On Thu, May 29, 2014 at 12:23:58PM +0800, Chen-Yu Tsai wrote:

On Tue, May 27, 2014 at 4:30 PM, Maxime Ripard
[off-list ref] wrote:

quoted

On Mon, May 26, 2014 at 12:36:38PM +0800, Chen-Yu Tsai wrote:

quoted

On Mon, May 26, 2014 at 3:14 AM, Maxime Ripard
[off-list ref] wrote:

quoted

On Fri, May 23, 2014 at 03:51:20PM +0800, Chen-Yu Tsai wrote:

quoted

The Allwinner A23 SoC has a PRCM unit like the previous A31 SoC.
The differences are the AR100 clock can no longer be modified,
and the APB0 clock has different divisors.

This patch adds a compatible with a modified subdevice list for
the A23.

Signed-off-by: Chen-Yu Tsai <redacted>
---
 .../devicetree/bindings/mfd/sun6i-prcm.txt         |  2 +-
 drivers/mfd/sun6i-prcm.c                           | 30 ++++++++++++++++++++++
 2 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/Documentation/devicetree/bindings/mfd/sun6i-prcm.txt b/Documentation/devicetree/bindings/mfd/sun6i-prcm.txt
index 1f5a31f..03c5a55 100644
--- a/Documentation/devicetree/bindings/mfd/sun6i-prcm.txt
+++ b/Documentation/devicetree/bindings/mfd/sun6i-prcm.txt

@@ -4,7 +4,7 @@ PRCM is an MFD device exposing several Power Management related devices
 (like clks and reset controllers).

 Required properties:
- - compatible: "allwinner,sun6i-a31-prcm"
+ - compatible: "allwinner,sun6i-a31-prcm" or "allwinner,sun8i-a23-prcm"
  - reg: The PRCM registers range

 The prcm node may contain several subdevices definitions:

diff --git a/drivers/mfd/sun6i-prcm.c b/drivers/mfd/sun6i-prcm.c
index 718fc4d..c96bb6c 100644
--- a/drivers/mfd/sun6i-prcm.c
+++ b/drivers/mfd/sun6i-prcm.c

@@ -76,16 +76,46 @@ static const struct mfd_cell sun6i_a31_prcm_subdevs[] = {
      },
 };

+static const struct mfd_cell sun8i_a23_prcm_subdevs[] = {
+     {
+             .name = "sun6i-a31-apb0-clk",
+             .of_compatible = "allwinner,sun8i-a23-apb0-clk",
+             .num_resources = ARRAY_SIZE(sun6i_a31_apb0_clk_res),
+             .resources = sun6i_a31_apb0_clk_res,
+     },
+     {
+             .name = "sun6i-a31-apb0-gates-clk",
+             .of_compatible = "allwinner,sun6i-a31-apb0-gates-clk",
+             .num_resources = ARRAY_SIZE(sun6i_a31_apb0_gates_clk_res),
+             .resources = sun6i_a31_apb0_gates_clk_res,
+     },

Did I just have a brainfart, or didn't you just introduced an
sun8i-a23-apb0-gates-clk driver?

My bad, I missed this one. The one in the DT is correct.
It actually works, so I'm a bit confused here.
Which one does the driver core actually use?

Actually, it will use both, and will match the of_compatible string
try to match it against the mfd-sub-nodes compatibles. If nothing
matches, it won't fill the dev.of_node field.

So actually it was supposed to use "allwinner,sun6i-a31-apb0-gates-clk",
as that clk driver takes clock-indices, so no need to define gate masks
and tie them to some new compatible.

There was no sun8i-a23-apb0-gates-clk driver.

I must not be getting enough sleep.

I'd still prefer it to have a different compatible though, at least to
be consistent.

Maxime

-- 
Maxime Ripard, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20140529/ce8ec282/attachment.sig>