OSDN Git Service

clk: gemini: hands off PCI OE bit
authorLinus Walleij <linus.walleij@linaro.org>
Tue, 8 Aug 2017 19:08:18 +0000 (21:08 +0200)
committerStephen Boyd <sboyd@codeaurora.org>
Thu, 31 Aug 2017 05:29:11 +0000 (22:29 -0700)
This bit is pin control, and needs to be carefully managed by the
new pin control driver.

Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
drivers/clk/clk-gemini.c

index b4cf2f6..f940e5a 100644 (file)
@@ -37,7 +37,6 @@ static DEFINE_SPINLOCK(gemini_clk_lock);
 
 #define GEMINI_GLOBAL_MISC_CONTROL     0x30
 #define PCI_CLK_66MHZ                  BIT(18)
-#define PCI_CLK_OE                     BIT(17)
 
 #define GEMINI_GLOBAL_CLOCK_CONTROL    0x34
 #define PCI_CLKRUN_EN                  BIT(16)
@@ -159,9 +158,6 @@ static int gemini_pci_enable(struct clk_hw *hw)
 
        regmap_update_bits(pciclk->map, GEMINI_GLOBAL_CLOCK_CONTROL,
                           0, PCI_CLKRUN_EN);
-       regmap_update_bits(pciclk->map,
-                          GEMINI_GLOBAL_MISC_CONTROL,
-                          0, PCI_CLK_OE);
        return 0;
 }
 
@@ -169,9 +165,6 @@ static void gemini_pci_disable(struct clk_hw *hw)
 {
        struct clk_gemini_pci *pciclk = to_pciclk(hw);
 
-       regmap_update_bits(pciclk->map,
-                          GEMINI_GLOBAL_MISC_CONTROL,
-                          PCI_CLK_OE, 0);
        regmap_update_bits(pciclk->map, GEMINI_GLOBAL_CLOCK_CONTROL,
                           PCI_CLKRUN_EN, 0);
 }