Unverified Commit 415da412 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'omap-for-6.0/fixes-signed' of... 

Merge tag 'omap-for-6.0/fixes-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into arm/fixes

Two fixes for omaps

A fix to remove usb4 from am5748 as it does not exist on the SoC, and
a fix for am335x mmc dma that wired direct and should not use the xbar.

Note that the am5748 fix depends on the recent deferred probe regression
fixes to boot. I ended up picking the merge commit to base it on as it
describes what got fixed quite nicely rather than a -rc tag.

* tag 'omap-for-6.0/fixes-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: dts: am5748: keep usb4_tm disabled
  ARM: dts: am33xx: Fix MMCHS0 dma properties

Link: https://lore.kernel.org/r/pull-1663140667-273537@atomide.com


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 1e6989a3 2a906db2

arch/arm/boot/dts/am33xx-l4.dtsi

+1 −2
Original line number Diff line number Diff line
@@ -1502,8 +1502,7 @@ SYSC_OMAP2_SOFTRESET | 
			mmc1: mmc@0 {

				compatible = "ti,am335-sdhci";

				ti,needs-special-reset;

				dmas = <&edma_xbar 24 0 0

					&edma_xbar 25 0 0>;

				dmas = <&edma 24 0>, <&edma 25 0>;

				dma-names = "tx", "rx";

				interrupts = <64>;

				reg = <0x0 0x1000>;

arch/arm/boot/dts/am5748.dtsi

+4 −0
Original line number Diff line number Diff line
@@ -25,6 +25,10 @@ &usb3_tm { 
	status = "disabled";

};



&usb4_tm {

	status = "disabled";

};



&atl_tm {

	status = "disabled";

};