Merge branch 'for-linus-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/mason...

[cascardo/linux.git] / arch / arm / boot / dts / am57xx-beagle-x15.dts

diff --git a/arch/arm/boot/dts/am57xx-beagle-x15.dts b/arch/arm/boot/dts/am57xx-beagle-x15.dts
index 4168eb9..81d6c30 100644 (file)
--- a/arch/arm/boot/dts/am57xx-beagle-x15.dts
+++ b/arch/arm/boot/dts/am57xx-beagle-x15.dts
@@ -8,6 +8,7 @@
 /dts-v1/;
 
 #include "dra74x.dtsi"
+#include "am57xx-commercial-grade.dtsi"
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/interrupt-controller/irq.h>
 
@@ -144,7 +145,7 @@
                };
        };
 
-       sound0: sound@0 {
+       sound0: sound0 {
                compatible = "simple-audio-card";
                simple-audio-card,name = "BeagleBoard-X15";
                simple-audio-card,widgets =
@@ -166,8 +167,6 @@
 
                sound0_master: simple-audio-card,codec {
                        sound-dai = <&tlv320aic3104>;
-                       assigned-clocks = <&clkoutmux2_clk_mux>;
-                       assigned-clock-parents = <&sys_clk2_dclk_div>;
                        clocks = <&clkout2_clk>;
                };
        };
@@ -427,7 +426,7 @@
                                        /* VDD_DSPEVE, VDD_IVA, VDD_GPU */
                                        regulator-name = "smps45";
                                        regulator-min-microvolt = < 850000>;
-                                       regulator-max-microvolt = <1150000>;
+                                       regulator-max-microvolt = <1250000>;
                                        regulator-always-on;
                                        regulator-boot-on;
                                };
@@ -436,7 +435,7 @@
                                        /* VDD_CORE */
                                        regulator-name = "smps6";
                                        regulator-min-microvolt = <850000>;
-                                       regulator-max-microvolt = <1030000>;
+                                       regulator-max-microvolt = <1150000>;
                                        regulator-always-on;
                                        regulator-boot-on;
                                };
@@ -571,6 +570,9 @@
                pinctrl-names = "default", "sleep";
                pinctrl-0 = <&clkout2_pins_default>;
                pinctrl-1 = <&clkout2_pins_sleep>;
+               assigned-clocks = <&clkoutmux2_clk_mux>;
+               assigned-clock-parents = <&sys_clk2_dclk_div>;
+
                status = "okay";
                adc-settle-ms = <40>;
 
@@ -795,6 +797,8 @@
        serial-dir = <  /* 0: INACTIVE, 1: TX, 2: RX */
                1 2 0 0
        >;
+       tx-num-evt = <32>;
+       rx-num-evt = <32>;
 };
 
 &mailbox5 {