diff options
| author | Jesper Nilsson <jesper.nilsson@axis.com> | 2008-10-21 17:45:58 +0200 |
|---|---|---|
| committer | Jesper Nilsson <jesper.nilsson@axis.com> | 2008-10-29 17:29:44 +0100 |
| commit | 556dcee7b829e5c350c3ffdbdb87a8b15aa3c5d3 (patch) | |
| tree | 26485b0d92eedcba6c0c96d4069469041aaf7106 | |
| parent | 242bfafc8e42da4697c1e2dea108049d14dbac4b (diff) | |
| download | linux-556dcee7b829e5c350c3ffdbdb87a8b15aa3c5d3.tar.gz linux-556dcee7b829e5c350c3ffdbdb87a8b15aa3c5d3.tar.bz2 linux-556dcee7b829e5c350c3ffdbdb87a8b15aa3c5d3.zip | |
[CRIS] Move header files from include to arch/cris/include.
Change all users of header files to correct path.
Remove some unneeded headers for arch-v32.
Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
| -rw-r--r-- | arch/cris/Makefile | 26 | ||||
| -rw-r--r-- | arch/cris/arch-v10/boot/.gitignore | 2 | ||||
| -rw-r--r-- | arch/cris/arch-v10/boot/compressed/head.S | 2 | ||||
| -rw-r--r-- | arch/cris/arch-v10/boot/compressed/misc.c | 2 | ||||
| -rw-r--r-- | arch/cris/arch-v10/boot/rescue/head.S | 2 | ||||
| -rw-r--r-- | arch/cris/arch-v10/boot/rescue/kimagerescue.S | 2 | ||||
| -rw-r--r-- | arch/cris/arch-v10/boot/rescue/testrescue.S | 2 | ||||
| -rw-r--r-- | arch/cris/arch-v10/drivers/axisflashmap.c | 2 | ||||
| -rw-r--r-- | arch/cris/arch-v10/drivers/ds1302.c | 4 | ||||
| -rw-r--r-- | arch/cris/arch-v10/drivers/gpio.c | 4 | ||||
| -rw-r--r-- | arch/cris/arch-v10/drivers/i2c.c | 4 | ||||
| -rw-r--r-- | arch/cris/arch-v10/drivers/sync_serial.c | 4 | ||||
| -rw-r--r-- | arch/cris/arch-v10/kernel/crisksyms.c | 2 | ||||
| -rw-r--r-- | arch/cris/arch-v10/kernel/debugport.c | 2 | ||||
| -rw-r--r-- | arch/cris/arch-v10/kernel/dma.c | 2 | ||||
| -rw-r--r-- | arch/cris/arch-v10/kernel/entry.S | 2 | ||||
| -rw-r--r-- | arch/cris/arch-v10/kernel/fasttimer.c | 2 | ||||
| -rw-r--r-- | arch/cris/arch-v10/kernel/head.S | 2 | ||||
| -rw-r--r-- | arch/cris/arch-v10/kernel/io_interface_mux.c | 4 | ||||
| -rw-r--r-- | arch/cris/arch-v10/kernel/kgdb.c | 2 | ||||
| -rw-r--r-- | arch/cris/arch-v10/kernel/process.c | 2 | ||||
| -rw-r--r-- | arch/cris/arch-v10/kernel/time.c | 2 | ||||
| -rw-r--r-- | arch/cris/arch-v10/kernel/traps.c | 2 | ||||
| -rw-r--r-- | arch/cris/arch-v10/mm/fault.c | 2 | ||||
| -rw-r--r-- | arch/cris/arch-v10/mm/init.c | 2 | ||||
| -rw-r--r-- | arch/cris/arch-v10/mm/tlb.c | 2 | ||||
| -rw-r--r-- | arch/cris/arch-v32/boot/compressed/head.S | 4 | ||||
| -rw-r--r-- | arch/cris/arch-v32/drivers/mach-a3/gpio.c | 2 | ||||
| -rw-r--r-- | arch/cris/arch-v32/drivers/mach-a3/nandflash.c | 2 | ||||
| -rw-r--r-- | arch/cris/arch-v32/drivers/mach-fs/nandflash.c | 2 | ||||
| -rw-r--r-- | arch/cris/arch-v32/drivers/pci/bios.c | 2 | ||||
| -rw-r--r-- | arch/cris/arch-v32/kernel/cache.c | 4 | ||||
| -rw-r--r-- | arch/cris/arch-v32/kernel/crisksyms.c | 8 | ||||
| -rw-r--r-- | arch/cris/arch-v32/kernel/debugport.c | 2 | ||||
| -rw-r--r-- | arch/cris/arch-v32/kernel/entry.S | 4 | ||||
| -rw-r--r-- | arch/cris/arch-v32/kernel/head.S | 4 | ||||
| -rw-r--r-- | arch/cris/arch-v32/kernel/kgdb.c | 8 | ||||
| -rw-r--r-- | arch/cris/arch-v32/kernel/kgdb_asm.S | 2 | ||||
| -rw-r--r-- | arch/cris/arch-v32/kernel/pinmux.c | 8 | ||||
| -rw-r--r-- | arch/cris/arch-v32/kernel/ptrace.c | 2 | ||||
| -rw-r--r-- | arch/cris/arch-v32/kernel/signal.c | 4 | ||||
| -rw-r--r-- | arch/cris/arch-v32/lib/nand_init.S | 10 | ||||
| -rw-r--r-- | arch/cris/arch-v32/mach-a3/dma.c | 2 | ||||
| -rw-r--r-- | arch/cris/arch-v32/mach-a3/io.c | 2 | ||||
| -rw-r--r-- | arch/cris/arch-v32/mach-fs/cpufreq.c | 6 | ||||
| -rw-r--r-- | arch/cris/arch-v32/mach-fs/dma.c | 2 | ||||
| -rw-r--r-- | arch/cris/arch-v32/mach-fs/io.c | 4 | ||||
| -rw-r--r-- | arch/cris/arch-v32/mach-fs/vcs_hook.c | 4 | ||||
| -rw-r--r-- | arch/cris/arch-v32/mm/init.c | 4 | ||||
| -rw-r--r-- | arch/cris/arch-v32/mm/tlb.c | 4 | ||||
| -rw-r--r-- | arch/cris/include/arch-v10/arch/Kbuild (renamed from include/asm-cris/arch-v10/Kbuild) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v10/arch/atomic.h (renamed from include/asm-cris/arch-v10/atomic.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v10/arch/bitops.h (renamed from include/asm-cris/arch-v10/bitops.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v10/arch/bug.h (renamed from include/asm-cris/arch-v10/bug.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v10/arch/byteorder.h (renamed from include/asm-cris/arch-v10/byteorder.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v10/arch/cache.h (renamed from include/asm-cris/arch-v10/cache.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v10/arch/checksum.h (renamed from include/asm-cris/arch-v10/checksum.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v10/arch/delay.h (renamed from include/asm-cris/arch-v10/delay.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v10/arch/dma.h (renamed from include/asm-cris/arch-v10/dma.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v10/arch/elf.h (renamed from include/asm-cris/arch-v10/elf.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v10/arch/io.h (renamed from include/asm-cris/arch-v10/io.h) | 2 | ||||
| -rw-r--r-- | arch/cris/include/arch-v10/arch/io_interface_mux.h (renamed from include/asm-cris/arch-v10/io_interface_mux.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v10/arch/irq.h (renamed from include/asm-cris/arch-v10/irq.h) | 2 | ||||
| -rw-r--r-- | arch/cris/include/arch-v10/arch/memmap.h (renamed from include/asm-cris/arch-v10/memmap.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v10/arch/mmu.h (renamed from include/asm-cris/arch-v10/mmu.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v10/arch/offset.h (renamed from include/asm-cris/arch-v10/offset.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v10/arch/page.h (renamed from include/asm-cris/arch-v10/page.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v10/arch/pgtable.h (renamed from include/asm-cris/arch-v10/pgtable.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v10/arch/processor.h (renamed from include/asm-cris/arch-v10/processor.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v10/arch/ptrace.h (renamed from include/asm-cris/arch-v10/ptrace.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v10/arch/sv_addr.agh (renamed from include/asm-cris/arch-v10/sv_addr.agh) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v10/arch/sv_addr_ag.h (renamed from include/asm-cris/arch-v10/sv_addr_ag.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v10/arch/svinto.h (renamed from include/asm-cris/arch-v10/svinto.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v10/arch/system.h (renamed from include/asm-cris/arch-v10/system.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v10/arch/thread_info.h (renamed from include/asm-cris/arch-v10/thread_info.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v10/arch/timex.h (renamed from include/asm-cris/arch-v10/timex.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v10/arch/tlb.h (renamed from include/asm-cris/arch-v10/tlb.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v10/arch/uaccess.h (renamed from include/asm-cris/arch-v10/uaccess.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v10/arch/unistd.h (renamed from include/asm-cris/arch-v10/unistd.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v10/arch/user.h (renamed from include/asm-cris/arch-v10/user.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/arch/Kbuild (renamed from include/asm-cris/arch-v32/Kbuild) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/arch/atomic.h (renamed from include/asm-cris/arch-v32/atomic.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/arch/bitops.h (renamed from include/asm-cris/arch-v32/bitops.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/arch/bug.h (renamed from include/asm-cris/arch-v32/bug.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/arch/byteorder.h (renamed from include/asm-cris/arch-v32/byteorder.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/arch/cache.h (renamed from include/asm-cris/arch-v32/cache.h) | 2 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/arch/checksum.h (renamed from include/asm-cris/arch-v32/checksum.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/arch/cryptocop.h (renamed from include/asm-cris/arch-v32/cryptocop.h) | 2 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/arch/delay.h (renamed from include/asm-cris/arch-v32/delay.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/arch/dma.h (renamed from include/asm-cris/arch-v32/dma.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/arch/elf.h (renamed from include/asm-cris/arch-v32/elf.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/arch/hwregs/Makefile (renamed from include/asm-cris/arch-v32/hwregs/Makefile) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/arch/hwregs/asm/ata_defs_asm.h (renamed from include/asm-cris/arch-v32/hwregs/asm/ata_defs_asm.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/arch/hwregs/asm/bif_core_defs_asm.h (renamed from include/asm-cris/arch-v32/hwregs/asm/bif_core_defs_asm.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/arch/hwregs/asm/bif_dma_defs_asm.h (renamed from include/asm-cris/arch-v32/hwregs/asm/bif_dma_defs_asm.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/arch/hwregs/asm/bif_slave_defs_asm.h (renamed from include/asm-cris/arch-v32/hwregs/asm/bif_slave_defs_asm.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/arch/hwregs/asm/config_defs_asm.h (renamed from include/asm-cris/arch-v32/hwregs/asm/config_defs_asm.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/arch/hwregs/asm/cpu_vect.h (renamed from include/asm-cris/arch-v32/hwregs/asm/cpu_vect.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/arch/hwregs/asm/cris_defs_asm.h (renamed from include/asm-cris/arch-v32/hwregs/asm/cris_defs_asm.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/arch/hwregs/asm/cris_supp_reg.h (renamed from include/asm-cris/arch-v32/hwregs/asm/cris_supp_reg.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/arch/hwregs/asm/dma_defs_asm.h (renamed from include/asm-cris/arch-v32/hwregs/asm/dma_defs_asm.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/arch/hwregs/asm/eth_defs_asm.h (renamed from include/asm-cris/arch-v32/hwregs/asm/eth_defs_asm.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/arch/hwregs/asm/gio_defs_asm.h (renamed from include/asm-cris/arch-v32/hwregs/asm/gio_defs_asm.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/arch/hwregs/asm/intr_vect.h (renamed from include/asm-cris/arch-v32/hwregs/asm/intr_vect.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/arch/hwregs/asm/intr_vect_defs_asm.h (renamed from include/asm-cris/arch-v32/hwregs/asm/intr_vect_defs_asm.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/arch/hwregs/asm/irq_nmi_defs_asm.h (renamed from include/asm-cris/arch-v32/hwregs/asm/irq_nmi_defs_asm.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/arch/hwregs/asm/marb_defs_asm.h (renamed from include/asm-cris/arch-v32/hwregs/asm/marb_defs_asm.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/arch/hwregs/asm/mmu_defs_asm.h (renamed from include/asm-cris/arch-v32/hwregs/asm/mmu_defs_asm.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/arch/hwregs/asm/mmu_supp_reg.h (renamed from include/asm-cris/arch-v32/hwregs/asm/mmu_supp_reg.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/arch/hwregs/asm/rt_trace_defs_asm.h (renamed from include/asm-cris/arch-v32/hwregs/asm/rt_trace_defs_asm.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/arch/hwregs/asm/ser_defs_asm.h (renamed from include/asm-cris/arch-v32/hwregs/asm/ser_defs_asm.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/arch/hwregs/asm/sser_defs_asm.h (renamed from include/asm-cris/arch-v32/hwregs/asm/sser_defs_asm.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/arch/hwregs/asm/strcop_defs_asm.h (renamed from include/asm-cris/arch-v32/hwregs/asm/strcop_defs_asm.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/arch/hwregs/asm/strmux_defs_asm.h (renamed from include/asm-cris/arch-v32/hwregs/asm/strmux_defs_asm.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/arch/hwregs/asm/timer_defs_asm.h (renamed from include/asm-cris/arch-v32/hwregs/asm/timer_defs_asm.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/arch/hwregs/ata_defs.h (renamed from include/asm-cris/arch-v32/hwregs/ata_defs.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/arch/hwregs/bif_core_defs.h (renamed from include/asm-cris/arch-v32/hwregs/bif_core_defs.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/arch/hwregs/bif_dma_defs.h (renamed from include/asm-cris/arch-v32/hwregs/bif_dma_defs.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/arch/hwregs/bif_slave_defs.h (renamed from include/asm-cris/arch-v32/hwregs/bif_slave_defs.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/arch/hwregs/config_defs.h (renamed from include/asm-cris/arch-v32/hwregs/config_defs.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/arch/hwregs/cpu_vect.h (renamed from include/asm-cris/arch-v32/hwregs/cpu_vect.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/arch/hwregs/dma.h (renamed from include/asm-cris/arch-v32/hwregs/dma.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/arch/hwregs/dma_defs.h (renamed from include/asm-cris/arch-v32/hwregs/dma_defs.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/arch/hwregs/eth_defs.h (renamed from include/asm-cris/arch-v32/hwregs/eth_defs.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/arch/hwregs/extmem_defs.h (renamed from include/asm-cris/arch-v32/hwregs/extmem_defs.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/arch/hwregs/iop/Makefile (renamed from include/asm-cris/arch-v32/hwregs/iop/Makefile) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/arch/hwregs/iop/asm/iop_crc_par_defs_asm.h (renamed from include/asm-cris/arch-v32/hwregs/iop/asm/iop_crc_par_defs_asm.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/arch/hwregs/iop/asm/iop_dmc_in_defs_asm.h (renamed from include/asm-cris/arch-v32/hwregs/iop/asm/iop_dmc_in_defs_asm.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/arch/hwregs/iop/asm/iop_dmc_out_defs_asm.h (renamed from include/asm-cris/arch-v32/hwregs/iop/asm/iop_dmc_out_defs_asm.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/arch/hwregs/iop/asm/iop_fifo_in_defs_asm.h (renamed from include/asm-cris/arch-v32/hwregs/iop/asm/iop_fifo_in_defs_asm.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/arch/hwregs/iop/asm/iop_fifo_in_extra_defs_asm.h (renamed from include/asm-cris/arch-v32/hwregs/iop/asm/iop_fifo_in_extra_defs_asm.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/arch/hwregs/iop/asm/iop_fifo_out_defs_asm.h (renamed from include/asm-cris/arch-v32/hwregs/iop/asm/iop_fifo_out_defs_asm.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/arch/hwregs/iop/asm/iop_fifo_out_extra_defs_asm.h (renamed from include/asm-cris/arch-v32/hwregs/iop/asm/iop_fifo_out_extra_defs_asm.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/arch/hwregs/iop/asm/iop_mpu_defs_asm.h (renamed from include/asm-cris/arch-v32/hwregs/iop/asm/iop_mpu_defs_asm.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/arch/hwregs/iop/asm/iop_reg_space_asm.h (renamed from include/asm-cris/arch-v32/hwregs/iop/asm/iop_reg_space_asm.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/arch/hwregs/iop/asm/iop_sap_in_defs_asm.h (renamed from include/asm-cris/arch-v32/hwregs/iop/asm/iop_sap_in_defs_asm.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/arch/hwregs/iop/asm/iop_sap_out_defs_asm.h (renamed from include/asm-cris/arch-v32/hwregs/iop/asm/iop_sap_out_defs_asm.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/arch/hwregs/iop/asm/iop_scrc_in_defs_asm.h (renamed from include/asm-cris/arch-v32/hwregs/iop/asm/iop_scrc_in_defs_asm.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/arch/hwregs/iop/asm/iop_scrc_out_defs_asm.h (renamed from include/asm-cris/arch-v32/hwregs/iop/asm/iop_scrc_out_defs_asm.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/arch/hwregs/iop/asm/iop_spu_defs_asm.h (renamed from include/asm-cris/arch-v32/hwregs/iop/asm/iop_spu_defs_asm.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/arch/hwregs/iop/asm/iop_sw_cfg_defs_asm.h (renamed from include/asm-cris/arch-v32/hwregs/iop/asm/iop_sw_cfg_defs_asm.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/arch/hwregs/iop/asm/iop_sw_cpu_defs_asm.h (renamed from include/asm-cris/arch-v32/hwregs/iop/asm/iop_sw_cpu_defs_asm.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/arch/hwregs/iop/asm/iop_sw_mpu_defs_asm.h (renamed from include/asm-cris/arch-v32/hwregs/iop/asm/iop_sw_mpu_defs_asm.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/arch/hwregs/iop/asm/iop_sw_spu_defs_asm.h (renamed from include/asm-cris/arch-v32/hwregs/iop/asm/iop_sw_spu_defs_asm.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/arch/hwregs/iop/asm/iop_timer_grp_defs_asm.h (renamed from include/asm-cris/arch-v32/hwregs/iop/asm/iop_timer_grp_defs_asm.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/arch/hwregs/iop/asm/iop_trigger_grp_defs_asm.h (renamed from include/asm-cris/arch-v32/hwregs/iop/asm/iop_trigger_grp_defs_asm.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/arch/hwregs/iop/asm/iop_version_defs_asm.h (renamed from include/asm-cris/arch-v32/hwregs/iop/asm/iop_version_defs_asm.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/arch/hwregs/iop/iop_crc_par_defs.h (renamed from include/asm-cris/arch-v32/hwregs/iop/iop_crc_par_defs.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/arch/hwregs/iop/iop_dmc_in_defs.h (renamed from include/asm-cris/arch-v32/hwregs/iop/iop_dmc_in_defs.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/arch/hwregs/iop/iop_dmc_out_defs.h (renamed from include/asm-cris/arch-v32/hwregs/iop/iop_dmc_out_defs.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/arch/hwregs/iop/iop_fifo_in_defs.h (renamed from include/asm-cris/arch-v32/hwregs/iop/iop_fifo_in_defs.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/arch/hwregs/iop/iop_fifo_in_extra_defs.h (renamed from include/asm-cris/arch-v32/hwregs/iop/iop_fifo_in_extra_defs.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/arch/hwregs/iop/iop_fifo_out_defs.h (renamed from include/asm-cris/arch-v32/hwregs/iop/iop_fifo_out_defs.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/arch/hwregs/iop/iop_fifo_out_extra_defs.h (renamed from include/asm-cris/arch-v32/hwregs/iop/iop_fifo_out_extra_defs.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/arch/hwregs/iop/iop_mpu_defs.h (renamed from include/asm-cris/arch-v32/hwregs/iop/iop_mpu_defs.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/arch/hwregs/iop/iop_mpu_macros.h (renamed from include/asm-cris/arch-v32/hwregs/iop/iop_mpu_macros.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/arch/hwregs/iop/iop_reg_space.h (renamed from include/asm-cris/arch-v32/hwregs/iop/iop_reg_space.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/arch/hwregs/iop/iop_sap_in_defs.h (renamed from include/asm-cris/arch-v32/hwregs/iop/iop_sap_in_defs.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/arch/hwregs/iop/iop_sap_out_defs.h (renamed from include/asm-cris/arch-v32/hwregs/iop/iop_sap_out_defs.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/arch/hwregs/iop/iop_scrc_in_defs.h (renamed from include/asm-cris/arch-v32/hwregs/iop/iop_scrc_in_defs.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/arch/hwregs/iop/iop_scrc_out_defs.h (renamed from include/asm-cris/arch-v32/hwregs/iop/iop_scrc_out_defs.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/arch/hwregs/iop/iop_spu_defs.h (renamed from include/asm-cris/arch-v32/hwregs/iop/iop_spu_defs.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/arch/hwregs/iop/iop_sw_cfg_defs.h (renamed from include/asm-cris/arch-v32/hwregs/iop/iop_sw_cfg_defs.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/arch/hwregs/iop/iop_sw_cpu_defs.h (renamed from include/asm-cris/arch-v32/hwregs/iop/iop_sw_cpu_defs.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/arch/hwregs/iop/iop_sw_mpu_defs.h (renamed from include/asm-cris/arch-v32/hwregs/iop/iop_sw_mpu_defs.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/arch/hwregs/iop/iop_sw_spu_defs.h (renamed from include/asm-cris/arch-v32/hwregs/iop/iop_sw_spu_defs.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/arch/hwregs/iop/iop_timer_grp_defs.h (renamed from include/asm-cris/arch-v32/hwregs/iop/iop_timer_grp_defs.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/arch/hwregs/iop/iop_trigger_grp_defs.h (renamed from include/asm-cris/arch-v32/hwregs/iop/iop_trigger_grp_defs.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/arch/hwregs/iop/iop_version_defs.h (renamed from include/asm-cris/arch-v32/hwregs/iop/iop_version_defs.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/arch/hwregs/irq_nmi_defs.h (renamed from include/asm-cris/arch-v32/hwregs/irq_nmi_defs.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/arch/hwregs/marb_bp_defs.h (renamed from include/asm-cris/arch-v32/hwregs/marb_bp_defs.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/arch/hwregs/marb_defs.h (renamed from include/asm-cris/arch-v32/hwregs/marb_defs.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/arch/hwregs/reg_rdwr.h (renamed from include/asm-cris/arch-v32/hwregs/reg_rdwr.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/arch/hwregs/rt_trace_defs.h (renamed from include/asm-cris/arch-v32/hwregs/rt_trace_defs.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/arch/hwregs/ser_defs.h (renamed from include/asm-cris/arch-v32/hwregs/ser_defs.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/arch/hwregs/sser_defs.h (renamed from include/asm-cris/arch-v32/hwregs/sser_defs.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/arch/hwregs/strcop.h (renamed from include/asm-cris/arch-v32/hwregs/strcop.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/arch/hwregs/strcop_defs.h (renamed from include/asm-cris/arch-v32/hwregs/strcop_defs.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/arch/hwregs/supp_reg.h (renamed from include/asm-cris/arch-v32/hwregs/supp_reg.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/arch/intmem.h (renamed from include/asm-cris/arch-v32/intmem.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/arch/io.h (renamed from include/asm-cris/arch-v32/io.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/arch/irq.h (renamed from include/asm-cris/arch-v32/irq.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/arch/memmap.h (renamed from include/asm-cris/arch-v32/memmap.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/arch/mmu.h (renamed from include/asm-cris/arch-v32/mmu.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/arch/offset.h (renamed from include/asm-cris/arch-v32/offset.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/arch/page.h (renamed from include/asm-cris/arch-v32/page.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/arch/pgtable.h (renamed from include/asm-cris/arch-v32/pgtable.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/arch/processor.h (renamed from include/asm-cris/arch-v32/processor.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/arch/ptrace.h (renamed from include/asm-cris/arch-v32/ptrace.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/arch/spinlock.h (renamed from include/asm-cris/arch-v32/spinlock.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/arch/system.h (renamed from include/asm-cris/arch-v32/system.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/arch/thread_info.h (renamed from include/asm-cris/arch-v32/thread_info.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/arch/timex.h (renamed from include/asm-cris/arch-v32/timex.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/arch/tlb.h (renamed from include/asm-cris/arch-v32/tlb.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/arch/uaccess.h (renamed from include/asm-cris/arch-v32/uaccess.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/arch/unistd.h (renamed from include/asm-cris/arch-v32/unistd.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/arch/user.h (renamed from include/asm-cris/arch-v32/user.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/mach-a3/mach/arbiter.h (renamed from include/asm-cris/arch-v32/mach-a3/arbiter.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/mach-a3/mach/dma.h (renamed from include/asm-cris/arch-v32/mach-a3/dma.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/mach-a3/mach/hwregs/asm/clkgen_defs_asm.h (renamed from include/asm-cris/arch-v32/mach-a3/hwregs/asm/clkgen_defs_asm.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/mach-a3/mach/hwregs/asm/ddr2_defs_asm.h (renamed from include/asm-cris/arch-v32/mach-a3/hwregs/asm/ddr2_defs_asm.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/mach-a3/mach/hwregs/asm/gio_defs_asm.h (renamed from include/asm-cris/arch-v32/mach-a3/hwregs/asm/gio_defs_asm.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/mach-a3/mach/hwregs/asm/pinmux_defs_asm.h (renamed from include/asm-cris/arch-v32/mach-a3/hwregs/asm/pinmux_defs_asm.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/mach-a3/mach/hwregs/asm/pio_defs_asm.h (renamed from include/asm-cris/arch-v32/mach-a3/hwregs/asm/pio_defs_asm.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/mach-a3/mach/hwregs/asm/reg_map_asm.h (renamed from include/asm-cris/arch-v32/mach-a3/hwregs/asm/reg_map_asm.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/mach-a3/mach/hwregs/asm/timer_defs_asm.h (renamed from include/asm-cris/arch-v32/mach-a3/hwregs/asm/timer_defs_asm.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/mach-a3/mach/hwregs/clkgen_defs.h (renamed from include/asm-cris/arch-v32/mach-a3/hwregs/clkgen_defs.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/mach-a3/mach/hwregs/ddr2_defs.h (renamed from include/asm-cris/arch-v32/mach-a3/hwregs/ddr2_defs.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/mach-a3/mach/hwregs/gio_defs.h (renamed from include/asm-cris/arch-v32/mach-a3/hwregs/gio_defs.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/mach-a3/mach/hwregs/intr_vect.h (renamed from include/asm-cris/arch-v32/mach-a3/hwregs/intr_vect.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/mach-a3/mach/hwregs/intr_vect_defs.h (renamed from include/asm-cris/arch-v32/mach-a3/hwregs/intr_vect_defs.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/mach-a3/mach/hwregs/iop/asm/iop_reg_space_asm.h (renamed from include/asm-cris/arch-v32/mach-a3/hwregs/iop/asm/iop_reg_space_asm.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/mach-a3/mach/hwregs/iop/asm/iop_sap_in_defs_asm.h (renamed from include/asm-cris/arch-v32/mach-a3/hwregs/iop/asm/iop_sap_in_defs_asm.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/mach-a3/mach/hwregs/iop/asm/iop_sap_out_defs_asm.h (renamed from include/asm-cris/arch-v32/mach-a3/hwregs/iop/asm/iop_sap_out_defs_asm.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/mach-a3/mach/hwregs/iop/asm/iop_sw_cfg_defs_asm.h (renamed from include/asm-cris/arch-v32/mach-a3/hwregs/iop/asm/iop_sw_cfg_defs_asm.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/mach-a3/mach/hwregs/iop/asm/iop_sw_cpu_defs_asm.h (renamed from include/asm-cris/arch-v32/mach-a3/hwregs/iop/asm/iop_sw_cpu_defs_asm.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/mach-a3/mach/hwregs/iop/asm/iop_sw_mpu_defs_asm.h (renamed from include/asm-cris/arch-v32/mach-a3/hwregs/iop/asm/iop_sw_mpu_defs_asm.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/mach-a3/mach/hwregs/iop/asm/iop_sw_spu_defs_asm.h (renamed from include/asm-cris/arch-v32/mach-a3/hwregs/iop/asm/iop_sw_spu_defs_asm.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/mach-a3/mach/hwregs/iop/asm/iop_version_defs_asm.h (renamed from include/asm-cris/arch-v32/mach-a3/hwregs/iop/asm/iop_version_defs_asm.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/mach-a3/mach/hwregs/iop/iop_reg_space.h (renamed from include/asm-cris/arch-v32/mach-a3/hwregs/iop/iop_reg_space.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/mach-a3/mach/hwregs/iop/iop_sap_in_defs.h (renamed from include/asm-cris/arch-v32/mach-a3/hwregs/iop/iop_sap_in_defs.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/mach-a3/mach/hwregs/iop/iop_sap_out_defs.h (renamed from include/asm-cris/arch-v32/mach-a3/hwregs/iop/iop_sap_out_defs.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/mach-a3/mach/hwregs/iop/iop_sw_cfg_defs.h (renamed from include/asm-cris/arch-v32/mach-a3/hwregs/iop/iop_sw_cfg_defs.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/mach-a3/mach/hwregs/iop/iop_sw_cpu_defs.h (renamed from include/asm-cris/arch-v32/mach-a3/hwregs/iop/iop_sw_cpu_defs.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/mach-a3/mach/hwregs/iop/iop_sw_mpu_defs.h (renamed from include/asm-cris/arch-v32/mach-a3/hwregs/iop/iop_sw_mpu_defs.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/mach-a3/mach/hwregs/iop/iop_sw_spu_defs.h (renamed from include/asm-cris/arch-v32/mach-a3/hwregs/iop/iop_sw_spu_defs.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/mach-a3/mach/hwregs/iop/iop_version_defs.h (renamed from include/asm-cris/arch-v32/mach-a3/hwregs/iop/iop_version_defs.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/mach-a3/mach/hwregs/l2cache_defs.h (renamed from include/asm-cris/arch-v32/mach-a3/hwregs/l2cache_defs.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/mach-a3/mach/hwregs/marb_bar_defs.h (renamed from include/asm-cris/arch-v32/mach-a3/hwregs/marb_bar_defs.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/mach-a3/mach/hwregs/marb_foo_defs.h (renamed from include/asm-cris/arch-v32/mach-a3/hwregs/marb_foo_defs.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/mach-a3/mach/hwregs/pinmux_defs.h (renamed from include/asm-cris/arch-v32/mach-a3/hwregs/pinmux_defs.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/mach-a3/mach/hwregs/pio_defs.h (renamed from include/asm-cris/arch-v32/mach-a3/hwregs/pio_defs.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/mach-a3/mach/hwregs/reg_map.h (renamed from include/asm-cris/arch-v32/mach-a3/hwregs/reg_map.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/mach-a3/mach/hwregs/strmux_defs.h (renamed from include/asm-cris/arch-v32/mach-a3/hwregs/strmux_defs.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/mach-a3/mach/hwregs/timer_defs.h (renamed from include/asm-cris/arch-v32/mach-a3/hwregs/timer_defs.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/mach-a3/mach/memmap.h (renamed from include/asm-cris/arch-v32/mach-a3/memmap.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/mach-a3/mach/pinmux.h (renamed from include/asm-cris/arch-v32/mach-a3/pinmux.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/mach-a3/mach/startup.inc (renamed from include/asm-cris/arch-v32/mach-a3/startup.inc) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/mach-fs/mach/arbiter.h (renamed from include/asm-cris/arch-v32/mach-fs/arbiter.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/mach-fs/mach/hwregs/asm/bif_core_defs_asm.h (renamed from include/asm-cris/arch-v32/mach-fs/hwregs/asm/bif_core_defs_asm.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/mach-fs/mach/hwregs/asm/config_defs_asm.h (renamed from include/asm-cris/arch-v32/mach-fs/hwregs/asm/config_defs_asm.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/mach-fs/mach/hwregs/asm/gio_defs_asm.h (renamed from include/asm-cris/arch-v32/mach-fs/hwregs/asm/gio_defs_asm.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/mach-fs/mach/hwregs/asm/pinmux_defs_asm.h (renamed from include/asm-cris/arch-v32/mach-fs/hwregs/asm/pinmux_defs_asm.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/mach-fs/mach/hwregs/asm/reg_map_asm.h (renamed from include/asm-cris/arch-v32/mach-fs/hwregs/asm/reg_map_asm.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/mach-fs/mach/hwregs/asm/timer_defs_asm.h (renamed from include/asm-cris/arch-v32/mach-fs/hwregs/asm/timer_defs_asm.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/mach-fs/mach/hwregs/bif_core_defs.h (renamed from include/asm-cris/arch-v32/mach-fs/hwregs/bif_core_defs.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/mach-fs/mach/hwregs/bif_dma_defs.h (renamed from include/asm-cris/arch-v32/mach-fs/hwregs/bif_dma_defs.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/mach-fs/mach/hwregs/bif_slave_defs.h (renamed from include/asm-cris/arch-v32/mach-fs/hwregs/bif_slave_defs.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/mach-fs/mach/hwregs/config_defs.h (renamed from include/asm-cris/arch-v32/mach-fs/hwregs/config_defs.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/mach-fs/mach/hwregs/gio_defs.h (renamed from include/asm-cris/arch-v32/mach-fs/hwregs/gio_defs.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/mach-fs/mach/hwregs/intr_vect.h (renamed from include/asm-cris/arch-v32/mach-fs/hwregs/intr_vect.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/mach-fs/mach/hwregs/intr_vect_defs.h (renamed from include/asm-cris/arch-v32/mach-fs/hwregs/intr_vect_defs.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/mach-fs/mach/hwregs/marb_bp_defs.h (renamed from include/asm-cris/arch-v32/mach-fs/hwregs/marb_bp_defs.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/mach-fs/mach/hwregs/marb_defs.h (renamed from include/asm-cris/arch-v32/mach-fs/hwregs/marb_defs.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/mach-fs/mach/hwregs/pinmux_defs.h (renamed from include/asm-cris/arch-v32/mach-fs/hwregs/pinmux_defs.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/mach-fs/mach/hwregs/reg_map.h (renamed from include/asm-cris/arch-v32/mach-fs/hwregs/reg_map.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/mach-fs/mach/hwregs/strmux_defs.h (renamed from include/asm-cris/arch-v32/mach-fs/hwregs/strmux_defs.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/mach-fs/mach/hwregs/timer_defs.h (renamed from include/asm-cris/arch-v32/mach-fs/hwregs/timer_defs.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/mach-fs/mach/pinmux.h (renamed from include/asm-cris/arch-v32/mach-fs/pinmux.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/mach-fs/mach/startup.inc (renamed from include/asm-cris/arch-v32/mach-fs/startup.inc) | 0 | ||||
| -rw-r--r-- | arch/cris/include/asm/Kbuild (renamed from include/asm-cris/Kbuild) | 0 | ||||
| -rw-r--r-- | arch/cris/include/asm/atomic.h (renamed from include/asm-cris/atomic.h) | 2 | ||||
| -rw-r--r-- | arch/cris/include/asm/auxvec.h (renamed from include/asm-cris/auxvec.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/asm/axisflashmap.h (renamed from include/asm-cris/axisflashmap.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/asm/bitops.h (renamed from include/asm-cris/bitops.h) | 2 | ||||
| -rw-r--r-- | arch/cris/include/asm/bug.h (renamed from include/asm-cris/bug.h) | 2 | ||||
| -rw-r--r-- | arch/cris/include/asm/bugs.h (renamed from include/asm-cris/bugs.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/asm/byteorder.h (renamed from include/asm-cris/byteorder.h) | 2 | ||||
| -rw-r--r-- | arch/cris/include/asm/cache.h (renamed from include/asm-cris/cache.h) | 2 | ||||
| -rw-r--r-- | arch/cris/include/asm/cacheflush.h (renamed from include/asm-cris/cacheflush.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/asm/checksum.h (renamed from include/asm-cris/checksum.h) | 2 | ||||
| -rw-r--r-- | arch/cris/include/asm/cputime.h (renamed from include/asm-cris/cputime.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/asm/current.h (renamed from include/asm-cris/current.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/asm/delay.h (renamed from include/asm-cris/delay.h) | 2 | ||||
| -rw-r--r-- | arch/cris/include/asm/device.h (renamed from include/asm-cris/device.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/asm/div64.h (renamed from include/asm-cris/div64.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/asm/dma-mapping.h (renamed from include/asm-cris/dma-mapping.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/asm/dma.h (renamed from include/asm-cris/dma.h) | 2 | ||||
| -rw-r--r-- | arch/cris/include/asm/elf.h (renamed from include/asm-cris/elf.h) | 2 | ||||
| -rw-r--r-- | arch/cris/include/asm/emergency-restart.h (renamed from include/asm-cris/emergency-restart.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/asm/errno.h (renamed from include/asm-cris/errno.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/asm/eshlibld.h (renamed from include/asm-cris/eshlibld.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/asm/ethernet.h (renamed from include/asm-cris/ethernet.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/asm/etraxgpio.h (renamed from include/asm-cris/etraxgpio.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/asm/etraxi2c.h (renamed from include/asm-cris/etraxi2c.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/asm/fasttimer.h (renamed from include/asm-cris/fasttimer.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/asm/fb.h (renamed from include/asm-cris/fb.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/asm/fcntl.h (renamed from include/asm-cris/fcntl.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/asm/futex.h (renamed from include/asm-cris/futex.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/asm/hardirq.h (renamed from include/asm-cris/hardirq.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/asm/hw_irq.h (renamed from include/asm-cris/hw_irq.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/asm/io.h (renamed from include/asm-cris/io.h) | 2 | ||||
| -rw-r--r-- | arch/cris/include/asm/ioctl.h (renamed from include/asm-cris/ioctl.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/asm/ioctls.h (renamed from include/asm-cris/ioctls.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/asm/ipcbuf.h (renamed from include/asm-cris/ipcbuf.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/asm/irq.h (renamed from include/asm-cris/irq.h) | 2 | ||||
| -rw-r--r-- | arch/cris/include/asm/irq_regs.h (renamed from include/asm-cris/irq_regs.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/asm/kdebug.h (renamed from include/asm-cris/kdebug.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/asm/kmap_types.h (renamed from include/asm-cris/kmap_types.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/asm/linkage.h (renamed from include/asm-cris/linkage.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/asm/local.h (renamed from include/asm-cris/local.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/asm/mman.h (renamed from include/asm-cris/mman.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/asm/mmu.h (renamed from include/asm-cris/mmu.h) | 2 | ||||
| -rw-r--r-- | arch/cris/include/asm/mmu_context.h (renamed from include/asm-cris/mmu_context.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/asm/module.h (renamed from include/asm-cris/module.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/asm/msgbuf.h (renamed from include/asm-cris/msgbuf.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/asm/mutex.h (renamed from include/asm-cris/mutex.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/asm/page.h (renamed from include/asm-cris/page.h) | 2 | ||||
| -rw-r--r-- | arch/cris/include/asm/param.h (renamed from include/asm-cris/param.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/asm/pci.h (renamed from include/asm-cris/pci.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/asm/percpu.h (renamed from include/asm-cris/percpu.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/asm/pgalloc.h (renamed from include/asm-cris/pgalloc.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/asm/pgtable.h (renamed from include/asm-cris/pgtable.h) | 2 | ||||
| -rw-r--r-- | arch/cris/include/asm/poll.h (renamed from include/asm-cris/poll.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/asm/posix_types.h (renamed from include/asm-cris/posix_types.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/asm/processor.h (renamed from include/asm-cris/processor.h) | 2 | ||||
| -rw-r--r-- | arch/cris/include/asm/ptrace.h (renamed from include/asm-cris/ptrace.h) | 2 | ||||
| -rw-r--r-- | arch/cris/include/asm/resource.h (renamed from include/asm-cris/resource.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/asm/rs485.h (renamed from include/asm-cris/rs485.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/asm/rtc.h (renamed from include/asm-cris/rtc.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/asm/scatterlist.h (renamed from include/asm-cris/scatterlist.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/asm/sections.h (renamed from include/asm-cris/sections.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/asm/segment.h (renamed from include/asm-cris/segment.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/asm/sembuf.h (renamed from include/asm-cris/sembuf.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/asm/setup.h (renamed from include/asm-cris/setup.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/asm/shmbuf.h (renamed from include/asm-cris/shmbuf.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/asm/shmparam.h (renamed from include/asm-cris/shmparam.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/asm/sigcontext.h (renamed from include/asm-cris/sigcontext.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/asm/siginfo.h (renamed from include/asm-cris/siginfo.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/asm/signal.h (renamed from include/asm-cris/signal.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/asm/smp.h (renamed from include/asm-cris/smp.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/asm/socket.h (renamed from include/asm-cris/socket.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/asm/sockios.h (renamed from include/asm-cris/sockios.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/asm/spinlock.h | 1 | ||||
| -rw-r--r-- | arch/cris/include/asm/stat.h (renamed from include/asm-cris/stat.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/asm/statfs.h (renamed from include/asm-cris/statfs.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/asm/string.h (renamed from include/asm-cris/string.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/asm/sync_serial.h (renamed from include/asm-cris/sync_serial.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/asm/system.h (renamed from include/asm-cris/system.h) | 2 | ||||
| -rw-r--r-- | arch/cris/include/asm/termbits.h (renamed from include/asm-cris/termbits.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/asm/termios.h (renamed from include/asm-cris/termios.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/asm/thread_info.h (renamed from include/asm-cris/thread_info.h) | 2 | ||||
| -rw-r--r-- | arch/cris/include/asm/timex.h (renamed from include/asm-cris/timex.h) | 2 | ||||
| -rw-r--r-- | arch/cris/include/asm/tlb.h (renamed from include/asm-cris/tlb.h) | 2 | ||||
| -rw-r--r-- | arch/cris/include/asm/tlbflush.h (renamed from include/asm-cris/tlbflush.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/asm/topology.h (renamed from include/asm-cris/topology.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/asm/types.h (renamed from include/asm-cris/types.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/asm/uaccess.h (renamed from include/asm-cris/uaccess.h) | 2 | ||||
| -rw-r--r-- | arch/cris/include/asm/ucontext.h (renamed from include/asm-cris/ucontext.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/asm/unaligned.h (renamed from include/asm-cris/unaligned.h) | 0 | ||||
| -rw-r--r-- | arch/cris/include/asm/unistd.h (renamed from include/asm-cris/unistd.h) | 2 | ||||
| -rw-r--r-- | arch/cris/include/asm/user.h (renamed from include/asm-cris/user.h) | 2 | ||||
| -rw-r--r-- | arch/cris/mm/ioremap.c | 2 | ||||
| -rw-r--r-- | drivers/net/cris/eth_v10.c | 4 | ||||
| -rw-r--r-- | drivers/serial/crisv10.c | 4 | ||||
| -rw-r--r-- | drivers/serial/crisv10.h | 2 | ||||
| -rw-r--r-- | include/asm-cris/arch-v32/arbiter.h | 30 | ||||
| -rw-r--r-- | include/asm-cris/arch-v32/hwregs/asm/pinmux_defs_asm.h | 632 | ||||
| -rw-r--r-- | include/asm-cris/arch-v32/hwregs/asm/reg_map_asm.h | 96 | ||||
| -rw-r--r-- | include/asm-cris/arch-v32/hwregs/gio_defs.h | 295 | ||||
| -rw-r--r-- | include/asm-cris/arch-v32/hwregs/intr_vect.h | 39 | ||||
| -rw-r--r-- | include/asm-cris/arch-v32/hwregs/pinmux_defs.h | 357 | ||||
| -rw-r--r-- | include/asm-cris/arch-v32/hwregs/strmux_defs.h | 127 | ||||
| -rw-r--r-- | include/asm-cris/arch-v32/pinmux.h | 40 | ||||
| -rw-r--r-- | include/asm-cris/spinlock.h | 1 |
365 files changed, 122 insertions, 1744 deletions
diff --git a/arch/cris/Makefile b/arch/cris/Makefile index c6f5f5a2ffdf..22825a7bbe57 100644 --- a/arch/cris/Makefile +++ b/arch/cris/Makefile @@ -23,12 +23,16 @@ mach-$(CONFIG_ETRAXFS) := fs ifneq ($(arch-y),) SARCH := arch-$(arch-y) +inc := -Iarch/cris/include/arch-$(arch-y) -Iarch/cris/include/arch-$(arch-y)/arch else SARCH := +inc := endif ifneq ($(mach-y),) MACH := mach-$(mach-y) +inc += -Iarch/cris/include/$(SARCH)/$(MACH)/ +inc += -Iarch/cris/include/$(SARCH)/$(MACH)/mach else MACH := endif @@ -39,9 +43,9 @@ OBJCOPYFLAGS := -O binary -R .note -R .comment -S CPPFLAGS_vmlinux.lds = -DDRAM_VIRTUAL_BASE=0x$(CONFIG_ETRAX_DRAM_VIRTUAL_BASE) -KBUILD_AFLAGS += -mlinux -march=$(arch-y) -Iinclude/asm/arch/mach -Iinclude/asm/arch - -KBUILD_CFLAGS += -mlinux -march=$(arch-y) -pipe -Iinclude/asm/arch/mach -Iinclude/asm/arch +KBUILD_AFLAGS += -mlinux -march=$(arch-y) $(inc) +KBUILD_CFLAGS += -mlinux -march=$(arch-y) -pipe $(inc) +KBUILD_CPPFLAGS += $(inc) ifdef CONFIG_FRAME_POINTER KBUILD_CFLAGS := $(subst -fomit-frame-pointer,,$(KBUILD_CFLAGS)) -g @@ -73,7 +77,7 @@ all: zImage zImage Image: vmlinux $(Q)$(MAKE) $(build)=$(boot) MACHINE=$(MACHINE) $(boot)/$@ -archprepare: $(SRC_ARCH)/.links $(srctree)/include/asm-$(ARCH)/.arch FORCE +archprepare: $(SRC_ARCH)/.links FORCE # Create some links to make all tools happy $(SRC_ARCH)/.links: @@ -95,17 +99,6 @@ endif @ln -sfn ../$(SARCH)/kernel/asm-offsets.c $(SRC_ARCH)/kernel/asm-offsets.c @touch $@ -# Create link to sub arch includes -$(srctree)/include/asm-$(ARCH)/.arch: $(wildcard include/config/arch/*.h) - @echo ' SYMLINK include/asm-$(ARCH)/arch -> include/asm-$(ARCH)/$(SARCH)' - @rm -f $(srctree)/include/asm-$(ARCH)/arch/mach - @rm -f $(srctree)/include/asm-$(ARCH)/arch - @ln -sf $(SARCH) $(srctree)/include/asm-$(ARCH)/arch -ifdef CONFIG_ETRAX_ARCH_V32 - @ln -sf $(MACH) $(srctree)/include/asm-$(ARCH)/arch/mach -endif - @touch $@ - archclean: $(Q)if [ -e arch/$(ARCH)/boot ]; then \ $(MAKE) $(clean)=arch/$(ARCH)/boot; \ @@ -116,8 +109,7 @@ CLEAN_FILES += \ $(MACHINE)/boot/compressed/decompress.bin \ $(MACHINE)/boot/compressed/piggy.gz \ $(MACHINE)/boot/rescue/rescue.bin \ - $(SRC_ARCH)/.links \ - $(srctree)/include/asm-$(ARCH)/.arch + $(SRC_ARCH)/.links MRPROPER_FILES += \ $(SRC_ARCH)/drivers \ diff --git a/arch/cris/arch-v10/boot/.gitignore b/arch/cris/arch-v10/boot/.gitignore new file mode 100644 index 000000000000..171a0853caf8 --- /dev/null +++ b/arch/cris/arch-v10/boot/.gitignore @@ -0,0 +1,2 @@ +Image +zImage diff --git a/arch/cris/arch-v10/boot/compressed/head.S b/arch/cris/arch-v10/boot/compressed/head.S index 981fbae84959..0bb4dcc29254 100644 --- a/arch/cris/arch-v10/boot/compressed/head.S +++ b/arch/cris/arch-v10/boot/compressed/head.S @@ -9,7 +9,7 @@ */ #define ASSEMBLER_MACROS_ONLY -#include <asm/arch/sv_addr_ag.h> +#include <arch/sv_addr_ag.h> #define RAM_INIT_MAGIC 0x56902387 #define COMMAND_LINE_MAGIC 0x87109563 diff --git a/arch/cris/arch-v10/boot/compressed/misc.c b/arch/cris/arch-v10/boot/compressed/misc.c index d933c89889db..a4db1507d3b1 100644 --- a/arch/cris/arch-v10/boot/compressed/misc.c +++ b/arch/cris/arch-v10/boot/compressed/misc.c @@ -20,7 +20,7 @@ #include <linux/types.h> -#include <asm/arch/svinto.h> +#include <arch/svinto.h> /* * gzip declarations diff --git a/arch/cris/arch-v10/boot/rescue/head.S b/arch/cris/arch-v10/boot/rescue/head.S index 6ba7be8ac4a0..fb503d1eeea4 100644 --- a/arch/cris/arch-v10/boot/rescue/head.S +++ b/arch/cris/arch-v10/boot/rescue/head.S @@ -65,7 +65,7 @@ #ifdef CONFIG_ETRAX_AXISFLASHMAP #define ASSEMBLER_MACROS_ONLY -#include <asm/arch/sv_addr_ag.h> +#include <arch/sv_addr_ag.h> ;; The partitiontable is looked for at the first sector after the boot ;; sector. Sector size is 65536 bytes in all flashes we use. diff --git a/arch/cris/arch-v10/boot/rescue/kimagerescue.S b/arch/cris/arch-v10/boot/rescue/kimagerescue.S index 55eeff8bb08e..6f7b3e61260b 100644 --- a/arch/cris/arch-v10/boot/rescue/kimagerescue.S +++ b/arch/cris/arch-v10/boot/rescue/kimagerescue.S @@ -6,7 +6,7 @@ */ #define ASSEMBLER_MACROS_ONLY -#include <asm/arch/sv_addr_ag.h> +#include <arch/sv_addr_ag.h> #define CODE_START 0x40004000 #define CODE_LENGTH 784 diff --git a/arch/cris/arch-v10/boot/rescue/testrescue.S b/arch/cris/arch-v10/boot/rescue/testrescue.S index 2d937f9afe23..fc7ec674eca5 100644 --- a/arch/cris/arch-v10/boot/rescue/testrescue.S +++ b/arch/cris/arch-v10/boot/rescue/testrescue.S @@ -6,7 +6,7 @@ */ #define ASSEMBLER_MACROS_ONLY -#include <asm/arch/sv_addr_ag.h> +#include <arch/sv_addr_ag.h> .text diff --git a/arch/cris/arch-v10/drivers/axisflashmap.c b/arch/cris/arch-v10/drivers/axisflashmap.c index b3bdda93ffef..b2079703af7e 100644 --- a/arch/cris/arch-v10/drivers/axisflashmap.c +++ b/arch/cris/arch-v10/drivers/axisflashmap.c @@ -26,7 +26,7 @@ #include <asm/axisflashmap.h> #include <asm/mmu.h> -#include <asm/arch/sv_addr_ag.h> +#include <arch/sv_addr_ag.h> #ifdef CONFIG_CRIS_LOW_MAP #define FLASH_UNCACHED_ADDR KSEG_8 diff --git a/arch/cris/arch-v10/drivers/ds1302.c b/arch/cris/arch-v10/drivers/ds1302.c index 3bdfaf43390c..77630df94343 100644 --- a/arch/cris/arch-v10/drivers/ds1302.c +++ b/arch/cris/arch-v10/drivers/ds1302.c @@ -24,10 +24,10 @@ #include <asm/uaccess.h> #include <asm/system.h> -#include <asm/arch/svinto.h> +#include <arch/svinto.h> #include <asm/io.h> #include <asm/rtc.h> -#include <asm/arch/io_interface_mux.h> +#include <arch/io_interface_mux.h> #include "i2c.h" diff --git a/arch/cris/arch-v10/drivers/gpio.c b/arch/cris/arch-v10/drivers/gpio.c index 86048e697eb5..4b0f65fac8e8 100644 --- a/arch/cris/arch-v10/drivers/gpio.c +++ b/arch/cris/arch-v10/drivers/gpio.c @@ -23,11 +23,11 @@ #include <linux/interrupt.h> #include <asm/etraxgpio.h> -#include <asm/arch/svinto.h> +#include <arch/svinto.h> #include <asm/io.h> #include <asm/system.h> #include <asm/irq.h> -#include <asm/arch/io_interface_mux.h> +#include <arch/io_interface_mux.h> #define GPIO_MAJOR 120 /* experimental MAJOR number */ diff --git a/arch/cris/arch-v10/drivers/i2c.c b/arch/cris/arch-v10/drivers/i2c.c index 2797e67ce4f4..7f656ae0b21d 100644 --- a/arch/cris/arch-v10/drivers/i2c.c +++ b/arch/cris/arch-v10/drivers/i2c.c @@ -25,10 +25,10 @@ #include <asm/etraxi2c.h> #include <asm/system.h> -#include <asm/arch/svinto.h> +#include <arch/svinto.h> #include <asm/io.h> #include <asm/delay.h> -#include <asm/arch/io_interface_mux.h> +#include <arch/io_interface_mux.h> #include "i2c.h" diff --git a/arch/cris/arch-v10/drivers/sync_serial.c b/arch/cris/arch-v10/drivers/sync_serial.c index 91fea623c7c9..6cc1a0319a5d 100644 --- a/arch/cris/arch-v10/drivers/sync_serial.c +++ b/arch/cris/arch-v10/drivers/sync_serial.c @@ -26,11 +26,11 @@ #include <asm/irq.h> #include <asm/dma.h> #include <asm/io.h> -#include <asm/arch/svinto.h> +#include <arch/svinto.h> #include <asm/uaccess.h> #include <asm/system.h> #include <asm/sync_serial.h> -#include <asm/arch/io_interface_mux.h> +#include <arch/io_interface_mux.h> /* The receiver is a bit tricky beacuse of the continuous stream of data.*/ /* */ diff --git a/arch/cris/arch-v10/kernel/crisksyms.c b/arch/cris/arch-v10/kernel/crisksyms.c index e6b80135502f..1ca6fc283232 100644 --- a/arch/cris/arch-v10/kernel/crisksyms.c +++ b/arch/cris/arch-v10/kernel/crisksyms.c @@ -1,6 +1,6 @@ #include <linux/module.h> #include <asm/io.h> -#include <asm/arch/svinto.h> +#include <arch/svinto.h> /* Export shadow registers for the CPU I/O pins */ EXPORT_SYMBOL(genconfig_shadow); diff --git a/arch/cris/arch-v10/kernel/debugport.c b/arch/cris/arch-v10/kernel/debugport.c index 3dc6e91ba39e..99851ba8e5fa 100644 --- a/arch/cris/arch-v10/kernel/debugport.c +++ b/arch/cris/arch-v10/kernel/debugport.c @@ -19,7 +19,7 @@ #include <linux/delay.h> #include <linux/tty.h> #include <asm/system.h> -#include <asm/arch/svinto.h> +#include <arch/svinto.h> #include <asm/io.h> /* Get SIMCOUT. */ extern void reset_watchdog(void); diff --git a/arch/cris/arch-v10/kernel/dma.c b/arch/cris/arch-v10/kernel/dma.c index eb1fa0d2b49f..929e68666299 100644 --- a/arch/cris/arch-v10/kernel/dma.c +++ b/arch/cris/arch-v10/kernel/dma.c @@ -7,7 +7,7 @@ #include <linux/errno.h> #include <asm/dma.h> -#include <asm/arch/svinto.h> +#include <arch/svinto.h> /* Macro to access ETRAX 100 registers */ #define SETS(var, reg, field, val) var = (var & ~IO_MASK_(reg##_, field##_)) | \ diff --git a/arch/cris/arch-v10/kernel/entry.S b/arch/cris/arch-v10/kernel/entry.S index 3a65f322ae07..ed171d389e65 100644 --- a/arch/cris/arch-v10/kernel/entry.S +++ b/arch/cris/arch-v10/kernel/entry.S @@ -23,7 +23,7 @@ #include <linux/linkage.h> #include <linux/sys.h> #include <asm/unistd.h> -#include <asm/arch/sv_addr_ag.h> +#include <arch/sv_addr_ag.h> #include <asm/errno.h> #include <asm/thread_info.h> #include <asm/asm-offsets.h> diff --git a/arch/cris/arch-v10/kernel/fasttimer.c b/arch/cris/arch-v10/kernel/fasttimer.c index 31ff35cff02c..5ff08a8695e9 100644 --- a/arch/cris/arch-v10/kernel/fasttimer.c +++ b/arch/cris/arch-v10/kernel/fasttimer.c @@ -24,7 +24,7 @@ #include <asm/rtc.h> -#include <asm/arch/svinto.h> +#include <arch/svinto.h> #include <asm/fasttimer.h> #include <linux/proc_fs.h> diff --git a/arch/cris/arch-v10/kernel/head.S b/arch/cris/arch-v10/kernel/head.S index 96344afc4ebc..fc4577102933 100644 --- a/arch/cris/arch-v10/kernel/head.S +++ b/arch/cris/arch-v10/kernel/head.S @@ -10,7 +10,7 @@ #define ASSEMBLER_MACROS_ONLY /* The IO_* macros use the ## token concatenation operator, so -traditional must not be used when assembling this file. */ -#include <asm/arch/sv_addr_ag.h> +#include <arch/sv_addr_ag.h> #define CRAMFS_MAGIC 0x28cd3d45 #define RAM_INIT_MAGIC 0x56902387 diff --git a/arch/cris/arch-v10/kernel/io_interface_mux.c b/arch/cris/arch-v10/kernel/io_interface_mux.c index add98e0941b5..29f97e962795 100644 --- a/arch/cris/arch-v10/kernel/io_interface_mux.c +++ b/arch/cris/arch-v10/kernel/io_interface_mux.c @@ -11,9 +11,9 @@ #include <linux/module.h> #include <linux/init.h> -#include <asm/arch/svinto.h> +#include <arch/svinto.h> #include <asm/io.h> -#include <asm/arch/io_interface_mux.h> +#include <arch/io_interface_mux.h> #define DBG(s) diff --git a/arch/cris/arch-v10/kernel/kgdb.c b/arch/cris/arch-v10/kernel/kgdb.c index 6fea45f2e40c..b9f9c8ce2169 100644 --- a/arch/cris/arch-v10/kernel/kgdb.c +++ b/arch/cris/arch-v10/kernel/kgdb.c @@ -176,7 +176,7 @@ #include <asm/setup.h> #include <asm/ptrace.h> -#include <asm/arch/svinto.h> +#include <arch/svinto.h> #include <asm/irq.h> static int kgdb_started = 0; diff --git a/arch/cris/arch-v10/kernel/process.c b/arch/cris/arch-v10/kernel/process.c index 53117f07cc1a..bd9b3ff63f6c 100644 --- a/arch/cris/arch-v10/kernel/process.c +++ b/arch/cris/arch-v10/kernel/process.c @@ -14,7 +14,7 @@ #include <linux/err.h> #include <linux/fs.h> #include <linux/slab.h> -#include <asm/arch/svinto.h> +#include <arch/svinto.h> #include <linux/init.h> #ifdef CONFIG_ETRAX_GPIO diff --git a/arch/cris/arch-v10/kernel/time.c b/arch/cris/arch-v10/kernel/time.c index 525483f0ddf8..c685ba4c3387 100644 --- a/arch/cris/arch-v10/kernel/time.c +++ b/arch/cris/arch-v10/kernel/time.c @@ -14,7 +14,7 @@ #include <linux/sched.h> #include <linux/init.h> #include <linux/mm.h> -#include <asm/arch/svinto.h> +#include <arch/svinto.h> #include <asm/types.h> #include <asm/signal.h> #include <asm/io.h> diff --git a/arch/cris/arch-v10/kernel/traps.c b/arch/cris/arch-v10/kernel/traps.c index 9eada5d8893b..8bebb96bbca1 100644 --- a/arch/cris/arch-v10/kernel/traps.c +++ b/arch/cris/arch-v10/kernel/traps.c @@ -10,7 +10,7 @@ #include <linux/ptrace.h> #include <asm/uaccess.h> -#include <asm/arch/sv_addr_ag.h> +#include <arch/sv_addr_ag.h> void show_registers(struct pt_regs *regs) diff --git a/arch/cris/arch-v10/mm/fault.c b/arch/cris/arch-v10/mm/fault.c index 65504fd80928..087a2096f221 100644 --- a/arch/cris/arch-v10/mm/fault.c +++ b/arch/cris/arch-v10/mm/fault.c @@ -13,7 +13,7 @@ #include <linux/mm.h> #include <asm/uaccess.h> #include <asm/pgtable.h> -#include <asm/arch/svinto.h> +#include <arch/svinto.h> #include <asm/mmu_context.h> /* debug of low-level TLB reload */ diff --git a/arch/cris/arch-v10/mm/init.c b/arch/cris/arch-v10/mm/init.c index 742fd1974c2e..baa746ce4e74 100644 --- a/arch/cris/arch-v10/mm/init.c +++ b/arch/cris/arch-v10/mm/init.c @@ -12,7 +12,7 @@ #include <asm/mmu.h> #include <asm/io.h> #include <asm/mmu_context.h> -#include <asm/arch/svinto.h> +#include <arch/svinto.h> extern void tlb_init(void); diff --git a/arch/cris/arch-v10/mm/tlb.c b/arch/cris/arch-v10/mm/tlb.c index 6baf5bd209e7..4a496e4ffacc 100644 --- a/arch/cris/arch-v10/mm/tlb.c +++ b/arch/cris/arch-v10/mm/tlb.c @@ -12,7 +12,7 @@ #include <asm/tlb.h> #include <asm/mmu_context.h> -#include <asm/arch/svinto.h> +#include <arch/svinto.h> #define D(x) diff --git a/arch/cris/arch-v32/boot/compressed/head.S b/arch/cris/arch-v32/boot/compressed/head.S index f86208caf32d..ea3012993b07 100644 --- a/arch/cris/arch-v32/boot/compressed/head.S +++ b/arch/cris/arch-v32/boot/compressed/head.S @@ -7,7 +7,7 @@ #define ASSEMBLER_MACROS_ONLY #include <hwregs/asm/reg_map_asm.h> -#include <asm/arch/mach/startup.inc> +#include <mach/startup.inc> #define RAM_INIT_MAGIC 0x56902387 #define COMMAND_LINE_MAGIC 0x87109563 @@ -17,7 +17,7 @@ .globl input_data .text -start: +_start: di ;; Start clocks for used blocks. diff --git a/arch/cris/arch-v32/drivers/mach-a3/gpio.c b/arch/cris/arch-v32/drivers/mach-a3/gpio.c index ef98608e5067..7a87bc0ae2e8 100644 --- a/arch/cris/arch-v32/drivers/mach-a3/gpio.c +++ b/arch/cris/arch-v32/drivers/mach-a3/gpio.c @@ -33,7 +33,7 @@ #include <asm/io.h> #include <asm/system.h> #include <asm/irq.h> -#include <asm/arch/mach/pinmux.h> +#include <mach/pinmux.h> #ifdef CONFIG_ETRAX_VIRTUAL_GPIO #include "../i2c.h" diff --git a/arch/cris/arch-v32/drivers/mach-a3/nandflash.c b/arch/cris/arch-v32/drivers/mach-a3/nandflash.c index 01ed0be2d0d1..25d6f2b3a721 100644 --- a/arch/cris/arch-v32/drivers/mach-a3/nandflash.c +++ b/arch/cris/arch-v32/drivers/mach-a3/nandflash.c @@ -18,7 +18,7 @@ #include <linux/mtd/mtd.h> #include <linux/mtd/nand.h> #include <linux/mtd/partitions.h> -#include <asm/arch/memmap.h> +#include <arch/memmap.h> #include <hwregs/reg_map.h> #include <hwregs/reg_rdwr.h> #include <hwregs/pio_defs.h> diff --git a/arch/cris/arch-v32/drivers/mach-fs/nandflash.c b/arch/cris/arch-v32/drivers/mach-fs/nandflash.c index aa01b134458a..c5a0f54763cc 100644 --- a/arch/cris/arch-v32/drivers/mach-fs/nandflash.c +++ b/arch/cris/arch-v32/drivers/mach-fs/nandflash.c @@ -18,7 +18,7 @@ #include <linux/mtd/mtd.h> #include <linux/mtd/nand.h> #include <linux/mtd/partitions.h> -#include <asm/arch/memmap.h> +#include <arch/memmap.h> #include <hwregs/reg_map.h> #include <hwregs/reg_rdwr.h> #include <hwregs/gio_defs.h> diff --git a/arch/cris/arch-v32/drivers/pci/bios.c b/arch/cris/arch-v32/drivers/pci/bios.c index 5b79a7a772d4..77ee319193c3 100644 --- a/arch/cris/arch-v32/drivers/pci/bios.c +++ b/arch/cris/arch-v32/drivers/pci/bios.c @@ -1,6 +1,6 @@ #include <linux/pci.h> #include <linux/kernel.h> -#include <asm/arch/hwregs/intr_vect.h> +#include <arch/hwregs/intr_vect.h> void __devinit pcibios_fixup_bus(struct pci_bus *b) { diff --git a/arch/cris/arch-v32/kernel/cache.c b/arch/cris/arch-v32/kernel/cache.c index 80da7b88a72b..f38433b1f861 100644 --- a/arch/cris/arch-v32/kernel/cache.c +++ b/arch/cris/arch-v32/kernel/cache.c @@ -1,7 +1,7 @@ #include <linux/module.h> #include <asm/io.h> -#include <asm/arch/cache.h> -#include <asm/arch/hwregs/dma.h> +#include <arch/cache.h> +#include <arch/hwregs/dma.h> /* This file is used to workaround a cache bug, Guinness TR 106. */ diff --git a/arch/cris/arch-v32/kernel/crisksyms.c b/arch/cris/arch-v32/kernel/crisksyms.c index 77d02c15a7fc..64933e2c0f5b 100644 --- a/arch/cris/arch-v32/kernel/crisksyms.c +++ b/arch/cris/arch-v32/kernel/crisksyms.c @@ -1,9 +1,9 @@ #include <linux/module.h> #include <linux/irq.h> -#include <asm/arch/dma.h> -#include <asm/arch/intmem.h> -#include <asm/arch/mach/pinmux.h> -#include <asm/arch/io.h> +#include <arch/dma.h> +#include <arch/intmem.h> +#include <mach/pinmux.h> +#include <arch/io.h> /* Functions for allocating DMA channels */ EXPORT_SYMBOL(crisv32_request_dma); diff --git a/arch/cris/arch-v32/kernel/debugport.c b/arch/cris/arch-v32/kernel/debugport.c index 15af4c293157..794b364d9f7d 100644 --- a/arch/cris/arch-v32/kernel/debugport.c +++ b/arch/cris/arch-v32/kernel/debugport.c @@ -9,7 +9,7 @@ #include <hwregs/reg_map.h> #include <hwregs/ser_defs.h> #include <hwregs/dma_defs.h> -#include <asm/arch/mach/pinmux.h> +#include <mach/pinmux.h> struct dbg_port { diff --git a/arch/cris/arch-v32/kernel/entry.S b/arch/cris/arch-v32/kernel/entry.S index eebbaba45430..7f6f93e6b70e 100644 --- a/arch/cris/arch-v32/kernel/entry.S +++ b/arch/cris/arch-v32/kernel/entry.S @@ -24,8 +24,8 @@ #include <asm/thread_info.h> #include <asm/asm-offsets.h> -#include <asm/arch/hwregs/asm/reg_map_asm.h> -#include <asm/arch/hwregs/asm/intr_vect_defs_asm.h> +#include <hwregs/asm/reg_map_asm.h> +#include <hwregs/asm/intr_vect_defs_asm.h> ;; Exported functions. .globl system_call diff --git a/arch/cris/arch-v32/kernel/head.S b/arch/cris/arch-v32/kernel/head.S index 2d66a7c320e1..f902d87fb5de 100644 --- a/arch/cris/arch-v32/kernel/head.S +++ b/arch/cris/arch-v32/kernel/head.S @@ -11,11 +11,11 @@ * -traditional must not be used when assembling this file. */ #include <hwregs/reg_rdwr.h> -#include <asm/arch/memmap.h> +#include <arch/memmap.h> #include <hwregs/intr_vect.h> #include <hwregs/asm/mmu_defs_asm.h> #include <hwregs/asm/reg_map_asm.h> -#include <asm/arch/mach/startup.inc> +#include <mach/startup.inc> #define CRAMFS_MAGIC 0x28cd3d45 #define JHEAD_MAGIC 0x1FF528A6 diff --git a/arch/cris/arch-v32/kernel/kgdb.c b/arch/cris/arch-v32/kernel/kgdb.c index 8bd5a5bc0dc7..c981fd663323 100644 --- a/arch/cris/arch-v32/kernel/kgdb.c +++ b/arch/cris/arch-v32/kernel/kgdb.c @@ -174,10 +174,10 @@ #include <asm/ptrace.h> #include <asm/irq.h> -#include <asm/arch/hwregs/reg_map.h> -#include <asm/arch/hwregs/reg_rdwr.h> -#include <asm/arch/hwregs/intr_vect_defs.h> -#include <asm/arch/hwregs/ser_defs.h> +#include <arch/hwregs/reg_map.h> +#include <arch/hwregs/reg_rdwr.h> +#include <arch/hwregs/intr_vect_defs.h> +#include <arch/hwregs/ser_defs.h> /* From entry.S. */ extern void gdb_handle_exception(void); diff --git a/arch/cris/arch-v32/kernel/kgdb_asm.S b/arch/cris/arch-v32/kernel/kgdb_asm.S index 3e7fa9ef8510..eba93e7e4aad 100644 --- a/arch/cris/arch-v32/kernel/kgdb_asm.S +++ b/arch/cris/arch-v32/kernel/kgdb_asm.S @@ -5,7 +5,7 @@ * port exceptions for kernel debugging purposes. */ -#include <asm/arch/hwregs/intr_vect.h> +#include <arch/hwregs/intr_vect.h> ;; Exported functions. .globl kgdb_handle_exception diff --git a/arch/cris/arch-v32/kernel/pinmux.c b/arch/cris/arch-v32/kernel/pinmux.c index a2b8aa37c1bf..6eb54ea1c976 100644 --- a/arch/cris/arch-v32/kernel/pinmux.c +++ b/arch/cris/arch-v32/kernel/pinmux.c @@ -11,10 +11,10 @@ #include <linux/kernel.h> #include <linux/string.h> #include <linux/spinlock.h> -#include <asm/arch/hwregs/reg_map.h> -#include <asm/arch/hwregs/reg_rdwr.h> -#include <asm/arch/pinmux.h> -#include <asm/arch/hwregs/pinmux_defs.h> +#include <arch/hwregs/reg_map.h> +#include <arch/hwregs/reg_rdwr.h> +#include <arch/pinmux.h> +#include <arch/hwregs/pinmux_defs.h> #undef DEBUG diff --git a/arch/cris/arch-v32/kernel/ptrace.c b/arch/cris/arch-v32/kernel/ptrace.c index e27f4670e88e..dd401473f5b5 100644 --- a/arch/cris/arch-v32/kernel/ptrace.c +++ b/arch/cris/arch-v32/kernel/ptrace.c @@ -17,7 +17,7 @@ #include <asm/pgtable.h> #include <asm/system.h> #include <asm/processor.h> -#include <asm/arch/hwregs/supp_reg.h> +#include <arch/hwregs/supp_reg.h> /* * Determines which bits in CCS the user has access to. diff --git a/arch/cris/arch-v32/kernel/signal.c b/arch/cris/arch-v32/kernel/signal.c index 58c1866804e3..da7d2be000ba 100644 --- a/arch/cris/arch-v32/kernel/signal.c +++ b/arch/cris/arch-v32/kernel/signal.c @@ -18,8 +18,8 @@ #include <asm/processor.h> #include <asm/ucontext.h> #include <asm/uaccess.h> -#include <asm/arch/ptrace.h> -#include <asm/arch/hwregs/cpu_vect.h> +#include <arch/ptrace.h> +#include <arch/hwregs/cpu_vect.h> extern unsigned long cris_signal_return_page; diff --git a/arch/cris/arch-v32/lib/nand_init.S b/arch/cris/arch-v32/lib/nand_init.S index e019816facd7..e705f5cce969 100644 --- a/arch/cris/arch-v32/lib/nand_init.S +++ b/arch/cris/arch-v32/lib/nand_init.S @@ -22,11 +22,11 @@ ## ##============================================================================= -#include <asm/arch/hwregs/asm/reg_map_asm.h> -#include <asm/arch/hwregs/asm/gio_defs_asm.h> -#include <asm/arch/hwregs/asm/pinmux_defs_asm.h> -#include <asm/arch/hwregs/asm/bif_core_defs_asm.h> -#include <asm/arch/hwregs/asm/config_defs_asm.h> +#include <arch/hwregs/asm/reg_map_asm.h> +#include <arch/hwregs/asm/gio_defs_asm.h> +#include <arch/hwregs/asm/pinmux_defs_asm.h> +#include <arch/hwregs/asm/bif_core_defs_asm.h> +#include <arch/hwregs/asm/config_defs_asm.h> ;; There are 8-bit NAND flashes and 16-bit NAND flashes. ;; We need to treat them slightly different. diff --git a/arch/cris/arch-v32/mach-a3/dma.c b/arch/cris/arch-v32/mach-a3/dma.c index 25f236ef0b81..f35e4f65f4ef 100644 --- a/arch/cris/arch-v32/mach-a3/dma.c +++ b/arch/cris/arch-v32/mach-a3/dma.c @@ -2,7 +2,7 @@ #include <linux/kernel.h> #include <linux/spinlock.h> -#include <asm/arch/mach/dma.h> +#include <mach/dma.h> #include <hwregs/reg_map.h> #include <hwregs/reg_rdwr.h> #include <hwregs/marb_defs.h> diff --git a/arch/cris/arch-v32/mach-a3/io.c b/arch/cris/arch-v32/mach-a3/io.c index 9eeaf3eca474..c22f67ecd9f3 100644 --- a/arch/cris/arch-v32/mach-a3/io.c +++ b/arch/cris/arch-v32/mach-a3/io.c @@ -12,7 +12,7 @@ #include <linux/kernel.h> #include <linux/module.h> #include <asm/io.h> -#include <asm/arch/mach/pinmux.h> +#include <mach/pinmux.h> #include <hwregs/gio_defs.h> struct crisv32_ioport crisv32_ioports[] = { diff --git a/arch/cris/arch-v32/mach-fs/cpufreq.c b/arch/cris/arch-v32/mach-fs/cpufreq.c index 58bd71e5bda9..d92cf70d1cbe 100644 --- a/arch/cris/arch-v32/mach-fs/cpufreq.c +++ b/arch/cris/arch-v32/mach-fs/cpufreq.c @@ -2,9 +2,9 @@ #include <linux/module.h> #include <linux/cpufreq.h> #include <hwregs/reg_map.h> -#include <asm/arch/hwregs/reg_rdwr.h> -#include <asm/arch/hwregs/config_defs.h> -#include <asm/arch/hwregs/bif_core_defs.h> +#include <arch/hwregs/reg_rdwr.h> +#include <arch/hwregs/config_defs.h> +#include <arch/hwregs/bif_core_defs.h> static int cris_sdram_freq_notifier(struct notifier_block *nb, unsigned long val, diff --git a/arch/cris/arch-v32/mach-fs/dma.c b/arch/cris/arch-v32/mach-fs/dma.c index a6acf4e6345c..2d970d7505c9 100644 --- a/arch/cris/arch-v32/mach-fs/dma.c +++ b/arch/cris/arch-v32/mach-fs/dma.c @@ -10,7 +10,7 @@ #include <hwregs/strmux_defs.h> #include <linux/errno.h> #include <asm/system.h> -#include <asm/arch/mach/arbiter.h> +#include <mach/arbiter.h> static char used_dma_channels[MAX_DMA_CHANNELS]; static const char *used_dma_channels_users[MAX_DMA_CHANNELS]; diff --git a/arch/cris/arch-v32/mach-fs/io.c b/arch/cris/arch-v32/mach-fs/io.c index a03a3ad3a188..cb6327b1f8f8 100644 --- a/arch/cris/arch-v32/mach-fs/io.c +++ b/arch/cris/arch-v32/mach-fs/io.c @@ -12,8 +12,8 @@ #include <linux/kernel.h> #include <linux/module.h> #include <asm/io.h> -#include <asm/arch/pinmux.h> -#include <asm/arch/hwregs/gio_defs.h> +#include <mach/pinmux.h> +#include <hwregs/gio_defs.h> #ifndef DEBUG #define DEBUG(x) diff --git a/arch/cris/arch-v32/mach-fs/vcs_hook.c b/arch/cris/arch-v32/mach-fs/vcs_hook.c index 593b10f07ef1..b11594ae0cb6 100644 --- a/arch/cris/arch-v32/mach-fs/vcs_hook.c +++ b/arch/cris/arch-v32/mach-fs/vcs_hook.c @@ -5,8 +5,8 @@ #include "vcs_hook.h" #include <stdarg.h> -#include <asm/arch-v32/hwregs/reg_map.h> -#include <asm/arch-v32/hwregs/intr_vect_defs.h> +#include <arch-v32/hwregs/reg_map.h> +#include <arch-v32/hwregs/intr_vect_defs.h> #define HOOK_TRIG_ADDR 0xb7000000 /* hook cvlog model reg address */ #define HOOK_MEM_BASE_ADDR 0xa0000000 /* csp4 (shared mem) base addr */ diff --git a/arch/cris/arch-v32/mm/init.c b/arch/cris/arch-v32/mm/init.c index 8a34b8b74293..caeb921a92ea 100644 --- a/arch/cris/arch-v32/mm/init.c +++ b/arch/cris/arch-v32/mm/init.c @@ -16,8 +16,8 @@ #include <asm/mmu.h> #include <asm/io.h> #include <asm/mmu_context.h> -#include <asm/arch/hwregs/asm/mmu_defs_asm.h> -#include <asm/arch/hwregs/supp_reg.h> +#include <arch/hwregs/asm/mmu_defs_asm.h> +#include <arch/hwregs/supp_reg.h> extern void tlb_init(void); diff --git a/arch/cris/arch-v32/mm/tlb.c b/arch/cris/arch-v32/mm/tlb.c index eda5ebcaea54..55ade36fe8a8 100644 --- a/arch/cris/arch-v32/mm/tlb.c +++ b/arch/cris/arch-v32/mm/tlb.c @@ -9,8 +9,8 @@ #include <asm/tlb.h> #include <asm/mmu_context.h> -#include <asm/arch/hwregs/asm/mmu_defs_asm.h> -#include <asm/arch/hwregs/supp_reg.h> +#include <arch/hwregs/asm/mmu_defs_asm.h> +#include <arch/hwregs/supp_reg.h> #define UPDATE_TLB_SEL_IDX(val) \ do { \ diff --git a/include/asm-cris/arch-v10/Kbuild b/arch/cris/include/arch-v10/arch/Kbuild index 7a192e1290b1..7a192e1290b1 100644 --- a/include/asm-cris/arch-v10/Kbuild +++ b/arch/cris/include/arch-v10/arch/Kbuild diff --git a/include/asm-cris/arch-v10/atomic.h b/arch/cris/include/arch-v10/arch/atomic.h index 6ef5e7d09024..6ef5e7d09024 100644 --- a/include/asm-cris/arch-v10/atomic.h +++ b/arch/cris/include/arch-v10/arch/atomic.h diff --git a/include/asm-cris/arch-v10/bitops.h b/arch/cris/include/arch-v10/arch/bitops.h index be85f6de25d3..be85f6de25d3 100644 --- a/include/asm-cris/arch-v10/bitops.h +++ b/arch/cris/include/arch-v10/arch/bitops.h diff --git a/include/asm-cris/arch-v10/bug.h b/arch/cris/include/arch-v10/arch/bug.h index 3485d6b34bb0..3485d6b34bb0 100644 --- a/include/asm-cris/arch-v10/bug.h +++ b/arch/cris/include/arch-v10/arch/bug.h diff --git a/include/asm-cris/arch-v10/byteorder.h b/arch/cris/include/arch-v10/arch/byteorder.h index 255b646b7fa8..255b646b7fa8 100644 --- a/include/asm-cris/arch-v10/byteorder.h +++ b/arch/cris/include/arch-v10/arch/byteorder.h diff --git a/include/asm-cris/arch-v10/cache.h b/arch/cris/include/arch-v10/arch/cache.h index aea27184d2d2..aea27184d2d2 100644 --- a/include/asm-cris/arch-v10/cache.h +++ b/arch/cris/include/arch-v10/arch/cache.h diff --git a/include/asm-cris/arch-v10/checksum.h b/arch/cris/include/arch-v10/arch/checksum.h index b8000c5d7fe1..b8000c5d7fe1 100644 --- a/include/asm-cris/arch-v10/checksum.h +++ b/arch/cris/include/arch-v10/arch/checksum.h diff --git a/include/asm-cris/arch-v10/delay.h b/arch/cris/include/arch-v10/arch/delay.h index 39481f6e0c30..39481f6e0c30 100644 --- a/include/asm-cris/arch-v10/delay.h +++ b/arch/cris/include/arch-v10/arch/delay.h diff --git a/include/asm-cris/arch-v10/dma.h b/arch/cris/include/arch-v10/arch/dma.h index ecb9dba6fa4f..ecb9dba6fa4f 100644 --- a/include/asm-cris/arch-v10/dma.h +++ b/arch/cris/include/arch-v10/arch/dma.h diff --git a/include/asm-cris/arch-v10/elf.h b/arch/cris/include/arch-v10/arch/elf.h index 1c38ee728b17..1c38ee728b17 100644 --- a/include/asm-cris/arch-v10/elf.h +++ b/arch/cris/include/arch-v10/arch/elf.h diff --git a/include/asm-cris/arch-v10/io.h b/arch/cris/include/arch-v10/arch/io.h index c08c24265299..f627ad0b8a3d 100644 --- a/include/asm-cris/arch-v10/io.h +++ b/arch/cris/include/arch-v10/arch/io.h @@ -1,7 +1,7 @@ #ifndef _ASM_ARCH_CRIS_IO_H #define _ASM_ARCH_CRIS_IO_H -#include <asm/arch/svinto.h> +#include <arch/svinto.h> /* Etrax shadow registers - which live in arch/cris/kernel/shadows.c */ diff --git a/include/asm-cris/arch-v10/io_interface_mux.h b/arch/cris/include/arch-v10/arch/io_interface_mux.h index d92500080883..d92500080883 100644 --- a/include/asm-cris/arch-v10/io_interface_mux.h +++ b/arch/cris/include/arch-v10/arch/io_interface_mux.h diff --git a/include/asm-cris/arch-v10/irq.h b/arch/cris/include/arch-v10/arch/irq.h index b1128a9984ae..6248004eca1c 100644 --- a/include/asm-cris/arch-v10/irq.h +++ b/arch/cris/include/arch-v10/arch/irq.h @@ -5,7 +5,7 @@ #ifndef _ASM_ARCH_IRQ_H #define _ASM_ARCH_IRQ_H -#include <asm/arch/sv_addr_ag.h> +#include <arch/sv_addr_ag.h> #define NR_IRQS 32 diff --git a/include/asm-cris/arch-v10/memmap.h b/arch/cris/include/arch-v10/arch/memmap.h index 13f3b971407f..13f3b971407f 100644 --- a/include/asm-cris/arch-v10/memmap.h +++ b/arch/cris/include/arch-v10/arch/memmap.h diff --git a/include/asm-cris/arch-v10/mmu.h b/arch/cris/include/arch-v10/arch/mmu.h index df84f1716e6b..df84f1716e6b 100644 --- a/include/asm-cris/arch-v10/mmu.h +++ b/arch/cris/include/arch-v10/arch/mmu.h diff --git a/include/asm-cris/arch-v10/offset.h b/arch/cris/include/arch-v10/arch/offset.h index 675b51d85639..675b51d85639 100644 --- a/include/asm-cris/arch-v10/offset.h +++ b/arch/cris/include/arch-v10/arch/offset.h diff --git a/include/asm-cris/arch-v10/page.h b/arch/cris/include/arch-v10/arch/page.h index ffafc99c3472..ffafc99c3472 100644 --- a/include/asm-cris/arch-v10/page.h +++ b/arch/cris/include/arch-v10/arch/page.h diff --git a/include/asm-cris/arch-v10/pgtable.h b/arch/cris/include/arch-v10/arch/pgtable.h index 2a2576d1fc97..2a2576d1fc97 100644 --- a/include/asm-cris/arch-v10/pgtable.h +++ b/arch/cris/include/arch-v10/arch/pgtable.h diff --git a/include/asm-cris/arch-v10/processor.h b/arch/cris/include/arch-v10/arch/processor.h index cc692c7a0660..cc692c7a0660 100644 --- a/include/asm-cris/arch-v10/processor.h +++ b/arch/cris/include/arch-v10/arch/processor.h diff --git a/include/asm-cris/arch-v10/ptrace.h b/arch/cris/include/arch-v10/arch/ptrace.h index 2f464eab3a51..2f464eab3a51 100644 --- a/include/asm-cris/arch-v10/ptrace.h +++ b/arch/cris/include/arch-v10/arch/ptrace.h diff --git a/include/asm-cris/arch-v10/sv_addr.agh b/arch/cris/include/arch-v10/arch/sv_addr.agh index 6ac3a7bc9760..6ac3a7bc9760 100644 --- a/include/asm-cris/arch-v10/sv_addr.agh +++ b/arch/cris/include/arch-v10/arch/sv_addr.agh diff --git a/include/asm-cris/arch-v10/sv_addr_ag.h b/arch/cris/include/arch-v10/arch/sv_addr_ag.h index e4a6b68b8982..e4a6b68b8982 100644 --- a/include/asm-cris/arch-v10/sv_addr_ag.h +++ b/arch/cris/include/arch-v10/arch/sv_addr_ag.h diff --git a/include/asm-cris/arch-v10/svinto.h b/arch/cris/include/arch-v10/arch/svinto.h index 0881a1af7cee..0881a1af7cee 100644 --- a/include/asm-cris/arch-v10/svinto.h +++ b/arch/cris/include/arch-v10/arch/svinto.h diff --git a/include/asm-cris/arch-v10/system.h b/arch/cris/include/arch-v10/arch/system.h index 4a9cd36c9e16..4a9cd36c9e16 100644 --- a/include/asm-cris/arch-v10/system.h +++ b/arch/cris/include/arch-v10/arch/system.h diff --git a/include/asm-cris/arch-v10/thread_info.h b/arch/cris/include/arch-v10/arch/thread_info.h index 218f4152d3e5..218f4152d3e5 100644 --- a/include/asm-cris/arch-v10/thread_info.h +++ b/arch/cris/include/arch-v10/arch/thread_info.h diff --git a/include/asm-cris/arch-v10/timex.h b/arch/cris/include/arch-v10/arch/timex.h index e48447d94faf..e48447d94faf 100644 --- a/include/asm-cris/arch-v10/timex.h +++ b/arch/cris/include/arch-v10/arch/timex.h diff --git a/include/asm-cris/arch-v10/tlb.h b/arch/cris/include/arch-v10/arch/tlb.h index 31525bbe75c3..31525bbe75c3 100644 --- a/include/asm-cris/arch-v10/tlb.h +++ b/arch/cris/include/arch-v10/arch/tlb.h diff --git a/include/asm-cris/arch-v10/uaccess.h b/arch/cris/include/arch-v10/arch/uaccess.h index 65b02d9b605a..65b02d9b605a 100644 --- a/include/asm-cris/arch-v10/uaccess.h +++ b/arch/cris/include/arch-v10/arch/uaccess.h diff --git a/include/asm-cris/arch-v10/unistd.h b/arch/cris/include/arch-v10/arch/unistd.h index d1a38b9e6264..d1a38b9e6264 100644 --- a/include/asm-cris/arch-v10/unistd.h +++ b/arch/cris/include/arch-v10/arch/unistd.h diff --git a/include/asm-cris/arch-v10/user.h b/arch/cris/include/arch-v10/arch/user.h index 9303ea77c915..9303ea77c915 100644 --- a/include/asm-cris/arch-v10/user.h +++ b/arch/cris/include/arch-v10/arch/user.h diff --git a/include/asm-cris/arch-v32/Kbuild b/arch/cris/include/arch-v32/arch/Kbuild index 35f2fc4f993e..35f2fc4f993e 100644 --- a/include/asm-cris/arch-v32/Kbuild +++ b/arch/cris/include/arch-v32/arch/Kbuild diff --git a/include/asm-cris/arch-v32/atomic.h b/arch/cris/include/arch-v32/arch/atomic.h index 852ceff8013f..852ceff8013f 100644 --- a/include/asm-cris/arch-v32/atomic.h +++ b/arch/cris/include/arch-v32/arch/atomic.h diff --git a/include/asm-cris/arch-v32/bitops.h b/arch/cris/include/arch-v32/arch/bitops.h index 147689d6b624..147689d6b624 100644 --- a/include/asm-cris/arch-v32/bitops.h +++ b/arch/cris/include/arch-v32/arch/bitops.h diff --git a/include/asm-cris/arch-v32/bug.h b/arch/cris/include/arch-v32/arch/bug.h index 0f211e135248..0f211e135248 100644 --- a/include/asm-cris/arch-v32/bug.h +++ b/arch/cris/include/arch-v32/arch/bug.h diff --git a/include/asm-cris/arch-v32/byteorder.h b/arch/cris/include/arch-v32/arch/byteorder.h index 6ef8fb4a35f2..6ef8fb4a35f2 100644 --- a/include/asm-cris/arch-v32/byteorder.h +++ b/arch/cris/include/arch-v32/arch/byteorder.h diff --git a/include/asm-cris/arch-v32/cache.h b/arch/cris/include/arch-v32/arch/cache.h index b3d752dfe15b..dfc73050e6b4 100644 --- a/include/asm-cris/arch-v32/cache.h +++ b/arch/cris/include/arch-v32/arch/cache.h @@ -1,7 +1,7 @@ #ifndef _ASM_CRIS_ARCH_CACHE_H #define _ASM_CRIS_ARCH_CACHE_H -#include <asm/arch/hwregs/dma.h> +#include <arch/hwregs/dma.h> /* A cache-line is 32 bytes. */ #define L1_CACHE_BYTES 32 diff --git a/include/asm-cris/arch-v32/checksum.h b/arch/cris/include/arch-v32/arch/checksum.h index e5dcfce6e0dc..e5dcfce6e0dc 100644 --- a/include/asm-cris/arch-v32/checksum.h +++ b/arch/cris/include/arch-v32/arch/checksum.h diff --git a/include/asm-cris/arch-v32/cryptocop.h b/arch/cris/include/arch-v32/arch/cryptocop.h index dfa1f66fb987..e1cd83dfabb5 100644 --- a/include/asm-cris/arch-v32/cryptocop.h +++ b/arch/cris/include/arch-v32/arch/cryptocop.h @@ -122,7 +122,7 @@ struct strcop_crypto_op{ /********** The API to use from inside the kernel. ************/ -#include <asm/arch/hwregs/dma.h> +#include <arch/hwregs/dma.h> typedef enum { cryptocop_alg_csum = 0, diff --git a/include/asm-cris/arch-v32/delay.h b/arch/cris/include/arch-v32/arch/delay.h index e9fda03810a9..e9fda03810a9 100644 --- a/include/asm-cris/arch-v32/delay.h +++ b/arch/cris/include/arch-v32/arch/delay.h diff --git a/include/asm-cris/arch-v32/dma.h b/arch/cris/include/arch-v32/arch/dma.h index 3674081389fd..3674081389fd 100644 --- a/include/asm-cris/arch-v32/dma.h +++ b/arch/cris/include/arch-v32/arch/dma.h diff --git a/include/asm-cris/arch-v32/elf.h b/arch/cris/include/arch-v32/arch/elf.h index 1324e505a4d8..1324e505a4d8 100644 --- a/include/asm-cris/arch-v32/elf.h +++ b/arch/cris/include/arch-v32/arch/elf.h diff --git a/include/asm-cris/arch-v32/hwregs/Makefile b/arch/cris/include/arch-v32/arch/hwregs/Makefile index f9a05d2aa061..f9a05d2aa061 100644 --- a/include/asm-cris/arch-v32/hwregs/Makefile +++ b/arch/cris/include/arch-v32/arch/hwregs/Makefile diff --git a/include/asm-cris/arch-v32/hwregs/asm/ata_defs_asm.h b/arch/cris/include/arch-v32/arch/hwregs/asm/ata_defs_asm.h index 866191418f9c..866191418f9c 100644 --- a/include/asm-cris/arch-v32/hwregs/asm/ata_defs_asm.h +++ b/arch/cris/include/arch-v32/arch/hwregs/asm/ata_defs_asm.h diff --git a/include/asm-cris/arch-v32/hwregs/asm/bif_core_defs_asm.h b/arch/cris/include/arch-v32/arch/hwregs/asm/bif_core_defs_asm.h index c686cb335621..c686cb335621 100644 --- a/include/asm-cris/arch-v32/hwregs/asm/bif_core_defs_asm.h +++ b/arch/cris/include/arch-v32/arch/hwregs/asm/bif_core_defs_asm.h diff --git a/include/asm-cris/arch-v32/hwregs/asm/bif_dma_defs_asm.h b/arch/cris/include/arch-v32/arch/hwregs/asm/bif_dma_defs_asm.h index 71532aa18168..71532aa18168 100644 --- a/include/asm-cris/arch-v32/hwregs/asm/bif_dma_defs_asm.h +++ b/arch/cris/include/arch-v32/arch/hwregs/asm/bif_dma_defs_asm.h diff --git a/include/asm-cris/arch-v32/hwregs/asm/bif_slave_defs_asm.h b/arch/cris/include/arch-v32/arch/hwregs/asm/bif_slave_defs_asm.h index 031f33a365bb..031f33a365bb 100644 --- a/include/asm-cris/arch-v32/hwregs/asm/bif_slave_defs_asm.h +++ b/arch/cris/include/arch-v32/arch/hwregs/asm/bif_slave_defs_asm.h diff --git a/include/asm-cris/arch-v32/hwregs/asm/config_defs_asm.h b/arch/cris/include/arch-v32/arch/hwregs/asm/config_defs_asm.h index e98476332e1f..e98476332e1f 100644 --- a/include/asm-cris/arch-v32/hwregs/asm/config_defs_asm.h +++ b/arch/cris/include/arch-v32/arch/hwregs/asm/config_defs_asm.h diff --git a/include/asm-cris/arch-v32/hwregs/asm/cpu_vect.h b/arch/cris/include/arch-v32/arch/hwregs/asm/cpu_vect.h index 8370aee8a14a..8370aee8a14a 100644 --- a/include/asm-cris/arch-v32/hwregs/asm/cpu_vect.h +++ b/arch/cris/include/arch-v32/arch/hwregs/asm/cpu_vect.h diff --git a/include/asm-cris/arch-v32/hwregs/asm/cris_defs_asm.h b/arch/cris/include/arch-v32/arch/hwregs/asm/cris_defs_asm.h index 7f768db272e2..7f768db272e2 100644 --- a/include/asm-cris/arch-v32/hwregs/asm/cris_defs_asm.h +++ b/arch/cris/include/arch-v32/arch/hwregs/asm/cris_defs_asm.h diff --git a/include/asm-cris/arch-v32/hwregs/asm/cris_supp_reg.h b/arch/cris/include/arch-v32/arch/hwregs/asm/cris_supp_reg.h index 7d3689a6f80d..7d3689a6f80d 100644 --- a/include/asm-cris/arch-v32/hwregs/asm/cris_supp_reg.h +++ b/arch/cris/include/arch-v32/arch/hwregs/asm/cris_supp_reg.h diff --git a/include/asm-cris/arch-v32/hwregs/asm/dma_defs_asm.h b/arch/cris/include/arch-v32/arch/hwregs/asm/dma_defs_asm.h index 0cb71bc127ae..0cb71bc127ae 100644 --- a/include/asm-cris/arch-v32/hwregs/asm/dma_defs_asm.h +++ b/arch/cris/include/arch-v32/arch/hwregs/asm/dma_defs_asm.h diff --git a/include/asm-cris/arch-v32/hwregs/asm/eth_defs_asm.h b/arch/cris/include/arch-v32/arch/hwregs/asm/eth_defs_asm.h index c9f49864831b..c9f49864831b 100644 --- a/include/asm-cris/arch-v32/hwregs/asm/eth_defs_asm.h +++ b/arch/cris/include/arch-v32/arch/hwregs/asm/eth_defs_asm.h diff --git a/include/asm-cris/arch-v32/hwregs/asm/gio_defs_asm.h b/arch/cris/include/arch-v32/arch/hwregs/asm/gio_defs_asm.h index 35356bc08629..35356bc08629 100644 --- a/include/asm-cris/arch-v32/hwregs/asm/gio_defs_asm.h +++ b/arch/cris/include/arch-v32/arch/hwregs/asm/gio_defs_asm.h diff --git a/include/asm-cris/arch-v32/hwregs/asm/intr_vect.h b/arch/cris/include/arch-v32/arch/hwregs/asm/intr_vect.h index c8315905c571..c8315905c571 100644 --- a/include/asm-cris/arch-v32/hwregs/asm/intr_vect.h +++ b/arch/cris/include/arch-v32/arch/hwregs/asm/intr_vect.h diff --git a/include/asm-cris/arch-v32/hwregs/asm/intr_vect_defs_asm.h b/arch/cris/include/arch-v32/arch/hwregs/asm/intr_vect_defs_asm.h index 6df2a433b02d..6df2a433b02d 100644 --- a/include/asm-cris/arch-v32/hwregs/asm/intr_vect_defs_asm.h +++ b/arch/cris/include/arch-v32/arch/hwregs/asm/intr_vect_defs_asm.h diff --git a/include/asm-cris/arch-v32/hwregs/asm/irq_nmi_defs_asm.h b/arch/cris/include/arch-v32/arch/hwregs/asm/irq_nmi_defs_asm.h index 0c8084054840..0c8084054840 100644 --- a/include/asm-cris/arch-v32/hwregs/asm/irq_nmi_defs_asm.h +++ b/arch/cris/include/arch-v32/arch/hwregs/asm/irq_nmi_defs_asm.h diff --git a/include/asm-cris/arch-v32/hwregs/asm/marb_defs_asm.h b/arch/cris/include/arch-v32/arch/hwregs/asm/marb_defs_asm.h index 45400eb8d389..45400eb8d389 100644 --- a/include/asm-cris/arch-v32/hwregs/asm/marb_defs_asm.h +++ b/arch/cris/include/arch-v32/arch/hwregs/asm/marb_defs_asm.h diff --git a/include/asm-cris/arch-v32/hwregs/asm/mmu_defs_asm.h b/arch/cris/include/arch-v32/arch/hwregs/asm/mmu_defs_asm.h index 505b7a16d878..505b7a16d878 100644 --- a/include/asm-cris/arch-v32/hwregs/asm/mmu_defs_asm.h +++ b/arch/cris/include/arch-v32/arch/hwregs/asm/mmu_defs_asm.h diff --git a/include/asm-cris/arch-v32/hwregs/asm/mmu_supp_reg.h b/arch/cris/include/arch-v32/arch/hwregs/asm/mmu_supp_reg.h index 339500bf3bc0..339500bf3bc0 100644 --- a/include/asm-cris/arch-v32/hwregs/asm/mmu_supp_reg.h +++ b/arch/cris/include/arch-v32/arch/hwregs/asm/mmu_supp_reg.h diff --git a/include/asm-cris/arch-v32/hwregs/asm/rt_trace_defs_asm.h b/arch/cris/include/arch-v32/arch/hwregs/asm/rt_trace_defs_asm.h index 10246f49fb28..10246f49fb28 100644 --- a/include/asm-cris/arch-v32/hwregs/asm/rt_trace_defs_asm.h +++ b/arch/cris/include/arch-v32/arch/hwregs/asm/rt_trace_defs_asm.h diff --git a/include/asm-cris/arch-v32/hwregs/asm/ser_defs_asm.h b/arch/cris/include/arch-v32/arch/hwregs/asm/ser_defs_asm.h index 4a2808bdf390..4a2808bdf390 100644 --- a/include/asm-cris/arch-v32/hwregs/asm/ser_defs_asm.h +++ b/arch/cris/include/arch-v32/arch/hwregs/asm/ser_defs_asm.h diff --git a/include/asm-cris/arch-v32/hwregs/asm/sser_defs_asm.h b/arch/cris/include/arch-v32/arch/hwregs/asm/sser_defs_asm.h index 27d4d91b3abd..27d4d91b3abd 100644 --- a/include/asm-cris/arch-v32/hwregs/asm/sser_defs_asm.h +++ b/arch/cris/include/arch-v32/arch/hwregs/asm/sser_defs_asm.h diff --git a/include/asm-cris/arch-v32/hwregs/asm/strcop_defs_asm.h b/arch/cris/include/arch-v32/arch/hwregs/asm/strcop_defs_asm.h index 55083e6aec93..55083e6aec93 100644 --- a/include/asm-cris/arch-v32/hwregs/asm/strcop_defs_asm.h +++ b/arch/cris/include/arch-v32/arch/hwregs/asm/strcop_defs_asm.h diff --git a/include/asm-cris/arch-v32/hwregs/asm/strmux_defs_asm.h b/arch/cris/include/arch-v32/arch/hwregs/asm/strmux_defs_asm.h index 69b299920f71..69b299920f71 100644 --- a/include/asm-cris/arch-v32/hwregs/asm/strmux_defs_asm.h +++ b/arch/cris/include/arch-v32/arch/hwregs/asm/strmux_defs_asm.h diff --git a/include/asm-cris/arch-v32/hwregs/asm/timer_defs_asm.h b/arch/cris/include/arch-v32/arch/hwregs/asm/timer_defs_asm.h index 43146021fc16..43146021fc16 100644 --- a/include/asm-cris/arch-v32/hwregs/asm/timer_defs_asm.h +++ b/arch/cris/include/arch-v32/arch/hwregs/asm/timer_defs_asm.h diff --git a/include/asm-cris/arch-v32/hwregs/ata_defs.h b/arch/cris/include/arch-v32/arch/hwregs/ata_defs.h index 43b6643ff0d3..43b6643ff0d3 100644 --- a/include/asm-cris/arch-v32/hwregs/ata_defs.h +++ b/arch/cris/include/arch-v32/arch/hwregs/ata_defs.h diff --git a/include/asm-cris/arch-v32/hwregs/bif_core_defs.h b/arch/cris/include/arch-v32/arch/hwregs/bif_core_defs.h index a56608b50359..a56608b50359 100644 --- a/include/asm-cris/arch-v32/hwregs/bif_core_defs.h +++ b/arch/cris/include/arch-v32/arch/hwregs/bif_core_defs.h diff --git a/include/asm-cris/arch-v32/hwregs/bif_dma_defs.h b/arch/cris/include/arch-v32/arch/hwregs/bif_dma_defs.h index b931c1aab679..b931c1aab679 100644 --- a/include/asm-cris/arch-v32/hwregs/bif_dma_defs.h +++ b/arch/cris/include/arch-v32/arch/hwregs/bif_dma_defs.h diff --git a/include/asm-cris/arch-v32/hwregs/bif_slave_defs.h b/arch/cris/include/arch-v32/arch/hwregs/bif_slave_defs.h index d18fc3c9f569..d18fc3c9f569 100644 --- a/include/asm-cris/arch-v32/hwregs/bif_slave_defs.h +++ b/arch/cris/include/arch-v32/arch/hwregs/bif_slave_defs.h diff --git a/include/asm-cris/arch-v32/hwregs/config_defs.h b/arch/cris/include/arch-v32/arch/hwregs/config_defs.h index 45457a4e3817..45457a4e3817 100644 --- a/include/asm-cris/arch-v32/hwregs/config_defs.h +++ b/arch/cris/include/arch-v32/arch/hwregs/config_defs.h diff --git a/include/asm-cris/arch-v32/hwregs/cpu_vect.h b/arch/cris/include/arch-v32/arch/hwregs/cpu_vect.h index 8370aee8a14a..8370aee8a14a 100644 --- a/include/asm-cris/arch-v32/hwregs/cpu_vect.h +++ b/arch/cris/include/arch-v32/arch/hwregs/cpu_vect.h diff --git a/include/asm-cris/arch-v32/hwregs/dma.h b/arch/cris/include/arch-v32/arch/hwregs/dma.h index 3ce322b5c731..3ce322b5c731 100644 --- a/include/asm-cris/arch-v32/hwregs/dma.h +++ b/arch/cris/include/arch-v32/arch/hwregs/dma.h diff --git a/include/asm-cris/arch-v32/hwregs/dma_defs.h b/arch/cris/include/arch-v32/arch/hwregs/dma_defs.h index 48ac8cef7ebe..48ac8cef7ebe 100644 --- a/include/asm-cris/arch-v32/hwregs/dma_defs.h +++ b/arch/cris/include/arch-v32/arch/hwregs/dma_defs.h diff --git a/include/asm-cris/arch-v32/hwregs/eth_defs.h b/arch/cris/include/arch-v32/arch/hwregs/eth_defs.h index 90fe8a28894f..90fe8a28894f 100644 --- a/include/asm-cris/arch-v32/hwregs/eth_defs.h +++ b/arch/cris/include/arch-v32/arch/hwregs/eth_defs.h diff --git a/include/asm-cris/arch-v32/hwregs/extmem_defs.h b/arch/cris/include/arch-v32/arch/hwregs/extmem_defs.h index c47b5ca48ece..c47b5ca48ece 100644 --- a/include/asm-cris/arch-v32/hwregs/extmem_defs.h +++ b/arch/cris/include/arch-v32/arch/hwregs/extmem_defs.h diff --git a/include/asm-cris/arch-v32/hwregs/iop/Makefile b/arch/cris/include/arch-v32/arch/hwregs/iop/Makefile index a90056a095e3..a90056a095e3 100644 --- a/include/asm-cris/arch-v32/hwregs/iop/Makefile +++ b/arch/cris/include/arch-v32/arch/hwregs/iop/Makefile diff --git a/include/asm-cris/arch-v32/hwregs/iop/asm/iop_crc_par_defs_asm.h b/arch/cris/include/arch-v32/arch/hwregs/iop/asm/iop_crc_par_defs_asm.h index a4b58000c164..a4b58000c164 100644 --- a/include/asm-cris/arch-v32/hwregs/iop/asm/iop_crc_par_defs_asm.h +++ b/arch/cris/include/arch-v32/arch/hwregs/iop/asm/iop_crc_par_defs_asm.h diff --git a/include/asm-cris/arch-v32/hwregs/iop/asm/iop_dmc_in_defs_asm.h b/arch/cris/include/arch-v32/arch/hwregs/iop/asm/iop_dmc_in_defs_asm.h index e7d539feccb1..e7d539feccb1 100644 --- a/include/asm-cris/arch-v32/hwregs/iop/asm/iop_dmc_in_defs_asm.h +++ b/arch/cris/include/arch-v32/arch/hwregs/iop/asm/iop_dmc_in_defs_asm.h diff --git a/include/asm-cris/arch-v32/hwregs/iop/asm/iop_dmc_out_defs_asm.h b/arch/cris/include/arch-v32/arch/hwregs/iop/asm/iop_dmc_out_defs_asm.h index 9fe1a8054371..9fe1a8054371 100644 --- a/include/asm-cris/arch-v32/hwregs/iop/asm/iop_dmc_out_defs_asm.h +++ b/arch/cris/include/arch-v32/arch/hwregs/iop/asm/iop_dmc_out_defs_asm.h diff --git a/include/asm-cris/arch-v32/hwregs/iop/asm/iop_fifo_in_defs_asm.h b/arch/cris/include/arch-v32/arch/hwregs/iop/asm/iop_fifo_in_defs_asm.h index 974dee082f9f..974dee082f9f 100644 --- a/include/asm-cris/arch-v32/hwregs/iop/asm/iop_fifo_in_defs_asm.h +++ b/arch/cris/include/arch-v32/arch/hwregs/iop/asm/iop_fifo_in_defs_asm.h diff --git a/include/asm-cris/arch-v32/hwregs/iop/asm/iop_fifo_in_extra_defs_asm.h b/arch/cris/include/arch-v32/arch/hwregs/iop/asm/iop_fifo_in_extra_defs_asm.h index e00fab0c9335..e00fab0c9335 100644 --- a/include/asm-cris/arch-v32/hwregs/iop/asm/iop_fifo_in_extra_defs_asm.h +++ b/arch/cris/include/arch-v32/arch/hwregs/iop/asm/iop_fifo_in_extra_defs_asm.h diff --git a/include/asm-cris/arch-v32/hwregs/iop/asm/iop_fifo_out_defs_asm.h b/arch/cris/include/arch-v32/arch/hwregs/iop/asm/iop_fifo_out_defs_asm.h index 9ec5f4a826df..9ec5f4a826df 100644 --- a/include/asm-cris/arch-v32/hwregs/iop/asm/iop_fifo_out_defs_asm.h +++ b/arch/cris/include/arch-v32/arch/hwregs/iop/asm/iop_fifo_out_defs_asm.h diff --git a/include/asm-cris/arch-v32/hwregs/iop/asm/iop_fifo_out_extra_defs_asm.h b/arch/cris/include/arch-v32/arch/hwregs/iop/asm/iop_fifo_out_extra_defs_asm.h index 0f84a50cf77c..0f84a50cf77c 100644 --- a/include/asm-cris/arch-v32/hwregs/iop/asm/iop_fifo_out_extra_defs_asm.h +++ b/arch/cris/include/arch-v32/arch/hwregs/iop/asm/iop_fifo_out_extra_defs_asm.h diff --git a/include/asm-cris/arch-v32/hwregs/iop/asm/iop_mpu_defs_asm.h b/arch/cris/include/arch-v32/arch/hwregs/iop/asm/iop_mpu_defs_asm.h index 80490c82cc29..80490c82cc29 100644 --- a/include/asm-cris/arch-v32/hwregs/iop/asm/iop_mpu_defs_asm.h +++ b/arch/cris/include/arch-v32/arch/hwregs/iop/asm/iop_mpu_defs_asm.h diff --git a/include/asm-cris/arch-v32/hwregs/iop/asm/iop_reg_space_asm.h b/arch/cris/include/arch-v32/arch/hwregs/iop/asm/iop_reg_space_asm.h index a20b8857b4d0..a20b8857b4d0 100644 --- a/include/asm-cris/arch-v32/hwregs/iop/asm/iop_reg_space_asm.h +++ b/arch/cris/include/arch-v32/arch/hwregs/iop/asm/iop_reg_space_asm.h diff --git a/include/asm-cris/arch-v32/hwregs/iop/asm/iop_sap_in_defs_asm.h b/arch/cris/include/arch-v32/arch/hwregs/iop/asm/iop_sap_in_defs_asm.h index a4a10ff300b3..a4a10ff300b3 100644 --- a/include/asm-cris/arch-v32/hwregs/iop/asm/iop_sap_in_defs_asm.h +++ b/arch/cris/include/arch-v32/arch/hwregs/iop/asm/iop_sap_in_defs_asm.h diff --git a/include/asm-cris/arch-v32/hwregs/iop/asm/iop_sap_out_defs_asm.h b/arch/cris/include/arch-v32/arch/hwregs/iop/asm/iop_sap_out_defs_asm.h index 0ec727f92a25..0ec727f92a25 100644 --- a/include/asm-cris/arch-v32/hwregs/iop/asm/iop_sap_out_defs_asm.h +++ b/arch/cris/include/arch-v32/arch/hwregs/iop/asm/iop_sap_out_defs_asm.h diff --git a/include/asm-cris/arch-v32/hwregs/iop/asm/iop_scrc_in_defs_asm.h b/arch/cris/include/arch-v32/arch/hwregs/iop/asm/iop_scrc_in_defs_asm.h index 2cf5721597fc..2cf5721597fc 100644 --- a/include/asm-cris/arch-v32/hwregs/iop/asm/iop_scrc_in_defs_asm.h +++ b/arch/cris/include/arch-v32/arch/hwregs/iop/asm/iop_scrc_in_defs_asm.h diff --git a/include/asm-cris/arch-v32/hwregs/iop/asm/iop_scrc_out_defs_asm.h b/arch/cris/include/arch-v32/arch/hwregs/iop/asm/iop_scrc_out_defs_asm.h index 640a25725f20..640a25725f20 100644 --- a/include/asm-cris/arch-v32/hwregs/iop/asm/iop_scrc_out_defs_asm.h +++ b/arch/cris/include/arch-v32/arch/hwregs/iop/asm/iop_scrc_out_defs_asm.h diff --git a/include/asm-cris/arch-v32/hwregs/iop/asm/iop_spu_defs_asm.h b/arch/cris/include/arch-v32/arch/hwregs/iop/asm/iop_spu_defs_asm.h index bb402c1aa761..bb402c1aa761 100644 --- a/include/asm-cris/arch-v32/hwregs/iop/asm/iop_spu_defs_asm.h +++ b/arch/cris/include/arch-v32/arch/hwregs/iop/asm/iop_spu_defs_asm.h diff --git a/include/asm-cris/arch-v32/hwregs/iop/asm/iop_sw_cfg_defs_asm.h b/arch/cris/include/arch-v32/arch/hwregs/iop/asm/iop_sw_cfg_defs_asm.h index 3be60f9b024c..3be60f9b024c 100644 --- a/include/asm-cris/arch-v32/hwregs/iop/asm/iop_sw_cfg_defs_asm.h +++ b/arch/cris/include/arch-v32/arch/hwregs/iop/asm/iop_sw_cfg_defs_asm.h diff --git a/include/asm-cris/arch-v32/hwregs/iop/asm/iop_sw_cpu_defs_asm.h b/arch/cris/include/arch-v32/arch/hwregs/iop/asm/iop_sw_cpu_defs_asm.h index db347bcba025..db347bcba025 100644 --- a/include/asm-cris/arch-v32/hwregs/iop/asm/iop_sw_cpu_defs_asm.h +++ b/arch/cris/include/arch-v32/arch/hwregs/iop/asm/iop_sw_cpu_defs_asm.h diff --git a/include/asm-cris/arch-v32/hwregs/iop/asm/iop_sw_mpu_defs_asm.h b/arch/cris/include/arch-v32/arch/hwregs/iop/asm/iop_sw_mpu_defs_asm.h index ee7dc0435b59..ee7dc0435b59 100644 --- a/include/asm-cris/arch-v32/hwregs/iop/asm/iop_sw_mpu_defs_asm.h +++ b/arch/cris/include/arch-v32/arch/hwregs/iop/asm/iop_sw_mpu_defs_asm.h diff --git a/include/asm-cris/arch-v32/hwregs/iop/asm/iop_sw_spu_defs_asm.h b/arch/cris/include/arch-v32/arch/hwregs/iop/asm/iop_sw_spu_defs_asm.h index 0929f144cfa1..0929f144cfa1 100644 --- a/include/asm-cris/arch-v32/hwregs/iop/asm/iop_sw_spu_defs_asm.h +++ b/arch/cris/include/arch-v32/arch/hwregs/iop/asm/iop_sw_spu_defs_asm.h diff --git a/include/asm-cris/arch-v32/hwregs/iop/asm/iop_timer_grp_defs_asm.h b/arch/cris/include/arch-v32/arch/hwregs/iop/asm/iop_timer_grp_defs_asm.h index 7129a9a4bedc..7129a9a4bedc 100644 --- a/include/asm-cris/arch-v32/hwregs/iop/asm/iop_timer_grp_defs_asm.h +++ b/arch/cris/include/arch-v32/arch/hwregs/iop/asm/iop_timer_grp_defs_asm.h diff --git a/include/asm-cris/arch-v32/hwregs/iop/asm/iop_trigger_grp_defs_asm.h b/arch/cris/include/arch-v32/arch/hwregs/iop/asm/iop_trigger_grp_defs_asm.h index 1005d9db80dc..1005d9db80dc 100644 --- a/include/asm-cris/arch-v32/hwregs/iop/asm/iop_trigger_grp_defs_asm.h +++ b/arch/cris/include/arch-v32/arch/hwregs/iop/asm/iop_trigger_grp_defs_asm.h diff --git a/include/asm-cris/arch-v32/hwregs/iop/asm/iop_version_defs_asm.h b/arch/cris/include/arch-v32/arch/hwregs/iop/asm/iop_version_defs_asm.h index e13feb20a7e3..e13feb20a7e3 100644 --- a/include/asm-cris/arch-v32/hwregs/iop/asm/iop_version_defs_asm.h +++ b/arch/cris/include/arch-v32/arch/hwregs/iop/asm/iop_version_defs_asm.h diff --git a/include/asm-cris/arch-v32/hwregs/iop/iop_crc_par_defs.h b/arch/cris/include/arch-v32/arch/hwregs/iop/iop_crc_par_defs.h index 90e4785b6474..90e4785b6474 100644 --- a/include/asm-cris/arch-v32/hwregs/iop/iop_crc_par_defs.h +++ b/arch/cris/include/arch-v32/arch/hwregs/iop/iop_crc_par_defs.h diff --git a/include/asm-cris/arch-v32/hwregs/iop/iop_dmc_in_defs.h b/arch/cris/include/arch-v32/arch/hwregs/iop/iop_dmc_in_defs.h index 76aec6e37f3e..76aec6e37f3e 100644 --- a/include/asm-cris/arch-v32/hwregs/iop/iop_dmc_in_defs.h +++ b/arch/cris/include/arch-v32/arch/hwregs/iop/iop_dmc_in_defs.h diff --git a/include/asm-cris/arch-v32/hwregs/iop/iop_dmc_out_defs.h b/arch/cris/include/arch-v32/arch/hwregs/iop/iop_dmc_out_defs.h index 938a0d4c4604..938a0d4c4604 100644 --- a/include/asm-cris/arch-v32/hwregs/iop/iop_dmc_out_defs.h +++ b/arch/cris/include/arch-v32/arch/hwregs/iop/iop_dmc_out_defs.h diff --git a/include/asm-cris/arch-v32/hwregs/iop/iop_fifo_in_defs.h b/arch/cris/include/arch-v32/arch/hwregs/iop/iop_fifo_in_defs.h index e0c982b263fa..e0c982b263fa 100644 --- a/include/asm-cris/arch-v32/hwregs/iop/iop_fifo_in_defs.h +++ b/arch/cris/include/arch-v32/arch/hwregs/iop/iop_fifo_in_defs.h diff --git a/include/asm-cris/arch-v32/hwregs/iop/iop_fifo_in_extra_defs.h b/arch/cris/include/arch-v32/arch/hwregs/iop/iop_fifo_in_extra_defs.h index 798ac95870e9..798ac95870e9 100644 --- a/include/asm-cris/arch-v32/hwregs/iop/iop_fifo_in_extra_defs.h +++ b/arch/cris/include/arch-v32/arch/hwregs/iop/iop_fifo_in_extra_defs.h diff --git a/include/asm-cris/arch-v32/hwregs/iop/iop_fifo_out_defs.h b/arch/cris/include/arch-v32/arch/hwregs/iop/iop_fifo_out_defs.h index 833e10f02526..833e10f02526 100644 --- a/include/asm-cris/arch-v32/hwregs/iop/iop_fifo_out_defs.h +++ b/arch/cris/include/arch-v32/arch/hwregs/iop/iop_fifo_out_defs.h diff --git a/include/asm-cris/arch-v32/hwregs/iop/iop_fifo_out_extra_defs.h b/arch/cris/include/arch-v32/arch/hwregs/iop/iop_fifo_out_extra_defs.h index 4a840aae84ee..4a840aae84ee 100644 --- a/include/asm-cris/arch-v32/hwregs/iop/iop_fifo_out_extra_defs.h +++ b/arch/cris/include/arch-v32/arch/hwregs/iop/iop_fifo_out_extra_defs.h diff --git a/include/asm-cris/arch-v32/hwregs/iop/iop_mpu_defs.h b/arch/cris/include/arch-v32/arch/hwregs/iop/iop_mpu_defs.h index c2b0ba1be60f..c2b0ba1be60f 100644 --- a/include/asm-cris/arch-v32/hwregs/iop/iop_mpu_defs.h +++ b/arch/cris/include/arch-v32/arch/hwregs/iop/iop_mpu_defs.h diff --git a/include/asm-cris/arch-v32/hwregs/iop/iop_mpu_macros.h b/arch/cris/include/arch-v32/arch/hwregs/iop/iop_mpu_macros.h index 2ec897ced166..2ec897ced166 100644 --- a/include/asm-cris/arch-v32/hwregs/iop/iop_mpu_macros.h +++ b/arch/cris/include/arch-v32/arch/hwregs/iop/iop_mpu_macros.h diff --git a/include/asm-cris/arch-v32/hwregs/iop/iop_reg_space.h b/arch/cris/include/arch-v32/arch/hwregs/iop/iop_reg_space.h index 756550f5d6cb..756550f5d6cb 100644 --- a/include/asm-cris/arch-v32/hwregs/iop/iop_reg_space.h +++ b/arch/cris/include/arch-v32/arch/hwregs/iop/iop_reg_space.h diff --git a/include/asm-cris/arch-v32/hwregs/iop/iop_sap_in_defs.h b/arch/cris/include/arch-v32/arch/hwregs/iop/iop_sap_in_defs.h index 5548ac10074f..5548ac10074f 100644 --- a/include/asm-cris/arch-v32/hwregs/iop/iop_sap_in_defs.h +++ b/arch/cris/include/arch-v32/arch/hwregs/iop/iop_sap_in_defs.h diff --git a/include/asm-cris/arch-v32/hwregs/iop/iop_sap_out_defs.h b/arch/cris/include/arch-v32/arch/hwregs/iop/iop_sap_out_defs.h index 273936996183..273936996183 100644 --- a/include/asm-cris/arch-v32/hwregs/iop/iop_sap_out_defs.h +++ b/arch/cris/include/arch-v32/arch/hwregs/iop/iop_sap_out_defs.h diff --git a/include/asm-cris/arch-v32/hwregs/iop/iop_scrc_in_defs.h b/arch/cris/include/arch-v32/arch/hwregs/iop/iop_scrc_in_defs.h index 4f0a9a81e737..4f0a9a81e737 100644 --- a/include/asm-cris/arch-v32/hwregs/iop/iop_scrc_in_defs.h +++ b/arch/cris/include/arch-v32/arch/hwregs/iop/iop_scrc_in_defs.h diff --git a/include/asm-cris/arch-v32/hwregs/iop/iop_scrc_out_defs.h b/arch/cris/include/arch-v32/arch/hwregs/iop/iop_scrc_out_defs.h index fd1d6ea1d484..fd1d6ea1d484 100644 --- a/include/asm-cris/arch-v32/hwregs/iop/iop_scrc_out_defs.h +++ b/arch/cris/include/arch-v32/arch/hwregs/iop/iop_scrc_out_defs.h diff --git a/include/asm-cris/arch-v32/hwregs/iop/iop_spu_defs.h b/arch/cris/include/arch-v32/arch/hwregs/iop/iop_spu_defs.h index 0fda26e2f06f..0fda26e2f06f 100644 --- a/include/asm-cris/arch-v32/hwregs/iop/iop_spu_defs.h +++ b/arch/cris/include/arch-v32/arch/hwregs/iop/iop_spu_defs.h diff --git a/include/asm-cris/arch-v32/hwregs/iop/iop_sw_cfg_defs.h b/arch/cris/include/arch-v32/arch/hwregs/iop/iop_sw_cfg_defs.h index d7b6d75884d2..d7b6d75884d2 100644 --- a/include/asm-cris/arch-v32/hwregs/iop/iop_sw_cfg_defs.h +++ b/arch/cris/include/arch-v32/arch/hwregs/iop/iop_sw_cfg_defs.h diff --git a/include/asm-cris/arch-v32/hwregs/iop/iop_sw_cpu_defs.h b/arch/cris/include/arch-v32/arch/hwregs/iop/iop_sw_cpu_defs.h index 5fed844b19e2..5fed844b19e2 100644 --- a/include/asm-cris/arch-v32/hwregs/iop/iop_sw_cpu_defs.h +++ b/arch/cris/include/arch-v32/arch/hwregs/iop/iop_sw_cpu_defs.h diff --git a/include/asm-cris/arch-v32/hwregs/iop/iop_sw_mpu_defs.h b/arch/cris/include/arch-v32/arch/hwregs/iop/iop_sw_mpu_defs.h index da718f2a8cad..da718f2a8cad 100644 --- a/include/asm-cris/arch-v32/hwregs/iop/iop_sw_mpu_defs.h +++ b/arch/cris/include/arch-v32/arch/hwregs/iop/iop_sw_mpu_defs.h diff --git a/include/asm-cris/arch-v32/hwregs/iop/iop_sw_spu_defs.h b/arch/cris/include/arch-v32/arch/hwregs/iop/iop_sw_spu_defs.h index b59dde4bd0d1..b59dde4bd0d1 100644 --- a/include/asm-cris/arch-v32/hwregs/iop/iop_sw_spu_defs.h +++ b/arch/cris/include/arch-v32/arch/hwregs/iop/iop_sw_spu_defs.h diff --git a/include/asm-cris/arch-v32/hwregs/iop/iop_timer_grp_defs.h b/arch/cris/include/arch-v32/arch/hwregs/iop/iop_timer_grp_defs.h index c994114f3b51..c994114f3b51 100644 --- a/include/asm-cris/arch-v32/hwregs/iop/iop_timer_grp_defs.h +++ b/arch/cris/include/arch-v32/arch/hwregs/iop/iop_timer_grp_defs.h diff --git a/include/asm-cris/arch-v32/hwregs/iop/iop_trigger_grp_defs.h b/arch/cris/include/arch-v32/arch/hwregs/iop/iop_trigger_grp_defs.h index 36e44282399d..36e44282399d 100644 --- a/include/asm-cris/arch-v32/hwregs/iop/iop_trigger_grp_defs.h +++ b/arch/cris/include/arch-v32/arch/hwregs/iop/iop_trigger_grp_defs.h diff --git a/include/asm-cris/arch-v32/hwregs/iop/iop_version_defs.h b/arch/cris/include/arch-v32/arch/hwregs/iop/iop_version_defs.h index b8d6a910c71c..b8d6a910c71c 100644 --- a/include/asm-cris/arch-v32/hwregs/iop/iop_version_defs.h +++ b/arch/cris/include/arch-v32/arch/hwregs/iop/iop_version_defs.h diff --git a/include/asm-cris/arch-v32/hwregs/irq_nmi_defs.h b/arch/cris/include/arch-v32/arch/hwregs/irq_nmi_defs.h index 7b167e3c0572..7b167e3c0572 100644 --- a/include/asm-cris/arch-v32/hwregs/irq_nmi_defs.h +++ b/arch/cris/include/arch-v32/arch/hwregs/irq_nmi_defs.h diff --git a/include/asm-cris/arch-v32/hwregs/marb_bp_defs.h b/arch/cris/include/arch-v32/arch/hwregs/marb_bp_defs.h index a11fdd3cd907..a11fdd3cd907 100644 --- a/include/asm-cris/arch-v32/hwregs/marb_bp_defs.h +++ b/arch/cris/include/arch-v32/arch/hwregs/marb_bp_defs.h diff --git a/include/asm-cris/arch-v32/hwregs/marb_defs.h b/arch/cris/include/arch-v32/arch/hwregs/marb_defs.h index 71e8af0bb3a4..71e8af0bb3a4 100644 --- a/include/asm-cris/arch-v32/hwregs/marb_defs.h +++ b/arch/cris/include/arch-v32/arch/hwregs/marb_defs.h diff --git a/include/asm-cris/arch-v32/hwregs/reg_rdwr.h b/arch/cris/include/arch-v32/arch/hwregs/reg_rdwr.h index 236f91efe7e8..236f91efe7e8 100644 --- a/include/asm-cris/arch-v32/hwregs/reg_rdwr.h +++ b/arch/cris/include/arch-v32/arch/hwregs/reg_rdwr.h diff --git a/include/asm-cris/arch-v32/hwregs/rt_trace_defs.h b/arch/cris/include/arch-v32/arch/hwregs/rt_trace_defs.h index d9f0e924fb23..d9f0e924fb23 100644 --- a/include/asm-cris/arch-v32/hwregs/rt_trace_defs.h +++ b/arch/cris/include/arch-v32/arch/hwregs/rt_trace_defs.h diff --git a/include/asm-cris/arch-v32/hwregs/ser_defs.h b/arch/cris/include/arch-v32/arch/hwregs/ser_defs.h index 01c2fab97d43..01c2fab97d43 100644 --- a/include/asm-cris/arch-v32/hwregs/ser_defs.h +++ b/arch/cris/include/arch-v32/arch/hwregs/ser_defs.h diff --git a/include/asm-cris/arch-v32/hwregs/sser_defs.h b/arch/cris/include/arch-v32/arch/hwregs/sser_defs.h index 8d1dab218b91..8d1dab218b91 100644 --- a/include/asm-cris/arch-v32/hwregs/sser_defs.h +++ b/arch/cris/include/arch-v32/arch/hwregs/sser_defs.h diff --git a/include/asm-cris/arch-v32/hwregs/strcop.h b/arch/cris/include/arch-v32/arch/hwregs/strcop.h index 35131ba466f3..35131ba466f3 100644 --- a/include/asm-cris/arch-v32/hwregs/strcop.h +++ b/arch/cris/include/arch-v32/arch/hwregs/strcop.h diff --git a/include/asm-cris/arch-v32/hwregs/strcop_defs.h b/arch/cris/include/arch-v32/arch/hwregs/strcop_defs.h index bd145a49b2c4..bd145a49b2c4 100644 --- a/include/asm-cris/arch-v32/hwregs/strcop_defs.h +++ b/arch/cris/include/arch-v32/arch/hwregs/strcop_defs.h diff --git a/include/asm-cris/arch-v32/hwregs/supp_reg.h b/arch/cris/include/arch-v32/arch/hwregs/supp_reg.h index ffe49625ae36..ffe49625ae36 100644 --- a/include/asm-cris/arch-v32/hwregs/supp_reg.h +++ b/arch/cris/include/arch-v32/arch/hwregs/supp_reg.h diff --git a/include/asm-cris/arch-v32/intmem.h b/arch/cris/include/arch-v32/arch/intmem.h index c0ada33bf90f..c0ada33bf90f 100644 --- a/include/asm-cris/arch-v32/intmem.h +++ b/arch/cris/include/arch-v32/arch/intmem.h diff --git a/include/asm-cris/arch-v32/io.h b/arch/cris/include/arch-v32/arch/io.h index 72024452cea9..72024452cea9 100644 --- a/include/asm-cris/arch-v32/io.h +++ b/arch/cris/include/arch-v32/arch/io.h diff --git a/include/asm-cris/arch-v32/irq.h b/arch/cris/include/arch-v32/arch/irq.h index 9e4c9fbdfddf..9e4c9fbdfddf 100644 --- a/include/asm-cris/arch-v32/irq.h +++ b/arch/cris/include/arch-v32/arch/irq.h diff --git a/include/asm-cris/arch-v32/memmap.h b/arch/cris/include/arch-v32/arch/memmap.h index d29df5644d3e..d29df5644d3e 100644 --- a/include/asm-cris/arch-v32/memmap.h +++ b/arch/cris/include/arch-v32/arch/memmap.h diff --git a/include/asm-cris/arch-v32/mmu.h b/arch/cris/include/arch-v32/arch/mmu.h index 6bcdc3fdf7dc..6bcdc3fdf7dc 100644 --- a/include/asm-cris/arch-v32/mmu.h +++ b/arch/cris/include/arch-v32/arch/mmu.h diff --git a/include/asm-cris/arch-v32/offset.h b/arch/cris/include/arch-v32/arch/offset.h index 4442c4bd52f4..4442c4bd52f4 100644 --- a/include/asm-cris/arch-v32/offset.h +++ b/arch/cris/include/arch-v32/arch/offset.h diff --git a/include/asm-cris/arch-v32/page.h b/arch/cris/include/arch-v32/arch/page.h index 20f1b4806bfe..20f1b4806bfe 100644 --- a/include/asm-cris/arch-v32/page.h +++ b/arch/cris/include/arch-v32/arch/page.h diff --git a/include/asm-cris/arch-v32/pgtable.h b/arch/cris/include/arch-v32/arch/pgtable.h index 08cb7ff7e4e7..08cb7ff7e4e7 100644 --- a/include/asm-cris/arch-v32/pgtable.h +++ b/arch/cris/include/arch-v32/arch/pgtable.h diff --git a/include/asm-cris/arch-v32/processor.h b/arch/cris/include/arch-v32/arch/processor.h index f80b47790ca6..f80b47790ca6 100644 --- a/include/asm-cris/arch-v32/processor.h +++ b/arch/cris/include/arch-v32/arch/processor.h diff --git a/include/asm-cris/arch-v32/ptrace.h b/arch/cris/include/arch-v32/arch/ptrace.h index 41f4e8662bc2..41f4e8662bc2 100644 --- a/include/asm-cris/arch-v32/ptrace.h +++ b/arch/cris/include/arch-v32/arch/ptrace.h diff --git a/include/asm-cris/arch-v32/spinlock.h b/arch/cris/include/arch-v32/arch/spinlock.h index 0d5709b983a1..0d5709b983a1 100644 --- a/include/asm-cris/arch-v32/spinlock.h +++ b/arch/cris/include/arch-v32/arch/spinlock.h diff --git a/include/asm-cris/arch-v32/system.h b/arch/cris/include/arch-v32/arch/system.h index 6ca90f1f110a..6ca90f1f110a 100644 --- a/include/asm-cris/arch-v32/system.h +++ b/arch/cris/include/arch-v32/arch/system.h diff --git a/include/asm-cris/arch-v32/thread_info.h b/arch/cris/include/arch-v32/arch/thread_info.h index d6936956a3c6..d6936956a3c6 100644 --- a/include/asm-cris/arch-v32/thread_info.h +++ b/arch/cris/include/arch-v32/arch/thread_info.h diff --git a/include/asm-cris/arch-v32/timex.h b/arch/cris/include/arch-v32/arch/timex.h index 2591d3c5ed9d..2591d3c5ed9d 100644 --- a/include/asm-cris/arch-v32/timex.h +++ b/arch/cris/include/arch-v32/arch/timex.h diff --git a/include/asm-cris/arch-v32/tlb.h b/arch/cris/include/arch-v32/arch/tlb.h index 4effb1253660..4effb1253660 100644 --- a/include/asm-cris/arch-v32/tlb.h +++ b/arch/cris/include/arch-v32/arch/tlb.h diff --git a/include/asm-cris/arch-v32/uaccess.h b/arch/cris/include/arch-v32/arch/uaccess.h index 6b207f1b6622..6b207f1b6622 100644 --- a/include/asm-cris/arch-v32/uaccess.h +++ b/arch/cris/include/arch-v32/arch/uaccess.h diff --git a/include/asm-cris/arch-v32/unistd.h b/arch/cris/include/arch-v32/arch/unistd.h index 0051114c63c7..0051114c63c7 100644 --- a/include/asm-cris/arch-v32/unistd.h +++ b/arch/cris/include/arch-v32/arch/unistd.h diff --git a/include/asm-cris/arch-v32/user.h b/arch/cris/include/arch-v32/arch/user.h index 03fa1f3c3c00..03fa1f3c3c00 100644 --- a/include/asm-cris/arch-v32/user.h +++ b/arch/cris/include/arch-v32/arch/user.h diff --git a/include/asm-cris/arch-v32/mach-a3/arbiter.h b/arch/cris/include/arch-v32/mach-a3/mach/arbiter.h index 65e9d6ff0520..65e9d6ff0520 100644 --- a/include/asm-cris/arch-v32/mach-a3/arbiter.h +++ b/arch/cris/include/arch-v32/mach-a3/mach/arbiter.h diff --git a/include/asm-cris/arch-v32/mach-a3/dma.h b/arch/cris/include/arch-v32/mach-a3/mach/dma.h index 9e8eb13b601d..9e8eb13b601d 100644 --- a/include/asm-cris/arch-v32/mach-a3/dma.h +++ b/arch/cris/include/arch-v32/mach-a3/mach/dma.h diff --git a/include/asm-cris/arch-v32/mach-a3/hwregs/asm/clkgen_defs_asm.h b/arch/cris/include/arch-v32/mach-a3/mach/hwregs/asm/clkgen_defs_asm.h index 02855adf63e8..02855adf63e8 100644 --- a/include/asm-cris/arch-v32/mach-a3/hwregs/asm/clkgen_defs_asm.h +++ b/arch/cris/include/arch-v32/mach-a3/mach/hwregs/asm/clkgen_defs_asm.h diff --git a/include/asm-cris/arch-v32/mach-a3/hwregs/asm/ddr2_defs_asm.h b/arch/cris/include/arch-v32/mach-a3/mach/hwregs/asm/ddr2_defs_asm.h index b12be03edacb..b12be03edacb 100644 --- a/include/asm-cris/arch-v32/mach-a3/hwregs/asm/ddr2_defs_asm.h +++ b/arch/cris/include/arch-v32/mach-a3/mach/hwregs/asm/ddr2_defs_asm.h diff --git a/include/asm-cris/arch-v32/mach-a3/hwregs/asm/gio_defs_asm.h b/arch/cris/include/arch-v32/mach-a3/mach/hwregs/asm/gio_defs_asm.h index df6714fda179..df6714fda179 100644 --- a/include/asm-cris/arch-v32/mach-a3/hwregs/asm/gio_defs_asm.h +++ b/arch/cris/include/arch-v32/mach-a3/mach/hwregs/asm/gio_defs_asm.h diff --git a/include/asm-cris/arch-v32/mach-a3/hwregs/asm/pinmux_defs_asm.h b/arch/cris/include/arch-v32/mach-a3/mach/hwregs/asm/pinmux_defs_asm.h index c3dc9c666c46..c3dc9c666c46 100644 --- a/include/asm-cris/arch-v32/mach-a3/hwregs/asm/pinmux_defs_asm.h +++ b/arch/cris/include/arch-v32/mach-a3/mach/hwregs/asm/pinmux_defs_asm.h diff --git a/include/asm-cris/arch-v32/mach-a3/hwregs/asm/pio_defs_asm.h b/arch/cris/include/arch-v32/mach-a3/mach/hwregs/asm/pio_defs_asm.h index 3907ef4921c8..3907ef4921c8 100644 --- a/include/asm-cris/arch-v32/mach-a3/hwregs/asm/pio_defs_asm.h +++ b/arch/cris/include/arch-v32/mach-a3/mach/hwregs/asm/pio_defs_asm.h diff --git a/include/asm-cris/arch-v32/mach-a3/hwregs/asm/reg_map_asm.h b/arch/cris/include/arch-v32/mach-a3/mach/hwregs/asm/reg_map_asm.h index 89439e9610e2..89439e9610e2 100644 --- a/include/asm-cris/arch-v32/mach-a3/hwregs/asm/reg_map_asm.h +++ b/arch/cris/include/arch-v32/mach-a3/mach/hwregs/asm/reg_map_asm.h diff --git a/include/asm-cris/arch-v32/mach-a3/hwregs/asm/timer_defs_asm.h b/arch/cris/include/arch-v32/mach-a3/mach/hwregs/asm/timer_defs_asm.h index b129e826fc34..b129e826fc34 100644 --- a/include/asm-cris/arch-v32/mach-a3/hwregs/asm/timer_defs_asm.h +++ b/arch/cris/include/arch-v32/mach-a3/mach/hwregs/asm/timer_defs_asm.h diff --git a/include/asm-cris/arch-v32/mach-a3/hwregs/clkgen_defs.h b/arch/cris/include/arch-v32/mach-a3/mach/hwregs/clkgen_defs.h index c1e9ba93b3a3..c1e9ba93b3a3 100644 --- a/include/asm-cris/arch-v32/mach-a3/hwregs/clkgen_defs.h +++ b/arch/cris/include/arch-v32/mach-a3/mach/hwregs/clkgen_defs.h diff --git a/include/asm-cris/arch-v32/mach-a3/hwregs/ddr2_defs.h b/arch/cris/include/arch-v32/mach-a3/mach/hwregs/ddr2_defs.h index 0f30e8bf946d..0f30e8bf946d 100644 --- a/include/asm-cris/arch-v32/mach-a3/hwregs/ddr2_defs.h +++ b/arch/cris/include/arch-v32/mach-a3/mach/hwregs/ddr2_defs.h diff --git a/include/asm-cris/arch-v32/mach-a3/hwregs/gio_defs.h b/arch/cris/include/arch-v32/mach-a3/mach/hwregs/gio_defs.h index 5d88e0db23ae..5d88e0db23ae 100644 --- a/include/asm-cris/arch-v32/mach-a3/hwregs/gio_defs.h +++ b/arch/cris/include/arch-v32/mach-a3/mach/hwregs/gio_defs.h diff --git a/include/asm-cris/arch-v32/mach-a3/hwregs/intr_vect.h b/arch/cris/include/arch-v32/mach-a3/mach/hwregs/intr_vect.h index bea699aa480e..bea699aa480e 100644 --- a/include/asm-cris/arch-v32/mach-a3/hwregs/intr_vect.h +++ b/arch/cris/include/arch-v32/mach-a3/mach/hwregs/intr_vect.h diff --git a/include/asm-cris/arch-v32/mach-a3/hwregs/intr_vect_defs.h b/arch/cris/include/arch-v32/mach-a3/mach/hwregs/intr_vect_defs.h index b820f6347c74..b820f6347c74 100644 --- a/include/asm-cris/arch-v32/mach-a3/hwregs/intr_vect_defs.h +++ b/arch/cris/include/arch-v32/mach-a3/mach/hwregs/intr_vect_defs.h diff --git a/include/asm-cris/arch-v32/mach-a3/hwregs/iop/asm/iop_reg_space_asm.h b/arch/cris/include/arch-v32/mach-a3/mach/hwregs/iop/asm/iop_reg_space_asm.h index d75a74e90458..d75a74e90458 100644 --- a/include/asm-cris/arch-v32/mach-a3/hwregs/iop/asm/iop_reg_space_asm.h +++ b/arch/cris/include/arch-v32/mach-a3/mach/hwregs/iop/asm/iop_reg_space_asm.h diff --git a/include/asm-cris/arch-v32/mach-a3/hwregs/iop/asm/iop_sap_in_defs_asm.h b/arch/cris/include/arch-v32/mach-a3/mach/hwregs/iop/asm/iop_sap_in_defs_asm.h index 7f90b5a0460d..7f90b5a0460d 100644 --- a/include/asm-cris/arch-v32/mach-a3/hwregs/iop/asm/iop_sap_in_defs_asm.h +++ b/arch/cris/include/arch-v32/mach-a3/mach/hwregs/iop/asm/iop_sap_in_defs_asm.h diff --git a/include/asm-cris/arch-v32/mach-a3/hwregs/iop/asm/iop_sap_out_defs_asm.h b/arch/cris/include/arch-v32/mach-a3/mach/hwregs/iop/asm/iop_sap_out_defs_asm.h index 399bd656406b..399bd656406b 100644 --- a/include/asm-cris/arch-v32/mach-a3/hwregs/iop/asm/iop_sap_out_defs_asm.h +++ b/arch/cris/include/arch-v32/mach-a3/mach/hwregs/iop/asm/iop_sap_out_defs_asm.h diff --git a/include/asm-cris/arch-v32/mach-a3/hwregs/iop/asm/iop_sw_cfg_defs_asm.h b/arch/cris/include/arch-v32/mach-a3/mach/hwregs/iop/asm/iop_sw_cfg_defs_asm.h index 3b3949b51a66..3b3949b51a66 100644 --- a/include/asm-cris/arch-v32/mach-a3/hwregs/iop/asm/iop_sw_cfg_defs_asm.h +++ b/arch/cris/include/arch-v32/mach-a3/mach/hwregs/iop/asm/iop_sw_cfg_defs_asm.h diff --git a/include/asm-cris/arch-v32/mach-a3/hwregs/iop/asm/iop_sw_cpu_defs_asm.h b/arch/cris/include/arch-v32/mach-a3/mach/hwregs/iop/asm/iop_sw_cpu_defs_asm.h index 3f4fe1b31815..3f4fe1b31815 100644 --- a/include/asm-cris/arch-v32/mach-a3/hwregs/iop/asm/iop_sw_cpu_defs_asm.h +++ b/arch/cris/include/arch-v32/mach-a3/mach/hwregs/iop/asm/iop_sw_cpu_defs_asm.h diff --git a/include/asm-cris/arch-v32/mach-a3/hwregs/iop/asm/iop_sw_mpu_defs_asm.h b/arch/cris/include/arch-v32/mach-a3/mach/hwregs/iop/asm/iop_sw_mpu_defs_asm.h index ffcc83b22d21..ffcc83b22d21 100644 --- a/include/asm-cris/arch-v32/mach-a3/hwregs/iop/asm/iop_sw_mpu_defs_asm.h +++ b/arch/cris/include/arch-v32/mach-a3/mach/hwregs/iop/asm/iop_sw_mpu_defs_asm.h diff --git a/include/asm-cris/arch-v32/mach-a3/hwregs/iop/asm/iop_sw_spu_defs_asm.h b/arch/cris/include/arch-v32/mach-a3/mach/hwregs/iop/asm/iop_sw_spu_defs_asm.h index 67a745338087..67a745338087 100644 --- a/include/asm-cris/arch-v32/mach-a3/hwregs/iop/asm/iop_sw_spu_defs_asm.h +++ b/arch/cris/include/arch-v32/mach-a3/mach/hwregs/iop/asm/iop_sw_spu_defs_asm.h diff --git a/include/asm-cris/arch-v32/mach-a3/hwregs/iop/asm/iop_version_defs_asm.h b/arch/cris/include/arch-v32/mach-a3/mach/hwregs/iop/asm/iop_version_defs_asm.h index 4ad671202af0..4ad671202af0 100644 --- a/include/asm-cris/arch-v32/mach-a3/hwregs/iop/asm/iop_version_defs_asm.h +++ b/arch/cris/include/arch-v32/mach-a3/mach/hwregs/iop/asm/iop_version_defs_asm.h diff --git a/include/asm-cris/arch-v32/mach-a3/hwregs/iop/iop_reg_space.h b/arch/cris/include/arch-v32/mach-a3/mach/hwregs/iop/iop_reg_space.h index af3196c60a46..af3196c60a46 100644 --- a/include/asm-cris/arch-v32/mach-a3/hwregs/iop/iop_reg_space.h +++ b/arch/cris/include/arch-v32/mach-a3/mach/hwregs/iop/iop_reg_space.h diff --git a/include/asm-cris/arch-v32/mach-a3/hwregs/iop/iop_sap_in_defs.h b/arch/cris/include/arch-v32/mach-a3/mach/hwregs/iop/iop_sap_in_defs.h index 51dde016c03a..51dde016c03a 100644 --- a/include/asm-cris/arch-v32/mach-a3/hwregs/iop/iop_sap_in_defs.h +++ b/arch/cris/include/arch-v32/mach-a3/mach/hwregs/iop/iop_sap_in_defs.h diff --git a/include/asm-cris/arch-v32/mach-a3/hwregs/iop/iop_sap_out_defs.h b/arch/cris/include/arch-v32/mach-a3/mach/hwregs/iop/iop_sap_out_defs.h index 5af88baa2ac1..5af88baa2ac1 100644 --- a/include/asm-cris/arch-v32/mach-a3/hwregs/iop/iop_sap_out_defs.h +++ b/arch/cris/include/arch-v32/mach-a3/mach/hwregs/iop/iop_sap_out_defs.h diff --git a/include/asm-cris/arch-v32/mach-a3/hwregs/iop/iop_sw_cfg_defs.h b/arch/cris/include/arch-v32/mach-a3/mach/hwregs/iop/iop_sw_cfg_defs.h index 98ac95275a1c..98ac95275a1c 100644 --- a/include/asm-cris/arch-v32/mach-a3/hwregs/iop/iop_sw_cfg_defs.h +++ b/arch/cris/include/arch-v32/mach-a3/mach/hwregs/iop/iop_sw_cfg_defs.h diff --git a/include/asm-cris/arch-v32/mach-a3/hwregs/iop/iop_sw_cpu_defs.h b/arch/cris/include/arch-v32/mach-a3/mach/hwregs/iop/iop_sw_cpu_defs.h index a16f556370eb..a16f556370eb 100644 --- a/include/asm-cris/arch-v32/mach-a3/hwregs/iop/iop_sw_cpu_defs.h +++ b/arch/cris/include/arch-v32/mach-a3/mach/hwregs/iop/iop_sw_cpu_defs.h diff --git a/include/asm-cris/arch-v32/mach-a3/hwregs/iop/iop_sw_mpu_defs.h b/arch/cris/include/arch-v32/mach-a3/mach/hwregs/iop/iop_sw_mpu_defs.h index a2e4e1a33e57..a2e4e1a33e57 100644 --- a/include/asm-cris/arch-v32/mach-a3/hwregs/iop/iop_sw_mpu_defs.h +++ b/arch/cris/include/arch-v32/mach-a3/mach/hwregs/iop/iop_sw_mpu_defs.h diff --git a/include/asm-cris/arch-v32/mach-a3/hwregs/iop/iop_sw_spu_defs.h b/arch/cris/include/arch-v32/mach-a3/mach/hwregs/iop/iop_sw_spu_defs.h index c8560b865a1a..c8560b865a1a 100644 --- a/include/asm-cris/arch-v32/mach-a3/hwregs/iop/iop_sw_spu_defs.h +++ b/arch/cris/include/arch-v32/mach-a3/mach/hwregs/iop/iop_sw_spu_defs.h diff --git a/include/asm-cris/arch-v32/mach-a3/hwregs/iop/iop_version_defs.h b/arch/cris/include/arch-v32/mach-a3/mach/hwregs/iop/iop_version_defs.h index 20de425e652b..20de425e652b 100644 --- a/include/asm-cris/arch-v32/mach-a3/hwregs/iop/iop_version_defs.h +++ b/arch/cris/include/arch-v32/mach-a3/mach/hwregs/iop/iop_version_defs.h diff --git a/include/asm-cris/arch-v32/mach-a3/hwregs/l2cache_defs.h b/arch/cris/include/arch-v32/mach-a3/mach/hwregs/l2cache_defs.h index 243ac3c882cb..243ac3c882cb 100644 --- a/include/asm-cris/arch-v32/mach-a3/hwregs/l2cache_defs.h +++ b/arch/cris/include/arch-v32/mach-a3/mach/hwregs/l2cache_defs.h diff --git a/include/asm-cris/arch-v32/mach-a3/hwregs/marb_bar_defs.h b/arch/cris/include/arch-v32/mach-a3/mach/hwregs/marb_bar_defs.h index c0e7628cbf7d..c0e7628cbf7d 100644 --- a/include/asm-cris/arch-v32/mach-a3/hwregs/marb_bar_defs.h +++ b/arch/cris/include/arch-v32/mach-a3/mach/hwregs/marb_bar_defs.h diff --git a/include/asm-cris/arch-v32/mach-a3/hwregs/marb_foo_defs.h b/arch/cris/include/arch-v32/mach-a3/mach/hwregs/marb_foo_defs.h index 2baa833f109a..2baa833f109a 100644 --- a/include/asm-cris/arch-v32/mach-a3/hwregs/marb_foo_defs.h +++ b/arch/cris/include/arch-v32/mach-a3/mach/hwregs/marb_foo_defs.h diff --git a/include/asm-cris/arch-v32/mach-a3/hwregs/pinmux_defs.h b/arch/cris/include/arch-v32/mach-a3/mach/hwregs/pinmux_defs.h index 4b96cd2cba8a..4b96cd2cba8a 100644 --- a/include/asm-cris/arch-v32/mach-a3/hwregs/pinmux_defs.h +++ b/arch/cris/include/arch-v32/mach-a3/mach/hwregs/pinmux_defs.h diff --git a/include/asm-cris/arch-v32/mach-a3/hwregs/pio_defs.h b/arch/cris/include/arch-v32/mach-a3/mach/hwregs/pio_defs.h index 2d8e4b4cc602..2d8e4b4cc602 100644 --- a/include/asm-cris/arch-v32/mach-a3/hwregs/pio_defs.h +++ b/arch/cris/include/arch-v32/mach-a3/mach/hwregs/pio_defs.h diff --git a/include/asm-cris/arch-v32/mach-a3/hwregs/reg_map.h b/arch/cris/include/arch-v32/mach-a3/mach/hwregs/reg_map.h index 36e59d6e96b6..36e59d6e96b6 100644 --- a/include/asm-cris/arch-v32/mach-a3/hwregs/reg_map.h +++ b/arch/cris/include/arch-v32/mach-a3/mach/hwregs/reg_map.h diff --git a/include/asm-cris/arch-v32/mach-a3/hwregs/strmux_defs.h b/arch/cris/include/arch-v32/mach-a3/mach/hwregs/strmux_defs.h index 14f718a4ecc3..14f718a4ecc3 100644 --- a/include/asm-cris/arch-v32/mach-a3/hwregs/strmux_defs.h +++ b/arch/cris/include/arch-v32/mach-a3/mach/hwregs/strmux_defs.h diff --git a/include/asm-cris/arch-v32/mach-a3/hwregs/timer_defs.h b/arch/cris/include/arch-v32/mach-a3/mach/hwregs/timer_defs.h index 2c33e097d60a..2c33e097d60a 100644 --- a/include/asm-cris/arch-v32/mach-a3/hwregs/timer_defs.h +++ b/arch/cris/include/arch-v32/mach-a3/mach/hwregs/timer_defs.h diff --git a/include/asm-cris/arch-v32/mach-a3/memmap.h b/arch/cris/include/arch-v32/mach-a3/mach/memmap.h index 7e15c9eb4e49..7e15c9eb4e49 100644 --- a/include/asm-cris/arch-v32/mach-a3/memmap.h +++ b/arch/cris/include/arch-v32/mach-a3/mach/memmap.h diff --git a/include/asm-cris/arch-v32/mach-a3/pinmux.h b/arch/cris/include/arch-v32/mach-a3/mach/pinmux.h index db42a7254584..db42a7254584 100644 --- a/include/asm-cris/arch-v32/mach-a3/pinmux.h +++ b/arch/cris/include/arch-v32/mach-a3/mach/pinmux.h diff --git a/include/asm-cris/arch-v32/mach-a3/startup.inc b/arch/cris/include/arch-v32/mach-a3/mach/startup.inc index 2f23e5e16f4a..2f23e5e16f4a 100644 --- a/include/asm-cris/arch-v32/mach-a3/startup.inc +++ b/arch/cris/include/arch-v32/mach-a3/mach/startup.inc diff --git a/include/asm-cris/arch-v32/mach-fs/arbiter.h b/arch/cris/include/arch-v32/mach-fs/mach/arbiter.h index a2e0ec8faa7d..a2e0ec8faa7d 100644 --- a/include/asm-cris/arch-v32/mach-fs/arbiter.h +++ b/arch/cris/include/arch-v32/mach-fs/mach/arbiter.h diff --git a/include/asm-cris/arch-v32/mach-fs/hwregs/asm/bif_core_defs_asm.h b/arch/cris/include/arch-v32/mach-fs/mach/hwregs/asm/bif_core_defs_asm.h index 0a409c92837e..0a409c92837e 100644 --- a/include/asm-cris/arch-v32/mach-fs/hwregs/asm/bif_core_defs_asm.h +++ b/arch/cris/include/arch-v32/mach-fs/mach/hwregs/asm/bif_core_defs_asm.h diff --git a/include/asm-cris/arch-v32/mach-fs/hwregs/asm/config_defs_asm.h b/arch/cris/include/arch-v32/mach-fs/mach/hwregs/asm/config_defs_asm.h index a9908dfc2937..a9908dfc2937 100644 --- a/include/asm-cris/arch-v32/mach-fs/hwregs/asm/config_defs_asm.h +++ b/arch/cris/include/arch-v32/mach-fs/mach/hwregs/asm/config_defs_asm.h diff --git a/include/asm-cris/arch-v32/mach-fs/hwregs/asm/gio_defs_asm.h b/arch/cris/include/arch-v32/mach-fs/mach/hwregs/asm/gio_defs_asm.h index be4c63936d90..be4c63936d90 100644 --- a/include/asm-cris/arch-v32/mach-fs/hwregs/asm/gio_defs_asm.h +++ b/arch/cris/include/arch-v32/mach-fs/mach/hwregs/asm/gio_defs_asm.h diff --git a/include/asm-cris/arch-v32/mach-fs/hwregs/asm/pinmux_defs_asm.h b/arch/cris/include/arch-v32/mach-fs/mach/hwregs/asm/pinmux_defs_asm.h index 30cf5a936b64..30cf5a936b64 100644 --- a/include/asm-cris/arch-v32/mach-fs/hwregs/asm/pinmux_defs_asm.h +++ b/arch/cris/include/arch-v32/mach-fs/mach/hwregs/asm/pinmux_defs_asm.h diff --git a/include/asm-cris/arch-v32/mach-fs/hwregs/asm/reg_map_asm.h b/arch/cris/include/arch-v32/mach-fs/mach/hwregs/asm/reg_map_asm.h index 87517aebd2cb..87517aebd2cb 100644 --- a/include/asm-cris/arch-v32/mach-fs/hwregs/asm/reg_map_asm.h +++ b/arch/cris/include/arch-v32/mach-fs/mach/hwregs/asm/reg_map_asm.h diff --git a/include/asm-cris/arch-v32/mach-fs/hwregs/asm/timer_defs_asm.h b/arch/cris/include/arch-v32/mach-fs/mach/hwregs/asm/timer_defs_asm.h index e1197194d5c1..e1197194d5c1 100644 --- a/include/asm-cris/arch-v32/mach-fs/hwregs/asm/timer_defs_asm.h +++ b/arch/cris/include/arch-v32/mach-fs/mach/hwregs/asm/timer_defs_asm.h diff --git a/include/asm-cris/arch-v32/mach-fs/hwregs/bif_core_defs.h b/arch/cris/include/arch-v32/mach-fs/mach/hwregs/bif_core_defs.h index 44362a62b47c..44362a62b47c 100644 --- a/include/asm-cris/arch-v32/mach-fs/hwregs/bif_core_defs.h +++ b/arch/cris/include/arch-v32/mach-fs/mach/hwregs/bif_core_defs.h diff --git a/include/asm-cris/arch-v32/mach-fs/hwregs/bif_dma_defs.h b/arch/cris/include/arch-v32/mach-fs/mach/hwregs/bif_dma_defs.h index 3cb51a09dba7..3cb51a09dba7 100644 --- a/include/asm-cris/arch-v32/mach-fs/hwregs/bif_dma_defs.h +++ b/arch/cris/include/arch-v32/mach-fs/mach/hwregs/bif_dma_defs.h diff --git a/include/asm-cris/arch-v32/mach-fs/hwregs/bif_slave_defs.h b/arch/cris/include/arch-v32/mach-fs/mach/hwregs/bif_slave_defs.h index 0c434585a3f9..0c434585a3f9 100644 --- a/include/asm-cris/arch-v32/mach-fs/hwregs/bif_slave_defs.h +++ b/arch/cris/include/arch-v32/mach-fs/mach/hwregs/bif_slave_defs.h diff --git a/include/asm-cris/arch-v32/mach-fs/hwregs/config_defs.h b/arch/cris/include/arch-v32/mach-fs/mach/hwregs/config_defs.h index abc5f20705f7..abc5f20705f7 100644 --- a/include/asm-cris/arch-v32/mach-fs/hwregs/config_defs.h +++ b/arch/cris/include/arch-v32/mach-fs/mach/hwregs/config_defs.h diff --git a/include/asm-cris/arch-v32/mach-fs/hwregs/gio_defs.h b/arch/cris/include/arch-v32/mach-fs/mach/hwregs/gio_defs.h index 26aa3efcf91b..26aa3efcf91b 100644 --- a/include/asm-cris/arch-v32/mach-fs/hwregs/gio_defs.h +++ b/arch/cris/include/arch-v32/mach-fs/mach/hwregs/gio_defs.h diff --git a/include/asm-cris/arch-v32/mach-fs/hwregs/intr_vect.h b/arch/cris/include/arch-v32/mach-fs/mach/hwregs/intr_vect.h index bacc2a895c21..bacc2a895c21 100644 --- a/include/asm-cris/arch-v32/mach-fs/hwregs/intr_vect.h +++ b/arch/cris/include/arch-v32/mach-fs/mach/hwregs/intr_vect.h diff --git a/include/asm-cris/arch-v32/mach-fs/hwregs/intr_vect_defs.h b/arch/cris/include/arch-v32/mach-fs/mach/hwregs/intr_vect_defs.h index aa65128ae1aa..aa65128ae1aa 100644 --- a/include/asm-cris/arch-v32/mach-fs/hwregs/intr_vect_defs.h +++ b/arch/cris/include/arch-v32/mach-fs/mach/hwregs/intr_vect_defs.h diff --git a/include/asm-cris/arch-v32/mach-fs/hwregs/marb_bp_defs.h b/arch/cris/include/arch-v32/mach-fs/mach/hwregs/marb_bp_defs.h index dcaaec4620ba..dcaaec4620ba 100644 --- a/include/asm-cris/arch-v32/mach-fs/hwregs/marb_bp_defs.h +++ b/arch/cris/include/arch-v32/mach-fs/mach/hwregs/marb_bp_defs.h diff --git a/include/asm-cris/arch-v32/mach-fs/hwregs/marb_defs.h b/arch/cris/include/arch-v32/mach-fs/mach/hwregs/marb_defs.h index 254da0854986..254da0854986 100644 --- a/include/asm-cris/arch-v32/mach-fs/hwregs/marb_defs.h +++ b/arch/cris/include/arch-v32/mach-fs/mach/hwregs/marb_defs.h diff --git a/include/asm-cris/arch-v32/mach-fs/hwregs/pinmux_defs.h b/arch/cris/include/arch-v32/mach-fs/mach/hwregs/pinmux_defs.h index 751eab5f191c..751eab5f191c 100644 --- a/include/asm-cris/arch-v32/mach-fs/hwregs/pinmux_defs.h +++ b/arch/cris/include/arch-v32/mach-fs/mach/hwregs/pinmux_defs.h diff --git a/include/asm-cris/arch-v32/mach-fs/hwregs/reg_map.h b/arch/cris/include/arch-v32/mach-fs/mach/hwregs/reg_map.h index 4146973a58b3..4146973a58b3 100644 --- a/include/asm-cris/arch-v32/mach-fs/hwregs/reg_map.h +++ b/arch/cris/include/arch-v32/mach-fs/mach/hwregs/reg_map.h diff --git a/include/asm-cris/arch-v32/mach-fs/hwregs/strmux_defs.h b/arch/cris/include/arch-v32/mach-fs/mach/hwregs/strmux_defs.h index cbfaa867829e..cbfaa867829e 100644 --- a/include/asm-cris/arch-v32/mach-fs/hwregs/strmux_defs.h +++ b/arch/cris/include/arch-v32/mach-fs/mach/hwregs/strmux_defs.h diff --git a/include/asm-cris/arch-v32/mach-fs/hwregs/timer_defs.h b/arch/cris/include/arch-v32/mach-fs/mach/hwregs/timer_defs.h index 76bcc591921d..76bcc591921d 100644 --- a/include/asm-cris/arch-v32/mach-fs/hwregs/timer_defs.h +++ b/arch/cris/include/arch-v32/mach-fs/mach/hwregs/timer_defs.h diff --git a/include/asm-cris/arch-v32/mach-fs/pinmux.h b/arch/cris/include/arch-v32/mach-fs/mach/pinmux.h index c2b3036779df..c2b3036779df 100644 --- a/include/asm-cris/arch-v32/mach-fs/pinmux.h +++ b/arch/cris/include/arch-v32/mach-fs/mach/pinmux.h diff --git a/include/asm-cris/arch-v32/mach-fs/startup.inc b/arch/cris/include/arch-v32/mach-fs/mach/startup.inc index 4a10ccbd6cc1..4a10ccbd6cc1 100644 --- a/include/asm-cris/arch-v32/mach-fs/startup.inc +++ b/arch/cris/include/arch-v32/mach-fs/mach/startup.inc diff --git a/include/asm-cris/Kbuild b/arch/cris/include/asm/Kbuild index d5b631935ec8..d5b631935ec8 100644 --- a/include/asm-cris/Kbuild +++ b/arch/cris/include/asm/Kbuild diff --git a/include/asm-cris/atomic.h b/arch/cris/include/asm/atomic.h index 5fc87768774a..f71ea686a2ea 100644 --- a/include/asm-cris/atomic.h +++ b/arch/cris/include/asm/atomic.h @@ -6,7 +6,7 @@ #include <linux/compiler.h> #include <asm/system.h> -#include <asm/arch/atomic.h> +#include <arch/atomic.h> /* * Atomic operations that C can't guarantee us. Useful for diff --git a/include/asm-cris/auxvec.h b/arch/cris/include/asm/auxvec.h index cb30b01bf19f..cb30b01bf19f 100644 --- a/include/asm-cris/auxvec.h +++ b/arch/cris/include/asm/auxvec.h diff --git a/include/asm-cris/axisflashmap.h b/arch/cris/include/asm/axisflashmap.h index 015ca5445ddd..015ca5445ddd 100644 --- a/include/asm-cris/axisflashmap.h +++ b/arch/cris/include/asm/axisflashmap.h diff --git a/include/asm-cris/bitops.h b/arch/cris/include/asm/bitops.h index 75ea6e096483..c0e62f811e09 100644 --- a/include/asm-cris/bitops.h +++ b/arch/cris/include/asm/bitops.h @@ -18,7 +18,7 @@ #error only <linux/bitops.h> can be included directly #endif -#include <asm/arch/bitops.h> +#include <arch/bitops.h> #include <asm/system.h> #include <asm/atomic.h> #include <linux/compiler.h> diff --git a/include/asm-cris/bug.h b/arch/cris/include/asm/bug.h index fee12d4ae683..3b3958963801 100644 --- a/include/asm-cris/bug.h +++ b/arch/cris/include/asm/bug.h @@ -1,4 +1,4 @@ #ifndef _CRIS_BUG_H #define _CRIS_BUG_H -#include <asm/arch/bug.h> +#include <arch/bug.h> #endif diff --git a/include/asm-cris/bugs.h b/arch/cris/include/asm/bugs.h index c5907aac1007..c5907aac1007 100644 --- a/include/asm-cris/bugs.h +++ b/arch/cris/include/asm/bugs.h diff --git a/include/asm-cris/byteorder.h b/arch/cris/include/asm/byteorder.h index 0cd9db1cc888..cc8e418cfd14 100644 --- a/include/asm-cris/byteorder.h +++ b/arch/cris/include/asm/byteorder.h @@ -4,7 +4,7 @@ #ifdef __GNUC__ #ifdef __KERNEL__ -#include <asm/arch/byteorder.h> +#include <arch/byteorder.h> /* defines are necessary because the other files detect the presence * of a defined __arch_swab32, not an inline diff --git a/include/asm-cris/cache.h b/arch/cris/include/asm/cache.h index 46a3b26e205a..a692b9fba8b9 100644 --- a/include/asm-cris/cache.h +++ b/arch/cris/include/asm/cache.h @@ -1,6 +1,6 @@ #ifndef _ASM_CACHE_H #define _ASM_CACHE_H -#include <asm/arch/cache.h> +#include <arch/cache.h> #endif /* _ASM_CACHE_H */ diff --git a/include/asm-cris/cacheflush.h b/arch/cris/include/asm/cacheflush.h index cf60e3f69f8d..cf60e3f69f8d 100644 --- a/include/asm-cris/cacheflush.h +++ b/arch/cris/include/asm/cacheflush.h diff --git a/include/asm-cris/checksum.h b/arch/cris/include/asm/checksum.h index c6c5be62c698..75dcb77d6cb0 100644 --- a/include/asm-cris/checksum.h +++ b/arch/cris/include/asm/checksum.h @@ -3,7 +3,7 @@ #ifndef _CRIS_CHECKSUM_H #define _CRIS_CHECKSUM_H -#include <asm/arch/checksum.h> +#include <arch/checksum.h> /* * computes the checksum of a memory block at buff, length len, diff --git a/include/asm-cris/cputime.h b/arch/cris/include/asm/cputime.h index 4446a65656fa..4446a65656fa 100644 --- a/include/asm-cris/cputime.h +++ b/arch/cris/include/asm/cputime.h diff --git a/include/asm-cris/current.h b/arch/cris/include/asm/current.h index 5f5c0efd00be..5f5c0efd00be 100644 --- a/include/asm-cris/current.h +++ b/arch/cris/include/asm/current.h diff --git a/include/asm-cris/delay.h b/arch/cris/include/asm/delay.h index 123e19aef49d..75ec581bfead 100644 --- a/include/asm-cris/delay.h +++ b/arch/cris/include/asm/delay.h @@ -7,7 +7,7 @@ * Delay routines, using a pre-computed "loops_per_second" value. */ -#include <asm/arch/delay.h> +#include <arch/delay.h> /* Use only for very small delays ( < 1 msec). */ diff --git a/include/asm-cris/device.h b/arch/cris/include/asm/device.h index d8f9872b0e2d..d8f9872b0e2d 100644 --- a/include/asm-cris/device.h +++ b/arch/cris/include/asm/device.h diff --git a/include/asm-cris/div64.h b/arch/cris/include/asm/div64.h index 6cd978cefb28..6cd978cefb28 100644 --- a/include/asm-cris/div64.h +++ b/arch/cris/include/asm/div64.h diff --git a/include/asm-cris/dma-mapping.h b/arch/cris/include/asm/dma-mapping.h index da8ef8e8f842..da8ef8e8f842 100644 --- a/include/asm-cris/dma-mapping.h +++ b/arch/cris/include/asm/dma-mapping.h diff --git a/include/asm-cris/dma.h b/arch/cris/include/asm/dma.h index 6f188dc56138..30fd715fa589 100644 --- a/include/asm-cris/dma.h +++ b/arch/cris/include/asm/dma.h @@ -3,7 +3,7 @@ #ifndef _ASM_DMA_H #define _ASM_DMA_H -#include <asm/arch/dma.h> +#include <arch/dma.h> /* it's useless on the Etrax, but unfortunately needed by the new bootmem allocator (but this should do it for this) */ diff --git a/include/asm-cris/elf.h b/arch/cris/include/asm/elf.h index f0d17fbc81ba..0f51b10b9f4f 100644 --- a/include/asm-cris/elf.h +++ b/arch/cris/include/asm/elf.h @@ -45,7 +45,7 @@ typedef unsigned long elf_fpregset_t; #define ELF_DATA ELFDATA2LSB #define ELF_ARCH EM_CRIS -#include <asm/arch/elf.h> +#include <arch/elf.h> /* The master for these definitions is {binutils}/include/elf/cris.h: */ /* User symbols in this file have a leading underscore. */ diff --git a/include/asm-cris/emergency-restart.h b/arch/cris/include/asm/emergency-restart.h index 108d8c48e42e..108d8c48e42e 100644 --- a/include/asm-cris/emergency-restart.h +++ b/arch/cris/include/asm/emergency-restart.h diff --git a/include/asm-cris/errno.h b/arch/cris/include/asm/errno.h index 2bf5eb5fa773..2bf5eb5fa773 100644 --- a/include/asm-cris/errno.h +++ b/arch/cris/include/asm/errno.h diff --git a/include/asm-cris/eshlibld.h b/arch/cris/include/asm/eshlibld.h index 10ce36cf79a9..10ce36cf79a9 100644 --- a/include/asm-cris/eshlibld.h +++ b/arch/cris/include/asm/eshlibld.h diff --git a/include/asm-cris/ethernet.h b/arch/cris/include/asm/ethernet.h index 4d58652c3a49..4d58652c3a49 100644 --- a/include/asm-cris/ethernet.h +++ b/arch/cris/include/asm/ethernet.h diff --git a/include/asm-cris/etraxgpio.h b/arch/cris/include/asm/etraxgpio.h index 38f1c8e1770c..38f1c8e1770c 100644 --- a/include/asm-cris/etraxgpio.h +++ b/arch/cris/include/asm/etraxgpio.h diff --git a/include/asm-cris/etraxi2c.h b/arch/cris/include/asm/etraxi2c.h index e369a7620893..e369a7620893 100644 --- a/include/asm-cris/etraxi2c.h +++ b/arch/cris/include/asm/etraxi2c.h diff --git a/include/asm-cris/fasttimer.h b/arch/cris/include/asm/fasttimer.h index 8f8a8d6c9653..8f8a8d6c9653 100644 --- a/include/asm-cris/fasttimer.h +++ b/arch/cris/include/asm/fasttimer.h diff --git a/include/asm-cris/fb.h b/arch/cris/include/asm/fb.h index c7df38030992..c7df38030992 100644 --- a/include/asm-cris/fb.h +++ b/arch/cris/include/asm/fb.h diff --git a/include/asm-cris/fcntl.h b/arch/cris/include/asm/fcntl.h index 46ab12db5739..46ab12db5739 100644 --- a/include/asm-cris/fcntl.h +++ b/arch/cris/include/asm/fcntl.h diff --git a/include/asm-cris/futex.h b/arch/cris/include/asm/futex.h index 6a332a9f099c..6a332a9f099c 100644 --- a/include/asm-cris/futex.h +++ b/arch/cris/include/asm/futex.h diff --git a/include/asm-cris/hardirq.h b/arch/cris/include/asm/hardirq.h index 74178adeb1cd..74178adeb1cd 100644 --- a/include/asm-cris/hardirq.h +++ b/arch/cris/include/asm/hardirq.h diff --git a/include/asm-cris/hw_irq.h b/arch/cris/include/asm/hw_irq.h index 298066020af2..298066020af2 100644 --- a/include/asm-cris/hw_irq.h +++ b/arch/cris/include/asm/hw_irq.h diff --git a/include/asm-cris/io.h b/arch/cris/include/asm/io.h index b87ce63f531f..32567bc2a421 100644 --- a/include/asm-cris/io.h +++ b/arch/cris/include/asm/io.h @@ -2,7 +2,7 @@ #define _ASM_CRIS_IO_H #include <asm/page.h> /* for __va, __pa */ -#include <asm/arch/io.h> +#include <arch/io.h> #include <linux/kernel.h> struct cris_io_operations diff --git a/include/asm-cris/ioctl.h b/arch/cris/include/asm/ioctl.h index b279fe06dfe5..b279fe06dfe5 100644 --- a/include/asm-cris/ioctl.h +++ b/arch/cris/include/asm/ioctl.h diff --git a/include/asm-cris/ioctls.h b/arch/cris/include/asm/ioctls.h index 4f4e52531fa0..4f4e52531fa0 100644 --- a/include/asm-cris/ioctls.h +++ b/arch/cris/include/asm/ioctls.h diff --git a/include/asm-cris/ipcbuf.h b/arch/cris/include/asm/ipcbuf.h index 8b0c18b02844..8b0c18b02844 100644 --- a/include/asm-cris/ipcbuf.h +++ b/arch/cris/include/asm/ipcbuf.h diff --git a/include/asm-cris/irq.h b/arch/cris/include/asm/irq.h index 998cce9f3200..ce0fcf540d62 100644 --- a/include/asm-cris/irq.h +++ b/arch/cris/include/asm/irq.h @@ -1,7 +1,7 @@ #ifndef _ASM_IRQ_H #define _ASM_IRQ_H -#include <asm/arch/irq.h> +#include <arch/irq.h> static inline int irq_canonicalize(int irq) { diff --git a/include/asm-cris/irq_regs.h b/arch/cris/include/asm/irq_regs.h index 3dd9c0b70270..3dd9c0b70270 100644 --- a/include/asm-cris/irq_regs.h +++ b/arch/cris/include/asm/irq_regs.h diff --git a/include/asm-cris/kdebug.h b/arch/cris/include/asm/kdebug.h index 6ece1b037665..6ece1b037665 100644 --- a/include/asm-cris/kdebug.h +++ b/arch/cris/include/asm/kdebug.h diff --git a/include/asm-cris/kmap_types.h b/arch/cris/include/asm/kmap_types.h index 492988cb9077..492988cb9077 100644 --- a/include/asm-cris/kmap_types.h +++ b/arch/cris/include/asm/kmap_types.h diff --git a/include/asm-cris/linkage.h b/arch/cris/include/asm/linkage.h index 291c2d01c44f..291c2d01c44f 100644 --- a/include/asm-cris/linkage.h +++ b/arch/cris/include/asm/linkage.h diff --git a/include/asm-cris/local.h b/arch/cris/include/asm/local.h index c11c530f74d0..c11c530f74d0 100644 --- a/include/asm-cris/local.h +++ b/arch/cris/include/asm/local.h diff --git a/include/asm-cris/mman.h b/arch/cris/include/asm/mman.h index 1c35e1b66b46..1c35e1b66b46 100644 --- a/include/asm-cris/mman.h +++ b/arch/cris/include/asm/mman.h diff --git a/include/asm-cris/mmu.h b/arch/cris/include/asm/mmu.h index c40a1bcad06c..e06ea94ecffd 100644 --- a/include/asm-cris/mmu.h +++ b/arch/cris/include/asm/mmu.h @@ -5,6 +5,6 @@ #ifndef _CRIS_MMU_H #define _CRIS_MMU_H -#include <asm/arch/mmu.h> +#include <arch/mmu.h> #endif diff --git a/include/asm-cris/mmu_context.h b/arch/cris/include/asm/mmu_context.h index 72ba08dcfd18..72ba08dcfd18 100644 --- a/include/asm-cris/mmu_context.h +++ b/arch/cris/include/asm/mmu_context.h diff --git a/include/asm-cris/module.h b/arch/cris/include/asm/module.h index 7ee72311bd78..7ee72311bd78 100644 --- a/include/asm-cris/module.h +++ b/arch/cris/include/asm/module.h diff --git a/include/asm-cris/msgbuf.h b/arch/cris/include/asm/msgbuf.h index ada63df1d574..ada63df1d574 100644 --- a/include/asm-cris/msgbuf.h +++ b/arch/cris/include/asm/msgbuf.h diff --git a/include/asm-cris/mutex.h b/arch/cris/include/asm/mutex.h index 458c1f7fbc18..458c1f7fbc18 100644 --- a/include/asm-cris/mutex.h +++ b/arch/cris/include/asm/mutex.h diff --git a/include/asm-cris/page.h b/arch/cris/include/asm/page.h index d19272ba6b69..f3fdbd09c34c 100644 --- a/include/asm-cris/page.h +++ b/arch/cris/include/asm/page.h @@ -1,7 +1,7 @@ #ifndef _CRIS_PAGE_H #define _CRIS_PAGE_H -#include <asm/arch/page.h> +#include <arch/page.h> #include <linux/const.h> /* PAGE_SHIFT determines the page size */ diff --git a/include/asm-cris/param.h b/arch/cris/include/asm/param.h index 0e47994e40be..0e47994e40be 100644 --- a/include/asm-cris/param.h +++ b/arch/cris/include/asm/param.h diff --git a/include/asm-cris/pci.h b/arch/cris/include/asm/pci.h index 730ce40fdd0f..730ce40fdd0f 100644 --- a/include/asm-cris/pci.h +++ b/arch/cris/include/asm/pci.h diff --git a/include/asm-cris/percpu.h b/arch/cris/include/asm/percpu.h index 6db9b43cf80a..6db9b43cf80a 100644 --- a/include/asm-cris/percpu.h +++ b/arch/cris/include/asm/percpu.h diff --git a/include/asm-cris/pgalloc.h b/arch/cris/include/asm/pgalloc.h index a1ba761d0573..a1ba761d0573 100644 --- a/include/asm-cris/pgalloc.h +++ b/arch/cris/include/asm/pgalloc.h diff --git a/include/asm-cris/pgtable.h b/arch/cris/include/asm/pgtable.h index 829e7a7d9fb9..50aa974aa834 100644 --- a/include/asm-cris/pgtable.h +++ b/arch/cris/include/asm/pgtable.h @@ -12,7 +12,7 @@ #include <linux/sched.h> #include <asm/mmu.h> #endif -#include <asm/arch/pgtable.h> +#include <arch/pgtable.h> /* * The Linux memory management assumes a three-level page table setup. On diff --git a/include/asm-cris/poll.h b/arch/cris/include/asm/poll.h index c98509d3149e..c98509d3149e 100644 --- a/include/asm-cris/poll.h +++ b/arch/cris/include/asm/poll.h diff --git a/include/asm-cris/posix_types.h b/arch/cris/include/asm/posix_types.h index ce3fb25a460b..ce3fb25a460b 100644 --- a/include/asm-cris/posix_types.h +++ b/arch/cris/include/asm/posix_types.h diff --git a/include/asm-cris/processor.h b/arch/cris/include/asm/processor.h index cdc0c1dce6be..3f7248f7a1c9 100644 --- a/include/asm-cris/processor.h +++ b/arch/cris/include/asm/processor.h @@ -13,7 +13,7 @@ #include <asm/system.h> #include <asm/page.h> #include <asm/ptrace.h> -#include <asm/arch/processor.h> +#include <arch/processor.h> struct task_struct; diff --git a/include/asm-cris/ptrace.h b/arch/cris/include/asm/ptrace.h index d910925e3174..6618893bfe8e 100644 --- a/include/asm-cris/ptrace.h +++ b/arch/cris/include/asm/ptrace.h @@ -1,7 +1,7 @@ #ifndef _CRIS_PTRACE_H #define _CRIS_PTRACE_H -#include <asm/arch/ptrace.h> +#include <arch/ptrace.h> #ifdef __KERNEL__ diff --git a/include/asm-cris/resource.h b/arch/cris/include/asm/resource.h index b5d29448de4e..b5d29448de4e 100644 --- a/include/asm-cris/resource.h +++ b/arch/cris/include/asm/resource.h diff --git a/include/asm-cris/rs485.h b/arch/cris/include/asm/rs485.h index c331c51b0c2b..c331c51b0c2b 100644 --- a/include/asm-cris/rs485.h +++ b/arch/cris/include/asm/rs485.h diff --git a/include/asm-cris/rtc.h b/arch/cris/include/asm/rtc.h index 17d3019529e1..17d3019529e1 100644 --- a/include/asm-cris/rtc.h +++ b/arch/cris/include/asm/rtc.h diff --git a/include/asm-cris/scatterlist.h b/arch/cris/include/asm/scatterlist.h index faff53ad1f96..faff53ad1f96 100644 --- a/include/asm-cris/scatterlist.h +++ b/arch/cris/include/asm/scatterlist.h diff --git a/include/asm-cris/sections.h b/arch/cris/include/asm/sections.h index 2c998ce8967b..2c998ce8967b 100644 --- a/include/asm-cris/sections.h +++ b/arch/cris/include/asm/sections.h diff --git a/include/asm-cris/segment.h b/arch/cris/include/asm/segment.h index c067513beaaf..c067513beaaf 100644 --- a/include/asm-cris/segment.h +++ b/arch/cris/include/asm/segment.h diff --git a/include/asm-cris/sembuf.h b/arch/cris/include/asm/sembuf.h index 7fed9843796d..7fed9843796d 100644 --- a/include/asm-cris/sembuf.h +++ b/arch/cris/include/asm/sembuf.h diff --git a/include/asm-cris/setup.h b/arch/cris/include/asm/setup.h index b90728652d1a..b90728652d1a 100644 --- a/include/asm-cris/setup.h +++ b/arch/cris/include/asm/setup.h diff --git a/include/asm-cris/shmbuf.h b/arch/cris/include/asm/shmbuf.h index 3239e3f000e8..3239e3f000e8 100644 --- a/include/asm-cris/shmbuf.h +++ b/arch/cris/include/asm/shmbuf.h diff --git a/include/asm-cris/shmparam.h b/arch/cris/include/asm/shmparam.h index d29d12270687..d29d12270687 100644 --- a/include/asm-cris/shmparam.h +++ b/arch/cris/include/asm/shmparam.h diff --git a/include/asm-cris/sigcontext.h b/arch/cris/include/asm/sigcontext.h index a1d634e120df..a1d634e120df 100644 --- a/include/asm-cris/sigcontext.h +++ b/arch/cris/include/asm/sigcontext.h diff --git a/include/asm-cris/siginfo.h b/arch/cris/include/asm/siginfo.h index c1cd6d16928b..c1cd6d16928b 100644 --- a/include/asm-cris/siginfo.h +++ b/arch/cris/include/asm/siginfo.h diff --git a/include/asm-cris/signal.h b/arch/cris/include/asm/signal.h index 349ae682b568..349ae682b568 100644 --- a/include/asm-cris/signal.h +++ b/arch/cris/include/asm/signal.h diff --git a/include/asm-cris/smp.h b/arch/cris/include/asm/smp.h index dba33aba3e95..dba33aba3e95 100644 --- a/include/asm-cris/smp.h +++ b/arch/cris/include/asm/smp.h diff --git a/include/asm-cris/socket.h b/arch/cris/include/asm/socket.h index 9df0ca82f5de..9df0ca82f5de 100644 --- a/include/asm-cris/socket.h +++ b/arch/cris/include/asm/socket.h diff --git a/include/asm-cris/sockios.h b/arch/cris/include/asm/sockios.h index cfe7bfecf599..cfe7bfecf599 100644 --- a/include/asm-cris/sockios.h +++ b/arch/cris/include/asm/sockios.h diff --git a/arch/cris/include/asm/spinlock.h b/arch/cris/include/asm/spinlock.h new file mode 100644 index 000000000000..ed816b57face --- /dev/null +++ b/arch/cris/include/asm/spinlock.h @@ -0,0 +1 @@ +#include <arch/spinlock.h> diff --git a/include/asm-cris/stat.h b/arch/cris/include/asm/stat.h index 9e558cc3c43b..9e558cc3c43b 100644 --- a/include/asm-cris/stat.h +++ b/arch/cris/include/asm/stat.h diff --git a/include/asm-cris/statfs.h b/arch/cris/include/asm/statfs.h index fdaf921844bc..fdaf921844bc 100644 --- a/include/asm-cris/statfs.h +++ b/arch/cris/include/asm/statfs.h diff --git a/include/asm-cris/string.h b/arch/cris/include/asm/string.h index 691190e99a27..691190e99a27 100644 --- a/include/asm-cris/string.h +++ b/arch/cris/include/asm/string.h diff --git a/include/asm-cris/sync_serial.h b/arch/cris/include/asm/sync_serial.h index d87c24df2b38..d87c24df2b38 100644 --- a/include/asm-cris/sync_serial.h +++ b/arch/cris/include/asm/sync_serial.h diff --git a/include/asm-cris/system.h b/arch/cris/include/asm/system.h index 5bcfe5a10907..8657b084a922 100644 --- a/include/asm-cris/system.h +++ b/arch/cris/include/asm/system.h @@ -1,7 +1,7 @@ #ifndef __ASM_CRIS_SYSTEM_H #define __ASM_CRIS_SYSTEM_H -#include <asm/arch/system.h> +#include <arch/system.h> /* the switch_to macro calls resume, an asm function in entry.S which does the actual * task switching. diff --git a/include/asm-cris/termbits.h b/arch/cris/include/asm/termbits.h index 66e1a7492a0c..66e1a7492a0c 100644 --- a/include/asm-cris/termbits.h +++ b/arch/cris/include/asm/termbits.h diff --git a/include/asm-cris/termios.h b/arch/cris/include/asm/termios.h index b0124e6c2e41..b0124e6c2e41 100644 --- a/include/asm-cris/termios.h +++ b/arch/cris/include/asm/termios.h diff --git a/include/asm-cris/thread_info.h b/arch/cris/include/asm/thread_info.h index cee97f14af3b..bc5b2935ca53 100644 --- a/include/asm-cris/thread_info.h +++ b/arch/cris/include/asm/thread_info.h @@ -16,7 +16,7 @@ #ifndef __ASSEMBLY__ #include <asm/types.h> #include <asm/processor.h> -#include <asm/arch/thread_info.h> +#include <arch/thread_info.h> #include <asm/segment.h> #endif diff --git a/include/asm-cris/timex.h b/arch/cris/include/asm/timex.h index b92e0e80fe86..980924ae7518 100644 --- a/include/asm-cris/timex.h +++ b/arch/cris/include/asm/timex.h @@ -7,7 +7,7 @@ #ifndef _ASM_CRIS_TIMEX_H #define _ASM_CRIS_TIMEX_H -#include <asm/arch/timex.h> +#include <arch/timex.h> /* * We don't have a cycle-counter.. but we do not support SMP anyway where this is diff --git a/include/asm-cris/tlb.h b/arch/cris/include/asm/tlb.h index 7724246a2601..77384ea2f29d 100644 --- a/include/asm-cris/tlb.h +++ b/arch/cris/include/asm/tlb.h @@ -3,7 +3,7 @@ #include <linux/pagemap.h> -#include <asm/arch/tlb.h> +#include <arch/tlb.h> /* * cris doesn't need any special per-pte or diff --git a/include/asm-cris/tlbflush.h b/arch/cris/include/asm/tlbflush.h index 20697e7ef4f2..20697e7ef4f2 100644 --- a/include/asm-cris/tlbflush.h +++ b/arch/cris/include/asm/tlbflush.h diff --git a/include/asm-cris/topology.h b/arch/cris/include/asm/topology.h index 2ac613d32a89..2ac613d32a89 100644 --- a/include/asm-cris/topology.h +++ b/arch/cris/include/asm/topology.h diff --git a/include/asm-cris/types.h b/arch/cris/include/asm/types.h index 5790262cbe8a..5790262cbe8a 100644 --- a/include/asm-cris/types.h +++ b/arch/cris/include/asm/types.h diff --git a/include/asm-cris/uaccess.h b/arch/cris/include/asm/uaccess.h index ea11eaf0e922..914540801c5e 100644 --- a/include/asm-cris/uaccess.h +++ b/arch/cris/include/asm/uaccess.h @@ -54,7 +54,7 @@ #define __access_ok(addr,size) (__kernel_ok || __user_ok((addr),(size))) #define access_ok(type,addr,size) __access_ok((unsigned long)(addr),(size)) -#include <asm/arch/uaccess.h> +#include <arch/uaccess.h> /* * The exception table consists of pairs of addresses: the first is the diff --git a/include/asm-cris/ucontext.h b/arch/cris/include/asm/ucontext.h index eed6ad5eb3f2..eed6ad5eb3f2 100644 --- a/include/asm-cris/ucontext.h +++ b/arch/cris/include/asm/ucontext.h diff --git a/include/asm-cris/unaligned.h b/arch/cris/include/asm/unaligned.h index 7b3f3fec567c..7b3f3fec567c 100644 --- a/include/asm-cris/unaligned.h +++ b/arch/cris/include/asm/unaligned.h diff --git a/include/asm-cris/unistd.h b/arch/cris/include/asm/unistd.h index 76398ef87e9b..235d076379d5 100644 --- a/include/asm-cris/unistd.h +++ b/arch/cris/include/asm/unistd.h @@ -336,7 +336,7 @@ #define NR_syscalls 327 -#include <asm/arch/unistd.h> +#include <arch/unistd.h> #define __ARCH_WANT_IPC_PARSE_VERSION #define __ARCH_WANT_OLD_READDIR diff --git a/include/asm-cris/user.h b/arch/cris/include/asm/user.h index 73e60fcbcf38..59147cf43cf6 100644 --- a/include/asm-cris/user.h +++ b/arch/cris/include/asm/user.h @@ -4,7 +4,7 @@ #include <linux/types.h> #include <asm/ptrace.h> #include <asm/page.h> -#include <asm/arch/user.h> +#include <arch/user.h> /* * Core file format: The core file is written in such a way that gdb diff --git a/arch/cris/mm/ioremap.c b/arch/cris/mm/ioremap.c index 8b0b9348b574..f9ca44bdea20 100644 --- a/arch/cris/mm/ioremap.c +++ b/arch/cris/mm/ioremap.c @@ -12,7 +12,7 @@ #include <linux/vmalloc.h> #include <linux/io.h> #include <asm/pgalloc.h> -#include <asm/arch/memmap.h> +#include <arch/memmap.h> /* * Generic mapping function (not visible outside): diff --git a/drivers/net/cris/eth_v10.c b/drivers/net/cris/eth_v10.c index 65d0a9103297..7e8a63106bdf 100644 --- a/drivers/net/cris/eth_v10.c +++ b/drivers/net/cris/eth_v10.c @@ -32,14 +32,14 @@ #include <linux/skbuff.h> #include <linux/ethtool.h> -#include <asm/arch/svinto.h>/* DMA and register descriptions */ +#include <arch/svinto.h>/* DMA and register descriptions */ #include <asm/io.h> /* CRIS_LED_* I/O functions */ #include <asm/irq.h> #include <asm/dma.h> #include <asm/system.h> #include <asm/ethernet.h> #include <asm/cache.h> -#include <asm/arch/io_interface_mux.h> +#include <arch/io_interface_mux.h> //#define ETHDEBUG #define D(x) diff --git a/drivers/serial/crisv10.c b/drivers/serial/crisv10.c index 211c21797ce0..8b2c619a09f2 100644 --- a/drivers/serial/crisv10.c +++ b/drivers/serial/crisv10.c @@ -34,14 +34,14 @@ static char *serial_version = "$Revision: 1.25 $"; #include <asm/system.h> #include <linux/delay.h> -#include <asm/arch/svinto.h> +#include <arch/svinto.h> /* non-arch dependent serial structures are in linux/serial.h */ #include <linux/serial.h> /* while we keep our own stuff (struct e100_serial) in a local .h file */ #include "crisv10.h" #include <asm/fasttimer.h> -#include <asm/arch/io_interface_mux.h> +#include <arch/io_interface_mux.h> #ifdef CONFIG_ETRAX_SERIAL_FAST_TIMER #ifndef CONFIG_ETRAX_FAST_TIMER diff --git a/drivers/serial/crisv10.h b/drivers/serial/crisv10.h index e3c5c8c3c09b..f36a729280bc 100644 --- a/drivers/serial/crisv10.h +++ b/drivers/serial/crisv10.h @@ -10,7 +10,7 @@ #include <linux/circ_buf.h> #include <asm/termios.h> #include <asm/dma.h> -#include <asm/arch/io_interface_mux.h> +#include <arch/io_interface_mux.h> /* Software state per channel */ diff --git a/include/asm-cris/arch-v32/arbiter.h b/include/asm-cris/arch-v32/arbiter.h deleted file mode 100644 index 081a911d7af1..000000000000 --- a/include/asm-cris/arch-v32/arbiter.h +++ /dev/null @@ -1,30 +0,0 @@ -#ifndef _ASM_CRIS_ARCH_ARBITER_H -#define _ASM_CRIS_ARCH_ARBITER_H - -#define EXT_REGION 0 -#define INT_REGION 1 - -typedef void (watch_callback)(void); - -enum -{ - arbiter_all_dmas = 0x3ff, - arbiter_cpu = 0xc00, - arbiter_all_clients = 0x3fff -}; - -enum -{ - arbiter_all_read = 0x55, - arbiter_all_write = 0xaa, - arbiter_all_accesses = 0xff -}; - -int crisv32_arbiter_allocate_bandwidth(int client, int region, - unsigned long bandwidth); -int crisv32_arbiter_watch(unsigned long start, unsigned long size, - unsigned long clients, unsigned long accesses, - watch_callback* cb); -int crisv32_arbiter_unwatch(int id); - -#endif diff --git a/include/asm-cris/arch-v32/hwregs/asm/pinmux_defs_asm.h b/include/asm-cris/arch-v32/hwregs/asm/pinmux_defs_asm.h deleted file mode 100644 index 13c725e4c774..000000000000 --- a/include/asm-cris/arch-v32/hwregs/asm/pinmux_defs_asm.h +++ /dev/null @@ -1,632 +0,0 @@ -#ifndef __pinmux_defs_asm_h -#define __pinmux_defs_asm_h - -/* - * This file is autogenerated from - * file: ../../inst/pinmux/rtl/guinness/pinmux_regs.r - * id: pinmux_regs.r,v 1.40 2005/02/09 16:22:59 perz Exp - * last modfied: Mon Apr 11 16:09:11 2005 - * - * by /n/asic/design/tools/rdesc/src/rdes2c -asm --outfile asm/pinmux_defs_asm.h ../../inst/pinmux/rtl/guinness/pinmux_regs.r - * id: $Id: pinmux_defs_asm.h,v 1.1 2005/04/24 18:31:04 starvik Exp $ - * Any changes here will be lost. - * - * -*- buffer-read-only: t -*- - */ - -#ifndef REG_FIELD -#define REG_FIELD( scope, reg, field, value ) \ - REG_FIELD_X_( value, reg_##scope##_##reg##___##field##___lsb ) -#define REG_FIELD_X_( value, shift ) ((value) << shift) -#endif - -#ifndef REG_STATE -#define REG_STATE( scope, reg, field, symbolic_value ) \ - REG_STATE_X_( regk_##scope##_##symbolic_value, reg_##scope##_##reg##___##field##___lsb ) -#define REG_STATE_X_( k, shift ) (k << shift) -#endif - -#ifndef REG_MASK -#define REG_MASK( scope, reg, field ) \ - REG_MASK_X_( reg_##scope##_##reg##___##field##___width, reg_##scope##_##reg##___##field##___lsb ) -#define REG_MASK_X_( width, lsb ) (((1 << width)-1) << lsb) -#endif - -#ifndef REG_LSB -#define REG_LSB( scope, reg, field ) reg_##scope##_##reg##___##field##___lsb -#endif - -#ifndef REG_BIT -#define REG_BIT( scope, reg, field ) reg_##scope##_##reg##___##field##___bit -#endif - -#ifndef REG_ADDR -#define REG_ADDR( scope, inst, reg ) REG_ADDR_X_(inst, reg_##scope##_##reg##_offset) -#define REG_ADDR_X_( inst, offs ) ((inst) + offs) -#endif - -#ifndef REG_ADDR_VECT -#define REG_ADDR_VECT( scope, inst, reg, index ) \ - REG_ADDR_VECT_X_(inst, reg_##scope##_##reg##_offset, index, \ - STRIDE_##scope##_##reg ) -#define REG_ADDR_VECT_X_( inst, offs, index, stride ) \ - ((inst) + offs + (index) * stride) -#endif - -/* Register rw_pa, scope pinmux, type rw */ -#define reg_pinmux_rw_pa___pa0___lsb 0 -#define reg_pinmux_rw_pa___pa0___width 1 -#define reg_pinmux_rw_pa___pa0___bit 0 -#define reg_pinmux_rw_pa___pa1___lsb 1 -#define reg_pinmux_rw_pa___pa1___width 1 -#define reg_pinmux_rw_pa___pa1___bit 1 -#define reg_pinmux_rw_pa___pa2___lsb 2 -#define reg_pinmux_rw_pa___pa2___width 1 -#define reg_pinmux_rw_pa___pa2___bit 2 -#define reg_pinmux_rw_pa___pa3___lsb 3 -#define reg_pinmux_rw_pa___pa3___width 1 -#define reg_pinmux_rw_pa___pa3___bit 3 -#define reg_pinmux_rw_pa___pa4___lsb 4 -#define reg_pinmux_rw_pa___pa4___width 1 -#define reg_pinmux_rw_pa___pa4___bit 4 -#define reg_pinmux_rw_pa___pa5___lsb 5 -#define reg_pinmux_rw_pa___pa5___width 1 -#define reg_pinmux_rw_pa___pa5___bit 5 -#define reg_pinmux_rw_pa___pa6___lsb 6 -#define reg_pinmux_rw_pa___pa6___width 1 -#define reg_pinmux_rw_pa___pa6___bit 6 -#define reg_pinmux_rw_pa___pa7___lsb 7 -#define reg_pinmux_rw_pa___pa7___width 1 -#define reg_pinmux_rw_pa___pa7___bit 7 -#define reg_pinmux_rw_pa___csp2_n___lsb 8 -#define reg_pinmux_rw_pa___csp2_n___width 1 -#define reg_pinmux_rw_pa___csp2_n___bit 8 -#define reg_pinmux_rw_pa___csp3_n___lsb 9 -#define reg_pinmux_rw_pa___csp3_n___width 1 -#define reg_pinmux_rw_pa___csp3_n___bit 9 -#define reg_pinmux_rw_pa___csp5_n___lsb 10 -#define reg_pinmux_rw_pa___csp5_n___width 1 -#define reg_pinmux_rw_pa___csp5_n___bit 10 -#define reg_pinmux_rw_pa___csp6_n___lsb 11 -#define reg_pinmux_rw_pa___csp6_n___width 1 -#define reg_pinmux_rw_pa___csp6_n___bit 11 -#define reg_pinmux_rw_pa___hsh4___lsb 12 -#define reg_pinmux_rw_pa___hsh4___width 1 -#define reg_pinmux_rw_pa___hsh4___bit 12 -#define reg_pinmux_rw_pa___hsh5___lsb 13 -#define reg_pinmux_rw_pa___hsh5___width 1 -#define reg_pinmux_rw_pa___hsh5___bit 13 -#define reg_pinmux_rw_pa___hsh6___lsb 14 -#define reg_pinmux_rw_pa___hsh6___width 1 -#define reg_pinmux_rw_pa___hsh6___bit 14 -#define reg_pinmux_rw_pa___hsh7___lsb 15 -#define reg_pinmux_rw_pa___hsh7___width 1 -#define reg_pinmux_rw_pa___hsh7___bit 15 -#define reg_pinmux_rw_pa_offset 0 - -/* Register rw_hwprot, scope pinmux, type rw */ -#define reg_pinmux_rw_hwprot___ser1___lsb 0 -#define reg_pinmux_rw_hwprot___ser1___width 1 -#define reg_pinmux_rw_hwprot___ser1___bit 0 -#define reg_pinmux_rw_hwprot___ser2___lsb 1 -#define reg_pinmux_rw_hwprot___ser2___width 1 -#define reg_pinmux_rw_hwprot___ser2___bit 1 -#define reg_pinmux_rw_hwprot___ser3___lsb 2 -#define reg_pinmux_rw_hwprot___ser3___width 1 -#define reg_pinmux_rw_hwprot___ser3___bit 2 -#define reg_pinmux_rw_hwprot___sser0___lsb 3 -#define reg_pinmux_rw_hwprot___sser0___width 1 -#define reg_pinmux_rw_hwprot___sser0___bit 3 -#define reg_pinmux_rw_hwprot___sser1___lsb 4 -#define reg_pinmux_rw_hwprot___sser1___width 1 -#define reg_pinmux_rw_hwprot___sser1___bit 4 -#define reg_pinmux_rw_hwprot___ata0___lsb 5 -#define reg_pinmux_rw_hwprot___ata0___width 1 -#define reg_pinmux_rw_hwprot___ata0___bit 5 -#define reg_pinmux_rw_hwprot___ata1___lsb 6 -#define reg_pinmux_rw_hwprot___ata1___width 1 -#define reg_pinmux_rw_hwprot___ata1___bit 6 -#define reg_pinmux_rw_hwprot___ata2___lsb 7 -#define reg_pinmux_rw_hwprot___ata2___width 1 -#define reg_pinmux_rw_hwprot___ata2___bit 7 -#define reg_pinmux_rw_hwprot___ata3___lsb 8 -#define reg_pinmux_rw_hwprot___ata3___width 1 -#define reg_pinmux_rw_hwprot___ata3___bit 8 -#define reg_pinmux_rw_hwprot___ata___lsb 9 -#define reg_pinmux_rw_hwprot___ata___width 1 -#define reg_pinmux_rw_hwprot___ata___bit 9 -#define reg_pinmux_rw_hwprot___eth1___lsb 10 -#define reg_pinmux_rw_hwprot___eth1___width 1 -#define reg_pinmux_rw_hwprot___eth1___bit 10 -#define reg_pinmux_rw_hwprot___eth1_mgm___lsb 11 -#define reg_pinmux_rw_hwprot___eth1_mgm___width 1 -#define reg_pinmux_rw_hwprot___eth1_mgm___bit 11 -#define reg_pinmux_rw_hwprot___timer___lsb 12 -#define reg_pinmux_rw_hwprot___timer___width 1 -#define reg_pinmux_rw_hwprot___timer___bit 12 -#define reg_pinmux_rw_hwprot___p21___lsb 13 -#define reg_pinmux_rw_hwprot___p21___width 1 -#define reg_pinmux_rw_hwprot___p21___bit 13 -#define reg_pinmux_rw_hwprot_offset 4 - -/* Register rw_pb_gio, scope pinmux, type rw */ -#define reg_pinmux_rw_pb_gio___pb0___lsb 0 -#define reg_pinmux_rw_pb_gio___pb0___width 1 -#define reg_pinmux_rw_pb_gio___pb0___bit 0 -#define reg_pinmux_rw_pb_gio___pb1___lsb 1 -#define reg_pinmux_rw_pb_gio___pb1___width 1 -#define reg_pinmux_rw_pb_gio___pb1___bit 1 -#define reg_pinmux_rw_pb_gio___pb2___lsb 2 -#define reg_pinmux_rw_pb_gio___pb2___width 1 -#define reg_pinmux_rw_pb_gio___pb2___bit 2 -#define reg_pinmux_rw_pb_gio___pb3___lsb 3 -#define reg_pinmux_rw_pb_gio___pb3___width 1 -#define reg_pinmux_rw_pb_gio___pb3___bit 3 -#define reg_pinmux_rw_pb_gio___pb4___lsb 4 -#define reg_pinmux_rw_pb_gio___pb4___width 1 -#define reg_pinmux_rw_pb_gio___pb4___bit 4 -#define reg_pinmux_rw_pb_gio___pb5___lsb 5 -#define reg_pinmux_rw_pb_gio___pb5___width 1 -#define reg_pinmux_rw_pb_gio___pb5___bit 5 -#define reg_pinmux_rw_pb_gio___pb6___lsb 6 -#define reg_pinmux_rw_pb_gio___pb6___width 1 -#define reg_pinmux_rw_pb_gio___pb6___bit 6 -#define reg_pinmux_rw_pb_gio___pb7___lsb 7 -#define reg_pinmux_rw_pb_gio___pb7___width 1 -#define reg_pinmux_rw_pb_gio___pb7___bit 7 -#define reg_pinmux_rw_pb_gio___pb8___lsb 8 -#define reg_pinmux_rw_pb_gio___pb8___width 1 -#define reg_pinmux_rw_pb_gio___pb8___bit 8 -#define reg_pinmux_rw_pb_gio___pb9___lsb 9 -#define reg_pinmux_rw_pb_gio___pb9___width 1 -#define reg_pinmux_rw_pb_gio___pb9___bit 9 -#define reg_pinmux_rw_pb_gio___pb10___lsb 10 -#define reg_pinmux_rw_pb_gio___pb10___width 1 -#define reg_pinmux_rw_pb_gio___pb10___bit 10 -#define reg_pinmux_rw_pb_gio___pb11___lsb 11 -#define reg_pinmux_rw_pb_gio___pb11___width 1 -#define reg_pinmux_rw_pb_gio___pb11___bit 11 -#define reg_pinmux_rw_pb_gio___pb12___lsb 12 -#define reg_pinmux_rw_pb_gio___pb12___width 1 -#define reg_pinmux_rw_pb_gio___pb12___bit 12 -#define reg_pinmux_rw_pb_gio___pb13___lsb 13 -#define reg_pinmux_rw_pb_gio___pb13___width 1 -#define reg_pinmux_rw_pb_gio___pb13___bit 13 -#define reg_pinmux_rw_pb_gio___pb14___lsb 14 -#define reg_pinmux_rw_pb_gio___pb14___width 1 -#define reg_pinmux_rw_pb_gio___pb14___bit 14 -#define reg_pinmux_rw_pb_gio___pb15___lsb 15 -#define reg_pinmux_rw_pb_gio___pb15___width 1 -#define reg_pinmux_rw_pb_gio___pb15___bit 15 -#define reg_pinmux_rw_pb_gio___pb16___lsb 16 -#define reg_pinmux_rw_pb_gio___pb16___width 1 -#define reg_pinmux_rw_pb_gio___pb16___bit 16 -#define reg_pinmux_rw_pb_gio___pb17___lsb 17 -#define reg_pinmux_rw_pb_gio___pb17___width 1 -#define reg_pinmux_rw_pb_gio___pb17___bit 17 -#define reg_pinmux_rw_pb_gio_offset 8 - -/* Register rw_pb_iop, scope pinmux, type rw */ -#define reg_pinmux_rw_pb_iop___pb0___lsb 0 -#define reg_pinmux_rw_pb_iop___pb0___width 1 -#define reg_pinmux_rw_pb_iop___pb0___bit 0 -#define reg_pinmux_rw_pb_iop___pb1___lsb 1 -#define reg_pinmux_rw_pb_iop___pb1___width 1 -#define reg_pinmux_rw_pb_iop___pb1___bit 1 -#define reg_pinmux_rw_pb_iop___pb2___lsb 2 -#define reg_pinmux_rw_pb_iop___pb2___width 1 -#define reg_pinmux_rw_pb_iop___pb2___bit 2 -#define reg_pinmux_rw_pb_iop___pb3___lsb 3 -#define reg_pinmux_rw_pb_iop___pb3___width 1 -#define reg_pinmux_rw_pb_iop___pb3___bit 3 -#define reg_pinmux_rw_pb_iop___pb4___lsb 4 -#define reg_pinmux_rw_pb_iop___pb4___width 1 -#define reg_pinmux_rw_pb_iop___pb4___bit 4 -#define reg_pinmux_rw_pb_iop___pb5___lsb 5 -#define reg_pinmux_rw_pb_iop___pb5___width 1 -#define reg_pinmux_rw_pb_iop___pb5___bit 5 -#define reg_pinmux_rw_pb_iop___pb6___lsb 6 -#define reg_pinmux_rw_pb_iop___pb6___width 1 -#define reg_pinmux_rw_pb_iop___pb6___bit 6 -#define reg_pinmux_rw_pb_iop___pb7___lsb 7 -#define reg_pinmux_rw_pb_iop___pb7___width 1 -#define reg_pinmux_rw_pb_iop___pb7___bit 7 -#define reg_pinmux_rw_pb_iop___pb8___lsb 8 -#define reg_pinmux_rw_pb_iop___pb8___width 1 -#define reg_pinmux_rw_pb_iop___pb8___bit 8 -#define reg_pinmux_rw_pb_iop___pb9___lsb 9 -#define reg_pinmux_rw_pb_iop___pb9___width 1 -#define reg_pinmux_rw_pb_iop___pb9___bit 9 -#define reg_pinmux_rw_pb_iop___pb10___lsb 10 -#define reg_pinmux_rw_pb_iop___pb10___width 1 -#define reg_pinmux_rw_pb_iop___pb10___bit 10 -#define reg_pinmux_rw_pb_iop___pb11___lsb 11 -#define reg_pinmux_rw_pb_iop___pb11___width 1 -#define reg_pinmux_rw_pb_iop___pb11___bit 11 -#define reg_pinmux_rw_pb_iop___pb12___lsb 12 -#define reg_pinmux_rw_pb_iop___pb12___width 1 -#define reg_pinmux_rw_pb_iop___pb12___bit 12 -#define reg_pinmux_rw_pb_iop___pb13___lsb 13 -#define reg_pinmux_rw_pb_iop___pb13___width 1 -#define reg_pinmux_rw_pb_iop___pb13___bit 13 -#define reg_pinmux_rw_pb_iop___pb14___lsb 14 -#define reg_pinmux_rw_pb_iop___pb14___width 1 -#define reg_pinmux_rw_pb_iop___pb14___bit 14 -#define reg_pinmux_rw_pb_iop___pb15___lsb 15 -#define reg_pinmux_rw_pb_iop___pb15___width 1 -#define reg_pinmux_rw_pb_iop___pb15___bit 15 -#define reg_pinmux_rw_pb_iop___pb16___lsb 16 -#define reg_pinmux_rw_pb_iop___pb16___width 1 -#define reg_pinmux_rw_pb_iop___pb16___bit 16 -#define reg_pinmux_rw_pb_iop___pb17___lsb 17 -#define reg_pinmux_rw_pb_iop___pb17___width 1 -#define reg_pinmux_rw_pb_iop___pb17___bit 17 -#define reg_pinmux_rw_pb_iop_offset 12 - -/* Register rw_pc_gio, scope pinmux, type rw */ -#define reg_pinmux_rw_pc_gio___pc0___lsb 0 -#define reg_pinmux_rw_pc_gio___pc0___width 1 -#define reg_pinmux_rw_pc_gio___pc0___bit 0 -#define reg_pinmux_rw_pc_gio___pc1___lsb 1 -#define reg_pinmux_rw_pc_gio___pc1___width 1 -#define reg_pinmux_rw_pc_gio___pc1___bit 1 -#define reg_pinmux_rw_pc_gio___pc2___lsb 2 -#define reg_pinmux_rw_pc_gio___pc2___width 1 -#define reg_pinmux_rw_pc_gio___pc2___bit 2 -#define reg_pinmux_rw_pc_gio___pc3___lsb 3 -#define reg_pinmux_rw_pc_gio___pc3___width 1 -#define reg_pinmux_rw_pc_gio___pc3___bit 3 -#define reg_pinmux_rw_pc_gio___pc4___lsb 4 -#define reg_pinmux_rw_pc_gio___pc4___width 1 -#define reg_pinmux_rw_pc_gio___pc4___bit 4 -#define reg_pinmux_rw_pc_gio___pc5___lsb 5 -#define reg_pinmux_rw_pc_gio___pc5___width 1 -#define reg_pinmux_rw_pc_gio___pc5___bit 5 -#define reg_pinmux_rw_pc_gio___pc6___lsb 6 -#define reg_pinmux_rw_pc_gio___pc6___width 1 -#define reg_pinmux_rw_pc_gio___pc6___bit 6 -#define reg_pinmux_rw_pc_gio___pc7___lsb 7 -#define reg_pinmux_rw_pc_gio___pc7___width 1 -#define reg_pinmux_rw_pc_gio___pc7___bit 7 -#define reg_pinmux_rw_pc_gio___pc8___lsb 8 -#define reg_pinmux_rw_pc_gio___pc8___width 1 -#define reg_pinmux_rw_pc_gio___pc8___bit 8 -#define reg_pinmux_rw_pc_gio___pc9___lsb 9 -#define reg_pinmux_rw_pc_gio___pc9___width 1 -#define reg_pinmux_rw_pc_gio___pc9___bit 9 -#define reg_pinmux_rw_pc_gio___pc10___lsb 10 -#define reg_pinmux_rw_pc_gio___pc10___width 1 -#define reg_pinmux_rw_pc_gio___pc10___bit 10 -#define reg_pinmux_rw_pc_gio___pc11___lsb 11 -#define reg_pinmux_rw_pc_gio___pc11___width 1 -#define reg_pinmux_rw_pc_gio___pc11___bit 11 -#define reg_pinmux_rw_pc_gio___pc12___lsb 12 -#define reg_pinmux_rw_pc_gio___pc12___width 1 -#define reg_pinmux_rw_pc_gio___pc12___bit 12 -#define reg_pinmux_rw_pc_gio___pc13___lsb 13 -#define reg_pinmux_rw_pc_gio___pc13___width 1 -#define reg_pinmux_rw_pc_gio___pc13___bit 13 -#define reg_pinmux_rw_pc_gio___pc14___lsb 14 -#define reg_pinmux_rw_pc_gio___pc14___width 1 -#define reg_pinmux_rw_pc_gio___pc14___bit 14 -#define reg_pinmux_rw_pc_gio___pc15___lsb 15 -#define reg_pinmux_rw_pc_gio___pc15___width 1 -#define reg_pinmux_rw_pc_gio___pc15___bit 15 -#define reg_pinmux_rw_pc_gio___pc16___lsb 16 -#define reg_pinmux_rw_pc_gio___pc16___width 1 -#define reg_pinmux_rw_pc_gio___pc16___bit 16 -#define reg_pinmux_rw_pc_gio___pc17___lsb 17 -#define reg_pinmux_rw_pc_gio___pc17___width 1 -#define reg_pinmux_rw_pc_gio___pc17___bit 17 -#define reg_pinmux_rw_pc_gio_offset 16 - -/* Register rw_pc_iop, scope pinmux, type rw */ -#define reg_pinmux_rw_pc_iop___pc0___lsb 0 -#define reg_pinmux_rw_pc_iop___pc0___width 1 -#define reg_pinmux_rw_pc_iop___pc0___bit 0 -#define reg_pinmux_rw_pc_iop___pc1___lsb 1 -#define reg_pinmux_rw_pc_iop___pc1___width 1 -#define reg_pinmux_rw_pc_iop___pc1___bit 1 -#define reg_pinmux_rw_pc_iop___pc2___lsb 2 -#define reg_pinmux_rw_pc_iop___pc2___width 1 -#define reg_pinmux_rw_pc_iop___pc2___bit 2 -#define reg_pinmux_rw_pc_iop___pc3___lsb 3 -#define reg_pinmux_rw_pc_iop___pc3___width 1 -#define reg_pinmux_rw_pc_iop___pc3___bit 3 -#define reg_pinmux_rw_pc_iop___pc4___lsb 4 -#define reg_pinmux_rw_pc_iop___pc4___width 1 -#define reg_pinmux_rw_pc_iop___pc4___bit 4 -#define reg_pinmux_rw_pc_iop___pc5___lsb 5 -#define reg_pinmux_rw_pc_iop___pc5___width 1 -#define reg_pinmux_rw_pc_iop___pc5___bit 5 -#define reg_pinmux_rw_pc_iop___pc6___lsb 6 -#define reg_pinmux_rw_pc_iop___pc6___width 1 -#define reg_pinmux_rw_pc_iop___pc6___bit 6 -#define reg_pinmux_rw_pc_iop___pc7___lsb 7 -#define reg_pinmux_rw_pc_iop___pc7___width 1 -#define reg_pinmux_rw_pc_iop___pc7___bit 7 -#define reg_pinmux_rw_pc_iop___pc8___lsb 8 -#define reg_pinmux_rw_pc_iop___pc8___width 1 -#define reg_pinmux_rw_pc_iop___pc8___bit 8 -#define reg_pinmux_rw_pc_iop___pc9___lsb 9 -#define reg_pinmux_rw_pc_iop___pc9___width 1 -#define reg_pinmux_rw_pc_iop___pc9___bit 9 -#define reg_pinmux_rw_pc_iop___pc10___lsb 10 -#define reg_pinmux_rw_pc_iop___pc10___width 1 -#define reg_pinmux_rw_pc_iop___pc10___bit 10 -#define reg_pinmux_rw_pc_iop___pc11___lsb 11 -#define reg_pinmux_rw_pc_iop___pc11___width 1 -#define reg_pinmux_rw_pc_iop___pc11___bit 11 -#define reg_pinmux_rw_pc_iop___pc12___lsb 12 -#define reg_pinmux_rw_pc_iop___pc12___width 1 -#define reg_pinmux_rw_pc_iop___pc12___bit 12 -#define reg_pinmux_rw_pc_iop___pc13___lsb 13 -#define reg_pinmux_rw_pc_iop___pc13___width 1 -#define reg_pinmux_rw_pc_iop___pc13___bit 13 -#define reg_pinmux_rw_pc_iop___pc14___lsb 14 -#define reg_pinmux_rw_pc_iop___pc14___width 1 -#define reg_pinmux_rw_pc_iop___pc14___bit 14 -#define reg_pinmux_rw_pc_iop___pc15___lsb 15 -#define reg_pinmux_rw_pc_iop___pc15___width 1 -#define reg_pinmux_rw_pc_iop___pc15___bit 15 -#define reg_pinmux_rw_pc_iop___pc16___lsb 16 -#define reg_pinmux_rw_pc_iop___pc16___width 1 -#define reg_pinmux_rw_pc_iop___pc16___bit 16 -#define reg_pinmux_rw_pc_iop___pc17___lsb 17 -#define reg_pinmux_rw_pc_iop___pc17___width 1 -#define reg_pinmux_rw_pc_iop___pc17___bit 17 -#define reg_pinmux_rw_pc_iop_offset 20 - -/* Register rw_pd_gio, scope pinmux, type rw */ -#define reg_pinmux_rw_pd_gio___pd0___lsb 0 -#define reg_pinmux_rw_pd_gio___pd0___width 1 -#define reg_pinmux_rw_pd_gio___pd0___bit 0 -#define reg_pinmux_rw_pd_gio___pd1___lsb 1 -#define reg_pinmux_rw_pd_gio___pd1___width 1 -#define reg_pinmux_rw_pd_gio___pd1___bit 1 -#define reg_pinmux_rw_pd_gio___pd2___lsb 2 -#define reg_pinmux_rw_pd_gio___pd2___width 1 -#define reg_pinmux_rw_pd_gio___pd2___bit 2 -#define reg_pinmux_rw_pd_gio___pd3___lsb 3 -#define reg_pinmux_rw_pd_gio___pd3___width 1 -#define reg_pinmux_rw_pd_gio___pd3___bit 3 -#define reg_pinmux_rw_pd_gio___pd4___lsb 4 -#define reg_pinmux_rw_pd_gio___pd4___width 1 -#define reg_pinmux_rw_pd_gio___pd4___bit 4 -#define reg_pinmux_rw_pd_gio___pd5___lsb 5 -#define reg_pinmux_rw_pd_gio___pd5___width 1 -#define reg_pinmux_rw_pd_gio___pd5___bit 5 -#define reg_pinmux_rw_pd_gio___pd6___lsb 6 -#define reg_pinmux_rw_pd_gio___pd6___width 1 -#define reg_pinmux_rw_pd_gio___pd6___bit 6 -#define reg_pinmux_rw_pd_gio___pd7___lsb 7 -#define reg_pinmux_rw_pd_gio___pd7___width 1 -#define reg_pinmux_rw_pd_gio___pd7___bit 7 -#define reg_pinmux_rw_pd_gio___pd8___lsb 8 -#define reg_pinmux_rw_pd_gio___pd8___width 1 -#define reg_pinmux_rw_pd_gio___pd8___bit 8 -#define reg_pinmux_rw_pd_gio___pd9___lsb 9 -#define reg_pinmux_rw_pd_gio___pd9___width 1 -#define reg_pinmux_rw_pd_gio___pd9___bit 9 -#define reg_pinmux_rw_pd_gio___pd10___lsb 10 -#define reg_pinmux_rw_pd_gio___pd10___width 1 -#define reg_pinmux_rw_pd_gio___pd10___bit 10 -#define reg_pinmux_rw_pd_gio___pd11___lsb 11 -#define reg_pinmux_rw_pd_gio___pd11___width 1 -#define reg_pinmux_rw_pd_gio___pd11___bit 11 -#define reg_pinmux_rw_pd_gio___pd12___lsb 12 -#define reg_pinmux_rw_pd_gio___pd12___width 1 -#define reg_pinmux_rw_pd_gio___pd12___bit 12 -#define reg_pinmux_rw_pd_gio___pd13___lsb 13 -#define reg_pinmux_rw_pd_gio___pd13___width 1 -#define reg_pinmux_rw_pd_gio___pd13___bit 13 -#define reg_pinmux_rw_pd_gio___pd14___lsb 14 -#define reg_pinmux_rw_pd_gio___pd14___width 1 -#define reg_pinmux_rw_pd_gio___pd14___bit 14 -#define reg_pinmux_rw_pd_gio___pd15___lsb 15 -#define reg_pinmux_rw_pd_gio___pd15___width 1 -#define reg_pinmux_rw_pd_gio___pd15___bit 15 -#define reg_pinmux_rw_pd_gio___pd16___lsb 16 -#define reg_pinmux_rw_pd_gio___pd16___width 1 -#define reg_pinmux_rw_pd_gio___pd16___bit 16 -#define reg_pinmux_rw_pd_gio___pd17___lsb 17 -#define reg_pinmux_rw_pd_gio___pd17___width 1 -#define reg_pinmux_rw_pd_gio___pd17___bit 17 -#define reg_pinmux_rw_pd_gio_offset 24 - -/* Register rw_pd_iop, scope pinmux, type rw */ -#define reg_pinmux_rw_pd_iop___pd0___lsb 0 -#define reg_pinmux_rw_pd_iop___pd0___width 1 -#define reg_pinmux_rw_pd_iop___pd0___bit 0 -#define reg_pinmux_rw_pd_iop___pd1___lsb 1 -#define reg_pinmux_rw_pd_iop___pd1___width 1 -#define reg_pinmux_rw_pd_iop___pd1___bit 1 -#define reg_pinmux_rw_pd_iop___pd2___lsb 2 -#define reg_pinmux_rw_pd_iop___pd2___width 1 -#define reg_pinmux_rw_pd_iop___pd2___bit 2 -#define reg_pinmux_rw_pd_iop___pd3___lsb 3 -#define reg_pinmux_rw_pd_iop___pd3___width 1 -#define reg_pinmux_rw_pd_iop___pd3___bit 3 -#define reg_pinmux_rw_pd_iop___pd4___lsb 4 -#define reg_pinmux_rw_pd_iop___pd4___width 1 -#define reg_pinmux_rw_pd_iop___pd4___bit 4 -#define reg_pinmux_rw_pd_iop___pd5___lsb 5 -#define reg_pinmux_rw_pd_iop___pd5___width 1 -#define reg_pinmux_rw_pd_iop___pd5___bit 5 -#define reg_pinmux_rw_pd_iop___pd6___lsb 6 -#define reg_pinmux_rw_pd_iop___pd6___width 1 -#define reg_pinmux_rw_pd_iop___pd6___bit 6 -#define reg_pinmux_rw_pd_iop___pd7___lsb 7 -#define reg_pinmux_rw_pd_iop___pd7___width 1 -#define reg_pinmux_rw_pd_iop___pd7___bit 7 -#define reg_pinmux_rw_pd_iop___pd8___lsb 8 -#define reg_pinmux_rw_pd_iop___pd8___width 1 -#define reg_pinmux_rw_pd_iop___pd8___bit 8 -#define reg_pinmux_rw_pd_iop___pd9___lsb 9 -#define reg_pinmux_rw_pd_iop___pd9___width 1 -#define reg_pinmux_rw_pd_iop___pd9___bit 9 -#define reg_pinmux_rw_pd_iop___pd10___lsb 10 -#define reg_pinmux_rw_pd_iop___pd10___width 1 -#define reg_pinmux_rw_pd_iop___pd10___bit 10 -#define reg_pinmux_rw_pd_iop___pd11___lsb 11 -#define reg_pinmux_rw_pd_iop___pd11___width 1 -#define reg_pinmux_rw_pd_iop___pd11___bit 11 -#define reg_pinmux_rw_pd_iop___pd12___lsb 12 -#define reg_pinmux_rw_pd_iop___pd12___width 1 -#define reg_pinmux_rw_pd_iop___pd12___bit 12 -#define reg_pinmux_rw_pd_iop___pd13___lsb 13 -#define reg_pinmux_rw_pd_iop___pd13___width 1 -#define reg_pinmux_rw_pd_iop___pd13___bit 13 -#define reg_pinmux_rw_pd_iop___pd14___lsb 14 -#define reg_pinmux_rw_pd_iop___pd14___width 1 -#define reg_pinmux_rw_pd_iop___pd14___bit 14 -#define reg_pinmux_rw_pd_iop___pd15___lsb 15 -#define reg_pinmux_rw_pd_iop___pd15___width 1 -#define reg_pinmux_rw_pd_iop___pd15___bit 15 -#define reg_pinmux_rw_pd_iop___pd16___lsb 16 -#define reg_pinmux_rw_pd_iop___pd16___width 1 -#define reg_pinmux_rw_pd_iop___pd16___bit 16 -#define reg_pinmux_rw_pd_iop___pd17___lsb 17 -#define reg_pinmux_rw_pd_iop___pd17___width 1 -#define reg_pinmux_rw_pd_iop___pd17___bit 17 -#define reg_pinmux_rw_pd_iop_offset 28 - -/* Register rw_pe_gio, scope pinmux, type rw */ -#define reg_pinmux_rw_pe_gio___pe0___lsb 0 -#define reg_pinmux_rw_pe_gio___pe0___width 1 -#define reg_pinmux_rw_pe_gio___pe0___bit 0 -#define reg_pinmux_rw_pe_gio___pe1___lsb 1 -#define reg_pinmux_rw_pe_gio___pe1___width 1 -#define reg_pinmux_rw_pe_gio___pe1___bit 1 -#define reg_pinmux_rw_pe_gio___pe2___lsb 2 -#define reg_pinmux_rw_pe_gio___pe2___width 1 -#define reg_pinmux_rw_pe_gio___pe2___bit 2 -#define reg_pinmux_rw_pe_gio___pe3___lsb 3 -#define reg_pinmux_rw_pe_gio___pe3___width 1 -#define reg_pinmux_rw_pe_gio___pe3___bit 3 -#define reg_pinmux_rw_pe_gio___pe4___lsb 4 -#define reg_pinmux_rw_pe_gio___pe4___width 1 -#define reg_pinmux_rw_pe_gio___pe4___bit 4 -#define reg_pinmux_rw_pe_gio___pe5___lsb 5 -#define reg_pinmux_rw_pe_gio___pe5___width 1 -#define reg_pinmux_rw_pe_gio___pe5___bit 5 -#define reg_pinmux_rw_pe_gio___pe6___lsb 6 -#define reg_pinmux_rw_pe_gio___pe6___width 1 -#define reg_pinmux_rw_pe_gio___pe6___bit 6 -#define reg_pinmux_rw_pe_gio___pe7___lsb 7 -#define reg_pinmux_rw_pe_gio___pe7___width 1 -#define reg_pinmux_rw_pe_gio___pe7___bit 7 -#define reg_pinmux_rw_pe_gio___pe8___lsb 8 -#define reg_pinmux_rw_pe_gio___pe8___width 1 -#define reg_pinmux_rw_pe_gio___pe8___bit 8 -#define reg_pinmux_rw_pe_gio___pe9___lsb 9 -#define reg_pinmux_rw_pe_gio___pe9___width 1 -#define reg_pinmux_rw_pe_gio___pe9___bit 9 -#define reg_pinmux_rw_pe_gio___pe10___lsb 10 -#define reg_pinmux_rw_pe_gio___pe10___width 1 -#define reg_pinmux_rw_pe_gio___pe10___bit 10 -#define reg_pinmux_rw_pe_gio___pe11___lsb 11 -#define reg_pinmux_rw_pe_gio___pe11___width 1 -#define reg_pinmux_rw_pe_gio___pe11___bit 11 -#define reg_pinmux_rw_pe_gio___pe12___lsb 12 -#define reg_pinmux_rw_pe_gio___pe12___width 1 -#define reg_pinmux_rw_pe_gio___pe12___bit 12 -#define reg_pinmux_rw_pe_gio___pe13___lsb 13 -#define reg_pinmux_rw_pe_gio___pe13___width 1 -#define reg_pinmux_rw_pe_gio___pe13___bit 13 -#define reg_pinmux_rw_pe_gio___pe14___lsb 14 -#define reg_pinmux_rw_pe_gio___pe14___width 1 -#define reg_pinmux_rw_pe_gio___pe14___bit 14 -#define reg_pinmux_rw_pe_gio___pe15___lsb 15 -#define reg_pinmux_rw_pe_gio___pe15___width 1 -#define reg_pinmux_rw_pe_gio___pe15___bit 15 -#define reg_pinmux_rw_pe_gio___pe16___lsb 16 -#define reg_pinmux_rw_pe_gio___pe16___width 1 -#define reg_pinmux_rw_pe_gio___pe16___bit 16 -#define reg_pinmux_rw_pe_gio___pe17___lsb 17 -#define reg_pinmux_rw_pe_gio___pe17___width 1 -#define reg_pinmux_rw_pe_gio___pe17___bit 17 -#define reg_pinmux_rw_pe_gio_offset 32 - -/* Register rw_pe_iop, scope pinmux, type rw */ -#define reg_pinmux_rw_pe_iop___pe0___lsb 0 -#define reg_pinmux_rw_pe_iop___pe0___width 1 -#define reg_pinmux_rw_pe_iop___pe0___bit 0 -#define reg_pinmux_rw_pe_iop___pe1___lsb 1 -#define reg_pinmux_rw_pe_iop___pe1___width 1 -#define reg_pinmux_rw_pe_iop___pe1___bit 1 -#define reg_pinmux_rw_pe_iop___pe2___lsb 2 -#define reg_pinmux_rw_pe_iop___pe2___width 1 -#define reg_pinmux_rw_pe_iop___pe2___bit 2 -#define reg_pinmux_rw_pe_iop___pe3___lsb 3 -#define reg_pinmux_rw_pe_iop___pe3___width 1 -#define reg_pinmux_rw_pe_iop___pe3___bit 3 -#define reg_pinmux_rw_pe_iop___pe4___lsb 4 -#define reg_pinmux_rw_pe_iop___pe4___width 1 -#define reg_pinmux_rw_pe_iop___pe4___bit 4 -#define reg_pinmux_rw_pe_iop___pe5___lsb 5 -#define reg_pinmux_rw_pe_iop___pe5___width 1 -#define reg_pinmux_rw_pe_iop___pe5___bit 5 -#define reg_pinmux_rw_pe_iop___pe6___lsb 6 -#define reg_pinmux_rw_pe_iop___pe6___width 1 -#define reg_pinmux_rw_pe_iop___pe6___bit 6 -#define reg_pinmux_rw_pe_iop___pe7___lsb 7 -#define reg_pinmux_rw_pe_iop___pe7___width 1 -#define reg_pinmux_rw_pe_iop___pe7___bit 7 -#define reg_pinmux_rw_pe_iop___pe8___lsb 8 -#define reg_pinmux_rw_pe_iop___pe8___width 1 -#define reg_pinmux_rw_pe_iop___pe8___bit 8 -#define reg_pinmux_rw_pe_iop___pe9___lsb 9 -#define reg_pinmux_rw_pe_iop___pe9___width 1 -#define reg_pinmux_rw_pe_iop___pe9___bit 9 -#define reg_pinmux_rw_pe_iop___pe10___lsb 10 -#define reg_pinmux_rw_pe_iop___pe10___width 1 -#define reg_pinmux_rw_pe_iop___pe10___bit 10 -#define reg_pinmux_rw_pe_iop___pe11___lsb 11 -#define reg_pinmux_rw_pe_iop___pe11___width 1 -#define reg_pinmux_rw_pe_iop___pe11___bit 11 -#define reg_pinmux_rw_pe_iop___pe12___lsb 12 -#define reg_pinmux_rw_pe_iop___pe12___width 1 -#define reg_pinmux_rw_pe_iop___pe12___bit 12 -#define reg_pinmux_rw_pe_iop___pe13___lsb 13 -#define reg_pinmux_rw_pe_iop___pe13___width 1 -#define reg_pinmux_rw_pe_iop___pe13___bit 13 -#define reg_pinmux_rw_pe_iop___pe14___lsb 14 -#define reg_pinmux_rw_pe_iop___pe14___width 1 -#define reg_pinmux_rw_pe_iop___pe14___bit 14 -#define reg_pinmux_rw_pe_iop___pe15___lsb 15 -#define reg_pinmux_rw_pe_iop___pe15___width 1 -#define reg_pinmux_rw_pe_iop___pe15___bit 15 -#define reg_pinmux_rw_pe_iop___pe16___lsb 16 -#define reg_pinmux_rw_pe_iop___pe16___width 1 -#define reg_pinmux_rw_pe_iop___pe16___bit 16 -#define reg_pinmux_rw_pe_iop___pe17___lsb 17 -#define reg_pinmux_rw_pe_iop___pe17___width 1 -#define reg_pinmux_rw_pe_iop___pe17___bit 17 -#define reg_pinmux_rw_pe_iop_offset 36 - -/* Register rw_usb_phy, scope pinmux, type rw */ -#define reg_pinmux_rw_usb_phy___en_usb0___lsb 0 -#define reg_pinmux_rw_usb_phy___en_usb0___width 1 -#define reg_pinmux_rw_usb_phy___en_usb0___bit 0 -#define reg_pinmux_rw_usb_phy___en_usb1___lsb 1 -#define reg_pinmux_rw_usb_phy___en_usb1___width 1 -#define reg_pinmux_rw_usb_phy___en_usb1___bit 1 -#define reg_pinmux_rw_usb_phy_offset 40 - - -/* Constants */ -#define regk_pinmux_no 0x00000000 -#define regk_pinmux_rw_hwprot_default 0x00000000 -#define regk_pinmux_rw_pa_default 0x00000000 -#define regk_pinmux_rw_pb_gio_default 0x00000000 -#define regk_pinmux_rw_pb_iop_default 0x00000000 -#define regk_pinmux_rw_pc_gio_default 0x00000000 -#define regk_pinmux_rw_pc_iop_default 0x00000000 -#define regk_pinmux_rw_pd_gio_default 0x00000000 -#define regk_pinmux_rw_pd_iop_default 0x00000000 -#define regk_pinmux_rw_pe_gio_default 0x00000000 -#define regk_pinmux_rw_pe_iop_default 0x00000000 -#define regk_pinmux_rw_usb_phy_default 0x00000000 -#define regk_pinmux_yes 0x00000001 -#endif /* __pinmux_defs_asm_h */ diff --git a/include/asm-cris/arch-v32/hwregs/asm/reg_map_asm.h b/include/asm-cris/arch-v32/hwregs/asm/reg_map_asm.h deleted file mode 100644 index 76959b70cd2c..000000000000 --- a/include/asm-cris/arch-v32/hwregs/asm/reg_map_asm.h +++ /dev/null @@ -1,96 +0,0 @@ -#ifndef __reg_map_h -#define __reg_map_h - -/* - * This file is autogenerated from - * file: ../../mod/fakereg.rmap - * id: fakereg.rmap,v 1.3 2004/02/11 19:53:22 ronny Exp - * last modified: Wed Feb 11 20:53:25 2004 - * file: ../../rtl/global.rmap - * id: global.rmap,v 1.3 2003/08/18 15:08:23 mikaeln Exp - * last modified: Mon Aug 18 17:08:23 2003 - * file: ../../mod/modreg.rmap - * id: modreg.rmap,v 1.31 2004/02/20 15:40:04 stefans Exp - * last modified: Fri Feb 20 16:40:04 2004 - * - * by /n/asic/design/tools/rdesc/src/rdes2c -asm --outfile asm/reg_map_asm.h -base 0xb0000000 ../../rtl/global.rmap ../../mod/modreg.rmap ../../inst/memarb/rtl/guinness/marb_top.r ../../mod/fakereg.rmap - * id: $Id: reg_map_asm.h,v 1.1 2005/04/24 18:31:04 starvik Exp $ - * Any changes here will be lost. - * - * -*- buffer-read-only: t -*- - */ -#define regi_artpec_mod 0xb7044000 -#define regi_ata 0xb0032000 -#define regi_ata_mod 0xb7006000 -#define regi_barber 0xb701a000 -#define regi_bif_core 0xb0014000 -#define regi_bif_dma 0xb0016000 -#define regi_bif_slave 0xb0018000 -#define regi_bif_slave_ext 0xac000000 -#define regi_bus_master 0xb703c000 -#define regi_config 0xb003c000 -#define regi_dma0 0xb0000000 -#define regi_dma1 0xb0002000 -#define regi_dma2 0xb0004000 -#define regi_dma3 0xb0006000 -#define regi_dma4 0xb0008000 -#define regi_dma5 0xb000a000 -#define regi_dma6 0xb000c000 -#define regi_dma7 0xb000e000 -#define regi_dma8 0xb0010000 -#define regi_dma9 0xb0012000 -#define regi_eth0 0xb0034000 -#define regi_eth1 0xb0036000 -#define regi_eth_mod 0xb7004000 -#define regi_eth_mod1 0xb701c000 -#define regi_eth_strmod 0xb7008000 -#define regi_eth_strmod1 0xb7032000 -#define regi_ext_dma 0xb703a000 -#define regi_ext_mem 0xb7046000 -#define regi_gen_io 0xb7016000 -#define regi_gio 0xb001a000 -#define regi_hook 0xb7000000 -#define regi_iop 0xb0020000 -#define regi_irq 0xb001c000 -#define regi_irq_nmi 0xb701e000 -#define regi_marb 0xb003e000 -#define regi_marb_bp0 0xb003e240 -#define regi_marb_bp1 0xb003e280 -#define regi_marb_bp2 0xb003e2c0 -#define regi_marb_bp3 0xb003e300 -#define regi_nand_mod 0xb7014000 -#define regi_p21 0xb002e000 -#define regi_p21_mod 0xb7042000 -#define regi_pci_mod 0xb7010000 -#define regi_pin_test 0xb7018000 -#define regi_pinmux 0xb0038000 -#define regi_sdram_chk 0xb703e000 -#define regi_sdram_mod 0xb7012000 -#define regi_ser0 0xb0026000 -#define regi_ser1 0xb0028000 -#define regi_ser2 0xb002a000 -#define regi_ser3 0xb002c000 -#define regi_ser_mod0 0xb7020000 -#define regi_ser_mod1 0xb7022000 -#define regi_ser_mod2 0xb7024000 -#define regi_ser_mod3 0xb7026000 -#define regi_smif_stat 0xb700e000 -#define regi_sser0 0xb0022000 -#define regi_sser1 0xb0024000 -#define regi_sser_mod0 0xb700a000 -#define regi_sser_mod1 0xb700c000 -#define regi_strcop 0xb0030000 -#define regi_strmux 0xb003a000 -#define regi_strmux_tst 0xb7040000 -#define regi_tap 0xb7002000 -#define regi_timer 0xb001e000 -#define regi_timer_mod 0xb7034000 -#define regi_trace 0xb0040000 -#define regi_usb0 0xb7028000 -#define regi_usb1 0xb702a000 -#define regi_usb2 0xb702c000 -#define regi_usb3 0xb702e000 -#define regi_usb_dev 0xb7030000 -#define regi_utmi_mod0 0xb7036000 -#define regi_utmi_mod1 0xb7038000 -#endif /* __reg_map_h */ diff --git a/include/asm-cris/arch-v32/hwregs/gio_defs.h b/include/asm-cris/arch-v32/hwregs/gio_defs.h deleted file mode 100644 index 3e9a0b25366f..000000000000 --- a/include/asm-cris/arch-v32/hwregs/gio_defs.h +++ /dev/null @@ -1,295 +0,0 @@ -#ifndef __gio_defs_h -#define __gio_defs_h - -/* - * This file is autogenerated from - * file: ../../inst/gio/rtl/gio_regs.r - * id: gio_regs.r,v 1.5 2005/02/04 09:43:21 perz Exp - * last modfied: Mon Apr 11 16:07:47 2005 - * - * by /n/asic/design/tools/rdesc/src/rdes2c --outfile gio_defs.h ../../inst/gio/rtl/gio_regs.r - * id: $Id: gio_defs.h,v 1.6 2005/04/24 18:30:58 starvik Exp $ - * Any changes here will be lost. - * - * -*- buffer-read-only: t -*- - */ -/* Main access macros */ -#ifndef REG_RD -#define REG_RD( scope, inst, reg ) \ - REG_READ( reg_##scope##_##reg, \ - (inst) + REG_RD_ADDR_##scope##_##reg ) -#endif - -#ifndef REG_WR -#define REG_WR( scope, inst, reg, val ) \ - REG_WRITE( reg_##scope##_##reg, \ - (inst) + REG_WR_ADDR_##scope##_##reg, (val) ) -#endif - -#ifndef REG_RD_VECT -#define REG_RD_VECT( scope, inst, reg, index ) \ - REG_READ( reg_##scope##_##reg, \ - (inst) + REG_RD_ADDR_##scope##_##reg + \ - (index) * STRIDE_##scope##_##reg ) -#endif - -#ifndef REG_WR_VECT -#define REG_WR_VECT( scope, inst, reg, index, val ) \ - REG_WRITE( reg_##scope##_##reg, \ - (inst) + REG_WR_ADDR_##scope##_##reg + \ - (index) * STRIDE_##scope##_##reg, (val) ) -#endif - -#ifndef REG_RD_INT -#define REG_RD_INT( scope, inst, reg ) \ - REG_READ( int, (inst) + REG_RD_ADDR_##scope##_##reg ) -#endif - -#ifndef REG_WR_INT -#define REG_WR_INT( scope, inst, reg, val ) \ - REG_WRITE( int, (inst) + REG_WR_ADDR_##scope##_##reg, (val) ) -#endif - -#ifndef REG_RD_INT_VECT -#define REG_RD_INT_VECT( scope, inst, reg, index ) \ - REG_READ( int, (inst) + REG_RD_ADDR_##scope##_##reg + \ - (index) * STRIDE_##scope##_##reg ) -#endif - -#ifndef REG_WR_INT_VECT -#define REG_WR_INT_VECT( scope, inst, reg, index, val ) \ - REG_WRITE( int, (inst) + REG_WR_ADDR_##scope##_##reg + \ - (index) * STRIDE_##scope##_##reg, (val) ) -#endif - -#ifndef REG_TYPE_CONV -#define REG_TYPE_CONV( type, orgtype, val ) \ - ( { union { orgtype o; type n; } r; r.o = val; r.n; } ) -#endif - -#ifndef reg_page_size -#define reg_page_size 8192 -#endif - -#ifndef REG_ADDR -#define REG_ADDR( scope, inst, reg ) \ - ( (inst) + REG_RD_ADDR_##scope##_##reg ) -#endif - -#ifndef REG_ADDR_VECT -#define REG_ADDR_VECT( scope, inst, reg, index ) \ - ( (inst) + REG_RD_ADDR_##scope##_##reg + \ - (index) * STRIDE_##scope##_##reg ) -#endif - -/* C-code for register scope gio */ - -/* Register rw_pa_dout, scope gio, type rw */ -typedef struct { - unsigned int data : 8; - unsigned int dummy1 : 24; -} reg_gio_rw_pa_dout; -#define REG_RD_ADDR_gio_rw_pa_dout 0 -#define REG_WR_ADDR_gio_rw_pa_dout 0 - -/* Register r_pa_din, scope gio, type r */ -typedef struct { - unsigned int data : 8; - unsigned int dummy1 : 24; -} reg_gio_r_pa_din; -#define REG_RD_ADDR_gio_r_pa_din 4 - -/* Register rw_pa_oe, scope gio, type rw */ -typedef struct { - unsigned int oe : 8; - unsigned int dummy1 : 24; -} reg_gio_rw_pa_oe; -#define REG_RD_ADDR_gio_rw_pa_oe 8 -#define REG_WR_ADDR_gio_rw_pa_oe 8 - -/* Register rw_intr_cfg, scope gio, type rw */ -typedef struct { - unsigned int pa0 : 3; - unsigned int pa1 : 3; - unsigned int pa2 : 3; - unsigned int pa3 : 3; - unsigned int pa4 : 3; - unsigned int pa5 : 3; - unsigned int pa6 : 3; - unsigned int pa7 : 3; - unsigned int dummy1 : 8; -} reg_gio_rw_intr_cfg; -#define REG_RD_ADDR_gio_rw_intr_cfg 12 -#define REG_WR_ADDR_gio_rw_intr_cfg 12 - -/* Register rw_intr_mask, scope gio, type rw */ -typedef struct { - unsigned int pa0 : 1; - unsigned int pa1 : 1; - unsigned int pa2 : 1; - unsigned int pa3 : 1; - unsigned int pa4 : 1; - unsigned int pa5 : 1; - unsigned int pa6 : 1; - unsigned int pa7 : 1; - unsigned int dummy1 : 24; -} reg_gio_rw_intr_mask; -#define REG_RD_ADDR_gio_rw_intr_mask 16 -#define REG_WR_ADDR_gio_rw_intr_mask 16 - -/* Register rw_ack_intr, scope gio, type rw */ -typedef struct { - unsigned int pa0 : 1; - unsigned int pa1 : 1; - unsigned int pa2 : 1; - unsigned int pa3 : 1; - unsigned int pa4 : 1; - unsigned int pa5 : 1; - unsigned int pa6 : 1; - unsigned int pa7 : 1; - unsigned int dummy1 : 24; -} reg_gio_rw_ack_intr; -#define REG_RD_ADDR_gio_rw_ack_intr 20 -#define REG_WR_ADDR_gio_rw_ack_intr 20 - -/* Register r_intr, scope gio, type r */ -typedef struct { - unsigned int pa0 : 1; - unsigned int pa1 : 1; - unsigned int pa2 : 1; - unsigned int pa3 : 1; - unsigned int pa4 : 1; - unsigned int pa5 : 1; - unsigned int pa6 : 1; - unsigned int pa7 : 1; - unsigned int dummy1 : 24; -} reg_gio_r_intr; -#define REG_RD_ADDR_gio_r_intr 24 - -/* Register r_masked_intr, scope gio, type r */ -typedef struct { - unsigned int pa0 : 1; - unsigned int pa1 : 1; - unsigned int pa2 : 1; - unsigned int pa3 : 1; - unsigned int pa4 : 1; - unsigned int pa5 : 1; - unsigned int pa6 : 1; - unsigned int pa7 : 1; - unsigned int dummy1 : 24; -} reg_gio_r_masked_intr; -#define REG_RD_ADDR_gio_r_masked_intr 28 - -/* Register rw_pb_dout, scope gio, type rw */ -typedef struct { - unsigned int data : 18; - unsigned int dummy1 : 14; -} reg_gio_rw_pb_dout; -#define REG_RD_ADDR_gio_rw_pb_dout 32 -#define REG_WR_ADDR_gio_rw_pb_dout 32 - -/* Register r_pb_din, scope gio, type r */ -typedef struct { - unsigned int data : 18; - unsigned int dummy1 : 14; -} reg_gio_r_pb_din; -#define REG_RD_ADDR_gio_r_pb_din 36 - -/* Register rw_pb_oe, scope gio, type rw */ -typedef struct { - unsigned int oe : 18; - unsigned int dummy1 : 14; -} reg_gio_rw_pb_oe; -#define REG_RD_ADDR_gio_rw_pb_oe 40 -#define REG_WR_ADDR_gio_rw_pb_oe 40 - -/* Register rw_pc_dout, scope gio, type rw */ -typedef struct { - unsigned int data : 18; - unsigned int dummy1 : 14; -} reg_gio_rw_pc_dout; -#define REG_RD_ADDR_gio_rw_pc_dout 48 -#define REG_WR_ADDR_gio_rw_pc_dout 48 - -/* Register r_pc_din, scope gio, type r */ -typedef struct { - unsigned int data : 18; - unsigned int dummy1 : 14; -} reg_gio_r_pc_din; -#define REG_RD_ADDR_gio_r_pc_din 52 - -/* Register rw_pc_oe, scope gio, type rw */ -typedef struct { - unsigned int oe : 18; - unsigned int dummy1 : 14; -} reg_gio_rw_pc_oe; -#define REG_RD_ADDR_gio_rw_pc_oe 56 -#define REG_WR_ADDR_gio_rw_pc_oe 56 - -/* Register rw_pd_dout, scope gio, type rw */ -typedef struct { - unsigned int data : 18; - unsigned int dummy1 : 14; -} reg_gio_rw_pd_dout; -#define REG_RD_ADDR_gio_rw_pd_dout 64 -#define REG_WR_ADDR_gio_rw_pd_dout 64 - -/* Register r_pd_din, scope gio, type r */ -typedef struct { - unsigned int data : 18; - unsigned int dummy1 : 14; -} reg_gio_r_pd_din; -#define REG_RD_ADDR_gio_r_pd_din 68 - -/* Register rw_pd_oe, scope gio, type rw */ -typedef struct { - unsigned int oe : 18; - unsigned int dummy1 : 14; -} reg_gio_rw_pd_oe; -#define REG_RD_ADDR_gio_rw_pd_oe 72 -#define REG_WR_ADDR_gio_rw_pd_oe 72 - -/* Register rw_pe_dout, scope gio, type rw */ -typedef struct { - unsigned int data : 18; - unsigned int dummy1 : 14; -} reg_gio_rw_pe_dout; -#define REG_RD_ADDR_gio_rw_pe_dout 80 -#define REG_WR_ADDR_gio_rw_pe_dout 80 - -/* Register r_pe_din, scope gio, type r */ -typedef struct { - unsigned int data : 18; - unsigned int dummy1 : 14; -} reg_gio_r_pe_din; -#define REG_RD_ADDR_gio_r_pe_din 84 - -/* Register rw_pe_oe, scope gio, type rw */ -typedef struct { - unsigned int oe : 18; - unsigned int dummy1 : 14; -} reg_gio_rw_pe_oe; -#define REG_RD_ADDR_gio_rw_pe_oe 88 -#define REG_WR_ADDR_gio_rw_pe_oe 88 - - -/* Constants */ -enum { - regk_gio_anyedge = 0x00000007, - regk_gio_hi = 0x00000001, - regk_gio_lo = 0x00000002, - regk_gio_negedge = 0x00000006, - regk_gio_no = 0x00000000, - regk_gio_off = 0x00000000, - regk_gio_posedge = 0x00000005, - regk_gio_rw_intr_cfg_default = 0x00000000, - regk_gio_rw_intr_mask_default = 0x00000000, - regk_gio_rw_pa_oe_default = 0x00000000, - regk_gio_rw_pb_oe_default = 0x00000000, - regk_gio_rw_pc_oe_default = 0x00000000, - regk_gio_rw_pd_oe_default = 0x00000000, - regk_gio_rw_pe_oe_default = 0x00000000, - regk_gio_set = 0x00000003, - regk_gio_yes = 0x00000001 -}; -#endif /* __gio_defs_h */ diff --git a/include/asm-cris/arch-v32/hwregs/intr_vect.h b/include/asm-cris/arch-v32/hwregs/intr_vect.h deleted file mode 100644 index 5c1b28fb205d..000000000000 --- a/include/asm-cris/arch-v32/hwregs/intr_vect.h +++ /dev/null @@ -1,39 +0,0 @@ -/* Interrupt vector numbers autogenerated by /n/asic/design/tools/rdesc/src/rdes2intr version - from ../../inst/intr_vect/rtl/guinness/ivmask.config.r -version . */ - -#ifndef _______INST_INTR_VECT_RTL_GUINNESS_IVMASK_CONFIG_R -#define _______INST_INTR_VECT_RTL_GUINNESS_IVMASK_CONFIG_R -#define MEMARB_INTR_VECT 0x31 -#define GEN_IO_INTR_VECT 0x32 -#define IOP0_INTR_VECT 0x33 -#define IOP1_INTR_VECT 0x34 -#define IOP2_INTR_VECT 0x35 -#define IOP3_INTR_VECT 0x36 -#define DMA0_INTR_VECT 0x37 -#define DMA1_INTR_VECT 0x38 -#define DMA2_INTR_VECT 0x39 -#define DMA3_INTR_VECT 0x3a -#define DMA4_INTR_VECT 0x3b -#define DMA5_INTR_VECT 0x3c -#define DMA6_INTR_VECT 0x3d -#define DMA7_INTR_VECT 0x3e -#define DMA8_INTR_VECT 0x3f -#define DMA9_INTR_VECT 0x40 -#define ATA_INTR_VECT 0x41 -#define SSER0_INTR_VECT 0x42 -#define SSER1_INTR_VECT 0x43 -#define SER0_INTR_VECT 0x44 -#define SER1_INTR_VECT 0x45 -#define SER2_INTR_VECT 0x46 -#define SER3_INTR_VECT 0x47 -#define P21_INTR_VECT 0x48 -#define ETH0_INTR_VECT 0x49 -#define ETH1_INTR_VECT 0x4a -#define TIMER_INTR_VECT 0x4b -#define BIF_ARB_INTR_VECT 0x4c -#define BIF_DMA_INTR_VECT 0x4d -#define EXT_INTR_VECT 0x4e -#define IPI_INTR_VECT 0x4f - -#endif diff --git a/include/asm-cris/arch-v32/hwregs/pinmux_defs.h b/include/asm-cris/arch-v32/hwregs/pinmux_defs.h deleted file mode 100644 index 9d91c2de1b07..000000000000 --- a/include/asm-cris/arch-v32/hwregs/pinmux_defs.h +++ /dev/null @@ -1,357 +0,0 @@ -#ifndef __pinmux_defs_h -#define __pinmux_defs_h - -/* - * This file is autogenerated from - * file: ../../inst/pinmux/rtl/guinness/pinmux_regs.r - * id: pinmux_regs.r,v 1.40 2005/02/09 16:22:59 perz Exp - * last modfied: Mon Apr 11 16:09:11 2005 - * - * by /n/asic/design/tools/rdesc/src/rdes2c --outfile pinmux_defs.h ../../inst/pinmux/rtl/guinness/pinmux_regs.r - * id: $Id: pinmux_defs.h,v 1.3 2005/04/24 18:30:58 starvik Exp $ - * Any changes here will be lost. - * - * -*- buffer-read-only: t -*- - */ -/* Main access macros */ -#ifndef REG_RD -#define REG_RD( scope, inst, reg ) \ - REG_READ( reg_##scope##_##reg, \ - (inst) + REG_RD_ADDR_##scope##_##reg ) -#endif - -#ifndef REG_WR -#define REG_WR( scope, inst, reg, val ) \ - REG_WRITE( reg_##scope##_##reg, \ - (inst) + REG_WR_ADDR_##scope##_##reg, (val) ) -#endif - -#ifndef REG_RD_VECT -#define REG_RD_VECT( scope, inst, reg, index ) \ - REG_READ( reg_##scope##_##reg, \ - (inst) + REG_RD_ADDR_##scope##_##reg + \ - (index) * STRIDE_##scope##_##reg ) -#endif - -#ifndef REG_WR_VECT -#define REG_WR_VECT( scope, inst, reg, index, val ) \ - REG_WRITE( reg_##scope##_##reg, \ - (inst) + REG_WR_ADDR_##scope##_##reg + \ - (index) * STRIDE_##scope##_##reg, (val) ) -#endif - -#ifndef REG_RD_INT -#define REG_RD_INT( scope, inst, reg ) \ - REG_READ( int, (inst) + REG_RD_ADDR_##scope##_##reg ) -#endif - -#ifndef REG_WR_INT -#define REG_WR_INT( scope, inst, reg, val ) \ - REG_WRITE( int, (inst) + REG_WR_ADDR_##scope##_##reg, (val) ) -#endif - -#ifndef REG_RD_INT_VECT -#define REG_RD_INT_VECT( scope, inst, reg, index ) \ - REG_READ( int, (inst) + REG_RD_ADDR_##scope##_##reg + \ - (index) * STRIDE_##scope##_##reg ) -#endif - -#ifndef REG_WR_INT_VECT -#define REG_WR_INT_VECT( scope, inst, reg, index, val ) \ - REG_WRITE( int, (inst) + REG_WR_ADDR_##scope##_##reg + \ - (index) * STRIDE_##scope##_##reg, (val) ) -#endif - -#ifndef REG_TYPE_CONV -#define REG_TYPE_CONV( type, orgtype, val ) \ - ( { union { orgtype o; type n; } r; r.o = val; r.n; } ) -#endif - -#ifndef reg_page_size -#define reg_page_size 8192 -#endif - -#ifndef REG_ADDR -#define REG_ADDR( scope, inst, reg ) \ - ( (inst) + REG_RD_ADDR_##scope##_##reg ) -#endif - -#ifndef REG_ADDR_VECT -#define REG_ADDR_VECT( scope, inst, reg, index ) \ - ( (inst) + REG_RD_ADDR_##scope##_##reg + \ - (index) * STRIDE_##scope##_##reg ) -#endif - -/* C-code for register scope pinmux */ - -/* Register rw_pa, scope pinmux, type rw */ -typedef struct { - unsigned int pa0 : 1; - unsigned int pa1 : 1; - unsigned int pa2 : 1; - unsigned int pa3 : 1; - unsigned int pa4 : 1; - unsigned int pa5 : 1; - unsigned int pa6 : 1; - unsigned int pa7 : 1; - unsigned int csp2_n : 1; - unsigned int csp3_n : 1; - unsigned int csp5_n : 1; - unsigned int csp6_n : 1; - unsigned int hsh4 : 1; - unsigned int hsh5 : 1; - unsigned int hsh6 : 1; - unsigned int hsh7 : 1; - unsigned int dummy1 : 16; -} reg_pinmux_rw_pa; -#define REG_RD_ADDR_pinmux_rw_pa 0 -#define REG_WR_ADDR_pinmux_rw_pa 0 - -/* Register rw_hwprot, scope pinmux, type rw */ -typedef struct { - unsigned int ser1 : 1; - unsigned int ser2 : 1; - unsigned int ser3 : 1; - unsigned int sser0 : 1; - unsigned int sser1 : 1; - unsigned int ata0 : 1; - unsigned int ata1 : 1; - unsigned int ata2 : 1; - unsigned int ata3 : 1; - unsigned int ata : 1; - unsigned int eth1 : 1; - unsigned int eth1_mgm : 1; - unsigned int timer : 1; - unsigned int p21 : 1; - unsigned int dummy1 : 18; -} reg_pinmux_rw_hwprot; -#define REG_RD_ADDR_pinmux_rw_hwprot 4 -#define REG_WR_ADDR_pinmux_rw_hwprot 4 - -/* Register rw_pb_gio, scope pinmux, type rw */ -typedef struct { - unsigned int pb0 : 1; - unsigned int pb1 : 1; - unsigned int pb2 : 1; - unsigned int pb3 : 1; - unsigned int pb4 : 1; - unsigned int pb5 : 1; - unsigned int pb6 : 1; - unsigned int pb7 : 1; - unsigned int pb8 : 1; - unsigned int pb9 : 1; - unsigned int pb10 : 1; - unsigned int pb11 : 1; - unsigned int pb12 : 1; - unsigned int pb13 : 1; - unsigned int pb14 : 1; - unsigned int pb15 : 1; - unsigned int pb16 : 1; - unsigned int pb17 : 1; - unsigned int dummy1 : 14; -} reg_pinmux_rw_pb_gio; -#define REG_RD_ADDR_pinmux_rw_pb_gio 8 -#define REG_WR_ADDR_pinmux_rw_pb_gio 8 - -/* Register rw_pb_iop, scope pinmux, type rw */ -typedef struct { - unsigned int pb0 : 1; - unsigned int pb1 : 1; - unsigned int pb2 : 1; - unsigned int pb3 : 1; - unsigned int pb4 : 1; - unsigned int pb5 : 1; - unsigned int pb6 : 1; - unsigned int pb7 : 1; - unsigned int pb8 : 1; - unsigned int pb9 : 1; - unsigned int pb10 : 1; - unsigned int pb11 : 1; - unsigned int pb12 : 1; - unsigned int pb13 : 1; - unsigned int pb14 : 1; - unsigned int pb15 : 1; - unsigned int pb16 : 1; - unsigned int pb17 : 1; - unsigned int dummy1 : 14; -} reg_pinmux_rw_pb_iop; -#define REG_RD_ADDR_pinmux_rw_pb_iop 12 -#define REG_WR_ADDR_pinmux_rw_pb_iop 12 - -/* Register rw_pc_gio, scope pinmux, type rw */ -typedef struct { - unsigned int pc0 : 1; - unsigned int pc1 : 1; - unsigned int pc2 : 1; - unsigned int pc3 : 1; - unsigned int pc4 : 1; - unsigned int pc5 : 1; - unsigned int pc6 : 1; - unsigned int pc7 : 1; - unsigned int pc8 : 1; - unsigned int pc9 : 1; - unsigned int pc10 : 1; - unsigned int pc11 : 1; - unsigned int pc12 : 1; - unsigned int pc13 : 1; - unsigned int pc14 : 1; - unsigned int pc15 : 1; - unsigned int pc16 : 1; - unsigned int pc17 : 1; - unsigned int dummy1 : 14; -} reg_pinmux_rw_pc_gio; -#define REG_RD_ADDR_pinmux_rw_pc_gio 16 -#define REG_WR_ADDR_pinmux_rw_pc_gio 16 - -/* Register rw_pc_iop, scope pinmux, type rw */ -typedef struct { - unsigned int pc0 : 1; - unsigned int pc1 : 1; - unsigned int pc2 : 1; - unsigned int pc3 : 1; - unsigned int pc4 : 1; - unsigned int pc5 : 1; - unsigned int pc6 : 1; - unsigned int pc7 : 1; - unsigned int pc8 : 1; - unsigned int pc9 : 1; - unsigned int pc10 : 1; - unsigned int pc11 : 1; - unsigned int pc12 : 1; - unsigned int pc13 : 1; - unsigned int pc14 : 1; - unsigned int pc15 : 1; - unsigned int pc16 : 1; - unsigned int pc17 : 1; - unsigned int dummy1 : 14; -} reg_pinmux_rw_pc_iop; -#define REG_RD_ADDR_pinmux_rw_pc_iop 20 -#define REG_WR_ADDR_pinmux_rw_pc_iop 20 - -/* Register rw_pd_gio, scope pinmux, type rw */ -typedef struct { - unsigned int pd0 : 1; - unsigned int pd1 : 1; - unsigned int pd2 : 1; - unsigned int pd3 : 1; - unsigned int pd4 : 1; - unsigned int pd5 : 1; - unsigned int pd6 : 1; - unsigned int pd7 : 1; - unsigned int pd8 : 1; - unsigned int pd9 : 1; - unsigned int pd10 : 1; - unsigned int pd11 : 1; - unsigned int pd12 : 1; - unsigned int pd13 : 1; - unsigned int pd14 : 1; - unsigned int pd15 : 1; - unsigned int pd16 : 1; - unsigned int pd17 : 1; - unsigned int dummy1 : 14; -} reg_pinmux_rw_pd_gio; -#define REG_RD_ADDR_pinmux_rw_pd_gio 24 -#define REG_WR_ADDR_pinmux_rw_pd_gio 24 - -/* Register rw_pd_iop, scope pinmux, type rw */ -typedef struct { - unsigned int pd0 : 1; - unsigned int pd1 : 1; - unsigned int pd2 : 1; - unsigned int pd3 : 1; - unsigned int pd4 : 1; - unsigned int pd5 : 1; - unsigned int pd6 : 1; - unsigned int pd7 : 1; - unsigned int pd8 : 1; - unsigned int pd9 : 1; - unsigned int pd10 : 1; - unsigned int pd11 : 1; - unsigned int pd12 : 1; - unsigned int pd13 : 1; - unsigned int pd14 : 1; - unsigned int pd15 : 1; - unsigned int pd16 : 1; - unsigned int pd17 : 1; - unsigned int dummy1 : 14; -} reg_pinmux_rw_pd_iop; -#define REG_RD_ADDR_pinmux_rw_pd_iop 28 -#define REG_WR_ADDR_pinmux_rw_pd_iop 28 - -/* Register rw_pe_gio, scope pinmux, type rw */ -typedef struct { - unsigned int pe0 : 1; - unsigned int pe1 : 1; - unsigned int pe2 : 1; - unsigned int pe3 : 1; - unsigned int pe4 : 1; - unsigned int pe5 : 1; - unsigned int pe6 : 1; - unsigned int pe7 : 1; - unsigned int pe8 : 1; - unsigned int pe9 : 1; - unsigned int pe10 : 1; - unsigned int pe11 : 1; - unsigned int pe12 : 1; - unsigned int pe13 : 1; - unsigned int pe14 : 1; - unsigned int pe15 : 1; - unsigned int pe16 : 1; - unsigned int pe17 : 1; - unsigned int dummy1 : 14; -} reg_pinmux_rw_pe_gio; -#define REG_RD_ADDR_pinmux_rw_pe_gio 32 -#define REG_WR_ADDR_pinmux_rw_pe_gio 32 - -/* Register rw_pe_iop, scope pinmux, type rw */ -typedef struct { - unsigned int pe0 : 1; - unsigned int pe1 : 1; - unsigned int pe2 : 1; - unsigned int pe3 : 1; - unsigned int pe4 : 1; - unsigned int pe5 : 1; - unsigned int pe6 : 1; - unsigned int pe7 : 1; - unsigned int pe8 : 1; - unsigned int pe9 : 1; - unsigned int pe10 : 1; - unsigned int pe11 : 1; - unsigned int pe12 : 1; - unsigned int pe13 : 1; - unsigned int pe14 : 1; - unsigned int pe15 : 1; - unsigned int pe16 : 1; - unsigned int pe17 : 1; - unsigned int dummy1 : 14; -} reg_pinmux_rw_pe_iop; -#define REG_RD_ADDR_pinmux_rw_pe_iop 36 -#define REG_WR_ADDR_pinmux_rw_pe_iop 36 - -/* Register rw_usb_phy, scope pinmux, type rw */ -typedef struct { - unsigned int en_usb0 : 1; - unsigned int en_usb1 : 1; - unsigned int dummy1 : 30; -} reg_pinmux_rw_usb_phy; -#define REG_RD_ADDR_pinmux_rw_usb_phy 40 -#define REG_WR_ADDR_pinmux_rw_usb_phy 40 - - -/* Constants */ -enum { - regk_pinmux_no = 0x00000000, - regk_pinmux_rw_hwprot_default = 0x00000000, - regk_pinmux_rw_pa_default = 0x00000000, - regk_pinmux_rw_pb_gio_default = 0x00000000, - regk_pinmux_rw_pb_iop_default = 0x00000000, - regk_pinmux_rw_pc_gio_default = 0x00000000, - regk_pinmux_rw_pc_iop_default = 0x00000000, - regk_pinmux_rw_pd_gio_default = 0x00000000, - regk_pinmux_rw_pd_iop_default = 0x00000000, - regk_pinmux_rw_pe_gio_default = 0x00000000, - regk_pinmux_rw_pe_iop_default = 0x00000000, - regk_pinmux_rw_usb_phy_default = 0x00000000, - regk_pinmux_yes = 0x00000001 -}; -#endif /* __pinmux_defs_h */ diff --git a/include/asm-cris/arch-v32/hwregs/strmux_defs.h b/include/asm-cris/arch-v32/hwregs/strmux_defs.h deleted file mode 100644 index 67474855c499..000000000000 --- a/include/asm-cris/arch-v32/hwregs/strmux_defs.h +++ /dev/null @@ -1,127 +0,0 @@ -#ifndef __strmux_defs_h -#define __strmux_defs_h - -/* - * This file is autogenerated from - * file: ../../inst/strmux/rtl/guinness/strmux_regs.r - * id: strmux_regs.r,v 1.10 2005/02/10 10:10:46 perz Exp - * last modfied: Mon Apr 11 16:09:43 2005 - * - * by /n/asic/design/tools/rdesc/src/rdes2c --outfile strmux_defs.h ../../inst/strmux/rtl/guinness/strmux_regs.r - * id: $Id: strmux_defs.h,v 1.5 2005/04/24 18:30:58 starvik Exp $ - * Any changes here will be lost. - * - * -*- buffer-read-only: t -*- - */ -/* Main access macros */ -#ifndef REG_RD -#define REG_RD( scope, inst, reg ) \ - REG_READ( reg_##scope##_##reg, \ - (inst) + REG_RD_ADDR_##scope##_##reg ) -#endif - -#ifndef REG_WR -#define REG_WR( scope, inst, reg, val ) \ - REG_WRITE( reg_##scope##_##reg, \ - (inst) + REG_WR_ADDR_##scope##_##reg, (val) ) -#endif - -#ifndef REG_RD_VECT -#define REG_RD_VECT( scope, inst, reg, index ) \ - REG_READ( reg_##scope##_##reg, \ - (inst) + REG_RD_ADDR_##scope##_##reg + \ - (index) * STRIDE_##scope##_##reg ) -#endif - -#ifndef REG_WR_VECT -#define REG_WR_VECT( scope, inst, reg, index, val ) \ - REG_WRITE( reg_##scope##_##reg, \ - (inst) + REG_WR_ADDR_##scope##_##reg + \ - (index) * STRIDE_##scope##_##reg, (val) ) -#endif - -#ifndef REG_RD_INT -#define REG_RD_INT( scope, inst, reg ) \ - REG_READ( int, (inst) + REG_RD_ADDR_##scope##_##reg ) -#endif - -#ifndef REG_WR_INT -#define REG_WR_INT( scope, inst, reg, val ) \ - REG_WRITE( int, (inst) + REG_WR_ADDR_##scope##_##reg, (val) ) -#endif - -#ifndef REG_RD_INT_VECT -#define REG_RD_INT_VECT( scope, inst, reg, index ) \ - REG_READ( int, (inst) + REG_RD_ADDR_##scope##_##reg + \ - (index) * STRIDE_##scope##_##reg ) -#endif - -#ifndef REG_WR_INT_VECT -#define REG_WR_INT_VECT( scope, inst, reg, index, val ) \ - REG_WRITE( int, (inst) + REG_WR_ADDR_##scope##_##reg + \ - (index) * STRIDE_##scope##_##reg, (val) ) -#endif - -#ifndef REG_TYPE_CONV -#define REG_TYPE_CONV( type, orgtype, val ) \ - ( { union { orgtype o; type n; } r; r.o = val; r.n; } ) -#endif - -#ifndef reg_page_size -#define reg_page_size 8192 -#endif - -#ifndef REG_ADDR -#define REG_ADDR( scope, inst, reg ) \ - ( (inst) + REG_RD_ADDR_##scope##_##reg ) -#endif - -#ifndef REG_ADDR_VECT -#define REG_ADDR_VECT( scope, inst, reg, index ) \ - ( (inst) + REG_RD_ADDR_##scope##_##reg + \ - (index) * STRIDE_##scope##_##reg ) -#endif - -/* C-code for register scope strmux */ - -/* Register rw_cfg, scope strmux, type rw */ -typedef struct { - unsigned int dma0 : 3; - unsigned int dma1 : 3; - unsigned int dma2 : 3; - unsigned int dma3 : 3; - unsigned int dma4 : 3; - unsigned int dma5 : 3; - unsigned int dma6 : 3; - unsigned int dma7 : 3; - unsigned int dma8 : 3; - unsigned int dma9 : 3; - unsigned int dummy1 : 2; -} reg_strmux_rw_cfg; -#define REG_RD_ADDR_strmux_rw_cfg 0 -#define REG_WR_ADDR_strmux_rw_cfg 0 - - -/* Constants */ -enum { - regk_strmux_ata = 0x00000003, - regk_strmux_eth0 = 0x00000001, - regk_strmux_eth1 = 0x00000004, - regk_strmux_ext0 = 0x00000001, - regk_strmux_ext1 = 0x00000001, - regk_strmux_ext2 = 0x00000001, - regk_strmux_ext3 = 0x00000001, - regk_strmux_iop0 = 0x00000002, - regk_strmux_iop1 = 0x00000001, - regk_strmux_off = 0x00000000, - regk_strmux_p21 = 0x00000004, - regk_strmux_rw_cfg_default = 0x00000000, - regk_strmux_ser0 = 0x00000002, - regk_strmux_ser1 = 0x00000002, - regk_strmux_ser2 = 0x00000004, - regk_strmux_ser3 = 0x00000003, - regk_strmux_sser0 = 0x00000003, - regk_strmux_sser1 = 0x00000003, - regk_strmux_strcop = 0x00000002 -}; -#endif /* __strmux_defs_h */ diff --git a/include/asm-cris/arch-v32/pinmux.h b/include/asm-cris/arch-v32/pinmux.h deleted file mode 100644 index bb09bce42e7a..000000000000 --- a/include/asm-cris/arch-v32/pinmux.h +++ /dev/null @@ -1,40 +0,0 @@ -#ifndef _ASM_CRIS_ARCH_PINMUX_H -#define _ASM_CRIS_ARCH_PINMUX_H - -#define PORT_B 0 -#define PORT_C 1 -#define PORT_D 2 -#define PORT_E 3 - -enum pin_mode -{ - pinmux_none = 0, - pinmux_fixed, - pinmux_gpio, - pinmux_iop -}; - -enum fixed_function -{ - pinmux_ser1, - pinmux_ser2, - pinmux_ser3, - pinmux_sser0, - pinmux_sser1, - pinmux_ata0, - pinmux_ata1, - pinmux_ata2, - pinmux_ata3, - pinmux_ata, - pinmux_eth1, - pinmux_timer -}; - -int crisv32_pinmux_init(void); -int crisv32_pinmux_alloc(int port, int first_pin, int last_pin, enum pin_mode); -int crisv32_pinmux_alloc_fixed(enum fixed_function function); -int crisv32_pinmux_dealloc(int port, int first_pin, int last_pin); -int crisv32_pinmux_dealloc_fixed(enum fixed_function function); -void crisv32_pinmux_dump(void); - -#endif diff --git a/include/asm-cris/spinlock.h b/include/asm-cris/spinlock.h deleted file mode 100644 index 2e8ba8afc7af..000000000000 --- a/include/asm-cris/spinlock.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm/arch/spinlock.h> |