Skip to contentSkip to conversation

platform/x86: Remove PMIC GPIO block support

PATCH Superseded Andy Shevchenko 3 participants 5 messages Jan 5, 2017 – Jan 6, 2017 x86 platform drivers

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore

Andy Shevchenko

author
#0 lore raw

PATCH 1/1 platform/x86: Remove PMIC GPIO block support

The Moorestown support was removed by commit 1a8359e411eb ("x86/mid: Remove Intel Moorestown").

Remove this leftover.

Signed-off-by Andy Shevchenko <[email protected]>
---
 drivers/platform/x86/Kconfig           |   8 -
 drivers/platform/x86/Makefile          |   1 -
 drivers/platform/x86/intel_pmic_gpio.c | 326 ---------------------------------
 include/linux/intel_pmic_gpio.h        |  15 --
 4 files changed, 350 deletions(-)
 delete mode 100644 drivers/platform/x86/intel_pmic_gpio.c
 delete mode 100644 include/linux/intel_pmic_gpio.h
drivers/platform/x86/Kconfig +0 -8
index 3cf325de9bf3..9d9b12556809 100644
@@ -836,19 +836,11 @@ config INTEL_SCU_IPC_UTIL
 	  low level access for debug work and updating the firmware. Say
 	  N unless you will be doing this on an Intel MID platform.
 
-config GPIO_INTEL_PMIC
-	bool "Intel PMIC GPIO support"
-	depends on INTEL_SCU_IPC && GPIOLIB
-	---help---
-	  Say Y here to support GPIO via the SCU IPC interface
-	  on Intel MID platforms.
-
 config INTEL_MID_POWER_BUTTON
 	tristate "power button driver for Intel MID platforms"
 	depends on INTEL_SCU_IPC && INPUT
 	help
 	  This driver handles the power button on the Intel MID platforms.
-
 	  If unsure, say N.
 
 config INTEL_MFLD_THERMAL
drivers/platform/x86/Makefile +0 -1
index 6bad273856e0..d84f53101520 100644
@@ -56,7 +56,6 @@ obj-$(CONFIG_INTEL_SCU_IPC)	+= intel_scu_ipc.o
 obj-$(CONFIG_INTEL_SCU_IPC_UTIL) += intel_scu_ipcutil.o
 obj-$(CONFIG_INTEL_MFLD_THERMAL) += intel_mid_thermal.o
 obj-$(CONFIG_INTEL_IPS)		+= intel_ips.o
-obj-$(CONFIG_GPIO_INTEL_PMIC)	+= intel_pmic_gpio.o
 obj-$(CONFIG_XO1_RFKILL)	+= xo1-rfkill.o
 obj-$(CONFIG_XO15_EBOOK)	+= xo15-ebook.o
 obj-$(CONFIG_IBM_RTL)		+= ibm_rtl.o
drivers/platform/x86/intel_pmic_gpio.c deleted +0 -326

326 lines not on this page · raw message

include/linux/intel_pmic_gpio.h deleted +0 -15
deleted file mode 100644
index 920109a29191..000000000000
@@ -1,15 +0,0 @@
-#ifndef LINUX_INTEL_PMIC_H
-#define LINUX_INTEL_PMIC_H
-
-struct intel_pmic_gpio_platform_data {
-	/* the first IRQ of the chip */
-	unsigned	irq_base;
-	/* number assigned to the first GPIO */
-	unsigned	gpio_base;
-	/* sram address for gpiointr register, the langwell chip will map
-	 * the PMIC spi GPIO expander's GPIOINTR register in sram.
-	 */
-	unsigned	gpiointr;
-};
-
-#endif
Signature · 1 line
2.11.0
author
#1 lore raw
Quoted 5 lines · Andy Shevchenko

