Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 3dc23f7852158fafde9eb736060f9e8131997f19

Authored by Stefan Roese
Committed by Tom Rini
1 parent d80cca29fe
Exists in v2017.01-smarct4x and in 37 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, imx_v2015.04_4.1.15_1.0.0_ga, pitx_8mp_lf_v2020.04, smarc-8m-android-10.0.0_2.6.0, smarc-8m-android-11.0.0_2.0.0, smarc-8mp-android-11.0.0_2.0.0, smarc-imx6_v2018.03_4.14.98_2.0.0_ga, smarc-imx7_v2017.03_4.9.11_1.0.0_ga, smarc-imx7_v2018.03_4.14.98_2.0.0_ga, smarc-imx_v2015.04_4.1.15_1.0.0_ga, smarc-imx_v2017.03_4.9.11_1.0.0_ga, smarc-imx_v2017.03_4.9.88_2.0.0_ga, smarc-imx_v2017.03_o8.1.0_1.3.0_8m, smarc-imx_v2018.03_4.14.78_1.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_2.0.0_ga, smarc_8m-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8m-imx_v2019.04_4.19.35_1.1.0, smarc_8m_00d0-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2019.04_4.19.35_1.1.0, smarc_8mm-imx_v2020.04_5.4.24_2.1.0, smarc_8mp_lf_v2020.04, smarc_8mq-imx_v2020.04_5.4.24_2.1.0, smarc_8mq_lf_v2020.04, ti-u-boot-2015.07, v2015.07-smarct33, v2015.07-smarct33-emmc, v2015.07-smarct4x, v2016.05-dlt, v2016.05-smarct3x, v2016.05-smarct3x-emmc, v2016.05-smarct4x, v2017.01-smarct3x, v2017.01-smarct3x-emmc

arm: marvell: Move arch/kirkwood.h to arch/soc.h 

This move makes is possible to use this header not only from kirkwood
platforms but from all Marvell mvebu platforms.

Signed-off-by: Stefan Roese <sr@denx.de>
Tested-by: Luka Perkov <luka@openwrt.org>
Acked-by: Prafulla Wadaskar <prafulla@marvell.com>

Showing 34 changed files with 105 additions and 105 deletions Side-by-side Diff

arch/arm/cpu/arm926ejs/kirkwood/cpu.c
Diff comments   View file @ 3dc23f7
... ... @@ -12,7 +12,7 @@
12 12 #include <u-boot/md5.h>
13 13 #include <asm/io.h>
14 14 #include <asm/arch/cpu.h>
15   -#include <asm/arch/kirkwood.h>
  15 +#include <asm/arch/soc.h>
16 16 #include <mvebu_mmc.h>
17 17  
18 18 #define BUFLEN 16
arch/arm/cpu/arm926ejs/kirkwood/mpp.c
Diff comments   View file @ 3dc23f7
... ... @@ -12,7 +12,7 @@
12 12 #include <common.h>
13 13 #include <asm/io.h>
14 14 #include <asm/arch/cpu.h>
15   -#include <asm/arch/kirkwood.h>
  15 +#include <asm/arch/soc.h>
16 16 #include <asm/arch/mpp.h>
17 17  
18 18 static u32 kirkwood_variant(void)
arch/arm/include/asm/arch-kirkwood/config.h
Diff comments   View file @ 3dc23f7
... ... @@ -23,7 +23,7 @@
23 23 #error "SOC Name not defined"
24 24 #endif /* CONFIG_KW88F6281 */
25 25  
26   -#include <asm/arch/kirkwood.h>
  26 +#include <asm/arch/soc.h>
