hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ARM64: dts: meson: fix clock source of the pclk for UART_AO 

>From the hardware perspective, the actual pclk of the AO uarts
is the corresponding clkc_ao uart gate, not the main clock controller clk81.
This was not problem so far, because the uart_gate had
the CLK_IGNORE_UNUSED flag, which kept the gate open.

We plan to remove the CLK_IGNORE_UNUSED flag in another patch,
but before doing that, we need to fix the clock in the DTS file.

Signed-off-by: Yixun Lan <yixun.lan@amlogic.com>
Signed-off-by: Kevin Hilman <khilman@baylibre.com>
This commit is contained in:
Yixun Lan 2018-03-28 11:01:30 +08:00 committed by Kevin Hilman
parent e03421ece6
commit 9adda3534f
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/arm64/boot/dts/amlogic/meson-axg.dtsi
View File

@ -1174,7 +1174,7 @@
compatible = "amlogic,meson-gx-uart", "amlogic,meson-ao-uart"; compatible = "amlogic,meson-gx-uart", "amlogic,meson-ao-uart";
reg = <0x0 0x3000 0x0 0x18>; reg = <0x0 0x3000 0x0 0x18>;
interrupts = <GIC_SPI 193 IRQ_TYPE_EDGE_RISING>; interrupts = <GIC_SPI 193 IRQ_TYPE_EDGE_RISING>;
clocks = <&xtal>, <&clkc CLKID_CLK81>, <&xtal>; clocks = <&xtal>, <&clkc_AO CLKID_AO_UART1>, <&xtal>;
clock-names = "xtal", "pclk", "baud"; clock-names = "xtal", "pclk", "baud";
status = "disabled"; status = "disabled";
}; };
@ -1183,7 +1183,7 @@
compatible = "amlogic,meson-gx-uart", "amlogic,meson-ao-uart"; compatible = "amlogic,meson-gx-uart", "amlogic,meson-ao-uart";
reg = <0x0 0x4000 0x0 0x18>; reg = <0x0 0x4000 0x0 0x18>;
interrupts = <GIC_SPI 197 IRQ_TYPE_EDGE_RISING>; interrupts = <GIC_SPI 197 IRQ_TYPE_EDGE_RISING>;
clocks = <&xtal>, <&clkc CLKID_CLK81>, <&xtal>; clocks = <&xtal>, <&clkc_AO CLKID_AO_UART2>, <&xtal>;
clock-names = "xtal", "pclk", "baud"; clock-names = "xtal", "pclk", "baud";
status = "disabled"; status = "disabled";
}; };

4
arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi
View File

@ -751,12 +751,12 @@
}; };
&uart_AO { &uart_AO {
clocks = <&xtal>, <&clkc CLKID_CLK81>, <&xtal>; clocks = <&xtal>, <&clkc_AO CLKID_AO_UART1>, <&xtal>;
clock-names = "xtal", "pclk", "baud"; clock-names = "xtal", "pclk", "baud";
}; };
&uart_AO_B { &uart_AO_B {
clocks = <&xtal>, <&clkc CLKID_CLK81>, <&xtal>; clocks = <&xtal>, <&clkc_AO CLKID_AO_UART2>, <&xtal>;
clock-names = "xtal", "pclk", "baud"; clock-names = "xtal", "pclk", "baud";
}; };

4
arch/arm64/boot/dts/amlogic/meson-gxl.dtsi
View File

@ -760,12 +760,12 @@
}; };
&uart_AO { &uart_AO {
clocks = <&xtal>, <&clkc CLKID_CLK81>, <&xtal>; clocks = <&xtal>, <&clkc_AO CLKID_AO_UART1>, <&xtal>;
clock-names = "xtal", "pclk", "baud"; clock-names = "xtal", "pclk", "baud";
}; };
&uart_AO_B { &uart_AO_B {
clocks = <&xtal>, <&clkc CLKID_CLK81>, <&xtal>; clocks = <&xtal>, <&clkc_AO CLKID_AO_UART2>, <&xtal>;
clock-names = "xtal", "pclk", "baud"; clock-names = "xtal", "pclk", "baud";
}; };