ARM: SAMSUNG: Moving ADC device definition to plat-samsung.
Subsystems (3)
PATCH v2 1/9 ARM: SAMSUNG: Moving ADC device definition to plat-samsung.
From: Naveen Krishna <[email protected]>
This patch moves ADC device definition to plat-samsung. Because that is generic to the S3C64XX and S5P Series SoCs.
Signed-off-by Naveen Krishna Ch <[email protected]>
Signed-off-by Kukjin Kim <[email protected]>
--- arch/arm/mach-s3c64xx/Kconfig | 1 + arch/arm/mach-s3c64xx/Makefile | 1 - arch/arm/mach-s3c64xx/dev-adc.c | 46 ------------------------------ arch/arm/mach-s3c64xx/include/mach/map.h | 1 + arch/arm/mach-s3c64xx/s3c6410.c | 2 + arch/arm/plat-samsung/Kconfig | 5 +++ arch/arm/plat-samsung/Makefile | 1 + arch/arm/plat-samsung/dev-adc.c | 46 ++++++++++++++++++++++++++++++ 8 files changed, 56 insertions(+), 47 deletions(-) delete mode 100644 arch/arm/mach-s3c64xx/dev-adc.c create mode 100644 arch/arm/plat-samsung/dev-adc.c
arch/arm/mach-s3c64xx/Kconfig +1 -0
@@ -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
@@ -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/dev-adc.c deleted +0 -46
46 lines not on this page · raw message
arch/arm/mach-s3c64xx/include/mach/map.h +1 -0
@@ -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
@@ -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
@@ -185,6 +185,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
arch/arm/plat-samsung/Makefile +1 -0
@@ -40,6 +40,7 @@ obj-y += dev-uart.o obj-$(CONFIG_S3C_DEV_USB_HOST) += dev-usb.o obj-$(CONFIG_S3C_DEV_USB_HSOTG) += dev-usb-hsotg.o obj-$(CONFIG_S3C_DEV_NAND) += dev-nand.o +obj-$(CONFIG_SAMSUNG_DEV_ADC) += dev-adc.o # DMA support
arch/arm/plat-samsung/dev-adc.c new file +46 -0
46 lines not on this page · raw message
Signature · 1 line
1.6.2.5
PATCH v2 1/9 ARM: SAMSUNG: Moving ADC device definition to plat-samsung.
next time, please ensure your git has rename detection turned on
Signature · 4 lines
Ben Q: What's a light-year? A: One-third less calories than a regular year.