diff mbox

[U-Boot,v4] tx25: Use generic gpio_* calls

Message ID 4FDCBF61.6040705@gmail.com
State Accepted
Commit 72739219a12bf02820d29a89cb2b7fdc4d0e840f
Delegated to: Anatolij Gustschin
Headers show

Commit Message

Vikram Narayanan June 16, 2012, 5:16 p.m. UTC 
Instead of manipulating gpio registers directly, use the calls
from the gpio library.

Signed-off-by: Vikram Narayanan <vikram186@gmail.com>
Acked-by: Stefano Babic <sbabic@denx.de>
Cc: John Rigby <jcrigby@gmail.com>
Cc: Fabio Estevam <fabio.estevam@freescale.com>
---
Changes from v3:
Use gpio_set_value instead of gpio_direction_output
(Ahh. Missed it again!!. Very bad)

Changes from v2:
Swap the place of the change log and commit message.

Changes from v1:
Used appropriate gpio_* lib calls.

 board/karo/tx25/tx25.c |   25 +++++++++----------------
 1 files changed, 9 insertions(+), 16 deletions(-)

Comments

Fabio Estevam June 16, 2012, 7:03 p.m. UTC | #1 
On Sat, Jun 16, 2012 at 2:16 PM, Vikram Narayanan <vikram186@gmail.com> wrote:
> Instead of manipulating gpio registers directly, use the calls
> from the gpio library.
>
> Signed-off-by: Vikram Narayanan <vikram186@gmail.com>
> Acked-by: Stefano Babic <sbabic@denx.de>
> Cc: John Rigby <jcrigby@gmail.com>
> Cc: Fabio Estevam <fabio.estevam@freescale.com>

