ARM: DT: Kirkwood: Use symbolic names from gpio.h

tjh.dev / kernel

fork atom

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

fork atom

ARM: DT: Kirkwood: Use symbolic names from gpio.h

Use GPIO_ACTIVE_HIGH and GPIO_ACTIVE_LOW instead of 0 and 1.

Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>

authored by

Andrew Lunn and committed by

Jason Cooper 12 years ago 3a31f2d7 23301190

+154 -155

33 changed files

expand all collapse all

arch

arm

boot

dts

kirkwood-cloudbox.dts

kirkwood-db.dtsi

kirkwood-dns320.dts

kirkwood-dns325.dts

kirkwood-dnskw.dtsi

kirkwood-dockstar.dts

kirkwood-dreamplug.dts

kirkwood-goflexnet.dts

kirkwood-guruplug-server-plus.dts

kirkwood-ib62x0.dts

kirkwood-iconnect.dts

kirkwood-iomega_ix2_200.dts

kirkwood-km_kirkwood.dts

kirkwood-lsxl.dtsi

kirkwood-mplcec4.dts

kirkwood-mv88f6281gtw-ge.dts

kirkwood-netgear_readynas_duo_v2.dts

kirkwood-netgear_readynas_nv+_v2.dts

kirkwood-ns2-common.dtsi

kirkwood-ns2lite.dts

kirkwood-ns2max.dts

kirkwood-ns2mini.dts

kirkwood-nsa310-common.dtsi

kirkwood-nsa310.dts

kirkwood-nsa310a.dts

kirkwood-openblocks_a6.dts

kirkwood-openblocks_a7.dts

kirkwood-sheevaplug-esata.dts

kirkwood-sheevaplug.dts

kirkwood-topkick.dts

kirkwood-ts219-6281.dts

kirkwood-ts219-6282.dts

kirkwood.dtsi

+4 -4

arch/arm/boot/dts/kirkwood-cloudbox.dts

reviewed

··· 67 67 button@1 { 68 68 label = "Power push button"; 69 69 linux,code = <KEY_POWER>; 70 70 - gpios = <&gpio0 16 1>; 70 70 + gpios = <&gpio0 16 GPIO_ACTIVE_LOW>; 71 71 }; 72 72 }; 73 73 ··· 76 76 77 77 red-fail { 78 78 label = "cloudbox:red:fail"; 79 79 - gpios = <&gpio0 14 0>; 79 79 + gpios = <&gpio0 14 GPIO_ACTIVE_HIGH>; 80 80 }; 81 81 blue-sata { 82 82 label = "cloudbox:blue:sata"; 83 83 - gpios = <&gpio0 15 0>; 83 83 + gpios = <&gpio0 15 GPIO_ACTIVE_HIGH>; 84 84 }; 85 85 }; 86 86 87 87 gpio_poweroff { 88 88 compatible = "gpio-poweroff"; 89 89 - gpios = <&gpio0 17 0>; 89 89 + gpios = <&gpio0 17 GPIO_ACTIVE_HIGH>; 90 90 }; 91 91 }; 92 92

+2 -2

arch/arm/boot/dts/kirkwood-db.dtsi

reviewed

··· 51 51 mvsdio@90000 { 52 52 pinctrl-0 = <&pmx_sdio_gpios>; 53 53 pinctrl-names = "default"; 54 54 - wp-gpios = <&gpio1 5 0>; 55 55 - cd-gpios = <&gpio1 6 0>; 54 54 + wp-gpios = <&gpio1 5 GPIO_ACTIVE_HIGH>; 55 55 + cd-gpios = <&gpio1 6 GPIO_ACTIVE_HIGH>; 56 56 status = "okay"; 57 57 }; 58 58 };

+5 -5

arch/arm/boot/dts/kirkwood-dns320.dts

reviewed

··· 24 24 25 25 blue-power { 26 26 label = "dns320:blue:power"; 27 27 - gpios = <&gpio0 26 1>; /* GPIO 26 Active Low */ 27 27 + gpios = <&gpio0 26 GPIO_ACTIVE_LOW>; 28 28 default-state = "keep"; 29 29 }; 30 30 blue-usb { 31 31 label = "dns320:blue:usb"; 32 32 - gpios = <&gpio1 11 1>; /* GPIO 43 Active Low */ 32 32 + gpios = <&gpio1 11 GPIO_ACTIVE_LOW>; 33 33 }; 34 34 orange-l_hdd { 35 35 label = "dns320:orange:l_hdd"; 36 36 - gpios = <&gpio0 28 1>; /* GPIO 28 Active Low */ 36 36 + gpios = <&gpio0 28 GPIO_ACTIVE_LOW>; 37 37 }; 38 38 orange-r_hdd { 39 39 label = "dns320:orange:r_hdd"; 40 40 - gpios = <&gpio0 27 1>; /* GPIO 27 Active Low */ 40 40 + gpios = <&gpio0 27 GPIO_ACTIVE_LOW>; 41 41 }; 42 42 orange-usb { 43 43 label = "dns320:orange:usb"; 44 44 - gpios = <&gpio1 3 1>; /* GPIO 35 Active Low */ 44 44 + gpios = <&gpio1 3 GPIO_ACTIVE_LOW>; /* GPIO 35 */ 45 45 }; 46 46 }; 47 47

+5 -5

arch/arm/boot/dts/kirkwood-dns325.dts

reviewed

