[GIT PULL 1/3] rockchip soc changes for 4.5

[GIT PULL 1/3] rockchip soc changes for 4.5

[Heiko Stübner]

Hi Arnd, Kevin, Olof,

after Arnd didn't like the arch-timer-supply fixup for the rk3036, I've
dropped that patch for further discussion. So this pull request includes
the other changes from that req and additionally a compatible for the
newly supported rk3228 quad-core Cortex-A7.


The following changes since commit 8005c49d9aea74d382f474ce11afbbc7d7130bec:

  Linux 4.4-rc1 (2015-11-15 17:00:27 -0800)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git tags/v4.5-rockchip-soc-1

for you to fetch changes up to 2608224c81a7d242a9b451b97011410b182f0da7:

  ARM: rockchip: enable support for RK3228 SoCs (2015-12-16 22:15:06 +0100)

----------------------------------------------------------------
SMP special case for the rk3036 and addition of the rk3228
quad-core Cortex-A7 cpu.

----------------------------------------------------------------
Heiko Stuebner (2):
      ARM: rockchip: add support smp for rk3036
      ARM: rockchip: use const and __initconst for rk3036 smp_operations

Jeffy Chen (1):
      ARM: rockchip: enable support for RK3228 SoCs

 Documentation/devicetree/bindings/arm/cpus.txt |  1 +
 arch/arm/mach-rockchip/platsmp.c               | 45 +++++++++++++++++++-------
 arch/arm/mach-rockchip/rockchip.c              |  1 +
 3 files changed, 35 insertions(+), 12 deletions(-)

[GIT PULL 2/3] rockchip dts32 changes for 4.5, round 2

[Heiko Stübner]

Hi Arnd, Kevin, Olof,

here is another pile of dts32 changes. Rockchip choose to support another
of their Cortex-A7 socs in mainline, so we have a new dtsi for the rk3228
and some other misc improvements described in the tag.



The following changes since commit 066111411101f6b020af1a7c752859a12476ba21:

  ARM: dts: rockchip: add gpio-ir-receiver to the R89 board (2015-12-04 20:01:27 +0100)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git tags/v4.5-rockchip-dts32-2

for you to fetch changes up to 94cf32b97bbb043b99e914aacff1a6d7833daf58:

  ARM: dts: rockchip: add the kylin board for rk3036 (2015-12-19 18:11:48 +0100)

----------------------------------------------------------------
Another new soc - the rk3228 quad-core cortex-a7, a new rk3036 board,
support for the efuses on Rockchip socs and some improvements for
rk3288 regulators.

----------------------------------------------------------------
Caesar Wang (5):
      ARM: dts: rockchip: fix voltage ranges for rk3288-evb-act8846 board
      ARM: dts: rockchip: add eFuse node for rk3066a SoCs
      ARM: dts: rockchip: add eFuse node for rk3188 SoCs
      ARM: dts: rockchip: add the sdio/sdmmc node for rk3036
      ARM: dts: rockchip: add the kylin board for rk3036

Chris Zhong (4):
      clk: rockchip: add id for mipidsi sclk on rk3288
      ARM: dts: rockchip: correct the name of REG8 for rk3288-evb-act8846
      ARM: dts: rockchip: add 2 regulators for rk3288-evb-act8846
      ARM: dts: rockchip: move the public part to rk3288-evb common

Heiko Stuebner (1):
      Merge branch 'v4.5-clk/clkids' into v4.5-armsoc/dts32

Jeffy Chen (3):
      clk: rockchip: add dt-binding header for rk3228
      ARM: dts: rockchip: add core rk3228 dtsi
      ARM: dts: rockchip: add rk3228-evb board

Matthias Brugger (1):
      ARM: dts: rockchip: Fix typo in rk3288 sdmmc card detect pin name

Xing Zheng (1):
      ARM: dts: rockchip: fix the pinctrl bias settings for rk3036

