From patchwork Thu Sep 8 17:23:41 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marty Plummer X-Patchwork-Id: 9321823 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 2616D6077F for ; Thu, 8 Sep 2016 17:25:58 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 11B442995B for ; Thu, 8 Sep 2016 17:25:58 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 045A82996E; Thu, 8 Sep 2016 17:25:58 +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 BB6762995B for ; Thu, 8 Sep 2016 17:25:57 +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 1bi342-00071L-UK; Thu, 08 Sep 2016 17:24:38 +0000 Received: from mail-oi0-x243.google.com ([2607:f8b0:4003:c06::243]) by bombadil.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1bi33d-0006wC-NG for linux-arm-kernel@lists.infradead.org; Thu, 08 Sep 2016 17:24:14 +0000 Received: by mail-oi0-x243.google.com with SMTP id x125so3213919oia.1 for ; Thu, 08 Sep 2016 10:23:53 -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=d/3+v8GWEOGtaAwTSgz7trey+1AwD2zfhQsi9K0sFLo=; b=ieVldclsXyPzWe1JbS3mvJOtyLNClo6GVSdoiGZ/MomAkDqO9sLfdNhwNX6I6M165i /7QR7IzjZvJxDRrfGM4S9f5ZXOSZAbyFlzC/GDM7owo2h8SEdEievZyC2b8aK7XeLcPg TUT7D7k3meSq1AOA3Nkvdzq4FeOZprRzZHjU9voebc08RlmUdDrXDPKJuzz0IE79rNYm j8ZxOISUgA1FWxNL8CoyxZ1HDf1RLml7tznVl6or9peumqWODPcDhHPqr6uLL5NcLUO4 gDBh1mAHj3KYi33n6qiRKo/oI/69pCjMsJSJqO3tRF31bIi1/9q5UKGn4G3DcN7r32QE oIDw== 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=d/3+v8GWEOGtaAwTSgz7trey+1AwD2zfhQsi9K0sFLo=; b=nIrX9AF8gfpdrHw37q2Au0voYyCnnKctHxBglWemzw4b+h98eMbctazczHvl06eYcw YfBaGKF5uO3aSGY1vrxFgELR8mhZgWL1FPYQ6PQvIiWd0m/8NheH0Db6afGoFkdmKvsW e8uBFLRFPfrX5troC+cZHH47FIF+8tTl7j0t3XPWUx3F1NsQXq8u1w/SpFuIQEINAEnH egK+OT0UNgIWsoDat2j831QzR9/f0G5fniKYGiFmXSyQnPFiEHLruxIiE6ggkP98kHkN vxF/H2kpPZfqQIgPo6q7PzwuGURtRtQLMoHeBMMA2JqCphzRFn0tYKBgpPsRXINzVxWA Nu7g== X-Gm-Message-State: AE9vXwOfN9DcrTMfoWMAWL3+PQbV3sQnFPET7wyiU0mAzkARxGaUeGXAdGtNEm/Gjo43Jw== X-Received: by 10.202.90.196 with SMTP id o187mr837626oib.75.1473355433080; Thu, 08 Sep 2016 10:23:53 -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.52 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 08 Sep 2016 10:23:52 -0700 (PDT) From: Marty Plummer To: xuwei5@hisilicon.com Subject: [RFC 2/7] Make Hi3620 explicit, remove wildcards Date: Thu, 8 Sep 2016 12:23:41 -0500 Message-Id: <20160908172346.27506-2-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_102413_870212_40E04F3E X-CRM114-Status: GOOD ( 10.13 ) 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 --- arch/arm/boot/dts/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index faacd52..7ffd3a3 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -154,7 +154,7 @@ dtb-$(CONFIG_ARCH_EXYNOS5) += \ exynos5440-sd5v1.dtb \ exynos5440-ssdk5440.dtb \ exynos5800-peach-pi.dtb -dtb-$(CONFIG_ARCH_HI3xxx) += \ +dtb-$(CONFIG_ARCH_HI3620) += \ hi3620-hi4511.dtb dtb-$(CONFIG_ARCH_HIGHBANK) += \ highbank.dtb \