Merge pull request torvalds#118 from hkallweit/odroidxu4-v4.2-rc1

ODROID-XU3/XU4: Enable PWM output for status LEDs in dts under 4.2rc1
EctoCosmonaut · Aug 11, 2015 · 4e537d2 · 4e537d2
2 parents 62076f1 + 9fb3ad7
commit 4e537d2
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi b/arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi
@@ -471,7 +471,7 @@
 	 */
 	pinctrl-0 = <&pwm0_out &pwm1_out &pwm2_out &pwm3_out>;
 	pinctrl-names = "default";
-	samsung,pwm-outputs = <0>;
+	samsung,pwm-outputs = <0>, <1>, <2>, <3>;
 	status = "okay";
 };
 

diff --git a/arch/arm/boot/dts/exynos5422-odroidxu4.dts b/arch/arm/boot/dts/exynos5422-odroidxu4.dts
@@ -17,6 +17,14 @@
 / {
 	model = "Hardkernel Odroid XU4";
 	compatible = "hardkernel,odroid-xu4", "samsung,exynos5800", "samsung,exynos5";
+
+	pwmleds {
+		/delete-node/ greenled;
+	};
+
+	gpioleds {
+		/delete-node/ redled;
+	};
 };
 
 &usbdrd_dwc3_1 {