Merge pull request #3490 from vpeter4/matrix3

projects/Cuboxi/patches/linux: update device tree for TBS Matrix system
This commit is contained in:
Stephan Raue 2014-09-14 21:23:21 +02:00
commit 9e8c0f5796

View File

@ -15,7 +15,7 @@
chosen {
stdout-path = &uart1;
};
@@ -132,6 +140,12 @@
@@ -132,9 +140,22 @@
red {
gpios = <&gpio1 2 0>;
default-state = "on";
@ -28,7 +28,17 @@
};
};
@@ -475,6 +489,12 @@
+ sound-spdif {
+ compatible = "fsl,imx-audio-spdif";
+ model = "imx-spdif";
+ spdif-controller = <&spdif>;
+ spdif-out;
+ };
+
sound-hdmi {
compatible = "fsl,imx6q-audio-hdmi",
"fsl,imx-audio-hdmi";
@@ -475,6 +496,16 @@
>;
};
@ -37,11 +47,15 @@
+ MX6QDL_PAD_EIM_D18__GPIO3_IO18 0x80000000
+ >;
+ };
+
+
+ pinctrl_sabresd_spdif: sabresd-spdif {
+ fsl,pins = <MX6QDL_PAD_GPIO_19__SPDIF_OUT 0x13091>;
+ };
+
pinctrl_hdmi_cec: hdmi_cecgrp {
fsl,pins = <
MX6QDL_PAD_KEY_ROW2__HDMI_TX_CEC_LINE 0x1f8b0
@@ -618,6 +638,7 @@
@@ -618,6 +649,7 @@
pinctrl_gpio_leds: gpioledsgrp {
fsl,pins = <
MX6QDL_PAD_GPIO_2__GPIO1_IO02 0x80000000
@ -49,3 +63,26 @@
>;
};
};
@@ -698,6 +730,22 @@
status = "okay";
};
+&spdif {
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_sabresd_spdif>;
+ clocks = <&clks 197>, <&clks 0>,
+ <&clks 197>, <&clks 0>,
+ <&clks 0>, <&clks 0>,
+ <&clks 0>, <&clks 0>,
+ <&clks 0>;
+ clock-names = "core", "rxtx0",
+ "rxtx1", "rxtx2",
+ "rxtx3", "rxtx4",
+ "rxtx5", "rxtx6",
+ "rxtx7";
+ status = "okay";
+};
+
&usbh1 {
vbus-supply = <&reg_usb_h1_vbus>;
status = "okay";