Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 349e1fba authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus/samsung4' of git://git.fluff.org/bjdooks/linux 

* 'for-linus/samsung4' of git://git.fluff.org/bjdooks/linux: (98 commits)
  Input: s3c24xx_ts - depend on SAMSUNG_DEV_TS and update menu entry
  Input: s3c24xx_ts - Add FEAT for Samsung touchscreen support
  Input: s3c24xx_ts - Implement generic GPIO configuration callback
  ARM: SAMSUNG: Move s3c64xx dev-ts.c to plat-samsung and rename configuration
  ARM: SAMSUNG: Implements cfg_gpio function for Samsung touchscreen
  ARM: S3C64XX: Add touchscreen platform device definition
  ARM: SAMSUNG: Move mach/ts.h to plat/ts.h
  ARM: S5PC100: Move i2c helpers from plat-s5pc1xx to mach-s5pc100
  ARM: S5PC100: Move frame buffer helpers from plat-s5pc1xx to mach-s5pc100
  ARM: S5PC100: gpio.h cleanup
  ARM: S5PC100: Move gpio support from plat-s5pc1xx to mach-s5pc100
  ARM: S5PC100: Use common functions for gpiolib implementation
  drivers: serial: S5PC100 serial driver cleanup
  ARM: S5PC100: Pre-requisite clock patch for plat-s5pc1xx to plat-s5p move
  ARM: SAMSUNG: Copy common I2C0 device helpers to machine directories
  ARM: SAMSUNG: move driver strength gpio configuration helper to common dir
  ARM: S5PV210: Add GPIOlib support
  ARM: SAMSUNGy: fix broken timer irq base
  ARM: SMDK6440: Add audio devices on board
  ARM: S5P6440: Add audio platform devices
  ...
parents fa9dc265 504d36e9

arch/arm/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -110,6 +110,8 @@ CHECKFLAGS += -D__arm__ 
head-y		:= arch/arm/kernel/head$(MMUEXT).o arch/arm/kernel/init_task.o

textofs-y	:= 0x00008000

textofs-$(CONFIG_ARCH_CLPS711X) := 0x00028000

# We don't want the htc bootloader to corrupt kernel during resume

textofs-$(CONFIG_PM_H1940)      := 0x00108000

# SA1111 DMA bug: we don't want the kernel to live in precious DMA-able memory

ifeq ($(CONFIG_ARCH_SA1100),y)

textofs-$(CONFIG_SA1111) := 0x00208000

arch/arm/mach-s3c2410/Kconfig

+9 −0
Original line number Diff line number Diff line
@@ -77,6 +77,7 @@ config ARCH_H1940 
	select PM_H1940 if PM

	select S3C_DEV_USB_HOST

	select S3C_DEV_NAND

	select S3C2410_SETUP_TS

	help

	  Say Y here if you are using the HP IPAQ H1940
@@ -96,12 +97,19 @@ config PM_H1940 
config MACH_N30

	bool "Acer N30 family"

	select CPU_S3C2410

	select MACH_N35

	select S3C_DEV_USB_HOST

	select S3C_DEV_NAND

	help

	  Say Y here if you want suppt for the Acer N30, Acer N35,

	  Navman PiN570, Yakumo AlphaX or Airis NC05 PDAs.



config MACH_N35

	bool

	help

	  Internal node in order to enable support for Acer N35 if Acer N30 is

	  selected.



config ARCH_BAST

	bool "Simtec Electronics BAST (EB2410ITX)"

	select CPU_S3C2410
@@ -111,6 +119,7 @@ config ARCH_BAST 
	select MACH_BAST_IDE

	select S3C24XX_DCLK

	select ISA

	select S3C_DEV_HWMON

	select S3C_DEV_USB_HOST

	select S3C_DEV_NAND

	help

arch/arm/mach-s3c2410/Makefile.boot

+7 −3
Original line number Diff line number Diff line 
ifeq ($(CONFIG_PM_H1940),y)

	zreladdr-y		:= 0x30108000

	params_phys-y	:= 0x30100100

else

	zreladdr-y		:= 0x30008000

	params_phys-y	:= 0x30000100

endif

arch/arm/mach-s3c2410/include/mach/gpio-nrs.h

+19 −6
Original line number Diff line number Diff line
@@ -16,15 +16,28 @@ 


#define S3C2410_GPIONO(bank,offset) ((bank) + (offset))



#define S3C2410_GPIO_BANKA   (32*0)

#define S3C2410_GPIO_BANKB   (32*1)

#define S3C2410_GPIO_BANKC   (32*2)

#define S3C2410_GPIO_BANKD   (32*3)

#define S3C2410_GPIO_BANKE   (32*4)

#define S3C2410_GPIO_BANKF   (32*5)

#define S3C2410_GPIO_BANKG   (32*6)

#define S3C2410_GPIO_BANKH   (32*7)



/* GPIO sizes for various SoCs:

 *

 *             2442

 *   2410 2412 2440 2443 2416

 *   ---- ---- ---- ---- ----

 * A 23   22   25   16   25

 * B 11   11   11   11   9

 * C 16   15   16   16   16

 * D 16   16   16   16   16

 * E 16   16   16   16   16

 * F 8    8    8    8    8

 * G 16   16   16   16   8

 * H 11   11   9    15   15

 * J --   --   13   16   --

 * K --   --   --   --   16

 * L --   --   --   15   7

 * M --   --   --   2    2

 */



/* GPIO bank sizes */

#define S3C2410_GPIO_A_NR	(32)

#define S3C2410_GPIO_B_NR	(32)

arch/arm/mach-s3c2410/include/mach/gpio-track.h

+2 −2
Original line number Diff line number Diff line
@@ -23,11 +23,11 @@ static inline struct s3c_gpio_chip *s3c_gpiolib_getchip(unsigned int pin) 
{

	struct s3c_gpio_chip *chip;



	if (pin > S3C2410_GPG(10))

	if (pin > S3C_GPIO_END)

		return NULL;



	chip = &s3c24xx_gpios[pin/32];

	return (S3C2410_GPIO_OFFSET(pin) < chip->chip.ngpio) ? chip : NULL;

	return ((pin - chip->chip.base) < chip->chip.ngpio) ? chip : NULL;

}



#endif /* __ASM_ARCH_GPIO_CORE_H */