[PATCH 0/3] clk: Add Meson GXBB Always-On Reset + Clocks

[PATCH 0/3] clk: Add Meson GXBB Always-On Reset + Clocks

[Neil Armstrong]

The Amlogic Meson GXBB SoC has an Always-On part that contains pairs on
clocks and reset controls in a single memory mapped control register.
Add a separate clocks and reset node with the corresponding driver
exporting clock nodes and a reset controller.

Neil Armstrong (3):
  clk: meson: Add GXBB AO Clock and Reset controller driver
  dt-bindings: clock: reset: Add GXBB AO Clock and Reset Bindings
  ARM64: dts: meson-gxbb: Add GXBB AO Clock and Reset node

 .../bindings/clock/amlogic,gxbb-aoclkc.txt         |  45 +++++
 arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi        |   9 +
 drivers/clk/meson/Makefile                         |   2 +-
 drivers/clk/meson/gxbb-aoclk.c                     | 203 +++++++++++++++++++++
 include/dt-bindings/clock/gxbb-aoclkc.h            |  66 +++++++
 include/dt-bindings/reset/gxbb-aoclkc.h            |  66 +++++++
 6 files changed, 390 insertions(+), 1 deletion(-)
 create mode 100644 Documentation/devicetree/bindings/clock/amlogic,gxbb-aoclkc.txt
 create mode 100644 drivers/clk/meson/gxbb-aoclk.c
 create mode 100644 include/dt-bindings/clock/gxbb-aoclkc.h
 create mode 100644 include/dt-bindings/reset/gxbb-aoclkc.h

-- 
2.7.0

[PATCH 1/3] clk: meson: Add GXBB AO Clock and Reset controller driver

[Neil Armstrong]

Adds a Clock and Reset controller driver for the Always-On part
of the Amlogic Meson GXBB SoC.

It exports paired Clocks and Resets lines that will be used by
peripherals in the Always-On subsystem.

Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
---
 drivers/clk/meson/Makefile     |   2 +-
 drivers/clk/meson/gxbb-aoclk.c | 203 +++++++++++++++++++++++++++++++++++++++++
 2 files changed, 204 insertions(+), 1 deletion(-)
 create mode 100644 drivers/clk/meson/gxbb-aoclk.c

diff --git a/drivers/clk/meson/Makefile b/drivers/clk/meson/Makefile
index 197e401..d4cd4a3 100644
--- a/drivers/clk/meson/Makefile
+++ b/drivers/clk/meson/Makefile
@@ -4,4 +4,4 @@
 
 obj-$(CONFIG_COMMON_CLK_AMLOGIC) += clk-pll.o clk-cpu.o clk-mpll.o
 obj-$(CONFIG_COMMON_CLK_MESON8B) += meson8b-clkc.o
-obj-$(CONFIG_COMMON_CLK_GXBB)	 += gxbb.o
+obj-$(CONFIG_COMMON_CLK_GXBB)	 += gxbb.o gxbb-aoclk.o
diff --git a/drivers/clk/meson/gxbb-aoclk.c b/drivers/clk/meson/gxbb-aoclk.c
new file mode 100644
index 0000000..56a9186
--- /dev/null
+++ b/drivers/clk/meson/gxbb-aoclk.c
@@ -0,0 +1,203 @@
+/*
+ * This file is provided under a dual BSD/GPLv2 license.  When using or
+ * redistributing this file, you may do so under either license.
+ *
+ * GPL LICENSE SUMMARY
+ *
+ * Copyright (c) 2016 BayLibre, SAS.
+ * Author: Neil Armstrong <narmstrong@baylibre.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of version 2 of the GNU General Public License as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; 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, see <http://www.gnu.org/licenses/>.
+ * The full GNU General Public License is included in this distribution
+ * in the file called COPYING.
+ *
+ * BSD LICENSE
+ *
+ * Copyright (c) 2016 BayLibre, SAS.
+ * Author: Neil Armstrong <narmstrong@baylibre.com>
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *   * Neither the name of Intel Corporation nor the names of its
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+#include <linux/clk.h>
+#include <linux/clk-provider.h>
+#include <linux/of_address.h>
+#include <linux/platform_device.h>
+#include <linux/reset-controller.h>
+#include <linux/module.h>
+#include <dt-bindings/clock/gxbb-aoclkc.h>
+#include <dt-bindings/reset/gxbb-aoclkc.h>
+
+static DEFINE_SPINLOCK(clk_lock);
+
+struct gxbb_aoclk_reset_controller {
+	struct reset_controller_dev reset;
+	unsigned int *data;
+	void __iomem *base;
+};
+
+static int gxbb_aoclk_do_reset(struct reset_controller_dev *rcdev,
+			       unsigned long id)
+{
+	struct gxbb_aoclk_reset_controller *reset =
+		container_of(rcdev, struct gxbb_aoclk_reset_controller, reset);
+
+	writel(BIT(reset->data[id]), reset->base);
+
+	return 0;
+}
+
+static const struct reset_control_ops gxbb_aoclk_reset_ops = {
+	.reset = gxbb_aoclk_do_reset,
+};
+
+#define GXBB_AO_GATE(_name, _bit)					\
+static struct clk_gate _name##_ao = {					\
+	.reg = (void __iomem *)0,					\
+	.bit_idx = (_bit),						\
+	.lock = &clk_lock,						\
+	.hw.init = &(struct clk_init_data) {				\
+		.name = #_name "_ao",					\
+		.ops = &clk_gate_ops,					\
+		.parent_names = (const char *[]){ "clk81" },		\
+		.num_parents = 1,					\
+		.flags = (CLK_SET_RATE_PARENT | CLK_IGNORE_UNUSED),	\
+	},								\
+}
+
+GXBB_AO_GATE(remote, 0);
+GXBB_AO_GATE(i2c_master, 1);
+GXBB_AO_GATE(i2c_slave, 2);
+GXBB_AO_GATE(uart1, 3);
+GXBB_AO_GATE(uart2, 5);
+GXBB_AO_GATE(ir_blaster, 6);
+
+static unsigned int gxbb_aoclk_reset[] = {
+	[RESET_AO_REMOTE] = 16,
+	[RESET_AO_I2C_MASTER] = 18,
+	[RESET_AO_I2C_SLAVE] = 19,
+	[RESET_AO_UART1] = 17,
+	[RESET_AO_UART2] = 22,
+	[RESET_AO_IR_BLASTER] = 23,
+};
+
+static struct clk_gate *gxbb_aoclk_gate[] = {
+	[CLKID_AO_REMOTE] = &remote_ao,
+	[CLKID_AO_I2C_MASTER] = &i2c_master_ao,
+	[CLKID_AO_I2C_SLAVE] = &i2c_slave_ao,
+	[CLKID_AO_UART1] = &uart1_ao,
+	[CLKID_AO_UART2] = &uart2_ao,
+	[CLKID_AO_IR_BLASTER] = &ir_blaster_ao,
+};
+
+static struct clk_hw_onecell_data gxbb_aoclk_onecell_data = {
+	.hws = {
+		[CLKID_AO_REMOTE] = &remote_ao.hw,
+		[CLKID_AO_I2C_MASTER] = &i2c_master_ao.hw,
+		[CLKID_AO_I2C_SLAVE] = &i2c_slave_ao.hw,
+		[CLKID_AO_UART1] = &uart1_ao.hw,
+		[CLKID_AO_UART2] = &uart2_ao.hw,
+		[CLKID_AO_IR_BLASTER] = &ir_blaster_ao.hw,
+	},
+	.num = ARRAY_SIZE(gxbb_aoclk_gate),
+};
+
+static int gxbb_aoclkc_probe(struct platform_device *pdev)
+{
+	void __iomem *base;
+	int ret, clkid;
+	struct device *dev = &pdev->dev;
+	struct gxbb_aoclk_reset_controller *rstc;
+
+	rstc = devm_kzalloc(dev, sizeof(rstc), GFP_KERNEL);
+	if (!rstc)
+		return -ENOMEM;
+
+	/*  Generic clocks */
+	base = of_iomap(dev->of_node, 0);
+	if (!base) {
+		pr_err("%s: Unable to map clk base\n", __func__);
+		return -ENXIO;
+	}
+
+	/* Reset Controller */
+	rstc->base = base;
+	rstc->data = gxbb_aoclk_reset;
+	rstc->reset.ops = &gxbb_aoclk_reset_ops;
+	rstc->reset.nr_resets = ARRAY_SIZE(gxbb_aoclk_reset);
+	rstc->reset.of_node = dev->of_node;
+	ret = devm_reset_controller_register(dev, &rstc->reset);
+
+	/*
+	 * Populate base address and register all clks
+	 */
+	for (clkid = 0; clkid < gxbb_aoclk_onecell_data.num; clkid++) {
+		gxbb_aoclk_gate[clkid]->reg = base;
+
+		ret = devm_clk_hw_register(dev,
+					gxbb_aoclk_onecell_data.hws[clkid]);
+		if (ret)
+			goto iounmap;
+	}
+
+	return of_clk_add_hw_provider(dev->of_node, of_clk_hw_onecell_get,
+			&gxbb_aoclk_onecell_data);
+
+iounmap:
+	iounmap(base);
+	return ret;
+}
+
+static const struct of_device_id gxbb_aoclkc_match_table[] = {
+	{ .compatible = "amlogic,gxbb-aoclkc" },
+	{ }
+};
+MODULE_DEVICE_TABLE(of, gxbb_aoclkc_match_table);
+
+static struct platform_driver gxbb_aoclkc_driver = {
+	.probe		= gxbb_aoclkc_probe,
+	.driver		= {
+		.name	= "gxbb-aoclkc",
+		.of_match_table = gxbb_aoclkc_match_table,
+	},
+};
+
+module_platform_driver(gxbb_aoclkc_driver);
+
+MODULE_DESCRIPTION("AmLogic Meson GXBB AO Clock Controller Driver");
+MODULE_LICENSE("Dual BSD/GPL");
+MODULE_ALIAS("platform:gxbb-aoclkc");
+MODULE_AUTHOR("Neil Armstrong <narmstrong@baylibre.com>");
-- 
2.7.0