··· 24 24 25 25 white-power { 26 26 label = "dns325:white:power"; 27 27 - gpios = <&gpio0 26 1>; /* GPIO 26 Active Low */ 27 27 + gpios = <&gpio0 26 GPIO_ACTIVE_LOW>; 28 28 default-state = "keep"; 29 29 }; 30 30 white-usb { 31 31 label = "dns325:white:usb"; 32 32 - gpios = <&gpio1 11 1>; /* GPIO 43 Active Low */ 32 32 + gpios = <&gpio1 11 GPIO_ACTIVE_LOW>; /* GPIO 43 */ 33 33 }; 34 34 red-l_hdd { 35 35 label = "dns325:red:l_hdd"; 36 36 - gpios = <&gpio0 28 1>; /* GPIO 28 Active Low */ 36 36 + gpios = <&gpio0 28 GPIO_ACTIVE_LOW>; 37 37 }; 38 38 red-r_hdd { 39 39 label = "dns325:red:r_hdd"; 40 40 - gpios = <&gpio0 27 1>; /* GPIO 27 Active Low */ 40 40 + gpios = <&gpio0 27 GPIO_ACTIVE_LOW>; 41 41 }; 42 42 red-usb { 43 43 label = "dns325:red:usb"; 44 44 - gpios = <&gpio0 29 1>; /* GPIO 29 Active Low */ 44 44 + gpios = <&gpio0 29 GPIO_ACTIVE_LOW>; 45 45 }; 46 46 }; 47 47

+6 -6

arch/arm/boot/dts/kirkwood-dnskw.dtsi

reviewed

··· 16 16 button@1 { 17 17 label = "Power button"; 18 18 linux,code = <KEY_POWER>; 19 19 - gpios = <&gpio1 2 1>; 19 19 + gpios = <&gpio1 2 GPIO_ACTIVE_LOW>; 20 20 }; 21 21 button@2 { 22 22 label = "USB unmount button"; 23 23 linux,code = <KEY_EJECTCD>; 24 24 - gpios = <&gpio1 15 1>; 24 24 + gpios = <&gpio1 15 GPIO_ACTIVE_LOW>; 25 25 }; 26 26 button@3 { 27 27 label = "Reset button"; 28 28 linux,code = <KEY_RESTART>; 29 29 - gpios = <&gpio1 16 1>; 29 29 + gpios = <&gpio1 16 GPIO_ACTIVE_LOW>; 30 30 }; 31 31 }; 32 32 ··· 35 35 compatible = "gpio-fan"; 36 36 pinctrl-0 = <&pmx_fan_high_speed &pmx_fan_low_speed>; 37 37 pinctrl-names = "default"; 38 38 - gpios = <&gpio1 14 1 39 39 - &gpio1 13 1>; 38 38 + gpios = <&gpio1 14 GPIO_ACTIVE_LOW 39 39 + &gpio1 13 GPIO_ACTIVE_LOW>; 40 40 gpio-fan,speed-map = <0 0 41 41 3000 1 42 42 6000 2>; ··· 46 46 compatible = "gpio-poweroff"; 47 47 pinctrl-0 = <&pmx_power_off>; 48 48 pinctrl-names = "default"; 49 49 - gpios = <&gpio1 4 0>; 49 49 + gpios = <&gpio1 4 GPIO_ACTIVE_HIGH>; 50 50 }; 51 51 52 52 ocp@f1000000 {

+2 -2

arch/arm/boot/dts/kirkwood-dockstar.dts

reviewed

··· 42 42 43 43 health { 44 44 label = "status:green:health"; 45 45 - gpios = <&gpio1 14 1>; 45 45 + gpios = <&gpio1 14 GPIO_ACTIVE_LOW>; 46 46 default-state = "keep"; 47 47 }; 48 48 fault { 49 49 label = "status:orange:fault"; 50 50 - gpios = <&gpio1 15 1>; 50 50 + gpios = <&gpio1 15 GPIO_ACTIVE_LOW>; 51 51 }; 52 52 }; 53 53 regulators {

+3 -3

arch/arm/boot/dts/kirkwood-dreamplug.dts

reviewed

··· 87 87 88 88 bluetooth { 89 89 label = "dreamplug:blue:bluetooth"; 90 90 - gpios = <&gpio1 15 1>; 90 90 + gpios = <&gpio1 15 GPIO_ACTIVE_LOW>; 91 91 }; 92 92 wifi { 93 93 label = "dreamplug:green:wifi"; 94 94 - gpios = <&gpio1 16 1>; 94 94 + gpios = <&gpio1 16 GPIO_ACTIVE_LOW>; 95 95 }; 96 96 wifi-ap { 97 97 label = "dreamplug:green:wifi_ap"; 98 98 - gpios = <&gpio1 17 1>; 98 98 + gpios = <&gpio1 17 GPIO_ACTIVE_LOW>; 99 99 }; 100 100 }; 101 101 };

+11 -11

arch/arm/boot/dts/kirkwood-goflexnet.dts

reviewed

