Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b1ad3796 authored by Russell King's avatar Russell King Committed by Russell King
Browse files

[ARM] omap: spi: arrange for omap_uwire to use connection ID 



... which now means no driver requests the "armxor_ck" clock directly.
Also, fix the error handling for clk_get(), ensuring that we propagate
the error returned from clk_get().

Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent cc51c9d4

arch/arm/mach-omap1/clock.c

+1 −0
Original line number Diff line number Diff line
@@ -133,6 +133,7 @@ static struct omap_clk omap_clks[] = { 
	CLK("i2c_omap.1", "fck",	&i2c_fck,	CK_16XX | CK_1510 | CK_310),

	CLK("i2c_omap.1", "ick",	&i2c_ick,	CK_16XX),

	CLK("i2c_omap.1", "ick",	&dummy_ck,	CK_1510 | CK_310),

	CLK("omap_uwire", "fck",	&armxor_ck.clk,	CK_16XX | CK_1510 | CK_310),

	CLK("omap-mcbsp.1", "ick",	&dspper_ck,	CK_16XX),

	CLK("omap-mcbsp.1", "ick",	&dummy_ck,	CK_1510 | CK_310),

	CLK("omap-mcbsp.2", "ick",	&armper_ck.clk,	CK_16XX),

drivers/spi/omap_uwire.c

+5 −4
Original line number Diff line number Diff line
@@ -506,11 +506,12 @@ static int __init uwire_probe(struct platform_device *pdev) 


	dev_set_drvdata(&pdev->dev, uwire);



	uwire->ck = clk_get(&pdev->dev, "armxor_ck");

	if (!uwire->ck || IS_ERR(uwire->ck)) {

		dev_dbg(&pdev->dev, "no mpu_xor_clk ?\n");

	uwire->ck = clk_get(&pdev->dev, "fck");

	if (IS_ERR(uwire->ck)) {

		status = PTR_ERR(uwire->ck);

		dev_dbg(&pdev->dev, "no functional clock?\n");

		spi_master_put(master);

		return -ENODEV;

		return status;

	}

	clk_enable(uwire->ck);