diff options
| author | Tom Rini <[email protected]> | 2026-03-23 08:03:17 -0600 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2026-03-23 08:03:17 -0600 |
| commit | e21ac9309112dbed4a021d0fbc0a8ca4c8328303 (patch) | |
| tree | ac3105afa6e492795b98923d24d90702ed9e3a7b /arch | |
| parent | f09e500f6d242d35fc477dcc2dbcfd469188b5a5 (diff) | |
| parent | 1f305f99d2001e96daa7e93da4da2bf56da9278e (diff) | |
Merge tag 'fsl-qoriq-for-2026.04-rc5' of https://source.denx.de/u-boot/custodians/u-boot-fsl-qoriq
CI: https://source.denx.de/u-boot/custodians/u-boot-fsl-qoriq/-/pipelines/29615
- Fix SPI flash clock for ls102xa
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/dts/ls1021a-tsn.dts | 4 | ||||
| -rw-r--r-- | arch/arm/include/asm/arch-ls102xa/immap_ls102xa.h | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/arch/arm/dts/ls1021a-tsn.dts b/arch/arm/dts/ls1021a-tsn.dts index 68f5543644e..e74d0956194 100644 --- a/arch/arm/dts/ls1021a-tsn.dts +++ b/arch/arm/dts/ls1021a-tsn.dts @@ -22,6 +22,10 @@ ethernet5 = &swp4; ethernet6 = &swp5; }; + + chosen { + stdout-path = &uart0; + }; }; &dspi0 { diff --git a/arch/arm/include/asm/arch-ls102xa/immap_ls102xa.h b/arch/arm/include/asm/arch-ls102xa/immap_ls102xa.h index a0c3da7f46d..51ba8733768 100644 --- a/arch/arm/include/asm/arch-ls102xa/immap_ls102xa.h +++ b/arch/arm/include/asm/arch-ls102xa/immap_ls102xa.h @@ -137,7 +137,7 @@ struct ccsr_gur { #define SCFG_ETSECCMCR_GE0_CLK125 0x00000000 #define SCFG_ETSECCMCR_GE1_CLK125 0x08000000 #define SCFG_PIXCLKCR_PXCKEN 0x80000000 -#define SCFG_QSPI_CLKSEL 0x50100000 +#define SCFG_QSPI_CLKSEL 0x30100000 #define SCFG_SNPCNFGCR_SEC_RD_WR 0xc0000000 #define SCFG_SNPCNFGCR_DCU_RD_WR 0x03000000 #define SCFG_SNPCNFGCR_SATA_RD_WR 0x00c00000 |