From 9f7f9c53b3235b20abb0cf1a13f558a7b83b14a3 Mon Sep 17 00:00:00 2001 From: Sascha Hauer Date: Mon, 3 May 2021 14:34:23 +0200 Subject: dts: update to v5.12 Signed-off-by: Sascha Hauer --- dts/src/arm64/allwinner/sun50i-a64-pine64-lts.dts | 2 +- dts/src/arm64/nvidia/tegra186-p2771-0000.dts | 2 +- dts/src/arm64/nvidia/tegra186-p3310.dtsi | 2 +- dts/src/arm64/nvidia/tegra186.dtsi | 2 +- dts/src/arm64/nvidia/tegra194-p2972-0000.dts | 3 ++- dts/src/arm64/nvidia/tegra194-p3668-0000.dtsi | 4 ++++ dts/src/arm64/nvidia/tegra194-p3668-0001.dtsi | 4 ++++ dts/src/arm64/nvidia/tegra194-p3668.dtsi | 1 - 8 files changed, 14 insertions(+), 6 deletions(-) (limited to 'dts/src') diff --git a/dts/src/arm64/allwinner/sun50i-a64-pine64-lts.dts b/dts/src/arm64/allwinner/sun50i-a64-pine64-lts.dts index e79ce49e7e..596a259074 100644 --- a/dts/src/arm64/allwinner/sun50i-a64-pine64-lts.dts +++ b/dts/src/arm64/allwinner/sun50i-a64-pine64-lts.dts @@ -21,5 +21,5 @@ }; &mmc0 { - cd-gpios = <&pio 5 6 GPIO_ACTIVE_LOW>; /* PF6 push-push switch */ + broken-cd; /* card detect is broken on *some* boards */ }; diff --git a/dts/src/arm64/nvidia/tegra186-p2771-0000.dts b/dts/src/arm64/nvidia/tegra186-p2771-0000.dts index 9f5f5e1fa8..683743f818 100644 --- a/dts/src/arm64/nvidia/tegra186-p2771-0000.dts +++ b/dts/src/arm64/nvidia/tegra186-p2771-0000.dts @@ -10,7 +10,7 @@ model = "NVIDIA Jetson TX2 Developer Kit"; compatible = "nvidia,p2771-0000", "nvidia,tegra186"; - aconnect { + aconnect@2900000 { status = "okay"; dma-controller@2930000 { diff --git a/dts/src/arm64/nvidia/tegra186-p3310.dtsi b/dts/src/arm64/nvidia/tegra186-p3310.dtsi index fd91774477..fcd71bfc67 100644 --- a/dts/src/arm64/nvidia/tegra186-p3310.dtsi +++ b/dts/src/arm64/nvidia/tegra186-p3310.dtsi @@ -23,7 +23,7 @@ }; chosen { - bootargs = "earlycon console=ttyS0,115200n8"; + bootargs = "earlycon console=ttyS0,115200n8 fw_devlink=on"; stdout-path = "serial0:115200n8"; }; diff --git a/dts/src/arm64/nvidia/tegra186.dtsi b/dts/src/arm64/nvidia/tegra186.dtsi index 02b26b39ce..9f75bbf00c 100644 --- a/dts/src/arm64/nvidia/tegra186.dtsi +++ b/dts/src/arm64/nvidia/tegra186.dtsi @@ -73,7 +73,7 @@ snps,rxpbl = <8>; }; - aconnect { + aconnect@2900000 { compatible = "nvidia,tegra186-aconnect", "nvidia,tegra210-aconnect"; clocks = <&bpmp TEGRA186_CLK_APE>, diff --git a/dts/src/arm64/nvidia/tegra194-p2972-0000.dts b/dts/src/arm64/nvidia/tegra194-p2972-0000.dts index 2888efc42b..d618f197a1 100644 --- a/dts/src/arm64/nvidia/tegra194-p2972-0000.dts +++ b/dts/src/arm64/nvidia/tegra194-p2972-0000.dts @@ -651,6 +651,8 @@ reg = <0x1a>; interrupt-parent = <&gpio>; interrupts = ; + clocks = <&bpmp TEGRA194_CLK_AUD_MCLK>; + clock-names = "mclk"; realtek,jd-src = <2>; sound-name-prefix = "CVB-RT"; @@ -658,7 +660,6 @@ rt5658_ep: endpoint { remote-endpoint = <&i2s1_dap_ep>; mclk-fs = <256>; - clocks = <&bpmp TEGRA194_CLK_AUD_MCLK>; }; }; }; diff --git a/dts/src/arm64/nvidia/tegra194-p3668-0000.dtsi b/dts/src/arm64/nvidia/tegra194-p3668-0000.dtsi index 7da3d48cb4..14da4206ea 100644 --- a/dts/src/arm64/nvidia/tegra194-p3668-0000.dtsi +++ b/dts/src/arm64/nvidia/tegra194-p3668-0000.dtsi @@ -5,6 +5,10 @@ model = "NVIDIA Jetson Xavier NX (SD-card)"; compatible = "nvidia,p3668-0000", "nvidia,tegra194"; + aliases { + mmc0 = "/bus@0/mmc@3400000"; + }; + bus@0 { /* SDMMC1 (SD/MMC) */ mmc@3400000 { diff --git a/dts/src/arm64/nvidia/tegra194-p3668-0001.dtsi b/dts/src/arm64/nvidia/tegra194-p3668-0001.dtsi index b7808648cf..f5a9ebbfb1 100644 --- a/dts/src/arm64/nvidia/tegra194-p3668-0001.dtsi +++ b/dts/src/arm64/nvidia/tegra194-p3668-0001.dtsi @@ -5,6 +5,10 @@ model = "NVIDIA Jetson Xavier NX (eMMC)"; compatible = "nvidia,p3668-0001", "nvidia,tegra194"; + aliases { + mmc0 = "/bus@0/mmc@3460000"; + }; + bus@0 { /* SDMMC4 (eMMC) */ mmc@3460000 { diff --git a/dts/src/arm64/nvidia/tegra194-p3668.dtsi b/dts/src/arm64/nvidia/tegra194-p3668.dtsi index 4f12721c33..f16b0aa8a3 100644 --- a/dts/src/arm64/nvidia/tegra194-p3668.dtsi +++ b/dts/src/arm64/nvidia/tegra194-p3668.dtsi @@ -14,7 +14,6 @@ i2c5 = "/bus@0/i2c@31c0000"; i2c6 = "/bus@0/i2c@c250000"; i2c7 = "/bus@0/i2c@31e0000"; - mmc0 = "/bus@0/mmc@3460000"; rtc0 = "/bpmp/i2c/pmic@3c"; rtc1 = "/bus@0/rtc@c2a0000"; serial0 = &tcu; -- cgit v1.2.3