projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'mkp-scsi/4.8/scsi-fixes' into fixes
[cascardo/linux.git]
/
arch
/
arm
/
boot
/
dts
/
omap4-sdp.dts
diff --git
a/arch/arm/boot/dts/omap4-sdp.dts
b/arch/arm/boot/dts/omap4-sdp.dts
index
aae5132
..
10d73a7
100644
(file)
--- a/
arch/arm/boot/dts/omap4-sdp.dts
+++ b/
arch/arm/boot/dts/omap4-sdp.dts
@@
-160,7
+160,7
@@
enable-active-high;
};
enable-active-high;
};
- tpd12s015: encoder
@0
{
+ tpd12s015: encoder {
compatible = "ti,tpd12s015";
gpios = <&gpio2 28 GPIO_ACTIVE_HIGH>, /* 60, CT CP HPD */
compatible = "ti,tpd12s015";
gpios = <&gpio2 28 GPIO_ACTIVE_HIGH>, /* 60, CT CP HPD */
@@
-174,7
+174,7
@@
port@0 {
reg = <0>;
port@0 {
reg = <0>;
- tpd12s015_in: endpoint
@0
{
+ tpd12s015_in: endpoint {
remote-endpoint = <&hdmi_out>;
};
};
remote-endpoint = <&hdmi_out>;
};
};
@@
-182,14
+182,14
@@
port@1 {
reg = <1>;
port@1 {
reg = <1>;
- tpd12s015_out: endpoint
@0
{
+ tpd12s015_out: endpoint {
remote-endpoint = <&hdmi_connector_in>;
};
};
};
};
remote-endpoint = <&hdmi_connector_in>;
};
};
};
};
- hdmi0: connector
@0
{
+ hdmi0: connector {
compatible = "hdmi-connector";
label = "hdmi";
compatible = "hdmi-connector";
label = "hdmi";
@@
-367,6
+367,7
@@
twl6040: twl@4b {
compatible = "ti,twl6040";
twl6040: twl@4b {
compatible = "ti,twl6040";
+ #clock-cells = <0>;
reg = <0x4b>;
pinctrl-names = "default";
reg = <0x4b>;
pinctrl-names = "default";
@@
-620,6
+621,10
@@
&mcpdm {
pinctrl-names = "default";
pinctrl-0 = <&mcpdm_pins>;
&mcpdm {
pinctrl-names = "default";
pinctrl-0 = <&mcpdm_pins>;
+
+ clocks = <&twl6040>;
+ clock-names = "pdmclk";
+
status = "okay";
};
status = "okay";
};