From patchwork Wed Mar 23 09:06:33 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "majun \(F\)" X-Patchwork-Id: 64218 Delivered-To: patch@linaro.org Received: by 10.112.199.169 with SMTP id jl9csp2545998lbc; Wed, 23 Mar 2016 02:07:13 -0700 (PDT) X-Received: by 10.66.153.101 with SMTP id vf5mr1218490pab.131.1458724033676; Wed, 23 Mar 2016 02:07:13 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id fe1si2988462pac.200.2016.03.23.02.07.13; Wed, 23 Mar 2016 02:07:13 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754328AbcCWJHL (ORCPT + 29 others); Wed, 23 Mar 2016 05:07:11 -0400 Received: from szxga01-in.huawei.com ([58.251.152.64]:6122 "EHLO szxga01-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753539AbcCWJHD (ORCPT ); Wed, 23 Mar 2016 05:07:03 -0400 Received: from 172.24.1.48 (EHLO szxeml425-hub.china.huawei.com) ([172.24.1.48]) by szxrg01-dlp.huawei.com (MOS 4.3.7-GA FastPath queued) with ESMTP id DHM89970; Wed, 23 Mar 2016 17:06:45 +0800 (CST) Received: from localhost (10.177.235.245) by szxeml425-hub.china.huawei.com (10.82.67.180) with Microsoft SMTP Server id 14.3.235.1; Wed, 23 Mar 2016 17:06:37 +0800 From: MaJun To: , , , , , , , , , , , , , , Subject: [PATCH 2/2] irqchip/mbigen:Change the config option of mbigen driver to non-configurable Date: Wed, 23 Mar 2016 17:06:33 +0800 Message-ID: <1458723993-21044-3-git-send-email-majun258@huawei.com> X-Mailer: git-send-email 1.9.5.msysgit.1 In-Reply-To: <1458723993-21044-1-git-send-email-majun258@huawei.com> References: <1458723993-21044-1-git-send-email-majun258@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.177.235.245] X-CFilter-Loop: Reflected X-Mirapoint-Virus-RAPID-Raw: score=unknown(0), refid=str=0001.0A020204.56F25CA6.0281, ss=1, re=0.000, recu=0.000, reip=0.000, cl=1, cld=1, fgs=0, ip=0.0.0.0, so=2013-06-18 04:22:30, dmn=2013-03-21 17:37:32 X-Mirapoint-Loop-Id: 0b05b56d84711592b819d27482ba1b37 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Ma Jun This config is selected by CONFIG_ARCH_HISI, So we change this config to non-configurable. I also adjust the mbigen config position try to sort the configs in alphabetical order. Signed-off-by: Ma Jun --- drivers/irqchip/Kconfig | 14 ++++++-------- 1 files changed, 6 insertions(+), 8 deletions(-) -- 1.7.1 diff --git a/drivers/irqchip/Kconfig b/drivers/irqchip/Kconfig index 7e8c441..3e12479 100644 --- a/drivers/irqchip/Kconfig +++ b/drivers/irqchip/Kconfig @@ -32,14 +32,6 @@ config ARM_GIC_V3_ITS bool select PCI_MSI_IRQ_DOMAIN -config HISILICON_IRQ_MBIGEN - bool "Support mbigen interrupt controller" - default n - depends on ARM_GIC_V3 && ARM_GIC_V3_ITS && GENERIC_MSI_IRQ_DOMAIN - help - Enable the mbigen interrupt controller used on - Hisilicon platform. - config ARM_NVIC bool select IRQ_DOMAIN @@ -114,6 +106,12 @@ config DW_APB_ICTL select GENERIC_IRQ_CHIP select IRQ_DOMAIN +config HISILICON_IRQ_MBIGEN + bool + select ARM_GIC_V3 + select ARM_GIC_V3_ITS + select GENERIC_MSI_IRQ_DOMAIN + config IMGPDC_IRQ bool select GENERIC_IRQ_CHIP