clk: ti: drop unnecessary MEMMAP_ADDRESSING flag

This has been superceded by the usage of ti_clk_ll_ops for now.

Signed-off-by: Tero Kristo <t-kristo@ti.com>
Acked-by: Tony Lindgren <tony@atomide.com>

diff --git a/drivers/clk/ti/apll.c b/drivers/clk/ti/apll.c
index 62b5db7b8fe9b581e0fbb86cb566c1b6f680736c..5cba28c6ab357d3ea0d28d6131aaceae8fb4cdd4 100644 (file)
--- a/drivers/clk/ti/apll.c
+++ b/drivers/clk/ti/apll.c
@@ -194,7 +194,6 @@ static void __init of_dra7_apll_setup(struct device_node *node)
 
        clk_hw->dpll_data = ad;
        clk_hw->hw.init = init;
-       clk_hw->flags = MEMMAP_ADDRESSING;
 
        init->name = node->name;
        init->ops = &apll_ck_ops;

diff --git a/drivers/clk/ti/dpll.c b/drivers/clk/ti/dpll.c
index 37624e16cf04d454eebfa9318ac2bace1779e1c1..c149bd169f4351bd78c01a7fefab3164015ac33f 100644 (file)
--- a/drivers/clk/ti/dpll.c
+++ b/drivers/clk/ti/dpll.c
@@ -248,7 +248,6 @@ struct clk *ti_clk_register_dpll(struct ti_clk *setup)
        clk_hw->dpll_data = dd;
        clk_hw->ops = &clkhwops_omap3_dpll;
        clk_hw->hw.init = &init;
-       clk_hw->flags = MEMMAP_ADDRESSING;
 
        init.name = setup->name;
        init.ops = ops;
@@ -380,7 +379,6 @@ static void __init of_ti_dpll_setup(struct device_node *node,
        clk_hw->dpll_data = dd;
        clk_hw->ops = &clkhwops_omap3_dpll;
        clk_hw->hw.init = init;
-       clk_hw->flags = MEMMAP_ADDRESSING;
 
        init->name = node->name;
        init->ops = ops;

diff --git a/drivers/clk/ti/gate.c b/drivers/clk/ti/gate.c
index b3291dbca5edaa62e78a4fc2c8df0fb3e0b60c2a..5ff62e2c63d05d9da3fe14d073250009ad171d5f 100644 (file)
--- a/drivers/clk/ti/gate.c
+++ b/drivers/clk/ti/gate.c
@@ -113,7 +113,7 @@ static struct clk *_register_gate(struct device *dev, const char *name,
        clk_hw->enable_bit = bit_idx;
        clk_hw->ops = hw_ops;
 
-       clk_hw->flags = MEMMAP_ADDRESSING | clk_gate_flags;
+       clk_hw->flags = clk_gate_flags;
 
        init.parent_names = &parent_name;
        init.num_parents = 1;
@@ -203,7 +203,6 @@ struct clk_hw *ti_clk_build_component_gate(struct ti_clk_gate *setup)
                ops = &clkhwops_iclk_wait;
 
        gate->ops = ops;
-       gate->flags = MEMMAP_ADDRESSING;
 
        return &gate->hw;
 }
@@ -269,7 +268,6 @@ _of_ti_composite_gate_clk_setup(struct device_node *node,
 
        gate->enable_bit = val;
        gate->ops = hw_ops;
-       gate->flags = MEMMAP_ADDRESSING;
 
        if (!ti_clk_add_component(node, &gate->hw, CLK_COMPONENT_TYPE_GATE))
                return;

diff --git a/drivers/clk/ti/interface.c b/drivers/clk/ti/interface.c
index 7927e1a2ba0272e3717f42102fddd06a48cb44db..42d9fd4f5f6aca5891e699d2c007aa68b30a6cd4 100644 (file)
--- a/drivers/clk/ti/interface.c
+++ b/drivers/clk/ti/interface.c
@@ -47,7 +47,6 @@ static struct clk *_register_interface(struct device *dev, const char *name,
 
        clk_hw->hw.init = &init;
        clk_hw->ops = ops;
-       clk_hw->flags = MEMMAP_ADDRESSING;
        clk_hw->enable_reg = reg;
        clk_hw->enable_bit = bit_idx;
 

diff --git a/include/linux/clk/ti.h b/include/linux/clk/ti.h
index 626ae94b7444f67ba3a1bce4bda6c974d64b9706..affdabd0b6a16f810f3b79dd487b783ed5c6a28a 100644 (file)
--- a/include/linux/clk/ti.h
+++ b/include/linux/clk/ti.h
@@ -168,7 +168,6 @@ struct clk_hw_omap {
  *     should be used.  This is a temporary solution - a better approach
  *     would be to associate clock type-specific data with the clock,
  *     similar to the struct dpll_data approach.
- * MEMMAP_ADDRESSING: Use memmap addressing to access clock registers.
  */
 #define ENABLE_REG_32BIT       (1 << 0)        /* Use 32-bit access */
 #define CLOCK_IDLE_CONTROL     (1 << 1)
@@ -176,7 +175,6 @@ struct clk_hw_omap {
 #define ENABLE_ON_INIT         (1 << 3)        /* Enable upon framework init */
 #define INVERT_ENABLE          (1 << 4)        /* 0 enables, 1 disables */
 #define CLOCK_CLKOUTX2         (1 << 5)
-#define MEMMAP_ADDRESSING      (1 << 6)
 
 /* CM_CLKEN_PLL*.EN* bit values - not all are available for every DPLL */
 #define DPLL_LOW_POWER_STOP    0x1