diff options
-rw-r--r-- | arch/ppc/platforms/4xx/ibm405ep.c | 1 | ||||
-rw-r--r-- | arch/ppc/platforms/4xx/ibm405gp.c | 1 | ||||
-rw-r--r-- | arch/ppc/platforms/4xx/ibm405gpr.c | 1 | ||||
-rw-r--r-- | arch/ppc/platforms/4xx/ibm440ep.c | 1 | ||||
-rw-r--r-- | arch/ppc/platforms/4xx/ibm440gp.c | 1 | ||||
-rw-r--r-- | arch/ppc/platforms/4xx/ibm440gx.c | 1 | ||||
-rw-r--r-- | arch/ppc/platforms/4xx/ibm440sp.c | 1 | ||||
-rw-r--r-- | arch/ppc/platforms/4xx/ibmnp405h.c | 1 | ||||
-rw-r--r-- | include/asm-ppc/ibm_ocp.h | 3 |
9 files changed, 11 insertions, 0 deletions
diff --git a/arch/ppc/platforms/4xx/ibm405ep.c b/arch/ppc/platforms/4xx/ibm405ep.c index 6d44567f4dd2..093b28d27a41 100644 --- a/arch/ppc/platforms/4xx/ibm405ep.c +++ b/arch/ppc/platforms/4xx/ibm405ep.c | |||
@@ -33,6 +33,7 @@ static struct ocp_func_mal_data ibm405ep_mal0_def = { | |||
33 | .txde_irq = 13, /* TX Descriptor Error IRQ */ | 33 | .txde_irq = 13, /* TX Descriptor Error IRQ */ |
34 | .rxde_irq = 14, /* RX Descriptor Error IRQ */ | 34 | .rxde_irq = 14, /* RX Descriptor Error IRQ */ |
35 | .serr_irq = 10, /* MAL System Error IRQ */ | 35 | .serr_irq = 10, /* MAL System Error IRQ */ |
36 | .dcr_base = DCRN_MAL_BASE /* MAL0_CFG DCR number */ | ||
36 | }; | 37 | }; |
37 | OCP_SYSFS_MAL_DATA() | 38 | OCP_SYSFS_MAL_DATA() |
38 | 39 | ||
diff --git a/arch/ppc/platforms/4xx/ibm405gp.c b/arch/ppc/platforms/4xx/ibm405gp.c index dfd7ef3ba5f8..e5700469a682 100644 --- a/arch/ppc/platforms/4xx/ibm405gp.c +++ b/arch/ppc/platforms/4xx/ibm405gp.c | |||
@@ -46,6 +46,7 @@ static struct ocp_func_mal_data ibm405gp_mal0_def = { | |||
46 | .txde_irq = 13, /* TX Descriptor Error IRQ */ | 46 | .txde_irq = 13, /* TX Descriptor Error IRQ */ |
47 | .rxde_irq = 14, /* RX Descriptor Error IRQ */ | 47 | .rxde_irq = 14, /* RX Descriptor Error IRQ */ |
48 | .serr_irq = 10, /* MAL System Error IRQ */ | 48 | .serr_irq = 10, /* MAL System Error IRQ */ |
49 | .dcr_base = DCRN_MAL_BASE /* MAL0_CFG DCR number */ | ||
49 | }; | 50 | }; |
50 | OCP_SYSFS_MAL_DATA() | 51 | OCP_SYSFS_MAL_DATA() |
51 | 52 | ||
diff --git a/arch/ppc/platforms/4xx/ibm405gpr.c b/arch/ppc/platforms/4xx/ibm405gpr.c index 01c8ccbc7214..cd0d00d8e8ee 100644 --- a/arch/ppc/platforms/4xx/ibm405gpr.c +++ b/arch/ppc/platforms/4xx/ibm405gpr.c | |||
@@ -42,6 +42,7 @@ static struct ocp_func_mal_data ibm405gpr_mal0_def = { | |||
42 | .txde_irq = 13, /* TX Descriptor Error IRQ */ | 42 | .txde_irq = 13, /* TX Descriptor Error IRQ */ |
43 | .rxde_irq = 14, /* RX Descriptor Error IRQ */ | 43 | .rxde_irq = 14, /* RX Descriptor Error IRQ */ |
44 | .serr_irq = 10, /* MAL System Error IRQ */ | 44 | .serr_irq = 10, /* MAL System Error IRQ */ |
45 | .dcr_base = DCRN_MAL_BASE /* MAL0_CFG DCR number */ | ||
45 | }; | 46 | }; |
46 | OCP_SYSFS_MAL_DATA() | 47 | OCP_SYSFS_MAL_DATA() |
47 | 48 | ||
diff --git a/arch/ppc/platforms/4xx/ibm440ep.c b/arch/ppc/platforms/4xx/ibm440ep.c index 284da01f1ffd..4712de8ff80f 100644 --- a/arch/ppc/platforms/4xx/ibm440ep.c +++ b/arch/ppc/platforms/4xx/ibm440ep.c | |||
@@ -53,6 +53,7 @@ static struct ocp_func_mal_data ibm440ep_mal0_def = { | |||
53 | .txde_irq = 33, /* TX Descriptor Error IRQ */ | 53 | .txde_irq = 33, /* TX Descriptor Error IRQ */ |
54 | .rxde_irq = 34, /* RX Descriptor Error IRQ */ | 54 | .rxde_irq = 34, /* RX Descriptor Error IRQ */ |
55 | .serr_irq = 32, /* MAL System Error IRQ */ | 55 | .serr_irq = 32, /* MAL System Error IRQ */ |
56 | .dcr_base = DCRN_MAL_BASE /* MAL0_CFG DCR number */ | ||
56 | }; | 57 | }; |
57 | OCP_SYSFS_MAL_DATA() | 58 | OCP_SYSFS_MAL_DATA() |
58 | 59 | ||
diff --git a/arch/ppc/platforms/4xx/ibm440gp.c b/arch/ppc/platforms/4xx/ibm440gp.c index 27615ef8309c..d926245e8b3e 100644 --- a/arch/ppc/platforms/4xx/ibm440gp.c +++ b/arch/ppc/platforms/4xx/ibm440gp.c | |||
@@ -56,6 +56,7 @@ static struct ocp_func_mal_data ibm440gp_mal0_def = { | |||
56 | .txde_irq = 33, /* TX Descriptor Error IRQ */ | 56 | .txde_irq = 33, /* TX Descriptor Error IRQ */ |
57 | .rxde_irq = 34, /* RX Descriptor Error IRQ */ | 57 | .rxde_irq = 34, /* RX Descriptor Error IRQ */ |
58 | .serr_irq = 32, /* MAL System Error IRQ */ | 58 | .serr_irq = 32, /* MAL System Error IRQ */ |
59 | .dcr_base = DCRN_MAL_BASE /* MAL0_CFG DCR number */ | ||
59 | }; | 60 | }; |
60 | OCP_SYSFS_MAL_DATA() | 61 | OCP_SYSFS_MAL_DATA() |
61 | 62 | ||
diff --git a/arch/ppc/platforms/4xx/ibm440gx.c b/arch/ppc/platforms/4xx/ibm440gx.c index 1f38f42835b4..956f45e4ef97 100644 --- a/arch/ppc/platforms/4xx/ibm440gx.c +++ b/arch/ppc/platforms/4xx/ibm440gx.c | |||
@@ -84,6 +84,7 @@ static struct ocp_func_mal_data ibm440gx_mal0_def = { | |||
84 | .txde_irq = 33, /* TX Descriptor Error IRQ */ | 84 | .txde_irq = 33, /* TX Descriptor Error IRQ */ |
85 | .rxde_irq = 34, /* RX Descriptor Error IRQ */ | 85 | .rxde_irq = 34, /* RX Descriptor Error IRQ */ |
86 | .serr_irq = 32, /* MAL System Error IRQ */ | 86 | .serr_irq = 32, /* MAL System Error IRQ */ |
87 | .dcr_base = DCRN_MAL_BASE /* MAL0_CFG DCR number */ | ||
87 | }; | 88 | }; |
88 | OCP_SYSFS_MAL_DATA() | 89 | OCP_SYSFS_MAL_DATA() |
89 | 90 | ||
diff --git a/arch/ppc/platforms/4xx/ibm440sp.c b/arch/ppc/platforms/4xx/ibm440sp.c index fa3e003a0db9..feb17e41ef69 100644 --- a/arch/ppc/platforms/4xx/ibm440sp.c +++ b/arch/ppc/platforms/4xx/ibm440sp.c | |||
@@ -43,6 +43,7 @@ static struct ocp_func_mal_data ibm440sp_mal0_def = { | |||
43 | .txde_irq = 34, /* TX Descriptor Error IRQ */ | 43 | .txde_irq = 34, /* TX Descriptor Error IRQ */ |
44 | .rxde_irq = 35, /* RX Descriptor Error IRQ */ | 44 | .rxde_irq = 35, /* RX Descriptor Error IRQ */ |
45 | .serr_irq = 33, /* MAL System Error IRQ */ | 45 | .serr_irq = 33, /* MAL System Error IRQ */ |
46 | .dcr_base = DCRN_MAL_BASE /* MAL0_CFG DCR number */ | ||
46 | }; | 47 | }; |
47 | OCP_SYSFS_MAL_DATA() | 48 | OCP_SYSFS_MAL_DATA() |
48 | 49 | ||
diff --git a/arch/ppc/platforms/4xx/ibmnp405h.c b/arch/ppc/platforms/4xx/ibmnp405h.c index 4937cfb4b5d9..a477a78f4902 100644 --- a/arch/ppc/platforms/4xx/ibmnp405h.c +++ b/arch/ppc/platforms/4xx/ibmnp405h.c | |||
@@ -73,6 +73,7 @@ static struct ocp_func_mal_data ibmnp405h_mal0_def = { | |||
73 | .txde_irq = 46, /* TX Descriptor Error IRQ */ | 73 | .txde_irq = 46, /* TX Descriptor Error IRQ */ |
74 | .rxde_irq = 47, /* RX Descriptor Error IRQ */ | 74 | .rxde_irq = 47, /* RX Descriptor Error IRQ */ |
75 | .serr_irq = 45, /* MAL System Error IRQ */ | 75 | .serr_irq = 45, /* MAL System Error IRQ */ |
76 | .dcr_base = DCRN_MAL_BASE /* MAL0_CFG DCR number */ | ||
76 | }; | 77 | }; |
77 | OCP_SYSFS_MAL_DATA() | 78 | OCP_SYSFS_MAL_DATA() |
78 | 79 | ||
diff --git a/include/asm-ppc/ibm_ocp.h b/include/asm-ppc/ibm_ocp.h index 7fd4b6ce327a..bd7656fa2026 100644 --- a/include/asm-ppc/ibm_ocp.h +++ b/include/asm-ppc/ibm_ocp.h | |||
@@ -147,6 +147,7 @@ struct ocp_func_mal_data { | |||
147 | int txde_irq; /* TX Descriptor Error IRQ */ | 147 | int txde_irq; /* TX Descriptor Error IRQ */ |
148 | int rxde_irq; /* RX Descriptor Error IRQ */ | 148 | int rxde_irq; /* RX Descriptor Error IRQ */ |
149 | int serr_irq; /* MAL System Error IRQ */ | 149 | int serr_irq; /* MAL System Error IRQ */ |
150 | int dcr_base; /* MALx_CFG DCR number */ | ||
150 | }; | 151 | }; |
151 | 152 | ||
152 | #define OCP_SYSFS_MAL_DATA() \ | 153 | #define OCP_SYSFS_MAL_DATA() \ |
@@ -157,6 +158,7 @@ OCP_SYSFS_ADDTL(struct ocp_func_mal_data, "%d\n", mal, rxeob_irq) \ | |||
157 | OCP_SYSFS_ADDTL(struct ocp_func_mal_data, "%d\n", mal, txde_irq) \ | 158 | OCP_SYSFS_ADDTL(struct ocp_func_mal_data, "%d\n", mal, txde_irq) \ |
158 | OCP_SYSFS_ADDTL(struct ocp_func_mal_data, "%d\n", mal, rxde_irq) \ | 159 | OCP_SYSFS_ADDTL(struct ocp_func_mal_data, "%d\n", mal, rxde_irq) \ |
159 | OCP_SYSFS_ADDTL(struct ocp_func_mal_data, "%d\n", mal, serr_irq) \ | 160 | OCP_SYSFS_ADDTL(struct ocp_func_mal_data, "%d\n", mal, serr_irq) \ |
161 | OCP_SYSFS_ADDTL(struct ocp_func_mal_data, "%d\n", mal, dcr_base) \ | ||
160 | \ | 162 | \ |
161 | void ocp_show_mal_data(struct device *dev) \ | 163 | void ocp_show_mal_data(struct device *dev) \ |
162 | { \ | 164 | { \ |
@@ -167,6 +169,7 @@ void ocp_show_mal_data(struct device *dev) \ | |||
167 | device_create_file(dev, &dev_attr_mal_txde_irq); \ | 169 | device_create_file(dev, &dev_attr_mal_txde_irq); \ |
168 | device_create_file(dev, &dev_attr_mal_rxde_irq); \ | 170 | device_create_file(dev, &dev_attr_mal_rxde_irq); \ |
169 | device_create_file(dev, &dev_attr_mal_serr_irq); \ | 171 | device_create_file(dev, &dev_attr_mal_serr_irq); \ |
172 | device_create_file(dev, &dev_attr_mal_dcr_base); \ | ||
170 | } | 173 | } |
171 | 174 | ||
172 | /* | 175 | /* |