From patchwork Sun Nov 1 09:52:52 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 538712 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 187BF140323 for ; Sun, 1 Nov 2015 20:53:09 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=linaro_org.20150623.gappssmtp.com header.i=@linaro_org.20150623.gappssmtp.com header.b=g4VnZ7vJ; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751565AbbKAJxI (ORCPT ); Sun, 1 Nov 2015 04:53:08 -0500 Received: from mail-lb0-f176.google.com ([209.85.217.176]:36514 "EHLO mail-lb0-f176.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751364AbbKAJxG (ORCPT ); Sun, 1 Nov 2015 04:53:06 -0500 Received: by lbjm5 with SMTP id m5so71454385lbj.3 for ; Sun, 01 Nov 2015 01:53:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro_org.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id; bh=ThFjlfnabPrPTTyGK+5MCJ9DylLiSL4DE8rRj5fKDyM=; b=g4VnZ7vJg8BjqpNDQun1kN4ucadBXUHMnOcXj7xPjd54nXUUHLecPfNudMdhsBp6+9 0BWMtkgAAytR3rlB2SjvFmOwbUUjTKlzEf4eZMuB85xEI4+q5d2tdZYHbn7mIvH3CBG6 DU0nMn+e8UlVcEPjQHsV4GhcanCN6XUK7DdY7bWD1bMv/Yb7lS9QUIMwqiSyJXhsQwRK /WUEDe8UxkHw5DBKnUS0Jb+6Vdpf5bhQquKVGHoKJXvJaB32xxy53zUtrRzVfGp6ItN8 b2hGL+ge4e/z0WtAKHHxjnn8aKEFZrnkjm3OqqMGecpi34XnePg2UjC+PI/JaoBMERb3 laRA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=ThFjlfnabPrPTTyGK+5MCJ9DylLiSL4DE8rRj5fKDyM=; b=J2y3NJe3E6R2ADMzpNgoKlv+Rlixm2jkqq+fu8vt8LuUvEkCNjYOXkPxV+mO2cJuQD FXY5T52l2ISxiajCDC5IENy1zXK2goiXCLMDpG6yoCUgLy67ZnNIPtKLaCuwtpiog/Mx kD/NUT7GDWxHXGZJz3xrHErdlxXT02Im7k5ApdsMkfm3tddHA1ADwlD+FFR/9SBGdxFl waNH61RPvbkyhcJMZz5GV2dQ5gYHSoE8Z/RT/Z3kVkihuvnqy36RF6d8dVJfizKAL8aB +saSGVvmHzT0Eg8Af5aqpSPX5EIXJce7PX+aI/HU/BGChBZEarQrvAxRecwntzb9iyzi tBJg== X-Gm-Message-State: ALoCoQkgqFKkNGwFHtJZxXZotbEXYRKkkBq4UbX+aWnEoTiY77s01l5xMC7K1BA/Z+GWjrsQ6trq X-Received: by 10.112.129.161 with SMTP id nx1mr7504563lbb.112.1446371584555; Sun, 01 Nov 2015 01:53:04 -0800 (PST) Received: from localhost.localdomain.localdomain (c-297471d5.01-192-6c756e10.cust.bredbandsbolaget.se. [213.113.116.41]) by smtp.gmail.com with ESMTPSA id h184sm2964573lfh.4.2015.11.01.01.52.54 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 01 Nov 2015 01:52:54 -0800 (PST) From: Linus Walleij To: linux-gpio@vger.kernel.org, Alexandre Courbot Cc: Linus Walleij Subject: [PATCH] gpio: fix up SPI submenu Date: Sun, 1 Nov 2015 10:52:52 +0100 Message-Id: <1446371572-31924-1-git-send-email-linus.walleij@linaro.org> X-Mailer: git-send-email 2.4.3 Sender: linux-gpio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-gpio@vger.kernel.org - Relax dependencies on SPI_MASTER for drivers in the SPI menu that already has this dependency. - Move out the expander that would be hidden for I2C access if SPI_MASTER was not selected. Tentatively create a separate menu for this. - Move the ZX SoC driver to memory-mapped drivers, this must be a mistake and only worked because the system has an SPI master enabled at the same time. Signed-off-by: Linus Walleij --- drivers/gpio/Kconfig | 34 ++++++++++++++++++---------------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig index a8dcc99830c3..b18bea08ff25 100644 --- a/drivers/gpio/Kconfig +++ b/drivers/gpio/Kconfig @@ -483,6 +483,12 @@ config GPIO_ZYNQ help Say yes here to support Xilinx Zynq GPIO controller. +config GPIO_ZX + bool "ZTE ZX GPIO support" + select GPIOLIB_IRQCHIP + help + Say yes here to support the GPIO device on ZTE ZX SoCs. + endmenu menu "Port-mapped I/O GPIO drivers" @@ -984,7 +990,7 @@ menu "SPI GPIO expanders" config GPIO_74X164 tristate "74x164 serial-in/parallel-out 8-bits shift register" - depends on SPI_MASTER && OF + depends on OF help Driver for 74x164 compatible serial-in/parallel-out 8-outputs shift registers. This driver can be used to provide access @@ -992,32 +998,28 @@ config GPIO_74X164 config GPIO_MAX7301 tristate "Maxim MAX7301 GPIO expander" - depends on SPI_MASTER select GPIO_MAX730X help GPIO driver for Maxim MAX7301 SPI-based GPIO expander. -config GPIO_MCP23S08 - tristate "Microchip MCP23xxx I/O expander" - depends on (SPI_MASTER && !I2C) || I2C - help - SPI/I2C driver for Microchip MCP23S08/MCP23S17/MCP23008/MCP23017 - I/O expanders. - This provides a GPIO interface supporting inputs and outputs. - The I2C versions of the chips can be used as interrupt-controller. - config GPIO_MC33880 tristate "Freescale MC33880 high-side/low-side switch" - depends on SPI_MASTER help SPI driver for Freescale MC33880 high-side/low-side switch. This provides GPIO interface supporting inputs and outputs. -config GPIO_ZX - bool "ZTE ZX GPIO support" - select GPIOLIB_IRQCHIP +endmenu + +menu "SPI or I2C GPIO expanders" + depends on (SPI_MASTER && !I2C) || I2C + +config GPIO_MCP23S08 + tristate "Microchip MCP23xxx I/O expander" help - Say yes here to support the GPIO device on ZTE ZX SoCs. + SPI/I2C driver for Microchip MCP23S08/MCP23S17/MCP23008/MCP23017 + I/O expanders. + This provides a GPIO interface supporting inputs and outputs. + The I2C versions of the chips can be used as interrupt-controller. endmenu