Commit 3929e1e7 authored by Maurus Cuelenaere's avatar Maurus Cuelenaere Committed by Ben Dooks

ARM: SAMSUNG: Move S3C24XX ADC driver to plat-samsung

Move S3C24XX ADC driver to plat-samsung
Signed-off-by: default avatarMaurus Cuelenaere <mcuelenaere@gmail.com>
Signed-off-by: default avatarBen Dooks <ben-linux@fluff.org>
parent 501dae90
...@@ -184,7 +184,7 @@ CONFIG_S3C24XX_PWM=y ...@@ -184,7 +184,7 @@ CONFIG_S3C24XX_PWM=y
CONFIG_S3C24XX_GPIO_EXTRA=0 CONFIG_S3C24XX_GPIO_EXTRA=0
CONFIG_S3C2410_DMA=y CONFIG_S3C2410_DMA=y
# CONFIG_S3C2410_DMA_DEBUG is not set # CONFIG_S3C2410_DMA_DEBUG is not set
CONFIG_S3C24XX_ADC=y CONFIG_S3C_ADC=y
CONFIG_PLAT_S3C=y CONFIG_PLAT_S3C=y
CONFIG_CPU_LLSERIAL_S3C2440_ONLY=y CONFIG_CPU_LLSERIAL_S3C2440_ONLY=y
CONFIG_CPU_LLSERIAL_S3C2440=y CONFIG_CPU_LLSERIAL_S3C2440=y
......
...@@ -187,7 +187,7 @@ CONFIG_S3C24XX_GPIO_EXTRA128=y ...@@ -187,7 +187,7 @@ CONFIG_S3C24XX_GPIO_EXTRA128=y
CONFIG_PM_SIMTEC=y CONFIG_PM_SIMTEC=y
CONFIG_S3C2410_DMA=y CONFIG_S3C2410_DMA=y
# CONFIG_S3C2410_DMA_DEBUG is not set # CONFIG_S3C2410_DMA_DEBUG is not set
CONFIG_S3C24XX_ADC=y CONFIG_S3C_ADC=y
CONFIG_MACH_SMDK=y CONFIG_MACH_SMDK=y
CONFIG_PLAT_S3C=y CONFIG_PLAT_S3C=y
CONFIG_CPU_LLSERIAL_S3C2410=y CONFIG_CPU_LLSERIAL_S3C2410=y
......
...@@ -117,13 +117,6 @@ config S3C2410_DMA_DEBUG ...@@ -117,13 +117,6 @@ config S3C2410_DMA_DEBUG
Enable debugging output for the DMA code. This option sends info Enable debugging output for the DMA code. This option sends info
to the kernel log, at priority KERN_DEBUG. 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 # SPI default pin configuration code
config S3C24XX_SPI_BUS0_GPE11_GPE12_GPE13 config S3C24XX_SPI_BUS0_GPE11_GPE12_GPE13
......
...@@ -38,7 +38,6 @@ obj-$(CONFIG_PM) += irq-pm.o ...@@ -38,7 +38,6 @@ obj-$(CONFIG_PM) += irq-pm.o
obj-$(CONFIG_PM) += sleep.o obj-$(CONFIG_PM) += sleep.o
obj-$(CONFIG_S3C2410_CLOCK) += s3c2410-clock.o obj-$(CONFIG_S3C2410_CLOCK) += s3c2410-clock.o
obj-$(CONFIG_S3C2410_DMA) += dma.o obj-$(CONFIG_S3C2410_DMA) += dma.o
obj-$(CONFIG_S3C24XX_ADC) += adc.o
obj-$(CONFIG_S3C2410_IOTIMING) += s3c2410-iotiming.o obj-$(CONFIG_S3C2410_IOTIMING) += s3c2410-iotiming.o
obj-$(CONFIG_S3C2412_IOTIMING) += s3c2412-iotiming.o obj-$(CONFIG_S3C2412_IOTIMING) += s3c2412-iotiming.o
obj-$(CONFIG_S3C2410_CPUFREQ_UTILS) += s3c2410-cpufreq-utils.o obj-$(CONFIG_S3C2410_CPUFREQ_UTILS) += s3c2410-cpufreq-utils.o
......
...@@ -74,6 +74,15 @@ config SAMSUNG_GPIO_EXTRA ...@@ -74,6 +74,15 @@ config SAMSUNG_GPIO_EXTRA
provides. This allows expanding the GPIO space for use with provides. This allows expanding the GPIO space for use with
GPIO expanders. GPIO expanders.
# ADC driver
config S3C_ADC
bool "ADC common driver support"
help
Core support for the ADC block found in the Samsung SoC systems
for drivers such as the touchscreen and hwmon to use to share
this resource.
# device definitions to compile in # device definitions to compile in
config S3C_DEV_HSMMC config S3C_DEV_HSMMC
......
...@@ -20,6 +20,10 @@ obj-$(CONFIG_SAMSUNG_CLKSRC) += clock-clksrc.o ...@@ -20,6 +20,10 @@ obj-$(CONFIG_SAMSUNG_CLKSRC) += clock-clksrc.o
obj-$(CONFIG_SAMSUNG_IRQ_UART) += irq-uart.o obj-$(CONFIG_SAMSUNG_IRQ_UART) += irq-uart.o
obj-$(CONFIG_SAMSUNG_IRQ_VIC_TIMER) += irq-vic-timer.o obj-$(CONFIG_SAMSUNG_IRQ_VIC_TIMER) += irq-vic-timer.o
# ADC
obj-$(CONFIG_S3C_ADC) += adc.o
# devices # devices
obj-$(CONFIG_S3C_DEV_HSMMC) += dev-hsmmc.o obj-$(CONFIG_S3C_DEV_HSMMC) += dev-hsmmc.o
......
/* arch/arm/plat-s3c24xx/adc.c /* arch/arm/plat-samsung/adc.c
* *
* Copyright (c) 2008 Simtec Electronics * Copyright (c) 2008 Simtec Electronics
* http://armlinux.simtec.co.uk/ * http://armlinux.simtec.co.uk/
* Ben Dooks <ben@simtec.co.uk>, <ben-linux@fluff.org> * Ben Dooks <ben@simtec.co.uk>, <ben-linux@fluff.org>
* *
* S3C24XX ADC device core * Samsung ADC device core
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
......
/* arch/arm/plat-s3c/include/plat/adc.h /* arch/arm/plat-samsung/include/plat/adc.h
* *
* Copyright (c) 2008 Simtec Electronics * Copyright (c) 2008 Simtec Electronics
* http://armlinux.simnte.co.uk/ * http://armlinux.simnte.co.uk/
* Ben Dooks <ben@simtec.co.uk> * Ben Dooks <ben@simtec.co.uk>
* *
* S3C24XX ADC driver information * S3C ADC driver information
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as * it under the terms of the GNU General Public License version 2 as
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment