[PATCH 0/2] clk vexpress updates for 3.11

[PATCH 0/2] clk vexpress updates for 3.11

[Pawel Moll]

Hi Mike,

Could you please queue these two small updates of the vexpress clk
drivers?

Thanks!

Pawel

Pawel Moll (2):
  clk: vexpress: Use full node name to identify individual clocks
  clk: vexpress: Make the clock drivers directly available for arm64

 drivers/clk/Kconfig                      | 2 +-
 drivers/clk/versatile/clk-vexpress-osc.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

-- 
1.8.1.2

[PATCH 1/2] clk: vexpress: Use full node name to identify individual clocks

[Pawel Moll]

Previously all the clocks were reported as "osc". Now it will be
something like "/dcc/osc at 0".

Signed-off-by: Pawel Moll <pawel.moll@arm.com>
---
 drivers/clk/versatile/clk-vexpress-osc.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/clk/versatile/clk-vexpress-osc.c b/drivers/clk/versatile/clk-vexpress-osc.c
index 256c8be..2dc8b41 100644
--- a/drivers/clk/versatile/clk-vexpress-osc.c
+++ b/drivers/clk/versatile/clk-vexpress-osc.c
@@ -107,7 +107,7 @@ void __init vexpress_osc_of_setup(struct device_node *node)
 	osc->func = vexpress_config_func_get_by_node(node);
 	if (!osc->func) {
 		pr_err("Failed to obtain config func for node '%s'!\n",
-				node->name);
+				node->full_name);
 		goto error;
 	}
 
@@ -119,7 +119,7 @@ void __init vexpress_osc_of_setup(struct device_node *node)
 
 	of_property_read_string(node, "clock-output-names", &init.name);
 	if (!init.name)
-		init.name = node->name;
+		init.name = node->full_name;
 
 	init.ops = &vexpress_osc_ops;
 	init.flags = CLK_IS_ROOT;
-- 
1.8.1.2

[PATCH 2/2] clk: vexpress: Make the clock drivers directly available for arm64

[Pawel Moll]

The new arm64 architecture has no idea of platform or machine, so
it doesn't have to define ARCH_VEXPRESS configuration option at
all. To allow user to select the drivers at all, make it depend
on ARM64 as well.

Signed-off-by: Pawel Moll <pawel.moll@arm.com>
Acked-by: Catalin Marinas <catalin.marinas@arm.com>
---
 drivers/clk/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/clk/Kconfig b/drivers/clk/Kconfig
index 0357ac4..d0d9b21 100644
--- a/drivers/clk/Kconfig
+++ b/drivers/clk/Kconfig
@@ -42,7 +42,7 @@ config COMMON_CLK_WM831X
 
 config COMMON_CLK_VERSATILE
 	bool "Clock driver for ARM Reference designs"
-	depends on ARCH_INTEGRATOR || ARCH_REALVIEW || ARCH_VEXPRESS
+	depends on ARCH_INTEGRATOR || ARCH_REALVIEW || ARCH_VEXPRESS || ARM64
 	---help---
           Supports clocking on ARM Reference designs:
 	  - Integrator/AP and Integrator/CP
-- 
1.8.1.2

[PATCH 0/2] clk vexpress updates for 3.11

[Mike Turquette]

Quoting Pawel Moll (2013-06-10 08:05:05)
> Hi Mike,
> 
> Could you please queue these two small updates of the vexpress clk
> drivers?

Taken into clk-next for 3.11.

Regards,
Mike

> 
> Thanks!
> 
> Pawel
> 
> Pawel Moll (2):
>   clk: vexpress: Use full node name to identify individual clocks
>   clk: vexpress: Make the clock drivers directly available for arm64
> 
>  drivers/clk/Kconfig                      | 2 +-
>  drivers/clk/versatile/clk-vexpress-osc.c | 4 ++--
>  2 files changed, 3 insertions(+), 3 deletions(-)
> 
> -- 
> 1.8.1.2