diff options
| author | Tony Lindgren <tony@atomide.com> | 2013-09-18 21:50:45 +0200 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2013-09-18 21:50:45 +0200 |
| commit | 45bea1d39a956619881315e20bdf52c8a702be03 (patch) | |
| tree | 80376af9c06b72aef53f44e422ad52bc45f302ee /arch/arm/boot/dts/omap3-igep.dtsi | |
| parent | Linux 3.12-rc1 (diff) | |
| parent | ARM: dts: igep00x0: Add pinmux configuration for MCBSP2 (diff) | |
| download | linux-45bea1d39a956619881315e20bdf52c8a702be03.tar.xz linux-45bea1d39a956619881315e20bdf52c8a702be03.zip | |
Merge tag 'for_3.12-rc2/dts_signed' of git://git.kernel.org/pub/scm/linux/kernel/git/bcousson/linux-omap-dt into omap-for-v3.12/fixes-dt
Fix BBB LDO voltage to avoid HDMI destruction
Fix OMAP5 wrong attribute
Fix typo in beagle xM strings
Fix missing pinmux and regulator for OMAP4 wifi
Fix missing pinmux for igep headset
Diffstat (limited to 'arch/arm/boot/dts/omap3-igep.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/omap3-igep.dtsi | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/omap3-igep.dtsi b/arch/arm/boot/dts/omap3-igep.dtsi index bc48b114eae6..2326d11462a5 100644 --- a/arch/arm/boot/dts/omap3-igep.dtsi +++ b/arch/arm/boot/dts/omap3-igep.dtsi @@ -48,6 +48,15 @@ >; }; + mcbsp2_pins: pinmux_mcbsp2_pins { + pinctrl-single,pins = < + 0x10c (PIN_INPUT | MUX_MODE0) /* mcbsp2_fsx.mcbsp2_fsx */ + 0x10e (PIN_INPUT | MUX_MODE0) /* mcbsp2_clkx.mcbsp2_clkx */ + 0x110 (PIN_INPUT | MUX_MODE0) /* mcbsp2_dr.mcbsp2.dr */ + 0x112 (PIN_OUTPUT | MUX_MODE0) /* mcbsp2_dx.mcbsp2_dx */ + >; + }; + mmc1_pins: pinmux_mmc1_pins { pinctrl-single,pins = < 0x114 (PIN_INPUT_PULLUP | MUX_MODE0) /* sdmmc1_clk.sdmmc1_clk */ @@ -93,6 +102,11 @@ clock-frequency = <400000>; }; +&mcbsp2 { + pinctrl-names = "default"; + pinctrl-0 = <&mcbsp2_pins>; +}; + &mmc1 { pinctrl-names = "default"; pinctrl-0 = <&mmc1_pins>; |