upgrade 3.13 targets to 3.13.2, refresh patches

[openwrt/svn-archive/archive.git] / target / linux / sunxi / patches-3.13 / 145-clksrc-add-hstimer.patch

diff --git a/target/linux/sunxi/patches-3.13/145-clksrc-add-hstimer.patch b/target/linux/sunxi/patches-3.13/145-clksrc-add-hstimer.patch
index db54eb8f8b64dd968a1044553d40205b654c4577..552ef005375d2eb4ce362dd489f98a7490cabf47 100644 (file)
--- a/target/linux/sunxi/patches-3.13/145-clksrc-add-hstimer.patch
+++ b/target/linux/sunxi/patches-3.13/145-clksrc-add-hstimer.patch
@@ -30,9 +30,6 @@ Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
  create mode 100644 Documentation/devicetree/bindings/timer/allwinner,sun5i-a13-hstimer.txt
  create mode 100644 drivers/clocksource/timer-sun5i.c
 
-diff --git a/Documentation/devicetree/bindings/timer/allwinner,sun5i-a13-hstimer.txt b/Documentation/devicetree/bindings/timer/allwinner,sun5i-a13-hstimer.txt
-new file mode 100644
-index 0000000..7c26154
 --- /dev/null
 +++ b/Documentation/devicetree/bindings/timer/allwinner,sun5i-a13-hstimer.txt
 @@ -0,0 +1,22 @@
@@ -58,8 +55,6 @@ index 0000000..7c26154
 +                   <0 54 1>;
 +      clocks = <&ahb1_gates 19>;
 +};
-diff --git a/arch/arm/mach-sunxi/Kconfig b/arch/arm/mach-sunxi/Kconfig
-index e3457b9..547004c 100644
 --- a/arch/arm/mach-sunxi/Kconfig
 +++ b/arch/arm/mach-sunxi/Kconfig
 @@ -13,3 +13,4 @@ config ARCH_SUNXI
@@ -67,8 +62,6 @@ index e3457b9..547004c 100644
        select SPARSE_IRQ
        select SUN4I_TIMER
 +      select SUN5I_HSTIMER
-diff --git a/drivers/clocksource/Kconfig b/drivers/clocksource/Kconfig
-index 634c4d6..cd6950f 100644
 --- a/drivers/clocksource/Kconfig
 +++ b/drivers/clocksource/Kconfig
 @@ -37,6 +37,10 @@ config SUN4I_TIMER
@@ -82,11 +75,9 @@ index 634c4d6..cd6950f 100644
  config VT8500_TIMER
        bool
  
-diff --git a/drivers/clocksource/Makefile b/drivers/clocksource/Makefile
-index 33621ef..358358d 100644
 --- a/drivers/clocksource/Makefile
 +++ b/drivers/clocksource/Makefile
-@@ -22,6 +22,7 @@ obj-$(CONFIG_ARCH_MOXART)    += moxart_timer.o
+@@ -22,6 +22,7 @@ obj-$(CONFIG_ARCH_MOXART)    += moxart_time
  obj-$(CONFIG_ARCH_MXS)                += mxs_timer.o
  obj-$(CONFIG_ARCH_PRIMA2)     += timer-prima2.o
  obj-$(CONFIG_SUN4I_TIMER)     += sun4i_timer.o
@@ -94,9 +85,6 @@ index 33621ef..358358d 100644
  obj-$(CONFIG_ARCH_TEGRA)      += tegra20_timer.o
  obj-$(CONFIG_VT8500_TIMER)    += vt8500_timer.o
  obj-$(CONFIG_ARCH_NSPIRE)     += zevio-timer.o
-diff --git a/drivers/clocksource/timer-sun5i.c b/drivers/clocksource/timer-sun5i.c
-new file mode 100644
-index 0000000..bddc522
 --- /dev/null
 +++ b/drivers/clocksource/timer-sun5i.c
 @@ -0,0 +1,192 @@
@@ -292,6 +280,3 @@ index 0000000..bddc522
 +                     sun5i_timer_init);
 +CLOCKSOURCE_OF_DECLARE(sun7i_a20, "allwinner,sun7i-a20-hstimer",
 +                     sun5i_timer_init);
--- 
-1.8.5.1
-