From patchwork Thu Sep 8 17:23:46 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marty Plummer X-Patchwork-Id: 9321829 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 9D5266077F for ; Thu, 8 Sep 2016 17:26:58 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 89DF62996E for ; Thu, 8 Sep 2016 17:26:58 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7DBC929972; Thu, 8 Sep 2016 17:26: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 1C2A52996E for ; Thu, 8 Sep 2016 17:26:58 +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 1bi34u-0008JW-76; Thu, 08 Sep 2016 17:25:32 +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-0006wU-Ol 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 2so5799674oif.2 for ; Thu, 08 Sep 2016 10:23:56 -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=smBiFPaHc03yLIpaPzJsUzJZABzck7HAolnw/YaqLrw=; b=VbGhFKVnxttGIXHEgY9rmDkakIjJlLrFauYr5fj0//xV4Q2brfKY4okdQL/Es4FHeA CTGkSn3GpxYF5d7YfWuX3lQKD3zy7gwDCvubIkkmGazyoNtcxcaC7FjS3pGBWehwVgvw If7/4GVma+uxm1v10ZiWyGYtsUQLrFKGZ//eQ+sFpE3sA9nZFleXHopiqYxRLymRv0mZ gi9x6/365LA6SNqNDwCbBLTwdr1hMswQickgBeDfRxmWN7j+250eAvWqo8JVzr8brLpU wDL+A8GXuV3iuk2gAajZFXsKMFsFh4fRidfoHFDRoYwEoGsjiYCCJ6kXJPqA6d+HaI91 pBAw== 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=smBiFPaHc03yLIpaPzJsUzJZABzck7HAolnw/YaqLrw=; b=ebQ/GmxSjne7rj/9GM/9r/GPVKOB/08kl9YR3l53bmizW81FyjgeU1AsTG3l1VlbLJ +Hxojf3LaRrZ2m9A5cxI+SpywVvNdYahszayPijgIKO8ADIs4G0sap1sAFbv97KZqiIe U0jMSh9+SqJ8kXaLmLbfaKNil7X7lhN+2q2+5RwKeB4yaKYp8XGRENi0MUhQo4jT4AUf YsQwUOYm8CJxB19M3NrpO1jUY9ktUPu8MmBLCoVsS4yl/+8huWowMYAdeK3PgfG34tgS cluttuwGUf/9UEe/EHRHneAsdzKKi3jeQAkJffbXNXBBX3dV5+Q/GtFLzgJl1zeL+GU0 DtiA== X-Gm-Message-State: AE9vXwNOajeRvuxFqEQmEjXqO85XPWm8axMfgTFhic1Alo520AGDK6JFE7vmvRQjL8tBHw== X-Received: by 10.202.221.198 with SMTP id u189mr828902oig.149.1473355435686; 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.55 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 08 Sep 2016 10:23:55 -0700 (PDT) From: Marty Plummer To: xuwei5@hisilicon.com Subject: [RFC 7/7] Make Hi3620 explicit, remove wildcards Date: Thu, 8 Sep 2016 12:23:46 -0500 Message-Id: <20160908172346.27506-7-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_102417_034352_023217C7 X-CRM114-Status: GOOD ( 11.14 ) 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/dma/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/dma/Kconfig b/drivers/dma/Kconfig index 739f797..74bab9d0 100644 --- a/drivers/dma/Kconfig +++ b/drivers/dma/Kconfig @@ -279,7 +279,7 @@ config INTEL_MIC_X100_DMA config K3_DMA tristate "Hisilicon K3 DMA support" - depends on ARCH_HI3xxx + depends on ARCH_HI3620 select DMA_ENGINE select DMA_VIRTUAL_CHANNELS help