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

Commit 84fbd2b8 authored by Tony Lindgren's avatar Tony Lindgren
Browse files

Merge branch 'for_3.8/dts_part2' of... 

Merge branch 'for_3.8/dts_part2' of git://git.kernel.org/pub/scm/linux/kernel/git/bcousson/linux-omap-dt into omap-for-v3.8/dt
parents 2580390c 5a2bc4c6

Documentation/devicetree/bindings/usb/am33xx-usb.txt

+21 −0
Original line number Diff line number Diff line 
AM33XX MUSB GLUE

 - compatible : Should be "ti,musb-am33xx"

 - reg : offset and length of register sets, first usbss, then for musb instances

 - interrupts : usbss, musb instance interrupts in order

 - ti,hwmods : must be "usb_otg_hs"

 - multipoint : Should be "1" indicating the musb controller supports

   multipoint. This is a MUSB configuration-specific setting.
@@ -12,3 +14,22 @@ AM33XX MUSB GLUE 
   represents PERIPHERAL.

 - power : Should be "250". This signifies the controller can supply upto

   500mA when operating in host mode.



Example:



usb@47400000  {

	compatible = "ti,musb-am33xx";

	reg = <0x47400000 0x1000	/* usbss */

	       0x47401000 0x800		/* musb instance 0 */

	       0x47401800 0x800>;	/* musb instance 1 */

	interrupts = <17		/* usbss */

		      18		/* musb instance 0 */

		      19>;		/* musb instance 1 */

	multipoint = <1>;

	num-eps = <16>;

	ram-bits = <12>;

	port0-mode = <3>;

	port1-mode = <3>;

	power = <250>;

	ti,hwmods = "usb_otg_hs";

};

arch/arm/boot/dts/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -73,6 +73,7 @@ dtb-$(CONFIG_ARCH_OMAP2PLUS) += omap2420-h4.dtb \ 
	omap4-sdp.dtb \

	omap5-evm.dtb \

	am335x-evm.dtb \

	am335x-evmsk.dtb \

	am335x-bone.dtb

dtb-$(CONFIG_ARCH_PRIMA2) += prima2-evb.dtb

dtb-$(CONFIG_ARCH_U8500) += snowball.dtb

arch/arm/boot/dts/am335x-bone.dts

+44 −0
Original line number Diff line number Diff line
@@ -24,6 +24,20 @@ 
		reg = <0x80000000 0x10000000>; /* 256 MB */

	};



	am33xx_pinmux: pinmux@44e10800 {

		pinctrl-names = "default";

		pinctrl-0 = <&user_leds_s0>;



		user_leds_s0: user_leds_s0 {

			pinctrl-single,pins = <

				0x54 0x7	/* gpmc_a5.gpio1_21, OUTPUT | MODE7 */

				0x58 0x17	/* gpmc_a6.gpio1_22, OUTPUT_PULLUP | MODE7 */

				0x5c 0x7	/* gpmc_a7.gpio1_23, OUTPUT | MODE7 */

				0x60 0x17	/* gpmc_a8.gpio1_24, OUTPUT_PULLUP | MODE7 */

			>;

		};

	};



	ocp {

		uart1: serial@44e09000 {

			status = "okay";
@@ -39,6 +53,36 @@ 


		};

	};



	leds {

		compatible = "gpio-leds";



		led@2 {

			label = "beaglebone:green:heartbeat";

			gpios = <&gpio2 21 0>;

			linux,default-trigger = "heartbeat";

			default-state = "off";

		};



		led@3 {

			label = "beaglebone:green:mmc0";

			gpios = <&gpio2 22 0>;

			linux,default-trigger = "mmc0";

			default-state = "off";

		};



		led@4 {

			label = "beaglebone:green:usr2";

			gpios = <&gpio2 23 0>;

			default-state = "off";

		};



		led@5 {

			label = "beaglebone:green:usr3";

			gpios = <&gpio2 24 0>;

			default-state = "off";

		};

	};

};



/include/ "tps65217.dtsi"

arch/arm/boot/dts/am335x-evm.dts

