Commit 85fb28be authored by Linus Walleij's avatar Linus Walleij
Browse files

ARM: u300: convert MMC/SD clock to device tree 



This converts the last of the U300 clocks to being probed from
the device tree.

Acked-by: default avatarMike Turquette <mturquette@linaro.org>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent bba5f2cc

Documentation/devicetree/bindings/clock/ste-u300-syscon-clock.txt

+23 −0
Original line number Diff line number Diff line
@@ -55,3 +55,26 @@ gpio: gpio@c0016000 { 
	(...)

	clocks = <&gpio_clk>;

};





Bindings for the MMC/SD card clock:



Required properties:

- compatible: must be "stericsson,u300-syscon-mclk"

- #clock-cells: must be <0>



Optional properties:

- clocks: parent clock(s)



mmc_mclk: mmc_mclk {

	#clock-cells = <0>;

	compatible = "stericsson,u300-syscon-mclk";

	clocks = <&mmc_pclk>;

};



mmcsd: mmcsd@c0001000 {

	compatible = "arm,pl18x", "arm,primecell";

	clocks = <&mmc_pclk>, <&mmc_mclk>;

	clock-names = "apb_pclk", "mclk";

	(...)

};

arch/arm/boot/dts/ste-u300.dts

+7 −2
Original line number Diff line number Diff line
@@ -205,6 +205,11 @@ mmc_pclk: mmc_p_clk@26M { 
			clock-id = <5>;

			clocks = <&fast_clk>;

		};

		mmc_mclk: mmc_mclk {

			#clock-cells = <0>;

			compatible = "stericsson,u300-syscon-mclk";

			clocks = <&mmc_pclk>;

		};

		spi_clk: spi_p_clk@26M {

			#clock-cells = <0>;

			compatible = "stericsson,u300-syscon-clk";
@@ -433,8 +438,8 @@ mmcsd: mmcsd@c0001000 { 
			reg = <0xc0001000 0x1000>;

			interrupt-parent = <&vicb>;

			interrupts = <6 7>;

			clocks = <&mmc_pclk>;

			clock-names = "apb_pclk";

			clocks = <&mmc_pclk>, <&mmc_mclk>;

			clock-names = "apb_pclk", "mclk";

			max-frequency = <24000000>;

			bus-width = <4>; // SD-card slot

			mmc-cap-mmc-highspeed;

drivers/clk/clk-u300.c

+17 −5
Original line number Diff line number Diff line
@@ -1139,6 +1139,18 @@ mclk_clk_register(struct device *dev, const char *name, 
	return clk;

}



static void __init of_u300_syscon_mclk_init(struct device_node *np)

{

	struct clk *clk = ERR_PTR(-EINVAL);

	const char *clk_name = np->name;

	const char *parent_name;



	parent_name = of_clk_get_parent_name(np, 0);

	clk = mclk_clk_register(NULL, clk_name, parent_name, false);

	if (!IS_ERR(clk))

		of_clk_add_provider(np, of_clk_src_simple_get, clk);

}



static const __initconst struct of_device_id u300_clk_match[] = {

	{

		.compatible = "fixed-clock",
@@ -1152,12 +1164,16 @@ static const __initconst struct of_device_id u300_clk_match[] = { 
		.compatible = "stericsson,u300-syscon-clk",

		.data = of_u300_syscon_clk_init,

	},

	{

		.compatible = "stericsson,u300-syscon-mclk",

		.data = of_u300_syscon_mclk_init,

	},

};





void __init u300_clk_init(void __iomem *base)

{

	u16 val;

	struct clk *clk;



	syscon_vbase = base;
@@ -1175,8 +1191,4 @@ void __init u300_clk_init(void __iomem *base) 
	writew(val, syscon_vbase + U300_SYSCON_PMCR);



	of_clk_init(u300_clk_match);



	/* Then this special MMC/SD clock */

	clk = mclk_clk_register(NULL, "mmc_clk", "mmc_p_clk", false);

	clk_register_clkdev(clk, NULL, "mmci");

}