··· 85 85 86 86 health { 87 87 label = "status:green:health"; 88 88 - gpios = <&gpio1 14 1>; 88 88 + gpios = <&gpio1 14 GPIO_ACTIVE_LOW>; 89 89 default-state = "keep"; 90 90 }; 91 91 fault { 92 92 label = "status:orange:fault"; 93 93 - gpios = <&gpio1 15 1>; 93 93 + gpios = <&gpio1 15 GPIO_ACTIVE_LOW>; 94 94 }; 95 95 left0 { 96 96 label = "status:white:left0"; 97 97 - gpios = <&gpio1 10 0>; 97 97 + gpios = <&gpio1 10 GPIO_ACTIVE_HIGH>; 98 98 }; 99 99 left1 { 100 100 label = "status:white:left1"; 101 101 - gpios = <&gpio1 11 0>; 101 101 + gpios = <&gpio1 11 GPIO_ACTIVE_HIGH>; 102 102 }; 103 103 left2 { 104 104 label = "status:white:left2"; 105 105 - gpios = <&gpio1 12 0>; 105 105 + gpios = <&gpio1 12 GPIO_ACTIVE_HIGH>; 106 106 }; 107 107 left3 { 108 108 label = "status:white:left3"; 109 109 - gpios = <&gpio1 13 0>; 109 109 + gpios = <&gpio1 13 GPIO_ACTIVE_HIGH>; 110 110 }; 111 111 right0 { 112 112 label = "status:white:right0"; 113 113 - gpios = <&gpio1 6 0>; 113 113 + gpios = <&gpio1 6 GPIO_ACTIVE_HIGH>; 114 114 }; 115 115 right1 { 116 116 label = "status:white:right1"; 117 117 - gpios = <&gpio1 7 0>; 117 117 + gpios = <&gpio1 7 GPIO_ACTIVE_HIGH>; 118 118 }; 119 119 right2 { 120 120 label = "status:white:right2"; 121 121 - gpios = <&gpio1 8 0>; 121 121 + gpios = <&gpio1 8 GPIO_ACTIVE_HIGH>; 122 122 }; 123 123 right3 { 124 124 label = "status:white:right3"; 125 125 - gpios = <&gpio1 9 0>; 125 125 + gpios = <&gpio1 9 GPIO_ACTIVE_HIGH>; 126 126 }; 127 127 }; 128 128 regulators { ··· 141 141 enable-active-high; 142 142 regulator-always-on; 143 143 regulator-boot-on; 144 144 - gpio = <&gpio0 29 0>; 144 144 + gpio = <&gpio0 29 GPIO_ACTIVE_HIGH>; 145 145 }; 146 146 }; 147 147 };

+4 -4

arch/arm/boot/dts/kirkwood-guruplug-server-plus.dts

reviewed

··· 60 60 61 61 health-r { 62 62 label = "guruplug:red:health"; 63 63 - gpios = <&gpio1 14 1>; 63 63 + gpios = <&gpio1 14 GPIO_ACTIVE_LOW>; 64 64 }; 65 65 health-g { 66 66 label = "guruplug:green:health"; 67 67 - gpios = <&gpio1 15 1>; 67 67 + gpios = <&gpio1 15 GPIO_ACTIVE_LOW>; 68 68 }; 69 69 wmode-r { 70 70 label = "guruplug:red:wmode"; 71 71 - gpios = <&gpio1 16 1>; 71 71 + gpios = <&gpio1 16 GPIO_ACTIVE_LOW>; 72 72 }; 73 73 wmode-g { 74 74 label = "guruplug:green:wmode"; 75 75 - gpios = <&gpio1 17 1>; 75 75 + gpios = <&gpio1 17 GPIO_ACTIVE_LOW>; 76 76 }; 77 77 }; 78 78 };

+6 -6

arch/arm/boot/dts/kirkwood-ib62x0.dts

reviewed

··· 64 64 button@1 { 65 65 label = "USB Copy"; 66 66 linux,code = <KEY_COPY>; 67 67 - gpios = <&gpio0 29 1>; 67 67 + gpios = <&gpio0 29 GPIO_ACTIVE_LOW>; 68 68 }; 69 69 button@2 { 70 70 label = "Reset"; 71 71 linux,code = <KEY_RESTART>; 72 72 - gpios = <&gpio0 28 1>; 72 72 + gpios = <&gpio0 28 GPIO_ACTIVE_LOW>; 73 73 }; 74 74 }; 75 75 ··· 81 81 82 82 green-os { 83 83 label = "ib62x0:green:os"; 84 84 - gpios = <&gpio0 25 0>; 84 84 + gpios = <&gpio0 25 GPIO_ACTIVE_HIGH>; 85 85 default-state = "keep"; 86 86 }; 87 87 red-os { 88 88 label = "ib62x0:red:os"; 89 89 - gpios = <&gpio0 22 0>; 89 89 + gpios = <&gpio0 22 GPIO_ACTIVE_HIGH>; 90 90 }; 91 91 usb-copy { 92 92 label = "ib62x0:red:usb_copy"; 93 93 - gpios = <&gpio0 27 0>; 93 93 + gpios = <&gpio0 27 GPIO_ACTIVE_HIGH>; 94 94 }; 95 95 }; 96 96 ··· 98 98 compatible = "gpio-poweroff"; 99 99 pinctrl-0 = <&pmx_power_off>; 100 100 pinctrl-names = "default"; 101 101 - gpios = <&gpio0 24 0>; 101 101 + gpios = <&gpio0 24 GPIO_ACTIVE_HIGH>; 102 102 }; 103 103 }; 104 104

+10 -10

arch/arm/boot/dts/kirkwood-iconnect.dts

reviewed

··· 94 94 95 95 led-level { 96 96 label = "led_level"; 97 97 - gpios = <&gpio1 9 0>; 97 97 + gpios = <&gpio1 9 GPIO_ACTIVE_HIGH>; 98 98 default-state = "on"; 99 99 }; 100 100 power-blue { 101 101 label = "power:blue"; 102 102 - gpios = <&gpio1 10 0>; 102 102 + gpios = <&gpio1 10 GPIO_ACTIVE_HIGH>; 103 103 default-state = "keep"; 104 104 }; 105 105 power-red { 106 106 label = "power:red"; 107 107 - gpios = <&gpio1 11 0>; 107 107 + gpios = <&gpio1 11 GPIO_ACTIVE_HIGH>; 108 108 }; 109 109 usb1 { 110 110 label = "usb1:blue"; 111 111 - gpios = <&gpio1 12 0>; 111 111 + gpios = <&gpio1 12 GPIO_ACTIVE_HIGH>; 112 112 }; 113 113 usb2 { 114 114 label = "usb2:blue"; 115 115 - gpios = <&gpio1 13 0>; 115 115 + gpios = <&gpio1 13 GPIO_ACTIVE_HIGH>; 116 116 }; 117 117 usb3 { 118 118 label = "usb3:blue"; 119 119 - gpios = <&gpio1 14 0>; 119 119 + gpios = <&gpio1 14 GPIO_ACTIVE_HIGH>; 120 120 }; 121 121 usb4 { 122 122 label = "usb4:blue"; 123 123 - gpios = <&gpio1 15 0>; 123 123 + gpios = <&gpio1 15 GPIO_ACTIVE_HIGH>; 124 124 }; 125 125 otb { 126 126 label = "otb:blue"; 127 127 - gpios = <&gpio1 16 0>; 127 127 + gpios = <&gpio1 16 GPIO_ACTIVE_HIGH>; 128 128 }; 129 129 }; 130 130 ··· 138 138 button@1 { 139 139 label = "OTB Button"; 140 140 linux,code = <KEY_COPY>; 141 141 - gpios = <&gpio1 3 1>; 141 141 + gpios = <&gpio1 3 GPIO_ACTIVE_LOW>; 142 142 debounce-interval = <100>; 143 143 }; 144 144 button@2 { 145 145 label = "Reset"; 146 146 linux,code = <KEY_RESTART>; 147 147 - gpios = <&gpio0 12 1>; 147 147 + gpios = <&gpio0 12 GPIO_ACTIVE_LOW>; 148 148 debounce-interval = <100>; 149 149 }; 150 150 };

