Merge tag 'dt-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

[cascardo/linux.git] / arch / arm / boot / dts / r8a7790-lager.dts

diff --git a/arch/arm/boot/dts/r8a7790-lager.dts b/arch/arm/boot/dts/r8a7790-lager.dts
index 4118030..0c3b678 100644 (file)
--- a/arch/arm/boot/dts/r8a7790-lager.dts
+++ b/arch/arm/boot/dts/r8a7790-lager.dts
@@ -355,7 +355,7 @@
 
        phy-handle = <&phy1>;
        renesas,ether-link-active-low;
-       status = "ok";
+       status = "okay";
 
        phy1: ethernet-phy@1 {
                reg = <1>;
@@ -366,7 +366,7 @@
 };
 
 &cmt0 {
-       status = "ok";
+       status = "okay";
 };
 
 &mmcif1 {
@@ -397,6 +397,8 @@
                spi-max-frequency = <30000000>;
                spi-tx-bus-width = <4>;
                spi-rx-bus-width = <4>;
+               spi-cpha;
+               spi-cpol;
                m25p,fast-read;
 
                partition@0 {
@@ -470,17 +472,17 @@
 };
 
 &iic0  {
-       status = "ok";
+       status = "okay";
 };
 
 &iic1  {
-       status = "ok";
+       status = "okay";
        pinctrl-0 = <&iic1_pins>;
        pinctrl-names = "default";
 };
 
 &iic2  {
-       status = "ok";
+       status = "okay";
        pinctrl-0 = <&iic2_pins>;
        pinctrl-names = "default";
 
@@ -562,7 +564,7 @@
        pinctrl-0 = <&vin1_pins>;
        pinctrl-names = "default";
 
-       status = "ok";
+       status = "okay";
 
        port {
                #address-cells = <1>;
@@ -579,6 +581,7 @@
        pinctrl-0 = <&sound_pins &sound_clk_pins>;
        pinctrl-names = "default";
 
+       /* Single DAI */
        #sound-dai-cells = <0>;
 
        status = "okay";