From patchwork Wed May 14 09:44:02 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geert Uytterhoeven X-Patchwork-Id: 4173811 Return-Path: X-Original-To: patchwork-linux-arm@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 174969F387 for ; Wed, 14 May 2014 09:47:10 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 29B0420220 for ; Wed, 14 May 2014 09:47:09 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 470202017B for ; Wed, 14 May 2014 09:47:08 +0000 (UTC) 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 1WkVjd-0008BK-Pg; Wed, 14 May 2014 09:44:25 +0000 Received: from mail-ig0-x22d.google.com ([2607:f8b0:4001:c05::22d]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WkVjb-00089P-RG for linux-arm-kernel@lists.infradead.org; Wed, 14 May 2014 09:44:24 +0000 Received: by mail-ig0-f173.google.com with SMTP id hn18so6320343igb.0 for ; Wed, 14 May 2014 02:44:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:sender:in-reply-to:references:date:message-id:subject :from:to:cc:content-type; bh=R920C5ZqRLnJXESM7XUD1MTWHglWvupYJdATcK9PMns=; b=AlDUYZe1goth9/4lzmvCT7+ILneLmoUqgZwm/s86PAiexKoOlBDY/7YJ5TpVX24Guk +nxStYLkumZuNrM+4cCwhC1kvQabBtUDAIi8agAjO81+Zb7smx5BN1awkcFOZEpE4C0E AVdrC5d1upVwDQp00T3N6Lv0M1llKXaQkBHCJONb92wWVEnEejGXxA+u5k0ndqHjqcwK vue0ZtcEEzJYtqn0j1Oh4tL2vQDxmUWJNq0wKs8kjNApBgd5uahqMLkPSp8d5pFUrDpK lhW6oOvLr7ppqqnvqXnZdHDDOEjz39rC5MW1eFm0tw/uz0FIP24og8mvW4bnrCzHY/zb iMRQ== MIME-Version: 1.0 X-Received: by 10.50.25.201 with SMTP id e9mr63931033igg.28.1400060642161; Wed, 14 May 2014 02:44:02 -0700 (PDT) Received: by 10.64.17.199 with HTTP; Wed, 14 May 2014 02:44:02 -0700 (PDT) In-Reply-To: <20140514050801.GE3502@verge.net.au> References: <1400029816-24028-1-git-send-email-wsa@the-dreams.de> <20140514050801.GE3502@verge.net.au> Date: Wed, 14 May 2014 11:44:02 +0200 X-Google-Sender-Auth: TpqHa85ipdY7TgoFO42V5psKGus Message-ID: Subject: Re: [PATCH v6 00/12] CCF support for Renesas r7s72100 From: Geert Uytterhoeven To: Simon Horman , Wolfram Sang X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140514_024423_923770_CE911016 X-CRM114-Status: GOOD ( 17.64 ) X-Spam-Score: 0.0 (/) Cc: Magnus Damm , Laurent Pinchart , "linux-arm-kernel@lists.infradead.org" , Linux-sh list 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: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-2.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=unavailable 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 Hi Wolfram, Simon, On Wed, May 14, 2014 at 7:08 AM, Simon Horman wrote: > On Wed, May 14, 2014 at 03:10:04AM +0200, Wolfram Sang wrote: >> This series moves the r7s72100 platfrom from the legacy clock implementation to >> the common clock framework. >> >> This series has been tested with the renesas-devel-v3.15-rc2-20140428 tag. If >> you want to boot into a console, you have a runtime dependency [1] which is >> expected to go away in 3.15-rc6. >> >> Changes since V5: >> >> * rebased and tested against latest renesas/devel-tag >> (with and without CCF) That's genmai-legacy (ARCH_SHMOBILE_LEGACY=y, MACH_GENMAI=y), and genmai-multiplatform (ARCH_SHMOBILE_MULTI=y, MACH_GENMAI=y, right? There's still a third variant: genmai-reference (ARCH_SHMOBILE_LEGACY=y, MACH_GENMAI_REFERENCE=y), which uses board-genmai-reference.c, but without CCF, i.e. with clock-r7s72100.c. For that, you still need the legacy clocks (also for serial!), so I needed the (gmail-whitespace-damaged) temporary workaround below in my local tree. > Thanks, I have queued up this series. Do we want to go for the quick fix below, or just fix the issue for good, and merge genmai-reference and genmai-multiplatform now, just like we did for koelsch/lager? I can send a proper patch for the quick fix, depending on your decision. From 1b7b851a5d1b7d10f42f68a35b65278827b03cc4 Mon Sep 17 00:00:00 2001 From: Geert Uytterhoeven Date: Mon, 12 May 2014 14:32:25 +0200 Subject: [PATCH] ARM: shmobile: genmai-reference: Re-add legacy clocks genmai-reference still uses non-CCF, so it needs the legacy clocks Signed-off-by: Geert Uytterhoeven --- arch/arm/mach-shmobile/clock-r7s72100.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/arch/arm/mach-shmobile/clock-r7s72100.c b/arch/arm/mach-shmobile/clock-r7s72100.c index df187484de5d..1b677e0a69c6 100644 --- a/arch/arm/mach-shmobile/clock-r7s72100.c +++ b/arch/arm/mach-shmobile/clock-r7s72100.c @@ -194,6 +194,16 @@ static struct clk_lookup lookups[] = { CLKDEV_DEV_ID("rspi-rz.2", &mstp_clks[MSTP105]), CLKDEV_DEV_ID("rspi-rz.3", &mstp_clks[MSTP104]), CLKDEV_DEV_ID("rspi-rz.4", &mstp_clks[MSTP103]), + CLKDEV_DEV_ID("e800c800.spi", &mstp_clks[MSTP107]), + CLKDEV_DEV_ID("e800d000.spi", &mstp_clks[MSTP106]), + CLKDEV_DEV_ID("e800d800.spi", &mstp_clks[MSTP105]), + CLKDEV_DEV_ID("e800e000.spi", &mstp_clks[MSTP104]), + CLKDEV_DEV_ID("e800e800.spi", &mstp_clks[MSTP103]), + CLKDEV_DEV_ID("fcfee000.i2c", &mstp_clks[MSTP97]), + CLKDEV_DEV_ID("fcfee400.i2c", &mstp_clks[MSTP96]), + CLKDEV_DEV_ID("fcfee800.i2c", &mstp_clks[MSTP95]), + CLKDEV_DEV_ID("fcfeec00.i2c", &mstp_clks[MSTP94]), + CLKDEV_DEV_ID("e8008000.serial", &mstp_clks[MSTP45]), CLKDEV_DEV_ID("r7s72100-ether", &mstp_clks[MSTP74]), /* ICK */