diff options
| -rw-r--r-- | arch/arm/boot/dts/db8500.dtsi | 18 | ||||
| -rw-r--r-- | arch/arm/boot/dts/snowball.dts | 10 |
2 files changed, 23 insertions, 5 deletions
diff --git a/arch/arm/boot/dts/db8500.dtsi b/arch/arm/boot/dts/db8500.dtsi index add7cab30f0c..e8403006d52d 100644 --- a/arch/arm/boot/dts/db8500.dtsi +++ b/arch/arm/boot/dts/db8500.dtsi | |||
| @@ -60,6 +60,8 @@ | |||
| 60 | interrupts = <0 119 0x4>; | 60 | interrupts = <0 119 0x4>; |
| 61 | supports-sleepmode; | 61 | supports-sleepmode; |
| 62 | gpio-controller; | 62 | gpio-controller; |
| 63 | #gpio-cells = <2>; | ||
| 64 | gpio-bank = <0>; | ||
| 63 | }; | 65 | }; |
| 64 | 66 | ||
| 65 | gpio1: gpio@8012e080 { | 67 | gpio1: gpio@8012e080 { |
| @@ -69,6 +71,8 @@ | |||
| 69 | interrupts = <0 120 0x4>; | 71 | interrupts = <0 120 0x4>; |
| 70 | supports-sleepmode; | 72 | supports-sleepmode; |
| 71 | gpio-controller; | 73 | gpio-controller; |
| 74 | #gpio-cells = <2>; | ||
| 75 | gpio-bank = <1>; | ||
| 72 | }; | 76 | }; |
| 73 | 77 | ||
| 74 | gpio2: gpio@8000e000 { | 78 | gpio2: gpio@8000e000 { |
| @@ -78,6 +82,8 @@ | |||
| 78 | interrupts = <0 121 0x4>; | 82 | interrupts = <0 121 0x4>; |
| 79 | supports-sleepmode; | 83 | supports-sleepmode; |
| 80 | gpio-controller; | 84 | gpio-controller; |
| 85 | #gpio-cells = <2>; | ||
| 86 | gpio-bank = <2>; | ||
| 81 | }; | 87 | }; |
| 82 | 88 | ||
| 83 | gpio3: gpio@8000e080 { | 89 | gpio3: gpio@8000e080 { |
| @@ -87,6 +93,8 @@ | |||
| 87 | interrupts = <0 122 0x4>; | 93 | interrupts = <0 122 0x4>; |
| 88 | supports-sleepmode; | 94 | supports-sleepmode; |
| 89 | gpio-controller; | 95 | gpio-controller; |
| 96 | #gpio-cells = <2>; | ||
| 97 | gpio-bank = <3>; | ||
| 90 | }; | 98 | }; |
| 91 | 99 | ||
| 92 | gpio4: gpio@8000e100 { | 100 | gpio4: gpio@8000e100 { |
| @@ -96,6 +104,8 @@ | |||
| 96 | interrupts = <0 123 0x4>; | 104 | interrupts = <0 123 0x4>; |
| 97 | supports-sleepmode; | 105 | supports-sleepmode; |
| 98 | gpio-controller; | 106 | gpio-controller; |
| 107 | #gpio-cells = <2>; | ||
| 108 | gpio-bank = <4>; | ||
| 99 | }; | 109 | }; |
| 100 | 110 | ||
| 101 | gpio5: gpio@8000e180 { | 111 | gpio5: gpio@8000e180 { |
| @@ -105,6 +115,8 @@ | |||
| 105 | interrupts = <0 124 0x4>; | 115 | interrupts = <0 124 0x4>; |
| 106 | supports-sleepmode; | 116 | supports-sleepmode; |
| 107 | gpio-controller; | 117 | gpio-controller; |
| 118 | #gpio-cells = <2>; | ||
| 119 | gpio-bank = <5>; | ||
| 108 | }; | 120 | }; |
| 109 | 121 | ||
| 110 | gpio6: gpio@8011e000 { | 122 | gpio6: gpio@8011e000 { |
| @@ -114,6 +126,8 @@ | |||
| 114 | interrupts = <0 125 0x4>; | 126 | interrupts = <0 125 0x4>; |
| 115 | supports-sleepmode; | 127 | supports-sleepmode; |
| 116 | gpio-controller; | 128 | gpio-controller; |
| 129 | #gpio-cells = <2>; | ||
| 130 | gpio-bank = <6>; | ||
| 117 | }; | 131 | }; |
| 118 | 132 | ||
| 119 | gpio7: gpio@8011e080 { | 133 | gpio7: gpio@8011e080 { |
| @@ -123,6 +137,8 @@ | |||
| 123 | interrupts = <0 126 0x4>; | 137 | interrupts = <0 126 0x4>; |
| 124 | supports-sleepmode; | 138 | supports-sleepmode; |
| 125 | gpio-controller; | 139 | gpio-controller; |
| 140 | #gpio-cells = <2>; | ||
| 141 | gpio-bank = <7>; | ||
| 126 | }; | 142 | }; |
| 127 | 143 | ||
| 128 | gpio8: gpio@a03fe000 { | 144 | gpio8: gpio@a03fe000 { |
| @@ -132,6 +148,8 @@ | |||
| 132 | interrupts = <0 127 0x4>; | 148 | interrupts = <0 127 0x4>; |
| 133 | supports-sleepmode; | 149 | supports-sleepmode; |
| 134 | gpio-controller; | 150 | gpio-controller; |
| 151 | #gpio-cells = <2>; | ||
| 152 | gpio-bank = <8>; | ||
| 135 | }; | 153 | }; |
| 136 | 154 | ||
| 137 | usb@a03e0000 { | 155 | usb@a03e0000 { |
diff --git a/arch/arm/boot/dts/snowball.dts b/arch/arm/boot/dts/snowball.dts index 359c6d679156..738959de2a1d 100644 --- a/arch/arm/boot/dts/snowball.dts +++ b/arch/arm/boot/dts/snowball.dts | |||
| @@ -30,35 +30,35 @@ | |||
| 30 | wakeup = <1>; | 30 | wakeup = <1>; |
| 31 | linux,code = <2>; | 31 | linux,code = <2>; |
| 32 | label = "userpb"; | 32 | label = "userpb"; |
| 33 | gpios = <&gpio1 0>; | 33 | gpios = <&gpio1 0 0>; |
| 34 | }; | 34 | }; |
| 35 | button@2 { | 35 | button@2 { |
| 36 | debounce_interval = <50>; | 36 | debounce_interval = <50>; |
| 37 | wakeup = <1>; | 37 | wakeup = <1>; |
| 38 | linux,code = <3>; | 38 | linux,code = <3>; |
| 39 | label = "userpb"; | 39 | label = "userpb"; |
| 40 | gpios = <&gpio4 23>; | 40 | gpios = <&gpio4 23 0>; |
| 41 | }; | 41 | }; |
| 42 | button@3 { | 42 | button@3 { |
| 43 | debounce_interval = <50>; | 43 | debounce_interval = <50>; |
| 44 | wakeup = <1>; | 44 | wakeup = <1>; |
| 45 | linux,code = <4>; | 45 | linux,code = <4>; |
| 46 | label = "userpb"; | 46 | label = "userpb"; |
| 47 | gpios = <&gpio4 23>; | 47 | gpios = <&gpio4 24 0>; |
| 48 | }; | 48 | }; |
| 49 | button@4 { | 49 | button@4 { |
| 50 | debounce_interval = <50>; | 50 | debounce_interval = <50>; |
| 51 | wakeup = <1>; | 51 | wakeup = <1>; |
| 52 | linux,code = <5>; | 52 | linux,code = <5>; |
| 53 | label = "userpb"; | 53 | label = "userpb"; |
| 54 | gpios = <&gpio5 1>; | 54 | gpios = <&gpio5 1 0>; |
| 55 | }; | 55 | }; |
| 56 | button@5 { | 56 | button@5 { |
| 57 | debounce_interval = <50>; | 57 | debounce_interval = <50>; |
| 58 | wakeup = <1>; | 58 | wakeup = <1>; |
| 59 | linux,code = <6>; | 59 | linux,code = <6>; |
| 60 | label = "userpb"; | 60 | label = "userpb"; |
| 61 | gpios = <&gpio5 2>; | 61 | gpios = <&gpio5 2 0>; |
| 62 | }; | 62 | }; |
| 63 | }; | 63 | }; |
| 64 | 64 | ||