Skip to content

L
linux
Commit ca31807b authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files
Options

ARM: davinci: remove include/mach/ subdirectory 

The files in include/mach are only used from mach/davinci,
so they are no longer needed in the traditional location.

Move them to arch/arm/mach-davinci/ and drop the logic for
the special include path.

The mach/uncompress.h file is not used at all and can just
be removed.
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parent 6d9230ed
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1064 additions and 1205 deletions
arch/arm/mach-davinci/Makefile
View file @ ca31807b
......@@ -3,9 +3,7 @@
# Makefile for the linux kernel.
#
#
ccflags-$(CONFIG_ARCH_MULTIPLATFORM) := -I$(srctree)/$(src)/include
#
# Common objects
obj-y := serial.o usb.o common.o sram.o
......
arch/arm/mach-davinci/board-da830-evm.c
View file @ ca31807b
......@@ -36,10 +36,9 @@
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
#include <mach/common.h>
#include <mach/mux.h>
#include <mach/da8xx.h>
#include "common.h"
#include "mux.h"
#include "da8xx.h"
#include "irqs.h"
#define DA830_EVM_PHY_ID ""
......
arch/arm/mach-davinci/board-da850-evm.c
View file @ ca31807b
......@@ -43,10 +43,9 @@
#include <linux/spi/spi.h>
#include <linux/spi/flash.h>
#include <mach/common.h>
#include <mach/da8xx.h>
#include <mach/mux.h>
#include "common.h"
#include "da8xx.h"
#include "mux.h"
#include "irqs.h"
#include "sram.h"
......
arch/arm/mach-davinci/board-dm355-evm.c
View file @ ca31807b
......@@ -33,9 +33,8 @@
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
#include <mach/serial.h>
#include <mach/common.h>
#include "serial.h"
#include "common.h"
#include "davinci.h"
/* NOTE: this is geared for the standard config, with a socketed
......
arch/arm/mach-davinci/board-dm355-leopard.c
View file @ ca31807b
......@@ -27,9 +27,8 @@
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
#include <mach/common.h>
#include <mach/serial.h>
#include "common.h"
#include "serial.h"
#include "davinci.h"
/* NOTE: this is geared for the standard config, with a socketed
......
arch/arm/mach-davinci/board-dm365-evm.c
View file @ ca31807b
......@@ -36,10 +36,7 @@
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
#include <mach/mux.h>
#include <mach/common.h>
#include <linux/platform_data/i2c-davinci.h>
#include <mach/serial.h>
#include <linux/platform_data/mmc-davinci.h>
#include <linux/platform_data/mtd-davinci.h>
#include <linux/platform_data/keyscan-davinci.h>
......@@ -47,6 +44,9 @@
#include <media/i2c/ths7303.h>
#include <media/i2c/tvp514x.h>
#include "mux.h"
#include "common.h"
#include "serial.h"
#include "davinci.h"
static inline int have_imager(void)
......
arch/arm/mach-davinci/board-dm644x-evm.c
View file @ ca31807b
......@@ -37,10 +37,6 @@
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
#include <mach/common.h>
#include <mach/mux.h>
#include <mach/serial.h>
#include <linux/platform_data/i2c-davinci.h>
#include <linux/platform_data/mtd-davinci.h>
#include <linux/platform_data/mmc-davinci.h>
......@@ -49,6 +45,9 @@
#include <linux/platform_data/ti-aemif.h>
#include "davinci.h"
#include "common.h"
#include "mux.h"
#include "serial.h"
#include "irqs.h"
#define DM644X_EVM_PHY_ID "davinci_mdio-0:01"
......
arch/arm/mach-davinci/board-dm646x-evm.c
View file @ ca31807b
......@@ -43,9 +43,8 @@
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
#include <mach/common.h>
#include <mach/serial.h>
#include "common.h"
#include "serial.h"
#include "davinci.h"
#include "irqs.h"
......
arch/arm/mach-davinci/board-mityomapl138.c
View file @ ca31807b
......@@ -28,12 +28,14 @@
#include <asm/io.h>
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
#include <mach/common.h>
#include <mach/da8xx.h>
#include "common.h"
#include "da8xx.h"
#include "mux.h"
#include <linux/platform_data/mtd-davinci.h>
#include <linux/platform_data/mtd-davinci-aemif.h>
#include <linux/platform_data/ti-aemif.h>
#include <mach/mux.h>
#include <linux/platform_data/spi-davinci.h>
#define MITYOMAPL138_PHY_ID ""
......
arch/arm/mach-davinci/board-neuros-osd2.c
View file @ ca31807b
......@@ -36,10 +36,9 @@
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
#include <mach/common.h>
#include <mach/serial.h>
#include <mach/mux.h>
#include "common.h"
#include "serial.h"
#include "mux.h"
#include "davinci.h"
#define NEUROS_OSD2_PHY_ID "davinci_mdio-0:01"
......
arch/arm/mach-davinci/board-omapl138-hawk.c
View file @ ca31807b
......@@ -27,9 +27,9 @@
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
#include <mach/common.h>
#include <mach/da8xx.h>
#include <mach/mux.h>
#include "common.h"
#include "da8xx.h"
#include "mux.h"
#define HAWKBOARD_PHY_ID "davinci_mdio-0:07"
......
arch/arm/mach-davinci/board-sffsdr.c
View file @ ca31807b
......@@ -22,12 +22,12 @@
#include <asm/mach/arch.h>
#include <asm/mach/flash.h>
#include <mach/common.h>
#include <linux/platform_data/i2c-davinci.h>
#include <mach/serial.h>
#include <mach/mux.h>
#include <linux/platform_data/usb-davinci.h>
#include "common.h"
#include "serial.h"
#include "mux.h"
#include "davinci.h"
#define SFFSDR_PHY_ID "davinci_mdio-0:01"
......
arch/arm/mach-davinci/common.c
View file @ ca31807b
......@@ -17,8 +17,8 @@
#include <asm/tlb.h>
#include <asm/mach/map.h>
#include <mach/common.h>
#include <mach/cputype.h>
#include "common.h"
#include "cputype.h"
struct davinci_soc_info davinci_soc_info;
EXPORT_SYMBOL(davinci_soc_info);
......
arch/arm/mach-davinci/include/mach/cputype.h → arch/arm/mach-davinci/cputype.h
View file @ ca31807b
......@@ -16,7 +16,7 @@
#ifndef _ASM_ARCH_CPU_H
#define _ASM_ARCH_CPU_H
#include <mach/common.h>
#include "common.h"
struct davinci_id {
u8 variant; /* JTAG ID bits 31:28 */
......
arch/arm/mach-davinci/da830.c
View file @ ca31807b
......@@ -16,14 +16,13 @@
#include <linux/irqchip/irq-davinci-cp-intc.h>
#include <linux/platform_data/gpio-davinci.h>
#include <asm/mach/map.h>
#include <mach/common.h>
#include <mach/cputype.h>
#include <mach/da8xx.h>
#include <clocksource/timer-davinci.h>
#include <asm/mach/map.h>
#include "common.h"
#include "cputype.h"
#include "da8xx.h"
#include "irqs.h"
#include "mux.h"
......
arch/arm/mach-davinci/da850.c
View file @ ca31807b
......@@ -28,16 +28,14 @@
#include <linux/platform_device.h>
#include <linux/regmap.h>
#include <linux/regulator/consumer.h>
#include <clocksource/timer-davinci.h>
#include <asm/mach/map.h>
#include <mach/common.h>
#include <mach/cputype.h>
#include <mach/da8xx.h>
#include <mach/pm.h>
#include <clocksource/timer-davinci.h>
#include "common.h"
#include "cputype.h"
#include "da8xx.h"
#include "pm.h"
#include "irqs.h"
#include "mux.h"
......
arch/arm/mach-davinci/da8xx-dt.c
View file @ ca31807b
......@@ -7,8 +7,8 @@
#include <asm/mach/arch.h>
#include <mach/common.h>
#include <mach/da8xx.h>
#include "common.h"
#include "da8xx.h"
#ifdef CONFIG_ARCH_DAVINCI_DA850
......
arch/arm/mach-davinci/include/mach/da8xx.h → arch/arm/mach-davinci/da8xx.h
View file @ ca31807b
......@@ -21,8 +21,9 @@
#include <linux/regmap.h>
#include <linux/videodev2.h>
#include <mach/serial.h>
#include <mach/pm.h>
#include "serial.h"
#include "pm.h"
#include <linux/platform_data/edma.h>
#include <linux/platform_data/i2c-davinci.h>
#include <linux/platform_data/mmc-davinci.h>
......
arch/arm/mach-davinci/davinci.h
View file @ ca31807b
......@@ -25,7 +25,8 @@
#include <linux/platform_data/davinci_asp.h>
#include <linux/platform_data/edma.h>
#include <linux/platform_data/keyscan-davinci.h>
#include <mach/hardware.h>
#include "hardware.h"
#include <media/davinci/vpfe_capture.h>
#include <media/davinci/vpif_types.h>
......
arch/arm/mach-davinci/devices-da8xx.c
View file @ ca31807b
......@@ -18,10 +18,9 @@
#include <linux/reboot.h>
#include <linux/serial_8250.h>
#include <mach/common.h>
#include <mach/cputype.h>
#include <mach/da8xx.h>
#include "common.h"
#include "cputype.h"
#include "da8xx.h"
#include "asp.h"
#include "cpuidle.h"
#include "irqs.h"
......
arch/arm/mach-davinci/devices.c
View file @ ca31807b
......@@ -14,10 +14,9 @@
#include <linux/io.h>
#include <linux/reboot.h>
#include <mach/hardware.h>
#include <mach/cputype.h>
#include <mach/mux.h>
#include "hardware.h"
#include "cputype.h"
#include "mux.h"
#include "davinci.h"
#include "irqs.h"
......
arch/arm/mach-davinci/dm355.c
View file @ ca31807b
......@@ -24,15 +24,13 @@
#include <linux/serial_8250.h>
#include <linux/spi/spi.h>
#include <asm/mach/map.h>
#include <mach/common.h>
#include <mach/cputype.h>
#include <mach/mux.h>
#include <mach/serial.h>
#include <clocksource/timer-davinci.h>
#include <asm/mach/map.h>
#include "common.h"
#include "cputype.h"
#include "serial.h"
#include "asp.h"
#include "davinci.h"
#include "irqs.h"
......
arch/arm/mach-davinci/dm365.c
View file @ ca31807b
......@@ -29,15 +29,13 @@
#include <linux/serial_8250.h>
#include <linux/spi/spi.h>
#include <asm/mach/map.h>
#include <mach/common.h>
#include <mach/cputype.h>
#include <mach/mux.h>
#include <mach/serial.h>
#include <clocksource/timer-davinci.h>
#include <asm/mach/map.h>
#include "common.h"
#include "cputype.h"
#include "serial.h"
#include "asp.h"
#include "davinci.h"
#include "irqs.h"
......
arch/arm/mach-davinci/dm644x.c
View file @ ca31807b
......@@ -21,15 +21,13 @@
#include <linux/platform_device.h>
#include <linux/serial_8250.h>
#include <asm/mach/map.h>
#include <mach/common.h>
#include <mach/cputype.h>
#include <mach/mux.h>
#include <mach/serial.h>
#include <clocksource/timer-davinci.h>
#include <asm/mach/map.h>
#include "common.h"
#include "cputype.h"
#include "serial.h"
#include "asp.h"
#include "davinci.h"
#include "irqs.h"
......
arch/arm/mach-davinci/dm646x.c
View file @ ca31807b
......@@ -22,15 +22,13 @@
#include <linux/platform_device.h>
#include <linux/serial_8250.h>
#include <asm/mach/map.h>
#include <mach/common.h>
#include <mach/cputype.h>
#include <mach/mux.h>
#include <mach/serial.h>
#include <clocksource/timer-davinci.h>
#include <asm/mach/map.h>
#include "common.h"
#include "cputype.h"
#include "serial.h"
#include "asp.h"
#include "davinci.h"
#include "irqs.h"
......
arch/arm/mach-davinci/include/mach/mux.h deleted 100644 → 0
View file @ 6d9230ed
This diff is collapsed.
arch/arm/mach-davinci/include/mach/uncompress.h deleted 100644 → 0
View file @ 6d9230ed
/*
* Serial port stubs for kernel decompress status messages
*
* Initially based on:
* arch/arm/plat-omap/include/mach/uncompress.h
*
* Original copyrights follow.
*
* Copyright (C) 2000 RidgeRun, Inc.
* Author: Greg Lonnon <glonnon@ridgerun.com>
*
* Rewritten by:
* Author: <source@mvista.com>
* 2004 (c) MontaVista Software, Inc.
*
* This file is licensed under the terms of the GNU General Public License
* version 2. This program is licensed "as is" without any warranty of any
* kind, whether express or implied.
*/
#include <linux/types.h>
#include <linux/serial_reg.h>
#include <asm/mach-types.h>
#include <mach/serial.h>
#define IOMEM(x) ((void __force __iomem *)(x))
u32 *uart;
/* PORT_16C550A, in polled non-fifo mode */
static inline void putc(char c)
{
if (!uart)
return;
while (!(uart[UART_LSR] & UART_LSR_THRE))
barrier();
uart[UART_TX] = c;
}
static inline void flush(void)
{
if (!uart)
return;
while (!(uart[UART_LSR] & UART_LSR_THRE))
barrier();
}
static inline void set_uart_info(u32 phys)
{
uart = (u32 *)phys;
}
#define _DEBUG_LL_ENTRY(machine, phys) \
{ \
if (machine_is_##machine()) { \
set_uart_info(phys); \
break; \
} \
}
#define DEBUG_LL_DAVINCI(machine, port) \
_DEBUG_LL_ENTRY(machine, DAVINCI_UART##port##_BASE)
#define DEBUG_LL_DA8XX(machine, port) \
_DEBUG_LL_ENTRY(machine, DA8XX_UART##port##_BASE)
static inline void __arch_decomp_setup(unsigned long arch_id)
{
/*
* Initialize the port based on the machine ID from the bootloader.
* Note that we're using macros here instead of switch statement
* as machine_is functions are optimized out for the boards that
* are not selected.
*/
do {
/* Davinci boards */
DEBUG_LL_DAVINCI(davinci_evm, 0);
DEBUG_LL_DAVINCI(sffsdr, 0);
DEBUG_LL_DAVINCI(neuros_osd2, 0);
DEBUG_LL_DAVINCI(davinci_dm355_evm, 0);
DEBUG_LL_DAVINCI(dm355_leopard, 0);
DEBUG_LL_DAVINCI(davinci_dm6467_evm, 0);
DEBUG_LL_DAVINCI(davinci_dm365_evm, 0);
/* DA8xx boards */
DEBUG_LL_DA8XX(davinci_da830_evm, 2);
DEBUG_LL_DA8XX(davinci_da850_evm, 2);
DEBUG_LL_DA8XX(mityomapl138, 1);
DEBUG_LL_DA8XX(omapl138_hawkboard, 2);
} while (0);
}
#define arch_decomp_setup() __arch_decomp_setup(arch_id)
arch/arm/mach-davinci/mux.c
View file @ ca31807b
......@@ -22,8 +22,8 @@
#include <linux/module.h>
#include <linux/spinlock.h>
#include <mach/mux.h>
#include <mach/common.h>
#include "mux.h"
#include "common.h"
static void __iomem *pinmux_base;
......
arch/arm/mach-davinci/mux.h
View file @ ca31807b
This diff is collapsed.
arch/arm/mach-davinci/pdata-quirks.c
View file @ ca31807b
......@@ -10,8 +10,8 @@
#include <media/i2c/tvp514x.h>
#include <media/i2c/adv7343.h>
#include <mach/common.h>
#include <mach/da8xx.h>
#include "common.h"
#include "da8xx.h"
struct pdata_init {
const char *compatible;
......
arch/arm/mach-davinci/pm.c
View file @ ca31807b
......@@ -16,11 +16,10 @@
#include <asm/delay.h>
#include <asm/io.h>
#include <mach/common.h>
#include <mach/da8xx.h>
#include <mach/mux.h>
#include <mach/pm.h>
#include "common.h"
#include "da8xx.h"
#include "mux.h"
#include "pm.h"
#include "clock.h"
#include "psc.h"
#include "sram.h"
......
arch/arm/mach-davinci/serial.c
View file @ ca31807b
......@@ -14,8 +14,8 @@
#include <linux/clk.h>
#include <linux/io.h>
#include <mach/serial.h>
#include <mach/cputype.h>
#include "serial.h"
#include "cputype.h"
static inline void serial_write_reg(struct plat_serial8250_port *p, int offset,
int value)
......
arch/arm/mach-davinci/include/mach/serial.h → arch/arm/mach-davinci/serial.h
View file @ ca31807b
......@@ -13,7 +13,7 @@
#include <asm/memory.h>
#include <mach/hardware.h>
#include "hardware.h"
#define DAVINCI_UART0_BASE (IO_PHYS + 0x20000)
#define DAVINCI_UART1_BASE (IO_PHYS + 0x20400)
......
arch/arm/mach-davinci/sram.c
View file @ ca31807b
......@@ -9,7 +9,7 @@
#include <linux/io.h>
#include <linux/genalloc.h>
#include <mach/common.h>
#include "common.h"
#include "sram.h"
static struct gen_pool *sram_pool;
......
arch/arm/mach-davinci/usb-da8xx.c
View file @ ca31807b
......@@ -15,10 +15,9 @@
#include <linux/platform_device.h>
#include <linux/usb/musb.h>
#include <mach/common.h>
#include <mach/cputype.h>
#include <mach/da8xx.h>
#include "common.h"
#include "cputype.h"
#include "da8xx.h"
#include "irqs.h"
#define DA8XX_USB0_BASE 0x01e00000
......
arch/arm/mach-davinci/usb.c
View file @ ca31807b
......@@ -8,9 +8,8 @@
#include <linux/platform_data/usb-davinci.h>
#include <linux/usb/musb.h>
#include <mach/common.h>
#include <mach/cputype.h>
#include "common.h"
#include "cputype.h"
#include "irqs.h"
#define DAVINCI_USB_OTG_BASE 0x01c64000
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7