Commit 55143438 authored by Andreas Fenkart's avatar Andreas Fenkart Committed by Ulf Hansson
Browse files

ARM: OMAP1/2+: MMC: separate platform data for mmc and mmc hs driver 



- omap mmc driver supports multiplexing, omap_mmc_hs doesn't
this leads to one of the major confusions in the omap_hsmmc driver

- platform data should be read-only for the driver
most callbacks are not set by the omap3 platform init code while still
required. So they are set from the driver probe function, which is against
the paradigm that platform-data should not be modified by the driver
typical examples are card_detect, read_only callbacks

un-bundling by searching for driver name \"omap_hsmmc in the
arch/arm folder. omap_hsmmc_platform_data is not initialized directly,
but from omap2_hsmmc_info, which is defined in a separate header file
not touched by this patch

hwmod includes platform headers to declare features of the platform. All
the declared features are prefixed OMAP_HSMMC. There is no need to
include platform header from hwmod other except for feature defines

Acked-by: default avatarTony Lindgren <tony@atomide.com>
Signed-off-by: default avatarAndreas Fenkart <afenkart@gmail.com>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent 826c71a0

arch/arm/mach-omap2/hsmmc.c

+13 −13
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 
#include <linux/gpio.h>

#include <linux/mmc/host.h>

#include <linux/platform_data/gpio-omap.h>

#include <linux/platform_data/mmc-omap.h>

#include <linux/platform_data/hsmmc-omap.h>



#include "soc.h"

#include "omap_device.h"
@@ -48,7 +48,7 @@ static void omap_hsmmc1_before_set_reg(struct device *dev, int slot, 
				  int power_on, int vdd)

{

	u32 reg, prog_io;

	struct omap_mmc_platform_data *mmc = dev->platform_data;

	struct omap_hsmmc_platform_data *mmc = dev->platform_data;



	if (mmc->slots[0].remux)

		mmc->slots[0].remux(dev, slot, power_on);
@@ -121,7 +121,7 @@ static void omap_hsmmc1_after_set_reg(struct device *dev, int slot, 
	}

}



static void hsmmc2_select_input_clk_src(struct omap_mmc_platform_data *mmc)

static void hsmmc2_select_input_clk_src(struct omap_hsmmc_platform_data *mmc)

