From: Javier Martinez Canillas <javier.martinez@collabora.co.uk>
To: Kukjin Kim <kgene.kim@samsung.com>
Cc: Doug Anderson <dianders@chromium.org>,
Olof Johansson <olof@lixom.net>,
Yuvaraj Kumar C D <yuvaraj.cd@gmail.com>,
Mark Brown <broonie@kernel.org>,
linux-samsung-soc@vger.kernel.org,
linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org,
linux-kernel@vger.kernel.org,
Javier Martinez Canillas <javier.martinez@collabora.co.uk>
Subject: [PATCH 4/6] ARM: dts: Use cros-tps65090 fragment in Peach boards
Date: Tue, 12 Aug 2014 18:44:26 +0200 [thread overview]
Message-ID: <1407861868-20097-5-git-send-email-javier.martinez@collabora.co.uk> (raw)
In-Reply-To: <1407861868-20097-1-git-send-email-javier.martinez@collabora.co.uk>
Peach Pit and Pi machines have the same regulators connection
and regulator name so the cros-tps65090 dtsi file can be used
to remove duplicated code.
Signed-off-by: Javier Martinez Canillas <javier.martinez@collabora.co.uk>
---
arch/arm/boot/dts/exynos5420-peach-pit.dts | 95 +++++++-----------------------
arch/arm/boot/dts/exynos5800-peach-pi.dts | 94 +++++++----------------------
2 files changed, 41 insertions(+), 148 deletions(-)
diff --git a/arch/arm/boot/dts/exynos5420-peach-pit.dts b/arch/arm/boot/dts/exynos5420-peach-pit.dts
index 228a6b1..a1a4410 100644
--- a/arch/arm/boot/dts/exynos5420-peach-pit.dts
+++ b/arch/arm/boot/dts/exynos5420-peach-pit.dts
@@ -93,13 +93,6 @@
pinctrl-0 = <&usb301_vbus_en>;
enable-active-high;
};
-
- vbat: fixed-regulator {
- compatible = "regulator-fixed";
- regulator-name = "vbat-supply";
- regulator-boot-on;
- regulator-always-on;
- };
};
&dp {
@@ -350,79 +343,33 @@
sbs,i2c-retry-count = <2>;
};
- power-regulator@48 {
- compatible = "ti,tps65090";
+ tps: power-regulator@48 {
reg = <0x48>;
-
- /*
- * Config irq to disable internal pulls
- * even though we run in polling mode.
- */
- pinctrl-names = "default";
- pinctrl-0 = <&tps65090_irq>;
-
- vsys1-supply = <&vbat>;
- vsys2-supply = <&vbat>;
- vsys3-supply = <&vbat>;
- infet1-supply = <&vbat>;
- infet2-supply = <&vbat>;
- infet3-supply = <&vbat>;
- infet4-supply = <&vbat>;
- infet5-supply = <&vbat>;
- infet6-supply = <&vbat>;
- infet7-supply = <&vbat>;
- vsys-l1-supply = <&vbat>;
- vsys-l2-supply = <&vbat>;
-
- regulators {
- tps65090_dcdc1: dcdc1 {
- ti,enable-ext-control;
- };
- tps65090_dcdc2: dcdc2 {
- ti,enable-ext-control;
- };
- tps65090_dcdc3: dcdc3 {
- ti,enable-ext-control;
- };
- tps65090_fet1: fet1 {
- regulator-name = "vcd_led";
- };
- tps65090_fet2: fet2 {
- regulator-name = "video_mid";
- regulator-always-on;
- };
- tps65090_fet3: fet3 {
- regulator-name = "wwan_r";
- regulator-always-on;
- };
- tps65090_fet4: fet4 {
- regulator-name = "sdcard";
- regulator-always-on;
- };
- tps65090_fet5: fet5 {
- regulator-name = "camout";
- };
- tps65090_fet6: fet6 {
- regulator-name = "lcd_vdd";
- };
- tps65090_fet7: fet7 {
- regulator-name = "video_mid_1a";
- regulator-always-on;
- };
- tps65090_ldo1: ldo1 {
- };
- tps65090_ldo2: ldo2 {
- };
- };
-
- charger {
- compatible = "ti,tps65090-charger";
- };
};
};
};
};
+#include "tps65090.dtsi"
+#include "cros-tps65090.dtsi"
+
+
+&tps65090_fet2 {
+ regulator-always-on;
+};
+
+&tps65090_fet3 {
+ regulator-always-on;
+};
+
+&tps65090_fet4 {
+ regulator-always-on;
+};
+
+&tps65090_fet7 {
+ regulator-always-on;
+};
+
&uart_3 {
status = "okay";
};
diff --git a/arch/arm/boot/dts/exynos5800-peach-pi.dts b/arch/arm/boot/dts/exynos5800-peach-pi.dts
index f3ee48b..6760839 100644
--- a/arch/arm/boot/dts/exynos5800-peach-pi.dts
+++ b/arch/arm/boot/dts/exynos5800-peach-pi.dts
@@ -91,13 +91,6 @@
pinctrl-0 = <&usb301_vbus_en>;
enable-active-high;
};
-
- vbat: fixed-regulator {
- compatible = "regulator-fixed";
- regulator-name = "vbat-supply";
- regulator-boot-on;
- regulator-always-on;
- };
};
&dp {
@@ -348,79 +341,32 @@
sbs,i2c-retry-count = <2>;
};
- power-regulator@48 {
- compatible = "ti,tps65090";
+ tps: power-regulator@48 {
reg = <0x48>;
-
- /*
- * Config irq to disable internal pulls
- * even though we run in polling mode.
- */
- pinctrl-names = "default";
- pinctrl-0 = <&tps65090_irq>;
-
- vsys1-supply = <&vbat>;
- vsys2-supply = <&vbat>;
- vsys3-supply = <&vbat>;
- infet1-supply = <&vbat>;
- infet2-supply = <&vbat>;
- infet3-supply = <&vbat>;
- infet4-supply = <&vbat>;
- infet5-supply = <&vbat>;
- infet6-supply = <&vbat>;
- infet7-supply = <&vbat>;
- vsys-l1-supply = <&vbat>;
- vsys-l2-supply = <&vbat>;
-
- regulators {
- tps65090_dcdc1: dcdc1 {
- ti,enable-ext-control;
- };
- tps65090_dcdc2: dcdc2 {
- ti,enable-ext-control;
- };
- tps65090_dcdc3: dcdc3 {
- ti,enable-ext-control;
- };
- tps65090_fet1: fet1 {
- regulator-name = "vcd_led";
- };
- tps65090_fet2: fet2 {
- regulator-name = "video_mid";
- regulator-always-on;
- };
- tps65090_fet3: fet3 {
- regulator-name = "wwan_r";
- regulator-always-on;
- };
- tps65090_fet4: fet4 {
- regulator-name = "sdcard";
- regulator-always-on;
- };
- tps65090_fet5: fet5 {
- regulator-name = "camout";
- };
- tps65090_fet6: fet6 {
- regulator-name = "lcd_vdd";
- };
- tps65090_fet7: fet7 {
- regulator-name = "video_mid_1a";
- regulator-always-on;
- };
- tps65090_ldo1: ldo1 {
- };
- tps65090_ldo2: ldo2 {
- };
- };
-
- charger {
- compatible = "ti,tps65090-charger";
- };
};
};
};
};
+#include "tps65090.dtsi"
+#include "cros-tps65090.dtsi"
+
+&tps65090_fet2 {
+ regulator-always-on;
+};
+
+&tps65090_fet3 {
+ regulator-always-on;
+};
+
+&tps65090_fet4 {
+ regulator-always-on;
+};
+
+&tps65090_fet7 {
+ regulator-always-on;
+};
+
&uart_3 {
status = "okay";
};
--
2.0.0.rc2
next prev parent reply other threads:[~2014-08-12 16:45 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-08-12 16:44 [PATCH 0/6] tps65090 DTS refactoring and improvements Javier Martinez Canillas
2014-08-12 16:44 ` [PATCH 1/6] ARM: dts: Create fragment for tps65090 PMU Javier Martinez Canillas
2014-08-12 16:58 ` Mark Brown
2014-08-12 17:21 ` Javier Martinez Canillas
2014-08-12 17:33 ` Mark Brown
2014-08-13 16:12 ` Stephen Warren
2014-08-12 16:44 ` [PATCH 2/6] ARM: dts: Use tps65090 fragment in exynos5250-snow Javier Martinez Canillas
2014-08-12 16:44 ` [PATCH 3/6] ARM: dts: Create cros-tps65090 fragment Javier Martinez Canillas
2014-08-12 17:26 ` Doug Anderson
2014-08-12 18:58 ` Javier Martinez Canillas
2014-08-12 16:44 ` Javier Martinez Canillas [this message]
2014-08-12 16:44 ` [PATCH 5/6] ARM: dts: Improve cros-tps65090 power scheme Javier Martinez Canillas
2014-08-12 16:44 ` [PATCH 6/6] ARM: dts: Add tps65090 FETs constraints Javier Martinez Canillas
2014-08-12 17:25 ` Mark Brown
2014-08-12 18:49 ` Javier Martinez Canillas
2014-08-12 21:27 ` Mark Brown
2014-08-13 11:31 ` Javier Martinez Canillas
2014-08-13 12:29 ` Mark Brown
2014-08-13 13:34 ` Javier Martinez Canillas
2014-08-13 15:51 ` Mark Brown
2014-08-13 16:58 ` Javier Martinez Canillas
2014-08-13 16:16 ` Stephen Warren
2014-08-13 17:01 ` Javier Martinez Canillas
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=1407861868-20097-5-git-send-email-javier.martinez@collabora.co.uk \
--to=javier.martinez@collabora.co.uk \
--cc=broonie@kernel.org \
--cc=devicetree@vger.kernel.org \
--cc=dianders@chromium.org \
--cc=kgene.kim@samsung.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-samsung-soc@vger.kernel.org \
--cc=olof@lixom.net \
--cc=yuvaraj.cd@gmail.com \
/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
all inboxes | Powered by JetHome®