Hi, On Mon, Nov 25, 2013 at 4:15 AM, Mark Brown <broonie@xxxxxxxxxx> wrote: > From: Mark Brown <broonie@xxxxxxxxxx> > > Rather than requiring each board to explicitly disable the SPI controllers > it is not using instead require boards to enable those that they are using. > This is less work overall since normally at most one of the controllers is > in use and avoids issues caused by inappropriate pinmuxing. > > Signed-off-by: Mark Brown <broonie@xxxxxxxxxx> > Acked-by: Tomasz Figa <t.figa@xxxxxxxxxxx> > --- > arch/arm/boot/dts/cros5250-common.dtsi | 9 +-------- > arch/arm/boot/dts/exynos5250-arndale.dts | 12 ------------ > arch/arm/boot/dts/exynos5250-smdk5250.dts | 6 ++---- > arch/arm/boot/dts/exynos5250.dtsi | 3 +++ > 4 files changed, 6 insertions(+), 24 deletions(-) > > diff --git a/arch/arm/boot/dts/cros5250-common.dtsi b/arch/arm/boot/dts/cros5250-common.dtsi > index dc259e8b8a73..0fcca2930c61 100644 > --- a/arch/arm/boot/dts/cros5250-common.dtsi > +++ b/arch/arm/boot/dts/cros5250-common.dtsi > @@ -286,19 +286,12 @@ > }; > }; > > - spi_0: spi@12d20000 { > - status = "disabled"; > - }; > - > spi_1: spi@12d30000 { > + status = "okay"; > samsung,spi-src-clk = <0>; > num-cs = <1>; > }; > > - spi_2: spi@12d40000 { > - status = "disabled"; > - }; > - > hdmi { > hpd-gpio = <&gpx3 7 0>; > }; > diff --git a/arch/arm/boot/dts/exynos5250-arndale.dts b/arch/arm/boot/dts/exynos5250-arndale.dts > index 684527087aa4..0385b58116ec 100644 > --- a/arch/arm/boot/dts/exynos5250-arndale.dts > +++ b/arch/arm/boot/dts/exynos5250-arndale.dts > @@ -434,18 +434,6 @@ > status = "okay"; > }; > > - spi_0: spi@12d20000 { > - status = "disabled"; > - }; > - > - spi_1: spi@12d30000 { > - status = "disabled"; > - }; > - > - spi_2: spi@12d40000 { > - status = "disabled"; > - }; > - > gpio_keys { > compatible = "gpio-keys"; > > diff --git a/arch/arm/boot/dts/exynos5250-smdk5250.dts b/arch/arm/boot/dts/exynos5250-smdk5250.dts > index f86d56760a45..5d0395e07eee 100644 > --- a/arch/arm/boot/dts/exynos5250-smdk5250.dts > +++ b/arch/arm/boot/dts/exynos5250-smdk5250.dts > @@ -189,6 +189,8 @@ > }; > > spi_1: spi@12d30000 { > + status = "okay"; > + > w25q80bw@0 { > #address-cells = <1>; > #size-cells = <1>; > @@ -214,10 +216,6 @@ > }; > }; > > - spi_2: spi@12d40000 { > - status = "disabled"; > - }; > - > hdmi { > hpd-gpio = <&gpx3 7 0>; > }; I'm a little surprised that I don't see removal of spi_0 on SMDK5250. When I apply your patch to ToT Linux I still see this in "exynos5250-smdk5250.dts": spi_0: spi@12d20000 { status = "disabled"; }; Other than that things look good to me and you can add my Reviewed-by: Reviewed-by: Doug Anderson <dianders@xxxxxxxxxxxx> -Doug -- To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html