Commit c9931582 authored by Tony Lindgren's avatar Tony Lindgren
Browse files

Merge branch 'omap-for-v5.11/dt-mot-take2' into omap-for-v5.11/dt

parents f487e6d6 5a7b6240

arch/arm/boot/dts/motorola-mapphone-common.dtsi

+1 −140
Original line number Diff line number Diff line
@@ -113,32 +113,9 @@ wl12xx_vmmc: regulator-wl12xx { 
		enable-active-high;

	};



	gpio_keys {

		compatible = "gpio-keys";



		volume_down {

			label = "Volume Down";

			gpios = <&gpio5 26 GPIO_ACTIVE_LOW>; /* gpio154 */

			linux,code = <KEY_VOLUMEDOWN>;

			linux,can-disable;

			/* Value above 7.95ms for no GPIO hardware debounce */

			debounce-interval = <10>;

		};



		slider {

			label = "Keypad Slide";

			gpios = <&gpio4 26 GPIO_ACTIVE_HIGH>; /* gpio122 */

			linux,input-type = <EV_SW>;

			linux,code = <SW_KEYPAD_SLIDE>;

			linux,can-disable;

			/* Value above 7.95ms for no GPIO hardware debounce */

			debounce-interval = <10>;

		};

	};



	soundcard {

		compatible = "audio-graph-card";

		label = "Droid 4 Audio";

		label = "Mapphone Audio";



		widgets =

			"Speaker", "Earpiece",
@@ -282,80 +259,6 @@ tmp105@48 { 
	};

};



&keypad {

	keypad,num-rows = <8>;

	keypad,num-columns = <8>;

	linux,keymap = <



	/* Row 1 */

	MATRIX_KEY(0, 2, KEY_1)

	MATRIX_KEY(0, 6, KEY_2)

	MATRIX_KEY(2, 3, KEY_3)

	MATRIX_KEY(0, 7, KEY_4)

	MATRIX_KEY(0, 4, KEY_5)

	MATRIX_KEY(5, 5, KEY_6)

	MATRIX_KEY(0, 1, KEY_7)

	MATRIX_KEY(0, 5, KEY_8)

	MATRIX_KEY(0, 0, KEY_9)

	MATRIX_KEY(1, 6, KEY_0)



	/* Row 2 */

	MATRIX_KEY(3, 4, KEY_APOSTROPHE)

	MATRIX_KEY(7, 6, KEY_Q)

	MATRIX_KEY(7, 7, KEY_W)

	MATRIX_KEY(7, 2, KEY_E)

	MATRIX_KEY(1, 0, KEY_R)

	MATRIX_KEY(4, 4, KEY_T)

	MATRIX_KEY(1, 2, KEY_Y)

	MATRIX_KEY(6, 7, KEY_U)

	MATRIX_KEY(2, 2, KEY_I)

	MATRIX_KEY(5, 6, KEY_O)

	MATRIX_KEY(3, 7, KEY_P)

	MATRIX_KEY(6, 5, KEY_BACKSPACE)



	/* Row 3 */

	MATRIX_KEY(5, 4, KEY_TAB)

	MATRIX_KEY(5, 7, KEY_A)

	MATRIX_KEY(2, 7, KEY_S)

	MATRIX_KEY(7, 0, KEY_D)

	MATRIX_KEY(2, 6, KEY_F)

	MATRIX_KEY(6, 2, KEY_G)

	MATRIX_KEY(6, 6, KEY_H)

	MATRIX_KEY(1, 4, KEY_J)

	MATRIX_KEY(3, 1, KEY_K)

	MATRIX_KEY(2, 1, KEY_L)

	MATRIX_KEY(4, 6, KEY_ENTER)



	/* Row 4 */

	MATRIX_KEY(3, 6, KEY_LEFTSHIFT)		/* KEY_CAPSLOCK */

	MATRIX_KEY(6, 1, KEY_Z)

	MATRIX_KEY(7, 4, KEY_X)

	MATRIX_KEY(5, 1, KEY_C)

	MATRIX_KEY(1, 7, KEY_V)

	MATRIX_KEY(2, 4, KEY_B)

	MATRIX_KEY(4, 1, KEY_N)

	MATRIX_KEY(1, 1, KEY_M)

	MATRIX_KEY(3, 5, KEY_COMMA)

	MATRIX_KEY(5, 2, KEY_DOT)

	MATRIX_KEY(6, 3, KEY_UP)

	MATRIX_KEY(7, 3, KEY_OK)



	/* Row 5 */

	MATRIX_KEY(2, 5, KEY_LEFTCTRL)		/* KEY_LEFTSHIFT */

	MATRIX_KEY(4, 5, KEY_LEFTALT)		/* SYM */

	MATRIX_KEY(6, 0, KEY_MINUS)

	MATRIX_KEY(4, 7, KEY_EQUAL)

	MATRIX_KEY(1, 5, KEY_SPACE)

	MATRIX_KEY(3, 2, KEY_SLASH)

	MATRIX_KEY(4, 3, KEY_LEFT)

	MATRIX_KEY(5, 3, KEY_DOWN)

	MATRIX_KEY(3, 3, KEY_RIGHT)



	/* Side buttons, KEY_VOLUMEDOWN and KEY_PWER are on CPCAP? */

	MATRIX_KEY(5, 0, KEY_VOLUMEUP)

	>;

};



