sun6i: Add A31s and ir support

While working on pinctrl for the A31s, I noticed that function 4 of PA15 - PA18 was missing, add these.

Signed-off-by Hans de Goede <[email protected]>

While working on pinctrl for the A31s, I noticed that function 4 of PA15 - PA18 was missing, add these.

Signed-off-by Hans de Goede <[email protected]>

---
Changes in v2:
-Drop the changes to the muxing of i2c3 this was based on
"A31s Datasheet v1.40.pdf", but all other A31 related info puts them at the pins where we already have them, so leave this as is

The A31s is a stripped down version of the A31, as such it is missing some pins and some functions on some pins.

The new pinctrl-sun6i-a31s.c this commit adds is a copy of pinctrl-sun6i-a31s.c

with the missing pins and functions removed.

Note there is no a31s specific version of pinctrl-sun6i-a31-r.c, as the prcm pins are identical between the A31 and the A31s.

Signed-off-by Hans de Goede <[email protected]>

The A31s is a stripped down version of the A31, as such it is missing some pins and some functions on some pins.

The new pinctrl-sun6i-a31s.c this commit adds is a copy of pinctrl-sun6i-a31s.c with the missing pins and functions removed.

Note there is no a31s specific version of pinctrl-sun6i-a31-r.c, as the prcm pins are identical between the A31 and the A31s.

Signed-off-by Hans de Goede <[email protected]>

---
Changes in v2:

So far the A31s is 100% compatible with the A31, still lets do the same as what we've done for the A13 / A10s and give it its own compatible string, in case we need to differentiate later.

Signed-off-by Hans de Goede <[email protected]>

On sun6i the cir block is attached to the reset controller, add support for de-asserting the reset if a reset controller is specified in dt.

Signed-off-by Hans de Goede <[email protected]>

Acked-by Mauro Carvalho Chehab <[email protected]>

Acked-by Maxime Ripard <[email protected]>

---
 .../devicetree/bindings/media/sunxi-ir.txt         |  2 ++
 drivers/media/rc/sunxi-cir.c                       | 25 ++++++++++++++++++++--
 2 files changed, 25 insertions(+), 2 deletions(-)

Documentation/devicetree/bindings/media/sunxi-ir.txt +0 -0

index 23dd5ad..6b70b9b 100644

Documentation/devicetree/bindings/media/sunxi-ir.txt +1 -0

 Example:
 

@@ -17,6 +18,7 @@ ir0: ir at 01c21800 {
        compatible = "allwinner,sun4i-a10-ir";
        clocks = <&apb0_gates 6>, <&ir0_clk>;
        clock-names = "apb", "ir";
+       resets = <&apb0_rst 1>;
        interrupts = <0 5 1>;
        reg = <0x01C21800 0x40>;
        linux,rc-map-name = "rc-rc6-mce";

drivers/media/rc/sunxi-cir.c +23 -3

index 340f7f5..06170e0 100644
@@ -23,6 +23,7 @@
 #include <linux/interrupt.h>
 #include <linux/module.h>
 #include <linux/of_platform.h>
+#include <linux/reset.h>
 #include <media/rc-core.h>
 
 #define SUNXI_IR_DEV "sunxi-ir"

@@ -95,6 +96,7 @@ struct sunxi_ir {
        int             irq;
        struct clk      *clk;
        struct clk      *apb_clk;
+       struct reset_control *rst;
        const char      *map_name;
 };
 

@@ -166,15 +168,29 @@ static int sunxi_ir_probe(struct platform_device *pdev)
                return PTR_ERR(ir->clk);
        }
 
+       /* Reset (optional) */
+       ir->rst = devm_reset_control_get_optional(dev, NULL);
+       if (IS_ERR(ir->rst)) {
+               ret = PTR_ERR(ir->rst);
+               if (ret == -EPROBE_DEFER)
+                       return ret;
+               ir->rst = NULL;
+       } else {
+               ret = reset_control_deassert(ir->rst);
+               if (ret)
+                       return ret;
+       }
+
        ret = clk_set_rate(ir->clk, SUNXI_IR_BASE_CLK);
        if (ret) {
                dev_err(dev, "set ir base clock failed!\n");
-               return ret;
+               goto exit_reset_assert;
        }
 
        if (clk_prepare_enable(ir->apb_clk)) {
                dev_err(dev, "try to enable apb_ir_clk failed\n");
-               return -EINVAL;
+               ret = -EINVAL;
+               goto exit_reset_assert;
        }
 
        if (clk_prepare_enable(ir->clk)) {

@@ -271,6 +287,9 @@ exit_clkdisable_clk:
        clk_disable_unprepare(ir->clk);
 exit_clkdisable_apb_clk:
        clk_disable_unprepare(ir->apb_clk);
+exit_reset_assert:
+       if (ir->rst)
+               reset_control_assert(ir->rst);
 
        return ret;
 }

@@ -282,6 +301,8 @@ static int sunxi_ir_remove(struct platform_device *pdev)
 
        clk_disable_unprepare(ir->clk);
        clk_disable_unprepare(ir->apb_clk);
+       if (ir->rst)
+               reset_control_assert(ir->rst);
 
        spin_lock_irqsave(&ir->ir_lock, flags);
        /* disable IR IRQ */
--

2.1.0

--
You received this message because you are subscribed to the Google Groups "linux-sunxi" group.
To unsubscribe from this group and stop receiving emails from it, send an email to linux-sunxi+unsubscribe at googlegroups.com. For more options, visit https://groups.google.com/d/optout.

Hi,

Quoted 16 lines · Hans de Goede

On sun6i the cir block is attached to the reset controller, add support for de-asserting the reset if a reset controller is specified in dt.

Signed-off-by Hans de Goede <[email protected]>

Acked-by Mauro Carvalho Chehab <[email protected]>

