brain-hackers_pepepper-mirror/u-boot-brain
1
0
Fork 0
mirror of https://github.com/brain-hackers/u-boot-brain synced 2024-06-09 23:36:03 +09:00
Code Issues Projects Releases Wiki Activity

rockchip: use 'arch-rockchip' as header file path

Browse Source 
Rockchip use 'arch-rockchip' instead of arch-$(SOC) as common
header file path, so that we can get the correct path directly.

Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
Reviewed-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
This commit is contained in:
Kever Yang 2019-03-28 11:01:23 +08:00 committed by Philipp Tomsich
parent 6916dad511
commit 15f09a1a83
100 changed files with 289 additions and 290 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/include/asm/arch-rockchip/ddr_rk3188.h
View File

@ -6,7 +6,7 @@
#ifndef _ASM_ARCH_DDR_RK3188_H #ifndef _ASM_ARCH_DDR_RK3188_H
#define _ASM_ARCH_DDR_RK3188_H #define _ASM_ARCH_DDR_RK3188_H
#include <asm/arch/ddr_rk3288.h> #include <asm/arch-rockchip/ddr_rk3288.h>
/* /*
* RK3188 Memory scheduler register map. * RK3188 Memory scheduler register map.

2
arch/arm/mach-rockchip/Kconfig
View File

@ -192,7 +192,7 @@ config ROCKCHIP_BOOT_MODE_REG
default 0x10300580 if ROCKCHIP_RV1108 default 0x10300580 if ROCKCHIP_RV1108
default 0 default 0
help help
The Soc will enter to different boot mode(defined in asm/arch/boot_mode.h) The Soc will enter to different boot mode(defined in asm/arch-rockchip/boot_mode.h)
according to the value from this register. according to the value from this register.
config ROCKCHIP_SPL_RESERVE_IRAM config ROCKCHIP_SPL_RESERVE_IRAM

2
arch/arm/mach-rockchip/boot_mode.c
View File

@ -6,7 +6,7 @@
#include <common.h> #include <common.h>
#include <adc.h> #include <adc.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/arch/boot_mode.h> #include <asm/arch-rockchip/boot_mode.h>
#if (CONFIG_ROCKCHIP_BOOT_MODE_REG == 0) #if (CONFIG_ROCKCHIP_BOOT_MODE_REG == 0)

4
arch/arm/mach-rockchip/bootrom.c
View File

@ -4,8 +4,8 @@
*/ */
#include <common.h> #include <common.h>
#include <asm/arch/bootrom.h> #include <asm/arch-rockchip/bootrom.h>
#include <asm/arch/boot_mode.h> #include <asm/arch-rockchip/boot_mode.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/setjmp.h> #include <asm/setjmp.h>
#include <asm/system.h> #include <asm/system.h>

12
arch/arm/mach-rockchip/rk3036-board-spl.c
View File

@ -6,12 +6,12 @@
#include <common.h> #include <common.h>
#include <debug_uart.h> #include <debug_uart.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/arch/bootrom.h> #include <asm/arch-rockchip/bootrom.h>
#include <asm/arch/grf_rk3036.h> #include <asm/arch-rockchip/grf_rk3036.h>
#include <asm/arch/hardware.h> #include <asm/arch-rockchip/hardware.h>
#include <asm/arch/sdram_rk3036.h> #include <asm/arch-rockchip/sdram_rk3036.h>
#include <asm/arch/timer.h> #include <asm/arch-rockchip/timer.h>
#include <asm/arch/uart.h> #include <asm/arch-rockchip/uart.h>
#define GRF_BASE 0x20008000 #define GRF_BASE 0x20008000

10
arch/arm/mach-rockchip/rk3036-board.c
View File

@ -9,11 +9,11 @@
#include <ram.h> #include <ram.h>
#include <asm/gpio.h> #include <asm/gpio.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/arch/clock.h> #include <asm/arch-rockchip/clock.h>
#include <asm/arch/periph.h> #include <asm/arch-rockchip/periph.h>
#include <asm/arch/grf_rk3036.h> #include <asm/arch-rockchip/grf_rk3036.h>
#include <asm/arch/boot_mode.h> #include <asm/arch-rockchip/boot_mode.h>
#include <asm/arch/sdram_rk3036.h> #include <asm/arch-rockchip/sdram_rk3036.h>
#include <dm/pinctrl.h> #include <dm/pinctrl.h>
DECLARE_GLOBAL_DATA_PTR; DECLARE_GLOBAL_DATA_PTR;

4
arch/arm/mach-rockchip/rk3036/clk_rk3036.c
View File

