Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7e0a51a0 authored by Linus Walleij's avatar Linus Walleij
Browse files

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: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 6ce4eac1

arch/arm/boot/dts/ste-href-tvk1281618.dtsi

+33 −6
Original line number Diff line number Diff line
@@ -15,26 +15,53 @@ 


/ {

	soc {

		/* Add Synaptics touch screen, TC35892 keypad etc here */

		/* Add Synaptics touch screen, TC35893 keypad etc here */

		i2c@80004000 {

			tc3589x@44 {

				compatible = "tc3589x";

			tc35893@44 {

				compatible = "toshiba,tc35893";

				reg = <0x44>;

				interrupt-parent = <&gpio6>;

				interrupts = <26 IRQ_TYPE_EDGE_RISING>;



				interrupt-controller;

				#interrupt-cells = <2>;

				#interrupt-cells = <1>;



				tc3589x_gpio {

					compatible = "tc3589x-gpio";

					interrupts = <0 IRQ_TYPE_EDGE_RISING>;

					compatible = "toshiba,tc3589x-gpio";

					interrupts = <0>;



					interrupt-controller;

					#interrupt-cells = <2>;

					gpio-controller;

					#gpio-cells = <2>;

				};

				tc3589x_keypad {

					compatible = "toshiba,tc3589x-keypad";

					interrupts = <6>;

					debounce-delay-ms = <4>;

					keypad,num-columns = <8>;

					keypad,num-rows = <8>;

					linux,no-autorepeat;

					linux,wakeup;

					linux,keymap = <0x0301006b

						        0x04010066

							0x06040072

							0x040200d7

							0x0303006a

							0x0205000e

							0x0607008b

							0x0500001c

							0x0403000b

							0x03040034

							0x05020067

							0x0305006c

							0x040500e7

							0x0005009e

							0x06020073

							0x01030039

							0x07060069

							0x050500d9>;

				};

			};

		};

	};

arch/arm/boot/dts/ste-hrefprev60.dtsi

+4 −4
Original line number Diff line number Diff line
@@ -28,18 +28,18 @@ 
				reg = <0x33>;

			};



			tc3589x@42 {

				compatible = "tc3589x";

			tc35892@42 {

				compatible = "toshiba,tc35892";

				reg = <0x42>;

				interrupt-parent = <&gpio6>;

				interrupts = <25 IRQ_TYPE_EDGE_RISING>;



				interrupt-controller;

				#interrupt-cells = <2>;

				#interrupt-cells = <1>;



				tc3589x_gpio: tc3589x_gpio {

					compatible = "tc3589x-gpio";

					interrupts = <0 IRQ_TYPE_EDGE_RISING>;

					interrupts = <0>;



					interrupt-controller;

					#interrupt-cells = <2>;