summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-mvebu
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm/mach-mvebu')
-rw-r--r--arch/arm/mach-mvebu/armada-370-xp.c5
-rw-r--r--arch/arm/mach-mvebu/common.c7
-rw-r--r--arch/arm/mach-mvebu/dove.c2
-rw-r--r--arch/arm/mach-mvebu/include/mach/armada-370-xp-regs.h64
-rw-r--r--arch/arm/mach-mvebu/include/mach/barebox-arm-head.h79
-rw-r--r--arch/arm/mach-mvebu/include/mach/bbu.h14
-rw-r--r--arch/arm/mach-mvebu/include/mach/common.h27
-rw-r--r--arch/arm/mach-mvebu/include/mach/debug_ll.h30
-rw-r--r--arch/arm/mach-mvebu/include/mach/dove-regs.h52
-rw-r--r--arch/arm/mach-mvebu/include/mach/kirkwood-regs.h37
-rw-r--r--arch/arm/mach-mvebu/include/mach/lowlevel.h13
-rw-r--r--arch/arm/mach-mvebu/include/mach/socid.h69
-rw-r--r--arch/arm/mach-mvebu/kirkwood.c2
-rw-r--r--arch/arm/mach-mvebu/kwb_bbu.c2
-rw-r--r--arch/arm/mach-mvebu/kwbootimage.c2
15 files changed, 11 insertions, 394 deletions
diff --git a/arch/arm/mach-mvebu/armada-370-xp.c b/arch/arm/mach-mvebu/armada-370-xp.c
index 0b40754231..1bbc6bd226 100644
--- a/arch/arm/mach-mvebu/armada-370-xp.c
+++ b/arch/arm/mach-mvebu/armada-370-xp.c
@@ -9,14 +9,15 @@
#include <of_address.h>
#include <asm/memory.h>
#include <linux/mbus.h>
-#include <mach/armada-370-xp-regs.h>
-#include <mach/socid.h>
+#include <mach/mvebu/armada-370-xp-regs.h>
+#include <mach/mvebu/socid.h>
static const struct of_device_id armada_370_xp_pcie_of_ids[] = {
{ .compatible = "marvell,armada-xp-pcie", },
{ .compatible = "marvell,armada-370-pcie", },
{ },
};
+MODULE_DEVICE_TABLE(of, armada_370_xp_pcie_of_ids);
/*
* Marvell Armada XP MV78230-A0 incorrectly identifies itself as
diff --git a/arch/arm/mach-mvebu/common.c b/arch/arm/mach-mvebu/common.c
index ed0745c62a..bca4a3cb1c 100644
--- a/arch/arm/mach-mvebu/common.c
+++ b/arch/arm/mach-mvebu/common.c
@@ -8,11 +8,11 @@
#include <of.h>
#include <of_address.h>
#include <linux/clk.h>
-#include <mach/common.h>
-#include <mach/socid.h>
+#include <mach/mvebu/common.h>
+#include <mach/mvebu/socid.h>
#include <asm/barebox-arm.h>
#include <asm/memory.h>
-#include <mach/lowlevel.h>
+#include <mach/mvebu/lowlevel.h>
/*
* The different SoC headers containing register definitions (mach/dove-regs.h,
@@ -57,6 +57,7 @@ static const struct of_device_id mvebu_pcie_of_ids[] = {
{ .compatible = "marvell,kirkwood-pcie" },
{ },
};
+MODULE_DEVICE_TABLE(of, mvebu_pcie_of_ids);
static int mvebu_soc_id_init(void)
{
diff --git a/arch/arm/mach-mvebu/dove.c b/arch/arm/mach-mvebu/dove.c
index d085894d19..2dd461c5c3 100644
--- a/arch/arm/mach-mvebu/dove.c
+++ b/arch/arm/mach-mvebu/dove.c
@@ -7,7 +7,7 @@
#include <restart.h>
#include <asm/memory.h>
#include <linux/mbus.h>
-#include <mach/dove-regs.h>
+#include <mach/mvebu/dove-regs.h>
static void __noreturn dove_restart_soc(struct restart_handler *rst)
{
diff --git a/arch/arm/mach-mvebu/include/mach/armada-370-xp-regs.h b/arch/arm/mach-mvebu/include/mach/armada-370-xp-regs.h
deleted file mode 100644
index bed2239aa3..0000000000
--- a/arch/arm/mach-mvebu/include/mach/armada-370-xp-regs.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-or-later */
-/* SPDX-FileCopyrightText: 2013 Thomas Petazzoni <thomas.petazzoni@free-electrons.com> */
-
-#ifndef __MACH_MVEBU_ARMADA_370_XP_REGS_H
-#define __MACH_MVEBU_ARMADA_370_XP_REGS_H
-
-#include <mach/common.h>
-
-#define ARMADA_370_XP_INT_REGS_BASE IOMEM(MVEBU_REMAP_INT_REG_BASE)
-#define ARMADA_370_XP_UART_BASE (ARMADA_370_XP_INT_REGS_BASE + 0x12000)
-#define ARMADA_370_XP_UARTn_BASE(n) \
- (ARMADA_370_XP_UART_BASE + ((n) * 0x100))
-
-#define ARMADA_370_XP_SYSCTL_BASE (ARMADA_370_XP_INT_REGS_BASE + 0x18200)
-#define ARMADA_370_XP_SOC_CTRL (ARMADA_370_XP_SYSCTL_BASE + 0x004)
-#define PCIE1_QUADX1_EN BIT(8)
-#define PCIE0_QUADX1_EN BIT(7)
-#define PCIE3_EN BIT(3)
-#define PCIE2_EN BIT(2)
-#define PCIE1_EN BIT(1)
-#define PCIE0_EN BIT(0)
-#define ARMADA_370_XP_SAR_LOW (ARMADA_370_XP_SYSCTL_BASE + 0x030)
-#define SAR_TCLK_FREQ BIT(20)
-#define ARMADA_370_XP_SAR_HIGH (ARMADA_370_XP_SYSCTL_BASE + 0x034)
-#define ARMADA_370_XP_CPU_SOC_ID (ARMADA_370_XP_SYSCTL_BASE + 0x03c)
-#define CPU_SOC_ID_DEVICE_MASK 0xffff
-#define ARMADA_XP_PUP_ENABLE (ARMADA_370_XP_SYSCTL_BASE + 0x44c)
-#define GE0_PUP_EN BIT(0)
-#define GE1_PUP_EN BIT(1)
-#define LCD_PUP_EN BIT(2)
-#define NAND_PUP_EN BIT(4)
-#define SPI_PUP_EN BIT(5)
-
-#define ARMADA_370_XP_SDRAM_BASE (ARMADA_370_XP_INT_REGS_BASE + 0x20000)
-#define DDR_BASE_CS 0x180
-#define DDR_BASE_CSn(n) (DDR_BASE_CS + ((n) * 0x8))
-#define DDR_BASE_CS_HIGH_MASK 0x0000000f
-#define DDR_BASE_CS_LOW_MASK 0xff000000
-#define DDR_SIZE_CS 0x184
-#define DDR_SIZE_CSn(n) (DDR_SIZE_CS + ((n) * 0x8))
-#define DDR_SIZE_ENABLED BIT(0)
-#define DDR_SIZE_CS_MASK 0x0000001c
-#define DDR_SIZE_CS_SHIFT 2
-#define DDR_SIZE_MASK 0xff000000
-
-#define ARMADA_370_XP_FABRIC_BASE (ARMADA_370_XP_INT_REGS_BASE + 0x20200)
-#define ARMADA_370_XP_FABRIC_CTRL (ARMADA_370_XP_FABRIC_BASE + 0x000)
-#define MBUS_ERR_PROP_EN BIT(8)
-#define ARMADA_370_XP_FABRIC_CONF (ARMADA_370_XP_FABRIC_BASE + 0x004)
-#define FABRIC_NUM_CPUS_MASK 0x3
-
-#define ARMADA_370_XP_TIMER_BASE (ARMADA_370_XP_INT_REGS_BASE + 0x20300)
-
-#define ARMADA_370_XP_PCIE_UNIT_OFFSET 0x40000
-#define ARMADA_370_XP_PCIE_PORT_OFFSET 0x04000
-#define ARMADA_370_XP_PCIE_BASE(port) \
- (ARMADA_370_XP_INT_REGS_BASE + 0x40000 + \
- (((port) / 4) * ARMADA_370_XP_PCIE_UNIT_OFFSET) + \
- (((port) % 4) * ARMADA_370_XP_PCIE_PORT_OFFSET))
-#define PCIE_DEVICE_VENDOR_ID 0x000
-
-#define ARMADA_370_XP_USB_BASE (ARMADA_370_XP_INT_REGS_BASE + 0x50000)
-
-#endif /* __MACH_MVEBU_ARMADA_370_XP_REGS_H */
diff --git a/arch/arm/mach-mvebu/include/mach/barebox-arm-head.h b/arch/arm/mach-mvebu/include/mach/barebox-arm-head.h
deleted file mode 100644
index 12f8cfc5a0..0000000000
--- a/arch/arm/mach-mvebu/include/mach/barebox-arm-head.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-
-#include <linux/stringify.h>
-#include <mach/common.h>
-
-static inline void __barebox_arm_head(void)
-{
- __asm__ __volatile__ (
-#ifdef CONFIG_CPU_32
-#ifdef CONFIG_THUMB2_BAREBOX
- ".arm\n"
- "adr r9, 1f + 1\n"
- "bx r9\n"
- ".thumb\n"
- "1:\n"
- "bl 2f\n"
- ".rept 10\n"
- "1: b 1b\n"
- ".endr\n"
-#else
- "b 2f\n"
- "1: b 1b\n"
- "1: b 1b\n"
- "1: b 1b\n"
- "1: b 1b\n"
- "1: b 1b\n"
- "1: b 1b\n"
- "1: b 1b\n"
-#endif
-#else
- "b 2f\n"
- "nop\n"
- "nop\n"
- "nop\n"
- "nop\n"
- "nop\n"
-#endif
- ".asciz \"barebox\"\n"
-#ifdef CONFIG_CPU_32
- ".word _text\n" /* text base. If copied there,
- * barebox can skip relocation
- */
-#else
- ".word 0xffffffff\n"
-#endif
- ".word _barebox_image_size\n" /* image size to copy */
-
- /*
- * The following entry (at offset 0x30) is the only intended
- * difference to the original arm __barebox_arm_head. This value
- * holds the address of the internal register window when the
- * image is started. If the window is not at the reset default
- * position any more the caller can pass the actual value here.
- */
- ".word " __stringify(MVEBU_BOOTUP_INT_REG_BASE) "\n"
- ".rept 7\n"
- ".word 0x55555555\n"
- ".endr\n"
- "2:\n"
-#ifdef CONFIG_PBL_BREAK
-#ifdef CONFIG_CPU_V8
- "brk #17\n"
-#else
- "bkpt #17\n"
-#endif
- "nop\n"
-#else
- "nop\n"
- "nop\n"
-#endif
- );
-}
-static inline void barebox_arm_head(void)
-{
- __barebox_arm_head();
- __asm__ __volatile__ (
- "b barebox_arm_reset_vector\n"
- );
-}
diff --git a/arch/arm/mach-mvebu/include/mach/bbu.h b/arch/arm/mach-mvebu/include/mach/bbu.h
deleted file mode 100644
index f8f70b6bf6..0000000000
--- a/arch/arm/mach-mvebu/include/mach/bbu.h
+++ /dev/null
@@ -1,14 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-
-#ifdef CONFIG_BAREBOX_UPDATE
-int mvebu_bbu_flash_register_handler(const char *name,
- char *devicefile, int version,
- bool isdefault);
-#else
-static inline int mvebu_bbu_flash_register_handler(const char *name,
- char *devicefile, int version,
- bool isdefault)
-{
- return -ENOSYS;
-}
-#endif
diff --git a/arch/arm/mach-mvebu/include/mach/common.h b/arch/arm/mach-mvebu/include/mach/common.h
deleted file mode 100644
index 81de0cbd79..0000000000
--- a/arch/arm/mach-mvebu/include/mach/common.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-or-later */
-/* SPDX-FileCopyrightText: 2013 Thomas Petazzoni <thomas.petazzoni@free-electrons.com> */
-/* SPDX-FileCopyrightText: 2013 Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> */
-
-#ifndef __MACH_COMMON_H__
-#define __MACH_COMMON_H__
-
-#include <asm/sections.h>
-#include <asm/unaligned.h>
-
-#define MVEBU_BOOTUP_INT_REG_BASE 0xd0000000
-#define MVEBU_REMAP_INT_REG_BASE 0xf1000000
-
-/* #including <asm/barebox-arm.h> yields a circle, so we need a forward decl */
-unsigned long get_runtime_offset(void);
-
-static inline void __iomem *mvebu_get_initial_int_reg_base(void)
-{
-#ifdef __PBL__
- u32 base = __get_unaligned_le32(_text + get_runtime_offset() + 0x30);
- return (void __force __iomem *)base;
-#else
- return (void __force __iomem *)MVEBU_REMAP_INT_REG_BASE;
-#endif
-}
-
-#endif
diff --git a/arch/arm/mach-mvebu/include/mach/debug_ll.h b/arch/arm/mach-mvebu/include/mach/debug_ll.h
deleted file mode 100644
index d213771573..0000000000
--- a/arch/arm/mach-mvebu/include/mach/debug_ll.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-or-later */
-/* SPDX-FileCopyrightText: 2013 Thomas Petazzoni <thomas.petazzoni@free-electrons.com> */
-
-#ifndef __MACH_DEBUG_LL_H__
-#define __MACH_DEBUG_LL_H__
-
-#include <io.h>
-
-#define UART_BASE 0xf1012000
-#define UARTn_BASE(n) (UART_BASE + ((n) * 0x100))
-#define UART_THR 0x00
-#define UART_LSR 0x14
-#define LSR_THRE BIT(5)
-
-#define EARLY_UART UARTn_BASE(CONFIG_MVEBU_CONSOLE_UART)
-
-static inline void PUTC_LL(char c)
-{
- /* Wait until there is space in the FIFO */
- while (!(readl(EARLY_UART + UART_LSR) & LSR_THRE))
- ;
-
- /* Send the character */
- writel(c, EARLY_UART + UART_THR);
-
- /* Wait to make sure it hits the line */
- while (!(readl(EARLY_UART + UART_LSR) & LSR_THRE))
- ;
-}
-#endif
diff --git a/arch/arm/mach-mvebu/include/mach/dove-regs.h b/arch/arm/mach-mvebu/include/mach/dove-regs.h
deleted file mode 100644
index a1335154be..0000000000
--- a/arch/arm/mach-mvebu/include/mach/dove-regs.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-or-later */
-/* SPDX-FileCopyrightText: 2013 Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> */
-
-#ifndef __MACH_MVEBU_DOVE_REGS_H
-#define __MACH_MVEBU_DOVE_REGS_H
-
-#include <mach/common.h>
-
-/*
- * Even after MVEBU SoC internal register base remap. Dove MC
- * registers are still at 0xd0800000. We remap it right after
- * internal registers to 0xf1800000.
-*/
-#define DOVE_BOOTUP_MC_REGS 0xd0800000
-#define DOVE_REMAP_MC_REGS 0xf1800000
-
-#define DOVE_INT_REGS_BASE IOMEM(MVEBU_REMAP_INT_REG_BASE)
-#define DOVE_MC_REGS_BASE IOMEM(DOVE_REMAP_MC_REGS)
-
-#define DOVE_UART_BASE (DOVE_INT_REGS_BASE + 0x12000)
-#define DOVE_UARTn_BASE(n) (DOVE_UART_BASE + ((n) * 0x100))
-
-#define DOVE_SPI0_BASE (DOVE_INT_REGS_BASE + 0x10600)
-#define DOVE_SPI1_BASE (DOVE_INT_REGS_BASE + 0x14600)
-
-#define DOVE_BRIDGE_BASE (DOVE_INT_REGS_BASE + 0x20000)
-#define INT_REGS_BASE_MAP 0x080
-#define BRIDGE_RSTOUT_MASK 0x108
-#define SOFT_RESET_OUT_EN BIT(2)
-#define BRIDGE_SYS_SOFT_RESET 0x10c
-#define SOFT_RESET_EN BIT(0)
-#define DOVE_TIMER_BASE (DOVE_INT_REGS_BASE + 0x20300)
-
-#define DOVE_SAR_BASE (DOVE_INT_REGS_BASE + 0xd0214)
-#define SAR0 0x000
-#define TCLK_FREQ_SHIFT 23
-#define TCLK_FREQ_MASK (0x3 << TCLK_FREQ_SHIFT)
-#define SAR1 0x004
-
-#define DOVE_AXI_CTRL (DOVE_INT_REGS_BASE + 0xd0224)
-#define DOVE_CPU_CTRL (DOVE_INT_REGS_BASE + 0xd025c)
-
-#define DOVE_SDRAM_BASE (DOVE_MC_REGS_BASE)
-#define SDRAM_REGS_BASE_DECODE 0x010
-#define SDRAM_MAPn(n) (0x100 + ((n) * 0x10))
-#define SDRAM_START_MASK (0x1ff << 23)
-#define SDRAM_LENGTH_SHIFT 16
-#define SDRAM_LENGTH_MASK (0x00f << SDRAM_LENGTH_SHIFT)
-#define SDRAM_ADDRESS_MASK (0x1ff << 7)
-#define SDRAM_MAP_VALID BIT(0)
-
-#endif /* __MACH_MVEBU_DOVE_REGS_H */
diff --git a/arch/arm/mach-mvebu/include/mach/kirkwood-regs.h b/arch/arm/mach-mvebu/include/mach/kirkwood-regs.h
deleted file mode 100644
index 5e21c4a587..0000000000
--- a/arch/arm/mach-mvebu/include/mach/kirkwood-regs.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-or-later */
-/* SPDX-FileCopyrightText: 2013 Thomas Petazzoni <thomas.petazzoni@free-electrons.com> */
-
-#ifndef __MACH_MVEBU_KIRKWOOD_REGS_H
-#define __MACH_MVEBU_KIRKWOOD_REGS_H
-
-#include <mach/common.h>
-
-#define KIRKWOOD_INT_REGS_BASE IOMEM(MVEBU_REMAP_INT_REG_BASE)
-
-#define KIRKWOOD_SDRAM_BASE (KIRKWOOD_INT_REGS_BASE + 0x00000)
-#define DDR_BASE_CS 0x1500
-#define DDR_BASE_CSn(n) (DDR_BASE_CS + ((n) * 0x8))
-#define DDR_BASE_CS_HIGH_MASK 0x0000000f
-#define DDR_BASE_CS_LOW_MASK 0xff000000
-#define DDR_SIZE_CS 0x1504
-#define DDR_SIZE_CSn(n) (DDR_SIZE_CS + ((n) * 0x8))
-#define DDR_SIZE_ENABLED BIT(0)
-#define DDR_SIZE_CS_MASK 0x1c
-#define DDR_SIZE_CS_SHIFT 2
-#define DDR_SIZE_MASK 0xff000000
-
-#define KIRKWOOD_SAR_BASE (KIRKWOOD_INT_REGS_BASE + 0x10030)
-#define SAR_TCLK_FREQ BIT(21)
-
-#define KIRKWOOD_UART_BASE (KIRKWOOD_INT_REGS_BASE + 0x12000)
-#define KIRKWOOD_UARTn_BASE(n) (KIRKWOOD_UART_BASE + ((n) * 0x100))
-
-#define KIRKWOOD_BRIDGE_BASE (KIRKWOOD_INT_REGS_BASE + 0x20000)
-#define BRIDGE_RSTOUT_MASK 0x108
-#define SOFT_RESET_OUT_EN BIT(2)
-#define BRIDGE_SYS_SOFT_RESET 0x10c
-#define SOFT_RESET_EN BIT(0)
-
-#define KIRKWOOD_TIMER_BASE (KIRKWOOD_INT_REGS_BASE + 0x20300)
-
-#endif /* __MACH_MVEBU_KIRKWOOD_REGS_H */
diff --git a/arch/arm/mach-mvebu/include/mach/lowlevel.h b/arch/arm/mach-mvebu/include/mach/lowlevel.h
deleted file mode 100644
index 08104b4b16..0000000000
--- a/arch/arm/mach-mvebu/include/mach/lowlevel.h
+++ /dev/null
@@ -1,13 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-or-later */
-/* SPDX-FileCopyrightText: 2013 Thomas Petazzoni <thomas.petazzoni@free-electrons.com> */
-/* SPDX-FileCopyrightText: 2013 Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> */
-
-#ifndef __MACH_LOWLEVEL_H__
-#define __MACH_LOWLEVEL_H__
-
-void mvebu_barebox_entry(void *boarddata);
-void dove_barebox_entry(void *boarddata);
-void kirkwood_barebox_entry(void *boarddata);
-void armada_370_xp_barebox_entry(void *boarddata);
-
-#endif
diff --git a/arch/arm/mach-mvebu/include/mach/socid.h b/arch/arm/mach-mvebu/include/mach/socid.h
deleted file mode 100644
index 2fcccdc0f3..0000000000
--- a/arch/arm/mach-mvebu/include/mach/socid.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-or-later */
-
-/* Marvell MVEBU SoC Ids */
-
-#ifndef __MACH_MVEBU_SOCID_H
-#define __MACH_MVEBU_SOCID_H
-
-#define PCIE_VEN_DEV_ID 0x000
-#define PCIE_REV_ID 0x008
-#define REV_ID_MASK 0xff
-
-extern u16 soc_devid;
-extern u16 soc_revid;
-
-static inline u16 mvebu_get_soc_devid(void)
-{
- return soc_devid;
-}
-
-static inline u16 mvebu_get_soc_revid(void)
-{
- return soc_revid;
-}
-
-/* Orion */
-#define DEVID_F5180 0x5180
-#define REVID_F5180N_B1 0x3
-#define DEVID_F5181 0x5181
-#define REVID_F5181_B1 0x3
-#define REVID_F5181L 0x8
-#define DEVID_F5182 0x5182
-#define REVID_F5182_A1 0x1
-#define DEVID_F6183 0x6183
-/* Kirkwood */
-#define DEVID_F6180 0x6180
-#define DEVID_F6190 0x6190
-#define DEVID_F6192 0x6192
-#define DEVID_F6280 0x6280
-#define DEVID_F6281 0x6281
-#define DEVID_F6282 0x1155
-/* Kirkwood Duo */
-#define DEVID_F6321 0x6321
-#define DEVID_F6322 0x6322
-#define DEVID_F6323 0x6323
-/* Avanta */
-#define DEVID_F6510 0x6510
-#define DEVID_F6530 0x6530
-#define DEVID_F6550 0x6550
-#define DEVID_F6560 0x6560
-/* Dove */
-#define DEVID_AP510 0x0510
-#define DEVID_F6781 0x6781
-/* Discovery Duo */
-#define DEVID_MV76100 0x7610
-#define DEVID_MV78100 0x7810
-#define DEVID_MV78200 0x7820
-/* Armada 370 */
-#define DEVID_F6707 0x6707
-#define DEVID_F6710 0x6710
-#define DEVID_F6711 0x6711
-/* Armada XP */
-#define DEVID_MV78130 0x7813
-#define DEVID_MV78160 0x7816
-#define DEVID_MV78230 0x7823
-#define DEVID_MV78260 0x7826
-#define DEVID_MV78460 0x7846
-#define DEVID_MV78880 0x7888
-
-#endif /* __MACH_MVEBU_SOCID_H */
diff --git a/arch/arm/mach-mvebu/kirkwood.c b/arch/arm/mach-mvebu/kirkwood.c
index d311058a61..4b5d1b716b 100644
--- a/arch/arm/mach-mvebu/kirkwood.c
+++ b/arch/arm/mach-mvebu/kirkwood.c
@@ -7,7 +7,7 @@
#include <restart.h>
#include <asm/memory.h>
#include <linux/mbus.h>
-#include <mach/kirkwood-regs.h>
+#include <mach/mvebu/kirkwood-regs.h>
static void __noreturn kirkwood_restart_soc(struct restart_handler *rst)
{
diff --git a/arch/arm/mach-mvebu/kwb_bbu.c b/arch/arm/mach-mvebu/kwb_bbu.c
index eb205b2799..0fde9abb57 100644
--- a/arch/arm/mach-mvebu/kwb_bbu.c
+++ b/arch/arm/mach-mvebu/kwb_bbu.c
@@ -4,7 +4,7 @@
#include <libfile.h>
#include <linux/printk.h>
-#include <mach/bbu.h>
+#include <mach/mvebu/bbu.h>
struct mvebu_bbu_handler {
struct bbu_handler bbuh;
diff --git a/arch/arm/mach-mvebu/kwbootimage.c b/arch/arm/mach-mvebu/kwbootimage.c
index 7189faa751..2bcc42fe57 100644
--- a/arch/arm/mach-mvebu/kwbootimage.c
+++ b/arch/arm/mach-mvebu/kwbootimage.c
@@ -10,7 +10,7 @@
#include <restart.h>
#include <unistd.h>
#include <asm/unaligned.h>
-#include <mach/common.h>
+#include <mach/mvebu/common.h>
static int do_bootm_kwbimage_v0_v1(struct image_data *data)
{
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-19 21:30:37 +0000