Merge git://git.samba.org/sfrench/cifs-2.6

[firefly-linux-kernel-4.4.55.git] / arch / arm / mach-tegra / tegra2_clocks.c

diff --git a/arch/arm/mach-tegra/tegra2_clocks.c b/arch/arm/mach-tegra/tegra2_clocks.c
index 0fe9b3ee294768b7c44efc90c6a012e18f5c15d9..371869d8ea01f1c63a4125dc8cccd0a3022b577d 100644 (file)
--- a/arch/arm/mach-tegra/tegra2_clocks.c
+++ b/arch/arm/mach-tegra/tegra2_clocks.c
@@ -166,13 +166,13 @@ static DEFINE_SPINLOCK(clock_register_lock);
 static int tegra_periph_clk_enable_refcount[3 * 32];
 
 #define clk_writel(value, reg) \
-       __raw_writel(value, (u32)reg_clk_base + (reg))
+       __raw_writel(value, reg_clk_base + (reg))
 #define clk_readl(reg) \
-       __raw_readl((u32)reg_clk_base + (reg))
+       __raw_readl(reg_clk_base + (reg))
 #define pmc_writel(value, reg) \
-       __raw_writel(value, (u32)reg_pmc_base + (reg))
+       __raw_writel(value, reg_pmc_base + (reg))
 #define pmc_readl(reg) \
