From: John Crispin <john@openwrt.org>
Date: Sat, 12 Nov 2011 23:40:07 +0000 (+0000)
Subject: lantiq: split compat headers out of bsp header patch
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=d84b7596d910352dd45f4665d60b487c03fdc175;p=openwrt%2Fstaging%2Flinusw.git

lantiq: split compat headers out of bsp header patch

SVN-Revision: 29001
---

diff --git a/target/linux/lantiq/patches/100-falcon_bsp_header.patch b/target/linux/lantiq/patches/100-falcon_bsp_header.patch
index 4e8ce08365..61105504c0 100644
--- a/target/linux/lantiq/patches/100-falcon_bsp_header.patch
+++ b/target/linux/lantiq/patches/100-falcon_bsp_header.patch
@@ -12048,51 +12048,6 @@
 +
 +#endif /* _sys_gpe_reg_h */
 --- /dev/null
-+++ b/arch/mips/include/asm/mach-lantiq/falcon/sysctrl.h
-@@ -0,0 +1,42 @@
-+/*
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License as
-+ * published by the Free Software Foundation; either version 2 of
-+ * the License, or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ * MA 02111-1307 USA
-+ *
-+ * Copyright (C) 2010 Thomas Langer, Lantiq Deutschland
-+ */
-+
-+#ifndef __FALCON_SYSCTRL_H
-+#define __FALCON_SYSCTRL_H
-+
-+extern void sys1_hw_activate(u32 mask);
-+extern void sys1_hw_deactivate(u32 mask);
-+extern void sys1_hw_clk_enable(u32 mask);
-+extern void sys1_hw_clk_disable(u32 mask);
-+extern void sys1_hw_activate_or_reboot(u32 mask);
-+
-+extern void sys_eth_hw_activate(u32 mask);
-+extern void sys_eth_hw_deactivate(u32 mask);
-+extern void sys_eth_hw_clk_enable(u32 mask);
-+extern void sys_eth_hw_clk_disable(u32 mask);
-+extern void sys_eth_hw_activate_or_reboot(u32 mask);
-+
-+extern void sys_gpe_hw_activate(u32 mask);
-+extern void sys_gpe_hw_deactivate(u32 mask);
-+extern void sys_gpe_hw_clk_enable(u32 mask);
-+extern void sys_gpe_hw_clk_disable(u32 mask);
-+extern void sys_gpe_hw_activate_or_reboot(u32 mask);
-+extern int sys_gpe_hw_is_activated(u32 mask);
-+
-+#endif /* __FALCON_SYSCTRL_H */
---- /dev/null
 +++ b/arch/mips/include/asm/mach-lantiq/falcon/cpu-feature-overrides.h
 @@ -0,0 +1,58 @@
 +/*
diff --git a/target/linux/lantiq/patches/110-sdk-compat.patch b/target/linux/lantiq/patches/110-sdk-compat.patch
new file mode 100644
index 0000000000..53f1a602a2
--- /dev/null
+++ b/target/linux/lantiq/patches/110-sdk-compat.patch
@@ -0,0 +1,65 @@
+Index: linux-3.1/arch/mips/include/asm/mach-lantiq/falcon/sysctrl.h
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.1/arch/mips/include/asm/mach-lantiq/falcon/sysctrl.h	2011-11-13 00:18:10.316010867 +0100
+@@ -0,0 +1,60 @@
++/*
++ * This program is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU General Public License as
++ * published by the Free Software Foundation; either version 2 of
++ * the License, or (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++ * MA 02111-1307 USA
++ *
++ * Copyright (C) 2010 Thomas Langer, Lantiq Deutschland
++ */
++
++#ifndef __FALCON_SYSCTRL_H
++#define __FALCON_SYSCTRL_H
++
++#include <falcon/lantiq_soc.h>
++
++static inline void sys1_hw_activate(u32 mask)
++{ ltq_sysctl_activate(SYSCTL_SYS1, mask); }
++static inline void sys1_hw_deactivate(u32 mask)
++{ ltq_sysctl_deactivate(SYSCTL_SYS1, mask); }
++static inline void sys1_hw_clk_enable(u32 mask)
++{ ltq_sysctl_clken(SYSCTL_SYS1, mask); }
++static inline void sys1_hw_clk_disable(u32 mask)
++{ ltq_sysctl_clkdis(SYSCTL_SYS1, mask); }
++static inline void sys1_hw_activate_or_reboot(u32 mask)
++{ ltq_sysctl_reboot(SYSCTL_SYS1, mask); }
++
++static inline void sys_eth_hw_activate(u32 mask)
++{ ltq_sysctl_activate(SYSCTL_SYSETH, mask); }
++static inline void sys_eth_hw_deactivate(u32 mask)
++{ ltq_sysctl_deactivate(SYSCTL_SYSETH, mask); }
++static inline void sys_eth_hw_clk_enable(u32 mask)
++{ ltq_sysctl_clken(SYSCTL_SYSETH, mask); }
++static inline void sys_eth_hw_clk_disable(u32 mask)
++{ ltq_sysctl_clkdis(SYSCTL_SYSETH, mask); }
++static inline void sys_eth_hw_activate_or_reboot(u32 mask)
++{ ltq_sysctl_reboot(SYSCTL_SYSETH, mask); }
++
++static inline void sys_gpe_hw_activate(u32 mask)
++{ ltq_sysctl_activate(SYSCTL_SYSGPE, mask); }
++static inline void sys_gpe_hw_deactivate(u32 mask)
++{ ltq_sysctl_deactivate(SYSCTL_SYSGPE, mask); }
++static inline void sys_gpe_hw_clk_enable(u32 mask)
++{ ltq_sysctl_clken(SYSCTL_SYSGPE, mask); }
++static inline void sys_gpe_hw_clk_disable(u32 mask)
++{ ltq_sysctl_clkdis(SYSCTL_SYSGPE, mask); }
++static inline void sys_gpe_hw_activate_or_reboot(u32 mask)
++{ ltq_sysctl_reboot(SYSCTL_SYSGPE, mask); }
++static inline int sys_gpe_hw_is_activated(u32 mask)
++{ return 1; }
++
++#endif /* __FALCON_SYSCTRL_H */
diff --git a/target/linux/lantiq/patches/850-falcon-sysctrl-compatibility.patch b/target/linux/lantiq/patches/850-falcon-sysctrl-compatibility.patch
deleted file mode 100644
index 4f54a9b500..0000000000
--- a/target/linux/lantiq/patches/850-falcon-sysctrl-compatibility.patch
+++ /dev/null
@@ -1,60 +0,0 @@
---- a/arch/mips/include/asm/mach-lantiq/falcon/sysctrl.h
-+++ b/arch/mips/include/asm/mach-lantiq/falcon/sysctrl.h
-@@ -20,23 +20,41 @@
- #ifndef __FALCON_SYSCTRL_H
- #define __FALCON_SYSCTRL_H
- 
--extern void sys1_hw_activate(u32 mask);
--extern void sys1_hw_deactivate(u32 mask);
--extern void sys1_hw_clk_enable(u32 mask);
--extern void sys1_hw_clk_disable(u32 mask);
--extern void sys1_hw_activate_or_reboot(u32 mask);
-+#include <falcon/lantiq_soc.h>
- 
--extern void sys_eth_hw_activate(u32 mask);
--extern void sys_eth_hw_deactivate(u32 mask);
--extern void sys_eth_hw_clk_enable(u32 mask);
--extern void sys_eth_hw_clk_disable(u32 mask);
--extern void sys_eth_hw_activate_or_reboot(u32 mask);
-+static inline void sys1_hw_activate(u32 mask)
-+{ ltq_sysctl_activate(SYSCTL_SYS1, mask); }
-+static inline void sys1_hw_deactivate(u32 mask)
-+{ ltq_sysctl_deactivate(SYSCTL_SYS1, mask); }
-+static inline void sys1_hw_clk_enable(u32 mask)
-+{ ltq_sysctl_clken(SYSCTL_SYS1, mask); }
-+static inline void sys1_hw_clk_disable(u32 mask)
-+{ ltq_sysctl_clkdis(SYSCTL_SYS1, mask); }
-+static inline void sys1_hw_activate_or_reboot(u32 mask)
-+{ ltq_sysctl_reboot(SYSCTL_SYS1, mask); }
- 
--extern void sys_gpe_hw_activate(u32 mask);
--extern void sys_gpe_hw_deactivate(u32 mask);
--extern void sys_gpe_hw_clk_enable(u32 mask);
--extern void sys_gpe_hw_clk_disable(u32 mask);
--extern void sys_gpe_hw_activate_or_reboot(u32 mask);
--extern int sys_gpe_hw_is_activated(u32 mask);
-+static inline void sys_eth_hw_activate(u32 mask)
-+{ ltq_sysctl_activate(SYSCTL_SYSETH, mask); }
-+static inline void sys_eth_hw_deactivate(u32 mask)
-+{ ltq_sysctl_deactivate(SYSCTL_SYSETH, mask); }
-+static inline void sys_eth_hw_clk_enable(u32 mask)
-+{ ltq_sysctl_clken(SYSCTL_SYSETH, mask); }
-+static inline void sys_eth_hw_clk_disable(u32 mask)
-+{ ltq_sysctl_clkdis(SYSCTL_SYSETH, mask); }
-+static inline void sys_eth_hw_activate_or_reboot(u32 mask)
-+{ ltq_sysctl_reboot(SYSCTL_SYSETH, mask); }
-+
-+static inline void sys_gpe_hw_activate(u32 mask)
-+{ ltq_sysctl_activate(SYSCTL_SYSGPE, mask); }
-+static inline void sys_gpe_hw_deactivate(u32 mask)
-+{ ltq_sysctl_deactivate(SYSCTL_SYSGPE, mask); }
-+static inline void sys_gpe_hw_clk_enable(u32 mask)
-+{ ltq_sysctl_clken(SYSCTL_SYSGPE, mask); }
-+static inline void sys_gpe_hw_clk_disable(u32 mask)
-+{ ltq_sysctl_clkdis(SYSCTL_SYSGPE, mask); }
-+static inline void sys_gpe_hw_activate_or_reboot(u32 mask)
-+{ ltq_sysctl_reboot(SYSCTL_SYSGPE, mask); }
-+static inline int sys_gpe_hw_is_activated(u32 mask)
-+{ return 1; }
- 
- #endif /* __FALCON_SYSCTRL_H */