[GIT PULL 5/5] omap dt changes for v3.16 merge window

[GIT PULL 5/5] omap dt changes for v3.16 merge window

[Tony Lindgren]

* Tony Lindgren <tony@atomide.com> [140508 16:45]:
> The following changes since commit 89ca3b881987f5a4be4c5dbaa7f0df12bbdde2fd:
> 
>   Linux 3.15-rc4 (2014-05-04 18:14:42 -0700)
> 
> are available in the git repository at:
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.16/dt-signed
> 
> for you to fetch changes up to 3fdb77174a2c173e0e69f2499b836a0e412f6c4d:
> 
>   ARM: dts: omap3-n900: use MATRIX_KEY for keymap (2014-05-06 10:22:51 -0700)
> 
> ----------------------------------------------------------------
> Device tree related changes for omaps for v3.16 merge window.

FYI, this causes a trivial merge conflict with the PM pull request
in this. Just overlapping additions, my resolution below for
reference.

Regards,

Tony


--- a/arch/arm/boot/dts/omap3-n900.dts
+++ b/arch/arm/boot/dts/omap3-n900.dts
@@@ -141,12 -144,15 +155,21 @@@
  		>;
  	};
  
 +	debug_leds: pinmux_debug_led_pins {
 +		pinctrl-single,pins = <
 +			OMAP3_CORE1_IOPAD(0x2198, PIN_OUTPUT | MUX_MODE4)	/* mcbsp1_clkx.gpio_162 */
 +		>;
 +	};
 +
+ 	mcspi4_pins: pinmux_mcspi4_pins {
+ 		pinctrl-single,pins = <
+ 			0x15c (PIN_INPUT_PULLDOWN | MUX_MODE1) /* mcspi4_clk */
+ 			0x162 (PIN_INPUT_PULLDOWN | MUX_MODE1) /* mcspi4_somi */
+ 			0x160 (PIN_OUTPUT | MUX_MODE1) /* mcspi4_simo */
+ 			0x166 (PIN_OUTPUT | MUX_MODE1) /* mcspi4_cs0 */
+ 		>;
+ 	};
+ 
  	mmc1_pins: pinmux_mmc1_pins {
  		pinctrl-single,pins = <
  			0x114 (PIN_INPUT_PULLUP | MUX_MODE0)	/* sdmmc1_clk */