27 27 #define CONFIG_ARM926EJS 1 /* Basic Architecture */
28 28 #define CONFIG_SYS_CACHELINE_SIZE 32
29 29 /* default Dcache Line length for kirkwood */
arch/arm/include/asm/arch-kirkwood/kirkwood.h
View file @ 3dc23f7
1   -/*
2   - * (C) Copyright 2009
3   - * Marvell Semiconductor <www.marvell.com>
4   - * Written-by: Prafulla Wadaskar <prafulla@marvell.com>
5   - *
6   - * Header file for the Marvell's Feroceon CPU core.
7   - *
8   - * SPDX-License-Identifier: GPL-2.0+
9   - */
10   -
11   -#ifndef _ASM_ARCH_KIRKWOOD_H
12   -#define _ASM_ARCH_KIRKWOOD_H
13   -
14   -#if defined (CONFIG_FEROCEON_88FR131) || defined (CONFIG_SHEEVA_88SV131)
15   -
16   -/* SOC specific definations */
17   -#define INTREG_BASE 0xd0000000
18   -#define KW_REGISTER(x) (KW_REGS_PHY_BASE + x)
19   -#define KW_OFFSET_REG (INTREG_BASE + 0x20080)
20   -
21   -/* undocumented registers */
22   -#define KW_REG_UNDOC_0x1470 (KW_REGISTER(0x1470))
23   -#define KW_REG_UNDOC_0x1478 (KW_REGISTER(0x1478))
24   -
25   -#define KW_TWSI_BASE (KW_REGISTER(0x11000))
26   -#define KW_UART0_BASE (KW_REGISTER(0x12000))
27   -#define KW_UART1_BASE (KW_REGISTER(0x12100))
28   -#define KW_MPP_BASE (KW_REGISTER(0x10000))
29   -#define KW_GPIO0_BASE (KW_REGISTER(0x10100))
30   -#define KW_GPIO1_BASE (KW_REGISTER(0x10140))
31   -#define KW_RTC_BASE (KW_REGISTER(0x10300))
32   -#define KW_NANDF_BASE (KW_REGISTER(0x10418))
33   -#define KW_SPI_BASE (KW_REGISTER(0x10600))
34   -#define KW_CPU_WIN_BASE (KW_REGISTER(0x20000))
35   -#define KW_CPU_REG_BASE (KW_REGISTER(0x20100))
36   -#define KW_TIMER_BASE (KW_REGISTER(0x20300))
37   -#define KW_REG_PCIE_BASE (KW_REGISTER(0x40000))
38   -#define KW_USB20_BASE (KW_REGISTER(0x50000))
39   -#define KW_EGIGA0_BASE (KW_REGISTER(0x72000))
40   -#define KW_EGIGA1_BASE (KW_REGISTER(0x76000))
41   -#define KW_SATA_BASE (KW_REGISTER(0x80000))
42   -#define KW_SDIO_BASE (KW_REGISTER(0x90000))
43   -
44   -/* Kirkwood Sata controller has two ports */
45   -#define KW_SATA_PORT0_OFFSET 0x2000
46   -#define KW_SATA_PORT1_OFFSET 0x4000
47   -
48   -/* Kirkwood GbE controller has two ports */
49   -#define MAX_MVGBE_DEVS 2
50   -#define MVGBE0_BASE KW_EGIGA0_BASE
51   -#define MVGBE1_BASE KW_EGIGA1_BASE
52   -
53   -/* Kirkwood USB Host controller */
54   -#define MVUSB0_BASE KW_USB20_BASE
55   -#define MVUSB0_CPU_ATTR_DRAM_CS0 KWCPU_ATTR_DRAM_CS0
56   -#define MVUSB0_CPU_ATTR_DRAM_CS1 KWCPU_ATTR_DRAM_CS1
57   -#define MVUSB0_CPU_ATTR_DRAM_CS2 KWCPU_ATTR_DRAM_CS2
58   -#define MVUSB0_CPU_ATTR_DRAM_CS3 KWCPU_ATTR_DRAM_CS3
59   -
60   -/* Kirkwood CPU memory windows */
61   -#define MVCPU_WIN_CTRL_DATA KWCPU_WIN_CTRL_DATA
62   -#define MVCPU_WIN_ENABLE KWCPU_WIN_ENABLE
63   -#define MVCPU_WIN_DISABLE KWCPU_WIN_DISABLE
64   -
65   -#if defined (CONFIG_KW88F6281)
66   -#include <asm/arch/kw88f6281.h>
67   -#elif defined (CONFIG_KW88F6192)
68   -#include <asm/arch/kw88f6192.h>
69   -#else
70   -#error "SOC Name not defined"
71   -#endif /* CONFIG_KW88F6281 */
72   -#endif /* CONFIG_FEROCEON_88FR131 */
73   -#endif /* _ASM_ARCH_KIRKWOOD_H */
arch/arm/include/asm/arch-kirkwood/soc.h
Diff comments   View file @ 3dc23f7
  1 +/*
  2 + * (C) Copyright 2009
  3 + * Marvell Semiconductor <www.marvell.com>
  4 + * Written-by: Prafulla Wadaskar <prafulla@marvell.com>
  5 + *
  6 + * Header file for the Marvell's Feroceon CPU core.
  7 + *
  8 + * SPDX-License-Identifier: GPL-2.0+
  9 + */
  10 +
  11 +#ifndef _ASM_ARCH_KIRKWOOD_H
  12 +#define _ASM_ARCH_KIRKWOOD_H
  13 +
  14 +#if defined (CONFIG_FEROCEON_88FR131) || defined (CONFIG_SHEEVA_88SV131)
  15 +
  16 +/* SOC specific definations */
  17 +#define INTREG_BASE 0xd0000000
  18 +#define KW_REGISTER(x) (KW_REGS_PHY_BASE + x)
  19 +#define KW_OFFSET_REG (INTREG_BASE + 0x20080)
  20 +
  21 +/* undocumented registers */
  22 +#define KW_REG_UNDOC_0x1470 (KW_REGISTER(0x1470))
  23 +#define KW_REG_UNDOC_0x1478 (KW_REGISTER(0x1478))
  24 +
  25 +#define KW_TWSI_BASE (KW_REGISTER(0x11000))
  26 +#define KW_UART0_BASE (KW_REGISTER(0x12000))
  27 +#define KW_UART1_BASE (KW_REGISTER(0x12100))
  28 +#define KW_MPP_BASE (KW_REGISTER(0x10000))
  29 +#define KW_GPIO0_BASE (KW_REGISTER(0x10100))
  30 +#define KW_GPIO1_BASE (KW_REGISTER(0x10140))
  31 +#define KW_RTC_BASE (KW_REGISTER(0x10300))
  32 +#define KW_NANDF_BASE (KW_REGISTER(0x10418))
  33 +#define KW_SPI_BASE (KW_REGISTER(0x10600))
  34 +#define KW_CPU_WIN_BASE (KW_REGISTER(0x20000))
  35 +#define KW_CPU_REG_BASE (KW_REGISTER(0x20100))
  36 +#define KW_TIMER_BASE (KW_REGISTER(0x20300))
  37 +#define KW_REG_PCIE_BASE (KW_REGISTER(0x40000))
  38 +#define KW_USB20_BASE (KW_REGISTER(0x50000))
  39 +#define KW_EGIGA0_BASE (KW_REGISTER(0x72000))
  40 +#define KW_EGIGA1_BASE (KW_REGISTER(0x76000))
  41 +#define KW_SATA_BASE (KW_REGISTER(0x80000))
  42 +#define KW_SDIO_BASE (KW_REGISTER(0x90000))
  43 +
  44 +/* Kirkwood Sata controller has two ports */
  45 +#define KW_SATA_PORT0_OFFSET 0x2000
  46 +#define KW_SATA_PORT1_OFFSET 0x4000
  47 +
  48 +/* Kirkwood GbE controller has two ports */
  49 +#define MAX_MVGBE_DEVS 2
  50 +#define MVGBE0_BASE KW_EGIGA0_BASE
  51 +#define MVGBE1_BASE KW_EGIGA1_BASE
  52 +
  53 +/* Kirkwood USB Host controller */
  54 +#define MVUSB0_BASE KW_USB20_BASE
  55 +#define MVUSB0_CPU_ATTR_DRAM_CS0 KWCPU_ATTR_DRAM_CS0
  56 +#define MVUSB0_CPU_ATTR_DRAM_CS1 KWCPU_ATTR_DRAM_CS1
  57 +#define MVUSB0_CPU_ATTR_DRAM_CS2 KWCPU_ATTR_DRAM_CS2
  58 +#define MVUSB0_CPU_ATTR_DRAM_CS3 KWCPU_ATTR_DRAM_CS3
  59 +
  60 +/* Kirkwood CPU memory windows */
  61 +#define MVCPU_WIN_CTRL_DATA KWCPU_WIN_CTRL_DATA
  62 +#define MVCPU_WIN_ENABLE KWCPU_WIN_ENABLE
  63 +#define MVCPU_WIN_DISABLE KWCPU_WIN_DISABLE
  64 +
  65 +#if defined (CONFIG_KW88F6281)
  66 +#include <asm/arch/kw88f6281.h>
  67 +#elif defined (CONFIG_KW88F6192)
  68 +#include <asm/arch/kw88f6192.h>
  69 +#else
  70 +#error "SOC Name not defined"
  71 +#endif /* CONFIG_KW88F6281 */
  72 +#endif /* CONFIG_FEROCEON_88FR131 */
  73 +#endif /* _ASM_ARCH_KIRKWOOD_H */
