diff --git a/config/boards/mekotronics-r58x-4g.csc b/config/boards/mekotronics-r58x-4g.csc index 36b7904e3a0a..030d150d9f91 100644 --- a/config/boards/mekotronics-r58x-4g.csc +++ b/config/boards/mekotronics-r58x-4g.csc @@ -29,8 +29,8 @@ function post_family_config__mekor58x_4g_use_mainline_uboot() { declare -g BOOTCONFIG="mekotronics-r58x-4g-rk3588_defconfig" # mainline declare -g BOOTDELAY=1 declare -g BOOTSOURCE="https://github.com/u-boot/u-boot.git" - declare -g BOOTBRANCH="tag:v2026.01" - declare -g BOOTPATCHDIR="v2026.01" + declare -g BOOTBRANCH="tag:v2026.04-rc2" + declare -g BOOTPATCHDIR="v2026.04" declare -g BOOTDIR="u-boot-${BOARD}" declare -g UBOOT_TARGET_MAP="BL31=bl31.elf ROCKCHIP_TPL=${RKBIN_DIR}/${DDR_BLOB};;u-boot-rockchip.bin" @@ -54,6 +54,20 @@ function pre_config_uboot_target__mekor58x_4g_patch_rockchip_common_boot_order() regular_git diff -u include/configs/rockchip-common.h || true } +function pre_config_uboot_target__ekor58x_4g_patch_uboot_dtsi_for_ums() { + [[ "${BRANCH}" == "vendor" ]] && return 0 # Not for 'vendor' branch, which uses 2017.09 vendor u-boot from Radxa + + display_alert "u-boot for ${BOARD}" "u-boot: add to u-boot dtsi for UMS" "info" # avoid a patch, just append to the dtsi file + # Append to the t6 u-boot dtsi file with stuff for enabling gadget/otg/peripheral mode + cat <<- EOD >> arch/arm/dts/rk3588-blueberry-edge-v12-linux-u-boot.dtsi + #include "rk3588-generic-u-boot.dtsi" + &u2phy0 { status = "okay"; }; + &u2phy0_otg { status = "okay"; }; + &usbdp_phy0 { status = "okay"; }; + &usb_host0_xhci { dr_mode = "peripheral"; maximum-speed = "high-speed"; status = "okay"; }; + EOD +} + function post_config_uboot_target__extra_configs_for_mekor58x_4g_mainline_environment_in_spi() { display_alert "u-boot for ${BOARD}/${BRANCH}" "u-boot: enable board-specific configs" "info" run_host_command_logged scripts/config --enable CONFIG_CMD_MISC diff --git a/patch/kernel/archive/rockchip64-6.19/dt/rk3588-blueberry-edge-v12-linux.dts b/patch/kernel/archive/rockchip64-6.19/dt/rk3588-blueberry-edge-v12-linux.dts index ac04cc61c64e..803a0fd14d3b 100644 --- a/patch/kernel/archive/rockchip64-6.19/dt/rk3588-blueberry-edge-v12-linux.dts +++ b/patch/kernel/archive/rockchip64-6.19/dt/rk3588-blueberry-edge-v12-linux.dts @@ -57,6 +57,17 @@ }; + sound { + compatible = "audio-graph-card"; + label = "rockchip,es8388"; + widgets = "Microphone", "Mic Jack", + "Headphone", "Headphones"; + routing = "LINPUT2", "Mic Jack", + "Headphones", "LOUT1", + "Headphones", "ROUT1"; + dais = <&i2s0_8ch_p0>; + }; + vcc12v_dcin: vcc12v-dcin { compatible = "regulator-fixed"; regulator-name = "vcc12v_dcin"; @@ -90,6 +101,20 @@ pinctrl-0 = <&vcc5v0_host_en>; }; + vcc5v0_otg: vcc5v0-otg-regulator { + compatible = "regulator-fixed"; + regulator-name = "vcc5v0_otg"; + regulator-boot-on; + regulator-always-on; + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; + enable-active-high; + gpio = <&gpio4 RK_PA7 GPIO_ACTIVE_HIGH>; + vin-supply = <&vcc5v0_sys>; + pinctrl-names = "default"; + pinctrl-0 = <&vcc5v0_otg_en>; + }; + vcc_1v1_nldo_s3: vcc-1v1-nldo-s3 { compatible = "regulator-fixed"; regulator-name = "vcc_1v1_nldo_s3"; @@ -251,7 +276,6 @@ }; &hdmi0 { - enable-gpios = <&gpio4 RK_PB1 GPIO_ACTIVE_HIGH>; status = "okay"; }; @@ -349,6 +373,26 @@ }; }; +&i2c3 { + status = "okay"; + + es8388: audio-codec@10 { + compatible = "everest,es8388", "everest,es8328"; + reg = <0x10>; + clocks = <&cru I2S0_8CH_MCLKOUT>; + clock-names = "mclk"; + assigned-clocks = <&cru I2S0_8CH_MCLKOUT>; + assigned-clock-rates = <12288000>; + #sound-dai-cells = <0>; + + port { + es8316_p0_0: endpoint { + remote-endpoint = <&i2s0_8ch_p0_0>; + }; + }; + }; +}; + // Unknown where this is wired to, maybe some header pins. Found on vendor DT. &i2c5 { pinctrl-names = "default"; @@ -373,6 +417,24 @@ }; }; +// analog sound +&i2s0_8ch { + pinctrl-names = "default"; + pinctrl-0 = <&i2s0_lrck + &i2s0_sclk + &i2s0_sdi0 + &i2s0_sdo0>; + status = "okay"; + + i2s0_8ch_p0: port { + i2s0_8ch_p0_0: endpoint { + dai-format = "i2s"; + mclk-fs = <256>; + remote-endpoint = <&es8316_p0_0>; + }; + }; +}; + //hdmi0 sound &i2s5_8ch { status = "okay"; @@ -445,16 +507,6 @@ status = "okay"; }; -/* @TODO - modem { - compatible = "rockchip,modem"; - power-on_gpio = <&gpio0 0x1d 0x00>; - reset_gpio = <&gpio0 0x00 0x00>; - status = "okay"; - }; -*/ - - &pinctrl { gpio-leds { @@ -519,6 +571,16 @@ }; }; + usb-typec { + usbc0_int: usbc0-int { // @TODO missing fusb302 + rockchip,pins = <3 RK_PC7 RK_FUNC_GPIO &pcfg_pull_up>; + }; + + vcc5v0_otg_en: vcc5v0-otg-en { + rockchip,pins = <4 RK_PA7 RK_FUNC_GPIO &pcfg_pull_none>; + }; + }; + }; &sata0 { @@ -920,6 +982,10 @@ }; }; +&usbdp_phy1 { + rockchip,dp-lane-mux = <0 1 2 3>; + status = "okay"; +}; &u2phy0 { status = "okay"; @@ -937,15 +1003,13 @@ status = "okay"; }; -// XHCI (USB3) stuff is disabled, as it all depends on the fusb302 USB-C controller -// the blue ports on the front of the board, labelled "USB3", arent really USB3, but USB2. &u2phy1 { // for usbdp_phy1 which is also usb_host1_xhci - status = "disabled"; + status = "okay"; }; -&u2phy1_otg { // for usb_host1_xhci +&u2phy1_otg { phy-supply = <&vcc5v0_host>; - status = "disabled"; + status = "okay"; }; // USB 2.0 stuff that somewhat works: @@ -975,6 +1039,11 @@ status = "okay"; }; +&usb_host0_xhci { + dr_mode = "host"; + status = "okay"; +}; + &usb_host1_ehci { status = "okay"; }; @@ -983,6 +1052,11 @@ status = "okay"; }; +&usb_host1_xhci { + dr_mode = "host"; + status = "okay"; +}; + &vop { status = "okay"; }; diff --git a/patch/u-boot/v2026.01/dt_uboot/rk3588-blueberry-edge-v12-linux.dtsi b/patch/u-boot/v2026.01/dt_uboot/rk3588-blueberry-edge-v12-linux.dtsi deleted file mode 100644 index e80f9bbfa5ce..000000000000 --- a/patch/u-boot/v2026.01/dt_uboot/rk3588-blueberry-edge-v12-linux.dtsi +++ /dev/null @@ -1 +0,0 @@ -#include "rk3588-generic-u-boot.dtsi" diff --git a/patch/u-boot/v2026.01/dt_upstream_rockchip/rk3588-blueberry-edge-v12-linux.dts b/patch/u-boot/v2026.01/dt_upstream_rockchip/rk3588-blueberry-edge-v12-linux.dts deleted file mode 100644 index bb69d01295bc..000000000000 --- a/patch/u-boot/v2026.01/dt_upstream_rockchip/rk3588-blueberry-edge-v12-linux.dts +++ /dev/null @@ -1,1035 +0,0 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) - -/dts-v1/; - -#include -#include -#include -#include -#include -#include -#include "rk3588.dtsi" - -/ { - model = "Mekotronics R58X-4G"; - compatible = "mekotronics,r58x-4G", "rockchip,rk3588"; - - aliases { - mmc0 = &sdhci; // eMMC - ethernet0 = &gmac0; - ethernet1 = &gmac1; - rs485 = &uart0; - rs232 = &uart3; - }; - - chosen { - stdout-path = "serial2:1500000n8"; - }; - - leds { - compatible = "gpio-leds"; - - fourg_led: fourg-led { - color = ; - label = "4G"; - gpios = <&gpio3 RK_PC5 GPIO_ACTIVE_HIGH>; - pinctrl-names = "default"; - pinctrl-0 = <&fourg_led_pin>; - }; - - lan_led: lan-led { - color = ; - label = "LAN"; - gpios = <&gpio3 RK_PC0 GPIO_ACTIVE_HIGH>; - pinctrl-names = "default"; - pinctrl-0 = <&lan_led_pin>; - }; - - // actually two leds: blue one labelled "PWR", and white one on Power button itself - power_led: power-led { - color = ; - label = "PWR"; - gpios = <&gpio3 RK_PB7 GPIO_ACTIVE_HIGH>; - linux,default-trigger = "heartbeat"; - pinctrl-names = "default"; - pinctrl-0 = <&power_led_pin>; - }; - - }; - - vcc12v_dcin: vcc12v-dcin { - compatible = "regulator-fixed"; - regulator-name = "vcc12v_dcin"; - regulator-always-on; - regulator-boot-on; - regulator-min-microvolt = <12000000>; - regulator-max-microvolt = <12000000>; - }; - - vcc5v0_sys: vcc5v0-sys { - compatible = "regulator-fixed"; - regulator-name = "vcc5v0_sys"; - regulator-always-on; - regulator-boot-on; - regulator-min-microvolt = <5000000>; - regulator-max-microvolt = <5000000>; - vin-supply = <&vcc12v_dcin>; - }; - - vcc5v0_host: vcc5v0-host-regulator { - compatible = "regulator-fixed"; - regulator-name = "vcc5v0_host"; - regulator-boot-on; - regulator-always-on; - regulator-min-microvolt = <5000000>; - regulator-max-microvolt = <5000000>; - enable-active-high; - gpio = <&gpio4 RK_PB0 GPIO_ACTIVE_HIGH>; - vin-supply = <&vcc5v0_sys>; - pinctrl-names = "default"; - pinctrl-0 = <&vcc5v0_host_en>; - }; - - vcc_1v1_nldo_s3: vcc-1v1-nldo-s3 { - compatible = "regulator-fixed"; - regulator-name = "vcc_1v1_nldo_s3"; - regulator-always-on; - regulator-boot-on; - regulator-min-microvolt = <1100000>; - regulator-max-microvolt = <1100000>; - vin-supply = <&vcc5v0_sys>; - }; - - pcie30_avdd0v75: pcie30-avdd0v75 { - compatible = "regulator-fixed"; - regulator-name = "pcie30_avdd0v75"; - regulator-boot-on; - regulator-always-on; - regulator-min-microvolt = <750000>; - regulator-max-microvolt = <750000>; - vin-supply = <&vdd_0v75_s0>; - }; - - pcie30_avdd1v8: pcie30-avdd1v8 { - compatible = "regulator-fixed"; - regulator-name = "pcie30_avdd1v8"; - regulator-boot-on; - regulator-always-on; - regulator-min-microvolt = <1800000>; - regulator-max-microvolt = <1800000>; - vin-supply = <&avcc_1v8_s0>; - }; - - vcc3v3_pcie30: vcc3v3-pcie30 { - compatible = "regulator-fixed"; - regulator-name = "vcc3v3_pcie30"; - regulator-min-microvolt = <3300000>; - regulator-max-microvolt = <3300000>; - enable-active-high; - pinctrl-names = "default"; - pinctrl-0 = <&vcc3v3_pcie30_en>; - gpios = <&gpio1 RK_PC4 GPIO_ACTIVE_HIGH>; //PCIE30x4_PWREN_H - startup-delay-us = <10000>; - vin-supply = <&vcc12v_dcin>; - }; - - vcc3v3_wlan: regulator-vcc3v3-wlan { - compatible = "regulator-fixed"; - regulator-name = "wlan-en"; - regulator-min-microvolt = <3300000>; - regulator-max-microvolt = <3300000>; - enable-active-high; - gpios = <&gpio1 RK_PB1 GPIO_ACTIVE_HIGH>; - pinctrl-names = "default"; - pinctrl-0 = <&wifi_pwren>; - vin-supply = <&vcc12v_dcin>; - }; - - hdmi0-con { - compatible = "hdmi-connector"; - type = "a"; - - port { - hdmi0_con_in: endpoint { - remote-endpoint = <&hdmi0_out_con>; - }; - }; - }; -}; - -&cpu_b0 { - cpu-supply = <&vdd_cpu_big0_s0>; - mem-supply = <&vdd_cpu_big0_s0>; -}; - -&cpu_b1 { - cpu-supply = <&vdd_cpu_big0_s0>; - mem-supply = <&vdd_cpu_big0_s0>; -}; - -&cpu_b2 { - cpu-supply = <&vdd_cpu_big1_s0>; - mem-supply = <&vdd_cpu_big1_s0>; -}; - -&cpu_b3 { - cpu-supply = <&vdd_cpu_big1_s0>; - mem-supply = <&vdd_cpu_big1_s0>; -}; - -&cpu_l0 { - cpu-supply = <&vdd_cpu_lit_s0>; - mem-supply = <&vdd_cpu_lit_mem_s0>; -}; - -&cpu_l1 { - cpu-supply = <&vdd_cpu_lit_s0>; - mem-supply = <&vdd_cpu_lit_mem_s0>; -}; - -&cpu_l2 { - cpu-supply = <&vdd_cpu_lit_s0>; - mem-supply = <&vdd_cpu_lit_mem_s0>; -}; - -&cpu_l3 { - cpu-supply = <&vdd_cpu_lit_s0>; - mem-supply = <&vdd_cpu_lit_mem_s0>; -}; - -&gmac0 { - clock_in_out = "output"; - phy-handle = <&rgmii_phy0>; - phy-mode = "rgmii-rxid"; - - snps,reset-gpio = <&gpio4 RK_PB3 GPIO_ACTIVE_LOW>; - snps,reset-active-low; - snps,reset-delays-us = <0 20000 100000>; - - pinctrl-names = "default"; - pinctrl-0 = <&gmac0_miim - &gmac0_tx_bus2 - &gmac0_rx_bus2 - &gmac0_rgmii_clk - &gmac0_rgmii_bus>; - - tx_delay = <0x44>; - //rx_delay = <0x4a>; - - status = "okay"; -}; - -&gmac1 { - clock_in_out = "output"; - phy-handle = <&rgmii_phy1>; - phy-mode = "rgmii-rxid"; - - snps,reset-gpio = <&gpio4 RK_PA2 GPIO_ACTIVE_LOW>; - snps,reset-active-low; - snps,reset-delays-us = <0 20000 100000>; - - pinctrl-names = "default"; - pinctrl-0 = <&gmac1_miim - &gmac1_tx_bus2 - &gmac1_rx_bus2 - &gmac1_rgmii_clk - &gmac1_rgmii_bus>; - - tx_delay = <0x42>; - //rx_delay = <0x4f>; - - status = "okay"; -}; - -&gpu { - mali-supply = <&vdd_gpu_s0>; - status = "okay"; -}; - -&pd_gpu { - domain-supply = <&vdd_gpu_s0>; -}; - -&hdmi0 { - enable-gpios = <&gpio4 RK_PB1 GPIO_ACTIVE_HIGH>; - status = "okay"; -}; - -&hdmi0_in { - hdmi0_in_vp0: endpoint { - remote-endpoint = <&vp0_out_hdmi0>; - }; -}; - -&hdmi0_out { - hdmi0_out_con: endpoint { - remote-endpoint = <&hdmi0_con_in>; - }; -}; - -&hdmi0_sound { - status = "okay"; -}; - -&hdptxphy0 { - status = "okay"; -}; - -&hdmi_receiver_cma { - status = "okay"; -}; - -&hdmi_receiver { - hpd-gpios = <&gpio1 RK_PD5 GPIO_ACTIVE_LOW>; - pinctrl-0 = <&hdmim1_rx_cec &hdmim1_rx_hpdin &hdmim1_rx_scl &hdmim1_rx_sda &hdmirx_hpd>; - pinctrl-names = "default"; - status = "okay"; -}; - -&i2c0 { - pinctrl-names = "default"; - pinctrl-0 = <&i2c0m2_xfer>; - status = "okay"; - - vdd_cpu_big0_s0: regulator@42 { - compatible = "rockchip,rk8602"; - reg = <0x42>; - fcs,suspend-voltage-selector = <1>; - regulator-name = "vdd_cpu_big0_s0"; - regulator-always-on; - regulator-boot-on; - regulator-min-microvolt = <550000>; - regulator-max-microvolt = <1050000>; - regulator-ramp-delay = <2300>; - vin-supply = <&vcc5v0_sys>; - - regulator-state-mem { - regulator-off-in-suspend; - }; - }; - - vdd_cpu_big1_s0: regulator@43 { - compatible = "rockchip,rk8603", "rockchip,rk8602"; - reg = <0x43>; - fcs,suspend-voltage-selector = <1>; - regulator-name = "vdd_cpu_big1_s0"; - regulator-always-on; - regulator-boot-on; - regulator-min-microvolt = <550000>; - regulator-max-microvolt = <1050000>; - regulator-ramp-delay = <2300>; - vin-supply = <&vcc5v0_sys>; - - regulator-state-mem { - regulator-off-in-suspend; - }; - }; -}; - -&i2c2 { - pinctrl-names = "default"; - pinctrl-0 = <&i2c2m0_xfer>; - status = "okay"; - - vdd_npu_s0: regulator@42 { - compatible = "rockchip,rk8602"; - reg = <0x42>; - fcs,suspend-voltage-selector = <1>; - regulator-name = "vdd_npu_s0"; - regulator-always-on; - regulator-boot-on; - regulator-min-microvolt = <550000>; - regulator-max-microvolt = <950000>; - regulator-ramp-delay = <2300>; - vin-supply = <&vcc5v0_sys>; - - regulator-state-mem { - regulator-off-in-suspend; - }; - }; -}; - -// Unknown where this is wired to, maybe some header pins. Found on vendor DT. -&i2c5 { - pinctrl-names = "default"; - pinctrl-0 = <&i2c5m3_xfer>; - status = "okay"; -}; - -&i2c6 { - status = "okay"; - - hym8563: rtc@51 { - compatible = "haoyu,hym8563"; - reg = <0x51>; - #clock-cells = <0>; - clock-frequency = <32768>; - clock-output-names = "hym8563"; - pinctrl-names = "default"; - pinctrl-0 = <&hym8563_int>; - interrupt-parent = <&gpio0>; - interrupts = ; //RTCIC_INT_L_GPIO0_B2 - wakeup-source; - }; -}; - -//hdmi0 sound -&i2s5_8ch { - status = "okay"; -}; - -//hdmirx sound -&i2s7_8ch { - status = "okay"; -}; - -&mdio0 { - rgmii_phy0: ethernet-phy@1 { - compatible = "ethernet-phy-ieee802.3-c22"; - reg = <0x1>; - }; -}; - -&mdio1 { - rgmii_phy1: ethernet-phy@1 { - compatible = "ethernet-phy-ieee802.3-c22"; - reg = <0x1>; - }; -}; - -&pcie30phy { - status = "okay"; -}; - -//m.2 -&pcie3x4 { - reset-gpios = <&gpio4 RK_PB6 GPIO_ACTIVE_HIGH>; - vpcie3v3-supply = <&vcc3v3_pcie30>; - status = "okay"; -}; - -// wifi BCM43752 [14e4:449d] -&pcie2x1l0 { - pinctrl-names = "default"; - pinctrl-0 = <&wifi_host_wake_irq>; - reset-gpios = <&gpio4 RK_PA5 GPIO_ACTIVE_HIGH>; - vpcie3v3-supply = <&vcc3v3_wlan>; - status = "okay"; - - pcie@0,0 { - reg = <0x200000 0 0 0 0>; - #address-cells = <3>; - #size-cells = <2>; - ranges; - device_type = "pci"; - bus-range = <0x20 0x2f>; - - wifi: wifi@0,0 { - compatible = "pci14e4,449d"; - reg = <0x210000 0 0 0 0>; - clocks = <&hym8563>; - clock-names = "lpo"; - }; - }; -}; - -&combphy0_ps { - status = "okay"; -}; - -&combphy1_ps { // for &pcie2x1l0 (wifi) - status = "okay"; -}; - -&combphy2_psu { - status = "okay"; -}; - -/* @TODO - modem { - compatible = "rockchip,modem"; - power-on_gpio = <&gpio0 0x1d 0x00>; - reset_gpio = <&gpio0 0x00 0x00>; - status = "okay"; - }; -*/ - - -&pinctrl { - - gpio-leds { - fourg_led_pin: fourg-led-pin { - rockchip,pins = <3 RK_PC5 RK_FUNC_GPIO &pcfg_pull_none>; - }; - - lan_led_pin: lan-led-pin { - rockchip,pins = <3 RK_PC0 RK_FUNC_GPIO &pcfg_pull_none>; - }; - - power_led_pin: power-led-pin { - rockchip,pins = <3 RK_PB7 RK_FUNC_GPIO &pcfg_pull_none>; - }; - }; - - pcie { - vcc3v3_pcie30_en: vcc3v3-pcie30-en { - rockchip,pins = <1 RK_PC4 RK_FUNC_GPIO &pcfg_pull_up>; - }; - }; - - hdmirx { - hdmirx_hpd: hdmirx-5v-detection { - rockchip,pins = <1 RK_PD5 RK_FUNC_GPIO &pcfg_pull_up>; - }; - }; - - hym8563 { - hym8563_int: hym8563-int { - rockchip,pins = <0 RK_PB2 RK_FUNC_GPIO &pcfg_pull_up>; - }; - }; - - wlan { - wifi_host_wake_irq: wifi-host-wake-irq { - rockchip,pins = <1 RK_PA7 RK_FUNC_GPIO &pcfg_pull_down>; - }; - - wifi_pwren: wifi-pwren { - rockchip,pins = <1 RK_PB1 RK_FUNC_GPIO &pcfg_pull_up>; - }; - }; - - wireless-bluetooth { - bt_reset_pin: bt-reset-pin { - rockchip,pins = <1 RK_PB2 RK_FUNC_GPIO &pcfg_pull_none>; - }; - - bt_wake_pin: bt-wake-pin { - rockchip,pins = <1 RK_PA4 RK_FUNC_GPIO &pcfg_pull_down>; - }; - - bt_wake_host_irq: bt-wake-host-irq { - rockchip,pins = <1 RK_PB0 RK_FUNC_GPIO &pcfg_pull_up>; - }; - }; - - usb { - vcc5v0_host_en: vcc5v0-host-en { - rockchip,pins = <4 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>; - }; - }; - -}; - -&sata0 { - status = "okay"; -}; - -&saradc { - status = "okay"; - vref-supply = <&vcc_1v8_s0>; -}; - -&sdhci { - bus-width = <8>; - no-sdio; - no-sd; - non-removable; - max-frequency = <200000000>; // vendor - // hs400 causes immediate trouble, hs200 works at around 150mb/s - // mmc-hs400-1_8v; - // mmc-hs400-enhanced-strobe; - mmc-hs200-1_8v; - status = "okay"; -}; - -&spi2 { - assigned-clocks = <&cru CLK_SPI2>; - assigned-clock-rates = <200000000>; - num-cs = <1>; - pinctrl-names = "default"; - pinctrl-0 = <&spi2m2_cs0 &spi2m2_pins>; - status = "okay"; - - pmic@0 { - compatible = "rockchip,rk806"; - reg = <0x0>; - interrupt-parent = <&gpio0>; - interrupts = <7 IRQ_TYPE_LEVEL_LOW>; - pinctrl-names = "default", "pmic-power-off"; - pinctrl-0 = <&pmic_pins>, <&rk806_dvs1_null>, - <&rk806_dvs2_null>, <&rk806_dvs3_null>; - pinctrl-1 = <&rk806_dvs1_slp>, <&rk806_dvs2_null>, <&rk806_dvs3_null>; - - spi-max-frequency = <1000000>; - system-power-controller; - - vcc1-supply = <&vcc5v0_sys>; - vcc2-supply = <&vcc5v0_sys>; - vcc3-supply = <&vcc5v0_sys>; - vcc4-supply = <&vcc5v0_sys>; - vcc5-supply = <&vcc5v0_sys>; - vcc6-supply = <&vcc5v0_sys>; - vcc7-supply = <&vcc5v0_sys>; - vcc8-supply = <&vcc5v0_sys>; - vcc9-supply = <&vcc5v0_sys>; - vcc10-supply = <&vcc5v0_sys>; - vcc11-supply = <&vcc_2v0_pldo_s3>; - vcc12-supply = <&vcc5v0_sys>; - vcc13-supply = <&vcc_1v1_nldo_s3>; - vcc14-supply = <&vcc_1v1_nldo_s3>; - vcca-supply = <&vcc5v0_sys>; - - gpio-controller; - #gpio-cells = <2>; - - rk806_dvs1_null: dvs1-null-pins { - pins = "gpio_pwrctrl1"; - function = "pin_fun0"; - }; - - rk806_dvs1_slp: dvs1-slp-pins { - pins = "gpio_pwrctrl1"; - function = "pin_fun1"; - }; - - rk806_dvs2_null: dvs2-null-pins { - pins = "gpio_pwrctrl2"; - function = "pin_fun0"; - }; - - rk806_dvs3_null: dvs3-null-pins { - pins = "gpio_pwrctrl3"; - function = "pin_fun0"; - }; - - regulators { - vdd_gpu_s0: vdd_gpu_mem_s0: dcdc-reg1 { - regulator-boot-on; - regulator-enable-ramp-delay = <400>; - regulator-min-microvolt = <550000>; - regulator-max-microvolt = <950000>; - regulator-name = "vdd_gpu_s0"; - regulator-ramp-delay = <12500>; - - regulator-state-mem { - regulator-off-in-suspend; - }; - }; - - vdd_cpu_lit_s0: vdd_cpu_lit_mem_s0: dcdc-reg2 { - regulator-always-on; - regulator-boot-on; - regulator-min-microvolt = <550000>; - regulator-max-microvolt = <950000>; - regulator-name = "vdd_cpu_lit_s0"; - regulator-ramp-delay = <12500>; - - regulator-state-mem { - regulator-off-in-suspend; - }; - }; - - vdd_log_s0: dcdc-reg3 { - regulator-always-on; - regulator-boot-on; - regulator-min-microvolt = <675000>; - regulator-max-microvolt = <800000>; - regulator-name = "vdd_log_s0"; - regulator-ramp-delay = <12500>; - - regulator-state-mem { - regulator-off-in-suspend; - regulator-suspend-microvolt = <750000>; - }; - }; - - vdd_vdenc_s0: vdd_vdenc_mem_s0: dcdc-reg4 { - regulator-always-on; - regulator-boot-on; - regulator-min-microvolt = <550000>; - regulator-max-microvolt = <950000>; - regulator-name = "vdd_vdenc_s0"; - regulator-ramp-delay = <12500>; - - regulator-state-mem { - regulator-off-in-suspend; - }; - }; - - vdd_ddr_s0: dcdc-reg5 { - regulator-always-on; - regulator-boot-on; - regulator-min-microvolt = <675000>; - regulator-max-microvolt = <900000>; - regulator-name = "vdd_ddr_s0"; - regulator-ramp-delay = <12500>; - - regulator-state-mem { - regulator-off-in-suspend; - regulator-suspend-microvolt = <850000>; - }; - }; - - vdd2_ddr_s3: dcdc-reg6 { - regulator-always-on; - regulator-boot-on; - regulator-name = "vdd2_ddr_s3"; - - regulator-state-mem { - regulator-on-in-suspend; - }; - }; - - vcc_2v0_pldo_s3: dcdc-reg7 { - regulator-always-on; - regulator-boot-on; - regulator-min-microvolt = <2000000>; - regulator-max-microvolt = <2000000>; - regulator-name = "vdd_2v0_pldo_s3"; - regulator-ramp-delay = <12500>; - - regulator-state-mem { - regulator-on-in-suspend; - regulator-suspend-microvolt = <2000000>; - }; - }; - - vcc_3v3_s3: dcdc-reg8 { - regulator-always-on; - regulator-boot-on; - regulator-min-microvolt = <3300000>; - regulator-max-microvolt = <3300000>; - regulator-name = "vcc_3v3_s3"; - - regulator-state-mem { - regulator-on-in-suspend; - regulator-suspend-microvolt = <3300000>; - }; - }; - - vddq_ddr_s0: dcdc-reg9 { - regulator-always-on; - regulator-boot-on; - regulator-name = "vddq_ddr_s0"; - - regulator-state-mem { - regulator-off-in-suspend; - }; - }; - - vcc_1v8_s3: dcdc-reg10 { - regulator-always-on; - regulator-boot-on; - regulator-min-microvolt = <1800000>; - regulator-max-microvolt = <1800000>; - regulator-name = "vcc_1v8_s3"; - - regulator-state-mem { - regulator-on-in-suspend; - regulator-suspend-microvolt = <1800000>; - }; - }; - - avcc_1v8_s0: pldo-reg1 { - regulator-always-on; - regulator-boot-on; - regulator-min-microvolt = <1800000>; - regulator-max-microvolt = <1800000>; - regulator-name = "avcc_1v8_s0"; - - regulator-state-mem { - regulator-off-in-suspend; - }; - }; - - vcc_1v8_s0: pldo-reg2 { - regulator-always-on; - regulator-boot-on; - regulator-min-microvolt = <1800000>; - regulator-max-microvolt = <1800000>; - regulator-name = "vcc_1v8_s0"; - - regulator-state-mem { - regulator-off-in-suspend; - regulator-suspend-microvolt = <1800000>; - }; - }; - - avdd_1v2_s0: pldo-reg3 { - regulator-always-on; - regulator-boot-on; - regulator-min-microvolt = <1200000>; - regulator-max-microvolt = <1200000>; - regulator-name = "avdd_1v2_s0"; - - regulator-state-mem { - regulator-off-in-suspend; - }; - }; - - vcc_3v3_s0: pldo-reg4 { - regulator-always-on; - regulator-boot-on; - regulator-min-microvolt = <3300000>; - regulator-max-microvolt = <3300000>; - regulator-ramp-delay = <12500>; - regulator-name = "vcc_3v3_s0"; - - regulator-state-mem { - regulator-off-in-suspend; - }; - }; - - vccio_sd_s0: pldo-reg5 { - regulator-always-on; - regulator-boot-on; - regulator-min-microvolt = <1800000>; - regulator-max-microvolt = <3300000>; - regulator-ramp-delay = <12500>; - regulator-name = "vccio_sd_s0"; - - regulator-state-mem { - regulator-off-in-suspend; - }; - }; - - pldo6_s3: pldo-reg6 { - regulator-always-on; - regulator-boot-on; - regulator-min-microvolt = <1800000>; - regulator-max-microvolt = <1800000>; - regulator-name = "pldo6_s3"; - - regulator-state-mem { - regulator-on-in-suspend; - regulator-suspend-microvolt = <1800000>; - }; - }; - - vdd_0v75_s3: nldo-reg1 { - regulator-always-on; - regulator-boot-on; - regulator-min-microvolt = <750000>; - regulator-max-microvolt = <750000>; - regulator-name = "vdd_0v75_s3"; - - regulator-state-mem { - regulator-on-in-suspend; - regulator-suspend-microvolt = <750000>; - }; - }; - - vdd_ddr_pll_s0: nldo-reg2 { - regulator-always-on; - regulator-boot-on; - regulator-min-microvolt = <850000>; - regulator-max-microvolt = <850000>; - regulator-name = "vdd_ddr_pll_s0"; - - regulator-state-mem { - regulator-off-in-suspend; - regulator-suspend-microvolt = <850000>; - }; - }; - - avdd_0v75_s0: nldo-reg3 { - regulator-always-on; - regulator-boot-on; - regulator-min-microvolt = <750000>; - regulator-max-microvolt = <750000>; - regulator-name = "avdd_0v75_s0"; - - regulator-state-mem { - regulator-off-in-suspend; - }; - }; - - vdd_0v85_s0: nldo-reg4 { - regulator-always-on; - regulator-boot-on; - regulator-min-microvolt = <850000>; - regulator-max-microvolt = <850000>; - regulator-name = "vdd_0v85_s0"; - - regulator-state-mem { - regulator-off-in-suspend; - }; - }; - - vdd_0v75_s0: nldo-reg5 { - regulator-always-on; - regulator-boot-on; - regulator-min-microvolt = <750000>; - regulator-max-microvolt = <750000>; - regulator-name = "vdd_0v75_s0"; - - regulator-state-mem { - regulator-off-in-suspend; - }; - }; - }; - }; -}; - -&tsadc { - status = "okay"; -}; - -// RS-485 on the back -&uart0 { - status = "okay"; - pinctrl-names = "default"; - pinctrl-0 = <&uart0m2_xfer>; - - linux,rs485-enabled-at-boot-time; -}; - -&uart2 { - pinctrl-0 = <&uart2m0_xfer>; - status = "okay"; -}; - -// RS-232 on the back -&uart3 { - status = "okay"; - pinctrl-names = "default"; - pinctrl-0 = <&uart3m2_xfer>; -}; - -// bluetooth via the BCM43752 -&uart6 { - status = "okay"; - pinctrl-names = "default"; - pinctrl-0 = <&uart6m1_xfer &uart6m1_ctsn &uart6m1_rtsn>; - - bluetooth { - compatible = "brcm,bcm43438-bt"; - clocks = <&hym8563>; - clock-names = "lpo"; - interrupt-parent = <&gpio1>; // bt_wake_host_irq - interrupts = ; // bt_wake_host_irq - interrupt-names = "host-wakeup"; - device-wakeup-gpios = <&gpio1 RK_PA4 GPIO_ACTIVE_HIGH>; // bt_wake_pin - shutdown-gpios = <&gpio1 RK_PB2 GPIO_ACTIVE_HIGH>; // bt_reset_pin - max-speed = <1500000>; - pinctrl-names = "default"; - pinctrl-0 = <&bt_wake_host_irq &bt_wake_pin &bt_reset_pin>; - vbat-supply = <&vcc_3v3_s3>; - vddio-supply = <&vcc_1v8_s3>; - }; -}; - - -&u2phy0 { - status = "okay"; -}; - -&u2phy0_otg { // for fc000000.usb UDC - status = "okay"; -}; - -&usb_host0_xhci { // usb@fc000000 - dr_mode = "peripheral"; - maximum-speed = "high-speed"; - phys = <&u2phy0_otg>; - phy-names = "usb2-phy"; - status = "okay"; -}; - -// XHCI (USB3) stuff is disabled, as it all depends on the fusb302 USB-C controller -// the blue ports on the front of the board, labelled "USB3", arent really USB3, but USB2. -&u2phy1 { // for usbdp_phy1 which is also usb_host1_xhci - status = "disabled"; -}; - -&u2phy1_otg { // for usb_host1_xhci - phy-supply = <&vcc5v0_host>; - status = "disabled"; -}; - -// USB 2.0 stuff that somewhat works: -&u2phy2 { // for usb_host0_ohci and usb_host0_ehci - status = "okay"; -}; - -&u2phy2_host { // for usb_host0_ohci and usb_host0_ehci - phy-supply = <&vcc5v0_host>; - status = "okay"; -}; - -&u2phy3 { // for usb_host1_ehci and usb_host1_ohci - status = "okay"; -}; - -&u2phy3_host { // for usb_host1_ehci and usb_host1_ohci - phy-supply = <&vcc5v0_host>; - status = "okay"; -}; - -&usb_host0_ehci { - status = "okay"; -}; - -&usb_host0_ohci { - status = "okay"; -}; - -&usb_host1_ehci { - status = "okay"; -}; - -&usb_host1_ohci { - status = "okay"; -}; - -&vop { - status = "okay"; -}; - -&vop_mmu { - status = "okay"; -}; - -&vp0 { - vp0_out_hdmi0: endpoint@ROCKCHIP_VOP2_EP_HDMI0 { - reg = ; - remote-endpoint = <&hdmi0_in_vp0>; - }; -}; - -/* NOT for u-boot yet -&pd_npu { - domain-supply = <&vdd_npu_s0>; -}; - -&rknn_core_0 { - npu-supply = <&vdd_npu_s0>; - sram-supply = <&vdd_npu_s0>; - status = "okay"; -}; - -&rknn_core_1 { - npu-supply = <&vdd_npu_s0>; - sram-supply = <&vdd_npu_s0>; - status = "okay"; -}; - -&rknn_core_2 { - npu-supply = <&vdd_npu_s0>; - sram-supply = <&vdd_npu_s0>; - status = "okay"; -}; - -&rknn_mmu_0 { - status = "okay"; -}; - -&rknn_mmu_1 { - status = "okay"; -}; - -&rknn_mmu_2 { - status = "okay"; -}; -*/ diff --git a/patch/u-boot/v2026.04/0000.patching_config.yaml b/patch/u-boot/v2026.04/0000.patching_config.yaml new file mode 100644 index 000000000000..a184da9d71f1 --- /dev/null +++ b/patch/u-boot/v2026.04/0000.patching_config.yaml @@ -0,0 +1,5 @@ +config: + overlay-directories: + - { source: "defconfig", target: "configs" } # copies all files in defconfig dir to the configs/ dir in the u-boot source tree + - { source: "dt_upstream_rockchip", target: "dts/upstream/src/arm64/rockchip" } # copies all files in dt_upstream_rockchip dir to the dts/upstream/src/arm64/rockchip dir in the u-boot source tree + - { source: "dt_uboot", target: "arch/arm/dts" } # copies all files in dt_uboot dir to the arch/arm/dts dir in the u-boot source tree diff --git a/patch/u-boot/v2026.01/board_mekotronics-r58x-4g/1001-fdt_fixup_ethernet-add-logs.patch b/patch/u-boot/v2026.04/1001-fdt_fixup_ethernet-add-logs.patch similarity index 100% rename from patch/u-boot/v2026.01/board_mekotronics-r58x-4g/1001-fdt_fixup_ethernet-add-logs.patch rename to patch/u-boot/v2026.04/1001-fdt_fixup_ethernet-add-logs.patch diff --git a/patch/u-boot/v2026.04/cmd-fileenv-read-string-from-file-into-env.patch b/patch/u-boot/v2026.04/cmd-fileenv-read-string-from-file-into-env.patch new file mode 100644 index 000000000000..126fcf4e98fc --- /dev/null +++ b/patch/u-boot/v2026.04/cmd-fileenv-read-string-from-file-into-env.patch @@ -0,0 +1,99 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Ricardo Pardini +Date: Fri, 31 Jan 2025 15:52:03 +0100 +Subject: cmd: fileenv: read string from file into env + +- rpardini: adapted from vendor/legacy patch from 2018 + +Signed-off-by: Pascal Vizeli +Signed-off-by: Stefan Agner +Signed-off-by: Ricardo Pardini +--- + cmd/Kconfig | 5 + + cmd/Makefile | 1 + + cmd/fileenv.c | 46 ++++++++++ + 3 files changed, 52 insertions(+) + +diff --git a/cmd/Kconfig b/cmd/Kconfig +index 111111111111..222222222222 100644 +--- a/cmd/Kconfig ++++ b/cmd/Kconfig +@@ -1898,6 +1898,11 @@ config CMD_XXD + help + Print file as hexdump to standard output + ++config CMD_FILEENV ++ bool "fileenv" ++ help ++ Read a file into memory and store it to env. ++ + endmenu + + if NET || NET_LWIP +diff --git a/cmd/Makefile b/cmd/Makefile +index 111111111111..222222222222 100644 +--- a/cmd/Makefile ++++ b/cmd/Makefile +@@ -175,6 +175,7 @@ obj-$(CONFIG_CMD_SHA1SUM) += sha1sum.o + obj-$(CONFIG_CMD_SEAMA) += seama.o + obj-$(CONFIG_CMD_SETEXPR) += setexpr.o + obj-$(CONFIG_CMD_SETEXPR_FMT) += printf.o ++obj-$(CONFIG_CMD_FILEENV) += fileenv.o + obj-$(CONFIG_CMD_SPI) += spi.o + obj-$(CONFIG_CMD_STRINGS) += strings.o + obj-$(CONFIG_CMD_SMBIOS) += smbios.o +diff --git a/cmd/fileenv.c b/cmd/fileenv.c +new file mode 100644 +index 000000000000..111111111111 +--- /dev/null ++++ b/cmd/fileenv.c +@@ -0,0 +1,46 @@ ++#include ++#include ++#include ++#include ++#include ++#include "env.h" ++static char *fs_argv[5]; ++ ++int do_fileenv(struct cmd_tbl *cmdtp, int flag, int argc, char * const argv[]) ++{ ++ if (argc < 6) ++ return CMD_RET_USAGE; ++ ++ fs_argv[0] = "fatload"; ++ fs_argv[1] = argv[1]; ++ fs_argv[2] = argv[2]; ++ fs_argv[3] = argv[3]; ++ fs_argv[4] = argv[4]; ++ ++ if (do_fat_fsload(cmdtp, 0, 5, fs_argv) != 0) ++ return 1; ++ ++ char *addr = (char *)simple_strtoul(argv[3], NULL, 16); ++ size_t size = env_get_hex("filesize", 0); ++ ++ // Prepare string ++ addr[size] = 0x00; ++ char *s = addr; ++ while(*s != 0x00) { ++ if (isprint(*s)) { ++ s++; ++ } ++ else { ++ *s = 0x00; ++ } ++ } ++ ++ return env_set(argv[5], addr); ++} ++ ++U_BOOT_CMD( ++ fileenv, 6, 0, do_fileenv, ++ "Read file and store it into env.", ++ " \n" ++ " - Read file from fat32 and store it as env." ++); +-- +Armbian + diff --git a/patch/u-boot/v2026.01/defconfig/mekotronics-r58x-4g-rk3588_defconfig b/patch/u-boot/v2026.04/defconfig/mekotronics-r58x-4g-rk3588_defconfig similarity index 97% rename from patch/u-boot/v2026.01/defconfig/mekotronics-r58x-4g-rk3588_defconfig rename to patch/u-boot/v2026.04/defconfig/mekotronics-r58x-4g-rk3588_defconfig index 7f6d0971cc65..2012a1cb3b26 100644 --- a/patch/u-boot/v2026.01/defconfig/mekotronics-r58x-4g-rk3588_defconfig +++ b/patch/u-boot/v2026.04/defconfig/mekotronics-r58x-4g-rk3588_defconfig @@ -25,6 +25,7 @@ CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_SPL_MAX_SIZE=0x40000 # CONFIG_SPL_RAW_IMAGE_SUPPORT is not set CONFIG_SPL_ATF=y +CONFIG_CMD_TCPM=y CONFIG_CMD_GPIO=y CONFIG_CMD_GPT=y CONFIG_CMD_I2C=y @@ -82,6 +83,8 @@ CONFIG_USB_OHCI_GENERIC=y CONFIG_USB_DWC3=y CONFIG_USB_DWC3_GENERIC=y CONFIG_SPL_USB_DWC3_GENERIC=y +CONFIG_TYPEC_TCPM=y +CONFIG_TYPEC_FUSB302=y CONFIG_USB_HOST_ETHER=y CONFIG_USB_ETHER_ASIX=y CONFIG_USB_ETHER_ASIX88179=y diff --git a/patch/u-boot/v2026.04/dt_upstream_rockchip/rk3588-blueberry-edge-v12-linux.dts b/patch/u-boot/v2026.04/dt_upstream_rockchip/rk3588-blueberry-edge-v12-linux.dts new file mode 120000 index 000000000000..f30706e14f3e --- /dev/null +++ b/patch/u-boot/v2026.04/dt_upstream_rockchip/rk3588-blueberry-edge-v12-linux.dts @@ -0,0 +1 @@ +../../../kernel/archive/rockchip64-6.19/dt/rk3588-blueberry-edge-v12-linux.dts \ No newline at end of file