Skip to contentSkip to conversation

mips: ath79: Rename get_bootstrap into ath79_get_bootstrap

PATCH New Wills Wang 2 participants 2 messages May 30, 2016 – May 31, 2016 MIPS

lore
Share & tools
lore

Wills Wang

author
#0 lore raw

PATCH 1/6 mips: ath79: Rename get_bootstrap into ath79_get_bootstrap

Add a platform prefix for function name in order to make more readable, and move it into ath79.h

Signed-off-by Wills Wang <[email protected]>
Acked-by Marek Vasut <[email protected]>

---

 arch/mips/mach-ath79/ar933x/clk.c         |  4 ++--
 arch/mips/mach-ath79/ar933x/ddr.c         |  4 ++--
 arch/mips/mach-ath79/ar934x/clk.c         |  6 +++---
 arch/mips/mach-ath79/ar934x/ddr.c         |  4 ++--
 arch/mips/mach-ath79/include/mach/ath79.h |  1 +
 arch/mips/mach-ath79/include/mach/reset.h | 14 --------------
 arch/mips/mach-ath79/qca953x/clk.c        |  4 ++--
 arch/mips/mach-ath79/qca953x/ddr.c        |  4 ++--
 arch/mips/mach-ath79/reset.c              |  2 +-
 9 files changed, 15 insertions(+), 28 deletions(-)
 delete mode 100644 arch/mips/mach-ath79/include/mach/reset.h
arch/mips/mach-ath79/ar933x/clk.c +2 -2
index 9fcd496..6d98efc 100644
@@ -9,7 +9,7 @@
 #include <asm/addrspace.h>
 #include <asm/types.h>
 #include <mach/ar71xx_regs.h>
-#include <mach/reset.h>
+#include <mach/ath79.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 