ZhengShunQian (2):
      clk: rockchip: Add the clock ids of rk3288 eFuses
      ARM: dts: rockchip: add eFuse config of rk3288 SoC

 Documentation/devicetree/bindings/arm/rockchip.txt |   8 +
 arch/arm/boot/dts/Makefile                         |   2 +
 arch/arm/boot/dts/rk3036-kylin.dts                 | 300 ++++++++++++++
 arch/arm/boot/dts/rk3036.dtsi                      | 106 ++++-
 arch/arm/boot/dts/rk3066a.dtsi                     |  13 +
 arch/arm/boot/dts/rk3188.dtsi                      |  13 +
 arch/arm/boot/dts/rk3228-evb.dts                   |  66 +++
 arch/arm/boot/dts/rk3228.dtsi                      | 442 +++++++++++++++++++++
 arch/arm/boot/dts/rk3288-evb-act8846.dts           |  44 +-
 arch/arm/boot/dts/rk3288-evb-rk808.dts             |  27 --
 arch/arm/boot/dts/rk3288-evb.dtsi                  |  37 +-
 arch/arm/boot/dts/rk3288.dtsi                      |  15 +-
 include/dt-bindings/clock/rk3228-cru.h             | 220 ++++++++++
 include/dt-bindings/clock/rk3288-cru.h             |   3 +
 14 files changed, 1237 insertions(+), 59 deletions(-)
 create mode 100644 arch/arm/boot/dts/rk3036-kylin.dts
 create mode 100644 arch/arm/boot/dts/rk3228-evb.dts
 create mode 100644 arch/arm/boot/dts/rk3228.dtsi
 create mode 100644 include/dt-bindings/clock/rk3228-cru.h

[GIT PULL 2/3] rockchip dts32 changes for 4.5, round 2

[Olof Johansson]

On Mon, Dec 21, 2015 at 02:24:13AM +0100, Heiko St?bner wrote:
> Hi Arnd, Kevin, Olof,
> 
> here is another pile of dts32 changes. Rockchip choose to support another
> of their Cortex-A7 socs in mainline, so we have a new dtsi for the rk3228
> and some other misc improvements described in the tag.
> 
> 
> 
> The following changes since commit 066111411101f6b020af1a7c752859a12476ba21:
> 
>   ARM: dts: rockchip: add gpio-ir-receiver to the R89 board (2015-12-04 20:01:27 +0100)
> 
> are available in the git repository at:
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git tags/v4.5-rockchip-dts32-2
> 
> for you to fetch changes up to 94cf32b97bbb043b99e914aacff1a6d7833daf58:
> 
>   ARM: dts: rockchip: add the kylin board for rk3036 (2015-12-19 18:11:48 +0100)
> 
> ----------------------------------------------------------------
> Another new soc - the rk3228 quad-core cortex-a7, a new rk3036 board,
> support for the efuses on Rockchip socs and some improvements for
> rk3288 regulators.

Merged, thanks.


-Olof

[GIT PULL 3/3] rockchip dts64 changes for 4.5, round 2

[Heiko Stübner]

Hi Arnd, Kevin, Olof,

and finally a small stack of 64bit devicetree changes, mainly adding the
broadcast-timer node for the driver that got improved to support arm64
compilations.

So if these 3 look ok, please pull.


Thanks
Heiko


The following changes since commit 5378e28c9776fbab6065cfb54417acff3ea5f1fd:

  arm64: dts: rockchip: add rk3368 evaluation board (2015-12-02 00:35:22 +0100)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git tags/v4.5-rockchip-dts64-2

for you to fetch changes up to b8084e5b34e83875846053bf9cd951b7640e40fe:

  arm64: dts: rockchip: Add the broadcast-timer for RK3368 SoC (2015-12-12 23:20:38 +0100)

----------------------------------------------------------------
New node for the broadcast-timer of the rk3368, a non-critical fix for
a regulator voltage and a typo fix.

----------------------------------------------------------------
Caesar Wang (2):
      arm64: dts: rockchip: correct voltage range for rk3368-evb-act8846 board
      arm64: dts: rockchip: Add the broadcast-timer for RK3368 SoC