@ -7,8 +7,8 @@
#include <common.h> #include <common.h>
#include <dm.h> #include <dm.h>
#include <syscon.h> #include <syscon.h>
#include <asm/arch/clock.h> #include <asm/arch-rockchip/clock.h>
#include <asm/arch/cru_rk3036.h> #include <asm/arch-rockchip/cru_rk3036.h>
int rockchip_get_clk(struct udevice **devp) int rockchip_get_clk(struct udevice **devp)
{ {

12
arch/arm/mach-rockchip/rk3036/sdram_rk3036.c
View File

@ -5,12 +5,12 @@
#include <common.h> #include <common.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/types.h> #include <asm/types.h>
#include <asm/arch/cru_rk3036.h> #include <asm/arch-rockchip/cru_rk3036.h>
#include <asm/arch/grf_rk3036.h> #include <asm/arch-rockchip/grf_rk3036.h>
#include <asm/arch/hardware.h> #include <asm/arch-rockchip/hardware.h>
#include <asm/arch/sdram_rk3036.h> #include <asm/arch-rockchip/sdram_rk3036.h>
#include <asm/arch/timer.h> #include <asm/arch-rockchip/timer.h>
#include <asm/arch/uart.h> #include <asm/arch-rockchip/uart.h>
/* /*
* we can not fit the code to access the device tree in SPL * we can not fit the code to access the device tree in SPL

2
arch/arm/mach-rockchip/rk3036/syscon_rk3036.c
View File

@ -6,7 +6,7 @@
#include <common.h> #include <common.h>
#include <dm.h> #include <dm.h>
#include <syscon.h> #include <syscon.h>
#include <asm/arch/clock.h> #include <asm/arch-rockchip/clock.h>
static const struct udevice_id rk3036_syscon_ids[] = { static const struct udevice_id rk3036_syscon_ids[] = {
{ .compatible = "rockchip,rk3036-grf", .data = ROCKCHIP_SYSCON_GRF }, { .compatible = "rockchip,rk3036-grf", .data = ROCKCHIP_SYSCON_GRF },

10
arch/arm/mach-rockchip/rk3128-board.c
View File

@ -8,11 +8,11 @@
#include <ram.h> #include <ram.h>
#include <syscon.h> #include <syscon.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/arch/clock.h> #include <asm/arch-rockchip/clock.h>
#include <asm/arch/periph.h> #include <asm/arch-rockchip/periph.h>
#include <asm/arch/grf_rk3128.h> #include <asm/arch-rockchip/grf_rk3128.h>
#include <asm/arch/boot_mode.h> #include <asm/arch-rockchip/boot_mode.h>
#include <asm/arch/timer.h> #include <asm/arch-rockchip/timer.h>
#include <power/regulator.h> #include <power/regulator.h>
DECLARE_GLOBAL_DATA_PTR; DECLARE_GLOBAL_DATA_PTR;

4
arch/arm/mach-rockchip/rk3128/clk_rk3128.c
View File

@ -6,8 +6,8 @@
#include <common.h> #include <common.h>
#include <dm.h> #include <dm.h>
#include <syscon.h> #include <syscon.h>
#include <asm/arch/clock.h> #include <asm/arch-rockchip/clock.h>
#include <asm/arch/cru_rk3128.h> #include <asm/arch-rockchip/cru_rk3128.h>
int rockchip_get_clk(struct udevice **devp) int rockchip_get_clk(struct udevice **devp)
{ {

2
arch/arm/mach-rockchip/rk3128/syscon_rk3128.c
View File

@ -6,7 +6,7 @@
#include <common.h> #include <common.h>
#include <dm.h> #include <dm.h>
#include <syscon.h> #include <syscon.h>
#include <asm/arch/clock.h> #include <asm/arch-rockchip/clock.h>
static const struct udevice_id rk3128_syscon_ids[] = { static const struct udevice_id rk3128_syscon_ids[] = {
{ .compatible = "rockchip,rk3128-grf", .data = ROCKCHIP_SYSCON_GRF }, { .compatible = "rockchip,rk3128-grf", .data = ROCKCHIP_SYSCON_GRF },

16
arch/arm/mach-rockchip/rk3188-board-spl.c
View File

@ -15,14 +15,14 @@
#include <syscon.h> #include <syscon.h>
#include <asm/gpio.h> #include <asm/gpio.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/arch/bootrom.h> #include <asm/arch-rockchip/bootrom.h>
#include <asm/arch/clock.h> #include <asm/arch-rockchip/clock.h>
#include <asm/arch/grf_rk3188.h> #include <asm/arch-rockchip/grf_rk3188.h>
#include <asm/arch/hardware.h> #include <asm/arch-rockchip/hardware.h>
#include <asm/arch/periph.h> #include <asm/arch-rockchip/periph.h>
#include <asm/arch/pmu_rk3188.h> #include <asm/arch-rockchip/pmu_rk3188.h>
#include <asm/arch/sdram.h> #include <asm/arch-rockchip/sdram.h>
#include <asm/arch/timer.h> #include <asm/arch-rockchip/timer.h>
#include <dm/pinctrl.h> #include <dm/pinctrl.h>
#include <dm/root.h> #include <dm/root.h>
#include <dm/test.h> #include <dm/test.h>

10
arch/arm/mach-rockchip/rk3188-board.c
View File

@ -10,11 +10,11 @@
#include <syscon.h> #include <syscon.h>
#include <asm/gpio.h> #include <asm/gpio.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/arch/clock.h> #include <asm/arch-rockchip/clock.h>
#include <asm/arch/grf_rk3188.h> #include <asm/arch-rockchip/grf_rk3188.h>
#include <asm/arch/periph.h> #include <asm/arch-rockchip/periph.h>
#include <asm/arch/pmu_rk3288.h> #include <asm/arch-rockchip/pmu_rk3288.h>
#include <asm/arch/boot_mode.h> #include <asm/arch-rockchip/boot_mode.h>
#include <dm/pinctrl.h> #include <dm/pinctrl.h>
__weak int rk_board_late_init(void) __weak int rk_board_late_init(void)

4
arch/arm/mach-rockchip/rk3188/clk_rk3188.c
View File

@ -7,8 +7,8 @@
#include <common.h> #include <common.h>
#include <dm.h> #include <dm.h>
#include <syscon.h> #include <syscon.h>
#include <asm/arch/clock.h> #include <asm/arch-rockchip/clock.h>
#include <asm/arch/cru_rk3188.h> #include <asm/arch-rockchip/cru_rk3188.h>
int rockchip_get_clk(struct udevice **devp) int rockchip_get_clk(struct udevice **devp)
{ {

2
arch/arm/mach-rockchip/rk3188/syscon_rk3188.c
View File

@ -7,7 +7,7 @@
#include <common.h> #include <common.h>
#include <dm.h> #include <dm.h>
#include <syscon.h> #include <syscon.h>
#include <asm/arch/clock.h> #include <asm/arch-rockchip/clock.h>
static const struct udevice_id rk3188_syscon_ids[] = { static const struct udevice_id rk3188_syscon_ids[] = {
{ .compatible = "rockchip,rk3188-noc", .data = ROCKCHIP_SYSCON_NOC }, { .compatible = "rockchip,rk3188-noc", .data = ROCKCHIP_SYSCON_NOC },

12
arch/arm/mach-rockchip/rk322x-board-spl.c
View File

@ -9,12 +9,12 @@
#include <ram.h> #include <ram.h>
#include <spl.h> #include <spl.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/arch/bootrom.h> #include <asm/arch-rockchip/bootrom.h>
#include <asm/arch/cru_rk322x.h> #include <asm/arch-rockchip/cru_rk322x.h>
#include <asm/arch/grf_rk322x.h> #include <asm/arch-rockchip/grf_rk322x.h>
#include <asm/arch/hardware.h> #include <asm/arch-rockchip/hardware.h>
#include <asm/arch/timer.h> #include <asm/arch-rockchip/timer.h>
#include <asm/arch/uart.h> #include <asm/arch-rockchip/uart.h>
u32 spl_boot_device(void) u32 spl_boot_device(void)
{ {

10
arch/arm/mach-rockchip/rk322x-board.c
View File

@ -8,10 +8,10 @@
#include <ram.h> #include <ram.h>
#include <syscon.h> #include <syscon.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/arch/boot_mode.h> #include <asm/arch-rockchip/boot_mode.h>
#include <asm/arch/clock.h> #include <asm/arch-rockchip/clock.h>
#include <asm/arch/periph.h> #include <asm/arch-rockchip/periph.h>
#include <asm/arch/grf_rk322x.h> #include <asm/arch-rockchip/grf_rk322x.h>
DECLARE_GLOBAL_DATA_PTR; DECLARE_GLOBAL_DATA_PTR;
@ -29,7 +29,7 @@ int board_late_init(void)
int board_init(void) int board_init(void)
{ {
#include <asm/arch/grf_rk322x.h> #include <asm/arch-rockchip/grf_rk322x.h>
/* Enable early UART2 channel 1 on the RK322x */ /* Enable early UART2 channel 1 on the RK322x */
#define GRF_BASE 0x11000000 #define GRF_BASE 0x11000000
struct rk322x_grf * const grf = (void *)GRF_BASE; struct rk322x_grf * const grf = (void *)GRF_BASE;

4
arch/arm/mach-rockchip/rk322x/clk_rk322x.c
View File

@ -6,8 +6,8 @@
#include <common.h> #include <common.h>
#include <dm.h> #include <dm.h>
#include <syscon.h> #include <syscon.h>
#include <asm/arch/clock.h> #include <asm/arch-rockchip/clock.h>
#include <asm/arch/cru_rk322x.h> #include <asm/arch-rockchip/cru_rk322x.h>
int rockchip_get_clk(struct udevice **devp) int rockchip_get_clk(struct udevice **devp)
{ {

2
arch/arm/mach-rockchip/rk322x/syscon_rk322x.c
View File

@ -6,7 +6,7 @@
#include <common.h> #include <common.h>
#include <dm.h> #include <dm.h>
#include <syscon.h> #include <syscon.h>
#include <asm/arch/clock.h> #include <asm/arch-rockchip/clock.h>
static const struct udevice_id rk322x_syscon_ids[] = { static const struct udevice_id rk322x_syscon_ids[] = {
{ .compatible = "rockchip,rk3228-grf", .data = ROCKCHIP_SYSCON_GRF }, { .compatible = "rockchip,rk3228-grf", .data = ROCKCHIP_SYSCON_GRF },

20
arch/arm/mach-rockchip/rk3288-board-spl.c
View File

@ -14,15 +14,15 @@
#include <spl.h> #include <spl.h>
#include <asm/gpio.h> #include <asm/gpio.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/arch/bootrom.h> #include <asm/arch-rockchip/bootrom.h>
#include <asm/arch/clock.h> #include <asm/arch-rockchip/clock.h>
#include <asm/arch/hardware.h> #include <asm/arch-rockchip/hardware.h>
#include <asm/arch/periph.h> #include <asm/arch-rockchip/periph.h>
#include <asm/arch/pmu_rk3288.h> #include <asm/arch-rockchip/pmu_rk3288.h>
#include <asm/arch/sdram.h> #include <asm/arch-rockchip/sdram.h>
#include <asm/arch/sdram_common.h> #include <asm/arch-rockchip/sdram_common.h>
#include <asm/arch/sys_proto.h> #include <asm/arch-rockchip/sys_proto.h>
#include <asm/arch/timer.h> #include <asm/arch-rockchip/timer.h>
#include <dm/pinctrl.h> #include <dm/pinctrl.h>
#include <dm/root.h> #include <dm/root.h>
#include <dm/test.h> #include <dm/test.h>
@ -110,7 +110,7 @@ void board_init_f(ulong dummy)
int ret; int ret;
/* Example code showing how to enable the debug UART on RK3288 */ /* Example code showing how to enable the debug UART on RK3288 */
#include <asm/arch/grf_rk3288.h> #include <asm/arch-rockchip/grf_rk3288.h>
/* Enable early UART on the RK3288 */ /* Enable early UART on the RK3288 */
#define GRF_BASE 0xff770000 #define GRF_BASE 0xff770000
struct rk3288_grf * const grf = (void *)GRF_BASE; struct rk3288_grf * const grf = (void *)GRF_BASE;

14
arch/arm/mach-rockchip/rk3288-board-tpl.c
View File

@ -10,13 +10,13 @@
#include <spl.h> #include <spl.h>
#include <version.h> #include <version.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/arch/bootrom.h> #include <asm/arch-rockchip/bootrom.h>
#include <asm/arch/clock.h> #include <asm/arch-rockchip/clock.h>
#include <asm/arch/grf_rk3288.h> #include <asm/arch-rockchip/grf_rk3288.h>
#include <asm/arch/periph.h> #include <asm/arch-rockchip/periph.h>
#include <asm/arch/pmu_rk3288.h> #include <asm/arch-rockchip/pmu_rk3288.h>
#include <asm/arch/sys_proto.h> #include <asm/arch-rockchip/sys_proto.h>
#include <asm/arch/timer.h> #include <asm/arch-rockchip/timer.h>
#define GRF_BASE 0xff770000 #define GRF_BASE 0xff770000
void board_init_f(ulong dummy) void board_init_f(ulong dummy)

12
arch/arm/mach-rockchip/rk3288-board.c
View File

@ -9,12 +9,12 @@
#include <ram.h> #include <ram.h>
#include <syscon.h> #include <syscon.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/arch/clock.h> #include <asm/arch-rockchip/clock.h>
#include <asm/arch/cru_rk3288.h> #include <asm/arch-rockchip/cru_rk3288.h>
#include <asm/arch/periph.h> #include <asm/arch-rockchip/periph.h>
#include <asm/arch/pmu_rk3288.h> #include <asm/arch-rockchip/pmu_rk3288.h>
#include <asm/arch/qos_rk3288.h> #include <asm/arch-rockchip/qos_rk3288.h>
#include <asm/arch/boot_mode.h> #include <asm/arch-rockchip/boot_mode.h>
#include <asm/gpio.h> #include <asm/gpio.h>
#include <dm/pinctrl.h> #include <dm/pinctrl.h>
#include <dt-bindings/clock/rk3288-cru.h> #include <dt-bindings/clock/rk3288-cru.h>

4
arch/arm/mach-rockchip/rk3288/clk_rk3288.c
View File

@ -7,8 +7,8 @@
#include <common.h> #include <common.h>
#include <dm.h> #include <dm.h>
#include <syscon.h> #include <syscon.h>
#include <asm/arch/clock.h> #include <asm/arch-rockchip/clock.h>
#include <asm/arch/cru_rk3288.h> #include <asm/arch-rockchip/cru_rk3288.h>
int rockchip_get_clk(struct udevice **devp) int rockchip_get_clk(struct udevice **devp)
{ {

2
arch/arm/mach-rockchip/rk3288/rk3288.c
View File

@ -3,7 +3,7 @@
* Copyright (c) 2016 Rockchip Electronics Co., Ltd * Copyright (c) 2016 Rockchip Electronics Co., Ltd
*/ */
#include <asm/io.h> #include <asm/io.h>
#include <asm/arch/hardware.h> #include <asm/arch-rockchip/hardware.h>
#define GRF_SOC_CON2 0xff77024c #define GRF_SOC_CON2 0xff77024c

2
arch/arm/mach-rockchip/rk3288/syscon_rk3288.c
View File

@ -7,7 +7,7 @@
#include <common.h> #include <common.h>
#include <dm.h> #include <dm.h>
#include <syscon.h> #include <syscon.h>
#include <asm/arch/clock.h> #include <asm/arch-rockchip/clock.h>
static const struct udevice_id rk3288_syscon_ids[] = { static const struct udevice_id rk3288_syscon_ids[] = {
{ .compatible = "rockchip,rk3288-noc", .data = ROCKCHIP_SYSCON_NOC }, { .compatible = "rockchip,rk3288-noc", .data = ROCKCHIP_SYSCON_NOC },

4
arch/arm/mach-rockchip/rk3328/clk_rk3328.c
View File

@ -5,8 +5,8 @@
#include <common.h> #include <common.h>
#include <dm.h> #include <dm.h>
#include <asm/arch/clock.h> #include <asm/arch-rockchip/clock.h>
#include <asm/arch/cru_rk3328.h> #include <asm/arch-rockchip/cru_rk3328.h>
int rockchip_get_clk(struct udevice **devp) int rockchip_get_clk(struct udevice **devp)
{ {

2
arch/arm/mach-rockchip/rk3328/rk3328.c
View File

@ -4,7 +4,7 @@
*/ */
#include <common.h> #include <common.h>
#include <asm/arch/hardware.h> #include <asm/arch-rockchip/hardware.h>
#include <asm/armv8/mmu.h> #include <asm/armv8/mmu.h>
#include <asm/io.h> #include <asm/io.h>

2
arch/arm/mach-rockchip/rk3328/syscon_rk3328.c
View File

@ -4,7 +4,7 @@
*/ */
#include <common.h> #include <common.h>
#include <asm/arch/clock.h> #include <asm/arch-rockchip/clock.h>
#include <dm.h> #include <dm.h>
#include <syscon.h> #include <syscon.h>

10
arch/arm/mach-rockchip/rk3368-board-spl.c
View File

@ -9,11 +9,11 @@
#include <ram.h> #include <ram.h>
#include <spl.h> #include <spl.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/arch/cru_rk3368.h> #include <asm/arch-rockchip/cru_rk3368.h>
#include <asm/arch/grf_rk3368.h> #include <asm/arch-rockchip/grf_rk3368.h>
#include <asm/arch/hardware.h> #include <asm/arch-rockchip/hardware.h>
#include <asm/arch/periph.h> #include <asm/arch-rockchip/periph.h>
#include <asm/arch/timer.h> #include <asm/arch-rockchip/timer.h>
#include <dm/pinctrl.h> #include <dm/pinctrl.h>
void board_debug_uart_init(void) void board_debug_uart_init(void)

12
arch/arm/mach-rockchip/rk3368-board-tpl.c
View File

@ -10,12 +10,12 @@
#include <spl.h> #include <spl.h>
#include <syscon.h> #include <syscon.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/arch/bootrom.h> #include <asm/arch-rockchip/bootrom.h>
#include <asm/arch/clock.h> #include <asm/arch-rockchip/clock.h>
#include <asm/arch/cru_rk3368.h> #include <asm/arch-rockchip/cru_rk3368.h>
#include <asm/arch/grf_rk3368.h> #include <asm/arch-rockchip/grf_rk3368.h>
#include <asm/arch/hardware.h> #include <asm/arch-rockchip/hardware.h>
#include <asm/arch/timer.h> #include <asm/arch-rockchip/timer.h>
/* /*
* The SPL (and also the full U-Boot stage on the RK3368) will run in * The SPL (and also the full U-Boot stage on the RK3368) will run in

4
arch/arm/mach-rockchip/rk3368/clk_rk3368.c
View File

@ -7,8 +7,8 @@
#include <common.h> #include <common.h>
#include <dm.h> #include <dm.h>
#include <syscon.h> #include <syscon.h>
#include <asm/arch/clock.h> #include <asm/arch-rockchip/clock.h>
#include <asm/arch/cru_rk3368.h> #include <asm/arch-rockchip/cru_rk3368.h>
int rockchip_get_clk(struct udevice **devp) int rockchip_get_clk(struct udevice **devp)
{ {

6
arch/arm/mach-rockchip/rk3368/rk3368.c
View File

@ -7,9 +7,9 @@
#include <common.h> #include <common.h>
#include <asm/armv8/mmu.h> #include <asm/armv8/mmu.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/arch/clock.h> #include <asm/arch-rockchip/clock.h>
#include <asm/arch/cru_rk3368.h> #include <asm/arch-rockchip/cru_rk3368.h>
#include <asm/arch/grf_rk3368.h> #include <asm/arch-rockchip/grf_rk3368.h>
#include <syscon.h> #include <syscon.h>
DECLARE_GLOBAL_DATA_PTR; DECLARE_GLOBAL_DATA_PTR;

2
arch/arm/mach-rockchip/rk3368/syscon_rk3368.c
View File

@ -8,7 +8,7 @@
#include <common.h> #include <common.h>
#include <dm.h> #include <dm.h>
#include <syscon.h> #include <syscon.h>
#include <asm/arch/clock.h> #include <asm/arch-rockchip/clock.h>
static const struct udevice_id rk3368_syscon_ids[] = { static const struct udevice_id rk3368_syscon_ids[] = {
{ .compatible = "rockchip,rk3368-grf", { .compatible = "rockchip,rk3368-grf",

12
arch/arm/mach-rockchip/rk3399-board-spl.c
View File

@ -12,12 +12,12 @@
#include <spl_gpio.h> #include <spl_gpio.h>
#include <syscon.h> #include <syscon.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/arch/bootrom.h> #include <asm/arch-rockchip/bootrom.h>
#include <asm/arch/clock.h> #include <asm/arch-rockchip/clock.h>
#include <asm/arch/grf_rk3399.h> #include <asm/arch-rockchip/grf_rk3399.h>
#include <asm/arch/hardware.h> #include <asm/arch-rockchip/hardware.h>
#include <asm/arch/periph.h> #include <asm/arch-rockchip/periph.h>
#include <asm/arch/sys_proto.h> #include <asm/arch-rockchip/sys_proto.h>
#include <dm/pinctrl.h> #include <dm/pinctrl.h>
void board_return_to_bootrom(void) void board_return_to_bootrom(void)

2
arch/arm/mach-rockchip/rk3399-board.c
View File

@ -4,7 +4,7 @@
*/ */
#include <common.h> #include <common.h>
#include <asm/arch/boot_mode.h> #include <asm/arch-rockchip/boot_mode.h>
int board_late_init(void) int board_late_init(void)
{ {

4
arch/arm/mach-rockchip/rk3399/clk_rk3399.c
View File

@ -7,8 +7,8 @@
#include <common.h> #include <common.h>
#include <dm.h> #include <dm.h>
#include <syscon.h> #include <syscon.h>
#include <asm/arch/clock.h> #include <asm/arch-rockchip/clock.h>
#include <asm/arch/cru_rk3399.h> #include <asm/arch-rockchip/cru_rk3399.h>
static int rockchip_get_cruclk(struct udevice **devp) static int rockchip_get_cruclk(struct udevice **devp)
{ {

3
arch/arm/mach-rockchip/rk3399/rk3399.c
View File

@ -4,9 +4,10 @@
*/ */
#include <common.h> #include <common.h>
#include <spl_gpio.h>
#include <asm/armv8/mmu.h> #include <asm/armv8/mmu.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/arch/hardware.h> #include <asm/arch-rockchip/hardware.h>
DECLARE_GLOBAL_DATA_PTR; DECLARE_GLOBAL_DATA_PTR;

2
arch/arm/mach-rockchip/rk3399/syscon_rk3399.c
View File

@ -6,7 +6,7 @@
#include <common.h> #include <common.h>
#include <dm.h> #include <dm.h>
#include <syscon.h> #include <syscon.h>
#include <asm/arch/clock.h> #include <asm/arch-rockchip/clock.h>
static const struct udevice_id rk3399_syscon_ids[] = { static const struct udevice_id rk3399_syscon_ids[] = {
{ .compatible = "rockchip,rk3399-grf", .data = ROCKCHIP_SYSCON_GRF }, { .compatible = "rockchip,rk3399-grf", .data = ROCKCHIP_SYSCON_GRF },

2
arch/arm/mach-rockchip/rk_timer.c
View File

@ -4,7 +4,7 @@
*/ */
#include <common.h> #include <common.h>
#include <asm/arch/timer.h> #include <asm/arch-rockchip/timer.h>
#include <asm/io.h> #include <asm/io.h>
#include <linux/types.h> #include <linux/types.h>

4
arch/arm/mach-rockchip/rv1108/clk_rv1108.c
View File

@ -7,8 +7,8 @@
#include <common.h> #include <common.h>
#include <dm.h> #include <dm.h>
#include <syscon.h> #include <syscon.h>
#include <asm/arch/clock.h> #include <asm/arch-rockchip/clock.h>
#include <asm/arch/cru_rv1108.h> #include <asm/arch-rockchip/cru_rv1108.h>
int rockchip_get_clk(struct udevice **devp) int rockchip_get_clk(struct udevice **devp)
{ {

2
arch/arm/mach-rockchip/rv1108/syscon_rv1108.c
View File

@ -6,7 +6,7 @@
#include <common.h> #include <common.h>
#include <dm.h> #include <dm.h>
#include <syscon.h> #include <syscon.h>
#include <asm/arch/clock.h> #include <asm/arch-rockchip/clock.h>
static const struct udevice_id rv1108_syscon_ids[] = { static const struct udevice_id rv1108_syscon_ids[] = {
{ .compatible = "rockchip,rv1108-grf", .data = ROCKCHIP_SYSCON_GRF }, { .compatible = "rockchip,rv1108-grf", .data = ROCKCHIP_SYSCON_GRF },

2
arch/arm/mach-rockchip/sdram_common.c
View File

@ -7,7 +7,7 @@
#include <dm.h> #include <dm.h>
#include <ram.h> #include <ram.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/arch/sdram_common.h> #include <asm/arch-rockchip/sdram_common.h>
#include <dm/uclass-internal.h> #include <dm/uclass-internal.h>
DECLARE_GLOBAL_DATA_PTR; DECLARE_GLOBAL_DATA_PTR;

4
board/elgin/elgin_rv1108/elgin_rv1108.c
View File

@ -7,8 +7,8 @@
#include <common.h> #include <common.h>
#include <asm/io.h> #include <asm/io.h>
#include <fdtdec.h> #include <fdtdec.h>
#include <asm/arch/grf_rv1108.h> #include <asm/arch-rockchip/grf_rv1108.h>
#include <asm/arch/hardware.h> #include <asm/arch-rockchip/hardware.h>
#include <asm/gpio.h> #include <asm/gpio.h>
DECLARE_GLOBAL_DATA_PTR; DECLARE_GLOBAL_DATA_PTR;

4
board/rockchip/evb_rk3036/evb_rk3036.c
View File

@ -6,8 +6,8 @@
#include <common.h> #include <common.h>
#include <dm.h> #include <dm.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/arch/uart.h> #include <asm/arch-rockchip/uart.h>
#include <asm/arch/sdram_rk3036.h> #include <asm/arch-rockchip/sdram_rk3036.h>
void get_ddr_config(struct rk3036_ddr_config *config) void get_ddr_config(struct rk3036_ddr_config *config)
{ {

2
board/rockchip/evb_rk3229/evb_rk3229.c
View File

@ -6,5 +6,5 @@
#include <common.h> #include <common.h>
#include <dm.h> #include <dm.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/arch/uart.h> #include <asm/arch-rockchip/uart.h>

2
board/rockchip/evb_rk3399/evb-rk3399.c
View File

@ -7,7 +7,7 @@
#include <dm.h> #include <dm.h>
#include <dm/pinctrl.h> #include <dm/pinctrl.h>
#include <dm/uclass-internal.h> #include <dm/uclass-internal.h>
#include <asm/arch/periph.h> #include <asm/arch-rockchip/periph.h>
#include <power/regulator.h> #include <power/regulator.h>
#include <spl.h> #include <spl.h>

4
board/rockchip/evb_rv1108/evb_rv1108.c
View File

@ -7,8 +7,8 @@
#include <common.h> #include <common.h>
#include <asm/io.h> #include <asm/io.h>
#include <fdtdec.h> #include <fdtdec.h>
#include <asm/arch/grf_rv1108.h> #include <asm/arch-rockchip/grf_rv1108.h>
#include <asm/arch/hardware.h> #include <asm/arch-rockchip/hardware.h>
DECLARE_GLOBAL_DATA_PTR; DECLARE_GLOBAL_DATA_PTR;

4
board/rockchip/kylin_rk3036/kylin_rk3036.c
View File

@ -6,8 +6,8 @@
#include <common.h> #include <common.h>
#include <dm.h> #include <dm.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/arch/uart.h> #include <asm/arch-rockchip/uart.h>
#include <asm/arch/sdram_rk3036.h> #include <asm/arch-rockchip/sdram_rk3036.h>
#include <asm/gpio.h> #include <asm/gpio.h>
void get_ddr_config(struct rk3036_ddr_config *config) void get_ddr_config(struct rk3036_ddr_config *config)

4
board/rockchip/sheep_rk3368/sheep_rk3368.c
View File

@ -4,8 +4,8 @@
*/ */
#include <common.h> #include <common.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/arch/clock.h> #include <asm/arch-rockchip/clock.h>
#include <asm/arch/grf_rk3368.h> #include <asm/arch-rockchip/grf_rk3368.h>
#include <syscon.h> #include <syscon.h>
int mach_cpu_init(void) int mach_cpu_init(void)

6
board/theobroma-systems/lion_rk3368/lion_rk3368.c
View File

@ -6,9 +6,9 @@
#include <dm.h> #include <dm.h>
#include <ram.h> #include <ram.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/arch/clock.h> #include <asm/arch-rockchip/clock.h>
#include <asm/arch/grf_rk3368.h> #include <asm/arch-rockchip/grf_rk3368.h>
#include <asm/arch/timer.h> #include <asm/arch-rockchip/timer.h>
#include <syscon.h> #include <syscon.h>
int mach_cpu_init(void) int mach_cpu_init(void)

10
board/theobroma-systems/puma_rk3399/puma-rk3399.c
View File

@ -15,11 +15,11 @@
#include <asm/io.h> #include <asm/io.h>
#include <asm/gpio.h> #include <asm/gpio.h>
#include <asm/setup.h> #include <asm/setup.h>
#include <asm/arch/clock.h> #include <asm/arch-rockchip/clock.h>
#include <asm/arch/cru_rk3399.h> #include <asm/arch-rockchip/cru_rk3399.h>
#include <asm/arch/hardware.h> #include <asm/arch-rockchip/hardware.h>
#include <asm/arch/grf_rk3399.h> #include <asm/arch-rockchip/grf_rk3399.h>
#include <asm/arch/periph.h> #include <asm/arch-rockchip/periph.h>
#include <power/regulator.h> #include <power/regulator.h>
#include <u-boot/sha256.h> #include <u-boot/sha256.h>

2
board/vamrs/rock960_rk3399/rock960-rk3399.c
View File

@ -7,7 +7,7 @@
#include <dm.h> #include <dm.h>
#include <dm/pinctrl.h> #include <dm/pinctrl.h>
#include <dm/uclass-internal.h> #include <dm/uclass-internal.h>
#include <asm/arch/periph.h> #include <asm/arch-rockchip/periph.h>
#include <power/regulator.h> #include <power/regulator.h>
#include <spl.h> #include <spl.h>

2
cmd/rockusb.c
View File

@ -8,7 +8,7 @@
#include <console.h> #include <console.h>
#include <g_dnl.h> #include <g_dnl.h>
#include <usb.h> #include <usb.h>
#include <asm/arch/f_rockusb.h> #include <asm/arch-rockchip/f_rockusb.h>
static int do_rockusb(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[]) static int do_rockusb(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[])
{ {

6
drivers/clk/rockchip/clk_rk3036.c
View File

@ -9,9 +9,9 @@
#include <errno.h> #include <errno.h>
#include <syscon.h> #include <syscon.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/arch/clock.h> #include <asm/arch-rockchip/clock.h>
#include <asm/arch/cru_rk3036.h> #include <asm/arch-rockchip/cru_rk3036.h>
#include <asm/arch/hardware.h> #include <asm/arch-rockchip/hardware.h>
#include <dm/lists.h> #include <dm/lists.h>
#include <dt-bindings/clock/rk3036-cru.h> #include <dt-bindings/clock/rk3036-cru.h>
#include <linux/log2.h> #include <linux/log2.h>

6
drivers/clk/rockchip/clk_rk3128.c
View File

@ -9,9 +9,9 @@
#include <errno.h> #include <errno.h>
#include <syscon.h> #include <syscon.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/arch/clock.h> #include <asm/arch-rockchip/clock.h>
#include <asm/arch/cru_rk3128.h> #include <asm/arch-rockchip/cru_rk3128.h>
#include <asm/arch/hardware.h> #include <asm/arch-rockchip/hardware.h>
#include <bitfield.h> #include <bitfield.h>
#include <dm/lists.h> #include <dm/lists.h>
#include <dt-bindings/clock/rk3128-cru.h> #include <dt-bindings/clock/rk3128-cru.h>

8
drivers/clk/rockchip/clk_rk3188.c
View File

@ -12,10 +12,10 @@
#include <mapmem.h> #include <mapmem.h>
#include <syscon.h> #include <syscon.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/arch/clock.h> #include <asm/arch-rockchip/clock.h>
#include <asm/arch/cru_rk3188.h> #include <asm/arch-rockchip/cru_rk3188.h>
#include <asm/arch/grf_rk3188.h> #include <asm/arch-rockchip/grf_rk3188.h>
#include <asm/arch/hardware.h> #include <asm/arch-rockchip/hardware.h>
#include <dt-bindings/clock/rk3188-cru.h> #include <dt-bindings/clock/rk3188-cru.h>
#include <dm/device-internal.h> #include <dm/device-internal.h>
#include <dm/lists.h> #include <dm/lists.h>

6
drivers/clk/rockchip/clk_rk322x.c
View File

@ -9,9 +9,9 @@
#include <errno.h> #include <errno.h>
#include <syscon.h> #include <syscon.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/arch/clock.h> #include <asm/arch-rockchip/clock.h>
#include <asm/arch/cru_rk322x.h> #include <asm/arch-rockchip/cru_rk322x.h>
#include <asm/arch/hardware.h> #include <asm/arch-rockchip/hardware.h>
#include <dm/lists.h> #include <dm/lists.h>
#include <dt-bindings/clock/rk3228-cru.h> #include <dt-bindings/clock/rk3228-cru.h>
#include <linux/log2.h> #include <linux/log2.h>

8
drivers/clk/rockchip/clk_rk3288.c
View File

@ -13,10 +13,10 @@
#include <mapmem.h> #include <mapmem.h>
#include <syscon.h> #include <syscon.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/arch/clock.h> #include <asm/arch-rockchip/clock.h>
#include <asm/arch/cru_rk3288.h> #include <asm/arch-rockchip/cru_rk3288.h>
#include <asm/arch/grf_rk3288.h> #include <asm/arch-rockchip/grf_rk3288.h>
#include <asm/arch/hardware.h> #include <asm/arch-rockchip/hardware.h>
#include <dt-bindings/clock/rk3288-cru.h> #include <dt-bindings/clock/rk3288-cru.h>
#include <dm/device-internal.h> #include <dm/device-internal.h>
#include <dm/lists.h> #include <dm/lists.h>

8
drivers/clk/rockchip/clk_rk3328.c
View File

@ -9,10 +9,10 @@
#include <dm.h> #include <dm.h>
#include <errno.h> #include <errno.h>
#include <syscon.h> #include <syscon.h>
#include <asm/arch/clock.h> #include <asm/arch-rockchip/clock.h>
#include <asm/arch/cru_rk3328.h> #include <asm/arch-rockchip/cru_rk3328.h>
#include <asm/arch/hardware.h> #include <asm/arch-rockchip/hardware.h>
#include <asm/arch/grf_rk3328.h> #include <asm/arch-rockchip/grf_rk3328.h>
#include <asm/io.h> #include <asm/io.h>
#include <dm/lists.h> #include <dm/lists.h>
#include <dt-bindings/clock/rk3328-cru.h> #include <dt-bindings/clock/rk3328-cru.h>

6
drivers/clk/rockchip/clk_rk3368.c
View File

@ -13,9 +13,9 @@
#include <mapmem.h> #include <mapmem.h>
#include <syscon.h> #include <syscon.h>
#include <bitfield.h> #include <bitfield.h>
#include <asm/arch/clock.h> #include <asm/arch-rockchip/clock.h>
#include <asm/arch/cru_rk3368.h> #include <asm/arch-rockchip/cru_rk3368.h>
#include <asm/arch/hardware.h> #include <asm/arch-rockchip/hardware.h>
#include <asm/io.h> #include <asm/io.h>
#include <dm/lists.h> #include <dm/lists.h>
#include <dt-bindings/clock/rk3368-cru.h> #include <dt-bindings/clock/rk3368-cru.h>

6
drivers/clk/rockchip/clk_rk3399.c
View File

@ -13,9 +13,9 @@
#include <syscon.h> #include <syscon.h>
#include <bitfield.h> #include <bitfield.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/arch/clock.h> #include <asm/arch-rockchip/clock.h>
#include <asm/arch/cru_rk3399.h> #include <asm/arch-rockchip/cru_rk3399.h>
#include <asm/arch/hardware.h> #include <asm/arch-rockchip/hardware.h>
#include <dm/lists.h> #include <dm/lists.h>
#include <dt-bindings/clock/rk3399-cru.h> #include <dt-bindings/clock/rk3399-cru.h>

6
drivers/clk/rockchip/clk_rv1108.c
View File

@ -11,9 +11,9 @@
#include <errno.h> #include <errno.h>
#include <syscon.h> #include <syscon.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/arch/clock.h> #include <asm/arch-rockchip/clock.h>
#include <asm/arch/cru_rv1108.h> #include <asm/arch-rockchip/cru_rv1108.h>
#include <asm/arch/hardware.h> #include <asm/arch-rockchip/hardware.h>
#include <dm/lists.h> #include <dm/lists.h>
#include <dt-bindings/clock/rv1108-cru.h> #include <dt-bindings/clock/rv1108-cru.h>

3
drivers/gpio/rk_gpio.c
View File

@ -12,7 +12,8 @@
#include <linux/errno.h> #include <linux/errno.h>
#include <asm/gpio.h> #include <asm/gpio.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/arch/clock.h> #include <asm/arch-rockchip/clock.h>
#include <asm/arch-rockchip/gpio.h>
#include <dm/pinctrl.h> #include <dm/pinctrl.h>
#include <dt-bindings/clock/rk3288-cru.h> #include <dt-bindings/clock/rk3288-cru.h>

6
drivers/i2c/rk_i2c.c
View File

@ -12,9 +12,9 @@
#include <errno.h> #include <errno.h>
#include <i2c.h> #include <i2c.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/arch/clock.h> #include <asm/arch-rockchip/clock.h>
#include <asm/arch/i2c.h> #include <asm/arch-rockchip/i2c.h>
#include <asm/arch/periph.h> #include <asm/arch-rockchip/periph.h>
#include <dm/pinctrl.h> #include <dm/pinctrl.h>
#include <linux/sizes.h> #include <linux/sizes.h>

4
drivers/mmc/rockchip_dw_mmc.c
View File

@ -13,8 +13,8 @@
#include <pwrseq.h> #include <pwrseq.h>
#include <syscon.h> #include <syscon.h>
#include <asm/gpio.h> #include <asm/gpio.h>
#include <asm/arch/clock.h> #include <asm/arch-rockchip/clock.h>
#include <asm/arch/periph.h> #include <asm/arch-rockchip/periph.h>
#include <linux/err.h> #include <linux/err.h>
struct rockchip_mmc_plat { struct rockchip_mmc_plat {

18
drivers/net/gmac_rockchip.c
View File

@ -11,15 +11,15 @@
#include <phy.h> #include <phy.h>
#include <syscon.h> #include <syscon.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/arch/periph.h> #include <asm/arch-rockchip/periph.h>
#include <asm/arch/clock.h> #include <asm/arch-rockchip/clock.h>
#include <asm/arch/hardware.h> #include <asm/arch-rockchip/hardware.h>
#include <asm/arch/grf_rk322x.h> #include <asm/arch-rockchip/grf_rk322x.h>
#include <asm/arch/grf_rk3288.h> #include <asm/arch-rockchip/grf_rk3288.h>
#include <asm/arch/grf_rk3328.h> #include <asm/arch-rockchip/grf_rk3328.h>
#include <asm/arch/grf_rk3368.h> #include <asm/arch-rockchip/grf_rk3368.h>
#include <asm/arch/grf_rk3399.h> #include <asm/arch-rockchip/grf_rk3399.h>
#include <asm/arch/grf_rv1108.h> #include <asm/arch-rockchip/grf_rv1108.h>
#include <dm/pinctrl.h> #include <dm/pinctrl.h>
#include <dt-bindings/clock/rk3288-cru.h> #include <dt-bindings/clock/rk3288-cru.h>
#include "designware.h" #include "designware.h"

2
drivers/pwm/rk_pwm.c
View File

@ -12,7 +12,7 @@
#include <regmap.h> #include <regmap.h>
#include <syscon.h> #include <syscon.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/arch/pwm.h> #include <asm/arch-rockchip/pwm.h>
#include <power/regulator.h> #include <power/regulator.h>
struct rk_pwm_priv { struct rk_pwm_priv {

12
drivers/ram/rockchip/dmc-rk3368.c
View File

@ -12,12 +12,12 @@
#include <regmap.h> #include <regmap.h>
#include <syscon.h> #include <syscon.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/arch/clock.h> #include <asm/arch-rockchip/clock.h>
#include <asm/arch/cru_rk3368.h> #include <asm/arch-rockchip/cru_rk3368.h>
#include <asm/arch/grf_rk3368.h> #include <asm/arch-rockchip/grf_rk3368.h>
#include <asm/arch/ddr_rk3368.h> #include <asm/arch-rockchip/ddr_rk3368.h>
#include <asm/arch/sdram.h> #include <asm/arch-rockchip/sdram.h>
#include <asm/arch/sdram_common.h> #include <asm/arch-rockchip/sdram_common.h>
struct dram_info { struct dram_info {
struct ram_info info; struct ram_info info;

6
drivers/ram/rockchip/sdram_rk3128.c
View File

@ -7,9 +7,9 @@
#include <dm.h> #include <dm.h>
#include <ram.h> #include <ram.h>
#include <syscon.h> #include <syscon.h>
#include <asm/arch/clock.h> #include <asm/arch-rockchip/clock.h>
#include <asm/arch/grf_rk3128.h> #include <asm/arch-rockchip/grf_rk3128.h>
#include <asm/arch/sdram_common.h> #include <asm/arch-rockchip/sdram_common.h>
struct dram_info { struct dram_info {
struct ram_info info; struct ram_info info;

14
drivers/ram/rockchip/sdram_rk3188.c
View File

@ -15,13 +15,13 @@
#include <regmap.h> #include <regmap.h>
#include <syscon.h> #include <syscon.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/arch/clock.h> #include <asm/arch-rockchip/clock.h>
#include <asm/arch/cru_rk3188.h> #include <asm/arch-rockchip/cru_rk3188.h>
#include <asm/arch/ddr_rk3188.h> #include <asm/arch-rockchip/ddr_rk3188.h>
#include <asm/arch/grf_rk3188.h> #include <asm/arch-rockchip/grf_rk3188.h>
#include <asm/arch/pmu_rk3188.h> #include <asm/arch-rockchip/pmu_rk3188.h>
#include <asm/arch/sdram.h> #include <asm/arch-rockchip/sdram.h>
#include <asm/arch/sdram_common.h> #include <asm/arch-rockchip/sdram_common.h>
#include <linux/err.h> #include <linux/err.h>
struct chan_info { struct chan_info {

16
drivers/ram/rockchip/sdram_rk322x.c
View File

@ -11,14 +11,14 @@
#include <regmap.h> #include <regmap.h>
#include <syscon.h> #include <syscon.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/arch/clock.h> #include <asm/arch-rockchip/clock.h>
#include <asm/arch/cru_rk322x.h> #include <asm/arch-rockchip/cru_rk322x.h>
#include <asm/arch/grf_rk322x.h> #include <asm/arch-rockchip/grf_rk322x.h>
#include <asm/arch/hardware.h> #include <asm/arch-rockchip/hardware.h>
#include <asm/arch/sdram_rk322x.h> #include <asm/arch-rockchip/sdram_rk322x.h>
#include <asm/arch/timer.h> #include <asm/arch-rockchip/timer.h>
#include <asm/arch/uart.h> #include <asm/arch-rockchip/uart.h>
#include <asm/arch/sdram_common.h> #include <asm/arch-rockchip/sdram_common.h>
#include <asm/types.h> #include <asm/types.h>
#include <linux/err.h> #include <linux/err.h>

14
drivers/ram/rockchip/sdram_rk3288.c
View File

@ -15,13 +15,13 @@
#include <regmap.h> #include <regmap.h>
#include <syscon.h> #include <syscon.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/arch/clock.h> #include <asm/arch-rockchip/clock.h>
#include <asm/arch/cru_rk3288.h> #include <asm/arch-rockchip/cru_rk3288.h>
#include <asm/arch/ddr_rk3288.h> #include <asm/arch-rockchip/ddr_rk3288.h>
#include <asm/arch/grf_rk3288.h> #include <asm/arch-rockchip/grf_rk3288.h>
#include <asm/arch/pmu_rk3288.h> #include <asm/arch-rockchip/pmu_rk3288.h>
#include <asm/arch/sdram.h> #include <asm/arch-rockchip/sdram.h>
#include <asm/arch/sdram_common.h> #include <asm/arch-rockchip/sdram_common.h>
#include <linux/err.h> #include <linux/err.h>
#include <power/regulator.h> #include <power/regulator.h>
#include <power/rk8xx_pmic.h> #include <power/rk8xx_pmic.h>

6
drivers/ram/rockchip/sdram_rk3328.c
View File

@ -7,9 +7,9 @@
#include <dm.h> #include <dm.h>
#include <ram.h> #include <ram.h>
#include <syscon.h> #include <syscon.h>
#include <asm/arch/clock.h> #include <asm/arch-rockchip/clock.h>
#include <asm/arch/grf_rk3328.h> #include <asm/arch-rockchip/grf_rk3328.h>
#include <asm/arch/sdram_common.h> #include <asm/arch-rockchip/sdram_common.h>
struct dram_info { struct dram_info {
struct ram_info info; struct ram_info info;

12
drivers/ram/rockchip/sdram_rk3399.c
View File

@ -13,12 +13,12 @@
#include <regmap.h> #include <regmap.h>
#include <syscon.h> #include <syscon.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/arch/clock.h> #include <asm/arch-rockchip/clock.h>
#include <asm/arch/sdram_common.h> #include <asm/arch-rockchip/sdram_common.h>
#include <asm/arch/sdram_rk3399.h> #include <asm/arch-rockchip/sdram_rk3399.h>
#include <asm/arch/cru_rk3399.h> #include <asm/arch-rockchip/cru_rk3399.h>
#include <asm/arch/grf_rk3399.h> #include <asm/arch-rockchip/grf_rk3399.h>
#include <asm/arch/hardware.h> #include <asm/arch-rockchip/hardware.h>
#include <linux/err.h> #include <linux/err.h>
#include <time.h> #include <time.h>

2
drivers/reset/reset-rockchip.c
View File

@ -7,7 +7,7 @@
#include <dm.h> #include <dm.h>
#include <reset-uclass.h> #include <reset-uclass.h>
#include <linux/io.h> #include <linux/io.h>
#include <asm/arch/hardware.h> #include <asm/arch-rockchip/hardware.h>
#include <dm/lists.h> #include <dm/lists.h>
/* /*
* Each reg has 16 bits reset signal for devices * Each reg has 16 bits reset signal for devices

2
drivers/serial/serial_rockchip.c
View File

@ -9,7 +9,7 @@
#include <dt-structs.h> #include <dt-structs.h>
#include <ns16550.h> #include <ns16550.h>
#include <serial.h> #include <serial.h>
#include <asm/arch/clock.h> #include <asm/arch-rockchip/clock.h>
#if defined(CONFIG_ROCKCHIP_RK3188) #if defined(CONFIG_ROCKCHIP_RK3188)
struct rockchip_uart_platdata { struct rockchip_uart_platdata {

2
drivers/sound/rockchip_sound.c
View File

@ -13,7 +13,7 @@
#include <i2s.h> #include <i2s.h>
#include <misc.h> #include <misc.h>
#include <sound.h> #include <sound.h>
#include <asm/arch/periph.h> #include <asm/arch-rockchip/periph.h>
#include <dm/pinctrl.h> #include <dm/pinctrl.h>
static int rockchip_sound_setup(struct udevice *dev) static int rockchip_sound_setup(struct udevice *dev)

4
drivers/spi/rk_spi.c
View File

@ -18,8 +18,8 @@
#include <spi.h> #include <spi.h>
#include <linux/errno.h> #include <linux/errno.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/arch/clock.h> #include <asm/arch-rockchip/clock.h>
#include <asm/arch/periph.h> #include <asm/arch-rockchip/periph.h>
#include <dm/pinctrl.h> #include <dm/pinctrl.h>
#include "rk_spi.h" #include "rk_spi.h"

6
drivers/sysreset/sysreset_rockchip.c
View File

@ -8,9 +8,9 @@
#include <errno.h> #include <errno.h>
#include <sysreset.h> #include <sysreset.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/arch/clock.h> #include <asm/arch-rockchip/clock.h>
#include <asm/arch/cru_rk3328.h> #include <asm/arch-rockchip/cru_rk3328.h>
#include <asm/arch/hardware.h> #include <asm/arch-rockchip/hardware.h>
#include <linux/err.h> #include <linux/err.h>
int rockchip_sysreset_request(struct udevice *dev, enum sysreset_t type) int rockchip_sysreset_request(struct udevice *dev, enum sysreset_t type)

2
drivers/timer/rockchip_timer.c
View File

@ -7,7 +7,7 @@
#include <dm.h> #include <dm.h>
#include <dm/ofnode.h> #include <dm/ofnode.h>
#include <mapmem.h> #include <mapmem.h>
#include <asm/arch/timer.h> #include <asm/arch-rockchip/timer.h>
#include <dt-structs.h> #include <dt-structs.h>
#include <timer.h> #include <timer.h>
#include <asm/io.h> #include <asm/io.h>

2
drivers/usb/gadget/f_rockusb.c
View File

@ -15,7 +15,7 @@
#include <linux/compiler.h> #include <linux/compiler.h>
#include <version.h> #include <version.h>
#include <g_dnl.h> #include <g_dnl.h>
#include <asm/arch/f_rockusb.h> #include <asm/arch-rockchip/f_rockusb.h>
static inline struct f_rockusb *func_to_rockusb(struct usb_function *f) static inline struct f_rockusb *func_to_rockusb(struct usb_function *f)
{ {

6
drivers/video/rockchip/rk3288_hdmi.c
View File

@ -13,9 +13,9 @@
#include <syscon.h> #include <syscon.h>
#include <asm/gpio.h> #include <asm/gpio.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/arch/clock.h> #include <asm/arch-rockchip/clock.h>
#include <asm/arch/hardware.h> #include <asm/arch-rockchip/hardware.h>
#include <asm/arch/grf_rk3288.h> #include <asm/arch-rockchip/grf_rk3288.h>
#include <power/regulator.h> #include <power/regulator.h>
#include "rk_hdmi.h" #include "rk_hdmi.h"

10
drivers/video/rockchip/rk3288_mipi.c
View File

@ -14,14 +14,14 @@
#include "rk_mipi.h" #include "rk_mipi.h"
#include <syscon.h> #include <syscon.h>
#include <asm/gpio.h> #include <asm/gpio.h>
#include <asm/hardware.h>
#include <asm/io.h> #include <asm/io.h>
#include <dm/uclass-internal.h> #include <dm/uclass-internal.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <asm/arch/clock.h> #include <asm/arch-rockchip/clock.h>
#include <asm/arch/cru_rk3288.h> #include <asm/arch-rockchip/cru_rk3288.h>
#include <asm/arch/grf_rk3288.h> #include <asm/arch-rockchip/grf_rk3288.h>
#include <asm/arch/rockchip_mipi_dsi.h> #include <asm/arch-rockchip/hardware.h>
#include <asm/arch-rockchip/rockchip_mipi_dsi.h>
#define MHz 1000000 #define MHz 1000000

6
drivers/video/rockchip/rk3288_vop.c
View File

@ -11,10 +11,10 @@
#include <regmap.h> #include <regmap.h>
#include <syscon.h> #include <syscon.h>
#include <video.h> #include <video.h>
#include <asm/hardware.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/arch/clock.h> #include <asm/arch-rockchip/clock.h>
#include <asm/arch/grf_rk3288.h> #include <asm/arch-rockchip/grf_rk3288.h>
#include <asm/arch-rockchip/hardware.h>
#include "rk_vop.h" #include "rk_vop.h"
DECLARE_GLOBAL_DATA_PTR; DECLARE_GLOBAL_DATA_PTR;

6
drivers/video/rockchip/rk3399_hdmi.c
View File

@ -13,9 +13,9 @@
#include <syscon.h> #include <syscon.h>
#include <asm/gpio.h> #include <asm/gpio.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/arch/clock.h> #include <asm/arch-rockchip/clock.h>
#include <asm/arch/hardware.h> #include <asm/arch-rockchip/hardware.h>
#include <asm/arch/grf_rk3399.h> #include <asm/arch-rockchip/grf_rk3399.h>
#include <power/regulator.h> #include <power/regulator.h>
#include "rk_hdmi.h" #include "rk_hdmi.h"

10
drivers/video/rockchip/rk3399_mipi.c
View File

@ -14,14 +14,14 @@
#include "rk_mipi.h" #include "rk_mipi.h"
#include <syscon.h> #include <syscon.h>
#include <asm/gpio.h> #include <asm/gpio.h>
#include <asm/hardware.h>
#include <asm/io.h> #include <asm/io.h>
#include <dm/uclass-internal.h> #include <dm/uclass-internal.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <asm/arch/clock.h> #include <asm/arch-rockchip/clock.h>
#include <asm/arch/cru_rk3399.h> #include <asm/arch-rockchip/cru_rk3399.h>
#include <asm/arch/grf_rk3399.h> #include <asm/arch-rockchip/grf_rk3399.h>
#include <asm/arch/rockchip_mipi_dsi.h> #include <asm/arch-rockchip/hardware.h>
#include <asm/arch-rockchip/rockchip_mipi_dsi.h>
/* Select mipi dsi source, big or little vop */ /* Select mipi dsi source, big or little vop */
static int rk_mipi_dsi_source_select(struct udevice *dev) static int rk_mipi_dsi_source_select(struct udevice *dev)

2
drivers/video/rockchip/rk3399_vop.c
View File

@ -10,7 +10,7 @@
#include <dm.h> #include <dm.h>
#include <regmap.h> #include <regmap.h>
#include <video.h> #include <video.h>
#include <asm/hardware.h> #include <asm/arch-rockchip/hardware.h>
#include <asm/io.h> #include <asm/io.h>
#include "rk_vop.h" #include "rk_vop.h"

6
drivers/video/rockchip/rk_edp.c
View File

@ -14,9 +14,9 @@
#include <syscon.h> #include <syscon.h>
#include <asm/gpio.h> #include <asm/gpio.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/arch/clock.h> #include <asm/arch-rockchip/clock.h>
#include <asm/arch/edp_rk3288.h> #include <asm/arch-rockchip/edp_rk3288.h>
#include <asm/arch/grf_rk3288.h> #include <asm/arch-rockchip/grf_rk3288.h>
#include <dt-bindings/clock/rk3288-cru.h> #include <dt-bindings/clock/rk3288-cru.h>
#define MAX_CR_LOOP 5 #define MAX_CR_LOOP 5

5
drivers/video/rockchip/rk_hdmi.c
View File

@ -14,10 +14,9 @@
#include <regmap.h> #include <regmap.h>
#include <syscon.h> #include <syscon.h>
#include <asm/gpio.h> #include <asm/gpio.h>
#include <asm/hardware.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/arch/clock.h> #include <asm/arch-rockchip/clock.h>
#include <asm/arch/hardware.h> #include <asm/arch-rockchip/hardware.h>
#include "rk_hdmi.h" #include "rk_hdmi.h"
#include "rk_vop.h" /* for rk_vop_probe_regulators */ #include "rk_vop.h" /* for rk_vop_probe_regulators */

6
drivers/video/rockchip/rk_lvds.c
View File

@ -12,9 +12,9 @@
#include <syscon.h> #include <syscon.h>
#include <asm/gpio.h> #include <asm/gpio.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/arch/clock.h> #include <asm/arch-rockchip/clock.h>
#include <asm/arch/lvds_rk3288.h> #include <asm/arch-rockchip/lvds_rk3288.h>
#include <asm/arch/grf_rk3288.h> #include <asm/arch-rockchip/grf_rk3288.h>
#include <dt-bindings/clock/rk3288-cru.h> #include <dt-bindings/clock/rk3288-cru.h>
#include <dt-bindings/video/rk3288.h> #include <dt-bindings/video/rk3288.h>

9
drivers/video/rockchip/rk_mipi.c
View File

@ -14,14 +14,13 @@
#include "rk_mipi.h" #include "rk_mipi.h"
#include <syscon.h> #include <syscon.h>
#include <asm/gpio.h> #include <asm/gpio.h>
#include <asm/hardware.h>
#include <asm/io.h> #include <asm/io.h>
#include <dm/uclass-internal.h> #include <dm/uclass-internal.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <asm/arch/clock.h> #include <asm/arch-rockchip/clock.h>
#include <asm/arch/cru_rk3399.h> #include <asm/arch-rockchip/cru_rk3399.h>
#include <asm/arch/grf_rk3399.h> #include <asm/arch-rockchip/grf_rk3399.h>
#include <asm/arch/rockchip_mipi_dsi.h> #include <asm/arch-rockchip/rockchip_mipi_dsi.h>
DECLARE_GLOBAL_DATA_PTR; DECLARE_GLOBAL_DATA_PTR;

7
drivers/video/rockchip/rk_vop.c
View File

@ -13,11 +13,10 @@
#include <syscon.h> #include <syscon.h>
#include <video.h> #include <video.h>
#include <asm/gpio.h> #include <asm/gpio.h>
#include <asm/hardware.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/arch/clock.h> #include <asm/arch-rockchip/clock.h>
#include <asm/arch/edp_rk3288.h> #include <asm/arch-rockchip/edp_rk3288.h>
#include <asm/arch/vop_rk3288.h> #include <asm/arch-rockchip/vop_rk3288.h>
#include <dm/device-internal.h> #include <dm/device-internal.h>
#include <dm/uclass-internal.h> #include <dm/uclass-internal.h>
#include <power/regulator.h> #include <power/regulator.h>

2
drivers/video/rockchip/rk_vop.h
View File

@ -6,7 +6,7 @@
#ifndef __RK_VOP_H__ #ifndef __RK_VOP_H__
#define __RK_VOP_H__ #define __RK_VOP_H__
#include <asm/arch/vop_rk3288.h> #include <asm/arch-rockchip/vop_rk3288.h>
struct rk_vop_priv { struct rk_vop_priv {
void *grf; void *grf;

2
include/configs/rk3036_common.h
View File

@ -5,7 +5,7 @@
#ifndef __CONFIG_RK3036_COMMON_H #ifndef __CONFIG_RK3036_COMMON_H
#define __CONFIG_RK3036_COMMON_H #define __CONFIG_RK3036_COMMON_H
#include <asm/arch/hardware.h> #include <asm/arch-rockchip/hardware.h>
#include "rockchip-common.h" #include "rockchip-common.h"
#define CONFIG_SYS_MALLOC_LEN (32 << 20) #define CONFIG_SYS_MALLOC_LEN (32 << 20)

2
include/configs/rk3188_common.h
View File

@ -8,7 +8,7 @@
#define CONFIG_SYS_CACHELINE_SIZE 64 #define CONFIG_SYS_CACHELINE_SIZE 64
#include <asm/arch/hardware.h> #include <asm/arch-rockchip/hardware.h>
#include "rockchip-common.h" #include "rockchip-common.h"
#define CONFIG_SKIP_LOWLEVEL_INIT_ONLY #define CONFIG_SKIP_LOWLEVEL_INIT_ONLY

2
include/configs/rk322x_common.h
View File

@ -5,7 +5,7 @@
#ifndef __CONFIG_RK322X_COMMON_H #ifndef __CONFIG_RK322X_COMMON_H
#define __CONFIG_RK322X_COMMON_H #define __CONFIG_RK322X_COMMON_H
#include <asm/arch/hardware.h> #include <asm/arch-rockchip/hardware.h>
#include "rockchip-common.h" #include "rockchip-common.h"
#define CONFIG_SKIP_LOWLEVEL_INIT #define CONFIG_SKIP_LOWLEVEL_INIT

2
include/configs/rk3288_common.h
View File

@ -6,7 +6,7 @@
#ifndef __CONFIG_RK3288_COMMON_H #ifndef __CONFIG_RK3288_COMMON_H
#define __CONFIG_RK3288_COMMON_H #define __CONFIG_RK3288_COMMON_H
#include <asm/arch/hardware.h> #include <asm/arch-rockchip/hardware.h>
#include "rockchip-common.h" #include "rockchip-common.h"
#define CONFIG_SKIP_LOWLEVEL_INIT_ONLY #define CONFIG_SKIP_LOWLEVEL_INIT_ONLY

2
include/configs/rk3368_common.h
View File

@ -10,7 +10,7 @@
#define CONFIG_SYS_CACHELINE_SIZE 64 #define CONFIG_SYS_CACHELINE_SIZE 64
#include <asm/arch/hardware.h> #include <asm/arch-rockchip/hardware.h>
#include <linux/sizes.h> #include <linux/sizes.h>
#define CONFIG_SYS_SDRAM_BASE 0 #define CONFIG_SYS_SDRAM_BASE 0

2
include/configs/rv1108_common.h
View File

@ -5,7 +5,7 @@
#ifndef __CONFIG_RV1108_COMMON_H #ifndef __CONFIG_RV1108_COMMON_H
#define __CONFIG_RV1108_COMMON_H #define __CONFIG_RV1108_COMMON_H
#include <asm/arch/hardware.h> #include <asm/arch-rockchip/hardware.h>
#include "rockchip-common.h" #include "rockchip-common.h"
#define CONFIG_SYS_MALLOC_LEN (32 << 20) #define CONFIG_SYS_MALLOC_LEN (32 << 20)