Merge branch 'work.splice_read' of git://git.kernel.org/pub/scm/linux/kernel/git...

[cascardo/linux.git] / arch / arm / boot / dts / stihxxx-b2120.dtsi

diff --git a/arch/arm/boot/dts/stihxxx-b2120.dtsi b/arch/arm/boot/dts/stihxxx-b2120.dtsi
index 133375b..ed2b7a9 100644 (file)
--- a/arch/arm/boot/dts/stihxxx-b2120.dtsi
+++ b/arch/arm/boot/dts/stihxxx-b2120.dtsi
@@ -18,14 +18,12 @@
                leds {
                        compatible = "gpio-leds";
                        red {
-                               #gpio-cells = <2>;
                                label = "Front Panel LED";
-                               gpios = <&pio4 1 0>;
+                               gpios = <&pio4 1 GPIO_ACTIVE_HIGH>;
                                linux,default-trigger = "heartbeat";
                        };
                        green {
-                               #gpio-cells = <2>;
-                               gpios = <&pio1 3 0>;
+                               gpios = <&pio1 3 GPIO_ACTIVE_HIGH>;
                                default-state = "off";
                        };
                };
@@ -65,6 +63,7 @@
                };
 
                mmc0: sdhci@09060000 {
+                       non-removable;
                        status = "okay";
                };
 
@@ -135,5 +134,50 @@
                                dvb-card        = <STV0367_TDA18212_NIMA_1>;
                        };
                };
+
+               sti_uni_player2: sti-uni-player@8d82000 {
+                       status = "okay";
+               };
+
+               sti_uni_player3: sti-uni-player@8d85000 {
+                       status = "okay";
+               };
+
+               sti_sasg_codec: sti-sasg-codec {
+                       status = "okay";
+                       pinctrl-names = "default";
+                       pinctrl-0 = <&pinctrl_spdif_out>;
+               };
+
+               sound {
+                       compatible = "simple-audio-card";
+                       simple-audio-card,name = "sti audio card";
+                       status = "okay";
+
+                       simple-audio-card,dai-link@0 {
+                               /* DAC */
+                               format = "i2s";
+                               mclk-fs = <256>;
+                               cpu {
+                                       sound-dai = <&sti_uni_player2>;
+                               };
+
+                               codec {
+                                       sound-dai = <&sti_sasg_codec 1>;
+                               };
+                       };
+                       simple-audio-card,dai-link@1 {
+                               /* SPDIF */
+                               format = "left_j";
+                               mclk-fs = <128>;
+                               cpu {
+                                       sound-dai = <&sti_uni_player3>;
+                               };
+
+                               codec {
+                                       sound-dai = <&sti_sasg_codec 0>;
+                               };
+                       };
+               };
        };
 };