[PATCH 1/3] clk: meson: Add GXBB AO Clock and Reset controller driver

[Stephen Boyd]

On 08/09, Neil Armstrong wrote:
> diff --git a/drivers/clk/meson/gxbb-aoclk.c b/drivers/clk/meson/gxbb-aoclk.c
> new file mode 100644
> index 0000000..56a9186
> --- /dev/null
> +++ b/drivers/clk/meson/gxbb-aoclk.c
> @@ -0,0 +1,203 @@
> +/*
> + * This file is provided under a dual BSD/GPLv2 license.  When using or
> + * redistributing this file, you may do so under either license.
> + *
> + * GPL LICENSE SUMMARY
> + *
> + * Copyright (c) 2016 BayLibre, SAS.
> + * Author: Neil Armstrong <narmstrong@baylibre.com>
> + *
> + * This program is free software; you can redistribute it and/or modify
> + * it under the terms of version 2 of the GNU General Public License as
> + * published by the Free Software Foundation.
> + *
> + * This program is distributed in the hope that it will be useful, but
> + * WITHOUT ANY WARRANTY; 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, see <http://www.gnu.org/licenses/>.
> + * The full GNU General Public License is included in this distribution
> + * in the file called COPYING.
> + *
> + * BSD LICENSE
> + *
> + * Copyright (c) 2016 BayLibre, SAS.
> + * Author: Neil Armstrong <narmstrong@baylibre.com>
> + *
> + * Redistribution and use in source and binary forms, with or without
> + * modification, are permitted provided that the following conditions
> + * are met:
> + *
> + *   * Redistributions of source code must retain the above copyright
> + *     notice, this list of conditions and the following disclaimer.
> + *   * Redistributions in binary form must reproduce the above copyright
> + *     notice, this list of conditions and the following disclaimer in
> + *     the documentation and/or other materials provided with the
> + *     distribution.
> + *   * Neither the name of Intel Corporation nor the names of its
> + *     contributors may be used to endorse or promote products derived
> + *     from this software without specific prior written permission.
> + *
> + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
> + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
> + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
> + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
> + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
> + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
> + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
> + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
> + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
> + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
> + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
> + */
> +#include <linux/clk.h>

Is this include used?

> +#include <linux/clk-provider.h>
> +#include <linux/of_address.h>
> +#include <linux/platform_device.h>
> +#include <linux/reset-controller.h>
> +#include <linux/module.h>
> +#include <dt-bindings/clock/gxbb-aoclkc.h>
> +#include <dt-bindings/reset/gxbb-aoclkc.h>
> +
> +static DEFINE_SPINLOCK(clk_lock);

gxbb_clk_lock?

