From: Patrice CHOTARD <patrice.chotard@foss.st.com>
To: Alain Volmat <avolmat@me.com>, Rob Herring <robh+dt@kernel.org>
Cc: Arnd Bergmann <arnd@arndb.de>,
<linux-arm-kernel@lists.infradead.org>,
<devicetree@vger.kernel.org>, <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH v2 4/7] ARM: dts: sti: move some nodes out of the soc section in stih407-family.dtsi
Date: Tue, 15 Feb 2022 17:50:42 +0100 [thread overview]
Message-ID: <70b2998b-4051-9c48-b73c-2d7434508c16@foss.st.com> (raw)
In-Reply-To: <20220211181614.683497-5-avolmat@me.com>
Hi Alain
On 2/11/22 19:16, Alain Volmat wrote:
> Move all nodes without reg property out of the soc section of
> stih407-family.dtsi and DT including stih407-family.dtsi.
> This avoid to set a <0> reg property.
>
> Signed-off-by: Alain Volmat <avolmat@me.com>
> ---
> v2: squash together 4 commits from v1 containing related modifications to
> avoid compilation issues
>
> arch/arm/boot/dts/stih407-family.dtsi | 262 +++++++++++++-------------
> arch/arm/boot/dts/stih410-b2260.dts | 14 +-
> arch/arm/boot/dts/stih418-b2199.dts | 22 +--
> arch/arm/boot/dts/stihxxx-b2120.dtsi | 22 +--
> 4 files changed, 155 insertions(+), 165 deletions(-)
>
> diff --git a/arch/arm/boot/dts/stih407-family.dtsi b/arch/arm/boot/dts/stih407-family.dtsi
> index 21f3347a91d6..1713f7878117 100644
> --- a/arch/arm/boot/dts/stih407-family.dtsi
> +++ b/arch/arm/boot/dts/stih407-family.dtsi
> @@ -115,37 +115,140 @@ pwm_regulator: pwm-regulator {
> status = "okay";
> };
>
> - soc {
> - #address-cells = <1>;
> - #size-cells = <1>;
> - interrupt-parent = <&intc>;
> + restart: restart-controller {
> + compatible = "st,stih407-restart";
> + st,syscfg = <&syscfg_sbc_reg>;
> + status = "okay";
> + };
> +
> + powerdown: powerdown-controller {
> + compatible = "st,stih407-powerdown";
> + #reset-cells = <1>;
> + };
> +
> + softreset: softreset-controller {
> + compatible = "st,stih407-softreset";
> + #reset-cells = <1>;
> + };
> +
> + picophyreset: picophyreset-controller {
> + compatible = "st,stih407-picophyreset";
> + #reset-cells = <1>;
> + };
> +
> + irq-syscfg {
> + compatible = "st,stih407-irq-syscfg";
> + st,syscfg = <&syscfg_core>;
> + st,irq-device = <ST_IRQ_SYSCFG_PMU_0>,
> + <ST_IRQ_SYSCFG_PMU_1>;
> + st,fiq-device = <ST_IRQ_SYSCFG_DISABLED>,
> + <ST_IRQ_SYSCFG_DISABLED>;
> + };
> +
> + usb2_picophy0: phy1 {
> + compatible = "st,stih407-usb2-phy";
> + #phy-cells = <0>;
> + st,syscfg = <&syscfg_core 0x100 0xf4>;
> + resets = <&softreset STIH407_PICOPHY_SOFTRESET>,
> + <&picophyreset STIH407_PICOPHY2_RESET>;
> + reset-names = "global", "port";
> + };
> +
> + miphy28lp_phy: miphy28lp {
> + compatible = "st,miphy28lp-phy";
> + st,syscfg = <&syscfg_core>;
> + #address-cells = <1>;
> + #size-cells = <1>;
> ranges;
> - compatible = "simple-bus";
>
> - restart: restart-controller@0 {
> - compatible = "st,stih407-restart";
> - reg = <0 0>;
> - st,syscfg = <&syscfg_sbc_reg>;
> - status = "okay";
> - };
> + phy_port0: port@9b22000 {
> + reg = <0x9b22000 0xff>,
> + <0x9b09000 0xff>,
> + <0x9b04000 0xff>;
> + reg-names = "sata-up",
> + "pcie-up",
> + "pipew";
> +
> + st,syscfg = <0x114 0x818 0xe0 0xec>;
> + #phy-cells = <1>;
>
> - powerdown: powerdown-controller@0 {
> - compatible = "st,stih407-powerdown";
> - reg = <0 0>;
> - #reset-cells = <1>;
> + reset-names = "miphy-sw-rst";
> + resets = <&softreset STIH407_MIPHY0_SOFTRESET>;
> };
>
> - softreset: softreset-controller@0 {
> - compatible = "st,stih407-softreset";
> - reg = <0 0>;
> - #reset-cells = <1>;
> + phy_port1: port@9b2a000 {
> + reg = <0x9b2a000 0xff>,
> + <0x9b19000 0xff>,
> + <0x9b14000 0xff>;
> + reg-names = "sata-up",
> + "pcie-up",
> + "pipew";
> +
> + st,syscfg = <0x118 0x81c 0xe4 0xf0>;
> +
> + #phy-cells = <1>;
> +
> + reset-names = "miphy-sw-rst";
> + resets = <&softreset STIH407_MIPHY1_SOFTRESET>;
> };
>
> - picophyreset: picophyreset-controller@0 {
> - compatible = "st,stih407-picophyreset";
> - reg = <0 0>;
> - #reset-cells = <1>;
> + phy_port2: port@8f95000 {
> + reg = <0x8f95000 0xff>,
> + <0x8f90000 0xff>;
> + reg-names = "pipew",
> + "usb3-up";
> +
> + st,syscfg = <0x11c 0x820>;
> +
> + #phy-cells = <1>;
> +
> + reset-names = "miphy-sw-rst";
> + resets = <&softreset STIH407_MIPHY2_SOFTRESET>;
> };
> + };
> +
> + st231_gp0: st231-gp0 {
> + compatible = "st,st231-rproc";
> + memory-region = <&gp0_reserved>;
> + resets = <&softreset STIH407_ST231_GP0_SOFTRESET>;
> + reset-names = "sw_reset";
> + clocks = <&clk_s_c0_flexgen CLK_ST231_GP_0>;
> + clock-frequency = <600000000>;
> + st,syscfg = <&syscfg_core 0x22c>;
> + #mbox-cells = <1>;
> + mbox-names = "vq0_rx", "vq0_tx", "vq1_rx", "vq1_tx";
> + mboxes = <&mailbox0 0 2>, <&mailbox2 0 1>, <&mailbox0 0 3>, <&mailbox2 0 0>;
> + };
> +
> + st231_delta: st231-delta {
> + compatible = "st,st231-rproc";
> + memory-region = <&delta_reserved>;
> + resets = <&softreset STIH407_ST231_DMU_SOFTRESET>;
> + reset-names = "sw_reset";
> + clocks = <&clk_s_c0_flexgen CLK_ST231_DMU>;
> + clock-frequency = <600000000>;
> + st,syscfg = <&syscfg_core 0x224>;
> + #mbox-cells = <1>;
> + mbox-names = "vq0_rx", "vq0_tx", "vq1_rx", "vq1_tx";
> + mboxes = <&mailbox0 0 0>, <&mailbox3 0 1>, <&mailbox0 0 1>, <&mailbox3 0 0>;
> + };
> +
> + delta0 {
> + compatible = "st,st-delta";
> + clock-names = "delta",
> + "delta-st231",
> + "delta-flash-promip";
> + clocks = <&clk_s_c0_flexgen CLK_VID_DMU>,
> + <&clk_s_c0_flexgen CLK_ST231_DMU>,
> + <&clk_s_c0_flexgen CLK_FLASH_PROMIP>;
> + };
> +
> + soc {
> + #address-cells = <1>;
> + #size-cells = <1>;
> + interrupt-parent = <&intc>;
> + ranges;
> + compatible = "simple-bus";
>
> syscfg_sbc: sbc-syscfg@9620000 {
> compatible = "st,stih407-sbc-syscfg", "syscon";
> @@ -189,16 +292,6 @@ syscfg_lpm: lpm-syscfg@94b5100 {
> reg = <0x94b5100 0x1000>;
> };
>
> - irq-syscfg@0 {
> - compatible = "st,stih407-irq-syscfg";
> - reg = <0 0>;
> - st,syscfg = <&syscfg_core>;
> - st,irq-device = <ST_IRQ_SYSCFG_PMU_0>,
> - <ST_IRQ_SYSCFG_PMU_1>;
> - st,fiq-device = <ST_IRQ_SYSCFG_DISABLED>,
> - <ST_IRQ_SYSCFG_DISABLED>;
> - };
> -
> /* Display */
> vtg_main: sti-vtg-main@8d02800 {
> compatible = "st,vtg";
> @@ -389,70 +482,6 @@ i2c@9541000 {
> status = "disabled";
> };
>
> - usb2_picophy0: phy1@0 {
> - compatible = "st,stih407-usb2-phy";
> - reg = <0 0>;
> - #phy-cells = <0>;
> - st,syscfg = <&syscfg_core 0x100 0xf4>;
> - resets = <&softreset STIH407_PICOPHY_SOFTRESET>,
> - <&picophyreset STIH407_PICOPHY2_RESET>;
> - reset-names = "global", "port";
> - };
> -
> - miphy28lp_phy: miphy28lp@0 {
> - compatible = "st,miphy28lp-phy";
> - st,syscfg = <&syscfg_core>;
> - #address-cells = <1>;
> - #size-cells = <1>;
> - ranges;
> - reg = <0 0>;
> -
> - phy_port0: port@9b22000 {
> - reg = <0x9b22000 0xff>,
> - <0x9b09000 0xff>,
> - <0x9b04000 0xff>;
> - reg-names = "sata-up",
> - "pcie-up",
> - "pipew";
> -
> - st,syscfg = <0x114 0x818 0xe0 0xec>;
> - #phy-cells = <1>;
> -
> - reset-names = "miphy-sw-rst";
> - resets = <&softreset STIH407_MIPHY0_SOFTRESET>;
> - };
> -
> - phy_port1: port@9b2a000 {
> - reg = <0x9b2a000 0xff>,
> - <0x9b19000 0xff>,
> - <0x9b14000 0xff>;
> - reg-names = "sata-up",
> - "pcie-up",
> - "pipew";
> -
> - st,syscfg = <0x118 0x81c 0xe4 0xf0>;
> -
> - #phy-cells = <1>;
> -
> - reset-names = "miphy-sw-rst";
> - resets = <&softreset STIH407_MIPHY1_SOFTRESET>;
> - };
> -
> - phy_port2: port@8f95000 {
> - reg = <0x8f95000 0xff>,
> - <0x8f90000 0xff>;
> - reg-names = "pipew",
> - "usb3-up";
> -
> - st,syscfg = <0x11c 0x820>;
> -
> - #phy-cells = <1>;
> -
> - reset-names = "miphy-sw-rst";
> - resets = <&softreset STIH407_MIPHY2_SOFTRESET>;
> - };
> - };
> -
> spi@9840000 {
> compatible = "st,comms-ssc4-spi";
> reg = <0x9840000 0x110>;
> @@ -815,34 +844,6 @@ mailbox3: mailbox@8f03000 {
> status = "okay";
> };
>
> - st231_gp0: st231-gp0@0 {
> - compatible = "st,st231-rproc";
> - reg = <0 0>;
> - memory-region = <&gp0_reserved>;
> - resets = <&softreset STIH407_ST231_GP0_SOFTRESET>;
> - reset-names = "sw_reset";
> - clocks = <&clk_s_c0_flexgen CLK_ST231_GP_0>;
> - clock-frequency = <600000000>;
> - st,syscfg = <&syscfg_core 0x22c>;
> - #mbox-cells = <1>;
> - mbox-names = "vq0_rx", "vq0_tx", "vq1_rx", "vq1_tx";
> - mboxes = <&mailbox0 0 2>, <&mailbox2 0 1>, <&mailbox0 0 3>, <&mailbox2 0 0>;
> - };
> -
> - st231_delta: st231-delta@0 {
> - compatible = "st,st231-rproc";
> - reg = <0 0>;
> - memory-region = <&delta_reserved>;
> - resets = <&softreset STIH407_ST231_DMU_SOFTRESET>;
> - reset-names = "sw_reset";
> - clocks = <&clk_s_c0_flexgen CLK_ST231_DMU>;
> - clock-frequency = <600000000>;
> - st,syscfg = <&syscfg_core 0x224>;
> - #mbox-cells = <1>;
> - mbox-names = "vq0_rx", "vq0_tx", "vq1_rx", "vq1_tx";
> - mboxes = <&mailbox0 0 0>, <&mailbox3 0 1>, <&mailbox0 0 1>, <&mailbox3 0 0>;
> - };
> -
> /* fdma audio */
> fdma0: dma-controller@8e20000 {
> compatible = "st,stih407-fdma-mpe31-11", "st,slim-rproc";
> @@ -986,16 +987,5 @@ sti_uni_reader1: sti-uni-reader@8d84000 {
>
> status = "disabled";
> };
> -
> - delta0@0 {
> - compatible = "st,st-delta";
> - reg = <0 0>;
> - clock-names = "delta",
> - "delta-st231",
> - "delta-flash-promip";
> - clocks = <&clk_s_c0_flexgen CLK_VID_DMU>,
> - <&clk_s_c0_flexgen CLK_ST231_DMU>,
> - <&clk_s_c0_flexgen CLK_FLASH_PROMIP>;
> - };
> };
> };
> diff --git a/arch/arm/boot/dts/stih410-b2260.dts b/arch/arm/boot/dts/stih410-b2260.dts
> index 9d579c16c295..c2d3b6de55d0 100644
> --- a/arch/arm/boot/dts/stih410-b2260.dts
> +++ b/arch/arm/boot/dts/stih410-b2260.dts
> @@ -75,6 +75,13 @@ codec {
> };
> };
>
> + miphy28lp_phy: miphy28lp {
> +
> + phy_port1: port@9b2a000 {
> + st,osc-force-ext;
> + };
> + };
> +
> soc {
> /* Low speed expansion connector */
> uart0: serial@9830000 {
> @@ -196,13 +203,6 @@ hdmiddc: i2c@9541000 {
> status = "okay";
> };
>
> - miphy28lp_phy: miphy28lp@0 {
> -
> - phy_port1: port@9b2a000 {
> - st,osc-force-ext;
> - };
> - };
> -
> sata1: sata@9b28000 {
> status = "okay";
> };
> diff --git a/arch/arm/boot/dts/stih418-b2199.dts b/arch/arm/boot/dts/stih418-b2199.dts
> index b66e2b29edea..d21bcc7c1271 100644
> --- a/arch/arm/boot/dts/stih418-b2199.dts
> +++ b/arch/arm/boot/dts/stih418-b2199.dts
> @@ -37,6 +37,17 @@ green {
> };
> };
>
> + miphy28lp_phy: miphy28lp {
> +
> + phy_port0: port@9b22000 {
> + st,osc-rdy;
> + };
> +
> + phy_port1: port@9b2a000 {
> + st,osc-force-ext;
> + };
> + };
> +
> soc {
> sbc_serial0: serial@9530000 {
> status = "okay";
> @@ -84,17 +95,6 @@ mmc0: sdhci@9060000 {
> non-removable;
> };
>
> - miphy28lp_phy: miphy28lp@0 {
> -
> - phy_port0: port@9b22000 {
> - st,osc-rdy;
> - };
> -
> - phy_port1: port@9b2a000 {
> - st,osc-force-ext;
> - };
> - };
> -
> st_dwc3: dwc3@8f94000 {
> status = "okay";
> };
> diff --git a/arch/arm/boot/dts/stihxxx-b2120.dtsi b/arch/arm/boot/dts/stihxxx-b2120.dtsi
> index d051f080e52e..4c72dedcd1be 100644
> --- a/arch/arm/boot/dts/stihxxx-b2120.dtsi
> +++ b/arch/arm/boot/dts/stihxxx-b2120.dtsi
> @@ -71,6 +71,17 @@ codec {
> };
> };
>
> + miphy28lp_phy: miphy28lp {
> +
> + phy_port0: port@9b22000 {
> + st,osc-rdy;
> + };
> +
> + phy_port1: port@9b2a000 {
> + st,osc-force-ext;
> + };
> + };
> +
> soc {
> sbc_serial0: serial@9530000 {
> status = "okay";
> @@ -128,17 +139,6 @@ hdmiddc: i2c@9541000 {
> st,i2c-min-sda-pulse-width-us = <5>;
> };
>
> - miphy28lp_phy: miphy28lp@0 {
> -
> - phy_port0: port@9b22000 {
> - st,osc-rdy;
> - };
> -
> - phy_port1: port@9b2a000 {
> - st,osc-force-ext;
> - };
> - };
> -
> st_dwc3: dwc3@8f94000 {
> status = "okay";
> };
Reviewed-by: Patrice Chotard <patrice.chotard@foss.st.com>
Thanks
Patrice
next prev parent reply other threads:[~2022-02-15 16:51 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-11 18:16 [PATCH v2 0/7] ARM: dts: sti: various DT fixes to avoid warnings Alain Volmat
2022-02-11 18:16 ` [PATCH v2 1/7] ARM: dts: sti: ensure unique unit-address in stih407-clock Alain Volmat
2022-02-15 16:49 ` Patrice CHOTARD
2022-02-11 18:16 ` [PATCH v2 2/7] ARM: dts: sti: ensure unique unit-address in stih410-clock Alain Volmat
2022-02-15 16:50 ` Patrice CHOTARD
2022-02-11 18:16 ` [PATCH v2 3/7] ARM: dts: sti: ensure unique unit-address in stih418-clock Alain Volmat
2022-02-15 16:50 ` Patrice CHOTARD
2022-02-11 18:16 ` [PATCH v2 4/7] ARM: dts: sti: move some nodes out of the soc section in stih407-family.dtsi Alain Volmat
2022-02-15 16:50 ` Patrice CHOTARD [this message]
2022-02-11 18:16 ` [PATCH v2 5/7] ARM: dts: sti: remove delta node from stih410.dtsi Alain Volmat
2022-02-15 16:50 ` Patrice CHOTARD
2022-02-11 18:16 ` [PATCH v2 6/7] ARM: dts: sti: move usb picophy nodes out of soc in stih410.dtsi Alain Volmat
2022-02-15 16:51 ` Patrice CHOTARD
2022-02-11 18:16 ` [PATCH v2 7/7] ARM: dts: sti: move usb picophy nodes out of soc in stih418.dtsi Alain Volmat
2022-02-15 16:52 ` Patrice CHOTARD
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=70b2998b-4051-9c48-b73c-2d7434508c16@foss.st.com \
--to=patrice.chotard@foss.st.com \
--cc=arnd@arndb.de \
--cc=avolmat@me.com \
--cc=devicetree@vger.kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=robh+dt@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®