From patchwork Fri May 23 10:30:57 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 30736 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-vc0-f199.google.com (mail-vc0-f199.google.com [209.85.220.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id DE9102066E for ; Fri, 23 May 2014 10:41:46 +0000 (UTC) Received: by mail-vc0-f199.google.com with SMTP id hq11sf661158vcb.10 for ; Fri, 23 May 2014 03:41:46 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:subject:date:message-id :in-reply-to:references:cc:precedence:list-id:list-unsubscribe :list-archive:list-post:list-help:list-subscribe:mime-version:sender :errors-to:x-original-sender:x-original-authentication-results :mailing-list:content-type:content-transfer-encoding; bh=Q1MmyhcpCjoSCS/SOE6eD6xS4P2a6ISEgpi0rUfj0ZM=; b=dE41RzZEPjFEIYSKJkvLWvOADy4PLHa2dE769ezBz0nCk3jbyZd5fxROAT76c6T9RZ jHPEbapHzZ99ugz8q2piVXdVqRVqdKC0lVR6o7RJVjsWmFcOzknOzMGBtbfQ+o+xatEL lAVJ6KXsvkMhAlUB76H5xPBpkBZUP7USzfiH3gtHw3Lb5KzQI5JbR287tebXB0zvCcfn QSI296bGfrjWHcNTYVg9xqgJuLvEEbhjsdFzPZaZC6lOChV8694HXznyXyPLBfFBTNRb fY5jX+jEjCroDYilp6VpfrEcMyDyAuV0kR6q3TeC8GFPGUsphOkOEfhBBOfrPJ3HAPUv b3+g== X-Gm-Message-State: ALoCoQklzsqrPruHRVKJrHz+uN2PlBNT/DeSUzyz3tRyLpf/rBaQqnHgLVnGytPHS3CVs7Veb2b4 X-Received: by 10.224.147.72 with SMTP id k8mr1776052qav.5.1400841706647; Fri, 23 May 2014 03:41:46 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.49.1 with SMTP id p1ls1726110qga.97.gmail; Fri, 23 May 2014 03:41:46 -0700 (PDT) X-Received: by 10.58.161.101 with SMTP id xr5mr631951veb.36.1400841706571; Fri, 23 May 2014 03:41:46 -0700 (PDT) Received: from mail-vc0-f181.google.com (mail-vc0-f181.google.com [209.85.220.181]) by mx.google.com with ESMTPS id 3si1391563vcs.47.2014.05.23.03.41.46 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 23 May 2014 03:41:46 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.181 as permitted sender) client-ip=209.85.220.181; Received: by mail-vc0-f181.google.com with SMTP id hy4so2592002vcb.40 for ; Fri, 23 May 2014 03:41:46 -0700 (PDT) X-Received: by 10.58.169.97 with SMTP id ad1mr69552vec.45.1400841706501; Fri, 23 May 2014 03:41:46 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.220.221.72 with SMTP id ib8csp20394vcb; Fri, 23 May 2014 03:41:45 -0700 (PDT) X-Received: by 10.224.46.195 with SMTP id k3mr5006753qaf.51.1400841705127; Fri, 23 May 2014 03:41:45 -0700 (PDT) Received: from bombadil.infradead.org (bombadil.infradead.org. [2001:1868:205::9]) by mx.google.com with ESMTPS id c13si3011622qaw.132.2014.05.23.03.41.45 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 23 May 2014 03:41:45 -0700 (PDT) Received-SPF: none (google.com: linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org does not designate permitted sender hosts) client-ip=2001:1868:205::9; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1WnmtM-0007pj-85; Fri, 23 May 2014 10:40:00 +0000 Received: from mail-wg0-f42.google.com ([74.125.82.42]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Wnmlv-0001Ez-Fx for linux-arm-kernel@lists.infradead.org; Fri, 23 May 2014 10:32:20 +0000 Received: by mail-wg0-f42.google.com with SMTP id y10so4527033wgg.25 for ; Fri, 23 May 2014 03:31:57 -0700 (PDT) X-Received: by 10.194.220.42 with SMTP id pt10mr2158244wjc.60.1400841117151; Fri, 23 May 2014 03:31:57 -0700 (PDT) Received: from localhost.localdomain (AToulouse-654-1-404-187.w82-125.abo.wanadoo.fr. [82.125.3.187]) by mx.google.com with ESMTPSA id s9sm2200908wix.13.2014.05.23.03.31.55 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 23 May 2014 03:31:56 -0700 (PDT) From: Daniel Lezcano To: tglx@linutronix.de, mingo@kernel.org Subject: [PATCH 17/71] clocksource: sh_cmt: Rename clock to "fck" in the non-legacy case Date: Fri, 23 May 2014 12:30:57 +0200 Message-Id: <1400841111-6683-17-git-send-email-daniel.lezcano@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1400841111-6683-1-git-send-email-daniel.lezcano@linaro.org> References: <537F214C.8000700@linaro.org> <1400841111-6683-1-git-send-email-daniel.lezcano@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140523_033219_722218_D60C56EE X-CRM114-Status: GOOD ( 12.92 ) X-Spam-Score: -0.7 (/) X-Spam-Report: SpamAssassin version 3.3.2 on bombadil.infradead.org summary: Content analysis details: (-0.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [74.125.82.42 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record Cc: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: , List-Help: , List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: daniel.lezcano@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.181 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 From: Laurent Pinchart The sh_cmt driver gets the CMT functional clock using a connection ID of "cmt_fck". While all SH SoCs create clock lookup entries with a NULL device ID and a "cmt_fck" connection ID, the ARM SoCs use the device ID only with a NULL connection ID. This works on legacy platforms but will break on ARM with DT boot. Fix the situation by using a connection ID of "fck" in the non-legacy platform data case. Clock lookup entries will be renamed to use the device ID as well as the connection ID as platforms get moved to new platform data. The legacy code will eventually be dropped, leaving us with device ID based clock lookup, compatible with DT boot. Signed-off-by: Laurent Pinchart --- drivers/clocksource/sh_cmt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/clocksource/sh_cmt.c b/drivers/clocksource/sh_cmt.c index 1efe7d6..a5ea9ae 100644 --- a/drivers/clocksource/sh_cmt.c +++ b/drivers/clocksource/sh_cmt.c @@ -1007,7 +1007,7 @@ static int sh_cmt_setup(struct sh_cmt_device *cmt, struct platform_device *pdev) cmt->legacy = cmt->info ? false : true; /* Get hold of clock. */ - cmt->clk = clk_get(&cmt->pdev->dev, "cmt_fck"); + cmt->clk = clk_get(&cmt->pdev->dev, cmt->legacy ? "cmt_fck" : "fck"); if (IS_ERR(cmt->clk)) { dev_err(&cmt->pdev->dev, "cannot get clock\n"); return PTR_ERR(cmt->clk);