ARM: s3c64xx: get rid of custom <mach/gpio.h>
Subsystems (4)
PATCH v2 2/2 ARM: s3c64xx: get rid of custom <mach/gpio.h>
This isolates the custom S3C64xx GPIO definition table to <linux/platform_data/gpio-samsung-s3x64xx.h> as this is used in a few different places in the kernel, removing the need to depend on the implicit inclusion of <mach/gpio.h> from <linux/gpio.h> and thus getting rid of a few nasty cross-dependencies.
Also delete the CONFIG_SAMSUNG_GPIO_EXTRA stuff. Instead roof the number of GPIOs for this platform:
First sum up all the GPIO banks from A to Q: 187 GPIOs. Add the 16 "board GPIOs" and the roof for SAMSUNG_GPIO_EXTRA, 128, so in total maximum 187+16+128 = 331 GPIOs, so let's take the same roof as for S3C24XX: 512. This way we can do away with the GPIO calculation macros for GPIO_BOARD_START, BOARD_NR_GPIOS and the definition of ARCH_NR_GPIOS.
---
ChangeLog v1->v2:
- Move the movement of the actual gpio.h file into this patch after mistakenly having it end up in the S3C24xx patch.
- Add a missing ifdef for the pm-gpio.c code in plat-samsung.
This patch depends on
"ARM: s3c24xx: get rid of custom <mach/gpio.h>"
I will take this through the GPIO tree.
--- arch/arm/Kconfig | 3 +- arch/arm/mach-s3c64xx/Kconfig | 3 - arch/arm/mach-s3c64xx/common.c | 1 + arch/arm/mach-s3c64xx/crag6410.h | 2 +- arch/arm/mach-s3c64xx/dev-audio.c | 1 + arch/arm/mach-s3c64xx/include/mach/gpio.h | 93 --------------------- arch/arm/mach-s3c64xx/mach-anw6410.c | 1 + arch/arm/mach-s3c64xx/mach-crag6410.c | 1 + arch/arm/mach-s3c64xx/mach-hmt.c | 1 + arch/arm/mach-s3c64xx/mach-mini6410.c | 1 + arch/arm/mach-s3c64xx/mach-real6410.c | 1 + arch/arm/mach-s3c64xx/mach-smartq.c | 1 + arch/arm/mach-s3c64xx/mach-smartq5.c | 1 + arch/arm/mach-s3c64xx/mach-smartq7.c | 1 + arch/arm/mach-s3c64xx/mach-smdk6400.c | 1 + arch/arm/mach-s3c64xx/mach-smdk6410.c | 1 + arch/arm/mach-s3c64xx/pm.c | 1 + arch/arm/mach-s3c64xx/setup-fb-24bpp.c | 1 + arch/arm/mach-s3c64xx/setup-i2c0.c | 1 + arch/arm/mach-s3c64xx/setup-i2c1.c | 1 + arch/arm/mach-s3c64xx/setup-ide.c | 1 + arch/arm/mach-s3c64xx/setup-keypad.c | 1 + arch/arm/mach-s3c64xx/setup-sdhci-gpio.c | 1 + arch/arm/mach-s3c64xx/setup-spi.c | 1 + arch/arm/plat-samsung/pm-gpio.c | 3 + drivers/gpio/gpio-samsung.c | 3 + include/linux/platform_data/gpio-samsung-s3c64xx.h | 94 ++++++++++++++++++++++ 27 files changed, 122 insertions(+), 99 deletions(-) delete mode 100644 arch/arm/mach-s3c64xx/include/mach/gpio.h create mode 100644 include/linux/platform_data/gpio-samsung-s3c64xx.h
arch/arm/Kconfig +1 -2
@@ -732,7 +732,6 @@ config ARCH_S3C64XX select HAVE_S3C2410_I2C if I2C select HAVE_S3C2410_WATCHDOG if WATCHDOG select HAVE_TCM - select NEED_MACH_GPIO_H select NO_IOPORT select PLAT_SAMSUNG select PM_GENERIC_DOMAINS
@@ -1592,7 +1591,7 @@ config ARM_PSCI config ARCH_NR_GPIO int default 1024 if ARCH_SHMOBILE || ARCH_TEGRA - default 512 if ARCH_EXYNOS || ARCH_KEYSTONE || SOC_OMAP5 || SOC_DRA7XX || ARCH_S3C24XX + default 512 if ARCH_EXYNOS || ARCH_KEYSTONE || SOC_OMAP5 || SOC_DRA7XX || ARCH_S3C24XX || ARCH_S3C64XX default 392 if ARCH_U8500 default 352 if ARCH_VT8500 default 288 if ARCH_SUNXI
arch/arm/mach-s3c64xx/Kconfig +0 -3
@@ -192,7 +192,6 @@ config SMDK6410_WM1190_EV1 select MFD_WM8350_I2C select REGULATOR select REGULATOR_WM8350 - select SAMSUNG_GPIO_EXTRA64 help The Wolfson Microelectronics 1190-EV1 is a WM835x based PMIC and audio daughtercard for the Samsung SMDK6410 reference
@@ -208,7 +207,6 @@ config SMDK6410_WM1192_EV1 select MFD_WM831X_I2C select REGULATOR select REGULATOR_WM831X - select SAMSUNG_GPIO_EXTRA64 help The Wolfson Microelectronics 1192-EV1 is a WM831x based PMIC daughtercard for the Samsung SMDK6410 reference platform.
@@ -294,7 +292,6 @@ config MACH_WLF_CRAGG_6410 select SAMSUNG_DEV_ADC select SAMSUNG_DEV_KEYPAD select SAMSUNG_DEV_PWM - select SAMSUNG_GPIO_EXTRA128 help Machine support for the Wolfson Cragganmore S3C6410 variant.
arch/arm/mach-s3c64xx/common.c +1 -0
@@ -32,6 +32,7 @@#include <linux/irq.h> #include <linux/gpio.h> #include <linux/irqchip/arm-vic.h> +#include <linux/platform_data/gpio-samsung-s3c64xx.h> #include <clocksource/samsung_pwm.h> #include <asm/mach/arch.h>
arch/arm/mach-s3c64xx/crag6410.h +1 -1
@@ -11,7 +11,7 @@#ifndef MACH_CRAG6410_H #define MACH_CRAG6410_H -#include <linux/gpio.h> +#include <linux/platform_data/gpio-samsung-s3c64xx.h> #define GLENFARCLAS_PMIC_IRQ_BASE IRQ_BOARD_START
arch/arm/mach-s3c64xx/dev-audio.c +1 -0
@@ -21,6 +21,7 @@#include <plat/devs.h> #include <linux/platform_data/asoc-s3c.h> +#include <linux/platform_data/gpio-samsung-s3c64xx.h> #include <plat/gpio-cfg.h> static int s3c64xx_i2s_cfg_gpio (struct platform_device *pdev)
arch/arm/mach-s3c64xx/include/mach/gpio.h deleted +0 -93
93 lines not on this page · raw message
arch/arm/mach-s3c64xx/mach-anw6410.c +1 -0
@@ -43,6 +43,7 @@#include <plat/regs-serial.h> #include <linux/platform_data/i2c-s3c2410.h> +#include <linux/platform_data/gpio-samsung-s3c64xx.h> #include <plat/fb.h> #include <plat/clock.h>
arch/arm/mach-s3c64xx/mach-crag6410.c +1 -0
@@ -32,6 +32,7 @@#include <linux/platform_data/pca953x.h> #include <linux/platform_data/s3c-hsotg.h> +#include <linux/platform_data/gpio-samsung-s3c64xx.h> #include <video/platform_lcd.h>
arch/arm/mach-s3c64xx/mach-hmt.c +1 -0
@@ -35,6 +35,7 @@#include <plat/regs-serial.h> #include <linux/platform_data/i2c-s3c2410.h> +#include <linux/platform_data/gpio-samsung-s3c64xx.h> #include <plat/fb.h> #include <linux/platform_data/mtd-nand-s3c2410.h>
arch/arm/mach-s3c64xx/mach-mini6410.c +1 -0
@@ -38,6 +38,7 @@#include <linux/platform_data/mtd-nand-s3c2410.h> #include <plat/regs-serial.h> #include <linux/platform_data/touchscreen-s3c2410.h> +#include <linux/platform_data/gpio-samsung-s3c64xx.h> #include <video/platform_lcd.h> #include <video/samsung_fimd.h>
arch/arm/mach-s3c64xx/mach-real6410.c +1 -0
@@ -39,6 +39,7 @@#include <linux/platform_data/mtd-nand-s3c2410.h> #include <plat/regs-serial.h> #include <linux/platform_data/touchscreen-s3c2410.h> +#include <linux/platform_data/gpio-samsung-s3c64xx.h> #include <video/platform_lcd.h> #include <video/samsung_fimd.h>
arch/arm/mach-s3c64xx/mach-smartq.c +1 -0
@@ -36,6 +36,7 @@#include <linux/platform_data/usb-ohci-s3c2410.h> #include <plat/sdhci.h> #include <linux/platform_data/touchscreen-s3c2410.h> +#include <linux/platform_data/gpio-samsung-s3c64xx.h> #include <video/platform_lcd.h> #include <plat/samsung-time.h>
arch/arm/mach-s3c64xx/mach-smartq5.c +1 -0
@@ -16,6 +16,7 @@#include <linux/input.h> #include <linux/leds.h> #include <linux/platform_device.h> +#include <linux/platform_data/gpio-samsung-s3c64xx.h> #include <asm/mach-types.h> #include <asm/mach/arch.h>
arch/arm/mach-s3c64xx/mach-smartq7.c +1 -0
@@ -16,6 +16,7 @@#include <linux/input.h> #include <linux/leds.h> #include <linux/platform_device.h> +#include <linux/platform_data/gpio-samsung-s3c64xx.h> #include <asm/mach-types.h> #include <asm/mach/arch.h>
arch/arm/mach-s3c64xx/mach-smdk6400.c +1 -0
@@ -35,6 +35,7 @@#include <plat/devs.h> #include <plat/cpu.h> #include <linux/platform_data/i2c-s3c2410.h> +#include <linux/platform_data/gpio-samsung-s3c64xx.h> #include <plat/samsung-time.h> #include "common.h"
arch/arm/mach-s3c64xx/mach-smdk6410.c +1 -0
@@ -31,6 +31,7 @@#include <linux/regulator/machine.h> #include <linux/pwm_backlight.h> #include <linux/platform_data/s3c-hsotg.h> +#include <linux/platform_data/gpio-samsung-s3c64xx.h> #ifdef CONFIG_SMDK6410_WM1190_EV1 #include <linux/mfd/wm8350/core.h>
arch/arm/mach-s3c64xx/pm.c +1 -0
@@ -18,6 +18,7 @@#include <linux/io.h> #include <linux/gpio.h> #include <linux/pm_domain.h> +#include <linux/platform_data/gpio-samsung-s3c64xx.h> #include <mach/map.h> #include <mach/irqs.h>
arch/arm/mach-s3c64xx/setup-fb-24bpp.c +1 -0
@@ -16,6 +16,7 @@#include <linux/types.h> #include <linux/fb.h> #include <linux/gpio.h> +#include <linux/platform_data/gpio-samsung-s3c64xx.h> #include <plat/fb.h> #include <plat/gpio-cfg.h>
arch/arm/mach-s3c64xx/setup-i2c0.c +1 -0
@@ -19,6 +19,7 @@struct platform_device ;/* don't need the contents */ #include <linux/platform_data/i2c-s3c2410.h> +#include <linux/platform_data/gpio-samsung-s3c64xx.h> #include <plat/gpio-cfg.h> void s3c_i2c0_cfg_gpio (struct platform_device *dev)
arch/arm/mach-s3c64xx/setup-i2c1.c +1 -0
@@ -19,6 +19,7 @@struct platform_device ;/* don't need the contents */ #include <linux/platform_data/i2c-s3c2410.h> +#include <linux/platform_data/gpio-samsung-s3c64xx.h> #include <plat/gpio-cfg.h> void s3c_i2c1_cfg_gpio (struct platform_device *dev)
arch/arm/mach-s3c64xx/setup-ide.c +1 -0
@@ -18,6 +18,7 @@#include <mach/regs-clock.h> #include <plat/gpio-cfg.h> #include <linux/platform_data/ata-samsung_cf.h> +#include <linux/platform_data/gpio-samsung-s3c64xx.h> void s3c64xx_ide_setup_gpio (void ) {
arch/arm/mach-s3c64xx/setup-keypad.c +1 -0
@@ -11,6 +11,7 @@*/ #include <linux/gpio.h> +#include <linux/platform_data/gpio-samsung-s3c64xx.h> #include <plat/gpio-cfg.h> #include <plat/keypad.h>
arch/arm/mach-s3c64xx/setup-sdhci-gpio.c +1 -0
@@ -17,6 +17,7 @@#include <linux/platform_device.h> #include <linux/io.h> #include <linux/gpio.h> +#include <linux/platform_data/gpio-samsung-s3c64xx.h> #include <plat/gpio-cfg.h> #include <plat/sdhci.h>
arch/arm/mach-s3c64xx/setup-spi.c +1 -0
@@ -9,6 +9,7 @@*/ #include <linux/gpio.h> +#include <linux/platform_data/gpio-samsung-s3c64xx.h> #include <plat/gpio-cfg.h> #ifdef CONFIG_S3C64XX_DEV_SPI0
arch/arm/plat-samsung/pm-gpio.c +3 -0
@@ -22,6 +22,9 @@#ifdef CONFIG_ARCH_S3C24XX #include <linux/platform_data/gpio-samsung-s3c24xx.h> #endif +#ifdef CONFIG_ARCH_S3C64XX +#include <linux/platform_data/gpio-samsung-s3c64xx.h> +#endif #include <plat/gpio-core.h> #include <plat/pm.h>
drivers/gpio/gpio-samsung.c +3 -0
@@ -30,6 +30,9 @@#ifdef CONFIG_ARCH_S3C24XX #include <linux/platform_data/gpio-samsung-s3c24xx.h> #endif +#ifdef CONFIG_ARCH_S3C64XX +#include <linux/platform_data/gpio-samsung-s3c64xx.h> +#endif #include <asm/irq.h>
include/linux/platform_data/gpio-samsung-s3c64xx.h new file +94 -0
94 lines not on this page · raw message
Signature · 1 line
1.8.3.1
PATCH v2 2/2 ARM: s3c64xx: get rid of custom <mach/gpio.h>
Hi Linus,
Quoted 28 lines · On Friday 13 of December 2013 13:53:54 Linus Walleij wrote:
This isolates the custom S3C64xx GPIO definition table to <
linux/platform_data/gpio-samsung-s3x64xx.h> as this is used in a few different places in the kernel, removing the need to depend on the implicit inclusion of <mach/gpio.h> from <linux/gpio.h> and thus getting rid of a few nasty cross-dependencies.Also delete the
CONFIG_SAMSUNG_GPIO_EXTRAstuff. Instead roof the number of GPIOs for this platform:
First sum up all the GPIO banks from A to Q: 187 GPIOs. Add the 16 "board GPIOs" and the roof forSAMSUNG_GPIO_EXTRA, 128, so in total maximum 187+16+128 = 331 GPIOs, so let's take the same roof as for S3C24XX: 512. This way we can do away with the GPIO calculation macros forGPIO_BOARD_START,BOARD_NR_GPIOSand the definition ofARCH_NR_GPIOS.Cc Mark Brown <[email protected]>Cc Tomasz Figa <[email protected]>Acked-by Kukjin Kim <[email protected]>Signed-off-by Linus Walleij <[email protected]>---
ChangeLogv1->v2:
- Move the movement of the actualgpio.hfile into this patch after mistakenly having it end up in the S3C24xx patch.
- Add a missing ifdef for thepm-gpio.ccode in plat-samsung.
Quoted 4 lines
This patch depends on
"ARM: s3c24xx: get rid of custom <mach/gpio.h>"I will take this through the GPIO tree.
Best regards,
Tomasz
PATCH v2 2/2 ARM: s3c64xx: get rid of custom <mach/gpio.h>
In reply to Linus WalleijQuoted 6 lines · Linus Walleij
This isolates the custom S3C64xx GPIO definition table to <
linux/platform_data/gpio-samsung-s3x64xx.h> as this is used in a few different places in the kernel, removing the need to depend on the implicit inclusion of <mach/gpio.h> from <linux/gpio.h> and thus getting rid of a few nasty cross-dependencies.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20131218/4252177e/attachment.sig>