ARM: dts: silk: Name spi pfc subnode after device name

[cascardo/linux.git] / arch / arm / boot / dts / r8a7794-silk.dts

diff --git a/arch/arm/boot/dts/r8a7794-silk.dts b/arch/arm/boot/dts/r8a7794-silk.dts
index 66f077a..488de73 100644 (file)
--- a/arch/arm/boot/dts/r8a7794-silk.dts
+++ b/arch/arm/boot/dts/r8a7794-silk.dts
@@ -32,7 +32,7 @@
                reg = <0 0x40000000 0 0x40000000>;
        };
 
-       d3_3v: regulator@0 {
+       d3_3v: regulator-d3-3v {
                compatible = "regulator-fixed";
                regulator-name = "D3.3V";
                regulator-min-microvolt = <3300000>;
@@ -41,7 +41,7 @@
                regulator-always-on;
        };
 
-       vcc_sdhi1: regulator@3 {
+       vcc_sdhi1: regulator-vcc-sdhi1 {
                compatible = "regulator-fixed";
 
                regulator-name = "SDHI1 Vcc";
@@ -52,7 +52,7 @@
                enable-active-high;
        };
 
-       vccq_sdhi1: regulator@4 {
+       vccq_sdhi1: regulator-vccq-sdhi1 {
                compatible = "regulator-gpio";
 
                regulator-name = "SDHI1 VccQ";
@@ -129,59 +129,59 @@
        pinctrl-0 = <&scif_clk_pins>;
        pinctrl-names = "default";
 
-       scif2_pins: serial2 {
-               renesas,groups = "scif2_data";
-               renesas,function = "scif2";
+       scif2_pins: scif2 {
+               groups = "scif2_data";
+               function = "scif2";
        };
 
        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_irq8";
-               renesas,function = "intc";
+               groups = "intc_irq8";
+               function = "intc";
        };
 
        i2c1_pins: i2c1 {
-               renesas,groups = "i2c1";
-               renesas,function = "i2c1";
+               groups = "i2c1";
+               function = "i2c1";
        };
 
        mmcif0_pins: mmcif0 {
-               renesas,groups = "mmc_data8", "mmc_ctrl";
-               renesas,function = "mmc";
+               groups = "mmc_data8", "mmc_ctrl";
+               function = "mmc";
        };
 
        sdhi1_pins: sd1 {
-               renesas,groups = "sdhi1_data4", "sdhi1_ctrl";
-               renesas,function = "sdhi1";
+               groups = "sdhi1_data4", "sdhi1_ctrl";
+               function = "sdhi1";
        };
 
-       qspi_pins: spi0 {
-               renesas,groups = "qspi_ctrl", "qspi_data4";
-               renesas,function = "qspi";
+       qspi_pins: qspi {
+               groups = "qspi_ctrl", "qspi_data4";
+               function = "qspi";
        };
 
        vin0_pins: vin0 {
-               renesas,groups = "vin0_data8", "vin0_clk";
-               renesas,function = "vin0";
+               groups = "vin0_data8", "vin0_clk";
+               function = "vin0";
        };
 
        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";
        };
 };