public inbox for linux-arm-kernel@lists.infradead.org 
 help / color / mirror / Atom feed
From: rmk+kernel@armlinux•org.uk (Russell King)
To: linux-arm-kernel@lists•infradead.org
Subject: [PATCH 12/13] ARM: dts: imx6qdl-cubox-i: rename regulators to match schematic
Date: Mon, 27 Nov 2017 16:53:06 +0000	[thread overview]
Message-ID: <E1eJMeY-0002rm-9W@rmk-PC.armlinux.org.uk> (raw)
In-Reply-To: <20171127165134.GH31757@n2100.armlinux.org.uk>

Make the regulators match the schematic - name the regulators after
one of their schematic supply names, and arrange them into their
heirarchy.

Signed-off-by: Russell King <rmk+kernel@armlinux•org.uk>
---
 arch/arm/boot/dts/imx6qdl-cubox-i.dtsi | 32 +++++++++++++++++++-------------
 1 file changed, 19 insertions(+), 13 deletions(-)

diff --git a/arch/arm/boot/dts/imx6qdl-cubox-i.dtsi b/arch/arm/boot/dts/imx6qdl-cubox-i.dtsi
index 98ec7ce1f2a3..7a3fba776661 100644
--- a/arch/arm/boot/dts/imx6qdl-cubox-i.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-cubox-i.dtsi
@@ -62,34 +62,36 @@
 		};
 	};
 
-	reg_3p3v: 3p3v {
+	v_5v0: regulator-v-5v0 {
 		compatible = "regulator-fixed";
-		regulator-name = "3P3V";
-		regulator-min-microvolt = <3300000>;
-		regulator-max-microvolt = <3300000>;
 		regulator-always-on;
+		regulator-max-microvolt = <5000000>;
+		regulator-min-microvolt = <5000000>;
+		regulator-name = "v_5v0";
 	};
 
-	reg_usbh1_vbus: usb-h1-vbus {
+	v_usb2: regulator-v-usb2 {
 		compatible = "regulator-fixed";
 		enable-active-high;
 		gpio = <&gpio1 0 0>;
 		pinctrl-names = "default";
 		pinctrl-0 = <&pinctrl_cubox_i_usbh1_vbus>;
-		regulator-name = "usb_h1_vbus";
-		regulator-min-microvolt = <5000000>;
 		regulator-max-microvolt = <5000000>;
+		regulator-min-microvolt = <5000000>;
+		regulator-name = "v_usb2";
+		vin-supply = <&v_5v0>;
 	};
 
-	reg_usbotg_vbus: usb-otg-vbus {
+	v_usb1: regulator-v-usb1 {
 		compatible = "regulator-fixed";
 		enable-active-high;
 		gpio = <&gpio3 22 0>;
 		pinctrl-names = "default";
 		pinctrl-0 = <&pinctrl_cubox_i_usbotg_vbus>;
-		regulator-name = "usb_otg_vbus";
-		regulator-min-microvolt = <5000000>;
 		regulator-max-microvolt = <5000000>;
+		regulator-min-microvolt = <5000000>;
+		regulator-name = "v_usb1";
+		vin-supply = <&v_5v0>;
 	};
 
 	sound-spdif {
@@ -237,21 +239,25 @@
 &usbh1 {
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_cubox_i_usbh1>;
-	vbus-supply = <&reg_usbh1_vbus>;
+	vbus-supply = <&v_usb2>;
 	status = "okay";
 };
 
 &usbotg {
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_cubox_i_usbotg>;
-	vbus-supply = <&reg_usbotg_vbus>;
+	vbus-supply = <&v_usb1>;
 	status = "okay";
 };
 
 &usdhc2 {
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_cubox_i_usdhc2_aux &pinctrl_cubox_i_usdhc2>;
-	vmmc-supply = <&reg_3p3v>;
+	vmmc-supply = <&vcc_3v3>;
 	cd-gpios = <&gpio1 4 GPIO_ACTIVE_LOW>;
 	status = "okay";
 };
+
+&vcc_3v3 {
+	vin-supply = <&v_5v0>;
+};
-- 
2.7.4

  parent reply	other threads:[~2017-11-27 16:53 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-11-27 16:51 [PATCH 00/13] SolidRun Hummingboard DT updates Russell King - ARM Linux
2017-11-27 16:52 ` [PATCH 01/13] ARM: dts: imx6qdl: SolidRun: remove redundant regulators node Russell King
2017-11-27 20:15   ` Fabio Estevam
2017-11-27 23:14     ` Russell King - ARM Linux
2017-11-27 23:55       ` Fabio Estevam
2017-11-27 16:52 ` [PATCH 02/13] ARM: dts: imx6qdl: SolidRun: move AR8035 into microsom Russell King
2017-11-27 20:12   ` Fabio Estevam
2017-11-27 23:13     ` Russell King - ARM Linux
2017-11-27 16:52 ` [PATCH 03/13] ARM: dts: imx6qdl: SolidRun: move microsom includes into .dts Russell King
     [not found]   ` <CALHpu36Kjy4SSn1m8ZOYwEr+9u67dobfNHiOX6s75UFGVm3atw@mail.gmail.com>
2017-11-28 10:45     ` Russell King - ARM Linux
2017-11-27 16:52 ` [PATCH 04/13] ARM: dts: imx6qdl-microsom: split out Broadcom Wi-Fi support Russell King
2017-11-27 16:52 ` [PATCH 05/13] ARM: dts: imx6qdl-microsom-brcm: rename sdio clock Russell King
2017-11-27 16:52 ` [PATCH 06/13] ARM: dts: imx6qdl-microsom: add 3.3V vcc regulator Russell King
2017-11-27 16:52 ` [PATCH 07/13] ARM: dts: imx6qdl-microsom: add support for TI Wi-Fi Russell King
2017-11-27 16:52 ` [PATCH 08/13] ARM: dts: ixm6qdl-microsom: add support for eMMC Russell King
2017-11-27 16:52 ` [PATCH 09/13] ARM: dts: imx6qdl-hummingboard: add SD card regulator Russell King
2017-11-27 20:11   ` Fabio Estevam
2017-11-27 16:52 ` [PATCH 10/13] ARM: dts: imx6qdl-hummingboard: rename regulators to match schematic Russell King
2017-11-27 16:53 ` [PATCH 11/13] ARM: dts: imx6qdl-hummingboard: fix node names Russell King
2017-11-27 16:53 ` Russell King [this message]
2017-11-27 16:53 ` [PATCH 13/13] ARM: dts: imx6qdl-cubox-i: " Russell King
2017-11-27 20:18 ` [PATCH 00/13] SolidRun Hummingboard DT updates Fabio Estevam

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=E1eJMeY-0002rm-9W@rmk-PC.armlinux.org.uk \
    --to=rmk+kernel@armlinux$(echo .)org.uk \
    --cc=linux-arm-kernel@lists$(echo .)infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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