浏览代码

ARM: SAMSUNG: Move gpio-config.c into plat-samsung

The arch/arm/plat-s3c/gpio-config.c file is common to pretty much all the Samsung
SoCs, so move it to arch/arm/plat-samsung

Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Ben Dooks 15 年之前
父节点
当前提交
4f830db962

+ 0 - 33
arch/arm/plat-s3c/Kconfig

@@ -130,39 +130,6 @@ config S3C_GPIO_TRACK
 	  Internal configuration option to enable the s3c specific gpio
 	  Internal configuration option to enable the s3c specific gpio
 	  chip tracking if the platform requires it.
 	  chip tracking if the platform requires it.
 
 
-config S3C_GPIO_PULL_UPDOWN
-	bool
-	help
-	  Internal configuration to enable the correct GPIO pull helper
-
-config S3C_GPIO_PULL_DOWN
-	bool
-	help
-	  Internal configuration to enable the correct GPIO pull helper
-
-config S3C_GPIO_PULL_UP
-	bool
-	help
-	  Internal configuration to enable the correct GPIO pull helper
-
-config S3C_GPIO_CFG_S3C24XX
-	bool
-	help
-	  Internal configuration to enable S3C24XX style GPIO configuration
-	  functions.
-
-config S3C_GPIO_CFG_S3C64XX
-	bool
-	help
-	  Internal configuration to enable S3C64XX style GPIO configuration
-	  functions.
-
-config S5P_GPIO_CFG_S5PC1XX
-	bool
-	help
-	  Internal configuration to enable S5PC1XX style GPIO configuration
-	  functions.
-
 # DMA
 # DMA
 
 
 config S3C_DMA
 config S3C_DMA

+ 0 - 1
arch/arm/plat-s3c/Makefile

@@ -14,7 +14,6 @@ obj-				:=
 obj-y				+= init.o
 obj-y				+= init.o
 obj-y				+= time.o
 obj-y				+= time.o
 obj-y				+= gpio.o
 obj-y				+= gpio.o
-obj-y				+= gpio-config.o
 
 
 # DMA support
 # DMA support
 
 

+ 35 - 0
arch/arm/plat-samsung/Kconfig

@@ -19,6 +19,41 @@ config SAMSUNG_CLKSRC
 	  Select the clock code for the clksrc implementation
 	  Select the clock code for the clksrc implementation
 	  used by newer systems such as the S3C64XX.
 	  used by newer systems such as the S3C64XX.
 
 
+# options for gpio configuration support
+
+config S3C_GPIO_CFG_S3C24XX
+	bool
+	help
+	  Internal configuration to enable S3C24XX style GPIO configuration
+	  functions.
+
+config S3C_GPIO_CFG_S3C64XX
+	bool
+	help
+	  Internal configuration to enable S3C64XX style GPIO configuration
+	  functions.
+
+config S5P_GPIO_CFG_S5PC1XX
+	bool
+	help
+	  Internal configuration to enable S5PC1XX style GPIO configuration
+	  functions.
+
+config S3C_GPIO_PULL_UPDOWN
+	bool
+	help
+	  Internal configuration to enable the correct GPIO pull helper
+
+config S3C_GPIO_PULL_DOWN
+	bool
+	help
+	  Internal configuration to enable the correct GPIO pull helper
+
+config S3C_GPIO_PULL_UP
+	bool
+	help
+	  Internal configuration to enable the correct GPIO pull helper
+
 # device definitions to compile in
 # device definitions to compile in
 
 
 config S3C_DEV_HSMMC
 config S3C_DEV_HSMMC

+ 1 - 0
arch/arm/plat-samsung/Makefile

@@ -13,6 +13,7 @@ obj-				:=
 
 
 obj-y				+= clock.o
 obj-y				+= clock.o
 obj-y				+= pwm-clock.o
 obj-y				+= pwm-clock.o
+obj-y				+= gpio-config.o
 
 
 obj-$(CONFIG_SAMSUNG_CLKSRC)	+= clock-clksrc.o
 obj-$(CONFIG_SAMSUNG_CLKSRC)	+= clock-clksrc.o
 
 

+ 0 - 0
arch/arm/plat-s3c/gpio-config.c → arch/arm/plat-samsung/gpio-config.c