| Message ID | 20220617121805.738157-2-aidanmacdonald.0x0@gmail.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | db30dc1a5226eb74d52f748989e9a06451333678 |
| Headers | show |
| Series | Fix missing TCU clock for X1000/X1830 SoCs | expand |
On Fri, Jun 17, 2022 at 01:18:05PM +0100, Aidan MacDonald wrote: > This clock is a gate for the TCU hardware block on these SoCs, but > it wasn't included in the device tree since the ingenic-tcu driver > erroneously did not request it. > > Reviewed-by: Paul Cercueil <paul@crapouillou.net> > Signed-off-by: Aidan MacDonald <aidanmacdonald.0x0@gmail.com> > --- > arch/mips/boot/dts/ingenic/x1000.dtsi | 5 +++-- > arch/mips/boot/dts/ingenic/x1830.dtsi | 5 +++-- > 2 files changed, 6 insertions(+), 4 deletions(-) > > diff --git a/arch/mips/boot/dts/ingenic/x1000.dtsi b/arch/mips/boot/dts/ingenic/x1000.dtsi > index b0a034b468bb..42e69664efd9 100644 > --- a/arch/mips/boot/dts/ingenic/x1000.dtsi > +++ b/arch/mips/boot/dts/ingenic/x1000.dtsi > @@ -111,8 +111,9 @@ tcu: timer@10002000 { > > clocks = <&cgu X1000_CLK_RTCLK>, > <&cgu X1000_CLK_EXCLK>, > - <&cgu X1000_CLK_PCLK>; > - clock-names = "rtc", "ext", "pclk"; > + <&cgu X1000_CLK_PCLK>, > + <&cgu X1000_CLK_TCU>; > + clock-names = "rtc", "ext", "pclk", "tcu"; > > interrupt-controller; > #interrupt-cells = <1>; > diff --git a/arch/mips/boot/dts/ingenic/x1830.dtsi b/arch/mips/boot/dts/ingenic/x1830.dtsi > index dbf21afaccb1..65a5da71c199 100644 > --- a/arch/mips/boot/dts/ingenic/x1830.dtsi > +++ b/arch/mips/boot/dts/ingenic/x1830.dtsi > @@ -104,8 +104,9 @@ tcu: timer@10002000 { > > clocks = <&cgu X1830_CLK_RTCLK>, > <&cgu X1830_CLK_EXCLK>, > - <&cgu X1830_CLK_PCLK>; > - clock-names = "rtc", "ext", "pclk"; > + <&cgu X1830_CLK_PCLK>, > + <&cgu X1830_CLK_TCU>; > + clock-names = "rtc", "ext", "pclk", "tcu"; > > interrupt-controller; > #interrupt-cells = <1>; > -- > 2.35.1 applied to mips-fixes. Thomas.
diff --git a/arch/mips/boot/dts/ingenic/x1000.dtsi b/arch/mips/boot/dts/ingenic/x1000.dtsi index b0a034b468bb..42e69664efd9 100644 --- a/arch/mips/boot/dts/ingenic/x1000.dtsi +++ b/arch/mips/boot/dts/ingenic/x1000.dtsi @@ -111,8 +111,9 @@ tcu: timer@10002000 { clocks = <&cgu X1000_CLK_RTCLK>, <&cgu X1000_CLK_EXCLK>, - <&cgu X1000_CLK_PCLK>; - clock-names = "rtc", "ext", "pclk"; + <&cgu X1000_CLK_PCLK>, + <&cgu X1000_CLK_TCU>; + clock-names = "rtc", "ext", "pclk", "tcu"; interrupt-controller; #interrupt-cells = <1>; diff --git a/arch/mips/boot/dts/ingenic/x1830.dtsi b/arch/mips/boot/dts/ingenic/x1830.dtsi index dbf21afaccb1..65a5da71c199 100644 --- a/arch/mips/boot/dts/ingenic/x1830.dtsi +++ b/arch/mips/boot/dts/ingenic/x1830.dtsi @@ -104,8 +104,9 @@ tcu: timer@10002000 { clocks = <&cgu X1830_CLK_RTCLK>, <&cgu X1830_CLK_EXCLK>, - <&cgu X1830_CLK_PCLK>; - clock-names = "rtc", "ext", "pclk"; + <&cgu X1830_CLK_PCLK>, + <&cgu X1830_CLK_TCU>; + clock-names = "rtc", "ext", "pclk", "tcu"; interrupt-controller; #interrupt-cells = <1>;