Re: [PATCH 1/2] ARM: EXYYNOS: Use EXYNOS4210_GPEx instead of EXYNOS4_GPEx

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 

On 08/07/2012 05:09 PM, Kukjin Kim wrote:

Kukjin Kim wrote:

Joonyoung Shim wrote:

Add to cc Grant Likely and Linus Walleij

On 05/18/2012 11:18 AM, Joonyoung Shim wrote:

Also use EXYNOS4210_GPIO_Ex instead of EXYNOS4_GPIO_Ex. The GPEx gpios
exist only on Exynos4210 and there are no on Exynos4x12. Redefine them
to exact SoC name.

Signed-off-by: Joonyoung Shim<jy0922.shim@xxxxxxxxxxx>
Signed-off-by: Kyungmin Park<kyungmin.park@xxxxxxxxxxx>
---
   arch/arm/mach-exynos/include/mach/gpio.h   |   32

++++++++++++++------

--

------

   arch/arm/mach-exynos/mach-nuri.c           |   16 +++++++-------
   arch/arm/mach-exynos/mach-origen.c         |    6 ++--
   arch/arm/mach-exynos/mach-universal_c210.c |   32

++++++++++++++-----

--

-------

   arch/arm/mach-exynos/setup-fimc.c          |    4 +-
   drivers/gpio/gpio-samsung.c                |   20 ++++++++--------
   6 files changed, 55 insertions(+), 55 deletions(-)

diff --git a/arch/arm/mach-exynos/include/mach/gpio.h b/arch/arm/mach-

exynos/include/mach/gpio.h

index eb24f1e..21c9bf1 100644
--- a/arch/arm/mach-exynos/include/mach/gpio.h
+++ b/arch/arm/mach-exynos/include/mach/gpio.h
@@ -26,11 +26,11 @@
   #define EXYNOS4_GPIO_C1_NR	(5)
   #define EXYNOS4_GPIO_D0_NR	(4)
   #define EXYNOS4_GPIO_D1_NR	(4)
-#define EXYNOS4_GPIO_E0_NR	(5)
-#define EXYNOS4_GPIO_E1_NR	(8)
-#define EXYNOS4_GPIO_E2_NR	(6)
-#define EXYNOS4_GPIO_E3_NR	(8)
-#define EXYNOS4_GPIO_E4_NR	(8)
+#define EXYNOS4210_GPIO_E0_NR	(5)
+#define EXYNOS4210_GPIO_E1_NR	(8)
+#define EXYNOS4210_GPIO_E2_NR	(6)
+#define EXYNOS4210_GPIO_E3_NR	(8)
+#define EXYNOS4210_GPIO_E4_NR	(8)

I think, splitting the gpios like following(common exynos4 and exynos4210
or exynos4x12). So please just put the definitions for EXYNOS4210 GPIO
after EXYNOS4_GPIO_XXX.

diff --git a/arch/arm/mach-exynos/include/mach/gpio.h b/arch/arm/mach-
exynos/include/mach/gpio.h
index eb24f1e..910b611 100644
--- a/arch/arm/mach-exynos/include/mach/gpio.h
+++ b/arch/arm/mach-exynos/include/mach/gpio.h
@@ -26,17 +26,10 @@
  #define EXYNOS4_GPIO_C1_NR	(5)
  #define EXYNOS4_GPIO_D0_NR	(4)
  #define EXYNOS4_GPIO_D1_NR	(4)
-#define EXYNOS4_GPIO_E0_NR	(5)
-#define EXYNOS4_GPIO_E1_NR	(8)
-#define EXYNOS4_GPIO_E2_NR	(6)
-#define EXYNOS4_GPIO_E3_NR	(8)
-#define EXYNOS4_GPIO_E4_NR	(8)
  #define EXYNOS4_GPIO_F0_NR	(8)
  #define EXYNOS4_GPIO_F1_NR	(8)
  #define EXYNOS4_GPIO_F2_NR	(8)
  #define EXYNOS4_GPIO_F3_NR	(6)
-#define EXYNOS4_GPIO_J0_NR	(8)
-#define EXYNOS4_GPIO_J1_NR	(5)
  #define EXYNOS4_GPIO_K0_NR	(7)
  #define EXYNOS4_GPIO_K1_NR	(7)
  #define EXYNOS4_GPIO_K2_NR	(7)
