aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/common
diff options
context:
space:
mode:
authorIan Molton <spyro@f2s.com>2008-07-08 10:32:50 +0100
committerIan Molton <spyro@f2s.com>2008-07-10 10:28:49 +0100
commit13f7558237ed841b19f11e0920c01c4d6d50fcc5 (patch)
tree095c566671b214920479f2447bec1b9b99a2c894 /arch/arm/common
parentClocklib: Provide for GPIO 12 clock on PXA (diff)
downloadlinux-dev-13f7558237ed841b19f11e0920c01c4d6d50fcc5.tar.xz
linux-dev-13f7558237ed841b19f11e0920c01c4d6d50fcc5.zip
Clocklib: Fix SA1111 clock name mess.
This patch uses the ability of PXA's clocklib to alias clock to resolve the problem caused by sharing the SA1111 IO controller between PXA and SA1100 architectures, which have differing GPIO numbering. Signed-off-by: Ian Molton <spyro@f2s.com>
Diffstat (limited to 'arch/arm/common')
-rw-r--r--arch/arm/common/sa1111.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/common/sa1111.c b/arch/arm/common/sa1111.c
index eb06d0b2cb74..79fa71d990b5 100644
--- a/arch/arm/common/sa1111.c
+++ b/arch/arm/common/sa1111.c
@@ -627,7 +627,7 @@ __sa1111_probe(struct device *me, struct resource *mem, int irq)
if (!sachip)
return -ENOMEM;
- sachip->clk = clk_get(me, "GPIO27_CLK");
+ sachip->clk = clk_get(me, "SA1111_CLK");
if (!sachip->clk) {
ret = PTR_ERR(sachip->clk);
goto err_free;