Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754812AbcCWLH1 (ORCPT ); Wed, 23 Mar 2016 07:07:27 -0400 Received: from terminus.zytor.com ([198.137.202.10]:50978 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754569AbcCWLHX (ORCPT ); Wed, 23 Mar 2016 07:07:23 -0400 Date: Wed, 23 Mar 2016 04:07:08 -0700 From: tip-bot for MaJun Message-ID: Cc: majun258@huawei.com, linux-kernel@vger.kernel.org, hpa@zytor.com, mingo@kernel.org, tglx@linutronix.de Reply-To: tglx@linutronix.de, mingo@kernel.org, hpa@zytor.com, majun258@huawei.com, linux-kernel@vger.kernel.org In-Reply-To: <1458723993-21044-3-git-send-email-majun258@huawei.com> References: <1458723993-21044-3-git-send-email-majun258@huawei.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:irq/urgent] irqchip/mbigen: Make CONFIG_HISILICON_IRQ_MBIGEN a hidden option Git-Commit-ID: 9a7c4abd41c0d553f4fb9845bdd4328155426ac7 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1992 Lines: 68 Commit-ID: 9a7c4abd41c0d553f4fb9845bdd4328155426ac7 Gitweb: http://git.kernel.org/tip/9a7c4abd41c0d553f4fb9845bdd4328155426ac7 Author: MaJun AuthorDate: Wed, 23 Mar 2016 17:06:33 +0800 Committer: Thomas Gleixner CommitDate: Wed, 23 Mar 2016 12:02:29 +0100 irqchip/mbigen: Make CONFIG_HISILICON_IRQ_MBIGEN a hidden option This config is selected by CONFIG_ARCH_HISI, so there is no point to have it user configurable. While at it move the config option to the proper place in the alphabetically sorted option list. Requested-by: Thomas Gleixner Signed-off-by: Ma Jun Cc: mark.rutland@arm.com Cc: jason@lakedaemon.net Cc: marc.zyngier@arm.com Cc: Catalin.Marinas@arm.com Cc: guohanjun@huawei.com Cc: Will.Deacon@arm.com Cc: huxinwei@huawei.com Cc: lizefan@huawei.com Cc: dingtianhong@huawei.com Cc: zhaojunhua@hisilicon.com Cc: liguozhu@hisilicon.com Cc: linux-arm-kernel@lists.infradead.org Link: http://lkml.kernel.org/r/1458723993-21044-3-git-send-email-majun258@huawei.com Signed-off-by: Thomas Gleixner --- drivers/irqchip/Kconfig | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) 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