Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux

[cascardo/linux.git] / drivers / edac / mpc85xx_edac.h

diff --git a/drivers/edac/mpc85xx_edac.h b/drivers/edac/mpc85xx_edac.h
index 9352e88..3f6fb16 100644 (file)
--- a/drivers/edac/mpc85xx_edac.h
+++ b/drivers/edac/mpc85xx_edac.h
@@ -17,65 +17,6 @@
 #define mpc85xx_printk(level, fmt, arg...) \
        edac_printk(level, "MPC85xx", fmt, ##arg)
 
-#define mpc85xx_mc_printk(mci, level, fmt, arg...) \
-       edac_mc_chipset_printk(mci, level, "MPC85xx", fmt, ##arg)
-
-/*
- * DRAM error defines
- */
-
-/* DDR_SDRAM_CFG */
-#define MPC85XX_MC_DDR_SDRAM_CFG       0x0110
-#define MPC85XX_MC_CS_BNDS_0           0x0000
-#define MPC85XX_MC_CS_BNDS_1           0x0008
-#define MPC85XX_MC_CS_BNDS_2           0x0010
-#define MPC85XX_MC_CS_BNDS_3           0x0018
-#define MPC85XX_MC_CS_BNDS_OFS         0x0008
-
-#define MPC85XX_MC_DATA_ERR_INJECT_HI  0x0e00
-#define MPC85XX_MC_DATA_ERR_INJECT_LO  0x0e04
-#define MPC85XX_MC_ECC_ERR_INJECT      0x0e08
-#define MPC85XX_MC_CAPTURE_DATA_HI     0x0e20
-#define MPC85XX_MC_CAPTURE_DATA_LO     0x0e24
-#define MPC85XX_MC_CAPTURE_ECC         0x0e28
-#define MPC85XX_MC_ERR_DETECT          0x0e40
-#define MPC85XX_MC_ERR_DISABLE         0x0e44
-#define MPC85XX_MC_ERR_INT_EN          0x0e48
-#define MPC85XX_MC_CAPTURE_ATRIBUTES   0x0e4c
-#define MPC85XX_MC_CAPTURE_ADDRESS     0x0e50
-#define MPC85XX_MC_CAPTURE_EXT_ADDRESS 0x0e54
-#define MPC85XX_MC_ERR_SBE             0x0e58
-
-#define DSC_MEM_EN     0x80000000
-#define DSC_ECC_EN     0x20000000
-#define DSC_RD_EN      0x10000000
-#define DSC_DBW_MASK   0x00180000
-#define DSC_DBW_32     0x00080000
-#define DSC_DBW_64     0x00000000
-
-#define DSC_SDTYPE_MASK                0x07000000
-
-#define DSC_SDTYPE_DDR         0x02000000
-#define DSC_SDTYPE_DDR2                0x03000000
-#define DSC_SDTYPE_DDR3                0x07000000
-#define DSC_X32_EN     0x00000020
-
-/* Err_Int_En */
-#define DDR_EIE_MSEE   0x1     /* memory select */
-#define DDR_EIE_SBEE   0x4     /* single-bit ECC error */
-#define DDR_EIE_MBEE   0x8     /* multi-bit ECC error */
-
-/* Err_Detect */
-#define DDR_EDE_MSE            0x1     /* memory select */
-#define DDR_EDE_SBE            0x4     /* single-bit ECC error */
-#define DDR_EDE_MBE            0x8     /* multi-bit ECC error */
-#define DDR_EDE_MME            0x80000000      /* multiple memory errors */
-
-/* Err_Disable */
-#define DDR_EDI_MSED   0x1     /* memory select disable */
-#define        DDR_EDI_SBED    0x4     /* single-bit ECC error disable */
-#define        DDR_EDI_MBED    0x8     /* multi-bit ECC error disable */
-
 /*
  * L2 Err defines
  */
@@ -149,13 +90,6 @@
 #define MPC85XX_PCIE_ERR_CAP_R2                0x0030
 #define MPC85XX_PCIE_ERR_CAP_R3                0x0034
 
-struct mpc85xx_mc_pdata {
-       char *name;
-       int edac_idx;
-       void __iomem *mc_vbase;
-       int irq;
-};
-
 struct mpc85xx_l2_pdata {
        char *name;
        int edac_idx;