From patchwork Wed Jul 6 18:22:59 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: ayaka X-Patchwork-Id: 9216835 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id C3C7660752 for ; Wed, 6 Jul 2016 18:25:12 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B845828335 for ; Wed, 6 Jul 2016 18:25:12 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id AC99E28338; Wed, 6 Jul 2016 18:25:12 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 24DA628335 for ; Wed, 6 Jul 2016 18:25:11 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.85_2 #1 (Red Hat Linux)) id 1bKrUM-0007P0-O2; Wed, 06 Jul 2016 18:23:58 +0000 Received: from kozue.soulik.info ([108.61.200.231]) by bombadil.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1bKrUE-0007J8-I7; Wed, 06 Jul 2016 18:23:51 +0000 Received: from ritsuko.sumomo.pri (unknown [IPv6:2001:470:b30d:2::3bd]) by kozue.soulik.info (Postfix) with ESMTPA id 3F24710560E; Thu, 7 Jul 2016 03:24:30 +0900 (JST) From: Randy Li To: devicetree@vger.kernel.org Subject: [PATCH 2/3] ARM: dts: move regulator settings from common to specifics Date: Thu, 7 Jul 2016 02:22:59 +0800 Message-Id: <1467829380-16242-3-git-send-email-ayaka@soulik.info> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1467829380-16242-1-git-send-email-ayaka@soulik.info> References: <3015470.z4L7UQJKa9@phil> <1467829380-16242-1-git-send-email-ayaka@soulik.info> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160706_112350_886459_E531D621 X-CRM114-Status: UNSURE ( 6.44 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: mark.rutland@arm.com, heiko@sntech.de, Randy Li , linux-kernel@vger.kernel.org, linux@armlinux.org.uk, linux-rockchip@lists.infradead.org, robh+dt@kernel.org, linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP The regulator settings are the same in the firefly beta and firefly release version. But the firefly reload is different. I remove the different part from the common header dtsi file, but remained those common one to keep references. Signed-off-by: Randy Li --- arch/arm/boot/dts/rk3288-firefly-beta.dts | 30 ++++++++++++++++++++++++++++++ arch/arm/boot/dts/rk3288-firefly.dts | 30 ++++++++++++++++++++++++++++++ arch/arm/boot/dts/rk3288-firefly.dtsi | 12 +++++------- 3 files changed, 65 insertions(+), 7 deletions(-) diff --git a/arch/arm/boot/dts/rk3288-firefly-beta.dts b/arch/arm/boot/dts/rk3288-firefly-beta.dts index 75d77e3..375c5d8 100644 --- a/arch/arm/boot/dts/rk3288-firefly-beta.dts +++ b/arch/arm/boot/dts/rk3288-firefly-beta.dts @@ -69,3 +69,33 @@ &pwm0 { status = "okay"; }; + +&gmac { + phy-supply = <&vcc_lan>; +}; + +&io_domains { + audio-supply = <&vcca_33>; + flash1-supply = <&vcc_lan>; +}; + +&act8846_regs { + vcca_18: REG7 { + regulator-name = "vcca_18"; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + }; + + vcca_33: REG8 { + regulator-name = "vcca_33"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + regulator-always-on; + }; + + vcc_lan: REG9 { + regulator-name = "vcc_lan"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + }; +}; diff --git a/arch/arm/boot/dts/rk3288-firefly.dts b/arch/arm/boot/dts/rk3288-firefly.dts index c07fe92..e89e575 100644 --- a/arch/arm/boot/dts/rk3288-firefly.dts +++ b/arch/arm/boot/dts/rk3288-firefly.dts @@ -69,3 +69,33 @@ &pwm1 { status = "okay"; }; + +&gmac { + phy-supply = <&vcc_lan>; +}; + +&io_domains { + audio-supply = <&vcca_33>; + flash1-supply = <&vcc_lan>; +}; + +&act8846_regs { + vcca_18: REG7 { + regulator-name = "vcca_18"; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + }; + + vcca_33: REG8 { + regulator-name = "vcca_33"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + regulator-always-on; + }; + + vcc_lan: REG9 { + regulator-name = "vcc_lan"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + }; +}; diff --git a/arch/arm/boot/dts/rk3288-firefly.dtsi b/arch/arm/boot/dts/rk3288-firefly.dtsi index 1d7f03c..194e05a 100644 --- a/arch/arm/boot/dts/rk3288-firefly.dtsi +++ b/arch/arm/boot/dts/rk3288-firefly.dtsi @@ -68,11 +68,9 @@ compatible = "rockchip,rk3288-io-voltage-domain"; rockchip,grf = <&grf>; - audio-supply = <&vcca_33>; bb-supply = <&vcc_io>; dvp-supply = <&dovdd_1v8>; flash0-supply = <&vcc_flash>; - flash1-supply = <&vcc_lan>; gpio30-supply = <&vcc_io>; gpio1830-supply = <&vcc_io>; lcdc-supply = <&vcc_io>; @@ -225,7 +223,6 @@ clock_in_out = "input"; pinctrl-names = "default"; pinctrl-0 = <&rgmii_pins>, <&phy_rst>, <&phy_pmeb>, <&phy_int>; - phy-supply = <&vcc_lan>; phy-mode = "rgmii"; snps,reset-active-low; snps,reset-delays-us = <0 10000 1000000>; @@ -296,7 +293,7 @@ inl2-supply = <&vcc_sys>; inl3-supply = <&vcc_20>; - regulators { + act8846_regs: regulators { vcc_ddr: REG1 { regulator-name = "vcc_ddr"; regulator-min-microvolt = <1200000>; @@ -339,19 +336,20 @@ regulator-always-on; }; - vcca_18: REG7 { + REG7 { regulator-name = "vcca_18"; regulator-min-microvolt = <1800000>; regulator-max-microvolt = <1800000>; }; - vcca_33: REG8 { + REG8 { regulator-name = "vcca_33"; regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; + regulator-always-on; }; - vcc_lan: REG9 { + REG9 { regulator-name = "vcc_lan"; regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>;