From: Arnd Bergmann <arnd@arndb.de>
Date: Wed, 7 Mar 2018 14:38:00 +0000 (+0100)
Subject: Merge tag 'omap-for-v4.17/dt-signed' of ssh://gitolite.kernel.org/pub/scm/linux/kerne... 
X-Git-Tag: v4.19~1283^2~57
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e94e5cb859293daa41e9386b3134e4c3265c1840;p=platform%2Fkernel%2Flinux-rpi.git

Merge tag 'omap-for-v4.17/dt-signed' of ssh://gitolite./linux/kernel/git/tmlind/linux-omap into next/dt

Pull "Device tree changes for omap variants for v4.17" from Tony Lindgren:

This series of changes updates the device tree files for omaps:

- Nokia N9 support for magnetometer

- Update at24 to use atmel as manufacturer for am335x-boneblue

- Add support for am33xx based PDU001 board

- Update Droid 4 touchscreen for reset-gpios and add audio
  codec and soundcard

- Remove unused dra7 cooling level nodes

- A series of changes to configure am335x and am437x for PM

- Add pinmuxing for i2c2 and 3 for LogicPD boards

- Add EMIF interrupt infor for am437x and am335x

- Add missing omap3 sound-dai-cells

* tag 'omap-for-v4.17/dt-signed' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: (21 commits)
  ARM: dts: omap4-droid4: add soundcard
  ARM: dts: motorola-cpcap-mapphone: add audio-codec
  ARM: dts: omap3: Add missing #sound-dai-cells
  ARM: dts: am43xx: add emif interrupt info
  ARM: dts: am33xx: add emif interrupt info
  ARM: dts: Add pinmuxing for i2c2 and i2c3 for LogicPD SOM-LV
  ARM: dts: Add pinmuxing for i2c2 and i2c3 for LogicPD torpedo
  ARM: dts: am4372: Mark omap_l3_noc with ti,no-idle
  ARM: dts: am4372: Mark emif with ti,no-idle
  ARM: dts: am33xx: Mark emif with ti,no-idle
  ARM: dts: am4372: Add soc node
  ARM: dts: am33xx: Add pm-sram phandle to soc node
  ARM: dts: am4372: Update emif node
  ARM: dts: am33xx: Update emif node
  ARM: dts: am4372: Reserve pm code and data regions in ocmcram sram node
  ARM: dts: am33xx: Reserve pm code and data regions in ocmcram sram node
  ARM: dts: omap: Remove "cooling-{min|max}-level" for CPU nodes
  ARM: dts: omap4-droid4: update touchscreen
  ARM: dts: am33xx: add PDU001 board
  ARM: dts: use 'atmel' as at24 manufacturer in am335x-boneblue
  ...

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---

e94e5cb859293daa41e9386b3134e4c3265c1840
diff --cc arch/arm/boot/dts/logicpd-torpedo-som.dtsi
index 4791544,d2135c2..3e174e4
--- a/arch/arm/boot/dts/logicpd-torpedo-som.dtsi
+++ b/arch/arm/boot/dts/logicpd-torpedo-som.dtsi
@@@ -138,12 -140,18 +142,24 @@@
  			OMAP3_CORE1_IOPAD(0x21b8, PIN_INPUT | MUX_MODE0)	/* hsusb0_data7.hsusb0_data7 */
  		>;
  	};
 +	i2c1_pins: pinmux_i2c1_pins {
 +		pinctrl-single,pins = <
 +			OMAP3_CORE1_IOPAD(0x21ba, PIN_INPUT | MUX_MODE0)        /* i2c1_scl.i2c1_scl */
 +			OMAP3_CORE1_IOPAD(0x21bc, PIN_INPUT | MUX_MODE0)        /* i2c1_sda.i2c1_sda */
 +		>;
 +	};
+ 	i2c2_pins: pinmux_i2c2_pins {
+ 		pinctrl-single,pins = <
+ 			OMAP3_CORE1_IOPAD(0x21be, PIN_INPUT | MUX_MODE0)	/* i2c2_scl */
+ 			OMAP3_CORE1_IOPAD(0x21c0, PIN_INPUT | MUX_MODE0)	/* i2c2_sda */
+ 		>;
+ 	};
+ 	i2c3_pins: pinmux_i2c3_pins {
+ 		pinctrl-single,pins = <
+ 			OMAP3_CORE1_IOPAD(0x21c2, PIN_INPUT | MUX_MODE0)	/* i2c3_scl */
+ 			OMAP3_CORE1_IOPAD(0x21c4, PIN_INPUT | MUX_MODE0)	/* i2c3_sda */
+ 		>;
+ 	};
  };
  
  &uart2 {