[PATCH 0/4] clk/power: add clock and power off driver for AS3722

[PATCH 0/4] clk/power: add clock and power off driver for AS3722

[Laxman Dewangan]

Add power off and clock driver for the ams AS3722.

The mfd patches are depends on mfd subtree which can be applied independtly.
The pacthes are created such that clock driver can go in clock tree and power
off driver in power sub tree.

Laxman Dewangan (4):
  mfd: as3722: add clock driver as mfd-sub device for the ams AS3722
  clk: as3722: add clock driver for ams AS3722
  mfd: AS3722: add dt node properties for system power controller
  power: reset: as3722: add power-off driver

 Documentation/devicetree/bindings/mfd/as3722.txt |   18 +++
 drivers/clk/Kconfig                              |    8 +
 drivers/clk/Makefile                             |    1 +
 drivers/clk/clk-as3722.c                         |  166 ++++++++++++++++++++++
 drivers/mfd/as3722.c                             |    3 +
 drivers/power/reset/Kconfig                      |    6 +
 drivers/power/reset/Makefile                     |    1 +
 drivers/power/reset/as3722-poweroff.c            |  101 +++++++++++++
 8 files changed, 304 insertions(+), 0 deletions(-)
 create mode 100644 drivers/clk/clk-as3722.c
 create mode 100644 drivers/power/reset/as3722-poweroff.c

[PATCH 1/4] mfd: as3722: add clock driver as mfd-sub device for the ams AS3722

[Laxman Dewangan]

Device ams AS3722 supports the one 32KHz clock output. The clock control
support is provided through clock driver.

Add clock driver as mfd sub device to probe the clock driver.

Signed-off-by: Laxman Dewangan <ldewangan@nvidia.com>
---
 Documentation/devicetree/bindings/mfd/as3722.txt |    9 +++++++++
 drivers/mfd/as3722.c                             |    3 +++
 2 files changed, 12 insertions(+), 0 deletions(-)

diff --git a/Documentation/devicetree/bindings/mfd/as3722.txt b/Documentation/devicetree/bindings/mfd/as3722.txt
index fc2191e..e782f39 100644
--- a/Documentation/devicetree/bindings/mfd/as3722.txt
+++ b/Documentation/devicetree/bindings/mfd/as3722.txt
@@ -112,6 +112,15 @@ Following are properties of regulator subnode.
 		ams,enable-tracking: Enable tracking with SD1, only supported
 			by LDO3.
 
+Clock:
+======
+AS3722 supports one 32KHz clock to output from device. The clock control is
+provided through the clock driver.
+This binding uses the common clock binding ./clock-bindings.txt.
+The device node should have the optional properties to support the clock:
+#clock-cells: from common clock binding; shall be set to 1. The clock id for
+	single clock output is 0.
+
 Example:
 --------
 #include <dt-bindings/mfd/as3722.h>
diff --git a/drivers/mfd/as3722.c b/drivers/mfd/as3722.c
index f161f2e..1d3415c 100644
--- a/drivers/mfd/as3722.c
+++ b/drivers/mfd/as3722.c
@@ -72,6 +72,9 @@ static struct mfd_cell as3722_devs[] = {
 		.resources = as3722_adc_resource,
 	},
 	{
+		.name = "as3722-clk",
+	},
+	{
 		.name = "as3722-power-off",
 	},
 };
-- 
1.7.1.1

[PATCH 2/4] clk: as3722: add clock driver for ams AS3722

[Laxman Dewangan]

Device ams AS3722 supports one clock 32KHz output. Add clock driver
to control the clock through clock framework.

Signed-off-by: Laxman Dewangan <ldewangan@nvidia.com>
---
 drivers/clk/Kconfig      |    8 ++
 drivers/clk/Makefile     |    1 +
 drivers/clk/clk-as3722.c |  166 ++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 175 insertions(+), 0 deletions(-)
 create mode 100644 drivers/clk/clk-as3722.c

diff --git a/drivers/clk/Kconfig b/drivers/clk/Kconfig
index 5c51115..03257bf 100644
--- a/drivers/clk/Kconfig
+++ b/drivers/clk/Kconfig
@@ -78,6 +78,14 @@ config CLK_TWL6040
 	  McPDM. McPDM module is using the external bit clock on the McPDM bus
 	  as functional clock.
 
+config COMMON_CLK_AS3722
+	tristate "ams AS3722 clock32K driver"
+	depends on MFD_AS3722
+	help
+	---help---
+	  Supports the clocking subsystem of the ams AS3722 PMIC from ams.
+	  This device supports one 32KHz clock.
+
 config COMMON_CLK_AXI_CLKGEN
 	tristate "AXI clkgen driver"
 	depends on ARCH_ZYNQ || MICROBLAZE
diff --git a/drivers/clk/Makefile b/drivers/clk/Makefile
index fe3121b..b94624d 100644
--- a/drivers/clk/Makefile
+++ b/drivers/clk/Makefile
@@ -39,6 +39,7 @@ obj-$(CONFIG_COMMON_CLK_KEYSTONE)	+= keystone/
 obj-$(CONFIG_X86)		+= x86/
 
 # Chip specific
+obj-$(CONFIG_COMMON_CLK_AS3722) += clk-as3722.o
 obj-$(CONFIG_COMMON_CLK_AXI_CLKGEN) += clk-axi-clkgen.o
 obj-$(CONFIG_COMMON_CLK_WM831X) += clk-wm831x.o
 obj-$(CONFIG_COMMON_CLK_MAX77686) += clk-max77686.o
diff --git a/drivers/clk/clk-as3722.c b/drivers/clk/clk-as3722.c
new file mode 100644
index 0000000..9358029
--- /dev/null
+++ b/drivers/clk/clk-as3722.c
@@ -0,0 +1,166 @@
+/*
+ * Clock driver for ams AS3722 device.
+ *
+ * Copyright (c) 2013, NVIDIA Corporation.
+ *
+ * Author: Laxman Dewangan <ldewangan@nvidia.com>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation version 2.
+ *
+ * This program is distributed "as is" WITHOUT ANY WARRANTY of any kind,
+ * whether express or implied; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ * 02111-1307, USA
+ */
+
+#include <linux/clk.h>
+#include <linux/clkdev.h>
+#include <linux/clk-provider.h>
+#include <linux/mfd/as3722.h>
+#include <linux/module.h>
+#include <linux/of.h>
+#include <linux/of_device.h>
+#include <linux/platform_device.h>
+#include <linux/slab.h>
+
+struct as3722_clks {
+	struct device *dev;
+	struct as3722 *as3722;
+	struct clk_hw hw;
+	struct clk *clk;
+	struct clk_onecell_data clk_data;
+};
+
+static inline struct as3722_clks *to_as3722_clks(struct clk_hw *hw)
+{
+	return container_of(hw, struct as3722_clks, hw);
+}
+
+static unsigned long as3722_clks_recalc_rate(struct clk_hw *hw,
+	unsigned long parent_rate)
+{
+	return 32768;
+}
+
+static int as3722_clks_prepare(struct clk_hw *hw)
+{
+	struct as3722_clks *as3722_clks = to_as3722_clks(hw);
+	int ret;
+
+	ret = as3722_update_bits(as3722_clks->as3722, AS3722_RTC_CONTROL_REG,
+			AS3722_RTC_CLK32K_OUT_EN, AS3722_RTC_CLK32K_OUT_EN);
+	if (ret < 0)
+		dev_err(as3722_clks->dev, "RTC_CONTROL_REG update failed, %d\n",
+			ret);
+
+	return ret;
+}
+
+static void as3722_clks_unprepare(struct clk_hw *hw)
+{
+	struct as3722_clks *as3722_clks = to_as3722_clks(hw);
+	int ret;
+
+	ret = as3722_update_bits(as3722_clks->as3722, AS3722_RTC_CONTROL_REG,
+			AS3722_RTC_CLK32K_OUT_EN, 0);
+	if (ret < 0)
+		dev_err(as3722_clks->dev, "RTC_CONTROL_REG update failed, %d\n",
+			ret);
+}
+
+static int as3722_clks_is_prepared(struct clk_hw *hw)
+{
+	struct as3722_clks *as3722_clks = to_as3722_clks(hw);
+	int ret;
+	u32 val;
+
+	ret = as3722_read(as3722_clks->as3722, AS3722_RTC_CONTROL_REG, &val);
+	if (ret < 0) {
+		dev_err(as3722_clks->dev, "RTC_CONTROL_REG read failed, %d\n",
+			ret);
+		return ret;
+	}
+
+	return !!(val & AS3722_RTC_CLK32K_OUT_EN);
+}
+
+static struct clk_ops as3722_clks_ops = {
+	.prepare	= as3722_clks_prepare,
+	.unprepare	= as3722_clks_unprepare,
+	.is_prepared	= as3722_clks_is_prepared,
+	.recalc_rate	= as3722_clks_recalc_rate,
+};
+
+static struct clk_init_data as3722_clks_hw_init = {
+	.name = "clk32k",
+	.ops = &as3722_clks_ops,
+	.flags = CLK_IS_ROOT | CLK_IGNORE_UNUSED,
+};
+
+static int as3722_clks_probe(struct platform_device *pdev)
+{
+	struct as3722_clks *as3722_clks;
+	struct clk *clk;
+	int ret;
+
+	as3722_clks = devm_kzalloc(&pdev->dev, sizeof(*as3722_clks),
+				GFP_KERNEL);
+	if (!as3722_clks)
+		return -ENOMEM;
+
+	as3722_clks->clk_data.clks = devm_kzalloc(&pdev->dev,
+			sizeof(*as3722_clks->clk_data.clks), GFP_KERNEL);
+	if (!as3722_clks->clk_data.clks)
+		return -ENOMEM;
+
+	platform_set_drvdata(pdev, as3722_clks);
+
+	as3722_clks->as3722 = dev_get_drvdata(pdev->dev.parent);
+	as3722_clks->dev = &pdev->dev;
+	as3722_clks->hw.init = &as3722_clks_hw_init;
+
+	clk = devm_clk_register(&pdev->dev, &as3722_clks->hw);
+	if (IS_ERR(clk)) {
+		ret = PTR_ERR(clk);
+		dev_err(&pdev->dev, "Fail to register clock %s, %d\n",
+			as3722_clks_hw_init.name, ret);
+		return ret;
+	}
+	as3722_clks->clk = clk;
+	as3722_clks->clk_data.clks[0] = clk;
+	as3722_clks->clk_data.clk_num = 1;
+	ret = of_clk_add_provider(pdev->dev.parent->of_node,
+			of_clk_src_simple_get, &as3722_clks->clk_data);
+	if (ret < 0)
+		dev_err(&pdev->dev, "Fail to add clock driver, %d\n", ret);
+	return ret;
+}
+
+static int as3722_clks_remove(struct platform_device *pdev)
+{
+	of_clk_del_provider(pdev->dev.parent->of_node);
+	return 0;
+}
+
+static struct platform_driver as3722_clks_driver = {
+	.driver = {
+		.name = "as3722-clk",
+		.owner = THIS_MODULE,
+	},
+	.probe = as3722_clks_probe,
+	.remove = as3722_clks_remove,
+};
+
+module_platform_driver(as3722_clks_driver);
+
+MODULE_DESCRIPTION("Clock driver for ams AS3722 PMIC Device");
+MODULE_ALIAS("platform:as3722-clk");
+MODULE_AUTHOR("Laxman Dewangan <ldewangan@nvidia.com>");
+MODULE_LICENSE("GPL v2");
-- 
1.7.1.1

