Merge git://git.denx.de/u-boot-spi

[u-boot] / arch / arm / cpu / armv7 / bcm235xx / clk-bcm235xx.c

diff --git a/arch/arm/cpu/armv7/bcm235xx/clk-bcm235xx.c b/arch/arm/cpu/armv7/bcm235xx/clk-bcm235xx.c
index ce3d0191253d5453c693a87ec9c26f583cd1bf2b..490bc4c491fad0761e985f2bd5eac4544a8630df 100644 (file)
--- a/arch/arm/cpu/armv7/bcm235xx/clk-bcm235xx.c
+++ b/arch/arm/cpu/armv7/bcm235xx/clk-bcm235xx.c
@@ -12,7 +12,7 @@
 
 #include <common.h>
 #include <asm/io.h>
-#include <asm/errno.h>
+#include <linux/errno.h>
 #include <asm/arch/sysmap.h>
 #include <asm/kona-common/clk.h>
 #include "clk-core.h"
@@ -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,