From patchwork Wed Nov 7 20:17:44 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janusz Krzysztofik X-Patchwork-Id: 994479 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=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="Poswbhgf"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 42qyNx3Pckz9s9J for ; Thu, 8 Nov 2018 07:16:33 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726806AbeKHFsN (ORCPT ); Thu, 8 Nov 2018 00:48:13 -0500 Received: from mail-lf1-f66.google.com ([209.85.167.66]:39284 "EHLO mail-lf1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726524AbeKHFsM (ORCPT ); Thu, 8 Nov 2018 00:48:12 -0500 Received: by mail-lf1-f66.google.com with SMTP id n18so12441203lfh.6; Wed, 07 Nov 2018 12:16:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=39mD7pgVBuElFJQ3mjWUtS+vlqTvSmmnI9p5XoWxu2c=; b=PoswbhgfLu+Y1TgpE7Vw26Nget0TxVpH0ftCItkypEY2qHc+OWSwfFzZCTCaWhL6qr m7sTF2yVw/orK7cwlhdCn+TWNdmuhcbVRlY05p7bSjUX/tuQf2dT7+TJEfyjYwJIDIaO Rw8S+og6WSoYO01OwVCJBzL/kBBiG0cibc5J7/+raSzpUfzRCY2PjI9lw6+hbpx6RBuX eb/9PPlPhHmx7YjIl8iHVHcwuzTTPNPaxQrQz7si0pB8S72avsJl1fmVo0kCL+O0U6tJ i/O+r3+NC0TbqbOrMivcIZclP3sdiv6SSqvTiGdYn13oJBG44ggiMU3oksbFrsRSZuHp 2W7Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=39mD7pgVBuElFJQ3mjWUtS+vlqTvSmmnI9p5XoWxu2c=; b=tuEssjzbMr2Srw/kSVexOxSnwavzErkPrhLJiHTj4vL/MxTpr7eVNJFbGzAKoiJfjg evzgnAkafcA5Hg90598ffMQjpF062MbU0rzDkfiUKgI1eOaneVDwcD04RxycoA+iqQVq vgsh0EbMQYqWCvj7L13JSEVw9qg6ekBhfFYyntpGakg5dglHQnH+ZeTDgnkZ+kRXEnid g+jVOp1EzE7avWq4gY94coBwT+UM+tZCyi3HPD768bR4DvlbMogKKD7OCPVOhcUOWqOb 20asshIfdIHIXUP5HHAN7IirGj7VrWrkZlqCpAlfh9tnVtycKsgKp0HyxPmTYS2RzH0B 32Og== X-Gm-Message-State: AGRZ1gImFi7zTnJIEgxSQet8Yxfx3v583pzS1K88ZZ3DOtJhiAak8pRC XcTqkmh1EpW2JmZMTtwiTvs= X-Google-Smtp-Source: AJdET5eeUSqla6DNbcynhxJFlwkG88h4g49E9DtL8RXu06qWx7VHqkQnsLEVI242UWjBrI6cflWqlA== X-Received: by 2002:a19:7919:: with SMTP id u25mr962730lfc.18.1541621774451; Wed, 07 Nov 2018 12:16:14 -0800 (PST) Received: from z50.lan (93-181-165-181.internetia.net.pl. [93.181.165.181]) by smtp.gmail.com with ESMTPSA id c19sm285650lfg.86.2018.11.07.12.16.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 07 Nov 2018 12:16:13 -0800 (PST) From: Janusz Krzysztofik To: Tony Lindgren Cc: Aaro Koskinen , Linus Walleij , linux-arm-kernel@lists.infradead.org, linux-omap@vger.kernel.org, linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org, Janusz Krzysztofik Subject: [PATCH 1/3] ARM: OMAP1: ams-delta: Drop board specific global GPIO numbers Date: Wed, 7 Nov 2018 21:17:44 +0100 Message-Id: <20181107201746.14705-2-jmkrzyszt@gmail.com> X-Mailer: git-send-email 2.16.4 In-Reply-To: <20181107201746.14705-1-jmkrzyszt@gmail.com> References: <20181107201746.14705-1-jmkrzyszt@gmail.com> Sender: linux-gpio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-gpio@vger.kernel.org As all users of the board specific GPIO pins have been converted from legacy integer-based to descriptor-based interface, there is no longer a need to maintain statically assigned GPIO pin numbers. Drop support for that. Signed-off-by: Janusz Krzysztofik --- arch/arm/mach-omap1/board-ams-delta.c | 3 --- arch/arm/mach-omap1/board-ams-delta.h | 16 ---------------- 2 files changed, 19 deletions(-) diff --git a/arch/arm/mach-omap1/board-ams-delta.c b/arch/arm/mach-omap1/board-ams-delta.c index 19e0c071d675..a6986a83a916 100644 --- a/arch/arm/mach-omap1/board-ams-delta.c +++ b/arch/arm/mach-omap1/board-ams-delta.c @@ -167,7 +167,6 @@ static struct omap_usb_config ams_delta_usb_config __initdata = { .pins[0] = 2, }; -#define LATCH1_GPIO_BASE 232 #define LATCH1_NGPIO 8 static struct resource latch1_resources[] = { @@ -183,7 +182,6 @@ static struct resource latch1_resources[] = { static struct bgpio_pdata latch1_pdata = { .label = LATCH1_LABEL, - .base = LATCH1_GPIO_BASE, .ngpio = LATCH1_NGPIO, }; @@ -219,7 +217,6 @@ static struct resource latch2_resources[] = { static struct bgpio_pdata latch2_pdata = { .label = LATCH2_LABEL, - .base = AMS_DELTA_LATCH2_GPIO_BASE, .ngpio = AMS_DELTA_LATCH2_NGPIO, }; diff --git a/arch/arm/mach-omap1/board-ams-delta.h b/arch/arm/mach-omap1/board-ams-delta.h index a74a306d7e77..06e4c64a47f8 100644 --- a/arch/arm/mach-omap1/board-ams-delta.h +++ b/arch/arm/mach-omap1/board-ams-delta.h @@ -41,22 +41,6 @@ #define AMS_DELTA_GPIO_PIN_CONFIG 11 #define AMS_DELTA_GPIO_PIN_NAND_RB 12 -#define AMS_DELTA_GPIO_PIN_LCD_VBLEN 240 -#define AMS_DELTA_GPIO_PIN_LCD_NDISP 241 -#define AMS_DELTA_GPIO_PIN_NAND_NCE 242 -#define AMS_DELTA_GPIO_PIN_NAND_NRE 243 -#define AMS_DELTA_GPIO_PIN_NAND_NWP 244 -#define AMS_DELTA_GPIO_PIN_NAND_NWE 245 -#define AMS_DELTA_GPIO_PIN_NAND_ALE 246 -#define AMS_DELTA_GPIO_PIN_NAND_CLE 247 -#define AMS_DELTA_GPIO_PIN_KEYBRD_PWR 248 -#define AMS_DELTA_GPIO_PIN_KEYBRD_DATAOUT 249 -#define AMS_DELTA_GPIO_PIN_SCARD_RSTIN 250 -#define AMS_DELTA_GPIO_PIN_SCARD_CMDVCC 251 -#define AMS_DELTA_GPIO_PIN_MODEM_NRESET 252 -#define AMS_DELTA_GPIO_PIN_MODEM_CODEC 253 - -#define AMS_DELTA_LATCH2_GPIO_BASE AMS_DELTA_GPIO_PIN_LCD_VBLEN #define AMS_DELTA_LATCH2_NGPIO 16 #endif /* CONFIG_MACH_AMS_DELTA */ From patchwork Wed Nov 7 20:17:45 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janusz Krzysztofik X-Patchwork-Id: 994478 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=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="QakvFgC0"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 42qyNr4SbKz9sDJ for ; Thu, 8 Nov 2018 07:16:28 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726910AbeKHFsP (ORCPT ); Thu, 8 Nov 2018 00:48:15 -0500 Received: from mail-lf1-f66.google.com ([209.85.167.66]:36952 "EHLO mail-lf1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726352AbeKHFsO (ORCPT ); Thu, 8 Nov 2018 00:48:14 -0500 Received: by mail-lf1-f66.google.com with SMTP id p17so12428969lfh.4; Wed, 07 Nov 2018 12:16:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=0Ca/oaZHdOkqaq3mknp73TodAa8FD7n+xhH62XjZakk=; b=QakvFgC0pyMYjsPmym9LP3PUl8Ma8Ys5jf4fDIoi25mTQtQgiHBHmicNWI4L32PneO LODuHwStrnuf2HO8A/U/0tvdn3h2/hdFztFWxKuPDQupKqdOhig0+eEqewmbRzLZhuvd TOOn5sb21cBM3QQbDXu1ui91X/oVHcxgUyElz5ft3dz28Ub2zxD3rFRsT2K7oAd581wT HbSODLbXPBmys09kNq1G9dl7drlFm6dAjLpYxLfNooPTRx290BDWZbJ4pAT0yohvYGGV 8EkRkKAxgkWoYSKSS/EIaj0R1XIsmP7YP/mhdrnh3lltLeP/KYC0mkb8N3udOd3N1pho ceVA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=0Ca/oaZHdOkqaq3mknp73TodAa8FD7n+xhH62XjZakk=; b=tY94+nA8aZ+4UYgpFP5SpO6Gfrywf3LEwhE6AptbzHjaGnojMlEKlYMYaiR5kelv/X szDM6gjyEECipivWT60lh89ByxxK5TYZuy12jpxWOq94ciP4axuMOEZRaPi4hhHSLq2o 3LMNTmH4ibbPy5gTCyGokIIBm0UBt2uUUQNC1y31++n60ExDOltSrmwp1X5m3U+QIt6s blnKQs5WdoHIG6EsutJiO0sDMLiMrQhsAq+6WHEsxAr5uSbFojoAbEak7wZ06bu6qVHL mgYmzc3ZiOBaZ1Hqfyzx3n7rKlnHKu3H+9+fU86gl+rQ9+eeu5ueS4+7Mlq84/ztFiNg HpQw== X-Gm-Message-State: AGRZ1gJGoP1spY3eOwMA40rhPoHSxkNrGJHLGPhfGOPSKKyarchqvbEa CMdPIDCrWxyUc3VNwgnNq+k= X-Google-Smtp-Source: AJdET5clRlIdyBRHkByaegx+YWp92XqKHCthjec3i7Z0+jaBzbwgzKElnus4Y0udmAWwqe1WuaGV2w== X-Received: by 2002:a19:df41:: with SMTP id q1mr1020009lfj.25.1541621775918; Wed, 07 Nov 2018 12:16:15 -0800 (PST) Received: from z50.lan (93-181-165-181.internetia.net.pl. [93.181.165.181]) by smtp.gmail.com with ESMTPSA id c19sm285650lfg.86.2018.11.07.12.16.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 07 Nov 2018 12:16:15 -0800 (PST) From: Janusz Krzysztofik To: Tony Lindgren Cc: Aaro Koskinen , Linus Walleij , linux-arm-kernel@lists.infradead.org, linux-omap@vger.kernel.org, linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org, Janusz Krzysztofik Subject: [PATCH 2/3] ARM: OMAP1: ams-delta: Drop unused symbols from the board header Date: Wed, 7 Nov 2018 21:17:45 +0100 Message-Id: <20181107201746.14705-3-jmkrzyszt@gmail.com> X-Mailer: git-send-email 2.16.4 In-Reply-To: <20181107201746.14705-1-jmkrzyszt@gmail.com> References: <20181107201746.14705-1-jmkrzyszt@gmail.com> Sender: linux-gpio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-gpio@vger.kernel.org Those bitmap symbols defining pins of latch2 register, used with read()/write() calls before the latch was converted to a GPIO device, have been obsoleted by integer symbols defined inside the board file. Signed-off-by: Janusz Krzysztofik --- arch/arm/mach-omap1/board-ams-delta.h | 4 ---- 1 file changed, 4 deletions(-) diff --git a/arch/arm/mach-omap1/board-ams-delta.h b/arch/arm/mach-omap1/board-ams-delta.h index 06e4c64a47f8..2c3aff824cf0 100644 --- a/arch/arm/mach-omap1/board-ams-delta.h +++ b/arch/arm/mach-omap1/board-ams-delta.h @@ -28,10 +28,6 @@ #if defined (CONFIG_MACH_AMS_DELTA) -#define AMD_DELTA_LATCH2_SCARD_RSTIN 0x0400 -#define AMD_DELTA_LATCH2_SCARD_CMDVCC 0x0800 -#define AMS_DELTA_LATCH2_MODEM_CODEC 0x2000 - #define AMS_DELTA_GPIO_PIN_KEYBRD_DATA 0 #define AMS_DELTA_GPIO_PIN_KEYBRD_CLK 1 #define AMS_DELTA_GPIO_PIN_MODEM_IRQ 2 From patchwork Wed Nov 7 20:17:46 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janusz Krzysztofik X-Patchwork-Id: 994477 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=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="Mfa1cG7p"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 42qyNq52dpz9s9J for ; Thu, 8 Nov 2018 07:16:27 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726352AbeKHFsQ (ORCPT ); Thu, 8 Nov 2018 00:48:16 -0500 Received: from mail-lf1-f68.google.com ([209.85.167.68]:38110 "EHLO mail-lf1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726524AbeKHFsP (ORCPT ); Thu, 8 Nov 2018 00:48:15 -0500 Received: by mail-lf1-f68.google.com with SMTP id p86so12455105lfg.5; Wed, 07 Nov 2018 12:16:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=416eiwFkeOJKBgKw/6aUOwBCVOCx0Nx8xUrBJhRseNI=; b=Mfa1cG7pCFaa99gAqxdQv6n0eLTg78TX9wc0fbtN7nr7fO6utbXLfjqWviV65o7vDk r3npqUYmltblj3PZD+/ZWLfqXZCPNwKfNWSJmtLQ3cVM3ExNuue7d6f1CMmEfYlyfxqh PVH52ntT4A8skySgzd/qxCA705oqXP7GYQy8FUIkudOz1nb5+ccQALlfl/k91wJWAI01 9HZEGJO9qeIEZzV44YagSR4G3TMseMVbcxajLXrGlMv5PewyvX5Yh64NMdea6wp66VAn v96mDdEzQvJ5JOSlrcgRCRI99bdlSS6ddzq2wAz+l2dBqXCJVg17lsGSpTRGH8qdxQXR DWOQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=416eiwFkeOJKBgKw/6aUOwBCVOCx0Nx8xUrBJhRseNI=; b=BXrDTMkgYdzVftolO5CaJvC2e4WrTPwyQ8k4NSDhSLj7LeLTTbL11U9fPcz5uxh6vD I5DRffoTn7WR2IjaipNKkLrFzaBcFdLzL6+Dn1fdS+ZbpYIkrAxWbmT82KsGwjjEynjg GneHjuJ3c15+KTYHZYU1HyIZSRkXa7vs1UmMXC8b48fQ+64d3bHEQw3DNj7fYTlI/i2G TUifRcuLMdiv9JogM+8C2O7xwhcJcIcgrwhvELNmIgpihX4Z4ats3vwcez7lEvK7T+nw BcnKPEcY0nc92mUWos/hE9zUScQog1F6NT2XqXJz5QI92GdinWw1aBcZUmvlLDpCDbvc IadQ== X-Gm-Message-State: AGRZ1gIwY3RskFlan1lJZRpqwYiSa8rPePn6n4zQVzHpWi0KoCu3WqQ9 0iX79WaCHzoCfGFolcCHzKQ= X-Google-Smtp-Source: AJdET5chGSsKC72Zjfe1yGzRqQ2BBaU0AtzTEsrizo1wdgw82MmUqomxTTNfYNKhnQG2V70x+5bKjQ== X-Received: by 2002:ac2:4188:: with SMTP id z8-v6mr1027273lfh.3.1541621777535; Wed, 07 Nov 2018 12:16:17 -0800 (PST) Received: from z50.lan (93-181-165-181.internetia.net.pl. [93.181.165.181]) by smtp.gmail.com with ESMTPSA id c19sm285650lfg.86.2018.11.07.12.16.15 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 07 Nov 2018 12:16:16 -0800 (PST) From: Janusz Krzysztofik To: Tony Lindgren Cc: Aaro Koskinen , Linus Walleij , linux-arm-kernel@lists.infradead.org, linux-omap@vger.kernel.org, linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org, Janusz Krzysztofik Subject: [PATCH 3/3] ARM: OMAP1: ams-delta: Move AMS_DELTA_LATCH2_NGPIO to the board file Date: Wed, 7 Nov 2018 21:17:46 +0100 Message-Id: <20181107201746.14705-4-jmkrzyszt@gmail.com> X-Mailer: git-send-email 2.16.4 In-Reply-To: <20181107201746.14705-1-jmkrzyszt@gmail.com> References: <20181107201746.14705-1-jmkrzyszt@gmail.com> Sender: linux-gpio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-gpio@vger.kernel.org That symbol is not used outside the board file, there is no need to keep it in the board header. Signed-off-by: Janusz Krzysztofik --- arch/arm/mach-omap1/board-ams-delta.c | 6 ++++-- arch/arm/mach-omap1/board-ams-delta.h | 2 -- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/arm/mach-omap1/board-ams-delta.c b/arch/arm/mach-omap1/board-ams-delta.c index a6986a83a916..1947bc63074e 100644 --- a/arch/arm/mach-omap1/board-ams-delta.c +++ b/arch/arm/mach-omap1/board-ams-delta.c @@ -204,11 +204,13 @@ static struct platform_device latch1_gpio_device = { #define LATCH1_PIN_DOCKIT1 6 #define LATCH1_PIN_DOCKIT2 7 +#define LATCH2_NGPIO 16 + static struct resource latch2_resources[] = { [0] = { .name = "dat", .start = LATCH2_PHYS, - .end = LATCH2_PHYS + (AMS_DELTA_LATCH2_NGPIO - 1) / 8, + .end = LATCH2_PHYS + (LATCH2_NGPIO - 1) / 8, .flags = IORESOURCE_MEM, }, }; @@ -217,7 +219,7 @@ static struct resource latch2_resources[] = { static struct bgpio_pdata latch2_pdata = { .label = LATCH2_LABEL, - .ngpio = AMS_DELTA_LATCH2_NGPIO, + .ngpio = LATCH2_NGPIO, }; static struct platform_device latch2_gpio_device = { diff --git a/arch/arm/mach-omap1/board-ams-delta.h b/arch/arm/mach-omap1/board-ams-delta.h index 2c3aff824cf0..b5c4a373b905 100644 --- a/arch/arm/mach-omap1/board-ams-delta.h +++ b/arch/arm/mach-omap1/board-ams-delta.h @@ -37,8 +37,6 @@ #define AMS_DELTA_GPIO_PIN_CONFIG 11 #define AMS_DELTA_GPIO_PIN_NAND_RB 12 -#define AMS_DELTA_LATCH2_NGPIO 16 - #endif /* CONFIG_MACH_AMS_DELTA */ #endif /* __ASM_ARCH_OMAP_AMS_DELTA_H */