Commit 4f53a4a7 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'v4.19-rockchip-dts64-2' of... 

Merge tag 'v4.19-rockchip-dts64-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into next/dt

A new board, the Vamrs Ficus using the rk3399 and followin the 96boards
standard. LEDs and power button for the rk3399 firefly and removal of
some deprecated type-c properties from the rk3399 devicetree.

* tag 'v4.19-rockchip-dts64-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip

:
  arm64: dts: rockchip: add led support for Firefly-RK3399
  arm64: dts: rockchip: remove deprecated Type-C PHY properties on rk3399
  arm64: dts: rockchip: add power button support for Firefly-RK3399
  arm64: dts: rockchip: drop out-of-tree properties from rk3399-ficus regulator
  arm64: dts: rockchip: add voltage properties for vcc3v3_pcie on rk3399 ficus
  arm64: dts: rockchip: add USB 2.0 and 3.0 support on Ficus board
  arm64: dts: rockchip: add 96boards RK3399 Ficus board
  dt-bindings: Add vendor prefix for Vamrs Ltd.

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 2dd207c9 0fbfe10f

Documentation/devicetree/bindings/arm/rockchip.txt

+5 −0
Original line number Diff line number Diff line 
Rockchip platforms device tree bindings

---------------------------------------



- 96boards RK3399 Ficus (ROCK960 Enterprise Edition)

    Required root node properties:

      - compatible = "vamrs,ficus", "rockchip,rk3399";



- Amarula Vyasa RK3288 board

    Required root node properties:

      - compatible = "amarula,vyasa-rk3288", "rockchip,rk3288";

Documentation/devicetree/bindings/vendor-prefixes.txt

+1 −0
Original line number Diff line number Diff line
@@ -396,6 +396,7 @@ upisemi uPI Semiconductor Corp. 
urt	United Radiant Technology Corporation

usi	Universal Scientific Industrial Co., Ltd.

v3	V3 Semiconductor

vamrs	Vamrs Ltd.

variscite	Variscite Ltd.

via	VIA Technologies, Inc.

virtio	Virtual I/O Device Specification, developed by the OASIS consortium

arch/arm64/boot/dts/rockchip/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3368-orion-r68-meta.dtb 
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3368-px5-evb.dtb

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3368-r88.dtb

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

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

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

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-gru-bob.dtb

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-gru-kevin.dtb

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

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

/*

 * Copyright (c) 2018 Collabora Ltd.

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

 *

 * Schematics available at https://dl.vamrs.com/products/ficus/docs/hw

 */



/dts-v1/;

#include "rk3399.dtsi"

#include "rk3399-opp.dtsi"



/ {

	model = "96boards RK3399 Ficus";

	compatible = "vamrs,ficus", "rockchip,rk3399";



	chosen {

		stdout-path = "serial2:1500000n8";

	};



	clkin_gmac: external-gmac-clock {

		compatible = "fixed-clock";

		clock-frequency = <125000000>;

		clock-output-names = "clkin_gmac";

		#clock-cells = <0>;

	};



	vcc1v8_s0: vcc1v8-s0 {

		compatible = "regulator-fixed";

		regulator-name = "vcc1v8_s0";

		regulator-min-microvolt = <1800000>;

		regulator-max-microvolt = <1800000>;

		regulator-always-on;

	};



	vcc_sys: vcc-sys {

		compatible = "regulator-fixed";

		regulator-name = "vcc_sys";

		regulator-min-microvolt = <5000000>;

		regulator-max-microvolt = <5000000>;

		regulator-always-on;

	};



	vcc3v3_sys: vcc3v3-sys {

		compatible = "regulator-fixed";

		regulator-name = "vcc3v3_sys";

		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;

		regulator-always-on;

		vin-supply = <&vcc_sys>;

	};



	vcc3v3_pcie: vcc3v3-pcie-regulator {

		compatible = "regulator-fixed";

		enable-active-high;

		gpio = <&gpio1 24 GPIO_ACTIVE_HIGH>;

		pinctrl-names = "default";

		pinctrl-0 = <&pcie_drv>;

		regulator-boot-on;

		regulator-name = "vcc3v3_pcie";

		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;

		vin-supply = <&vcc3v3_sys>;

	};



	vcc5v0_host: vcc5v0-host-regulator {

		compatible = "regulator-fixed";

		enable-active-high;

		gpio = <&gpio4 27 GPIO_ACTIVE_HIGH>;

		pinctrl-names = "default";

		pinctrl-0 = <&host_vbus_drv>;

		regulator-name = "vcc5v0_host";

		regulator-min-microvolt = <5000000>;

		regulator-max-microvolt = <5000000>;

		regulator-always-on;

		vin-supply = <&vcc_sys>;

	};



	vdd_log: vdd-log {

		compatible = "pwm-regulator";

		pwms = <&pwm2 0 25000 0>;

		regulator-name = "vdd_log";

		regulator-min-microvolt = <800000>;

		regulator-max-microvolt = <1400000>;

		regulator-always-on;

		regulator-boot-on;

		vin-supply = <&vcc_sys>;

	};



};



