Merge tag 'for-f2fs-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk...

[sfrench/cifs-2.6.git] / arch / arm / boot / dts / r8a7791-koelsch.dts

diff --git a/arch/arm/boot/dts/r8a7791-koelsch.dts b/arch/arm/boot/dts/r8a7791-koelsch.dts
index cc6e28f81fe4f3721352deb9450f6c36a731b30c..da59c2844b8ad1c3ed0451c3378fcd5ee05f6864 100644 (file)
--- a/arch/arm/boot/dts/r8a7791-koelsch.dts
+++ b/arch/arm/boot/dts/r8a7791-koelsch.dts
@@ -242,11 +242,10 @@
                          1800000 0>;
        };
 
-       audio_clock: clock {
+       audio_clock: audio_clock {
                compatible = "fixed-clock";
                #clock-cells = <0>;
                clock-frequency = <11289600>;
-               clock-output-names = "audio_clock";
        };
 
        rsnd_ak4643: sound {
@@ -324,89 +323,89 @@
        pinctrl-names = "default";
 
        i2c2_pins: i2c2 {
-               renesas,groups = "i2c2";
-               renesas,function = "i2c2";
+               groups = "i2c2";
+               function = "i2c2";
        };
 
        du_pins: du {
-               renesas,groups = "du_rgb888", "du_sync", "du_disp", "du_clk_out_0";
-               renesas,function = "du";
+               groups = "du_rgb888", "du_sync", "du_disp", "du_clk_out_0";
+               function = "du";
        };
 
        scif0_pins: serial0 {
-               renesas,groups = "scif0_data_d";
-               renesas,function = "scif0";
+               groups = "scif0_data_d";
+               function = "scif0";
        };
 
        scif1_pins: serial1 {
-               renesas,groups = "scif1_data_d";
-               renesas,function = "scif1";
+               groups = "scif1_data_d";
+               function = "scif1";
        };
 
        scif_clk_pins: scif_clk {
-               renesas,groups = "scif_clk";
-               renesas,function = "scif_clk";
+               groups = "scif_clk";
+               function = "scif_clk";
        };
 
        ether_pins: ether {
-               renesas,groups = "eth_link", "eth_mdio", "eth_rmii";
-               renesas,function = "eth";
+               groups = "eth_link", "eth_mdio", "eth_rmii";
+               function = "eth";
        };
 
        phy1_pins: phy1 {
-               renesas,groups = "intc_irq0";
-               renesas,function = "intc";
+               groups = "intc_irq0";
+               function = "intc";
        };
 
        sdhi0_pins: sd0 {
-               renesas,groups = "sdhi0_data4", "sdhi0_ctrl";
-               renesas,function = "sdhi0";
+               groups = "sdhi0_data4", "sdhi0_ctrl";
+               function = "sdhi0";
        };
 
        sdhi1_pins: sd1 {
-               renesas,groups = "sdhi1_data4", "sdhi1_ctrl";
-               renesas,function = "sdhi1";
+               groups = "sdhi1_data4", "sdhi1_ctrl";
+               function = "sdhi1";
        };
 
        sdhi2_pins: sd2 {
-               renesas,groups = "sdhi2_data4", "sdhi2_ctrl";
-               renesas,function = "sdhi2";
+               groups = "sdhi2_data4", "sdhi2_ctrl";
+               function = "sdhi2";
        };
 
        qspi_pins: spi0 {
-               renesas,groups = "qspi_ctrl", "qspi_data4";
-               renesas,function = "qspi";
+               groups = "qspi_ctrl", "qspi_data4";
+               function = "qspi";
        };
 
        msiof0_pins: spi1 {
-               renesas,groups = "msiof0_clk", "msiof0_sync", "msiof0_rx",
+               groups = "msiof0_clk", "msiof0_sync", "msiof0_rx",
                                 "msiof0_tx";
-               renesas,function = "msiof0";
+               function = "msiof0";
        };
 
        usb0_pins: usb0 {
-               renesas,groups = "usb0";
-               renesas,function = "usb0";
+               groups = "usb0";
+               function = "usb0";
        };
 
        usb1_pins: usb1 {
-               renesas,groups = "usb1";
-               renesas,function = "usb1";
+               groups = "usb1";
+               function = "usb1";
        };
 
        vin1_pins: vin1 {
-               renesas,groups = "vin1_data8", "vin1_clk";
-               renesas,function = "vin1";
+               groups = "vin1_data8", "vin1_clk";
+               function = "vin1";
        };
 
        sound_pins: sound {
-               renesas,groups = "ssi0129_ctrl", "ssi0_data", "ssi1_data";
-               renesas,function = "ssi";
+               groups = "ssi0129_ctrl", "ssi0_data", "ssi1_data";
+               function = "ssi";
        };
 
        sound_clk_pins: sound_clk {
-               renesas,groups = "audio_clk_a";
-               renesas,function = "audio_clk";
+               groups = "audio_clk_a";
+               function = "audio_clk";
        };
 };