qong: Use generic function for configuring GPR register

PATCH New Fabio Estevam 2 participants 8 messages Nov 9, 2011 – Nov 10, 2011

Subsystems (2)

Arm (32-bit) Arm i.MX and Layerscape

lore

Share & tools

lore

Fabio Estevam

author

2011-11-09 14:15 UTC #0 lore raw

PATCH 1/4 qong: Use generic function for configuring GPR register

Use generic function for configuring GPR register.

Signed-off-by Fabio Estevam <[email protected]>

---
 board/davedenx/qong/qong.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

board/davedenx/qong/qong.c +1 -1

index 665aedf..c41f11d 100644
@@ -231,7 +231,7 @@ static void board_nand_setup(void)
 
 	mxc_setup_weimcs(3, &cs3);
 
-	__REG(IOMUXC_GPR) |= 1 << 13;
+	mx31_set_gpr(MUX_SDCTL_CSD1_SEL, 1);
 
 	mx31_gpio_mux(IOMUX_MODE(MUX_CTL_NFC_WP, MUX_CTL_IN_GPIO));
 	mx31_gpio_mux(IOMUX_MODE(MUX_CTL_NFC_CE, MUX_CTL_IN_GPIO));

Signature · 1 line

1.7.1

Fabio Estevam

author

2011-11-09 14:15 UTC #1 lore raw

PATCH 2/4 mx31: Remove duplicate definition for GPR register

GPR register definition is already available at imx-regs.h, so remove the duplication.

Signed-off-by Fabio Estevam <[email protected]>

---
 arch/arm/cpu/arm1136/mx31/generic.c |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

arch/arm/cpu/arm1136/mx31/generic.c +2 -4

index 4f27e25..1621e9e 100644
@@ -27,8 +27,6 @@
 #include <asm/io.h>
 #include <asm/arch/sys_proto.h>
 