{

	u32 reg;
@@ -136,7 +136,7 @@ static void hsmmc2_select_input_clk_src(struct omap_mmc_platform_data *mmc) 
static void hsmmc2_before_set_reg(struct device *dev, int slot,

				   int power_on, int vdd)

{

	struct omap_mmc_platform_data *mmc = dev->platform_data;

	struct omap_hsmmc_platform_data *mmc = dev->platform_data;



	if (mmc->slots[0].remux)

		mmc->slots[0].remux(dev, slot, power_on);
@@ -148,7 +148,7 @@ static void hsmmc2_before_set_reg(struct device *dev, int slot, 
static int am35x_hsmmc2_set_power(struct device *dev, int slot,

				  int power_on, int vdd)

{

	struct omap_mmc_platform_data *mmc = dev->platform_data;

	struct omap_hsmmc_platform_data *mmc = dev->platform_data;



	if (power_on)

		hsmmc2_select_input_clk_src(mmc);
@@ -162,8 +162,8 @@ static int nop_mmc_set_power(struct device *dev, int slot, int power_on, 
	return 0;

}



static inline void omap_hsmmc_mux(struct omap_mmc_platform_data *mmc_controller,

			int controller_nr)

static inline void omap_hsmmc_mux(struct omap_hsmmc_platform_data

				  *mmc_controller, int controller_nr)

{

	if (gpio_is_valid(mmc_controller->slots[0].switch_pin) &&

		(mmc_controller->slots[0].switch_pin < OMAP_MAX_GPIO_LINES))
@@ -244,7 +244,7 @@ static inline void omap_hsmmc_mux(struct omap_mmc_platform_data *mmc_controller, 
}



static int __init omap_hsmmc_pdata_init(struct omap2_hsmmc_info *c,

					struct omap_mmc_platform_data *mmc)

					struct omap_hsmmc_platform_data *mmc)

{

	char *hc_name;
@@ -369,7 +369,7 @@ static int omap_hsmmc_done; 
void omap_hsmmc_late_init(struct omap2_hsmmc_info *c)

{

	struct platform_device *pdev;

	struct omap_mmc_platform_data *mmc_pdata;

	struct omap_hsmmc_platform_data *mmc_pdata;

	int res;



	if (omap_hsmmc_done != 1)
@@ -409,12 +409,12 @@ static void __init omap_hsmmc_init_one(struct omap2_hsmmc_info *hsmmcinfo, 
	struct omap_device *od;

	struct platform_device *pdev;

	char oh_name[MAX_OMAP_MMC_HWMOD_NAME_LEN];

	struct omap_mmc_platform_data *mmc_data;

	struct omap_mmc_dev_attr *mmc_dev_attr;

	struct omap_hsmmc_platform_data *mmc_data;

	struct omap_hsmmc_dev_attr *mmc_dev_attr;

	char *name;

	int res;



	mmc_data = kzalloc(sizeof(struct omap_mmc_platform_data), GFP_KERNEL);

	mmc_data = kzalloc(sizeof(*mmc_data), GFP_KERNEL);

	if (!mmc_data) {

		pr_err("Cannot allocate memory for mmc device!\n");

		return;
@@ -464,7 +464,7 @@ static void __init omap_hsmmc_init_one(struct omap2_hsmmc_info *hsmmcinfo, 
	}



	res = platform_device_add_data(pdev, mmc_data,

			      sizeof(struct omap_mmc_platform_data));

			      sizeof(struct omap_hsmmc_platform_data));

	if (res) {

		pr_err("Could not add pdata for %s\n", name);

		goto put_pdev;

arch/arm/mach-omap2/omap_hwmod_2430_data.c

+2 −2
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 


#include <linux/i2c-omap.h>

#include <linux/platform_data/asoc-ti-mcbsp.h>

#include <linux/platform_data/mmc-omap.h>

#include <linux/platform_data/hsmmc-omap.h>

#include <linux/platform_data/spi-omap2-mcspi.h>

#include <linux/omap-dma.h>

#include <plat/dmtimer.h>
@@ -372,7 +372,7 @@ static struct omap_hwmod_opt_clk omap2430_mmc1_opt_clks[] = { 
	{ .role = "dbck", .clk = "mmchsdb1_fck" },

};



static struct omap_mmc_dev_attr mmc1_dev_attr = {

static struct omap_hsmmc_dev_attr mmc1_dev_attr = {

	.flags = OMAP_HSMMC_SUPPORTS_DUAL_VOLT,

};

arch/arm/mach-omap2/omap_hwmod_33xx_43xx_ipblock_data.c

+4 −4
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
 */



#include <linux/platform_data/gpio-omap.h>

#include <linux/platform_data/mmc-omap.h>

#include <linux/platform_data/hsmmc-omap.h>

#include <linux/platform_data/spi-omap2-mcspi.h>

#include "omap_hwmod.h"

#include "i2c.h"
@@ -836,7 +836,7 @@ static struct omap_hwmod_class am33xx_mmc_hwmod_class = { 
};



/* mmc0 */

static struct omap_mmc_dev_attr am33xx_mmc0_dev_attr = {

static struct omap_hsmmc_dev_attr am33xx_mmc0_dev_attr = {

	.flags		= OMAP_HSMMC_SUPPORTS_DUAL_VOLT,

};
@@ -854,7 +854,7 @@ struct omap_hwmod am33xx_mmc0_hwmod = { 
};



/* mmc1 */

static struct omap_mmc_dev_attr am33xx_mmc1_dev_attr = {

static struct omap_hsmmc_dev_attr am33xx_mmc1_dev_attr = {

	.flags		= OMAP_HSMMC_SUPPORTS_DUAL_VOLT,

};
@@ -872,7 +872,7 @@ struct omap_hwmod am33xx_mmc1_hwmod = { 
};



/* mmc2 */

static struct omap_mmc_dev_attr am33xx_mmc2_dev_attr = {

static struct omap_hsmmc_dev_attr am33xx_mmc2_dev_attr = {

	.flags		= OMAP_HSMMC_SUPPORTS_DUAL_VOLT,

};

struct omap_hwmod am33xx_mmc2_hwmod = {

arch/arm/mach-omap2/omap_hwmod_3xxx_data.c

+4 −4
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 
#include <linux/i2c-omap.h>

#include <linux/power/smartreflex.h>

#include <linux/platform_data/gpio-omap.h>

#include <linux/platform_data/mmc-omap.h>

#include <linux/platform_data/hsmmc-omap.h>



#include <linux/omap-dma.h>

#include "l3_3xxx.h"
@@ -1786,12 +1786,12 @@ static struct omap_hwmod_opt_clk omap34xx_mmc1_opt_clks[] = { 
	{ .role = "dbck", .clk = "omap_32k_fck", },

};



static struct omap_mmc_dev_attr mmc1_dev_attr = {

static struct omap_hsmmc_dev_attr mmc1_dev_attr = {

	.flags = OMAP_HSMMC_SUPPORTS_DUAL_VOLT,

};



/* See 35xx errata 2.1.1.128 in SPRZ278F */

static struct omap_mmc_dev_attr mmc1_pre_es3_dev_attr = {

static struct omap_hsmmc_dev_attr mmc1_pre_es3_dev_attr = {

	.flags = (OMAP_HSMMC_SUPPORTS_DUAL_VOLT |

		  OMAP_HSMMC_BROKEN_MULTIBLOCK_READ),

};
@@ -1854,7 +1854,7 @@ static struct omap_hwmod_opt_clk omap34xx_mmc2_opt_clks[] = { 
};



/* See 35xx errata 2.1.1.128 in SPRZ278F */

static struct omap_mmc_dev_attr mmc2_pre_es3_dev_attr = {

static struct omap_hsmmc_dev_attr mmc2_pre_es3_dev_attr = {

	.flags = OMAP_HSMMC_BROKEN_MULTIBLOCK_READ,

};

arch/arm/mach-omap2/omap_hwmod_44xx_data.c

+2 −2
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 


#include <linux/io.h>

#include <linux/platform_data/gpio-omap.h>

#include <linux/platform_data/mmc-omap.h>

#include <linux/platform_data/hsmmc-omap.h>

#include <linux/power/smartreflex.h>

#include <linux/i2c-omap.h>
@@ -1952,7 +1952,7 @@ static struct omap_hwmod_dma_info omap44xx_mmc1_sdma_reqs[] = { 
};



/* mmc1 dev_attr */

static struct omap_mmc_dev_attr mmc1_dev_attr = {

static struct omap_hsmmc_dev_attr mmc1_dev_attr = {

	.flags	= OMAP_HSMMC_SUPPORTS_DUAL_VOLT,

};