&cpu_l0 {

	cpu-supply = <&vdd_cpu_l>;

};



&cpu_l1 {

	cpu-supply = <&vdd_cpu_l>;

};



&cpu_l2 {

	cpu-supply = <&vdd_cpu_l>;

};



&cpu_l3 {

	cpu-supply = <&vdd_cpu_l>;

};



&cpu_b0 {

	cpu-supply = <&vdd_cpu_b>;

};



&cpu_b1 {

	cpu-supply = <&vdd_cpu_b>;

};



&emmc_phy {

	status = "okay";

};



&gmac {

	assigned-clocks = <&cru SCLK_RMII_SRC>;

	assigned-clock-parents = <&clkin_gmac>;

	clock_in_out = "input";

	phy-supply = <&vcc3v3_sys>;

	phy-mode = "rgmii";

	pinctrl-names = "default";

	pinctrl-0 = <&rgmii_pins>;

	snps,reset-gpio = <&gpio3 RK_PB7 GPIO_ACTIVE_LOW>;

	snps,reset-active-low;

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

	tx_delay = <0x28>;

	rx_delay = <0x11>;

	status = "okay";

};



&hdmi {

	ddc-i2c-bus = <&i2c3>;

	pinctrl-names = "default";

	pinctrl-0 = <&hdmi_cec>;

	status = "okay";

};



&i2c0 {

	clock-frequency = <400000>;

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

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

	status = "okay";



	vdd_cpu_b: regulator@40 {

		compatible = "silergy,syr827";

		reg = <0x40>;

		fcs,suspend-voltage-selector = <1>;

		regulator-name = "vdd_cpu_b";

		regulator-min-microvolt = <712500>;

		regulator-max-microvolt = <1500000>;

		regulator-ramp-delay = <1000>;

		regulator-always-on;

		regulator-boot-on;

		vin-supply = <&vcc_sys>;

		status = "okay";



		regulator-state-mem {

			regulator-off-in-suspend;

		};

	};



	vdd_gpu: regulator@41 {

		compatible = "silergy,syr828";

		reg = <0x41>;

		fcs,suspend-voltage-selector = <1>;

		regulator-name = "vdd_gpu";

		regulator-min-microvolt = <712500>;

		regulator-max-microvolt = <1500000>;

		regulator-ramp-delay = <1000>;

		regulator-always-on;

		regulator-boot-on;

		vin-supply = <&vcc_sys>;

		regulator-state-mem {

			regulator-off-in-suspend;

		};

	};



	rk808: pmic@1b {

		compatible = "rockchip,rk808";

		reg = <0x1b>;

		interrupt-parent = <&gpio1>;

		interrupts = <21 IRQ_TYPE_LEVEL_LOW>;

		pinctrl-names = "default";

		pinctrl-0 = <&pmic_int_l>;

		rockchip,system-power-controller;

		wakeup-source;

		#clock-cells = <1>;

		clock-output-names = "xin32k", "rk808-clkout2";



		vcc1-supply = <&vcc_sys>;

		vcc2-supply = <&vcc_sys>;

		vcc3-supply = <&vcc_sys>;

		vcc4-supply = <&vcc_sys>;

		vcc6-supply = <&vcc_sys>;

		vcc7-supply = <&vcc_sys>;

		vcc8-supply = <&vcc3v3_sys>;

		vcc9-supply = <&vcc_sys>;

		vcc10-supply = <&vcc_sys>;

		vcc11-supply = <&vcc_sys>;

		vcc12-supply = <&vcc3v3_sys>;

		vddio-supply = <&vcc_1v8>;



		regulators {

			vdd_center: DCDC_REG1 {

				regulator-name = "vdd_center";

				regulator-min-microvolt = <750000>;

				regulator-max-microvolt = <1350000>;

				regulator-always-on;

				regulator-boot-on;

				regulator-state-mem {

					regulator-off-in-suspend;

				};

			};



			vdd_cpu_l: DCDC_REG2 {

				regulator-name = "vdd_cpu_l";

				regulator-min-microvolt = <750000>;

				regulator-max-microvolt = <1350000>;

				regulator-always-on;

				regulator-boot-on;

				regulator-state-mem {

					regulator-off-in-suspend;

				};

			};



			vcc_ddr: DCDC_REG3 {

				regulator-name = "vcc_ddr";

				regulator-always-on;

				regulator-boot-on;

				regulator-state-mem {

					regulator-on-in-suspend;

				};

			};



			vcc_1v8: DCDC_REG4 {

				regulator-name = "vcc_1v8";

				regulator-min-microvolt = <1800000>;

				regulator-max-microvolt = <1800000>;

				regulator-always-on;

				regulator-boot-on;

				regulator-state-mem {

					regulator-on-in-suspend;

					regulator-suspend-microvolt = <1800000>;

				};

			};



			vcc1v8_dvp: LDO_REG1 {

				regulator-name = "vcc1v8_dvp";

				regulator-min-microvolt = <1800000>;

				regulator-max-microvolt = <1800000>;

				regulator-always-on;

				regulator-boot-on;

				regulator-state-mem {

					regulator-on-in-suspend;

					regulator-suspend-microvolt = <1800000>;

				};

			};



			vcca1v8_hdmi: LDO_REG2 {

				regulator-name = "vcca1v8_hdmi";

				regulator-min-microvolt = <1800000>;

				regulator-max-microvolt = <1800000>;

				regulator-always-on;

				regulator-boot-on;

				regulator-state-mem {

					regulator-on-in-suspend;

					regulator-suspend-microvolt = <1800000>;

				};

			};



			vcca_1v8: LDO_REG3 {

				regulator-name = "vcca_1v8";

				regulator-min-microvolt = <1800000>;

				regulator-max-microvolt = <1800000>;

				regulator-always-on;

				regulator-boot-on;

				regulator-state-mem {

					regulator-on-in-suspend;

					regulator-suspend-microvolt = <1800000>;

				};

			};



			vcc_sd: LDO_REG4 {

				regulator-name = "vcc_sd";

				regulator-min-microvolt = <1800000>;

				regulator-max-microvolt = <3300000>;

				regulator-always-on;

				regulator-boot-on;

				regulator-state-mem {

					regulator-on-in-suspend;

					regulator-suspend-microvolt = <3300000>;

				};

			};



			vcc3v0_sd: LDO_REG5 {

				regulator-name = "vcc3v0_sd";

				regulator-min-microvolt = <3000000>;

				regulator-max-microvolt = <3000000>;

				regulator-always-on;

				regulator-boot-on;

				regulator-state-mem {

					regulator-on-in-suspend;

					regulator-suspend-microvolt = <3000000>;

				};

			};



			vcc_1v5: LDO_REG6 {

				regulator-name = "vcc_1v5";

				regulator-min-microvolt = <1500000>;

				regulator-max-microvolt = <1500000>;

				regulator-always-on;

				regulator-boot-on;

				regulator-state-mem {

					regulator-on-in-suspend;

					regulator-suspend-microvolt = <1500000>;

				};

			};



			vcca0v9_hdmi: LDO_REG7 {

				regulator-name = "vcca0v9_hdmi";

				regulator-min-microvolt = <900000>;

				regulator-max-microvolt = <900000>;

				regulator-always-on;

				regulator-boot-on;

				regulator-state-mem {

					regulator-on-in-suspend;

					regulator-suspend-microvolt = <900000>;

				};

			};



			vcc_3v0: LDO_REG8 {

				regulator-name = "vcc_3v0";

				regulator-min-microvolt = <3000000>;

				regulator-max-microvolt = <3000000>;

				regulator-always-on;

				regulator-boot-on;

				regulator-state-mem {

					regulator-on-in-suspend;

					regulator-suspend-microvolt = <3000000>;

				};

			};



			vcc3v3_s3: SWITCH_REG1 {

				regulator-name = "vcc3v3_s3";

				regulator-always-on;

				regulator-boot-on;

				regulator-state-mem {

					regulator-on-in-suspend;

				};

			};



			vcc3v3_s0: SWITCH_REG2 {

				regulator-name = "vcc3v3_s0";

				regulator-always-on;

				regulator-boot-on;

				regulator-state-mem {

					regulator-on-in-suspend;

				};

			};

		};

	};

};



