From: John Keeping <john@metanate.com>
To: Johan Jonker <jbx6244@gmail.com>
Cc: kever.yang@rock-chips.com, sjg@chromium.org,
philipp.tomsich@vrull.eu, w.egorov@phytec.de, hl@rock-chips.com,
jernej.skrabec@gmail.com, lukma@denx.de, seanga2@gmail.com,
agust@denx.de, u-boot@lists.denx.de
Subject: Re: [PATCH v1 1/7] arm: dts: rockchip: rk3288: move io-domains nodes
Date: Wed, 15 Mar 2023 12:43:04 +0000 [thread overview]
Message-ID: <ZBG9WJU8six5Utbe@donbot> (raw)
In-Reply-To: <f52b16ea-ad7e-efaf-b8bd-e2a6307bf241@gmail.com>
On Tue, Mar 14, 2023 at 07:13:30PM +0100, Johan Jonker wrote:
> In order to better compare the Linux rk3288.dtsi version
> with the u-boot version move the io-domains nodes.
>
> Signed-off-by: Johan Jonker <jbx6244@gmail.com>
A few minor nits below, but with or without those fixed this is a step
in the right direction.
Reviewed-by: John Keeping <john@metanate.com>
> ---
> arch/arm/dts/rk3288-miqi.dtsi | 27 +++++++++++--------------
> arch/arm/dts/rk3288-phycore-som.dtsi | 30 +++++++++++++---------------
> arch/arm/dts/rk3288-popmetal.dtsi | 30 +++++++++++++---------------
> arch/arm/dts/rk3288-veyron.dtsi | 28 ++++++++++++--------------
> arch/arm/dts/rk3288.dtsi | 5 +++++
> 5 files changed, 58 insertions(+), 62 deletions(-)
>
> diff --git a/arch/arm/dts/rk3288-miqi.dtsi b/arch/arm/dts/rk3288-miqi.dtsi
> index cb80cbf2..00c8613d 100644
> --- a/arch/arm/dts/rk3288-miqi.dtsi
> +++ b/arch/arm/dts/rk3288-miqi.dtsi
> @@ -18,21 +18,6 @@
> clock-output-names = "ext_gmac";
> };
>
> - io_domains: io-domains {
> - compatible = "rockchip,rk3288-io-voltage-domain";
> - rockchip,grf = <&grf>;
> -
> - audio-supply = <&vcca_33>;
> - flash0-supply = <&vcc_flash>;
> - flash1-supply = <&vcc_lan>;
> - gpio30-supply = <&vcc_io>;
> - gpio1830-supply = <&vcc_io>;
> - lcdc-supply = <&vcc_io>;
> - sdcard-supply = <&vccio_sd>;
> - wifi-supply = <&vcc_18>;
> - };
> -
> -
> leds {
> compatible = "gpio-leds";
>
> @@ -277,6 +262,18 @@
> status = "okay";
> };
>
> +&io_domains {
> + audio-supply = <&vcca_33>;
> + flash0-supply = <&vcc_flash>;
> + flash1-supply = <&vcc_lan>;
> + gpio30-supply = <&vcc_io>;
> + gpio1830-supply = <&vcc_io>;
> + lcdc-supply = <&vcc_io>;
> + sdcard-supply = <&vccio_sd>;
> + wifi-supply = <&vcc_18>;
> + status = "okay";
To match Linux, the status property should be at the top.
> +};
> +
> &pinctrl {
> pcfg_output_high: pcfg-output-high {
> output-high;
> diff --git a/arch/arm/dts/rk3288-phycore-som.dtsi b/arch/arm/dts/rk3288-phycore-som.dtsi
> index 821525f7..70c00308 100644
> --- a/arch/arm/dts/rk3288-phycore-som.dtsi
> +++ b/arch/arm/dts/rk3288-phycore-som.dtsi
> @@ -71,22 +71,6 @@
> clock-output-names = "ext_gmac";
> };
>
> - io_domains: io_domains {
> - compatible = "rockchip,rk3288-io-voltage-domain";
> -
> - status = "okay";
> - sdcard-supply = <&vdd_io_sd>;
> - flash0-supply = <&vdd_emmc_io>;
> - flash1-supply = <&vdd_misc_1v8>;
> - gpio1830-supply = <&vdd_3v3_io>;
> - gpio30-supply = <&vdd_3v3_io>;
> - bb-supply = <&vdd_3v3_io>;
> - dvp-supply = <&vdd_3v3_io>;
> - lcdc-supply = <&vdd_3v3_io>;
> - wifi-supply = <&vdd_3v3_io>;
> - audio-supply = <&vdd_3v3_io>;
> - };
> -
> leds: user-leds {
> compatible = "gpio-leds";
> pinctrl-names = "default";
> @@ -197,6 +181,20 @@
> ddc-i2c-bus = <&i2c5>;
> };
>
> +&io_domains {
> + audio-supply = <&vdd_3v3_io>;
> + bb-supply = <&vdd_3v3_io>;
> + dvp-supply = <&vdd_3v3_io>;
> + flash0-supply = <&vdd_emmc_io>;
> + flash1-supply = <&vdd_misc_1v8>;
> + gpio1830-supply = <&vdd_3v3_io>;
> + gpio30-supply = <&vdd_3v3_io>;
> + lcdc-supply = <&vdd_3v3_io>;
> + sdcard-supply = <&vdd_io_sd>;
> + wifi-supply = <&vdd_3v3_io>;
> + status = "okay";
Likewise, the Linux version of this file has status at the top (although
the supplies are sorted very strangely in the Linux version).
> +};
> +
> &i2c0 {
> status = "okay";
> clock-frequency = <400000>;
> diff --git a/arch/arm/dts/rk3288-popmetal.dtsi b/arch/arm/dts/rk3288-popmetal.dtsi
> index 0253933a..d732a706 100644
> --- a/arch/arm/dts/rk3288-popmetal.dtsi
> +++ b/arch/arm/dts/rk3288-popmetal.dtsi
> @@ -71,22 +71,6 @@
> };
> };
>
> - io_domains: io-domains {
> - compatible = "rockchip,rk3288-io-voltage-domain";
> - rockchip,grf = <&grf>;
> -
> - audio-supply = <&vcca_33>;
> - bb-supply = <&vcc_io>;
> - dvp-supply = <&vcc18_dvp>;
> - flash0-supply = <&vcc_flash>;
> - flash1-supply = <&vcc_lan>;
> - gpio30-supply = <&vcc_io>;
> - gpio1830-supply = <&vcc_io>;
> - lcdc-supply = <&vcc_io>;
> - sdcard-supply = <&vccio_sd>;
> - wifi-supply = <&vccio_wl>;
> - };
> -
> ir: ir-receiver {
> compatible = "gpio-ir-receiver";
> gpios = <&gpio0 6 GPIO_ACTIVE_LOW>;
> @@ -443,6 +427,20 @@
> status = "okay";
> };
>
> +&io_domains {
> + audio-supply = <&vcca_33>;
> + bb-supply = <&vcc_io>;
> + dvp-supply = <&vcc18_dvp>;
> + flash0-supply = <&vcc_flash>;
> + flash1-supply = <&vcc_lan>;
> + gpio30-supply = <&vcc_io>;
> + gpio1830-supply = <&vcc_io>;
> + lcdc-supply = <&vcc_io>;
> + sdcard-supply = <&vccio_sd>;
> + wifi-supply = <&vccio_wl>;
> + status = "okay";
Again, status is first in the Linux copy.
> +};
> +
> &pinctrl {
> ak8963 {
> comp_int: comp-int {
> diff --git a/arch/arm/dts/rk3288-veyron.dtsi b/arch/arm/dts/rk3288-veyron.dtsi
> index 35db8827..434b0d49 100644
> --- a/arch/arm/dts/rk3288-veyron.dtsi
> +++ b/arch/arm/dts/rk3288-veyron.dtsi
> @@ -198,21 +198,6 @@
> /* Faux input supply. See bt_regulator description. */
> vin-supply = <&bt_regulator>;
> };
> -
> - io-domains {
> - compatible = "rockchip,rk3288-io-voltage-domain";
> - rockchip,grf = <&grf>;
> -
> - audio-supply = <&vcc18_codec>;
> - bb-supply = <&vcc33_io>;
> - dvp-supply = <&vcc_18>;
> - flash0-supply = <&vcc18_flashio>;
> - gpio1830-supply = <&vcc33_io>;
> - gpio30-supply = <&vcc33_io>;
> - lcdc-supply = <&vcc33_lcd>;
> - sdcard-supply = <&vccio_sd>;
> - wifi-supply = <&vcc18_wl>;
> - };
> };
>
> &cpu0 {
> @@ -503,6 +488,19 @@
> clocks = <&cru HCLK_I2S0>, <&cru SCLK_I2S0>, <&cru SCLK_I2S0_OUT>;
> };
>
> +&io_domains {
> + audio-supply = <&vcc18_codec>;
> + bb-supply = <&vcc33_io>;
> + dvp-supply = <&vcc_18>;
> + flash0-supply = <&vcc18_flashio>;
> + gpio1830-supply = <&vcc33_io>;
> + gpio30-supply = <&vcc33_io>;
> + lcdc-supply = <&vcc33_lcd>;
> + sdcard-supply = <&vccio_sd>;
> + wifi-supply = <&vcc18_wl>;
> + status = "okay";
Order of status again :-)
> +};
> +
> &wdt {
> status = "okay";
> };
> diff --git a/arch/arm/dts/rk3288.dtsi b/arch/arm/dts/rk3288.dtsi
> index 8c394c1e..9cfb86f9 100644
> --- a/arch/arm/dts/rk3288.dtsi
> +++ b/arch/arm/dts/rk3288.dtsi
> @@ -762,6 +762,11 @@
> grf: syscon@ff770000 {
> compatible = "rockchip,rk3288-grf", "syscon";
> reg = <0xff770000 0x1000>;
> +
> + io_domains: io-domains {
> + compatible = "rockchip,rk3288-io-voltage-domain";
> + status = "disabled";
> + };
> };
>
> wdt: watchdog@ff800000 {
> --
> 2.20.1
>
next prev parent reply other threads:[~2023-03-15 12:43 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-14 18:13 [PATCH v1 1/7] arm: dts: rockchip: rk3288: move io-domains nodes Johan Jonker
2023-03-14 18:15 ` [PATCH v1 2/7] arm: dts: rockchip: rk3288: partial sync grf and pmu nodes Johan Jonker
2023-03-15 14:05 ` Simon Glass
2023-03-14 18:16 ` [PATCH v1 3/7] video: rockchip: rk_vop: add rk3288-dp compare string Johan Jonker
2023-03-15 14:05 ` Simon Glass
2023-03-14 18:16 ` [PATCH v1 4/7] arm: dts: rockchip: rk3288: partial sync edp node Johan Jonker
2023-03-15 14:05 ` Simon Glass
2023-03-14 18:16 ` [PATCH v1 5/7] arm: dts: rockchip: rk3288: partial sync vop/lvds/mipi/hdmi nodes Johan Jonker
2023-03-15 14:05 ` Simon Glass
2023-03-14 18:16 ` [PATCH v1 6/7] clk: rockchip: clk_rk3288: add PCLK_RKPWM Johan Jonker
2023-03-15 14:05 ` Simon Glass
2023-03-14 18:16 ` [PATCH v1 7/7] arm: dts: rockchip: rk3288: partial sync pwm nodes Johan Jonker
2023-03-15 14:05 ` Simon Glass
2023-03-15 16:37 ` Johan Jonker
2023-03-15 12:43 ` John Keeping [this message]
2023-03-15 14:05 ` [PATCH v1 1/7] arm: dts: rockchip: rk3288: move io-domains nodes Simon Glass
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=ZBG9WJU8six5Utbe@donbot \
--to=john@metanate.com \
--cc=agust@denx.de \
--cc=hl@rock-chips.com \
--cc=jbx6244@gmail.com \
--cc=jernej.skrabec@gmail.com \
--cc=kever.yang@rock-chips.com \
--cc=lukma@denx.de \
--cc=philipp.tomsich@vrull.eu \
--cc=seanga2@gmail.com \
--cc=sjg@chromium.org \
--cc=u-boot@lists.denx.de \
--cc=w.egorov@phytec.de \
/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