diff options
| author | Tom Rini <[email protected]> | 2026-06-24 10:02:34 -0600 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2026-06-24 10:02:34 -0600 |
| commit | 77a48fa272161df9b778ffc09af814eec11cddd2 (patch) | |
| tree | 69ac4345f7f9696f0c7f79fdaddf81e3ef4577eb /dts | |
| parent | fcda974e36033ad5331a9b4a4a551af4e141ad7d (diff) | |
| parent | b4fa246a1565aa63375de06b732c6d1eb1f82d27 (diff) | |
Merge tag 'mediatek-for-master-2026-06-24' of https://source.denx.de/u-boot/custodians/u-boot-mediatek
- Cherry-pick upstream devicetree fix for duplicate regulator names.
- Fix regressions due to recent mach-wide cleanups accidentally changing
gd->bd->bi_dram[0].size.
Diffstat (limited to 'dts')
| -rw-r--r-- | dts/upstream/src/arm64/mediatek/mt6359.dtsi | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/dts/upstream/src/arm64/mediatek/mt6359.dtsi b/dts/upstream/src/arm64/mediatek/mt6359.dtsi index 467d8a4c2aa..45ad69ee49e 100644 --- a/dts/upstream/src/arm64/mediatek/mt6359.dtsi +++ b/dts/upstream/src/arm64/mediatek/mt6359.dtsi @@ -205,7 +205,7 @@ regulator-max-microvolt = <1700000>; }; mt6359_vrfck_1_ldo_reg: ldo_vrfck_1 { - regulator-name = "vrfck"; + regulator-name = "vrfck_1"; regulator-min-microvolt = <1240000>; regulator-max-microvolt = <1600000>; }; @@ -227,7 +227,7 @@ regulator-max-microvolt = <3300000>; }; mt6359_vemc_1_ldo_reg: ldo_vemc_1 { - regulator-name = "vemc"; + regulator-name = "vemc_1"; regulator-min-microvolt = <2500000>; regulator-max-microvolt = <3300000>; }; |