github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-23 14:42:08 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

Two fixes for omaps

Browse Source 
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.
 -----BEGIN PGP SIGNATURE-----
 
 iQJFBAABCAAvFiEEkgNvrZJU/QSQYIcQG9Q+yVyrpXMFAmMhgrERHHRvbnlAYXRv
 bWlkZS5jb20ACgkQG9Q+yVyrpXPUJg//bzGzEInF3BoA5HNd/epmniNJhvRlcY8T
 ZD8HefWfMpJ17g3RmwZgFui0YU65YDqeoSEYl5AU8STCI52Nk16EKcKs9MrnpARF
 SzHRPKw4y8R4qwjYwUIfB4hyOcX5Dr+vYHmanhvQuRSSa8B2xh94zUUO/OI+cKeI
 GeXBDKGwCBJXJqu98OrfSvQuvDVr2KUCgr/iwXo/RJ9Zqjx1+hgC8B0k6IQaScm2
 hJWzt94qadBcfrd8nfw5QFZyfVRDv5YPQ8hpyjoS7RNg30HR4qSDuFYs6y7iVMLV
 LUdpjr3f9rhWFcQF69J8fKHw5ookfB6kjn3P+Xt5puXbpbmNz2hvSXEoqC/gnVnG
 EWSN+waXlkXH+WVVOn1oMc9B0cjA+u/05z6lHjM2iUOGTQHb5yMGNLB3qrIiAVxB
 /ZYyrIcxNukf5Qqk2bROGOdC4nIrF+TACalbubAGam3+BbmZwJpARRA90qIl5zSX
 4GRk5S9Vvph16w71Dt3CQRVCyl/1VpIr5RMkBA9CKLO3bkSsTsHRUPhGGgDOlFdh
 /FlBRZDNAXtfPVvh4pEA4HdlHKYw53QDZRQoCs2m8l73FypuxQlJlWUfLEltshTE
 7rIYGwK62aysrnoQetmrbJDrfLtEhOnel/+ehpKkecJ+50TWs9Zjg5neUjiq5K3O
 hnAJ/sR2VSc=
 =p5BT
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEo6/YBQwIrVS28WGKmmx57+YAGNkFAmMtpjwACgkQmmx57+YA
 GNlq0g/8D8InNgCpqLj7KZe/0exuWUwM8pNRx7MVUTlMfiAtEJjahdm+Xxy08B2z
 ORgrj8n7g39t90cqjj8hK6PD/5DzFSrJtdFOMUhXwg8q8MrmfSYoIkAWMn3rrzOc
 N/608zG2fRwECLc+K8uZ9Zi6bTEG6/PKjNADV62ggAnPa9ts6fpw6o8NL1Gs/4Ju
 3QNYOx/S9B9Hn/grZ74ZFqJil/D2PSQj5T9IQXhDbuy6pF5pFuEMRbA3eLphEc4C
 QNRXrZu9MHUBSFPA3iFm11SX2tf2GLjzLYgsdCQM1I5intdyi2DnpuItnkElwYnd
 14fGiQamk3unKLImEM/TQjfZrEcTdIqdvESUCGqmjcsMF4IAbVlO3LeMVM518oX/
 01FmOM0BXAKT6jsuawg8gjzLUNj4bHatM0HXxOskbfvSpIeA5eAVG1Af/1SEg4HY
 GdrwOMgEU7y7ORlLykxCN+8APYpZCfxNRBF+KORxPDAXizYPafM/SU9WCd3ehuEN
 70uzwegMud14mIoA4/Lw3Si0ZWM9+PLCfHFiVwe2g02OtZPCJte7YvvB+GrK9ecy
 dhp5NcgCStEMVnIlYWIIOM/C/PNwUKYYEZRCrCEZH557Dj2+aiq6hc/a7aBjXpik
 BcBJTduYX84b2pHL0IgB6cI+wPzj2jK+4moTJzyGIDQ59Y9eOuM=
 =M5HN
 -----END PGP SIGNATURE-----

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: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann 2022-09-23 14:27:39 +02:00
commit 415da41225
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
arch/arm/boot/dts/am33xx-l4.dtsi
View File

@ -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>;

4
arch/arm/boot/dts/am5748.dtsi
View File

@ -25,6 +25,10 @@ &usb3_tm {
status = "disabled";
};
&usb4_tm {
status = "disabled";
};
&atl_tm {
status = "disabled";
};