[GIT PULL 1/3] ARM: berlin: CPU clock topic for v4.4 (round 1)

[GIT PULL 1/3] ARM: berlin: CPU clock topic for v4.4 (round 1)

[Sebastian Hesselbarth]

Arnd, Kevin, Olof,

this is a branch adding cpu clock to the BG2Q driver while also
moving some #define to the dt-binding. As the Berlin DT PR will
require this, I have chosen to make this topic branch a
prerequisite for the DT PR. The clk driver patches have appropriate
Acked-by's from clk maintainers.

Please pull.

Sebastian

The following changes since commit 6ff33f3902c3b1c5d0db6b1e2c70b6d76fba357f:

  Linux 4.3-rc1 (2015-09-12 16:35:56 -0700)

are available in the git repository at:

  git://git.infradead.org/users/hesselba/linux-berlin.git tags/berlin-cpuclk-for-4.4-1

for you to fetch changes up to 44b2e5f96d5e8be80c4a8c09492ddae6f98afc2a:

  clk: berlin: add cpuclk (2015-09-23 22:53:01 +0200)

----------------------------------------------------------------
Marvell Berlin CPU clk topic branch:
- move MAX_CLKS to dt-binding includes
- add BG2Q CPU clock driver

This is a topic branch for cpufreq nodes added
in berlin/dt

----------------------------------------------------------------
Antoine Tenart (2):
      clk: berlin: move MAX_CLKS out of drivers/clk/berlin
      clk: berlin: add cpuclk

 drivers/clk/berlin/bg2.c             |  1 -
 drivers/clk/berlin/bg2q.c            | 13 ++++++-------
 include/dt-bindings/clock/berlin2.h  |  2 ++
 include/dt-bindings/clock/berlin2q.h |  3 +++
 4 files changed, 11 insertions(+), 8 deletions(-)

[GIT PULL 2/3] ARM: berlin: DT changes for v4.4 (round 1)

[Sebastian Hesselbarth]

Arnd, Kevin, Olof,

this is round 1 of Marvell Berlin DT changes for v4.4. There is
some improvement in serial aliases/stdout path, cpufreq properties,
and PWM nodes for all SoCs. The cpufreq properties depend on cpuclk
being available, therefore this branch has a dependency with the
cpuclk topic PR sent earlier.

Please pull.

Sebastian

The following changes since commit 6ff33f3902c3b1c5d0db6b1e2c70b6d76fba357f:

  Linux 4.3-rc1 (2015-09-12 16:35:56 -0700)

are available in the git repository at:

  git://git.infradead.org/users/hesselba/linux-berlin.git tags/berlin-dt-for-4.4-1

for you to fetch changes up to 5f5cdc08231eb802ad3890ba3bd2ef272c21b924:

  ARM: berlin: add a PWM node on the BG2CD (2015-10-05 20:09:26 +0200)

----------------------------------------------------------------
Marvell Berlin DT for 4.4 take 1
- use serial aliases and stdout path
- add cpufreq properties to all SoCs
- add pwm nodes for all SoCs

This depends on topic branch berlin-cpuclk-for-4.4-1

----------------------------------------------------------------
Antoine Tenart (6):
      ARM: berlin: dts: add the cpufreq-dt bindings on the BG2Q
      ARM: berlin: dts: add the cpufreq-dt bindings on the BG2
      ARM: berlin: dts: add the cpufreq-dt bindings on the BG2CD
      ARM: berlin: add a PWM node on the BG2Q
      ARM: berlin: add a PWM node on the BG2
      ARM: berlin: add a PWM node on the BG2CD

Jisheng Zhang (2):
      arm: dts: berlin: add aliases for serial
      arm: dts: berlin: use stdout-path

 arch/arm/boot/dts/berlin2-sony-nsz-gs7.dts        |  3 ++-
 arch/arm/boot/dts/berlin2.dtsi                    | 23 +++++++++++++++++++++++
 arch/arm/boot/dts/berlin2cd-google-chromecast.dts |  3 ++-
 arch/arm/boot/dts/berlin2cd.dtsi                  | 20 ++++++++++++++++++++
 arch/arm/boot/dts/berlin2q-marvell-dmp.dts        |  3 ++-
 arch/arm/boot/dts/berlin2q.dtsi                   | 23 +++++++++++++++++++++++
 6 files changed, 72 insertions(+), 3 deletions(-)

