Commit 2c70bcf7 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

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

PWM-Fan and nor-flash for the RockPro64, a better display mode for
the Kevin Chromebook and a new board the Leez P710 SBC.

* tag 'v5.4-rockchip-dts64-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
  arm64: dts: rockchip: Add dts for Leez RK3399 P710 SBC
  arm64: dts: rockchip: enable internal SPI flash for RockPro64.
  arm64: dts: rockchip: Add PWM fan for RockPro64
  arm64: dts: rockchip: Specify override mode for kevin panel

Link: https://lore.kernel.org/r/20190819141659.26414-1-dinguyen@kernel.org
Link: https://lore.kernel.org/r/2362486.gYoCZEsBuK@phil


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 745d0c93 fc702ed4

Documentation/devicetree/bindings/arm/rockchip.yaml

+5 −0
Original line number Diff line number Diff line
@@ -364,6 +364,11 @@ properties: 
          - const: mecer,xms6

          - const: rockchip,rk3229



      - description: Leez RK3399 P710

        items:

          - const: leez,p710

          - const: rockchip,rk3399



      - description: mqmaker MiQi

        items:

          - const: mqmaker,miqi

Documentation/devicetree/bindings/vendor-prefixes.yaml

+2 −0
Original line number Diff line number Diff line
@@ -503,6 +503,8 @@ patternProperties: 
    description: Lantiq Semiconductor

  "^lattice,.*":

    description: Lattice Semiconductor

  "^leez,.*":

    description: Leez

  "^lego,.*":

    description: LEGO Systems A/S

  "^lemaker,.*":

arch/arm64/boot/dts/rockchip/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -20,6 +20,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-leez-p710.dtb

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

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

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

arch/arm64/boot/dts/rockchip/rk3399-gru-kevin.dts

