Commit 6d1d45cb authored Apr 23, 2021 by Linus Torvalds

Merge tag 'arm-fixes-5.12-4' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc

Pull ARM SoC fixes from Arnd Bergmann:
 "These should be the final fixes for v5.12.

  There is one fix for SD card detection on one Allwinner board, and a
  few fixes for the Tegra platform that I had already queued up for
  v5.13 due to a communication problem. This addresses MMC device
  ordering on multiple machines, audio support on Jetson AGX Xavier and
  suspend/resume on Jetson TX2"

* tag 'arm-fixes-5.12-4' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc:
  arm64: dts: allwinner: Revert SD card CD GPIO for Pine64-LTS
  arm64: tegra: Move clocks from RT5658 endpoint to device node
  arm64: tegra: Fix mmc0 alias for Jetson Xavier NX
  arm64: tegra: Set fw_devlink=on for Jetson TX2
  arm64: tegra: Add unit-address for ACONNECT on Tegra186

parents 5bfc75d9 a1768dad

arch/arm64/boot/dts/allwinner/sun50i-a64-pine64-lts.dts

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -21,5 +21,5 @@
	};		};

	&mmc0 {		&mmc0 {
	cd-gpios = <&pio 5 6 GPIO_ACTIVE_LOW>; /* PF6 push-push switch */		broken-cd; /* card detect is broken on some boards */
	};		};

arch/arm64/boot/dts/nvidia/tegra186-p2771-0000.dts

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -10,7 +10,7 @@
	model = "NVIDIA Jetson TX2 Developer Kit";		model = "NVIDIA Jetson TX2 Developer Kit";
	compatible = "nvidia,p2771-0000", "nvidia,tegra186";		compatible = "nvidia,p2771-0000", "nvidia,tegra186";

	aconnect {		aconnect@2900000 {
	status = "okay";		status = "okay";

	dma-controller@2930000 {		dma-controller@2930000 {

arch/arm64/boot/dts/nvidia/tegra186-p3310.dtsi

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -23,7 +23,7 @@
	};		};

	chosen {		chosen {
	bootargs = "earlycon console=ttyS0,115200n8";		bootargs = "earlycon console=ttyS0,115200n8 fw_devlink=on";
	stdout-path = "serial0:115200n8";		stdout-path = "serial0:115200n8";
	};		};

arch/arm64/boot/dts/nvidia/tegra186.dtsi

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -73,7 +73,7 @@
	snps,rxpbl = <8>;		snps,rxpbl = <8>;
	};		};

	aconnect {		aconnect@2900000 {
	compatible = "nvidia,tegra186-aconnect",		compatible = "nvidia,tegra186-aconnect",
	"nvidia,tegra210-aconnect";		"nvidia,tegra210-aconnect";
	clocks = <&bpmp TEGRA186_CLK_APE>,		clocks = <&bpmp TEGRA186_CLK_APE>,

arch/arm64/boot/dts/nvidia/tegra194-p2972-0000.dts

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -651,6 +651,8 @@
	reg = <0x1a>;		reg = <0x1a>;
	interrupt-parent = <&gpio>;		interrupt-parent = <&gpio>;
	interrupts = <TEGRA194_MAIN_GPIO(S, 5) GPIO_ACTIVE_HIGH>;		interrupts = <TEGRA194_MAIN_GPIO(S, 5) GPIO_ACTIVE_HIGH>;
			clocks = <&bpmp TEGRA194_CLK_AUD_MCLK>;
			clock-names = "mclk";
	realtek,jd-src = <2>;		realtek,jd-src = <2>;
	sound-name-prefix = "CVB-RT";		sound-name-prefix = "CVB-RT";

	@@ -658,7 +660,6 @@
	rt5658_ep: endpoint {		rt5658_ep: endpoint {
	remote-endpoint = <&i2s1_dap_ep>;		remote-endpoint = <&i2s1_dap_ep>;
	mclk-fs = <256>;		mclk-fs = <256>;
	clocks = <&bpmp TEGRA194_CLK_AUD_MCLK>;
	};		};
	};		};
	};		};