diff options
| author | Linus Walleij <linus.walleij@linaro.org> | 2013-10-15 17:00:10 -0400 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2013-11-26 15:01:54 -0500 |
| commit | 7e0a51a0312da5d1f7cb164355924c5cdf39082d (patch) | |
| tree | f4460d62ef097d1ad73fc63062ff45d9b9583cc6 | |
| parent | 6ce4eac1f600b34f2f7f58f9cd8f0503d79e42ae (diff) | |
ARM: ux500: adjust the TC3589x devices to the binding
The TC3589x devices appearing in the ST Ericsson device trees
are adjusted to use the new binding so this is in a good shape,
and we add the keypad on the TVK1281618 UIB so this is working
again.
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
| -rw-r--r-- | arch/arm/boot/dts/ste-href-tvk1281618.dtsi | 39 | ||||
| -rw-r--r-- | arch/arm/boot/dts/ste-hrefprev60.dtsi | 8 |
2 files changed, 37 insertions, 10 deletions
diff --git a/arch/arm/boot/dts/ste-href-tvk1281618.dtsi b/arch/arm/boot/dts/ste-href-tvk1281618.dtsi index 76d3ef13175f..61b180ea92ca 100644 --- a/arch/arm/boot/dts/ste-href-tvk1281618.dtsi +++ b/arch/arm/boot/dts/ste-href-tvk1281618.dtsi | |||
| @@ -15,26 +15,53 @@ | |||
| 15 | 15 | ||
| 16 | / { | 16 | / { |
| 17 | soc { | 17 | soc { |
| 18 | /* Add Synaptics touch screen, TC35892 keypad etc here */ | 18 | /* Add Synaptics touch screen, TC35893 keypad etc here */ |
| 19 | i2c@80004000 { | 19 | i2c@80004000 { |
| 20 | tc3589x@44 { | 20 | tc35893@44 { |
| 21 | compatible = "tc3589x"; | 21 | compatible = "toshiba,tc35893"; |
| 22 | reg = <0x44>; | 22 | reg = <0x44>; |
| 23 | interrupt-parent = <&gpio6>; | 23 | interrupt-parent = <&gpio6>; |
| 24 | interrupts = <26 IRQ_TYPE_EDGE_RISING>; | 24 | interrupts = <26 IRQ_TYPE_EDGE_RISING>; |
| 25 | 25 | ||
| 26 | interrupt-controller; | 26 | interrupt-controller; |
| 27 | #interrupt-cells = <2>; | 27 | #interrupt-cells = <1>; |
| 28 | 28 | ||
| 29 | tc3589x_gpio { | 29 | tc3589x_gpio { |
| 30 | compatible = "tc3589x-gpio"; | 30 | compatible = "toshiba,tc3589x-gpio"; |
| 31 | interrupts = <0 IRQ_TYPE_EDGE_RISING>; | 31 | interrupts = <0>; |
| 32 | 32 | ||
| 33 | interrupt-controller; | 33 | interrupt-controller; |
| 34 | #interrupt-cells = <2>; | 34 | #interrupt-cells = <2>; |
| 35 | gpio-controller; | 35 | gpio-controller; |
| 36 | #gpio-cells = <2>; | 36 | #gpio-cells = <2>; |
| 37 | }; | 37 | }; |
| 38 | tc3589x_keypad { | ||
| 39 | compatible = "toshiba,tc3589x-keypad"; | ||
| 40 | interrupts = <6>; | ||
| 41 | debounce-delay-ms = <4>; | ||
| 42 | keypad,num-columns = <8>; | ||
| 43 | keypad,num-rows = <8>; | ||
| 44 | linux,no-autorepeat; | ||
| 45 | linux,wakeup; | ||
| 46 | linux,keymap = <0x0301006b | ||
| 47 | 0x04010066 | ||
| 48 | 0x06040072 | ||
| 49 | 0x040200d7 | ||
| 50 | 0x0303006a | ||
| 51 | 0x0205000e | ||
| 52 | 0x0607008b | ||
| 53 | 0x0500001c | ||
| 54 | 0x0403000b | ||
| 55 | 0x03040034 | ||
| 56 | 0x05020067 | ||
| 57 | 0x0305006c | ||
| 58 | 0x040500e7 | ||
| 59 | 0x0005009e | ||
| 60 | 0x06020073 | ||
| 61 | 0x01030039 | ||
| 62 | 0x07060069 | ||
| 63 | 0x050500d9>; | ||
| 64 | }; | ||
| 38 | }; | 65 | }; |
| 39 | }; | 66 | }; |
| 40 | }; | 67 | }; |
diff --git a/arch/arm/boot/dts/ste-hrefprev60.dtsi b/arch/arm/boot/dts/ste-hrefprev60.dtsi index b2cd7bc2752f..6b271a410d03 100644 --- a/arch/arm/boot/dts/ste-hrefprev60.dtsi +++ b/arch/arm/boot/dts/ste-hrefprev60.dtsi | |||
| @@ -28,18 +28,18 @@ | |||
| 28 | reg = <0x33>; | 28 | reg = <0x33>; |
| 29 | }; | 29 | }; |
| 30 | 30 | ||
| 31 | tc3589x@42 { | 31 | tc35892@42 { |
| 32 | compatible = "tc3589x"; | 32 | compatible = "toshiba,tc35892"; |
| 33 | reg = <0x42>; | 33 | reg = <0x42>; |
| 34 | interrupt-parent = <&gpio6>; | 34 | interrupt-parent = <&gpio6>; |
| 35 | interrupts = <25 IRQ_TYPE_EDGE_RISING>; | 35 | interrupts = <25 IRQ_TYPE_EDGE_RISING>; |
| 36 | 36 | ||
| 37 | interrupt-controller; | 37 | interrupt-controller; |
| 38 | #interrupt-cells = <2>; | 38 | #interrupt-cells = <1>; |
| 39 | 39 | ||
| 40 | tc3589x_gpio: tc3589x_gpio { | 40 | tc3589x_gpio: tc3589x_gpio { |
| 41 | compatible = "tc3589x-gpio"; | 41 | compatible = "tc3589x-gpio"; |
| 42 | interrupts = <0 IRQ_TYPE_EDGE_RISING>; | 42 | interrupts = <0>; |
| 43 | 43 | ||
| 44 | interrupt-controller; | 44 | interrupt-controller; |
| 45 | #interrupt-cells = <2>; | 45 | #interrupt-cells = <2>; |