[source] lantiq: fix 0008-MIPS-lantiq-backport-old-timer-code.patch for Amazon-SE

[LEDE Commits]

hauke pushed a commit to source.git, branch master:
https://git.lede-project.org/e097eb27af4dcee394c13fbfc06e0bd51d4598ff

commit e097eb27af4dcee394c13fbfc06e0bd51d4598ff
Author: Tino Reichardt <milky-lede at mcmilk.de>
AuthorDate: Sun May 7 19:30:36 2017 +0200

    lantiq: fix 0008-MIPS-lantiq-backport-old-timer-code.patch for Amazon-SE
    
    The patch 0008 removes the vanilla kernel gptu.c of lantiq.
    But the replacement file timer.c does not work Amazon-SE and
    is also protected therefore with an CONFIG_SOC_AMAZON_SE :-)
    
    This commit will re-activate the default vanilla kernel code
    in gptu.c for Amazon-SE.
    
    Signed-off-by: Tino Reichardt <milky-lede at mcmilk.de>
    [refresh patches and add same change for kernel 4.9]
    Signed-off-by: Hauke Mehrtens <hauke at hauke-m.de>
---
 .../patches-4.4/0008-MIPS-lantiq-backport-old-timer-code.patch | 10 ++++++++--
 .../0035-owrt-lantiq-wifi-and-ethernet-eeprom-handling.patch   |  2 +-
 .../patches-4.9/0008-MIPS-lantiq-backport-old-timer-code.patch | 10 ++++++++--
 .../0035-owrt-lantiq-wifi-and-ethernet-eeprom-handling.patch   |  2 +-
 4 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/target/linux/lantiq/patches-4.4/0008-MIPS-lantiq-backport-old-timer-code.patch b/target/linux/lantiq/patches-4.4/0008-MIPS-lantiq-backport-old-timer-code.patch
index f36a79a..335a1e2 100644
--- a/target/linux/lantiq/patches-4.4/0008-MIPS-lantiq-backport-old-timer-code.patch
+++ b/target/linux/lantiq/patches-4.4/0008-MIPS-lantiq-backport-old-timer-code.patch
@@ -172,9 +172,15 @@ Signed-off-by: John Crispin <blogic at openwrt.org>
 +#endif /* __DANUBE_GPTU_DEV_H__2005_07_26__10_19__ */
 --- a/arch/mips/lantiq/xway/Makefile
 +++ b/arch/mips/lantiq/xway/Makefile
-@@ -1,4 +1,4 @@
+@@ -1,4 +1,10 @@
 -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
++obj-y := prom.o sysctrl.o clk.o reset.o dma.o dcdc.o
++
++ifdef CONFIG_SOC_AMAZON_SE
++obj-y += gptu.o
++else
++obj-y += timer.o
++endif
  
  obj-y += vmmc.o
  
diff --git a/target/linux/lantiq/patches-4.4/0035-owrt-lantiq-wifi-and-ethernet-eeprom-handling.patch b/target/linux/lantiq/patches-4.4/0035-owrt-lantiq-wifi-and-ethernet-eeprom-handling.patch
index 15ecdb3..64060eb 100644
--- a/target/linux/lantiq/patches-4.4/0035-owrt-lantiq-wifi-and-ethernet-eeprom-handling.patch
+++ b/target/linux/lantiq/patches-4.4/0035-owrt-lantiq-wifi-and-ethernet-eeprom-handling.patch
@@ -27,7 +27,7 @@ Signed-off-by: John Crispin <blogic at openwrt.org>
  #endif /* _LTQ_XWAY_H__ */
 --- a/arch/mips/lantiq/xway/Makefile
 +++ b/arch/mips/lantiq/xway/Makefile
-@@ -2,4 +2,7 @@ obj-y := prom.o sysctrl.o clk.o reset.o
+@@ -8,4 +8,7 @@ endif
  
  obj-y += vmmc.o
  
diff --git a/target/linux/lantiq/patches-4.9/0008-MIPS-lantiq-backport-old-timer-code.patch b/target/linux/lantiq/patches-4.9/0008-MIPS-lantiq-backport-old-timer-code.patch
index f36a79a..335a1e2 100644
--- a/target/linux/lantiq/patches-4.9/0008-MIPS-lantiq-backport-old-timer-code.patch
+++ b/target/linux/lantiq/patches-4.9/0008-MIPS-lantiq-backport-old-timer-code.patch
@@ -172,9 +172,15 @@ Signed-off-by: John Crispin <blogic at openwrt.org>
 +#endif /* __DANUBE_GPTU_DEV_H__2005_07_26__10_19__ */
 --- a/arch/mips/lantiq/xway/Makefile
 +++ b/arch/mips/lantiq/xway/Makefile
-@@ -1,4 +1,4 @@
+@@ -1,4 +1,10 @@
 -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
++obj-y := prom.o sysctrl.o clk.o reset.o dma.o dcdc.o
++
++ifdef CONFIG_SOC_AMAZON_SE
++obj-y += gptu.o
++else
++obj-y += timer.o
++endif
  
  obj-y += vmmc.o
  
diff --git a/target/linux/lantiq/patches-4.9/0035-owrt-lantiq-wifi-and-ethernet-eeprom-handling.patch b/target/linux/lantiq/patches-4.9/0035-owrt-lantiq-wifi-and-ethernet-eeprom-handling.patch
index d875c55..cef4c1e 100644
--- a/target/linux/lantiq/patches-4.9/0035-owrt-lantiq-wifi-and-ethernet-eeprom-handling.patch
+++ b/target/linux/lantiq/patches-4.9/0035-owrt-lantiq-wifi-and-ethernet-eeprom-handling.patch
@@ -27,7 +27,7 @@ Signed-off-by: John Crispin <blogic at openwrt.org>
  #endif /* _LTQ_XWAY_H__ */
 --- a/arch/mips/lantiq/xway/Makefile
 +++ b/arch/mips/lantiq/xway/Makefile
-@@ -2,4 +2,7 @@ obj-y := prom.o sysctrl.o clk.o reset.o
+@@ -8,4 +8,7 @@ endif
  
  obj-y += vmmc.o