On Mon, Mar 5, 2018 at 7:11 PM, Tony Lindgren <tony@xxxxxxxxxxx> wrote:
>
> 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
Pulled into next/dt with a simple conflict resolution as shown
below, thanks!
Arnd
diff --cc arch/arm/boot/dts/logicpd-torpedo-som.dtsi
index 47915447a826,d2135c2f4a37..3e174e474d3d
--- 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 {
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
