diff mbox

[v7,2/4] Power: Reset: Generalize qnap-poweroff to work on Synology devices.

Message ID 1392840157-31072-3-git-send-email-klightspeed@killerwolves.net (mailing list archive)
State New, archived
Headers show

Commit Message

Ben Peddell Feb. 19, 2014, 8:02 p.m. UTC 
From: Andrew Lunn <andrew@lunn.ch>

The Synology NAS devices use a very similar mechanism to QNAP NAS
devices to power off. Both send a single charactor command to a PIC,
over the second serial port. However the baud rate and the command
differ. Generalize the driver to support this.

Signed-off-by: Ben Peddell <klightspeed@killerwolves.net>
Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Acked-by: Jason Cooper <jason@lakedaemon.net>
Cc: Anton Vorontsov <anton@enomsg.org>
Cc: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Cc: David Woodhouse <dwmw2@infradead.org>
---
 .../bindings/power_supply/qnap-poweroff.txt        |  5 ++-
 drivers/power/reset/qnap-poweroff.c                | 49 ++++++++++++++++------
 2 files changed, 41 insertions(+), 13 deletions(-)

Comments

Jason Cooper Feb. 22, 2014, 1:39 a.m. UTC | #1 
Dmitry, David,

On Thu, Feb 20, 2014 at 06:02:35AM +1000, klightspeed@killerwolves.net wrote:
> From: Andrew Lunn <andrew@lunn.ch>
> 
> The Synology NAS devices use a very similar mechanism to QNAP NAS
> devices to power off. Both send a single charactor command to a PIC,
> over the second serial port. However the baud rate and the command
> differ. Generalize the driver to support this.
> 
> Signed-off-by: Ben Peddell <klightspeed@killerwolves.net>
> Signed-off-by: Andrew Lunn <andrew@lunn.ch>
> Acked-by: Jason Cooper <jason@lakedaemon.net>
> Cc: Anton Vorontsov <anton@enomsg.org>
> Cc: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
> Cc: David Woodhouse <dwmw2@infradead.org>
> ---
>  .../bindings/power_supply/qnap-poweroff.txt        |  5 ++-
>  drivers/power/reset/qnap-poweroff.c                | 49 ++++++++++++++++------
>  2 files changed, 41 insertions(+), 13 deletions(-)

Do you guys want to take this, or me?  I'm fine either way, there's no
dependencies.

thx,

Jason.

