arm64: amlogic: support gxbb clock controller
Subsystems (5)
v2 cover arm64: amlogic: support gxbb clock controller
This series breaks out some clean-up patches and the changes to dts from v1 of the meson8b[0] and gxbb[1] clk driver series. This was done to make it easy for the AmLogic maintainers to take only these patches if they want. Additionally there is a shared, immutable branch with the gxbb clk driver if the amlogic maintainers wish to merge that into their tree:
git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git clk-s905
The only functional change was to nest the clock-controller node inside of the hiubus node, as suggested by Kevin.
[0] Link: lkml.kernel.org/g/1465518467-23939-1-git-send-email-mturquette at baylibre.com
[1] Link: lkml.kernel.org/g/1465518774-26924-1-git-send-email-mturquette at baylibre.com
Michael Turquette (3):
arm: meson: explicitly select clk drivers
arm64: amlogic: select gxbb clk driver
arm64: dts: gxbb clock controller
arch/arm/mach-meson/Kconfig | 3 +++ arch/arm64/Kconfig.platforms | 2 ++ arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi | 6 ++++++ 3 files changed, 11 insertions(+)
Signature · 1 line
2.1.4
PATCH v2 1/3 arm: meson: explicitly select clk drivers
The AmLogic clock controller code is used by both arm and arm64 architectures. Explicitly select the core code for all Meson (32-bit arm) builds, and also select the Meson8b driver when that machine is built.
---
No changes in v2
arch/arm/mach-meson/Kconfig | 3 +++ 1 file changed, 3 insertions(+)
arch/arm/mach-meson/Kconfig +3 -0
@@ -7,6 +7,8 @@ menuconfig ARCH_MESON select CACHE_L2X0 select PINCTRL select PINCTRL_MESON + select COMMON_CLK + select COMMON_CLK_AMLOGIC if ARCH_MESON
@@ -24,5 +26,6 @@ config MACH_MESON8B bool "Amlogic Meson8b SoCs support" default ARCH_MESON select MESON6_TIMER + select COMMON_CLK_MESON8B endif
Signature · 1 line
2.1.4
PATCH v2 2/3 arm64: amlogic: select gxbb clk driver
In reply to Michael TurquetteThe AmLogic clock controller code is used by both arm and arm64 architectures. Explicitly select the core code for all Meson (arm64) builds, and also select the GXBB driver, since that's the way arm64 does things.
---
No changes in v2
arch/arm64/Kconfig.platforms | 2 ++ 1 file changed, 2 insertions(+)
arch/arm64/Kconfig.platforms +2 -0
@@ -68,6 +68,8 @@ config ARCH_MESON bool "Amlogic Platforms" select PINCTRL select PINCTRL_MESON + select COMMON_CLK_AMLOGIC + select COMMON_CLK_GXBB help This enables support for the Amlogic S905 SoCs.
Signature · 1 line
2.1.4
PATCH v2 3/3 arm64: dts: gxbb clock controller
In reply to Michael TurquetteAdd the clock controller node for the AmLogic GXBB machine.
---
Changed in v2:
* nest the clock-controller node inside the hiubus node; suggested by Kevin Hilman
arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi | 6 ++++++ 1 file changed, 6 insertions(+)
arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi +6 -0
@@ -315,6 +315,12 @@ #address-cells = <2>; #size-cells = <2>; ranges = <0x0 0x0 0x0 0xc883c000 0x0 0x2000>; + + clkc: clock-controller at 0 { + compatible = "amlogic,gxbb-clkc"; + #clock-cells = <1>; + reg = <0x0 0x0 0x0 0x3db>; + }; }; apb: apb at d0000000 {
Signature · 1 line
2.1.4
Kevin Hilman
maintainerv2 cover arm64: amlogic: support gxbb clock controller
In reply to Michael TurquetteQuoted 6 lines · Michael Turquette
This series breaks out some clean-up patches and the changes to dts from v1 of the meson8b[0] and gxbb[1] clk driver series. This was done to make it easy for the AmLogic maintainers to take only these patches if they want. Additionally there is a shared, immutable branch with the gxbb clk driver if the amlogic maintainers wish to merge that into their tree:
Thanks for splitting these out. I've applied the first to to the 'soc' branch and the 3rd to the 'dt64' branch of the amlogic tree.
Quoted 1 line
git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.gitclk-s905
I assume you plan to merge this merged for v4.8?
Kevin
Quoted 15 lines
The only functional change was to nest the clock-controller node inside of the hiubus node, as suggested by Kevin.
[0] Link: lkml.kernel.org/g/1465518467-23939-1-git-send-email-mturquette at baylibre.com
[1] Link: lkml.kernel.org/g/1465518774-26924-1-git-send-email-mturquette at baylibre.comMichael Turquette (3):
arm: meson: explicitly select clk drivers
arm64: amlogic: select gxbb clk driver
arm64: dts: gxbb clock controllerarch/arm/mach-meson/Kconfig | 3 +++ arch/arm64/Kconfig.platforms | 2 ++ arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi | 6 ++++++ 3 files changed, 11 insertions(+)
v2 cover arm64: amlogic: support gxbb clock controller
Quoting Kevin Hilman (2016-06-23 16:05:49)
Quoted 9 lines
Quoted 6 lines · Michael Turquette
This series breaks out some clean-up patches and the changes to dts from v1 of the meson8b[0] and gxbb[1] clk driver series. This was done to make it easy for the AmLogic maintainers to take only these patches if they want. Additionally there is a shared, immutable branch with the gxbb clk driver if the amlogic maintainers wish to merge that into their tree:
Quoted 6 lines
Thanks for splitting these out. I've applied the first to to the 'soc' branch and the 3rd to the 'dt64' branch of the amlogic tree.
Quoted 1 line
git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.gitclk-s905I assume you plan to merge this merged for v4.8?
I've just applied it to clk-next.
Regards,
Mike
Quoted 18 lines
Kevin
Quoted 15 lines
The only functional change was to nest the clock-controller node inside of the hiubus node, as suggested by Kevin.
[0] Link: lkml.kernel.org/g/1465518467-23939-1-git-send-email-mturquette at baylibre.com
[1] Link: lkml.kernel.org/g/1465518774-26924-1-git-send-email-mturquette at baylibre.comMichael Turquette (3):
arm: meson: explicitly select clk drivers
arm64: amlogic: select gxbb clk driver
arm64: dts: gxbb clock controllerarch/arm/mach-meson/Kconfig | 3 +++ arch/arm64/Kconfig.platforms | 2 ++ arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi | 6 ++++++ 3 files changed, 11 insertions(+)