cleanup patches

SVN-Revision: 32953

1 files changed, 0 insertions, 285 deletions

diff --git a/target/linux/lantiq/patches-3.3/0021-MIPS-lantiq-convert-to-clkdev-api.patch b/target/linux/lantiq/patches-3.3/0021-MIPS-lantiq-convert-to-clkdev-api.patch
deleted file mode 100644
index 48ceef206c..0000000000
--- a/target/linux/lantiq/patches-3.3/0021-MIPS-lantiq-convert-to-clkdev-api.patch
+++ /dev/null
@@ -1,285 +0,0 @@
-From 69f1bf02b0c6b132140326320d26aa4e91bc3290 Mon Sep 17 00:00:00 2001
-From: John Crispin <blogic@openwrt.org>
-Date: Thu, 8 Mar 2012 08:39:06 +0100
-Subject: [PATCH 21/70] MIPS: lantiq: convert to clkdev api
-
-* Change setup from HAVE_CLK -> HAVE_MACH_CLKDEV/CLKDEV_LOOKUP
-* Add clk_activate/clk_deactivate
-* Add better error paths to the clk_*() functions
-* Change the way our static clocks are referenced
-
-Signed-off-by: John Crispin <blogic@openwrt.org>
----
- arch/mips/Kconfig                          |    3 +-
- arch/mips/include/asm/mach-lantiq/lantiq.h |   20 ++----
- arch/mips/lantiq/clk.c                     |   96 +++++++++++++++------------
- arch/mips/lantiq/clk.h                     |   52 ++++++++++++++-
- arch/mips/lantiq/prom.c                    |    1 -
- 5 files changed, 111 insertions(+), 61 deletions(-)
-
---- a/arch/mips/Kconfig
-+++ b/arch/mips/Kconfig
-@@ -228,7 +228,8 @@ config LANTIQ
- 	select ARCH_REQUIRE_GPIOLIB
- 	select SWAP_IO_SPACE
- 	select BOOT_RAW
--	select HAVE_CLK
-+	select HAVE_MACH_CLKDEV
-+	select CLKDEV_LOOKUP
- 	select HAVE_OPROFILE
- 	select MIPS_MACHINE
- 
---- a/arch/mips/include/asm/mach-lantiq/lantiq.h
-+++ b/arch/mips/include/asm/mach-lantiq/lantiq.h
-@@ -9,6 +9,7 @@
- #define _LANTIQ_H__
- 
- #include <linux/irq.h>
-+#include <linux/clk.h>
- #include <linux/ioport.h>
- 
- /* generic reg access functions */
-@@ -22,18 +23,6 @@
- extern unsigned int ltq_get_cpu_ver(void);
- extern unsigned int ltq_get_soc_type(void);
- 
--/* clock speeds */
--#define CLOCK_60M	60000000
--#define CLOCK_83M	83333333
--#define CLOCK_100M	100000000
--#define CLOCK_111M	111111111
--#define CLOCK_133M	133333333
--#define CLOCK_167M	166666667
--#define CLOCK_200M	200000000
--#define CLOCK_266M	266666666
--#define CLOCK_333M	333333333
--#define CLOCK_400M	400000000
--
- /* spinlock all ebu i/o */
- extern spinlock_t ebu_lock;
- 
-@@ -46,6 +35,13 @@ extern void ltq_disable_irq(struct irq_d
- extern void ltq_mask_and_ack_irq(struct irq_data *data);
- extern void ltq_enable_irq(struct irq_data *data);
- 
-+/* clock handling */
-+extern int clk_activate(struct clk *clk);
-+extern void clk_deactivate(struct clk *clk);
-+extern struct clk *clk_get_cpu(void);
-+extern struct clk *clk_get_fpi(void);
-+extern struct clk *clk_get_io(void);
-+
- /* find out what caused the last cpu reset */
- extern int ltq_reset_cause(void);
- 
---- a/arch/mips/lantiq/clk.c
-+++ b/arch/mips/lantiq/clk.c
-@@ -12,6 +12,7 @@
- #include <linux/kernel.h>
- #include <linux/types.h>
- #include <linux/clk.h>
-+#include <linux/clkdev.h>
- #include <linux/err.h>
- #include <linux/list.h>
- 
-@@ -24,33 +25,29 @@
- #include "clk.h"
- #include "prom.h"
- 
--struct clk {
--	const char *name;
--	unsigned long rate;
--	unsigned long (*get_rate) (void);
--};
-+/* lantiq socs have 3 static clocks */
-+static struct clk cpu_clk_generic[3];
- 
--static struct clk *cpu_clk;
--static int cpu_clk_cnt;
-+void clkdev_add_static(unsigned long cpu, unsigned long fpi, unsigned long io)
-+{
-+	cpu_clk_generic[0].rate = cpu;
-+	cpu_clk_generic[1].rate = fpi;
-+	cpu_clk_generic[2].rate = io;
-+}
- 
--/* lantiq socs have 3 static clocks */
--static struct clk cpu_clk_generic[] = {
--	{
--		.name = "cpu",
--		.get_rate = ltq_get_cpu_hz,
--	}, {
--		.name = "fpi",
--		.get_rate = ltq_get_fpi_hz,
--	}, {
--		.name = "io",
--		.get_rate = ltq_get_io_region_clock,
--	},
--};
-+struct clk *clk_get_cpu(void)
-+{
-+	return &cpu_clk_generic[0];
-+}
-+
-+struct clk *clk_get_fpi(void)
-+{
-+	return &cpu_clk_generic[1];
-+}
- 
--void clk_init(void)
-+struct clk *clk_get_io(void)
- {
--	cpu_clk = cpu_clk_generic;
--	cpu_clk_cnt = ARRAY_SIZE(cpu_clk_generic);
-+	return &cpu_clk_generic[2];
- }
- 
- static inline int clk_good(struct clk *clk)
-@@ -73,36 +70,49 @@ unsigned long clk_get_rate(struct clk *c
- }
- EXPORT_SYMBOL(clk_get_rate);
- 
--struct clk *clk_get(struct device *dev, const char *id)
-+int clk_enable(struct clk *clk)
- {
--	int i;
-+	if (unlikely(!clk_good(clk)))
-+		return -1;
- 
--	for (i = 0; i < cpu_clk_cnt; i++)
--		if (!strcmp(id, cpu_clk[i].name))
--			return &cpu_clk[i];
--	BUG();
--	return ERR_PTR(-ENOENT);
-+	if (clk->enable)
-+		return clk->enable(clk);
-+
-+	return -1;
- }
--EXPORT_SYMBOL(clk_get);
-+EXPORT_SYMBOL(clk_enable);
- 
--void clk_put(struct clk *clk)
-+void clk_disable(struct clk *clk)
- {
--	/* not used */
-+	if (unlikely(!clk_good(clk)))
-+		return;
-+
-+	if (clk->disable)
-+		clk->disable(clk);
- }
--EXPORT_SYMBOL(clk_put);
-+EXPORT_SYMBOL(clk_disable);
- 
--int clk_enable(struct clk *clk)
-+int clk_activate(struct clk *clk)
- {
--	/* not used */
--	return 0;
-+	if (unlikely(!clk_good(clk)))
-+		return -1;
-+
-+	if (clk->activate)
-+		return clk->activate(clk);
-+
-+	return -1;
- }
--EXPORT_SYMBOL(clk_enable);
-+EXPORT_SYMBOL(clk_activate);
- 
--void clk_disable(struct clk *clk)
-+void clk_deactivate(struct clk *clk)
- {
--	/* not used */
-+	if (unlikely(!clk_good(clk)))
-+		return;
-+
-+	if (clk->deactivate)
-+		clk->deactivate(clk);
- }
--EXPORT_SYMBOL(clk_disable);
-+EXPORT_SYMBOL(clk_deactivate);
- 
- static inline u32 ltq_get_counter_resolution(void)
- {
-@@ -126,7 +136,7 @@ void __init plat_time_init(void)
- 
- 	ltq_soc_init();
- 
--	clk = clk_get(0, "cpu");
-+	clk = clk_get_cpu();
- 	mips_hpt_frequency = clk_get_rate(clk) / ltq_get_counter_resolution();
- 	write_c0_compare(read_c0_count());
- 	pr_info("CPU Clock: %ldMHz\n", clk_get_rate(clk) / 1000000);
---- a/arch/mips/lantiq/clk.h
-+++ b/arch/mips/lantiq/clk.h
-@@ -9,10 +9,54 @@
- #ifndef _LTQ_CLK_H__
- #define _LTQ_CLK_H__
- 
--extern void clk_init(void);
-+#include <linux/clkdev.h>
- 
--extern unsigned long ltq_get_cpu_hz(void);
--extern unsigned long ltq_get_fpi_hz(void);
--extern unsigned long ltq_get_io_region_clock(void);
-+/* clock speeds */
-+#define CLOCK_60M	60000000
-+#define CLOCK_62_5M	62500000
-+#define CLOCK_83M	83333333
-+#define CLOCK_83_5M	83500000
-+#define CLOCK_98_304M	98304000
-+#define CLOCK_100M	100000000
-+#define CLOCK_111M	111111111
-+#define CLOCK_125M	125000000
-+#define CLOCK_133M	133333333
-+#define CLOCK_150M	150000000
-+#define CLOCK_166M	166666666
-+#define CLOCK_167M	166666667
-+#define CLOCK_196_608M	196608000
-+#define CLOCK_200M	200000000
-+#define CLOCK_250M	250000000
-+#define CLOCK_266M	266666666
-+#define CLOCK_300M	300000000
-+#define CLOCK_333M	333333333
-+#define CLOCK_393M	393215332
-+#define CLOCK_400M	400000000
-+#define CLOCK_500M	500000000
-+#define CLOCK_600M	600000000
-+
-+struct clk {
-+	struct clk_lookup cl;
-+	unsigned long rate;
-+	unsigned long (*get_rate) (void);
-+	unsigned int module;
-+	unsigned int bits;
-+	int (*enable) (struct clk *clk);
-+	void (*disable) (struct clk *clk);
-+	int (*activate) (struct clk *clk);
-+	void (*deactivate) (struct clk *clk);
-+	void (*reboot) (struct clk *clk);
-+};
-+
-+extern void clkdev_add_static(unsigned long cpu, unsigned long fpi,
-+					unsigned long io);
-+
-+extern unsigned long ltq_danube_cpu_hz(void);
-+extern unsigned long ltq_danube_fpi_hz(void);
-+extern unsigned long ltq_danube_io_region_clock(void);
-+
-+extern unsigned long ltq_vr9_cpu_hz(void);
-+extern unsigned long ltq_vr9_fpi_hz(void);
-+extern unsigned long ltq_vr9_io_region_clock(void);
- 
- #endif
---- a/arch/mips/lantiq/prom.c
-+++ b/arch/mips/lantiq/prom.c
-@@ -103,7 +103,6 @@ EXPORT_SYMBOL(ltq_remap_resource);
- void __init prom_init(void)
- {
- 	ltq_soc_detect(&soc_info);
--	clk_init();
- 	snprintf(soc_info.sys_type, LTQ_SYS_TYPE_LEN - 1, "%s rev %s",
- 		soc_info.name, soc_info.rev_type);
- 	soc_info.sys_type[LTQ_SYS_TYPE_LEN - 1] = '\0';