* [PATCH 1/3] ARM: dts: stih407: Enable PWM nodes only board level
2015-09-23 19:37 [PATCH 0/3] ARM: dts: Various STi DT clean-ups Maxime Coquelin
@ 2015-09-23 19:37 ` Maxime Coquelin
2015-09-23 19:37 ` [PATCH 2/3] ARM: dts: stih407/410: Tidy up display nodes Maxime Coquelin
` (3 subsequent siblings)
4 siblings, 0 replies; 8+ messages in thread
From: Maxime Coquelin @ 2015-09-23 19:37 UTC (permalink / raw)
To: linux-arm-kernel
The PWM may not be used on some boards, so enable them only the board file.
Signed-off-by: Maxime Coquelin <maxime.coquelin@st•com>
---
arch/arm/boot/dts/stih407-family.dtsi | 6 ++++--
arch/arm/boot/dts/stihxxx-b2120.dtsi | 8 ++++++++
2 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/arch/arm/boot/dts/stih407-family.dtsi b/arch/arm/boot/dts/stih407-family.dtsi
index ae05277..9975e8f 100644
--- a/arch/arm/boot/dts/stih407-family.dtsi
+++ b/arch/arm/boot/dts/stih407-family.dtsi
@@ -585,7 +585,6 @@
/* COMMS PWM Module */
pwm0: pwm at 9810000 {
compatible = "st,sti-pwm";
- status = "okay";
#pwm-cells = <2>;
reg = <0x9810000 0x68>;
pinctrl-names = "default";
@@ -593,12 +592,13 @@
clock-names = "pwm";
clocks = <&clk_sysin>;
st,pwm-num-chan = <1>;
+
+ status = "disabled";
};
/* SBC PWM Module */
pwm1: pwm at 9510000 {
compatible = "st,sti-pwm";
- status = "okay";
#pwm-cells = <2>;
reg = <0x9510000 0x68>;
pinctrl-names = "default";
@@ -609,6 +609,8 @@
clock-names = "pwm";
clocks = <&clk_sysin>;
st,pwm-num-chan = <4>;
+
+ status = "disabled";
};
};
};
diff --git a/arch/arm/boot/dts/stihxxx-b2120.dtsi b/arch/arm/boot/dts/stihxxx-b2120.dtsi
index f589fe4..ab029f7 100644
--- a/arch/arm/boot/dts/stihxxx-b2120.dtsi
+++ b/arch/arm/boot/dts/stihxxx-b2120.dtsi
@@ -27,6 +27,14 @@
};
};
+ pwm0: pwm at 9810000 {
+ status = "okay";
+ };
+
+ pwm1: pwm at 9510000 {
+ status = "okay";
+ };
+
i2c at 9842000 {
status = "okay";
};
--
1.9.1
^ permalink raw reply related [flat|nested] 8+ messages in thread* [PATCH 2/3] ARM: dts: stih407/410: Tidy up display nodes
2015-09-23 19:37 [PATCH 0/3] ARM: dts: Various STi DT clean-ups Maxime Coquelin
2015-09-23 19:37 ` [PATCH 1/3] ARM: dts: stih407: Enable PWM nodes only board level Maxime Coquelin
@ 2015-09-23 19:37 ` Maxime Coquelin
2015-09-23 19:37 ` [PATCH 3/3] ARM: dts: stih410: Enable USB2.0 and related PHY nodes at board level Maxime Coquelin
` (2 subsequent siblings)
4 siblings, 0 replies; 8+ messages in thread
From: Maxime Coquelin @ 2015-09-23 19:37 UTC (permalink / raw)
To: linux-arm-kernel
The display nodes are common to both STiH407 and STiH410, move them to the
family file.
Signed-off-by: Maxime Coquelin <maxime.coquelin@st•com>
---
arch/arm/boot/dts/stih407-family.dtsi | 13 +++++++++++++
arch/arm/boot/dts/stih407.dtsi | 13 -------------
arch/arm/boot/dts/stih410.dtsi | 13 -------------
3 files changed, 13 insertions(+), 26 deletions(-)
diff --git a/arch/arm/boot/dts/stih407-family.dtsi b/arch/arm/boot/dts/stih407-family.dtsi
index 9975e8f..5b454d9 100644
--- a/arch/arm/boot/dts/stih407-family.dtsi
+++ b/arch/arm/boot/dts/stih407-family.dtsi
@@ -152,6 +152,19 @@
<ST_IRQ_SYSCFG_DISABLED>;
};
+ /* Display */
+ vtg_main: sti-vtg-main at 8d02800 {
+ compatible = "st,vtg";
+ reg = <0x8d02800 0x200>;
+ interrupts = <GIC_SPI 108 IRQ_TYPE_NONE>;
+ };
+
+ vtg_aux: sti-vtg-aux at 8d00200 {
+ compatible = "st,vtg";
+ reg = <0x8d00200 0x100>;
+ interrupts = <GIC_SPI 109 IRQ_TYPE_NONE>;
+ };
+
serial at 9830000 {
compatible = "st,asc";
reg = <0x9830000 0x2c>;
diff --git a/arch/arm/boot/dts/stih407.dtsi b/arch/arm/boot/dts/stih407.dtsi
index 3efa3b2..98c3468 100644
--- a/arch/arm/boot/dts/stih407.dtsi
+++ b/arch/arm/boot/dts/stih407.dtsi
@@ -10,19 +10,6 @@
#include "stih407-family.dtsi"
/ {
soc {
- /* Display */
- vtg_main: sti-vtg-main at 8d02800 {
- compatible = "st,vtg";
- reg = <0x8d02800 0x200>;
- interrupts = <GIC_SPI 108 IRQ_TYPE_NONE>;
- };
-
- vtg_aux: sti-vtg-aux at 8d00200 {
- compatible = "st,vtg";
- reg = <0x8d00200 0x100>;
- interrupts = <GIC_SPI 109 IRQ_TYPE_NONE>;
- };
-
sti-display-subsystem {
compatible = "st,sti-display-subsystem";
#address-cells = <1>;
diff --git a/arch/arm/boot/dts/stih410.dtsi b/arch/arm/boot/dts/stih410.dtsi
index 6f40bc9..23f4a48 100644
--- a/arch/arm/boot/dts/stih410.dtsi
+++ b/arch/arm/boot/dts/stih410.dtsi
@@ -85,19 +85,6 @@
phy-names = "usb";
};
- /* Display */
- vtg_main: sti-vtg-main at 8d02800 {
- compatible = "st,vtg";
- reg = <0x8d02800 0x200>;
- interrupts = <GIC_SPI 108 IRQ_TYPE_NONE>;
- };
-
- vtg_aux: sti-vtg-aux at 8d00200 {
- compatible = "st,vtg";
- reg = <0x8d00200 0x100>;
- interrupts = <GIC_SPI 109 IRQ_TYPE_NONE>;
- };
-
sti-display-subsystem {
compatible = "st,sti-display-subsystem";
#address-cells = <1>;
--
1.9.1
^ permalink raw reply related [flat|nested] 8+ messages in thread* [PATCH 3/3] ARM: dts: stih410: Enable USB2.0 and related PHY nodes at board level
2015-09-23 19:37 [PATCH 0/3] ARM: dts: Various STi DT clean-ups Maxime Coquelin
2015-09-23 19:37 ` [PATCH 1/3] ARM: dts: stih407: Enable PWM nodes only board level Maxime Coquelin
2015-09-23 19:37 ` [PATCH 2/3] ARM: dts: stih407/410: Tidy up display nodes Maxime Coquelin
@ 2015-09-23 19:37 ` Maxime Coquelin
2015-09-24 6:58 ` [STLinux Kernel] " Patrice Chotard
2015-09-27 22:45 ` [STLinux Kernel] [PATCH 0/3] ARM: dts: Various STi DT clean-ups Peter Griffin
2015-09-30 9:15 ` Maxime Coquelin
4 siblings, 1 reply; 8+ messages in thread
From: Maxime Coquelin @ 2015-09-23 19:37 UTC (permalink / raw)
To: linux-arm-kernel
A borad might not expose the USB2.0 ports, so disable them by default in SoC
file, and enable them in b2120 board.
Signed-off-by: Maxime Coquelin <maxime.coquelin@st•com>
---
arch/arm/boot/dts/stih410-b2120.dts | 24 ++++++++++++++++++++++++
arch/arm/boot/dts/stih410.dtsi | 12 ++++++++++++
2 files changed, 36 insertions(+)
diff --git a/arch/arm/boot/dts/stih410-b2120.dts b/arch/arm/boot/dts/stih410-b2120.dts
index 16f02c5..8af1e73 100644
--- a/arch/arm/boot/dts/stih410-b2120.dts
+++ b/arch/arm/boot/dts/stih410-b2120.dts
@@ -35,5 +35,29 @@
sd-uhs-sdr104;
sd-uhs-ddr50;
};
+
+ usb2_picophy1: phy2 {
+ status = "okay";
+ };
+
+ usb2_picophy2: phy3 {
+ status = "okay";
+ };
+
+ ohci0: usb at 9a03c00 {
+ status = "okay";
+ };
+
+ ehci0: usb at 9a03e00 {
+ status = "okay";
+ };
+
+ ohci1: usb at 9a83c00 {
+ status = "okay";
+ };
+
+ ehci1: usb at 9a83e00 {
+ status = "okay";
+ };
};
};
diff --git a/arch/arm/boot/dts/stih410.dtsi b/arch/arm/boot/dts/stih410.dtsi
index 23f4a48..e3150e3 100644
--- a/arch/arm/boot/dts/stih410.dtsi
+++ b/arch/arm/boot/dts/stih410.dtsi
@@ -22,6 +22,8 @@
resets = <&softreset STIH407_PICOPHY_SOFTRESET>,
<&picophyreset STIH407_PICOPHY0_RESET>;
reset-names = "global", "port";
+
+ status = "disabled";
};
usb2_picophy2: phy3 {
@@ -31,6 +33,8 @@
resets = <&softreset STIH407_PICOPHY_SOFTRESET>,
<&picophyreset STIH407_PICOPHY1_RESET>;
reset-names = "global", "port";
+
+ status = "disabled";
};
ohci0: usb at 9a03c00 {
@@ -43,6 +47,8 @@
reset-names = "power", "softreset";
phys = <&usb2_picophy1>;
phy-names = "usb";
+
+ status = "disabled";
};
ehci0: usb at 9a03e00 {
@@ -57,6 +63,8 @@
reset-names = "power", "softreset";
phys = <&usb2_picophy1>;
phy-names = "usb";
+
+ status = "disabled";
};
ohci1: usb at 9a83c00 {
@@ -69,6 +77,8 @@
reset-names = "power", "softreset";
phys = <&usb2_picophy2>;
phy-names = "usb";
+
+ status = "disabled";
};
ehci1: usb at 9a83e00 {
@@ -83,6 +93,8 @@
reset-names = "power", "softreset";
phys = <&usb2_picophy2>;
phy-names = "usb";
+
+ status = "disabled";
};
sti-display-subsystem {
--
1.9.1
^ permalink raw reply related [flat|nested] 8+ messages in thread* [STLinux Kernel] [PATCH 3/3] ARM: dts: stih410: Enable USB2.0 and related PHY nodes at board level
2015-09-23 19:37 ` [PATCH 3/3] ARM: dts: stih410: Enable USB2.0 and related PHY nodes at board level Maxime Coquelin
@ 2015-09-24 6:58 ` Patrice Chotard
2015-09-29 8:56 ` Maxime Coquelin
0 siblings, 1 reply; 8+ messages in thread
From: Patrice Chotard @ 2015-09-24 6:58 UTC (permalink / raw)
To: linux-arm-kernel
Hi Max
On 09/23/2015 09:37 PM, Maxime Coquelin wrote:
> A borad might not expose the USB2.0 ports, so disable them by default in SoC
typo borad
Otherwise, for the series
Acked-by: Patrice Chotard <patrice.chotard@st•com>
Patrice
> file, and enable them in b2120 board.
>
> Signed-off-by: Maxime Coquelin <maxime.coquelin@st•com>
> ---
> arch/arm/boot/dts/stih410-b2120.dts | 24 ++++++++++++++++++++++++
> arch/arm/boot/dts/stih410.dtsi | 12 ++++++++++++
> 2 files changed, 36 insertions(+)
>
> diff --git a/arch/arm/boot/dts/stih410-b2120.dts b/arch/arm/boot/dts/stih410-b2120.dts
> index 16f02c5..8af1e73 100644
> --- a/arch/arm/boot/dts/stih410-b2120.dts
> +++ b/arch/arm/boot/dts/stih410-b2120.dts
> @@ -35,5 +35,29 @@
> sd-uhs-sdr104;
> sd-uhs-ddr50;
> };
> +
> + usb2_picophy1: phy2 {
> + status = "okay";
> + };
> +
> + usb2_picophy2: phy3 {
> + status = "okay";
> + };
> +
> + ohci0: usb at 9a03c00 {
> + status = "okay";
> + };
> +
> + ehci0: usb at 9a03e00 {
> + status = "okay";
> + };
> +
> + ohci1: usb at 9a83c00 {
> + status = "okay";
> + };
> +
> + ehci1: usb at 9a83e00 {
> + status = "okay";
> + };
> };
> };
> diff --git a/arch/arm/boot/dts/stih410.dtsi b/arch/arm/boot/dts/stih410.dtsi
> index 23f4a48..e3150e3 100644
> --- a/arch/arm/boot/dts/stih410.dtsi
> +++ b/arch/arm/boot/dts/stih410.dtsi
> @@ -22,6 +22,8 @@
> resets = <&softreset STIH407_PICOPHY_SOFTRESET>,
> <&picophyreset STIH407_PICOPHY0_RESET>;
> reset-names = "global", "port";
> +
> + status = "disabled";
> };
>
> usb2_picophy2: phy3 {
> @@ -31,6 +33,8 @@
> resets = <&softreset STIH407_PICOPHY_SOFTRESET>,
> <&picophyreset STIH407_PICOPHY1_RESET>;
> reset-names = "global", "port";
> +
> + status = "disabled";
> };
>
> ohci0: usb at 9a03c00 {
> @@ -43,6 +47,8 @@
> reset-names = "power", "softreset";
> phys = <&usb2_picophy1>;
> phy-names = "usb";
> +
> + status = "disabled";
> };
>
> ehci0: usb at 9a03e00 {
> @@ -57,6 +63,8 @@
> reset-names = "power", "softreset";
> phys = <&usb2_picophy1>;
> phy-names = "usb";
> +
> + status = "disabled";
> };
>
> ohci1: usb at 9a83c00 {
> @@ -69,6 +77,8 @@
> reset-names = "power", "softreset";
> phys = <&usb2_picophy2>;
> phy-names = "usb";
> +
> + status = "disabled";
> };
>
> ehci1: usb at 9a83e00 {
> @@ -83,6 +93,8 @@
> reset-names = "power", "softreset";
> phys = <&usb2_picophy2>;
> phy-names = "usb";
> +
> + status = "disabled";
> };
>
> sti-display-subsystem {
^ permalink raw reply [flat|nested] 8+ messages in thread* [STLinux Kernel] [PATCH 3/3] ARM: dts: stih410: Enable USB2.0 and related PHY nodes at board level
2015-09-24 6:58 ` [STLinux Kernel] " Patrice Chotard
@ 2015-09-29 8:56 ` Maxime Coquelin
0 siblings, 0 replies; 8+ messages in thread
From: Maxime Coquelin @ 2015-09-29 8:56 UTC (permalink / raw)
To: linux-arm-kernel
On 09/24/2015 08:58 AM, Patrice Chotard wrote:
> Hi Max
>
> On 09/23/2015 09:37 PM, Maxime Coquelin wrote:
>> A borad might not expose the USB2.0 ports, so disable them by default
>> in SoC
>
> typo borad
>
> Otherwise, for the series
>
> Acked-by: Patrice Chotard <patrice.chotard@st•com>
>
Thanks Patrice, I will fix the typo before sending the pull request.
Regards,
Maxime
^ permalink raw reply [flat|nested] 8+ messages in thread
* [STLinux Kernel] [PATCH 0/3] ARM: dts: Various STi DT clean-ups
2015-09-23 19:37 [PATCH 0/3] ARM: dts: Various STi DT clean-ups Maxime Coquelin
` (2 preceding siblings ...)
2015-09-23 19:37 ` [PATCH 3/3] ARM: dts: stih410: Enable USB2.0 and related PHY nodes at board level Maxime Coquelin
@ 2015-09-27 22:45 ` Peter Griffin
2015-09-30 9:15 ` Maxime Coquelin
4 siblings, 0 replies; 8+ messages in thread
From: Peter Griffin @ 2015-09-27 22:45 UTC (permalink / raw)
To: linux-arm-kernel
Hi Maxime,
On Wed, 23 Sep 2015, Maxime Coquelin wrote:
> This series cleans the STi407 family DTs, by factorizing common nodes between
> STiH407 and STiH410, and also by only enabling PWM and USB nodes at board
> level, as they could not be exposed on some boards.
For the series: -
Acked-by: Peter Griffin <peter.griffin@linaro•org>
regards,
Peter.
^ permalink raw reply [flat|nested] 8+ messages in thread* [PATCH 0/3] ARM: dts: Various STi DT clean-ups
2015-09-23 19:37 [PATCH 0/3] ARM: dts: Various STi DT clean-ups Maxime Coquelin
` (3 preceding siblings ...)
2015-09-27 22:45 ` [STLinux Kernel] [PATCH 0/3] ARM: dts: Various STi DT clean-ups Peter Griffin
@ 2015-09-30 9:15 ` Maxime Coquelin
4 siblings, 0 replies; 8+ messages in thread
From: Maxime Coquelin @ 2015-09-30 9:15 UTC (permalink / raw)
To: linux-arm-kernel
On 09/23/2015 09:37 PM, Maxime Coquelin wrote:
> This series cleans the STi407 family DTs, by factorizing common nodes between
> STiH407 and STiH410, and also by only enabling PWM and USB nodes at board
> level, as they could not be exposed on some boards.
>
> Maxime Coquelin (3):
> ARM: dts: stih407: Enable PWM nodes only board level
> ARM: dts: stih407/410: Tidy up display nodes
> ARM: dts: stih410: Enable USB2.0 and related PHY nodes at board level
>
> arch/arm/boot/dts/stih407-family.dtsi | 19 +++++++++++++++++--
> arch/arm/boot/dts/stih407.dtsi | 13 -------------
> arch/arm/boot/dts/stih410-b2120.dts | 24 ++++++++++++++++++++++++
> arch/arm/boot/dts/stih410.dtsi | 23 +++++++++++------------
> arch/arm/boot/dts/stihxxx-b2120.dtsi | 8 ++++++++
> 5 files changed, 60 insertions(+), 27 deletions(-)
>
Thanks for the reviews.
Series applied to sti-dt-for-v4.4
Regards,
Maxime
^ permalink raw reply [flat|nested] 8+ messages in thread