Acked-by Maxime Ripard <[email protected]>

---
  .../devicetree/bindings/media/sunxi-ir.txt         |  2 ++
  drivers/media/rc/sunxi-cir.c                       | 25 ++++++++++++++++++++--
  2 files changed, 25 insertions(+), 2 deletions(-)

Documentation/devicetree/bindings/media/sunxi-ir.txt +0 -0

index 23dd5ad..6b70b9b 100644

Documentation/devicetree/bindings/media/sunxi-ir.txt Required properties: · line 13

Quoted 4 lines

Documentation/devicetree/bindings/media/sunxi-ir.txt +1 -0

@@ -10,6 +10,7 @@ Required properties:
 
  Optional properties:
  - linux,rc-map-name : Remote control map name.
+- resets : phandle + reset specifier pair

Should it be optional? Or should we use a sun6i compatible with a mandatory reset phandle? I mean, the driver/hardware is not going to work with the reset missing on sun6i.

Seems we are doing it one way for some of our drivers, and the other (optional) way for more generic ones, like USB.

Hi,

Quoted 28 lines · Chen-Yu Tsai

Hi,

Quoted 16 lines · Hans de Goede

On sun6i the cir block is attached to the reset controller, add support for de-asserting the reset if a reset controller is specified in dt.

Signed-off-by Hans de Goede <[email protected]>

Acked-by Mauro Carvalho Chehab <[email protected]>

Acked-by Maxime Ripard <[email protected]>

---
 .../devicetree/bindings/media/sunxi-ir.txt         |  2 ++
 drivers/media/rc/sunxi-cir.c                       | 25 ++++++++++++++++++++--
 2 files changed, 25 insertions(+), 2 deletions(-)

Documentation/devicetree/bindings/media/sunxi-ir.txt +0 -0

index 23dd5ad..6b70b9b 100644

Documentation/devicetree/bindings/media/sunxi-ir.txt Required properties: · line 13

Quoted 4 lines

Documentation/devicetree/bindings/media/sunxi-ir.txt +1 -0

@@ -10,6 +10,7 @@ Required properties:
 
 Optional properties:
 - linux,rc-map-name : Remote control map name.
+- resets : phandle + reset specifier pair

Should it be optional? Or should we use a sun6i compatible with a mandatory reset phandle? I mean, the driver/hardware is not going to work with the reset missing on sun6i.

Quoted 2 lines

Seems we are doing it one way for some of our drivers, and the other (optional) way for more generic ones, like USB.

I do not believe that we should add a new compatible just because the reset line of a block is hooked up differently. It is the exact same ip-block. Only now the reset is not controlled through the apb-gate, but controlled separately.

Hi,

Quoted 34 lines · Hans de Goede

Hi,

Quoted 30 lines · Chen-Yu Tsai

Hi,

Quoted 16 lines · Hans de Goede

On sun6i the cir block is attached to the reset controller, add support for de-asserting the reset if a reset controller is specified in dt.

Signed-off-by Hans de Goede <[email protected]>

Acked-by Mauro Carvalho Chehab <[email protected]>

Acked-by Maxime Ripard <[email protected]>

---
  .../devicetree/bindings/media/sunxi-ir.txt         |  2 ++
  drivers/media/rc/sunxi-cir.c                       | 25 ++++++++++++++++++++--
  2 files changed, 25 insertions(+), 2 deletions(-)

Documentation/devicetree/bindings/media/sunxi-ir.txt +0 -0

index 23dd5ad..6b70b9b 100644

Documentation/devicetree/bindings/media/sunxi-ir.txt Required properties: · line 13

Quoted 4 lines

Documentation/devicetree/bindings/media/sunxi-ir.txt +1 -0

@@ -10,6 +10,7 @@ Required properties:
 
  Optional properties:
  - linux,rc-map-name : Remote control map name.
+- resets : phandle + reset specifier pair

Should it be optional? Or should we use a sun6i compatible with a mandatory reset phandle? I mean, the driver/hardware is not going to work with the reset missing on sun6i.

Seems we are doing it one way for some of our drivers, and the other (optional) way for more generic ones, like USB.

Quoted 4 lines

I do not believe that we should add a new compatible just because the reset line of a block is hooked up differently. It is the exact same ip-block. Only now the reset is not controlled through the apb-gate, but controlled separately.

He has a point though. Your driver might very well probe nicely and everything, but still wouldn't be functional at all because the reset line wouldn't have been specified in the DT.

The easiest way to deal with that would be in the bindings doc to update it with a compatible for the A31, and mentionning that the reset property is mandatory there.

Note that the code itself might not change at all though. I'd just like to avoid any potential breaking of the DT bindings themselves. If we further want to refine the code, we can do that however we want.

I have a slight preference for a clean error if reset is missing, but I won't get in the way just for that.

Maxime

Hi,

Quoted 52 lines · Maxime Ripard

Hi,

Quoted 38 lines · Hans de Goede

Hi,

Quoted 34 lines · Chen-Yu Tsai

Hi,

Quoted 19 lines · Hans de Goede

On sun6i the cir block is attached to the reset controller, add support for de-asserting the reset if a reset controller is specified in dt.

Signed-off-by Hans de Goede <[email protected]>

Acked-by Mauro Carvalho Chehab <[email protected]>

Acked-by Maxime Ripard <[email protected]>

---
  .../devicetree/bindings/media/sunxi-ir.txt         |  2 ++
  drivers/media/rc/sunxi-cir.c                       | 25
++++++++++++++++++++--
  2 files changed, 25 insertions(+), 2 deletions(-)

Documentation/devicetree/bindings/media/sunxi-ir.txt +0 -0

index 23dd5ad..6b70b9b 100644

Documentation/devicetree/bindings/media/sunxi-ir.txt Required properties: · line 13

Quoted 4 lines

