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

Merge branches 'clk-rohm', 'clk-hisilicon', 'clk-marvell', 'clk-unused' and... 

Merge branches 'clk-rohm', 'clk-hisilicon', 'clk-marvell', 'clk-unused' and 'clk-devm-ioremap-resource' into clk-next

 - Prepare Armada 3700 for suspend to RAM by moving suspend/resume priority for PCIe
 - Drop unused variables, enums, etc. in various clk drivers
 - Convert various drivers to use devm_platform_ioremap_resource()

* clk-rohm:
  clk: bd718x7: Add MODULE_ALIAS()

* clk-hisilicon:
  clk: hisilicon: fix sparse warnings in clk-hi3660.c
  clk: hisilicon: fix sparse warnings in clk-hi3670.c

* clk-marvell:
  dt-bindings: clk: armada3700: document the PCIe clock
  dt-bindings: clk: armada3700: fix typo in SoC name
  clk: mvebu: armada-37xx-periph: change suspend/resume time
  clk: mvebu: armada-37xx-periph: add PCIe gated clock

* clk-unused:
  clk: armada-xp: remove unused code
  clk: imx: imx8mn: drop unused pll enum
  clk: ast2600: remove unused variable 'eclk_parent_names'

* clk-devm-ioremap-resource:
  clk: sprd: Change to use devm_platform_ioremap_resource()
  clk: s3c2410: use devm_platform_ioremap_resource() to simplify code
  clk: axs10x: use devm_platform_ioremap_resource() to simplify code
  clk: mediatek: mt6797: use devm_platform_ioremap_resource() to simplify code
  clk: mediatek: mt7629: use devm_platform_ioremap_resource() to simplify code
  clk: mediatek: mt7622: use devm_platform_ioremap_resource() to simplify code
  clk: mediatek: mt8183: use devm_platform_ioremap_resource() to simplify code
  clk: mediatek: mt6779: use devm_platform_ioremap_resource() to simplify code
  clk: mediatek: mt2712: use devm_platform_ioremap_resource() to simplify code
  clk: davinci: use devm_platform_ioremap_resource() to simplify code
  clk: hisilicon: use devm_platform_ioremap_resource() to simplify code
  clk: bcm2835: use devm_platform_ioremap_resource() to simplify code
parents 8ad1193e 99991571 06aeb3fb 3bdf364a 793ee798

Documentation/devicetree/bindings/clock/armada3700-periph-clock.txt

+3 −2
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ bridge. 
The peripheral clock consumer should specify the desired clock by

having the clock ID in its "clocks" phandle cell.



The following is a list of provided IDs for Armada 370 North bridge clocks:

The following is a list of provided IDs for Armada 3700 North bridge clocks:

ID	Clock name	Description

-----------------------------------

0	mmc		MMC controller
@@ -30,7 +30,7 @@ ID Clock name Description 
15	eip97		EIP 97

16	cpu		CPU



The following is a list of provided IDs for Armada 370 South bridge clocks:

The following is a list of provided IDs for Armada 3700 South bridge clocks:

ID	Clock name	Description

-----------------------------------

0	gbe-50		50 MHz parent clock for Gigabit Ethernet
@@ -46,6 +46,7 @@ ID Clock name Description 
10	sdio		SDIO

11	usb32-sub2-sys	USB 2 clock

12	usb32-ss-sys	USB 3 clock

13	pcie		PCIe controller



Required properties:

drivers/clk/axs10x/i2s_pll_clock.c

+1 −3
Original line number Diff line number Diff line
@@ -172,14 +172,12 @@ static int i2s_pll_clk_probe(struct platform_device *pdev) 
	struct clk *clk;

	struct i2s_pll_clk *pll_clk;

	struct clk_init_data init;

	struct resource *mem;



	pll_clk = devm_kzalloc(dev, sizeof(*pll_clk), GFP_KERNEL);

	if (!pll_clk)

		return -ENOMEM;



	mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	pll_clk->base = devm_ioremap_resource(dev, mem);

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

	if (IS_ERR(pll_clk->base))

		return PTR_ERR(pll_clk->base);

drivers/clk/axs10x/pll_clock.c

+2 −5
Original line number Diff line number Diff line
@@ -221,7 +221,6 @@ static int axs10x_pll_clk_probe(struct platform_device *pdev) 
	struct device *dev = &pdev->dev;

	const char *parent_name;

	struct axs10x_pll_clk *pll_clk;

	struct resource *mem;

	struct clk_init_data init = { };

	int ret;
@@ -229,13 +228,11 @@ static int axs10x_pll_clk_probe(struct platform_device *pdev) 
	if (!pll_clk)

		return -ENOMEM;



	mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	pll_clk->base = devm_ioremap_resource(dev, mem);

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

	if (IS_ERR(pll_clk->base))

		return PTR_ERR(pll_clk->base);



	mem = platform_get_resource(pdev, IORESOURCE_MEM, 1);

	pll_clk->lock = devm_ioremap_resource(dev, mem);

	pll_clk->lock = devm_platform_ioremap_resource(pdev, 1);

	if (IS_ERR(pll_clk->lock))

		return PTR_ERR(pll_clk->lock);

drivers/clk/bcm/clk-bcm2835-aux.c

+1 −3
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ static int bcm2835_aux_clk_probe(struct platform_device *pdev) 
	struct clk_hw_onecell_data *onecell;

	const char *parent;

	struct clk *parent_clk;

	struct resource *res;

	void __iomem *reg, *gate;



	parent_clk = devm_clk_get(dev, NULL);
@@ -27,8 +26,7 @@ static int bcm2835_aux_clk_probe(struct platform_device *pdev) 
		return PTR_ERR(parent_clk);

	parent = __clk_get_name(parent_clk);



	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	reg = devm_ioremap_resource(dev, res);

	reg = devm_platform_ioremap_resource(pdev, 0);

	if (IS_ERR(reg))

		return PTR_ERR(reg);

drivers/clk/bcm/clk-bcm2835.c

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

	struct clk_hw **hws;

	struct bcm2835_cprman *cprman;

	struct resource *res;

	const struct bcm2835_clk_desc *desc;

	const size_t asize = ARRAY_SIZE(clk_desc_array);

	const struct cprman_plat_data *pdata;
@@ -2211,8 +2210,7 @@ static int bcm2835_clk_probe(struct platform_device *pdev) 


	spin_lock_init(&cprman->regs_lock);

	cprman->dev = dev;

	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	cprman->regs = devm_ioremap_resource(dev, res);

	cprman->regs = devm_platform_ioremap_resource(pdev, 0);

	if (IS_ERR(cprman->regs))

		return PTR_ERR(cprman->regs);

CRA Git | Maintained and supported by SUSTech CRA and CCSE