@@ -57,6 +50,31 @@
  #define EXYNOS4_GPIO_Y6_NR	(8)
  #define EXYNOS4_GPIO_Z_NR	(7)

+/* For EXYNOS4210 GPIO bank sizes */
+
+#define EXYNOS4210_GPIO_E0_NR	(5)
+#define EXYNOS4210_GPIO_E1_NR	(8)
+#define EXYNOS4210_GPIO_E2_NR	(6)
+#define EXYNOS4210_GPIO_E3_NR	(8)
+#define EXYNOS4210_GPIO_E4_NR	(8)
+#define EXYNOS4210_GPIO_J0_NR	(8)
+#define EXYNOS4210_GPIO_J1_NR	(5)

[...]

And we can add EXYNOS4X12 GPIO like following in other patch.

+/* For EXYNOS4X12 GPIO bank sizes */
+
+#define EXYNOS4X12_GPIO_J0_NR	(8)
+#define EXYNOS4X12_GPIO_J1_NR	(5)
+#define EXYNOS4X12_GPIO_M0_NR	(8)
+#define EXYNOS4X12_GPIO_M1_NR	(7)
+#define EXYNOS4X12_GPIO_M2_NR	(5)
+#define EXYNOS4X12_GPIO_M3_NR	(8)
+#define EXYNOS4X12_GPIO_M4_NR	(8)
+#define EXYNOS4X12_GPIO_V0_NR	(8)
+#define EXYNOS4X12_GPIO_V1_NR	(8)
+#define EXYNOS4X12_GPIO_V2_NR	(8)
+#define EXYNOS4X12_GPIO_V3_NR	(8)
+#define EXYNOS4X12_GPIO_V4_NR	(2)


   #define EXYNOS4_GPIO_F0_NR	(8)
   #define EXYNOS4_GPIO_F1_NR	(8)
   #define EXYNOS4_GPIO_F2_NR	(8)
