From patchwork Fri Feb 9 12:07:28 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?J=2E_Neusch=C3=A4fer?= X-Patchwork-Id: 871363 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=) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3zdDPZ0Cnvz9s72 for ; Fri, 9 Feb 2018 23:09:06 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751189AbeBIMHu (ORCPT ); Fri, 9 Feb 2018 07:07:50 -0500 Received: from mout.gmx.net ([212.227.17.21]:48211 "EHLO mout.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750942AbeBIMHr (ORCPT ); Fri, 9 Feb 2018 07:07:47 -0500 Received: from localhost.localdomain ([88.153.6.11]) by mail.gmx.com (mrgmx102 [212.227.17.168]) with ESMTPSA (Nemesis) id 0M3u86-1f2CLe10aI-00rcNK; Fri, 09 Feb 2018 13:07:40 +0100 From: =?utf-8?q?Jonathan_Neusch=C3=A4fer?= To: linux-kernel@vger.kernel.org Cc: Joel Stanley , linuxppc-dev@lists.ozlabs.org, linux-gpio@vger.kernel.org, devicetree@vger.kernel.org, =?utf-8?q?Jon?= =?utf-8?q?athan_Neusch=C3=A4fer?= , Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman Subject: [PATCH v3 1/4] powerpc: wii: Explicitly configure GPIO owner for poweroff pin Date: Fri, 9 Feb 2018 13:07:28 +0100 Message-Id: <20180209120732.17863-2-j.neuschaefer@gmx.net> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180209120732.17863-1-j.neuschaefer@gmx.net> References: <20180209120732.17863-1-j.neuschaefer@gmx.net> MIME-Version: 1.0 X-Provags-ID: V03:K0:dwLhG+vJnBnKptY5IqOxTJLwj5v5as+LNQrGxAQmMFa8W0gxhXA 9d4RQxrXNzt6agQEOfVuBMpJGgJAL+FqsxPr/lq6rZxSFNIkzOiknh74b90v0OAwae2x5Ep tWTGmomrYFdne9lpvStGMXb0KX+wWxBd+tMkMWJ3iPSyQ6YCpdBw9MPSlrwvKhFWp2uUJsF UTALXubE03ifHL2ZucqSg== X-UI-Out-Filterresults: notjunk:1; V01:K0:bdFSbI8cPuw=:UuMsvnPwtgza2lb819+o6Q aMYKEaLtpAzybytfGVEnzxPxzNQBeuDoksU7PvkF79aQbVdZr9bxrP3hAC41SkK2UwJ3KkcRY +1E9UbF2O5w+7IvzwpsEPX2kujZ1AIUoUcHsZgg0u2CCZwFj8L1TPWFX/I3szMVeMLSkH4Yi1 jXhoyG42p+cJOmkrfIaP1nvxi+BrBe0EAH38idvMmNjhtPbgv/+K1Q/VspKvB1sydKP6qoJtg 7ugAEA476uuguViBwVTQEfl5sAEIH99wmrMk3G5WCvggNTMfX2gQmOdwRQdC1YT7Y6GBq1/D1 Y3tMGj04eOwQFhc8RoDllnjJV7xABXW0TFJXn+2VnyH+9iNXjO6KzsFaUJfgbagMs9lSAvhgu 9idu4UW0ylf0GC7/+nxzBytVVGFqQM9/8UcFiCvbiE39cEg0PpotAzEg0C6Nro5Y/342JntLD IQ2jj0wi7F3+UJwaL/OB4572FuY6OtrO7QT7gU2Lr2n0cNKGor3KNioFB9/XcNslKStVS/HPo nvo021BhTrTXsF8C+esqbMHbnC0MsjnP8mTkd+M1PCrDqmuDs0CezjWEZrAbVJRPFX+bLzi6q kN0mAs2PkhGGkrwCLp0TN454h7eRgGI+ifbn1uppCGIAkxobh9hN+rZGzI9jsknxP+8AEH4VP UXnglk4gxxYin83JxMM22anJfiJMT+iQjboig/OI41PvcMa5pZd/Bk/oCHl7hMA63Eo51obAL MLEifCkTKOSRSyHbD05NpkFgww8EDbJEcRm7HikW8dqPKAVzDwlgKNiUD1hlrJcorydGZyaYP Cp3lu2u5Q9XnKdvYcJYNQ/pHtAmbBn0XulWIwGiRx9rdphMZZw= Sender: linux-gpio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-gpio@vger.kernel.org The Hollywood chipset's GPIO controller has two sets of registers: One for access by the PowerPC CPU, and one for access by the ARM coprocessor (but both are accessible from the PPC because the memory firewall (AHBPROT) is usually disabled when booting Linux, today). The wii_power_off function currently assumes that the poweroff GPIO pin is configured for use via the ARM side, but the upcoming GPIO driver configures all pins for use via the PPC side, breaking poweroff. Configure the owner register explicitly in wii_power_off to make wii_power_off work with and without the new GPIO driver. I think the Wii can be switched to the generic gpio-poweroff driver, after the GPIO driver is merged. Signed-off-by: Jonathan Neuschäfer --- v2, v3: - no change --- arch/powerpc/platforms/embedded6xx/wii.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/arch/powerpc/platforms/embedded6xx/wii.c b/arch/powerpc/platforms/embedded6xx/wii.c index 160fa09533ba..4682327f76a9 100644 --- a/arch/powerpc/platforms/embedded6xx/wii.c +++ b/arch/powerpc/platforms/embedded6xx/wii.c @@ -45,6 +45,7 @@ #define HW_GPIO_BASE(idx) (idx * 0x20) #define HW_GPIO_OUT(idx) (HW_GPIO_BASE(idx) + 0) #define HW_GPIO_DIR(idx) (HW_GPIO_BASE(idx) + 4) +#define HW_GPIO_OWNER (HW_GPIO_BASE(1) + 0x1c) #define HW_GPIO_SHUTDOWN (1<<1) #define HW_GPIO_SLOT_LED (1<<5) @@ -177,6 +178,12 @@ static void wii_power_off(void) local_irq_disable(); if (hw_gpio) { + /* + * set the owner of the shutdown pin to ARM, because it is + * accessed through the registers for the ARM, below + */ + clrbits32(hw_gpio + HW_GPIO_OWNER, HW_GPIO_SHUTDOWN); + /* make sure that the poweroff GPIO is configured as output */ setbits32(hw_gpio + HW_GPIO_DIR(1), HW_GPIO_SHUTDOWN); From patchwork Fri Feb 9 12:07:29 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?J=2E_Neusch=C3=A4fer?= X-Patchwork-Id: 871360 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=) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3zdDNW3h8zz9s72 for ; Fri, 9 Feb 2018 23:08:11 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752013AbeBIMH6 (ORCPT ); Fri, 9 Feb 2018 07:07:58 -0500 Received: from mout.gmx.net ([212.227.17.22]:46031 "EHLO mout.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751201AbeBIMHx (ORCPT ); Fri, 9 Feb 2018 07:07:53 -0500 Received: from localhost.localdomain ([88.153.6.11]) by mail.gmx.com (mrgmx102 [212.227.17.168]) with ESMTPSA (Nemesis) id 0LhCDT-1f5CTw0vJv-00oT47; Fri, 09 Feb 2018 13:07:43 +0100 From: =?utf-8?q?Jonathan_Neusch=C3=A4fer?= To: linux-kernel@vger.kernel.org Cc: Joel Stanley , linuxppc-dev@lists.ozlabs.org, linux-gpio@vger.kernel.org, devicetree@vger.kernel.org, =?utf-8?q?Jon?= =?utf-8?q?athan_Neusch=C3=A4fer?= , Albert Herranz , Segher Boessenkool , Linus Walleij Subject: [PATCH v3 2/4] gpio: Add GPIO driver for Nintendo Wii Date: Fri, 9 Feb 2018 13:07:29 +0100 Message-Id: <20180209120732.17863-3-j.neuschaefer@gmx.net> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180209120732.17863-1-j.neuschaefer@gmx.net> References: <20180209120732.17863-1-j.neuschaefer@gmx.net> MIME-Version: 1.0 X-Provags-ID: V03:K0:c6NO3Chnnr/pmEI2zRQ2mxjDoyh12y4hvV/kB1q8CGVRcOh4Gnh Ym46e6TKo+r2RlsB8bzX9euihF1RZNhfuGqPitIZcQu4vEjQV+h0zcD5BzEhqINSTHCskL5 AA+WuzIYDTjhRHd9FWvvpDgefLCbFdRwPkg7qn+8qHXLC9Fo9Nx0O4gJXAXaxHDLaFUiIv5 R1bSAeaA0ZDSWRB92aGfA== X-UI-Out-Filterresults: notjunk:1; V01:K0:HiPR79U88+I=:NpvPSRkWRs+p7896pR5zWP iAZdYwFJwKPR+QwHdJwSR9yicQjvDTm9qkZ2HN4LNAv0MP70I1j+f3blkMytScPNYDtrT5iqX 9kTdh7ODLNgf8F3Nsqygx4A69OBFhRFxgcOwGnDbuwK76654P8cXA4AQzTCu/I35By2MVSi4E CJustnciLtu7r5dfPcnXvZJ2egQiyeIAAbtwnXG7wmIvzFAXDIVJsmbUKsP3omSFNheaWrK6a d9vA4+028r/sUi9k71Ux38gkHssw0U3O+m2l16cgnzLvHIt3j+ZPYfhR/T7fumiJGvP0PfN5v trCQErN+1bYqF/yRBLoxnT5EfHQ+d48EH+Id+H/pcm4rcmBMc5k6sO+QBn5O4e0tr0TJrCzbu 4bfhYBRJiCJXAXbFMQWVkpnMqne41fDovDJFAAk990vohyURsTzw4qGTxBqIwrtXJREH081MS 1rN5BOaI3m039basV35kUgUwc6DhqDbky7MModCjE82cE0bLK3iOtgaV4LRMIFTD6kmIC5aBQ VC+UXvW5UXOfTvpH0Q1FJ3ubCYhLXhijIzqemJD2z/8x0LVhTacPfCavD7Qc8rArZaCJHCFJD bcq1i/pXevPBSup5f/TGWk8MOA+UyyAVgMEFiprScGvn41iNAiz+m2BmsQtHveibeSaWKjEvJ Gg58KL/8EZoWFXr6osewugsl8axyJrdHDQBPzxN5Nxo1aFI1/6FRfAQo8WJymkSV8X7erpwEO KdNAmafwx0RAMlhgG2BvK+eRYlb2BRyQw+v1jqRYQMy9t1WfHgHxMtWONyN2gLsPaJJw9euPP 1Pge2L6+WzZZV7ws0LZGRgm3VHLQ9WRpXlp3lYl5NEWLO494jk= Sender: linux-gpio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-gpio@vger.kernel.org The Nintendo Wii's chipset (called "Hollywood") has a GPIO controller that supports a configurable number of pins (up to 32), interrupts, and some special mechanisms to share the controller between the system's security processor (an ARM926) and the PowerPC CPU. Pin multiplexing is not supported. This patch adds a basic driver for this GPIO controller. Interrupt support will come in a later patch. This patch is based on code developed by Albert Herranz and the GameCube Linux Team, file arch/powerpc/platforms/embedded6xx/hlwd-gpio.c, available at https://github.com/DeltaResero/GC-Wii-Linux-Kernels, but has grown quite dissimilar. Signed-off-by: Jonathan Neuschäfer Cc: Albert Herranz Cc: Segher Boessenkool <--- v3: - Do some style cleanups, as suggest by Andy Shevchenko v2: - Change hlwd_gpio_driver.driver.name to "gpio-hlwd" to match the filename (was "hlwd_gpio") - Remove unnecessary include of linux/of_gpio.h, as suggested by Linus Walleij. - Add struct device pointer to context struct to make it possible to use dev_info(hlwd->dev, "..."), as suggested by Linus Walleij - Use the GPIO_GENERIC library to reduce code size, as suggested by Linus Walleij - Use iowrite32be instead of __raw_writel for big-endian MMIO access, as suggested by Linus Walleij - Remove commit message paragraph suggesting to diff against the original driver, because it's so different now Reviewed-by: Segher Boessenkool Reviewed-by: Andy Shevchenko --- drivers/gpio/Kconfig | 9 ++++ drivers/gpio/Makefile | 1 + drivers/gpio/gpio-hlwd.c | 115 +++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 125 insertions(+) create mode 100644 drivers/gpio/gpio-hlwd.c diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig index d6a8e851ad13..47606dfe06cc 100644 --- a/drivers/gpio/Kconfig +++ b/drivers/gpio/Kconfig @@ -229,6 +229,15 @@ config GPIO_GRGPIO Select this to support Aeroflex Gaisler GRGPIO cores from the GRLIB VHDL IP core library. +config GPIO_HLWD + tristate "Nintendo Wii (Hollywood) GPIO" + depends on OF_GPIO + select GPIO_GENERIC + help + Select this to support the GPIO controller of the Nintendo Wii. + + If unsure, say N. + config GPIO_ICH tristate "Intel ICH GPIO" depends on PCI && X86 diff --git a/drivers/gpio/Makefile b/drivers/gpio/Makefile index 4bc24febb889..492f62d0eb59 100644 --- a/drivers/gpio/Makefile +++ b/drivers/gpio/Makefile @@ -54,6 +54,7 @@ obj-$(CONFIG_GPIO_FTGPIO010) += gpio-ftgpio010.o obj-$(CONFIG_GPIO_GE_FPGA) += gpio-ge.o obj-$(CONFIG_GPIO_GPIO_MM) += gpio-gpio-mm.o obj-$(CONFIG_GPIO_GRGPIO) += gpio-grgpio.o +obj-$(CONFIG_GPIO_HLWD) += gpio-hlwd.o obj-$(CONFIG_HTC_EGPIO) += gpio-htc-egpio.o obj-$(CONFIG_GPIO_ICH) += gpio-ich.o obj-$(CONFIG_GPIO_INGENIC) += gpio-ingenic.o diff --git a/drivers/gpio/gpio-hlwd.c b/drivers/gpio/gpio-hlwd.c new file mode 100644 index 000000000000..a63136a68ba3 --- /dev/null +++ b/drivers/gpio/gpio-hlwd.c @@ -0,0 +1,115 @@ +// SPDX-License-Identifier: GPL-2.0+ +// Copyright (C) 2008-2009 The GameCube Linux Team +// Copyright (C) 2008,2009 Albert Herranz +// Copyright (C) 2017-2018 Jonathan Neuschäfer +// +// Nintendo Wii (Hollywood) GPIO driver + +#include +#include +#include +#include +#include +#include +#include + +/* + * Register names and offsets courtesy of WiiBrew: + * https://wiibrew.org/wiki/Hardware/Hollywood_GPIOs + * + * Note that for most registers, there are two versions: + * - HW_GPIOB_* Is always accessible by the Broadway PowerPC core, but does + * always give access to all GPIO lines + * - HW_GPIO_* Is only accessible by the Broadway PowerPC code if the memory + * firewall (AHBPROT) in the Hollywood chipset has been configured to allow + * such access. + * + * The ownership of each GPIO line can be configured in the HW_GPIO_OWNER + * register: A one bit configures the line for access via the HW_GPIOB_* + * registers, a zero bit indicates access via HW_GPIO_*. This driver uses + * HW_GPIOB_*. + */ +#define HW_GPIOB_OUT 0x00 +#define HW_GPIOB_DIR 0x04 +#define HW_GPIOB_IN 0x08 +#define HW_GPIOB_INTLVL 0x0c +#define HW_GPIOB_INTFLAG 0x10 +#define HW_GPIOB_INTMASK 0x14 +#define HW_GPIOB_INMIR 0x18 +#define HW_GPIO_ENABLE 0x1c +#define HW_GPIO_OUT 0x20 +#define HW_GPIO_DIR 0x24 +#define HW_GPIO_IN 0x28 +#define HW_GPIO_INTLVL 0x2c +#define HW_GPIO_INTFLAG 0x30 +#define HW_GPIO_INTMASK 0x34 +#define HW_GPIO_INMIR 0x38 +#define HW_GPIO_OWNER 0x3c + +struct hlwd_gpio { + struct gpio_chip gpioc; + void __iomem *regs; +}; + +static int hlwd_gpio_probe(struct platform_device *pdev) +{ + struct hlwd_gpio *hlwd; + struct resource *regs_resource; + u32 ngpios; + int res; + + hlwd = devm_kzalloc(&pdev->dev, sizeof(*hlwd), GFP_KERNEL); + if (!hlwd) + return -ENOMEM; + + regs_resource = platform_get_resource(pdev, IORESOURCE_MEM, 0); + hlwd->regs = devm_ioremap_resource(&pdev->dev, regs_resource); + if (IS_ERR(hlwd->regs)) + return PTR_ERR(hlwd->regs); + + /* + * Claim all GPIOs using the OWNER register. This will not work on + * systems where the AHBPROT memory firewall hasn't been configured to + * permit PPC access to HW_GPIO_*. + * + * Note that this has to happen before bgpio_init reads the + * HW_GPIOB_OUT and HW_GPIOB_DIR, because otherwise it reads the wrong + * values. + */ + iowrite32be(0xffffffff, hlwd->regs + HW_GPIO_OWNER); + + res = bgpio_init(&hlwd->gpioc, &pdev->dev, 4, + hlwd->regs + HW_GPIOB_IN, hlwd->regs + HW_GPIOB_OUT, + NULL, hlwd->regs + HW_GPIOB_DIR, NULL, + BGPIOF_BIG_ENDIAN_BYTE_ORDER); + if (res < 0) { + dev_warn(&pdev->dev, "bgpio_init failed: %d\n", res); + return res; + } + + res = of_property_read_u32(pdev->dev.of_node, "ngpios", &ngpios); + if (res) + ngpios = 32; + hlwd->gpioc.ngpio = ngpios; + + return devm_gpiochip_add_data(&pdev->dev, &hlwd->gpioc, hlwd); +} + +static const struct of_device_id hlwd_gpio_match[] = { + { .compatible = "nintendo,hollywood-gpio", }, + {}, +}; +MODULE_DEVICE_TABLE(of, hlwd_gpio_match); + +static struct platform_driver hlwd_gpio_driver = { + .driver = { + .name = "gpio-hlwd", + .of_match_table = hlwd_gpio_match, + }, + .probe = hlwd_gpio_probe, +}; +module_platform_driver(hlwd_gpio_driver); + +MODULE_AUTHOR("Jonathan Neuschäfer "); +MODULE_DESCRIPTION("Nintendo Wii GPIO driver"); +MODULE_LICENSE("GPL"); From patchwork Fri Feb 9 12:07:30 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?J=2E_Neusch=C3=A4fer?= X-Patchwork-Id: 871362 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=) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3zdDPM6bCxz9s72 for ; Fri, 9 Feb 2018 23:08:55 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751071AbeBIMIN (ORCPT ); Fri, 9 Feb 2018 07:08:13 -0500 Received: from mout.gmx.net ([212.227.17.20]:42143 "EHLO mout.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751910AbeBIMH4 (ORCPT ); Fri, 9 Feb 2018 07:07:56 -0500 Received: from localhost.localdomain ([88.153.6.11]) by mail.gmx.com (mrgmx102 [212.227.17.168]) with ESMTPSA (Nemesis) id 0MVsUW-1eDEXw0UbA-00X4bk; Fri, 09 Feb 2018 13:07:44 +0100 From: =?utf-8?q?Jonathan_Neusch=C3=A4fer?= To: linux-kernel@vger.kernel.org Cc: Joel Stanley , linuxppc-dev@lists.ozlabs.org, linux-gpio@vger.kernel.org, devicetree@vger.kernel.org, =?utf-8?q?Jon?= =?utf-8?q?athan_Neusch=C3=A4fer?= , Rob Herring , Mark Rutland , Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman Subject: [PATCH v3 3/4] powerpc: wii.dts: Add ngpios property Date: Fri, 9 Feb 2018 13:07:30 +0100 Message-Id: <20180209120732.17863-4-j.neuschaefer@gmx.net> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180209120732.17863-1-j.neuschaefer@gmx.net> References: <20180209120732.17863-1-j.neuschaefer@gmx.net> MIME-Version: 1.0 X-Provags-ID: V03:K0:ixqf/7HPx5HCiYsBS5gEttEt9wNgrCyAqpiYnEK40r0u9DVTR2g p1Cw5w4i8FhaYBLZ8cjkfIxJEPX3Edu/MBzOK9xmCzWP43N1+kZs6vApe/KAgoczlCZJgLB vHeI0X2LjrLPVIXgFtCBG4uB+fICh50/OQEIKrtFYcn6IHK6S2COIO/A5fhnaikCUdcjXkH D91ZlzeFYF95DbR45QsHQ== X-UI-Out-Filterresults: notjunk:1; V01:K0:dE/fAj/pryA=:gExQYzFy4cbXK30JIs3s/9 B8n3RaCJ+xo/JVKegQ2EJiqsYdxTyORceMz8hiiK72IUy8GQAwjdvw/UIrUWhTNBd4ZFdSxNv JqvzV0XXwmLslhYegMn4J00vKVZRLt7Nn6afqgHA8G0QLeC25o9baH+4VY2MCn4q03NWBIHFP Ywdkvlv9Jb135z5mD8tjjHNNZCiZ85OFXhi4IOT6frF1bfIZY1l2bw5jGQxFNq0H2B9p93t0O uL3DOsmtefJ7xltSJoYe+5czwxda86DE2MDMK89rEzN8Ko1037PdZawRxkGeF37yFKgajS3gi IO3Gxm0Q/tnSstI/B+gqyIFEqwqQfhhxFnVo5uMqLe+fT0VN8HGQx8smxfACkCe20OzPSlLD2 E3aN3psrdYgvg6f0aOeRC/y8pur411b7FEfd4++wUYuYV5j8soPHwHOwVCI849wUKm5Ao5z/0 wcV2Dp5qHvp1QSVJk116PfAFLk5zpfWETZrdsGGk9Nv8KlkI9ivAln0JVYXscUKiZBU60Cse0 YwRArbcpZPhIBIvG2jOsGTavYuZPPGSgVVnx591Woh79rkQKL3hiQrANxRw9B6QdHrYI3Ew2D xvlHoRbGrhCJUFrMZSfO5G/gca+LIy4v//lAAUky9R6InKiKkWwFSGOq2XDAJaQzSDCA03/SB MextsJSK/5xxLPSovNy+ZtlbHx4imHI6QE5ZCUdRj7C12HFcDAUxGiH4s+FU+AgapktZRT8yO F56U33BokchS+Xrz6kk1ltz4k/fyQJ39AYoCoxCwN4kphLJnMwhTylFt9RkWflPXMkORu4vJu 6kUBMT9LVtxwKcL69FCNRAdfo1PM/WQAPojtbZfv2xGw0g/41I= Sender: linux-gpio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-gpio@vger.kernel.org The Hollywood GPIO controller supports 32 GPIOs, but on the Wii, only 24 are used. Signed-off-by: Jonathan Neuschäfer --- v2, v3: - no change --- arch/powerpc/boot/dts/wii.dts | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/powerpc/boot/dts/wii.dts b/arch/powerpc/boot/dts/wii.dts index 40b324b6391e..7235e375919c 100644 --- a/arch/powerpc/boot/dts/wii.dts +++ b/arch/powerpc/boot/dts/wii.dts @@ -176,6 +176,7 @@ compatible = "nintendo,hollywood-gpio"; reg = <0x0d8000c0 0x40>; gpio-controller; + ngpios = <24>; /* * This is commented out while a standard binding From patchwork Fri Feb 9 12:07:31 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?J=2E_Neusch=C3=A4fer?= X-Patchwork-Id: 871361 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=) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3zdDP812zyz9s82 for ; Fri, 9 Feb 2018 23:08:44 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751910AbeBIMIO (ORCPT ); Fri, 9 Feb 2018 07:08:14 -0500 Received: from mout.gmx.net ([212.227.17.20]:38089 "EHLO mout.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751098AbeBIMH4 (ORCPT ); Fri, 9 Feb 2018 07:07:56 -0500 Received: from localhost.localdomain ([88.153.6.11]) by mail.gmx.com (mrgmx102 [212.227.17.168]) with ESMTPSA (Nemesis) id 0Lp8h6-1fDh3M3jSm-00esfw; Fri, 09 Feb 2018 13:07:45 +0100 From: =?utf-8?q?Jonathan_Neusch=C3=A4fer?= To: linux-kernel@vger.kernel.org Cc: Joel Stanley , linuxppc-dev@lists.ozlabs.org, linux-gpio@vger.kernel.org, devicetree@vger.kernel.org, =?utf-8?q?Jon?= =?utf-8?q?athan_Neusch=C3=A4fer?= , Rob Herring , Mark Rutland , Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman Subject: [PATCH v3 4/4] powerpc: wii.dts: Add GPIO line names Date: Fri, 9 Feb 2018 13:07:31 +0100 Message-Id: <20180209120732.17863-5-j.neuschaefer@gmx.net> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180209120732.17863-1-j.neuschaefer@gmx.net> References: <20180209120732.17863-1-j.neuschaefer@gmx.net> MIME-Version: 1.0 X-Provags-ID: V03:K0:GdN6gCGntLjNjNtSDUSDKHoBON++iQDfa39DHkAAWXZH2ABkvwq piOgwHUI0LzIypl2uUNWYrumf2rbi30H9yXIKI5o7qXUSQNnee3c6duLiDYT9sHDzlZZDbi xHtZK1iL+BkCdgMXfgJnCO/Gtj8/aEOjlz86mv/c29W+Gxac8QT5ubWtVDSRMwec9ZS8/YT sZzlHW1B+XYVl+OsCRlRg== X-UI-Out-Filterresults: notjunk:1; V01:K0:1Nm8T9rH/s0=:YwZBEPsDlplU7WmJ0edupv ehUNJ0tWkH/z4KsGYBNVRxtnMGLYNb6n0ij7P0IW8hiO+bF0LXE9kVmRvQzN09bJL/H5GjsNs TkCsnQ+O+u2/JW2frCAaeDB9oPmE0A/58b9Lov+JjS5sF0p6MLywv37IgWoEEvX3BmaFfl+Kk 4nmDf4NMxCmC77uJOKjhmffVoAbkuQn7lVibOyTurpRWQZ7qz+0/l8+XgoE/gbiV87oljw4Ot tjiXbbCf204L5eK4ZFQbfRMh0q3i2DahWdiokbLQsS/qyL08YINaSn1ncUryE3nU0SUV/4kFj FxNzxXppDxByuHLDSgFx9wL7hLWCO/Lt1hUBqGLNw0SMjIXTS8AaOsE+QbgGHK4sDqB+odUrm 3wsPB0fzQF1U3rwyZ1Qq8WlEoKjP4yQmk88Bk0iQ59jbKlxjV3AOmHRhgssZKAGxcIVUrGF87 9bPN5vnq0d98bbiVr8pJ+3sEqaDwyodE6AS9TWwi4qkygmdFy5olYbMLMhUzYXz1E5KVanx0T QFR1j+3APGXBiE6yo6MfCBgbKDOF2YnIsT8Yf9e/qRMe+fbhJFWQWUOiNIMOMaHHUda1DTPpj xV1LDLD4/ux+ZvQonQteB2SQjhuuV2A9iTy0Qexp5viYAzHG1TeYSHZ3qcbzvzhVOx+Y3q0qB liVS4XoQPmjX0PL6U5UmtmoQd9XiPdtUEb9s7cwDLMd9Oc8Uc3t+vGXOow89Q/c+Vj3eDcygR IMQ1hmWHcN7iYAWnz8qxx3siKbtjoy/S1iJrgHln4YFdWlXZL4GhoU/+9VvkKh3Tk94uLTWJa Kia4NTC1/pgfYHYauCuVKdhU6Y9e9/F0B+7W3MoruYiAlTwUxw= Sender: linux-gpio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-gpio@vger.kernel.org These are the GPIO line names on a Nintendo Wii, as documented in: https://wiibrew.org/wiki/Hardware/Hollywood_GPIOs Signed-off-by: Jonathan Neuschäfer --- v2, v3: - no change --- arch/powerpc/boot/dts/wii.dts | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/arch/powerpc/boot/dts/wii.dts b/arch/powerpc/boot/dts/wii.dts index 7235e375919c..07d5e84e98b1 100644 --- a/arch/powerpc/boot/dts/wii.dts +++ b/arch/powerpc/boot/dts/wii.dts @@ -178,6 +178,14 @@ gpio-controller; ngpios = <24>; + gpio-line-names = + "POWER", "SHUTDOWN", "FAN", "DC_DC", + "DI_SPIN", "SLOT_LED", "EJECT_BTN", "SLOT_IN", + "SENSOR_BAR", "DO_EJECT", "EEP_CS", "EEP_CLK", + "EEP_MOSI", "EEP_MISO", "AVE_SCL", "AVE_SDA", + "DEBUG0", "DEBUG1", "DEBUG2", "DEBUG3", + "DEBUG4", "DEBUG5", "DEBUG6", "DEBUG7"; + /* * This is commented out while a standard binding * for i2c over gpio is defined.