Matthias Brugger (1):
      arm64: dts: rockchip: Fix typo in rk3368 sdmmc card detect pin name

 arch/arm64/boot/dts/rockchip/rk3368-evb-act8846.dts | 6 +++---
 arch/arm64/boot/dts/rockchip/rk3368.dtsi            | 8 +++++++-
 2 files changed, 10 insertions(+), 4 deletions(-)

[GIT PULL 3/3] rockchip dts64 changes for 4.5, round 2

[Olof Johansson]

On Mon, Dec 21, 2015 at 02:28:27AM +0100, Heiko St?bner wrote:
> Hi Arnd, Kevin, Olof,
> 
> and finally a small stack of 64bit devicetree changes, mainly adding the
> broadcast-timer node for the driver that got improved to support arm64
> compilations.
> 
> So if these 3 look ok, please pull.
> 
> 
> Thanks
> Heiko
> 
> 
> The following changes since commit 5378e28c9776fbab6065cfb54417acff3ea5f1fd:
> 
>   arm64: dts: rockchip: add rk3368 evaluation board (2015-12-02 00:35:22 +0100)
> 
> are available in the git repository at:
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git tags/v4.5-rockchip-dts64-2
> 
> for you to fetch changes up to b8084e5b34e83875846053bf9cd951b7640e40fe:
> 
>   arm64: dts: rockchip: Add the broadcast-timer for RK3368 SoC (2015-12-12 23:20:38 +0100)

Merged, thanks.


-Olof

[GIT PULL 1/3] rockchip soc changes for 4.5

[Olof Johansson]

On Mon, Dec 21, 2015 at 02:21:14AM +0100, Heiko St?bner wrote:
> Hi Arnd, Kevin, Olof,
> 
> after Arnd didn't like the arch-timer-supply fixup for the rk3036, I've
> dropped that patch for further discussion. So this pull request includes
> the other changes from that req and additionally a compatible for the
> newly supported rk3228 quad-core Cortex-A7.
> 
> 
> The following changes since commit 8005c49d9aea74d382f474ce11afbbc7d7130bec:
> 
>   Linux 4.4-rc1 (2015-11-15 17:00:27 -0800)
> 
> are available in the git repository at:
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git tags/v4.5-rockchip-soc-1
> 
> for you to fetch changes up to 2608224c81a7d242a9b451b97011410b182f0da7:
> 
>   ARM: rockchip: enable support for RK3228 SoCs (2015-12-16 22:15:06 +0100)

Merged, thanks.


-Olof

[GIT PULL 1/3] rockchip soc changes for 4.5

[Heiko Stübner]

Hi Arnd, Kevin, Olof,

please find below rockchip soc changes for 4.5 .

There exists one possible merge conflict with armsoc/cleanup, due to the newly
added const/__initconst attributes in the smp_operations.

But I've already also adapted the new smp operation struct accordingly.


The following changes since commit 8005c49d9aea74d382f474ce11afbbc7d7130bec:

  Linux 4.4-rc1 (2015-11-15 17:00:27 -0800)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git tags/v4.5-rockchip-soc

for you to fetch changes up to 24fdb345d7a9e1ee8dc6fe138a250c63f918fed5:

  ARM: rockchip: use const and __initconst for rk3036 smp_operations (2015-12-04 18:36:02 +0100)

----------------------------------------------------------------
SMP special case for the rk3036 and making sure the arch-timer
supply is enabled, similar to the rk3288.

----------------------------------------------------------------
Heiko Stuebner (2):
      ARM: rockchip: add support smp for rk3036
      ARM: rockchip: use const and __initconst for rk3036 smp_operations

Xing Zheng (1):
      ARM: rockchip: make sure timer5 is enabled on rk3036 platforms

 Documentation/devicetree/bindings/arm/cpus.txt |  1 +
 arch/arm/mach-rockchip/platsmp.c               | 45 +++++++++++++++++++-------
 arch/arm/mach-rockchip/rockchip.c              | 44 +++++++++++++++----------
 3 files changed, 61 insertions(+), 29 deletions(-)

