From patchwork Wed Apr 12 17:27:53 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Javier Martinez Canillas X-Patchwork-Id: 9677981 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 35B4760383 for ; Wed, 12 Apr 2017 17:30:14 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2680A2861E for ; Wed, 12 Apr 2017 17:30:14 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1B66028627; Wed, 12 Apr 2017 17:30:14 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9CF452861E for ; Wed, 12 Apr 2017 17:30:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754785AbdDLR22 (ORCPT ); Wed, 12 Apr 2017 13:28:28 -0400 Received: from ec2-52-27-115-49.us-west-2.compute.amazonaws.com ([52.27.115.49]:37035 "EHLO osg.samsung.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751349AbdDLR2Z (ORCPT ); Wed, 12 Apr 2017 13:28:25 -0400 Received: from localhost (localhost [127.0.0.1]) by osg.samsung.com (Postfix) with ESMTP id 75899A05F1; Wed, 12 Apr 2017 17:28:44 +0000 (UTC) X-Virus-Scanned: amavisd-new at osg.samsung.com Received: from osg.samsung.com ([127.0.0.1]) by localhost (s-opensource.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id BgUgSbZai7hW; Wed, 12 Apr 2017 17:28:44 +0000 (UTC) Received: from minerva.sisa.samsung.com (r167-61-57-135.dialup.adsl.anteldata.net.uy [167.61.57.135]) by osg.samsung.com (Postfix) with ESMTPSA id 69164A05ED; Wed, 12 Apr 2017 17:28:40 +0000 (UTC) From: Javier Martinez Canillas To: linux-kernel@vger.kernel.org Cc: Aaro Koskinen , devicetree@vger.kernel.org, Rob Herring , Tony Lindgren , Lee Jones , Javier Martinez Canillas , =?UTF-8?q?Beno=C3=AEt=20Cousson?= , Mark Rutland , linux-omap@vger.kernel.org, Russell King , linux-arm-kernel@lists.infradead.org Subject: [PATCH v5 2/8] mfd: retu: Drop -mfd suffix from I2C device ID name Date: Wed, 12 Apr 2017 14:27:53 -0300 Message-Id: <20170412172800.23035-3-javier@osg.samsung.com> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20170412172800.23035-1-javier@osg.samsung.com> References: <20170412172800.23035-1-javier@osg.samsung.com> Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP It's not correct to encode the subsystem in the I2C device name, so drop the -mfd suffix. To maintain bisect-ability, change driver and platform code / DTS users in the same patch. Suggested-by: Lee Jones Signed-off-by: Javier Martinez Canillas Acked-by: Rob Herring Acked-by: Aaro Koskinen Acked-by: Tony Lindgren Reviewed-by: Wolfram Sang --- Changes in v5: - Add Rob Herring's Acked-by tag. - Add Aaro Koskinen's Acked-by tag. - Add Acked-by: Tony Lindgren 's Acked-by tag. Changes in v4: None Changes in v3: None Changes in v2: None arch/arm/boot/dts/omap2420-n8x0-common.dtsi | 4 ++-- arch/arm/mach-omap1/board-nokia770.c | 4 ++-- drivers/mfd/retu-mfd.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/arch/arm/boot/dts/omap2420-n8x0-common.dtsi b/arch/arm/boot/dts/omap2420-n8x0-common.dtsi index 7e5ffc583c90..1b06430c8013 100644 --- a/arch/arm/boot/dts/omap2420-n8x0-common.dtsi +++ b/arch/arm/boot/dts/omap2420-n8x0-common.dtsi @@ -15,8 +15,8 @@ >; #address-cells = <1>; #size-cells = <0>; - retu_mfd: retu@1 { - compatible = "retu-mfd"; + retu: retu@1 { + compatible = "retu"; interrupt-parent = <&gpio4>; interrupts = <12 IRQ_TYPE_EDGE_RISING>; reg = <0x1>; diff --git a/arch/arm/mach-omap1/board-nokia770.c b/arch/arm/mach-omap1/board-nokia770.c index ee8d9f553db4..06243c0b12d2 100644 --- a/arch/arm/mach-omap1/board-nokia770.c +++ b/arch/arm/mach-omap1/board-nokia770.c @@ -233,10 +233,10 @@ static struct platform_device nokia770_cbus_device = { static struct i2c_board_info nokia770_i2c_board_info_2[] __initdata = { { - I2C_BOARD_INFO("retu-mfd", 0x01), + I2C_BOARD_INFO("retu", 0x01), }, { - I2C_BOARD_INFO("tahvo-mfd", 0x02), + I2C_BOARD_INFO("tahvo", 0x02), }, }; diff --git a/drivers/mfd/retu-mfd.c b/drivers/mfd/retu-mfd.c index d4c114abeb75..53e1d386d2c0 100644 --- a/drivers/mfd/retu-mfd.c +++ b/drivers/mfd/retu-mfd.c @@ -302,8 +302,8 @@ static int retu_remove(struct i2c_client *i2c) } static const struct i2c_device_id retu_id[] = { - { "retu-mfd", 0 }, - { "tahvo-mfd", 0 }, + { "retu", 0 }, + { "tahvo", 0 }, { } }; MODULE_DEVICE_TABLE(i2c, retu_id);