Message ID | 20200831060305.20963-2-ryan_chen@aspeedtech.com |
---|---|
State | Accepted |
Commit | 15b87feb2b7923ef679e9da3f956e7a836fbaa40 |
Delegated to: | Tom Rini |
Headers | show |
Series | Rename ASPEED SoC clock name | expand |
> -----Original Message----- > From: Ryan Chen <ryan_chen@aspeedtech.com> > Sent: Monday, August 31, 2020 2:03 PM > To: Ryan Chen <ryan_chen@aspeedtech.com>; ChiaWei Wang > <chiawei_wang@aspeedtech.com>; Lukasz Majewski <lukma@denx.de>; > clg@kaod.org; Eddie James <eajames@linux.ibm.com>; Simon Glass > <sjg@chromium.org>; u-boot@lists.denx.de > Subject: [PATCH v2 1/3] cosmetic: aspeed: ast2500: Rename clock header > > Rename the ast2500-scu.h to aspeed-clock.h. > > Signed-off-by: Ryan Chen <ryan_chen@aspeedtech.com> > --- > arch/arm/dts/ast2500-u-boot.dtsi | 2 +- > arch/arm/mach-aspeed/ast2500/sdram_ast2500.c | 2 +- > drivers/clk/aspeed/clk_ast2500.c | 2 +- > include/dt-bindings/clock/{ast2500-scu.h => aspeed-clock.h} | 0 > 4 files changed, 3 insertions(+), 3 deletions(-) rename > include/dt-bindings/clock/{ast2500-scu.h => aspeed-clock.h} (100%) > Reviewed-by: Chia-Wei, Wang <chiawei_wang@aspeedtech.com>
On 8/31/20 8:03 AM, Ryan Chen wrote: > Rename the ast2500-scu.h to aspeed-clock.h. > > Signed-off-by: Ryan Chen <ryan_chen@aspeedtech.com> Reviewed-by: Cédric Le Goater <clg@kaod.org> > --- > arch/arm/dts/ast2500-u-boot.dtsi | 2 +- > arch/arm/mach-aspeed/ast2500/sdram_ast2500.c | 2 +- > drivers/clk/aspeed/clk_ast2500.c | 2 +- > include/dt-bindings/clock/{ast2500-scu.h => aspeed-clock.h} | 0 > 4 files changed, 3 insertions(+), 3 deletions(-) > rename include/dt-bindings/clock/{ast2500-scu.h => aspeed-clock.h} (100%) > > diff --git a/arch/arm/dts/ast2500-u-boot.dtsi b/arch/arm/dts/ast2500-u-boot.dtsi > index 8ac4215745..3b119e4ace 100644 > --- 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 a3adaa8a99..8536a70a19 100644 > --- 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 d1940f1884..392fe76b27 100644 > --- 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/ast2500-scu.h b/include/dt-bindings/clock/aspeed-clock.h > similarity index 100% > rename from include/dt-bindings/clock/ast2500-scu.h > rename to include/dt-bindings/clock/aspeed-clock.h >
On Mon, Aug 31, 2020 at 02:03:03PM +0800, Ryan Chen wrote: > Rename the ast2500-scu.h to aspeed-clock.h. > > Signed-off-by: Ryan Chen <ryan_chen@aspeedtech.com> > Reviewed-by: Chia-Wei, Wang <chiawei_wang@aspeedtech.com> > Reviewed-by: Cédric Le Goater <clg@kaod.org> Applied to u-boot/next, thanks!
diff --git a/arch/arm/dts/ast2500-u-boot.dtsi b/arch/arm/dts/ast2500-u-boot.dtsi index 8ac4215745..3b119e4ace 100644 --- 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 a3adaa8a99..8536a70a19 100644 --- 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 d1940f1884..392fe76b27 100644 --- 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/ast2500-scu.h b/include/dt-bindings/clock/aspeed-clock.h similarity index 100% rename from include/dt-bindings/clock/ast2500-scu.h rename to include/dt-bindings/clock/aspeed-clock.h
Rename the ast2500-scu.h to aspeed-clock.h. Signed-off-by: Ryan Chen <ryan_chen@aspeedtech.com> --- arch/arm/dts/ast2500-u-boot.dtsi | 2 +- arch/arm/mach-aspeed/ast2500/sdram_ast2500.c | 2 +- drivers/clk/aspeed/clk_ast2500.c | 2 +- include/dt-bindings/clock/{ast2500-scu.h => aspeed-clock.h} | 0 4 files changed, 3 insertions(+), 3 deletions(-) rename include/dt-bindings/clock/{ast2500-scu.h => aspeed-clock.h} (100%)