[GIT PULL 3/3] ARM: berlin: SoC changes for v4.4 (round 1)

[Sebastian Hesselbarth]

Arnd, Kevin, Olof,

this is Marvell Berlin SoC changes for v4.4. It only contains a
single patch to register a cpufreq-dt device that we have properties
for now.

Please pull.

Sebastian

The following changes since commit 6ff33f3902c3b1c5d0db6b1e2c70b6d76fba357f:

  Linux 4.3-rc1 (2015-09-12 16:35:56 -0700)

are available in the git repository at:

  git://git.infradead.org/users/hesselba/linux-berlin.git tags/berlin-soc-for-4.4-1

for you to fetch changes up to e1a3e724a25761a2b2e9e0e059e33afac6409a76:

  ARM: berlin: register cpufreq-dt (2015-09-21 22:57:24 +0200)

----------------------------------------------------------------
Marvell SoC for 4.4 take 1
- register cpufreq-dt device

----------------------------------------------------------------
Antoine Tenart (1):
      ARM: berlin: register cpufreq-dt

 arch/arm/mach-berlin/berlin.c | 6 ++++++
 1 file changed, 6 insertions(+)

[GIT PULL 2/3] ARM: berlin: DT changes for v4.4 (round 1)

[Arnd Bergmann]

On Friday 09 October 2015 20:48:13 Sebastian Hesselbarth wrote:
> this is round 1 of Marvell Berlin DT changes for v4.4. There is
> some improvement in serial aliases/stdout path, cpufreq properties,
> and PWM nodes for all SoCs. The cpufreq properties depend on cpuclk
> being available, therefore this branch has a dependency with the
> cpuclk topic PR sent earlier.
> 

Pulled into next/dt, thanks!

	Arnd

[GIT PULL 2/3] ARM: berlin: DT changes for v4.4 (round 1)

[Sebastian Hesselbarth]

On 14.10.2015 17:44, Arnd Bergmann wrote:
> On Friday 09 October 2015 20:48:13 Sebastian Hesselbarth wrote:
>> this is round 1 of Marvell Berlin DT changes for v4.4. There is
>> some improvement in serial aliases/stdout path, cpufreq properties,
>> and PWM nodes for all SoCs. The cpufreq properties depend on cpuclk
>> being available, therefore this branch has a dependency with the
>> cpuclk topic PR sent earlier.
>>
>
> Pulled into next/dt, thanks!

Hi Arnd,

the prerequisite cpuclk topic branch didn't make it into arm-soc causing
a build failure on bg2q dts files.

Unfortunately, cpuclk topic branch touches both, dt-includes and driver
code. I was hoping you could also pull the topic branch with berlin/dt.

I am open for suggestions how to deal with it now and in the future.

Sebastian

[GIT PULL 2/3] ARM: berlin: DT changes for v4.4 (round 1)

[Arnd Bergmann]

On Thursday 15 October 2015 14:42:12 Sebastian Hesselbarth wrote:
> On 14.10.2015 17:44, Arnd Bergmann wrote:
> > On Friday 09 October 2015 20:48:13 Sebastian Hesselbarth wrote:
> >> this is round 1 of Marvell Berlin DT changes for v4.4. There is
> >> some improvement in serial aliases/stdout path, cpufreq properties,
> >> and PWM nodes for all SoCs. The cpufreq properties depend on cpuclk
> >> being available, therefore this branch has a dependency with the
> >> cpuclk topic PR sent earlier.
> >>
> >
> > Pulled into next/dt, thanks!
> 
> Hi Arnd,
> 
> the prerequisite cpuclk topic branch didn't make it into arm-soc causing
> a build failure on bg2q dts files.
> 
> Unfortunately, cpuclk topic branch touches both, dt-includes and driver
> code. I was hoping you could also pull the topic branch with berlin/dt.
> 
> I am open for suggestions how to deal with it now and in the future.

Oops, I should have checked this better. In general, you should never
submit a branch that does not by itself build and work. Even if I had
merged your other pull request into the next/drivers branch, I would
still have a broken next/dt branch that I could not submit to Linus.

Can you create a pull request with just one patch that adds the
CLKID_CPU definition so I can merge that into next/dt to get a working
branch again?

After that, please rebase the "clk: berlin: add cpuclk" patch on top
of this one, so we can avoid conflicting commits.

