From patchwork Wed Jun 5 08:57:08 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Shiyan X-Patchwork-Id: 2667801 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) by patchwork2.kernel.org (Postfix) with ESMTP id 85269DF264 for ; Wed, 5 Jun 2013 08:58:22 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Uk9Xb-00045Q-2U; Wed, 05 Jun 2013 08:57:59 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1Uk9XS-0004Lf-Mu; Wed, 05 Jun 2013 08:57:50 +0000 Received: from smtp1.mail.ru ([94.100.176.129]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Uk9XL-0004JF-0h for linux-arm-kernel@lists.infradead.org; Wed, 05 Jun 2013 08:57:46 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mail.ru; s=mail2; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From; bh=ucaNFZgLYB/jj2rKxB5v9+2gVyLGIXbHfq19Qas9PkA=; b=OPy/H2p95CTZxti9Kr3boBP6PyEvKVURTScMKZ9g1cvevt7UervHeYUYXEhxLuMm9+UtTHh5hiG5dl+TYdKSfLPfwF+wJbf+krsf3raWWufUBRY3j5AnTsMm7Ywxy6VAwgBfwbB1KFohRQSLmYIohriR3LFJL1+LunrzYFKBWHk=; Received: from [188.134.40.128] (port=20699 helo=shc.zet) by smtp1.mail.ru with esmtpa (envelope-from ) id 1Uk9Wy-0004Db-ND; Wed, 05 Jun 2013 12:57:20 +0400 From: Alexander Shiyan To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 2/2] hwmon: mc13783-adc: Rename unit to indicate various MC13xxx chips support Date: Wed, 5 Jun 2013 12:57:08 +0400 Message-Id: <1370422628-1073-2-git-send-email-shc_work@mail.ru> X-Mailer: git-send-email 1.8.1.5 In-Reply-To: <1370422628-1073-1-git-send-email-shc_work@mail.ru> References: <1370422628-1073-1-git-send-email-shc_work@mail.ru> X-Spam: Not detected X-Mras: Ok X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130605_045743_588095_B3565ADC X-CRM114-Status: UNSURE ( 9.43 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -2.0 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (shc_work[at]mail.ru) -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [94.100.176.129 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature Cc: Russell King , Alexander Shiyan , Arnd Bergmann , lm-sensors@lm-sensors.org, Olof Johansson , Sascha Hauer , Jean Delvare , Shawn Guo , Guenter Roeck X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org Signed-off-by: Alexander Shiyan --- arch/arm/configs/imx_v4_v5_defconfig | 2 +- drivers/hwmon/Kconfig | 10 +++++----- drivers/hwmon/Makefile | 2 +- drivers/hwmon/{mc13783-adc.c => mc13xxx-adc.c} | 0 4 files changed, 7 insertions(+), 7 deletions(-) rename drivers/hwmon/{mc13783-adc.c => mc13xxx-adc.c} (100%) diff --git a/drivers/hwmon/mc13783-adc.c b/drivers/hwmon/mc13xxx-adc.c similarity index 100% rename from drivers/hwmon/mc13783-adc.c rename to drivers/hwmon/mc13xxx-adc.c diff --git a/arch/arm/configs/imx_v4_v5_defconfig b/arch/arm/configs/imx_v4_v5_defconfig index 7fd9f9b..ba5b640 100644 --- a/arch/arm/configs/imx_v4_v5_defconfig +++ b/arch/arm/configs/imx_v4_v5_defconfig @@ -114,7 +114,7 @@ CONFIG_W1=y CONFIG_W1_MASTER_MXC=y CONFIG_W1_SLAVE_THERM=y CONFIG_HWMON=m -CONFIG_SENSORS_MC13783_ADC=m +CONFIG_SENSORS_MC13XXX_ADC=m CONFIG_WATCHDOG=y CONFIG_IMX2_WDT=y CONFIG_MFD_MC13XXX_SPI=y diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig index 4f71370..c28a362 100644 --- a/drivers/hwmon/Kconfig +++ b/drivers/hwmon/Kconfig @@ -1526,11 +1526,11 @@ config SENSORS_APPLESMC Say Y here if you have an applicable laptop and want to experience the awesome power of applesmc. -config SENSORS_MC13783_ADC - tristate "Freescale MC13783/MC13892 ADC" - depends on MFD_MC13XXX - help - Support for the A/D converter on MC13783 and MC13892 PMIC. +config SENSORS_MC13XXX_ADC + tristate "Freescale MC13783/MC13892 ADC" + depends on MFD_MC13XXX + help + Support for the A/D converter on MC13783 and MC13892 PMIC. if ACPI diff --git a/drivers/hwmon/Makefile b/drivers/hwmon/Makefile index d17d3e6..b0cbc36f 100644 --- a/drivers/hwmon/Makefile +++ b/drivers/hwmon/Makefile @@ -106,7 +106,7 @@ obj-$(CONFIG_SENSORS_MAX6639) += max6639.o obj-$(CONFIG_SENSORS_MAX6642) += max6642.o obj-$(CONFIG_SENSORS_MAX6650) += max6650.o obj-$(CONFIG_SENSORS_MAX6697) += max6697.o -obj-$(CONFIG_SENSORS_MC13783_ADC)+= mc13783-adc.o +obj-$(CONFIG_SENSORS_MC13XXX_ADC)+= mc13xxx-adc.o obj-$(CONFIG_SENSORS_MCP3021) += mcp3021.o obj-$(CONFIG_SENSORS_NCT6775) += nct6775.o obj-$(CONFIG_SENSORS_NTC_THERMISTOR) += ntc_thermistor.o