arch/arm/mvebu-common/dram.c
Diff comments   View file @ 3dc23f7
... ... @@ -10,7 +10,7 @@
10 10 #include <common.h>
11 11 #include <asm/io.h>
12 12 #include <asm/arch/cpu.h>
13   -#include <asm/arch/kirkwood.h>
  13 +#include <asm/arch/soc.h>
14 14  
15 15 DECLARE_GLOBAL_DATA_PTR;
16 16  
arch/arm/mvebu-common/timer.c
Diff comments   View file @ 3dc23f7
... ... @@ -7,7 +7,7 @@
7 7  
8 8 #include <common.h>
9 9 #include <asm/io.h>
10   -#include <asm/arch/kirkwood.h>
  10 +#include <asm/arch/soc.h>
11 11  
12 12 #define UBOOT_CNTR 0 /* counter to use for uboot timer */
13 13  
board/LaCie/net2big_v2/net2big_v2.c
Diff comments   View file @ 3dc23f7
... ... @@ -13,7 +13,7 @@
13 13 #include <command.h>
14 14 #include <i2c.h>
15 15 #include <asm/arch/cpu.h>
16   -#include <asm/arch/kirkwood.h>
  16 +#include <asm/arch/soc.h>
17 17 #include <asm/arch/mpp.h>
18 18 #include <asm/arch/gpio.h>
19 19  
board/LaCie/netspace_v2/netspace_v2.c
Diff comments   View file @ 3dc23f7
... ... @@ -12,7 +12,7 @@
12 12 #include <common.h>
13 13 #include <command.h>
14 14 #include <asm/arch/cpu.h>
15   -#include <asm/arch/kirkwood.h>
  15 +#include <asm/arch/soc.h>
