ARM: dts: r8a7794: remove Z clock

commit 68cc085a4daaa32f7138de1e918331c05165a484 upstream.

R8A7794 doesn't have Cortex-A15 CPUs, thus there's no Z clock...

Fixes: 0dce5454d5c2 ("ARM: shmobile: Initial r8a7794 SoC device tree")
Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/arch/arm/boot/dts/r8a7794.dtsi b/arch/arm/boot/dts/r8a7794.dtsi
index a9368010fb8dd8bdc09b609abb4619ab1beeb446..7e860d3737ff00ca599ccc2dadb030e30e9b5b72 100644 (file)
--- a/arch/arm/boot/dts/r8a7794.dtsi
+++ b/arch/arm/boot/dts/r8a7794.dtsi
@@ -1025,8 +1025,7 @@
                        clocks = <&extal_clk &usb_extal_clk>;
                        #clock-cells = <1>;
                        clock-output-names = "main", "pll0", "pll1", "pll3",
-                                            "lb", "qspi", "sdh", "sd0", "z",
-                                            "rcan";
+                                            "lb", "qspi", "sdh", "sd0", "rcan";
                        #power-domain-cells = <0>;
                };
                /* Variable factor clocks */

diff --git a/include/dt-bindings/clock/r8a7794-clock.h b/include/dt-bindings/clock/r8a7794-clock.h
index 9d02f5317c7c315d2a88c9e381a3215416242509..88e64846cf370ff4a32c8423b5d00833c8cb5a81 100644 (file)
--- a/include/dt-bindings/clock/r8a7794-clock.h
+++ b/include/dt-bindings/clock/r8a7794-clock.h
@@ -20,8 +20,7 @@
 #define R8A7794_CLK_QSPI               5
 #define R8A7794_CLK_SDH                        6
 #define R8A7794_CLK_SD0                        7
-#define R8A7794_CLK_Z                  8
-#define R8A7794_CLK_RCAN               9
+#define R8A7794_CLK_RCAN               8
 
 /* MSTP0 */
 #define R8A7794_CLK_MSIOF0             0