[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,

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 2/3] rockchip dts32 changes for 4.5

[Heiko Stübner]

Hi Arnd, Kevin, Olof,

please find below 32bit arm dts changes for Rockchip. As the tag describes,
new boards, a new soc and some smaller stuff.

It includes a shared branch containing dt-binding header changes for new
clock-ids and gets shared with the clock changes implementing these.


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-dts32-1

for you to fetch changes up to 066111411101f6b020af1a7c752859a12476ba21:

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

----------------------------------------------------------------
First round of arm devicetree changes.
Among the bigger changes are two new Veyron boards, support for
the dual-core cortex-a7 rk3036 soc and addition of support for
the crypto engine of the rk3288. Smaller changes include some
IR receivers, updates of thermal settings more reflecting real-
life and testing-results.

----------------------------------------------------------------
Caesar Wang (1):
      ARM: dts: rockchip: update the thermal management on rk3288

Chris Zhong (1):
      ARM: dts: rockchip: add veyron-mickey board

Heiko Stuebner (7):
      ARM: dts: rockchip: Setup rk3066/rk3188 ethernet0 alias for u-boot
      Merge branch 'v4.5-clk/clkids' into v4.5-armsoc/dts32
      ARM: dts: rockchip: override thermal settings on veyron-speedy
      ARM: dts: rockchip: make sure edp_24m is associated to xin24m on veyron
      ARM: dts: rockchip: add veyron-brain board
      ARM: dts: rockchip: add touchscreen node to veyron minnie
      ARM: dts: rockchip: add gpio-ir-receiver to the R89 board

John Keeping (1):
      ARM: dts: rockchip: set system-power-controller property on rk3288-rock2

Sjoerd Simons (2):
      ARM: dts: rockchip: Setup rk3288 ethernet0 alias for u-boot
      ARM: dts: rockchip: Add IR receiver to RK3288 Radxa Rock 2 Square

Sugar Zhang (1):
      ARM: dts: rockchip: add channels properties for i2s

Xing Zheng (3):
      clk: rockchip: add dt-binding header for rk3036
      ARM: dts: rockchip: add core rk3036 dtsi
      ARM: dts: rockchip: add rk3036-evb board

Zain Wang (2):
      clk: rockchip: add an id for rk3288 crypto clk
      ARM: dts: rockchip: Add Crypto node for rk3288

 Documentation/devicetree/bindings/arm/rockchip.txt |  14 +
 arch/arm/boot/dts/Makefile                         |   3 +
 arch/arm/boot/dts/rk3036-evb.dts                   |  64 +++
 arch/arm/boot/dts/rk3036.dtsi                      | 554 +++++++++++++++++++++
 arch/arm/boot/dts/rk3066a.dtsi                     |   6 +
 arch/arm/boot/dts/rk3188.dtsi                      |   2 +
 arch/arm/boot/dts/rk3288-r89.dts                   |  13 +
 arch/arm/boot/dts/rk3288-rock2-som.dtsi            |   1 +
 arch/arm/boot/dts/rk3288-rock2-square.dts          |  13 +
 arch/arm/boot/dts/rk3288-thermal.dtsi              |  14 +-
 arch/arm/boot/dts/rk3288-veyron-brain.dts          | 139 ++++++
 arch/arm/boot/dts/rk3288-veyron-mickey.dts         | 250 ++++++++++
 arch/arm/boot/dts/rk3288-veyron-minnie.dts         |  12 +
 arch/arm/boot/dts/rk3288-veyron-speedy.dts         |   8 +
 arch/arm/boot/dts/rk3288-veyron.dtsi               |   5 +
 arch/arm/boot/dts/rk3288.dtsi                      |  15 +
 arch/arm/boot/dts/rk3xxx.dtsi                      |   1 +
 include/dt-bindings/clock/rk3036-cru.h             | 193 +++++++
 include/dt-bindings/clock/rk3288-cru.h             |   1 +
 19 files changed, 1306 insertions(+), 2 deletions(-)
 create mode 100644 arch/arm/boot/dts/rk3036-evb.dts
 create mode 100644 arch/arm/boot/dts/rk3036.dtsi
 create mode 100644 arch/arm/boot/dts/rk3288-veyron-brain.dts
 create mode 100644 arch/arm/boot/dts/rk3288-veyron-mickey.dts
 create mode 100644 include/dt-bindings/clock/rk3036-cru.h

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

[Arnd Bergmann]

On Saturday 05 December 2015 01:56:23 Heiko St?bner wrote:
> First round of arm devicetree changes.
> Among the bigger changes are two new Veyron boards, support for
> the dual-core cortex-a7 rk3036 soc and addition of support for
> the crypto engine of the rk3288. Smaller changes include some
> IR receivers, updates of thermal settings more reflecting real-
> life and testing-results.
> 

Pulled into next/dt, thanks!

	Arnd

[GIT PULL 3/3] rockchip dts64 changes for 4.5

[Heiko Stübner]

Hi Arnd, Kevin, Olof,

please find below rockchip arm64 changes for 4.5 .
I think the tag should explain the changes sufficiently.


Thanks
Heiko


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-dts64-1

for you to fetch changes up to 5378e28c9776fbab6065cfb54417acff3ea5f1fd:

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

----------------------------------------------------------------
First round of 64bit devicetree changes for Rockchip socs.
This includes support for the evaluation board of the rk3368
as well as the dts-part for the newly added thermal management
support, rk3368 pwm nodes and an alias.

----------------------------------------------------------------
Caesar Wang (5):
      arm64: dts: rockchip: Add the thermal data found on RK3368
      arm64: dts: rockchip: Add main thermal info to rk3368.dtsi
      arm64: dts: rockchip: Enable the Thermal on R88 board
      arm64: dts: rockchip: add the pwm node info for RK3368 SoCs
      arm64: dts: rockchip: add rk3368 evaluation board

Heiko Stuebner (1):
      arm64: dts: rockchip: Setup rk3368 ethernet0 alias for u-boot

 Documentation/devicetree/bindings/arm/rockchip.txt |   4 +
 arch/arm64/boot/dts/rockchip/Makefile              |   1 +
 .../arm64/boot/dts/rockchip/rk3368-evb-act8846.dts | 176 +++++++++++++
 arch/arm64/boot/dts/rockchip/rk3368-evb.dtsi       | 281 +++++++++++++++++++++
 arch/arm64/boot/dts/rockchip/rk3368-r88.dts        |   6 +
 arch/arm64/boot/dts/rockchip/rk3368-thermal.dtsi   | 112 ++++++++
 arch/arm64/boot/dts/rockchip/rk3368.dtsi           |  97 +++++++
 7 files changed, 677 insertions(+)
 create mode 100644 arch/arm64/boot/dts/rockchip/rk3368-evb-act8846.dts
 create mode 100644 arch/arm64/boot/dts/rockchip/rk3368-evb.dtsi
 create mode 100644 arch/arm64/boot/dts/rockchip/rk3368-thermal.dtsi

[GIT PULL 3/3] rockchip dts64 changes for 4.5

[Arnd Bergmann]

On Saturday 05 December 2015 01:58:29 Heiko St?bner wrote:
> First round of 64bit devicetree changes for Rockchip socs.
> This includes support for the evaluation board of the rk3368
> as well as the dts-part for the newly added thermal management
> support, rk3368 pwm nodes and an alias.
> 
> 

Pulled into next/dt64, thanks

	Arnd

[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