cosmetic: aspeed: ast2500: Rename clock header

Rename the ast2500-scu.h to aspeed-clock.h.

Signed-off-by: Ryan Chen <[email protected]>
Reviewed-by: Chia-Wei, Wang <[email protected]>
Reviewed-by: Cédric Le Goater <[email protected]>

diff --git a/arch/arm/dts/ast2500-u-boot.dtsi b/arch/arm/dts/ast2500-u-boot.dtsi
index 8ac42157455703b922eb467486ebacc9350c7555..3b119e4ace60d1ff4b427cf1beba974c42331aa6 100644 (file)
--- a/arch/arm/dts/ast2500-u-boot.dtsi
+++ b/arch/arm/dts/ast2500-u-boot.dtsi
@@ -1,4 +1,4 @@
-#include <dt-bindings/clock/ast2500-scu.h>
+#include <dt-bindings/clock/aspeed-clock.h>
 #include <dt-bindings/reset/ast2500-reset.h>
 
 #include "ast2500.dtsi"

diff --git a/arch/arm/mach-aspeed/ast2500/sdram_ast2500.c b/arch/arm/mach-aspeed/ast2500/sdram_ast2500.c
index a3adaa8a999cc372d731f214026571485635501f..8536a70a19d3b2ef7a8ad1b082df968c9708e4db 100644 (file)
--- a/arch/arm/mach-aspeed/ast2500/sdram_ast2500.c
+++ b/arch/arm/mach-aspeed/ast2500/sdram_ast2500.c
@@ -19,7 +19,7 @@
 #include <asm/arch/wdt.h>
 #include <linux/err.h>
 #include <linux/kernel.h>
-#include <dt-bindings/clock/ast2500-scu.h>
+#include <dt-bindings/clock/aspeed-clock.h>
 
 /* These configuration parameters are taken from Aspeed SDK */
 #define DDR4_MR46_MODE         0x08000000

diff --git a/drivers/clk/aspeed/clk_ast2500.c b/drivers/clk/aspeed/clk_ast2500.c
index d1940f188495f9493d5467f524a1e4700553d63b..392fe76b27a0cfdf9a95e14a8997a4e390cb467a 100644 (file)
--- a/drivers/clk/aspeed/clk_ast2500.c
+++ b/drivers/clk/aspeed/clk_ast2500.c
@@ -10,7 +10,7 @@
 #include <asm/io.h>
 #include <asm/arch/scu_ast2500.h>
 #include <dm/lists.h>
-#include <dt-bindings/clock/ast2500-scu.h>
+#include <dt-bindings/clock/aspeed-clock.h>
 #include <linux/delay.h>
 #include <linux/err.h>
 

diff --git a/include/dt-bindings/clock/aspeed-clock.h b/include/dt-bindings/clock/aspeed-clock.h
new file mode 100644 (file)
index 0000000..4803abe
--- /dev/null
+++ b/include/dt-bindings/clock/aspeed-clock.h
@@ -0,0 +1,30 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
+/*
+ * Copyright 2016 Google Inc.
+ */
+
+/* Core Clocks */
+#define PLL_HPLL       1
+#define PLL_DPLL       2
+#define PLL_D2PLL      3
+#define PLL_MPLL       4
+#define ARMCLK         5
+
+
+/* Bus Clocks, derived from core clocks */
+#define BCLK_PCLK      101
+#define BCLK_LHCLK     102
+#define BCLK_MACCLK    103
+#define BCLK_SDCLK     104
+#define BCLK_ARMCLK    105
+
+#define MCLK_DDR       201
+
+/* Special clocks */
+#define PCLK_UART1     501
+#define PCLK_UART2     502
+#define PCLK_UART3     503
+#define PCLK_UART4     504
+#define PCLK_UART5     505
+#define PCLK_MAC1      506
+#define PCLK_MAC2      507

diff --git a/include/dt-bindings/clock/ast2500-scu.h b/include/dt-bindings/clock/ast2500-scu.h
deleted file mode 100644 (file)
index 4803abe..0000000
--- a/include/dt-bindings/clock/ast2500-scu.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
-/*
- * Copyright 2016 Google Inc.
- */
-
-/* Core Clocks */
-#define PLL_HPLL       1
-#define PLL_DPLL       2
-#define PLL_D2PLL      3
-#define PLL_MPLL       4
-#define ARMCLK         5
-
-
-/* Bus Clocks, derived from core clocks */
-#define BCLK_PCLK      101
-#define BCLK_LHCLK     102
-#define BCLK_MACCLK    103
-#define BCLK_SDCLK     104
-#define BCLK_ARMCLK    105
-
-#define MCLK_DDR       201
-
-/* Special clocks */
-#define PCLK_UART1     501
-#define PCLK_UART2     502
-#define PCLK_UART3     503
-#define PCLK_UART4     504
-#define PCLK_UART5     505
-#define PCLK_MAC1      506
-#define PCLK_MAC2      507