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

Commit b02cba86 authored by Dmitry Eremin-Solenikov's avatar Dmitry Eremin-Solenikov Committed by Russell King
Browse files

ARM: 8246/2: pcmcia: sa1111: provide device clock 



Both pxa2xx (long ago) and sa1100 (now) make use of clock device to get
the cpu speed. Make sa1111 glue code provide clock to platform layer.

Signed-off-by: default avatarDmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 0821c3bc

drivers/pcmcia/sa1111_generic.c

+7 −0
Original line number Original line Diff line number Diff line
@@ -145,6 +145,12 @@ int sa1111_pcmcia_add(struct sa1111_dev *dev, struct pcmcia_low_level *ops, 
			return -ENOMEM;

			return -ENOMEM;





		s->soc.nr = ops->first + i;

		s->soc.nr = ops->first + i;

		s->soc.clk = clk_get(&dev->dev, NULL);

		if (IS_ERR(s->soc.clk)) {

			ret = PTR_ERR(s->soc.clk);

			kfree(s);

			return ret;

		}

		soc_pcmcia_init_one(&s->soc, ops, &dev->dev);

		soc_pcmcia_init_one(&s->soc, ops, &dev->dev);

		s->dev = dev;

		s->dev = dev;

		if (s->soc.nr) {

		if (s->soc.nr) {
@@ -220,6 +226,7 @@ static int pcmcia_remove(struct sa1111_dev *dev) 
	for (; s; s = next) {

	for (; s; s = next) {

		next = s->next;

		next = s->next;

		soc_pcmcia_remove_one(&s->soc);

		soc_pcmcia_remove_one(&s->soc);

		clk_put(s->soc.clk);

		kfree(s);

		kfree(s);

	}

	}