Commit 2839b1ef authored by Linus Walleij's avatar Linus Walleij Committed by Stephen Boyd

clk: gemini: hands off PCI OE bit

This bit is pin control, and needs to be carefully managed by the
new pin control driver.
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarStephen Boyd <sboyd@codeaurora.org>
parent 56d87776
...@@ -37,7 +37,6 @@ static DEFINE_SPINLOCK(gemini_clk_lock); ...@@ -37,7 +37,6 @@ static DEFINE_SPINLOCK(gemini_clk_lock);
#define GEMINI_GLOBAL_MISC_CONTROL 0x30 #define GEMINI_GLOBAL_MISC_CONTROL 0x30
#define PCI_CLK_66MHZ BIT(18) #define PCI_CLK_66MHZ BIT(18)
#define PCI_CLK_OE BIT(17)
#define GEMINI_GLOBAL_CLOCK_CONTROL 0x34 #define GEMINI_GLOBAL_CLOCK_CONTROL 0x34
#define PCI_CLKRUN_EN BIT(16) #define PCI_CLKRUN_EN BIT(16)
...@@ -159,9 +158,6 @@ static int gemini_pci_enable(struct clk_hw *hw) ...@@ -159,9 +158,6 @@ static int gemini_pci_enable(struct clk_hw *hw)
regmap_update_bits(pciclk->map, GEMINI_GLOBAL_CLOCK_CONTROL, regmap_update_bits(pciclk->map, GEMINI_GLOBAL_CLOCK_CONTROL,
0, PCI_CLKRUN_EN); 0, PCI_CLKRUN_EN);
regmap_update_bits(pciclk->map,
GEMINI_GLOBAL_MISC_CONTROL,
0, PCI_CLK_OE);
return 0; return 0;
} }
...@@ -169,9 +165,6 @@ static void gemini_pci_disable(struct clk_hw *hw) ...@@ -169,9 +165,6 @@ static void gemini_pci_disable(struct clk_hw *hw)
{ {
struct clk_gemini_pci *pciclk = to_pciclk(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, regmap_update_bits(pciclk->map, GEMINI_GLOBAL_CLOCK_CONTROL,
PCI_CLKRUN_EN, 0); PCI_CLKRUN_EN, 0);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment