linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
From: kernel@martin.sperl.org (kernel at martin.sperl.org)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v5 14/20] clk: bcm2835: added missing PLL clock divider
Date: Sun, 28 Feb 2016 15:37:05 +0000	[thread overview]
Message-ID: <1456673831-2408-15-git-send-email-kernel@martin.sperl.org> (raw)
In-Reply-To: <1456673831-2408-1-git-send-email-kernel@martin.sperl.org>

From: Martin Sperl <kernel@martin.sperl.org>

Added the missing pll clock divider definitions.

Signed-off-by: Martin Sperl <kernel@martin.sperl.org>
---
 drivers/clk/bcm/clk-bcm2835.c       |   50 +++++++++++++++++++++++++++++++++++
 include/dt-bindings/clock/bcm2835.h |    8 ++++++
 2 files changed, 58 insertions(+)

diff --git a/drivers/clk/bcm/clk-bcm2835.c b/drivers/clk/bcm/clk-bcm2835.c
index b67147b..ff02871 100644
--- a/drivers/clk/bcm/clk-bcm2835.c
+++ b/drivers/clk/bcm/clk-bcm2835.c
@@ -1470,6 +1470,22 @@ static const struct bcm2835_clk_desc clk_desc_array[] = {
 		.load_mask = CM_PLLA_LOADPER,
 		.hold_mask = CM_PLLA_HOLDPER,
 		.fixed_divider = 1),
