tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

ARM: dts: i.MX51 boards: Switch to use standard GPIO flags definitions

Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>

authored by

Alexander Shiyan and committed by
Shawn Guo bdb3eec7 4e942303

+15 -11
+1 -1
arch/arm/boot/dts/imx51-apf51.dts
··· 36 36 pinctrl-names = "default"; 37 37 pinctrl-0 = <&pinctrl_fec>; 38 38 phy-mode = "mii"; 39 - phy-reset-gpios = <&gpio3 0 0>; 39 + phy-reset-gpios = <&gpio3 0 GPIO_ACTIVE_HIGH>; 40 40 phy-reset-duration = <1>; 41 41 status = "okay"; 42 42 };
+7 -5
arch/arm/boot/dts/imx51-apf51dev.dts
··· 48 48 49 49 user-key { 50 50 label = "user"; 51 - gpios = <&gpio1 3 0>; 51 + gpios = <&gpio1 3 GPIO_ACTIVE_HIGH>; 52 52 linux,code = <256>; /* BTN_0 */ 53 53 }; 54 54 }; ··· 58 58 59 59 user { 60 60 label = "Heartbeat"; 61 - gpios = <&gpio1 2 0>; 61 + gpios = <&gpio1 2 GPIO_ACTIVE_HIGH>; 62 62 linux,default-trigger = "heartbeat"; 63 63 }; 64 64 }; ··· 68 68 pinctrl-names = "default"; 69 69 pinctrl-0 = <&pinctrl_ecspi1>; 70 70 fsl,spi-num-chipselects = <2>; 71 - cs-gpios = <&gpio4 24 0>, <&gpio4 25 0>; 71 + cs-gpios = <&gpio4 24 GPIO_ACTIVE_HIGH>, 72 + <&gpio4 25 GPIO_ACTIVE_HIGH>; 72 73 status = "okay"; 73 74 }; 74 75 ··· 77 76 pinctrl-names = "default"; 78 77 pinctrl-0 = <&pinctrl_ecspi2>; 79 78 fsl,spi-num-chipselects = <2>; 80 - cs-gpios = <&gpio3 28 1>, <&gpio3 27 1>; 79 + cs-gpios = <&gpio3 28 GPIO_ACTIVE_LOW>, 80 + <&gpio3 27 GPIO_ACTIVE_LOW>; 81 81 status = "okay"; 82 82 }; 83 83 84 84 &esdhc1 { 85 85 pinctrl-names = "default"; 86 86 pinctrl-0 = <&pinctrl_esdhc1>; 87 - cd-gpios = <&gpio2 29 0>; 87 + cd-gpios = <&gpio2 29 GPIO_ACTIVE_HIGH>; 88 88 bus-width = <4>; 89 89 status = "okay"; 90 90 };
+6 -5
arch/arm/boot/dts/imx51-babbage.dts
··· 75 75 76 76 power { 77 77 label = "Power Button"; 78 - gpios = <&gpio2 21 0>; 78 + gpios = <&gpio2 21 GPIO_ACTIVE_HIGH>; 79 79 linux,code = <116>; /* KEY_POWER */ 80 80 gpio-key,wakeup; 81 81 }; ··· 105 105 reg=<0>; 106 106 #clock-cells = <0>; 107 107 clock-frequency = <26000000>; 108 - gpios = <&gpio4 26 1>; 108 + gpios = <&gpio4 26 GPIO_ACTIVE_LOW>; 109 109 }; 110 110 }; 111 111 }; ··· 121 121 &esdhc2 { 122 122 pinctrl-names = "default"; 123 123 pinctrl-0 = <&pinctrl_esdhc2>; 124 - cd-gpios = <&gpio1 6 0>; 125 - wp-gpios = <&gpio1 5 0>; 124 + cd-gpios = <&gpio1 6 GPIO_ACTIVE_HIGH>; 125 + wp-gpios = <&gpio1 5 GPIO_ACTIVE_HIGH>; 126 126 status = "okay"; 127 127 }; 128 128 ··· 137 137 pinctrl-names = "default"; 138 138 pinctrl-0 = <&pinctrl_ecspi1>; 139 139 fsl,spi-num-chipselects = <2>; 140 - cs-gpios = <&gpio4 24 0>, <&gpio4 25 0>; 140 + cs-gpios = <&gpio4 24 GPIO_ACTIVE_HIGH>, 141 + <&gpio4 25 GPIO_ACTIVE_HIGH>; 141 142 status = "okay"; 142 143 143 144 pmic: mc13892@0 {
+1
arch/arm/boot/dts/imx51.dtsi
··· 14 14 #include "imx51-pinfunc.h" 15 15 #include <dt-bindings/interrupt-controller/irq.h> 16 16 #include <dt-bindings/clock/imx5-clock.h> 17 + #include <dt-bindings/gpio/gpio.h> 17 18 18 19 / { 19 20 aliases {