diff options
| author | Tom Rini <trini@konsulko.com> | 2021-02-12 09:09:10 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-02-12 09:09:10 -0500 |
| commit | 7c82e12cc4e9e25d7c89fe15bfeec4e9b0bb2b4d (patch) | |
| tree | fa26858ef3ca931b31456045461e239cbe57719b /arch | |
| parent | 80c7e4cf76d204d4b726b0cc57a557a9d9c1c453 (diff) | |
| parent | 65bde1c087f847a2e279501e27eeaddba16e3b51 (diff) | |
| download | u-boot-7c82e12cc4e9e25d7c89fe15bfeec4e9b0bb2b4d.zip u-boot-7c82e12cc4e9e25d7c89fe15bfeec4e9b0bb2b4d.tar.gz u-boot-7c82e12cc4e9e25d7c89fe15bfeec4e9b0bb2b4d.tar.bz2 | |
Merge tag 'u-boot-atmel-fixes-2021.04-a' of https://gitlab.denx.de/u-boot/custodians/u-boot-atmelWIP/12Feb2021
First set of u-boot-atmel fixes for 2021.04 cycle:
This small PR includes just two fixes but very important: one revert in
the clk subsystem which fixes the boot on many old boards
(sama5d2_xplained, sama5d4_xplained), which currently crash at boot; and
one small fix related to debug serial on sama7g5ek board.
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/dts/sama7g5ek.dts | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/dts/sama7g5ek.dts b/arch/arm/dts/sama7g5ek.dts index ff9c9eb..3a4fdd3 100644 --- a/arch/arm/dts/sama7g5ek.dts +++ b/arch/arm/dts/sama7g5ek.dts @@ -122,7 +122,7 @@ pinctrl_flx3_default: flx3_default { pinmux = <PIN_PD16__FLEXCOM3_IO0>, <PIN_PD17__FLEXCOM3_IO1>; - bias-disable; + bias-pull-up; }; pinctrl_sdmmc0_cmd_data_default: sdmmc0_cmd_data_default { |