Commit 8bd92669 authored by Russell King's avatar Russell King
Browse files

Revert "ARM: sa1100: clean up of the clock support" 

This reverts commit edf3ff5b.

This revert is necessary to revert the broken "RTC: sa1100:
support sa1100, pxa and mmp soc families" change.
parent 90a4c0f5

arch/arm/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -754,7 +754,7 @@ config ARCH_SA1100 
	select ARCH_HAS_CPUFREQ

	select CPU_FREQ

	select GENERIC_CLOCKEVENTS

	select CLKDEV_LOOKUP

	select HAVE_CLK

	select HAVE_SCHED_CLOCK

	select TICK_ONESHOT

	select ARCH_REQUIRE_GPIOLIB

arch/arm/mach-sa1100/clock.c

+25 −66
Original line number Diff line number Diff line
@@ -11,39 +11,17 @@ 
#include <linux/clk.h>

#include <linux/spinlock.h>

#include <linux/mutex.h>

#include <linux/io.h>

#include <linux/clkdev.h>



#include <mach/hardware.h>



struct clkops {

	void			(*enable)(struct clk *);

	void			(*disable)(struct clk *);

	unsigned long		(*getrate)(struct clk *);

};



/*

 * Very simple clock implementation - we only have one clock to deal with.

 */

struct clk {

	const struct clkops	*ops;

	unsigned long		rate;

	unsigned int		enabled;

};



#define INIT_CLKREG(_clk, _devname, _conname)		\

	{						\

		.clk		= _clk,			\

		.dev_id		= _devname,		\

		.con_id		= _conname,		\

	}



#define DEFINE_CLK(_name, _ops, _rate)			\

struct clk clk_##_name = {				\

		.ops	= _ops,				\

		.rate	= _rate,			\

	}



static DEFINE_SPINLOCK(clocks_lock);



static void clk_gpio27_enable(struct clk *clk)

static void clk_gpio27_enable(void)

{

	/*

	 * First, set up the 3.6864MHz clock on GPIO 27 for the SA-1111:
@@ -54,22 +32,38 @@ static void clk_gpio27_enable(struct clk *clk) 
	TUCR = TUCR_3_6864MHz;

}



static void clk_gpio27_disable(struct clk *clk)

static void clk_gpio27_disable(void)

{

	TUCR = 0;

	GPDR &= ~GPIO_32_768kHz;

	GAFR &= ~GPIO_32_768kHz;

}



static struct clk clk_gpio27;



static DEFINE_SPINLOCK(clocks_lock);



struct clk *clk_get(struct device *dev, const char *id)

{

	const char *devname = dev_name(dev);



	return strcmp(devname, "sa1111.0") ? ERR_PTR(-ENOENT) : &clk_gpio27;

}

EXPORT_SYMBOL(clk_get);



void clk_put(struct clk *clk)

{

}

EXPORT_SYMBOL(clk_put);



int clk_enable(struct clk *clk)

{

	unsigned long flags;



	spin_lock_irqsave(&clocks_lock, flags);

	if (clk->enabled++ == 0)

		clk->ops->enable(clk);

		clk_gpio27_enable();

	spin_unlock_irqrestore(&clocks_lock, flags);



	return 0;

}

EXPORT_SYMBOL(clk_enable);
@@ -82,48 +76,13 @@ void clk_disable(struct clk *clk) 


	spin_lock_irqsave(&clocks_lock, flags);

	if (--clk->enabled == 0)

		clk->ops->disable(clk);

		clk_gpio27_disable();

	spin_unlock_irqrestore(&clocks_lock, flags);

}

EXPORT_SYMBOL(clk_disable);



unsigned long clk_get_rate(struct clk *clk)

{

	unsigned long rate;



	rate = clk->rate;

	if (clk->ops->getrate)

		rate = clk->ops->getrate(clk);



	return rate;

	return 3686400;

}

EXPORT_SYMBOL(clk_get_rate);
 


const struct clkops clk_gpio27_ops = {

	.enable		= clk_gpio27_enable,

	.disable	= clk_gpio27_disable,

};



static void clk_dummy_enable(struct clk *clk) { }

static void clk_dummy_disable(struct clk *clk) { }



const struct clkops clk_dummy_ops = {

	.enable		= clk_dummy_enable,

	.disable	= clk_dummy_disable,

};



static DEFINE_CLK(gpio27, &clk_gpio27_ops, 3686400);

static DEFINE_CLK(dummy, &clk_dummy_ops, 0);



static struct clk_lookup sa11xx_clkregs[] = {

	INIT_CLKREG(&clk_gpio27, "sa1111.0", NULL),

	INIT_CLKREG(&clk_dummy, "sa1100-rtc", NULL),

};



static int __init sa11xx_clk_init(void)

{

	clkdev_add_table(sa11xx_clkregs, ARRAY_SIZE(sa11xx_clkregs));

	return 0;

}



postcore_initcall(sa11xx_clk_init);