Commit b1da66d2 authored by Stephen Boyd's avatar Stephen Boyd
Browse files

Merge tag 'samsung-clk-6.11' of... 

Merge tag 'samsung-clk-6.11' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into clk-samsung

Pull Samsung SoC clk drivers updates from Krzysztof Kozlowski:

 - exynos-clkout: Remove usage of of_device_id table as .of_match_table,
   because the driver is instantiated as MFD cell, not as standalone
   platform driver.  Populated .of_match_table confused people few times
   to convert the code to device_get_match_data(), which broke the
   driver.
 - Mark one of UFS clocks as critical, because having it off stops the
   system from shutdown
 - Use kmemdup_array() when applicable

* tag 'samsung-clk-6.11' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux:
  clk: samsung: gs101: mark gout_hsi2_ufs_embd_i_clk_unipro as critical
  clk: samsung: Switch to use kmemdup_array()
  clk: samsung: exynos-clkout: Remove misleading of_match_table/MODULE_DEVICE_TABLE
parents 1613e604 e61f400d

drivers/clk/samsung/clk-cpu.c

+2 −2
Original line number Diff line number Diff line
@@ -689,7 +689,7 @@ static int __init exynos_register_cpu_clock(struct samsung_clk_provider *ctx, 
	for (num_cfgs = 0; clk_data->cfg[num_cfgs].prate != 0; )

		num_cfgs++;



	cpuclk->cfg = kmemdup(clk_data->cfg, sizeof(*clk_data->cfg) * num_cfgs,

	cpuclk->cfg = kmemdup_array(clk_data->cfg, num_cfgs, sizeof(*cpuclk->cfg),

				    GFP_KERNEL);

	if (!cpuclk->cfg) {

		ret = -ENOMEM;

drivers/clk/samsung/clk-exynos-clkout.c

+4 −3
Original line number Diff line number Diff line
@@ -17,6 +17,8 @@ 
#include <linux/platform_device.h>

#include <linux/pm.h>



#define DRV_NAME			"exynos-clkout"



#define EXYNOS_CLKOUT_NR_CLKS		1

#define EXYNOS_CLKOUT_PARENTS		32
@@ -75,7 +77,6 @@ static const struct of_device_id exynos_clkout_ids[] = { 
		.data = &exynos_clkout_exynos5,

	}, { }

};

MODULE_DEVICE_TABLE(of, exynos_clkout_ids);



/*

 * Device will be instantiated as child of PMU device without its own
@@ -236,8 +237,7 @@ static SIMPLE_DEV_PM_OPS(exynos_clkout_pm_ops, exynos_clkout_suspend, 


static struct platform_driver exynos_clkout_driver = {

	.driver = {

		.name = "exynos-clkout",

		.of_match_table = exynos_clkout_ids,

		.name = DRV_NAME,

		.pm = &exynos_clkout_pm_ops,

	},

	.probe = exynos_clkout_probe,
@@ -248,4 +248,5 @@ module_platform_driver(exynos_clkout_driver); 
MODULE_AUTHOR("Krzysztof Kozlowski <krzk@kernel.org>");

MODULE_AUTHOR("Tomasz Figa <tomasz.figa@gmail.com>");

MODULE_DESCRIPTION("Samsung Exynos clock output driver");

MODULE_ALIAS("platform:" DRV_NAME);

MODULE_LICENSE("GPL");

drivers/clk/samsung/clk-gs101.c

+1 −1
Original line number Diff line number Diff line
@@ -2846,7 +2846,7 @@ static const struct samsung_gate_clock hsi2_gate_clks[] __initconst = { 
	GATE(CLK_GOUT_HSI2_UFS_EMBD_I_CLK_UNIPRO,

	     "gout_hsi2_ufs_embd_i_clk_unipro", "mout_hsi2_ufs_embd_user",

	     CLK_CON_GAT_GOUT_BLK_HSI2_UID_UFS_EMBD_IPCLKPORT_I_CLK_UNIPRO,

	     21, 0, 0),

	     21, CLK_IS_CRITICAL, 0),

	GATE(CLK_GOUT_HSI2_UFS_EMBD_I_FMP_CLK,

	     "gout_hsi2_ufs_embd_i_fmp_clk", "mout_hsi2_bus_user",

	     CLK_CON_GAT_GOUT_BLK_HSI2_UID_UFS_EMBD_IPCLKPORT_I_FMP_CLK,

drivers/clk/samsung/clk-pll.c

+4 −4
Original line number Diff line number Diff line
@@ -1286,9 +1286,9 @@ static void __init _samsung_clk_register_pll(struct samsung_clk_provider *ctx, 
			len++;



		pll->rate_count = len;

		pll->rate_table = kmemdup(pll_clk->rate_table,

					pll->rate_count *

					sizeof(struct samsung_pll_rate_table),

		pll->rate_table = kmemdup_array(pll_clk->rate_table,

						pll->rate_count,

						sizeof(*pll->rate_table),

						GFP_KERNEL);

		WARN(!pll->rate_table,

			"%s: could not allocate rate table for %s\n",