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

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

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

New boards NanoPi R2S, A95X-Z2 and more Rock-Pi4 variants.
Khadas-edge additions and a some fixes.

* tag 'v5.10-rockchip-dts64-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
  arm64: dts: rockchip: add ir-receiver node to rk3399-khadas-edge
  arm64: dts: rockchip: add spiflash node to rk3399-khadas-edge
  arm64: dts: rockchip: Add support for FriendlyARM NanoPi R2S
  dt-bindings: Add doc for FriendlyARM NanoPi R2S
  arm64: dts: rockchip: replace status value "ok" by "okay"
  arm64: dts: rockchip: fix cpu-supply for rk3328-evb
  arm64: dts: rockchip: add rk3318 A95X Z2 board
  dt-bindings: arm: rockchip: add Zkmagic A95X Z2 description
  dt-bindings: Add vendor prefix for Shenzhen Zkmagic Technology Co., Ltd.
  arm64: dts: rockchip: Add Radxa ROCK Pi 4C support
  arm64: dts: rockchip: Add Radxa ROCK Pi 4B support
  arm64: dts: rockchip: Mark rock-pi-4 as rock-pi-4a dts
  dt-bindings: arm: rockchip: Update ROCKPi 4 binding
  arm64: dts: rockchip: change spdif fallback compatible on rk3308
  arm64: dts: rockchip: Fix power routing to support POE on rk3399-roc-pc

Link: https://lore.kernel.org/r/16010805.MhVyP8KKtY@diego


Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 5f7067bc 30a9a8c1

Documentation/devicetree/bindings/arm/rockchip.yaml

+15 −1
Original line number Diff line number Diff line
@@ -104,6 +104,11 @@ properties: 
              - firefly,roc-rk3399-pc-mezzanine

          - const: rockchip,rk3399



      - description: FriendlyElec NanoPi R2S

        items:

          - const: friendlyarm,nanopi-r2s

          - const: rockchip,rk3328



      - description: FriendlyElec NanoPi4 series boards

        items:

          - enum:
@@ -430,8 +435,12 @@ properties: 
          - const: radxa,rock

          - const: rockchip,rk3188



      - description: Radxa ROCK Pi 4

      - description: Radxa ROCK Pi 4A/B/C

        items:

          - enum:

              - radxa,rockpi4a

              - radxa,rockpi4b

              - radxa,rockpi4c

          - const: radxa,rockpi4

          - const: rockchip,rk3399
@@ -555,4 +564,9 @@ properties: 
        items:

          - const: tronsmart,orion-r68-meta

          - const: rockchip,rk3368



      - description: Zkmagic A95X Z2

        items:

          - const: zkmagic,a95x-z2

          - const: rockchip,rk3318

...

Documentation/devicetree/bindings/vendor-prefixes.yaml

+2 −0
Original line number Diff line number Diff line
@@ -1198,6 +1198,8 @@ patternProperties: 
    description: Shenzhen Zidoo Technology Co., Ltd.

  "^zii,.*":

    description: Zodiac Inflight Innovations

  "^zkmagic,.*":

    description: Shenzhen Zkmagic Technology Co., Ltd.

  "^zte,.*":

    description: ZTE Corp.

  "^zyxel,.*":

arch/arm64/boot/dts/rockchip/Makefile

+5 −1
Original line number Diff line number Diff line
@@ -2,9 +2,11 @@ 
dtb-$(CONFIG_ARCH_ROCKCHIP) += px30-evb.dtb

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3308-evb.dtb

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3308-roc-cc.dtb

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3318-a95x-z2.dtb

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3326-odroid-go2.dtb

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-a1.dtb

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-evb.dtb

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-nanopi-r2s.dtb

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-rock64.dtb

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-roc-cc.dtb

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3368-evb-act8846.dtb
@@ -33,7 +35,9 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-pinebook-pro.dtb 
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-puma-haikou.dtb

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-rock-pi-4a.dtb

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

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

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

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

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