+7 -7

arch/arm/boot/dts/kirkwood-iomega_ix2_200.dts

reviewed

··· 127 127 128 128 power_led { 129 129 label = "status:white:power_led"; 130 130 - gpios = <&gpio0 16 0>; 130 130 + gpios = <&gpio0 16 GPIO_ACTIVE_HIGH>; 131 131 default-state = "keep"; 132 132 }; 133 133 rebuild_led { 134 134 label = "status:white:rebuild_led"; 135 135 - gpios = <&gpio1 4 0>; 135 135 + gpios = <&gpio1 4 GPIO_ACTIVE_HIGH>; 136 136 }; 137 137 health_led { 138 138 label = "status:red:health_led"; 139 139 - gpios = <&gpio1 5 0>; 139 139 + gpios = <&gpio1 5 GPIO_ACTIVE_HIGH>; 140 140 }; 141 141 backup_led { 142 142 label = "status:blue:backup_led"; 143 143 - gpios = <&gpio0 15 0>; 143 143 + gpios = <&gpio0 15 GPIO_ACTIVE_HIGH>; 144 144 }; 145 145 }; 146 146 gpio-keys { ··· 155 155 Power { 156 156 label = "Power Button"; 157 157 linux,code = <KEY_POWER>; 158 158 - gpios = <&gpio0 14 1>; 158 158 + gpios = <&gpio0 14 GPIO_ACTIVE_LOW>; 159 159 }; 160 160 Reset { 161 161 label = "Reset Button"; 162 162 linux,code = <KEY_RESTART>; 163 163 - gpios = <&gpio0 12 1>; 163 163 + gpios = <&gpio0 12 GPIO_ACTIVE_LOW>; 164 164 }; 165 165 OTB { 166 166 label = "OTB Button"; 167 167 linux,code = <KEY_COPY>; 168 168 - gpios = <&gpio1 3 1>; 168 168 + gpios = <&gpio1 3 GPIO_ACTIVE_LOW>; 169 169 }; 170 170 }; 171 171 };

+2 -2

arch/arm/boot/dts/kirkwood-km_kirkwood.dts

reviewed

··· 38 38 39 39 i2c@0 { 40 40 compatible = "i2c-gpio"; 41 41 - gpios = < &gpio0 8 0 /* sda */ 42 42 - &gpio0 9 0 >; /* scl */ 41 41 + gpios = < &gpio0 8 GPIO_ACTIVE_HIGH /* sda */ 42 42 + &gpio0 9 GPIO_ACTIVE_HIGH>; /* scl */ 43 43 i2c-gpio,delay-us = <2>; /* ~100 kHz */ 44 44 }; 45 45 };

+11 -11

arch/arm/boot/dts/kirkwood-lsxl.dtsi

reviewed