16 16 #include <asm/arch/mpp.h>
17 17 #include <asm/arch/gpio.h>
18 18  
board/LaCie/wireless_space/wireless_space.c
Diff comments   View file @ 3dc23f7
... ... @@ -12,7 +12,7 @@
12 12 #include <common.h>
13 13 #include <command.h>
14 14 #include <asm/arch/cpu.h>
15   -#include <asm/arch/kirkwood.h>
  15 +#include <asm/arch/soc.h>
16 16 #include <asm/arch/mpp.h>
17 17 #include <asm/arch/gpio.h>
18 18  
board/Marvell/dreamplug/dreamplug.c
Diff comments   View file @ 3dc23f7
... ... @@ -12,7 +12,7 @@
12 12 #include <common.h>
13 13 #include <miiphy.h>
14 14 #include <asm/arch/cpu.h>
15   -#include <asm/arch/kirkwood.h>
  15 +#include <asm/arch/soc.h>
16 16 #include <asm/arch/mpp.h>
17 17 #include "dreamplug.h"
18 18  
board/Marvell/guruplug/guruplug.c
Diff comments   View file @ 3dc23f7
... ... @@ -9,7 +9,7 @@
9 9 #include <common.h>
10 10 #include <miiphy.h>
11 11 #include <asm/arch/cpu.h>
12   -#include <asm/arch/kirkwood.h>
  12 +#include <asm/arch/soc.h>
13 13 #include <asm/arch/mpp.h>
14 14 #include "guruplug.h"
15 15  
board/Marvell/mv88f6281gtw_ge/mv88f6281gtw_ge.c
Diff comments   View file @ 3dc23f7
... ... @@ -11,7 +11,7 @@
11 11 #include <common.h>
12 12 #include <netdev.h>
13 13 #include <asm/arch/cpu.h>
14   -#include <asm/arch/kirkwood.h>
  14 +#include <asm/arch/soc.h>
15 15 #include <asm/arch/mpp.h>
16 16 #include "mv88f6281gtw_ge.h"
17 17  
board/Marvell/openrd/openrd.c
Diff comments   View file @ 3dc23f7
... ... @@ -14,7 +14,7 @@
14 14 #include <common.h>
15 15 #include <miiphy.h>
16 16 #include <asm/arch/cpu.h>
17   -#include <asm/arch/kirkwood.h>
  17 +#include <asm/arch/soc.h>
18 18 #include <asm/arch/mpp.h>
19 19 #include "openrd.h"
20 20  
board/Marvell/rd6281a/rd6281a.c
Diff comments   View file @ 3dc23f7
... ... @@ -10,7 +10,7 @@
10 10 #include <miiphy.h>
11 11 #include <netdev.h>
12 12 #include <asm/arch/cpu.h>
13   -#include <asm/arch/kirkwood.h>
  13 +#include <asm/arch/soc.h>
