github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-31 18:43:33 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

Device Tree fixes for TI K3 platform for v5.17 merge window

Browse Source 
* Update J721S2 platform to switch serial aliases to ttyS2.
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEE+KKGk1TrgjIXoxo03bWEnRc2JJ0FAmH9I2EACgkQ3bWEnRc2
 JJ2/bQ//V5hmXYedSYjX2LWg8xBnUu/3lYK7QGtU+uA21Btg9XipJg6xvBUfRYd8
 Oop5qnMM+wU/isqxyYGYspGuSGUAaVvzDh6t7RNVY5sKgP8trLXBIFGrqYdC9vFJ
 DHs9MKdjNjz3NsCOqS7lMMS2Gb6o3WnFkLtLuW5HN3Yrss8YT+RabwzKY6eUdUCD
 QyZxh+agVjPzV6IVACiOt/ebklrC9AUGwOKyNlWS65NATRFativNiX9xFgshqTMM
 7lscweZWLXaw9n4NmniZYOzzL9nY9OZ1E9+MmvLAh8r4sjnvn1Dip6c7iDSGsT75
 BLmeMde+5DFCoJDLgxurjQYVGbF9CfBxzKHa3xRGavir7fVJdEz6s8hd7hiNaOTn
 ZlvloivSFS3LdI5wV+/bXNEZcuH2dqbgnIgx0bmz7CEQuzGdgg3tVEomFUH/vBDb
 hJLbWJ3DV1D3GfCdH78SAwgRSVtWGCVmiQXuMVNznb7qOAttqj/WqHL0mNB+qdnV
 GtofhSxeyEn+KNAeFh+Q4J4pWdSae3b+KK+EHfJn4d4UxJjl2MsXZW01n/V56FDS
 B0ElyA4Gift01oBkBECv5sXBzSo1bFkXsPtriL6NCmxnSUXK3+XSgiD7Xz4Yyb33
 K3qWyK1ljpNOdW8QKf2fu52bcEW7y6elu4DAgotE465bD8B9Htk=
 =Vjuy
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEo6/YBQwIrVS28WGKmmx57+YAGNkFAmICMBkACgkQmmx57+YA
 GNmKIA/+JDAzUO3pracr4ODTt0T9Mqf/95i3D95azRP8d44WRs5NkGnCLm/jXde1
 xGuhH9AdHJ6umZPMo6qW60gI+f3DKUn+w5aDe7xfn2gFTkNbNdKpyoPHCc+Rz7+F
 iv8s3ydXtZoX0tvQMewAbpAYp8lsmHnB8r9QvQlhtLe7KQJGq0g2nW04q8fPFfk2
 iEajdphmRbLwrm/8YqAMpZs3IqbsvmQibXr0Woiv52gfaOH6DhxgplgGQQ7HbDld
 9kzMU6k8gaNkd8Exrz5qFokZ8H9HCyjdp6AjgmiTsT9bkwErXDbyWayAglm0+/1T
 IjJS/G1R1O3la5+O6Eq4hkgICn9Udr/XLtXiE8jlu97LxzL/AfN2LLU+fxTEGKyL
 NTEXHbGQ20CrDQHetyaduE0dI+b96U42AjgyM4drh9ygi2ehMHpg6S8HJe0pL0PQ
 lhXT19VLm60IVoUPrXaYmzMiCtr9rplmkvpYaPjjnhUZK9p4mPDAPeSZORO95p5D
 gJRWM/JBMsSNTp47tV93Bed6aqW4WcexyzdsZz5xjTv5q9PDRfxZPTshB3dCVl0t
 tmho2orFqm3KXtwoeigzTXhTCDv7OfjXCtVo9rZY6zITEUwVP65eVNBcBSaizp0m
 Xdkusm6fNsohuTLF9WLF5wnd4nOGO7irr84KLC6SXuuS+AIwjKk=
 =N2Mp
 -----END PGP SIGNATURE-----

Merge tag 'ti-k3-dt-fixes-for-v5.17' of git://git.kernel.org/pub/scm/linux/kernel/git/ti/linux into arm/fixes

Device Tree fixes for TI K3 platform for v5.17 merge window

* Update J721S2 platform to switch serial aliases to ttyS2.

* tag 'ti-k3-dt-fixes-for-v5.17' of git://git.kernel.org/pub/scm/linux/kernel/git/ti/linux:
  arm64: dts: ti: k3-j721s2-common-proc-board: Alias console uart to serial2
  arm64: dts: ti: k3-j721s2: Move aliases to board dts

Link: https://lore.kernel.org/r/20220204130716.fjlm4vvcbtzcwlwx@chalice
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann 2022-02-08 09:55:52 +01:00
commit 99c410e89e
2 changed files with 12 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
arch/arm64/boot/dts/ti/k3-j721s2-common-proc-board.dts
View File

@ -15,8 +15,18 @@ / {
model = "Texas Instruments J721S2 EVM";
chosen {
stdout-path = "serial10:115200n8";
bootargs = "console=ttyS10,115200n8 earlycon=ns16550a,mmio32,2880000";
stdout-path = "serial2:115200n8";
bootargs = "console=ttyS2,115200n8 earlycon=ns16550a,mmio32,2880000";
};
aliases {
serial1 = &mcu_uart0;
serial2 = &main_uart8;
mmc0 = &main_sdhci0;
mmc1 = &main_sdhci1;
can0 = &main_mcan16;
can1 = &mcu_mcan0;
can2 = &mcu_mcan1;
};
evm_12v0: fixedregulator-evm12v0 {

22
arch/arm64/boot/dts/ti/k3-j721s2.dtsi
View File

@ -21,28 +21,6 @@ / {
#address-cells = <2>;
#size-cells = <2>;
aliases {
serial0 = &wkup_uart0;
serial1 = &mcu_uart0;
serial2 = &main_uart0;
serial3 = &main_uart1;
serial4 = &main_uart2;
serial5 = &main_uart3;
serial6 = &main_uart4;
serial7 = &main_uart5;
serial8 = &main_uart6;
serial9 = &main_uart7;
serial10 = &main_uart8;
serial11 = &main_uart9;
mmc0 = &main_sdhci0;
mmc1 = &main_sdhci1;
can0 = &main_mcan16;
can1 = &mcu_mcan0;
can2 = &mcu_mcan1;
can3 = &main_mcan3;
can4 = &main_mcan5;
};
chosen { };
cpus {