Patchwork [U-Boot,v2,1/4] imx: Remove unneeded/repititive definitions from imx headers

login
register
mail settings
Submitter Vikram Narayanan
Date April 10, 2012, 2:25 p.m.
Message ID <4F8442F5.2060608@gmail.com>
Download mbox | patch
Permalink /patch/151584/
State Accepted
Commit a9407f2bc51ed118c47a2e60396466bba78c57a6
Headers show

Comments

Vikram Narayanan - April 10, 2012, 2:25 p.m.
Remove gpio related unused/repititive definitions from imx headers.

Signed-off-by: Vikram Narayanan <vikram186@gmail.com>
---
 arch/arm/include/asm/arch-mx35/mx35_pins.h |    2 --
 arch/arm/include/asm/arch-mx5/mx5x_pins.h  |    2 --
 arch/arm/include/asm/arch-mx6/imx-regs.h   |    2 --
 3 files changed, 0 insertions(+), 6 deletions(-)
Stefano Babic - April 10, 2012, 2:43 p.m.
On 10/04/2012 16:25, Vikram Narayanan wrote:
> Remove gpio related unused/repititive definitions from imx headers.
> 
> Signed-off-by: Vikram Narayanan <vikram186@gmail.com>
> ---
>  arch/arm/include/asm/arch-mx35/mx35_pins.h |    2 --
>  arch/arm/include/asm/arch-mx5/mx5x_pins.h  |    2 --
>  arch/arm/include/asm/arch-mx6/imx-regs.h   |    2 --
>  3 files changed, 0 insertions(+), 6 deletions(-)
> 
> diff --git a/arch/arm/include/asm/arch-mx35/mx35_pins.h b/arch/arm/include/asm/arch-mx35/mx35_pins.h
> index 3676e33..8c38139 100644
> --- a/arch/arm/include/asm/arch-mx35/mx35_pins.h
> +++ b/arch/arm/include/asm/arch-mx35/mx35_pins.h
> @@ -84,8 +84,6 @@
>  					GPIO_NUM_PIN) + ((pin >> MUX_IO_I) &\
>  					((1 << (MUX_IO_P - MUX_IO_I)) - 1)))
>  #define IOMUX_TO_IRQ(pin)       (MXC_GPIO_INT_BASE + IOMUX_TO_GPIO(pin))
> -#define GPIO_TO_PORT(n)         (n / GPIO_NUM_PIN)
> -#define GPIO_TO_INDEX(n)        (n % GPIO_NUM_PIN)
>  
>  #define NON_GPIO_I	0x7
>  #define PIN_TO_MUX_MASK	((1<<(PAD_I - MUX_I)) - 1)
> diff --git a/arch/arm/include/asm/arch-mx5/mx5x_pins.h b/arch/arm/include/asm/arch-mx5/mx5x_pins.h
> index 4e3a31b..122fbee 100644
> --- a/arch/arm/include/asm/arch-mx5/mx5x_pins.h
> +++ b/arch/arm/include/asm/arch-mx5/mx5x_pins.h
> @@ -78,8 +78,6 @@
>  					GPIO_NUM_PIN) + ((pin >> MUX_IO_I) &\
>  					((1 << (MUX_IO_P - MUX_IO_I)) - 1)))
>  #define IOMUX_TO_IRQ(pin)       (MXC_GPIO_INT_BASE + IOMUX_TO_GPIO(pin))
> -#define GPIO_TO_PORT(n)         (n / GPIO_NUM_PIN)
> -#define GPIO_TO_INDEX(n)        (n % GPIO_NUM_PIN)
>  
>  #define NON_GPIO_PORT		0x7
>  #define PIN_TO_MUX_MASK		((1 << (PAD_I - MUX_I)) - 1)
> diff --git a/arch/arm/include/asm/arch-mx6/imx-regs.h b/arch/arm/include/asm/arch-mx6/imx-regs.h
> index cad957a..27ecb75 100644
> --- a/arch/arm/include/asm/arch-mx6/imx-regs.h
> +++ b/arch/arm/include/asm/arch-mx6/imx-regs.h
> @@ -168,8 +168,6 @@
>  #define FEC_QUIRK_ENET_MAC
>  
>  #define GPIO_NUMBER(port, index)		((((port)-1)*32)+((index)&31))
> -#define GPIO_TO_PORT(number)		(((number)/32)+1)
> -#define GPIO_TO_INDEX(number)		((number)&31)
>  
>  #if !(defined(__KERNEL_STRICT_NAMES) || defined(__ASSEMBLY__))
>  #include <asm/types.h>

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

Best regards,
Stefano Babic
Stefano Babic - April 11, 2012, 7:33 a.m.
On 10/04/2012 16:25, Vikram Narayanan wrote:
> Remove gpio related unused/repititive definitions from imx headers.
> 
> Signed-off-by: Vikram Narayanan <vikram186@gmail.com>
> ---

Applied to u-boot-imx (fix), thanks.

Best regards,
Stefano Babic

Patch

diff --git a/arch/arm/include/asm/arch-mx35/mx35_pins.h b/arch/arm/include/asm/arch-mx35/mx35_pins.h
index 3676e33..8c38139 100644
--- a/arch/arm/include/asm/arch-mx35/mx35_pins.h
+++ b/arch/arm/include/asm/arch-mx35/mx35_pins.h
@@ -84,8 +84,6 @@ 
 					GPIO_NUM_PIN) + ((pin >> MUX_IO_I) &\
 					((1 << (MUX_IO_P - MUX_IO_I)) - 1)))
 #define IOMUX_TO_IRQ(pin)       (MXC_GPIO_INT_BASE + IOMUX_TO_GPIO(pin))
-#define GPIO_TO_PORT(n)         (n / GPIO_NUM_PIN)
-#define GPIO_TO_INDEX(n)        (n % GPIO_NUM_PIN)
 
 #define NON_GPIO_I	0x7
 #define PIN_TO_MUX_MASK	((1<<(PAD_I - MUX_I)) - 1)
diff --git a/arch/arm/include/asm/arch-mx5/mx5x_pins.h b/arch/arm/include/asm/arch-mx5/mx5x_pins.h
index 4e3a31b..122fbee 100644
--- a/arch/arm/include/asm/arch-mx5/mx5x_pins.h
+++ b/arch/arm/include/asm/arch-mx5/mx5x_pins.h
@@ -78,8 +78,6 @@ 
 					GPIO_NUM_PIN) + ((pin >> MUX_IO_I) &\
 					((1 << (MUX_IO_P - MUX_IO_I)) - 1)))
 #define IOMUX_TO_IRQ(pin)       (MXC_GPIO_INT_BASE + IOMUX_TO_GPIO(pin))
-#define GPIO_TO_PORT(n)         (n / GPIO_NUM_PIN)
-#define GPIO_TO_INDEX(n)        (n % GPIO_NUM_PIN)
 
 #define NON_GPIO_PORT		0x7
 #define PIN_TO_MUX_MASK		((1 << (PAD_I - MUX_I)) - 1)
diff --git a/arch/arm/include/asm/arch-mx6/imx-regs.h b/arch/arm/include/asm/arch-mx6/imx-regs.h
index cad957a..27ecb75 100644
--- a/arch/arm/include/asm/arch-mx6/imx-regs.h
+++ b/arch/arm/include/asm/arch-mx6/imx-regs.h
@@ -168,8 +168,6 @@ 
 #define FEC_QUIRK_ENET_MAC
 
 #define GPIO_NUMBER(port, index)		((((port)-1)*32)+((index)&31))
-#define GPIO_TO_PORT(number)		(((number)/32)+1)
-#define GPIO_TO_INDEX(number)		((number)&31)
 
 #if !(defined(__KERNEL_STRICT_NAMES) || defined(__ASSEMBLY__))
 #include <asm/types.h>