14 14 #include <asm/arch/mpp.h>
15 15 #include "rd6281a.h"
16 16  
board/Marvell/sheevaplug/sheevaplug.c
Diff comments   View file @ 3dc23f7
... ... @@ -9,7 +9,7 @@
9 9 #include <common.h>
10 10 #include <miiphy.h>
11 11 #include <asm/arch/cpu.h>
12   -#include <asm/arch/kirkwood.h>
  12 +#include <asm/arch/soc.h>
13 13 #include <asm/arch/mpp.h>
14 14 #include "sheevaplug.h"
15 15  
board/Seagate/dockstar/dockstar.c
Diff comments   View file @ 3dc23f7
... ... @@ -11,7 +11,7 @@
11 11  
12 12 #include <common.h>
13 13 #include <miiphy.h>
14   -#include <asm/arch/kirkwood.h>
  14 +#include <asm/arch/soc.h>
15 15 #include <asm/arch/mpp.h>
16 16 #include <asm/arch/cpu.h>
17 17 #include <asm/io.h>
board/Seagate/goflexhome/goflexhome.c
Diff comments   View file @ 3dc23f7
... ... @@ -14,7 +14,7 @@
14 14  
15 15 #include <common.h>
16 16 #include <miiphy.h>
17   -#include <asm/arch/kirkwood.h>
  17 +#include <asm/arch/soc.h>
18 18 #include <asm/arch/mpp.h>
19 19 #include <asm/arch/cpu.h>
20 20 #include <asm/io.h>
board/buffalo/lsxl/lsxl.c
Diff comments   View file @ 3dc23f7
... ... @@ -15,7 +15,7 @@
15 15 #include <miiphy.h>
16 16 #include <spi.h>
17 17 #include <spi_flash.h>
18   -#include <asm/arch/kirkwood.h>
  18 +#include <asm/arch/soc.h>
19 19 #include <asm/arch/cpu.h>
20 20 #include <asm/arch/mpp.h>
21 21 #include <asm/arch/gpio.h>
board/cloudengines/pogo_e02/pogo_e02.c
Diff comments   View file @ 3dc23f7
... ... @@ -13,7 +13,7 @@
13 13 #include <common.h>
14 14 #include <miiphy.h>
15 15 #include <asm/arch/cpu.h>
16   -#include <asm/arch/kirkwood.h>
  16 +#include <asm/arch/soc.h>
17 17 #include <asm/arch/mpp.h>
18 18 #include "pogo_e02.h"
19 19  
board/d-link/dns325/dns325.c
Diff comments   View file @ 3dc23f7
... ... @@ -14,7 +14,7 @@
14 14 #include <miiphy.h>
15 15 #include <netdev.h>
16 16 #include <asm/arch/cpu.h>
17   -#include <asm/arch/kirkwood.h>
  17 +#include <asm/arch/soc.h>
18 18 #include <asm/arch/mpp.h>
19 19 #include <asm/arch/gpio.h>
20 20 #include "dns325.h"
board/iomega/iconnect/iconnect.c
Diff comments   View file @ 3dc23f7
... ... @@ -9,7 +9,7 @@
9 9 #include <common.h>
10 10 #include <miiphy.h>
11 11 #include <asm/arch/cpu.h>
12   -#include <asm/arch/kirkwood.h>
  12 +#include <asm/arch/soc.h>
13 13 #include <asm/arch/mpp.h>
14 14 #include "iconnect.h"
15 15  
board/karo/tk71/tk71.c
Diff comments   View file @ 3dc23f7
... ... @@ -8,7 +8,7 @@
8 8 #include <common.h>
9 9 #include <miiphy.h>
10 10 #include <asm/arch/cpu.h>
11   -#include <asm/arch/kirkwood.h>
  11 +#include <asm/arch/soc.h>
12 12 #include <asm/arch/mpp.h>
13 13 #include <asm/io.h>
14 14  
board/keymile/km_arm/km_arm.c
Diff comments   View file @ 3dc23f7
... ... @@ -20,7 +20,7 @@
20 20 #include <spi.h>
21 21 #include <asm/io.h>
22 22 #include <asm/arch/cpu.h>
23   -#include <asm/arch/kirkwood.h>
  23 +#include <asm/arch/soc.h>
24 24 #include <asm/arch/mpp.h>
25 25  
26 26 #include "../common/common.h"
board/raidsonic/ib62x0/ib62x0.c
Diff comments   View file @ 3dc23f7
... ... @@ -11,7 +11,7 @@
11 11 #include <miiphy.h>
12 12 #include <asm/io.h>
13 13 #include <asm/arch/cpu.h>
14   -#include <asm/arch/kirkwood.h>
  14 +#include <asm/arch/soc.h>
