diff options
author | Roland Stigge <stigge@antcom.de> | 2012-09-25 04:15:49 -0400 |
---|---|---|
committer | Roland Stigge <stigge@antcom.de> | 2012-09-25 04:15:49 -0400 |
commit | a4bc78785190d1b59c28b823de8389f3555380cc (patch) | |
tree | df247c50e31ab14452ffdfeb549da3a05416be0b /arch | |
parent | 632cbbcf0e80f2e2dcf94b8e4d05dd03eda90a06 (diff) |
ARM: LPC32xx: Platform update for devicetree completion of spi-pl022
spi-pl022 got a further update to its devicetree support, completing properties
such that no platform data is necessary anymore. This patch adjusts phy3250.c
accordingly: The supplied platform data is deleted. However, OF_DEV_AUXDATA()
are still necessary due to device naming ("dev:ssp0").
Signed-off-by: Roland Stigge <stigge@antcom.de>
Acked-by: Alexandre Pereira da Silva <aletes.xgr@gmail.com>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/mach-lpc32xx/phy3250.c | 20 |
1 files changed, 2 insertions, 18 deletions
diff --git a/arch/arm/mach-lpc32xx/phy3250.c b/arch/arm/mach-lpc32xx/phy3250.c index 5663a9a943f7..e8ff4c3f0566 100644 --- a/arch/arm/mach-lpc32xx/phy3250.c +++ b/arch/arm/mach-lpc32xx/phy3250.c | |||
@@ -27,7 +27,6 @@ | |||
27 | #include <linux/gpio.h> | 27 | #include <linux/gpio.h> |
28 | #include <linux/amba/bus.h> | 28 | #include <linux/amba/bus.h> |
29 | #include <linux/amba/clcd.h> | 29 | #include <linux/amba/clcd.h> |
30 | #include <linux/amba/pl022.h> | ||
31 | #include <linux/amba/pl08x.h> | 30 | #include <linux/amba/pl08x.h> |
32 | #include <linux/amba/mmci.h> | 31 | #include <linux/amba/mmci.h> |
33 | #include <linux/of.h> | 32 | #include <linux/of.h> |
@@ -156,21 +155,6 @@ static struct clcd_board lpc32xx_clcd_data = { | |||
156 | .remove = lpc32xx_clcd_remove, | 155 | .remove = lpc32xx_clcd_remove, |
157 | }; | 156 | }; |
158 | 157 | ||
159 | /* | ||
160 | * AMBA SSP (SPI) | ||
161 | */ | ||
162 | static struct pl022_ssp_controller lpc32xx_ssp0_data = { | ||
163 | .bus_id = 0, | ||
164 | .num_chipselect = 1, | ||
165 | .enable_dma = 0, | ||
166 | }; | ||
167 | |||
168 | static struct pl022_ssp_controller lpc32xx_ssp1_data = { | ||
169 | .bus_id = 1, | ||
170 | .num_chipselect = 1, | ||
171 | .enable_dma = 0, | ||
172 | }; | ||
173 | |||
174 | static struct pl08x_channel_data pl08x_slave_channels[] = { | 158 | static struct pl08x_channel_data pl08x_slave_channels[] = { |
175 | { | 159 | { |
176 | .bus_id = "nand-slc", | 160 | .bus_id = "nand-slc", |
@@ -232,8 +216,8 @@ static struct lpc32xx_mlc_platform_data lpc32xx_mlc_data = { | |||
232 | }; | 216 | }; |
233 | 217 | ||
234 | static const struct of_dev_auxdata lpc32xx_auxdata_lookup[] __initconst = { | 218 | static const struct of_dev_auxdata lpc32xx_auxdata_lookup[] __initconst = { |
235 | OF_DEV_AUXDATA("arm,pl022", 0x20084000, "dev:ssp0", &lpc32xx_ssp0_data), | 219 | OF_DEV_AUXDATA("arm,pl022", 0x20084000, "dev:ssp0", NULL), |
236 | OF_DEV_AUXDATA("arm,pl022", 0x2008C000, "dev:ssp1", &lpc32xx_ssp1_data), | 220 | OF_DEV_AUXDATA("arm,pl022", 0x2008C000, "dev:ssp1", NULL), |
237 | OF_DEV_AUXDATA("arm,pl110", 0x31040000, "dev:clcd", &lpc32xx_clcd_data), | 221 | OF_DEV_AUXDATA("arm,pl110", 0x31040000, "dev:clcd", &lpc32xx_clcd_data), |
238 | OF_DEV_AUXDATA("arm,pl080", 0x31000000, "pl08xdmac", &pl08x_pd), | 222 | OF_DEV_AUXDATA("arm,pl080", 0x31000000, "pl08xdmac", &pl08x_pd), |
239 | OF_DEV_AUXDATA("arm,pl18x", 0x20098000, "20098000.sd", | 223 | OF_DEV_AUXDATA("arm,pl18x", 0x20098000, "20098000.sd", |