* [PATCH 1/3] ARM: dts: Leave Exynos5250 SPI controller disabled by default
@ 2013-11-25 12:15 Mark Brown
2013-11-25 12:15 ` [PATCH 2/3] ARM: dts: Disable I2C controllers by default on Exynos5250 Mark Brown
` (3 more replies)
0 siblings, 4 replies; 13+ messages in thread
From: Mark Brown @ 2013-11-25 12:15 UTC (permalink / raw)
To: linux-arm-kernel
From: Mark Brown <broonie@linaro.org>
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@linaro.org>
Acked-by: Tomasz Figa <t.figa@samsung.com>
---
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 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>;
};
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 at 12d20000 {
- status = "disabled";
- };
-
- spi_1: spi at 12d30000 {
- status = "disabled";
- };
-
- spi_2: spi at 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 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>;
};
diff --git a/arch/arm/boot/dts/exynos5250.dtsi b/arch/arm/boot/dts/exynos5250.dtsi
index 9db5047812f3..9b58532854e1 100644
--- a/arch/arm/boot/dts/exynos5250.dtsi
+++ b/arch/arm/boot/dts/exynos5250.dtsi
@@ -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
--
1.8.4.4
^ permalink raw reply related [flat|nested] 13+ messages in thread* [PATCH 2/3] ARM: dts: Disable I2C controllers by default on Exynos5250 2013-11-25 12:15 [PATCH 1/3] ARM: dts: Leave Exynos5250 SPI controller disabled by default Mark Brown @ 2013-11-25 12:15 ` Mark Brown 2013-11-25 12:15 ` [PATCH 3/3] ARM: dts: Rename Exynos5250 ChromeOS common file to have exynos prefix Mark Brown ` (2 subsequent siblings) 3 siblings, 0 replies; 13+ messages in thread From: Mark Brown @ 2013-11-25 12:15 UTC (permalink / raw) To: linux-arm-kernel From: Mark Brown <broonie@linaro.org> 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. Signed-off-by: Mark Brown <broonie@linaro.org> Acked-by: Tomasz Figa <t.figa@samsung.com> --- 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(-) diff --git a/arch/arm/boot/dts/cros5250-common.dtsi b/arch/arm/boot/dts/cros5250-common.dtsi index 0fcca2930c61..7dbba0859a1d 100644 --- a/arch/arm/boot/dts/cros5250-common.dtsi +++ b/arch/arm/boot/dts/cros5250-common.dtsi @@ -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>; diff --git a/arch/arm/boot/dts/exynos5250-arndale.dts b/arch/arm/boot/dts/exynos5250-arndale.dts index 0385b58116ec..6fbe89fd7d41 100644 --- a/arch/arm/boot/dts/exynos5250-arndale.dts +++ b/arch/arm/boot/dts/exynos5250-arndale.dts @@ -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; diff --git a/arch/arm/boot/dts/exynos5250-smdk5250.dts b/arch/arm/boot/dts/exynos5250-smdk5250.dts index 5d0395e07eee..a17b1a0a8abc 100644 --- a/arch/arm/boot/dts/exynos5250-smdk5250.dts +++ b/arch/arm/boot/dts/exynos5250-smdk5250.dts @@ -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"; diff --git a/arch/arm/boot/dts/exynos5250.dtsi b/arch/arm/boot/dts/exynos5250.dtsi index 9b58532854e1..3a4454620f6b 100644 --- a/arch/arm/boot/dts/exynos5250.dtsi +++ b/arch/arm/boot/dts/exynos5250.dtsi @@ -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 { -- 1.8.4.4 ^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH 3/3] ARM: dts: Rename Exynos5250 ChromeOS common file to have exynos prefix 2013-11-25 12:15 [PATCH 1/3] ARM: dts: Leave Exynos5250 SPI controller disabled by default Mark Brown 2013-11-25 12:15 ` [PATCH 2/3] ARM: dts: Disable I2C controllers by default on Exynos5250 Mark Brown @ 2013-11-25 12:15 ` Mark Brown 2013-12-20 23:09 ` Kukjin Kim 2013-12-09 15:23 ` [PATCH 1/3] ARM: dts: Leave Exynos5250 SPI controller disabled by default Tomasz Figa 2013-12-10 0:57 ` Doug Anderson 3 siblings, 1 reply; 13+ messages in thread From: Mark Brown @ 2013-11-25 12:15 UTC (permalink / raw) To: linux-arm-kernel From: Mark Brown <broonie@linaro.org> 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 <broonie@linaro.org> Acked-by: Tomasz Figa <t.figa@samsung.com> --- 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%) diff --git a/arch/arm/boot/dts/cros5250-common.dtsi b/arch/arm/boot/dts/exynos5250-cros-common.dtsi similarity index 100% rename from arch/arm/boot/dts/cros5250-common.dtsi rename to arch/arm/boot/dts/exynos5250-cros-common.dtsi diff --git a/arch/arm/boot/dts/exynos5250-snow.dts b/arch/arm/boot/dts/exynos5250-snow.dts index fd711e245e8d..7e2669c6f7f5 100644 --- a/arch/arm/boot/dts/exynos5250-snow.dts +++ b/arch/arm/boot/dts/exynos5250-snow.dts @@ -10,7 +10,7 @@ /dts-v1/; #include "exynos5250.dtsi" -#include "cros5250-common.dtsi" +#include "exynos5250-cros-common.dtsi" / { model = "Google Snow"; -- 1.8.4.4 ^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH 3/3] ARM: dts: Rename Exynos5250 ChromeOS common file to have exynos prefix 2013-11-25 12:15 ` [PATCH 3/3] ARM: dts: Rename Exynos5250 ChromeOS common file to have exynos prefix Mark Brown @ 2013-12-20 23:09 ` Kukjin Kim 2013-12-20 23:37 ` Kukjin Kim 0 siblings, 1 reply; 13+ messages in thread From: Kukjin Kim @ 2013-12-20 23:09 UTC (permalink / raw) To: linux-arm-kernel On 11/25/13 21:15, Mark Brown wrote: > From: Mark Brown<broonie@linaro.org> > > 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<broonie@linaro.org> > Acked-by: Tomasz Figa<t.figa@samsung.com> > --- > 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%) > > diff --git a/arch/arm/boot/dts/cros5250-common.dtsi b/arch/arm/boot/dts/exynos5250-cros-common.dtsi > similarity index 100% > rename from arch/arm/boot/dts/cros5250-common.dtsi > rename to arch/arm/boot/dts/exynos5250-cros-common.dtsi > diff --git a/arch/arm/boot/dts/exynos5250-snow.dts b/arch/arm/boot/dts/exynos5250-snow.dts > index fd711e245e8d..7e2669c6f7f5 100644 > --- a/arch/arm/boot/dts/exynos5250-snow.dts > +++ b/arch/arm/boot/dts/exynos5250-snow.dts > @@ -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 ^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH 3/3] ARM: dts: Rename Exynos5250 ChromeOS common file to have exynos prefix 2013-12-20 23:09 ` Kukjin Kim @ 2013-12-20 23:37 ` Kukjin Kim 2013-12-21 0:57 ` Doug Anderson 0 siblings, 1 reply; 13+ messages in thread From: Kukjin Kim @ 2013-12-20 23:37 UTC (permalink / raw) To: linux-arm-kernel On 12/21/13 08:09, Kukjin Kim wrote: > On 11/25/13 21:15, Mark Brown wrote: >> From: Mark Brown<broonie@linaro.org> >> >> 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<broonie@linaro.org> >> Acked-by: Tomasz Figa<t.figa@samsung.com> >> --- >> 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%) >> >> diff --git a/arch/arm/boot/dts/cros5250-common.dtsi >> b/arch/arm/boot/dts/exynos5250-cros-common.dtsi >> similarity index 100% >> rename from arch/arm/boot/dts/cros5250-common.dtsi >> rename to arch/arm/boot/dts/exynos5250-cros-common.dtsi >> diff --git a/arch/arm/boot/dts/exynos5250-snow.dts >> b/arch/arm/boot/dts/exynos5250-snow.dts >> index fd711e245e8d..7e2669c6f7f5 100644 >> --- a/arch/arm/boot/dts/exynos5250-snow.dts >> +++ b/arch/arm/boot/dts/exynos5250-snow.dts >> @@ -10,7 +10,7 @@ >> >> /dts-v1/; >> #include "exynos5250.dtsi" >> -#include "cros5250-common.dtsi" >> +#include "exynos5250-cros-common.dtsi" >> >> / { >> model = "Google Snow"; > > + Doug and Olof. > Oops, I missed. Again + > 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 ^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH 3/3] ARM: dts: Rename Exynos5250 ChromeOS common file to have exynos prefix 2013-12-20 23:37 ` Kukjin Kim @ 2013-12-21 0:57 ` Doug Anderson 2013-12-21 1:11 ` Kukjin Kim 0 siblings, 1 reply; 13+ messages in thread From: Doug Anderson @ 2013-12-21 0:57 UTC (permalink / raw) To: linux-arm-kernel Kukjin, On Fri, Dec 20, 2013 at 3:37 PM, Kukjin Kim <kgene.kim@samsung.com> wrote: > On 12/21/13 08:09, Kukjin Kim wrote: >> >> On 11/25/13 21:15, Mark Brown wrote: >>> >>> From: Mark Brown<broonie@linaro.org> >>> >>> 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<broonie@linaro.org> >>> Acked-by: Tomasz Figa<t.figa@samsung.com> The rename makes a lot of sense to me. Reviewed-by: Doug Anderson <dianders@chromium.org> ^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH 3/3] ARM: dts: Rename Exynos5250 ChromeOS common file to have exynos prefix 2013-12-21 0:57 ` Doug Anderson @ 2013-12-21 1:11 ` Kukjin Kim 0 siblings, 0 replies; 13+ messages in thread From: Kukjin Kim @ 2013-12-21 1:11 UTC (permalink / raw) To: linux-arm-kernel On 12/21/13 09:57, Doug Anderson wrote: > Kukjin, > > On Fri, Dec 20, 2013 at 3:37 PM, Kukjin Kim<kgene.kim@samsung.com> wrote: >> On 12/21/13 08:09, Kukjin Kim wrote: >>> >>> On 11/25/13 21:15, Mark Brown wrote: >>>> >>>> From: Mark Brown<broonie@linaro.org> >>>> >>>> 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<broonie@linaro.org> >>>> Acked-by: Tomasz Figa<t.figa@samsung.com> > > The rename makes a lot of sense to me. > > Reviewed-by: Doug Anderson<dianders@chromium.org> > I've applied. Thanks and Merry Christmas :-) - Kukjin ^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH 1/3] ARM: dts: Leave Exynos5250 SPI controller disabled by default 2013-11-25 12:15 [PATCH 1/3] ARM: dts: Leave Exynos5250 SPI controller disabled by default Mark Brown 2013-11-25 12:15 ` [PATCH 2/3] ARM: dts: Disable I2C controllers by default on Exynos5250 Mark Brown 2013-11-25 12:15 ` [PATCH 3/3] ARM: dts: Rename Exynos5250 ChromeOS common file to have exynos prefix Mark Brown @ 2013-12-09 15:23 ` Tomasz Figa 2013-12-09 21:07 ` Kukjin Kim 2013-12-10 0:57 ` Doug Anderson 3 siblings, 1 reply; 13+ messages in thread From: Tomasz Figa @ 2013-12-09 15:23 UTC (permalink / raw) To: linux-arm-kernel Hi Kukjin, On Monday 25 of November 2013 12:15:08 Mark Brown wrote: > From: Mark Brown <broonie@linaro.org> > > 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@linaro.org> > Acked-by: Tomasz Figa <t.figa@samsung.com> > --- > 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 ^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH 1/3] ARM: dts: Leave Exynos5250 SPI controller disabled by default 2013-12-09 15:23 ` [PATCH 1/3] ARM: dts: Leave Exynos5250 SPI controller disabled by default Tomasz Figa @ 2013-12-09 21:07 ` Kukjin Kim 2013-12-10 0:48 ` Doug Anderson 0 siblings, 1 reply; 13+ messages in thread From: Kukjin Kim @ 2013-12-09 21:07 UTC (permalink / raw) To: linux-arm-kernel On 12/10/13 00:23, Tomasz Figa wrote: > Hi Kukjin, > Hi, > On Monday 25 of November 2013 12:15:08 Mark Brown wrote: >> From: Mark Brown<broonie@linaro.org> >> >> 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@linaro.org> >> Acked-by: Tomasz Figa<t.figa@samsung.com> >> --- >> 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? > 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 ^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH 1/3] ARM: dts: Leave Exynos5250 SPI controller disabled by default 2013-12-09 21:07 ` Kukjin Kim @ 2013-12-10 0:48 ` Doug Anderson 0 siblings, 0 replies; 13+ messages in thread From: Doug Anderson @ 2013-12-10 0:48 UTC (permalink / raw) To: linux-arm-kernel Hi, On Mon, Dec 9, 2013 at 1:07 PM, Kukjin Kim <kgene.kim@samsung.com> wrote: > On 12/10/13 00:23, Tomasz Figa wrote: >> >> Hi Kukjin, >> > Hi, > > >> On Monday 25 of November 2013 12:15:08 Mark Brown wrote: >>> >>> From: Mark Brown<broonie@linaro.org> >>> >>> 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@linaro.org> >>> Acked-by: Tomasz Figa<t.figa@samsung.com> >>> --- >>> 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? >> > 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 ^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH 1/3] ARM: dts: Leave Exynos5250 SPI controller disabled by default 2013-11-25 12:15 [PATCH 1/3] ARM: dts: Leave Exynos5250 SPI controller disabled by default Mark Brown ` (2 preceding siblings ...) 2013-12-09 15:23 ` [PATCH 1/3] ARM: dts: Leave Exynos5250 SPI controller disabled by default Tomasz Figa @ 2013-12-10 0:57 ` Doug Anderson 2013-12-10 11:13 ` Mark Brown 3 siblings, 1 reply; 13+ messages in thread From: Doug Anderson @ 2013-12-10 0:57 UTC (permalink / raw) To: linux-arm-kernel Hi, On Mon, Nov 25, 2013 at 4:15 AM, Mark Brown <broonie@kernel.org> wrote: > From: Mark Brown <broonie@linaro.org> > > 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@linaro.org> > Acked-by: Tomasz Figa <t.figa@samsung.com> > --- > 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 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>; > }; > 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 at 12d20000 { > - status = "disabled"; > - }; > - > - spi_1: spi at 12d30000 { > - status = "disabled"; > - }; > - > - spi_2: spi at 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 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>; > }; 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: Reviewed-by: Doug Anderson <dianders@chromium.org> -Doug ^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH 1/3] ARM: dts: Leave Exynos5250 SPI controller disabled by default 2013-12-10 0:57 ` Doug Anderson @ 2013-12-10 11:13 ` Mark Brown 0 siblings, 0 replies; 13+ messages in thread From: Mark Brown @ 2013-12-10 11:13 UTC (permalink / raw) To: linux-arm-kernel On Mon, Dec 09, 2013 at 04:57:01PM -0800, Doug Anderson wrote: > 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"; > }; 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> ^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH 1/3] ARM: dts: Leave Exynos5250 SPI controller disabled by default @ 2013-12-10 11:07 Mark Brown 2013-12-10 11:07 ` [PATCH 3/3] ARM: dts: Rename Exynos5250 ChromeOS common file to have exynos prefix Mark Brown 0 siblings, 1 reply; 13+ messages in thread From: Mark Brown @ 2013-12-10 11:07 UTC (permalink / raw) To: linux-arm-kernel From: Mark Brown <broonie@linaro.org> 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@linaro.org> Acked-by: Tomasz Figa <t.figa@samsung.com> Reviewed-by: Doug Anderson <dianders@chromium.org> --- arch/arm/boot/dts/cros5250-common.dtsi | 9 +-------- arch/arm/boot/dts/exynos5250-arndale.dts | 12 ------------ arch/arm/boot/dts/exynos5250-smdk5250.dts | 10 ++-------- arch/arm/boot/dts/exynos5250.dtsi | 3 +++ 4 files changed, 6 insertions(+), 28 deletions(-) diff --git a/arch/arm/boot/dts/cros5250-common.dtsi b/arch/arm/boot/dts/cros5250-common.dtsi index 42cef0a8ce95..d32ec0fb7f39 100644 --- a/arch/arm/boot/dts/cros5250-common.dtsi +++ b/arch/arm/boot/dts/cros5250-common.dtsi @@ -298,19 +298,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>; }; diff --git a/arch/arm/boot/dts/exynos5250-arndale.dts b/arch/arm/boot/dts/exynos5250-arndale.dts index b77a37ec81c2..de9508b100d9 100644 --- a/arch/arm/boot/dts/exynos5250-arndale.dts +++ b/arch/arm/boot/dts/exynos5250-arndale.dts @@ -426,18 +426,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"; diff --git a/arch/arm/boot/dts/exynos5250-smdk5250.dts b/arch/arm/boot/dts/exynos5250-smdk5250.dts index 13746dfb20aa..87b55f0edda4 100644 --- a/arch/arm/boot/dts/exynos5250-smdk5250.dts +++ b/arch/arm/boot/dts/exynos5250-smdk5250.dts @@ -176,11 +176,9 @@ }; }; - spi_0: spi at 12d20000 { - status = "disabled"; - }; - spi_1: spi at 12d30000 { + status = "okay"; + w25q80bw at 0 { #address-cells = <1>; #size-cells = <1>; @@ -206,10 +204,6 @@ }; }; - spi_2: spi at 12d40000 { - status = "disabled"; - }; - hdmi { hpd-gpio = <&gpx3 7 0>; }; diff --git a/arch/arm/boot/dts/exynos5250.dtsi b/arch/arm/boot/dts/exynos5250.dtsi index b98ffc3a5fe2..9831b5650a05 100644 --- a/arch/arm/boot/dts/exynos5250.dtsi +++ b/arch/arm/boot/dts/exynos5250.dtsi @@ -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 -- 1.8.5.1 ^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH 3/3] ARM: dts: Rename Exynos5250 ChromeOS common file to have exynos prefix 2013-12-10 11:07 Mark Brown @ 2013-12-10 11:07 ` Mark Brown 0 siblings, 0 replies; 13+ messages in thread From: Mark Brown @ 2013-12-10 11:07 UTC (permalink / raw) To: linux-arm-kernel From: Mark Brown <broonie@linaro.org> 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 <broonie@linaro.org> Acked-by: Tomasz Figa <t.figa@samsung.com> Reviewed-by: Doug Anderson <dianders@chromium.org> --- arch/arm/boot/dts/cros5250-common.dtsi | 325 -------------------------- arch/arm/boot/dts/exynos5250-cros-common.dtsi | 325 ++++++++++++++++++++++++++ arch/arm/boot/dts/exynos5250-snow.dts | 2 +- 3 files changed, 326 insertions(+), 326 deletions(-) delete mode 100644 arch/arm/boot/dts/cros5250-common.dtsi create mode 100644 arch/arm/boot/dts/exynos5250-cros-common.dtsi diff --git a/arch/arm/boot/dts/cros5250-common.dtsi b/arch/arm/boot/dts/cros5250-common.dtsi deleted file mode 100644 index 2fed9acd28da..000000000000 --- a/arch/arm/boot/dts/cros5250-common.dtsi +++ /dev/null @@ -1,325 +0,0 @@ -/* - * Common device tree include for all Exynos 5250 boards based off of Daisy. - * - * Copyright (c) 2012 Google, Inc - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. -*/ - -/ { - aliases { - }; - - memory { - reg = <0x40000000 0x80000000>; - }; - - chosen { - }; - - pinctrl at 11400000 { - /* - * Disabled pullups since external part has its own pullups and - * double-pulling gets us out of spec in some cases. - */ - i2c2_bus: i2c2-bus { - samsung,pin-pud = <0>; - }; - - max77686_irq: max77686-irq { - samsung,pins = "gpx3-2"; - samsung,pin-function = <0>; - samsung,pin-pud = <0>; - samsung,pin-drv = <0>; - }; - }; - - i2c at 12C60000 { - status = "okay"; - samsung,i2c-sda-delay = <100>; - samsung,i2c-max-bus-freq = <378000>; - - max77686 at 09 { - compatible = "maxim,max77686"; - interrupt-parent = <&gpx3>; - interrupts = <2 0>; - pinctrl-names = "default"; - pinctrl-0 = <&max77686_irq>; - wakeup-source; - reg = <0x09>; - - voltage-regulators { - ldo1_reg: LDO1 { - regulator-name = "P1.0V_LDO_OUT1"; - regulator-min-microvolt = <1000000>; - regulator-max-microvolt = <1000000>; - regulator-always-on; - }; - - ldo2_reg: LDO2 { - regulator-name = "P1.8V_LDO_OUT2"; - regulator-min-microvolt = <1800000>; - regulator-max-microvolt = <1800000>; - regulator-always-on; - }; - - ldo3_reg: LDO3 { - regulator-name = "P1.8V_LDO_OUT3"; - regulator-min-microvolt = <1800000>; - regulator-max-microvolt = <1800000>; - regulator-always-on; - }; - - ldo7_reg: LDO7 { - regulator-name = "P1.1V_LDO_OUT7"; - regulator-min-microvolt = <1100000>; - regulator-max-microvolt = <1100000>; - regulator-always-on; - }; - - ldo8_reg: LDO8 { - regulator-name = "P1.0V_LDO_OUT8"; - regulator-min-microvolt = <1000000>; - regulator-max-microvolt = <1000000>; - regulator-always-on; - }; - - ldo10_reg: LDO10 { - regulator-name = "P1.8V_LDO_OUT10"; - regulator-min-microvolt = <1800000>; - regulator-max-microvolt = <1800000>; - regulator-always-on; - }; - - ldo12_reg: LDO12 { - regulator-name = "P3.0V_LDO_OUT12"; - regulator-min-microvolt = <3000000>; - regulator-max-microvolt = <3000000>; - regulator-always-on; - }; - - ldo14_reg: LDO14 { - regulator-name = "P1.8V_LDO_OUT14"; - regulator-min-microvolt = <1800000>; - regulator-max-microvolt = <1800000>; - regulator-always-on; - }; - - ldo15_reg: LDO15 { - regulator-name = "P1.0V_LDO_OUT15"; - regulator-min-microvolt = <1000000>; - regulator-max-microvolt = <1000000>; - regulator-always-on; - }; - - ldo16_reg: LDO16 { - regulator-name = "P1.8V_LDO_OUT16"; - regulator-min-microvolt = <1800000>; - regulator-max-microvolt = <1800000>; - regulator-always-on; - }; - - buck1_reg: BUCK1 { - regulator-name = "vdd_mif"; - regulator-min-microvolt = <950000>; - regulator-max-microvolt = <1300000>; - regulator-always-on; - regulator-boot-on; - }; - - buck2_reg: BUCK2 { - regulator-name = "vdd_arm"; - regulator-min-microvolt = <850000>; - regulator-max-microvolt = <1350000>; - regulator-always-on; - regulator-boot-on; - }; - - buck3_reg: BUCK3 { - regulator-name = "vdd_int"; - regulator-min-microvolt = <900000>; - regulator-max-microvolt = <1200000>; - regulator-always-on; - regulator-boot-on; - }; - - buck4_reg: BUCK4 { - regulator-name = "vdd_g3d"; - regulator-min-microvolt = <850000>; - regulator-max-microvolt = <1300000>; - regulator-always-on; - regulator-boot-on; - }; - - buck5_reg: BUCK5 { - regulator-name = "P1.8V_BUCK_OUT5"; - regulator-min-microvolt = <1800000>; - regulator-max-microvolt = <1800000>; - regulator-always-on; - regulator-boot-on; - }; - - buck6_reg: BUCK6 { - regulator-name = "P1.35V_BUCK_OUT6"; - regulator-min-microvolt = <1350000>; - regulator-max-microvolt = <1350000>; - regulator-always-on; - }; - - buck7_reg: BUCK7 { - regulator-name = "P2.0V_BUCK_OUT7"; - regulator-min-microvolt = <2000000>; - regulator-max-microvolt = <2000000>; - regulator-always-on; - }; - - buck8_reg: BUCK8 { - regulator-name = "P2.85V_BUCK_OUT8"; - regulator-min-microvolt = <2850000>; - regulator-max-microvolt = <2850000>; - regulator-always-on; - }; - }; - }; - }; - - i2c at 12C70000 { - status = "okay"; - samsung,i2c-sda-delay = <100>; - samsung,i2c-max-bus-freq = <378000>; - - trackpad { - reg = <0x67>; - compatible = "cypress,cyapa"; - interrupts = <2 0>; - interrupt-parent = <&gpx1>; - wakeup-source; - }; - }; - - i2c at 12C80000 { - status = "okay"; - samsung,i2c-sda-delay = <100>; - samsung,i2c-max-bus-freq = <66000>; - - hdmiddc at 50 { - compatible = "samsung,exynos4210-hdmiddc"; - reg = <0x50>; - }; - }; - - 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 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>; - - hdmiphy at 38 { - compatible = "samsung,exynos4212-hdmiphy"; - reg = <0x38>; - }; - }; - - mmc at 12200000 { - num-slots = <1>; - supports-highspeed; - broken-cd; - fifo-depth = <0x80>; - card-detect-delay = <200>; - samsung,dw-mshc-ciu-div = <3>; - samsung,dw-mshc-sdr-timing = <2 3>; - samsung,dw-mshc-ddr-timing = <1 2>; - pinctrl-names = "default"; - pinctrl-0 = <&sd0_clk &sd0_cmd &sd0_cd &sd0_bus4 &sd0_bus8>; - - slot at 0 { - reg = <0>; - bus-width = <8>; - }; - }; - - mmc at 12210000 { - status = "disabled"; - }; - - mmc at 12220000 { - num-slots = <1>; - supports-highspeed; - fifo-depth = <0x80>; - card-detect-delay = <200>; - samsung,dw-mshc-ciu-div = <3>; - samsung,dw-mshc-sdr-timing = <2 3>; - samsung,dw-mshc-ddr-timing = <1 2>; - pinctrl-names = "default"; - pinctrl-0 = <&sd2_clk &sd2_cmd &sd2_cd &sd2_bus4>; - - slot at 0 { - reg = <0>; - bus-width = <4>; - wp-gpios = <&gpc2 1 0>; - }; - }; - - mmc at 12230000 { - num-slots = <1>; - supports-highspeed; - broken-cd; - fifo-depth = <0x80>; - card-detect-delay = <200>; - samsung,dw-mshc-ciu-div = <3>; - samsung,dw-mshc-sdr-timing = <2 3>; - samsung,dw-mshc-ddr-timing = <1 2>; - /* See board-specific dts files for pin setup */ - - slot at 0 { - reg = <0>; - bus-width = <4>; - }; - }; - - spi_1: spi at 12d30000 { - status = "okay"; - samsung,spi-src-clk = <0>; - num-cs = <1>; - }; - - hdmi { - hpd-gpio = <&gpx3 7 0>; - }; - - gpio-keys { - compatible = "gpio-keys"; - - power { - label = "Power"; - gpios = <&gpx1 3 1>; - linux,code = <116>; /* KEY_POWER */ - gpio-key,wakeup; - }; - }; -}; diff --git a/arch/arm/boot/dts/exynos5250-cros-common.dtsi b/arch/arm/boot/dts/exynos5250-cros-common.dtsi new file mode 100644 index 000000000000..2fed9acd28da --- /dev/null +++ b/arch/arm/boot/dts/exynos5250-cros-common.dtsi @@ -0,0 +1,325 @@ +/* + * Common device tree include for all Exynos 5250 boards based off of Daisy. + * + * Copyright (c) 2012 Google, Inc + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. +*/ + +/ { + aliases { + }; + + memory { + reg = <0x40000000 0x80000000>; + }; + + chosen { + }; + + pinctrl at 11400000 { + /* + * Disabled pullups since external part has its own pullups and + * double-pulling gets us out of spec in some cases. + */ + i2c2_bus: i2c2-bus { + samsung,pin-pud = <0>; + }; + + max77686_irq: max77686-irq { + samsung,pins = "gpx3-2"; + samsung,pin-function = <0>; + samsung,pin-pud = <0>; + samsung,pin-drv = <0>; + }; + }; + + i2c at 12C60000 { + status = "okay"; + samsung,i2c-sda-delay = <100>; + samsung,i2c-max-bus-freq = <378000>; + + max77686 at 09 { + compatible = "maxim,max77686"; + interrupt-parent = <&gpx3>; + interrupts = <2 0>; + pinctrl-names = "default"; + pinctrl-0 = <&max77686_irq>; + wakeup-source; + reg = <0x09>; + + voltage-regulators { + ldo1_reg: LDO1 { + regulator-name = "P1.0V_LDO_OUT1"; + regulator-min-microvolt = <1000000>; + regulator-max-microvolt = <1000000>; + regulator-always-on; + }; + + ldo2_reg: LDO2 { + regulator-name = "P1.8V_LDO_OUT2"; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + regulator-always-on; + }; + + ldo3_reg: LDO3 { + regulator-name = "P1.8V_LDO_OUT3"; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + regulator-always-on; + }; + + ldo7_reg: LDO7 { + regulator-name = "P1.1V_LDO_OUT7"; + regulator-min-microvolt = <1100000>; + regulator-max-microvolt = <1100000>; + regulator-always-on; + }; + + ldo8_reg: LDO8 { + regulator-name = "P1.0V_LDO_OUT8"; + regulator-min-microvolt = <1000000>; + regulator-max-microvolt = <1000000>; + regulator-always-on; + }; + + ldo10_reg: LDO10 { + regulator-name = "P1.8V_LDO_OUT10"; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + regulator-always-on; + }; + + ldo12_reg: LDO12 { + regulator-name = "P3.0V_LDO_OUT12"; + regulator-min-microvolt = <3000000>; + regulator-max-microvolt = <3000000>; + regulator-always-on; + }; + + ldo14_reg: LDO14 { + regulator-name = "P1.8V_LDO_OUT14"; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + regulator-always-on; + }; + + ldo15_reg: LDO15 { + regulator-name = "P1.0V_LDO_OUT15"; + regulator-min-microvolt = <1000000>; + regulator-max-microvolt = <1000000>; + regulator-always-on; + }; + + ldo16_reg: LDO16 { + regulator-name = "P1.8V_LDO_OUT16"; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + regulator-always-on; + }; + + buck1_reg: BUCK1 { + regulator-name = "vdd_mif"; + regulator-min-microvolt = <950000>; + regulator-max-microvolt = <1300000>; + regulator-always-on; + regulator-boot-on; + }; + + buck2_reg: BUCK2 { + regulator-name = "vdd_arm"; + regulator-min-microvolt = <850000>; + regulator-max-microvolt = <1350000>; + regulator-always-on; + regulator-boot-on; + }; + + buck3_reg: BUCK3 { + regulator-name = "vdd_int"; + regulator-min-microvolt = <900000>; + regulator-max-microvolt = <1200000>; + regulator-always-on; + regulator-boot-on; + }; + + buck4_reg: BUCK4 { + regulator-name = "vdd_g3d"; + regulator-min-microvolt = <850000>; + regulator-max-microvolt = <1300000>; + regulator-always-on; + regulator-boot-on; + }; + + buck5_reg: BUCK5 { + regulator-name = "P1.8V_BUCK_OUT5"; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + regulator-always-on; + regulator-boot-on; + }; + + buck6_reg: BUCK6 { + regulator-name = "P1.35V_BUCK_OUT6"; + regulator-min-microvolt = <1350000>; + regulator-max-microvolt = <1350000>; + regulator-always-on; + }; + + buck7_reg: BUCK7 { + regulator-name = "P2.0V_BUCK_OUT7"; + regulator-min-microvolt = <2000000>; + regulator-max-microvolt = <2000000>; + regulator-always-on; + }; + + buck8_reg: BUCK8 { + regulator-name = "P2.85V_BUCK_OUT8"; + regulator-min-microvolt = <2850000>; + regulator-max-microvolt = <2850000>; + regulator-always-on; + }; + }; + }; + }; + + i2c at 12C70000 { + status = "okay"; + samsung,i2c-sda-delay = <100>; + samsung,i2c-max-bus-freq = <378000>; + + trackpad { + reg = <0x67>; + compatible = "cypress,cyapa"; + interrupts = <2 0>; + interrupt-parent = <&gpx1>; + wakeup-source; + }; + }; + + i2c at 12C80000 { + status = "okay"; + samsung,i2c-sda-delay = <100>; + samsung,i2c-max-bus-freq = <66000>; + + hdmiddc at 50 { + compatible = "samsung,exynos4210-hdmiddc"; + reg = <0x50>; + }; + }; + + 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 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>; + + hdmiphy at 38 { + compatible = "samsung,exynos4212-hdmiphy"; + reg = <0x38>; + }; + }; + + mmc at 12200000 { + num-slots = <1>; + supports-highspeed; + broken-cd; + fifo-depth = <0x80>; + card-detect-delay = <200>; + samsung,dw-mshc-ciu-div = <3>; + samsung,dw-mshc-sdr-timing = <2 3>; + samsung,dw-mshc-ddr-timing = <1 2>; + pinctrl-names = "default"; + pinctrl-0 = <&sd0_clk &sd0_cmd &sd0_cd &sd0_bus4 &sd0_bus8>; + + slot at 0 { + reg = <0>; + bus-width = <8>; + }; + }; + + mmc at 12210000 { + status = "disabled"; + }; + + mmc at 12220000 { + num-slots = <1>; + supports-highspeed; + fifo-depth = <0x80>; + card-detect-delay = <200>; + samsung,dw-mshc-ciu-div = <3>; + samsung,dw-mshc-sdr-timing = <2 3>; + samsung,dw-mshc-ddr-timing = <1 2>; + pinctrl-names = "default"; + pinctrl-0 = <&sd2_clk &sd2_cmd &sd2_cd &sd2_bus4>; + + slot at 0 { + reg = <0>; + bus-width = <4>; + wp-gpios = <&gpc2 1 0>; + }; + }; + + mmc at 12230000 { + num-slots = <1>; + supports-highspeed; + broken-cd; + fifo-depth = <0x80>; + card-detect-delay = <200>; + samsung,dw-mshc-ciu-div = <3>; + samsung,dw-mshc-sdr-timing = <2 3>; + samsung,dw-mshc-ddr-timing = <1 2>; + /* See board-specific dts files for pin setup */ + + slot at 0 { + reg = <0>; + bus-width = <4>; + }; + }; + + spi_1: spi at 12d30000 { + status = "okay"; + samsung,spi-src-clk = <0>; + num-cs = <1>; + }; + + hdmi { + hpd-gpio = <&gpx3 7 0>; + }; + + gpio-keys { + compatible = "gpio-keys"; + + power { + label = "Power"; + gpios = <&gpx1 3 1>; + linux,code = <116>; /* KEY_POWER */ + gpio-key,wakeup; + }; + }; +}; diff --git a/arch/arm/boot/dts/exynos5250-snow.dts b/arch/arm/boot/dts/exynos5250-snow.dts index a9395c426db4..a290be8be2cb 100644 --- a/arch/arm/boot/dts/exynos5250-snow.dts +++ b/arch/arm/boot/dts/exynos5250-snow.dts @@ -10,7 +10,7 @@ /dts-v1/; #include "exynos5250.dtsi" -#include "cros5250-common.dtsi" +#include "exynos5250-cros-common.dtsi" / { model = "Google Snow"; -- 1.8.5.1 ^ permalink raw reply related [flat|nested] 13+ messages in thread
end of thread, other threads:[~2013-12-21 1:11 UTC | newest] Thread overview: 13+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2013-11-25 12:15 [PATCH 1/3] ARM: dts: Leave Exynos5250 SPI controller disabled by default Mark Brown 2013-11-25 12:15 ` [PATCH 2/3] ARM: dts: Disable I2C controllers by default on Exynos5250 Mark Brown 2013-11-25 12:15 ` [PATCH 3/3] ARM: dts: Rename Exynos5250 ChromeOS common file to have exynos prefix Mark Brown 2013-12-20 23:09 ` Kukjin Kim 2013-12-20 23:37 ` Kukjin Kim 2013-12-21 0:57 ` Doug Anderson 2013-12-21 1:11 ` Kukjin Kim 2013-12-09 15:23 ` [PATCH 1/3] ARM: dts: Leave Exynos5250 SPI controller disabled by default Tomasz Figa 2013-12-09 21:07 ` Kukjin Kim 2013-12-10 0:48 ` Doug Anderson 2013-12-10 0:57 ` Doug Anderson 2013-12-10 11:13 ` Mark Brown -- strict thread matches above, loose matches on Subject: below -- 2013-12-10 11:07 Mark Brown 2013-12-10 11:07 ` [PATCH 3/3] ARM: dts: Rename Exynos5250 ChromeOS common file to have exynos prefix Mark Brown
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).