leandrof/u-boot
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge git://git.denx.de/u-boot-rockchip

Browse Source
This commit is contained in:
Tom Rini
2016-10-03 09:09:29 -04:00
parent e95b9b4437 67171e13a3
commit 51b4a639e4
26 changed files with 421 additions and 205 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
arch/arm/include/asm/arch-rockchip/boot_mode.h Normal file
View File

@@ -0,0 +1,19 @@
#ifndef __REBOOT_MODE_H
#define __REBOOT_MODE_H
/* high 24 bits is tag, low 8 bits is type */
#define REBOOT_FLAG 0x5242C300
/* normal boot */
#define BOOT_NORMAL (REBOOT_FLAG + 0)
/* enter loader rockusb mode */
#define BOOT_LOADER (REBOOT_FLAG + 1)
/* enter recovery */
#define BOOT_RECOVERY (REBOOT_FLAG + 3)
/* enter fastboot mode */
#define BOOT_FASTBOOT (REBOOT_FLAG + 9)
/* enter charging mode */
#define BOOT_CHARGING (REBOOT_FLAG + 11)
/* enter usb mass storage mode */
#define BOOT_UMS (REBOOT_FLAG + 12)
#endif

4
arch/arm/include/asm/arch-rockchip/cru_rk3399.h
View File

@@ -64,9 +64,9 @@ check_member(rk3399_cru, sdio1_con[1], 0x594);
#define APLL_HZ (600*MHz)
#define GPLL_HZ (594*MHz)
#define CPLL_HZ (384*MHz)
#define PPLL_HZ (594*MHz)
#define PPLL_HZ (676*MHz)
#define PMU_PCLK_HZ (99*MHz)
#define PMU_PCLK_HZ (48*MHz)
#define ACLKM_CORE_HZ (300*MHz)
#define ATCLK_CORE_HZ (300*MHz)

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

@@ -10,8 +10,8 @@
struct rk3288_pwm {
u32 cnt;
u32 period_hpr;
u32 duty_lpr;
u32 period_hpr;
u32 ctrl;
};
check_member(rk3288_pwm, ctrl, 0xc);