From patchwork Mon Apr 22 08:47:43 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Mack X-Patchwork-Id: 1088611 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-gpio-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=zonque.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 44ngFl17vJz9s4Y for ; Mon, 22 Apr 2019 18:47:55 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726949AbfDVIry (ORCPT ); Mon, 22 Apr 2019 04:47:54 -0400 Received: from mail.bugwerft.de ([46.23.86.59]:50144 "EHLO mail.bugwerft.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726434AbfDVIry (ORCPT ); Mon, 22 Apr 2019 04:47:54 -0400 Received: from localhost.localdomain (pD95EFAF2.dip0.t-ipconnect.de [217.94.250.242]) by mail.bugwerft.de (Postfix) with ESMTPSA id 427FF2A9DC2; Mon, 22 Apr 2019 08:46:01 +0000 (UTC) From: Daniel Mack To: robert.jarzmik@free.fr, haojian.zhuang@gmail.com, linus.walleij@linaro.org Cc: linux-gpio@vger.kernel.org, Daniel Mack Subject: [PATCH 2/4] ARM: pxa: raumfeld-controller: fix 'dock detect' GPIO key Date: Mon, 22 Apr 2019 10:47:43 +0200 Message-Id: <20190422084745.9064-3-daniel@zonque.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190422084745.9064-1-daniel@zonque.org> References: <20190422084745.9064-1-daniel@zonque.org> MIME-Version: 1.0 Sender: linux-gpio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-gpio@vger.kernel.org The dock detection input key is active low. Also add a pinmux for it. Signed-off-by: Daniel Mack --- arch/arm/boot/dts/pxa300-raumfeld-controller.dts | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/pxa300-raumfeld-controller.dts b/arch/arm/boot/dts/pxa300-raumfeld-controller.dts index cf9ab1ad568f..c57428ed5cf0 100644 --- a/arch/arm/boot/dts/pxa300-raumfeld-controller.dts +++ b/arch/arm/boot/dts/pxa300-raumfeld-controller.dts @@ -107,9 +107,10 @@ }; &keys { + pinctrl-0 = <&gpio_keys_pins &dock_detect_pins>; dock-detect { label = "dock detect"; - gpios = <&gpio 116 GPIO_ACTIVE_HIGH>; + gpios = <&gpio 116 GPIO_ACTIVE_LOW>; linux,code = ; }; }; @@ -235,6 +236,14 @@ pinctrl-single,low-power-mode = MFP_LPM(MFP_LPM_FLOAT); }; + dock_detect_pins: dock_detect_pins { + pinctrl-single,pins = < + MFP_PIN_PXA300(116) MFP_AF0 /* DOCK_DETECT */ + >; + pinctrl-single,low-power-mode = MFP_LPM(MFP_LPM_PULL_HIGH); + pinctrl-single,bias-pullup = MPF_PULL_UP; + }; + lcdc_pins: lcdc_pins { pinctrl-single,pins = < MFP_PIN_PXA300(54) MFP_AF1 /* LDD_0 */