From eb3ebc4fc0812e5fa1ade20bd890b45781bb4fc7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AA=B7=E9=AB=85=E5=A4=B4?= <74764072+DHDAXCW@users.noreply.github.com> Date: Sun, 24 Jul 2022 15:43:55 +0800 Subject: [PATCH] =?UTF-8?q?rockchip=EF=BC=9Aadd=20doornet2=20lpddr4=204gb?= =?UTF-8?q?=20(#9817)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 添加DN2 LPDDR4 4GB * 添加DN2 LPDDR4 4GB * rockchip: Complement missing configuration for other kernels Co-authored-by: hejiawencc --- package/boot/uboot-rockchip/Makefile | 3 +- .../boot/dts/rockchip/rk3399-doornet2.dts | 2 +- .../boot/dts/rockchip/rk3399-doornet2-4gb.dts | 113 ++++++++++++++++++ target/linux/rockchip/image/armv8.mk | 12 +- ...9-Add-support-for-EmbedFire-DoorNet2.patch | 2 +- ...-for-rockchip-hardware-random-number.patch | 12 ++ ...9-Add-support-for-EmbedFire-DoorNet2.patch | 2 +- ...rk3399-add-support-for-GuangMiao-G4C.patch | 12 ++ .../900-arm-boot-add-dts-files.patch | 5 +- ...9-Add-support-for-EmbedFire-DoorNet2.patch | 2 +- ...-for-rockchip-hardware-random-number.patch | 12 ++ 11 files changed, 169 insertions(+), 8 deletions(-) create mode 100644 target/linux/rockchip/files/arch/arm64/boot/dts/rockchip/rk3399-doornet2-4gb.dts diff --git a/package/boot/uboot-rockchip/Makefile b/package/boot/uboot-rockchip/Makefile index 7b1686bed5ee6f..487fc56736e31a 100644 --- a/package/boot/uboot-rockchip/Makefile +++ b/package/boot/uboot-rockchip/Makefile @@ -97,7 +97,8 @@ define U-Boot/guangmiao-g4c-rk3399 BUILD_SUBTARGET:=armv8 NAME:=GuangMiao G4C BUILD_DEVICES:= \ - sharevdi_guangmiao-g4c + sharevdi_guangmiao-g4c \ + embedfire_doornet2-4gb DEPENDS:=+PACKAGE_u-boot-guangmiao-g4c-rk3399:arm-trusted-firmware-rockchip PKG_BUILD_DEPENDS:=arm-trusted-firmware-rockchip ATF:=rk3399_bl31.elf diff --git a/target/linux/rockchip/files-5.18/arch/arm64/boot/dts/rockchip/rk3399-doornet2.dts b/target/linux/rockchip/files-5.18/arch/arm64/boot/dts/rockchip/rk3399-doornet2.dts index e75d922ceb879f..7b9d5efafaac94 100644 --- a/target/linux/rockchip/files-5.18/arch/arm64/boot/dts/rockchip/rk3399-doornet2.dts +++ b/target/linux/rockchip/files-5.18/arch/arm64/boot/dts/rockchip/rk3399-doornet2.dts @@ -4,7 +4,7 @@ #include "rk3399-doornet2.dtsi" / { - model = "EmbedFire DoorNet2"; + model = "EmbedFire DoorNet2 1GB"; compatible = "embedfire,doornet2", "rockchip,rk3399"; aliases { diff --git a/target/linux/rockchip/files/arch/arm64/boot/dts/rockchip/rk3399-doornet2-4gb.dts b/target/linux/rockchip/files/arch/arm64/boot/dts/rockchip/rk3399-doornet2-4gb.dts new file mode 100644 index 00000000000000..dbbe3758cdbbce --- /dev/null +++ b/target/linux/rockchip/files/arch/arm64/boot/dts/rockchip/rk3399-doornet2-4gb.dts @@ -0,0 +1,113 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) + +/dts-v1/; +#include "rk3399-doornet2.dtsi" + +/ { + model = "EmbedFire DoorNet2-4GB"; + compatible = "embedfire,doornet2", "rockchip,rk3399"; + + aliases { + led-boot = &sys_led; + led-failsafe = &sys_led; + led-running = &sys_led; + led-upgrade = &sys_led; + }; + + /delete-node/ display-subsystem; + + gpio-leds { + pinctrl-0 = <&lan_led_pin>, <&sys_led_pin>, <&wan_led_pin>; + + /delete-node/ status; + + lan_led: led-lan { + gpios = <&gpio1 RK_PA1 GPIO_ACTIVE_HIGH>; + label = "green:lan"; + }; + + sys_led: led-sys { + gpios = <&gpio0 RK_PB5 GPIO_ACTIVE_HIGH>; + label = "red:sys"; + default-state = "on"; + }; + + wan_led: led-wan { + gpios = <&gpio1 RK_PA0 GPIO_ACTIVE_HIGH>; + label = "green:wan"; + }; + }; + + gpio-keys { + pinctrl-0 = <&reset_button_pin>; + + /delete-node/ power; + + reset { + debounce-interval = <50>; + gpios = <&gpio1 RK_PC6 GPIO_ACTIVE_LOW>; + label = "reset"; + linux,code = ; + }; + }; + + vdd_5v: vdd-5v { + compatible = "regulator-fixed"; + regulator-name = "vdd_5v"; + regulator-always-on; + regulator-boot-on; + }; +}; + +&pcie0 { + max-link-speed = <1>; + num-lanes = <1>; + vpcie3v3-supply = <&vcc3v3_sys>; + + pcie@0 { + reg = <0x00000000 0 0 0 0>; + #address-cells = <3>; + #size-cells = <2>; + + pcie-eth@0,0 { + compatible = "realtek,r8168"; + reg = <0x000000 0 0 0 0>; + + realtek,led-data = <0x870>; + }; + }; +}; + +&pinctrl { + gpio-leds { + /delete-node/ leds-gpio; + + lan_led_pin: lan-led-pin { + rockchip,pins = <1 RK_PA1 RK_FUNC_GPIO &pcfg_pull_none>; + }; + + sys_led_pin: sys-led-pin { + rockchip,pins = <0 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>; + }; + + wan_led_pin: wan-led-pin { + rockchip,pins = <1 RK_PA0 RK_FUNC_GPIO &pcfg_pull_none>; + }; + }; + + rockchip-key { + /delete-node/ power-key; + + reset_button_pin: reset-button-pin { + rockchip,pins = <1 RK_PC6 RK_FUNC_GPIO &pcfg_pull_up>; + }; + }; +}; + +&u2phy0_host { + phy-supply = <&vdd_5v>; +}; + +&vcc3v3_sys { + vin-supply = <&vcc5v0_sys>; +}; diff --git a/target/linux/rockchip/image/armv8.mk b/target/linux/rockchip/image/armv8.mk index 298242c35952b8..62275f29b05823 100644 --- a/target/linux/rockchip/image/armv8.mk +++ b/target/linux/rockchip/image/armv8.mk @@ -14,7 +14,7 @@ TARGET_DEVICES += embedfire_doornet1 define Device/embedfire_doornet2 DEVICE_VENDOR := EmbedFire - DEVICE_MODEL := DoorNet2 + DEVICE_MODEL := DoorNet2 1GB SOC := rk3399 UBOOT_DEVICE_NAME := doornet2-rk3399 IMAGE/sysupgrade.img.gz := boot-common | boot-script nanopi-r4s | pine64-bin | gzip | append-metadata @@ -22,6 +22,16 @@ define Device/embedfire_doornet2 endef TARGET_DEVICES += embedfire_doornet2 +define Device/embedfire_doornet2-4gb + DEVICE_VENDOR := EmbedFire + DEVICE_MODEL := DoorNet2 4GB + SOC := rk3399 + UBOOT_DEVICE_NAME := guangmiao-g4c-rk3399 + IMAGE/sysupgrade.img.gz := boot-common | boot-script nanopi-r4s | pine64-img | gzip | append-metadata + DEVICE_PACKAGES := kmod-r8168 -urngd +endef +TARGET_DEVICES += embedfire_doornet2-4gb + define Device/friendlyarm_nanopi-neo3 DEVICE_VENDOR := FriendlyARM DEVICE_MODEL := NanoPi NEO3 diff --git a/target/linux/rockchip/patches-5.10/205-rockchip-rk3399-Add-support-for-EmbedFire-DoorNet2.patch b/target/linux/rockchip/patches-5.10/205-rockchip-rk3399-Add-support-for-EmbedFire-DoorNet2.patch index 65a38702c49605..e1ec3a4bfc68ba 100644 --- a/target/linux/rockchip/patches-5.10/205-rockchip-rk3399-Add-support-for-EmbedFire-DoorNet2.patch +++ b/target/linux/rockchip/patches-5.10/205-rockchip-rk3399-Add-support-for-EmbedFire-DoorNet2.patch @@ -17,7 +17,7 @@ +#include "rk3399-doornet2.dtsi" + +/ { -+ model = "EmbedFire DoorNet2"; ++ model = "EmbedFire DoorNet2 1GB"; + compatible = "embedfire,doornet2", "rockchip,rk3399"; + + aliases { diff --git a/target/linux/rockchip/patches-5.10/801-char-add-support-for-rockchip-hardware-random-number.patch b/target/linux/rockchip/patches-5.10/801-char-add-support-for-rockchip-hardware-random-number.patch index 16ca6279e71a6f..8045c95521923c 100644 --- a/target/linux/rockchip/patches-5.10/801-char-add-support-for-rockchip-hardware-random-number.patch +++ b/target/linux/rockchip/patches-5.10/801-char-add-support-for-rockchip-hardware-random-number.patch @@ -43,3 +43,15 @@ Signed-off-by: wevsty obj-$(CONFIG_HW_RANDOM_PIC32) += pic32-rng.o obj-$(CONFIG_HW_RANDOM_MESON) += meson-rng.o obj-$(CONFIG_HW_RANDOM_CAVIUM) += cavium-rng.o cavium-rng-vf.o + +--- a/arch/arm64/boot/dts/rockchip/Makefile ++++ b/arch/arm64/boot/dts/rockchip/Makefile +@@ -22,6 +22,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3368-orion-r68-meta.dtb + dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3368-px5-evb.dtb + dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3368-r88.dtb + dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-doornet2.dtb ++dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-doornet2-4gb.dtb + dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-evb.dtb + dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-ficus.dtb + dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-firefly.dtb + \ No newline at end of file diff --git a/target/linux/rockchip/patches-5.15/205-rockchip-rk3399-Add-support-for-EmbedFire-DoorNet2.patch b/target/linux/rockchip/patches-5.15/205-rockchip-rk3399-Add-support-for-EmbedFire-DoorNet2.patch index 01caa6e8b5e8f5..f58978ba9ae3d2 100644 --- a/target/linux/rockchip/patches-5.15/205-rockchip-rk3399-Add-support-for-EmbedFire-DoorNet2.patch +++ b/target/linux/rockchip/patches-5.15/205-rockchip-rk3399-Add-support-for-EmbedFire-DoorNet2.patch @@ -17,7 +17,7 @@ +#include "rk3399-doornet2.dtsi" + +/ { -+ model = "EmbedFire DoorNet2"; ++ model = "EmbedFire DoorNet2 1GB"; + compatible = "embedfire,doornet2", "rockchip,rk3399"; + + aliases { diff --git a/target/linux/rockchip/patches-5.15/208-rockchip-rk3399-add-support-for-GuangMiao-G4C.patch b/target/linux/rockchip/patches-5.15/208-rockchip-rk3399-add-support-for-GuangMiao-G4C.patch index a0160f927ae324..557a500ac4af24 100644 --- a/target/linux/rockchip/patches-5.15/208-rockchip-rk3399-add-support-for-GuangMiao-G4C.patch +++ b/target/linux/rockchip/patches-5.15/208-rockchip-rk3399-add-support-for-GuangMiao-G4C.patch @@ -8,3 +8,15 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-hugsun-x99.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-khadas-edge.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-khadas-edge-captain.dtb + +--- a/arch/arm64/boot/dts/rockchip/Makefile ++++ b/arch/arm64/boot/dts/rockchip/Makefile +@@ -26,6 +26,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3368-orion-r68-meta.dtb + dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3368-px5-evb.dtb + dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3368-r88.dtb + dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-doornet2.dtb ++dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-doornet2-4gb.dtb + dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-evb.dtb + dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-ficus.dtb + dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-firefly.dtb + \ No newline at end of file diff --git a/target/linux/rockchip/patches-5.18/900-arm-boot-add-dts-files.patch b/target/linux/rockchip/patches-5.18/900-arm-boot-add-dts-files.patch index fcda50c762fe92..eb2b744dca05b3 100644 --- a/target/linux/rockchip/patches-5.18/900-arm-boot-add-dts-files.patch +++ b/target/linux/rockchip/patches-5.18/900-arm-boot-add-dts-files.patch @@ -13,15 +13,16 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-rock64.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-rock-pi-e.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-roc-cc.dtb -@@ -22,6 +26,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3368-or +@@ -22,6 +26,8 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3368-or dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3368-px5-evb.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3368-r88.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-evb.dtb +dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-doornet2.dtb ++dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-doornet2-4gb.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-ficus.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-firefly.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-gru-bob.dtb -@@ -40,6 +45,9 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-na +@@ -40,6 +46,9 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-na dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-nanopi-m4b.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-nanopi-neo4.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-nanopi-r4s.dtb diff --git a/target/linux/rockchip/patches-5.4/205-rockchip-rk3399-Add-support-for-EmbedFire-DoorNet2.patch b/target/linux/rockchip/patches-5.4/205-rockchip-rk3399-Add-support-for-EmbedFire-DoorNet2.patch index da48acc16ac8fc..7d09896fb3a63c 100644 --- a/target/linux/rockchip/patches-5.4/205-rockchip-rk3399-Add-support-for-EmbedFire-DoorNet2.patch +++ b/target/linux/rockchip/patches-5.4/205-rockchip-rk3399-Add-support-for-EmbedFire-DoorNet2.patch @@ -17,7 +17,7 @@ +#include "rk3399-doornet2.dtsi" + +/ { -+ model = "EmbedFire DoorNet2"; ++ model = "EmbedFire DoorNet2 1GB"; + compatible = "embedfire,doornet2", "rockchip,rk3399"; + + aliases { diff --git a/target/linux/rockchip/patches-5.4/801-char-add-support-for-rockchip-hardware-random-number.patch b/target/linux/rockchip/patches-5.4/801-char-add-support-for-rockchip-hardware-random-number.patch index 85f14e61b34b0d..7f2b167b5068f6 100644 --- a/target/linux/rockchip/patches-5.4/801-char-add-support-for-rockchip-hardware-random-number.patch +++ b/target/linux/rockchip/patches-5.4/801-char-add-support-for-rockchip-hardware-random-number.patch @@ -43,3 +43,15 @@ Signed-off-by: wevsty obj-$(CONFIG_HW_RANDOM_PIC32) += pic32-rng.o obj-$(CONFIG_HW_RANDOM_MESON) += meson-rng.o obj-$(CONFIG_HW_RANDOM_CAVIUM) += cavium-rng.o cavium-rng-vf.o + +--- a/arch/arm64/boot/dts/rockchip/Makefile ++++ b/arch/arm64/boot/dts/rockchip/Makefile +@@ -17,6 +17,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3368-orion-r68-meta.dtb + dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3368-px5-evb.dtb + dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3368-r88.dtb + dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-doornet2.dtb ++dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-doornet2-4gb.dtb + dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-evb.dtb + dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-ficus.dtb + dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-firefly.dtb + \ No newline at end of file