[PATCH 4/4] arch: arm: dts: cpcap-mapphone: Move cpcap leds from common dts file to devices as apropriate

[Carl Philipp Klemm <philipp@xxxxxxxx>]

Removes non-functional leds from xt875 and adds its touchscreen
button light

Signed-off-by: Carl Philipp Klemm <philipp@xxxxxxxx>
---
 .../arm/boot/dts/motorola-cpcap-mapphone.dtsi | 47 ++++++++-----------
 .../arm/boot/dts/omap4-droid-bionic-xt875.dts |  7 +++
 arch/arm/boot/dts/omap4-droid4-xt894.dts      | 14 ++++++
 3 files changed, 41 insertions(+), 27 deletions(-)

diff --git a/arch/arm/boot/dts/motorola-cpcap-mapphone.dtsi b/arch/arm/boot/dts/motorola-cpcap-mapphone.dtsi
index ea02fd403a9b..f7ddcf122404 100644
--- a/arch/arm/boot/dts/motorola-cpcap-mapphone.dtsi
+++ b/arch/arm/boot/dts/motorola-cpcap-mapphone.dtsi
@@ -115,36 +115,29 @@ cpcap_usb2_phy: phy {
 			io-channel-names = "vbus", "id";
 			vusb-supply = <&vusb>;
 		};
+	};
+};
 
-		led_red: led-red {
-			compatible = "motorola,cpcap-led-red";
-			vdd-supply = <&sw5>;
-			label = "status-led:red";
-		};
-
-		led_green: led-green {
-			compatible = "motorola,cpcap-led-green";
-			vdd-supply = <&sw5>;
-			label = "status-led:green";
-		};
-
-		led_blue: led-blue {
-			compatible = "motorola,cpcap-led-blue";
-			vdd-supply = <&sw5>;
-			label = "status-led:blue";
-		};
+/ {
+	led_red: led-red {
+		compatible = "motorola,cpcap-led-red";
+		vdd-supply = <&sw5>;
+		label = "status-led:red";
+		cpcap-phandle = <&cpcap>;
+	};
 
-		led_adl: led-adl {
-			compatible = "motorola,cpcap-led-adl";
-			vdd-supply = <&sw5>;
-			label = "button-backlight";
-		};
+	led_green: led-green {
+		compatible = "motorola,cpcap-led-green";
+		vdd-supply = <&sw5>;
+		label = "status-led:green";
+		cpcap-phandle = <&cpcap>;
+	};
 
-		led_cp: led-cp {
-			compatible = "motorola,cpcap-led-cp";
-			vdd-supply = <&sw5>;
-			label = "shift-key-light";
-		};
+	led_blue: led-blue {
+		compatible = "motorola,cpcap-led-blue";
+		vdd-supply = <&sw5>;
+		label = "status-led:blue";
+		cpcap-phandle = <&cpcap>;
 	};
 };
 
diff --git a/arch/arm/boot/dts/omap4-droid-bionic-xt875.dts b/arch/arm/boot/dts/omap4-droid-bionic-xt875.dts
index ccf03a743678..eae69ec9b3f1 100644
--- a/arch/arm/boot/dts/omap4-droid-bionic-xt875.dts
+++ b/arch/arm/boot/dts/omap4-droid-bionic-xt875.dts
@@ -6,6 +6,13 @@
 / {
 	model = "Motorola Droid Bionic XT875";
 	compatible = "motorola,droid-bionic", "ti,omap4430", "ti,omap4";
+
+	led_kl: led-kl {
+		compatible = "motorola,cpcap-led-kl";
+		vdd-supply = <&sw5>;
+		label = "button-backlight";
+		cpcap-phandle = <&cpcap>;
+	};
 };
 
 &keypad {
diff --git a/arch/arm/boot/dts/omap4-droid4-xt894.dts b/arch/arm/boot/dts/omap4-droid4-xt894.dts
index e833c21f1c01..a590f28edbf6 100644
--- a/arch/arm/boot/dts/omap4-droid4-xt894.dts
+++ b/arch/arm/boot/dts/omap4-droid4-xt894.dts
@@ -31,6 +31,20 @@ slider {
 			debounce-interval = <10>;
 		};
 	};
+
+	led_adl: led-adl {
+		compatible = "motorola,cpcap-led-adl";
+		vdd-supply = <&sw5>;
+		label = "button-backlight";
+		cpcap-phandle = <&cpcap>;
+	};
+
+	led_cp: led-cp {
+		compatible = "motorola,cpcap-led-cp";
+		vdd-supply = <&sw5>;
+		label = "shift-key-light";
+		cpcap-phandle = <&cpcap>;
+	};
 };
 
 / {
-- 
2.38.1