summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 2a4c34c)
raw | patch | inline | side by side (parent: 2a4c34c)
author | Dan Murphy <dmurphy@ti.com> | |
Wed, 24 Apr 2013 15:48:17 +0000 (10:48 -0500) | ||
committer | Archit Taneja <archit@ti.com> | |
Thu, 25 Apr 2013 04:13:51 +0000 (09:43 +0530) |
Need to add back all integrated content into the omap4-panda-common.
The panda-common was introduced in commit 8d7804ea21b8172da7fa0ba66802193cb6c11588
but did not contain all the previous integrated content because it was based off the mainline
panda file.
Add back the removed content from the following commits
9f27ac6b975c2de80ec4b7119dabff06ab288722
9f27ac6b975c2de80ec4b7119dabff06ab288722
6a347f858b110c64d575f3ecb62ea682944289f7
8f264527c31f0023bcd68d0bf4a7634eb7f95659
Signed-off-by: Dan Murphy <dmurphy@ti.com>
The panda-common was introduced in commit 8d7804ea21b8172da7fa0ba66802193cb6c11588
but did not contain all the previous integrated content because it was based off the mainline
panda file.
Add back the removed content from the following commits
9f27ac6b975c2de80ec4b7119dabff06ab288722
9f27ac6b975c2de80ec4b7119dabff06ab288722
6a347f858b110c64d575f3ecb62ea682944289f7
8f264527c31f0023bcd68d0bf4a7634eb7f95659
Signed-off-by: Dan Murphy <dmurphy@ti.com>
arch/arm/boot/dts/omap4-panda-common.dtsi | patch | blob | history |
index 122fd99f7bf82d021403882561ef21e20f892e71..d5a1a31fb8ef16ebbe6d026c7c7071db01674324 100644 (file)
ti,mclk-freq = <38400000>;
ti,mcpdm = <&mcpdm>;
+ ti,mcbsp1 = <&mcbsp1>;
+ ti,mcbsp2 = <&mcbsp2>;
+ ti,aess = <&aess>;
ti,twl6040 = <&twl6040>;
"HSMIC", "Headset Mic",
"Headset Mic", "Headset Mic Bias",
"AFML", "Line In",
- "AFMR", "Line In";
+ "AFMR", "Line In",
+ "Headset Playback", "PDM_DL1",
+ "Handsfree Playback", "PDM_DL2",
+ "PDM_UL1", "Capture",
+ "40122000.mcbsp Playback", "BT_VX_DL",
+ "BT_VX_UL", "40122000.mcbsp Capture",
+ "40124000.mcbsp Playback", "MM_EXT_DL",
+ "MM_EXT_UL", "40124000.mcbsp Capture";
+ };
+
+ sound_hdmi {
+ compatible = "ti,omap-hdmi-tpd12s015-audio";
+ ti,model = "OMAP4HDMI";
+
+ ti,hdmi_audio = <&hdmi>;
+ ti,level_shifter = <&tpd12s015>;
};
};
twl6040: twl@4b {
compatible = "ti,twl6040";
- reg = <0x4b>;
/* SPI = 0, IRQ# = 119, 4 = active high level-sensitive */
interrupts = <0 119 4>; /* IRQ_SYS_2N cascaded to gic */
interrupt-parent = <&gic>;
};
/include/ "twl6030.dtsi"
+/include/ "twl6040.dtsi"
&i2c2 {
pinctrl-names = "default";
device-handle = <&elpida_ECB240ABACN>;
};
-&mcbsp2 {
- status = "disabled";
-};
-
&mcbsp3 {
status = "disabled";
};
status = "disabled";
};
+&dpi {
+ dvi {
+ compatible = "ti,tfp410";
+ data-lines = <24>;
+ gpios = <&gpio1 0 0>; /* 0, power-down */
+ i2c-bus = <&i2c3>;
+ };
+};
+
+&hdmi {
+ tpd12s015: tpd12s015 {
+ compatible = "ti,tpd12s015";
+
+ gpios = <&gpio2 28 0>, /* 60, CT CP HPD */
+ <&gpio2 9 0>, /* 41, LS OE */
+ <&gpio2 31 0>; /* 63, HPD */
+
+ hdmi {
+ compatible = "ti,hdmi_panel";
+ };
+
+ };
+};
+
&twl_usb_comparator {
usb-supply = <&vusb>;
};