Skip to content

Commit db6b924

Browse files
committed
Merge tag 'ti-k3-dt-fixes-for-v5.19' of git://git.kernel.org/pub/scm/linux/kernel/git/ti/linux into arm/fixes
Devicetree fixes for TI K3 platforms for v5.19 Critical fixes for the following: * Boot failure on J721s2 (overlap GIC memory map) * AM64 boot fails on highspeed cards (SoC characterization updates) * tag 'ti-k3-dt-fixes-for-v5.19' of git://git.kernel.org/pub/scm/linux/kernel/git/ti/linux: arm64: dts: ti: k3-am64-main: Remove support for HS400 speed mode arm64: dts: ti: k3-j721s2: Fix overlapping GICD memory region Link: https://lore.kernel.org/r/20220618031627.xxvscc22c6doaa3t@kahuna Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2 parents 2c629dd + 0c0af88 commit db6b924

File tree

2 files changed

+1
-3
lines changed

2 files changed

+1
-3
lines changed

arch/arm64/boot/dts/ti/k3-am64-main.dtsi

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -456,13 +456,11 @@
456456
clock-names = "clk_ahb", "clk_xin";
457457
mmc-ddr-1_8v;
458458
mmc-hs200-1_8v;
459-
mmc-hs400-1_8v;
460459
ti,trm-icp = <0x2>;
461460
ti,otap-del-sel-legacy = <0x0>;
462461
ti,otap-del-sel-mmc-hs = <0x0>;
463462
ti,otap-del-sel-ddr52 = <0x6>;
464463
ti,otap-del-sel-hs200 = <0x7>;
465-
ti,otap-del-sel-hs400 = <0x4>;
466464
};
467465

468466
sdhci1: mmc@fa00000 {

arch/arm64/boot/dts/ti/k3-j721s2-main.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
ranges;
3434
#interrupt-cells = <3>;
3535
interrupt-controller;
36-
reg = <0x00 0x01800000 0x00 0x200000>, /* GICD */
36+
reg = <0x00 0x01800000 0x00 0x100000>, /* GICD */
3737
<0x00 0x01900000 0x00 0x100000>, /* GICR */
3838
<0x00 0x6f000000 0x00 0x2000>, /* GICC */
3939
<0x00 0x6f010000 0x00 0x1000>, /* GICH */

0 commit comments

Comments
 (0)