shinys000114/kernel_common_drivers
1
0
Fork 0
mirror of https://github.com/hardkernel/kernel_common_drivers.git synced 2026-06-25 12:03:48 +09:00
Code Issues Packages Projects Releases Wiki Activity

dts: fix reg conflict between iotrace and defendkey [1/1]

Browse Source 
PD#SWPL-157900

Problem:
there is conflict between iotrace and defendkey

Solution:
fix reg conflict

Verify:
t5w

Change-Id: I8c4acb8eb237b82eacad2897c4285b85bd159d3e
Signed-off-by: Jian Hu <jian.hu@amlogic.com>
This commit is contained in:
Jian Hu
2024-02-20 06:56:55 +00:00
committed by gerrit autosubmit
parent ed7763a2a3
commit e9dbb93ec8
8 changed files with 9 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
arch/arm/boot/dts/amlogic/t5w_t962d4_at301.dts
+1 -4
View File
@@ -68,10 +68,7 @@
defendkey_reserved:linux,defendkey {
compatible = "amlogic, defendkey";
reusable;
size = <0x100000>;
alignment = <0x100000>;
alloc-ranges = <0x04F00000 0x100000>;
reg = <0x04e00000 0x100000>;
};
secmon_reserved: linux,secmon {
arch/arm/boot/dts/amlogic/t5w_t962d4_at301_1.5g.dts
+1 -4
View File
@@ -68,10 +68,7 @@
defendkey_reserved:linux,defendkey {
compatible = "amlogic, defendkey";
reusable;
size = <0x100000>;
alignment = <0x100000>;
alloc-ranges = <0x04F00000 0x100000>;
reg = <0x04e00000 0x100000>;
};
secmon_reserved: linux,secmon {
arch/arm/boot/dts/amlogic/t5w_t962d4_at301_1.5g_R.dts
+1 -4
View File
@@ -68,10 +68,7 @@
defendkey_reserved:linux,defendkey {
compatible = "amlogic, defendkey";
reusable;
size = <0x100000>;
alignment = <0x100000>;
alloc-ranges = <0x04F00000 0x100000>;
reg = <0x04e00000 0x100000>;
};
secmon_reserved: linux,secmon {
arch/arm/boot/dts/amlogic/t5w_t962d4_at301_1g.dts
+1 -4
View File
@@ -68,10 +68,7 @@
defendkey_reserved:linux,defendkey {
compatible = "amlogic, defendkey";
reusable;
size = <0x100000>;
alignment = <0x100000>;
alloc-ranges = <0x04F00000 0x100000>;
reg = <0x04e00000 0x100000>;
};
secmon_reserved: linux,secmon {
arch/arm/boot/dts/amlogic/t5w_t962d4_at301_1g_R.dts
+1 -4
View File
@@ -68,10 +68,7 @@
defendkey_reserved:linux,defendkey {
compatible = "amlogic, defendkey";
reusable;
size = <0x100000>;
alignment = <0x100000>;
alloc-ranges = <0x04F00000 0x100000>;
reg = <0x04e00000 0x100000>;
};
secmon_reserved: linux,secmon {
arch/arm/boot/dts/amlogic/t5w_t962d4_at301_R.dts
+1 -4
View File
@@ -68,10 +68,7 @@
defendkey_reserved:linux,defendkey {
compatible = "amlogic, defendkey";
reusable;
size = <0x100000>;
alignment = <0x100000>;
alloc-ranges = <0x04F00000 0x100000>;
reg = <0x04e00000 0x100000>;
};
secmon_reserved: linux,secmon {
arch/arm/boot/dts/amlogic/t5w_t962d4_at301_linux.dts
+1 -4
View File
@@ -69,10 +69,7 @@
defendkey_reserved:linux,defendkey {
compatible = "amlogic, defendkey";
reusable;
size = <0x100000>;
alignment = <0x100000>;
alloc-ranges = <0x04F00000 0x100000>;
reg = <0x04e00000 0x100000>;
};
secmon_reserved: linux,secmon {
arch/arm64/boot/dts/amlogic/t5w_t962d4_at301_linux.dts
+2 -5
View File
@@ -64,7 +64,7 @@
debug_reserved:linux,iotrace {
compatible = "amlogic, iotrace";
reg = <0x0 0x0ff00000 0x0 0x00100000>;
reg = <0x0 0x04f00000 0x0 0x00100000>;
io-size = <0x1b000>;
sched-size = <0x2000>;
irq-size = <0x1000>;
@@ -74,10 +74,7 @@
defendkey_reserved:linux,defendkey {
compatible = "amlogic, defendkey";
reusable;
size = <0x0 0x100000>;
alignment = <0x0 0x100000>;
alloc-ranges = <0x0 0x04F00000 0x0 0x100000>;
reg = <0x0 0x04e00000 0x0 0x100000>;
};
secmon_reserved:linux,secmon {