From patchwork Thu Jun 15 18:49:22 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: 9789935 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 6DB2460384 for ; Thu, 15 Jun 2017 18:51:43 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 614F428673 for ; Thu, 15 Jun 2017 18:51:43 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 55C8F2867C; Thu, 15 Jun 2017 18:51:43 +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.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID 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 D5A8828673 for ; Thu, 15 Jun 2017 18:51:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750814AbdFOStr (ORCPT ); Thu, 15 Jun 2017 14:49:47 -0400 Received: from mail-wr0-f194.google.com ([209.85.128.194]:34358 "EHLO mail-wr0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752520AbdFOStp (ORCPT ); Thu, 15 Jun 2017 14:49:45 -0400 Received: by mail-wr0-f194.google.com with SMTP id y25so2321783wrd.1 for ; Thu, 15 Jun 2017 11:49:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dowhile0-org.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=Yh/x7CdEmrkI0lcdlr2KHEPV1Gq02nz9/vH0r1KZ9Aw=; b=CD0j2H7caxL8mFav1Njve7vPoc5+RhKsSGs1Zbsua4e5BNrWoVhUX4YfKFlVmBikjc SzV+Ky4EZCVBnXxFZ4SYyv4iQoZuotF+w7QiuDgKqMQ/wPZVYNmPG2I5/TNd3MnzkWr2 h0Gz8/cxjJN2DdFCuWasuFL3Xgv6Vg3DdlyrZfwToHmlA1fRbeezY3ESX0IekWsWjoYb AEAtESRHARLsNLiESHdH2VvK/e9XbNVKgZ66O5gKu3tOUwnWVNXRG1AGKgfUp+qzy4IR Q609Ymb7gAGpe8/Pspz+tPmJdepDam4pB/53f/xBq7z8zS3V/HRQSiTyMC6ZPMiz0Jzg 5Frg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=Yh/x7CdEmrkI0lcdlr2KHEPV1Gq02nz9/vH0r1KZ9Aw=; b=Yl/v7JaEULA/sF1eIFiqPntzQP0hjysLrQTmvXD12yQFHMWYzteeTSN35Lm+07rAH+ 9mvsA11OY4/3ngHa5Vx7K2IeIMFuFlhMs5fkYSuU/phKKaI4CNGDe4fi530gAa0QM0m4 PZbX6Xoar/TmvCzutPBZgiBJk/EA747znNBLB4AaTCvfyA2VXpZgIdbcrVDX+WCUg8cM IcnSNIGCcTvkEjT5FyqlZmIjEKHnuCpunT4zJNb09gUfSEtS4yyLi+5S72W/KdMT3OHa lGV6mtNzwvhv/jrKr+G+TzBco0gkqiKVpf3lRWv9VXeSWblFcO4cujV/sQMT2ynNpgIj OGUg== X-Gm-Message-State: AKS2vOztkJ5Q6YawxI1fwTbr7RbjAa0RsrAmIy1TxDXDnb283iL61hp2 S0mwhkS9n9G0GEEx X-Received: by 10.223.146.161 with SMTP id 30mr5151878wrn.164.1497552583799; Thu, 15 Jun 2017 11:49:43 -0700 (PDT) Received: from localhost.localdomain ([90.68.25.6]) by smtp.gmail.com with ESMTPSA id l190sm32320wmb.18.2017.06.15.11.49.40 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 15 Jun 2017 11:49:43 -0700 (PDT) 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-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 Acked-by: Lee Jones --- 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);