Commit 7458ea38 authored by Stephen Boyd's avatar Stephen Boyd
Browse files

Merge tag 'sunxi-clk-for-6.6-1' of... 

Merge tag 'sunxi-clk-for-6.6-1' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux into clk-allwinner

Pull Allwinner clk driver updates from Jernej Skrabec:

 - Convert sun9i-mmc clock to use devm_platform_get_and_ioremap_resource()
 - Fix function name in a comment in ccu_mmc_timing.c

* tag 'sunxi-clk-for-6.6-1' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux:
  clk: sunxi-ng: Modify mismatched function name
  clk: sunxi: sun9i-mmc: Use devm_platform_get_and_ioremap_resource()
parents 06c2afb8 075d9ca5

drivers/clk/sunxi-ng/ccu_mmc_timing.c

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ int sunxi_ccu_set_mmc_timing_mode(struct clk *clk, bool new_mode) 
EXPORT_SYMBOL_GPL(sunxi_ccu_set_mmc_timing_mode);



/**

 * sunxi_ccu_set_mmc_timing_mode: Get the current MMC clock timing mode

 * sunxi_ccu_get_mmc_timing_mode: Get the current MMC clock timing mode

 * @clk: clock to query

 *

 * Return: %0 if the clock is in old timing mode, > %0 if it is in

drivers/clk/sunxi/clk-sun9i-mmc.c

+4 −6
Original line number Diff line number Diff line
@@ -108,15 +108,13 @@ static int sun9i_a80_mmc_config_clk_probe(struct platform_device *pdev) 


	spin_lock_init(&data->lock);



	r = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	if (!r)

		return -EINVAL;

	/* one clock/reset pair per word */

	count = DIV_ROUND_UP((resource_size(r)), SUN9I_MMC_WIDTH);

	data->membase = devm_ioremap_resource(&pdev->dev, r);

	data->membase = devm_platform_get_and_ioremap_resource(pdev, 0, &r);

	if (IS_ERR(data->membase))

		return PTR_ERR(data->membase);



	/* one clock/reset pair per word */

	count = DIV_ROUND_UP((resource_size(r)), SUN9I_MMC_WIDTH);



	clk_data = &data->clk_data;

	clk_data->clk_num = count;

	clk_data->clks = devm_kcalloc(&pdev->dev, count, sizeof(struct clk *),