[GIT PULL 1/3] rockchip soc changes for 4.5

[Arnd Bergmann]

On Saturday 05 December 2015 01:53:38 Heiko St?bner wrote:
> SMP special case for the rk3036 and making sure the arch-timer
> supply is enabled, similar to the rk3288.

That is a rather ugly hack, I'd prefer if this could be done cleaner
rather than duplicated into another place.

Sorry for not seeing this earlier. Can you replace the hardcoded 
RK3036_TIMER_PHYS and RK3288_TIMER6_7_PHYS constants with a DT
lookup, to make it somewhat less hacky?

	Arnd

[GIT PULL 1/3] rockchip soc changes for 4.5

[Heiko Stübner]

Hi Arnd,

Am Samstag, 12. Dezember 2015, 01:30:17 schrieb Arnd Bergmann:
> On Saturday 05 December 2015 01:53:38 Heiko St?bner wrote:
> > SMP special case for the rk3036 and making sure the arch-timer
> > supply is enabled, similar to the rk3288.
> 
> That is a rather ugly hack, I'd prefer if this could be done cleaner
> rather than duplicated into another place.

I do agree that it is rather ugly :-) .

The general opinion seems to be, that firmware is supposed to make sure this 
timer is enabled and at the time when it got introduced the consensus was to 
not hack up the arch-timer to facilitate this and "just" put it into the soc 
code for the affected cpu.

It seems like the really new rk3228 (quad-core A7 and using psci now) actually 
gets this right now, in having its firmware taking care of this. So it looks 
like this hopefully won't be needed even for future arm32 socs.

I guess I should look at what the new and shiny mainline uboot support does 
for this, but I do think it might actually do it right as well.

So this is really only a hack for flaky vendor-bootloaders.


Which brings me to ...

> Sorry for not seeing this earlier. Can you replace the hardcoded
> RK3036_TIMER_PHYS and RK3288_TIMER6_7_PHYS constants with a DT
> lookup, to make it somewhat less hacky?

I'm not really sure how that is supposed to look like. Technically nothing 
should ever touch that timer, as it will only make the system hang if it gets 
disabled.

We do have a binding for the timer ip block (rockchip,rk3288-timer) but of 
course cannot use that, to make sure the regular timer driver doesn't bind to 
it. So I guess we could do something like:


timer at 200440a0 {
	compatible = "rockchip,arch-timer-supply";
	reg = <0x200440a0 0x20>;
};

try to find this and enable it, but duplicating the hack and spreading it into 
the dts as well somehow doesn't feel like an improvement ;-) .

But I maybe you have a nicer idea on how to do this, than me.


Thanks
Heiko

[GIT PULL 1/3] rockchip soc changes for 4.5

[Doug Anderson]

Heiko,

On Fri, Dec 11, 2015 at 4:57 PM, Heiko St?bner <heiko@sntech.de> wrote:
> Hi Arnd,
>
> Am Samstag, 12. Dezember 2015, 01:30:17 schrieb Arnd Bergmann:
>> On Saturday 05 December 2015 01:53:38 Heiko St?bner wrote:
>> > SMP special case for the rk3036 and making sure the arch-timer
>> > supply is enabled, similar to the rk3288.
>>
>> That is a rather ugly hack, I'd prefer if this could be done cleaner
>> rather than duplicated into another place.
>
> I do agree that it is rather ugly :-) .
>
> The general opinion seems to be, that firmware is supposed to make sure this
> timer is enabled and at the time when it got introduced the consensus was to
> not hack up the arch-timer to facilitate this and "just" put it into the soc
> code for the affected cpu.
>
> It seems like the really new rk3228 (quad-core A7 and using psci now) actually
> gets this right now, in having its firmware taking care of this. So it looks
> like this hopefully won't be needed even for future arm32 socs.
>
> I guess I should look at what the new and shiny mainline uboot support does
> for this, but I do think it might actually do it right as well.
>
> So this is really only a hack for flaky vendor-bootloaders.
>
>
> Which brings me to ...
>
>> Sorry for not seeing this earlier. Can you replace the hardcoded
>> RK3036_TIMER_PHYS and RK3288_TIMER6_7_PHYS constants with a DT
>> lookup, to make it somewhat less hacky?
>
> I'm not really sure how that is supposed to look like. Technically nothing
> should ever touch that timer, as it will only make the system hang if it gets
> disabled.
>
> We do have a binding for the timer ip block (rockchip,rk3288-timer) but of
> course cannot use that, to make sure the regular timer driver doesn't bind to
> it. So I guess we could do something like:
>
>
> timer at 200440a0 {
>         compatible = "rockchip,arch-timer-supply";
>         reg = <0x200440a0 0x20>;
> };
>
> try to find this and enable it, but duplicating the hack and spreading it into
> the dts as well somehow doesn't feel like an improvement ;-) .
>
> But I maybe you have a nicer idea on how to do this, than me.

