diff --git a/config/boards/panther-x2.csc b/config/boards/panther-x2.csc index 162eea6d3a..d14f3f56de 100644 --- a/config/boards/panther-x2.csc +++ b/config/boards/panther-x2.csc @@ -12,3 +12,13 @@ BOOT_FDT_FILE="rockchip/rk3566-panther-x2.dtb" IMAGE_PARTITION_TABLE="gpt" BOOT_SCENARIO="spl-blobs" BOOTFS_TYPE="fat" + +function post_family_config__use_radxa_rock3_uboot() { + display_alert "Overriding U-Boot source" "Using Radxa stable-4.19-rock3" "info" + + BOOTSOURCE="https://github.com/radxa/u-boot.git" + BOOTBRANCH="branch:stable-4.19-rock3" + BOOTPATCHDIR="none" + BOOTPATCHES="none" + SKIP_BOOTSPLASH_PATCHES="yes" +} diff --git a/patch/kernel/archive/rockchip64-6.18/dt/rk3566-panther-x2.dts b/patch/kernel/archive/rockchip64-6.18/dt/rk3566-panther-x2.dts index dc9f914a9b..f828fa0382 100644 --- a/patch/kernel/archive/rockchip64-6.18/dt/rk3566-panther-x2.dts +++ b/patch/kernel/archive/rockchip64-6.18/dt/rk3566-panther-x2.dts @@ -1,6 +1,7 @@ // SPDX-License-Identifier: (GPL-2.0+ OR MIT) /* * Copyright (c) 2023 tdleiyao + * WiFi, I2C, and SPI additions */ /dts-v1/; @@ -408,6 +409,27 @@ }; }; +/* I2C2 - General purpose I2C */ +&i2c2 { + status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&i2c2m1_xfer>; +}; + +/* I2C3 - General purpose I2C */ +&i2c3 { + status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&i2c3m0_xfer>; +}; + +/* I2C4 - General purpose I2C */ +&i2c4 { + status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&i2c4m0_xfer>; +}; + &i2s1_8ch { pinctrl-names = "default"; pinctrl-0 = <&i2s1m1_sclktx &i2s1m1_sclkrx @@ -419,6 +441,19 @@ status = "disabled"; }; +/* SPI0 - with spidev for userspace access */ +&spi0 { + status = "okay"; + #address-cells = <1>; + #size-cells = <0>; + + spidev@0 { + compatible = "armbian,spi-dev"; + reg = <0>; + spi-max-frequency = <10000000>; + }; +}; + &pinctrl { sdio-pwrseq { wifi_enable_h: wifi-enable-h { @@ -521,6 +556,8 @@ pinctrl-0 = <&sdmmc1_bus4 &sdmmc1_cmd &sdmmc1_clk>; non-removable; mmc-pwrseq = <&sdio_pwrseq>; + vmmc-supply = <&vcc3v3_sys>; + vqmmc-supply = <&vcc_1v8>; status = "okay"; };