Commit 99e45e29 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'v5.6-rockchip-dts64-1' of... 

Merge tag 'v5.6-rockchip-dts64-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into arm/dt

New boards are the Radxa Rock Pi N10 using the VMARC SOM and Dalang
carrier board, separate versions for the two rockpro64 hardware revisions
which switched a pin between revisions. The rockpro64 also got
bluetooth support now.

The px30 got a lot of attention with dsi, gpu and thermal support.
Similarly the rk3399-roc-pc board also got attention with mtd flash,
sdr104 mode, hdmi sound, gpu and a lot of other smaller improvements.

Other than that there is a new gpu-cooling device for rk3399 a cpu
idle-state for rk3328 and more small improvements across a number
of boards.

* tag 'v5.6-rockchip-dts64-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip: (37 commits)
  arm64: dts: rockchip: Enable mp8859 regulator on rk3399-roc-pc
  arm64: dts: rockchip: rk3399-hugsun-x99: remove supports-sd and supports-emmc options
  arm64: dts: rockchip: rk3399-firefly: remove num-slots from &sdio0 node
  arm64: dts: rockchip: Add PX30 LVDS
  arm64: dts: rockchip: add dsi controller for px30
  arm64: dts: rockchip: Add PX30 DSI DPHY
  arm64: dts: rockchip: Add RK3328 idle state
  arm64: dts: rockchip: remove identical &uart0 node from rk3368-lion-haikou
  arm64: dts: rockchip: Add Radxa Rock Pi N10 initial support
  ARM: dts: rockchip: Add Radxa Dalang Carrier board
  arm64: dts: rockchip: Add VMARC RK3399Pro SOM initial support
  dt-bindings: arm: rockchip: Add Rock Pi N10 binding
  arm64: dts: rockchip: hook up bluetooth at uart0 on rockpro64
  arm64: dts: rockchip: enable wifi module at sdio0 on rockpro64
  arm64: dts: rockchip: split rk3399-rockpro64 for v2 and v2.1 boards
  arm64: dts: rockchip: enable the gpu on px30-evb
  arm64: dts: rockchip: add the gpu for px30
  dt-bindings: gpu: mali-bifrost: Add Rockchip PX30
  arm64: dts: rockchip: Add GPU cooling device for RK3399
  arm64: dts: rockchip: Add regulators for PCIe for Radxa Rock Pi 4 board
  ...

Link: https://lore.kernel.org/r/5115625.yBEeHQkg2z@phil


Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 3886edbb 1fc61ed0

Documentation/devicetree/bindings/arm/rockchip.yaml

+9 −0
Original line number Diff line number Diff line
@@ -409,6 +409,9 @@ properties: 


      - description: Pine64 RockPro64

        items:

          - enum:

              - pine64,rockpro64-v2.1

              - pine64,rockpro64-v2.0

          - const: pine64,rockpro64

          - const: rockchip,rk3399
@@ -422,6 +425,12 @@ properties: 
          - const: radxa,rockpi4

          - const: rockchip,rk3399



      - description: Radxa ROCK Pi N10

        items:

          - const: radxa,rockpi-n10

          - const: vamrs,rk3399pro-vmarc-som

          - const: rockchip,rk3399pro



      - description: Radxa Rock2 Square

        items:

          - const: radxa,rock2-square

Documentation/devicetree/bindings/gpu/arm,mali-bifrost.yaml

+1 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ properties: 
      - enum:

          - amlogic,meson-g12a-mali

          - realtek,rtd1619-mali

          - rockchip,px30-mali

      - const: arm,mali-bifrost # Mali Bifrost GPU model/revision is fully discoverable



  reg:

arch/arm/boot/dts/rockchip-radxa-dalang-carrier.dtsi

0 → 100644
+81 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: (GPL-2.0+ OR MIT)

/*

 * Copyright (c) 2019 Fuzhou Rockchip Electronics Co., Ltd

 * Copyright (c) 2019 Radxa Limited

 * Copyright (c) 2019 Amarula Solutions(India)

 */



#include <dt-bindings/pwm/pwm.h>



/ {

	chosen {

		stdout-path = "serial2:1500000n8";

	};

};



&gmac {

	status = "okay";

};



&i2c1 {

	status = "okay";

	i2c-scl-rising-time-ns = <140>;

	i2c-scl-falling-time-ns = <30>;

};



&i2c2 {

	status = "okay";

	clock-frequency = <400000>;



	hym8563: hym8563@51 {

		compatible = "haoyu,hym8563";

		reg = <0x51>;

		#clock-cells = <0>;

		clock-frequency = <32768>;

		clock-output-names = "hym8563";

		pinctrl-names = "default";

		pinctrl-0 = <&hym8563_int>;

		interrupt-parent = <&gpio4>;

		interrupts = <30 IRQ_TYPE_LEVEL_LOW>;

	};

};



&pwm0 {

	status = "okay";

};



&pwm2 {

	status = "okay";

};



&sdmmc {

	bus-width = <4>;

	cap-mmc-highspeed;

	cap-sd-highspeed;

	cd-gpios = <&gpio0 RK_PA7 GPIO_ACTIVE_LOW>;

	disable-wp;

	vqmmc-supply = <&vccio_sd>;

	max-frequency = <150000000>;

	pinctrl-names = "default";

	pinctrl-0 = <&sdmmc_clk &sdmmc_cmd &sdmmc_cd &sdmmc_bus4>;

	status = "okay";

};



&uart0 {

	pinctrl-names = "default";

	pinctrl-0 = <&uart0_xfer &uart0_cts>;

	status = "okay";

};



&uart2 {

	status = "okay";

};



&pinctrl {

	hym8563 {

		hym8563_int: hym8563-int {

			rockchip,pins =

				<4 RK_PD6 0 &pcfg_pull_up>;

		};

	};

};

arch/arm64/boot/dts/rockchip/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -33,6 +33,8 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-roc-pc.dtb 
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-roc-pc-mezzanine.dtb

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-rock-pi-4.dtb

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-rock960.dtb

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-rockpro64-v2.dtb

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-rockpro64.dtb

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-sapphire.dtb

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-sapphire-excavator.dtb

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399pro-rock-pi-n10.dtb

arch/arm64/boot/dts/rockchip/px30-evb.dts

+11 −0
Original line number Diff line number Diff line
@@ -132,6 +132,11 @@ &gmac { 
	status = "okay";

};



&gpu {

	mali-supply = <&vdd_log>;

	status = "okay";

};



&i2c0 {

	status = "okay";
@@ -485,6 +490,12 @@ &sdio { 
	status = "okay";

};



&tsadc {

	rockchip,hw-tshut-mode = <1>;

	rockchip,hw-tshut-polarity = <1>;

	status = "okay";

};



&u2phy {

	status = "okay";