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

Commit 05a690d2 authored by Ben Dooks's avatar Ben Dooks
Browse files

ARM: Merge for-2635/samsung-ts 

Merge branch 'for-2635/samsung-ts' into for-linus/samsung2
parents 1770a898 4f7cdc38

arch/arm/mach-s3c64xx/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -85,6 +85,7 @@ config MACH_ANW6410 
config MACH_SMDK6410

	bool "SMDK6410"

	select CPU_S3C6410

	select SAMSUNG_DEV_ADC

	select S3C_DEV_HSMMC

	select S3C_DEV_HSMMC1

	select S3C_DEV_I2C1

arch/arm/mach-s3c64xx/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -58,5 +58,4 @@ obj-$(CONFIG_MACH_HMT) += mach-hmt.o 
obj-y				+= dev-uart.o

obj-y				+= dev-rtc.o

obj-y				+= dev-audio.o

obj-$(CONFIG_S3C_ADC)		+= dev-adc.o

obj-$(CONFIG_S3C64XX_DEV_SPI)	+= dev-spi.o

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

+1 −0
Original line number Diff line number Diff line
@@ -103,5 +103,6 @@ 
#define S3C_PA_USBHOST		S3C64XX_PA_USBHOST

#define S3C_PA_USB_HSOTG	S3C64XX_PA_USB_HSOTG

#define S3C_VA_USB_HSPHY	S3C64XX_VA_USB_HSPHY

#define SAMSUNG_PA_ADC		S3C64XX_PA_ADC



#endif /* __ASM_ARCH_6400_MAP_H */

arch/arm/mach-s3c64xx/s3c6410.c

+2 −0
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ 
#include <plat/clock.h>

#include <plat/sdhci.h>

#include <plat/iic-core.h>

#include <plat/adc.h>

#include <mach/s3c6400.h>

#include <mach/s3c6410.h>
@@ -52,6 +53,7 @@ void __init s3c6410_map_io(void) 
	s3c_i2c0_setname("s3c2440-i2c");

	s3c_i2c1_setname("s3c2440-i2c");



	s3c_device_adc.name	= "s3c64xx-adc";

	s3c_device_nand.name = "s3c6400-nand";

}

arch/arm/plat-samsung/Kconfig

+5 −0
Original line number Diff line number Diff line
@@ -190,6 +190,11 @@ config S3C_DEV_NAND 
	help

	  Compile in platform device definition for NAND controller



config SAMSUNG_DEV_ADC

	bool

	help

	  Compile in platform device definition for ADC controller



config S3C64XX_DEV_SPI

	bool

	help