Commit fae93f7c authored by Mark Brown's avatar Mark Brown Committed by Kukjin Kim

ARM: dts: Leave Exynos5250 SPI controller disabled by default

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: default avatarMark Brown <broonie@linaro.org>
Acked-by: default avatarTomasz Figa <t.figa@samsung.com>
Reviewed-by: default avatarDoug Anderson <dianders@chromium.org>
Signed-off-by: default avatarKukjin Kim <kgene.kim@samsung.com>
parent 24b714f8
...@@ -279,19 +279,12 @@ slot@0 { ...@@ -279,19 +279,12 @@ slot@0 {
}; };
}; };
spi_0: spi@12d20000 {
status = "disabled";
};
spi_1: spi@12d30000 { spi_1: spi@12d30000 {
status = "okay";
samsung,spi-src-clk = <0>; samsung,spi-src-clk = <0>;
num-cs = <1>; num-cs = <1>;
}; };
spi_2: spi@12d40000 {
status = "disabled";
};
hdmi { hdmi {
hpd-gpio = <&gpx3 7 0>; hpd-gpio = <&gpx3 7 0>;
}; };
......
...@@ -428,18 +428,6 @@ i2s0: i2s@03830000 { ...@@ -428,18 +428,6 @@ i2s0: i2s@03830000 {
status = "okay"; status = "okay";
}; };
spi_0: spi@12d20000 {
status = "disabled";
};
spi_1: spi@12d30000 {
status = "disabled";
};
spi_2: spi@12d40000 {
status = "disabled";
};
gpio_keys { gpio_keys {
compatible = "gpio-keys"; compatible = "gpio-keys";
......
...@@ -184,6 +184,8 @@ spi_0: spi@12d20000 { ...@@ -184,6 +184,8 @@ spi_0: spi@12d20000 {
}; };
spi_1: spi@12d30000 { spi_1: spi@12d30000 {
status = "okay";
w25q80bw@0 { w25q80bw@0 {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
...@@ -209,10 +211,6 @@ partition@40000 { ...@@ -209,10 +211,6 @@ partition@40000 {
}; };
}; };
spi_2: spi@12d40000 {
status = "disabled";
};
hdmi { hdmi {
hpd-gpio = <&gpx3 7 0>; hpd-gpio = <&gpx3 7 0>;
}; };
......
...@@ -351,6 +351,7 @@ i2c@121D0000 { ...@@ -351,6 +351,7 @@ i2c@121D0000 {
spi_0: spi@12d20000 { spi_0: spi@12d20000 {
compatible = "samsung,exynos4210-spi"; compatible = "samsung,exynos4210-spi";
status = "disabled";
reg = <0x12d20000 0x100>; reg = <0x12d20000 0x100>;
interrupts = <0 66 0>; interrupts = <0 66 0>;
dmas = <&pdma0 5 dmas = <&pdma0 5
...@@ -366,6 +367,7 @@ spi_0: spi@12d20000 { ...@@ -366,6 +367,7 @@ spi_0: spi@12d20000 {
spi_1: spi@12d30000 { spi_1: spi@12d30000 {
compatible = "samsung,exynos4210-spi"; compatible = "samsung,exynos4210-spi";
status = "disabled";
reg = <0x12d30000 0x100>; reg = <0x12d30000 0x100>;
interrupts = <0 67 0>; interrupts = <0 67 0>;
dmas = <&pdma1 5 dmas = <&pdma1 5
...@@ -381,6 +383,7 @@ spi_1: spi@12d30000 { ...@@ -381,6 +383,7 @@ spi_1: spi@12d30000 {
spi_2: spi@12d40000 { spi_2: spi@12d40000 {
compatible = "samsung,exynos4210-spi"; compatible = "samsung,exynos4210-spi";
status = "disabled";
reg = <0x12d40000 0x100>; reg = <0x12d40000 0x100>;
interrupts = <0 68 0>; interrupts = <0 68 0>;
dmas = <&pdma0 7 dmas = <&pdma0 7
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment