From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 07FF0C7618A for ; Wed, 15 Mar 2023 12:43:25 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id EBC5C8625F; Wed, 15 Mar 2023 13:43:22 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=metanate.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=metanate.com header.i=@metanate.com header.b="e84W4AF+"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 89A858625E; Wed, 15 Mar 2023 13:43:19 +0100 (CET) Received: from metanate.com (unknown [IPv6:2001:8b0:1628:5005::111]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 3CD928625A for ; Wed, 15 Mar 2023 13:43:15 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=metanate.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=john@metanate.com DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=metanate.com; s=stronger; h=In-Reply-To:Content-Type:References:Message-ID: Subject:Cc:To:From:Date:Reply-To:Content-Transfer-Encoding:Content-ID: Content-Description; bh=BAYK+syeyjUlrD32AprnwDtP+iJjXe+kRDjEOrZ4KNE=; b=e84W4 AF+nLYNl3x+JQjuEzsqmwvQtqneDcCg9k4HqiQGZ6puGh5GPnJhi9oML+7GsHL7oT11J61g5HwWwK trTCT/4xZSUweEao5J+Y1NynjG5NW70zkqFHax0K0qErQkW0ULhccuJJaF5FJ2Z6rq90LRNRtoSB0 QjgKj+XT+qMYp9RxXCuDNfsF70gkk0LC/K8IQkaHgSTIsMgxWXnRyRnaOStDUckF0P6iCefelWM1w Sr0s2deejtNP1EZgpN6W4tW7hzaxUvuWzy18+8vbF90avC+Iq5fgR/EhBNh5YBfJOCVrCH7g0wFhC JlG5Hhg0bZWnNxNiGJglFAplXdCcg==; Received: from dougal.metanate.com ([192.168.88.1] helo=donbot) by email.metanate.com with esmtpsa (TLS1.3) tls TLS_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from ) id 1pcQTA-0007Iy-Sf; Wed, 15 Mar 2023 12:43:06 +0000 Date: Wed, 15 Mar 2023 12:43:04 +0000 From: John Keeping To: Johan Jonker 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 Message-ID: References: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: X-Authenticated: YES X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean 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 A few minor nits below, but with or without those fixed this is a step in the right direction. Reviewed-by: John Keeping > --- > 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 >