From patchwork Sat Apr 6 15:01:23 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bastian Hecht X-Patchwork-Id: 2401711 Return-Path: X-Original-To: patchwork-linux-sh@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 76983DFB7B for ; Sat, 6 Apr 2013 14:01:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1422924Ab3DFOB0 (ORCPT ); Sat, 6 Apr 2013 10:01:26 -0400 Received: from mail-bk0-f51.google.com ([209.85.214.51]:52598 "EHLO mail-bk0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1422884Ab3DFOBZ (ORCPT ); Sat, 6 Apr 2013 10:01:25 -0400 Received: by mail-bk0-f51.google.com with SMTP id y8so2461522bkt.24 for ; Sat, 06 Apr 2013 07:01:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer; bh=FRiuXEw1X4c6VMx63mh2F6/1G6YOH2SjmRwen8dwh9w=; b=fkT25GgqF2phQT4q2yGtASFaVAYl4u3gOcLoGnlmZ/rKGF/5UHthTJnWetM2V0zTMM kn0Gkk6HB1UuO1VRfbNl5EJcz70jM1glPBRrXZT4c2JW5Cvjuhbhd6AatUB2IrcjNmpe GKlK1yJV+ulug7yRblpYYCkL03EBOgwP/Tmgmwljv5qT+HoYiNx2wMH1QPQEzBr0cJVI aNO6oD6GBd9IjSq/ewXQn/YG9QIbUV0AloSxPdt5GqnZ2HgoYYX4l5UR0yUJxw9j7CRL vB45wZWsyrkVZIP4l+RKfqthiUm4wZVAJwAxQyQL9if9wtYZhowW/UloVglP2emH10Ay G6Zg== X-Received: by 10.205.131.197 with SMTP id hr5mr8340848bkc.124.1365256884009; Sat, 06 Apr 2013 07:01:24 -0700 (PDT) Received: from localhost.localdomain (g229018019.adsl.alicedsl.de. [92.229.18.19]) by mx.google.com with ESMTPS id b17sm730419bky.19.2013.04.06.07.01.20 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sat, 06 Apr 2013 07:01:23 -0700 (PDT) From: Bastian Hecht To: linux-sh@vger.kernel.org Cc: Magnus Damm , Simon Horman , Laurent Pichart , Kuninori Morimoto Subject: [RFC] ARM: shmobile: Armadillo800EVA: Replace GPIO function request Date: Sat, 6 Apr 2013 17:01:23 +0200 Message-Id: <1365260483-25556-1-git-send-email-hechtb+renesas@gmail.com> X-Mailer: git-send-email 1.7.9.5 Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org We move to the new pinctrl framework to set up the function for the touchscreen IRQ. This is an RFC related to the discussion at [PATCH 6/6] ARM: shmobile: Armadillo800EVA: Reference DT implementation Not-signed-off-by: Bastian Hecht --- arch/arm/mach-shmobile/board-armadillo800eva.c | 6 +++--- drivers/pinctrl/sh-pfc/pfc-r8a7740.c | 13 +++++++++++++ 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/arch/arm/mach-shmobile/board-armadillo800eva.c b/arch/arm/mach-shmobile/board-armadillo800eva.c index d82e67a..a1891f4 100644 --- a/arch/arm/mach-shmobile/board-armadillo800eva.c +++ b/arch/arm/mach-shmobile/board-armadillo800eva.c @@ -1064,6 +1064,9 @@ static const struct pinctrl_map eva_pinctrl_map[] = { "sdhi0_ctrl", "sdhi0"), PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_sdhi.0", "pfc-r8a7740", "sdhi0_wp", "sdhi0"), + /* ST1232 */ + PIN_MAP_MUX_GROUP_DEFAULT("i2c-sh_mobile.0", "pfc-r8a7740", + "intc_irq10", "intc"), }; static void __init eva_clock_init(void) @@ -1124,9 +1127,6 @@ static void __init eva_init(void) gpio_request_one(61, GPIOF_OUT_INIT_HIGH, NULL); /* LCDDON */ gpio_request_one(202, GPIOF_OUT_INIT_LOW, NULL); /* LCD0_LED_CONT */ - /* Touchscreen */ - gpio_request(GPIO_FN_IRQ10, NULL); /* TP_INT */ - /* GETHER */ gpio_request(GPIO_FN_ET_CRS, NULL); gpio_request(GPIO_FN_ET_MDC, NULL); diff --git a/drivers/pinctrl/sh-pfc/pfc-r8a7740.c b/drivers/pinctrl/sh-pfc/pfc-r8a7740.c index 21ff7f2..1810e56 100644 --- a/drivers/pinctrl/sh-pfc/pfc-r8a7740.c +++ b/drivers/pinctrl/sh-pfc/pfc-r8a7740.c @@ -1658,6 +1658,14 @@ static struct sh_pfc_pin pinmux_pins[] = { GPIO_PORT_ALL(), }; +/* - INTC ------------------------------------------------------------------- */ +static const unsigned int intc_irq10_pins[] = { + /* IRQ */ + 19, +}; +static const unsigned int intc_irq10_mux[] = { + IRQ10_MARK, +}; /* - LCD0 ------------------------------------------------------------------- */ static const unsigned int lcd0_data8_pins[] = { /* D[0:7] */ @@ -2062,6 +2070,7 @@ static const unsigned int sdhi2_wp_1_mux[] = { }; static const struct sh_pfc_pin_group pinmux_groups[] = { + SH_PFC_PIN_GROUP(intc_irq10), SH_PFC_PIN_GROUP(lcd0_data8), SH_PFC_PIN_GROUP(lcd0_data9), SH_PFC_PIN_GROUP(lcd0_data12), @@ -2112,6 +2121,10 @@ static const struct sh_pfc_pin_group pinmux_groups[] = { SH_PFC_PIN_GROUP(sdhi2_wp_1), }; +static const char * const intc_groups[] = { + "intc_irq10", +}; + static const char * const lcd0_groups[] = { "lcd0_data8", "lcd0_data9",