Commit 339bc7c0 authored by Stephen Boyd's avatar Stephen Boyd
Browse files

Merge tag 'clk-renesas-for-v5.4-tag1' of... 

Merge tag 'clk-renesas-for-v5.4-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers into clk-renesas

Pull Renesas clk driver updates from Geert Uytterhoeven:

  - Fix "always-on" Clock Domains on R-Car M1A, RZ/A1, RZ/A2, and RZ/N1

* tag 'clk-renesas-for-v5.4-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers:
  clk: renesas: cpg-mssr: Set GENPD_FLAG_ALWAYS_ON for clock domain
  clk: renesas: r9a06g032: Set GENPD_FLAG_ALWAYS_ON for clock domain
  clk: renesas: mstp: Set GENPD_FLAG_ALWAYS_ON for clock domain
  dt-bindings: clk: emev2: Rename bindings documentation file
  clk: renesas: rcar-usb2-clock-sel: Use devm_platform_ioremap_resource() helper
parents 5f9e832c f787216f

drivers/clk/renesas/clk-mstp.c

+2 −1
Original line number Diff line number Diff line
@@ -334,7 +334,8 @@ void __init cpg_mstp_add_clk_domain(struct device_node *np) 
		return;



	pd->name = np->name;

	pd->flags = GENPD_FLAG_PM_CLK | GENPD_FLAG_ACTIVE_WAKEUP;

	pd->flags = GENPD_FLAG_PM_CLK | GENPD_FLAG_ALWAYS_ON |

		    GENPD_FLAG_ACTIVE_WAKEUP;

	pd->attach_dev = cpg_mstp_attach_dev;

	pd->detach_dev = cpg_mstp_detach_dev;

	pm_genpd_init(pd, &pm_domain_always_on_gov, false);

drivers/clk/renesas/r9a06g032-clocks.c

+2 −1
Original line number Diff line number Diff line
@@ -421,7 +421,8 @@ static int r9a06g032_add_clk_domain(struct device *dev) 
		return -ENOMEM;



	pd->name = np->name;

	pd->flags = GENPD_FLAG_PM_CLK | GENPD_FLAG_ACTIVE_WAKEUP;

	pd->flags = GENPD_FLAG_PM_CLK | GENPD_FLAG_ALWAYS_ON |

		    GENPD_FLAG_ACTIVE_WAKEUP;

	pd->attach_dev = r9a06g032_attach_dev;

	pd->detach_dev = r9a06g032_detach_dev;

	pm_genpd_init(pd, &pm_domain_always_on_gov, false);

drivers/clk/renesas/rcar-usb2-clock-sel.c

+1 −3
Original line number Diff line number Diff line
@@ -117,7 +117,6 @@ static int rcar_usb2_clock_sel_probe(struct platform_device *pdev) 
	struct device *dev = &pdev->dev;

	struct device_node *np = dev->of_node;

	struct usb2_clock_sel_priv *priv;

	struct resource *res;

	struct clk *clk;

	struct clk_init_data init;
@@ -125,8 +124,7 @@ static int rcar_usb2_clock_sel_probe(struct platform_device *pdev) 
	if (!priv)

		return -ENOMEM;



	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	priv->base = devm_ioremap_resource(dev, res);

	priv->base = devm_platform_ioremap_resource(pdev, 0);

	if (IS_ERR(priv->base))

		return PTR_ERR(priv->base);

drivers/clk/renesas/renesas-cpg-mssr.c

+2 −1
Original line number Diff line number Diff line
@@ -551,7 +551,8 @@ static int __init cpg_mssr_add_clk_domain(struct device *dev, 


	genpd = &pd->genpd;

	genpd->name = np->name;

	genpd->flags = GENPD_FLAG_PM_CLK | GENPD_FLAG_ACTIVE_WAKEUP;

	genpd->flags = GENPD_FLAG_PM_CLK | GENPD_FLAG_ALWAYS_ON |

		       GENPD_FLAG_ACTIVE_WAKEUP;

	genpd->attach_dev = cpg_mssr_attach_dev;

	genpd->detach_dev = cpg_mssr_detach_dev;

	pm_genpd_init(genpd, &pm_domain_always_on_gov, false);

CRA Git | Maintained and supported by SUSTech CRA and CCSE