[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: Russell King <rmk+kernel@arm.linux.org.uk>

1 files changed, 1 insertions, 0 deletions

diff --git a/arch/arm/mach-omap1/clock.c b/arch/arm/mach-omap1/clock.c
index d2c61390346b..7c4554317907 100644
--- a/arch/arm/mach-omap1/clock.c
+++ b/arch/arm/mach-omap1/clock.c
@@ -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),