Skip to contentSkip to conversation

platform/x86: Remove PMIC GPIO block support

PATCH RESEND New Andy Shevchenko 2 participants 2 messages Jan 12, 2017 – Jan 14, 2017

Subsystems (3)
x86 x86 platform drivers Intel MID (Mobile Internet Device) platform
lore
Share & tools
lore

Andy Shevchenko

author
#0 lore raw

PATCH RESEND v2 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]>
---
 arch/x86/platform/intel-mid/sfi.c      |   1 -
 drivers/platform/x86/Kconfig           |   7 -
 drivers/platform/x86/Makefile          |   1 -
 drivers/platform/x86/intel_pmic_gpio.c | 326 ---------------------------------
 include/linux/intel_pmic_gpio.h        |  15 --
 5 files changed, 350 deletions(-)
 delete mode 100644 drivers/platform/x86/intel_pmic_gpio.c
 delete mode 100644 include/linux/intel_pmic_gpio.h
arch/x86/platform/intel-mid/sfi.c +0 -1
index ce1303830231..19b43e3a9f0f 100644
@@ -15,7 +15,6 @@
 #include <linux/interrupt.h>
 #include <linux/scatterlist.h>
 #include <linux/sfi.h>
-#include <linux/intel_pmic_gpio.h>
 #include <linux/spi/spi.h>
 #include <linux/i2c.h>
 #include <linux/skbuff.h>
drivers/platform/x86/Kconfig +0 -7
index 59aa8e302bc3..49a594855f98 100644
@@ -816,13 +816,6 @@ 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
drivers/platform/x86/Makefile +0 -1
index d4111f0f8a78..b2f52a7690af 100644
@@ -50,7 +50,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
merge bot
#1 lore raw

[tip:x86/platform] x86/platform/intel: Remove PMIC GPIO block support

x86/platform/intel: Remove PMIC GPIO block support
Commit-ID:  a665ece8b471de45bc19af05d52a1eaa5bc06dca
Gitweb:     http://git.kernel.org/tip/a665ece8b471de45bc19af05d52a1eaa5bc06dca
Author:     Andy Shevchenko <[email protected]>
AuthorDate: Thu, 12 Jan 2017 13:23:31 +0200
Committer:  Ingo Molnar <[email protected]>
CommitDate: Sat, 14 Jan 2017 08:30:45 +0100

x86/platform/intel: Remove PMIC GPIO block support

Moorestown support was removed by commit:

1a8359e411eb ("x86/mid: Remove Intel Moorestown")

Remove this leftover.

Signed-off-by Andy Shevchenko <[email protected]>
Cc Darren Hart <[email protected]>
Cc Linus Torvalds <[email protected]>
Cc Peter Zijlstra <[email protected]>
Cc Thomas Gleixner <[email protected]>
Cc [email protected]
Link http://lkml.kernel.org/r/[email protected] open here
Signed-off-by Ingo Molnar <[email protected]>
---
 arch/x86/platform/intel-mid/sfi.c      |   1 -
 drivers/platform/x86/Kconfig           |   7 -
 drivers/platform/x86/Makefile          |   1 -
 drivers/platform/x86/intel_pmic_gpio.c | 326 ---------------------------------
 include/linux/intel_pmic_gpio.h        |  15 --
 5 files changed, 350 deletions(-)
arch/x86/platform/intel-mid/sfi.c +0 -1
index ce13038..19b43e3 100644
@@ -15,7 +15,6 @@
 #include <linux/interrupt.h>
 #include <linux/scatterlist.h>
 #include <linux/sfi.h>
-#include <linux/intel_pmic_gpio.h>
 #include <linux/spi/spi.h>
 #include <linux/i2c.h>
 #include <linux/skbuff.h>
drivers/platform/x86/Kconfig +0 -7
index 5fe8be0..fe5a3da 100644
@@ -816,13 +816,6 @@ 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
drivers/platform/x86/Makefile +0 -1
index d4111f0..b2f52a7 100644
@@ -50,7 +50,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 920109a..0000000
@@ -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