Commit c5d75d5a authored by Peter Ujfalusi's avatar Peter Ujfalusi Committed by Tony Lindgren

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: default avatarPeter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent aa986458
...@@ -158,11 +158,6 @@ wl12xx_vmmc: wl12xx_vmmc { ...@@ -158,11 +158,6 @@ wl12xx_vmmc: wl12xx_vmmc {
&omap4_pmx_core { &omap4_pmx_core {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = < pinctrl-0 = <
&twl6040_pins
&mcpdm_pins
&dmic_pins
&mcbsp1_pins
&mcbsp2_pins
&dss_hdmi_pins &dss_hdmi_pins
&tpd12s015_pins &tpd12s015_pins
>; >;
...@@ -326,6 +321,10 @@ twl: twl@48 { ...@@ -326,6 +321,10 @@ twl: twl@48 {
twl6040: twl@4b { twl6040: twl@4b {
compatible = "ti,twl6040"; compatible = "ti,twl6040";
reg = <0x4b>; reg = <0x4b>;
pinctrl-names = "default";
pinctrl-0 = <&twl6040_pins>;
/* SPI = 0, IRQ# = 119, 4 = active high level-sensitive */ /* SPI = 0, IRQ# = 119, 4 = active high level-sensitive */
interrupts = <GIC_SPI 119 IRQ_TYPE_LEVEL_HIGH>; /* IRQ_SYS_2N cascaded to gic */ interrupts = <GIC_SPI 119 IRQ_TYPE_LEVEL_HIGH>; /* IRQ_SYS_2N cascaded to gic */
interrupt-parent = <&gic>; interrupt-parent = <&gic>;
...@@ -537,10 +536,34 @@ &uart4 { ...@@ -537,10 +536,34 @@ &uart4 {
pinctrl-0 = <&uart4_pins>; 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 { &mcbsp3 {
status = "disabled"; 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 { &twl_usb_comparator {
usb-supply = <&vusb>; usb-supply = <&vusb>;
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment