From patchwork Wed Sep 5 02:12:09 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peng Fan X-Patchwork-Id: 966166 X-Patchwork-Delegate: sbabic@denx.de 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=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=nxp.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.b="gxlcanNG"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 424nTL3zGRz9s3Z for ; Wed, 5 Sep 2018 12:19:34 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 4FAEBC21D8A; Wed, 5 Sep 2018 02:17:24 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=BAD_ENC_HEADER, SPF_HELO_PASS, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 01422C21EE7; Wed, 5 Sep 2018 02:08:06 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 9D7D0C21EF2; Wed, 5 Sep 2018 02:08:03 +0000 (UTC) Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-db5eur01on0081.outbound.protection.outlook.com [104.47.2.81]) by lists.denx.de (Postfix) with ESMTPS id 4D7B1C21EBB for ; Wed, 5 Sep 2018 02:07:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=As/uxA9thcKZhlpPhuh00akzIjGD4bk99y6iqRhJ5j4=; b=gxlcanNGkKThEdViSLCmSdGyTMLZCcz1B1/m8Y/K+AVsFqX0MNnt4rqwseFKUEtGXut/NCnRPKV/z92FT3seMAL88TkPVqe8Tuh6+ft7Vwjjq1HyDjiGIixYMPKfII5O0NQ6KEv/sm08TcgrnqkKToEzEAR1P73YuVxIZNHNKAU= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=peng.fan@nxp.com; Received: from linux-u7w5.ap.freescale.net.net (92.121.68.129) by VI1PR04MB4496.eurprd04.prod.outlook.com (2603:10a6:803:69::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1101.18; Wed, 5 Sep 2018 02:07:37 +0000 From: Peng Fan To: sbabic@denx.de Date: Wed, 5 Sep 2018 10:12:09 +0800 Message-Id: <20180905021219.12828-23-peng.fan@nxp.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20180905021219.12828-1-peng.fan@nxp.com> References: <20180905021219.12828-1-peng.fan@nxp.com> MIME-Version: 1.0 X-Originating-IP: [92.121.68.129] X-ClientProxiedBy: HK0PR03CA0022.apcprd03.prod.outlook.com (2603:1096:203:2e::34) To VI1PR04MB4496.eurprd04.prod.outlook.com (2603:10a6:803:69::28) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 090b6fb4-d339-434f-6b23-08d612d45bcc X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989137)(4534165)(4627221)(201703031133081)(201702281549075)(8990107)(5600074)(711020)(4618075)(2017052603328)(7153060)(7193020); SRVR:VI1PR04MB4496; X-Microsoft-Exchange-Diagnostics: 1; VI1PR04MB4496; 3:Lba2D6Uc8wnha3vECOxIfEnqa1SWHSMXzzKeglLcSgqLG1BbDyVPWmlwVwQWFXOGZXRcHMGZv75y/g35y0Pwv/QuGAA8UzjyA+Ua1NJe4BYN4X01EoMqp+04c+ejH04bgXw3yn7eYsmisKPhCuTztKX3jB5C8D/uGrISKEZ7vfG/SP8z87NLukaOVDFEodyr/OAtW3Tk03LF8ylXvzEGb0AZkKjJgJkri7xpK7GuLTRbnVqvbqFoeLbOklRuQv9u; 25:SxpHKDJd/nDEkoKwPNdHUDDu+6/xb9gA+MVHKMt5tBauXwbf3YbJNKyEO8gycg4b+RPoXXAMiAurb1Y4fzwcK7Em1m7TNT1OdyVAeLsSUzABF6aWVwZdmn1TT7aOkk2/+j615e9/ozofStLLi76l2fHF7vb/4DXz+/G5zNQp47zTb1T3RUaKxebO6+jT/4z7Kd8DXKc6U3J0dPYOfpNKG0+aDaeIs1jjwAqRYt0Nkl/8tJ0n6u0wmS5t/4cucPab32q8ZIyW6QibFWULEZg/5+lwWaPEycTFTysAT0Q+rZ5eaWmrm5JhWdqv1UF7kFWcrwS03NvKevpd016emhFj6g==; 31:O7DRmUxyhwVNfIPi+xmBNpFBwv0oWtUr02gS6WDRqIlTWEBa24Ny/WakVovT7MCHGYeR6wlBzOoh1jPoUpcxx/TqJER6l81WtlLOzoggBjrma694blglH2EJCRcJyIxGXReMplcWr9BPFrw5xm+4o+yNV1vN1cGttkgLq6qyNIffn7OQmCFbW0I3h6WMgSkC4EdbSJhh55/k5fUHCRplSGvs934MetmnoaE50SuPAlY= X-MS-TrafficTypeDiagnostic: VI1PR04MB4496: X-Microsoft-Exchange-Diagnostics: 1; VI1PR04MB4496; 20:6FrQMGHp0Kp9NWr3GLRVeCFoJpZlxCBf0db857Qi/Col+I53U/vhSPtKbTCiFeds+B1hLmDDQGOR4jzq+N2Pvq4j08qsdGRKBLE3DM9cdaHvtGPr9FWzf1uTghwrtHF8vqtIL4PvK02JB/hEaKD7Psoa6OcTouXH4nIEvUVrILrq4HOsZKsHnWR0+IUFxirkb64wLsIgoSmmCAGyWP0zU1ReEWVeGlY/SenUaxy0Q9Pc6vh3QF+uZKQfPRBY92o3BeMVlVxjlCgpMyGPrthhBbq1dKXfX2R56t6zCgZP/weIWZiVwQwNdEl7GhZ5wd+ij8W1AGTqc0iDhWhNvnKI1T48VchIuxYCZAAFFS7JrvaBh6dY7+676M61GSyGCCU7nOXq1F0uNj6jTt0wVJIscky80rkG08WgreT5+fXZLRq/dapJcKUKYWk59ieiGCZmPzTEoeqKWA7JEwZfoWkHK44g5RyEyX42NI+iIpXs13At3qeFLELeNuOqvYMtsvan; 4:JcIXiNZeZB4kMx52FkZb4e/aNdJKUaGErB/8xeEAcvHCFG8Pvi16L2z1Gfwismku1meL24/y8rYLxzKe3nb9Nt3NRerJ0tP6skqDYyfQNXCSSvZ1EF9S68lRKXFA2DyWjRlllA/fy+5eJ3NEmk4aFzfZTGRrJlcfSjef6mwFse+4j7SG4JCM3zbxcwL0S0obTzMzLFVvUGJjPPSB1qUkG9D5LeHeCcs+kl1NFT6iH1VYXZM0wNPbEUCHhCrcV8XpoDlu5acx8bR34sEk1QgujDxJXaKvjj+UtRVKYV6OKc/DCtbP1xas3MemXdCqNS86 X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(823301075)(93006095)(93001095)(3231311)(944501410)(52105095)(3002001)(10201501046)(6055026)(149027)(150027)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(20161123562045)(20161123558120)(20161123564045)(201708071742011)(7699016); SRVR:VI1PR04MB4496; BCL:0; PCL:0; RULEID:; SRVR:VI1PR04MB4496; X-Forefront-PRVS: 078693968A X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(396003)(366004)(136003)(376002)(346002)(39860400002)(189003)(199004)(11346002)(305945005)(25786009)(7736002)(386003)(8936002)(478600001)(26005)(36756003)(6116002)(1076002)(3846002)(476003)(446003)(81166006)(50226002)(86362001)(6506007)(47776003)(50466002)(48376002)(8676002)(2616005)(81156014)(956004)(16526019)(186003)(16586007)(66066001)(53936002)(316002)(4326008)(76176011)(68736007)(5660300001)(6512007)(2361001)(51416003)(486006)(106356001)(97736004)(105586002)(6666003)(6486002)(6916009)(44832011)(2351001)(2906002)(52116002); DIR:OUT; SFP:1101; SCL:1; SRVR:VI1PR04MB4496; H:linux-u7w5.ap.freescale.net.net; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; Received-SPF: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; VI1PR04MB4496; 23:rq+oll7g0XIuukpeA9GQRrvo78fUY1STaIcUoQ0hl?= oRNMqPQkYXaK8PypwUlGltGkZ1W2Uhhlm3OKFiHSUiMU15VVWNtfMXQr3gjboFHoQY6y5sd4r+8kFDU8e7LgEZ0R9clBB8qBabChoKG81wd41YSC//vgy10pYAUaXffLJ9NyjxrZT2Djbf4aaqb7n1xJBTdj05XgtarFkr4IGcTj58YnBLTmKH6T5BNh/yAXqPlCBtH8FHnWhk1K2e0FLcAPVGV9vJcgQtpjFCyz8UrqPcnJZBqvS+ZpX6F4Dk6hCP8PzrCDr3gv0WMnYav0GEHj8m44Z61szFXTH98Y7md3CsHMPIjAqLnuynoyKiNovtudsJOSifd+pFUXC8ZObI0ARHtM1+/k5SS13RYFjG+7koCbPXcomy1vaIBNKuC0SsMRt7U8aBF9DuzY02snYM8cRRsCSqyC/Bk+1ilTZkCpsGTvxLf9LJ0u4kILWjZzMz8U33P+2HFhTjY8yciVjIZ5dN8fMkCp6ht6Tw9QRo2jDEQLtjlMPCrcM/nw55DZoB/micWraWd8IN7xMIwlCR/FeNrFZ2CTZ6zjStccQug8EKMD0BjJnNWqwrOhdTzxV2/hGTp5mHKl8mwIUg+EHAJFZO/vmC8ZqunEHK0Je9vuFC0RM+0cjnPoI4vC8PBPaDI2DdfumBwNL08ZOHtPTqRVNeJT/I4atuWSVJ0++6NwEnBVCAk6ns+LKVtgiDhHhSGQ75S4x3PPnomvIGYM/Im3ZN7M+hq43QeLqGKa95ZNC2qhJ7SsMrnzuYNmJJSC3II5LlKJDAMvO9SeqAKkfxIxHd7ePomy3tNOcZIbwmuxTYGO0eA5lVAkkOGVMdoIJEL6/eXz14/2w2D3s8IWYJOktD7HRMp0qApsMYCI6Nlh/VGwhteUKxTl3+JGrpqBUfS+AdN3CArwfWC5+XhV7QkfNrpshPrg2cmmusJKNTp1iOe4zacXP//IrvGcTEavp0qytv1rOVfkXXmuM4RxHB/GB+jypOWBWoHCjhIBVdy/Y2dCwy9UAch4DDragS6mX2aLRCpGtMbz4ABwYy+E6bMXUq4t9Gxsnf/0Ef+tWlP4hUm2RRBxisX6BYJlgKbwVt9IStKJyHPO4oIHkNlwtdNk4NgfjX8HWwqOpfCqmBccX4oABpGMjV27lxFyOFzeL4MC86ApNJYvU9zzSaSL/MYknDH+sCiNc8/3bl9Ksl5nOlAtdcH2mQqRv5RBHMrK3I= X-Microsoft-Antispam-Message-Info: 3+gDBwse0SaahUHk/O2KvSO7FWrJtk5HTD0sgWO2geRCdc2QQIDh7Fl9WZ0Bn/ZpONJNZAcrja0iXMjafn73N+e/lnA3LlCY2/C3po+FnqRb9VWIJkRrd5NDuZhToiNsn4r+aA7F1PsH6TFyjt4pf2awWB3ycpa7MpRcHED0c5OuwpYcGXg+1X870UAK14KY6+yge17DAB/7O63/U0DwlULZ4dRF578qhcGYoMqTWWrbNaCNOqc4nlAKqwBcmGxhXNanydacjIw8L0X5QdxEKyaEwHtepxaJyFWpcidCNzrGFcyHnz2vi7elDe2rH57OEVbPJOupnmMAa6hnBNqEHSC06UFyVuTAKpfqNvG/VTQ= X-Microsoft-Exchange-Diagnostics: 1; VI1PR04MB4496; 6:/cHS06O6GOXV7/BQbWIzAxZhE6dmDXBZyhzINTPAjDSzVekt027ZwZsl34q94oaUuNLwUg9qdFf89KHpwuQfJdSs8WMEo7QJWkLER9P1M7RaeVjGZrPyYdC62OQ/PI63QHSnryC8kSF9JzHebxtqbQKDeGfea0Qql+8JDCZ6g98PFaTeQ+mE1O1vVGHmmN8orMB5R+LbEfR26/4kac90+1FdGl9Ndjqk6Ydw3Vkm7nQdAqFLHAcKmstAcmZwKiR3api9DHkmVvs0saGLcgz7IOvWXHHbol8Xs5ltq+2mawq0mQ9arvvZP87vWDVJLTiXD2ZnW3C1S5zZiBa0wQUmbuB+XBav/zObEOV/gZBmJrfSoBLsd6EtD6KOS6X2R7Oo2qfTtyUFvW/6IKscdDNBCodC+FdCkge2sOG9I4WeLUlvlaX80KXpm5AtIguJtA3DmxiGeo+F2MB/OqEE4lYm9A==; 5:wt+I/WJyXbyetqiIM+4W5bpgGILJk1+Zp7vZHbbIveAMTuMK8KAP6kMOKzpi/SH7dsbLuVKOMW8349lwO1RV1+L7IsCgx65HHfft9K1U2q/4xhZTf7FWqce+3WK1XVelZEkD/fTS+9Nic93fwx6oy3vn+S6thruW1H8/hSKr0Zk=; 7:N/zhk4RbB9qBo55paseaKGYe3j3APnYdCGOiBi1yw/SKjrV3IwWrOP/va9CAU8o4RCt1Lr4a3rCUQ8U0thnBU6JRle47vPufuTz2GkgCf8ZR/1Lp868rEp/cFD3WveYspVsNeXsqmum6qVV5uQ8zF6FWGloIeh0dDBVvgqZGl7z35N9JCIzvVaZ3VKt2LRA6qsZu+BsxImOR9nIMuH5nU/lPzk0xTojGwYYioPe9tZg0eYSvXbOxebad+B/FJE3I SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Sep 2018 02:07:37.7150 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 090b6fb4-d339-434f-6b23-08d612d45bcc X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB4496 Cc: fabio.estevam@nxp.com, u-boot@lists.denx.de Subject: [U-Boot] [PATCH V4 22/32] gpio: mxc_gpio: add support for i.MX8 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Add i.MX8 support, there are 8 GPIO banks. Signed-off-by: Peng Fan Cc: Stefano Babic --- arch/arm/include/asm/arch-imx8/gpio.h | 21 +++++++++++++++++++++ drivers/gpio/mxc_gpio.c | 30 +++++++++++++++++++++--------- 2 files changed, 42 insertions(+), 9 deletions(-) create mode 100644 arch/arm/include/asm/arch-imx8/gpio.h diff --git a/arch/arm/include/asm/arch-imx8/gpio.h b/arch/arm/include/asm/arch-imx8/gpio.h new file mode 100644 index 0000000000..24cfde3c29 --- /dev/null +++ b/arch/arm/include/asm/arch-imx8/gpio.h @@ -0,0 +1,21 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* + * Copyright 2018 NXP + */ + +#ifndef __ASM_ARCH_IMX8_GPIO_H +#define __ASM_ARCH_IMX8_GPIO_H + +#if !(defined(__KERNEL_STRICT_NAMES) || defined(__ASSEMBLY__)) +/* GPIO registers */ +struct gpio_regs { + u32 gpio_dr; /* data */ + u32 gpio_dir; /* direction */ + u32 gpio_psr; /* pad satus */ +}; +#endif + +/* IMX8 the GPIO index is from 0 not 1 */ +#define IMX_GPIO_NR(port, index) (((port) * 32) + ((index) & 31)) + +#endif /* __ASM_ARCH_IMX8_GPIO_H */ diff --git a/drivers/gpio/mxc_gpio.c b/drivers/gpio/mxc_gpio.c index d8e72ada19..b820160ae7 100644 --- a/drivers/gpio/mxc_gpio.c +++ b/drivers/gpio/mxc_gpio.c @@ -40,21 +40,27 @@ static unsigned long gpio_ports[] = { [2] = GPIO3_BASE_ADDR, #if defined(CONFIG_MX25) || defined(CONFIG_MX27) || defined(CONFIG_MX51) || \ defined(CONFIG_MX53) || defined(CONFIG_MX6) || \ - defined(CONFIG_MX7) || defined(CONFIG_MX8M) + defined(CONFIG_MX7) || defined(CONFIG_MX8M) || \ + defined(CONFIG_ARCH_IMX8) [3] = GPIO4_BASE_ADDR, #endif #if defined(CONFIG_MX27) || defined(CONFIG_MX53) || defined(CONFIG_MX6) || \ - defined(CONFIG_MX7) || defined(CONFIG_MX8M) + defined(CONFIG_MX7) || defined(CONFIG_MX8M) || \ + defined(CONFIG_ARCH_IMX8) [4] = GPIO5_BASE_ADDR, #if !(defined(CONFIG_MX6UL) || defined(CONFIG_MX6ULL) || defined(CONFIG_MX8M)) [5] = GPIO6_BASE_ADDR, #endif #endif -#if defined(CONFIG_MX53) || defined(CONFIG_MX6) || defined(CONFIG_MX7) +#if defined(CONFIG_MX53) || defined(CONFIG_MX6) || defined(CONFIG_MX7) || \ + defined(CONFIG_ARCH_IMX8) #if !(defined(CONFIG_MX6UL) || defined(CONFIG_MX6ULL)) [6] = GPIO7_BASE_ADDR, #endif #endif +#if defined(CONFIG_ARCH_IMX8) + [7] = GPIO8_BASE_ADDR, +#endif }; static int mxc_gpio_direction(unsigned int gpio, @@ -347,19 +353,22 @@ static const struct mxc_gpio_plat mxc_plat[] = { { 2, (struct gpio_regs *)GPIO3_BASE_ADDR }, #if defined(CONFIG_MX25) || defined(CONFIG_MX27) || defined(CONFIG_MX51) || \ defined(CONFIG_MX53) || defined(CONFIG_MX6) || \ - defined(CONFIG_MX8M) + defined(CONFIG_MX8M) || defined(CONFIG_ARCH_IMX8) { 3, (struct gpio_regs *)GPIO4_BASE_ADDR }, #endif #if defined(CONFIG_MX27) || defined(CONFIG_MX53) || defined(CONFIG_MX6) || \ - defined(CONFIG_MX8M) + defined(CONFIG_MX8M) || defined(CONFIG_ARCH_IMX8) { 4, (struct gpio_regs *)GPIO5_BASE_ADDR }, #ifndef CONFIG_MX8M { 5, (struct gpio_regs *)GPIO6_BASE_ADDR }, #endif #endif -#if defined(CONFIG_MX53) || defined(CONFIG_MX6) +#if defined(CONFIG_MX53) || defined(CONFIG_MX6) || defined(CONFIG_ARCH_IMX8) { 6, (struct gpio_regs *)GPIO7_BASE_ADDR }, #endif +#if defined(CONFIG_ARCH_IMX8) + { 7, (struct gpio_regs *)GPIO8_BASE_ADDR }, +#endif }; U_BOOT_DEVICES(mxc_gpios) = { @@ -368,19 +377,22 @@ U_BOOT_DEVICES(mxc_gpios) = { { "gpio_mxc", &mxc_plat[2] }, #if defined(CONFIG_MX25) || defined(CONFIG_MX27) || defined(CONFIG_MX51) || \ defined(CONFIG_MX53) || defined(CONFIG_MX6) || \ - defined(CONFIG_MX8M) + defined(CONFIG_MX8M) || defined(CONFIG_ARCH_IMX8) { "gpio_mxc", &mxc_plat[3] }, #endif #if defined(CONFIG_MX27) || defined(CONFIG_MX53) || defined(CONFIG_MX6) || \ - defined(CONFIG_MX8M) + defined(CONFIG_MX8M) || defined(CONFIG_ARCH_IMX8) { "gpio_mxc", &mxc_plat[4] }, #ifndef CONFIG_MX8M { "gpio_mxc", &mxc_plat[5] }, #endif #endif -#if defined(CONFIG_MX53) || defined(CONFIG_MX6) +#if defined(CONFIG_MX53) || defined(CONFIG_MX6) || defined(CONFIG_ARCH_IMX8) { "gpio_mxc", &mxc_plat[6] }, #endif +#if defined(CONFIG_ARCH_IMX8) + { "gpio_mxc", &mxc_plat[7] }, +#endif }; #endif #endif