From patchwork Tue Sep 22 15:44:06 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geert Uytterhoeven X-Patchwork-Id: 7240011 X-Patchwork-Delegate: geert@linux-m68k.org 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 3B1B0BEEC1 for ; Tue, 22 Sep 2015 15:44:31 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 74C3720873 for ; Tue, 22 Sep 2015 15:44:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A46F12086B for ; Tue, 22 Sep 2015 15:44:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758458AbbIVPo0 (ORCPT ); Tue, 22 Sep 2015 11:44:26 -0400 Received: from michel.telenet-ops.be ([195.130.137.88]:56224 "EHLO michel.telenet-ops.be" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758456AbbIVPoO (ORCPT ); Tue, 22 Sep 2015 11:44:14 -0400 Received: from ayla.of.borg ([84.195.106.123]) by michel.telenet-ops.be with bizsmtp id LFk81r00t2fm56U06Fk8LV; Tue, 22 Sep 2015 17:44:11 +0200 Received: from ramsan.of.borg ([192.168.97.29] helo=ramsan) by ayla.of.borg with esmtp (Exim 4.82) (envelope-from ) id 1ZePjk-0007i6-Cz; Tue, 22 Sep 2015 17:44:08 +0200 Received: from geert by ramsan with local (Exim 4.82) (envelope-from ) id 1ZePjr-0007uj-UW; Tue, 22 Sep 2015 17:44:15 +0200 From: Geert Uytterhoeven To: Laurent Pinchart , Magnus Damm , Simon Horman , Kuninori Morimoto , Ulrich Hecht , Michael Turquette , Stephen Boyd , Philipp Zabel Cc: linux-clk@vger.kernel.org, linux-pm@vger.kernel.org, devicetree@vger.kernel.org, linux-sh@vger.kernel.org, Geert Uytterhoeven Subject: [PATCH/RFC v2 4/4] clk: shmobile: rcar-gen2: Switch from old MSTP to new MSSR driver Date: Tue, 22 Sep 2015 17:44:06 +0200 Message-Id: <1442936646-30362-5-git-send-email-geert+renesas@glider.be> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1442936646-30362-1-git-send-email-geert+renesas@glider.be> References: <1442936646-30362-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=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, 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 Signed-off-by: Geert Uytterhoeven --- drivers/clk/shmobile/Makefile | 2 +- drivers/clk/shmobile/clk-rcar-gen2.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/clk/shmobile/Makefile b/drivers/clk/shmobile/Makefile index 2525ba9608b69732..f595a028a581a271 100644 --- a/drivers/clk/shmobile/Makefile +++ b/drivers/clk/shmobile/Makefile @@ -5,7 +5,7 @@ obj-$(CONFIG_ARCH_R8A7740) += clk-r8a7740.o clk-mstp.o clk-div6.o obj-$(CONFIG_ARCH_R8A7778) += clk-r8a7778.o clk-mstp.o obj-$(CONFIG_ARCH_R8A7779) += clk-r8a7779.o clk-mstp.o obj-$(CONFIG_ARCH_R8A7790) += clk-rcar-gen2.o clk-mstp.o clk-div6.o -obj-$(CONFIG_ARCH_R8A7791) += clk-rcar-gen2.o clk-mstp.o clk-div6.o +obj-$(CONFIG_ARCH_R8A7791) += clk-rcar-gen2.o clk-mssr.o clk-div6.o obj-$(CONFIG_ARCH_R8A7793) += clk-rcar-gen2.o clk-mstp.o clk-div6.o obj-$(CONFIG_ARCH_R8A7794) += clk-rcar-gen2.o clk-mstp.o clk-div6.o obj-$(CONFIG_ARCH_R8A7795) += clk-rcar-gen3.o clk-mstp.o clk-div6.o diff --git a/drivers/clk/shmobile/clk-rcar-gen2.c b/drivers/clk/shmobile/clk-rcar-gen2.c index 3f02b40b4911831c..a237d63af1ede4f6 100644 --- a/drivers/clk/shmobile/clk-rcar-gen2.c +++ b/drivers/clk/shmobile/clk-rcar-gen2.c @@ -431,7 +431,7 @@ static void __init rcar_gen2_cpg_clocks_init(struct device_node *np) of_clk_add_provider(np, of_clk_src_onecell_get, &cpg->data); - cpg_mstp_add_clk_domain(np); + cpg_mssr_add_clk_domain(np); } CLK_OF_DECLARE(rcar_gen2_cpg_clks, "renesas,rcar-gen2-cpg-clocks", rcar_gen2_cpg_clocks_init);