Regarding the MAX_CLKS definition, please leave that out of the
dt-bindings header, it doesn't really belong in there as it has
no significance to the dts files and its definition apparently is
not stable.

	Arnd

[GIT PULL] ARM: berlin: DT CPU clock fixup for v4.4

[Sebastian Hesselbarth]

Arnd, Kevin, Olof,

this is the single patch PR to fix the broken DT PR for Berlin
sent earlier. As Arnd requested, this only contains a patch adding
the missing CPUID_CLK to Berlin clock dt-binding include.

Please pull.

Sebastian

The following changes since commit 6ff33f3902c3b1c5d0db6b1e2c70b6d76fba357f:

  Linux 4.3-rc1 (2015-09-12 16:35:56 -0700)

are available in the git repository at:

  git://git.infradead.org/users/hesselba/linux-berlin.git tags/berlin-dt-cpuclk-for-4.4-1

for you to fetch changes up to 28c039eebaaa28def9364b9a12a30192be8b4730:

  ARM: berlin: dts: add CLKID_CPU for BG2Q (2015-10-15 20:31:41 +0200)

----------------------------------------------------------------
Marvell Berlin DT CPU clock for 4.4
- add missing CLKID_CPU for Berlin BG2Q

----------------------------------------------------------------
Sebastian Hesselbarth (1):
      ARM: berlin: dts: add CLKID_CPU for BG2Q

 include/dt-bindings/clock/berlin2q.h | 1 +
 1 file changed, 1 insertion(+)

[GIT PULL] ARM: berlin: DT CPU clock fixup for v4.4

[Arnd Bergmann]

On Thursday 15 October 2015 20:44:27 Sebastian Hesselbarth wrote:
> Arnd, Kevin, Olof,
> 
> this is the single patch PR to fix the broken DT PR for Berlin
> sent earlier. As Arnd requested, this only contains a patch adding
> the missing CPUID_CLK to Berlin clock dt-binding include.
> 
> Please pull.
> 
> Sebastian
> 
> The following changes since commit 6ff33f3902c3b1c5d0db6b1e2c70b6d76fba357f:
> 
>   Linux 4.3-rc1 (2015-09-12 16:35:56 -0700)
> 
> are available in the git repository at:
> 
>   git://git.infradead.org/users/hesselba/linux-berlin.git tags/berlin-dt-cpuclk-for-4.4-1
> 
> for you to fetch changes up to 28c039eebaaa28def9364b9a12a30192be8b4730:
> 
>   ARM: berlin: dts: add CLKID_CPU for BG2Q (2015-10-15 20:31:41 +0200)
> 
> ----------------------------------------------------------------
> Marvell Berlin DT CPU clock for 4.4
> - add missing CLKID_CPU for Berlin BG2Q
> 

Pulled into next/dt, thanks a lot for the fix!

	Arnd

[GIT PULL] ARM: berlin: DT CPU clock fixup for v4.4

[Sebastian Hesselbarth]

On 15.10.2015 20:53, Arnd Bergmann wrote:
> On Thursday 15 October 2015 20:44:27 Sebastian Hesselbarth wrote:
>> Arnd, Kevin, Olof,
>>
>> this is the single patch PR to fix the broken DT PR for Berlin
>> sent earlier. As Arnd requested, this only contains a patch adding
>> the missing CPUID_CLK to Berlin clock dt-binding include.
>>
>> Please pull.
>>
>> Sebastian
>>
>> The following changes since commit 6ff33f3902c3b1c5d0db6b1e2c70b6d76fba357f:
>>
>>    Linux 4.3-rc1 (2015-09-12 16:35:56 -0700)
>>
>> are available in the git repository at:
>>
>>    git://git.infradead.org/users/hesselba/linux-berlin.git tags/berlin-dt-cpuclk-for-4.4-1
>>
>> for you to fetch changes up to 28c039eebaaa28def9364b9a12a30192be8b4730:
>>
>>    ARM: berlin: dts: add CLKID_CPU for BG2Q (2015-10-15 20:31:41 +0200)
>>
>> ----------------------------------------------------------------
>> Marvell Berlin DT CPU clock for 4.4
>> - add missing CLKID_CPU for Berlin BG2Q
>>
>
> Pulled into next/dt, thanks a lot for the fix!

Thanks a lot for the resolution!

Sebastian

[GIT PULL] ARM: berlin: CPU clock driver for v4.4 (round 1)