[PATCH 3/4] mfd: AS3722: add dt node properties for system power controller

[Laxman Dewangan]

ams AS3722 device supports the power off by turning off its all rails.

Add dt node properties to enable this functionality on this device.

Signed-off-by: Laxman Dewangan <ldewangan@nvidia.com>
---
 Documentation/devicetree/bindings/mfd/as3722.txt |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)

diff --git a/Documentation/devicetree/bindings/mfd/as3722.txt b/Documentation/devicetree/bindings/mfd/as3722.txt
index e782f39..1a2fa8a 100644
--- a/Documentation/devicetree/bindings/mfd/as3722.txt
+++ b/Documentation/devicetree/bindings/mfd/as3722.txt
@@ -121,6 +121,15 @@ The device node should have the optional properties to support the clock:
 #clock-cells: from common clock binding; shall be set to 1. The clock id for
 	single clock output is 0.
 
+Power-off:
+=========
+
+AS3722 supports the system power off by turning off all its rail. The power off
+is provided through pm power off.
+The device node should have the following properties to enable power-off
+functionality from ams AS3722:
+ams,system-power-controller: To enable the power off functionality through
+	device.
 Example:
 --------
 #include <dt-bindings/mfd/as3722.h>
-- 
1.7.1.1

[PATCH 4/4] power: reset: as3722: add power-off driver

[Laxman Dewangan]

ams AS3722 supports the power off functionality to turn off
system.

Add power off driver for ams AS3722.

Signed-off-by: Laxman Dewangan <ldewangan@nvidia.com>
---
 drivers/power/reset/Kconfig           |    6 ++
 drivers/power/reset/Makefile          |    1 +
 drivers/power/reset/as3722-poweroff.c |  101 +++++++++++++++++++++++++++++++++
 3 files changed, 108 insertions(+), 0 deletions(-)
 create mode 100644 drivers/power/reset/as3722-poweroff.c

diff --git a/drivers/power/reset/Kconfig b/drivers/power/reset/Kconfig
index 9b3ea53..6d452a7 100644
--- a/drivers/power/reset/Kconfig
+++ b/drivers/power/reset/Kconfig
@@ -6,6 +6,12 @@ menuconfig POWER_RESET
 
 	  Say Y here to enable board reset and power off
 
+config POWER_RESET_AS3722
+	bool "ams AS3722 power-off driver"
+	depends on MFD_AS3722 && POWER_RESET
+	help
+	  This driver supports turning off board via a ams AS3722 power-off.
+
 config POWER_RESET_GPIO
 	bool "GPIO power-off driver"
 	depends on OF_GPIO && POWER_RESET
