Commit a86ac954 authored by Masahiro Yamada's avatar Masahiro Yamada
Browse files

ARM: UniPhier: include <mach/*.h> instead of <asm/arch/*.h>

Since commit 0e7368c6

 (kbuild: prepare for moving headers into
mach-*/include/mach), we can replace #include <asm/arch/*.h> with
<mach/*.h> so we do not need to create the symbolic link during the
build.
Signed-off-by: default avatarMasahiro Yamada <yamada.m@jp.panasonic.com>
parent 9eb7acef
......@@ -6,7 +6,7 @@
*/
#include <common.h>
#include <asm/arch/led.h>
#include <mach/led.h>
/*
* Routine: board_init
......
......@@ -5,8 +5,8 @@
* SPDX-License-Identifier: GPL-2.0+
*/
#include <asm/arch/led.h>
#include <asm/arch/board.h>
#include <mach/led.h>
#include <mach/board.h>
void pin_init(void);
......
......@@ -6,7 +6,7 @@
*/
#include <common.h>
#include <asm/arch/board.h>
#include <mach/board.h>
int board_early_init_r(void)
{
......
......@@ -8,7 +8,7 @@
#include <common.h>
#include <asm/io.h>
#include <asm/armv7.h>
#include <asm/arch/ssc-regs.h>
#include <mach/ssc-regs.h>
#ifdef CONFIG_UNIPHIER_L2CACHE_ON
static void uniphier_cache_maint_all(u32 operation)
......
......@@ -7,7 +7,7 @@
#include <common.h>
#include <asm/io.h>
#include <asm/arch/ddrphy-regs.h>
#include <mach/ddrphy-regs.h>
/* Select either decimal or hexadecimal */
#if 1
......
......@@ -6,8 +6,8 @@
*/
#include <common.h>
#include <asm/arch/boot-device.h>
#include <asm/arch/sbc-regs.h>
#include <mach/boot-device.h>
#include <mach/sbc-regs.h>
static int do_pinmon(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
{
......
......@@ -7,7 +7,7 @@
#include <common.h>
#include <asm/io.h>
#include <asm/arch/sg-regs.h>
#include <mach/sg-regs.h>
int print_cpuinfo(void)
{
......
......@@ -7,7 +7,7 @@
#include <common.h>
#include <asm/io.h>
#include <asm/arch/ddrphy-regs.h>
#include <mach/ddrphy-regs.h>
void ddrphy_prepare_training(struct ddrphy __iomem *phy, int rank)
{
......
......@@ -21,6 +21,6 @@ U_BOOT_DEVICE(serial##n) = { \
.platdata = &serial_device##n \
};
#include <asm/arch/ehci-uniphier.h>
#include <mach/ehci-uniphier.h>
#endif /* ARCH_PLATDEVICE_H */
......@@ -8,9 +8,9 @@
#include <config.h>
#include <linux/linkage.h>
#include <asm/system.h>
#include <asm/arch/led.h>
#include <asm/arch/arm-mpcore.h>
#include <asm/arch/sbc-regs.h>
#include <mach/led.h>
#include <mach/arm-mpcore.h>
#include <mach/sbc-regs.h>
ENTRY(lowlevel_init)
mov r8, lr @ persevere link reg across call
......@@ -122,7 +122,7 @@ ENTRY(enable_mmu)
mov pc, lr
ENDPROC(enable_mmu)
#include <asm/arch/ssc-regs.h>
#include <mach/ssc-regs.h>
#define BOOT_RAM_SIZE (SSC_WAY_SIZE)
#define BOOT_WAY_BITS (0x00000100) /* way 8 */
......
......@@ -7,7 +7,7 @@
#include <common.h>
#include <asm/io.h>
#include <asm/arch/bcu-regs.h>
#include <mach/bcu-regs.h>
#define ch(x) ((x) >= 32 ? 0 : (x) < 0 ? 0x11111111 : 0x11111111 << (x))
......
......@@ -7,7 +7,7 @@
#include <common.h>
#include <asm/io.h>
#include <asm/arch/sc-regs.h>
#include <mach/sc-regs.h>
void clkrst_init(void)
{
......
......@@ -6,7 +6,7 @@
#include <linux/types.h>
#include <asm/io.h>
#include <asm/arch/ddrphy-regs.h>
#include <mach/ddrphy-regs.h>
void ddrphy_init(struct ddrphy __iomem *phy, int freq, int size)
{
......
......@@ -8,10 +8,10 @@
*/
#include <linux/linkage.h>
#include <asm/arch/sg-regs.h>
#include <mach/sg-regs.h>
#define UART_CLK 36864000
#include <asm/arch/debug-uart.S>
#include <mach/debug-uart.S>
ENTRY(setup_lowlevel_debug)
init_debug_uart r0, r1, r2
......
......@@ -6,7 +6,7 @@
#include <common.h>
#include <asm/io.h>
#include <asm/arch/sg-regs.h>
#include <mach/sg-regs.h>
void pin_init(void)
{
......
......@@ -5,7 +5,7 @@
* SPDX-License-Identifier: GPL-2.0+
*/
#include <asm/arch/platdevice.h>
#include <mach/platdevice.h>
#define UART_MASTER_CLK 36864000
......
......@@ -6,8 +6,8 @@
#include <common.h>
#include <asm/io.h>
#include <asm/arch/sc-regs.h>
#include <asm/arch/sg-regs.h>
#include <mach/sc-regs.h>
#include <mach/sg-regs.h>
#undef DPLL_SSC_RATE_1PER
......
......@@ -7,8 +7,8 @@
#include <common.h>
#include <asm/io.h>
#include <asm/arch/sbc-regs.h>
#include <asm/arch/sg-regs.h>
#include <mach/sbc-regs.h>
#include <mach/sg-regs.h>
void sbc_init(void)
{
......
......@@ -7,7 +7,7 @@
#include <common.h>
#include <asm/io.h>
#include <asm/arch/sg-regs.h>
#include <mach/sg-regs.h>
void sg_init(void)
{
......
......@@ -6,8 +6,8 @@
#include <common.h>
#include <asm/io.h>
#include <asm/arch/umc-regs.h>
#include <asm/arch/ddrphy-regs.h>
#include <mach/umc-regs.h>
#include <mach/ddrphy-regs.h>
static void umc_start_ssif(void __iomem *ssif_base)
{
......
......@@ -8,9 +8,9 @@
#include <common.h>
#include <spl.h>
#include <asm/io.h>
#include <asm/arch/boot-device.h>
#include <asm/arch/sg-regs.h>
#include <asm/arch/sbc-regs.h>
#include <mach/boot-device.h>
#include <mach/sg-regs.h>
#include <mach/sbc-regs.h>
struct boot_device_info boot_device_table[] = {
{BOOT_DEVICE_NAND, "NAND (Mirror 8, ECC 8, EraseSize 128KB, Addr 4)"},
......
......@@ -7,7 +7,7 @@
#include <common.h>
#include <asm/io.h>
#include <asm/arch/sc-regs.h>
#include <mach/sc-regs.h>
void clkrst_init(void)
{
......
......@@ -6,7 +6,7 @@
#include <linux/types.h>
#include <asm/io.h>
#include <asm/arch/ddrphy-regs.h>
#include <mach/ddrphy-regs.h>
void ddrphy_init(struct ddrphy __iomem *phy, int freq, int size)
{
......
......@@ -8,11 +8,11 @@
*/
#include <linux/linkage.h>
#include <asm/arch/sc-regs.h>
#include <asm/arch/sg-regs.h>
#include <mach/sc-regs.h>
#include <mach/sg-regs.h>
#define UART_CLK 73728000
#include <asm/arch/debug-uart.S>
#include <mach/debug-uart.S>
ENTRY(setup_lowlevel_debug)
ldr r0, =SC_CLKCTRL
......
......@@ -6,7 +6,7 @@
#include <common.h>
#include <asm/io.h>
#include <asm/arch/sg-regs.h>
#include <mach/sg-regs.h>
void pin_init(void)
{
......
......@@ -5,7 +5,7 @@
* SPDX-License-Identifier: GPL-2.0+
*/
#include <asm/arch/platdevice.h>
#include <mach/platdevice.h>
#define UART_MASTER_CLK 73728000
......
......@@ -6,8 +6,8 @@
#include <common.h>
#include <asm/io.h>
#include <asm/arch/sc-regs.h>
#include <asm/arch/sg-regs.h>
#include <mach/sc-regs.h>
#include <mach/sg-regs.h>
#undef DPLL_SSC_RATE_1PER
......
......@@ -6,7 +6,7 @@
#include <common.h>
#include <asm/io.h>
#include <asm/arch/sc-regs.h>
#include <mach/sc-regs.h>
void enable_dpll_ssc(void)
{
......
......@@ -7,8 +7,8 @@
#include <common.h>
#include <asm/io.h>
#include <asm/arch/sbc-regs.h>
#include <asm/arch/sg-regs.h>
#include <mach/sbc-regs.h>
#include <mach/sg-regs.h>
void sbc_init(void)
{
......
......@@ -7,7 +7,7 @@
#include <common.h>
#include <asm/io.h>
#include <asm/arch/sg-regs.h>
#include <mach/sg-regs.h>
void sg_init(void)
{
......
......@@ -6,8 +6,8 @@
#include <common.h>
#include <asm/io.h>
#include <asm/arch/umc-regs.h>
#include <asm/arch/ddrphy-regs.h>
#include <mach/umc-regs.h>
#include <mach/ddrphy-regs.h>
static void umc_start_ssif(void __iomem *ssif_base)
{
......
......@@ -7,7 +7,7 @@
#include <common.h>
#include <asm/io.h>
#include <asm/arch/sc-regs.h>
#include <mach/sc-regs.h>
void clkrst_init(void)
{
......
......@@ -7,7 +7,7 @@
#include <config.h>
#include <linux/types.h>
#include <asm/io.h>
#include <asm/arch/ddrphy-regs.h>
#include <mach/ddrphy-regs.h>
void ddrphy_init(struct ddrphy __iomem *phy, int freq, int size)
{
......
......@@ -8,10 +8,10 @@
*/
#include <linux/linkage.h>
#include <asm/arch/sg-regs.h>
#include <mach/sg-regs.h>
#define UART_CLK 80000000
#include <asm/arch/debug-uart.S>
#include <mach/debug-uart.S>
ENTRY(setup_lowlevel_debug)
init_debug_uart r0, r1, r2
......
......@@ -6,7 +6,7 @@
#include <common.h>
#include <asm/io.h>
#include <asm/arch/sg-regs.h>
#include <mach/sg-regs.h>
void pin_init(void)
{
......
......@@ -5,7 +5,7 @@
* SPDX-License-Identifier: GPL-2.0+
*/
#include <asm/arch/platdevice.h>
#include <mach/platdevice.h>
#define UART_MASTER_CLK 80000000
......
......@@ -6,8 +6,8 @@
#include <common.h>
#include <asm/io.h>
#include <asm/arch/sc-regs.h>
#include <asm/arch/sg-regs.h>
#include <mach/sc-regs.h>
#include <mach/sg-regs.h>
static void dpll_init(void)
{
......
......@@ -7,8 +7,8 @@
#include <common.h>
#include <asm/io.h>
#include <asm/arch/sbc-regs.h>
#include <asm/arch/sg-regs.h>
#include <mach/sbc-regs.h>
#include <mach/sg-regs.h>
void sbc_init(void)
{
......
......@@ -6,8 +6,8 @@
#include <common.h>
#include <asm/io.h>
#include <asm/arch/umc-regs.h>
#include <asm/arch/ddrphy-regs.h>
#include <mach/umc-regs.h>
#include <mach/ddrphy-regs.h>
static void umc_start_ssif(void __iomem *ssif_base)
{
......
......@@ -5,7 +5,7 @@
* SPDX-License-Identifier: GPL-2.0+
*/
#include <asm/arch/board.h>
#include <mach/board.h>
int misc_init_f(void)
{
......
......@@ -7,7 +7,7 @@
#include <common.h>
#include <asm/io.h>
#include <asm/arch/sc-regs.h>
#include <mach/sc-regs.h>
void reset_cpu(unsigned long ignored)
{
......
......@@ -8,8 +8,8 @@
#include <config.h>
#include <linux/linkage.h>
#include <asm/system.h>
#include <asm/arch/led.h>
#include <asm/arch/sbc-regs.h>
#include <mach/led.h>
#include <mach/sbc-regs.h>
/* Entry point of U-Boot main program for the secondary CPU */
LENTRY(secondary_entry)
......
......@@ -8,8 +8,8 @@
#include <common.h>
#include <spl.h>
#include <linux/compiler.h>
#include <asm/arch/led.h>
#include <asm/arch/board.h>
#include <mach/led.h>
#include <mach/board.h>
void __weak bcu_init(void)
{
......
......@@ -7,7 +7,7 @@
#include <common.h>
#include <asm/io.h>
#include <asm/arch/board.h>
#include <mach/board.h>
#if defined(CONFIG_PFC_MICRO_SUPPORT_CARD)
......@@ -112,7 +112,7 @@ int board_eth_init(bd_t *bis)
#if !defined(CONFIG_SYS_NO_FLASH)
#include <mtd/cfi_flash.h>
#include <asm/arch/sbc-regs.h>
#include <mach/sbc-regs.h>
struct memory_bank {
phys_addr_t base;
......
......@@ -7,7 +7,7 @@
#include <common.h>
#include <asm/io.h>
#include <asm/arch/arm-mpcore.h>
#include <mach/arm-mpcore.h>
#define PERIPHCLK (50 * 1000 * 1000) /* 50 MHz */
#define PRESCALER ((PERIPHCLK) / (CONFIG_SYS_TIMER_RATE) - 1)
......
......@@ -8,7 +8,7 @@
#include <common.h>
#include <linux/err.h>
#include <usb.h>
#include <asm/arch/ehci-uniphier.h>
#include <mach/ehci-uniphier.h>
#include "ehci.h"
#ifdef CONFIG_OF_CONTROL
......
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