[PATCH 3/3] ARM: STi: stih41x: Provide a proper header for this DTSI file

[PATCH 3/3] ARM: STi: stih41x: Provide a proper header for this DTSI file

[Lee Jones]

Also explicitly include STiH416 Clk bindings instead of relying on
inheriting them from other DTSI files which we happen to include.

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

diff --git a/arch/arm/boot/dts/stih41x.dtsi b/arch/arm/boot/dts/stih41x.dtsi
index f5b9898..32730e5 100644
--- a/arch/arm/boot/dts/stih41x.dtsi
+++ b/arch/arm/boot/dts/stih41x.dtsi
@@ -1,3 +1,11 @@
+/*
+ * Copyright (C) 2014 STMicroelectronics Limited.
+ *
+ * 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
+ * publishhed by the Free Software Foundation.
+ */
+#include "stih416-clock.dtsi"
 / {
 	#address-cells = <1>;
 	#size-cells = <1>;
-- 
1.8.3.2

[PATCH 1/3] ARM: sti: stih416: Add support for B2020 RevE

[Lee Jones]

The B2020 RevE differs from the other B2020 boards in a few subtle ways;
including the Ethernet reset GPIO which this patch adds support for and
the LED wiring which will follow in a latter patch.  Without supplying
these differences Ethernet and the board LEDs simply will not work.

Signed-off-by: Lee Jones <lee.jones@linaro.org>
---
 arch/arm/boot/dts/Makefile               |  3 ++-
 arch/arm/boot/dts/stih416-b2020-revE.dts | 21 +++++++++++++++++++++
 2 files changed, 23 insertions(+), 1 deletion(-)
 create mode 100644 arch/arm/boot/dts/stih416-b2020-revE.dts

diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index 35c146f..0f89cdf 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -338,7 +338,8 @@ dtb-$(CONFIG_ARCH_SPEAR6XX)+= spear600-evb.dtb
 dtb-$(CONFIG_ARCH_STI)+= stih415-b2000.dtb \
 	stih416-b2000.dtb \
 	stih415-b2020.dtb \
-	stih416-b2020.dtb
+	stih416-b2020.dtb \
+	stih416-b2020-revE.dtb
 dtb-$(CONFIG_ARCH_SUNXI) += \
 	sun4i-a10-a1000.dtb \
 	sun4i-a10-cubieboard.dtb \
diff --git a/arch/arm/boot/dts/stih416-b2020-revE.dts b/arch/arm/boot/dts/stih416-b2020-revE.dts
new file mode 100644
index 0000000..202919a
--- /dev/null
+++ b/arch/arm/boot/dts/stih416-b2020-revE.dts
@@ -0,0 +1,21 @@
+/*
+ * Copyright (C) 2014 STMicroelectronics (R&D) Limited.
+ * Author: Lee Jones <lee.jones@linaro.org>
+ *
+ * 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
+ * publishhed by the Free Software Foundation.
+ */
+/dts-v1/;
+#include "stih416.dtsi"
+#include "stih41x-b2020.dtsi"
+/ {
+        model = "STiH416 B2020 REV-E";
+	compatible = "st,stih416-b2020", "st,stih416";
+
+	soc {
+		ethernet1: ethernet at fef08000 {
+			snps,reset-gpio = <&PIO0 7>;
+		};
+	};
+};
-- 
1.8.3.2

[PATCH 2/3] ARM: sti: stih416: Enable board LED support for B2020 RevE

[Lee Jones]

There are two LEDs available on the B2020 RevE board, one red, one
green.  In this patch we enable the red one for "heartbeat" and turn
the green one off.

Signed-off-by: Lee Jones <lee.jones@linaro.org>
---
 arch/arm/boot/dts/stih416-b2020-revE.dts | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/arch/arm/boot/dts/stih416-b2020-revE.dts b/arch/arm/boot/dts/stih416-b2020-revE.dts
index 202919a..0a33739 100644
--- a/arch/arm/boot/dts/stih416-b2020-revE.dts
+++ b/arch/arm/boot/dts/stih416-b2020-revE.dts
@@ -14,6 +14,20 @@
 	compatible = "st,stih416-b2020", "st,stih416";
 
 	soc {
+		leds {
+			compatible = "gpio-leds";
+			red {
+				#gpio-cells		= <1>;
+				label			= "Front Panel LED";
+				gpios			= <&PIO4 1>;
+				linux,default-trigger	= "heartbeat";
+			};
+			green {
+				gpios			= <&PIO1 3>;
+				default-state 		= "off";
+			};
+		};
+
 		ethernet1: ethernet at fef08000 {
 			snps,reset-gpio = <&PIO0 7>;
 		};
-- 
1.8.3.2

[PATCH 3/3] ARM: sti: stih41x: Provide a proper header for this DTSI file

[Lee Jones]

Also explicitly include STiH416 Clk bindings instead of relying on
inheriting them from other DTSI files which we happen to include.

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

diff --git a/arch/arm/boot/dts/stih41x.dtsi b/arch/arm/boot/dts/stih41x.dtsi
index f5b9898..32730e5 100644
--- a/arch/arm/boot/dts/stih41x.dtsi
+++ b/arch/arm/boot/dts/stih41x.dtsi
@@ -1,3 +1,11 @@
+/*
+ * Copyright (C) 2014 STMicroelectronics Limited.
+ *
+ * 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
+ * publishhed by the Free Software Foundation.
+ */
+#include "stih416-clock.dtsi"
 / {
 	#address-cells = <1>;
 	#size-cells = <1>;
-- 
1.8.3.2

[PATCH 3/3] ARM: sti: stih41x: Provide a proper header for this DTSI file

[Maxime Coquelin]

Hi Lee,

On 05/21/2014 10:20 AM, Lee Jones wrote:
> Also explicitly include STiH416 Clk bindings instead of relying on
> inheriting them from other DTSI files which we happen to include.
>
> Signed-off-by: Lee Jones <lee.jones@linaro.org>
> ---
>   arch/arm/boot/dts/stih41x.dtsi | 8 ++++++++
>   1 file changed, 8 insertions(+)
>
> diff --git a/arch/arm/boot/dts/stih41x.dtsi b/arch/arm/boot/dts/stih41x.dtsi
> index f5b9898..32730e5 100644
> --- a/arch/arm/boot/dts/stih41x.dtsi
> +++ b/arch/arm/boot/dts/stih41x.dtsi
> @@ -1,3 +1,11 @@
> +/*
> + * Copyright (C) 2014 STMicroelectronics Limited.
> + *
> + * 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
> + * publishhed by the Free Software Foundation.
> + */
> +#include "stih416-clock.dtsi"

Nack.
As discussed on IRC, this dtsi file is included by stih415.dtsi.
In this case, we want to include stih415-clocks.dtsi instead.

Regards,
Maxime
>   / {
>   	#address-cells = <1>;
>   	#size-cells = <1>;
>

[PATCH 3/3] ARM: sti: stih41x: Provide a proper header for this DTSI file

[Lee Jones]

> >Also explicitly include STiH416 Clk bindings instead of relying on
> >inheriting them from other DTSI files which we happen to include.
> >
> >Signed-off-by: Lee Jones <lee.jones@linaro.org>
> >---
> >  arch/arm/boot/dts/stih41x.dtsi | 8 ++++++++
> >  1 file changed, 8 insertions(+)
> >
> >diff --git a/arch/arm/boot/dts/stih41x.dtsi b/arch/arm/boot/dts/stih41x.dtsi
> >index f5b9898..32730e5 100644
> >--- a/arch/arm/boot/dts/stih41x.dtsi
> >+++ b/arch/arm/boot/dts/stih41x.dtsi
> >@@ -1,3 +1,11 @@
> >+/*
> >+ * Copyright (C) 2014 STMicroelectronics Limited.
> >+ *
> >+ * 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
> >+ * publishhed by the Free Software Foundation.
> >+ */
> >+#include "stih416-clock.dtsi"
> 
> Nack.
> As discussed on IRC, this dtsi file is included by stih415.dtsi.
> In this case, we want to include stih415-clocks.dtsi instead.

+1 resubmitted.

> >  / {
> >  	#address-cells = <1>;
> >  	#size-cells = <1>;
> >

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