ARM: dts: Leave Exynos5250 SPI controller disabled by default
Subsystems (2)
PATCH 1/3 ARM: dts: Leave Exynos5250 SPI controller disabled by default
From: Mark Brown <[email protected]>
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.
--- 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(-)
arch/arm/boot/dts/cros5250-common.dtsi +1 -8
@@ -286,19 +286,12 @@ }; }; - spi_0: spi at 12d20000 { - status = "disabled"; - }; - spi_1: spi at 12d30000 { + status = "okay"; samsung,spi-src-clk = <0>; num-cs = <1>; }; - spi_2: spi at 12d40000 { - status = "disabled"; - }; - hdmi { hpd-gpio = <&gpx3 7 0>; };
arch/arm/boot/dts/exynos5250-arndale.dts +0 -12
@@ -434,18 +434,6 @@ status = "okay"; }; - spi_0: spi at 12d20000 { - status = "disabled"; - }; - - spi_1: spi at 12d30000 { - status = "disabled"; - }; - - spi_2: spi at 12d40000 { - status = "disabled"; - }; - gpio_keys { compatible = "gpio-keys";
arch/arm/boot/dts/exynos5250-smdk5250.dts +2 -4
@@ -189,6 +189,8 @@ }; spi_1: spi at 12d30000 { + status = "okay"; + w25q80bw at 0 { #address-cells = <1>; #size-cells = <1>;
@@ -214,10 +216,6 @@ }; }; - spi_2: spi at 12d40000 { - status = "disabled"; - }; - hdmi { hpd-gpio = <&gpx3 7 0>; };
arch/arm/boot/dts/exynos5250.dtsi +3 -0
@@ -349,6 +349,7 @@ spi_0: spi at 12d20000 { compatible = "samsung,exynos4210-spi"; + status = "disabled"; reg = <0x12d20000 0x100>; interrupts = <0 66 0>; dmas = <&pdma0 5
@@ -364,6 +365,7 @@ spi_1: spi@12d30000 { compatible = "samsung,exynos4210-spi"; + status = "disabled"; reg = <0x12d30000 0x100>; interrupts = <0 67 0>; dmas = <&pdma1 5
@@ -379,6 +381,7 @@ spi_2: spi@12d40000 { compatible = "samsung,exynos4210-spi"; + status = "disabled"; reg = <0x12d40000 0x100>; interrupts = <0 68 0>; dmas = <&pdma0 7
Signature · 1 line
1.8.4.4
PATCH 2/3 ARM: dts: Disable I2C controllers by default on Exynos5250
From: Mark Brown <[email protected]>
Ensure that unused I2C controllers are not activated, causing problems due to inappropriate pinmuxing or similar, by marking the controllers as disabled by default and requiring boards to explicitly enable those that are in use.
--- arch/arm/boot/dts/cros5250-common.dtsi | 12 ++++++++---- arch/arm/boot/dts/exynos5250-arndale.dts | 32 ++++++++----------------------- arch/arm/boot/dts/exynos5250-smdk5250.dts | 25 +++++------------------- arch/arm/boot/dts/exynos5250.dtsi | 10 ++++++++++ 4 files changed, 31 insertions(+), 48 deletions(-)
arch/arm/boot/dts/cros5250-common.dtsi +8 -4
@@ -30,6 +30,7 @@ }; i2c at 12C60000 { + status = "okay"; samsung,i2c-sda-delay = <100>; samsung,i2c-max-bus-freq = <378000>;
@@ -173,6 +174,7 @@ }; i2c at 12C70000 { + status = "okay"; samsung,i2c-sda-delay = <100>; samsung,i2c-max-bus-freq = <378000>;
@@ -186,6 +188,7 @@ }; i2c at 12C80000 { + status = "okay"; samsung,i2c-sda-delay = <100>; samsung,i2c-max-bus-freq = <66000>;
@@ -196,30 +199,31 @@ }; i2c at 12C90000 { + status = "okay"; samsung,i2c-sda-delay = <100>; samsung,i2c-max-bus-freq = <66000>; }; i2c at 12CA0000 { + status = "okay"; samsung,i2c-sda-delay = <100>; samsung,i2c-max-bus-freq = <66000>; }; i2c at 12CB0000 { + status = "okay"; samsung,i2c-sda-delay = <100>; samsung,i2c-max-bus-freq = <66000>; }; - i2c at 12CC0000 { - status = "disabled"; - }; - i2c at 12CD0000 { + status = "okay"; samsung,i2c-sda-delay = <100>; samsung,i2c-max-bus-freq = <66000>; }; i2c at 12CE0000 { + status = "okay"; samsung,i2c-sda-delay = <100>; samsung,i2c-max-bus-freq = <378000>;
arch/arm/boot/dts/exynos5250-arndale.dts +8 -24
@@ -34,6 +34,7 @@ samsung,i2c-sda-delay = <100>; samsung,i2c-max-bus-freq = <20000>; samsung,i2c-slave-addr = <0x66>; + status = "okay"; s5m8767_pmic at 66 { compatible = "samsung,s5m8767-pmic";
@@ -319,11 +320,9 @@ }; }; - i2c at 12C70000 { - status = "disabled"; - }; - i2c at 12C80000 { + status = "okay"; + samsung,i2c-sda-delay = <100>; samsung,i2c-max-bus-freq = <66000>; samsung,i2c-slave-addr = <0x50>;
@@ -335,7 +334,10 @@ }; i2c at 12C90000 { + status = "okay"; + wm1811a at 1a { + compatible = "wlf,wm1811"; reg = <0x1a>;
@@ -353,23 +355,9 @@ }; }; - i2c at 12CA0000 { - status = "disabled"; - }; - - i2c at 12CB0000 { - status = "disabled"; - }; - - i2c at 12CC0000 { - status = "disabled"; - }; - - i2c at 12CD0000 { - status = "disabled"; - }; - i2c at 12CE0000 { + status = "okay"; + samsung,i2c-sda-delay = <100>; samsung,i2c-max-bus-freq = <66000>; samsung,i2c-slave-addr = <0x38>;
@@ -380,10 +368,6 @@ }; }; - i2c at 121D0000 { - status = "disabled"; - }; - dwmmc_0: dwmmc0 at 12200000 { num-slots = <1>; supports-highspeed;
arch/arm/boot/dts/exynos5250-smdk5250.dts +5 -20
@@ -30,6 +30,7 @@ i2c at 12C60000 { samsung,i2c-sda-delay = <100>; samsung,i2c-max-bus-freq = <20000>; + status = "okay"; eeprom at 50 { compatible = "samsung,s524ad0xd1";
@@ -64,6 +65,7 @@ i2c at 12C70000 { samsung,i2c-sda-delay = <100>; samsung,i2c-max-bus-freq = <20000>; + status = "okay"; eeprom at 51 { compatible = "samsung,s524ad0xd1";
@@ -89,6 +91,7 @@ samsung,i2c-sda-delay = <100>; samsung,i2c-max-bus-freq = <40000>; samsung,i2c-slave-addr = <0x38>; + status = "okay"; sata-phy { compatible = "samsung,sata-phy";
@@ -103,6 +106,7 @@ i2c at 12C80000 { samsung,i2c-sda-delay = <100>; samsung,i2c-max-bus-freq = <66000>; + status = "okay"; hdmiddc at 50 { compatible = "samsung,exynos4210-hdmiddc";
@@ -110,29 +114,10 @@ }; }; - i2c at 12C90000 { - status = "disabled"; - }; - - i2c at 12CA0000 { - status = "disabled"; - }; - - i2c at 12CB0000 { - status = "disabled"; - }; - - i2c at 12CC0000 { - status = "disabled"; - }; - - i2c at 12CD0000 { - status = "disabled"; - }; - i2c at 12CE0000 { samsung,i2c-sda-delay = <100>; samsung,i2c-max-bus-freq = <66000>; + status = "okay"; hdmiphy at 38 { compatible = "samsung,exynos4212-hdmiphy";
arch/arm/boot/dts/exynos5250.dtsi +10 -0
@@ -242,6 +242,7 @@ clock-names = "i2c"; pinctrl-names = "default"; pinctrl-0 = <&i2c0_bus>; + status = "disabled"; }; i2c_1: i2c at 12C70000 {
@@ -254,6 +255,7 @@ clock-names = "i2c"; pinctrl-names = "default"; pinctrl-0 = <&i2c1_bus>; + status = "disabled"; }; i2c_2: i2c at 12C80000 {
@@ -266,6 +268,7 @@ clock-names = "i2c"; pinctrl-names = "default"; pinctrl-0 = <&i2c2_bus>; + status = "disabled"; }; i2c_3: i2c at 12C90000 {
@@ -278,6 +281,7 @@ clock-names = "i2c"; pinctrl-names = "default"; pinctrl-0 = <&i2c3_bus>; + status = "disabled"; }; i2c_4: i2c at 12CA0000 {
@@ -290,6 +294,7 @@ clock-names = "i2c"; pinctrl-names = "default"; pinctrl-0 = <&i2c4_bus>; + status = "disabled"; }; i2c_5: i2c at 12CB0000 {
@@ -302,6 +307,7 @@ clock-names = "i2c"; pinctrl-names = "default"; pinctrl-0 = <&i2c5_bus>; + status = "disabled"; }; i2c_6: i2c at 12CC0000 {
@@ -314,6 +320,7 @@ clock-names = "i2c"; pinctrl-names = "default"; pinctrl-0 = <&i2c6_bus>; + status = "disabled"; }; i2c_7: i2c at 12CD0000 {
@@ -326,6 +333,7 @@ clock-names = "i2c"; pinctrl-names = "default"; pinctrl-0 = <&i2c7_bus>; + status = "disabled"; }; i2c_8: i2c at 12CE0000 {
@@ -336,6 +344,7 @@ #size-cells = <0>; clocks = <&clock 302>; clock-names = "i2c"; + status = "disabled"; }; i2c at 121D0000 {
@@ -345,6 +354,7 @@ #size-cells = <0>; clocks = <&clock 288>; clock-names = "i2c"; + status = "disabled"; }; spi_0: spi at 12d20000 {
Signature · 1 line
1.8.4.4
PATCH 3/3 ARM: dts: Rename Exynos5250 ChromeOS common file to have exynos prefix
In reply to Mark BrownFrom: Mark Brown <[email protected]>
Make it easier to notice the common file for ChromeOS devices based on the Exynos5250 by giving it the exynos5250 prefix that the boards have.
---
arch/arm/boot/dts/{cros5250-common.dtsi => exynos5250-cros-common.dtsi} | 0
arch/arm/boot/dts/exynos5250-snow.dts | 2 +-
2 files changed, 1 insertion(+), 1 deletion(-)
rename arch/arm/boot/dts/{cros5250-common.dtsi => exynos5250-cros-common.dtsi} (100%)arch/arm/boot/dts/exynos5250-cros-common.dtsi renamed from arch/arm/boot/dts/cros5250-common.dtsi +0 -0
arch/arm/boot/dts/exynos5250-snow.dts +1 -1
@@ -10,7 +10,7 @@ /dts-v1/; #include "exynos5250.dtsi" -#include "cros5250-common.dtsi" +#include "exynos5250-cros-common.dtsi" / { model = "Google Snow";
Signature · 1 line
1.8.4.4
PATCH 3/3 ARM: dts: Rename Exynos5250 ChromeOS common file to have exynos prefix
Quoted 22 lines · Mark Brown
From: Mark Brown<[email protected]>
Make it easier to notice the common file for ChromeOS devices based on the Exynos5250 by giving it the exynos5250 prefix that the boards have.
Signed-off-by Mark Brown<[email protected]>Acked-by Tomasz Figa<[email protected]>--- arch/arm/boot/dts/{cros5250-common.dtsi => exynos5250-cros-common.dtsi} | 0 arch/arm/boot/dts/exynos5250-snow.dts | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-)rename
arch/arm/boot/dts/{cros5250-common.dtsi=>exynos5250-cros-common.dtsi} (100%)arch/arm/boot/dts/exynos5250-cros-common.dtsi renamed from arch/arm/boot/dts/cros5250-common.dtsi +0
-0arch/arm/boot/dts/exynos5250-snow.dts +0
-0
arch/arm/boot/dts/exynos5250-snow.dts line 16
Quoted 8 lines
arch/arm/boot/dts/exynos5250-snow.dts +1
-1@@ -10,7 +10,7 @@ /dts-v1/; #include "exynos5250.dtsi" -#include "cros5250-common.dtsi" +#include "exynos5250-cros-common.dtsi" / { model = "Google Snow";
+ Doug and Olof.
Doug and Olof,
I need your ack on this. How do you think?
Thanks,
Kukjin
PATCH 3/3 ARM: dts: Rename Exynos5250 ChromeOS common file to have exynos prefix
Quoted 33 lines · Kukjin Kim
Quoted 32 lines · Mark Brown
From: Mark Brown<[email protected]>
Make it easier to notice the common file for ChromeOS devices based on the Exynos5250 by giving it the exynos5250 prefix that the boards have.
Signed-off-by Mark Brown<[email protected]>Acked-by Tomasz Figa<[email protected]>---
arch/arm/boot/dts/{cros5250-common.dtsi=>exynos5250-cros-common.dtsi} | 0arch/arm/boot/dts/exynos5250-snow.dts| 2 +-2 files changed, 1 insertion(+), 1 deletion(-)rename
arch/arm/boot/dts/{cros5250-common.dtsi=>exynos5250-cros-common.dtsi} (100%)arch/arm/boot/dts/exynos5250-cros-common.dtsi renamed from arch/arm/boot/dts/cros5250-common.dtsi +0
-0arch/arm/boot/dts/exynos5250-snow.dts +1
-1@@ -10,7 +10,7 @@ /dts-v1/; #include "exynos5250.dtsi" -#include "cros5250-common.dtsi" +#include "exynos5250-cros-common.dtsi"
Quoted 5 lines
arch/arm/boot/dts/exynos5250-snow.dts line 16
Quoted 2 lines
arch/arm/boot/dts/exynos5250-snow.dts +0
-0/ { model = "Google Snow";+ Doug and Olof.
Oops, I missed. Again +
Quoted 4 lines
Doug and Olof,
I need your ack on this. How do you think?
One more, I've applied Mark's 1/3 and 2/3 patches.
Thanks,
Kukjin
PATCH 3/3 ARM: dts: Rename Exynos5250 ChromeOS common file to have exynos prefix
Kukjin,
Quoted 11 lines · Kukjin Kim
Quoted 10 lines · Kukjin Kim
Quoted 8 lines · Mark Brown
From: Mark Brown<[email protected]>
Make it easier to notice the common file for ChromeOS devices based on the Exynos5250 by giving it the exynos5250 prefix that the boards have.
Signed-off-by Mark Brown<[email protected]>Acked-by Tomasz Figa<[email protected]>
The rename makes a lot of sense to me.
PATCH 3/3 ARM: dts: Rename Exynos5250 ChromeOS common file to have exynos prefix
Quoted 12 lines · Doug Anderson
Kukjin,
Quoted 9 lines · Kukjin Kim
Quoted 8 lines · Kukjin Kim
Quoted 6 lines · Mark Brown
From: Mark Brown<[email protected]>
Make it easier to notice the common file for ChromeOS devices based on the Exynos5250 by giving it the exynos5250 prefix that the boards have.
Quoted 7 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Signed-off-by Mark Brown<[email protected]>Acked-by Tomasz Figa<[email protected]>The rename makes a lot of sense to me.
Reviewed-by Doug Anderson<[email protected]>
I've applied.
Thanks and Merry Christmas :-)
- Kukjin
PATCH 1/3 ARM: dts: Leave Exynos5250 SPI controller disabled by default
In reply to Mark BrownHi Kukjin,
Quoted 7 lines · On Monday 25 of November 2013 12:15:08 Mark Brown wrote:
From: Mark Brown <[email protected]>
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.
Quoted 8 lines
Signed-off-by Mark Brown <[email protected]>Acked-by Tomasz Figa <[email protected]>--- 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(-)
Seems like you have missed this series. Could you apply it?
Best regards,
Tomasz
PATCH 1/3 ARM: dts: Leave Exynos5250 SPI controller disabled by default
Quoted 2 lines · Tomasz Figa
Hi Kukjin,
Hi,
Quoted 17 lines · On Monday 25 of November 2013 12:15:08 Mark Brown wrote:
Quoted 7 lines
From: Mark Brown<[email protected]>
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.
Quoted 8 lines
Signed-off-by Mark Brown<[email protected]>Acked-by Tomasz Figa<[email protected]>--- 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(-)
Quoted 2 lines
Seems like you have missed this series. Could you apply it?
Yeah, thanks for your gentle reminder.
+ Doug and Olof
BTW, Doug and Olof, are you OK with changing the name of cros5250-common DT file? Basically, I agree with Mark's patch.
- Kukjin
PATCH 1/3 ARM: dts: Leave Exynos5250 SPI controller disabled by default
Hi,
Quoted 29 lines · Kukjin Kim
Quoted 3 lines · Tomasz Figa
Hi Kukjin,
Hi,
Quoted 22 lines · On Monday 25 of November 2013 12:15:08 Mark Brown wrote:
Quoted 19 lines
From: Mark Brown<[email protected]>
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<[email protected]>Acked-by Tomasz Figa<[email protected]>--- 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(-)
Quoted 8 lines
Quoted 2 lines
Seems like you have missed this series. Could you apply it?
Yeah, thanks for your gentle reminder.
+ Doug and Olof
BTW, Doug and Olof, are you OK with changing the name of cros5250-common DT file? Basically, I agree with Mark's patch.
I don't see anything that's changing a name, so perhaps I'm confused or missing something. Mark's patch looks good to me so I'll add a reviewed by...
-Doug
PATCH 1/3 ARM: dts: Leave Exynos5250 SPI controller disabled by default
In reply to Mark BrownHi,
Quoted 78 lines · Mark Brown
From: Mark Brown <[email protected]>
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 <[email protected]>Acked-by Tomasz Figa <[email protected]>--- 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(-)arch/arm/boot/dts/cros5250-common.dtsi +1
-8@@ -286,19 +286,12 @@ }; }; - spi_0: spi at 12d20000 { - status = "disabled"; - }; - spi_1: spi at 12d30000 { + status = "okay"; samsung,spi-src-clk = <0>; num-cs = <1>; }; - spi_2: spi at 12d40000 { - status = "disabled"; - }; - hdmi { hpd-gpio = <&gpx3 7 0>; };arch/arm/boot/dts/exynos5250-arndale.dts +0
-12@@ -434,18 +434,6 @@ status = "okay"; }; - spi_0: spi at 12d20000 { - status = "disabled"; - }; - - spi_1: spi at 12d30000 { - status = "disabled"; - }; - - spi_2: spi at 12d40000 { - status = "disabled"; - }; - gpio_keys { compatible = "gpio-keys";arch/arm/boot/dts/exynos5250-smdk5250.dts +2
-0@@ -189,6 +189,8 @@ }; spi_1: spi at 12d30000 { + status = "okay"; + w25q80bw at 0 { #address-cells = <1>; #size-cells = <1>;
arch/arm/boot/dts/exynos5250-smdk5250.dts line 221
Quoted 10 lines
arch/arm/boot/dts/exynos5250-smdk5250.dts +0
-4@@ -214,10 +216,6 @@ }; }; - spi_2: spi at 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 at 12d20000 {
status = "disabled";
};Other than that things look good to me and you can add my Reviewed-by:
-Doug
PATCH 1/3 ARM: dts: Leave Exynos5250 SPI controller disabled by default
Quoted 7 lines · Doug Anderson
I'm a little surprised that I don't see removal of
spi_0on SMDK5250. When I apply your patch to ToT Linux I still see this in "exynos5250-smdk5250.dts":spi_0: spi at 12d20000 { status = "disabled"; };
I suspect that one went AWOL during rebasing - these have been kicking
around since September. Resent with that added.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20131210/88bbd7a4/attachment.sig>