The Moorestown support was removed by commit 1a8359e411eb ("x86/mid:
Remove
Intel Moorestown").

Remove this leftover.

Okay, this one dependent to removal of its users.
So, will wait until that part makes upstream.

Signature · 2 lines
Andy Shevchenko <[email protected]>
Intel Finland Oy
build bot
#2 lore raw
In reply to Andy Shevchenko
reproduce:

Hi Andy,

[auto build test ERROR on platform-drivers-x86/for-next]
[also build test ERROR on v4.10-rc2 next-20170105]
[if your patch is applied to the wrong git tree, please drop us a note to help improve the system]

url:    https://github.com/0day-ci/linux/commits/Andy-Shevchenko/platform-x86-Remove-PMIC-GPIO-block-support/20170106-185609
base:   git://git.infradead.org/users/dvhart/linux-platform-drivers-x86.git for-next
config: i386-allmodconfig (attached as .config)
compiler: gcc-6 (Debian 6.2.0-3) 6.2.0 20160901
reproduce:
        # save the attached .config to linux build tree
        make ARCH=i386

All errors (new ones prefixed by >>):

>> arch/x86/platform/intel-mid/sfi.c:18:35: fatal error: linux/intel_pmic_gpio.h: No such file or directory
    #include <linux/intel_pmic_gpio.h>
                                      ^

compilation terminated.

vim +18 arch/x86/platform/intel-mid/sfi.c

aeedb370 Kuppuswamy Sathyanarayanan 2013-10-17   2   * intel_mid_sfi.c: Intel MID SFI initialization code
aeedb370 Kuppuswamy Sathyanarayanan 2013-10-17   3   *
aeedb370 Kuppuswamy Sathyanarayanan 2013-10-17   4   * (C) Copyright 2013 Intel Corporation
aeedb370 Kuppuswamy Sathyanarayanan 2013-10-17   5   * Author: Sathyanarayanan Kuppuswamy <[email protected]>
aeedb370 Kuppuswamy Sathyanarayanan 2013-10-17   6   *
aeedb370 Kuppuswamy Sathyanarayanan 2013-10-17   7   * This program is free software; you can redistribute it and/or
aeedb370 Kuppuswamy Sathyanarayanan 2013-10-17   8   * modify it under the terms of the GNU General Public License
aeedb370 Kuppuswamy Sathyanarayanan 2013-10-17   9   * as published by the Free Software Foundation; version 2
aeedb370 Kuppuswamy Sathyanarayanan 2013-10-17  10   * of the License.
aeedb370 Kuppuswamy Sathyanarayanan 2013-10-17  11   */
aeedb370 Kuppuswamy Sathyanarayanan 2013-10-17  12  
aeedb370 Kuppuswamy Sathyanarayanan 2013-10-17  13  #include <linux/init.h>
aeedb370 Kuppuswamy Sathyanarayanan 2013-10-17  14  #include <linux/kernel.h>
aeedb370 Kuppuswamy Sathyanarayanan 2013-10-17  15  #include <linux/interrupt.h>
aeedb370 Kuppuswamy Sathyanarayanan 2013-10-17  16  #include <linux/scatterlist.h>
aeedb370 Kuppuswamy Sathyanarayanan 2013-10-17  17  #include <linux/sfi.h>
aeedb370 Kuppuswamy Sathyanarayanan 2013-10-17 @18  #include <linux/intel_pmic_gpio.h>
aeedb370 Kuppuswamy Sathyanarayanan 2013-10-17  19  #include <linux/spi/spi.h>
aeedb370 Kuppuswamy Sathyanarayanan 2013-10-17  20  #include <linux/i2c.h>
aeedb370 Kuppuswamy Sathyanarayanan 2013-10-17  21  #include <linux/skbuff.h>
aeedb370 Kuppuswamy Sathyanarayanan 2013-10-17  22  #include <linux/gpio.h>
aeedb370 Kuppuswamy Sathyanarayanan 2013-10-17  23  #include <linux/gpio_keys.h>
aeedb370 Kuppuswamy Sathyanarayanan 2013-10-17  24  #include <linux/input.h>
aeedb370 Kuppuswamy Sathyanarayanan 2013-10-17  25  #include <linux/platform_device.h>
aeedb370 Kuppuswamy Sathyanarayanan 2013-10-17  26  #include <linux/irq.h>

:::::: The code at line 18 was first introduced by commit
:::::: aeedb370e7398fb5b39185b295d36f2da0653215 intel_mid: Moved SFI related code to sfi.c

:::::: TO: Kuppuswamy Sathyanarayanan <[email protected]> :::::: CC: H. Peter Anvin <[email protected]>

---
0-DAY kernel test infrastructure Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all Intel Corporation

#3 lore raw
Quoted 14 lines · kbuild test robot

Hi Andy,

[auto build test ERROR on platform-drivers-x86/for-next]
[also build test ERROR on v4.10-rc2 next-20170105]
[if your patch is applied to the wrong git tree, please drop us a note to help improve the system]

url:    https://github.com/0day-ci/linux/commits/Andy-Shevchenko/platform-x86-Remove-PMIC-GPIO-block-support/20170106-185609
base:   git://git.infradead.org/users/dvhart/linux-platform-drivers-x86.git for-next
config: i386-allmodconfig (attached as .config)
compiler: gcc-6 (Debian 6.2.0-3) 6.2.0 20160901
reproduce:
        # save the attached .config to linux build tree
        make ARCH=i386
Quoted 1 line

All errors (new ones prefixed by >>):

Yes, yes. It's not an error, just dependency. Removal of the users of this header is pending for tip tree.

Quoted 43 lines
Quoted 2 lines
Quoted 2 lines

arch/x86/platform/intel-mid/sfi.c:18:35: fatal error: linux/intel_pmic_gpio.h: No such file or directory

    #include <linux/intel_pmic_gpio.h>
                                      ^

compilation terminated.

vim +18 arch/x86/platform/intel-mid/sfi.c

aeedb370 Kuppuswamy Sathyanarayanan 2013-10-17   2   * intel_mid_sfi.c: Intel MID SFI initialization code
aeedb370 Kuppuswamy Sathyanarayanan 2013-10-17   3   *
aeedb370 Kuppuswamy Sathyanarayanan 2013-10-17   4   * (C) Copyright 2013 Intel Corporation
aeedb370 Kuppuswamy Sathyanarayanan 2013-10-17   5   * Author: Sathyanarayanan Kuppuswamy <[email protected]>
aeedb370 Kuppuswamy Sathyanarayanan 2013-10-17   6   *
aeedb370 Kuppuswamy Sathyanarayanan 2013-10-17   7   * This program is free software; you can redistribute it and/or
aeedb370 Kuppuswamy Sathyanarayanan 2013-10-17   8   * modify it under the terms of the GNU General Public License
aeedb370 Kuppuswamy Sathyanarayanan 2013-10-17   9   * as published by the Free Software Foundation; version 2
aeedb370 Kuppuswamy Sathyanarayanan 2013-10-17  10   * of the License.
aeedb370 Kuppuswamy Sathyanarayanan 2013-10-17  11   */
aeedb370 Kuppuswamy Sathyanarayanan 2013-10-17  12
aeedb370 Kuppuswamy Sathyanarayanan 2013-10-17  13  #include <linux/init.h>
aeedb370 Kuppuswamy Sathyanarayanan 2013-10-17  14  #include <linux/kernel.h>
aeedb370 Kuppuswamy Sathyanarayanan 2013-10-17  15  #include <linux/interrupt.h>
aeedb370 Kuppuswamy Sathyanarayanan 2013-10-17  16  #include <linux/scatterlist.h>
aeedb370 Kuppuswamy Sathyanarayanan 2013-10-17  17  #include <linux/sfi.h>
aeedb370 Kuppuswamy Sathyanarayanan 2013-10-17 @18  #include <linux/intel_pmic_gpio.h>
aeedb370 Kuppuswamy Sathyanarayanan 2013-10-17  19  #include <linux/spi/spi.h>
aeedb370 Kuppuswamy Sathyanarayanan 2013-10-17  20  #include <linux/i2c.h>
aeedb370 Kuppuswamy Sathyanarayanan 2013-10-17  21  #include <linux/skbuff.h>
aeedb370 Kuppuswamy Sathyanarayanan 2013-10-17  22  #include <linux/gpio.h>
aeedb370 Kuppuswamy Sathyanarayanan 2013-10-17  23  #include <linux/gpio_keys.h>
aeedb370 Kuppuswamy Sathyanarayanan 2013-10-17  24  #include <linux/input.h>
aeedb370 Kuppuswamy Sathyanarayanan 2013-10-17  25  #include <linux/platform_device.h>
aeedb370 Kuppuswamy Sathyanarayanan 2013-10-17  26  #include <linux/irq.h>

:::::: The code at line 18 was first introduced by commit
:::::: aeedb370e7398fb5b39185b295d36f2da0653215 intel_mid: Moved SFI related code to sfi.c

:::::: TO: Kuppuswamy Sathyanarayanan <[email protected]> :::::: CC: H. Peter Anvin <[email protected]>

---
0-DAY kernel test infrastructure Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all Intel Corporation

Signature · 2 lines
With Best Regards,
Andy Shevchenko
build bot
#4 lore raw
In reply to Andy Shevchenko
reproduce:

Hi Andy,

[auto build test ERROR on platform-drivers-x86/for-next]
[also build test ERROR on v4.10-rc2 next-20170105]
[if your patch is applied to the wrong git tree, please drop us a note to help improve the system]

url:    https://github.com/0day-ci/linux/commits/Andy-Shevchenko/platform-x86-Remove-PMIC-GPIO-block-support/20170106-185609
base:   git://git.infradead.org/users/dvhart/linux-platform-drivers-x86.git for-next
config: x86_64-randconfig-s0-01062027 (attached as .config)
compiler: gcc-4.4 (Debian 4.4.7-8) 4.4.7
reproduce:
        # save the attached .config to linux build tree
        make ARCH=x86_64

All errors (new ones prefixed by >>):

>> arch/x86/platform/intel-mid/sfi.c:18:35: error: linux/intel_pmic_gpio.h: No such file or directory

vim +18 arch/x86/platform/intel-mid/sfi.c

aeedb370 Kuppuswamy Sathyanarayanan 2013-10-17   2   * intel_mid_sfi.c: Intel MID SFI initialization code
aeedb370 Kuppuswamy Sathyanarayanan 2013-10-17   3   *
aeedb370 Kuppuswamy Sathyanarayanan 2013-10-17   4   * (C) Copyright 2013 Intel Corporation
aeedb370 Kuppuswamy Sathyanarayanan 2013-10-17   5   * Author: Sathyanarayanan Kuppuswamy <[email protected]>
aeedb370 Kuppuswamy Sathyanarayanan 2013-10-17   6   *
aeedb370 Kuppuswamy Sathyanarayanan 2013-10-17   7   * This program is free software; you can redistribute it and/or
aeedb370 Kuppuswamy Sathyanarayanan 2013-10-17   8   * modify it under the terms of the GNU General Public License
aeedb370 Kuppuswamy Sathyanarayanan 2013-10-17   9   * as published by the Free Software Foundation; version 2
aeedb370 Kuppuswamy Sathyanarayanan 2013-10-17  10   * of the License.
aeedb370 Kuppuswamy Sathyanarayanan 2013-10-17  11   */
aeedb370 Kuppuswamy Sathyanarayanan 2013-10-17  12  
aeedb370 Kuppuswamy Sathyanarayanan 2013-10-17  13  #include <linux/init.h>
aeedb370 Kuppuswamy Sathyanarayanan 2013-10-17  14  #include <linux/kernel.h>
aeedb370 Kuppuswamy Sathyanarayanan 2013-10-17  15  #include <linux/interrupt.h>
aeedb370 Kuppuswamy Sathyanarayanan 2013-10-17  16  #include <linux/scatterlist.h>
aeedb370 Kuppuswamy Sathyanarayanan 2013-10-17  17  #include <linux/sfi.h>
aeedb370 Kuppuswamy Sathyanarayanan 2013-10-17 @18  #include <linux/intel_pmic_gpio.h>
aeedb370 Kuppuswamy Sathyanarayanan 2013-10-17  19  #include <linux/spi/spi.h>
aeedb370 Kuppuswamy Sathyanarayanan 2013-10-17  20  #include <linux/i2c.h>
aeedb370 Kuppuswamy Sathyanarayanan 2013-10-17  21  #include <linux/skbuff.h>
aeedb370 Kuppuswamy Sathyanarayanan 2013-10-17  22  #include <linux/gpio.h>
aeedb370 Kuppuswamy Sathyanarayanan 2013-10-17  23  #include <linux/gpio_keys.h>
aeedb370 Kuppuswamy Sathyanarayanan 2013-10-17  24  #include <linux/input.h>
aeedb370 Kuppuswamy Sathyanarayanan 2013-10-17  25  #include <linux/platform_device.h>
aeedb370 Kuppuswamy Sathyanarayanan 2013-10-17  26  #include <linux/irq.h>

:::::: The code at line 18 was first introduced by commit
:::::: aeedb370e7398fb5b39185b295d36f2da0653215 intel_mid: Moved SFI related code to sfi.c

:::::: TO: Kuppuswamy Sathyanarayanan <[email protected]> :::::: CC: H. Peter Anvin <[email protected]>

---
0-DAY kernel test infrastructure Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all Intel Corporation