From patchwork Wed Dec 18 15:08:22 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Valentine Barshak X-Patchwork-Id: 3370521 Return-Path: X-Original-To: patchwork-linux-sh@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 518BE9F314 for ; Wed, 18 Dec 2013 15:08:33 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 13BC1205E1 for ; Wed, 18 Dec 2013 15:08:32 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4831B200EB for ; Wed, 18 Dec 2013 15:08:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754679Ab3LRPI1 (ORCPT ); Wed, 18 Dec 2013 10:08:27 -0500 Received: from mail-lb0-f177.google.com ([209.85.217.177]:54414 "EHLO mail-lb0-f177.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754876Ab3LRPI0 (ORCPT ); Wed, 18 Dec 2013 10:08:26 -0500 Received: by mail-lb0-f177.google.com with SMTP id q8so2103337lbi.36 for ; Wed, 18 Dec 2013 07:08:25 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=rJfdZ3frtYymSeFMhbXbi9ajb4xYjUcJklQOnbF3jZk=; b=Z0+PrhTbowo8CIxfNMkOSTcDX8ChQ4M5Di0x3Wgkur4zd0EdPyP8h/bdqhJNGiAMJc 3CFWaezP/WXa7ZkIGqeDPpKG/3S/qcOVMhc9P/CSVGeVnHQbU7RBOlfh/S4NY5xgZbCO bCWKHSzl+rOyx3/iDDhrhvWwuCWkMsX5js+J+4RGMz21K455VZe18ENOk04yYFXAFohT JNgA5tGeLUIXKAdJ0Y/H6bBt37yPs+yuHXp1CV80ApyzHSCCzvPTkNPWuy3lWi6uZ8HO zMn6e2ZCc4PjEVKvQlJD6bzyemyGTBspirLJDGkAl3vSjaZfZyKHrC6Ln2mRugsNrznl rNmQ== X-Gm-Message-State: ALoCoQn/rqOlRQ9bgok13jxWIpdfD9DQyjC6vtc8hKQFWV1i0eIiUTv2TQbfV7OGImFsMh1Xo7uz X-Received: by 10.152.5.163 with SMTP id t3mr11349230lat.39.1387379305037; Wed, 18 Dec 2013 07:08:25 -0800 (PST) Received: from black.localnet ([93.100.122.208]) by mx.google.com with ESMTPSA id mx3sm165275lbc.14.2013.12.18.07.08.23 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 18 Dec 2013 07:08:24 -0800 (PST) From: Valentine Barshak To: linux-sh@vger.kernel.org Cc: Simon Horman , Magnus Damm , Kuninori Morimoto , Laurent Pinchart Subject: [PATCH] arm: shmobile: r8a7790: Fix I2C controller names Date: Wed, 18 Dec 2013 19:08:22 +0400 Message-Id: <1387379302-20223-1-git-send-email-valentine.barshak@cogentembedded.com> X-Mailer: git-send-email 1.8.3.1 Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The R8A7790 is an R-Car Gen2 SoC. The clock division factor (CDF) width is 3 bits on Gen2 as opposed to 2 bits on Gen1. Fix the device names for R8A7790 SoC to make the R-Car I2C driver configure the hardware properly. Signed-off-by: Valentine Barshak Acked-by: Kuninori Morimoto --- arch/arm/mach-shmobile/clock-r8a7790.c | 8 ++++---- arch/arm/mach-shmobile/setup-r8a7790.c | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/arch/arm/mach-shmobile/clock-r8a7790.c b/arch/arm/mach-shmobile/clock-r8a7790.c index 81f45a0..18d836b 100644 --- a/arch/arm/mach-shmobile/clock-r8a7790.c +++ b/arch/arm/mach-shmobile/clock-r8a7790.c @@ -297,13 +297,13 @@ static struct clk_lookup lookups[] = { CLKDEV_DEV_ID("sh-sci.8", &mstp_clks[MSTP717]), CLKDEV_DEV_ID("sh-sci.9", &mstp_clks[MSTP716]), CLKDEV_DEV_ID("e6508000.i2c", &mstp_clks[MSTP931]), - CLKDEV_DEV_ID("i2c-rcar.0", &mstp_clks[MSTP931]), + CLKDEV_DEV_ID("i2c-rcar_gen2.0", &mstp_clks[MSTP931]), CLKDEV_DEV_ID("e6518000.i2c", &mstp_clks[MSTP930]), - CLKDEV_DEV_ID("i2c-rcar.1", &mstp_clks[MSTP930]), + CLKDEV_DEV_ID("i2c-rcar_gen2.1", &mstp_clks[MSTP930]), CLKDEV_DEV_ID("e6530000.i2c", &mstp_clks[MSTP929]), - CLKDEV_DEV_ID("i2c-rcar.2", &mstp_clks[MSTP929]), + CLKDEV_DEV_ID("i2c-rcar_gen2.2", &mstp_clks[MSTP929]), CLKDEV_DEV_ID("e6540000.i2c", &mstp_clks[MSTP928]), - CLKDEV_DEV_ID("i2c-rcar.3", &mstp_clks[MSTP928]), + CLKDEV_DEV_ID("i2c-rcar_gen2.3", &mstp_clks[MSTP928]), CLKDEV_DEV_ID("r8a7790-ether", &mstp_clks[MSTP813]), CLKDEV_DEV_ID("r8a7790-vin.0", &mstp_clks[MSTP811]), CLKDEV_DEV_ID("r8a7790-vin.1", &mstp_clks[MSTP810]), diff --git a/arch/arm/mach-shmobile/setup-r8a7790.c b/arch/arm/mach-shmobile/setup-r8a7790.c index 8474818..77fd7ed 100644 --- a/arch/arm/mach-shmobile/setup-r8a7790.c +++ b/arch/arm/mach-shmobile/setup-r8a7790.c @@ -85,7 +85,7 @@ static struct resource i2c_resources[] __initdata = { #define r8a7790_register_i2c(idx) \ platform_device_register_simple( \ - "i2c-rcar", idx, \ + "i2c-rcar_gen2", idx, \ i2c_resources + (2 * idx), 2); \ void __init r8a7790_pinmux_init(void)