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 <[email protected]>
A few minor nits below, but with or without those fixed this is a step in the right direction. Reviewed-by: John Keeping <[email protected]> > --- > 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 >
