Patchwork [U-Boot,1/6] video: remove AT91 legacy API from bus_vcxk

login
register
mail settings
Submitter Andreas Bießmann
Date Oct. 30, 2013, 2:18 p.m.
Message ID <1383142702-9782-2-git-send-email-andreas.devel@googlemail.com>
Download mbox | patch
Permalink /patch/287221/
State Accepted
Delegated to: Andreas Bießmann
Headers show

Comments

Andreas Bießmann - Oct. 30, 2013, 2:18 p.m.
Signed-off-by: Andreas Bießmann <andreas.devel@googlemail.com>
---
 drivers/video/bus_vcxk.c |   15 ---------------
 1 file changed, 15 deletions(-)
esw@bus-elektronik.de - Nov. 4, 2013, 3:12 p.m.
Am 2013-10-30 15:18, schrieb Andreas Bießmann:
> Signed-off-by: Andreas Bießmann <andreas.devel@googlemail.com>
> ---
>  drivers/video/bus_vcxk.c |   15 ---------------
>  1 file changed, 15 deletions(-)
> 
> diff --git a/drivers/video/bus_vcxk.c b/drivers/video/bus_vcxk.c
> index 0138bca..60a5cc5 100644
> --- a/drivers/video/bus_vcxk.c
> +++ b/drivers/video/bus_vcxk.c
> @@ -20,7 +20,6 @@ vu_long  *vcxk_bws_long = ((vu_long *) (CONFIG_SYS_VCXK_BASE));
>  	#ifndef VCBITMASK
>  		#define VCBITMASK(bitno)	(0x0001 << (bitno % 16))
>  	#endif
> -#ifndef CONFIG_AT91_LEGACY
>  at91_pio_t *pio = (at91_pio_t *) AT91_PIO_BASE;
>  #define VCXK_INIT_PIN(PORT, PIN, DDR, I0O1) \
>  	do { \
> @@ -37,20 +36,6 @@ at91_pio_t *pio = (at91_pio_t *) AT91_PIO_BASE;
>  #define VCXK_ACKNOWLEDGE	\
>  	(!(readl(&pio->CONFIG_SYS_VCXK_ACKNOWLEDGE_PORT.pdsr) & \
>  			CONFIG_SYS_VCXK_ACKNOWLEDGE_PIN))
> -#else
> -	#define VCXK_INIT_PIN(PORT, PIN, DDR, I0O1) \
> -		((AT91PS_PIO) PORT)->PIO_PER = PIN; \
> -		((AT91PS_PIO) PORT)->DDR = PIN; \
> -		((AT91PS_PIO) PORT)->PIO_MDDR = PIN; \
> -		if (!I0O1) ((AT91PS_PIO) PORT)->PIO_PPUER = PIN;
> -
> -	#define VCXK_SET_PIN(PORT, PIN)	((AT91PS_PIO) PORT)->PIO_SODR  = PIN;
> -	#define VCXK_CLR_PIN(PORT, PIN)	((AT91PS_PIO) PORT)->PIO_CODR  = PIN;
> -
> -	#define VCXK_ACKNOWLEDGE	\
> -		(!(((AT91PS_PIO) CONFIG_SYS_VCXK_ACKNOWLEDGE_PORT)->\
> -			PIO_PDSR & CONFIG_SYS_VCXK_ACKNOWLEDGE_PIN))
> -#endif
>  #elif defined(CONFIG_MCF52x2)
>  	#include <asm/m5282.h>
>  	#ifndef VCBITMASK
> 

Acked-by: Jens Scharsig (BuS Elektronik) <esw@bus-elektronik.de>
Anatolij Gustschin - Nov. 4, 2013, 3:21 p.m.
On Wed, 30 Oct 2013 15:18:17 +0100
Andreas Bießmann <andreas.devel@googlemail.com> wrote:

> Signed-off-by: Andreas Bießmann <andreas.devel@googlemail.com>
> ---
>  drivers/video/bus_vcxk.c |   15 ---------------
>  1 file changed, 15 deletions(-)

Acked-by: Anatolij Gustschin <agust@denx.de>
Andreas Bießmann - Nov. 13, 2013, 9:21 p.m.
Dear Andreas Devel,

Andreas Devel <andreas.devel@googlemail.com> writes:
>Signed-off-by: Andreas Bießmann <andreas.devel@googlemail.com>
>Acked-by: Jens Scharsig (BuS Elektronik) <esw@bus-elektronik.de>
>Acked-by: Anatolij Gustschin <agust@denx.de>
>
>---
>drivers/video/bus_vcxk.c |   15 ---------------
> 1 file changed, 15 deletions(-)

applied to u-boot-atmel/master, thanks!

Best regards,
Andreas Bießmann

Patch

diff --git a/drivers/video/bus_vcxk.c b/drivers/video/bus_vcxk.c
index 0138bca..60a5cc5 100644
--- a/drivers/video/bus_vcxk.c
+++ b/drivers/video/bus_vcxk.c
@@ -20,7 +20,6 @@  vu_long  *vcxk_bws_long = ((vu_long *) (CONFIG_SYS_VCXK_BASE));
 	#ifndef VCBITMASK
 		#define VCBITMASK(bitno)	(0x0001 << (bitno % 16))
 	#endif
-#ifndef CONFIG_AT91_LEGACY
 at91_pio_t *pio = (at91_pio_t *) AT91_PIO_BASE;
 #define VCXK_INIT_PIN(PORT, PIN, DDR, I0O1) \
 	do { \
@@ -37,20 +36,6 @@  at91_pio_t *pio = (at91_pio_t *) AT91_PIO_BASE;
 #define VCXK_ACKNOWLEDGE	\
 	(!(readl(&pio->CONFIG_SYS_VCXK_ACKNOWLEDGE_PORT.pdsr) & \
 			CONFIG_SYS_VCXK_ACKNOWLEDGE_PIN))
-#else
-	#define VCXK_INIT_PIN(PORT, PIN, DDR, I0O1) \
-		((AT91PS_PIO) PORT)->PIO_PER = PIN; \
-		((AT91PS_PIO) PORT)->DDR = PIN; \
-		((AT91PS_PIO) PORT)->PIO_MDDR = PIN; \
-		if (!I0O1) ((AT91PS_PIO) PORT)->PIO_PPUER = PIN;
-
-	#define VCXK_SET_PIN(PORT, PIN)	((AT91PS_PIO) PORT)->PIO_SODR  = PIN;
-	#define VCXK_CLR_PIN(PORT, PIN)	((AT91PS_PIO) PORT)->PIO_CODR  = PIN;
-
-	#define VCXK_ACKNOWLEDGE	\
-		(!(((AT91PS_PIO) CONFIG_SYS_VCXK_ACKNOWLEDGE_PORT)->\
-			PIO_PDSR & CONFIG_SYS_VCXK_ACKNOWLEDGE_PIN))
-#endif
 #elif defined(CONFIG_MCF52x2)
 	#include <asm/m5282.h>
 	#ifndef VCBITMASK