Skip to contentSkip to conversation

second round of Rockchip dts64 changes for 4.14

GIT PULL Heiko Stuebner 2 participants 5 messages Aug 24, 2017

Subsystems (2)
lore
Share & tools
lore

Heiko Stuebner

author maintainer
#0 lore raw

Hi Arnd, Kevin, Olof,

please find below some more Rockchip related changes, that hopfully can still make it into 4.14. Nothing overly exciting, just some more boards and new nodes.

This also includes the core graphics support for rk3399 and the new sapphire board from Rockchip also includes working graphic support already. I was also able to get hdmi output on the rk3399-firefly, but as this was only yesterday I didn't want to rush changes to much, but might include it in a third round, if Linus does an -rc8. Otherwise it doesn't really hurt to wait one release.

So, please pull.

Thanks
Heiko

The following changes since commit 45a995c054e116ea9578dd6186be35f65cc0a7d0:

arm64: dts: rockchip: update dynamic-power-coefficient for rk3399 (2017-08-01 01:00:55 +0200)

are available in the git repository at:

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

for you to fetch changes up to 60fd9f72ce8a353f6371101c788e4d86212b16d7:

arm64: dts: rockchip: add Haikou baseboard with RK3399-Q7 SoM (2017-08-23 09:40:05 +0200)

----------------------------------------------------------------
3 new boards, the rk3328-based Rock64 from the Pine64-makers, the Sapphire som+baseboard which is another evaluation board for Rocckhip customers and the rk3399-based som+baseboard from Austria-based Theobroma Systems, which interestingly is in a miniITX formfactor and provides a real PCIe x4 slot.

New nodes include on rk3399 graphics (vops, hdmi, etc) and more iommus, on rk3328 iommus, pwm, thermal management, and sound as well as operating points and rk3368 got iommu nodes and cpu operating points.

On existing boards firefly got operating points, the rk3328-evb got its pmic and gru boards got some sound-related fixes.

----------------------------------------------------------------
David Wu (1):
arm64: dts: rockchip: Add pwm nodes for rk3328

Elaine Zhang (1):
arm64: dts: rockchip: add pd_edp node for rk3399

Finley Xiao (1):
arm64: dts: rockchip: Add cpu operating points for RK3328 SoC

Heiko Stuebner (2):
arm64: dts: rockchip: remove num-slots property from rk3399-sapphire
arm64: dts: rockchip: add rk3328-rock64 board

Jacob Chen (4):
arm64: dts: rockchip: add rk3399 mipi nodes
arm64: dts: rockchip: add rk3399 hdmi nodes
arm64: dts: rockchip: Add support for rk3399 sapphire SOM
arm64: dts: rockchip: Add support for rk3399 excavator main board

Jeffy Chen (2):
arm64: dts: rockchip: Fix wrong rt5514 dmic delay property for Gru
arm64: dts: rockchip: Assign mic irq to correct device for Gru

Jianqun Xu (1):
arm64: dts: rockchip: include opp dtsi for rk3399 firefly

Joseph Chen (1):

      arm64: dts: rockchip: add rk805 node for rk3328-evb

Kever Yang (1):
arm64: dts: rockchip: init rk3399 vop clock rates

Klaus Goger (3):

      dt-bindings: add rk3399-q7 SoM
      arm64: dts: rockchip: add RK3399-Q7 (Puma) SoM
      arm64: dts: rockchip: add Haikou baseboard with RK3399-Q7 SoM

Mark Yao (1):
arm64: dts: rockchip: Add rk3399 vop and display-subsystem

Rocky Hao (3):
arm64: dts: rockchip: add tsadc node for rk3328 SoC
arm64: dts: rockchip: add thermal nodes for rk3328 SoC
arm64: dts: rockchip: Enable tsadc module on RK3328 eavluation board

Romain Perier (1):
arm64: dts: rockchip: Add basic cpu frequencies for RK3368

Simon Xue (3):
arm64: dts: rockchip: add rk3328 iommu nodes
arm64: dts: rockchip: add rk3368 iommu nodes
arm64: dts: rockchip: add more rk3399 iommu nodes

