From patchwork Sun Jul 8 17:12:21 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juergen Borleis X-Patchwork-Id: 1169921 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork1.kernel.org (Postfix) with ESMTP id CFE4E3FD4F for ; Sun, 8 Jul 2012 17:31:45 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1SnvA4-0003Eh-Jm; Sun, 08 Jul 2012 17:20:44 +0000 Received: from metis.ext.pengutronix.de ([2001:6f8:1178:4:290:27ff:fe1d:cc33]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1Snv2A-0001oY-DD for linux-arm-kernel@lists.infradead.org; Sun, 08 Jul 2012 17:12:46 +0000 Received: from dude.hi.pengutronix.de ([2001:6f8:1178:2:21e:67ff:fe11:9c5c]) by metis.ext.pengutronix.de with esmtp (Exim 4.72) (envelope-from ) id 1Snv23-0006yK-Mv for linux-arm-kernel@lists.infradead.org; Sun, 08 Jul 2012 19:12:27 +0200 Received: from jbe by dude.hi.pengutronix.de with local (Exim 4.80) (envelope-from ) id 1Snv22-0004Yt-QB for linux-arm-kernel@lists.infradead.org; Sun, 08 Jul 2012 19:12:26 +0200 From: Juergen Beisert To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 07/10] MACH/Samsung/Mini2440: add hwmon capabilities to mini2440 Date: Sun, 8 Jul 2012 19:12:21 +0200 Message-Id: <1341767544-17447-8-git-send-email-jbe@pengutronix.de> X-Mailer: git-send-email 1.7.10 In-Reply-To: <1341767544-17447-1-git-send-email-jbe@pengutronix.de> References: <1341767544-17447-1-git-send-email-jbe@pengutronix.de> X-SA-Exim-Connect-IP: 2001:6f8:1178:2:21e:67ff:fe11:9c5c X-SA-Exim-Mail-From: jbe@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-arm-kernel@lists.infradead.org X-Spam-Note: CRM114 invocation failed X-Spam-Score: -1.9 (-) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-1.9 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 T_RP_MATCHES_RCVD Envelope sender domain matches handover relay domain -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org This adds the internal 8 ADC channels to the sysfs. They can be reached via: /sys/devices/platform/s3c24xx-adc/s3c-hwmon Signed-off-by: Juergen Beisert --- arch/arm/mach-s3c24xx/Kconfig | 1 + arch/arm/mach-s3c24xx/mach-mini2440.c | 50 +++++++++++++++++++++++++++++++++ 2 files changed, 51 insertions(+) diff --git a/arch/arm/mach-s3c24xx/Kconfig b/arch/arm/mach-s3c24xx/Kconfig index 0e65445..4f42b7e 100644 --- a/arch/arm/mach-s3c24xx/Kconfig +++ b/arch/arm/mach-s3c24xx/Kconfig @@ -406,6 +406,7 @@ config MACH_MINI2440 select S3C_DEV_NAND select S3C_DEV_USB_HOST select TOUCHSCREEN_S3C2410 + select S3C_DEV_HWMON help Say Y here to select support for the MINI2440. Is a 10cm x 10cm board available via various sources. It can come with a 3.5" or 7" touch LCD. diff --git a/arch/arm/mach-s3c24xx/mach-mini2440.c b/arch/arm/mach-s3c24xx/mach-mini2440.c index fd5fe9d..36149ed 100644 --- a/arch/arm/mach-s3c24xx/mach-mini2440.c +++ b/arch/arm/mach-s3c24xx/mach-mini2440.c @@ -57,6 +57,7 @@ #include #include #include +#include #include @@ -548,6 +549,53 @@ static struct s3c2410_ts_mach_info mini2440_ts_cfg __initdata = { .oversampling_shift = 0, }; +static struct s3c_hwmon_chcfg mini2440_adc_chcfg[8] = { + { + .name = "AIN0", /* connected to CON4/5 and W1 */ + .mult = 3300, + .div = 1023, + }, { + .name = "AIN1", /* connected to CON4/6 */ + .mult = 3300, + .div = 1023, + }, { + .name = "AIN2", /* connected to CON4/7 */ + .mult = 3300, + .div = 1023, + }, { + .name = "AIN3", /* connected to CON4/8 */ + .mult = 3300, + .div = 1023, + }, { + .name = "TSYM", + .mult = 3300, + .div = 1023, + }, { + .name = "TSYP", + .mult = 3300, + .div = 1023, + }, { + .name = "TSXM", + .mult = 3300, + .div = 1023, + }, { + .name = "TSXP", + .mult = 3300, + .div = 1023, + }, +}; + +static struct s3c_hwmon_pdata mini2440_adc __initdata = { + .in[0] = &mini2440_adc_chcfg[0], + .in[1] = &mini2440_adc_chcfg[1], + .in[2] = &mini2440_adc_chcfg[2], + .in[3] = &mini2440_adc_chcfg[3], + .in[4] = &mini2440_adc_chcfg[4], + .in[5] = &mini2440_adc_chcfg[5], + .in[6] = &mini2440_adc_chcfg[6], + .in[7] = &mini2440_adc_chcfg[7], +}; + static struct platform_device *mini2440_devices[] __initdata = { &s3c_device_ohci, &s3c_device_wdt, @@ -564,6 +612,7 @@ static struct platform_device *mini2440_devices[] __initdata = { &mini2440_audio, &samsung_asoc_dma, &s3c_device_adc, + &s3c_device_hwmon, }; static void __init mini2440_map_io(void) @@ -721,6 +770,7 @@ static void __init mini2440_init(void) s3c_nand_set_platdata(&mini2440_nand_info); s3c_i2c0_set_platdata(NULL); s3c24xx_ts_set_platdata(&mini2440_ts_cfg); + s3c_hwmon_set_platdata(&mini2440_adc); i2c_register_board_info(0, mini2440_i2c_devs, ARRAY_SIZE(mini2440_i2c_devs));