diff --git a/arch/arm64/boot/dts/rockchip/rk3568-evb.dtsi b/arch/arm64/boot/dts/rockchip/rk3568-evb.dtsi
|
index f13c2387f1d2..9793bf3dd27e 100644
|
--- a/arch/arm64/boot/dts/rockchip/rk3568-evb.dtsi
|
+++ b/arch/arm64/boot/dts/rockchip/rk3568-evb.dtsi
|
@@ -346,7 +346,7 @@ sdio_pwrseq: sdio-pwrseq {
|
wireless_wlan: wireless-wlan {
|
compatible = "wlan-platdata";
|
rockchip,grf = <&grf>;
|
- wifi_chip_type = "ap6398s";
|
+ wifi_chip_type = "mt7601u";
|
WIFI,poweren_gpio = <&gpio3 RK_PD5 GPIO_ACTIVE_HIGH>;
|
status = "okay";
|
};
|
@@ -363,7 +363,7 @@ wireless_bluetooth: wireless-bluetooth {
|
BT,reset_gpio = <&gpio3 RK_PA0 GPIO_ACTIVE_HIGH>;
|
BT,wake_gpio = <&gpio3 RK_PA1 GPIO_ACTIVE_HIGH>;
|
BT,wake_host_irq = <&gpio3 RK_PA2 GPIO_ACTIVE_HIGH>;
|
- status = "okay";
|
+ status = "disabled";
|
};
|
|
test-power {
|
@@ -681,15 +681,15 @@ dsi0_panel: panel@0 {
|
disp_timings0: display-timings {
|
native-mode = <&dsi0_timing0>;
|
dsi0_timing0: timing0 {
|
- clock-frequency = <132000000>;
|
- hactive = <1080>;
|
- vactive = <1920>;
|
- hfront-porch = <15>;
|
- hsync-len = <2>;
|
- hback-porch = <30>;
|
- vfront-porch = <15>;
|
- vsync-len = <2>;
|
- vback-porch = <15>;
|
+ clock-frequency = <149600000>;
|
+ hactive = <1920>;
|
+ vactive = <1080>;
|
+ hfront-porch = <48>;
|
+ hsync-len = <32>;
|
+ hback-porch = <187>;
|
+ vfront-porch = <3>;
|
+ vsync-len = <6>;
|
+ vback-porch = <51>;
|
hsync-active = <0>;
|
vsync-active = <0>;
|
de-active = <0>;
|
@@ -1375,14 +1375,42 @@ rk809_codec: codec {
|
&i2c1 {
|
status = "okay";
|
|
- gt1x: gt1x@14 {
|
- compatible = "goodix,gt1x";
|
- reg = <0x14>;
|
+ ili251x@41 {
|
+ compatible = "ilitek,ili251x";
|
+ reg = <0x41>;
|
pinctrl-names = "default";
|
pinctrl-0 = <&touch_gpio>;
|
- goodix,rst-gpio = <&gpio0 RK_PB6 GPIO_ACTIVE_HIGH>;
|
- goodix,irq-gpio = <&gpio0 RK_PB5 IRQ_TYPE_LEVEL_LOW>;
|
+ interrupt-parent = <&gpio0>;
|
+ interrupts = <13 IRQ_TYPE_EDGE_FALLING>;
|
+ reset-gpios = <&gpio0 RK_PB6 GPIO_ACTIVE_LOW>;
|
+ max-fingers = <6>;
|
};
|
+
|
+/*
|
+ i2c-hid-dev@40 {
|
+ compatible = "hid-over-i2c";
|
+ reg = <0x40>;
|
+ hid-descr-addr = <0x0001>;
|
+ pinctrl-names = "default";
|
+ pinctrl-0 = <&touch_gpio>;
|
+ interrupt-parent = <&gpio0>;
|
+ interrupts = <13 IRQ_TYPE_EDGE_FALLING>;
|
+ post-power-on-delay-ms = <70>;
|
+ };
|
+
|
+
|
+
|
+ gt9271@14 {
|
+ compatible = "goodix,gt9271";
|
+ reg = <0x14>;
|
+ pinctrl-names = "default";
|
+ pinctrl-0 = <&touch_gpio>;
|
+ interrupt-parent = <&gpio0>;
|
+ interrupts = <13 0>;
|
+ reset-gpio = <&gpio0 RK_PB6 GPIO_ACTIVE_HIGH>;
|
+ irq-gpio = <&gpio0 RK_PB5 IRQ_TYPE_LEVEL_LOW>;
|
+ };
|
+*/
|
};
|
|
&i2c5 {
|
@@ -1496,8 +1524,8 @@ soc_slppin_rst: soc_slppin_rst {
|
touch {
|
touch_gpio: touch-gpio {
|
rockchip,pins =
|
- <0 RK_PB5 RK_FUNC_GPIO &pcfg_pull_up>,
|
- <0 RK_PB6 RK_FUNC_GPIO &pcfg_pull_none>;
|
+ <0 RK_PB6 RK_FUNC_GPIO &pcfg_pull_up>,
|
+ <0 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>;
|
};
|
};
|
|
@@ -1545,9 +1573,9 @@ &pmu_io_domains {
|
pmuio2-supply = <&vcc3v3_pmu>;
|
vccio1-supply = <&vccio_acodec>;
|
vccio3-supply = <&vccio_sd>;
|
- vccio4-supply = <&vcc_3v3>;
|
+ vccio4-supply = <&vcc_1v8>;
|
vccio5-supply = <&vcc_3v3>;
|
- vccio6-supply = <&vcc_3v3>;
|
+ vccio6-supply = <&vcc_1v8>;
|
vccio7-supply = <&vcc_3v3>;
|
};
|
|
@@ -1560,7 +1588,7 @@ &pwm5 {
|
};
|
|
&pwm7 {
|
- status = "okay";
|
+ status = "disabled";
|
|
compatible = "rockchip,remotectl-pwm";
|
remote_pwm_id = <3>;
|
diff --git a/arch/arm64/boot/dts/rockchip/rk3568-evb1-ddr4-v10-linux.dts b/arch/arm64/boot/dts/rockchip/rk3568-evb1-ddr4-v10-linux.dts
|
index b6b618bb561a..238ab7d55580 100644
|
--- a/arch/arm64/boot/dts/rockchip/rk3568-evb1-ddr4-v10-linux.dts
|
+++ b/arch/arm64/boot/dts/rockchip/rk3568-evb1-ddr4-v10-linux.dts
|
@@ -3,15 +3,151 @@
|
* Copyright (c) 2020 Rockchip Electronics Co., Ltd.
|
*
|
*/
|
-
|
+#include <dt-bindings/display/media-bus-format.h>
|
#include "rk3568-evb1-ddr4-v10.dtsi"
|
#include "rk3568-linux.dtsi"
|
#include <dt-bindings/display/rockchip_vop.h>
|
+/*
|
+/ {
|
+ panel-lvds0 {
|
+ compatible = "simple-panel";
|
+ power-supply = <&vcc3v3_lcd0_n>;
|
+ enable-delay-ms = <20>;
|
+ prepare-delay-ms = <20>;
|
+ unprepare-delay-ms = <20>;
|
+ disable-delay-ms = <20>;
|
+ bus-format = <MEDIA_BUS_FMT_RGB888_1X7X4_SPWG>;
|
+ width-mm = <217>;
|
+ height-mm = <136>;
|
+
|
+ display-timings {
|
+ native-mode = <&timing0>;
|
+ timing0: timing0 {
|
+ clock-frequency = <73400000>;
|
+ hactive = <1280>;
|
+ vactive = <800>;
|
+ hback-porch = <40>;
|
+ hfront-porch = <80>;
|
+ vback-porch = <9>;
|
+ vfront-porch = <9>;
|
+ hsync-len = <40>;
|
+ vsync-len = <5>;
|
+ hsync-active = <0>;
|
+ vsync-active = <0>;
|
+ de-active = <0>;
|
+ pixelclk-active = <0>;
|
+ };
|
+ };
|
+
|
+ ports {
|
+ #address-cells = <1>;
|
+ #size-cells = <0>;
|
+ port@0 {
|
+ reg = <0>;
|
+ panel_in_lvds0: endpoint {
|
+ remote-endpoint = <&lvds0_out_panel>;
|
+ };
|
+ };
|
+ };
|
+ };
|
+
|
+};
|
+&lvds0 {
|
+ status = "okay";
|
+ ports {
|
+ port@1 {
|
+ reg = <1>;
|
+ lvds0_out_panel: endpoint {
|
+ remote-endpoint = <&panel_in_lvds0>;
|
+ };
|
+ };
|
+ };
|
+};
|
+
|
+&lvds0_in_vp1 {
|
+ status = "okay";
|
+};
|
+
|
+&route_lvds{
|
+ status = "okay";
|
+ connect = <&vp1_out_lvds>;
|
+};
|
+*/
|
|
&vp0 {
|
- cursor-win-id = <ROCKCHIP_VOP2_CLUSTER0>;
|
+ cursor-win-id = <ROCKCHIP_VOP2_CLUSTER0>;
|
};
|
|
&vp1 {
|
- cursor-win-id = <ROCKCHIP_VOP2_CLUSTER1>;
|
+ cursor-win-id = <ROCKCHIP_VOP2_CLUSTER1>;
|
+};
|
+
|
+&backlight {
|
+ status = "okay";
|
+};
|
+
|
+
|
+&uart3{
|
+ dma-names = "tx", "rx";
|
+ pinctrl-names = "default";
|
+ pinctrl-0 = <&uart3m1_xfer>;
|
+ status = "okay";
|
+};
|
+
|
+&uart4{
|
+ dma-names = "tx", "rx";
|
+ pinctrl-names = "default";
|
+ pinctrl-0 = <&uart4m1_xfer>;
|
+ status = "okay";
|
+};
|
+
|
+&uart6 {
|
+ dma-name = "tx", "rx";
|
+ pinctrl-0 = <&uart6m1_xfer>;
|
+ status = "okay";
|
+};
|
+
|
+
|
+&uart9 {
|
+ pinctrl-names = "default";
|
+ pinctrl-0 = <&uart9m1_xfer &rs485_ctrl &dout0_gpio>;
|
+ status = "okay";
|
+};
|
+
|
+&can0 {
|
+ compatible = "rockchip,rk3568-can-2.0";
|
+ assigned-clocks = <&cru CLK_CAN0>;
|
+ assigned-clock-rates = <150000000>;
|
+ pinctrl-names = "default";
|
+ pinctrl-0 = <&can0m1_pins>;
|
+ status = "okay";
|
+};
|
+
|
+&can1 {
|
+ compatible = "rockchip,rk3568-can-2.0";
|
+ assigned-clocks = <&cru CLK_CAN1>;
|
+ assigned-clock-rates = <150000000>;
|
+ pinctrl-names = "default";
|
+ pinctrl-0 = <&can1m1_pins>;
|
+ status = "okay";
|
+};
|
+
|
+&pwm15 {
|
+ status = "okay";
|
+};
|
+
|
+&pinctrl {
|
+
|
+ rs485 {
|
+ rs485_ctrl: rs485-ctrl {
|
+ rockchip,pins = <4 RK_PD2 RK_FUNC_GPIO &pcfg_pull_none>;
|
+ };
|
+ };
|
+
|
+ dout0 {
|
+ dout0_gpio: dout0-gpio {
|
+ rockchip,pins = <0 RK_PA4 RK_FUNC_GPIO &pcfg_pull_none>;
|
+ };
|
+ };
|
+
|
};
|
diff --git a/arch/arm64/boot/dts/rockchip/rk3568-evb1-ddr4-v10.dtsi b/arch/arm64/boot/dts/rockchip/rk3568-evb1-ddr4-v10.dtsi
|
index dc9ad4236dd3..afaa65550717 100644
|
--- a/arch/arm64/boot/dts/rockchip/rk3568-evb1-ddr4-v10.dtsi
|
+++ b/arch/arm64/boot/dts/rockchip/rk3568-evb1-ddr4-v10.dtsi
|
@@ -186,15 +186,15 @@ &dsi1_panel {
|
|
&edp {
|
hpd-gpios = <&gpio0 RK_PC2 GPIO_ACTIVE_HIGH>;
|
- status = "okay";
|
+ status = "disabled";
|
};
|
|
&edp_phy {
|
- status = "okay";
|
+ status = "disabled";
|
};
|
|
&edp_in_vp0 {
|
- status = "okay";
|
+ status = "disabled";
|
};
|
|
&edp_in_vp1 {
|
@@ -250,7 +250,7 @@ &gmac1m1_rgmii_clk
|
|
tx_delay = <0x4f>;
|
rx_delay = <0x26>;
|
-
|
+
|
phy-handle = <&rgmii_phy1>;
|
status = "okay";
|
};
|
@@ -259,10 +259,11 @@ &gmac1m1_rgmii_clk
|
* power-supply should switche to vcc3v3_lcd1_n
|
* when mipi panel is connected to dsi1.
|
*/
|
+/*
|
>1x {
|
power-supply = <&vcc3v3_lcd0_n>;
|
};
|
-
|
+*/
|
&i2c4 {
|
status = "okay";
|
gc8034: gc8034@37 {
|
@@ -356,13 +357,13 @@ &video_phy1 {
|
};
|
|
&pcie30phy {
|
- status = "okay";
|
+ status = "disabled";
|
};
|
|
&pcie3x2 {
|
reset-gpios = <&gpio2 RK_PD6 GPIO_ACTIVE_HIGH>;
|
vpcie3v3-supply = <&vcc3v3_pcie>;
|
- status = "okay";
|
+ status = "disabled";
|
};
|
|
&pinctrl {
|
@@ -424,7 +425,7 @@ &route_dsi0 {
|
};
|
|
&route_edp {
|
- status = "okay";
|
+ status = "disabled";
|
connect = <&vp0_out_edp>;
|
};
|
|
@@ -460,7 +461,7 @@ &uart8 {
|
pinctrl-names = "default";
|
pinctrl-0 = <&uart8m0_xfer &uart8m0_ctsn>;
|
};
|
-
|
+/*mipi_dsi下这个要调成HIGHT，但是lvds通过这个引脚来拉低打开背光所以有所区别 */
|
&vcc3v3_lcd0_n {
|
gpio = <&gpio0 RK_PC7 GPIO_ACTIVE_HIGH>;
|
enable-active-high;
|
@@ -489,5 +490,5 @@ &wireless_bluetooth {
|
BT,reset_gpio = <&gpio3 RK_PA0 GPIO_ACTIVE_HIGH>;
|
BT,wake_gpio = <&gpio3 RK_PA2 GPIO_ACTIVE_HIGH>;
|
BT,wake_host_irq = <&gpio3 RK_PA1 GPIO_ACTIVE_HIGH>;
|
- status = "okay";
|
+ status = "disabled";
|
};
|
diff --git a/arch/arm64/configs/rockchip_linux_defconfig b/arch/arm64/configs/rockchip_linux_defconfig
|
index 688203de6bae..dc9320a4b42f 100644
|
--- a/arch/arm64/configs/rockchip_linux_defconfig
|
+++ b/arch/arm64/configs/rockchip_linux_defconfig
|
@@ -60,13 +60,10 @@ CONFIG_ARMV8_DEPRECATED=y
|
CONFIG_SWP_EMULATION=y
|
CONFIG_CP15_BARRIER_EMULATION=y
|
CONFIG_SETEND_EMULATION=y
|
-# CONFIG_ARM64_PTR_AUTH is not set
|
# CONFIG_ARM64_AMU_EXTN is not set
|
-# CONFIG_ARM64_TLB_RANGE is not set
|
# CONFIG_ARM64_BTI is not set
|
# CONFIG_ARM64_E0PD is not set
|
# CONFIG_ARCH_RANDOM is not set
|
-# CONFIG_ARM64_MTE is not set
|
# CONFIG_ARM64_SVE is not set
|
CONFIG_ARM64_PSEUDO_NMI=y
|
CONFIG_PM_DEBUG=y
|
@@ -120,6 +117,9 @@ CONFIG_SYN_COOKIES=y
|
CONFIG_NETFILTER=y
|
CONFIG_IP_NF_IPTABLES=y
|
CONFIG_IP_NF_MANGLE=y
|
+CONFIG_CAN=y
|
+CONFIG_CAN_ROCKCHIP=y
|
+CONFIG_CANFD_ROCKCHIP=y
|
CONFIG_BT=y
|
CONFIG_BT_RFCOMM=y
|
CONFIG_BT_HIDP=y
|
@@ -130,6 +130,7 @@ CONFIG_BT_HCIBFUSB=y
|
CONFIG_BT_HCIVHCI=y
|
CONFIG_BT_MRVL=y
|
CONFIG_BT_MRVL_SDIO=y
|
+CONFIG_CFG80211_WEXT=y
|
CONFIG_RFKILL=y
|
CONFIG_RFKILL_RK=y
|
CONFIG_PCI=y
|
@@ -212,8 +213,23 @@ CONFIG_STMMAC_ETH=y
|
CONFIG_MOTORCOMM_PHY=y
|
CONFIG_ROCKCHIP_PHY=y
|
CONFIG_RK630_PHY=y
|
+CONFIG_PPP=y
|
+CONFIG_PPP_BSDCOMP=y
|
+CONFIG_PPP_DEFLATE=y
|
+CONFIG_PPP_FILTER=y
|
+CONFIG_PPP_MPPE=y
|
+CONFIG_PPP_MULTILINK=y
|
+CONFIG_PPPOE=y
|
+CONFIG_PPP_ASYNC=y
|
+CONFIG_PPP_SYNC_TTY=y
|
CONFIG_USB_RTL8150=y
|
CONFIG_USB_RTL8152=y
|
+CONFIG_USB_USBNET=y
|
+CONFIG_USB_NET_CDC_MBIM=y
|
+CONFIG_HOSTAP=y
|
+CONFIG_HOSTAP_FIRMWARE=y
|
+CONFIG_HOSTAP_FIRMWARE_NVRAM=y
|
+CONFIG_MT7601U=y
|
CONFIG_WL_ROCKCHIP=y
|
CONFIG_WIFI_BUILD_MODULE=y
|
CONFIG_AP6XXX=m
|
@@ -228,8 +244,10 @@ CONFIG_MOUSE_CYAPA=y
|
CONFIG_MOUSE_ELAN_I2C=y
|
CONFIG_INPUT_TOUCHSCREEN=y
|
CONFIG_TOUCHSCREEN_ATMEL_MXT=y
|
+CONFIG_TOUCHSCREEN_GOODIX=y
|
CONFIG_TOUCHSCREEN_GSL3673=y
|
CONFIG_TOUCHSCREEN_GT1X=y
|
+CONFIG_TOUCHSCREEN_ILI210X=y
|
CONFIG_TOUCHSCREEN_ELAN=y
|
CONFIG_TOUCHSCREEN_USB_COMPOSITE=y
|
CONFIG_ROCKCHIP_REMOTECTL=y
|
@@ -628,7 +646,6 @@ CONFIG_CRYPTO_USER_API_HASH=y
|
CONFIG_CRYPTO_USER_API_SKCIPHER=y
|
CONFIG_CRYPTO_DEV_ROCKCHIP=y
|
CONFIG_CRYPTO_DEV_ROCKCHIP_DEV=y
|
-CONFIG_CRC_CCITT=y
|
CONFIG_CRC_T10DIF=y
|
CONFIG_CRC7=y
|
# CONFIG_XZ_DEC_X86 is not set
|
