From patchwork Thu May 9 18:12:50 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Doug Anderson X-Patchwork-Id: 2545031 Return-Path: X-Original-To: patchwork-linux-samsung-soc@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id AF76CDFE75 for ; Thu, 9 May 2013 18:19:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752670Ab3EISTi (ORCPT ); Thu, 9 May 2013 14:19:38 -0400 Received: from mail-qc0-f201.google.com ([209.85.216.201]:35151 "EHLO mail-qc0-f201.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751528Ab3EISTh (ORCPT ); Thu, 9 May 2013 14:19:37 -0400 Received: by mail-qc0-f201.google.com with SMTP id c10so317372qcz.4 for ; Thu, 09 May 2013 11:19:36 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references:x-gm-message-state; bh=kJKO59vYKfIy0A7SRhp+i3fVAq325YCpJL2hxBi8Xz0=; b=DZM6CFziwMRs/DvSh+86WGSkztC3xdinsZBdfooHIAlVFhAI06Wmq3Sc075WAAkqKQ f9zsdu+QdUOYICMROqsObtLY84uZXidA3yZtLr5pwqk/AjzRWGFyMus6vR7tIs9ZsWHY DD1CD6U7ux0fulzYjqdTweDtkneB6vRY/c8qsFJqm3Vc5vx+TTLrvgZJ/0ZD/NA/p9lq EXukO4A4M4oC1ZTWsrSohZKKJTASuEWbXhImuF0WMhUifEYuLJbbXpL9yU2RxfOtLZCW IxYMhp4CYr9t3u6h2T49ekyI+yzWnuCQSx42lAHU/eXVE8Hh371Dw8Nn7n315dc096pZ 5cTw== X-Received: by 10.236.36.44 with SMTP id v32mr6930705yha.33.1368123181108; Thu, 09 May 2013 11:13:01 -0700 (PDT) Received: from corp2gmr1-1.hot.corp.google.com (corp2gmr1-1.hot.corp.google.com [172.24.189.92]) by gmr-mx.google.com with ESMTPS id n23si231701yhi.7.2013.05.09.11.13.01 for (version=TLSv1.1 cipher=AES128-SHA bits=128/128); Thu, 09 May 2013 11:13:01 -0700 (PDT) Received: from tictac.mtv.corp.google.com (tictac.mtv.corp.google.com [172.22.162.34]) by corp2gmr1-1.hot.corp.google.com (Postfix) with ESMTP id D10D231C071; Thu, 9 May 2013 11:13:00 -0700 (PDT) Received: by tictac.mtv.corp.google.com (Postfix, from userid 121310) id 79A9C8082D; Thu, 9 May 2013 11:13:00 -0700 (PDT) From: Doug Anderson To: Kukjin Kim Cc: Thomas Abraham , Olof Johansson , Simon Glass , Alim Akhtar , Tomasz Figa , Doug Anderson , Russell King , Linus Walleij , linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v3] ARM: exynos: Select PINCTRL_EXYNOS for exynos4/5 at chip level Date: Thu, 9 May 2013 11:12:50 -0700 Message-Id: <1368123170-22906-1-git-send-email-dianders@chromium.org> X-Mailer: git-send-email 1.8.2.1 In-Reply-To: <1368039168-24447-1-git-send-email-dianders@chromium.org> References: <1368039168-24447-1-git-send-email-dianders@chromium.org> X-Gm-Message-State: ALoCoQnhMWLog4ZF0VIrS0mHZ+cp1b7Y5jJ/JihWoy1PFbLYcAVtFyqBIbzfV9QJAOEIQLDDMdNDtDEMUEuUbMUh1xu7nrJ24BqKJXWXs4gdFeFwnHBF3rBO61tMUlKUQ8vq/o3OB3u73Ha0kbjPhciTW+uOWFQF7qeGzN1gWKhI/moojlewd1JipuGpEKNgiNOKofGcjL7nRXh/sFUF5lL7ootl8z3FKQ== Sender: linux-samsung-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-samsung-soc@vger.kernel.org Previously if you had MACH_EXYNOS5_DT but not MACH_EXYNOS4_DT you'd be missing the pincontrol definitions. Move PINCTRL selects to the arch level since we should be enabling the code for all exynos variants. Update the PINCTRL descriptions to indicate that PINCTRL_EXYNOS is not for exynos5440. Also add basic dependencies for the PINCTRL_EXYNOS kernel config. Signed-off-by: Doug Anderson Acked-by: Linus Walleij for the pinctrl --- Changes in v3: - Moved to chip level as per Tomasz. - Update PINCTRL Kconfig for exynos. Changes in v2: - Moved to the arch level as suggested by Olof. arch/arm/mach-exynos/Kconfig | 9 ++++++--- drivers/pinctrl/Kconfig | 5 +++-- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/arch/arm/mach-exynos/Kconfig b/arch/arm/mach-exynos/Kconfig index 6e77432..4139d7f 100644 --- a/arch/arm/mach-exynos/Kconfig +++ b/arch/arm/mach-exynos/Kconfig @@ -17,6 +17,7 @@ config ARCH_EXYNOS4 select HAVE_ARM_SCU if SMP select HAVE_SMP select MIGHT_HAVE_CACHE_L2X0 + select PINCTRL help Samsung EXYNOS4 SoCs based systems @@ -24,6 +25,7 @@ config ARCH_EXYNOS5 bool "SAMSUNG EXYNOS5" select HAVE_ARM_SCU if SMP select HAVE_SMP + select PINCTRL help Samsung EXYNOS5 (Cortex-A15) SoC based systems @@ -34,6 +36,7 @@ config CPU_EXYNOS4210 default y depends on ARCH_EXYNOS4 select ARM_CPU_SUSPEND if PM + select PINCTRL_EXYNOS select PM_GENERIC_DOMAINS select S5P_PM if PM select S5P_SLEEP if PM @@ -45,6 +48,7 @@ config SOC_EXYNOS4212 bool "SAMSUNG EXYNOS4212" default y depends on ARCH_EXYNOS4 + select PINCTRL_EXYNOS select S5P_PM if PM select S5P_SLEEP if PM select SAMSUNG_DMADEV @@ -55,6 +59,7 @@ config SOC_EXYNOS4412 bool "SAMSUNG EXYNOS4412" default y depends on ARCH_EXYNOS4 + select PINCTRL_EXYNOS select SAMSUNG_DMADEV help Enable EXYNOS4412 SoC support @@ -63,6 +68,7 @@ config SOC_EXYNOS5250 bool "SAMSUNG EXYNOS5250" default y depends on ARCH_EXYNOS5 + select PINCTRL_EXYNOS select PM_GENERIC_DOMAINS if PM select S5P_PM if PM select S5P_SLEEP if PM @@ -78,7 +84,6 @@ config SOC_EXYNOS5440 select ARCH_HAS_OPP select ARM_ARCH_TIMER select AUTO_ZRELADDR - select PINCTRL select PINCTRL_EXYNOS5440 select PM_OPP help @@ -412,8 +417,6 @@ config MACH_EXYNOS4_DT select CLKSRC_OF select CPU_EXYNOS4210 select KEYBOARD_SAMSUNG if INPUT_KEYBOARD - select PINCTRL - select PINCTRL_EXYNOS select S5P_DEV_MFC select USE_OF help diff --git a/drivers/pinctrl/Kconfig b/drivers/pinctrl/Kconfig index 8f66924..a1c6dd3 100644 --- a/drivers/pinctrl/Kconfig +++ b/drivers/pinctrl/Kconfig @@ -207,12 +207,13 @@ config PINCTRL_SAMSUNG select PINCONF config PINCTRL_EXYNOS - bool "Pinctrl driver data for Samsung EXYNOS SoCs" - depends on OF && GPIOLIB + bool "Pinctrl driver data for Samsung EXYNOS SoCs other than 5440" + depends on OF && GPIOLIB && ARCH_EXYNOS select PINCTRL_SAMSUNG config PINCTRL_EXYNOS5440 bool "Samsung EXYNOS5440 SoC pinctrl driver" + depends on SOC_EXYNOS5440 select PINMUX select PINCONF