diff options
| author | Tom Rini <trini@konsulko.com> | 2023-03-22 09:21:41 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2023-03-22 09:21:41 -0400 |
| commit | 5e207b8517427226b96c5e808ae119fb1d75d39a (patch) | |
| tree | 42cdd1f67733a761e6c6c753ae9b5f13111e53e6 | |
| parent | e37be8484f025137d5073406641b1c731c19b3e1 (diff) | |
| parent | de58694f0d5431627d7389f50a6b2034a682ba24 (diff) | |
| download | u-boot-5e207b8517427226b96c5e808ae119fb1d75d39a.zip u-boot-5e207b8517427226b96c5e808ae119fb1d75d39a.tar.gz u-boot-5e207b8517427226b96c5e808ae119fb1d75d39a.tar.bz2 | |
Merge tag 'u-boot-amlogic-20230322' of https://source.denx.de/u-boot/custodians/u-boot-amlogic
- odroid-go-ultra: setup PMIC regulators at board init
| -rw-r--r-- | arch/arm/dts/meson-g12b-odroid-go-ultra-u-boot.dtsi | 8 | ||||
| -rw-r--r-- | board/amlogic/odroid-go-ultra/MAINTAINERS | 7 | ||||
| -rw-r--r-- | board/amlogic/odroid-go-ultra/Makefile | 5 | ||||
| -rw-r--r-- | board/amlogic/odroid-go-ultra/odroid-go-ultra.c | 22 | ||||
| -rw-r--r-- | configs/odroid-go-ultra_defconfig | 4 |
5 files changed, 44 insertions, 2 deletions
diff --git a/arch/arm/dts/meson-g12b-odroid-go-ultra-u-boot.dtsi b/arch/arm/dts/meson-g12b-odroid-go-ultra-u-boot.dtsi index 00852f5..1c0f976 100644 --- a/arch/arm/dts/meson-g12b-odroid-go-ultra-u-boot.dtsi +++ b/arch/arm/dts/meson-g12b-odroid-go-ultra-u-boot.dtsi @@ -14,3 +14,11 @@ &usb3_pcie_phy { /delete-property/ phy-supply; }; + +&vcc_2v3 { + regulator-init-microvolt = <2400000>; +}; + +&vdd_ee { + regulator-init-microvolt = <875000>; +}; diff --git a/board/amlogic/odroid-go-ultra/MAINTAINERS b/board/amlogic/odroid-go-ultra/MAINTAINERS new file mode 100644 index 0000000..c22951b --- /dev/null +++ b/board/amlogic/odroid-go-ultra/MAINTAINERS @@ -0,0 +1,7 @@ +ODROID-GO-ULTRA +M: Neil Armstrong <neil.armstrong@linaro.org> +S: Maintained +L: u-boot-amlogic@groups.io +F: board/amlogic/odroid-go-ultra +F: configs/odroid-go-ultra_defconfig +F: doc/board/amlogic/odroid-go-ultra.rst diff --git a/board/amlogic/odroid-go-ultra/Makefile b/board/amlogic/odroid-go-ultra/Makefile new file mode 100644 index 0000000..8ebaa0c --- /dev/null +++ b/board/amlogic/odroid-go-ultra/Makefile @@ -0,0 +1,5 @@ +# SPDX-License-Identifier: GPL-2.0+ +# +# (C) Copyright 2023 Neil Armstrong <neil.armstrong@linaro.org> + +obj-y := odroid-go-ultra.o diff --git a/board/amlogic/odroid-go-ultra/odroid-go-ultra.c b/board/amlogic/odroid-go-ultra/odroid-go-ultra.c new file mode 100644 index 0000000..bbd23e2 --- /dev/null +++ b/board/amlogic/odroid-go-ultra/odroid-go-ultra.c @@ -0,0 +1,22 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (C) 2023 Neil Armstrong <neil.armstrong@linaro.org> + */ + +#include <common.h> +#include <asm/arch/boot.h> +#include <power/regulator.h> + +int mmc_get_env_dev(void) +{ + if (meson_get_boot_device() == BOOT_DEVICE_EMMC) + return 1; + return 0; +} + +int board_init(void) +{ + regulators_enable_boot_on(_DEBUG); + + return 0; +} diff --git a/configs/odroid-go-ultra_defconfig b/configs/odroid-go-ultra_defconfig index dca3a3a..102469e 100644 --- a/configs/odroid-go-ultra_defconfig +++ b/configs/odroid-go-ultra_defconfig @@ -1,5 +1,5 @@ CONFIG_ARM=y -CONFIG_SYS_BOARD="w400" +CONFIG_SYS_BOARD="odroid-go-ultra" CONFIG_ARCH_MESON=y CONFIG_TEXT_BASE=0x01000000 CONFIG_NR_DRAM_BANKS=1 @@ -18,7 +18,6 @@ CONFIG_DEBUG_UART=y CONFIG_REMAKE_ELF=y CONFIG_OF_BOARD_SETUP=y # CONFIG_DISPLAY_CPUINFO is not set -CONFIG_MISC_INIT_R=y CONFIG_SYS_MAXARGS=32 # CONFIG_CMD_BDI is not set # CONFIG_CMD_IMI is not set @@ -28,6 +27,7 @@ CONFIG_CMD_MMC=y CONFIG_CMD_USB=y CONFIG_CMD_USB_MASS_STORAGE=y # CONFIG_CMD_SETEXPR is not set +CONFIG_CMD_PMIC=y CONFIG_CMD_REGULATOR=y CONFIG_OF_CONTROL=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y |