diff mbox

[RESEND] ARM64: dts: meson-axg: add the audio clock controller

Message ID 20180706144305.30116-1-jbrunet@baylibre.com (mailing list archive)
State Superseded
Headers show

Commit Message

Jerome Brunet July 6, 2018, 2:43 p.m. UTC
Add the audio clock controller which is part of the audio bus
This controller takes 8 input plls, and the usual clock gate, from the
main clock controller. It provides the clocs for the all the devices of
the audio subsystem, such as tdms, spdif, pdm, etc.

Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>
---

Resend to fix typo reported by Martin in the commit description.
(Thx Martin !)

Kevin,

Please note that this change depends on the axg audio clock bindings [0].
It explains the problem reported by kbuild robot
It will be part of our PR to clock in this cycle.

As usual, I've prepared a topic branch with the DT changes for you.
Please, let me know when you need a tag on it.

Cheers
Jerome

 arch/arm64/boot/dts/amlogic/meson-axg.dtsi | 36 ++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)

Comments

Kevin Hilman July 9, 2018, 9:53 p.m. UTC | #1
Jerome Brunet <jbrunet@baylibre.com> writes:

> Add the audio clock controller which is part of the audio bus
> This controller takes 8 input plls, and the usual clock gate, from the
> main clock controller. It provides the clocs for the all the devices of
> the audio subsystem, such as tdms, spdif, pdm, etc.
>
> Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>
> ---
>
> Resend to fix typo reported by Martin in the commit description.
> (Thx Martin !)
>
> Kevin,
>
> Please note that this change depends on the axg audio clock bindings [0].
>
> It explains the problem reported by kbuild robot
> It will be part of our PR to clock in this cycle.
>
> As usual, I've prepared a topic branch with the DT changes for you.
> Please, let me know when you need a tag on it.

Unless you're expecting some more dependencies for the v4.19 cycle,
please tag it now, then I will queue it up.

Kevin
Jerome Brunet July 10, 2018, 7:58 a.m. UTC | #2
On Mon, 2018-07-09 at 14:53 -0700, Kevin Hilman wrote:
> Jerome Brunet <jbrunet@baylibre.com> writes:
> 
> > Add the audio clock controller which is part of the audio bus
> > This controller takes 8 input plls, and the usual clock gate, from the
> > main clock controller. It provides the clocs for the all the devices of
> > the audio subsystem, such as tdms, spdif, pdm, etc.
> > 
> > Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>
> > ---
> > 
> > Resend to fix typo reported by Martin in the commit description.
> > (Thx Martin !)
> > 
> > Kevin,
> > 
> > Please note that this change depends on the axg audio clock bindings [0].
> > 
> > It explains the problem reported by kbuild robot
> > It will be part of our PR to clock in this cycle.
> > 
> > As usual, I've prepared a topic branch with the DT changes for you.
> > Please, let me know when you need a tag on it.
> 
> Unless you're expecting some more dependencies for the v4.19 cycle,
> please tag it now, then I will queue it up.

Done : meson-clk-dt-for-v4.19

> 
> Kevin
diff mbox

Patch

diff --git a/arch/arm64/boot/dts/amlogic/meson-axg.dtsi b/arch/arm64/boot/dts/amlogic/meson-axg.dtsi
index aa1a42407466..56d334be9f85 100644
--- a/arch/arm64/boot/dts/amlogic/meson-axg.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-axg.dtsi
@@ -6,6 +6,7 @@ 
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/interrupt-controller/irq.h>
 #include <dt-bindings/interrupt-controller/arm-gic.h>
+#include <dt-bindings/clock/axg-audio-clkc.h>
 #include <dt-bindings/clock/axg-clkc.h>
 #include <dt-bindings/clock/axg-aoclkc.h>
 #include <dt-bindings/gpio/meson-axg-gpio.h>
@@ -155,6 +156,41 @@ 
 			};
 		};
 
+		audio: bus@ff642000 {
+			compatible = "simple-bus";
+			reg = <0x0 0xff642000 0x0 0x2000>;
+			#address-cells = <2>;
+			#size-cells = <2>;
+			ranges = <0x0 0x0 0x0 0xff642000 0x0 0x2000>;
+
+			clkc_audio: clock-controller@0 {
+				compatible = "amlogic,axg-audio-clkc";
+				reg = <0x0 0x0 0x0 0xb4>;
+				#clock-cells = <1>;
+
+				clocks = <&clkc CLKID_AUDIO>,
+					 <&clkc CLKID_MPLL0>,
+					 <&clkc CLKID_MPLL1>,
+					 <&clkc CLKID_MPLL2>,
+					 <&clkc CLKID_MPLL3>,
+					 <&clkc CLKID_HIFI_PLL>,
+					 <&clkc CLKID_FCLK_DIV3>,
+					 <&clkc CLKID_FCLK_DIV4>,
+					 <&clkc CLKID_GP0_PLL>;
+				clock-names = "pclk",
+					      "mst_in0",
+					      "mst_in1",
+					      "mst_in2",
+					      "mst_in3",
+					      "mst_in4",
+					      "mst_in5",
+					      "mst_in6",
+					      "mst_in7";
+
+				resets = <&reset RESET_AUDIO>;
+			};
+		};
+
 		cbus: bus@ffd00000 {
 			compatible = "simple-bus";
 			reg = <0x0 0xffd00000 0x0 0x25000>;