&mmc1 {

	vmmc-supply = <&vwlan2>;

	bus-width = <4>;
@@ -395,34 +298,6 @@ wlcore: wlcore@2 { 
	};

};



&i2c1 {

	led-controller@38 {

		compatible = "ti,lm3532";

		#address-cells = <1>;

		#size-cells = <0>;

		reg = <0x38>;



		enable-gpios = <&gpio6 12 GPIO_ACTIVE_HIGH>;



		ramp-up-us = <1024>;

		ramp-down-us = <8193>;



		backlight_led: led@0 {

			reg = <0>;

			led-sources = <2>;

			ti,led-mode = <0>;

			label = ":backlight";

		};



		led@1 {

			reg = <1>;

			led-sources = <1>;

			ti,led-mode = <0>;

			label = ":kbd_backlight";

		};

	};

};



&i2c2 {

	touchscreen@4a {

		compatible = "atmel,maxtouch";
@@ -796,20 +671,6 @@ ak8975: magnetometer@c { 
				  "0", "0", "-1";



	};



	lis3dh: accelerometer@18 {

		compatible = "st,lis3dh-accel";

		reg = <0x18>;



		vdd-supply = <&vhvio>;



		interrupt-parent = <&gpio2>;

		interrupts = <2 IRQ_TYPE_EDGE_BOTH>; /* gpio34 */



		rotation-matrix = "0", "-1", "0",

				  "1", "0", "0",

				  "0", "0", "1";

	};

};



&mcbsp2 {

arch/arm/boot/dts/omap4-droid-bionic-xt875.dts

+46 −0
Original line number Diff line number Diff line
@@ -7,3 +7,49 @@ / { 
	model = "Motorola Droid Bionic XT875";

	compatible = "motorola,droid-bionic", "ti,omap4430", "ti,omap4";

};



&keypad {

	keypad,num-rows = <8>;

	keypad,num-columns = <8>;

	linux,keymap = <

	MATRIX_KEY(5, 0, KEY_VOLUMEUP)

	MATRIX_KEY(3, 0, KEY_VOLUMEDOWN)

	>;

};



&i2c1 {

	led-controller@38 {

		compatible = "ti,lm3532";

		#address-cells = <1>;

		#size-cells = <0>;

		reg = <0x38>;



		enable-gpios = <&gpio6 12 GPIO_ACTIVE_HIGH>;



		ramp-up-us = <1024>;

		ramp-down-us = <8193>;



		backlight_led: led@0 {

			reg = <0>;

			led-sources = <2>;

			ti,led-mode = <0>;

			label = ":backlight";

		};

	};

};



&i2c4 {

	kxtf9: accelerometer@f {

		compatible = "kionix,kxtf9";

		reg = <0x0f>;



		vdd-supply = <&vhvio>;



		interrupt-parent = <&gpio2>;

		interrupts = <2 IRQ_TYPE_EDGE_RISING>;



		rotation-matrix = "0", "-1", "0",

				  "1", "0", "0",

				  "0", "0", "1";

	};

};

arch/arm/boot/dts/omap4-droid4-xt894.dts

+143 −0
Original line number Diff line number Diff line
@@ -3,7 +3,150 @@ 


#include "motorola-mapphone-common.dtsi"



/ {

	gpio_keys {

		compatible = "gpio-keys";



		volume_down {

			label = "Volume Down";

			gpios = <&gpio5 26 GPIO_ACTIVE_LOW>; /* gpio154 */

			linux,code = <KEY_VOLUMEDOWN>;

			linux,can-disable;

			/* Value above 7.95ms for no GPIO hardware debounce */

			debounce-interval = <10>;

		};



		slider {

			label = "Keypad Slide";

			gpios = <&gpio4 26 GPIO_ACTIVE_HIGH>; /* gpio122 */

			linux,input-type = <EV_SW>;

			linux,code = <SW_KEYPAD_SLIDE>;

			linux,can-disable;

			/* Value above 7.95ms for no GPIO hardware debounce */

			debounce-interval = <10>;

		};

	};

};



/ {

	model = "Motorola Droid 4 XT894";

	compatible = "motorola,droid4", "ti,omap4430", "ti,omap4";

};



&keypad {

	keypad,num-rows = <8>;

	keypad,num-columns = <8>;

	linux,keymap = <



	/* Row 1 */

	MATRIX_KEY(0, 2, KEY_1)

	MATRIX_KEY(0, 6, KEY_2)

	MATRIX_KEY(2, 3, KEY_3)

	MATRIX_KEY(0, 7, KEY_4)

	MATRIX_KEY(0, 4, KEY_5)

	MATRIX_KEY(5, 5, KEY_6)

	MATRIX_KEY(0, 1, KEY_7)

	MATRIX_KEY(0, 5, KEY_8)

	MATRIX_KEY(0, 0, KEY_9)

	MATRIX_KEY(1, 6, KEY_0)



	/* Row 2 */

	MATRIX_KEY(3, 4, KEY_APOSTROPHE)

	MATRIX_KEY(7, 6, KEY_Q)

	MATRIX_KEY(7, 7, KEY_W)

	MATRIX_KEY(7, 2, KEY_E)

	MATRIX_KEY(1, 0, KEY_R)

	MATRIX_KEY(4, 4, KEY_T)

	MATRIX_KEY(1, 2, KEY_Y)

	MATRIX_KEY(6, 7, KEY_U)

	MATRIX_KEY(2, 2, KEY_I)

	MATRIX_KEY(5, 6, KEY_O)

	MATRIX_KEY(3, 7, KEY_P)

	MATRIX_KEY(6, 5, KEY_BACKSPACE)



	/* Row 3 */

	MATRIX_KEY(5, 4, KEY_TAB)

	MATRIX_KEY(5, 7, KEY_A)

	MATRIX_KEY(2, 7, KEY_S)

	MATRIX_KEY(7, 0, KEY_D)

	MATRIX_KEY(2, 6, KEY_F)

	MATRIX_KEY(6, 2, KEY_G)

	MATRIX_KEY(6, 6, KEY_H)

	MATRIX_KEY(1, 4, KEY_J)

	MATRIX_KEY(3, 1, KEY_K)

	MATRIX_KEY(2, 1, KEY_L)

	MATRIX_KEY(4, 6, KEY_ENTER)



	/* Row 4 */

	MATRIX_KEY(3, 6, KEY_LEFTSHIFT)		/* KEY_CAPSLOCK */

	MATRIX_KEY(6, 1, KEY_Z)

	MATRIX_KEY(7, 4, KEY_X)

	MATRIX_KEY(5, 1, KEY_C)

	MATRIX_KEY(1, 7, KEY_V)

	MATRIX_KEY(2, 4, KEY_B)

	MATRIX_KEY(4, 1, KEY_N)

	MATRIX_KEY(1, 1, KEY_M)

	MATRIX_KEY(3, 5, KEY_COMMA)

	MATRIX_KEY(5, 2, KEY_DOT)

	MATRIX_KEY(6, 3, KEY_UP)

	MATRIX_KEY(7, 3, KEY_OK)



	/* Row 5 */

	MATRIX_KEY(2, 5, KEY_LEFTCTRL)		/* KEY_LEFTSHIFT */

	MATRIX_KEY(4, 5, KEY_LEFTALT)		/* SYM */

	MATRIX_KEY(6, 0, KEY_MINUS)

	MATRIX_KEY(4, 7, KEY_EQUAL)

	MATRIX_KEY(1, 5, KEY_SPACE)

	MATRIX_KEY(3, 2, KEY_SLASH)

	MATRIX_KEY(4, 3, KEY_LEFT)

	MATRIX_KEY(5, 3, KEY_DOWN)

	MATRIX_KEY(3, 3, KEY_RIGHT)



	/* Side buttons, KEY_VOLUMEDOWN and KEY_PWER are on CPCAP? */

	MATRIX_KEY(5, 0, KEY_VOLUMEUP)

	>;

};



&i2c1 {

	led-controller@38 {

		compatible = "ti,lm3532";

		#address-cells = <1>;

		#size-cells = <0>;

		reg = <0x38>;



		enable-gpios = <&gpio6 12 GPIO_ACTIVE_HIGH>;



		ramp-up-us = <1024>;

		ramp-down-us = <8193>;



		backlight_led: led@0 {

			reg = <0>;

			led-sources = <2>;

			ti,led-mode = <0>;

			label = ":backlight";

		};



		led@1 {

			reg = <1>;

			led-sources = <1>;

			ti,led-mode = <0>;

			label = ":kbd_backlight";

		};

	};

};



&i2c4 {

	lis3dh: accelerometer@18 {

		compatible = "st,lis3dh-accel";

		reg = <0x18>;



		vdd-supply = <&vhvio>;



		interrupt-parent = <&gpio2>;

		interrupts = <2 IRQ_TYPE_EDGE_BOTH>; /* gpio34 */



		rotation-matrix = "0", "-1", "0",

				  "1", "0", "0",

				  "0", "0", "1";

	};

};