> diff --git a/Documentation/devicetree/bindings/power_supply/qnap-poweroff.txt b/Documentation/devicetree/bindings/power_supply/qnap-poweroff.txt
> index 0347d83..af25e77 100644
> --- a/Documentation/devicetree/bindings/power_supply/qnap-poweroff.txt
> +++ b/Documentation/devicetree/bindings/power_supply/qnap-poweroff.txt
> @@ -6,8 +6,11 @@ Orion5x SoCs. Sending the character 'A', at 19200 baud, tells the
>  microcontroller to turn the power off. This driver adds a handler to
>  pm_power_off which is called to turn the power off.
>  
> +Synology NAS devices use a similar scheme, but a different baud rate,
> +9600, and a different character, '1'.
> +
>  Required Properties:
> -- compatible: Should be "qnap,power-off"
> +- compatible: Should be "qnap,power-off" or "synology,power-off"
>  
>  - reg: Address and length of the register set for UART1
>  - clocks: tclk clock
> diff --git a/drivers/power/reset/qnap-poweroff.c b/drivers/power/reset/qnap-poweroff.c
> index 37f56f7..a75db7f 100644
> --- a/drivers/power/reset/qnap-poweroff.c
> +++ b/drivers/power/reset/qnap-poweroff.c
> @@ -1,5 +1,5 @@
>  /*
> - * QNAP Turbo NAS Board power off
> + * QNAP Turbo NAS Board power off. Can also be used on Synology devices.
>   *
>   * Copyright (C) 2012 Andrew Lunn <andrew@lunn.ch>
>   *
> @@ -25,17 +25,43 @@
>  
>  #define UART1_REG(x)	(base + ((UART_##x) << 2))
>  
> +struct power_off_cfg {
> +	u32 baud;
> +	char cmd;
> +};
> +
> +static const struct power_off_cfg qnap_power_off_cfg = {
> +	.baud = 19200,
> +	.cmd = 'A',
> +};
> +
> +static const struct power_off_cfg synology_power_off_cfg = {
> +	.baud = 9600,
> +	.cmd = '1',
> +};
> +
> +static const struct of_device_id qnap_power_off_of_match_table[] = {
> +	{ .compatible = "qnap,power-off",
> +	  .data = &qnap_power_off_cfg,
> +	},
> +	{ .compatible = "synology,power-off",
> +	  .data = &synology_power_off_cfg,
> +	},
> +	{}
> +};
> +MODULE_DEVICE_TABLE(of, qnap_power_off_of_match_table);
> +
>  static void __iomem *base;
>  static unsigned long tclk;
> +static const struct power_off_cfg *cfg;
>  
>  static void qnap_power_off(void)
>  {
> -	/* 19200 baud divisor */
> -	const unsigned divisor = ((tclk + (8 * 19200)) / (16 * 19200));
> +	const unsigned divisor = ((tclk + (8 * cfg->baud)) / (16 * cfg->baud));
>  
>  	pr_err("%s: triggering power-off...\n", __func__);
>  
> -	/* hijack UART1 and reset into sane state (19200,8n1) */
> +	/* hijack UART1 and reset into sane state */
>  	writel(0x83, UART1_REG(LCR));
>  	writel(divisor & 0xff, UART1_REG(DLL));
>  	writel((divisor >> 8) & 0xff, UART1_REG(DLM));
> @@ -44,16 +70,21 @@ static void qnap_power_off(void)
>  	writel(0x00, UART1_REG(FCR));
>  	writel(0x00, UART1_REG(MCR));
>  
> -	/* send the power-off command 'A' to PIC */
> -	writel('A', UART1_REG(TX));
> +	/* send the power-off command to PIC */
> +	writel(cfg->cmd, UART1_REG(TX));
>  }
>  
>  static int qnap_power_off_probe(struct platform_device *pdev)
>  {
> +	struct device_node *np = pdev->dev.of_node;
>  	struct resource *res;
>  	struct clk *clk;
>  	char symname[KSYM_NAME_LEN];
>  
> +	const struct of_device_id *match =
> +		of_match_node(qnap_power_off_of_match_table, np);
> +	cfg = match->data;
> +
>  	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
>  	if (!res) {
>  		dev_err(&pdev->dev, "Missing resource");
> @@ -94,12 +125,6 @@ static int qnap_power_off_remove(struct platform_device *pdev)
>  	return 0;
>  }
>  
> -static const struct of_device_id qnap_power_off_of_match_table[] = {
> -	{ .compatible = "qnap,power-off", },
> -	{}
> -};
> -MODULE_DEVICE_TABLE(of, qnap_power_off_of_match_table);
> -
>  static struct platform_driver qnap_power_off_driver = {
>  	.probe	= qnap_power_off_probe,
>  	.remove	= qnap_power_off_remove,
> -- 
> 1.8.3.2
> 
> 
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Jason Cooper March 4, 2014, 3:54 a.m. UTC | #2 
On Fri, Feb 21, 2014 at 08:39:54PM -0500, Jason Cooper wrote:
> Dmitry, David,
> 
> On Thu, Feb 20, 2014 at 06:02:35AM +1000, klightspeed@killerwolves.net wrote:
> > From: Andrew Lunn <andrew@lunn.ch>
> > 
> > The Synology NAS devices use a very similar mechanism to QNAP NAS
> > devices to power off. Both send a single charactor command to a PIC,
> > over the second serial port. However the baud rate and the command
> > differ. Generalize the driver to support this.
> > 
> > Signed-off-by: Ben Peddell <klightspeed@killerwolves.net>
> > Signed-off-by: Andrew Lunn <andrew@lunn.ch>
> > Acked-by: Jason Cooper <jason@lakedaemon.net>
> > Cc: Anton Vorontsov <anton@enomsg.org>
> > Cc: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
> > Cc: David Woodhouse <dwmw2@infradead.org>
> > ---
> >  .../bindings/power_supply/qnap-poweroff.txt        |  5 ++-
> >  drivers/power/reset/qnap-poweroff.c                | 49 ++++++++++++++++------
> >  2 files changed, 41 insertions(+), 13 deletions(-)
> 
> Do you guys want to take this, or me?  I'm fine either way, there's no
> dependencies.

Hmmm, it's been over a week.  Since it's isolated to a driver only
kirkwood/mvebu devices use, I'll go ahead a queue this up to go through
mvebu/arm-soc for v3.15.  Please ping me in the next few days if you'd
prefer I drop it.

Applied to mvebu/drivers

thx,

Jason.

> > diff --git a/Documentation/devicetree/bindings/power_supply/qnap-poweroff.txt b/Documentation/devicetree/bindings/power_supply/qnap-poweroff.txt
> > index 0347d83..af25e77 100644
> > --- a/Documentation/devicetree/bindings/power_supply/qnap-poweroff.txt
> > +++ b/Documentation/devicetree/bindings/power_supply/qnap-poweroff.txt
> > @@ -6,8 +6,11 @@ Orion5x SoCs. Sending the character 'A', at 19200 baud, tells the
> >  microcontroller to turn the power off. This driver adds a handler to
> >  pm_power_off which is called to turn the power off.
> >  
> > +Synology NAS devices use a similar scheme, but a different baud rate,
> > +9600, and a different character, '1'.
> > +
> >  Required Properties:
> > -- compatible: Should be "qnap,power-off"
> > +- compatible: Should be "qnap,power-off" or "synology,power-off"
> >  
> >  - reg: Address and length of the register set for UART1
> >  - clocks: tclk clock
> > diff --git a/drivers/power/reset/qnap-poweroff.c b/drivers/power/reset/qnap-poweroff.c
> > index 37f56f7..a75db7f 100644
> > --- a/drivers/power/reset/qnap-poweroff.c
> > +++ b/drivers/power/reset/qnap-poweroff.c
> > @@ -1,5 +1,5 @@
> >  /*
> > - * QNAP Turbo NAS Board power off
> > + * QNAP Turbo NAS Board power off. Can also be used on Synology devices.
> >   *
> >   * Copyright (C) 2012 Andrew Lunn <andrew@lunn.ch>
> >   *
> > @@ -25,17 +25,43 @@
> >  
> >  #define UART1_REG(x)	(base + ((UART_##x) << 2))
> >  
> > +struct power_off_cfg {
> > +	u32 baud;
> > +	char cmd;
> > +};
> > +
> > +static const struct power_off_cfg qnap_power_off_cfg = {
> > +	.baud = 19200,
> > +	.cmd = 'A',
> > +};
> > +
> > +static const struct power_off_cfg synology_power_off_cfg = {
> > +	.baud = 9600,
> > +	.cmd = '1',
> > +};
> > +
> > +static const struct of_device_id qnap_power_off_of_match_table[] = {
> > +	{ .compatible = "qnap,power-off",
> > +	  .data = &qnap_power_off_cfg,
> > +	},
> > +	{ .compatible = "synology,power-off",
> > +	  .data = &synology_power_off_cfg,
> > +	},
> > +	{}
> > +};
> > +MODULE_DEVICE_TABLE(of, qnap_power_off_of_match_table);
> > +
> >  static void __iomem *base;
> >  static unsigned long tclk;
> > +static const struct power_off_cfg *cfg;
> >  
> >  static void qnap_power_off(void)
> >  {
> > -	/* 19200 baud divisor */
> > -	const unsigned divisor = ((tclk + (8 * 19200)) / (16 * 19200));
> > +	const unsigned divisor = ((tclk + (8 * cfg->baud)) / (16 * cfg->baud));
> >  
> >  	pr_err("%s: triggering power-off...\n", __func__);
> >  
> > -	/* hijack UART1 and reset into sane state (19200,8n1) */
> > +	/* hijack UART1 and reset into sane state */
> >  	writel(0x83, UART1_REG(LCR));
> >  	writel(divisor & 0xff, UART1_REG(DLL));
> >  	writel((divisor >> 8) & 0xff, UART1_REG(DLM));
> > @@ -44,16 +70,21 @@ static void qnap_power_off(void)
> >  	writel(0x00, UART1_REG(FCR));
> >  	writel(0x00, UART1_REG(MCR));
> >  
> > -	/* send the power-off command 'A' to PIC */
> > -	writel('A', UART1_REG(TX));
> > +	/* send the power-off command to PIC */
> > +	writel(cfg->cmd, UART1_REG(TX));
> >  }
> >  
> >  static int qnap_power_off_probe(struct platform_device *pdev)
> >  {
> > +	struct device_node *np = pdev->dev.of_node;
> >  	struct resource *res;
> >  	struct clk *clk;
> >  	char symname[KSYM_NAME_LEN];
> >  
> > +	const struct of_device_id *match =
> > +		of_match_node(qnap_power_off_of_match_table, np);
> > +	cfg = match->data;
> > +
> >  	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
> >  	if (!res) {
> >  		dev_err(&pdev->dev, "Missing resource");
> > @@ -94,12 +125,6 @@ static int qnap_power_off_remove(struct platform_device *pdev)
> >  	return 0;
> >  }
> >  
> > -static const struct of_device_id qnap_power_off_of_match_table[] = {
> > -	{ .compatible = "qnap,power-off", },
> > -	{}
> > -};
> > -MODULE_DEVICE_TABLE(of, qnap_power_off_of_match_table);
> > -
> >  static struct platform_driver qnap_power_off_driver = {
> >  	.probe	= qnap_power_off_probe,
> >  	.remove	= qnap_power_off_remove,
> > -- 
> > 1.8.3.2
> > 
> > 
> > _______________________________________________
> > linux-arm-kernel mailing list
> > linux-arm-kernel@lists.infradead.org
> > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
> --
> To unsubscribe from this list: send the line "unsubscribe devicetree" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/Documentation/devicetree/bindings/power_supply/qnap-poweroff.txt b/Documentation/devicetree/bindings/power_supply/qnap-poweroff.txt
index 0347d83..af25e77 100644
--- a/Documentation/devicetree/bindings/power_supply/qnap-poweroff.txt
+++ b/Documentation/devicetree/bindings/power_supply/qnap-poweroff.txt
@@ -6,8 +6,11 @@  Orion5x SoCs. Sending the character 'A', at 19200 baud, tells the
 microcontroller to turn the power off. This driver adds a handler to
 pm_power_off which is called to turn the power off.
 
+Synology NAS devices use a similar scheme, but a different baud rate,
+9600, and a different character, '1'.
+
 Required Properties:
-- compatible: Should be "qnap,power-off"
+- compatible: Should be "qnap,power-off" or "synology,power-off"
 
 - reg: Address and length of the register set for UART1
 - clocks: tclk clock
diff --git a/drivers/power/reset/qnap-poweroff.c b/drivers/power/reset/qnap-poweroff.c
index 37f56f7..a75db7f 100644
--- a/drivers/power/reset/qnap-poweroff.c
+++ b/drivers/power/reset/qnap-poweroff.c
@@ -1,5 +1,5 @@ 
 /*
- * QNAP Turbo NAS Board power off
+ * QNAP Turbo NAS Board power off. Can also be used on Synology devices.
  *
  * Copyright (C) 2012 Andrew Lunn <andrew@lunn.ch>
  *
@@ -25,17 +25,43 @@ 
 
 #define UART1_REG(x)	(base + ((UART_##x) << 2))
 
+struct power_off_cfg {
+	u32 baud;
+	char cmd;
+};
+
+static const struct power_off_cfg qnap_power_off_cfg = {
+	.baud = 19200,
+	.cmd = 'A',
+};
+
+static const struct power_off_cfg synology_power_off_cfg = {
+	.baud = 9600,
+	.cmd = '1',
+};
+
+static const struct of_device_id qnap_power_off_of_match_table[] = {
+	{ .compatible = "qnap,power-off",
+	  .data = &qnap_power_off_cfg,
+	},
+	{ .compatible = "synology,power-off",
+	  .data = &synology_power_off_cfg,
+	},
+	{}
+};
+MODULE_DEVICE_TABLE(of, qnap_power_off_of_match_table);
+
 static void __iomem *base;
 static unsigned long tclk;
+static const struct power_off_cfg *cfg;
 
 static void qnap_power_off(void)
 {
-	/* 19200 baud divisor */
-	const unsigned divisor = ((tclk + (8 * 19200)) / (16 * 19200));
+	const unsigned divisor = ((tclk + (8 * cfg->baud)) / (16 * cfg->baud));
 
 	pr_err("%s: triggering power-off...\n", __func__);
 
-	/* hijack UART1 and reset into sane state (19200,8n1) */
+	/* hijack UART1 and reset into sane state */
 	writel(0x83, UART1_REG(LCR));
 	writel(divisor & 0xff, UART1_REG(DLL));
 	writel((divisor >> 8) & 0xff, UART1_REG(DLM));
@@ -44,16 +70,21 @@  static void qnap_power_off(void)
 	writel(0x00, UART1_REG(FCR));
 	writel(0x00, UART1_REG(MCR));
 
-	/* send the power-off command 'A' to PIC */
-	writel('A', UART1_REG(TX));
+	/* send the power-off command to PIC */
+	writel(cfg->cmd, UART1_REG(TX));
 }
 
 static int qnap_power_off_probe(struct platform_device *pdev)
 {
+	struct device_node *np = pdev->dev.of_node;
 	struct resource *res;
 	struct clk *clk;
 	char symname[KSYM_NAME_LEN];
 
+	const struct of_device_id *match =
+		of_match_node(qnap_power_off_of_match_table, np);
+	cfg = match->data;
+
 	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
 	if (!res) {
 		dev_err(&pdev->dev, "Missing resource");
@@ -94,12 +125,6 @@  static int qnap_power_off_remove(struct platform_device *pdev)
 	return 0;
 }
 
-static const struct of_device_id qnap_power_off_of_match_table[] = {
-	{ .compatible = "qnap,power-off", },
-	{}
-};
-MODULE_DEVICE_TABLE(of, qnap_power_off_of_match_table);
-
 static struct platform_driver qnap_power_off_driver = {
 	.probe	= qnap_power_off_probe,
 	.remove	= qnap_power_off_remove,