Root/target/linux/mpc83xx/patches-3.3/201-powerpc-add-rb_iomap.patch

1--- a/arch/powerpc/kernel/Makefile
2+++ b/arch/powerpc/kernel/Makefile
3@@ -125,9 +125,11 @@ obj-$(CONFIG_FSL_EMB_PERF_EVENT_E500) +=
4 
5 obj-$(CONFIG_8XX_MINIMAL_FPEMU) += softemu8xx.o
6 
7+ifneq ($(CONFIG_RB_IOMAP),y)
8 ifneq ($(CONFIG_PPC_INDIRECT_IO),y)
9 obj-y += iomap.o
10 endif
11+endif
12 
13 obj-$(CONFIG_PPC64) += $(obj64-y)
14 obj-$(CONFIG_PPC32) += $(obj32-y)
15--- a/arch/powerpc/platforms/83xx/Makefile
16+++ b/arch/powerpc/platforms/83xx/Makefile
17@@ -7,6 +7,7 @@ obj-$(CONFIG_MCU_MPC8349EMITX) += mcu_mp
18 obj-$(CONFIG_MPC830x_RDB) += mpc830x_rdb.o
19 obj-$(CONFIG_MPC831x_RDB) += mpc831x_rdb.o
20 obj-$(CONFIG_MPC832x_RDB) += mpc832x_rdb.o
21+obj-$(CONFIG_RB_PPC) += rbppc.o
22 obj-$(CONFIG_MPC834x_MDS) += mpc834x_mds.o
23 obj-$(CONFIG_MPC834x_ITX) += mpc834x_itx.o
24 obj-$(CONFIG_MPC836x_MDS) += mpc836x_mds.o
25--- a/arch/powerpc/platforms/Kconfig
26+++ b/arch/powerpc/platforms/Kconfig
27@@ -175,6 +175,10 @@ config PPC_INDIRECT_MMIO
28 config PPC_IO_WORKAROUNDS
29     bool
30 
31+config RB_IOMAP
32+ bool
33+ default y if RB_PPC
34+
35 source "drivers/cpufreq/Kconfig"
36 
37 menu "CPU Frequency drivers"
38--- a/arch/powerpc/sysdev/Makefile
39+++ b/arch/powerpc/sysdev/Makefile
40@@ -65,3 +65,5 @@ obj-$(CONFIG_PPC_SCOM) += scom.o
41 subdir-ccflags-$(CONFIG_PPC_WERROR) := -Werror
42 
43 obj-$(CONFIG_PPC_XICS) += xics/
44+
45+obj-$(CONFIG_RB_IOMAP) += rb_iomap.o
46--- /dev/null
47+++ b/arch/powerpc/sysdev/rb_iomap.c
48@@ -0,0 +1,204 @@
49+#include <linux/init.h>
50+#include <linux/pci.h>
51+#include <linux/mm.h>
52+#include <asm/io.h>
53+
54+#define LOCALBUS_START 0x40000000
55+#define LOCALBUS_MASK 0x007fffff
56+#define LOCALBUS_REGMASK 0x001fffff
57+
58+static void __iomem *localbus_base;
59+
60+static inline int is_localbus(void __iomem *addr)
61+{
62+ return ((unsigned) addr & ~LOCALBUS_MASK) == LOCALBUS_START;
63+}
64+
65+static inline unsigned localbus_regoff(unsigned reg) {
66+ return (reg << 16) | (((reg ^ 8) & 8) << 17);
67+}
68+
69+static inline void __iomem *localbus_addr(void __iomem *addr)
70+{
71+ return localbus_base
72+ + ((unsigned) addr & LOCALBUS_MASK & ~LOCALBUS_REGMASK)
73+ + localbus_regoff((unsigned) addr & LOCALBUS_REGMASK);
74+}
75+
76+unsigned int ioread8(void __iomem *addr)
77+{
78+ if (is_localbus(addr))
79+ return in_be16(localbus_addr(addr)) >> 8;
80+ return readb(addr);
81+}
82+EXPORT_SYMBOL(ioread8);
83+
84+unsigned int ioread16(void __iomem *addr)
85+{
86+ if (is_localbus(addr))
87+ return le16_to_cpu(in_be16(localbus_addr(addr)));
88+ return readw(addr);
89+}
90+EXPORT_SYMBOL(ioread16);
91+
92+unsigned int ioread16be(void __iomem *addr)
93+{
94+ return in_be16(addr);
95+}
96+EXPORT_SYMBOL(ioread16be);
97+
98+unsigned int ioread32(void __iomem *addr)
99+{
100+ return readl(addr);
101+}
102+EXPORT_SYMBOL(ioread32);
103+
104+unsigned int ioread32be(void __iomem *addr)
105+{
106+ return in_be32(addr);
107+}
108+EXPORT_SYMBOL(ioread32be);
109+
110+void iowrite8(u8 val, void __iomem *addr)
111+{
112+ if (is_localbus(addr))
113+ out_be16(localbus_addr(addr), ((u16) val) << 8);
114+ else
115+ writeb(val, addr);
116+}
117+EXPORT_SYMBOL(iowrite8);
118+
119+void iowrite16(u16 val, void __iomem *addr)
120+{
121+ if (is_localbus(addr))
122+ out_be16(localbus_addr(addr), cpu_to_le16(val));
123+ else
124+ writew(val, addr);
125+}
126+EXPORT_SYMBOL(iowrite16);
127+
128+void iowrite16be(u16 val, void __iomem *addr)
129+{
130+ out_be16(addr, val);
131+}
132+EXPORT_SYMBOL(iowrite16be);
133+
134+void iowrite32(u32 val, void __iomem *addr)
135+{
136+ writel(val, addr);
137+}
138+EXPORT_SYMBOL(iowrite32);
139+
140+void iowrite32be(u32 val, void __iomem *addr)
141+{
142+ out_be32(addr, val);
143+}
144+EXPORT_SYMBOL(iowrite32be);
145+
146+void ioread8_rep(void __iomem *addr, void *dst, unsigned long count)
147+{
148+ if (is_localbus(addr)) {
149+ unsigned i;
150+ void *laddr = localbus_addr(addr);
151+ u8 *buf = dst;
152+
153+ for (i = 0; i < count; ++i) {
154+ *buf++ = in_be16(laddr) >> 8;
155+ }
156+ } else {
157+ _insb((u8 __iomem *) addr, dst, count);
158+ }
159+}
160+EXPORT_SYMBOL(ioread8_rep);
161+
162+void ioread16_rep(void __iomem *addr, void *dst, unsigned long count)
163+{
164+ if (is_localbus(addr)) {
165+ unsigned i;
166+ void *laddr = localbus_addr(addr);
167+ u16 *buf = dst;
168+
169+ for (i = 0; i < count; ++i) {
170+ *buf++ = in_be16(laddr);
171+ }
172+ } else {
173+ _insw_ns((u16 __iomem *) addr, dst, count);
174+ }
175+}
176+EXPORT_SYMBOL(ioread16_rep);
177+
178+void ioread32_rep(void __iomem *addr, void *dst, unsigned long count)
179+{
180+ _insl_ns((u32 __iomem *) addr, dst, count);
181+}
182+EXPORT_SYMBOL(ioread32_rep);
183+
184+void iowrite8_rep(void __iomem *addr, const void *src, unsigned long count)
185+{
186+ if (is_localbus(addr)) {
187+ unsigned i;
188+ void *laddr = localbus_addr(addr);
189+ const u8 *buf = src;
190+
191+ for (i = 0; i < count; ++i) {
192+ out_be16(laddr, ((u16) *buf++) << 8);
193+ }
194+ } else {
195+ _outsb((u8 __iomem *) addr, src, count);
196+ }
197+}
198+EXPORT_SYMBOL(iowrite8_rep);
199+
200+void iowrite16_rep(void __iomem *addr, const void *src, unsigned long count)
201+{
202+ if (is_localbus(addr)) {
203+ unsigned i;
204+ void *laddr = localbus_addr(addr);
205+ const u16 *buf = src;
206+
207+ for (i = 0; i < count; ++i) {
208+ out_be16(laddr, *buf++);
209+ }
210+ } else {
211+ _outsw_ns((u16 __iomem *) addr, src, count);
212+ }
213+}
214+EXPORT_SYMBOL(iowrite16_rep);
215+
216+void iowrite32_rep(void __iomem *addr, const void *src, unsigned long count)
217+{
218+ _outsl_ns((u32 __iomem *) addr, src, count);
219+}
220+EXPORT_SYMBOL(iowrite32_rep);
221+
222+void __iomem *ioport_map(unsigned long port, unsigned int len)
223+{
224+ return (void __iomem *) (port + _IO_BASE);
225+}
226+EXPORT_SYMBOL(ioport_unmap);
227+
228+void ioport_unmap(void __iomem *addr)
229+{
230+ /* Nothing to do */
231+}
232+EXPORT_SYMBOL(ioport_map);
233+
234+void pci_iounmap(struct pci_dev *dev, void __iomem *addr)
235+{
236+ /* Nothing to do */
237+}
238+EXPORT_SYMBOL(pci_iounmap);
239+
240+void __iomem *localbus_map(unsigned long addr, unsigned int len)
241+{
242+ if (!localbus_base)
243+ localbus_base = ioremap(addr & ~LOCALBUS_MASK,
244+ LOCALBUS_MASK + 1);
245+ return (void *) (LOCALBUS_START + (addr & LOCALBUS_MASK));
246+}
247+EXPORT_SYMBOL(localbus_map);
248+
249+void localbus_unmap(void __iomem *addr)
250+{
251+}
252+EXPORT_SYMBOL(localbus_unmap);
253--- a/arch/powerpc/platforms/83xx/Kconfig
254+++ b/arch/powerpc/platforms/83xx/Kconfig
255@@ -44,6 +44,7 @@ config RB_PPC
256     select QUICC_ENGINE
257     select PPC_MPC832x
258     select PPC_MPC834x
259+ select RB_IOMAP
260     help
261       This option enables support for MikroTik RouterBOARD 333/600 series boards.
262 
263

Archive Download this file

Branches:
backfire
history
master
release_2010-11-17
release_2010-12-14
release_2011-02-23
release_2011-05-28
release_2011-08-27
release_2011-11-13
release_2012-03-18
release_2012-04-09
release_2012-10-11
uclibc_nptl



interactive