+14 −0
Original line number Diff line number Diff line
@@ -43,6 +43,20 @@ 
		backlight = <&backlight>;

		power-supply = <&pp3300_disp>;



		panel-timing {

			clock-frequency = <266604720>;

			hactive = <2400>;

			hfront-porch = <48>;

			hback-porch = <84>;

			hsync-len = <32>;

			hsync-active = <0>;

			vactive = <1600>;

			vfront-porch = <3>;

			vback-porch = <120>;

			vsync-len = <10>;

			vsync-active = <0>;

		};



		port {

			panel_in_edp: endpoint {

				remote-endpoint = <&edp_out_panel>;

arch/arm64/boot/dts/rockchip/rk3399-leez-p710.dts

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

/*

 * Copyright (c) 2019 Andy Yan <andy.yan@gmail.com>

 */



/dts-v1/;

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

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

#include "rk3399.dtsi"

#include "rk3399-opp.dtsi"



/ {

	model = "Leez RK3399 P710";

	compatible = "leez,p710", "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>;

	};



	sdio_pwrseq: sdio-pwrseq {

		compatible = "mmc-pwrseq-simple";

		clocks = <&rk808 1>;

		clock-names = "ext_clock";

		pinctrl-names = "default";

		pinctrl-0 = <&wifi_reg_on_h>;

		reset-gpios = <&gpio0 RK_PB2 GPIO_ACTIVE_LOW>;

	};



	dc5v_adp: dc5v-adp {

		compatible = "regulator-fixed";

		regulator-name = "dc5v_adapter";

		regulator-always-on;

		regulator-boot-on;

		regulator-min-microvolt = <5000000>;

		regulator-max-microvolt = <5000000>;

	};



	vcc3v3_lan: vcc3v3-lan {

		compatible = "regulator-fixed";

		regulator-name = "vcc3v3_lan";

		regulator-always-on;

		regulator-boot-on;

		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;

		vim-supply = <&vcc3v3_sys>;

	};



	vcc3v3_sys: vcc3v3-sys {

		compatible = "regulator-fixed";

		regulator-name = "vcc3v3_sys";

		regulator-always-on;

		regulator-boot-on;

		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;

		vin-supply = <&vcc5v0_sys>;

	};



	vcc5v0_host0: vcc5v0_host1: vcc5v0-host {

		compatible = "regulator-fixed";

		regulator-name = "vcc5v0_host";

		regulator-boot-on;

		regulator-always-on;

		regulator-min-microvolt = <5500000>;

		regulator-max-microvolt = <5500000>;

		vin-supply = <&vcc5v0_sys>;

	};



	vcc5v0_host3: vcc5v0-host3 {

		compatible = "regulator-fixed";

		regulator-name = "vcc5v0_host3";

		enable-active-high;

		gpio = <&gpio2 RK_PA2 GPIO_ACTIVE_HIGH>;

		pinctrl-names = "default";

		pinctrl-0 = <&vcc5v0_host3_en>;

		regulator-always-on;

		vin-supply = <&vcc5v0_sys>;

	};



	vcc5v0_sys: vcc5v0-sys {

		compatible = "regulator-fixed";

		regulator-name = "vcc5v0_sys";

		regulator-always-on;

		regulator-boot-on;

		regulator-min-microvolt = <5000000>;

		regulator-max-microvolt = <5000000>;

		vin-supply = <&dc5v_adp>;

	};



	vdd_log: vdd-log {

		compatible = "pwm-regulator";

		pwms = <&pwm2 0 25000 1>;

		regulator-name = "vdd_log";

		regulator-always-on;

		regulator-boot-on;

		regulator-min-microvolt = <800000>;

		regulator-max-microvolt = <1400000>;

		vin-supply = <&vcc5v0_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_lan>;

	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";

};



&gpu {

	mali-supply = <&vdd_gpu>;

	status = "okay";

};



&hdmi {

	ddc-i2c-bus = <&i2c7>;

	pinctrl-names = "default";

	pinctrl-0 = <&hdmi_cec>;

	status = "okay";

};



&hdmi_sound {

	status = "okay";

};



&i2c0 {

	clock-frequency = <400000>;

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

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

	status = "okay";



	rk808: pmic@1b {

		compatible = "rockchip,rk808";

		reg = <0x1b>;

		interrupt-parent = <&gpio1>;

		interrupts = <21 IRQ_TYPE_LEVEL_LOW>;

		#clock-cells = <1>;

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

		pinctrl-names = "default";

		pinctrl-0 = <&pmic_int_l>;

		rockchip,system-power-controller;

		wakeup-source;



		vcc1-supply = <&vcc5v0_sys>;

		vcc2-supply = <&vcc5v0_sys>;

		vcc3-supply = <&vcc5v0_sys>;

		vcc4-supply = <&vcc5v0_sys>;

		vcc6-supply = <&vcc5v0_sys>;

		vcc7-supply = <&vcc5v0_sys>;

		vcc8-supply = <&vcc3v3_sys>;

		vcc9-supply = <&vcc5v0_sys>;

		vcc10-supply = <&vcc5v0_sys>;

		vcc11-supply = <&vcc5v0_sys>;

		vcc12-supply = <&vcc3v3_sys>;

		vddio-supply = <&vcc_1v8>;



		regulators {

			vdd_center: DCDC_REG1 {

				regulator-name = "vdd_center";

				regulator-always-on;

				regulator-boot-on;

				regulator-min-microvolt = <750000>;

				regulator-max-microvolt = <1350000>;

				regulator-ramp-delay = <6001>;

				regulator-state-mem {

					regulator-off-in-suspend;

				};

			};



			vdd_cpu_l: DCDC_REG2 {

				regulator-name = "vdd_cpu_l";

				regulator-always-on;

				regulator-boot-on;

				regulator-min-microvolt = <750000>;

				regulator-max-microvolt = <1350000>;

				regulator-ramp-delay = <6001>;

				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-always-on;

				regulator-boot-on;

				regulator-min-microvolt = <1800000>;

				regulator-max-microvolt = <1800000>;

				regulator-state-mem {

					regulator-on-in-suspend;

					regulator-suspend-microvolt = <1800000>;

				};

			};



			vcc1v8_dvp: LDO_REG1 {

				regulator-name = "vcc1v8_dvp";

				regulator-always-on;

				regulator-boot-on;

				regulator-min-microvolt = <1800000>;

				regulator-max-microvolt = <1800000>;

				regulator-state-mem {

					regulator-off-in-suspend;

				};

			};



			vcc1v8_hdmi: LDO_REG2 {

				regulator-name = "vcc1v8_hdmi";

				regulator-always-on;

				regulator-boot-on;

				regulator-min-microvolt = <1800000>;

				regulator-max-microvolt = <1800000>;

				regulator-state-mem {

					regulator-off-in-suspend;

				};

			};



			vcca_1v8: LDO_REG3 {

				regulator-name = "vcca_1v8";

				regulator-always-on;

				regulator-boot-on;

				regulator-min-microvolt = <1800000>;

				regulator-max-microvolt = <1800000>;

				regulator-state-mem {

					regulator-on-in-suspend;

					regulator-suspend-microvolt = <1800000>;

				};

			};



			vccio_sd: LDO_REG4 {

				regulator-name = "vccio_sd";

				regulator-always-on;

				regulator-boot-on;

				regulator-min-microvolt = <3000000>;

				regulator-max-microvolt = <3000000>;

				regulator-state-mem {

					regulator-on-in-suspend;

					regulator-suspend-microvolt = <3000000>;

				};

			};



			vcca3v0_codec: LDO_REG5 {

				regulator-name = "vcca3v0_codec";

				regulator-always-on;

				regulator-boot-on;

				regulator-min-microvolt = <3000000>;

				regulator-max-microvolt = <3000000>;

				regulator-state-mem {

					regulator-off-in-suspend;

				};

			};



			vcc_1v5: LDO_REG6 {

				regulator-name = "vcc_1v5";

				regulator-always-on;

				regulator-boot-on;

				regulator-min-microvolt = <1500000>;

				regulator-max-microvolt = <1500000>;

				regulator-state-mem {

					regulator-on-in-suspend;

					regulator-suspend-microvolt = <1500000>;

				};

			};



			vcc0v9_hdmi: LDO_REG7 {

				regulator-name = "vcc0v9_hdmi";

				regulator-always-on;

				regulator-boot-on;

				regulator-min-microvolt = <900000>;

				regulator-max-microvolt = <900000>;

				regulator-state-mem {

					regulator-off-in-suspend;

				};

			};



			vcc_3v0: LDO_REG8 {

				regulator-name = "vcc_3v0";

				regulator-always-on;

				regulator-boot-on;

				regulator-min-microvolt = <3000000>;

				regulator-max-microvolt = <3000000>;

				regulator-state-mem {

					regulator-on-in-suspend;

					regulator-suspend-microvolt = <3000000>;

				};

			};

		};

	};



	vdd_cpu_b: regulator@40 {

		compatible = "silergy,syr827";

		reg = <0x40>;

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

		pinctrl-names = "default";

		pinctrl-0 = <&vsel1_gpio>;

		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 = <&vcc5v0_sys>;



		regulator-state-mem {

			regulator-off-in-suspend;

		};

	};



	vdd_gpu: regulator@41 {

		compatible = "silergy,syr828";

		reg = <0x41>;

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

		pinctrl-names = "default";

		pinctrl-0 = <&vsel2_gpio>;

		regulator-name = "vdd_gpu";

		regulator-min-microvolt = <712500>;

		regulator-max-microvolt = <1500000>;

		regulator-ramp-delay = <1000>;

		regulator-always-on;

		regulator-boot-on;

		vin-supply = <&vcc5v0_sys>;



		regulator-state-mem {

			regulator-off-in-suspend;

		};

	};

};



&i2c1 {

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

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

	status = "okay";

};



&i2c3 {

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

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

	status = "okay";

};



&i2c4 {

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

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

	status = "okay";

};



&i2c7 {

	status = "okay";

};



&i2s0 {

	rockchip,playback-channels = <8>;

	rockchip,capture-channels = <8>;

	status = "okay";

};



&i2s1 {

	rockchip,playback-channels = <2>;

	rockchip,capture-channels = <2>;

	status = "okay";

};



&i2s2 {

	status = "okay";

};



&io_domains {

	status = "okay";



	bt656-supply = <&vcc1v8_dvp>;

	audio-supply = <&vcc_1v8>;

	sdmmc-supply = <&vccio_sd>;

	gpio1830-supply = <&vcc_3v0>;

};



&pmu_io_domains {

	status = "okay";

	pmu1830-supply = <&vcc_3v0>;

};



&pinctrl {

	bt {

		bt_reg_on_h: bt-reg-on-h {

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

		};



		bt_host_wake_l: bt-host-wake-l {

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

		};



		bt_wake_l: bt-wake-l {

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

		};

	};



	pmic {

		pmic_int_l: pmic-int-l {

			rockchip,pins = <1 RK_PC5 RK_FUNC_GPIO &pcfg_pull_up>;

		};



		vsel1_gpio: vsel1-gpio {

			rockchip,pins = <1 RK_PC1 RK_FUNC_GPIO &pcfg_pull_down>;

		};



		vsel2_gpio: vsel2-gpio {

			rockchip,pins = <1 RK_PB6 RK_FUNC_GPIO &pcfg_pull_down>;

		};

	};



	usb2 {

		vcc5v0_host3_en: vcc5v0-host3-en {

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

		};

	};



	wifi {

		wifi_reg_on_h: wifi-reg-on-h {

			rockchip,pins =

				<0 RK_PB2 RK_FUNC_GPIO &pcfg_pull_none>;

		};



		wifi_host_wake_l: wifi-host-wake-l {

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

		};

	};

};



&pwm2 {

	status = "okay";

};



&saradc {

	status = "okay";



	vref-supply = <&vcc_1v8>;

};



&sdio0 {

	#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;

	pinctrl-names = "default";

	pinctrl-0 = <&sdio0_bus4 &sdio0_cmd &sdio0_clk>;

	sd-uhs-sdr104;

	status = "okay";



	brcmf: wifi@1 {

		compatible = "brcm,bcm4329-fmac";

		reg = <1>;

		interrupt-parent = <&gpio0>;

		interrupts = <RK_PA3 GPIO_ACTIVE_HIGH>;

		interrupt-names = "host-wake";

		pinctrl-names = "default";

		pinctrl-0 = <&wifi_host_wake_l>;

	};

};



&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;

	cd-gpios = <&gpio0 RK_PA7 GPIO_ACTIVE_LOW>;

	disable-wp;

	max-frequency = <150000000>;

	pinctrl-names = "default";

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

	status = "okay";

};



&tcphy0 {

	status = "okay";

};



&tcphy1 {

	status = "okay";

};



&tsadc {

	status = "okay";



	/* tshut mode 0:CRU 1:GPIO */

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

	/* tshut polarity 0:LOW 1:HIGH */

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

};



&u2phy0 {

	status = "okay";



	u2phy0_otg: otg-port {

		status = "okay";

	};



	u2phy0_host: host-port {

		phy-supply = <&vcc5v0_host0>;

		status = "okay";

	};

};



&u2phy1 {

	status = "okay";



	u2phy1_otg: otg-port {

		status = "okay";

	};



	u2phy1_host: host-port {

		phy-supply = <&vcc5v0_host1>;

		status = "okay";

	};

};



&uart0 {

	pinctrl-names = "default";

	pinctrl-0 = <&uart0_xfer &uart0_cts &uart0_rts>;

	status = "okay";



	bluetooth {

		compatible = "brcm,bcm43438-bt";

		clocks = <&rk808 1>;

		clock-names = "ext_clock";

		device-wakeup-gpios = <&gpio2 RK_PD2 GPIO_ACTIVE_HIGH>;

		host-wakeup-gpios = <&gpio0 RK_PA4 GPIO_ACTIVE_HIGH>;

		shutdown-gpios = <&gpio0 RK_PB1 GPIO_ACTIVE_HIGH>;

		pinctrl-names = "default";

		pinctrl-0 = <&bt_host_wake_l &bt_wake_l &bt_reg_on_h>;

	};

};



&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 = "otg";

};



&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";

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE