Unified · Split
| @@ -89,8 +89,6 @@ cciss.txt · 88 unmodified lines | ||
| 89 | 89 | - info, major/minor #'s for Compaq's SMART Array Controllers. |
| 90 | 90 | cdrom/ |
| 91 | 91 | - directory with information on the CD-ROM drivers that Linux has. |
| 92 | −cli-sti-removal.txt | |
| 93 | − - cli()/sti() removal guide. | |
| 94 | 92 | computone.txt |
| 95 | 93 | - info on Computone Intelliport II/Plus Multiport Serial Driver. |
| 96 | 94 | connector/ |
| @@ -12,7 +12,7 @@ DOCBOOKS := wanbook.xml z8530book.xml mcabook.xml videobook.xml \ · 11 unmodified lines | ||
| 12 | 12 | kernel-api.xml filesystems.xml lsm.xml usb.xml kgdb.xml \ |
| 13 | 13 | gadget.xml libata.xml mtdnand.xml librs.xml rapidio.xml \ |
| 14 | 14 | genericirq.xml s390-drivers.xml uio-howto.xml scsi.xml \ |
| 15 | − mac80211.xml debugobjects.xml | |
| 15 | + mac80211.xml debugobjects.xml sh.xml | |
| 16 | 16 | |
| 17 | 17 | ### |
| 18 | 18 | # The build process is as follows (targets): |
| @@ -102,6 +102,13 @@ C-procfs-example = procfs_example.xml · 83 unmodified lines | ||
| 102 | 102 | C-procfs-example2 = $(addprefix $(obj)/,$(C-procfs-example)) |
| 103 | 103 | $(obj)/procfs-guide.xml: $(C-procfs-example2) |
| 104 | 104 | |
| 105 | +# List of programs to build | |
| 106 | +##oops, this is a kernel module::hostprogs-y := procfs_example | |
| 107 | +obj-m += procfs_example.o | |
| 108 | + | |
| 109 | +# Tell kbuild to always build the programs | |
| 110 | +always := $(hostprogs-y) | |
| 111 | + | |
| 105 | 112 | notfoundtemplate = echo "*** You have to install docbook-utils or xmlto ***"; \ |
| 106 | 113 | exit 1 |
| 107 | 114 | db2xtemplate = db2TYPE -o $(dir $@) $< |
| @@ -189,8 +189,6 @@ static int __init init_procfs_example(void) · 188 unmodified lines | ||
| 189 | 189 | return 0; |
| 190 | 190 | |
| 191 | 191 | no_symlink: |
| 192 | − remove_proc_entry("tty", example_dir); | |
| 193 | −no_tty: | |
| 194 | 192 | remove_proc_entry("bar", example_dir); |
| 195 | 193 | no_bar: |
| 196 | 194 | remove_proc_entry("foo", example_dir); |
| @@ -206,7 +204,6 @@ out: · 9 unmodified lines | ||
| 206 | 204 | static void __exit cleanup_procfs_example(void) |
| 207 | 205 | { |
| 208 | 206 | remove_proc_entry("jiffies_too", example_dir); |
| 209 | − remove_proc_entry("tty", example_dir); | |
| 210 | 207 | remove_proc_entry("bar", example_dir); |
| 211 | 208 | remove_proc_entry("foo", example_dir); |
| 212 | 209 | remove_proc_entry("jiffies", example_dir); |
| @@ -222,3 +219,4 @@ module_exit(cleanup_procfs_example); · 9 unmodified lines | ||
| 222 | 219 | |
| 223 | 220 | MODULE_AUTHOR("Erik Mouw"); |
| 224 | 221 | MODULE_DESCRIPTION("procfs examples"); |
| 222 | +MODULE_LICENSE("GPL"); | |
| @@ -100,7 +100,7 @@ · 99 unmodified lines | ||
| 100 | 100 | the hardware structures represented here, please consult the Principles |
| 101 | 101 | of Operation. |
| 102 | 102 | </para> |
| 103 | −!Iinclude/asm-s390/cio.h | |
| 103 | +!Iarch/s390/include/asm/cio.h | |
| 104 | 104 | </sect1> |
| 105 | 105 | <sect1 id="ccwdev"> |
| 106 | 106 | <title>ccw devices</title> |
| @@ -114,7 +114,7 @@ · 7 unmodified lines | ||
| 114 | 114 | ccw device structure. Device drivers must not bypass those functions |
| 115 | 115 | or strange side effects may happen. |
| 116 | 116 | </para> |
| 117 | −!Iinclude/asm-s390/ccwdev.h | |
| 117 | +!Iarch/s390/include/asm/ccwdev.h | |
| 118 | 118 | !Edrivers/s390/cio/device.c |
| 119 | 119 | !Edrivers/s390/cio/device_ops.c |
| 120 | 120 | </sect1> |
| @@ -125,7 +125,7 @@ · 4 unmodified lines | ||
| 125 | 125 | measurement data which is made available by the channel subsystem |
| 126 | 126 | for each channel attached device. |
| 127 | 127 | </para> |
| 128 | −!Iinclude/asm-s390/cmb.h | |
| 128 | +!Iarch/s390/include/asm/cmb.h | |
| 129 | 129 | !Edrivers/s390/cio/cmf.c |
| 130 | 130 | </sect1> |
| 131 | 131 | </chapter> |
| @@ -142,7 +142,7 @@ · 10 unmodified lines | ||
| 142 | 142 | </para> |
| 143 | 143 | <sect1 id="ccwgroupdevices"> |
| 144 | 144 | <title>ccw group devices</title> |
| 145 | −!Iinclude/asm-s390/ccwgroup.h | |
| 145 | +!Iarch/s390/include/asm/ccwgroup.h | |
| 146 | 146 | !Edrivers/s390/cio/ccwgroup.c |
| 147 | 147 | </sect1> |
| 148 | 148 | </chapter> |
| @@ -0,0 +1,105 @@ | ||
| 1 | +<?xml version="1.0" encoding="UTF-8"?> | |
| 2 | +<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" | |
| 3 | + "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" []> | |
| 4 | + | |
| 5 | +<book id="sh-drivers"> | |
| 6 | + <bookinfo> | |
| 7 | + <title>SuperH Interfaces Guide</title> | |
| 8 | + | |
| 9 | + <authorgroup> | |
| 10 | + <author> | |
| 11 | + <firstname>Paul</firstname> | |
| 12 | + <surname>Mundt</surname> | |
| 13 | + <affiliation> | |
| 14 | + <address> | |
| 15 | + <email>lethal@linux-sh.org</email> | |
| 16 | + </address> | |
| 17 | + </affiliation> | |
| 18 | + </author> | |
| 19 | + </authorgroup> | |
| 20 | + | |
| 21 | + <copyright> | |
| 22 | + <year>2008</year> | |
| 23 | + <holder>Paul Mundt</holder> | |
| 24 | + </copyright> | |
| 25 | + <copyright> | |
| 26 | + <year>2008</year> | |
| 27 | + <holder>Renesas Technology Corp.</holder> | |
| 28 | + </copyright> | |
| 29 | + | |
| 30 | + <legalnotice> | |
| 31 | + <para> | |
| 32 | + This documentation is free software; you can redistribute | |
| 33 | + it and/or modify it under the terms of the GNU General Public | |
| 34 | + License version 2 as published by the Free Software Foundation. | |
| 35 | + </para> | |
| 36 | + | |
| 37 | + <para> | |
| 38 | + This program is distributed in the hope that it will be | |
| 39 | + useful, but WITHOUT ANY WARRANTY; without even the implied | |
| 40 | + warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. | |
| 41 | + See the GNU General Public License for more details. | |
| 42 | + </para> | |
| 43 | + | |
| 44 | + <para> | |
| 45 | + You should have received a copy of the GNU General Public | |
| 46 | + License along with this program; if not, write to the Free | |
| 47 | + Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, | |
| 48 | + MA 02111-1307 USA | |
| 49 | + </para> | |
| 50 | + | |
| 51 | + <para> | |
| 52 | + For more details see the file COPYING in the source | |
| 53 | + distribution of Linux. | |
| 54 | + </para> | |
| 55 | + </legalnotice> | |
| 56 | + </bookinfo> | |
| 57 | + | |
| 58 | +<toc></toc> | |
| 59 | + | |
| 60 | + <chapter id="mm"> | |
| 61 | + <title>Memory Management</title> | |
| 62 | + <sect1 id="sh4"> | |
| 63 | + <title>SH-4</title> | |
| 64 | + <sect2 id="sq"> | |
| 65 | + <title>Store Queue API</title> | |
| 66 | +!Earch/sh/kernel/cpu/sh4/sq.c | |
| 67 | + </sect2> | |
| 68 | + </sect1> | |
| 69 | + <sect1 id="sh5"> | |
| 70 | + <title>SH-5</title> | |
| 71 | + <sect2 id="tlb"> | |
| 72 | + <title>TLB Interfaces</title> | |
| 73 | +!Iarch/sh/mm/tlb-sh5.c | |
| 74 | +!Iarch/sh/include/asm/tlb_64.h | |
| 75 | + </sect2> | |
| 76 | + </sect1> | |
| 77 | + </chapter> | |
| 78 | + <chapter id="clk"> | |
| 79 | + <title>Clock Framework Extensions</title> | |
| 80 | +!Iarch/sh/include/asm/clock.h | |
| 81 | + </chapter> | |
| 82 | + <chapter id="mach"> | |
| 83 | + <title>Machine Specific Interfaces</title> | |
| 84 | + <sect1 id="dreamcast"> | |
| 85 | + <title>mach-dreamcast</title> | |
| 86 | +!Iarch/sh/boards/mach-dreamcast/rtc.c | |
| 87 | + </sect1> | |
| 88 | + <sect1 id="x3proto"> | |
| 89 | + <title>mach-x3proto</title> | |
| 90 | +!Earch/sh/boards/mach-x3proto/ilsel.c | |
| 91 | + </sect1> | |
| 92 | + </chapter> | |
| 93 | + <chapter id="busses"> | |
| 94 | + <title>Busses</title> | |
| 95 | + <sect1 id="superhyway"> | |
| 96 | + <title>SuperHyway</title> | |
| 97 | +!Edrivers/sh/superhyway/superhyway.c | |
| 98 | + </sect1> | |
| 99 | + | |
| 100 | + <sect1 id="maple"> | |
| 101 | + <title>Maple</title> | |
| 102 | +!Edrivers/sh/maple/maple.c | |
| 103 | + </sect1> | |
| 104 | + </chapter> | |
| 105 | +</book> | |
| @@ -1648,7 +1648,7 @@ static struct video_buffer capture_fb; · 1647 unmodified lines | ||
| 1648 | 1648 | |
| 1649 | 1649 | <chapter id="pubfunctions"> |
| 1650 | 1650 | <title>Public Functions Provided</title> |
| 1651 | −!Edrivers/media/video/videodev.c | |
| 1651 | +!Edrivers/media/video/v4l2-dev.c | |
| 1652 | 1652 | </chapter> |
| 1653 | 1653 | |
| 1654 | 1654 | </book> |
| @@ -69,12 +69,6 @@ · 68 unmodified lines | ||
| 69 | 69 | device to be used as both a tty interface and as a synchronous |
| 70 | 70 | controller is a project for Linux post the 2.4 release |
| 71 | 71 | </para> |
| 72 | − <para> | |
| 73 | − The support code handles most common card configurations and | |
| 74 | − supports running both Cisco HDLC and Synchronous PPP. With extra | |
| 75 | − glue the frame relay and X.25 protocols can also be used with this | |
| 76 | − driver. | |
| 77 | − </para> | |
| 78 | 72 | </chapter> |
| 79 | 73 | |
| 80 | 74 | <chapter id="Driver_Modes"> |
| @@ -179,35 +173,27 @@ · 98 unmodified lines | ||
| 179 | 173 | <para> |
| 180 | 174 | If you wish to use the network interface facilities of the driver, |
| 181 | 175 | then you need to attach a network device to each channel that is |
| 182 | − present and in use. In addition to use the SyncPPP and Cisco HDLC | |
| 176 | + present and in use. In addition to use the generic HDLC | |
| 183 | 177 | you need to follow some additional plumbing rules. They may seem |
| 184 | 178 | complex but a look at the example hostess_sv11 driver should |
| 185 | 179 | reassure you. |
| 186 | 180 | </para> |
| 187 | 181 | <para> |
| 188 | 182 | The network device used for each channel should be pointed to by |
| 189 | − the netdevice field of each channel. The dev-> priv field of the | |
| 183 | + the netdevice field of each channel. The hdlc-> priv field of the | |
| 190 | 184 | network device points to your private data - you will need to be |
| 191 | − able to find your ppp device from this. In addition to use the | |
| 192 | − sync ppp layer the private data must start with a void * pointer | |
| 193 | − to the syncppp structures. | |
| 185 | + able to find your private data from this. | |
| 194 | 186 | </para> |
| 195 | 187 | <para> |
| 196 | 188 | The way most drivers approach this particular problem is to |
| 197 | 189 | create a structure holding the Z8530 device definition and |
| 198 | − put that and the syncppp pointer into the private field of | |
| 199 | − the network device. The network device fields of the channels | |
| 200 | − then point back to the network devices. The ppp_device can also | |
| 201 | − be put in the private structure conveniently. | |
| 190 | + put that into the private field of the network device. The | |
| 191 | + network device fields of the channels then point back to the | |
| 192 | + network devices. | |
| 202 | 193 | </para> |
| 203 | 194 | <para> |
| 204 | − If you wish to use the synchronous ppp then you need to attach | |
| 205 | − the syncppp layer to the network device. You should do this before | |
| 206 | − you register the network device. The | |
| 207 | − <function>sppp_attach</function> requires that the first void * | |
| 208 | − pointer in your private data is pointing to an empty struct | |
| 209 | − ppp_device. The function fills in the initial data for the | |
| 210 | − ppp/hdlc layer. | |
| 195 | + If you wish to use the generic HDLC then you need to register | |
| 196 | + the HDLC device. | |
| 211 | 197 | </para> |
| 212 | 198 | <para> |
| 213 | 199 | Before you register your network device you will also need to |
| @@ -314,10 +300,10 @@ · 100 unmodified lines | ||
| 314 | 300 | buffer in sk_buff format and queues it for transmission. The |
| 315 | 301 | caller must provide the entire packet with the exception of the |
| 316 | 302 | bitstuffing and CRC. This is normally done by the caller via |
| 317 | − the syncppp interface layer. It returns 0 if the buffer has been | |
| 318 | − queued and non zero values for queue full. If the function accepts | |
| 319 | − the buffer it becomes property of the Z8530 layer and the caller | |
| 320 | − should not free it. | |
| 303 | + the generic HDLC interface layer. It returns 0 if the buffer has been | |
| 304 | + queued and non zero values for queue full. If the function accepts | |
| 305 | + the buffer it becomes property of the Z8530 layer and the caller | |
| 306 | + should not free it. | |
| 321 | 307 | </para> |
| 322 | 308 | <para> |
| 323 | 309 | The function <function>z8530_get_stats</function> returns a pointer |
| @@ -0,0 +1,3 @@ | ||
| 1 | +obj-m := DocBook/ accounting/ auxdisplay/ connector/ \ | |
| 2 | + filesystems/configfs/ ia64/ networking/ \ | |
| 3 | + pcmcia/ spi/ video4linux/ vm/ watchdog/src/ | |
| @@ -0,0 +1,10 @@ | ||
| 1 | +# kbuild trick to avoid linker error. Can be omitted if a module is built. | |
| 2 | +obj- := dummy.o | |
| 3 | + | |
| 4 | +# List of programs to build | |
| 5 | +hostprogs-y := getdelays | |
| 6 | + | |
| 7 | +# Tell kbuild to always build the programs | |
| 8 | +always := $(hostprogs-y) | |
| 9 | + | |
| 10 | +HOSTCFLAGS_getdelays.o += -I$(objtree)/usr/include | |
| @@ -201,13 +201,19 @@ void print_delayacct(struct taskstats *t) · 200 unmodified lines | ||
| 201 | 201 | "RECLAIM %12s%15s\n" |
| 202 | 202 | " %15llu%15llu\n", |
| 203 | 203 | "count", "real total", "virtual total", "delay total", |
| 204 | − t->cpu_count, t->cpu_run_real_total, t->cpu_run_virtual_total, | |
| 205 | − t->cpu_delay_total, | |
| 204 | + (unsigned long long)t->cpu_count, | |
| 205 | + (unsigned long long)t->cpu_run_real_total, | |
| 206 | + (unsigned long long)t->cpu_run_virtual_total, | |
| 207 | + (unsigned long long)t->cpu_delay_total, | |
| 206 | 208 | "count", "delay total", |
| 207 | − t->blkio_count, t->blkio_delay_total, | |
| 208 | − "count", "delay total", t->swapin_count, t->swapin_delay_total, | |
| 209 | + (unsigned long long)t->blkio_count, | |
| 210 | + (unsigned long long)t->blkio_delay_total, | |
| 209 | 211 | "count", "delay total", |
| 210 | − t->freepages_count, t->freepages_delay_total); | |
| 212 | + (unsigned long long)t->swapin_count, | |
| 213 | + (unsigned long long)t->swapin_delay_total, | |
| 214 | + "count", "delay total", | |
| 215 | + (unsigned long long)t->freepages_count, | |
| 216 | + (unsigned long long)t->freepages_delay_total); | |
| 211 | 217 | } |
| 212 | 218 | |
| 213 | 219 | void task_context_switch_counts(struct taskstats *t) |
| @@ -215,14 +221,17 @@ void task_context_switch_counts(struct taskstats *t) · 1 unmodified line | ||
| 215 | 221 | printf("\n\nTask %15s%15s\n" |
| 216 | 222 | " %15llu%15llu\n", |
| 217 | 223 | "voluntary", "nonvoluntary", |
| 218 | − t->nvcsw, t->nivcsw); | |
| 224 | + (unsigned long long)t->nvcsw, (unsigned long long)t->nivcsw); | |
| 219 | 225 | } |
| 220 | 226 | |
| 221 | 227 | void print_cgroupstats(struct cgroupstats *c) |
| 222 | 228 | { |
| 223 | 229 | printf("sleeping %llu, blocked %llu, running %llu, stopped %llu, " |
| 224 | − "uninterruptible %llu\n", c->nr_sleeping, c->nr_io_wait, | |
| 225 | − c->nr_running, c->nr_stopped, c->nr_uninterruptible); | |
| 230 | + "uninterruptible %llu\n", (unsigned long long)c->nr_sleeping, | |
| 231 | + (unsigned long long)c->nr_io_wait, | |
| 232 | + (unsigned long long)c->nr_running, | |
| 233 | + (unsigned long long)c->nr_stopped, | |
| 234 | + (unsigned long long)c->nr_uninterruptible); | |
| 226 | 235 | } |
| 227 | 236 | |
| 228 | 237 | |
| @@ -32,7 +32,7 @@ Linux currently supports the following features on the IXP4xx chips: · 31 unmodified lines | ||
| 32 | 32 | - Flash access (MTD/JFFS) |
| 33 | 33 | - I2C through GPIO on IXP42x |
| 34 | 34 | - GPIO for input/output/interrupts |
| 35 | − See include/asm-arm/arch-ixp4xx/platform.h for access functions. | |
| 35 | + See arch/arm/mach-ixp4xx/include/mach/platform.h for access functions. | |
| 36 | 36 | - Timers (watchdog, OS) |
| 37 | 37 | |
| 38 | 38 | The following components of the chips are not supported by Linux and |
| @@ -158,7 +158,7 @@ So, what's changed? · 157 unmodified lines | ||
| 158 | 158 | be re-checked for pending events. (see the Neponset IRQ handler for |
| 159 | 159 | details). |
| 160 | 160 | |
| 161 | −7. fixup_irq() is gone, as is include/asm-arm/arch-*/irq.h | |
| 161 | +7. fixup_irq() is gone, as is arch/arm/mach-*/include/mach/irq.h | |
| 162 | 162 | |
| 163 | 163 | Please note that this will not solve all problems - some of them are |
| 164 | 164 | hardware based. Mixing level-based and edge-based IRQs on the same |
| @@ -79,7 +79,7 @@ Machine/Platform support · 78 unmodified lines | ||
| 79 | 79 | To this end, we now have arch/arm/mach-$(MACHINE) directories which are |
| 80 | 80 | designed to house the non-driver files for a particular machine (eg, PCI, |
| 81 | 81 | memory management, architecture definitions etc). For all future |
| 82 | − machines, there should be a corresponding include/asm-arm/arch-$(MACHINE) | |
| 82 | + machines, there should be a corresponding arch/arm/mach-$(MACHINE)/include/mach | |
| 83 | 83 | directory. |
| 84 | 84 | |
| 85 | 85 | |
| @@ -176,7 +176,7 @@ Kernel entry (head.S) · 90 unmodified lines | ||
| 176 | 176 | class typically based around one or more system on a chip devices, and |
| 177 | 177 | acts as a natural container around the actual implementations. These |
| 178 | 178 | classes are given directories - arch/arm/mach-<class> and |
| 179 | − include/asm-arm/arch-<class> - which contain the source files to | |
| 179 | + arch/arm/mach-<class> - which contain the source files to/include/mach | |
| 180 | 180 | support the machine class. This directories also contain any machine |
| 181 | 181 | specific supporting code. |
| 182 | 182 | |
| @@ -13,16 +13,31 @@ Introduction · 12 unmodified lines | ||
| 13 | 13 | data-sheet/users manual to find out the complete list. |
| 14 | 14 | |
| 15 | 15 | |
| 16 | +GPIOLIB | |
| 17 | +------- | |
| 18 | + | |
| 19 | + With the event of the GPIOLIB in drivers/gpio, support for some | |
| 20 | + of the GPIO functions such as reading and writing a pin will | |
| 21 | + be removed in favour of this common access method. | |
| 22 | + | |
| 23 | + Once all the extant drivers have been converted, the functions | |
| 24 | + listed below will be removed (they may be marked as __deprecated | |
| 25 | + in the near future). | |
| 26 | + | |
| 27 | + - s3c2410_gpio_getpin | |
| 28 | + - s3c2410_gpio_setpin | |
| 29 | + | |
| 30 | + | |
| 16 | 31 | Headers |
| 17 | 32 | ------- |
| 18 | 33 | |
| 19 | − See include/asm-arm/arch-s3c2410/regs-gpio.h for the list | |
| 34 | + See arch/arm/mach-s3c2410/include/mach/regs-gpio.h for the list | |
| 20 | 35 | of GPIO pins, and the configuration values for them. This |
| 21 | − is included by using #include <asm/arch/regs-gpio.h> | |
| 36 | + is included by using #include <mach/regs-gpio.h> | |
| 22 | 37 | |
| 23 | 38 | The GPIO management functions are defined in the hardware |
| 24 | − header include/asm-arm/arch-s3c2410/hardware.h which can be | |
| 25 | − included by #include <asm/arch/hardware.h> | |
| 39 | + header arch/arm/mach-s3c2410/include/mach/hardware.h which can be | |
| 40 | + included by #include <mach/hardware.h> | |
| 26 | 41 | |
| 27 | 42 | A useful amount of documentation can be found in the hardware |
| 28 | 43 | header on how the GPIO functions (and others) work. |
| @@ -8,9 +8,10 @@ Introduction · 7 unmodified lines | ||
| 8 | 8 | |
| 9 | 9 | The Samsung S3C24XX range of ARM9 System-on-Chip CPUs are supported |
| 10 | 10 | by the 's3c2410' architecture of ARM Linux. Currently the S3C2410, |
| 11 | − S3C2412, S3C2413, S3C2440 and S3C2442 devices are supported. | |
| 11 | + S3C2412, S3C2413, S3C2440, S3C2442 and S3C2443 devices are supported. | |
| 12 | + | |
| 13 | + Support for the S3C2400 and S3C24A0 series are in progress. | |
| 12 | 14 | |
| 13 | − Support for the S3C2400 series is in progress. | |
| 14 | 15 | |
| 15 | 16 | Configuration |
| 16 | 17 | ------------- |
| @@ -36,7 +37,23 @@ Layout · 19 unmodified lines | ||
| 36 | 37 | in arch/arm/mach-s3c2410 and S3C2440 in arch/arm/mach-s3c2440 |
| 37 | 38 | |
| 38 | 39 | Register, kernel and platform data definitions are held in the |
| 39 | − include/asm-arm/arch-s3c2410 directory. | |
| 40 | + arch/arm/mach-s3c2410 directory./include/mach | |
| 41 | + | |
| 42 | +arch/arm/plat-s3c24xx: | |
| 43 | + | |
| 44 | + Files in here are either common to all the s3c24xx family, | |
| 45 | + or are common to only some of them with names to indicate this | |
| 46 | + status. The files that are not common to all are generally named | |
| 47 | + with the initial cpu they support in the series to ensure a short | |
| 48 | + name without any possibility of confusion with newer devices. | |
| 49 | + | |
| 50 | + As an example, initially s3c244x would cover s3c2440 and s3c2442, but | |
| 51 | + with the s3c2443 which does not share many of the same drivers in | |
| 52 | + this directory, the name becomes invalid. We stick to s3c2440-<x> | |
| 53 | + to indicate a driver that is s3c2440 and s3c2442 compatible. | |
| 54 | + | |
| 55 | + This does mean that to find the status of any given SoC, a number | |
| 56 | + of directories may need to be searched. | |
| 40 | 57 | |
| 41 | 58 | |
| 42 | 59 | Machines |
| @@ -159,6 +176,17 @@ NAND · 116 unmodified lines | ||
| 159 | 176 | For more information see Documentation/arm/Samsung-S3C24XX/NAND.txt |
| 160 | 177 | |
| 161 | 178 | |
| 179 | +SD/MMC | |
| 180 | +------ | |
| 181 | + | |
| 182 | + The SD/MMC hardware pre S3C2443 is supported in the current | |
| 183 | + kernel, the driver is drivers/mmc/host/s3cmci.c and supports | |
| 184 | + 1 and 4 bit SD or MMC cards. | |
| 185 | + | |
| 186 | + The SDIO behaviour of this driver has not been fully tested. There is no | |
| 187 | + current support for hardware SDIO interrupts. | |
| 188 | + | |
| 189 | + | |
| 162 | 190 | Serial |
| 163 | 191 | ------ |
| 164 | 192 | |
| @@ -178,6 +206,9 @@ GPIO · 13 unmodified lines | ||
| 178 | 206 | The core contains support for manipulating the GPIO, see the |
| 179 | 207 | documentation in GPIO.txt in the same directory as this file. |
| 180 | 208 | |
| 209 | + Newer kernels carry GPIOLIB, and support is being moved towards | |
| 210 | + this with some of the older support in line to be removed. | |
| 211 | + | |
| 181 | 212 | |
| 182 | 213 | Clock Management |
| 183 | 214 | ---------------- |
| @@ -49,7 +49,7 @@ Board Support · 48 unmodified lines | ||
| 49 | 49 | Platform Data |
| 50 | 50 | ------------- |
| 51 | 51 | |
| 52 | − See linux/include/asm-arm/arch-s3c2410/usb-control.h for the | |
| 52 | + See arch/arm/mach-s3c2410/include/mach/usb-control.h for the | |
| 53 | 53 | descriptions of the platform device data. An implementation |
| 54 | 54 | can be found in linux/arch/arm/mach-s3c2410/usb-simtec.c . |
| 55 | 55 | |
| @@ -0,0 +1,10 @@ | ||
| 1 | +# kbuild trick to avoid linker error. Can be omitted if a module is built. | |
| 2 | +obj- := dummy.o | |
| 3 | + | |
| 4 | +# List of programs to build | |
| 5 | +hostprogs-y := cfag12864b-example | |
| 6 | + | |
| 7 | +# Tell kbuild to always build the programs | |
| 8 | +always := $(hostprogs-y) | |
| 9 | + | |
| 10 | +HOSTCFLAGS_cfag12864b-example.o += -I$(objtree)/usr/include | |
| @@ -112,27 +112,18 @@ Hot plug support for SCSI tape drives · 111 unmodified lines | ||
| 112 | 112 | |
| 113 | 113 | Hot plugging of SCSI tape drives is supported, with some caveats. |
| 114 | 114 | The cciss driver must be informed that changes to the SCSI bus |
| 115 | −have been made, in addition to and prior to informing the SCSI | |
| 116 | −mid layer. This may be done via the /proc filesystem. For example: | |
| 115 | +have been made. This may be done via the /proc filesystem. | |
| 116 | +For example: | |
| 117 | 117 | |
| 118 | 118 | echo "rescan" > /proc/scsi/cciss0/1 |
| 119 | 119 | |
| 120 | −This causes the adapter to query the adapter about changes to the | |
| 121 | −physical SCSI buses and/or fibre channel arbitrated loop and the | |
| 120 | +This causes the driver to query the adapter about changes to the | |
| 121 | +physical SCSI buses and/or fibre channel arbitrated loop and the | |
| 122 | 122 | driver to make note of any new or removed sequential access devices |
| 123 | 123 | or medium changers. The driver will output messages indicating what |
| 124 | 124 | devices have been added or removed and the controller, bus, target and |
| 125 | −lun used to address the device. Once this is done, the SCSI mid layer | |
| 126 | −can be informed of changes to the virtual SCSI bus which the driver | |
| 127 | −presents to it in the usual way. For example: | |
| 128 | − | |
| 129 | − echo scsi add-single-device 3 2 1 0 > /proc/scsi/scsi | |
| 130 | − | |
| 131 | −to add a device on controller 3, bus 2, target 1, lun 0. Note that | |
| 132 | −the driver makes an effort to preserve the devices positions | |
| 133 | −in the virtual SCSI bus, so if you are only moving tape drives | |
| 134 | −around on the same adapter and not adding or removing tape drives | |
| 135 | −from the adapter, informing the SCSI mid layer may not be necessary. | |
| 125 | +lun used to address the device. It then notifies the SCSI mid layer | |
| 126 | +of these changes. | |
| 136 | 127 | |
| 137 | 128 | Note that the naming convention of the /proc filesystem entries |
| 138 | 129 | contains a number in addition to the driver name. (E.g. "cciss0" |
| @@ -1,133 +0,0 @@ | ||
| 1 | − | |
| 2 | −#### cli()/sti() removal guide, started by Ingo Molnar <mingo@redhat.com> | |
| 3 | − | |
| 4 | − | |
| 5 | −as of 2.5.28, five popular macros have been removed on SMP, and | |
| 6 | −are being phased out on UP: | |
| 7 | − | |
| 8 | − cli(), sti(), save_flags(flags), save_flags_cli(flags), restore_flags(flags) | |
| 9 | − | |
| 10 | −until now it was possible to protect driver code against interrupt | |
| 11 | −handlers via a cli(), but from now on other, more lightweight methods | |
| 12 | −have to be used for synchronization, such as spinlocks or semaphores. | |
| 13 | − | |
| 14 | −for example, driver code that used to do something like: | |
| 15 | − | |
| 16 | − struct driver_data; | |
| 17 | − | |
| 18 | − irq_handler (...) | |
| 19 | − { | |
| 20 | − .... | |
| 21 | − driver_data.finish = 1; | |
| 22 | − driver_data.new_work = 0; | |
| 23 | − .... | |
| 24 | − } | |
| 25 | − | |
| 26 | − ... | |
| 27 | − | |
| 28 | − ioctl_func (...) | |
| 29 | − { | |
| 30 | − ... | |
| 31 | − cli(); | |
| 32 | − ... | |
| 33 | − driver_data.finish = 0; | |
| 34 | − driver_data.new_work = 2; | |
| 35 | − ... | |
| 36 | − sti(); | |
| 37 | − ... | |
| 38 | − } | |
| 39 | − | |
| 40 | −was SMP-correct because the cli() function ensured that no | |
| 41 | −interrupt handler (amongst them the above irq_handler()) function | |
| 42 | −would execute while the cli()-ed section is executing. | |
| 43 | − | |
| 44 | −but from now on a more direct method of locking has to be used: | |
| 45 | − | |
| 46 | − DEFINE_SPINLOCK(driver_lock); | |
| 47 | − struct driver_data; | |
| 48 | − | |
| 49 | − irq_handler (...) | |
| 50 | − { | |
| 51 | − unsigned long flags; | |
| 52 | − .... | |
| 53 | − spin_lock_irqsave(&driver_lock, flags); | |
| 54 | − .... | |
| 55 | − driver_data.finish = 1; | |
| 56 | − driver_data.new_work = 0; | |
| 57 | − .... | |
| 58 | − spin_unlock_irqrestore(&driver_lock, flags); | |
| 59 | − .... | |
| 60 | − } | |
| 61 | − | |
| 62 | − ... | |
| 63 | − | |
| 64 | − ioctl_func (...) | |
| 65 | − { | |
| 66 | − ... | |
| 67 | − spin_lock_irq(&driver_lock); | |
| 68 | − ... | |
| 69 | − driver_data.finish = 0; | |
| 70 | − driver_data.new_work = 2; | |
| 71 | − ... | |
| 72 | − spin_unlock_irq(&driver_lock); | |
| 73 | − ... | |
| 74 | − } | |
| 75 | − | |
| 76 | −the above code has a number of advantages: | |
| 77 | − | |
| 78 | −- the locking relation is easier to understand - actual lock usage | |
| 79 | − pinpoints the critical sections. cli() usage is too opaque. | |
| 80 | − Easier to understand means it's easier to debug. | |
| 81 | − | |
| 82 | −- it's faster, because spinlocks are faster to acquire than the | |
| 83 | − potentially heavily-used IRQ lock. Furthermore, your driver does | |
| 84 | − not have to wait eg. for a big heavy SCSI interrupt to finish, | |
| 85 | − because the driver_lock spinlock is only used by your driver. | |
| 86 | − cli() on the other hand was used by many drivers, and extended | |
| 87 | − the critical section to the whole IRQ handler function - creating | |
| 88 | − serious lock contention. | |
| 89 | − | |
| 90 | − | |
| 91 | −to make the transition easier, we've still kept the cli(), sti(), | |
| 92 | −save_flags(), save_flags_cli() and restore_flags() macros defined | |
| 93 | −on UP systems - but their usage will be phased out until 2.6 is | |
| 94 | −released. | |
| 95 | − | |
| 96 | −drivers that want to disable local interrupts (interrupts on the | |
| 97 | −current CPU), can use the following five macros: | |
| 98 | − | |
| 99 | − local_irq_disable(), local_irq_enable(), local_save_flags(flags), | |
| 100 | − local_irq_save(flags), local_irq_restore(flags) | |
| 101 | − | |
| 102 | −but beware, their meaning and semantics are much simpler, far from | |
| 103 | −that of the old cli(), sti(), save_flags(flags) and restore_flags(flags) | |
| 104 | −SMP meaning: | |
| 105 | − | |
| 106 | − local_irq_disable() => turn local IRQs off | |
| 107 | − | |
| 108 | − local_irq_enable() => turn local IRQs on | |
| 109 | − | |
| 110 | − local_save_flags(flags) => save the current IRQ state into flags. The | |
| 111 | − state can be on or off. (on some | |
| 112 | − architectures there's even more bits in it.) | |
| 113 | − | |
| 114 | − local_irq_save(flags) => save the current IRQ state into flags and | |
| 115 | − disable interrupts. | |
| 116 | − | |
| 117 | − local_irq_restore(flags) => restore the IRQ state from flags. | |
| 118 | − | |
| 119 | −(local_irq_save can save both irqs on and irqs off state, and | |
| 120 | −local_irq_restore can restore into both irqs on and irqs off state.) | |
| 121 | − | |
| 122 | −another related change is that synchronize_irq() now takes a parameter: | |
| 123 | −synchronize_irq(irq). This change too has the purpose of making SMP | |
| 124 | −synchronization more lightweight - this way you can wait for your own | |
| 125 | −interrupt handler to finish, no need to wait for other IRQ sources. | |
| 126 | − | |
| 127 | − | |
| 128 | −why were these changes done? The main reason was the architectural burden | |
| 129 | −of maintaining the cli()/sti() interface - it became a real problem. The | |
| 130 | −new interrupt system is much more streamlined, easier to understand, debug, | |
| 131 | −and it's also a bit faster - the same happened to it that will happen to | |
| 132 | −cli()/sti() using drivers once they convert to spinlocks :-) | |
| 133 | − | |
| @@ -0,0 +1,11 @@ | ||
| 1 | +ifneq ($(CONFIG_CONNECTOR),) | |
| 2 | +obj-m += cn_test.o | |
| 3 | +endif | |
| 4 | + | |
| 5 | +# List of programs to build | |
| 6 | +hostprogs-y := ucon | |
| 7 | + | |
| 8 | +# Tell kbuild to always build the programs | |
| 9 | +always := $(hostprogs-y) | |
| 10 | + | |
| 11 | +HOSTCFLAGS_ucon.o += -I$(objtree)/usr/include | |
| @@ -59,15 +59,10 @@ apicid values in those tables for disabled apics. In the event BIOS doesn't · 58 unmodified lines | ||
| 59 | 59 | mark such hot-pluggable cpus as disabled entries, one could use this |
| 60 | 60 | parameter "additional_cpus=x" to represent those cpus in the cpu_possible_map. |
| 61 | 61 | |
| 62 | −s390 uses the number of cpus it detects at IPL time to also the number of bits | |
| 63 | −in cpu_possible_map. If it is desired to add additional cpus at a later time | |
| 64 | −the number should be specified using this option or the possible_cpus option. | |
| 65 | − | |
| 66 | 62 | possible_cpus=n [s390 only] use this to set hotpluggable cpus. |
| 67 | 63 | This option sets possible_cpus bits in |
| 68 | 64 | cpu_possible_map. Thus keeping the numbers of bits set |
| 69 | 65 | constant even if the machine gets rebooted. |
| 70 | − This option overrides additional_cpus. | |
| 71 | 66 | |
| 72 | 67 | CPU maps and such |
| 73 | 68 | ----------------- |
| @@ -2560,9 +2560,6 @@ Your cooperation is appreciated. · 2559 unmodified lines | ||
| 2560 | 2560 | 96 = /dev/usb/hiddev0 1st USB HID device |
| 2561 | 2561 | ... |
| 2562 | 2562 | 111 = /dev/usb/hiddev15 16th USB HID device |
| 2563 | − 112 = /dev/usb/auer0 1st auerswald ISDN device | |
| 2564 | − ... | |
| 2565 | − 127 = /dev/usb/auer15 16th auerswald ISDN device | |
| 2566 | 2563 | 128 = /dev/usb/brlvgr0 First Braille Voyager device |
| 2567 | 2564 | ... |
| 2568 | 2565 | 131 = /dev/usb/brlvgr3 Fourth Braille Voyager device |
| @@ -19,15 +19,6 @@ Who: Pavel Machek <pavel@suse.cz> · 18 unmodified lines | ||
| 19 | 19 | |
| 20 | 20 | --------------------------- |
| 21 | 21 | |
| 22 | −What: old NCR53C9x driver | |
| 23 | −When: October 2007 | |
| 24 | −Why: Replaced by the much better esp_scsi driver. Actual low-level | |
| 25 | − driver can be ported over almost trivially. | |
| 26 | −Who: David Miller <davem@davemloft.net> | |
| 27 | − Christoph Hellwig <hch@lst.de> | |
| 28 | − | |
| 29 | −--------------------------- | |
| 30 | − | |
| 31 | 22 | What: Video4Linux API 1 ioctls and video_decoder.h from Video devices. |
| 32 | 23 | When: December 2008 |
| 33 | 24 | Files: include/linux/video_decoder.h include/linux/videodev.h |
| @@ -205,19 +196,6 @@ Who: Tejun Heo <htejun@gmail.com> · 171 unmodified lines | ||
| 205 | 196 | |
| 206 | 197 | --------------------------- |
| 207 | 198 | |
| 208 | −What: The arch/ppc and include/asm-ppc directories | |
| 209 | −When: Jun 2008 | |
| 210 | −Why: The arch/powerpc tree is the merged architecture for ppc32 and ppc64 | |
| 211 | − platforms. Currently there are efforts underway to port the remaining | |
| 212 | − arch/ppc platforms to the merged tree. New submissions to the arch/ppc | |
| 213 | − tree have been frozen with the 2.6.22 kernel release and that tree will | |
| 214 | − remain in bug-fix only mode until its scheduled removal. Platforms | |
| 215 | − that are not ported by June 2008 will be removed due to the lack of an | |
| 216 | − interested maintainer. | |
| 217 | −Who: linuxppc-dev@ozlabs.org | |
| 218 | − | |
| 219 | −--------------------------- | |
| 220 | − | |
| 221 | 199 | What: i386/x86_64 bzImage symlinks |
| 222 | 200 | When: April 2010 |
| 223 | 201 | |
| @@ -0,0 +1,3 @@ | ||
| 1 | +ifneq ($(CONFIG_CONFIGFS_FS),) | |
| 2 | +obj-m += configfs_example_explicit.o configfs_example_macros.o | |
| 3 | +endif | |
| @@ -26,6 +26,12 @@ Mailing list: linux-ext4@vger.kernel.org · 25 unmodified lines | ||
| 26 | 26 | |
| 27 | 27 | git://git.kernel.org/pub/scm/fs/ext2/e2fsprogs.git |
| 28 | 28 | |
| 29 | + - Note that it is highly important to install the mke2fs.conf file | |
| 30 | + that comes with the e2fsprogs 1.41.x sources in /etc/mke2fs.conf. If | |
| 31 | + you have edited the /etc/mke2fs.conf file installed on your system, | |
| 32 | + you will need to merge your changes with the version from e2fsprogs | |
| 33 | + 1.41.x. | |
| 34 | + | |
| 29 | 35 | - Create a new filesystem using the ext4dev filesystem type: |
| 30 | 36 | |
| 31 | 37 | # mke2fs -t ext4dev /dev/hda1 |
| @@ -3,14 +3,14 @@ Quota subsystem · 2 unmodified lines | ||
| 3 | 3 | =============== |
| 4 | 4 | |
| 5 | 5 | Quota subsystem allows system administrator to set limits on used space and |
| 6 | −number of used inodes (inode is a filesystem structure which is associated | |
| 7 | −with each file or directory) for users and/or groups. For both used space and | |
| 8 | −number of used inodes there are actually two limits. The first one is called | |
| 9 | −softlimit and the second one hardlimit. An user can never exceed a hardlimit | |
| 10 | −for any resource. User is allowed to exceed softlimit but only for limited | |
| 11 | −period of time. This period is called "grace period" or "grace time". When | |
| 12 | −grace time is over, user is not able to allocate more space/inodes until he | |
| 13 | −frees enough of them to get below softlimit. | |
| 6 | +number of used inodes (inode is a filesystem structure which is associated with | |
| 7 | +each file or directory) for users and/or groups. For both used space and number | |
| 8 | +of used inodes there are actually two limits. The first one is called softlimit | |
| 9 | +and the second one hardlimit. An user can never exceed a hardlimit for any | |
| 10 | +resource (unless he has CAP_SYS_RESOURCE capability). User is allowed to exceed | |
| 11 | +softlimit but only for limited period of time. This period is called "grace | |
| 12 | +period" or "grace time". When grace time is over, user is not able to allocate | |
| 13 | +more space/inodes until he frees enough of them to get below softlimit. | |
| 14 | 14 | |
| 15 | 15 | Quota limits (and amount of grace time) are set independently for each |
| 16 | 16 | filesystem. |
| @@ -53,6 +53,12 @@ in parentheses): · 36 unmodified lines | ||
| 53 | 53 | QUOTA_NL_BSOFTLONGWARN - space (block) softlimit is exceeded |
| 54 | 54 | longer than given grace period. |
| 55 | 55 | QUOTA_NL_BSOFTWARN - space (block) softlimit |
| 56 | + - four warnings are also defined for the event when user stops | |
| 57 | + exceeding some limit: | |
| 58 | + QUOTA_NL_IHARDBELOW - inode hardlimit | |
| 59 | + QUOTA_NL_ISOFTBELOW - inode softlimit | |
| 60 | + QUOTA_NL_BHARDBELOW - space (block) hardlimit | |
| 61 | + QUOTA_NL_BSOFTBELOW - space (block) softlimit | |
| 56 | 62 | QUOTA_NL_A_DEV_MAJOR (u32) |
| 57 | 63 | - major number of a device with the affected filesystem |
| 58 | 64 | QUOTA_NL_A_DEV_MINOR (u32) |
| @@ -57,7 +57,7 @@ Similarly to JFFS2, UBIFS supports on-the-flight compression which makes · 56 unmodified lines | ||
| 57 | 57 | it possible to fit quite a lot of data to the flash. |
| 58 | 58 | |
| 59 | 59 | Similarly to JFFS2, UBIFS is tolerant of unclean reboots and power-cuts. |
| 60 | −It does not need stuff like ckfs.ext2. UBIFS automatically replays its | |
| 60 | +It does not need stuff like fsck.ext2. UBIFS automatically replays its | |
| 61 | 61 | journal and recovers from crashes, ensuring that the on-flash data |
| 62 | 62 | structures are consistent. |
| 63 | 63 | |
| @@ -10,6 +10,10 @@ Supported chips: · 9 unmodified lines | ||
| 10 | 10 | Prefix: 'sch311x' |
| 11 | 11 | Addresses scanned: none, address read from Super-I/O config space |
| 12 | 12 | Datasheet: http://www.nuhorizons.com/FeaturedProducts/Volume1/SMSC/311x.pdf |
| 13 | + * SMSC SCH5027 | |
| 14 | + Prefix: 'sch5027' | |
| 15 | + Addresses scanned: I2C 0x2c, 0x2d, 0x2e | |
| 16 | + Datasheet: Provided by SMSC upon request and under NDA | |
| 13 | 17 | |
| 14 | 18 | Authors: |
| 15 | 19 | Juerg Haefliger <juergh@gmail.com> |
| @@ -27,33 +31,31 @@ Module Parameters · 11 unmodified lines | ||
| 27 | 31 | following boards: |
| 28 | 32 | - VIA EPIA SN18000 |
| 29 | 33 | |
| 30 | −Note that there is no need to use this parameter if the driver loads without | |
| 31 | −complaining. The driver will say so if it is necessary. | |
| 32 | − | |
| 33 | 34 | |
| 34 | 35 | Description |
| 35 | 36 | ----------- |
| 36 | 37 | |
| 37 | 38 | This driver implements support for the hardware monitoring capabilities of the |
| 38 | −SMSC DME1737 and Asus A8000 (which are the same) and SMSC SCH311x Super-I/O | |
| 39 | −chips. These chips feature monitoring of 3 temp sensors temp[1-3] (2 remote | |
| 40 | −diodes and 1 internal), 7 voltages in[0-6] (6 external and 1 internal) and up | |
| 41 | −to 6 fan speeds fan[1-6]. Additionally, the chips implement up to 5 PWM | |
| 42 | −outputs pwm[1-3,5-6] for controlling fan speeds both manually and | |
| 39 | +SMSC DME1737 and Asus A8000 (which are the same), SMSC SCH5027, and SMSC | |
| 40 | +SCH311x Super-I/O chips. These chips feature monitoring of 3 temp sensors | |
| 41 | +temp[1-3] (2 remote diodes and 1 internal), 7 voltages in[0-6] (6 external and | |
| 42 | +1 internal) and up to 6 fan speeds fan[1-6]. Additionally, the chips implement | |
| 43 | +up to 5 PWM outputs pwm[1-3,5-6] for controlling fan speeds both manually and | |
| 43 | 44 | automatically. |
| 44 | 45 | |
| 45 | −For the DME1737 and A8000, fan[1-2] and pwm[1-2] are always present. Fan[3-6] | |
| 46 | −and pwm[3,5-6] are optional features and their availability depends on the | |
| 47 | −configuration of the chip. The driver will detect which features are present | |
| 48 | −during initialization and create the sysfs attributes accordingly. | |
| 46 | +For the DME1737, A8000 and SCH5027, fan[1-2] and pwm[1-2] are always present. | |
| 47 | +Fan[3-6] and pwm[3,5-6] are optional features and their availability depends on | |
| 48 | +the configuration of the chip. The driver will detect which features are | |
| 49 | +present during initialization and create the sysfs attributes accordingly. | |
| 49 | 50 | |
| 50 | 51 | For the SCH311x, fan[1-3] and pwm[1-3] are always present and fan[4-6] and |
| 51 | 52 | pwm[5-6] don't exist. |
| 52 | 53 | |
| 53 | −The hardware monitoring features of the DME1737 and A8000 are only accessible | |
| 54 | −via SMBus, while the SCH311x only provides access via the ISA bus. The driver | |
| 55 | −will therefore register itself as an I2C client driver if it detects a DME1737 | |
| 56 | −or A8000 and as a platform driver if it detects a SCH311x chip. | |
| 54 | +The hardware monitoring features of the DME1737, A8000, and SCH5027 are only | |
| 55 | +accessible via SMBus, while the SCH311x only provides access via the ISA bus. | |
| 56 | +The driver will therefore register itself as an I2C client driver if it detects | |
| 57 | +a DME1737, A8000, or SCH5027 and as a platform driver if it detects a SCH311x | |
| 58 | +chip. | |
| 57 | 59 | |
| 58 | 60 | |
| 59 | 61 | Voltage Monitoring |
| @@ -64,6 +66,7 @@ scaling resistors. The values returned by the driver therefore reflect true · 4 unmodified lines | ||
| 64 | 66 | millivolts and don't need scaling. The voltage inputs are mapped as follows |
| 65 | 67 | (the last column indicates the input ranges): |
| 66 | 68 | |
| 69 | +DME1737, A8000: | |
| 67 | 70 | in0: +5VTR (+5V standby) 0V - 6.64V |
| 68 | 71 | in1: Vccp (processor core) 0V - 3V |
| 69 | 72 | in2: VCC (internal +3.3V) 0V - 4.38V |
| @@ -72,6 +75,24 @@ millivolts and don't need scaling. The voltage inputs are mapped as follows · 2 unmodified lines | ||
| 72 | 75 | in5: VTR (+3.3V standby) 0V - 4.38V |
| 73 | 76 | in6: Vbat (+3.0V) 0V - 4.38V |
| 74 | 77 | |
| 78 | +SCH311x: | |
| 79 | + in0: +2.5V 0V - 6.64V | |
| 80 | + in1: Vccp (processor core) 0V - 2V | |
| 81 | + in2: VCC (internal +3.3V) 0V - 4.38V | |
| 82 | + in3: +5V 0V - 6.64V | |
| 83 | + in4: +12V 0V - 16V | |
| 84 | + in5: VTR (+3.3V standby) 0V - 4.38V | |
| 85 | + in6: Vbat (+3.0V) 0V - 4.38V | |
| 86 | + | |
| 87 | +SCH5027: | |
| 88 | + in0: +5VTR (+5V standby) 0V - 6.64V | |
| 89 | + in1: Vccp (processor core) 0V - 3V | |
| 90 | + in2: VCC (internal +3.3V) 0V - 4.38V | |
| 91 | + in3: V2_IN 0V - 1.5V | |
| 92 | + in4: V1_IN 0V - 1.5V | |
| 93 | + in5: VTR (+3.3V standby) 0V - 4.38V | |
| 94 | + in6: Vbat (+3.0V) 0V - 4.38V | |
| 95 | + | |
| 75 | 96 | Each voltage input has associated min and max limits which trigger an alarm |
| 76 | 97 | when crossed. |
| 77 | 98 | |
| @@ -1,8 +1,11 @@ | ||
| 1 | 1 | Kernel driver ibmaem |
| 2 | 2 | ====================== |
| 3 | 3 | |
| 4 | +This driver talks to the IBM Systems Director Active Energy Manager, known | |
| 5 | +henceforth as AEM. | |
| 6 | + | |
| 4 | 7 | Supported systems: |
| 5 | − * Any recent IBM System X server with Active Energy Manager support. | |
| 8 | + * Any recent IBM System X server with AEM support. | |
| 6 | 9 | This includes the x3350, x3550, x3650, x3655, x3755, x3850 M2, |
| 7 | 10 | x3950 M2, and certain HS2x/LS2x/QS2x blades. The IPMI host interface |
| 8 | 11 | driver ("ipmi-si") needs to be loaded for this driver to do anything. |
| @@ -14,24 +17,22 @@ Author: Darrick J. Wong · 5 unmodified lines | ||
| 14 | 17 | Description |
| 15 | 18 | ----------- |
| 16 | 19 | |
| 17 | −This driver implements sensor reading support for the energy and power | |
| 18 | −meters available on various IBM System X hardware through the BMC. All | |
| 19 | −sensor banks will be exported as platform devices; this driver can talk | |
| 20 | −to both v1 and v2 interfaces. This driver is completely separate from the | |
| 21 | −older ibmpex driver. | |
| 20 | +This driver implements sensor reading support for the energy and power meters | |
| 21 | +available on various IBM System X hardware through the BMC. All sensor banks | |
| 22 | +will be exported as platform devices; this driver can talk to both v1 and v2 | |
| 23 | +interfaces. This driver is completely separate from the older ibmpex driver. | |
| 22 | 24 | |
| 23 | −The v1 AEM interface has a simple set of features to monitor energy use. | |
| 24 | −There is a register that displays an estimate of raw energy consumption | |
| 25 | −since the last BMC reset, and a power sensor that returns average power | |
| 26 | −use over a configurable interval. | |
| 25 | +The v1 AEM interface has a simple set of features to monitor energy use. There | |
| 26 | +is a register that displays an estimate of raw energy consumption since the | |
| 27 | +last BMC reset, and a power sensor that returns average power use over a | |
| 28 | +configurable interval. | |
| 27 | 29 | |
| 28 | −The v2 AEM interface is a bit more sophisticated, being able to present | |
| 29 | −a wider range of energy and power use registers, the power cap as | |
| 30 | −set by the AEM software, and temperature sensors. | |
| 30 | +The v2 AEM interface is a bit more sophisticated, being able to present a wider | |
| 31 | +range of energy and power use registers, the power cap as set by the AEM | |
| 32 | +software, and temperature sensors. | |
| 31 | 33 | |
| 32 | 34 | Special Features |
| 33 | 35 | ---------------- |
| 34 | 36 | |
| 35 | −The "power_cap" value displays the current system power cap, as set by | |
| 36 | −the Active Energy Manager software. Setting the power cap from the host | |
| 37 | −is not currently supported. | |
| 37 | +The "power_cap" value displays the current system power cap, as set by the AEM | |
| 38 | +software. Setting the power cap from the host is not currently supported. | |
| @@ -6,12 +6,14 @@ Supported chips: · 5 unmodified lines | ||
| 6 | 6 | Prefix: 'it87' |
| 7 | 7 | Addresses scanned: from Super I/O config space (8 I/O ports) |
| 8 | 8 | Datasheet: Publicly available at the ITE website |
| 9 | − http://www.ite.com.tw/ | |
| 9 | + http://www.ite.com.tw/product_info/file/pc/IT8705F_V.0.4.1.pdf | |
| 10 | 10 | * IT8712F |
| 11 | 11 | Prefix: 'it8712' |
| 12 | 12 | Addresses scanned: from Super I/O config space (8 I/O ports) |
| 13 | 13 | Datasheet: Publicly available at the ITE website |
| 14 | − http://www.ite.com.tw/ | |
| 14 | + http://www.ite.com.tw/product_info/file/pc/IT8712F_V0.9.1.pdf | |
| 15 | + http://www.ite.com.tw/product_info/file/pc/Errata%20V0.1%20for%20IT8712F%20V0.9.1.pdf | |
| 16 | + http://www.ite.com.tw/product_info/file/pc/IT8712F_V0.9.3.pdf | |
| 15 | 17 | * IT8716F/IT8726F |
| 16 | 18 | Prefix: 'it8716' |
| 17 | 19 | Addresses scanned: from Super I/O config space (8 I/O ports) |
| @@ -90,14 +92,13 @@ upper VID bits share their pins with voltage inputs (in5 and in6) so you · 72 unmodified lines | ||
| 90 | 92 | can't have both on a given board. |
| 91 | 93 | |
| 92 | 94 | The IT8716F, IT8718F and later IT8712F revisions have support for |
| 93 | −2 additional fans. They are supported by the driver for the IT8716F and | |
| 94 | −IT8718F but not for the IT8712F | |
| 95 | +2 additional fans. The additional fans are supported by the driver. | |
| 95 | 96 | |
| 96 | 97 | The IT8716F and IT8718F, and late IT8712F and IT8705F also have optional |
| 97 | 98 | 16-bit tachometer counters for fans 1 to 3. This is better (no more fan |
| 98 | 99 | clock divider mess) but not compatible with the older chips and |
| 99 | −revisions. For now, the driver only uses the 16-bit mode on the | |
| 100 | −IT8716F and IT8718F. | |
| 100 | +revisions. The 16-bit tachometer mode is enabled by the driver when one | |
| 101 | +of the above chips is detected. | |
| 101 | 102 | |
| 102 | 103 | The IT8726F is just bit enhanced IT8716F with additional hardware |
| 103 | 104 | for AMD power sequencing. Therefore the chip will appear as IT8716F |
| @@ -40,10 +40,6 @@ Module Parameters · 39 unmodified lines | ||
| 40 | 40 | (default is 1) |
| 41 | 41 | Use 'init=0' to bypass initializing the chip. |
| 42 | 42 | Try this if your computer crashes when you load the module. |
| 43 | −* reset: int | |
| 44 | − (default is 0) | |
| 45 | − The driver used to reset the chip on load, but does no more. Use | |
| 46 | − 'reset=1' to restore the old behavior. Report if you need to do this. | |
| 47 | 43 | |
| 48 | 44 | Description |
| 49 | 45 | ----------- |
| @@ -22,6 +22,7 @@ Credits: · 21 unmodified lines | ||
| 22 | 22 | |
| 23 | 23 | Additional contributors: |
| 24 | 24 | Sven Anders <anders@anduras.de> |
| 25 | + Marc Hulsman <m.hulsman@tudelft.nl> | |
| 25 | 26 | |
| 26 | 27 | Module Parameters |
| 27 | 28 | ----------------- |
| @@ -67,9 +68,8 @@ on until the temperature falls below the Hysteresis value. · 39 unmodified lines | ||
| 67 | 68 | |
| 68 | 69 | Fan rotation speeds are reported in RPM (rotations per minute). An alarm is |
| 69 | 70 | triggered if the rotation speed has dropped below a programmable limit. Fan |
| 70 | −readings can be divided by a programmable divider (1, 2, 4, 8 for fan 1/2/3 | |
| 71 | −and 1, 2, 4, 8, 16, 32, 64 or 128 for fan 4/5) to give the readings more | |
| 72 | −range or accuracy. | |
| 71 | +readings can be divided by a programmable divider (1, 2, 4, 8, 16, | |
| 72 | +32, 64 or 128 for all fans) to give the readings more range or accuracy. | |
| 73 | 73 | |
| 74 | 74 | Voltage sensors (also known as IN sensors) report their values in millivolts. |
| 75 | 75 | An alarm is triggered if the voltage has crossed a programmable minimum |
| @@ -0,0 +1,8 @@ | ||
| 1 | +# kbuild trick to avoid linker error. Can be omitted if a module is built. | |
| 2 | +obj- := dummy.o | |
| 3 | + | |
| 4 | +# List of programs to build | |
| 5 | +hostprogs-y := aliasing-test | |
| 6 | + | |
| 7 | +# Tell kbuild to always build the programs | |
| 8 | +always := $(hostprogs-y) | |
| @@ -105,7 +105,6 @@ Code Seq# Include File Comments · 104 unmodified lines | ||
| 105 | 105 | 'T' all linux/soundcard.h conflict! |
| 106 | 106 | 'T' all asm-i386/ioctls.h conflict! |
| 107 | 107 | 'U' 00-EF linux/drivers/usb/usb.h |
| 108 | −'U' F0-FF drivers/usb/auerswald.c | |
| 109 | 108 | 'V' all linux/vt.h |
| 110 | 109 | 'W' 00-1F linux/watchdog.h conflict! |
| 111 | 110 | 'W' 00-1F linux/wanrouter.h conflict! |
| @@ -11,14 +11,14 @@ for non English (read: Japanese) speakers and is not intended as a · 10 unmodified lines | ||
| 11 | 11 | fork. So if you have any comments or updates for this file, please try |
| 12 | 12 | to update the original English file first. |
| 13 | 13 | |
| 14 | −Last Updated: 2007/11/16 | |
| 14 | +Last Updated: 2008/08/21 | |
| 15 | 15 | ================================== |
| 16 | 16 | これは、 |
| 17 | −linux-2.6.24/Documentation/HOWTO | |
| 17 | +linux-2.6.27/Documentation/HOWTO | |
| 18 | 18 | の和訳です。 |
| 19 | 19 | |
| 20 | 20 | 翻訳団体： JF プロジェクト < http://www.linux.or.jp/JF/ > |
| 21 | −翻訳日： 2007/11/10 | |
| 21 | +翻訳日： 2008/8/5 | |
| 22 | 22 | 翻訳者： Tsugikazu Shibata <tshibata at ab dot jp dot nec dot com> |
| 23 | 23 | 校正者： 松倉さん <nbh--mats at nifty dot com> |
| 24 | 24 | 小林 雅典さん (Masanori Kobayasi) <zap03216 at nifty dot ne dot jp> |
| @@ -287,13 +287,15 @@ Linux カーネルの開発プロセスは現在幾つかの異なるメイン · 262 unmodified lines | ||
| 287 | 287 | に安定した状態にあると判断したときにリリースされます。目標は毎週新 |
| 288 | 288 | しい -rc カーネルをリリースすることです。 |
| 289 | 289 | |
| 290 | − - 以下の URL で各 -rc リリースに存在する既知の後戻り問題のリスト | |
| 291 | − が追跡されます- | |
| 292 | − http://kernelnewbies.org/known_regressions | |
| 293 | − | |
| 294 | 290 | - このプロセスはカーネルが 「準備ができた」と考えられるまで継続しま |
| 295 | 291 | す。このプロセスはだいたい 6週間継続します。 |
| 296 | 292 | |
| 293 | + - 各リリースでの既知の後戻り問題(regression: このリリースの中で新規 | |
| 294 | + に作り込まれた問題を指す) はその都度 Linux-kernel メーリングリスト | |
| 295 | + に投稿されます。ゴールとしては、カーネルが 「準備ができた」と宣言 | |
| 296 | + する前にこのリストの長さをゼロに減らすことですが、現実には、数個の | |
| 297 | + 後戻り問題がリリース時にたびたび残ってしまいます。 | |
| 298 | + | |
| 297 | 299 | Andrew Morton が Linux-kernel メーリングリストにカーネルリリースについ |
| 298 | 300 | て書いたことをここで言っておくことは価値があります- |
| 299 | 301 | 「カーネルがいつリリースされるかは誰も知りません。なぜなら、これは現 |
| @@ -303,18 +305,20 @@ Andrew Morton が Linux-kernel メーリングリストにカーネルリリー · 3 unmodified lines | ||
| 303 | 305 | 2.6.x.y -stable カーネルツリー |
| 304 | 306 | --------------------------- |
| 305 | 307 | |
| 306 | −バージョンに4つ目の数字がついたカーネルは -stable カーネルです。これに | |
| 307 | −は、2.6.x カーネルで見つかったセキュリティ問題や重大な後戻りに対する比 | |
| 308 | −較的小さい重要な修正が含まれます。 | |
| 308 | +バージョン番号が4つの数字に分かれているカーネルは -stable カーネルです。 | |
| 309 | +これには、2.6.x カーネルで見つかったセキュリティ問題や重大な後戻りに対 | |
| 310 | +する比較的小さい重要な修正が含まれます。 | |
| 309 | 311 | |
| 310 | 312 | これは、開発/実験的バージョンのテストに協力することに興味が無く、 |
| 311 | 313 | 最新の安定したカーネルを使いたいユーザに推奨するブランチです。 |
| 312 | 314 | |
| 313 | −もし、2.6.x.y カーネルが存在しない場合には、番号が一番大きい 2.6.x | |
| 314 | −が最新の安定版カーネルです。 | |
| 315 | +もし、2.6.x.y カーネルが存在しない場合には、番号が一番大きい 2.6.x が | |
| 316 | +最新の安定版カーネルです。 | |
| 315 | 317 | |
| 316 | −2.6.x.y は "stable" チーム <stable@kernel.org> でメンテされており、だ | |
| 317 | −いたい隔週でリリースされています。 | |
| 318 | +2.6.x.y は "stable" チーム <stable@kernel.org> でメンテされており、必 | |
| 319 | +要に応じてリリースされます。通常のリリース期間は 2週間毎ですが、差し迫っ | |
| 320 | +た問題がなければもう少し長くなることもあります。セキュリティ関連の問題 | |
| 321 | +の場合はこれに対してだいたいの場合、すぐにリリースがされます。 | |
| 318 | 322 | |
| 319 | 323 | カーネルツリーに入っている、Documentation/stable_kernel_rules.txt ファ |
| 320 | 324 | イルにはどのような種類の変更が -stable ツリーに受け入れ可能か、またリ |
| @@ -341,7 +345,9 @@ linux-kernel メーリングリストで収集された多数のパッチと同 · 20 unmodified lines | ||
| 341 | 345 | メインラインへ入れるように Linus にプッシュします。 |
| 342 | 346 | |
| 343 | 347 | メインカーネルツリーに含めるために Linus に送る前に、すべての新しいパッ |
| 344 | −チが -mm ツリーでテストされることが強く推奨されます。 | |
| 348 | +チが -mm ツリーでテストされることが強く推奨されています。マージウィン | |
| 349 | +ドウが開く前に -mm ツリーに現れなかったパッチはメインラインにマージさ | |
| 350 | +れることは困難になります。 | |
| 345 | 351 | |
| 346 | 352 | これらのカーネルは安定して動作すべきシステムとして使うのには適切ではあ |
| 347 | 353 | りませんし、カーネルブランチの中でももっとも動作にリスクが高いものです。 |
| @@ -395,13 +401,15 @@ linux-kernel メーリングリストで収集された多数のパッチと同 · 47 unmodified lines | ||
| 395 | 401 | - pcmcia, Dominik Brodowski <linux@dominikbrodowski.net> |
| 396 | 402 | git.kernel.org:/pub/scm/linux/kernel/git/brodo/pcmcia-2.6.git |
| 397 | 403 | |
| 398 | − - SCSI, James Bottomley <James.Bottomley@SteelEye.com> | |
| 404 | + - SCSI, James Bottomley <James.Bottomley@hansenpartnership.com> | |
| 399 | 405 | git.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6.git |
| 400 | 406 | |
| 407 | + - x86, Ingo Molnar <mingo@elte.hu> | |
| 408 | + git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86.git | |
| 409 | + | |
| 401 | 410 | quilt ツリー- |
| 402 | − - USB, PCI ドライバコアと I2C, Greg Kroah-Hartman <gregkh@suse.de> | |
| 411 | + - USB, ドライバコアと I2C, Greg Kroah-Hartman <gregkh@suse.de> | |
| 403 | 412 | kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/ |
| 404 | − - x86-64 と i386 の仲間 Andi Kleen <ak@suse.de> | |
| 405 | 413 | |
| 406 | 414 | その他のカーネルツリーは http://git.kernel.org/ と MAINTAINERS ファ |
| 407 | 415 | イルに一覧表があります。 |
| @@ -412,13 +420,32 @@ linux-kernel メーリングリストで収集された多数のパッチと同 · 4 unmodified lines | ||
| 412 | 420 | bugzilla.kernel.org は Linux カーネル開発者がカーネルのバグを追跡する |
| 413 | 421 | 場所です。ユーザは見つけたバグの全てをこのツールで報告すべきです。 |
| 414 | 422 | どう kernel bugzilla を使うかの詳細は、以下を参照してください- |
| 415 | − http://test.kernel.org/bugzilla/faq.html | |
| 416 | − | |
| 423 | + http://bugzilla.kernel.org/page.cgi?id=faq.html | |
| 417 | 424 | メインカーネルソースディレクトリにあるファイル REPORTING-BUGS はカーネ |
| 418 | 425 | ルバグらしいものについてどうレポートするかの良いテンプレートであり、問 |
| 419 | 426 | 題の追跡を助けるためにカーネル開発者にとってどんな情報が必要なのかの詳 |
| 420 | 427 | 細が書かれています。 |
| 421 | 428 | |
| 429 | +バグレポートの管理 | |
| 430 | +------------------- | |
| 431 | + | |
| 432 | +あなたのハッキングのスキルを訓練する最高の方法のひとつに、他人がレポー | |
| 433 | +トしたバグを修正することがあります。あなたがカーネルをより安定化させる | |
| 434 | +こに寄与するということだけでなく、あなたは 現実の問題を修正することを | |
| 435 | +学び、自分のスキルも強化でき、また他の開発者があなたの存在に気がつき | |
| 436 | +ます。バグを修正することは、多くの開発者の中から自分が功績をあげる最善 | |
| 437 | +の道です、なぜなら多くの人は他人のバグの修正に時間を浪費することを好ま | |
| 438 | +ないからです。 | |
| 439 | + | |
| 440 | +すでにレポートされたバグのために仕事をするためには、 | |
| 441 | +http://bugzilla.kernel.org に行ってください。もし今後のバグレポートに | |
| 442 | +ついてアドバイスを受けたいのであれば、bugme-new メーリングリスト(新し | |
| 443 | +いバグレポートだけがここにメールされる) または bugme-janitor メーリン | |
| 444 | +グリスト(bugzilla の変更毎にここにメールされる)を購読できます。 | |
| 445 | + | |
| 446 | + http://lists.linux-foundation.org/mailman/listinfo/bugme-new | |
| 447 | + http://lists.linux-foundation.org/mailman/listinfo/bugme-janitors | |
| 448 | + | |
| 422 | 449 | メーリングリスト |
| 423 | 450 | ------------- |
| 424 | 451 | |
| @@ -0,0 +1,111 @@ | ||
| 1 | +NOTE: | |
| 2 | +This is a version of Documentation/SubmitChecklist into Japanese. | |
| 3 | +This document is maintained by Takenori Nagano <t-nagano@ah.jp.nec.com> | |
| 4 | +and the JF Project team <http://www.linux.or.jp/JF/>. | |
| 5 | +If you find any difference between this document and the original file | |
| 6 | +or a problem with the translation, | |
| 7 | +please contact the maintainer of this file or JF project. | |
| 8 | + | |
| 9 | +Please also note that the purpose of this file is to be easier to read | |
| 10 | +for non English (read: Japanese) speakers and is not intended as a | |
| 11 | +fork. So if you have any comments or updates of this file, please try | |
| 12 | +to update the original English file first. | |
| 13 | + | |
| 14 | +Last Updated: 2008/07/14 | |
| 15 | +================================== | |
| 16 | +これは、 | |
| 17 | +linux-2.6.26/Documentation/SubmitChecklist の和訳です。 | |
| 18 | + | |
| 19 | +翻訳団体： JF プロジェクト < http://www.linux.or.jp/JF/ > | |
| 20 | +翻訳日： 2008/07/14 | |
| 21 | +翻訳者： Takenori Nagano <t-nagano at ah dot jp dot nec dot com> | |
| 22 | +校正者： Masanori Kobayashi さん <zap03216 at nifty dot ne dot jp> | |
| 23 | +================================== | |
| 24 | + | |
| 25 | + | |
| 26 | +Linux カーネルパッチ投稿者向けチェックリスト | |
| 27 | +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | |
| 28 | + | |
| 29 | +本書では、パッチをより素早く取り込んでもらいたい開発者が実践すべき基本的な事柄 | |
| 30 | +をいくつか紹介します。ここにある全ての事柄は、Documentation/SubmittingPatches | |
| 31 | +などのLinuxカーネルパッチ投稿に際しての心得を補足するものです。 | |
| 32 | + | |
| 33 | + 1: 妥当なCONFIGオプションや変更されたCONFIGオプション、つまり =y, =m, =n | |
| 34 | + 全てで正しくビルドできることを確認してください。その際、gcc及びリンカが | |
| 35 | + warningやerrorを出していないことも確認してください。 | |
| 36 | + | |
| 37 | + 2: allnoconfig, allmodconfig オプションを用いて正しくビルドできることを | |
| 38 | + 確認してください。 | |
| 39 | + | |
| 40 | + 3: 手許のクロスコンパイルツールやOSDLのPLMのようなものを用いて、複数の | |
| 41 | + アーキテクチャにおいても正しくビルドできることを確認してください。 | |
| 42 | + | |
| 43 | + 4: 64bit長の'unsigned long'を使用しているppc64は、クロスコンパイルでの | |
| 44 | + チェックに適当なアーキテクチャです。 | |
| 45 | + | |
| 46 | + 5: カーネルコーディングスタイルに準拠しているかどうか確認してください(!) | |
| 47 | + | |
| 48 | + 6: CONFIGオプションの追加・変更をした場合には、CONFIGメニューが壊れていない | |
| 49 | + ことを確認してください。 | |
| 50 | + | |
| 51 | + 7: 新しくKconfigのオプションを追加する際には、必ずそのhelpも記述してください。 | |
| 52 | + | |
| 53 | + 8: 適切なKconfigの依存関係を考えながら慎重にチェックしてください。 | |
| 54 | + ただし、この作業はマシンを使ったテストできちんと行うのがとても困難です。 | |
| 55 | + うまくやるには、自分の頭で考えることです。 | |
| 56 | + | |
| 57 | + 9: sparseを利用してちゃんとしたコードチェックをしてください。 | |
| 58 | + | |
| 59 | +10: 'make checkstack' と 'make namespacecheck' を利用し、問題が発見されたら | |
| 60 | + 修正してください。'make checkstack' は明示的に問題を示しませんが、どれか | |
| 61 | + １つの関数が512バイトより大きいスタックを使っていれば、修正すべき候補と | |
| 62 | + なります。 | |
| 63 | + | |
| 64 | +11: グローバルなkernel API を説明する kernel-doc をソースの中に含めてください。 | |
| 65 | + ( staticな関数においては必須ではありませんが、含めてもらっても結構です ) | |
| 66 | + そして、'make htmldocs' もしくは 'make mandocs' を利用して追記した | |
| 67 | + ドキュメントのチェックを行い、問題が見つかった場合には修正を行ってください。 | |
| 68 | + | |
| 69 | +12: CONFIG_PREEMPT, CONFIG_DEBUG_PREEMPT, CONFIG_DEBUG_SLAB, | |
| 70 | + CONFIG_DEBUG_PAGEALLOC, CONFIG_DEBUG_MUTEXES, CONFIG_DEBUG_SPINLOCK, | |
| 71 | + CONFIG_DEBUG_SPINLOCK_SLEEP これら全てを同時に有効にして動作確認を | |
| 72 | + 行ってください。 | |
| 73 | + | |
| 74 | +13: CONFIG_SMP, CONFIG_PREEMPT を有効にした場合と無効にした場合の両方で | |
| 75 | + ビルドした上、動作確認を行ってください。 | |
| 76 | + | |
| 77 | +14: もしパッチがディスクのI/O性能などに影響を与えるようであれば、 | |
| 78 | + 'CONFIG_LBD'オプションを有効にした場合と無効にした場合の両方で | |
| 79 | + テストを実施してみてください。 | |
| 80 | + | |
| 81 | +15: lockdepの機能を全て有効にした上で、全てのコードパスを評価してください。 | |
| 82 | + | |
| 83 | +16: /proc に新しいエントリを追加した場合には、Documentation/ 配下に | |
| 84 | + 必ずドキュメントを追加してください。 | |
| 85 | + | |
| 86 | +17: 新しいブートパラメータを追加した場合には、 | |
| 87 | + 必ずDocumentation/kernel-parameters.txt に説明を追加してください。 | |
| 88 | + | |
| 89 | +18: 新しくmoduleにパラメータを追加した場合には、MODULE_PARM_DESC()を | |
| 90 | + 利用して必ずその説明を記述してください。 | |
| 91 | + | |
| 92 | +19: 新しいuserspaceインタフェースを作成した場合には、Documentation/ABI/ に | |
| 93 | + Documentation/ABI/README を参考にして必ずドキュメントを追加してください。 | |
| 94 | + | |
| 95 | +20: 'make headers_check'を実行して全く問題がないことを確認してください。 | |
| 96 | + | |
| 97 | +21: 少なくともslabアロケーションとpageアロケーションに失敗した場合の | |
| 98 | + 挙動について、fault-injectionを利用して確認してください。 | |
| 99 | + Documentation/fault-injection/ を参照してください。 | |
| 100 | + | |
| 101 | + 追加したコードがかなりの量であったならば、サブシステム特有の | |
| 102 | + fault-injectionを追加したほうが良いかもしれません。 | |
| 103 | + | |
| 104 | +22: 新たに追加したコードは、`gcc -W'でコンパイルしてください。 | |
| 105 | + このオプションは大量の不要なメッセージを出力しますが、 | |
| 106 | + "warning: comparison between signed and unsigned" のようなメッセージは、 | |
| 107 | + バグを見つけるのに役に立ちます。 | |
| 108 | + | |
| 109 | +23: 投稿したパッチが -mm パッチセットにマージされた後、全ての既存のパッチや | |
| 110 | + VM, VFS およびその他のサブシステムに関する様々な変更と、現時点でも共存 | |
| 111 | + できることを確認するテストを行ってください。 | |
| @@ -365,6 +365,8 @@ and is between 256 and 4096 characters. It is defined in the file · 364 unmodified lines | ||
| 365 | 365 | no delay (0). |
| 366 | 366 | Format: integer |
| 367 | 367 | |
| 368 | + bootmem_debug [KNL] Enable bootmem allocator debug messages. | |
| 369 | + | |
| 368 | 370 | bttv.card= [HW,V4L] bttv (bt848 + bt878 based grabber cards) |
| 369 | 371 | bttv.radio= Most important insmod options are available as |
| 370 | 372 | kernel args too. |
| @@ -1072,6 +1074,9 @@ and is between 256 and 4096 characters. It is defined in the file · 701 unmodified lines | ||
| 1072 | 1074 | |
| 1073 | 1075 | * [no]ncq: Turn on or off NCQ. |
| 1074 | 1076 | |
| 1077 | + * nohrst, nosrst, norst: suppress hard, soft | |
| 1078 | + and both resets. | |
| 1079 | + | |
| 1075 | 1080 | If there are multiple matching configurations changing |
| 1076 | 1081 | the same attribute, the last one is used. |
| 1077 | 1082 | |
| @@ -895,6 +895,9 @@ static void handle_console_output(int fd, struct virtqueue *vq, bool timeout) · 894 unmodified lines | ||
| 895 | 895 | } |
| 896 | 896 | } |
| 897 | 897 | |
| 898 | +/* This is called when we no longer want to hear about Guest changes to a | |
| 899 | + * virtqueue. This is more efficient in high-traffic cases, but it means we | |
| 900 | + * have to set a timer to check if any more changes have occurred. */ | |
| 898 | 901 | static void block_vq(struct virtqueue *vq) |
| 899 | 902 | { |
| 900 | 903 | struct itimerval itm; |
| @@ -939,6 +942,11 @@ static void handle_net_output(int fd, struct virtqueue *vq, bool timeout) · 38 unmodified lines | ||
| 939 | 942 | if (!timeout && num) |
| 940 | 943 | block_vq(vq); |
| 941 | 944 | |
| 945 | + /* We never quite know how long should we wait before we check the | |
| 946 | + * queue again for more packets. We start at 500 microseconds, and if | |
| 947 | + * we get fewer packets than last time, we assume we made the timeout | |
| 948 | + * too small and increase it by 10 microseconds. Otherwise, we drop it | |
| 949 | + * by one microsecond every time. It seems to work well enough. */ | |
| 942 | 950 | if (timeout) { |
| 943 | 951 | if (num < last_timeout_num) |
| 944 | 952 | timeout_usec += 10; |
| @@ -1447,21 +1455,6 @@ static void configure_device(int fd, const char *tapif, u32 ipaddr) · 502 unmodified lines | ||
| 1447 | 1455 | err(1, "Bringing interface %s up", tapif); |
| 1448 | 1456 | } |
| 1449 | 1457 | |
| 1450 | −static void get_mac(int fd, const char *tapif, unsigned char hwaddr[6]) | |
| 1451 | −{ | |
| 1452 | − struct ifreq ifr; | |
| 1453 | − | |
| 1454 | − memset(&ifr, 0, sizeof(ifr)); | |
| 1455 | − strcpy(ifr.ifr_name, tapif); | |
| 1456 | − | |
| 1457 | − /* SIOC stands for Socket I/O Control. G means Get (vs S for Set | |
| 1458 | − * above). IF means Interface, and HWADDR is hardware address. | |
| 1459 | − * Simple! */ | |
| 1460 | − if (ioctl(fd, SIOCGIFHWADDR, &ifr) != 0) | |
| 1461 | − err(1, "getting hw address for %s", tapif); | |
| 1462 | − memcpy(hwaddr, ifr.ifr_hwaddr.sa_data, 6); | |
| 1463 | −} | |
| 1464 | − | |
| 1465 | 1458 | static int get_tun_device(char tapif[IFNAMSIZ]) |
| 1466 | 1459 | { |
| 1467 | 1460 | struct ifreq ifr; |
| @@ -1531,11 +1524,8 @@ static void setup_tun_net(char *arg) · 63 unmodified lines | ||
| 1531 | 1524 | p = strchr(arg, ':'); |
| 1532 | 1525 | if (p) { |
| 1533 | 1526 | str2mac(p+1, conf.mac); |
| 1527 | + add_feature(dev, VIRTIO_NET_F_MAC); | |
| 1534 | 1528 | *p = '\0'; |
| 1535 | − } else { | |
| 1536 | − p = arg + strlen(arg); | |
| 1537 | − /* None supplied; query the randomly assigned mac. */ | |
| 1538 | − get_mac(ipfd, tapif, conf.mac); | |
| 1539 | 1529 | } |
| 1540 | 1530 | |
| 1541 | 1531 | /* arg is now either an IP address or a bridge name */ |
| @@ -1547,13 +1537,10 @@ static void setup_tun_net(char *arg) · 5 unmodified lines | ||
| 1547 | 1537 | /* Set up the tun device. */ |
| 1548 | 1538 | configure_device(ipfd, tapif, ip); |
| 1549 | 1539 | |
| 1550 | − /* Tell Guest what MAC address to use. */ | |
| 1551 | − add_feature(dev, VIRTIO_NET_F_MAC); | |
| 1552 | 1540 | add_feature(dev, VIRTIO_F_NOTIFY_ON_EMPTY); |
| 1553 | 1541 | /* Expect Guest to handle everything except UFO */ |
| 1554 | 1542 | add_feature(dev, VIRTIO_NET_F_CSUM); |
| 1555 | 1543 | add_feature(dev, VIRTIO_NET_F_GUEST_CSUM); |
| 1556 | − add_feature(dev, VIRTIO_NET_F_MAC); | |
| 1557 | 1544 | add_feature(dev, VIRTIO_NET_F_GUEST_TSO4); |
| 1558 | 1545 | add_feature(dev, VIRTIO_NET_F_GUEST_TSO6); |
| 1559 | 1546 | add_feature(dev, VIRTIO_NET_F_GUEST_ECN); |
| @@ -0,0 +1,8 @@ | ||
| 1 | +# kbuild trick to avoid linker error. Can be omitted if a module is built. | |
| 2 | +obj- := dummy.o | |
| 3 | + | |
| 4 | +# List of programs to build | |
| 5 | +hostprogs-y := ifenslave | |
| 6 | + | |
| 7 | +# Tell kbuild to always build the programs | |
| 8 | +always := $(hostprogs-y) | |
| @@ -1081,7 +1081,7 @@ static int set_if_addr(char *master_ifname, char *slave_ifname) · 1080 unmodified lines | ||
| 1081 | 1081 | |
| 1082 | 1082 | } |
| 1083 | 1083 | |
| 1084 | − ipaddr = ifr.ifr_addr.sa_data; | |
| 1084 | + ipaddr = (unsigned char *)ifr.ifr_addr.sa_data; | |
| 1085 | 1085 | v_print("Interface '%s': set IP %s to %d.%d.%d.%d\n", |
| 1086 | 1086 | slave_ifname, ifra[i].desc, |
| 1087 | 1087 | ipaddr[0], ipaddr[1], ipaddr[2], ipaddr[3]); |
| @@ -0,0 +1,10 @@ | ||
| 1 | +# kbuild trick to avoid linker error. Can be omitted if a module is built. | |
| 2 | +obj- := dummy.o | |
| 3 | + | |
| 4 | +# List of programs to build | |
| 5 | +hostprogs-y := crc32hash | |
| 6 | + | |
| 7 | +# Tell kbuild to always build the programs | |
| 8 | +always := $(hostprogs-y) | |
| 9 | + | |
| 10 | +HOSTCFLAGS_crc32hash.o += -I$(objtree)/usr/include | |
| @@ -26,7 +26,7 @@ int main(int argc, char **argv) { · 25 unmodified lines | ||
| 26 | 26 | printf("no string passed as argument\n"); |
| 27 | 27 | return -1; |
| 28 | 28 | } |
| 29 | − result = crc32(argv[1], strlen(argv[1])); | |
| 29 | + result = crc32((unsigned char const *)argv[1], strlen(argv[1])); | |
| 30 | 30 | printf("0x%x\n", result); |
| 31 | 31 | return 0; |
| 32 | 32 | } |
| @@ -1,4 +1,4 @@ | ||
| 1 | −PM quality of Service interface. | |
| 1 | +PM Quality Of Service Interface. | |
| 2 | 2 | |
| 3 | 3 | This interface provides a kernel and user mode interface for registering |
| 4 | 4 | performance expectations by drivers, subsystems and user space applications on |
| @@ -7,6 +7,11 @@ one of the parameters. · 2 unmodified lines | ||
| 7 | 7 | Currently we have {cpu_dma_latency, network_latency, network_throughput} as the |
| 8 | 8 | initial set of pm_qos parameters. |
| 9 | 9 | |
| 10 | +Each parameters have defined units: | |
| 11 | + * latency: usec | |
| 12 | + * timeout: usec | |
| 13 | + * throughput: kbs (kilo bit / sec) | |
| 14 | + | |
| 10 | 15 | The infrastructure exposes multiple misc device nodes one per implemented |
| 11 | 16 | parameter. The set of parameters implement is defined by pm_qos_power_init() |
| 12 | 17 | and pm_qos_params.h. This is done because having the available parameters |
| @@ -278,7 +278,7 @@ it with special cases. · 277 unmodified lines | ||
| 278 | 278 | a 64-bit platform. |
| 279 | 279 | |
| 280 | 280 | d) request and get assigned a platform number (see PLATFORM_* |
| 281 | − constants in include/asm-powerpc/processor.h | |
| 281 | + constants in arch/powerpc/include/asm/processor.h | |
| 282 | 282 | |
| 283 | 283 | 32-bit embedded kernels: |
| 284 | 284 | |
| @@ -340,7 +340,7 @@ the block to RAM before passing it to the kernel. · 55 unmodified lines | ||
| 340 | 340 | --------- |
| 341 | 341 | |
| 342 | 342 | The kernel is entered with r3 pointing to an area of memory that is |
| 343 | − roughly described in include/asm-powerpc/prom.h by the structure | |
| 343 | + roughly described in arch/powerpc/include/asm/prom.h by the structure | |
| 344 | 344 | boot_param_header: |
| 345 | 345 | |
| 346 | 346 | struct boot_param_header { |
| @@ -133,7 +133,7 @@ error. Given an arbitrary address, the routine · 132 unmodified lines | ||
| 133 | 133 | pci_get_device_by_addr() will find the pci device associated |
| 134 | 134 | with that address (if any). |
| 135 | 135 | |
| 136 | −The default include/asm-powerpc/io.h macros readb(), inb(), insb(), | |
| 136 | +The default arch/powerpc/include/asm/io.h macros readb(), inb(), insb(), | |
| 137 | 137 | etc. include a check to see if the i/o read returned all-0xff's. |
| 138 | 138 | If so, these make a call to eeh_dn_check_failure(), which in turn |
| 139 | 139 | asks the firmware if the all-ff's value is the sign of a true EEH |
| @@ -363,6 +363,11 @@ This rule exists because users of the rfkill subsystem expect to get (and set, · 362 unmodified lines | ||
| 363 | 363 | when possible) the overall transmitter rfkill state, not of a particular rfkill |
| 364 | 364 | line. |
| 365 | 365 | |
| 366 | +5. During suspend, the rfkill class will attempt to soft-block the radio | |
| 367 | +through a call to rfkill->toggle_radio, and will try to restore its previous | |
| 368 | +state during resume. After a rfkill class is suspended, it will *not* call | |
| 369 | +rfkill->toggle_radio until it is resumed. | |
| 370 | + | |
| 366 | 371 | Example of a WLAN wireless driver connected to the rfkill subsystem: |
| 367 | 372 | -------------------------------------------------------------------- |
| 368 | 373 | |
| @@ -1,3 +1,26 @@ | ||
| 1 | + | |
| 2 | +1 Release Date : Thur.July. 24 11:41:51 PST 2008 - | |
| 3 | + (emaild-id:megaraidlinux@lsi.com) | |
| 4 | + Sumant Patro | |
| 5 | + Bo Yang | |
| 6 | + | |
| 7 | +2 Current Version : 00.00.04.01 | |
| 8 | +3 Older Version : 00.00.03.22 | |
| 9 | + | |
| 10 | +1. Add the new controller (0078, 0079) support to the driver | |
| 11 | + Those controllers are LSI's next generatation(gen2) SAS controllers. | |
| 12 | + | |
| 13 | +1 Release Date : Mon.June. 23 10:12:45 PST 2008 - | |
| 14 | + (emaild-id:megaraidlinux@lsi.com) | |
| 15 | + Sumant Patro | |
| 16 | + Bo Yang | |
| 17 | + | |
| 18 | +2 Current Version : 00.00.03.22 | |
| 19 | +3 Older Version : 00.00.03.20 | |
| 20 | + | |
| 21 | +1. Add shutdown DCMD cmd to the shutdown routine to make FW shutdown proper. | |
| 22 | +2. Unexpected interrupt occurs in HWR Linux driver, add the dumy readl pci flush will fix this issue. | |
| 23 | + | |
| 1 | 24 | 1 Release Date : Mon. March 10 11:02:31 PDT 2008 - |
| 2 | 25 | (emaild-id:megaraidlinux@lsi.com) |
| 3 | 26 | Sumant Patro |
| @@ -1144,8 +1144,6 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. · 1143 unmodified lines | ||
| 1144 | 1144 | |
| 1145 | 1145 | This module supports autoprobe and multiple cards. |
| 1146 | 1146 | |
| 1147 | − Power management is _not_ supported. | |
| 1148 | − | |
| 1149 | 1147 | Module snd-ice1712 |
| 1150 | 1148 | ------------------ |
| 1151 | 1149 | |
| @@ -1628,8 +1626,6 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. · 476 unmodified lines | ||
| 1628 | 1626 | |
| 1629 | 1627 | This module supports autoprobe and multiple cards. |
| 1630 | 1628 | |
| 1631 | − Power management is _not_ supported. | |
| 1632 | − | |
| 1633 | 1629 | Module snd-pcsp |
| 1634 | 1630 | ----------------- |
| 1635 | 1631 | |
| @@ -2081,13 +2077,11 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. · 445 unmodified lines | ||
| 2081 | 2077 | Module snd-virtuoso |
| 2082 | 2078 | ------------------- |
| 2083 | 2079 | |
| 2084 | − Module for sound cards based on the Asus AV200 chip, i.e., | |
| 2085 | − Xonar D2 and Xonar D2X. | |
| 2080 | + Module for sound cards based on the Asus AV100/AV200 chips, | |
| 2081 | + i.e., Xonar D1, DX, D2 and D2X. | |
| 2086 | 2082 | |
| 2087 | 2083 | This module supports autoprobe and multiple cards. |
| 2088 | 2084 | |
| 2089 | − Power management is _not_ supported. | |
| 2090 | − | |
| 2091 | 2085 | Module snd-vx222 |
| 2092 | 2086 | ---------------- |
| 2093 | 2087 | |
| @@ -0,0 +1,11 @@ | ||
| 1 | +# kbuild trick to avoid linker error. Can be omitted if a module is built. | |
| 2 | +obj- := dummy.o | |
| 3 | + | |
| 4 | +# List of programs to build | |
| 5 | +hostprogs-y := spidev_test spidev_fdx | |
| 6 | + | |
| 7 | +# Tell kbuild to always build the programs | |
| 8 | +always := $(hostprogs-y) | |
| 9 | + | |
| 10 | +HOSTCFLAGS_spidev_test.o += -I$(objtree)/usr/include | |
| 11 | +HOSTCFLAGS_spidev_fdx.o += -I$(objtree)/usr/include | |
| @@ -19,7 +19,7 @@ Declaring PXA2xx Master Controllers · 18 unmodified lines | ||
| 19 | 19 | ----------------------------------- |
| 20 | 20 | Typically a SPI master is defined in the arch/.../mach-*/board-*.c as a |
| 21 | 21 | "platform device". The master configuration is passed to the driver via a table |
| 22 | −found in include/asm-arm/arch-pxa/pxa2xx_spi.h: | |
| 22 | +found in arch/arm/mach-pxa/include/mach/pxa2xx_spi.h: | |
| 23 | 23 | |
| 24 | 24 | struct pxa2xx_spi_master { |
| 25 | 25 | enum pxa_ssp_type ssp_type; |
| @@ -94,7 +94,7 @@ using the "spi_board_info" structure found in "linux/spi/spi.h". See · 68 unmodified lines | ||
| 94 | 94 | |
| 95 | 95 | Each slave device attached to the PXA must provide slave specific configuration |
| 96 | 96 | information via the structure "pxa2xx_spi_chip" found in |
| 97 | −"include/asm-arm/arch-pxa/pxa2xx_spi.h". The pxa2xx_spi master controller driver | |
| 97 | +"arch/arm/mach-pxa/include/mach/pxa2xx_spi.h". The pxa2xx_spi master controller driver | |
| 98 | 98 | will uses the configuration whenever the driver communicates with the slave |
| 99 | 99 | device. |
| 100 | 100 | |
| @@ -210,7 +210,7 @@ board should normally be set up and registered. · 209 unmodified lines | ||
| 210 | 210 | |
| 211 | 211 | So for example arch/.../mach-*/board-*.c files might have code like: |
| 212 | 212 | |
| 213 | − #include <asm/arch/spi.h> /* for mysoc_spi_data */ | |
| 213 | + #include <mach/spi.h> /* for mysoc_spi_data */ | |
| 214 | 214 | |
| 215 | 215 | /* if your mach-* infrastructure doesn't support kernels that can |
| 216 | 216 | * run on multiple boards, pdata wouldn't benefit from "__init". |
| @@ -227,7 +227,7 @@ So for example arch/.../mach-*/board-*.c files might have code like: · 10 unmodified lines | ||
| 227 | 227 | |
| 228 | 228 | And SOC-specific utility code might look something like: |
| 229 | 229 | |
| 230 | − #include <asm/arch/spi.h> | |
| 230 | + #include <mach/spi.h> | |
| 231 | 231 | |
| 232 | 232 | static struct platform_device spi2 = { ... }; |
| 233 | 233 | |
| @@ -1,30 +0,0 @@ | ||
| 1 | − Auerswald USB kernel driver | |
| 2 | − =========================== | |
| 3 | − | |
| 4 | −What is it? What can I do with it? | |
| 5 | −================================== | |
| 6 | −The auerswald USB kernel driver connects your linux 2.4.x | |
| 7 | −system to the auerswald usb-enabled devices. | |
| 8 | − | |
| 9 | −There are two types of auerswald usb devices: | |
| 10 | −a) small PBX systems (ISDN) | |
| 11 | −b) COMfort system telephones (ISDN) | |
| 12 | − | |
| 13 | −The driver installation creates the devices | |
| 14 | −/dev/usb/auer0..15. These devices carry a vendor- | |
| 15 | −specific protocol. You may run all auerswald java | |
| 16 | −software on it. The java software needs a native | |
| 17 | −library "libAuerUsbJNINative.so" installed on | |
| 18 | −your system. This library is available from | |
| 19 | −auerswald and shipped as part of the java software. | |
| 20 | − | |
| 21 | −You may create the devices with: | |
| 22 | − mknod -m 666 /dev/usb/auer0 c 180 112 | |
| 23 | − ... | |
| 24 | − mknod -m 666 /dev/usb/auer15 c 180 127 | |
| 25 | − | |
| 26 | −Future plans | |
| 27 | −============ | |
| 28 | −- Connection to ISDN4LINUX (the hisax interface) | |
| 29 | − | |
| 30 | −The maintainer of this driver is wolfgang@iksw-muees.de | |
| @@ -436,7 +436,12 @@ post_reset; the USB core guarantees that this is true of internal · 435 unmodified lines | ||
| 436 | 436 | suspend/resume events as well. |
| 437 | 437 | |
| 438 | 438 | If a driver wants to block all suspend/resume calls during some |
| 439 | −critical section, it can simply acquire udev->pm_mutex. | |
| 439 | +critical section, it can simply acquire udev->pm_mutex. Note that | |
| 440 | +calls to resume may be triggered indirectly. Block IO due to memory | |
| 441 | +allocations can make the vm subsystem resume a device. Thus while | |
| 442 | +holding this lock you must not allocate memory with GFP_KERNEL or | |
| 443 | +GFP_NOFS. | |
| 444 | + | |
| 440 | 445 | Alternatively, if the critical section might call some of the |
| 441 | 446 | usb_autopm_* routines, the driver can avoid deadlock by doing: |
| 442 | 447 | |
| @@ -0,0 +1,8 @@ | ||
| 1 | +# kbuild trick to avoid linker error. Can be omitted if a module is built. | |
| 2 | +obj- := dummy.o | |
| 3 | + | |
| 4 | +# List of programs to build | |
| 5 | +hostprogs-y := v4lgrab | |
| 6 | + | |
| 7 | +# Tell kbuild to always build the programs | |
| 8 | +always := $(hostprogs-y) | |
| @@ -226,6 +226,7 @@ sonixj 0c45:6130 Sonix Pccam · 225 unmodified lines | ||
| 226 | 226 | sonixj 0c45:6138 Sn9c120 Mo4000 |
| 227 | 227 | sonixj 0c45:613b Surfer SN-206 |
| 228 | 228 | sonixj 0c45:613c Sonix Pccam168 |
| 229 | +sonixj 0c45:6143 Sonix Pccam168 | |
| 229 | 230 | sunplus 0d64:0303 Sunplus FashionCam DXG |
| 230 | 231 | etoms 102c:6151 Qcam Sangha CIF |
| 231 | 232 | etoms 102c:6251 Qcam xxxxxx VGA |
| @@ -0,0 +1,8 @@ | ||
| 1 | +# kbuild trick to avoid linker error. Can be omitted if a module is built. | |
| 2 | +obj- := dummy.o | |
| 3 | + | |
| 4 | +# List of programs to build | |
| 5 | +hostprogs-y := slabinfo | |
| 6 | + | |
| 7 | +# Tell kbuild to always build the programs | |
| 8 | +always := $(hostprogs-y) | |
| @@ -18,10 +18,11 @@ migrate_pages function call takes two sets of nodes and moves pages of a · 17 unmodified lines | ||
| 18 | 18 | process that are located on the from nodes to the destination nodes. |
| 19 | 19 | Page migration functions are provided by the numactl package by Andi Kleen |
| 20 | 20 | (a version later than 0.9.3 is required. Get it from |
| 21 | −ftp://ftp.suse.com/pub/people/ak). numactl provided libnuma which | |
| 22 | −provides an interface similar to other numa functionality for page migration. | |
| 23 | −cat /proc/<pid>/numa_maps allows an easy review of where the pages of | |
| 24 | −a process are located. See also the numa_maps manpage in the numactl package. | |
| 21 | +ftp://oss.sgi.com/www/projects/libnuma/download/). numactl provides libnuma | |
| 22 | +which provides an interface similar to other numa functionality for page | |
| 23 | +migration. cat /proc/<pid>/numa_maps allows an easy review of where the | |
| 24 | +pages of a process are located. See also the numa_maps documentation in the | |
| 25 | +proc(5) man page. | |
| 25 | 26 | |
| 26 | 27 | Manual migration is useful if for example the scheduler has relocated |
| 27 | 28 | a process to a processor on a distant node. A batch scheduler or an |
| @@ -0,0 +1,8 @@ | ||
| 1 | +# kbuild trick to avoid linker error. Can be omitted if a module is built. | |
| 2 | +obj- := dummy.o | |
| 3 | + | |
| 4 | +# List of programs to build | |
| 5 | +hostprogs-y := watchdog-simple watchdog-test | |
| 6 | + | |
| 7 | +# Tell kbuild to always build the programs | |
| 8 | +always := $(hostprogs-y) | |
| @@ -175,12 +175,18 @@ M: bcrl@kvack.org · 174 unmodified lines | ||
| 175 | 175 | L: linux-aio@kvack.org |
| 176 | 176 | S: Supported |
| 177 | 177 | |
| 178 | −ABIT UGURU HARDWARE MONITOR DRIVER | |
| 178 | +ABIT UGURU 1,2 HARDWARE MONITOR DRIVER | |
| 179 | 179 | P: Hans de Goede |
| 180 | 180 | M: j.w.r.degoede@hhs.nl |
| 181 | 181 | L: lm-sensors@lm-sensors.org |
| 182 | 182 | S: Maintained |
| 183 | 183 | |
| 184 | +ABIT UGURU 3 HARDWARE MONITOR DRIVER | |
| 185 | +P: Alistair John Strachan | |
| 186 | +M: alistair@devzero.co.uk | |
| 187 | +L: lm-sensors@lm-sensors.org | |
| 188 | +S: Maintained | |
| 189 | + | |
| 184 | 190 | ACENIC DRIVER |
| 185 | 191 | P: Jes Sorensen |
| 186 | 192 | M: jes@trained-monkey.org |
| @@ -502,6 +508,12 @@ L: openezx-devel@lists.openezx.org (subscribers-only) · 315 unmodified lines | ||
| 502 | 508 | W: http://www.openezx.org/ |
| 503 | 509 | S: Maintained |
| 504 | 510 | |
| 511 | +ARM/FREESCALE IMX / MXC ARM ARCHITECTURE | |
| 512 | +P: Sascha Hauer | |
| 513 | +M: kernel@pengutronix.de | |
| 514 | +L: linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only) | |
| 515 | +S: Maintained | |
| 516 | + | |
| 505 | 517 | ARM/GLOMATION GESBC9312SX MACHINE SUPPORT |
| 506 | 518 | P: Lennert Buytenhek |
| 507 | 519 | M: kernel@wantstofly.org |
| @@ -588,6 +600,11 @@ M: kernel@wantstofly.org · 80 unmodified lines | ||
| 588 | 600 | L: linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only) |
| 589 | 601 | S: Maintained |
| 590 | 602 | |
| 603 | +ARM/MAGICIAN MACHINE SUPPORT | |
| 604 | +P: Philipp Zabel | |
| 605 | +M: philipp.zabel@gmail.com | |
| 606 | +S: Maintained | |
| 607 | + | |
| 591 | 608 | ARM/TOSA MACHINE SUPPORT |
| 592 | 609 | P: Dmitry Baryshkov |
| 593 | 610 | M: dbaryshkov@gmail.com |
| @@ -714,6 +731,15 @@ L: linux-wireless@vger.kernel.org · 120 unmodified lines | ||
| 714 | 731 | L: ath5k-devel@lists.ath5k.org |
| 715 | 732 | S: Maintained |
| 716 | 733 | |
| 734 | +ATHEROS ATH9K WIRELESS DRIVER | |
| 735 | +P: Luis R. Rodriguez | |
| 736 | +M: lrodriguez@atheros.com | |
| 737 | +P: Jouni Malinen | |
| 738 | +M: jmalinen@atheros.com | |
| 739 | +L: linux-wireless@vger.kernel.org | |
| 740 | +L: ath9k-devel@lists.ath9k.org | |
| 741 | +S: Supported | |
| 742 | + | |
| 717 | 743 | ATI_REMOTE2 DRIVER |
| 718 | 744 | P: Ville Syrjala |
| 719 | 745 | M: syrjala@sci.fi |
| @@ -916,94 +942,19 @@ M: joern@lazybastard.org · 196 unmodified lines | ||
| 916 | 942 | L: linux-mtd@lists.infradead.org |
| 917 | 943 | S: Maintained |
| 918 | 944 | |
| 919 | −BLUETOOTH SUBSYSTEM | |
| 945 | +BLUETOOTH DRIVERS | |
| 920 | 946 | P: Marcel Holtmann |
| 921 | 947 | M: marcel@holtmann.org |
| 922 | −P: Maxim Krasnyansky | |
| 923 | −M: maxk@qualcomm.com | |
| 924 | 948 | L: linux-bluetooth@vger.kernel.org |
| 925 | −W: http://bluez.sf.net | |
| 926 | −W: http://www.bluez.org | |
| 927 | −W: http://www.holtmann.org/linux/bluetooth/ | |
| 928 | −T: git kernel.org:/pub/scm/linux/kernel/git/holtmann/bluetooth-2.6.git | |
| 929 | −S: Maintained | |
| 930 | − | |
| 931 | −BLUETOOTH RFCOMM LAYER | |
| 932 | −P: Marcel Holtmann | |
| 933 | −M: marcel@holtmann.org | |
| 934 | −P: Maxim Krasnyansky | |
| 935 | −M: maxk@qualcomm.com | |
| 949 | +W: http://www.bluez.org/ | |
| 936 | 950 | S: Maintained |
| 937 | 951 | |
| 938 | −BLUETOOTH BNEP LAYER | |
| 939 | −P: Marcel Holtmann | |
| 940 | −M: marcel@holtmann.org | |
| 941 | −P: Maxim Krasnyansky | |
| 942 | −M: maxk@qualcomm.com | |
| 943 | −S: Maintained | |
| 944 | − | |
| 945 | −BLUETOOTH CMTP LAYER | |
| 946 | −P: Marcel Holtmann | |
| 947 | −M: marcel@holtmann.org | |
| 948 | −S: Maintained | |
| 949 | − | |
| 950 | −BLUETOOTH HIDP LAYER | |
| 951 | −P: Marcel Holtmann | |
| 952 | −M: marcel@holtmann.org | |
| 953 | −S: Maintained | |
| 954 | − | |
| 955 | −BLUETOOTH HCI UART DRIVER | |
| 956 | −P: Marcel Holtmann | |
| 957 | −M: marcel@holtmann.org | |
| 958 | −P: Maxim Krasnyansky | |
| 959 | −M: maxk@qualcomm.com | |
| 960 | −S: Maintained | |
| 961 | − | |
| 962 | −BLUETOOTH HCI USB DRIVER | |
| 963 | −P: Marcel Holtmann | |
| 964 | −M: marcel@holtmann.org | |
| 965 | −P: Maxim Krasnyansky | |
| 966 | −M: maxk@qualcomm.com | |
| 967 | −S: Maintained | |
| 968 | − | |
| 969 | −BLUETOOTH HCI BCM203X DRIVER | |
| 970 | −P: Marcel Holtmann | |
| 971 | −M: marcel@holtmann.org | |
| 972 | −S: Maintained | |
| 973 | − | |
| 974 | −BLUETOOTH HCI BPA10X DRIVER | |
| 975 | −P: Marcel Holtmann | |
| 976 | −M: marcel@holtmann.org | |
| 977 | −S: Maintained | |
| 978 | − | |
| 979 | −BLUETOOTH HCI BFUSB DRIVER | |
| 980 | −P: Marcel Holtmann | |
| 981 | −M: marcel@holtmann.org | |
| 982 | −S: Maintained | |
| 983 | − | |
| 984 | −BLUETOOTH HCI DTL1 DRIVER | |
| 985 | −P: Marcel Holtmann | |
| 986 | −M: marcel@holtmann.org | |
| 987 | −S: Maintained | |
| 988 | − | |
| 989 | −BLUETOOTH HCI BLUECARD DRIVER | |
| 990 | −P: Marcel Holtmann | |
| 991 | −M: marcel@holtmann.org | |
| 992 | −S: Maintained | |
| 993 | − | |
| 994 | −BLUETOOTH HCI BT3C DRIVER | |
| 995 | −P: Marcel Holtmann | |
| 996 | −M: marcel@holtmann.org | |
| 997 | −S: Maintained | |
| 998 | − | |
| 999 | −BLUETOOTH HCI BTUART DRIVER | |
| 952 | +BLUETOOTH SUBSYSTEM | |
| 1000 | 953 | P: Marcel Holtmann |
| 1001 | 954 | M: marcel@holtmann.org |
| 1002 | −S: Maintained | |
| 1003 | − | |
| 1004 | −BLUETOOTH HCI VHCI DRIVER | |
| 1005 | −P: Maxim Krasnyansky | |
| 1006 | −M: maxk@qualcomm.com | |
| 955 | +L: linux-bluetooth@vger.kernel.org | |
| 956 | +W: http://www.bluez.org/ | |
| 957 | +T: git kernel.org:/pub/scm/linux/kernel/git/holtmann/bluetooth-2.6.git | |
| 1007 | 958 | S: Maintained |
| 1008 | 959 | |
| 1009 | 960 | BONDING DRIVER |
| @@ -1229,7 +1180,7 @@ S: Maintained · 219 unmodified lines | ||
| 1229 | 1180 | CPU FREQUENCY DRIVERS |
| 1230 | 1181 | P: Dave Jones |
| 1231 | 1182 | M: davej@codemonkey.org.uk |
| 1232 | −L: cpufreq@lists.linux.org.uk | |
| 1183 | +L: cpufreq@vger.kernel.org | |
| 1233 | 1184 | W: http://www.codemonkey.org.uk/projects/cpufreq/ |
| 1234 | 1185 | T: git kernel.org/pub/scm/linux/kernel/git/davej/cpufreq.git |
| 1235 | 1186 | S: Maintained |
| @@ -2442,7 +2393,7 @@ L: kernel-janitors@vger.kernel.org · 1206 unmodified lines | ||
| 2442 | 2393 | W: http://www.kerneljanitors.org/ |
| 2443 | 2394 | S: Maintained |
| 2444 | 2395 | |
| 2445 | −KERNEL NFSD | |
| 2396 | +KERNEL NFSD, SUNRPC, AND LOCKD SERVERS | |
| 2446 | 2397 | P: J. Bruce Fields |
| 2447 | 2398 | M: bfields@fieldses.org |
| 2448 | 2399 | P: Neil Brown |
| @@ -2908,6 +2859,12 @@ M: jirislaby@gmail.com · 459 unmodified lines | ||
| 2908 | 2859 | L: linux-kernel@vger.kernel.org |
| 2909 | 2860 | S: Maintained |
| 2910 | 2861 | |
| 2862 | +MUSB MULTIPOINT HIGH SPEED DUAL-ROLE CONTROLLER | |
| 2863 | +P: Felipe Balbi | |
| 2864 | +M: felipe.balbi@nokia.com | |
| 2865 | +L: linux-usb@vger.kernel.org | |
| 2866 | +S: Maintained | |
| 2867 | + | |
| 2911 | 2868 | MYRICOM MYRI-10G 10GbE DRIVER (MYRI10GE) |
| 2912 | 2869 | P: Andrew Gallatin |
| 2913 | 2870 | M: gallatin@myri.com |
| @@ -3056,9 +3013,10 @@ M: horms@verge.net.au · 142 unmodified lines | ||
| 3056 | 3013 | P: Julian Anastasov |
| 3057 | 3014 | M: ja@ssi.bg |
| 3058 | 3015 | L: netdev@vger.kernel.org |
| 3016 | +L: lvs-devel@vger.kernel.org | |
| 3059 | 3017 | S: Maintained |
| 3060 | 3018 | |
| 3061 | −NFS CLIENT | |
| 3019 | +NFS, SUNRPC, AND LOCKD CLIENTS | |
| 3062 | 3020 | P: Trond Myklebust |
| 3063 | 3021 | M: Trond.Myklebust@netapp.com |
| 3064 | 3022 | L: linux-nfs@vger.kernel.org |
| @@ -3721,6 +3679,16 @@ L: linux-visws-devel@lists.sf.net · 656 unmodified lines | ||
| 3721 | 3679 | W: http://linux-visws.sf.net |
| 3722 | 3680 | S: Maintained for 2.6. |
| 3723 | 3681 | |
| 3682 | +SGI GRU DRIVER | |
| 3683 | +P: Jack Steiner | |
| 3684 | +M: steiner@sgi.com | |
| 3685 | +S: Maintained | |
| 3686 | + | |
| 3687 | +SGI XP/XPC/XPNET DRIVER | |
| 3688 | +P: Dean Nelson | |
| 3689 | +M: dcn@sgi.com | |
| 3690 | +S: Maintained | |
| 3691 | + | |
| 3724 | 3692 | SIMTEC EB110ATX (Chalice CATS) |
| 3725 | 3693 | P: Ben Dooks |
| 3726 | 3694 | P: Vincent Sanders |
| @@ -4175,12 +4143,6 @@ M: oliver@neukum.name · 448 unmodified lines | ||
| 4175 | 4143 | L: linux-usb@vger.kernel.org |
| 4176 | 4144 | S: Maintained |
| 4177 | 4145 | |
| 4178 | −USB AUERSWALD DRIVER | |
| 4179 | −P: Wolfgang Muees | |
| 4180 | −M: wolfgang@iksw-muees.de | |
| 4181 | −L: linux-usb@vger.kernel.org | |
| 4182 | −S: Maintained | |
| 4183 | − | |
| 4184 | 4146 | USB BLOCK DRIVER (UB ub) |
| 4185 | 4147 | P: Pete Zaitcev |
| 4186 | 4148 | M: zaitcev@redhat.com |
| @@ -4663,12 +4625,6 @@ L: linux-wireless@vger.kernel.org · 476 unmodified lines | ||
| 4663 | 4625 | L: zd1211-devs@lists.sourceforge.net (subscribers-only) |
| 4664 | 4626 | S: Maintained |
| 4665 | 4627 | |
| 4666 | −ZF MACHZ WATCHDOG | |
| 4667 | −P: Fernando Fuganti | |
| 4668 | −M: fuganti@netbank.com.br | |
| 4669 | −W: http://cvs.conectiva.com.br/drivers/ZFL-watchdog/ | |
| 4670 | −S: Maintained | |
| 4671 | − | |
| 4672 | 4628 | ZR36067 VIDEO FOR LINUX DRIVER |
| 4673 | 4629 | P: Ronald Bultje |
| 4674 | 4630 | M: rbultje@ronald.bitfreak.net |
| @@ -1,7 +1,7 @@ | ||
| 1 | 1 | VERSION = 2 |
| 2 | 2 | PATCHLEVEL = 6 |
| 3 | 3 | SUBLEVEL = 27 |
| 4 | −EXTRAVERSION = -rc1 | |
| 4 | +EXTRAVERSION = -rc4 | |
| 5 | 5 | NAME = Rotary Wombat |
| 6 | 6 | |
| 7 | 7 | # *DOCUMENTATION* |
| @@ -821,6 +821,9 @@ ifdef CONFIG_HEADERS_CHECK · 813 unmodified lines | ||
| 821 | 821 | endif |
| 822 | 822 | ifdef CONFIG_SAMPLES |
| 823 | 823 | $(Q)$(MAKE) $(build)=samples |
| 824 | +endif | |
| 825 | +ifdef CONFIG_BUILD_DOCSRC | |
| 826 | + $(Q)$(MAKE) $(build)=Documentation | |
| 824 | 827 | endif |
| 825 | 828 | $(call vmlinux-modpost) |
| 826 | 829 | $(call if_changed_rule,vmlinux__) |
| @@ -929,10 +932,10 @@ ifneq ($(KBUILD_SRC),) · 102 unmodified lines | ||
| 929 | 932 | echo " in the '$(srctree)' directory.";\ |
| 930 | 933 | /bin/false; \ |
| 931 | 934 | fi; |
| 932 | − $(Q)if [ ! -d include2 ]; then mkdir -p include2; fi; | |
| 933 | − $(Q)if [ -e $(srctree)/include/asm-$(SRCARCH)/errno.h ]; then \ | |
| 935 | + $(Q)if [ ! -d include2 ]; then \ | |
| 936 | + mkdir -p include2; \ | |
| 934 | 937 | ln -fsn $(srctree)/include/asm-$(SRCARCH) include2/asm; \ |
| 935 | − fi | |
| 938 | + fi | |
| 936 | 939 | endif |
| 937 | 940 | |
| 938 | 941 | # prepare2 creates a makefile if using a separate output directory |
| @@ -1166,7 +1169,7 @@ MRPROPER_FILES += .config .config.old include/asm .version .old_version \ · 227 unmodified lines | ||
| 1166 | 1169 | # |
| 1167 | 1170 | clean: rm-dirs := $(CLEAN_DIRS) |
| 1168 | 1171 | clean: rm-files := $(CLEAN_FILES) |
| 1169 | −clean-dirs := $(addprefix _clean_,$(srctree) $(vmlinux-alldirs)) | |
| 1172 | +clean-dirs := $(addprefix _clean_,$(srctree) $(vmlinux-alldirs) Documentation) | |
| 1170 | 1173 | |
| 1171 | 1174 | PHONY += $(clean-dirs) clean archclean |
| 1172 | 1175 | $(clean-dirs): |
| @@ -1492,7 +1495,7 @@ quiet_cmd_cscope-file = FILELST cscope.files · 319 unmodified lines | ||
| 1492 | 1495 | cmd_cscope-file = (echo \-k; echo \-q; $(all-sources)) > cscope.files |
| 1493 | 1496 | |
| 1494 | 1497 | quiet_cmd_cscope = MAKE cscope.out |
| 1495 | − cmd_cscope = cscope -b | |
| 1498 | + cmd_cscope = cscope -b -f cscope.out | |
| 1496 | 1499 | |
| 1497 | 1500 | cscope: FORCE |
| 1498 | 1501 | $(call cmd,cscope-file) |
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
| @@ -121,24 +121,29 @@ osf_filldir(void *__buf, const char *name, int namlen, loff_t offset, · 120 unmodified lines | ||
| 121 | 121 | if (reclen > buf->count) |
| 122 | 122 | return -EINVAL; |
| 123 | 123 | d_ino = ino; |
| 124 | − if (sizeof(d_ino) < sizeof(ino) && d_ino != ino) | |
| 124 | + if (sizeof(d_ino) < sizeof(ino) && d_ino != ino) { | |
| 125 | + buf->error = -EOVERFLOW; | |
| 125 | 126 | return -EOVERFLOW; |
| 127 | + } | |
| 126 | 128 | if (buf->basep) { |
| 127 | 129 | if (put_user(offset, buf->basep)) |
| 128 | − return -EFAULT; | |
| 130 | + goto Efault; | |
| 129 | 131 | buf->basep = NULL; |
| 130 | 132 | } |
| 131 | 133 | dirent = buf->dirent; |
| 132 | − put_user(d_ino, &dirent->d_ino); | |
| 133 | − put_user(namlen, &dirent->d_namlen); | |
| 134 | − put_user(reclen, &dirent->d_reclen); | |
| 135 | − if (copy_to_user(dirent->d_name, name, namlen) || | |
| 134 | + if (put_user(d_ino, &dirent->d_ino) || | |
| 135 | + put_user(namlen, &dirent->d_namlen) || | |
| 136 | + put_user(reclen, &dirent->d_reclen) || | |
| 137 | + copy_to_user(dirent->d_name, name, namlen) || | |
| 136 | 138 | put_user(0, dirent->d_name + namlen)) |
| 137 | − return -EFAULT; | |
| 139 | + goto Efault; | |
| 138 | 140 | dirent = (void __user *)dirent + reclen; |
| 139 | 141 | buf->dirent = dirent; |
| 140 | 142 | buf->count -= reclen; |
| 141 | 143 | return 0; |
| 144 | +Efault: | |
| 145 | + buf->error = -EFAULT; | |
| 146 | + return -EFAULT; | |
| 142 | 147 | } |
| 143 | 148 | |
| 144 | 149 | asmlinkage int |
| @@ -97,9 +97,7 @@ textofs-y := 0x00008000 · 96 unmodified lines | ||
| 97 | 97 | machine-$(CONFIG_ARCH_RPC) := rpc |
| 98 | 98 | machine-$(CONFIG_ARCH_EBSA110) := ebsa110 |
| 99 | 99 | machine-$(CONFIG_ARCH_CLPS7500) := clps7500 |
| 100 | − incdir-$(CONFIG_ARCH_CLPS7500) := cl7500 | |
| 101 | 100 | machine-$(CONFIG_FOOTBRIDGE) := footbridge |
| 102 | − incdir-$(CONFIG_FOOTBRIDGE) := ebsa285 | |
| 103 | 101 | machine-$(CONFIG_ARCH_SHARK) := shark |
| 104 | 102 | machine-$(CONFIG_ARCH_SA1100) := sa1100 |
| 105 | 103 | ifeq ($(CONFIG_ARCH_SA1100),y) |
| @@ -114,13 +112,15 @@ endif · 8 unmodified lines | ||
| 114 | 112 | machine-$(CONFIG_ARCH_IOP32X) := iop32x |
| 115 | 113 | machine-$(CONFIG_ARCH_IOP33X) := iop33x |
| 116 | 114 | machine-$(CONFIG_ARCH_IOP13XX) := iop13xx |
| 115 | + plat-$(CONFIG_PLAT_IOP) := iop | |
| 117 | 116 | machine-$(CONFIG_ARCH_IXP4XX) := ixp4xx |
| 118 | 117 | machine-$(CONFIG_ARCH_IXP2000) := ixp2000 |
| 119 | 118 | machine-$(CONFIG_ARCH_IXP23XX) := ixp23xx |
| 120 | 119 | machine-$(CONFIG_ARCH_OMAP1) := omap1 |
| 121 | 120 | machine-$(CONFIG_ARCH_OMAP2) := omap2 |
| 122 | − incdir-$(CONFIG_ARCH_OMAP) := omap | |
| 123 | − machine-$(CONFIG_ARCH_S3C2410) := s3c2410 | |
| 121 | + plat-$(CONFIG_ARCH_OMAP) := omap | |
| 122 | + machine-$(CONFIG_ARCH_S3C2410) := s3c2410 s3c2400 s3c2412 s3c2440 s3c2442 s3c2443 | |
| 123 | + plat-$(CONFIG_PLAT_S3C24XX) := s3c24xx | |
| 124 | 124 | machine-$(CONFIG_ARCH_LH7A40X) := lh7a40x |
| 125 | 125 | machine-$(CONFIG_ARCH_VERSATILE) := versatile |
| 126 | 126 | machine-$(CONFIG_ARCH_IMX) := imx |
| @@ -135,10 +135,11 @@ endif · 8 unmodified lines | ||
| 135 | 135 | machine-$(CONFIG_ARCH_DAVINCI) := davinci |
| 136 | 136 | machine-$(CONFIG_ARCH_KIRKWOOD) := kirkwood |
| 137 | 137 | machine-$(CONFIG_ARCH_KS8695) := ks8695 |
| 138 | − incdir-$(CONFIG_ARCH_MXC) := mxc | |
| 138 | + plat-$(CONFIG_ARCH_MXC) := mxc | |
| 139 | 139 | machine-$(CONFIG_ARCH_MX2) := mx2 |
| 140 | 140 | machine-$(CONFIG_ARCH_MX3) := mx3 |
| 141 | 141 | machine-$(CONFIG_ARCH_ORION5X) := orion5x |
| 142 | + plat-$(CONFIG_PLAT_ORION) := orion | |
| 142 | 143 | machine-$(CONFIG_ARCH_MSM7X00A) := msm |
| 143 | 144 | machine-$(CONFIG_ARCH_LOKI) := loki |
| 144 | 145 | machine-$(CONFIG_ARCH_MV78XX0) := mv78xx0 |
| @@ -153,17 +154,22 @@ endif · 8 unmodified lines | ||
| 153 | 154 | # The byte offset of the kernel image in RAM from the start of RAM. |
| 154 | 155 | TEXT_OFFSET := $(textofs-y) |
| 155 | 156 | |
| 156 | −ifeq ($(incdir-y),) | |
| 157 | −incdir-y := $(machine-y) | |
| 158 | −endif | |
| 159 | −INCDIR := arch-$(incdir-y) | |
| 160 | − | |
| 157 | +# The first directory contains additional information for the boot setup code | |
| 161 | 158 | ifneq ($(machine-y),) |
| 162 | −MACHINE := arch/arm/mach-$(machine-y)/ | |
| 159 | +MACHINE := arch/arm/mach-$(word 1,$(machine-y))/ | |
| 163 | 160 | else |
| 164 | 161 | MACHINE := |
| 165 | 162 | endif |
| 166 | 163 | |
| 164 | +machdirs := $(patsubst %,arch/arm/mach-%/,$(machine-y)) | |
| 165 | +platdirs := $(patsubst %,arch/arm/plat-%/,$(plat-y)) | |
| 166 | + | |
| 167 | +ifeq ($(KBUILD_SRC),) | |
| 168 | +KBUILD_CPPFLAGS += $(patsubst %,-I%include,$(machdirs) $(platdirs)) | |
| 169 | +else | |
| 170 | +KBUILD_CPPFLAGS += $(patsubst %,-I$(srctree)/%include,$(machdirs) $(platdirs)) | |
| 171 | +endif | |
| 172 | + | |
| 167 | 173 | export TEXT_OFFSET GZFLAGS MMUEXT |
| 168 | 174 | |
| 169 | 175 | # Do we have FASTFPE? |
| @@ -174,23 +180,11 @@ endif · 4 unmodified lines | ||
| 174 | 180 | |
| 175 | 181 | # If we have a machine-specific directory, then include it in the build. |
| 176 | 182 | core-y += arch/arm/kernel/ arch/arm/mm/ arch/arm/common/ |
| 177 | −core-y += $(MACHINE) | |
| 178 | −core-$(CONFIG_ARCH_S3C2410) += arch/arm/mach-s3c2400/ | |
| 179 | −core-$(CONFIG_ARCH_S3C2410) += arch/arm/mach-s3c2412/ | |
| 180 | −core-$(CONFIG_ARCH_S3C2410) += arch/arm/mach-s3c2440/ | |
| 181 | −core-$(CONFIG_ARCH_S3C2410) += arch/arm/mach-s3c2442/ | |
| 182 | −core-$(CONFIG_ARCH_S3C2410) += arch/arm/mach-s3c2443/ | |
| 183 | +core-y += $(machdirs) $(platdirs) | |
| 183 | 184 | core-$(CONFIG_FPE_NWFPE) += arch/arm/nwfpe/ |
| 184 | 185 | core-$(CONFIG_FPE_FASTFPE) += $(FASTFPE_OBJ) |
| 185 | 186 | core-$(CONFIG_VFP) += arch/arm/vfp/ |
| 186 | 187 | |
| 187 | −# If we have a common platform directory, then include it in the build. | |
| 188 | −core-$(CONFIG_PLAT_IOP) += arch/arm/plat-iop/ | |
| 189 | −core-$(CONFIG_PLAT_ORION) += arch/arm/plat-orion/ | |
| 190 | −core-$(CONFIG_ARCH_OMAP) += arch/arm/plat-omap/ | |
| 191 | −core-$(CONFIG_PLAT_S3C24XX) += arch/arm/plat-s3c24xx/ | |
| 192 | −core-$(CONFIG_ARCH_MXC) += arch/arm/plat-mxc/ | |
| 193 | − | |
| 194 | 188 | drivers-$(CONFIG_OPROFILE) += arch/arm/oprofile/ |
| 195 | 189 | |
| 196 | 190 | libs-y := arch/arm/lib/ $(libs-y) |
| @@ -210,20 +204,10 @@ boot := arch/arm/boot · 13 unmodified lines | ||
| 210 | 204 | # them changed. We use .arch to indicate when they were updated |
| 211 | 205 | # last, otherwise make uses the target directory mtime. |
| 212 | 206 | |
| 213 | −include/asm-arm/.arch: $(wildcard include/config/arch/*.h) include/config/auto.conf | |
| 214 | − @echo ' SYMLINK include/asm-arm/arch -> include/asm-arm/$(INCDIR)' | |
| 215 | −ifneq ($(KBUILD_SRC),) | |
| 216 | − $(Q)mkdir -p include/asm-arm | |
| 217 | − $(Q)ln -fsn $(srctree)/include/asm-arm/$(INCDIR) include/asm-arm/arch | |
| 218 | −else | |
| 219 | − $(Q)ln -fsn $(INCDIR) include/asm-arm/arch | |
| 220 | −endif | |
| 221 | − @touch $@ | |
| 222 | − | |
| 223 | 207 | archprepare: maketools |
| 224 | 208 | |
| 225 | 209 | PHONY += maketools FORCE |
| 226 | −maketools: include/linux/version.h include/asm-arm/.arch FORCE | |
| 210 | +maketools: include/linux/version.h FORCE | |
| 227 | 211 | $(Q)$(MAKE) $(build)=arch/arm/tools include/asm-arm/mach-types.h |
| 228 | 212 | |
| 229 | 213 | # Convert bzImage to zImage |
| @@ -1,2 +1,3 @@ | ||
| 1 | −piggy.gz | |
| 2 | 1 | font.c |
| 2 | +piggy.gz | |
| 3 | +vmlinux.lds | |
| @@ -112,6 +112,3 @@ $(obj)/font.c: $(FONTC) · 111 unmodified lines | ||
| 112 | 112 | |
| 113 | 113 | $(obj)/vmlinux.lds: $(obj)/vmlinux.lds.in arch/arm/boot/Makefile .config |
| 114 | 114 | @sed "$(SEDFLAGS)" < $< > $@ |
| 115 | − | |
| 116 | −$(obj)/misc.o: $(obj)/misc.c include/asm/arch/uncompress.h lib/inflate.c | |
| 117 | − | |
| @@ -6,7 +6,6 @@ · 5 unmodified lines | ||
| 6 | 6 | */ |
| 7 | 7 | |
| 8 | 8 | #include <linux/linkage.h> |
| 9 | −#include <asm/mach-types.h> | |
| 10 | 9 | |
| 11 | 10 | .section ".start", "ax" |
| 12 | 11 | |
| @@ -37,7 +37,7 @@ · 36 unmodified lines | ||
| 37 | 37 | |
| 38 | 38 | #else |
| 39 | 39 | |
| 40 | −#include <asm/arch/debug-macro.S> | |
| 40 | +#include <mach/debug-macro.S> | |
| 41 | 41 | |
| 42 | 42 | .macro writeb, ch, rb |
| 43 | 43 | senduart \ch, \rb |
| @@ -27,7 +27,7 @@ unsigned int __machine_arch_type; · 26 unmodified lines | ||
| 27 | 27 | static void putstr(const char *ptr); |
| 28 | 28 | |
| 29 | 29 | #include <linux/compiler.h> |
| 30 | −#include <asm/arch/uncompress.h> | |
| 30 | +#include <mach/uncompress.h> | |
| 31 | 31 | |
| 32 | 32 | #ifdef CONFIG_DEBUG_ICEDCC |
| 33 | 33 | |
| @@ -246,9 +246,9 @@ map_single(struct device *dev, void *ptr, size_t size, · 245 unmodified lines | ||
| 246 | 246 | } |
| 247 | 247 | |
| 248 | 248 | dev_dbg(dev, |
| 249 | − "%s: unsafe buffer %p (phy=%p) mapped to %p (phy=%p)\n", | |
| 250 | − __func__, buf->ptr, (void *) virt_to_dma(dev, buf->ptr), | |
| 251 | − buf->safe, (void *) buf->safe_dma_addr); | |
| 249 | + "%s: unsafe buffer %p (dma=%#x) mapped to %p (dma=%#x)\n", | |
| 250 | + __func__, buf->ptr, virt_to_dma(dev, buf->ptr), | |
| 251 | + buf->safe, buf->safe_dma_addr); | |
| 252 | 252 | |
| 253 | 253 | if ((dir == DMA_TO_DEVICE) || |
| 254 | 254 | (dir == DMA_BIDIRECTIONAL)) { |
| @@ -292,9 +292,9 @@ unmap_single(struct device *dev, dma_addr_t dma_addr, size_t size, · 37 unmodified lines | ||
| 292 | 292 | BUG_ON(buf->size != size); |
| 293 | 293 | |
| 294 | 294 | dev_dbg(dev, |
| 295 | − "%s: unsafe buffer %p (phy=%p) mapped to %p (phy=%p)\n", | |
| 296 | − __func__, buf->ptr, (void *) virt_to_dma(dev, buf->ptr), | |
| 297 | − buf->safe, (void *) buf->safe_dma_addr); | |
| 295 | + "%s: unsafe buffer %p (dma=%#x) mapped to %p (dma=%#x)\n", | |
| 296 | + __func__, buf->ptr, virt_to_dma(dev, buf->ptr), | |
| 297 | + buf->safe, buf->safe_dma_addr); | |
| 298 | 298 | |
| 299 | 299 | DO_STATS ( device_info->bounce_count++ ); |
| 300 | 300 | |
| @@ -321,9 +321,8 @@ unmap_single(struct device *dev, dma_addr_t dma_addr, size_t size, · 20 unmodified lines | ||
| 321 | 321 | } |
| 322 | 322 | } |
| 323 | 323 | |
| 324 | −static inline void | |
| 325 | −sync_single(struct device *dev, dma_addr_t dma_addr, size_t size, | |
| 326 | − enum dma_data_direction dir) | |
| 324 | +static int sync_single(struct device *dev, dma_addr_t dma_addr, size_t size, | |
| 325 | + enum dma_data_direction dir) | |
| 327 | 326 | { |
| 328 | 327 | struct dmabounce_device_info *device_info = dev->archdata.dmabounce; |
| 329 | 328 | struct safe_buffer *buf = NULL; |
| @@ -355,9 +354,9 @@ sync_single(struct device *dev, dma_addr_t dma_addr, size_t size, · 25 unmodified lines | ||
| 355 | 354 | */ |
| 356 | 355 | |
| 357 | 356 | dev_dbg(dev, |
| 358 | − "%s: unsafe buffer %p (phy=%p) mapped to %p (phy=%p)\n", | |
| 359 | − __func__, buf->ptr, (void *) virt_to_dma(dev, buf->ptr), | |
| 360 | − buf->safe, (void *) buf->safe_dma_addr); | |
| 357 | + "%s: unsafe buffer %p (dma=%#x) mapped to %p (dma=%#x)\n", | |
| 358 | + __func__, buf->ptr, virt_to_dma(dev, buf->ptr), | |
| 359 | + buf->safe, buf->safe_dma_addr); | |
| 361 | 360 | |
| 362 | 361 | DO_STATS ( device_info->bounce_count++ ); |
| 363 | 362 | |
| @@ -383,8 +382,9 @@ sync_single(struct device *dev, dma_addr_t dma_addr, size_t size, · 19 unmodified lines | ||
| 383 | 382 | * No need to sync the safe buffer - it was allocated |
| 384 | 383 | * via the coherent allocators. |
| 385 | 384 | */ |
| 385 | + return 0; | |
| 386 | 386 | } else { |
| 387 | − dma_cache_maint(dma_to_virt(dev, dma_addr), size, dir); | |
| 387 | + return 1; | |
| 388 | 388 | } |
| 389 | 389 | } |
| 390 | 390 | |
| @@ -474,25 +474,29 @@ dma_unmap_sg(struct device *dev, struct scatterlist *sg, int nents, · 83 unmodified lines | ||
| 474 | 474 | } |
| 475 | 475 | } |
| 476 | 476 | |
| 477 | −void | |
| 478 | −dma_sync_single_for_cpu(struct device *dev, dma_addr_t dma_addr, size_t size, | |
| 479 | − enum dma_data_direction dir) | |
| 477 | +void dma_sync_single_range_for_cpu(struct device *dev, dma_addr_t dma_addr, | |
| 478 | + unsigned long offset, size_t size, | |
| 479 | + enum dma_data_direction dir) | |
| 480 | 480 | { |
| 481 | − dev_dbg(dev, "%s(ptr=%p,size=%d,dir=%x)\n", | |
| 482 | − __func__, (void *) dma_addr, size, dir); | |
| 481 | + dev_dbg(dev, "%s(dma=%#x,off=%#lx,size=%zx,dir=%x)\n", | |
| 482 | + __func__, dma_addr, offset, size, dir); | |
| 483 | 483 | |
| 484 | − sync_single(dev, dma_addr, size, dir); | |
| 484 | + if (sync_single(dev, dma_addr, offset + size, dir)) | |
| 485 | + dma_cache_maint(dma_to_virt(dev, dma_addr) + offset, size, dir); | |
| 485 | 486 | } |
| 487 | +EXPORT_SYMBOL(dma_sync_single_range_for_cpu); | |
| 486 | 488 | |
| 487 | −void | |
| 488 | −dma_sync_single_for_device(struct device *dev, dma_addr_t dma_addr, size_t size, | |
| 489 | − enum dma_data_direction dir) | |
| 489 | +void dma_sync_single_range_for_device(struct device *dev, dma_addr_t dma_addr, | |
| 490 | + unsigned long offset, size_t size, | |
| 491 | + enum dma_data_direction dir) | |
| 490 | 492 | { |
| 491 | − dev_dbg(dev, "%s(ptr=%p,size=%d,dir=%x)\n", | |
| 492 | − __func__, (void *) dma_addr, size, dir); | |
| 493 | + dev_dbg(dev, "%s(dma=%#x,off=%#lx,size=%zx,dir=%x)\n", | |
| 494 | + __func__, dma_addr, offset, size, dir); | |
| 493 | 495 | |
| 494 | − sync_single(dev, dma_addr, size, dir); | |
| 496 | + if (sync_single(dev, dma_addr, offset + size, dir)) | |
| 497 | + dma_cache_maint(dma_to_virt(dev, dma_addr) + offset, size, dir); | |
| 495 | 498 | } |
| 499 | +EXPORT_SYMBOL(dma_sync_single_range_for_device); | |
| 496 | 500 | |
| 497 | 501 | void |
| 498 | 502 | dma_sync_sg_for_cpu(struct device *dev, struct scatterlist *sg, int nents, |
| @@ -644,8 +648,6 @@ EXPORT_SYMBOL(dma_map_single); · 145 unmodified lines | ||
| 644 | 648 | EXPORT_SYMBOL(dma_unmap_single); |
| 645 | 649 | EXPORT_SYMBOL(dma_map_sg); |
| 646 | 650 | EXPORT_SYMBOL(dma_unmap_sg); |
| 647 | −EXPORT_SYMBOL(dma_sync_single_for_cpu); | |
| 648 | −EXPORT_SYMBOL(dma_sync_single_for_device); | |
| 649 | 651 | EXPORT_SYMBOL(dma_sync_sg_for_cpu); |
| 650 | 652 | EXPORT_SYMBOL(dma_sync_sg_for_device); |
| 651 | 653 | EXPORT_SYMBOL(dmabounce_register_dev); |
| @@ -25,7 +25,7 @@ · 24 unmodified lines | ||
| 25 | 25 | #include <linux/slab.h> |
| 26 | 26 | #include <linux/spinlock.h> |
| 27 | 27 | |
| 28 | −#include <asm/hardware.h> | |
| 28 | +#include <mach/hardware.h> | |
| 29 | 29 | #include <asm/io.h> |
| 30 | 30 | #include <asm/irq.h> |
| 31 | 31 | #include <asm/mach/irq.h> |
| @@ -26,7 +26,7 @@ · 25 unmodified lines | ||
| 26 | 26 | #include <linux/dma-mapping.h> |
| 27 | 27 | #include <linux/clk.h> |
| 28 | 28 | |
| 29 | −#include <asm/hardware.h> | |
| 29 | +#include <mach/hardware.h> | |
| 30 | 30 | #include <asm/mach-types.h> |
| 31 | 31 | #include <asm/io.h> |
| 32 | 32 | #include <asm/irq.h> |
| @@ -26,13 +26,12 @@ · 25 unmodified lines | ||
| 26 | 26 | #include <linux/apm-emulation.h> |
| 27 | 27 | #include <linux/suspend.h> |
| 28 | 28 | |
| 29 | −#include <asm/hardware.h> | |
| 30 | −#include <asm/mach-types.h> | |
| 29 | +#include <mach/hardware.h> | |
| 31 | 30 | #include <asm/irq.h> |
| 32 | −#include <asm/arch/pm.h> | |
| 33 | −#include <asm/arch/pxa-regs.h> | |
| 34 | −#include <asm/arch/pxa2xx-regs.h> | |
| 35 | −#include <asm/arch/sharpsl.h> | |
| 31 | +#include <mach/pm.h> | |
| 32 | +#include <mach/pxa-regs.h> | |
| 33 | +#include <mach/pxa2xx-regs.h> | |
| 34 | +#include <mach/sharpsl.h> | |
| 36 | 35 | #include <asm/hardware/sharpsl_pm.h> |
| 37 | 36 | |
| 38 | 37 | /* |
| @@ -18,7 +18,7 @@ · 17 unmodified lines | ||
| 18 | 18 | #include <linux/interrupt.h> |
| 19 | 19 | #include <linux/irq.h> |
| 20 | 20 | |
| 21 | −#include <asm/hardware.h> | |
| 21 | +#include <mach/hardware.h> | |
| 22 | 22 | #include <asm/io.h> |
| 23 | 23 | #include <asm/hardware/ioc.h> |
| 24 | 24 | |
| @@ -16,8 +16,7 @@ · 15 unmodified lines | ||
| 16 | 16 | #include <linux/slab.h> |
| 17 | 17 | #include <linux/module.h> |
| 18 | 18 | #include <linux/string.h> |
| 19 | −#include <asm/hardware.h> | |
| 20 | −#include <asm/arch/hardware.h> | |
| 19 | +#include <mach/hardware.h> | |
| 21 | 20 | #include <asm/hardware/uengine.h> |
| 22 | 21 | #include <asm/io.h> |
| 23 | 22 | |
| @@ -757,7 +757,14 @@ CONFIG_INPUT_EVDEV=y · 756 unmodified lines | ||
| 757 | 757 | # |
| 758 | 758 | # Input Device Drivers |
| 759 | 759 | # |
| 760 | −# CONFIG_INPUT_KEYBOARD is not set | |
| 760 | +CONFIG_INPUT_KEYBOARD=y | |
| 761 | +# CONFIG_KEYBOARD_ATKBD is not set | |
| 762 | +# CONFIG_KEYBOARD_SUNKBD is not set | |
| 763 | +# CONFIG_KEYBOARD_LKKBD is not set | |
| 764 | +# CONFIG_KEYBOARD_XTKBD is not set | |
| 765 | +# CONFIG_KEYBOARD_NEWTON is not set | |
| 766 | +# CONFIG_KEYBOARD_STOWAWAY is not set | |
| 767 | +CONFIG_KEYBOARD_GPIO=y | |
| 761 | 768 | # CONFIG_INPUT_MOUSE is not set |
| 762 | 769 | # CONFIG_INPUT_JOYSTICK is not set |
| 763 | 770 | # CONFIG_INPUT_TABLET is not set |
| @@ -1111,11 +1118,11 @@ CONFIG_RTC_DRV_DS1307=y · 347 unmodified lines | ||
| 1111 | 1118 | CONFIG_RTC_DRV_RS5C372=y |
| 1112 | 1119 | # CONFIG_RTC_DRV_ISL1208 is not set |
| 1113 | 1120 | # CONFIG_RTC_DRV_X1205 is not set |
| 1114 | −# CONFIG_RTC_DRV_PCF8563 is not set | |
| 1121 | +CONFIG_RTC_DRV_PCF8563=y | |
| 1115 | 1122 | # CONFIG_RTC_DRV_PCF8583 is not set |
| 1116 | 1123 | CONFIG_RTC_DRV_M41T80=y |
| 1117 | 1124 | # CONFIG_RTC_DRV_M41T80_WDT is not set |
| 1118 | −# CONFIG_RTC_DRV_S35390A is not set | |
| 1125 | +CONFIG_RTC_DRV_S35390A=y | |
| 1119 | 1126 | |
| 1120 | 1127 | # |
| 1121 | 1128 | # SPI RTC drivers |
File renamed without changes.
File renamed without changes.
File renamed without changes.
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/assembler.h | |
| 2 | + * arch/arm/include/asm/assembler.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 1996-2000 Russell King |
| 5 | 5 | * |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/atomic.h | |
| 2 | + * arch/arm/include/asm/atomic.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 1996 Russell King. |
| 5 | 5 | * Copyright (C) 2002 Deep Blue Solutions Ltd. |
File renamed without changes.
File renamed without changes.
File renamed without changes.
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/bugs.h | |
| 2 | + * arch/arm/include/asm/bugs.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 1995-2003 Russell King |
| 5 | 5 | * |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/byteorder.h | |
| 2 | + * arch/arm/include/asm/byteorder.h | |
| 3 | 3 | * |
| 4 | 4 | * ARM Endian-ness. In little endian mode, the data bus is connected such |
| 5 | 5 | * that byte accesses appear as: |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/cache.h | |
| 2 | + * arch/arm/include/asm/cache.h | |
| 3 | 3 | */ |
| 4 | 4 | #ifndef __ASMARM_CACHE_H |
| 5 | 5 | #define __ASMARM_CACHE_H |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/cacheflush.h | |
| 2 | + * arch/arm/include/asm/cacheflush.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 1999-2002 Russell King |
| 5 | 5 | * |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/checksum.h | |
| 2 | + * arch/arm/include/asm/checksum.h | |
| 3 | 3 | * |
| 4 | 4 | * IP checksum routines |
| 5 | 5 | * |
File renamed without changes.
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/cpu-multi32.h | |
| 2 | + * arch/arm/include/asm/cpu-multi32.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 2000 Russell King |
| 5 | 5 | * |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/cpu-single.h | |
| 2 | + * arch/arm/include/asm/cpu-single.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 2000 Russell King |
| 5 | 5 | * |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/cpu.h | |
| 2 | + * arch/arm/include/asm/cpu.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 2004-2005 ARM Ltd. |
| 5 | 5 | * |
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
| @@ -3,11 +3,48 @@ · 2 unmodified lines | ||
| 3 | 3 | |
| 4 | 4 | #ifdef __KERNEL__ |
| 5 | 5 | |
| 6 | −#include <linux/mm.h> /* need struct page */ | |
| 7 | − | |
| 6 | +#include <linux/mm_types.h> | |
| 8 | 7 | #include <linux/scatterlist.h> |
| 9 | 8 | |
| 10 | 9 | #include <asm-generic/dma-coherent.h> |
| 10 | +#include <asm/memory.h> | |
| 11 | + | |
| 12 | +/* | |
| 13 | + * page_to_dma/dma_to_virt/virt_to_dma are architecture private functions | |
| 14 | + * used internally by the DMA-mapping API to provide DMA addresses. They | |
| 15 | + * must not be used by drivers. | |
| 16 | + */ | |
| 17 | +#ifndef __arch_page_to_dma | |
| 18 | +static inline dma_addr_t page_to_dma(struct device *dev, struct page *page) | |
| 19 | +{ | |
| 20 | + return (dma_addr_t)__virt_to_bus((unsigned long)page_address(page)); | |
| 21 | +} | |
| 22 | + | |
| 23 | +static inline void *dma_to_virt(struct device *dev, dma_addr_t addr) | |
| 24 | +{ | |
| 25 | + return (void *)__bus_to_virt(addr); | |
| 26 | +} | |
| 27 | + | |
| 28 | +static inline dma_addr_t virt_to_dma(struct device *dev, void *addr) | |
| 29 | +{ | |
| 30 | + return (dma_addr_t)__virt_to_bus((unsigned long)(addr)); | |
| 31 | +} | |
| 32 | +#else | |
| 33 | +static inline dma_addr_t page_to_dma(struct device *dev, struct page *page) | |
| 34 | +{ | |
| 35 | + return __arch_page_to_dma(dev, page); | |
| 36 | +} | |
| 37 | + | |
| 38 | +static inline void *dma_to_virt(struct device *dev, dma_addr_t addr) | |
| 39 | +{ | |
| 40 | + return __arch_dma_to_virt(dev, addr); | |
| 41 | +} | |
| 42 | + | |
| 43 | +static inline dma_addr_t virt_to_dma(struct device *dev, void *addr) | |
| 44 | +{ | |
| 45 | + return __arch_virt_to_dma(dev, addr); | |
| 46 | +} | |
| 47 | +#endif | |
| 11 | 48 | |
| 12 | 49 | /* |
| 13 | 50 | * DMA-consistent mapping functions. These allocate/free a region of |
| @@ -169,7 +206,7 @@ dma_map_single(struct device *dev, void *cpu_addr, size_t size, · 155 unmodified lines | ||
| 169 | 206 | if (!arch_is_coherent()) |
| 170 | 207 | dma_cache_maint(cpu_addr, size, dir); |
| 171 | 208 | |
| 172 | − return virt_to_dma(dev, (unsigned long)cpu_addr); | |
| 209 | + return virt_to_dma(dev, cpu_addr); | |
| 173 | 210 | } |
| 174 | 211 | #else |
| 175 | 212 | extern dma_addr_t dma_map_single(struct device *,void *, size_t, enum dma_data_direction); |
| @@ -195,7 +232,7 @@ dma_map_page(struct device *dev, struct page *page, · 19 unmodified lines | ||
| 195 | 232 | unsigned long offset, size_t size, |
| 196 | 233 | enum dma_data_direction dir) |
| 197 | 234 | { |
| 198 | − return dma_map_single(dev, page_address(page) + offset, size, (int)dir); | |
| 235 | + return dma_map_single(dev, page_address(page) + offset, size, dir); | |
| 199 | 236 | } |
| 200 | 237 | |
| 201 | 238 | /** |
| @@ -241,7 +278,7 @@ static inline void · 39 unmodified lines | ||
| 241 | 278 | dma_unmap_page(struct device *dev, dma_addr_t handle, size_t size, |
| 242 | 279 | enum dma_data_direction dir) |
| 243 | 280 | { |
| 244 | − dma_unmap_single(dev, handle, size, (int)dir); | |
| 281 | + dma_unmap_single(dev, handle, size, dir); | |
| 245 | 282 | } |
| 246 | 283 | |
| 247 | 284 | /** |
| @@ -314,11 +351,12 @@ extern void dma_unmap_sg(struct device *, struct scatterlist *, int, enum dma_da · 66 unmodified lines | ||
| 314 | 351 | |
| 315 | 352 | |
| 316 | 353 | /** |
| 317 | − * dma_sync_single_for_cpu | |
| 354 | + * dma_sync_single_range_for_cpu | |
| 318 | 355 | * @dev: valid struct device pointer, or NULL for ISA and EISA-like devices |
| 319 | 356 | * @handle: DMA address of buffer |
| 320 | − * @size: size of buffer to map | |
| 321 | − * @dir: DMA transfer direction | |
| 357 | + * @offset: offset of region to start sync | |
| 358 | + * @size: size of region to sync | |
| 359 | + * @dir: DMA transfer direction (same as passed to dma_map_single) | |
| 322 | 360 | * |
| 323 | 361 | * Make physical memory consistent for a single streaming mode DMA |
| 324 | 362 | * translation after a transfer. |
| @@ -332,25 +370,41 @@ extern void dma_unmap_sg(struct device *, struct scatterlist *, int, enum dma_da · 7 unmodified lines | ||
| 332 | 370 | */ |
| 333 | 371 | #ifndef CONFIG_DMABOUNCE |
| 334 | 372 | static inline void |
| 335 | −dma_sync_single_for_cpu(struct device *dev, dma_addr_t handle, size_t size, | |
| 336 | − enum dma_data_direction dir) | |
| 373 | +dma_sync_single_range_for_cpu(struct device *dev, dma_addr_t handle, | |
| 374 | + unsigned long offset, size_t size, | |
| 375 | + enum dma_data_direction dir) | |
| 337 | 376 | { |
| 338 | 377 | if (!arch_is_coherent()) |
| 339 | − dma_cache_maint((void *)dma_to_virt(dev, handle), size, dir); | |
| 378 | + dma_cache_maint(dma_to_virt(dev, handle) + offset, size, dir); | |
| 340 | 379 | } |
| 341 | 380 | |
| 342 | 381 | static inline void |
| 343 | −dma_sync_single_for_device(struct device *dev, dma_addr_t handle, size_t size, | |
| 344 | − enum dma_data_direction dir) | |
| 382 | +dma_sync_single_range_for_device(struct device *dev, dma_addr_t handle, | |
| 383 | + unsigned long offset, size_t size, | |
| 384 | + enum dma_data_direction dir) | |
| 345 | 385 | { |
| 346 | 386 | if (!arch_is_coherent()) |
| 347 | − dma_cache_maint((void *)dma_to_virt(dev, handle), size, dir); | |
| 387 | + dma_cache_maint(dma_to_virt(dev, handle) + offset, size, dir); | |
| 348 | 388 | } |
| 349 | 389 | #else |
| 350 | −extern void dma_sync_single_for_cpu(struct device*, dma_addr_t, size_t, enum dma_data_direction); | |
| 351 | −extern void dma_sync_single_for_device(struct device*, dma_addr_t, size_t, enum dma_data_direction); | |
| 390 | +extern void dma_sync_single_range_for_cpu(struct device *, dma_addr_t, unsigned long, size_t, enum dma_data_direction); | |
| 391 | +extern void dma_sync_single_range_for_device(struct device *, dma_addr_t, unsigned long, size_t, enum dma_data_direction); | |
| 352 | 392 | #endif |
| 353 | 393 | |
| 394 | +static inline void | |
| 395 | +dma_sync_single_for_cpu(struct device *dev, dma_addr_t handle, size_t size, | |
| 396 | + enum dma_data_direction dir) | |
| 397 | +{ | |
| 398 | + dma_sync_single_range_for_cpu(dev, handle, 0, size, dir); | |
| 399 | +} | |
| 400 | + | |
| 401 | +static inline void | |
| 402 | +dma_sync_single_for_device(struct device *dev, dma_addr_t handle, size_t size, | |
| 403 | + enum dma_data_direction dir) | |
| 404 | +{ | |
| 405 | + dma_sync_single_range_for_device(dev, handle, 0, size, dir); | |
| 406 | +} | |
| 407 | + | |
| 354 | 408 | |
| 355 | 409 | /** |
| 356 | 410 | * dma_sync_sg_for_cpu |
| @@ -6,7 +6,7 @@ typedef unsigned int dmach_t; · 5 unmodified lines | ||
| 6 | 6 | #include <linux/spinlock.h> |
| 7 | 7 | #include <asm/system.h> |
| 8 | 8 | #include <asm/scatterlist.h> |
| 9 | −#include <asm/arch/dma.h> | |
| 9 | +#include <mach/dma.h> | |
| 10 | 10 | |
| 11 | 11 | /* |
| 12 | 12 | * This is the maximum virtual address which can be DMA'd from. |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/domain.h | |
| 2 | + * arch/arm/include/asm/domain.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 1999 Russell King. |
| 5 | 5 | * |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/ecard.h | |
| 2 | + * arch/arm/include/asm/ecard.h | |
| 3 | 3 | * |
| 4 | 4 | * definitions for expansion cards |
| 5 | 5 | * |
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/fiq.h | |
| 2 | + * arch/arm/include/asm/fiq.h | |
| 3 | 3 | * |
| 4 | 4 | * Support for FIQ on ARM architectures. |
| 5 | 5 | * Written by Philip Blundell <philb@gnu.org>, 1998 |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/flat.h -- uClinux flat-format executables | |
| 2 | + * arch/arm/include/asm/flat.h -- uClinux flat-format executables | |
| 3 | 3 | */ |
| 4 | 4 | |
| 5 | 5 | #ifndef __ARM_FLAT_H__ |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/floppy.h | |
| 2 | + * arch/arm/include/asm/floppy.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 1996-2000 Russell King |
| 5 | 5 | * |
| @@ -12,7 +12,7 @@ · 6 unmodified lines | ||
| 12 | 12 | #ifndef __ASM_ARM_FLOPPY_H |
| 13 | 13 | #define __ASM_ARM_FLOPPY_H |
| 14 | 14 | #if 0 |
| 15 | −#include <asm/arch/floppy.h> | |
| 15 | +#include <mach/floppy.h> | |
| 16 | 16 | #endif |
| 17 | 17 | |
| 18 | 18 | #define fd_outb(val,port) \ |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/fpstate.h | |
| 2 | + * arch/arm/include/asm/fpstate.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 1995 Russell King |
| 5 | 5 | * |
File renamed without changes.
File renamed without changes.
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/glue.h | |
| 2 | + * arch/arm/include/asm/glue.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 1997-1999 Russell King |
| 5 | 5 | * Copyright (C) 2000-2002 Deep Blue Solutions Ltd. |
| @@ -2,6 +2,6 @@ · 1 unmodified line | ||
| 2 | 2 | #define _ARCH_ARM_GPIO_H |
| 3 | 3 | |
| 4 | 4 | /* not all ARM platforms necessarily support this API ... */ |
| 5 | −#include <asm/arch/gpio.h> | |
| 5 | +#include <mach/gpio.h> | |
| 6 | 6 | |
| 7 | 7 | #endif /* _ARCH_ARM_GPIO_H */ |
File renamed without changes.
File renamed without changes.
File renamed without changes.
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/hardware/cache-l2x0.h | |
| 2 | + * arch/arm/include/asm/hardware/cache-l2x0.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 2007 ARM Limited |
| 5 | 5 | * |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/hardware/clps7111.h | |
| 2 | + * arch/arm/include/asm/hardware/clps7111.h | |
| 3 | 3 | * |
| 4 | 4 | * This file contains the hardware definitions of the CLPS7111 internal |
| 5 | 5 | * registers. |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/hardware/cs89712.h | |
| 2 | + * arch/arm/include/asm/hardware/cs89712.h | |
| 3 | 3 | * |
| 4 | 4 | * This file contains the hardware definitions of the CS89712 |
| 5 | 5 | * additional internal registers. |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/hardware/debug-8250.S | |
| 2 | + * arch/arm/include/asm/hardware/debug-8250.S | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 1994-1999 Russell King |
| 5 | 5 | * |
| @@ -1,4 +1,4 @@ | ||
| 1 | −/* linux/include/asm-arm/hardware/debug-pl01x.S | |
| 1 | +/* arch/arm/include/asm/hardware/debug-pl01x.S | |
| 2 | 2 | * |
| 3 | 3 | * Debugging macro include header |
| 4 | 4 | * |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/hardware/dec21285.h | |
| 2 | + * arch/arm/include/asm/hardware/dec21285.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 1998 Russell King |
| 5 | 5 | * |
| @@ -19,7 +19,7 @@ · 13 unmodified lines | ||
| 19 | 19 | #define DC21285_PCI_MEM 0x80000000 |
| 20 | 20 | |
| 21 | 21 | #ifndef __ASSEMBLY__ |
| 22 | −#include <asm/hardware.h> | |
| 22 | +#include <mach/hardware.h> | |
| 23 | 23 | #define DC21285_IO(x) ((volatile unsigned long *)(ARMCSR_BASE+(x))) |
| 24 | 24 | #else |
| 25 | 25 | #define DC21285_IO(x) (x) |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/hardware/entry-macro-iomd.S | |
| 2 | + * arch/arm/include/asm/hardware/entry-macro-iomd.S | |
| 3 | 3 | * |
| 4 | 4 | * Low-level IRQ helper macros for IOC/IOMD based platforms |
| 5 | 5 | * |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/hardware/ep7211.h | |
| 2 | + * arch/arm/include/asm/hardware/ep7211.h | |
| 3 | 3 | * |
| 4 | 4 | * This file contains the hardware definitions of the EP7211 internal |
| 5 | 5 | * registers. |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/hardware/ep7212.h | |
| 2 | + * arch/arm/include/asm/hardware/ep7212.h | |
| 3 | 3 | * |
| 4 | 4 | * This file contains the hardware definitions of the EP7212 internal |
| 5 | 5 | * registers. |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/hardware/gic.h | |
| 2 | + * arch/arm/include/asm/hardware/gic.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 2002 ARM Limited, All Rights Reserved. |
| 5 | 5 | * |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/hardware/icst307.h | |
| 2 | + * arch/arm/include/asm/hardware/icst307.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 2003 Deep Blue Solutions, Ltd, All Rights Reserved. |
| 5 | 5 | * |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/hardware/icst525.h | |
| 2 | + * arch/arm/include/asm/hardware/icst525.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 2003 Deep Blue Solutions, Ltd, All Rights Reserved. |
| 5 | 5 | * |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/hardware/ioc.h | |
| 2 | + * arch/arm/include/asm/hardware/ioc.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) Russell King |
| 5 | 5 | * |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/hardware/iomd.h | |
| 2 | + * arch/arm/include/asm/hardware/iomd.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 1999 Russell King |
| 5 | 5 | * |
| @@ -19,7 +19,7 @@ · 18 unmodified lines | ||
| 19 | 19 | #define _ADMA_H |
| 20 | 20 | #include <linux/types.h> |
| 21 | 21 | #include <linux/io.h> |
| 22 | −#include <asm/hardware.h> | |
| 22 | +#include <mach/hardware.h> | |
| 23 | 23 | #include <asm/hardware/iop_adma.h> |
| 24 | 24 | |
| 25 | 25 | /* Memory copy units */ |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/hardware/iop3xx-gpio.h | |
| 2 | + * arch/arm/include/asm/hardware/iop3xx-gpio.h | |
| 3 | 3 | * |
| 4 | 4 | * IOP3xx GPIO wrappers |
| 5 | 5 | * |
| @@ -25,7 +25,7 @@ · 19 unmodified lines | ||
| 25 | 25 | #ifndef __ASM_ARM_HARDWARE_IOP3XX_GPIO_H |
| 26 | 26 | #define __ASM_ARM_HARDWARE_IOP3XX_GPIO_H |
| 27 | 27 | |
| 28 | −#include <asm/hardware.h> | |
| 28 | +#include <mach/hardware.h> | |
| 29 | 29 | #include <asm-generic/gpio.h> |
| 30 | 30 | |
| 31 | 31 | #define IOP3XX_N_GPIOS 8 |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/hardware/iop3xx.h | |
| 2 | + * arch/arm/include/asm/hardware/iop3xx.h | |
| 3 | 3 | * |
| 4 | 4 | * Intel IOP32X and IOP33X register definitions |
| 5 | 5 | * |
File renamed without changes.
File renamed without changes.
File renamed without changes.
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/hardware/locomo.h | |
| 2 | + * arch/arm/include/asm/hardware/locomo.h | |
| 3 | 3 | * |
| 4 | 4 | * This file contains the definitions for the LoCoMo G/A Chip |
| 5 | 5 | * |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/hardware/memc.h | |
| 2 | + * arch/arm/include/asm/hardware/memc.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) Russell King. |
| 5 | 5 | * |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/hardware/pci_v3.h | |
| 2 | + * arch/arm/include/asm/hardware/pci_v3.h | |
| 3 | 3 | * |
| 4 | 4 | * Internal header file PCI V3 chip |
| 5 | 5 | * |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/hardware/sa1111.h | |
| 2 | + * arch/arm/include/asm/hardware/sa1111.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 2000 John G Dorsey <john+@cs.cmu.edu> |
| 5 | 5 | * |
| @@ -12,7 +12,7 @@ · 6 unmodified lines | ||
| 12 | 12 | #ifndef _ASM_ARCH_SA1111 |
| 13 | 13 | #define _ASM_ARCH_SA1111 |
| 14 | 14 | |
| 15 | −#include <asm/arch/bitfield.h> | |
| 15 | +#include <mach/bitfield.h> | |
| 16 | 16 | |
| 17 | 17 | /* |
| 18 | 18 | * The SA1111 is always located at virtual 0xf4000000, and is always |
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/hardware/vic.h | |
| 2 | + * arch/arm/include/asm/hardware/vic.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (c) ARM Limited 2003. All rights reserved. |
| 5 | 5 | * |
| @@ -0,0 +1,27 @@ | ||
| 1 | +/* | |
| 2 | + * Nothing to see here yet | |
| 3 | + */ | |
| 4 | +#ifndef _ARCH_ARM_HW_IRQ_H | |
| 5 | +#define _ARCH_ARM_HW_IRQ_H | |
| 6 | + | |
| 7 | +static inline void ack_bad_irq(int irq) | |
| 8 | +{ | |
| 9 | + extern unsigned long irq_err_count; | |
| 10 | + irq_err_count++; | |
| 11 | +} | |
| 12 | + | |
| 13 | +/* | |
| 14 | + * Obsolete inline function for calling irq descriptor handlers. | |
| 15 | + */ | |
| 16 | +static inline void desc_handle_irq(unsigned int irq, struct irq_desc *desc) | |
| 17 | +{ | |
| 18 | + desc->handle_irq(irq, desc); | |
| 19 | +} | |
| 20 | + | |
| 21 | +void set_irq_flags(unsigned int irq, unsigned int flags); | |
| 22 | + | |
| 23 | +#define IRQF_VALID (1 << 0) | |
| 24 | +#define IRQF_PROBE (1 << 1) | |
| 25 | +#define IRQF_NOAUTOEN (1 << 2) | |
| 26 | + | |
| 27 | +#endif | |
File renamed without changes.
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/ide.h | |
| 2 | + * arch/arm/include/asm/ide.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 1994-1996 Linus Torvalds & authors |
| 5 | 5 | */ |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/io.h | |
| 2 | + * arch/arm/include/asm/io.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 1996-2000 Russell King |
| 5 | 5 | * |
| @@ -82,7 +82,7 @@ extern void __readwrite_bug(const char *fn); · 76 unmodified lines | ||
| 82 | 82 | /* |
| 83 | 83 | * Now, pick up the machine-defined IO definitions |
| 84 | 84 | */ |
| 85 | −#include <asm/arch/io.h> | |
| 85 | +#include <mach/io.h> | |
| 86 | 86 | |
| 87 | 87 | /* |
| 88 | 88 | * IO port access primitives |
File renamed without changes.
File renamed without changes.
File renamed without changes.
| @@ -1,7 +1,7 @@ | ||
| 1 | 1 | #ifndef __ASM_ARM_IRQ_H |
| 2 | 2 | #define __ASM_ARM_IRQ_H |
| 3 | 3 | |
| 4 | −#include <asm/arch/irqs.h> | |
| 4 | +#include <mach/irqs.h> | |
| 5 | 5 | |
| 6 | 6 | #ifndef irq_canonicalize |
| 7 | 7 | #define irq_canonicalize(i) (i) |
File renamed without changes.
File renamed without changes.
File renamed without changes.
| @@ -10,7 +10,7 @@ · 9 unmodified lines | ||
| 10 | 10 | /* Maximum address we can use for the control code buffer */ |
| 11 | 11 | #define KEXEC_CONTROL_MEMORY_LIMIT (-1UL) |
| 12 | 12 | |
| 13 | −#define KEXEC_CONTROL_CODE_SIZE 4096 | |
| 13 | +#define KEXEC_CONTROL_PAGE_SIZE 4096 | |
| 14 | 14 | |
| 15 | 15 | #define KEXEC_ARCH KEXEC_ARCH_ARM |
| 16 | 16 | |
File renamed without changes.
File renamed without changes.
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/kprobes.h | |
| 2 | + * arch/arm/include/asm/kprobes.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 2006, 2007 Motorola Inc. |
| 5 | 5 | * |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/leds.h | |
| 2 | + * arch/arm/include/asm/leds.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 1998 Russell King |
| 5 | 5 | * |
File renamed without changes.
File renamed without changes.
File renamed without changes.
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/locks.h | |
| 2 | + * arch/arm/include/asm/locks.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 2000 Russell King |
| 5 | 5 | * |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/mach/arch.h | |
| 2 | + * arch/arm/include/asm/mach/arch.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 2000 Russell King |
| 5 | 5 | * |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/mach/dma.h | |
| 2 | + * arch/arm/include/asm/mach/dma.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 1998-2000 Russell King |
| 5 | 5 | * |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/mach/flash.h | |
| 2 | + * arch/arm/include/asm/mach/flash.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 2003 Russell King, All Rights Reserved. |
| 5 | 5 | * |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/mach/irda.h | |
| 2 | + * arch/arm/include/asm/mach/irda.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 2004 Russell King. |
| 5 | 5 | * |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/mach/irq.h | |
| 2 | + * arch/arm/include/asm/mach/irq.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 1995-2000 Russell King. |
| 5 | 5 | * |
| @@ -21,20 +21,6 @@ extern void (*init_arch_irq)(void); · 15 unmodified lines | ||
| 21 | 21 | extern void init_FIQ(void); |
| 22 | 22 | extern int show_fiq_list(struct seq_file *, void *); |
| 23 | 23 | |
| 24 | −/* | |
| 25 | − * Obsolete inline function for calling irq descriptor handlers. | |
| 26 | − */ | |
| 27 | −static inline void desc_handle_irq(unsigned int irq, struct irq_desc *desc) | |
| 28 | −{ | |
| 29 | − desc->handle_irq(irq, desc); | |
| 30 | −} | |
| 31 | − | |
| 32 | −void set_irq_flags(unsigned int irq, unsigned int flags); | |
| 33 | − | |
| 34 | −#define IRQF_VALID (1 << 0) | |
| 35 | −#define IRQF_PROBE (1 << 1) | |
| 36 | −#define IRQF_NOAUTOEN (1 << 2) | |
| 37 | − | |
| 38 | 24 | /* |
| 39 | 25 | * This is for easy migration, but should be changed in the source |
| 40 | 26 | */ |
| @@ -45,10 +31,4 @@ do { \ · 4 unmodified lines | ||
| 45 | 31 | spin_unlock(&desc->lock); \ |
| 46 | 32 | } while(0) |
| 47 | 33 | |
| 48 | −extern unsigned long irq_err_count; | |
| 49 | −static inline void ack_bad_irq(int irq) | |
| 50 | −{ | |
| 51 | − irq_err_count++; | |
| 52 | −} | |
| 53 | − | |
| 54 | 34 | #endif |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/map.h | |
| 2 | + * arch/arm/include/asm/map.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 1999-2000 Russell King |
| 5 | 5 | * |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/mach/mmc.h | |
| 2 | + * arch/arm/include/asm/mach/mmc.h | |
| 3 | 3 | */ |
| 4 | 4 | #ifndef ASMARM_MACH_MMC_H |
| 5 | 5 | #define ASMARM_MACH_MMC_H |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/mach/pci.h | |
| 2 | + * arch/arm/include/asm/mach/pci.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 2000 Russell King |
| 5 | 5 | * |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/mach/serial_at91.h | |
| 2 | + * arch/arm/include/asm/mach/serial_at91.h | |
| 3 | 3 | * |
| 4 | 4 | * Based on serial_sa1100.h by Nicolas Pitre |
| 5 | 5 | * |
| @@ -1,9 +1,9 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/mach/serial_sa1100.h | |
| 2 | + * arch/arm/include/asm/mach/serial_sa1100.h | |
| 3 | 3 | * |
| 4 | 4 | * Author: Nicolas Pitre |
| 5 | 5 | * |
| 6 | − * Moved to include/asm-arm/mach and changed lots, Russell King | |
| 6 | + * Moved and changed lots, Russell King | |
| 7 | 7 | * |
| 8 | 8 | * Low level machine dependent UART functions. |
| 9 | 9 | */ |
File renamed without changes.
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/mach/time.h | |
| 2 | + * arch/arm/include/asm/mach/time.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 2004 MontaVista Software, Inc. |
| 5 | 5 | * |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/mach/udc_pxa2xx.h | |
| 2 | + * arch/arm/include/asm/mach/udc_pxa2xx.h | |
| 3 | 3 | * |
| 4 | 4 | * This supports machine-specific differences in how the PXA2xx |
| 5 | 5 | * USB Device Controller (UDC) is wired. |
| @@ -4,7 +4,7 @@ · 3 unmodified lines | ||
| 4 | 4 | #ifndef _ASM_MC146818RTC_H |
| 5 | 5 | #define _ASM_MC146818RTC_H |
| 6 | 6 | |
| 7 | −#include <asm/arch/irqs.h> | |
| 7 | +#include <mach/irqs.h> | |
| 8 | 8 | #include <asm/io.h> |
| 9 | 9 | |
| 10 | 10 | #ifndef RTC_PORT |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/memory.h | |
| 2 | + * arch/arm/include/asm/memory.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 2000-2002 Russell King |
| 5 | 5 | * modification for nommu, Hyok S. Choi, 2004 |
| @@ -24,7 +24,7 @@ · 18 unmodified lines | ||
| 24 | 24 | #endif |
| 25 | 25 | |
| 26 | 26 | #include <linux/compiler.h> |
| 27 | −#include <asm/arch/memory.h> | |
| 27 | +#include <mach/memory.h> | |
| 28 | 28 | #include <asm/sizes.h> |
| 29 | 29 | |
| 30 | 30 | #ifdef CONFIG_MMU |
| @@ -149,6 +149,14 @@ · 118 unmodified lines | ||
| 149 | 149 | #define arch_adjust_zones(node,size,holes) do { } while (0) |
| 150 | 150 | #endif |
| 151 | 151 | |
| 152 | +/* | |
| 153 | + * Amount of memory reserved for the vmalloc() area, and minimum | |
| 154 | + * address for vmalloc mappings. | |
| 155 | + */ | |
| 156 | +extern unsigned long vmalloc_reserve; | |
| 157 | + | |
| 158 | +#define VMALLOC_MIN (void *)(VMALLOC_END - vmalloc_reserve) | |
| 159 | + | |
| 152 | 160 | /* |
| 153 | 161 | * PFNs are used to describe any physical page; this means |
| 154 | 162 | * PFN 0 == physical address 0. |
| @@ -305,20 +313,6 @@ static inline __deprecated void *bus_to_virt(unsigned long x) · 150 unmodified lines | ||
| 305 | 313 | */ |
| 306 | 314 | #define page_to_phys(page) (page_to_pfn(page) << PAGE_SHIFT) |
| 307 | 315 | |
| 308 | −/* | |
| 309 | − * Optional device DMA address remapping. Do _not_ use directly! | |
| 310 | − * We should really eliminate virt_to_bus() here - it's deprecated. | |
| 311 | − */ | |
| 312 | −#ifndef __arch_page_to_dma | |
| 313 | −#define page_to_dma(dev, page) ((dma_addr_t)__virt_to_bus((unsigned long)page_address(page))) | |
| 314 | −#define dma_to_virt(dev, addr) ((void *)__bus_to_virt(addr)) | |
| 315 | −#define virt_to_dma(dev, addr) ((dma_addr_t)__virt_to_bus((unsigned long)(addr))) | |
| 316 | −#else | |
| 317 | −#define page_to_dma(dev, page) (__arch_page_to_dma(dev, page)) | |
| 318 | −#define dma_to_virt(dev, addr) (__arch_dma_to_virt(dev, addr)) | |
| 319 | −#define virt_to_dma(dev, addr) (__arch_virt_to_dma(dev, addr)) | |
| 320 | −#endif | |
| 321 | − | |
| 322 | 316 | /* |
| 323 | 317 | * Optional coherency support. Currently used only by selected |
| 324 | 318 | * Intel XSC3-based systems. |
File renamed without changes.
File renamed without changes.
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/mmu_context.h | |
| 2 | + * arch/arm/include/asm/mmu_context.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 1996 Russell King. |
| 5 | 5 | * |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/mmzone.h | |
| 2 | + * arch/arm/include/asm/mmzone.h | |
| 3 | 3 | * |
| 4 | 4 | * 1999-12-29 Nicolas Pitre Created |
| 5 | 5 | * |
| @@ -25,6 +25,6 @@ extern pg_data_t discontig_node_data[]; · 19 unmodified lines | ||
| 25 | 25 | */ |
| 26 | 26 | #define NODE_MEM_MAP(nid) (NODE_DATA(nid)->node_mem_map) |
| 27 | 27 | |
| 28 | −#include <asm/arch/memory.h> | |
| 28 | +#include <mach/memory.h> | |
| 29 | 29 | |
| 30 | 30 | #endif |
File renamed without changes.
File renamed without changes.
| @@ -10,15 +10,13 @@ · 9 unmodified lines | ||
| 10 | 10 | * This program is free software; you can redistribute it and/or modify |
| 11 | 11 | * it under the terms of the GNU General Public License version 2 as |
| 12 | 12 | * published by the Free Software Foundation. |
| 13 | − * | |
| 14 | − * $Id: xip.h,v 1.2 2004/12/01 15:49:10 nico Exp $ | |
| 15 | 13 | */ |
| 16 | 14 | |
| 17 | 15 | #ifndef __ARM_MTD_XIP_H__ |
| 18 | 16 | #define __ARM_MTD_XIP_H__ |
| 19 | 17 | |
| 20 | −#include <asm/hardware.h> | |
| 21 | −#include <asm/arch/mtd-xip.h> | |
| 18 | +#include <mach/hardware.h> | |
| 19 | +#include <mach/mtd-xip.h> | |
| 22 | 20 | |
| 23 | 21 | /* fill instruction prefetch */ |
| 24 | 22 | #define xip_iprefetch() do { asm volatile (".rep 8; nop; .endr"); } while (0) |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/mutex.h | |
| 2 | + * arch/arm/include/asm/mutex.h | |
| 3 | 3 | * |
| 4 | 4 | * ARM optimized mutex locking primitives |
| 5 | 5 | * |
File renamed without changes.
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/page-nommu.h | |
| 2 | + * arch/arm/include/asm/page-nommu.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 2004 Hyok S. Choi |
| 5 | 5 | * |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/page.h | |
| 2 | + * arch/arm/include/asm/page.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 1995-2003 Russell King |
| 5 | 5 | * |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/param.h | |
| 2 | + * arch/arm/include/asm/param.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 1995-1999 Russell King |
| 5 | 5 | * |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/parport.h: ARM-specific parport initialisation | |
| 2 | + * arch/arm/include/asm/parport.h: ARM-specific parport initialisation | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 1999, 2000 Tim Waugh <tim@cyberelk.demon.co.uk> |
| 5 | 5 | * |
| @@ -4,7 +4,7 @@ · 3 unmodified lines | ||
| 4 | 4 | #ifdef __KERNEL__ |
| 5 | 5 | #include <asm-generic/pci-dma-compat.h> |
| 6 | 6 | |
| 7 | −#include <asm/hardware.h> /* for PCIBIOS_MIN_* */ | |
| 7 | +#include <mach/hardware.h> /* for PCIBIOS_MIN_* */ | |
| 8 | 8 | |
| 9 | 9 | #define pcibios_scan_all_fns(a, b) 0 |
| 10 | 10 | |
File renamed without changes.
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/pgalloc.h | |
| 2 | + * arch/arm/include/asm/pgalloc.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 2000-2001 Russell King |
| 5 | 5 | * |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/pgtable-hwdef.h | |
| 2 | + * arch/arm/include/asm/pgtable-hwdef.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 1995-2002 Russell King |
| 5 | 5 | * |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/pgtable-nommu.h | |
| 2 | + * arch/arm/include/asm/pgtable-nommu.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 1995-2002 Russell King |
| 5 | 5 | * Copyright (C) 2004 Hyok S. Choi |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/pgtable.h | |
| 2 | + * arch/arm/include/asm/pgtable.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 1995-2002 Russell King |
| 5 | 5 | * |
| @@ -20,7 +20,7 @@ · 14 unmodified lines | ||
| 20 | 20 | #else |
| 21 | 21 | |
| 22 | 22 | #include <asm/memory.h> |
| 23 | −#include <asm/arch/vmalloc.h> | |
| 23 | +#include <mach/vmalloc.h> | |
| 24 | 24 | #include <asm/pgtable-hwdef.h> |
| 25 | 25 | |
| 26 | 26 | /* |
File renamed without changes.
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/posix_types.h | |
| 2 | + * arch/arm/include/asm/posix_types.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 1996-1998 Russell King. |
| 5 | 5 | * |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/proc-fns.h | |
| 2 | + * arch/arm/include/asm/proc-fns.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 1997-1999 Russell King |
| 5 | 5 | * Copyright (C) 2000 Deep Blue Solutions Ltd |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/processor.h | |
| 2 | + * arch/arm/include/asm/processor.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 1995-1999 Russell King |
| 5 | 5 | * |
| @@ -112,9 +112,9 @@ extern int kernel_thread(int (*fn)(void *), void *arg, unsigned long flags); · 106 unmodified lines | ||
| 112 | 112 | static inline void prefetch(const void *ptr) |
| 113 | 113 | { |
| 114 | 114 | __asm__ __volatile__( |
| 115 | − "pld\t%0" | |
| 115 | + "pld\t%a0" | |
| 116 | 116 | : |
| 117 | − : "o" (*(char *)ptr) | |
| 117 | + : "p" (ptr) | |
| 118 | 118 | : "cc"); |
| 119 | 119 | } |
| 120 | 120 | |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/procinfo.h | |
| 2 | + * arch/arm/include/asm/procinfo.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 1996-1999 Russell King |
| 5 | 5 | * |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/ptrace.h | |
| 2 | + * arch/arm/include/asm/ptrace.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 1996-2003 Russell King |
| 5 | 5 | * |
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/serial.h | |
| 2 | + * arch/arm/include/asm/serial.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 1996 Russell King. |
| 5 | 5 | * |
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/smp.h | |
| 2 | + * arch/arm/include/asm/smp.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 2004-2005 ARM Ltd. |
| 5 | 5 | * |
| @@ -14,10 +14,10 @@ · 8 unmodified lines | ||
| 14 | 14 | #include <linux/cpumask.h> |
| 15 | 15 | #include <linux/thread_info.h> |
| 16 | 16 | |
| 17 | −#include <asm/arch/smp.h> | |
| 17 | +#include <mach/smp.h> | |
| 18 | 18 | |
| 19 | 19 | #ifndef CONFIG_SMP |
| 20 | −# error "<asm-arm/smp.h> included in non-SMP build" | |
| 20 | +# error "<asm/smp.h> included in non-SMP build" | |
| 21 | 21 | #endif |
| 22 | 22 | |
| 23 | 23 | #define raw_smp_processor_id() (current_thread_info()->cpu) |
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/therm.h: Definitions for Dallas Semiconductor | |
| 2 | + * arch/arm/include/asm/therm.h: Definitions for Dallas Semiconductor | |
| 3 | 3 | * DS1620 thermometer driver (as used in the Rebel.com NetWinder) |
| 4 | 4 | */ |
| 5 | 5 | #ifndef __ASM_THERM_H |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/thread_info.h | |
| 2 | + * arch/arm/include/asm/thread_info.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 2002 Russell King. |
| 5 | 5 | * |
| @@ -117,7 +117,7 @@ extern void iwmmxt_task_switch(struct thread_info *); · 111 unmodified lines | ||
| 117 | 117 | |
| 118 | 118 | /* |
| 119 | 119 | * We use bit 30 of the preempt_count to indicate that kernel |
| 120 | − * preemption is occurring. See include/asm-arm/hardirq.h. | |
| 120 | + * preemption is occurring. See <asm/hardirq.h>. | |
| 121 | 121 | */ |
| 122 | 122 | #define PREEMPT_ACTIVE 0x40000000 |
| 123 | 123 | |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/thread_notify.h | |
| 2 | + * arch/arm/include/asm/thread_notify.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 2006 Russell King. |
| 5 | 5 | * |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/timex.h | |
| 2 | + * arch/arm/include/asm/timex.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 1997,1998 Russell King |
| 5 | 5 | * |
| @@ -12,7 +12,7 @@ · 6 unmodified lines | ||
| 12 | 12 | #ifndef _ASMARM_TIMEX_H |
| 13 | 13 | #define _ASMARM_TIMEX_H |
| 14 | 14 | |
| 15 | −#include <asm/arch/timex.h> | |
| 15 | +#include <mach/timex.h> | |
| 16 | 16 | |
| 17 | 17 | typedef unsigned long cycles_t; |
| 18 | 18 | |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/tlb.h | |
| 2 | + * arch/arm/include/asm/tlb.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 2002 Russell King |
| 5 | 5 | * |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/tlbflush.h | |
| 2 | + * arch/arm/include/asm/tlbflush.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 1999-2003 Russell King |
| 5 | 5 | * |
| @@ -54,6 +54,7 @@ · 48 unmodified lines | ||
| 54 | 54 | * v4wbi - ARMv4 with write buffer with I TLB flush entry instruction |
| 55 | 55 | * fr - Feroceon (v4wbi with non-outer-cacheable page table walks) |
| 56 | 56 | * v6wbi - ARMv6 with write buffer with I TLB flush entry instruction |
| 57 | + * v7wbi - identical to v6wbi | |
| 57 | 58 | */ |
| 58 | 59 | #undef _TLB |
| 59 | 60 | #undef MULTI_TLB |
| @@ -266,14 +267,16 @@ extern struct cpu_tlb_fns cpu_tlb; · 206 unmodified lines | ||
| 266 | 267 | v4wbi_possible_flags | \ |
| 267 | 268 | fr_possible_flags | \ |
| 268 | 269 | v4wb_possible_flags | \ |
| 269 | − v6wbi_possible_flags) | |
| 270 | + v6wbi_possible_flags | \ | |
| 271 | + v7wbi_possible_flags) | |
| 270 | 272 | |
| 271 | 273 | #define always_tlb_flags (v3_always_flags & \ |
| 272 | 274 | v4_always_flags & \ |
| 273 | 275 | v4wbi_always_flags & \ |
| 274 | 276 | fr_always_flags & \ |
| 275 | 277 | v4wb_always_flags & \ |
| 276 | − v6wbi_always_flags) | |
| 278 | + v6wbi_always_flags & \ | |
| 279 | + v7wbi_always_flags) | |
| 277 | 280 | |
| 278 | 281 | #define tlb_flag(f) ((always_tlb_flags & (f)) || (__tlb_flag & possible_tlb_flags & (f))) |
| 279 | 282 | |
File renamed without changes.
File renamed without changes.
File renamed without changes.
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/uaccess.h | |
| 2 | + * arch/arm/include/asm/uaccess.h | |
| 3 | 3 | * |
| 4 | 4 | * This program is free software; you can redistribute it and/or modify |
| 5 | 5 | * it under the terms of the GNU General Public License version 2 as |
File renamed without changes.
File renamed without changes.
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/unistd.h | |
| 2 | + * arch/arm/include/asm/unistd.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 2001-2005 Russell King |
| 5 | 5 | * |
| @@ -381,6 +381,12 @@ · 375 unmodified lines | ||
| 381 | 381 | #define __NR_fallocate (__NR_SYSCALL_BASE+352) |
| 382 | 382 | #define __NR_timerfd_settime (__NR_SYSCALL_BASE+353) |
| 383 | 383 | #define __NR_timerfd_gettime (__NR_SYSCALL_BASE+354) |
| 384 | +#define __NR_signalfd4 (__NR_SYSCALL_BASE+355) | |
| 385 | +#define __NR_eventfd2 (__NR_SYSCALL_BASE+356) | |
| 386 | +#define __NR_epoll_create1 (__NR_SYSCALL_BASE+357) | |
| 387 | +#define __NR_dup3 (__NR_SYSCALL_BASE+358) | |
| 388 | +#define __NR_pipe2 (__NR_SYSCALL_BASE+359) | |
| 389 | +#define __NR_inotify_init1 (__NR_SYSCALL_BASE+360) | |
| 384 | 390 | |
| 385 | 391 | /* |
| 386 | 392 | * The following SWIs are ARM private. |
File renamed without changes.
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/vfp.h | |
| 2 | + * arch/arm/include/asm/vfp.h | |
| 3 | 3 | * |
| 4 | 4 | * VFP register definitions. |
| 5 | 5 | * First, the standard VFP set. |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/vfpmacros.h | |
| 2 | + * arch/arm/include/asm/vfpmacros.h | |
| 3 | 3 | * |
| 4 | 4 | * Assembler-only file containing VFP macros and register definitions. |
| 5 | 5 | */ |
| @@ -1,7 +1,7 @@ | ||
| 1 | 1 | #ifndef ASMARM_VGA_H |
| 2 | 2 | #define ASMARM_VGA_H |
| 3 | 3 | |
| 4 | −#include <asm/hardware.h> | |
| 4 | +#include <mach/hardware.h> | |
| 5 | 5 | #include <asm/io.h> |
| 6 | 6 | |
| 7 | 7 | #define VGA_MAP_MEM(x,s) (PCIMEM_BASE + (x)) |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/xor.h | |
| 2 | + * arch/arm/include/asm/xor.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 2001 Russell King |
| 5 | 5 | * |
| @@ -0,0 +1 @@ | ||
| 1 | +vmlinux.lds | |
| @@ -262,10 +262,10 @@ · 261 unmodified lines | ||
| 262 | 262 | /* 250 */ CALL(sys_epoll_create) |
| 263 | 263 | CALL(ABI(sys_epoll_ctl, sys_oabi_epoll_ctl)) |
| 264 | 264 | CALL(ABI(sys_epoll_wait, sys_oabi_epoll_wait)) |
| 265 | − CALL(sys_remap_file_pages) | |
| 265 | + CALL(sys_remap_file_pages) | |
| 266 | 266 | CALL(sys_ni_syscall) /* sys_set_thread_area */ |
| 267 | 267 | /* 255 */ CALL(sys_ni_syscall) /* sys_get_thread_area */ |
| 268 | − CALL(sys_set_tid_address) | |
| 268 | + CALL(sys_set_tid_address) | |
| 269 | 269 | CALL(sys_timer_create) |
| 270 | 270 | CALL(sys_timer_settime) |
| 271 | 271 | CALL(sys_timer_gettime) |
| @@ -364,6 +364,12 @@ · 92 unmodified lines | ||
| 364 | 364 | CALL(sys_fallocate) |
| 365 | 365 | CALL(sys_timerfd_settime) |
| 366 | 366 | CALL(sys_timerfd_gettime) |
| 367 | +/* 355 */ CALL(sys_signalfd4) | |
| 368 | + CALL(sys_eventfd2) | |
| 369 | + CALL(sys_epoll_create1) | |
| 370 | + CALL(sys_dup3) | |
| 371 | + CALL(sys_pipe2) | |
| 372 | +/* 360 */ CALL(sys_inotify_init1) | |
| 367 | 373 | #ifndef syscalls_counted |
| 368 | 374 | .equ syscalls_padding, ((NR_syscalls + 3) & ~3) - NR_syscalls |
| 369 | 375 | #define syscalls_counted |
| @@ -16,7 +16,7 @@ · 15 unmodified lines | ||
| 16 | 16 | #include <asm/ptrace.h> |
| 17 | 17 | #include <asm/thread_info.h> |
| 18 | 18 | #include <asm/asm-offsets.h> |
| 19 | −#include <asm/arch/ep93xx-regs.h> | |
| 19 | +#include <mach/ep93xx-regs.h> | |
| 20 | 20 | |
| 21 | 21 | /* |
| 22 | 22 | * We can't use hex constants here due to a bug in gas. |
| @@ -15,7 +15,7 @@ · 14 unmodified lines | ||
| 15 | 15 | #include <linux/signal.h> |
| 16 | 16 | #include <linux/sched.h> |
| 17 | 17 | #include <linux/init.h> |
| 18 | −#include <asm/arch/ep93xx-regs.h> | |
| 18 | +#include <mach/ep93xx-regs.h> | |
| 19 | 19 | #include <asm/thread_notify.h> |
| 20 | 20 | #include <asm/io.h> |
| 21 | 21 | |
| @@ -80,7 +80,7 @@ · 79 unmodified lines | ||
| 80 | 80 | #endif /* CONFIG_CPU_V6 */ |
| 81 | 81 | |
| 82 | 82 | #else |
| 83 | −#include <asm/arch/debug-macro.S> | |
| 83 | +#include <mach/debug-macro.S> | |
| 84 | 84 | #endif /* CONFIG_DEBUG_ICEDCC */ |
| 85 | 85 | |
| 86 | 86 | /* |
| @@ -46,7 +46,7 @@ · 45 unmodified lines | ||
| 46 | 46 | |
| 47 | 47 | #include <asm/dma.h> |
| 48 | 48 | #include <asm/ecard.h> |
| 49 | −#include <asm/hardware.h> | |
| 49 | +#include <mach/hardware.h> | |
| 50 | 50 | #include <asm/irq.h> |
| 51 | 51 | #include <asm/mmu_context.h> |
| 52 | 52 | #include <asm/mach/irq.h> |
| @@ -18,7 +18,7 @@ · 17 unmodified lines | ||
| 18 | 18 | #include <asm/memory.h> |
| 19 | 19 | #include <asm/glue.h> |
| 20 | 20 | #include <asm/vfpmacros.h> |
| 21 | −#include <asm/arch/entry-macro.S> | |
| 21 | +#include <mach/entry-macro.S> | |
| 22 | 22 | #include <asm/thread_notify.h> |
| 23 | 23 | |
| 24 | 24 | #include "entry-header.S" |
| @@ -10,7 +10,7 @@ · 9 unmodified lines | ||
| 10 | 10 | |
| 11 | 11 | #include <asm/unistd.h> |
| 12 | 12 | #include <asm/ftrace.h> |
| 13 | −#include <asm/arch/entry-macro.S> | |
| 13 | +#include <mach/entry-macro.S> | |
| 14 | 14 | |
| 15 | 15 | #include "entry-header.S" |
| 16 | 16 | |
| @@ -181,7 +181,7 @@ ENTRY(lookup_processor_type) · 180 unmodified lines | ||
| 181 | 181 | ldmfd sp!, {r4 - r7, r9, pc} |
| 182 | 182 | |
| 183 | 183 | /* |
| 184 | − * Look in include/asm-arm/procinfo.h and arch/arm/kernel/arch.[ch] for | |
| 184 | + * Look in <asm/procinfo.h> and arch/arm/kernel/arch.[ch] for | |
| 185 | 185 | * more information about the __proc_info and __arch_info structures. |
| 186 | 186 | */ |
| 187 | 187 | .long __proc_info_begin |
| @@ -15,7 +15,6 @@ · 14 unmodified lines | ||
| 15 | 15 | #include <linux/init.h> |
| 16 | 16 | |
| 17 | 17 | #include <asm/assembler.h> |
| 18 | −#include <asm/mach-types.h> | |
| 19 | 18 | #include <asm/ptrace.h> |
| 20 | 19 | #include <asm/asm-offsets.h> |
| 21 | 20 | #include <asm/thread_info.h> |
| @@ -38,6 +38,7 @@ · 37 unmodified lines | ||
| 38 | 38 | #include <linux/proc_fs.h> |
| 39 | 39 | |
| 40 | 40 | #include <asm/system.h> |
| 41 | +#include <asm/mach/irq.h> | |
| 41 | 42 | #include <asm/mach/time.h> |
| 42 | 43 | |
| 43 | 44 | /* |
| @@ -71,7 +71,7 @@ void machine_kexec(struct kimage *image) · 70 unmodified lines | ||
| 71 | 71 | |
| 72 | 72 | |
| 73 | 73 | flush_icache_range((unsigned long) reboot_code_buffer, |
| 74 | − (unsigned long) reboot_code_buffer + KEXEC_CONTROL_CODE_SIZE); | |
| 74 | + (unsigned long) reboot_code_buffer + KEXEC_CONTROL_PAGE_SIZE); | |
| 75 | 75 | printk(KERN_INFO "Bye!\n"); |
| 76 | 76 | |
| 77 | 77 | cpu_proc_fin(); |
| @@ -51,7 +51,7 @@ extern void setup_mm_for_reboot(char mode); · 50 unmodified lines | ||
| 51 | 51 | |
| 52 | 52 | static volatile int hlt_counter; |
| 53 | 53 | |
| 54 | −#include <asm/arch/system.h> | |
| 54 | +#include <mach/system.h> | |
| 55 | 55 | |
| 56 | 56 | void disable_hlt(void) |
| 57 | 57 | { |
| @@ -81,6 +81,8 @@ EXPORT_SYMBOL(system_serial_high); · 80 unmodified lines | ||
| 81 | 81 | unsigned int elf_hwcap; |
| 82 | 82 | EXPORT_SYMBOL(elf_hwcap); |
| 83 | 83 | |
| 84 | +unsigned long __initdata vmalloc_reserve = 128 << 20; | |
| 85 | + | |
| 84 | 86 | |
| 85 | 87 | #ifdef MULTI_CPU |
| 86 | 88 | struct processor processor; |
| @@ -500,6 +502,17 @@ static void __init early_mem(char **p) · 413 unmodified lines | ||
| 500 | 502 | } |
| 501 | 503 | __early_param("mem=", early_mem); |
| 502 | 504 | |
| 505 | +/* | |
| 506 | + * vmalloc=size forces the vmalloc area to be exactly 'size' | |
| 507 | + * bytes. This can be used to increase (or decrease) the vmalloc | |
| 508 | + * area - the default is 128m. | |
| 509 | + */ | |
| 510 | +static void __init early_vmalloc(char **arg) | |
| 511 | +{ | |
| 512 | + vmalloc_reserve = memparse(*arg, arg); | |
| 513 | +} | |
| 514 | +__early_param("vmalloc=", early_vmalloc); | |
| 515 | + | |
| 503 | 516 | /* |
| 504 | 517 | * Initial parsing of the command line. |
| 505 | 518 | */ |
| @@ -100,7 +100,7 @@ int __cpuinit __cpu_up(unsigned int cpu) · 99 unmodified lines | ||
| 100 | 100 | * a 1:1 mapping for the physical address of the kernel. |
| 101 | 101 | */ |
| 102 | 102 | pgd = pgd_alloc(&init_mm); |
| 103 | − pmd = pmd_offset(pgd, PHYS_OFFSET); | |
| 103 | + pmd = pmd_offset(pgd + pgd_index(PHYS_OFFSET), PHYS_OFFSET); | |
| 104 | 104 | *pmd = __pmd((PHYS_OFFSET & PGDIR_MASK) | |
| 105 | 105 | PMD_TYPE_SECT | PMD_SECT_AP_WRITE); |
| 106 | 106 | |
| @@ -139,7 +139,7 @@ int __cpuinit __cpu_up(unsigned int cpu) · 32 unmodified lines | ||
| 139 | 139 | secondary_data.stack = NULL; |
| 140 | 140 | secondary_data.pgdir = 0; |
| 141 | 141 | |
| 142 | − *pmd_offset(pgd, PHYS_OFFSET) = __pmd(0); | |
| 142 | + *pmd = __pmd(0); | |
| 143 | 143 | pgd_free(&init_mm, pgd); |
| 144 | 144 | |
| 145 | 145 | if (ret) { |
| @@ -288,14 +288,28 @@ void unregister_undef_hook(struct undef_hook *hook) · 287 unmodified lines | ||
| 288 | 288 | spin_unlock_irqrestore(&undef_lock, flags); |
| 289 | 289 | } |
| 290 | 290 | |
| 291 | +static int call_undef_hook(struct pt_regs *regs, unsigned int instr) | |
| 292 | +{ | |
| 293 | + struct undef_hook *hook; | |
| 294 | + unsigned long flags; | |
| 295 | + int (*fn)(struct pt_regs *regs, unsigned int instr) = NULL; | |
| 296 | + | |
| 297 | + spin_lock_irqsave(&undef_lock, flags); | |
| 298 | + list_for_each_entry(hook, &undef_hook, node) | |
| 299 | + if ((instr & hook->instr_mask) == hook->instr_val && | |
| 300 | + (regs->ARM_cpsr & hook->cpsr_mask) == hook->cpsr_val) | |
| 301 | + fn = hook->fn; | |
| 302 | + spin_unlock_irqrestore(&undef_lock, flags); | |
| 303 | + | |
| 304 | + return fn ? fn(regs, instr) : 1; | |
| 305 | +} | |
| 306 | + | |
| 291 | 307 | asmlinkage void __exception do_undefinstr(struct pt_regs *regs) |
| 292 | 308 | { |
| 293 | 309 | unsigned int correction = thumb_mode(regs) ? 2 : 4; |
| 294 | 310 | unsigned int instr; |
| 295 | − struct undef_hook *hook; | |
| 296 | 311 | siginfo_t info; |
| 297 | 312 | void __user *pc; |
| 298 | − unsigned long flags; | |
| 299 | 313 | |
| 300 | 314 | /* |
| 301 | 315 | * According to the ARM ARM, PC is 2 or 4 bytes ahead, |
| @@ -325,17 +339,8 @@ asmlinkage void __exception do_undefinstr(struct pt_regs *regs) · 23 unmodified lines | ||
| 325 | 339 | } |
| 326 | 340 | #endif |
| 327 | 341 | |
| 328 | − spin_lock_irqsave(&undef_lock, flags); | |
| 329 | − list_for_each_entry(hook, &undef_hook, node) { | |
| 330 | − if ((instr & hook->instr_mask) == hook->instr_val && | |
| 331 | − (regs->ARM_cpsr & hook->cpsr_mask) == hook->cpsr_val) { | |
| 332 | − if (hook->fn(regs, instr) == 0) { | |
| 333 | − spin_unlock_irqrestore(&undef_lock, flags); | |
| 334 | − return; | |
| 335 | − } | |
| 336 | − } | |
| 337 | − } | |
| 338 | − spin_unlock_irqrestore(&undef_lock, flags); | |
| 342 | + if (call_undef_hook(regs, instr) == 0) | |
| 343 | + return; | |
| 339 | 344 | |
| 340 | 345 | #ifdef CONFIG_DEBUG_USER |
| 341 | 346 | if (user_debug & UDBG_UNDEFINED) { |
| @@ -12,7 +12,7 @@ · 11 unmodified lines | ||
| 12 | 12 | */ |
| 13 | 13 | #include <linux/linkage.h> |
| 14 | 14 | #include <asm/assembler.h> |
| 15 | −#include <asm/hardware.h> | |
| 15 | +#include <mach/hardware.h> | |
| 16 | 16 | |
| 17 | 17 | #define CPSR2SPSR(rt) \ |
| 18 | 18 | mrs rt, cpsr; \ |
| @@ -20,7 +20,7 @@ · 19 unmodified lines | ||
| 20 | 20 | * r2, r3 contains the zero-extended value |
| 21 | 21 | * lr corrupted |
| 22 | 22 | * |
| 23 | − * No other registers must be altered. (see include/asm-arm/uaccess.h | |
| 23 | + * No other registers must be altered. (see <asm/uaccess.h> | |
| 24 | 24 | * for specific ASM register usage). |
| 25 | 25 | * |
| 26 | 26 | * Note that ADDR_LIMIT is either 0 or 0xc0000000. |
| @@ -9,7 +9,7 @@ · 8 unmodified lines | ||
| 9 | 9 | */ |
| 10 | 10 | #include <linux/linkage.h> |
| 11 | 11 | #include <asm/assembler.h> |
| 12 | −#include <asm/hardware.h> | |
| 12 | +#include <mach/hardware.h> | |
| 13 | 13 | |
| 14 | 14 | .Linsw_bad_alignment: |
| 15 | 15 | adr r0, .Linsw_bad_align_msg |
| @@ -9,7 +9,7 @@ · 8 unmodified lines | ||
| 9 | 9 | */ |
| 10 | 10 | #include <linux/linkage.h> |
| 11 | 11 | #include <asm/assembler.h> |
| 12 | −#include <asm/hardware.h> | |
| 12 | +#include <mach/hardware.h> | |
| 13 | 13 | |
| 14 | 14 | .Loutsw_bad_alignment: |
| 15 | 15 | adr r0, .Loutsw_bad_align_msg |
| @@ -20,7 +20,7 @@ · 19 unmodified lines | ||
| 20 | 20 | * Outputs: r0 is the error code |
| 21 | 21 | * lr corrupted |
| 22 | 22 | * |
| 23 | − * No other registers must be altered. (see include/asm-arm/uaccess.h | |
| 23 | + * No other registers must be altered. (see <asm/uaccess.h> | |
| 24 | 24 | * for specific ASM register usage). |
| 25 | 25 | * |
| 26 | 26 | * Note that ADDR_LIMIT is either 0 or 0xc0000000 |
| @@ -20,14 +20,14 @@ · 19 unmodified lines | ||
| 20 | 20 | #include <asm/setup.h> |
| 21 | 21 | #include <asm/memory.h> |
| 22 | 22 | #include <asm/mach-types.h> |
| 23 | −#include <asm/hardware.h> | |
| 23 | +#include <mach/hardware.h> | |
| 24 | 24 | #include <asm/irq.h> |
| 25 | 25 | |
| 26 | 26 | #include <asm/mach/arch.h> |
| 27 | 27 | #include <asm/mach/map.h> |
| 28 | 28 | #include <asm/mach/irq.h> |
| 29 | 29 | |
| 30 | −#include <asm/arch/aaed2000.h> | |
| 30 | +#include <mach/aaed2000.h> | |
| 31 | 31 | |
| 32 | 32 | #include "core.h" |
| 33 | 33 | |
| @@ -20,7 +20,7 @@ · 19 unmodified lines | ||
| 20 | 20 | #include <linux/timex.h> |
| 21 | 21 | #include <linux/signal.h> |
| 22 | 22 | |
| 23 | −#include <asm/hardware.h> | |
| 23 | +#include <mach/hardware.h> | |
| 24 | 24 | #include <asm/irq.h> |
| 25 | 25 | #include <asm/sizes.h> |
| 26 | 26 | |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-aaec2000/aaec2000.h | |
| 2 | + * arch/arm/mach-aaec2000/include/mach/aaec2000.h | |
| 3 | 3 | * |
| 4 | 4 | * AAEC-2000 registers definition |
| 5 | 5 | * |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-aaec2000/aaed2000.h | |
| 2 | + * arch/arm/mach-aaec2000/include/mach/aaed2000.h | |
| 3 | 3 | * |
| 4 | 4 | * AAED-2000 specific bits definition |
| 5 | 5 | * |
| @@ -1,4 +1,4 @@ | ||
| 1 | −/* linux/include/asm-arm/arch-aaec2000/debug-macro.S | |
| 1 | +/* arch/arm/mach-aaec2000/include/mach/debug-macro.S | |
| 2 | 2 | * |
| 3 | 3 | * Debugging macro include header |
| 4 | 4 | * |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-aaec2000/dma.h | |
| 2 | + * arch/arm/mach-aaec2000/include/mach/dma.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (c) 2005 Nicolas Bellido Y Ortega |
| 5 | 5 | * |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-aaec2000/entry-macro.S | |
| 2 | + * arch/arm/mach-aaec2000/include/mach/entry-macro.S | |
| 3 | 3 | * |
| 4 | 4 | * Low-level IRQ helper for aaec-2000 based platforms |
| 5 | 5 | * |
| @@ -10,7 +10,7 @@ · 4 unmodified lines | ||
| 10 | 10 | * published by the Free Software Foundation. |
| 11 | 11 | * |
| 12 | 12 | */ |
| 13 | −#include <asm/arch/irqs.h> | |
| 13 | +#include <mach/irqs.h> | |
| 14 | 14 | |
| 15 | 15 | .macro disable_fiq |
| 16 | 16 | .endm |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-aaec2000/hardware.h | |
| 2 | + * arch/arm/mach-aaec2000/include/mach/hardware.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (c) 2005 Nicolas Bellido Y Ortega |
| 5 | 5 | * |
| @@ -12,7 +12,7 @@ · 6 unmodified lines | ||
| 12 | 12 | #define __ASM_ARCH_HARDWARE_H |
| 13 | 13 | |
| 14 | 14 | #include <asm/sizes.h> |
| 15 | −#include <asm/arch/aaec2000.h> | |
| 15 | +#include <mach/aaec2000.h> | |
| 16 | 16 | |
| 17 | 17 | /* The kernel is loaded at physical address 0xf8000000. |
| 18 | 18 | * We map the IO space a bit after |
| @@ -1,12 +1,12 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-aaec2000/io.h | |
| 2 | + * arch/arm/mach-aaec2000/include/mach/io.h | |
| 3 | 3 | * |
| 4 | 4 | * Copied from asm/arch/sa1100/io.h |
| 5 | 5 | */ |
| 6 | 6 | #ifndef __ASM_ARM_ARCH_IO_H |
| 7 | 7 | #define __ASM_ARM_ARCH_IO_H |
| 8 | 8 | |
| 9 | −#include <asm/hardware.h> | |
| 9 | +#include <mach/hardware.h> | |
| 10 | 10 | |
| 11 | 11 | #define IO_SPACE_LIMIT 0xffffffff |
| 12 | 12 | |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-aaec2000/irqs.h | |
| 2 | + * arch/arm/mach-aaec2000/include/mach/irqs.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (c) 2005 Nicolas Bellido Y Ortega |
| 5 | 5 | * |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-aaec2000/memory.h | |
| 2 | + * arch/arm/mach-aaec2000/include/mach/memory.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (c) 2005 Nicolas Bellido Y Ortega |
| 5 | 5 | * |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-aaed2000/system.h | |
| 2 | + * arch/arm/mach-aaed2000/include/mach/system.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (c) 2005 Nicolas Bellido Y Ortega |
| 5 | 5 | * |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-aaec2000/timex.h | |
| 2 | + * arch/arm/mach-aaec2000/include/mach/timex.h | |
| 3 | 3 | * |
| 4 | 4 | * AAEC-2000 Architecture timex specification |
| 5 | 5 | * |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-aaec2000/uncompress.h | |
| 2 | + * arch/arm/mach-aaec2000/include/mach/uncompress.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (c) 2005 Nicolas Bellido Y Ortega |
| 5 | 5 | * |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-aaec2000/vmalloc.h | |
| 2 | + * arch/arm/mach-aaec2000/include/mach/vmalloc.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (c) 2005 Nicolas Bellido Y Ortega |
| 5 | 5 | * |
| @@ -17,10 +17,10 @@ · 16 unmodified lines | ||
| 17 | 17 | |
| 18 | 18 | #include <asm/mach/arch.h> |
| 19 | 19 | #include <asm/mach/map.h> |
| 20 | −#include <asm/arch/at91cap9.h> | |
| 21 | −#include <asm/arch/at91_pmc.h> | |
| 22 | −#include <asm/arch/at91_rstc.h> | |
| 23 | −#include <asm/arch/at91_shdwc.h> | |
| 20 | +#include <mach/at91cap9.h> | |
| 21 | +#include <mach/at91_pmc.h> | |
| 22 | +#include <mach/at91_rstc.h> | |
| 23 | +#include <mach/at91_shdwc.h> | |
| 24 | 24 | |
| 25 | 25 | #include "generic.h" |
| 26 | 26 | #include "clock.h" |
| @@ -20,11 +20,11 @@ · 19 unmodified lines | ||
| 20 | 20 | |
| 21 | 21 | #include <video/atmel_lcdc.h> |
| 22 | 22 | |
| 23 | −#include <asm/arch/board.h> | |
| 24 | −#include <asm/arch/gpio.h> | |
| 25 | −#include <asm/arch/at91cap9.h> | |
| 26 | −#include <asm/arch/at91cap9_matrix.h> | |
| 27 | −#include <asm/arch/at91sam9_smc.h> | |
| 23 | +#include <mach/board.h> | |
| 24 | +#include <mach/gpio.h> | |
| 25 | +#include <mach/at91cap9.h> | |
| 26 | +#include <mach/at91cap9_matrix.h> | |
| 27 | +#include <mach/at91sam9_smc.h> | |
| 28 | 28 | |
| 29 | 29 | #include "generic.h" |
| 30 | 30 | |
| @@ -14,9 +14,9 @@ · 13 unmodified lines | ||
| 14 | 14 | |
| 15 | 15 | #include <asm/mach/arch.h> |
| 16 | 16 | #include <asm/mach/map.h> |
| 17 | −#include <asm/arch/at91rm9200.h> | |
| 18 | −#include <asm/arch/at91_pmc.h> | |
| 19 | −#include <asm/arch/at91_st.h> | |
| 17 | +#include <mach/at91rm9200.h> | |
| 18 | +#include <mach/at91_pmc.h> | |
| 19 | +#include <mach/at91_st.h> | |
| 20 | 20 | |
| 21 | 21 | #include "generic.h" |
| 22 | 22 | #include "clock.h" |
| @@ -17,10 +17,10 @@ · 16 unmodified lines | ||
| 17 | 17 | #include <linux/platform_device.h> |
| 18 | 18 | #include <linux/i2c-gpio.h> |
| 19 | 19 | |
| 20 | −#include <asm/arch/board.h> | |
| 21 | −#include <asm/arch/gpio.h> | |
| 22 | −#include <asm/arch/at91rm9200.h> | |
| 23 | −#include <asm/arch/at91rm9200_mc.h> | |
| 20 | +#include <mach/board.h> | |
| 21 | +#include <mach/gpio.h> | |
| 22 | +#include <mach/at91rm9200.h> | |
| 23 | +#include <mach/at91rm9200_mc.h> | |
| 24 | 24 | |
| 25 | 25 | #include "generic.h" |
| 26 | 26 | |
| @@ -26,7 +26,7 @@ · 25 unmodified lines | ||
| 26 | 26 | |
| 27 | 27 | #include <asm/mach/time.h> |
| 28 | 28 | |
| 29 | −#include <asm/arch/at91_st.h> | |
| 29 | +#include <mach/at91_st.h> | |
| 30 | 30 | |
| 31 | 31 | static unsigned long last_crtr; |
| 32 | 32 | static u32 irqmask; |
| @@ -15,11 +15,11 @@ · 14 unmodified lines | ||
| 15 | 15 | |
| 16 | 16 | #include <asm/mach/arch.h> |
| 17 | 17 | #include <asm/mach/map.h> |
| 18 | −#include <asm/arch/cpu.h> | |
| 19 | −#include <asm/arch/at91sam9260.h> | |
| 20 | −#include <asm/arch/at91_pmc.h> | |
| 21 | −#include <asm/arch/at91_rstc.h> | |
| 22 | −#include <asm/arch/at91_shdwc.h> | |
| 18 | +#include <mach/cpu.h> | |
| 19 | +#include <mach/at91sam9260.h> | |
| 20 | +#include <mach/at91_pmc.h> | |
| 21 | +#include <mach/at91_rstc.h> | |
| 22 | +#include <mach/at91_shdwc.h> | |
| 23 | 23 | |
| 24 | 24 | #include "generic.h" |
| 25 | 25 | #include "clock.h" |
| @@ -16,12 +16,12 @@ · 15 unmodified lines | ||
| 16 | 16 | #include <linux/platform_device.h> |
| 17 | 17 | #include <linux/i2c-gpio.h> |
| 18 | 18 | |
| 19 | −#include <asm/arch/board.h> | |
| 20 | −#include <asm/arch/gpio.h> | |
| 21 | −#include <asm/arch/cpu.h> | |
| 22 | −#include <asm/arch/at91sam9260.h> | |
| 23 | −#include <asm/arch/at91sam9260_matrix.h> | |
| 24 | −#include <asm/arch/at91sam9_smc.h> | |
| 19 | +#include <mach/board.h> | |
| 20 | +#include <mach/gpio.h> | |
| 21 | +#include <mach/cpu.h> | |
| 22 | +#include <mach/at91sam9260.h> | |
| 23 | +#include <mach/at91sam9260_matrix.h> | |
| 24 | +#include <mach/at91sam9_smc.h> | |
| 25 | 25 | |
| 26 | 26 | #include "generic.h" |
| 27 | 27 | |
| @@ -15,10 +15,10 @@ · 14 unmodified lines | ||
| 15 | 15 | |
| 16 | 16 | #include <asm/mach/arch.h> |
| 17 | 17 | #include <asm/mach/map.h> |
| 18 | −#include <asm/arch/at91sam9261.h> | |
| 19 | −#include <asm/arch/at91_pmc.h> | |
| 20 | −#include <asm/arch/at91_rstc.h> | |
| 21 | −#include <asm/arch/at91_shdwc.h> | |
| 18 | +#include <mach/at91sam9261.h> | |
| 19 | +#include <mach/at91_pmc.h> | |
| 20 | +#include <mach/at91_rstc.h> | |
| 21 | +#include <mach/at91_shdwc.h> | |
| 22 | 22 | |
| 23 | 23 | #include "generic.h" |
| 24 | 24 | #include "clock.h" |
| @@ -20,11 +20,11 @@ · 19 unmodified lines | ||
| 20 | 20 | #include <linux/fb.h> |
| 21 | 21 | #include <video/atmel_lcdc.h> |
| 22 | 22 | |
| 23 | −#include <asm/arch/board.h> | |
| 24 | −#include <asm/arch/gpio.h> | |
| 25 | −#include <asm/arch/at91sam9261.h> | |
| 26 | −#include <asm/arch/at91sam9261_matrix.h> | |
| 27 | −#include <asm/arch/at91sam9_smc.h> | |
| 23 | +#include <mach/board.h> | |
| 24 | +#include <mach/gpio.h> | |
| 25 | +#include <mach/at91sam9261.h> | |
| 26 | +#include <mach/at91sam9261_matrix.h> | |
| 27 | +#include <mach/at91sam9_smc.h> | |
| 28 | 28 | |
| 29 | 29 | #include "generic.h" |
| 30 | 30 | |
| @@ -15,10 +15,10 @@ · 14 unmodified lines | ||
| 15 | 15 | |
| 16 | 16 | #include <asm/mach/arch.h> |
| 17 | 17 | #include <asm/mach/map.h> |
| 18 | −#include <asm/arch/at91sam9263.h> | |
| 19 | −#include <asm/arch/at91_pmc.h> | |
| 20 | −#include <asm/arch/at91_rstc.h> | |
| 21 | −#include <asm/arch/at91_shdwc.h> | |
| 18 | +#include <mach/at91sam9263.h> | |
| 19 | +#include <mach/at91_pmc.h> | |
| 20 | +#include <mach/at91_rstc.h> | |
| 21 | +#include <mach/at91_shdwc.h> | |
| 22 | 22 | |
| 23 | 23 | #include "generic.h" |
| 24 | 24 | #include "clock.h" |
| @@ -19,11 +19,11 @@ · 18 unmodified lines | ||
| 19 | 19 | #include <linux/fb.h> |
| 20 | 20 | #include <video/atmel_lcdc.h> |
| 21 | 21 | |
| 22 | −#include <asm/arch/board.h> | |
| 23 | −#include <asm/arch/gpio.h> | |
| 24 | −#include <asm/arch/at91sam9263.h> | |
| 25 | −#include <asm/arch/at91sam9263_matrix.h> | |
| 26 | −#include <asm/arch/at91sam9_smc.h> | |
| 22 | +#include <mach/board.h> | |
| 23 | +#include <mach/gpio.h> | |
| 24 | +#include <mach/at91sam9263.h> | |
| 25 | +#include <mach/at91sam9263_matrix.h> | |
| 26 | +#include <mach/at91sam9_smc.h> | |
| 27 | 27 | |
| 28 | 28 | #include "generic.h" |
| 29 | 29 | |
| @@ -17,7 +17,7 @@ · 16 unmodified lines | ||
| 17 | 17 | |
| 18 | 18 | #include <asm/mach/time.h> |
| 19 | 19 | |
| 20 | −#include <asm/arch/at91_pit.h> | |
| 20 | +#include <mach/at91_pit.h> | |
| 21 | 21 | |
| 22 | 22 | |
| 23 | 23 | #define PIT_CPIV(x) ((x) & AT91_PIT_CPIV) |
| @@ -14,11 +14,11 @@ · 13 unmodified lines | ||
| 14 | 14 | |
| 15 | 15 | #include <asm/mach/arch.h> |
| 16 | 16 | #include <asm/mach/map.h> |
| 17 | −#include <asm/arch/cpu.h> | |
| 18 | −#include <asm/arch/at91sam9rl.h> | |
| 19 | −#include <asm/arch/at91_pmc.h> | |
| 20 | −#include <asm/arch/at91_rstc.h> | |
| 21 | −#include <asm/arch/at91_shdwc.h> | |
| 17 | +#include <mach/cpu.h> | |
| 18 | +#include <mach/at91sam9rl.h> | |
| 19 | +#include <mach/at91_pmc.h> | |
| 20 | +#include <mach/at91_rstc.h> | |
| 21 | +#include <mach/at91_shdwc.h> | |
| 22 | 22 | |
| 23 | 23 | #include "generic.h" |
| 24 | 24 | #include "clock.h" |
| @@ -16,11 +16,11 @@ · 15 unmodified lines | ||
| 16 | 16 | #include <linux/fb.h> |
| 17 | 17 | #include <video/atmel_lcdc.h> |
| 18 | 18 | |
| 19 | −#include <asm/arch/board.h> | |
| 20 | −#include <asm/arch/gpio.h> | |
| 21 | −#include <asm/arch/at91sam9rl.h> | |
| 22 | −#include <asm/arch/at91sam9rl_matrix.h> | |
| 23 | −#include <asm/arch/at91sam9_smc.h> | |
| 19 | +#include <mach/board.h> | |
| 20 | +#include <mach/gpio.h> | |
| 21 | +#include <mach/at91sam9rl.h> | |
| 22 | +#include <mach/at91sam9rl_matrix.h> | |
| 23 | +#include <mach/at91sam9_smc.h> | |
| 24 | 24 | |
| 25 | 25 | #include "generic.h" |
| 26 | 26 | |
| @@ -14,9 +14,9 @@ · 13 unmodified lines | ||
| 14 | 14 | #include <linux/init.h> |
| 15 | 15 | #include <linux/irq.h> |
| 16 | 16 | #include <asm/mach/arch.h> |
| 17 | −#include <asm/arch/at91x40.h> | |
| 18 | −#include <asm/arch/at91_st.h> | |
| 19 | −#include <asm/arch/timex.h> | |
| 17 | +#include <mach/at91x40.h> | |
| 18 | +#include <mach/at91_st.h> | |
| 19 | +#include <mach/timex.h> | |
| 20 | 20 | #include "generic.h" |
| 21 | 21 | |
| 22 | 22 | /* |
| @@ -23,10 +23,10 @@ · 22 unmodified lines | ||
| 23 | 23 | #include <linux/interrupt.h> |
| 24 | 24 | #include <linux/irq.h> |
| 25 | 25 | #include <linux/time.h> |
| 26 | −#include <asm/hardware.h> | |
| 26 | +#include <mach/hardware.h> | |
| 27 | 27 | #include <asm/io.h> |
| 28 | 28 | #include <asm/mach/time.h> |
| 29 | −#include <asm/arch/at91_tc.h> | |
| 29 | +#include <mach/at91_tc.h> | |
| 30 | 30 | |
| 31 | 31 | /* |
| 32 | 32 | * 3 counter/timer units present. |
| @@ -24,7 +24,7 @@ · 23 unmodified lines | ||
| 24 | 24 | #include <linux/module.h> |
| 25 | 25 | #include <linux/platform_device.h> |
| 26 | 26 | |
| 27 | −#include <asm/hardware.h> | |
| 27 | +#include <mach/hardware.h> | |
| 28 | 28 | #include <asm/setup.h> |
| 29 | 29 | #include <asm/mach-types.h> |
| 30 | 30 | #include <asm/irq.h> |
| @@ -33,8 +33,8 @@ · 2 unmodified lines | ||
| 33 | 33 | #include <asm/mach/map.h> |
| 34 | 34 | #include <asm/mach/irq.h> |
| 35 | 35 | |
| 36 | −#include <asm/arch/board.h> | |
| 37 | −#include <asm/arch/gpio.h> | |
| 36 | +#include <mach/board.h> | |
| 37 | +#include <mach/gpio.h> | |
| 38 | 38 | |
| 39 | 39 | #include "generic.h" |
| 40 | 40 | |
| @@ -28,7 +28,7 @@ · 27 unmodified lines | ||
| 28 | 28 | #include <linux/spi/spi.h> |
| 29 | 29 | #include <linux/spi/flash.h> |
| 30 | 30 | |
| 31 | −#include <asm/hardware.h> | |
| 31 | +#include <mach/hardware.h> | |
| 32 | 32 | #include <asm/setup.h> |
| 33 | 33 | #include <asm/mach-types.h> |
| 34 | 34 | #include <asm/irq.h> |
| @@ -37,8 +37,8 @@ · 2 unmodified lines | ||
| 37 | 37 | #include <asm/mach/map.h> |
| 38 | 38 | #include <asm/mach/irq.h> |
| 39 | 39 | |
| 40 | −#include <asm/arch/board.h> | |
| 41 | −#include <asm/arch/gpio.h> | |
| 40 | +#include <mach/board.h> | |
| 41 | +#include <mach/gpio.h> | |
| 42 | 42 | |
| 43 | 43 | #include "generic.h" |
| 44 | 44 | |
| @@ -33,7 +33,7 @@ · 32 unmodified lines | ||
| 33 | 33 | |
| 34 | 34 | #include <video/atmel_lcdc.h> |
| 35 | 35 | |
| 36 | −#include <asm/hardware.h> | |
| 36 | +#include <mach/hardware.h> | |
| 37 | 37 | #include <asm/setup.h> |
| 38 | 38 | #include <asm/mach-types.h> |
| 39 | 39 | #include <asm/irq.h> |
| @@ -42,10 +42,10 @@ · 2 unmodified lines | ||
| 42 | 42 | #include <asm/mach/map.h> |
| 43 | 43 | #include <asm/mach/irq.h> |
| 44 | 44 | |
| 45 | −#include <asm/arch/board.h> | |
| 46 | −#include <asm/arch/gpio.h> | |
| 47 | −#include <asm/arch/at91cap9_matrix.h> | |
| 48 | −#include <asm/arch/at91sam9_smc.h> | |
| 45 | +#include <mach/board.h> | |
| 46 | +#include <mach/gpio.h> | |
| 47 | +#include <mach/at91cap9_matrix.h> | |
| 48 | +#include <mach/at91sam9_smc.h> | |
| 49 | 49 | |
| 50 | 50 | #include "generic.h" |
| 51 | 51 | |
| @@ -25,7 +25,7 @@ · 24 unmodified lines | ||
| 25 | 25 | #include <linux/module.h> |
| 26 | 26 | #include <linux/platform_device.h> |
| 27 | 27 | |
| 28 | −#include <asm/hardware.h> | |
| 28 | +#include <mach/hardware.h> | |
| 29 | 29 | #include <asm/setup.h> |
| 30 | 30 | #include <asm/mach-types.h> |
| 31 | 31 | #include <asm/irq.h> |
| @@ -34,8 +34,8 @@ · 2 unmodified lines | ||
| 34 | 34 | #include <asm/mach/map.h> |
| 35 | 35 | #include <asm/mach/irq.h> |
| 36 | 36 | |
| 37 | −#include <asm/arch/board.h> | |
| 38 | −#include <asm/arch/gpio.h> | |
| 37 | +#include <mach/board.h> | |
| 38 | +#include <mach/gpio.h> | |
| 39 | 39 | |
| 40 | 40 | #include "generic.h" |
| 41 | 41 | |
| @@ -28,7 +28,7 @@ · 27 unmodified lines | ||
| 28 | 28 | #include <linux/input.h> |
| 29 | 29 | #include <linux/gpio_keys.h> |
| 30 | 30 | |
| 31 | −#include <asm/hardware.h> | |
| 31 | +#include <mach/hardware.h> | |
| 32 | 32 | #include <asm/setup.h> |
| 33 | 33 | #include <asm/mach-types.h> |
| 34 | 34 | #include <asm/irq.h> |
| @@ -37,8 +37,8 @@ · 2 unmodified lines | ||
| 37 | 37 | #include <asm/mach/map.h> |
| 38 | 38 | #include <asm/mach/irq.h> |
| 39 | 39 | |
| 40 | −#include <asm/arch/board.h> | |
| 41 | −#include <asm/arch/gpio.h> | |
| 40 | +#include <mach/board.h> | |
| 41 | +#include <mach/gpio.h> | |
| 42 | 42 | |
| 43 | 43 | #include "generic.h" |
| 44 | 44 | |
| @@ -25,7 +25,7 @@ · 24 unmodified lines | ||
| 25 | 25 | #include <linux/platform_device.h> |
| 26 | 26 | #include <linux/mtd/physmap.h> |
| 27 | 27 | |
| 28 | −#include <asm/hardware.h> | |
| 28 | +#include <mach/hardware.h> | |
| 29 | 29 | #include <asm/setup.h> |
| 30 | 30 | #include <asm/mach-types.h> |
| 31 | 31 | #include <asm/irq.h> |
| @@ -34,8 +34,8 @@ · 2 unmodified lines | ||
| 34 | 34 | #include <asm/mach/map.h> |
| 35 | 35 | #include <asm/mach/irq.h> |
| 36 | 36 | |
| 37 | −#include <asm/arch/board.h> | |
| 38 | −#include <asm/arch/gpio.h> | |
| 37 | +#include <mach/board.h> | |
| 38 | +#include <mach/gpio.h> | |
| 39 | 39 | |
| 40 | 40 | #include "generic.h" |
| 41 | 41 | |
| @@ -29,7 +29,7 @@ · 28 unmodified lines | ||
| 29 | 29 | #include <linux/spi/spi.h> |
| 30 | 30 | #include <linux/mtd/physmap.h> |
| 31 | 31 | |
| 32 | −#include <asm/hardware.h> | |
| 32 | +#include <mach/hardware.h> | |
| 33 | 33 | #include <asm/setup.h> |
| 34 | 34 | #include <asm/mach-types.h> |
| 35 | 35 | #include <asm/irq.h> |
| @@ -38,9 +38,9 @@ · 2 unmodified lines | ||
| 38 | 38 | #include <asm/mach/map.h> |
| 39 | 39 | #include <asm/mach/irq.h> |
| 40 | 40 | |
| 41 | −#include <asm/arch/board.h> | |
| 42 | −#include <asm/arch/gpio.h> | |
| 43 | −#include <asm/arch/at91rm9200_mc.h> | |
| 41 | +#include <mach/board.h> | |
| 42 | +#include <mach/gpio.h> | |
| 43 | +#include <mach/at91rm9200_mc.h> | |
| 44 | 44 | |
| 45 | 45 | #include "generic.h" |
| 46 | 46 | |
| @@ -24,10 +24,10 @@ · 23 unmodified lines | ||
| 24 | 24 | #include <linux/platform_device.h> |
| 25 | 25 | #include <linux/irq.h> |
| 26 | 26 | #include <asm/mach-types.h> |
| 27 | −#include <asm/hardware.h> | |
| 27 | +#include <mach/hardware.h> | |
| 28 | 28 | #include <asm/mach/arch.h> |
| 29 | 29 | #include <asm/mach/map.h> |
| 30 | −#include <asm/arch/board.h> | |
| 30 | +#include <mach/board.h> | |
| 31 | 31 | #include "generic.h" |
| 32 | 32 | |
| 33 | 33 | static void __init at91eb01_map_io(void) |
| @@ -25,7 +25,7 @@ · 24 unmodified lines | ||
| 25 | 25 | #include <linux/module.h> |
| 26 | 26 | #include <linux/device.h> |
| 27 | 27 | |
| 28 | −#include <asm/hardware.h> | |
| 28 | +#include <mach/hardware.h> | |
| 29 | 29 | #include <asm/setup.h> |
| 30 | 30 | #include <asm/mach-types.h> |
| 31 | 31 | #include <asm/irq.h> |
| @@ -34,8 +34,8 @@ · 2 unmodified lines | ||
| 34 | 34 | #include <asm/mach/map.h> |
| 35 | 35 | #include <asm/mach/irq.h> |
| 36 | 36 | |
| 37 | −#include <asm/arch/board.h> | |
| 38 | −#include <asm/arch/gpio.h> | |
| 37 | +#include <mach/board.h> | |
| 38 | +#include <mach/gpio.h> | |
| 39 | 39 | |
| 40 | 40 | #include "generic.h" |
| 41 | 41 | |
| @@ -27,7 +27,7 @@ · 26 unmodified lines | ||
| 27 | 27 | #include <linux/spi/spi.h> |
| 28 | 28 | #include <linux/spi/flash.h> |
| 29 | 29 | |
| 30 | −#include <asm/hardware.h> | |
| 30 | +#include <mach/hardware.h> | |
| 31 | 31 | #include <asm/setup.h> |
| 32 | 32 | #include <asm/mach-types.h> |
| 33 | 33 | #include <asm/irq.h> |
| @@ -36,8 +36,8 @@ · 2 unmodified lines | ||
| 36 | 36 | #include <asm/mach/map.h> |
| 37 | 37 | #include <asm/mach/irq.h> |
| 38 | 38 | |
| 39 | −#include <asm/arch/board.h> | |
| 40 | −#include <asm/arch/gpio.h> | |
| 39 | +#include <mach/board.h> | |
| 40 | +#include <mach/gpio.h> | |
| 41 | 41 | |
| 42 | 42 | #include "generic.h" |
| 43 | 43 | |
| @@ -29,7 +29,7 @@ · 28 unmodified lines | ||
| 29 | 29 | #include <linux/spi/spi.h> |
| 30 | 30 | #include <linux/mtd/physmap.h> |
| 31 | 31 | |
| 32 | −#include <asm/hardware.h> | |
| 32 | +#include <mach/hardware.h> | |
| 33 | 33 | #include <asm/setup.h> |
| 34 | 34 | #include <asm/mach-types.h> |
| 35 | 35 | #include <asm/irq.h> |
| @@ -38,9 +38,9 @@ · 2 unmodified lines | ||
| 38 | 38 | #include <asm/mach/map.h> |
| 39 | 39 | #include <asm/mach/irq.h> |
| 40 | 40 | |
| 41 | −#include <asm/arch/board.h> | |
| 42 | −#include <asm/arch/gpio.h> | |
| 43 | −#include <asm/arch/at91rm9200_mc.h> | |
| 41 | +#include <mach/board.h> | |
| 42 | +#include <mach/gpio.h> | |
| 43 | +#include <mach/at91rm9200_mc.h> | |
| 44 | 44 | |
| 45 | 45 | #include "generic.h" |
| 46 | 46 | |
| @@ -24,7 +24,7 @@ · 23 unmodified lines | ||
| 24 | 24 | #include <linux/module.h> |
| 25 | 25 | #include <linux/platform_device.h> |
| 26 | 26 | |
| 27 | −#include <asm/hardware.h> | |
| 27 | +#include <mach/hardware.h> | |
| 28 | 28 | #include <asm/setup.h> |
| 29 | 29 | #include <asm/mach-types.h> |
| 30 | 30 | #include <asm/irq.h> |
| @@ -33,8 +33,8 @@ · 2 unmodified lines | ||
| 33 | 33 | #include <asm/mach/map.h> |
| 34 | 34 | #include <asm/mach/irq.h> |
| 35 | 35 | |
| 36 | −#include <asm/arch/board.h> | |
| 37 | −#include <asm/arch/gpio.h> | |
| 36 | +#include <mach/board.h> | |
| 37 | +#include <mach/gpio.h> | |
| 38 | 38 | |
| 39 | 39 | #include "generic.h" |
| 40 | 40 | |
| @@ -25,7 +25,7 @@ · 24 unmodified lines | ||
| 25 | 25 | #include <linux/module.h> |
| 26 | 26 | #include <linux/platform_device.h> |
| 27 | 27 | |
| 28 | −#include <asm/hardware.h> | |
| 28 | +#include <mach/hardware.h> | |
| 29 | 29 | #include <asm/setup.h> |
| 30 | 30 | #include <asm/mach-types.h> |
| 31 | 31 | #include <asm/irq.h> |
| @@ -34,10 +34,10 @@ · 2 unmodified lines | ||
| 34 | 34 | #include <asm/mach/map.h> |
| 35 | 35 | #include <asm/mach/irq.h> |
| 36 | 36 | |
| 37 | −#include <asm/arch/board.h> | |
| 38 | −#include <asm/arch/gpio.h> | |
| 37 | +#include <mach/board.h> | |
| 38 | +#include <mach/gpio.h> | |
| 39 | 39 | |
| 40 | −#include <asm/arch/at91rm9200_mc.h> | |
| 40 | +#include <mach/at91rm9200_mc.h> | |
| 41 | 41 | |
| 42 | 42 | #include "generic.h" |
| 43 | 43 | |
| @@ -27,7 +27,7 @@ · 26 unmodified lines | ||
| 27 | 27 | #include <linux/spi/spi.h> |
| 28 | 28 | #include <linux/mtd/physmap.h> |
| 29 | 29 | |
| 30 | −#include <asm/hardware.h> | |
| 30 | +#include <mach/hardware.h> | |
| 31 | 31 | #include <asm/setup.h> |
| 32 | 32 | #include <asm/mach-types.h> |
| 33 | 33 | #include <asm/irq.h> |
| @@ -36,9 +36,9 @@ · 2 unmodified lines | ||
| 36 | 36 | #include <asm/mach/map.h> |
| 37 | 37 | #include <asm/mach/irq.h> |
| 38 | 38 | |
| 39 | −#include <asm/arch/board.h> | |
| 40 | −#include <asm/arch/gpio.h> | |
| 41 | −#include <asm/arch/at91rm9200_mc.h> | |
| 39 | +#include <mach/board.h> | |
| 40 | +#include <mach/gpio.h> | |
| 41 | +#include <mach/at91rm9200_mc.h> | |
| 42 | 42 | |
| 43 | 43 | #include "generic.h" |
| 44 | 44 | |
| @@ -30,7 +30,7 @@ · 29 unmodified lines | ||
| 30 | 30 | #include <linux/input.h> |
| 31 | 31 | #include <linux/clk.h> |
| 32 | 32 | |
| 33 | −#include <asm/hardware.h> | |
| 33 | +#include <mach/hardware.h> | |
| 34 | 34 | #include <asm/setup.h> |
| 35 | 35 | #include <asm/mach-types.h> |
| 36 | 36 | #include <asm/irq.h> |
| @@ -39,9 +39,9 @@ · 2 unmodified lines | ||
| 39 | 39 | #include <asm/mach/map.h> |
| 40 | 40 | #include <asm/mach/irq.h> |
| 41 | 41 | |
| 42 | −#include <asm/arch/board.h> | |
| 43 | −#include <asm/arch/gpio.h> | |
| 44 | −#include <asm/arch/at91_shdwc.h> | |
| 42 | +#include <mach/board.h> | |
| 43 | +#include <mach/gpio.h> | |
| 44 | +#include <mach/at91_shdwc.h> | |
| 45 | 45 | |
| 46 | 46 | #include "generic.h" |
| 47 | 47 | |
| @@ -27,7 +27,7 @@ · 26 unmodified lines | ||
| 27 | 27 | #include <linux/platform_device.h> |
| 28 | 28 | #include <linux/spi/spi.h> |
| 29 | 29 | |
| 30 | −#include <asm/hardware.h> | |
| 30 | +#include <mach/hardware.h> | |
| 31 | 31 | #include <asm/setup.h> |
| 32 | 32 | #include <asm/mach-types.h> |
| 33 | 33 | #include <asm/irq.h> |
| @@ -36,8 +36,8 @@ · 2 unmodified lines | ||
| 36 | 36 | #include <asm/mach/map.h> |
| 37 | 37 | #include <asm/mach/irq.h> |
| 38 | 38 | |
| 39 | −#include <asm/arch/board.h> | |
| 40 | −#include <asm/arch/gpio.h> | |
| 39 | +#include <mach/board.h> | |
| 40 | +#include <mach/gpio.h> | |
| 41 | 41 | |
| 42 | 42 | #include "generic.h" |
| 43 | 43 | |
| @@ -28,7 +28,7 @@ · 27 unmodified lines | ||
| 28 | 28 | #include <linux/spi/at73c213.h> |
| 29 | 29 | #include <linux/clk.h> |
| 30 | 30 | |
| 31 | −#include <asm/hardware.h> | |
| 31 | +#include <mach/hardware.h> | |
| 32 | 32 | #include <asm/setup.h> |
| 33 | 33 | #include <asm/mach-types.h> |
| 34 | 34 | #include <asm/irq.h> |
| @@ -37,8 +37,8 @@ · 2 unmodified lines | ||
| 37 | 37 | #include <asm/mach/map.h> |
| 38 | 38 | #include <asm/mach/irq.h> |
| 39 | 39 | |
| 40 | −#include <asm/arch/board.h> | |
| 41 | −#include <asm/arch/gpio.h> | |
| 40 | +#include <mach/board.h> | |
| 41 | +#include <mach/gpio.h> | |
| 42 | 42 | |
| 43 | 43 | #include "generic.h" |
| 44 | 44 | |
| @@ -35,7 +35,7 @@ · 34 unmodified lines | ||
| 35 | 35 | |
| 36 | 36 | #include <video/atmel_lcdc.h> |
| 37 | 37 | |
| 38 | −#include <asm/hardware.h> | |
| 38 | +#include <mach/hardware.h> | |
| 39 | 39 | #include <asm/setup.h> |
| 40 | 40 | #include <asm/mach-types.h> |
| 41 | 41 | #include <asm/irq.h> |
| @@ -44,9 +44,9 @@ · 2 unmodified lines | ||
| 44 | 44 | #include <asm/mach/map.h> |
| 45 | 45 | #include <asm/mach/irq.h> |
| 46 | 46 | |
| 47 | −#include <asm/arch/board.h> | |
| 48 | −#include <asm/arch/gpio.h> | |
| 49 | −#include <asm/arch/at91sam9_smc.h> | |
| 47 | +#include <mach/board.h> | |
| 48 | +#include <mach/gpio.h> | |
| 49 | +#include <mach/at91sam9_smc.h> | |
| 50 | 50 | |
| 51 | 51 | #include "generic.h" |
| 52 | 52 | |
| @@ -32,7 +32,7 @@ · 31 unmodified lines | ||
| 32 | 32 | |
| 33 | 33 | #include <video/atmel_lcdc.h> |
| 34 | 34 | |
| 35 | −#include <asm/hardware.h> | |
| 35 | +#include <mach/hardware.h> | |
| 36 | 36 | #include <asm/setup.h> |
| 37 | 37 | #include <asm/mach-types.h> |
| 38 | 38 | #include <asm/irq.h> |
| @@ -41,9 +41,9 @@ · 2 unmodified lines | ||
| 41 | 41 | #include <asm/mach/map.h> |
| 42 | 42 | #include <asm/mach/irq.h> |
| 43 | 43 | |
| 44 | −#include <asm/arch/board.h> | |
| 45 | −#include <asm/arch/gpio.h> | |
| 46 | −#include <asm/arch/at91sam9_smc.h> | |
| 44 | +#include <mach/board.h> | |
| 45 | +#include <mach/gpio.h> | |
| 46 | +#include <mach/at91sam9_smc.h> | |
| 47 | 47 | |
| 48 | 48 | #include "generic.h" |
| 49 | 49 | |
| @@ -26,7 +26,7 @@ · 25 unmodified lines | ||
| 26 | 26 | #include <linux/spi/at73c213.h> |
| 27 | 27 | #include <linux/clk.h> |
| 28 | 28 | |
| 29 | −#include <asm/hardware.h> | |
| 29 | +#include <mach/hardware.h> | |
| 30 | 30 | #include <asm/setup.h> |
| 31 | 31 | #include <asm/mach-types.h> |
| 32 | 32 | #include <asm/irq.h> |
| @@ -35,8 +35,8 @@ · 2 unmodified lines | ||
| 35 | 35 | #include <asm/mach/map.h> |
| 36 | 36 | #include <asm/mach/irq.h> |
| 37 | 37 | |
| 38 | −#include <asm/arch/board.h> | |
| 39 | −#include <asm/arch/gpio.h> | |
| 38 | +#include <mach/board.h> | |
| 39 | +#include <mach/gpio.h> | |
| 40 | 40 | |
| 41 | 41 | #include "generic.h" |
| 42 | 42 | |
| @@ -18,7 +18,7 @@ · 17 unmodified lines | ||
| 18 | 18 | |
| 19 | 19 | #include <video/atmel_lcdc.h> |
| 20 | 20 | |
| 21 | −#include <asm/hardware.h> | |
| 21 | +#include <mach/hardware.h> | |
| 22 | 22 | #include <asm/setup.h> |
| 23 | 23 | #include <asm/mach-types.h> |
| 24 | 24 | #include <asm/irq.h> |
| @@ -27,9 +27,9 @@ · 2 unmodified lines | ||
| 27 | 27 | #include <asm/mach/map.h> |
| 28 | 28 | #include <asm/mach/irq.h> |
| 29 | 29 | |
| 30 | −#include <asm/arch/board.h> | |
| 31 | −#include <asm/arch/gpio.h> | |
| 32 | −#include <asm/arch/at91sam9_smc.h> | |
| 30 | +#include <mach/board.h> | |
| 31 | +#include <mach/gpio.h> | |
| 32 | +#include <mach/at91sam9_smc.h> | |
| 33 | 33 | |
| 34 | 34 | #include "generic.h" |
| 35 | 35 | |
| @@ -30,7 +30,7 @@ · 29 unmodified lines | ||
| 30 | 30 | #include <linux/input.h> |
| 31 | 31 | #include <linux/clk.h> |
| 32 | 32 | |
| 33 | −#include <asm/hardware.h> | |
| 33 | +#include <mach/hardware.h> | |
| 34 | 34 | #include <asm/setup.h> |
| 35 | 35 | #include <asm/mach-types.h> |
| 36 | 36 | #include <asm/irq.h> |
| @@ -39,9 +39,9 @@ · 2 unmodified lines | ||
| 39 | 39 | #include <asm/mach/map.h> |
| 40 | 40 | #include <asm/mach/irq.h> |
| 41 | 41 | |
| 42 | −#include <asm/arch/board.h> | |
| 43 | −#include <asm/arch/gpio.h> | |
| 44 | −#include <asm/arch/at91_shdwc.h> | |
| 42 | +#include <mach/board.h> | |
| 43 | +#include <mach/gpio.h> | |
| 44 | +#include <mach/at91_shdwc.h> | |
| 45 | 45 | |
| 46 | 46 | #include "generic.h" |
| 47 | 47 | |
| @@ -29,7 +29,7 @@ · 28 unmodified lines | ||
| 29 | 29 | #include <linux/gpio_keys.h> |
| 30 | 30 | #include <linux/input.h> |
| 31 | 31 | |
| 32 | −#include <asm/hardware.h> | |
| 32 | +#include <mach/hardware.h> | |
| 33 | 33 | #include <asm/setup.h> |
| 34 | 34 | #include <asm/mach-types.h> |
| 35 | 35 | #include <asm/irq.h> |
| @@ -38,9 +38,9 @@ · 2 unmodified lines | ||
| 38 | 38 | #include <asm/mach/map.h> |
| 39 | 39 | #include <asm/mach/irq.h> |
| 40 | 40 | |
| 41 | −#include <asm/arch/board.h> | |
| 42 | −#include <asm/arch/gpio.h> | |
| 43 | −#include <asm/arch/at91_shdwc.h> | |
| 41 | +#include <mach/board.h> | |
| 42 | +#include <mach/gpio.h> | |
| 43 | +#include <mach/at91_shdwc.h> | |
| 44 | 44 | |
| 45 | 45 | #include "generic.h" |
| 46 | 46 | |
| @@ -33,7 +33,7 @@ · 32 unmodified lines | ||
| 33 | 33 | #include <linux/gpio_keys.h> |
| 34 | 34 | #include <linux/input.h> |
| 35 | 35 | |
| 36 | −#include <asm/hardware.h> | |
| 36 | +#include <mach/hardware.h> | |
| 37 | 37 | #include <asm/setup.h> |
| 38 | 38 | #include <asm/mach-types.h> |
| 39 | 39 | #include <asm/irq.h> |
| @@ -42,9 +42,9 @@ · 2 unmodified lines | ||
| 42 | 42 | #include <asm/mach/map.h> |
| 43 | 43 | #include <asm/mach/irq.h> |
| 44 | 44 | |
| 45 | −#include <asm/arch/board.h> | |
| 46 | −#include <asm/arch/gpio.h> | |
| 47 | −#include <asm/arch/at91rm9200_mc.h> | |
| 45 | +#include <mach/board.h> | |
| 46 | +#include <mach/gpio.h> | |
| 47 | +#include <mach/at91rm9200_mc.h> | |
| 48 | 48 | |
| 49 | 49 | #include "generic.h" |
| 50 | 50 | |
| @@ -24,11 +24,10 @@ · 23 unmodified lines | ||
| 24 | 24 | #include <linux/clk.h> |
| 25 | 25 | |
| 26 | 26 | #include <asm/io.h> |
| 27 | −#include <asm/mach-types.h> | |
| 28 | 27 | |
| 29 | −#include <asm/hardware.h> | |
| 30 | −#include <asm/arch/at91_pmc.h> | |
| 31 | −#include <asm/arch/cpu.h> | |
| 28 | +#include <mach/hardware.h> | |
| 29 | +#include <mach/at91_pmc.h> | |
| 30 | +#include <mach/cpu.h> | |
| 32 | 31 | |
| 33 | 32 | #include "clock.h" |
| 34 | 33 | |
| @@ -20,9 +20,9 @@ · 19 unmodified lines | ||
| 20 | 20 | #include <linux/module.h> |
| 21 | 21 | |
| 22 | 22 | #include <asm/io.h> |
| 23 | −#include <asm/hardware.h> | |
| 24 | −#include <asm/arch/at91_pio.h> | |
| 25 | −#include <asm/arch/gpio.h> | |
| 23 | +#include <mach/hardware.h> | |
| 24 | +#include <mach/at91_pio.h> | |
| 25 | +#include <mach/gpio.h> | |
| 26 | 26 | |
| 27 | 27 | #include "generic.h" |
| 28 | 28 | |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-at91/at91_adc.h | |
| 2 | + * arch/arm/mach-at91/include/mach/at91_adc.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) SAN People |
| 5 | 5 | * |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-at91/at91_aic.h | |
| 2 | + * arch/arm/mach-at91/include/mach/at91_aic.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 2005 Ivan Kokshaysky |
| 5 | 5 | * Copyright (C) SAN People |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-at91/at91_dbgu.h | |
| 2 | + * arch/arm/mach-at91/include/mach/at91_dbgu.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 2005 Ivan Kokshaysky |
| 5 | 5 | * Copyright (C) SAN People |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-at91/at91_mci.h | |
| 2 | + * arch/arm/mach-at91/include/mach/at91_mci.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 2005 Ivan Kokshaysky |
| 5 | 5 | * Copyright (C) SAN People |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-at91/at91_pio.h | |
| 2 | + * arch/arm/mach-at91/include/mach/at91_pio.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 2005 Ivan Kokshaysky |
| 5 | 5 | * Copyright (C) SAN People |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-at91/at91_pit.h | |
| 2 | + * arch/arm/mach-at91/include/mach/at91_pit.h | |
| 3 | 3 | * |
| 4 | 4 | * Periodic Interval Timer (PIT) - System peripherals regsters. |
| 5 | 5 | * Based on AT91SAM9261 datasheet revision D. |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-at91/at91_pmc.h | |
| 2 | + * arch/arm/mach-at91/include/mach/at91_pmc.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 2005 Ivan Kokshaysky |
| 5 | 5 | * Copyright (C) SAN People |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-at91/at91_rstc.h | |
| 2 | + * arch/arm/mach-at91/include/mach/at91_rstc.h | |
| 3 | 3 | * |
| 4 | 4 | * Reset Controller (RSTC) - System peripherals regsters. |
| 5 | 5 | * Based on AT91SAM9261 datasheet revision D. |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-at91/at91_rtc.h | |
| 2 | + * arch/arm/mach-at91/include/mach/at91_rtc.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 2005 Ivan Kokshaysky |
| 5 | 5 | * Copyright (C) SAN People |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-at91/at91_rtt.h | |
| 2 | + * arch/arm/mach-at91/include/mach/at91_rtt.h | |
| 3 | 3 | * |
| 4 | 4 | * Real-time Timer (RTT) - System peripherals regsters. |
| 5 | 5 | * Based on AT91SAM9261 datasheet revision D. |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-at91/at91_shdwc.h | |
| 2 | + * arch/arm/mach-at91/include/mach/at91_shdwc.h | |
| 3 | 3 | * |
| 4 | 4 | * Shutdown Controller (SHDWC) - System peripherals regsters. |
| 5 | 5 | * Based on AT91SAM9261 datasheet revision D. |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-at91/at91_spi.h | |
| 2 | + * arch/arm/mach-at91/include/mach/at91_spi.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 2005 Ivan Kokshaysky |
| 5 | 5 | * Copyright (C) SAN People |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-at91/at91_ssc.h | |
| 2 | + * arch/arm/mach-at91/include/mach/at91_ssc.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) SAN People |
| 5 | 5 | * |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-at91/at91_st.h | |
| 2 | + * arch/arm/mach-at91/include/mach/at91_st.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 2005 Ivan Kokshaysky |
| 5 | 5 | * Copyright (C) SAN People |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-at91/at91_tc.h | |
| 2 | + * arch/arm/mach-at91/include/mach/at91_tc.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) SAN People |
| 5 | 5 | * |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-at91/at91_twi.h | |
| 2 | + * arch/arm/mach-at91/include/mach/at91_twi.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 2005 Ivan Kokshaysky |
| 5 | 5 | * Copyright (C) SAN People |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-at91/at91_wdt.h | |
| 2 | + * arch/arm/mach-at91/include/mach/at91_wdt.h | |
| 3 | 3 | * |
| 4 | 4 | * Watchdog Timer (WDT) - System peripherals regsters. |
| 5 | 5 | * Based on AT91SAM9261 datasheet revision D. |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-at91/at91cap9.h | |
| 2 | + * arch/arm/mach-at91/include/mach/at91cap9.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 2007 Stelian Pop <stelian.pop@leadtechdesign.com> |
| 5 | 5 | * Copyright (C) 2007 Lead Tech Design <www.leadtechdesign.com> |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-at91/at91cap9_ddrsdr.h | |
| 2 | + * arch/arm/mach-at91/include/mach/at91cap9_ddrsdr.h | |
| 3 | 3 | * |
| 4 | 4 | * DDR/SDR Controller (DDRSDRC) - System peripherals registers. |
| 5 | 5 | * Based on AT91CAP9 datasheet revision B. |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-at91/at91cap9_matrix.h | |
| 2 | + * arch/arm/mach-at91/include/mach/at91cap9_matrix.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 2007 Stelian Pop <stelian.pop@leadtechdesign.com> |
| 5 | 5 | * Copyright (C) 2007 Lead Tech Design <www.leadtechdesign.com> |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-at91/at91rm9200.h | |
| 2 | + * arch/arm/mach-at91/include/mach/at91rm9200.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 2005 Ivan Kokshaysky |
| 5 | 5 | * Copyright (C) SAN People |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-at91/at91rm9200_emac.h | |
| 2 | + * arch/arm/mach-at91/include/mach/at91rm9200_emac.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 2005 Ivan Kokshaysky |
| 5 | 5 | * Copyright (C) SAN People |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-at91/at91rm9200_mc.h | |
| 2 | + * arch/arm/mach-at91/include/mach/at91rm9200_mc.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 2005 Ivan Kokshaysky |
| 5 | 5 | * Copyright (C) SAN People |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-at91/at91sam9260.h | |
| 2 | + * arch/arm/mach-at91/include/mach/at91sam9260.h | |
| 3 | 3 | * |
| 4 | 4 | * (C) 2006 Andrew Victor |
| 5 | 5 | * |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-at91/at91sam9260_matrix.h | |
| 2 | + * arch/arm/mach-at91/include/mach/at91sam9260_matrix.h | |
| 3 | 3 | * |
| 4 | 4 | * Memory Controllers (MATRIX, EBI) - System peripherals registers. |
| 5 | 5 | * Based on AT91SAM9260 datasheet revision B. |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-at91/at91sam9261.h | |
| 2 | + * arch/arm/mach-at91/include/mach/at91sam9261.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) SAN People |
| 5 | 5 | * |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-at91/at91sam9261_matrix.h | |
| 2 | + * arch/arm/mach-at91/include/mach/at91sam9261_matrix.h | |
| 3 | 3 | * |
| 4 | 4 | * Memory Controllers (MATRIX, EBI) - System peripherals registers. |
| 5 | 5 | * Based on AT91SAM9261 datasheet revision D. |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-at91/at91sam9263.h | |
| 2 | + * arch/arm/mach-at91/include/mach/at91sam9263.h | |
| 3 | 3 | * |
| 4 | 4 | * (C) 2007 Atmel Corporation. |
| 5 | 5 | * |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-at91/at91sam9263_matrix.h | |
| 2 | + * arch/arm/mach-at91/include/mach/at91sam9263_matrix.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 2006 Atmel Corporation. |
| 5 | 5 | * |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-at91/at91sam9_sdramc.h | |
| 2 | + * arch/arm/mach-at91/include/mach/at91sam9_sdramc.h | |
| 3 | 3 | * |
| 4 | 4 | * SDRAM Controllers (SDRAMC) - System peripherals registers. |
| 5 | 5 | * Based on AT91SAM9261 datasheet revision D. |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-at91/at91sam9_smc.h | |
| 2 | + * arch/arm/mach-at91/include/mach/at91sam9_smc.h | |
| 3 | 3 | * |
| 4 | 4 | * Static Memory Controllers (SMC) - System peripherals registers. |
| 5 | 5 | * Based on AT91SAM9261 datasheet revision D. |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-at91/at91sam9260.h | |
| 2 | + * arch/arm/mach-at91/include/mach/at91sam9260.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 2007 Atmel Corporation |
| 5 | 5 | * |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-at91/at91sam9rl_matrix.h | |
| 2 | + * arch/arm/mach-at91/include/mach/at91sam9rl_matrix.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 2007 Atmel Corporation |
| 5 | 5 | * |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-at91/at91x40.h | |
| 2 | + * arch/arm/mach-at91/include/mach/at91x40.h | |
| 3 | 3 | * |
| 4 | 4 | * (C) Copyright 2007, Greg Ungerer <gerg@snapgear.com> |
| 5 | 5 | * |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-at91/board.h | |
| 2 | + * arch/arm/mach-at91/include/mach/board.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 2005 HP Labs |
| 5 | 5 | * |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-at91/cpu.h | |
| 2 | + * arch/arm/mach-at91/include/mach/cpu.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 2006 SAN People |
| 5 | 5 | * |
| @@ -13,8 +13,8 @@ · 7 unmodified lines | ||
| 13 | 13 | #ifndef __ASM_ARCH_CPU_H |
| 14 | 14 | #define __ASM_ARCH_CPU_H |
| 15 | 15 | |
| 16 | −#include <asm/hardware.h> | |
| 17 | −#include <asm/arch/at91_dbgu.h> | |
| 16 | +#include <mach/hardware.h> | |
| 17 | +#include <mach/at91_dbgu.h> | |
| 18 | 18 | |
| 19 | 19 | |
| 20 | 20 | #define ARCH_ID_AT91RM9200 0x09290780 |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-at91/debug-macro.S | |
| 2 | + * arch/arm/mach-at91/include/mach/debug-macro.S | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 2003-2005 SAN People |
| 5 | 5 | * |
| @@ -11,8 +11,8 @@ · 5 unmodified lines | ||
| 11 | 11 | * |
| 12 | 12 | */ |
| 13 | 13 | |
| 14 | −#include <asm/hardware.h> | |
| 15 | −#include <asm/arch/at91_dbgu.h> | |
| 14 | +#include <mach/hardware.h> | |
| 15 | +#include <mach/at91_dbgu.h> | |
| 16 | 16 | |
| 17 | 17 | .macro addruart,rx |
| 18 | 18 | mrc p15, 0, \rx, c1, c0 |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-at91/dma.h | |
| 2 | + * arch/arm/mach-at91/include/mach/dma.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 2003 SAN People |
| 5 | 5 | * |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-at91/entry-macro.S | |
| 2 | + * arch/arm/mach-at91/include/mach/entry-macro.S | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 2003-2005 SAN People |
| 5 | 5 | * |
| @@ -10,8 +10,8 @@ · 4 unmodified lines | ||
| 10 | 10 | * warranty of any kind, whether express or implied. |
| 11 | 11 | */ |
| 12 | 12 | |
| 13 | −#include <asm/hardware.h> | |
| 14 | −#include <asm/arch/at91_aic.h> | |
| 13 | +#include <mach/hardware.h> | |
| 14 | +#include <mach/at91_aic.h> | |
| 15 | 15 | |
| 16 | 16 | .macro disable_fiq |
| 17 | 17 | .endm |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-at91/gpio.h | |
| 2 | + * arch/arm/mach-at91/include/mach/gpio.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 2005 HP Labs |
| 5 | 5 | * |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-at91/hardware.h | |
| 2 | + * arch/arm/mach-at91/include/mach/hardware.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 2003 SAN People |
| 5 | 5 | * Copyright (C) 2003 ATMEL |
| @@ -17,19 +17,19 @@ · 11 unmodified lines | ||
| 17 | 17 | #include <asm/sizes.h> |
| 18 | 18 | |
| 19 | 19 | #if defined(CONFIG_ARCH_AT91RM9200) |
| 20 | −#include <asm/arch/at91rm9200.h> | |
| 20 | +#include <mach/at91rm9200.h> | |
| 21 | 21 | #elif defined(CONFIG_ARCH_AT91SAM9260) || defined(CONFIG_ARCH_AT91SAM9G20) |
| 22 | −#include <asm/arch/at91sam9260.h> | |
| 22 | +#include <mach/at91sam9260.h> | |
| 23 | 23 | #elif defined(CONFIG_ARCH_AT91SAM9261) |
| 24 | −#include <asm/arch/at91sam9261.h> | |
| 24 | +#include <mach/at91sam9261.h> | |
| 25 | 25 | #elif defined(CONFIG_ARCH_AT91SAM9263) |
| 26 | −#include <asm/arch/at91sam9263.h> | |
| 26 | +#include <mach/at91sam9263.h> | |
| 27 | 27 | #elif defined(CONFIG_ARCH_AT91SAM9RL) |
| 28 | −#include <asm/arch/at91sam9rl.h> | |
| 28 | +#include <mach/at91sam9rl.h> | |
| 29 | 29 | #elif defined(CONFIG_ARCH_AT91CAP9) |
| 30 | −#include <asm/arch/at91cap9.h> | |
| 30 | +#include <mach/at91cap9.h> | |
| 31 | 31 | #elif defined(CONFIG_ARCH_AT91X40) |
| 32 | −#include <asm/arch/at91x40.h> | |
| 32 | +#include <mach/at91x40.h> | |
| 33 | 33 | #else |
| 34 | 34 | #error "Unsupported AT91 processor" |
| 35 | 35 | #endif |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-at91/io.h | |
| 2 | + * arch/arm/mach-at91/include/mach/io.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 2003 SAN People |
| 5 | 5 | * |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-at91/irqs.h | |
| 2 | + * arch/arm/mach-at91/include/mach/irqs.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 2004 SAN People |
| 5 | 5 | * |
| @@ -22,7 +22,7 @@ · 16 unmodified lines | ||
| 22 | 22 | #define __ASM_ARCH_IRQS_H |
| 23 | 23 | |
| 24 | 24 | #include <asm/io.h> |
| 25 | −#include <asm/arch/at91_aic.h> | |
| 25 | +#include <mach/at91_aic.h> | |
| 26 | 26 | |
| 27 | 27 | #define NR_AIC_IRQS 32 |
| 28 | 28 | |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-at91/memory.h | |
| 2 | + * arch/arm/mach-at91/include/mach/memory.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 2004 SAN People |
| 5 | 5 | * |
| @@ -21,7 +21,7 @@ · 15 unmodified lines | ||
| 21 | 21 | #ifndef __ASM_ARCH_MEMORY_H |
| 22 | 22 | #define __ASM_ARCH_MEMORY_H |
| 23 | 23 | |
| 24 | −#include <asm/hardware.h> | |
| 24 | +#include <mach/hardware.h> | |
| 25 | 25 | |
| 26 | 26 | #define PHYS_OFFSET (AT91_SDRAM_BASE) |
| 27 | 27 | |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-at91/system.h | |
| 2 | + * arch/arm/mach-at91/include/mach/system.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 2003 SAN People |
| 5 | 5 | * |
| @@ -21,9 +21,9 @@ · 15 unmodified lines | ||
| 21 | 21 | #ifndef __ASM_ARCH_SYSTEM_H |
| 22 | 22 | #define __ASM_ARCH_SYSTEM_H |
| 23 | 23 | |
| 24 | −#include <asm/hardware.h> | |
| 25 | −#include <asm/arch/at91_st.h> | |
| 26 | −#include <asm/arch/at91_dbgu.h> | |
| 24 | +#include <mach/hardware.h> | |
| 25 | +#include <mach/at91_st.h> | |
| 26 | +#include <mach/at91_dbgu.h> | |
| 27 | 27 | |
| 28 | 28 | static inline void arch_idle(void) |
| 29 | 29 | { |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-at91/timex.h | |
| 2 | + * arch/arm/mach-at91/include/mach/timex.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 2003 SAN People |
| 5 | 5 | * |
| @@ -21,7 +21,7 @@ · 15 unmodified lines | ||
| 21 | 21 | #ifndef __ASM_ARCH_TIMEX_H |
| 22 | 22 | #define __ASM_ARCH_TIMEX_H |
| 23 | 23 | |
| 24 | −#include <asm/hardware.h> | |
| 24 | +#include <mach/hardware.h> | |
| 25 | 25 | |
| 26 | 26 | #if defined(CONFIG_ARCH_AT91RM9200) |
| 27 | 27 | |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-at91/uncompress.h | |
| 2 | + * arch/arm/mach-at91/include/mach/uncompress.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 2003 SAN People |
| 5 | 5 | * |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-at91/vmalloc.h | |
| 2 | + * arch/arm/mach-at91/include/mach/vmalloc.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 2003 SAN People |
| 5 | 5 | * |
| @@ -25,9 +25,8 @@ · 24 unmodified lines | ||
| 25 | 25 | #include <linux/mm.h> |
| 26 | 26 | #include <linux/types.h> |
| 27 | 27 | |
| 28 | −#include <asm/hardware.h> | |
| 28 | +#include <mach/hardware.h> | |
| 29 | 29 | #include <asm/irq.h> |
| 30 | −#include <asm/mach-types.h> | |
| 31 | 30 | #include <asm/setup.h> |
| 32 | 31 | |
| 33 | 32 | #include <asm/mach/arch.h> |
| @@ -13,9 +13,8 @@ · 12 unmodified lines | ||
| 13 | 13 | #include <linux/module.h> |
| 14 | 14 | #include <linux/init.h> |
| 15 | 15 | |
| 16 | −#include <asm/mach-types.h> | |
| 17 | −#include <asm/arch/board.h> | |
| 18 | −#include <asm/arch/gpio.h> | |
| 16 | +#include <mach/board.h> | |
| 17 | +#include <mach/gpio.h> | |
| 19 | 18 | |
| 20 | 19 | |
| 21 | 20 | /* ------------------------------------------------------------------------- */ |
| @@ -23,16 +23,15 @@ · 22 unmodified lines | ||
| 23 | 23 | #include <asm/atomic.h> |
| 24 | 24 | #include <asm/mach/time.h> |
| 25 | 25 | #include <asm/mach/irq.h> |
| 26 | −#include <asm/mach-types.h> | |
| 27 | 26 | |
| 28 | −#include <asm/arch/at91_pmc.h> | |
| 29 | −#include <asm/arch/gpio.h> | |
| 30 | −#include <asm/arch/cpu.h> | |
| 27 | +#include <mach/at91_pmc.h> | |
| 28 | +#include <mach/gpio.h> | |
| 29 | +#include <mach/cpu.h> | |
| 31 | 30 | |
| 32 | 31 | #include "generic.h" |
| 33 | 32 | |
| 34 | 33 | #ifdef CONFIG_ARCH_AT91RM9200 |
| 35 | −#include <asm/arch/at91rm9200_mc.h> | |
| 34 | +#include <mach/at91rm9200_mc.h> | |
| 36 | 35 | |
| 37 | 36 | /* |
| 38 | 37 | * The AT91RM9200 goes into self-refresh mode with this command, and will |
| @@ -42,7 +41,7 @@ · 3 unmodified lines | ||
| 42 | 41 | #define sdram_selfrefresh_disable() do {} while (0) |
| 43 | 42 | |
| 44 | 43 | #elif defined(CONFIG_ARCH_AT91CAP9) |
| 45 | −#include <asm/arch/at91cap9_ddrsdr.h> | |
| 44 | +#include <mach/at91cap9_ddrsdr.h> | |
| 46 | 45 | |
| 47 | 46 | static u32 saved_lpr; |
| 48 | 47 | |
| @@ -59,7 +58,7 @@ static inline void sdram_selfrefresh_enable(void) · 10 unmodified lines | ||
| 59 | 58 | #define sdram_selfrefresh_disable() at91_sys_write(AT91_DDRSDRC_LPR, saved_lpr) |
| 60 | 59 | |
| 61 | 60 | #else |
| 62 | −#include <asm/arch/at91sam9_sdramc.h> | |
| 61 | +#include <mach/at91sam9_sdramc.h> | |
| 63 | 62 | |
| 64 | 63 | #ifdef CONFIG_ARCH_AT91SAM9263 |
| 65 | 64 | /* |
| @@ -92,8 +91,8 @@ static inline void sdram_selfrefresh_enable(void) · 26 unmodified lines | ||
| 92 | 91 | */ |
| 93 | 92 | #if defined(AT91_SHDWC) |
| 94 | 93 | |
| 95 | −#include <asm/arch/at91_rstc.h> | |
| 96 | −#include <asm/arch/at91_shdwc.h> | |
| 94 | +#include <mach/at91_rstc.h> | |
| 95 | +#include <mach/at91_shdwc.h> | |
| 97 | 96 | |
| 98 | 97 | static void __init show_reset_status(void) |
| 99 | 98 | { |
| @@ -23,7 +23,7 @@ · 22 unmodified lines | ||
| 23 | 23 | #include <linux/string.h> |
| 24 | 24 | #include <linux/mm.h> |
| 25 | 25 | |
| 26 | −#include <asm/hardware.h> | |
| 26 | +#include <mach/hardware.h> | |
| 27 | 27 | #include <asm/sizes.h> |
| 28 | 28 | #include <asm/io.h> |
| 29 | 29 | #include <asm/setup.h> |
| @@ -33,7 +33,7 @@ · 3 unmodified lines | ||
| 33 | 33 | #include <asm/page.h> |
| 34 | 34 | |
| 35 | 35 | #include <asm/mach/map.h> |
| 36 | −#include <asm/arch/autcpu12.h> | |
| 36 | +#include <mach/autcpu12.h> | |
| 37 | 37 | |
| 38 | 38 | #include "common.h" |
| 39 | 39 | |
| @@ -23,7 +23,7 @@ · 22 unmodified lines | ||
| 23 | 23 | #include <linux/string.h> |
| 24 | 24 | #include <linux/mm.h> |
| 25 | 25 | |
| 26 | −#include <asm/hardware.h> | |
| 26 | +#include <mach/hardware.h> | |
| 27 | 27 | #include <asm/io.h> |
| 28 | 28 | #include <asm/pgtable.h> |
| 29 | 29 | #include <asm/page.h> |
| @@ -27,7 +27,7 @@ · 26 unmodified lines | ||
| 27 | 27 | |
| 28 | 28 | #include <linux/kernel.h> |
| 29 | 29 | |
| 30 | −#include <asm/hardware.h> | |
| 30 | +#include <mach/hardware.h> | |
| 31 | 31 | #include <asm/page.h> |
| 32 | 32 | #include <asm/pgtable.h> |
| 33 | 33 | #include <asm/sizes.h> |
| @@ -22,7 +22,7 @@ · 21 unmodified lines | ||
| 22 | 22 | #include <linux/kernel.h> |
| 23 | 23 | #include <linux/init.h> |
| 24 | 24 | |
| 25 | −#include <asm/hardware.h> | |
| 25 | +#include <mach/hardware.h> | |
| 26 | 26 | #include <asm/page.h> |
| 27 | 27 | #include <asm/pgtable.h> |
| 28 | 28 | #include <asm/sizes.h> |
| @@ -23,7 +23,7 @@ · 22 unmodified lines | ||
| 23 | 23 | #include <linux/init.h> |
| 24 | 24 | #include <linux/initrd.h> |
| 25 | 25 | |
| 26 | −#include <asm/hardware.h> | |
| 26 | +#include <mach/hardware.h> | |
| 27 | 27 | #include <asm/irq.h> |
| 28 | 28 | #include <asm/setup.h> |
| 29 | 29 | #include <asm/mach-types.h> |
File renamed without changes.
| @@ -1,4 +1,4 @@ | ||
| 1 | −/* linux/include/asm-arm/arch-clps711x/debug-macro.S | |
| 1 | +/* arch/arm/mach-clps711x/include/mach/debug-macro.S | |
| 2 | 2 | * |
| 3 | 3 | * Debugging macro include header |
| 4 | 4 | * |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-clps711x/dma.h | |
| 2 | + * arch/arm/mach-clps711x/include/mach/dma.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 1997,1998 Russell King |
| 5 | 5 | * |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-clps711x/entry-macro.S | |
| 2 | + * arch/arm/mach-clps711x/include/mach/entry-macro.S | |
| 3 | 3 | * |
| 4 | 4 | * Low-level IRQ helper macros for CLPS711X-based platforms |
| 5 | 5 | * |
| @@ -7,7 +7,7 @@ · 1 unmodified line | ||
| 7 | 7 | * License version 2. This program is licensed "as is" without any |
| 8 | 8 | * warranty of any kind, whether express or implied. |
| 9 | 9 | */ |
| 10 | −#include <asm/hardware.h> | |
| 10 | +#include <mach/hardware.h> | |
| 11 | 11 | #include <asm/hardware/clps7111.h> |
| 12 | 12 | |
| 13 | 13 | .macro disable_fiq |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-clps711x/hardware.h | |
| 2 | + * arch/arm/mach-clps711x/include/mach/hardware.h | |
| 3 | 3 | * |
| 4 | 4 | * This file contains the hardware definitions of the Prospector P720T. |
| 5 | 5 | * |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-clps711x/io.h | |
| 2 | + * arch/arm/mach-clps711x/include/mach/io.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 1999 ARM Limited |
| 5 | 5 | * |
| @@ -20,7 +20,7 @@ · 14 unmodified lines | ||
| 20 | 20 | #ifndef __ASM_ARM_ARCH_IO_H |
| 21 | 21 | #define __ASM_ARM_ARCH_IO_H |
| 22 | 22 | |
| 23 | −#include <asm/hardware.h> | |
| 23 | +#include <mach/hardware.h> | |
| 24 | 24 | |
| 25 | 25 | #define IO_SPACE_LIMIT 0xffffffff |
| 26 | 26 | |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-clps711x/irqs.h | |
| 2 | + * arch/arm/mach-clps711x/include/mach/irqs.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 2000 Deep Blue Solutions Ltd. |
| 5 | 5 | * |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-clps711x/memory.h | |
| 2 | + * arch/arm/mach-clps711x/include/mach/memory.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 1999 ARM Limited |
| 5 | 5 | * |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-clps711x/syspld.h | |
| 2 | + * arch/arm/mach-clps711x/include/mach/syspld.h | |
| 3 | 3 | * |
| 4 | 4 | * System Control PLD register definitions. |
| 5 | 5 | * |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-clps711x/system.h | |
| 2 | + * arch/arm/mach-clps711x/include/mach/system.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 2000 Deep Blue Solutions Ltd |
| 5 | 5 | * |
| @@ -20,7 +20,7 @@ · 14 unmodified lines | ||
| 20 | 20 | #ifndef __ASM_ARCH_SYSTEM_H |
| 21 | 21 | #define __ASM_ARCH_SYSTEM_H |
| 22 | 22 | |
| 23 | −#include <asm/hardware.h> | |
| 23 | +#include <mach/hardware.h> | |
| 24 | 24 | #include <asm/hardware/clps7111.h> |
| 25 | 25 | #include <asm/io.h> |
| 26 | 26 | |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-clps711x/time.h | |
| 2 | + * arch/arm/mach-clps711x/include/mach/time.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 2000 Deep Blue Solutions Ltd. |
| 5 | 5 | * |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-clps711x/timex.h | |
| 2 | + * arch/arm/mach-clps711x/include/mach/timex.h | |
| 3 | 3 | * |
| 4 | 4 | * Prospector 720T architecture timex specifications |
| 5 | 5 | * |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-clps711x/uncompress.h | |
| 2 | + * arch/arm/mach-clps711x/include/mach/uncompress.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 2000 Deep Blue Solutions Ltd |
| 5 | 5 | * |
| @@ -17,8 +17,8 @@ · 11 unmodified lines | ||
| 17 | 17 | * along with this program; if not, write to the Free Software |
| 18 | 18 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
| 19 | 19 | */ |
| 20 | −#include <asm/arch/io.h> | |
| 21 | −#include <asm/hardware.h> | |
| 20 | +#include <mach/io.h> | |
| 21 | +#include <mach/hardware.h> | |
| 22 | 22 | #include <asm/hardware/clps7111.h> |
| 23 | 23 | |
| 24 | 24 | #undef CLPS7111_BASE |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-clps711x/vmalloc.h | |
| 2 | + * arch/arm/mach-clps711x/include/mach/vmalloc.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 2000 Deep Blue Solutions Ltd. |
| 5 | 5 | * |
| @@ -21,7 +21,7 @@ · 20 unmodified lines | ||
| 21 | 21 | #include <linux/list.h> |
| 22 | 22 | |
| 23 | 23 | #include <asm/mach/irq.h> |
| 24 | −#include <asm/hardware.h> | |
| 24 | +#include <mach/hardware.h> | |
| 25 | 25 | #include <asm/io.h> |
| 26 | 26 | #include <asm/irq.h> |
| 27 | 27 | |
| @@ -25,7 +25,7 @@ · 24 unmodified lines | ||
| 25 | 25 | #include <linux/bootmem.h> |
| 26 | 26 | |
| 27 | 27 | #include <asm/sizes.h> |
| 28 | −#include <asm/hardware.h> | |
| 28 | +#include <mach/hardware.h> | |
| 29 | 29 | #include <asm/pgtable.h> |
| 30 | 30 | #include <asm/page.h> |
| 31 | 31 | #include <asm/mach/map.h> |
| @@ -22,7 +22,7 @@ · 21 unmodified lines | ||
| 22 | 22 | #include <linux/kernel.h> |
| 23 | 23 | #include <linux/init.h> |
| 24 | 24 | |
| 25 | −#include <asm/hardware.h> | |
| 25 | +#include <mach/hardware.h> | |
| 26 | 26 | #include <asm/io.h> |
| 27 | 27 | #include <asm/leds.h> |
| 28 | 28 | #include <asm/system.h> |
| @@ -23,7 +23,7 @@ · 22 unmodified lines | ||
| 23 | 23 | #include <linux/string.h> |
| 24 | 24 | #include <linux/mm.h> |
| 25 | 25 | |
| 26 | −#include <asm/hardware.h> | |
| 26 | +#include <mach/hardware.h> | |
| 27 | 27 | #include <asm/io.h> |
| 28 | 28 | #include <asm/pgtable.h> |
| 29 | 29 | #include <asm/page.h> |
| @@ -32,7 +32,7 @@ · 2 unmodified lines | ||
| 32 | 32 | #include <asm/mach-types.h> |
| 33 | 33 | #include <asm/mach/arch.h> |
| 34 | 34 | #include <asm/mach/map.h> |
| 35 | −#include <asm/arch/syspld.h> | |
| 35 | +#include <mach/syspld.h> | |
| 36 | 36 | |
| 37 | 37 | #include "common.h" |
| 38 | 38 | |
| @@ -22,7 +22,7 @@ · 21 unmodified lines | ||
| 22 | 22 | #include <linux/irq.h> |
| 23 | 23 | #include <linux/sched.h> |
| 24 | 24 | |
| 25 | −#include <asm/hardware.h> | |
| 25 | +#include <mach/hardware.h> | |
| 26 | 26 | #include <asm/irq.h> |
| 27 | 27 | #include <asm/leds.h> |
| 28 | 28 | #include <asm/io.h> |
| @@ -21,7 +21,7 @@ · 20 unmodified lines | ||
| 21 | 21 | #include <asm/mach/irq.h> |
| 22 | 22 | #include <asm/mach/time.h> |
| 23 | 23 | |
| 24 | −#include <asm/hardware.h> | |
| 24 | +#include <mach/hardware.h> | |
| 25 | 25 | #include <asm/hardware/iomd.h> |
| 26 | 26 | #include <asm/io.h> |
| 27 | 27 | #include <asm/irq.h> |
File renamed without changes.
| @@ -1,4 +1,4 @@ | ||
| 1 | −/* linux/include/asm-arm/arch-cl7500/debug-macro.S | |
| 1 | +/* arch/arm/mach-clps7500/include/mach/debug-macro.S | |
| 2 | 2 | * |
| 3 | 3 | * Debugging macro include header |
| 4 | 4 | * |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-cl7500/dma.h | |
| 2 | + * arch/arm/mach-clps7500/include/mach/dma.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 1999 Nexus Electronics Ltd. |
| 5 | 5 | */ |
| @@ -1,4 +1,4 @@ | ||
| 1 | −#include <asm/hardware.h> | |
| 1 | +#include <mach/hardware.h> | |
| 2 | 2 | #include <asm/hardware/entry-macro-iomd.S> |
| 3 | 3 | |
| 4 | 4 | .equ ioc_base_high, IOC_BASE & 0xff000000 |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-cl7500/hardware.h | |
| 2 | + * arch/arm/mach-clps7500/include/mach/hardware.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 1996-1999 Russell King. |
| 5 | 5 | * Copyright (C) 1999 Nexus Electronics Ltd. |
| @@ -10,7 +10,7 @@ · 4 unmodified lines | ||
| 10 | 10 | #ifndef __ASM_ARCH_HARDWARE_H |
| 11 | 11 | #define __ASM_ARCH_HARDWARE_H |
| 12 | 12 | |
| 13 | −#include <asm/arch/memory.h> | |
| 13 | +#include <mach/memory.h> | |
| 14 | 14 | #include <asm/hardware/iomd.h> |
| 15 | 15 | |
| 16 | 16 | #ifdef __ASSEMBLY__ |
| @@ -1,6 +1,6 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-cl7500/io.h | |
| 3 | − * from linux/include/asm-arm/arch-rpc/io.h | |
| 2 | + * arch/arm/mach-clps7500/include/mach/io.h | |
| 3 | + * from arch/arm/mach-rpc/include/mach/io.h | |
| 4 | 4 | * |
| 5 | 5 | * Copyright (C) 1997 Russell King |
| 6 | 6 | * |
| @@ -10,7 +10,7 @@ · 3 unmodified lines | ||
| 10 | 10 | #ifndef __ASM_ARM_ARCH_IO_H |
| 11 | 11 | #define __ASM_ARM_ARCH_IO_H |
| 12 | 12 | |
| 13 | −#include <asm/hardware.h> | |
| 13 | +#include <mach/hardware.h> | |
| 14 | 14 | |
| 15 | 15 | #define IO_SPACE_LIMIT 0xffffffff |
| 16 | 16 | |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-cl7500/irq.h | |
| 2 | + * arch/arm/mach-clps7500/include/mach/irq.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 1996 Russell King |
| 5 | 5 | * Copyright (C) 1999, 2001 Nexus Electronics Ltd. |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-cl7500/irqs.h | |
| 2 | + * arch/arm/mach-clps7500/include/mach/irqs.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 1999 Nexus Electronics Ltd |
| 5 | 5 | */ |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-cl7500/memory.h | |
| 2 | + * arch/arm/mach-clps7500/include/mach/memory.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (c) 1996,1997,1998 Russell King. |
| 5 | 5 | * |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-cl7500/system.h | |
| 2 | + * arch/arm/mach-clps7500/include/mach/system.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (c) 1999 Nexus Electronics Ltd. |
| 5 | 5 | */ |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-cl7500/timex.h | |
| 2 | + * arch/arm/mach-clps7500/include/mach/timex.h | |
| 3 | 3 | * |
| 4 | 4 | * CL7500 architecture timex specifications |
| 5 | 5 | * |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-cl7500/uncompress.h | |
| 2 | + * arch/arm/mach-clps7500/include/mach/uncompress.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 1999, 2000 Nexus Electronics Ltd. |
| 5 | 5 | */ |
| @@ -1,4 +1,4 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-cl7500/vmalloc.h | |
| 2 | + * arch/arm/mach-clps7500/include/mach/vmalloc.h | |
| 3 | 3 | */ |
| 4 | 4 | #define VMALLOC_END (PAGE_OFFSET + 0x1c000000) |
| @@ -20,13 +20,13 @@ · 19 unmodified lines | ||
| 20 | 20 | #include <asm/setup.h> |
| 21 | 21 | #include <asm/io.h> |
| 22 | 22 | #include <asm/mach-types.h> |
| 23 | −#include <asm/hardware.h> | |
| 23 | +#include <mach/hardware.h> | |
| 24 | 24 | |
| 25 | 25 | #include <asm/mach/arch.h> |
| 26 | 26 | #include <asm/mach/map.h> |
| 27 | 27 | #include <asm/mach/flash.h> |
| 28 | 28 | |
| 29 | −#include <asm/arch/common.h> | |
| 29 | +#include <mach/common.h> | |
| 30 | 30 | |
| 31 | 31 | /* other misc. init functions */ |
| 32 | 32 | void __init davinci_psc_init(void); |
| @@ -17,10 +17,10 @@ · 16 unmodified lines | ||
| 17 | 17 | #include <linux/mutex.h> |
| 18 | 18 | #include <linux/platform_device.h> |
| 19 | 19 | |
| 20 | −#include <asm/hardware.h> | |
| 20 | +#include <mach/hardware.h> | |
| 21 | 21 | #include <asm/io.h> |
| 22 | 22 | |
| 23 | −#include <asm/arch/psc.h> | |
| 23 | +#include <mach/psc.h> | |
| 24 | 24 | #include "clock.h" |
| 25 | 25 | |
| 26 | 26 | /* PLL/Reset register offsets */ |
| @@ -20,9 +20,9 @@ · 19 unmodified lines | ||
| 20 | 20 | #include <linux/irq.h> |
| 21 | 21 | #include <linux/bitops.h> |
| 22 | 22 | |
| 23 | −#include <asm/arch/irqs.h> | |
| 24 | −#include <asm/arch/hardware.h> | |
| 25 | −#include <asm/arch/gpio.h> | |
| 23 | +#include <mach/irqs.h> | |
| 24 | +#include <mach/hardware.h> | |
| 25 | +#include <mach/gpio.h> | |
| 26 | 26 | |
| 27 | 27 | #include <asm/mach/irq.h> |
| 28 | 28 | |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-davinci/clock.h | |
| 2 | + * arch/arm/mach-davinci/include/mach/clock.h | |
| 3 | 3 | * |
| 4 | 4 | * Clock control driver for DaVinci - header file |
| 5 | 5 | * |
File renamed without changes.
File renamed without changes.
File renamed without changes.
| @@ -8,8 +8,8 @@ · 7 unmodified lines | ||
| 8 | 8 | * is licensed "as is" without any warranty of any kind, whether express |
| 9 | 9 | * or implied. |
| 10 | 10 | */ |
| 11 | −#include <asm/arch/io.h> | |
| 12 | −#include <asm/arch/irqs.h> | |
| 11 | +#include <mach/io.h> | |
| 12 | +#include <mach/irqs.h> | |
| 13 | 13 | |
| 14 | 14 | .macro disable_fiq |
| 15 | 15 | .endm |
| @@ -14,7 +14,7 @@ · 13 unmodified lines | ||
| 14 | 14 | #define __DAVINCI_GPIO_H |
| 15 | 15 | |
| 16 | 16 | #include <linux/io.h> |
| 17 | −#include <asm/hardware.h> | |
| 17 | +#include <mach/hardware.h> | |
| 18 | 18 | |
| 19 | 19 | /* |
| 20 | 20 | * basic gpio routines |
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
| @@ -11,7 +11,7 @@ · 10 unmodified lines | ||
| 11 | 11 | #ifndef __ASM_ARCH_SERIAL_H |
| 12 | 12 | #define __ASM_ARCH_SERIAL_H |
| 13 | 13 | |
| 14 | −#include <asm/arch/io.h> | |
| 14 | +#include <mach/io.h> | |
| 15 | 15 | |
| 16 | 16 | #define DAVINCI_UART0_BASE (IO_PHYS + 0x20000) |
| 17 | 17 | #define DAVINCI_UART1_BASE (IO_PHYS + 0x20400) |
| @@ -12,7 +12,7 @@ · 11 unmodified lines | ||
| 12 | 12 | #define __ASM_ARCH_SYSTEM_H |
| 13 | 13 | |
| 14 | 14 | #include <asm/io.h> |
| 15 | −#include <asm/hardware.h> | |
| 15 | +#include <mach/hardware.h> | |
| 16 | 16 | |
| 17 | 17 | extern void davinci_watchdog_reset(void); |
| 18 | 18 | |
File renamed without changes.
| @@ -11,7 +11,7 @@ · 10 unmodified lines | ||
| 11 | 11 | |
| 12 | 12 | #include <linux/types.h> |
| 13 | 13 | #include <linux/serial_reg.h> |
| 14 | −#include <asm/arch/serial.h> | |
| 14 | +#include <mach/serial.h> | |
| 15 | 15 | |
| 16 | 16 | /* PORT_16C550A, in polled non-fifo mode */ |
| 17 | 17 | |
| @@ -9,7 +9,7 @@ · 8 unmodified lines | ||
| 9 | 9 | * or implied. |
| 10 | 10 | */ |
| 11 | 11 | #include <asm/memory.h> |
| 12 | −#include <asm/arch/io.h> | |
| 12 | +#include <mach/io.h> | |
| 13 | 13 | |
| 14 | 14 | /* Allow vmalloc range until the IO virtual range minus a 2M "hole" */ |
| 15 | 15 | #define VMALLOC_END (IO_VIRT - (2<<20)) |
| @@ -17,7 +17,7 @@ · 16 unmodified lines | ||
| 17 | 17 | #include <asm/memory.h> |
| 18 | 18 | |
| 19 | 19 | #include <asm/mach/map.h> |
| 20 | −#include <asm/arch/clock.h> | |
| 20 | +#include <mach/clock.h> | |
| 21 | 21 | |
| 22 | 22 | extern void davinci_check_revision(void); |
| 23 | 23 | |
| @@ -23,7 +23,7 @@ · 22 unmodified lines | ||
| 23 | 23 | #include <linux/interrupt.h> |
| 24 | 24 | #include <linux/irq.h> |
| 25 | 25 | |
| 26 | −#include <asm/hardware.h> | |
| 26 | +#include <mach/hardware.h> | |
| 27 | 27 | #include <asm/io.h> |
| 28 | 28 | #include <asm/mach/irq.h> |
| 29 | 29 | |
| @@ -11,9 +11,9 @@ · 10 unmodified lines | ||
| 11 | 11 | #include <linux/io.h> |
| 12 | 12 | #include <linux/spinlock.h> |
| 13 | 13 | |
| 14 | −#include <asm/hardware.h> | |
| 14 | +#include <mach/hardware.h> | |
| 15 | 15 | |
| 16 | −#include <asm/arch/mux.h> | |
| 16 | +#include <mach/mux.h> | |
| 17 | 17 | |
| 18 | 18 | /* System control register offsets */ |
| 19 | 19 | #define PINMUX0 0x00 |
| @@ -23,9 +23,9 @@ · 22 unmodified lines | ||
| 23 | 23 | #include <linux/init.h> |
| 24 | 24 | |
| 25 | 25 | #include <asm/io.h> |
| 26 | −#include <asm/hardware.h> | |
| 27 | −#include <asm/arch/psc.h> | |
| 28 | −#include <asm/arch/mux.h> | |
| 26 | +#include <mach/hardware.h> | |
| 27 | +#include <mach/psc.h> | |
| 28 | +#include <mach/mux.h> | |
| 29 | 29 | |
| 30 | 30 | /* PSC register offsets */ |
| 31 | 31 | #define EPCPR 0x070 |
| @@ -29,9 +29,9 @@ · 28 unmodified lines | ||
| 29 | 29 | |
| 30 | 30 | #include <asm/io.h> |
| 31 | 31 | #include <asm/irq.h> |
| 32 | −#include <asm/hardware.h> | |
| 33 | −#include <asm/arch/serial.h> | |
| 34 | −#include <asm/arch/irqs.h> | |
| 32 | +#include <mach/hardware.h> | |
| 33 | +#include <mach/serial.h> | |
| 34 | +#include <mach/irqs.h> | |
| 35 | 35 | |
| 36 | 36 | #define UART_DAVINCI_PWREMU 0x0c |
| 37 | 37 | |
| @@ -17,13 +17,13 @@ · 16 unmodified lines | ||
| 17 | 17 | #include <linux/spinlock.h> |
| 18 | 18 | |
| 19 | 19 | #include <asm/io.h> |
| 20 | −#include <asm/hardware.h> | |
| 20 | +#include <mach/hardware.h> | |
| 21 | 21 | #include <asm/system.h> |
| 22 | 22 | #include <asm/irq.h> |
| 23 | 23 | #include <asm/mach/irq.h> |
| 24 | 24 | #include <asm/mach/time.h> |
| 25 | 25 | #include <asm/errno.h> |
| 26 | −#include <asm/arch/io.h> | |
| 26 | +#include <mach/io.h> | |
| 27 | 27 | |
| 28 | 28 | static struct clock_event_device clockevent_davinci; |
| 29 | 29 | |
| @@ -15,7 +15,7 @@ · 14 unmodified lines | ||
| 15 | 15 | #include <linux/serial_8250.h> |
| 16 | 16 | #include <linux/init.h> |
| 17 | 17 | |
| 18 | −#include <asm/hardware.h> | |
| 18 | +#include <mach/hardware.h> | |
| 19 | 19 | #include <asm/irq.h> |
| 20 | 20 | #include <asm/io.h> |
| 21 | 21 | #include <asm/setup.h> |
| @@ -1,4 +1,4 @@ | ||
| 1 | −/* linux/include/asm-arm/arch-ebsa110/debug-macro.S | |
| 1 | +/* arch/arm/mach-ebsa110/include/mach/debug-macro.S | |
| 2 | 2 | * |
| 3 | 3 | * Debugging macro include header |
| 4 | 4 | * |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-ebsa110/dma.h | |
| 2 | + * arch/arm/mach-ebsa110/include/mach/dma.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 1997,1998 Russell King |
| 5 | 5 | * |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-ebsa110/entry-macro.S | |
| 2 | + * arch/arm/mach-ebsa110/include/mach/entry-macro.S | |
| 3 | 3 | * |
| 4 | 4 | * Low-level IRQ helper macros for ebsa110 platform. |
| 5 | 5 | * |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-ebsa110/hardware.h | |
| 2 | + * arch/arm/mach-ebsa110/include/mach/hardware.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 1996-2000 Russell King. |
| 5 | 5 | * |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-ebsa110/io.h | |
| 2 | + * arch/arm/mach-ebsa110/include/mach/io.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 1997,1998 Russell King |
| 5 | 5 | * |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-ebsa110/irqs.h | |
| 2 | + * arch/arm/mach-ebsa110/include/mach/irqs.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 1996 Russell King |
| 5 | 5 | * |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-ebsa110/memory.h | |
| 2 | + * arch/arm/mach-ebsa110/include/mach/memory.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 1996-1999 Russell King. |
| 5 | 5 | * |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-ebsa110/system.h | |
| 2 | + * arch/arm/mach-ebsa110/include/mach/system.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 1996-2000 Russell King. |
| 5 | 5 | * |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-ebsa110/timex.h | |
| 2 | + * arch/arm/mach-ebsa110/include/mach/timex.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 1997, 1998 Russell King |
| 5 | 5 | * |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-ebsa110/uncompress.h | |
| 2 | + * arch/arm/mach-ebsa110/include/mach/uncompress.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 1996,1997,1998 Russell King |
| 5 | 5 | * |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-ebsa110/vmalloc.h | |
| 2 | + * arch/arm/mach-ebsa110/include/mach/vmalloc.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 1998 Russell King |
| 5 | 5 | * |
| @@ -24,7 +24,7 @@ · 23 unmodified lines | ||
| 24 | 24 | #include <linux/kernel.h> |
| 25 | 25 | #include <linux/types.h> |
| 26 | 26 | |
| 27 | −#include <asm/hardware.h> | |
| 27 | +#include <mach/hardware.h> | |
| 28 | 28 | #include <asm/io.h> |
| 29 | 29 | #include <asm/page.h> |
| 30 | 30 | |
| @@ -15,7 +15,7 @@ · 14 unmodified lines | ||
| 15 | 15 | #include <linux/spinlock.h> |
| 16 | 16 | #include <linux/init.h> |
| 17 | 17 | |
| 18 | −#include <asm/hardware.h> | |
| 18 | +#include <mach/hardware.h> | |
| 19 | 19 | #include <asm/leds.h> |
| 20 | 20 | #include <asm/system.h> |
| 21 | 21 | #include <asm/mach-types.h> |
| @@ -19,7 +19,7 @@ · 18 unmodified lines | ||
| 19 | 19 | #include <linux/mtd/physmap.h> |
| 20 | 20 | #include <linux/platform_device.h> |
| 21 | 21 | #include <asm/io.h> |
| 22 | −#include <asm/hardware.h> | |
| 22 | +#include <mach/hardware.h> | |
| 23 | 23 | #include <asm/mach-types.h> |
| 24 | 24 | #include <asm/mach/arch.h> |
| 25 | 25 | |
| @@ -16,7 +16,7 @@ · 15 unmodified lines | ||
| 16 | 16 | #include <linux/module.h> |
| 17 | 17 | #include <linux/string.h> |
| 18 | 18 | #include <asm/div64.h> |
| 19 | −#include <asm/hardware.h> | |
| 19 | +#include <mach/hardware.h> | |
| 20 | 20 | #include <asm/io.h> |
| 21 | 21 | |
| 22 | 22 | struct clk { |
| @@ -36,7 +36,7 @@ · 35 unmodified lines | ||
| 36 | 36 | #include <asm/types.h> |
| 37 | 37 | #include <asm/setup.h> |
| 38 | 38 | #include <asm/memory.h> |
| 39 | −#include <asm/hardware.h> | |
| 39 | +#include <mach/hardware.h> | |
| 40 | 40 | #include <asm/irq.h> |
| 41 | 41 | #include <asm/system.h> |
| 42 | 42 | #include <asm/tlbflush.h> |
| @@ -46,7 +46,7 @@ · 3 unmodified lines | ||
| 46 | 46 | #include <asm/mach/map.h> |
| 47 | 47 | #include <asm/mach/time.h> |
| 48 | 48 | #include <asm/mach/irq.h> |
| 49 | −#include <asm/arch/gpio.h> | |
| 49 | +#include <mach/gpio.h> | |
| 50 | 50 | |
| 51 | 51 | #include <asm/hardware/vic.h> |
| 52 | 52 | |
| @@ -19,7 +19,7 @@ · 18 unmodified lines | ||
| 19 | 19 | #include <linux/mtd/physmap.h> |
| 20 | 20 | #include <linux/platform_device.h> |
| 21 | 21 | #include <asm/io.h> |
| 22 | −#include <asm/hardware.h> | |
| 22 | +#include <mach/hardware.h> | |
| 23 | 23 | #include <asm/mach-types.h> |
| 24 | 24 | #include <asm/mach/arch.h> |
| 25 | 25 | |
| @@ -19,7 +19,7 @@ · 18 unmodified lines | ||
| 19 | 19 | #include <linux/mtd/physmap.h> |
| 20 | 20 | #include <linux/platform_device.h> |
| 21 | 21 | #include <asm/io.h> |
| 22 | −#include <asm/hardware.h> | |
| 22 | +#include <mach/hardware.h> | |
| 23 | 23 | #include <asm/mach-types.h> |
| 24 | 24 | #include <asm/mach/arch.h> |
| 25 | 25 | |
| @@ -19,7 +19,7 @@ · 18 unmodified lines | ||
| 19 | 19 | #include <linux/mtd/physmap.h> |
| 20 | 20 | #include <linux/platform_device.h> |
| 21 | 21 | #include <asm/io.h> |
| 22 | −#include <asm/hardware.h> | |
| 22 | +#include <mach/hardware.h> | |
| 23 | 23 | #include <asm/mach-types.h> |
| 24 | 24 | #include <asm/mach/arch.h> |
| 25 | 25 | |
| @@ -20,7 +20,7 @@ · 19 unmodified lines | ||
| 20 | 20 | #include <linux/mtd/physmap.h> |
| 21 | 21 | #include <linux/platform_device.h> |
| 22 | 22 | #include <asm/io.h> |
| 23 | −#include <asm/hardware.h> | |
| 23 | +#include <mach/hardware.h> | |
| 24 | 24 | #include <asm/mach-types.h> |
| 25 | 25 | #include <asm/mach/arch.h> |
| 26 | 26 | |
| @@ -19,7 +19,7 @@ · 18 unmodified lines | ||
| 19 | 19 | #include <linux/mtd/physmap.h> |
| 20 | 20 | #include <linux/platform_device.h> |
| 21 | 21 | #include <asm/io.h> |
| 22 | −#include <asm/hardware.h> | |
| 22 | +#include <mach/hardware.h> | |
| 23 | 23 | #include <asm/mach-types.h> |
| 24 | 24 | #include <asm/mach/arch.h> |
| 25 | 25 | |
| @@ -19,7 +19,7 @@ · 18 unmodified lines | ||
| 19 | 19 | #include <linux/mtd/physmap.h> |
| 20 | 20 | #include <linux/platform_device.h> |
| 21 | 21 | #include <asm/io.h> |
| 22 | −#include <asm/hardware.h> | |
| 22 | +#include <mach/hardware.h> | |
| 23 | 23 | #include <asm/mach-types.h> |
| 24 | 24 | #include <asm/mach/arch.h> |
| 25 | 25 | |
| @@ -19,7 +19,7 @@ · 18 unmodified lines | ||
| 19 | 19 | #include <linux/mtd/physmap.h> |
| 20 | 20 | #include <linux/platform_device.h> |
| 21 | 21 | #include <asm/io.h> |
| 22 | −#include <asm/hardware.h> | |
| 22 | +#include <mach/hardware.h> | |
| 23 | 23 | #include <asm/mach-types.h> |
| 24 | 24 | #include <asm/mach/arch.h> |
| 25 | 25 | |
| @@ -17,7 +17,7 @@ · 16 unmodified lines | ||
| 17 | 17 | #include <linux/module.h> |
| 18 | 18 | #include <linux/seq_file.h> |
| 19 | 19 | |
| 20 | −#include <asm/arch/ep93xx-regs.h> | |
| 20 | +#include <mach/ep93xx-regs.h> | |
| 21 | 21 | #include <asm/io.h> |
| 22 | 22 | #include <asm/gpio.h> |
| 23 | 23 | |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-ep93xx/debug-macro.S | |
| 2 | + * arch/arm/mach-ep93xx/include/mach/debug-macro.S | |
| 3 | 3 | * Debugging macro include header |
| 4 | 4 | * |
| 5 | 5 | * Copyright (C) 2006 Lennert Buytenhek <buytenh@wantstofly.org> |
| @@ -9,7 +9,7 @@ · 3 unmodified lines | ||
| 9 | 9 | * the Free Software Foundation; either version 2 of the License, or (at |
| 10 | 10 | * your option) any later version. |
| 11 | 11 | */ |
| 12 | −#include <asm/arch/ep93xx-regs.h> | |
| 12 | +#include <mach/ep93xx-regs.h> | |
| 13 | 13 | |
| 14 | 14 | .macro addruart,rx |
| 15 | 15 | mrc p15, 0, \rx, c1, c0 |
| @@ -0,0 +1,3 @@ | ||
| 1 | +/* | |
| 2 | + * arch/arm/mach-ep93xx/include/mach/dma.h | |
| 3 | + */ | |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-ep93xx/entry-macro.S | |
| 2 | + * arch/arm/mach-ep93xx/include/mach/entry-macro.S | |
| 3 | 3 | * IRQ demultiplexing for EP93xx |
| 4 | 4 | * |
| 5 | 5 | * Copyright (C) 2006 Lennert Buytenhek <buytenh@wantstofly.org> |
| @@ -9,7 +9,7 @@ · 3 unmodified lines | ||
| 9 | 9 | * the Free Software Foundation; either version 2 of the License, or (at |
| 10 | 10 | * your option) any later version. |
| 11 | 11 | */ |
| 12 | −#include <asm/arch/ep93xx-regs.h> | |
| 12 | +#include <mach/ep93xx-regs.h> | |
| 13 | 13 | |
| 14 | 14 | .macro disable_fiq |
| 15 | 15 | .endm |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-ep93xx/ep93xx-regs.h | |
| 2 | + * arch/arm/mach-ep93xx/include/mach/ep93xx-regs.h | |
| 3 | 3 | */ |
| 4 | 4 | |
| 5 | 5 | #ifndef __ASM_ARCH_EP93XX_REGS_H |
| @@ -0,0 +1,3 @@ | ||
| 1 | +/* | |
| 2 | + * arch/arm/mach-ep93xx/include/mach/gesbc9312.h | |
| 3 | + */ | |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-ep93xx/gpio.h | |
| 2 | + * arch/arm/mach-ep93xx/include/mach/gpio.h | |
| 3 | 3 | */ |
| 4 | 4 | |
| 5 | 5 | #ifndef __ASM_ARCH_GPIO_H |
| @@ -1,6 +1,8 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-ep93xx/hardware.h | |
| 2 | + * arch/arm/mach-ep93xx/include/mach/hardware.h | |
| 3 | 3 | */ |
| 4 | +#ifndef __ASM_ARCH_HARDWARE_H | |
| 5 | +#define __ASM_ARCH_HARDWARE_H | |
| 4 | 6 | |
| 5 | 7 | #include "ep93xx-regs.h" |
| 6 | 8 | |
| @@ -10,3 +12,5 @@ · 3 unmodified lines | ||
| 10 | 12 | |
| 11 | 13 | #include "gesbc9312.h" |
| 12 | 14 | #include "ts72xx.h" |
| 15 | + | |
| 16 | +#endif | |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-ep93xx/io.h | |
| 2 | + * arch/arm/mach-ep93xx/include/mach/io.h | |
| 3 | 3 | */ |
| 4 | 4 | |
| 5 | 5 | #define IO_SPACE_LIMIT 0xffffffff |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-ep93xx/irqs.h | |
| 2 | + * arch/arm/mach-ep93xx/include/mach/irqs.h | |
| 3 | 3 | */ |
| 4 | 4 | |
| 5 | 5 | #ifndef __ASM_ARCH_IRQS_H |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-ep93xx/memory.h | |
| 2 | + * arch/arm/mach-ep93xx/include/mach/memory.h | |
| 3 | 3 | */ |
| 4 | 4 | |
| 5 | 5 | #ifndef __ASM_ARCH_MEMORY_H |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-ep93xx/platform.h | |
| 2 | + * arch/arm/mach-ep93xx/include/mach/platform.h | |
| 3 | 3 | */ |
| 4 | 4 | |
| 5 | 5 | #ifndef __ASSEMBLY__ |
| @@ -1,8 +1,8 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-ep93xx/system.h | |
| 2 | + * arch/arm/mach-ep93xx/include/mach/system.h | |
| 3 | 3 | */ |
| 4 | 4 | |
| 5 | −#include <asm/hardware.h> | |
| 5 | +#include <mach/hardware.h> | |
| 6 | 6 | |
| 7 | 7 | static inline void arch_idle(void) |
| 8 | 8 | { |
| @@ -0,0 +1,5 @@ | ||
| 1 | +/* | |
| 2 | + * arch/arm/mach-ep93xx/include/mach/timex.h | |
| 3 | + */ | |
| 4 | + | |
| 5 | +#define CLOCK_TICK_RATE 983040 | |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-ep93xx/ts72xx.h | |
| 2 | + * arch/arm/mach-ep93xx/include/mach/ts72xx.h | |
| 3 | 3 | */ |
| 4 | 4 | |
| 5 | 5 | /* |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-ep93xx/uncompress.h | |
| 2 | + * arch/arm/mach-ep93xx/include/mach/uncompress.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 2006 Lennert Buytenhek <buytenh@wantstofly.org> |
| 5 | 5 | * |
| @@ -9,7 +9,7 @@ · 3 unmodified lines | ||
| 9 | 9 | * your option) any later version. |
| 10 | 10 | */ |
| 11 | 11 | |
| 12 | −#include <asm/arch/ep93xx-regs.h> | |
| 12 | +#include <mach/ep93xx-regs.h> | |
| 13 | 13 | |
| 14 | 14 | static unsigned char __raw_readb(unsigned int ptr) |
| 15 | 15 | { |
| @@ -0,0 +1,5 @@ | ||
| 1 | +/* | |
| 2 | + * arch/arm/mach-ep93xx/include/mach/vmalloc.h | |
| 3 | + */ | |
| 4 | + | |
| 5 | +#define VMALLOC_END 0xfe800000 | |
| @@ -20,7 +20,7 @@ · 19 unmodified lines | ||
| 20 | 20 | #include <linux/mtd/physmap.h> |
| 21 | 21 | |
| 22 | 22 | #include <asm/io.h> |
| 23 | −#include <asm/hardware.h> | |
| 23 | +#include <mach/hardware.h> | |
| 24 | 24 | |
| 25 | 25 | #include <asm/mach/arch.h> |
| 26 | 26 | #include <asm/mach-types.h> |
| @@ -20,7 +20,7 @@ · 19 unmodified lines | ||
| 20 | 20 | #include <linux/platform_device.h> |
| 21 | 21 | #include <linux/m48t86.h> |
| 22 | 22 | #include <asm/io.h> |
| 23 | −#include <asm/hardware.h> | |
| 23 | +#include <mach/hardware.h> | |
| 24 | 24 | #include <asm/mach-types.h> |
| 25 | 25 | #include <asm/mach/arch.h> |
| 26 | 26 | #include <asm/mach/map.h> |
| @@ -18,6 +18,9 @@ static int irqmap_cats[] __initdata = { IRQ_PCI, IRQ_IN0, IRQ_IN1, IRQ_IN3 }; · 17 unmodified lines | ||
| 18 | 18 | |
| 19 | 19 | static int __init cats_map_irq(struct pci_dev *dev, u8 slot, u8 pin) |
| 20 | 20 | { |
| 21 | + if (dev->irq >= 255) | |
| 22 | + return -1; /* not a valid interrupt. */ | |
| 23 | + | |
| 21 | 24 | if (dev->irq >= 128) |
| 22 | 25 | return dev->irq & 0x1f; |
| 23 | 26 | |
| @@ -21,7 +21,7 @@ · 20 unmodified lines | ||
| 21 | 21 | #include <linux/init.h> |
| 22 | 22 | #include <linux/spinlock.h> |
| 23 | 23 | |
| 24 | −#include <asm/hardware.h> | |
| 24 | +#include <mach/hardware.h> | |
| 25 | 25 | #include <asm/leds.h> |
| 26 | 26 | #include <asm/mach-types.h> |
| 27 | 27 | #include <asm/system.h> |
| @@ -1,4 +1,4 @@ | ||
| 1 | −/* linux/include/asm-arm/arch-ebsa285/debug-macro.S | |
| 1 | +/* arch/arm/mach-footbridge/include/mach/debug-macro.S | |
| 2 | 2 | * |
| 3 | 3 | * Debugging macro include header |
| 4 | 4 | * |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-ebsa285/dma.h | |
| 2 | + * arch/arm/mach-footbridge/include/mach/dma.h | |
| 3 | 3 | * |
| 4 | 4 | * Architecture DMA routines |
| 5 | 5 | * |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-ebsa285/entry-macro.S | |
| 2 | + * arch/arm/mach-footbridge/include/mach/entry-macro.S | |
| 3 | 3 | * |
| 4 | 4 | * Low-level IRQ helper macros for footbridge-based platforms |
| 5 | 5 | * |
| @@ -7,8 +7,8 @@ · 1 unmodified line | ||
| 7 | 7 | * License version 2. This program is licensed "as is" without any |
| 8 | 8 | * warranty of any kind, whether express or implied. |
| 9 | 9 | */ |
| 10 | −#include <asm/hardware.h> | |
| 11 | −#include <asm/arch/irqs.h> | |
| 10 | +#include <mach/hardware.h> | |
| 11 | +#include <mach/irqs.h> | |
| 12 | 12 | #include <asm/hardware/dec21285.h> |
| 13 | 13 | |
| 14 | 14 | .equ dc21285_high, ARMCSR_BASE & 0xff000000 |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-ebsa285/hardware.h | |
| 2 | + * arch/arm/mach-footbridge/include/mach/hardware.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 1998-1999 Russell King. |
| 5 | 5 | * |
| @@ -12,7 +12,7 @@ · 6 unmodified lines | ||
| 12 | 12 | #ifndef __ASM_ARCH_HARDWARE_H |
| 13 | 13 | #define __ASM_ARCH_HARDWARE_H |
| 14 | 14 | |
| 15 | −#include <asm/arch/memory.h> | |
| 15 | +#include <mach/memory.h> | |
| 16 | 16 | |
| 17 | 17 | /* Virtual Physical Size |
| 18 | 18 | * 0xff800000 0x40000000 1MB X-Bus |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-ebsa285/io.h | |
| 2 | + * arch/arm/mach-footbridge/include/mach/io.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 1997-1999 Russell King |
| 5 | 5 | * |
| @@ -14,7 +14,7 @@ · 8 unmodified lines | ||
| 14 | 14 | #ifndef __ASM_ARM_ARCH_IO_H |
| 15 | 15 | #define __ASM_ARM_ARCH_IO_H |
| 16 | 16 | |
| 17 | −#include <asm/hardware.h> | |
| 17 | +#include <mach/hardware.h> | |
| 18 | 18 | |
| 19 | 19 | #define IO_SPACE_LIMIT 0xffff |
| 20 | 20 | |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-ebsa285/irqs.h | |
| 2 | + * arch/arm/mach-footbridge/include/mach/irqs.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 1998 Russell King |
| 5 | 5 | * Copyright (C) 1998 Phil Blundell |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-ebsa285/memory.h | |
| 2 | + * arch/arm/mach-footbridge/include/mach/memory.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 1996-1999 Russell King. |
| 5 | 5 | * |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-ebsa285/system.h | |
| 2 | + * arch/arm/mach-footbridge/include/mach/system.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 1996-1999 Russell King. |
| 5 | 5 | * |
| @@ -9,7 +9,7 @@ · 3 unmodified lines | ||
| 9 | 9 | */ |
| 10 | 10 | #include <asm/hardware/dec21285.h> |
| 11 | 11 | #include <asm/io.h> |
| 12 | −#include <asm/hardware.h> | |
| 12 | +#include <mach/hardware.h> | |
| 13 | 13 | #include <asm/leds.h> |
| 14 | 14 | #include <asm/mach-types.h> |
| 15 | 15 | |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-ebsa285/timex.h | |
| 2 | + * arch/arm/mach-footbridge/include/mach/timex.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 1998 Russell King |
| 5 | 5 | * |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-ebsa285/uncompress.h | |
| 2 | + * arch/arm/mach-footbridge/include/mach/uncompress.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 1996-1999 Russell King |
| 5 | 5 | * |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-ebsa285/vmalloc.h | |
| 2 | + * arch/arm/mach-footbridge/include/mach/vmalloc.h | |
| 3 | 3 | * |
| 4 | 4 | * This program is free software; you can redistribute it and/or modify |
| 5 | 5 | * it under the terms of the GNU General Public License version 2 as |
| @@ -21,7 +21,7 @@ · 20 unmodified lines | ||
| 21 | 21 | |
| 22 | 22 | #include <asm/mach/irq.h> |
| 23 | 23 | |
| 24 | −#include <asm/hardware.h> | |
| 24 | +#include <mach/hardware.h> | |
| 25 | 25 | #include <asm/hardware/dec21285.h> |
| 26 | 26 | #include <asm/irq.h> |
| 27 | 27 | #include <asm/io.h> |
| @@ -21,7 +21,7 @@ · 20 unmodified lines | ||
| 21 | 21 | #include <linux/init.h> |
| 22 | 22 | #include <linux/spinlock.h> |
| 23 | 23 | |
| 24 | −#include <asm/hardware.h> | |
| 24 | +#include <mach/hardware.h> | |
| 25 | 25 | #include <asm/leds.h> |
| 26 | 26 | #include <asm/mach-types.h> |
| 27 | 27 | #include <asm/system.h> |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-ebsa285/time.h | |
| 2 | + * arch/arm/mach-footbridge/include/mach/time.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 1998 Russell King. |
| 5 | 5 | * Copyright (C) 1998 Phil Blundell |
| @@ -23,7 +23,7 @@ · 17 unmodified lines | ||
| 23 | 23 | #include <linux/mc146818rtc.h> |
| 24 | 24 | #include <linux/bcd.h> |
| 25 | 25 | |
| 26 | −#include <asm/hardware.h> | |
| 26 | +#include <mach/hardware.h> | |
| 27 | 27 | #include <asm/io.h> |
| 28 | 28 | |
| 29 | 29 | #include <asm/mach/time.h> |
| @@ -23,11 +23,11 @@ · 22 unmodified lines | ||
| 23 | 23 | #include <asm/pgtable.h> |
| 24 | 24 | #include <asm/dma.h> |
| 25 | 25 | #include <asm/io.h> |
| 26 | −#include <asm/hardware.h> | |
| 26 | +#include <mach/hardware.h> | |
| 27 | 27 | #include <asm/irq.h> |
| 28 | 28 | #include <asm/mach/irq.h> |
| 29 | 29 | #include <asm/mach/map.h> |
| 30 | −#include <asm/arch/irqs.h> | |
| 30 | +#include <mach/irqs.h> | |
| 31 | 31 | |
| 32 | 32 | #include <asm/mach/dma.h> |
| 33 | 33 | |
| @@ -17,9 +17,9 @@ · 16 unmodified lines | ||
| 17 | 17 | #include <linux/interrupt.h> |
| 18 | 18 | #include <linux/module.h> |
| 19 | 19 | #include <asm/types.h> |
| 20 | −#include <asm/hardware.h> | |
| 20 | +#include <mach/hardware.h> | |
| 21 | 21 | #include <asm/irq.h> |
| 22 | −#include <asm/arch/irqs.h> | |
| 22 | +#include <mach/irqs.h> | |
| 23 | 23 | #include <asm/mach/irq.h> |
| 24 | 24 | #include <asm/mach/time.h> |
| 25 | 25 | #include "common.h" |
| @@ -17,9 +17,9 @@ · 16 unmodified lines | ||
| 17 | 17 | #include <linux/interrupt.h> |
| 18 | 18 | #include <linux/module.h> |
| 19 | 19 | #include <asm/types.h> |
| 20 | −#include <asm/hardware.h> | |
| 20 | +#include <mach/hardware.h> | |
| 21 | 21 | #include <asm/irq.h> |
| 22 | −#include <asm/arch/irqs.h> | |
| 22 | +#include <mach/irqs.h> | |
| 23 | 23 | #include <asm/mach/irq.h> |
| 24 | 24 | #include <asm/mach/time.h> |
| 25 | 25 | #include <linux/device.h> |
| @@ -25,7 +25,7 @@ · 24 unmodified lines | ||
| 25 | 25 | #include <asm/page.h> |
| 26 | 26 | #include <asm/pgtable.h> |
| 27 | 27 | #include <asm/mach/arch.h> |
| 28 | −#include <asm/hardware.h> | |
| 28 | +#include <mach/hardware.h> | |
| 29 | 29 | #include "common.h" |
| 30 | 30 | |
| 31 | 31 | MACHINE_START(H7201, "Hynix GMS30C7201") |
| @@ -25,7 +25,7 @@ · 24 unmodified lines | ||
| 25 | 25 | #include <asm/page.h> |
| 26 | 26 | #include <asm/pgtable.h> |
| 27 | 27 | #include <asm/mach/arch.h> |
| 28 | −#include <asm/hardware.h> | |
| 28 | +#include <mach/hardware.h> | |
| 29 | 29 | #include "common.h" |
| 30 | 30 | |
| 31 | 31 | static struct resource cirrus_resources[] = { |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-h720x/boards.h | |
| 2 | + * arch/arm/mach-h720x/include/mach/boards.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 2003 Thomas Gleixner <tglx@linutronix.de> |
| 5 | 5 | * (C) 2003 Robert Schwebel <r.schwebel@pengutronix.de> |
| @@ -1,4 +1,4 @@ | ||
| 1 | −/* linux/include/asm-arm/arch-h720x/debug-macro.S | |
| 1 | +/* arch/arm/mach-h720x/include/mach/debug-macro.S | |
| 2 | 2 | * |
| 3 | 3 | * Debugging macro include header |
| 4 | 4 | * |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-h720x/dma.h | |
| 2 | + * arch/arm/mach-h720x/include/mach/dma.h | |
| 3 | 3 | * |
| 4 | 4 | * Architecture DMA routes |
| 5 | 5 | * |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-h720x/entry-macro.S | |
| 2 | + * arch/arm/mach-h720x/include/mach/entry-macro.S | |
| 3 | 3 | * |
| 4 | 4 | * Low-level IRQ helper macros for Hynix HMS720x based platforms |
| 5 | 5 | * |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-h720x/h7201-regs.h | |
| 2 | + * arch/arm/mach-h720x/include/mach/h7201-regs.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 2000 Jungjun Kim, Hynix Semiconductor Inc. |
| 5 | 5 | * (C) 2003 Thomas Gleixner <tglx@linutronix.de> |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-h720x/h7202-regs.h | |
| 2 | + * arch/arm/mach-h720x/include/mach/h7202-regs.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 2000 Jungjun Kim, Hynix Semiconductor Inc. |
| 5 | 5 | * (C) 2003 Thomas Gleixner <tglx@linutronix.de> |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-h720x/hardware.h | |
| 2 | + * arch/arm/mach-h720x/include/mach/hardware.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 2000 Jungjun Kim, Hynix Semiconductor Inc. |
| 5 | 5 | * (C) 2003 Thomas Gleixner <tglx@linutronix.de> |
| @@ -1,12 +1,12 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-h720x/io.h | |
| 2 | + * arch/arm/mach-h720x/include/mach/io.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 2000 Steve Hill (sjhill@cotw.com) |
| 5 | 5 | * |
| 6 | 6 | * Changelog: |
| 7 | 7 | * |
| 8 | 8 | * 09-19-2001 JJKIM |
| 9 | − * Created from linux/include/asm-arm/arch-l7200/io.h | |
| 9 | + * Created from arch/arm/mach-l7200/include/mach/io.h | |
| 10 | 10 | * |
| 11 | 11 | * 03-27-2003 Robert Schwebel <r.schwebel@pengutronix.de>: |
| 12 | 12 | * re-unified header files for h720x |
| @@ -14,7 +14,7 @@ · 1 unmodified line | ||
| 14 | 14 | #ifndef __ASM_ARM_ARCH_IO_H |
| 15 | 15 | #define __ASM_ARM_ARCH_IO_H |
| 16 | 16 | |
| 17 | −#include <asm/hardware.h> | |
| 17 | +#include <mach/hardware.h> | |
| 18 | 18 | |
| 19 | 19 | #define IO_SPACE_LIMIT 0xffffffff |
| 20 | 20 | |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-h720x/irqs.h | |
| 2 | + * arch/arm/mach-h720x/include/mach/irqs.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 2000 Jungjun Kim |
| 5 | 5 | * (C) 2003 Robert Schwebel <r.schwebel@pengutronix.de> |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-h720x/memory.h | |
| 2 | + * arch/arm/mach-h720x/include/mach/memory.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (c) 2000 Jungjun Kim |
| 5 | 5 | * |
| @@ -1,18 +1,18 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-h720x/system.h | |
| 2 | + * arch/arm/mach-h720x/include/mach/system.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 2001-2002 Jungjun Kim, Hynix Semiconductor Inc. |
| 5 | 5 | * |
| 6 | 6 | * This program is free software; you can redistribute it and/or modify |
| 7 | 7 | * it under the terms of the GNU General Public License version 2 as |
| 8 | 8 | * published by the Free Software Foundation. |
| 9 | − * linux/include/asm-arm/arch-h720x/system.h | |
| 9 | + * arch/arm/mach-h720x/include/mach/system.h | |
| 10 | 10 | * |
| 11 | 11 | */ |
| 12 | 12 | |
| 13 | 13 | #ifndef __ASM_ARCH_SYSTEM_H |
| 14 | 14 | #define __ASM_ARCH_SYSTEM_H |
| 15 | −#include <asm/hardware.h> | |
| 15 | +#include <mach/hardware.h> | |
| 16 | 16 | |
| 17 | 17 | static void arch_idle(void) |
| 18 | 18 | { |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-h720x/timex.h | |
| 2 | + * arch/arm/mach-h720x/include/mach/timex.h | |
| 3 | 3 | * Copyright (C) 2000 Jungjun Kim, Hynix Semiconductor Inc. |
| 4 | 4 | * |
| 5 | 5 | * This program is free software; you can redistribute it and/or modify |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-h720x/uncompress.h | |
| 2 | + * arch/arm/mach-h720x/include/mach/uncompress.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 2001-2002 Jungjun Kim |
| 5 | 5 | */ |
| @@ -7,7 +7,7 @@ · 1 unmodified line | ||
| 7 | 7 | #ifndef __ASM_ARCH_UNCOMPRESS_H |
| 8 | 8 | #define __ASM_ARCH_UNCOMPRESS_H |
| 9 | 9 | |
| 10 | −#include <asm/hardware.h> | |
| 10 | +#include <mach/hardware.h> | |
| 11 | 11 | |
| 12 | 12 | #define LSR 0x14 |
| 13 | 13 | #define TEMPTY 0x40 |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-h720x/vmalloc.h | |
| 2 | + * arch/arm/mach-h720x/include/mach/vmalloc.h | |
| 3 | 3 | */ |
| 4 | 4 | |
| 5 | 5 | #ifndef __ARCH_ARM_VMALLOC_H |
| @@ -23,7 +23,7 @@ · 22 unmodified lines | ||
| 23 | 23 | #include <linux/err.h> |
| 24 | 24 | |
| 25 | 25 | #include <asm/io.h> |
| 26 | −#include <asm/arch/imx-regs.h> | |
| 26 | +#include <mach/imx-regs.h> | |
| 27 | 27 | |
| 28 | 28 | /* |
| 29 | 29 | * Very simple approach: We can't disable clocks, so we do |
| @@ -172,24 +172,29 @@ found: · 142 unmodified lines | ||
| 172 | 172 | |
| 173 | 173 | return clk; |
| 174 | 174 | } |
| 175 | +EXPORT_SYMBOL(clk_get); | |
| 175 | 176 | |
| 176 | 177 | void clk_put(struct clk *clk) |
| 177 | 178 | { |
| 178 | 179 | } |
| 180 | +EXPORT_SYMBOL(clk_put); | |
| 179 | 181 | |
| 180 | 182 | int clk_enable(struct clk *clk) |
| 181 | 183 | { |
| 182 | 184 | return 0; |
| 183 | 185 | } |
| 186 | +EXPORT_SYMBOL(clk_enable); | |
| 184 | 187 | |
| 185 | 188 | void clk_disable(struct clk *clk) |
| 186 | 189 | { |
| 187 | 190 | } |
| 191 | +EXPORT_SYMBOL(clk_disable); | |
| 188 | 192 | |
| 189 | 193 | unsigned long clk_get_rate(struct clk *clk) |
| 190 | 194 | { |
| 191 | 195 | return clk->get_rate(); |
| 192 | 196 | } |
| 197 | +EXPORT_SYMBOL(clk_get_rate); | |
| 193 | 198 | |
| 194 | 199 | int imx_clocks_init(void) |
| 195 | 200 | { |
| @@ -36,7 +36,7 @@ · 35 unmodified lines | ||
| 36 | 36 | #include <linux/err.h> |
| 37 | 37 | #include <asm/system.h> |
| 38 | 38 | |
| 39 | −#include <asm/hardware.h> | |
| 39 | +#include <mach/hardware.h> | |
| 40 | 40 | |
| 41 | 41 | #include "generic.h" |
| 42 | 42 | |
| @@ -30,9 +30,9 @@ · 29 unmodified lines | ||
| 30 | 30 | |
| 31 | 31 | #include <asm/system.h> |
| 32 | 32 | #include <asm/irq.h> |
| 33 | −#include <asm/hardware.h> | |
| 33 | +#include <mach/hardware.h> | |
| 34 | 34 | #include <asm/dma.h> |
| 35 | −#include <asm/arch/imx-dma.h> | |
| 35 | +#include <mach/imx-dma.h> | |
| 36 | 36 | |
| 37 | 37 | struct imx_dma_channel imx_dma_channels[IMX_DMA_CHANNELS]; |
| 38 | 38 | |
| @@ -29,13 +29,13 @@ · 28 unmodified lines | ||
| 29 | 29 | #include <linux/string.h> |
| 30 | 30 | |
| 31 | 31 | #include <asm/errno.h> |
| 32 | −#include <asm/arch/imxfb.h> | |
| 33 | −#include <asm/hardware.h> | |
| 34 | −#include <asm/arch/imx-regs.h> | |
| 32 | +#include <mach/imxfb.h> | |
| 33 | +#include <mach/hardware.h> | |
| 34 | +#include <mach/imx-regs.h> | |
| 35 | 35 | |
| 36 | 36 | #include <asm/mach/map.h> |
| 37 | −#include <asm/arch/mmc.h> | |
| 38 | −#include <asm/arch/gpio.h> | |
| 37 | +#include <mach/mmc.h> | |
| 38 | +#include <mach/gpio.h> | |
| 39 | 39 | |
| 40 | 40 | unsigned long imx_gpio_alloc_map[(GPIO_PORT_MAX + 1) * 32 / BITS_PER_LONG]; |
| 41 | 41 | |
| @@ -251,7 +251,6 @@ void __init set_imx_fb_info(struct imxfb_mach_info *hard_imx_fb_info) · 209 unmodified lines | ||
| 251 | 251 | { |
| 252 | 252 | memcpy(&imx_fb_info,hard_imx_fb_info,sizeof(struct imxfb_mach_info)); |
| 253 | 253 | } |
| 254 | −EXPORT_SYMBOL(set_imx_fb_info); | |
| 255 | 254 | |
| 256 | 255 | static struct resource imxfb_resources[] = { |
| 257 | 256 | [0] = { |
| @@ -1,4 +1,4 @@ | ||
| 1 | −/* linux/include/asm-arm/arch-imx/debug-macro.S | |
| 1 | +/* arch/arm/mach-imx/include/mach/debug-macro.S | |
| 2 | 2 | * |
| 3 | 3 | * Debugging macro include header |
| 4 | 4 | * |
File renamed without changes.
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-imx/entry-macro.S | |
| 2 | + * arch/arm/mach-imx/include/mach/entry-macro.S | |
| 3 | 3 | * |
| 4 | 4 | * Low-level IRQ helper macros for iMX-based platforms |
| 5 | 5 | * |
| @@ -7,7 +7,7 @@ · 1 unmodified line | ||
| 7 | 7 | * License version 2. This program is licensed "as is" without any |
| 8 | 8 | * warranty of any kind, whether express or implied. |
| 9 | 9 | */ |
| 10 | −#include <asm/hardware.h> | |
| 10 | +#include <mach/hardware.h> | |
| 11 | 11 | |
| 12 | 12 | .macro disable_fiq |
| 13 | 13 | .endm |
| @@ -1,6 +1,6 @@ | ||
| 1 | 1 | #ifndef _IMX_GPIO_H |
| 2 | 2 | |
| 3 | −#include <asm/arch/imx-regs.h> | |
| 3 | +#include <mach/imx-regs.h> | |
| 4 | 4 | |
| 5 | 5 | #define IMX_GPIO_ALLOC_MODE_NORMAL 0 |
| 6 | 6 | #define IMX_GPIO_ALLOC_MODE_NO_ALLOC 1 |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-imx/hardware.h | |
| 2 | + * arch/arm/mach-imx/include/mach/hardware.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 1999 ARM Limited. |
| 5 | 5 | * |
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-imxads/io.h | |
| 2 | + * arch/arm/mach-imxads/include/mach/io.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 1999 ARM Limited |
| 5 | 5 | * |
| @@ -20,7 +20,7 @@ · 14 unmodified lines | ||
| 20 | 20 | #ifndef __ASM_ARM_ARCH_IO_H |
| 21 | 21 | #define __ASM_ARM_ARCH_IO_H |
| 22 | 22 | |
| 23 | −#include <asm/hardware.h> | |
| 23 | +#include <mach/hardware.h> | |
| 24 | 24 | |
| 25 | 25 | #define IO_SPACE_LIMIT 0xffffffff |
| 26 | 26 | |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-imxads/irqs.h | |
| 2 | + * arch/arm/mach-imxads/include/mach/irqs.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 1999 ARM Limited |
| 5 | 5 | * Copyright (C) 2000 Deep Blue Solutions Ltd. |
| @@ -23,7 +23,7 @@ · 17 unmodified lines | ||
| 23 | 23 | #define __ARM_IRQS_H__ |
| 24 | 24 | |
| 25 | 25 | /* Use the imx definitions */ |
| 26 | −#include <asm/hardware.h> | |
| 26 | +#include <mach/hardware.h> | |
| 27 | 27 | |
| 28 | 28 | /* |
| 29 | 29 | * IMX Interrupt numbers |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-imx/memory.h | |
| 2 | + * arch/arm/mach-imx/include/mach/memory.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 1999 ARM Limited |
| 5 | 5 | * Copyright (C) 2002 Shane Nay (shane@minirl.com) |
File renamed without changes.
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-imx/mx1ads.h | |
| 2 | + * arch/arm/mach-imx/include/mach/mx1ads.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 2004 Robert Schwebel, Pengutronix |
| 5 | 5 | * |
| @@ -1,11 +1,11 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-imx/spi_imx.h | |
| 2 | + * arch/arm/mach-imx/include/mach/spi_imx.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 2006 SWAPP |
| 5 | 5 | * Andrea Paterniani <a.paterniani@swapp-eng.it> |
| 6 | 6 | * |
| 7 | 7 | * Initial version inspired by: |
| 8 | − * linux-2.6.17-rc3-mm1/include/asm-arm/arch-pxa/pxa2xx_spi.h | |
| 8 | + * linux-2.6.17-rc3-mm1/arch/arm/mach-pxa/include/mach/pxa2xx_spi.h | |
| 9 | 9 | * |
| 10 | 10 | * This program is free software; you can redistribute it and/or modify |
| 11 | 11 | * it under the terms of the GNU General Public License as published by |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-imxads/system.h | |
| 2 | + * arch/arm/mach-imxads/include/mach/system.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 1999 ARM Limited |
| 5 | 5 | * Copyright (C) 2000 Deep Blue Solutions Ltd |
File renamed without changes.
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-imxads/uncompress.h | |
| 2 | + * arch/arm/mach-imxads/include/mach/uncompress.h | |
| 3 | 3 | * |
| 4 | 4 | * |
| 5 | 5 | * |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-imx/vmalloc.h | |
| 2 | + * arch/arm/mach-imx/include/mach/vmalloc.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 2000 Russell King. |
| 5 | 5 | * |
| @@ -27,7 +27,7 @@ · 26 unmodified lines | ||
| 27 | 27 | #include <linux/list.h> |
| 28 | 28 | #include <linux/timer.h> |
| 29 | 29 | |
| 30 | −#include <asm/hardware.h> | |
| 30 | +#include <mach/hardware.h> | |
| 31 | 31 | #include <asm/irq.h> |
| 32 | 32 | #include <asm/io.h> |
| 33 | 33 | |
| @@ -13,7 +13,7 @@ · 12 unmodified lines | ||
| 13 | 13 | |
| 14 | 14 | #include <linux/kernel.h> |
| 15 | 15 | #include <linux/init.h> |
| 16 | −#include <asm/hardware.h> | |
| 16 | +#include <mach/hardware.h> | |
| 17 | 17 | #include <asm/system.h> |
| 18 | 18 | #include <asm/io.h> |
| 19 | 19 | #include <asm/leds.h> |
| @@ -16,7 +16,7 @@ · 15 unmodified lines | ||
| 16 | 16 | #include <linux/init.h> |
| 17 | 17 | #include <linux/platform_device.h> |
| 18 | 18 | #include <asm/system.h> |
| 19 | −#include <asm/hardware.h> | |
| 19 | +#include <mach/hardware.h> | |
| 20 | 20 | #include <asm/irq.h> |
| 21 | 21 | #include <asm/pgtable.h> |
| 22 | 22 | #include <asm/page.h> |
| @@ -25,8 +25,8 @@ · 2 unmodified lines | ||
| 25 | 25 | #include <asm/mach-types.h> |
| 26 | 26 | |
| 27 | 27 | #include <asm/mach/arch.h> |
| 28 | −#include <asm/arch/mmc.h> | |
| 29 | −#include <asm/arch/imx-uart.h> | |
| 28 | +#include <mach/mmc.h> | |
| 29 | +#include <mach/imx-uart.h> | |
| 30 | 30 | #include <linux/interrupt.h> |
| 31 | 31 | #include "generic.h" |
| 32 | 32 | |
| @@ -125,7 +125,7 @@ static struct platform_device *devices[] __initdata = { · 92 unmodified lines | ||
| 125 | 125 | &imx_uart2_device, |
| 126 | 126 | }; |
| 127 | 127 | |
| 128 | −#ifdef CONFIG_MMC_IMX | |
| 128 | +#if defined(CONFIG_MMC_IMX) || defined(CONFIG_MMC_IMX_MODULE) | |
| 129 | 129 | static int mx1ads_mmc_card_present(struct device *dev) |
| 130 | 130 | { |
| 131 | 131 | /* MMC/SD Card Detect is PB 20 on MX1ADS V1.0.7 */ |
| @@ -143,7 +143,7 @@ mx1ads_init(void) · 11 unmodified lines | ||
| 143 | 143 | #ifdef CONFIG_LEDS |
| 144 | 144 | imx_gpio_mode(GPIO_PORTA | GPIO_OUT | 2); |
| 145 | 145 | #endif |
| 146 | −#ifdef CONFIG_MMC_IMX | |
| 146 | +#if defined(CONFIG_MMC_IMX) || defined(CONFIG_MMC_IMX_MODULE) | |
| 147 | 147 | /* SD/MMC card detect */ |
| 148 | 148 | imx_gpio_mode(GPIO_PORTB | GPIO_GIUS | GPIO_IN | 20); |
| 149 | 149 | imx_set_mmc_info(&mx1ads_mmc_info); |
| @@ -19,7 +19,7 @@ · 18 unmodified lines | ||
| 19 | 19 | #include <linux/clockchips.h> |
| 20 | 20 | #include <linux/clk.h> |
| 21 | 21 | |
| 22 | −#include <asm/hardware.h> | |
| 22 | +#include <mach/hardware.h> | |
| 23 | 23 | #include <asm/io.h> |
| 24 | 24 | #include <asm/leds.h> |
| 25 | 25 | #include <asm/irq.h> |
| @@ -20,11 +20,11 @@ · 19 unmodified lines | ||
| 20 | 20 | #include <linux/amba/bus.h> |
| 21 | 21 | #include <linux/amba/serial.h> |
| 22 | 22 | |
| 23 | −#include <asm/hardware.h> | |
| 23 | +#include <mach/hardware.h> | |
| 24 | 24 | #include <asm/irq.h> |
| 25 | 25 | #include <asm/io.h> |
| 26 | 26 | #include <asm/hardware/arm_timer.h> |
| 27 | −#include <asm/arch/cm.h> | |
| 27 | +#include <mach/cm.h> | |
| 28 | 28 | #include <asm/system.h> |
| 29 | 29 | #include <asm/leds.h> |
| 30 | 30 | #include <asm/mach/time.h> |
| @@ -3,8 +3,6 @@ · 2 unmodified lines | ||
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 2001-2002 Deep Blue Solutions Ltd. |
| 5 | 5 | * |
| 6 | − * $Id: cpu.c,v 1.6 2002/07/18 13:58:51 rmk Exp $ | |
| 7 | − * | |
| 8 | 6 | * This program is free software; you can redistribute it and/or modify |
| 9 | 7 | * it under the terms of the GNU General Public License version 2 as |
| 10 | 8 | * published by the Free Software Foundation. |
| @@ -20,7 +18,7 @@ · 9 unmodified lines | ||
| 20 | 18 | #include <linux/smp.h> |
| 21 | 19 | #include <linux/init.h> |
| 22 | 20 | |
| 23 | −#include <asm/hardware.h> | |
| 21 | +#include <mach/hardware.h> | |
| 24 | 22 | #include <asm/io.h> |
| 25 | 23 | #include <asm/mach-types.h> |
| 26 | 24 | #include <asm/hardware/icst525.h> |
| @@ -23,8 +23,8 @@ · 22 unmodified lines | ||
| 23 | 23 | |
| 24 | 24 | #include <asm/io.h> |
| 25 | 25 | #include <asm/hardware/icst525.h> |
| 26 | −#include <asm/arch/lm.h> | |
| 27 | −#include <asm/arch/impd1.h> | |
| 26 | +#include <mach/lm.h> | |
| 27 | +#include <mach/impd1.h> | |
| 28 | 28 | #include <asm/sizes.h> |
| 29 | 29 | |
| 30 | 30 | #include "clock.h" |
| @@ -405,7 +405,7 @@ static int impd1_probe(struct lm_device *dev) · 374 unmodified lines | ||
| 405 | 405 | |
| 406 | 406 | ret = amba_device_register(d, &dev->resource); |
| 407 | 407 | if (ret) { |
| 408 | − dev_err(&d->dev, "unable to register device: %d\n"); | |
| 408 | + dev_err(&d->dev, "unable to register device: %d\n", ret); | |
| 409 | 409 | kfree(d); |
| 410 | 410 | } |
| 411 | 411 | } |
File renamed without changes.
File renamed without changes.
| @@ -1,4 +1,4 @@ | ||
| 1 | −/* linux/include/asm-arm/arch-integrator/debug-macro.S | |
| 1 | +/* arch/arm/mach-integrator/include/mach/debug-macro.S | |
| 2 | 2 | * |
| 3 | 3 | * Debugging macro include header |
| 4 | 4 | * |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-integrator/dma.h | |
| 2 | + * arch/arm/mach-integrator/include/mach/dma.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 1997,1998 Russell King |
| 5 | 5 | * |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-integrator/entry-macro.S | |
| 2 | + * arch/arm/mach-integrator/include/mach/entry-macro.S | |
| 3 | 3 | * |
| 4 | 4 | * Low-level IRQ helper macros for Integrator platforms |
| 5 | 5 | * |
| @@ -7,8 +7,8 @@ · 1 unmodified line | ||
| 7 | 7 | * License version 2. This program is licensed "as is" without any |
| 8 | 8 | * warranty of any kind, whether express or implied. |
| 9 | 9 | */ |
| 10 | −#include <asm/hardware.h> | |
| 11 | −#include <asm/arch/irqs.h> | |
| 10 | +#include <mach/hardware.h> | |
| 11 | +#include <mach/irqs.h> | |
| 12 | 12 | |
| 13 | 13 | .macro disable_fiq |
| 14 | 14 | .endm |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-integrator/hardware.h | |
| 2 | + * arch/arm/mach-integrator/include/mach/hardware.h | |
| 3 | 3 | * |
| 4 | 4 | * This file contains the hardware definitions of the Integrator. |
| 5 | 5 | * |
| @@ -23,7 +23,7 @@ · 17 unmodified lines | ||
| 23 | 23 | #define __ASM_ARCH_HARDWARE_H |
| 24 | 24 | |
| 25 | 25 | #include <asm/sizes.h> |
| 26 | −#include <asm/arch/platform.h> | |
| 26 | +#include <mach/platform.h> | |
| 27 | 27 | |
| 28 | 28 | /* |
| 29 | 29 | * Where in virtual memory the IO devices (timers, system controllers |
File renamed without changes.
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-integrator/io.h | |
| 2 | + * arch/arm/mach-integrator/include/mach/io.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 1999 ARM Limited |
| 5 | 5 | * |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-integrator/irqs.h | |
| 2 | + * arch/arm/mach-integrator/include/mach/irqs.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 1999 ARM Limited |
| 5 | 5 | * Copyright (C) 2000 Deep Blue Solutions Ltd. |
File renamed without changes.
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-integrator/memory.h | |
| 2 | + * arch/arm/mach-integrator/include/mach/memory.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 1999 ARM Limited |
| 5 | 5 | * |
| @@ -26,8 +26,6 @@ · 25 unmodified lines | ||
| 26 | 26 | * NOTE: This is a multi-hosted header file for use with uHAL and |
| 27 | 27 | * supported debuggers. |
| 28 | 28 | * |
| 29 | − * $Id: platform.s,v 1.32 2000/02/18 10:51:39 asims Exp $ | |
| 30 | − * | |
| 31 | 29 | * ***********************************************************************/ |
| 32 | 30 | |
| 33 | 31 | #ifndef __address_h |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-integrator/system.h | |
| 2 | + * arch/arm/mach-integrator/include/mach/system.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 1999 ARM Limited |
| 5 | 5 | * Copyright (C) 2000 Deep Blue Solutions Ltd |
| @@ -21,7 +21,7 @@ · 15 unmodified lines | ||
| 21 | 21 | #ifndef __ASM_ARCH_SYSTEM_H |
| 22 | 22 | #define __ASM_ARCH_SYSTEM_H |
| 23 | 23 | |
| 24 | −#include <asm/arch/cm.h> | |
| 24 | +#include <mach/cm.h> | |
| 25 | 25 | |
| 26 | 26 | static inline void arch_idle(void) |
| 27 | 27 | { |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-integrator/timex.h | |
| 2 | + * arch/arm/mach-integrator/include/mach/timex.h | |
| 3 | 3 | * |
| 4 | 4 | * Integrator architecture timex specifications |
| 5 | 5 | * |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-integrator/uncompress.h | |
| 2 | + * arch/arm/mach-integrator/include/mach/uncompress.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 1999 ARM Limited |
| 5 | 5 | * |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-integrator/vmalloc.h | |
| 2 | + * arch/arm/mach-integrator/include/mach/vmalloc.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 2000 Russell King. |
| 5 | 5 | * |
| @@ -28,14 +28,14 @@ · 27 unmodified lines | ||
| 28 | 28 | #include <linux/amba/bus.h> |
| 29 | 29 | #include <linux/amba/kmi.h> |
| 30 | 30 | |
| 31 | −#include <asm/hardware.h> | |
| 31 | +#include <mach/hardware.h> | |
| 32 | 32 | #include <asm/io.h> |
| 33 | 33 | #include <asm/irq.h> |
| 34 | 34 | #include <asm/setup.h> |
| 35 | 35 | #include <asm/param.h> /* HZ */ |
| 36 | 36 | #include <asm/mach-types.h> |
| 37 | 37 | |
| 38 | −#include <asm/arch/lm.h> | |
| 38 | +#include <mach/lm.h> | |
| 39 | 39 | |
| 40 | 40 | #include <asm/mach/arch.h> |
| 41 | 41 | #include <asm/mach/flash.h> |
| @@ -20,15 +20,15 @@ · 19 unmodified lines | ||
| 20 | 20 | #include <linux/amba/kmi.h> |
| 21 | 21 | #include <linux/amba/clcd.h> |
| 22 | 22 | |
| 23 | −#include <asm/hardware.h> | |
| 23 | +#include <mach/hardware.h> | |
| 24 | 24 | #include <asm/io.h> |
| 25 | 25 | #include <asm/irq.h> |
| 26 | 26 | #include <asm/setup.h> |
| 27 | 27 | #include <asm/mach-types.h> |
| 28 | 28 | #include <asm/hardware/icst525.h> |
| 29 | 29 | |
| 30 | −#include <asm/arch/cm.h> | |
| 31 | −#include <asm/arch/lm.h> | |
| 30 | +#include <mach/cm.h> | |
| 31 | +#include <mach/lm.h> | |
| 32 | 32 | |
| 33 | 33 | #include <asm/mach/arch.h> |
| 34 | 34 | #include <asm/mach/flash.h> |
| @@ -25,12 +25,12 @@ · 24 unmodified lines | ||
| 25 | 25 | #include <linux/smp.h> |
| 26 | 26 | #include <linux/spinlock.h> |
| 27 | 27 | |
| 28 | −#include <asm/hardware.h> | |
| 28 | +#include <mach/hardware.h> | |
| 29 | 29 | #include <asm/io.h> |
| 30 | 30 | #include <asm/leds.h> |
| 31 | 31 | #include <asm/system.h> |
| 32 | 32 | #include <asm/mach-types.h> |
| 33 | −#include <asm/arch/cm.h> | |
| 33 | +#include <mach/cm.h> | |
| 34 | 34 | |
| 35 | 35 | static int saved_leds; |
| 36 | 36 | |
| @@ -12,7 +12,7 @@ · 11 unmodified lines | ||
| 12 | 12 | #include <linux/device.h> |
| 13 | 13 | #include <linux/slab.h> |
| 14 | 14 | |
| 15 | −#include <asm/arch/lm.h> | |
| 15 | +#include <mach/lm.h> | |
| 16 | 16 | |
| 17 | 17 | #define to_lm_device(d) container_of(d, struct lm_device, dev) |
| 18 | 18 | #define to_lm_driver(d) container_of(d, struct lm_driver, drv) |
| @@ -28,7 +28,7 @@ · 27 unmodified lines | ||
| 28 | 28 | #include <linux/spinlock.h> |
| 29 | 29 | #include <linux/init.h> |
| 30 | 30 | |
| 31 | −#include <asm/hardware.h> | |
| 31 | +#include <mach/hardware.h> | |
| 32 | 32 | #include <asm/io.h> |
| 33 | 33 | #include <asm/irq.h> |
| 34 | 34 | #include <asm/system.h> |
| @@ -19,7 +19,7 @@ · 18 unmodified lines | ||
| 19 | 19 | #define _ADMA_H |
| 20 | 20 | #include <linux/types.h> |
| 21 | 21 | #include <linux/io.h> |
| 22 | −#include <asm/hardware.h> | |
| 22 | +#include <mach/hardware.h> | |
| 23 | 23 | #include <asm/hardware/iop_adma.h> |
| 24 | 24 | |
| 25 | 25 | #define ADMA_ACCR(chan) (chan->mmr_base + 0x0) |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-iop13xx/debug-macro.S | |
| 2 | + * arch/arm/mach-iop13xx/include/mach/debug-macro.S | |
| 3 | 3 | * |
| 4 | 4 | * Debugging macro include header |
| 5 | 5 | * |
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
| @@ -1,7 +1,7 @@ | ||
| 1 | 1 | #ifndef __ASM_ARCH_MEMORY_H |
| 2 | 2 | #define __ASM_ARCH_MEMORY_H |
| 3 | 3 | |
| 4 | −#include <asm/arch/hardware.h> | |
| 4 | +#include <mach/hardware.h> | |
| 5 | 5 | |
| 6 | 6 | /* |
| 7 | 7 | * Physical DRAM offset. |
File renamed without changes.
| @@ -1,6 +1,6 @@ | ||
| 1 | 1 | #ifndef _IOP13XX_PCI_H_ |
| 2 | 2 | #define _IOP13XX_PCI_H_ |
| 3 | −#include <asm/arch/irqs.h> | |
| 3 | +#include <mach/irqs.h> | |
| 4 | 4 | #include <asm/io.h> |
| 5 | 5 | |
| 6 | 6 | struct pci_sys_data; |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-iop13xx/system.h | |
| 2 | + * arch/arm/mach-iop13xx/include/mach/system.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 2004 Intel Corp. |
| 5 | 5 | * |
| @@ -7,7 +7,7 @@ · 1 unmodified line | ||
| 7 | 7 | * it under the terms of the GNU General Public License version 2 as |
| 8 | 8 | * published by the Free Software Foundation. |
| 9 | 9 | */ |
| 10 | −#include <asm/arch/iop13xx.h> | |
| 10 | +#include <mach/iop13xx.h> | |
| 11 | 11 | static inline void arch_idle(void) |
| 12 | 12 | { |
| 13 | 13 | cpu_do_idle(); |
File renamed without changes.
| @@ -1,3 +1,3 @@ | ||
| 1 | −#include <asm/hardware.h> | |
| 1 | +#include <mach/hardware.h> | |
| 2 | 2 | |
| 3 | 3 | #define CLOCK_TICK_RATE (100 * HZ) |
| @@ -1,6 +1,6 @@ | ||
| 1 | 1 | #include <asm/types.h> |
| 2 | 2 | #include <linux/serial_reg.h> |
| 3 | −#include <asm/hardware.h> | |
| 3 | +#include <mach/hardware.h> | |
| 4 | 4 | |
| 5 | 5 | #define UART_BASE ((volatile u32 *)IOP13XX_UART1_PHYS) |
| 6 | 6 | #define TX_DONE (UART_LSR_TEMT | UART_LSR_THRE) |
File renamed without changes.
| @@ -18,7 +18,7 @@ · 17 unmodified lines | ||
| 18 | 18 | */ |
| 19 | 19 | #include <linux/kernel.h> |
| 20 | 20 | #include <linux/module.h> |
| 21 | −#include <asm/hardware.h> | |
| 21 | +#include <mach/hardware.h> | |
| 22 | 22 | #include <asm/io.h> |
| 23 | 23 | |
| 24 | 24 | void * __iomem __iop13xx_io(unsigned long io_addr) |
| @@ -18,14 +18,14 @@ · 17 unmodified lines | ||
| 18 | 18 | */ |
| 19 | 19 | #include <linux/pci.h> |
| 20 | 20 | |
| 21 | −#include <asm/hardware.h> | |
| 21 | +#include <mach/hardware.h> | |
| 22 | 22 | #include <asm/irq.h> |
| 23 | 23 | #include <asm/mach/pci.h> |
| 24 | 24 | #include <asm/mach-types.h> |
| 25 | 25 | #include <asm/mach/arch.h> |
| 26 | −#include <asm/arch/pci.h> | |
| 26 | +#include <mach/pci.h> | |
| 27 | 27 | #include <asm/mach/time.h> |
| 28 | −#include <asm/arch/time.h> | |
| 28 | +#include <mach/time.h> | |
| 29 | 29 | |
| 30 | 30 | extern int init_atu; /* Flag to select which ATU(s) to initialize / disable */ |
| 31 | 31 | |
| @@ -18,14 +18,14 @@ · 17 unmodified lines | ||
| 18 | 18 | */ |
| 19 | 19 | #include <linux/pci.h> |
| 20 | 20 | |
| 21 | −#include <asm/hardware.h> | |
| 21 | +#include <mach/hardware.h> | |
| 22 | 22 | #include <asm/irq.h> |
| 23 | 23 | #include <asm/mach/pci.h> |
| 24 | 24 | #include <asm/mach-types.h> |
| 25 | 25 | #include <asm/mach/arch.h> |
| 26 | −#include <asm/arch/pci.h> | |
| 26 | +#include <mach/pci.h> | |
| 27 | 27 | #include <asm/mach/time.h> |
| 28 | −#include <asm/arch/time.h> | |
| 28 | +#include <mach/time.h> | |
| 29 | 29 | |
| 30 | 30 | extern int init_atu; |
| 31 | 31 | |
| @@ -23,10 +23,9 @@ · 22 unmodified lines | ||
| 23 | 23 | #include <asm/uaccess.h> |
| 24 | 24 | #include <asm/mach/irq.h> |
| 25 | 25 | #include <asm/irq.h> |
| 26 | −#include <asm/hardware.h> | |
| 27 | −#include <asm/mach-types.h> | |
| 28 | −#include <asm/arch/irqs.h> | |
| 29 | −#include <asm/arch/msi.h> | |
| 26 | +#include <mach/hardware.h> | |
| 27 | +#include <mach/irqs.h> | |
| 28 | +#include <mach/msi.h> | |
| 30 | 29 | |
| 31 | 30 | /* INTCTL0 CP6 R0 Page 4 |
| 32 | 31 | */ |
| @@ -21,11 +21,11 @@ · 20 unmodified lines | ||
| 21 | 21 | #include <linux/delay.h> |
| 22 | 22 | #include <linux/jiffies.h> |
| 23 | 23 | #include <asm/irq.h> |
| 24 | −#include <asm/hardware.h> | |
| 24 | +#include <mach/hardware.h> | |
| 25 | 25 | #include <asm/sizes.h> |
| 26 | 26 | #include <asm/signal.h> |
| 27 | 27 | #include <asm/mach/pci.h> |
| 28 | −#include <asm/arch/pci.h> | |
| 28 | +#include <mach/pci.h> | |
| 29 | 29 | |
| 30 | 30 | #define IOP13XX_PCI_DEBUG 0 |
| 31 | 31 | #define PRINTK(x...) ((void)(IOP13XX_PCI_DEBUG && printk(x))) |
| @@ -22,7 +22,7 @@ · 21 unmodified lines | ||
| 22 | 22 | #include <linux/mtd/physmap.h> |
| 23 | 23 | #endif |
| 24 | 24 | #include <asm/mach/map.h> |
| 25 | −#include <asm/hardware.h> | |
| 25 | +#include <mach/hardware.h> | |
| 26 | 26 | #include <asm/irq.h> |
| 27 | 27 | #include <asm/io.h> |
| 28 | 28 | #include <asm/hardware/iop_adma.h> |
| @@ -23,7 +23,7 @@ · 22 unmodified lines | ||
| 23 | 23 | #include <linux/mtd/physmap.h> |
| 24 | 24 | #include <linux/platform_device.h> |
| 25 | 25 | #include <linux/i2c.h> |
| 26 | −#include <asm/hardware.h> | |
| 26 | +#include <mach/hardware.h> | |
| 27 | 27 | #include <linux/io.h> |
| 28 | 28 | #include <linux/irq.h> |
| 29 | 29 | #include <asm/mach/arch.h> |
| @@ -31,7 +31,7 @@ · 1 unmodified line | ||
| 31 | 31 | #include <asm/mach/pci.h> |
| 32 | 32 | #include <asm/mach/time.h> |
| 33 | 33 | #include <asm/mach-types.h> |
| 34 | −#include <asm/arch/time.h> | |
| 34 | +#include <mach/time.h> | |
| 35 | 35 | |
| 36 | 36 | static void __init em7210_timer_init(void) |
| 37 | 37 | { |
| @@ -25,7 +25,7 @@ · 24 unmodified lines | ||
| 25 | 25 | #include <linux/mtd/physmap.h> |
| 26 | 26 | #include <linux/i2c.h> |
| 27 | 27 | #include <linux/platform_device.h> |
| 28 | −#include <asm/hardware.h> | |
| 28 | +#include <mach/hardware.h> | |
| 29 | 29 | #include <asm/io.h> |
| 30 | 30 | #include <asm/irq.h> |
| 31 | 31 | #include <asm/mach/arch.h> |
| @@ -34,7 +34,7 @@ · 2 unmodified lines | ||
| 34 | 34 | #include <asm/mach/time.h> |
| 35 | 35 | #include <asm/mach-types.h> |
| 36 | 36 | #include <asm/page.h> |
| 37 | −#include <asm/arch/time.h> | |
| 37 | +#include <mach/time.h> | |
| 38 | 38 | |
| 39 | 39 | /* |
| 40 | 40 | * GLAN Tank timer tick configuration. |
File renamed without changes.
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-iop32x/debug-macro.S | |
| 2 | + * arch/arm/mach-iop32x/include/mach/debug-macro.S | |
| 3 | 3 | * |
| 4 | 4 | * Debugging macro include header |
| 5 | 5 | * |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-iop33x/dma.h | |
| 2 | + * arch/arm/mach-iop32x/include/mach/dma.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 2004 Intel Corp. |
| 5 | 5 | * |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-iop32x/entry-macro.S | |
| 2 | + * arch/arm/mach-iop32x/include/mach/entry-macro.S | |
| 3 | 3 | * |
| 4 | 4 | * Low-level IRQ helper macros for IOP32x-based platforms |
| 5 | 5 | * |
| @@ -7,7 +7,7 @@ · 1 unmodified line | ||
| 7 | 7 | * License version 2. This program is licensed "as is" without any |
| 8 | 8 | * warranty of any kind, whether express or implied. |
| 9 | 9 | */ |
| 10 | −#include <asm/arch/iop32x.h> | |
| 10 | +#include <mach/iop32x.h> | |
| 11 | 11 | |
| 12 | 12 | .macro disable_fiq |
| 13 | 13 | .endm |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-iop32x/glantank.h | |
| 2 | + * arch/arm/mach-iop32x/include/mach/glantank.h | |
| 3 | 3 | * |
| 4 | 4 | * IO-Data GLAN Tank board registers |
| 5 | 5 | */ |
File renamed without changes.
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-iop32x/hardware.h | |
| 2 | + * arch/arm/mach-iop32x/include/mach/hardware.h | |
| 3 | 3 | */ |
| 4 | 4 | |
| 5 | 5 | #ifndef __HARDWARE_H |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-iop32x/io.h | |
| 2 | + * arch/arm/mach-iop32x/include/mach/io.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 2001 MontaVista Software, Inc. |
| 5 | 5 | * |
| @@ -11,7 +11,7 @@ · 5 unmodified lines | ||
| 11 | 11 | #ifndef __IO_H |
| 12 | 12 | #define __IO_H |
| 13 | 13 | |
| 14 | −#include <asm/hardware.h> | |
| 14 | +#include <mach/hardware.h> | |
| 15 | 15 | |
| 16 | 16 | extern void __iomem *__iop3xx_ioremap(unsigned long cookie, size_t size, |
| 17 | 17 | unsigned int mtype); |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-iop32x/iop32x.h | |
| 2 | + * arch/arm/mach-iop32x/include/mach/iop32x.h | |
| 3 | 3 | * |
| 4 | 4 | * Intel IOP32X Chip definitions |
| 5 | 5 | * |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-iop32x/iq31244.h | |
| 2 | + * arch/arm/mach-iop32x/include/mach/iq31244.h | |
| 3 | 3 | * |
| 4 | 4 | * Intel IQ31244 evaluation board registers |
| 5 | 5 | */ |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-iop32x/iq80321.h | |
| 2 | + * arch/arm/mach-iop32x/include/mach/iq80321.h | |
| 3 | 3 | * |
| 4 | 4 | * Intel IQ80321 evaluation board registers |
| 5 | 5 | */ |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-iop32x/irqs.h | |
| 2 | + * arch/arm/mach-iop32x/include/mach/irqs.h | |
| 3 | 3 | * |
| 4 | 4 | * Author: Rory Bolt <rorybolt@pacbell.net> |
| 5 | 5 | * Copyright: (C) 2002 Rory Bolt |
| @@ -1,11 +1,11 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-iop32x/memory.h | |
| 2 | + * arch/arm/mach-iop32x/include/mach/memory.h | |
| 3 | 3 | */ |
| 4 | 4 | |
| 5 | 5 | #ifndef __MEMORY_H |
| 6 | 6 | #define __MEMORY_H |
| 7 | 7 | |
| 8 | −#include <asm/hardware.h> | |
| 8 | +#include <mach/hardware.h> | |
| 9 | 9 | |
| 10 | 10 | /* |
| 11 | 11 | * Physical DRAM offset. |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-iop32x/n2100.h | |
| 2 | + * arch/arm/mach-iop32x/include/mach/n2100.h | |
| 3 | 3 | * |
| 4 | 4 | * Thecus N2100 board registers |
| 5 | 5 | */ |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-iop32x/system.h | |
| 2 | + * arch/arm/mach-iop32x/include/mach/system.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 2001 MontaVista Software, Inc. |
| 5 | 5 | * |
File renamed without changes.
| @@ -1,9 +1,9 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-iop32x/timex.h | |
| 2 | + * arch/arm/mach-iop32x/include/mach/timex.h | |
| 3 | 3 | * |
| 4 | 4 | * IOP32x architecture timex specifications |
| 5 | 5 | */ |
| 6 | 6 | |
| 7 | −#include <asm/hardware.h> | |
| 7 | +#include <mach/hardware.h> | |
| 8 | 8 | |
| 9 | 9 | #define CLOCK_TICK_RATE (100 * HZ) |
| @@ -1,11 +1,11 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-iop32x/uncompress.h | |
| 2 | + * arch/arm/mach-iop32x/include/mach/uncompress.h | |
| 3 | 3 | */ |
| 4 | 4 | |
| 5 | 5 | #include <asm/types.h> |
| 6 | 6 | #include <asm/mach-types.h> |
| 7 | 7 | #include <linux/serial_reg.h> |
| 8 | −#include <asm/hardware.h> | |
| 8 | +#include <mach/hardware.h> | |
| 9 | 9 | |
| 10 | 10 | static volatile u8 *uart_base; |
| 11 | 11 | |
| @@ -0,0 +1,5 @@ | ||
| 1 | +/* | |
| 2 | + * arch/arm/mach-iop32x/include/mach/vmalloc.h | |
| 3 | + */ | |
| 4 | + | |
| 5 | +#define VMALLOC_END 0xfe000000 | |
| @@ -26,7 +26,7 @@ · 25 unmodified lines | ||
| 26 | 26 | #include <linux/serial_8250.h> |
| 27 | 27 | #include <linux/mtd/physmap.h> |
| 28 | 28 | #include <linux/platform_device.h> |
| 29 | −#include <asm/hardware.h> | |
| 29 | +#include <mach/hardware.h> | |
| 30 | 30 | #include <asm/io.h> |
| 31 | 31 | #include <asm/irq.h> |
| 32 | 32 | #include <asm/mach/arch.h> |
| @@ -36,7 +36,7 @@ · 3 unmodified lines | ||
| 36 | 36 | #include <asm/mach-types.h> |
| 37 | 37 | #include <asm/page.h> |
| 38 | 38 | #include <asm/pgtable.h> |
| 39 | −#include <asm/arch/time.h> | |
| 39 | +#include <mach/time.h> | |
| 40 | 40 | |
| 41 | 41 | /* |
| 42 | 42 | * Until March of 2007 iq31244 platforms and ep80219 platforms shared the |
| @@ -23,7 +23,7 @@ · 22 unmodified lines | ||
| 23 | 23 | #include <linux/serial_8250.h> |
| 24 | 24 | #include <linux/mtd/physmap.h> |
| 25 | 25 | #include <linux/platform_device.h> |
| 26 | −#include <asm/hardware.h> | |
| 26 | +#include <mach/hardware.h> | |
| 27 | 27 | #include <asm/io.h> |
| 28 | 28 | #include <asm/irq.h> |
| 29 | 29 | #include <asm/mach/arch.h> |
| @@ -33,7 +33,7 @@ · 3 unmodified lines | ||
| 33 | 33 | #include <asm/mach-types.h> |
| 34 | 34 | #include <asm/page.h> |
| 35 | 35 | #include <asm/pgtable.h> |
| 36 | −#include <asm/arch/time.h> | |
| 36 | +#include <mach/time.h> | |
| 37 | 37 | |
| 38 | 38 | /* |
| 39 | 39 | * IQ80321 timer tick configuration. |
| @@ -16,7 +16,7 @@ · 15 unmodified lines | ||
| 16 | 16 | #include <linux/list.h> |
| 17 | 17 | #include <asm/mach/irq.h> |
| 18 | 18 | #include <asm/irq.h> |
| 19 | −#include <asm/hardware.h> | |
| 19 | +#include <mach/hardware.h> | |
| 20 | 20 | #include <asm/mach-types.h> |
| 21 | 21 | |
| 22 | 22 | static u32 iop32x_mask; |
| @@ -30,7 +30,7 @@ · 29 unmodified lines | ||
| 30 | 30 | #include <linux/i2c.h> |
| 31 | 31 | #include <linux/platform_device.h> |
| 32 | 32 | #include <linux/reboot.h> |
| 33 | −#include <asm/hardware.h> | |
| 33 | +#include <mach/hardware.h> | |
| 34 | 34 | #include <asm/io.h> |
| 35 | 35 | #include <asm/irq.h> |
| 36 | 36 | #include <asm/mach/arch.h> |
| @@ -40,7 +40,7 @@ · 3 unmodified lines | ||
| 40 | 40 | #include <asm/mach-types.h> |
| 41 | 41 | #include <asm/page.h> |
| 42 | 42 | #include <asm/pgtable.h> |
| 43 | −#include <asm/arch/time.h> | |
| 43 | +#include <mach/time.h> | |
| 44 | 44 | |
| 45 | 45 | /* |
| 46 | 46 | * N2100 timer tick configuration. |
File renamed without changes.
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-iop33x/debug-macro.S | |
| 2 | + * arch/arm/mach-iop33x/include/mach/debug-macro.S | |
| 3 | 3 | * |
| 4 | 4 | * Debugging macro include header |
| 5 | 5 | * |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-iop32x/dma.h | |
| 2 | + * arch/arm/mach-iop33x/include/mach/dma.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 2004 Intel Corp. |
| 5 | 5 | * |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-iop33x/entry-macro.S | |
| 2 | + * arch/arm/mach-iop33x/include/mach/entry-macro.S | |
| 3 | 3 | * |
| 4 | 4 | * Low-level IRQ helper macros for IOP33x-based platforms |
| 5 | 5 | * |
| @@ -7,7 +7,7 @@ · 1 unmodified line | ||
| 7 | 7 | * License version 2. This program is licensed "as is" without any |
| 8 | 8 | * warranty of any kind, whether express or implied. |
| 9 | 9 | */ |
| 10 | −#include <asm/arch/iop33x.h> | |
| 10 | +#include <mach/iop33x.h> | |
| 11 | 11 | |
| 12 | 12 | .macro disable_fiq |
| 13 | 13 | .endm |
File renamed without changes.
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-iop33x/hardware.h | |
| 2 | + * arch/arm/mach-iop33x/include/mach/hardware.h | |
| 3 | 3 | */ |
| 4 | 4 | |
| 5 | 5 | #ifndef __HARDWARE_H |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-iop33x/io.h | |
| 2 | + * arch/arm/mach-iop33x/include/mach/io.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 2001 MontaVista Software, Inc. |
| 5 | 5 | * |
| @@ -11,7 +11,7 @@ · 5 unmodified lines | ||
| 11 | 11 | #ifndef __IO_H |
| 12 | 12 | #define __IO_H |
| 13 | 13 | |
| 14 | −#include <asm/hardware.h> | |
| 14 | +#include <mach/hardware.h> | |
| 15 | 15 | |
| 16 | 16 | extern void __iomem *__iop3xx_ioremap(unsigned long cookie, size_t size, |
| 17 | 17 | unsigned int mtype); |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-iop33x/iop33x.h | |
| 2 | + * arch/arm/mach-iop33x/include/mach/iop33x.h | |
| 3 | 3 | * |
| 4 | 4 | * Intel IOP33X Chip definitions |
| 5 | 5 | * |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-iop33x/iq80331.h | |
| 2 | + * arch/arm/mach-iop33x/include/mach/iq80331.h | |
| 3 | 3 | * |
| 4 | 4 | * Intel IQ80331 evaluation board registers |
| 5 | 5 | */ |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-iop33x/iq80332.h | |
| 2 | + * arch/arm/mach-iop33x/include/mach/iq80332.h | |
| 3 | 3 | * |
| 4 | 4 | * Intel IQ80332 evaluation board registers |
| 5 | 5 | */ |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-iop33x/irqs.h | |
| 2 | + * arch/arm/mach-iop33x/include/mach/irqs.h | |
| 3 | 3 | * |
| 4 | 4 | * Author: Dave Jiang (dave.jiang@intel.com) |
| 5 | 5 | * Copyright: (C) 2003 Intel Corp. |
| @@ -1,11 +1,11 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-iop33x/memory.h | |
| 2 | + * arch/arm/mach-iop33x/include/mach/memory.h | |
| 3 | 3 | */ |
| 4 | 4 | |
| 5 | 5 | #ifndef __MEMORY_H |
| 6 | 6 | #define __MEMORY_H |
| 7 | 7 | |
| 8 | −#include <asm/hardware.h> | |
| 8 | +#include <mach/hardware.h> | |
| 9 | 9 | |
| 10 | 10 | /* |
| 11 | 11 | * Physical DRAM offset. |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-iop33x/system.h | |
| 2 | + * arch/arm/mach-iop33x/include/mach/system.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 2001 MontaVista Software, Inc. |
| 5 | 5 | * |
File renamed without changes.
| @@ -1,9 +1,9 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-iop33x/timex.h | |
| 2 | + * arch/arm/mach-iop33x/include/mach/timex.h | |
| 3 | 3 | * |
| 4 | 4 | * IOP3xx architecture timex specifications |
| 5 | 5 | */ |
| 6 | 6 | |
| 7 | −#include <asm/hardware.h> | |
| 7 | +#include <mach/hardware.h> | |
| 8 | 8 | |
| 9 | 9 | #define CLOCK_TICK_RATE (100 * HZ) |
| @@ -1,11 +1,11 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-iop33x/uncompress.h | |
| 2 | + * arch/arm/mach-iop33x/include/mach/uncompress.h | |
| 3 | 3 | */ |
| 4 | 4 | |
| 5 | 5 | #include <asm/types.h> |
| 6 | 6 | #include <asm/mach-types.h> |
| 7 | 7 | #include <linux/serial_reg.h> |
| 8 | −#include <asm/hardware.h> | |
| 8 | +#include <mach/hardware.h> | |
| 9 | 9 | |
| 10 | 10 | static volatile u32 *uart_base; |
| 11 | 11 | |
| @@ -0,0 +1,5 @@ | ||
| 1 | +/* | |
| 2 | + * arch/arm/mach-iop33x/include/mach/vmalloc.h | |
| 3 | + */ | |
| 4 | + | |
| 5 | +#define VMALLOC_END 0xfe000000 | |
| @@ -22,7 +22,7 @@ · 21 unmodified lines | ||
| 22 | 22 | #include <linux/serial_8250.h> |
| 23 | 23 | #include <linux/mtd/physmap.h> |
| 24 | 24 | #include <linux/platform_device.h> |
| 25 | −#include <asm/hardware.h> | |
| 25 | +#include <mach/hardware.h> | |
| 26 | 26 | #include <asm/io.h> |
| 27 | 27 | #include <asm/irq.h> |
| 28 | 28 | #include <asm/mach/arch.h> |
| @@ -32,7 +32,7 @@ · 3 unmodified lines | ||
| 32 | 32 | #include <asm/mach-types.h> |
| 33 | 33 | #include <asm/page.h> |
| 34 | 34 | #include <asm/pgtable.h> |
| 35 | −#include <asm/arch/time.h> | |
| 35 | +#include <mach/time.h> | |
| 36 | 36 | |
| 37 | 37 | /* |
| 38 | 38 | * IQ80331 timer tick configuration. |
| @@ -22,7 +22,7 @@ · 21 unmodified lines | ||
| 22 | 22 | #include <linux/serial_8250.h> |
| 23 | 23 | #include <linux/mtd/physmap.h> |
| 24 | 24 | #include <linux/platform_device.h> |
| 25 | −#include <asm/hardware.h> | |
| 25 | +#include <mach/hardware.h> | |
| 26 | 26 | #include <asm/io.h> |
| 27 | 27 | #include <asm/irq.h> |
| 28 | 28 | #include <asm/mach/arch.h> |
| @@ -32,7 +32,7 @@ · 3 unmodified lines | ||
| 32 | 32 | #include <asm/mach-types.h> |
| 33 | 33 | #include <asm/page.h> |
| 34 | 34 | #include <asm/pgtable.h> |
| 35 | −#include <asm/arch/time.h> | |
| 35 | +#include <mach/time.h> | |
| 36 | 36 | |
| 37 | 37 | /* |
| 38 | 38 | * IQ80332 timer tick configuration. |
| @@ -16,7 +16,7 @@ · 15 unmodified lines | ||
| 16 | 16 | #include <linux/list.h> |
| 17 | 17 | #include <asm/mach/irq.h> |
| 18 | 18 | #include <asm/irq.h> |
| 19 | −#include <asm/hardware.h> | |
| 19 | +#include <mach/hardware.h> | |
| 20 | 20 | #include <asm/mach-types.h> |
| 21 | 21 | |
| 22 | 22 | static u32 iop33x_mask0; |
| @@ -24,9 +24,8 @@ · 23 unmodified lines | ||
| 24 | 24 | #include <asm/setup.h> |
| 25 | 25 | #include <asm/system.h> |
| 26 | 26 | #include <asm/memory.h> |
| 27 | −#include <asm/hardware.h> | |
| 27 | +#include <mach/hardware.h> | |
| 28 | 28 | #include <asm/hardware/iop3xx.h> |
| 29 | −#include <asm/mach-types.h> | |
| 30 | 29 | #include <asm/mach/arch.h> |
| 31 | 30 | |
| 32 | 31 | #define IOP33X_UART_XTAL 33334000 |
| @@ -29,7 +29,7 @@ · 28 unmodified lines | ||
| 29 | 29 | #include <asm/types.h> |
| 30 | 30 | #include <asm/setup.h> |
| 31 | 31 | #include <asm/memory.h> |
| 32 | −#include <asm/hardware.h> | |
| 32 | +#include <mach/hardware.h> | |
| 33 | 33 | #include <asm/irq.h> |
| 34 | 34 | #include <asm/system.h> |
| 35 | 35 | #include <asm/tlbflush.h> |
| @@ -39,7 +39,7 @@ · 3 unmodified lines | ||
| 39 | 39 | #include <asm/mach/time.h> |
| 40 | 40 | #include <asm/mach/irq.h> |
| 41 | 41 | |
| 42 | −#include <asm/arch/gpio.h> | |
| 42 | +#include <mach/gpio.h> | |
| 43 | 43 | |
| 44 | 44 | static DEFINE_SPINLOCK(ixp2000_slowport_lock); |
| 45 | 45 | static unsigned long ixp2000_slowport_irq_flags; |
| @@ -38,7 +38,7 @@ · 37 unmodified lines | ||
| 38 | 38 | #include <asm/pgtable.h> |
| 39 | 39 | #include <asm/page.h> |
| 40 | 40 | #include <asm/system.h> |
| 41 | −#include <asm/hardware.h> | |
| 41 | +#include <mach/hardware.h> | |
| 42 | 42 | #include <asm/mach-types.h> |
| 43 | 43 | |
| 44 | 44 | #include <asm/mach/pci.h> |
| @@ -1,4 +1,4 @@ | ||
| 1 | −/* linux/include/asm-arm/arch-ixp2000/debug-macro.S | |
| 1 | +/* arch/arm/mach-ixp2000/include/mach/debug-macro.S | |
| 2 | 2 | * |
| 3 | 3 | * Debugging macro include header |
| 4 | 4 | * |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-ixp2000/dma.h | |
| 2 | + * arch/arm/mach-ixp2000/include/mach/dma.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 2002 Intel Corp. |
| 5 | 5 | * |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-ixp2000/enp2611.h | |
| 2 | + * arch/arm/mach-ixp2000/include/mach/enp2611.h | |
| 3 | 3 | * |
| 4 | 4 | * Register and other defines for Radisys ENP-2611 |
| 5 | 5 | * |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-ixp2000/entry-macro.S | |
| 2 | + * arch/arm/mach-ixp2000/include/mach/entry-macro.S | |
| 3 | 3 | * |
| 4 | 4 | * Low-level IRQ helper macros for IXP2000-based platforms |
| 5 | 5 | * |
| @@ -7,7 +7,7 @@ · 1 unmodified line | ||
| 7 | 7 | * License version 2. This program is licensed "as is" without any |
| 8 | 8 | * warranty of any kind, whether express or implied. |
| 9 | 9 | */ |
| 10 | −#include <asm/arch/irqs.h> | |
| 10 | +#include <mach/irqs.h> | |
| 11 | 11 | |
| 12 | 12 | .macro disable_fiq |
| 13 | 13 | .endm |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-ixp2000/gpio.h | |
| 2 | + * arch/arm/mach-ixp2000/include/mach/gpio.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 2002 Intel Corporation. |
| 5 | 5 | * |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-ixp2000/hardware.h | |
| 2 | + * arch/arm/mach-ixp2000/include/mach/hardware.h | |
| 3 | 3 | * |
| 4 | 4 | * Hardware definitions for IXP2400/2800 based systems |
| 5 | 5 | * |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-ixp2000/io.h | |
| 2 | + * arch/arm/mach-ixp2000/include/mach/io.h | |
| 3 | 3 | * |
| 4 | 4 | * Original Author: Naeem M Afzal <naeem.m.afzal@intel.com> |
| 5 | 5 | * Maintainer: Deepak Saxena <dsaxena@plexity.net> |
| @@ -15,7 +15,7 @@ · 9 unmodified lines | ||
| 15 | 15 | #ifndef __ASM_ARM_ARCH_IO_H |
| 16 | 16 | #define __ASM_ARM_ARCH_IO_H |
| 17 | 17 | |
| 18 | −#include <asm/hardware.h> | |
| 18 | +#include <mach/hardware.h> | |
| 19 | 19 | |
| 20 | 20 | #define IO_SPACE_LIMIT 0xffffffff |
| 21 | 21 | #define __mem_pci(a) (a) |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-ixp2000/irqs.h | |
| 2 | + * arch/arm/mach-ixp2000/include/mach/irqs.h | |
| 3 | 3 | * |
| 4 | 4 | * Original Author: Naeem Afzal <naeem.m.afzal@intel.com> |
| 5 | 5 | * Maintainer: Deepak Saxena <dsaxena@plexity.net> |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-ixp2000/ixdp2x00.h | |
| 2 | + * arch/arm/mach-ixp2000/include/mach/ixdp2x00.h | |
| 3 | 3 | * |
| 4 | 4 | * Register and other defines for IXDP2[48]00 platforms |
| 5 | 5 | * |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-ixp2000/ixdp2x01.h | |
| 2 | + * arch/arm/mach-ixp2000/include/mach/ixdp2x01.h | |
| 3 | 3 | * |
| 4 | 4 | * Platform definitions for IXDP2X01 && IXDP2801 systems |
| 5 | 5 | * |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-ixp2000/ixp2000-regs.h | |
| 2 | + * arch/arm/mach-ixp2000/include/mach/ixp2000-regs.h | |
| 3 | 3 | * |
| 4 | 4 | * Chipset register definitions for IXP2400/2800 based systems. |
| 5 | 5 | * |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-ixp2000/memory.h | |
| 2 | + * arch/arm/mach-ixp2000/include/mach/memory.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (c) 2002 Intel Corp. |
| 5 | 5 | * Copyright (c) 2003-2004 MontaVista Software, Inc. |
| @@ -22,7 +22,7 @@ · 16 unmodified lines | ||
| 22 | 22 | * bus_to_virt: Used to convert an address for DMA operations |
| 23 | 23 | * to an address that the kernel can use. |
| 24 | 24 | */ |
| 25 | −#include <asm/arch/ixp2000-regs.h> | |
| 25 | +#include <mach/ixp2000-regs.h> | |
| 26 | 26 | |
| 27 | 27 | #define __virt_to_bus(v) \ |
| 28 | 28 | (((__virt_to_phys(v) - 0x0) + (*IXP2000_PCI_SDRAM_BAR & 0xfffffff0))) |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-ixp2000/platform.h | |
| 2 | + * arch/arm/mach-ixp2000/include/mach/platform.h | |
| 3 | 3 | * |
| 4 | 4 | * Various bits of code used by platform-level code. |
| 5 | 5 | * |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-ixp2000/system.h | |
| 2 | + * arch/arm/mach-ixp2000/include/mach/system.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 2002 Intel Corp. |
| 5 | 5 | * Copyricht (C) 2003-2005 MontaVista Software, Inc. |
| @@ -9,7 +9,7 @@ · 3 unmodified lines | ||
| 9 | 9 | * published by the Free Software Foundation. |
| 10 | 10 | */ |
| 11 | 11 | |
| 12 | −#include <asm/hardware.h> | |
| 12 | +#include <mach/hardware.h> | |
| 13 | 13 | #include <asm/mach-types.h> |
| 14 | 14 | |
| 15 | 15 | static inline void arch_idle(void) |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-ixp2000/timex.h | |
| 2 | + * arch/arm/mach-ixp2000/include/mach/timex.h | |
| 3 | 3 | * |
| 4 | 4 | * IXP2000 architecture timex specifications |
| 5 | 5 | */ |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-ixp2000/uncompress.h | |
| 2 | + * arch/arm/mach-ixp2000/include/mach/uncompress.h | |
| 3 | 3 | * |
| 4 | 4 | * |
| 5 | 5 | * Original Author: Naeem Afzal <naeem.m.afzal@intel.com> |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-ixp2000/vmalloc.h | |
| 2 | + * arch/arm/mach-ixp2000/include/mach/vmalloc.h | |
| 3 | 3 | * |
| 4 | 4 | * Author: Naeem Afzal <naeem.m.afzal@intel.com> |
| 5 | 5 | * |
| @@ -31,7 +31,7 @@ · 30 unmodified lines | ||
| 31 | 31 | #include <asm/pgtable.h> |
| 32 | 32 | #include <asm/page.h> |
| 33 | 33 | #include <asm/system.h> |
| 34 | −#include <asm/hardware.h> | |
| 34 | +#include <mach/hardware.h> | |
| 35 | 35 | #include <asm/mach-types.h> |
| 36 | 36 | |
| 37 | 37 | #include <asm/mach/pci.h> |
| @@ -31,7 +31,7 @@ · 30 unmodified lines | ||
| 31 | 31 | #include <asm/pgtable.h> |
| 32 | 32 | #include <asm/page.h> |
| 33 | 33 | #include <asm/system.h> |
| 34 | −#include <asm/hardware.h> | |
| 34 | +#include <mach/hardware.h> | |
| 35 | 35 | #include <asm/mach-types.h> |
| 36 | 36 | |
| 37 | 37 | #include <asm/mach/pci.h> |
| @@ -31,7 +31,7 @@ · 30 unmodified lines | ||
| 31 | 31 | #include <asm/pgtable.h> |
| 32 | 32 | #include <asm/page.h> |
| 33 | 33 | #include <asm/system.h> |
| 34 | −#include <asm/hardware.h> | |
| 34 | +#include <mach/hardware.h> | |
| 35 | 35 | #include <asm/mach-types.h> |
| 36 | 36 | |
| 37 | 37 | #include <asm/mach/pci.h> |
| @@ -41,7 +41,7 @@ · 3 unmodified lines | ||
| 41 | 41 | #include <asm/mach/flash.h> |
| 42 | 42 | #include <asm/mach/arch.h> |
| 43 | 43 | |
| 44 | −#include <asm/arch/gpio.h> | |
| 44 | +#include <mach/gpio.h> | |
| 45 | 45 | |
| 46 | 46 | |
| 47 | 47 | /************************************************************************* |
| @@ -36,7 +36,7 @@ · 35 unmodified lines | ||
| 36 | 36 | #include <asm/pgtable.h> |
| 37 | 37 | #include <asm/page.h> |
| 38 | 38 | #include <asm/system.h> |
| 39 | −#include <asm/hardware.h> | |
| 39 | +#include <mach/hardware.h> | |
| 40 | 40 | #include <asm/mach-types.h> |
| 41 | 41 | |
| 42 | 42 | #include <asm/mach/pci.h> |
| @@ -28,7 +28,7 @@ · 27 unmodified lines | ||
| 28 | 28 | #include <asm/io.h> |
| 29 | 29 | #include <asm/irq.h> |
| 30 | 30 | #include <asm/system.h> |
| 31 | −#include <asm/hardware.h> | |
| 31 | +#include <mach/hardware.h> | |
| 32 | 32 | |
| 33 | 33 | #include <asm/mach/pci.h> |
| 34 | 34 | |
| @@ -32,8 +32,7 @@ · 31 unmodified lines | ||
| 32 | 32 | #include <asm/types.h> |
| 33 | 33 | #include <asm/setup.h> |
| 34 | 34 | #include <asm/memory.h> |
| 35 | −#include <asm/hardware.h> | |
| 36 | −#include <asm/mach-types.h> | |
| 35 | +#include <mach/hardware.h> | |
| 37 | 36 | #include <asm/irq.h> |
| 38 | 37 | #include <asm/system.h> |
| 39 | 38 | #include <asm/tlbflush.h> |
| @@ -29,7 +29,7 @@ · 28 unmodified lines | ||
| 29 | 29 | #include <asm/types.h> |
| 30 | 30 | #include <asm/setup.h> |
| 31 | 31 | #include <asm/memory.h> |
| 32 | −#include <asm/hardware.h> | |
| 32 | +#include <mach/hardware.h> | |
| 33 | 33 | #include <asm/mach-types.h> |
| 34 | 34 | #include <asm/irq.h> |
| 35 | 35 | #include <asm/system.h> |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-ixp23xx/debug-macro.S | |
| 2 | + * arch/arm/mach-ixp23xx/include/mach/debug-macro.S | |
| 3 | 3 | * |
| 4 | 4 | * Debugging macro include header |
| 5 | 5 | * |
| @@ -10,7 +10,7 @@ · 4 unmodified lines | ||
| 10 | 10 | * it under the terms of the GNU General Public License version 2 as |
| 11 | 11 | * published by the Free Software Foundation. |
| 12 | 12 | */ |
| 13 | −#include <asm/arch/ixp23xx.h> | |
| 13 | +#include <mach/ixp23xx.h> | |
| 14 | 14 | |
| 15 | 15 | .macro addruart,rx |
| 16 | 16 | mrc p15, 0, \rx, c1, c0 |
| @@ -0,0 +1,3 @@ | ||
| 1 | +/* | |
| 2 | + * arch/arm/mach-ixp23xx/include/mach/dma.h | |
| 3 | + */ | |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-ixp23xx/entry-macro.S | |
| 2 | + * arch/arm/mach-ixp23xx/include/mach/entry-macro.S | |
| 3 | 3 | */ |
| 4 | 4 | |
| 5 | 5 | .macro disable_fiq |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-ixp23xx/hardware.h | |
| 2 | + * arch/arm/mach-ixp23xx/include/mach/hardware.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 2002-2004 Intel Corporation. |
| 5 | 5 | * Copyricht (C) 2005 MontaVista Software, Inc. |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-ixp23xx/io.h | |
| 2 | + * arch/arm/mach-ixp23xx/include/mach/io.h | |
| 3 | 3 | * |
| 4 | 4 | * Original Author: Naeem M Afzal <naeem.m.afzal@intel.com> |
| 5 | 5 | * Maintainer: Deepak Saxena <dsaxena@plexity.net> |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-ixp23xx/irqs.h | |
| 2 | + * arch/arm/mach-ixp23xx/include/mach/irqs.h | |
| 3 | 3 | * |
| 4 | 4 | * IRQ definitions for IXP23XX based systems |
| 5 | 5 | * |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-ixp23xx/ixdp2351.h | |
| 2 | + * arch/arm/mach-ixp23xx/include/mach/ixdp2351.h | |
| 3 | 3 | * |
| 4 | 4 | * Register and other defines for IXDP2351 |
| 5 | 5 | * |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-ixp23xx/ixp23xx.h | |
| 2 | + * arch/arm/mach-ixp23xx/include/mach/ixp23xx.h | |
| 3 | 3 | * |
| 4 | 4 | * Register definitions for IXP23XX |
| 5 | 5 | * |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-ixp23xx/memory.h | |
| 2 | + * arch/arm/mach-ixp23xx/include/mach/memory.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (c) 2003-2004 Intel Corp. |
| 5 | 5 | * |
| @@ -12,7 +12,7 @@ · 6 unmodified lines | ||
| 12 | 12 | #ifndef __ASM_ARCH_MEMORY_H |
| 13 | 13 | #define __ASM_ARCH_MEMORY_H |
| 14 | 14 | |
| 15 | −#include <asm/hardware.h> | |
| 15 | +#include <mach/hardware.h> | |
| 16 | 16 | |
| 17 | 17 | /* |
| 18 | 18 | * Physical DRAM offset. |
| @@ -28,7 +28,6 @@ · 9 unmodified lines | ||
| 28 | 28 | * to an address that the kernel can use. |
| 29 | 29 | */ |
| 30 | 30 | #ifndef __ASSEMBLY__ |
| 31 | −#include <asm/mach-types.h> | |
| 32 | 31 | |
| 33 | 32 | #define __virt_to_bus(v) \ |
| 34 | 33 | ({ unsigned int ret; \ |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-ixp23xx/platform.h | |
| 2 | + * arch/arm/mach-ixp23xx/include/mach/platform.h | |
| 3 | 3 | * |
| 4 | 4 | * Various bits of code used by platform-level code. |
| 5 | 5 | * |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-ixp23xx/system.h | |
| 2 | + * arch/arm/mach-ixp23xx/include/mach/system.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 2003 Intel Corporation. |
| 5 | 5 | * |
| @@ -8,7 +8,7 @@ · 2 unmodified lines | ||
| 8 | 8 | * published by the Free Software Foundation. |
| 9 | 9 | */ |
| 10 | 10 | |
| 11 | −#include <asm/hardware.h> | |
| 11 | +#include <mach/hardware.h> | |
| 12 | 12 | #include <asm/mach-types.h> |
| 13 | 13 | |
| 14 | 14 | static inline void arch_idle(void) |
| @@ -0,0 +1,3 @@ | ||
| 1 | +/* | |
| 2 | + * arch/arm/mach-ixp23xx/include/mach/time.h | |
| 3 | + */ | |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-ixp23xx/timex.h | |
| 2 | + * arch/arm/mach-ixp23xx/include/mach/timex.h | |
| 3 | 3 | * |
| 4 | 4 | * XScale architecture timex specifications |
| 5 | 5 | */ |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-ixp23xx/uncompress.h | |
| 2 | + * arch/arm/mach-ixp23xx/include/mach/uncompress.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 2002-2004 Intel Corporation. |
| 5 | 5 | * |
| @@ -11,7 +11,7 @@ · 5 unmodified lines | ||
| 11 | 11 | #ifndef __ASM_ARCH_UNCOMPRESS_H |
| 12 | 12 | #define __ASM_ARCH_UNCOMPRESS_H |
| 13 | 13 | |
| 14 | −#include <asm/arch/ixp23xx.h> | |
| 14 | +#include <mach/ixp23xx.h> | |
| 15 | 15 | #include <linux/serial_reg.h> |
| 16 | 16 | |
| 17 | 17 | #define UART_BASE ((volatile u32 *)IXP23XX_UART1_PHYS) |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-ixp23xx/vmalloc.h | |
| 2 | + * arch/arm/mach-ixp23xx/include/mach/vmalloc.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (c) 2005 MontaVista Software, Inc. |
| 5 | 5 | * |
| @@ -34,7 +34,7 @@ · 33 unmodified lines | ||
| 34 | 34 | #include <asm/types.h> |
| 35 | 35 | #include <asm/setup.h> |
| 36 | 36 | #include <asm/memory.h> |
| 37 | −#include <asm/hardware.h> | |
| 37 | +#include <mach/hardware.h> | |
| 38 | 38 | #include <asm/mach-types.h> |
| 39 | 39 | #include <asm/system.h> |
| 40 | 40 | #include <asm/tlbflush.h> |
| @@ -31,8 +31,7 @@ · 30 unmodified lines | ||
| 31 | 31 | #include <asm/sizes.h> |
| 32 | 32 | #include <asm/system.h> |
| 33 | 33 | #include <asm/mach/pci.h> |
| 34 | −#include <asm/mach-types.h> | |
| 35 | −#include <asm/hardware.h> | |
| 34 | +#include <mach/hardware.h> | |
| 36 | 35 | |
| 37 | 36 | extern int (*external_fault) (unsigned long, struct pt_regs *); |
| 38 | 37 | |
| @@ -33,7 +33,7 @@ · 32 unmodified lines | ||
| 33 | 33 | #include <asm/types.h> |
| 34 | 34 | #include <asm/setup.h> |
| 35 | 35 | #include <asm/memory.h> |
| 36 | −#include <asm/hardware.h> | |
| 36 | +#include <mach/hardware.h> | |
| 37 | 37 | #include <asm/mach-types.h> |
| 38 | 38 | #include <asm/irq.h> |
| 39 | 39 | #include <asm/system.h> |
| @@ -25,7 +25,7 @@ · 24 unmodified lines | ||
| 25 | 25 | |
| 26 | 26 | #include <asm/mach/pci.h> |
| 27 | 27 | #include <asm/irq.h> |
| 28 | −#include <asm/hardware.h> | |
| 28 | +#include <mach/hardware.h> | |
| 29 | 29 | #include <asm/mach-types.h> |
| 30 | 30 | |
| 31 | 31 | void __init avila_pci_preinit(void) |
| @@ -23,7 +23,7 @@ · 22 unmodified lines | ||
| 23 | 23 | #include <asm/types.h> |
| 24 | 24 | #include <asm/setup.h> |
| 25 | 25 | #include <asm/memory.h> |
| 26 | −#include <asm/hardware.h> | |
| 26 | +#include <mach/hardware.h> | |
| 27 | 27 | #include <asm/mach-types.h> |
| 28 | 28 | #include <asm/irq.h> |
| 29 | 29 | #include <asm/mach/arch.h> |
| @@ -32,7 +32,7 @@ · 31 unmodified lines | ||
| 32 | 32 | #include <asm/sizes.h> |
| 33 | 33 | #include <asm/system.h> |
| 34 | 34 | #include <asm/mach/pci.h> |
| 35 | −#include <asm/hardware.h> | |
| 35 | +#include <mach/hardware.h> | |
| 36 | 36 | |
| 37 | 37 | |
| 38 | 38 | /* |
| @@ -29,8 +29,8 @@ · 28 unmodified lines | ||
| 29 | 29 | #include <linux/clocksource.h> |
| 30 | 30 | #include <linux/clockchips.h> |
| 31 | 31 | |
| 32 | −#include <asm/arch/udc.h> | |
| 33 | −#include <asm/hardware.h> | |
| 32 | +#include <mach/udc.h> | |
| 33 | +#include <mach/hardware.h> | |
| 34 | 34 | #include <asm/uaccess.h> |
| 35 | 35 | #include <asm/io.h> |
| 36 | 36 | #include <asm/pgtable.h> |
| @@ -20,7 +20,7 @@ · 19 unmodified lines | ||
| 20 | 20 | #include <linux/irq.h> |
| 21 | 21 | |
| 22 | 22 | #include <asm/mach-types.h> |
| 23 | −#include <asm/hardware.h> | |
| 23 | +#include <mach/hardware.h> | |
| 24 | 24 | #include <asm/irq.h> |
| 25 | 25 | |
| 26 | 26 | #include <asm/mach/pci.h> |
| @@ -19,7 +19,7 @@ · 18 unmodified lines | ||
| 19 | 19 | #include <asm/types.h> |
| 20 | 20 | #include <asm/setup.h> |
| 21 | 21 | #include <asm/memory.h> |
| 22 | −#include <asm/hardware.h> | |
| 22 | +#include <mach/hardware.h> | |
| 23 | 23 | #include <asm/irq.h> |
| 24 | 24 | #include <asm/mach-types.h> |
| 25 | 25 | #include <asm/mach/arch.h> |
| @@ -64,7 +64,7 @@ static struct platform_device fsg_i2c_gpio = { · 63 unmodified lines | ||
| 64 | 64 | |
| 65 | 65 | static struct i2c_board_info __initdata fsg_i2c_board_info [] = { |
| 66 | 66 | { |
| 67 | − I2C_BOARD_INFO("rtc-isl1208", 0x6f), | |
| 67 | + I2C_BOARD_INFO("isl1208", 0x6f), | |
| 68 | 68 | }, |
| 69 | 69 | }; |
| 70 | 70 | |
| @@ -179,7 +179,6 @@ static void __init fsg_init(void) · 108 unmodified lines | ||
| 179 | 179 | { |
| 180 | 180 | DECLARE_MAC_BUF(mac_buf); |
| 181 | 181 | uint8_t __iomem *f; |
| 182 | − int i; | |
| 183 | 182 | |
| 184 | 183 | ixp4xx_sys_init(); |
| 185 | 184 | |
| @@ -228,6 +227,7 @@ static void __init fsg_init(void) · 42 unmodified lines | ||
| 228 | 227 | f = ioremap(IXP4XX_EXP_BUS_BASE(0), 0x400000); |
| 229 | 228 | if (f) { |
| 230 | 229 | #ifdef __ARMEB__ |
| 230 | + int i; | |
| 231 | 231 | for (i = 0; i < 6; i++) { |
| 232 | 232 | fsg_plat_eth[0].hwaddr[i] = readb(f + 0x3C0422 + i); |
| 233 | 233 | fsg_plat_eth[1].hwaddr[i] = readb(f + 0x3C043B + i); |
| @@ -23,7 +23,7 @@ · 22 unmodified lines | ||
| 23 | 23 | #include <linux/irq.h> |
| 24 | 24 | |
| 25 | 25 | #include <asm/mach-types.h> |
| 26 | −#include <asm/hardware.h> | |
| 26 | +#include <mach/hardware.h> | |
| 27 | 27 | |
| 28 | 28 | #include <asm/mach/pci.h> |
| 29 | 29 | |
| @@ -22,7 +22,7 @@ · 21 unmodified lines | ||
| 22 | 22 | #include <asm/types.h> |
| 23 | 23 | #include <asm/setup.h> |
| 24 | 24 | #include <asm/memory.h> |
| 25 | −#include <asm/hardware.h> | |
| 25 | +#include <mach/hardware.h> | |
| 26 | 26 | #include <asm/irq.h> |
| 27 | 27 | #include <asm/mach-types.h> |
| 28 | 28 | #include <asm/mach/arch.h> |
| @@ -28,8 +28,8 @@ · 27 unmodified lines | ||
| 28 | 28 | #include <linux/irq.h> |
| 29 | 29 | |
| 30 | 30 | #include <asm/mach-types.h> |
| 31 | −#include <asm/hardware.h> | |
| 32 | −#include <asm/arch/gtwx5715.h> | |
| 31 | +#include <mach/hardware.h> | |
| 32 | +#include <mach/gtwx5715.h> | |
| 33 | 33 | #include <asm/mach/pci.h> |
| 34 | 34 | |
| 35 | 35 | /* |
| @@ -32,12 +32,12 @@ · 31 unmodified lines | ||
| 32 | 32 | #include <asm/types.h> |
| 33 | 33 | #include <asm/setup.h> |
| 34 | 34 | #include <asm/memory.h> |
| 35 | −#include <asm/hardware.h> | |
| 35 | +#include <mach/hardware.h> | |
| 36 | 36 | #include <asm/irq.h> |
| 37 | 37 | #include <asm/mach-types.h> |
| 38 | 38 | #include <asm/mach/arch.h> |
| 39 | 39 | #include <asm/mach/flash.h> |
| 40 | −#include <asm/arch/gtwx5715.h> | |
| 40 | +#include <mach/gtwx5715.h> | |
| 41 | 41 | |
| 42 | 42 | /* |
| 43 | 43 | * Xscale UART registers are 32 bits wide with only the least |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-ixp4xx/avila.h | |
| 2 | + * arch/arm/mach-ixp4xx/include/mach/avila.h | |
| 3 | 3 | * |
| 4 | 4 | * Gateworks Avila platform specific definitions |
| 5 | 5 | * |
| @@ -16,7 +16,7 @@ · 10 unmodified lines | ||
| 16 | 16 | */ |
| 17 | 17 | |
| 18 | 18 | #ifndef __ASM_ARCH_HARDWARE_H__ |
| 19 | −#error "Do not include this directly, instead #include <asm/hardware.h>" | |
| 19 | +#error "Do not include this directly, instead #include <mach/hardware.h>" | |
| 20 | 20 | #endif |
| 21 | 21 | |
| 22 | 22 | #define AVILA_SDA_PIN 7 |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-ixp4xx/coyote.h | |
| 2 | + * arch/arm/mach-ixp4xx/include/mach/coyote.h | |
| 3 | 3 | * |
| 4 | 4 | * ADI Engineering platform specific definitions |
| 5 | 5 | * |
| @@ -13,7 +13,7 @@ · 7 unmodified lines | ||
| 13 | 13 | */ |
| 14 | 14 | |
| 15 | 15 | #ifndef __ASM_ARCH_HARDWARE_H__ |
| 16 | −#error "Do not include this directly, instead #include <asm/hardware.h>" | |
| 16 | +#error "Do not include this directly, instead #include <mach/hardware.h>" | |
| 17 | 17 | #endif |
| 18 | 18 | |
| 19 | 19 | /* PCI controller GPIO to IRQ pin mappings */ |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-ixp4xx/cpu.h | |
| 2 | + * arch/arm/mach-ixp4xx/include/mach/cpu.h | |
| 3 | 3 | * |
| 4 | 4 | * IXP4XX cpu type detection |
| 5 | 5 | * |
| @@ -1,4 +1,4 @@ | ||
| 1 | −/* linux/include/asm-arm/arch-ixp4xx/debug-macro.S | |
| 1 | +/* arch/arm/mach-ixp4xx/include/mach/debug-macro.S | |
| 2 | 2 | * |
| 3 | 3 | * Debugging macro include header |
| 4 | 4 | * |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-ixp4xx/dma.h | |
| 2 | + * arch/arm/mach-ixp4xx/include/mach/dma.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 2001-2004 MontaVista Software, Inc. |
| 5 | 5 | * |
| @@ -14,7 +14,7 @@ · 8 unmodified lines | ||
| 14 | 14 | #include <linux/device.h> |
| 15 | 15 | #include <asm/page.h> |
| 16 | 16 | #include <asm/sizes.h> |
| 17 | −#include <asm/hardware.h> | |
| 17 | +#include <mach/hardware.h> | |
| 18 | 18 | |
| 19 | 19 | #define MAX_DMA_ADDRESS (PAGE_OFFSET + SZ_64M) |
| 20 | 20 | |
| @@ -13,7 +13,7 @@ · 12 unmodified lines | ||
| 13 | 13 | */ |
| 14 | 14 | |
| 15 | 15 | #ifndef __ASM_ARCH_HARDWARE_H__ |
| 16 | −#error "Do not include this directly, instead #include <asm/hardware.h>" | |
| 16 | +#error "Do not include this directly, instead #include <mach/hardware.h>" | |
| 17 | 17 | #endif |
| 18 | 18 | |
| 19 | 19 | #define DSMG600_SDA_PIN 5 |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-ixp4xx/entry-macro.S | |
| 2 | + * arch/arm/mach-ixp4xx/include/mach/entry-macro.S | |
| 3 | 3 | * |
| 4 | 4 | * Low-level IRQ helper macros for IXP4xx-based platforms |
| 5 | 5 | * |
| @@ -7,7 +7,7 @@ · 1 unmodified line | ||
| 7 | 7 | * License version 2. This program is licensed "as is" without any |
| 8 | 8 | * warranty of any kind, whether express or implied. |
| 9 | 9 | */ |
| 10 | −#include <asm/hardware.h> | |
| 10 | +#include <mach/hardware.h> | |
| 11 | 11 | |
| 12 | 12 | .macro disable_fiq |
| 13 | 13 | .endm |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-ixp4xx/fsg.h | |
| 2 | + * arch/arm/mach-ixp4xx/include/mach/fsg.h | |
| 3 | 3 | * |
| 4 | 4 | * Freecom FSG-3 platform specific definitions |
| 5 | 5 | * |
| @@ -16,7 +16,7 @@ · 10 unmodified lines | ||
| 16 | 16 | */ |
| 17 | 17 | |
| 18 | 18 | #ifndef __ASM_ARCH_HARDWARE_H__ |
| 19 | −#error "Do not include this directly, instead #include <asm/hardware.h>" | |
| 19 | +#error "Do not include this directly, instead #include <mach/hardware.h>" | |
| 20 | 20 | #endif |
| 21 | 21 | |
| 22 | 22 | #define FSG_SDA_PIN 12 |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-ixp4xx/gpio.h | |
| 2 | + * arch/arm/mach-ixp4xx/include/mach/gpio.h | |
| 3 | 3 | * |
| 4 | 4 | * IXP4XX GPIO wrappers for arch-neutral GPIO calls |
| 5 | 5 | * |
| @@ -25,7 +25,7 @@ · 19 unmodified lines | ||
| 25 | 25 | #ifndef __ASM_ARCH_IXP4XX_GPIO_H |
| 26 | 26 | #define __ASM_ARCH_IXP4XX_GPIO_H |
| 27 | 27 | |
| 28 | −#include <asm/hardware.h> | |
| 28 | +#include <mach/hardware.h> | |
| 29 | 29 | |
| 30 | 30 | static inline int gpio_request(unsigned gpio, const char *label) |
| 31 | 31 | { |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-ixp4xx/gtwx5715.h | |
| 2 | + * arch/arm/mach-ixp4xx/include/mach/gtwx5715.h | |
| 3 | 3 | * |
| 4 | 4 | * Gemtek GTWX5715 Gateway (Linksys WRV54G) |
| 5 | 5 | * |
| @@ -21,7 +21,7 @@ · 15 unmodified lines | ||
| 21 | 21 | */ |
| 22 | 22 | |
| 23 | 23 | #ifndef __ASM_ARCH_HARDWARE_H__ |
| 24 | −#error "Do not include this directly, instead #include <asm/hardware.h>" | |
| 24 | +#error "Do not include this directly, instead #include <mach/hardware.h>" | |
| 25 | 25 | #endif |
| 26 | 26 | #include "irqs.h" |
| 27 | 27 | |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-ixp4xx/hardware.h | |
| 2 | + * arch/arm/mach-ixp4xx/include/mach/hardware.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 2002 Intel Corporation. |
| 5 | 5 | * Copyright (C) 2003-2004 MontaVista Software, Inc. |
| @@ -31,7 +31,7 @@ · 25 unmodified lines | ||
| 31 | 31 | #include "ixp4xx-regs.h" |
| 32 | 32 | |
| 33 | 33 | #ifndef __ASSEMBLER__ |
| 34 | −#include <asm/arch/cpu.h> | |
| 34 | +#include <mach/cpu.h> | |
| 35 | 35 | #endif |
| 36 | 36 | |
| 37 | 37 | /* Platform helper functions and definitions */ |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-ixp4xx/io.h | |
| 2 | + * arch/arm/mach-ixp4xx/include/mach/io.h | |
| 3 | 3 | * |
| 4 | 4 | * Author: Deepak Saxena <dsaxena@plexity.net> |
| 5 | 5 | * |
| @@ -15,7 +15,7 @@ · 9 unmodified lines | ||
| 15 | 15 | |
| 16 | 16 | #include <linux/bitops.h> |
| 17 | 17 | |
| 18 | −#include <asm/hardware.h> | |
| 18 | +#include <mach/hardware.h> | |
| 19 | 19 | |
| 20 | 20 | #define IO_SPACE_LIMIT 0xffff0000 |
| 21 | 21 | |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-ixp4xx/irqs.h | |
| 2 | + * arch/arm/mach-ixp4xx/include/mach/irqs.h | |
| 3 | 3 | * |
| 4 | 4 | * IRQ definitions for IXP4XX based systems |
| 5 | 5 | * |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-ixp4xx/ixdp425.h | |
| 2 | + * arch/arm/mach-ixp4xx/include/mach/ixdp425.h | |
| 3 | 3 | * |
| 4 | 4 | * IXDP425 platform specific definitions |
| 5 | 5 | * |
| @@ -13,7 +13,7 @@ · 7 unmodified lines | ||
| 13 | 13 | */ |
| 14 | 14 | |
| 15 | 15 | #ifndef __ASM_ARCH_HARDWARE_H__ |
| 16 | −#error "Do not include this directly, instead #include <asm/hardware.h>" | |
| 16 | +#error "Do not include this directly, instead #include <mach/hardware.h>" | |
| 17 | 17 | #endif |
| 18 | 18 | |
| 19 | 19 | #define IXDP425_SDA_PIN 7 |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-ixp4xx/ixp4xx-regs.h | |
| 2 | + * arch/arm/mach-ixp4xx/include/mach/ixp4xx-regs.h | |
| 3 | 3 | * |
| 4 | 4 | * Register definitions for IXP4xx chipset. This file contains |
| 5 | 5 | * register location and bit definitions only. Platform specific |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-ixp4xx/memory.h | |
| 2 | + * arch/arm/mach-ixp4xx/include/mach/memory.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (c) 2001-2004 MontaVista Software, Inc. |
| 5 | 5 | */ |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-ixp4xx/nas100d.h | |
| 2 | + * arch/arm/mach-ixp4xx/include/mach/nas100d.h | |
| 3 | 3 | * |
| 4 | 4 | * NAS100D platform specific definitions |
| 5 | 5 | * |
| @@ -16,7 +16,7 @@ · 10 unmodified lines | ||
| 16 | 16 | */ |
| 17 | 17 | |
| 18 | 18 | #ifndef __ASM_ARCH_HARDWARE_H__ |
| 19 | −#error "Do not include this directly, instead #include <asm/hardware.h>" | |
| 19 | +#error "Do not include this directly, instead #include <mach/hardware.h>" | |
| 20 | 20 | #endif |
| 21 | 21 | |
| 22 | 22 | #define NAS100D_SDA_PIN 5 |
File renamed without changes.
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-ixp4xx/nslu2.h | |
| 2 | + * arch/arm/mach-ixp4xx/include/mach/nslu2.h | |
| 3 | 3 | * |
| 4 | 4 | * NSLU2 platform specific definitions |
| 5 | 5 | * |
| @@ -15,7 +15,7 @@ · 9 unmodified lines | ||
| 15 | 15 | */ |
| 16 | 16 | |
| 17 | 17 | #ifndef __ASM_ARCH_HARDWARE_H__ |
| 18 | −#error "Do not include this directly, instead #include <asm/hardware.h>" | |
| 18 | +#error "Do not include this directly, instead #include <mach/hardware.h>" | |
| 19 | 19 | #endif |
| 20 | 20 | |
| 21 | 21 | #define NSLU2_SDA_PIN 7 |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-ixp4xx/platform.h | |
| 2 | + * arch/arm/mach-ixp4xx/include/mach/platform.h | |
| 3 | 3 | * |
| 4 | 4 | * Constants and functions that are useful to IXP4xx platform-specific code |
| 5 | 5 | * and device drivers. |
| @@ -8,7 +8,7 @@ · 2 unmodified lines | ||
| 8 | 8 | */ |
| 9 | 9 | |
| 10 | 10 | #ifndef __ASM_ARCH_HARDWARE_H__ |
| 11 | −#error "Do not include this directly, instead #include <asm/hardware.h>" | |
| 11 | +#error "Do not include this directly, instead #include <mach/hardware.h>" | |
| 12 | 12 | #endif |
| 13 | 13 | |
| 14 | 14 | #ifndef __ASSEMBLY__ |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-ixp4xx/prpmc1100.h | |
| 2 | + * arch/arm/mach-ixp4xx/include/mach/prpmc1100.h | |
| 3 | 3 | * |
| 4 | 4 | * Motorolla PrPMC1100 platform specific definitions |
| 5 | 5 | * |
| @@ -13,7 +13,7 @@ · 7 unmodified lines | ||
| 13 | 13 | */ |
| 14 | 14 | |
| 15 | 15 | #ifndef __ASM_ARCH_HARDWARE_H__ |
| 16 | −#error "Do not include this directly, instead #include <asm/hardware.h>" | |
| 16 | +#error "Do not include this directly, instead #include <mach/hardware.h>" | |
| 17 | 17 | #endif |
| 18 | 18 | |
| 19 | 19 | #define PRPMC1100_FLASH_BASE IXP4XX_EXP_BUS_CS0_BASE_PHYS |
File renamed without changes.
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-ixp4xx/system.h | |
| 2 | + * arch/arm/mach-ixp4xx/include/mach/system.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 2002 Intel Corporation. |
| 5 | 5 | * |
| @@ -9,7 +9,7 @@ · 3 unmodified lines | ||
| 9 | 9 | * |
| 10 | 10 | */ |
| 11 | 11 | |
| 12 | −#include <asm/hardware.h> | |
| 12 | +#include <mach/hardware.h> | |
| 13 | 13 | |
| 14 | 14 | static inline void arch_idle(void) |
| 15 | 15 | { |
| @@ -1,9 +1,9 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-ixp4xx/timex.h | |
| 2 | + * arch/arm/mach-ixp4xx/include/mach/timex.h | |
| 3 | 3 | * |
| 4 | 4 | */ |
| 5 | 5 | |
| 6 | −#include <asm/hardware.h> | |
| 6 | +#include <mach/hardware.h> | |
| 7 | 7 | |
| 8 | 8 | /* |
| 9 | 9 | * We use IXP425 General purpose timer for our timer needs, it runs at |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-ixp4xx/udc.h | |
| 2 | + * arch/arm/mach-ixp4xx/include/mach/udc.h | |
| 3 | 3 | * |
| 4 | 4 | */ |
| 5 | 5 | #include <asm/mach/udc_pxa2xx.h> |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-ixp4xx/uncompress.h | |
| 2 | + * arch/arm/mach-ixp4xx/include/mach/uncompress.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 2002 Intel Corporation. |
| 5 | 5 | * Copyright (C) 2003-2004 MontaVista Software, Inc. |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-ixp4xx/vmalloc.h | |
| 2 | + * arch/arm/mach-ixp4xx/include/mach/vmalloc.h | |
| 3 | 3 | */ |
| 4 | 4 | #define VMALLOC_END (0xFF000000) |
| 5 | 5 | |
| @@ -22,7 +22,7 @@ · 21 unmodified lines | ||
| 22 | 22 | |
| 23 | 23 | #include <asm/mach/pci.h> |
| 24 | 24 | #include <asm/irq.h> |
| 25 | −#include <asm/hardware.h> | |
| 25 | +#include <mach/hardware.h> | |
| 26 | 26 | #include <asm/mach-types.h> |
| 27 | 27 | |
| 28 | 28 | void __init ixdp425_pci_preinit(void) |
| @@ -24,7 +24,7 @@ · 23 unmodified lines | ||
| 24 | 24 | #include <asm/types.h> |
| 25 | 25 | #include <asm/setup.h> |
| 26 | 26 | #include <asm/memory.h> |
| 27 | −#include <asm/hardware.h> | |
| 27 | +#include <mach/hardware.h> | |
| 28 | 28 | #include <asm/mach-types.h> |
| 29 | 29 | #include <asm/irq.h> |
| 30 | 30 | #include <asm/mach/arch.h> |
| @@ -19,7 +19,7 @@ · 18 unmodified lines | ||
| 19 | 19 | #include <linux/irq.h> |
| 20 | 20 | |
| 21 | 21 | #include <asm/mach-types.h> |
| 22 | −#include <asm/hardware.h> | |
| 22 | +#include <mach/hardware.h> | |
| 23 | 23 | |
| 24 | 24 | #include <asm/mach/pci.h> |
| 25 | 25 | |
| @@ -21,7 +21,7 @@ · 20 unmodified lines | ||
| 21 | 21 | #include <linux/kernel.h> |
| 22 | 22 | #include <linux/module.h> |
| 23 | 23 | #include <linux/slab.h> |
| 24 | −#include <asm/arch/npe.h> | |
| 24 | +#include <mach/npe.h> | |
| 25 | 25 | |
| 26 | 26 | #define DEBUG_MSG 0 |
| 27 | 27 | #define DEBUG_FW 0 |
| @@ -12,7 +12,7 @@ · 11 unmodified lines | ||
| 12 | 12 | #include <linux/interrupt.h> |
| 13 | 13 | #include <linux/kernel.h> |
| 14 | 14 | #include <linux/module.h> |
| 15 | −#include <asm/arch/qmgr.h> | |
| 15 | +#include <mach/qmgr.h> | |
| 16 | 16 | |
| 17 | 17 | #define DEBUG 0 |
| 18 | 18 | |
| @@ -23,7 +23,7 @@ · 22 unmodified lines | ||
| 23 | 23 | #include <linux/irq.h> |
| 24 | 24 | |
| 25 | 25 | #include <asm/mach-types.h> |
| 26 | −#include <asm/hardware.h> | |
| 26 | +#include <mach/hardware.h> | |
| 27 | 27 | |
| 28 | 28 | #include <asm/mach/pci.h> |
| 29 | 29 | |
| @@ -23,7 +23,7 @@ · 22 unmodified lines | ||
| 23 | 23 | #include <asm/types.h> |
| 24 | 24 | #include <asm/setup.h> |
| 25 | 25 | #include <asm/memory.h> |
| 26 | −#include <asm/hardware.h> | |
| 26 | +#include <mach/hardware.h> | |
| 27 | 27 | #include <asm/irq.h> |
| 28 | 28 | #include <asm/mach-types.h> |
| 29 | 29 | #include <asm/mach/arch.h> |
| @@ -12,7 +12,7 @@ · 11 unmodified lines | ||
| 12 | 12 | #include <linux/init.h> |
| 13 | 13 | #include <linux/mbus.h> |
| 14 | 14 | #include <linux/io.h> |
| 15 | −#include <asm/hardware.h> | |
| 15 | +#include <mach/hardware.h> | |
| 16 | 16 | #include "common.h" |
| 17 | 17 | |
| 18 | 18 | /* |
| @@ -15,15 +15,17 @@ · 14 unmodified lines | ||
| 15 | 15 | #include <linux/mbus.h> |
| 16 | 16 | #include <linux/mv643xx_eth.h> |
| 17 | 17 | #include <linux/ata_platform.h> |
| 18 | +#include <linux/spi/orion_spi.h> | |
| 18 | 19 | #include <asm/page.h> |
| 19 | 20 | #include <asm/timex.h> |
| 20 | 21 | #include <asm/mach/map.h> |
| 21 | 22 | #include <asm/mach/time.h> |
| 22 | −#include <asm/arch/kirkwood.h> | |
| 23 | −#include <asm/plat-orion/cache-feroceon-l2.h> | |
| 24 | −#include <asm/plat-orion/ehci-orion.h> | |
| 25 | −#include <asm/plat-orion/orion_nand.h> | |
| 26 | −#include <asm/plat-orion/time.h> | |
| 23 | +#include <mach/kirkwood.h> | |
| 24 | +#include <plat/cache-feroceon-l2.h> | |
| 25 | +#include <plat/ehci-orion.h> | |
| 26 | +#include <plat/mv_xor.h> | |
| 27 | +#include <plat/orion_nand.h> | |
| 28 | +#include <plat/time.h> | |
| 27 | 29 | #include "common.h" |
| 28 | 30 | |
| 29 | 31 | /***************************************************************************** |
| @@ -195,6 +197,37 @@ void __init kirkwood_sata_init(struct mv_sata_platform_data *sata_data) · 165 unmodified lines | ||
| 195 | 197 | } |
| 196 | 198 | |
| 197 | 199 | |
| 200 | +/***************************************************************************** | |
| 201 | + * SPI | |
| 202 | + ****************************************************************************/ | |
| 203 | +static struct orion_spi_info kirkwood_spi_plat_data = { | |
| 204 | + .tclk = KIRKWOOD_TCLK, | |
| 205 | +}; | |
| 206 | + | |
| 207 | +static struct resource kirkwood_spi_resources[] = { | |
| 208 | + { | |
| 209 | + .start = SPI_PHYS_BASE, | |
| 210 | + .end = SPI_PHYS_BASE + SZ_512 - 1, | |
| 211 | + .flags = IORESOURCE_MEM, | |
| 212 | + }, | |
| 213 | +}; | |
| 214 | + | |
| 215 | +static struct platform_device kirkwood_spi = { | |
| 216 | + .name = "orion_spi", | |
| 217 | + .id = 0, | |
| 218 | + .resource = kirkwood_spi_resources, | |
| 219 | + .dev = { | |
| 220 | + .platform_data = &kirkwood_spi_plat_data, | |
| 221 | + }, | |
| 222 | + .num_resources = ARRAY_SIZE(kirkwood_spi_resources), | |
| 223 | +}; | |
| 224 | + | |
| 225 | +void __init kirkwood_spi_init() | |
| 226 | +{ | |
| 227 | + platform_device_register(&kirkwood_spi); | |
| 228 | +} | |
| 229 | + | |
| 230 | + | |
| 198 | 231 | /***************************************************************************** |
| 199 | 232 | * UART0 |
| 200 | 233 | ****************************************************************************/ |
| @@ -283,6 +316,212 @@ void __init kirkwood_uart1_init(void) · 82 unmodified lines | ||
| 283 | 316 | } |
| 284 | 317 | |
| 285 | 318 | |
| 319 | +/***************************************************************************** | |
| 320 | + * XOR | |
| 321 | + ****************************************************************************/ | |
| 322 | +static struct mv_xor_platform_shared_data kirkwood_xor_shared_data = { | |
| 323 | + .dram = &kirkwood_mbus_dram_info, | |
| 324 | +}; | |
| 325 | + | |
| 326 | +static u64 kirkwood_xor_dmamask = DMA_32BIT_MASK; | |
| 327 | + | |
| 328 | + | |
| 329 | +/***************************************************************************** | |
| 330 | + * XOR0 | |
| 331 | + ****************************************************************************/ | |
| 332 | +static struct resource kirkwood_xor0_shared_resources[] = { | |
| 333 | + { | |
| 334 | + .name = "xor 0 low", | |
| 335 | + .start = XOR0_PHYS_BASE, | |
| 336 | + .end = XOR0_PHYS_BASE + 0xff, | |
| 337 | + .flags = IORESOURCE_MEM, | |
| 338 | + }, { | |
| 339 | + .name = "xor 0 high", | |
| 340 | + .start = XOR0_HIGH_PHYS_BASE, | |
| 341 | + .end = XOR0_HIGH_PHYS_BASE + 0xff, | |
| 342 | + .flags = IORESOURCE_MEM, | |
| 343 | + }, | |
| 344 | +}; | |
| 345 | + | |
| 346 | +static struct platform_device kirkwood_xor0_shared = { | |
| 347 | + .name = MV_XOR_SHARED_NAME, | |
| 348 | + .id = 0, | |
| 349 | + .dev = { | |
| 350 | + .platform_data = &kirkwood_xor_shared_data, | |
| 351 | + }, | |
| 352 | + .num_resources = ARRAY_SIZE(kirkwood_xor0_shared_resources), | |
| 353 | + .resource = kirkwood_xor0_shared_resources, | |
| 354 | +}; | |
| 355 | + | |
| 356 | +static struct resource kirkwood_xor00_resources[] = { | |
| 357 | + [0] = { | |
| 358 | + .start = IRQ_KIRKWOOD_XOR_00, | |
| 359 | + .end = IRQ_KIRKWOOD_XOR_00, | |
| 360 | + .flags = IORESOURCE_IRQ, | |
| 361 | + }, | |
| 362 | +}; | |
| 363 | + | |
| 364 | +static struct mv_xor_platform_data kirkwood_xor00_data = { | |
| 365 | + .shared = &kirkwood_xor0_shared, | |
| 366 | + .hw_id = 0, | |
| 367 | + .pool_size = PAGE_SIZE, | |
| 368 | +}; | |
| 369 | + | |
| 370 | +static struct platform_device kirkwood_xor00_channel = { | |
| 371 | + .name = MV_XOR_NAME, | |
| 372 | + .id = 0, | |
| 373 | + .num_resources = ARRAY_SIZE(kirkwood_xor00_resources), | |
| 374 | + .resource = kirkwood_xor00_resources, | |
| 375 | + .dev = { | |
| 376 | + .dma_mask = &kirkwood_xor_dmamask, | |
| 377 | + .coherent_dma_mask = DMA_64BIT_MASK, | |
| 378 | + .platform_data = (void *)&kirkwood_xor00_data, | |
| 379 | + }, | |
| 380 | +}; | |
| 381 | + | |
| 382 | +static struct resource kirkwood_xor01_resources[] = { | |
| 383 | + [0] = { | |
| 384 | + .start = IRQ_KIRKWOOD_XOR_01, | |
| 385 | + .end = IRQ_KIRKWOOD_XOR_01, | |
| 386 | + .flags = IORESOURCE_IRQ, | |
| 387 | + }, | |
| 388 | +}; | |
| 389 | + | |
| 390 | +static struct mv_xor_platform_data kirkwood_xor01_data = { | |
| 391 | + .shared = &kirkwood_xor0_shared, | |
| 392 | + .hw_id = 1, | |
| 393 | + .pool_size = PAGE_SIZE, | |
| 394 | +}; | |
| 395 | + | |
| 396 | +static struct platform_device kirkwood_xor01_channel = { | |
| 397 | + .name = MV_XOR_NAME, | |
| 398 | + .id = 1, | |
| 399 | + .num_resources = ARRAY_SIZE(kirkwood_xor01_resources), | |
| 400 | + .resource = kirkwood_xor01_resources, | |
| 401 | + .dev = { | |
| 402 | + .dma_mask = &kirkwood_xor_dmamask, | |
| 403 | + .coherent_dma_mask = DMA_64BIT_MASK, | |
| 404 | + .platform_data = (void *)&kirkwood_xor01_data, | |
| 405 | + }, | |
| 406 | +}; | |
| 407 | + | |
| 408 | +void __init kirkwood_xor0_init(void) | |
| 409 | +{ | |
| 410 | + platform_device_register(&kirkwood_xor0_shared); | |
| 411 | + | |
| 412 | + /* | |
| 413 | + * two engines can't do memset simultaneously, this limitation | |
| 414 | + * satisfied by removing memset support from one of the engines. | |
| 415 | + */ | |
| 416 | + dma_cap_set(DMA_MEMCPY, kirkwood_xor00_data.cap_mask); | |
| 417 | + dma_cap_set(DMA_XOR, kirkwood_xor00_data.cap_mask); | |
| 418 | + platform_device_register(&kirkwood_xor00_channel); | |
| 419 | + | |
| 420 | + dma_cap_set(DMA_MEMCPY, kirkwood_xor01_data.cap_mask); | |
| 421 | + dma_cap_set(DMA_MEMSET, kirkwood_xor01_data.cap_mask); | |
| 422 | + dma_cap_set(DMA_XOR, kirkwood_xor01_data.cap_mask); | |
| 423 | + platform_device_register(&kirkwood_xor01_channel); | |
| 424 | +} | |
| 425 | + | |
| 426 | + | |
| 427 | +/***************************************************************************** | |
| 428 | + * XOR1 | |
| 429 | + ****************************************************************************/ | |
| 430 | +static struct resource kirkwood_xor1_shared_resources[] = { | |
| 431 | + { | |
| 432 | + .name = "xor 1 low", | |
| 433 | + .start = XOR1_PHYS_BASE, | |
| 434 | + .end = XOR1_PHYS_BASE + 0xff, | |
| 435 | + .flags = IORESOURCE_MEM, | |
| 436 | + }, { | |
| 437 | + .name = "xor 1 high", | |
| 438 | + .start = XOR1_HIGH_PHYS_BASE, | |
| 439 | + .end = XOR1_HIGH_PHYS_BASE + 0xff, | |
| 440 | + .flags = IORESOURCE_MEM, | |
| 441 | + }, | |
| 442 | +}; | |
| 443 | + | |
| 444 | +static struct platform_device kirkwood_xor1_shared = { | |
| 445 | + .name = MV_XOR_SHARED_NAME, | |
| 446 | + .id = 1, | |
| 447 | + .dev = { | |
| 448 | + .platform_data = &kirkwood_xor_shared_data, | |
| 449 | + }, | |
| 450 | + .num_resources = ARRAY_SIZE(kirkwood_xor1_shared_resources), | |
| 451 | + .resource = kirkwood_xor1_shared_resources, | |
| 452 | +}; | |
| 453 | + | |
| 454 | +static struct resource kirkwood_xor10_resources[] = { | |
| 455 | + [0] = { | |
| 456 | + .start = IRQ_KIRKWOOD_XOR_10, | |
| 457 | + .end = IRQ_KIRKWOOD_XOR_10, | |
| 458 | + .flags = IORESOURCE_IRQ, | |
| 459 | + }, | |
| 460 | +}; | |
| 461 | + | |
| 462 | +static struct mv_xor_platform_data kirkwood_xor10_data = { | |
| 463 | + .shared = &kirkwood_xor1_shared, | |
| 464 | + .hw_id = 0, | |
| 465 | + .pool_size = PAGE_SIZE, | |
| 466 | +}; | |
| 467 | + | |
| 468 | +static struct platform_device kirkwood_xor10_channel = { | |
| 469 | + .name = MV_XOR_NAME, | |
| 470 | + .id = 2, | |
| 471 | + .num_resources = ARRAY_SIZE(kirkwood_xor10_resources), | |
| 472 | + .resource = kirkwood_xor10_resources, | |
| 473 | + .dev = { | |
| 474 | + .dma_mask = &kirkwood_xor_dmamask, | |
| 475 | + .coherent_dma_mask = DMA_64BIT_MASK, | |
| 476 | + .platform_data = (void *)&kirkwood_xor10_data, | |
| 477 | + }, | |
| 478 | +}; | |
| 479 | + | |
| 480 | +static struct resource kirkwood_xor11_resources[] = { | |
| 481 | + [0] = { | |
| 482 | + .start = IRQ_KIRKWOOD_XOR_11, | |
| 483 | + .end = IRQ_KIRKWOOD_XOR_11, | |
| 484 | + .flags = IORESOURCE_IRQ, | |
| 485 | + }, | |
| 486 | +}; | |
| 487 | + | |
| 488 | +static struct mv_xor_platform_data kirkwood_xor11_data = { | |
| 489 | + .shared = &kirkwood_xor1_shared, | |
| 490 | + .hw_id = 1, | |
| 491 | + .pool_size = PAGE_SIZE, | |
| 492 | +}; | |
| 493 | + | |
| 494 | +static struct platform_device kirkwood_xor11_channel = { | |
| 495 | + .name = MV_XOR_NAME, | |
| 496 | + .id = 3, | |
| 497 | + .num_resources = ARRAY_SIZE(kirkwood_xor11_resources), | |
| 498 | + .resource = kirkwood_xor11_resources, | |
| 499 | + .dev = { | |
| 500 | + .dma_mask = &kirkwood_xor_dmamask, | |
| 501 | + .coherent_dma_mask = DMA_64BIT_MASK, | |
| 502 | + .platform_data = (void *)&kirkwood_xor11_data, | |
| 503 | + }, | |
| 504 | +}; | |
| 505 | + | |
| 506 | +void __init kirkwood_xor1_init(void) | |
| 507 | +{ | |
| 508 | + platform_device_register(&kirkwood_xor1_shared); | |
| 509 | + | |
| 510 | + /* | |
| 511 | + * two engines can't do memset simultaneously, this limitation | |
| 512 | + * satisfied by removing memset support from one of the engines. | |
| 513 | + */ | |
| 514 | + dma_cap_set(DMA_MEMCPY, kirkwood_xor10_data.cap_mask); | |
| 515 | + dma_cap_set(DMA_XOR, kirkwood_xor10_data.cap_mask); | |
| 516 | + platform_device_register(&kirkwood_xor10_channel); | |
| 517 | + | |
| 518 | + dma_cap_set(DMA_MEMCPY, kirkwood_xor11_data.cap_mask); | |
| 519 | + dma_cap_set(DMA_MEMSET, kirkwood_xor11_data.cap_mask); | |
| 520 | + dma_cap_set(DMA_XOR, kirkwood_xor11_data.cap_mask); | |
| 521 | + platform_device_register(&kirkwood_xor11_channel); | |
| 522 | +} | |
| 523 | + | |
| 524 | + | |
| 286 | 525 | /***************************************************************************** |
| 287 | 526 | * Time handling |
| 288 | 527 | ****************************************************************************/ |
| @@ -33,8 +33,11 @@ void kirkwood_ge00_init(struct mv643xx_eth_platform_data *eth_data); · 32 unmodified lines | ||
| 33 | 33 | void kirkwood_pcie_init(void); |
| 34 | 34 | void kirkwood_rtc_init(void); |
| 35 | 35 | void kirkwood_sata_init(struct mv_sata_platform_data *sata_data); |
| 36 | +void kirkwood_spi_init(void); | |
| 36 | 37 | void kirkwood_uart0_init(void); |
| 37 | 38 | void kirkwood_uart1_init(void); |
| 39 | +void kirkwood_xor0_init(void); | |
| 40 | +void kirkwood_xor1_init(void); | |
| 38 | 41 | |
| 39 | 42 | extern struct sys_timer kirkwood_timer; |
| 40 | 43 | |
| @@ -21,7 +21,7 @@ · 20 unmodified lines | ||
| 21 | 21 | #include <asm/mach-types.h> |
| 22 | 22 | #include <asm/mach/arch.h> |
| 23 | 23 | #include <asm/mach/pci.h> |
| 24 | −#include <asm/arch/kirkwood.h> | |
| 24 | +#include <mach/kirkwood.h> | |
| 25 | 25 | #include "common.h" |
| 26 | 26 | |
| 27 | 27 | static struct mv643xx_eth_platform_data db88f6281_ge00_data = { |
| @@ -1,12 +1,12 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-kirkwood/debug-macro.S | |
| 2 | + * arch/arm/mach-kirkwood/include/mach/debug-macro.S | |
| 3 | 3 | * |
| 4 | 4 | * This program is free software; you can redistribute it and/or modify |
| 5 | 5 | * it under the terms of the GNU General Public License version 2 as |
| 6 | 6 | * published by the Free Software Foundation. |
| 7 | 7 | */ |
| 8 | 8 | |
| 9 | −#include <asm/arch/kirkwood.h> | |
| 9 | +#include <mach/kirkwood.h> | |
| 10 | 10 | |
| 11 | 11 | .macro addruart,rx |
| 12 | 12 | mrc p15, 0, \rx, c1, c0 |
File renamed without changes.
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-kirkwood/entry-macro.S | |
| 2 | + * arch/arm/mach-kirkwood/include/mach/entry-macro.S | |
| 3 | 3 | * |
| 4 | 4 | * Low-level IRQ helper macros for Marvell Kirkwood platforms |
| 5 | 5 | * |
| @@ -8,7 +8,7 @@ · 2 unmodified lines | ||
| 8 | 8 | * warranty of any kind, whether express or implied. |
| 9 | 9 | */ |
| 10 | 10 | |
| 11 | −#include <asm/arch/kirkwood.h> | |
| 11 | +#include <mach/kirkwood.h> | |
| 12 | 12 | |
| 13 | 13 | .macro disable_fiq |
| 14 | 14 | .endm |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-kirkwood/hardware.h | |
| 2 | + * arch/arm/mach-kirkwood/include/mach/hardware.h | |
| 3 | 3 | * |
| 4 | 4 | * This program is free software; you can redistribute it and/or modify |
| 5 | 5 | * it under the terms of the GNU General Public License version 2 as |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-kirkwood/io.h | |
| 2 | + * arch/arm/mach-kirkwood/include/mach/io.h | |
| 3 | 3 | * |
| 4 | 4 | * This file is licensed under the terms of the GNU General Public |
| 5 | 5 | * License version 2. This program is licensed "as is" without any |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-kirkwood/irqs.h | |
| 2 | + * arch/arm/mach-kirkwood/include/mach/irqs.h | |
| 3 | 3 | * |
| 4 | 4 | * IRQ definitions for Marvell Kirkwood SoCs |
| 5 | 5 | * |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-kirkwood/kirkwood.h | |
| 2 | + * arch/arm/mach-kirkwood/include/mach/kirkwood.h | |
| 3 | 3 | * |
| 4 | 4 | * Generic definitions for Marvell Kirkwood SoC flavors: |
| 5 | 5 | * 88F6180, 88F6192 and 88F6281. |
| @@ -88,6 +88,15 @@ · 82 unmodified lines | ||
| 88 | 88 | |
| 89 | 89 | #define USB_PHYS_BASE (KIRKWOOD_REGS_PHYS_BASE | 0x50000) |
| 90 | 90 | |
| 91 | +#define XOR0_PHYS_BASE (KIRKWOOD_REGS_PHYS_BASE | 0x60800) | |
| 92 | +#define XOR0_VIRT_BASE (KIRKWOOD_REGS_VIRT_BASE | 0x60800) | |
| 93 | +#define XOR1_PHYS_BASE (KIRKWOOD_REGS_PHYS_BASE | 0x60900) | |
| 94 | +#define XOR1_VIRT_BASE (KIRKWOOD_REGS_VIRT_BASE | 0x60900) | |
| 95 | +#define XOR0_HIGH_PHYS_BASE (KIRKWOOD_REGS_PHYS_BASE | 0x60A00) | |
| 96 | +#define XOR0_HIGH_VIRT_BASE (KIRKWOOD_REGS_VIRT_BASE | 0x60A00) | |
| 97 | +#define XOR1_HIGH_PHYS_BASE (KIRKWOOD_REGS_PHYS_BASE | 0x60B00) | |
| 98 | +#define XOR1_HIGH_VIRT_BASE (KIRKWOOD_REGS_VIRT_BASE | 0x60B00) | |
| 99 | + | |
| 91 | 100 | #define GE00_PHYS_BASE (KIRKWOOD_REGS_PHYS_BASE | 0x70000) |
| 92 | 101 | #define GE01_PHYS_BASE (KIRKWOOD_REGS_PHYS_BASE | 0x74000) |
| 93 | 102 | |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-mv78xx0/memory.h | |
| 2 | + * arch/arm/mach-kirkwood/include/mach/memory.h | |
| 3 | 3 | */ |
| 4 | 4 | |
| 5 | 5 | #ifndef __ASM_ARCH_MEMORY_H |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-mv78xx0/system.h | |
| 2 | + * arch/arm/mach-kirkwood/include/mach/system.h | |
| 3 | 3 | * |
| 4 | 4 | * This file is licensed under the terms of the GNU General Public |
| 5 | 5 | * License version 2. This program is licensed "as is" without any |
| @@ -9,8 +9,8 @@ · 3 unmodified lines | ||
| 9 | 9 | #ifndef __ASM_ARCH_SYSTEM_H |
| 10 | 10 | #define __ASM_ARCH_SYSTEM_H |
| 11 | 11 | |
| 12 | −#include <asm/arch/hardware.h> | |
| 13 | −#include <asm/arch/mv78xx0.h> | |
| 12 | +#include <mach/hardware.h> | |
| 13 | +#include <mach/kirkwood.h> | |
| 14 | 14 | |
| 15 | 15 | static inline void arch_idle(void) |
| 16 | 16 | { |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-kirkwood/timex.h | |
| 2 | + * arch/arm/mach-kirkwood/include/mach/timex.h | |
| 3 | 3 | * |
| 4 | 4 | * This file is licensed under the terms of the GNU General Public |
| 5 | 5 | * License version 2. This program is licensed "as is" without any |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-kirkwood/uncompress.h | |
| 2 | + * arch/arm/mach-kirkwood/include/mach/uncompress.h | |
| 3 | 3 | * |
| 4 | 4 | * This file is licensed under the terms of the GNU General Public |
| 5 | 5 | * License version 2. This program is licensed "as is" without any |
| @@ -7,7 +7,7 @@ · 1 unmodified line | ||
| 7 | 7 | */ |
| 8 | 8 | |
| 9 | 9 | #include <linux/serial_reg.h> |
| 10 | −#include <asm/arch/kirkwood.h> | |
| 10 | +#include <mach/kirkwood.h> | |
| 11 | 11 | |
| 12 | 12 | #define SERIAL_BASE ((unsigned char *)UART0_PHYS_BASE) |
| 13 | 13 | |
| @@ -0,0 +1,5 @@ | ||
| 1 | +/* | |
| 2 | + * arch/arm/mach-kirkwood/include/mach/vmalloc.h | |
| 3 | + */ | |
| 4 | + | |
| 5 | +#define VMALLOC_END 0xfe800000 | |
| @@ -12,7 +12,7 @@ · 11 unmodified lines | ||
| 12 | 12 | #include <linux/init.h> |
| 13 | 13 | #include <linux/irq.h> |
| 14 | 14 | #include <linux/io.h> |
| 15 | −#include <asm/plat-orion/irq.h> | |
| 15 | +#include <plat/irq.h> | |
| 16 | 16 | #include "common.h" |
| 17 | 17 | |
| 18 | 18 | void __init kirkwood_init_irq(void) |
| @@ -12,7 +12,7 @@ · 11 unmodified lines | ||
| 12 | 12 | #include <linux/pci.h> |
| 13 | 13 | #include <linux/mbus.h> |
| 14 | 14 | #include <asm/mach/pci.h> |
| 15 | −#include <asm/plat-orion/pcie.h> | |
| 15 | +#include <plat/pcie.h> | |
| 16 | 16 | #include "common.h" |
| 17 | 17 | |
| 18 | 18 | |
| @@ -18,10 +18,13 @@ · 17 unmodified lines | ||
| 18 | 18 | #include <linux/timer.h> |
| 19 | 19 | #include <linux/ata_platform.h> |
| 20 | 20 | #include <linux/mv643xx_eth.h> |
| 21 | +#include <linux/spi/flash.h> | |
| 22 | +#include <linux/spi/spi.h> | |
| 23 | +#include <linux/spi/orion_spi.h> | |
| 21 | 24 | #include <asm/mach-types.h> |
| 22 | 25 | #include <asm/mach/arch.h> |
| 23 | 26 | #include <asm/mach/pci.h> |
| 24 | −#include <asm/arch/kirkwood.h> | |
| 27 | +#include <mach/kirkwood.h> | |
| 25 | 28 | #include "common.h" |
| 26 | 29 | |
| 27 | 30 | #define RD88F6192_GPIO_USB_VBUS 10 |
| @@ -34,6 +37,21 @@ static struct mv_sata_platform_data rd88f6192_sata_data = { · 6 unmodified lines | ||
| 34 | 37 | .n_ports = 2, |
| 35 | 38 | }; |
| 36 | 39 | |
| 40 | +static const struct flash_platform_data rd88F6192_spi_slave_data = { | |
| 41 | + .type = "m25p128", | |
| 42 | +}; | |
| 43 | + | |
| 44 | +static struct spi_board_info __initdata rd88F6192_spi_slave_info[] = { | |
| 45 | + { | |
| 46 | + .modalias = "m25p80", | |
| 47 | + .platform_data = &rd88F6192_spi_slave_data, | |
| 48 | + .irq = -1, | |
| 49 | + .max_speed_hz = 20000000, | |
| 50 | + .bus_num = 0, | |
| 51 | + .chip_select = 0, | |
| 52 | + }, | |
| 53 | +}; | |
| 54 | + | |
| 37 | 55 | static void __init rd88f6192_init(void) |
| 38 | 56 | { |
| 39 | 57 | /* |
| @@ -45,7 +63,12 @@ static void __init rd88f6192_init(void) · 5 unmodified lines | ||
| 45 | 63 | kirkwood_ge00_init(&rd88f6192_ge00_data); |
| 46 | 64 | kirkwood_rtc_init(); |
| 47 | 65 | kirkwood_sata_init(&rd88f6192_sata_data); |
| 66 | + spi_register_board_info(rd88F6192_spi_slave_info, | |
| 67 | + ARRAY_SIZE(rd88F6192_spi_slave_info)); | |
| 68 | + kirkwood_spi_init(); | |
| 48 | 69 | kirkwood_uart0_init(); |
| 70 | + kirkwood_xor0_init(); | |
| 71 | + kirkwood_xor1_init(); | |
| 49 | 72 | } |
| 50 | 73 | |
| 51 | 74 | static int __init rd88f6192_pci_init(void) |
| @@ -22,8 +22,8 @@ · 21 unmodified lines | ||
| 22 | 22 | #include <asm/mach-types.h> |
| 23 | 23 | #include <asm/mach/arch.h> |
| 24 | 24 | #include <asm/mach/pci.h> |
| 25 | −#include <asm/arch/kirkwood.h> | |
| 26 | −#include <asm/plat-orion/orion_nand.h> | |
| 25 | +#include <mach/kirkwood.h> | |
| 26 | +#include <plat/orion_nand.h> | |
| 27 | 27 | #include "common.h" |
| 28 | 28 | |
| 29 | 29 | static struct mtd_partition rd88f6281_nand_parts[] = { |
| @@ -18,7 +18,7 @@ · 17 unmodified lines | ||
| 18 | 18 | #include <asm/mach/map.h> |
| 19 | 19 | #include <asm/mach/irq.h> |
| 20 | 20 | |
| 21 | −#include <asm/arch/devices.h> | |
| 21 | +#include <mach/devices.h> | |
| 22 | 22 | |
| 23 | 23 | #include "generic.h" |
| 24 | 24 | |
| @@ -25,13 +25,13 @@ · 24 unmodified lines | ||
| 25 | 25 | #include <linux/module.h> |
| 26 | 26 | #include <linux/init.h> |
| 27 | 27 | |
| 28 | −#include <asm/hardware.h> | |
| 28 | +#include <mach/hardware.h> | |
| 29 | 29 | #include <asm/io.h> |
| 30 | 30 | #include <asm/mach/arch.h> |
| 31 | 31 | #include <asm/mach/map.h> |
| 32 | 32 | |
| 33 | −#include <asm/arch/regs-sys.h> | |
| 34 | −#include <asm/arch/regs-misc.h> | |
| 33 | +#include <mach/regs-sys.h> | |
| 34 | +#include <mach/regs-misc.h> | |
| 35 | 35 | |
| 36 | 36 | |
| 37 | 37 | static struct __initdata map_desc ks8695_io_desc[] = { |
| @@ -22,9 +22,9 @@ · 21 unmodified lines | ||
| 22 | 22 | |
| 23 | 23 | #include <linux/platform_device.h> |
| 24 | 24 | |
| 25 | −#include <asm/arch/regs-wan.h> | |
| 26 | −#include <asm/arch/regs-lan.h> | |
| 27 | −#include <asm/arch/regs-hpna.h> | |
| 25 | +#include <mach/regs-wan.h> | |
| 26 | +#include <mach/regs-lan.h> | |
| 27 | +#include <mach/regs-hpna.h> | |
| 28 | 28 | |
| 29 | 29 | |
| 30 | 30 | /* -------------------------------------------------------------------- |
| @@ -25,11 +25,11 @@ · 24 unmodified lines | ||
| 25 | 25 | #include <linux/module.h> |
| 26 | 26 | |
| 27 | 27 | #include <asm/io.h> |
| 28 | −#include <asm/hardware.h> | |
| 28 | +#include <mach/hardware.h> | |
| 29 | 29 | #include <asm/mach/irq.h> |
| 30 | 30 | |
| 31 | −#include <asm/arch/regs-gpio.h> | |
| 32 | −#include <asm/arch/gpio.h> | |
| 31 | +#include <mach/regs-gpio.h> | |
| 32 | +#include <mach/gpio.h> | |
| 33 | 33 | |
| 34 | 34 | /* |
| 35 | 35 | * Configure a GPIO line for either GPIO function, or its internal |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-ks8695/debug-macro.S | |
| 2 | + * arch/arm/mach-ks8695/include/mach/debug-macro.S | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 2006 Ben Dooks <ben@simtec.co.uk> |
| 5 | 5 | * Copyright (C) 2006 Simtec Electronics |
| @@ -11,8 +11,8 @@ · 5 unmodified lines | ||
| 11 | 11 | * published by the Free Software Foundation. |
| 12 | 12 | */ |
| 13 | 13 | |
| 14 | −#include <asm/hardware.h> | |
| 15 | −#include <asm/arch/regs-uart.h> | |
| 14 | +#include <mach/hardware.h> | |
| 15 | +#include <mach/regs-uart.h> | |
| 16 | 16 | |
| 17 | 17 | .macro addruart, rx |
| 18 | 18 | mrc p15, 0, \rx, c1, c0 |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-ks8695/devices.h | |
| 2 | + * arch/arm/mach-ks8695/include/mach/devices.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 2006 Andrew Victor |
| 5 | 5 | * |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-ks8695/dma.h | |
| 2 | + * arch/arm/mach-ks8695/include/mach/dma.h | |
| 3 | 3 | * |
| 4 | 4 | * This program is free software; you can redistribute it and/or modify |
| 5 | 5 | * it under the terms of the GNU General Public License as published by |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-ks8695/entry-macro.S | |
| 2 | + * arch/arm/mach-ks8695/include/mach/entry-macro.S | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 2006 Ben Dooks <ben@simtec.co.uk> |
| 5 | 5 | * Copyright (C) 2006 Simtec Electronics |
| @@ -11,8 +11,8 @@ · 5 unmodified lines | ||
| 11 | 11 | * warranty of any kind, whether express or implied. |
| 12 | 12 | */ |
| 13 | 13 | |
| 14 | −#include <asm/hardware.h> | |
| 15 | −#include <asm/arch/regs-irq.h> | |
| 14 | +#include <mach/hardware.h> | |
| 15 | +#include <mach/regs-irq.h> | |
| 16 | 16 | |
| 17 | 17 | .macro disable_fiq |
| 18 | 18 | .endm |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-ks8695/gpio.h | |
| 2 | + * arch/arm/mach-ks8695/include/mach/gpio.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 2006 Andrew Victor |
| 5 | 5 | * |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-ks8695/hardware.h | |
| 2 | + * arch/arm/mach-ks8695/include/mach/hardware.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 2006 Ben Dooks <ben@simtec.co.uk> |
| 5 | 5 | * Copyright (C) 2006 Simtec Electronics |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-ks8695/io.h | |
| 2 | + * arch/arm/mach-ks8695/include/mach/io.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 2006 Andrew Victor |
| 5 | 5 | * |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-ks8695/irqs.h | |
| 2 | + * arch/arm/mach-ks8695/include/mach/irqs.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 2006 Simtec Electronics |
| 5 | 5 | * Ben Dooks <ben@simtec.co.uk> |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-ks8695/memory.h | |
| 2 | + * arch/arm/mach-ks8695/include/mach/memory.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 2006 Andrew Victor |
| 5 | 5 | * |
| @@ -13,7 +13,7 @@ · 7 unmodified lines | ||
| 13 | 13 | #ifndef __ASM_ARCH_MEMORY_H |
| 14 | 14 | #define __ASM_ARCH_MEMORY_H |
| 15 | 15 | |
| 16 | −#include <asm/hardware.h> | |
| 16 | +#include <mach/hardware.h> | |
| 17 | 17 | |
| 18 | 18 | /* |
| 19 | 19 | * Physical SRAM offset. |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-ks8695/regs-gpio.h | |
| 2 | + * arch/arm/mach-ks8695/include/mach/regs-gpio.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 2007 Andrew Victor |
| 5 | 5 | * |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-ks8695/regs-wan.h | |
| 2 | + * arch/arm/mach-ks8695/include/mach/regs-wan.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 2006 Andrew Victor |
| 5 | 5 | * |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-ks8695/regs-irq.h | |
| 2 | + * arch/arm/mach-ks8695/include/mach/regs-irq.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 2006 Ben Dooks <ben@simtec.co.uk> |
| 5 | 5 | * Copyright (C) 2006 Simtec Electronics |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-ks8695/regs-lan.h | |
| 2 | + * arch/arm/mach-ks8695/include/mach/regs-lan.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 2006 Andrew Victor |
| 5 | 5 | * |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-ks8695/regs-mem.h | |
| 2 | + * arch/arm/mach-ks8695/include/mach/regs-mem.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 2006 Andrew Victor |
| 5 | 5 | * |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-ks8695/regs-misc.h | |
| 2 | + * arch/arm/mach-ks8695/include/mach/regs-misc.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 2006 Andrew Victor |
| 5 | 5 | * |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-ks8695/regs-pci.h | |
| 2 | + * arch/arm/mach-ks8695/include/mach/regs-pci.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 2006 Ben Dooks <ben@simtec.co.uk> |
| 5 | 5 | * Copyright (C) 2006 Simtec Electronics |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-ks8695/regs-switch.h | |
| 2 | + * arch/arm/mach-ks8695/include/mach/regs-switch.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 2006 Andrew Victor |
| 5 | 5 | * |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-ks8695/regs-sys.h | |
| 2 | + * arch/arm/mach-ks8695/include/mach/regs-sys.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 2006 Ben Dooks <ben@simtec.co.uk> |
| 5 | 5 | * Copyright (C) 2006 Simtec Electronics |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-ks8695/regs-timer.h | |
| 2 | + * arch/arm/mach-ks8695/include/mach/regs-timer.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 2006 Ben Dooks <ben@simtec.co.uk> |
| 5 | 5 | * Copyright (C) 2006 Simtec Electronics |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-ks8695/regs-uart.h | |
| 2 | + * arch/arm/mach-ks8695/include/mach/regs-uart.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 2006 Ben Dooks <ben@simtec.co.uk> |
| 5 | 5 | * Copyright (C) 2006 Simtec Electronics |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-ks8695/regs-wan.h | |
| 2 | + * arch/arm/mach-ks8695/include/mach/regs-wan.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 2006 Andrew Victor |
| 5 | 5 | * |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-s3c2410/system.h | |
| 2 | + * arch/arm/mach-s3c2410/include/mach/system.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 2006 Simtec Electronics |
| 5 | 5 | * Ben Dooks <ben@simtec.co.uk> |
| @@ -15,7 +15,7 @@ · 9 unmodified lines | ||
| 15 | 15 | #define __ASM_ARCH_SYSTEM_H |
| 16 | 16 | |
| 17 | 17 | #include <asm/io.h> |
| 18 | −#include <asm/arch/regs-timer.h> | |
| 18 | +#include <mach/regs-timer.h> | |
| 19 | 19 | |
| 20 | 20 | static void arch_idle(void) |
| 21 | 21 | { |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-ks8695/timex.h | |
| 2 | + * arch/arm/mach-ks8695/include/mach/timex.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 2006 Simtec Electronics |
| 5 | 5 | * Ben Dooks <ben@simtec.co.uk> |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-ks8695/uncompress.h | |
| 2 | + * arch/arm/mach-ks8695/include/mach/uncompress.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 2006 Ben Dooks <ben@simtec.co.uk> |
| 5 | 5 | * Copyright (C) 2006 Simtec Electronics |
| @@ -15,7 +15,7 @@ · 9 unmodified lines | ||
| 15 | 15 | #define __ASM_ARCH_UNCOMPRESS_H |
| 16 | 16 | |
| 17 | 17 | #include <asm/io.h> |
| 18 | −#include <asm/arch/regs-uart.h> | |
| 18 | +#include <mach/regs-uart.h> | |
| 19 | 19 | |
| 20 | 20 | static void putc(char c) |
| 21 | 21 | { |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-ks8695/vmalloc.h | |
| 2 | + * arch/arm/mach-ks8695/include/mach/vmalloc.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 2006 Ben Dooks |
| 5 | 5 | * Copyright (C) 2006 Simtec Electronics <linux@simtec.co.uk> |
| @@ -25,14 +25,14 @@ · 24 unmodified lines | ||
| 25 | 25 | #include <linux/ioport.h> |
| 26 | 26 | #include <linux/sysdev.h> |
| 27 | 27 | |
| 28 | −#include <asm/hardware.h> | |
| 28 | +#include <mach/hardware.h> | |
| 29 | 29 | #include <asm/irq.h> |
| 30 | 30 | #include <asm/io.h> |
| 31 | 31 | |
| 32 | 32 | #include <asm/mach/irq.h> |
| 33 | 33 | |
| 34 | −#include <asm/arch/regs-irq.h> | |
| 35 | −#include <asm/arch/regs-gpio.h> | |
| 34 | +#include <mach/regs-irq.h> | |
| 35 | +#include <mach/regs-gpio.h> | |
| 36 | 36 | |
| 37 | 37 | static void ks8695_irq_mask(unsigned int irqno) |
| 38 | 38 | { |
| @@ -12,10 +12,9 @@ · 11 unmodified lines | ||
| 12 | 12 | #include <linux/module.h> |
| 13 | 13 | #include <linux/init.h> |
| 14 | 14 | |
| 15 | −#include <asm/mach-types.h> | |
| 16 | 15 | #include <asm/leds.h> |
| 17 | −#include <asm/arch/devices.h> | |
| 18 | −#include <asm/arch/gpio.h> | |
| 16 | +#include <mach/devices.h> | |
| 17 | +#include <mach/gpio.h> | |
| 19 | 18 | |
| 20 | 19 | |
| 21 | 20 | static inline void ks8695_led_on(unsigned int led) |
| @@ -31,10 +31,10 @@ · 30 unmodified lines | ||
| 31 | 31 | #include <asm/io.h> |
| 32 | 32 | #include <asm/signal.h> |
| 33 | 33 | #include <asm/mach/pci.h> |
| 34 | −#include <asm/hardware.h> | |
| 34 | +#include <mach/hardware.h> | |
| 35 | 35 | |
| 36 | −#include <asm/arch/devices.h> | |
| 37 | −#include <asm/arch/regs-pci.h> | |
| 36 | +#include <mach/devices.h> | |
| 37 | +#include <mach/regs-pci.h> | |
| 38 | 38 | |
| 39 | 39 | |
| 40 | 40 | static int pci_dbg; |
| @@ -28,8 +28,8 @@ · 27 unmodified lines | ||
| 28 | 28 | #include <asm/io.h> |
| 29 | 29 | #include <asm/mach/time.h> |
| 30 | 30 | |
| 31 | −#include <asm/arch/regs-timer.h> | |
| 32 | −#include <asm/arch/regs-irq.h> | |
| 31 | +#include <mach/regs-timer.h> | |
| 32 | +#include <mach/regs-irq.h> | |
| 33 | 33 | |
| 34 | 34 | #include "generic.h" |
| 35 | 35 | |
| @@ -13,7 +13,7 @@ · 12 unmodified lines | ||
| 13 | 13 | #include <asm/types.h> |
| 14 | 14 | #include <asm/irq.h> |
| 15 | 15 | #include <asm/mach-types.h> |
| 16 | −#include <asm/hardware.h> | |
| 16 | +#include <mach/hardware.h> | |
| 17 | 17 | #include <asm/page.h> |
| 18 | 18 | |
| 19 | 19 | #include <asm/mach/arch.h> |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-l7200/aux_reg.h | |
| 2 | + * arch/arm/mach-l7200/include/mach/aux_reg.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 2000 Steve Hill (sjhill@cotw.com) |
| 5 | 5 | * |
| @@ -9,7 +9,7 @@ · 3 unmodified lines | ||
| 9 | 9 | #ifndef _ASM_ARCH_AUXREG_H |
| 10 | 10 | #define _ASM_ARCH_AUXREG_H |
| 11 | 11 | |
| 12 | −#include <asm/hardware.h> | |
| 12 | +#include <mach/hardware.h> | |
| 13 | 13 | |
| 14 | 14 | #define l7200aux_reg *((volatile unsigned int *) (AUX_BASE)) |
| 15 | 15 | |
| @@ -1,4 +1,4 @@ | ||
| 1 | −/* linux/include/asm-arm/arch-l7200/debug-macro.S | |
| 1 | +/* arch/arm/mach-l7200/include/mach/debug-macro.S | |
| 2 | 2 | * |
| 3 | 3 | * Debugging macro include header |
| 4 | 4 | * |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-l7200/dma.h | |
| 2 | + * arch/arm/mach-l7200/include/mach/dma.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 2000 Steve Hill (sjhill@cotw.com) |
| 5 | 5 | * |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-l7200/entry-macro.S | |
| 2 | + * arch/arm/mach-l7200/include/mach/entry-macro.S | |
| 3 | 3 | * |
| 4 | 4 | * Low-level IRQ helper macros for L7200-based platforms |
| 5 | 5 | * |
| @@ -7,7 +7,7 @@ · 1 unmodified line | ||
| 7 | 7 | * License version 2. This program is licensed "as is" without any |
| 8 | 8 | * warranty of any kind, whether express or implied. |
| 9 | 9 | */ |
| 10 | −#include <asm/hardware.h> | |
| 10 | +#include <mach/hardware.h> | |
| 11 | 11 | |
| 12 | 12 | .equ irq_base_addr, IO_BASE_2 |
| 13 | 13 | |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-l7200/gp_timers.h | |
| 2 | + * arch/arm/mach-l7200/include/mach/gp_timers.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 2000 Steve Hill (sjhill@cotw.com) |
| 5 | 5 | * |
| @@ -10,7 +10,7 @@ · 4 unmodified lines | ||
| 10 | 10 | #ifndef _ASM_ARCH_GPTIMERS_H |
| 11 | 11 | #define _ASM_ARCH_GPTIMERS_H |
| 12 | 12 | |
| 13 | −#include <asm/hardware.h> | |
| 13 | +#include <mach/hardware.h> | |
| 14 | 14 | |
| 15 | 15 | /* |
| 16 | 16 | * Layout of L7200 general purpose timer registers |
| @@ -1,6 +1,6 @@ | ||
| 1 | 1 | /****************************************************************************/ |
| 2 | 2 | /* |
| 3 | − * linux/include/asm-arm/arch-l7200/gpio.h | |
| 3 | + * arch/arm/mach-l7200/include/mach/gpio.h | |
| 4 | 4 | * |
| 5 | 5 | * Registers and helper functions for the L7200 Link-Up Systems |
| 6 | 6 | * GPIO. |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-l7200/hardware.h | |
| 2 | + * arch/arm/mach-l7200/include/mach/hardware.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 2000 Rob Scott (rscott@mtrob.fdns.net) |
| 5 | 5 | * Steve Hill (sjhill@cotw.com) |
| @@ -1,16 +1,16 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-l7200/io.h | |
| 2 | + * arch/arm/mach-l7200/include/mach/io.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 2000 Steve Hill (sjhill@cotw.com) |
| 5 | 5 | * |
| 6 | 6 | * Changelog: |
| 7 | − * 03-21-2000 SJH Created from linux/include/asm-arm/arch-nexuspci/io.h | |
| 7 | + * 03-21-2000 SJH Created from arch/arm/mach-nexuspci/include/mach/io.h | |
| 8 | 8 | * 08-31-2000 SJH Added in IO functions necessary for new drivers |
| 9 | 9 | */ |
| 10 | 10 | #ifndef __ASM_ARM_ARCH_IO_H |
| 11 | 11 | #define __ASM_ARM_ARCH_IO_H |
| 12 | 12 | |
| 13 | −#include <asm/hardware.h> | |
| 13 | +#include <mach/hardware.h> | |
| 14 | 14 | |
| 15 | 15 | #define IO_SPACE_LIMIT 0xffffffff |
| 16 | 16 | |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-l7200/irqs.h | |
| 2 | + * arch/arm/mach-l7200/include/mach/irqs.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 2000 Rob Scott (rscott@mtrob.fdns.net) |
| 5 | 5 | * Steve Hill (sjhill@cotw.com) |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-l7200/memory.h | |
| 2 | + * arch/arm/mach-l7200/include/mach/memory.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (c) 2000 Steve Hill (sjhill@cotw.com) |
| 5 | 5 | * Copyright (c) 2000 Rob Scott (rscott@mtrob.fdns.net) |
| @@ -1,6 +1,6 @@ | ||
| 1 | 1 | /****************************************************************************/ |
| 2 | 2 | /* |
| 3 | − * linux/include/asm-arm/arch-l7200/pmpcon.h | |
| 3 | + * arch/arm/mach-l7200/include/mach/pmpcon.h | |
| 4 | 4 | * |
| 5 | 5 | * Registers and helper functions for the L7200 Link-Up Systems |
| 6 | 6 | * DC/DC converter register. |
| @@ -1,6 +1,6 @@ | ||
| 1 | 1 | /****************************************************************************/ |
| 2 | 2 | /* |
| 3 | − * linux/include/asm-arm/arch-l7200/pmu.h | |
| 3 | + * arch/arm/mach-l7200/include/mach/pmu.h | |
| 4 | 4 | * |
| 5 | 5 | * Registers and helper functions for the L7200 Link-Up Systems |
| 6 | 6 | * Power Management Unit (PMU). |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-l7200/serial.h | |
| 2 | + * arch/arm/mach-l7200/include/mach/serial.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (c) 2000 Rob Scott (rscott@mtrob.fdns.net) |
| 5 | 5 | * Steve Hill (sjhill@cotw.com) |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-l7200/serial_l7200.h | |
| 2 | + * arch/arm/mach-l7200/include/mach/serial_l7200.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (c) 2000 Steven Hill (sjhill@cotw.com) |
| 5 | 5 | * |
| @@ -9,7 +9,7 @@ · 3 unmodified lines | ||
| 9 | 9 | #ifndef __ASM_ARCH_SERIAL_L7200_H |
| 10 | 10 | #define __ASM_ARCH_SERIAL_L7200_H |
| 11 | 11 | |
| 12 | −#include <asm/arch/memory.h> | |
| 12 | +#include <mach/memory.h> | |
| 13 | 13 | |
| 14 | 14 | /* |
| 15 | 15 | * This assumes you have a 3.6864 MHz clock for your UART. |
| @@ -1,6 +1,6 @@ | ||
| 1 | 1 | /****************************************************************************/ |
| 2 | 2 | /* |
| 3 | − * linux/include/asm-arm/arch-l7200/sib.h | |
| 3 | + * arch/arm/mach-l7200/include/mach/sib.h | |
| 4 | 4 | * |
| 5 | 5 | * Registers and helper functions for the Serial Interface Bus. |
| 6 | 6 | * |
| @@ -1,6 +1,6 @@ | ||
| 1 | 1 | /****************************************************************************/ |
| 2 | 2 | /* |
| 3 | − * linux/include/asm-arm/arch-l7200/sys-clock.h | |
| 3 | + * arch/arm/mach-l7200/include/mach/sys-clock.h | |
| 4 | 4 | * |
| 5 | 5 | * Registers and helper functions for the L7200 Link-Up Systems |
| 6 | 6 | * System clocks. |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-l7200/system.h | |
| 2 | + * arch/arm/mach-l7200/include/mach/system.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (c) 2000 Steve Hill (sjhill@cotw.com) |
| 5 | 5 | * |
| @@ -12,7 +12,7 @@ · 6 unmodified lines | ||
| 12 | 12 | #ifndef __ASM_ARCH_SYSTEM_H |
| 13 | 13 | #define __ASM_ARCH_SYSTEM_H |
| 14 | 14 | |
| 15 | −#include <asm/hardware.h> | |
| 15 | +#include <mach/hardware.h> | |
| 16 | 16 | |
| 17 | 17 | static inline void arch_idle(void) |
| 18 | 18 | { |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-l7200/time.h | |
| 2 | + * arch/arm/mach-l7200/include/mach/time.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 2000 Rob Scott (rscott@mtrob.fdns.net) |
| 5 | 5 | * Steve Hill (sjhill@cotw.com) |
| @@ -11,7 +11,7 @@ · 5 unmodified lines | ||
| 11 | 11 | #ifndef _ASM_ARCH_TIME_H |
| 12 | 12 | #define _ASM_ARCH_TIME_H |
| 13 | 13 | |
| 14 | −#include <asm/arch/irqs.h> | |
| 14 | +#include <mach/irqs.h> | |
| 15 | 15 | |
| 16 | 16 | /* |
| 17 | 17 | * RTC base register address |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-l7200/timex.h | |
| 2 | + * arch/arm/mach-l7200/include/mach/timex.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 2000 Rob Scott (rscott@mtrob.fdns.net) |
| 5 | 5 | * Steve Hill (sjhill@cotw.com) |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-l7200/uncompress.h | |
| 2 | + * arch/arm/mach-l7200/include/mach/uncompress.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 2000 Steve Hill (sjhill@cotw.com) |
| 5 | 5 | * |
| @@ -9,7 +9,7 @@ · 3 unmodified lines | ||
| 9 | 9 | * 07-26-2000 SJH Removed hard coded baud rate |
| 10 | 10 | */ |
| 11 | 11 | |
| 12 | −#include <asm/hardware.h> | |
| 12 | +#include <mach/hardware.h> | |
| 13 | 13 | |
| 14 | 14 | #define IO_UART IO_START + 0x00044000 |
| 15 | 15 | |
| @@ -1,4 +1,4 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-l7200/vmalloc.h | |
| 2 | + * arch/arm/mach-l7200/include/mach/vmalloc.h | |
| 3 | 3 | */ |
| 4 | 4 | #define VMALLOC_END (PAGE_OFFSET + 0x10000000) |
| @@ -13,7 +13,7 @@ · 12 unmodified lines | ||
| 13 | 13 | #include <linux/device.h> |
| 14 | 14 | #include <linux/interrupt.h> |
| 15 | 15 | |
| 16 | −#include <asm/hardware.h> | |
| 16 | +#include <mach/hardware.h> | |
| 17 | 17 | #include <asm/setup.h> |
| 18 | 18 | #include <asm/mach-types.h> |
| 19 | 19 | #include <asm/mach/arch.h> |
| @@ -14,7 +14,7 @@ · 13 unmodified lines | ||
| 14 | 14 | #include <linux/interrupt.h> |
| 15 | 15 | #include <linux/irq.h> |
| 16 | 16 | |
| 17 | −#include <asm/hardware.h> | |
| 17 | +#include <mach/hardware.h> | |
| 18 | 18 | #include <asm/setup.h> |
| 19 | 19 | #include <asm/mach-types.h> |
| 20 | 20 | #include <asm/mach/arch.h> |
| @@ -17,14 +17,13 @@ · 16 unmodified lines | ||
| 17 | 17 | |
| 18 | 18 | //#include <linux/module.h> |
| 19 | 19 | //#include <linux/time.h> |
| 20 | −//#include <asm/hardware.h> | |
| 21 | 20 | |
| 22 | 21 | //#include <asm/mach/time.h> |
| 23 | 22 | #include <asm/irq.h> |
| 24 | 23 | #include <asm/mach/irq.h> |
| 25 | 24 | |
| 26 | 25 | #include <asm/system.h> |
| 27 | −#include <asm/hardware.h> | |
| 26 | +#include <mach/hardware.h> | |
| 28 | 27 | #include <linux/amba/bus.h> |
| 29 | 28 | #include <linux/amba/clcd.h> |
| 30 | 29 | |
| @@ -9,8 +9,8 @@ · 8 unmodified lines | ||
| 9 | 9 | */ |
| 10 | 10 | |
| 11 | 11 | #include <linux/cpufreq.h> |
| 12 | −#include <asm/hardware.h> | |
| 13 | −#include <asm/arch/clocks.h> | |
| 12 | +#include <mach/hardware.h> | |
| 13 | +#include <mach/clocks.h> | |
| 14 | 14 | #include <linux/err.h> |
| 15 | 15 | |
| 16 | 16 | struct module; |
| @@ -1,4 +1,4 @@ | ||
| 1 | −/* include/asm-arm/arch-lh7a40x/clocks.h | |
| 1 | +/* arch/arm/mach-lh7a40x/include/mach/clocks.h | |
| 2 | 2 | * |
| 3 | 3 | * Copyright (C) 2004 Marc Singer |
| 4 | 4 | * |
| @@ -1,4 +1,4 @@ | ||
| 1 | −/* include/asm-arm/arch-lh7a40x/constants.h | |
| 1 | +/* arch/arm/mach-lh7a40x/include/mach/constants.h | |
| 2 | 2 | * |
| 3 | 3 | * Copyright (C) 2004 Coastal Environmental Systems |
| 4 | 4 | * Copyright (C) 2004 Logic Product Development |
| @@ -1,4 +1,4 @@ | ||
| 1 | −/* linux/include/asm-arm/arch-lh7a40x/debug-macro.S | |
| 1 | +/* arch/arm/mach-lh7a40x/include/mach/debug-macro.S | |
| 2 | 2 | * |
| 3 | 3 | * Debugging macro include header |
| 4 | 4 | * |
| @@ -1,4 +1,4 @@ | ||
| 1 | −/* include/asm-arm/arch-lh7a40x/dma.h | |
| 1 | +/* arch/arm/mach-lh7a40x/include/mach/dma.h | |
| 2 | 2 | * |
| 3 | 3 | * Copyright (C) 2005 Marc Singer |
| 4 | 4 | * |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-lh7a40x/entry-macro.S | |
| 2 | + * arch/arm/mach-lh7a40x/include/mach/entry-macro.S | |
| 3 | 3 | * |
| 4 | 4 | * Low-level IRQ helper macros for LH7A40x platforms |
| 5 | 5 | * |
| @@ -7,8 +7,8 @@ · 1 unmodified line | ||
| 7 | 7 | * License version 2. This program is licensed "as is" without any |
| 8 | 8 | * warranty of any kind, whether express or implied. |
| 9 | 9 | */ |
| 10 | −#include <asm/hardware.h> | |
| 11 | −#include <asm/arch/irqs.h> | |
| 10 | +#include <mach/hardware.h> | |
| 11 | +#include <mach/irqs.h> | |
| 12 | 12 | |
| 13 | 13 | /* In order to allow there to be support for both of the processor |
| 14 | 14 | classes at the same time, we make a hack here that isn't very |
| @@ -1,8 +1,8 @@ | ||
| 1 | −/* include/asm-arm/arch-lh7a40x/hardware.h | |
| 1 | +/* arch/arm/mach-lh7a40x/include/mach/hardware.h | |
| 2 | 2 | * |
| 3 | 3 | * Copyright (C) 2004 Coastal Environmental Systems |
| 4 | 4 | * |
| 5 | − * [ Substantially cribbed from include/asm-arm/arch-pxa/hardware.h ] | |
| 5 | + * [ Substantially cribbed from arch/arm/mach-pxa/include/mach/hardware.h ] | |
| 6 | 6 | * |
| 7 | 7 | * This program is free software; you can redistribute it and/or |
| 8 | 8 | * modify it under the terms of the GNU General Public License |
| @@ -1,4 +1,4 @@ | ||
| 1 | −/* include/asm-arm/arch-lh7a40x/io.h | |
| 1 | +/* arch/arm/mach-lh7a40x/include/mach/io.h | |
| 2 | 2 | * |
| 3 | 3 | * Copyright (C) 2004 Coastal Environmental Systems |
| 4 | 4 | * |
| @@ -11,7 +11,7 @@ · 6 unmodified lines | ||
| 11 | 11 | #ifndef __ASM_ARCH_IO_H |
| 12 | 12 | #define __ASM_ARCH_IO_H |
| 13 | 13 | |
| 14 | −#include <asm/hardware.h> | |
| 14 | +#include <mach/hardware.h> | |
| 15 | 15 | |
| 16 | 16 | #define IO_SPACE_LIMIT 0xffffffff |
| 17 | 17 | |
| @@ -1,4 +1,4 @@ | ||
| 1 | −/* include/asm-arm/arch-lh7a40x/irqs.h | |
| 1 | +/* arch/arm/mach-lh7a40x/include/mach/irqs.h | |
| 2 | 2 | * |
| 3 | 3 | * Copyright (C) 2004 Coastal Environmental Systems |
| 4 | 4 | * Copyright (C) 2004 Logic Product Development |
| @@ -1,4 +1,4 @@ | ||
| 1 | −/* include/asm-arm/arch-lh7a40x/memory.h | |
| 1 | +/* arch/arm/mach-lh7a40x/include/mach/memory.h | |
| 2 | 2 | * |
| 3 | 3 | * Copyright (C) 2004 Coastal Environmental Systems |
| 4 | 4 | * |
| @@ -1,4 +1,4 @@ | ||
| 1 | −/* include/asm-arm/arch-lh7a40x/registers.h | |
| 1 | +/* arch/arm/mach-lh7a40x/include/mach/registers.h | |
| 2 | 2 | * |
| 3 | 3 | * Copyright (C) 2004 Coastal Environmental Systems |
| 4 | 4 | * Copyright (C) 2004 Logic Product Development |
| @@ -9,7 +9,7 @@ · 4 unmodified lines | ||
| 9 | 9 | * |
| 10 | 10 | */ |
| 11 | 11 | |
| 12 | −#include <asm/arch/constants.h> | |
| 12 | +#include <mach/constants.h> | |
| 13 | 13 | |
| 14 | 14 | #ifndef __ASM_ARCH_REGISTERS_H |
| 15 | 15 | #define __ASM_ARCH_REGISTERS_H |
| @@ -1,5 +1,4 @@ | ||
| 1 | 1 | /* ssp.h |
| 2 | − $Id$ | |
| 3 | 2 | |
| 4 | 3 | written by Marc Singer |
| 5 | 4 | 6 Dec 2004 |
| @@ -1,4 +1,4 @@ | ||
| 1 | −/* include/asm-arm/arch-lh7a40x/system.h | |
| 1 | +/* arch/arm/mach-lh7a40x/include/mach/system.h | |
| 2 | 2 | * |
| 3 | 3 | * Copyright (C) 2004 Coastal Environmental Systems |
| 4 | 4 | * |
| @@ -1,4 +1,4 @@ | ||
| 1 | −/* include/asm-arm/arch-lh7a40x/timex.h | |
| 1 | +/* arch/arm/mach-lh7a40x/include/mach/timex.h | |
| 2 | 2 | * |
| 3 | 3 | * Copyright (C) 2004 Coastal Environmental Systems |
| 4 | 4 | * |
| @@ -8,7 +8,7 @@ · 3 unmodified lines | ||
| 8 | 8 | * |
| 9 | 9 | */ |
| 10 | 10 | |
| 11 | −#include <asm/arch/constants.h> | |
| 11 | +#include <mach/constants.h> | |
| 12 | 12 | |
| 13 | 13 | #define CLOCK_TICK_RATE (PLL_CLOCK/6/16) |
| 14 | 14 | |
| @@ -1,4 +1,4 @@ | ||
| 1 | −/* include/asm-arm/arch-lh7a40x/uncompress.h | |
| 1 | +/* arch/arm/mach-lh7a40x/include/mach/uncompress.h | |
| 2 | 2 | * |
| 3 | 3 | * Copyright (C) 2004 Coastal Environmental Systems |
| 4 | 4 | * |
| @@ -8,7 +8,7 @@ · 3 unmodified lines | ||
| 8 | 8 | * |
| 9 | 9 | */ |
| 10 | 10 | |
| 11 | −#include <asm/arch/registers.h> | |
| 11 | +#include <mach/registers.h> | |
| 12 | 12 | |
| 13 | 13 | #ifndef UART_R_DATA |
| 14 | 14 | # define UART_R_DATA (0x00) |
| @@ -1,4 +1,4 @@ | ||
| 1 | −/* include/asm-arm/arch-lh7a40x/vmalloc.h | |
| 1 | +/* arch/arm/mach-lh7a40x/include/mach/vmalloc.h | |
| 2 | 2 | * |
| 3 | 3 | * Copyright (C) 2004 Coastal Environmental Systems |
| 4 | 4 | * |
| @@ -12,10 +12,10 @@ · 11 unmodified lines | ||
| 12 | 12 | #include <linux/module.h> |
| 13 | 13 | #include <linux/interrupt.h> |
| 14 | 14 | |
| 15 | −#include <asm/hardware.h> | |
| 15 | +#include <mach/hardware.h> | |
| 16 | 16 | #include <asm/irq.h> |
| 17 | 17 | #include <asm/mach/irq.h> |
| 18 | −#include <asm/arch/irqs.h> | |
| 18 | +#include <mach/irqs.h> | |
| 19 | 19 | |
| 20 | 20 | #include "common.h" |
| 21 | 21 | |
| @@ -12,10 +12,10 @@ · 11 unmodified lines | ||
| 12 | 12 | #include <linux/module.h> |
| 13 | 13 | #include <linux/interrupt.h> |
| 14 | 14 | |
| 15 | −#include <asm/hardware.h> | |
| 15 | +#include <mach/hardware.h> | |
| 16 | 16 | #include <asm/irq.h> |
| 17 | 17 | #include <asm/mach/irq.h> |
| 18 | −#include <asm/arch/irqs.h> | |
| 18 | +#include <mach/irqs.h> | |
| 19 | 19 | |
| 20 | 20 | #include "common.h" |
| 21 | 21 | |
| @@ -13,10 +13,10 @@ · 12 unmodified lines | ||
| 13 | 13 | #include <linux/module.h> |
| 14 | 14 | #include <linux/interrupt.h> |
| 15 | 15 | |
| 16 | −#include <asm/hardware.h> | |
| 16 | +#include <mach/hardware.h> | |
| 17 | 17 | #include <asm/irq.h> |
| 18 | 18 | #include <asm/mach/irq.h> |
| 19 | −#include <asm/arch/irqs.h> | |
| 19 | +#include <mach/irqs.h> | |
| 20 | 20 | |
| 21 | 21 | #include "common.h" |
| 22 | 22 | |
| @@ -1,5 +1,4 @@ | ||
| 1 | 1 | /* lcd-panel.h |
| 2 | − $Id$ | |
| 3 | 2 | |
| 4 | 3 | written by Marc Singer |
| 5 | 4 | 18 Jul 2005 |
| @@ -46,9 +46,9 @@ · 45 unmodified lines | ||
| 46 | 46 | |
| 47 | 47 | #include <asm/io.h> |
| 48 | 48 | #include <asm/irq.h> |
| 49 | −#include <asm/hardware.h> | |
| 49 | +#include <mach/hardware.h> | |
| 50 | 50 | |
| 51 | −#include <asm/arch/ssp.h> | |
| 51 | +#include <mach/ssp.h> | |
| 52 | 52 | |
| 53 | 53 | //#define TALK |
| 54 | 54 | |
| @@ -14,7 +14,7 @@ · 13 unmodified lines | ||
| 14 | 14 | #include <linux/irq.h> |
| 15 | 15 | #include <linux/time.h> |
| 16 | 16 | |
| 17 | −#include <asm/hardware.h> | |
| 17 | +#include <mach/hardware.h> | |
| 18 | 18 | #include <asm/io.h> |
| 19 | 19 | #include <asm/irq.h> |
| 20 | 20 | #include <asm/leds.h> |
| @@ -11,7 +11,7 @@ · 10 unmodified lines | ||
| 11 | 11 | #include <linux/kernel.h> |
| 12 | 12 | #include <linux/init.h> |
| 13 | 13 | #include <linux/mbus.h> |
| 14 | −#include <asm/hardware.h> | |
| 14 | +#include <mach/hardware.h> | |
| 15 | 15 | #include <asm/io.h> |
| 16 | 16 | #include "common.h" |
| 17 | 17 | |
| @@ -18,9 +18,9 @@ · 17 unmodified lines | ||
| 18 | 18 | #include <asm/timex.h> |
| 19 | 19 | #include <asm/mach/map.h> |
| 20 | 20 | #include <asm/mach/time.h> |
| 21 | −#include <asm/arch/loki.h> | |
| 22 | −#include <asm/plat-orion/orion_nand.h> | |
| 23 | −#include <asm/plat-orion/time.h> | |
| 21 | +#include <mach/loki.h> | |
| 22 | +#include <plat/orion_nand.h> | |
| 23 | +#include <plat/time.h> | |
| 24 | 24 | #include "common.h" |
| 25 | 25 | |
| 26 | 26 | /***************************************************************************** |
| @@ -1,12 +1,12 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-loki/debug-macro.S | |
| 2 | + * arch/arm/mach-loki/include/mach/debug-macro.S | |
| 3 | 3 | * |
| 4 | 4 | * This program is free software; you can redistribute it and/or modify |
| 5 | 5 | * it under the terms of the GNU General Public License version 2 as |
| 6 | 6 | * published by the Free Software Foundation. |
| 7 | 7 | */ |
| 8 | 8 | |
| 9 | −#include <asm/arch/loki.h> | |
| 9 | +#include <mach/loki.h> | |
| 10 | 10 | |
| 11 | 11 | .macro addruart,rx |
| 12 | 12 | mrc p15, 0, \rx, c1, c0 |
File renamed without changes.
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-loki/entry-macro.S | |
| 2 | + * arch/arm/mach-loki/include/mach/entry-macro.S | |
| 3 | 3 | * |
| 4 | 4 | * Low-level IRQ helper macros for Marvell Loki (88RC8480) platforms |
| 5 | 5 | * |
| @@ -8,7 +8,7 @@ · 2 unmodified lines | ||
| 8 | 8 | * warranty of any kind, whether express or implied. |
| 9 | 9 | */ |
| 10 | 10 | |
| 11 | −#include <asm/arch/loki.h> | |
| 11 | +#include <mach/loki.h> | |
| 12 | 12 | |
| 13 | 13 | .macro disable_fiq |
| 14 | 14 | .endm |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-loki/hardware.h | |
| 2 | + * arch/arm/mach-loki/include/mach/hardware.h | |
| 3 | 3 | * |
| 4 | 4 | * This program is free software; you can redistribute it and/or modify |
| 5 | 5 | * it under the terms of the GNU General Public License version 2 as |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-loki/io.h | |
| 2 | + * arch/arm/mach-loki/include/mach/io.h | |
| 3 | 3 | * |
| 4 | 4 | * This file is licensed under the terms of the GNU General Public |
| 5 | 5 | * License version 2. This program is licensed "as is" without any |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-loki/irqs.h | |
| 2 | + * arch/arm/mach-loki/include/mach/irqs.h | |
| 3 | 3 | * |
| 4 | 4 | * IRQ definitions for Marvell Loki (88RC8480) SoCs |
| 5 | 5 | * |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-loki/loki.h | |
| 2 | + * arch/arm/mach-loki/include/mach/loki.h | |
| 3 | 3 | * |
| 4 | 4 | * Generic definitions for Marvell Loki (88RC8480) SoC flavors |
| 5 | 5 | * |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-loki/memory.h | |
| 2 | + * arch/arm/mach-loki/include/mach/memory.h | |
| 3 | 3 | */ |
| 4 | 4 | |
| 5 | 5 | #ifndef __ASM_ARCH_MEMORY_H |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-loki/system.h | |
| 2 | + * arch/arm/mach-loki/include/mach/system.h | |
| 3 | 3 | * |
| 4 | 4 | * This file is licensed under the terms of the GNU General Public |
| 5 | 5 | * License version 2. This program is licensed "as is" without any |
| @@ -9,8 +9,8 @@ · 3 unmodified lines | ||
| 9 | 9 | #ifndef __ASM_ARCH_SYSTEM_H |
| 10 | 10 | #define __ASM_ARCH_SYSTEM_H |
| 11 | 11 | |
| 12 | −#include <asm/arch/hardware.h> | |
| 13 | −#include <asm/arch/loki.h> | |
| 12 | +#include <mach/hardware.h> | |
| 13 | +#include <mach/loki.h> | |
| 14 | 14 | |
| 15 | 15 | static inline void arch_idle(void) |
| 16 | 16 | { |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-loki/timex.h | |
| 2 | + * arch/arm/mach-loki/include/mach/timex.h | |
| 3 | 3 | * |
| 4 | 4 | * This file is licensed under the terms of the GNU General Public |
| 5 | 5 | * License version 2. This program is licensed "as is" without any |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-loki/uncompress.h | |
| 2 | + * arch/arm/mach-loki/include/mach/uncompress.h | |
| 3 | 3 | * |
| 4 | 4 | * This file is licensed under the terms of the GNU General Public |
| 5 | 5 | * License version 2. This program is licensed "as is" without any |
| @@ -7,7 +7,7 @@ · 1 unmodified line | ||
| 7 | 7 | */ |
| 8 | 8 | |
| 9 | 9 | #include <linux/serial_reg.h> |
| 10 | −#include <asm/arch/loki.h> | |
| 10 | +#include <mach/loki.h> | |
| 11 | 11 | |
| 12 | 12 | #define SERIAL_BASE ((unsigned char *)UART0_PHYS_BASE) |
| 13 | 13 | |
| @@ -0,0 +1,5 @@ | ||
| 1 | +/* | |
| 2 | + * arch/arm/mach-loki/include/mach/vmalloc.h | |
| 3 | + */ | |
| 4 | + | |
| 5 | +#define VMALLOC_END 0xfe800000 | |
| @@ -12,7 +12,7 @@ · 11 unmodified lines | ||
| 12 | 12 | #include <linux/init.h> |
| 13 | 13 | #include <linux/irq.h> |
| 14 | 14 | #include <asm/io.h> |
| 15 | −#include <asm/plat-orion/irq.h> | |
| 15 | +#include <plat/irq.h> | |
| 16 | 16 | #include "common.h" |
| 17 | 17 | |
| 18 | 18 | void __init loki_init_irq(void) |
| @@ -19,7 +19,7 @@ · 18 unmodified lines | ||
| 19 | 19 | #include <linux/mv643xx_eth.h> |
| 20 | 20 | #include <asm/mach-types.h> |
| 21 | 21 | #include <asm/mach/arch.h> |
| 22 | −#include <asm/arch/loki.h> | |
| 22 | +#include <mach/loki.h> | |
| 23 | 23 | #include "common.h" |
| 24 | 24 | |
| 25 | 25 | #define LB88RC8480_FLASH_BOOT_CS_BASE 0xf8000000 |
| @@ -19,14 +19,14 @@ · 18 unmodified lines | ||
| 19 | 19 | #include <linux/platform_device.h> |
| 20 | 20 | #include <linux/input.h> |
| 21 | 21 | |
| 22 | −#include <asm/hardware.h> | |
| 22 | +#include <mach/hardware.h> | |
| 23 | 23 | #include <asm/mach-types.h> |
| 24 | 24 | #include <asm/mach/arch.h> |
| 25 | 25 | #include <asm/mach/map.h> |
| 26 | 26 | #include <asm/mach/flash.h> |
| 27 | 27 | |
| 28 | −#include <asm/arch/board.h> | |
| 29 | −#include <asm/arch/msm_iomap.h> | |
| 28 | +#include <mach/board.h> | |
| 29 | +#include <mach/msm_iomap.h> | |
| 30 | 30 | |
| 31 | 31 | #include <asm/io.h> |
| 32 | 32 | #include <asm/delay.h> |
| @@ -28,9 +28,9 @@ · 27 unmodified lines | ||
| 28 | 28 | #include <linux/mtd/nand.h> |
| 29 | 29 | #include <linux/mtd/partitions.h> |
| 30 | 30 | |
| 31 | −#include <asm/arch/msm_iomap.h> | |
| 31 | +#include <mach/msm_iomap.h> | |
| 32 | 32 | |
| 33 | −#include <asm/arch/board.h> | |
| 33 | +#include <mach/board.h> | |
| 34 | 34 | |
| 35 | 35 | struct flash_platform_data msm_nand_data = { |
| 36 | 36 | .parts = 0, |
| @@ -15,7 +15,7 @@ · 14 unmodified lines | ||
| 15 | 15 | |
| 16 | 16 | #include <asm/io.h> |
| 17 | 17 | #include <linux/interrupt.h> |
| 18 | −#include <asm/arch/dma.h> | |
| 18 | +#include <mach/dma.h> | |
| 19 | 19 | |
| 20 | 20 | #define MSM_DMOV_CHANNEL_COUNT 16 |
| 21 | 21 | |
| @@ -1,4 +1,4 @@ | ||
| 1 | −/* linux/include/asm-arm/arch-msm/idle.S | |
| 1 | +/* arch/arm/mach-msm/include/mach/idle.S | |
| 2 | 2 | * |
| 3 | 3 | * Idle processing for MSM7K - work around bugs with SWFI. |
| 4 | 4 | * |
| @@ -1,4 +1,4 @@ | ||
| 1 | −/* linux/include/asm-arm/arch-msm/board.h | |
| 1 | +/* arch/arm/mach-msm/include/mach/board.h | |
| 2 | 2 | * |
| 3 | 3 | * Copyright (C) 2007 Google, Inc. |
| 4 | 4 | * Author: Brian Swetland <swetland@google.com> |
| @@ -1,4 +1,4 @@ | ||
| 1 | −/* include/asm-arm/arch-msm7200/debug-macro.S | |
| 1 | +/* arch/arm/mach-msm7200/include/mach/debug-macro.S | |
| 2 | 2 | * |
| 3 | 3 | * Copyright (C) 2007 Google, Inc. |
| 4 | 4 | * Author: Brian Swetland <swetland@google.com> |
| @@ -14,8 +14,8 @@ · 9 unmodified lines | ||
| 14 | 14 | * |
| 15 | 15 | */ |
| 16 | 16 | |
| 17 | −#include <asm/hardware.h> | |
| 18 | −#include <asm/arch/msm_iomap.h> | |
| 17 | +#include <mach/hardware.h> | |
| 18 | +#include <mach/msm_iomap.h> | |
| 19 | 19 | |
| 20 | 20 | .macro addruart,rx |
| 21 | 21 | @ see if the MMU is enabled and select appropriate base address |
| @@ -1,4 +1,4 @@ | ||
| 1 | −/* linux/include/asm-arm/arch-msm/dma.h | |
| 1 | +/* arch/arm/mach-msm/include/mach/dma.h | |
| 2 | 2 | * |
| 3 | 3 | * Copyright (C) 2007 Google, Inc. |
| 4 | 4 | * |
| @@ -16,7 +16,7 @@ · 11 unmodified lines | ||
| 16 | 16 | #ifndef __ASM_ARCH_MSM_DMA_H |
| 17 | 17 | |
| 18 | 18 | #include <linux/list.h> |
| 19 | −#include <asm/arch/msm_iomap.h> | |
| 19 | +#include <mach/msm_iomap.h> | |
| 20 | 20 | |
| 21 | 21 | struct msm_dmov_cmd { |
| 22 | 22 | struct list_head list; |
| @@ -1,4 +1,4 @@ | ||
| 1 | −/* include/asm-arm/arch-msm7200/entry-macro.S | |
| 1 | +/* arch/arm/mach-msm7200/include/mach/entry-macro.S | |
| 2 | 2 | * |
| 3 | 3 | * Copyright (C) 2007 Google, Inc. |
| 4 | 4 | * Author: Brian Swetland <swetland@google.com> |
| @@ -14,7 +14,7 @@ · 9 unmodified lines | ||
| 14 | 14 | * |
| 15 | 15 | */ |
| 16 | 16 | |
| 17 | −#include <asm/arch/msm_iomap.h> | |
| 17 | +#include <mach/msm_iomap.h> | |
| 18 | 18 | |
| 19 | 19 | .macro disable_fiq |
| 20 | 20 | .endm |
| @@ -1,4 +1,4 @@ | ||
| 1 | −/* linux/include/asm-arm/arch-msm/hardware.h | |
| 1 | +/* arch/arm/mach-msm/include/mach/hardware.h | |
| 2 | 2 | * |
| 3 | 3 | * Copyright (C) 2007 Google, Inc. |
| 4 | 4 | * |
| @@ -1,4 +1,4 @@ | ||
| 1 | −/* include/asm-arm/arch-msm/io.h | |
| 1 | +/* arch/arm/mach-msm/include/mach/io.h | |
| 2 | 2 | * |
| 3 | 3 | * Copyright (C) 2007 Google, Inc. |
| 4 | 4 | * |
| @@ -1,4 +1,4 @@ | ||
| 1 | −/* linux/include/asm-arm/arch-msm/irqs.h | |
| 1 | +/* arch/arm/mach-msm/include/mach/irqs.h | |
| 2 | 2 | * |
| 3 | 3 | * Copyright (C) 2007 Google, Inc. |
| 4 | 4 | * Author: Brian Swetland <swetland@google.com> |
| @@ -1,4 +1,4 @@ | ||
| 1 | −/* linux/include/asm-arm/arch-msm/memory.h | |
| 1 | +/* arch/arm/mach-msm/include/mach/memory.h | |
| 2 | 2 | * |
| 3 | 3 | * Copyright (C) 2007 Google, Inc. |
| 4 | 4 | * |
| @@ -1,4 +1,4 @@ | ||
| 1 | −/* linux/include/asm-arm/arch-msm/msm_iomap.h | |
| 1 | +/* arch/arm/mach-msm/include/mach/msm_iomap.h | |
| 2 | 2 | * |
| 3 | 3 | * Copyright (C) 2007 Google, Inc. |
| 4 | 4 | * Author: Brian Swetland <swetland@google.com> |
| @@ -1,4 +1,4 @@ | ||
| 1 | −/* linux/include/asm-arm/arch-msm/system.h | |
| 1 | +/* arch/arm/mach-msm/include/mach/system.h | |
| 2 | 2 | * |
| 3 | 3 | * Copyright (C) 2007 Google, Inc. |
| 4 | 4 | * |
| @@ -13,7 +13,7 @@ · 8 unmodified lines | ||
| 13 | 13 | * |
| 14 | 14 | */ |
| 15 | 15 | |
| 16 | −#include <asm/hardware.h> | |
| 16 | +#include <mach/hardware.h> | |
| 17 | 17 | |
| 18 | 18 | void arch_idle(void); |
| 19 | 19 | |
| @@ -1,4 +1,4 @@ | ||
| 1 | −/* linux/include/asm-arm/arch-msm/timex.h | |
| 1 | +/* arch/arm/mach-msm/include/mach/timex.h | |
| 2 | 2 | * |
| 3 | 3 | * Copyright (C) 2007 Google, Inc. |
| 4 | 4 | * |
| @@ -1,4 +1,4 @@ | ||
| 1 | −/* linux/include/asm-arm/arch-msm/uncompress.h | |
| 1 | +/* arch/arm/mach-msm/include/mach/uncompress.h | |
| 2 | 2 | * |
| 3 | 3 | * Copyright (C) 2007 Google, Inc. |
| 4 | 4 | * |
| @@ -1,4 +1,4 @@ | ||
| 1 | −/* linux/include/asm-arm/arch-msm/vmalloc.h | |
| 1 | +/* arch/arm/mach-msm/include/mach/vmalloc.h | |
| 2 | 2 | * |
| 3 | 3 | * Copyright (C) 2007 Google, Inc. |
| 4 | 4 | * |
| @@ -19,13 +19,13 @@ · 18 unmodified lines | ||
| 19 | 19 | #include <linux/kernel.h> |
| 20 | 20 | #include <linux/init.h> |
| 21 | 21 | |
| 22 | −#include <asm/hardware.h> | |
| 22 | +#include <mach/hardware.h> | |
| 23 | 23 | #include <asm/io.h> |
| 24 | 24 | #include <asm/page.h> |
| 25 | −#include <asm/arch/msm_iomap.h> | |
| 25 | +#include <mach/msm_iomap.h> | |
| 26 | 26 | #include <asm/mach/map.h> |
| 27 | 27 | |
| 28 | −#include <asm/arch/board.h> | |
| 28 | +#include <mach/board.h> | |
| 29 | 29 | |
| 30 | 30 | #define MSM_DEVICE(name) { \ |
| 31 | 31 | .virtual = MSM_##name##_BASE, \ |
| @@ -21,11 +21,11 @@ · 20 unmodified lines | ||
| 21 | 21 | #include <linux/timer.h> |
| 22 | 22 | |
| 23 | 23 | #include <linux/irq.h> |
| 24 | −#include <asm/hardware.h> | |
| 24 | +#include <mach/hardware.h> | |
| 25 | 25 | |
| 26 | 26 | #include <asm/io.h> |
| 27 | 27 | |
| 28 | −#include <asm/arch/msm_iomap.h> | |
| 28 | +#include <mach/msm_iomap.h> | |
| 29 | 29 | |
| 30 | 30 | #define VIC_REG(off) (MSM_VIC_BASE + (off)) |
| 31 | 31 | |
| @@ -22,7 +22,7 @@ · 21 unmodified lines | ||
| 22 | 22 | #include <linux/delay.h> |
| 23 | 23 | |
| 24 | 24 | #include <asm/mach/time.h> |
| 25 | −#include <asm/arch/msm_iomap.h> | |
| 25 | +#include <mach/msm_iomap.h> | |
| 26 | 26 | |
| 27 | 27 | #include <asm/io.h> |
| 28 | 28 | |
| @@ -17,11 +17,11 @@ · 16 unmodified lines | ||
| 17 | 17 | #include <linux/ata_platform.h> |
| 18 | 18 | #include <asm/mach/map.h> |
| 19 | 19 | #include <asm/mach/time.h> |
| 20 | −#include <asm/arch/mv78xx0.h> | |
| 21 | −#include <asm/plat-orion/cache-feroceon-l2.h> | |
| 22 | −#include <asm/plat-orion/ehci-orion.h> | |
| 23 | −#include <asm/plat-orion/orion_nand.h> | |
| 24 | −#include <asm/plat-orion/time.h> | |
| 20 | +#include <mach/mv78xx0.h> | |
| 21 | +#include <plat/cache-feroceon-l2.h> | |
| 22 | +#include <plat/ehci-orion.h> | |
| 23 | +#include <plat/orion_nand.h> | |
| 24 | +#include <plat/time.h> | |
| 25 | 25 | #include "common.h" |
| 26 | 26 | |
| 27 | 27 | |
| @@ -13,7 +13,7 @@ · 12 unmodified lines | ||
| 13 | 13 | #include <linux/platform_device.h> |
| 14 | 14 | #include <linux/ata_platform.h> |
| 15 | 15 | #include <linux/mv643xx_eth.h> |
| 16 | −#include <asm/arch/mv78xx0.h> | |
| 16 | +#include <mach/mv78xx0.h> | |
| 17 | 17 | #include <asm/mach-types.h> |
| 18 | 18 | #include <asm/mach/arch.h> |
| 19 | 19 | #include "common.h" |
| @@ -1,12 +1,12 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-mv78xx0/debug-macro.S | |
| 2 | + * arch/arm/mach-mv78xx0/include/mach/debug-macro.S | |
| 3 | 3 | * |
| 4 | 4 | * This program is free software; you can redistribute it and/or modify |
| 5 | 5 | * it under the terms of the GNU General Public License version 2 as |
| 6 | 6 | * published by the Free Software Foundation. |
| 7 | 7 | */ |
| 8 | 8 | |
| 9 | −#include <asm/arch/mv78xx0.h> | |
| 9 | +#include <mach/mv78xx0.h> | |
| 10 | 10 | |
| 11 | 11 | .macro addruart,rx |
| 12 | 12 | mrc p15, 0, \rx, c1, c0 |
File renamed without changes.
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-mv78xx0/entry-macro.S | |
| 2 | + * arch/arm/mach-mv78xx0/include/mach/entry-macro.S | |
| 3 | 3 | * |
| 4 | 4 | * Low-level IRQ helper macros for Marvell MV78xx0 platforms |
| 5 | 5 | * |
| @@ -8,7 +8,7 @@ · 2 unmodified lines | ||
| 8 | 8 | * warranty of any kind, whether express or implied. |
| 9 | 9 | */ |
| 10 | 10 | |
| 11 | −#include <asm/arch/mv78xx0.h> | |
| 11 | +#include <mach/mv78xx0.h> | |
| 12 | 12 | |
| 13 | 13 | .macro disable_fiq |
| 14 | 14 | .endm |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-mv78xx0/hardware.h | |
| 2 | + * arch/arm/mach-mv78xx0/include/mach/hardware.h | |
| 3 | 3 | * |
| 4 | 4 | * This file is licensed under the terms of the GNU General Public |
| 5 | 5 | * License version 2. This program is licensed "as is" without any |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-mv78xx0/io.h | |
| 2 | + * arch/arm/mach-mv78xx0/include/mach/io.h | |
| 3 | 3 | * |
| 4 | 4 | * This file is licensed under the terms of the GNU General Public |
| 5 | 5 | * License version 2. This program is licensed "as is" without any |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-mv78xx0/irqs.h | |
| 2 | + * arch/arm/mach-mv78xx0/include/mach/irqs.h | |
| 3 | 3 | * |
| 4 | 4 | * IRQ definitions for Marvell MV78xx0 SoCs |
| 5 | 5 | * |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-kirkwood/memory.h | |
| 2 | + * arch/arm/mach-mv78xx0/include/mach/memory.h | |
| 3 | 3 | */ |
| 4 | 4 | |
| 5 | 5 | #ifndef __ASM_ARCH_MEMORY_H |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-mv78xx0/mv78xx0.h | |
| 2 | + * arch/arm/mach-mv78xx0/include/mach/mv78xx0.h | |
| 3 | 3 | * |
| 4 | 4 | * Generic definitions for Marvell MV78xx0 SoC flavors: |
| 5 | 5 | * MV781x0 and MV782x0. |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-kirkwood/system.h | |
| 2 | + * arch/arm/mach-mv78xx0/include/mach/system.h | |
| 3 | 3 | * |
| 4 | 4 | * This file is licensed under the terms of the GNU General Public |
| 5 | 5 | * License version 2. This program is licensed "as is" without any |
| @@ -9,8 +9,8 @@ · 3 unmodified lines | ||
| 9 | 9 | #ifndef __ASM_ARCH_SYSTEM_H |
| 10 | 10 | #define __ASM_ARCH_SYSTEM_H |
| 11 | 11 | |
| 12 | −#include <asm/arch/hardware.h> | |
| 13 | −#include <asm/arch/kirkwood.h> | |
| 12 | +#include <mach/hardware.h> | |
| 13 | +#include <mach/mv78xx0.h> | |
| 14 | 14 | |
| 15 | 15 | static inline void arch_idle(void) |
| 16 | 16 | { |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-mv78xx0/timex.h | |
| 2 | + * arch/arm/mach-mv78xx0/include/mach/timex.h | |
| 3 | 3 | * |
| 4 | 4 | * This file is licensed under the terms of the GNU General Public |
| 5 | 5 | * License version 2. This program is licensed "as is" without any |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-mv78xx0/uncompress.h | |
| 2 | + * arch/arm/mach-mv78xx0/include/mach/uncompress.h | |
| 3 | 3 | * |
| 4 | 4 | * This file is licensed under the terms of the GNU General Public |
| 5 | 5 | * License version 2. This program is licensed "as is" without any |
| @@ -7,7 +7,7 @@ · 1 unmodified line | ||
| 7 | 7 | */ |
| 8 | 8 | |
| 9 | 9 | #include <linux/serial_reg.h> |
| 10 | −#include <asm/arch/mv78xx0.h> | |
| 10 | +#include <mach/mv78xx0.h> | |
| 11 | 11 | |
| 12 | 12 | #define SERIAL_BASE ((unsigned char *)UART0_PHYS_BASE) |
| 13 | 13 | |
| @@ -0,0 +1,5 @@ | ||
| 1 | +/* | |
| 2 | + * arch/arm/mach-mv78xx0/include/mach/vmalloc.h | |
| 3 | + */ | |
| 4 | + | |
| 5 | +#define VMALLOC_END 0xfe000000 | |
| @@ -11,8 +11,8 @@ · 10 unmodified lines | ||
| 11 | 11 | #include <linux/kernel.h> |
| 12 | 12 | #include <linux/init.h> |
| 13 | 13 | #include <linux/pci.h> |
| 14 | −#include <asm/arch/mv78xx0.h> | |
| 15 | −#include <asm/plat-orion/irq.h> | |
| 14 | +#include <mach/mv78xx0.h> | |
| 15 | +#include <plat/irq.h> | |
| 16 | 16 | #include "common.h" |
| 17 | 17 | |
| 18 | 18 | void __init mv78xx0_init_irq(void) |
| @@ -12,7 +12,7 @@ · 11 unmodified lines | ||
| 12 | 12 | #include <linux/pci.h> |
| 13 | 13 | #include <linux/mbus.h> |
| 14 | 14 | #include <asm/mach/pci.h> |
| 15 | −#include <asm/plat-orion/pcie.h> | |
| 15 | +#include <plat/pcie.h> | |
| 16 | 16 | #include "common.h" |
| 17 | 17 | |
| 18 | 18 | struct pcie_port { |
| @@ -22,10 +22,9 @@ · 21 unmodified lines | ||
| 22 | 22 | #include <linux/module.h> |
| 23 | 23 | #include <linux/spinlock.h> |
| 24 | 24 | |
| 25 | −#include <asm/arch/clock.h> | |
| 26 | −#include <asm/arch/common.h> | |
| 25 | +#include <mach/clock.h> | |
| 26 | +#include <mach/common.h> | |
| 27 | 27 | #include <asm/div64.h> |
| 28 | −#include <asm/mach-types.h> | |
| 29 | 28 | |
| 30 | 29 | #include "crm_regs.h" |
| 31 | 30 | |
| @@ -24,7 +24,7 @@ · 23 unmodified lines | ||
| 24 | 24 | #include <linux/io.h> |
| 25 | 25 | #include <linux/module.h> |
| 26 | 26 | |
| 27 | −#include <asm/hardware.h> | |
| 27 | +#include <mach/hardware.h> | |
| 28 | 28 | |
| 29 | 29 | #include "crm_regs.h" |
| 30 | 30 | |
| @@ -20,7 +20,7 @@ · 19 unmodified lines | ||
| 20 | 20 | #ifndef __ARCH_ARM_MACH_MX2_CRM_REGS_H__ |
| 21 | 21 | #define __ARCH_ARM_MACH_MX2_CRM_REGS_H__ |
| 22 | 22 | |
| 23 | −#include <asm/arch/hardware.h> | |
| 23 | +#include <mach/hardware.h> | |
| 24 | 24 | |
| 25 | 25 | /* Register offsets */ |
| 26 | 26 | #define CCM_CSCR (IO_ADDRESS(CCM_BASE_ADDR) + 0x0) |
| @@ -32,7 +32,7 @@ · 31 unmodified lines | ||
| 32 | 32 | #include <linux/platform_device.h> |
| 33 | 33 | #include <linux/gpio.h> |
| 34 | 34 | |
| 35 | −#include <asm/hardware.h> | |
| 35 | +#include <mach/hardware.h> | |
| 36 | 36 | |
| 37 | 37 | /* |
| 38 | 38 | * Resource definition for the MXC IrDA |
| @@ -20,7 +20,7 @@ · 19 unmodified lines | ||
| 20 | 20 | |
| 21 | 21 | #include <linux/mm.h> |
| 22 | 22 | #include <linux/init.h> |
| 23 | −#include <asm/hardware.h> | |
| 23 | +#include <mach/hardware.h> | |
| 24 | 24 | #include <asm/pgtable.h> |
| 25 | 25 | #include <asm/mach/map.h> |
| 26 | 26 | |
| @@ -23,16 +23,16 @@ · 22 unmodified lines | ||
| 23 | 23 | #include <linux/mtd/map.h> |
| 24 | 24 | #include <linux/mtd/partitions.h> |
| 25 | 25 | #include <linux/mtd/physmap.h> |
| 26 | −#include <asm/arch/common.h> | |
| 27 | −#include <asm/hardware.h> | |
| 26 | +#include <mach/common.h> | |
| 27 | +#include <mach/hardware.h> | |
| 28 | 28 | #include <asm/mach-types.h> |
| 29 | 29 | #include <asm/mach/arch.h> |
| 30 | 30 | #include <asm/mach/time.h> |
| 31 | 31 | #include <asm/mach/map.h> |
| 32 | −#include <asm/arch/gpio.h> | |
| 33 | −#include <asm/arch/imx-uart.h> | |
| 34 | −#include <asm/arch/iomux-mx1-mx2.h> | |
| 35 | −#include <asm/arch/board-mx27ads.h> | |
| 32 | +#include <mach/gpio.h> | |
| 33 | +#include <mach/imx-uart.h> | |
| 34 | +#include <mach/iomux-mx1-mx2.h> | |
| 35 | +#include <mach/board-mx27ads.h> | |
| 36 | 36 | |
| 37 | 37 | /* ADS's NOR flash */ |
| 38 | 38 | static struct physmap_flash_data mx27ads_flash_data = { |
| @@ -21,12 +21,12 @@ · 20 unmodified lines | ||
| 21 | 21 | #include <linux/mtd/physmap.h> |
| 22 | 22 | #include <asm/mach/arch.h> |
| 23 | 23 | #include <asm/mach-types.h> |
| 24 | −#include <asm/arch/common.h> | |
| 25 | −#include <asm/hardware.h> | |
| 26 | −#include <asm/arch/iomux-mx1-mx2.h> | |
| 24 | +#include <mach/common.h> | |
| 25 | +#include <mach/hardware.h> | |
| 26 | +#include <mach/iomux-mx1-mx2.h> | |
| 27 | 27 | #include <asm/mach/time.h> |
| 28 | −#include <asm/arch/imx-uart.h> | |
| 29 | −#include <asm/arch/board-pcm038.h> | |
| 28 | +#include <mach/imx-uart.h> | |
| 29 | +#include <mach/board-pcm038.h> | |
| 30 | 30 | |
| 31 | 31 | /* |
| 32 | 32 | * Phytec's phyCORE-i.MX27 comes with 32MiB flash, |
| @@ -17,8 +17,7 @@ · 16 unmodified lines | ||
| 17 | 17 | */ |
| 18 | 18 | |
| 19 | 19 | #include <linux/platform_device.h> |
| 20 | −#include <asm/hardware.h> | |
| 21 | −#include <asm/mach-types.h> | |
| 20 | +#include <mach/hardware.h> | |
| 22 | 21 | #include <asm/mach/arch.h> |
| 23 | 22 | |
| 24 | 23 | /* |
| @@ -20,8 +20,8 @@ · 19 unmodified lines | ||
| 20 | 20 | #include <linux/module.h> |
| 21 | 21 | #include <linux/platform_device.h> |
| 22 | 22 | #include <linux/serial.h> |
| 23 | −#include <asm/hardware.h> | |
| 24 | −#include <asm/arch/imx-uart.h> | |
| 23 | +#include <mach/hardware.h> | |
| 24 | +#include <mach/imx-uart.h> | |
| 25 | 25 | |
| 26 | 26 | static struct resource uart0[] = { |
| 27 | 27 | { |
| @@ -23,7 +23,7 @@ · 22 unmodified lines | ||
| 23 | 23 | #include <linux/clk.h> |
| 24 | 24 | #include <linux/io.h> |
| 25 | 25 | |
| 26 | −#include <asm/arch/hardware.h> | |
| 26 | +#include <mach/hardware.h> | |
| 27 | 27 | #include <asm/proc-fns.h> |
| 28 | 28 | #include <asm/system.h> |
| 29 | 29 | |
| @@ -23,7 +23,7 @@ · 22 unmodified lines | ||
| 23 | 23 | #include <linux/clk.h> |
| 24 | 24 | #include <linux/err.h> |
| 25 | 25 | #include <linux/io.h> |
| 26 | −#include <asm/arch/clock.h> | |
| 26 | +#include <mach/clock.h> | |
| 27 | 27 | #include <asm/div64.h> |
| 28 | 28 | |
| 29 | 29 | #include "crm_regs.h" |
| @@ -21,8 +21,8 @@ · 20 unmodified lines | ||
| 21 | 21 | #include <linux/platform_device.h> |
| 22 | 22 | #include <linux/serial.h> |
| 23 | 23 | #include <linux/gpio.h> |
| 24 | −#include <asm/hardware.h> | |
| 25 | −#include <asm/arch/imx-uart.h> | |
| 24 | +#include <mach/hardware.h> | |
| 25 | +#include <mach/imx-uart.h> | |
| 26 | 26 | |
| 27 | 27 | static struct resource uart0[] = { |
| 28 | 28 | { |
| @@ -21,9 +21,9 @@ · 20 unmodified lines | ||
| 21 | 21 | #include <linux/spinlock.h> |
| 22 | 22 | #include <linux/io.h> |
| 23 | 23 | #include <linux/gpio.h> |
| 24 | −#include <asm/hardware.h> | |
| 25 | −#include <asm/arch/gpio.h> | |
| 26 | −#include <asm/arch/iomux-mx3.h> | |
| 24 | +#include <mach/hardware.h> | |
| 25 | +#include <mach/gpio.h> | |
| 26 | +#include <mach/iomux-mx3.h> | |
| 27 | 27 | |
| 28 | 28 | /* |
| 29 | 29 | * IOMUX register (base) addresses |
| @@ -22,10 +22,10 @@ · 21 unmodified lines | ||
| 22 | 22 | |
| 23 | 23 | #include <linux/mm.h> |
| 24 | 24 | #include <linux/init.h> |
| 25 | −#include <asm/hardware.h> | |
| 25 | +#include <mach/hardware.h> | |
| 26 | 26 | #include <asm/pgtable.h> |
| 27 | 27 | #include <asm/mach/map.h> |
| 28 | −#include <asm/arch/common.h> | |
| 28 | +#include <mach/common.h> | |
| 29 | 29 | |
| 30 | 30 | /*! |
| 31 | 31 | * @file mm.c |
| @@ -23,14 +23,14 @@ · 22 unmodified lines | ||
| 23 | 23 | #include <linux/clk.h> |
| 24 | 24 | #include <linux/serial_8250.h> |
| 25 | 25 | |
| 26 | −#include <asm/hardware.h> | |
| 26 | +#include <mach/hardware.h> | |
| 27 | 27 | #include <asm/mach-types.h> |
| 28 | 28 | #include <asm/mach/arch.h> |
| 29 | 29 | #include <asm/mach/time.h> |
| 30 | 30 | #include <asm/memory.h> |
| 31 | 31 | #include <asm/mach/map.h> |
| 32 | −#include <asm/arch/common.h> | |
| 33 | −#include <asm/arch/board-mx31ads.h> | |
| 32 | +#include <mach/common.h> | |
| 33 | +#include <mach/board-mx31ads.h> | |
| 34 | 34 | |
| 35 | 35 | /*! |
| 36 | 36 | * @file mx31ads.c |
| @@ -23,15 +23,15 @@ · 22 unmodified lines | ||
| 23 | 23 | #include <linux/kernel.h> |
| 24 | 24 | #include <linux/memory.h> |
| 25 | 25 | |
| 26 | −#include <asm/hardware.h> | |
| 26 | +#include <mach/hardware.h> | |
| 27 | 27 | #include <asm/mach-types.h> |
| 28 | 28 | #include <asm/mach/arch.h> |
| 29 | 29 | #include <asm/mach/time.h> |
| 30 | 30 | #include <asm/mach/map.h> |
| 31 | −#include <asm/arch/common.h> | |
| 31 | +#include <mach/common.h> | |
| 32 | 32 | #include <asm/page.h> |
| 33 | 33 | #include <asm/setup.h> |
| 34 | −#include <asm/arch/board-mx31lite.h> | |
| 34 | +#include <mach/board-mx31lite.h> | |
| 35 | 35 | |
| 36 | 36 | /* |
| 37 | 37 | * This file contains the board-specific initialization routines. |
| @@ -23,15 +23,15 @@ · 22 unmodified lines | ||
| 23 | 23 | #include <linux/mtd/physmap.h> |
| 24 | 24 | #include <linux/memory.h> |
| 25 | 25 | |
| 26 | −#include <asm/hardware.h> | |
| 26 | +#include <mach/hardware.h> | |
| 27 | 27 | #include <asm/mach-types.h> |
| 28 | 28 | #include <asm/mach/arch.h> |
| 29 | 29 | #include <asm/mach/time.h> |
| 30 | 30 | #include <asm/mach/map.h> |
| 31 | −#include <asm/arch/common.h> | |
| 32 | −#include <asm/arch/imx-uart.h> | |
| 33 | −#include <asm/arch/iomux-mx3.h> | |
| 34 | −#include <asm/arch/board-pcm037.h> | |
| 31 | +#include <mach/common.h> | |
| 32 | +#include <mach/imx-uart.h> | |
| 33 | +#include <mach/iomux-mx3.h> | |
| 34 | +#include <mach/board-pcm037.h> | |
| 35 | 35 | |
| 36 | 36 | static struct physmap_flash_data pcm037_flash_data = { |
| 37 | 37 | .width = 2, |
| @@ -23,8 +23,8 @@ · 22 unmodified lines | ||
| 23 | 23 | #include <linux/amba/bus.h> |
| 24 | 24 | #include <linux/amba/clcd.h> |
| 25 | 25 | |
| 26 | −#include <asm/arch/netx-regs.h> | |
| 27 | −#include <asm/hardware.h> | |
| 26 | +#include <mach/netx-regs.h> | |
| 27 | +#include <mach/hardware.h> | |
| 28 | 28 | |
| 29 | 29 | struct clk {}; |
| 30 | 30 | |
| @@ -22,11 +22,11 @@ · 21 unmodified lines | ||
| 22 | 22 | #include <linux/kernel.h> |
| 23 | 23 | #include <linux/module.h> |
| 24 | 24 | #include <linux/platform_device.h> |
| 25 | −#include <asm/hardware.h> | |
| 25 | +#include <mach/hardware.h> | |
| 26 | 26 | #include <asm/mach/map.h> |
| 27 | 27 | #include <asm/hardware/vic.h> |
| 28 | 28 | #include <asm/io.h> |
| 29 | −#include <asm/arch/netx-regs.h> | |
| 29 | +#include <mach/netx-regs.h> | |
| 30 | 30 | #include <asm/mach/irq.h> |
| 31 | 31 | |
| 32 | 32 | static struct map_desc netx_io_desc[] __initdata = { |
| @@ -1,4 +1,4 @@ | ||
| 1 | −/* linux/include/asm-arm/arch-netx/debug-macro.S | |
| 1 | +/* arch/arm/mach-netx/include/mach/debug-macro.S | |
| 2 | 2 | * |
| 3 | 3 | * Debugging macro include header |
| 4 | 4 | * |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-netx/dma.h | |
| 2 | + * arch/arm/mach-netx/include/mach/dma.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 2005 Sascha Hauer <s.hauer@pengutronix.de>, Pengutronix |
| 5 | 5 | * |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-netx/entry-macro.S | |
| 2 | + * arch/arm/mach-netx/include/mach/entry-macro.S | |
| 3 | 3 | * |
| 4 | 4 | * Low-level IRQ helper macros for Hilscher netX based platforms |
| 5 | 5 | * |
| @@ -18,7 +18,7 @@ · 12 unmodified lines | ||
| 18 | 18 | * along with this program; if not, write to the Free Software |
| 19 | 19 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
| 20 | 20 | */ |
| 21 | −#include <asm/hardware.h> | |
| 21 | +#include <mach/hardware.h> | |
| 22 | 22 | |
| 23 | 23 | .macro disable_fiq |
| 24 | 24 | .endm |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-netx/eth.h | |
| 2 | + * arch/arm/mach-netx/include/mach/eth.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (c) 2005 Sascha Hauer <s.hauer@pengutronix.de>, Pengutronix |
| 5 | 5 | * |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-netx/hardware.h | |
| 2 | + * arch/arm/mach-netx/include/mach/hardware.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 2005 Sascha Hauer <s.hauer@pengutronix.de>, Pengutronix |
| 5 | 5 | * |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-netx/io.h | |
| 2 | + * arch/arm/mach-netx/include/mach/io.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 2005 Sascha Hauer <s.hauer@pengutronix.de>, Pengutronix |
| 5 | 5 | * |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-netx/irqs.h | |
| 2 | + * arch/arm/mach-netx/include/mach/irqs.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 2005 Sascha Hauer <s.hauer@pengutronix.de>, Pengutronix |
| 5 | 5 | * |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-netx/memory.h | |
| 2 | + * arch/arm/mach-netx/include/mach/memory.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 2005 Sascha Hauer <s.hauer@pengutronix.de>, Pengutronix |
| 5 | 5 | * |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-netx/netx-regs.h | |
| 2 | + * arch/arm/mach-netx/include/mach/netx-regs.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (c) 2005 Sascha Hauer <s.hauer@pengutronix.de>, Pengutronix |
| 5 | 5 | * |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-netx/param.h | |
| 2 | + * arch/arm/mach-netx/include/mach/param.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 2005 Sascha Hauer <s.hauer@pengutronix.de>, Pengutronix |
| 5 | 5 | * |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-netx/pfifo.h | |
| 2 | + * arch/arm/mach-netx/include/mach/pfifo.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (c) 2005 Sascha Hauer <s.hauer@pengutronix.de>, Pengutronix |
| 5 | 5 | * |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-netx/system.h | |
| 2 | + * arch/arm/mach-netx/include/mach/system.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 2005 Sascha Hauer <s.hauer@pengutronix.de>, Pengutronix |
| 5 | 5 | * |
| @@ -20,7 +20,7 @@ · 14 unmodified lines | ||
| 20 | 20 | #define __ASM_ARCH_SYSTEM_H |
| 21 | 21 | |
| 22 | 22 | #include <asm/io.h> |
| 23 | −#include <asm/hardware.h> | |
| 23 | +#include <mach/hardware.h> | |
| 24 | 24 | #include "netx-regs.h" |
| 25 | 25 | |
| 26 | 26 | static inline void arch_idle(void) |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-netx/timex.h | |
| 2 | + * arch/arm/mach-netx/include/mach/timex.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 2005 Sascha Hauer <s.hauer@pengutronix.de>, Pengutronix |
| 5 | 5 | * |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-netx/uncompress.h | |
| 2 | + * arch/arm/mach-netx/include/mach/uncompress.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 2005 Sascha Hauer <s.hauer@pengutronix.de>, Pengutronix |
| 5 | 5 | * |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-netx/vmalloc.h | |
| 2 | + * arch/arm/mach-netx/include/mach/vmalloc.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 2005 Sascha Hauer <s.hauer@pengutronix.de>, Pengutronix |
| 5 | 5 | * |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-netx/xc.h | |
| 2 | + * arch/arm/mach-netx/include/mach/xc.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 2005 Sascha Hauer <s.hauer@pengutronix.de>, Pengutronix |
| 5 | 5 | * |
| @@ -25,11 +25,11 @@ · 24 unmodified lines | ||
| 25 | 25 | #include <linux/amba/bus.h> |
| 26 | 26 | #include <linux/amba/clcd.h> |
| 27 | 27 | |
| 28 | −#include <asm/hardware.h> | |
| 28 | +#include <mach/hardware.h> | |
| 29 | 29 | #include <asm/mach-types.h> |
| 30 | 30 | #include <asm/mach/arch.h> |
| 31 | −#include <asm/arch/netx-regs.h> | |
| 32 | −#include <asm/arch/eth.h> | |
| 31 | +#include <mach/netx-regs.h> | |
| 32 | +#include <mach/eth.h> | |
| 33 | 33 | |
| 34 | 34 | #include "generic.h" |
| 35 | 35 | #include "fb.h" |
| @@ -25,11 +25,11 @@ · 24 unmodified lines | ||
| 25 | 25 | #include <linux/amba/bus.h> |
| 26 | 26 | #include <linux/amba/clcd.h> |
| 27 | 27 | |
| 28 | −#include <asm/hardware.h> | |
| 28 | +#include <mach/hardware.h> | |
| 29 | 29 | #include <asm/mach-types.h> |
| 30 | 30 | #include <asm/mach/arch.h> |
| 31 | −#include <asm/arch/netx-regs.h> | |
| 32 | −#include <asm/arch/eth.h> | |
| 31 | +#include <mach/netx-regs.h> | |
| 32 | +#include <mach/eth.h> | |
| 33 | 33 | |
| 34 | 34 | #include "generic.h" |
| 35 | 35 | |
| @@ -25,11 +25,11 @@ · 24 unmodified lines | ||
| 25 | 25 | #include <linux/amba/bus.h> |
| 26 | 26 | #include <linux/amba/clcd.h> |
| 27 | 27 | |
| 28 | −#include <asm/hardware.h> | |
| 28 | +#include <mach/hardware.h> | |
| 29 | 29 | #include <asm/mach-types.h> |
| 30 | 30 | #include <asm/mach/arch.h> |
| 31 | −#include <asm/arch/netx-regs.h> | |
| 32 | −#include <asm/arch/eth.h> | |
| 31 | +#include <mach/netx-regs.h> | |
| 32 | +#include <mach/eth.h> | |
| 33 | 33 | |
| 34 | 34 | #include "generic.h" |
| 35 | 35 | #include "fb.h" |
| @@ -22,9 +22,9 @@ · 21 unmodified lines | ||
| 22 | 22 | #include <linux/mutex.h> |
| 23 | 23 | |
| 24 | 24 | #include <asm/io.h> |
| 25 | −#include <asm/hardware.h> | |
| 26 | −#include <asm/arch/netx-regs.h> | |
| 27 | −#include <asm/arch/pfifo.h> | |
| 25 | +#include <mach/hardware.h> | |
| 26 | +#include <mach/netx-regs.h> | |
| 27 | +#include <mach/pfifo.h> | |
| 28 | 28 | |
| 29 | 29 | static DEFINE_MUTEX(pfifo_lock); |
| 30 | 30 | |
| @@ -22,10 +22,10 @@ · 21 unmodified lines | ||
| 22 | 22 | #include <linux/irq.h> |
| 23 | 23 | #include <linux/clocksource.h> |
| 24 | 24 | |
| 25 | −#include <asm/hardware.h> | |
| 25 | +#include <mach/hardware.h> | |
| 26 | 26 | #include <asm/io.h> |
| 27 | 27 | #include <asm/mach/time.h> |
| 28 | −#include <asm/arch/netx-regs.h> | |
| 28 | +#include <mach/netx-regs.h> | |
| 29 | 29 | |
| 30 | 30 | /* |
| 31 | 31 | * IRQ handler for the timer |
| @@ -23,10 +23,10 @@ · 22 unmodified lines | ||
| 23 | 23 | #include <linux/mutex.h> |
| 24 | 24 | |
| 25 | 25 | #include <asm/io.h> |
| 26 | −#include <asm/hardware.h> | |
| 27 | −#include <asm/arch/netx-regs.h> | |
| 26 | +#include <mach/hardware.h> | |
| 27 | +#include <mach/netx-regs.h> | |
| 28 | 28 | |
| 29 | −#include <asm/arch/xc.h> | |
| 29 | +#include <mach/xc.h> | |
| 30 | 30 | |
| 31 | 31 | static DEFINE_MUTEX(xc_lock); |
| 32 | 32 | |
| @@ -13,12 +13,12 @@ · 12 unmodified lines | ||
| 13 | 13 | #include <asm/mach/map.h> |
| 14 | 14 | #include <asm/gpio.h> |
| 15 | 15 | |
| 16 | −#include <asm/arch-ns9xxx/board.h> | |
| 17 | −#include <asm/arch-ns9xxx/processor-ns9360.h> | |
| 18 | −#include <asm/arch-ns9xxx/regs-sys-ns9360.h> | |
| 19 | −#include <asm/arch-ns9xxx/regs-mem.h> | |
| 20 | −#include <asm/arch-ns9xxx/regs-bbu.h> | |
| 21 | −#include <asm/arch-ns9xxx/regs-board-a9m9750dev.h> | |
| 16 | +#include <mach/board.h> | |
| 17 | +#include <mach/processor-ns9360.h> | |
| 18 | +#include <mach/regs-sys-ns9360.h> | |
| 19 | +#include <mach/regs-mem.h> | |
| 20 | +#include <mach/regs-bbu.h> | |
| 21 | +#include <mach/regs-board-a9m9750dev.h> | |
| 22 | 22 | |
| 23 | 23 | #include "board-a9m9750dev.h" |
| 24 | 24 | |
| @@ -14,8 +14,8 @@ · 13 unmodified lines | ||
| 14 | 14 | #include <linux/kernel.h> |
| 15 | 15 | #include <linux/module.h> |
| 16 | 16 | |
| 17 | −#include <asm/arch-ns9xxx/regs-bbu.h> | |
| 18 | −#include <asm/arch-ns9xxx/processor-ns9360.h> | |
| 17 | +#include <mach/regs-bbu.h> | |
| 18 | +#include <mach/processor-ns9360.h> | |
| 19 | 19 | |
| 20 | 20 | #include "gpio-ns9360.h" |
| 21 | 21 | |
| @@ -13,9 +13,9 @@ · 12 unmodified lines | ||
| 13 | 13 | #include <linux/spinlock.h> |
| 14 | 14 | #include <linux/module.h> |
| 15 | 15 | |
| 16 | −#include <asm/arch-ns9xxx/gpio.h> | |
| 17 | −#include <asm/arch-ns9xxx/processor.h> | |
| 18 | −#include <asm/arch-ns9xxx/processor-ns9360.h> | |
| 16 | +#include <mach/gpio.h> | |
| 17 | +#include <mach/processor.h> | |
| 18 | +#include <mach/processor-ns9360.h> | |
| 19 | 19 | #include <asm/bug.h> |
| 20 | 20 | #include <asm/types.h> |
| 21 | 21 | #include <asm/bitops.h> |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-ns9xxx/board.h | |
| 2 | + * arch/arm/mach-ns9xxx/include/mach/board.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 2006,2007 by Digi International Inc. |
| 5 | 5 | * All rights reserved. |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-ns9xxx/debug-macro.S | |
| 2 | + * arch/arm/mach-ns9xxx/include/mach/debug-macro.S | |
| 3 | 3 | * Copyright (C) 2006 by Digi International Inc. |
| 4 | 4 | * All rights reserved. |
| 5 | 5 | * |
| @@ -7,9 +7,9 @@ · 1 unmodified line | ||
| 7 | 7 | * under the terms of the GNU General Public License version 2 as published by |
| 8 | 8 | * the Free Software Foundation. |
| 9 | 9 | */ |
| 10 | −#include <asm/hardware.h> | |
| 10 | +#include <mach/hardware.h> | |
| 11 | 11 | |
| 12 | −#include <asm/arch-ns9xxx/regs-board-a9m9750dev.h> | |
| 12 | +#include <mach/regs-board-a9m9750dev.h> | |
| 13 | 13 | |
| 14 | 14 | .macro addruart,rx |
| 15 | 15 | mrc p15, 0, \rx, c1, c0 |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-ns9xxx/dma.h | |
| 2 | + * arch/arm/mach-ns9xxx/include/mach/dma.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 2006 by Digi International Inc. |
| 5 | 5 | * All rights reserved. |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-ns9xxx/entry-macro.S | |
| 2 | + * arch/arm/mach-ns9xxx/include/mach/entry-macro.S | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 2006,2007 by Digi International Inc. |
| 5 | 5 | * All rights reserved. |
| @@ -8,8 +8,8 @@ · 2 unmodified lines | ||
| 8 | 8 | * under the terms of the GNU General Public License version 2 as published by |
| 9 | 9 | * the Free Software Foundation. |
| 10 | 10 | */ |
| 11 | −#include <asm/hardware.h> | |
| 12 | −#include <asm/arch-ns9xxx/regs-sys-common.h> | |
| 11 | +#include <mach/hardware.h> | |
| 12 | +#include <mach/regs-sys-common.h> | |
| 13 | 13 | |
| 14 | 14 | .macro get_irqnr_preamble, base, tmp |
| 15 | 15 | ldr \base, =SYS_ISRADDR |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-ns9xxx/gpio.h | |
| 2 | + * arch/arm/mach-ns9xxx/include/mach/gpio.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 2007 by Digi International Inc. |
| 5 | 5 | * All rights reserved. |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-ns9xxx/hardware.h | |
| 2 | + * arch/arm/mach-ns9xxx/include/mach/hardware.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 2006 by Digi International Inc. |
| 5 | 5 | * All rights reserved. |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-ns9xxx/io.h | |
| 2 | + * arch/arm/mach-ns9xxx/include/mach/io.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 2006 by Digi International Inc. |
| 5 | 5 | * All rights reserved. |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-ns9xxx/irqs.h | |
| 2 | + * arch/arm/mach-ns9xxx/include/mach/irqs.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 2006,2007 by Digi International Inc. |
| 5 | 5 | * All rights reserved. |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-ns9xxx/memory.h | |
| 2 | + * arch/arm/mach-ns9xxx/include/mach/memory.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 2006 by Digi International Inc. |
| 5 | 5 | * All rights reserved. |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-ns9xxx/module.h | |
| 2 | + * arch/arm/mach-ns9xxx/include/mach/module.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 2007 by Digi International Inc. |
| 5 | 5 | * All rights reserved. |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-ns9xxx/processor-ns9360.h | |
| 2 | + * arch/arm/mach-ns9xxx/include/mach/processor-ns9360.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 2007 by Digi International Inc. |
| 5 | 5 | * All rights reserved. |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-ns9xxx/processor.h | |
| 2 | + * arch/arm/mach-ns9xxx/include/mach/processor.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 2006,2007 by Digi International Inc. |
| 5 | 5 | * All rights reserved. |
| @@ -11,7 +11,7 @@ · 5 unmodified lines | ||
| 11 | 11 | #ifndef __ASM_ARCH_PROCESSOR_H |
| 12 | 12 | #define __ASM_ARCH_PROCESSOR_H |
| 13 | 13 | |
| 14 | −#include <asm/arch-ns9xxx/module.h> | |
| 14 | +#include <mach/module.h> | |
| 15 | 15 | |
| 16 | 16 | #define processor_is_ns9210() (0 \ |
| 17 | 17 | || module_is_cc7ucamry() \ |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-ns9xxx/regs-bbu.h | |
| 2 | + * arch/arm/mach-ns9xxx/include/mach/regs-bbu.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 2006 by Digi International Inc. |
| 5 | 5 | * All rights reserved. |
| @@ -11,7 +11,7 @@ · 5 unmodified lines | ||
| 11 | 11 | #ifndef __ASM_ARCH_REGSBBU_H |
| 12 | 12 | #define __ASM_ARCH_REGSBBU_H |
| 13 | 13 | |
| 14 | −#include <asm/hardware.h> | |
| 14 | +#include <mach/hardware.h> | |
| 15 | 15 | |
| 16 | 16 | /* BBus Utility */ |
| 17 | 17 | |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-ns9xxx/regs-board-a9m9750dev.h | |
| 2 | + * arch/arm/mach-ns9xxx/include/mach/regs-board-a9m9750dev.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 2006 by Digi International Inc. |
| 5 | 5 | * All rights reserved. |
| @@ -11,7 +11,7 @@ · 5 unmodified lines | ||
| 11 | 11 | #ifndef __ASM_ARCH_REGSBOARDA9M9750_H |
| 12 | 12 | #define __ASM_ARCH_REGSBOARDA9M9750_H |
| 13 | 13 | |
| 14 | −#include <asm/hardware.h> | |
| 14 | +#include <mach/hardware.h> | |
| 15 | 15 | |
| 16 | 16 | #define FPGA_UARTA_BASE io_p2v(NS9XXX_CSxSTAT_PHYS(0)) |
| 17 | 17 | #define FPGA_UARTB_BASE io_p2v(NS9XXX_CSxSTAT_PHYS(0) + 0x08) |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-ns9xxx/regs-mem.h | |
| 2 | + * arch/arm/mach-ns9xxx/include/mach/regs-mem.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 2006 by Digi International Inc. |
| 5 | 5 | * All rights reserved. |
| @@ -11,7 +11,7 @@ · 5 unmodified lines | ||
| 11 | 11 | #ifndef __ASM_ARCH_REGSMEM_H |
| 12 | 12 | #define __ASM_ARCH_REGSMEM_H |
| 13 | 13 | |
| 14 | −#include <asm/hardware.h> | |
| 14 | +#include <mach/hardware.h> | |
| 15 | 15 | |
| 16 | 16 | /* Memory Module */ |
| 17 | 17 | |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-ns9xxx/regs-sys-common.h | |
| 2 | + * arch/arm/mach-ns9xxx/include/mach/regs-sys-common.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 2007 by Digi International Inc. |
| 5 | 5 | * All rights reserved. |
| @@ -11,7 +11,7 @@ · 5 unmodified lines | ||
| 11 | 11 | |
| 12 | 12 | #ifndef __ASM_ARCH_REGSSYSCOMMON_H |
| 13 | 13 | #define __ASM_ARCH_REGSSYSCOMMON_H |
| 14 | −#include <asm/hardware.h> | |
| 14 | +#include <mach/hardware.h> | |
| 15 | 15 | |
| 16 | 16 | /* Interrupt Vector Address Register Level x */ |
| 17 | 17 | #define SYS_IVA(x) __REG2(0xa09000c4, (x)) |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-ns9xxx/regs-sys-ns9360.h | |
| 2 | + * arch/arm/mach-ns9xxx/include/mach/regs-sys-ns9360.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 2006,2007 by Digi International Inc. |
| 5 | 5 | * All rights reserved. |
| @@ -11,7 +11,7 @@ · 5 unmodified lines | ||
| 11 | 11 | #ifndef __ASM_ARCH_REGSSYSNS9360_H |
| 12 | 12 | #define __ASM_ARCH_REGSSYSNS9360_H |
| 13 | 13 | |
| 14 | −#include <asm/hardware.h> | |
| 14 | +#include <mach/hardware.h> | |
| 15 | 15 | |
| 16 | 16 | /* System Control Module */ |
| 17 | 17 | |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-ns9xxx/system.h | |
| 2 | + * arch/arm/mach-ns9xxx/include/mach/system.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 2006,2007 by Digi International Inc. |
| 5 | 5 | * All rights reserved. |
| @@ -12,8 +12,8 @@ · 6 unmodified lines | ||
| 12 | 12 | #define __ASM_ARCH_SYSTEM_H |
| 13 | 13 | |
| 14 | 14 | #include <asm/proc-fns.h> |
| 15 | −#include <asm/arch-ns9xxx/processor.h> | |
| 16 | −#include <asm/arch-ns9xxx/processor-ns9360.h> | |
| 15 | +#include <mach/processor.h> | |
| 16 | +#include <mach/processor-ns9360.h> | |
| 17 | 17 | |
| 18 | 18 | static inline void arch_idle(void) |
| 19 | 19 | { |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-ns9xxx/timex.h | |
| 2 | + * arch/arm/mach-ns9xxx/include/mach/timex.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 2005-2006 by Digi International Inc. |
| 5 | 5 | * All rights reserved. |
| @@ -12,7 +12,7 @@ · 6 unmodified lines | ||
| 12 | 12 | #define __ASM_ARCH_TIMEX_H |
| 13 | 13 | |
| 14 | 14 | /* |
| 15 | − * value for CLOCK_TICK_RATE stolen from include/asm-arm/arch-s3c2410/timex.h. | |
| 15 | + * value for CLOCK_TICK_RATE stolen from arch/arm/mach-s3c2410/include/mach/timex.h. | |
| 16 | 16 | * See there for an explanation. |
| 17 | 17 | */ |
| 18 | 18 | #define CLOCK_TICK_RATE 12000000 |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-ns9xxx/uncompress.h | |
| 2 | + * arch/arm/mach-ns9xxx/include/mach/uncompress.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 2006 by Digi International Inc. |
| 5 | 5 | * All rights reserved. |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-ns9xxx/vmalloc.h | |
| 2 | + * arch/arm/mach-ns9xxx/include/mach/vmalloc.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 2006 by Digi International Inc. |
| 5 | 5 | * All rights reserved. |
| @@ -12,10 +12,9 @@ · 11 unmodified lines | ||
| 12 | 12 | #include <linux/kernel_stat.h> |
| 13 | 13 | #include <asm/io.h> |
| 14 | 14 | #include <asm/mach/irq.h> |
| 15 | −#include <asm/mach-types.h> | |
| 16 | −#include <asm/arch-ns9xxx/regs-sys-common.h> | |
| 17 | −#include <asm/arch-ns9xxx/irqs.h> | |
| 18 | −#include <asm/arch-ns9xxx/board.h> | |
| 15 | +#include <mach/regs-sys-common.h> | |
| 16 | +#include <mach/irqs.h> | |
| 17 | +#include <mach/board.h> | |
| 19 | 18 | |
| 20 | 19 | #include "generic.h" |
| 21 | 20 | |
| @@ -11,7 +11,7 @@ · 10 unmodified lines | ||
| 11 | 11 | #include <asm/mach/arch.h> |
| 12 | 12 | #include <asm/mach-types.h> |
| 13 | 13 | |
| 14 | −#include <asm/arch-ns9xxx/processor-ns9360.h> | |
| 14 | +#include <mach/processor-ns9360.h> | |
| 15 | 15 | |
| 16 | 16 | #include "board-a9m9750dev.h" |
| 17 | 17 | #include "generic.h" |
| @@ -11,7 +11,7 @@ · 10 unmodified lines | ||
| 11 | 11 | #include <asm/mach/arch.h> |
| 12 | 12 | #include <asm/mach-types.h> |
| 13 | 13 | |
| 14 | −#include <asm/arch-ns9xxx/processor-ns9360.h> | |
| 14 | +#include <mach/processor-ns9360.h> | |
| 15 | 15 | |
| 16 | 16 | #include "board-jscc9p9360.h" |
| 17 | 17 | #include "generic.h" |
| @@ -11,8 +11,8 @@ · 10 unmodified lines | ||
| 11 | 11 | #include <linux/platform_device.h> |
| 12 | 12 | #include <linux/serial_8250.h> |
| 13 | 13 | |
| 14 | −#include <asm/arch-ns9xxx/regs-board-a9m9750dev.h> | |
| 15 | −#include <asm/arch-ns9xxx/board.h> | |
| 14 | +#include <mach/regs-board-a9m9750dev.h> | |
| 15 | +#include <mach/board.h> | |
| 16 | 16 | |
| 17 | 17 | #define DRIVER_NAME "serial8250" |
| 18 | 18 | |
| @@ -14,8 +14,8 @@ · 13 unmodified lines | ||
| 14 | 14 | |
| 15 | 15 | #include <asm/page.h> |
| 16 | 16 | #include <asm/mach/map.h> |
| 17 | −#include <asm/arch-ns9xxx/processor-ns9360.h> | |
| 18 | −#include <asm/arch-ns9xxx/regs-sys-ns9360.h> | |
| 17 | +#include <mach/processor-ns9360.h> | |
| 18 | +#include <mach/regs-sys-ns9360.h> | |
| 19 | 19 | |
| 20 | 20 | void ns9360_reset(char mode) |
| 21 | 21 | { |
| @@ -15,10 +15,10 @@ · 14 unmodified lines | ||
| 15 | 15 | #include <linux/clocksource.h> |
| 16 | 16 | #include <linux/clockchips.h> |
| 17 | 17 | |
| 18 | −#include <asm/arch-ns9xxx/processor-ns9360.h> | |
| 19 | −#include <asm/arch-ns9xxx/regs-sys-ns9360.h> | |
| 20 | −#include <asm/arch-ns9xxx/irqs.h> | |
| 21 | −#include <asm/arch/system.h> | |
| 18 | +#include <mach/processor-ns9360.h> | |
| 19 | +#include <mach/regs-sys-ns9360.h> | |
| 20 | +#include <mach/irqs.h> | |
| 21 | +#include <mach/system.h> | |
| 22 | 22 | #include "generic.h" |
| 23 | 23 | |
| 24 | 24 | #define TIMER_CLOCKSOURCE 0 |
| @@ -17,18 +17,18 @@ · 16 unmodified lines | ||
| 17 | 17 | #include <linux/input.h> |
| 18 | 18 | #include <linux/platform_device.h> |
| 19 | 19 | |
| 20 | −#include <asm/hardware.h> | |
| 20 | +#include <mach/hardware.h> | |
| 21 | 21 | #include <asm/mach-types.h> |
| 22 | 22 | #include <asm/mach/arch.h> |
| 23 | 23 | #include <asm/mach/map.h> |
| 24 | 24 | |
| 25 | −#include <asm/arch/board-ams-delta.h> | |
| 26 | −#include <asm/arch/gpio.h> | |
| 27 | −#include <asm/arch/keypad.h> | |
| 28 | −#include <asm/arch/mux.h> | |
| 29 | −#include <asm/arch/usb.h> | |
| 30 | −#include <asm/arch/board.h> | |
| 31 | −#include <asm/arch/common.h> | |
| 25 | +#include <mach/board-ams-delta.h> | |
| 26 | +#include <mach/gpio.h> | |
| 27 | +#include <mach/keypad.h> | |
| 28 | +#include <mach/mux.h> | |
| 29 | +#include <mach/usb.h> | |
| 30 | +#include <mach/board.h> | |
| 31 | +#include <mach/common.h> | |
| 32 | 32 | |
| 33 | 33 | static u8 ams_delta_latch1_reg; |
| 34 | 34 | static u16 ams_delta_latch2_reg; |
| @@ -20,21 +20,21 @@ · 19 unmodified lines | ||
| 20 | 20 | #include <linux/mtd/partitions.h> |
| 21 | 21 | #include <linux/input.h> |
| 22 | 22 | |
| 23 | −#include <asm/hardware.h> | |
| 23 | +#include <mach/hardware.h> | |
| 24 | 24 | #include <asm/mach-types.h> |
| 25 | 25 | #include <asm/mach/arch.h> |
| 26 | 26 | #include <asm/mach/flash.h> |
| 27 | 27 | #include <asm/mach/map.h> |
| 28 | 28 | |
| 29 | −#include <asm/arch/tc.h> | |
| 30 | −#include <asm/arch/gpio.h> | |
| 31 | −#include <asm/arch/mux.h> | |
| 32 | −#include <asm/arch/fpga.h> | |
| 33 | −#include <asm/arch/nand.h> | |
| 34 | −#include <asm/arch/keypad.h> | |
| 35 | −#include <asm/arch/common.h> | |
| 36 | −#include <asm/arch/board.h> | |
| 37 | −#include <asm/arch/board-fsample.h> | |
| 29 | +#include <mach/tc.h> | |
| 30 | +#include <mach/gpio.h> | |
| 31 | +#include <mach/mux.h> | |
| 32 | +#include <mach/fpga.h> | |
| 33 | +#include <mach/nand.h> | |
| 34 | +#include <mach/keypad.h> | |
| 35 | +#include <mach/common.h> | |
| 36 | +#include <mach/board.h> | |
| 37 | +#include <mach/board-fsample.h> | |
| 38 | 38 | |
| 39 | 39 | static int fsample_keymap[] = { |
| 40 | 40 | KEY(0,0,KEY_UP), |
| @@ -17,16 +17,16 @@ · 16 unmodified lines | ||
| 17 | 17 | #include <linux/init.h> |
| 18 | 18 | #include <linux/platform_device.h> |
| 19 | 19 | |
| 20 | −#include <asm/hardware.h> | |
| 20 | +#include <mach/hardware.h> | |
| 21 | 21 | #include <asm/mach-types.h> |
| 22 | 22 | #include <asm/mach/arch.h> |
| 23 | 23 | #include <asm/mach/map.h> |
| 24 | 24 | |
| 25 | −#include <asm/arch/gpio.h> | |
| 26 | −#include <asm/arch/mux.h> | |
| 27 | −#include <asm/arch/usb.h> | |
| 28 | −#include <asm/arch/board.h> | |
| 29 | −#include <asm/arch/common.h> | |
| 25 | +#include <mach/gpio.h> | |
| 26 | +#include <mach/mux.h> | |
| 27 | +#include <mach/usb.h> | |
| 28 | +#include <mach/board.h> | |
| 29 | +#include <mach/common.h> | |
| 30 | 30 | |
| 31 | 31 | static void __init omap_generic_init_irq(void) |
| 32 | 32 | { |
| @@ -12,8 +12,8 @@ · 11 unmodified lines | ||
| 12 | 12 | * published by the Free Software Foundation. |
| 13 | 13 | */ |
| 14 | 14 | |
| 15 | −#include <asm/arch/mmc.h> | |
| 16 | −#include <asm/arch/gpio.h> | |
| 15 | +#include <mach/mmc.h> | |
| 16 | +#include <mach/gpio.h> | |
| 17 | 17 | |
| 18 | 18 | #ifdef CONFIG_MMC_OMAP |
| 19 | 19 | static int slot_cover_open; |
| @@ -29,7 +29,7 @@ · 28 unmodified lines | ||
| 29 | 29 | #include <linux/input.h> |
| 30 | 30 | #include <linux/i2c/tps65010.h> |
| 31 | 31 | |
| 32 | −#include <asm/hardware.h> | |
| 32 | +#include <mach/hardware.h> | |
| 33 | 33 | #include <asm/gpio.h> |
| 34 | 34 | |
| 35 | 35 | #include <asm/mach-types.h> |
| @@ -37,16 +37,16 @@ · 1 unmodified line | ||
| 37 | 37 | #include <asm/mach/flash.h> |
| 38 | 38 | #include <asm/mach/map.h> |
| 39 | 39 | |
| 40 | −#include <asm/arch/gpio-switch.h> | |
| 41 | −#include <asm/arch/mux.h> | |
| 42 | −#include <asm/arch/tc.h> | |
| 43 | −#include <asm/arch/nand.h> | |
| 44 | −#include <asm/arch/irda.h> | |
| 45 | −#include <asm/arch/usb.h> | |
| 46 | −#include <asm/arch/keypad.h> | |
| 47 | −#include <asm/arch/common.h> | |
| 48 | −#include <asm/arch/mcbsp.h> | |
| 49 | −#include <asm/arch/omap-alsa.h> | |
| 40 | +#include <mach/gpio-switch.h> | |
| 41 | +#include <mach/mux.h> | |
| 42 | +#include <mach/tc.h> | |
| 43 | +#include <mach/nand.h> | |
| 44 | +#include <mach/irda.h> | |
| 45 | +#include <mach/usb.h> | |
| 46 | +#include <mach/keypad.h> | |
| 47 | +#include <mach/common.h> | |
| 48 | +#include <mach/mcbsp.h> | |
| 49 | +#include <mach/omap-alsa.h> | |
| 50 | 50 | |
| 51 | 51 | static int h2_keymap[] = { |
| 52 | 52 | KEY(0, 0, KEY_LEFT), |
| @@ -12,8 +12,8 @@ · 11 unmodified lines | ||
| 12 | 12 | * published by the Free Software Foundation. |
| 13 | 13 | */ |
| 14 | 14 | |
| 15 | −#include <asm/arch/mmc.h> | |
| 16 | −#include <asm/arch/gpio.h> | |
| 15 | +#include <mach/mmc.h> | |
| 16 | +#include <mach/gpio.h> | |
| 17 | 17 | |
| 18 | 18 | #ifdef CONFIG_MMC_OMAP |
| 19 | 19 | static int slot_cover_open; |
| @@ -31,7 +31,7 @@ · 30 unmodified lines | ||
| 31 | 31 | |
| 32 | 32 | #include <asm/setup.h> |
| 33 | 33 | #include <asm/page.h> |
| 34 | −#include <asm/hardware.h> | |
| 34 | +#include <mach/hardware.h> | |
| 35 | 35 | #include <asm/gpio.h> |
| 36 | 36 | |
| 37 | 37 | #include <asm/mach-types.h> |
| @@ -39,18 +39,18 @@ · 1 unmodified line | ||
| 39 | 39 | #include <asm/mach/flash.h> |
| 40 | 40 | #include <asm/mach/map.h> |
| 41 | 41 | |
| 42 | −#include <asm/arch/gpioexpander.h> | |
| 43 | −#include <asm/arch/irqs.h> | |
| 44 | −#include <asm/arch/mux.h> | |
| 45 | −#include <asm/arch/tc.h> | |
| 46 | −#include <asm/arch/nand.h> | |
| 47 | −#include <asm/arch/irda.h> | |
| 48 | −#include <asm/arch/usb.h> | |
| 49 | −#include <asm/arch/keypad.h> | |
| 50 | −#include <asm/arch/dma.h> | |
| 51 | −#include <asm/arch/common.h> | |
| 52 | −#include <asm/arch/mcbsp.h> | |
| 53 | −#include <asm/arch/omap-alsa.h> | |
| 42 | +#include <mach/gpioexpander.h> | |
| 43 | +#include <mach/irqs.h> | |
| 44 | +#include <mach/mux.h> | |
| 45 | +#include <mach/tc.h> | |
| 46 | +#include <mach/nand.h> | |
| 47 | +#include <mach/irda.h> | |
| 48 | +#include <mach/usb.h> | |
| 49 | +#include <mach/keypad.h> | |
| 50 | +#include <mach/dma.h> | |
| 51 | +#include <mach/common.h> | |
| 52 | +#include <mach/mcbsp.h> | |
| 53 | +#include <mach/omap-alsa.h> | |
| 54 | 54 | |
| 55 | 55 | #define H3_TS_GPIO 48 |
| 56 | 56 | |
| @@ -24,21 +24,21 @@ · 23 unmodified lines | ||
| 24 | 24 | #include <linux/mtd/partitions.h> |
| 25 | 25 | #include <linux/input.h> |
| 26 | 26 | |
| 27 | −#include <asm/hardware.h> | |
| 27 | +#include <mach/hardware.h> | |
| 28 | 28 | #include <asm/mach-types.h> |
| 29 | 29 | #include <asm/mach/arch.h> |
| 30 | 30 | #include <asm/mach/flash.h> |
| 31 | 31 | #include <asm/mach/map.h> |
| 32 | 32 | |
| 33 | −#include <asm/arch/mux.h> | |
| 34 | −#include <asm/arch/fpga.h> | |
| 35 | −#include <asm/arch/gpio.h> | |
| 36 | −#include <asm/arch/tc.h> | |
| 37 | −#include <asm/arch/usb.h> | |
| 38 | −#include <asm/arch/keypad.h> | |
| 39 | −#include <asm/arch/common.h> | |
| 40 | −#include <asm/arch/mcbsp.h> | |
| 41 | −#include <asm/arch/omap-alsa.h> | |
| 33 | +#include <mach/mux.h> | |
| 34 | +#include <mach/fpga.h> | |
| 35 | +#include <mach/gpio.h> | |
| 36 | +#include <mach/tc.h> | |
| 37 | +#include <mach/usb.h> | |
| 38 | +#include <mach/keypad.h> | |
| 39 | +#include <mach/common.h> | |
| 40 | +#include <mach/mcbsp.h> | |
| 41 | +#include <mach/omap-alsa.h> | |
| 42 | 42 | |
| 43 | 43 | static int innovator_keymap[] = { |
| 44 | 44 | KEY(0, 0, KEY_F1), |
| @@ -20,21 +20,21 @@ · 19 unmodified lines | ||
| 20 | 20 | #include <linux/workqueue.h> |
| 21 | 21 | #include <linux/delay.h> |
| 22 | 22 | |
| 23 | −#include <asm/hardware.h> | |
| 23 | +#include <mach/hardware.h> | |
| 24 | 24 | #include <asm/mach-types.h> |
| 25 | 25 | #include <asm/mach/arch.h> |
| 26 | 26 | #include <asm/mach/map.h> |
| 27 | 27 | |
| 28 | −#include <asm/arch/gpio.h> | |
| 29 | −#include <asm/arch/mux.h> | |
| 30 | −#include <asm/arch/usb.h> | |
| 31 | −#include <asm/arch/board.h> | |
| 32 | −#include <asm/arch/keypad.h> | |
| 33 | −#include <asm/arch/common.h> | |
| 34 | −#include <asm/arch/dsp_common.h> | |
| 35 | −#include <asm/arch/aic23.h> | |
| 36 | −#include <asm/arch/omapfb.h> | |
| 37 | −#include <asm/arch/lcd_mipid.h> | |
| 28 | +#include <mach/gpio.h> | |
| 29 | +#include <mach/mux.h> | |
| 30 | +#include <mach/usb.h> | |
| 31 | +#include <mach/board.h> | |
| 32 | +#include <mach/keypad.h> | |
| 33 | +#include <mach/common.h> | |
| 34 | +#include <mach/dsp_common.h> | |
| 35 | +#include <mach/aic23.h> | |
| 36 | +#include <mach/omapfb.h> | |
| 37 | +#include <mach/lcd_mipid.h> | |
| 38 | 38 | |
| 39 | 39 | #define ADS7846_PENDOWN_GPIO 15 |
| 40 | 40 | |
| @@ -39,7 +39,7 @@ · 38 unmodified lines | ||
| 39 | 39 | |
| 40 | 40 | #include <linux/i2c/tps65010.h> |
| 41 | 41 | |
| 42 | −#include <asm/hardware.h> | |
| 42 | +#include <mach/hardware.h> | |
| 43 | 43 | #include <asm/gpio.h> |
| 44 | 44 | |
| 45 | 45 | #include <asm/mach-types.h> |
| @@ -47,12 +47,12 @@ · 1 unmodified line | ||
| 47 | 47 | #include <asm/mach/map.h> |
| 48 | 48 | #include <asm/mach/flash.h> |
| 49 | 49 | |
| 50 | −#include <asm/arch/usb.h> | |
| 51 | −#include <asm/arch/mux.h> | |
| 52 | −#include <asm/arch/tc.h> | |
| 53 | −#include <asm/arch/common.h> | |
| 54 | −#include <asm/arch/mcbsp.h> | |
| 55 | −#include <asm/arch/omap-alsa.h> | |
| 50 | +#include <mach/usb.h> | |
| 51 | +#include <mach/mux.h> | |
| 52 | +#include <mach/tc.h> | |
| 53 | +#include <mach/common.h> | |
| 54 | +#include <mach/mcbsp.h> | |
| 55 | +#include <mach/omap-alsa.h> | |
| 56 | 56 | |
| 57 | 57 | static struct mtd_partition osk_partitions[] = { |
| 58 | 58 | /* bootloader (U-Boot, etc) in first sector */ |
| @@ -340,7 +340,7 @@ static struct omap_board_config_kernel osk_config[] __initdata = { · 281 unmodified lines | ||
| 340 | 340 | #include <linux/spi/spi.h> |
| 341 | 341 | #include <linux/spi/ads7846.h> |
| 342 | 342 | |
| 343 | −#include <asm/arch/keypad.h> | |
| 343 | +#include <mach/keypad.h> | |
| 344 | 344 | |
| 345 | 345 | static const int osk_keymap[] = { |
| 346 | 346 | /* KEY(col, row, code) */ |
| @@ -27,23 +27,23 @@ · 26 unmodified lines | ||
| 27 | 27 | #include <linux/interrupt.h> |
| 28 | 28 | #include <linux/apm-emulation.h> |
| 29 | 29 | |
| 30 | −#include <asm/hardware.h> | |
| 30 | +#include <mach/hardware.h> | |
| 31 | 31 | #include <asm/mach-types.h> |
| 32 | 32 | #include <asm/mach/arch.h> |
| 33 | 33 | #include <asm/mach/map.h> |
| 34 | 34 | #include <asm/mach/flash.h> |
| 35 | 35 | |
| 36 | −#include <asm/arch/gpio.h> | |
| 37 | −#include <asm/arch/mux.h> | |
| 38 | −#include <asm/arch/usb.h> | |
| 39 | −#include <asm/arch/tc.h> | |
| 40 | −#include <asm/arch/dma.h> | |
| 41 | −#include <asm/arch/board.h> | |
| 42 | −#include <asm/arch/irda.h> | |
| 43 | −#include <asm/arch/keypad.h> | |
| 44 | −#include <asm/arch/common.h> | |
| 45 | −#include <asm/arch/mcbsp.h> | |
| 46 | −#include <asm/arch/omap-alsa.h> | |
| 36 | +#include <mach/gpio.h> | |
| 37 | +#include <mach/mux.h> | |
| 38 | +#include <mach/usb.h> | |
| 39 | +#include <mach/tc.h> | |
| 40 | +#include <mach/dma.h> | |
| 41 | +#include <mach/board.h> | |
| 42 | +#include <mach/irda.h> | |
| 43 | +#include <mach/keypad.h> | |
| 44 | +#include <mach/common.h> | |
| 45 | +#include <mach/mcbsp.h> | |
| 46 | +#include <mach/omap-alsa.h> | |
| 47 | 47 | |
| 48 | 48 | static void __init omap_palmte_init_irq(void) |
| 49 | 49 | { |
| @@ -23,24 +23,24 @@ · 22 unmodified lines | ||
| 23 | 23 | #include <linux/mtd/partitions.h> |
| 24 | 24 | #include <linux/leds.h> |
| 25 | 25 | |
| 26 | −#include <asm/hardware.h> | |
| 26 | +#include <mach/hardware.h> | |
| 27 | 27 | #include <asm/mach-types.h> |
| 28 | 28 | #include <asm/mach/arch.h> |
| 29 | 29 | #include <asm/mach/map.h> |
| 30 | 30 | #include <asm/mach/flash.h> |
| 31 | 31 | |
| 32 | −#include <asm/arch/led.h> | |
| 33 | −#include <asm/arch/mcbsp.h> | |
| 34 | −#include <asm/arch/gpio.h> | |
| 35 | −#include <asm/arch/mux.h> | |
| 36 | −#include <asm/arch/usb.h> | |
| 37 | −#include <asm/arch/dma.h> | |
| 38 | −#include <asm/arch/tc.h> | |
| 39 | −#include <asm/arch/board.h> | |
| 40 | −#include <asm/arch/irda.h> | |
| 41 | −#include <asm/arch/keypad.h> | |
| 42 | −#include <asm/arch/common.h> | |
| 43 | −#include <asm/arch/omap-alsa.h> | |
| 32 | +#include <mach/led.h> | |
| 33 | +#include <mach/mcbsp.h> | |
| 34 | +#include <mach/gpio.h> | |
| 35 | +#include <mach/mux.h> | |
| 36 | +#include <mach/usb.h> | |
| 37 | +#include <mach/dma.h> | |
| 38 | +#include <mach/tc.h> | |
| 39 | +#include <mach/board.h> | |
| 40 | +#include <mach/irda.h> | |
| 41 | +#include <mach/keypad.h> | |
| 42 | +#include <mach/common.h> | |
| 43 | +#include <mach/omap-alsa.h> | |
| 44 | 44 | |
| 45 | 45 | #include <linux/spi/spi.h> |
| 46 | 46 | #include <linux/spi/ads7846.h> |
| @@ -26,23 +26,23 @@ · 25 unmodified lines | ||
| 26 | 26 | #include <linux/mtd/mtd.h> |
| 27 | 27 | #include <linux/mtd/partitions.h> |
| 28 | 28 | |
| 29 | −#include <asm/hardware.h> | |
| 29 | +#include <mach/hardware.h> | |
| 30 | 30 | #include <asm/mach-types.h> |
| 31 | 31 | #include <asm/mach/arch.h> |
| 32 | 32 | #include <asm/mach/map.h> |
| 33 | 33 | #include <asm/mach/flash.h> |
| 34 | 34 | |
| 35 | −#include <asm/arch/mcbsp.h> | |
| 36 | −#include <asm/arch/gpio.h> | |
| 37 | −#include <asm/arch/mux.h> | |
| 38 | −#include <asm/arch/usb.h> | |
| 39 | −#include <asm/arch/dma.h> | |
| 40 | −#include <asm/arch/tc.h> | |
| 41 | −#include <asm/arch/board.h> | |
| 42 | −#include <asm/arch/irda.h> | |
| 43 | −#include <asm/arch/keypad.h> | |
| 44 | −#include <asm/arch/common.h> | |
| 45 | −#include <asm/arch/omap-alsa.h> | |
| 35 | +#include <mach/mcbsp.h> | |
| 36 | +#include <mach/gpio.h> | |
| 37 | +#include <mach/mux.h> | |
| 38 | +#include <mach/usb.h> | |
| 39 | +#include <mach/dma.h> | |
| 40 | +#include <mach/tc.h> | |
| 41 | +#include <mach/board.h> | |
| 42 | +#include <mach/irda.h> | |
| 43 | +#include <mach/keypad.h> | |
| 44 | +#include <mach/common.h> | |
| 45 | +#include <mach/omap-alsa.h> | |
| 46 | 46 | |
| 47 | 47 | #include <linux/spi/spi.h> |
| 48 | 48 | #include <linux/spi/ads7846.h> |
| @@ -20,20 +20,20 @@ · 19 unmodified lines | ||
| 20 | 20 | #include <linux/mtd/partitions.h> |
| 21 | 21 | #include <linux/input.h> |
| 22 | 22 | |
| 23 | −#include <asm/hardware.h> | |
| 23 | +#include <mach/hardware.h> | |
| 24 | 24 | #include <asm/mach-types.h> |
| 25 | 25 | #include <asm/mach/arch.h> |
| 26 | 26 | #include <asm/mach/flash.h> |
| 27 | 27 | #include <asm/mach/map.h> |
| 28 | 28 | |
| 29 | −#include <asm/arch/tc.h> | |
| 30 | −#include <asm/arch/gpio.h> | |
| 31 | −#include <asm/arch/mux.h> | |
| 32 | −#include <asm/arch/fpga.h> | |
| 33 | −#include <asm/arch/nand.h> | |
| 34 | −#include <asm/arch/keypad.h> | |
| 35 | −#include <asm/arch/common.h> | |
| 36 | −#include <asm/arch/board.h> | |
| 29 | +#include <mach/tc.h> | |
| 30 | +#include <mach/gpio.h> | |
| 31 | +#include <mach/mux.h> | |
| 32 | +#include <mach/fpga.h> | |
| 33 | +#include <mach/nand.h> | |
| 34 | +#include <mach/keypad.h> | |
| 35 | +#include <mach/common.h> | |
| 36 | +#include <mach/board.h> | |
| 37 | 37 | |
| 38 | 38 | static int p2_keymap[] = { |
| 39 | 39 | KEY(0,0,KEY_UP), |
| @@ -12,9 +12,9 @@ · 11 unmodified lines | ||
| 12 | 12 | * published by the Free Software Foundation. |
| 13 | 13 | */ |
| 14 | 14 | |
| 15 | −#include <asm/arch/hardware.h> | |
| 16 | −#include <asm/arch/mmc.h> | |
| 17 | −#include <asm/arch/gpio.h> | |
| 15 | +#include <mach/hardware.h> | |
| 16 | +#include <mach/mmc.h> | |
| 17 | +#include <mach/gpio.h> | |
| 18 | 18 | |
| 19 | 19 | #ifdef CONFIG_MMC_OMAP |
| 20 | 20 | static int slot_cover_open; |
| @@ -26,22 +26,22 @@ · 25 unmodified lines | ||
| 26 | 26 | #include <linux/i2c.h> |
| 27 | 27 | #include <linux/errno.h> |
| 28 | 28 | |
| 29 | −#include <asm/hardware.h> | |
| 29 | +#include <mach/hardware.h> | |
| 30 | 30 | #include <asm/mach-types.h> |
| 31 | 31 | #include <asm/mach/arch.h> |
| 32 | 32 | #include <asm/mach/flash.h> |
| 33 | 33 | #include <asm/mach/map.h> |
| 34 | 34 | |
| 35 | −#include <asm/arch/gpio.h> | |
| 36 | −#include <asm/arch/mux.h> | |
| 37 | −#include <asm/arch/irda.h> | |
| 38 | −#include <asm/arch/usb.h> | |
| 39 | −#include <asm/arch/tc.h> | |
| 40 | −#include <asm/arch/board.h> | |
| 41 | −#include <asm/arch/common.h> | |
| 42 | −#include <asm/arch/mcbsp.h> | |
| 43 | −#include <asm/arch/omap-alsa.h> | |
| 44 | −#include <asm/arch/keypad.h> | |
| 35 | +#include <mach/gpio.h> | |
| 36 | +#include <mach/mux.h> | |
| 37 | +#include <mach/irda.h> | |
| 38 | +#include <mach/usb.h> | |
| 39 | +#include <mach/tc.h> | |
| 40 | +#include <mach/board.h> | |
| 41 | +#include <mach/common.h> | |
| 42 | +#include <mach/mcbsp.h> | |
| 43 | +#include <mach/omap-alsa.h> | |
| 44 | +#include <mach/keypad.h> | |
| 45 | 45 | |
| 46 | 46 | /* Write to I2C device */ |
| 47 | 47 | int sx1_i2c_write_byte(u8 devaddr, u8 regoffset, u8 value) |
| @@ -22,17 +22,17 @@ · 21 unmodified lines | ||
| 22 | 22 | #include <linux/serial_8250.h> |
| 23 | 23 | #include <linux/serial_reg.h> |
| 24 | 24 | |
| 25 | −#include <asm/hardware.h> | |
| 25 | +#include <mach/hardware.h> | |
| 26 | 26 | #include <asm/mach-types.h> |
| 27 | 27 | #include <asm/mach/arch.h> |
| 28 | 28 | #include <asm/mach/flash.h> |
| 29 | 29 | #include <asm/mach/map.h> |
| 30 | 30 | |
| 31 | −#include <asm/arch/common.h> | |
| 32 | −#include <asm/arch/gpio.h> | |
| 33 | −#include <asm/arch/mux.h> | |
| 34 | −#include <asm/arch/tc.h> | |
| 35 | −#include <asm/arch/usb.h> | |
| 31 | +#include <mach/common.h> | |
| 32 | +#include <mach/gpio.h> | |
| 33 | +#include <mach/mux.h> | |
| 34 | +#include <mach/tc.h> | |
| 35 | +#include <mach/usb.h> | |
| 36 | 36 | |
| 37 | 37 | static struct plat_serial8250_port voiceblue_ports[] = { |
| 38 | 38 | { |
| @@ -21,10 +21,10 @@ · 20 unmodified lines | ||
| 21 | 21 | #include <asm/io.h> |
| 22 | 22 | #include <asm/mach-types.h> |
| 23 | 23 | |
| 24 | −#include <asm/arch/cpu.h> | |
| 25 | −#include <asm/arch/usb.h> | |
| 26 | −#include <asm/arch/clock.h> | |
| 27 | −#include <asm/arch/sram.h> | |
| 24 | +#include <mach/cpu.h> | |
| 25 | +#include <mach/usb.h> | |
| 26 | +#include <mach/clock.h> | |
| 27 | +#include <mach/sram.h> | |
| 28 | 28 | |
| 29 | 29 | #include "clock.h" |
| 30 | 30 | |
| @@ -14,15 +14,14 @@ · 13 unmodified lines | ||
| 14 | 14 | #include <linux/init.h> |
| 15 | 15 | #include <linux/platform_device.h> |
| 16 | 16 | |
| 17 | −#include <asm/hardware.h> | |
| 17 | +#include <mach/hardware.h> | |
| 18 | 18 | #include <asm/io.h> |
| 19 | −#include <asm/mach-types.h> | |
| 20 | 19 | #include <asm/mach/map.h> |
| 21 | 20 | |
| 22 | −#include <asm/arch/tc.h> | |
| 23 | −#include <asm/arch/board.h> | |
| 24 | −#include <asm/arch/mux.h> | |
| 25 | −#include <asm/arch/gpio.h> | |
| 21 | +#include <mach/tc.h> | |
| 22 | +#include <mach/board.h> | |
| 23 | +#include <mach/mux.h> | |
| 24 | +#include <mach/gpio.h> | |
| 26 | 25 | |
| 27 | 26 | /*-------------------------------------------------------------------------*/ |
| 28 | 27 | |
| @@ -22,13 +22,13 @@ · 21 unmodified lines | ||
| 22 | 22 | #include <linux/device.h> |
| 23 | 23 | #include <linux/errno.h> |
| 24 | 24 | |
| 25 | −#include <asm/hardware.h> | |
| 25 | +#include <mach/hardware.h> | |
| 26 | 26 | #include <asm/io.h> |
| 27 | 27 | #include <asm/irq.h> |
| 28 | 28 | #include <asm/mach/irq.h> |
| 29 | 29 | |
| 30 | −#include <asm/arch/fpga.h> | |
| 31 | −#include <asm/arch/gpio.h> | |
| 30 | +#include <mach/fpga.h> | |
| 31 | +#include <mach/gpio.h> | |
| 32 | 32 | |
| 33 | 33 | static void fpga_mask_irq(unsigned int irq) |
| 34 | 34 | { |
| @@ -15,8 +15,8 @@ · 14 unmodified lines | ||
| 15 | 15 | #include <asm/tlb.h> |
| 16 | 16 | #include <asm/mach/map.h> |
| 17 | 17 | #include <asm/io.h> |
| 18 | −#include <asm/arch/mux.h> | |
| 19 | −#include <asm/arch/tc.h> | |
| 18 | +#include <mach/mux.h> | |
| 19 | +#include <mach/tc.h> | |
| 20 | 20 | |
| 21 | 21 | extern int omap1_clk_init(void); |
| 22 | 22 | extern void omap_check_revision(void); |
| @@ -41,11 +41,11 @@ · 40 unmodified lines | ||
| 41 | 41 | #include <linux/sched.h> |
| 42 | 42 | #include <linux/interrupt.h> |
| 43 | 43 | |
| 44 | −#include <asm/hardware.h> | |
| 44 | +#include <mach/hardware.h> | |
| 45 | 45 | #include <asm/irq.h> |
| 46 | 46 | #include <asm/mach/irq.h> |
| 47 | −#include <asm/arch/gpio.h> | |
| 48 | −#include <asm/arch/cpu.h> | |
| 47 | +#include <mach/gpio.h> | |
| 48 | +#include <mach/cpu.h> | |
| 49 | 49 | |
| 50 | 50 | #include <asm/io.h> |
| 51 | 51 | |
| @@ -14,13 +14,13 @@ · 13 unmodified lines | ||
| 14 | 14 | #include <linux/sched.h> |
| 15 | 15 | |
| 16 | 16 | #include <asm/io.h> |
| 17 | −#include <asm/hardware.h> | |
| 17 | +#include <mach/hardware.h> | |
| 18 | 18 | #include <asm/leds.h> |
| 19 | 19 | #include <asm/system.h> |
| 20 | 20 | #include <asm/mach-types.h> |
| 21 | 21 | |
| 22 | −#include <asm/arch/fpga.h> | |
| 23 | −#include <asm/arch/gpio.h> | |
| 22 | +#include <mach/fpga.h> | |
| 23 | +#include <mach/gpio.h> | |
| 24 | 24 | |
| 25 | 25 | #include "leds.h" |
| 26 | 26 | |
| @@ -3,7 +3,7 @@ · 2 unmodified lines | ||
| 3 | 3 | */ |
| 4 | 4 | #include <linux/init.h> |
| 5 | 5 | |
| 6 | −#include <asm/hardware.h> | |
| 6 | +#include <mach/hardware.h> | |
| 7 | 7 | #include <asm/leds.h> |
| 8 | 8 | #include <asm/system.h> |
| 9 | 9 | |
| @@ -5,11 +5,11 @@ · 4 unmodified lines | ||
| 5 | 5 | */ |
| 6 | 6 | #include <linux/init.h> |
| 7 | 7 | |
| 8 | −#include <asm/hardware.h> | |
| 8 | +#include <mach/hardware.h> | |
| 9 | 9 | #include <asm/leds.h> |
| 10 | 10 | #include <asm/system.h> |
| 11 | 11 | |
| 12 | −#include <asm/arch/gpio.h> | |
| 12 | +#include <mach/gpio.h> | |
| 13 | 13 | |
| 14 | 14 | #include "leds.h" |
| 15 | 15 | |
| @@ -9,8 +9,8 @@ · 8 unmodified lines | ||
| 9 | 9 | #include <asm/leds.h> |
| 10 | 10 | #include <asm/mach-types.h> |
| 11 | 11 | |
| 12 | −#include <asm/arch/gpio.h> | |
| 13 | −#include <asm/arch/mux.h> | |
| 12 | +#include <mach/gpio.h> | |
| 13 | +#include <mach/mux.h> | |
| 14 | 14 | |
| 15 | 15 | #include "leds.h" |
| 16 | 16 | |
| @@ -13,8 +13,8 @@ · 12 unmodified lines | ||
| 13 | 13 | #include <linux/resource.h> |
| 14 | 14 | #include <linux/interrupt.h> |
| 15 | 15 | #include <linux/platform_device.h> |
| 16 | −#include <asm/arch/mailbox.h> | |
| 17 | −#include <asm/arch/irqs.h> | |
| 16 | +#include <mach/mailbox.h> | |
| 17 | +#include <mach/irqs.h> | |
| 18 | 18 | #include <asm/io.h> |
| 19 | 19 | |
| 20 | 20 | #define MAILBOX_ARM2DSP1 0x00 |
| @@ -17,11 +17,11 @@ · 16 unmodified lines | ||
| 17 | 17 | #include <linux/io.h> |
| 18 | 18 | #include <linux/platform_device.h> |
| 19 | 19 | |
| 20 | −#include <asm/arch/dma.h> | |
| 21 | −#include <asm/arch/mux.h> | |
| 22 | −#include <asm/arch/cpu.h> | |
| 23 | −#include <asm/arch/mcbsp.h> | |
| 24 | −#include <asm/arch/dsp_common.h> | |
| 20 | +#include <mach/dma.h> | |
| 21 | +#include <mach/mux.h> | |
| 22 | +#include <mach/cpu.h> | |
| 23 | +#include <mach/mcbsp.h> | |
| 24 | +#include <mach/dsp_common.h> | |
| 25 | 25 | |
| 26 | 26 | #define DPS_RSTCT2_PER_EN (1 << 0) |
| 27 | 27 | #define DSP_RSTCT2_WD_PER_EN (1 << 1) |
| @@ -28,7 +28,7 @@ · 27 unmodified lines | ||
| 28 | 28 | #include <asm/io.h> |
| 29 | 29 | #include <linux/spinlock.h> |
| 30 | 30 | |
| 31 | −#include <asm/arch/mux.h> | |
| 31 | +#include <mach/mux.h> | |
| 32 | 32 | |
| 33 | 33 | #ifdef CONFIG_OMAP_MUX |
| 34 | 34 | |
| @@ -47,17 +47,16 @@ · 46 unmodified lines | ||
| 47 | 47 | #include <asm/atomic.h> |
| 48 | 48 | #include <asm/mach/time.h> |
| 49 | 49 | #include <asm/mach/irq.h> |
| 50 | −#include <asm/mach-types.h> | |
| 51 | − | |
| 52 | −#include <asm/arch/cpu.h> | |
| 53 | −#include <asm/arch/irqs.h> | |
| 54 | −#include <asm/arch/clock.h> | |
| 55 | −#include <asm/arch/sram.h> | |
| 56 | −#include <asm/arch/tc.h> | |
| 57 | −#include <asm/arch/pm.h> | |
| 58 | −#include <asm/arch/mux.h> | |
| 59 | −#include <asm/arch/dma.h> | |
| 60 | −#include <asm/arch/dmtimer.h> | |
| 50 | + | |
| 51 | +#include <mach/cpu.h> | |
| 52 | +#include <mach/irqs.h> | |
| 53 | +#include <mach/clock.h> | |
| 54 | +#include <mach/sram.h> | |
| 55 | +#include <mach/tc.h> | |
| 56 | +#include <mach/pm.h> | |
| 57 | +#include <mach/mux.h> | |
| 58 | +#include <mach/dma.h> | |
| 59 | +#include <mach/dmtimer.h> | |
| 61 | 60 | |
| 62 | 61 | static unsigned int arm_sleep_save[ARM_SLEEP_SAVE_SIZE]; |
| 63 | 62 | static unsigned short dsp_sleep_save[DSP_SLEEP_SAVE_SIZE]; |
| @@ -22,12 +22,12 @@ · 21 unmodified lines | ||
| 22 | 22 | #include <asm/io.h> |
| 23 | 23 | #include <asm/mach-types.h> |
| 24 | 24 | |
| 25 | −#include <asm/arch/board.h> | |
| 26 | −#include <asm/arch/mux.h> | |
| 27 | −#include <asm/arch/gpio.h> | |
| 28 | −#include <asm/arch/fpga.h> | |
| 25 | +#include <mach/board.h> | |
| 26 | +#include <mach/mux.h> | |
| 27 | +#include <mach/gpio.h> | |
| 28 | +#include <mach/fpga.h> | |
| 29 | 29 | #ifdef CONFIG_PM |
| 30 | −#include <asm/arch/pm.h> | |
| 30 | +#include <mach/pm.h> | |
| 31 | 31 | #endif |
| 32 | 32 | |
| 33 | 33 | static struct clk * uart1_ck; |
| @@ -34,8 +34,8 @@ · 33 unmodified lines | ||
| 34 | 34 | |
| 35 | 35 | #include <linux/linkage.h> |
| 36 | 36 | #include <asm/assembler.h> |
| 37 | −#include <asm/arch/io.h> | |
| 38 | −#include <asm/arch/pm.h> | |
| 37 | +#include <mach/io.h> | |
| 38 | +#include <mach/pm.h> | |
| 39 | 39 | |
| 40 | 40 | .text |
| 41 | 41 | |
| @@ -10,8 +10,8 @@ · 9 unmodified lines | ||
| 10 | 10 | |
| 11 | 11 | #include <linux/linkage.h> |
| 12 | 12 | #include <asm/assembler.h> |
| 13 | −#include <asm/arch/io.h> | |
| 14 | −#include <asm/hardware.h> | |
| 13 | +#include <mach/io.h> | |
| 14 | +#include <mach/hardware.h> | |
| 15 | 15 | |
| 16 | 16 | .text |
| 17 | 17 | |
| @@ -45,7 +45,7 @@ · 44 unmodified lines | ||
| 45 | 45 | #include <linux/clockchips.h> |
| 46 | 46 | |
| 47 | 47 | #include <asm/system.h> |
| 48 | −#include <asm/hardware.h> | |
| 48 | +#include <mach/hardware.h> | |
| 49 | 49 | #include <asm/io.h> |
| 50 | 50 | #include <asm/leds.h> |
| 51 | 51 | #include <asm/irq.h> |
| @@ -46,13 +46,13 @@ · 45 unmodified lines | ||
| 46 | 46 | #include <linux/clockchips.h> |
| 47 | 47 | |
| 48 | 48 | #include <asm/system.h> |
| 49 | −#include <asm/hardware.h> | |
| 49 | +#include <mach/hardware.h> | |
| 50 | 50 | #include <asm/io.h> |
| 51 | 51 | #include <asm/leds.h> |
| 52 | 52 | #include <asm/irq.h> |
| 53 | 53 | #include <asm/mach/irq.h> |
| 54 | 54 | #include <asm/mach/time.h> |
| 55 | −#include <asm/arch/dmtimer.h> | |
| 55 | +#include <mach/dmtimer.h> | |
| 56 | 56 | |
| 57 | 57 | struct sys_timer omap_timer; |
| 58 | 58 | |
| @@ -22,17 +22,17 @@ · 21 unmodified lines | ||
| 22 | 22 | #include <linux/err.h> |
| 23 | 23 | #include <linux/clk.h> |
| 24 | 24 | |
| 25 | −#include <asm/hardware.h> | |
| 25 | +#include <mach/hardware.h> | |
| 26 | 26 | #include <asm/mach-types.h> |
| 27 | 27 | #include <asm/mach/arch.h> |
| 28 | 28 | #include <asm/mach/map.h> |
| 29 | 29 | #include <asm/mach/flash.h> |
| 30 | 30 | |
| 31 | −#include <asm/arch/gpio.h> | |
| 32 | −#include <asm/arch/mux.h> | |
| 33 | −#include <asm/arch/board.h> | |
| 34 | −#include <asm/arch/common.h> | |
| 35 | −#include <asm/arch/gpmc.h> | |
| 31 | +#include <mach/gpio.h> | |
| 32 | +#include <mach/mux.h> | |
| 33 | +#include <mach/board.h> | |
| 34 | +#include <mach/common.h> | |
| 35 | +#include <mach/gpmc.h> | |
| 36 | 36 | |
| 37 | 37 | #include <asm/io.h> |
| 38 | 38 | |
| @@ -29,19 +29,19 @@ · 28 unmodified lines | ||
| 29 | 29 | #include <linux/err.h> |
| 30 | 30 | #include <linux/clk.h> |
| 31 | 31 | |
| 32 | −#include <asm/hardware.h> | |
| 32 | +#include <mach/hardware.h> | |
| 33 | 33 | #include <asm/mach-types.h> |
| 34 | 34 | #include <asm/mach/arch.h> |
| 35 | 35 | #include <asm/mach/flash.h> |
| 36 | 36 | |
| 37 | −#include <asm/arch/gpio.h> | |
| 38 | −#include <asm/arch/led.h> | |
| 39 | −#include <asm/arch/mux.h> | |
| 40 | −#include <asm/arch/usb.h> | |
| 41 | −#include <asm/arch/board.h> | |
| 42 | −#include <asm/arch/common.h> | |
| 43 | −#include <asm/arch/gpmc.h> | |
| 44 | −#include <asm/arch/control.h> | |
| 37 | +#include <mach/gpio.h> | |
| 38 | +#include <mach/led.h> | |
| 39 | +#include <mach/mux.h> | |
| 40 | +#include <mach/usb.h> | |
| 41 | +#include <mach/board.h> | |
| 42 | +#include <mach/common.h> | |
| 43 | +#include <mach/gpmc.h> | |
| 44 | +#include <mach/control.h> | |
| 45 | 45 | |
| 46 | 46 | /* LED & Switch macros */ |
| 47 | 47 | #define LED0_GPIO13 13 |
| @@ -20,16 +20,16 @@ · 19 unmodified lines | ||
| 20 | 20 | #include <linux/init.h> |
| 21 | 21 | #include <linux/device.h> |
| 22 | 22 | |
| 23 | −#include <asm/hardware.h> | |
| 23 | +#include <mach/hardware.h> | |
| 24 | 24 | #include <asm/mach-types.h> |
| 25 | 25 | #include <asm/mach/arch.h> |
| 26 | 26 | #include <asm/mach/map.h> |
| 27 | 27 | |
| 28 | −#include <asm/arch/gpio.h> | |
| 29 | −#include <asm/arch/mux.h> | |
| 30 | −#include <asm/arch/usb.h> | |
| 31 | −#include <asm/arch/board.h> | |
| 32 | −#include <asm/arch/common.h> | |
| 28 | +#include <mach/gpio.h> | |
| 29 | +#include <mach/mux.h> | |
| 30 | +#include <mach/usb.h> | |
| 31 | +#include <mach/board.h> | |
| 32 | +#include <mach/common.h> | |
| 33 | 33 | |
| 34 | 34 | static void __init omap_generic_init_irq(void) |
| 35 | 35 | { |
| @@ -22,24 +22,24 @@ · 21 unmodified lines | ||
| 22 | 22 | #include <linux/err.h> |
| 23 | 23 | #include <linux/clk.h> |
| 24 | 24 | |
| 25 | −#include <asm/hardware.h> | |
| 25 | +#include <mach/hardware.h> | |
| 26 | 26 | #include <asm/mach-types.h> |
| 27 | 27 | #include <asm/mach/arch.h> |
| 28 | 28 | #include <asm/mach/map.h> |
| 29 | 29 | #include <asm/mach/flash.h> |
| 30 | 30 | |
| 31 | −#include <asm/arch/control.h> | |
| 32 | −#include <asm/arch/gpio.h> | |
| 33 | −#include <asm/arch/gpioexpander.h> | |
| 34 | −#include <asm/arch/mux.h> | |
| 35 | −#include <asm/arch/usb.h> | |
| 36 | −#include <asm/arch/irda.h> | |
| 37 | −#include <asm/arch/board.h> | |
| 38 | −#include <asm/arch/common.h> | |
| 39 | −#include <asm/arch/keypad.h> | |
| 40 | −#include <asm/arch/menelaus.h> | |
| 41 | −#include <asm/arch/dma.h> | |
| 42 | −#include <asm/arch/gpmc.h> | |
| 31 | +#include <mach/control.h> | |
| 32 | +#include <mach/gpio.h> | |
| 33 | +#include <mach/gpioexpander.h> | |
| 34 | +#include <mach/mux.h> | |
| 35 | +#include <mach/usb.h> | |
| 36 | +#include <mach/irda.h> | |
| 37 | +#include <mach/board.h> | |
| 38 | +#include <mach/common.h> | |
| 39 | +#include <mach/keypad.h> | |
| 40 | +#include <mach/menelaus.h> | |
| 41 | +#include <mach/dma.h> | |
| 42 | +#include <mach/gpmc.h> | |
| 43 | 43 | |
| 44 | 44 | #include <asm/io.h> |
| 45 | 45 | |
| @@ -25,9 +25,9 @@ · 24 unmodified lines | ||
| 25 | 25 | |
| 26 | 26 | #include <asm/io.h> |
| 27 | 27 | |
| 28 | −#include <asm/arch/clock.h> | |
| 29 | −#include <asm/arch/sram.h> | |
| 30 | −#include <asm/arch/cpu.h> | |
| 28 | +#include <mach/clock.h> | |
| 29 | +#include <mach/sram.h> | |
| 30 | +#include <mach/cpu.h> | |
| 31 | 31 | #include <asm/div64.h> |
| 32 | 32 | |
| 33 | 33 | #include "memory.h" |
| @@ -16,7 +16,7 @@ · 15 unmodified lines | ||
| 16 | 16 | #ifndef __ARCH_ARM_MACH_OMAP2_CLOCK_H |
| 17 | 17 | #define __ARCH_ARM_MACH_OMAP2_CLOCK_H |
| 18 | 18 | |
| 19 | −#include <asm/arch/clock.h> | |
| 19 | +#include <mach/clock.h> | |
| 20 | 20 | |
| 21 | 21 | /* The maximum error between a target DPLL rate and the rounded rate in Hz */ |
| 22 | 22 | #define DEFAULT_DPLL_RATE_TOLERANCE 50000 |
| @@ -28,8 +28,8 @@ · 27 unmodified lines | ||
| 28 | 28 | #include <linux/io.h> |
| 29 | 29 | #include <linux/cpufreq.h> |
| 30 | 30 | |
| 31 | −#include <asm/arch/clock.h> | |
| 32 | −#include <asm/arch/sram.h> | |
| 31 | +#include <mach/clock.h> | |
| 32 | +#include <mach/sram.h> | |
| 33 | 33 | #include <asm/div64.h> |
| 34 | 34 | #include <asm/bitops.h> |
| 35 | 35 | |
| @@ -26,8 +26,8 @@ · 25 unmodified lines | ||
| 26 | 26 | #include <linux/io.h> |
| 27 | 27 | #include <linux/limits.h> |
| 28 | 28 | |
| 29 | −#include <asm/arch/clock.h> | |
| 30 | −#include <asm/arch/sram.h> | |
| 29 | +#include <mach/clock.h> | |
| 30 | +#include <mach/sram.h> | |
| 31 | 31 | #include <asm/div64.h> |
| 32 | 32 | #include <asm/bitops.h> |
| 33 | 33 | |
| @@ -19,7 +19,7 @@ · 18 unmodified lines | ||
| 19 | 19 | #ifndef __ARCH_ARM_MACH_OMAP2_CLOCK34XX_H |
| 20 | 20 | #define __ARCH_ARM_MACH_OMAP2_CLOCK34XX_H |
| 21 | 21 | |
| 22 | −#include <asm/arch/control.h> | |
| 22 | +#include <mach/control.h> | |
| 23 | 23 | |
| 24 | 24 | #include "clock.h" |
| 25 | 25 | #include "cm.h" |
| @@ -15,8 +15,8 @@ · 14 unmodified lines | ||
| 15 | 15 | #include <linux/kernel.h> |
| 16 | 16 | #include <linux/io.h> |
| 17 | 17 | |
| 18 | −#include <asm/arch/common.h> | |
| 19 | −#include <asm/arch/control.h> | |
| 18 | +#include <mach/common.h> | |
| 19 | +#include <mach/control.h> | |
| 20 | 20 | |
| 21 | 21 | static void __iomem *omap2_ctrl_base; |
| 22 | 22 | |
| @@ -14,15 +14,15 @@ · 13 unmodified lines | ||
| 14 | 14 | #include <linux/init.h> |
| 15 | 15 | #include <linux/platform_device.h> |
| 16 | 16 | |
| 17 | −#include <asm/hardware.h> | |
| 17 | +#include <mach/hardware.h> | |
| 18 | 18 | #include <asm/io.h> |
| 19 | 19 | #include <asm/mach-types.h> |
| 20 | 20 | #include <asm/mach/map.h> |
| 21 | 21 | |
| 22 | −#include <asm/arch/tc.h> | |
| 23 | −#include <asm/arch/board.h> | |
| 24 | −#include <asm/arch/mux.h> | |
| 25 | −#include <asm/arch/gpio.h> | |
| 22 | +#include <mach/tc.h> | |
| 23 | +#include <mach/board.h> | |
| 24 | +#include <mach/mux.h> | |
| 25 | +#include <mach/gpio.h> | |
| 26 | 26 | |
| 27 | 27 | #if defined(CONFIG_I2C_OMAP) || defined(CONFIG_I2C_OMAP_MODULE) |
| 28 | 28 | |
| @@ -142,7 +142,7 @@ static inline void omap_init_sti(void) {} · 113 unmodified lines | ||
| 142 | 142 | |
| 143 | 143 | #if defined(CONFIG_SPI_OMAP24XX) |
| 144 | 144 | |
| 145 | −#include <asm/arch/mcspi.h> | |
| 145 | +#include <mach/mcspi.h> | |
| 146 | 146 | |
| 147 | 147 | #define OMAP2_MCSPI1_BASE 0x48098000 |
| 148 | 148 | #define OMAP2_MCSPI2_BASE 0x4809a000 |
| @@ -18,7 +18,7 @@ · 17 unmodified lines | ||
| 18 | 18 | |
| 19 | 19 | #include <asm/io.h> |
| 20 | 20 | #include <asm/mach-types.h> |
| 21 | −#include <asm/arch/gpmc.h> | |
| 21 | +#include <mach/gpmc.h> | |
| 22 | 22 | |
| 23 | 23 | #undef DEBUG |
| 24 | 24 | |
| @@ -17,8 +17,8 @@ · 16 unmodified lines | ||
| 17 | 17 | |
| 18 | 18 | #include <asm/io.h> |
| 19 | 19 | |
| 20 | −#include <asm/arch/control.h> | |
| 21 | −#include <asm/arch/cpu.h> | |
| 20 | +#include <mach/control.h> | |
| 21 | +#include <mach/cpu.h> | |
| 22 | 22 | |
| 23 | 23 | #if defined(CONFIG_ARCH_OMAP2420) |
| 24 | 24 | #define TAP_BASE io_p2v(0x48014000) |
| @@ -21,8 +21,8 @@ · 20 unmodified lines | ||
| 21 | 21 | |
| 22 | 22 | #include <asm/mach/map.h> |
| 23 | 23 | |
| 24 | −#include <asm/arch/mux.h> | |
| 25 | −#include <asm/arch/omapfb.h> | |
| 24 | +#include <mach/mux.h> | |
| 25 | +#include <mach/omapfb.h> | |
| 26 | 26 | |
| 27 | 27 | extern void omap_sram_init(void); |
| 28 | 28 | extern int omap2_clk_init(void); |
| @@ -13,7 +13,7 @@ · 12 unmodified lines | ||
| 13 | 13 | #include <linux/kernel.h> |
| 14 | 14 | #include <linux/init.h> |
| 15 | 15 | #include <linux/interrupt.h> |
| 16 | −#include <asm/hardware.h> | |
| 16 | +#include <mach/hardware.h> | |
| 17 | 17 | #include <asm/mach/irq.h> |
| 18 | 18 | #include <asm/irq.h> |
| 19 | 19 | #include <asm/io.h> |
| @@ -14,8 +14,8 @@ · 13 unmodified lines | ||
| 14 | 14 | #include <linux/clk.h> |
| 15 | 15 | #include <linux/err.h> |
| 16 | 16 | #include <linux/platform_device.h> |
| 17 | −#include <asm/arch/mailbox.h> | |
| 18 | −#include <asm/arch/irqs.h> | |
| 17 | +#include <mach/mailbox.h> | |
| 18 | +#include <mach/irqs.h> | |
| 19 | 19 | #include <asm/io.h> |
| 20 | 20 | |
| 21 | 21 | #define MAILBOX_REVISION 0x00 |
| @@ -17,10 +17,10 @@ · 16 unmodified lines | ||
| 17 | 17 | #include <linux/io.h> |
| 18 | 18 | #include <linux/platform_device.h> |
| 19 | 19 | |
| 20 | −#include <asm/arch/dma.h> | |
| 21 | −#include <asm/arch/mux.h> | |
| 22 | −#include <asm/arch/cpu.h> | |
| 23 | −#include <asm/arch/mcbsp.h> | |
| 20 | +#include <mach/dma.h> | |
| 21 | +#include <mach/mux.h> | |
| 22 | +#include <mach/cpu.h> | |
| 23 | +#include <mach/mcbsp.h> | |
| 24 | 24 | |
| 25 | 25 | struct mcbsp_internal_clk { |
| 26 | 26 | struct clk clk; |
| @@ -24,9 +24,9 @@ · 23 unmodified lines | ||
| 24 | 24 | |
| 25 | 25 | #include <asm/io.h> |
| 26 | 26 | |
| 27 | −#include <asm/arch/common.h> | |
| 28 | −#include <asm/arch/clock.h> | |
| 29 | −#include <asm/arch/sram.h> | |
| 27 | +#include <mach/common.h> | |
| 28 | +#include <mach/clock.h> | |
| 29 | +#include <mach/sram.h> | |
| 30 | 30 | |
| 31 | 31 | #include "prm.h" |
| 32 | 32 | |
| @@ -29,8 +29,8 @@ · 28 unmodified lines | ||
| 29 | 29 | #include <asm/io.h> |
| 30 | 30 | #include <linux/spinlock.h> |
| 31 | 31 | |
| 32 | −#include <asm/arch/control.h> | |
| 33 | −#include <asm/arch/mux.h> | |
| 32 | +#include <mach/control.h> | |
| 33 | +#include <mach/mux.h> | |
| 34 | 34 | |
| 35 | 35 | #ifdef CONFIG_OMAP_MUX |
| 36 | 36 | |
| @@ -30,12 +30,11 @@ · 29 unmodified lines | ||
| 30 | 30 | #include <asm/atomic.h> |
| 31 | 31 | #include <asm/mach/time.h> |
| 32 | 32 | #include <asm/mach/irq.h> |
| 33 | −#include <asm/mach-types.h> | |
| 34 | 33 | |
| 35 | −#include <asm/arch/irqs.h> | |
| 36 | −#include <asm/arch/clock.h> | |
| 37 | −#include <asm/arch/sram.h> | |
| 38 | −#include <asm/arch/pm.h> | |
| 34 | +#include <mach/irqs.h> | |
| 35 | +#include <mach/clock.h> | |
| 36 | +#include <mach/sram.h> | |
| 37 | +#include <mach/pm.h> | |
| 39 | 38 | |
| 40 | 39 | static struct clk *vclk; |
| 41 | 40 | static void (*omap2_sram_idle)(void); |
| @@ -18,8 +18,8 @@ · 17 unmodified lines | ||
| 18 | 18 | #include <linux/clk.h> |
| 19 | 19 | #include <linux/io.h> |
| 20 | 20 | |
| 21 | −#include <asm/arch/common.h> | |
| 22 | −#include <asm/arch/prcm.h> | |
| 21 | +#include <mach/common.h> | |
| 22 | +#include <mach/prcm.h> | |
| 23 | 23 | |
| 24 | 24 | #include "clock.h" |
| 25 | 25 | #include "prm.h" |
| @@ -15,7 +15,7 @@ · 14 unmodified lines | ||
| 15 | 15 | */ |
| 16 | 16 | #undef DEBUG |
| 17 | 17 | |
| 18 | −#include <asm/arch/sdrc.h> | |
| 18 | +#include <mach/sdrc.h> | |
| 19 | 19 | |
| 20 | 20 | #ifndef __ASSEMBLER__ |
| 21 | 21 | extern void __iomem *omap2_sdrc_base; |
| @@ -20,8 +20,8 @@ · 19 unmodified lines | ||
| 20 | 20 | |
| 21 | 21 | #include <asm/io.h> |
| 22 | 22 | |
| 23 | −#include <asm/arch/common.h> | |
| 24 | −#include <asm/arch/board.h> | |
| 23 | +#include <mach/common.h> | |
| 24 | +#include <mach/board.h> | |
| 25 | 25 | |
| 26 | 26 | static struct clk * uart1_ick = NULL; |
| 27 | 27 | static struct clk * uart1_fck = NULL; |
| @@ -23,8 +23,8 @@ · 22 unmodified lines | ||
| 23 | 23 | |
| 24 | 24 | #include <linux/linkage.h> |
| 25 | 25 | #include <asm/assembler.h> |
| 26 | −#include <asm/arch/io.h> | |
| 27 | −#include <asm/arch/pm.h> | |
| 26 | +#include <mach/io.h> | |
| 27 | +#include <mach/pm.h> | |
| 28 | 28 | |
| 29 | 29 | #include "sdrc.h" |
| 30 | 30 | |
| @@ -24,8 +24,8 @@ · 23 unmodified lines | ||
| 24 | 24 | */ |
| 25 | 25 | #include <linux/linkage.h> |
| 26 | 26 | #include <asm/assembler.h> |
| 27 | −#include <asm/arch/io.h> | |
| 28 | −#include <asm/hardware.h> | |
| 27 | +#include <mach/io.h> | |
| 28 | +#include <mach/hardware.h> | |
| 29 | 29 | |
| 30 | 30 | #include "prm.h" |
| 31 | 31 | #include "cm.h" |
| @@ -24,8 +24,8 @@ · 23 unmodified lines | ||
| 24 | 24 | */ |
| 25 | 25 | #include <linux/linkage.h> |
| 26 | 26 | #include <asm/assembler.h> |
| 27 | −#include <asm/arch/io.h> | |
| 28 | −#include <asm/hardware.h> | |
| 27 | +#include <mach/io.h> | |
| 28 | +#include <mach/hardware.h> | |
| 29 | 29 | |
| 30 | 30 | #include "prm.h" |
| 31 | 31 | #include "cm.h" |
| @@ -34,7 +34,7 @@ · 33 unmodified lines | ||
| 34 | 34 | #include <linux/clockchips.h> |
| 35 | 35 | |
| 36 | 36 | #include <asm/mach/time.h> |
| 37 | −#include <asm/arch/dmtimer.h> | |
| 37 | +#include <mach/dmtimer.h> | |
| 38 | 38 | |
| 39 | 39 | static struct omap_dm_timer *gptimer; |
| 40 | 40 | static struct clock_event_device clockevent_gpt; |
| @@ -15,9 +15,9 @@ · 14 unmodified lines | ||
| 15 | 15 | |
| 16 | 16 | #include <linux/usb/musb.h> |
| 17 | 17 | |
| 18 | −#include <asm/arch/gpmc.h> | |
| 19 | −#include <asm/arch/gpio.h> | |
| 20 | −#include <asm/arch/mux.h> | |
| 18 | +#include <mach/gpmc.h> | |
| 19 | +#include <mach/gpio.h> | |
| 20 | +#include <mach/mux.h> | |
| 21 | 21 | |
| 22 | 22 | |
| 23 | 23 | static u8 async_cs, sync_cs; |
| @@ -317,7 +317,6 @@ tusb6010_setup_interface(struct musb_hdrc_platform_data *data, · 293 unmodified lines | ||
| 317 | 317 | printk(error, 6, status); |
| 318 | 318 | return -ENODEV; |
| 319 | 319 | } |
| 320 | − data->multipoint = 1; | |
| 321 | 320 | tusb_device.dev.platform_data = data; |
| 322 | 321 | |
| 323 | 322 | /* REVISIT let the driver know what DMA channels work */ |
| @@ -13,7 +13,7 @@ · 12 unmodified lines | ||
| 13 | 13 | #include <linux/kernel.h> |
| 14 | 14 | #include <linux/init.h> |
| 15 | 15 | #include <linux/mbus.h> |
| 16 | −#include <asm/hardware.h> | |
| 16 | +#include <mach/hardware.h> | |
| 17 | 17 | #include <asm/io.h> |
| 18 | 18 | #include "common.h" |
| 19 | 19 | |
| @@ -24,11 +24,12 @@ · 23 unmodified lines | ||
| 24 | 24 | #include <asm/mach/arch.h> |
| 25 | 25 | #include <asm/mach/map.h> |
| 26 | 26 | #include <asm/mach/time.h> |
| 27 | −#include <asm/arch/hardware.h> | |
| 28 | −#include <asm/arch/orion5x.h> | |
| 29 | −#include <asm/plat-orion/ehci-orion.h> | |
| 30 | −#include <asm/plat-orion/orion_nand.h> | |
| 31 | −#include <asm/plat-orion/time.h> | |
| 27 | +#include <mach/hardware.h> | |
| 28 | +#include <mach/orion5x.h> | |
| 29 | +#include <plat/ehci-orion.h> | |
| 30 | +#include <plat/mv_xor.h> | |
| 31 | +#include <plat/orion_nand.h> | |
| 32 | +#include <plat/time.h> | |
| 32 | 33 | #include "common.h" |
| 33 | 34 | |
| 34 | 35 | /***************************************************************************** |
| @@ -354,6 +355,103 @@ void __init orion5x_uart1_init(void) · 319 unmodified lines | ||
| 354 | 355 | } |
| 355 | 356 | |
| 356 | 357 | |
| 358 | +/***************************************************************************** | |
| 359 | + * XOR engine | |
| 360 | + ****************************************************************************/ | |
| 361 | +static struct resource orion5x_xor_shared_resources[] = { | |
| 362 | + { | |
| 363 | + .name = "xor low", | |
| 364 | + .start = ORION5X_XOR_PHYS_BASE, | |
| 365 | + .end = ORION5X_XOR_PHYS_BASE + 0xff, | |
| 366 | + .flags = IORESOURCE_MEM, | |
| 367 | + }, { | |
| 368 | + .name = "xor high", | |
| 369 | + .start = ORION5X_XOR_PHYS_BASE + 0x200, | |
| 370 | + .end = ORION5X_XOR_PHYS_BASE + 0x2ff, | |
| 371 | + .flags = IORESOURCE_MEM, | |
| 372 | + }, | |
| 373 | +}; | |
| 374 | + | |
| 375 | +static struct platform_device orion5x_xor_shared = { | |
| 376 | + .name = MV_XOR_SHARED_NAME, | |
| 377 | + .id = 0, | |
| 378 | + .num_resources = ARRAY_SIZE(orion5x_xor_shared_resources), | |
| 379 | + .resource = orion5x_xor_shared_resources, | |
| 380 | +}; | |
| 381 | + | |
| 382 | +static u64 orion5x_xor_dmamask = DMA_32BIT_MASK; | |
| 383 | + | |
| 384 | +static struct resource orion5x_xor0_resources[] = { | |
| 385 | + [0] = { | |
| 386 | + .start = IRQ_ORION5X_XOR0, | |
| 387 | + .end = IRQ_ORION5X_XOR0, | |
| 388 | + .flags = IORESOURCE_IRQ, | |
| 389 | + }, | |
| 390 | +}; | |
| 391 | + | |
| 392 | +static struct mv_xor_platform_data orion5x_xor0_data = { | |
| 393 | + .shared = &orion5x_xor_shared, | |
| 394 | + .hw_id = 0, | |
| 395 | + .pool_size = PAGE_SIZE, | |
| 396 | +}; | |
| 397 | + | |
| 398 | +static struct platform_device orion5x_xor0_channel = { | |
| 399 | + .name = MV_XOR_NAME, | |
| 400 | + .id = 0, | |
| 401 | + .num_resources = ARRAY_SIZE(orion5x_xor0_resources), | |
| 402 | + .resource = orion5x_xor0_resources, | |
| 403 | + .dev = { | |
| 404 | + .dma_mask = &orion5x_xor_dmamask, | |
| 405 | + .coherent_dma_mask = DMA_64BIT_MASK, | |
| 406 | + .platform_data = (void *)&orion5x_xor0_data, | |
| 407 | + }, | |
| 408 | +}; | |
| 409 | + | |
| 410 | +static struct resource orion5x_xor1_resources[] = { | |
| 411 | + [0] = { | |
| 412 | + .start = IRQ_ORION5X_XOR1, | |
| 413 | + .end = IRQ_ORION5X_XOR1, | |
| 414 | + .flags = IORESOURCE_IRQ, | |
| 415 | + }, | |
| 416 | +}; | |
| 417 | + | |
| 418 | +static struct mv_xor_platform_data orion5x_xor1_data = { | |
| 419 | + .shared = &orion5x_xor_shared, | |
| 420 | + .hw_id = 1, | |
| 421 | + .pool_size = PAGE_SIZE, | |
| 422 | +}; | |
| 423 | + | |
| 424 | +static struct platform_device orion5x_xor1_channel = { | |
| 425 | + .name = MV_XOR_NAME, | |
| 426 | + .id = 1, | |
| 427 | + .num_resources = ARRAY_SIZE(orion5x_xor1_resources), | |
| 428 | + .resource = orion5x_xor1_resources, | |
| 429 | + .dev = { | |
| 430 | + .dma_mask = &orion5x_xor_dmamask, | |
| 431 | + .coherent_dma_mask = DMA_64BIT_MASK, | |
| 432 | + .platform_data = (void *)&orion5x_xor1_data, | |
| 433 | + }, | |
| 434 | +}; | |
| 435 | + | |
| 436 | +void __init orion5x_xor_init(void) | |
| 437 | +{ | |
| 438 | + platform_device_register(&orion5x_xor_shared); | |
| 439 | + | |
| 440 | + /* | |
| 441 | + * two engines can't do memset simultaneously, this limitation | |
| 442 | + * satisfied by removing memset support from one of the engines. | |
| 443 | + */ | |
| 444 | + dma_cap_set(DMA_MEMCPY, orion5x_xor0_data.cap_mask); | |
| 445 | + dma_cap_set(DMA_XOR, orion5x_xor0_data.cap_mask); | |
| 446 | + platform_device_register(&orion5x_xor0_channel); | |
| 447 | + | |
| 448 | + dma_cap_set(DMA_MEMCPY, orion5x_xor1_data.cap_mask); | |
| 449 | + dma_cap_set(DMA_MEMSET, orion5x_xor1_data.cap_mask); | |
| 450 | + dma_cap_set(DMA_XOR, orion5x_xor1_data.cap_mask); | |
| 451 | + platform_device_register(&orion5x_xor1_channel); | |
| 452 | +} | |
| 453 | + | |
| 454 | + | |
| 357 | 455 | /***************************************************************************** |
| 358 | 456 | * Time handling |
| 359 | 457 | ****************************************************************************/ |
| @@ -382,6 +480,8 @@ static void __init orion5x_id(u32 *dev, u32 *rev, char **dev_name) · 22 unmodified lines | ||
| 382 | 480 | *dev_name = "MV88F5281-D2"; |
| 383 | 481 | } else if (*rev == MV88F5281_REV_D1) { |
| 384 | 482 | *dev_name = "MV88F5281-D1"; |
| 483 | + } else if (*rev == MV88F5281_REV_D0) { | |
| 484 | + *dev_name = "MV88F5281-D0"; | |
| 385 | 485 | } else { |
| 386 | 486 | *dev_name = "MV88F5281-Rev-Unsupported"; |
| 387 | 487 | } |
| @@ -416,6 +516,15 @@ void __init orion5x_init(void) · 28 unmodified lines | ||
| 416 | 516 | * Setup Orion address map |
| 417 | 517 | */ |
| 418 | 518 | orion5x_setup_cpu_mbus_bridge(); |
| 519 | + | |
| 520 | + /* | |
| 521 | + * Don't issue "Wait for Interrupt" instruction if we are | |
| 522 | + * running on D0 5281 silicon. | |
| 523 | + */ | |
| 524 | + if (dev == MV88F5281_DEV_ID && rev == MV88F5281_REV_D0) { | |
| 525 | + printk(KERN_INFO "Orion: Applying 5281 D0 WFI workaround.\n"); | |
| 526 | + disable_hlt(); | |
| 527 | + } | |
| 419 | 528 | } |
| 420 | 529 | |
| 421 | 530 | /* |
| @@ -32,6 +32,7 @@ void orion5x_i2c_init(void); · 31 unmodified lines | ||
| 32 | 32 | void orion5x_sata_init(struct mv_sata_platform_data *sata_data); |
| 33 | 33 | void orion5x_uart0_init(void); |
| 34 | 34 | void orion5x_uart1_init(void); |
| 35 | +void orion5x_xor_init(void); | |
| 35 | 36 | |
| 36 | 37 | /* |
| 37 | 38 | * PCIe/PCI functions. |
| @@ -24,8 +24,8 @@ · 23 unmodified lines | ||
| 24 | 24 | #include <asm/gpio.h> |
| 25 | 25 | #include <asm/mach/arch.h> |
| 26 | 26 | #include <asm/mach/pci.h> |
| 27 | −#include <asm/arch/orion5x.h> | |
| 28 | −#include <asm/plat-orion/orion_nand.h> | |
| 27 | +#include <mach/orion5x.h> | |
| 28 | +#include <plat/orion_nand.h> | |
| 29 | 29 | #include "common.h" |
| 30 | 30 | #include "mpp.h" |
| 31 | 31 | |
| @@ -25,7 +25,7 @@ · 24 unmodified lines | ||
| 25 | 25 | #include <asm/gpio.h> |
| 26 | 26 | #include <asm/mach/arch.h> |
| 27 | 27 | #include <asm/mach/pci.h> |
| 28 | −#include <asm/arch/orion5x.h> | |
| 28 | +#include <mach/orion5x.h> | |
| 29 | 29 | #include "common.h" |
| 30 | 30 | #include "mpp.h" |
| 31 | 31 | |
| @@ -17,7 +17,7 @@ · 16 unmodified lines | ||
| 17 | 17 | #include <linux/bitops.h> |
| 18 | 18 | #include <asm/gpio.h> |
| 19 | 19 | #include <asm/io.h> |
| 20 | −#include <asm/arch/orion5x.h> | |
| 20 | +#include <mach/orion5x.h> | |
| 21 | 21 | #include "common.h" |
| 22 | 22 | |
| 23 | 23 | static DEFINE_SPINLOCK(gpio_lock); |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-orion5x/debug-macro.S | |
| 2 | + * arch/arm/mach-orion5x/include/mach/debug-macro.S | |
| 3 | 3 | * |
| 4 | 4 | * Debugging macro include header |
| 5 | 5 | * |
| @@ -8,7 +8,7 @@ · 2 unmodified lines | ||
| 8 | 8 | * published by the Free Software Foundation. |
| 9 | 9 | */ |
| 10 | 10 | |
| 11 | −#include <asm/arch/orion5x.h> | |
| 11 | +#include <mach/orion5x.h> | |
| 12 | 12 | |
| 13 | 13 | .macro addruart,rx |
| 14 | 14 | mrc p15, 0, \rx, c1, c0 |
File renamed without changes.
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-orion5x/entry-macro.S | |
| 2 | + * arch/arm/mach-orion5x/include/mach/entry-macro.S | |
| 3 | 3 | * |
| 4 | 4 | * Low-level IRQ helper macros for Orion platforms |
| 5 | 5 | * |
| @@ -8,7 +8,7 @@ · 2 unmodified lines | ||
| 8 | 8 | * warranty of any kind, whether express or implied. |
| 9 | 9 | */ |
| 10 | 10 | |
| 11 | −#include <asm/arch/orion5x.h> | |
| 11 | +#include <mach/orion5x.h> | |
| 12 | 12 | |
| 13 | 13 | .macro disable_fiq |
| 14 | 14 | .endm |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-orion5x/gpio.h | |
| 2 | + * arch/arm/mach-orion5x/include/mach/gpio.h | |
| 3 | 3 | * |
| 4 | 4 | * This file is licensed under the terms of the GNU General Public |
| 5 | 5 | * License version 2. This program is licensed "as is" without any |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-orion5x/hardware.h | |
| 2 | + * arch/arm/mach-orion5x/include/mach/hardware.h | |
| 3 | 3 | * |
| 4 | 4 | * This program is free software; you can redistribute it and/or modify |
| 5 | 5 | * it under the terms of the GNU General Public License version 2 as |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-orion5x/io.h | |
| 2 | + * arch/arm/mach-orion5x/include/mach/io.h | |
| 3 | 3 | * |
| 4 | 4 | * Tzachi Perelstein <tzachi@marvell.com> |
| 5 | 5 | * |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-orion5x/irqs.h | |
| 2 | + * arch/arm/mach-orion5x/include/mach/irqs.h | |
| 3 | 3 | * |
| 4 | 4 | * IRQ definitions for Orion SoC |
| 5 | 5 | * |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-orion5x/memory.h | |
| 2 | + * arch/arm/mach-orion5x/include/mach/memory.h | |
| 3 | 3 | * |
| 4 | 4 | * Marvell Orion memory definitions |
| 5 | 5 | */ |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-orion5x/orion5x.h | |
| 2 | + * arch/arm/mach-orion5x/include/mach/orion5x.h | |
| 3 | 3 | * |
| 4 | 4 | * Generic definitions of Orion SoC flavors: |
| 5 | 5 | * Orion-1, Orion-VoIP, Orion-NAS, and Orion-2. |
| @@ -73,6 +73,7 @@ · 67 unmodified lines | ||
| 73 | 73 | #define MV88F5182_REV_A2 2 |
| 74 | 74 | /* Orion-2 (88F5281) */ |
| 75 | 75 | #define MV88F5281_DEV_ID 0x5281 |
| 76 | +#define MV88F5281_REV_D0 4 | |
| 76 | 77 | #define MV88F5281_REV_D1 5 |
| 77 | 78 | #define MV88F5281_REV_D2 6 |
| 78 | 79 | |
| @@ -105,6 +106,10 @@ · 26 unmodified lines | ||
| 105 | 106 | #define ORION5X_USB0_VIRT_BASE (ORION5X_REGS_VIRT_BASE | 0x50000) |
| 106 | 107 | #define ORION5X_USB0_REG(x) (ORION5X_USB0_VIRT_BASE | (x)) |
| 107 | 108 | |
| 109 | +#define ORION5X_XOR_PHYS_BASE (ORION5X_REGS_PHYS_BASE | 0x60900) | |
| 110 | +#define ORION5X_XOR_VIRT_BASE (ORION5X_REGS_VIRT_BASE | 0x60900) | |
| 111 | +#define ORION5X_XOR_REG(x) (ORION5X_XOR_VIRT_BASE | (x)) | |
| 112 | + | |
| 108 | 113 | #define ORION5X_ETH_PHYS_BASE (ORION5X_REGS_PHYS_BASE | 0x70000) |
| 109 | 114 | #define ORION5X_ETH_VIRT_BASE (ORION5X_REGS_VIRT_BASE | 0x70000) |
| 110 | 115 | #define ORION5X_ETH_REG(x) (ORION5X_ETH_VIRT_BASE | (x)) |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-orion5x/system.h | |
| 2 | + * arch/arm/mach-orion5x/include/mach/system.h | |
| 3 | 3 | * |
| 4 | 4 | * Tzachi Perelstein <tzachi@marvell.com> |
| 5 | 5 | * |
| @@ -11,8 +11,8 @@ · 5 unmodified lines | ||
| 11 | 11 | #ifndef __ASM_ARCH_SYSTEM_H |
| 12 | 12 | #define __ASM_ARCH_SYSTEM_H |
| 13 | 13 | |
| 14 | −#include <asm/arch/hardware.h> | |
| 15 | −#include <asm/arch/orion5x.h> | |
| 14 | +#include <mach/hardware.h> | |
| 15 | +#include <mach/orion5x.h> | |
| 16 | 16 | |
| 17 | 17 | static inline void arch_idle(void) |
| 18 | 18 | { |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-orion5x/timex.h | |
| 2 | + * arch/arm/mach-orion5x/include/mach/timex.h | |
| 3 | 3 | * |
| 4 | 4 | * Tzachi Perelstein <tzachi@marvell.com> |
| 5 | 5 | * |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-orion5x/uncompress.h | |
| 2 | + * arch/arm/mach-orion5x/include/mach/uncompress.h | |
| 3 | 3 | * |
| 4 | 4 | * Tzachi Perelstein <tzachi@marvell.com> |
| 5 | 5 | * |
| @@ -9,7 +9,7 @@ · 3 unmodified lines | ||
| 9 | 9 | */ |
| 10 | 10 | |
| 11 | 11 | #include <linux/serial_reg.h> |
| 12 | −#include <asm/arch/orion5x.h> | |
| 12 | +#include <mach/orion5x.h> | |
| 13 | 13 | |
| 14 | 14 | #define SERIAL_BASE ((unsigned char *)UART0_PHYS_BASE) |
| 15 | 15 | |
| @@ -0,0 +1,5 @@ | ||
| 1 | +/* | |
| 2 | + * arch/arm/mach-orion5x/include/mach/vmalloc.h | |
| 3 | + */ | |
| 4 | + | |
| 5 | +#define VMALLOC_END 0xfd800000 | |
| @@ -15,8 +15,8 @@ · 14 unmodified lines | ||
| 15 | 15 | #include <linux/irq.h> |
| 16 | 16 | #include <asm/gpio.h> |
| 17 | 17 | #include <asm/io.h> |
| 18 | −#include <asm/arch/orion5x.h> | |
| 19 | −#include <asm/plat-orion/irq.h> | |
| 18 | +#include <mach/orion5x.h> | |
| 19 | +#include <plat/irq.h> | |
| 20 | 20 | #include "common.h" |
| 21 | 21 | |
| 22 | 22 | /***************************************************************************** |
| @@ -24,8 +24,8 @@ · 23 unmodified lines | ||
| 24 | 24 | #include <asm/gpio.h> |
| 25 | 25 | #include <asm/mach/arch.h> |
| 26 | 26 | #include <asm/mach/pci.h> |
| 27 | −#include <asm/arch/orion5x.h> | |
| 28 | −#include <asm/plat-orion/orion_nand.h> | |
| 27 | +#include <mach/orion5x.h> | |
| 28 | +#include <plat/orion_nand.h> | |
| 29 | 29 | #include "common.h" |
| 30 | 30 | #include "mpp.h" |
| 31 | 31 | |
| @@ -356,6 +356,7 @@ static void __init kurobox_pro_init(void) · 324 unmodified lines | ||
| 356 | 356 | orion5x_sata_init(&kurobox_pro_sata_data); |
| 357 | 357 | orion5x_uart0_init(); |
| 358 | 358 | orion5x_uart1_init(); |
| 359 | + orion5x_xor_init(); | |
| 359 | 360 | |
| 360 | 361 | orion5x_setup_dev_boot_win(KUROBOX_PRO_NOR_BOOT_BASE, |
| 361 | 362 | KUROBOX_PRO_NOR_BOOT_SIZE); |
| @@ -11,7 +11,7 @@ · 10 unmodified lines | ||
| 11 | 11 | #include <linux/kernel.h> |
| 12 | 12 | #include <linux/init.h> |
| 13 | 13 | #include <linux/mbus.h> |
| 14 | −#include <asm/hardware.h> | |
| 14 | +#include <mach/hardware.h> | |
| 15 | 15 | #include <asm/io.h> |
| 16 | 16 | #include "common.h" |
| 17 | 17 | #include "mpp.h" |
| @@ -25,7 +25,7 @@ · 24 unmodified lines | ||
| 25 | 25 | #include <asm/mach-types.h> |
| 26 | 26 | #include <asm/mach/arch.h> |
| 27 | 27 | #include <asm/mach/pci.h> |
| 28 | −#include <asm/arch/orion5x.h> | |
| 28 | +#include <mach/orion5x.h> | |
| 29 | 29 | #include "common.h" |
| 30 | 30 | #include "mpp.h" |
| 31 | 31 | |
| @@ -239,6 +239,7 @@ static void __init mss2_init(void) · 207 unmodified lines | ||
| 239 | 239 | orion5x_i2c_init(); |
| 240 | 240 | orion5x_sata_init(&mss2_sata_data); |
| 241 | 241 | orion5x_uart0_init(); |
| 242 | + orion5x_xor_init(); | |
| 242 | 243 | |
| 243 | 244 | orion5x_setup_dev_boot_win(MSS2_NOR_BOOT_BASE, MSS2_NOR_BOOT_SIZE); |
| 244 | 245 | platform_device_register(&mss2_nor_flash); |
| @@ -22,7 +22,7 @@ · 21 unmodified lines | ||
| 22 | 22 | #include <asm/mach-types.h> |
| 23 | 23 | #include <asm/gpio.h> |
| 24 | 24 | #include <asm/mach/arch.h> |
| 25 | −#include <asm/arch/orion5x.h> | |
| 25 | +#include <mach/orion5x.h> | |
| 26 | 26 | #include "common.h" |
| 27 | 27 | #include "mpp.h" |
| 28 | 28 | |
| @@ -203,6 +203,7 @@ static void __init mv2120_init(void) · 174 unmodified lines | ||
| 203 | 203 | orion5x_i2c_init(); |
| 204 | 204 | orion5x_sata_init(&mv2120_sata_data); |
| 205 | 205 | orion5x_uart0_init(); |
| 206 | + orion5x_xor_init(); | |
| 206 | 207 | |
| 207 | 208 | orion5x_setup_dev_boot_win(MV2120_NOR_BOOT_BASE, MV2120_NOR_BOOT_SIZE); |
| 208 | 209 | platform_device_register(&mv2120_nor_flash); |
| @@ -14,7 +14,7 @@ · 13 unmodified lines | ||
| 14 | 14 | #include <linux/pci.h> |
| 15 | 15 | #include <linux/mbus.h> |
| 16 | 16 | #include <asm/mach/pci.h> |
| 17 | −#include <asm/plat-orion/pcie.h> | |
| 17 | +#include <plat/pcie.h> | |
| 18 | 18 | #include "common.h" |
| 19 | 19 | |
| 20 | 20 | /***************************************************************************** |
| @@ -21,7 +21,7 @@ · 20 unmodified lines | ||
| 21 | 21 | #include <asm/leds.h> |
| 22 | 22 | #include <asm/mach/arch.h> |
| 23 | 23 | #include <asm/mach/pci.h> |
| 24 | −#include <asm/arch/orion5x.h> | |
| 24 | +#include <mach/orion5x.h> | |
| 25 | 25 | #include "common.h" |
| 26 | 26 | #include "mpp.h" |
| 27 | 27 | |
| @@ -22,7 +22,7 @@ · 21 unmodified lines | ||
| 22 | 22 | #include <asm/leds.h> |
| 23 | 23 | #include <asm/mach/arch.h> |
| 24 | 24 | #include <asm/mach/pci.h> |
| 25 | −#include <asm/arch/orion5x.h> | |
| 25 | +#include <mach/orion5x.h> | |
| 26 | 26 | #include "common.h" |
| 27 | 27 | #include "mpp.h" |
| 28 | 28 | |
| @@ -24,7 +24,7 @@ · 23 unmodified lines | ||
| 24 | 24 | #include <asm/leds.h> |
| 25 | 25 | #include <asm/mach/arch.h> |
| 26 | 26 | #include <asm/mach/pci.h> |
| 27 | −#include <asm/arch/orion5x.h> | |
| 27 | +#include <mach/orion5x.h> | |
| 28 | 28 | #include "common.h" |
| 29 | 29 | #include "mpp.h" |
| 30 | 30 | |
| @@ -292,6 +292,7 @@ static void __init rd88f5182_init(void) · 261 unmodified lines | ||
| 292 | 292 | orion5x_i2c_init(); |
| 293 | 293 | orion5x_sata_init(&rd88f5182_sata_data); |
| 294 | 294 | orion5x_uart0_init(); |
| 295 | + orion5x_xor_init(); | |
| 295 | 296 | |
| 296 | 297 | orion5x_setup_dev_boot_win(RD88F5182_NOR_BOOT_BASE, |
| 297 | 298 | RD88F5182_NOR_BOOT_SIZE); |
| @@ -26,7 +26,7 @@ · 25 unmodified lines | ||
| 26 | 26 | #include <asm/gpio.h> |
| 27 | 27 | #include <asm/mach/arch.h> |
| 28 | 28 | #include <asm/mach/pci.h> |
| 29 | −#include <asm/arch/orion5x.h> | |
| 29 | +#include <mach/orion5x.h> | |
| 30 | 30 | #include "common.h" |
| 31 | 31 | #include "mpp.h" |
| 32 | 32 | #include "tsx09-common.h" |
| @@ -207,12 +207,12 @@ static struct i2c_board_info __initdata qnap_ts209_i2c_rtc = { · 174 unmodified lines | ||
| 207 | 207 | |
| 208 | 208 | static struct gpio_keys_button qnap_ts209_buttons[] = { |
| 209 | 209 | { |
| 210 | − .code = KEY_RESTART, | |
| 210 | + .code = KEY_COPY, | |
| 211 | 211 | .gpio = QNAP_TS209_GPIO_KEY_MEDIA, |
| 212 | 212 | .desc = "USB Copy Button", |
| 213 | 213 | .active_low = 1, |
| 214 | 214 | }, { |
| 215 | − .code = KEY_POWER, | |
| 215 | + .code = KEY_RESTART, | |
| 216 | 216 | .gpio = QNAP_TS209_GPIO_KEY_RESET, |
| 217 | 217 | .desc = "Reset Button", |
| 218 | 218 | .active_low = 1, |
| @@ -296,6 +296,7 @@ static void __init qnap_ts209_init(void) · 77 unmodified lines | ||
| 296 | 296 | orion5x_i2c_init(); |
| 297 | 297 | orion5x_sata_init(&qnap_ts209_sata_data); |
| 298 | 298 | orion5x_uart0_init(); |
| 299 | + orion5x_xor_init(); | |
| 299 | 300 | |
| 300 | 301 | orion5x_setup_dev_boot_win(QNAP_TS209_NOR_BOOT_BASE, |
| 301 | 302 | QNAP_TS209_NOR_BOOT_SIZE); |
| @@ -3,6 +3,9 @@ · 2 unmodified lines | ||
| 3 | 3 | * |
| 4 | 4 | * Maintainer: Sylver Bruneau <sylver.bruneau@gmail.com> |
| 5 | 5 | * |
| 6 | + * Copyright (C) 2008 Sylver Bruneau <sylver.bruneau@gmail.com> | |
| 7 | + * Copyright (C) 2008 Martin Michlmayr <tbm@cyrius.com> | |
| 8 | + * | |
| 6 | 9 | * This program is free software; you can redistribute it and/or |
| 7 | 10 | * modify it under the terms of the GNU General Public License |
| 8 | 11 | * as published by the Free Software Foundation; either version |
| @@ -16,6 +19,7 @@ · 7 unmodified lines | ||
| 16 | 19 | #include <linux/irq.h> |
| 17 | 20 | #include <linux/mtd/physmap.h> |
| 18 | 21 | #include <linux/mv643xx_eth.h> |
| 22 | +#include <linux/leds.h> | |
| 19 | 23 | #include <linux/gpio_keys.h> |
| 20 | 24 | #include <linux/input.h> |
| 21 | 25 | #include <linux/i2c.h> |
| @@ -24,7 +28,7 @@ · 2 unmodified lines | ||
| 24 | 28 | #include <asm/gpio.h> |
| 25 | 29 | #include <asm/mach/arch.h> |
| 26 | 30 | #include <asm/mach/pci.h> |
| 27 | −#include <asm/arch/orion5x.h> | |
| 31 | +#include <mach/orion5x.h> | |
| 28 | 32 | #include "common.h" |
| 29 | 33 | #include "mpp.h" |
| 30 | 34 | #include "tsx09-common.h" |
| @@ -162,16 +166,59 @@ static struct i2c_board_info __initdata qnap_ts409_i2c_rtc = { · 131 unmodified lines | ||
| 162 | 166 | I2C_BOARD_INFO("s35390a", 0x30), |
| 163 | 167 | }; |
| 164 | 168 | |
| 169 | +/***************************************************************************** | |
| 170 | + * LEDs attached to GPIO | |
| 171 | + ****************************************************************************/ | |
| 172 | + | |
| 173 | +static struct gpio_led ts409_led_pins[] = { | |
| 174 | + { | |
| 175 | + .name = "ts409:red:sata1", | |
| 176 | + .gpio = 4, | |
| 177 | + .active_low = 1, | |
| 178 | + }, { | |
| 179 | + .name = "ts409:red:sata2", | |
| 180 | + .gpio = 5, | |
| 181 | + .active_low = 1, | |
| 182 | + }, { | |
| 183 | + .name = "ts409:red:sata3", | |
| 184 | + .gpio = 6, | |
| 185 | + .active_low = 1, | |
| 186 | + }, { | |
| 187 | + .name = "ts409:red:sata4", | |
| 188 | + .gpio = 7, | |
| 189 | + .active_low = 1, | |
| 190 | + }, | |
| 191 | +}; | |
| 192 | + | |
| 193 | +static struct gpio_led_platform_data ts409_led_data = { | |
| 194 | + .leds = ts409_led_pins, | |
| 195 | + .num_leds = ARRAY_SIZE(ts409_led_pins), | |
| 196 | +}; | |
| 197 | + | |
| 198 | +static struct platform_device ts409_leds = { | |
| 199 | + .name = "leds-gpio", | |
| 200 | + .id = -1, | |
| 201 | + .dev = { | |
| 202 | + .platform_data = &ts409_led_data, | |
| 203 | + }, | |
| 204 | +}; | |
| 205 | + | |
| 165 | 206 | /**************************************************************************** |
| 166 | 207 | * GPIO Attached Keys |
| 167 | 208 | * Power button is attached to the PIC microcontroller |
| 168 | 209 | ****************************************************************************/ |
| 169 | 210 | |
| 211 | +#define QNAP_TS409_GPIO_KEY_RESET 14 | |
| 170 | 212 | #define QNAP_TS409_GPIO_KEY_MEDIA 15 |
| 171 | 213 | |
| 172 | 214 | static struct gpio_keys_button qnap_ts409_buttons[] = { |
| 173 | 215 | { |
| 174 | 216 | .code = KEY_RESTART, |
| 217 | + .gpio = QNAP_TS409_GPIO_KEY_RESET, | |
| 218 | + .desc = "Reset Button", | |
| 219 | + .active_low = 1, | |
| 220 | + }, { | |
| 221 | + .code = KEY_COPY, | |
| 175 | 222 | .gpio = QNAP_TS409_GPIO_KEY_MEDIA, |
| 176 | 223 | .desc = "USB Copy Button", |
| 177 | 224 | .active_low = 1, |
| @@ -255,6 +302,7 @@ static void __init qnap_ts409_init(void) · 77 unmodified lines | ||
| 255 | 302 | if (qnap_ts409_i2c_rtc.irq == 0) |
| 256 | 303 | pr_warning("qnap_ts409_init: failed to get RTC IRQ\n"); |
| 257 | 304 | i2c_register_board_info(0, &qnap_ts409_i2c_rtc, 1); |
| 305 | + platform_device_register(&ts409_leds); | |
| 258 | 306 | |
| 259 | 307 | /* register tsx09 specific power-off method */ |
| 260 | 308 | pm_power_off = qnap_tsx09_power_off; |
| @@ -18,7 +18,7 @@ · 17 unmodified lines | ||
| 18 | 18 | #include <asm/mach-types.h> |
| 19 | 19 | #include <asm/mach/arch.h> |
| 20 | 20 | #include <asm/mach/map.h> |
| 21 | −#include <asm/arch/orion5x.h> | |
| 21 | +#include <mach/orion5x.h> | |
| 22 | 22 | #include "common.h" |
| 23 | 23 | #include "mpp.h" |
| 24 | 24 | |
| @@ -256,6 +256,7 @@ static void __init ts78xx_init(void) · 231 unmodified lines | ||
| 256 | 256 | orion5x_sata_init(&ts78xx_sata_data); |
| 257 | 257 | orion5x_uart0_init(); |
| 258 | 258 | orion5x_uart1_init(); |
| 259 | + orion5x_xor_init(); | |
| 259 | 260 | |
| 260 | 261 | orion5x_setup_dev_boot_win(TS78XX_NOR_BOOT_BASE, |
| 261 | 262 | TS78XX_NOR_BOOT_SIZE); |
| @@ -19,7 +19,7 @@ · 18 unmodified lines | ||
| 19 | 19 | #include <asm/gpio.h> |
| 20 | 20 | #include <asm/mach/arch.h> |
| 21 | 21 | #include <asm/mach/pci.h> |
| 22 | −#include <asm/arch/orion5x.h> | |
| 22 | +#include <mach/orion5x.h> | |
| 23 | 23 | #include "common.h" |
| 24 | 24 | #include "mpp.h" |
| 25 | 25 | |
| @@ -19,7 +19,7 @@ · 18 unmodified lines | ||
| 19 | 19 | #include <asm/gpio.h> |
| 20 | 20 | #include <asm/mach/arch.h> |
| 21 | 21 | #include <asm/mach/pci.h> |
| 22 | −#include <asm/arch/orion5x.h> | |
| 22 | +#include <mach/orion5x.h> | |
| 23 | 23 | #include "common.h" |
| 24 | 24 | #include "mpp.h" |
| 25 | 25 | |
| @@ -21,10 +21,10 @@ · 20 unmodified lines | ||
| 21 | 21 | #include <linux/err.h> |
| 22 | 22 | #include <linux/delay.h> |
| 23 | 23 | |
| 24 | −#include <asm/hardware.h> | |
| 24 | +#include <mach/hardware.h> | |
| 25 | 25 | #include <asm/io.h> |
| 26 | 26 | |
| 27 | −#include <asm/arch/clock.h> | |
| 27 | +#include <mach/clock.h> | |
| 28 | 28 | #include "clock.h" |
| 29 | 29 | |
| 30 | 30 | /*forward declaration*/ |
| @@ -26,7 +26,7 @@ · 25 unmodified lines | ||
| 26 | 26 | #include <linux/device.h> |
| 27 | 27 | #include <linux/spi/spi.h> |
| 28 | 28 | |
| 29 | −#include <asm/hardware.h> | |
| 29 | +#include <mach/hardware.h> | |
| 30 | 30 | #include <asm/io.h> |
| 31 | 31 | #include <asm/setup.h> |
| 32 | 32 | #include <asm/mach-types.h> |
| @@ -38,9 +38,9 @@ · 5 unmodified lines | ||
| 38 | 38 | #include <asm/mach/map.h> |
| 39 | 39 | #include <asm/mach/time.h> |
| 40 | 40 | |
| 41 | −#include <asm/arch/irq.h> | |
| 42 | −#include <asm/arch/clock.h> | |
| 43 | −#include <asm/arch/dma.h> | |
| 41 | +#include <mach/irq.h> | |
| 42 | +#include <mach/clock.h> | |
| 43 | +#include <mach/dma.h> | |
| 44 | 44 | |
| 45 | 45 | struct resource spipnx_0_resources[] = { |
| 46 | 46 | { |
| @@ -23,12 +23,12 @@ · 22 unmodified lines | ||
| 23 | 23 | #include <linux/clk.h> |
| 24 | 24 | |
| 25 | 25 | #include <asm/system.h> |
| 26 | −#include <asm/hardware.h> | |
| 26 | +#include <mach/hardware.h> | |
| 27 | 27 | #include <asm/dma.h> |
| 28 | 28 | #include <asm/dma-mapping.h> |
| 29 | 29 | #include <asm/io.h> |
| 30 | 30 | #include <asm/mach/dma.h> |
| 31 | −#include <asm/arch/clock.h> | |
| 31 | +#include <mach/clock.h> | |
| 32 | 32 | |
| 33 | 33 | static struct dma_channel { |
| 34 | 34 | char *name; |
| @@ -18,8 +18,8 @@ · 17 unmodified lines | ||
| 18 | 18 | #include <linux/kernel.h> |
| 19 | 19 | #include <linux/module.h> |
| 20 | 20 | #include <asm/io.h> |
| 21 | −#include <asm/arch/platform.h> | |
| 22 | −#include <asm/arch/gpio.h> | |
| 21 | +#include <mach/platform.h> | |
| 22 | +#include <mach/gpio.h> | |
| 23 | 23 | |
| 24 | 24 | /* register definitions */ |
| 25 | 25 | #define PIO_VA_BASE IO_ADDRESS(PNX4008_PIO_BASE) |
| @@ -14,8 +14,8 @@ · 13 unmodified lines | ||
| 14 | 14 | #include <linux/i2c-pnx.h> |
| 15 | 15 | #include <linux/platform_device.h> |
| 16 | 16 | #include <linux/err.h> |
| 17 | −#include <asm/arch/platform.h> | |
| 18 | −#include <asm/arch/i2c.h> | |
| 17 | +#include <mach/platform.h> | |
| 18 | +#include <mach/i2c.h> | |
| 19 | 19 | |
| 20 | 20 | static int set_clock_run(struct platform_device *pdev) |
| 21 | 21 | { |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-pnx4008/clock.h | |
| 2 | + * arch/arm/mach-pnx4008/include/mach/clock.h | |
| 3 | 3 | * |
| 4 | 4 | * Clock control driver for PNX4008 - header file |
| 5 | 5 | * |
| @@ -1,4 +1,4 @@ | ||
| 1 | −/* linux/include/asm-arm/arch-pnx4008/debug-macro.S | |
| 1 | +/* arch/arm/mach-pnx4008/include/mach/debug-macro.S | |
| 2 | 2 | * |
| 3 | 3 | * Debugging macro include header |
| 4 | 4 | * |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-pnx4008/dma.h | |
| 2 | + * arch/arm/mach-pnx4008/include/mach/dma.h | |
| 3 | 3 | * |
| 4 | 4 | * PNX4008 DMA header file |
| 5 | 5 | * |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-pnx4008/entry-macro.S | |
| 2 | + * arch/arm/mach-pnx4008/include/mach/entry-macro.S | |
| 3 | 3 | * |
| 4 | 4 | * Low-level IRQ helper macros for PNX4008-based platforms |
| 5 | 5 | * |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-pnx4008/gpio.h | |
| 2 | + * arch/arm/mach-pnx4008/include/mach/gpio.h | |
| 3 | 3 | * |
| 4 | 4 | * PNX4008 GPIO driver - header file |
| 5 | 5 | * |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-pnx4008/hardware.h | |
| 2 | + * arch/arm/mach-pnx4008/include/mach/hardware.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (c) 2005 MontaVista Software, Inc. <source@mvista.com> |
| 5 | 5 | * |
| @@ -21,7 +21,7 @@ · 15 unmodified lines | ||
| 21 | 21 | #define __ASM_ARCH_HARDWARE_H |
| 22 | 22 | |
| 23 | 23 | #include <asm/sizes.h> |
| 24 | −#include <asm/arch/platform.h> | |
| 24 | +#include <mach/platform.h> | |
| 25 | 25 | |
| 26 | 26 | /* Start of virtual addresses for IO devices */ |
| 27 | 27 | #define IO_BASE 0xF0000000 |
| @@ -12,9 +12,6 @@ · 11 unmodified lines | ||
| 12 | 12 | #ifndef __ASM_ARCH_I2C_H__ |
| 13 | 13 | #define __ASM_ARCH_I2C_H__ |
| 14 | 14 | |
| 15 | −#include <linux/pm.h> | |
| 16 | −#include <linux/platform_device.h> | |
| 17 | − | |
| 18 | 15 | enum { |
| 19 | 16 | mstatus_tdi = 0x00000001, |
| 20 | 17 | mstatus_afi = 0x00000002, |
| @@ -1,6 +1,6 @@ | ||
| 1 | 1 | |
| 2 | 2 | /* |
| 3 | − * include/asm-arm/arch-pnx4008/io.h | |
| 3 | + * arch/arm/mach-pnx4008/include/mach/io.h | |
| 4 | 4 | * |
| 5 | 5 | * Author: Dmitry Chigirev <chigirev@ru.mvista.com> |
| 6 | 6 | * |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-pnx4008/irq.h | |
| 2 | + * arch/arm/mach-pnx4008/include/mach/irq.h | |
| 3 | 3 | * |
| 4 | 4 | * PNX4008 IRQ controller driver - header file |
| 5 | 5 | * this one is used in entry-arnv.S as well so it cannot contain C code |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-pnx4008/irqs.h | |
| 2 | + * arch/arm/mach-pnx4008/include/mach/irqs.h | |
| 3 | 3 | * |
| 4 | 4 | * PNX4008 IRQ controller driver - header file |
| 5 | 5 | * |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-pnx4008/memory.h | |
| 2 | + * arch/arm/mach-pnx4008/include/mach/memory.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (c) 2005 Philips Semiconductors |
| 5 | 5 | * Copyright (c) 2005 MontaVista Software, Inc. |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-pnx4008/param.h | |
| 2 | + * arch/arm/mach-pnx4008/include/mach/param.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 1999 ARM Limited |
| 5 | 5 | * |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-pnx4008/platform.h | |
| 2 | + * arch/arm/mach-pnx4008/include/mach/platform.h | |
| 3 | 3 | * |
| 4 | 4 | * PNX4008 Base addresses - header file |
| 5 | 5 | * |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-pnx4008/pm.h | |
| 2 | + * arch/arm/mach-pnx4008/include/mach/pm.h | |
| 3 | 3 | * |
| 4 | 4 | * PNX4008 Power Management Routiness - header file |
| 5 | 5 | * |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-pnx4008/system.h | |
| 2 | + * arch/arm/mach-pnx4008/include/mach/system.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 2003 Philips Semiconductors |
| 5 | 5 | * Copyright (C) 2005 MontaVista Software, Inc. |
| @@ -21,9 +21,9 @@ · 15 unmodified lines | ||
| 21 | 21 | #ifndef __ASM_ARCH_SYSTEM_H |
| 22 | 22 | #define __ASM_ARCH_SYSTEM_H |
| 23 | 23 | |
| 24 | −#include <asm/hardware.h> | |
| 24 | +#include <mach/hardware.h> | |
| 25 | 25 | #include <asm/io.h> |
| 26 | −#include <asm/arch/platform.h> | |
| 26 | +#include <mach/platform.h> | |
| 27 | 27 | |
| 28 | 28 | static void arch_idle(void) |
| 29 | 29 | { |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-pnx4008/timex.h | |
| 2 | + * arch/arm/mach-pnx4008/include/mach/timex.h | |
| 3 | 3 | * |
| 4 | 4 | * PNX4008 timers header file |
| 5 | 5 | * |
| @@ -14,7 +14,7 @@ · 8 unmodified lines | ||
| 14 | 14 | #ifndef __PNX4008_TIMEX_H |
| 15 | 15 | #define __PNX4008_TIMEX_H |
| 16 | 16 | |
| 17 | −#include <asm/hardware.h> | |
| 17 | +#include <mach/hardware.h> | |
| 18 | 18 | #include <asm/io.h> |
| 19 | 19 | |
| 20 | 20 | #define CLOCK_TICK_RATE 1000000 |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-pnx4008/uncompress.h | |
| 2 | + * arch/arm/mach-pnx4008/include/mach/uncompress.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 1999 ARM Limited |
| 5 | 5 | * Copyright (C) 2006 MontaVista Software, Inc. |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-pnx4008/vmalloc.h | |
| 2 | + * arch/arm/mach-pnx4008/include/mach/vmalloc.h | |
| 3 | 3 | * |
| 4 | 4 | * Author: Vitaly Wool <source@mvista.com> |
| 5 | 5 | * |
| @@ -23,17 +23,16 @@ · 22 unmodified lines | ||
| 23 | 23 | #include <linux/ioport.h> |
| 24 | 24 | #include <linux/device.h> |
| 25 | 25 | #include <linux/irq.h> |
| 26 | −#include <asm/hardware.h> | |
| 26 | +#include <mach/hardware.h> | |
| 27 | 27 | #include <asm/io.h> |
| 28 | 28 | #include <asm/setup.h> |
| 29 | −#include <asm/mach-types.h> | |
| 30 | 29 | #include <asm/pgtable.h> |
| 31 | 30 | #include <asm/page.h> |
| 32 | 31 | #include <asm/system.h> |
| 33 | 32 | #include <asm/mach/arch.h> |
| 34 | 33 | #include <asm/mach/irq.h> |
| 35 | 34 | #include <asm/mach/map.h> |
| 36 | −#include <asm/arch/irq.h> | |
| 35 | +#include <mach/irq.h> | |
| 37 | 36 | |
| 38 | 37 | static u8 pnx4008_irq_type[NR_IRQS] = PNX4008_IRQ_TYPES; |
| 39 | 38 | |
| @@ -20,10 +20,9 @@ · 19 unmodified lines | ||
| 20 | 20 | #include <linux/clk.h> |
| 21 | 21 | |
| 22 | 22 | #include <asm/io.h> |
| 23 | −#include <asm/mach-types.h> | |
| 24 | 23 | #include <asm/cacheflush.h> |
| 25 | −#include <asm/arch/pm.h> | |
| 26 | −#include <asm/arch/clock.h> | |
| 24 | +#include <mach/pm.h> | |
| 25 | +#include <mach/clock.h> | |
| 27 | 26 | |
| 28 | 27 | #define SRAM_VA IO_ADDRESS(PNX4008_IRAM_BASE) |
| 29 | 28 | |
| @@ -15,14 +15,14 @@ · 14 unmodified lines | ||
| 15 | 15 | |
| 16 | 16 | #include <asm/io.h> |
| 17 | 17 | |
| 18 | −#include <asm/arch/platform.h> | |
| 19 | −#include <asm/hardware.h> | |
| 18 | +#include <mach/platform.h> | |
| 19 | +#include <mach/hardware.h> | |
| 20 | 20 | |
| 21 | 21 | #include <linux/serial_core.h> |
| 22 | 22 | #include <linux/serial_reg.h> |
| 23 | −#include <asm/arch/gpio.h> | |
| 23 | +#include <mach/gpio.h> | |
| 24 | 24 | |
| 25 | −#include <asm/arch/clock.h> | |
| 25 | +#include <mach/clock.h> | |
| 26 | 26 | |
| 27 | 27 | #define UART_3 0 |
| 28 | 28 | #define UART_4 1 |
| @@ -13,7 +13,7 @@ · 12 unmodified lines | ||
| 13 | 13 | |
| 14 | 14 | #include <linux/linkage.h> |
| 15 | 15 | #include <asm/assembler.h> |
| 16 | −#include <asm/hardware.h> | |
| 16 | +#include <mach/hardware.h> | |
| 17 | 17 | |
| 18 | 18 | #define PWRMAN_VA_BASE IO_ADDRESS(PNX4008_PWRMAN_BASE) |
| 19 | 19 | #define PWR_CTRL_REG_OFFS 0x44 |
| @@ -24,7 +24,7 @@ · 23 unmodified lines | ||
| 24 | 24 | #include <linux/irq.h> |
| 25 | 25 | |
| 26 | 26 | #include <asm/system.h> |
| 27 | −#include <asm/hardware.h> | |
| 27 | +#include <mach/hardware.h> | |
| 28 | 28 | #include <asm/io.h> |
| 29 | 29 | #include <asm/leds.h> |
| 30 | 30 | #include <asm/mach/time.h> |
| @@ -19,7 +19,7 @@ · 18 unmodified lines | ||
| 19 | 19 | #include <linux/i2c.h> |
| 20 | 20 | #include <linux/slab.h> |
| 21 | 21 | #include <linux/workqueue.h> |
| 22 | −#include <asm/arch/akita.h> | |
| 22 | +#include <mach/akita.h> | |
| 23 | 23 | |
| 24 | 24 | /* MAX7310 Regiser Map */ |
| 25 | 25 | #define MAX7310_INPUT 0x00 |
| @@ -12,9 +12,9 @@ · 11 unmodified lines | ||
| 12 | 12 | #include <linux/platform_device.h> |
| 13 | 13 | #include <linux/delay.h> |
| 14 | 14 | |
| 15 | −#include <asm/arch/pxa2xx-regs.h> | |
| 16 | −#include <asm/arch/pxa2xx-gpio.h> | |
| 17 | −#include <asm/hardware.h> | |
| 15 | +#include <mach/pxa2xx-regs.h> | |
| 16 | +#include <mach/pxa2xx-gpio.h> | |
| 17 | +#include <mach/hardware.h> | |
| 18 | 18 | |
| 19 | 19 | #include "devices.h" |
| 20 | 20 | #include "generic.h" |
| @@ -125,3 +125,28 @@ void clks_register(struct clk *clks, size_t num) · 104 unmodified lines | ||
| 125 | 125 | list_add(&clks[i].node, &clocks); |
| 126 | 126 | mutex_unlock(&clocks_mutex); |
| 127 | 127 | } |
| 128 | + | |
| 129 | +int clk_add_alias(char *alias, struct device *alias_dev, char *id, | |
| 130 | + struct device *dev) | |
| 131 | +{ | |
| 132 | + struct clk *r = clk_lookup(dev, id); | |
| 133 | + struct clk *new; | |
| 134 | + | |
| 135 | + if (!r) | |
| 136 | + return -ENODEV; | |
| 137 | + | |
| 138 | + new = kzalloc(sizeof(struct clk), GFP_KERNEL); | |
| 139 | + | |
| 140 | + if (!new) | |
| 141 | + return -ENOMEM; | |
| 142 | + | |
| 143 | + new->name = alias; | |
| 144 | + new->dev = alias_dev; | |
| 145 | + new->other = r; | |
| 146 | + | |
| 147 | + mutex_lock(&clocks_mutex); | |
| 148 | + list_add(&new->node, &clocks); | |
| 149 | + mutex_unlock(&clocks_mutex); | |
| 150 | + | |
| 151 | + return 0; | |
| 152 | +} | |
| @@ -1,3 +1,5 @@ | ||
| 1 | +#include <linux/list.h> | |
| 2 | + | |
| 1 | 3 | struct clk; |
| 2 | 4 | |
| 3 | 5 | struct clkops { |
| @@ -86,3 +88,6 @@ extern void clk_pxa3xx_cken_disable(struct clk *); · 82 unmodified lines | ||
| 86 | 88 | #endif |
| 87 | 89 | |
| 88 | 90 | void clks_register(struct clk *clks, size_t num); |
| 91 | +int clk_add_alias(char *alias, struct device *alias_dev, char *id, | |
| 92 | + struct device *dev); | |
| 93 | + | |
| @@ -22,7 +22,7 @@ · 21 unmodified lines | ||
| 22 | 22 | #include <linux/gpio.h> |
| 23 | 23 | |
| 24 | 24 | #include <asm/mach/pci.h> |
| 25 | −#include <asm/arch/pxa-regs.h> | |
| 25 | +#include <mach/pxa-regs.h> | |
| 26 | 26 | #include <asm/mach-types.h> |
| 27 | 27 | |
| 28 | 28 | #include <asm/hardware/it8152.h> |
| @@ -23,14 +23,14 @@ · 22 unmodified lines | ||
| 23 | 23 | #include <asm/mach-types.h> |
| 24 | 24 | #include <asm/mach/map.h> |
| 25 | 25 | |
| 26 | −#include <asm/arch/pxa2xx-regs.h> | |
| 27 | −#include <asm/arch/mfp-pxa27x.h> | |
| 28 | −#include <asm/arch/pxa-regs.h> | |
| 29 | −#include <asm/arch/audio.h> | |
| 30 | −#include <asm/arch/pxafb.h> | |
| 31 | −#include <asm/arch/ohci.h> | |
| 32 | −#include <asm/arch/mmc.h> | |
| 33 | −#include <asm/arch/bitfield.h> | |
| 26 | +#include <mach/pxa2xx-regs.h> | |
| 27 | +#include <mach/mfp-pxa27x.h> | |
| 28 | +#include <mach/pxa-regs.h> | |
| 29 | +#include <mach/audio.h> | |
| 30 | +#include <mach/pxafb.h> | |
| 31 | +#include <mach/ohci.h> | |
| 32 | +#include <mach/mmc.h> | |
| 33 | +#include <mach/bitfield.h> | |
| 34 | 34 | |
| 35 | 35 | #include <asm/hardware/it8152.h> |
| 36 | 36 | |
| @@ -21,16 +21,16 @@ · 20 unmodified lines | ||
| 21 | 21 | #include <linux/mtd/partitions.h> |
| 22 | 22 | #include <linux/mtd/physmap.h> |
| 23 | 23 | #include <asm/mach-types.h> |
| 24 | −#include <asm/hardware.h> | |
| 24 | +#include <mach/hardware.h> | |
| 25 | 25 | #include <asm/irq.h> |
| 26 | 26 | #include <asm/sizes.h> |
| 27 | 27 | #include <asm/mach/arch.h> |
| 28 | 28 | #include <asm/mach/map.h> |
| 29 | 29 | #include <asm/mach/irq.h> |
| 30 | 30 | #include <asm/mach/flash.h> |
| 31 | −#include <asm/arch/pxa-regs.h> | |
| 32 | −#include <asm/arch/pxa2xx-gpio.h> | |
| 33 | −#include <asm/arch/colibri.h> | |
| 31 | +#include <mach/pxa-regs.h> | |
| 32 | +#include <mach/pxa2xx-gpio.h> | |
| 33 | +#include <mach/colibri.h> | |
| 34 | 34 | |
| 35 | 35 | #include "generic.h" |
| 36 | 36 | #include "devices.h" |
| @@ -26,7 +26,7 @@ · 25 unmodified lines | ||
| 26 | 26 | #include <asm/setup.h> |
| 27 | 27 | #include <asm/memory.h> |
| 28 | 28 | #include <asm/mach-types.h> |
| 29 | −#include <asm/hardware.h> | |
| 29 | +#include <mach/hardware.h> | |
| 30 | 30 | #include <asm/irq.h> |
| 31 | 31 | #include <asm/io.h> |
| 32 | 32 | #include <asm/system.h> |
| @@ -35,14 +35,14 @@ · 2 unmodified lines | ||
| 35 | 35 | #include <asm/mach/map.h> |
| 36 | 36 | #include <asm/mach/irq.h> |
| 37 | 37 | |
| 38 | −#include <asm/arch/pxa-regs.h> | |
| 39 | −#include <asm/arch/pxa2xx-regs.h> | |
| 40 | −#include <asm/arch/pxa2xx-gpio.h> | |
| 41 | −#include <asm/arch/irda.h> | |
| 42 | −#include <asm/arch/mmc.h> | |
| 43 | −#include <asm/arch/udc.h> | |
| 44 | −#include <asm/arch/corgi.h> | |
| 45 | −#include <asm/arch/sharpsl.h> | |
| 38 | +#include <mach/pxa-regs.h> | |
| 39 | +#include <mach/pxa2xx-regs.h> | |
| 40 | +#include <mach/pxa2xx-gpio.h> | |
| 41 | +#include <mach/irda.h> | |
| 42 | +#include <mach/mmc.h> | |
| 43 | +#include <mach/udc.h> | |
| 44 | +#include <mach/corgi.h> | |
| 45 | +#include <mach/sharpsl.h> | |
| 46 | 46 | |
| 47 | 47 | #include <asm/mach/sharpsl_param.h> |
| 48 | 48 | #include <asm/hardware/scoop.h> |
| @@ -20,12 +20,12 @@ · 19 unmodified lines | ||
| 20 | 20 | #include <linux/platform_device.h> |
| 21 | 21 | #include <linux/module.h> |
| 22 | 22 | #include <linux/string.h> |
| 23 | −#include <asm/arch/akita.h> | |
| 24 | −#include <asm/arch/corgi.h> | |
| 25 | −#include <asm/hardware.h> | |
| 26 | −#include <asm/arch/pxa-regs.h> | |
| 27 | −#include <asm/arch/sharpsl.h> | |
| 28 | −#include <asm/arch/spitz.h> | |
| 23 | +#include <mach/akita.h> | |
| 24 | +#include <mach/corgi.h> | |
| 25 | +#include <mach/hardware.h> | |
| 26 | +#include <mach/pxa-regs.h> | |
| 27 | +#include <mach/sharpsl.h> | |
| 28 | +#include <mach/spitz.h> | |
| 29 | 29 | #include <asm/hardware/scoop.h> |
| 30 | 30 | #include <asm/mach/sharpsl_param.h> |
| 31 | 31 | #include "generic.h" |
| @@ -20,14 +20,14 @@ · 19 unmodified lines | ||
| 20 | 20 | |
| 21 | 21 | #include <asm/irq.h> |
| 22 | 22 | #include <asm/mach-types.h> |
| 23 | −#include <asm/hardware.h> | |
| 23 | +#include <mach/hardware.h> | |
| 24 | 24 | #include <asm/hardware/scoop.h> |
| 25 | 25 | |
| 26 | −#include <asm/arch/sharpsl.h> | |
| 27 | −#include <asm/arch/corgi.h> | |
| 28 | −#include <asm/arch/pxa-regs.h> | |
| 29 | −#include <asm/arch/pxa2xx-regs.h> | |
| 30 | −#include <asm/arch/pxa2xx-gpio.h> | |
| 26 | +#include <mach/sharpsl.h> | |
| 27 | +#include <mach/corgi.h> | |
| 28 | +#include <mach/pxa-regs.h> | |
| 29 | +#include <mach/pxa2xx-regs.h> | |
| 30 | +#include <mach/pxa2xx-gpio.h> | |
| 31 | 31 | #include "sharpsl.h" |
| 32 | 32 | |
| 33 | 33 | #define SHARPSL_CHARGE_ON_VOLT 0x99 /* 2.9V */ |
| @@ -16,13 +16,13 @@ · 15 unmodified lines | ||
| 16 | 16 | #include <linux/slab.h> |
| 17 | 17 | #include <linux/delay.h> |
| 18 | 18 | #include <linux/platform_device.h> |
| 19 | −#include <asm/hardware.h> | |
| 19 | +#include <mach/hardware.h> | |
| 20 | 20 | #include <asm/mach-types.h> |
| 21 | 21 | |
| 22 | −#include <asm/arch/ssp.h> | |
| 23 | −#include <asm/arch/pxa-regs.h> | |
| 24 | −#include <asm/arch/pxa2xx-gpio.h> | |
| 25 | −#include <asm/arch/regs-ssp.h> | |
| 22 | +#include <mach/ssp.h> | |
| 23 | +#include <mach/pxa-regs.h> | |
| 24 | +#include <mach/pxa2xx-gpio.h> | |
| 25 | +#include <mach/regs-ssp.h> | |
| 26 | 26 | #include "sharpsl.h" |
| 27 | 27 | |
| 28 | 28 | static DEFINE_SPINLOCK(corgi_ssp_lock); |
| @@ -37,9 +37,9 @@ · 36 unmodified lines | ||
| 37 | 37 | #include <linux/init.h> |
| 38 | 38 | #include <linux/cpufreq.h> |
| 39 | 39 | |
| 40 | −#include <asm/hardware.h> | |
| 41 | −#include <asm/arch/pxa-regs.h> | |
| 42 | −#include <asm/arch/pxa2xx-regs.h> | |
| 40 | +#include <mach/hardware.h> | |
| 41 | +#include <mach/pxa-regs.h> | |
| 42 | +#include <mach/pxa2xx-regs.h> | |
| 43 | 43 | |
| 44 | 44 | #ifdef DEBUG |
| 45 | 45 | static unsigned int freq_debug; |
| @@ -4,19 +4,19 @@ · 3 unmodified lines | ||
| 4 | 4 | #include <linux/platform_device.h> |
| 5 | 5 | #include <linux/dma-mapping.h> |
| 6 | 6 | |
| 7 | −#include <asm/arch/gpio.h> | |
| 8 | −#include <asm/arch/udc.h> | |
| 9 | −#include <asm/arch/pxafb.h> | |
| 10 | −#include <asm/arch/mmc.h> | |
| 11 | −#include <asm/arch/irda.h> | |
| 12 | −#include <asm/arch/i2c.h> | |
| 13 | −#include <asm/arch/mfp-pxa27x.h> | |
| 14 | −#include <asm/arch/ohci.h> | |
| 15 | −#include <asm/arch/pxa27x_keypad.h> | |
| 16 | −#include <asm/arch/pxa2xx_spi.h> | |
| 17 | −#include <asm/arch/camera.h> | |
| 18 | −#include <asm/arch/audio.h> | |
| 19 | −#include <asm/arch/pxa3xx_nand.h> | |
| 7 | +#include <mach/gpio.h> | |
| 8 | +#include <mach/udc.h> | |
| 9 | +#include <mach/pxafb.h> | |
| 10 | +#include <mach/mmc.h> | |
| 11 | +#include <mach/irda.h> | |
| 12 | +#include <mach/i2c.h> | |
| 13 | +#include <mach/mfp-pxa27x.h> | |
| 14 | +#include <mach/ohci.h> | |
| 15 | +#include <mach/pxa27x_keypad.h> | |
| 16 | +#include <mach/pxa2xx_spi.h> | |
| 17 | +#include <mach/camera.h> | |
| 18 | +#include <mach/audio.h> | |
| 19 | +#include <mach/pxa3xx_nand.h> | |
| 20 | 20 | |
| 21 | 21 | #include "devices.h" |
| 22 | 22 | #include "generic.h" |
| @@ -20,10 +20,10 @@ · 19 unmodified lines | ||
| 20 | 20 | |
| 21 | 21 | #include <asm/system.h> |
| 22 | 22 | #include <asm/irq.h> |
| 23 | −#include <asm/hardware.h> | |
| 23 | +#include <mach/hardware.h> | |
| 24 | 24 | #include <asm/dma.h> |
| 25 | 25 | |
| 26 | −#include <asm/arch/pxa-regs.h> | |
| 26 | +#include <mach/pxa-regs.h> | |
| 27 | 27 | |
| 28 | 28 | struct dma_channel { |
| 29 | 29 | char *name; |
| @@ -14,8 +14,8 @@ · 13 unmodified lines | ||
| 14 | 14 | #include <linux/module.h> |
| 15 | 15 | |
| 16 | 16 | #include <asm/mach-types.h> |
| 17 | −#include <asm/arch/pxa-regs.h> | |
| 18 | −#include <asm/arch/pxafb.h> | |
| 17 | +#include <mach/pxa-regs.h> | |
| 18 | +#include <mach/pxafb.h> | |
| 19 | 19 | |
| 20 | 20 | static struct pxafb_mode_info e400_pxafb_mode_info = { |
| 21 | 21 | .pixclock = 140703, |
| @@ -23,14 +23,14 @@ · 22 unmodified lines | ||
| 23 | 23 | #include <asm/mach-types.h> |
| 24 | 24 | #include <asm/mach/arch.h> |
| 25 | 25 | |
| 26 | −#include <asm/arch/mfp-pxa27x.h> | |
| 27 | −#include <asm/arch/pxa-regs.h> | |
| 28 | −#include <asm/arch/pxa27x-udc.h> | |
| 29 | −#include <asm/arch/audio.h> | |
| 30 | −#include <asm/arch/pxafb.h> | |
| 31 | −#include <asm/arch/ohci.h> | |
| 32 | −#include <asm/arch/mmc.h> | |
| 33 | −#include <asm/arch/pxa27x_keypad.h> | |
| 26 | +#include <mach/mfp-pxa27x.h> | |
| 27 | +#include <mach/pxa-regs.h> | |
| 28 | +#include <mach/pxa27x-udc.h> | |
| 29 | +#include <mach/audio.h> | |
| 30 | +#include <mach/pxafb.h> | |
| 31 | +#include <mach/ohci.h> | |
| 32 | +#include <mach/mmc.h> | |
| 33 | +#include <mach/pxa27x_keypad.h> | |
| 34 | 34 | |
| 35 | 35 | #include "generic.h" |
| 36 | 36 | |
| @@ -10,18 +10,78 @@ · 9 unmodified lines | ||
| 10 | 10 | * |
| 11 | 11 | */ |
| 12 | 12 | |
| 13 | +#include <linux/kernel.h> | |
| 13 | 14 | #include <linux/init.h> |
| 14 | 15 | |
| 15 | 16 | #include <asm/setup.h> |
| 16 | 17 | #include <asm/mach/arch.h> |
| 17 | −#include <asm/arch/hardware.h> | |
| 18 | 18 | #include <asm/mach-types.h> |
| 19 | 19 | |
| 20 | +#include <mach/mfp-pxa25x.h> | |
| 21 | +#include <mach/hardware.h> | |
| 22 | + | |
| 20 | 23 | #include "generic.h" |
| 21 | 24 | |
| 25 | +static unsigned long e740_pin_config[] __initdata = { | |
| 26 | + /* Chip selects */ | |
| 27 | + GPIO15_nCS_1, /* CS1 - Flash */ | |
| 28 | + GPIO79_nCS_3, /* CS3 - IMAGEON */ | |
| 29 | + GPIO80_nCS_4, /* CS4 - TMIO */ | |
| 30 | + | |
| 31 | + /* Clocks */ | |
| 32 | + GPIO12_32KHz, | |
| 33 | + | |
| 34 | + /* BTUART */ | |
| 35 | + GPIO42_BTUART_RXD, | |
| 36 | + GPIO43_BTUART_TXD, | |
| 37 | + GPIO44_BTUART_CTS, | |
| 38 | + GPIO45_GPIO, /* Used by TMIO for #SUSPEND */ | |
| 39 | + | |
| 40 | + /* PC Card */ | |
| 41 | + GPIO8_GPIO, /* CD0 */ | |
| 42 | + GPIO44_GPIO, /* CD1 */ | |
| 43 | + GPIO11_GPIO, /* IRQ0 */ | |
| 44 | + GPIO6_GPIO, /* IRQ1 */ | |
| 45 | + GPIO27_GPIO, /* RST0 */ | |
| 46 | + GPIO24_GPIO, /* RST1 */ | |
| 47 | + GPIO20_GPIO, /* PWR0 */ | |
| 48 | + GPIO23_GPIO, /* PWR1 */ | |
| 49 | + GPIO48_nPOE, | |
| 50 | + GPIO49_nPWE, | |
| 51 | + GPIO50_nPIOR, | |
| 52 | + GPIO51_nPIOW, | |
| 53 | + GPIO52_nPCE_1, | |
| 54 | + GPIO53_nPCE_2, | |
| 55 | + GPIO54_nPSKTSEL, | |
| 56 | + GPIO55_nPREG, | |
| 57 | + GPIO56_nPWAIT, | |
| 58 | + GPIO57_nIOIS16, | |
| 59 | + | |
| 60 | + /* wakeup */ | |
| 61 | + GPIO0_GPIO | WAKEUP_ON_EDGE_RISE, | |
| 62 | +}; | |
| 63 | + | |
| 64 | +static unsigned long e400_pin_config[] __initdata = { | |
| 65 | + /* Chip selects */ | |
| 66 | + GPIO15_nCS_1, /* CS1 - Flash */ | |
| 67 | + GPIO80_nCS_4, /* CS4 - TMIO */ | |
| 68 | + | |
| 69 | + /* Clocks */ | |
| 70 | + GPIO12_32KHz, | |
| 71 | + | |
| 72 | + /* BTUART */ | |
| 73 | + GPIO42_BTUART_RXD, | |
| 74 | + GPIO43_BTUART_TXD, | |
| 75 | + GPIO44_BTUART_CTS, | |
| 76 | + GPIO45_GPIO, /* Used by TMIO for #SUSPEND */ | |
| 77 | + | |
| 78 | + /* wakeup */ | |
| 79 | + GPIO0_GPIO | WAKEUP_ON_EDGE_RISE, | |
| 80 | +}; | |
| 81 | + | |
| 22 | 82 | /* Only e800 has 128MB RAM */ |
| 23 | 83 | static void __init eseries_fixup(struct machine_desc *desc, |
| 24 | − struct tag *tags, char **cmdline, struct meminfo *mi) | |
| 84 | + struct tag *tags, char **cmdline, struct meminfo *mi) | |
| 25 | 85 | { |
| 26 | 86 | mi->nr_banks=1; |
| 27 | 87 | mi->bank[0].start = 0xa0000000; |
| @@ -32,83 +92,95 @@ static void __init eseries_fixup(struct machine_desc *desc, · 4 unmodified lines | ||
| 32 | 92 | mi->bank[0].size = (64*1024*1024); |
| 33 | 93 | } |
| 34 | 94 | |
| 95 | +static void __init e740_init(void) | |
| 96 | +{ | |
| 97 | + pxa2xx_mfp_config(ARRAY_AND_SIZE(e740_pin_config)); | |
| 98 | +} | |
| 99 | + | |
| 100 | +static void __init e400_init(void) | |
| 101 | +{ | |
| 102 | + pxa2xx_mfp_config(ARRAY_AND_SIZE(e400_pin_config)); | |
| 103 | +} | |
| 104 | + | |
| 35 | 105 | /* e-series machine definitions */ |
| 36 | 106 | |
| 37 | 107 | #ifdef CONFIG_MACH_E330 |
| 38 | 108 | MACHINE_START(E330, "Toshiba e330") |
| 39 | − /* Maintainer: Ian Molton (spyro@f2s.com) */ | |
| 40 | − .phys_io = 0x40000000, | |
| 41 | − .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc, | |
| 42 | − .boot_params = 0xa0000100, | |
| 43 | − .map_io = pxa_map_io, | |
| 44 | − .init_irq = pxa25x_init_irq, | |
| 45 | − .fixup = eseries_fixup, | |
| 46 | − .timer = &pxa_timer, | |
| 109 | + /* Maintainer: Ian Molton (spyro@f2s.com) */ | |
| 110 | + .phys_io = 0x40000000, | |
| 111 | + .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc, | |
| 112 | + .boot_params = 0xa0000100, | |
| 113 | + .map_io = pxa_map_io, | |
| 114 | + .init_irq = pxa25x_init_irq, | |
| 115 | + .fixup = eseries_fixup, | |
| 116 | + .timer = &pxa_timer, | |
| 47 | 117 | MACHINE_END |
| 48 | 118 | #endif |
| 49 | 119 | |
| 50 | 120 | #ifdef CONFIG_MACH_E350 |
| 51 | 121 | MACHINE_START(E350, "Toshiba e350") |
| 52 | 122 | /* Maintainer: Ian Molton (spyro@f2s.com) */ |
| 53 | − .phys_io = 0x40000000, | |
| 54 | − .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc, | |
| 55 | − .boot_params = 0xa0000100, | |
| 56 | − .map_io = pxa_map_io, | |
| 57 | − .init_irq = pxa25x_init_irq, | |
| 58 | − .fixup = eseries_fixup, | |
| 59 | − .timer = &pxa_timer, | |
| 123 | + .phys_io = 0x40000000, | |
| 124 | + .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc, | |
| 125 | + .boot_params = 0xa0000100, | |
| 126 | + .map_io = pxa_map_io, | |
| 127 | + .init_irq = pxa25x_init_irq, | |
| 128 | + .fixup = eseries_fixup, | |
| 129 | + .timer = &pxa_timer, | |
| 60 | 130 | MACHINE_END |
| 61 | 131 | #endif |
| 62 | 132 | |
| 63 | 133 | #ifdef CONFIG_MACH_E740 |
| 64 | 134 | MACHINE_START(E740, "Toshiba e740") |
| 65 | − /* Maintainer: Ian Molton (spyro@f2s.com) */ | |
| 66 | − .phys_io = 0x40000000, | |
| 67 | − .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc, | |
| 68 | − .boot_params = 0xa0000100, | |
| 69 | − .map_io = pxa_map_io, | |
| 70 | − .init_irq = pxa25x_init_irq, | |
| 71 | − .fixup = eseries_fixup, | |
| 72 | − .timer = &pxa_timer, | |
| 135 | + /* Maintainer: Ian Molton (spyro@f2s.com) */ | |
| 136 | + .phys_io = 0x40000000, | |
| 137 | + .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc, | |
| 138 | + .boot_params = 0xa0000100, | |
| 139 | + .map_io = pxa_map_io, | |
| 140 | + .init_irq = pxa25x_init_irq, | |
| 141 | + .fixup = eseries_fixup, | |
| 142 | + .init_machine = e740_init, | |
| 143 | + .timer = &pxa_timer, | |
| 73 | 144 | MACHINE_END |
| 74 | 145 | #endif |
| 75 | 146 | |
| 76 | 147 | #ifdef CONFIG_MACH_E750 |
| 77 | 148 | MACHINE_START(E750, "Toshiba e750") |
| 78 | − /* Maintainer: Ian Molton (spyro@f2s.com) */ | |
| 79 | − .phys_io = 0x40000000, | |
| 80 | − .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc, | |
| 81 | − .boot_params = 0xa0000100, | |
| 82 | − .map_io = pxa_map_io, | |
| 83 | − .init_irq = pxa25x_init_irq, | |
| 84 | − .fixup = eseries_fixup, | |
| 85 | − .timer = &pxa_timer, | |
| 149 | + /* Maintainer: Ian Molton (spyro@f2s.com) */ | |
| 150 | + .phys_io = 0x40000000, | |
| 151 | + .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc, | |
| 152 | + .boot_params = 0xa0000100, | |
| 153 | + .map_io = pxa_map_io, | |
| 154 | + .init_irq = pxa25x_init_irq, | |
| 155 | + .fixup = eseries_fixup, | |
| 156 | + .timer = &pxa_timer, | |
| 86 | 157 | MACHINE_END |
| 87 | 158 | #endif |
| 88 | 159 | |
| 89 | 160 | #ifdef CONFIG_MACH_E400 |
| 90 | 161 | MACHINE_START(E400, "Toshiba e400") |
| 91 | − /* Maintainer: Ian Molton (spyro@f2s.com) */ | |
| 92 | − .phys_io = 0x40000000, | |
| 93 | − .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc, | |
| 94 | − .boot_params = 0xa0000100, | |
| 95 | − .map_io = pxa_map_io, | |
| 96 | − .init_irq = pxa25x_init_irq, | |
| 97 | − .fixup = eseries_fixup, | |
| 98 | − .timer = &pxa_timer, | |
| 162 | + /* Maintainer: Ian Molton (spyro@f2s.com) */ | |
| 163 | + .phys_io = 0x40000000, | |
| 164 | + .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc, | |
| 165 | + .boot_params = 0xa0000100, | |
| 166 | + .map_io = pxa_map_io, | |
| 167 | + .init_irq = pxa25x_init_irq, | |
| 168 | + .fixup = eseries_fixup, | |
| 169 | + .init_machine = e400_init, | |
| 170 | + .timer = &pxa_timer, | |
| 99 | 171 | MACHINE_END |
| 100 | 172 | #endif |
| 101 | 173 | |
| 102 | 174 | #ifdef CONFIG_MACH_E800 |
| 103 | 175 | MACHINE_START(E800, "Toshiba e800") |
| 104 | − /* Maintainer: Ian Molton (spyro@f2s.com) */ | |
| 105 | − .phys_io = 0x40000000, | |
| 106 | − .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc, | |
| 107 | − .boot_params = 0xa0000100, | |
| 108 | − .map_io = pxa_map_io, | |
| 109 | − .init_irq = pxa25x_init_irq, | |
| 110 | − .fixup = eseries_fixup, | |
| 111 | − .timer = &pxa_timer, | |
| 176 | + /* Maintainer: Ian Molton (spyro@f2s.com) */ | |
| 177 | + .phys_io = 0x40000000, | |
| 178 | + .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc, | |
| 179 | + .boot_params = 0xa0000100, | |
| 180 | + .map_io = pxa_map_io, | |
| 181 | + .init_irq = pxa25x_init_irq, | |
| 182 | + .fixup = eseries_fixup, | |
| 183 | + .timer = &pxa_timer, | |
| 112 | 184 | MACHINE_END |
| 113 | 185 | #endif |
| 114 | 186 | |
| @@ -14,10 +14,10 @@ · 13 unmodified lines | ||
| 14 | 14 | #include <linux/init.h> |
| 15 | 15 | #include <linux/device.h> |
| 16 | 16 | |
| 17 | −#include <asm/arch/udc.h> | |
| 18 | −#include <asm/arch/eseries-gpio.h> | |
| 19 | −#include <asm/arch/hardware.h> | |
| 20 | −#include <asm/arch/pxa-regs.h> | |
| 17 | +#include <mach/udc.h> | |
| 18 | +#include <mach/eseries-gpio.h> | |
| 19 | +#include <mach/hardware.h> | |
| 20 | +#include <mach/pxa-regs.h> | |
| 21 | 21 | #include <asm/mach/arch.h> |
| 22 | 22 | #include <asm/mach-types.h> |
| 23 | 23 | #include <asm/mach/map.h> |
| @@ -18,13 +18,13 @@ · 17 unmodified lines | ||
| 18 | 18 | #include <linux/pwm_backlight.h> |
| 19 | 19 | |
| 20 | 20 | #include <asm/setup.h> |
| 21 | −#include <asm/arch/pxafb.h> | |
| 22 | −#include <asm/arch/ohci.h> | |
| 23 | −#include <asm/arch/i2c.h> | |
| 21 | +#include <mach/pxafb.h> | |
| 22 | +#include <mach/ohci.h> | |
| 23 | +#include <mach/i2c.h> | |
| 24 | 24 | |
| 25 | −#include <asm/arch/mfp-pxa27x.h> | |
| 26 | −#include <asm/arch/pxa-regs.h> | |
| 27 | −#include <asm/arch/pxa2xx-regs.h> | |
| 25 | +#include <mach/mfp-pxa27x.h> | |
| 26 | +#include <mach/pxa-regs.h> | |
| 27 | +#include <mach/pxa2xx-regs.h> | |
| 28 | 28 | #include <asm/mach-types.h> |
| 29 | 29 | #include <asm/mach/arch.h> |
| 30 | 30 | |
| @@ -20,15 +20,25 @@ · 19 unmodified lines | ||
| 20 | 20 | #include <linux/kernel.h> |
| 21 | 21 | #include <linux/init.h> |
| 22 | 22 | |
| 23 | −#include <asm/hardware.h> | |
| 23 | +#include <mach/hardware.h> | |
| 24 | 24 | #include <asm/system.h> |
| 25 | 25 | #include <asm/pgtable.h> |
| 26 | 26 | #include <asm/mach/map.h> |
| 27 | 27 | |
| 28 | −#include <asm/arch/pxa-regs.h> | |
| 28 | +#include <mach/pxa-regs.h> | |
| 29 | +#include <mach/reset.h> | |
| 29 | 30 | |
| 30 | 31 | #include "generic.h" |
| 31 | 32 | |
| 33 | +void clear_reset_status(unsigned int mask) | |
| 34 | +{ | |
| 35 | + if (cpu_is_pxa2xx()) | |
| 36 | + pxa2xx_clear_reset_status(mask); | |
| 37 | + | |
| 38 | + if (cpu_is_pxa3xx()) | |
| 39 | + pxa3xx_clear_reset_status(mask); | |
| 40 | +} | |
| 41 | + | |
| 32 | 42 | /* |
| 33 | 43 | * Get the clock frequency as reflected by CCCR and the turbo flag. |
| 34 | 44 | * We assume these values have been applied via a fcs. |
| @@ -47,12 +47,20 @@ extern unsigned pxa27x_get_memclk_frequency_10khz(void); · 46 unmodified lines | ||
| 47 | 47 | #define pxa27x_get_memclk_frequency_10khz() (0) |
| 48 | 48 | #endif |
| 49 | 49 | |
| 50 | +#if defined(CONFIG_PXA25x) || defined(CONFIG_PXA27x) | |
| 51 | +extern void pxa2xx_clear_reset_status(unsigned int); | |
| 52 | +#else | |
| 53 | +static inline void pxa2xx_clear_reset_status(unsigned int mask) {} | |
| 54 | +#endif | |
| 55 | + | |
| 50 | 56 | #ifdef CONFIG_PXA3xx |
| 51 | 57 | extern unsigned pxa3xx_get_clk_frequency_khz(int); |
| 52 | 58 | extern unsigned pxa3xx_get_memclk_frequency_10khz(void); |
| 59 | +extern void pxa3xx_clear_reset_status(unsigned int); | |
| 53 | 60 | #else |
| 54 | 61 | #define pxa3xx_get_clk_frequency_khz(x) (0) |
| 55 | 62 | #define pxa3xx_get_memclk_frequency_10khz() (0) |
| 63 | +static inline void pxa3xx_clear_reset_status(unsigned int mask) {} | |
| 56 | 64 | #endif |
| 57 | 65 | |
| 58 | 66 | extern struct sysdev_class pxa_irq_sysclass; |
| @@ -18,10 +18,10 @@ · 17 unmodified lines | ||
| 18 | 18 | #include <linux/sysdev.h> |
| 19 | 19 | |
| 20 | 20 | #include <asm/gpio.h> |
| 21 | −#include <asm/hardware.h> | |
| 21 | +#include <mach/hardware.h> | |
| 22 | 22 | #include <asm/io.h> |
| 23 | −#include <asm/arch/pxa-regs.h> | |
| 24 | −#include <asm/arch/pxa2xx-gpio.h> | |
| 23 | +#include <mach/pxa-regs.h> | |
| 24 | +#include <mach/pxa2xx-gpio.h> | |
| 25 | 25 | |
| 26 | 26 | #include "generic.h" |
| 27 | 27 | |
| @@ -26,7 +26,7 @@ · 25 unmodified lines | ||
| 26 | 26 | #include <asm/setup.h> |
| 27 | 27 | #include <asm/memory.h> |
| 28 | 28 | #include <asm/mach-types.h> |
| 29 | −#include <asm/hardware.h> | |
| 29 | +#include <mach/hardware.h> | |
| 30 | 30 | #include <asm/irq.h> |
| 31 | 31 | #include <asm/sizes.h> |
| 32 | 32 | |
| @@ -34,13 +34,13 @@ · 1 unmodified line | ||
| 34 | 34 | #include <asm/mach/map.h> |
| 35 | 35 | #include <asm/mach/irq.h> |
| 36 | 36 | #include <asm/mach/flash.h> |
| 37 | −#include <asm/arch/mmc.h> | |
| 38 | −#include <asm/arch/udc.h> | |
| 39 | −#include <asm/arch/gumstix.h> | |
| 37 | +#include <mach/mmc.h> | |
| 38 | +#include <mach/udc.h> | |
| 39 | +#include <mach/gumstix.h> | |
| 40 | 40 | |
| 41 | −#include <asm/arch/pxa-regs.h> | |
| 42 | −#include <asm/arch/pxa2xx-regs.h> | |
| 43 | −#include <asm/arch/pxa2xx-gpio.h> | |
| 41 | +#include <mach/pxa-regs.h> | |
| 42 | +#include <mach/pxa2xx-regs.h> | |
| 43 | +#include <mach/pxa2xx-gpio.h> | |
| 44 | 44 | |
| 45 | 45 | #include "generic.h" |
| 46 | 46 | |
| @@ -25,18 +25,18 @@ · 24 unmodified lines | ||
| 25 | 25 | #include <asm/setup.h> |
| 26 | 26 | #include <asm/memory.h> |
| 27 | 27 | #include <asm/mach-types.h> |
| 28 | −#include <asm/hardware.h> | |
| 28 | +#include <mach/hardware.h> | |
| 29 | 29 | #include <asm/irq.h> |
| 30 | 30 | |
| 31 | 31 | #include <asm/mach/arch.h> |
| 32 | 32 | #include <asm/mach/map.h> |
| 33 | 33 | |
| 34 | −#include <asm/arch/pxa-regs.h> | |
| 35 | −#include <asm/arch/pxa2xx-gpio.h> | |
| 36 | −#include <asm/arch/idp.h> | |
| 37 | −#include <asm/arch/pxafb.h> | |
| 38 | −#include <asm/arch/bitfield.h> | |
| 39 | −#include <asm/arch/mmc.h> | |
| 34 | +#include <mach/pxa-regs.h> | |
| 35 | +#include <mach/pxa2xx-gpio.h> | |
| 36 | +#include <mach/idp.h> | |
| 37 | +#include <mach/pxafb.h> | |
| 38 | +#include <mach/bitfield.h> | |
| 39 | +#include <mach/mmc.h> | |
| 40 | 40 | |
| 41 | 41 | #include "generic.h" |
| 42 | 42 | #include "devices.h" |
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
| @@ -1,4 +1,4 @@ | ||
| 1 | −/* linux/include/asm-arm/arch-pxa/debug-macro.S | |
| 1 | +/* arch/arm/mach-pxa/include/mach/debug-macro.S | |
| 2 | 2 | * |
| 3 | 3 | * Debugging macro include header |
| 4 | 4 | * |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-pxa/dma.h | |
| 2 | + * arch/arm/mach-pxa/include/mach/dma.h | |
| 3 | 3 | * |
| 4 | 4 | * Author: Nicolas Pitre |
| 5 | 5 | * Created: Jun 15, 2001 |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-pxa/entry-macro.S | |
| 2 | + * arch/arm/mach-pxa/include/mach/entry-macro.S | |
| 3 | 3 | * |
| 4 | 4 | * Low-level IRQ helper macros for PXA-based platforms |
| 5 | 5 | * |
| @@ -7,8 +7,8 @@ · 1 unmodified line | ||
| 7 | 7 | * License version 2. This program is licensed "as is" without any |
| 8 | 8 | * warranty of any kind, whether express or implied. |
| 9 | 9 | */ |
| 10 | −#include <asm/hardware.h> | |
| 11 | −#include <asm/arch/irqs.h> | |
| 10 | +#include <mach/hardware.h> | |
| 11 | +#include <mach/irqs.h> | |
| 12 | 12 | |
| 13 | 13 | .macro disable_fiq |
| 14 | 14 | .endm |
File renamed without changes.
File renamed without changes.
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-pxa/gpio.h | |
| 2 | + * arch/arm/mach-pxa/include/mach/gpio.h | |
| 3 | 3 | * |
| 4 | 4 | * PXA GPIO wrappers for arch-neutral GPIO calls |
| 5 | 5 | * |
| @@ -24,9 +24,9 @@ · 18 unmodified lines | ||
| 24 | 24 | #ifndef __ASM_ARCH_PXA_GPIO_H |
| 25 | 25 | #define __ASM_ARCH_PXA_GPIO_H |
| 26 | 26 | |
| 27 | −#include <asm/arch/pxa-regs.h> | |
| 27 | +#include <mach/pxa-regs.h> | |
| 28 | 28 | #include <asm/irq.h> |
| 29 | −#include <asm/hardware.h> | |
| 29 | +#include <mach/hardware.h> | |
| 30 | 30 | |
| 31 | 31 | #include <asm-generic/gpio.h> |
| 32 | 32 | |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-pxa/gumstix.h | |
| 2 | + * arch/arm/mach-pxa/include/mach/gumstix.h | |
| 3 | 3 | * |
| 4 | 4 | * This program is free software; you can redistribute it and/or modify |
| 5 | 5 | * it under the terms of the GNU General Public License version 2 as |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-pxa/hardware.h | |
| 2 | + * arch/arm/mach-pxa/include/mach/hardware.h | |
| 3 | 3 | * |
| 4 | 4 | * Author: Nicolas Pitre |
| 5 | 5 | * Created: Jun 15, 2001 |
| @@ -224,11 +224,6 @@ extern void pxa_gpio_set_value(unsigned gpio, int value); · 218 unmodified lines | ||
| 224 | 224 | */ |
| 225 | 225 | extern unsigned int get_memclk_frequency_10khz(void); |
| 226 | 226 | |
| 227 | −/* | |
| 228 | − * register GPIO as reset generator | |
| 229 | − */ | |
| 230 | −extern int init_gpio_reset(int gpio); | |
| 231 | − | |
| 232 | 227 | #endif |
| 233 | 228 | |
| 234 | 229 | #if defined(CONFIG_MACH_ARMCORE) && defined(CONFIG_PCI) |
File renamed without changes.
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-pxa/idp.h | |
| 2 | + * arch/arm/mach-pxa/include/mach/idp.h | |
| 3 | 3 | * |
| 4 | 4 | * This program is free software; you can redistribute it and/or modify |
| 5 | 5 | * it under the terms of the GNU General Public License version 2 as |
| @@ -1,12 +1,12 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-pxa/io.h | |
| 2 | + * arch/arm/mach-pxa/include/mach/io.h | |
| 3 | 3 | * |
| 4 | 4 | * Copied from asm/arch/sa1100/io.h |
| 5 | 5 | */ |
| 6 | 6 | #ifndef __ASM_ARM_ARCH_IO_H |
| 7 | 7 | #define __ASM_ARM_ARCH_IO_H |
| 8 | 8 | |
| 9 | −#include <asm/hardware.h> | |
| 9 | +#include <mach/hardware.h> | |
| 10 | 10 | |
| 11 | 11 | #define IO_SPACE_LIMIT 0xffffffff |
| 12 | 12 | |
File renamed without changes.
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-pxa/irqs.h | |
| 2 | + * arch/arm/mach-pxa/include/mach/irqs.h | |
| 3 | 3 | * |
| 4 | 4 | * Author: Nicolas Pitre |
| 5 | 5 | * Created: Jun 15, 2001 |
| @@ -183,6 +183,7 @@ · 177 unmodified lines | ||
| 183 | 183 | defined(CONFIG_MACH_TOSA) || \ |
| 184 | 184 | defined(CONFIG_MACH_MAINSTONE) || \ |
| 185 | 185 | defined(CONFIG_MACH_PCM027) || \ |
| 186 | + defined(CONFIG_ARCH_PXA_ESERIES) || \ | |
| 186 | 187 | defined(CONFIG_MACH_MAGICIAN) |
| 187 | 188 | #define NR_IRQS (IRQ_BOARD_END) |
| 188 | 189 | #elif defined(CONFIG_MACH_ZYLONITE) |
File renamed without changes.
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-pxa/lpd270.h | |
| 2 | + * arch/arm/mach-pxa/include/mach/lpd270.h | |
| 3 | 3 | * |
| 4 | 4 | * Author: Lennert Buytenhek |
| 5 | 5 | * Created: Feb 10, 2006 |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-pxa/lubbock.h | |
| 2 | + * arch/arm/mach-pxa/include/mach/lubbock.h | |
| 3 | 3 | * |
| 4 | 4 | * Author: Nicolas Pitre |
| 5 | 5 | * Created: Jun 15, 2001 |
| @@ -12,7 +12,7 @@ · 11 unmodified lines | ||
| 12 | 12 | #ifndef _MAGICIAN_H_ |
| 13 | 13 | #define _MAGICIAN_H_ |
| 14 | 14 | |
| 15 | −#include <asm/arch/irqs.h> | |
| 15 | +#include <mach/irqs.h> | |
| 16 | 16 | |
| 17 | 17 | /* |
| 18 | 18 | * PXA GPIOs |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-pxa/mainstone.h | |
| 2 | + * arch/arm/mach-pxa/include/mach/mainstone.h | |
| 3 | 3 | * |
| 4 | 4 | * Author: Nicolas Pitre |
| 5 | 5 | * Created: Nov 14, 2002 |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-pxa/memory.h | |
| 2 | + * arch/arm/mach-pxa/include/mach/memory.h | |
| 3 | 3 | * |
| 4 | 4 | * Author: Nicolas Pitre |
| 5 | 5 | * Copyright: (C) 2001 MontaVista Software Inc. |
| @@ -1,8 +1,8 @@ | ||
| 1 | 1 | #ifndef __ASM_ARCH_MFP_PXA25X_H |
| 2 | 2 | #define __ASM_ARCH_MFP_PXA25X_H |
| 3 | 3 | |
| 4 | −#include <asm/arch/mfp.h> | |
| 5 | −#include <asm/arch/mfp-pxa2xx.h> | |
| 4 | +#include <mach/mfp.h> | |
| 5 | +#include <mach/mfp-pxa2xx.h> | |
| 6 | 6 | |
| 7 | 7 | /* GPIO */ |
| 8 | 8 | #define GPIO2_GPIO MFP_CFG_IN(GPIO2, AF0) |
| @@ -8,8 +8,8 @@ · 7 unmodified lines | ||
| 8 | 8 | * specific controller, and this should work in most cases. |
| 9 | 9 | */ |
| 10 | 10 | |
| 11 | −#include <asm/arch/mfp.h> | |
| 12 | −#include <asm/arch/mfp-pxa2xx.h> | |
| 11 | +#include <mach/mfp.h> | |
| 12 | +#include <mach/mfp-pxa2xx.h> | |
| 13 | 13 | |
| 14 | 14 | /* GPIO */ |
| 15 | 15 | #define GPIO85_GPIO MFP_CFG_IN(GPIO85, AF0) |
| @@ -1,7 +1,7 @@ | ||
| 1 | 1 | #ifndef __ASM_ARCH_MFP_PXA2XX_H |
| 2 | 2 | #define __ASM_ARCH_MFP_PXA2XX_H |
| 3 | 3 | |
| 4 | −#include <asm/arch/mfp.h> | |
| 4 | +#include <mach/mfp.h> | |
| 5 | 5 | |
| 6 | 6 | /* |
| 7 | 7 | * the following MFP_xxx bit definitions in mfp.h are re-used for pxa2xx: |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-pxa/mfp-pxa300.h | |
| 2 | + * arch/arm/mach-pxa/include/mach/mfp-pxa300.h | |
| 3 | 3 | * |
| 4 | 4 | * PXA300/PXA310 specific MFP configuration definitions |
| 5 | 5 | * |
| @@ -15,8 +15,8 @@ · 9 unmodified lines | ||
| 15 | 15 | #ifndef __ASM_ARCH_MFP_PXA300_H |
| 16 | 16 | #define __ASM_ARCH_MFP_PXA300_H |
| 17 | 17 | |
| 18 | −#include <asm/arch/mfp.h> | |
| 19 | −#include <asm/arch/mfp-pxa3xx.h> | |
| 18 | +#include <mach/mfp.h> | |
| 19 | +#include <mach/mfp-pxa3xx.h> | |
| 20 | 20 | |
| 21 | 21 | /* GPIO */ |
| 22 | 22 | #define GPIO46_GPIO MFP_CFG(GPIO46, AF1) |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-pxa/mfp-pxa320.h | |
| 2 | + * arch/arm/mach-pxa/include/mach/mfp-pxa320.h | |
| 3 | 3 | * |
| 4 | 4 | * PXA320 specific MFP configuration definitions |
| 5 | 5 | * |
| @@ -15,8 +15,8 @@ · 9 unmodified lines | ||
| 15 | 15 | #ifndef __ASM_ARCH_MFP_PXA320_H |
| 16 | 16 | #define __ASM_ARCH_MFP_PXA320_H |
| 17 | 17 | |
| 18 | −#include <asm/arch/mfp.h> | |
| 19 | −#include <asm/arch/mfp-pxa3xx.h> | |
| 18 | +#include <mach/mfp.h> | |
| 19 | +#include <mach/mfp-pxa3xx.h> | |
| 20 | 20 | |
| 21 | 21 | /* GPIO */ |
| 22 | 22 | #define GPIO46_GPIO MFP_CFG(GPIO46, AF0) |
File renamed without changes.
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-pxa/mfp-pxa930.h | |
| 2 | + * arch/arm/mach-pxa/include/mach/mfp-pxa930.h | |
| 3 | 3 | * |
| 4 | 4 | * PXA930 specific MFP configuration definitions |
| 5 | 5 | * |
| @@ -13,8 +13,8 @@ · 7 unmodified lines | ||
| 13 | 13 | #ifndef __ASM_ARCH_MFP_PXA9xx_H |
| 14 | 14 | #define __ASM_ARCH_MFP_PXA9xx_H |
| 15 | 15 | |
| 16 | −#include <asm/arch/mfp.h> | |
| 17 | −#include <asm/arch/mfp-pxa3xx.h> | |
| 16 | +#include <mach/mfp.h> | |
| 17 | +#include <mach/mfp-pxa3xx.h> | |
| 18 | 18 | |
| 19 | 19 | /* GPIO */ |
| 20 | 20 | #define GPIO46_GPIO MFP_CFG(GPIO46, AF0) |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-pxa/mfp.h | |
| 2 | + * arch/arm/mach-pxa/include/mach/mfp.h | |
| 3 | 3 | * |
| 4 | 4 | * Multi-Function Pin Definitions |
| 5 | 5 | * |
File renamed without changes.
| @@ -10,14 +10,12 @@ · 9 unmodified lines | ||
| 10 | 10 | * This program is free software; you can redistribute it and/or modify |
| 11 | 11 | * it under the terms of the GNU General Public License version 2 as |
| 12 | 12 | * published by the Free Software Foundation. |
| 13 | − * | |
| 14 | − * $Id: xip.h,v 1.2 2004/12/01 15:49:10 nico Exp $ | |
| 15 | 13 | */ |
| 16 | 14 | |
| 17 | 15 | #ifndef __ARCH_PXA_MTD_XIP_H__ |
| 18 | 16 | #define __ARCH_PXA_MTD_XIP_H__ |
| 19 | 17 | |
| 20 | −#include <asm/arch/pxa-regs.h> | |
| 18 | +#include <mach/pxa-regs.h> | |
| 21 | 19 | |
| 22 | 20 | #define xip_irqpending() (ICIP & ICMR) |
| 23 | 21 | |
File renamed without changes.
File renamed without changes.
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-pxa/pcm027.h | |
| 2 | + * arch/arm/mach-pxa/include/mach/pcm027.h | |
| 3 | 3 | * |
| 4 | 4 | * (c) 2003 Phytec Messtechnik GmbH <armlinux@phytec.de> |
| 5 | 5 | * (c) 2007 Juergen Beisert <j.beisert@pengutronix.de> |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-pxa/pcm990_baseboard.h | |
| 2 | + * arch/arm/mach-pxa/include/mach/pcm990_baseboard.h | |
| 3 | 3 | * |
| 4 | 4 | * (c) 2003 Phytec Messtechnik GmbH <armlinux@phytec.de> |
| 5 | 5 | * (c) 2007 Juergen Beisert <j.beisert@pengutronix.de> |
| @@ -19,7 +19,7 @@ · 13 unmodified lines | ||
| 19 | 19 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
| 20 | 20 | */ |
| 21 | 21 | |
| 22 | −#include <asm/arch/pcm027.h> | |
| 22 | +#include <mach/pcm027.h> | |
| 23 | 23 | |
| 24 | 24 | /* |
| 25 | 25 | * definitions relevant only when the PCM-990 |
File renamed without changes.
| @@ -1,11 +1,11 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-pxa/poodle.h | |
| 2 | + * arch/arm/mach-pxa/include/mach/poodle.h | |
| 3 | 3 | * |
| 4 | 4 | * May be copied or modified under the terms of the GNU General Public |
| 5 | 5 | * License. See linux/COPYING for more information. |
| 6 | 6 | * |
| 7 | 7 | * Based on: |
| 8 | − * linux/include/asm-arm/arch-sa1100/collie.h | |
| 8 | + * arch/arm/mach-sa1100/include/mach/collie.h | |
| 9 | 9 | * |
| 10 | 10 | * ChangeLog: |
| 11 | 11 | * 04-06-2001 Lineo Japan, Inc. |
| @@ -70,6 +70,12 @@ · 58 unmodified lines | ||
| 70 | 70 | #define POODLE_SCOOP_IO_DIR ( POODLE_SCOOP_VPEN | POODLE_SCOOP_HS_OUT ) |
| 71 | 71 | #define POODLE_SCOOP_IO_OUT ( 0 ) |
| 72 | 72 | |
| 73 | +#define POODLE_LOCOMO_GPIO_AMP_ON LOCOMO_GPIO(8) | |
| 74 | +#define POODLE_LOCOMO_GPIO_MUTE_L LOCOMO_GPIO(10) | |
| 75 | +#define POODLE_LOCOMO_GPIO_MUTE_R LOCOMO_GPIO(11) | |
| 76 | +#define POODLE_LOCOMO_GPIO_232VCC_ON LOCOMO_GPIO(12) | |
| 77 | +#define POODLE_LOCOMO_GPIO_JK_B LOCOMO_GPIO(13) | |
| 78 | + | |
| 73 | 79 | extern struct platform_device poodle_locomo_device; |
| 74 | 80 | |
| 75 | 81 | #endif /* __ASM_ARCH_POODLE_H */ |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-pxa/pxa-regs.h | |
| 2 | + * arch/arm/mach-pxa/include/mach/pxa-regs.h | |
| 3 | 3 | * |
| 4 | 4 | * Author: Nicolas Pitre |
| 5 | 5 | * Created: Jun 15, 2001 |
| @@ -829,7 +829,7 @@ · 823 unmodified lines | ||
| 829 | 829 | */ |
| 830 | 830 | |
| 831 | 831 | /* |
| 832 | − * SSP Serial Port Registers - see include/asm-arm/arch-pxa/regs-ssp.h | |
| 832 | + * SSP Serial Port Registers - see arch/arm/mach-pxa/include/mach/regs-ssp.h | |
| 833 | 833 | */ |
| 834 | 834 | |
| 835 | 835 | /* |
| @@ -837,7 +837,7 @@ · 1 unmodified line | ||
| 837 | 837 | */ |
| 838 | 838 | |
| 839 | 839 | /* |
| 840 | − * Core Clock - see include/asm-arm/arch-pxa/pxa2xx-regs.h | |
| 840 | + * Core Clock - see arch/arm/mach-pxa/include/mach/pxa2xx-regs.h | |
| 841 | 841 | */ |
| 842 | 842 | |
| 843 | 843 | #ifdef CONFIG_PXA27x |
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-pxa/pxa2xx-regs.h | |
| 2 | + * arch/arm/mach-pxa/include/mach/pxa2xx-regs.h | |
| 3 | 3 | * |
| 4 | 4 | * Taken from pxa-regs.h by Russell King |
| 5 | 5 | * |
File renamed without changes.
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-pxa/pxa3xx-regs.h | |
| 2 | + * arch/arm/mach-pxa/include/mach/pxa3xx-regs.h | |
| 3 | 3 | * |
| 4 | 4 | * PXA3xx specific register definitions |
| 5 | 5 | * |
File renamed without changes.
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-pxa/pxafb.h | |
| 2 | + * arch/arm/mach-pxa/include/mach/pxafb.h | |
| 3 | 3 | * |
| 4 | 4 | * Support for the xscale frame buffer. |
| 5 | 5 | * |
| @@ -13,7 +13,7 @@ · 7 unmodified lines | ||
| 13 | 13 | */ |
| 14 | 14 | |
| 15 | 15 | #include <linux/fb.h> |
| 16 | −#include <asm/arch/regs-lcd.h> | |
| 16 | +#include <mach/regs-lcd.h> | |
| 17 | 17 | |
| 18 | 18 | /* |
| 19 | 19 | * Supported LCD connections |
| @@ -28,6 +28,7 @@ · 8 unmodified lines | ||
| 28 | 28 | * bits 10-17 : for AC Bias Pin Frequency |
| 29 | 29 | * bit 18 : for output enable polarity |
| 30 | 30 | * bit 19 : for pixel clock edge |
| 31 | + * bit 20 : for output pixel format when base is RGBT16 | |
| 31 | 32 | */ |
| 32 | 33 | #define LCD_CONN_TYPE(_x) ((_x) & 0x0f) |
| 33 | 34 | #define LCD_CONN_WIDTH(_x) (((_x) >> 4) & 0x1f) |
| @@ -53,10 +54,11 @@ · 19 unmodified lines | ||
| 53 | 54 | #define LCD_SMART_PANEL_18BPP ((18 << 4) | LCD_TYPE_SMART_PANEL) |
| 54 | 55 | |
| 55 | 56 | #define LCD_AC_BIAS_FREQ(x) (((x) & 0xff) << 10) |
| 56 | −#define LCD_BIAS_ACTIVE_HIGH (0 << 17) | |
| 57 | −#define LCD_BIAS_ACTIVE_LOW (1 << 17) | |
| 58 | −#define LCD_PCLK_EDGE_RISE (0 << 18) | |
| 59 | −#define LCD_PCLK_EDGE_FALL (1 << 18) | |
| 57 | +#define LCD_BIAS_ACTIVE_HIGH (0 << 18) | |
| 58 | +#define LCD_BIAS_ACTIVE_LOW (1 << 18) | |
| 59 | +#define LCD_PCLK_EDGE_RISE (0 << 19) | |
| 60 | +#define LCD_PCLK_EDGE_FALL (1 << 19) | |
| 61 | +#define LCD_ALTERNATE_MAPPING (1 << 20) | |
| 60 | 62 | |
| 61 | 63 | /* |
| 62 | 64 | * This structure describes the machine which we are running on. |
| @@ -1,7 +1,7 @@ | ||
| 1 | 1 | #ifndef __ASM_ARCH_REGS_LCD_H |
| 2 | 2 | #define __ASM_ARCH_REGS_LCD_H |
| 3 | 3 | |
| 4 | −#include <asm/arch/bitfield.h> | |
| 4 | +#include <mach/bitfield.h> | |
| 5 | 5 | |
| 6 | 6 | /* |
| 7 | 7 | * LCD Controller Registers and Bits Definitions |
File renamed without changes.
| @@ -0,0 +1,18 @@ | ||
| 1 | +#ifndef __ASM_ARCH_RESET_H | |
| 2 | +#define __ASM_ARCH_RESET_H | |
| 3 | + | |
| 4 | +#define RESET_STATUS_HARDWARE (1 << 0) /* Hardware Reset */ | |
| 5 | +#define RESET_STATUS_WATCHDOG (1 << 1) /* Watchdog Reset */ | |
| 6 | +#define RESET_STATUS_LOWPOWER (1 << 2) /* Low Power/Sleep Exit */ | |
| 7 | +#define RESET_STATUS_GPIO (1 << 3) /* GPIO Reset */ | |
| 8 | +#define RESET_STATUS_ALL (0xf) | |
| 9 | + | |
| 10 | +extern unsigned int reset_status; | |
| 11 | +extern void clear_reset_status(unsigned int mask); | |
| 12 | + | |
| 13 | +/* | |
| 14 | + * register GPIO as reset generator | |
| 15 | + */ | |
| 16 | +extern int init_gpio_reset(int gpio); | |
| 17 | + | |
| 18 | +#endif /* __ASM_ARCH_RESET_H */ | |
File renamed without changes.
File renamed without changes.
File renamed without changes.
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-pxa/system.h | |
| 2 | + * arch/arm/mach-pxa/include/mach/system.h | |
| 3 | 3 | * |
| 4 | 4 | * Author: Nicolas Pitre |
| 5 | 5 | * Created: Jun 15, 2001 |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-pxa/timex.h | |
| 2 | + * arch/arm/mach-pxa/include/mach/timex.h | |
| 3 | 3 | * |
| 4 | 4 | * Author: Nicolas Pitre |
| 5 | 5 | * Created: Jun 15, 2001 |
File renamed without changes.
File renamed without changes.
File renamed without changes.
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-pxa/udc.h | |
| 2 | + * arch/arm/mach-pxa/include/mach/udc.h | |
| 3 | 3 | * |
| 4 | 4 | */ |
| 5 | 5 | #include <asm/mach/udc_pxa2xx.h> |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-pxa/uncompress.h | |
| 2 | + * arch/arm/mach-pxa/include/mach/uncompress.h | |
| 3 | 3 | * |
| 4 | 4 | * Author: Nicolas Pitre |
| 5 | 5 | * Copyright: (C) 2001 MontaVista Software Inc. |
| @@ -10,7 +10,7 @@ · 4 unmodified lines | ||
| 10 | 10 | */ |
| 11 | 11 | |
| 12 | 12 | #include <linux/serial_reg.h> |
| 13 | −#include <asm/arch/pxa-regs.h> | |
| 13 | +#include <mach/pxa-regs.h> | |
| 14 | 14 | #include <asm/mach-types.h> |
| 15 | 15 | |
| 16 | 16 | #define __REG(x) ((volatile unsigned long *)x) |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-pxa/vmalloc.h | |
| 2 | + * arch/arm/mach-pxa/include/mach/vmalloc.h | |
| 3 | 3 | * |
| 4 | 4 | * Author: Nicolas Pitre |
| 5 | 5 | * Copyright: (C) 2001 MontaVista Software Inc. |
File renamed without changes.
| @@ -17,10 +17,10 @@ · 16 unmodified lines | ||
| 17 | 17 | #include <linux/interrupt.h> |
| 18 | 18 | #include <linux/sysdev.h> |
| 19 | 19 | |
| 20 | −#include <asm/hardware.h> | |
| 20 | +#include <mach/hardware.h> | |
| 21 | 21 | #include <asm/irq.h> |
| 22 | 22 | #include <asm/mach/irq.h> |
| 23 | −#include <asm/arch/pxa-regs.h> | |
| 23 | +#include <mach/pxa-regs.h> | |
| 24 | 24 | |
| 25 | 25 | #include "generic.h" |
| 26 | 26 | |
| @@ -14,12 +14,12 @@ · 13 unmodified lines | ||
| 14 | 14 | |
| 15 | 15 | #include <linux/init.h> |
| 16 | 16 | |
| 17 | −#include <asm/hardware.h> | |
| 17 | +#include <mach/hardware.h> | |
| 18 | 18 | #include <asm/leds.h> |
| 19 | 19 | #include <asm/system.h> |
| 20 | 20 | |
| 21 | −#include <asm/arch/pxa-regs.h> | |
| 22 | −#include <asm/arch/idp.h> | |
| 21 | +#include <mach/pxa-regs.h> | |
| 22 | +#include <mach/idp.h> | |
| 23 | 23 | |
| 24 | 24 | #include "leds.h" |
| 25 | 25 | |
| @@ -13,11 +13,11 @@ · 12 unmodified lines | ||
| 13 | 13 | |
| 14 | 14 | #include <linux/init.h> |
| 15 | 15 | |
| 16 | −#include <asm/hardware.h> | |
| 16 | +#include <mach/hardware.h> | |
| 17 | 17 | #include <asm/leds.h> |
| 18 | 18 | #include <asm/system.h> |
| 19 | −#include <asm/arch/pxa-regs.h> | |
| 20 | −#include <asm/arch/lubbock.h> | |
| 19 | +#include <mach/pxa-regs.h> | |
| 20 | +#include <mach/lubbock.h> | |
| 21 | 21 | |
| 22 | 22 | #include "leds.h" |
| 23 | 23 | |
| @@ -12,12 +12,12 @@ · 11 unmodified lines | ||
| 12 | 12 | |
| 13 | 13 | #include <linux/init.h> |
| 14 | 14 | |
| 15 | −#include <asm/hardware.h> | |
| 15 | +#include <mach/hardware.h> | |
| 16 | 16 | #include <asm/leds.h> |
| 17 | 17 | #include <asm/system.h> |
| 18 | 18 | |
| 19 | −#include <asm/arch/pxa-regs.h> | |
| 20 | −#include <asm/arch/mainstone.h> | |
| 19 | +#include <mach/pxa-regs.h> | |
| 20 | +#include <mach/mainstone.h> | |
| 21 | 21 | |
| 22 | 22 | #include "leds.h" |
| 23 | 23 | |
| @@ -12,14 +12,14 @@ · 11 unmodified lines | ||
| 12 | 12 | |
| 13 | 13 | #include <linux/init.h> |
| 14 | 14 | |
| 15 | −#include <asm/hardware.h> | |
| 15 | +#include <mach/hardware.h> | |
| 16 | 16 | #include <asm/system.h> |
| 17 | 17 | #include <asm/types.h> |
| 18 | 18 | #include <asm/leds.h> |
| 19 | 19 | |
| 20 | −#include <asm/arch/pxa-regs.h> | |
| 21 | −#include <asm/arch/pxa2xx-gpio.h> | |
| 22 | −#include <asm/arch/trizeps4.h> | |
| 20 | +#include <mach/pxa-regs.h> | |
| 21 | +#include <mach/pxa2xx-gpio.h> | |
| 22 | +#include <mach/trizeps4.h> | |
| 23 | 23 | |
| 24 | 24 | #include "leds.h" |
| 25 | 25 | |
| @@ -26,21 +26,21 @@ · 25 unmodified lines | ||
| 26 | 26 | #include <asm/setup.h> |
| 27 | 27 | #include <asm/memory.h> |
| 28 | 28 | #include <asm/mach-types.h> |
| 29 | −#include <asm/hardware.h> | |
| 29 | +#include <mach/hardware.h> | |
| 30 | 30 | #include <asm/irq.h> |
| 31 | 31 | |
| 32 | 32 | #include <asm/mach/arch.h> |
| 33 | 33 | #include <asm/mach/map.h> |
| 34 | 34 | #include <asm/mach/irq.h> |
| 35 | 35 | |
| 36 | −#include <asm/arch/pxa-regs.h> | |
| 37 | −#include <asm/arch/mfp-pxa300.h> | |
| 38 | −#include <asm/arch/gpio.h> | |
| 39 | −#include <asm/arch/pxafb.h> | |
| 40 | −#include <asm/arch/ssp.h> | |
| 41 | −#include <asm/arch/pxa27x_keypad.h> | |
| 42 | −#include <asm/arch/pxa3xx_nand.h> | |
| 43 | −#include <asm/arch/littleton.h> | |
| 36 | +#include <mach/pxa-regs.h> | |
| 37 | +#include <mach/mfp-pxa300.h> | |
| 38 | +#include <mach/gpio.h> | |
| 39 | +#include <mach/pxafb.h> | |
| 40 | +#include <mach/ssp.h> | |
| 41 | +#include <mach/pxa27x_keypad.h> | |
| 42 | +#include <mach/pxa3xx_nand.h> | |
| 43 | +#include <mach/littleton.h> | |
| 44 | 44 | |
| 45 | 45 | #include "generic.h" |
| 46 | 46 | |
| @@ -29,7 +29,7 @@ · 28 unmodified lines | ||
| 29 | 29 | #include <asm/setup.h> |
| 30 | 30 | #include <asm/memory.h> |
| 31 | 31 | #include <asm/mach-types.h> |
| 32 | −#include <asm/hardware.h> | |
| 32 | +#include <mach/hardware.h> | |
| 33 | 33 | #include <asm/irq.h> |
| 34 | 34 | #include <asm/sizes.h> |
| 35 | 35 | |
| @@ -38,15 +38,15 @@ · 2 unmodified lines | ||
| 38 | 38 | #include <asm/mach/irq.h> |
| 39 | 39 | #include <asm/mach/flash.h> |
| 40 | 40 | |
| 41 | −#include <asm/arch/pxa-regs.h> | |
| 42 | −#include <asm/arch/pxa2xx-regs.h> | |
| 43 | −#include <asm/arch/pxa2xx-gpio.h> | |
| 44 | −#include <asm/arch/lpd270.h> | |
| 45 | −#include <asm/arch/audio.h> | |
| 46 | −#include <asm/arch/pxafb.h> | |
| 47 | −#include <asm/arch/mmc.h> | |
| 48 | −#include <asm/arch/irda.h> | |
| 49 | −#include <asm/arch/ohci.h> | |
| 41 | +#include <mach/pxa-regs.h> | |
| 42 | +#include <mach/pxa2xx-regs.h> | |
| 43 | +#include <mach/pxa2xx-gpio.h> | |
| 44 | +#include <mach/lpd270.h> | |
| 45 | +#include <mach/audio.h> | |
| 46 | +#include <mach/pxafb.h> | |
| 47 | +#include <mach/mmc.h> | |
| 48 | +#include <mach/irda.h> | |
| 49 | +#include <mach/ohci.h> | |
| 50 | 50 | |
| 51 | 51 | #include "generic.h" |
| 52 | 52 | #include "devices.h" |
| @@ -25,12 +25,12 @@ · 24 unmodified lines | ||
| 25 | 25 | |
| 26 | 26 | #include <linux/spi/spi.h> |
| 27 | 27 | #include <linux/spi/ads7846.h> |
| 28 | −#include <asm/arch/pxa2xx_spi.h> | |
| 28 | +#include <mach/pxa2xx_spi.h> | |
| 29 | 29 | |
| 30 | 30 | #include <asm/setup.h> |
| 31 | 31 | #include <asm/memory.h> |
| 32 | 32 | #include <asm/mach-types.h> |
| 33 | −#include <asm/hardware.h> | |
| 33 | +#include <mach/hardware.h> | |
| 34 | 34 | #include <asm/irq.h> |
| 35 | 35 | #include <asm/sizes.h> |
| 36 | 36 | |
| @@ -41,17 +41,18 @@ · 4 unmodified lines | ||
| 41 | 41 | |
| 42 | 42 | #include <asm/hardware/sa1111.h> |
| 43 | 43 | |
| 44 | −#include <asm/arch/pxa-regs.h> | |
| 45 | −#include <asm/arch/pxa2xx-regs.h> | |
| 46 | −#include <asm/arch/mfp-pxa25x.h> | |
| 47 | −#include <asm/arch/audio.h> | |
| 48 | −#include <asm/arch/lubbock.h> | |
| 49 | −#include <asm/arch/udc.h> | |
| 50 | −#include <asm/arch/irda.h> | |
| 51 | −#include <asm/arch/pxafb.h> | |
| 52 | −#include <asm/arch/mmc.h> | |
| 44 | +#include <mach/pxa-regs.h> | |
| 45 | +#include <mach/pxa2xx-regs.h> | |
| 46 | +#include <mach/mfp-pxa25x.h> | |
| 47 | +#include <mach/audio.h> | |
| 48 | +#include <mach/lubbock.h> | |
| 49 | +#include <mach/udc.h> | |
| 50 | +#include <mach/irda.h> | |
| 51 | +#include <mach/pxafb.h> | |
| 52 | +#include <mach/mmc.h> | |
| 53 | 53 | |
| 54 | 54 | #include "generic.h" |
| 55 | +#include "clock.h" | |
| 55 | 56 | #include "devices.h" |
| 56 | 57 | |
| 57 | 58 | static unsigned long lubbock_pin_config[] __initdata = { |
| @@ -224,7 +225,7 @@ static struct platform_device sa1111_device = { · 166 unmodified lines | ||
| 224 | 225 | * for the temperature sensors. |
| 225 | 226 | */ |
| 226 | 227 | static struct pxa2xx_spi_master pxa_ssp_master_info = { |
| 227 | − .num_chipselect = 0, | |
| 228 | + .num_chipselect = 1, | |
| 228 | 229 | }; |
| 229 | 230 | |
| 230 | 231 | static int lubbock_ads7846_pendown_state(void) |
| @@ -485,6 +486,7 @@ static void __init lubbock_init(void) · 254 unmodified lines | ||
| 485 | 486 | |
| 486 | 487 | pxa2xx_mfp_config(ARRAY_AND_SIZE(lubbock_pin_config)); |
| 487 | 488 | |
| 489 | + clk_add_alias("SA1111_CLK", NULL, "GPIO11_CLK", NULL); | |
| 488 | 490 | pxa_set_udc_info(&udc_info); |
| 489 | 491 | set_pxa_fb_info(&sharp_lm8v31); |
| 490 | 492 | pxa_set_mci_info(&lubbock_mci_platform_data); |
| @@ -26,18 +26,18 @@ · 25 unmodified lines | ||
| 26 | 26 | #include <linux/pda_power.h> |
| 27 | 27 | #include <linux/pwm_backlight.h> |
| 28 | 28 | |
| 29 | −#include <asm/hardware.h> | |
| 29 | +#include <mach/hardware.h> | |
| 30 | 30 | #include <asm/mach-types.h> |
| 31 | 31 | #include <asm/mach/arch.h> |
| 32 | −#include <asm/arch/magician.h> | |
| 33 | −#include <asm/arch/mfp-pxa27x.h> | |
| 34 | −#include <asm/arch/pxa-regs.h> | |
| 35 | −#include <asm/arch/pxa2xx-regs.h> | |
| 36 | −#include <asm/arch/pxafb.h> | |
| 37 | −#include <asm/arch/i2c.h> | |
| 38 | −#include <asm/arch/mmc.h> | |
| 39 | −#include <asm/arch/irda.h> | |
| 40 | −#include <asm/arch/ohci.h> | |
| 32 | +#include <mach/magician.h> | |
| 33 | +#include <mach/mfp-pxa27x.h> | |
| 34 | +#include <mach/pxa-regs.h> | |
| 35 | +#include <mach/pxa2xx-regs.h> | |
| 36 | +#include <mach/pxafb.h> | |
| 37 | +#include <mach/i2c.h> | |
| 38 | +#include <mach/mmc.h> | |
| 39 | +#include <mach/irda.h> | |
| 40 | +#include <mach/ohci.h> | |
| 41 | 41 | |
| 42 | 42 | #include "devices.h" |
| 43 | 43 | #include "generic.h" |
| @@ -32,7 +32,7 @@ · 31 unmodified lines | ||
| 32 | 32 | #include <asm/setup.h> |
| 33 | 33 | #include <asm/memory.h> |
| 34 | 34 | #include <asm/mach-types.h> |
| 35 | −#include <asm/hardware.h> | |
| 35 | +#include <mach/hardware.h> | |
| 36 | 36 | #include <asm/irq.h> |
| 37 | 37 | #include <asm/sizes.h> |
| 38 | 38 | |
| @@ -41,17 +41,17 @@ · 2 unmodified lines | ||
| 41 | 41 | #include <asm/mach/irq.h> |
| 42 | 42 | #include <asm/mach/flash.h> |
| 43 | 43 | |
| 44 | −#include <asm/arch/pxa-regs.h> | |
| 45 | −#include <asm/arch/pxa2xx-regs.h> | |
| 46 | −#include <asm/arch/mfp-pxa27x.h> | |
| 47 | −#include <asm/arch/mainstone.h> | |
| 48 | −#include <asm/arch/audio.h> | |
| 49 | −#include <asm/arch/pxafb.h> | |
| 50 | −#include <asm/arch/i2c.h> | |
| 51 | −#include <asm/arch/mmc.h> | |
| 52 | −#include <asm/arch/irda.h> | |
| 53 | −#include <asm/arch/ohci.h> | |
| 54 | −#include <asm/arch/pxa27x_keypad.h> | |
| 44 | +#include <mach/pxa-regs.h> | |
| 45 | +#include <mach/pxa2xx-regs.h> | |
| 46 | +#include <mach/mfp-pxa27x.h> | |
| 47 | +#include <mach/mainstone.h> | |
| 48 | +#include <mach/audio.h> | |
| 49 | +#include <mach/pxafb.h> | |
| 50 | +#include <mach/i2c.h> | |
| 51 | +#include <mach/mmc.h> | |
| 52 | +#include <mach/irda.h> | |
| 53 | +#include <mach/ohci.h> | |
| 54 | +#include <mach/pxa27x_keypad.h> | |
| 55 | 55 | |
| 56 | 56 | #include "generic.h" |
| 57 | 57 | #include "devices.h" |
| @@ -18,10 +18,10 @@ · 17 unmodified lines | ||
| 18 | 18 | #include <linux/init.h> |
| 19 | 19 | #include <linux/sysdev.h> |
| 20 | 20 | |
| 21 | −#include <asm/arch/hardware.h> | |
| 22 | −#include <asm/arch/pxa-regs.h> | |
| 23 | −#include <asm/arch/pxa2xx-regs.h> | |
| 24 | −#include <asm/arch/mfp-pxa2xx.h> | |
| 21 | +#include <mach/hardware.h> | |
| 22 | +#include <mach/pxa-regs.h> | |
| 23 | +#include <mach/pxa2xx-regs.h> | |
| 24 | +#include <mach/mfp-pxa2xx.h> | |
| 25 | 25 | |
| 26 | 26 | #include "generic.h" |
| 27 | 27 | |
| @@ -19,10 +19,10 @@ · 18 unmodified lines | ||
| 19 | 19 | #include <linux/io.h> |
| 20 | 20 | #include <linux/sysdev.h> |
| 21 | 21 | |
| 22 | −#include <asm/hardware.h> | |
| 23 | −#include <asm/arch/mfp.h> | |
| 24 | −#include <asm/arch/mfp-pxa3xx.h> | |
| 25 | −#include <asm/arch/pxa3xx-regs.h> | |
| 22 | +#include <mach/hardware.h> | |
| 23 | +#include <mach/mfp.h> | |
| 24 | +#include <mach/mfp-pxa3xx.h> | |
| 25 | +#include <mach/pxa3xx-regs.h> | |
| 26 | 26 | |
| 27 | 27 | /* mfp_spin_lock is used to ensure that MFP register configuration |
| 28 | 28 | * (most likely a read-modify-write operation) is atomic, and that |
| @@ -30,15 +30,15 @@ · 29 unmodified lines | ||
| 30 | 30 | #include <asm/mach/arch.h> |
| 31 | 31 | #include <asm/mach/map.h> |
| 32 | 32 | |
| 33 | −#include <asm/arch/audio.h> | |
| 34 | −#include <asm/arch/palmtx.h> | |
| 35 | −#include <asm/arch/mmc.h> | |
| 36 | −#include <asm/arch/pxafb.h> | |
| 37 | −#include <asm/arch/pxa-regs.h> | |
| 38 | −#include <asm/arch/mfp-pxa27x.h> | |
| 39 | −#include <asm/arch/irda.h> | |
| 40 | −#include <asm/arch/pxa27x_keypad.h> | |
| 41 | −#include <asm/arch/udc.h> | |
| 33 | +#include <mach/audio.h> | |
| 34 | +#include <mach/palmtx.h> | |
| 35 | +#include <mach/mmc.h> | |
| 36 | +#include <mach/pxafb.h> | |
| 37 | +#include <mach/pxa-regs.h> | |
| 38 | +#include <mach/mfp-pxa27x.h> | |
| 39 | +#include <mach/irda.h> | |
| 40 | +#include <mach/pxa27x_keypad.h> | |
| 41 | +#include <mach/udc.h> | |
| 42 | 42 | |
| 43 | 43 | #include "generic.h" |
| 44 | 44 | #include "devices.h" |
| @@ -29,12 +29,12 @@ · 28 unmodified lines | ||
| 29 | 29 | |
| 30 | 30 | #include <asm/mach-types.h> |
| 31 | 31 | #include <asm/mach/arch.h> |
| 32 | −#include <asm/arch/hardware.h> | |
| 33 | −#include <asm/arch/pxa-regs.h> | |
| 34 | −#include <asm/arch/pxa2xx-gpio.h> | |
| 35 | −#include <asm/arch/pxa2xx-regs.h> | |
| 36 | −#include <asm/arch/pxa2xx_spi.h> | |
| 37 | −#include <asm/arch/pcm027.h> | |
| 32 | +#include <mach/hardware.h> | |
| 33 | +#include <mach/pxa-regs.h> | |
| 34 | +#include <mach/pxa2xx-gpio.h> | |
| 35 | +#include <mach/pxa2xx-regs.h> | |
| 36 | +#include <mach/pxa2xx_spi.h> | |
| 37 | +#include <mach/pcm027.h> | |
| 38 | 38 | #include "generic.h" |
| 39 | 39 | |
| 40 | 40 | /* |
| @@ -22,23 +22,22 @@ · 21 unmodified lines | ||
| 22 | 22 | |
| 23 | 23 | #include <linux/irq.h> |
| 24 | 24 | #include <linux/platform_device.h> |
| 25 | −#include <linux/ide.h> | |
| 26 | 25 | #include <linux/i2c.h> |
| 27 | 26 | #include <linux/pwm_backlight.h> |
| 28 | 27 | |
| 29 | 28 | #include <media/soc_camera.h> |
| 30 | 29 | |
| 31 | 30 | #include <asm/gpio.h> |
| 32 | −#include <asm/arch/i2c.h> | |
| 33 | −#include <asm/arch/camera.h> | |
| 31 | +#include <mach/i2c.h> | |
| 32 | +#include <mach/camera.h> | |
| 34 | 33 | #include <asm/mach/map.h> |
| 35 | −#include <asm/arch/pxa-regs.h> | |
| 36 | −#include <asm/arch/audio.h> | |
| 37 | −#include <asm/arch/mmc.h> | |
| 38 | −#include <asm/arch/ohci.h> | |
| 39 | −#include <asm/arch/pcm990_baseboard.h> | |
| 40 | −#include <asm/arch/pxafb.h> | |
| 41 | −#include <asm/arch/mfp-pxa27x.h> | |
| 34 | +#include <mach/pxa-regs.h> | |
| 35 | +#include <mach/audio.h> | |
| 36 | +#include <mach/mmc.h> | |
| 37 | +#include <mach/ohci.h> | |
| 38 | +#include <mach/pcm990_baseboard.h> | |
| 39 | +#include <mach/pxafb.h> | |
| 40 | +#include <mach/mfp-pxa27x.h> | |
| 42 | 41 | |
| 43 | 42 | #include "devices.h" |
| 44 | 43 | #include "generic.h" |
| @@ -16,12 +16,12 @@ · 15 unmodified lines | ||
| 16 | 16 | #include <linux/errno.h> |
| 17 | 17 | #include <linux/time.h> |
| 18 | 18 | |
| 19 | −#include <asm/hardware.h> | |
| 19 | +#include <mach/hardware.h> | |
| 20 | 20 | #include <asm/memory.h> |
| 21 | 21 | #include <asm/system.h> |
| 22 | −#include <asm/arch/pm.h> | |
| 23 | −#include <asm/arch/pxa-regs.h> | |
| 24 | −#include <asm/arch/lubbock.h> | |
| 22 | +#include <mach/pm.h> | |
| 23 | +#include <mach/pxa-regs.h> | |
| 24 | +#include <mach/lubbock.h> | |
| 25 | 25 | #include <asm/mach/time.h> |
| 26 | 26 | |
| 27 | 27 | struct pxa_cpu_pm_fns *pxa_cpu_pm_fns; |
| @@ -21,7 +21,7 @@ · 20 unmodified lines | ||
| 21 | 21 | #include <linux/pm.h> |
| 22 | 22 | #include <linux/delay.h> |
| 23 | 23 | |
| 24 | −#include <asm/hardware.h> | |
| 24 | +#include <mach/hardware.h> | |
| 25 | 25 | #include <asm/mach-types.h> |
| 26 | 26 | #include <asm/irq.h> |
| 27 | 27 | #include <asm/setup.h> |
| @@ -31,16 +31,16 @@ · 3 unmodified lines | ||
| 31 | 31 | #include <asm/mach/map.h> |
| 32 | 32 | #include <asm/mach/irq.h> |
| 33 | 33 | |
| 34 | −#include <asm/arch/pxa-regs.h> | |
| 35 | −#include <asm/arch/pxa2xx-regs.h> | |
| 36 | −#include <asm/arch/pxa2xx-gpio.h> | |
| 37 | −#include <asm/arch/mmc.h> | |
| 38 | −#include <asm/arch/udc.h> | |
| 39 | −#include <asm/arch/irda.h> | |
| 40 | −#include <asm/arch/poodle.h> | |
| 41 | −#include <asm/arch/pxafb.h> | |
| 42 | −#include <asm/arch/sharpsl.h> | |
| 43 | −#include <asm/arch/ssp.h> | |
| 34 | +#include <mach/pxa-regs.h> | |
| 35 | +#include <mach/pxa2xx-regs.h> | |
| 36 | +#include <mach/pxa2xx-gpio.h> | |
| 37 | +#include <mach/mmc.h> | |
| 38 | +#include <mach/udc.h> | |
| 39 | +#include <mach/irda.h> | |
| 40 | +#include <mach/poodle.h> | |
| 41 | +#include <mach/pxafb.h> | |
| 42 | +#include <mach/sharpsl.h> | |
| 43 | +#include <mach/ssp.h> | |
| 44 | 44 | |
| 45 | 45 | #include <asm/hardware/scoop.h> |
| 46 | 46 | #include <asm/hardware/locomo.h> |
| @@ -20,7 +20,7 @@ · 19 unmodified lines | ||
| 20 | 20 | #include <linux/pwm.h> |
| 21 | 21 | |
| 22 | 22 | #include <asm/div64.h> |
| 23 | −#include <asm/arch/pxa-regs.h> | |
| 23 | +#include <mach/pxa-regs.h> | |
| 24 | 24 | |
| 25 | 25 | /* PWM registers and bits definitions */ |
| 26 | 26 | #define PWMCR (0x00) |
| @@ -23,13 +23,14 @@ · 22 unmodified lines | ||
| 23 | 23 | #include <linux/suspend.h> |
| 24 | 24 | #include <linux/sysdev.h> |
| 25 | 25 | |
| 26 | −#include <asm/hardware.h> | |
| 27 | −#include <asm/arch/irqs.h> | |
| 28 | −#include <asm/arch/pxa-regs.h> | |
| 29 | −#include <asm/arch/pxa2xx-regs.h> | |
| 30 | −#include <asm/arch/mfp-pxa25x.h> | |
| 31 | −#include <asm/arch/pm.h> | |
| 32 | −#include <asm/arch/dma.h> | |
| 26 | +#include <mach/hardware.h> | |
| 27 | +#include <mach/irqs.h> | |
| 28 | +#include <mach/pxa-regs.h> | |
| 29 | +#include <mach/pxa2xx-regs.h> | |
| 30 | +#include <mach/mfp-pxa25x.h> | |
| 31 | +#include <mach/reset.h> | |
| 32 | +#include <mach/pm.h> | |
| 33 | +#include <mach/dma.h> | |
| 33 | 34 | |
| 34 | 35 | #include "generic.h" |
| 35 | 36 | #include "devices.h" |
| @@ -165,8 +166,7 @@ static struct clk pxa25x_hwuart_clk = · 129 unmodified lines | ||
| 165 | 166 | ; |
| 166 | 167 | |
| 167 | 168 | /* |
| 168 | − * PXA 2xx clock declarations. Order is important (see aliases below) | |
| 169 | − * Please be careful not to disrupt the ordering. | |
| 169 | + * PXA 2xx clock declarations. | |
| 170 | 170 | */ |
| 171 | 171 | static struct clk pxa25x_clks[] = { |
| 172 | 172 | INIT_CK("LCDCLK", LCD, &clk_pxa25x_lcd_ops, &pxa_device_fb.dev), |
| @@ -193,11 +193,6 @@ static struct clk pxa25x_clks[] = { · 20 unmodified lines | ||
| 193 | 193 | INIT_CKEN("FICPCLK", FICP, 47923000, 0, NULL), |
| 194 | 194 | }; |
| 195 | 195 | |
| 196 | −static struct clk pxa2xx_clk_aliases[] = { | |
| 197 | − INIT_CKOTHER("GPIO7_CLK", &pxa25x_clks[4], NULL), | |
| 198 | − INIT_CKOTHER("SA1111_CLK", &pxa25x_clks[5], NULL), | |
| 199 | −}; | |
| 200 | − | |
| 201 | 196 | #ifdef CONFIG_PM |
| 202 | 197 | |
| 203 | 198 | #define SAVE(x) sleep_save[SLEEP_SAVE_##x] = x |
| @@ -348,6 +343,9 @@ static int __init pxa25x_init(void) · 144 unmodified lines | ||
| 348 | 343 | clks_register(&pxa25x_hwuart_clk, 1); |
| 349 | 344 | |
| 350 | 345 | if (cpu_is_pxa21x() || cpu_is_pxa25x()) { |
| 346 | + | |
| 347 | + reset_status = RCSR; | |
| 348 | + | |
| 351 | 349 | clks_register(pxa25x_clks, ARRAY_SIZE(pxa25x_clks)); |
| 352 | 350 | |
| 353 | 351 | if ((ret = pxa_init_dma(16))) |
| @@ -371,8 +369,6 @@ static int __init pxa25x_init(void) · 17 unmodified lines | ||
| 371 | 369 | if (cpu_is_pxa255()) |
| 372 | 370 | ret = platform_device_register(&pxa_device_hwuart); |
| 373 | 371 | |
| 374 | − clks_register(pxa2xx_clk_aliases, ARRAY_SIZE(pxa2xx_clk_aliases)); | |
| 375 | − | |
| 376 | 372 | return ret; |
| 377 | 373 | } |
| 378 | 374 | |
| @@ -18,16 +18,17 @@ · 17 unmodified lines | ||
| 18 | 18 | #include <linux/platform_device.h> |
| 19 | 19 | #include <linux/sysdev.h> |
| 20 | 20 | |
| 21 | −#include <asm/hardware.h> | |
| 21 | +#include <mach/hardware.h> | |
| 22 | 22 | #include <asm/irq.h> |
| 23 | −#include <asm/arch/irqs.h> | |
| 24 | −#include <asm/arch/pxa-regs.h> | |
| 25 | −#include <asm/arch/pxa2xx-regs.h> | |
| 26 | −#include <asm/arch/mfp-pxa27x.h> | |
| 27 | −#include <asm/arch/ohci.h> | |
| 28 | −#include <asm/arch/pm.h> | |
| 29 | −#include <asm/arch/dma.h> | |
| 30 | −#include <asm/arch/i2c.h> | |
| 23 | +#include <mach/irqs.h> | |
| 24 | +#include <mach/pxa-regs.h> | |
| 25 | +#include <mach/pxa2xx-regs.h> | |
| 26 | +#include <mach/mfp-pxa27x.h> | |
| 27 | +#include <mach/reset.h> | |
| 28 | +#include <mach/ohci.h> | |
| 29 | +#include <mach/pm.h> | |
| 30 | +#include <mach/dma.h> | |
| 31 | +#include <mach/i2c.h> | |
| 31 | 32 | |
| 32 | 33 | #include "generic.h" |
| 33 | 34 | #include "devices.h" |
| @@ -384,6 +385,9 @@ static int __init pxa27x_init(void) · 350 unmodified lines | ||
| 384 | 385 | int i, ret = 0; |
| 385 | 386 | |
| 386 | 387 | if (cpu_is_pxa27x()) { |
| 388 | + | |
| 389 | + reset_status = RCSR; | |
| 390 | + | |
| 387 | 391 | clks_register(pxa27x_clks, ARRAY_SIZE(pxa27x_clks)); |
| 388 | 392 | |
| 389 | 393 | if ((ret = pxa_init_dma(32))) |
| @@ -14,9 +14,18 @@ · 13 unmodified lines | ||
| 14 | 14 | #include <linux/kernel.h> |
| 15 | 15 | #include <linux/device.h> |
| 16 | 16 | |
| 17 | −#include <asm/arch/mfp-pxa2xx.h> | |
| 18 | −#include <asm/arch/mfp-pxa25x.h> | |
| 19 | −#include <asm/arch/irda.h> | |
| 17 | +#include <mach/hardware.h> | |
| 18 | +#include <mach/pxa2xx-regs.h> | |
| 19 | +#include <mach/mfp-pxa2xx.h> | |
| 20 | +#include <mach/mfp-pxa25x.h> | |
| 21 | +#include <mach/reset.h> | |
| 22 | +#include <mach/irda.h> | |
| 23 | + | |
| 24 | +void pxa2xx_clear_reset_status(unsigned int mask) | |
| 25 | +{ | |
| 26 | + /* RESET_STATUS_* has a 1:1 mapping with RCSR */ | |
| 27 | + RCSR = mask; | |
| 28 | +} | |
| 20 | 29 | |
| 21 | 30 | static unsigned long pxa2xx_mfp_fir[] = { |
| 22 | 31 | GPIO46_FICP_RXD, |
| @@ -17,9 +17,9 @@ · 16 unmodified lines | ||
| 17 | 17 | #include <linux/kernel.h> |
| 18 | 18 | #include <linux/platform_device.h> |
| 19 | 19 | |
| 20 | −#include <asm/hardware.h> | |
| 21 | −#include <asm/arch/pxa3xx-regs.h> | |
| 22 | −#include <asm/arch/mfp-pxa300.h> | |
| 20 | +#include <mach/hardware.h> | |
| 21 | +#include <mach/pxa3xx-regs.h> | |
| 22 | +#include <mach/mfp-pxa300.h> | |
| 23 | 23 | |
| 24 | 24 | #include "generic.h" |
| 25 | 25 | #include "devices.h" |
| @@ -90,7 +90,9 @@ static struct clk common_clks[] = { · 64 unmodified lines | ||
| 90 | 90 | }; |
| 91 | 91 | |
| 92 | 92 | static struct clk pxa310_clks[] = { |
| 93 | +#ifdef CONFIG_CPU_PXA310 | |
| 93 | 94 | PXA3xx_CKEN("MMCCLK", MMC3, 19500000, 0, &pxa3xx_device_mci3.dev), |
| 95 | +#endif | |
| 94 | 96 | }; |
| 95 | 97 | |
| 96 | 98 | static int __init pxa300_init(void) |
| @@ -17,10 +17,10 @@ · 16 unmodified lines | ||
| 17 | 17 | #include <linux/kernel.h> |
| 18 | 18 | #include <linux/platform_device.h> |
| 19 | 19 | |
| 20 | −#include <asm/hardware.h> | |
| 21 | −#include <asm/arch/mfp.h> | |
| 22 | −#include <asm/arch/pxa3xx-regs.h> | |
| 23 | −#include <asm/arch/mfp-pxa320.h> | |
| 20 | +#include <mach/hardware.h> | |
| 21 | +#include <mach/mfp.h> | |
| 22 | +#include <mach/pxa3xx-regs.h> | |
| 23 | +#include <mach/mfp-pxa320.h> | |
| 24 | 24 | |
| 25 | 25 | #include "generic.h" |
| 26 | 26 | #include "devices.h" |
| @@ -22,12 +22,13 @@ · 21 unmodified lines | ||
| 22 | 22 | #include <linux/io.h> |
| 23 | 23 | #include <linux/sysdev.h> |
| 24 | 24 | |
| 25 | −#include <asm/hardware.h> | |
| 26 | −#include <asm/arch/pxa3xx-regs.h> | |
| 27 | −#include <asm/arch/ohci.h> | |
| 28 | −#include <asm/arch/pm.h> | |
| 29 | −#include <asm/arch/dma.h> | |
| 30 | −#include <asm/arch/ssp.h> | |
| 25 | +#include <mach/hardware.h> | |
| 26 | +#include <mach/pxa3xx-regs.h> | |
| 27 | +#include <mach/reset.h> | |
| 28 | +#include <mach/ohci.h> | |
| 29 | +#include <mach/pm.h> | |
| 30 | +#include <mach/dma.h> | |
| 31 | +#include <mach/ssp.h> | |
| 31 | 32 | |
| 32 | 33 | #include "generic.h" |
| 33 | 34 | #include "devices.h" |
| @@ -109,6 +110,12 @@ unsigned int pxa3xx_get_memclk_frequency_10khz(void) · 75 unmodified lines | ||
| 109 | 110 | return (clk / 10000); |
| 110 | 111 | } |
| 111 | 112 | |
| 113 | +void pxa3xx_clear_reset_status(unsigned int mask) | |
| 114 | +{ | |
| 115 | + /* RESET_STATUS_* has a 1:1 mapping with ARSR */ | |
| 116 | + ARSR = mask; | |
| 117 | +} | |
| 118 | + | |
| 112 | 119 | /* |
| 113 | 120 | * Return the current AC97 clock frequency. |
| 114 | 121 | */ |
| @@ -532,6 +539,9 @@ static int __init pxa3xx_init(void) · 417 unmodified lines | ||
| 532 | 539 | int i, ret = 0; |
| 533 | 540 | |
| 534 | 541 | if (cpu_is_pxa3xx()) { |
| 542 | + | |
| 543 | + reset_status = ARSR; | |
| 544 | + | |
| 535 | 545 | /* |
| 536 | 546 | * clear RDH bit every time after reset |
| 537 | 547 | * |
| @@ -16,8 +16,8 @@ · 15 unmodified lines | ||
| 16 | 16 | #include <linux/irq.h> |
| 17 | 17 | #include <linux/dma-mapping.h> |
| 18 | 18 | |
| 19 | −#include <asm/hardware.h> | |
| 20 | −#include <asm/arch/mfp-pxa930.h> | |
| 19 | +#include <mach/hardware.h> | |
| 20 | +#include <mach/mfp-pxa930.h> | |
| 21 | 21 | |
| 22 | 22 | static struct pxa3xx_mfp_addr_map pxa930_mfp_addr_map[] __initdata = { |
| 23 | 23 | |
| @@ -10,8 +10,11 @@ · 9 unmodified lines | ||
| 10 | 10 | #include <asm/io.h> |
| 11 | 11 | #include <asm/proc-fns.h> |
| 12 | 12 | |
| 13 | −#include <asm/arch/pxa-regs.h> | |
| 14 | −#include <asm/arch/pxa2xx-regs.h> | |
| 13 | +#include <mach/pxa-regs.h> | |
| 14 | +#include <mach/reset.h> | |
| 15 | + | |
| 16 | +unsigned int reset_status; | |
| 17 | +EXPORT_SYMBOL(reset_status); | |
| 15 | 18 | |
| 16 | 19 | static void do_hw_reset(void); |
| 17 | 20 | |
| @@ -77,8 +80,7 @@ static void do_hw_reset(void) · 59 unmodified lines | ||
| 77 | 80 | |
| 78 | 81 | void arch_reset(char mode) |
| 79 | 82 | { |
| 80 | − if (cpu_is_pxa2xx()) | |
| 81 | − RCSR = RCSR_HWR | RCSR_WDR | RCSR_SMR | RCSR_GPR; | |
| 83 | + clear_reset_status(RESET_STATUS_ALL); | |
| 82 | 84 | |
| 83 | 85 | switch (mode) { |
| 84 | 86 | case 's': |
| @@ -21,9 +21,9 @@ · 20 unmodified lines | ||
| 21 | 21 | |
| 22 | 22 | #include <asm/mach-types.h> |
| 23 | 23 | #include <asm/mach/arch.h> |
| 24 | −#include <asm/hardware.h> | |
| 25 | −#include <asm/arch/pxa3xx-regs.h> | |
| 26 | −#include <asm/arch/mfp-pxa930.h> | |
| 24 | +#include <mach/hardware.h> | |
| 25 | +#include <mach/pxa3xx-regs.h> | |
| 26 | +#include <mach/mfp-pxa930.h> | |
| 27 | 27 | |
| 28 | 28 | #include "devices.h" |
| 29 | 29 | #include "generic.h" |
| @@ -22,12 +22,12 @@ · 21 unmodified lines | ||
| 22 | 22 | #include <linux/platform_device.h> |
| 23 | 23 | #include <linux/apm-emulation.h> |
| 24 | 24 | |
| 25 | −#include <asm/hardware.h> | |
| 25 | +#include <mach/hardware.h> | |
| 26 | 26 | #include <asm/mach-types.h> |
| 27 | −#include <asm/arch/pm.h> | |
| 28 | −#include <asm/arch/pxa-regs.h> | |
| 29 | −#include <asm/arch/pxa2xx-gpio.h> | |
| 30 | −#include <asm/arch/sharpsl.h> | |
| 27 | +#include <mach/pm.h> | |
| 28 | +#include <mach/pxa-regs.h> | |
| 29 | +#include <mach/pxa2xx-gpio.h> | |
| 30 | +#include <mach/sharpsl.h> | |
| 31 | 31 | #include "sharpsl.h" |
| 32 | 32 | |
| 33 | 33 | struct battery_thresh spitz_battery_levels_acin[] = { |
| @@ -13,10 +13,10 @@ · 12 unmodified lines | ||
| 13 | 13 | |
| 14 | 14 | #include <linux/linkage.h> |
| 15 | 15 | #include <asm/assembler.h> |
| 16 | −#include <asm/hardware.h> | |
| 16 | +#include <mach/hardware.h> | |
| 17 | 17 | |
| 18 | −#include <asm/arch/pxa-regs.h> | |
| 19 | −#include <asm/arch/pxa2xx-regs.h> | |
| 18 | +#include <mach/pxa-regs.h> | |
| 19 | +#include <mach/pxa2xx-regs.h> | |
| 20 | 20 | |
| 21 | 21 | #define MDREFR_KDIV 0x200a4000 // all banks |
| 22 | 22 | #define CCCR_SLEEP 0x00000107 // L=7 2N=2 A=0 PPDIS=0 CPDIS=0 |
| @@ -26,7 +26,7 @@ · 25 unmodified lines | ||
| 26 | 26 | #include <asm/setup.h> |
| 27 | 27 | #include <asm/memory.h> |
| 28 | 28 | #include <asm/mach-types.h> |
| 29 | −#include <asm/hardware.h> | |
| 29 | +#include <mach/hardware.h> | |
| 30 | 30 | #include <asm/irq.h> |
| 31 | 31 | #include <asm/io.h> |
| 32 | 32 | #include <asm/system.h> |
| @@ -35,18 +35,19 @@ · 2 unmodified lines | ||
| 35 | 35 | #include <asm/mach/map.h> |
| 36 | 36 | #include <asm/mach/irq.h> |
| 37 | 37 | |
| 38 | −#include <asm/arch/pxa-regs.h> | |
| 39 | −#include <asm/arch/pxa2xx-regs.h> | |
| 40 | −#include <asm/arch/pxa2xx-gpio.h> | |
| 41 | −#include <asm/arch/pxa27x-udc.h> | |
| 42 | −#include <asm/arch/irda.h> | |
| 43 | −#include <asm/arch/mmc.h> | |
| 44 | −#include <asm/arch/ohci.h> | |
| 45 | −#include <asm/arch/udc.h> | |
| 46 | −#include <asm/arch/pxafb.h> | |
| 47 | −#include <asm/arch/akita.h> | |
| 48 | −#include <asm/arch/spitz.h> | |
| 49 | −#include <asm/arch/sharpsl.h> | |
| 38 | +#include <mach/pxa-regs.h> | |
| 39 | +#include <mach/pxa2xx-regs.h> | |
| 40 | +#include <mach/pxa2xx-gpio.h> | |
| 41 | +#include <mach/pxa27x-udc.h> | |
| 42 | +#include <mach/reset.h> | |
| 43 | +#include <mach/irda.h> | |
| 44 | +#include <mach/mmc.h> | |
| 45 | +#include <mach/ohci.h> | |
| 46 | +#include <mach/udc.h> | |
| 47 | +#include <mach/pxafb.h> | |
| 48 | +#include <mach/akita.h> | |
| 49 | +#include <mach/spitz.h> | |
| 50 | +#include <mach/sharpsl.h> | |
| 50 | 51 | |
| 51 | 52 | #include <asm/mach/sharpsl_param.h> |
| 52 | 53 | #include <asm/hardware/scoop.h> |
| @@ -20,14 +20,14 @@ · 19 unmodified lines | ||
| 20 | 20 | |
| 21 | 21 | #include <asm/irq.h> |
| 22 | 22 | #include <asm/mach-types.h> |
| 23 | −#include <asm/hardware.h> | |
| 23 | +#include <mach/hardware.h> | |
| 24 | 24 | #include <asm/hardware/scoop.h> |
| 25 | 25 | |
| 26 | −#include <asm/arch/sharpsl.h> | |
| 27 | −#include <asm/arch/spitz.h> | |
| 28 | −#include <asm/arch/pxa-regs.h> | |
| 29 | −#include <asm/arch/pxa2xx-regs.h> | |
| 30 | −#include <asm/arch/pxa2xx-gpio.h> | |
| 26 | +#include <mach/sharpsl.h> | |
| 27 | +#include <mach/spitz.h> | |
| 28 | +#include <mach/pxa-regs.h> | |
| 29 | +#include <mach/pxa2xx-regs.h> | |
| 30 | +#include <mach/pxa2xx-gpio.h> | |
| 31 | 31 | #include "sharpsl.h" |
| 32 | 32 | |
| 33 | 33 | #define SHARPSL_CHARGE_ON_VOLT 0x99 /* 2.9V */ |
| @@ -31,10 +31,10 @@ · 30 unmodified lines | ||
| 31 | 31 | |
| 32 | 32 | #include <asm/io.h> |
| 33 | 33 | #include <asm/irq.h> |
| 34 | −#include <asm/hardware.h> | |
| 35 | −#include <asm/arch/ssp.h> | |
| 36 | −#include <asm/arch/pxa-regs.h> | |
| 37 | −#include <asm/arch/regs-ssp.h> | |
| 34 | +#include <mach/hardware.h> | |
| 35 | +#include <mach/ssp.h> | |
| 36 | +#include <mach/pxa-regs.h> | |
| 37 | +#include <mach/regs-ssp.h> | |
| 38 | 38 | |
| 39 | 39 | #define TIMEOUT 100000 |
| 40 | 40 | |
| @@ -11,10 +11,10 @@ · 10 unmodified lines | ||
| 11 | 11 | |
| 12 | 12 | #include <linux/linkage.h> |
| 13 | 13 | #include <asm/assembler.h> |
| 14 | −#include <asm/hardware.h> | |
| 14 | +#include <mach/hardware.h> | |
| 15 | 15 | |
| 16 | −#include <asm/arch/pxa-regs.h> | |
| 17 | −#include <asm/arch/pxa2xx-regs.h> | |
| 16 | +#include <mach/pxa-regs.h> | |
| 17 | +#include <mach/pxa2xx-regs.h> | |
| 18 | 18 | |
| 19 | 19 | .text |
| 20 | 20 | |
| @@ -21,9 +21,9 @@ · 20 unmodified lines | ||
| 21 | 21 | |
| 22 | 22 | #include <asm/mach-types.h> |
| 23 | 23 | #include <asm/mach/arch.h> |
| 24 | −#include <asm/hardware.h> | |
| 25 | −#include <asm/arch/pxa3xx-regs.h> | |
| 26 | −#include <asm/arch/mfp-pxa930.h> | |
| 24 | +#include <mach/hardware.h> | |
| 25 | +#include <mach/pxa3xx-regs.h> | |
| 26 | +#include <mach/mfp-pxa930.h> | |
| 27 | 27 | |
| 28 | 28 | #include "devices.h" |
| 29 | 29 | #include "generic.h" |
| @@ -22,7 +22,7 @@ · 21 unmodified lines | ||
| 22 | 22 | #include <asm/cnt32_to_63.h> |
| 23 | 23 | #include <asm/mach/irq.h> |
| 24 | 24 | #include <asm/mach/time.h> |
| 25 | −#include <asm/arch/pxa-regs.h> | |
| 25 | +#include <mach/pxa-regs.h> | |
| 26 | 26 | #include <asm/mach-types.h> |
| 27 | 27 | |
| 28 | 28 | /* |
| @@ -16,7 +16,7 @@ · 15 unmodified lines | ||
| 16 | 16 | #include <linux/delay.h> |
| 17 | 17 | #include <linux/rfkill.h> |
| 18 | 18 | |
| 19 | −#include <asm/arch/tosa_bt.h> | |
| 19 | +#include <mach/tosa_bt.h> | |
| 20 | 20 | |
| 21 | 21 | static void tosa_bt_on(struct tosa_bt_data *data) |
| 22 | 22 | { |
| @@ -34,16 +34,17 @@ · 33 unmodified lines | ||
| 34 | 34 | |
| 35 | 35 | #include <asm/setup.h> |
| 36 | 36 | #include <asm/mach-types.h> |
| 37 | −#include <asm/arch/pxa2xx-regs.h> | |
| 38 | −#include <asm/arch/mfp-pxa25x.h> | |
| 39 | −#include <asm/arch/irda.h> | |
| 40 | −#include <asm/arch/i2c.h> | |
| 41 | −#include <asm/arch/mmc.h> | |
| 42 | −#include <asm/arch/udc.h> | |
| 43 | −#include <asm/arch/tosa_bt.h> | |
| 37 | +#include <mach/pxa2xx-regs.h> | |
| 38 | +#include <mach/mfp-pxa25x.h> | |
| 39 | +#include <mach/reset.h> | |
| 40 | +#include <mach/irda.h> | |
| 41 | +#include <mach/i2c.h> | |
| 42 | +#include <mach/mmc.h> | |
| 43 | +#include <mach/udc.h> | |
| 44 | +#include <mach/tosa_bt.h> | |
| 44 | 45 | |
| 45 | 46 | #include <asm/mach/arch.h> |
| 46 | −#include <asm/arch/tosa.h> | |
| 47 | +#include <mach/tosa.h> | |
| 47 | 48 | |
| 48 | 49 | #include <asm/hardware/scoop.h> |
| 49 | 50 | #include <asm/mach/sharpsl_param.h> |
| @@ -31,7 +31,7 @@ · 30 unmodified lines | ||
| 31 | 31 | #include <asm/setup.h> |
| 32 | 32 | #include <asm/memory.h> |
| 33 | 33 | #include <asm/mach-types.h> |
| 34 | −#include <asm/hardware.h> | |
| 34 | +#include <mach/hardware.h> | |
| 35 | 35 | #include <asm/irq.h> |
| 36 | 36 | #include <asm/sizes.h> |
| 37 | 37 | |
| @@ -40,15 +40,15 @@ · 2 unmodified lines | ||
| 40 | 40 | #include <asm/mach/irq.h> |
| 41 | 41 | #include <asm/mach/flash.h> |
| 42 | 42 | |
| 43 | −#include <asm/arch/pxa-regs.h> | |
| 44 | −#include <asm/arch/pxa2xx-regs.h> | |
| 45 | −#include <asm/arch/pxa2xx-gpio.h> | |
| 46 | −#include <asm/arch/trizeps4.h> | |
| 47 | −#include <asm/arch/audio.h> | |
| 48 | −#include <asm/arch/pxafb.h> | |
| 49 | −#include <asm/arch/mmc.h> | |
| 50 | −#include <asm/arch/irda.h> | |
| 51 | −#include <asm/arch/ohci.h> | |
| 43 | +#include <mach/pxa-regs.h> | |
| 44 | +#include <mach/pxa2xx-regs.h> | |
| 45 | +#include <mach/pxa2xx-gpio.h> | |
| 46 | +#include <mach/trizeps4.h> | |
| 47 | +#include <mach/audio.h> | |
| 48 | +#include <mach/pxafb.h> | |
| 49 | +#include <mach/mmc.h> | |
| 50 | +#include <mach/irda.h> | |
| 51 | +#include <mach/ohci.h> | |
| 52 | 52 | |
| 53 | 53 | #include "generic.h" |
| 54 | 54 | #include "devices.h" |
| @@ -23,14 +23,14 @@ · 22 unmodified lines | ||
| 23 | 23 | |
| 24 | 24 | #include <asm/mach-types.h> |
| 25 | 25 | #include <asm/mach/arch.h> |
| 26 | −#include <asm/hardware.h> | |
| 27 | −#include <asm/arch/audio.h> | |
| 28 | −#include <asm/arch/gpio.h> | |
| 29 | −#include <asm/arch/pxafb.h> | |
| 30 | −#include <asm/arch/zylonite.h> | |
| 31 | −#include <asm/arch/mmc.h> | |
| 32 | −#include <asm/arch/pxa27x_keypad.h> | |
| 33 | −#include <asm/arch/pxa3xx_nand.h> | |
| 26 | +#include <mach/hardware.h> | |
| 27 | +#include <mach/audio.h> | |
| 28 | +#include <mach/gpio.h> | |
| 29 | +#include <mach/pxafb.h> | |
| 30 | +#include <mach/zylonite.h> | |
| 31 | +#include <mach/mmc.h> | |
| 32 | +#include <mach/pxa27x_keypad.h> | |
| 33 | +#include <mach/pxa3xx_nand.h> | |
| 34 | 34 | |
| 35 | 35 | #include "devices.h" |
| 36 | 36 | #include "generic.h" |
| @@ -20,9 +20,9 @@ · 19 unmodified lines | ||
| 20 | 20 | #include <linux/i2c/pca953x.h> |
| 21 | 21 | |
| 22 | 22 | #include <asm/gpio.h> |
| 23 | −#include <asm/arch/mfp-pxa300.h> | |
| 24 | −#include <asm/arch/i2c.h> | |
| 25 | −#include <asm/arch/zylonite.h> | |
| 23 | +#include <mach/mfp-pxa300.h> | |
| 24 | +#include <mach/i2c.h> | |
| 25 | +#include <mach/zylonite.h> | |
| 26 | 26 | |
| 27 | 27 | #include "generic.h" |
| 28 | 28 | |
| @@ -17,9 +17,9 @@ · 16 unmodified lines | ||
| 17 | 17 | #include <linux/kernel.h> |
| 18 | 18 | #include <linux/init.h> |
| 19 | 19 | |
| 20 | −#include <asm/arch/gpio.h> | |
| 21 | −#include <asm/arch/mfp-pxa320.h> | |
| 22 | −#include <asm/arch/zylonite.h> | |
| 20 | +#include <mach/gpio.h> | |
| 21 | +#include <mach/mfp-pxa320.h> | |
| 22 | +#include <mach/zylonite.h> | |
| 23 | 23 | |
| 24 | 24 | #include "generic.h" |
| 25 | 25 | |
| @@ -29,7 +29,7 @@ · 28 unmodified lines | ||
| 29 | 29 | #include <linux/clockchips.h> |
| 30 | 30 | |
| 31 | 31 | #include <asm/system.h> |
| 32 | −#include <asm/hardware.h> | |
| 32 | +#include <mach/hardware.h> | |
| 33 | 33 | #include <asm/io.h> |
| 34 | 34 | #include <asm/irq.h> |
| 35 | 35 | #include <asm/leds.h> |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-realview/board-eb.h | |
| 2 | + * arch/arm/mach-realview/include/mach/board-eb.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 2007 ARM Limited |
| 5 | 5 | * |
| @@ -21,7 +21,7 @@ · 15 unmodified lines | ||
| 21 | 21 | #ifndef __ASM_ARCH_BOARD_EB_H |
| 22 | 22 | #define __ASM_ARCH_BOARD_EB_H |
| 23 | 23 | |
| 24 | −#include <asm/arch/platform.h> | |
| 24 | +#include <mach/platform.h> | |
| 25 | 25 | |
| 26 | 26 | /* |
| 27 | 27 | * RealView EB + ARM11MPCore peripheral addresses |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-realview/board-pb1176.h | |
| 2 | + * arch/arm/mach-realview/include/mach/board-pb1176.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 2008 ARM Limited |
| 5 | 5 | * |
| @@ -21,7 +21,7 @@ · 15 unmodified lines | ||
| 21 | 21 | #ifndef __ASM_ARCH_BOARD_PB1176_H |
| 22 | 22 | #define __ASM_ARCH_BOARD_PB1176_H |
| 23 | 23 | |
| 24 | −#include <asm/arch/platform.h> | |
| 24 | +#include <mach/platform.h> | |
| 25 | 25 | |
| 26 | 26 | /* |
| 27 | 27 | * Peripheral addresses |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-realview/board-pb11mp.h | |
| 2 | + * arch/arm/mach-realview/include/mach/board-pb11mp.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 2008 ARM Limited |
| 5 | 5 | * |
| @@ -21,7 +21,7 @@ · 15 unmodified lines | ||
| 21 | 21 | #ifndef __ASM_ARCH_BOARD_PB11MP_H |
| 22 | 22 | #define __ASM_ARCH_BOARD_PB11MP_H |
| 23 | 23 | |
| 24 | −#include <asm/arch/platform.h> | |
| 24 | +#include <mach/platform.h> | |
| 25 | 25 | |
| 26 | 26 | /* |
| 27 | 27 | * Peripheral addresses |
| @@ -1,4 +1,4 @@ | ||
| 1 | −/* linux/include/asm-arm/arch-realview/debug-macro.S | |
| 1 | +/* arch/arm/mach-realview/include/mach/debug-macro.S | |
| 2 | 2 | * |
| 3 | 3 | * Debugging macro include header |
| 4 | 4 | * |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-realview/dma.h | |
| 2 | + * arch/arm/mach-realview/include/mach/dma.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 2003 ARM Limited. |
| 5 | 5 | * Copyright (C) 1997,1998 Russell King |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-realview/entry-macro.S | |
| 2 | + * arch/arm/mach-realview/include/mach/entry-macro.S | |
| 3 | 3 | * |
| 4 | 4 | * Low-level IRQ helper macros for RealView platforms |
| 5 | 5 | * |
| @@ -7,7 +7,7 @@ · 1 unmodified line | ||
| 7 | 7 | * License version 2. This program is licensed "as is" without any |
| 8 | 8 | * warranty of any kind, whether express or implied. |
| 9 | 9 | */ |
| 10 | −#include <asm/hardware.h> | |
| 10 | +#include <mach/hardware.h> | |
| 11 | 11 | #include <asm/hardware/gic.h> |
| 12 | 12 | |
| 13 | 13 | .macro disable_fiq |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-realview/hardware.h | |
| 2 | + * arch/arm/mach-realview/include/mach/hardware.h | |
| 3 | 3 | * |
| 4 | 4 | * This file contains the hardware definitions of the RealView boards. |
| 5 | 5 | * |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-realview/io.h | |
| 2 | + * arch/arm/mach-realview/include/mach/io.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 2003 ARM Limited |
| 5 | 5 | * |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-realview/irqs.h | |
| 2 | + * arch/arm/mach-realview/include/mach/irqs.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 2003 ARM Limited |
| 5 | 5 | * Copyright (C) 2000 Deep Blue Solutions Ltd. |
| @@ -22,9 +22,9 @@ · 16 unmodified lines | ||
| 22 | 22 | #ifndef __ASM_ARCH_IRQS_H |
| 23 | 23 | #define __ASM_ARCH_IRQS_H |
| 24 | 24 | |
| 25 | −#include <asm/arch/board-eb.h> | |
| 26 | −#include <asm/arch/board-pb11mp.h> | |
| 27 | −#include <asm/arch/board-pb1176.h> | |
| 25 | +#include <mach/board-eb.h> | |
| 26 | +#include <mach/board-pb11mp.h> | |
| 27 | +#include <mach/board-pb1176.h> | |
| 28 | 28 | |
| 29 | 29 | #define IRQ_LOCALTIMER 29 |
| 30 | 30 | #define IRQ_LOCALWDOG 30 |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-realview/memory.h | |
| 2 | + * arch/arm/mach-realview/include/mach/memory.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 2003 ARM Limited |
| 5 | 5 | * |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-realview/platform.h | |
| 2 | + * arch/arm/mach-realview/include/mach/platform.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (c) ARM Limited 2003. All rights reserved. |
| 5 | 5 | * |
File renamed without changes.
File renamed without changes.
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-realview/system.h | |
| 2 | + * arch/arm/mach-realview/include/mach/system.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 2003 ARM Limited |
| 5 | 5 | * Copyright (C) 2000 Deep Blue Solutions Ltd |
| @@ -21,9 +21,9 @@ · 15 unmodified lines | ||
| 21 | 21 | #ifndef __ASM_ARCH_SYSTEM_H |
| 22 | 22 | #define __ASM_ARCH_SYSTEM_H |
| 23 | 23 | |
| 24 | −#include <asm/hardware.h> | |
| 24 | +#include <mach/hardware.h> | |
| 25 | 25 | #include <asm/io.h> |
| 26 | −#include <asm/arch/platform.h> | |
| 26 | +#include <mach/platform.h> | |
| 27 | 27 | |
| 28 | 28 | static inline void arch_idle(void) |
| 29 | 29 | { |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-realview/timex.h | |
| 2 | + * arch/arm/mach-realview/include/mach/timex.h | |
| 3 | 3 | * |
| 4 | 4 | * RealView architecture timex specifications |
| 5 | 5 | * |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-realview/uncompress.h | |
| 2 | + * arch/arm/mach-realview/include/mach/uncompress.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 2003 ARM Limited |
| 5 | 5 | * |
| @@ -17,12 +17,12 @@ · 11 unmodified lines | ||
| 17 | 17 | * along with this program; if not, write to the Free Software |
| 18 | 18 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
| 19 | 19 | */ |
| 20 | −#include <asm/hardware.h> | |
| 20 | +#include <mach/hardware.h> | |
| 21 | 21 | #include <asm/mach-types.h> |
| 22 | 22 | |
| 23 | −#include <asm/arch/board-eb.h> | |
| 24 | −#include <asm/arch/board-pb11mp.h> | |
| 25 | −#include <asm/arch/board-pb1176.h> | |
| 23 | +#include <mach/board-eb.h> | |
| 24 | +#include <mach/board-pb11mp.h> | |
| 25 | +#include <mach/board-pb1176.h> | |
| 26 | 26 | |
| 27 | 27 | #define AMBA_UART_DR(base) (*(volatile unsigned char *)((base) + 0x00)) |
| 28 | 28 | #define AMBA_UART_LCRH(base) (*(volatile unsigned char *)((base) + 0x2c)) |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-realview/vmalloc.h | |
| 2 | + * arch/arm/mach-realview/include/mach/vmalloc.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 2003 ARM Limited |
| 5 | 5 | * Copyright (C) 2000 Russell King. |
| @@ -20,7 +20,7 @@ · 19 unmodified lines | ||
| 20 | 20 | |
| 21 | 21 | #include <asm/hardware/arm_twd.h> |
| 22 | 22 | #include <asm/hardware/gic.h> |
| 23 | −#include <asm/hardware.h> | |
| 23 | +#include <mach/hardware.h> | |
| 24 | 24 | #include <asm/io.h> |
| 25 | 25 | #include <asm/irq.h> |
| 26 | 26 | |
| @@ -15,13 +15,13 @@ · 14 unmodified lines | ||
| 15 | 15 | #include <linux/smp.h> |
| 16 | 16 | |
| 17 | 17 | #include <asm/cacheflush.h> |
| 18 | −#include <asm/hardware.h> | |
| 18 | +#include <mach/hardware.h> | |
| 19 | 19 | #include <asm/io.h> |
| 20 | 20 | #include <asm/mach-types.h> |
| 21 | 21 | |
| 22 | −#include <asm/arch/board-eb.h> | |
| 23 | −#include <asm/arch/board-pb11mp.h> | |
| 24 | −#include <asm/arch/scu.h> | |
| 22 | +#include <mach/board-eb.h> | |
| 23 | +#include <mach/board-pb11mp.h> | |
| 24 | +#include <mach/scu.h> | |
| 25 | 25 | |
| 26 | 26 | extern void realview_secondary_startup(void); |
| 27 | 27 | |
| @@ -24,7 +24,7 @@ · 23 unmodified lines | ||
| 24 | 24 | #include <linux/sysdev.h> |
| 25 | 25 | #include <linux/amba/bus.h> |
| 26 | 26 | |
| 27 | −#include <asm/hardware.h> | |
| 27 | +#include <mach/hardware.h> | |
| 28 | 28 | #include <asm/io.h> |
| 29 | 29 | #include <asm/irq.h> |
| 30 | 30 | #include <asm/leds.h> |
| @@ -38,8 +38,8 @@ · 7 unmodified lines | ||
| 38 | 38 | #include <asm/mach/mmc.h> |
| 39 | 39 | #include <asm/mach/time.h> |
| 40 | 40 | |
| 41 | −#include <asm/arch/board-eb.h> | |
| 42 | −#include <asm/arch/irqs.h> | |
| 41 | +#include <mach/board-eb.h> | |
| 42 | +#include <mach/irqs.h> | |
| 43 | 43 | |
| 44 | 44 | #include "core.h" |
| 45 | 45 | #include "clock.h" |
| @@ -24,7 +24,7 @@ · 23 unmodified lines | ||
| 24 | 24 | #include <linux/sysdev.h> |
| 25 | 25 | #include <linux/amba/bus.h> |
| 26 | 26 | |
| 27 | −#include <asm/hardware.h> | |
| 27 | +#include <mach/hardware.h> | |
| 28 | 28 | #include <asm/io.h> |
| 29 | 29 | #include <asm/irq.h> |
| 30 | 30 | #include <asm/leds.h> |
| @@ -39,8 +39,8 @@ · 8 unmodified lines | ||
| 39 | 39 | #include <asm/mach/mmc.h> |
| 40 | 40 | #include <asm/mach/time.h> |
| 41 | 41 | |
| 42 | −#include <asm/arch/board-pb1176.h> | |
| 43 | −#include <asm/arch/irqs.h> | |
| 42 | +#include <mach/board-pb1176.h> | |
| 43 | +#include <mach/irqs.h> | |
| 44 | 44 | |
| 45 | 45 | #include "core.h" |
| 46 | 46 | #include "clock.h" |
| @@ -24,7 +24,7 @@ · 23 unmodified lines | ||
| 24 | 24 | #include <linux/sysdev.h> |
| 25 | 25 | #include <linux/amba/bus.h> |
| 26 | 26 | |
| 27 | −#include <asm/hardware.h> | |
| 27 | +#include <mach/hardware.h> | |
| 28 | 28 | #include <asm/io.h> |
| 29 | 29 | #include <asm/irq.h> |
| 30 | 30 | #include <asm/leds.h> |
| @@ -39,8 +39,8 @@ · 8 unmodified lines | ||
| 39 | 39 | #include <asm/mach/mmc.h> |
| 40 | 40 | #include <asm/mach/time.h> |
| 41 | 41 | |
| 42 | −#include <asm/arch/board-pb11mp.h> | |
| 43 | −#include <asm/arch/irqs.h> | |
| 42 | +#include <mach/board-pb11mp.h> | |
| 43 | +#include <mach/irqs.h> | |
| 44 | 44 | |
| 45 | 45 | #include "core.h" |
| 46 | 46 | #include "clock.h" |
| @@ -20,7 +20,7 @@ · 19 unmodified lines | ||
| 20 | 20 | #include <asm/fiq.h> |
| 21 | 21 | #include <asm/io.h> |
| 22 | 22 | #include <asm/irq.h> |
| 23 | −#include <asm/hardware.h> | |
| 23 | +#include <mach/hardware.h> | |
| 24 | 24 | #include <asm/uaccess.h> |
| 25 | 25 | |
| 26 | 26 | #include <asm/mach/dma.h> |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-rpc/acornfb.h | |
| 2 | + * arch/arm/mach-rpc/include/mach/acornfb.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 1999 Russell King |
| 5 | 5 | * |
| @@ -1,4 +1,4 @@ | ||
| 1 | −/* linux/include/asm-arm/arch-rpc/debug-macro.S | |
| 1 | +/* arch/arm/mach-rpc/include/mach/debug-macro.S | |
| 2 | 2 | * |
| 3 | 3 | * Debugging macro include header |
| 4 | 4 | * |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-rpc/dma.h | |
| 2 | + * arch/arm/mach-rpc/include/mach/dma.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 1997 Russell King |
| 5 | 5 | * |
| @@ -1,4 +1,4 @@ | ||
| 1 | −#include <asm/hardware.h> | |
| 1 | +#include <mach/hardware.h> | |
| 2 | 2 | #include <asm/hardware/entry-macro-iomd.S> |
| 3 | 3 | |
| 4 | 4 | .equ ioc_base_high, IOC_BASE & 0xff000000 |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-rpc/hardware.h | |
| 2 | + * arch/arm/mach-rpc/include/mach/hardware.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 1996-1999 Russell King. |
| 5 | 5 | * |
| @@ -12,7 +12,7 @@ · 6 unmodified lines | ||
| 12 | 12 | #ifndef __ASM_ARCH_HARDWARE_H |
| 13 | 13 | #define __ASM_ARCH_HARDWARE_H |
| 14 | 14 | |
| 15 | −#include <asm/arch/memory.h> | |
| 15 | +#include <mach/memory.h> | |
| 16 | 16 | |
| 17 | 17 | #ifndef __ASSEMBLY__ |
| 18 | 18 | #define IOMEM(x) ((void __iomem *)(unsigned long)(x)) |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-rpc/io.h | |
| 2 | + * arch/arm/mach-rpc/include/mach/io.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 1997 Russell King |
| 5 | 5 | * |
| @@ -13,7 +13,7 @@ · 7 unmodified lines | ||
| 13 | 13 | #ifndef __ASM_ARM_ARCH_IO_H |
| 14 | 14 | #define __ASM_ARM_ARCH_IO_H |
| 15 | 15 | |
| 16 | −#include <asm/hardware.h> | |
| 16 | +#include <mach/hardware.h> | |
| 17 | 17 | |
| 18 | 18 | #define IO_SPACE_LIMIT 0xffffffff |
| 19 | 19 | |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-rpc/irqs.h | |
| 2 | + * arch/arm/mach-rpc/include/mach/irqs.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 1996 Russell King |
| 5 | 5 | * |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-rpc/memory.h | |
| 2 | + * arch/arm/mach-rpc/include/mach/memory.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 1996,1997,1998 Russell King. |
| 5 | 5 | * |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-rpc/system.h | |
| 2 | + * arch/arm/mach-rpc/include/mach/system.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 1996-1999 Russell King. |
| 5 | 5 | * |
| @@ -7,7 +7,7 @@ · 1 unmodified line | ||
| 7 | 7 | * it under the terms of the GNU General Public License version 2 as |
| 8 | 8 | * published by the Free Software Foundation. |
| 9 | 9 | */ |
| 10 | −#include <asm/hardware.h> | |
| 10 | +#include <mach/hardware.h> | |
| 11 | 11 | #include <asm/hardware/iomd.h> |
| 12 | 12 | #include <asm/io.h> |
| 13 | 13 | |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-rpc/timex.h | |
| 2 | + * arch/arm/mach-rpc/include/mach/timex.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 1997, 1998 Russell King |
| 5 | 5 | * |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-rpc/uncompress.h | |
| 2 | + * arch/arm/mach-rpc/include/mach/uncompress.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 1996 Russell King |
| 5 | 5 | * |
| @@ -9,7 +9,7 @@ · 3 unmodified lines | ||
| 9 | 9 | */ |
| 10 | 10 | #define VIDMEM ((char *)SCREEN_START) |
| 11 | 11 | |
| 12 | −#include <asm/hardware.h> | |
| 12 | +#include <mach/hardware.h> | |
| 13 | 13 | #include <asm/io.h> |
| 14 | 14 | #include <asm/setup.h> |
| 15 | 15 | #include <asm/page.h> |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-rpc/vmalloc.h | |
| 2 | + * arch/arm/mach-rpc/include/mach/vmalloc.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 1997 Russell King |
| 5 | 5 | * |
| @@ -22,7 +22,7 @@ · 21 unmodified lines | ||
| 22 | 22 | #include <asm/elf.h> |
| 23 | 23 | #include <asm/io.h> |
| 24 | 24 | #include <asm/mach-types.h> |
| 25 | −#include <asm/hardware.h> | |
| 25 | +#include <mach/hardware.h> | |
| 26 | 26 | #include <asm/page.h> |
| 27 | 27 | #include <asm/domain.h> |
| 28 | 28 | #include <asm/setup.h> |
| @@ -25,11 +25,11 @@ · 24 unmodified lines | ||
| 25 | 25 | #include <linux/interrupt.h> |
| 26 | 26 | #include <linux/ioport.h> |
| 27 | 27 | |
| 28 | −#include <asm/hardware.h> | |
| 28 | +#include <mach/hardware.h> | |
| 29 | 29 | #include <asm/irq.h> |
| 30 | 30 | #include <asm/io.h> |
| 31 | 31 | |
| 32 | −#include <asm/arch/regs-gpio.h> | |
| 32 | +#include <mach/regs-gpio.h> | |
| 33 | 33 | |
| 34 | 34 | int s3c2400_gpio_getirq(unsigned int pin) |
| 35 | 35 | { |
| @@ -1,4 +1,4 @@ | ||
| 1 | −/* linux/include/asm-arm/arch-s3c2400/map.h | |
| 1 | +/* arch/arm/mach-s3c2400/include/mach/map.h | |
| 2 | 2 | * |
| 3 | 3 | * Copyright 2003,2007 Simtec Electronics |
| 4 | 4 | * http://armlinux.simtec.co.uk/ |
| @@ -1,5 +1,5 @@ | ||
| 1 | −/* linux/include/asm-arm/arch-s3c2400/memory.h | |
| 2 | − * from linux/include/asm-arm/arch-rpc/memory.h | |
| 1 | +/* arch/arm/mach-s3c2400/include/mach/memory.h | |
| 2 | + * from arch/arm/mach-rpc/include/mach/memory.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright 2007 Simtec Electronics |
| 5 | 5 | * http://armlinux.simtec.co.uk/ |
| @@ -24,9 +24,9 @@ · 23 unmodified lines | ||
| 24 | 24 | #include <asm/mach/map.h> |
| 25 | 25 | #include <asm/mach/irq.h> |
| 26 | 26 | |
| 27 | −#include <asm/arch/map.h> | |
| 28 | −#include <asm/arch/bast-map.h> | |
| 29 | −#include <asm/arch/bast-irq.h> | |
| 27 | +#include <mach/map.h> | |
| 28 | +#include <mach/bast-map.h> | |
| 29 | +#include <mach/bast-irq.h> | |
| 30 | 30 | |
| 31 | 31 | /* IDE ports */ |
| 32 | 32 | |
| @@ -28,15 +28,15 @@ · 27 unmodified lines | ||
| 28 | 28 | |
| 29 | 29 | #include <asm/mach-types.h> |
| 30 | 30 | |
| 31 | −#include <asm/hardware.h> | |
| 31 | +#include <mach/hardware.h> | |
| 32 | 32 | #include <asm/irq.h> |
| 33 | 33 | #include <asm/io.h> |
| 34 | 34 | |
| 35 | 35 | #include <asm/mach/irq.h> |
| 36 | 36 | |
| 37 | −#include <asm/arch/regs-irq.h> | |
| 38 | −#include <asm/arch/bast-map.h> | |
| 39 | −#include <asm/arch/bast-irq.h> | |
| 37 | +#include <mach/regs-irq.h> | |
| 38 | +#include <mach/bast-map.h> | |
| 39 | +#include <mach/bast-irq.h> | |
| 40 | 40 | |
| 41 | 41 | #include <asm/plat-s3c24xx/irq.h> |
| 42 | 42 | |
| @@ -34,12 +34,12 @@ · 33 unmodified lines | ||
| 34 | 34 | |
| 35 | 35 | #include <asm/mach/map.h> |
| 36 | 36 | |
| 37 | −#include <asm/hardware.h> | |
| 37 | +#include <mach/hardware.h> | |
| 38 | 38 | #include <asm/io.h> |
| 39 | 39 | |
| 40 | 40 | #include <asm/plat-s3c/regs-serial.h> |
| 41 | −#include <asm/arch/regs-clock.h> | |
| 42 | −#include <asm/arch/regs-gpio.h> | |
| 41 | +#include <mach/regs-clock.h> | |
| 42 | +#include <mach/regs-gpio.h> | |
| 43 | 43 | |
| 44 | 44 | #include <asm/plat-s3c24xx/s3c2410.h> |
| 45 | 45 | #include <asm/plat-s3c24xx/clock.h> |
| @@ -18,17 +18,17 @@ · 17 unmodified lines | ||
| 18 | 18 | #include <linux/serial_core.h> |
| 19 | 19 | |
| 20 | 20 | #include <asm/dma.h> |
| 21 | −#include <asm/arch/dma.h> | |
| 21 | +#include <mach/dma.h> | |
| 22 | 22 | |
| 23 | 23 | #include <asm/plat-s3c24xx/cpu.h> |
| 24 | 24 | #include <asm/plat-s3c24xx/dma.h> |
| 25 | 25 | |
| 26 | 26 | #include <asm/plat-s3c/regs-serial.h> |
| 27 | −#include <asm/arch/regs-gpio.h> | |
| 27 | +#include <mach/regs-gpio.h> | |
| 28 | 28 | #include <asm/plat-s3c/regs-ac97.h> |
| 29 | −#include <asm/arch/regs-mem.h> | |
| 30 | −#include <asm/arch/regs-lcd.h> | |
| 31 | −#include <asm/arch/regs-sdi.h> | |
| 29 | +#include <mach/regs-mem.h> | |
| 30 | +#include <mach/regs-lcd.h> | |
| 31 | +#include <mach/regs-sdi.h> | |
| 32 | 32 | #include <asm/plat-s3c24xx/regs-iis.h> |
| 33 | 33 | #include <asm/plat-s3c24xx/regs-spi.h> |
| 34 | 34 | |
| @@ -26,11 +26,11 @@ · 25 unmodified lines | ||
| 26 | 26 | #include <linux/interrupt.h> |
| 27 | 27 | #include <linux/ioport.h> |
| 28 | 28 | |
| 29 | −#include <asm/hardware.h> | |
| 29 | +#include <mach/hardware.h> | |
| 30 | 30 | #include <asm/irq.h> |
| 31 | 31 | #include <asm/io.h> |
| 32 | 32 | |
| 33 | −#include <asm/arch/regs-gpio.h> | |
| 33 | +#include <mach/regs-gpio.h> | |
| 34 | 34 | |
| 35 | 35 | int s3c2410_gpio_irqfilter(unsigned int pin, unsigned int on, |
| 36 | 36 | unsigned int config) |
| @@ -16,9 +16,9 @@ · 15 unmodified lines | ||
| 16 | 16 | #include <linux/string.h> |
| 17 | 17 | #include <linux/ctype.h> |
| 18 | 18 | #include <linux/leds.h> |
| 19 | −#include <asm/arch/regs-gpio.h> | |
| 20 | −#include <asm/hardware.h> | |
| 21 | −#include <asm/arch/h1940-latch.h> | |
| 19 | +#include <mach/regs-gpio.h> | |
| 20 | +#include <mach/hardware.h> | |
| 21 | +#include <mach/h1940-latch.h> | |
| 22 | 22 | |
| 23 | 23 | #define DRV_NAME "h1940-bt" |
| 24 | 24 | |
| @@ -1,4 +1,4 @@ | ||
| 1 | −/* linux/include/asm-arm/arch-s3c2410/anubis-cpld.h | |
| 1 | +/* arch/arm/mach-s3c2410/include/mach/anubis-cpld.h | |
| 2 | 2 | * |
| 3 | 3 | * Copyright (c) 2005 Simtec Electronics |
| 4 | 4 | * http://www.simtec.co.uk/products/ |
| @@ -1,4 +1,4 @@ | ||
| 1 | −/* linux/include/asm-arm/arch-s3c2410/anubis-irq.h | |
| 1 | +/* arch/arm/mach-s3c2410/include/mach/anubis-irq.h | |
| 2 | 2 | * |
| 3 | 3 | * Copyright (c) 2005 Simtec Electronics |
| 4 | 4 | * http://www.simtec.co.uk/products/ |
| @@ -1,4 +1,4 @@ | ||
| 1 | −/* linux/include/asm-arm/arch-s3c2410/anubis-map.h | |
| 1 | +/* arch/arm/mach-s3c2410/include/mach/anubis-map.h | |
| 2 | 2 | * |
| 3 | 3 | * Copyright (c) 2005 Simtec Electronics |
| 4 | 4 | * http://www.simtec.co.uk/products/ |
| @@ -1,4 +1,4 @@ | ||
| 1 | −/* linux/include/asm-arm/arch-s3c2410/audio.h | |
| 1 | +/* arch/arm/mach-s3c2410/include/mach/audio.h | |
| 2 | 2 | * |
| 3 | 3 | * Copyright (c) 2004-2005 Simtec Electronics |
| 4 | 4 | * http://www.simtec.co.uk/products/SWLINUX/ |
| @@ -1,4 +1,4 @@ | ||
| 1 | −/* linux/include/asm-arm/arch-s3c2410/bast-cpld.h | |
| 1 | +/* arch/arm/mach-s3c2410/include/mach/bast-cpld.h | |
| 2 | 2 | * |
| 3 | 3 | * Copyright (c) 2003,2004 Simtec Electronics |
| 4 | 4 | * Ben Dooks <ben@simtec.co.uk> |
| @@ -1,4 +1,4 @@ | ||
| 1 | −/* linux/include/asm-arm/arch-s3c2410/bast-irq.h | |
| 1 | +/* arch/arm/mach-s3c2410/include/mach/bast-irq.h | |
| 2 | 2 | * |
| 3 | 3 | * Copyright (c) 2003,2004 Simtec Electronics |
| 4 | 4 | * Ben Dooks <ben@simtec.co.uk> |
| @@ -1,4 +1,4 @@ | ||
| 1 | −/* linux/include/asm-arm/arch-s3c2410/bast-map.h | |
| 1 | +/* arch/arm/mach-s3c2410/include/mach/bast-map.h | |
| 2 | 2 | * |
| 3 | 3 | * Copyright (c) 2003,2004 Simtec Electronics |
| 4 | 4 | * Ben Dooks <ben@simtec.co.uk> |
| @@ -1,4 +1,4 @@ | ||
| 1 | −/* linux/include/asm-arm/arch-s3c2410/bast-pmu.h | |
| 1 | +/* arch/arm/mach-s3c2410/include/mach/bast-pmu.h | |
| 2 | 2 | * |
| 3 | 3 | * Copyright (c) 2003,2004 Simtec Electronics |
| 4 | 4 | * Ben Dooks <ben@simtec.co.uk> |
| @@ -1,4 +1,4 @@ | ||
| 1 | −/* linux/include/asm-arm/arch-s3c2410/debug-macro.S | |
| 1 | +/* arch/arm/mach-s3c2410/include/mach/debug-macro.S | |
| 2 | 2 | * |
| 3 | 3 | * Debugging macro include header |
| 4 | 4 | * |
| @@ -12,8 +12,8 @@ · 7 unmodified lines | ||
| 12 | 12 | * published by the Free Software Foundation. |
| 13 | 13 | */ |
| 14 | 14 | |
| 15 | −#include <asm/arch/map.h> | |
| 16 | −#include <asm/arch/regs-gpio.h> | |
| 15 | +#include <mach/map.h> | |
| 16 | +#include <mach/regs-gpio.h> | |
| 17 | 17 | #include <asm/plat-s3c/regs-serial.h> |
| 18 | 18 | |
| 19 | 19 | #define S3C2410_UART1_OFF (0x4000) |
| @@ -1,4 +1,4 @@ | ||
| 1 | −/* linux/include/asm-arm/arch-s3c2410/dma.h | |
| 1 | +/* arch/arm/mach-s3c2410/include/mach/dma.h | |
| 2 | 2 | * |
| 3 | 3 | * Copyright (C) 2003,2004,2006 Simtec Electronics |
| 4 | 4 | * Ben Dooks <ben@simtec.co.uk> |
| @@ -14,7 +14,7 @@ · 9 unmodified lines | ||
| 14 | 14 | #define __ASM_ARCH_DMA_H __FILE__ |
| 15 | 15 | |
| 16 | 16 | #include <linux/sysdev.h> |
| 17 | −#include <asm/hardware.h> | |
| 17 | +#include <mach/hardware.h> | |
| 18 | 18 | |
| 19 | 19 | /* |
| 20 | 20 | * This is the maximum DMA address(physical address) that can be DMAd to. |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-s3c2410/entry-macro.S | |
| 2 | + * arch/arm/mach-s3c2410/include/mach/entry-macro.S | |
| 3 | 3 | * |
| 4 | 4 | * Low-level IRQ helper macros for S3C2410-based platforms |
| 5 | 5 | * |
| @@ -19,7 +19,7 @@ · 13 unmodified lines | ||
| 19 | 19 | #define INTPND (0x10) |
| 20 | 20 | #define INTOFFSET (0x14) |
| 21 | 21 | |
| 22 | −#include <asm/hardware.h> | |
| 22 | +#include <mach/hardware.h> | |
| 23 | 23 | #include <asm/irq.h> |
| 24 | 24 | |
| 25 | 25 | .macro get_irqnr_preamble, base, tmp |
| @@ -1,4 +1,4 @@ | ||
| 1 | −/* linux/include/asm-arm/arch-s3c2410/fb.h | |
| 1 | +/* arch/arm/mach-s3c2410/include/mach/fb.h | |
| 2 | 2 | * |
| 3 | 3 | * Copyright (c) 2004 Arnaud Patard <arnaud.patard@rtp-net.org> |
| 4 | 4 | * |
| @@ -12,7 +12,7 @@ · 7 unmodified lines | ||
| 12 | 12 | #ifndef __ASM_ARM_FB_H |
| 13 | 13 | #define __ASM_ARM_FB_H |
| 14 | 14 | |
| 15 | −#include <asm/arch/regs-lcd.h> | |
| 15 | +#include <mach/regs-lcd.h> | |
| 16 | 16 | |
| 17 | 17 | struct s3c2410fb_hw { |
| 18 | 18 | unsigned long lcdcon1; |
| @@ -1,4 +1,4 @@ | ||
| 1 | −/* linux/include/asm-arm/arch-s3c2410/gpio.h | |
| 1 | +/* arch/arm/mach-s3c2410/include/mach/gpio.h | |
| 2 | 2 | * |
| 3 | 3 | * Copyright (c) 2008 Simtec Electronics |
| 4 | 4 | * http://armlinux.simtec.co.uk/ |
| @@ -1,4 +1,4 @@ | ||
| 1 | −/* linux/include/asm-arm/arch-s3c2410/h1940-latch.h | |
| 1 | +/* arch/arm/mach-s3c2410/include/mach/h1940-latch.h | |
| 2 | 2 | * |
| 3 | 3 | * Copyright (c) 2005 Simtec Electronics |
| 4 | 4 | * http://armlinux.simtec.co.uk/ |
| @@ -1,4 +1,4 @@ | ||
| 1 | −/* linux/include/asm-arm/arch-s3c2410/h1940.h | |
| 1 | +/* arch/arm/mach-s3c2410/include/mach/h1940.h | |
| 2 | 2 | * |
| 3 | 3 | * Copyright 2006 Ben Dooks <ben-linux@fluff.org> |
| 4 | 4 | * |
| @@ -1,4 +1,4 @@ | ||
| 1 | −/* linux/include/asm-arm/arch-s3c2410/hardware.h | |
| 1 | +/* arch/arm/mach-s3c2410/include/mach/hardware.h | |
| 2 | 2 | * |
| 3 | 3 | * Copyright (c) 2003 Simtec Electronics |
| 4 | 4 | * Ben Dooks <ben@simtec.co.uk> |
| @@ -13,10 +13,6 @@ · 8 unmodified lines | ||
| 13 | 13 | #ifndef __ASM_ARCH_HARDWARE_H |
| 14 | 14 | #define __ASM_ARCH_HARDWARE_H |
| 15 | 15 | |
| 16 | −#ifndef __ASM_HARDWARE_H | |
| 17 | −#error "Do not include this directly, instead #include <asm/hardware.h>" | |
| 18 | −#endif | |
| 19 | − | |
| 20 | 16 | #ifndef __ASSEMBLY__ |
| 21 | 17 | |
| 22 | 18 | /* external functions for GPIO support |
| @@ -131,7 +127,7 @@ extern int s3c2412_gpio_set_sleepcfg(unsigned int pin, unsigned int state); · 108 unmodified lines | ||
| 131 | 127 | #endif /* __ASSEMBLY__ */ |
| 132 | 128 | |
| 133 | 129 | #include <asm/sizes.h> |
| 134 | −#include <asm/arch/map.h> | |
| 130 | +#include <mach/map.h> | |
| 135 | 131 | |
| 136 | 132 | /* machine specific hardware definitions should go after this */ |
| 137 | 133 | |
| @@ -1,4 +1,4 @@ | ||
| 1 | −/* linux/include/asm-arm/arch-s3c2410/idle.h | |
| 1 | +/* arch/arm/mach-s3c2410/include/mach/idle.h | |
| 2 | 2 | * |
| 3 | 3 | * Copyright (c) 2004 Simtec Electronics <linux@simtec.co.uk> |
| 4 | 4 | * http://www.simtec.co.uk/products/SWLINUX/ |
| @@ -1,6 +1,6 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-s3c2410/io.h | |
| 3 | − * from linux/include/asm-arm/arch-rpc/io.h | |
| 2 | + * arch/arm/mach-s3c2410/include/mach/io.h | |
| 3 | + * from arch/arm/mach-rpc/include/mach/io.h | |
| 4 | 4 | * |
| 5 | 5 | * Copyright (C) 1997 Russell King |
| 6 | 6 | * (C) 2003 Simtec Electronics |
| @@ -9,7 +9,7 @@ · 2 unmodified lines | ||
| 9 | 9 | #ifndef __ASM_ARM_ARCH_IO_H |
| 10 | 10 | #define __ASM_ARM_ARCH_IO_H |
| 11 | 11 | |
| 12 | −#include <asm/hardware.h> | |
| 12 | +#include <mach/hardware.h> | |
| 13 | 13 | |
| 14 | 14 | #define IO_SPACE_LIMIT 0xffffffff |
| 15 | 15 | |
| @@ -1,4 +1,4 @@ | ||
| 1 | −/* linux/include/asm-arm/arch-s3c2410/irqs.h | |
| 1 | +/* arch/arm/mach-s3c2410/include/mach/irqs.h | |
| 2 | 2 | * |
| 3 | 3 | * Copyright (c) 2003-2005 Simtec Electronics |
| 4 | 4 | * Ben Dooks <ben@simtec.co.uk> |
| @@ -1,4 +1,4 @@ | ||
| 1 | −/* linux/include/asm-arm/arch-s3c2410/leds-gpio.h | |
| 1 | +/* arch/arm/mach-s3c2410/include/mach/leds-gpio.h | |
| 2 | 2 | * |
| 3 | 3 | * Copyright (c) 2006 Simtec Electronics |
| 4 | 4 | * http://armlinux.simtec.co.uk/ |
| @@ -1,4 +1,4 @@ | ||
| 1 | −/* linux/include/asm-arm/arch-s3c2410/map.h | |
| 1 | +/* arch/arm/mach-s3c2410/include/mach/map.h | |
| 2 | 2 | * |
| 3 | 3 | * Copyright (c) 2003 Simtec Electronics |
| 4 | 4 | * Ben Dooks <ben@simtec.co.uk> |
| @@ -1,5 +1,5 @@ | ||
| 1 | −/* linux/include/asm-arm/arch-s3c2410/memory.h | |
| 2 | − * from linux/include/asm-arm/arch-rpc/memory.h | |
| 1 | +/* arch/arm/mach-s3c2410/include/mach/memory.h | |
| 2 | + * from arch/arm/mach-rpc/include/mach/memory.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 1996,1997,1998 Russell King. |
| 5 | 5 | * |
| @@ -1,4 +1,4 @@ | ||
| 1 | −/* linux/include/asm-arm/arch-s3c2410/osiris-cpld.h | |
| 1 | +/* arch/arm/mach-s3c2410/include/mach/osiris-cpld.h | |
| 2 | 2 | * |
| 3 | 3 | * Copyright 2005 Simtec Electronics |
| 4 | 4 | * http://www.simtec.co.uk/products/ |
| @@ -1,4 +1,4 @@ | ||
| 1 | −/* linux/include/asm-arm/arch-s3c2410/osiris-map.h | |
| 1 | +/* arch/arm/mach-s3c2410/include/mach/osiris-map.h | |
| 2 | 2 | * |
| 3 | 3 | * (c) 2005 Simtec Electronics |
| 4 | 4 | * http://www.simtec.co.uk/products/ |
| @@ -1,4 +1,4 @@ | ||
| 1 | −/* linux/include/asm-arm/arch-s3c2410/otom-map.h | |
| 1 | +/* arch/arm/mach-s3c2410/include/mach/otom-map.h | |
| 2 | 2 | * |
| 3 | 3 | * (c) 2005 Guillaume GOURAT / NexVision |
| 4 | 4 | * guillaume.gourat@nexvision.fr |
| @@ -1,4 +1,4 @@ | ||
| 1 | −/* linux/include/asm-arm/arch-s3c2410/regs-clock.h | |
| 1 | +/* arch/arm/mach-s3c2410/include/mach/regs-clock.h | |
| 2 | 2 | * |
| 3 | 3 | * Copyright (c) 2003,2004,2005,2006 Simtec Electronics <linux@simtec.co.uk> |
| 4 | 4 | * http://armlinux.simtec.co.uk/ |
| @@ -11,7 +11,7 @@ · 6 unmodified lines | ||
| 11 | 11 | */ |
| 12 | 12 | |
| 13 | 13 | #ifndef __ASM_ARM_REGS_CLOCK |
| 14 | −#define __ASM_ARM_REGS_CLOCK "$Id: clock.h,v 1.4 2003/04/30 14:50:51 ben Exp $" | |
| 14 | +#define __ASM_ARM_REGS_CLOCK | |
| 15 | 15 | |
| 16 | 16 | #define S3C2410_CLKREG(x) ((x) + S3C24XX_VA_CLKPWR) |
| 17 | 17 | |
| @@ -1,4 +1,4 @@ | ||
| 1 | −/* linux/include/asm-arm/arch-s3c2410/regs-dsc.h | |
| 1 | +/* arch/arm/mach-s3c2410/include/mach/regs-dsc.h | |
| 2 | 2 | * |
| 3 | 3 | * Copyright (c) 2004 Simtec Electronics <linux@simtec.co.uk> |
| 4 | 4 | * http://www.simtec.co.uk/products/SWLINUX/ |
| @@ -1,4 +1,4 @@ | ||
| 1 | −/* linux/include/asm-arm/arch-s3c2410/regs-gpio.h | |
| 1 | +/* arch/arm/mach-s3c2410/include/mach/regs-gpio.h | |
| 2 | 2 | * |
| 3 | 3 | * Copyright (c) 2003,2004 Simtec Electronics <linux@simtec.co.uk> |
| 4 | 4 | * http://www.simtec.co.uk/products/SWLINUX/ |
| @@ -12,7 +12,7 @@ · 7 unmodified lines | ||
| 12 | 12 | |
| 13 | 13 | |
| 14 | 14 | #ifndef __ASM_ARCH_REGS_GPIO_H |
| 15 | −#define __ASM_ARCH_REGS_GPIO_H "$Id: gpio.h,v 1.5 2003/05/19 12:51:08 ben Exp $" | |
| 15 | +#define __ASM_ARCH_REGS_GPIO_H | |
| 16 | 16 | |
| 17 | 17 | #define S3C2410_GPIONO(bank,offset) ((bank) + (offset)) |
| 18 | 18 | |
| @@ -1,4 +1,4 @@ | ||
| 1 | −/* linux/include/asm-arm/arch-s3c2410/regs-gpioj.h | |
| 1 | +/* arch/arm/mach-s3c2410/include/mach/regs-gpioj.h | |
| 2 | 2 | * |
| 3 | 3 | * Copyright (c) 2004 Simtec Electronics <linux@simtec.co.uk> |
| 4 | 4 | * http://www.simtec.co.uk/products/SWLINUX/ |
| @@ -1,4 +1,4 @@ | ||
| 1 | −/* linux/include/asm-arm/arch-s3c2410/regs-irq.h | |
| 1 | +/* arch/arm/mach-s3c2410/include/mach/regs-irq.h | |
| 2 | 2 | * |
| 3 | 3 | * Copyright (c) 2003 Simtec Electronics <linux@simtec.co.uk> |
| 4 | 4 | * http://www.simtec.co.uk/products/SWLINUX/ |
| @@ -10,7 +10,7 @@ · 5 unmodified lines | ||
| 10 | 10 | |
| 11 | 11 | |
| 12 | 12 | #ifndef ___ASM_ARCH_REGS_IRQ_H |
| 13 | −#define ___ASM_ARCH_REGS_IRQ_H "$Id: irq.h,v 1.3 2003/03/25 21:29:06 ben Exp $" | |
| 13 | +#define ___ASM_ARCH_REGS_IRQ_H | |
| 14 | 14 | |
| 15 | 15 | /* interrupt controller */ |
| 16 | 16 | |
| @@ -1,4 +1,4 @@ | ||
| 1 | −/* linux/include/asm-arm/arch-s3c2410/regs-lcd.h | |
| 1 | +/* arch/arm/mach-s3c2410/include/mach/regs-lcd.h | |
| 2 | 2 | * |
| 3 | 3 | * Copyright (c) 2003 Simtec Electronics <linux@simtec.co.uk> |
| 4 | 4 | * http://www.simtec.co.uk/products/SWLINUX/ |
| @@ -10,7 +10,7 @@ · 5 unmodified lines | ||
| 10 | 10 | |
| 11 | 11 | |
| 12 | 12 | #ifndef ___ASM_ARCH_REGS_LCD_H |
| 13 | −#define ___ASM_ARCH_REGS_LCD_H "$Id: lcd.h,v 1.3 2003/06/26 13:25:06 ben Exp $" | |
| 13 | +#define ___ASM_ARCH_REGS_LCD_H | |
| 14 | 14 | |
| 15 | 15 | #define S3C2410_LCDREG(x) (x) |
| 16 | 16 | |
| @@ -1,4 +1,4 @@ | ||
| 1 | −/* linux/include/asm-arm/arch-s3c2410/regs-mem.h | |
| 1 | +/* arch/arm/mach-s3c2410/include/mach/regs-mem.h | |
| 2 | 2 | * |
| 3 | 3 | * Copyright (c) 2004 Simtec Electronics <linux@simtec.co.uk> |
| 4 | 4 | * http://www.simtec.co.uk/products/SWLINUX/ |
| @@ -11,7 +11,7 @@ · 6 unmodified lines | ||
| 11 | 11 | */ |
| 12 | 12 | |
| 13 | 13 | #ifndef __ASM_ARM_MEMREGS_H |
| 14 | −#define __ASM_ARM_MEMREGS_H "$Id: regs.h,v 1.8 2003/05/01 15:55:41 ben Exp $" | |
| 14 | +#define __ASM_ARM_MEMREGS_H | |
| 15 | 15 | |
| 16 | 16 | #ifndef S3C2410_MEMREG |
| 17 | 17 | #define S3C2410_MEMREG(x) (S3C24XX_VA_MEMCTRL + (x)) |
| @@ -1,4 +1,4 @@ | ||
| 1 | −/* linux/include/asm-arm/arch-s3c2410/regs-power.h | |
| 1 | +/* arch/arm/mach-s3c2410/include/mach/regs-power.h | |
| 2 | 2 | * |
| 3 | 3 | * Copyright (c) 2003,2004,2005,2006 Simtec Electronics <linux@simtec.co.uk> |
| 4 | 4 | * http://armlinux.simtec.co.uk/ |
| @@ -1,4 +1,4 @@ | ||
| 1 | −/* linux/include/asm-arm/arch-s3c2410/regs-s3c2412-mem.h | |
| 1 | +/* arch/arm/mach-s3c2410/include/mach/regs-s3c2412-mem.h | |
| 2 | 2 | * |
| 3 | 3 | * Copyright (c) 2008 Simtec Electronics |
| 4 | 4 | * Ben Dooks <ben@simtec.co.uk> |
| @@ -1,4 +1,4 @@ | ||
| 1 | −/* linux/include/asm-arm/arch-s3c2410/regs-s3c2412.h | |
| 1 | +/* arch/arm/mach-s3c2410/include/mach/regs-s3c2412.h | |
| 2 | 2 | * |
| 3 | 3 | * Copyright 2007 Simtec Electronics |
| 4 | 4 | * http://armlinux.simtec.co.uk/ |
| @@ -1,4 +1,4 @@ | ||
| 1 | −/* linux/include/asm-arm/arch-s3c2410/regs-s3c2443-clock.h | |
| 1 | +/* arch/arm/mach-s3c2410/include/mach/regs-s3c2443-clock.h | |
| 2 | 2 | * |
| 3 | 3 | * Copyright (c) 2007 Simtec Electronics |
| 4 | 4 | * Ben Dooks <ben@simtec.co.uk> |
| @@ -1,4 +1,4 @@ | ||
| 1 | −/* linux/include/asm-arm/arch-s3c2410/regs-sdi.h | |
| 1 | +/* arch/arm/mach-s3c2410/include/mach/regs-sdi.h | |
| 2 | 2 | * |
| 3 | 3 | * Copyright (c) 2004 Simtec Electronics <linux@simtec.co.uk> |
| 4 | 4 | * http://www.simtec.co.uk/products/SWLINUX/ |
| @@ -1,4 +1,4 @@ | ||
| 1 | −/* linux/include/asm-arm/arch-s3c2410/reset.h | |
| 1 | +/* arch/arm/mach-s3c2410/include/mach/reset.h | |
| 2 | 2 | * |
| 3 | 3 | * Copyright (c) 2007 Simtec Electronics |
| 4 | 4 | * Ben Dooks <ben@simtec.co.uk> |
| @@ -1,4 +1,4 @@ | ||
| 1 | −/* linux/include/asm-arm/arch-s3c2410/spi-gpio.h | |
| 1 | +/* arch/arm/mach-s3c2410/include/mach/spi-gpio.h | |
| 2 | 2 | * |
| 3 | 3 | * Copyright (c) 2006 Simtec Electronics |
| 4 | 4 | * Ben Dooks <ben@simtec.co.uk> |
| @@ -1,4 +1,4 @@ | ||
| 1 | −/* linux/include/asm-arm/arch-s3c2410/spi.h | |
| 1 | +/* arch/arm/mach-s3c2410/include/mach/spi.h | |
| 2 | 2 | * |
| 3 | 3 | * Copyright (c) 2006 Simtec Electronics |
| 4 | 4 | * Ben Dooks <ben@simtec.co.uk> |
| @@ -1,4 +1,4 @@ | ||
| 1 | −/* linux/include/asm-arm/arch-s3c2410/system-reset.h | |
| 1 | +/* arch/arm/mach-s3c2410/include/mach/system-reset.h | |
| 2 | 2 | * |
| 3 | 3 | * Copyright (c) 2008 Simtec Electronics |
| 4 | 4 | * Ben Dooks <ben@simtec.co.uk> |
| @@ -10,11 +10,11 @@ · 5 unmodified lines | ||
| 10 | 10 | * published by the Free Software Foundation. |
| 11 | 11 | */ |
| 12 | 12 | |
| 13 | −#include <asm/hardware.h> | |
| 13 | +#include <mach/hardware.h> | |
| 14 | 14 | #include <asm/io.h> |
| 15 | 15 | |
| 16 | 16 | #include <asm/plat-s3c/regs-watchdog.h> |
| 17 | −#include <asm/arch/regs-clock.h> | |
| 17 | +#include <mach/regs-clock.h> | |
| 18 | 18 | |
| 19 | 19 | #include <linux/clk.h> |
| 20 | 20 | #include <linux/err.h> |
| @@ -1,4 +1,4 @@ | ||
| 1 | −/* linux/include/asm-arm/arch-s3c2410/system.h | |
| 1 | +/* arch/arm/mach-s3c2410/include/mach/system.h | |
| 2 | 2 | * |
| 3 | 3 | * Copyright (c) 2003 Simtec Electronics |
| 4 | 4 | * Ben Dooks <ben@simtec.co.uk> |
| @@ -10,14 +10,14 @@ · 5 unmodified lines | ||
| 10 | 10 | * published by the Free Software Foundation. |
| 11 | 11 | */ |
| 12 | 12 | |
| 13 | −#include <asm/hardware.h> | |
| 13 | +#include <mach/hardware.h> | |
| 14 | 14 | #include <asm/io.h> |
| 15 | 15 | |
| 16 | −#include <asm/arch/map.h> | |
| 17 | −#include <asm/arch/idle.h> | |
| 18 | −#include <asm/arch/reset.h> | |
| 16 | +#include <mach/map.h> | |
| 17 | +#include <mach/idle.h> | |
| 18 | +#include <mach/reset.h> | |
| 19 | 19 | |
| 20 | −#include <asm/arch/regs-clock.h> | |
| 20 | +#include <mach/regs-clock.h> | |
| 21 | 21 | |
| 22 | 22 | void (*s3c24xx_idle)(void); |
| 23 | 23 | void (*s3c24xx_reset_hook)(void); |
| @@ -55,4 +55,4 @@ static void arch_idle(void) · 31 unmodified lines | ||
| 55 | 55 | s3c24xx_default_idle(); |
| 56 | 56 | } |
| 57 | 57 | |
| 58 | −#include <asm/arch/system-reset.h> | |
| 58 | +#include <mach/system-reset.h> | |
| @@ -1,4 +1,4 @@ | ||
| 1 | −/* linux/include/asm-arm/arch-s3c2410/timex.h | |
| 1 | +/* arch/arm/mach-s3c2410/include/mach/timex.h | |
| 2 | 2 | * |
| 3 | 3 | * Copyright (c) 2003-2005 Simtec Electronics |
| 4 | 4 | * Ben Dooks <ben@simtec.co.uk> |
| @@ -1,4 +1,4 @@ | ||
| 1 | −/* linux/include/asm-arm/arch-s3c2410/uncompress.h | |
| 1 | +/* arch/arm/mach-s3c2410/include/mach/uncompress.h | |
| 2 | 2 | * |
| 3 | 3 | * Copyright (c) 2003, 2007 Simtec Electronics |
| 4 | 4 | * http://armlinux.simtec.co.uk/ |
| @@ -14,8 +14,8 @@ · 9 unmodified lines | ||
| 14 | 14 | #ifndef __ASM_ARCH_UNCOMPRESS_H |
| 15 | 15 | #define __ASM_ARCH_UNCOMPRESS_H |
| 16 | 16 | |
| 17 | −#include <asm/arch/regs-gpio.h> | |
| 18 | −#include <asm/arch/map.h> | |
| 17 | +#include <mach/regs-gpio.h> | |
| 18 | +#include <mach/map.h> | |
| 19 | 19 | |
| 20 | 20 | /* working in physical space... */ |
| 21 | 21 | #undef S3C2410_GPIOREG |
| @@ -1,4 +1,4 @@ | ||
| 1 | −/* linux/include/asm-arm/arch-s3c2410/usb-control.h | |
| 1 | +/* arch/arm/mach-s3c2410/include/mach/usb-control.h | |
| 2 | 2 | * |
| 3 | 3 | * Copyright (c) 2004 Simtec Electronics |
| 4 | 4 | * Ben Dooks <ben@simtec.co.uk> |
| @@ -11,7 +11,7 @@ · 6 unmodified lines | ||
| 11 | 11 | */ |
| 12 | 12 | |
| 13 | 13 | #ifndef __ASM_ARCH_USBCONTROL_H |
| 14 | −#define __ASM_ARCH_USBCONTROL_H "include/asm-arm/arch-s3c2410/usb-control.h" | |
| 14 | +#define __ASM_ARCH_USBCONTROL_H "arch/arm/mach-s3c2410/include/mach/usb-control.h" | |
| 15 | 15 | |
| 16 | 16 | #define S3C_HCDFLG_USED (1) |
| 17 | 17 | |
| @@ -1,6 +1,6 @@ | ||
| 1 | −/* linux/include/asm-arm/arch-s3c2410/vmalloc.h | |
| 1 | +/* arch/arm/mach-s3c2410/include/mach/vmalloc.h | |
| 2 | 2 | * |
| 3 | − * from linux/include/asm-arm/arch-iop3xx/vmalloc.h | |
| 3 | + * from arch/arm/mach-iop3xx/include/mach/vmalloc.h | |
| 4 | 4 | * |
| 5 | 5 | * Copyright (c) 2003 Simtec Electronics <linux@simtec.co.uk> |
| 6 | 6 | * http://www.simtec.co.uk/products/SWLINUX/ |
| @@ -1,4 +1,4 @@ | ||
| 1 | −/* linux/include/asm-arm/arch-s3c2410/vr1000-cpld.h | |
| 1 | +/* arch/arm/mach-s3c2410/include/mach/vr1000-cpld.h | |
| 2 | 2 | * |
| 3 | 3 | * Copyright (c) 2003 Simtec Electronics |
| 4 | 4 | * Ben Dooks <ben@simtec.co.uk> |
| @@ -1,4 +1,4 @@ | ||
| 1 | −/* linux/include/asm-arm/arch-s3c2410/vr1000-irq.h | |
| 1 | +/* arch/arm/mach-s3c2410/include/mach/vr1000-irq.h | |
| 2 | 2 | * |
| 3 | 3 | * Copyright (c) 2003,2004 Simtec Electronics |
| 4 | 4 | * Ben Dooks <ben@simtec.co.uk> |
| @@ -1,4 +1,4 @@ | ||
| 1 | −/* linux/include/asm-arm/arch-s3c2410/vr1000-map.h | |
| 1 | +/* arch/arm/mach-s3c2410/include/mach/vr1000-map.h | |
| 2 | 2 | * |
| 3 | 3 | * Copyright (c) 2003-2005 Simtec Electronics |
| 4 | 4 | * Ben Dooks <ben@simtec.co.uk> |
| @@ -21,7 +21,7 @@ · 16 unmodified lines | ||
| 21 | 21 | #ifndef __ASM_ARCH_VR1000MAP_H |
| 22 | 22 | #define __ASM_ARCH_VR1000MAP_H |
| 23 | 23 | |
| 24 | −#include <asm/arch/bast-map.h> | |
| 24 | +#include <mach/bast-map.h> | |
| 25 | 25 | |
| 26 | 26 | #define VR1000_IOADDR(x) BAST_IOADDR(x) |
| 27 | 27 | |
| @@ -42,15 +42,15 @@ · 41 unmodified lines | ||
| 42 | 42 | #include <asm/mach/irq.h> |
| 43 | 43 | #include <asm/mach/flash.h> |
| 44 | 44 | |
| 45 | −#include <asm/hardware.h> | |
| 45 | +#include <mach/hardware.h> | |
| 46 | 46 | #include <asm/io.h> |
| 47 | 47 | #include <asm/irq.h> |
| 48 | 48 | #include <asm/mach-types.h> |
| 49 | −#include <asm/arch/fb.h> | |
| 49 | +#include <mach/fb.h> | |
| 50 | 50 | |
| 51 | 51 | #include <asm/plat-s3c/regs-serial.h> |
| 52 | −#include <asm/arch/regs-lcd.h> | |
| 53 | −#include <asm/arch/regs-gpio.h> | |
| 52 | +#include <mach/regs-lcd.h> | |
| 53 | +#include <mach/regs-gpio.h> | |
| 54 | 54 | |
| 55 | 55 | #include <asm/plat-s3c24xx/devs.h> |
| 56 | 56 | #include <asm/plat-s3c24xx/cpu.h> |
| @@ -29,24 +29,24 @@ · 28 unmodified lines | ||
| 29 | 29 | #include <asm/mach/map.h> |
| 30 | 30 | #include <asm/mach/irq.h> |
| 31 | 31 | |
| 32 | −#include <asm/arch/bast-map.h> | |
| 33 | −#include <asm/arch/bast-irq.h> | |
| 34 | −#include <asm/arch/bast-cpld.h> | |
| 32 | +#include <mach/bast-map.h> | |
| 33 | +#include <mach/bast-irq.h> | |
| 34 | +#include <mach/bast-cpld.h> | |
| 35 | 35 | |
| 36 | −#include <asm/hardware.h> | |
| 36 | +#include <mach/hardware.h> | |
| 37 | 37 | #include <asm/io.h> |
| 38 | 38 | #include <asm/irq.h> |
| 39 | 39 | #include <asm/mach-types.h> |
| 40 | 40 | |
| 41 | 41 | //#include <asm/debug-ll.h> |
| 42 | 42 | #include <asm/plat-s3c/regs-serial.h> |
| 43 | −#include <asm/arch/regs-gpio.h> | |
| 44 | −#include <asm/arch/regs-mem.h> | |
| 45 | −#include <asm/arch/regs-lcd.h> | |
| 43 | +#include <mach/regs-gpio.h> | |
| 44 | +#include <mach/regs-mem.h> | |
| 45 | +#include <mach/regs-lcd.h> | |
| 46 | 46 | |
| 47 | 47 | #include <asm/plat-s3c/nand.h> |
| 48 | 48 | #include <asm/plat-s3c/iic.h> |
| 49 | −#include <asm/arch/fb.h> | |
| 49 | +#include <mach/fb.h> | |
| 50 | 50 | |
| 51 | 51 | #include <linux/mtd/mtd.h> |
| 52 | 52 | #include <linux/mtd/nand.h> |
| @@ -562,7 +562,7 @@ static struct platform_device *bast_devices[] __initdata = { · 509 unmodified lines | ||
| 562 | 562 | &bast_sio, |
| 563 | 563 | }; |
| 564 | 564 | |
| 565 | −static struct clk *bast_clocks[] = { | |
| 565 | +static struct clk *bast_clocks[] __initdata = { | |
| 566 | 566 | &s3c24xx_dclk0, |
| 567 | 567 | &s3c24xx_dclk1, |
| 568 | 568 | &s3c24xx_clkout0, |
| @@ -25,19 +25,19 @@ · 24 unmodified lines | ||
| 25 | 25 | #include <asm/mach/map.h> |
| 26 | 26 | #include <asm/mach/irq.h> |
| 27 | 27 | |
| 28 | −#include <asm/hardware.h> | |
| 28 | +#include <mach/hardware.h> | |
| 29 | 29 | #include <asm/io.h> |
| 30 | 30 | #include <asm/irq.h> |
| 31 | 31 | #include <asm/mach-types.h> |
| 32 | 32 | |
| 33 | 33 | #include <asm/plat-s3c/regs-serial.h> |
| 34 | −#include <asm/arch/regs-lcd.h> | |
| 35 | −#include <asm/arch/regs-gpio.h> | |
| 36 | −#include <asm/arch/regs-clock.h> | |
| 34 | +#include <mach/regs-lcd.h> | |
| 35 | +#include <mach/regs-gpio.h> | |
| 36 | +#include <mach/regs-clock.h> | |
| 37 | 37 | |
| 38 | −#include <asm/arch/h1940.h> | |
| 39 | −#include <asm/arch/h1940-latch.h> | |
| 40 | −#include <asm/arch/fb.h> | |
| 38 | +#include <mach/h1940.h> | |
| 39 | +#include <mach/h1940-latch.h> | |
| 40 | +#include <mach/fb.h> | |
| 41 | 41 | #include <asm/plat-s3c24xx/udc.h> |
| 42 | 42 | |
| 43 | 43 | #include <asm/plat-s3c24xx/clock.h> |
| @@ -26,15 +26,15 @@ · 25 unmodified lines | ||
| 26 | 26 | #include <linux/serial_core.h> |
| 27 | 27 | #include <linux/timer.h> |
| 28 | 28 | |
| 29 | −#include <asm/hardware.h> | |
| 29 | +#include <mach/hardware.h> | |
| 30 | 30 | #include <asm/io.h> |
| 31 | 31 | #include <asm/irq.h> |
| 32 | 32 | #include <asm/mach-types.h> |
| 33 | 33 | |
| 34 | −#include <asm/arch/fb.h> | |
| 35 | −#include <asm/arch/leds-gpio.h> | |
| 36 | −#include <asm/arch/regs-gpio.h> | |
| 37 | −#include <asm/arch/regs-lcd.h> | |
| 34 | +#include <mach/fb.h> | |
| 35 | +#include <mach/leds-gpio.h> | |
| 36 | +#include <mach/regs-gpio.h> | |
| 37 | +#include <mach/regs-lcd.h> | |
| 38 | 38 | |
| 39 | 39 | #include <asm/mach/arch.h> |
| 40 | 40 | #include <asm/mach/irq.h> |
| @@ -22,15 +22,15 @@ · 21 unmodified lines | ||
| 22 | 22 | #include <asm/mach/map.h> |
| 23 | 23 | #include <asm/mach/irq.h> |
| 24 | 24 | |
| 25 | −#include <asm/arch/otom-map.h> | |
| 25 | +#include <mach/otom-map.h> | |
| 26 | 26 | |
| 27 | −#include <asm/hardware.h> | |
| 27 | +#include <mach/hardware.h> | |
| 28 | 28 | #include <asm/io.h> |
| 29 | 29 | #include <asm/irq.h> |
| 30 | 30 | #include <asm/mach-types.h> |
| 31 | 31 | |
| 32 | 32 | #include <asm/plat-s3c/regs-serial.h> |
| 33 | −#include <asm/arch/regs-gpio.h> | |
| 33 | +#include <mach/regs-gpio.h> | |
| 34 | 34 | |
| 35 | 35 | #include <asm/plat-s3c24xx/s3c2410.h> |
| 36 | 36 | #include <asm/plat-s3c24xx/clock.h> |
| @@ -42,19 +42,19 @@ · 41 unmodified lines | ||
| 42 | 42 | #include <asm/mach/map.h> |
| 43 | 43 | #include <asm/mach/irq.h> |
| 44 | 44 | |
| 45 | −#include <asm/hardware.h> | |
| 45 | +#include <mach/hardware.h> | |
| 46 | 46 | #include <asm/io.h> |
| 47 | 47 | #include <asm/irq.h> |
| 48 | 48 | #include <asm/mach-types.h> |
| 49 | 49 | |
| 50 | −#include <asm/arch/regs-gpio.h> | |
| 51 | −#include <asm/arch/leds-gpio.h> | |
| 50 | +#include <mach/regs-gpio.h> | |
| 51 | +#include <mach/leds-gpio.h> | |
| 52 | 52 | #include <asm/plat-s3c/regs-serial.h> |
| 53 | −#include <asm/arch/fb.h> | |
| 53 | +#include <mach/fb.h> | |
| 54 | 54 | #include <asm/plat-s3c/nand.h> |
| 55 | 55 | #include <asm/plat-s3c24xx/udc.h> |
| 56 | −#include <asm/arch/spi.h> | |
| 57 | −#include <asm/arch/spi-gpio.h> | |
| 56 | +#include <mach/spi.h> | |
| 57 | +#include <mach/spi-gpio.h> | |
| 58 | 58 | |
| 59 | 59 | #include <asm/plat-s3c24xx/common-smdk.h> |
| 60 | 60 | #include <asm/plat-s3c24xx/devs.h> |
| @@ -5,7 +5,6 @@ · 4 unmodified lines | ||
| 5 | 5 | * Copyright (C) 2004 by FS Forth-Systeme GmbH |
| 6 | 6 | * All rights reserved. |
| 7 | 7 | * |
| 8 | − * $Id: mach-smdk2410.c,v 1.1 2004/05/11 14:15:38 mpietrek Exp $ | |
| 9 | 8 | * @Author: Jonas Dietsche |
| 10 | 9 | * |
| 11 | 10 | * This program is free software; you can redistribute it and/or |
| @@ -42,7 +41,7 @@ · 30 unmodified lines | ||
| 42 | 41 | #include <asm/mach/map.h> |
| 43 | 42 | #include <asm/mach/irq.h> |
| 44 | 43 | |
| 45 | −#include <asm/hardware.h> | |
| 44 | +#include <mach/hardware.h> | |
| 46 | 45 | #include <asm/io.h> |
| 47 | 46 | #include <asm/irq.h> |
| 48 | 47 | #include <asm/mach-types.h> |
| @@ -39,7 +39,7 @@ · 38 unmodified lines | ||
| 39 | 39 | #include <asm/mach/irq.h> |
| 40 | 40 | #include <asm/mach/flash.h> |
| 41 | 41 | |
| 42 | −#include <asm/hardware.h> | |
| 42 | +#include <mach/hardware.h> | |
| 43 | 43 | #include <asm/io.h> |
| 44 | 44 | #include <asm/irq.h> |
| 45 | 45 | #include <asm/mach-types.h> |
| @@ -30,19 +30,19 @@ · 29 unmodified lines | ||
| 30 | 30 | #include <asm/mach/map.h> |
| 31 | 31 | #include <asm/mach/irq.h> |
| 32 | 32 | |
| 33 | −#include <asm/arch/bast-map.h> | |
| 34 | −#include <asm/arch/vr1000-map.h> | |
| 35 | −#include <asm/arch/vr1000-irq.h> | |
| 36 | −#include <asm/arch/vr1000-cpld.h> | |
| 33 | +#include <mach/bast-map.h> | |
| 34 | +#include <mach/vr1000-map.h> | |
| 35 | +#include <mach/vr1000-irq.h> | |
| 36 | +#include <mach/vr1000-cpld.h> | |
| 37 | 37 | |
| 38 | −#include <asm/hardware.h> | |
| 38 | +#include <mach/hardware.h> | |
| 39 | 39 | #include <asm/io.h> |
| 40 | 40 | #include <asm/irq.h> |
| 41 | 41 | #include <asm/mach-types.h> |
| 42 | 42 | |
| 43 | 43 | #include <asm/plat-s3c/regs-serial.h> |
| 44 | −#include <asm/arch/regs-gpio.h> | |
| 45 | −#include <asm/arch/leds-gpio.h> | |
| 44 | +#include <mach/regs-gpio.h> | |
| 45 | +#include <mach/leds-gpio.h> | |
| 46 | 46 | |
| 47 | 47 | #include <asm/plat-s3c24xx/clock.h> |
| 48 | 48 | #include <asm/plat-s3c24xx/devs.h> |
| @@ -344,7 +344,7 @@ static struct platform_device *vr1000_devices[] __initdata = { · 295 unmodified lines | ||
| 344 | 344 | &vr1000_led3, |
| 345 | 345 | }; |
| 346 | 346 | |
| 347 | −static struct clk *vr1000_clocks[] = { | |
| 347 | +static struct clk *vr1000_clocks[] __initdata = { | |
| 348 | 348 | &s3c24xx_dclk0, |
| 349 | 349 | &s3c24xx_dclk1, |
| 350 | 350 | &s3c24xx_clkout0, |
| @@ -26,9 +26,9 @@ · 25 unmodified lines | ||
| 26 | 26 | #include <asm/mach/map.h> |
| 27 | 27 | #include <asm/mach/irq.h> |
| 28 | 28 | |
| 29 | −#include <asm/arch/map.h> | |
| 30 | −#include <asm/arch/bast-map.h> | |
| 31 | −#include <asm/arch/bast-cpld.h> | |
| 29 | +#include <mach/map.h> | |
| 30 | +#include <mach/bast-map.h> | |
| 31 | +#include <mach/bast-cpld.h> | |
| 32 | 32 | |
| 33 | 33 | |
| 34 | 34 | static void simtec_nor_vpp(struct map_info *map, int vpp) |
| @@ -20,10 +20,10 @@ · 19 unmodified lines | ||
| 20 | 20 | |
| 21 | 21 | #include <linux/linkage.h> |
| 22 | 22 | #include <asm/assembler.h> |
| 23 | −#include <asm/hardware.h> | |
| 24 | −#include <asm/arch/map.h> | |
| 23 | +#include <mach/hardware.h> | |
| 24 | +#include <mach/map.h> | |
| 25 | 25 | |
| 26 | −#include <asm/arch/regs-gpio.h> | |
| 26 | +#include <mach/regs-gpio.h> | |
| 27 | 27 | |
| 28 | 28 | .text |
| 29 | 29 | .global h1940_pm_return |
| @@ -26,13 +26,13 @@ · 25 unmodified lines | ||
| 26 | 26 | #include <linux/time.h> |
| 27 | 27 | #include <linux/sysdev.h> |
| 28 | 28 | |
| 29 | −#include <asm/hardware.h> | |
| 29 | +#include <mach/hardware.h> | |
| 30 | 30 | #include <asm/io.h> |
| 31 | 31 | |
| 32 | 32 | #include <asm/mach-types.h> |
| 33 | 33 | |
| 34 | −#include <asm/arch/regs-gpio.h> | |
| 35 | −#include <asm/arch/h1940.h> | |
| 34 | +#include <mach/regs-gpio.h> | |
| 35 | +#include <mach/h1940.h> | |
| 36 | 36 | |
| 37 | 37 | #include <asm/plat-s3c24xx/cpu.h> |
| 38 | 38 | #include <asm/plat-s3c24xx/pm.h> |
| @@ -24,11 +24,11 @@ · 23 unmodified lines | ||
| 24 | 24 | #include <asm/mach/map.h> |
| 25 | 25 | #include <asm/mach/irq.h> |
| 26 | 26 | |
| 27 | −#include <asm/hardware.h> | |
| 27 | +#include <mach/hardware.h> | |
| 28 | 28 | #include <asm/io.h> |
| 29 | 29 | #include <asm/irq.h> |
| 30 | 30 | |
| 31 | −#include <asm/arch/regs-clock.h> | |
| 31 | +#include <mach/regs-clock.h> | |
| 32 | 32 | #include <asm/plat-s3c/regs-serial.h> |
| 33 | 33 | |
| 34 | 34 | #include <asm/plat-s3c24xx/s3c2410.h> |
| @@ -26,12 +26,12 @@ · 25 unmodified lines | ||
| 26 | 26 | |
| 27 | 27 | #include <linux/linkage.h> |
| 28 | 28 | #include <asm/assembler.h> |
| 29 | −#include <asm/hardware.h> | |
| 30 | −#include <asm/arch/map.h> | |
| 29 | +#include <mach/hardware.h> | |
| 30 | +#include <mach/map.h> | |
| 31 | 31 | |
| 32 | −#include <asm/arch/regs-gpio.h> | |
| 33 | −#include <asm/arch/regs-clock.h> | |
| 34 | −#include <asm/arch/regs-mem.h> | |
| 32 | +#include <mach/regs-gpio.h> | |
| 33 | +#include <mach/regs-clock.h> | |
| 34 | +#include <mach/regs-mem.h> | |
| 35 | 35 | #include <asm/plat-s3c/regs-serial.h> |
| 36 | 36 | |
| 37 | 37 | /* s3c2410_cpu_suspend |
| @@ -26,12 +26,12 @@ · 25 unmodified lines | ||
| 26 | 26 | #include <asm/mach/map.h> |
| 27 | 27 | #include <asm/mach/irq.h> |
| 28 | 28 | |
| 29 | −#include <asm/arch/bast-map.h> | |
| 30 | −#include <asm/arch/bast-irq.h> | |
| 31 | −#include <asm/arch/usb-control.h> | |
| 32 | −#include <asm/arch/regs-gpio.h> | |
| 29 | +#include <mach/bast-map.h> | |
| 30 | +#include <mach/bast-irq.h> | |
| 31 | +#include <mach/usb-control.h> | |
| 32 | +#include <mach/regs-gpio.h> | |
| 33 | 33 | |
| 34 | −#include <asm/hardware.h> | |
| 34 | +#include <mach/hardware.h> | |
| 35 | 35 | #include <asm/io.h> |
| 36 | 36 | #include <asm/irq.h> |
| 37 | 37 | |
| @@ -34,12 +34,12 @@ · 33 unmodified lines | ||
| 34 | 34 | |
| 35 | 35 | #include <asm/mach/map.h> |
| 36 | 36 | |
| 37 | −#include <asm/hardware.h> | |
| 37 | +#include <mach/hardware.h> | |
| 38 | 38 | #include <asm/io.h> |
| 39 | 39 | |
| 40 | 40 | #include <asm/plat-s3c/regs-serial.h> |
| 41 | −#include <asm/arch/regs-clock.h> | |
| 42 | −#include <asm/arch/regs-gpio.h> | |
| 41 | +#include <mach/regs-clock.h> | |
| 42 | +#include <mach/regs-gpio.h> | |
| 43 | 43 | |
| 44 | 44 | #include <asm/plat-s3c24xx/s3c2412.h> |
| 45 | 45 | #include <asm/plat-s3c24xx/clock.h> |
| @@ -18,18 +18,18 @@ · 17 unmodified lines | ||
| 18 | 18 | #include <linux/serial_core.h> |
| 19 | 19 | |
| 20 | 20 | #include <asm/dma.h> |
| 21 | −#include <asm/arch/dma.h> | |
| 21 | +#include <mach/dma.h> | |
| 22 | 22 | #include <asm/io.h> |
| 23 | 23 | |
| 24 | 24 | #include <asm/plat-s3c24xx/dma.h> |
| 25 | 25 | #include <asm/plat-s3c24xx/cpu.h> |
| 26 | 26 | |
| 27 | 27 | #include <asm/plat-s3c/regs-serial.h> |
| 28 | −#include <asm/arch/regs-gpio.h> | |
| 28 | +#include <mach/regs-gpio.h> | |
| 29 | 29 | #include <asm/plat-s3c/regs-ac97.h> |
| 30 | −#include <asm/arch/regs-mem.h> | |
| 31 | −#include <asm/arch/regs-lcd.h> | |
| 32 | −#include <asm/arch/regs-sdi.h> | |
| 30 | +#include <mach/regs-mem.h> | |
| 31 | +#include <mach/regs-lcd.h> | |
| 32 | +#include <mach/regs-sdi.h> | |
| 33 | 33 | #include <asm/plat-s3c24xx/regs-s3c2412-iis.h> |
| 34 | 34 | #include <asm/plat-s3c24xx/regs-iis.h> |
| 35 | 35 | #include <asm/plat-s3c24xx/regs-spi.h> |
| @@ -20,9 +20,9 @@ · 19 unmodified lines | ||
| 20 | 20 | #include <asm/mach/arch.h> |
| 21 | 21 | #include <asm/mach/map.h> |
| 22 | 22 | |
| 23 | −#include <asm/arch/regs-gpio.h> | |
| 23 | +#include <mach/regs-gpio.h> | |
| 24 | 24 | |
| 25 | −#include <asm/hardware.h> | |
| 25 | +#include <mach/hardware.h> | |
| 26 | 26 | |
| 27 | 27 | int s3c2412_gpio_set_sleepcfg(unsigned int pin, unsigned int state) |
| 28 | 28 | { |
| @@ -25,15 +25,15 @@ · 24 unmodified lines | ||
| 25 | 25 | #include <linux/ioport.h> |
| 26 | 26 | #include <linux/sysdev.h> |
| 27 | 27 | |
| 28 | −#include <asm/hardware.h> | |
| 28 | +#include <mach/hardware.h> | |
| 29 | 29 | #include <asm/irq.h> |
| 30 | 30 | #include <asm/io.h> |
| 31 | 31 | |
| 32 | 32 | #include <asm/mach/irq.h> |
| 33 | 33 | |
| 34 | −#include <asm/arch/regs-irq.h> | |
| 35 | −#include <asm/arch/regs-gpio.h> | |
| 36 | −#include <asm/arch/regs-power.h> | |
| 34 | +#include <mach/regs-irq.h> | |
| 35 | +#include <mach/regs-gpio.h> | |
| 36 | +#include <mach/regs-power.h> | |
| 37 | 37 | |
| 38 | 38 | #include <asm/plat-s3c24xx/cpu.h> |
| 39 | 39 | #include <asm/plat-s3c24xx/irq.h> |
| @@ -26,9 +26,6 @@ · 25 unmodified lines | ||
| 26 | 26 | |
| 27 | 27 | #include <linux/spi/spi.h> |
| 28 | 28 | |
| 29 | −#include <linux/mtd/mtd.h> | |
| 30 | −#include <linux/mtd/partitions.h> | |
| 31 | − | |
| 32 | 29 | #include <asm/mach/arch.h> |
| 33 | 30 | #include <asm/mach/map.h> |
| 34 | 31 | #include <asm/mach/irq.h> |
| @@ -37,12 +34,12 @@ · 2 unmodified lines | ||
| 37 | 34 | #include <asm/plat-s3c/nand.h> |
| 38 | 35 | #include <asm/plat-s3c/iic.h> |
| 39 | 36 | |
| 40 | −#include <asm/arch/regs-power.h> | |
| 41 | −#include <asm/arch/regs-gpio.h> | |
| 42 | −#include <asm/arch/regs-mem.h> | |
| 43 | −#include <asm/arch/regs-lcd.h> | |
| 44 | −#include <asm/arch/spi-gpio.h> | |
| 45 | −#include <asm/arch/fb.h> | |
| 37 | +#include <mach/regs-power.h> | |
| 38 | +#include <mach/regs-gpio.h> | |
| 39 | +#include <mach/regs-mem.h> | |
| 40 | +#include <mach/regs-lcd.h> | |
| 41 | +#include <mach/spi-gpio.h> | |
| 42 | +#include <mach/fb.h> | |
| 46 | 43 | |
| 47 | 44 | #include <asm/mach-types.h> |
| 48 | 45 | |
| @@ -24,7 +24,7 @@ · 23 unmodified lines | ||
| 24 | 24 | #include <asm/mach/map.h> |
| 25 | 25 | #include <asm/mach/irq.h> |
| 26 | 26 | |
| 27 | −#include <asm/hardware.h> | |
| 27 | +#include <mach/hardware.h> | |
| 28 | 28 | #include <asm/hardware/iomd.h> |
| 29 | 29 | #include <asm/setup.h> |
| 30 | 30 | #include <asm/io.h> |
| @@ -33,12 +33,12 @@ · 2 unmodified lines | ||
| 33 | 33 | |
| 34 | 34 | //#include <asm/debug-ll.h> |
| 35 | 35 | #include <asm/plat-s3c/regs-serial.h> |
| 36 | −#include <asm/arch/regs-gpio.h> | |
| 37 | −#include <asm/arch/regs-lcd.h> | |
| 36 | +#include <mach/regs-gpio.h> | |
| 37 | +#include <mach/regs-lcd.h> | |
| 38 | 38 | |
| 39 | −#include <asm/arch/idle.h> | |
| 39 | +#include <mach/idle.h> | |
| 40 | 40 | #include <asm/plat-s3c24xx/udc.h> |
| 41 | −#include <asm/arch/fb.h> | |
| 41 | +#include <mach/fb.h> | |
| 42 | 42 | |
| 43 | 43 | #include <asm/plat-s3c24xx/s3c2410.h> |
| 44 | 44 | #include <asm/plat-s3c24xx/s3c2412.h> |
| @@ -27,18 +27,18 @@ · 26 unmodified lines | ||
| 27 | 27 | #include <asm/mach/map.h> |
| 28 | 28 | #include <asm/mach/irq.h> |
| 29 | 29 | |
| 30 | −#include <asm/hardware.h> | |
| 30 | +#include <mach/hardware.h> | |
| 31 | 31 | #include <asm/setup.h> |
| 32 | 32 | #include <asm/io.h> |
| 33 | 33 | #include <asm/irq.h> |
| 34 | 34 | #include <asm/mach-types.h> |
| 35 | 35 | |
| 36 | 36 | #include <asm/plat-s3c/regs-serial.h> |
| 37 | −#include <asm/arch/regs-gpio.h> | |
| 38 | −#include <asm/arch/regs-lcd.h> | |
| 37 | +#include <mach/regs-gpio.h> | |
| 38 | +#include <mach/regs-lcd.h> | |
| 39 | 39 | |
| 40 | −#include <asm/arch/idle.h> | |
| 41 | −#include <asm/arch/fb.h> | |
| 40 | +#include <mach/idle.h> | |
| 41 | +#include <mach/fb.h> | |
| 42 | 42 | |
| 43 | 43 | #include <asm/plat-s3c/nand.h> |
| 44 | 44 | |
| @@ -19,14 +19,14 @@ · 18 unmodified lines | ||
| 19 | 19 | #include <linux/sysdev.h> |
| 20 | 20 | #include <linux/platform_device.h> |
| 21 | 21 | |
| 22 | −#include <asm/hardware.h> | |
| 22 | +#include <mach/hardware.h> | |
| 23 | 23 | #include <asm/io.h> |
| 24 | 24 | #include <asm/irq.h> |
| 25 | 25 | |
| 26 | −#include <asm/arch/regs-power.h> | |
| 27 | −#include <asm/arch/regs-gpioj.h> | |
| 28 | −#include <asm/arch/regs-gpio.h> | |
| 29 | −#include <asm/arch/regs-dsc.h> | |
| 26 | +#include <mach/regs-power.h> | |
| 27 | +#include <mach/regs-gpioj.h> | |
| 28 | +#include <mach/regs-gpio.h> | |
| 29 | +#include <mach/regs-dsc.h> | |
| 30 | 30 | |
| 31 | 31 | #include <asm/plat-s3c24xx/cpu.h> |
| 32 | 32 | #include <asm/plat-s3c24xx/pm.h> |
| @@ -25,22 +25,22 @@ · 24 unmodified lines | ||
| 25 | 25 | #include <asm/mach/map.h> |
| 26 | 26 | #include <asm/mach/irq.h> |
| 27 | 27 | |
| 28 | −#include <asm/hardware.h> | |
| 28 | +#include <mach/hardware.h> | |
| 29 | 29 | #include <asm/proc-fns.h> |
| 30 | 30 | #include <asm/io.h> |
| 31 | 31 | #include <asm/irq.h> |
| 32 | 32 | |
| 33 | −#include <asm/arch/reset.h> | |
| 34 | −#include <asm/arch/idle.h> | |
| 33 | +#include <mach/reset.h> | |
| 34 | +#include <mach/idle.h> | |
| 35 | 35 | |
| 36 | −#include <asm/arch/regs-clock.h> | |
| 36 | +#include <mach/regs-clock.h> | |
| 37 | 37 | #include <asm/plat-s3c/regs-serial.h> |
| 38 | −#include <asm/arch/regs-power.h> | |
| 39 | −#include <asm/arch/regs-gpio.h> | |
| 40 | −#include <asm/arch/regs-gpioj.h> | |
| 41 | −#include <asm/arch/regs-dsc.h> | |
| 38 | +#include <mach/regs-power.h> | |
| 39 | +#include <mach/regs-gpio.h> | |
| 40 | +#include <mach/regs-gpioj.h> | |
| 41 | +#include <mach/regs-dsc.h> | |
| 42 | 42 | #include <asm/plat-s3c24xx/regs-spi.h> |
| 43 | −#include <asm/arch/regs-s3c2412.h> | |
| 43 | +#include <mach/regs-s3c2412.h> | |
| 44 | 44 | |
| 45 | 45 | #include <asm/plat-s3c24xx/s3c2412.h> |
| 46 | 46 | #include <asm/plat-s3c24xx/cpu.h> |
| @@ -22,10 +22,10 @@ · 21 unmodified lines | ||
| 22 | 22 | |
| 23 | 23 | #include <linux/linkage.h> |
| 24 | 24 | #include <asm/assembler.h> |
| 25 | −#include <asm/hardware.h> | |
| 26 | −#include <asm/arch/map.h> | |
| 25 | +#include <mach/hardware.h> | |
| 26 | +#include <mach/map.h> | |
| 27 | 27 | |
| 28 | −#include <asm/arch/regs-irq.h> | |
| 28 | +#include <mach/regs-irq.h> | |
| 29 | 29 | |
| 30 | 30 | .text |
| 31 | 31 | |
| @@ -34,12 +34,12 @@ · 33 unmodified lines | ||
| 34 | 34 | #include <linux/mutex.h> |
| 35 | 35 | #include <linux/clk.h> |
| 36 | 36 | |
| 37 | −#include <asm/hardware.h> | |
| 37 | +#include <mach/hardware.h> | |
| 38 | 38 | #include <asm/atomic.h> |
| 39 | 39 | #include <asm/irq.h> |
| 40 | 40 | #include <asm/io.h> |
| 41 | 41 | |
| 42 | −#include <asm/arch/regs-clock.h> | |
| 42 | +#include <mach/regs-clock.h> | |
| 43 | 43 | |
| 44 | 44 | #include <asm/plat-s3c24xx/clock.h> |
| 45 | 45 | #include <asm/plat-s3c24xx/cpu.h> |
| @@ -18,17 +18,17 @@ · 17 unmodified lines | ||
| 18 | 18 | #include <linux/serial_core.h> |
| 19 | 19 | |
| 20 | 20 | #include <asm/dma.h> |
| 21 | −#include <asm/arch/dma.h> | |
| 21 | +#include <mach/dma.h> | |
| 22 | 22 | |
| 23 | 23 | #include <asm/plat-s3c24xx/dma.h> |
| 24 | 24 | #include <asm/plat-s3c24xx/cpu.h> |
| 25 | 25 | |
| 26 | 26 | #include <asm/plat-s3c/regs-serial.h> |
| 27 | −#include <asm/arch/regs-gpio.h> | |
| 27 | +#include <mach/regs-gpio.h> | |
| 28 | 28 | #include <asm/plat-s3c/regs-ac97.h> |
| 29 | −#include <asm/arch/regs-mem.h> | |
| 30 | −#include <asm/arch/regs-lcd.h> | |
| 31 | −#include <asm/arch/regs-sdi.h> | |
| 29 | +#include <mach/regs-mem.h> | |
| 30 | +#include <mach/regs-lcd.h> | |
| 31 | +#include <mach/regs-sdi.h> | |
| 32 | 32 | #include <asm/plat-s3c24xx/regs-iis.h> |
| 33 | 33 | #include <asm/plat-s3c24xx/regs-spi.h> |
| 34 | 34 | |
| @@ -20,12 +20,12 @@ · 19 unmodified lines | ||
| 20 | 20 | #include <asm/mach/map.h> |
| 21 | 21 | #include <asm/mach/irq.h> |
| 22 | 22 | |
| 23 | −#include <asm/hardware.h> | |
| 23 | +#include <mach/hardware.h> | |
| 24 | 24 | #include <asm/io.h> |
| 25 | 25 | #include <asm/irq.h> |
| 26 | 26 | |
| 27 | −#include <asm/arch/regs-gpio.h> | |
| 28 | −#include <asm/arch/regs-dsc.h> | |
| 27 | +#include <mach/regs-gpio.h> | |
| 28 | +#include <mach/regs-dsc.h> | |
| 29 | 29 | |
| 30 | 30 | #include <asm/plat-s3c24xx/cpu.h> |
| 31 | 31 | #include <asm/plat-s3c24xx/s3c2440.h> |
| @@ -25,14 +25,14 @@ · 24 unmodified lines | ||
| 25 | 25 | #include <linux/ioport.h> |
| 26 | 26 | #include <linux/sysdev.h> |
| 27 | 27 | |
| 28 | −#include <asm/hardware.h> | |
| 28 | +#include <mach/hardware.h> | |
| 29 | 29 | #include <asm/irq.h> |
| 30 | 30 | #include <asm/io.h> |
| 31 | 31 | |
| 32 | 32 | #include <asm/mach/irq.h> |
| 33 | 33 | |
| 34 | −#include <asm/arch/regs-irq.h> | |
| 35 | −#include <asm/arch/regs-gpio.h> | |
| 34 | +#include <mach/regs-irq.h> | |
| 35 | +#include <mach/regs-gpio.h> | |
| 36 | 36 | |
| 37 | 37 | #include <asm/plat-s3c24xx/cpu.h> |
| 38 | 38 | #include <asm/plat-s3c24xx/pm.h> |
| @@ -27,19 +27,19 @@ · 26 unmodified lines | ||
| 27 | 27 | #include <asm/mach/map.h> |
| 28 | 28 | #include <asm/mach/irq.h> |
| 29 | 29 | |
| 30 | −#include <asm/arch/anubis-map.h> | |
| 31 | −#include <asm/arch/anubis-irq.h> | |
| 32 | −#include <asm/arch/anubis-cpld.h> | |
| 30 | +#include <mach/anubis-map.h> | |
| 31 | +#include <mach/anubis-irq.h> | |
| 32 | +#include <mach/anubis-cpld.h> | |
| 33 | 33 | |
| 34 | −#include <asm/hardware.h> | |
| 34 | +#include <mach/hardware.h> | |
| 35 | 35 | #include <asm/io.h> |
| 36 | 36 | #include <asm/irq.h> |
| 37 | 37 | #include <asm/mach-types.h> |
| 38 | 38 | |
| 39 | 39 | #include <asm/plat-s3c/regs-serial.h> |
| 40 | −#include <asm/arch/regs-gpio.h> | |
| 41 | −#include <asm/arch/regs-mem.h> | |
| 42 | −#include <asm/arch/regs-lcd.h> | |
| 40 | +#include <mach/regs-gpio.h> | |
| 41 | +#include <mach/regs-mem.h> | |
| 42 | +#include <mach/regs-lcd.h> | |
| 43 | 43 | #include <asm/plat-s3c/nand.h> |
| 44 | 44 | |
| 45 | 45 | #include <linux/mtd/mtd.h> |
| @@ -414,7 +414,7 @@ static struct platform_device *anubis_devices[] __initdata = { · 368 unmodified lines | ||
| 414 | 414 | &anubis_device_sm501, |
| 415 | 415 | }; |
| 416 | 416 | |
| 417 | −static struct clk *anubis_clocks[] = { | |
| 417 | +static struct clk *anubis_clocks[] __initdata = { | |
| 418 | 418 | &s3c24xx_dclk0, |
| 419 | 419 | &s3c24xx_dclk1, |
| 420 | 420 | &s3c24xx_clkout0, |
| @@ -27,14 +27,14 @@ · 26 unmodified lines | ||
| 27 | 27 | #include <asm/mach/map.h> |
| 28 | 28 | #include <asm/mach/irq.h> |
| 29 | 29 | |
| 30 | −#include <asm/hardware.h> | |
| 30 | +#include <mach/hardware.h> | |
| 31 | 31 | #include <asm/irq.h> |
| 32 | 32 | #include <asm/mach-types.h> |
| 33 | 33 | |
| 34 | 34 | #include <asm/plat-s3c/regs-serial.h> |
| 35 | −#include <asm/arch/regs-gpio.h> | |
| 36 | −#include <asm/arch/regs-mem.h> | |
| 37 | −#include <asm/arch/regs-lcd.h> | |
| 35 | +#include <mach/regs-gpio.h> | |
| 36 | +#include <mach/regs-mem.h> | |
| 37 | +#include <mach/regs-lcd.h> | |
| 38 | 38 | #include <asm/plat-s3c/nand.h> |
| 39 | 39 | |
| 40 | 40 | #include <linux/mtd/mtd.h> |
| @@ -29,13 +29,13 @@ · 28 unmodified lines | ||
| 29 | 29 | #include <asm/mach/irq.h> |
| 30 | 30 | |
| 31 | 31 | #include <asm/setup.h> |
| 32 | −#include <asm/hardware.h> | |
| 32 | +#include <mach/hardware.h> | |
| 33 | 33 | #include <asm/io.h> |
| 34 | 34 | #include <asm/irq.h> |
| 35 | 35 | #include <asm/mach-types.h> |
| 36 | 36 | |
| 37 | 37 | //#include <asm/debug-ll.h> |
| 38 | −#include <asm/arch/regs-gpio.h> | |
| 38 | +#include <mach/regs-gpio.h> | |
| 39 | 39 | #include <asm/plat-s3c/regs-serial.h> |
| 40 | 40 | |
| 41 | 41 | #include <asm/plat-s3c24xx/s3c2410.h> |
| @@ -25,18 +25,18 @@ · 24 unmodified lines | ||
| 25 | 25 | #include <asm/mach/map.h> |
| 26 | 26 | #include <asm/mach/irq.h> |
| 27 | 27 | |
| 28 | −#include <asm/arch/osiris-map.h> | |
| 29 | −#include <asm/arch/osiris-cpld.h> | |
| 28 | +#include <mach/osiris-map.h> | |
| 29 | +#include <mach/osiris-cpld.h> | |
| 30 | 30 | |
| 31 | −#include <asm/hardware.h> | |
| 31 | +#include <mach/hardware.h> | |
| 32 | 32 | #include <asm/io.h> |
| 33 | 33 | #include <asm/irq.h> |
| 34 | 34 | #include <asm/mach-types.h> |
| 35 | 35 | |
| 36 | 36 | #include <asm/plat-s3c/regs-serial.h> |
| 37 | −#include <asm/arch/regs-gpio.h> | |
| 38 | −#include <asm/arch/regs-mem.h> | |
| 39 | −#include <asm/arch/regs-lcd.h> | |
| 37 | +#include <mach/regs-gpio.h> | |
| 38 | +#include <mach/regs-mem.h> | |
| 39 | +#include <mach/regs-lcd.h> | |
| 40 | 40 | #include <asm/plat-s3c/nand.h> |
| 41 | 41 | |
| 42 | 42 | #include <linux/mtd/mtd.h> |
| @@ -341,7 +341,7 @@ static struct platform_device *osiris_devices[] __initdata = { · 298 unmodified lines | ||
| 341 | 341 | &osiris_pcmcia, |
| 342 | 342 | }; |
| 343 | 343 | |
| 344 | −static struct clk *osiris_clocks[] = { | |
| 344 | +static struct clk *osiris_clocks[] __initdata = { | |
| 345 | 345 | &s3c24xx_dclk0, |
| 346 | 346 | &s3c24xx_dclk1, |
| 347 | 347 | &s3c24xx_clkout0, |
| @@ -33,18 +33,18 @@ · 32 unmodified lines | ||
| 33 | 33 | #include <asm/mach/map.h> |
| 34 | 34 | #include <asm/mach/irq.h> |
| 35 | 35 | |
| 36 | −#include <asm/hardware.h> | |
| 36 | +#include <mach/hardware.h> | |
| 37 | 37 | #include <asm/io.h> |
| 38 | 38 | #include <asm/irq.h> |
| 39 | 39 | #include <asm/mach-types.h> |
| 40 | 40 | |
| 41 | 41 | #include <asm/plat-s3c/regs-serial.h> |
| 42 | −#include <asm/arch/regs-gpio.h> | |
| 43 | −#include <asm/arch/regs-lcd.h> | |
| 42 | +#include <mach/regs-gpio.h> | |
| 43 | +#include <mach/regs-lcd.h> | |
| 44 | 44 | |
| 45 | −#include <asm/arch/h1940.h> | |
| 45 | +#include <mach/h1940.h> | |
| 46 | 46 | #include <asm/plat-s3c/nand.h> |
| 47 | −#include <asm/arch/fb.h> | |
| 47 | +#include <mach/fb.h> | |
| 48 | 48 | |
| 49 | 49 | #include <asm/plat-s3c24xx/clock.h> |
| 50 | 50 | #include <asm/plat-s3c24xx/devs.h> |
| @@ -26,17 +26,17 @@ · 25 unmodified lines | ||
| 26 | 26 | #include <asm/mach/map.h> |
| 27 | 27 | #include <asm/mach/irq.h> |
| 28 | 28 | |
| 29 | −#include <asm/hardware.h> | |
| 29 | +#include <mach/hardware.h> | |
| 30 | 30 | #include <asm/io.h> |
| 31 | 31 | #include <asm/irq.h> |
| 32 | 32 | #include <asm/mach-types.h> |
| 33 | 33 | |
| 34 | 34 | #include <asm/plat-s3c/regs-serial.h> |
| 35 | −#include <asm/arch/regs-gpio.h> | |
| 36 | −#include <asm/arch/regs-lcd.h> | |
| 35 | +#include <mach/regs-gpio.h> | |
| 36 | +#include <mach/regs-lcd.h> | |
| 37 | 37 | |
| 38 | −#include <asm/arch/idle.h> | |
| 39 | −#include <asm/arch/fb.h> | |
| 38 | +#include <mach/idle.h> | |
| 39 | +#include <mach/fb.h> | |
| 40 | 40 | |
| 41 | 41 | #include <asm/plat-s3c24xx/s3c2410.h> |
| 42 | 42 | #include <asm/plat-s3c24xx/s3c2440.h> |
| @@ -25,7 +25,7 @@ · 24 unmodified lines | ||
| 25 | 25 | #include <asm/mach/map.h> |
| 26 | 26 | #include <asm/mach/irq.h> |
| 27 | 27 | |
| 28 | −#include <asm/hardware.h> | |
| 28 | +#include <mach/hardware.h> | |
| 29 | 29 | #include <asm/io.h> |
| 30 | 30 | #include <asm/irq.h> |
| 31 | 31 | |
| @@ -34,12 +34,12 @@ · 33 unmodified lines | ||
| 34 | 34 | #include <linux/mutex.h> |
| 35 | 35 | #include <linux/clk.h> |
| 36 | 36 | |
| 37 | −#include <asm/hardware.h> | |
| 37 | +#include <mach/hardware.h> | |
| 38 | 38 | #include <asm/atomic.h> |
| 39 | 39 | #include <asm/irq.h> |
| 40 | 40 | #include <asm/io.h> |
| 41 | 41 | |
| 42 | −#include <asm/arch/regs-clock.h> | |
| 42 | +#include <mach/regs-clock.h> | |
| 43 | 43 | |
| 44 | 44 | #include <asm/plat-s3c24xx/clock.h> |
| 45 | 45 | #include <asm/plat-s3c24xx/cpu.h> |
| @@ -34,10 +34,10 @@ · 33 unmodified lines | ||
| 34 | 34 | |
| 35 | 35 | #include <asm/mach/map.h> |
| 36 | 36 | |
| 37 | −#include <asm/hardware.h> | |
| 37 | +#include <mach/hardware.h> | |
| 38 | 38 | #include <asm/io.h> |
| 39 | 39 | |
| 40 | −#include <asm/arch/regs-s3c2443-clock.h> | |
| 40 | +#include <mach/regs-s3c2443-clock.h> | |
| 41 | 41 | |
| 42 | 42 | #include <asm/plat-s3c24xx/s3c2443.h> |
| 43 | 43 | #include <asm/plat-s3c24xx/clock.h> |
| @@ -18,18 +18,18 @@ · 17 unmodified lines | ||
| 18 | 18 | #include <linux/serial_core.h> |
| 19 | 19 | |
| 20 | 20 | #include <asm/dma.h> |
| 21 | −#include <asm/arch/dma.h> | |
| 21 | +#include <mach/dma.h> | |
| 22 | 22 | #include <asm/io.h> |
| 23 | 23 | |
| 24 | 24 | #include <asm/plat-s3c24xx/dma.h> |
| 25 | 25 | #include <asm/plat-s3c24xx/cpu.h> |
| 26 | 26 | |
| 27 | 27 | #include <asm/plat-s3c/regs-serial.h> |
| 28 | −#include <asm/arch/regs-gpio.h> | |
| 28 | +#include <mach/regs-gpio.h> | |
| 29 | 29 | #include <asm/plat-s3c/regs-ac97.h> |
| 30 | −#include <asm/arch/regs-mem.h> | |
| 31 | −#include <asm/arch/regs-lcd.h> | |
| 32 | −#include <asm/arch/regs-sdi.h> | |
| 30 | +#include <mach/regs-mem.h> | |
| 31 | +#include <mach/regs-lcd.h> | |
| 32 | +#include <mach/regs-sdi.h> | |
| 33 | 33 | #include <asm/plat-s3c24xx/regs-iis.h> |
| 34 | 34 | #include <asm/plat-s3c24xx/regs-spi.h> |
| 35 | 35 | |
| @@ -25,14 +25,14 @@ · 24 unmodified lines | ||
| 25 | 25 | #include <linux/ioport.h> |
| 26 | 26 | #include <linux/sysdev.h> |
| 27 | 27 | |
| 28 | −#include <asm/hardware.h> | |
| 28 | +#include <mach/hardware.h> | |
| 29 | 29 | #include <asm/irq.h> |
| 30 | 30 | #include <asm/io.h> |
| 31 | 31 | |
| 32 | 32 | #include <asm/mach/irq.h> |
| 33 | 33 | |
| 34 | −#include <asm/arch/regs-irq.h> | |
| 35 | −#include <asm/arch/regs-gpio.h> | |
| 34 | +#include <mach/regs-irq.h> | |
| 35 | +#include <mach/regs-gpio.h> | |
| 36 | 36 | |
| 37 | 37 | #include <asm/plat-s3c24xx/cpu.h> |
| 38 | 38 | #include <asm/plat-s3c24xx/pm.h> |
| @@ -26,17 +26,17 @@ · 25 unmodified lines | ||
| 26 | 26 | #include <asm/mach/map.h> |
| 27 | 27 | #include <asm/mach/irq.h> |
| 28 | 28 | |
| 29 | −#include <asm/hardware.h> | |
| 29 | +#include <mach/hardware.h> | |
| 30 | 30 | #include <asm/io.h> |
| 31 | 31 | #include <asm/irq.h> |
| 32 | 32 | #include <asm/mach-types.h> |
| 33 | 33 | |
| 34 | 34 | #include <asm/plat-s3c/regs-serial.h> |
| 35 | −#include <asm/arch/regs-gpio.h> | |
| 36 | −#include <asm/arch/regs-lcd.h> | |
| 35 | +#include <mach/regs-gpio.h> | |
| 36 | +#include <mach/regs-lcd.h> | |
| 37 | 37 | |
| 38 | −#include <asm/arch/idle.h> | |
| 39 | −#include <asm/arch/fb.h> | |
| 38 | +#include <mach/idle.h> | |
| 39 | +#include <mach/fb.h> | |
| 40 | 40 | |
| 41 | 41 | #include <asm/plat-s3c24xx/s3c2410.h> |
| 42 | 42 | #include <asm/plat-s3c24xx/s3c2440.h> |
| @@ -25,12 +25,12 @@ · 24 unmodified lines | ||
| 25 | 25 | #include <asm/mach/map.h> |
| 26 | 26 | #include <asm/mach/irq.h> |
| 27 | 27 | |
| 28 | −#include <asm/hardware.h> | |
| 28 | +#include <mach/hardware.h> | |
| 29 | 29 | #include <asm/io.h> |
| 30 | 30 | #include <asm/irq.h> |
| 31 | 31 | |
| 32 | −#include <asm/arch/regs-s3c2443-clock.h> | |
| 33 | −#include <asm/arch/reset.h> | |
| 32 | +#include <mach/regs-s3c2443-clock.h> | |
| 33 | +#include <mach/reset.h> | |
| 34 | 34 | |
| 35 | 35 | #include <asm/plat-s3c24xx/s3c2443.h> |
| 36 | 36 | #include <asm/plat-s3c24xx/devs.h> |
| @@ -46,9 +46,6 @@ led-$(CONFIG_SA1100_SIMPAD) += leds-simpad.o · 45 unmodified lines | ||
| 46 | 46 | # LEDs support |
| 47 | 47 | obj-$(CONFIG_LEDS) += $(led-y) |
| 48 | 48 | |
| 49 | −# SA1110 USB client support | |
| 50 | −#obj-$(CONFIG_SA1100_USB) += usb/ | |
| 51 | − | |
| 52 | 49 | # Miscelaneous functions |
| 53 | 50 | obj-$(CONFIG_PM) += pm.o sleep.o |
| 54 | 51 | obj-$(CONFIG_SA1100_SSP) += ssp.o |
| @@ -20,7 +20,7 @@ · 19 unmodified lines | ||
| 20 | 20 | #include <linux/delay.h> |
| 21 | 21 | #include <linux/mm.h> |
| 22 | 22 | |
| 23 | −#include <asm/hardware.h> | |
| 23 | +#include <mach/hardware.h> | |
| 24 | 24 | #include <asm/mach-types.h> |
| 25 | 25 | #include <asm/irq.h> |
| 26 | 26 | #include <asm/setup.h> |
| @@ -34,8 +34,8 @@ · 7 unmodified lines | ||
| 34 | 34 | #include <asm/mach/irda.h> |
| 35 | 35 | #include <asm/mach/map.h> |
| 36 | 36 | #include <asm/mach/serial_sa1100.h> |
| 37 | −#include <asm/arch/assabet.h> | |
| 38 | −#include <asm/arch/mcp.h> | |
| 37 | +#include <mach/assabet.h> | |
| 38 | +#include <mach/mcp.h> | |
| 39 | 39 | |
| 40 | 40 | #include "generic.h" |
| 41 | 41 | |
| @@ -23,10 +23,10 @@ · 22 unmodified lines | ||
| 23 | 23 | #include <linux/mtd/partitions.h> |
| 24 | 24 | #include <linux/errno.h> |
| 25 | 25 | |
| 26 | −#include <asm/hardware.h> | |
| 26 | +#include <mach/hardware.h> | |
| 27 | 27 | #include <asm/mach-types.h> |
| 28 | 28 | #include <asm/setup.h> |
| 29 | −#include <asm/arch/irqs.h> | |
| 29 | +#include <mach/irqs.h> | |
| 30 | 30 | |
| 31 | 31 | #include <asm/mach/arch.h> |
| 32 | 32 | #include <asm/mach/flash.h> |
| @@ -34,7 +34,7 @@ · 1 unmodified line | ||
| 34 | 34 | #include <asm/hardware/sa1111.h> |
| 35 | 35 | #include <asm/mach/serial_sa1100.h> |
| 36 | 36 | |
| 37 | −#include <asm/arch/badge4.h> | |
| 37 | +#include <mach/badge4.h> | |
| 38 | 38 | |
| 39 | 39 | #include "generic.h" |
| 40 | 40 | |
| @@ -19,7 +19,7 @@ · 18 unmodified lines | ||
| 19 | 19 | #include <linux/mtd/partitions.h> |
| 20 | 20 | |
| 21 | 21 | #include <asm/irq.h> |
| 22 | −#include <asm/hardware.h> | |
| 22 | +#include <mach/hardware.h> | |
| 23 | 23 | #include <asm/setup.h> |
| 24 | 24 | |
| 25 | 25 | #include <asm/mach-types.h> |
| @@ -28,8 +28,8 @@ · 2 unmodified lines | ||
| 28 | 28 | #include <asm/mach/map.h> |
| 29 | 29 | #include <asm/mach/serial_sa1100.h> |
| 30 | 30 | |
| 31 | −#include <asm/arch/cerf.h> | |
| 32 | −#include <asm/arch/mcp.h> | |
| 31 | +#include <mach/cerf.h> | |
| 32 | +#include <mach/mcp.h> | |
| 33 | 33 | #include "generic.h" |
| 34 | 34 | |
| 35 | 35 | static struct resource cerfuart2_resources[] = { |
| @@ -11,7 +11,7 @@ · 10 unmodified lines | ||
| 11 | 11 | #include <linux/spinlock.h> |
| 12 | 12 | #include <linux/mutex.h> |
| 13 | 13 | |
| 14 | −#include <asm/hardware.h> | |
| 14 | +#include <mach/hardware.h> | |
| 15 | 15 | |
| 16 | 16 | /* |
| 17 | 17 | * Very simple clock implementation - we only have one clock to |
| @@ -26,11 +26,11 @@ · 25 unmodified lines | ||
| 26 | 26 | #include <linux/mtd/partitions.h> |
| 27 | 27 | #include <linux/timer.h> |
| 28 | 28 | |
| 29 | −#include <asm/hardware.h> | |
| 29 | +#include <mach/hardware.h> | |
| 30 | 30 | #include <asm/mach-types.h> |
| 31 | 31 | #include <asm/irq.h> |
| 32 | 32 | #include <asm/setup.h> |
| 33 | −#include <asm/arch/collie.h> | |
| 33 | +#include <mach/collie.h> | |
| 34 | 34 | |
| 35 | 35 | #include <asm/mach/arch.h> |
| 36 | 36 | #include <asm/mach/flash.h> |
| @@ -40,7 +40,7 @@ · 3 unmodified lines | ||
| 40 | 40 | #include <asm/hardware/scoop.h> |
| 41 | 41 | #include <asm/mach/sharpsl_param.h> |
| 42 | 42 | #include <asm/hardware/locomo.h> |
| 43 | −#include <asm/arch/mcp.h> | |
| 43 | +#include <mach/mcp.h> | |
| 44 | 44 | |
| 45 | 45 | #include "generic.h" |
| 46 | 46 | |
| @@ -24,11 +24,10 @@ · 23 unmodified lines | ||
| 24 | 24 | #include <linux/platform_device.h> |
| 25 | 25 | |
| 26 | 26 | #include <asm/irq.h> |
| 27 | −#include <asm/mach-types.h> | |
| 28 | −#include <asm/hardware.h> | |
| 27 | +#include <mach/hardware.h> | |
| 29 | 28 | #include <asm/hardware/scoop.h> |
| 30 | 29 | #include <asm/dma.h> |
| 31 | −#include <asm/arch/collie.h> | |
| 30 | +#include <mach/collie.h> | |
| 32 | 31 | #include <asm/mach/sharpsl_param.h> |
| 33 | 32 | #include <asm/hardware/sharpsl_pm.h> |
| 34 | 33 | |
| @@ -88,7 +88,7 @@ · 87 unmodified lines | ||
| 88 | 88 | #include <linux/init.h> |
| 89 | 89 | #include <linux/cpufreq.h> |
| 90 | 90 | |
| 91 | −#include <asm/hardware.h> | |
| 91 | +#include <mach/hardware.h> | |
| 92 | 92 | |
| 93 | 93 | #include "generic.h" |
| 94 | 94 | |
| @@ -3,8 +3,6 @@ · 2 unmodified lines | ||
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 2001 Russell King |
| 5 | 5 | * |
| 6 | − * $Id: cpu-sa1110.c,v 1.9 2002/07/06 16:53:18 rmk Exp $ | |
| 7 | − * | |
| 8 | 6 | * This program is free software; you can redistribute it and/or modify |
| 9 | 7 | * it under the terms of the GNU General Public License version 2 as |
| 10 | 8 | * published by the Free Software Foundation. |
| @@ -26,7 +24,7 @@ · 15 unmodified lines | ||
| 26 | 24 | #include <linux/delay.h> |
| 27 | 25 | #include <linux/init.h> |
| 28 | 26 | |
| 29 | −#include <asm/hardware.h> | |
| 27 | +#include <mach/hardware.h> | |
| 30 | 28 | #include <asm/mach-types.h> |
| 31 | 29 | #include <asm/io.h> |
| 32 | 30 | #include <asm/system.h> |
| @@ -18,7 +18,7 @@ · 17 unmodified lines | ||
| 18 | 18 | |
| 19 | 19 | #include <asm/system.h> |
| 20 | 20 | #include <asm/irq.h> |
| 21 | −#include <asm/hardware.h> | |
| 21 | +#include <mach/hardware.h> | |
| 22 | 22 | #include <asm/dma.h> |
| 23 | 23 | |
| 24 | 24 | |
| @@ -76,7 +76,7 @@ static irqreturn_t dma_irq_handler(int irq, void *dev_id) · 51 unmodified lines | ||
| 76 | 76 | * address of the hardware registers for that channel as the channel |
| 77 | 77 | * identifier. This identifier is written to the location pointed by |
| 78 | 78 | * @dma_regs. The list of possible values for @device are listed into |
| 79 | − * linux/include/asm-arm/arch-sa1100/dma.h as a dma_device_t enum. | |
| 79 | + * arch/arm/mach-sa1100/include/mach/dma.h as a dma_device_t enum. | |
| 80 | 80 | * |
| 81 | 81 | * Note that reading from a port and writing to the same port are |
| 82 | 82 | * actually considered as two different streams requiring separate |
| @@ -21,7 +21,7 @@ · 20 unmodified lines | ||
| 21 | 21 | |
| 22 | 22 | #include <asm/div64.h> |
| 23 | 23 | #include <asm/cnt32_to_63.h> |
| 24 | −#include <asm/hardware.h> | |
| 24 | +#include <mach/hardware.h> | |
| 25 | 25 | #include <asm/system.h> |
| 26 | 26 | #include <asm/pgtable.h> |
| 27 | 27 | #include <asm/mach/map.h> |
| @@ -31,6 +31,9 @@ · 3 unmodified lines | ||
| 31 | 31 | |
| 32 | 32 | #include "generic.h" |
| 33 | 33 | |
| 34 | +unsigned int reset_status; | |
| 35 | +EXPORT_SYMBOL(reset_status); | |
| 36 | + | |
| 34 | 37 | #define NR_FREQS 16 |
| 35 | 38 | |
| 36 | 39 | /* |
| @@ -12,7 +12,7 @@ · 11 unmodified lines | ||
| 12 | 12 | #include <linux/module.h> |
| 13 | 13 | |
| 14 | 14 | #include <asm/gpio.h> |
| 15 | −#include <asm/hardware.h> | |
| 15 | +#include <mach/hardware.h> | |
| 16 | 16 | #include "generic.h" |
| 17 | 17 | |
| 18 | 18 | static int sa1100_gpio_get(struct gpio_chip *chip, unsigned offset) |
| @@ -30,7 +30,7 @@ · 29 unmodified lines | ||
| 30 | 30 | #include <linux/serial_core.h> |
| 31 | 31 | |
| 32 | 32 | #include <asm/irq.h> |
| 33 | −#include <asm/hardware.h> | |
| 33 | +#include <mach/hardware.h> | |
| 34 | 34 | #include <asm/mach-types.h> |
| 35 | 35 | #include <asm/setup.h> |
| 36 | 36 | |
| @@ -41,14 +41,14 @@ · 4 unmodified lines | ||
| 41 | 41 | #include <asm/mach/map.h> |
| 42 | 42 | #include <asm/mach/serial_sa1100.h> |
| 43 | 43 | |
| 44 | −#include <asm/arch/h3600.h> | |
| 44 | +#include <mach/h3600.h> | |
| 45 | 45 | |
| 46 | 46 | #if defined (CONFIG_SA1100_H3600) || defined (CONFIG_SA1100_H3100) |
| 47 | −#include <asm/arch/h3600_gpio.h> | |
| 47 | +#include <mach/h3600_gpio.h> | |
| 48 | 48 | #endif |
| 49 | 49 | |
| 50 | 50 | #ifdef CONFIG_SA1100_H3800 |
| 51 | −#include <asm/arch/h3600_asic.h> | |
| 51 | +#include <mach/h3600_asic.h> | |
| 52 | 52 | #endif |
| 53 | 53 | |
| 54 | 54 | #include "generic.h" |
| @@ -681,7 +681,7 @@ static struct ipaq_model_ops h3800_model_ops __initdata = { · 626 unmodified lines | ||
| 681 | 681 | |
| 682 | 682 | #define MAX_ASIC_ISR_LOOPS 20 |
| 683 | 683 | |
| 684 | −/* The order of these is important - see #include <asm/arch/irqs.h> */ | |
| 684 | +/* The order of these is important - see #include <mach/irqs.h> */ | |
| 685 | 685 | static u32 kpio_irq_mask[] = { |
| 686 | 686 | KPIO_KEY_ALL, |
| 687 | 687 | KPIO_SPI_INT, |
| @@ -22,7 +22,7 @@ · 21 unmodified lines | ||
| 22 | 22 | #include <linux/mtd/mtd.h> |
| 23 | 23 | #include <linux/mtd/partitions.h> |
| 24 | 24 | |
| 25 | −#include <asm/hardware.h> | |
| 25 | +#include <mach/hardware.h> | |
| 26 | 26 | #include <asm/mach-types.h> |
| 27 | 27 | #include <asm/setup.h> |
| 28 | 28 | #include <asm/page.h> |
File renamed without changes.
| @@ -38,7 +38,7 @@ · 37 unmodified lines | ||
| 38 | 38 | #define SA1101_p2v(PhAdd) (PhAdd) |
| 39 | 39 | #endif |
| 40 | 40 | |
| 41 | −#include <asm/arch/bitfield.h> | |
| 41 | +#include <mach/bitfield.h> | |
| 42 | 42 | |
| 43 | 43 | #define C 0 |
| 44 | 44 | #define Assembly 1 |
File renamed without changes.
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-sa1100/assabet.h | |
| 2 | + * arch/arm/mach-sa1100/include/mach/assabet.h | |
| 3 | 3 | * |
| 4 | 4 | * Created 2000/06/05 by Nicolas Pitre <nico@cam.org> |
| 5 | 5 | * |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-sa1100/badge4.h | |
| 2 | + * arch/arm/mach-sa1100/include/mach/badge4.h | |
| 3 | 3 | * |
| 4 | 4 | * Tim Connors <connors@hpl.hp.com> |
| 5 | 5 | * Christopher Hoover <ch@hpl.hp.com> |
| @@ -13,7 +13,7 @@ · 7 unmodified lines | ||
| 13 | 13 | */ |
| 14 | 14 | |
| 15 | 15 | #ifndef __ASM_ARCH_HARDWARE_H |
| 16 | −#error "include <asm/hardware.h> instead" | |
| 16 | +#error "include <mach/hardware.h> instead" | |
| 17 | 17 | #endif |
| 18 | 18 | |
| 19 | 19 | #define BADGE4_SA1111_BASE (0x48000000) |
File renamed without changes.
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-sa1100/cerf.h | |
| 2 | + * arch/arm/mach-sa1100/include/mach/cerf.h | |
| 3 | 3 | * |
| 4 | 4 | * This program is free software; you can redistribute it and/or modify |
| 5 | 5 | * it under the terms of the GNU General Public License version 2 as |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-sa1100/collie.h | |
| 2 | + * arch/arm/mach-sa1100/include/mach/collie.h | |
| 3 | 3 | * |
| 4 | 4 | * This file contains the hardware specific definitions for Assabet |
| 5 | 5 | * Only include this file from SA1100-specific files. |
| @@ -1,4 +1,4 @@ | ||
| 1 | −/* linux/include/asm-arm/arch-sa1100/debug-macro.S | |
| 1 | +/* arch/arm/mach-sa1100/include/mach/debug-macro.S | |
| 2 | 2 | * |
| 3 | 3 | * Debugging macro include header |
| 4 | 4 | * |
| @@ -10,7 +10,7 @@ · 5 unmodified lines | ||
| 10 | 10 | * published by the Free Software Foundation. |
| 11 | 11 | * |
| 12 | 12 | */ |
| 13 | −#include <asm/hardware.h> | |
| 13 | +#include <mach/hardware.h> | |
| 14 | 14 | |
| 15 | 15 | .macro addruart,rx |
| 16 | 16 | mrc p15, 0, \rx, c1, c0 |
| @@ -19,7 +19,7 @@ · 2 unmodified lines | ||
| 19 | 19 | movne \rx, #0xf8000000 @ virtual address |
| 20 | 20 | |
| 21 | 21 | @ We probe for the active serial port here, coherently with |
| 22 | − @ the comment in include/asm-arm/arch-sa1100/uncompress.h. | |
| 22 | + @ the comment in arch/arm/mach-sa1100/include/mach/uncompress.h. | |
| 23 | 23 | @ We assume r1 can be clobbered. |
| 24 | 24 | |
| 25 | 25 | @ see if Ser3 is active |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-sa1100/dma.h | |
| 2 | + * arch/arm/mach-sa1100/include/mach/dma.h | |
| 3 | 3 | * |
| 4 | 4 | * Generic SA1100 DMA support |
| 5 | 5 | * |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-sa1100/entry-macro.S | |
| 2 | + * arch/arm/mach-sa1100/include/mach/entry-macro.S | |
| 3 | 3 | * |
| 4 | 4 | * Low-level IRQ helper macros for SA1100-based platforms |
| 5 | 5 | * |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-sa1100/gpio.h | |
| 2 | + * arch/arm/mach-sa1100/include/mach/gpio.h | |
| 3 | 3 | * |
| 4 | 4 | * SA1100 GPIO wrappers for arch-neutral GPIO calls |
| 5 | 5 | * |
| @@ -24,7 +24,7 @@ · 18 unmodified lines | ||
| 24 | 24 | #ifndef __ASM_ARCH_SA1100_GPIO_H |
| 25 | 25 | #define __ASM_ARCH_SA1100_GPIO_H |
| 26 | 26 | |
| 27 | −#include <asm/hardware.h> | |
| 27 | +#include <mach/hardware.h> | |
| 28 | 28 | #include <asm/irq.h> |
| 29 | 29 | #include <asm-generic/gpio.h> |
| 30 | 30 | |
File renamed without changes.
File renamed without changes.
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-sa1100/hardware.h | |
| 2 | + * arch/arm/mach-sa1100/include/mach/hardware.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 1998 Nicolas Pitre <nico@cam.org> |
| 5 | 5 | * |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-sa1100/ide.h | |
| 2 | + * arch/arm/mach-sa1100/include/mach/ide.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (c) 1998 Hugo Fiennes & Nicolas Pitre |
| 5 | 5 | * |
| @@ -10,7 +10,7 @@ · 4 unmodified lines | ||
| 10 | 10 | */ |
| 11 | 11 | |
| 12 | 12 | #include <asm/irq.h> |
| 13 | −#include <asm/hardware.h> | |
| 13 | +#include <mach/hardware.h> | |
| 14 | 14 | #include <asm/mach-types.h> |
| 15 | 15 | |
| 16 | 16 | #error "This code is broken and needs update to match with current ide support" |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-sa1100/io.h | |
| 2 | + * arch/arm/mach-sa1100/include/mach/io.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 1997-1999 Russell King |
| 5 | 5 | * |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-sa1100/irqs.h | |
| 2 | + * arch/arm/mach-sa1100/include/mach/irqs.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 1996 Russell King |
| 5 | 5 | * Copyright (C) 1998 Deborah Wallach (updates for SA1100/Brutus). |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-sa1100/jornada720.h | |
| 2 | + * arch/arm/mach-sa1100/include/mach/jornada720.h | |
| 3 | 3 | * |
| 4 | 4 | * This file contains SSP/MCU communication definitions for HP Jornada 710/720/728 |
| 5 | 5 | * |
File renamed without changes.
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-sa1100/mcp.h | |
| 2 | + * arch/arm/mach-sa1100/include/mach/mcp.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 2005 Russell King. |
| 5 | 5 | * |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-sa1100/memory.h | |
| 2 | + * arch/arm/mach-sa1100/include/mach/memory.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 1999-2000 Nicolas Pitre <nico@cam.org> |
| 5 | 5 | */ |
| @@ -10,8 +10,6 @@ · 9 unmodified lines | ||
| 10 | 10 | * This program is free software; you can redistribute it and/or modify |
| 11 | 11 | * it under the terms of the GNU General Public License version 2 as |
| 12 | 12 | * published by the Free Software Foundation. |
| 13 | − * | |
| 14 | − * $Id: xip.h,v 1.2 2004/12/01 15:49:10 nico Exp $ | |
| 15 | 13 | */ |
| 16 | 14 | |
| 17 | 15 | #ifndef __ARCH_SA1100_MTD_XIP_H__ |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-sa1100/neponset.h | |
| 2 | + * arch/arm/mach-sa1100/include/mach/neponset.h | |
| 3 | 3 | * |
| 4 | 4 | * Created 2000/06/05 by Nicolas Pitre <nico@cam.org> |
| 5 | 5 | * |
| @@ -0,0 +1,18 @@ | ||
| 1 | +#ifndef __ASM_ARCH_RESET_H | |
| 2 | +#define __ASM_ARCH_RESET_H | |
| 3 | + | |
| 4 | +#include "hardware.h" | |
| 5 | + | |
| 6 | +#define RESET_STATUS_HARDWARE (1 << 0) /* Hardware Reset */ | |
| 7 | +#define RESET_STATUS_WATCHDOG (1 << 1) /* Watchdog Reset */ | |
| 8 | +#define RESET_STATUS_LOWPOWER (1 << 2) /* Exit from Low Power/Sleep */ | |
| 9 | +#define RESET_STATUS_GPIO (1 << 3) /* GPIO Reset */ | |
| 10 | +#define RESET_STATUS_ALL (0xf) | |
| 11 | + | |
| 12 | +extern unsigned int reset_status; | |
| 13 | +static inline void clear_reset_status(unsigned int mask) | |
| 14 | +{ | |
| 15 | + RCSR = mask; | |
| 16 | +} | |
| 17 | + | |
| 18 | +#endif /* __ASM_ARCH_RESET_H */ | |
File renamed without changes.
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-sa1100/simpad.h | |
| 2 | + * arch/arm/mach-sa1100/include/mach/simpad.h | |
| 3 | 3 | * |
| 4 | 4 | * based of assabet.h same as HUW_Webpanel |
| 5 | 5 | * |
| @@ -1,9 +1,9 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-sa1100/system.h | |
| 2 | + * arch/arm/mach-sa1100/include/mach/system.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (c) 1999 Nicolas Pitre <nico@cam.org> |
| 5 | 5 | */ |
| 6 | −#include <asm/hardware.h> | |
| 6 | +#include <mach/hardware.h> | |
| 7 | 7 | |
| 8 | 8 | static inline void arch_idle(void) |
| 9 | 9 | { |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-sa1100/timex.h | |
| 2 | + * arch/arm/mach-sa1100/include/mach/timex.h | |
| 3 | 3 | * |
| 4 | 4 | * SA1100 architecture timex specifications |
| 5 | 5 | * |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-sa1100/uncompress.h | |
| 2 | + * arch/arm/mach-sa1100/include/mach/uncompress.h | |
| 3 | 3 | * |
| 4 | 4 | * (C) 1999 Nicolas Pitre <nico@cam.org> |
| 5 | 5 | * |
| @@ -0,0 +1,4 @@ | ||
| 1 | +/* | |
| 2 | + * arch/arm/mach-sa1100/include/mach/vmalloc.h | |
| 3 | + */ | |
| 4 | +#define VMALLOC_END (0xe8000000) | |
| @@ -16,7 +16,7 @@ · 15 unmodified lines | ||
| 16 | 16 | #include <linux/ioport.h> |
| 17 | 17 | #include <linux/sysdev.h> |
| 18 | 18 | |
| 19 | −#include <asm/hardware.h> | |
| 19 | +#include <mach/hardware.h> | |
| 20 | 20 | #include <asm/mach/irq.h> |
| 21 | 21 | |
| 22 | 22 | #include "generic.h" |
| @@ -23,7 +23,7 @@ · 22 unmodified lines | ||
| 23 | 23 | #include <linux/mtd/partitions.h> |
| 24 | 24 | #include <video/s1d13xxxfb.h> |
| 25 | 25 | |
| 26 | −#include <asm/hardware.h> | |
| 26 | +#include <mach/hardware.h> | |
| 27 | 27 | #include <asm/hardware/sa1111.h> |
| 28 | 28 | #include <asm/irq.h> |
| 29 | 29 | #include <asm/mach-types.h> |
| @@ -20,9 +20,9 @@ · 19 unmodified lines | ||
| 20 | 20 | #include <linux/sched.h> |
| 21 | 21 | #include <linux/slab.h> |
| 22 | 22 | |
| 23 | −#include <asm/hardware.h> | |
| 23 | +#include <mach/hardware.h> | |
| 24 | 24 | #include <asm/hardware/ssp.h> |
| 25 | −#include <asm/arch/jornada720.h> | |
| 25 | +#include <mach/jornada720.h> | |
| 26 | 26 | |
| 27 | 27 | static DEFINE_SPINLOCK(jornada_ssp_lock); |
| 28 | 28 | static unsigned long jornada_ssp_flags; |
| @@ -6,14 +6,14 @@ · 5 unmodified lines | ||
| 6 | 6 | #include <linux/kernel.h> |
| 7 | 7 | #include <linux/tty.h> |
| 8 | 8 | |
| 9 | −#include <asm/hardware.h> | |
| 9 | +#include <mach/hardware.h> | |
| 10 | 10 | #include <asm/setup.h> |
| 11 | 11 | #include <asm/mach-types.h> |
| 12 | 12 | |
| 13 | 13 | #include <asm/mach/arch.h> |
| 14 | 14 | #include <asm/mach/map.h> |
| 15 | 15 | #include <asm/mach/serial_sa1100.h> |
| 16 | −#include <asm/arch/mcp.h> | |
| 16 | +#include <mach/mcp.h> | |
| 17 | 17 | |
| 18 | 18 | #include "generic.h" |
| 19 | 19 | |
| @@ -11,10 +11,10 @@ · 10 unmodified lines | ||
| 11 | 11 | */ |
| 12 | 12 | #include <linux/init.h> |
| 13 | 13 | |
| 14 | −#include <asm/hardware.h> | |
| 14 | +#include <mach/hardware.h> | |
| 15 | 15 | #include <asm/leds.h> |
| 16 | 16 | #include <asm/system.h> |
| 17 | −#include <asm/arch/assabet.h> | |
| 17 | +#include <mach/assabet.h> | |
| 18 | 18 | |
| 19 | 19 | #include "leds.h" |
| 20 | 20 | |
| @@ -12,7 +12,7 @@ · 11 unmodified lines | ||
| 12 | 12 | |
| 13 | 13 | #include <linux/init.h> |
| 14 | 14 | |
| 15 | −#include <asm/hardware.h> | |
| 15 | +#include <mach/hardware.h> | |
| 16 | 16 | #include <asm/leds.h> |
| 17 | 17 | #include <asm/system.h> |
| 18 | 18 | |
| @@ -5,7 +5,7 @@ · 4 unmodified lines | ||
| 5 | 5 | */ |
| 6 | 6 | #include <linux/init.h> |
| 7 | 7 | |
| 8 | −#include <asm/hardware.h> | |
| 8 | +#include <mach/hardware.h> | |
| 9 | 9 | #include <asm/leds.h> |
| 10 | 10 | #include <asm/system.h> |
| 11 | 11 | |
| @@ -11,7 +11,7 @@ · 10 unmodified lines | ||
| 11 | 11 | */ |
| 12 | 12 | #include <linux/init.h> |
| 13 | 13 | |
| 14 | −#include <asm/hardware.h> | |
| 14 | +#include <mach/hardware.h> | |
| 15 | 15 | #include <asm/leds.h> |
| 16 | 16 | #include <asm/system.h> |
| 17 | 17 | |
| @@ -11,7 +11,7 @@ · 10 unmodified lines | ||
| 11 | 11 | */ |
| 12 | 12 | #include <linux/init.h> |
| 13 | 13 | |
| 14 | −#include <asm/hardware.h> | |
| 14 | +#include <mach/hardware.h> | |
| 15 | 15 | #include <asm/leds.h> |
| 16 | 16 | #include <asm/system.h> |
| 17 | 17 | |
| @@ -5,10 +5,10 @@ · 4 unmodified lines | ||
| 5 | 5 | */ |
| 6 | 6 | #include <linux/init.h> |
| 7 | 7 | |
| 8 | −#include <asm/hardware.h> | |
| 8 | +#include <mach/hardware.h> | |
| 9 | 9 | #include <asm/leds.h> |
| 10 | 10 | #include <asm/system.h> |
| 11 | −#include <asm/arch/simpad.h> | |
| 11 | +#include <mach/simpad.h> | |
| 12 | 12 | |
| 13 | 13 | #include "leds.h" |
| 14 | 14 | |
| @@ -10,14 +10,14 @@ · 9 unmodified lines | ||
| 10 | 10 | #include <linux/platform_device.h> |
| 11 | 11 | #include <linux/slab.h> |
| 12 | 12 | |
| 13 | −#include <asm/hardware.h> | |
| 13 | +#include <mach/hardware.h> | |
| 14 | 14 | #include <asm/mach-types.h> |
| 15 | 15 | #include <asm/irq.h> |
| 16 | 16 | #include <asm/mach/map.h> |
| 17 | 17 | #include <asm/mach/irq.h> |
| 18 | 18 | #include <asm/mach/serial_sa1100.h> |
| 19 | −#include <asm/arch/assabet.h> | |
| 20 | −#include <asm/arch/neponset.h> | |
| 19 | +#include <mach/assabet.h> | |
| 20 | +#include <mach/neponset.h> | |
| 21 | 21 | #include <asm/hardware/sa1111.h> |
| 22 | 22 | #include <asm/sizes.h> |
| 23 | 23 | |
| @@ -11,7 +11,7 @@ · 10 unmodified lines | ||
| 11 | 11 | |
| 12 | 12 | #include <linux/mtd/partitions.h> |
| 13 | 13 | |
| 14 | −#include <asm/hardware.h> | |
| 14 | +#include <mach/hardware.h> | |
| 15 | 15 | #include <asm/io.h> |
| 16 | 16 | #include <asm/setup.h> |
| 17 | 17 | #include <asm/mach-types.h> |
| @@ -20,7 +20,7 @@ · 2 unmodified lines | ||
| 20 | 20 | #include <asm/mach/map.h> |
| 21 | 21 | #include <asm/mach/flash.h> |
| 22 | 22 | #include <asm/mach/serial_sa1100.h> |
| 23 | −#include <asm/arch/irqs.h> | |
| 23 | +#include <mach/irqs.h> | |
| 24 | 24 | |
| 25 | 25 | #include "generic.h" |
| 26 | 26 | |
| @@ -27,7 +27,7 @@ · 26 unmodified lines | ||
| 27 | 27 | #include <linux/errno.h> |
| 28 | 28 | #include <linux/time.h> |
| 29 | 29 | |
| 30 | −#include <asm/hardware.h> | |
| 30 | +#include <mach/hardware.h> | |
| 31 | 31 | #include <asm/memory.h> |
| 32 | 32 | #include <asm/system.h> |
| 33 | 33 | #include <asm/mach/time.h> |
| @@ -9,7 +9,7 @@ · 8 unmodified lines | ||
| 9 | 9 | #include <linux/mtd/mtd.h> |
| 10 | 10 | #include <linux/mtd/partitions.h> |
| 11 | 11 | |
| 12 | −#include <asm/hardware.h> | |
| 12 | +#include <mach/hardware.h> | |
| 13 | 13 | #include <asm/mach-types.h> |
| 14 | 14 | #include <asm/setup.h> |
| 15 | 15 | |
| @@ -17,8 +17,8 @@ · 1 unmodified line | ||
| 17 | 17 | #include <asm/mach/flash.h> |
| 18 | 18 | #include <asm/mach/map.h> |
| 19 | 19 | #include <asm/mach/serial_sa1100.h> |
| 20 | −#include <asm/arch/mcp.h> | |
| 21 | −#include <asm/arch/shannon.h> | |
| 20 | +#include <mach/mcp.h> | |
| 21 | +#include <mach/shannon.h> | |
| 22 | 22 | |
| 23 | 23 | #include "generic.h" |
| 24 | 24 | |
| @@ -14,7 +14,7 @@ · 13 unmodified lines | ||
| 14 | 14 | #include <linux/mtd/partitions.h> |
| 15 | 15 | |
| 16 | 16 | #include <asm/irq.h> |
| 17 | −#include <asm/hardware.h> | |
| 17 | +#include <mach/hardware.h> | |
| 18 | 18 | #include <asm/setup.h> |
| 19 | 19 | |
| 20 | 20 | #include <asm/mach-types.h> |
| @@ -22,8 +22,8 @@ · 1 unmodified line | ||
| 22 | 22 | #include <asm/mach/flash.h> |
| 23 | 23 | #include <asm/mach/map.h> |
| 24 | 24 | #include <asm/mach/serial_sa1100.h> |
| 25 | −#include <asm/arch/mcp.h> | |
| 26 | −#include <asm/arch/simpad.h> | |
| 25 | +#include <mach/mcp.h> | |
| 26 | +#include <mach/simpad.h> | |
| 27 | 27 | |
| 28 | 28 | #include <linux/serial_core.h> |
| 29 | 29 | #include <linux/ioport.h> |
| @@ -18,7 +18,7 @@ · 17 unmodified lines | ||
| 18 | 18 | |
| 19 | 19 | #include <linux/linkage.h> |
| 20 | 20 | #include <asm/assembler.h> |
| 21 | −#include <asm/hardware.h> | |
| 21 | +#include <mach/hardware.h> | |
| 22 | 22 | |
| 23 | 23 | |
| 24 | 24 | |
| @@ -20,7 +20,7 @@ · 19 unmodified lines | ||
| 20 | 20 | |
| 21 | 21 | #include <asm/io.h> |
| 22 | 22 | #include <asm/irq.h> |
| 23 | −#include <asm/hardware.h> | |
| 23 | +#include <mach/hardware.h> | |
| 24 | 24 | #include <asm/hardware/ssp.h> |
| 25 | 25 | |
| 26 | 26 | #define TIMEOUT 100000 |
| @@ -16,7 +16,7 @@ · 15 unmodified lines | ||
| 16 | 16 | #include <linux/clockchips.h> |
| 17 | 17 | |
| 18 | 18 | #include <asm/mach/time.h> |
| 19 | −#include <asm/hardware.h> | |
| 19 | +#include <mach/hardware.h> | |
| 20 | 20 | |
| 21 | 21 | #define MIN_OSCR_DELTA 2 |
| 22 | 22 | |
| @@ -1,4 +1,4 @@ | ||
| 1 | −/* linux/include/asm-arm/arch-shark/debug-macro.S | |
| 1 | +/* arch/arm/mach-shark/include/mach/debug-macro.S | |
| 2 | 2 | * |
| 3 | 3 | * Debugging macro include header |
| 4 | 4 | * |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-shark/dma.h | |
| 2 | + * arch/arm/mach-shark/include/mach/dma.h | |
| 3 | 3 | * |
| 4 | 4 | * by Alexander Schulz |
| 5 | 5 | */ |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-shark/entry-macro.S | |
| 2 | + * arch/arm/mach-shark/include/mach/entry-macro.S | |
| 3 | 3 | * |
| 4 | 4 | * Low-level IRQ helper macros for Shark platform |
| 5 | 5 | * |
| @@ -1,10 +1,10 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-shark/hardware.h | |
| 2 | + * arch/arm/mach-shark/include/mach/hardware.h | |
| 3 | 3 | * |
| 4 | 4 | * by Alexander Schulz |
| 5 | 5 | * |
| 6 | 6 | * derived from: |
| 7 | − * linux/include/asm-arm/arch-ebsa110/hardware.h | |
| 7 | + * arch/arm/mach-ebsa110/include/mach/hardware.h | |
| 8 | 8 | * Copyright (C) 1996-1999 Russell King. |
| 9 | 9 | */ |
| 10 | 10 | #ifndef __ASM_ARCH_HARDWARE_H |
| @@ -1,17 +1,17 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-shark/io.h | |
| 2 | + * arch/arm/mach-shark/include/mach/io.h | |
| 3 | 3 | * |
| 4 | 4 | * by Alexander Schulz |
| 5 | 5 | * |
| 6 | 6 | * derived from: |
| 7 | − * linux/include/asm-arm/arch-ebsa110/io.h | |
| 7 | + * arch/arm/mach-ebsa110/include/mach/io.h | |
| 8 | 8 | * Copyright (C) 1997,1998 Russell King |
| 9 | 9 | */ |
| 10 | 10 | |
| 11 | 11 | #ifndef __ASM_ARM_ARCH_IO_H |
| 12 | 12 | #define __ASM_ARM_ARCH_IO_H |
| 13 | 13 | |
| 14 | −#include <asm/hardware.h> | |
| 14 | +#include <mach/hardware.h> | |
| 15 | 15 | |
| 16 | 16 | #define IO_SPACE_LIMIT 0xffffffff |
| 17 | 17 | |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-shark/irqs.h | |
| 2 | + * arch/arm/mach-shark/include/mach/irqs.h | |
| 3 | 3 | * |
| 4 | 4 | * by Alexander Schulz |
| 5 | 5 | */ |
| @@ -1,10 +1,10 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-shark/memory.h | |
| 2 | + * arch/arm/mach-shark/include/mach/memory.h | |
| 3 | 3 | * |
| 4 | 4 | * by Alexander Schulz |
| 5 | 5 | * |
| 6 | 6 | * derived from: |
| 7 | − * linux/include/asm-arm/arch-ebsa110/memory.h | |
| 7 | + * arch/arm/mach-ebsa110/include/mach/memory.h | |
| 8 | 8 | * Copyright (c) 1996-1999 Russell King. |
| 9 | 9 | */ |
| 10 | 10 | #ifndef __ASM_ARCH_MEMORY_H |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-shark/system.h | |
| 2 | + * arch/arm/mach-shark/include/mach/system.h | |
| 3 | 3 | * |
| 4 | 4 | * by Alexander Schulz |
| 5 | 5 | */ |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-shark/timex.h | |
| 2 | + * arch/arm/mach-shark/include/mach/timex.h | |
| 3 | 3 | * |
| 4 | 4 | * by Alexander Schulz |
| 5 | 5 | */ |
| @@ -1,9 +1,9 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-shark/uncompress.h | |
| 2 | + * arch/arm/mach-shark/include/mach/uncompress.h | |
| 3 | 3 | * by Alexander Schulz |
| 4 | 4 | * |
| 5 | 5 | * derived from: |
| 6 | − * linux/include/asm-arm/arch-ebsa285/uncompress.h | |
| 6 | + * arch/arm/mach-footbridge/include/mach/uncompress.h | |
| 7 | 7 | * Copyright (C) 1996,1997,1998 Russell King |
| 8 | 8 | */ |
| 9 | 9 | |
| @@ -1,4 +1,4 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-shark/vmalloc.h | |
| 2 | + * arch/arm/mach-shark/include/mach/vmalloc.h | |
| 3 | 3 | */ |
| 4 | 4 | #define VMALLOC_END (PAGE_OFFSET + 0x10000000) |
| @@ -4,7 +4,7 @@ · 3 unmodified lines | ||
| 4 | 4 | * by Alexander Schulz |
| 5 | 5 | * |
| 6 | 6 | * derived from linux/arch/ppc/kernel/i8259.c and: |
| 7 | − * include/asm-arm/arch-ebsa110/irq.h | |
| 7 | + * arch/arm/mach-ebsa110/include/mach/irq.h | |
| 8 | 8 | * Copyright (C) 1996-1998 Russell King |
| 9 | 9 | */ |
| 10 | 10 | |
| @@ -21,7 +21,7 @@ · 20 unmodified lines | ||
| 21 | 21 | #include <linux/spinlock.h> |
| 22 | 22 | #include <linux/ioport.h> |
| 23 | 23 | |
| 24 | −#include <asm/hardware.h> | |
| 24 | +#include <mach/hardware.h> | |
| 25 | 25 | #include <asm/leds.h> |
| 26 | 26 | #include <asm/io.h> |
| 27 | 27 | #include <asm/system.h> |
| @@ -31,7 +31,7 @@ · 30 unmodified lines | ||
| 31 | 31 | |
| 32 | 32 | #include <asm/cnt32_to_63.h> |
| 33 | 33 | #include <asm/system.h> |
| 34 | −#include <asm/hardware.h> | |
| 34 | +#include <mach/hardware.h> | |
| 35 | 35 | #include <asm/io.h> |
| 36 | 36 | #include <asm/irq.h> |
| 37 | 37 | #include <asm/leds.h> |
| @@ -1,4 +1,4 @@ | ||
| 1 | −/* linux/include/asm-arm/arch-versatile/debug-macro.S | |
| 1 | +/* arch/arm/mach-versatile/include/mach/debug-macro.S | |
| 2 | 2 | * |
| 3 | 3 | * Debugging macro include header |
| 4 | 4 | * |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-versatile/dma.h | |
| 2 | + * arch/arm/mach-versatile/include/mach/dma.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 2003 ARM Limited. |
| 5 | 5 | * Copyright (C) 1997,1998 Russell King |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-versatile/entry-macro.S | |
| 2 | + * arch/arm/mach-versatile/include/mach/entry-macro.S | |
| 3 | 3 | * |
| 4 | 4 | * Low-level IRQ helper macros for Versatile platforms |
| 5 | 5 | * |
| @@ -7,7 +7,7 @@ · 1 unmodified line | ||
| 7 | 7 | * License version 2. This program is licensed "as is" without any |
| 8 | 8 | * warranty of any kind, whether express or implied. |
| 9 | 9 | */ |
| 10 | −#include <asm/hardware.h> | |
| 10 | +#include <mach/hardware.h> | |
| 11 | 11 | #include <asm/hardware/vic.h> |
| 12 | 12 | |
| 13 | 13 | .macro disable_fiq |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-versatile/hardware.h | |
| 2 | + * arch/arm/mach-versatile/include/mach/hardware.h | |
| 3 | 3 | * |
| 4 | 4 | * This file contains the hardware definitions of the Versatile boards. |
| 5 | 5 | * |
| @@ -23,7 +23,7 @@ · 17 unmodified lines | ||
| 23 | 23 | #define __ASM_ARCH_HARDWARE_H |
| 24 | 24 | |
| 25 | 25 | #include <asm/sizes.h> |
| 26 | −#include <asm/arch/platform.h> | |
| 26 | +#include <mach/platform.h> | |
| 27 | 27 | |
| 28 | 28 | /* |
| 29 | 29 | * PCI space virtual addresses |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-versatile/io.h | |
| 2 | + * arch/arm/mach-versatile/include/mach/io.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 2003 ARM Limited |
| 5 | 5 | * |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-versatile/irqs.h | |
| 2 | + * arch/arm/mach-versatile/include/mach/irqs.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 2003 ARM Limited |
| 5 | 5 | * Copyright (C) 2000 Deep Blue Solutions Ltd. |
| @@ -19,7 +19,7 @@ · 13 unmodified lines | ||
| 19 | 19 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
| 20 | 20 | */ |
| 21 | 21 | |
| 22 | −#include <asm/arch/platform.h> | |
| 22 | +#include <mach/platform.h> | |
| 23 | 23 | |
| 24 | 24 | /* |
| 25 | 25 | * IRQ interrupts definitions are the same as the INT definitions |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-versatile/memory.h | |
| 2 | + * arch/arm/mach-versatile/include/mach/memory.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 2003 ARM Limited |
| 5 | 5 | * |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-versatile/platform.h | |
| 2 | + * arch/arm/mach-versatile/include/mach/platform.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (c) ARM Limited 2003. All rights reserved. |
| 5 | 5 | * |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-versatile/system.h | |
| 2 | + * arch/arm/mach-versatile/include/mach/system.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 2003 ARM Limited |
| 5 | 5 | * Copyright (C) 2000 Deep Blue Solutions Ltd |
| @@ -21,9 +21,9 @@ · 15 unmodified lines | ||
| 21 | 21 | #ifndef __ASM_ARCH_SYSTEM_H |
| 22 | 22 | #define __ASM_ARCH_SYSTEM_H |
| 23 | 23 | |
| 24 | −#include <asm/hardware.h> | |
| 24 | +#include <mach/hardware.h> | |
| 25 | 25 | #include <asm/io.h> |
| 26 | −#include <asm/arch/platform.h> | |
| 26 | +#include <mach/platform.h> | |
| 27 | 27 | |
| 28 | 28 | static inline void arch_idle(void) |
| 29 | 29 | { |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-versatile/timex.h | |
| 2 | + * arch/arm/mach-versatile/include/mach/timex.h | |
| 3 | 3 | * |
| 4 | 4 | * Versatile architecture timex specifications |
| 5 | 5 | * |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-versatile/uncompress.h | |
| 2 | + * arch/arm/mach-versatile/include/mach/uncompress.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 2003 ARM Limited |
| 5 | 5 | * |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-versatile/vmalloc.h | |
| 2 | + * arch/arm/mach-versatile/include/mach/vmalloc.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 2003 ARM Limited |
| 5 | 5 | * Copyright (C) 2000 Russell King. |
| @@ -22,7 +22,7 @@ · 21 unmodified lines | ||
| 22 | 22 | #include <linux/spinlock.h> |
| 23 | 23 | #include <linux/init.h> |
| 24 | 24 | |
| 25 | −#include <asm/hardware.h> | |
| 25 | +#include <mach/hardware.h> | |
| 26 | 26 | #include <asm/io.h> |
| 27 | 27 | #include <asm/irq.h> |
| 28 | 28 | #include <asm/system.h> |
| @@ -24,7 +24,7 @@ · 23 unmodified lines | ||
| 24 | 24 | #include <linux/sysdev.h> |
| 25 | 25 | #include <linux/amba/bus.h> |
| 26 | 26 | |
| 27 | −#include <asm/hardware.h> | |
| 27 | +#include <mach/hardware.h> | |
| 28 | 28 | #include <asm/io.h> |
| 29 | 29 | #include <asm/irq.h> |
| 30 | 30 | #include <asm/mach-types.h> |
| @@ -24,7 +24,7 @@ · 23 unmodified lines | ||
| 24 | 24 | #include <linux/sysdev.h> |
| 25 | 25 | #include <linux/amba/bus.h> |
| 26 | 26 | |
| 27 | −#include <asm/hardware.h> | |
| 27 | +#include <mach/hardware.h> | |
| 28 | 28 | #include <asm/io.h> |
| 29 | 29 | #include <asm/irq.h> |
| 30 | 30 | #include <asm/mach-types.h> |
| @@ -187,7 +187,7 @@ config CPU_ARM926T · 186 unmodified lines | ||
| 187 | 187 | ARCH_AT91SAM9260 || ARCH_AT91SAM9261 || \ |
| 188 | 188 | ARCH_AT91SAM9263 || ARCH_AT91SAM9RL || \ |
| 189 | 189 | ARCH_AT91SAM9G20 || ARCH_AT91CAP9 || \ |
| 190 | − ARCH_NS9XXX || ARCH_DAVINCI | |
| 190 | + ARCH_NS9XXX || ARCH_DAVINCI || ARCH_MX2 | |
| 191 | 191 | default y if ARCH_VERSATILE_PB || MACH_VERSATILE_AB || \ |
| 192 | 192 | ARCH_OMAP730 || ARCH_OMAP16XX || \ |
| 193 | 193 | ARCH_PNX4008 || ARCH_NETX || CPU_S3C2412 || \ |
| @@ -742,3 +742,11 @@ config CACHE_L2X0 · 548 unmodified lines | ||
| 742 | 742 | select OUTER_CACHE |
| 743 | 743 | help |
| 744 | 744 | This option enables the L2x0 PrimeCell. |
| 745 | + | |
| 746 | +config CACHE_XSC3L2 | |
| 747 | + bool "Enable the L2 cache on XScale3" | |
| 748 | + depends on CPU_XSC3 | |
| 749 | + default y | |
| 750 | + select OUTER_CACHE | |
| 751 | + help | |
| 752 | + This option enables the L2 cache on XScale3. | |
| @@ -14,7 +14,7 @@ · 13 unmodified lines | ||
| 14 | 14 | |
| 15 | 15 | #include <linux/init.h> |
| 16 | 16 | #include <asm/cacheflush.h> |
| 17 | −#include <asm/plat-orion/cache-feroceon-l2.h> | |
| 17 | +#include <plat/cache-feroceon-l2.h> | |
| 18 | 18 | |
| 19 | 19 | |
| 20 | 20 | /* |
| @@ -9,7 +9,7 @@ · 8 unmodified lines | ||
| 9 | 9 | */ |
| 10 | 10 | #include <linux/linkage.h> |
| 11 | 11 | #include <linux/init.h> |
| 12 | −#include <asm/hardware.h> | |
| 12 | +#include <mach/hardware.h> | |
| 13 | 13 | #include <asm/page.h> |
| 14 | 14 | #include "proc-macros.S" |
| 15 | 15 | |
| @@ -9,7 +9,7 @@ · 8 unmodified lines | ||
| 9 | 9 | */ |
| 10 | 10 | #include <linux/linkage.h> |
| 11 | 11 | #include <linux/init.h> |
| 12 | −#include <asm/hardware.h> | |
| 12 | +#include <mach/hardware.h> | |
| 13 | 13 | #include <asm/page.h> |
| 14 | 14 | #include "proc-macros.S" |
| 15 | 15 | |
| @@ -13,7 +13,7 @@ · 12 unmodified lines | ||
| 13 | 13 | */ |
| 14 | 14 | #include <linux/linkage.h> |
| 15 | 15 | #include <linux/init.h> |
| 16 | −#include <asm/hardware.h> | |
| 16 | +#include <mach/hardware.h> | |
| 17 | 17 | #include <asm/page.h> |
| 18 | 18 | #include "proc-macros.S" |
| 19 | 19 | |
| @@ -0,0 +1,182 @@ | ||
| 1 | +/* | |
| 2 | + * arch/arm/mm/cache-xsc3l2.c - XScale3 L2 cache controller support | |
| 3 | + * | |
| 4 | + * Copyright (C) 2007 ARM Limited | |
| 5 | + * | |
| 6 | + * This program is free software; you can redistribute it and/or modify | |
| 7 | + * it under the terms of the GNU General Public License version 2 as | |
| 8 | + * published by the Free Software Foundation. | |
| 9 | + * | |
| 10 | + * This program is distributed in the hope that it will be useful, | |
| 11 | + * but WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 12 | + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
| 13 | + * GNU General Public License for more details. | |
| 14 | + * | |
| 15 | + * You should have received a copy of the GNU General Public License | |
| 16 | + * along with this program; if not, write to the Free Software | |
| 17 | + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | |
| 18 | + */ | |
| 19 | +#include <linux/init.h> | |
| 20 | +#include <linux/spinlock.h> | |
| 21 | + | |
| 22 | +#include <asm/system.h> | |
| 23 | +#include <asm/cacheflush.h> | |
| 24 | +#include <asm/io.h> | |
| 25 | + | |
| 26 | +#define CR_L2 (1 << 26) | |
| 27 | + | |
| 28 | +#define CACHE_LINE_SIZE 32 | |
| 29 | +#define CACHE_LINE_SHIFT 5 | |
| 30 | +#define CACHE_WAY_PER_SET 8 | |
| 31 | + | |
| 32 | +#define CACHE_WAY_SIZE(l2ctype) (8192 << (((l2ctype) >> 8) & 0xf)) | |
| 33 | +#define CACHE_SET_SIZE(l2ctype) (CACHE_WAY_SIZE(l2ctype) >> CACHE_LINE_SHIFT) | |
| 34 | + | |
| 35 | +static inline int xsc3_l2_present(void) | |
| 36 | +{ | |
| 37 | + unsigned long l2ctype; | |
| 38 | + | |
| 39 | + __asm__("mrc p15, 1, %0, c0, c0, 1" : "=r" (l2ctype)); | |
| 40 | + | |
| 41 | + return !!(l2ctype & 0xf8); | |
| 42 | +} | |
| 43 | + | |
| 44 | +static inline void xsc3_l2_clean_mva(unsigned long addr) | |
| 45 | +{ | |
| 46 | + __asm__("mcr p15, 1, %0, c7, c11, 1" : : "r" (addr)); | |
| 47 | +} | |
| 48 | + | |
| 49 | +static inline void xsc3_l2_clean_pa(unsigned long addr) | |
| 50 | +{ | |
| 51 | + xsc3_l2_clean_mva(__phys_to_virt(addr)); | |
| 52 | +} | |
| 53 | + | |
| 54 | +static inline void xsc3_l2_inv_mva(unsigned long addr) | |
| 55 | +{ | |
| 56 | + __asm__("mcr p15, 1, %0, c7, c7, 1" : : "r" (addr)); | |
| 57 | +} | |
| 58 | + | |
| 59 | +static inline void xsc3_l2_inv_pa(unsigned long addr) | |
| 60 | +{ | |
| 61 | + xsc3_l2_inv_mva(__phys_to_virt(addr)); | |
| 62 | +} | |
| 63 | + | |
| 64 | +static inline void xsc3_l2_inv_all(void) | |
| 65 | +{ | |
| 66 | + unsigned long l2ctype, set_way; | |
| 67 | + int set, way; | |
| 68 | + | |
| 69 | + __asm__("mrc p15, 1, %0, c0, c0, 1" : "=r" (l2ctype)); | |
| 70 | + | |
| 71 | + for (set = 0; set < CACHE_SET_SIZE(l2ctype); set++) { | |
| 72 | + for (way = 0; way < CACHE_WAY_PER_SET; way++) { | |
| 73 | + set_way = (way << 29) | (set << 5); | |
| 74 | + __asm__("mcr p15, 1, %0, c7, c11, 2" : : "r"(set_way)); | |
| 75 | + } | |
| 76 | + } | |
| 77 | + | |
| 78 | + dsb(); | |
| 79 | +} | |
| 80 | + | |
| 81 | +static void xsc3_l2_inv_range(unsigned long start, unsigned long end) | |
| 82 | +{ | |
| 83 | + if (start == 0 && end == -1ul) { | |
| 84 | + xsc3_l2_inv_all(); | |
| 85 | + return; | |
| 86 | + } | |
| 87 | + | |
| 88 | + /* | |
| 89 | + * Clean and invalidate partial first cache line. | |
| 90 | + */ | |
| 91 | + if (start & (CACHE_LINE_SIZE - 1)) { | |
| 92 | + xsc3_l2_clean_pa(start & ~(CACHE_LINE_SIZE - 1)); | |
| 93 | + xsc3_l2_inv_pa(start & ~(CACHE_LINE_SIZE - 1)); | |
| 94 | + start = (start | (CACHE_LINE_SIZE - 1)) + 1; | |
| 95 | + } | |
| 96 | + | |
| 97 | + /* | |
| 98 | + * Clean and invalidate partial last cache line. | |
| 99 | + */ | |
| 100 | + if (end & (CACHE_LINE_SIZE - 1)) { | |
| 101 | + xsc3_l2_clean_pa(end & ~(CACHE_LINE_SIZE - 1)); | |
| 102 | + xsc3_l2_inv_pa(end & ~(CACHE_LINE_SIZE - 1)); | |
| 103 | + end &= ~(CACHE_LINE_SIZE - 1); | |
| 104 | + } | |
| 105 | + | |
| 106 | + /* | |
| 107 | + * Invalidate all full cache lines between 'start' and 'end'. | |
| 108 | + */ | |
| 109 | + while (start != end) { | |
| 110 | + xsc3_l2_inv_pa(start); | |
| 111 | + start += CACHE_LINE_SIZE; | |
| 112 | + } | |
| 113 | + | |
| 114 | + dsb(); | |
| 115 | +} | |
| 116 | + | |
| 117 | +static void xsc3_l2_clean_range(unsigned long start, unsigned long end) | |
| 118 | +{ | |
| 119 | + start &= ~(CACHE_LINE_SIZE - 1); | |
| 120 | + while (start < end) { | |
| 121 | + xsc3_l2_clean_pa(start); | |
| 122 | + start += CACHE_LINE_SIZE; | |
| 123 | + } | |
| 124 | + | |
| 125 | + dsb(); | |
| 126 | +} | |
| 127 | + | |
| 128 | +/* | |
| 129 | + * optimize L2 flush all operation by set/way format | |
| 130 | + */ | |
| 131 | +static inline void xsc3_l2_flush_all(void) | |
| 132 | +{ | |
| 133 | + unsigned long l2ctype, set_way; | |
| 134 | + int set, way; | |
| 135 | + | |
| 136 | + __asm__("mrc p15, 1, %0, c0, c0, 1" : "=r" (l2ctype)); | |
| 137 | + | |
| 138 | + for (set = 0; set < CACHE_SET_SIZE(l2ctype); set++) { | |
| 139 | + for (way = 0; way < CACHE_WAY_PER_SET; way++) { | |
| 140 | + set_way = (way << 29) | (set << 5); | |
| 141 | + __asm__("mcr p15, 1, %0, c7, c15, 2" : : "r"(set_way)); | |
| 142 | + } | |
| 143 | + } | |
| 144 | + | |
| 145 | + dsb(); | |
| 146 | +} | |
| 147 | + | |
| 148 | +static void xsc3_l2_flush_range(unsigned long start, unsigned long end) | |
| 149 | +{ | |
| 150 | + if (start == 0 && end == -1ul) { | |
| 151 | + xsc3_l2_flush_all(); | |
| 152 | + return; | |
| 153 | + } | |
| 154 | + | |
| 155 | + start &= ~(CACHE_LINE_SIZE - 1); | |
| 156 | + while (start < end) { | |
| 157 | + xsc3_l2_clean_pa(start); | |
| 158 | + xsc3_l2_inv_pa(start); | |
| 159 | + start += CACHE_LINE_SIZE; | |
| 160 | + } | |
| 161 | + | |
| 162 | + dsb(); | |
| 163 | +} | |
| 164 | + | |
| 165 | +static int __init xsc3_l2_init(void) | |
| 166 | +{ | |
| 167 | + if (!cpu_is_xsc3() || !xsc3_l2_present()) | |
| 168 | + return 0; | |
| 169 | + | |
| 170 | + if (!(get_cr() & CR_L2)) { | |
| 171 | + pr_info("XScale3 L2 cache enabled.\n"); | |
| 172 | + adjust_cr(CR_L2, CR_L2); | |
| 173 | + xsc3_l2_inv_all(); | |
| 174 | + } | |
| 175 | + | |
| 176 | + outer_cache.inv_range = xsc3_l2_inv_range; | |
| 177 | + outer_cache.clean_range = xsc3_l2_clean_range; | |
| 178 | + outer_cache.flush_range = xsc3_l2_flush_range; | |
| 179 | + | |
| 180 | + return 0; | |
| 181 | +} | |
| 182 | +core_initcall(xsc3_l2_init); | |
| @@ -156,9 +156,9 @@ static int __init check_initrd(struct meminfo *mi) · 155 unmodified lines | ||
| 156 | 156 | } |
| 157 | 157 | |
| 158 | 158 | if (initrd_node == -1) { |
| 159 | − printk(KERN_ERR "initrd (0x%08lx - 0x%08lx) extends beyond " | |
| 159 | + printk(KERN_ERR "INITRD: 0x%08lx+0x%08lx extends beyond " | |
| 160 | 160 | "physical memory - disabling initrd\n", |
| 161 | − phys_initrd_start, end); | |
| 161 | + phys_initrd_start, phys_initrd_size); | |
| 162 | 162 | phys_initrd_start = phys_initrd_size = 0; |
| 163 | 163 | } |
| 164 | 164 | #endif |
| @@ -239,24 +239,32 @@ bootmem_init_node(int node, int initrd_node, struct meminfo *mi) · 74 unmodified lines | ||
| 239 | 239 | reserve_bootmem_node(pgdat, boot_pfn << PAGE_SHIFT, |
| 240 | 240 | boot_pages << PAGE_SHIFT, BOOTMEM_DEFAULT); |
| 241 | 241 | |
| 242 | + /* | |
| 243 | + * Reserve any special node zero regions. | |
| 244 | + */ | |
| 245 | + if (node == 0) | |
| 246 | + reserve_node_zero(pgdat); | |
| 247 | + | |
| 242 | 248 | #ifdef CONFIG_BLK_DEV_INITRD |
| 243 | 249 | /* |
| 244 | 250 | * If the initrd is in this node, reserve its memory. |
| 245 | 251 | */ |
| 246 | 252 | if (node == initrd_node) { |
| 247 | − reserve_bootmem_node(pgdat, phys_initrd_start, | |
| 248 | − phys_initrd_size, BOOTMEM_DEFAULT); | |
| 249 | − initrd_start = __phys_to_virt(phys_initrd_start); | |
| 250 | − initrd_end = initrd_start + phys_initrd_size; | |
| 253 | + int res = reserve_bootmem_node(pgdat, phys_initrd_start, | |
| 254 | + phys_initrd_size, BOOTMEM_EXCLUSIVE); | |
| 255 | + | |
| 256 | + if (res == 0) { | |
| 257 | + initrd_start = __phys_to_virt(phys_initrd_start); | |
| 258 | + initrd_end = initrd_start + phys_initrd_size; | |
| 259 | + } else { | |
| 260 | + printk(KERN_ERR | |
| 261 | + "INITRD: 0x%08lx+0x%08lx overlaps in-use " | |
| 262 | + "memory region - disabling initrd\n", | |
| 263 | + phys_initrd_start, phys_initrd_size); | |
| 264 | + } | |
| 251 | 265 | } |
| 252 | 266 | #endif |
| 253 | 267 | |
| 254 | − /* | |
| 255 | − * Finally, reserve any node zero regions. | |
| 256 | − */ | |
| 257 | − if (node == 0) | |
| 258 | − reserve_node_zero(pgdat); | |
| 259 | − | |
| 260 | 268 | /* |
| 261 | 269 | * initialise the zones within this node. |
| 262 | 270 | */ |
| @@ -259,7 +259,7 @@ remap_area_supersections(unsigned long virt, unsigned long pfn, · 258 unmodified lines | ||
| 259 | 259 | * caller shouldn't need to know that small detail. |
| 260 | 260 | * |
| 261 | 261 | * 'flags' are the extra L_PTE_ flags that you want to specify for this |
| 262 | − * mapping. See include/asm-arm/proc-armv/pgtable.h for more information. | |
| 262 | + * mapping. See <asm/pgtable.h> for more information. | |
| 263 | 263 | */ |
| 264 | 264 | void __iomem * |
| 265 | 265 | __arm_ioremap_pfn(unsigned long pfn, unsigned long offset, size_t size, |
| @@ -568,6 +568,55 @@ void __init iotable_init(struct map_desc *io_desc, int nr) · 567 unmodified lines | ||
| 568 | 568 | create_mapping(io_desc + i); |
| 569 | 569 | } |
| 570 | 570 | |
| 571 | +static int __init check_membank_valid(struct membank *mb) | |
| 572 | +{ | |
| 573 | + /* | |
| 574 | + * Check whether this memory region has non-zero size. | |
| 575 | + */ | |
| 576 | + if (mb->size == 0) | |
| 577 | + return 0; | |
| 578 | + | |
| 579 | + /* | |
| 580 | + * Check whether this memory region would entirely overlap | |
| 581 | + * the vmalloc area. | |
| 582 | + */ | |
| 583 | + if (phys_to_virt(mb->start) >= VMALLOC_MIN) { | |
| 584 | + printk(KERN_NOTICE "Ignoring RAM at %.8lx-%.8lx " | |
| 585 | + "(vmalloc region overlap).\n", | |
| 586 | + mb->start, mb->start + mb->size - 1); | |
| 587 | + return 0; | |
| 588 | + } | |
| 589 | + | |
| 590 | + /* | |
| 591 | + * Check whether this memory region would partially overlap | |
| 592 | + * the vmalloc area. | |
| 593 | + */ | |
| 594 | + if (phys_to_virt(mb->start + mb->size) < phys_to_virt(mb->start) || | |
| 595 | + phys_to_virt(mb->start + mb->size) > VMALLOC_MIN) { | |
| 596 | + unsigned long newsize = VMALLOC_MIN - phys_to_virt(mb->start); | |
| 597 | + | |
| 598 | + printk(KERN_NOTICE "Truncating RAM at %.8lx-%.8lx " | |
| 599 | + "to -%.8lx (vmalloc region overlap).\n", | |
| 600 | + mb->start, mb->start + mb->size - 1, | |
| 601 | + mb->start + newsize - 1); | |
| 602 | + mb->size = newsize; | |
| 603 | + } | |
| 604 | + | |
| 605 | + return 1; | |
| 606 | +} | |
| 607 | + | |
| 608 | +static void __init sanity_check_meminfo(struct meminfo *mi) | |
| 609 | +{ | |
| 610 | + int i; | |
| 611 | + int j; | |
| 612 | + | |
| 613 | + for (i = 0, j = 0; i < mi->nr_banks; i++) { | |
| 614 | + if (check_membank_valid(&mi->bank[i])) | |
| 615 | + mi->bank[j++] = mi->bank[i]; | |
| 616 | + } | |
| 617 | + mi->nr_banks = j; | |
| 618 | +} | |
| 619 | + | |
| 571 | 620 | static inline void prepare_page_table(struct meminfo *mi) |
| 572 | 621 | { |
| 573 | 622 | unsigned long addr; |
| @@ -753,6 +802,7 @@ void __init paging_init(struct meminfo *mi, struct machine_desc *mdesc) · 179 unmodified lines | ||
| 753 | 802 | void *zero_page; |
| 754 | 803 | |
| 755 | 804 | build_mem_type_table(); |
| 805 | + sanity_check_meminfo(mi); | |
| 756 | 806 | prepare_page_table(mi); |
| 757 | 807 | bootmem_init(mi); |
| 758 | 808 | devicemaps_init(mdesc); |
| @@ -231,7 +231,7 @@ cpu_arm720_name: · 230 unmodified lines | ||
| 231 | 231 | .align |
| 232 | 232 | |
| 233 | 233 | /* |
| 234 | − * See linux/include/asm-arm/procinfo.h for a definition of this structure. | |
| 234 | + * See <asm/procinfo.h> for a definition of this structure. | |
| 235 | 235 | */ |
| 236 | 236 | |
| 237 | 237 | .section ".proc.info.init", #alloc, #execinstr |
| @@ -15,6 +15,7 @@ · 14 unmodified lines | ||
| 15 | 15 | #include <asm/pgtable-hwdef.h> |
| 16 | 16 | #include <asm/pgtable.h> |
| 17 | 17 | #include <asm/ptrace.h> |
| 18 | +#include "proc-macros.S" | |
| 18 | 19 | |
| 19 | 20 | /* ARM940T has a 4KB DCache comprising 256 lines of 4 words */ |
| 20 | 21 | #define CACHE_DLINESIZE 16 |
| @@ -17,6 +17,7 @@ · 16 unmodified lines | ||
| 17 | 17 | #include <asm/pgtable-hwdef.h> |
| 18 | 18 | #include <asm/pgtable.h> |
| 19 | 19 | #include <asm/ptrace.h> |
| 20 | +#include "proc-macros.S" | |
| 20 | 21 | |
| 21 | 22 | /* |
| 22 | 23 | * ARM946E-S is synthesizable to have 0KB to 1MB sized D-Cache, |
| @@ -18,7 +18,7 @@ · 17 unmodified lines | ||
| 18 | 18 | #include <asm/assembler.h> |
| 19 | 19 | #include <asm/asm-offsets.h> |
| 20 | 20 | #include <asm/elf.h> |
| 21 | −#include <asm/hardware.h> | |
| 21 | +#include <mach/hardware.h> | |
| 22 | 22 | #include <asm/pgtable-hwdef.h> |
| 23 | 23 | #include <asm/pgtable.h> |
| 24 | 24 | #include <asm/ptrace.h> |
| @@ -23,7 +23,7 @@ · 22 unmodified lines | ||
| 23 | 23 | #include <asm/assembler.h> |
| 24 | 24 | #include <asm/asm-offsets.h> |
| 25 | 25 | #include <asm/elf.h> |
| 26 | −#include <asm/hardware.h> | |
| 26 | +#include <mach/hardware.h> | |
| 27 | 27 | #include <asm/pgtable-hwdef.h> |
| 28 | 28 | #include <asm/pgtable.h> |
| 29 | 29 | |
| @@ -28,7 +28,7 @@ · 27 unmodified lines | ||
| 28 | 28 | #include <linux/init.h> |
| 29 | 29 | #include <asm/assembler.h> |
| 30 | 30 | #include <asm/elf.h> |
| 31 | −#include <asm/hardware.h> | |
| 31 | +#include <mach/hardware.h> | |
| 32 | 32 | #include <asm/pgtable.h> |
| 33 | 33 | #include <asm/pgtable-hwdef.h> |
| 34 | 34 | #include <asm/page.h> |
| @@ -51,11 +51,6 @@ · 16 unmodified lines | ||
| 51 | 51 | */ |
| 52 | 52 | #define CACHESIZE 32768 |
| 53 | 53 | |
| 54 | −/* | |
| 55 | − * Run with L2 enabled. | |
| 56 | − */ | |
| 57 | −#define L2_CACHE_ENABLE 1 | |
| 58 | − | |
| 59 | 54 | /* |
| 60 | 55 | * This macro is used to wait for a CP15 write and is needed when we |
| 61 | 56 | * have to ensure that the last operation to the coprocessor was |
| @@ -265,12 +260,9 @@ ENTRY(xsc3_dma_inv_range) · 203 unmodified lines | ||
| 265 | 260 | tst r0, #CACHELINESIZE - 1 |
| 266 | 261 | bic r0, r0, #CACHELINESIZE - 1 |
| 267 | 262 | mcrne p15, 0, r0, c7, c10, 1 @ clean L1 D line |
| 268 | − mcrne p15, 1, r0, c7, c11, 1 @ clean L2 line | |
| 269 | 263 | tst r1, #CACHELINESIZE - 1 |
| 270 | 264 | mcrne p15, 0, r1, c7, c10, 1 @ clean L1 D line |
| 271 | − mcrne p15, 1, r1, c7, c11, 1 @ clean L2 line | |
| 272 | 265 | 1: mcr p15, 0, r0, c7, c6, 1 @ invalidate L1 D line |
| 273 | − mcr p15, 1, r0, c7, c7, 1 @ invalidate L2 line | |
| 274 | 266 | add r0, r0, #CACHELINESIZE |
| 275 | 267 | cmp r0, r1 |
| 276 | 268 | blo 1b |
| @@ -288,7 +280,6 @@ ENTRY(xsc3_dma_inv_range) · 11 unmodified lines | ||
| 288 | 280 | ENTRY(xsc3_dma_clean_range) |
| 289 | 281 | bic r0, r0, #CACHELINESIZE - 1 |
| 290 | 282 | 1: mcr p15, 0, r0, c7, c10, 1 @ clean L1 D line |
| 291 | − mcr p15, 1, r0, c7, c11, 1 @ clean L2 line | |
| 292 | 283 | add r0, r0, #CACHELINESIZE |
| 293 | 284 | cmp r0, r1 |
| 294 | 285 | blo 1b |
| @@ -306,8 +297,6 @@ ENTRY(xsc3_dma_clean_range) · 11 unmodified lines | ||
| 306 | 297 | ENTRY(xsc3_dma_flush_range) |
| 307 | 298 | bic r0, r0, #CACHELINESIZE - 1 |
| 308 | 299 | 1: mcr p15, 0, r0, c7, c14, 1 @ clean/invalidate L1 D line |
| 309 | − mcr p15, 1, r0, c7, c11, 1 @ clean L2 line | |
| 310 | − mcr p15, 1, r0, c7, c7, 1 @ invalidate L2 line | |
| 311 | 300 | add r0, r0, #CACHELINESIZE |
| 312 | 301 | cmp r0, r1 |
| 313 | 302 | blo 1b |
| @@ -347,9 +336,7 @@ ENTRY(cpu_xsc3_switch_mm) · 33 unmodified lines | ||
| 347 | 336 | mcr p15, 0, ip, c7, c5, 0 @ invalidate L1 I cache and BTB |
| 348 | 337 | mcr p15, 0, ip, c7, c10, 4 @ data write barrier |
| 349 | 338 | mcr p15, 0, ip, c7, c5, 4 @ prefetch flush |
| 350 | −#ifdef L2_CACHE_ENABLE | |
| 351 | 339 | orr r0, r0, #0x18 @ cache the page table in L2 |
| 352 | −#endif | |
| 353 | 340 | mcr p15, 0, r0, c2, c0, 0 @ load page table pointer |
| 354 | 341 | mcr p15, 0, ip, c8, c7, 0 @ invalidate I and D TLBs |
| 355 | 342 | cpwait_ret lr, ip |
| @@ -378,12 +365,10 @@ ENTRY(cpu_xsc3_set_pte_ext) · 22 unmodified lines | ||
| 378 | 365 | orreq r2, r2, #PTE_EXT_AP_UNO_SRW @ yes -> user n/a, system r/w |
| 379 | 366 | @ combined with user -> user r/w |
| 380 | 367 | |
| 381 | −#if L2_CACHE_ENABLE | |
| 382 | 368 | @ If it's cacheable, it needs to be in L2 also. |
| 383 | 369 | eor ip, r1, #L_PTE_CACHEABLE |
| 384 | 370 | tst ip, #L_PTE_CACHEABLE |
| 385 | 371 | orreq r2, r2, #PTE_EXT_TEX(0x5) |
| 386 | −#endif | |
| 387 | 372 | |
| 388 | 373 | tst r3, #L_PTE_PRESENT | L_PTE_YOUNG @ present and young? |
| 389 | 374 | movne r2, #0 @ no -> fault |
| @@ -408,9 +393,7 @@ __xsc3_setup: · 18 unmodified lines | ||
| 408 | 393 | mcr p15, 0, ip, c7, c10, 4 @ data write barrier |
| 409 | 394 | mcr p15, 0, ip, c7, c5, 4 @ prefetch flush |
| 410 | 395 | mcr p15, 0, ip, c8, c7, 0 @ invalidate I and D TLBs |
| 411 | −#if L2_CACHE_ENABLE | |
| 412 | 396 | orr r4, r4, #0x18 @ cache the page table in L2 |
| 413 | −#endif | |
| 414 | 397 | mcr p15, 0, r4, c2, c0, 0 @ load page table pointer |
| 415 | 398 | |
| 416 | 399 | mov r0, #0 @ don't allow CP access |
| @@ -418,9 +401,7 @@ __xsc3_setup: · 1 unmodified line | ||
| 418 | 401 | |
| 419 | 402 | mrc p15, 0, r0, c1, c0, 1 @ get auxiliary control reg |
| 420 | 403 | and r0, r0, #2 @ preserve bit P bit setting |
| 421 | −#if L2_CACHE_ENABLE | |
| 422 | 404 | orr r0, r0, #(1 << 10) @ enable L2 for LLR cache |
| 423 | −#endif | |
| 424 | 405 | mcr p15, 0, r0, c1, c0, 1 @ set auxiliary control reg |
| 425 | 406 | |
| 426 | 407 | adr r5, xsc3_crval |
| @@ -429,9 +410,6 @@ __xsc3_setup: · 2 unmodified lines | ||
| 429 | 410 | bic r0, r0, r5 @ ..V. ..R. .... ..A. |
| 430 | 411 | orr r0, r0, r6 @ ..VI Z..S .... .C.M (mmu) |
| 431 | 412 | @ ...I Z..S .... .... (uc) |
| 432 | −#if L2_CACHE_ENABLE | |
| 433 | − orr r0, r0, #0x04000000 @ L2 enable | |
| 434 | −#endif | |
| 435 | 413 | mov pc, lr |
| 436 | 414 | |
| 437 | 415 | .size __xsc3_setup, . - __xsc3_setup |
| @@ -69,7 +69,7 @@ typedef union tagFPREG { · 68 unmodified lines | ||
| 69 | 69 | * This structure is exported to user space. Do not re-order. |
| 70 | 70 | * Only add new stuff to the end, and do not change the size of |
| 71 | 71 | * any element. Elements of this structure are used by user |
| 72 | − * space, and must match struct user_fp in include/asm-arm/user.h. | |
| 72 | + * space, and must match struct user_fp in <asm/user.h>. | |
| 73 | 73 | * We include the byte offsets below for documentation purposes. |
| 74 | 74 | * |
| 75 | 75 | * The size of this structure and FPREG are checked by fpmodule.c |
| @@ -40,7 +40,7 @@ · 39 unmodified lines | ||
| 40 | 40 | #include <asm/io.h> |
| 41 | 41 | #include <asm/irq.h> |
| 42 | 42 | #include <asm/mach/irq.h> |
| 43 | −#include <asm/hardware.h> | |
| 43 | +#include <mach/hardware.h> | |
| 44 | 44 | #include <asm/system.h> |
| 45 | 45 | |
| 46 | 46 | #include "op_counter.h" |
| @@ -19,7 +19,7 @@ · 18 unmodified lines | ||
| 19 | 19 | #include <linux/platform_device.h> |
| 20 | 20 | #include <asm/hardware/iop3xx.h> |
| 21 | 21 | #include <linux/dma-mapping.h> |
| 22 | −#include <asm/arch/adma.h> | |
| 22 | +#include <mach/adma.h> | |
| 23 | 23 | #include <asm/hardware/iop_adma.h> |
| 24 | 24 | |
| 25 | 25 | #ifdef CONFIG_ARCH_IOP32X |
| @@ -25,9 +25,8 @@ · 24 unmodified lines | ||
| 25 | 25 | #include <asm/setup.h> |
| 26 | 26 | #include <asm/system.h> |
| 27 | 27 | #include <asm/memory.h> |
| 28 | −#include <asm/hardware.h> | |
| 28 | +#include <mach/hardware.h> | |
| 29 | 29 | #include <asm/hardware/iop3xx.h> |
| 30 | −#include <asm/mach-types.h> | |
| 31 | 30 | #include <asm/mach/arch.h> |
| 32 | 31 | |
| 33 | 32 | #ifdef CONFIG_ARCH_IOP32X |
| @@ -18,7 +18,7 @@ · 17 unmodified lines | ||
| 18 | 18 | */ |
| 19 | 19 | #include <linux/kernel.h> |
| 20 | 20 | #include <linux/module.h> |
| 21 | −#include <asm/hardware.h> | |
| 21 | +#include <mach/hardware.h> | |
| 22 | 22 | #include <asm/io.h> |
| 23 | 23 | |
| 24 | 24 | void * __iomem __iop3xx_ioremap(unsigned long cookie, size_t size, |
| @@ -21,10 +21,9 @@ · 20 unmodified lines | ||
| 21 | 21 | #include <asm/irq.h> |
| 22 | 22 | #include <asm/signal.h> |
| 23 | 23 | #include <asm/system.h> |
| 24 | −#include <asm/hardware.h> | |
| 24 | +#include <mach/hardware.h> | |
| 25 | 25 | #include <asm/mach/pci.h> |
| 26 | 26 | #include <asm/hardware/iop3xx.h> |
| 27 | −#include <asm/mach-types.h> | |
| 28 | 27 | |
| 29 | 28 | // #define DEBUG |
| 30 | 29 | |
| @@ -18,13 +18,13 @@ · 17 unmodified lines | ||
| 18 | 18 | #include <linux/time.h> |
| 19 | 19 | #include <linux/init.h> |
| 20 | 20 | #include <linux/timex.h> |
| 21 | −#include <asm/hardware.h> | |
| 21 | +#include <mach/hardware.h> | |
| 22 | 22 | #include <asm/io.h> |
| 23 | 23 | #include <asm/irq.h> |
| 24 | 24 | #include <asm/uaccess.h> |
| 25 | 25 | #include <asm/mach/irq.h> |
| 26 | 26 | #include <asm/mach/time.h> |
| 27 | −#include <asm/arch/time.h> | |
| 27 | +#include <mach/time.h> | |
| 28 | 28 | |
| 29 | 29 | static unsigned long ticks_per_jiffy; |
| 30 | 30 | static unsigned long ticks_per_usec; |
| @@ -39,7 +39,7 @@ · 38 unmodified lines | ||
| 39 | 39 | #include <linux/string.h> |
| 40 | 40 | #include <linux/version.h> |
| 41 | 41 | |
| 42 | −#include <asm/arch/clock.h> | |
| 42 | +#include <mach/clock.h> | |
| 43 | 43 | |
| 44 | 44 | static LIST_HEAD(clocks); |
| 45 | 45 | static DEFINE_MUTEX(clocks_mutex); |
| @@ -23,7 +23,7 @@ · 22 unmodified lines | ||
| 23 | 23 | #include <linux/io.h> |
| 24 | 24 | #include <linux/irq.h> |
| 25 | 25 | #include <linux/gpio.h> |
| 26 | −#include <asm/hardware.h> | |
| 26 | +#include <mach/hardware.h> | |
| 27 | 27 | #include <asm-generic/bug.h> |
| 28 | 28 | |
| 29 | 29 | static struct mxc_gpio_port *mxc_gpio_ports; |
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
| @@ -1,4 +1,4 @@ | ||
| 1 | −/* linux/include/asm-arm/arch-imx/debug-macro.S | |
| 1 | +/* arch/arm/mach-imx/include/mach/debug-macro.S | |
| 2 | 2 | * |
| 3 | 3 | * Debugging macro include header |
| 4 | 4 | * |
| @@ -11,22 +11,22 @@ · 6 unmodified lines | ||
| 11 | 11 | * |
| 12 | 12 | */ |
| 13 | 13 | |
| 14 | −#include <asm/arch/hardware.h> | |
| 14 | +#include <mach/hardware.h> | |
| 15 | 15 | |
| 16 | 16 | #ifdef CONFIG_MACH_MX31ADS |
| 17 | −#include <asm/arch/board-mx31ads.h> | |
| 17 | +#include <mach/board-mx31ads.h> | |
| 18 | 18 | #endif |
| 19 | 19 | #ifdef CONFIG_MACH_PCM037 |
| 20 | −#include <asm/arch/board-pcm037.h> | |
| 20 | +#include <mach/board-pcm037.h> | |
| 21 | 21 | #endif |
| 22 | 22 | #ifdef CONFIG_MACH_MX31LITE |
| 23 | −#include <asm/arch/board-mx31lite.h> | |
| 23 | +#include <mach/board-mx31lite.h> | |
| 24 | 24 | #endif |
| 25 | 25 | #ifdef CONFIG_MACH_MX27ADS |
| 26 | −#include <asm/arch/board-mx27ads.h> | |
| 26 | +#include <mach/board-mx27ads.h> | |
| 27 | 27 | #endif |
| 28 | 28 | #ifdef CONFIG_MACH_PCM038 |
| 29 | −#include <asm/arch/board-pcm038.h> | |
| 29 | +#include <mach/board-pcm038.h> | |
| 30 | 30 | #endif |
| 31 | 31 | .macro addruart,rx |
| 32 | 32 | mrc p15, 0, \rx, c1, c0 |
File renamed without changes.
File renamed without changes.
| @@ -19,7 +19,7 @@ · 18 unmodified lines | ||
| 19 | 19 | #ifndef __ASM_ARCH_MXC_GPIO_H__ |
| 20 | 20 | #define __ASM_ARCH_MXC_GPIO_H__ |
| 21 | 21 | |
| 22 | −#include <asm/hardware.h> | |
| 22 | +#include <mach/hardware.h> | |
| 23 | 23 | #include <asm-generic/gpio.h> |
| 24 | 24 | |
| 25 | 25 | /* use gpiolib dispatchers */ |
| @@ -23,15 +23,15 @@ · 22 unmodified lines | ||
| 23 | 23 | #include <asm/sizes.h> |
| 24 | 24 | |
| 25 | 25 | #ifdef CONFIG_ARCH_MX3 |
| 26 | −# include <asm/arch/mx31.h> | |
| 26 | +# include <mach/mx31.h> | |
| 27 | 27 | #endif |
| 28 | 28 | |
| 29 | 29 | #ifdef CONFIG_ARCH_MX2 |
| 30 | 30 | # ifdef CONFIG_MACH_MX27 |
| 31 | −# include <asm/arch/mx27.h> | |
| 31 | +# include <mach/mx27.h> | |
| 32 | 32 | # endif |
| 33 | 33 | #endif |
| 34 | 34 | |
| 35 | −#include <asm/arch/mxc.h> | |
| 35 | +#include <mach/mxc.h> | |
| 36 | 36 | |
| 37 | 37 | #endif /* __ASM_ARCH_MXC_HARDWARE_H__ */ |
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
| @@ -11,6 +11,6 @@ · 10 unmodified lines | ||
| 11 | 11 | #ifndef __ASM_ARCH_MXC_IRQS_H__ |
| 12 | 12 | #define __ASM_ARCH_MXC_IRQS_H__ |
| 13 | 13 | |
| 14 | −#include <asm/hardware.h> | |
| 14 | +#include <mach/hardware.h> | |
| 15 | 15 | |
| 16 | 16 | #endif /* __ASM_ARCH_MXC_IRQS_H__ */ |
| @@ -11,7 +11,7 @@ · 10 unmodified lines | ||
| 11 | 11 | #ifndef __ASM_ARCH_MXC_MEMORY_H__ |
| 12 | 12 | #define __ASM_ARCH_MXC_MEMORY_H__ |
| 13 | 13 | |
| 14 | −#include <asm/hardware.h> | |
| 14 | +#include <mach/hardware.h> | |
| 15 | 15 | |
| 16 | 16 | /* |
| 17 | 17 | * Virtual view <-> DMA view memory address translations |
File renamed without changes.
File renamed without changes.
File renamed without changes.
| @@ -24,7 +24,7 @@ · 23 unmodified lines | ||
| 24 | 24 | #define __PLAT_MXC_TIMER_H |
| 25 | 25 | |
| 26 | 26 | #include <linux/clk.h> |
| 27 | −#include <asm/hardware.h> | |
| 27 | +#include <mach/hardware.h> | |
| 28 | 28 | |
| 29 | 29 | #ifdef CONFIG_ARCH_IMX |
| 30 | 30 | #define TIMER_BASE IO_ADDRESS(TIM1_BASE_ADDR) |
File renamed without changes.
| @@ -20,6 +20,6 @@ · 19 unmodified lines | ||
| 20 | 20 | #ifndef __ASM_ARCH_MXC_TIMEX_H__ |
| 21 | 21 | #define __ASM_ARCH_MXC_TIMEX_H__ |
| 22 | 22 | |
| 23 | −#include <asm/hardware.h> /* for CLOCK_TICK_RATE */ | |
| 23 | +#include <mach/hardware.h> /* for CLOCK_TICK_RATE */ | |
| 24 | 24 | |
| 25 | 25 | #endif /* __ASM_ARCH_MXC_TIMEX_H__ */ |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-mxc/uncompress.h | |
| 2 | + * arch/arm/plat-mxc/include/mach/uncompress.h | |
| 3 | 3 | * |
| 4 | 4 | * |
| 5 | 5 | * |
| @@ -25,7 +25,7 @@ · 19 unmodified lines | ||
| 25 | 25 | |
| 26 | 26 | #define __MXC_BOOT_UNCOMPRESS |
| 27 | 27 | |
| 28 | −#include <asm/hardware.h> | |
| 28 | +#include <mach/hardware.h> | |
| 29 | 29 | |
| 30 | 30 | #define UART(x) (*(volatile unsigned long *)(serial_port + (x))) |
| 31 | 31 | |
File renamed without changes.
| @@ -30,9 +30,9 @@ · 29 unmodified lines | ||
| 30 | 30 | #include <linux/string.h> |
| 31 | 31 | #include <linux/gpio.h> |
| 32 | 32 | |
| 33 | −#include <asm/hardware.h> | |
| 33 | +#include <mach/hardware.h> | |
| 34 | 34 | #include <asm/mach/map.h> |
| 35 | −#include <asm/arch/iomux-mx1-mx2.h> | |
| 35 | +#include <mach/iomux-mx1-mx2.h> | |
| 36 | 36 | |
| 37 | 37 | void mxc_gpio_mode(int gpio_mode) |
| 38 | 38 | { |
| @@ -19,7 +19,7 @@ · 18 unmodified lines | ||
| 19 | 19 | |
| 20 | 20 | #include <linux/irq.h> |
| 21 | 21 | #include <asm/io.h> |
| 22 | −#include <asm/arch/common.h> | |
| 22 | +#include <mach/common.h> | |
| 23 | 23 | |
| 24 | 24 | #define AVIC_BASE IO_ADDRESS(AVIC_BASE_ADDR) |
| 25 | 25 | #define AVIC_INTCNTL (AVIC_BASE + 0x00) /* int control reg */ |
| @@ -26,10 +26,10 @@ · 25 unmodified lines | ||
| 26 | 26 | #include <linux/clockchips.h> |
| 27 | 27 | #include <linux/clk.h> |
| 28 | 28 | |
| 29 | −#include <asm/hardware.h> | |
| 29 | +#include <mach/hardware.h> | |
| 30 | 30 | #include <asm/mach/time.h> |
| 31 | −#include <asm/arch/common.h> | |
| 32 | −#include <asm/arch/mxc_timer.h> | |
| 31 | +#include <mach/common.h> | |
| 32 | +#include <mach/mxc_timer.h> | |
| 33 | 33 | |
| 34 | 34 | static struct clock_event_device clockevent_mxc; |
| 35 | 35 | static enum clock_event_mode clockevent_mode = CLOCK_EVT_MODE_UNUSED; |
| @@ -10,7 +10,6 @@ · 9 unmodified lines | ||
| 10 | 10 | * it under the terms of the GNU General Public License version 2 as |
| 11 | 11 | * published by the Free Software Foundation. |
| 12 | 12 | */ |
| 13 | −#include <linux/version.h> | |
| 14 | 13 | #include <linux/kernel.h> |
| 15 | 14 | #include <linux/init.h> |
| 16 | 15 | #include <linux/module.h> |
| @@ -26,7 +25,7 @@ · 9 unmodified lines | ||
| 26 | 25 | |
| 27 | 26 | #include <asm/io.h> |
| 28 | 27 | |
| 29 | −#include <asm/arch/clock.h> | |
| 28 | +#include <mach/clock.h> | |
| 30 | 29 | |
| 31 | 30 | static LIST_HEAD(clocks); |
| 32 | 31 | static DEFINE_MUTEX(clocks_mutex); |
| @@ -19,20 +19,20 @@ · 18 unmodified lines | ||
| 19 | 19 | #include <linux/serial_reg.h> |
| 20 | 20 | #include <linux/clk.h> |
| 21 | 21 | |
| 22 | −#include <asm/hardware.h> | |
| 22 | +#include <mach/hardware.h> | |
| 23 | 23 | #include <asm/system.h> |
| 24 | 24 | #include <asm/pgtable.h> |
| 25 | 25 | #include <asm/mach/map.h> |
| 26 | 26 | #include <asm/io.h> |
| 27 | 27 | #include <asm/setup.h> |
| 28 | 28 | |
| 29 | −#include <asm/arch/common.h> | |
| 30 | −#include <asm/arch/board.h> | |
| 31 | −#include <asm/arch/control.h> | |
| 32 | −#include <asm/arch/mux.h> | |
| 33 | −#include <asm/arch/fpga.h> | |
| 29 | +#include <mach/common.h> | |
| 30 | +#include <mach/board.h> | |
| 31 | +#include <mach/control.h> | |
| 32 | +#include <mach/mux.h> | |
| 33 | +#include <mach/fpga.h> | |
| 34 | 34 | |
| 35 | −#include <asm/arch/clock.h> | |
| 35 | +#include <mach/clock.h> | |
| 36 | 36 | |
| 37 | 37 | #if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3) |
| 38 | 38 | # include "../mach-omap2/sdrc.h" |
| @@ -21,7 +21,7 @@ · 20 unmodified lines | ||
| 21 | 21 | #include <linux/err.h> |
| 22 | 22 | #include <linux/clk.h> |
| 23 | 23 | |
| 24 | −#include <asm/hardware.h> | |
| 24 | +#include <mach/hardware.h> | |
| 25 | 25 | #include <asm/io.h> |
| 26 | 26 | #include <asm/system.h> |
| 27 | 27 | |
| @@ -13,11 +13,11 @@ · 12 unmodified lines | ||
| 13 | 13 | #include <linux/init.h> |
| 14 | 14 | #include <linux/platform_device.h> |
| 15 | 15 | |
| 16 | −#include <asm/hardware.h> | |
| 16 | +#include <mach/hardware.h> | |
| 17 | 17 | #include <asm/io.h> |
| 18 | 18 | |
| 19 | −#include <asm/arch/board.h> | |
| 20 | −#include <asm/arch/gpio.h> | |
| 19 | +#include <mach/board.h> | |
| 20 | +#include <mach/gpio.h> | |
| 21 | 21 | |
| 22 | 22 | |
| 23 | 23 | /* Many OMAP development platforms reuse the same "debug board"; these |
| @@ -13,13 +13,13 @@ · 12 unmodified lines | ||
| 13 | 13 | #include <linux/leds.h> |
| 14 | 14 | |
| 15 | 15 | #include <asm/io.h> |
| 16 | −#include <asm/hardware.h> | |
| 16 | +#include <mach/hardware.h> | |
| 17 | 17 | #include <asm/leds.h> |
| 18 | 18 | #include <asm/system.h> |
| 19 | 19 | #include <asm/mach-types.h> |
| 20 | 20 | |
| 21 | −#include <asm/arch/fpga.h> | |
| 22 | −#include <asm/arch/gpio.h> | |
| 21 | +#include <mach/fpga.h> | |
| 22 | +#include <mach/gpio.h> | |
| 23 | 23 | |
| 24 | 24 | |
| 25 | 25 | /* Many OMAP development platforms reuse the same "debug board"; these |
| @@ -14,17 +14,17 @@ · 13 unmodified lines | ||
| 14 | 14 | #include <linux/init.h> |
| 15 | 15 | #include <linux/platform_device.h> |
| 16 | 16 | |
| 17 | −#include <asm/hardware.h> | |
| 17 | +#include <mach/hardware.h> | |
| 18 | 18 | #include <asm/io.h> |
| 19 | 19 | #include <asm/mach-types.h> |
| 20 | 20 | #include <asm/mach/map.h> |
| 21 | 21 | |
| 22 | −#include <asm/arch/tc.h> | |
| 23 | −#include <asm/arch/board.h> | |
| 24 | −#include <asm/arch/mux.h> | |
| 25 | −#include <asm/arch/gpio.h> | |
| 26 | −#include <asm/arch/menelaus.h> | |
| 27 | −#include <asm/arch/mcbsp.h> | |
| 22 | +#include <mach/tc.h> | |
| 23 | +#include <mach/board.h> | |
| 24 | +#include <mach/mux.h> | |
| 25 | +#include <mach/gpio.h> | |
| 26 | +#include <mach/menelaus.h> | |
| 27 | +#include <mach/mcbsp.h> | |
| 28 | 28 | |
| 29 | 29 | #if defined(CONFIG_OMAP_DSP) || defined(CONFIG_OMAP_DSP_MODULE) |
| 30 | 30 | |
| @@ -28,10 +28,10 @@ · 27 unmodified lines | ||
| 28 | 28 | #include <linux/io.h> |
| 29 | 29 | |
| 30 | 30 | #include <asm/system.h> |
| 31 | −#include <asm/hardware.h> | |
| 31 | +#include <mach/hardware.h> | |
| 32 | 32 | #include <asm/dma.h> |
| 33 | 33 | |
| 34 | −#include <asm/arch/tc.h> | |
| 34 | +#include <mach/tc.h> | |
| 35 | 35 | |
| 36 | 36 | #undef DEBUG |
| 37 | 37 | |
| @@ -32,10 +32,10 @@ · 31 unmodified lines | ||
| 32 | 32 | #include <linux/list.h> |
| 33 | 33 | #include <linux/clk.h> |
| 34 | 34 | #include <linux/delay.h> |
| 35 | −#include <asm/hardware.h> | |
| 36 | −#include <asm/arch/dmtimer.h> | |
| 35 | +#include <mach/hardware.h> | |
| 36 | +#include <mach/dmtimer.h> | |
| 37 | 37 | #include <asm/io.h> |
| 38 | −#include <asm/arch/irqs.h> | |
| 38 | +#include <mach/irqs.h> | |
| 39 | 39 | |
| 40 | 40 | /* register offsets */ |
| 41 | 41 | #define _OMAP_TIMER_ID_OFFSET 0x00 |
| @@ -28,14 +28,13 @@ · 27 unmodified lines | ||
| 28 | 28 | #include <linux/platform_device.h> |
| 29 | 29 | #include <linux/bootmem.h> |
| 30 | 30 | |
| 31 | −#include <asm/hardware.h> | |
| 31 | +#include <mach/hardware.h> | |
| 32 | 32 | #include <asm/io.h> |
| 33 | −#include <asm/mach-types.h> | |
| 34 | 33 | #include <asm/mach/map.h> |
| 35 | 34 | |
| 36 | −#include <asm/arch/board.h> | |
| 37 | −#include <asm/arch/sram.h> | |
| 38 | −#include <asm/arch/omapfb.h> | |
| 35 | +#include <mach/board.h> | |
| 36 | +#include <mach/sram.h> | |
| 37 | +#include <mach/omapfb.h> | |
| 39 | 38 | |
| 40 | 39 | #if defined(CONFIG_FB_OMAP) || defined(CONFIG_FB_OMAP_MODULE) |
| 41 | 40 | |
| @@ -18,10 +18,10 @@ · 17 unmodified lines | ||
| 18 | 18 | #include <linux/err.h> |
| 19 | 19 | #include <linux/clk.h> |
| 20 | 20 | |
| 21 | −#include <asm/hardware.h> | |
| 21 | +#include <mach/hardware.h> | |
| 22 | 22 | #include <asm/irq.h> |
| 23 | −#include <asm/arch/irqs.h> | |
| 24 | −#include <asm/arch/gpio.h> | |
| 23 | +#include <mach/irqs.h> | |
| 24 | +#include <mach/gpio.h> | |
| 25 | 25 | #include <asm/mach/irq.h> |
| 26 | 26 | |
| 27 | 27 | #include <asm/io.h> |
| @@ -26,8 +26,7 @@ · 25 unmodified lines | ||
| 26 | 26 | #include <linux/kernel.h> |
| 27 | 27 | #include <linux/platform_device.h> |
| 28 | 28 | #include <linux/i2c.h> |
| 29 | −#include <asm/mach-types.h> | |
| 30 | −#include <asm/arch/mux.h> | |
| 29 | +#include <mach/mux.h> | |
| 31 | 30 | |
| 32 | 31 | #define OMAP_I2C_SIZE 0x3f |
| 33 | 32 | #define OMAP1_I2C_BASE 0xfffb3800 |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-omap/aic23.h | |
| 2 | + * arch/arm/plat-omap/include/mach/aic23.h | |
| 3 | 3 | * |
| 4 | 4 | * Hardware definitions for TI TLV320AIC23 audio codec |
| 5 | 5 | * |
File renamed without changes.
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-omap/board-2430sdp.h | |
| 2 | + * arch/arm/plat-omap/include/mach/board-2430sdp.h | |
| 3 | 3 | * |
| 4 | 4 | * Hardware definitions for TI OMAP2430 SDP board. |
| 5 | 5 | * |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-omap/board-ams-delta.h | |
| 2 | + * arch/arm/plat-omap/include/mach/board-ams-delta.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 2006 Jonathan McDowell <noodles@earth.li> |
| 5 | 5 | * |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-omap/board-apollon.h | |
| 2 | + * arch/arm/plat-omap/include/mach/board-apollon.h | |
| 3 | 3 | * |
| 4 | 4 | * Hardware definitions for Samsung OMAP24XX Apollon board. |
| 5 | 5 | * |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-omap/board-fsample.h | |
| 2 | + * arch/arm/plat-omap/include/mach/board-fsample.h | |
| 3 | 3 | * |
| 4 | 4 | * Board-specific goodies for TI F-Sample. |
| 5 | 5 | * |
| @@ -15,7 +15,7 @@ · 9 unmodified lines | ||
| 15 | 15 | #define __ASM_ARCH_OMAP_FSAMPLE_H |
| 16 | 16 | |
| 17 | 17 | /* fsample is pretty close to p2-sample */ |
| 18 | −#include <asm/arch/board-perseus2.h> | |
| 18 | +#include <mach/board-perseus2.h> | |
| 19 | 19 | |
| 20 | 20 | #define fsample_cpld_read(reg) __raw_readb(reg) |
| 21 | 21 | #define fsample_cpld_write(val, reg) __raw_writeb(val, reg) |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-omap/board-h2.h | |
| 2 | + * arch/arm/plat-omap/include/mach/board-h2.h | |
| 3 | 3 | * |
| 4 | 4 | * Hardware definitions for TI OMAP1610 H2 board. |
| 5 | 5 | * |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-omap/board-h3.h | |
| 2 | + * arch/arm/plat-omap/include/mach/board-h3.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 2001 RidgeRun, Inc. |
| 5 | 5 | * Copyright (C) 2004 Texas Instruments, Inc. |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-omap/board-h4.h | |
| 2 | + * arch/arm/plat-omap/include/mach/board-h4.h | |
| 3 | 3 | * |
| 4 | 4 | * Hardware definitions for TI OMAP1610 H4 board. |
| 5 | 5 | * |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-omap/board-innovator.h | |
| 2 | + * arch/arm/plat-omap/include/mach/board-innovator.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 2001 RidgeRun, Inc. |
| 5 | 5 | * |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-omap/board-nokia.h | |
| 2 | + * arch/arm/plat-omap/include/mach/board-nokia.h | |
| 3 | 3 | * |
| 4 | 4 | * Information structures for Nokia-specific board config data |
| 5 | 5 | * |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-omap/board-osk.h | |
| 2 | + * arch/arm/plat-omap/include/mach/board-osk.h | |
| 3 | 3 | * |
| 4 | 4 | * Hardware definitions for TI OMAP5912 OSK board. |
| 5 | 5 | * |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-omap/board-palmte.h | |
| 2 | + * arch/arm/plat-omap/include/mach/board-palmte.h | |
| 3 | 3 | * |
| 4 | 4 | * Hardware definitions for the Palm Tungsten E device. |
| 5 | 5 | * |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-omap/board-palmte.h | |
| 2 | + * arch/arm/plat-omap/include/mach/board-palmte.h | |
| 3 | 3 | * |
| 4 | 4 | * Hardware definitions for the Palm Tungsten|T device. |
| 5 | 5 | * |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-omap/board-palmz71.h | |
| 2 | + * arch/arm/plat-omap/include/mach/board-palmz71.h | |
| 3 | 3 | * |
| 4 | 4 | * Hardware definitions for the Palm Zire71 device. |
| 5 | 5 | * |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-omap/board-perseus2.h | |
| 2 | + * arch/arm/plat-omap/include/mach/board-perseus2.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright 2003 by Texas Instruments Incorporated |
| 5 | 5 | * OMAP730 / Perseus2 support by Jean Pihet |
| @@ -30,7 +30,7 @@ · 24 unmodified lines | ||
| 30 | 30 | #ifndef __ASM_ARCH_OMAP_PERSEUS2_H |
| 31 | 31 | #define __ASM_ARCH_OMAP_PERSEUS2_H |
| 32 | 32 | |
| 33 | −#include <asm/arch/fpga.h> | |
| 33 | +#include <mach/fpga.h> | |
| 34 | 34 | |
| 35 | 35 | #ifndef OMAP_SDRAM_DEVICE |
| 36 | 36 | #define OMAP_SDRAM_DEVICE D256M_1X16_4B |
File renamed without changes.
File renamed without changes.
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-omap/board.h | |
| 2 | + * arch/arm/plat-omap/include/mach/board.h | |
| 3 | 3 | * |
| 4 | 4 | * Information structures for board-specific data |
| 5 | 5 | * |
| @@ -12,7 +12,7 @@ · 6 unmodified lines | ||
| 12 | 12 | |
| 13 | 13 | #include <linux/types.h> |
| 14 | 14 | |
| 15 | −#include <asm/arch/gpio-switch.h> | |
| 15 | +#include <mach/gpio-switch.h> | |
| 16 | 16 | |
| 17 | 17 | /* Different peripheral ids */ |
| 18 | 18 | #define OMAP_TAG_CLOCK 0x4f01 |
| @@ -125,7 +125,7 @@ struct omap_pwm_led_platform_data { · 106 unmodified lines | ||
| 125 | 125 | void (*set_power)(struct omap_pwm_led_platform_data *self, int on_off); |
| 126 | 126 | }; |
| 127 | 127 | |
| 128 | −/* See include/asm-arm/arch-omap/gpio-switch.h for definitions */ | |
| 128 | +/* See arch/arm/plat-omap/include/mach/gpio-switch.h for definitions */ | |
| 129 | 129 | struct omap_gpio_switch_config { |
| 130 | 130 | char name[12]; |
| 131 | 131 | u16 gpio; |
| @@ -154,7 +154,7 @@ struct omap_version_config { · 22 unmodified lines | ||
| 154 | 154 | }; |
| 155 | 155 | |
| 156 | 156 | |
| 157 | −#include <asm-arm/arch-omap/board-nokia.h> | |
| 157 | +#include <mach/board-nokia.h> | |
| 158 | 158 | |
| 159 | 159 | struct omap_board_config_entry { |
| 160 | 160 | u16 tag; |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-omap/clock.h | |
| 2 | + * arch/arm/plat-omap/include/mach/clock.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 2004 - 2005 Nokia corporation |
| 5 | 5 | * Written by Tuukka Tikkanen <tuukka.tikkanen@elektrobit.com> |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-omap/common.h | |
| 2 | + * arch/arm/plat-omap/include/mach/common.h | |
| 3 | 3 | * |
| 4 | 4 | * Header for code common to all OMAP machines. |
| 5 | 5 | * |
| @@ -2,7 +2,7 @@ · 1 unmodified line | ||
| 2 | 2 | #define __ASM_ARCH_CONTROL_H |
| 3 | 3 | |
| 4 | 4 | /* |
| 5 | − * include/asm-arm/arch-omap/control.h | |
| 5 | + * arch/arm/plat-omap/include/mach/control.h | |
| 6 | 6 | * |
| 7 | 7 | * OMAP2/3 System Control Module definitions |
| 8 | 8 | * |
| @@ -16,7 +16,7 @@ · 7 unmodified lines | ||
| 16 | 16 | * the Free Software Foundation. |
| 17 | 17 | */ |
| 18 | 18 | |
| 19 | −#include <asm/arch/io.h> | |
| 19 | +#include <mach/io.h> | |
| 20 | 20 | |
| 21 | 21 | #define OMAP242X_CTRL_REGADDR(reg) \ |
| 22 | 22 | (void __iomem *)IO_ADDRESS(OMAP242X_CTRL_BASE + (reg)) |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-omap/cpu.h | |
| 2 | + * arch/arm/plat-omap/include/mach/cpu.h | |
| 3 | 3 | * |
| 4 | 4 | * OMAP cpu type detection |
| 5 | 5 | * |
| @@ -1,4 +1,4 @@ | ||
| 1 | −/* linux/include/asm-arm/arch-omap/debug-macro.S | |
| 1 | +/* arch/arm/plat-omap/include/mach/debug-macro.S | |
| 2 | 2 | * |
| 3 | 3 | * Debugging macro include header |
| 4 | 4 | * |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-omap/dma.h | |
| 2 | + * arch/arm/plat-omap/include/mach/dma.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 2003 Nokia Corporation |
| 5 | 5 | * Author: Juha Yrjölä <juha.yrjola@nokia.com> |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-omap/dmtimer.h | |
| 2 | + * arch/arm/plat-omap/include/mach/dmtimer.h | |
| 3 | 3 | * |
| 4 | 4 | * OMAP Dual-Mode Timers |
| 5 | 5 | * |
File renamed without changes.
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-omap2/eac.h | |
| 2 | + * arch/arm/plat-omap/include/mach2/eac.h | |
| 3 | 3 | * |
| 4 | 4 | * Defines for Enhanced Audio Controller |
| 5 | 5 | * |
| @@ -27,8 +27,8 @@ · 21 unmodified lines | ||
| 27 | 27 | #ifndef __ASM_ARM_ARCH_OMAP2_EAC_H |
| 28 | 28 | #define __ASM_ARM_ARCH_OMAP2_EAC_H |
| 29 | 29 | |
| 30 | −#include <asm/arch/io.h> | |
| 31 | −#include <asm/arch/hardware.h> | |
| 30 | +#include <mach/io.h> | |
| 31 | +#include <mach/hardware.h> | |
| 32 | 32 | #include <asm/irq.h> |
| 33 | 33 | |
| 34 | 34 | #include <sound/core.h> |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-omap/entry-macro.S | |
| 2 | + * arch/arm/plat-omap/include/mach/entry-macro.S | |
| 3 | 3 | * |
| 4 | 4 | * Low-level IRQ helper macros for OMAP-based platforms |
| 5 | 5 | * |
| @@ -7,9 +7,9 @@ · 1 unmodified line | ||
| 7 | 7 | * License version 2. This program is licensed "as is" without any |
| 8 | 8 | * warranty of any kind, whether express or implied. |
| 9 | 9 | */ |
| 10 | −#include <asm/hardware.h> | |
| 11 | −#include <asm/arch/io.h> | |
| 12 | −#include <asm/arch/irqs.h> | |
| 10 | +#include <mach/hardware.h> | |
| 11 | +#include <mach/io.h> | |
| 12 | +#include <mach/irqs.h> | |
| 13 | 13 | |
| 14 | 14 | #if defined(CONFIG_ARCH_OMAP1) |
| 15 | 15 | |
| @@ -57,7 +57,7 @@ · 41 unmodified lines | ||
| 57 | 57 | |
| 58 | 58 | #elif defined(CONFIG_ARCH_OMAP24XX) |
| 59 | 59 | |
| 60 | −#include <asm/arch/omap24xx.h> | |
| 60 | +#include <mach/omap24xx.h> | |
| 61 | 61 | |
| 62 | 62 | .macro disable_fiq |
| 63 | 63 | .endm |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-omap/fpga.h | |
| 2 | + * arch/arm/plat-omap/include/mach/fpga.h | |
| 3 | 3 | * |
| 4 | 4 | * Interrupt handler for OMAP-1510 FPGA |
| 5 | 5 | * |
File renamed without changes.
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-omap/gpio.h | |
| 2 | + * arch/arm/plat-omap/include/mach/gpio.h | |
| 3 | 3 | * |
| 4 | 4 | * OMAP GPIO handling defines and functions |
| 5 | 5 | * |
| @@ -26,7 +26,7 @@ · 20 unmodified lines | ||
| 26 | 26 | #ifndef __ASM_ARCH_OMAP_GPIO_H |
| 27 | 27 | #define __ASM_ARCH_OMAP_GPIO_H |
| 28 | 28 | |
| 29 | −#include <asm/arch/irqs.h> | |
| 29 | +#include <mach/irqs.h> | |
| 30 | 30 | #include <asm/io.h> |
| 31 | 31 | |
| 32 | 32 | #define OMAP_MPUIO_BASE (void __iomem *)0xfffb5000 |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-omap/gpioexpander.h | |
| 2 | + * arch/arm/plat-omap/include/mach/gpioexpander.h | |
| 3 | 3 | * |
| 4 | 4 | * |
| 5 | 5 | * Copyright (C) 2004 Texas Instruments, Inc. |
File renamed without changes.
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-omap/hardware.h | |
| 2 | + * arch/arm/plat-omap/include/mach/hardware.h | |
| 3 | 3 | * |
| 4 | 4 | * Hardware definitions for TI OMAP processors and boards |
| 5 | 5 | * |
| @@ -39,9 +39,9 @@ · 33 unmodified lines | ||
| 39 | 39 | #include <asm/sizes.h> |
| 40 | 40 | #ifndef __ASSEMBLER__ |
| 41 | 41 | #include <asm/types.h> |
| 42 | −#include <asm/arch/cpu.h> | |
| 42 | +#include <mach/cpu.h> | |
| 43 | 43 | #endif |
| 44 | −#include <asm/arch/serial.h> | |
| 44 | +#include <mach/serial.h> | |
| 45 | 45 | |
| 46 | 46 | /* |
| 47 | 47 | * --------------------------------------------------------------------------- |
File renamed without changes.
| @@ -1,9 +1,9 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-omap/io.h | |
| 2 | + * arch/arm/plat-omap/include/mach/io.h | |
| 3 | 3 | * |
| 4 | 4 | * IO definitions for TI OMAP processors and boards |
| 5 | 5 | * |
| 6 | − * Copied from linux/include/asm-arm/arch-sa1100/io.h | |
| 6 | + * Copied from arch/arm/mach-sa1100/include/mach/io.h | |
| 7 | 7 | * Copyright (C) 1997-1999 Russell King |
| 8 | 8 | * |
| 9 | 9 | * This program is free software; you can redistribute it and/or modify it |
| @@ -34,7 +34,7 @@ · 24 unmodified lines | ||
| 34 | 34 | #ifndef __ASM_ARM_ARCH_IO_H |
| 35 | 35 | #define __ASM_ARM_ARCH_IO_H |
| 36 | 36 | |
| 37 | −#include <asm/hardware.h> | |
| 37 | +#include <mach/hardware.h> | |
| 38 | 38 | |
| 39 | 39 | #define IO_SPACE_LIMIT 0xffffffff |
| 40 | 40 | |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-omap/irda.h | |
| 2 | + * arch/arm/plat-omap/include/mach/irda.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 2005-2006 Komal Shah <komal_shah802003@yahoo.com> |
| 5 | 5 | * |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-omap/irqs.h | |
| 2 | + * arch/arm/plat-omap/include/mach/irqs.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) Greg Lonnon 2001 |
| 5 | 5 | * Updated for OMAP-1610 by Tony Lindgren <tony@atomide.com> |
| @@ -327,6 +327,6 @@ · 321 unmodified lines | ||
| 327 | 327 | extern void omap_init_irq(void); |
| 328 | 328 | #endif |
| 329 | 329 | |
| 330 | −#include <asm/hardware.h> | |
| 330 | +#include <mach/hardware.h> | |
| 331 | 331 | |
| 332 | 332 | #endif |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-omap/keypad.h | |
| 2 | + * arch/arm/plat-omap/include/mach/keypad.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 2006 Komal Shah <komal_shah802003@yahoo.com> |
| 5 | 5 | * |
File renamed without changes.
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-omap/led.h | |
| 2 | + * arch/arm/plat-omap/include/mach/led.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 2006 Samsung Electronics |
| 5 | 5 | * Kyungmin Park <kyungmin.park@samsung.com> |
File renamed without changes.
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-omap/mcbsp.h | |
| 2 | + * arch/arm/plat-omap/include/mach/mcbsp.h | |
| 3 | 3 | * |
| 4 | 4 | * Defines for Multi-Channel Buffered Serial Port |
| 5 | 5 | * |
| @@ -27,8 +27,8 @@ · 21 unmodified lines | ||
| 27 | 27 | #include <linux/completion.h> |
| 28 | 28 | #include <linux/spinlock.h> |
| 29 | 29 | |
| 30 | −#include <asm/hardware.h> | |
| 31 | −#include <asm/arch/clock.h> | |
| 30 | +#include <mach/hardware.h> | |
| 31 | +#include <mach/clock.h> | |
| 32 | 32 | |
| 33 | 33 | #define OMAP730_MCBSP1_BASE 0xfffb1000 |
| 34 | 34 | #define OMAP730_MCBSP2_BASE 0xfffb1800 |
File renamed without changes.
| @@ -1,12 +1,12 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-omap/memory.h | |
| 2 | + * arch/arm/plat-omap/include/mach/memory.h | |
| 3 | 3 | * |
| 4 | 4 | * Memory map for OMAP-1510 and 1610 |
| 5 | 5 | * |
| 6 | 6 | * Copyright (C) 2000 RidgeRun, Inc. |
| 7 | 7 | * Author: Greg Lonnon <glonnon@ridgerun.com> |
| 8 | 8 | * |
| 9 | − * This file was derived from linux/include/asm-arm/arch-intergrator/memory.h | |
| 9 | + * This file was derived from arch/arm/mach-intergrator/include/mach/memory.h | |
| 10 | 10 | * Copyright (C) 1999 ARM Limited |
| 11 | 11 | * |
| 12 | 12 | * This program is free software; you can redistribute it and/or modify it |
| @@ -76,13 +76,14 @@ · 63 unmodified lines | ||
| 76 | 76 | (dma_addr_t)virt_to_lbus(page_address(page)) : \ |
| 77 | 77 | (dma_addr_t)__virt_to_bus(page_address(page));}) |
| 78 | 78 | |
| 79 | −#define __arch_dma_to_virt(dev, addr) ({is_lbus_device(dev) ? \ | |
| 80 | − lbus_to_virt(addr) : \ | |
| 81 | − __bus_to_virt(addr);}) | |
| 79 | +#define __arch_dma_to_virt(dev, addr) ({ (void *) (is_lbus_device(dev) ? \ | |
| 80 | + lbus_to_virt(addr) : \ | |
| 81 | + __bus_to_virt(addr)); }) | |
| 82 | 82 | |
| 83 | −#define __arch_virt_to_dma(dev, addr) ({is_lbus_device(dev) ? \ | |
| 84 | − virt_to_lbus(addr) : \ | |
| 85 | − __virt_to_bus(addr);}) | |
| 83 | +#define __arch_virt_to_dma(dev, addr) ({ unsigned long __addr = (unsigned long)(addr); \ | |
| 84 | + (dma_addr_t) (is_lbus_device(dev) ? \ | |
| 85 | + virt_to_lbus(__addr) : \ | |
| 86 | + __virt_to_bus(__addr)); }) | |
| 86 | 87 | |
| 87 | 88 | #endif /* CONFIG_ARCH_OMAP15XX */ |
| 88 | 89 | |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-omap/menelaus.h | |
| 2 | + * arch/arm/plat-omap/include/mach/menelaus.h | |
| 3 | 3 | * |
| 4 | 4 | * Functions to access Menelaus power management chip |
| 5 | 5 | */ |
| @@ -15,7 +15,7 @@ · 14 unmodified lines | ||
| 15 | 15 | #include <linux/device.h> |
| 16 | 16 | #include <linux/mmc/host.h> |
| 17 | 17 | |
| 18 | −#include <asm/arch/board.h> | |
| 18 | +#include <mach/board.h> | |
| 19 | 19 | |
| 20 | 20 | #define OMAP_MMC_MAX_SLOTS 2 |
| 21 | 21 | |
| @@ -14,7 +14,7 @@ · 13 unmodified lines | ||
| 14 | 14 | #ifndef __ARCH_OMAP_MTD_XIP_H__ |
| 15 | 15 | #define __ARCH_OMAP_MTD_XIP_H__ |
| 16 | 16 | |
| 17 | −#include <asm/hardware.h> | |
| 17 | +#include <mach/hardware.h> | |
| 18 | 18 | #define OMAP_MPU_TIMER_BASE (0xfffec500) |
| 19 | 19 | #define OMAP_MPU_TIMER_OFFSET 0x100 |
| 20 | 20 | |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-omap/mux.h | |
| 2 | + * arch/arm/plat-omap/include/mach/mux.h | |
| 3 | 3 | * |
| 4 | 4 | * Table of the Omap register configurations for the FUNC_MUX and |
| 5 | 5 | * PULL_DWN combinations. |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-omap/nand.h | |
| 2 | + * arch/arm/plat-omap/include/mach/nand.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 2006 Micron Technology Inc. |
| 5 | 5 | * |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-omap/omap-alsa.h | |
| 2 | + * arch/arm/plat-omap/include/mach/omap-alsa.h | |
| 3 | 3 | * |
| 4 | 4 | * Alsa Driver for AIC23 and TSC2101 codecs on OMAP platform boards. |
| 5 | 5 | * |
| @@ -40,10 +40,10 @@ · 34 unmodified lines | ||
| 40 | 40 | #ifndef __OMAP_ALSA_H |
| 41 | 41 | #define __OMAP_ALSA_H |
| 42 | 42 | |
| 43 | −#include <asm/arch/dma.h> | |
| 43 | +#include <mach/dma.h> | |
| 44 | 44 | #include <sound/core.h> |
| 45 | 45 | #include <sound/pcm.h> |
| 46 | −#include <asm/arch/mcbsp.h> | |
| 46 | +#include <mach/mcbsp.h> | |
| 47 | 47 | #include <linux/platform_device.h> |
| 48 | 48 | |
| 49 | 49 | #define DMA_BUF_SIZE (1024 * 8) |
| @@ -1,4 +1,4 @@ | ||
| 1 | −/* linux/include/asm-arm/arch-omap/omap1510.h | |
| 1 | +/* arch/arm/plat-omap/include/mach/omap1510.h | |
| 2 | 2 | * |
| 3 | 3 | * Hardware definitions for TI OMAP1510 processor. |
| 4 | 4 | * |
| @@ -1,4 +1,4 @@ | ||
| 1 | −/* linux/include/asm-arm/arch-omap/omap16xx.h | |
| 1 | +/* arch/arm/plat-omap/include/mach/omap16xx.h | |
| 2 | 2 | * |
| 3 | 3 | * Hardware definitions for TI OMAP1610/5912/1710 processors. |
| 4 | 4 | * |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-omap/omap24xx.h | |
| 2 | + * arch/arm/plat-omap/include/mach/omap24xx.h | |
| 3 | 3 | * |
| 4 | 4 | * This file contains the processor specific definitions |
| 5 | 5 | * of the TI OMAP24XX. |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-omap/omap34xx.h | |
| 2 | + * arch/arm/plat-omap/include/mach/omap34xx.h | |
| 3 | 3 | * |
| 4 | 4 | * This file contains the processor specific definitions of the TI OMAP34XX. |
| 5 | 5 | * |
| @@ -1,4 +1,4 @@ | ||
| 1 | −/* linux/include/asm-arm/arch-omap/omap730.h | |
| 1 | +/* arch/arm/plat-omap/include/mach/omap730.h | |
| 2 | 2 | * |
| 3 | 3 | * Hardware definitions for TI OMAP730 processor. |
| 4 | 4 | * |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * File: include/asm-arm/arch-omap/omapfb.h | |
| 2 | + * File: arch/arm/plat-omap/include/mach/omapfb.h | |
| 3 | 3 | * |
| 4 | 4 | * Framebuffer driver for TI OMAP boards |
| 5 | 5 | * |
| @@ -167,7 +167,7 @@ enum omapfb_update_mode { · 161 unmodified lines | ||
| 167 | 167 | #include <linux/fb.h> |
| 168 | 168 | #include <linux/mutex.h> |
| 169 | 169 | |
| 170 | −#include <asm/arch/board.h> | |
| 170 | +#include <mach/board.h> | |
| 171 | 171 | |
| 172 | 172 | #define OMAP_LCDC_INV_VSYNC 0x0001 |
| 173 | 173 | #define OMAP_LCDC_INV_HSYNC 0x0002 |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/arch-omap/onenand.h | |
| 2 | + * arch/arm/plat-omap/include/mach/onenand.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 2006 Nokia Corporation |
| 5 | 5 | * Author: Juha Yrjola |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-omap/param.h | |
| 2 | + * arch/arm/plat-omap/include/mach/param.h | |
| 3 | 3 | * |
| 4 | 4 | */ |
| 5 | 5 | |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-omap/pm.h | |
| 2 | + * arch/arm/plat-omap/include/mach/pm.h | |
| 3 | 3 | * |
| 4 | 4 | * Header file for OMAP Power Management Routines |
| 5 | 5 | * |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-omap/prcm.h | |
| 2 | + * arch/arm/plat-omap/include/mach/prcm.h | |
| 3 | 3 | * |
| 4 | 4 | * Access definations for use in OMAP24XX clock and power management |
| 5 | 5 | * |
| @@ -14,7 +14,7 @@ · 13 unmodified lines | ||
| 14 | 14 | * published by the Free Software Foundation. |
| 15 | 15 | */ |
| 16 | 16 | |
| 17 | −#include <asm/arch/io.h> | |
| 17 | +#include <mach/io.h> | |
| 18 | 18 | |
| 19 | 19 | /* SDRC register offsets - read/write with sdrc_{read,write}_reg() */ |
| 20 | 20 | |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-omap/serial.h | |
| 2 | + * arch/arm/plat-omap/include/mach/serial.h | |
| 3 | 3 | * |
| 4 | 4 | * This program is distributed in the hope that it will be useful, |
| 5 | 5 | * but WITHOUT ANY WARRANTY; without even the implied warranty of |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-omap/sram.h | |
| 2 | + * arch/arm/plat-omap/include/mach/sram.h | |
| 3 | 3 | * |
| 4 | 4 | * Interface for functions that need to be run in internal SRAM |
| 5 | 5 | * |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * Copied from linux/include/asm-arm/arch-sa1100/system.h | |
| 2 | + * Copied from arch/arm/mach-sa1100/include/mach/system.h | |
| 3 | 3 | * Copyright (c) 1999 Nicolas Pitre <nico@cam.org> |
| 4 | 4 | */ |
| 5 | 5 | #ifndef __ASM_ARCH_SYSTEM_H |
| @@ -7,7 +7,7 @@ · 1 unmodified line | ||
| 7 | 7 | #include <linux/clk.h> |
| 8 | 8 | |
| 9 | 9 | #include <asm/mach-types.h> |
| 10 | −#include <asm/hardware.h> | |
| 10 | +#include <mach/hardware.h> | |
| 11 | 11 | |
| 12 | 12 | #ifndef CONFIG_MACH_VOICEBLUE |
| 13 | 13 | #define voiceblue_reset() do {} while (0) |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-omap/tc.h | |
| 2 | + * arch/arm/plat-omap/include/mach/tc.h | |
| 3 | 3 | * |
| 4 | 4 | * OMAP Traffic Controller |
| 5 | 5 | * |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-omap/timex.h | |
| 2 | + * arch/arm/plat-omap/include/mach/timex.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 2000 RidgeRun, Inc. |
| 5 | 5 | * Author: Greg Lonnon <glonnon@ridgerun.com> |
| @@ -1,10 +1,10 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-omap/uncompress.h | |
| 2 | + * arch/arm/plat-omap/include/mach/uncompress.h | |
| 3 | 3 | * |
| 4 | 4 | * Serial port stubs for kernel decompress status messages |
| 5 | 5 | * |
| 6 | 6 | * Initially based on: |
| 7 | − * linux-2.4.15-rmk1-dsplinux1.6/include/asm-arm/arch-omap1510/uncompress.h | |
| 7 | + * linux-2.4.15-rmk1-dsplinux1.6/arch/arm/plat-omap/include/mach1510/uncompress.h | |
| 8 | 8 | * Copyright (C) 2000 RidgeRun, Inc. |
| 9 | 9 | * Author: Greg Lonnon <glonnon@ridgerun.com> |
| 10 | 10 | * |
| @@ -19,7 +19,7 @@ · 8 unmodified lines | ||
| 19 | 19 | |
| 20 | 20 | #include <linux/types.h> |
| 21 | 21 | #include <linux/serial_reg.h> |
| 22 | −#include <asm/arch/serial.h> | |
| 22 | +#include <mach/serial.h> | |
| 23 | 23 | |
| 24 | 24 | unsigned int system_rev; |
| 25 | 25 | |
| @@ -3,7 +3,7 @@ · 2 unmodified lines | ||
| 3 | 3 | #ifndef __ASM_ARCH_OMAP_USB_H |
| 4 | 4 | #define __ASM_ARCH_OMAP_USB_H |
| 5 | 5 | |
| 6 | −#include <asm/arch/board.h> | |
| 6 | +#include <mach/board.h> | |
| 7 | 7 | |
| 8 | 8 | /*-------------------------------------------------------------------------*/ |
| 9 | 9 | |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * linux/include/asm-arm/arch-omap/vmalloc.h | |
| 2 | + * arch/arm/plat-omap/include/mach/vmalloc.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 2000 Russell King. |
| 5 | 5 | * |
| @@ -31,7 +31,7 @@ · 30 unmodified lines | ||
| 31 | 31 | #include <linux/err.h> |
| 32 | 32 | #include <linux/delay.h> |
| 33 | 33 | #include <asm/io.h> |
| 34 | −#include <asm/arch/mailbox.h> | |
| 34 | +#include <mach/mailbox.h> | |
| 35 | 35 | #include "mailbox.h" |
| 36 | 36 | |
| 37 | 37 | static struct omap_mbox *mboxes; |
| @@ -24,8 +24,8 @@ · 23 unmodified lines | ||
| 24 | 24 | #include <linux/delay.h> |
| 25 | 25 | #include <linux/io.h> |
| 26 | 26 | |
| 27 | −#include <asm/arch/dma.h> | |
| 28 | −#include <asm/arch/mcbsp.h> | |
| 27 | +#include <mach/dma.h> | |
| 28 | +#include <mach/mcbsp.h> | |
| 29 | 29 | |
| 30 | 30 | static struct omap_mcbsp mcbsp[OMAP_MAX_MCBSP_COUNT]; |
| 31 | 31 | |
| @@ -28,7 +28,7 @@ · 27 unmodified lines | ||
| 28 | 28 | #include <asm/system.h> |
| 29 | 29 | #include <asm/io.h> |
| 30 | 30 | #include <linux/spinlock.h> |
| 31 | −#include <asm/arch/mux.h> | |
| 31 | +#include <mach/mux.h> | |
| 32 | 32 | |
| 33 | 33 | #ifdef CONFIG_OMAP_MUX |
| 34 | 34 | |
| @@ -33,7 +33,7 @@ · 32 unmodified lines | ||
| 33 | 33 | #include <linux/clk.h> |
| 34 | 34 | |
| 35 | 35 | #include <asm/io.h> |
| 36 | −#include <asm/hardware.h> | |
| 36 | +#include <mach/hardware.h> | |
| 37 | 37 | |
| 38 | 38 | #define OCPI_BASE 0xfffec320 |
| 39 | 39 | #define OCPI_FAULT (OCPI_BASE + 0x00) |
| @@ -22,10 +22,10 @@ · 21 unmodified lines | ||
| 22 | 22 | |
| 23 | 23 | #include <asm/mach/map.h> |
| 24 | 24 | |
| 25 | −#include <asm/arch/sram.h> | |
| 26 | −#include <asm/arch/board.h> | |
| 25 | +#include <mach/sram.h> | |
| 26 | +#include <mach/board.h> | |
| 27 | 27 | |
| 28 | −#include <asm/arch/control.h> | |
| 28 | +#include <mach/control.h> | |
| 29 | 29 | |
| 30 | 30 | #if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3) |
| 31 | 31 | # include "../mach-omap2/prm.h" |
| @@ -31,12 +31,12 @@ · 30 unmodified lines | ||
| 31 | 31 | #include <asm/io.h> |
| 32 | 32 | #include <asm/irq.h> |
| 33 | 33 | #include <asm/system.h> |
| 34 | −#include <asm/hardware.h> | |
| 34 | +#include <mach/hardware.h> | |
| 35 | 35 | |
| 36 | −#include <asm/arch/control.h> | |
| 37 | −#include <asm/arch/mux.h> | |
| 38 | −#include <asm/arch/usb.h> | |
| 39 | −#include <asm/arch/board.h> | |
| 36 | +#include <mach/control.h> | |
| 37 | +#include <mach/mux.h> | |
| 38 | +#include <mach/usb.h> | |
| 39 | +#include <mach/board.h> | |
| 40 | 40 | |
| 41 | 41 | #ifdef CONFIG_ARCH_OMAP1 |
| 42 | 42 | |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/plat-orion/cache-feroceon-l2.h | |
| 2 | + * arch/arm/plat-orion/include/plat/cache-feroceon-l2.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 2008 Marvell Semiconductor |
| 5 | 5 | * |
| @@ -1,13 +1,13 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/plat-orion/ehci-orion.h | |
| 2 | + * arch/arm/plat-orion/include/plat/ehci-orion.h | |
| 3 | 3 | * |
| 4 | 4 | * This file is licensed under the terms of the GNU General Public |
| 5 | 5 | * License version 2. This program is licensed "as is" without any |
| 6 | 6 | * warranty of any kind, whether express or implied. |
| 7 | 7 | */ |
| 8 | 8 | |
| 9 | −#ifndef __ASM_PLAT_ORION_EHCI_ORION_H | |
| 10 | −#define __ASM_PLAT_ORION_EHCI_ORION_H | |
| 9 | +#ifndef __PLAT_EHCI_ORION_H | |
| 10 | +#define __PLAT_EHCI_ORION_H | |
| 11 | 11 | |
| 12 | 12 | #include <linux/mbus.h> |
| 13 | 13 | |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/plat-orion/irq.h | |
| 2 | + * arch/arm/plat-orion/include/plat/irq.h | |
| 3 | 3 | * |
| 4 | 4 | * Marvell Orion SoC IRQ handling. |
| 5 | 5 | * |
| @@ -8,8 +8,8 @@ · 2 unmodified lines | ||
| 8 | 8 | * warranty of any kind, whether express or implied. |
| 9 | 9 | */ |
| 10 | 10 | |
| 11 | −#ifndef __ASM_PLAT_ORION_IRQ_H | |
| 12 | −#define __ASM_PLAT_ORION_IRQ_H | |
| 11 | +#ifndef __PLAT_IRQ_H | |
| 12 | +#define __PLAT_IRQ_H | |
| 13 | 13 | |
| 14 | 14 | void orion_irq_init(unsigned int irq_start, void __iomem *maskaddr); |
| 15 | 15 | |
| @@ -1,9 +1,11 @@ | ||
| 1 | 1 | /* |
| 2 | + * arch/arm/plat-orion/include/plat/mv_xor.h | |
| 3 | + * | |
| 2 | 4 | * Marvell XOR platform device data definition file. |
| 3 | 5 | */ |
| 4 | 6 | |
| 5 | −#ifndef __ASM_PLAT_ORION_MV_XOR_H | |
| 6 | −#define __ASM_PLAT_ORION_MV_XOR_H | |
| 7 | +#ifndef __PLAT_MV_XOR_H | |
| 8 | +#define __PLAT_MV_XOR_H | |
| 7 | 9 | |
| 8 | 10 | #include <linux/dmaengine.h> |
| 9 | 11 | #include <linux/mbus.h> |
| @@ -1,13 +1,13 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/plat-orion/orion_nand.h | |
| 2 | + * arch/arm/plat-orion/include/plat/orion_nand.h | |
| 3 | 3 | * |
| 4 | 4 | * This file is licensed under the terms of the GNU General Public |
| 5 | 5 | * License version 2. This program is licensed "as is" without any |
| 6 | 6 | * warranty of any kind, whether express or implied. |
| 7 | 7 | */ |
| 8 | 8 | |
| 9 | −#ifndef __ASM_PLAT_ORION_ORION_NAND_H | |
| 10 | −#define __ASM_PLAT_ORION_ORION_NAND_H | |
| 9 | +#ifndef __PLAT_ORION_NAND_H | |
| 10 | +#define __PLAT_ORION_NAND_H | |
| 11 | 11 | |
| 12 | 12 | /* |
| 13 | 13 | * Device bus NAND private data |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/plat-orion/pcie.h | |
| 2 | + * arch/arm/plat-orion/include/plat/pcie.h | |
| 3 | 3 | * |
| 4 | 4 | * Marvell Orion SoC PCIe handling. |
| 5 | 5 | * |
| @@ -8,8 +8,8 @@ · 2 unmodified lines | ||
| 8 | 8 | * warranty of any kind, whether express or implied. |
| 9 | 9 | */ |
| 10 | 10 | |
| 11 | −#ifndef __ASM_PLAT_ORION_PCIE_H | |
| 12 | −#define __ASM_PLAT_ORION_PCIE_H | |
| 11 | +#ifndef __PLAT_PCIE_H | |
| 12 | +#define __PLAT_PCIE_H | |
| 13 | 13 | |
| 14 | 14 | u32 orion_pcie_dev_id(void __iomem *base); |
| 15 | 15 | u32 orion_pcie_rev(void __iomem *base); |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/asm-arm/plat-orion/time.h | |
| 2 | + * arch/arm/plat-orion/include/plat/time.h | |
| 3 | 3 | * |
| 4 | 4 | * Marvell Orion SoC time handling. |
| 5 | 5 | * |
| @@ -8,8 +8,8 @@ · 2 unmodified lines | ||
| 8 | 8 | * warranty of any kind, whether express or implied. |
| 9 | 9 | */ |
| 10 | 10 | |
| 11 | −#ifndef __ASM_PLAT_ORION_TIME_H | |
| 12 | −#define __ASM_PLAT_ORION_TIME_H | |
| 11 | +#ifndef __PLAT_TIME_H | |
| 12 | +#define __PLAT_TIME_H | |
| 13 | 13 | |
| 14 | 14 | void orion_time_init(unsigned int irq, unsigned int tclk); |
| 15 | 15 | |
| @@ -12,7 +12,7 @@ · 11 unmodified lines | ||
| 12 | 12 | #include <linux/init.h> |
| 13 | 13 | #include <linux/irq.h> |
| 14 | 14 | #include <linux/io.h> |
| 15 | −#include <asm/plat-orion/irq.h> | |
| 15 | +#include <plat/irq.h> | |
| 16 | 16 | |
| 17 | 17 | static void orion_irq_mask(u32 irq) |
| 18 | 18 | { |
| @@ -12,7 +12,7 @@ · 11 unmodified lines | ||
| 12 | 12 | #include <linux/pci.h> |
| 13 | 13 | #include <linux/mbus.h> |
| 14 | 14 | #include <asm/mach/pci.h> |
| 15 | −#include <asm/plat-orion/pcie.h> | |
| 15 | +#include <plat/pcie.h> | |
| 16 | 16 | |
| 17 | 17 | /* |
| 18 | 18 | * PCIe unit register offsets. |
| @@ -16,7 +16,7 @@ · 15 unmodified lines | ||
| 16 | 16 | #include <linux/interrupt.h> |
| 17 | 17 | #include <linux/irq.h> |
| 18 | 18 | #include <asm/mach/time.h> |
| 19 | −#include <asm/arch/hardware.h> | |
| 19 | +#include <mach/hardware.h> | |
| 20 | 20 | |
| 21 | 21 | /* |
| 22 | 22 | * Number of timer ticks per jiffy. |
| @@ -40,12 +40,12 @@ · 39 unmodified lines | ||
| 40 | 40 | #include <linux/mutex.h> |
| 41 | 41 | #include <linux/delay.h> |
| 42 | 42 | |
| 43 | −#include <asm/hardware.h> | |
| 43 | +#include <mach/hardware.h> | |
| 44 | 44 | #include <asm/irq.h> |
| 45 | 45 | #include <asm/io.h> |
| 46 | 46 | |
| 47 | −#include <asm/arch/regs-clock.h> | |
| 48 | −#include <asm/arch/regs-gpio.h> | |
| 47 | +#include <mach/regs-clock.h> | |
| 48 | +#include <mach/regs-gpio.h> | |
| 49 | 49 | |
| 50 | 50 | #include <asm/plat-s3c24xx/clock.h> |
| 51 | 51 | #include <asm/plat-s3c24xx/cpu.h> |
| @@ -31,12 +31,12 @@ · 30 unmodified lines | ||
| 31 | 31 | #include <asm/mach/irq.h> |
| 32 | 32 | |
| 33 | 33 | #include <asm/mach-types.h> |
| 34 | −#include <asm/hardware.h> | |
| 34 | +#include <mach/hardware.h> | |
| 35 | 35 | #include <asm/io.h> |
| 36 | 36 | #include <asm/irq.h> |
| 37 | 37 | |
| 38 | −#include <asm/arch/regs-gpio.h> | |
| 39 | −#include <asm/arch/leds-gpio.h> | |
| 38 | +#include <mach/regs-gpio.h> | |
| 39 | +#include <mach/leds-gpio.h> | |
| 40 | 40 | |
| 41 | 41 | #include <asm/plat-s3c/nand.h> |
| 42 | 42 | |
| @@ -30,7 +30,7 @@ · 29 unmodified lines | ||
| 30 | 30 | #include <linux/platform_device.h> |
| 31 | 31 | #include <linux/delay.h> |
| 32 | 32 | |
| 33 | −#include <asm/hardware.h> | |
| 33 | +#include <mach/hardware.h> | |
| 34 | 34 | #include <asm/irq.h> |
| 35 | 35 | #include <asm/io.h> |
| 36 | 36 | #include <asm/delay.h> |
| @@ -39,9 +39,9 @@ · 2 unmodified lines | ||
| 39 | 39 | #include <asm/mach/arch.h> |
| 40 | 40 | #include <asm/mach/map.h> |
| 41 | 41 | |
| 42 | −#include <asm/arch/system-reset.h> | |
| 42 | +#include <mach/system-reset.h> | |
| 43 | 43 | |
| 44 | −#include <asm/arch/regs-gpio.h> | |
| 44 | +#include <mach/regs-gpio.h> | |
| 45 | 45 | #include <asm/plat-s3c/regs-serial.h> |
| 46 | 46 | |
| 47 | 47 | #include <asm/plat-s3c24xx/cpu.h> |
| @@ -169,9 +169,7 @@ static struct map_desc s3c_iodesc[] __initdata = { · 121 unmodified lines | ||
| 169 | 169 | IODESC_ENT(UART) |
| 170 | 170 | }; |
| 171 | 171 | |
| 172 | − | |
| 173 | −static struct cpu_table * | |
| 174 | −s3c_lookup_cpu(unsigned long idcode) | |
| 172 | +static struct cpu_table * __init s3c_lookup_cpu(unsigned long idcode) | |
| 175 | 173 | { |
| 176 | 174 | struct cpu_table *tab; |
| 177 | 175 | int count; |
| @@ -23,8 +23,8 @@ · 22 unmodified lines | ||
| 23 | 23 | #include <asm/mach/arch.h> |
| 24 | 24 | #include <asm/mach/map.h> |
| 25 | 25 | #include <asm/mach/irq.h> |
| 26 | −#include <asm/arch/fb.h> | |
| 27 | −#include <asm/hardware.h> | |
| 26 | +#include <mach/fb.h> | |
| 27 | +#include <mach/hardware.h> | |
| 28 | 28 | #include <asm/io.h> |
| 29 | 29 | #include <asm/irq.h> |
| 30 | 30 | |
| @@ -29,12 +29,12 @@ · 28 unmodified lines | ||
| 29 | 29 | |
| 30 | 30 | #include <asm/system.h> |
| 31 | 31 | #include <asm/irq.h> |
| 32 | −#include <asm/hardware.h> | |
| 32 | +#include <mach/hardware.h> | |
| 33 | 33 | #include <asm/io.h> |
| 34 | 34 | #include <asm/dma.h> |
| 35 | 35 | |
| 36 | 36 | #include <asm/mach/dma.h> |
| 37 | −#include <asm/arch/map.h> | |
| 37 | +#include <mach/map.h> | |
| 38 | 38 | |
| 39 | 39 | #include <asm/plat-s3c24xx/dma.h> |
| 40 | 40 | |
| @@ -27,11 +27,11 @@ · 26 unmodified lines | ||
| 27 | 27 | #include <linux/interrupt.h> |
| 28 | 28 | #include <linux/ioport.h> |
| 29 | 29 | |
| 30 | −#include <asm/hardware.h> | |
| 30 | +#include <mach/hardware.h> | |
| 31 | 31 | #include <asm/irq.h> |
| 32 | 32 | #include <asm/io.h> |
| 33 | 33 | |
| 34 | −#include <asm/arch/regs-gpio.h> | |
| 34 | +#include <mach/regs-gpio.h> | |
| 35 | 35 | |
| 36 | 36 | void s3c2410_gpio_cfgpin(unsigned int pin, unsigned int function) |
| 37 | 37 | { |
| @@ -19,10 +19,10 @@ · 18 unmodified lines | ||
| 19 | 19 | #include <linux/io.h> |
| 20 | 20 | #include <linux/gpio.h> |
| 21 | 21 | |
| 22 | −#include <asm/hardware.h> | |
| 22 | +#include <mach/hardware.h> | |
| 23 | 23 | #include <asm/irq.h> |
| 24 | 24 | |
| 25 | −#include <asm/arch/regs-gpio.h> | |
| 25 | +#include <mach/regs-gpio.h> | |
| 26 | 26 | |
| 27 | 27 | struct s3c24xx_gpio_chip { |
| 28 | 28 | struct gpio_chip chip; |
| @@ -56,14 +56,14 @@ · 55 unmodified lines | ||
| 56 | 56 | #include <linux/ioport.h> |
| 57 | 57 | #include <linux/sysdev.h> |
| 58 | 58 | |
| 59 | −#include <asm/hardware.h> | |
| 59 | +#include <mach/hardware.h> | |
| 60 | 60 | #include <asm/irq.h> |
11 more lines aren’t shown here.
This diff is large: its 17 lines aren’t shown here.
This diff is large: its 20 lines aren’t shown here.
This diff is large: its 15 lines aren’t shown here.
This diff is large: its 15 lines aren’t shown here.
This diff is large: its 18 lines aren’t shown here.
This diff is large: its 21 lines aren’t shown here.
This diff is large: its 18 lines aren’t shown here.
This diff is large: its 12 lines aren’t shown here.
This diff is large: its 6 lines aren’t shown here.
This diff is large: its 99 lines aren’t shown here.
This diff is large: its 37 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 24 lines aren’t shown here.
This diff is large: its 33 lines aren’t shown here.
This diff is large: its 15 lines aren’t shown here.
This diff is large: its 15 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 13 lines aren’t shown here.
This diff is large: its 346 lines aren’t shown here.
This diff is large: its 434 lines aren’t shown here.
This diff is large: its 372 lines aren’t shown here.
This diff is large: its 189 lines aren’t shown here.
This diff is large: its 1305 lines aren’t shown here.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
This diff is large: its 8 lines aren’t shown here.
File renamed without changes.
File renamed without changes.
This diff is large: its 9 lines aren’t shown here.
File renamed without changes.
File renamed without changes.
File renamed without changes.
This diff is large: its 9 lines aren’t shown here.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 11 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 6 lines aren’t shown here.
This diff is large: its 94 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 89 lines aren’t shown here.
This diff is large: its 183 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 42 lines aren’t shown here.
File renamed without changes.
This diff is large: its 20 lines aren’t shown here.
File renamed without changes.
File renamed without changes.
This diff is large: its 56 lines aren’t shown here.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 15 lines aren’t shown here.
This diff is large: its 26 lines aren’t shown here.
This diff is large: its 117 lines aren’t shown here.
This diff is large: its 1196 lines aren’t shown here.
This diff is large: its 694 lines aren’t shown here.
This diff is large: its 18 lines aren’t shown here.
This diff is large: its 18 lines aren’t shown here.
This diff is large: its 19 lines aren’t shown here.
This diff is large: its 69 lines aren’t shown here.
This diff is large: its 136 lines aren’t shown here.
This diff is large: its 53 lines aren’t shown here.
This diff is large: its 162 lines aren’t shown here.
This diff is large: its 123 lines aren’t shown here.
This diff is large: its 123 lines aren’t shown here.
This diff is large: its 308 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 28 lines aren’t shown here.
This diff is large: its 13 lines aren’t shown here.
This diff is large: its 6 lines aren’t shown here.
This diff is large: its 402 lines aren’t shown here.
This diff is large: its 94 lines aren’t shown here.
This diff is large: its 94 lines aren’t shown here.
This diff is large: its 113 lines aren’t shown here.
This diff is large: its 309 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 13 lines aren’t shown here.
This diff is large: its 7 lines aren’t shown here.
This diff is large: its 104 lines aren’t shown here.
This diff is large: its 93 lines aren’t shown here.
This diff is large: its 20 lines aren’t shown here.
This diff is large: its 20 lines aren’t shown here.
This diff is large: its 58 lines aren’t shown here.
This diff is large: its 591 lines aren’t shown here.
This diff is large: its 340 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 30 lines aren’t shown here.
This diff is large: its 49 lines aren’t shown here.
This diff is large: its 278 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 29 lines aren’t shown here.
This diff is large: its 93 lines aren’t shown here.
This diff is large: its 287 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 13 lines aren’t shown here.
This diff is large: its 20 lines aren’t shown here.
This diff is large: its 129 lines aren’t shown here.
This diff is large: its 78 lines aren’t shown here.
This diff is large: its 63 lines aren’t shown here.
This diff is large: its 80 lines aren’t shown here.
This diff is large: its 208 lines aren’t shown here.
This diff is large: its 107 lines aren’t shown here.
This diff is large: its 64 lines aren’t shown here.
This diff is large: its 65 lines aren’t shown here.
This diff is large: its 54 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
This diff is large: its 37 lines aren’t shown here.
This diff is large: its 25 lines aren’t shown here.
This diff is large: its 1344 lines aren’t shown here.
This diff is large: its 1286 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 14 lines aren’t shown here.
This diff is large: its 139 lines aren’t shown here.
This diff is large: its 45 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 3 lines aren’t shown here.
This diff is large: its 33 lines aren’t shown here.
This diff is large: its 14 lines aren’t shown here.
This diff is large: its 28 lines aren’t shown here.
This diff is large: its 36 lines aren’t shown here.
This diff is large: its 18 lines aren’t shown here.
This diff is large: its 10 lines aren’t shown here.
This diff is large: its 25 lines aren’t shown here.
This diff is large: its 13 lines aren’t shown here.
This diff is large: its 42 lines aren’t shown here.
This diff is large: its 11 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
This diff is large: its 18 lines aren’t shown here.
File renamed without changes.
This diff is large: its 13 lines aren’t shown here.
This diff is large: its 26 lines aren’t shown here.
This diff is large: its 37 lines aren’t shown here.
This diff is large: its 2 lines aren’t shown here.
This diff is large: its 26 lines aren’t shown here.
This diff is large: its 13 lines aren’t shown here.
This diff is large: its 11 lines aren’t shown here.
This diff is large: its 11 lines aren’t shown here.
This diff is large: its 11 lines aren’t shown here.
This diff is large: its 121 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 44 lines aren’t shown here.
This diff is large: its 10 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 23 lines aren’t shown here.
This diff is large: its 51 lines aren’t shown here.
This diff is large: its 2 lines aren’t shown here.
This diff is large: its 10 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 12 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 28 lines aren’t shown here.
This diff is large: its 16 lines aren’t shown here.
This diff is large: its 57 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 566 lines aren’t shown here.
This diff is large: its 497 lines aren’t shown here.
This diff is large: its 497 lines aren’t shown here.
This diff is large: its 544 lines aren’t shown here.
This diff is large: its 552 lines aren’t shown here.
This diff is large: its 413 lines aren’t shown here.
This diff is large: its 557 lines aren’t shown here.
This diff is large: its 668 lines aren’t shown here.
This diff is large: its 562 lines aren’t shown here.
This diff is large: its 398 lines aren’t shown here.
This diff is large: its 560 lines aren’t shown here.
This diff is large: its 563 lines aren’t shown here.
This diff is large: its 328 lines aren’t shown here.
This diff is large: its 622 lines aren’t shown here.
This diff is large: its 792 lines aren’t shown here.
This diff is large: its 610 lines aren’t shown here.
This diff is large: its 610 lines aren’t shown here.
This diff is large: its 539 lines aren’t shown here.
This diff is large: its 563 lines aren’t shown here.
This diff is large: its 540 lines aren’t shown here.
This diff is large: its 534 lines aren’t shown here.
This diff is large: its 515 lines aren’t shown here.
This diff is large: its 538 lines aren’t shown here.
This diff is large: its 537 lines aren’t shown here.
This diff is large: its 740 lines aren’t shown here.
This diff is large: its 760 lines aren’t shown here.
This diff is large: its 605 lines aren’t shown here.
This diff is large: its 348 lines aren’t shown here.
This diff is large: its 529 lines aren’t shown here.
This diff is large: its 290 lines aren’t shown here.
This diff is large: its 573 lines aren’t shown here.
This diff is large: its 351 lines aren’t shown here.
This diff is large: its 435 lines aren’t shown here.
This diff is large: its 565 lines aren’t shown here.
This diff is large: its 355 lines aren’t shown here.
This diff is large: its 272 lines aren’t shown here.
This diff is large: its 281 lines aren’t shown here.
This diff is large: its 511 lines aren’t shown here.
This diff is large: its 396 lines aren’t shown here.
This diff is large: its 444 lines aren’t shown here.
This diff is large: its 455 lines aren’t shown here.
This diff is large: its 444 lines aren’t shown here.
This diff is large: its 444 lines aren’t shown here.
This diff is large: its 220 lines aren’t shown here.
This diff is large: its 663 lines aren’t shown here.
This diff is large: its 495 lines aren’t shown here.
This diff is large: its 510 lines aren’t shown here.
This diff is large: its 226 lines aren’t shown here.
This diff is large: its 630 lines aren’t shown here.
This diff is large: its 342 lines aren’t shown here.
This diff is large: its 485 lines aren’t shown here.
This diff is large: its 996 lines aren’t shown here.
This diff is large: its 282 lines aren’t shown here.
This diff is large: its 444 lines aren’t shown here.
This diff is large: its 864 lines aren’t shown here.
This diff is large: its 629 lines aren’t shown here.
This diff is large: its 454 lines aren’t shown here.
This diff is large: its 630 lines aren’t shown here.
This diff is large: its 253 lines aren’t shown here.
This diff is large: its 226 lines aren’t shown here.
This diff is large: its 707 lines aren’t shown here.
This diff is large: its 753 lines aren’t shown here.
This diff is large: its 665 lines aren’t shown here.
This diff is large: its 711 lines aren’t shown here.
This diff is large: its 675 lines aren’t shown here.
This diff is large: its 510 lines aren’t shown here.
This diff is large: its 435 lines aren’t shown here.
This diff is large: its 391 lines aren’t shown here.
This diff is large: its 585 lines aren’t shown here.
This diff is large: its 586 lines aren’t shown here.
This diff is large: its 393 lines aren’t shown here.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
This diff is large: its 19 lines aren’t shown here.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
This diff is large: its 29 lines aren’t shown here.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
This diff is large: its 15 lines aren’t shown here.
File renamed without changes.
This diff is large: its 18 lines aren’t shown here.
File renamed without changes.
File renamed without changes.
This diff is large: its 7 lines aren’t shown here.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
This diff is large: its 23 lines aren’t shown here.
This diff is large: its 302 lines aren’t shown here.
File renamed without changes.
This diff is large: its 35 lines aren’t shown here.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
This diff is large: its 9 lines aren’t shown here.
File renamed without changes.
This diff is large: its 7 lines aren’t shown here.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
This diff is large: its 9 lines aren’t shown here.
File renamed without changes.
This diff is large: its 8 lines aren’t shown here.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
This diff is large: its 7 lines aren’t shown here.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
This diff is large: its 9 lines aren’t shown here.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
This diff is large: its 7 lines aren’t shown here.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
This diff is large: its 11 lines aren’t shown here.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
This diff is large: its 9 lines aren’t shown here.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
This diff is large: its 7 lines aren’t shown here.
File renamed without changes.
File renamed without changes.
File renamed without changes.
This diff is large: its 7 lines aren’t shown here.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
This diff is large: its 40 lines aren’t shown here.
This diff is large: its 13 lines aren’t shown here.
This diff is large: its 46 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 26 lines aren’t shown here.
This diff is large: its 65 lines aren’t shown here.
This diff is large: its 19 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 19 lines aren’t shown here.
This diff is large: its 24 lines aren’t shown here.
This diff is large: its 11 lines aren’t shown here.
This diff is large: its 19 lines aren’t shown here.
This diff is large: its 64 lines aren’t shown here.
This diff is large: its 10 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 13 lines aren’t shown here.
This diff is large: its 153 lines aren’t shown here.
This diff is large: its 27 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 11 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 46 lines aren’t shown here.
This diff is large: its 17 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 14 lines aren’t shown here.
This diff is large: its 30 lines aren’t shown here.
This diff is large: its 57 lines aren’t shown here.
This diff is large: its 23 lines aren’t shown here.
This diff is large: its 14 lines aren’t shown here.
This diff is large: its 345 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 29 lines aren’t shown here.
This diff is large: its 45 lines aren’t shown here.
This diff is large: its 59 lines aren’t shown here.
This diff is large: its 16 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 78 lines aren’t shown here.
This diff is large: its 18 lines aren’t shown here.
This diff is large: its 23 lines aren’t shown here.
This diff is large: its 218 lines aren’t shown here.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
This diff is large: its 27 lines aren’t shown here.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
This diff is large: its 9 lines aren’t shown here.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
This diff is large: its 11 lines aren’t shown here.
This diff is large: its 16 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 55 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 44 lines aren’t shown here.
This diff is large: its 6 lines aren’t shown here.
This diff is large: its 19 lines aren’t shown here.
This diff is large: its 22 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 108 lines aren’t shown here.
This diff is large: its 11 lines aren’t shown here.
This diff is large: its 38 lines aren’t shown here.
This diff is large: its 62 lines aren’t shown here.
This diff is large: its 302 lines aren’t shown here.
This diff is large: its 21 lines aren’t shown here.
This diff is large: its 12 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 10 lines aren’t shown here.
This diff is large: its 16 lines aren’t shown here.
This diff is large: its 11 lines aren’t shown here.
This diff is large: its 12 lines aren’t shown here.
This diff is large: its 19 lines aren’t shown here.
This diff is large: its 61 lines aren’t shown here.
This diff is large: its 39 lines aren’t shown here.
This diff is large: its 23 lines aren’t shown here.
This diff is large: its 11 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 35 lines aren’t shown here.
This diff is large: its 17 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 18 lines aren’t shown here.
This diff is large: its 51 lines aren’t shown here.
This diff is large: its 56 lines aren’t shown here.
This diff is large: its 19 lines aren’t shown here.
This diff is large: its 30 lines aren’t shown here.
This diff is large: its 213 lines aren’t shown here.
This diff is large: its 196 lines aren’t shown here.
This diff is large: its 34 lines aren’t shown here.
This diff is large: its 14 lines aren’t shown here.
This diff is large: its 60 lines aren’t shown here.
This diff is large: its 199 lines aren’t shown here.
This diff is large: its 21 lines aren’t shown here.
This diff is large: its 20 lines aren’t shown here.
This diff is large: its 74 lines aren’t shown here.
This diff is large: its 130 lines aren’t shown here.
This diff is large: its 41 lines aren’t shown here.
This diff is large: its 65 lines aren’t shown here.
This diff is large: its 10 lines aren’t shown here.
This diff is large: its 27 lines aren’t shown here.
This diff is large: its 20 lines aren’t shown here.
This diff is large: its 11 lines aren’t shown here.
This diff is large: its 12 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 12 lines aren’t shown here.
This diff is large: its 10 lines aren’t shown here.
This diff is large: its 27 lines aren’t shown here.
This diff is large: its 25 lines aren’t shown here.
This diff is large: its 26 lines aren’t shown here.
This diff is large: its 12 lines aren’t shown here.
This diff is large: its 34 lines aren’t shown here.
This diff is large: its 75 lines aren’t shown here.
This diff is large: its 12 lines aren’t shown here.
This diff is large: its 12 lines aren’t shown here.
This diff is large: its 14 lines aren’t shown here.
This diff is large: its 16 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 11 lines aren’t shown here.
This diff is large: its 15 lines aren’t shown here.
This diff is large: its 117 lines aren’t shown here.
This diff is large: its 61 lines aren’t shown here.
This diff is large: its 19 lines aren’t shown here.
This diff is large: its 11 lines aren’t shown here.
This diff is large: its 14 lines aren’t shown here.
This diff is large: its 16 lines aren’t shown here.
This diff is large: its 15 lines aren’t shown here.
This diff is large: its 13 lines aren’t shown here.
This diff is large: its 189 lines aren’t shown here.
This diff is large: its 11 lines aren’t shown here.
This diff is large: its 28 lines aren’t shown here.
This diff is large: its 539 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 38 lines aren’t shown here.
This diff is large: its 183 lines aren’t shown here.
This diff is large: its 49 lines aren’t shown here.
This diff is large: its 16 lines aren’t shown here.
This diff is large: its 63 lines aren’t shown here.
This diff is large: its 49 lines aren’t shown here.
This diff is large: its 84 lines aren’t shown here.
This diff is large: its 22 lines aren’t shown here.
This diff is large: its 65 lines aren’t shown here.
This diff is large: its 99 lines aren’t shown here.
This diff is large: its 28 lines aren’t shown here.
This diff is large: its 10 lines aren’t shown here.
This diff is large: its 23 lines aren’t shown here.
This diff is large: its 12 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 38 lines aren’t shown here.
This diff is large: its 18 lines aren’t shown here.
This diff is large: its 55 lines aren’t shown here.
This diff is large: its 51 lines aren’t shown here.
This diff is large: its 47 lines aren’t shown here.
This diff is large: its 21 lines aren’t shown here.
This diff is large: its 25 lines aren’t shown here.
This diff is large: its 21 lines aren’t shown here.
This diff is large: its 12 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 24 lines aren’t shown here.
This diff is large: its 32 lines aren’t shown here.
This diff is large: its 22 lines aren’t shown here.
This diff is large: its 50 lines aren’t shown here.
This diff is large: its 34 lines aren’t shown here.
This diff is large: its 13 lines aren’t shown here.
This diff is large: its 15 lines aren’t shown here.
This diff is large: its 18 lines aren’t shown here.
This diff is large: its 38 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 38 lines aren’t shown here.
This diff is large: its 20 lines aren’t shown here.
This diff is large: its 53 lines aren’t shown here.
This diff is large: its 62 lines aren’t shown here.
This diff is large: its 104 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 73 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 42 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 49 lines aren’t shown here.
This diff is large: its 19 lines aren’t shown here.
This diff is large: its 17 lines aren’t shown here.
This diff is large: its 22 lines aren’t shown here.
This diff is large: its 52 lines aren’t shown here.
This diff is large: its 18 lines aren’t shown here.
This diff is large: its 118 lines aren’t shown here.
This diff is large: its 29 lines aren’t shown here.
This diff is large: its 17 lines aren’t shown here.
This diff is large: its 16 lines aren’t shown here.
This diff is large: its 29 lines aren’t shown here.
This diff is large: its 14 lines aren’t shown here.
This diff is large: its 20 lines aren’t shown here.
This diff is large: its 17 lines aren’t shown here.
This diff is large: its 12 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 142 lines aren’t shown here.
This diff is large: its 26 lines aren’t shown here.
This diff is large: its 11 lines aren’t shown here.
This diff is large: its 10 lines aren’t shown here.
This diff is large: its 65 lines aren’t shown here.
This diff is large: its 128 lines aren’t shown here.
This diff is large: its 10 lines aren’t shown here.
This diff is large: its 42 lines aren’t shown here.
This diff is large: its 81 lines aren’t shown here.
This diff is large: its 84 lines aren’t shown here.
This diff is large: its 108 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 111 lines aren’t shown here.
This diff is large: its 20 lines aren’t shown here.
This diff is large: its 43 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 34 lines aren’t shown here.
This diff is large: its 130 lines aren’t shown here.
This diff is large: its 316 lines aren’t shown here.
This diff is large: its 93 lines aren’t shown here.
This diff is large: its 129 lines aren’t shown here.
This diff is large: its 14 lines aren’t shown here.
This diff is large: its 38 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 41 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 27 lines aren’t shown here.
This diff is large: its 57 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 105 lines aren’t shown here.
This diff is large: its 26 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 10 lines aren’t shown here.
This diff is large: its 16 lines aren’t shown here.
This diff is large: its 28 lines aren’t shown here.
This diff is large: its 27 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 22 lines aren’t shown here.
This diff is large: its 15 lines aren’t shown here.
This diff is large: its 134 lines aren’t shown here.
This diff is large: its 79 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 11 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 14 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 14 lines aren’t shown here.
This diff is large: its 88 lines aren’t shown here.
This diff is large: its 51 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 25 lines aren’t shown here.
This diff is large: its 85 lines aren’t shown here.
This diff is large: its 10 lines aren’t shown here.
This diff is large: its 48 lines aren’t shown here.
This diff is large: its 24 lines aren’t shown here.
This diff is large: its 10 lines aren’t shown here.
This diff is large: its 960 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 307 lines aren’t shown here.
This diff is large: its 36 lines aren’t shown here.
This diff is large: its 106 lines aren’t shown here.
This diff is large: its 11 lines aren’t shown here.
This diff is large: its 29 lines aren’t shown here.
This diff is large: its 30 lines aren’t shown here.
This diff is large: its 31 lines aren’t shown here.
This diff is large: its 31 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 615 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 45 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 46 lines aren’t shown here.
This diff is large: its 21 lines aren’t shown here.
This diff is large: its 20 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 10 lines aren’t shown here.
This diff is large: its 31 lines aren’t shown here.
This diff is large: its 38 lines aren’t shown here.
This diff is large: its 158 lines aren’t shown here.
This diff is large: its 21 lines aren’t shown here.
This diff is large: its 84 lines aren’t shown here.
This diff is large: its 80 lines aren’t shown here.
This diff is large: its 255 lines aren’t shown here.
This diff is large: its 96 lines aren’t shown here.
This diff is large: its 52 lines aren’t shown here.
This diff is large: its 81 lines aren’t shown here.
This diff is large: its 85 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 14 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 32 lines aren’t shown here.
This diff is large: its 19 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 30 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 32 lines aren’t shown here.
This diff is large: its 42 lines aren’t shown here.
This diff is large: its 30 lines aren’t shown here.
This diff is large: its 113 lines aren’t shown here.
This diff is large: its 17 lines aren’t shown here.
This diff is large: its 1172 lines aren’t shown here.
This diff is large: its 127 lines aren’t shown here.
This diff is large: its 18 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 52 lines aren’t shown here.
This diff is large: its 58 lines aren’t shown here.
This diff is large: its 81 lines aren’t shown here.
This diff is large: its 71 lines aren’t shown here.
This diff is large: its 11 lines aren’t shown here.
This diff is large: its 138 lines aren’t shown here.
This diff is large: its 50 lines aren’t shown here.
This diff is large: its 144 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 11 lines aren’t shown here.
This diff is large: its 43 lines aren’t shown here.
This diff is large: its 120 lines aren’t shown here.
This diff is large: its 40 lines aren’t shown here.
This diff is large: its 55 lines aren’t shown here.
This diff is large: its 291 lines aren’t shown here.
This diff is large: its 26 lines aren’t shown here.
This diff is large: its 78 lines aren’t shown here.
This diff is large: its 70 lines aren’t shown here.
This diff is large: its 19 lines aren’t shown here.
This diff is large: its 60 lines aren’t shown here.
This diff is large: its 10 lines aren’t shown here.
This diff is large: its 314 lines aren’t shown here.
This diff is large: its 269 lines aren’t shown here.
This diff is large: its 330 lines aren’t shown here.
This diff is large: its 51 lines aren’t shown here.
This diff is large: its 14 lines aren’t shown here.
This diff is large: its 675 lines aren’t shown here.
This diff is large: its 20 lines aren’t shown here.
This diff is large: its 209 lines aren’t shown here.
This diff is large: its 56 lines aren’t shown here.
This diff is large: its 78 lines aren’t shown here.
This diff is large: its 130 lines aren’t shown here.
This diff is large: its 200 lines aren’t shown here.
This diff is large: its 90 lines aren’t shown here.
This diff is large: its 164 lines aren’t shown here.
This diff is large: its 72 lines aren’t shown here.
This diff is large: its 21 lines aren’t shown here.
This diff is large: its 24 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 23 lines aren’t shown here.
This diff is large: its 21 lines aren’t shown here.
This diff is large: its 13 lines aren’t shown here.
This diff is large: its 11 lines aren’t shown here.
This diff is large: its 19 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 15 lines aren’t shown here.
This diff is large: its 14 lines aren’t shown here.
This diff is large: its 36 lines aren’t shown here.
This diff is large: its 27 lines aren’t shown here.
This diff is large: its 14 lines aren’t shown here.
This diff is large: its 27 lines aren’t shown here.
This diff is large: its 18 lines aren’t shown here.
This diff is large: its 17 lines aren’t shown here.
This diff is large: its 15 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 123 lines aren’t shown here.
This diff is large: its 28 lines aren’t shown here.
This diff is large: its 13 lines aren’t shown here.
This diff is large: its 28 lines aren’t shown here.
This diff is large: its 15 lines aren’t shown here.
This diff is large: its 28 lines aren’t shown here.
This diff is large: its 18 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 18 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 27 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 18 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 18 lines aren’t shown here.
This diff is large: its 36 lines aren’t shown here.
This diff is large: its 12 lines aren’t shown here.
This diff is large: its 27 lines aren’t shown here.
This diff is large: its 18 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 18 lines aren’t shown here.
This diff is large: its 18 lines aren’t shown here.
This diff is large: its 115 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 34 lines aren’t shown here.
This diff is large: its 143 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 52 lines aren’t shown here.
This diff is large: its 13 lines aren’t shown here.
This diff is large: its 45 lines aren’t shown here.
This diff is large: its 17 lines aren’t shown here.
This diff is large: its 46 lines aren’t shown here.
This diff is large: its 23 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 142 lines aren’t shown here.
This diff is large: its 140 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 19 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 37 lines aren’t shown here.
This diff is large: its 36 lines aren’t shown here.
This diff is large: its 36 lines aren’t shown here.
This diff is large: its 27 lines aren’t shown here.
This diff is large: its 75 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 54 lines aren’t shown here.
This diff is large: its 40 lines aren’t shown here.
This diff is large: its 18 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 77 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 11 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 15 lines aren’t shown here.
This diff is large: its 25 lines aren’t shown here.
This diff is large: its 11 lines aren’t shown here.
This diff is large: its 255 lines aren’t shown here.
This diff is large: its 20 lines aren’t shown here.
This diff is large: its 15 lines aren’t shown here.
This diff is large: its 15 lines aren’t shown here.
This diff is large: its 11 lines aren’t shown here.
This diff is large: its 10 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 30 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 682 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 61 lines aren’t shown here.
This diff is large: its 14 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 11 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 39 lines aren’t shown here.
This diff is large: its 15 lines aren’t shown here.
This diff is large: its 11 lines aren’t shown here.
This diff is large: its 11 lines aren’t shown here.
This diff is large: its 17 lines aren’t shown here.
This diff is large: its 38 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 136 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 20 lines aren’t shown here.
This diff is large: its 18 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 11 lines aren’t shown here.
This diff is large: its 14 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 13 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 13 lines aren’t shown here.
This diff is large: its 13 lines aren’t shown here.
This diff is large: its 22 lines aren’t shown here.
This diff is large: its 47 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 99 lines aren’t shown here.
This diff is large: its 25 lines aren’t shown here.
This diff is large: its 72 lines aren’t shown here.
This diff is large: its 22 lines aren’t shown here.
This diff is large: its 11 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 16 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 18 lines aren’t shown here.
This diff is large: its 227 lines aren’t shown here.
This diff is large: its 54 lines aren’t shown here.
This diff is large: its 12 lines aren’t shown here.
This diff is large: its 988 lines aren’t shown here.
This diff is large: its 132 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 597 lines aren’t shown here.
This diff is large: its 42 lines aren’t shown here.
This diff is large: its 42 lines aren’t shown here.
This diff is large: its 41 lines aren’t shown here.
This diff is large: its 96 lines aren’t shown here.
This diff is large: its 15 lines aren’t shown here.
This diff is large: its 27 lines aren’t shown here.
This diff is large: its 94 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 37 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 85 lines aren’t shown here.
This diff is large: its 61 lines aren’t shown here.
This diff is large: its 69 lines aren’t shown here.
This diff is large: its 15 lines aren’t shown here.
This diff is large: its 10 lines aren’t shown here.
This diff is large: its 32 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 16 lines aren’t shown here.
This diff is large: its 420 lines aren’t shown here.
This diff is large: its 182 lines aren’t shown here.
This diff is large: its 395 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 13 lines aren’t shown here.
This diff is large: its 50 lines aren’t shown here.
This diff is large: its 11 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 10 lines aren’t shown here.
This diff is large: its 6 lines aren’t shown here.
This diff is large: its 13 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 11 lines aren’t shown here.
This diff is large: its 22 lines aren’t shown here.
This diff is large: its 11 lines aren’t shown here.
This diff is large: its 71 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 692 lines aren’t shown here.
This diff is large: its 195 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 11 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 11 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 12 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 51 lines aren’t shown here.
This diff is large: its 14 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 14 lines aren’t shown here.
This diff is large: its 11 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 12 lines aren’t shown here.
This diff is large: its 11 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 14 lines aren’t shown here.
This diff is large: its 11 lines aren’t shown here.
This diff is large: its 11 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 557 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 12 lines aren’t shown here.
This diff is large: its 18 lines aren’t shown here.
This diff is large: its 38 lines aren’t shown here.
This diff is large: its 48 lines aren’t shown here.
This diff is large: its 61 lines aren’t shown here.
This diff is large: its 27 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 13 lines aren’t shown here.
This diff is large: its 11 lines aren’t shown here.
This diff is large: its 38 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 18 lines aren’t shown here.
This diff is large: its 33 lines aren’t shown here.
This diff is large: its 17 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 18 lines aren’t shown here.
This diff is large: its 117 lines aren’t shown here.
This diff is large: its 235 lines aren’t shown here.
This diff is large: its 249 lines aren’t shown here.
This diff is large: its 72 lines aren’t shown here.
This diff is large: its 73 lines aren’t shown here.
This diff is large: its 1084 lines aren’t shown here.
This diff is large: its 2174 lines aren’t shown here.
This diff is large: its 45 lines aren’t shown here.
This diff is large: its 2931 lines aren’t shown here.
This diff is large: its 386 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 465 lines aren’t shown here.
This diff is large: its 10 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 14 lines aren’t shown here.
This diff is large: its 12 lines aren’t shown here.
This diff is large: its 226 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 58 lines aren’t shown here.
This diff is large: its 144 lines aren’t shown here.
This diff is large: its 749 lines aren’t shown here.
This diff is large: its 121 lines aren’t shown here.
This diff is large: its 15 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 274 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 55 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 93 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 105 lines aren’t shown here.
This diff is large: its 19 lines aren’t shown here.
This diff is large: its 10 lines aren’t shown here.
This diff is large: its 65 lines aren’t shown here.
This diff is large: its 16 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 11 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 18 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 11 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 89 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 11 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 29 lines aren’t shown here.
This diff is large: its 113 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 18 lines aren’t shown here.
This diff is large: its 18 lines aren’t shown here.
This diff is large: its 107 lines aren’t shown here.
This diff is large: its 23 lines aren’t shown here.
This diff is large: its 60 lines aren’t shown here.
This diff is large: its 43 lines aren’t shown here.
This diff is large: its 319 lines aren’t shown here.
This diff is large: its 28 lines aren’t shown here.
This diff is large: its 56 lines aren’t shown here.
This diff is large: its 451 lines aren’t shown here.
This diff is large: its 58 lines aren’t shown here.
This diff is large: its 20 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 65 lines aren’t shown here.
This diff is large: its 148 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 200 lines aren’t shown here.
This diff is large: its 84 lines aren’t shown here.
This diff is large: its 178 lines aren’t shown here.
This diff is large: its 10 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 27 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 17 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 284 lines aren’t shown here.
This diff is large: its 28 lines aren’t shown here.
This diff is large: its 29 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 137 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 34 lines aren’t shown here.
This diff is large: its 134 lines aren’t shown here.
This diff is large: its 35 lines aren’t shown here.
This diff is large: its 689 lines aren’t shown here.
This diff is large: its 87 lines aren’t shown here.
This diff is large: its 57 lines aren’t shown here.
This diff is large: its 18 lines aren’t shown here.
This diff is large: its 538 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 12 lines aren’t shown here.
This diff is large: its 20 lines aren’t shown here.
This diff is large: its 58 lines aren’t shown here.
This diff is large: its 79 lines aren’t shown here.
This diff is large: its 38 lines aren’t shown here.
This diff is large: its 27 lines aren’t shown here.
This diff is large: its 27 lines aren’t shown here.
This diff is large: its 29 lines aren’t shown here.
This diff is large: its 29 lines aren’t shown here.
This diff is large: its 547 lines aren’t shown here.
This diff is large: its 27 lines aren’t shown here.
This diff is large: its 19 lines aren’t shown here.
This diff is large: its 19 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 1197 lines aren’t shown here.
This diff is large: its 158 lines aren’t shown here.
This diff is large: its 203 lines aren’t shown here.
This diff is large: its 25 lines aren’t shown here.
This diff is large: its 484 lines aren’t shown here.
This diff is large: its 340 lines aren’t shown here.
This diff is large: its 452 lines aren’t shown here.
This diff is large: its 553 lines aren’t shown here.
This diff is large: its 30 lines aren’t shown here.
This diff is large: its 340 lines aren’t shown here.
This diff is large: its 34 lines aren’t shown here.
This diff is large: its 16 lines aren’t shown here.
This diff is large: its 7 lines aren’t shown here.
This diff is large: its 17 lines aren’t shown here.
This diff is large: its 57 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 466 lines aren’t shown here.
This diff is large: its 18 lines aren’t shown here.
This diff is large: its 299 lines aren’t shown here.
This diff is large: its 1558 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 12 lines aren’t shown here.
This diff is large: its 1022 lines aren’t shown here.
This diff is large: its 980 lines aren’t shown here.
This diff is large: its 1924 lines aren’t shown here.
This diff is large: its 1073 lines aren’t shown here.
This diff is large: its 8576 lines aren’t shown here.
This diff is large: its 970 lines aren’t shown here.
This diff is large: its 3147 lines aren’t shown here.
This diff is large: its 1471 lines aren’t shown here.
This diff is large: its 437 lines aren’t shown here.
This diff is large: its 544 lines aren’t shown here.
This diff is large: its 2127 lines aren’t shown here.
This diff is large: its 317 lines aren’t shown here.
This diff is large: its 1319 lines aren’t shown here.
This diff is large: its 1386 lines aren’t shown here.
This diff is large: its 1027 lines aren’t shown here.
This diff is large: its 413 lines aren’t shown here.
This diff is large: its 1916 lines aren’t shown here.
This diff is large: its 2872 lines aren’t shown here.
This diff is large: its 18 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 21 lines aren’t shown here.
This diff is large: its 131 lines aren’t shown here.
This diff is large: its 22 lines aren’t shown here.
This diff is large: its 103 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 60 lines aren’t shown here.
This diff is large: its 239 lines aren’t shown here.
This diff is large: its 142 lines aren’t shown here.
This diff is large: its 778 lines aren’t shown here.
This diff is large: its 63 lines aren’t shown here.
This diff is large: its 507 lines aren’t shown here.
This diff is large: its 97 lines aren’t shown here.
This diff is large: its 36 lines aren’t shown here.
This diff is large: its 17 lines aren’t shown here.
This diff is large: its 31 lines aren’t shown here.
This diff is large: its 32 lines aren’t shown here.
This diff is large: its 48 lines aren’t shown here.
This diff is large: its 99 lines aren’t shown here.
This diff is large: its 45 lines aren’t shown here.
This diff is large: its 17 lines aren’t shown here.
This diff is large: its 170 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 165 lines aren’t shown here.
This diff is large: its 52 lines aren’t shown here.
This diff is large: its 22 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 124 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 36 lines aren’t shown here.
This diff is large: its 298 lines aren’t shown here.
This diff is large: its 194 lines aren’t shown here.
This diff is large: its 45 lines aren’t shown here.
This diff is large: its 14 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 161 lines aren’t shown here.
This diff is large: its 26 lines aren’t shown here.
This diff is large: its 18 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 55 lines aren’t shown here.
This diff is large: its 13 lines aren’t shown here.
This diff is large: its 18 lines aren’t shown here.
This diff is large: its 73 lines aren’t shown here.
This diff is large: its 69 lines aren’t shown here.
This diff is large: its 25 lines aren’t shown here.
This diff is large: its 15 lines aren’t shown here.
This diff is large: its 26 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 12 lines aren’t shown here.
This diff is large: its 11 lines aren’t shown here.
This diff is large: its 125 lines aren’t shown here.
This diff is large: its 10 lines aren’t shown here.
This diff is large: its 20 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 24 lines aren’t shown here.
This diff is large: its 12 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 68 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 58 lines aren’t shown here.
This diff is large: its 25 lines aren’t shown here.
This diff is large: its 82 lines aren’t shown here.
This diff is large: its 12 lines aren’t shown here.
This diff is large: its 17 lines aren’t shown here.
This diff is large: its 14 lines aren’t shown here.
This diff is large: its 90 lines aren’t shown here.
This diff is large: its 16 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 47 lines aren’t shown here.
This diff is large: its 17 lines aren’t shown here.
This diff is large: its 16 lines aren’t shown here.
This diff is large: its 16 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 15 lines aren’t shown here.
This diff is large: its 16 lines aren’t shown here.
This diff is large: its 77 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 14 lines aren’t shown here.
This diff is large: its 12 lines aren’t shown here.
This diff is large: its 13 lines aren’t shown here.
This diff is large: its 13 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 12 lines aren’t shown here.
This diff is large: its 12 lines aren’t shown here.
This diff is large: its 13 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 18 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 11 lines aren’t shown here.
This diff is large: its 282 lines aren’t shown here.
This diff is large: its 53 lines aren’t shown here.
This diff is large: its 45 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 14 lines aren’t shown here.
This diff is large: its 23 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 17 lines aren’t shown here.
This diff is large: its 12 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 45 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 106 lines aren’t shown here.
This diff is large: its 16 lines aren’t shown here.
This diff is large: its 55 lines aren’t shown here.
This diff is large: its 22 lines aren’t shown here.
This diff is large: its 210 lines aren’t shown here.
This diff is large: its 27 lines aren’t shown here.
This diff is large: its 13 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 15 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 26 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 22 lines aren’t shown here.
This diff is large: its 118 lines aren’t shown here.
This diff is large: its 11 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 28 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 182 lines aren’t shown here.
This diff is large: its 31 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 18 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 29 lines aren’t shown here.
This diff is large: its 37 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 50 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 18 lines aren’t shown here.
This diff is large: its 39 lines aren’t shown here.
This diff is large: its 54 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 15 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 326 lines aren’t shown here.
This diff is large: its 11 lines aren’t shown here.
This diff is large: its 11 lines aren’t shown here.
This diff is large: its 11 lines aren’t shown here.
This diff is large: its 12 lines aren’t shown here.
This diff is large: its 13 lines aren’t shown here.
This diff is large: its 13 lines aren’t shown here.
This diff is large: its 13 lines aren’t shown here.
This diff is large: its 13 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 13 lines aren’t shown here.
This diff is large: its 11 lines aren’t shown here.
This diff is large: its 13 lines aren’t shown here.
This diff is large: its 13 lines aren’t shown here.
This diff is large: its 13 lines aren’t shown here.
This diff is large: its 13 lines aren’t shown here.
This diff is large: its 117 lines aren’t shown here.
This diff is large: its 13 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 89 lines aren’t shown here.
This diff is large: its 11 lines aren’t shown here.
This diff is large: its 16 lines aren’t shown here.
This diff is large: its 575 lines aren’t shown here.
This diff is large: its 21 lines aren’t shown here.
This diff is large: its 67 lines aren’t shown here.
This diff is large: its 16 lines aren’t shown here.
This diff is large: its 61 lines aren’t shown here.
This diff is large: its 13 lines aren’t shown here.
This diff is large: its 52 lines aren’t shown here.
This diff is large: its 20 lines aren’t shown here.
This diff is large: its 6 lines aren’t shown here.
This diff is large: its 16 lines aren’t shown here.
This diff is large: its 189 lines aren’t shown here.
This diff is large: its 21 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 260 lines aren’t shown here.
This diff is large: its 17 lines aren’t shown here.
This diff is large: its 249 lines aren’t shown here.
This diff is large: its 16 lines aren’t shown here.
This diff is large: its 18 lines aren’t shown here.
This diff is large: its 30 lines aren’t shown here.
This diff is large: its 26 lines aren’t shown here.
This diff is large: its 23 lines aren’t shown here.
This diff is large: its 94 lines aren’t shown here.
This diff is large: its 10 lines aren’t shown here.
This diff is large: its 17 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 21 lines aren’t shown here.
This diff is large: its 18 lines aren’t shown here.
This diff is large: its 17 lines aren’t shown here.
This diff is large: its 300 lines aren’t shown here.
This diff is large: its 10 lines aren’t shown here.
This diff is large: its 10 lines aren’t shown here.
This diff is large: its 10 lines aren’t shown here.
This diff is large: its 10 lines aren’t shown here.
This diff is large: its 17 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 25 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 26 lines aren’t shown here.
This diff is large: its 36 lines aren’t shown here.
This diff is large: its 483 lines aren’t shown here.
This diff is large: its 28 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 112 lines aren’t shown here.
This diff is large: its 19 lines aren’t shown here.
This diff is large: its 24 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 18 lines aren’t shown here.
This diff is large: its 51 lines aren’t shown here.
This diff is large: its 134 lines aren’t shown here.
This diff is large: its 17 lines aren’t shown here.
This diff is large: its 47 lines aren’t shown here.
This diff is large: its 161 lines aren’t shown here.
This diff is large: its 26 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 24 lines aren’t shown here.
This diff is large: its 20 lines aren’t shown here.
This diff is large: its 19 lines aren’t shown here.
This diff is large: its 22 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 39 lines aren’t shown here.
This diff is large: its 92 lines aren’t shown here.
This diff is large: its 25 lines aren’t shown here.
This diff is large: its 17 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 2153 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 18 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 176 lines aren’t shown here.
This diff is large: its 70 lines aren’t shown here.
This diff is large: its 1541 lines aren’t shown here.
This diff is large: its 134 lines aren’t shown here.
This diff is large: its 463 lines aren’t shown here.
This diff is large: its 101 lines aren’t shown here.
This diff is large: its 2254 lines aren’t shown here.
This diff is large: its 489 lines aren’t shown here.
This diff is large: its 63 lines aren’t shown here.
This diff is large: its 173 lines aren’t shown here.
This diff is large: its 2032 lines aren’t shown here.
This diff is large: its 109 lines aren’t shown here.
This diff is large: its 984 lines aren’t shown here.
This diff is large: its 2171 lines aren’t shown here.
This diff is large: its 111 lines aren’t shown here.
This diff is large: its 116 lines aren’t shown here.
This diff is large: its 301 lines aren’t shown here.
This diff is large: its 426 lines aren’t shown here.
This diff is large: its 434 lines aren’t shown here.
This diff is large: its 325 lines aren’t shown here.
This diff is large: its 57 lines aren’t shown here.
This diff is large: its 1152 lines aren’t shown here.
This diff is large: its 234 lines aren’t shown here.
This diff is large: its 720 lines aren’t shown here.
This diff is large: its 14 lines aren’t shown here.
This diff is large: its 27 lines aren’t shown here.
This diff is large: its 22 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 99 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 11 lines aren’t shown here.
This diff is large: its 291 lines aren’t shown here.
This diff is large: its 28 lines aren’t shown here.
This diff is large: its 19 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 208 lines aren’t shown here.
This diff is large: its 5 lines aren’t shown here.
This diff is large: its 24 lines aren’t shown here.
This diff is large: its 95 lines aren’t shown here.
This diff is large: its 10 lines aren’t shown here.
This diff is large: its 18 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 82 lines aren’t shown here.
This diff is large: its 55 lines aren’t shown here.
This diff is large: its 50 lines aren’t shown here.
This diff is large: its 33 lines aren’t shown here.
This diff is large: its 10 lines aren’t shown here.
This diff is large: its 13 lines aren’t shown here.
This diff is large: its 36 lines aren’t shown here.
This diff is large: its 29 lines aren’t shown here.
This diff is large: its 15 lines aren’t shown here.
This diff is large: its 3 lines aren’t shown here.
This diff is large: its 28 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 33 lines aren’t shown here.
This diff is large: its 11 lines aren’t shown here.
This diff is large: its 92 lines aren’t shown here.
This diff is large: its 12 lines aren’t shown here.
This diff is large: its 42 lines aren’t shown here.
This diff is large: its 195 lines aren’t shown here.
This diff is large: its 13 lines aren’t shown here.
This diff is large: its 13 lines aren’t shown here.
This diff is large: its 13 lines aren’t shown here.
This diff is large: its 11 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 11 lines aren’t shown here.
This diff is large: its 11 lines aren’t shown here.
This diff is large: its 13 lines aren’t shown here.
This diff is large: its 11 lines aren’t shown here.
This diff is large: its 11 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 15 lines aren’t shown here.
This diff is large: its 11 lines aren’t shown here.
This diff is large: its 12 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 11 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 130 lines aren’t shown here.
This diff is large: its 13 lines aren’t shown here.
This diff is large: its 83 lines aren’t shown here.
This diff is large: its 15 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 91 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 74 lines aren’t shown here.
This diff is large: its 40 lines aren’t shown here.
This diff is large: its 265 lines aren’t shown here.
This diff is large: its 330 lines aren’t shown here.
This diff is large: its 324 lines aren’t shown here.
This diff is large: its 390 lines aren’t shown here.
This diff is large: its 132 lines aren’t shown here.
This diff is large: its 89 lines aren’t shown here.
This diff is large: its 213 lines aren’t shown here.
This diff is large: its 244 lines aren’t shown here.
This diff is large: its 108 lines aren’t shown here.
This diff is large: its 265 lines aren’t shown here.
This diff is large: its 54 lines aren’t shown here.
This diff is large: its 76 lines aren’t shown here.
This diff is large: its 221 lines aren’t shown here.
This diff is large: its 198 lines aren’t shown here.
This diff is large: its 214 lines aren’t shown here.
This diff is large: its 580 lines aren’t shown here.
This diff is large: its 16 lines aren’t shown here.
This diff is large: its 128 lines aren’t shown here.
This diff is large: its 526 lines aren’t shown here.
This diff is large: its 258 lines aren’t shown here.
This diff is large: its 281 lines aren’t shown here.
This diff is large: its 204 lines aren’t shown here.
This diff is large: its 169 lines aren’t shown here.
This diff is large: its 258 lines aren’t shown here.
This diff is large: its 154 lines aren’t shown here.
This diff is large: its 169 lines aren’t shown here.
This diff is large: its 241 lines aren’t shown here.
This diff is large: its 280 lines aren’t shown here.
This diff is large: its 262 lines aren’t shown here.
This diff is large: its 86 lines aren’t shown here.
This diff is large: its 231 lines aren’t shown here.
This diff is large: its 170 lines aren’t shown here.
This diff is large: its 326 lines aren’t shown here.
This diff is large: its 208 lines aren’t shown here.
This diff is large: its 238 lines aren’t shown here.
This diff is large: its 71 lines aren’t shown here.
This diff is large: its 125 lines aren’t shown here.
This diff is large: its 501 lines aren’t shown here.
This diff is large: its 519 lines aren’t shown here.
This diff is large: its 261 lines aren’t shown here.
This diff is large: its 338 lines aren’t shown here.
This diff is large: its 78 lines aren’t shown here.
This diff is large: its 345 lines aren’t shown here.
This diff is large: its 286 lines aren’t shown here.
This diff is large: its 101 lines aren’t shown here.
This diff is large: its 337 lines aren’t shown here.
This diff is large: its 125 lines aren’t shown here.
This diff is large: its 241 lines aren’t shown here.
This diff is large: its 384 lines aren’t shown here.
This diff is large: its 113 lines aren’t shown here.
This diff is large: its 114 lines aren’t shown here.
This diff is large: its 60 lines aren’t shown here.
This diff is large: its 417 lines aren’t shown here.
This diff is large: its 300 lines aren’t shown here.
This diff is large: its 190 lines aren’t shown here.
This diff is large: its 280 lines aren’t shown here.
This diff is large: its 725 lines aren’t shown here.
This diff is large: its 181 lines aren’t shown here.
This diff is large: its 103 lines aren’t shown here.
This diff is large: its 374 lines aren’t shown here.
This diff is large: its 430 lines aren’t shown here.
This diff is large: its 361 lines aren’t shown here.
This diff is large: its 478 lines aren’t shown here.
This diff is large: its 285 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 324 lines aren’t shown here.
This diff is large: its 402 lines aren’t shown here.
This diff is large: its 93 lines aren’t shown here.
This diff is large: its 365 lines aren’t shown here.
This diff is large: its 600 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 23 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 35 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 16 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 11 lines aren’t shown here.
This diff is large: its 18 lines aren’t shown here.
This diff is large: its 165 lines aren’t shown here.
This diff is large: its 41 lines aren’t shown here.
This diff is large: its 17 lines aren’t shown here.
This diff is large: its 35 lines aren’t shown here.
This diff is large: its 300 lines aren’t shown here.
This diff is large: its 69 lines aren’t shown here.
This diff is large: its 45 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 104 lines aren’t shown here.
This diff is large: its 7 lines aren’t shown here.
This diff is large: its 10 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 41 lines aren’t shown here.
This diff is large: its 96 lines aren’t shown here.
This diff is large: its 263 lines aren’t shown here.
This diff is large: its 94 lines aren’t shown here.
This diff is large: its 19 lines aren’t shown here.
This diff is large: its 38 lines aren’t shown here.
This diff is large: its 558 lines aren’t shown here.
This diff is large: its 25 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 24 lines aren’t shown here.
This diff is large: its 38 lines aren’t shown here.
This diff is large: its 117 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 537 lines aren’t shown here.
This diff is large: its 25 lines aren’t shown here.
This diff is large: its 10 lines aren’t shown here.
This diff is large: its 12 lines aren’t shown here.
This diff is large: its 243 lines aren’t shown here.
This diff is large: its 43 lines aren’t shown here.
This diff is large: its 35 lines aren’t shown here.
This diff is large: its 26 lines aren’t shown here.
This diff is large: its 11 lines aren’t shown here.
This diff is large: its 15 lines aren’t shown here.
This diff is large: its 284 lines aren’t shown here.
This diff is large: its 118 lines aren’t shown here.
This diff is large: its 1035 lines aren’t shown here.
This diff is large: its 428 lines aren’t shown here.
This diff is large: its 20 lines aren’t shown here.
This diff is large: its 10 lines aren’t shown here.
This diff is large: its 157 lines aren’t shown here.
This diff is large: its 805 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 21 lines aren’t shown here.
This diff is large: its 42 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 32 lines aren’t shown here.
This diff is large: its 27 lines aren’t shown here.
This diff is large: its 18 lines aren’t shown here.
This diff is large: its 47 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 18 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 18 lines aren’t shown here.
This diff is large: its 18 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 21 lines aren’t shown here.
This diff is large: its 19 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 18 lines aren’t shown here.
This diff is large: its 104 lines aren’t shown here.
This diff is large: its 55 lines aren’t shown here.
This diff is large: its 78 lines aren’t shown here.
This diff is large: its 43 lines aren’t shown here.
This diff is large: its 34 lines aren’t shown here.
This diff is large: its 63 lines aren’t shown here.
This diff is large: its 18 lines aren’t shown here.
This diff is large: its 19 lines aren’t shown here.
This diff is large: its 105 lines aren’t shown here.
This diff is large: its 20 lines aren’t shown here.
This diff is large: its 18 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 17 lines aren’t shown here.
This diff is large: its 17 lines aren’t shown here.
This diff is large: its 24 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 27 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 54 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 84 lines aren’t shown here.
This diff is large: its 17 lines aren’t shown here.
This diff is large: its 90 lines aren’t shown here.
This diff is large: its 235 lines aren’t shown here.
This diff is large: its 73 lines aren’t shown here.
This diff is large: its 36 lines aren’t shown here.
This diff is large: its 17 lines aren’t shown here.
This diff is large: its 21 lines aren’t shown here.
This diff is large: its 226 lines aren’t shown here.
This diff is large: its 18 lines aren’t shown here.
This diff is large: its 30 lines aren’t shown here.
This diff is large: its 13 lines aren’t shown here.
This diff is large: its 133 lines aren’t shown here.
This diff is large: its 45 lines aren’t shown here.
This diff is large: its 13 lines aren’t shown here.
This diff is large: its 113 lines aren’t shown here.
This diff is large: its 175 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 53 lines aren’t shown here.
This diff is large: its 44 lines aren’t shown here.
This diff is large: its 65 lines aren’t shown here.
This diff is large: its 18 lines aren’t shown here.
This diff is large: its 39 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 27 lines aren’t shown here.
This diff is large: its 18 lines aren’t shown here.
This diff is large: its 301 lines aren’t shown here.
This diff is large: its 28 lines aren’t shown here.
This diff is large: its 33 lines aren’t shown here.
This diff is large: its 20 lines aren’t shown here.
This diff is large: its 325 lines aren’t shown here.
This diff is large: its 10 lines aren’t shown here.
This diff is large: its 43 lines aren’t shown here.
This diff is large: its 112 lines aren’t shown here.
This diff is large: its 93 lines aren’t shown here.
This diff is large: its 52 lines aren’t shown here.
This diff is large: its 36 lines aren’t shown here.
This diff is large: its 56 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 25 lines aren’t shown here.
This diff is large: its 18 lines aren’t shown here.
This diff is large: its 224 lines aren’t shown here.
This diff is large: its 22 lines aren’t shown here.
This diff is large: its 82 lines aren’t shown here.
This diff is large: its 216 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 121 lines aren’t shown here.
This diff is large: its 7 lines aren’t shown here.
This diff is large: its 110 lines aren’t shown here.
This diff is large: its 44 lines aren’t shown here.
This diff is large: its 111 lines aren’t shown here.
This diff is large: its 154 lines aren’t shown here.
This diff is large: its 22 lines aren’t shown here.
This diff is large: its 18 lines aren’t shown here.
This diff is large: its 87 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 19 lines aren’t shown here.
This diff is large: its 33 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 130 lines aren’t shown here.
This diff is large: its 78 lines aren’t shown here.
This diff is large: its 241 lines aren’t shown here.
This diff is large: its 104 lines aren’t shown here.
This diff is large: its 33 lines aren’t shown here.
This diff is large: its 25 lines aren’t shown here.
This diff is large: its 295 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 49 lines aren’t shown here.
This diff is large: its 21 lines aren’t shown here.
This diff is large: its 216 lines aren’t shown here.
This diff is large: its 47 lines aren’t shown here.
This diff is large: its 54 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 131 lines aren’t shown here.
This diff is large: its 79 lines aren’t shown here.
This diff is large: its 43 lines aren’t shown here.
This diff is large: its 198 lines aren’t shown here.
This diff is large: its 18 lines aren’t shown here.
This diff is large: its 10 lines aren’t shown here.
This diff is large: its 62 lines aren’t shown here.
This diff is large: its 376 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 4 lines aren’t shown here.
This diff is large: its 4 lines aren’t shown here.
This diff is large: its 6 lines aren’t shown here.
This diff is large: its 6 lines aren’t shown here.
This diff is large: its 6 lines aren’t shown here.
This diff is large: its 6 lines aren’t shown here.
This diff is large: its 4 lines aren’t shown here.
This diff is large: its 4 lines aren’t shown here.
This diff is large: its 6 lines aren’t shown here.
This diff is large: its 6 lines aren’t shown here.
This diff is large: its 6 lines aren’t shown here.
This diff is large: its 6 lines aren’t shown here.
This diff is large: its 5 lines aren’t shown here.
This diff is large: its 19 lines aren’t shown here.
This diff is large: its 10 lines aren’t shown here.
This diff is large: its 6 lines aren’t shown here.
This diff is large: its 6 lines aren’t shown here.
This diff is large: its 6 lines aren’t shown here.
This diff is large: its 6 lines aren’t shown here.
This diff is large: its 6 lines aren’t shown here.
This diff is large: its 15 lines aren’t shown here.
This diff is large: its 6 lines aren’t shown here.
This diff is large: its 6 lines aren’t shown here.
This diff is large: its 15 lines aren’t shown here.
This diff is large: its 15 lines aren’t shown here.
This diff is large: its 6 lines aren’t shown here.
This diff is large: its 6 lines aren’t shown here.
This diff is large: its 6 lines aren’t shown here.
This diff is large: its 14 lines aren’t shown here.
This diff is large: its 6 lines aren’t shown here.
This diff is large: its 5 lines aren’t shown here.
This diff is large: its 71 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 35 lines aren’t shown here.
This diff is large: its 12 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 12 lines aren’t shown here.
This diff is large: its 12 lines aren’t shown here.
This diff is large: its 24 lines aren’t shown here.
This diff is large: its 16 lines aren’t shown here.
This diff is large: its 7 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 17 lines aren’t shown here.
This diff is large: its 39 lines aren’t shown here.
This diff is large: its 55 lines aren’t shown here.
This diff is large: its 332 lines aren’t shown here.
This diff is large: its 27 lines aren’t shown here.
This diff is large: its 18 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 75 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 60 lines aren’t shown here.
This diff is large: its 36 lines aren’t shown here.
This diff is large: its 36 lines aren’t shown here.
This diff is large: its 16 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 17 lines aren’t shown here.
This diff is large: its 20 lines aren’t shown here.
This diff is large: its 55 lines aren’t shown here.
This diff is large: its 40 lines aren’t shown here.
This diff is large: its 25 lines aren’t shown here.
This diff is large: its 29 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 17 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 30 lines aren’t shown here.
This diff is large: its 18 lines aren’t shown here.
This diff is large: its 12 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 25 lines aren’t shown here.
This diff is large: its 17 lines aren’t shown here.
This diff is large: its 26 lines aren’t shown here.
This diff is large: its 334 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 48 lines aren’t shown here.
This diff is large: its 15 lines aren’t shown here.
This diff is large: its 25 lines aren’t shown here.
This diff is large: its 373 lines aren’t shown here.
This diff is large: its 22 lines aren’t shown here.
This diff is large: its 14 lines aren’t shown here.
This diff is large: its 51 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 26 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 26 lines aren’t shown here.
This diff is large: its 28 lines aren’t shown here.
This diff is large: its 10 lines aren’t shown here.
This diff is large: its 35 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 28 lines aren’t shown here.
This diff is large: its 24 lines aren’t shown here.
This diff is large: its 213 lines aren’t shown here.
This diff is large: its 16 lines aren’t shown here.
This diff is large: its 11 lines aren’t shown here.
This diff is large: its 63 lines aren’t shown here.
This diff is large: its 20 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 36 lines aren’t shown here.
This diff is large: its 13 lines aren’t shown here.
This diff is large: its 13 lines aren’t shown here.
This diff is large: its 28 lines aren’t shown here.
This diff is large: its 22 lines aren’t shown here.
This diff is large: its 15 lines aren’t shown here.
This diff is large: its 45 lines aren’t shown here.
This diff is large: its 117 lines aren’t shown here.
This diff is large: its 160 lines aren’t shown here.
This diff is large: its 71 lines aren’t shown here.
This diff is large: its 27 lines aren’t shown here.
This diff is large: its 37 lines aren’t shown here.
This diff is large: its 24 lines aren’t shown here.
This diff is large: its 30 lines aren’t shown here.
This diff is large: its 31 lines aren’t shown here.
This diff is large: its 63 lines aren’t shown here.
This diff is large: its 43 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 31 lines aren’t shown here.
This diff is large: its 11 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 106 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 25 lines aren’t shown here.
This diff is large: its 25 lines aren’t shown here.
This diff is large: its 19 lines aren’t shown here.
This diff is large: its 14 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 58 lines aren’t shown here.
This diff is large: its 82 lines aren’t shown here.
This diff is large: its 26 lines aren’t shown here.
This diff is large: its 38 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 18 lines aren’t shown here.
This diff is large: its 15 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 37 lines aren’t shown here.
This diff is large: its 14 lines aren’t shown here.
This diff is large: its 310 lines aren’t shown here.
This diff is large: its 15 lines aren’t shown here.
This diff is large: its 28 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 28 lines aren’t shown here.
This diff is large: its 19 lines aren’t shown here.
This diff is large: its 99 lines aren’t shown here.
This diff is large: its 10 lines aren’t shown here.
This diff is large: its 16 lines aren’t shown here.
This diff is large: its 12 lines aren’t shown here.
This diff is large: its 16 lines aren’t shown here.
This diff is large: its 26 lines aren’t shown here.
This diff is large: its 10 lines aren’t shown here.
This diff is large: its 19 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 27 lines aren’t shown here.
This diff is large: its 69 lines aren’t shown here.
This diff is large: its 82 lines aren’t shown here.
This diff is large: its 20 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 72 lines aren’t shown here.
This diff is large: its 10 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 15 lines aren’t shown here.
This diff is large: its 17 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 23 lines aren’t shown here.
This diff is large: its 68 lines aren’t shown here.
This diff is large: its 35 lines aren’t shown here.
This diff is large: its 6 lines aren’t shown here.
This diff is large: its 21 lines aren’t shown here.
This diff is large: its 31 lines aren’t shown here.
This diff is large: its 28 lines aren’t shown here.
This diff is large: its 59 lines aren’t shown here.
This diff is large: its 10 lines aren’t shown here.
This diff is large: its 165 lines aren’t shown here.
This diff is large: its 195 lines aren’t shown here.
This diff is large: its 696 lines aren’t shown here.
This diff is large: its 33 lines aren’t shown here.
This diff is large: its 80 lines aren’t shown here.
This diff is large: its 18 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 60 lines aren’t shown here.
This diff is large: its 43 lines aren’t shown here.
This diff is large: its 33 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 19 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 34 lines aren’t shown here.
This diff is large: its 196 lines aren’t shown here.
This diff is large: its 363 lines aren’t shown here.
This diff is large: its 40 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 45 lines aren’t shown here.
This diff is large: its 11 lines aren’t shown here.
This diff is large: its 34 lines aren’t shown here.
This diff is large: its 97 lines aren’t shown here.
This diff is large: its 29 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 35 lines aren’t shown here.
This diff is large: its 39 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 60 lines aren’t shown here.
This diff is large: its 31 lines aren’t shown here.
This diff is large: its 18 lines aren’t shown here.
This diff is large: its 16 lines aren’t shown here.
This diff is large: its 10 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 10 lines aren’t shown here.
This diff is large: its 85 lines aren’t shown here.
This diff is large: its 37 lines aren’t shown here.
This diff is large: its 147 lines aren’t shown here.
This diff is large: its 121 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 39 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 18 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 25 lines aren’t shown here.
This diff is large: its 65 lines aren’t shown here.
This diff is large: its 28 lines aren’t shown here.
This diff is large: its 27 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 101 lines aren’t shown here.
This diff is large: its 18 lines aren’t shown here.
This diff is large: its 5 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 103 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 39 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 34 lines aren’t shown here.
This diff is large: its 19 lines aren’t shown here.
This diff is large: its 18 lines aren’t shown here.
This diff is large: its 42 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 40 lines aren’t shown here.
This diff is large: its 461 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 22 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 33 lines aren’t shown here.
This diff is large: its 94 lines aren’t shown here.
This diff is large: its 235 lines aren’t shown here.
This diff is large: its 57 lines aren’t shown here.
This diff is large: its 168 lines aren’t shown here.
This diff is large: its 33 lines aren’t shown here.
This diff is large: its 10 lines aren’t shown here.
This diff is large: its 26 lines aren’t shown here.
This diff is large: its 10 lines aren’t shown here.
This diff is large: its 12 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 65 lines aren’t shown here.
This diff is large: its 268 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 63 lines aren’t shown here.
This diff is large: its 16 lines aren’t shown here.
This diff is large: its 165 lines aren’t shown here.
This diff is large: its 16 lines aren’t shown here.
This diff is large: its 16 lines aren’t shown here.
This diff is large: its 16 lines aren’t shown here.
This diff is large: its 16 lines aren’t shown here.
This diff is large: its 18 lines aren’t shown here.
This diff is large: its 16 lines aren’t shown here.
This diff is large: its 18 lines aren’t shown here.
This diff is large: its 16 lines aren’t shown here.
This diff is large: its 16 lines aren’t shown here.
This diff is large: its 12 lines aren’t shown here.
This diff is large: its 16 lines aren’t shown here.
This diff is large: its 16 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 16 lines aren’t shown here.
This diff is large: its 182 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 17 lines aren’t shown here.
This diff is large: its 167 lines aren’t shown here.
This diff is large: its 28 lines aren’t shown here.
This diff is large: its 13 lines aren’t shown here.
This diff is large: its 23 lines aren’t shown here.
This diff is large: its 11 lines aren’t shown here.
This diff is large: its 10 lines aren’t shown here.
This diff is large: its 56 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 18 lines aren’t shown here.
This diff is large: its 27 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 58 lines aren’t shown here.
This diff is large: its 45 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 24 lines aren’t shown here.
This diff is large: its 27 lines aren’t shown here.
This diff is large: its 43 lines aren’t shown here.
This diff is large: its 16 lines aren’t shown here.
This diff is large: its 16 lines aren’t shown here.
This diff is large: its 37 lines aren’t shown here.
This diff is large: its 17 lines aren’t shown here.
This diff is large: its 54 lines aren’t shown here.
This diff is large: its 23 lines aren’t shown here.
This diff is large: its 98 lines aren’t shown here.
This diff is large: its 152 lines aren’t shown here.
This diff is large: its 125 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 17 lines aren’t shown here.
This diff is large: its 14 lines aren’t shown here.
This diff is large: its 65 lines aren’t shown here.
This diff is large: its 56 lines aren’t shown here.
This diff is large: its 89 lines aren’t shown here.
This diff is large: its 84 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 61 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 231 lines aren’t shown here.
This diff is large: its 42 lines aren’t shown here.
This diff is large: its 102 lines aren’t shown here.
This diff is large: its 38 lines aren’t shown here.
This diff is large: its 175 lines aren’t shown here.
This diff is large: its 39 lines aren’t shown here.
This diff is large: its 74 lines aren’t shown here.
This diff is large: its 20 lines aren’t shown here.
This diff is large: its 60 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 35 lines aren’t shown here.
This diff is large: its 24 lines aren’t shown here.
This diff is large: its 11 lines aren’t shown here.
This diff is large: its 18 lines aren’t shown here.
This diff is large: its 32 lines aren’t shown here.
This diff is large: its 13 lines aren’t shown here.
This diff is large: its 24 lines aren’t shown here.
This diff is large: its 213 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 62 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 18 lines aren’t shown here.
This diff is large: its 13 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 24 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 26 lines aren’t shown here.
This diff is large: its 17 lines aren’t shown here.
This diff is large: its 10 lines aren’t shown here.
This diff is large: its 40 lines aren’t shown here.
This diff is large: its 10 lines aren’t shown here.
This diff is large: its 18 lines aren’t shown here.
This diff is large: its 51 lines aren’t shown here.
This diff is large: its 113 lines aren’t shown here.
This diff is large: its 15 lines aren’t shown here.
This diff is large: its 11 lines aren’t shown here.
This diff is large: its 11 lines aren’t shown here.
This diff is large: its 10 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 15 lines aren’t shown here.
This diff is large: its 48 lines aren’t shown here.
This diff is large: its 142 lines aren’t shown here.
This diff is large: its 14 lines aren’t shown here.
This diff is large: its 172 lines aren’t shown here.
This diff is large: its 11 lines aren’t shown here.
This diff is large: its 11 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 13 lines aren’t shown here.
This diff is large: its 19 lines aren’t shown here.
This diff is large: its 33 lines aren’t shown here.
This diff is large: its 33 lines aren’t shown here.
This diff is large: its 31 lines aren’t shown here.
This diff is large: its 31 lines aren’t shown here.
This diff is large: its 33 lines aren’t shown here.
This diff is large: its 43 lines aren’t shown here.
This diff is large: its 41 lines aren’t shown here.
This diff is large: its 68 lines aren’t shown here.
This diff is large: its 35 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 11 lines aren’t shown here.
This diff is large: its 298 lines aren’t shown here.
This diff is large: its 67 lines aren’t shown here.
This diff is large: its 13 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 15 lines aren’t shown here.
This diff is large: its 13 lines aren’t shown here.
This diff is large: its 13 lines aren’t shown here.
This diff is large: its 15 lines aren’t shown here.
This diff is large: its 15 lines aren’t shown here.
This diff is large: its 15 lines aren’t shown here.
This diff is large: its 13 lines aren’t shown here.
This diff is large: its 24 lines aren’t shown here.
This diff is large: its 15 lines aren’t shown here.
This diff is large: its 20 lines aren’t shown here.
This diff is large: its 21 lines aren’t shown here.
This diff is large: its 19 lines aren’t shown here.
This diff is large: its 18 lines aren’t shown here.
This diff is large: its 13 lines aren’t shown here.