Acked-by: Fabio Estevam <fabio.estevam@freescale.com>
Stefano Babic June 18, 2012, 7:11 a.m. UTC | #2 
On 16/06/2012 19:16, Vikram Narayanan wrote:
> Instead of manipulating gpio registers directly, use the calls
> from the gpio library.
> 
> Signed-off-by: Vikram Narayanan <vikram186@gmail.com>
> Acked-by: Stefano Babic <sbabic@denx.de>
> Cc: John Rigby <jcrigby@gmail.com>
> Cc: Fabio Estevam <fabio.estevam@freescale.com>
> ---
> Changes from v3:
> Use gpio_set_value instead of gpio_direction_output
> (Ahh. Missed it again!!. Very bad)
> 
> Changes from v2:
> Swap the place of the change log and commit message.
> 
> Changes from v1:
> Used appropriate gpio_* lib calls.
> 
>  board/karo/tx25/tx25.c |   25 +++++++++----------------
>  1 files changed, 9 insertions(+), 16 deletions(-)
> 
> diff --git a/board/karo/tx25/tx25.c b/board/karo/tx25/tx25.c
> index 2a29943..07fd98d 100644
> --- a/board/karo/tx25/tx25.c
> +++ b/board/karo/tx25/tx25.c
> @@ -34,14 +34,13 @@
>  DECLARE_GLOBAL_DATA_PTR;
>  
>  #ifdef CONFIG_FEC_MXC
> +#define GPIO_FEC_RESET_B	MXC_GPIO_PORT_TO_NUM(4, 7)
> +#define GPIO_FEC_ENABLE_B	MXC_GPIO_PORT_TO_NUM(4, 9)
>  void tx25_fec_init(void)
>  {
>  	struct iomuxc_mux_ctl *muxctl;
>  	struct iomuxc_pad_ctl *padctl;
> -	u32 val;
>  	u32 gpio_mux_mode = MX25_PIN_MUX_MODE(5);
> -	struct gpio_regs *gpio4 = (struct gpio_regs *)IMX_GPIO4_BASE;
> -	struct gpio_regs *gpio3 = (struct gpio_regs *)IMX_GPIO3_BASE;
>  	u32 saved_rdata0_mode, saved_rdata1_mode, saved_rx_dv_mode;
>  
>  	debug("tx25_fec_init\n");
> @@ -66,18 +65,15 @@ void tx25_fec_init(void)
>  	writel(0x0, &padctl->pad_d11);
>  
>  	/* drop PHY power and assert reset (low) */
> -	val = readl(&gpio4->gpio_dr) & ~((1 << 7) | (1 << 9));
> -	writel(val, &gpio4->gpio_dr);
> -	val = readl(&gpio4->gpio_dir) | (1 << 7) | (1 << 9);
> -	writel(val, &gpio4->gpio_dir);
> +	gpio_direction_output(GPIO_FEC_RESET_B, 0);
> +	gpio_direction_output(GPIO_FEC_ENABLE_B, 0);
>  
>  	mdelay(5);
>  
>  	debug("resetting phy\n");
>  
>  	/* turn on PHY power leaving reset asserted */
> -	val = readl(&gpio4->gpio_dr) | 1 << 9;
> -	writel(val, &gpio4->gpio_dr);
> +	gpio_set_value(GPIO_FEC_ENABLE_B, 1);
>  
>  	mdelay(10);
>  
> @@ -107,19 +103,16 @@ void tx25_fec_init(void)
>  	/*
>  	 * set each to 1 and make each an output
>  	 */
> -	val = readl(&gpio3->gpio_dr) | (1 << 10) | (1 << 11) | (1 << 12);
> -	writel(val, &gpio3->gpio_dr);
> -	val = readl(&gpio3->gpio_dir) | (1 << 10) | (1 << 11) | (1 << 12);
> -	writel(val, &gpio3->gpio_dir);
> +	gpio_direction_output(MXC_GPIO_PORT_TO_NUM(3, 10), 1);
> +	gpio_direction_output(MXC_GPIO_PORT_TO_NUM(3, 11), 1);
> +	gpio_direction_output(MXC_GPIO_PORT_TO_NUM(3, 12), 1);
>  
>  	mdelay(22);		/* this value came from RedBoot */
>  
>  	/*
>  	 * deassert PHY reset
>  	 */
> -	val = readl(&gpio4->gpio_dr) | 1 << 7;
> -	writel(val, &gpio4->gpio_dr);
> -	writel(val, &gpio4->gpio_dr);
> +	gpio_set_value(GPIO_FEC_RESET_B, 1);
>  
>  	mdelay(5);
>  

Acked-by: Stefano Babic <sbabic@denx.de>

Best regards,
Stefano Babic
Anatolij Gustschin Aug. 10, 2012, 10:06 p.m. UTC | #3 
Hi,

On Sat, 16 Jun 2012 22:46:17 +0530
Vikram Narayanan <vikram186@gmail.com> wrote:

> Instead of manipulating gpio registers directly, use the calls
> from the gpio library.
> 
> Signed-off-by: Vikram Narayanan <vikram186@gmail.com>
> Acked-by: Stefano Babic <sbabic@denx.de>
> Cc: John Rigby <jcrigby@gmail.com>
> Cc: Fabio Estevam <fabio.estevam@freescale.com>
> ---
> Changes from v3:
> Use gpio_set_value instead of gpio_direction_output
> (Ahh. Missed it again!!. Very bad)
> 
> Changes from v2:
> Swap the place of the change log and commit message.
> 
> Changes from v1:
> Used appropriate gpio_* lib calls.
> 
>  board/karo/tx25/tx25.c |   25 +++++++++----------------
>  1 files changed, 9 insertions(+), 16 deletions(-)

applied to my staging branch, thanks!

Anatolij
diff mbox

Patch

diff --git a/board/karo/tx25/tx25.c b/board/karo/tx25/tx25.c
index 2a29943..07fd98d 100644
--- a/board/karo/tx25/tx25.c
+++ b/board/karo/tx25/tx25.c
@@ -34,14 +34,13 @@ 
 DECLARE_GLOBAL_DATA_PTR;
 
 #ifdef CONFIG_FEC_MXC
+#define GPIO_FEC_RESET_B	MXC_GPIO_PORT_TO_NUM(4, 7)
+#define GPIO_FEC_ENABLE_B	MXC_GPIO_PORT_TO_NUM(4, 9)
 void tx25_fec_init(void)
 {
 	struct iomuxc_mux_ctl *muxctl;
 	struct iomuxc_pad_ctl *padctl;
-	u32 val;
 	u32 gpio_mux_mode = MX25_PIN_MUX_MODE(5);
-	struct gpio_regs *gpio4 = (struct gpio_regs *)IMX_GPIO4_BASE;
-	struct gpio_regs *gpio3 = (struct gpio_regs *)IMX_GPIO3_BASE;
 	u32 saved_rdata0_mode, saved_rdata1_mode, saved_rx_dv_mode;
 
 	debug("tx25_fec_init\n");
@@ -66,18 +65,15 @@  void tx25_fec_init(void)
 	writel(0x0, &padctl->pad_d11);
 
 	/* drop PHY power and assert reset (low) */
-	val = readl(&gpio4->gpio_dr) & ~((1 << 7) | (1 << 9));
-	writel(val, &gpio4->gpio_dr);
-	val = readl(&gpio4->gpio_dir) | (1 << 7) | (1 << 9);
-	writel(val, &gpio4->gpio_dir);
+	gpio_direction_output(GPIO_FEC_RESET_B, 0);
+	gpio_direction_output(GPIO_FEC_ENABLE_B, 0);
 
 	mdelay(5);
 
 	debug("resetting phy\n");
 
 	/* turn on PHY power leaving reset asserted */
-	val = readl(&gpio4->gpio_dr) | 1 << 9;
-	writel(val, &gpio4->gpio_dr);
+	gpio_set_value(GPIO_FEC_ENABLE_B, 1);
 
 	mdelay(10);
 
@@ -107,19 +103,16 @@  void tx25_fec_init(void)
 	/*
 	 * set each to 1 and make each an output
 	 */
-	val = readl(&gpio3->gpio_dr) | (1 << 10) | (1 << 11) | (1 << 12);
-	writel(val, &gpio3->gpio_dr);
-	val = readl(&gpio3->gpio_dir) | (1 << 10) | (1 << 11) | (1 << 12);
-	writel(val, &gpio3->gpio_dir);
+	gpio_direction_output(MXC_GPIO_PORT_TO_NUM(3, 10), 1);
+	gpio_direction_output(MXC_GPIO_PORT_TO_NUM(3, 11), 1);
+	gpio_direction_output(MXC_GPIO_PORT_TO_NUM(3, 12), 1);
 
 	mdelay(22);		/* this value came from RedBoot */
 
 	/*
 	 * deassert PHY reset
 	 */
-	val = readl(&gpio4->gpio_dr) | 1 << 7;
-	writel(val, &gpio4->gpio_dr);
-	writel(val, &gpio4->gpio_dr);
+	gpio_set_value(GPIO_FEC_RESET_B, 1);
 
 	mdelay(5);