mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
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 2/6] ARM: dts: Use tps65090 fragment in exynos5250-snow
Date: Tue, 12 Aug 2014 18:44:24 +0200	[thread overview]
Message-ID: <1407861868-20097-3-git-send-email-javier.martinez@collabora.co.uk> (raw)
In-Reply-To: <1407861868-20097-1-git-send-email-javier.martinez@collabora.co.uk>

Now that there is a .dtsi fragment file for the tps65090 PMU,
include it in the Exynos Snow DTS file to reduce duplication.

Signed-off-by: Javier Martinez Canillas <javier.martinez@collabora.co.uk>
---
 arch/arm/boot/dts/exynos5250-snow.dts | 108 +++++++++++++++++-----------------
 1 file changed, 54 insertions(+), 54 deletions(-)

diff --git a/arch/arm/boot/dts/exynos5250-snow.dts b/arch/arm/boot/dts/exynos5250-snow.dts
index f2b8c41..159a497 100644
--- a/arch/arm/boot/dts/exynos5250-snow.dts
+++ b/arch/arm/boot/dts/exynos5250-snow.dts
@@ -147,8 +147,7 @@
 				wakeup-source;
 			};
 
-			power-regulator {
-				compatible = "ti,tps65090";
+			tps: power-regulator {
 				reg = <0x48>;
 
 				/*
@@ -170,58 +169,6 @@
 				infet7-supply = <&vbat>;
 				vsys-l1-supply = <&vbat>;
 				vsys-l2-supply = <&vbat>;
-
-				regulators {
-					dcdc1 {
-						ti,enable-ext-control;
-					};
-					dcdc2 {
-						ti,enable-ext-control;
-					};
-					dcdc3 {
-						ti,enable-ext-control;
-					};
-					fet1 {
-						regulator-name = "vcd_led";
-						ti,overcurrent-wait = <3>;
-					};
-					tps65090_fet2: fet2 {
-						regulator-name = "video_mid";
-						regulator-always-on;
-						ti,overcurrent-wait = <3>;
-					};
-					fet3 {
-						regulator-name = "wwan_r";
-						regulator-always-on;
-						ti,overcurrent-wait = <3>;
-					};
-					fet4 {
-						regulator-name = "sdcard";
-						ti,overcurrent-wait = <3>;
-					};
-					fet5 {
-						regulator-name = "camout";
-						regulator-always-on;
-						ti,overcurrent-wait = <3>;
-					};
-					fet6 {
-						regulator-name = "lcd_vdd";
-						ti,overcurrent-wait = <3>;
-					};
-					tps65090_fet7: fet7 {
-						regulator-name = "video_mid_1a";
-						regulator-always-on;
-						ti,overcurrent-wait = <3>;
-					};
-					ldo1 {
-					};
-					ldo2 {
-					};
-				};
-
-				charger {
-					compatible = "ti,tps65090-charger";
-				};
 			};
 		};
 	};
@@ -344,6 +291,59 @@
 	};
 };
 
+#include "tps65090.dtsi"
+
+&tps65090_dcdc1 {
+	ti,enable-ext-control;
+};
+
+&tps65090_dcdc2 {
+	ti,enable-ext-control;
+};
+
+&tps65090_dcdc3 {
+	ti,enable-ext-control;
+};
+
+&tps65090_fet1 {
+	regulator-name = "vcd_led";
+	ti,overcurrent-wait = <3>;
+};
+
+&tps65090_fet2 {
+	regulator-name = "video_mid";
+	regulator-always-on;
+	ti,overcurrent-wait = <3>;
+};
+
+&tps65090_fet3 {
+	regulator-name = "wwan_r";
+	regulator-always-on;
+	ti,overcurrent-wait = <3>;
+};
+
+&tps65090_fet4 {
+	regulator-name = "sdcard";
+	ti,overcurrent-wait = <3>;
+};
+
+&tps65090_fet5 {
+	regulator-name = "camout";
+	regulator-always-on;
+	ti,overcurrent-wait = <3>;
+};
+
+&tps65090_fet6 {
+	regulator-name = "lcd_vdd";
+	ti,overcurrent-wait = <3>;
+};
+
+&tps65090_fet7 {
+	regulator-name = "video_mid_1a";
+	regulator-always-on;
+	ti,overcurrent-wait = <3>;
+};
+
 &i2c_0 {
 	max77686@09 {
 		compatible = "maxim,max77686";
-- 
2.0.0.rc2


  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 ` Javier Martinez Canillas [this message]
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 ` [PATCH 4/6] ARM: dts: Use cros-tps65090 fragment in Peach boards Javier Martinez Canillas
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-3-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®