From ead4b8fb4e6a0c2f1a856229a98de72bbac98a37 Mon Sep 17 00:00:00 2001 From: aprayoga Date: Sun, 4 Feb 2018 05:10:57 +0800 Subject: [PATCH] dts, restore pwm-fan --- .../95-helios4-device-tree.patch | 14 ++++------ ...-helios4-gpio-fan_instead_of_pwm-fan.patch | 26 ------------------- 2 files changed, 5 insertions(+), 35 deletions(-) delete mode 100644 patch/kernel/mvebu-default/95-helios4-gpio-fan_instead_of_pwm-fan.patch diff --git a/patch/kernel/mvebu-default/95-helios4-device-tree.patch b/patch/kernel/mvebu-default/95-helios4-device-tree.patch index 94d42c9846..cedf279920 100644 --- a/patch/kernel/mvebu-default/95-helios4-device-tree.patch +++ b/patch/kernel/mvebu-default/95-helios4-device-tree.patch @@ -21,7 +21,7 @@ new file mode 100644 index 0000000..19a0256 --- /dev/null +++ b/arch/arm/boot/dts/armada-388-helios4.dts -@@ -0,0 +1,333 @@ +@@ -0,0 +1,329 @@ +/* + * Device Tree file for Helios4 + * based on SolidRun Clearfog revision A1 rev 2.0 (88F6828) @@ -142,17 +142,13 @@ index 0000000..19a0256 + }; + + fan1: j10-pwm { -+ compatible = "gpio-fan"; -+ gpios = <&gpio1 9 GPIO_ACTIVE_HIGH>; -+ gpio-fan,speed-map = < 0 0 -+ 3800 1>; ++ compatible = "pwm-fan"; ++ pwms = <&gpio1 9 3800>; + }; + + fan2: j17-pwm { -+ compatible = "gpio-fan"; -+ gpios = <&gpio1 23 GPIO_ACTIVE_HIGH>; -+ gpio-fan,speed-map = < 0 0 -+ 3800 1>; ++ compatible = "pwm-fan"; ++ pwms = <&gpio1 23 3800>; + }; + + usb2_phy: usb2-phy { diff --git a/patch/kernel/mvebu-default/95-helios4-gpio-fan_instead_of_pwm-fan.patch b/patch/kernel/mvebu-default/95-helios4-gpio-fan_instead_of_pwm-fan.patch deleted file mode 100644 index b72ccb00da..0000000000 --- a/patch/kernel/mvebu-default/95-helios4-gpio-fan_instead_of_pwm-fan.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/arch/arm/boot/dts/armada-388-helios4.dts b/arch/arm/boot/dts/armada-388-helios4.dts -index ec7a5ce..1075535 100644 ---- a/arch/arm/boot/dts/armada-388-helios4.dts -+++ b/arch/arm/boot/dts/armada-388-helios4.dts -@@ -131,13 +131,17 @@ - }; - - fan1: j10-pwm { -- compatible = "pwm-fan"; -- pwms = <&gpio1 9 3800>; -+ compatible = "gpio-fan"; -+ gpios = <&gpio1 9 GPIO_ACTIVE_HIGH>; -+ gpio-fan,speed-map = < 0 0 -+ 3800 1>; - }; - - fan2: j17-pwm { -- compatible = "pwm-fan"; -- pwms = <&gpio1 23 3800>; -+ compatible = "gpio-fan"; -+ gpios = <&gpio1 23 GPIO_ACTIVE_HIGH>; -+ gpio-fan,speed-map = < 0 0 -+ 3800 1>; - }; - - usb2_phy: usb2-phy {