Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1669368 > unrolled thread

[GIT PULL] Improve cp110 clk support on Marvell Armada 7K/8K

Back to article view | Back to linux.kernel

Contents

  [GIT PULL] Improve cp110 clk support on Marvell Armada 7K/8K Gregory CLEMENT <gregory.clement@free-electrons.com> - 2017-06-19 17:50 +0200
    Re: [GIT PULL] Improve cp110 clk support on Marvell Armada 7K/8K Stephen Boyd <sboyd@codeaurora.org> - 2017-06-20 02:20 +0200
      Re: [GIT PULL] Improve cp110 clk support on Marvell Armada 7K/8K Gregory CLEMENT <gregory.clement@free-electrons.com> - 2017-06-20 09:40 +0200

#1669368 — [GIT PULL] Improve cp110 clk support on Marvell Armada 7K/8K

Hi Mike, Stephen,

This time I turned the series in a pull request so I removed the
device tree binding part which will be in an other series for Rob
Herring and I also removed the dt part that I will take care of once
you will have pulled this one.

I hope this will be easier for you to apply this way.

Thanks!

Gregory

The following changes since commit 2ea659a9ef488125eb46da6eb571de5eae5c43f6:

  Linux 4.12-rc1 (Sat, 13 May 2017 13:19:49 -0700)

are available in the git repository at:

  git://git.infradead.org/linux-mvebu.git refs/heads/clk-cp110

for you to fetch changes up to a45af6d3a98b4d8a2746de13a8db52fb4123bb56:

  clk: mvebu: cp110: add sdio clock to cp-110 system controller (Wed, 31 May 2017 15:19:15 +0200)

----------------------------------------------------------------
Improve cp110 clk support on Marvell Armada 7K/8K

We got more information about the clock controllers and the clock tree
of the CP110 part that we find in the Marvell Armada 7K/8K SoCs. The
clk driver is modified accordingly from this new information.

----------------------------------------------------------------
Gregory CLEMENT (3):
  clk: mvebu: cp110: make failure labels more meaningful
  clk: mvebu: cp110: do not depend anymore of the *-clock-output-names
  clk: mvebu: cp110: introduce a new binding

Konstantin Porotchkin (1):
  clk: mvebu: cp110: add sdio clock to cp-110 system controller

 drivers/clk/mvebu/cp110-system-controller.c | 200 ++++++++++++++-------
 1 file changed, 138 insertions(+), 62 deletions(-)

-- 
git-series 0.9.1

[toc] | [next] | [standalone]

#1670105

On 06/19, Gregory CLEMENT wrote:
> 
> Hi Mike, Stephen,
> 
> This time I turned the series in a pull request so I removed the
> device tree binding part which will be in an other series for Rob
> Herring and I also removed the dt part that I will take care of once
> you will have pulled this one.
> 
> I hope this will be easier for you to apply this way.
> 

Ok. It wasn't clear what was going on and I forgot to ask in the
lastest patch series. Pulled into clk-next, but I had to apply
this patch on top:

---8<----
From: Stephen Boyd <sboyd@codeaurora.org>
Subject: [PATCH] clk: mvebu: cp110: Minor cleanups

Mark an array of strings static const and remove the dereference
of a function pointer when assigning to the platform driver probe
struct member.

drivers/clk/mvebu/cp110-system-controller.c:89:12:
warning: symbol 'gate_base_names' was not declared. Should it be static?
drivers/clk/mvebu/cp110-system-controller.c:447:18:
error: cannot dereference this type

Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
---
 drivers/clk/mvebu/cp110-system-controller.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/clk/mvebu/cp110-system-controller.c b/drivers/clk/mvebu/cp110-system-controller.c
