Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752548AbdFOStt (ORCPT ); Thu, 15 Jun 2017 14:49:49 -0400 Received: from mail-wr0-f193.google.com ([209.85.128.193]:35476 "EHLO mail-wr0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752521AbdFOStp (ORCPT ); Thu, 15 Jun 2017 14:49:45 -0400 From: Javier Martinez Canillas To: linux-kernel@vger.kernel.org Cc: devicetree@vger.kernel.org, Wolfram Sang , Rob Herring , Tony Lindgren , Lee Jones , Aaro Koskinen , 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: [RESEND PATCH v6 2/8] mfd: retu: Drop -mfd suffix from I2C device ID name Date: Thu, 15 Jun 2017 20:49:22 +0200 Message-Id: <20170615184928.12007-3-javier@dowhile0.org> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20170615184928.12007-1-javier@dowhile0.org> References: <20170615184928.12007-1-javier@dowhile0.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2383 Lines: 79 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 v6: - Add Wolfram Sang's Reviewed-by tag. Changes in v5: - Add Rob Herring's Acked-by tag. - Add Aaro Koskinen's Acked-by tag. - Add 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); -- 2.9.3