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

Commit 9d2d2430 authored by Ulf Hansson's avatar Ulf Hansson
Browse files

mmc: core: Move mmc_of_parse_voltage() to host.c 



MMC OF parsing functions, which parses various host DT properties, should
stay close to each other. Therefore, let's move mmc_of_parse_voltage()
close to mmc_of_parse() into host.c.

Additionally, there is no reason to build the code only when CONFIG_OF is
set, as there should be stub functions for the OF helpers that is being
used, so let's drop this condition as well.

Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent 3958790e

drivers/mmc/core/core.c

+0 −48
Original line number Diff line number Diff line
@@ -1112,54 +1112,6 @@ u32 mmc_vddrange_to_ocrmask(int vdd_min, int vdd_max) 
	return mask;

}



#ifdef CONFIG_OF



/**

 * mmc_of_parse_voltage - return mask of supported voltages

 * @np: The device node need to be parsed.

 * @mask: mask of voltages available for MMC/SD/SDIO

 *

 * Parse the "voltage-ranges" DT property, returning zero if it is not

 * found, negative errno if the voltage-range specification is invalid,

 * or one if the voltage-range is specified and successfully parsed.

 */

int mmc_of_parse_voltage(struct device_node *np, u32 *mask)

{

	const u32 *voltage_ranges;

	int num_ranges, i;



	voltage_ranges = of_get_property(np, "voltage-ranges", &num_ranges);

	num_ranges = num_ranges / sizeof(*voltage_ranges) / 2;

	if (!voltage_ranges) {

		pr_debug("%pOF: voltage-ranges unspecified\n", np);

		return 0;

	}

	if (!num_ranges) {

		pr_err("%pOF: voltage-ranges empty\n", np);

		return -EINVAL;

	}



	for (i = 0; i < num_ranges; i++) {

		const int j = i * 2;

		u32 ocr_mask;



		ocr_mask = mmc_vddrange_to_ocrmask(

				be32_to_cpu(voltage_ranges[j]),

				be32_to_cpu(voltage_ranges[j + 1]));

		if (!ocr_mask) {

			pr_err("%pOF: voltage-range #%d is invalid\n",

				np, i);

			return -EINVAL;

		}

		*mask |= ocr_mask;

	}



	return 1;

}

EXPORT_SYMBOL(mmc_of_parse_voltage);



#endif /* CONFIG_OF */



static int mmc_of_get_func_num(struct device_node *node)

{

	u32 reg;

drivers/mmc/core/host.c

+44 −0
Original line number Diff line number Diff line
@@ -348,6 +348,50 @@ int mmc_of_parse(struct mmc_host *host) 


EXPORT_SYMBOL(mmc_of_parse);



/**

 * mmc_of_parse_voltage - return mask of supported voltages

 * @np: The device node need to be parsed.

 * @mask: mask of voltages available for MMC/SD/SDIO

 *

 * Parse the "voltage-ranges" DT property, returning zero if it is not

 * found, negative errno if the voltage-range specification is invalid,

 * or one if the voltage-range is specified and successfully parsed.

 */

int mmc_of_parse_voltage(struct device_node *np, u32 *mask)

{

	const u32 *voltage_ranges;

	int num_ranges, i;



	voltage_ranges = of_get_property(np, "voltage-ranges", &num_ranges);

	num_ranges = num_ranges / sizeof(*voltage_ranges) / 2;

	if (!voltage_ranges) {

		pr_debug("%pOF: voltage-ranges unspecified\n", np);

		return 0;

	}

	if (!num_ranges) {

		pr_err("%pOF: voltage-ranges empty\n", np);

		return -EINVAL;

	}



	for (i = 0; i < num_ranges; i++) {

		const int j = i * 2;

		u32 ocr_mask;



		ocr_mask = mmc_vddrange_to_ocrmask(

				be32_to_cpu(voltage_ranges[j]),

				be32_to_cpu(voltage_ranges[j + 1]));

		if (!ocr_mask) {

			pr_err("%pOF: voltage-range #%d is invalid\n",

				np, i);

			return -EINVAL;

		}

		*mask |= ocr_mask;

	}



	return 1;

}

EXPORT_SYMBOL(mmc_of_parse_voltage);



/**

 *	mmc_alloc_host - initialise the per-host structure.

 *	@extra: sizeof private data structure