From patchwork Thu Oct 1 14:37:27 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Magnus Damm X-Patchwork-Id: 7309211 X-Patchwork-Delegate: geert@linux-m68k.org 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.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id B6EA29F314 for ; Thu, 1 Oct 2015 14:37:25 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D73682069B for ; Thu, 1 Oct 2015 14:37:24 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D5FD32069A for ; Thu, 1 Oct 2015 14:37:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753031AbbJAOhS (ORCPT ); Thu, 1 Oct 2015 10:37:18 -0400 Received: from mail-pa0-f54.google.com ([209.85.220.54]:33305 "EHLO mail-pa0-f54.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752976AbbJAOhN (ORCPT ); Thu, 1 Oct 2015 10:37:13 -0400 Received: by pacex6 with SMTP id ex6so76619037pac.0; Thu, 01 Oct 2015 07:37:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:date:message-id:in-reply-to:references:subject; bh=Z8p3CkTGLFm1Ruf2g7/2+D/1X0PaIUeUT1RQ6cGjdiI=; b=k2psGPNNhJGot6zqaXZHBFQmMD9w4+xb3DXjka2u4HnYJpCFrjcX7MCgvs4whtlI4j sFgPSHy4Sn6aH4ulzpvpYb5PCy+cGpdk2hVFWhxXyzWZiWALX0VbbPRzx0A+vPZPteyN y51b9ArXbUs0B4CQhcPQHt5zylXxQ2CwaJxagn0Migv4NC5zL/N0e5y+KhVi5Ycf+v5z O2/9ixTPXfmCPvG47yz+gf3if/vEgnHoZaV6Hv6u3o+pMMtjt2jRgTClgDTpQIMo8Qfc DH3shw9Y+3+T0m9zT7ckNS51SmzTLHrQ/RPuFoK5acskCC8BVjZoY7poo9dqdm6sOsfR 6W5g== X-Received: by 10.66.146.69 with SMTP id ta5mr12881055pab.46.1443710232997; Thu, 01 Oct 2015 07:37:12 -0700 (PDT) Received: from [127.0.0.1] (s214090.ppp.asahi-net.or.jp. [220.157.214.90]) by smtp.gmail.com with ESMTPSA id k10sm7071018pbq.78.2015.10.01.07.37.09 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 01 Oct 2015 07:37:11 -0700 (PDT) From: Magnus Damm To: linux-clk@vger.kernel.org Cc: kuninori.morimoto.gx@renesas.com, linux-sh@vger.kernel.org, mturquette@baylibre.com, gaku.inami.xw@bp.renesas.com, sboyd@codeaurora.org, horms@verge.net.au, geert@linux-m68k.org, laurent.pinchart@ideasonboard.com, Magnus Damm Date: Thu, 01 Oct 2015 23:37:27 +0900 Message-Id: <20151001143727.20618.78251.sendpatchset@little-apple> In-Reply-To: <20151001143717.20618.26365.sendpatchset@little-apple> References: <20151001143717.20618.26365.sendpatchset@little-apple> Subject: [PATCH v8 01/05] clk: shmobile: Rework CONFIG_ARCH_SHMOBILE_MULTI 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.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, T_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 From: Magnus Damm Shmobile is all multiplatform these days, so in get rid of the reference to CONFIG_ARCH_SHMOBILE_MULTI in drivers/clk/shmobile/. Also instead of always enabling DIV6 and MSTP adjust the Makefile to enable DIV6 and MSTP depending on if they are included in the SoC or not. Signed-off-by: Magnus Damm Acked-by: Geert Uytterhoeven Acked-by: Laurent Pinchart --- Earlier known as "clk: shmobile: Get rid of CONFIG_ARCH_SHMOBILE_MULTI" Changes since V7: - None Changes since V6: - None Changes since V5: - None Changes since V4: - Added Acked-by from Laurent Changes since V3: - Got rid of hunks that modified drivers/clk/Makefile - This to prevent build issue with non-CCF enabled SH arch - A nice side effect is that this patch now can be merged any time Changes since V2: - Fixed patch subject typo CONFIG_SHMOBILE_MULTI -> CONFIG_ARCH_SHMOBILE_MULTI Changes since V1: - Added Acked-by from Geert drivers/clk/shmobile/Makefile | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-sh" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html --- 0001/drivers/clk/shmobile/Makefile +++ work/drivers/clk/shmobile/Makefile 2015-08-29 16:14:57.522366518 +0900 @@ -1,13 +1,11 @@ obj-$(CONFIG_ARCH_EMEV2) += clk-emev2.o -obj-$(CONFIG_ARCH_R7S72100) += clk-rz.o -obj-$(CONFIG_ARCH_R8A73A4) += clk-r8a73a4.o -obj-$(CONFIG_ARCH_R8A7740) += clk-r8a7740.o -obj-$(CONFIG_ARCH_R8A7778) += clk-r8a7778.o -obj-$(CONFIG_ARCH_R8A7779) += clk-r8a7779.o -obj-$(CONFIG_ARCH_R8A7790) += clk-rcar-gen2.o -obj-$(CONFIG_ARCH_R8A7791) += clk-rcar-gen2.o -obj-$(CONFIG_ARCH_R8A7793) += clk-rcar-gen2.o -obj-$(CONFIG_ARCH_R8A7794) += clk-rcar-gen2.o -obj-$(CONFIG_ARCH_SH73A0) += clk-sh73a0.o -obj-$(CONFIG_ARCH_SHMOBILE_MULTI) += clk-div6.o -obj-$(CONFIG_ARCH_SHMOBILE_MULTI) += clk-mstp.o +obj-$(CONFIG_ARCH_R7S72100) += clk-rz.o clk-mstp.o +obj-$(CONFIG_ARCH_R8A73A4) += clk-r8a73a4.o clk-mstp.o clk-div6.o +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_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_SH73A0) += clk-sh73a0.o clk-mstp.o clk-div6.o