Merge tag 'for_linus_stable' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso...

[cascardo/linux.git] / drivers / clk / tegra / clk.c

diff --git a/drivers/clk/tegra/clk.c b/drivers/clk/tegra/clk.c
index 9ddb754..41cd87c 100644 (file)
--- a/drivers/clk/tegra/clk.c
+++ b/drivers/clk/tegra/clk.c
@@ -30,6 +30,7 @@
 #define CLK_OUT_ENB_V                  0x360
 #define CLK_OUT_ENB_W                  0x364
 #define CLK_OUT_ENB_X                  0x280
+#define CLK_OUT_ENB_Y                  0x298
 #define CLK_OUT_ENB_SET_L              0x320
 #define CLK_OUT_ENB_CLR_L              0x324
 #define CLK_OUT_ENB_SET_H              0x328
@@ -42,6 +43,8 @@
 #define CLK_OUT_ENB_CLR_W              0x44c
 #define CLK_OUT_ENB_SET_X              0x284
 #define CLK_OUT_ENB_CLR_X              0x288
+#define CLK_OUT_ENB_SET_Y              0x29c
+#define CLK_OUT_ENB_CLR_Y              0x2a0
 
 #define RST_DEVICES_L                  0x004
 #define RST_DEVICES_H                  0x008
@@ -50,6 +53,7 @@
 #define RST_DEVICES_V                  0x358
 #define RST_DEVICES_W                  0x35C
 #define RST_DEVICES_X                  0x28C
+#define RST_DEVICES_Y                  0x2a4
 #define RST_DEVICES_SET_L              0x300
 #define RST_DEVICES_CLR_L              0x304
 #define RST_DEVICES_SET_H              0x308
@@ -62,6 +66,8 @@
 #define RST_DEVICES_CLR_W              0x43c
 #define RST_DEVICES_SET_X              0x290
 #define RST_DEVICES_CLR_X              0x294
+#define RST_DEVICES_SET_Y              0x2a8
+#define RST_DEVICES_CLR_Y              0x2ac
 
 /* Global data of Tegra CPU CAR ops */
 static struct tegra_cpu_car_ops dummy_car_ops;
@@ -122,6 +128,14 @@ static struct tegra_clk_periph_regs periph_regs[] = {
                .rst_set_reg = RST_DEVICES_SET_X,
                .rst_clr_reg = RST_DEVICES_CLR_X,
        },
+       [6] = {
+               .enb_reg = CLK_OUT_ENB_Y,
+               .enb_set_reg = CLK_OUT_ENB_SET_Y,
+               .enb_clr_reg = CLK_OUT_ENB_CLR_Y,
+               .rst_reg = RST_DEVICES_Y,
+               .rst_set_reg = RST_DEVICES_SET_Y,
+               .rst_clr_reg = RST_DEVICES_CLR_Y,
+       },
 };
 
 static void __iomem *clk_base;
@@ -272,7 +286,7 @@ void __init tegra_add_of_provider(struct device_node *np)
        of_clk_add_provider(np, of_clk_src_onecell_get, &clk_data);
 
        rst_ctlr.of_node = np;
-       rst_ctlr.nr_resets = clk_num * 32;
+       rst_ctlr.nr_resets = periph_banks * 32;
        reset_controller_register(&rst_ctlr);
 }