In a kernel tree drop from Rockchip I noticed that they're still
carrying around the patch "ARM: rockchip: make sure timer5 is enabled
on rk3036 platforms" as if it made it upstream, but as per this thread
it didn't.

Does someone have ownership resolving this?  Perhaps everyone has
updated to a bootloader that avoids the need for this patch now?

-Doug

[GIT PULL 1/3] rockchip soc changes for 4.5

[Heiko Stübner]

Am Montag, 7. M?rz 2016, 16:46:04 schrieb Doug Anderson:
> On Fri, Dec 11, 2015 at 4:57 PM, Heiko St?bner <heiko@sntech.de> wrote:
> > Hi Arnd,
> > 
> > Am Samstag, 12. Dezember 2015, 01:30:17 schrieb Arnd Bergmann:
> >> On Saturday 05 December 2015 01:53:38 Heiko St?bner wrote:
> >> > SMP special case for the rk3036 and making sure the arch-timer
> >> > supply is enabled, similar to the rk3288.
> >> 
> >> That is a rather ugly hack, I'd prefer if this could be done cleaner
> >> rather than duplicated into another place.
> > 
> > I do agree that it is rather ugly :-) .
> > 
> > The general opinion seems to be, that firmware is supposed to make sure
> > this timer is enabled and at the time when it got introduced the
> > consensus was to not hack up the arch-timer to facilitate this and "just"
> > put it into the soc code for the affected cpu.
> > 
> > It seems like the really new rk3228 (quad-core A7 and using psci now)
> > actually gets this right now, in having its firmware taking care of this.
> > So it looks like this hopefully won't be needed even for future arm32
> > socs.
> > 
> > I guess I should look at what the new and shiny mainline uboot support
> > does
> > for this, but I do think it might actually do it right as well.
> > 
> > So this is really only a hack for flaky vendor-bootloaders.
> > 
> > 
> > Which brings me to ...
> > 
> >> Sorry for not seeing this earlier. Can you replace the hardcoded
> >> RK3036_TIMER_PHYS and RK3288_TIMER6_7_PHYS constants with a DT
> >> lookup, to make it somewhat less hacky?
> > 
> > I'm not really sure how that is supposed to look like. Technically nothing
> > should ever touch that timer, as it will only make the system hang if it
> > gets disabled.
> > 
> > We do have a binding for the timer ip block (rockchip,rk3288-timer) but of
> > course cannot use that, to make sure the regular timer driver doesn't bind
> > to it. So I guess we could do something like:
> > 
> > 
> > timer at 200440a0 {
> > 
> >         compatible = "rockchip,arch-timer-supply";
> >         reg = <0x200440a0 0x20>;
> > 
> > };
> > 
> > try to find this and enable it, but duplicating the hack and spreading it
> > into the dts as well somehow doesn't feel like an improvement ;-) .
> > 
> > But I maybe you have a nicer idea on how to do this, than me.
> 
> In a kernel tree drop from Rockchip I noticed that they're still
> carrying around the patch "ARM: rockchip: make sure timer5 is enabled
> on rk3036 platforms" as if it made it upstream, but as per this thread
> it didn't.
> 
> Does someone have ownership resolving this?  Perhaps everyone has
> updated to a bootloader that avoids the need for this patch now?