Sugar Zhang (2):
arm64: dts: rockchip: add rk3328 i2s nodes
arm64: dts: rockchip: add rk3328 pdm node

William Wu (1):
arm64: dts: rockchip: disable tx ipgap linecheck for rk3399 dwc3

Yakir Yang (1):
arm64: dts: rockchip: add rk3399 edp nodes

 Documentation/devicetree/bindings/arm/rockchip.txt |  12 +
 arch/arm64/boot/dts/rockchip/Makefile              |   3 +
 arch/arm64/boot/dts/rockchip/rk3328-evb.dts        | 140 +++++
 arch/arm64/boot/dts/rockchip/rk3328-rock64.dts     | 333 +++++++++++
 arch/arm64/boot/dts/rockchip/rk3328.dtsi           | 304 ++++++++++
 arch/arm64/boot/dts/rockchip/rk3368.dtsi           | 121 +++-
 arch/arm64/boot/dts/rockchip/rk3399-firefly.dts    |   1 +
 arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi       |  13 +-
 .../arm64/boot/dts/rockchip/rk3399-puma-haikou.dts | 228 ++++++++
 arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi      | 547 +++++++++++++++++
 .../dts/rockchip/rk3399-sapphire-excavator.dts     | 240 ++++++++
 arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi  | 644 +++++++++++++++++++++
 arch/arm64/boot/dts/rockchip/rk3399.dtsi           | 243 ++++++++
 13 files changed, 2820 insertions(+), 9 deletions(-)
 create mode 100644 arch/arm64/boot/dts/rockchip/rk3328-rock64.dts
 create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-puma-haikou.dts
 create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi
 create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator.dts
 create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi
author maintainer
#1 lore raw

[GIT PULL 2/2] second round of Rockchip dts32 changes for 4.14

The following changes since commit 0f4dc7e154d054303c4dd6b5c3e3207f9a7f8714:

ARM: dts: rockchip: fix property-ordering in rv1108 mmc nodes (2017-07-22 22:41:35 +0200)

are available in the git repository at:

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

for you to fetch changes up to 274ff50d3ad951bca0adbfb9ffd628d35ba6db6f:

ARM: dts: rockchip: enable usb for rv1108-evb (2017-08-23 09:24:51 +0200)

----------------------------------------------------------------
A lot of attention for the rv1108 soc targetted at media-processing (usb, operating points, spi, pwm, adc, watchdog, i2c and devices for its evb).

RK3228/3229 gets iommu and spi nodes. Similar to the rk3288 which also gets some more iommu nodes as well as getting converted to 64 bit addresses due to wanting to address more than 4GB of memory via LPAE.

----------------------------------------------------------------
Andy Yan (10):
ARM: dts: rockchip: add i2c dt nodes for rv1108
ARM: dts: rockchip: add watchdog dt node for rv1108
ARM: dts: rockchip: add saradc support for rv1108
ARM: dts: rockchip: add spi dt node for rv1108
ARM: dts: rockchip: add pwm dt nodes for rv1108
ARM: dts: rockchip: add pwm backlight for rv1108 evb
ARM: dts: rockchip: add pmic rk805 dt node for rv1108 evb
ARM: dts: rockchip: add accelerometer bma250e dt node for rv1108 evb
ARM: dts: rockchip: add cpu opp table for rv1108
ARM: dts: rockchip: add cpu power supply for rv1108 evb

Elaine Zhang (3):
clk: rockchip: add more clk ids for rv1108
clk: rockchip: rename the clk id for HCLK_I2S1_2CH
clk: rockchip: fix up indentation of some RV1108 clock-ids

Frank Wang (3):
dt-bindings: update grf-binding for rv1108 SoCs
ARM: dts: rockchip: add usb nodes for rv1108 SoCs
ARM: dts: rockchip: enable usb for rv1108-evb

Heiko Stuebner (1):

      Merge branch 'v4.14-shared/clkids' into v4.14-armsoc/dts32

Huibin Hong (1):
ARM: dts: rockchip: add spi node and spi pinctrl on rk3228/rk3229

Simon Xue (2):
ARM: dts: rockchip: add more iommu nodes on rk3288
ARM: dts: rockchip: add rk322x iommu nodes

