Amlogic fixes for v5.17-rc
- meson6/meson8/meson8b UART compatible fixup to notably fix earlycon -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEPVPGJshWBf4d9CyLd9zb2sjISdEFAmHb/ZwACgkQd9zb2sjI SdFqgg/+IYDjXrHANH0j6q0wjHCOXbmErqsNimVM9HPjBzYd71dNy+VO0kn6Cobv HcxnMWjgvEY3AYRBWbSH4Hqq+rse6VJHQqoxzivyQRJhzlDZQVAjBPIzcX6GPQpD VCAGR2B3/xVZFmDHuQUPgVPr2yJXFksWJAi5VfPWLj/moQW0EH9VEu8B1+iDrTkN DxTYhjGVM0eM54Ms3RbaRAv5zOXCC2rZmFvtN8LXhItneuovzG/kKAP3htFVEG1g s8ASmikXbPD5rw8uiorJAyQXAM1pNJgVE/34TVc1ge8fuNiV1pxIpKxfKDdiPj6J iDW5jz8ygCpXnn9Nc3qCnb14/+d/MV0SBOqjZg7eFRFpFtXAEudii7dSkCQYzOS5 qdaw5xIRYomxNQ6I+52BYB2Ma34IVduuRBcti4AxHJhlo3hQRHHDvI5oQvnWcP9b duQeCXDWE0W77Hm4yvIVL+gLNEOgLv6imNJqOHYvs8e+lqhFUc1qT+ZOFBGXUnwN nQ4l4nmtHTnt2m2A6z2fFbQ4KrMmVrw3I7AT2fZHIvSxR7O5XMvyHz6Uc+AzU5sX NumcZsqjqGHhctmbn5hW8gsSse6pcHuRRrJ2k24OTmNJDfFeJSc2FCXvJ+c87Ahp XtuTbas/3IENHfn0VAzCFMOFiMzMOX/4Zj22/un4XOuLrTI6sc4= =E9tl -----END PGP SIGNATURE----- gpgsig -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEo6/YBQwIrVS28WGKmmx57+YAGNkFAmICPQkACgkQmmx57+YA GNmVbQ//cnDurfbE7PijtfiWb5n81bX0q+h5FBXrbLLxK2B13leq44JxoJ4WLg5w q4okOn8ni0aKT8y64GV2LD3+m7HYMGyAGhyOp3hoXKNCQcx+Yfm8Tsku0tEQqKTu EOzhO03fba9exJMt3LKRgcwTYmsxF+EP0DbyGnEkKV2ly66aB4X7ocVYvCBh1VZL SspWWUtem0PJkPsr+2X62poyhzCE0rRorzIw7n3Szo9T4WDTrRyB4L09SVs57h40 yAPVV7kUz+NjHeCJpAnSLozIGjJyudeBtBtTD0/ezP4yY1Spmlo4n0Q1Enh29dZN /XWDYrkJQqamAyRRrkSmWm1wDluqNBckvZ9mwhZ9BAVam/WQnn2Y7Rh5jg5mQbcj fIGHXFKXq4cIprLW/1LpLwcZbYXac3oShGbsIMKsI0igClPqoOdSjrn5MZ8ekksQ lnJlbnZkietqL4gYT9sHb1/Y/sqjX5Eq1neYZsWCOl6mJJEntOQu0rVFZf0eNkOe IdJvQi44uoKnGSOomzbQWIFjbCLulqYxyrSPhrBva+Z6Q0M+T6NdFqG1rhPp7Ieq U9apzuxbGVsa7SHDdidVrV6eM4PHWZK71Ctfc064xvkSvGGogvYju/RztAT7/7ls VF/9wq7Xdc9H3ER2xzISGqYQYLNFJbn/DflZceyC8J0R3RK6/cc= =31SM -----END PGP SIGNATURE----- Merge tag 'amlogic-fixes-v5.17-rc-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux into arm/fixes Amlogic fixes for v5.17-rc - meson6/meson8/meson8b UART compatible fixup to notably fix earlycon * tag 'amlogic-fixes-v5.17-rc-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux: ARM: dts: meson8b: Fix the UART device-tree schema validation ARM: dts: meson8: Fix the UART device-tree schema validation ARM: dts: meson: Fix the UART compatible strings Link: https://lore.kernel.org/r/746a7f25-1c96-9d27-3a08-e86b2af608ef@baylibre.com Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann
Коммит
7896020612
|
|
@ -59,7 +59,7 @@
|
|||
};
|
||||
|
||||
uart_A: serial@84c0 {
|
||||
compatible = "amlogic,meson6-uart", "amlogic,meson-uart";
|
||||
compatible = "amlogic,meson6-uart";
|
||||
reg = <0x84c0 0x18>;
|
||||
interrupts = <GIC_SPI 26 IRQ_TYPE_EDGE_RISING>;
|
||||
fifo-size = <128>;
|
||||
|
|
@ -67,7 +67,7 @@
|
|||
};
|
||||
|
||||
uart_B: serial@84dc {
|
||||
compatible = "amlogic,meson6-uart", "amlogic,meson-uart";
|
||||
compatible = "amlogic,meson6-uart";
|
||||
reg = <0x84dc 0x18>;
|
||||
interrupts = <GIC_SPI 75 IRQ_TYPE_EDGE_RISING>;
|
||||
status = "disabled";
|
||||
|
|
@ -105,7 +105,7 @@
|
|||
};
|
||||
|
||||
uart_C: serial@8700 {
|
||||
compatible = "amlogic,meson6-uart", "amlogic,meson-uart";
|
||||
compatible = "amlogic,meson6-uart";
|
||||
reg = <0x8700 0x18>;
|
||||
interrupts = <GIC_SPI 93 IRQ_TYPE_EDGE_RISING>;
|
||||
status = "disabled";
|
||||
|
|
@ -228,7 +228,7 @@
|
|||
};
|
||||
|
||||
uart_AO: serial@4c0 {
|
||||
compatible = "amlogic,meson6-uart", "amlogic,meson-ao-uart", "amlogic,meson-uart";
|
||||
compatible = "amlogic,meson6-uart", "amlogic,meson-ao-uart";
|
||||
reg = <0x4c0 0x18>;
|
||||
interrupts = <GIC_SPI 90 IRQ_TYPE_EDGE_RISING>;
|
||||
status = "disabled";
|
||||
|
|
|
|||
|
|
@ -736,27 +736,27 @@
|
|||
};
|
||||
|
||||
&uart_AO {
|
||||
compatible = "amlogic,meson8-uart", "amlogic,meson-uart";
|
||||
clocks = <&clkc CLKID_CLK81>, <&xtal>, <&clkc CLKID_CLK81>;
|
||||
clock-names = "baud", "xtal", "pclk";
|
||||
compatible = "amlogic,meson8-uart", "amlogic,meson-ao-uart";
|
||||
clocks = <&xtal>, <&clkc CLKID_CLK81>, <&clkc CLKID_CLK81>;
|
||||
clock-names = "xtal", "pclk", "baud";
|
||||
};
|
||||
|
||||
&uart_A {
|
||||
compatible = "amlogic,meson8-uart", "amlogic,meson-uart";
|
||||
clocks = <&clkc CLKID_CLK81>, <&xtal>, <&clkc CLKID_UART0>;
|
||||
clock-names = "baud", "xtal", "pclk";
|
||||
compatible = "amlogic,meson8-uart";
|
||||
clocks = <&xtal>, <&clkc CLKID_UART0>, <&clkc CLKID_CLK81>;
|
||||
clock-names = "xtal", "pclk", "baud";
|
||||
};
|
||||
|
||||
&uart_B {
|
||||
compatible = "amlogic,meson8-uart", "amlogic,meson-uart";
|
||||
clocks = <&clkc CLKID_CLK81>, <&xtal>, <&clkc CLKID_UART1>;
|
||||
clock-names = "baud", "xtal", "pclk";
|
||||
compatible = "amlogic,meson8-uart";
|
||||
clocks = <&xtal>, <&clkc CLKID_UART0>, <&clkc CLKID_CLK81>;
|
||||
clock-names = "xtal", "pclk", "baud";
|
||||
};
|
||||
|
||||
&uart_C {
|
||||
compatible = "amlogic,meson8-uart", "amlogic,meson-uart";
|
||||
clocks = <&clkc CLKID_CLK81>, <&xtal>, <&clkc CLKID_UART2>;
|
||||
clock-names = "baud", "xtal", "pclk";
|
||||
compatible = "amlogic,meson8-uart";
|
||||
clocks = <&xtal>, <&clkc CLKID_UART0>, <&clkc CLKID_CLK81>;
|
||||
clock-names = "xtal", "pclk", "baud";
|
||||
};
|
||||
|
||||
&usb0 {
|
||||
|
|
|
|||
|
|
@ -724,27 +724,27 @@
|
|||
};
|
||||
|
||||
&uart_AO {
|
||||
compatible = "amlogic,meson8b-uart", "amlogic,meson-uart";
|
||||
clocks = <&clkc CLKID_CLK81>, <&xtal>, <&clkc CLKID_CLK81>;
|
||||
clock-names = "baud", "xtal", "pclk";
|
||||
compatible = "amlogic,meson8b-uart", "amlogic,meson-ao-uart";
|
||||
clocks = <&xtal>, <&clkc CLKID_CLK81>, <&clkc CLKID_CLK81>;
|
||||
clock-names = "xtal", "pclk", "baud";
|
||||
};
|
||||
|
||||
&uart_A {
|
||||
compatible = "amlogic,meson8b-uart", "amlogic,meson-uart";
|
||||
clocks = <&clkc CLKID_CLK81>, <&xtal>, <&clkc CLKID_UART0>;
|
||||
clock-names = "baud", "xtal", "pclk";
|
||||
compatible = "amlogic,meson8b-uart";
|
||||
clocks = <&xtal>, <&clkc CLKID_UART0>, <&clkc CLKID_CLK81>;
|
||||
clock-names = "xtal", "pclk", "baud";
|
||||
};
|
||||
|
||||
&uart_B {
|
||||
compatible = "amlogic,meson8b-uart", "amlogic,meson-uart";
|
||||
clocks = <&clkc CLKID_CLK81>, <&xtal>, <&clkc CLKID_UART1>;
|
||||
clock-names = "baud", "xtal", "pclk";
|
||||
compatible = "amlogic,meson8b-uart";
|
||||
clocks = <&xtal>, <&clkc CLKID_UART0>, <&clkc CLKID_CLK81>;
|
||||
clock-names = "xtal", "pclk", "baud";
|
||||
};
|
||||
|
||||
&uart_C {
|
||||
compatible = "amlogic,meson8b-uart", "amlogic,meson-uart";
|
||||
clocks = <&clkc CLKID_CLK81>, <&xtal>, <&clkc CLKID_UART2>;
|
||||
clock-names = "baud", "xtal", "pclk";
|
||||
compatible = "amlogic,meson8b-uart";
|
||||
clocks = <&xtal>, <&clkc CLKID_UART0>, <&clkc CLKID_CLK81>;
|
||||
clock-names = "xtal", "pclk", "baud";
|
||||
};
|
||||
|
||||
&usb0 {
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче