Skip to contentSkip to conversation

clk: bcm: Allow CLK_BCM2835 for ARCH_BRCMSTB

PATCH Applied Florian Fainelli 3 participants 6 messages May 9, 2019 – Jun 6, 2019 Common clk

lore
Share & tools
lore
#0 lore raw

cover clk: bcm: Allow CLK_BCM2835 for ARCH_BRCMSTB

Hi Stephen,

This small patch series allows making use of the CLK_BCM2835 driver(s) on ARCH_BRCMSTB since we have newer chips that make use of the CPRMAN block that this driver supports.

Thanks!

Florian Fainelli (2):
clk: bcm: Make BCM2835 clock drivers selectable
clk: bcm: Allow CLK_BCM2835 for ARCH_BRCMSTB

 drivers/clk/bcm/Kconfig  | 9 +++++++++
 drivers/clk/bcm/Makefile | 4 ++--
 2 files changed, 11 insertions(+), 2 deletions(-)
Signature · 1 line
2.17.1
#1 lore raw

PATCH 1/2 clk: bcm: Make BCM2835 clock drivers selectable

Make the BCM2835 clock driver selectable by other architectures/platforms. ARCH_BRCMSTB will be selecting that driver in the next commit since new chips like 7211 use the same CPRMAN clock controller that this driver supports.

---
 drivers/clk/bcm/Kconfig  | 9 +++++++++
 drivers/clk/bcm/Makefile | 4 ++--
 2 files changed, 11 insertions(+), 2 deletions(-)
drivers/clk/bcm/Kconfig +9 -0
index 4c4bd85f707c..0b873e23f128 100644
@@ -1,3 +1,12 @@
+config CLK_BCM2835
+	bool "Broadcom BCM2835 clock support"
+	depends on ARCH_BCM2835 || COMPILE_TEST
+	depends on COMMON_CLK
+	default ARCH_BCM2835
+	help
+	  Enable common clock framework support for Broadcom BCM2835
+	  SoCs.
+
 config CLK_BCM_63XX
 	bool "Broadcom BCM63xx clock support"
 	depends on ARCH_BCM_63XX || COMPILE_TEST
drivers/clk/bcm/Makefile +2 -2
index 002661d39128..e924f25bc6c8 100644
@@ -5,8 +5,8 @@ obj-$(CONFIG_CLK_BCM_KONA)	+= clk-kona-setup.o
 obj-$(CONFIG_CLK_BCM_KONA)	+= clk-bcm281xx.o
 obj-$(CONFIG_CLK_BCM_KONA)	+= clk-bcm21664.o
 obj-$(CONFIG_COMMON_CLK_IPROC)	+= clk-iproc-armpll.o clk-iproc-pll.o clk-iproc-asiu.o
-obj-$(CONFIG_ARCH_BCM2835)	+= clk-bcm2835.o
-obj-$(CONFIG_ARCH_BCM2835)	+= clk-bcm2835-aux.o
+obj-$(CONFIG_CLK_BCM2835)	+= clk-bcm2835.o
+obj-$(CONFIG_CLK_BCM2835)	+= clk-bcm2835-aux.o
 obj-$(CONFIG_ARCH_BCM_53573)	+= clk-bcm53573-ilp.o
 obj-$(CONFIG_CLK_BCM_CYGNUS)	+= clk-cygnus.o
 obj-$(CONFIG_CLK_BCM_HR2)	+= clk-hr2.o
Signature · 1 line
2.17.1
Reviewed-by on v1 1/2
#2 lore raw

Re: [PATCH 1/2] clk: bcm: Make BCM2835 clock drivers selectable

Quoted 4 lines · Florian Fainelli

Make the BCM2835 clock driver selectable by other architectures/platforms. ARCH_BRCMSTB will be selecting that driver in the next commit since new chips like 7211 use the same CPRMAN clock controller that this driver supports.

These two are:

maintainer
#3 lore raw

Re: [PATCH 1/2] clk: bcm: Make BCM2835 clock drivers selectable

In reply to Florian Fainelli

Quoting Florian Fainelli (2019-05-09 13:29:55)

Quoted 16 lines

Make the BCM2835 clock driver selectable by other architectures/platforms. ARCH_BRCMSTB will be selecting that driver in the next commit since new chips like 7211 use the same CPRMAN clock controller that this driver supports.

---
 drivers/clk/bcm/Kconfig  | 9 +++++++++
 drivers/clk/bcm/Makefile | 4 ++--
 2 files changed, 11 insertions(+), 2 deletions(-)
drivers/clk/bcm/Kconfig +0 -0
index 4c4bd85f707c..0b873e23f128 100644

drivers/clk/bcm/Kconfig line 4

Quoted 4 lines
drivers/clk/bcm/Kconfig +4 -0
@@ -1,3 +1,12 @@
+config CLK_BCM2835
+       bool "Broadcom BCM2835 clock support"
+       depends on ARCH_BCM2835 || COMPILE_TEST
+       depends on COMMON_CLK

This whole thing is inside the COMMON_CLK menu so this line probably doesn't matter. Anyway, I'm just going to apply this to clk-next.

Quoted 4 lines
drivers/clk/bcm/Kconfig +4 -0
+       default ARCH_BCM2835
+       help
+         Enable common clock framework support for Broadcom BCM2835
+         SoCs.
#4 lore raw

PATCH 2/2 clk: bcm: Allow CLK_BCM2835 for ARCH_BRCMSTB

In reply to Florian Fainelli

ARCH_BRCMSTB needs to use the BCM2835 clock driver for chips like BCM7211 which adopted that clock controller, make that possible and the driver default to be enabled for ARCH_BRCMSTB.

---
 drivers/clk/bcm/Kconfig | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/clk/bcm/Kconfig +2 -2
index 0b873e23f128..0eb281d597fc 100644
@@ -1,8 +1,8 @@
 config CLK_BCM2835
 	bool "Broadcom BCM2835 clock support"
-	depends on ARCH_BCM2835 || COMPILE_TEST
+	depends on ARCH_BCM2835 || ARCH_BRCMSTB || COMPILE_TEST
 	depends on COMMON_CLK
-	default ARCH_BCM2835
+	default ARCH_BCM2835 || ARCH_BRCMSTB
 	help
 	  Enable common clock framework support for Broadcom BCM2835
 	  SoCs.
Signature · 1 line
2.17.1
maintainer Applied
#5 lore raw

Quoting Florian Fainelli (2019-05-09 13:29:56)

Quoted 6 lines

ARCH_BRCMSTB needs to use the BCM2835 clock driver for chips like BCM7211 which adopted that clock controller, make that possible and the driver default to be enabled for ARCH_BRCMSTB.

---

Applied to clk-next