-#define IOMUXGPR	(IOMUXC_BASE + 0x008)
-
 static u32 mx31_decode_pll(u32 reg, u32 infreq)
 {
 	u32 mfi = GET_PLL_MFI(reg);

@@ -147,13 +145,13 @@ void mx31_set_gpr(enum iomux_gp_func gp, char en)
 {
 	u32 l;
 
-	l = readl(IOMUXGPR);
+	l = readl(IOMUXC_GPR);
 	if (en)
 		l |= gp;
 	else
 		l &= ~gp;
 
-	writel(l, IOMUXGPR);
+	writel(l, IOMUXC_GPR);
 }
 
 void mxc_setup_weimcs(int cs, const struct mxc_weimcs *weimcs)

Signature · 1 line

1.7.1

Stefano Babic

2011-11-10 13:20 UTC #2 lore raw

PATCH 2/4 mx31: Remove duplicate definition for GPR register

Quoted 4 lines · Fabio Estevam

GPR register definition is already available at imx-regs.h, so remove the duplication.
Signed-off-by Fabio Estevam <[email protected]>
---

Acked-by Stefano Babic <[email protected]>

Best regards,
Stefano Babic

Signature · 5 lines

=====================================================================
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-0 Fax: +49-8142-66989-80  Email: office at denx.de
=====================================================================

Fabio Estevam

author

2011-11-09 14:15 UTC #3 lore raw

PATCH 3/4 mx31: Use proper IO accessor for GPR register

In reply to Fabio Estevam

Use proper IO accessor for GPR register.

Signed-off-by Fabio Estevam <[email protected]>

---
 arch/arm/cpu/arm1136/mx31/generic.c       |    5 +++--
 arch/arm/include/asm/arch-mx31/imx-regs.h |    7 ++++++-
 2 files changed, 9 insertions(+), 3 deletions(-)

arch/arm/cpu/arm1136/mx31/generic.c +3 -2

index 1621e9e..167e97a 100644
@@ -144,14 +144,15 @@ void mx31_set_pad(enum iomux_pins pin, u32 config)
 void mx31_set_gpr(enum iomux_gp_func gp, char en)
 {
 	u32 l;
+	struct iomuxc_regs *iomuxc = (struct iomuxc_regs *)IOMUXC_BASE;
 
-	l = readl(IOMUXC_GPR);
+	l = readl(&iomuxc->gpr);
 	if (en)
 		l |= gp;
 	else
 		l &= ~gp;
 
-	writel(l, IOMUXC_GPR);
+	writel(l, &iomuxc->gpr);
 }
 
 void mxc_setup_weimcs(int cs, const struct mxc_weimcs *weimcs)

arch/arm/include/asm/arch-mx31/imx-regs.h +6 -1

index afdaa1c..0147920 100644
@@ -98,6 +98,12 @@ struct iim_regs {
 	u32 iim_scs3;
 };
 
+struct iomuxc_regs {
+	u32 unused1;
+	u32 unused2;
+	u32 gpr;
+};
+
 struct mx3_cpu_type {
 	u8 srev;
 	u32 v;

@@ -636,7 +642,6 @@ struct esdc_regs {
 #define WEIM_BASE	0xb8002000
 
 #define IOMUXC_BASE	0x43FAC000
-#define IOMUXC_GPR	(IOMUXC_BASE + 0x8)
 #define IOMUXC_SW_MUX_CTL(x)	(IOMUXC_BASE + 0xc + (x) * 4)
 #define IOMUXC_SW_PAD_CTL(x)	(IOMUXC_BASE + 0x154 + (x) * 4)

Signature · 1 line

1.7.1

Stefano Babic

2011-11-10 13:20 UTC #4 lore raw

PATCH 3/4 mx31: Use proper IO accessor for GPR register

Quoted 4 lines · Fabio Estevam

Use proper IO accessor for GPR register.
Signed-off-by Fabio Estevam <[email protected]>
---

Acked-by Stefano Babic <[email protected]>

Best regards,
Stefano Babic

Signature · 5 lines

=====================================================================
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-0 Fax: +49-8142-66989-80  Email: office at denx.de
=====================================================================

Fabio Estevam

author

2011-11-09 14:15 UTC #5 lore raw

PATCH 4/4 mx31: Fix checkpatch warnings in generic.c

In reply to Fabio Estevam

Fix checkpatch warnings in generic.c.

Signed-off-by Fabio Estevam <[email protected]>

---
 arch/arm/cpu/arm1136/mx31/generic.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

arch/arm/cpu/arm1136/mx31/generic.c +2 -2

index 167e97a..f458281 100644
@@ -87,7 +87,7 @@ static u32 mx31_get_hsp_clk(void)
 void mx31_dump_clocks(void)
 {
 	u32 cpufreq = mx31_get_mcu_main_clk();
-	printf("mx31 cpu clock: %dMHz\n",cpufreq / 1000000);
+	printf("mx31 cpu clock: %dMHz\n", cpufreq / 1000000);
 	printf("ipg clock     : %dHz\n", mx31_get_ipg_clk());
 	printf("hsp clock     : %dHz\n", mx31_get_hsp_clk());
 }

@@ -215,7 +215,7 @@ static char *get_reset_cause(void)
 }
 
 #if defined(CONFIG_DISPLAY_CPUINFO)
-int print_cpuinfo (void)
+int print_cpuinfo(void)
 {
 	u32 srev = get_cpu_rev();

Signature · 1 line

1.7.1

Stefano Babic

2011-11-10 13:21 UTC #6 lore raw

PATCH 4/4 mx31: Fix checkpatch warnings in generic.c

Quoted 4 lines · Fabio Estevam

Fix checkpatch warnings in generic.c.
Signed-off-by Fabio Estevam <[email protected]>
---

Acked-by Stefano Babic <[email protected]>

Best regards,
Stefano Babic

Signature · 5 lines

=====================================================================
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-0 Fax: +49-8142-66989-80  Email: office at denx.de
=====================================================================

Stefano Babic

2011-11-10 13:19 UTC #7 lore raw

PATCH 1/4 qong: Use generic function for configuring GPR register

In reply to Fabio Estevam

Quoted 12 lines · Fabio Estevam

Use generic function for configuring GPR register.
Signed-off-by Fabio Estevam <[email protected]>
---
 board/davedenx/qong/qong.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
board/davedenx/qong/qong.c +0 -0
index 665aedf..c41f11d 100644

board/davedenx/qong/qong.c static void board_nand_setup(void) · line 237

Quoted 8 lines

board/davedenx/qong/qong.c +1 -1

@@ -231,7 +231,7 @@ static void board_nand_setup(void)
 
 	mxc_setup_weimcs(3, &cs3);
 
-	__REG(IOMUXC_GPR) |= 1 << 13;
+	mx31_set_gpr(MUX_SDCTL_CSD1_SEL, 1);
 
 	mx31_gpio_mux(IOMUX_MODE(MUX_CTL_NFC_WP, MUX_CTL_IN_GPIO));
 	mx31_gpio_mux(IOMUX_MODE(MUX_CTL_NFC_CE, MUX_CTL_IN_GPIO));

Acked-by Stefano Babic <[email protected]>

Best regards,
Stefano Babic

Signature · 5 lines

=====================================================================
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-0 Fax: +49-8142-66989-80  Email: office at denx.de
=====================================================================