Skip to contentSkip to conversation

clk: gemini: hands off PCI OE bit

PATCH New Linus Walleij 2 participants 6 messages Aug 8, 2017 – Aug 31, 2017 Common clk

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 clk: gemini: hands off PCI OE bit

This bit is pin control, and needs to be carefully managed by the new pin control driver.

---
 drivers/clk/clk-gemini.c | 7 -------
 1 file changed, 7 deletions(-)
drivers/clk/clk-gemini.c +0 -7
index b4cf2f699a21..f940e5af845b 100644
@@ -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);
 }
Signature · 1 line
2.9.4
#1 lore raw

PATCH 1/1 clk: gemini: hands off PCI OE bit

Quoted 4 lines · Linus Walleij

This bit is pin control, and needs to be carefully managed by the new pin control driver.

Fixes tag?

Does this need to be merged now as a critical fix? Or we can wait on it for next release?

Signature · 2 lines
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum,
a Linux Foundation Collaborative Project
#2 lore raw

PATCH 1/1 clk: gemini: hands off PCI OE bit

Quoted 7 lines · Stephen Boyd
Quoted 4 lines · Linus Walleij

This bit is pin control, and needs to be carefully managed by the new pin control driver.

Fixes tag?

It's not a fix, it'd just that we move the responsibility of managing the pin from the clock driver to the pin control driver.

I initially thought the Gemini would not need a separate pin control driver because it was "simple" ... so these bits could be handled here and there among the peripherals. Little did I know. Mea culpa.

Quoted 2 lines

Does this need to be merged now as a critical fix? Or we can wait on it for next release?

Just put it in for the next release, thanks!

Yours,
Linus Walleij

#3 lore raw

PATCH 1/1 clk: gemini: hands off PCI OE bit

Quoted 12 lines · Linus Walleij
Quoted 7 lines · Stephen Boyd
Quoted 4 lines · Linus Walleij

This bit is pin control, and needs to be carefully managed by the new pin control driver.

Fixes tag?

It's not a fix, it'd just that we move the responsibility of managing the pin from the clock driver to the pin control driver.

Quoted 9 lines

I initially thought the Gemini would not need a separate pin control driver because it was "simple" ... so these bits could be handled here and there among the peripherals. Little did I know. Mea culpa.

Quoted 2 lines

Does this need to be merged now as a critical fix? Or we can wait on it for next release?

Just put it in for the next release, thanks!

Alright. Thanks!

Signature · 2 lines
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum,
a Linux Foundation Collaborative Project
#4 lore raw

PATCH 1/1 clk: gemini: hands off PCI OE bit

Quoted 17 lines · Stephen Boyd
Quoted 16 lines · Linus Walleij
Quoted 7 lines · Stephen Boyd
Quoted 4 lines · Linus Walleij

This bit is pin control, and needs to be carefully managed by the new pin control driver.

Fixes tag?

It's not a fix, it'd just that we move the responsibility of managing the pin from the clock driver to the pin control driver.

I initially thought the Gemini would not need a separate pin control driver because it was "simple" ... so these bits could be handled here and there among the peripherals. Little did I know. Mea culpa.

Quoted 7 lines
Quoted 5 lines
Quoted 2 lines

Does this need to be merged now as a critical fix? Or we can wait on it for next release?

Just put it in for the next release, thanks!

Alright. Thanks!

Stephen are you queueing this patch?

Or someone else from the clk group?

Yours,
Linus Walleij

Applied
#5 lore raw

PATCH 1/1 clk: gemini: hands off PCI OE bit

In reply to Linus Walleij
Quoted 5 lines · Linus Walleij

This bit is pin control, and needs to be carefully managed by the new pin control driver.

---

Applied to clk-next

Signature · 2 lines
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum,
a Linux Foundation Collaborative Project