Documentation/devicetree/bindings/media/sunxi-ir.txt +1 -0

@@ -10,6 +10,7 @@ Required properties:
 
  Optional properties:
  - linux,rc-map-name : Remote control map name.
+- resets : phandle + reset specifier pair

Should it be optional? Or should we use a sun6i compatible with a mandatory reset phandle? I mean, the driver/hardware is not going to work with the reset missing on sun6i.

Quoted 8 lines

Quoted 2 lines

Seems we are doing it one way for some of our drivers, and the other (optional) way for more generic ones, like USB.

I do not believe that we should add a new compatible just because the reset line of a block is hooked up differently. It is the exact same ip-block. Only now the reset is not controlled through the apb-gate, but controlled separately.

Quoted 3 lines

He has a point though. Your driver might very well probe nicely and everything, but still wouldn't be functional at all because the reset line wouldn't have been specified in the DT.

Right, just like other drivers we've, see e.g.:

Documentation/devicetree/bindings/mmc/sunxi-mmc.txt

Which is dealing with this in the same way.

Quoted 3 lines

The easiest way to deal with that would be in the bindings doc to update it with a compatible for the A31, and mentionning that the reset property is mandatory there.

No the easiest way to deal with this is to expect people writing the dts to know what they are doing, just like we do for a lot of the other blocks in sun6i.

Maybe put a generic note somewhere that sun6i has a reset controller, and that for all the blocks with optional resets property it should be considered mandatory on sun6i ?

I'm sorry but I'm not going to make this change for the ir bindings given that we've the same situation in a lot of other places.

Consistency is important. Moreover I believe that having a sun6i specific compatible string is just wrong, since it is the exact same hardware block as on sun5i, just with its reset line routed differently, just like e.g. the mmc controller, the uarts or the gmac all of which also do not have a sun6i specific compatible to enforce reset controller usage.

Regards,

Hans

Quoted 6 lines

Note that the code itself might not change at all though. I'd just like to avoid any potential breaking of the DT bindings themselves. If we further want to refine the code, we can do that however we want.

I have a slight preference for a clean error if reset is missing, but I won't get in the way just for that.

Hi,

Quoted 101 lines · Hans de Goede

Hi,

Quoted 52 lines · Maxime Ripard

Hi,

Quoted 38 lines · Hans de Goede

Hi,

Quoted 34 lines · Chen-Yu Tsai

Hi,

Quoted 19 lines · Hans de Goede

On sun6i the cir block is attached to the reset controller, add support for de-asserting the reset if a reset controller is specified in dt.

Signed-off-by Hans de Goede <[email protected]>

Acked-by Mauro Carvalho Chehab <[email protected]>

Acked-by Maxime Ripard <[email protected]>

---
   .../devicetree/bindings/media/sunxi-ir.txt         |  2 ++
   drivers/media/rc/sunxi-cir.c                       | 25
++++++++++++++++++++--
   2 files changed, 25 insertions(+), 2 deletions(-)

Documentation/devicetree/bindings/media/sunxi-ir.txt +0 -0

index 23dd5ad..6b70b9b 100644

Documentation/devicetree/bindings/media/sunxi-ir.txt Required properties: · line 13

Quoted 4 lines

Documentation/devicetree/bindings/media/sunxi-ir.txt +1 -0

@@ -10,6 +10,7 @@ Required properties:
 
   Optional properties:
   - linux,rc-map-name : Remote control map name.
+- resets : phandle + reset specifier pair

Should it be optional? Or should we use a sun6i compatible with a mandatory reset phandle? I mean, the driver/hardware is not going to work with the reset missing on sun6i.

Quoted 8 lines

Quoted 2 lines

Seems we are doing it one way for some of our drivers, and the other (optional) way for more generic ones, like USB.

I do not believe that we should add a new compatible just because the reset line of a block is hooked up differently. It is the exact same ip-block. Only now the reset is not controlled through the apb-gate, but controlled separately.

Quoted 3 lines

He has a point though. Your driver might very well probe nicely and everything, but still wouldn't be functional at all because the reset line wouldn't have been specified in the DT.

Right, just like other drivers we've, see e.g.:

Documentation/devicetree/bindings/mmc/sunxi-mmc.txt

Which is dealing with this in the same way.

Quoted 3 lines

The easiest way to deal with that would be in the bindings doc to update it with a compatible for the A31, and mentionning that the reset property is mandatory there.

No the easiest way to deal with this is to expect people writing the dts to know what they are doing, just like we do for a lot of the other blocks in sun6i.

Maybe put a generic note somewhere that sun6i has a reset controller, and that for all the blocks with optional resets property it should be considered mandatory on sun6i ?

I'm sorry but I'm not going to make this change for the ir bindings given that we've the same situation in a lot of other places.

Consistency is important. Moreover I believe that having a sun6i specific compatible string is just wrong, since it is the exact same hardware block as on sun5i, just with its reset line routed differently, just like e.g. the mmc controller, the uarts or the gmac all of which also do not have a sun6i specific compatible to enforce reset controller usage.

Regards,

Hans

Quoted 4 lines

Note that the code itself might not change at all though. I'd just like to avoid any potential breaking of the DT bindings themselves. If we further want to refine the code, we can do that however we want.

Quoted 2 lines

Quoted 2 lines

I have a slight preference for a clean error if reset is missing, but I won't get in the way just for that.

Seems this patch and the following patch were overlooked after the discussion. Any chance we could get this in?

Hi,

Quoted 121 lines · Chen-Yu Tsai

Hi,

Quoted 114 lines · Hans de Goede

Hi,

Quoted 60 lines · Maxime Ripard

Hi,

Quoted 48 lines · Hans de Goede

Hi,

Quoted 38 lines · Chen-Yu Tsai

Hi,

Quoted 21 lines · Hans de Goede

On sun6i the cir block is attached to the reset controller, add support
for de-asserting the reset if a reset controller is specified in dt.

Signed-off-by Hans de Goede <[email protected]>

Acked-by Mauro Carvalho Chehab <[email protected]>

Acked-by Maxime Ripard <[email protected]>

---
   .../devicetree/bindings/media/sunxi-ir.txt         |  2 ++
   drivers/media/rc/sunxi-cir.c                       | 25
++++++++++++++++++++--
   2 files changed, 25 insertions(+), 2 deletions(-)

Documentation/devicetree/bindings/media/sunxi-ir.txt +0 -0

index 23dd5ad..6b70b9b 100644

Documentation/devicetree/bindings/media/sunxi-ir.txt Required properties: · line 13

Quoted 4 lines

Documentation/devicetree/bindings/media/sunxi-ir.txt +1 -0

@@ -10,6 +10,7 @@ Required properties:
 
   Optional properties:
   - linux,rc-map-name : Remote control map name.
+- resets : phandle + reset specifier pair

Should it be optional? Or should we use a sun6i compatible with a mandatory reset phandle? I mean, the driver/hardware is not going to work with the reset missing on sun6i.

Quoted 2 lines

Seems we are doing it one way for some of our drivers, and the other (optional) way for more generic ones, like USB.

Quoted 4 lines

I do not believe that we should add a new compatible just because the reset line of a block is hooked up differently. It is the exact same ip-block. Only now the reset is not controlled through the apb-gate, but controlled separately.

Quoted 3 lines

He has a point though. Your driver might very well probe nicely and everything, but still wouldn't be functional at all because the reset line wouldn't have been specified in the DT.

Right, just like other drivers we've, see e.g.:

Documentation/devicetree/bindings/mmc/sunxi-mmc.txt

Which is dealing with this in the same way.

Quoted 3 lines

The easiest way to deal with that would be in the bindings doc to update it with a compatible for the A31, and mentionning that the reset property is mandatory there.

No the easiest way to deal with this is to expect people writing the dts to know what they are doing, just like we do for a lot of the other blocks in sun6i.

Maybe put a generic note somewhere that sun6i has a reset controller, and that for all the blocks with optional resets property it should be considered mandatory on sun6i ?

I'm sorry but I'm not going to make this change for the ir bindings given that we've the same situation in a lot of other places.

Consistency is important. Moreover I believe that having a sun6i specific compatible string is just wrong, since it is the exact same hardware block as on sun5i, just with its reset line routed differently, just like e.g. the mmc controller, the uarts or the gmac all of which also do not have a sun6i specific compatible to enforce reset controller usage.

Regards,

Hans

Quoted 6 lines

Note that the code itself might not change at all though. I'd just like to avoid any potential breaking of the DT bindings themselves. If we further want to refine the code, we can do that however we want.

I have a slight preference for a clean error if reset is missing, but I won't get in the way just for that.

Quoted 2 lines

Seems this patch and the following patch were overlooked after the discussion. Any chance we could get this in?

I'm a linux/media sub-maintainer, so I've already send a pull-req for these 2 to the linux/media maintainer, iow this is taken care of :)

With the prcm in sun6i (and some later SoCs) some mod0 clocks are instantiated through the mfd framework, and as such do not work with of_clk_declare, since they do not have registers assigned to them yet at of_clk_declare init time.

Silence the error on not finding registers in the of_clk_declare mod0 clk setup method, and also register mod0-clk support as a platform driver to work properly with mfd instantiated mod0 clocks.

Signed-off-by Hans de Goede <[email protected]>

---
 drivers/clk/sunxi/clk-mod0.c | 41 ++++++++++++++++++++++++++++++++++++-----
 1 file changed, 36 insertions(+), 5 deletions(-)

drivers/clk/sunxi/clk-mod0.c +2 -1

index 658d74f..7ddab6f 100644
@@ -17,6 +17,7 @@
 #include <linux/clk-provider.h>
 #include <linux/clkdev.h>
 #include <linux/of_address.h>
+#include <linux/platform_device.h>
 
 #include "clk-factors.h"
 

@@ -67,7 +68,7 @@ static struct clk_factors_config sun4i_a10_mod0_config = {
 	.pwidth = 2,
 };
 
