Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

rockchip：add doornet2 lpddr4 4gb #9817

Merged
merged 3 commits into from
Jul 24, 2022
+169 −8
Merged

rockchip：add doornet2 lpddr4 4gb #9817

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
803d866
添加DN2 LPDDR4 4GB
hejiawencc Jul 22, 2022
c5cd0c4
添加DN2 LPDDR4 4GB
DHDAXCW Jul 22, 2022
6518944
rockchip: Complement missing configuration for other kernels
DHDAXCW Jul 22, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion package/boot/uboot-rockchip/Makefile
View file
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion target/linux/rockchip/files-5.18/arch/arm64/boot/dts/rockchip/rk3399-doornet2.dts
View file
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@
#include "rk3399-doornet2.dtsi"

/ {
model = "EmbedFire DoorNet2";
model = "EmbedFire DoorNet2 1GB";
compatible = "embedfire,doornet2", "rockchip,rk3399";

aliases {
113 changes: 113 additions & 0 deletions target/linux/rockchip/files/arch/arm64/boot/dts/rockchip/rk3399-doornet2-4gb.dts
View file
Original file line number Diff line number Diff line change
@@ -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 = <KEY_RESTART>;
};
};

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>;
};
12 changes: 11 additions & 1 deletion target/linux/rockchip/image/armv8.mk
View file
Original file line number Diff line number Diff line change
@@ -14,14 +14,24 @@ 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
DEVICE_PACKAGES := kmod-r8168 -urngd
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
2 changes: 1 addition & 1 deletion .../linux/rockchip/patches-5.10/205-rockchip-rk3399-Add-support-for-EmbedFire-DoorNet2.patch
View file
Original file line number Diff line number Diff line change
@@ -17,7 +17,7 @@
+#include "rk3399-doornet2.dtsi"
+
+/ {
+ model = "EmbedFire DoorNet2";
+ model = "EmbedFire DoorNet2 1GB";
+ compatible = "embedfire,doornet2", "rockchip,rk3399";
+
+ aliases {
12 changes: 12 additions & 0 deletions ...inux/rockchip/patches-5.10/801-char-add-support-for-rockchip-hardware-random-number.patch
View file
Original file line number Diff line number Diff line change
@@ -43,3 +43,15 @@ Signed-off-by: wevsty <[email protected]>
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

2 changes: 1 addition & 1 deletion .../linux/rockchip/patches-5.15/205-rockchip-rk3399-Add-support-for-EmbedFire-DoorNet2.patch
View file
Original file line number Diff line number Diff line change
@@ -17,7 +17,7 @@
+#include "rk3399-doornet2.dtsi"
+
+/ {
+ model = "EmbedFire DoorNet2";
+ model = "EmbedFire DoorNet2 1GB";
+ compatible = "embedfire,doornet2", "rockchip,rk3399";
+
+ aliases {
12 changes: 12 additions & 0 deletions target/linux/rockchip/patches-5.15/208-rockchip-rk3399-add-support-for-GuangMiao-G4C.patch
View file
Original file line number Diff line number Diff line change
@@ -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

5 changes: 3 additions & 2 deletions target/linux/rockchip/patches-5.18/900-arm-boot-add-dts-files.patch
View file
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion ...t/linux/rockchip/patches-5.4/205-rockchip-rk3399-Add-support-for-EmbedFire-DoorNet2.patch
View file
Original file line number Diff line number Diff line change
@@ -17,7 +17,7 @@
+#include "rk3399-doornet2.dtsi"
+
+/ {
+ model = "EmbedFire DoorNet2";
+ model = "EmbedFire DoorNet2 1GB";
+ compatible = "embedfire,doornet2", "rockchip,rk3399";
+
+ aliases {
12 changes: 12 additions & 0 deletions ...linux/rockchip/patches-5.4/801-char-add-support-for-rockchip-hardware-random-number.patch
View file
Original file line number Diff line number Diff line change
@@ -43,3 +43,15 @@ Signed-off-by: wevsty <[email protected]>
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