linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
From: ayaka@soulik.info (Randy Li)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 2/3] ARM: dts: move regulator settings from common to specifics
Date: Thu,  7 Jul 2016 02:22:59 +0800	[thread overview]
Message-ID: <1467829380-16242-3-git-send-email-ayaka@soulik.info> (raw)
In-Reply-To: <1467829380-16242-1-git-send-email-ayaka@soulik.info>

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 <ayaka@soulik.info>
---
 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>;
-- 
2.7.4

  parent reply	other threads:[~2016-07-06 18:22 UTC|newest]

Thread overview: 48+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-07-06 15:25 [PATCH 0/3] ARM: dts: the dts support for rk3288 firefly reload ayaka
2016-07-06 15:25 ` [PATCH 1/3] ARM: dts: add label leds for rk3288-firefly.dtsi ayaka
2016-07-06 15:25 ` [PATCH 2/3] ARM: dts: move regulator settings from common to specifics ayaka
2016-07-06 16:13   ` Heiko Stuebner
2016-07-06 17:34     ` [PATCH 0/3] " Randy Li
2016-07-06 17:34       ` [PATCH 1/3] ARM: dts: add label leds for rk3288-firefly.dtsi Randy Li
2016-07-06 17:34       ` [PATCH 2/3] ARM: dts: move regulator settings from common to specifics Randy Li
2016-07-06 17:34       ` [PATCH 3/3] ARM: dts: add rk3288-firefly-reload Randy Li
2016-07-06 17:52     ` [PATCH 0/3] Re:[PATCH 2/3] ARM: dts: move regulator settings from common to specifics Randy Li
2016-07-06 17:52       ` [PATCH 1/3] ARM: dts: add label leds for rk3288-firefly.dtsi Randy Li
2016-07-06 17:52       ` [PATCH 2/3] ARM: dts: move regulator settings from common to specifics Randy Li
2016-07-06 17:52       ` [PATCH 3/3] ARM: dts: add rk3288-firefly-reload Randy Li
2016-07-06 18:06     ` [PATCH 2/3] ARM: dts: move regulator settings from common to specifics Randy Li
2016-07-06 18:22     ` [PATCH 0/3] ARM: dts: the dts support for rk3288 firefly reload Randy Li
2016-07-06 18:22       ` [PATCH 1/3] ARM: dts: add label leds for rk3288-firefly.dtsi Randy Li
2016-07-06 18:22       ` Randy Li [this message]
2016-07-06 18:23       ` [PATCH 3/3] ARM: dts: add rk3288-firefly-reload Randy Li
2016-07-07 21:35       ` [PATCH 0/3] ARM: dts: the dts support for rk3288 firefly reload Heiko Stuebner
2016-07-09 15:42         ` ayaka
2016-07-09 23:06           ` Heiko Stuebner
2016-07-17 15:38             ` [PATCH] " Randy Li
2016-07-17 15:38               ` [PATCH] ARM: dts: add rk3288-firefly-reload Randy Li
2016-07-17 21:01                 ` Rob Herring
2016-07-18 11:24                 ` Heiko Stübner
2016-07-18 15:32                   ` [PATCH v2] " Randy Li
2016-07-18 15:32                     ` [PATCH] " Randy Li
2016-07-18 19:46                       ` Heiko Stübner
2016-08-07  3:40                         ` Shawn Lin
2016-08-07 14:44                           ` Heiko Stuebner
2016-08-08  2:29                             ` Shawn Lin
2016-08-09  9:28                             ` 陈豪
2016-08-09 10:02                               ` 陈豪
2016-08-09 10:06                                 ` Randy Li
2016-08-09 10:58                                   ` Heiko Stübner
2016-08-10  1:12                                     ` Randy Li
2016-08-14 11:27                                       ` [PATCH 0/2] ARM: dts: rockchip: correct the regulators in firefly reload Randy Li
2016-08-14 11:27                                         ` [PATCH 1/2] ARM: dts: rockchip: remove excess sd properties for " Randy Li
2016-08-14 12:30                                           ` Heiko Stuebner
2016-08-14 12:38                                             ` ayaka
2016-08-17 14:10                                               ` Heiko Stübner
2016-08-17 17:03                                                 ` [PATCH 0/2 v2] ARM: dts: rockchip: correct the regulators in " Randy Li
2016-08-17 17:03                                                   ` [PATCH 1/2] ARM: dts: rockchip: remove excess sd properties for " Randy Li
2016-08-18 13:35                                                     ` Heiko Stübner
2016-08-18 14:20                                                       ` ayaka
2016-08-17 17:03                                                   ` [PATCH 2/2] ARM: dts: rockchip: add missing regulators for firefly reload board Randy Li
2016-08-18 16:47                                                     ` Heiko Stübner
2016-08-14 11:27                                         ` Randy Li
2016-07-06 15:25 ` [PATCH 3/3] ARM: dts: add rk3288-firefly-reload ayaka

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=1467829380-16242-3-git-send-email-ayaka@soulik.info \
    --to=ayaka@soulik.info \
    --cc=linux-arm-kernel@lists.infradead.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;
as well as URLs for NNTP newsgroup(s).