··· 109 109 button@1 { 110 110 label = "Function Button"; 111 111 linux,code = <KEY_OPTION>; 112 112 - gpios = <&gpio1 9 1>; 112 112 + gpios = <&gpio1 9 GPIO_ACTIVE_LOW>; 113 113 }; 114 114 button@2 { 115 115 label = "Power-on Switch"; 116 116 linux,code = <KEY_RESERVED>; 117 117 linux,input-type = <5>; 118 118 - gpios = <&gpio1 10 1>; 118 118 + gpios = <&gpio1 10 GPIO_ACTIVE_LOW>; 119 119 }; 120 120 button@3 { 121 121 label = "Power-auto Switch"; 122 122 linux,code = <KEY_ESC>; 123 123 linux,input-type = <5>; 124 124 - gpios = <&gpio1 11 1>; 124 124 + gpios = <&gpio1 11 GPIO_ACTIVE_LOW>; 125 125 }; 126 126 }; 127 127 ··· 134 134 135 135 led@1 { 136 136 label = "lsxl:blue:func"; 137 137 - gpios = <&gpio1 4 1>; 137 137 + gpios = <&gpio1 4 GPIO_ACTIVE_LOW>; 138 138 }; 139 139 140 140 led@2 { 141 141 label = "lsxl:red:alarm"; 142 142 - gpios = <&gpio1 5 1>; 142 142 + gpios = <&gpio1 5 GPIO_ACTIVE_LOW>; 143 143 }; 144 144 145 145 led@3 { 146 146 label = "lsxl:amber:info"; 147 147 - gpios = <&gpio1 6 1>; 147 147 + gpios = <&gpio1 6 GPIO_ACTIVE_LOW>; 148 148 }; 149 149 150 150 led@4 { 151 151 label = "lsxl:blue:power"; 152 152 - gpios = <&gpio1 7 1>; 152 152 + gpios = <&gpio1 7 GPIO_ACTIVE_LOW>; 153 153 default-state = "keep"; 154 154 }; 155 155 156 156 led@5 { 157 157 label = "lsxl:red:func"; 158 158 - gpios = <&gpio1 16 1>; 158 158 + gpios = <&gpio1 16 GPIO_ACTIVE_LOW>; 159 159 }; 160 160 }; 161 161 ··· 163 163 compatible = "gpio-fan"; 164 164 pinctrl-0 = <&pmx_fan_low &pmx_fan_high &pmx_fan_lock>; 165 165 pinctrl-names = "default"; 166 166 - gpios = <&gpio0 19 1 167 167 - &gpio0 18 1>; 166 166 + gpios = <&gpio0 19 GPIO_ACTIVE_LOW 167 167 + &gpio0 18 GPIO_ACTIVE_LOW>; 168 168 gpio-fan,speed-map = <0 3 169 169 1500 2 170 170 3250 1 171 171 5000 0>; 172 172 - alarm-gpios = <&gpio1 8 0>; 172 172 + alarm-gpios = <&gpio1 8 GPIO_ACTIVE_HIGH>; 173 173 }; 174 174 175 175 restart_poweroff {

+7 -7

arch/arm/boot/dts/kirkwood-mplcec4.dts

reviewed

··· 110 110 pinctrl-0 = <&pmx_sdio &pmx_sdio_cd>; 111 111 pinctrl-names = "default"; 112 112 status = "okay"; 113 113 - cd-gpios = <&gpio1 15 1>; 113 113 + cd-gpios = <&gpio1 15 GPIO_ACTIVE_LOW>; 114 114 /* No WP GPIO */ 115 115 }; 116 116 }; ··· 126 126 127 127 health { 128 128 label = "status:green:health"; 129 129 - gpios = <&gpio0 7 1>; 129 129 + gpios = <&gpio0 7 GPIO_ACTIVE_LOW>; 130 130 }; 131 131 132 132 user1o { 133 133 label = "user1:orange"; 134 134 - gpios = <&gpio1 8 1>; 134 134 + gpios = <&gpio1 8 GPIO_ACTIVE_LOW>; 135 135 default-state = "on"; 136 136 }; 137 137 138 138 user1g { 139 139 label = "user1:green"; 140 140 - gpios = <&gpio1 9 1>; 140 140 + gpios = <&gpio1 9 GPIO_ACTIVE_LOW>; 141 141 default-state = "on"; 142 142 }; 143 143 144 144 user0o { 145 145 label = "user0:orange"; 146 146 - gpios = <&gpio1 12 1>; 146 146 + gpios = <&gpio1 12 GPIO_ACTIVE_LOW>; 147 147 default-state = "on"; 148 148 }; 149 149 150 150 user0g { 151 151 label = "user0:green"; 152 152 - gpios = <&gpio1 13 1>; 152 152 + gpios = <&gpio1 13 GPIO_ACTIVE_LOW>; 153 153 default-state = "on"; 154 154 }; 155 155 156 156 misc { 157 157 label = "status:orange:misc"; 158 158 - gpios = <&gpio1 14 1>; 158 158 + gpios = <&gpio1 14 GPIO_ACTIVE_LOW>; 159 159 default-state = "on"; 160 160 }; 161 161

+5 -5

arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts

reviewed

··· 90 90 91 91 green-status { 92 92 label = "gtw:green:Status"; 93 93 - gpios = <&gpio0 20 0>; 93 93 + gpios = <&gpio0 20 GPIO_ACTIVE_HIGH>; 94 94 }; 95 95 96 96 red-status { 97 97 label = "gtw:red:Status"; 98 98 - gpios = <&gpio0 21 0>; 98 98 + gpios = <&gpio0 21 GPIO_ACTIVE_HIGH>; 99 99 }; 100 100 101 101 green-usb { 102 102 label = "gtw:green:USB"; 103 103 - gpios = <&gpio0 12 0>; 103 103 + gpios = <&gpio0 12 GPIO_ACTIVE_HIGH>; 104 104 }; 105 105 }; 106 106 ··· 114 114 button@1 { 115 115 label = "SWR Button"; 116 116 linux,code = <KEY_RESTART>; 117 117 - gpios = <&gpio1 15 1>; 117 117 + gpios = <&gpio1 15 GPIO_ACTIVE_LOW>; 118 118 }; 119 119 button@2 { 120 120 label = "WPS Button"; 121 121 linux,code = <KEY_WPS_BUTTON>; 122 122 - gpios = <&gpio1 14 1>; 122 122 + gpios = <&gpio1 14 GPIO_ACTIVE_LOW>; 123 123 }; 124 124 }; 125 125 };

-1

arch/arm/boot/dts/kirkwood-netgear_readynas_duo_v2.dts

reviewed

··· 11 11 12 12 /dts-v1/; 13 13 14 14 - #include <dt-bindings/gpio/gpio.h> 15 14 #include "kirkwood.dtsi" 16 15 #include "kirkwood-6282.dtsi" 17 16

-1

arch/arm/boot/dts/kirkwood-netgear_readynas_nv+_v2.dts

reviewed

··· 11 11 12 12 /dts-v1/; 13 13 14 14 - #include <dt-bindings/gpio/gpio.h> 15 14 #include "kirkwood.dtsi" 16 15 #include "kirkwood-6282.dtsi" 17 16

+3 -3

arch/arm/boot/dts/kirkwood-ns2-common.dtsi

reviewed

