From 3dac521a49dc1fba0484968ce0c0cb6bc406ab34 Mon Sep 17 00:00:00 2001 From: John Crispin Date: Sat, 15 Dec 2012 02:01:08 +0000 Subject: remove 3.3 and 3.6 SVN-Revision: 34699 --- ...-xway-split-ltq_reset_once-into-2-subfunc.patch | 60 ---------------------- 1 file changed, 60 deletions(-) delete mode 100644 target/linux/lantiq/patches-3.6/0104-MIPS-lantiq-xway-split-ltq_reset_once-into-2-subfunc.patch (limited to 'target/linux/lantiq/patches-3.6/0104-MIPS-lantiq-xway-split-ltq_reset_once-into-2-subfunc.patch') diff --git a/target/linux/lantiq/patches-3.6/0104-MIPS-lantiq-xway-split-ltq_reset_once-into-2-subfunc.patch b/target/linux/lantiq/patches-3.6/0104-MIPS-lantiq-xway-split-ltq_reset_once-into-2-subfunc.patch deleted file mode 100644 index 7a4c3c7e7c..0000000000 --- a/target/linux/lantiq/patches-3.6/0104-MIPS-lantiq-xway-split-ltq_reset_once-into-2-subfunc.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 8fc2eacbe332fbf6bfd09425fb141bb47d843a78 Mon Sep 17 00:00:00 2001 -From: John Crispin -Date: Mon, 22 Oct 2012 09:32:46 +0200 -Subject: [PATCH 104/113] MIPS: lantiq: xway: split ltq_reset_once into 2 - subfunctions - -We need to call the reset functions from within the phy reset code and dont -want to duplicate the access code for the reset registers. - -Signed-off-by: John Crispin ---- - arch/mips/include/asm/mach-lantiq/xway/lantiq_soc.h | 3 +++ - arch/mips/lantiq/xway/reset.c | 14 ++++++++++++-- - 2 files changed, 15 insertions(+), 2 deletions(-) - -diff --git a/arch/mips/include/asm/mach-lantiq/xway/lantiq_soc.h b/arch/mips/include/asm/mach-lantiq/xway/lantiq_soc.h -index 6a2df70..6b9f5be 100644 ---- a/arch/mips/include/asm/mach-lantiq/xway/lantiq_soc.h -+++ b/arch/mips/include/asm/mach-lantiq/xway/lantiq_soc.h -@@ -87,5 +87,8 @@ extern __iomem void *ltq_cgu_membase; - extern void ltq_pmu_enable(unsigned int module); - extern void ltq_pmu_disable(unsigned int module); - -+/* allow drivers to reset clock domains and ip cores */ -+void ltq_reset_once(unsigned int module, ulong u); -+ - #endif /* CONFIG_SOC_TYPE_XWAY */ - #endif /* _LTQ_XWAY_H__ */ -diff --git a/arch/mips/lantiq/xway/reset.c b/arch/mips/lantiq/xway/reset.c -index a89d1a3..1b77f82 100644 ---- a/arch/mips/lantiq/xway/reset.c -+++ b/arch/mips/lantiq/xway/reset.c -@@ -55,12 +55,22 @@ unsigned char ltq_boot_select(void) - return (val >> RCU_BOOT_SEL_SHIFT) & RCU_BOOT_SEL_MASK; - } - -+static void ltq_reset_enter(unsigned int module) -+{ -+ ltq_rcu_w32(ltq_rcu_r32(RCU_RST_REQ) | module, RCU_RST_REQ); -+} -+ -+static void ltq_reset_leave(unsigned int module) -+{ -+ ltq_rcu_w32(ltq_rcu_r32(RCU_RST_REQ) & ~module, RCU_RST_REQ); -+} -+ - /* reset a io domain for u micro seconds */ - void ltq_reset_once(unsigned int module, ulong u) - { -- ltq_rcu_w32(ltq_rcu_r32(RCU_RST_REQ) | module, RCU_RST_REQ); -+ ltq_reset_enter(RCU_RST_REQ); - udelay(u); -- ltq_rcu_w32(ltq_rcu_r32(RCU_RST_REQ) & ~module, RCU_RST_REQ); -+ ltq_reset_leave(RCU_RST_REQ); - } - - static void ltq_machine_restart(char *command) --- -1.7.10.4 - -- cgit v1.2.3