@@ -67,12 +67,12 @@ enum exynos4_gpio_number {
   	EXYNOS4_GPIO_C1_START	= EXYNOS_GPIO_NEXT(EXYNOS4_GPIO_C0),
   	EXYNOS4_GPIO_D0_START	= EXYNOS_GPIO_NEXT(EXYNOS4_GPIO_C1),
   	EXYNOS4_GPIO_D1_START	= EXYNOS_GPIO_NEXT(EXYNOS4_GPIO_D0),
-	EXYNOS4_GPIO_E0_START	= EXYNOS_GPIO_NEXT(EXYNOS4_GPIO_D1),
-	EXYNOS4_GPIO_E1_START	= EXYNOS_GPIO_NEXT(EXYNOS4_GPIO_E0),
-	EXYNOS4_GPIO_E2_START	= EXYNOS_GPIO_NEXT(EXYNOS4_GPIO_E1),
-	EXYNOS4_GPIO_E3_START	= EXYNOS_GPIO_NEXT(EXYNOS4_GPIO_E2),
-	EXYNOS4_GPIO_E4_START	= EXYNOS_GPIO_NEXT(EXYNOS4_GPIO_E3),
-	EXYNOS4_GPIO_F0_START	= EXYNOS_GPIO_NEXT(EXYNOS4_GPIO_E4),
+	EXYNOS4210_GPIO_E0_START	= EXYNOS_GPIO_NEXT(EXYNOS4_GPIO_D1),
+	EXYNOS4210_GPIO_E1_START	=

EXYNOS_GPIO_NEXT(EXYNOS4210_GPIO_E0),

+	EXYNOS4210_GPIO_E2_START	=

EXYNOS_GPIO_NEXT(EXYNOS4210_GPIO_E1),

+	EXYNOS4210_GPIO_E3_START	=

EXYNOS_GPIO_NEXT(EXYNOS4210_GPIO_E2),

+	EXYNOS4210_GPIO_E4_START	=

EXYNOS_GPIO_NEXT(EXYNOS4210_GPIO_E3),

+	EXYNOS4_GPIO_F0_START	= EXYNOS_GPIO_NEXT(EXYNOS4210_GPIO_E4),
   	EXYNOS4_GPIO_F1_START	= EXYNOS_GPIO_NEXT(EXYNOS4_GPIO_F0),
   	EXYNOS4_GPIO_F2_START	= EXYNOS_GPIO_NEXT(EXYNOS4_GPIO_F1),
   	EXYNOS4_GPIO_F3_START	= EXYNOS_GPIO_NEXT(EXYNOS4_GPIO_F2),

Same as above.

@@ -99,6 +117,31 @@ enum exynos4_gpio_number {
  	EXYNOS4_GPIO_Z_START	= EXYNOS_GPIO_NEXT(EXYNOS4_GPIO_Y6),
  };

+enum exynos4210_gpio_number {
+	EXYNOS4210_GPIO_E0_START	= EXYNOS4_GPIO_NEXT(EXYNOS4_GPIO_Z),
+	EXYNOS4210_GPIO_E1_START	=

EXYNOS4_GPIO_NEXT(EXYNOS4210_GPIO_E0),

+	EXYNOS4210_GPIO_E2_START	=

EXYNOS4_GPIO_NEXT(EXYNOS4210_GPIO_E1),

+	EXYNOS4210_GPIO_E3_START	=

EXYNOS4_GPIO_NEXT(EXYNOS4210_GPIO_E2),

+	EXYNOS4210_GPIO_E4_START	=

EXYNOS4_GPIO_NEXT(EXYNOS4210_GPIO_E3),

+	EXYNOS4210_GPIO_J0_START	=

EXYNOS4_GPIO_NEXT(EXYNOS4210_GPIO_E4),

+	EXYNOS4210_GPIO_J1_START	=

EXYNOS4_GPIO_NEXT(EXYNOS4210_GPIO_J0),

+};

[...]

And following is possible for EXYNOS4X12...

+enum exynos4x12_gpio_number {
+	EXYNOS4X12_GPIO_J0_START	= EXYNOS4_GPIO_NEXT(EXYNOS4_GPIO_Z),
+	EXYNOS4X12_GPIO_J1_START	=

EXYNOS4_GPIO_NEXT(EXYNOS4X12_GPIO_J0),

+	EXYNOS4X12_GPIO_M0_START	=

EXYNOS4_GPIO_NEXT(EXYNOS4X12_GPIO_J1),

+	EXYNOS4X12_GPIO_M1_START	=

EXYNOS4_GPIO_NEXT(EXYNOS4X12_GPIO_M0),

+	EXYNOS4X12_GPIO_M2_START	=

EXYNOS4_GPIO_NEXT(EXYNOS4X12_GPIO_M1),

+	EXYNOS4X12_GPIO_M3_START	=

EXYNOS4_GPIO_NEXT(EXYNOS4X12_GPIO_M2),

+	EXYNOS4X12_GPIO_M4_START	=

EXYNOS4_GPIO_NEXT(EXYNOS4X12_GPIO_M3),

+	EXYNOS4X12_GPIO_V0_START	=

EXYNOS4_GPIO_NEXT(EXYNOS4X12_GPIO_M4),

+	EXYNOS4X12_GPIO_V1_START	=

EXYNOS4_GPIO_NEXT(EXYNOS4X12_GPIO_V0),

+	EXYNOS4X12_GPIO_V2_START	=

EXYNOS4_GPIO_NEXT(EXYNOS4X12_GPIO_V1),

+	EXYNOS4X12_GPIO_V3_START	=

EXYNOS4_GPIO_NEXT(EXYNOS4X12_GPIO_V2),

+	EXYNOS4X12_GPIO_V4_START	=

EXYNOS4_GPIO_NEXT(EXYNOS4X12_GPIO_V3),

+};
+
  /* EXYNOS4 GPIO number definitions */

  #define EXYNOS4_GPA0(_nr)	(EXYNOS4_GPIO_A0_START + (_nr))

[...]

Of course, need to update other regarding gpio part accordingly.


Joonyoung, any updates on this?


Sorry for late response, but i don't have any progress for this.

Thanks.
--
To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
[Index of Archives]     [Linux SoC Development]     [Linux Rockchip Development]     [Linux USB Development]     [Video for Linux]     [Linux Audio Users]     [Linux SCSI]     [Yosemite News]

  Powered by Linux