running on kylin, with the provided uboot sources (mainline uboot + some 
patches) the rk3036 runs just fine, without that timer enablement being needed.

So if nobody shouts (and does the needed work), I intend to just let it drop.


Heiko

[GIT PULL 1/3] rockchip soc changes for 4.5

[Doug Anderson]

Heiko,

On Mon, Mar 7, 2016 at 4:50 PM, Heiko St?bner <heiko@sntech.de> wrote:
> Am Montag, 7. M?rz 2016, 16:46:04 schrieb Doug Anderson:
>> On Fri, Dec 11, 2015 at 4:57 PM, Heiko St?bner <heiko@sntech.de> wrote:
>> > Hi Arnd,
>> >
>> > Am Samstag, 12. Dezember 2015, 01:30:17 schrieb Arnd Bergmann:
>> >> On Saturday 05 December 2015 01:53:38 Heiko St?bner wrote:
>> >> > SMP special case for the rk3036 and making sure the arch-timer
>> >> > supply is enabled, similar to the rk3288.
>> >>
>> >> That is a rather ugly hack, I'd prefer if this could be done cleaner
>> >> rather than duplicated into another place.
>> >
>> > I do agree that it is rather ugly :-) .
>> >
>> > The general opinion seems to be, that firmware is supposed to make sure
>> > this timer is enabled and at the time when it got introduced the
>> > consensus was to not hack up the arch-timer to facilitate this and "just"
>> > put it into the soc code for the affected cpu.
>> >
>> > It seems like the really new rk3228 (quad-core A7 and using psci now)
>> > actually gets this right now, in having its firmware taking care of this.
>> > So it looks like this hopefully won't be needed even for future arm32
>> > socs.
>> >
>> > I guess I should look at what the new and shiny mainline uboot support
>> > does
>> > for this, but I do think it might actually do it right as well.
>> >
>> > So this is really only a hack for flaky vendor-bootloaders.
>> >
>> >
>> > Which brings me to ...
>> >
>> >> Sorry for not seeing this earlier. Can you replace the hardcoded
>> >> RK3036_TIMER_PHYS and RK3288_TIMER6_7_PHYS constants with a DT
>> >> lookup, to make it somewhat less hacky?
>> >
>> > I'm not really sure how that is supposed to look like. Technically nothing
>> > should ever touch that timer, as it will only make the system hang if it
>> > gets disabled.
>> >
>> > We do have a binding for the timer ip block (rockchip,rk3288-timer) but of
>> > course cannot use that, to make sure the regular timer driver doesn't bind
>> > to it. So I guess we could do something like:
>> >
>> >
>> > timer at 200440a0 {
>> >
>> >         compatible = "rockchip,arch-timer-supply";
>> >         reg = <0x200440a0 0x20>;
>> >
>> > };
>> >
>> > try to find this and enable it, but duplicating the hack and spreading it
>> > into the dts as well somehow doesn't feel like an improvement ;-) .
>> >
>> > But I maybe you have a nicer idea on how to do this, than me.
>>
>> In a kernel tree drop from Rockchip I noticed that they're still
>> carrying around the patch "ARM: rockchip: make sure timer5 is enabled
>> on rk3036 platforms" as if it made it upstream, but as per this thread
>> it didn't.
>>
>> Does someone have ownership resolving this?  Perhaps everyone has
>> updated to a bootloader that avoids the need for this patch now?
>
> running on kylin, with the provided uboot sources (mainline uboot + some
> patches) the rk3036 runs just fine, without that timer enablement being needed.
>
> So if nobody shouts (and does the needed work), I intend to just let it drop.

Sounds like a great plan to me.  Thanks!  :)

-Doug