index b034b79345ec..ca9a0a536174 100644
--- a/drivers/clk/mvebu/cp110-system-controller.c
+++ b/drivers/clk/mvebu/cp110-system-controller.c
@@ -86,7 +86,7 @@ enum {
 #define CP110_GATE_EIP150		25
 #define CP110_GATE_EIP197		26
 
-const char *gate_base_names[] = {
+static const char * const gate_base_names[] = {
 	[CP110_GATE_AUDIO]	= "audio",
 	[CP110_GATE_COMM_UNIT]	= "communit",
 	[CP110_GATE_NAND]	= "nand",
@@ -437,14 +437,13 @@ static int cp110_clk_probe(struct platform_device *pdev)
 	return cp110_syscon_common_probe(pdev, pdev->dev.of_node->parent);
 }
 
-
 static const struct of_device_id cp110_syscon_legacy_of_match[] = {
 	{ .compatible = "marvell,cp110-system-controller0", },
 	{ }
 };
 
 static struct platform_driver cp110_syscon_legacy_driver = {
-	.probe = *cp110_syscon_legacy_clk_probe,
+	.probe = cp110_syscon_legacy_clk_probe,
 	.driver		= {
 		.name	= "marvell-cp110-system-controller0",
 		.of_match_table = cp110_syscon_legacy_of_match,
-- 
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum,
a Linux Foundation Collaborative Project

[toc] | [prev] | [next] | [standalone]

#1670379

Hi Stephen,
 
 On mar., juin 20 2017, Stephen Boyd <sboyd@codeaurora.org> wrote:

> On 06/19, Gregory CLEMENT wrote:
>> 
>> Hi Mike, Stephen,
>> 
>> This time I turned the series in a pull request so I removed the
>> device tree binding part which will be in an other series for Rob
>> Herring and I also removed the dt part that I will take care of once
>> you will have pulled this one.
>> 
>> I hope this will be easier for you to apply this way.
>> 
>
> Ok. It wasn't clear what was going on and I forgot to ask in the
> lastest patch series. Pulled into clk-next, but I had to apply
> this patch on top:

Thanks for the pull and the fix patch!

Gregory

>
> ---8<----
> From: Stephen Boyd <sboyd@codeaurora.org>
> Subject: [PATCH] clk: mvebu: cp110: Minor cleanups
>
> Mark an array of strings static const and remove the dereference
> of a function pointer when assigning to the platform driver probe
> struct member.
>
> drivers/clk/mvebu/cp110-system-controller.c:89:12:
> warning: symbol 'gate_base_names' was not declared. Should it be static?
> drivers/clk/mvebu/cp110-system-controller.c:447:18:
> error: cannot dereference this type
>
> Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
> ---
>  drivers/clk/mvebu/cp110-system-controller.c | 5 ++---
>  1 file changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/clk/mvebu/cp110-system-controller.c b/drivers/clk/mvebu/cp110-system-controller.c
> index b034b79345ec..ca9a0a536174 100644
> --- a/drivers/clk/mvebu/cp110-system-controller.c
> +++ b/drivers/clk/mvebu/cp110-system-controller.c
> @@ -86,7 +86,7 @@ enum {
>  #define CP110_GATE_EIP150		25
>  #define CP110_GATE_EIP197		26
>  
> -const char *gate_base_names[] = {
> +static const char * const gate_base_names[] = {
>  	[CP110_GATE_AUDIO]	= "audio",
>  	[CP110_GATE_COMM_UNIT]	= "communit",
>  	[CP110_GATE_NAND]	= "nand",
> @@ -437,14 +437,13 @@ static int cp110_clk_probe(struct platform_device *pdev)
>  	return cp110_syscon_common_probe(pdev, pdev->dev.of_node->parent);
>  }
>  
> -
>  static const struct of_device_id cp110_syscon_legacy_of_match[] = {
>  	{ .compatible = "marvell,cp110-system-controller0", },
>  	{ }
>  };
>  
>  static struct platform_driver cp110_syscon_legacy_driver = {
> -	.probe = *cp110_syscon_legacy_clk_probe,
> +	.probe = cp110_syscon_legacy_clk_probe,
>  	.driver		= {
>  		.name	= "marvell-cp110-system-controller0",
>  		.of_match_table = cp110_syscon_legacy_of_match,
> -- 
> Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum,
> a Linux Foundation Collaborative Project

-- 
Gregory Clement, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web