* [PATCH v2 0/3] arm64: amlogic: support gxbb clock controller
@ 2016-06-23 2:12 Michael Turquette
2016-06-23 2:12 ` [PATCH v2 1/3] arm: meson: explicitly select clk drivers Michael Turquette
` (3 more replies)
0 siblings, 4 replies; 6+ messages in thread
From: Michael Turquette @ 2016-06-23 2:12 UTC (permalink / raw)
To: linus-amlogic
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(+)
--
2.1.4
^ permalink raw reply [flat|nested] 6+ messages in thread* [PATCH v2 1/3] arm: meson: explicitly select clk drivers
2016-06-23 2:12 [PATCH v2 0/3] arm64: amlogic: support gxbb clock controller Michael Turquette
@ 2016-06-23 2:12 ` Michael Turquette
2016-06-23 2:12 ` [PATCH v2 2/3] arm64: amlogic: select gxbb clk driver Michael Turquette
` (2 subsequent siblings)
3 siblings, 0 replies; 6+ messages in thread
From: Michael Turquette @ 2016-06-23 2:12 UTC (permalink / raw)
To: linus-amlogic
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.
Signed-off-by: Michael Turquette <mturquette@baylibre.com>
---
No changes in v2
arch/arm/mach-meson/Kconfig | 3 +++
1 file changed, 3 insertions(+)
diff --git a/arch/arm/mach-meson/Kconfig b/arch/arm/mach-meson/Kconfig
index 31bdd91098b6..c689219501e0 100644
--- a/arch/arm/mach-meson/Kconfig
+++ b/arch/arm/mach-meson/Kconfig
@@ -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
--
2.1.4
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH v2 2/3] arm64: amlogic: select gxbb clk driver
2016-06-23 2:12 [PATCH v2 0/3] arm64: amlogic: support gxbb clock controller Michael Turquette
2016-06-23 2:12 ` [PATCH v2 1/3] arm: meson: explicitly select clk drivers Michael Turquette
@ 2016-06-23 2:12 ` Michael Turquette
2016-06-23 2:12 ` [PATCH v2 3/3] arm64: dts: gxbb clock controller Michael Turquette
2016-06-23 23:05 ` [PATCH v2 0/3] arm64: amlogic: support " Kevin Hilman
3 siblings, 0 replies; 6+ messages in thread
From: Michael Turquette @ 2016-06-23 2:12 UTC (permalink / raw)
To: linus-amlogic
The 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.
Signed-off-by: Michael Turquette <mturquette@baylibre.com>
---
No changes in v2
arch/arm64/Kconfig.platforms | 2 ++
1 file changed, 2 insertions(+)
diff --git a/arch/arm64/Kconfig.platforms b/arch/arm64/Kconfig.platforms
index 26c56177382c..fd7d9b51afb4 100644
--- a/arch/arm64/Kconfig.platforms
+++ b/arch/arm64/Kconfig.platforms
@@ -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.
--
2.1.4
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH v2 3/3] arm64: dts: gxbb clock controller
2016-06-23 2:12 [PATCH v2 0/3] arm64: amlogic: support gxbb clock controller Michael Turquette
2016-06-23 2:12 ` [PATCH v2 1/3] arm: meson: explicitly select clk drivers Michael Turquette
2016-06-23 2:12 ` [PATCH v2 2/3] arm64: amlogic: select gxbb clk driver Michael Turquette
@ 2016-06-23 2:12 ` Michael Turquette
2016-06-23 23:05 ` [PATCH v2 0/3] arm64: amlogic: support " Kevin Hilman
3 siblings, 0 replies; 6+ messages in thread
From: Michael Turquette @ 2016-06-23 2:12 UTC (permalink / raw)
To: linus-amlogic
Add the clock controller node for the AmLogic GXBB machine.
Signed-off-by: Michael Turquette <mturquette@baylibre.com>
---
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(+)
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi
index 806b90392402..e502c24b0ac7 100644
--- a/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi
@@ -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 {
--
2.1.4
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH v2 0/3] arm64: amlogic: support gxbb clock controller
2016-06-23 2:12 [PATCH v2 0/3] arm64: amlogic: support gxbb clock controller Michael Turquette
` (2 preceding siblings ...)
2016-06-23 2:12 ` [PATCH v2 3/3] arm64: dts: gxbb clock controller Michael Turquette
@ 2016-06-23 23:05 ` Kevin Hilman
2016-06-24 4:40 ` Michael Turquette
3 siblings, 1 reply; 6+ messages in thread
From: Kevin Hilman @ 2016-06-23 23:05 UTC (permalink / raw)
To: linus-amlogic
Michael Turquette <mturquette@baylibre.com> writes:
> 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.
> git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git clk-s905
I assume you plan to merge this merged for v4.8?
Kevin
> 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(+)
^ permalink raw reply [flat|nested] 6+ messages in thread* [PATCH v2 0/3] arm64: amlogic: support gxbb clock controller
2016-06-23 23:05 ` [PATCH v2 0/3] arm64: amlogic: support " Kevin Hilman
@ 2016-06-24 4:40 ` Michael Turquette
0 siblings, 0 replies; 6+ messages in thread
From: Michael Turquette @ 2016-06-24 4:40 UTC (permalink / raw)
To: linus-amlogic
Quoting Kevin Hilman (2016-06-23 16:05:49)
> Michael Turquette <mturquette@baylibre.com> writes:
>
> > 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.
>
> > git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git clk-s905
>
> I assume you plan to merge this merged for v4.8?
I've just applied it to clk-next.
Regards,
Mike
>
> Kevin
>
> > 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(+)
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2016-06-24 4:40 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-06-23 2:12 [PATCH v2 0/3] arm64: amlogic: support gxbb clock controller Michael Turquette
2016-06-23 2:12 ` [PATCH v2 1/3] arm: meson: explicitly select clk drivers Michael Turquette
2016-06-23 2:12 ` [PATCH v2 2/3] arm64: amlogic: select gxbb clk driver Michael Turquette
2016-06-23 2:12 ` [PATCH v2 3/3] arm64: dts: gxbb clock controller Michael Turquette
2016-06-23 23:05 ` [PATCH v2 0/3] arm64: amlogic: support " Kevin Hilman
2016-06-24 4:40 ` Michael Turquette
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).