Unverified Commit 84d08b2e authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

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

New boards: Pine64 PineNote ereader tablet and Bananapi-R2-Pro (both rk356x)

New peripherals for the rk356x-family (pdm-audio, gpu, another i2s, usb2)

A lot of additions to Quartz-A (connector-header, gpu, sdmmc1, io-domains,
usb2) and rk3568-evb1-v10 (rk809-audio, cpu-regulator, gpu, tsadc, led,
usb2, touchscreen).

Fixes for the pwm-regulators, that used wrong names for their supplies
as well adapting the cros-ec pwm nodes to a changed binding (going via
the pwm tree).

And as sort of misc-changes, defined the logic-regulator on rk3399-puma
as well as enabled the mali-gpu on the rk3399-firefly.

* tag 'v5.18-rockchip-dts64-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip: (28 commits)
  arm64: dts: rockchip: align Google CROS EC PWM node name with dtschema
  arm64: dts: rockchip: enable rk809 audio codec on the rk3568 evb1-v10
  arm64: dts: rockchip: set vdd_gpu regulator on rk3568-evb1-v10 to always on
  arm64: dts: rockchip: add the vdd_cpu regulator to rk3568-evb1-v10
  arm64: dts: rockchip: enable work led on rk3568-evb1-v10
  arm64: dts: rockchip: fix supplies for pwm regulators
  arm64: dts: rockchip: define vdd_log on rk3399-puma
  arm64: dts: rockchip: Add Pine64 PineNote board
  arm64: dts: rockchip: Add pdm node to rk356x
  dt-bindings: arm: rockchip: Add Pine64 PineNote board
  arm64: dts: rockchip: enable the tsadc on rk3568-evb1-v10
  arm64: dts: rockchip: enable the gpu on rk3568-evb1-v10
  arm64: dts: rockchip: enable the gpu on quartz64-a
  arm64: dts: rockchip: add cooling map and trip points for gpu to rk356x
  arm64: dts: rockchip: add gpu node to rk356x
  arm64: dts: rockchip: add usb2 support to rk3568-evb1-v10
  arm64: dts: rockchip: rename and sort the rk356x usb2 phy handles
  arm64: dts: rockchip: add the i2s3_2ch node to rk356x
  arm64: dts: rockchip: Add Bananapi R2 Pro
  dt-bindings: rockchip: Add BananaPi R2 Pro Board
  ...

Link: https://lore.kernel.org/r/6456947.djgVdjDsCv@phil


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents ceaf23fe a0024f55

Documentation/devicetree/bindings/arm/rockchip.yaml

+13 −0
Original line number Diff line number Diff line
@@ -481,6 +481,14 @@ properties: 
          - const: pine64,pinebook-pro

          - const: rockchip,rk3399



      - description: Pine64 PineNote

        items:

          - enum:

              - pine64,pinenote-v1.1

              - pine64,pinenote-v1.2

          - const: pine64,pinenote

          - const: rockchip,rk3566



      - description: Pine64 Rock64

        items:

          - const: pine64,rock64
@@ -651,6 +659,11 @@ properties: 
          - const: rockchip,rk3568-evb1-v10

          - const: rockchip,rk3568



      - description: Rockchip RK3568 Banana Pi R2 Pro

        items:

          - const: rockchip,rk3568-bpi-r2pro

          - const: rockchip,rk3568



additionalProperties: true



...

arch/arm64/boot/dts/rockchip/Makefile

+3 −0
Original line number Diff line number Diff line
@@ -56,5 +56,8 @@ 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

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-pinenote-v1.1.dtb

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-pinenote-v1.2.dtb

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-quartz64-a.dtb

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-evb1-v10.dtb

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-bpi-r2-pro.dtb

arch/arm64/boot/dts/rockchip/rk3399-firefly.dts

+6 −1
Original line number Diff line number Diff line
@@ -245,12 +245,12 @@ vcc_sys: vcc-sys { 
	vdd_log: vdd-log {

		compatible = "pwm-regulator";

		pwms = <&pwm2 0 25000 1>;

		pwm-supply = <&vcc_sys>;

		regulator-name = "vdd_log";

		regulator-always-on;

		regulator-boot-on;

		regulator-min-microvolt = <430000>;

		regulator-max-microvolt = <1400000>;

		vin-supply = <&vcc_sys>;

	};

};
@@ -298,6 +298,11 @@ &gmac { 
	status = "okay";

};



&gpu {

	mali-supply = <&vdd_gpu>;

	status = "okay";

};



&hdmi {

	ddc-i2c-bus = <&i2c3>;

	pinctrl-names = "default";

arch/arm64/boot/dts/rockchip/rk3399-gru-chromebook.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -462,7 +462,7 @@ ap_i2c_tp: &i2c5 { 
};



&cros_ec {

	cros_ec_pwm: ec-pwm {

	cros_ec_pwm: pwm {

		compatible = "google,cros-ec-pwm";

		#pwm-cells = <1>;

	};

arch/arm64/boot/dts/rockchip/rk3399-khadas-edge.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -80,12 +80,12 @@ vcc5v0_host: vcc5v0-host-regulator { 
	vdd_log: vdd-log {

		compatible = "pwm-regulator";

		pwms = <&pwm2 0 25000 1>;

		pwm-supply = <&vsys_3v3>;

		regulator-name = "vdd_log";

		regulator-always-on;

		regulator-boot-on;

		regulator-min-microvolt = <800000>;

		regulator-max-microvolt = <1400000>;

		vin-supply = <&vsys_3v3>;

	};



	vsys: vsys {