-static const struct factors_data sun4i_a10_mod0_data __initconst = {
+static const struct factors_data sun4i_a10_mod0_data = {
 	.enable = 31,
 	.mux = 24,
 	.muxmask = BIT(1) | BIT(0),

Hi,

Quoted 37 lines · Hans de Goede

With the prcm in sun6i (and some later SoCs) some mod0 clocks are instantiated through the mfd framework, and as such do not work with of_clk_declare, since they do not have registers assigned to them yet at of_clk_declare init time.

Silence the error on not finding registers in the of_clk_declare mod0 clk setup method, and also register mod0-clk support as a platform driver to work properly with mfd instantiated mod0 clocks.

Signed-off-by Hans de Goede <[email protected]>

---
  drivers/clk/sunxi/clk-mod0.c | 41 ++++++++++++++++++++++++++++++++++++-----
  1 file changed, 36 insertions(+), 5 deletions(-)

drivers/clk/sunxi/clk-mod0.c +2 -1

index 658d74f..7ddab6f 100644
@@ -17,6 +17,7 @@
  #include <linux/clk-provider.h>
  #include <linux/clkdev.h>
  #include <linux/of_address.h>
+#include <linux/platform_device.h>
 
  #include "clk-factors.h"
 

@@ -67,7 +68,7 @@ static struct clk_factors_config sun4i_a10_mod0_config = {
  	.pwidth = 2,
  };
 
-static const struct factors_data sun4i_a10_mod0_data __initconst = {
+static const struct factors_data sun4i_a10_mod0_data = {
  	.enable = 31,
  	.mux = 24,
  	.muxmask = BIT(1) | BIT(0),

@@ -82,17 +83,47 @@ static void __init sun4i_a10_mod0_setup(struct device_node *node)
  	void __iomem *reg;
 

drivers/clk/sunxi/clk-mod0.c static void __init sun4i_a10_mod0_setup(struct device_node *node) · line 89

Quoted 7 lines

drivers/clk/sunxi/clk-mod0.c +1 -4

  	reg = of_iomap(node, 0);
-	if (!reg) {
-		pr_err("Could not get registers for mod0-clk: %s\n",
-		       node->name);
+	if (!reg)
  		return;
-	}

A comment here would be nice to mention that this is intentional.

Add support for the ir-clk which is part of the sun6i SoC prcm module.

Signed-off-by Hans de Goede <[email protected]>

---
 drivers/mfd/sun6i-prcm.c | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

drivers/mfd/sun6i-prcm.c +0 -0

index 2f2e9f0..1911731 100644

drivers/mfd/sun6i-prcm.c +0 -0

 static const struct resource sun6i_a31_apb0_rstc_res[] = {
 	{
 		.start = 0xb0,

@@ -69,6 +77,12 @@ static const struct mfd_cell sun6i_a31_prcm_subdevs[] = {
 		.resources = sun6i_a31_apb0_gates_clk_res,
 	},

Quoted 6 lines · Hans de Goede

Add support for the ir-clk which is part of the sun6i SoC prcm module.

Signed-off-by Hans de Goede <[email protected]>

---
  drivers/mfd/sun6i-prcm.c | 14 ++++++++++++++
  1 file changed, 14 insertions(+)

Pretty standard stuff (

Quoted 5 lines

drivers/mfd/sun6i-prcm.c +0 -0

index 2f2e9f0..1911731 100644

drivers/mfd/sun6i-prcm.c static const struct resource sun6i_a31_apb0_gates_clk_res[] = { · line 50

Quoted 10 lines

drivers/mfd/sun6i-prcm.c +7 -0

@@ -41,6 +41,14 @@ static const struct resource sun6i_a31_apb0_gates_clk_res[] = {
  	},
  };
 
+static const struct resource sun6i_a31_ir_clk_res[] = {
+	{
+		.start = 0x54,
+		.end = 0x57,
+		.flags = IORESOURCE_MEM,
+	},
+};

I'm still unkeen on this registers not being defined -- but whateveer!

Quoted 6 lines

drivers/mfd/sun6i-prcm.c +0 -0

  static const struct resource sun6i_a31_apb0_rstc_res[] = {
  	{
  		.start = 0xb0,

@@ -69,6 +77,12 @@ static const struct mfd_cell sun6i_a31_prcm_subdevs[] = {
  		.resources = sun6i_a31_apb0_gates_clk_res,
  	},

drivers/mfd/sun6i-prcm.c static const struct mfd_cell sun6i_a31_prcm_subdevs[] = { · line 88

Quoted 10 lines

drivers/mfd/sun6i-prcm.c +6 -0

  	{
+		.name = "sun6i-a31-ir-clk",
+		.of_compatible = "allwinner,sun4i-a10-mod0-clk",
+		.num_resources = ARRAY_SIZE(sun6i_a31_ir_clk_res),
+		.resources = sun6i_a31_ir_clk_res,
+	},
+	{
  		.name = "sun6i-a31-apb0-clock-reset",
  		.of_compatible = "allwinner,sun6i-a31-clock-reset",
  		.num_resources = ARRAY_SIZE(sun6i_a31_apb0_rstc_res),

This is all pretty standard stuff:

For my own reference:

Acked-by Lee Jones <[email protected]>

Do you do you expect this patch to be handled?

Hi,

Quoted 50 lines · Lee Jones

Quoted 6 lines · Hans de Goede

Add support for the ir-clk which is part of the sun6i SoC prcm module.

Signed-off-by Hans de Goede <[email protected]>

---
 drivers/mfd/sun6i-prcm.c | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

Pretty standard stuff (

Quoted 5 lines

drivers/mfd/sun6i-prcm.c +0 -0

index 2f2e9f0..1911731 100644

drivers/mfd/sun6i-prcm.c static const struct resource sun6i_a31_apb0_gates_clk_res[] = { · line 50

Quoted 10 lines

drivers/mfd/sun6i-prcm.c +7 -0

@@ -41,6 +41,14 @@ static const struct resource sun6i_a31_apb0_gates_clk_res[] = {
 	},
 };
 
+static const struct resource sun6i_a31_ir_clk_res[] = {
+	{
+		.start = 0x54,
+		.end = 0x57,
+		.flags = IORESOURCE_MEM,
+	},
+};

I'm still unkeen on this registers not being defined -- but whateveer!

Quoted 6 lines

drivers/mfd/sun6i-prcm.c +0 -0

 static const struct resource sun6i_a31_apb0_rstc_res[] = {
 	{
 		.start = 0xb0,

@@ -69,6 +77,12 @@ static const struct mfd_cell sun6i_a31_prcm_subdevs[] = {
 		.resources = sun6i_a31_apb0_gates_clk_res,
 	},

drivers/mfd/sun6i-prcm.c static const struct mfd_cell sun6i_a31_prcm_subdevs[] = { · line 88

Quoted 10 lines

drivers/mfd/sun6i-prcm.c +6 -0

 	{
+		.name = "sun6i-a31-ir-clk",
+		.of_compatible = "allwinner,sun4i-a10-mod0-clk",
+		.num_resources = ARRAY_SIZE(sun6i_a31_ir_clk_res),
+		.resources = sun6i_a31_ir_clk_res,
+	},
+	{
 		.name = "sun6i-a31-apb0-clock-reset",
 		.of_compatible = "allwinner,sun6i-a31-clock-reset",
 		.num_resources = ARRAY_SIZE(sun6i_a31_apb0_rstc_res),

This is all pretty standard stuff:

For my own reference:

Quoted 3 lines

Acked-by Lee Jones <[email protected]>

Do you do you expect this patch to be handled?

I've no preference for how this goes upstream. There are no compile time deps and runtime the ir will not work (but not explode) until all the bits are in place.

Add an ir_clk sub-node to the prcm node.

Signed-off-by Hans de Goede <[email protected]>

Add a node for the ir receiver found on the A31.

Signed-off-by Hans de Goede <[email protected]>

The Mele M9 has an ir receiver, enable it.

Signed-off-by Hans de Goede <[email protected]>

Add a dtsi file for A31s based boards.

Since the A31s is the same die as the A31 in a different package, this dtsi simply includes sun6i-a31.dtsi and then overrides the pinctrl compatible to reflect the different package, everything else is identical.

Signed-off-by Hans de Goede <[email protected]>

---
Changes in v2:

(quoted diff) +0 -2

-include sun6i-a31.dtsi and override the pinctrl compatible, rather then
 copying everything
---
 arch/arm/boot/dts/sun6i-a31s.dtsi | 62 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 62 insertions(+)
 create mode 100644 arch/arm/boot/dts/sun6i-a31s.dtsi

arch/arm/boot/dts/sun6i-a31s.dtsi new file +52 -0

new file mode 100644
index 0000000..d0bd2b9
@@ -0,0 +1,62 @@
+/*
+ * Copyright 2014 Hans de Goede <[email protected]>
+ *
+ * This file is dual-licensed: you can use it either under the terms
+ * of the GPL or the X11 license, at your option. Note that this dual
+ * licensing only applies to this file, and not this project as a
+ * whole.
+ *
+ *  a) This library 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; either version 2 of the
+ *     License, or (at your option) any later version.
+ *
+ *     This library 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 library; if not, write to the Free
+ *     Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+ *     MA 02110-1301 USA
+ *
+ * Or, alternatively,
+ *
+ *  b) Permission is hereby granted, free of charge, to any person
+ *     obtaining a copy of this software and associated documentation
+ *     files (the "Software"), to deal in the Software without
+ *     restriction, including without limitation the rights to use,
+ *     copy, modify, merge, publish, distribute, sublicense, and/or
+ *     sell copies of the Software, and to permit persons to whom the
+ *     Software is furnished to do so, subject to the following
+ *     conditions:
+ *
+ *     The above copyright notice and this permission notice shall be
+ *     included in all copies or substantial portions of the Software.
+ *
+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ *     OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/*
+ * The A31s is the same die as the A31 in a different package, this is
+ * reflected by it having different pinctrl compatible everything else is
+ * identical.
+ */

Quoted 78 lines · Hans de Goede

Add a dtsi file for A31s based boards.

Since the A31s is the same die as the A31 in a different package, this dtsi simply includes sun6i-a31.dtsi and then overrides the pinctrl compatible to reflect the different package, everything else is identical.

Signed-off-by Hans de Goede <[email protected]>

---
Changes in v2:

(quoted diff) +0 -2

-include sun6i-a31.dtsi and override the pinctrl compatible, rather then
  copying everything
---
  arch/arm/boot/dts/sun6i-a31s.dtsi | 62 +++++++++++++++++++++++++++++++++++++++
  1 file changed, 62 insertions(+)
  create mode 100644 arch/arm/boot/dts/sun6i-a31s.dtsi

arch/arm/boot/dts/sun6i-a31s.dtsi new file +56 -0

new file mode 100644
index 0000000..d0bd2b9
@@ -0,0 +1,62 @@
+/*
+ * Copyright 2014 Hans de Goede <[email protected]>
+ *
+ * This file is dual-licensed: you can use it either under the terms
+ * of the GPL or the X11 license, at your option. Note that this dual
+ * licensing only applies to this file, and not this project as a
+ * whole.
+ *
+ *  a) This library 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; either version 2 of the
+ *     License, or (at your option) any later version.
+ *
+ *     This library 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 library; if not, write to the Free
+ *     Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+ *     MA 02110-1301 USA
+ *
+ * Or, alternatively,
+ *
+ *  b) Permission is hereby granted, free of charge, to any person
+ *     obtaining a copy of this software and associated documentation
+ *     files (the "Software"), to deal in the Software without
+ *     restriction, including without limitation the rights to use,
+ *     copy, modify, merge, publish, distribute, sublicense, and/or
+ *     sell copies of the Software, and to permit persons to whom the
+ *     Software is furnished to do so, subject to the following
+ *     conditions:
+ *
+ *     The above copyright notice and this permission notice shall be
+ *     included in all copies or substantial portions of the Software.
+ *
+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ *     OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/*
+ * The A31s is the same die as the A31 in a different package, this is
+ * reflected by it having different pinctrl compatible everything else is
+ * identical.
+ */
+
+/include/ "sun6i-a31.dtsi"
+
+/ {

arch/arm/boot/dts/sun6i-a31s.dtsi line 62

Quoted 6 lines

arch/arm/boot/dts/sun6i-a31s.dtsi new file +6 -0

+	soc at 01c00000 {
+		pio: pinctrl at 01c20800 {
+			compatible = "allwinner,sun6i-a31s-pinctrl";
+		};
+	};
+};

Given your previous changes, you should also update the enable-method.

Also, for this patch and the next one, Arnd just warned me that we shouldn't duplicate the DT path, and that we should switch to the new trend on using label references (like what TI or Amlogic does for example).

Hi,

Quoted 79 lines · Maxime Ripard

Quoted 78 lines · Hans de Goede

Add a dtsi file for A31s based boards.

Since the A31s is the same die as the A31 in a different package, this dtsi simply includes sun6i-a31.dtsi and then overrides the pinctrl compatible to reflect the different package, everything else is identical.

Signed-off-by Hans de Goede <[email protected]>

---
Changes in v2:

(quoted diff) +0 -2

-include sun6i-a31.dtsi and override the pinctrl compatible, rather then
 copying everything
---
 arch/arm/boot/dts/sun6i-a31s.dtsi | 62 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 62 insertions(+)
 create mode 100644 arch/arm/boot/dts/sun6i-a31s.dtsi

arch/arm/boot/dts/sun6i-a31s.dtsi new file +56 -0

new file mode 100644
index 0000000..d0bd2b9
@@ -0,0 +1,62 @@
+/*
+ * Copyright 2014 Hans de Goede <[email protected]>
+ *
+ * This file is dual-licensed: you can use it either under the terms
+ * of the GPL or the X11 license, at your option. Note that this dual
+ * licensing only applies to this file, and not this project as a
+ * whole.
+ *
+ *  a) This library 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; either version 2 of the
+ *     License, or (at your option) any later version.
+ *
+ *     This library 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 library; if not, write to the Free
+ *     Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+ *     MA 02110-1301 USA
+ *
+ * Or, alternatively,
+ *
+ *  b) Permission is hereby granted, free of charge, to any person
+ *     obtaining a copy of this software and associated documentation
+ *     files (the "Software"), to deal in the Software without
+ *     restriction, including without limitation the rights to use,
+ *     copy, modify, merge, publish, distribute, sublicense, and/or
+ *     sell copies of the Software, and to permit persons to whom the
+ *     Software is furnished to do so, subject to the following
+ *     conditions:
+ *
+ *     The above copyright notice and this permission notice shall be
+ *     included in all copies or substantial portions of the Software.
+ *
+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ *     OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/*
+ * The A31s is the same die as the A31 in a different package, this is
+ * reflected by it having different pinctrl compatible everything else is
+ * identical.
+ */
+
+/include/ "sun6i-a31.dtsi"
+
+/ {

Quoted 8 lines

arch/arm/boot/dts/sun6i-a31s.dtsi line 62

Quoted 6 lines

arch/arm/boot/dts/sun6i-a31s.dtsi new file +6 -0

+	soc at 01c00000 {
+		pio: pinctrl at 01c20800 {
+			compatible = "allwinner,sun6i-a31s-pinctrl";
+		};
+	};
+};

Given your previous changes, you should also update the enable-method.

I've not added a new compatible for the enable-method, given that this is the exact same die, so the 2 are 100?% compatible, just like you insisted that "allwinner,sun4i-a10-mod0-clk" should be used for the ir-clk since it was 100% compatible to that I believe that the enable method should use the existing compatible and not invent a new one for something which is 100% compatible.

Quoted 4 lines

Also, for this patch and the next one, Arnd just warned me that we shouldn't duplicate the DT path, and that we should switch to the new trend on using label references (like what TI or Amlogic does for example).

Ok, so something like this, right ? :

&pio {
	compatible = "allwinner,sun6i-a31s-pinctrl";
};

Quoted 91 lines · Hans de Goede

Hi,

Quoted 79 lines · Maxime Ripard

Quoted 78 lines · Hans de Goede

Add a dtsi file for A31s based boards.

Since the A31s is the same die as the A31 in a different package, this dtsi simply includes sun6i-a31.dtsi and then overrides the pinctrl compatible to reflect the different package, everything else is identical.

Signed-off-by Hans de Goede <[email protected]>

---
Changes in v2:

(quoted diff) +0 -2

-include sun6i-a31.dtsi and override the pinctrl compatible, rather then
  copying everything
---
  arch/arm/boot/dts/sun6i-a31s.dtsi | 62 +++++++++++++++++++++++++++++++++++++++
  1 file changed, 62 insertions(+)
  create mode 100644 arch/arm/boot/dts/sun6i-a31s.dtsi

arch/arm/boot/dts/sun6i-a31s.dtsi new file +56 -0

new file mode 100644
index 0000000..d0bd2b9
@@ -0,0 +1,62 @@
+/*
+ * Copyright 2014 Hans de Goede <[email protected]>
+ *
+ * This file is dual-licensed: you can use it either under the terms
+ * of the GPL or the X11 license, at your option. Note that this dual
+ * licensing only applies to this file, and not this project as a
+ * whole.
+ *
+ *  a) This library 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; either version 2 of the
+ *     License, or (at your option) any later version.
+ *
+ *     This library 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 library; if not, write to the Free
+ *     Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+ *     MA 02110-1301 USA
+ *
+ * Or, alternatively,
+ *
+ *  b) Permission is hereby granted, free of charge, to any person
+ *     obtaining a copy of this software and associated documentation
+ *     files (the "Software"), to deal in the Software without
+ *     restriction, including without limitation the rights to use,
+ *     copy, modify, merge, publish, distribute, sublicense, and/or
+ *     sell copies of the Software, and to permit persons to whom the
+ *     Software is furnished to do so, subject to the following
+ *     conditions:
+ *
+ *     The above copyright notice and this permission notice shall be
+ *     included in all copies or substantial portions of the Software.
+ *
+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ *     OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/*
+ * The A31s is the same die as the A31 in a different package, this is
+ * reflected by it having different pinctrl compatible everything else is
+ * identical.
+ */
+
+/include/ "sun6i-a31.dtsi"
+
+/ {

Quoted 8 lines

arch/arm/boot/dts/sun6i-a31s.dtsi line 62

Quoted 6 lines

arch/arm/boot/dts/sun6i-a31s.dtsi new file +6 -0

+	soc at 01c00000 {
+		pio: pinctrl at 01c20800 {
+			compatible = "allwinner,sun6i-a31s-pinctrl";
+		};
+	};
+};

Given your previous changes, you should also update the enable-method.

Quoted 6 lines

I've not added a new compatible for the enable-method, given that this is the exact same die, so the 2 are 100?% compatible, just like you insisted that "allwinner,sun4i-a10-mod0-clk" should be used for the ir-clk since it was 100% compatible to that I believe that the enable method should use the existing compatible and not invent a new one for something which is 100% compatible.

Yeah, you have a point and I agree, but your patch 3 does add a CPU_METHOD_OF_DECLARE for the A31s.

Since I was going to push the branch now that 3.19-rc1 is out, do you want me to edit your patch before doing so?

Quoted 5 lines

Quoted 4 lines

Also, for this patch and the next one, Arnd just warned me that we shouldn't duplicate the DT path, and that we should switch to the new trend on using label references (like what TI or Amlogic does for example).

Quoted 5 lines

Ok, so something like this, right ? :

&pio {
	compatible = "allwinner,sun6i-a31s-pinctrl";
};

Yep.

Quoted 99 lines · Maxime Ripard

Quoted 91 lines · Hans de Goede

Hi,

Quoted 79 lines · Maxime Ripard

Quoted 78 lines · Hans de Goede

Add a dtsi file for A31s based boards.

Since the A31s is the same die as the A31 in a different package, this dtsi simply includes sun6i-a31.dtsi and then overrides the pinctrl compatible to reflect the different package, everything else is identical.

Signed-off-by Hans de Goede <[email protected]>

---
Changes in v2:

(quoted diff) +0 -2

-include sun6i-a31.dtsi and override the pinctrl compatible, rather then
 copying everything
---
 arch/arm/boot/dts/sun6i-a31s.dtsi | 62 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 62 insertions(+)
 create mode 100644 arch/arm/boot/dts/sun6i-a31s.dtsi

arch/arm/boot/dts/sun6i-a31s.dtsi new file +56 -0

new file mode 100644
index 0000000..d0bd2b9
@@ -0,0 +1,62 @@
+/*
+ * Copyright 2014 Hans de Goede <[email protected]>
+ *
+ * This file is dual-licensed: you can use it either under the terms
+ * of the GPL or the X11 license, at your option. Note that this dual
+ * licensing only applies to this file, and not this project as a
+ * whole.
+ *
+ *  a) This library 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; either version 2 of the
+ *     License, or (at your option) any later version.
+ *
+ *     This library 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 library; if not, write to the Free
+ *     Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+ *     MA 02110-1301 USA
+ *
+ * Or, alternatively,
+ *
+ *  b) Permission is hereby granted, free of charge, to any person
+ *     obtaining a copy of this software and associated documentation
+ *     files (the "Software"), to deal in the Software without
+ *     restriction, including without limitation the rights to use,
+ *     copy, modify, merge, publish, distribute, sublicense, and/or
+ *     sell copies of the Software, and to permit persons to whom the
+ *     Software is furnished to do so, subject to the following
+ *     conditions:
+ *
+ *     The above copyright notice and this permission notice shall be
+ *     included in all copies or substantial portions of the Software.
+ *
+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ *     OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/*
+ * The A31s is the same die as the A31 in a different package, this is
+ * reflected by it having different pinctrl compatible everything else is
+ * identical.
+ */
+
+/include/ "sun6i-a31.dtsi"
+
+/ {

Quoted 8 lines

arch/arm/boot/dts/sun6i-a31s.dtsi line 62

Quoted 6 lines

arch/arm/boot/dts/sun6i-a31s.dtsi new file +6 -0

+	soc at 01c00000 {
+		pio: pinctrl at 01c20800 {
+			compatible = "allwinner,sun6i-a31s-pinctrl";
+		};
+	};
+};

Given your previous changes, you should also update the enable-method.

Quoted 6 lines

I've not added a new compatible for the enable-method, given that this is the exact same die, so the 2 are 100?% compatible, just like you insisted that "allwinner,sun4i-a10-mod0-clk" should be used for the ir-clk since it was 100% compatible to that I believe that the enable method should use the existing compatible and not invent a new one for something which is 100% compatible.

Quoted 2 lines

Yeah, you have a point and I agree, but your patch 3 does add a CPU_METHOD_OF_DECLARE for the A31s.

Ah right, it does, my bad.

Quoted 2 lines

Since I was going to push the branch now that 3.19-rc1 is out, do you want me to edit your patch before doing so?

Yes, please drop the addition of the extra CPU_METHOD_OF_DECLARE, or let me know if you want a new version instead.

Hi,

Quoted 2 lines · Hans de Goede

Quoted 1 line · Maxime Ripard

On Sat, Dec 20, 2014 at 11:24:55AM +0100, Hans de Goede wrote:

Quoted 14 lines

Quoted 11 lines

Quoted 8 lines

Quoted 1 line

Given your previous changes, you should also update the enable-method.

I've not added a new compatible for the enable-method, given that this is the exact same die, so the 2 are 100?% compatible, just like you insisted that "allwinner,sun4i-a10-mod0-clk" should be used for the ir-clk since it was 100% compatible to that I believe that the enable method should use the existing compatible and not invent a new one for something which is 100% compatible.

Yeah, you have a point and I agree, but your patch 3 does add a CPU_METHOD_OF_DECLARE for the A31s.

Ah right, it does, my bad.

Quoted 5 lines

Quoted 2 lines

Since I was going to push the branch now that 3.19-rc1 is out, do you want me to edit your patch before doing so?

Yes, please drop the addition of the extra CPU_METHOD_OF_DECLARE, or let me know if you want a new version instead.

I just modified it, and pushed it, no need to resend it.

Thanks, while looking at your dt-for-3.20 branch I noticed that you've merged v2 of "ARM: dts: sun6i: Add ir node", I did a v3 adding an ir:
label to the node, which I noticed was missing because you asked me to move the a31s dt stuff to moving label references, can you fix this up, or do you want me to do a follow up patch ?

Note that having this fixed is a pre-req for the csq-cs908 dts patch.