+63 −0
Original line number Diff line number Diff line
@@ -24,6 +24,28 @@ 
		reg = <0x80000000 0x10000000>; /* 256 MB */

	};



	am33xx_pinmux: pinmux@44e10800 {

		pinctrl-names = "default";

		pinctrl-0 = <&matrix_keypad_s0 &volume_keys_s0>;



		matrix_keypad_s0: matrix_keypad_s0 {

			pinctrl-single,pins = <

				0x54 0x7	/* gpmc_a5.gpio1_21, OUTPUT | MODE7 */

				0x58 0x7	/* gpmc_a6.gpio1_22, OUTPUT | MODE7 */

				0x64 0x27	/* gpmc_a9.gpio1_25, INPUT | MODE7 */

				0x68 0x27	/* gpmc_a10.gpio1_26, INPUT | MODE7 */

				0x6c 0x27	/* gpmc_a11.gpio1_27, INPUT | MODE7 */

			>;

		};



		volume_keys_s0: volume_keys_s0 {

			pinctrl-single,pins = <

				0x150 0x27	/* spi0_sclk.gpio0_2, INPUT | MODE7 */

				0x154 0x27	/* spi0_d0.gpio0_3, INPUT | MODE7 */

			>;

		};

	};



	ocp {

		uart1: serial@44e09000 {

			status = "okay";
@@ -95,6 +117,47 @@ 
		regulator-name = "lis3_reg";

		regulator-boot-on;

	};



	matrix_keypad: matrix_keypad@0 {

		compatible = "gpio-matrix-keypad";

		debounce-delay-ms = <5>;

		col-scan-delay-us = <2>;



		row-gpios = <&gpio2 25 0	/* Bank1, pin25 */

			     &gpio2 26 0	/* Bank1, pin26 */

			     &gpio2 27 0>;	/* Bank1, pin27 */



		col-gpios = <&gpio2 21 0	/* Bank1, pin21 */

			     &gpio2 22 0>;	/* Bank1, pin22 */



		linux,keymap = <0x0000008b	/* MENU */

				0x0100009e	/* BACK */

				0x02000069	/* LEFT */

				0x0001006a	/* RIGHT */

				0x0101001c	/* ENTER */

				0x0201006c>;	/* DOWN */

	};



	gpio_keys: volume_keys@0 {

		compatible = "gpio-keys";

		#address-cells = <1>;

		#size-cells = <0>;

		autorepeat;



		switch@9 {

			label = "volume-up";

			linux,code = <115>;

			gpios = <&gpio1 2 1>;

			gpio-key,wakeup;

		};



		switch@10 {

			label = "volume-down";

			linux,code = <114>;

			gpios = <&gpio1 3 1>;

			gpio-key,wakeup;

		};

	};

};



/include/ "tps65910.dtsi"

arch/arm/boot/dts/am335x-evmsk.dts

+84 −0
Original line number Diff line number Diff line
@@ -30,6 +30,29 @@ 
		reg = <0x80000000 0x10000000>; /* 256 MB */

	};



	am33xx_pinmux: pinmux@44e10800 {

		pinctrl-names = "default";

		pinctrl-0 = <&user_leds_s0 &gpio_keys_s0>;



		user_leds_s0: user_leds_s0 {

			pinctrl-single,pins = <

				0x10 0x7	/* gpmc_ad4.gpio1_4, OUTPUT | MODE7 */

				0x14 0x7	/* gpmc_ad5.gpio1_5, OUTPUT | MODE7 */

				0x18 0x7	/* gpmc_ad6.gpio1_6, OUTPUT | MODE7 */

				0x1c 0x7	/* gpmc_ad7.gpio1_7, OUTPUT | MODE7 */

			>;

		};



		gpio_keys_s0: gpio_keys_s0 {

			pinctrl-single,pins = <

				0x94 0x27	/* gpmc_oen_ren.gpio2_3, INPUT | MODE7 */

				0x90 0x27	/* gpmc_advn_ale.gpio2_2, INPUT | MODE7 */

				0x70 0x27	/* gpmc_wait0.gpio0_30, INPUT | MODE7 */

				0x9c 0x27	/* gpmc_ben0_cle.gpio2_5, INPUT | MODE7 */

			>;

		};

	};



	ocp {

		uart1: serial@44e09000 {

			status = "okay";
@@ -86,6 +109,67 @@ 
		regulator-name = "lis3_reg";

		regulator-boot-on;

	};



	leds {

		compatible = "gpio-leds";



		led@1 {

			label = "evmsk:green:usr0";

			gpios = <&gpio2 4 0>;

			default-state = "off";

		};



		led@2 {

			label = "evmsk:green:usr1";

			gpios = <&gpio2 5 0>;

			default-state = "off";

		};



		led@3 {

			label = "evmsk:green:mmc0";

			gpios = <&gpio2 6 0>;

			linux,default-trigger = "mmc0";

			default-state = "off";

		};



		led@4 {

			label = "evmsk:green:heartbeat";

			gpios = <&gpio2 7 0>;

			linux,default-trigger = "heartbeat";

			default-state = "off";

		};

	};



	gpio_buttons: gpio_buttons@0 {

		compatible = "gpio-keys";

		#address-cells = <1>;

		#size-cells = <0>;



		switch@1 {

			label = "button0";

			linux,code = <0x100>;

			gpios = <&gpio3 3 0>;

		};



		switch@2 {

			label = "button1";

			linux,code = <0x101>;

			gpios = <&gpio3 2 0>;

		};



		switch@3 {

			label = "button2";

			linux,code = <0x102>;

			gpios = <&gpio1 30 0>;

			gpio-key,wakeup;

		};



		switch@4 {

			label = "button3";

			linux,code = <0x103>;

			gpios = <&gpio3 5 0>;

		};

	};

};



/include/ "tps65910.dtsi"