arch/arm64/boot/dts/rockchip/rk3308.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -574,7 +574,7 @@ 
	};



	spdif_tx: spdif-tx@ff3a0000 {

		compatible = "rockchip,rk3308-spdif", "rockchip,rk3328-spdif";

		compatible = "rockchip,rk3308-spdif", "rockchip,rk3066-spdif";

		reg = <0x0 0xff3a0000 0x0 0x1000>;

		interrupts = <GIC_SPI 55 IRQ_TYPE_LEVEL_HIGH>;

		clocks = <&cru SCLK_SPDIF_TX>, <&cru HCLK_SPDIFTX>;

arch/arm64/boot/dts/rockchip/rk3318-a95x-z2.dts

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



/dts-v1/;

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

#include "rk3328.dtsi"



/ {

	model = "A95X Z2";

	compatible = "zkmagic,a95x-z2", "rockchip,rk3318";



	chosen {

		stdout-path = "serial2:1500000n8";

	};



	adc-keys {

		compatible = "adc-keys";

		io-channels = <&saradc 0>;

		io-channel-names = "buttons";

		keyup-threshold-microvolt = <1800000>;

		poll-interval = <100>;



		recovery {

			label = "recovery";

			linux,code = <KEY_VENDOR>;

			press-threshold-microvolt = <17000>;

		};

	};



	ir-receiver {

		compatible = "gpio-ir-receiver";

		gpios = <&gpio2 RK_PA2 GPIO_ACTIVE_LOW>;

		pinctrl-0 = <&ir_int>;

		pinctrl-names = "default";

	};



	leds {

		compatible = "gpio-leds";

		pinctrl-0 = <&cyx_led_pin>;

		pinctrl-names = "default";



		cyx_led: led-0 {

			default-state = "on";

			gpios = <&gpio2 RK_PC7 GPIO_ACTIVE_LOW>;

			label = "CYX_LED";

		};

	};



	sdio_pwrseq: sdio-pwrseq {

		compatible = "mmc-pwrseq-simple";

		pinctrl-0 = <&wifi_enable_h>;

		pinctrl-names = "default";

		reset-gpios = <&gpio1 RK_PC2 GPIO_ACTIVE_LOW>;

	};



	spdif-sound {

		compatible = "simple-audio-card";

		simple-audio-card,name = "SPDIF";



		simple-audio-card,cpu {

			sound-dai = <&spdif>;

		};



		simple-audio-card,codec {

			sound-dai = <&spdif_out>;

		};

	};



	spdif_out: spdif-out {

		compatible = "linux,spdif-dit";

		#sound-dai-cells = <0>;

	};



	/* Power tree */

	vccio_1v8: vccio-1v8-regulator {

		compatible = "regulator-fixed";

		regulator-name = "vccio_1v8";

		regulator-min-microvolt = <1800000>;

		regulator-max-microvolt = <1800000>;

		regulator-always-on;

	};



	vccio_3v3: vccio-3v3-regulator {

		compatible = "regulator-fixed";

		regulator-name = "vccio_3v3";

		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;

		regulator-always-on;

	};



	vcc_otg_vbus: otg-vbus-regulator {

		compatible = "regulator-fixed";

		gpio = <&gpio0 RK_PA2 GPIO_ACTIVE_HIGH>;

		pinctrl-0 = <&otg_vbus_drv>;

		pinctrl-names = "default";

		regulator-name = "vcc_otg_vbus";

		regulator-min-microvolt = <5000000>;

		regulator-max-microvolt = <5000000>;

		enable-active-high;

	};



	vcc_sd: sdmmc-regulator {

		compatible = "regulator-fixed";

		gpio = <&gpio0 RK_PD6 GPIO_ACTIVE_LOW>;

		pinctrl-0 = <&sdmmc0m1_pin>;

		pinctrl-names = "default";

		regulator-name = "vcc_sd";

		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;

		vin-supply = <&vccio_3v3>;

	};



	vdd_arm: vdd-arm {

		compatible = "pwm-regulator";

		pwms = <&pwm0 0 5000 1>;

		regulator-name = "vdd_arm";

		regulator-min-microvolt = <950000>;

		regulator-max-microvolt = <1400000>;

		regulator-settling-time-up-us = <250>;

		regulator-always-on;

		regulator-boot-on;

	};



	vdd_log: vdd-log {

		compatible = "pwm-regulator";

		pwms = <&pwm1 0 5000 1>;

		regulator-name = "vdd_log";

		regulator-min-microvolt = <900000>;

		regulator-max-microvolt = <1300000>;

		regulator-settling-time-up-us = <250>;

		regulator-always-on;

		regulator-boot-on;

	};

};



&analog_sound {

	status = "okay";

};



&codec {

	status = "okay";

};



&cpu0 {

	cpu-supply = <&vdd_arm>;

};



&cpu1 {

	cpu-supply = <&vdd_arm>;

};



&cpu2 {

	cpu-supply = <&vdd_arm>;

};



&cpu3 {

	cpu-supply = <&vdd_arm>;

};



&cpu0_opp_table {

	opp-1200000000 {

		status = "disabled";

	};



	opp-1296000000 {

		status = "disabled";

	};

};



&emmc {

	bus-width = <8>;

	cap-mmc-highspeed;

	non-removable;

	pinctrl-0 = <&emmc_clk &emmc_cmd &emmc_bus8>;

	pinctrl-names = "default";

	status = "okay";

};



&gmac2phy {

	assigned-clock-parents = <&cru SCLK_MAC2PHY_SRC>;

	assigned-clock-rate = <50000000>;

	assigned-clocks = <&cru SCLK_MAC2PHY>;

	clock_in_out = "output";

	status = "okay";

};



&gpu {

	mali-supply = <&vdd_log>;

};



&hdmi {

	ddc-i2c-scl-high-time-ns = <9625>;

	ddc-i2c-scl-low-time-ns = <10000>;

	status = "okay";

};



&hdmiphy {

	status = "okay";

};



&hdmi_sound {

	status = "okay";

};



&i2s0 {

	status = "okay";

};



&i2s1 {

	status = "okay";

};



&io_domains {

	pmuio-supply = <&vccio_3v3>;

	vccio1-supply = <&vccio_3v3>;

	vccio2-supply = <&vccio_1v8>;

	vccio3-supply = <&vccio_3v3>;

	vccio4-supply = <&vccio_1v8>;

	vccio5-supply = <&vccio_3v3>;

	vccio6-supply = <&vccio_3v3>;

	status = "okay";

};



&pinctrl {

	ir {

		ir_int: ir-int {

			rockchip,pins = <2 RK_PA2 RK_FUNC_GPIO &pcfg_pull_none>;

		};

	};



	leds {

		cyx_led_pin: cyx-led-pin {

			rockchip,pins = <2 RK_PC7 RK_FUNC_GPIO &pcfg_pull_none>;

		};

	};



	pwm0 {

		pwm0_pin_pull_up: pwm0-pin-pull-up {

			rockchip,pins = <2 RK_PA4 1 &pcfg_pull_up>;

		};

	};



	pwm1 {

		pwm1_pin_pull_up: pwm1-pin-pull-up {

			rockchip,pins = <2 RK_PA5 1 &pcfg_pull_up>;

		};

	};



	sdio-pwrseq {

		wifi_enable_h: wifi-enable-h {

			rockchip,pins = <1 RK_PC2 RK_FUNC_GPIO &pcfg_pull_none>;

		};

	};



	sdmmc1 {

		clk_32k_out: clk-32k-out {

			rockchip,pins = <1 RK_PD4 1 &pcfg_pull_none>;

		};

	};



	usb {

		host_vbus_drv: host-vbus-drv {

			rockchip,pins = <0 RK_PA0 RK_FUNC_GPIO &pcfg_pull_none>;

		};



		otg_vbus_drv: otg-vbus-drv {

			rockchip,pins = <0 RK_PA2 RK_FUNC_GPIO &pcfg_pull_none>;

		};

	};

};



&pwm0 {

	pinctrl-0 = <&pwm0_pin_pull_up>;

	pinctrl-names = "active";

	status = "okay";

};



&pwm1 {

	pinctrl-0 = <&pwm1_pin_pull_up>;

	pinctrl-names = "active";

	status = "okay";

};



&saradc {

	vref-supply = <&vccio_1v8>;

	status = "okay";

};



&sdio {

	bus-width = <4>;

	cap-sd-highspeed;

	cap-sdio-irq;

	keep-power-in-suspend;

	max-frequency = <125000000>;

	mmc-pwrseq = <&sdio_pwrseq>;

	non-removable;

	pinctrl-0 = <&sdmmc1_bus4 &sdmmc1_cmd &sdmmc1_clk &clk_32k_out>;

	pinctrl-names = "default";

	sd-uhs-sdr104;

	status = "okay";

};



&sdmmc {

	bus-width = <4>;

	cap-sd-highspeed;

	pinctrl-0 = <&sdmmc0_clk &sdmmc0_cmd &sdmmc0_dectn &sdmmc0_bus4>;

	pinctrl-names = "default";

	vmmc-supply = <&vcc_sd>;

	status = "okay";

};



&spdif {

	pinctrl-0 = <&spdifm0_tx>;

	status = "okay";

};



&soc_crit {

	temperature = <115000>; /* millicelsius */

};



&target {

	temperature = <105000>; /* millicelsius */

};



&threshold {

	temperature = <90000>; /* millicelsius */

};



&tsadc {

	rockchip,hw-tshut-temp = <120000>;

	status = "okay";

};



&u2phy {

	status = "okay";

};



&u2phy_host {

	status = "okay";

};



&u2phy_otg {

	phy-supply = <&vcc_otg_vbus>;

	status = "okay";

};



&uart0 {

	pinctrl-0 = <&uart0_xfer &uart0_cts>;

	status = "okay";

};



&uart2 {

	status = "okay";

};



&usb20_otg {

	dr_mode = "host";

	status = "okay";

};



&usb_host0_ehci {

	status = "okay";

};



&usb_host0_ohci {

	status = "okay";

};



&vop {

	status = "okay";

};



&vop_mmu {

	status = "okay";

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE