Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b2ff4790 authored by Tony Lindgren's avatar Tony Lindgren
Browse files

ARM: OMAP2+: Remove legacy omap4_twl6030_hsmmc_init 



This is no longer used, omap4 is device tree based now.

Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent e30b06f4

arch/arm/mach-omap2/common.h

+0 −1
Original line number Diff line number Diff line
@@ -299,7 +299,6 @@ struct omap_sdrc_params; 
extern void omap_sdrc_init(struct omap_sdrc_params *sdrc_cs0,

				      struct omap_sdrc_params *sdrc_cs1);

struct omap2_hsmmc_info;

extern int omap4_twl6030_hsmmc_init(struct omap2_hsmmc_info *controllers);

extern void omap_reserve(void);



struct omap_hwmod;

arch/arm/mach-omap2/omap4-common.c

+0 −57
Original line number Diff line number Diff line
@@ -35,7 +35,6 @@ 
#include "iomap.h"

#include "common.h"

#include "mmc.h"

#include "hsmmc.h"

#include "prminst44xx.h"

#include "prcm_mpu44xx.h"

#include "omap4-sar-layout.h"
@@ -284,59 +283,3 @@ void __init omap_gic_of_init(void) 
	omap_wakeupgen_init();

	irqchip_init();

}
 


#if defined(CONFIG_MMC_OMAP_HS) || defined(CONFIG_MMC_OMAP_HS_MODULE)

static int omap4_twl6030_hsmmc_late_init(struct device *dev)

{

	int irq = 0;

	struct platform_device *pdev = container_of(dev,

				struct platform_device, dev);

	struct omap_mmc_platform_data *pdata = dev->platform_data;



	/* Setting MMC1 Card detect Irq */

	if (pdev->id == 0) {

		irq = twl6030_mmc_card_detect_config();

		if (irq < 0) {

			dev_err(dev, "%s: Error card detect config(%d)\n",

				__func__, irq);

			return irq;

		}

		pdata->slots[0].card_detect_irq = irq;

		pdata->slots[0].card_detect = twl6030_mmc_card_detect;

	}

	return 0;

}



static __init void omap4_twl6030_hsmmc_set_late_init(struct device *dev)

{

	struct omap_mmc_platform_data *pdata;



	/* dev can be null if CONFIG_MMC_OMAP_HS is not set */

	if (!dev) {

		pr_err("Failed %s\n", __func__);

		return;

	}

	pdata = dev->platform_data;

	pdata->init =	omap4_twl6030_hsmmc_late_init;

}



int __init omap4_twl6030_hsmmc_init(struct omap2_hsmmc_info *controllers)

{

	struct omap2_hsmmc_info *c;



	omap_hsmmc_init(controllers);

	for (c = controllers; c->mmc; c++) {

		/* pdev can be null if CONFIG_MMC_OMAP_HS is not set */

		if (!c->pdev)

			continue;

		omap4_twl6030_hsmmc_set_late_init(&c->pdev->dev);

	}



	return 0;

}

#else

int __init omap4_twl6030_hsmmc_init(struct omap2_hsmmc_info *controllers)

{

	return 0;

}

#endif