Tao Huang (1):
ARM: dts: rockchip: convert rk3288 device tree files to 64 bits

 .../devicetree/bindings/soc/rockchip/grf.txt       |   3 +
 arch/arm/boot/dts/rk322x.dtsi                      |  86 +++++
 arch/arm/boot/dts/rk3288-evb.dtsi                  |   2 +-
 arch/arm/boot/dts/rk3288-fennec.dts                |   2 +-
 arch/arm/boot/dts/rk3288-firefly-reload-core.dtsi  |   2 +-
 arch/arm/boot/dts/rk3288-firefly.dtsi              |   2 +-
 arch/arm/boot/dts/rk3288-miqi.dts                  |   2 +-
 arch/arm/boot/dts/rk3288-phycore-som.dtsi          |   2 +-
 arch/arm/boot/dts/rk3288-popmetal.dts              |   2 +-
 arch/arm/boot/dts/rk3288-r89.dts                   |   2 +-
 arch/arm/boot/dts/rk3288-rock2-som.dtsi            |   2 +-
 arch/arm/boot/dts/rk3288-tinker.dts                |   2 +-
 arch/arm/boot/dts/rk3288-veyron.dtsi               |   2 +-
 arch/arm/boot/dts/rk3288.dtsi                      | 215 +++++++------
 arch/arm/boot/dts/rv1108-evb.dts                   | 186 +++++++++++
 arch/arm/boot/dts/rv1108.dtsi                      | 349 ++++++++++++++++++++-
 include/dt-bindings/clock/rv1108-cru.h             | 123 +++++++-
 17 files changed, 867 insertions(+), 117 deletions(-)
#2 lore raw

[GIT PULL 2/2] second round of Rockchip dts32 changes for 4.14

Quoted 17 lines · Heiko Stuebner

The following changes since commit 0f4dc7e154d054303c4dd6b5c3e3207f9a7f8714:

ARM: dts: rockchip: fix property-ordering in rv1108 mmc nodes (2017-07-22 22:41:35 +0200)

are available in the git repository at:

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

for you to fetch changes up to 274ff50d3ad951bca0adbfb9ffd628d35ba6db6f:

ARM: dts: rockchip: enable usb for rv1108-evb (2017-08-23 09:24:51 +0200)

----------------------------------------------------------------
A lot of attention for the rv1108 soc targetted at media-processing (usb, operating points, spi, pwm, adc, watchdog, i2c and devices for its evb).

Quoted 4 lines

RK3228/3229 gets iommu and spi nodes. Similar to the rk3288 which also gets some more iommu nodes as well as getting converted to 64 bit addresses due to wanting to address more than 4GB of memory via LPAE.

Pulled into next/dt with a small fixup, see below. Please check.

Thanks!

Arnd

arch/arm/boot/dts/rk3288.dtsi +0 -0
diff --cc arch/arm/boot/dts/rk3288.dtsi
index 858e1fed762a,c0c04e99e159..356ed1e62452
@@@ -1126,9 -1145,27 +1145,27 @@@
                };
        };

