diff options
| author | Tom Rini <[email protected]> | 2026-08-29 09:56:00 -0600 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2026-08-29 09:56:00 -0600 |
| commit | 856a00aeb61c1d4e7825257e54219599f8e34a6c (patch) | |
| tree | 0b02f08085d5db33af937a34e861e86c7d60fa84 /arch/arm/dts | |
| parent | 043b4280138d45c50340c0f899935b83be4375b7 (diff) | |
| parent | ed58bafd0b24e15b734c624bdaf00b876e5d32e6 (diff) | |
Merge tag 'u-boot-rockchip-2027.01-20260828' of https://git.u-boot-project.org/u-boot/custodians/u-boot-rockchip into nextnext
- Fixed possible SPI hangs when only PICO is routed (TX-only),
- Added support for ROC-RK3399-PC-PLUS (via roc-pc-rk3399_defconfig)
Diffstat (limited to 'arch/arm/dts')
| -rw-r--r-- | arch/arm/dts/rk3399-roc-pc-u-boot.dtsi | 26 |
1 files changed, 5 insertions, 21 deletions
diff --git a/arch/arm/dts/rk3399-roc-pc-u-boot.dtsi b/arch/arm/dts/rk3399-roc-pc-u-boot.dtsi index 883d399a06a..e7e4a2c8907 100644 --- a/arch/arm/dts/rk3399-roc-pc-u-boot.dtsi +++ b/arch/arm/dts/rk3399-roc-pc-u-boot.dtsi @@ -10,30 +10,14 @@ config { sysreset-gpio = <&gpio1 RK_PA6 GPIO_ACTIVE_HIGH>; }; +}; - vcc_hub_en: vcc_hub_en-regulator { - compatible = "regulator-fixed"; - enable-active-high; - gpio = <&gpio2 RK_PA4 GPIO_ACTIVE_HIGH>; - pinctrl-names = "default"; - pinctrl-0 = <&hub_rst>; - regulator-name = "vcc_hub_en"; - regulator-always-on; - }; +&i2c7 { + bootph-pre-ram; }; -/* - * should be placed inside mp8859, but not until mp8859 has - * its own dt-binding. - */ -&dc_12v { - compatible = "regulator-fixed"; - regulator-name = "dc_12v"; - regulator-always-on; - regulator-boot-on; - regulator-min-microvolt = <12000000>; - regulator-max-microvolt = <12000000>; - vin-supply = <&vcc_vbus_typec0>; +&i2c7_xfer { + bootph-pre-ram; }; &gpio4 { |