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

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@philSigned-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 745d0c93 fc702ed4
...@@ -364,6 +364,11 @@ properties: ...@@ -364,6 +364,11 @@ properties:
- const: mecer,xms6 - const: mecer,xms6
- const: rockchip,rk3229 - const: rockchip,rk3229
- description: Leez RK3399 P710
items:
- const: leez,p710
- const: rockchip,rk3399
- description: mqmaker MiQi - description: mqmaker MiQi
items: items:
- const: mqmaker,miqi - const: mqmaker,miqi
......
...@@ -503,6 +503,8 @@ patternProperties: ...@@ -503,6 +503,8 @@ patternProperties:
description: Lantiq Semiconductor description: Lantiq Semiconductor
"^lattice,.*": "^lattice,.*":
description: Lattice Semiconductor description: Lattice Semiconductor
"^leez,.*":
description: Leez
"^lego,.*": "^lego,.*":
description: LEGO Systems A/S description: LEGO Systems A/S
"^lemaker,.*": "^lemaker,.*":
......
...@@ -20,6 +20,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-hugsun-x99.dtb ...@@ -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.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-khadas-edge-captain.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-khadas-edge-captain.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-khadas-edge-v.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-nanopc-t4.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-nanopi-m4.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-nanopi-m4.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-nanopi-neo4.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-nanopi-neo4.dtb
......
...@@ -43,6 +43,20 @@ edp_panel: edp-panel { ...@@ -43,6 +43,20 @@ edp_panel: edp-panel {
backlight = <&backlight>; backlight = <&backlight>;
power-supply = <&pp3300_disp>; 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 { port {
panel_in_edp: endpoint { panel_in_edp: endpoint {
remote-endpoint = <&edp_out_panel>; remote-endpoint = <&edp_out_panel>;
......
This diff is collapsed.
...@@ -58,6 +58,13 @@ diy-led { ...@@ -58,6 +58,13 @@ diy-led {
}; };
}; };
fan: pwm-fan {
compatible = "pwm-fan";
#cooling-cells = <2>;
fan-supply = <&vcc12v_dcin>;
pwms = <&pwm1 0 50000 0>;
};
sdio_pwrseq: sdio-pwrseq { sdio_pwrseq: sdio-pwrseq {
compatible = "mmc-pwrseq-simple"; compatible = "mmc-pwrseq-simple";
clocks = <&rk808 1>; clocks = <&rk808 1>;
...@@ -602,6 +609,10 @@ &pwm0 { ...@@ -602,6 +609,10 @@ &pwm0 {
status = "okay"; status = "okay";
}; };
&pwm1 {
status = "okay";
};
&pwm2 { &pwm2 {
status = "okay"; status = "okay";
}; };
...@@ -631,6 +642,16 @@ &sdhci { ...@@ -631,6 +642,16 @@ &sdhci {
status = "okay"; status = "okay";
}; };
&spi1 {
status = "okay";
flash@0 {
compatible = "jedec,spi-nor";
reg = <0>;
spi-max-frequency = <10000000>;
};
};
&tcphy0 { &tcphy0 {
status = "okay"; status = "okay";
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment