Commit 261078ab authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

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

Newly added boards are the PX30 SOM system from Engicam and Kobol Helios64.
The Scarlet tablet finally gets support for its cameras, now that the
the rk3399-isp moved out of staging.
The Odroid-Go-Advance got its joystick support now that the adc-joystick
driver was merged and misc omprovements to the RockPi4, rk3328-roc-cc
and orange-pi.

* tag 'v5.11-rockchip-dts64-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip: (28 commits)
  arm64: dts: rockchip: use USB host by default on rk3399-rock-pi-4
  arm64: dts: rockchip: fix I2S conflict on rk3399-rock-pi-4
  arm64: dts: rockchip: fix supplies on rk3399-rock-pi-4
  arm64: dts: rockchip: Fix UART pull-ups on rk3328
  arm64: dts: rockchip: add isp and sensors for Scarlet
  arm64: dts: rockchip: add isp0 node for rk3399
  arm64: dts: rockchip: Properly define the type C connector on rk3399-orangepi
  arm64: dts: rockchip: Add BT support on px30-engicam
  arm64: dts: rockchip: Add WiFi support on px30-engicam
  arm64: dts: rockchip: Add Engicam PX30.Core C.TOUCH 2.0 10.1" OF
  dt-bindings: arm: rockchip: Add Engicam PX30.Core C.TOUCH 2.0 10.1" OF
  arm64: dts: rockchip: Enable LVDS panel on px30-engicam-edimm2.2
  arm64: dts: rockchip: Enable USB Host, OTG on px30-enagicam
  arm64: dts: rockchip: rename sdhci nodename to mmc on rk3399
  arm64: dts: rockchip: Enable analog audio on rk3328-roc-cc
  arm64: dts: rockchip: Enable HDMI audio on rk3328-roc-cc
  arm64: dts: rockchip: Set dr_mode to "host" for OTG on rk3328-roc-cc
  arm64: dts: rockchip: Add Engicam PX30.Core C.TOUCH 2.0
  arm64: dts: rockchip: Add Engicam C.TOUCH 2.0
  dt-bindings: arm: rockchip: Add Engicam PX30.Core C.TOUCH 2.0
  ...

Link: https://lore.kernel.org/r/4278011.LvFx2qVVIh@phil


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

Documentation/devicetree/bindings/arm/rockchip.yaml

+23 −0
Original line number Diff line number Diff line
@@ -70,6 +70,24 @@ properties: 
          - const: elgin,rv1108-r1

          - const: rockchip,rv1108



      - description: Engicam PX30.Core C.TOUCH 2.0

        items:

          - const: engicam,px30-core-ctouch2

          - const: engicam,px30-core

          - const: rockchip,px30



      - description: Engicam PX30.Core C.TOUCH 2.0 10.1" Open Frame

        items:

          - const: engicam,px30-core-ctouch2-of10

          - const: engicam,px30-core

          - const: rockchip,px30



      - description: Engicam PX30.Core EDIMM2.2 Starter Kit

        items:

          - const: engicam,px30-core-edimm2.2

          - const: engicam,px30-core

          - const: rockchip,px30



      - description: Firefly Firefly-RK3288

        items:

          - enum:
@@ -381,6 +399,11 @@ properties: 
              - khadas,edge-v

          - const: rockchip,rk3399



      - description: Kobol Helios64

        items:

          - const: kobol,helios64

          - const: rockchip,rk3399



      - description: Mecer Xtreme Mini S6

        items:

          - const: mecer,xms6

Documentation/devicetree/bindings/vendor-prefixes.yaml

+2 −0
Original line number Diff line number Diff line
@@ -563,6 +563,8 @@ patternProperties: 
    description: Kionix, Inc.

  "^kobo,.*":

    description: Rakuten Kobo Inc.

  "^kobol,.*":

    description: Kobol Innovations Pte. Ltd.

  "^koe,.*":

    description: Kaohsiung Opto-Electronics Inc.

  "^kontron,.*":

arch/arm64/boot/dts/rockchip/Makefile

+4 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

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

dtb-$(CONFIG_ARCH_ROCKCHIP) += px30-engicam-px30-core-ctouch2.dtb

dtb-$(CONFIG_ARCH_ROCKCHIP) += px30-engicam-px30-core-ctouch2-of10.dtb

dtb-$(CONFIG_ARCH_ROCKCHIP) += px30-engicam-px30-core-edimm2.2.dtb

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

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

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3318-a95x-z2.dtb
@@ -26,6 +29,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-hugsun-x99.dtb 
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-khadas-edge.dtb

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-khadas-edge-captain.dtb

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-khadas-edge-v.dtb

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-kobol-helios64.dtb

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-leez-p710.dtb

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-nanopc-t4.dtb

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-nanopi-m4.dtb

arch/arm64/boot/dts/rockchip/px30-engicam-common.dtsi

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

/*

 * Copyright (c) 2020 Engicam srl

 * Copyright (c) 2020 Amarula Solutions

 * Copyright (c) 2020 Amarula Solutions(India)

 */



/ {

	vcc5v0_sys: vcc5v0-sys {

		compatible = "regulator-fixed";

		regulator-name = "vcc5v0_sys";	/* +5V */

		regulator-always-on;

		regulator-boot-on;

		regulator-min-microvolt = <5000000>;

		regulator-max-microvolt = <5000000>;

	};



	sdio_pwrseq: sdio-pwrseq {

		compatible = "mmc-pwrseq-simple";

		clocks = <&xin32k>;

		clock-names = "ext_clock";

		post-power-on-delay-ms = <80>;

		pinctrl-names = "default";

		pinctrl-0 = <&wifi_enable_h>;

	};



	vcc3v3_btreg: vcc3v3-btreg {

		compatible = "regulator-gpio";

		enable-active-high;

		pinctrl-names = "default";

		pinctrl-0 = <&bt_enable_h>;

		regulator-name = "btreg-gpio-supply";

		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;

		regulator-always-on;

		states = <3300000 0x0>;

	};



	vcc3v3_rf_aux_mod: vcc3v3-rf-aux-mod {

		compatible = "regulator-fixed";

		regulator-name = "vcc3v3_rf_aux_mod";

		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;

		regulator-always-on;

		regulator-boot-on;

		vin-supply = <&vcc5v0_sys>;

	};



	xin32k: xin32k {

		compatible = "fixed-clock";

		#clock-cells = <0>;

		clock-frequency = <32768>;

		clock-output-names = "xin32k";

	};

};



&sdio {

	#address-cells = <1>;

	#size-cells = <0>;

	bus-width = <4>;

	clock-frequency = <50000000>;

	cap-sdio-irq;

	cap-sd-highspeed;

	keep-power-in-suspend;

	mmc-pwrseq = <&sdio_pwrseq>;

	non-removable;

	sd-uhs-sdr104;

	status = "okay";



	brcmf: wifi@1 {

		compatible = "brcm,bcm4329-fmac";

		reg = <1>;

	};

};



&gmac {

	clock_in_out = "output";

	phy-supply = <&vcc_3v3>;	/* +3V3_SOM */

	snps,reset-active-low;

	snps,reset-delays-us = <0 50000 50000>;

	snps,reset-gpio = <&gpio2 RK_PB5 GPIO_ACTIVE_HIGH>;

	status = "okay";

};



&pwm0 {

	status = "okay";

};



&sdmmc {

	cap-sd-highspeed;

	card-detect-delay = <800>;

	vmmc-supply = <&vcc_3v3>;	/* +3V3_SOM */

	vqmmc-supply = <&vcc_3v3>;

	status = "okay";

};



&u2phy {

	status = "okay";



	u2phy_host: host-port {

		status = "okay";

	};



	u2phy_otg: otg-port {

		status = "okay";

	};

};



&uart2 {

	pinctrl-0 = <&uart2m1_xfer>;

	status = "okay";

};



&usb20_otg {

	status = "okay";

};



&usb_host0_ehci {

	status = "okay";

};



&usb_host0_ohci {

	status = "okay";

};

arch/arm64/boot/dts/rockchip/px30-engicam-ctouch2.dtsi

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

/*

 * Copyright (c) 2020 Engicam srl

 * Copyright (c) 2020 Amarula Solutions

 * Copyright (c) 2020 Amarula Solutions(India)

 */



#include "px30-engicam-common.dtsi"



&pinctrl {

	bt {

		bt_enable_h: bt-enable-h {

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

		};

	};



	sdio-pwrseq {

		wifi_enable_h: wifi-enable-h {

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

		};

	};

};



&sdio_pwrseq {

	reset-gpios = <&gpio1 RK_PC2 GPIO_ACTIVE_LOW>;

};



&vcc3v3_btreg {

	enable-gpio = <&gpio1 RK_PC3 GPIO_ACTIVE_HIGH>;

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE