firewall: update to git head

[librecmc/librecmc.git] / target / linux / lantiq / patches-3.7 / 0301-gptu.patch

diff --git a/target/linux/lantiq/patches-3.7/0301-gptu.patch b/target/linux/lantiq/patches-3.7/0301-gptu.patch
index 4539d4a338c5ed664c14a358da1f2e1515344b61..4ecf12f6fd12512df8e4cae915b5a43d9d43d0bb 100644 (file)
--- a/target/linux/lantiq/patches-3.7/0301-gptu.patch
+++ b/target/linux/lantiq/patches-3.7/0301-gptu.patch
@@ -1,8 +1,8 @@
-Index: linux-3.7.1/arch/mips/lantiq/xway/timer.c
-===================================================================
---- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.7.1/arch/mips/lantiq/xway/timer.c  2012-12-18 20:47:56.625037132 +0100
-@@ -0,0 +1,841 @@
+--- /dev/null
++++ b/arch/mips/lantiq/xway/timer.c
+@@ -0,0 +1,845 @@
++#ifndef CONFIG_SOC_AMAZON_SE
++
 +#include <linux/kernel.h>
 +#include <linux/module.h>
 +#include <linux/version.h>
@@ -216,7 +216,7 @@ Index: linux-3.7.1/arch/mips/lantiq/xway/timer.c
 +
 +static inline void lq_enable_gptu(void)
 +{
-+      struct clk *clk = clk_get_sys("ltq_gptu", NULL);
++      struct clk *clk = clk_get_sys("1e100a00.gptu", NULL);
 +      clk_enable(clk);
 +
 +      //ltq_pmu_enable(PMU_GPT);
@@ -234,7 +234,7 @@ Index: linux-3.7.1/arch/mips/lantiq/xway/timer.c
 +
 +static inline void lq_disable_gptu(void)
 +{
-+      struct clk *clk = clk_get_sys("ltq_gptu", NULL);
++      struct clk *clk = clk_get_sys("1e100a00.gptu", NULL);
 +      ltq_w32(0x00, LQ_GPTU_IRNEN);
 +      ltq_w32(0xfff, LQ_GPTU_IRNCR);
 +
@@ -844,10 +844,10 @@ Index: linux-3.7.1/arch/mips/lantiq/xway/timer.c
 +
 +module_init(lq_gptu_init);
 +module_exit(lq_gptu_exit);
-Index: linux-3.7.1/arch/mips/include/asm/mach-lantiq/lantiq_timer.h
-===================================================================
---- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.7.1/arch/mips/include/asm/mach-lantiq/lantiq_timer.h       2012-12-18 20:47:56.625037132 +0100
++
++#endif
+--- /dev/null
++++ b/arch/mips/include/asm/mach-lantiq/lantiq_timer.h
 @@ -0,0 +1,155 @@
 +#ifndef __DANUBE_GPTU_DEV_H__2005_07_26__10_19__
 +#define __DANUBE_GPTU_DEV_H__2005_07_26__10_19__
@@ -1004,10 +1004,8 @@ Index: linux-3.7.1/arch/mips/include/asm/mach-lantiq/lantiq_timer.h
 +      u32 reload, unsigned long arg1, unsigned long arg2);
 +
 +#endif /* __DANUBE_GPTU_DEV_H__2005_07_26__10_19__ */
-Index: linux-3.7.1/arch/mips/lantiq/xway/Makefile
-===================================================================
---- linux-3.7.1.orig/arch/mips/lantiq/xway/Makefile    2012-12-18 20:48:40.717038183 +0100
-+++ linux-3.7.1/arch/mips/lantiq/xway/Makefile 2012-12-18 20:49:10.129038884 +0100
+--- a/arch/mips/lantiq/xway/Makefile
++++ b/arch/mips/lantiq/xway/Makefile
 @@ -1,3 +1,3 @@
 -obj-y := prom.o sysctrl.o clk.o reset.o dma.o gptu.o dcdc.o
 +obj-y := prom.o sysctrl.o clk.o reset.o dma.o timer.o dcdc.o