diff options
| author | Tom Rini <trini@konsulko.com> | 2020-01-31 13:26:28 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-01-31 13:26:28 -0500 |
| commit | 80e99adbe47d1c8590f9b971ac52257fdc51a5ec (patch) | |
| tree | 2da762e5bd632c832852fd3d3c18d8b7cdef9e38 /arch/arm/mach-uniphier/board_init.c | |
| parent | 514d00e527320a96c682029f4982955700f1664b (diff) | |
| parent | 76cd7d47fb8ac191553b741bb424e93c94ca759a (diff) | |
Merge tag 'uniphier-v2020.04-2' of https://gitlab.denx.de/u-boot/custodians/u-boot-uniphier
UniPhier SoC updates for v2020.04 (2nd)
Denali NAND driver changes:
- Set up more registers in denali-spl for SOCFPGA
- Make clocks optional
- Do not assert reset signals in the remove hook
- associate SPARE_AREA_SKIP_BYTES with DT compatible
- switch to UCLASS_MTD
UniPhier platform changes:
- fix a bug in dram_init()
- specify loadaddr for "source" command
Diffstat (limited to 'arch/arm/mach-uniphier/board_init.c')
| -rw-r--r-- | arch/arm/mach-uniphier/board_init.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/mach-uniphier/board_init.c b/arch/arm/mach-uniphier/board_init.c index 7535f915286..99727a30042 100644 --- a/arch/arm/mach-uniphier/board_init.c +++ b/arch/arm/mach-uniphier/board_init.c @@ -40,7 +40,6 @@ static const struct uniphier_initdata uniphier_initdata[] = { .soc_id = UNIPHIER_LD4_ID, .sbc_init = uniphier_ld4_sbc_init, .pll_init = uniphier_ld4_pll_init, - .clk_init = uniphier_ld4_clk_init, }, #endif #if defined(CONFIG_ARCH_UNIPHIER_PRO4) @@ -56,7 +55,6 @@ static const struct uniphier_initdata uniphier_initdata[] = { .soc_id = UNIPHIER_SLD8_ID, .sbc_init = uniphier_ld4_sbc_init, .pll_init = uniphier_ld4_pll_init, - .clk_init = uniphier_ld4_clk_init, }, #endif #if defined(CONFIG_ARCH_UNIPHIER_PRO5) |