Re: [PATCH 1/3] Revert "Input: olpc_apsp - enable the SP clock"

2019-01-24 Thread Stephen Boyd 
Quoting Dmitry Torokhov (2019-01-23 14:05:45)
> On Mon, Jan 21, 2019 at 07:22:54AM +0100, Lubomir Rintel wrote:
> > Turns out this is not such a great idea. Once the SP clock is disabled,
> > it's not sufficient to just enable in order to bring the SP core back up.
> > 
> > It seems that the kernel has no business managing this clock. Just let
> > the firmware keep it enabled.
> > 
> > This reverts commit ed22cee91a88c47e564478b012fdbcb079653499.
> > 
> > Link: 
> > https://lore.kernel.org/lkml/154783267051.169631.3197836544646625...@swboyd.mtv.corp.google.com/
> > Signed-off-by: Lubomir Rintel 
> 
> OK, as clock folks say it is a bad idea it must be so. Merge though clk
> tree?
> 
> Acked-by: Dmitry Torokhov 
> 

Ok sure. I'll merge them through clk tree. I'll fast track it through
clk-fixes too.

Re: [PATCH 1/3] Revert "Input: olpc_apsp - enable the SP clock"

2019-01-24 Thread Stephen Boyd 
Quoting Lubomir Rintel (2019-01-20 22:22:54)
> Turns out this is not such a great idea. Once the SP clock is disabled,
> it's not sufficient to just enable in order to bring the SP core back up.
> 
> It seems that the kernel has no business managing this clock. Just let
> the firmware keep it enabled.
> 
> This reverts commit ed22cee91a88c47e564478b012fdbcb079653499.
> 
> Link: 
> https://lore.kernel.org/lkml/154783267051.169631.3197836544646625...@swboyd.mtv.corp.google.com/
> Signed-off-by: Lubomir Rintel 
> ---

Applied to clk-fixes

Re: [PATCH 1/3] Revert "Input: olpc_apsp - enable the SP clock"

2019-01-23 Thread Dmitry Torokhov 
On Mon, Jan 21, 2019 at 07:22:54AM +0100, Lubomir Rintel wrote:
> Turns out this is not such a great idea. Once the SP clock is disabled,
> it's not sufficient to just enable in order to bring the SP core back up.
> 
> It seems that the kernel has no business managing this clock. Just let
> the firmware keep it enabled.
> 
> This reverts commit ed22cee91a88c47e564478b012fdbcb079653499.
> 
> Link: 
> https://lore.kernel.org/lkml/154783267051.169631.3197836544646625...@swboyd.mtv.corp.google.com/
> Signed-off-by: Lubomir Rintel 

OK, as clock folks say it is a bad idea it must be so. Merge though clk
tree?

Acked-by: Dmitry Torokhov 

Thanks.

-- 
Dmitry

[PATCH 1/3] Revert "Input: olpc_apsp - enable the SP clock"

2019-01-20 Thread Lubomir Rintel 
Turns out this is not such a great idea. Once the SP clock is disabled,
it's not sufficient to just enable in order to bring the SP core back up.

It seems that the kernel has no business managing this clock. Just let
the firmware keep it enabled.

This reverts commit ed22cee91a88c47e564478b012fdbcb079653499.

Link: 
https://lore.kernel.org/lkml/154783267051.169631.3197836544646625...@swboyd.mtv.corp.google.com/
Signed-off-by: Lubomir Rintel 
---
 .../devicetree/bindings/serio/olpc,ap-sp.txt   |  4 
 drivers/input/serio/olpc_apsp.c| 14 --
 2 files changed, 18 deletions(-)

diff --git a/Documentation/devicetree/bindings/serio/olpc,ap-sp.txt 
b/Documentation/devicetree/bindings/serio/olpc,ap-sp.txt
index 36603419d6f8..0e72183f52bc 100644
--- a/Documentation/devicetree/bindings/serio/olpc,ap-sp.txt
+++ b/Documentation/devicetree/bindings/serio/olpc,ap-sp.txt
@@ -4,14 +4,10 @@ Required properties:
 - compatible : "olpc,ap-sp"
 - reg : base address and length of SoC's WTM registers
 - interrupts : SP-AP interrupt
-- clocks : phandle + clock-specifier for the clock that drives the WTM
-- clock-names:  should be "sp"
 
 Example:
ap-sp@d429 {
compatible = "olpc,ap-sp";
reg = <0xd429 0x1000>;
interrupts = <40>;
-   clocks = <_clocks MMP2_CLK_SP>;
-   clock-names = "sp";
}
diff --git a/drivers/input/serio/olpc_apsp.c b/drivers/input/serio/olpc_apsp.c
index bae08226e3d9..a7cfab3db9ee 100644
--- a/drivers/input/serio/olpc_apsp.c
+++ b/drivers/input/serio/olpc_apsp.c
@@ -23,7 +23,6 @@
 #include 
 #include 
 #include 
-#include 
 
 /*
  * The OLPC XO-1.75 and XO-4 laptops do not have a hardware PS/2 controller.
@@ -75,7 +74,6 @@ struct olpc_apsp {
struct serio *kbio;
struct serio *padio;
void __iomem *base;
-   struct clk *clk;
int open_count;
int irq;
 };
@@ -148,17 +146,11 @@ static int olpc_apsp_open(struct serio *port)
struct olpc_apsp *priv = port->port_data;
unsigned int tmp;
unsigned long l;
-   int error;
 
if (priv->open_count++ == 0) {
-   error = clk_prepare_enable(priv->clk);
-   if (error)
-   return error;
-
l = readl(priv->base + COMMAND_FIFO_STATUS);
if (!(l & CMD_STS_MASK)) {
dev_err(priv->dev, "SP cannot accept commands.\n");
-   clk_disable_unprepare(priv->clk);
return -EIO;
}
 
@@ -179,8 +171,6 @@ static void olpc_apsp_close(struct serio *port)
/* Disable interrupt 0 */
tmp = readl(priv->base + PJ_INTERRUPT_MASK);
writel(tmp | INT_0, priv->base + PJ_INTERRUPT_MASK);
-
-   clk_disable_unprepare(priv->clk);
}
 }
 
@@ -208,10 +198,6 @@ static int olpc_apsp_probe(struct platform_device *pdev)
if (priv->irq < 0)
return priv->irq;
 
-   priv->clk = devm_clk_get(>dev, "sp");
-   if (IS_ERR(priv->clk))
-   return PTR_ERR(priv->clk);
-
/* KEYBOARD */
kb_serio = kzalloc(sizeof(struct serio), GFP_KERNEL);
if (!kb_serio)
-- 
2.20.1