* [PATCH 1/2] ARM: LPC32xx: DTS update for devicetree completion of spi-pl022
@ 2012-09-18 13:00 Roland Stigge
2012-09-18 13:00 ` [PATCH 2/2] ARM: LPC32xx: Platform " Roland Stigge
` (2 more replies)
0 siblings, 3 replies; 5+ messages in thread
From: Roland Stigge @ 2012-09-18 13:00 UTC (permalink / raw)
To: linux-arm-kernel
spi-pl022 got a further update to its devicetree support, completing properties
such that no platform data is necessary anymore. This patch adjusts
lpc32xx.dtsi accordingly.
Signed-off-by: Roland Stigge <stigge@antcom.de>
---
I will do a git pull request for arm-soc.git when the respective change in
spi-pl022.c is merged.
arch/arm/boot/dts/lpc32xx.dtsi | 2 ++
1 file changed, 2 insertions(+)
--- linux-2.6.orig/arch/arm/boot/dts/lpc32xx.dtsi
+++ linux-2.6/arch/arm/boot/dts/lpc32xx.dtsi
@@ -91,6 +91,7 @@
compatible = "arm,pl022", "arm,primecell";
reg = <0x20084000 0x1000>;
interrupts = <0x14 0>;
+ pl022,bus-id = <0>;
};
spi1: spi at 20088000 {
@@ -102,6 +103,7 @@
compatible = "arm,pl022", "arm,primecell";
reg = <0x2008c000 0x1000>;
interrupts = <0x15 0>;
+ pl022,bus-id = <1>;
};
spi2: spi at 20090000 {
^ permalink raw reply [flat|nested] 5+ messages in thread* [PATCH 2/2] ARM: LPC32xx: Platform update for devicetree completion of spi-pl022 2012-09-18 13:00 [PATCH 1/2] ARM: LPC32xx: DTS update for devicetree completion of spi-pl022 Roland Stigge @ 2012-09-18 13:00 ` Roland Stigge 2012-09-18 13:03 ` Alexandre Pereira da Silva 2012-09-18 13:02 ` [PATCH 1/2] ARM: LPC32xx: DTS " Alexandre Pereira da Silva 2012-09-18 21:20 ` Linus Walleij 2 siblings, 1 reply; 5+ messages in thread From: Roland Stigge @ 2012-09-18 13:00 UTC (permalink / raw) To: linux-arm-kernel 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> -- I will do a git pull request for arm-soc.git when the respective change in spi-pl022.c is merged. --- linux-2.6.orig/arch/arm/mach-lpc32xx/phy3250.c +++ linux-2.6/arch/arm/mach-lpc32xx/phy3250.c @@ -27,7 +27,6 @@ #include <linux/gpio.h> #include <linux/amba/bus.h> #include <linux/amba/clcd.h> -#include <linux/amba/pl022.h> #include <linux/amba/pl08x.h> #include <linux/amba/mmci.h> #include <linux/of.h> @@ -156,21 +155,6 @@ static struct clcd_board lpc32xx_clcd_da .remove = lpc32xx_clcd_remove, }; -/* - * AMBA SSP (SPI) - */ -static struct pl022_ssp_controller lpc32xx_ssp0_data = { - .bus_id = 0, - .num_chipselect = 1, - .enable_dma = 0, -}; - -static struct pl022_ssp_controller lpc32xx_ssp1_data = { - .bus_id = 1, - .num_chipselect = 1, - .enable_dma = 0, -}; - static struct pl08x_channel_data pl08x_slave_channels[] = { { .bus_id = "nand-slc", @@ -232,8 +216,8 @@ static struct lpc32xx_mlc_platform_data }; static const struct of_dev_auxdata lpc32xx_auxdata_lookup[] __initconst = { - OF_DEV_AUXDATA("arm,pl022", 0x20084000, "dev:ssp0", &lpc32xx_ssp0_data), - OF_DEV_AUXDATA("arm,pl022", 0x2008C000, "dev:ssp1", &lpc32xx_ssp1_data), + OF_DEV_AUXDATA("arm,pl022", 0x20084000, "dev:ssp0", NULL), + OF_DEV_AUXDATA("arm,pl022", 0x2008C000, "dev:ssp1", NULL), OF_DEV_AUXDATA("arm,pl110", 0x31040000, "dev:clcd", &lpc32xx_clcd_data), OF_DEV_AUXDATA("arm,pl080", 0x31000000, "pl08xdmac", &pl08x_pd), OF_DEV_AUXDATA("arm,pl18x", 0x20098000, "20098000.sd", ^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH 2/2] ARM: LPC32xx: Platform update for devicetree completion of spi-pl022 2012-09-18 13:00 ` [PATCH 2/2] ARM: LPC32xx: Platform " Roland Stigge @ 2012-09-18 13:03 ` Alexandre Pereira da Silva 0 siblings, 0 replies; 5+ messages in thread From: Alexandre Pereira da Silva @ 2012-09-18 13:03 UTC (permalink / raw) To: linux-arm-kernel On Tue, Sep 18, 2012 at 10:00 AM, Roland Stigge <stigge@antcom.de> wrote: > 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> > -- > I will do a git pull request for arm-soc.git when the respective change in > spi-pl022.c is merged. > > --- linux-2.6.orig/arch/arm/mach-lpc32xx/phy3250.c > +++ linux-2.6/arch/arm/mach-lpc32xx/phy3250.c > @@ -27,7 +27,6 @@ > #include <linux/gpio.h> > #include <linux/amba/bus.h> > #include <linux/amba/clcd.h> > -#include <linux/amba/pl022.h> > #include <linux/amba/pl08x.h> > #include <linux/amba/mmci.h> > #include <linux/of.h> > @@ -156,21 +155,6 @@ static struct clcd_board lpc32xx_clcd_da > .remove = lpc32xx_clcd_remove, > }; > > -/* > - * AMBA SSP (SPI) > - */ > -static struct pl022_ssp_controller lpc32xx_ssp0_data = { > - .bus_id = 0, > - .num_chipselect = 1, > - .enable_dma = 0, > -}; > - > -static struct pl022_ssp_controller lpc32xx_ssp1_data = { > - .bus_id = 1, > - .num_chipselect = 1, > - .enable_dma = 0, > -}; > - > static struct pl08x_channel_data pl08x_slave_channels[] = { > { > .bus_id = "nand-slc", > @@ -232,8 +216,8 @@ static struct lpc32xx_mlc_platform_data > }; > > static const struct of_dev_auxdata lpc32xx_auxdata_lookup[] __initconst = { > - OF_DEV_AUXDATA("arm,pl022", 0x20084000, "dev:ssp0", &lpc32xx_ssp0_data), > - OF_DEV_AUXDATA("arm,pl022", 0x2008C000, "dev:ssp1", &lpc32xx_ssp1_data), > + OF_DEV_AUXDATA("arm,pl022", 0x20084000, "dev:ssp0", NULL), > + OF_DEV_AUXDATA("arm,pl022", 0x2008C000, "dev:ssp1", NULL), > OF_DEV_AUXDATA("arm,pl110", 0x31040000, "dev:clcd", &lpc32xx_clcd_data), > OF_DEV_AUXDATA("arm,pl080", 0x31000000, "pl08xdmac", &pl08x_pd), > OF_DEV_AUXDATA("arm,pl18x", 0x20098000, "20098000.sd", ^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH 1/2] ARM: LPC32xx: DTS update for devicetree completion of spi-pl022 2012-09-18 13:00 [PATCH 1/2] ARM: LPC32xx: DTS update for devicetree completion of spi-pl022 Roland Stigge 2012-09-18 13:00 ` [PATCH 2/2] ARM: LPC32xx: Platform " Roland Stigge @ 2012-09-18 13:02 ` Alexandre Pereira da Silva 2012-09-18 21:20 ` Linus Walleij 2 siblings, 0 replies; 5+ messages in thread From: Alexandre Pereira da Silva @ 2012-09-18 13:02 UTC (permalink / raw) To: linux-arm-kernel On Tue, Sep 18, 2012 at 10:00 AM, Roland Stigge <stigge@antcom.de> wrote: > spi-pl022 got a further update to its devicetree support, completing properties > such that no platform data is necessary anymore. This patch adjusts > lpc32xx.dtsi accordingly. > > Signed-off-by: Roland Stigge <stigge@antcom.de> Acked-by: Alexandre Pereira da Silva <aletes.xgr@gmail.com> > > --- > I will do a git pull request for arm-soc.git when the respective change in > spi-pl022.c is merged. > > arch/arm/boot/dts/lpc32xx.dtsi | 2 ++ > 1 file changed, 2 insertions(+) > > --- linux-2.6.orig/arch/arm/boot/dts/lpc32xx.dtsi > +++ linux-2.6/arch/arm/boot/dts/lpc32xx.dtsi > @@ -91,6 +91,7 @@ > compatible = "arm,pl022", "arm,primecell"; > reg = <0x20084000 0x1000>; > interrupts = <0x14 0>; > + pl022,bus-id = <0>; > }; > > spi1: spi at 20088000 { > @@ -102,6 +103,7 @@ > compatible = "arm,pl022", "arm,primecell"; > reg = <0x2008c000 0x1000>; > interrupts = <0x15 0>; > + pl022,bus-id = <1>; > }; > > spi2: spi at 20090000 { ^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH 1/2] ARM: LPC32xx: DTS update for devicetree completion of spi-pl022 2012-09-18 13:00 [PATCH 1/2] ARM: LPC32xx: DTS update for devicetree completion of spi-pl022 Roland Stigge 2012-09-18 13:00 ` [PATCH 2/2] ARM: LPC32xx: Platform " Roland Stigge 2012-09-18 13:02 ` [PATCH 1/2] ARM: LPC32xx: DTS " Alexandre Pereira da Silva @ 2012-09-18 21:20 ` Linus Walleij 2 siblings, 0 replies; 5+ messages in thread From: Linus Walleij @ 2012-09-18 21:20 UTC (permalink / raw) To: linux-arm-kernel On Tue, Sep 18, 2012 at 3:00 PM, Roland Stigge <stigge@antcom.de> wrote: > spi-pl022 got a further update to its devicetree support, completing properties > such that no platform data is necessary anymore. This patch adjusts > lpc32xx.dtsi accordingly. > > Signed-off-by: Roland Stigge <stigge@antcom.de> FWIW Acked-by: Linus Walleij <linus.walleij@linaro.org> on both patches... Yours, Linus Walleij ^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2012-09-18 21:20 UTC | newest] Thread overview: 5+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2012-09-18 13:00 [PATCH 1/2] ARM: LPC32xx: DTS update for devicetree completion of spi-pl022 Roland Stigge 2012-09-18 13:00 ` [PATCH 2/2] ARM: LPC32xx: Platform " Roland Stigge 2012-09-18 13:03 ` Alexandre Pereira da Silva 2012-09-18 13:02 ` [PATCH 1/2] ARM: LPC32xx: DTS " Alexandre Pereira da Silva 2012-09-18 21:20 ` Linus Walleij
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).