+	[BCM2835_PLLA_DSI0]	= REGISTER_PLL_DIV(
+		.name = "plla_dsi0",
+		.source_pll = "plla",
+		.cm_reg = CM_PLLA,
+		.a2w_reg = A2W_PLLA_DSI0,
+		.load_mask = CM_PLLA_LOADDSI0,
+		.hold_mask = CM_PLLA_HOLDDSI0,
+		.fixed_divider = 1),
+	[BCM2835_PLLA_CCP2]	= REGISTER_PLL_DIV(
+		.name = "plla_ccp2",
+		.source_pll = "plla",
+		.cm_reg = CM_PLLA,
+		.a2w_reg = A2W_PLLA_DSI0,
+		.load_mask = CM_PLLA_LOADCCP2,
+		.hold_mask = CM_PLLA_HOLDCCP2,
+		.fixed_divider = 1),
 
 	/* PLLB is used for the ARM's clock. */
 	[BCM2835_PLLB]		= REGISTER_PLL(
@@ -1494,6 +1510,24 @@ static const struct bcm2835_clk_desc clk_desc_array[] = {
 		.load_mask = CM_PLLB_LOADARM,
 		.hold_mask = CM_PLLB_HOLDARM,
 		.fixed_divider = 1),
+	[BCM2835_PLLB_SP0]	= REGISTER_PLL_DIV(
+		.name = "pllb_sp0",
+		.source_pll = "pllb",
+		.cm_reg = CM_PLLB,
+		.a2w_reg = A2W_PLLB_SP0,
+		.fixed_divider = 1),
+	[BCM2835_PLLB_SP1]	= REGISTER_PLL_DIV(
+		.name = "pllb_sp1",
+		.source_pll = "pllb",
+		.cm_reg = CM_PLLB,
+		.a2w_reg = A2W_PLLB_SP1,
+		.fixed_divider = 1),
+	[BCM2835_PLLB_SP2]	= REGISTER_PLL_DIV(
+		.name = "pllb_sp2",
+		.source_pll = "pllb",
+		.cm_reg = CM_PLLB,
+		.a2w_reg = A2W_PLLB_SP2,
+		.fixed_divider = 1),
 
 	/*
 	 * PLLC is the core PLL, used to drive the core VPU clock.
@@ -1584,6 +1618,22 @@ static const struct bcm2835_clk_desc clk_desc_array[] = {
 		.load_mask = CM_PLLD_LOADPER,
 		.hold_mask = CM_PLLD_HOLDPER,
 		.fixed_divider = 1),
+	[BCM2835_PLLD_DSI0]	= REGISTER_PLL_DIV(
+		.name = "plld_dsi0",
+		.source_pll = "plld",
+		.cm_reg = CM_PLLD,
+		.a2w_reg = A2W_PLLD_DSI0,
+		.load_mask = CM_PLLD_LOADDSI0,
+		.hold_mask = CM_PLLD_HOLDDSI0,
+		.fixed_divider = 1),
+	[BCM2835_PLLD_DSI1]	= REGISTER_PLL_DIV(
+		.name = "plld_dsi1",
+		.source_pll = "plld",
+		.cm_reg = CM_PLLD,
+		.a2w_reg = A2W_PLLD_DSI1,
+		.load_mask = CM_PLLD_LOADDSI1,
+		.hold_mask = CM_PLLD_HOLDDSI1,
+		.fixed_divider = 1),
 
 	/*
 	 * PLLH is used to supply the pixel clock or the AUX clock for the
diff --git a/include/dt-bindings/clock/bcm2835.h b/include/dt-bindings/clock/bcm2835.h
index 9a7b4a5..9689812 100644
--- a/include/dt-bindings/clock/bcm2835.h
+++ b/include/dt-bindings/clock/bcm2835.h
@@ -45,3 +45,11 @@
 #define BCM2835_CLOCK_PERI_IMAGE	29
 #define BCM2835_CLOCK_PWM		30
 #define BCM2835_CLOCK_PCM		31
+
+#define BCM2835_PLLA_DSI0		32
+#define BCM2835_PLLA_CCP2		33
+#define BCM2835_PLLB_SP0		34
+#define BCM2835_PLLB_SP1		35
+#define BCM2835_PLLB_SP2		36
+#define BCM2835_PLLD_DSI0		37
+#define BCM2835_PLLD_DSI1		38
-- 
1.7.10.4

  parent reply	other threads:[~2016-02-28 15:37 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-02-28 15:36 [PATCH v5 00/20] add additional clocks and frac/mash support kernel at martin.sperl.org
2016-02-28 15:36 ` [PATCH v5 01/20] clk: bcm2835: pll_off should only set CM_PLL_ANARST kernel at martin.sperl.org
2016-02-28 17:58   ` Stefan Wahren
2016-02-28 15:36 ` [PATCH v5 02/20] clk: bcm2835: clean up coding style issues kernel at martin.sperl.org
2016-02-28 15:36 ` [PATCH v5 03/20] clk: bcm2835: add locking to pll*_on/off methods kernel at martin.sperl.org
2016-02-28 18:04   ` Stefan Wahren
2016-02-28 15:36 ` [PATCH v5 04/20] clk: bcm2835: remove uart0/1_pclk fixed clocks kernel at martin.sperl.org
2016-02-28 15:36 ` [PATCH v5 05/20] clk: bcm2835: enable clocks that have been enabled by firmware kernel at martin.sperl.org
2016-02-28 15:36 ` [PATCH v5 06/20] clk: bcm2835: remove use of BCM2835_CLOCK_COUNT in driver kernel at martin.sperl.org
2016-02-28 15:36 ` [PATCH v5 07/20] clk: bcm2835: reorganize bcm2835_clock_array assignment kernel at martin.sperl.org
2016-02-28 15:36 ` [PATCH v5 08/20] clk: bcm2835: add fractional support kernel at martin.sperl.org
2016-02-28 15:37 ` [PATCH v5 09/20] clk: bcm2835: enable management of PCM clock kernel at martin.sperl.org
2016-02-28 15:37 ` [PATCH v5 10/20] clk: bcm2835: implement correct clamping for mash clocks kernel at martin.sperl.org
2016-02-28 15:37 ` [PATCH v5 11/20] clk: bcm2835: divider value has to be 1 or more kernel at martin.sperl.org
2016-02-28 15:37 ` [PATCH v5 12/20] clk: bcm2835: expose raw clock-registers via debugfs kernel at martin.sperl.org
2016-02-28 15:37 ` [PATCH v5 13/20] clk: bcm2835: expose current divider, parent and mash " kernel at martin.sperl.org
2016-02-28 15:37 ` kernel at martin.sperl.org [this message]
2016-02-28 15:37 ` [PATCH v5 15/20] clk: bcm2835: add additional clocks kernel at martin.sperl.org
2016-02-28 15:37 ` [PATCH v5 16/20] clk: bcm2835: add the camera related clocks cam0, cam1 and ccp2 kernel at martin.sperl.org
2016-02-28 15:37 ` [PATCH v5 17/20] clk: bcm2835: add the dsi clocks kernel at martin.sperl.org
2016-02-28 15:37 ` [PATCH v5 18/20] clk: bcm2835: add arm clock kernel at martin.sperl.org
2016-02-28 15:37 ` [PATCH v5 19/20] clk: bcm2835: add gates that require PM_DEBUG to be set kernel at martin.sperl.org
2016-02-28 17:48 ` [PATCH v5 00/20] add additional clocks and frac/mash support Stefan Wahren

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1456673831-2408-15-git-send-email-kernel@martin.sperl.org \
    --to=kernel@martin.sperl.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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).