&i2c1 {

	status = "okay";

};



&i2c2 {

	status = "okay";

};



&i2c3 {

	status = "okay";

};



&i2c4 {

	status = "okay";

};



&io_domains {

	bt656-supply = <&vcc1v8_s0>; /* bt656_gpio2ab_ms */

	audio-supply = <&vcc1v8_s0>; /* audio_gpio3d4a_ms */

	sdmmc-supply = <&vcc_sd>; /* sdmmc_gpio4b_ms */

	gpio1830-supply = <&vcc_3v0>; /* gpio1833_gpio4cd_ms */

	status = "okay";

};



&pcie_phy {

	status = "okay";

};



&pcie0 {

	ep-gpios = <&gpio4 RK_PD4 GPIO_ACTIVE_HIGH>;

	num-lanes = <4>;

	pinctrl-names = "default";

	pinctrl-0 = <&pcie_clkreqn_cpm>;

	vpcie3v3-supply = <&vcc3v3_pcie>;

	status = "okay";

};



&pmu_io_domains {

	pmu1830-supply = <&vcc_1v8>;

	status = "okay";

};



&pinctrl {

	gmac {

		rgmii_sleep_pins: rgmii-sleep-pins {

			rockchip,pins =

				<3 15 RK_FUNC_GPIO &pcfg_output_low>;

		};

	};



	sdmmc {

		sdmmc_bus1: sdmmc-bus1 {

			rockchip,pins =

				<4 8 RK_FUNC_1 &pcfg_pull_up_8ma>;

		};



		sdmmc_bus4: sdmmc-bus4 {

			rockchip,pins =

				<4 8 RK_FUNC_1 &pcfg_pull_up_8ma>,

				<4 9 RK_FUNC_1 &pcfg_pull_up_8ma>,

				<4 10 RK_FUNC_1 &pcfg_pull_up_8ma>,

				<4 11 RK_FUNC_1 &pcfg_pull_up_8ma>;

		};



		sdmmc_clk: sdmmc-clk {

			rockchip,pins =

				<4 12 RK_FUNC_1 &pcfg_pull_none_18ma>;

		};



		sdmmc_cmd: sdmmc-cmd {

			rockchip,pins =

				<4 13 RK_FUNC_1 &pcfg_pull_up_8ma>;

		};

	};



	pcie {

		pcie_drv: pcie-drv {

			rockchip,pins =

				<1 24 RK_FUNC_GPIO &pcfg_pull_none>;

			};

	};



	pmic {

		pmic_int_l: pmic-int-l {

			rockchip,pins =

				<1 21 RK_FUNC_GPIO &pcfg_pull_up>;

		};



		vsel1_gpio: vsel1-gpio {

			rockchip,pins =

				<1 17 RK_FUNC_GPIO &pcfg_pull_down>;

		};



		vsel2_gpio: vsel2-gpio {

			rockchip,pins =

				<1 14 RK_FUNC_GPIO &pcfg_pull_down>;

		};

	};



	usb2 {

		host_vbus_drv: host-vbus-drv {

			rockchip,pins =

				<4 27 RK_FUNC_GPIO &pcfg_pull_none>;

		};

	};

};



