| Message ID | 1471514928-3341-4-git-send-email-narmstrong@baylibre.com (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
Neil Armstrong <narmstrong@baylibre.com> writes: > Add the AO clock controller node for the AmLogic GXBB SoC. > > Signed-off-by: Neil Armstrong <narmstrong@baylibre.com> > --- Applying this to the amlogic tree, but will need to wait a cycle due to include dependencies on the bindings, which are going through the clock tree. Kevin
Quoting Kevin Hilman (2016-08-19 15:03:06) > Neil Armstrong <narmstrong@baylibre.com> writes: > > > Add the AO clock controller node for the AmLogic GXBB SoC. > > > > Signed-off-by: Neil Armstrong <narmstrong@baylibre.com> > > --- > > Applying this to the amlogic tree, but will need to wait a cycle due to > include dependencies on the bindings, which are going through the clock > tree. FYI, for picked patches, Stephen and I create a stable branch for each platform. You can pull this into your tree if you want, just let us know so we'll be sure not to rebase: git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git clk-meson-gxbb-ao Regards, Mike > > Kevin
Michael Turquette <mturquette@baylibre.com> writes: > Quoting Kevin Hilman (2016-08-19 15:03:06) >> Neil Armstrong <narmstrong@baylibre.com> writes: >> >> > Add the AO clock controller node for the AmLogic GXBB SoC. >> > >> > Signed-off-by: Neil Armstrong <narmstrong@baylibre.com> >> > --- >> >> Applying this to the amlogic tree, but will need to wait a cycle due to >> include dependencies on the bindings, which are going through the clock >> tree. > > FYI, for picked patches, Stephen and I create a stable branch for each > platform. You can pull this into your tree if you want, just let us know > so we'll be sure not to rebase: > > git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git clk-meson-gxbb-ao > OK, I'll be using clk-meson-gxb and clk-meson-gxbb-ao. Thanks, Kevin
Quoting Kevin Hilman (2016-08-29 10:37:37) > Michael Turquette <mturquette@baylibre.com> writes: > > > Quoting Kevin Hilman (2016-08-19 15:03:06) > >> Neil Armstrong <narmstrong@baylibre.com> writes: > >> > >> > Add the AO clock controller node for the AmLogic GXBB SoC. > >> > > >> > Signed-off-by: Neil Armstrong <narmstrong@baylibre.com> > >> > --- > >> > >> Applying this to the amlogic tree, but will need to wait a cycle due to > >> include dependencies on the bindings, which are going through the clock > >> tree. > > > > FYI, for picked patches, Stephen and I create a stable branch for each > > platform. You can pull this into your tree if you want, just let us know > > so we'll be sure not to rebase: > > > > git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git clk-meson-gxbb-ao > > > > OK, I'll be using clk-meson-gxb and clk-meson-gxbb-ao. Heads up, I merged clk-meson-gxbb-ao into clk-meson-gxbb yesterday to make it easier to merge the emmc clock gate patches. If you haven't pulled clk-meson-gxbb-ao already then you can just re-pull clk-meson-gxbb and you'll get it. Regards, Mike > > Thanks, > > Kevin
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi index e502c24..c81e1ab 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi @@ -45,6 +45,8 @@ #include <dt-bindings/interrupt-controller/arm-gic.h> #include <dt-bindings/gpio/meson-gxbb-gpio.h> #include <dt-bindings/reset/amlogic,meson-gxbb-reset.h> +#include <dt-bindings/clock/gxbb-aoclkc.h> +#include <dt-bindings/reset/gxbb-aoclkc.h> / { compatible = "amlogic,meson-gxbb"; @@ -205,6 +207,13 @@ }; }; + clkc_AO: clock-controller@040 { + compatible = "amlogic,gxbb-aoclkc"; + reg = <0x0 0x00040 0x0 0x4>; + #clock-cells = <1>; + #reset-cells = <1>; + }; + uart_AO: serial@4c0 { compatible = "amlogic,meson-uart"; reg = <0x0 0x004c0 0x0 0x14>;
Add the AO clock controller node for the AmLogic GXBB SoC. Signed-off-by: Neil Armstrong <narmstrong@baylibre.com> --- arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi | 9 +++++++++ 1 file changed, 9 insertions(+)