[PATCH 00/13] ARM: ux500: Misc Device Tree patches

[PATCH 00/13] ARM: ux500: Misc Device Tree patches

[Lee Jones]

In this patchset we:

1. Remove nodes which aren't pertinent to Snowball from its DTS file
2. Provide ST-Ericsson's DTS[I] files with a ste-* prefix
3. Remove the old u9540.dts file 

[PATCH 01/13] ARM: ux500: Remove Toshiba TC35892 I/O Expander's DT entry from Snowball's DTS

[Lee Jones]

It doesn't exist on this development board.

Signed-off-by: Lee Jones <lee.jones@linaro.org>
---
 arch/arm/boot/dts/snowball.dts | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/arch/arm/boot/dts/snowball.dts b/arch/arm/boot/dts/snowball.dts
index 49824be..16c2b23 100644
--- a/arch/arm/boot/dts/snowball.dts
+++ b/arch/arm/boot/dts/snowball.dts
@@ -166,12 +166,6 @@
 		};
 
 		i2c at 80004000 {
-			tc3589x at 42 {
-				//compatible = "tc3589x";
-				reg = <0x42>;
-				gpios = <&gpio6 25 0x4>;
-				interrupt-parent = <&gpio6>;
-			};
 			tps61052 at 33 {
 				//compatible = "tps61052";
 				reg = <0x33>;
-- 
1.8.1.2

[PATCH 02/13] ARM: ux500: Remove Snowball DTS entry for National Semiconductor LP5521 LED chip

[Lee Jones]

It doesn't exist on the Snowball development board.

Signed-off-by: Lee Jones <lee.jones@linaro.org>
---
 arch/arm/boot/dts/snowball.dts | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/arch/arm/boot/dts/snowball.dts b/arch/arm/boot/dts/snowball.dts
index 16c2b23..a5d6317 100644
--- a/arch/arm/boot/dts/snowball.dts
+++ b/arch/arm/boot/dts/snowball.dts
@@ -173,14 +173,6 @@
 		};
 
 		i2c at 80128000 {
-			lp5521 at 33 {
-				// compatible = "lp5521";
-				reg = <0x33>;
-			};
-			lp5521 at 34 {
-				// compatible = "lp5521";
-				reg = <0x34>;
-			};
 			bh1780 at 29 {
 				// compatible = "rohm,bh1780gli";
 				reg = <0x33>;
-- 
1.8.1.2

[PATCH 03/13] ARM: ux500: Remove Snowball DTS entry for TPS61052 chip

[Lee Jones]

TPS61052 is a; boost converter, LED driver, LED flash driver and
simple GPIO pin chip. It has no use here however, as it is not
found on the Snowball development board.

Signed-off-by: Lee Jones <lee.jones@linaro.org>
---
 arch/arm/boot/dts/snowball.dts | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/arch/arm/boot/dts/snowball.dts b/arch/arm/boot/dts/snowball.dts
index a5d6317..d01ec70 100644
--- a/arch/arm/boot/dts/snowball.dts
+++ b/arch/arm/boot/dts/snowball.dts
@@ -165,13 +165,6 @@
 			status = "okay";
 		};
 
-		i2c at 80004000 {
-			tps61052 at 33 {
-				//compatible = "tps61052";
-				reg = <0x33>;
-			};
-		};
-
 		i2c at 80128000 {
 			bh1780 at 29 {
 				// compatible = "rohm,bh1780gli";
-- 
1.8.1.2

[PATCH 04/13] ARM: ux500: Remove Snowball DTS entry for ROHM BH1780GLI ambient light sensor

[Lee Jones]

It doesn't exist on the Snowball development board.

Signed-off-by: Lee Jones <lee.jones@linaro.org>
---
 arch/arm/boot/dts/snowball.dts | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/arch/arm/boot/dts/snowball.dts b/arch/arm/boot/dts/snowball.dts
index d01ec70..dc5c641 100644
--- a/arch/arm/boot/dts/snowball.dts
+++ b/arch/arm/boot/dts/snowball.dts
@@ -165,13 +165,6 @@
 			status = "okay";
 		};
 
-		i2c at 80128000 {
-			bh1780 at 29 {
-				// compatible = "rohm,bh1780gli";
-				reg = <0x33>;
-			};
-		};
-
 		cpufreq-cooling {
 			status = "okay";
 		};
-- 
1.8.1.2

[PATCH 05/13] ARM: ux500: Apply a ste-* prefix onto snowball.dts

[Lee Jones]

Signed-off-by: Lee Jones <lee.jones@linaro.org>
---
 arch/arm/boot/dts/{snowball.dts => ste-snowball.dts} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename arch/arm/boot/dts/{snowball.dts => ste-snowball.dts} (100%)

diff --git a/arch/arm/boot/dts/snowball.dts b/arch/arm/boot/dts/ste-snowball.dts
similarity index 100%
rename from arch/arm/boot/dts/snowball.dts
rename to arch/arm/boot/dts/ste-snowball.dts
-- 
1.8.1.2

[PATCH 06/13] ARM: ux500: Apply a ste-* prefix onto ccu8540.dts

[Lee Jones]

Signed-off-by: Lee Jones <lee.jones@linaro.org>
---
 arch/arm/boot/dts/{ccu8540.dts => ste-ccu8540.dts} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename arch/arm/boot/dts/{ccu8540.dts => ste-ccu8540.dts} (100%)

diff --git a/arch/arm/boot/dts/ccu8540.dts b/arch/arm/boot/dts/ste-ccu8540.dts
similarity index 100%
rename from arch/arm/boot/dts/ccu8540.dts
rename to arch/arm/boot/dts/ste-ccu8540.dts
-- 
1.8.1.2

[PATCH 07/13] ARM: ux500: Apply a ste-* prefix onto ccu9540.dts

[Lee Jones]

Signed-off-by: Lee Jones <lee.jones@linaro.org>
---
 arch/arm/boot/dts/{ccu9540.dts => ste-ccu9540.dts} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename arch/arm/boot/dts/{ccu9540.dts => ste-ccu9540.dts} (100%)

diff --git a/arch/arm/boot/dts/ccu9540.dts b/arch/arm/boot/dts/ste-ccu9540.dts
similarity index 100%
rename from arch/arm/boot/dts/ccu9540.dts
rename to arch/arm/boot/dts/ste-ccu9540.dts
-- 
1.8.1.2

[PATCH 08/13] ARM: ux500: Apply a ste-* prefix onto href.dtsi

[Lee Jones]

Signed-off-by: Lee Jones <lee.jones@linaro.org>
---
 arch/arm/boot/dts/{href.dtsi => ste-href.dtsi} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename arch/arm/boot/dts/{href.dtsi => ste-href.dtsi} (100%)

diff --git a/arch/arm/boot/dts/href.dtsi b/arch/arm/boot/dts/ste-href.dtsi
similarity index 100%
rename from arch/arm/boot/dts/href.dtsi
rename to arch/arm/boot/dts/ste-href.dtsi
-- 
1.8.1.2

[PATCH 09/13] ARM: ux500: Apply a ste-* prefix onto hrefprev60.dts Signed-off-by: Lee Jones <lee.jones@linaro.org>

[Lee Jones]

---
 arch/arm/boot/dts/{hrefprev60.dts => ste-hrefprev60.dts} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename arch/arm/boot/dts/{hrefprev60.dts => ste-hrefprev60.dts} (100%)

diff --git a/arch/arm/boot/dts/hrefprev60.dts b/arch/arm/boot/dts/ste-hrefprev60.dts
similarity index 100%
rename from arch/arm/boot/dts/hrefprev60.dts
rename to arch/arm/boot/dts/ste-hrefprev60.dts
-- 
1.8.1.2

[PATCH 10/13] ARM: ux500: Apply a ste-* prefix onto hrefv60plus.dts

[Lee Jones]

Signed-off-by: Lee Jones <lee.jones@linaro.org>
---
 arch/arm/boot/dts/{hrefv60plus.dts => ste-hrefv60plus.dts} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename arch/arm/boot/dts/{hrefv60plus.dts => ste-hrefv60plus.dts} (100%)

diff --git a/arch/arm/boot/dts/hrefv60plus.dts b/arch/arm/boot/dts/ste-hrefv60plus.dts
similarity index 100%
rename from arch/arm/boot/dts/hrefv60plus.dts
rename to arch/arm/boot/dts/ste-hrefv60plus.dts
-- 
1.8.1.2

[PATCH 11/13] ARM: ux500: Apply a ste-* prefix onto stuib.dtsi

[Lee Jones]

Signed-off-by: Lee Jones <lee.jones@linaro.org>
---
 arch/arm/boot/dts/{stuib.dtsi => ste-stuib.dtsi} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename arch/arm/boot/dts/{stuib.dtsi => ste-stuib.dtsi} (100%)

diff --git a/arch/arm/boot/dts/stuib.dtsi b/arch/arm/boot/dts/ste-stuib.dtsi
similarity index 100%
rename from arch/arm/boot/dts/stuib.dtsi
rename to arch/arm/boot/dts/ste-stuib.dtsi
-- 
1.8.1.2

[PATCH 12/13] ARM: ux500: Apply a ste-* prefix onto dbx5x0.dtsi

[Lee Jones]

Signed-off-by: Lee Jones <lee.jones@linaro.org>
---
 arch/arm/boot/dts/{dbx5x0.dtsi => ste-dbx5x0.dtsi} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename arch/arm/boot/dts/{dbx5x0.dtsi => ste-dbx5x0.dtsi} (100%)

diff --git a/arch/arm/boot/dts/dbx5x0.dtsi b/arch/arm/boot/dts/ste-dbx5x0.dtsi
similarity index 100%
rename from arch/arm/boot/dts/dbx5x0.dtsi
rename to arch/arm/boot/dts/ste-dbx5x0.dtsi
-- 
1.8.1.2

[PATCH 13/13] ARM: ux500: Remove u9540.dts as it's been replaced

[Lee Jones]

This must have been a merge error. There was a patch which renamed the
u9540.dts to ccu9540.dts, however the u9540.dts was reincarnate with
the same patches which created it in the first place. Let's kill it
once and for all.

Signed-off-by: Lee Jones <lee.jones@linaro.org>
---
 arch/arm/boot/dts/u9540.dts | 72 ---------------------------------------------
 1 file changed, 72 deletions(-)
 delete mode 100644 arch/arm/boot/dts/u9540.dts

diff --git a/arch/arm/boot/dts/u9540.dts b/arch/arm/boot/dts/u9540.dts
deleted file mode 100644
index 95892ec..0000000
--- a/arch/arm/boot/dts/u9540.dts
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Copyright 2012 ST-Ericsson AB
- *
- * The code contained herein is licensed under the GNU General Public
- * License. You may obtain a copy of the GNU General Public License
- * Version 2 or later at the following locations:
- *
- * http://www.opensource.org/licenses/gpl-license.html
- * http://www.gnu.org/copyleft/gpl.html
- */
-
-/dts-v1/;
-/include/ "dbx5x0.dtsi"
-
-/ {
-	model = "ST-Ericsson U9540 platform with Device Tree";
-	compatible = "st-ericsson,u9540";
-
-	memory {
-		reg = <0x00000000 0x20000000>;
-	};
-
-	soc-u9500 {
-		uart at 80120000 {
-			status = "okay";
-		};
-
-		uart at 80121000 {
-			status = "okay";
-		};
-
-		uart at 80007000 {
-			status = "okay";
-		};
-
-		// External Micro SD slot
-		sdi0_per1 at 80126000 {
-			arm,primecell-periphid = <0x10480180>;
-			max-frequency = <100000000>;
-			bus-width = <4>;
-			mmc-cap-sd-highspeed;
-			mmc-cap-mmc-highspeed;
-			vmmc-supply = <&ab8500_ldo_aux3_reg>;
-
-			cd-gpios  = <&gpio7 6 0x4>; // 230
-			cd-inverted;
-
-			status = "okay";
-		};
-
-
-		// WLAN SDIO channel
-		sdi1_per2 at 80118000 {
-			arm,primecell-periphid = <0x10480180>;
-			max-frequency = <50000000>;
-			bus-width = <4>;
-
-			status = "okay";
-		};
-
-		// On-board eMMC
-		sdi4_per2 at 80114000 {
-			arm,primecell-periphid = <0x10480180>;
-		        max-frequency = <100000000>;
-			bus-width = <8>;
-			mmc-cap-mmc-highspeed;
-			vmmc-supply = <&ab8500_ldo_aux2_reg>;
-
-			status = "okay";
-		};
-	};
-};
-- 
1.8.1.2

[PATCH 01/13] ARM: ux500: Remove Toshiba TC35892 I/O Expander's DT entry from Snowball's DTS

[Linus Walleij]

On Fri, Jul 19, 2013 at 4:13 PM, Lee Jones <lee.jones@linaro.org> wrote:

> It doesn't exist on this development board.
>
> Signed-off-by: Lee Jones <lee.jones@linaro.org>

Patch applied to my ux500-dt branch.

Yours,
Linus Walleij

[PATCH 02/13] ARM: ux500: Remove Snowball DTS entry for National Semiconductor LP5521 LED chip

[Linus Walleij]

On Fri, Jul 19, 2013 at 4:13 PM, Lee Jones <lee.jones@linaro.org> wrote:

> It doesn't exist on the Snowball development board.
>
> Signed-off-by: Lee Jones <lee.jones@linaro.org>

Patch applied.

Yours,
Linus Walleij

[PATCH 03/13] ARM: ux500: Remove Snowball DTS entry for TPS61052 chip

[Linus Walleij]

On Fri, Jul 19, 2013 at 4:13 PM, Lee Jones <lee.jones@linaro.org> wrote:

> TPS61052 is a; boost converter, LED driver, LED flash driver and
> simple GPIO pin chip. It has no use here however, as it is not
> found on the Snowball development board.
>
> Signed-off-by: Lee Jones <lee.jones@linaro.org>

Patch applied.

Yours,
Linus Walleij

[PATCH 04/13] ARM: ux500: Remove Snowball DTS entry for ROHM BH1780GLI ambient light sensor

[Linus Walleij]

On Fri, Jul 19, 2013 at 4:13 PM, Lee Jones <lee.jones@linaro.org> wrote:

> It doesn't exist on the Snowball development board.
>
> Signed-off-by: Lee Jones <lee.jones@linaro.org>

Patch applied.

Yours,
Linus Walleij

[PATCH 13/13] ARM: ux500: Remove u9540.dts as it's been replaced

[Linus Walleij]

On Fri, Jul 19, 2013 at 4:13 PM, Lee Jones <lee.jones@linaro.org> wrote:

> This must have been a merge error. There was a patch which renamed the
> u9540.dts to ccu9540.dts, however the u9540.dts was reincarnate with
> the same patches which created it in the first place. Let's kill it
> once and for all.
>
> Signed-off-by: Lee Jones <lee.jones@linaro.org>

I applied all the rename patches but it appears they were never
really tested, so I made this patch fixing all the bugs they introduced.
(Quicker than iterating the patch set.)

Yours,
Linus Walleij

[PATCH 05/13] ARM: ux500: Apply a ste-* prefix onto snowball.dts

[Olof Johansson]

On Fri, Jul 19, 2013 at 7:13 AM, Lee Jones <lee.jones@linaro.org> wrote:
> Signed-off-by: Lee Jones <lee.jones@linaro.org>
> ---
>  arch/arm/boot/dts/{snowball.dts => ste-snowball.dts} | 0
>  1 file changed, 0 insertions(+), 0 deletions(-)
>  rename arch/arm/boot/dts/{snowball.dts => ste-snowball.dts} (100%)
>
> diff --git a/arch/arm/boot/dts/snowball.dts b/arch/arm/boot/dts/ste-snowball.dts
> similarity index 100%
> rename from arch/arm/boot/dts/snowball.dts
> rename to arch/arm/boot/dts/ste-snowball.dts

Grmbl, grmbl, grmbl. This now breaks any script that knows to use
snowball.dtb. :(

It's good to get the prefixes added, but it's annoying to have to deal
with both during an overlap period. Maybe generate both dtb filenames
for a while but rename the source?


-Olof

[PATCH 05/13] ARM: ux500: Apply a ste-* prefix onto snowball.dts

[Lee Jones]

On Tue, 20 Aug 2013, Olof Johansson wrote:

> On Fri, Jul 19, 2013 at 7:13 AM, Lee Jones <lee.jones@linaro.org> wrote:
> > Signed-off-by: Lee Jones <lee.jones@linaro.org>
> > ---
> >  arch/arm/boot/dts/{snowball.dts => ste-snowball.dts} | 0
> >  1 file changed, 0 insertions(+), 0 deletions(-)
> >  rename arch/arm/boot/dts/{snowball.dts => ste-snowball.dts} (100%)
> >
> > diff --git a/arch/arm/boot/dts/snowball.dts b/arch/arm/boot/dts/ste-snowball.dts
> > similarity index 100%
> > rename from arch/arm/boot/dts/snowball.dts
> > rename to arch/arm/boot/dts/ste-snowball.dts
> 
> Grmbl, grmbl, grmbl. This now breaks any script that knows to use
> snowball.dtb. :(
> 
> It's good to get the prefixes added, but it's annoying to have to deal
> with both during an overlap period. Maybe generate both dtb filenames
> for a while but rename the source?

How would you create both DTB files from one DTS file?

Surely they only solution would be to maintain both snowball.dts and
ste-snowball.dts at the same time, which doesn't sound logical at all.

Why can't you do as Linus and I have done and just change your script?

-- 
Lee Jones
Linaro ST-Ericsson Landing Team Lead
Linaro.org ? Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog

[PATCH 05/13] ARM: ux500: Apply a ste-* prefix onto snowball.dts

[Linus Walleij]

On Wed, Aug 21, 2013 at 2:31 AM, Olof Johansson <olof@lixom.net> wrote:

>> diff --git a/arch/arm/boot/dts/snowball.dts b/arch/arm/boot/dts/ste-snowball.dts
>> similarity index 100%
>> rename from arch/arm/boot/dts/snowball.dts
>> rename to arch/arm/boot/dts/ste-snowball.dts
>
> Grmbl, grmbl, grmbl. This now breaks any script that knows to use
> snowball.dtb. :(
>
> It's good to get the prefixes added, but it's annoying to have to deal
> with both during an overlap period. Maybe generate both dtb filenames
> for a while but rename the source?

Hm I had the same problem but changed my Makefile
(scripts are too simple for me) like this:

 dtb            := $(build_dir)/arch/arm/boot/dts/ste-hrefv60plus.dtb
+fallbackdtb    := $(build_dir)/arch/arm/boot/dts/hrefv60plus.dtb
(...)
-       cat $(dtb) >> $(output_dir)/zImage
+       if [ -f arch/arm/boot/dts/hrefv60plus.dts ] ; then \
+           cat $(fallbackdtb) >> $(output_dir)/zImage ; echo "fallback" ; \
+       else \
+           cat $(dtb) >> $(output_dir)/zImage ; \
+       fi

Yours,
Linus Walleij

[PATCH 05/13] ARM: ux500: Apply a ste-* prefix onto snowball.dts

[Olof Johansson]

On Wed, Aug 21, 2013 at 3:37 PM, Linus Walleij <linus.walleij@linaro.org> wrote:
> On Wed, Aug 21, 2013 at 2:31 AM, Olof Johansson <olof@lixom.net> wrote:
>
>>> diff --git a/arch/arm/boot/dts/snowball.dts b/arch/arm/boot/dts/ste-snowball.dts
>>> similarity index 100%
>>> rename from arch/arm/boot/dts/snowball.dts
>>> rename to arch/arm/boot/dts/ste-snowball.dts
>>
>> Grmbl, grmbl, grmbl. This now breaks any script that knows to use
>> snowball.dtb. :(
>>
>> It's good to get the prefixes added, but it's annoying to have to deal
>> with both during an overlap period. Maybe generate both dtb filenames
>> for a while but rename the source?
>
> Hm I had the same problem but changed my Makefile
> (scripts are too simple for me) like this:
>
>  dtb            := $(build_dir)/arch/arm/boot/dts/ste-hrefv60plus.dtb
> +fallbackdtb    := $(build_dir)/arch/arm/boot/dts/hrefv60plus.dtb
> (...)
> -       cat $(dtb) >> $(output_dir)/zImage
> +       if [ -f arch/arm/boot/dts/hrefv60plus.dts ] ; then \
> +           cat $(fallbackdtb) >> $(output_dir)/zImage ; echo "fallback" ; \
> +       else \
> +           cat $(dtb) >> $(output_dir)/zImage ; \
> +       fi

Sure, working around it is trivial. I just did a:
   - at cp $</arch/arm/boot/dts/ste-snowball.dtb $</arch/arm/boot/dts/snowball.dtb

But the point is that everybody needs to do something like that now,
which is unfortunate.


-Olof

[PATCH 05/13] ARM: ux500: Apply a ste-* prefix onto snowball.dts

[Lee Jones]

On Wed, 21 Aug 2013, Olof Johansson wrote:

> On Wed, Aug 21, 2013 at 3:37 PM, Linus Walleij <linus.walleij@linaro.org> wrote:
> > On Wed, Aug 21, 2013 at 2:31 AM, Olof Johansson <olof@lixom.net> wrote:
> >
> >>> diff --git a/arch/arm/boot/dts/snowball.dts b/arch/arm/boot/dts/ste-snowball.dts
> >>> similarity index 100%
> >>> rename from arch/arm/boot/dts/snowball.dts
> >>> rename to arch/arm/boot/dts/ste-snowball.dts
> >>
> >> Grmbl, grmbl, grmbl. This now breaks any script that knows to use
> >> snowball.dtb. :(
> >>
> >> It's good to get the prefixes added, but it's annoying to have to deal
> >> with both during an overlap period. Maybe generate both dtb filenames
> >> for a while but rename the source?
> >
> > Hm I had the same problem but changed my Makefile
> > (scripts are too simple for me) like this:
> >
> >  dtb            := $(build_dir)/arch/arm/boot/dts/ste-hrefv60plus.dtb
> > +fallbackdtb    := $(build_dir)/arch/arm/boot/dts/hrefv60plus.dtb
> > (...)
> > -       cat $(dtb) >> $(output_dir)/zImage
> > +       if [ -f arch/arm/boot/dts/hrefv60plus.dts ] ; then \
> > +           cat $(fallbackdtb) >> $(output_dir)/zImage ; echo "fallback" ; \
> > +       else \
> > +           cat $(dtb) >> $(output_dir)/zImage ; \
> > +       fi
> 
> Sure, working around it is trivial. I just did a:
>    - at cp $</arch/arm/boot/dts/ste-snowball.dtb $</arch/arm/boot/dts/snowball.dtb
> 
> But the point is that everybody needs to do something like that now,
> which is unfortunate.

Well with only ~5 active users it's probably not that much of a big
deal anyway, but I'm still interested to know what the alternative is?

-- 
Lee Jones
Linaro ST-Ericsson Landing Team Lead
Linaro.org ? Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog