openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

ARM: dts: omap4-panda-common: Move audio related pinmux to respective nodes 

Attach the pinctrl nodes to their respective device node:
mcbsp1, mcpdm and twl6040.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
This commit is contained in:
Peter Ujfalusi 2014-01-24 10:18:59 +02:00 committed by Tony Lindgren
parent fd4a8a685d
commit aa986458d1
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
arch/arm/boot/dts/omap4-panda-common.dtsi
View File

@ -109,9 +109,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
&mcbsp1_pins
&dss_dpi_pins &dss_dpi_pins
&tfp410_pins &tfp410_pins
&dss_hdmi_pins &dss_hdmi_pins
@ -300,6 +297,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>;
/* IRQ# = 119 */ /* IRQ# = 119 */
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>;
@ -380,6 +381,12 @@ &emif2 {
device-handle = <&elpida_ECB240ABACN>; device-handle = <&elpida_ECB240ABACN>;
}; };
&mcbsp1 {
pinctrl-names = "default";
pinctrl-0 = <&mcbsp1_pins>;
status = "okay";
};
&mcbsp2 { &mcbsp2 {
status = "disabled"; status = "disabled";
}; };
@ -392,6 +399,12 @@ &dmic {
status = "disabled"; status = "disabled";
}; };
&mcpdm {
pinctrl-names = "default";
pinctrl-0 = <&mcpdm_pins>;
status = "okay";
};
&twl_usb_comparator { &twl_usb_comparator {
usb-supply = <&vusb>; usb-supply = <&vusb>;
}; };