[5/9] omap: pdata-quirks: remove openpandora quirks for mmc3 and wl1251
diff mbox series

Message ID 63f59daa6b6e079905ff128b88282cf2c72e3540.1571430329.git.hns@goldelico.com
State New
Headers show
Series
  • OpenPandora: make wl1251 connected to mmc3 sdio port of OpenPandora work again
Related show

Commit Message

H. Nikolaus Schaller Oct. 18, 2019, 8:25 p.m. UTC
With a wl1251 child node of mmc3 in the device tree decoded
in omap_hsmmc.c to handle special wl1251 initialization, we do
no longer need to instantiate the mmc3 through pdata quirks.

We also can remove the wlan regulator and reset/interrupt definitions
and do them through device tree.

Fixes: 81eef6ca9201 ("mmc: omap_hsmmc: Use dma_request_chan() for requesting DMA channel")

Signed-off-by: H. Nikolaus Schaller <hns@goldelico.com>
Cc: <stable@vger.kernel.org> # 4.7.0
---
 arch/arm/mach-omap2/pdata-quirks.c | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

Comments

Tony Lindgren Oct. 19, 2019, 4:22 p.m. UTC | #1
* H. Nikolaus Schaller <hns@goldelico.com> [191019 15:18]:
> 
> > Am 19.10.2019 um 15:36 schrieb Sasha Levin <sashal@kernel.org>:
> > 
> > Hi,
> > 
> > [This is an automated email]
> > 
> > This commit has been processed because it contains a "Fixes:" tag,
> > fixing commit: 81eef6ca92014 mmc: omap_hsmmc: Use dma_request_chan() for requesting DMA channel.
> > 
> > The bot has tested the following trees: v5.3.6, v4.19.79, v4.14.149, v4.9.196.
> > 
> > v5.3.6: Build OK!
> > v4.19.79: Failed to apply! Possible dependencies:
> >    Unable to calculate
> > 
> > v4.14.149: Failed to apply! Possible dependencies:
> >    0486738928bf0 ("ARM: OMAP1: ams-delta: add GPIO lookup tables")
> >    0920ca103f8d8 ("ARM: sa1100: provide infrastructure to support generic CF sockets")
> >    29786e9b6551b ("ARM: sa1100/assabet: convert to generic CF sockets")
> >    2bcb1be092370 ("Input: ams_delta_serio: Replace power GPIO with regulator")
> >    56de7570b3264 ("Input: ams_delta_serio: use private structure")
> >    7be893aa2d6a1 ("pcmcia: sa1100: provide generic CF support")
> >    b51af86559d4b ("ARM: sa1100/shannon: convert to generic CF sockets")
> >    b955153bfa68d ("ARM: sa1100/assabet: add BCR/BSR GPIO driver")
> >    c2f9b05fd5c12 ("media: arch: sh: ecovec: Use new renesas-ceu camera driver")
> >    df88c57689278 ("Input: ams_delta_serio: convert to platform driver")
> >    efdfeb079cc3b ("regulator: fixed: Convert to use GPIO descriptor only")
> 
> ^^^ this is the relevant one.
> 
> > 
> > v4.9.196: Failed to apply! Possible dependencies:
> >    0486738928bf0 ("ARM: OMAP1: ams-delta: add GPIO lookup tables")
> >    072f58af1dfbc ("ARM: dts: Add devicetree for the Raspberry Pi 3, for arm32 (v6)")
> >    1aa1d858f582c ("ARM: dts: bcm283x: Add dtsi for OTG mode")
> >    29786e9b6551b ("ARM: sa1100/assabet: convert to generic CF sockets")
> >    2bcb1be092370 ("Input: ams_delta_serio: Replace power GPIO with regulator")
> >    3bfe25fa9f8a5 ("ARM: dts: bcm283x: Move the BCM2837 DT contents from arm64 to arm.")
> >    56de7570b3264 ("Input: ams_delta_serio: use private structure")
> >    6c1b417adc8fa ("ARM: pxa: ezx: use the new pxa_camera platform_data")
> >    7ade445c26269 ("ARM: pxa: magician: Add support for ADS7846 touchscreen")
> >    8f9bafbb92c03 ("ARM: dts: aspeed: Add Romulus BMC platform")
> >    b24413180f560 ("License cleanup: add SPDX GPL-2.0 license identifier to files with no license")
> >    b5478c1b67bcd ("alpha: add asm/extable.h")
> >    b955153bfa68d ("ARM: sa1100/assabet: add BCR/BSR GPIO driver")
> >    d9fa04725f27f ("ARM: pxa: em-x270: use the new pxa_camera platform_data")
> >    df88c57689278 ("Input: ams_delta_serio: convert to platform driver")
> >    efdfeb079cc3b ("regulator: fixed: Convert to use GPIO descriptor only")
> >    fe7bf9dcfff5b ("ARM: dts: add a devicetree for Raidsonic NAS IB-4220-B")
> > 
> > 
> > NOTE: The patch will not be queued to stable trees until it is upstream.
> > 
> > How should we proceed with this patch?
> 
> I have checked and the reason is that 
> 
> efdfeb079cc3b ("regulator: fixed: Convert to use GPIO descriptor only")
> 
> was introduced after v.4.19 which was also partially reverted by this patch
> if based on mainline.
> 
> I have split it up into the partial revert of efdfeb079cc3b  for mainline
> and the real patch which now applies to all relevant stable trees.
> 
> So I'll sent a v2 asap.

Please also remove arch/arm/mach-omap2/hsmmc.[ch] as I think that
can be now done :)

Regards,

Tony

Patch
diff mbox series

diff --git a/arch/arm/mach-omap2/pdata-quirks.c b/arch/arm/mach-omap2/pdata-quirks.c
index d942a3357090..231bf4dc55fa 100644
--- a/arch/arm/mach-omap2/pdata-quirks.c
+++ b/arch/arm/mach-omap2/pdata-quirks.c
@@ -304,14 +304,17 @@  static void __init omap3_logicpd_torpedo_init(void)
 }
 
 /* omap3pandora legacy devices */
-#define PANDORA_WIFI_IRQ_GPIO		21
-#define PANDORA_WIFI_NRESET_GPIO	23
 
 static struct platform_device pandora_backlight = {
 	.name	= "pandora-backlight",
 	.id	= -1,
 };
 
+#if OLD_WL1251
+
+#define PANDORA_WIFI_IRQ_GPIO		21
+#define PANDORA_WIFI_NRESET_GPIO	23
+
 static struct regulator_consumer_supply pandora_vmmc3_supply[] = {
 	REGULATOR_SUPPLY("vmmc", "omap_hsmmc.2"),
 };
@@ -407,15 +410,11 @@  static void __init pandora_wl1251_init(void)
 fail:
 	pr_err("wl1251 board initialisation failed\n");
 }
+#endif
 
 static void __init omap3_pandora_legacy_init(void)
 {
 	platform_device_register(&pandora_backlight);
-	gpiod_add_lookup_table(&pandora_vwlan_gpiod_table);
-	platform_device_register(&pandora_vwlan_device);
-	omap_hsmmc_init(pandora_mmc3);
-	omap_hsmmc_late_init(pandora_mmc3);
-	pandora_wl1251_init();
 }
 #endif /* CONFIG_ARCH_OMAP3 */