@@ -17,7 +17,7 @@ static u32 ar933x_get_xtal(void)
 {
 	u32 val;
 
-	val = get_bootstrap();
+	val = ath79_get_bootstrap();
 	if (val & AR933X_BOOTSTRAP_REF_CLK_40)
 		return 40000000;
 	else
arch/mips/mach-ath79/ar933x/ddr.c +2 -2
index 7f20d34..2a25e23 100644
@@ -10,7 +10,7 @@
 #include <asm/addrspace.h>
 #include <asm/types.h>
 #include <mach/ar71xx_regs.h>
-#include <mach/reset.h>
+#include <mach/ath79.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 

@@ -114,7 +114,7 @@ void ddr_init(void)
 	writel(DDR_CONF_REG_VAL, regs + AR71XX_DDR_REG_CONFIG);
 	writel(DDR_CONF2_REG_VAL, regs + AR71XX_DDR_REG_CONFIG2);
 
-	val = get_bootstrap();
+	val = ath79_get_bootstrap();
 	if (val & AR933X_BOOTSTRAP_DDR2) {
 		/* AHB maximum timeout */
 		writel(0xfffff, regs + AR933X_DDR_REG_TIMEOUT_MAX);
arch/mips/mach-ath79/ar934x/clk.c +3 -3
index 9c65184..9b41d3d 100644
@@ -9,7 +9,7 @@
 #include <asm/addrspace.h>
 #include <asm/types.h>
 #include <mach/ar71xx_regs.h>
-#include <mach/reset.h>
+#include <mach/ath79.h>
 #include <wait_bit.h>
 
 DECLARE_GLOBAL_DATA_PTR;

@@ -119,7 +119,7 @@ void ar934x_pll_init(const u16 cpu_mhz, const u16 ddr_mhz, const u16 ahb_mhz)
 	writel(0x03000000, srif_regs + 0x188); /* Undocumented reg :-) */
 
 	/* Test for 40MHz XTAL */
-	reg = get_bootstrap();
+	reg = ath79_get_bootstrap();
 	if (reg & AR934X_BOOTSTRAP_REF_CLK_40) {
 		xtal_40 = 1;
 		cpu_srif = 0x41c00000;

@@ -214,7 +214,7 @@ static u32 ar934x_get_xtal(void)
 {
 	u32 val;
 
-	val = get_bootstrap();
+	val = ath79_get_bootstrap();
 	if (val & AR934X_BOOTSTRAP_REF_CLK_40)
 		return 40000000;
 	else
arch/mips/mach-ath79/ar934x/ddr.c +2 -2
index 4621d58..2ba1efa 100644
@@ -11,7 +11,7 @@
 #include <asm/addrspace.h>
 #include <asm/types.h>
 #include <mach/ar71xx_regs.h>
-#include <mach/reset.h>
+#include <mach/ath79.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 

@@ -45,7 +45,7 @@ void ar934x_ddr_init(const u16 cpu_mhz, const u16 ddr_mhz, const u16 ahb_mhz)
 	ddr_regs = map_physmem(AR71XX_DDR_CTRL_BASE, AR71XX_DDR_CTRL_SIZE,
 			       MAP_NOCACHE);
 
-	reg = get_bootstrap();
+	reg = ath79_get_bootstrap();
 	if (reg & AR934X_BOOTSTRAP_SDRAM_DISABLED) {	/* DDR */
 		if (reg & AR934X_BOOTSTRAP_DDR1) {	/* DDR 1 */
 			memtype = AR934X_DDR1;
arch/mips/mach-ath79/include/mach/ath79.h +1 -0
index 17af082..582c028 100644
@@ -140,6 +140,7 @@ static inline int soc_is_qca956x(void)
 	return soc_is_tp9343() || soc_is_qca9561();
 }
 
+u32 ath79_get_bootstrap(void);
 int ath79_eth_reset(void);
 int ath79_usb_reset(void);
arch/mips/mach-ath79/include/mach/reset.h deleted +0 -14
deleted file mode 100644
index c383bfe..0000000
@@ -1,14 +0,0 @@
-/*
- * Copyright (C) 2015-2016 Wills Wang <[email protected]>
- *
- * SPDX-License-Identifier: GPL-2.0+
- */
-
-#ifndef __ASM_MACH_RESET_H
-#define __ASM_MACH_RESET_H
-
-#include <linux/types.h>
-
-u32 get_bootstrap(void);
-
-#endif /* __ASM_MACH_RESET_H */
arch/mips/mach-ath79/qca953x/clk.c +2 -2
index ef0a28e..533356c 100644
@@ -9,7 +9,7 @@
 #include <asm/addrspace.h>
 #include <asm/types.h>
 #include <mach/ar71xx_regs.h>
-#include <mach/reset.h>
+#include <mach/ath79.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 

@@ -17,7 +17,7 @@ static u32 qca953x_get_xtal(void)
 {
 	u32 val;
 
-	val = get_bootstrap();
+	val = ath79_get_bootstrap();
 	if (val & QCA953X_BOOTSTRAP_REF_CLK_40)
 		return 40000000;
 	else
arch/mips/mach-ath79/qca953x/ddr.c +2 -2
index ac0130c..c6049d8 100644
@@ -10,7 +10,7 @@
 #include <asm/addrspace.h>
 #include <asm/types.h>
 #include <mach/ar71xx_regs.h>
-#include <mach/reset.h>
+#include <mach/ath79.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 

@@ -226,7 +226,7 @@ void ddr_init(void)
 
 	regs = map_physmem(AR71XX_DDR_CTRL_BASE, AR71XX_DDR_CTRL_SIZE,
 			   MAP_NOCACHE);
-	val = get_bootstrap();
+	val = ath79_get_bootstrap();
 	if (val & QCA953X_BOOTSTRAP_DDR1) {
 		writel(DDR_CTL_CONFIG_VAL, regs + QCA953X_DDR_REG_CTL_CONF);
 		udelay(10);
arch/mips/mach-ath79/reset.c +1 -1
index a88bcbc..33bf979 100644
@@ -45,7 +45,7 @@ void _machine_restart(void)
 		/* NOP */;
 }
 
-u32 get_bootstrap(void)
+u32 ath79_get_bootstrap(void)
 {
 	void __iomem *base;
 	u32 reg = 0;
Signature · 1 line
1.9.1
#1 lore raw

PATCH 1/6 mips: ath79: Rename get_bootstrap into ath79_get_bootstrap

Am 30.05.2016 um 16:54 schrieb Wills Wang:

Quoted 7 lines

Add a platform prefix for function name in order to make more readable, and move it into ath79.h

Signed-off-by Wills Wang <[email protected]>
Acked-by Marek Vasut <[email protected]>

---

Quoted 12 lines
 arch/mips/mach-ath79/ar933x/clk.c         |  4 ++--
 arch/mips/mach-ath79/ar933x/ddr.c         |  4 ++--
 arch/mips/mach-ath79/ar934x/clk.c         |  6 +++---
 arch/mips/mach-ath79/ar934x/ddr.c         |  4 ++--
 arch/mips/mach-ath79/include/mach/ath79.h |  1 +
 arch/mips/mach-ath79/include/mach/reset.h | 14 --------------
 arch/mips/mach-ath79/qca953x/clk.c        |  4 ++--
 arch/mips/mach-ath79/qca953x/ddr.c        |  4 ++--
 arch/mips/mach-ath79/reset.c              |  2 +-
 9 files changed, 15 insertions(+), 28 deletions(-)
 delete mode 100644 arch/mips/mach-ath79/include/mach/reset.h

applied to u-boot-mips, thanks!

Signature · 9 lines
- Daniel

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 473 bytes
Desc: OpenPGP digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20160531/0e52855f/attachment.sig>