Browse Source

ARM: s3c24xx: explicit dependency on <plat/gpio-cfg.h>

Previously the custom GPIO header for the S3C24xx would in turn
bring in the custom pin control implementation from
<plat/gpio-cfg.h>. This is not good as it mixes up two
subsystems and makes the dependencies hard to track. Make
the dependency explicit by explicitly including the pin
control header where needed.

Reported-by: Arnd Bergmann <arnd@arndb.de>
Cc: Tomasz Figa <tomasz.figa@gmail.com>
Cc: Sylwester Nawrocki <sylvester.nawrocki@gmail.com>
Cc: Ben Dooks <ben-linux@fluff.org>
Cc: Kukjin Kim <kgene.kim@samsung.com>
Cc: Mark Brown <broonie@kernel.org>
Cc: linux-samsung-soc@vger.kernel.org
Acked-by: Heiko Stuebner <heiko@sntech.de>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
isee-imx_3.14.28.y
Linus Walleij 7 years ago
parent
commit
364374121b
6 changed files with 5 additions and 2 deletions
  1. +1
    -0
      arch/arm/mach-s3c24xx/h1940-bluetooth.c
  2. +0
    -2
      arch/arm/mach-s3c24xx/include/mach/gpio-samsung.h
  3. +1
    -0
      arch/arm/mach-s3c24xx/mach-rx1950.c
  4. +1
    -0
      arch/arm/mach-s3c24xx/pm-s3c2410.c
  5. +1
    -0
      arch/arm/mach-s3c24xx/setup-ts.c
  6. +1
    -0
      drivers/mmc/host/s3cmci.c

+ 1
- 0
arch/arm/mach-s3c24xx/h1940-bluetooth.c View File

@ -19,6 +19,7 @@
#include <linux/gpio.h>
#include <linux/rfkill.h>
#include <plat/gpio-cfg.h>
#include <mach/hardware.h>
#include <mach/regs-gpio.h>
#include <mach/gpio-samsung.h>


+ 0
- 2
arch/arm/mach-s3c24xx/include/mach/gpio-samsung.h View File

@ -93,8 +93,6 @@ enum s3c_gpio_number {
#define S3C2410_GPL(_nr) (S3C2410_GPIO_L_START + (_nr))
#define S3C2410_GPM(_nr) (S3C2410_GPIO_M_START + (_nr))
#include <plat/gpio-cfg.h>
#ifdef CONFIG_CPU_S3C244X
#define S3C_GPIO_END (S3C2410_GPJ(0) + 32)
#elif defined(CONFIG_CPU_S3C2443) || defined(CONFIG_CPU_S3C2416)


+ 1
- 0
arch/arm/mach-s3c24xx/mach-rx1950.c View File

@ -59,6 +59,7 @@
#include <plat/pm.h>
#include <plat/regs-serial.h>
#include <plat/samsung-time.h>
#include <plat/gpio-cfg.h>
#include "common.h"
#include "h1940.h"


+ 1
- 0
arch/arm/mach-s3c24xx/pm-s3c2410.c View File

@ -35,6 +35,7 @@
#include <mach/regs-gpio.h>
#include <mach/gpio-samsung.h>
#include <plat/gpio-cfg.h>
#include <plat/cpu.h>
#include <plat/pm.h>


+ 1
- 0
arch/arm/mach-s3c24xx/setup-ts.c View File

@ -15,6 +15,7 @@
struct platform_device; /* don't need the contents */
#include <plat/gpio-cfg.h>
#include <mach/hardware.h>
#include <mach/gpio-samsung.h>


+ 1
- 0
drivers/mmc/host/s3cmci.c View File

@ -23,6 +23,7 @@
#include <linux/irq.h>
#include <linux/io.h>
#include <plat/gpio-cfg.h>
#include <mach/dma.h>
#include <mach/gpio-samsung.h>


Loading…
Cancel
Save