ARM: Versatile irq and clock DT support

From: Rob Herring <[email protected]>

Add support for initialization using IRQCHIP_DECLARE. This also requires that the controller initialization set the handle_irq function pointer itself when it is a primary controller.

Signed-off-by Rob Herring <[email protected]>

Cc Thomas Gleixner <[email protected]>

Cc Jason Cooper <[email protected]>

---
v2:
- New patch

From: Rob Herring <[email protected]>

The secondary controller on ARM Versatile AB and PB is similar to other ARM platforms, but has a pass-thru register to connect some interrupts directly to interrupt inputs on the primary interrupt controller. The PIC_ENABLES register needs to be configured for proper operation when the matching node is arm,versatile-sic. Add the the necessary IRQCHIP_DECLARE as well.

Signed-off-by Rob Herring <[email protected]>

Cc Thomas Gleixner <[email protected]>

Cc Jason Cooper <[email protected]>

Cc Arnd Bergmann <[email protected]>

---
v2:
- Rework to use the compatible string for pass-thru register setup.

From: Rob Herring <[email protected]>

Now that versatile-fpga irqchip has IRQCHIP_DECLARE support, the interrupt related initialization can be removed.

Signed-off-by Rob Herring <[email protected]>

Cc Russell King <[email protected]>

Cc Linus Walleij <[email protected]>

---
v2:
- New patch

From: Rob Herring <[email protected]>

Now that versatile's irqchips are initialized from DT, the init_irq hook can be removed.

Signed-off-by Rob Herring <[email protected]>

Acked-by Arnd Bergmann <[email protected]>

From: Rob Herring <[email protected]>

Add binding for the core module found on ARM versatile AB and PB boards.

Signed-off-by Rob Herring <[email protected]>

Cc Pawel Moll <[email protected]>

Cc Mark Rutland <[email protected]>

Cc Ian Campbell <[email protected]>

Cc Kumar Gala <[email protected]>

Acked-by Arnd Bergmann <[email protected]>

From: Rob Herring <[email protected]>

The versatile dts is missing any clock data. Add the clocks.

It is not clear from the documentation where pclk comes from, so for now it is a dummy clock which is sufficient for things to work.

Signed-off-by Rob Herring <[email protected]>

Acked-by Arnd Bergmann <[email protected]>

---
v2:
- Move and Rename crystal node.
- Define pclk as 24MHz based on Linus W's input
- fix timer to be 3 clocks and fix names
- Fix sspclk clock name

From: Rob Herring <[email protected]>

Versatile platforms share the same OSC programming model as Integrator platforms. Add the necessary parameters and init functions for Versatile.

Renaming the file to clk-versatile.c as versatile is used as the family name for ARM, Ltd. boards.

Signed-off-by Rob Herring <[email protected]>

Cc Mike Turquette <[email protected]>

Acked-by Arnd Bergmann <[email protected]>

---
v2:
- Rename clk-integrator.c to clk-versatile.c

From: Rob Herring <[email protected]>

Versatile platforms share the same OSC programming model as Integrator platforms. Add the necessary parameters and init functions for Versatile.

Renaming the file to clk-versatile.c as versatile is used as the family name for ARM, Ltd. boards.

Signed-off-by Rob Herring <[email protected]>

Cc Mike Turquette <[email protected]>

Acked-by Arnd Bergmann <[email protected]>

---
v2:
- Rename clk-integrator.c to clk-versatile.c

 drivers/clk/versatile/Makefile                     |  3 +-
 .../{clk-integrator.c => clk-versatile.c}          | 35 ++++++++++++++++++++--
 2 files changed, 34 insertions(+), 4 deletions(-)
 rename drivers/clk/versatile/{clk-integrator.c => clk-versatile.c} (66%)

drivers/clk/versatile/Makefile +1 -2

index c16ca78..9ee2b37 100644
@@ -1,6 +1,5 @@
 # Makefile for Versatile-specific clocks
-obj-$(CONFIG_ICST)             += clk-icst.o
-obj-$(CONFIG_ARCH_INTEGRATOR)  += clk-integrator.o
+obj-$(CONFIG_ICST)             += clk-icst.o clk-versatile.o
 obj-$(CONFIG_INTEGRATOR_IMPD1) += clk-impd1.o
 obj-$(CONFIG_ARCH_REALVIEW)    += clk-realview.o
 obj-$(CONFIG_ARCH_VEXPRESS)    += clk-vexpress.o clk-sp810.o

drivers/clk/versatile/clk-versatile.c renamed from drivers/clk/versatile/clk-integrator.c +33 -2

