diff options
| author | Peter Ujfalusi <peter.ujfalusi@ti.com> | 2014-01-24 12:19:00 +0400 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2014-03-01 03:02:43 +0400 |
| commit | c5d75d5add72ad911c835bc809e0d341b3742185 (patch) | |
| tree | 701b74f939d94e326f049e3540c45774bc928eb8 /arch/arm | |
| parent | aa986458d168f84314b35d70efb8220fd2598cd1 (diff) | |
| download | linux-c5d75d5add72ad911c835bc809e0d341b3742185.tar.xz | |
ARM: dts: omap4-sdp: Move audio related pinmux to respective nodes
Attach the pinctrl nodes to their respective device node:
mcbsp1, mcbsp2, dmic, mcpdm and twl6040.
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/boot/dts/omap4-sdp.dts | 33 |
1 files changed, 28 insertions, 5 deletions
diff --git a/arch/arm/boot/dts/omap4-sdp.dts b/arch/arm/boot/dts/omap4-sdp.dts index dbc81fb6ef03..513b01774966 100644 --- a/arch/arm/boot/dts/omap4-sdp.dts +++ b/arch/arm/boot/dts/omap4-sdp.dts @@ -158,11 +158,6 @@ &omap4_pmx_core { pinctrl-names = "default"; pinctrl-0 = < - &twl6040_pins - &mcpdm_pins - &dmic_pins - &mcbsp1_pins - &mcbsp2_pins &dss_hdmi_pins &tpd12s015_pins >; @@ -326,6 +321,10 @@ twl6040: twl@4b { compatible = "ti,twl6040"; reg = <0x4b>; + + pinctrl-names = "default"; + pinctrl-0 = <&twl6040_pins>; + /* SPI = 0, IRQ# = 119, 4 = active high level-sensitive */ interrupts = <GIC_SPI 119 IRQ_TYPE_LEVEL_HIGH>; /* IRQ_SYS_2N cascaded to gic */ interrupt-parent = <&gic>; @@ -537,10 +536,34 @@ pinctrl-0 = <&uart4_pins>; }; +&mcbsp1 { + pinctrl-names = "default"; + pinctrl-0 = <&mcbsp1_pins>; + status = "okay"; +}; + +&mcbsp2 { + pinctrl-names = "default"; + pinctrl-0 = <&mcbsp2_pins>; + status = "okay"; +}; + &mcbsp3 { status = "disabled"; }; +&dmic { + pinctrl-names = "default"; + pinctrl-0 = <&dmic_pins>; + status = "okay"; +}; + +&mcpdm { + pinctrl-names = "default"; + pinctrl-0 = <&mcpdm_pins>; + status = "okay"; +}; + &twl_usb_comparator { usb-supply = <&vusb>; }; |