From a36159eec6ca17402b0e146b86efaf76568dc353 Mon Sep 17 00:00:00 2001
From: hc <hc@nodka.com>
Date: Fri, 20 Sep 2024 01:41:23 +0000
Subject: [PATCH] 重命名 AX88772C_eeprom/asix.c 为 asix_mac.c
---
kernel/arch/arm64/boot/dts/rockchip/px30-android.dtsi | 29 ++++++++++++++++++++++++++---
1 files changed, 26 insertions(+), 3 deletions(-)
diff --git a/kernel/arch/arm64/boot/dts/rockchip/px30-android.dtsi b/kernel/arch/arm64/boot/dts/rockchip/px30-android.dtsi
index aecb634..017a170 100644
--- a/kernel/arch/arm64/boot/dts/rockchip/px30-android.dtsi
+++ b/kernel/arch/arm64/boot/dts/rockchip/px30-android.dtsi
@@ -6,7 +6,15 @@
/ {
chosen: chosen {
- bootargs = "earlycon=uart8250,mmio32,0xff160000 console=ttyFIQ0 androidboot.baseband=N/A androidboot.veritymode=enforcing androidboot.hardware=rk30board androidboot.console=ttyFIQ0 init=/init kpti=0";
+ bootargs = "earlycon=uart8250,mmio32,0xff160000 console=ttyFIQ0 init=/init kpti=0";
+ };
+
+ debug: debug@ff690000 {
+ compatible = "rockchip,debug";
+ reg = <0x0 0xff690000 0x0 0x1000>,
+ <0x0 0xff692000 0x0 0x1000>,
+ <0x0 0xff694000 0x0 0x1000>,
+ <0x0 0xff696000 0x0 0x1000>;
};
fiq-debugger {
@@ -14,7 +22,7 @@
rockchip,serial-id = <2>;
rockchip,wake-irq = <0>;
/* If enable uart uses irq instead of fiq */
- rockchip,irq-mode-enable = <0>;
+ rockchip,irq-mode-enable = <1>;
rockchip,baudrate = <1500000>; /* Only 115200 and 1500000 */
interrupts = <GIC_SPI 127 IRQ_TYPE_LEVEL_LOW>;
pinctrl-names = "default";
@@ -24,6 +32,11 @@
firmware {
firmware_android: android {};
+
+ optee: optee {
+ compatible = "linaro,optee-tz";
+ method = "smc";
+ };
};
reserved-memory {
@@ -44,6 +57,17 @@
ftrace-size = <0x00000>;
pmsg-size = <0x50000>;
};
+
+ vendor_storage_rm: vendor-storage-rm@00000000 {
+ compatible = "rockchip,vendor-storage-rm";
+ reg = <0x0 0x0 0x0 0x0>;
+ };
+ };
+
+ vendor_storage: vendor-storage {
+ compatible = "rockchip,ram-vendor-storage";
+ memory-region = <&vendor_storage_rm>;
+ status = "okay";
};
};
@@ -53,7 +77,6 @@
&display_subsystem {
status = "disabled";
- ports = <&vopb_out>, <&vopl_out>;
logo-memory-region = <&drm_logo>;
route {
--
Gitblit v1.6.2