Merge tag 'u-boot-rockchip-20240315' of https://source.denx.de/u-boot/custodians/u-boot-rockchip into next
Please pull the updates for rockchip platform: - Add board: rk3588 Generic, Cool Pi CM5, Theobroma-Systems RK3588 Jaguar SBC, Toybrick TB-RK3588X; rk3588s Cool Pi 4B; rk3566 Pine64 PineTab2; - Add saradc v2 support; - Add PMIC RK806 support; - rk3588 disable force_jtag by default; - Migrate to use IO-domain driver for all boards; - Use common bss and stack addresses for rk33xx and rk35xx boards; - Other updates for driver, config and dts;
This commit is contained in:
@@ -3,20 +3,9 @@
|
||||
* Copyright 2018 Google
|
||||
*/
|
||||
|
||||
#include <common.h>
|
||||
#include <dm.h>
|
||||
#include <init.h>
|
||||
#include <syscon.h>
|
||||
#include <asm/io.h>
|
||||
#include <asm/arch-rockchip/clock.h>
|
||||
#include <asm/arch-rockchip/grf_rk3399.h>
|
||||
#include <asm/arch-rockchip/hardware.h>
|
||||
#include <asm/arch-rockchip/misc.h>
|
||||
|
||||
#define GRF_IO_VSEL_BT656_SHIFT 0
|
||||
#define GRF_IO_VSEL_AUDIO_SHIFT 1
|
||||
#define PMUGRF_CON0_VSEL_SHIFT 8
|
||||
#define PMUGRF_CON0_VOL_SHIFT 9
|
||||
|
||||
#ifdef CONFIG_SPL_BUILD
|
||||
/* provided to defeat compiler optimisation in board_init_f() */
|
||||
@@ -65,44 +54,3 @@ int board_early_init_r(void)
|
||||
return 0;
|
||||
}
|
||||
#endif
|
||||
|
||||
static void setup_iodomain(void)
|
||||
{
|
||||
struct rk3399_grf_regs *grf =
|
||||
syscon_get_first_range(ROCKCHIP_SYSCON_GRF);
|
||||
struct rk3399_pmugrf_regs *pmugrf =
|
||||
syscon_get_first_range(ROCKCHIP_SYSCON_PMUGRF);
|
||||
|
||||
/* BT656 and audio is in 1.8v domain */
|
||||
rk_setreg(&grf->io_vsel, (1 << GRF_IO_VSEL_BT656_SHIFT |
|
||||
1 << GRF_IO_VSEL_AUDIO_SHIFT));
|
||||
|
||||
/*
|
||||
* Set GPIO1 1.8v/3.0v source select to PMU1830_VOL
|
||||
* and explicitly configure that PMU1830_VOL to be 1.8V
|
||||
*/
|
||||
rk_setreg(&pmugrf->soc_con0, (1 << PMUGRF_CON0_VSEL_SHIFT |
|
||||
1 << PMUGRF_CON0_VOL_SHIFT));
|
||||
}
|
||||
|
||||
int misc_init_r(void)
|
||||
{
|
||||
const u32 cpuid_offset = 0x7;
|
||||
const u32 cpuid_length = 0x10;
|
||||
u8 cpuid[cpuid_length];
|
||||
int ret;
|
||||
|
||||
setup_iodomain();
|
||||
|
||||
ret = rockchip_cpuid_from_efuse(cpuid_offset, cpuid_length, cpuid);
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
ret = rockchip_cpuid_set(cpuid, cpuid_length);
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
ret = rockchip_setup_macaddr();
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
Reference in New Issue
Block a user