similarity index 66%
rename from drivers/clk/versatile/clk-integrator.c
rename to drivers/clk/versatile/clk-versatile.c
index 734c4b8..fe52a79 100644
@@ -17,6 +17,9 @@
 
 #define INTEGRATOR_HDR_LOCK_OFFSET     0x14
 
+#define VERSATILE_SYS_OSCCLCD_OFFSET   0x1c
+#define VERSATILE_SYS_LOCK_OFFSET      0x20
+
 /* Base offset for the core module */
 static void __iomem *cm_base;
 

@@ -37,11 +40,27 @@ static const struct clk_icst_desc __initdata cm_auxosc_desc = {
        .lock_offset = INTEGRATOR_HDR_LOCK_OFFSET,
 };
 
-static void __init of_integrator_cm_osc_setup(struct device_node *np)
+static const struct icst_params versatile_auxosc_params = {
+       .vco_max        = ICST307_VCO_MAX,
+       .vco_min        = ICST307_VCO_MIN,
+       .vd_min         = 4 + 8,
+       .vd_max         = 511 + 8,
+       .rd_min         = 1 + 2,
+       .rd_max         = 127 + 2,
+       .s2div          = icst307_s2div,
+       .idx2s          = icst307_idx2s,
+};
+
+static const struct clk_icst_desc versatile_auxosc_desc __initconst = {
+       .params = &versatile_auxosc_params,
+       .vco_offset = VERSATILE_SYS_OSCCLCD_OFFSET,
+       .lock_offset = VERSATILE_SYS_LOCK_OFFSET,
+};
+static void __init cm_osc_setup(struct device_node *np,
+                               const struct clk_icst_desc *desc)
 {
        struct clk *clk = ERR_PTR(-EINVAL);
        const char *clk_name = np->name;
-       const struct clk_icst_desc *desc = &cm_auxosc_desc;
        const char *parent_name;
 
        if (!cm_base) {

@@ -65,5 +84,17 @@ static void __init of_integrator_cm_osc_setup(struct device_node *np)
        if (!IS_ERR(clk))
                of_clk_add_provider(np, of_clk_src_simple_get, clk);
 }
+
+static void __init of_integrator_cm_osc_setup(struct device_node *np)
+{
+       cm_osc_setup(np, &cm_auxosc_desc);
+}
 CLK_OF_DECLARE(integrator_cm_auxosc_clk,
        "arm,integrator-cm-auxosc", of_integrator_cm_osc_setup);
+
+static void __init of_versatile_cm_osc_setup(struct device_node *np)
+{
+       cm_osc_setup(np, &versatile_auxosc_desc);
+}
+CLK_OF_DECLARE(versatile_cm_auxosc_clk,
+              "arm,versatile-cm-auxosc", of_versatile_cm_osc_setup);

Signature · 1 line

1.9.1

Quoting Rob Herring (2014-05-29 15:40:21)

Quoted 8 lines

From: Rob Herring <[email protected]>

Versatile platforms share the same OSC programming model as Integrator platforms. Add the necessary parameters and init functions for Versatile.

Renaming the file to clk-versatile.c as versatile is used as the family name for ARM, Ltd. boards.

Quoted 3 lines

Signed-off-by Rob Herring <[email protected]>

Cc Mike Turquette <[email protected]>

Acked-by Arnd Bergmann <[email protected]>

So it's OK to rename the file and add the new stuff in one commit? I thought there were some guidelines about doing renames separately...

Regards,
Mike

Quoted 89 lines

---
v2:
- Rename clk-integrator.c to clk-versatile.c

 drivers/clk/versatile/Makefile                     |  3 +-
 .../{clk-integrator.c => clk-versatile.c}          | 35 ++++++++++++++++++++--
 2 files changed, 34 insertions(+), 4 deletions(-)
 rename drivers/clk/versatile/{clk-integrator.c => clk-versatile.c} (66%)

drivers/clk/versatile/Makefile +1 -2

index c16ca78..9ee2b37 100644
@@ -1,6 +1,5 @@
 # Makefile for Versatile-specific clocks
-obj-$(CONFIG_ICST)             += clk-icst.o
-obj-$(CONFIG_ARCH_INTEGRATOR)  += clk-integrator.o
+obj-$(CONFIG_ICST)             += clk-icst.o clk-versatile.o
 obj-$(CONFIG_INTEGRATOR_IMPD1) += clk-impd1.o
 obj-$(CONFIG_ARCH_REALVIEW)    += clk-realview.o
 obj-$(CONFIG_ARCH_VEXPRESS)    += clk-vexpress.o clk-sp810.o

drivers/clk/versatile/clk-versatile.c renamed from drivers/clk/versatile/clk-integrator.c +33 -3

similarity index 66%
rename from drivers/clk/versatile/clk-integrator.c
rename to drivers/clk/versatile/clk-versatile.c
index 734c4b8..fe52a79 100644
@@ -17,6 +17,9 @@
 
 #define INTEGRATOR_HDR_LOCK_OFFSET     0x14
 
+#define VERSATILE_SYS_OSCCLCD_OFFSET   0x1c
+#define VERSATILE_SYS_LOCK_OFFSET      0x20
+
 /* Base offset for the core module */
 static void __iomem *cm_base;
 

@@ -37,11 +40,27 @@ static const struct clk_icst_desc __initdata cm_auxosc_desc = {
        .lock_offset = INTEGRATOR_HDR_LOCK_OFFSET,
 };
 
-static void __init of_integrator_cm_osc_setup(struct device_node *np)
+static const struct icst_params versatile_auxosc_params = {
+       .vco_max        = ICST307_VCO_MAX,
+       .vco_min        = ICST307_VCO_MIN,
+       .vd_min         = 4 + 8,
+       .vd_max         = 511 + 8,
+       .rd_min         = 1 + 2,
+       .rd_max         = 127 + 2,
+       .s2div          = icst307_s2div,
+       .idx2s          = icst307_idx2s,
+};
+
+static const struct clk_icst_desc versatile_auxosc_desc __initconst = {
+       .params = &versatile_auxosc_params,
+       .vco_offset = VERSATILE_SYS_OSCCLCD_OFFSET,
+       .lock_offset = VERSATILE_SYS_LOCK_OFFSET,
+};
+static void __init cm_osc_setup(struct device_node *np,
+                               const struct clk_icst_desc *desc)
 {
        struct clk *clk = ERR_PTR(-EINVAL);
        const char *clk_name = np->name;
-       const struct clk_icst_desc *desc = &cm_auxosc_desc;
        const char *parent_name;
 
        if (!cm_base) {

@@ -65,5 +84,17 @@ static void __init of_integrator_cm_osc_setup(struct device_node *np)
        if (!IS_ERR(clk))
                of_clk_add_provider(np, of_clk_src_simple_get, clk);
 }
+
+static void __init of_integrator_cm_osc_setup(struct device_node *np)
+{
+       cm_osc_setup(np, &cm_auxosc_desc);
+}
 CLK_OF_DECLARE(integrator_cm_auxosc_clk,
        "arm,integrator-cm-auxosc", of_integrator_cm_osc_setup);
+
+static void __init of_versatile_cm_osc_setup(struct device_node *np)
+{
+       cm_osc_setup(np, &versatile_auxosc_desc);
+}
+CLK_OF_DECLARE(versatile_cm_auxosc_clk,
+              "arm,versatile-cm-auxosc", of_versatile_cm_osc_setup);
--

1.9.1

Quoted 13 lines

Quoting Rob Herring (2014-05-29 15:40:21)

Quoted 11 lines

From: Rob Herring <[email protected]>

Versatile platforms share the same OSC programming model as Integrator platforms. Add the necessary parameters and init functions for Versatile.

Renaming the file to clk-versatile.c as versatile is used as the family name for ARM, Ltd. boards.

Signed-off-by Rob Herring <[email protected]>

Cc Mike Turquette <[email protected]>

Acked-by Arnd Bergmann <[email protected]>

Quoted 2 lines

So it's OK to rename the file and add the new stuff in one commit? I thought there were some guidelines about doing renames separately...

You don't want to move of a chunk of code and change it along the way because you can't see the real changes, but a file rename does not affect the diff here (other than the Makefile change).

Rob

Quoted 93 lines

Regards,
Mike

Quoted 89 lines

---
v2:
- Rename clk-integrator.c to clk-versatile.c

 drivers/clk/versatile/Makefile                     |  3 +-
 .../{clk-integrator.c => clk-versatile.c}          | 35 ++++++++++++++++++++--
 2 files changed, 34 insertions(+), 4 deletions(-)
 rename drivers/clk/versatile/{clk-integrator.c => clk-versatile.c} (66%)

drivers/clk/versatile/Makefile +1 -2

index c16ca78..9ee2b37 100644
@@ -1,6 +1,5 @@
 # Makefile for Versatile-specific clocks
-obj-$(CONFIG_ICST)             += clk-icst.o
-obj-$(CONFIG_ARCH_INTEGRATOR)  += clk-integrator.o
+obj-$(CONFIG_ICST)             += clk-icst.o clk-versatile.o
 obj-$(CONFIG_INTEGRATOR_IMPD1) += clk-impd1.o
 obj-$(CONFIG_ARCH_REALVIEW)    += clk-realview.o
 obj-$(CONFIG_ARCH_VEXPRESS)    += clk-vexpress.o clk-sp810.o

drivers/clk/versatile/clk-versatile.c renamed from drivers/clk/versatile/clk-integrator.c +33 -3

similarity index 66%
rename from drivers/clk/versatile/clk-integrator.c
rename to drivers/clk/versatile/clk-versatile.c
index 734c4b8..fe52a79 100644
@@ -17,6 +17,9 @@
 
 #define INTEGRATOR_HDR_LOCK_OFFSET     0x14
 
+#define VERSATILE_SYS_OSCCLCD_OFFSET   0x1c
+#define VERSATILE_SYS_LOCK_OFFSET      0x20
+
 /* Base offset for the core module */
 static void __iomem *cm_base;
 

@@ -37,11 +40,27 @@ static const struct clk_icst_desc __initdata cm_auxosc_desc = {
        .lock_offset = INTEGRATOR_HDR_LOCK_OFFSET,
 };
 
-static void __init of_integrator_cm_osc_setup(struct device_node *np)
+static const struct icst_params versatile_auxosc_params = {
+       .vco_max        = ICST307_VCO_MAX,
+       .vco_min        = ICST307_VCO_MIN,
+       .vd_min         = 4 + 8,
+       .vd_max         = 511 + 8,
+       .rd_min         = 1 + 2,
+       .rd_max         = 127 + 2,
+       .s2div          = icst307_s2div,
+       .idx2s          = icst307_idx2s,
+};
+
+static const struct clk_icst_desc versatile_auxosc_desc __initconst = {
+       .params = &versatile_auxosc_params,
+       .vco_offset = VERSATILE_SYS_OSCCLCD_OFFSET,
+       .lock_offset = VERSATILE_SYS_LOCK_OFFSET,
+};
+static void __init cm_osc_setup(struct device_node *np,
+                               const struct clk_icst_desc *desc)
 {
        struct clk *clk = ERR_PTR(-EINVAL);
        const char *clk_name = np->name;
-       const struct clk_icst_desc *desc = &cm_auxosc_desc;
        const char *parent_name;
 
        if (!cm_base) {

@@ -65,5 +84,17 @@ static void __init of_integrator_cm_osc_setup(struct device_node *np)
        if (!IS_ERR(clk))
                of_clk_add_provider(np, of_clk_src_simple_get, clk);
 }
+
+static void __init of_integrator_cm_osc_setup(struct device_node *np)
+{
+       cm_osc_setup(np, &cm_auxosc_desc);
+}
 CLK_OF_DECLARE(integrator_cm_auxosc_clk,
        "arm,integrator-cm-auxosc", of_integrator_cm_osc_setup);
+
+static void __init of_versatile_cm_osc_setup(struct device_node *np)
+{
+       cm_osc_setup(np, &versatile_auxosc_desc);
+}
+CLK_OF_DECLARE(versatile_cm_auxosc_clk,
+              "arm,versatile-cm-auxosc", of_versatile_cm_osc_setup);
--

1.9.1

Linus, This could use testing again on Versatile.

Quoted 1 line · Rob Herring

Linus, This could use testing again on Versatile.

OK I should probably test on Versatile *and* the Integrators since these are also affected. Do you have a branch I can pull?

Quoted 1 line · Rob Herring

Linus, This could use testing again on Versatile.

OK I should probably test on Versatile *and* the Integrators since these are also affected. Do you have a branch I can pull?

Quoted 6 lines · Linus Walleij

Quoted 1 line · Rob Herring

Linus, This could use testing again on Versatile.

OK I should probably test on Versatile *and* the Integrators since these are also affected. Do you have a branch I can pull?

Did you get a chance to test this series?

Quoted 5 lines · Jason Cooper

Quoted 4 lines · Linus Walleij

Quoted 1 line · Rob Herring

Linus, This could use testing again on Versatile.

Quoted 4 lines

Quoted 2 lines

OK I should probably test on Versatile *and* the Integrators since these are also affected. Do you have a branch I can pull?

Did you get a chance to test this series?

Sadly not yet :-(

I'm snowed under by regressions FTM.