··· 65 65 button@1 { 66 66 label = "Power push button"; 67 67 linux,code = <KEY_POWER>; 68 68 - gpios = <&gpio1 0 0>; 68 68 + gpios = <&gpio1 0 GPIO_ACTIVE_HIGH>; 69 69 }; 70 70 }; 71 71 ··· 74 74 75 75 red-fail { 76 76 label = "ns2:red:fail"; 77 77 - gpios = <&gpio0 12 0>; 77 77 + gpios = <&gpio0 12 GPIO_ACTIVE_HIGH>; 78 78 }; 79 79 }; 80 80 81 81 gpio_poweroff { 82 82 compatible = "gpio-poweroff"; 83 83 - gpios = <&gpio0 31 0>; 83 83 + gpios = <&gpio0 31 GPIO_ACTIVE_HIGH>; 84 84 }; 85 85 86 86 };

+1 -1

arch/arm/boot/dts/kirkwood-ns2lite.dts

reviewed

··· 25 25 26 26 blue-sata { 27 27 label = "ns2:blue:sata"; 28 28 - gpios = <&gpio0 30 1>; 28 28 + gpios = <&gpio0 30 GPIO_ACTIVE_LOW>; 29 29 linux,default-trigger = "ide-disk"; 30 30 }; 31 31 };

+5 -5

arch/arm/boot/dts/kirkwood-ns2max.dts

reviewed

··· 22 22 23 23 gpio_fan { 24 24 compatible = "gpio-fan"; 25 25 - gpios = <&gpio0 22 1 26 26 - &gpio0 7 1 27 27 - &gpio1 1 1 28 28 - &gpio0 23 1>; 25 25 + gpios = <&gpio0 22 GPIO_ACTIVE_LOW 26 26 + &gpio0 7 GPIO_ACTIVE_LOW 27 27 + &gpio1 1 GPIO_ACTIVE_LOW 28 28 + &gpio0 23 GPIO_ACTIVE_LOW>; 29 29 gpio-fan,speed-map = 30 30 < 0 0 31 31 1500 15 ··· 36 36 3300 10 37 37 4300 9 38 38 5500 8>; 39 39 - alarm-gpios = <&gpio0 25 1>; 39 39 + alarm-gpios = <&gpio0 25 GPIO_ACTIVE_LOW>; 40 40 }; 41 41 42 42 ns2-leds {

+5 -5

arch/arm/boot/dts/kirkwood-ns2mini.dts

reviewed

··· 23 23 24 24 gpio_fan { 25 25 compatible = "gpio-fan"; 26 26 - gpios = <&gpio0 22 1 27 27 - &gpio0 7 1 28 28 - &gpio1 1 1 29 29 - &gpio0 23 1>; 26 26 + gpios = <&gpio0 22 GPIO_ACTIVE_LOW 27 27 + &gpio0 7 GPIO_ACTIVE_LOW 28 28 + &gpio1 1 GPIO_ACTIVE_LOW 29 29 + &gpio0 23 GPIO_ACTIVE_LOW>; 30 30 gpio-fan,speed-map = 31 31 < 0 0 32 32 3000 15 ··· 37 37 7140 10 38 38 7980 9 39 39 9200 8>; 40 40 - alarm-gpios = <&gpio0 25 1>; 40 40 + alarm-gpios = <&gpio0 25 GPIO_ACTIVE_LOW>; 41 41 }; 42 42 43 43 ns2-leds {

+2 -2

arch/arm/boot/dts/kirkwood-nsa310-common.dtsi

reviewed

··· 40 40 compatible = "gpio-poweroff"; 41 41 pinctrl-0 = <&pmx_pwr_off>; 42 42 pinctrl-names = "default"; 43 43 - gpios = <&gpio1 16 0>; 43 43 + gpios = <&gpio1 16 GPIO_ACTIVE_HIGH>; 44 44 }; 45 45 46 46 regulators { ··· 58 58 regulator-max-microvolt = <5000000>; 59 59 regulator-always-on; 60 60 regulator-boot-on; 61 61 - gpio = <&gpio0 21 0>; 61 61 + gpio = <&gpio0 21 GPIO_ACTIVE_HIGH>; 62 62 }; 63 63 }; 64 64 };

+13 -13

arch/arm/boot/dts/kirkwood-nsa310.dts

reviewed

··· 120 120 button@1 { 121 121 label = "Power Button"; 122 122 linux,code = <KEY_POWER>; 123 123 - gpios = <&gpio1 14 0>; 123 123 + gpios = <&gpio1 14 GPIO_ACTIVE_HIGH>; 124 124 }; 125 125 button@2 { 126 126 label = "Copy Button"; 127 127 linux,code = <KEY_COPY>; 128 128 - gpios = <&gpio1 5 1>; 128 128 + gpios = <&gpio1 5 GPIO_ACTIVE_LOW>; 129 129 }; 130 130 button@3 { 131 131 label = "Reset Button"; 132 132 linux,code = <KEY_RESTART>; 133 133 - gpios = <&gpio1 4 1>; 133 133 + gpios = <&gpio1 4 GPIO_ACTIVE_LOW>; 134 134 }; 135 135 }; 136 136 ··· 145 145 146 146 green-sys { 147 147 label = "nsa310:green:sys"; 148 148 - gpios = <&gpio0 28 0>; 148 148 + gpios = <&gpio0 28 GPIO_ACTIVE_HIGH>; 149 149 }; 150 150 red-sys { 151 151 label = "nsa310:red:sys"; 152 152 - gpios = <&gpio0 29 0>; 152 152 + gpios = <&gpio0 29 GPIO_ACTIVE_HIGH>; 153 153 }; 154 154 green-hdd { 155 155 label = "nsa310:green:hdd"; 156 156 - gpios = <&gpio1 9 0>; 156 156 + gpios = <&gpio1 9 GPIO_ACTIVE_HIGH>; 157 157 }; 158 158 red-hdd { 159 159 label = "nsa310:red:hdd"; 160 160 - gpios = <&gpio1 10 0>; 160 160 + gpios = <&gpio1 10 GPIO_ACTIVE_HIGH>; 161 161 }; 162 162 green-esata { 163 163 label = "nsa310:green:esata"; 164 164 - gpios = <&gpio0 12 0>; 164 164 + gpios = <&gpio0 12 GPIO_ACTIVE_HIGH>; 165 165 }; 166 166 red-esata { 167 167 label = "nsa310:red:esata"; 168 168 - gpios = <&gpio0 13 0>; 168 168 + gpios = <&gpio0 13 GPIO_ACTIVE_HIGH>; 169 169 }; 170 170 green-usb { 171 171 label = "nsa310:green:usb"; 172 172 - gpios = <&gpio0 15 0>; 172 172 + gpios = <&gpio0 15 GPIO_ACTIVE_HIGH>; 173 173 }; 174 174 red-usb { 175 175 label = "nsa310:red:usb"; 176 176 - gpios = <&gpio0 16 0>; 176 176 + gpios = <&gpio0 16 GPIO_ACTIVE_HIGH>; 177 177 }; 178 178 green-copy { 179 179 label = "nsa310:green:copy"; 180 180 - gpios = <&gpio1 7 0>; 180 180 + gpios = <&gpio1 7 GPIO_ACTIVE_HIGH>; 181 181 }; 182 182 red-copy { 183 183 label = "nsa310:red:copy"; 184 184 - gpios = <&gpio1 8 0>; 184 184 + gpios = <&gpio1 8 GPIO_ACTIVE_HIGH>; 185 185 }; 186 186 }; 187 187 };

