diff options
| author | Tom Rini <trini@konsulko.com> | 2019-08-26 17:45:20 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-08-26 17:45:20 -0400 |
| commit | 12277acda0802e4517ca82842c71aae723f0da16 (patch) | |
| tree | 34a610694fdcee8f19f81337f6658a84210262ee /arch | |
| parent | 7a4b0bc5fe70225ae3595ba81d1473c06fd6b83b (diff) | |
| parent | 44de15d6867c246e7a09ef061d3de56e1799a606 (diff) | |
| download | u-boot-12277acda0802e4517ca82842c71aae723f0da16.tar.gz u-boot-12277acda0802e4517ca82842c71aae723f0da16.tar.xz u-boot-12277acda0802e4517ca82842c71aae723f0da16.zip | |
Merge branch '2019-08-26-master-imports'
- Assorted minor bugfixes
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/dts/logicpd-som-lv.dtsi | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/arch/arm/dts/logicpd-som-lv.dtsi b/arch/arm/dts/logicpd-som-lv.dtsi index 5563ee54c9..b56524cc7f 100644 --- a/arch/arm/dts/logicpd-som-lv.dtsi +++ b/arch/arm/dts/logicpd-som-lv.dtsi @@ -228,6 +228,20 @@ >; }; + 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 */ + >; + }; + tsc2004_pins: pinmux_tsc2004_pins { pinctrl-single,pins = < OMAP3_CORE1_IOPAD(0x2186, PIN_INPUT | MUX_MODE4) /* mcbsp4_dr.gpio_153 */ @@ -249,18 +263,6 @@ OMAP3_WKUP_IOPAD(0x2a0c, PIN_OUTPUT | MUX_MODE4) /* sys_boot1.gpio_3 */ >; }; - 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 */ - >; - }; }; &omap3_pmx_core2 { |