diff options
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/dts/am437x-gp-evm-u-boot.dtsi | 16 | ||||
| -rw-r--r-- | arch/arm/dts/k3-j721e-r5-common-proc-board.dts | 4 | ||||
| -rw-r--r-- | arch/arm/mach-k3/Kconfig | 2 | ||||
| -rw-r--r-- | arch/arm/mach-k3/am6_init.c | 10 | ||||
| -rw-r--r-- | arch/arm/mach-k3/common.c | 2 |
5 files changed, 32 insertions, 2 deletions
diff --git a/arch/arm/dts/am437x-gp-evm-u-boot.dtsi b/arch/arm/dts/am437x-gp-evm-u-boot.dtsi index d950d32f17..b55aa8e763 100644 --- a/arch/arm/dts/am437x-gp-evm-u-boot.dtsi +++ b/arch/arm/dts/am437x-gp-evm-u-boot.dtsi @@ -42,3 +42,19 @@ &i2c0 { u-boot,dm-spl; }; + +&l4_wkup { + u-boot,dm-spl; +}; + +&scm { + u-boot,dm-spl; +}; + +&scm_conf { + u-boot,dm-spl; +}; + +ðphy0 { + u-boot,dm-spl; +}; diff --git a/arch/arm/dts/k3-j721e-r5-common-proc-board.dts b/arch/arm/dts/k3-j721e-r5-common-proc-board.dts index 1f14d71438..eb577cdbc6 100644 --- a/arch/arm/dts/k3-j721e-r5-common-proc-board.dts +++ b/arch/arm/dts/k3-j721e-r5-common-proc-board.dts @@ -157,9 +157,13 @@ }; &mcu_uart0 { + /delete-property/ power-domains; + /delete-property/ clocks; + /delete-property/ clock-names; pinctrl-names = "default"; pinctrl-0 = <&mcu_uart0_pins_default>; status = "okay"; + clock-frequency = <48000000>; }; &main_uart0 { diff --git a/arch/arm/mach-k3/Kconfig b/arch/arm/mach-k3/Kconfig index 2e111bbf27..8f4272286c 100644 --- a/arch/arm/mach-k3/Kconfig +++ b/arch/arm/mach-k3/Kconfig @@ -50,7 +50,7 @@ config SYS_K3_MCU_SCRATCHPAD_SIZE config SYS_K3_BOOT_PARAM_TABLE_INDEX hex default 0x41c7fbfc if SOC_K3_AM6 - default 0x41cffc00 if SOC_K3_J721E + default 0x41cffbfc if SOC_K3_J721E help Address at which ROM stores the value which determines if SPL is booted up by primary boot media or secondary boot media. diff --git a/arch/arm/mach-k3/am6_init.c b/arch/arm/mach-k3/am6_init.c index 8d107b870b..63cd7e0458 100644 --- a/arch/arm/mach-k3/am6_init.c +++ b/arch/arm/mach-k3/am6_init.c @@ -109,6 +109,16 @@ void board_init_f(ulong dummy) /* Init DM early in-order to invoke system controller */ spl_early_init(); +#ifdef CONFIG_K3_EARLY_CONS + /* + * Allow establishing an early console as required for example when + * doing a UART-based boot. Note that this console may not "survive" + * through a SYSFW PM-init step and will need a re-init in some way + * due to changing module clock frequencies. + */ + early_console_init(); +#endif + #ifdef CONFIG_K3_LOAD_SYSFW /* * Process pinctrl for the serial0 a.k.a. WKUP_UART0 module and continue diff --git a/arch/arm/mach-k3/common.c b/arch/arm/mach-k3/common.c index 2f82edb970..7af60a7f2f 100644 --- a/arch/arm/mach-k3/common.c +++ b/arch/arm/mach-k3/common.c @@ -218,7 +218,7 @@ int print_cpuinfo(void) name = "Unknown Silicon"; }; - printf("%s PG ", name); + printf("%s SR ", name); switch (rev) { case REV_PG1_0: name = "1.0"; |