15 15 #include <asm/arch/mpp.h>
16 16 #include "ib62x0.h"
17 17  
drivers/block/mvsata_ide.c
Diff comments   View file @ 3dc23f7
... ... @@ -12,7 +12,7 @@
12 12 #if defined(CONFIG_ORION5X)
13 13 #include <asm/arch/orion5x.h>
14 14 #elif defined(CONFIG_KIRKWOOD)
15   -#include <asm/arch/kirkwood.h>
  15 +#include <asm/arch/soc.h>
16 16 #endif
17 17  
18 18 /* SATA port registers */
drivers/gpio/kw_gpio.c
Diff comments   View file @ 3dc23f7
... ... @@ -16,7 +16,7 @@
16 16 #include <common.h>
17 17 #include <asm/bitops.h>
18 18 #include <asm/io.h>
19   -#include <asm/arch/kirkwood.h>
  19 +#include <asm/arch/soc.h>
20 20 #include <asm/arch/gpio.h>
21 21  
22 22 static unsigned long gpio_valid_input[BITS_TO_LONGS(GPIO_MAX)];
drivers/i2c/mvtwsi.c
Diff comments   View file @ 3dc23f7
... ... @@ -21,7 +21,7 @@
21 21 #if defined(CONFIG_ORION5X)
22 22 #include <asm/arch/orion5x.h>
23 23 #elif defined(CONFIG_KIRKWOOD)
24   -#include <asm/arch/kirkwood.h>
  24 +#include <asm/arch/soc.h>
25 25 #elif defined(CONFIG_SUNXI)
26 26 #include <asm/arch/i2c.h>
27 27 #else
drivers/mmc/mvebu_mmc.c
Diff comments   View file @ 3dc23f7
... ... @@ -14,7 +14,7 @@
14 14 #include <mmc.h>
15 15 #include <asm/io.h>
16 16 #include <asm/arch/cpu.h>
17   -#include <asm/arch/kirkwood.h>
  17 +#include <asm/arch/soc.h>
18 18 #include <mvebu_mmc.h>
19 19  
20 20 DECLARE_GLOBAL_DATA_PTR;
drivers/mtd/nand/kirkwood_nand.c
Diff comments   View file @ 3dc23f7
... ... @@ -8,7 +8,7 @@
8 8  
9 9 #include <common.h>
10 10 #include <asm/io.h>
11   -#include <asm/arch/kirkwood.h>
  11 +#include <asm/arch/soc.h>
12 12 #include <nand.h>
13 13  
14 14 /* NAND Flash Soc registers */
... ... @@ -24,7 +24,7 @@
24 24 #include <asm/arch/cpu.h>
25 25  
26 26 #if defined(CONFIG_KIRKWOOD)
27   -#include <asm/arch/kirkwood.h>
  27 +#include <asm/arch/soc.h>
28 28 #elif defined(CONFIG_ORION5X)
29 29 #include <asm/arch/orion5x.h>
30 30 #elif defined(CONFIG_DOVE)
... ... @@ -12,7 +12,7 @@
12 12 #ifndef _MVRTC_H_
13 13 #define _MVRTC_H_
14 14  
15   -#include <asm/arch/kirkwood.h>
  15 +#include <asm/arch/soc.h>
16 16 #include <compiler.h>
17 17  
18 18 /* RTC registers */
drivers/spi/kirkwood_spi.c
Diff comments   View file @ 3dc23f7
... ... @@ -12,7 +12,7 @@
12 12 #include <malloc.h>
13 13 #include <spi.h>
14 14 #include <asm/io.h>
15   -#include <asm/arch/kirkwood.h>
  15 +#include <asm/arch/soc.h>
16 16 #include <asm/arch/spi.h>
17 17 #include <asm/arch/mpp.h>
18 18  
drivers/usb/host/ehci-marvell.c
Diff comments   View file @ 3dc23f7
... ... @@ -13,7 +13,7 @@
13 13 #include <asm/arch/cpu.h>
14 14  
15 15 #if defined(CONFIG_KIRKWOOD)
16   -#include <asm/arch/kirkwood.h>
  16 +#include <asm/arch/soc.h>
17 17 #elif defined(CONFIG_ORION5X)
18 18 #include <asm/arch/orion5x.h>
19 19 #endif