ARM: dts: Various STi DT clean-ups
cover ARM: dts: Various STi DT clean-ups
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(-)
Signature · 1 line
1.9.1
PATCH 1/3 ARM: dts: stih407: Enable PWM nodes only board level
The PWM may not be used on some boards, so enable them only the board file.
--- arch/arm/boot/dts/stih407-family.dtsi | 6 ++++-- arch/arm/boot/dts/stihxxx-b2120.dtsi | 8 ++++++++ 2 files changed, 12 insertions(+), 2 deletions(-)
arch/arm/boot/dts/stih407-family.dtsi +4 -2
@@ -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"; }; }; };
arch/arm/boot/dts/stihxxx-b2120.dtsi +8 -0
@@ -27,6 +27,14 @@ }; }; + pwm0: pwm at 9810000 { + status = "okay"; + }; + + pwm1: pwm at 9510000 { + status = "okay"; + }; + i2c at 9842000 { status = "okay"; };
Signature · 1 line
1.9.1
PATCH 2/3 ARM: dts: stih407/410: Tidy up display nodes
In reply to Maxime CoquelinThe display nodes are common to both STiH407 and STiH410, move them to the family file.
--- 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(-)
arch/arm/boot/dts/stih407-family.dtsi +13 -0
@@ -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>;
arch/arm/boot/dts/stih407.dtsi +0 -13
@@ -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>;
arch/arm/boot/dts/stih410.dtsi +0 -13
@@ -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>;
Signature · 1 line
1.9.1
PATCH 3/3 ARM: dts: stih410: Enable USB2.0 and related PHY nodes at board level
In reply to Maxime CoquelinA borad might not expose the USB2.0 ports, so disable them by default in SoC file, and enable them in b2120 board.
--- arch/arm/boot/dts/stih410-b2120.dts | 24 ++++++++++++++++++++++++ arch/arm/boot/dts/stih410.dtsi | 12 ++++++++++++ 2 files changed, 36 insertions(+)
arch/arm/boot/dts/stih410-b2120.dts +24 -0
@@ -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"; + }; }; };
arch/arm/boot/dts/stih410.dtsi +12 -0
@@ -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 {
Signature · 1 line
1.9.1
PATCH 3/3 ARM: dts: stih410: Enable USB2.0 and related PHY nodes at board level
Hi Max
Quoted 1 line · Maxime Coquelin
A borad might not expose the USB2.0 ports, so disable them by default in SoC
typo borad
Otherwise, for the series
Patrice
Quoted 100 lines
file, and enable them in b2120 board.
Signed-off-by Maxime Coquelin <[email protected]>--- arch/arm/boot/dts/stih410-b2120.dts | 24 ++++++++++++++++++++++++ arch/arm/boot/dts/stih410.dtsi | 12 ++++++++++++ 2 files changed, 36 insertions(+)arch/arm/boot/dts/stih410-b2120.dts +24
-0@@ -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"; + }; }; };arch/arm/boot/dts/stih410.dtsi +12
-0@@ -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 {
PATCH 3/3 ARM: dts: stih410: Enable USB2.0 and related PHY nodes at board level
Quoted 12 lines · Patrice Chotard
Hi Max
Quoted 2 lines · Maxime Coquelin
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 <[email protected]>
Thanks Patrice, I will fix the typo before sending the pull request.
Regards,
Maxime
cover ARM: dts: Various STi DT clean-ups
In reply to Maxime CoquelinHi Maxime,
Quoted 3 lines · Maxime Coquelin
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: -
regards,
Peter.
cover ARM: dts: Various STi DT clean-ups
In reply to Maxime CoquelinQuoted 9 lines · Maxime Coquelin
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
Quoted 7 lines
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