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

Commit 8e2376ab authored by Ben Dooks's avatar Ben Dooks
Browse files

ARM: Merge next-samsung-mc-adc 

Merge branch 'next-samsung-mc-adc' into next-samsung-try5

Conflicts:
	arch/arm/mach-s3c6400/include/mach/map.h
	(fix ADC and RTC merge)
parents 71269364 bcedfa98

arch/arm/configs/mini2440_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -184,7 +184,7 @@ CONFIG_S3C24XX_PWM=y 
CONFIG_S3C24XX_GPIO_EXTRA=0

CONFIG_S3C2410_DMA=y

# CONFIG_S3C2410_DMA_DEBUG is not set

CONFIG_S3C24XX_ADC=y

CONFIG_S3C_ADC=y

CONFIG_PLAT_S3C=y

CONFIG_CPU_LLSERIAL_S3C2440_ONLY=y

CONFIG_CPU_LLSERIAL_S3C2440=y

arch/arm/configs/s3c2410_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -187,7 +187,7 @@ CONFIG_S3C24XX_GPIO_EXTRA128=y 
CONFIG_PM_SIMTEC=y

CONFIG_S3C2410_DMA=y

# CONFIG_S3C2410_DMA_DEBUG is not set

CONFIG_S3C24XX_ADC=y

CONFIG_S3C_ADC=y

CONFIG_MACH_SMDK=y

CONFIG_PLAT_S3C=y

CONFIG_CPU_LLSERIAL_S3C2410=y

arch/arm/mach-s3c6400/include/mach/map.h

+1 −0
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ 
#define S3C64XX_PA_USB_HSOTG	(0x7C000000)

#define S3C64XX_PA_WATCHDOG	(0x7E004000)

#define S3C64XX_PA_RTC		(0x7E005000)

#define S3C64XX_PA_ADC		(0x7E00B000)

#define S3C64XX_PA_SYSCON	(0x7E00F000)

#define S3C64XX_PA_AC97		(0x7F001000)

#define S3C64XX_PA_IIS0		(0x7F002000)

arch/arm/plat-s3c/include/plat/regs-adc.h

+3 −0
Original line number Diff line number Diff line
@@ -19,6 +19,9 @@ 
#define S3C2410_ADCDLY	   S3C2410_ADCREG(0x08)

#define S3C2410_ADCDAT0	   S3C2410_ADCREG(0x0C)

#define S3C2410_ADCDAT1	   S3C2410_ADCREG(0x10)

#define S3C64XX_ADCUPDN		S3C2410_ADCREG(0x14)

#define S3C64XX_ADCCLRINT	S3C2410_ADCREG(0x18)

#define S3C64XX_ADCCLRINTPNDNUP	S3C2410_ADCREG(0x20)





/* ADCCON Register Bits */

arch/arm/plat-s3c24xx/Kconfig

+0 −7
Original line number Diff line number Diff line
@@ -117,13 +117,6 @@ config S3C2410_DMA_DEBUG 
	  Enable debugging output for the DMA code. This option sends info

	  to the kernel log, at priority KERN_DEBUG.



config S3C24XX_ADC

	bool "ADC common driver support"

	help

	  Core support for the ADC block found in the S3C24XX SoC systems

	  for drivers such as the touchscreen and hwmon to use to share

	  this resource.



# SPI default pin configuration code



config S3C24XX_SPI_BUS0_GPE11_GPE12_GPE13