diff options
author | Andre Wolokita <Andre.Wolokita@analog.com> | 2014-09-04 20:42:28 -0400 |
---|---|---|
committer | Steven Miao <realmz6@gmail.com> | 2015-04-23 09:34:31 -0400 |
commit | bb717b33aa6b01abcc78c7a18dec343a3bde9574 (patch) | |
tree | 447338e6473068f7c3e7c883ca794df6433dc837 | |
parent | f7fee0366c861c66c9abc8ab9a250bea2dd53c8d (diff) |
debug-mmrs: Eliminate all traces of the USB_PHY_TEST MMR
Interacting with the USB_PHY_TEST MMR through debugfs was causing wide-spread
chaos in the realm (kernel panic). Expunge all references to this demonic
register.
Signed-off-by: Andre Wolokita <Andre.Wolokita@analog.com>
-rw-r--r-- | arch/blackfin/kernel/debug-mmrs.c | 1 | ||||
-rw-r--r-- | arch/blackfin/mach-bf527/include/mach/cdefBF525.h | 5 | ||||
-rw-r--r-- | arch/blackfin/mach-bf527/include/mach/defBF525.h | 4 | ||||
-rw-r--r-- | arch/blackfin/mach-bf548/include/mach/cdefBF542.h | 4 | ||||
-rw-r--r-- | arch/blackfin/mach-bf548/include/mach/cdefBF547.h | 4 | ||||
-rw-r--r-- | arch/blackfin/mach-bf548/include/mach/defBF542.h | 3 | ||||
-rw-r--r-- | arch/blackfin/mach-bf548/include/mach/defBF547.h | 3 |
7 files changed, 0 insertions, 24 deletions
diff --git a/arch/blackfin/kernel/debug-mmrs.c b/arch/blackfin/kernel/debug-mmrs.c index 947ad0832338..86b1cd3a0309 100644 --- a/arch/blackfin/kernel/debug-mmrs.c +++ b/arch/blackfin/kernel/debug-mmrs.c | |||
@@ -1620,7 +1620,6 @@ static int __init bfin_debug_mmrs_init(void) | |||
1620 | D16(USB_APHY_CNTRL); | 1620 | D16(USB_APHY_CNTRL); |
1621 | D16(USB_APHY_CALIB); | 1621 | D16(USB_APHY_CALIB); |
1622 | D16(USB_APHY_CNTRL2); | 1622 | D16(USB_APHY_CNTRL2); |
1623 | D16(USB_PHY_TEST); | ||
1624 | D16(USB_PLLOSC_CTRL); | 1623 | D16(USB_PLLOSC_CTRL); |
1625 | D16(USB_SRP_CLKDIV); | 1624 | D16(USB_SRP_CLKDIV); |
1626 | D16(USB_EP_NI0_TXMAXP); | 1625 | D16(USB_EP_NI0_TXMAXP); |
diff --git a/arch/blackfin/mach-bf527/include/mach/cdefBF525.h b/arch/blackfin/mach-bf527/include/mach/cdefBF525.h index d90a85b6b6b9..bd045318a250 100644 --- a/arch/blackfin/mach-bf527/include/mach/cdefBF525.h +++ b/arch/blackfin/mach-bf527/include/mach/cdefBF525.h | |||
@@ -122,11 +122,6 @@ | |||
122 | #define bfin_read_USB_APHY_CNTRL2() bfin_read16(USB_APHY_CNTRL2) | 122 | #define bfin_read_USB_APHY_CNTRL2() bfin_read16(USB_APHY_CNTRL2) |
123 | #define bfin_write_USB_APHY_CNTRL2(val) bfin_write16(USB_APHY_CNTRL2, val) | 123 | #define bfin_write_USB_APHY_CNTRL2(val) bfin_write16(USB_APHY_CNTRL2, val) |
124 | 124 | ||
125 | /* (PHY_TEST is for ADI usage only) */ | ||
126 | |||
127 | #define bfin_read_USB_PHY_TEST() bfin_read16(USB_PHY_TEST) | ||
128 | #define bfin_write_USB_PHY_TEST(val) bfin_write16(USB_PHY_TEST, val) | ||
129 | |||
130 | #define bfin_read_USB_PLLOSC_CTRL() bfin_read16(USB_PLLOSC_CTRL) | 125 | #define bfin_read_USB_PLLOSC_CTRL() bfin_read16(USB_PLLOSC_CTRL) |
131 | #define bfin_write_USB_PLLOSC_CTRL(val) bfin_write16(USB_PLLOSC_CTRL, val) | 126 | #define bfin_write_USB_PLLOSC_CTRL(val) bfin_write16(USB_PLLOSC_CTRL, val) |
132 | #define bfin_read_USB_SRP_CLKDIV() bfin_read16(USB_SRP_CLKDIV) | 127 | #define bfin_read_USB_SRP_CLKDIV() bfin_read16(USB_SRP_CLKDIV) |
diff --git a/arch/blackfin/mach-bf527/include/mach/defBF525.h b/arch/blackfin/mach-bf527/include/mach/defBF525.h index 71578d964d00..591e00ff620a 100644 --- a/arch/blackfin/mach-bf527/include/mach/defBF525.h +++ b/arch/blackfin/mach-bf527/include/mach/defBF525.h | |||
@@ -77,10 +77,6 @@ | |||
77 | 77 | ||
78 | #define USB_APHY_CNTRL2 0xffc039e8 /* Register used to prevent re-enumeration once Moab goes into hibernate mode */ | 78 | #define USB_APHY_CNTRL2 0xffc039e8 /* Register used to prevent re-enumeration once Moab goes into hibernate mode */ |
79 | 79 | ||
80 | /* (PHY_TEST is for ADI usage only) */ | ||
81 | |||
82 | #define USB_PHY_TEST 0xffc039ec /* Used for reducing simulation time and simplifies FIFO testability */ | ||
83 | |||
84 | #define USB_PLLOSC_CTRL 0xffc039f0 /* Used to program different parameters for USB PLL and Oscillator */ | 80 | #define USB_PLLOSC_CTRL 0xffc039f0 /* Used to program different parameters for USB PLL and Oscillator */ |
85 | #define USB_SRP_CLKDIV 0xffc039f4 /* Used to program clock divide value for the clock fed to the SRP detection logic */ | 81 | #define USB_SRP_CLKDIV 0xffc039f4 /* Used to program clock divide value for the clock fed to the SRP detection logic */ |
86 | 82 | ||
diff --git a/arch/blackfin/mach-bf548/include/mach/cdefBF542.h b/arch/blackfin/mach-bf548/include/mach/cdefBF542.h index d09c19cd1b7b..916347901d5a 100644 --- a/arch/blackfin/mach-bf548/include/mach/cdefBF542.h +++ b/arch/blackfin/mach-bf548/include/mach/cdefBF542.h | |||
@@ -241,10 +241,6 @@ | |||
241 | #define bfin_read_USB_APHY_CNTRL2() bfin_read16(USB_APHY_CNTRL2) | 241 | #define bfin_read_USB_APHY_CNTRL2() bfin_read16(USB_APHY_CNTRL2) |
242 | #define bfin_write_USB_APHY_CNTRL2(val) bfin_write16(USB_APHY_CNTRL2, val) | 242 | #define bfin_write_USB_APHY_CNTRL2(val) bfin_write16(USB_APHY_CNTRL2, val) |
243 | 243 | ||
244 | /* (PHY_TEST is for ADI usage only) */ | ||
245 | |||
246 | #define bfin_read_USB_PHY_TEST() bfin_read16(USB_PHY_TEST) | ||
247 | #define bfin_write_USB_PHY_TEST(val) bfin_write16(USB_PHY_TEST, val) | ||
248 | #define bfin_read_USB_PLLOSC_CTRL() bfin_read16(USB_PLLOSC_CTRL) | 244 | #define bfin_read_USB_PLLOSC_CTRL() bfin_read16(USB_PLLOSC_CTRL) |
249 | #define bfin_write_USB_PLLOSC_CTRL(val) bfin_write16(USB_PLLOSC_CTRL, val) | 245 | #define bfin_write_USB_PLLOSC_CTRL(val) bfin_write16(USB_PLLOSC_CTRL, val) |
250 | #define bfin_read_USB_SRP_CLKDIV() bfin_read16(USB_SRP_CLKDIV) | 246 | #define bfin_read_USB_SRP_CLKDIV() bfin_read16(USB_SRP_CLKDIV) |
diff --git a/arch/blackfin/mach-bf548/include/mach/cdefBF547.h b/arch/blackfin/mach-bf548/include/mach/cdefBF547.h index bcb9726dea54..be83f645bba8 100644 --- a/arch/blackfin/mach-bf548/include/mach/cdefBF547.h +++ b/arch/blackfin/mach-bf548/include/mach/cdefBF547.h | |||
@@ -408,10 +408,6 @@ | |||
408 | #define bfin_read_USB_APHY_CNTRL2() bfin_read16(USB_APHY_CNTRL2) | 408 | #define bfin_read_USB_APHY_CNTRL2() bfin_read16(USB_APHY_CNTRL2) |
409 | #define bfin_write_USB_APHY_CNTRL2(val) bfin_write16(USB_APHY_CNTRL2, val) | 409 | #define bfin_write_USB_APHY_CNTRL2(val) bfin_write16(USB_APHY_CNTRL2, val) |
410 | 410 | ||
411 | /* (PHY_TEST is for ADI usage only) */ | ||
412 | |||
413 | #define bfin_read_USB_PHY_TEST() bfin_read16(USB_PHY_TEST) | ||
414 | #define bfin_write_USB_PHY_TEST(val) bfin_write16(USB_PHY_TEST, val) | ||
415 | #define bfin_read_USB_PLLOSC_CTRL() bfin_read16(USB_PLLOSC_CTRL) | 411 | #define bfin_read_USB_PLLOSC_CTRL() bfin_read16(USB_PLLOSC_CTRL) |
416 | #define bfin_write_USB_PLLOSC_CTRL(val) bfin_write16(USB_PLLOSC_CTRL, val) | 412 | #define bfin_write_USB_PLLOSC_CTRL(val) bfin_write16(USB_PLLOSC_CTRL, val) |
417 | #define bfin_read_USB_SRP_CLKDIV() bfin_read16(USB_SRP_CLKDIV) | 413 | #define bfin_read_USB_SRP_CLKDIV() bfin_read16(USB_SRP_CLKDIV) |
diff --git a/arch/blackfin/mach-bf548/include/mach/defBF542.h b/arch/blackfin/mach-bf548/include/mach/defBF542.h index 51161575a163..ae4b889e3606 100644 --- a/arch/blackfin/mach-bf548/include/mach/defBF542.h +++ b/arch/blackfin/mach-bf548/include/mach/defBF542.h | |||
@@ -140,9 +140,6 @@ | |||
140 | #define USB_APHY_CALIB 0xffc03de4 /* Register used to set some calibration values */ | 140 | #define USB_APHY_CALIB 0xffc03de4 /* Register used to set some calibration values */ |
141 | #define USB_APHY_CNTRL2 0xffc03de8 /* Register used to prevent re-enumeration once Moab goes into hibernate mode */ | 141 | #define USB_APHY_CNTRL2 0xffc03de8 /* Register used to prevent re-enumeration once Moab goes into hibernate mode */ |
142 | 142 | ||
143 | /* (PHY_TEST is for ADI usage only) */ | ||
144 | |||
145 | #define USB_PHY_TEST 0xffc03dec /* Used for reducing simulation time and simplifies FIFO testability */ | ||
146 | #define USB_PLLOSC_CTRL 0xffc03df0 /* Used to program different parameters for USB PLL and Oscillator */ | 143 | #define USB_PLLOSC_CTRL 0xffc03df0 /* Used to program different parameters for USB PLL and Oscillator */ |
147 | #define USB_SRP_CLKDIV 0xffc03df4 /* Used to program clock divide value for the clock fed to the SRP detection logic */ | 144 | #define USB_SRP_CLKDIV 0xffc03df4 /* Used to program clock divide value for the clock fed to the SRP detection logic */ |
148 | 145 | ||
diff --git a/arch/blackfin/mach-bf548/include/mach/defBF547.h b/arch/blackfin/mach-bf548/include/mach/defBF547.h index d55dcc0f5324..7cc7928a3c73 100644 --- a/arch/blackfin/mach-bf548/include/mach/defBF547.h +++ b/arch/blackfin/mach-bf548/include/mach/defBF547.h | |||
@@ -254,9 +254,6 @@ | |||
254 | #define USB_APHY_CALIB 0xffc03de4 /* Register used to set some calibration values */ | 254 | #define USB_APHY_CALIB 0xffc03de4 /* Register used to set some calibration values */ |
255 | #define USB_APHY_CNTRL2 0xffc03de8 /* Register used to prevent re-enumeration once Moab goes into hibernate mode */ | 255 | #define USB_APHY_CNTRL2 0xffc03de8 /* Register used to prevent re-enumeration once Moab goes into hibernate mode */ |
256 | 256 | ||
257 | /* (PHY_TEST is for ADI usage only) */ | ||
258 | |||
259 | #define USB_PHY_TEST 0xffc03dec /* Used for reducing simulation time and simplifies FIFO testability */ | ||
260 | #define USB_PLLOSC_CTRL 0xffc03df0 /* Used to program different parameters for USB PLL and Oscillator */ | 257 | #define USB_PLLOSC_CTRL 0xffc03df0 /* Used to program different parameters for USB PLL and Oscillator */ |
261 | #define USB_SRP_CLKDIV 0xffc03df4 /* Used to program clock divide value for the clock fed to the SRP detection logic */ | 258 | #define USB_SRP_CLKDIV 0xffc03df4 /* Used to program clock divide value for the clock fed to the SRP detection logic */ |
262 | 259 | ||