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/arm/boot/dts/rk3288-linux.dtsi | 56 ++++++++++++++++++++++++++++++--------------------------
1 files changed, 30 insertions(+), 26 deletions(-)
diff --git a/kernel/arch/arm/boot/dts/rk3288-linux.dtsi b/kernel/arch/arm/boot/dts/rk3288-linux.dtsi
index 4b760be..1ea066a 100644
--- a/kernel/arch/arm/boot/dts/rk3288-linux.dtsi
+++ b/kernel/arch/arm/boot/dts/rk3288-linux.dtsi
@@ -7,8 +7,15 @@
#include "rk3288-dram-default-timing.dtsi"
/ {
+ aliases {
+ mshc0 = &emmc;
+ mshc1 = &sdmmc;
+ mshc2 = &sdio0;
+ mshc3 = &sdio1;
+ };
+
chosen {
- bootargs = "earlycon=uart8250,mmio32,0xff690000 vmalloc=496M rw root=PARTUUID=614e0000-0000 rootfstype=ext4 rootwait";
+ bootargs = "earlycon=uart8250,mmio32,0xff690000 console=ttyFIQ0 vmalloc=496M rw root=PARTUUID=614e0000-0000 rootfstype=ext4 rootwait";
};
/delete-node/ dmc@ff610000;
@@ -74,12 +81,12 @@
};
reserved-memory {
- ramoops_mem: ramoops@00000000 {
+ ramoops_mem: ramoops@8000000 {
reg = <0x0 0x8000000 0x0 0xF0000>;
};
drm_logo: drm-logo@00000000 {
- compatible = "rockchip,drm-logo";
+ compatible = "rockchip,drm-logo";
reg = <0x0 0x0 0x0 0x0>;
};
};
@@ -89,16 +96,10 @@
interrupts = <GIC_SPI 155 IRQ_TYPE_LEVEL_HIGH>;
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>; /* If enable uart uses irq instead of fiq */
rockchip,baudrate = <115200>; /* Only 115200 and 1500000 */
pinctrl-names = "default";
pinctrl-0 = <&uart2_xfer>;
- };
-
- psci {
- compatible = "arm,psci-1.0";
- method = "smc";
};
/delete-node/ timer@ff810000;
@@ -158,22 +159,6 @@
};
};
-&cpu0 {
- enable-method = "psci";
-};
-
-&cpu1 {
- enable-method = "psci";
-};
-
-&cpu2 {
- enable-method = "psci";
-};
-
-&cpu3 {
- enable-method = "psci";
-};
-
&dmac_bus_s {
/* change to non-secure dmac */
reg = <0x0 0xff600000 0x0 0x4000>;
@@ -195,6 +180,25 @@
status = "okay";
};
+&iep {
+ status = "okay";
+};
+
+&iep_mmu {
+ status = "okay";
+};
+
+&rga {
+ compatible = "rockchip,rga2";
+ clocks = <&cru ACLK_RGA>, <&cru HCLK_RGA>, <&cru SCLK_RGA>;
+ clock-names = "aclk_rga", "hclk_rga", "clk_rga";
+ status = "okay";
+};
+
+&rng {
+ status = "okay";
+};
+
&uart2 {
status = "disabled";
};
--
Gitblit v1.6.2