diff options
| author | Tom Rini <trini@konsulko.com> | 2023-06-19 09:18:40 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2023-06-19 09:18:40 -0400 |
| commit | 50842b217fef505a0ec6662cc2acdc55d0bb23c5 (patch) | |
| tree | fa4e4ec78b8a479ded37aadd11fc62d8aa8ff029 | |
| parent | 1c30e10017ec8bcd0ffec0d8c7d17539ae73dfa7 (diff) | |
| parent | ee8f873678cca41df206f23883d6fe6a641a7f21 (diff) | |
Merge tag 'u-boot-at91-fixes-2023.07-a' of https://source.denx.de/u-boot/custodians/u-boot-at91
First set of u-boot-atmel fixes for the 2023.07 cycle:
This small fixes set includes one init fix for scmi clocks and a missing
gpio_request for pm9g45.
| -rw-r--r-- | arch/arm/mach-at91/armv7/cpu.c | 2 | ||||
| -rw-r--r-- | board/ronetix/pm9g45/pm9g45.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/mach-at91/armv7/cpu.c b/arch/arm/mach-at91/armv7/cpu.c index 616621a1f9de..5ea7e2609f59 100644 --- a/arch/arm/mach-at91/armv7/cpu.c +++ b/arch/arm/mach-at91/armv7/cpu.c @@ -24,7 +24,7 @@ int arch_cpu_init(void) { -#if defined(CONFIG_CLK_CCF) +#if defined(CONFIG_CLK_CCF) || defined(CONFIG_CLK_SCMI) return 0; #else return at91_clock_init(CFG_SYS_AT91_MAIN_CLOCK); diff --git a/board/ronetix/pm9g45/pm9g45.c b/board/ronetix/pm9g45/pm9g45.c index c56582a19485..aa5c80ac6417 100644 --- a/board/ronetix/pm9g45/pm9g45.c +++ b/board/ronetix/pm9g45/pm9g45.c @@ -67,10 +67,12 @@ static void pm9g45_nand_hw_init(void) #ifdef CFG_SYS_NAND_READY_PIN /* Configure RDY/BSY */ + gpio_request(CFG_SYS_NAND_READY_PIN, "NAND RDY/BSY"); gpio_direction_input(CFG_SYS_NAND_READY_PIN); #endif /* Enable NandFlash */ + gpio_request(CFG_SYS_NAND_ENABLE_PIN, "NAND enable"); gpio_direction_output(CFG_SYS_NAND_ENABLE_PIN, 1); } #endif |