[Sebastian Hesselbarth]

Arnd, Kevin, Olof,

this is the remaining driver changes of the broken PRs sent earlier.
Again, as Arnd requested this branch is based on the PR adding the
CPUID to the dt-binding include and drops moving the MAX_CLKS
define from the driver to the dt-binding include.

Please pull.

The following changes since commit 28c039eebaaa28def9364b9a12a30192be8b4730:

  ARM: berlin: dts: add CLKID_CPU for BG2Q (2015-10-15 20:31:41 +0200)

are available in the git repository at:

  git://git.infradead.org/users/hesselba/linux-berlin.git tags/berlin-new-cpuclk-for-4.4-1

for you to fetch changes up to 515f1a2027006839c08c842da919abfcc3c7ae2a:

  clk: berlin: add cpuclk (2015-10-15 20:55:55 +0200)

----------------------------------------------------------------
Marvell Berlin BG2Q CPU clock driver:
- add BG2Q CPU clock to clk driver

----------------------------------------------------------------
Antoine Tenart (1):
      clk: berlin: add cpuclk

Sebastian Hesselbarth (1):
      Merge tag 'berlin-dt-cpuclk-for-4.4-1' into berlin/cpuclk

 drivers/clk/berlin/bg2q.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

[GIT PULL 3/3] ARM: berlin: SoC changes for v4.4 (round 1)

[Arnd Bergmann]

On Friday 09 October 2015 20:48:14 Sebastian Hesselbarth wrote:
> Arnd, Kevin, Olof,
> 
> this is Marvell Berlin SoC changes for v4.4. It only contains a
> single patch to register a cpufreq-dt device that we have properties
> for now.
> 
> Please pull.
> 
> Sebastian
> 
> The following changes since commit 6ff33f3902c3b1c5d0db6b1e2c70b6d76fba357f:
> 
>   Linux 4.3-rc1 (2015-09-12 16:35:56 -0700)
> 
> are available in the git repository at:
> 
>   git://git.infradead.org/users/hesselba/linux-berlin.git tags/berlin-soc-for-4.4-1
> 
> for you to fetch changes up to e1a3e724a25761a2b2e9e0e059e33afac6409a76:
> 
>   ARM: berlin: register cpufreq-dt (2015-09-21 22:57:24 +0200)
> 
> ----------------------------------------------------------------
> Marvell SoC for 4.4 take 1
> - register cpufreq-dt device

I really wish we could get rid of that crap (having to register
a device for this manually). Not your fault of course, so merged
into next/soc.

Thanks,

	Arnd

[GIT PULL] ARM: berlin: CPU clock driver for v4.4 (round 1)

[Arnd Bergmann]

On Thursday 15 October 2015 21:04:24 Sebastian Hesselbarth wrote:
> this is the remaining driver changes of the broken PRs sent earlier.
> Again, as Arnd requested this branch is based on the PR adding the
> CPUID to the dt-binding include and drops moving the MAX_CLKS
> define from the driver to the dt-binding include.

+clk maintainers

I've pulled it into next/drivers now to speed things up and given
that it has Stephen's Ack, but I'd note that now that the dependency
is handled correctly, this could have gone the normal path through the
clk maintainers.

Thanks,

	Arnd

> The following changes since commit 28c039eebaaa28def9364b9a12a30192be8b4730:
>   ARM: berlin: dts: add CLKID_CPU for BG2Q (2015-10-15 20:31:41 +0200)
> 
> are available in the git repository at:
>   git://git.infradead.org/users/hesselba/linux-berlin.git
>   tags/berlin-new-cpuclk-for-4.4-1> 
> for you to fetch changes up to 515f1a2027006839c08c842da919abfcc3c7ae2a:
>   clk: berlin: add cpuclk (2015-10-15 20:55:55 +0200)
> 
> ----------------------------------------------------------------
> Marvell Berlin BG2Q CPU clock driver:
> - add BG2Q CPU clock to clk driver
> 
> ----------------------------------------------------------------
> 
> Antoine Tenart (1):
>       clk: berlin: add cpuclk
> 
> Sebastian Hesselbarth (1):
>       Merge tag 'berlin-dt-cpuclk-for-4.4-1' into berlin/cpuclk
>  
>  drivers/clk/berlin/bg2q.c | 14 +++++++-------
>  1 file changed, 7 insertions(+), 7 deletions(-)