+ vpu_mmu: iommu at ff9a0800 {

+               compatible = "rockchip,iommu";
+               reg = <0x0 0xff9a0800 0x0 0x100>;
+               interrupts = <GIC_SPI 11 IRQ_TYPE_LEVEL_HIGH>;
+               interrupt-names = "vpu_mmu";
+               #iommu-cells = <0>;
+               status = "disabled";
+       };
+
+       hevc_mmu: iommu at ff9c0440 {
+               compatible = "rockchip,iommu";
+               reg = <0x0 0xff9c0440 0x0 0x40>, <0x0 0xff9c0480 0x0 0x40>;
+               interrupts = <GIC_SPI 111 IRQ_TYPE_LEVEL_HIGH>;
+               interrupt-names = "hevc_mmu";
+               #iommu-cells = <0>;
+               status = "disabled";

+ };
+
- gpu: mali at ffa30000 {
- compatible = "rockchip,rk3288-mali", "arm,mali-t760",
"arm,mali-midgard";
+ gpu: gpu at ffa30000 {

 +              compatible = "rockchip,rk3288-mali", "arm,mali-t760";
-               reg = <0xffa30000 0x10000>;
+               reg = <0x0 0xffa30000 0x0 0x10000>;

interrupts = <GIC_SPI 6 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>, <GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>;

#4 lore raw
In reply to Heiko Stuebner
Quoted 8 lines · Heiko Stuebner

Hi Arnd, Kevin, Olof,

please find below some more Rockchip related changes, that hopfully can still make it into 4.14. Nothing overly exciting, just some more boards and new nodes.

This also includes the core graphics support for rk3399 and the new sapphire board from Rockchip also includes working graphic support already.

Pulled into next/dt64, thanks!

Quoted 4 lines

I was also able to get hdmi output on the rk3399-firefly, but as this was only yesterday I didn't want to rush changes to much, but might include it in a third round, if Linus does an -rc8. Otherwise it doesn't really hurt to wait one release.

I don't think there will be an -rc8, but please send it anyway once you feel comfortable with it, we'll see if it works out on our end.

Arnd

author maintainer
#3 lore raw

[GIT PULL 2/2] second round of Rockchip dts32 changes for 4.14

In reply to Arnd Bergmann

Am Donnerstag, 24. August 2017, 15:50:51 CEST schrieb Arnd Bergmann:

Quoted 61 lines · Heiko Stuebner
Quoted 17 lines

The following changes since commit 0f4dc7e154d054303c4dd6b5c3e3207f9a7f8714:

ARM: dts: rockchip: fix property-ordering in rv1108 mmc nodes (2017-07-22 22:41:35 +0200)

are available in the git repository at:

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

for you to fetch changes up to 274ff50d3ad951bca0adbfb9ffd628d35ba6db6f:

ARM: dts: rockchip: enable usb for rv1108-evb (2017-08-23 09:24:51 +0200)

----------------------------------------------------------------
A lot of attention for the rv1108 soc targetted at media-processing (usb, operating points, spi, pwm, adc, watchdog, i2c and devices for its evb).

Quoted 4 lines

RK3228/3229 gets iommu and spi nodes. Similar to the rk3288 which also gets some more iommu nodes as well as getting converted to 64 bit addresses due to wanting to address more than 4GB of memory via LPAE.

Pulled into next/dt with a small fixup, see below. Please check.

Thanks!

Arnd

arch/arm/boot/dts/rk3288.dtsi +18 -0
diff --cc arch/arm/boot/dts/rk3288.dtsi
index 858e1fed762a,c0c04e99e159..356ed1e62452
@@@ -1126,9 -1145,27 +1145,27 @@@
                };
        };
 
+       vpu_mmu: iommu at ff9a0800 {
+               compatible = "rockchip,iommu";
+               reg = <0x0 0xff9a0800 0x0 0x100>;
+               interrupts = <GIC_SPI 11 IRQ_TYPE_LEVEL_HIGH>;
+               interrupt-names = "vpu_mmu";
+               #iommu-cells = <0>;
+               status = "disabled";
+       };
+
+       hevc_mmu: iommu at ff9c0440 {
+               compatible = "rockchip,iommu";
+               reg = <0x0 0xff9c0440 0x0 0x40>, <0x0 0xff9c0480 0x0 0x40>;
+               interrupts = <GIC_SPI 111 IRQ_TYPE_LEVEL_HIGH>;
+               interrupt-names = "hevc_mmu";
+               #iommu-cells = <0>;
+               status = "disabled";
+       };
+
 -      gpu: mali at ffa30000 {
 -              compatible = "rockchip,rk3288-mali", "arm,mali-t760",

"arm,mali-midgard";
+ gpu: gpu at ffa30000 {
+ compatible = "rockchip,rk3288-mali", "arm,mali-t760";

arch/arm/boot/dts/rk3288.dtsi

Quoted 5 lines
arch/arm/boot/dts/rk3288.dtsi +1 -1
-               reg = <0xffa30000 0x10000>;
+               reg = <0x0 0xffa30000 0x0 0x10000>;
                interrupts = <GIC_SPI 6 IRQ_TYPE_LEVEL_HIGH>,
                             <GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>,
                             <GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>;

yep looks good. Seems like the mali compatible-fix that was going into an 4.13-rc interfered here.

Thanks
Heiko