&pwm2 {

	status = "okay";

};



&pwm3 {

	status = "okay";

};



&sdhci {

	bus-width = <8>;

	mmc-hs400-1_8v;

	mmc-hs400-enhanced-strobe;

	non-removable;

	status = "okay";

};



&sdmmc {

	bus-width = <4>;

	cap-mmc-highspeed;

	cap-sd-highspeed;

	clock-frequency = <100000000>;

	clock-freq-min-max = <100000 100000000>;

	disable-wp;

	sd-uhs-sdr104;

	vqmmc-supply = <&vcc_sd>;

	card-detect-delay = <800>;

	pinctrl-names = "default";

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

	status = "okay";

};



&tcphy0 {

	status = "okay";

};



&tcphy1 {

	status = "okay";

};



&u2phy0 {

	status = "okay";

};



&u2phy1 {

	status = "okay";

};



&u2phy0_host {

	phy-supply = <&vcc5v0_host>;

	status = "okay";

};



&u2phy1_host {

	phy-supply = <&vcc5v0_host>;

	status = "okay";

};



&u2phy0_otg {

	status = "okay";

};



&u2phy1_otg {

	status = "okay";

};



&uart0 {

	pinctrl-names = "default";

	pinctrl-0 = <&uart0_xfer &uart0_cts>;

	status = "okay";

};



&uart2 {

	status = "okay";

};



&usb_host0_ehci {

	status = "okay";

};



&usb_host0_ohci {

	status = "okay";

};



&usb_host1_ehci {

	status = "okay";

};



&usb_host1_ohci {

	status = "okay";

};



&usbdrd3_0 {

	status = "okay";

};



&usbdrd_dwc3_0 {

	status = "okay";

	dr_mode = "host";

};



&usbdrd3_1 {

	status = "okay";

};



&usbdrd_dwc3_1 {

	status = "okay";

	dr_mode = "host";

};



&vopb {

	status = "okay";

};



&vopb_mmu {

	status = "okay";

};



&vopl {

	status = "okay";

};



&vopl_mmu {

	status = "okay";

};

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

+44 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ 
 */



/dts-v1/;

#include <dt-bindings/input/linux-event-codes.h>

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

#include "rk3399.dtsi"

#include "rk3399-opp.dtsi"
@@ -72,6 +73,39 @@ 
		regulator-max-microvolt = <12000000>;

	};



	gpio-keys {

		compatible = "gpio-keys";

		autorepeat;

		pinctrl-names = "default";

		pinctrl-0 = <&pwrbtn>;



		power {

			debounce-interval = <100>;

			gpios = <&gpio0 RK_PA5 GPIO_ACTIVE_LOW>;

			label = "GPIO Key Power";

			linux,code = <KEY_POWER>;

			wakeup-source;

		};

	};



	leds {

		compatible = "gpio-leds";

		pinctrl-names = "default";

		pinctrl-0 = <&work_led_gpio>, <&diy_led_gpio>;



		work-led {

			label = "work";

			default-state = "on";

			gpios = <&gpio2 RK_PD3 GPIO_ACTIVE_HIGH>;

		};



		diy-led {

			label = "diy";

			default-state = "off";

			gpios = <&gpio0 RK_PB5 GPIO_ACTIVE_HIGH>;

		};

	};



	rt5640-sound {

		compatible = "simple-audio-card";

		simple-audio-card,name = "rockchip,rt5640-codec";
@@ -587,6 +621,16 @@ 
			rockchip,pins = <1 RK_PA0 RK_FUNC_GPIO &pcfg_pull_none>;

		};

	};



	leds {

		work_led_gpio: work_led-gpio {

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

		};



		diy_led_gpio: diy_led-gpio {

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

		};

	};

};



&pwm0 {

CRA Git | Maintained and supported by SUSTech CRA and CCSE