From patchwork Tue Jul 7 14:10:16 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geert Uytterhoeven X-Patchwork-Id: 6733251 X-Patchwork-Delegate: horms@verge.net.au Return-Path: X-Original-To: patchwork-linux-sh@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 783E5C05AC for ; Tue, 7 Jul 2015 14:10:32 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id A0EC0205C2 for ; Tue, 7 Jul 2015 14:10:31 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 101CA20626 for ; Tue, 7 Jul 2015 14:10:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757830AbbGGOKY (ORCPT ); Tue, 7 Jul 2015 10:10:24 -0400 Received: from xavier.telenet-ops.be ([195.130.132.52]:60060 "EHLO xavier.telenet-ops.be" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757836AbbGGOKS (ORCPT ); Tue, 7 Jul 2015 10:10:18 -0400 Received: from ayla.of.borg ([84.193.93.87]) by xavier.telenet-ops.be with bizsmtp id pSAF1q00f1t5w8s01SAFSG; Tue, 07 Jul 2015 16:10:16 +0200 Received: from ramsan.of.borg ([192.168.97.29] helo=ramsan) by ayla.of.borg with esmtp (Exim 4.82) (envelope-from ) id 1ZCTZf-00064A-9D; Tue, 07 Jul 2015 16:10:15 +0200 Received: from geert by ramsan with local (Exim 4.82) (envelope-from ) id 1ZCTZj-0005MZ-Kt; Tue, 07 Jul 2015 16:10:19 +0200 From: Geert Uytterhoeven To: Simon Horman , Magnus Damm , Michael Turquette , Stephen Boyd Cc: Laurent Pinchart , Ulrich Hecht , linux-sh@vger.kernel.org, linux-clk@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Geert Uytterhoeven Subject: [PATCH/RFC 10/11] ARM: shmobile: rcar-gen2: Use syscon to configure the CPG Date: Tue, 7 Jul 2015 16:10:16 +0200 Message-Id: <1436278217-20522-11-git-send-email-geert+renesas@glider.be> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1436278217-20522-1-git-send-email-geert+renesas@glider.be> References: <1436278217-20522-1-git-send-email-geert+renesas@glider.be> 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.7 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 Let the R-Car Gen2 CPG clock driver rely on syscon to read the Mode Monitoring Register (MODEMR), instead of passing the register value directly. Signed-off-by: Geert Uytterhoeven --- arch/arm/mach-shmobile/Kconfig | 1 + arch/arm/mach-shmobile/setup-rcar-gen2.c | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/arch/arm/mach-shmobile/Kconfig b/arch/arm/mach-shmobile/Kconfig index 26a036c3ab522128..37faf6e18d26344f 100644 --- a/arch/arm/mach-shmobile/Kconfig +++ b/arch/arm/mach-shmobile/Kconfig @@ -23,6 +23,7 @@ config ARCH_RCAR_GEN2 select SYS_SUPPORTS_SH_CMT select PCI_DOMAINS if PCI select HAVE_ARM_ARCH_TIMER + select MFD_SYSCON config ARCH_RMOBILE bool diff --git a/arch/arm/mach-shmobile/setup-rcar-gen2.c b/arch/arm/mach-shmobile/setup-rcar-gen2.c index 570d6bd3784f7464..7a845f4829081cd9 100644 --- a/arch/arm/mach-shmobile/setup-rcar-gen2.c +++ b/arch/arm/mach-shmobile/setup-rcar-gen2.c @@ -15,6 +15,7 @@ * GNU General Public License for more details. */ +#include #include #include #include @@ -125,7 +126,7 @@ void __init rcar_gen2_timer_init(void) iounmap(base); - rcar_gen2_clocks_init(mode); + of_clk_init(NULL); clocksource_of_init(); }