From patchwork Fri Oct 4 06:36:52 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 280473 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id AEAA22C0099 for ; Fri, 4 Oct 2013 16:37:01 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750905Ab3JDGgy (ORCPT ); Fri, 4 Oct 2013 02:36:54 -0400 Received: from mail-pb0-f52.google.com ([209.85.160.52]:57206 "EHLO mail-pb0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750728Ab3JDGgy (ORCPT ); Fri, 4 Oct 2013 02:36:54 -0400 Received: by mail-pb0-f52.google.com with SMTP id wz12so3543254pbc.11 for ; Thu, 03 Oct 2013 23:36:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=date:sender:message-id:from:to:cc:subject:mime-version:content-type; bh=8N0EtEvjCu+IBrvzmj5yL/kbP+s8H1AaNYDaq0Tfdec=; b=dbE4RfxFGspgmUNEOoD4XCWSlSzCsw1Dua2MDPdL3aGAvogvJqnp5C1mgF0whuDY+G /9V6IqjUwibgONQcIR6OL3aH8IedYJ8xhn1iLvPelV1t/hmqVtKBk6JXu8+UiHfauEAV sDd3kRZEM1minRovkLD1iHNotmctBvSUnpUd6ZGPVs+2/8qOVITNsdnDJNrGPGjpBRzM B1CCmU02PEZyHq7F3tpNoleF+flyQe0zoPnOKTULAa9WUsmftMjYYxnflXkNxajxGpoh EwWACELiWzSxtqNHukDNBJZFdbx8yK+AiVJ1YoXbz+a+GuFJ0OXWQ1Gd6aqTp60Hh5ic I7eQ== X-Received: by 10.68.202.197 with SMTP id kk5mr362878pbc.191.1380868613660; Thu, 03 Oct 2013 23:36:53 -0700 (PDT) Received: from morimoto-Dell-XPS420.gmail.com (49.14.32.202.bf.2iij.net. [202.32.14.49]) by mx.google.com with ESMTPSA id wd6sm15633589pab.3.1969.12.31.16.00.00 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Thu, 03 Oct 2013 23:36:52 -0700 (PDT) Date: Thu, 03 Oct 2013 23:36:52 -0700 (PDT) Message-ID: <87ob75zgn2.wl%kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto To: Wolfram Sang Cc: Simon , Linux-SH , Linux-I2C , Kuninori Morimoto Subject: [PATCH] i2c: rcar: fixup rcar type naming MIME-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Sender: linux-i2c-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-i2c@vger.kernel.org b720423a2627f045133bec39a31fe2bc0dab86f3 (i2c: rcar: add rcar-H2 support) added R-Car H2 support on i2c-rcar. But the added i2c type naming was H1/H2, instead of Gen1/Gen2 (Generation 1/2) Gen1/Gen2 is better naming on this driver. This patch exchanges rcar_i2c_id_table[], but it still can keep compatible, since still there is no user for i2c-rcar_h1/h2 at this point. Signed-off-by: Kuninori Morimoto --- drivers/i2c/busses/i2c-rcar.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/drivers/i2c/busses/i2c-rcar.c b/drivers/i2c/busses/i2c-rcar.c index 8603f5e..2c2fd7c 100644 --- a/drivers/i2c/busses/i2c-rcar.c +++ b/drivers/i2c/busses/i2c-rcar.c @@ -103,8 +103,8 @@ enum { #define ID_NACK (1 << 4) enum rcar_i2c_type { - I2C_RCAR_H1, - I2C_RCAR_H2, + I2C_RCAR_GEN1, + I2C_RCAR_GEN2, }; struct rcar_i2c_priv { @@ -240,10 +240,10 @@ static int rcar_i2c_clock_calculate(struct rcar_i2c_priv *priv, } switch (priv->devtype) { - case I2C_RCAR_H1: + case I2C_RCAR_GEN1: cdf_width = 2; break; - case I2C_RCAR_H2: + case I2C_RCAR_GEN2: cdf_width = 3; break; default: @@ -640,10 +640,10 @@ static const struct i2c_algorithm rcar_i2c_algo = { }; static const struct of_device_id rcar_i2c_dt_ids[] = { - { .compatible = "renesas,i2c-rcar", .data = (void *)I2C_RCAR_H1 }, - { .compatible = "renesas,i2c-r8a7778", .data = (void *)I2C_RCAR_H1 }, - { .compatible = "renesas,i2c-r8a7779", .data = (void *)I2C_RCAR_H1 }, - { .compatible = "renesas,i2c-r8a7790", .data = (void *)I2C_RCAR_H2 }, + { .compatible = "renesas,i2c-rcar", .data = (void *)I2C_RCAR_GEN1 }, + { .compatible = "renesas,i2c-r8a7778", .data = (void *)I2C_RCAR_GEN1 }, + { .compatible = "renesas,i2c-r8a7779", .data = (void *)I2C_RCAR_GEN1 }, + { .compatible = "renesas,i2c-r8a7790", .data = (void *)I2C_RCAR_GEN2 }, {}, }; MODULE_DEVICE_TABLE(of, rcar_i2c_dt_ids); @@ -731,9 +731,9 @@ static int rcar_i2c_remove(struct platform_device *pdev) } static struct platform_device_id rcar_i2c_id_table[] = { - { "i2c-rcar", I2C_RCAR_H1 }, - { "i2c-rcar_h1", I2C_RCAR_H1 }, - { "i2c-rcar_h2", I2C_RCAR_H2 }, + { "i2c-rcar", I2C_RCAR_GEN1 }, + { "i2c-rcar_gen1", I2C_RCAR_GEN1 }, + { "i2c-rcar_gen2", I2C_RCAR_GEN2 }, {}, }; MODULE_DEVICE_TABLE(platform, rcar_i2c_id_table);