+12 -12

arch/arm/boot/dts/kirkwood-nsa310a.dts

reviewed

··· 108 108 button@1 { 109 109 label = "Power Button"; 110 110 linux,code = <KEY_POWER>; 111 111 - gpios = <&gpio1 14 0>; 111 111 + gpios = <&gpio1 14 GPIO_ACTIVE_HIGH>; 112 112 }; 113 113 button@2 { 114 114 label = "Copy Button"; 115 115 linux,code = <KEY_COPY>; 116 116 - gpios = <&gpio1 5 1>; 116 116 + gpios = <&gpio1 5 GPIO_ACTIVE_LOW>; 117 117 }; 118 118 button@3 { 119 119 label = "Reset Button"; 120 120 linux,code = <KEY_RESTART>; 121 121 - gpios = <&gpio1 4 1>; 121 121 + gpios = <&gpio1 4 GPIO_ACTIVE_LOW>; 122 122 }; 123 123 }; 124 124 ··· 127 127 128 128 green-sys { 129 129 label = "nsa310:green:sys"; 130 130 - gpios = <&gpio0 28 0>; 130 130 + gpios = <&gpio0 28 GPIO_ACTIVE_HIGH>; 131 131 }; 132 132 red-sys { 133 133 label = "nsa310:red:sys"; 134 134 - gpios = <&gpio0 29 0>; 134 134 + gpios = <&gpio0 29 GPIO_ACTIVE_HIGH>; 135 135 }; 136 136 green-hdd { 137 137 label = "nsa310:green:hdd"; 138 138 - gpios = <&gpio1 9 0>; 138 138 + gpios = <&gpio1 9 GPIO_ACTIVE_HIGH>; 139 139 }; 140 140 red-hdd { 141 141 label = "nsa310:red:hdd"; 142 142 - gpios = <&gpio1 10 0>; 142 142 + gpios = <&gpio1 10 GPIO_ACTIVE_HIGH>; 143 143 }; 144 144 green-esata { 145 145 label = "nsa310:green:esata"; 146 146 - gpios = <&gpio0 12 0>; 146 146 + gpios = <&gpio0 12 GPIO_ACTIVE_HIGH>; 147 147 }; 148 148 red-esata { 149 149 label = "nsa310:red:esata"; 150 150 - gpios = <&gpio0 13 0>; 150 150 + gpios = <&gpio0 13 GPIO_ACTIVE_HIGH>; 151 151 }; 152 152 green-usb { 153 153 label = "nsa310:green:usb"; 154 154 - gpios = <&gpio0 15 0>; 154 154 + gpios = <&gpio0 15 GPIO_ACTIVE_HIGH>; 155 155 }; 156 156 green-copy { 157 157 label = "nsa310:green:copy"; 158 158 - gpios = <&gpio1 7 0>; 158 158 + gpios = <&gpio1 7 GPIO_ACTIVE_HIGH>; 159 159 }; 160 160 red-copy { 161 161 label = "nsa310:red:copy"; 162 162 - gpios = <&gpio1 8 0>; 162 162 + gpios = <&gpio1 8 GPIO_ACTIVE_HIGH>; 163 163 }; 164 164 }; 165 165 };

+4 -4

arch/arm/boot/dts/kirkwood-openblocks_a6.dts

reviewed

··· 101 101 102 102 led-red { 103 103 label = "obsa6:red:stat"; 104 104 - gpios = <&gpio1 9 1>; 104 104 + gpios = <&gpio1 9 GPIO_ACTIVE_LOW>; 105 105 }; 106 106 107 107 led-green { 108 108 label = "obsa6:green:stat"; 109 109 - gpios = <&gpio1 10 1>; 109 109 + gpios = <&gpio1 10 GPIO_ACTIVE_LOW>; 110 110 }; 111 111 112 112 led-yellow { 113 113 label = "obsa6:yellow:stat"; 114 114 - gpios = <&gpio1 11 1>; 114 114 + gpios = <&gpio1 11 GPIO_ACTIVE_LOW>; 115 115 }; 116 116 }; 117 117 ··· 125 125 button@1 { 126 126 label = "Init Button"; 127 127 linux,code = <KEY_POWER>; 128 128 - gpios = <&gpio1 6 0>; 128 128 + gpios = <&gpio1 6 GPIO_ACTIVE_HIGH>; 129 129 }; 130 130 }; 131 131 };

+4 -4

arch/arm/boot/dts/kirkwood-openblocks_a7.dts

reviewed