> +
> +struct gxbb_aoclk_reset_controller {
> +	struct reset_controller_dev reset;
> +	unsigned int *data;
> +	void __iomem *base;
> +};
> +
> +static int gxbb_aoclk_do_reset(struct reset_controller_dev *rcdev,
> +			       unsigned long id)
> +{
> +	struct gxbb_aoclk_reset_controller *reset =
> +		container_of(rcdev, struct gxbb_aoclk_reset_controller, reset);
> +
> +	writel(BIT(reset->data[id]), reset->base);
> +
> +	return 0;
> +}
> +
> +static const struct reset_control_ops gxbb_aoclk_reset_ops = {
> +	.reset = gxbb_aoclk_do_reset,
> +};
> +
> +#define GXBB_AO_GATE(_name, _bit)					\
> +static struct clk_gate _name##_ao = {					\
> +	.reg = (void __iomem *)0,					\
> +	.bit_idx = (_bit),						\
> +	.lock = &clk_lock,						\
> +	.hw.init = &(struct clk_init_data) {				\
> +		.name = #_name "_ao",					\
> +		.ops = &clk_gate_ops,					\
> +		.parent_names = (const char *[]){ "clk81" },		\
> +		.num_parents = 1,					\
> +		.flags = (CLK_SET_RATE_PARENT | CLK_IGNORE_UNUSED),	\
> +	},								\
> +}
> +
> +GXBB_AO_GATE(remote, 0);
> +GXBB_AO_GATE(i2c_master, 1);
> +GXBB_AO_GATE(i2c_slave, 2);
> +GXBB_AO_GATE(uart1, 3);
> +GXBB_AO_GATE(uart2, 5);
> +GXBB_AO_GATE(ir_blaster, 6);
> +
> +static unsigned int gxbb_aoclk_reset[] = {
> +	[RESET_AO_REMOTE] = 16,
> +	[RESET_AO_I2C_MASTER] = 18,
> +	[RESET_AO_I2C_SLAVE] = 19,
> +	[RESET_AO_UART1] = 17,
> +	[RESET_AO_UART2] = 22,
> +	[RESET_AO_IR_BLASTER] = 23,
> +};
> +
> +static struct clk_gate *gxbb_aoclk_gate[] = {
> +	[CLKID_AO_REMOTE] = &remote_ao,
> +	[CLKID_AO_I2C_MASTER] = &i2c_master_ao,
> +	[CLKID_AO_I2C_SLAVE] = &i2c_slave_ao,
> +	[CLKID_AO_UART1] = &uart1_ao,
> +	[CLKID_AO_UART2] = &uart2_ao,
> +	[CLKID_AO_IR_BLASTER] = &ir_blaster_ao,
> +};
> +
> +static struct clk_hw_onecell_data gxbb_aoclk_onecell_data = {

can this be const?

> +	.hws = {
> +		[CLKID_AO_REMOTE] = &remote_ao.hw,
> +		[CLKID_AO_I2C_MASTER] = &i2c_master_ao.hw,
> +		[CLKID_AO_I2C_SLAVE] = &i2c_slave_ao.hw,
> +		[CLKID_AO_UART1] = &uart1_ao.hw,
> +		[CLKID_AO_UART2] = &uart2_ao.hw,
> +		[CLKID_AO_IR_BLASTER] = &ir_blaster_ao.hw,
> +	},
> +	.num = ARRAY_SIZE(gxbb_aoclk_gate),
> +};
> +
> +static int gxbb_aoclkc_probe(struct platform_device *pdev)
> +{
> +	void __iomem *base;
> +	int ret, clkid;
> +	struct device *dev = &pdev->dev;
> +	struct gxbb_aoclk_reset_controller *rstc;
> +
> +	rstc = devm_kzalloc(dev, sizeof(rstc), GFP_KERNEL);
> +	if (!rstc)
> +		return -ENOMEM;
> +
> +	/*  Generic clocks */
> +	base = of_iomap(dev->of_node, 0);

use devm_ioremap_resource() please and platform APIs to get the
ioresource.

> +	if (!base) {
> +		pr_err("%s: Unable to map clk base\n", __func__);

We don't need error prints here with devm_ioremap_resource().

> +		return -ENXIO;
> +	}
> +
> +	/* Reset Controller */
> +	rstc->base = base;
> +	rstc->data = gxbb_aoclk_reset;
> +	rstc->reset.ops = &gxbb_aoclk_reset_ops;
> +	rstc->reset.nr_resets = ARRAY_SIZE(gxbb_aoclk_reset);
> +	rstc->reset.of_node = dev->of_node;
> +	ret = devm_reset_controller_register(dev, &rstc->reset);
> +
> +	/*
> +	 * Populate base address and register all clks
> +	 */
> +	for (clkid = 0; clkid < gxbb_aoclk_onecell_data.num; clkid++) {
> +		gxbb_aoclk_gate[clkid]->reg = base;
> +
> +		ret = devm_clk_hw_register(dev,
> +					gxbb_aoclk_onecell_data.hws[clkid]);
> +		if (ret)
> +			goto iounmap;
> +	}
> +
> +	return of_clk_add_hw_provider(dev->of_node, of_clk_hw_onecell_get,
> +			&gxbb_aoclk_onecell_data);
> +
> +iounmap:
> +	iounmap(base);
> +	return ret;
> +}
> +
> +static const struct of_device_id gxbb_aoclkc_match_table[] = {
> +	{ .compatible = "amlogic,gxbb-aoclkc" },
> +	{ }
> +};
> +MODULE_DEVICE_TABLE(of, gxbb_aoclkc_match_table);
> +
> +static struct platform_driver gxbb_aoclkc_driver = {
> +	.probe		= gxbb_aoclkc_probe,

No remove means leak of iomem mapping.
-- 
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum,
a Linux Foundation Collaborative Project

[PATCH 1/3] clk: meson: Add GXBB AO Clock and Reset controller driver

[Neil Armstrong]

Hi Stephen,

On 08/13/2016 03:29 AM, Stephen Boyd wrote:
> On 08/09, Neil Armstrong wrote:
>> diff --git a/drivers/clk/meson/gxbb-aoclk.c b/drivers/clk/meson/gxbb-aoclk.c
>> new file mode 100644
>> index 0000000..56a9186
>> --- /dev/null
>> +++ b/drivers/clk/meson/gxbb-aoclk.c
>> @@ -0,0 +1,203 @@

[...]

>> + */
>> +#include <linux/clk.h>
> 
> Is this include used?

No !

> 
>> +#include <linux/clk-provider.h>
>> +#include <linux/of_address.h>
>> +#include <linux/platform_device.h>
>> +#include <linux/reset-controller.h>
>> +#include <linux/module.h>
>> +#include <dt-bindings/clock/gxbb-aoclkc.h>
>> +#include <dt-bindings/reset/gxbb-aoclkc.h>
>> +
>> +static DEFINE_SPINLOCK(clk_lock);
> 
> gxbb_clk_lock?

Renamed into gxbb_aoclk_lock for sake of clarity

> 
>> +
>> +struct gxbb_aoclk_reset_controller {
>> +	struct reset_controller_dev reset;
>> +	unsigned int *data;
>> +	void __iomem *base;
>> +};
>> +

[...]

>> +
>> +static struct clk_hw_onecell_data gxbb_aoclk_onecell_data = {
> 
> can this be const?

It would be awesome, but it will be discarded by of_clk_add_hw_provider :

drivers/clk/meson/gxbb-aoclk.c:176:4: warning: passing argument 3 of 'of_clk_add_hw_provider' discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
    &gxbb_aoclk_onecell_data);

In file included from drivers/clk/meson/gxbb-aoclk.c:55:0:
./include/linux/clk-provider.h:788:5: note: expected 'void *' but argument is of type 'const struct clk_hw_onecell_data *'
 int of_clk_add_hw_provider(struct device_node *np,

> 
>> +	.hws = {
>> +		[CLKID_AO_REMOTE] = &remote_ao.hw,
>> +		[CLKID_AO_I2C_MASTER] = &i2c_master_ao.hw,
>> +		[CLKID_AO_I2C_SLAVE] = &i2c_slave_ao.hw,
>> +		[CLKID_AO_UART1] = &uart1_ao.hw,
>> +		[CLKID_AO_UART2] = &uart2_ao.hw,
>> +		[CLKID_AO_IR_BLASTER] = &ir_blaster_ao.hw,
>> +	},
>> +	.num = ARRAY_SIZE(gxbb_aoclk_gate),
>> +};
>> +
>> +static int gxbb_aoclkc_probe(struct platform_device *pdev)
>> +{
>> +	void __iomem *base;
>> +	int ret, clkid;
>> +	struct device *dev = &pdev->dev;
>> +	struct gxbb_aoclk_reset_controller *rstc;
>> +
>> +	rstc = devm_kzalloc(dev, sizeof(rstc), GFP_KERNEL);
>> +	if (!rstc)
>> +		return -ENOMEM;
>> +
>> +	/*  Generic clocks */
>> +	base = of_iomap(dev->of_node, 0);
> 
> use devm_ioremap_resource() please and platform APIs to get the
> ioresource.

Done.

> 
>> +	if (!base) {
>> +		pr_err("%s: Unable to map clk base\n", __func__);
> 
> We don't need error prints here with devm_ioremap_resource().
> 
>> +		return -ENXIO;
>> +	}
>> +
>> +	/* Reset Controller */
>> +	rstc->base = base;
>> +	rstc->data = gxbb_aoclk_reset;
>> +	rstc->reset.ops = &gxbb_aoclk_reset_ops;
>> +	rstc->reset.nr_resets = ARRAY_SIZE(gxbb_aoclk_reset);
>> +	rstc->reset.of_node = dev->of_node;
>> +	ret = devm_reset_controller_register(dev, &rstc->reset);
>> +
>> +	/*
>> +	 * Populate base address and register all clks
>> +	 */
>> +	for (clkid = 0; clkid < gxbb_aoclk_onecell_data.num; clkid++) {
>> +		gxbb_aoclk_gate[clkid]->reg = base;
>> +
>> +		ret = devm_clk_hw_register(dev,
>> +					gxbb_aoclk_onecell_data.hws[clkid]);
>> +		if (ret)
>> +			goto iounmap;
>> +	}
>> +
>> +	return of_clk_add_hw_provider(dev->of_node, of_clk_hw_onecell_get,
>> +			&gxbb_aoclk_onecell_data);
>> +
>> +iounmap:
>> +	iounmap(base);
>> +	return ret;
>> +}
>> +
>> +static const struct of_device_id gxbb_aoclkc_match_table[] = {
>> +	{ .compatible = "amlogic,gxbb-aoclkc" },
>> +	{ }
>> +};
>> +MODULE_DEVICE_TABLE(of, gxbb_aoclkc_match_table);
>> +
>> +static struct platform_driver gxbb_aoclkc_driver = {
>> +	.probe		= gxbb_aoclkc_probe,
> 
> No remove means leak of iomem mapping.
> 

It will be non-modular, so no need of remove. The MODULE_* macros and module.h include will be removed like other clk drivers (gxbb and oxnas for instance).

Thanks,
Neil

[PATCH 1/3] clk: meson: Add GXBB AO Clock and Reset controller driver

[Stephen Boyd]

On 08/16, Neil Armstrong wrote:
> On 08/13/2016 03:29 AM, Stephen Boyd wrote:
> > On 08/09, Neil Armstrong wrote:
> 
> >> +
> >> +static struct clk_hw_onecell_data gxbb_aoclk_onecell_data = {
> > 
> > can this be const?
> 
> It would be awesome, but it will be discarded by of_clk_add_hw_provider :

Ok, right.

> >> +iounmap:
> >> +	iounmap(base);
> >> +	return ret;
> >> +}
> >> +
> >> +static const struct of_device_id gxbb_aoclkc_match_table[] = {
> >> +	{ .compatible = "amlogic,gxbb-aoclkc" },
> >> +	{ }
> >> +};
> >> +MODULE_DEVICE_TABLE(of, gxbb_aoclkc_match_table);
> >> +
> >> +static struct platform_driver gxbb_aoclkc_driver = {
> >> +	.probe		= gxbb_aoclkc_probe,
> > 
> > No remove means leak of iomem mapping.

And OF provider registration.

> > 
> 
> It will be non-modular, so no need of remove. The MODULE_* macros and module.h include will be removed like other clk drivers (gxbb and oxnas for instance).

Ok make sure to remove sysfs unbinding then.

-- 
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum,
a Linux Foundation Collaborative Project

[PATCH 1/3] clk: meson: Add GXBB AO Clock and Reset controller driver

[Paul Gortmaker]

On Tue, Aug 9, 2016 at 5:13 AM, Neil Armstrong <narmstrong@baylibre.com> wrote:
> Adds a Clock and Reset controller driver for the Always-On part
> of the Amlogic Meson GXBB SoC.
>
> It exports paired Clocks and Resets lines that will be used by
> peripherals in the Always-On subsystem.

[...]

> +static const struct of_device_id gxbb_aoclkc_match_table[] = {
> +       { .compatible = "amlogic,gxbb-aoclkc" },
> +       { }
> +};
> +MODULE_DEVICE_TABLE(of, gxbb_aoclkc_match_table);
> +
> +static struct platform_driver gxbb_aoclkc_driver = {
> +       .probe          = gxbb_aoclkc_probe,
> +       .driver         = {
> +               .name   = "gxbb-aoclkc",
> +               .of_match_table = gxbb_aoclkc_match_table,
> +       },
> +};
> +
> +module_platform_driver(gxbb_aoclkc_driver);
> +
> +MODULE_DESCRIPTION("AmLogic Meson GXBB AO Clock Controller Driver");
> +MODULE_LICENSE("Dual BSD/GPL");
> +MODULE_ALIAS("platform:gxbb-aoclkc");
> +MODULE_AUTHOR("Neil Armstrong <narmstrong@baylibre.com>");

Since this driver is controlled by a bool Kconfig, you can dump the module.h
include and all the MODULE_<xyz> tags above.

Or, if there is a genuine use case for it to be modular, then make it tristate?

Thanks,
Paul.

[PATCH 1/3] clk: meson: Add GXBB AO Clock and Reset controller driver

[Neil Armstrong]

On 08/15/2016 02:08 AM, Paul Gortmaker wrote:
> On Tue, Aug 9, 2016 at 5:13 AM, Neil Armstrong <narmstrong@baylibre.com> wrote:
>> Adds a Clock and Reset controller driver for the Always-On part
>> of the Amlogic Meson GXBB SoC.
>>
>> It exports paired Clocks and Resets lines that will be used by
>> peripherals in the Always-On subsystem.
> 
> [...]
> 
>> +static const struct of_device_id gxbb_aoclkc_match_table[] = {
>> +       { .compatible = "amlogic,gxbb-aoclkc" },
>> +       { }
>> +};
>> +MODULE_DEVICE_TABLE(of, gxbb_aoclkc_match_table);
>> +
>> +static struct platform_driver gxbb_aoclkc_driver = {
>> +       .probe          = gxbb_aoclkc_probe,
>> +       .driver         = {
>> +               .name   = "gxbb-aoclkc",
>> +               .of_match_table = gxbb_aoclkc_match_table,
>> +       },
>> +};
>> +
>> +module_platform_driver(gxbb_aoclkc_driver);
>> +
>> +MODULE_DESCRIPTION("AmLogic Meson GXBB AO Clock Controller Driver");
>> +MODULE_LICENSE("Dual BSD/GPL");
>> +MODULE_ALIAS("platform:gxbb-aoclkc");
>> +MODULE_AUTHOR("Neil Armstrong <narmstrong@baylibre.com>");
> 
> Since this driver is controlled by a bool Kconfig, you can dump the module.h
> include and all the MODULE_<xyz> tags above.
> 
> Or, if there is a genuine use case for it to be modular, then make it tristate?
> 
> Thanks,
> Paul.
> 

It will be non-modular.

Thanks,
Neil

[PATCH 2/3] dt-bindings: clock: reset: Add GXBB AO Clock and Reset Bindings

[Neil Armstrong]

Add documentations and dt-bindings headers for the AO clock and reset
controller.

Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
---
 .../bindings/clock/amlogic,gxbb-aoclkc.txt         | 45 +++++++++++++++
 include/dt-bindings/clock/gxbb-aoclkc.h            | 66 ++++++++++++++++++++++
 include/dt-bindings/reset/gxbb-aoclkc.h            | 66 ++++++++++++++++++++++
 3 files changed, 177 insertions(+)
 create mode 100644 Documentation/devicetree/bindings/clock/amlogic,gxbb-aoclkc.txt
 create mode 100644 include/dt-bindings/clock/gxbb-aoclkc.h
 create mode 100644 include/dt-bindings/reset/gxbb-aoclkc.h

diff --git a/Documentation/devicetree/bindings/clock/amlogic,gxbb-aoclkc.txt b/Documentation/devicetree/bindings/clock/amlogic,gxbb-aoclkc.txt
new file mode 100644
index 0000000..a55d31b
--- /dev/null
+++ b/Documentation/devicetree/bindings/clock/amlogic,gxbb-aoclkc.txt
@@ -0,0 +1,45 @@
+* Amlogic GXBB AO Clock and Reset Unit
+
+The Amlogic GXBB AO clock controller generates and supplies clock to various
+controllers within the Always-On part of the SoC.
+
+Required Properties:
+
+- compatible: should be "amlogic,gxbb-aoclkc"
+- reg: physical base address of the clock controller and length of memory
+       mapped region.
+
+- #clock-cells: should be 1.
+
+Each clock is assigned an identifier and client nodes can use this identifier
+to specify the clock which they consume. All available clocks are defined as
+preprocessor macros in the dt-bindings/clock/gxbb-aoclkc.h header and can be
+used in device tree sources.
+
+- #reset-cells: should be 1.
+
+Each reset is assigned an identifier and client nodes can use this identifier
+to specify the reset which they consume. All available resets are defined as
+preprocessor macros in the dt-bindings/reset/gxbb-aoclkc.h header and can be
+used in device tree sources.
+
+Example: AO Clock controller node:
+
+	clkc_AO: clock-controller at 040 {
+		compatible = "amlogic,gxbb-aoclkc";
+		reg = <0x0 0x040 0x0 0x4>;
+		#clock-cells = <1>;
+		#reset-cells = <1>;
+	};
+
+Example: UART controller node that consumes the clock and reset generated
+  by the clock controller:
+
+	uart_AO: serial at 4c0 {
+		compatible = "amlogic,meson-uart";
+		reg = <0x4c0 0x14>;
+		interrupts = <0 90 1>;
+		clocks = <&clkc_AO CLKID_AO_UART1>;
+		resets = <&clkc_AO RESET_AO_UART1>;
+		status = "disabled";
+	};
diff --git a/include/dt-bindings/clock/gxbb-aoclkc.h b/include/dt-bindings/clock/gxbb-aoclkc.h
new file mode 100644
index 0000000..3175148
--- /dev/null
+++ b/include/dt-bindings/clock/gxbb-aoclkc.h
@@ -0,0 +1,66 @@
+/*
+ * This file is provided under a dual BSD/GPLv2 license.  When using or
+ * redistributing this file, you may do so under either license.
+ *
+ * GPL LICENSE SUMMARY
+ *
+ * Copyright (c) 2016 BayLibre, SAS.
+ * Author: Neil Armstrong <narmstrong@baylibre.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of version 2 of the GNU General Public License as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; 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, see <http://www.gnu.org/licenses/>.
+ * The full GNU General Public License is included in this distribution
+ * in the file called COPYING.
+ *
+ * BSD LICENSE
+ *
+ * Copyright (c) 2016 BayLibre, SAS.
+ * Author: Neil Armstrong <narmstrong@baylibre.com>
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *   * Neither the name of Intel Corporation nor the names of its
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef DT_BINDINGS_CLOCK_AMLOGIC_MESON_GXBB_AOCLK
+#define DT_BINDINGS_CLOCK_AMLOGIC_MESON_GXBB_AOCLK
+
+#define CLKID_AO_REMOTE		0
+#define CLKID_AO_I2C_MASTER	1
+#define CLKID_AO_I2C_SLAVE	2
+#define CLKID_AO_UART1		3
+#define CLKID_AO_UART2		4
+#define CLKID_AO_IR_BLASTER	5
+
+#endif
diff --git a/include/dt-bindings/reset/gxbb-aoclkc.h b/include/dt-bindings/reset/gxbb-aoclkc.h
new file mode 100644
index 0000000..9e3fd60
--- /dev/null
+++ b/include/dt-bindings/reset/gxbb-aoclkc.h
@@ -0,0 +1,66 @@
+/*
+ * This file is provided under a dual BSD/GPLv2 license.  When using or
+ * redistributing this file, you may do so under either license.
+ *
+ * GPL LICENSE SUMMARY
+ *
+ * Copyright (c) 2016 BayLibre, SAS.
+ * Author: Neil Armstrong <narmstrong@baylibre.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of version 2 of the GNU General Public License as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; 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, see <http://www.gnu.org/licenses/>.
+ * The full GNU General Public License is included in this distribution
+ * in the file called COPYING.
+ *
+ * BSD LICENSE
+ *
+ * Copyright (c) 2016 BayLibre, SAS.
+ * Author: Neil Armstrong <narmstrong@baylibre.com>
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *   * Neither the name of Intel Corporation nor the names of its
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef DT_BINDINGS_RESET_AMLOGIC_MESON_GXBB_AOCLK
+#define DT_BINDINGS_RESET_AMLOGIC_MESON_GXBB_AOCLK
+
+#define RESET_AO_REMOTE		0
+#define RESET_AO_I2C_MASTER	1
+#define RESET_AO_I2C_SLAVE	2
+#define RESET_AO_UART1		3
+#define RESET_AO_UART2		4
+#define RESET_AO_IR_BLASTER	5
+
+#endif
-- 
2.7.0

[PATCH 2/3] dt-bindings: clock: reset: Add GXBB AO Clock and Reset Bindings

[Rob Herring]

On Tue, Aug 09, 2016 at 11:13:27AM +0200, Neil Armstrong wrote:
> Add documentations and dt-bindings headers for the AO clock and reset
> controller.
> 
> Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
> ---
>  .../bindings/clock/amlogic,gxbb-aoclkc.txt         | 45 +++++++++++++++
>  include/dt-bindings/clock/gxbb-aoclkc.h            | 66 ++++++++++++++++++++++
>  include/dt-bindings/reset/gxbb-aoclkc.h            | 66 ++++++++++++++++++++++
>  3 files changed, 177 insertions(+)
>  create mode 100644 Documentation/devicetree/bindings/clock/amlogic,gxbb-aoclkc.txt
>  create mode 100644 include/dt-bindings/clock/gxbb-aoclkc.h
>  create mode 100644 include/dt-bindings/reset/gxbb-aoclkc.h

Acked-by: Rob Herring <robh@kernel.org>

[PATCH 3/3] ARM64: dts: meson-gxbb: Add GXBB AO Clock and Reset node

[Neil Armstrong]

Add the AO clock controller node for the AmLogic GXBB SoC.

Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
---
 arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi
index e502c24..c81e1ab 100644
--- a/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi
@@ -45,6 +45,8 @@
 #include <dt-bindings/interrupt-controller/arm-gic.h>
 #include <dt-bindings/gpio/meson-gxbb-gpio.h>
 #include <dt-bindings/reset/amlogic,meson-gxbb-reset.h>
+#include <dt-bindings/clock/gxbb-aoclkc.h>
+#include <dt-bindings/reset/gxbb-aoclkc.h>
 
 / {
 	compatible = "amlogic,meson-gxbb";
@@ -205,6 +207,13 @@
 				};
 			};
 
+			clkc_AO: clock-controller at 040 {
+				compatible = "amlogic,gxbb-aoclkc";
+				reg = <0x0 0x00040 0x0 0x4>;
+				#clock-cells = <1>;
+				#reset-cells = <1>;
+			};
+
 			uart_AO: serial at 4c0 {
 				compatible = "amlogic,meson-uart";
 				reg = <0x0 0x004c0 0x0 0x14>;
-- 
2.7.0