From patchwork Mon May 19 17:36:33 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sebastian Hesselbarth X-Patchwork-Id: 4204931 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 7C67EBEEAB for ; Mon, 19 May 2014 17:40:57 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id A00FA202B8 for ; Mon, 19 May 2014 17:40:56 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id CBB8720211 for ; Mon, 19 May 2014 17:40:55 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1WmRWR-0004FH-Ld; Mon, 19 May 2014 17:38:47 +0000 Received: from mail-ee0-x22f.google.com ([2a00:1450:4013:c00::22f]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WmRV3-00034Y-9G for linux-arm-kernel@lists.infradead.org; Mon, 19 May 2014 17:37:22 +0000 Received: by mail-ee0-f47.google.com with SMTP id c13so3846300eek.34 for ; Mon, 19 May 2014 10:36:57 -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=D4awnbSwxSMbKHwxENVZfTEIUFx3aR0KIBrb1YXIxUk=; b=SEMObpxTiJPSQb/ARTp0R2DwtM1kF4NfQzIYYfVXNmqI2c0FH/+jttUNrNSAlLHFzg +sHcRB5mLuSuM9On/T11sESxnbgALMw4PqEvPZalVH+3IQnqv8IxvJU/5ThsPTFilQYZ aI4OXjdyECxl4VGlY7wwCmc7ux3EHPuOoiJeaILILZMQs1Ytx1kP2KFoidBzVDam3b5u q2G9aBcwiT6cpnHZvGb5ui6/cXNUsCayNPxIxJQdJ9ht6LsinjJY8VKaQal0CVuhtogN OplClTE+RRd32+GSrlY57hK20BEQczgujKmGyaEMx3drFawUjGVSVPJHMiiCRTW64Xan 3gpA== X-Received: by 10.14.184.68 with SMTP id r44mr5621186eem.116.1400521017090; Mon, 19 May 2014 10:36:57 -0700 (PDT) Received: from topkick.lan (dslc-082-083-214-160.pools.arcor-ip.net. [82.83.214.160]) by mx.google.com with ESMTPSA id x3sm43365512een.17.2014.05.19.10.36.53 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 19 May 2014 10:36:55 -0700 (PDT) From: Sebastian Hesselbarth To: Sebastian Hesselbarth Subject: [PATCH v4 5/7] ARM: berlin: add the pinctrl dependency for the Marvell Berlin SoCs Date: Mon, 19 May 2014 19:36:33 +0200 Message-Id: <1400520995-27365-6-git-send-email-sebastian.hesselbarth@gmail.com> In-Reply-To: <1400520995-27365-1-git-send-email-sebastian.hesselbarth@gmail.com> References: <1400520995-27365-1-git-send-email-sebastian.hesselbarth@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140519_103721_527258_58CDB244 X-CRM114-Status: UNSURE ( 9.90 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.1 (/) Cc: Thomas Petazzoni , zmxu@marvell.com, Antoine Tenart , linux-kernel@vger.kernel.org, Alexandre Belloni , jszhang@marvell.com, Linus Walleij , linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-2.4 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Antoine Tenart Signed-off-by: Antoine Tenart Acked-by: Sebastian Hesselbarth --- Cc: Linus Walleij Cc: Antoine Tenart Cc: Alexandre Belloni Cc: Thomas Petazzoni Cc: zmxu@marvell.com Cc: jszhang@marvell.com Cc: linux-arm-kernel@lists.infradead.org Cc: linux-kernel@vger.kernel.org --- arch/arm/mach-berlin/Kconfig | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/arch/arm/mach-berlin/Kconfig b/arch/arm/mach-berlin/Kconfig index 95c098f497b5..101e0f356730 100644 --- a/arch/arm/mach-berlin/Kconfig +++ b/arch/arm/mach-berlin/Kconfig @@ -5,6 +5,7 @@ config ARCH_BERLIN select GENERIC_IRQ_CHIP select DW_APB_ICTL select DW_APB_TIMER_OF + select PINCTRL if ARCH_BERLIN @@ -15,16 +16,19 @@ config MACH_BERLIN_BG2 select CACHE_L2X0 select CPU_PJ4B select HAVE_ARM_TWD if SMP + select PINCTRL_BERLIN_BG2 config MACH_BERLIN_BG2CD bool "Marvell Armada 1500-mini (BG2CD)" select CACHE_L2X0 select HAVE_ARM_TWD if SMP + select PINCTRL_BERLIN_BG2CD config MACH_BERLIN_BG2Q bool "Marvell Armada 1500 Pro (BG2-Q)" select CACHE_L2X0 select HAVE_ARM_TWD if SMP + select PINCTRL_BERLIN_BG2Q endmenu