diff mbox

[U-Boot,3/4] arm: bcm235xx: fix kps ccu

Message ID 1466552587-9953-4-git-send-email-srae@broadcom.com
State Accepted
Commit 77a1a677a6db02377921cda1a146d18efb1f31ec
Delegated to: Tom Rini
Headers show

Commit Message

Steve Rae June 21, 2016, 11:43 p.m. UTC
From: Chris Brand <chris.brand@broadcom.com>

The Kona Peripheral Slave CCU has 4 policy mask registers, not 8.

Signed-off-by: Chris Brand <chris.brand@broadcom.com>
Signed-off-by: Steve Rae <srae@broadcom.com>
---

 arch/arm/cpu/armv7/bcm235xx/clk-bcm235xx.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

Comments

Tom Rini June 25, 2016, 2:53 a.m. UTC | #1
On Tue, Jun 21, 2016 at 04:43:06PM -0700, Steve Rae wrote:

> From: Chris Brand <chris.brand@broadcom.com>
> 
> The Kona Peripheral Slave CCU has 4 policy mask registers, not 8.
> 
> Signed-off-by: Chris Brand <chris.brand@broadcom.com>
> Signed-off-by: Steve Rae <srae@broadcom.com>

Applied to u-boot/master, thanks!
diff mbox

Patch

diff --git a/arch/arm/cpu/armv7/bcm235xx/clk-bcm235xx.c b/arch/arm/cpu/armv7/bcm235xx/clk-bcm235xx.c
index ce3d019..80187e3 100644
--- a/arch/arm/cpu/armv7/bcm235xx/clk-bcm235xx.c
+++ b/arch/arm/cpu/armv7/bcm235xx/clk-bcm235xx.c
@@ -292,7 +292,7 @@  static struct ccu_clock kps_ccu_clk = {
 		.ops = &ccu_clk_ops,
 		.ccu_clk_mgr_base = KONA_SLV_CLK_BASE_ADDR,
 	},
-	.num_policy_masks = 2,
+	.num_policy_masks = 1,
 	.policy_freq_offset = 0x00000008,
 	.freq_bit_shift = 8,
 	.policy_ctl_offset = 0x0000000c,
@@ -300,10 +300,6 @@  static struct ccu_clock kps_ccu_clk = {
 	.policy1_mask_offset = 0x00000014,
 	.policy2_mask_offset = 0x00000018,
 	.policy3_mask_offset = 0x0000001c,
-	.policy0_mask2_offset = 0x00000048,
-	.policy1_mask2_offset = 0x0000004c,
-	.policy2_mask2_offset = 0x00000050,
-	.policy3_mask2_offset = 0x00000054,
 	.lvm_en_offset = 0x00000034,
 	.freq_id = 2,
 	.freq_tbl = slave_axi_freq_tbl,