ARM: tegra: remove clock-frequency properties from serial nodes
Subsystems (2)
PATCH 1/1 ARM: tegra: remove clock-frequency properties from serial nodes
From: Stephen Warren <[email protected]>
Currently, the serial nodes define both a clock-frequency and a clocks property. We should not provide both, since they might conflict.
In practice, this also causes problems since the of_serial driver uses the clock-frequency property in preference to the clocks property, and hence doesn't clk_prepare_enable() the clock, which may then leave it with no known users, and hence the common clock framework will disable it, thus breaking the port, which is usually the console.
--- arch/arm/boot/dts/tegra20.dtsi | 5 ----- arch/arm/boot/dts/tegra30.dtsi | 5 ----- 2 files changed, 10 deletions(-)
arch/arm/boot/dts/tegra20.dtsi +0 -5
@@ -247,7 +247,6 @@ reg = <0x70006000 0x40>; reg-shift = <2>; interrupts = <0 36 0x04>; - clock-frequency = <216000000>; nvidia,dma-request-selector = <&apbdma 8>; clocks = <&tegra_car 6>; status = "disabled";
@@ -258,7 +257,6 @@ reg = <0x70006040 0x40>; reg-shift = <2>; interrupts = <0 37 0x04>; - clock-frequency = <216000000>; nvidia,dma-request-selector = <&apbdma 9>; clocks = <&tegra_car 96>; status = "disabled";
@@ -269,7 +267,6 @@ reg = <0x70006200 0x100>; reg-shift = <2>; interrupts = <0 46 0x04>; - clock-frequency = <216000000>; nvidia,dma-request-selector = <&apbdma 10>; clocks = <&tegra_car 55>; status = "disabled";
@@ -280,7 +277,6 @@ reg = <0x70006300 0x100>; reg-shift = <2>; interrupts = <0 90 0x04>; - clock-frequency = <216000000>; nvidia,dma-request-selector = <&apbdma 19>; clocks = <&tegra_car 65>; status = "disabled";
@@ -291,7 +287,6 @@ reg = <0x70006400 0x100>; reg-shift = <2>; interrupts = <0 91 0x04>; - clock-frequency = <216000000>; nvidia,dma-request-selector = <&apbdma 20>; clocks = <&tegra_car 66>; status = "disabled";
arch/arm/boot/dts/tegra30.dtsi +0 -5
@@ -234,7 +234,6 @@ reg = <0x70006000 0x40>; reg-shift = <2>; interrupts = <0 36 0x04>; - clock-frequency = <408000000>; nvidia,dma-request-selector = <&apbdma 8>; clocks = <&tegra_car 6>; status = "disabled";
@@ -244,7 +243,6 @@ compatible = "nvidia,tegra30-uart", "nvidia,tegra20-uart"; reg = <0x70006040 0x40>; reg-shift = <2>; - clock-frequency = <408000000>; interrupts = <0 37 0x04>; nvidia,dma-request-selector = <&apbdma 9>; clocks = <&tegra_car 160>;
@@ -255,7 +253,6 @@ compatible = "nvidia,tegra30-uart", "nvidia,tegra20-uart"; reg = <0x70006200 0x100>; reg-shift = <2>; - clock-frequency = <408000000>; interrupts = <0 46 0x04>; nvidia,dma-request-selector = <&apbdma 10>; clocks = <&tegra_car 55>;
@@ -266,7 +263,6 @@ compatible = "nvidia,tegra30-uart", "nvidia,tegra20-uart"; reg = <0x70006300 0x100>; reg-shift = <2>; - clock-frequency = <408000000>; interrupts = <0 90 0x04>; nvidia,dma-request-selector = <&apbdma 19>; clocks = <&tegra_car 65>;
@@ -277,7 +273,6 @@ compatible = "nvidia,tegra30-uart", "nvidia,tegra20-uart"; reg = <0x70006400 0x100>; reg-shift = <2>; - clock-frequency = <408000000>; interrupts = <0 91 0x04>; nvidia,dma-request-selector = <&apbdma 20>; clocks = <&tegra_car 66>;
Signature · 1 line
1.7.10.4
PATCH 1/1 ARM: tegra: remove clock-frequency properties from serial nodes
Quoted 10 lines · Stephen Warren
From: Stephen Warren <[email protected]>
Currently, the serial nodes define both a clock-frequency and a clocks property. We should not provide both, since they might conflict.
In practice, this also causes problems since the
of_serialdriver uses the clock-frequency property in preference to the clocks property, and hence doesn'tclk_prepare_enable()the clock, which may then leave it with no known users, and hence the common clock framework will disable it, thus breaking the port, which is usually the console.
I've applied this to Tegra's for-3.9/soc-ccf-fixes branch, although I'll hold off on pushing it out a little while in case anyone has comments on it. That said, I hope to include it in an arm-soc pull request tomorrow at the latest.