From patchwork Thu Sep 8 17:23:45 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marty Plummer X-Patchwork-Id: 9321827 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id B74026077F for ; Thu, 8 Sep 2016 17:26:37 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A43CA2996E for ; Thu, 8 Sep 2016 17:26:37 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 97D0C29972; Thu, 8 Sep 2016 17:26:37 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 39CC82996E for ; Thu, 8 Sep 2016 17:26:37 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.85_2 #1 (Red Hat Linux)) id 1bi34a-0007Rf-Aa; Thu, 08 Sep 2016 17:25:12 +0000 Received: from mail-oi0-x242.google.com ([2607:f8b0:4003:c06::242]) by bombadil.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1bi33g-0006wR-OT for linux-arm-kernel@lists.infradead.org; Thu, 08 Sep 2016 17:24:17 +0000 Received: by mail-oi0-x242.google.com with SMTP id s71so2854822oih.3 for ; Thu, 08 Sep 2016 10:23:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=ai8CUBtQOHTZh/HIwDvmTS7HZXTXGPXDwwZCQ6/59Kk=; b=KTgasUjByjcyC0D3xRjYQvvrVjCYpyRuXgiEBdXg12qWA0pnVArH3wqcr5TQjqzXKP 47Gh0Z3g+E5rb3cg9YDAmMKsYZe9/9rzpiWqscvorzHNIFok72mcCTPTwzEkeN76hdLL AAQHLIETG2enh1IBpU6FzaReEtDy4rtTf1hKHIJa7VwihdjetO4xxgQ8akwitBhDMYBL cChMMpKq0MVvBkVKG7gMOQ4josZP+wBBobgzGadLz7cPVBZwXEVcfPiX826RPaUuoGJv o8q+1jFmZMbMKo00eYO4zZe53GuC1kOMeGWpvpX1P7WUDLDQxeREJ6mD+f4+H40yzUUv zOGg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=ai8CUBtQOHTZh/HIwDvmTS7HZXTXGPXDwwZCQ6/59Kk=; b=jWIclKrBHufvXM8zKwDU+aCaVQQOIV/b+JSz/3jpk5b8HbVC6hr5qaFRomYP45vjWP qAJNHLSh/YAvJTxldHSg/a3YKJaczCO//7GEho23YCr5cZSXbug1TIHP/PdPQ9KAZ1X3 jm4huu1RsNd5AtDfCl1j62/baDW0ryf6coPof66/kA/MeMWfciQFtcMmH8JFNzF21CDz NaD7R5/poNhITZMALAmx5SGanhdf+0bA5g0eaeoUktZiKqYeoSyHxlEY0UIgRJ1379i/ gcKIoJMy/eCLvQdMNni5SVbn/UPNW25wregLORLGiUbo7zA7jrfBEPrdxq2grdumXqAR QqCg== X-Gm-Message-State: AE9vXwNSERig0ZzdL1gKcTV7ZCgVGy7J1ZiHO6rCb0E3+EX96ueh3UAIb+Y2gWxoeL3kdw== X-Received: by 10.202.66.6 with SMTP id p6mr909930oia.56.1473355435136; Thu, 08 Sep 2016 10:23:55 -0700 (PDT) Received: from tha-monstah.mydomain (cpe-72-176-81-0.stx.res.rr.com. [72.176.81.0]) by smtp.googlemail.com with ESMTPSA id s37sm14460646otd.13.2016.09.08.10.23.54 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 08 Sep 2016 10:23:54 -0700 (PDT) From: Marty Plummer To: xuwei5@hisilicon.com Subject: [RFC 6/7] Make Hi3620 explicit, remove wildcards Date: Thu, 8 Sep 2016 12:23:45 -0500 Message-Id: <20160908172346.27506-6-netz.kernel@gmail.com> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20160908172346.27506-1-netz.kernel@gmail.com> References: <20160908172346.27506-1-netz.kernel@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160908_102416_991109_FB42CE0A X-CRM114-Status: UNSURE ( 9.78 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP This is a preparatory series for adding the ARMv5/v6 hi3520 SoCs. Assumptions were made when adding hi3620 that don't hold water in light of adding support for the hi3520 SoC. Fix the issue by renaming config options and other namespaces to avoid collisions with the new work. Only internal APIs are modified with this series. Signed-off-by: Marty Plummer --- drivers/clk/hisilicon/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/clk/hisilicon/Makefile b/drivers/clk/hisilicon/Makefile index e169ec7..2edf3b5 100644 --- a/drivers/clk/hisilicon/Makefile +++ b/drivers/clk/hisilicon/Makefile @@ -4,7 +4,7 @@ obj-y += clk.o clkgate-separated.o clkdivider-hi6220.o -obj-$(CONFIG_ARCH_HI3xxx) += clk-hi3620.o +obj-$(CONFIG_ARCH_HI3620) += clk-hi3620.o obj-$(CONFIG_ARCH_HIP04) += clk-hip04.o obj-$(CONFIG_ARCH_HIX5HD2) += clk-hix5hd2.o obj-$(CONFIG_COMMON_CLK_HI3519) += clk-hi3519.o