-       __raw_readl((u32)reg_pmc_base + (reg))
+       __raw_readl(reg_pmc_base + (reg))
 
 unsigned long clk_measure_input_freq(void)
 {
@@ -918,7 +918,7 @@ static struct clk_ops tegra_pll_div_ops = {
 static void tegra2_periph_clk_init(struct clk *c)
 {
        u32 val = clk_readl(c->reg);
-       const struct clk_mux_sel *mux = 0;
+       const struct clk_mux_sel *mux = NULL;
        const struct clk_mux_sel *sel;
        if (c->flags & MUX) {
                for (sel = c->inputs; sel->input != NULL; sel++) {
@@ -1459,7 +1459,7 @@ static struct clk tegra_pll_s = {
 static struct clk_mux_sel tegra_clk_m_sel[] = {
        { .input = &tegra_clk_32k, .value = 0},
        { .input = &tegra_pll_s,  .value = 1},
-       { 0, 0},
+       { NULL , 0},
 };
 
 static struct clk tegra_clk_m = {
@@ -1861,7 +1861,7 @@ static const struct audio_sources {
        { .name = "ext_audio_clk1", .value = 6 },
        { .name = "ext_vimclk", .value = 7 },
 #endif
-       { 0, 0 }
+       { NULL, 0 }
 };
 
 static struct clk tegra_clk_audio = {
@@ -1885,7 +1885,7 @@ static struct clk tegra_clk_audio_2x = {
        },
 };
 
-struct clk_lookup tegra_audio_clk_lookups[] = {
+static struct clk_lookup tegra_audio_clk_lookups[] = {
        { .con_id = "audio", .clk = &tegra_clk_audio },
        { .con_id = "audio_2x", .clk = &tegra_clk_audio_2x }
 };
@@ -1926,7 +1926,7 @@ static struct clk_mux_sel mux_cclk[] = {
        { .input = &tegra_pll_p_out3,   .value = 6},
        { .input = &tegra_clk_d,        .value = 7},
        { .input = &tegra_pll_x,        .value = 8},
-       { 0, 0},
+       { NULL, 0},
 };
 
 static struct clk_mux_sel mux_sclk[] = {
@@ -1938,7 +1938,7 @@ static struct clk_mux_sel mux_sclk[] = {
        { .input = &tegra_clk_d,        .value = 5},
        { .input = &tegra_clk_32k,      .value = 6},
        { .input = &tegra_pll_m_out1,   .value = 7},
-       { 0, 0},
+       { NULL, 0},
 };
 
 static struct clk tegra_clk_cclk = {
@@ -2009,7 +2009,7 @@ static struct clk_mux_sel mux_pllm_pllc_pllp_plla[] = {
        { .input = &tegra_pll_c, .value = 1},
        { .input = &tegra_pll_p, .value = 2},
        { .input = &tegra_pll_a_out0, .value = 3},
-       { 0, 0},
+       { NULL, 0},
 };
 
 static struct clk_mux_sel mux_pllm_pllc_pllp_clkm[] = {
@@ -2017,7 +2017,7 @@ static struct clk_mux_sel mux_pllm_pllc_pllp_clkm[] = {
        { .input = &tegra_pll_c, .value = 1},
        { .input = &tegra_pll_p, .value = 2},
        { .input = &tegra_clk_m, .value = 3},
-       { 0, 0},
+       { NULL, 0},
 };
 
 static struct clk_mux_sel mux_pllp_pllc_pllm_clkm[] = {
@@ -2025,7 +2025,7 @@ static struct clk_mux_sel mux_pllp_pllc_pllm_clkm[] = {
        { .input = &tegra_pll_c, .value = 1},
        { .input = &tegra_pll_m, .value = 2},
        { .input = &tegra_clk_m, .value = 3},
-       { 0, 0},
+       { NULL, 0},
 };
 
 static struct clk_mux_sel mux_pllaout0_audio2x_pllp_clkm[] = {
@@ -2033,7 +2033,7 @@ static struct clk_mux_sel mux_pllaout0_audio2x_pllp_clkm[] = {
        {.input = &tegra_clk_audio_2x, .value = 1},
        {.input = &tegra_pll_p, .value = 2},
        {.input = &tegra_clk_m, .value = 3},
-       { 0, 0},
+       { NULL, 0},
 };
 
 static struct clk_mux_sel mux_pllp_plld_pllc_clkm[] = {
@@ -2041,7 +2041,7 @@ static struct clk_mux_sel mux_pllp_plld_pllc_clkm[] = {
        {.input = &tegra_pll_d_out0, .value = 1},
        {.input = &tegra_pll_c, .value = 2},
        {.input = &tegra_clk_m, .value = 3},
-       { 0, 0},
+       { NULL, 0},
 };
 
 static struct clk_mux_sel mux_pllp_pllc_audio_clkm_clk32[] = {
@@ -2050,39 +2050,39 @@ static struct clk_mux_sel mux_pllp_pllc_audio_clkm_clk32[] = {
        {.input = &tegra_clk_audio,     .value = 2},
        {.input = &tegra_clk_m,     .value = 3},
        {.input = &tegra_clk_32k,   .value = 4},
-       { 0, 0},
+       { NULL, 0},
 };
 
 static struct clk_mux_sel mux_pllp_pllc_pllm[] = {
        {.input = &tegra_pll_p,     .value = 0},
        {.input = &tegra_pll_c,     .value = 1},
        {.input = &tegra_pll_m,     .value = 2},
-       { 0, 0},
+       { NULL, 0},
 };
 
 static struct clk_mux_sel mux_clk_m[] = {
        { .input = &tegra_clk_m, .value = 0},
-       { 0, 0},
+       { NULL, 0},
 };
 
 static struct clk_mux_sel mux_pllp_out3[] = {
        { .input = &tegra_pll_p_out3, .value = 0},
-       { 0, 0},
+       { NULL, 0},
 };
 
 static struct clk_mux_sel mux_plld[] = {
        { .input = &tegra_pll_d, .value = 0},
-       { 0, 0},
+       { NULL, 0},
 };
 
 static struct clk_mux_sel mux_clk_32k[] = {
        { .input = &tegra_clk_32k, .value = 0},
-       { 0, 0},
+       { NULL, 0},
 };
 
 static struct clk_mux_sel mux_pclk[] = {
        { .input = &tegra_clk_pclk, .value = 0},
-       { 0, 0},
+       { NULL, 0},
 };
 
 static struct clk tegra_clk_emc = {
@@ -2125,7 +2125,7 @@ static struct clk tegra_clk_emc = {
                .parent = _parent,                      \
        }
 
-struct clk tegra_list_clks[] = {
+static struct clk tegra_list_clks[] = {
        PERIPH_CLK("apbdma",    "tegra-dma",            NULL,   34,     0,      108000000, mux_pclk,                    0),
        PERIPH_CLK("rtc",       "rtc-tegra",            NULL,   4,      0,      32768,     mux_clk_32k,                 PERIPH_NO_RESET),
        PERIPH_CLK("timer",     "timer",                NULL,   5,      0,      26000000,  mux_clk_m,                   0),
@@ -2221,7 +2221,7 @@ struct clk tegra_list_clks[] = {
  * configuration.  List those here to register them twice in the clock lookup
  * table under two names.
  */
-struct clk_duplicate tegra_clk_duplicates[] = {
+static struct clk_duplicate tegra_clk_duplicates[] = {
        CLK_DUPLICATE("uarta",  "tegra_uart.0", NULL),
        CLK_DUPLICATE("uartb",  "tegra_uart.1", NULL),
        CLK_DUPLICATE("uartc",  "tegra_uart.2", NULL),
@@ -2252,7 +2252,7 @@ struct clk_duplicate tegra_clk_duplicates[] = {
                .clk = ck,      \
        }
 
-struct clk *tegra_ptr_clks[] = {
+static struct clk *tegra_ptr_clks[] = {
        &tegra_clk_32k,
        &tegra_pll_s,
        &tegra_clk_m,