From: Furong Xu Date: Thu, 16 Feb 2017 02:00:48 +0000 (+0800) Subject: ramips: fix PWM pin mux conflict in dtsi X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=71ea3b481406cd44d2d94da60e6fdec5bc8a9eb9;p=lede.git ramips: fix PWM pin mux conflict in dtsi GPIO18 and GPIO19 on OMEGA2(+) should be GPIO mode, enable PWM lead to a conflict [ 0.290633] rt2880-pinmux pinctrl: pin io18 already requested by pinctrl; cannot claim for 10005000.pwm [ 0.299722] rt2880-pinmux pinctrl: pin-18 (10005000.pwm) status -22 [ 0.305729] rt2880-pinmux pinctrl: could not request pin 18 (io18) from group pwm0 on device rt2880-pinmux [ 0.315131] mtk-pwm 10005000.pwm: Error applying setting, reverse things back Keep PWM disabled. Signed-off-by: Furong Xu --- diff --git a/target/linux/ramips/dts/OMEGA2.dtsi b/target/linux/ramips/dts/OMEGA2.dtsi index 79148347f3..5d9b6198f9 100644 --- a/target/linux/ramips/dts/OMEGA2.dtsi +++ b/target/linux/ramips/dts/OMEGA2.dtsi @@ -156,10 +156,6 @@ status = "okay"; }; -&pwm { - status = "okay"; -}; - ðernet { mtd-mac-address = <&factory 0x28>; };