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

Commit e6c784ed authored by Yuvaraj Kumar C D's avatar Yuvaraj Kumar C D Committed by Chris Ball
Browse files

mmc: dw_mmc: exynos: move the exynos private init 



Currently platform specific private data initialization is done by
dw_mci_exynos_priv_init and dw_mci_exynos_parse_dt. As we already have
separate platform specific device tree parser dw_mci_exynos_parse_dt,
move the dw_mci_exynos_priv_init code to dw_mci_exynos_parse_dt.
We can use the dw_mci_exynos_priv_init to do some actual platform
specific initialization of SMU and etc.

Signed-off-by: default avatarYuvaraj Kumar C D <yuvaraj.cd@samsung.com>
Tested-by: default avatarAlim Akhtar <alim.akhtar@samsung.com>
Tested-by: default avatarJaehoon Chung <jh80.chung@samsung.com>
Acked-by: default avatarSeungwon Jeon <tgih.jun@samsung.com>
Signed-off-by: default avatarChris Ball <cjb@laptop.org>
parent 2eb2944f

drivers/mmc/host/dw_mmc-exynos.c

+16 −18
Original line number Original line Diff line number Diff line
@@ -72,22 +72,8 @@ static struct dw_mci_exynos_compatible { 




static int dw_mci_exynos_priv_init(struct dw_mci *host)

static int dw_mci_exynos_priv_init(struct dw_mci *host)

{

{

	struct dw_mci_exynos_priv_data *priv;

	struct dw_mci_exynos_priv_data *priv = host->priv;

	int idx;



	priv = devm_kzalloc(host->dev, sizeof(*priv), GFP_KERNEL);

	if (!priv) {

		dev_err(host->dev, "mem alloc failed for private data\n");

		return -ENOMEM;

	}



	for (idx = 0; idx < ARRAY_SIZE(exynos_compat); idx++) {

		if (of_device_is_compatible(host->dev->of_node,

					exynos_compat[idx].compatible))

			priv->ctrl_type = exynos_compat[idx].ctrl_type;

	}





	host->priv = priv;

	return 0;

	return 0;

}

}
@@ -174,12 +160,24 @@ static void dw_mci_exynos_set_ios(struct dw_mci *host, struct mmc_ios *ios) 




static int dw_mci_exynos_parse_dt(struct dw_mci *host)

static int dw_mci_exynos_parse_dt(struct dw_mci *host)

{

{

	struct dw_mci_exynos_priv_data *priv = host->priv;

	struct dw_mci_exynos_priv_data *priv;

	struct device_node *np = host->dev->of_node;

	struct device_node *np = host->dev->of_node;

	u32 timing[2];

	u32 timing[2];

	u32 div = 0;

	u32 div = 0;

	int idx;

	int ret;

	int ret;





	priv = devm_kzalloc(host->dev, sizeof(*priv), GFP_KERNEL);

	if (!priv) {

		dev_err(host->dev, "mem alloc failed for private data\n");

		return -ENOMEM;

	}



	for (idx = 0; idx < ARRAY_SIZE(exynos_compat); idx++) {

		if (of_device_is_compatible(np, exynos_compat[idx].compatible))

			priv->ctrl_type = exynos_compat[idx].ctrl_type;

	}



	of_property_read_u32(np, "samsung,dw-mshc-ciu-div", &div);

	of_property_read_u32(np, "samsung,dw-mshc-ciu-div", &div);

	priv->ciu_div = div;

	priv->ciu_div = div;
@@ -188,14 +186,14 @@ static int dw_mci_exynos_parse_dt(struct dw_mci *host) 
	if (ret)

	if (ret)

		return ret;

		return ret;





	priv->sdr_timing = SDMMC_CLKSEL_TIMING(timing[0], timing[1], div);



	ret = of_property_read_u32_array(np,

	ret = of_property_read_u32_array(np,

			"samsung,dw-mshc-ddr-timing", timing, 2);

			"samsung,dw-mshc-ddr-timing", timing, 2);

	if (ret)

	if (ret)

		return ret;

		return ret;





	priv->sdr_timing = SDMMC_CLKSEL_TIMING(timing[0], timing[1], div);

	priv->ddr_timing = SDMMC_CLKSEL_TIMING(timing[0], timing[1], div);

	priv->ddr_timing = SDMMC_CLKSEL_TIMING(timing[0], timing[1], div);

	host->priv = priv;

	return 0;

	return 0;

}

}