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: 9789921 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 672C860384 for ; Thu, 15 Jun 2017 18:50:32 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5A7781FF1F for ; Thu, 15 Jun 2017 18:50:32 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4F325284C3; Thu, 15 Jun 2017 18:50:32 +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=-1.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id E5B5D2864D for ; Thu, 15 Jun 2017 18:50:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=9utE9jn+2Bo+gaxHD8fLC/PzyV9mGpJ8K9jsFCt7qis=; b=tYmmGNlGUraq8ymjNkDivUZI0W v6NSwEvYxscEXb2lkFmmlYKRTCDnp6vQvS5ST7U+ySQd1euVe4EWWYU5eBCwBGB2TOnCVxLsq+gYl /2Nax3/ddo11Z4ZIRYa4dXUkLyBB1cU0H9ZMJv0gxydag9RV0fOoxmLpbQPSjrbDzm9dE/O77tzO5 DL3x/eVuZ/30QmGqwjpHjZ1TZm9Vv/RZDw9pDaZIr4FEVRmw1Km9fAk+/LeeX44EEkH39Kr8YhqNj SShlUU9GzgNbQDvqsse3i0deUlUe0dLkqJWxSk2b/7pHPdRysl/45bHBxLSw390KOHQk3BcFl/jIQ mKeBlSBA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1dLZqg-0004Xg-Ne; Thu, 15 Jun 2017 18:50:30 +0000 Received: from mail-wr0-x241.google.com ([2a00:1450:400c:c0c::241]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1dLZqH-0002xZ-IA for linux-arm-kernel@lists.infradead.org; Thu, 15 Jun 2017 18:50:19 +0000 Received: by mail-wr0-x241.google.com with SMTP id x23so4535654wrb.0 for ; Thu, 15 Jun 2017 11:49:45 -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=F0xul9sOl6VgS3Sy0+vh9AIR8/8yqSUUl7znVdd1PzBWYH72xd/kqniP3WtOasGgfM nuE1MQPLOoJLZlmOcRxWUjQu0LbzUbUdSzdPAxIpUPR8U+r1k319d+hrQHaYKxxLMHxG YYHzcJ3T4UCpE1eu/40XmnJ5ZqrOIltBj3oA1W4CwNJViAZU3M2M91u187Yc3N1kREca GWfeaH12ELjN7Brd+rZy8ATeG4F48BDgbY5Ee9lmv4RuD+sE8Bnc0cu5nxSx9gdpX90t uWMmgh5IknK3f0MtPxlCS5Hcbk8OueGOk5n+txQoOHqAp42oUmHwNNKK5q44q/EoRLwD 4d5g== X-Gm-Message-State: AKS2vOwxA03A33ZpUPvRBAthL+B9ej7KchO1YaKj95EXxG9SvQBE1Gwl BrWBzPKnKo4+J86f 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 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> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170615_115006_092433_1650CFB8 X-CRM114-Status: GOOD ( 14.03 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mark Rutland , devicetree@vger.kernel.org, Aaro Koskinen , Tony Lindgren , Wolfram Sang , Russell King , Rob Herring , =?UTF-8?q?Beno=C3=AEt=20Cousson?= , Javier Martinez Canillas , linux-omap@vger.kernel.org, Lee Jones , linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.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);