* linux-next: manual merge of the gpio tree with the mfd tree
@ 2016-02-16 3:33 Stephen Rothwell
0 siblings, 0 replies; 8+ messages in thread
From: Stephen Rothwell @ 2016-02-16 3:33 UTC (permalink / raw)
To: Linus Walleij, Lee Jones
Cc: linux-next, linux-kernel, Andrew F. Davis, Nicolas Saenz Julienne
Hi Linus,
Today's linux-next merge of the gpio tree got conflicts in:
drivers/gpio/Kconfig
drivers/gpio/Makefile
between commit:
5d8c473983fc ("gpio: tps65086: Add GPO driver for the TPS65086 PMIC")
from the mfd tree and commit:
b866526d0cfe ("gpio: Add driver for TI TPIC2810")
c366c76a2c41 ("gpio: add tps65218 gpio")
from the gpio tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell
diff --cc drivers/gpio/Kconfig
index 2b80903965d1,ad226485a8e4..000000000000
--- a/drivers/gpio/Kconfig
+++ b/drivers/gpio/Kconfig
@@@ -844,12 -889,13 +889,19 @@@ config GPIO_TIMBERDAL
---help---
Add support for the GPIO IP in the timberdale FPGA.
+config GPIO_TPS65086
+ tristate "TI TPS65086 GPO"
+ depends on MFD_TPS65086
+ help
+ This driver supports the GPO on TI TPS65086x PMICs.
+
+ config GPIO_TPS65218
+ tristate "TPS65218 GPIO"
+ depends on MFD_TPS65218
+ help
+ Select this option to enable GPIO driver for the TPS65218
+ chip family.
+
config GPIO_TPS6586X
bool "TPS6586X GPIO"
depends on MFD_TPS6586X
diff --cc drivers/gpio/Makefile
index c759190b73fa,f1d3d823d1bc..000000000000
--- a/drivers/gpio/Makefile
+++ b/drivers/gpio/Makefile
@@@ -95,7 -97,8 +97,9 @@@ obj-$(CONFIG_GPIO_TC3589X) += gpio-tc35
obj-$(CONFIG_ARCH_TEGRA) += gpio-tegra.o
obj-$(CONFIG_GPIO_TIMBERDALE) += gpio-timberdale.o
obj-$(CONFIG_GPIO_PALMAS) += gpio-palmas.o
+obj-$(CONFIG_GPIO_TPS65086) += gpio-tps65086.o
+ obj-$(CONFIG_GPIO_TPIC2810) += gpio-tpic2810.o
+ obj-$(CONFIG_GPIO_TPS65218) += gpio-tps65218.o
obj-$(CONFIG_GPIO_TPS6586X) += gpio-tps6586x.o
obj-$(CONFIG_GPIO_TPS65910) += gpio-tps65910.o
obj-$(CONFIG_GPIO_TPS65912) += gpio-tps65912.o
^ permalink raw reply [flat|nested] 8+ messages in thread* linux-next: manual merge of the gpio tree with the mfd tree
@ 2019-06-28 7:28 Stephen Rothwell
2019-07-09 0:15 ` Stephen Rothwell
0 siblings, 1 reply; 8+ messages in thread
From: Stephen Rothwell @ 2019-06-28 7:28 UTC (permalink / raw)
To: Linus Walleij, Lee Jones
Cc: Linux Next Mailing List, Linux Kernel Mailing List,
Matti Vaittinen, Geert Uytterhoeven
[-- Attachment #1: Type: text/plain, Size: 15510 bytes --]
Hi all,
Today's linux-next merge of the gpio tree got a conflict in:
drivers/gpio/Makefile
between commit:
18bc64b3aebf ("gpio: Initial support for ROHM bd70528 GPIO block")
from the mfd tree and commit:
db16bad6efd9 ("gpio: Sort GPIO drivers in Makefile")
from the gpio tree.
I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc drivers/gpio/Makefile
index 10efc4f743fe,9e400e34e300..000000000000
--- a/drivers/gpio/Makefile
+++ b/drivers/gpio/Makefile
@@@ -17,155 -17,154 +17,155 @@@ obj-$(CONFIG_GPIO_GENERIC) += gpio-gene
# directly supported by gpio-generic
gpio-generic-$(CONFIG_GPIO_GENERIC) += gpio-mmio.o
- obj-$(CONFIG_GPIO_104_DIO_48E) += gpio-104-dio-48e.o
- obj-$(CONFIG_GPIO_104_IDIO_16) += gpio-104-idio-16.o
- obj-$(CONFIG_GPIO_104_IDI_48) += gpio-104-idi-48.o
- obj-$(CONFIG_GPIO_74X164) += gpio-74x164.o
- obj-$(CONFIG_GPIO_74XX_MMIO) += gpio-74xx-mmio.o
- obj-$(CONFIG_GPIO_ADNP) += gpio-adnp.o
- obj-$(CONFIG_GPIO_ADP5520) += gpio-adp5520.o
- obj-$(CONFIG_GPIO_ADP5588) += gpio-adp5588.o
- obj-$(CONFIG_GPIO_ALTERA) += gpio-altera.o
- obj-$(CONFIG_GPIO_ALTERA_A10SR) += gpio-altera-a10sr.o
- obj-$(CONFIG_GPIO_AMD_FCH) += gpio-amd-fch.o
- obj-$(CONFIG_GPIO_AMD8111) += gpio-amd8111.o
- obj-$(CONFIG_GPIO_AMDPT) += gpio-amdpt.o
- obj-$(CONFIG_GPIO_ARIZONA) += gpio-arizona.o
- obj-$(CONFIG_GPIO_ATH79) += gpio-ath79.o
- obj-$(CONFIG_GPIO_ASPEED) += gpio-aspeed.o
- obj-$(CONFIG_GPIO_RASPBERRYPI_EXP) += gpio-raspberrypi-exp.o
- obj-$(CONFIG_GPIO_BCM_KONA) += gpio-bcm-kona.o
- obj-$(CONFIG_GPIO_BD70528) += gpio-bd70528.o
- obj-$(CONFIG_GPIO_BD9571MWV) += gpio-bd9571mwv.o
- obj-$(CONFIG_GPIO_BRCMSTB) += gpio-brcmstb.o
- obj-$(CONFIG_GPIO_BT8XX) += gpio-bt8xx.o
- obj-$(CONFIG_GPIO_CADENCE) += gpio-cadence.o
- obj-$(CONFIG_GPIO_CLPS711X) += gpio-clps711x.o
- obj-$(CONFIG_GPIO_CS5535) += gpio-cs5535.o
- obj-$(CONFIG_GPIO_CRYSTAL_COVE) += gpio-crystalcove.o
- obj-$(CONFIG_GPIO_DA9052) += gpio-da9052.o
- obj-$(CONFIG_GPIO_DA9055) += gpio-da9055.o
- obj-$(CONFIG_GPIO_DAVINCI) += gpio-davinci.o
- obj-$(CONFIG_GPIO_DLN2) += gpio-dln2.o
- obj-$(CONFIG_GPIO_DWAPB) += gpio-dwapb.o
- obj-$(CONFIG_GPIO_EIC_SPRD) += gpio-eic-sprd.o
- obj-$(CONFIG_GPIO_EM) += gpio-em.o
- obj-$(CONFIG_GPIO_EP93XX) += gpio-ep93xx.o
- obj-$(CONFIG_GPIO_EXAR) += gpio-exar.o
- obj-$(CONFIG_GPIO_F7188X) += gpio-f7188x.o
- 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_GW_PLD) += gpio-gw-pld.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_IOP) += gpio-iop.o
- obj-$(CONFIG_GPIO_IXP4XX) += gpio-ixp4xx.o
- obj-$(CONFIG_GPIO_IT87) += gpio-it87.o
- obj-$(CONFIG_GPIO_JANZ_TTL) += gpio-janz-ttl.o
- obj-$(CONFIG_GPIO_KEMPLD) += gpio-kempld.o
- obj-$(CONFIG_ARCH_KS8695) += gpio-ks8695.o
- obj-$(CONFIG_GPIO_INTEL_MID) += gpio-intel-mid.o
- obj-$(CONFIG_GPIO_LOONGSON) += gpio-loongson.o
- obj-$(CONFIG_GPIO_LP3943) += gpio-lp3943.o
- obj-$(CONFIG_GPIO_LPC18XX) += gpio-lpc18xx.o
- obj-$(CONFIG_ARCH_LPC32XX) += gpio-lpc32xx.o
- obj-$(CONFIG_GPIO_LP873X) += gpio-lp873x.o
- obj-$(CONFIG_GPIO_LP87565) += gpio-lp87565.o
- obj-$(CONFIG_GPIO_LYNXPOINT) += gpio-lynxpoint.o
- obj-$(CONFIG_GPIO_MADERA) += gpio-madera.o
- obj-$(CONFIG_GPIO_MAX3191X) += gpio-max3191x.o
- obj-$(CONFIG_GPIO_MAX730X) += gpio-max730x.o
- obj-$(CONFIG_GPIO_MAX7300) += gpio-max7300.o
- obj-$(CONFIG_GPIO_MAX7301) += gpio-max7301.o
- obj-$(CONFIG_GPIO_MAX732X) += gpio-max732x.o
- obj-$(CONFIG_GPIO_MAX77620) += gpio-max77620.o
- obj-$(CONFIG_GPIO_MAX77650) += gpio-max77650.o
- obj-$(CONFIG_GPIO_MB86S7X) += gpio-mb86s7x.o
- obj-$(CONFIG_GPIO_MENZ127) += gpio-menz127.o
- obj-$(CONFIG_GPIO_MERRIFIELD) += gpio-merrifield.o
- obj-$(CONFIG_GPIO_MC33880) += gpio-mc33880.o
- obj-$(CONFIG_GPIO_MC9S08DZ60) += gpio-mc9s08dz60.o
- obj-$(CONFIG_GPIO_MLXBF) += gpio-mlxbf.o
- obj-$(CONFIG_GPIO_ML_IOH) += gpio-ml-ioh.o
- obj-$(CONFIG_GPIO_MM_LANTIQ) += gpio-mm-lantiq.o
- obj-$(CONFIG_GPIO_MOCKUP) += gpio-mockup.o
- obj-$(CONFIG_GPIO_MPC5200) += gpio-mpc5200.o
- obj-$(CONFIG_GPIO_MPC8XXX) += gpio-mpc8xxx.o
- obj-$(CONFIG_GPIO_MSIC) += gpio-msic.o
+ obj-$(CONFIG_GPIO_104_DIO_48E) += gpio-104-dio-48e.o
+ obj-$(CONFIG_GPIO_104_IDI_48) += gpio-104-idi-48.o
+ obj-$(CONFIG_GPIO_104_IDIO_16) += gpio-104-idio-16.o
+ obj-$(CONFIG_GPIO_74X164) += gpio-74x164.o
+ obj-$(CONFIG_GPIO_74XX_MMIO) += gpio-74xx-mmio.o
+ obj-$(CONFIG_GPIO_ADNP) += gpio-adnp.o
+ obj-$(CONFIG_GPIO_ADP5520) += gpio-adp5520.o
+ obj-$(CONFIG_GPIO_ADP5588) += gpio-adp5588.o
+ obj-$(CONFIG_GPIO_ALTERA_A10SR) += gpio-altera-a10sr.o
+ obj-$(CONFIG_GPIO_ALTERA) += gpio-altera.o
+ obj-$(CONFIG_GPIO_AMD8111) += gpio-amd8111.o
+ obj-$(CONFIG_GPIO_AMD_FCH) += gpio-amd-fch.o
+ obj-$(CONFIG_GPIO_AMDPT) += gpio-amdpt.o
+ obj-$(CONFIG_GPIO_ARIZONA) += gpio-arizona.o
+ obj-$(CONFIG_GPIO_ASPEED) += gpio-aspeed.o
+ obj-$(CONFIG_GPIO_ATH79) += gpio-ath79.o
+ obj-$(CONFIG_GPIO_BCM_KONA) += gpio-bcm-kona.o
++obj-$(CONFIG_GPIO_BD70528) += gpio-bd70528.o
+ obj-$(CONFIG_GPIO_BD9571MWV) += gpio-bd9571mwv.o
+ obj-$(CONFIG_GPIO_BRCMSTB) += gpio-brcmstb.o
+ obj-$(CONFIG_GPIO_BT8XX) += gpio-bt8xx.o
+ obj-$(CONFIG_GPIO_CADENCE) += gpio-cadence.o
+ obj-$(CONFIG_GPIO_CLPS711X) += gpio-clps711x.o
+ obj-$(CONFIG_GPIO_SNPS_CREG) += gpio-creg-snps.o
+ obj-$(CONFIG_GPIO_CRYSTAL_COVE) += gpio-crystalcove.o
+ obj-$(CONFIG_GPIO_CS5535) += gpio-cs5535.o
+ obj-$(CONFIG_GPIO_DA9052) += gpio-da9052.o
+ obj-$(CONFIG_GPIO_DA9055) += gpio-da9055.o
+ obj-$(CONFIG_GPIO_DAVINCI) += gpio-davinci.o
+ obj-$(CONFIG_GPIO_DLN2) += gpio-dln2.o
+ obj-$(CONFIG_GPIO_DWAPB) += gpio-dwapb.o
+ obj-$(CONFIG_GPIO_EIC_SPRD) += gpio-eic-sprd.o
+ obj-$(CONFIG_GPIO_EM) += gpio-em.o
+ obj-$(CONFIG_GPIO_EP93XX) += gpio-ep93xx.o
+ obj-$(CONFIG_GPIO_EXAR) += gpio-exar.o
+ obj-$(CONFIG_GPIO_F7188X) += gpio-f7188x.o
+ 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_GW_PLD) += gpio-gw-pld.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_INTEL_MID) += gpio-intel-mid.o
+ obj-$(CONFIG_GPIO_IOP) += gpio-iop.o
+ obj-$(CONFIG_GPIO_IT87) += gpio-it87.o
+ obj-$(CONFIG_GPIO_IXP4XX) += gpio-ixp4xx.o
+ obj-$(CONFIG_GPIO_JANZ_TTL) += gpio-janz-ttl.o
+ obj-$(CONFIG_GPIO_KEMPLD) += gpio-kempld.o
+ obj-$(CONFIG_ARCH_KS8695) += gpio-ks8695.o
+ obj-$(CONFIG_GPIO_LOONGSON1) += gpio-loongson1.o
+ obj-$(CONFIG_GPIO_LOONGSON) += gpio-loongson.o
+ obj-$(CONFIG_GPIO_LP3943) += gpio-lp3943.o
+ obj-$(CONFIG_GPIO_LP873X) += gpio-lp873x.o
+ obj-$(CONFIG_GPIO_LP87565) += gpio-lp87565.o
+ obj-$(CONFIG_GPIO_LPC18XX) += gpio-lpc18xx.o
+ obj-$(CONFIG_ARCH_LPC32XX) += gpio-lpc32xx.o
+ obj-$(CONFIG_GPIO_LYNXPOINT) += gpio-lynxpoint.o
+ obj-$(CONFIG_GPIO_MADERA) += gpio-madera.o
+ obj-$(CONFIG_GPIO_MAX3191X) += gpio-max3191x.o
+ obj-$(CONFIG_GPIO_MAX7300) += gpio-max7300.o
+ obj-$(CONFIG_GPIO_MAX7301) += gpio-max7301.o
+ obj-$(CONFIG_GPIO_MAX730X) += gpio-max730x.o
+ obj-$(CONFIG_GPIO_MAX732X) += gpio-max732x.o
+ obj-$(CONFIG_GPIO_MAX77620) += gpio-max77620.o
+ obj-$(CONFIG_GPIO_MAX77650) += gpio-max77650.o
+ obj-$(CONFIG_GPIO_MB86S7X) += gpio-mb86s7x.o
+ obj-$(CONFIG_GPIO_MC33880) += gpio-mc33880.o
+ obj-$(CONFIG_GPIO_MC9S08DZ60) += gpio-mc9s08dz60.o
+ obj-$(CONFIG_GPIO_MENZ127) += gpio-menz127.o
+ obj-$(CONFIG_GPIO_MERRIFIELD) += gpio-merrifield.o
+ obj-$(CONFIG_GPIO_ML_IOH) += gpio-ml-ioh.o
+ obj-$(CONFIG_GPIO_MLXBF) += gpio-mlxbf.o
+ obj-$(CONFIG_GPIO_MM_LANTIQ) += gpio-mm-lantiq.o
+ obj-$(CONFIG_GPIO_MOCKUP) += gpio-mockup.o
+ obj-$(CONFIG_GPIO_MPC5200) += gpio-mpc5200.o
+ obj-$(CONFIG_GPIO_MPC8XXX) += gpio-mpc8xxx.o
+ obj-$(CONFIG_GPIO_MSIC) += gpio-msic.o
obj-$(CONFIG_GPIO_MT7621) += gpio-mt7621.o
- obj-$(CONFIG_GPIO_MVEBU) += gpio-mvebu.o
- obj-$(CONFIG_GPIO_MXC) += gpio-mxc.o
- obj-$(CONFIG_GPIO_MXS) += gpio-mxs.o
- obj-$(CONFIG_GPIO_OCTEON) += gpio-octeon.o
- obj-$(CONFIG_GPIO_OMAP) += gpio-omap.o
- obj-$(CONFIG_GPIO_PCA953X) += gpio-pca953x.o
- obj-$(CONFIG_GPIO_PCF857X) += gpio-pcf857x.o
- obj-$(CONFIG_GPIO_PCH) += gpio-pch.o
- obj-$(CONFIG_GPIO_PCI_IDIO_16) += gpio-pci-idio-16.o
- obj-$(CONFIG_GPIO_PCIE_IDIO_24) += gpio-pcie-idio-24.o
- obj-$(CONFIG_GPIO_PISOSR) += gpio-pisosr.o
- obj-$(CONFIG_GPIO_PL061) += gpio-pl061.o
+ obj-$(CONFIG_GPIO_MVEBU) += gpio-mvebu.o
+ obj-$(CONFIG_GPIO_MXC) += gpio-mxc.o
+ obj-$(CONFIG_GPIO_MXS) += gpio-mxs.o
+ obj-$(CONFIG_GPIO_OCTEON) += gpio-octeon.o
+ obj-$(CONFIG_GPIO_OMAP) += gpio-omap.o
+ obj-$(CONFIG_GPIO_PALMAS) += gpio-palmas.o
+ obj-$(CONFIG_GPIO_PCA953X) += gpio-pca953x.o
+ obj-$(CONFIG_GPIO_PCF857X) += gpio-pcf857x.o
+ obj-$(CONFIG_GPIO_PCH) += gpio-pch.o
+ obj-$(CONFIG_GPIO_PCIE_IDIO_24) += gpio-pcie-idio-24.o
+ obj-$(CONFIG_GPIO_PCI_IDIO_16) += gpio-pci-idio-16.o
+ obj-$(CONFIG_GPIO_PISOSR) += gpio-pisosr.o
+ obj-$(CONFIG_GPIO_PL061) += gpio-pl061.o
obj-$(CONFIG_GPIO_PMIC_EIC_SPRD) += gpio-pmic-eic-sprd.o
- obj-$(CONFIG_GPIO_PXA) += gpio-pxa.o
- obj-$(CONFIG_GPIO_RC5T583) += gpio-rc5t583.o
- obj-$(CONFIG_GPIO_RDC321X) += gpio-rdc321x.o
- obj-$(CONFIG_GPIO_RCAR) += gpio-rcar.o
- obj-$(CONFIG_GPIO_REG) += gpio-reg.o
- obj-$(CONFIG_ARCH_SA1100) += gpio-sa1100.o
+ obj-$(CONFIG_GPIO_PXA) += gpio-pxa.o
+ obj-$(CONFIG_GPIO_RASPBERRYPI_EXP) += gpio-raspberrypi-exp.o
+ obj-$(CONFIG_GPIO_RC5T583) += gpio-rc5t583.o
+ obj-$(CONFIG_GPIO_RCAR) += gpio-rcar.o
+ obj-$(CONFIG_GPIO_RDC321X) += gpio-rdc321x.o
+ obj-$(CONFIG_GPIO_REG) += gpio-reg.o
+ obj-$(CONFIG_ARCH_SA1100) += gpio-sa1100.o
obj-$(CONFIG_GPIO_SAMA5D2_PIOBU) += gpio-sama5d2-piobu.o
- obj-$(CONFIG_GPIO_SCH) += gpio-sch.o
- obj-$(CONFIG_GPIO_SCH311X) += gpio-sch311x.o
- obj-$(CONFIG_GPIO_SNPS_CREG) += gpio-creg-snps.o
- obj-$(CONFIG_GPIO_SODAVILLE) += gpio-sodaville.o
- obj-$(CONFIG_GPIO_SPEAR_SPICS) += gpio-spear-spics.o
- obj-$(CONFIG_GPIO_SPRD) += gpio-sprd.o
- obj-$(CONFIG_GPIO_STA2X11) += gpio-sta2x11.o
- obj-$(CONFIG_GPIO_STMPE) += gpio-stmpe.o
- obj-$(CONFIG_GPIO_STP_XWAY) += gpio-stp-xway.o
- obj-$(CONFIG_GPIO_SYSCON) += gpio-syscon.o
- obj-$(CONFIG_GPIO_TB10X) += gpio-tb10x.o
- obj-$(CONFIG_GPIO_TC3589X) += gpio-tc3589x.o
- obj-$(CONFIG_GPIO_TEGRA) += gpio-tegra.o
- obj-$(CONFIG_GPIO_TEGRA186) += gpio-tegra186.o
- obj-$(CONFIG_GPIO_THUNDERX) += gpio-thunderx.o
- obj-$(CONFIG_GPIO_TIMBERDALE) += gpio-timberdale.o
- obj-$(CONFIG_GPIO_PALMAS) += gpio-palmas.o
- obj-$(CONFIG_GPIO_SIOX) += gpio-siox.o
- obj-$(CONFIG_GPIO_TPIC2810) += gpio-tpic2810.o
- obj-$(CONFIG_GPIO_TPS65086) += gpio-tps65086.o
- obj-$(CONFIG_GPIO_TPS65218) += gpio-tps65218.o
- obj-$(CONFIG_GPIO_TPS6586X) += gpio-tps6586x.o
- obj-$(CONFIG_GPIO_TPS65910) += gpio-tps65910.o
- obj-$(CONFIG_GPIO_TPS65912) += gpio-tps65912.o
- obj-$(CONFIG_GPIO_TPS68470) += gpio-tps68470.o
- obj-$(CONFIG_GPIO_TQMX86) += gpio-tqmx86.o
- obj-$(CONFIG_GPIO_TS4800) += gpio-ts4800.o
- obj-$(CONFIG_GPIO_TS4900) += gpio-ts4900.o
- obj-$(CONFIG_GPIO_TS5500) += gpio-ts5500.o
- obj-$(CONFIG_GPIO_TWL4030) += gpio-twl4030.o
- obj-$(CONFIG_GPIO_TWL6040) += gpio-twl6040.o
- obj-$(CONFIG_GPIO_UCB1400) += gpio-ucb1400.o
- obj-$(CONFIG_GPIO_UNIPHIER) += gpio-uniphier.o
- obj-$(CONFIG_GPIO_VF610) += gpio-vf610.o
- obj-$(CONFIG_GPIO_VIPERBOARD) += gpio-viperboard.o
- obj-$(CONFIG_GPIO_VR41XX) += gpio-vr41xx.o
- obj-$(CONFIG_GPIO_VX855) += gpio-vx855.o
- obj-$(CONFIG_GPIO_WHISKEY_COVE) += gpio-wcove.o
- obj-$(CONFIG_GPIO_WINBOND) += gpio-winbond.o
- obj-$(CONFIG_GPIO_WM831X) += gpio-wm831x.o
- obj-$(CONFIG_GPIO_WM8350) += gpio-wm8350.o
- obj-$(CONFIG_GPIO_WM8994) += gpio-wm8994.o
- obj-$(CONFIG_GPIO_WS16C48) += gpio-ws16c48.o
- obj-$(CONFIG_GPIO_XGENE) += gpio-xgene.o
- obj-$(CONFIG_GPIO_XGENE_SB) += gpio-xgene-sb.o
- obj-$(CONFIG_GPIO_XILINX) += gpio-xilinx.o
- obj-$(CONFIG_GPIO_XLP) += gpio-xlp.o
- obj-$(CONFIG_GPIO_XRA1403) += gpio-xra1403.o
- obj-$(CONFIG_GPIO_XTENSA) += gpio-xtensa.o
- obj-$(CONFIG_GPIO_ZEVIO) += gpio-zevio.o
- obj-$(CONFIG_GPIO_ZYNQ) += gpio-zynq.o
- obj-$(CONFIG_GPIO_ZX) += gpio-zx.o
- obj-$(CONFIG_GPIO_LOONGSON1) += gpio-loongson1.o
+ obj-$(CONFIG_GPIO_SCH311X) += gpio-sch311x.o
+ obj-$(CONFIG_GPIO_SCH) += gpio-sch.o
+ obj-$(CONFIG_GPIO_SIOX) += gpio-siox.o
+ obj-$(CONFIG_GPIO_SODAVILLE) += gpio-sodaville.o
+ obj-$(CONFIG_GPIO_SPEAR_SPICS) += gpio-spear-spics.o
+ obj-$(CONFIG_GPIO_SPRD) += gpio-sprd.o
+ obj-$(CONFIG_GPIO_STA2X11) += gpio-sta2x11.o
+ obj-$(CONFIG_GPIO_STMPE) += gpio-stmpe.o
+ obj-$(CONFIG_GPIO_STP_XWAY) += gpio-stp-xway.o
+ obj-$(CONFIG_GPIO_SYSCON) += gpio-syscon.o
+ obj-$(CONFIG_GPIO_TB10X) += gpio-tb10x.o
+ obj-$(CONFIG_GPIO_TC3589X) += gpio-tc3589x.o
+ obj-$(CONFIG_GPIO_TEGRA186) += gpio-tegra186.o
+ obj-$(CONFIG_GPIO_TEGRA) += gpio-tegra.o
+ obj-$(CONFIG_GPIO_THUNDERX) += gpio-thunderx.o
+ obj-$(CONFIG_GPIO_TIMBERDALE) += gpio-timberdale.o
+ obj-$(CONFIG_GPIO_TPIC2810) += gpio-tpic2810.o
+ obj-$(CONFIG_GPIO_TPS65086) += gpio-tps65086.o
+ obj-$(CONFIG_GPIO_TPS65218) += gpio-tps65218.o
+ obj-$(CONFIG_GPIO_TPS6586X) += gpio-tps6586x.o
+ obj-$(CONFIG_GPIO_TPS65910) += gpio-tps65910.o
+ obj-$(CONFIG_GPIO_TPS65912) += gpio-tps65912.o
+ obj-$(CONFIG_GPIO_TPS68470) += gpio-tps68470.o
+ obj-$(CONFIG_GPIO_TQMX86) += gpio-tqmx86.o
+ obj-$(CONFIG_GPIO_TS4800) += gpio-ts4800.o
+ obj-$(CONFIG_GPIO_TS4900) += gpio-ts4900.o
+ obj-$(CONFIG_GPIO_TS5500) += gpio-ts5500.o
+ obj-$(CONFIG_GPIO_TWL4030) += gpio-twl4030.o
+ obj-$(CONFIG_GPIO_TWL6040) += gpio-twl6040.o
+ obj-$(CONFIG_GPIO_UCB1400) += gpio-ucb1400.o
+ obj-$(CONFIG_GPIO_UNIPHIER) += gpio-uniphier.o
+ obj-$(CONFIG_GPIO_VF610) += gpio-vf610.o
+ obj-$(CONFIG_GPIO_VIPERBOARD) += gpio-viperboard.o
+ obj-$(CONFIG_GPIO_VR41XX) += gpio-vr41xx.o
+ obj-$(CONFIG_GPIO_VX855) += gpio-vx855.o
+ obj-$(CONFIG_GPIO_WHISKEY_COVE) += gpio-wcove.o
+ obj-$(CONFIG_GPIO_WINBOND) += gpio-winbond.o
+ obj-$(CONFIG_GPIO_WM831X) += gpio-wm831x.o
+ obj-$(CONFIG_GPIO_WM8350) += gpio-wm8350.o
+ obj-$(CONFIG_GPIO_WM8994) += gpio-wm8994.o
+ obj-$(CONFIG_GPIO_WS16C48) += gpio-ws16c48.o
+ obj-$(CONFIG_GPIO_XGENE) += gpio-xgene.o
+ obj-$(CONFIG_GPIO_XGENE_SB) += gpio-xgene-sb.o
+ obj-$(CONFIG_GPIO_XILINX) += gpio-xilinx.o
+ obj-$(CONFIG_GPIO_XLP) += gpio-xlp.o
+ obj-$(CONFIG_GPIO_XRA1403) += gpio-xra1403.o
+ obj-$(CONFIG_GPIO_XTENSA) += gpio-xtensa.o
+ obj-$(CONFIG_GPIO_ZEVIO) += gpio-zevio.o
+ obj-$(CONFIG_GPIO_ZX) += gpio-zx.o
+ obj-$(CONFIG_GPIO_ZYNQ) += gpio-zynq.o
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: linux-next: manual merge of the gpio tree with the mfd tree
2019-06-28 7:28 Stephen Rothwell
@ 2019-07-09 0:15 ` Stephen Rothwell
2019-07-09 13:20 ` Linus Walleij
0 siblings, 1 reply; 8+ messages in thread
From: Stephen Rothwell @ 2019-07-09 0:15 UTC (permalink / raw)
To: Linus Walleij, Lee Jones
Cc: Linux Next Mailing List, Linux Kernel Mailing List,
Matti Vaittinen, Geert Uytterhoeven
[-- Attachment #1: Type: text/plain, Size: 16428 bytes --]
Hi all,
On Fri, 28 Jun 2019 17:28:07 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the gpio tree got a conflict in:
>
> drivers/gpio/Makefile
>
> between commit:
>
> 18bc64b3aebf ("gpio: Initial support for ROHM bd70528 GPIO block")
>
> from the mfd tree and commit:
>
> db16bad6efd9 ("gpio: Sort GPIO drivers in Makefile")
>
> from the gpio tree.
>
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging. You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.
>
> --
> Cheers,
> Stephen Rothwell
>
> diff --cc drivers/gpio/Makefile
> index 10efc4f743fe,9e400e34e300..000000000000
> --- a/drivers/gpio/Makefile
> +++ b/drivers/gpio/Makefile
> @@@ -17,155 -17,154 +17,155 @@@ obj-$(CONFIG_GPIO_GENERIC) += gpio-gene
> # directly supported by gpio-generic
> gpio-generic-$(CONFIG_GPIO_GENERIC) += gpio-mmio.o
>
> - obj-$(CONFIG_GPIO_104_DIO_48E) += gpio-104-dio-48e.o
> - obj-$(CONFIG_GPIO_104_IDIO_16) += gpio-104-idio-16.o
> - obj-$(CONFIG_GPIO_104_IDI_48) += gpio-104-idi-48.o
> - obj-$(CONFIG_GPIO_74X164) += gpio-74x164.o
> - obj-$(CONFIG_GPIO_74XX_MMIO) += gpio-74xx-mmio.o
> - obj-$(CONFIG_GPIO_ADNP) += gpio-adnp.o
> - obj-$(CONFIG_GPIO_ADP5520) += gpio-adp5520.o
> - obj-$(CONFIG_GPIO_ADP5588) += gpio-adp5588.o
> - obj-$(CONFIG_GPIO_ALTERA) += gpio-altera.o
> - obj-$(CONFIG_GPIO_ALTERA_A10SR) += gpio-altera-a10sr.o
> - obj-$(CONFIG_GPIO_AMD_FCH) += gpio-amd-fch.o
> - obj-$(CONFIG_GPIO_AMD8111) += gpio-amd8111.o
> - obj-$(CONFIG_GPIO_AMDPT) += gpio-amdpt.o
> - obj-$(CONFIG_GPIO_ARIZONA) += gpio-arizona.o
> - obj-$(CONFIG_GPIO_ATH79) += gpio-ath79.o
> - obj-$(CONFIG_GPIO_ASPEED) += gpio-aspeed.o
> - obj-$(CONFIG_GPIO_RASPBERRYPI_EXP) += gpio-raspberrypi-exp.o
> - obj-$(CONFIG_GPIO_BCM_KONA) += gpio-bcm-kona.o
> - obj-$(CONFIG_GPIO_BD70528) += gpio-bd70528.o
> - obj-$(CONFIG_GPIO_BD9571MWV) += gpio-bd9571mwv.o
> - obj-$(CONFIG_GPIO_BRCMSTB) += gpio-brcmstb.o
> - obj-$(CONFIG_GPIO_BT8XX) += gpio-bt8xx.o
> - obj-$(CONFIG_GPIO_CADENCE) += gpio-cadence.o
> - obj-$(CONFIG_GPIO_CLPS711X) += gpio-clps711x.o
> - obj-$(CONFIG_GPIO_CS5535) += gpio-cs5535.o
> - obj-$(CONFIG_GPIO_CRYSTAL_COVE) += gpio-crystalcove.o
> - obj-$(CONFIG_GPIO_DA9052) += gpio-da9052.o
> - obj-$(CONFIG_GPIO_DA9055) += gpio-da9055.o
> - obj-$(CONFIG_GPIO_DAVINCI) += gpio-davinci.o
> - obj-$(CONFIG_GPIO_DLN2) += gpio-dln2.o
> - obj-$(CONFIG_GPIO_DWAPB) += gpio-dwapb.o
> - obj-$(CONFIG_GPIO_EIC_SPRD) += gpio-eic-sprd.o
> - obj-$(CONFIG_GPIO_EM) += gpio-em.o
> - obj-$(CONFIG_GPIO_EP93XX) += gpio-ep93xx.o
> - obj-$(CONFIG_GPIO_EXAR) += gpio-exar.o
> - obj-$(CONFIG_GPIO_F7188X) += gpio-f7188x.o
> - 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_GW_PLD) += gpio-gw-pld.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_IOP) += gpio-iop.o
> - obj-$(CONFIG_GPIO_IXP4XX) += gpio-ixp4xx.o
> - obj-$(CONFIG_GPIO_IT87) += gpio-it87.o
> - obj-$(CONFIG_GPIO_JANZ_TTL) += gpio-janz-ttl.o
> - obj-$(CONFIG_GPIO_KEMPLD) += gpio-kempld.o
> - obj-$(CONFIG_ARCH_KS8695) += gpio-ks8695.o
> - obj-$(CONFIG_GPIO_INTEL_MID) += gpio-intel-mid.o
> - obj-$(CONFIG_GPIO_LOONGSON) += gpio-loongson.o
> - obj-$(CONFIG_GPIO_LP3943) += gpio-lp3943.o
> - obj-$(CONFIG_GPIO_LPC18XX) += gpio-lpc18xx.o
> - obj-$(CONFIG_ARCH_LPC32XX) += gpio-lpc32xx.o
> - obj-$(CONFIG_GPIO_LP873X) += gpio-lp873x.o
> - obj-$(CONFIG_GPIO_LP87565) += gpio-lp87565.o
> - obj-$(CONFIG_GPIO_LYNXPOINT) += gpio-lynxpoint.o
> - obj-$(CONFIG_GPIO_MADERA) += gpio-madera.o
> - obj-$(CONFIG_GPIO_MAX3191X) += gpio-max3191x.o
> - obj-$(CONFIG_GPIO_MAX730X) += gpio-max730x.o
> - obj-$(CONFIG_GPIO_MAX7300) += gpio-max7300.o
> - obj-$(CONFIG_GPIO_MAX7301) += gpio-max7301.o
> - obj-$(CONFIG_GPIO_MAX732X) += gpio-max732x.o
> - obj-$(CONFIG_GPIO_MAX77620) += gpio-max77620.o
> - obj-$(CONFIG_GPIO_MAX77650) += gpio-max77650.o
> - obj-$(CONFIG_GPIO_MB86S7X) += gpio-mb86s7x.o
> - obj-$(CONFIG_GPIO_MENZ127) += gpio-menz127.o
> - obj-$(CONFIG_GPIO_MERRIFIELD) += gpio-merrifield.o
> - obj-$(CONFIG_GPIO_MC33880) += gpio-mc33880.o
> - obj-$(CONFIG_GPIO_MC9S08DZ60) += gpio-mc9s08dz60.o
> - obj-$(CONFIG_GPIO_MLXBF) += gpio-mlxbf.o
> - obj-$(CONFIG_GPIO_ML_IOH) += gpio-ml-ioh.o
> - obj-$(CONFIG_GPIO_MM_LANTIQ) += gpio-mm-lantiq.o
> - obj-$(CONFIG_GPIO_MOCKUP) += gpio-mockup.o
> - obj-$(CONFIG_GPIO_MPC5200) += gpio-mpc5200.o
> - obj-$(CONFIG_GPIO_MPC8XXX) += gpio-mpc8xxx.o
> - obj-$(CONFIG_GPIO_MSIC) += gpio-msic.o
> + obj-$(CONFIG_GPIO_104_DIO_48E) += gpio-104-dio-48e.o
> + obj-$(CONFIG_GPIO_104_IDI_48) += gpio-104-idi-48.o
> + obj-$(CONFIG_GPIO_104_IDIO_16) += gpio-104-idio-16.o
> + obj-$(CONFIG_GPIO_74X164) += gpio-74x164.o
> + obj-$(CONFIG_GPIO_74XX_MMIO) += gpio-74xx-mmio.o
> + obj-$(CONFIG_GPIO_ADNP) += gpio-adnp.o
> + obj-$(CONFIG_GPIO_ADP5520) += gpio-adp5520.o
> + obj-$(CONFIG_GPIO_ADP5588) += gpio-adp5588.o
> + obj-$(CONFIG_GPIO_ALTERA_A10SR) += gpio-altera-a10sr.o
> + obj-$(CONFIG_GPIO_ALTERA) += gpio-altera.o
> + obj-$(CONFIG_GPIO_AMD8111) += gpio-amd8111.o
> + obj-$(CONFIG_GPIO_AMD_FCH) += gpio-amd-fch.o
> + obj-$(CONFIG_GPIO_AMDPT) += gpio-amdpt.o
> + obj-$(CONFIG_GPIO_ARIZONA) += gpio-arizona.o
> + obj-$(CONFIG_GPIO_ASPEED) += gpio-aspeed.o
> + obj-$(CONFIG_GPIO_ATH79) += gpio-ath79.o
> + obj-$(CONFIG_GPIO_BCM_KONA) += gpio-bcm-kona.o
> ++obj-$(CONFIG_GPIO_BD70528) += gpio-bd70528.o
> + obj-$(CONFIG_GPIO_BD9571MWV) += gpio-bd9571mwv.o
> + obj-$(CONFIG_GPIO_BRCMSTB) += gpio-brcmstb.o
> + obj-$(CONFIG_GPIO_BT8XX) += gpio-bt8xx.o
> + obj-$(CONFIG_GPIO_CADENCE) += gpio-cadence.o
> + obj-$(CONFIG_GPIO_CLPS711X) += gpio-clps711x.o
> + obj-$(CONFIG_GPIO_SNPS_CREG) += gpio-creg-snps.o
> + obj-$(CONFIG_GPIO_CRYSTAL_COVE) += gpio-crystalcove.o
> + obj-$(CONFIG_GPIO_CS5535) += gpio-cs5535.o
> + obj-$(CONFIG_GPIO_DA9052) += gpio-da9052.o
> + obj-$(CONFIG_GPIO_DA9055) += gpio-da9055.o
> + obj-$(CONFIG_GPIO_DAVINCI) += gpio-davinci.o
> + obj-$(CONFIG_GPIO_DLN2) += gpio-dln2.o
> + obj-$(CONFIG_GPIO_DWAPB) += gpio-dwapb.o
> + obj-$(CONFIG_GPIO_EIC_SPRD) += gpio-eic-sprd.o
> + obj-$(CONFIG_GPIO_EM) += gpio-em.o
> + obj-$(CONFIG_GPIO_EP93XX) += gpio-ep93xx.o
> + obj-$(CONFIG_GPIO_EXAR) += gpio-exar.o
> + obj-$(CONFIG_GPIO_F7188X) += gpio-f7188x.o
> + 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_GW_PLD) += gpio-gw-pld.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_INTEL_MID) += gpio-intel-mid.o
> + obj-$(CONFIG_GPIO_IOP) += gpio-iop.o
> + obj-$(CONFIG_GPIO_IT87) += gpio-it87.o
> + obj-$(CONFIG_GPIO_IXP4XX) += gpio-ixp4xx.o
> + obj-$(CONFIG_GPIO_JANZ_TTL) += gpio-janz-ttl.o
> + obj-$(CONFIG_GPIO_KEMPLD) += gpio-kempld.o
> + obj-$(CONFIG_ARCH_KS8695) += gpio-ks8695.o
> + obj-$(CONFIG_GPIO_LOONGSON1) += gpio-loongson1.o
> + obj-$(CONFIG_GPIO_LOONGSON) += gpio-loongson.o
> + obj-$(CONFIG_GPIO_LP3943) += gpio-lp3943.o
> + obj-$(CONFIG_GPIO_LP873X) += gpio-lp873x.o
> + obj-$(CONFIG_GPIO_LP87565) += gpio-lp87565.o
> + obj-$(CONFIG_GPIO_LPC18XX) += gpio-lpc18xx.o
> + obj-$(CONFIG_ARCH_LPC32XX) += gpio-lpc32xx.o
> + obj-$(CONFIG_GPIO_LYNXPOINT) += gpio-lynxpoint.o
> + obj-$(CONFIG_GPIO_MADERA) += gpio-madera.o
> + obj-$(CONFIG_GPIO_MAX3191X) += gpio-max3191x.o
> + obj-$(CONFIG_GPIO_MAX7300) += gpio-max7300.o
> + obj-$(CONFIG_GPIO_MAX7301) += gpio-max7301.o
> + obj-$(CONFIG_GPIO_MAX730X) += gpio-max730x.o
> + obj-$(CONFIG_GPIO_MAX732X) += gpio-max732x.o
> + obj-$(CONFIG_GPIO_MAX77620) += gpio-max77620.o
> + obj-$(CONFIG_GPIO_MAX77650) += gpio-max77650.o
> + obj-$(CONFIG_GPIO_MB86S7X) += gpio-mb86s7x.o
> + obj-$(CONFIG_GPIO_MC33880) += gpio-mc33880.o
> + obj-$(CONFIG_GPIO_MC9S08DZ60) += gpio-mc9s08dz60.o
> + obj-$(CONFIG_GPIO_MENZ127) += gpio-menz127.o
> + obj-$(CONFIG_GPIO_MERRIFIELD) += gpio-merrifield.o
> + obj-$(CONFIG_GPIO_ML_IOH) += gpio-ml-ioh.o
> + obj-$(CONFIG_GPIO_MLXBF) += gpio-mlxbf.o
> + obj-$(CONFIG_GPIO_MM_LANTIQ) += gpio-mm-lantiq.o
> + obj-$(CONFIG_GPIO_MOCKUP) += gpio-mockup.o
> + obj-$(CONFIG_GPIO_MPC5200) += gpio-mpc5200.o
> + obj-$(CONFIG_GPIO_MPC8XXX) += gpio-mpc8xxx.o
> + obj-$(CONFIG_GPIO_MSIC) += gpio-msic.o
> obj-$(CONFIG_GPIO_MT7621) += gpio-mt7621.o
> - obj-$(CONFIG_GPIO_MVEBU) += gpio-mvebu.o
> - obj-$(CONFIG_GPIO_MXC) += gpio-mxc.o
> - obj-$(CONFIG_GPIO_MXS) += gpio-mxs.o
> - obj-$(CONFIG_GPIO_OCTEON) += gpio-octeon.o
> - obj-$(CONFIG_GPIO_OMAP) += gpio-omap.o
> - obj-$(CONFIG_GPIO_PCA953X) += gpio-pca953x.o
> - obj-$(CONFIG_GPIO_PCF857X) += gpio-pcf857x.o
> - obj-$(CONFIG_GPIO_PCH) += gpio-pch.o
> - obj-$(CONFIG_GPIO_PCI_IDIO_16) += gpio-pci-idio-16.o
> - obj-$(CONFIG_GPIO_PCIE_IDIO_24) += gpio-pcie-idio-24.o
> - obj-$(CONFIG_GPIO_PISOSR) += gpio-pisosr.o
> - obj-$(CONFIG_GPIO_PL061) += gpio-pl061.o
> + obj-$(CONFIG_GPIO_MVEBU) += gpio-mvebu.o
> + obj-$(CONFIG_GPIO_MXC) += gpio-mxc.o
> + obj-$(CONFIG_GPIO_MXS) += gpio-mxs.o
> + obj-$(CONFIG_GPIO_OCTEON) += gpio-octeon.o
> + obj-$(CONFIG_GPIO_OMAP) += gpio-omap.o
> + obj-$(CONFIG_GPIO_PALMAS) += gpio-palmas.o
> + obj-$(CONFIG_GPIO_PCA953X) += gpio-pca953x.o
> + obj-$(CONFIG_GPIO_PCF857X) += gpio-pcf857x.o
> + obj-$(CONFIG_GPIO_PCH) += gpio-pch.o
> + obj-$(CONFIG_GPIO_PCIE_IDIO_24) += gpio-pcie-idio-24.o
> + obj-$(CONFIG_GPIO_PCI_IDIO_16) += gpio-pci-idio-16.o
> + obj-$(CONFIG_GPIO_PISOSR) += gpio-pisosr.o
> + obj-$(CONFIG_GPIO_PL061) += gpio-pl061.o
> obj-$(CONFIG_GPIO_PMIC_EIC_SPRD) += gpio-pmic-eic-sprd.o
> - obj-$(CONFIG_GPIO_PXA) += gpio-pxa.o
> - obj-$(CONFIG_GPIO_RC5T583) += gpio-rc5t583.o
> - obj-$(CONFIG_GPIO_RDC321X) += gpio-rdc321x.o
> - obj-$(CONFIG_GPIO_RCAR) += gpio-rcar.o
> - obj-$(CONFIG_GPIO_REG) += gpio-reg.o
> - obj-$(CONFIG_ARCH_SA1100) += gpio-sa1100.o
> + obj-$(CONFIG_GPIO_PXA) += gpio-pxa.o
> + obj-$(CONFIG_GPIO_RASPBERRYPI_EXP) += gpio-raspberrypi-exp.o
> + obj-$(CONFIG_GPIO_RC5T583) += gpio-rc5t583.o
> + obj-$(CONFIG_GPIO_RCAR) += gpio-rcar.o
> + obj-$(CONFIG_GPIO_RDC321X) += gpio-rdc321x.o
> + obj-$(CONFIG_GPIO_REG) += gpio-reg.o
> + obj-$(CONFIG_ARCH_SA1100) += gpio-sa1100.o
> obj-$(CONFIG_GPIO_SAMA5D2_PIOBU) += gpio-sama5d2-piobu.o
> - obj-$(CONFIG_GPIO_SCH) += gpio-sch.o
> - obj-$(CONFIG_GPIO_SCH311X) += gpio-sch311x.o
> - obj-$(CONFIG_GPIO_SNPS_CREG) += gpio-creg-snps.o
> - obj-$(CONFIG_GPIO_SODAVILLE) += gpio-sodaville.o
> - obj-$(CONFIG_GPIO_SPEAR_SPICS) += gpio-spear-spics.o
> - obj-$(CONFIG_GPIO_SPRD) += gpio-sprd.o
> - obj-$(CONFIG_GPIO_STA2X11) += gpio-sta2x11.o
> - obj-$(CONFIG_GPIO_STMPE) += gpio-stmpe.o
> - obj-$(CONFIG_GPIO_STP_XWAY) += gpio-stp-xway.o
> - obj-$(CONFIG_GPIO_SYSCON) += gpio-syscon.o
> - obj-$(CONFIG_GPIO_TB10X) += gpio-tb10x.o
> - obj-$(CONFIG_GPIO_TC3589X) += gpio-tc3589x.o
> - obj-$(CONFIG_GPIO_TEGRA) += gpio-tegra.o
> - obj-$(CONFIG_GPIO_TEGRA186) += gpio-tegra186.o
> - obj-$(CONFIG_GPIO_THUNDERX) += gpio-thunderx.o
> - obj-$(CONFIG_GPIO_TIMBERDALE) += gpio-timberdale.o
> - obj-$(CONFIG_GPIO_PALMAS) += gpio-palmas.o
> - obj-$(CONFIG_GPIO_SIOX) += gpio-siox.o
> - obj-$(CONFIG_GPIO_TPIC2810) += gpio-tpic2810.o
> - obj-$(CONFIG_GPIO_TPS65086) += gpio-tps65086.o
> - obj-$(CONFIG_GPIO_TPS65218) += gpio-tps65218.o
> - obj-$(CONFIG_GPIO_TPS6586X) += gpio-tps6586x.o
> - obj-$(CONFIG_GPIO_TPS65910) += gpio-tps65910.o
> - obj-$(CONFIG_GPIO_TPS65912) += gpio-tps65912.o
> - obj-$(CONFIG_GPIO_TPS68470) += gpio-tps68470.o
> - obj-$(CONFIG_GPIO_TQMX86) += gpio-tqmx86.o
> - obj-$(CONFIG_GPIO_TS4800) += gpio-ts4800.o
> - obj-$(CONFIG_GPIO_TS4900) += gpio-ts4900.o
> - obj-$(CONFIG_GPIO_TS5500) += gpio-ts5500.o
> - obj-$(CONFIG_GPIO_TWL4030) += gpio-twl4030.o
> - obj-$(CONFIG_GPIO_TWL6040) += gpio-twl6040.o
> - obj-$(CONFIG_GPIO_UCB1400) += gpio-ucb1400.o
> - obj-$(CONFIG_GPIO_UNIPHIER) += gpio-uniphier.o
> - obj-$(CONFIG_GPIO_VF610) += gpio-vf610.o
> - obj-$(CONFIG_GPIO_VIPERBOARD) += gpio-viperboard.o
> - obj-$(CONFIG_GPIO_VR41XX) += gpio-vr41xx.o
> - obj-$(CONFIG_GPIO_VX855) += gpio-vx855.o
> - obj-$(CONFIG_GPIO_WHISKEY_COVE) += gpio-wcove.o
> - obj-$(CONFIG_GPIO_WINBOND) += gpio-winbond.o
> - obj-$(CONFIG_GPIO_WM831X) += gpio-wm831x.o
> - obj-$(CONFIG_GPIO_WM8350) += gpio-wm8350.o
> - obj-$(CONFIG_GPIO_WM8994) += gpio-wm8994.o
> - obj-$(CONFIG_GPIO_WS16C48) += gpio-ws16c48.o
> - obj-$(CONFIG_GPIO_XGENE) += gpio-xgene.o
> - obj-$(CONFIG_GPIO_XGENE_SB) += gpio-xgene-sb.o
> - obj-$(CONFIG_GPIO_XILINX) += gpio-xilinx.o
> - obj-$(CONFIG_GPIO_XLP) += gpio-xlp.o
> - obj-$(CONFIG_GPIO_XRA1403) += gpio-xra1403.o
> - obj-$(CONFIG_GPIO_XTENSA) += gpio-xtensa.o
> - obj-$(CONFIG_GPIO_ZEVIO) += gpio-zevio.o
> - obj-$(CONFIG_GPIO_ZYNQ) += gpio-zynq.o
> - obj-$(CONFIG_GPIO_ZX) += gpio-zx.o
> - obj-$(CONFIG_GPIO_LOONGSON1) += gpio-loongson1.o
> + obj-$(CONFIG_GPIO_SCH311X) += gpio-sch311x.o
> + obj-$(CONFIG_GPIO_SCH) += gpio-sch.o
> + obj-$(CONFIG_GPIO_SIOX) += gpio-siox.o
> + obj-$(CONFIG_GPIO_SODAVILLE) += gpio-sodaville.o
> + obj-$(CONFIG_GPIO_SPEAR_SPICS) += gpio-spear-spics.o
> + obj-$(CONFIG_GPIO_SPRD) += gpio-sprd.o
> + obj-$(CONFIG_GPIO_STA2X11) += gpio-sta2x11.o
> + obj-$(CONFIG_GPIO_STMPE) += gpio-stmpe.o
> + obj-$(CONFIG_GPIO_STP_XWAY) += gpio-stp-xway.o
> + obj-$(CONFIG_GPIO_SYSCON) += gpio-syscon.o
> + obj-$(CONFIG_GPIO_TB10X) += gpio-tb10x.o
> + obj-$(CONFIG_GPIO_TC3589X) += gpio-tc3589x.o
> + obj-$(CONFIG_GPIO_TEGRA186) += gpio-tegra186.o
> + obj-$(CONFIG_GPIO_TEGRA) += gpio-tegra.o
> + obj-$(CONFIG_GPIO_THUNDERX) += gpio-thunderx.o
> + obj-$(CONFIG_GPIO_TIMBERDALE) += gpio-timberdale.o
> + obj-$(CONFIG_GPIO_TPIC2810) += gpio-tpic2810.o
> + obj-$(CONFIG_GPIO_TPS65086) += gpio-tps65086.o
> + obj-$(CONFIG_GPIO_TPS65218) += gpio-tps65218.o
> + obj-$(CONFIG_GPIO_TPS6586X) += gpio-tps6586x.o
> + obj-$(CONFIG_GPIO_TPS65910) += gpio-tps65910.o
> + obj-$(CONFIG_GPIO_TPS65912) += gpio-tps65912.o
> + obj-$(CONFIG_GPIO_TPS68470) += gpio-tps68470.o
> + obj-$(CONFIG_GPIO_TQMX86) += gpio-tqmx86.o
> + obj-$(CONFIG_GPIO_TS4800) += gpio-ts4800.o
> + obj-$(CONFIG_GPIO_TS4900) += gpio-ts4900.o
> + obj-$(CONFIG_GPIO_TS5500) += gpio-ts5500.o
> + obj-$(CONFIG_GPIO_TWL4030) += gpio-twl4030.o
> + obj-$(CONFIG_GPIO_TWL6040) += gpio-twl6040.o
> + obj-$(CONFIG_GPIO_UCB1400) += gpio-ucb1400.o
> + obj-$(CONFIG_GPIO_UNIPHIER) += gpio-uniphier.o
> + obj-$(CONFIG_GPIO_VF610) += gpio-vf610.o
> + obj-$(CONFIG_GPIO_VIPERBOARD) += gpio-viperboard.o
> + obj-$(CONFIG_GPIO_VR41XX) += gpio-vr41xx.o
> + obj-$(CONFIG_GPIO_VX855) += gpio-vx855.o
> + obj-$(CONFIG_GPIO_WHISKEY_COVE) += gpio-wcove.o
> + obj-$(CONFIG_GPIO_WINBOND) += gpio-winbond.o
> + obj-$(CONFIG_GPIO_WM831X) += gpio-wm831x.o
> + obj-$(CONFIG_GPIO_WM8350) += gpio-wm8350.o
> + obj-$(CONFIG_GPIO_WM8994) += gpio-wm8994.o
> + obj-$(CONFIG_GPIO_WS16C48) += gpio-ws16c48.o
> + obj-$(CONFIG_GPIO_XGENE) += gpio-xgene.o
> + obj-$(CONFIG_GPIO_XGENE_SB) += gpio-xgene-sb.o
> + obj-$(CONFIG_GPIO_XILINX) += gpio-xilinx.o
> + obj-$(CONFIG_GPIO_XLP) += gpio-xlp.o
> + obj-$(CONFIG_GPIO_XRA1403) += gpio-xra1403.o
> + obj-$(CONFIG_GPIO_XTENSA) += gpio-xtensa.o
> + obj-$(CONFIG_GPIO_ZEVIO) += gpio-zevio.o
> + obj-$(CONFIG_GPIO_ZX) += gpio-zx.o
> + obj-$(CONFIG_GPIO_ZYNQ) += gpio-zynq.o
I am still getting this conflict (the commit ids may have changed).
Just a reminder in case you think Linus may need to know.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: linux-next: manual merge of the gpio tree with the mfd tree
2019-07-09 0:15 ` Stephen Rothwell
@ 2019-07-09 13:20 ` Linus Walleij
0 siblings, 0 replies; 8+ messages in thread
From: Linus Walleij @ 2019-07-09 13:20 UTC (permalink / raw)
To: Stephen Rothwell, Linus Torvalds
Cc: Lee Jones, Linux Next Mailing List, Linux Kernel Mailing List,
Matti Vaittinen, Geert Uytterhoeven
Hi Stephen, Linus
On Tue, Jul 9, 2019 at 2:16 AM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> > Today's linux-next merge of the gpio tree got a conflict in:
> >
> > drivers/gpio/Makefile
> >
> > between commit:
> >
> > 18bc64b3aebf ("gpio: Initial support for ROHM bd70528 GPIO block")
> >
> > from the mfd tree and commit:
> >
> > db16bad6efd9 ("gpio: Sort GPIO drivers in Makefile")
> >
> > from the gpio tree.
(...)
> I am still getting this conflict (the commit ids may have changed).
> Just a reminder in case you think Linus may need to know.
Of course I forgot to mention that in my pull request to Torvalds.
Linus: there might be some trival merge conflict in the Makefile
because Geert made a patch restructuring the Makefile and a
new GPIO driver was merged orthogonally in the MFD tree.
The resolution should be trivial, and the end result that we see
less of this because now the files are in alphabetic order so
we (or so it is believed) get a rectangular distribution of
conflicts since all filenames are equally plausible (yeah right).
It's a best effort to keep some sane order at least.
Yours,
Linus Walleij
^ permalink raw reply [flat|nested] 8+ messages in thread
* linux-next: manual merge of the gpio tree with the mfd tree
@ 2016-03-09 3:37 Stephen Rothwell
2016-03-09 5:35 ` Lee Jones
0 siblings, 1 reply; 8+ messages in thread
From: Stephen Rothwell @ 2016-03-09 3:37 UTC (permalink / raw)
To: Linus Walleij, Lee Jones
Cc: linux-next, linux-kernel, Laxman Dewangan, Andrew F. Davis
Hi Linus,
Today's linux-next merge of the gpio tree got a conflict in:
drivers/gpio/gpio-tps65912.c
between commits:
65b6555971d0 ("mfd: tps65912: Remove old driver in preparation for new driver")
ca801a22f465 ("gpio: tps65912: Add GPIO driver for the TPS65912 PMIC")
from the mfd tree and commit:
0964ac703edf ("gpio: tps65912: Use devm_gpiochip_add_data() for gpio registration")
from the gpio tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell
diff --cc drivers/gpio/gpio-tps65912.c
index 3da3840201de,e72302d2461a..000000000000
--- a/drivers/gpio/gpio-tps65912.c
+++ b/drivers/gpio/gpio-tps65912.c
@@@ -105,54 -90,54 +105,44 @@@ static struct gpio_chip template_chip
static int tps65912_gpio_probe(struct platform_device *pdev)
{
- struct tps65912 *tps65912 = dev_get_drvdata(pdev->dev.parent);
- struct tps65912_board *pdata = dev_get_platdata(tps65912->dev);
- struct tps65912_gpio_data *tps65912_gpio;
+ struct tps65912 *tps = dev_get_drvdata(pdev->dev.parent);
+ struct tps65912_gpio *gpio;
int ret;
- tps65912_gpio = devm_kzalloc(&pdev->dev, sizeof(*tps65912_gpio),
- GFP_KERNEL);
- if (tps65912_gpio == NULL)
+ gpio = devm_kzalloc(&pdev->dev, sizeof(*gpio), GFP_KERNEL);
+ if (!gpio)
return -ENOMEM;
- tps65912_gpio->tps65912 = tps65912;
- tps65912_gpio->gpio_chip = template_chip;
- tps65912_gpio->gpio_chip.parent = &pdev->dev;
- if (pdata && pdata->gpio_base)
- tps65912_gpio->gpio_chip.base = pdata->gpio_base;
+ gpio->tps = dev_get_drvdata(pdev->dev.parent);
+ gpio->gpio_chip = template_chip;
+ gpio->gpio_chip.parent = tps->dev;
- ret = gpiochip_add_data(&gpio->gpio_chip, gpio);
- ret = devm_gpiochip_add_data(&pdev->dev, &tps65912_gpio->gpio_chip,
- tps65912_gpio);
++ ret = devm_gpiochip_add_data(&pdev->dev, &gpio->gpio_chip, gpio);
if (ret < 0) {
- dev_err(&pdev->dev, "Failed to register gpiochip, %d\n", ret);
+ dev_err(&pdev->dev, "Could not register gpiochip, %d\n", ret);
return ret;
}
- platform_set_drvdata(pdev, tps65912_gpio);
+ platform_set_drvdata(pdev, gpio);
- return ret;
+ return 0;
}
- static int tps65912_gpio_remove(struct platform_device *pdev)
- {
- struct tps65912_gpio *gpio = platform_get_drvdata(pdev);
-
- gpiochip_remove(&gpio->gpio_chip);
-
- return 0;
- }
-
+static const struct platform_device_id tps65912_gpio_id_table[] = {
+ { "tps65912-gpio", },
+ { /* sentinel */ }
+};
+MODULE_DEVICE_TABLE(platform, tps65912_gpio_id_table);
+
static struct platform_driver tps65912_gpio_driver = {
.driver = {
.name = "tps65912-gpio",
},
.probe = tps65912_gpio_probe,
- .remove = tps65912_gpio_remove,
+ .id_table = tps65912_gpio_id_table,
};
+module_platform_driver(tps65912_gpio_driver);
-static int __init tps65912_gpio_init(void)
-{
- return platform_driver_register(&tps65912_gpio_driver);
-}
-subsys_initcall(tps65912_gpio_init);
-
-static void __exit tps65912_gpio_exit(void)
-{
- platform_driver_unregister(&tps65912_gpio_driver);
-}
-module_exit(tps65912_gpio_exit);
-
-MODULE_AUTHOR("Margarita Olaya Cabrera <magi@slimlogic.co.uk>");
-MODULE_DESCRIPTION("GPIO interface for TPS65912 PMICs");
+MODULE_AUTHOR("Andrew F. Davis <afd@ti.com>");
+MODULE_DESCRIPTION("TPS65912 GPIO driver");
MODULE_LICENSE("GPL v2");
-MODULE_ALIAS("platform:tps65912-gpio");
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: linux-next: manual merge of the gpio tree with the mfd tree
2016-03-09 3:37 Stephen Rothwell
@ 2016-03-09 5:35 ` Lee Jones
2016-03-09 10:41 ` Linus Walleij
0 siblings, 1 reply; 8+ messages in thread
From: Lee Jones @ 2016-03-09 5:35 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Linus Walleij, linux-next, linux-kernel, Laxman Dewangan,
Andrew F. Davis
On Wed, 09 Mar 2016, Stephen Rothwell wrote:
> Hi Linus,
>
> Today's linux-next merge of the gpio tree got a conflict in:
>
> drivers/gpio/gpio-tps65912.c
>
> between commits:
>
> 65b6555971d0 ("mfd: tps65912: Remove old driver in preparation for new driver")
> ca801a22f465 ("gpio: tps65912: Add GPIO driver for the TPS65912 PMIC")
>
> from the mfd tree and commit:
>
> 0964ac703edf ("gpio: tps65912: Use devm_gpiochip_add_data() for gpio registration")
>
> from the gpio tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
I sent out a pull-request for this already.
Please pull 'ib-mfd-regulator-gpio-4.6' from my tree.
--
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: linux-next: manual merge of the gpio tree with the mfd tree
2016-03-09 5:35 ` Lee Jones
@ 2016-03-09 10:41 ` Linus Walleij
0 siblings, 0 replies; 8+ messages in thread
From: Linus Walleij @ 2016-03-09 10:41 UTC (permalink / raw)
To: Lee Jones
Cc: Stephen Rothwell, linux-next, linux-kernel, Laxman Dewangan,
Andrew F. Davis
On Wed, Mar 9, 2016 at 12:35 PM, Lee Jones <lee.jones@linaro.org> wrote:
>> I fixed it up (see below) and can carry the fix as necessary (no action
>> is required).
>
> I sent out a pull-request for this already.
>
> Please pull 'ib-mfd-regulator-gpio-4.6' from my tree.
I merged Lee's immutable branch to the GPIO tree now so the problem
should be gone tomorrow.
Yours,
Linus Walleij
^ permalink raw reply [flat|nested] 8+ messages in thread
* linux-next: manual merge of the gpio tree with the mfd tree
@ 2011-06-22 3:51 Stephen Rothwell
0 siblings, 0 replies; 8+ messages in thread
From: Stephen Rothwell @ 2011-06-22 3:51 UTC (permalink / raw)
To: Grant Likely
Cc: linux-next, linux-kernel, Margarita Olaya, Samuel Ortiz, Liam Girdwood
Hi Grant,
Today's linux-next merge of the gpio tree got a conflict in
drivers/gpio/Makefile between commit d4739bbd20ec ("tps65912: gpio: add
gpio driver") from the mfd tree and commit c103de240439 ("gpio:
reorganize drivers") from the gpio tree.
I fixed it up (see below) and can carry the fix as necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc drivers/gpio/Makefile
index 78aed0e,0fbdd75..0000000
--- a/drivers/gpio/Makefile
+++ b/drivers/gpio/Makefile
@@@ -14,40 -38,20 +38,21 @@@ obj-$(CONFIG_GPIO_RDC321X) += gpio-rdc3
obj-$(CONFIG_GPIO_PLAT_SAMSUNG) += gpio-plat-samsung.o
obj-$(CONFIG_GPIO_S5PC100) += gpio-s5pc100.o
obj-$(CONFIG_GPIO_S5PV210) += gpio-s5pv210.o
- obj-$(CONFIG_GPIO_LANGWELL) += langwell_gpio.o
- obj-$(CONFIG_GPIO_MAX730X) += max730x.o
- obj-$(CONFIG_GPIO_MAX7300) += max7300.o
- obj-$(CONFIG_GPIO_MAX7301) += max7301.o
- obj-$(CONFIG_GPIO_MAX732X) += max732x.o
- obj-$(CONFIG_GPIO_MC33880) += mc33880.o
- obj-$(CONFIG_GPIO_MCP23S08) += mcp23s08.o
- obj-$(CONFIG_GPIO_74X164) += 74x164.o
- obj-$(CONFIG_ARCH_OMAP) += gpio-omap.o
- obj-$(CONFIG_GPIO_PCA953X) += pca953x.o
- obj-$(CONFIG_GPIO_PCF857X) += pcf857x.o
- obj-$(CONFIG_GPIO_PCH) += pch_gpio.o
- obj-$(CONFIG_GPIO_PL061) += pl061.o
- obj-$(CONFIG_GPIO_STMPE) += stmpe-gpio.o
- obj-$(CONFIG_GPIO_TC3589X) += tc3589x-gpio.o
- obj-$(CONFIG_GPIO_TIMBERDALE) += timbgpio.o
- obj-$(CONFIG_GPIO_TWL4030) += twl4030-gpio.o
+
+ obj-$(CONFIG_GPIO_SCH) += gpio-sch.o
+ obj-$(CONFIG_GPIO_STMPE) += gpio-stmpe.o
+ obj-$(CONFIG_GPIO_SX150X) += gpio-sx150x.o
+ obj-$(CONFIG_GPIO_TC3589X) += gpio-tc3589x.o
+ obj-$(CONFIG_ARCH_TEGRA) += gpio-tegra.o
+ obj-$(CONFIG_GPIO_TIMBERDALE) += gpio-timberdale.o
+ obj-$(CONFIG_GPIO_TPS65910) += gpio-tps65910.o
+obj-$(CONFIG_GPIO_TPS65912) += gpio-tps65912.o
- obj-$(CONFIG_GPIO_UCB1400) += ucb1400_gpio.o
- obj-$(CONFIG_GPIO_XILINX) += xilinx_gpio.o
- obj-$(CONFIG_GPIO_CS5535) += cs5535-gpio.o
- obj-$(CONFIG_GPIO_BT8XX) += bt8xxgpio.o
- obj-$(CONFIG_GPIO_IT8761E) += it8761e_gpio.o
- obj-$(CONFIG_GPIO_VR41XX) += vr41xx_giu.o
- obj-$(CONFIG_GPIO_WM831X) += wm831x-gpio.o
- obj-$(CONFIG_GPIO_WM8350) += wm8350-gpiolib.o
- obj-$(CONFIG_GPIO_WM8994) += wm8994-gpio.o
- obj-$(CONFIG_GPIO_SCH) += sch_gpio.o
+ obj-$(CONFIG_GPIO_TWL4030) += gpio-twl4030.o
obj-$(CONFIG_MACH_U300) += gpio-u300.o
- obj-$(CONFIG_PLAT_NOMADIK) += gpio-nomadik.o
- obj-$(CONFIG_GPIO_RDC321X) += rdc321x-gpio.o
- obj-$(CONFIG_GPIO_JANZ_TTL) += janz-ttl.o
- obj-$(CONFIG_GPIO_SX150X) += sx150x.o
- obj-$(CONFIG_GPIO_VX855) += vx855_gpio.o
- obj-$(CONFIG_GPIO_ML_IOH) += ml_ioh_gpio.o
- obj-$(CONFIG_AB8500_GPIO) += ab8500-gpio.o
- obj-$(CONFIG_GPIO_TPS65910) += tps65910-gpio.o
+ obj-$(CONFIG_GPIO_UCB1400) += gpio-ucb1400.o
+ obj-$(CONFIG_GPIO_VR41XX) += gpio-vr41xx.o
+ obj-$(CONFIG_GPIO_VX855) += gpio-vx855.o
+ obj-$(CONFIG_GPIO_WM831X) += gpio-wm831x.o
+ obj-$(CONFIG_GPIO_WM8350) += gpio-wm8350.o
+ obj-$(CONFIG_GPIO_WM8994) += gpio-wm8994.o
+ obj-$(CONFIG_GPIO_XILINX) += gpio-xilinx.o
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2019-07-09 13:20 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-02-16 3:33 linux-next: manual merge of the gpio tree with the mfd tree Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2019-06-28 7:28 Stephen Rothwell
2019-07-09 0:15 ` Stephen Rothwell
2019-07-09 13:20 ` Linus Walleij
2016-03-09 3:37 Stephen Rothwell
2016-03-09 5:35 ` Lee Jones
2016-03-09 10:41 ` Linus Walleij
2011-06-22 3:51 Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).