··· 126 126 127 127 led-red { 128 128 label = "obsa7:red:stat"; 129 129 - gpios = <&gpio1 9 1>; 129 129 + gpios = <&gpio1 9 GPIO_ACTIVE_LOW>; 130 130 }; 131 131 132 132 led-green { 133 133 label = "obsa7:green:stat"; 134 134 - gpios = <&gpio1 10 1>; 134 134 + gpios = <&gpio1 10 GPIO_ACTIVE_LOW>; 135 135 }; 136 136 137 137 led-yellow { 138 138 label = "obsa7:yellow:stat"; 139 139 - gpios = <&gpio1 11 1>; 139 139 + gpios = <&gpio1 11 GPIO_ACTIVE_LOW>; 140 140 }; 141 141 }; 142 142 ··· 150 150 button@1 { 151 151 label = "Init Button"; 152 152 linux,code = <KEY_POWER>; 153 153 - gpios = <&gpio1 6 0>; 153 153 + gpios = <&gpio1 6 GPIO_ACTIVE_HIGH>; 154 154 }; 155 155 }; 156 156 };

+3 -3

arch/arm/boot/dts/kirkwood-sheevaplug-esata.dts

reviewed

··· 24 24 pinctrl-0 = <&pmx_sdio &pmx_sdio_cd &pmx_sdio_wp>; 25 25 pinctrl-names = "default"; 26 26 status = "okay"; 27 27 - cd-gpios = <&gpio1 12 1>; 28 28 - wp-gpios = <&gpio1 15 0>; 27 27 + cd-gpios = <&gpio1 12 GPIO_ACTIVE_LOW>; 28 28 + wp-gpios = <&gpio1 15 GPIO_ACTIVE_HIGH>; 29 29 }; 30 30 }; 31 31 ··· 36 36 37 37 health { 38 38 label = "sheevaplug:blue:health"; 39 39 - gpios = <&gpio1 17 1>; 39 39 + gpios = <&gpio1 17 GPIO_ACTIVE_LOW>; 40 40 default-state = "keep"; 41 41 }; 42 42 };

+2 -2

arch/arm/boot/dts/kirkwood-sheevaplug.dts

reviewed

··· 31 31 32 32 health { 33 33 label = "sheevaplug:blue:health"; 34 34 - gpios = <&gpio1 17 1>; 34 34 + gpios = <&gpio1 17 GPIO_ACTIVE_LOW>; 35 35 default-state = "keep"; 36 36 }; 37 37 38 38 misc { 39 39 label = "sheevaplug:red:misc"; 40 40 - gpios = <&gpio1 14 1>; 40 40 + gpios = <&gpio1 14 GPIO_ACTIVE_LOW>; 41 41 }; 42 42 }; 43 43 };

+5 -5

arch/arm/boot/dts/kirkwood-topkick.dts

reviewed

··· 131 131 132 132 disk { 133 133 label = "topkick:yellow:disk"; 134 134 - gpios = <&gpio0 21 1>; 134 134 + gpios = <&gpio0 21 GPIO_ACTIVE_LOW>; 135 135 linux,default-trigger = "ide-disk"; 136 136 }; 137 137 system2 { 138 138 label = "topkick:red:system"; 139 139 - gpios = <&gpio1 5 1>; 139 139 + gpios = <&gpio1 5 GPIO_ACTIVE_LOW>; 140 140 }; 141 141 system { 142 142 label = "topkick:blue:system"; 143 143 - gpios = <&gpio1 6 1>; 143 143 + gpios = <&gpio1 6 GPIO_ACTIVE_LOW>; 144 144 default-state = "on"; 145 145 }; 146 146 wifi { 147 147 label = "topkick:green:wifi"; 148 148 - gpios = <&gpio1 7 1>; 148 148 + gpios = <&gpio1 7 GPIO_ACTIVE_LOW>; 149 149 }; 150 150 wifi2 { 151 151 label = "topkick:yellow:wifi"; 152 152 - gpios = <&gpio1 16 1>; 152 152 + gpios = <&gpio1 16 GPIO_ACTIVE_LOW>; 153 153 }; 154 154 }; 155 155 regulators {

+2 -2

arch/arm/boot/dts/kirkwood-ts219-6281.dts

reviewed

··· 42 42 button@1 { 43 43 label = "USB Copy"; 44 44 linux,code = <KEY_COPY>; 45 45 - gpios = <&gpio0 15 1>; 45 45 + gpios = <&gpio0 15 GPIO_ACTIVE_LOW>; 46 46 }; 47 47 button@2 { 48 48 label = "Reset"; 49 49 linux,code = <KEY_RESTART>; 50 50 - gpios = <&gpio0 16 1>; 50 50 + gpios = <&gpio0 16 GPIO_ACTIVE_LOW>; 51 51 }; 52 52 }; 53 53 };

+2 -2

arch/arm/boot/dts/kirkwood-ts219-6282.dts

reviewed

··· 52 52 button@1 { 53 53 label = "USB Copy"; 54 54 linux,code = <KEY_COPY>; 55 55 - gpios = <&gpio1 11 1>; 55 55 + gpios = <&gpio1 11 GPIO_ACTIVE_LOW>; 56 56 }; 57 57 button@2 { 58 58 label = "Reset"; 59 59 linux,code = <KEY_RESTART>; 60 60 - gpios = <&gpio1 5 1>; 60 60 + gpios = <&gpio1 5 GPIO_ACTIVE_LOW>; 61 61 }; 62 62 }; 63 63 };

arch/arm/boot/dts/kirkwood.dtsi

reviewed

··· 1 1 /include/ "skeleton.dtsi" 2 2 #include <dt-bindings/input/input.h> 3 3 + #include <dt-bindings/gpio/gpio.h> 3 4 4 5 #define MBUS_ID(target,attributes) (((target) << 24) | ((attributes) << 16)) 5 6