Unverified Commit db6b9245 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'ti-k3-dt-fixes-for-v5.19' of... 

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: default avatarArnd Bergmann <arnd@arndb.de>
parents 2c629dd2 0c0af88f

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

+0 −2
Original line number Diff line number Diff line
@@ -456,13 +456,11 @@ 
		clock-names = "clk_ahb", "clk_xin";

		mmc-ddr-1_8v;

		mmc-hs200-1_8v;

		mmc-hs400-1_8v;

		ti,trm-icp = <0x2>;

		ti,otap-del-sel-legacy = <0x0>;

		ti,otap-del-sel-mmc-hs = <0x0>;

		ti,otap-del-sel-ddr52 = <0x6>;

		ti,otap-del-sel-hs200 = <0x7>;

		ti,otap-del-sel-hs400 = <0x4>;

	};



	sdhci1: mmc@fa00000 {

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

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ 
		ranges;

		#interrupt-cells = <3>;

		interrupt-controller;

		reg = <0x00 0x01800000 0x00 0x200000>, /* GICD */

		reg = <0x00 0x01800000 0x00 0x100000>, /* GICD */

		      <0x00 0x01900000 0x00 0x100000>, /* GICR */

		      <0x00 0x6f000000 0x00 0x2000>,   /* GICC */

		      <0x00 0x6f010000 0x00 0x1000>,   /* GICH */