diff --git a/drivers/power/reset/Makefile b/drivers/power/reset/Makefile
index 3e6ed88..a5b4a77 100644
--- a/drivers/power/reset/Makefile
+++ b/drivers/power/reset/Makefile
@@ -1,3 +1,4 @@
+obj-$(CONFIG_POWER_RESET_AS3722) += as3722-poweroff.o
 obj-$(CONFIG_POWER_RESET_GPIO) += gpio-poweroff.o
 obj-$(CONFIG_POWER_RESET_MSM) += msm-poweroff.o
 obj-$(CONFIG_POWER_RESET_QNAP) += qnap-poweroff.o
diff --git a/drivers/power/reset/as3722-poweroff.c b/drivers/power/reset/as3722-poweroff.c
new file mode 100644
index 0000000..64e7c7f
--- /dev/null
+++ b/drivers/power/reset/as3722-poweroff.c
@@ -0,0 +1,101 @@
+/*
+ * Power off driver for ams AS3722 device.
+ *
+ * Copyright (c) 2013, NVIDIA Corporation.
+ *
+ * Author: Laxman Dewangan <ldewangan@nvidia.com>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation version 2.
+ *
+ * This program is distributed "as is" WITHOUT ANY WARRANTY of any kind,
+ * whether express or implied; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ * 02111-1307, USA
+ */
+
+#include <linux/mfd/as3722.h>
+#include <linux/module.h>
+#include <linux/of.h>
+#include <linux/of_device.h>
+#include <linux/platform_device.h>
+#include <linux/slab.h>
+
+struct as3722_poweroff {
+	struct device *dev;
+	struct as3722 *as3722;
+};
+
+static struct as3722_poweroff *as3722_pm_poweroff;
+
+static void as3722_pm_power_off(void)
+{
+	int ret;
+
+	if (!as3722_pm_poweroff) {
+		pr_err("AS3722 poweroff is not initialised\n");
+		return;
+	}
+
+	ret = as3722_update_bits(as3722_pm_poweroff->as3722,
+		AS3722_RESET_CONTROL_REG, AS3722_POWER_OFF, AS3722_POWER_OFF);
+	if (ret < 0)
+		dev_err(as3722_pm_poweroff->dev,
+			"RESET_CONTROL_REG update failed, %d\n", ret);
+}
+
+static int as3722_poweroff_probe(struct platform_device *pdev)
+{
+	struct as3722_poweroff *as3722_poweroff;
+	struct device_node *np = pdev->dev.parent->of_node;
+
+	if (!np)
+		return -EINVAL;
+
+	if (!of_property_read_bool(np, "ams,system-power-controller"))
+		return 0;
+
+	as3722_poweroff = devm_kzalloc(&pdev->dev, sizeof(*as3722_poweroff),
+				GFP_KERNEL);
+	if (!as3722_poweroff)
+		return -ENOMEM;
+
+	as3722_poweroff->as3722 = dev_get_drvdata(pdev->dev.parent);
+	as3722_poweroff->dev = &pdev->dev;
+	as3722_pm_poweroff = as3722_poweroff;
+	if (!pm_power_off)
+		pm_power_off = as3722_pm_power_off;
+
+	return 0;
+}
+
+static int as3722_poweroff_remove(struct platform_device *pdev)
+{
+	if (pm_power_off == as3722_pm_power_off)
+		pm_power_off = NULL;
+	as3722_pm_poweroff = NULL;
+
+	return 0;
+}
+
+static struct platform_driver as3722_poweroff_driver = {
+	.driver = {
+		.name = "as3722-power-off",
+		.owner = THIS_MODULE,
+	},
+	.probe = as3722_poweroff_probe,
+	.remove = as3722_poweroff_remove,
+};
+
+module_platform_driver(as3722_poweroff_driver);
+
+MODULE_DESCRIPTION("Power off driver for ams AS3722 PMIC Device");
+MODULE_ALIAS("platform:as3722-power-off");
+MODULE_AUTHOR("Laxman Dewangan <ldewangan@nvidia.com>");
+MODULE_LICENSE("GPL v2");
-- 
1.7.1.1

Re: [PATCH 1/4] mfd: as3722: add clock driver as mfd-sub device for the ams AS3722

[Lee Jones]

On Tue, 29 Oct 2013, Laxman Dewangan wrote:

> Device ams AS3722 supports the one 32KHz clock output. The clock control
> support is provided through clock driver.
> 
> Add clock driver as mfd sub device to probe the clock driver.
> 
> Signed-off-by: Laxman Dewangan <ldewangan@nvidia.com>
> ---
>  Documentation/devicetree/bindings/mfd/as3722.txt |    9 +++++++++
>  drivers/mfd/as3722.c                             |    3 +++

You need to seperate the DT binding from the drivers/mfd changes.

The MFD changes are fine of course.

-- 
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog