mirror of
https://github.com/torvalds/linux.git
synced 2026-05-28 00:53:34 +02:00
A lot of dt-yaml related fixes; PCIe, USB and pwm-fans for Helios64;
Display rotation and audio codec for the Odroid Go Advance; IR, spdif and usb-c support for rk3399-firefly; USB support for rk3308 and some rk3328 boards and setting the PCIe link speed to actually only supported speed on rk3399. -----BEGIN PGP SIGNATURE----- iQFEBAABCAAuFiEE7v+35S2Q1vLNA3Lx86Z5yZzRHYEFAmDO/cEQHGhlaWtvQHNu dGVjaC5kZQAKCRDzpnnJnNEdge1jB/9YUxCy4YUpdu6Cd1xMSekFi9fk5fHb/KF/ OboLWvgany7SW0zAGV6XgFxIZKczVx5kQwq1Sf0seiI5u7RL2Fir5VRh9Uu6qK0l i8saw+hThXWu4Bg3xiKo8eIG76apHAH9eWuSuRx9hJjb6PgOym5Fh2IOcdUyx7JB g3TqUGk/Ai+TR55ySPB6f/TJQO0PFNMmzrJO0QYnO70TWFRYKsmsnLCEfAPpzcr0 1NBbvLF+mtvNOlTlANUDAr4XcqrMJgGI7b4s3i0c8Dt5ani6QoJKuwZvnKbG7Tm5 zOgiHnDfNcHMacTeJKwDUKc/zF+Dvt+fflsfk1thb+tFHbuEXIQT =H1p3 -----END PGP SIGNATURE----- gpgsig -----BEGIN PGP SIGNATURE----- iQJDBAABCgAtFiEElf+HevZ4QCAJmMQ+jBrnPN6EHHcFAmDT5yYPHG9sb2ZAbGl4 b20ubmV0AAoJEIwa5zzehBx3p5IP/j2MNoOXY0pLUCfM/5fQ66/ES/uLBV2Rt4Qg d1axZkcZ74qOcXhmxCfiq/1/4vYNZu+QQ+D/QFXmor9HbRZMzebvODQIcMWJmwCQ tavBHqG3seKzSQibaPveOCgSqK2UqzABpVexgE28QrVkrY3DhR3vYBlxNDz4terC 9ucICyXur2j4/pv2ZIQhyoZTuaGPp9bLdU7QigRUsXODEirnLzjuV1u1XML7vRbW nKA7cp/6z4ndrUksC8p3sSDHUTfhJKMi0Hs7iFW6Le+0sog4MFzwNJLzJZ2V+KeI mCkCZsjsieMy1qtfG36ad/DaXt1AOlsVzgoMo4QFfy07oC7AICoX2QMGwiJvE/l8 f3eep7P3vDm20bs3DzfhjA+leurBjQq2gOCkA7NgFgpTFAu9S1d4dDC+fxRaqwi3 I0fD/pDbQSyQIXw5HpwieCU+d0+VI0VXBnMFYSxo3zyX6t6QXFF9phoAECLiBqUO VjjDkGiI9+EjUKTWFVxFTLsnPHhWA5Eab+FOqlpW2a1fmAUHSXq7Q3LVG0BR0DJn EDtFPIEkqxuSWkuyiGM7pcgwUEhoYmdRqda9yty0zJaUKMqWd/8xGHj8AG/avWho V/0EZDOlydO474k7g8eIW6mEErhdBIkXHHVQLcamk2EjYn78JUVT1P7f0GprMDqc 7HUJmQy1 =qhsN -----END PGP SIGNATURE----- Merge tag 'v5.14-rockchip-dts64-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into arm/dt A lot of dt-yaml related fixes; PCIe, USB and pwm-fans for Helios64; Display rotation and audio codec for the Odroid Go Advance; IR, spdif and usb-c support for rk3399-firefly; USB support for rk3308 and some rk3328 boards and setting the PCIe link speed to actually only supported speed on rk3399. * tag 'v5.14-rockchip-dts64-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip: (30 commits) arm64: dts: rockchip: Re-add regulator-always-on for vcc_sdio for rk3399-roc-pc arm64: dts: rockchip: Re-add regulator-boot-on, regulator-always-on for vdd_gpu on rk3399-roc-pc arm64: dts: rockchip: add ir-receiver for rk3399-roc-pc arm64: dts: rockchip: Add USB-C port details for rk3399 Firefly arm64: dts: rockchip: Sort rk3399 firefly pinmux entries arm64: dts: rockchip: add infrared receiver node to RK3399 Firefly arm64: dts: rockchip: add SPDIF node for rk3399-firefly arm64: dts: rockchip: Add Rotation Property for OGA Panel arm64: dts: rockchip: Add support for USB on helios64 arm64: dts: rockchip: add USB support to rk3308.dtsi arm64: dts: rockchip: rename nodename for phy-rockchip-inno-usb2 arm64: dts: rockchip: add rk817 codec to Odroid Go arm64: dts: rename grf-gpio nodename in rk3328.dtsi arm64: dts: rockchip: Add support for PCIe on helios64 arm64: dts: rockchip: Add support for two PWM fans on helios64 arm64: dts: rockchip: fix regulator-gpio states array arm64: dts: rockchip: add #power-domain-cells to power domain nodes arm64: dts: rockchip: Fix power-controller node names for rk3399 arm64: dts: rockchip: Fix power-controller node names for rk3328 arm64: dts: rockchip: Fix power-controller node names for px30 ... Link: https://lore.kernel.org/r/2796982.e9J7NaK4W3@phil Signed-off-by: Olof Johansson <olof@lixom.net>
This commit is contained in:
Olof Johansson
commit
73d1774e0f
|
|
@ -244,28 +244,31 @@ power: power-controller {
|
|||
#size-cells = <0>;
|
||||
|
||||
/* These power domains are grouped by VD_LOGIC */
|
||||
pd_usb@PX30_PD_USB {
|
||||
power-domain@PX30_PD_USB {
|
||||
reg = <PX30_PD_USB>;
|
||||
clocks = <&cru HCLK_HOST>,
|
||||
<&cru HCLK_OTG>,
|
||||
<&cru SCLK_OTG_ADP>;
|
||||
pm_qos = <&qos_usb_host>, <&qos_usb_otg>;
|
||||
#power-domain-cells = <0>;
|
||||
};
|
||||
pd_sdcard@PX30_PD_SDCARD {
|
||||
power-domain@PX30_PD_SDCARD {
|
||||
reg = <PX30_PD_SDCARD>;
|
||||
clocks = <&cru HCLK_SDMMC>,
|
||||
<&cru SCLK_SDMMC>;
|
||||
pm_qos = <&qos_sdmmc>;
|
||||
#power-domain-cells = <0>;
|
||||
};
|
||||
pd_gmac@PX30_PD_GMAC {
|
||||
power-domain@PX30_PD_GMAC {
|
||||
reg = <PX30_PD_GMAC>;
|
||||
clocks = <&cru ACLK_GMAC>,
|
||||
<&cru PCLK_GMAC>,
|
||||
<&cru SCLK_MAC_REF>,
|
||||
<&cru SCLK_GMAC_RX_TX>;
|
||||
pm_qos = <&qos_gmac>;
|
||||
#power-domain-cells = <0>;
|
||||
};
|
||||
pd_mmc_nand@PX30_PD_MMC_NAND {
|
||||
power-domain@PX30_PD_MMC_NAND {
|
||||
reg = <PX30_PD_MMC_NAND>;
|
||||
clocks = <&cru HCLK_NANDC>,
|
||||
<&cru HCLK_EMMC>,
|
||||
|
|
@ -277,15 +280,17 @@ pd_mmc_nand@PX30_PD_MMC_NAND {
|
|||
<&cru SCLK_SFC>;
|
||||
pm_qos = <&qos_emmc>, <&qos_nand>,
|
||||
<&qos_sdio>, <&qos_sfc>;
|
||||
#power-domain-cells = <0>;
|
||||
};
|
||||
pd_vpu@PX30_PD_VPU {
|
||||
power-domain@PX30_PD_VPU {
|
||||
reg = <PX30_PD_VPU>;
|
||||
clocks = <&cru ACLK_VPU>,
|
||||
<&cru HCLK_VPU>,
|
||||
<&cru SCLK_CORE_VPU>;
|
||||
pm_qos = <&qos_vpu>, <&qos_vpu_r128>;
|
||||
#power-domain-cells = <0>;
|
||||
};
|
||||
pd_vo@PX30_PD_VO {
|
||||
power-domain@PX30_PD_VO {
|
||||
reg = <PX30_PD_VO>;
|
||||
clocks = <&cru ACLK_RGA>,
|
||||
<&cru ACLK_VOPB>,
|
||||
|
|
@ -300,8 +305,9 @@ pd_vo@PX30_PD_VO {
|
|||
<&cru SCLK_VOPB_PWM>;
|
||||
pm_qos = <&qos_rga_rd>, <&qos_rga_wr>,
|
||||
<&qos_vop_m0>, <&qos_vop_m1>;
|
||||
#power-domain-cells = <0>;
|
||||
};
|
||||
pd_vi@PX30_PD_VI {
|
||||
power-domain@PX30_PD_VI {
|
||||
reg = <PX30_PD_VI>;
|
||||
clocks = <&cru ACLK_CIF>,
|
||||
<&cru ACLK_ISP>,
|
||||
|
|
@ -311,11 +317,13 @@ pd_vi@PX30_PD_VI {
|
|||
pm_qos = <&qos_isp_128>, <&qos_isp_rd>,
|
||||
<&qos_isp_wr>, <&qos_isp_m1>,
|
||||
<&qos_vip>;
|
||||
#power-domain-cells = <0>;
|
||||
};
|
||||
pd_gpu@PX30_PD_GPU {
|
||||
power-domain@PX30_PD_GPU {
|
||||
reg = <PX30_PD_GPU>;
|
||||
clocks = <&cru SCLK_GPU>;
|
||||
pm_qos = <&qos_gpu>;
|
||||
#power-domain-cells = <0>;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
@ -814,7 +822,7 @@ usb2phy_grf: syscon@ff2c0000 {
|
|||
#address-cells = <1>;
|
||||
#size-cells = <1>;
|
||||
|
||||
u2phy: usb2-phy@100 {
|
||||
u2phy: usb2phy@100 {
|
||||
compatible = "rockchip,px30-usb2phy";
|
||||
reg = <0x100 0x20>;
|
||||
clocks = <&pmucru SCLK_USBPHY_REF>;
|
||||
|
|
@ -1087,7 +1095,6 @@ vopb_mmu: iommu@ff460f00 {
|
|||
compatible = "rockchip,iommu";
|
||||
reg = <0x0 0xff460f00 0x0 0x100>;
|
||||
interrupts = <GIC_SPI 77 IRQ_TYPE_LEVEL_HIGH>;
|
||||
interrupt-names = "vopb_mmu";
|
||||
clocks = <&cru ACLK_VOPB>, <&cru HCLK_VOPB>;
|
||||
clock-names = "aclk", "iface";
|
||||
power-domains = <&power PX30_PD_VO>;
|
||||
|
|
@ -1128,7 +1135,6 @@ vopl_mmu: iommu@ff470f00 {
|
|||
compatible = "rockchip,iommu";
|
||||
reg = <0x0 0xff470f00 0x0 0x100>;
|
||||
interrupts = <GIC_SPI 78 IRQ_TYPE_LEVEL_HIGH>;
|
||||
interrupt-names = "vopl_mmu";
|
||||
clocks = <&cru ACLK_VOPL>, <&cru HCLK_VOPL>;
|
||||
clock-names = "aclk", "iface";
|
||||
power-domains = <&power PX30_PD_VO>;
|
||||
|
|
|
|||
|
|
@ -84,8 +84,8 @@ vcc_sdmmc: vcc-sdmmc {
|
|||
regulator-min-microvolt = <1800000>;
|
||||
regulator-max-microvolt = <3300000>;
|
||||
gpios = <&gpio0 RK_PA7 GPIO_ACTIVE_HIGH>;
|
||||
states = <1800000 0x0
|
||||
3300000 0x1>;
|
||||
states = <1800000 0x0>,
|
||||
<3300000 0x1>;
|
||||
vin-supply = <&vcc5v0_sys>;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -164,7 +164,7 @@ xin24m: xin24m {
|
|||
|
||||
grf: grf@ff000000 {
|
||||
compatible = "rockchip,rk3308-grf", "syscon", "simple-mfd";
|
||||
reg = <0x0 0xff000000 0x0 0x10000>;
|
||||
reg = <0x0 0xff000000 0x0 0x08000>;
|
||||
|
||||
reboot-mode {
|
||||
compatible = "syscon-reboot-mode";
|
||||
|
|
@ -177,6 +177,42 @@ reboot-mode {
|
|||
};
|
||||
};
|
||||
|
||||
usb2phy_grf: syscon@ff008000 {
|
||||
compatible = "rockchip,rk3308-usb2phy-grf", "syscon", "simple-mfd";
|
||||
reg = <0x0 0xff008000 0x0 0x4000>;
|
||||
#address-cells = <1>;
|
||||
#size-cells = <1>;
|
||||
|
||||
u2phy: usb2phy@100 {
|
||||
compatible = "rockchip,rk3308-usb2phy";
|
||||
reg = <0x100 0x10>;
|
||||
assigned-clocks = <&cru USB480M>;
|
||||
assigned-clock-parents = <&u2phy>;
|
||||
clocks = <&cru SCLK_USBPHY_REF>;
|
||||
clock-names = "phyclk";
|
||||
clock-output-names = "usb480m_phy";
|
||||
#clock-cells = <0>;
|
||||
status = "disabled";
|
||||
|
||||
u2phy_otg: otg-port {
|
||||
interrupts = <GIC_SPI 67 IRQ_TYPE_LEVEL_HIGH>,
|
||||
<GIC_SPI 68 IRQ_TYPE_LEVEL_HIGH>,
|
||||
<GIC_SPI 69 IRQ_TYPE_LEVEL_HIGH>;
|
||||
interrupt-names = "otg-bvalid", "otg-id",
|
||||
"linestate";
|
||||
#phy-cells = <0>;
|
||||
status = "disabled";
|
||||
};
|
||||
|
||||
u2phy_host: host-port {
|
||||
interrupts = <GIC_SPI 74 IRQ_TYPE_LEVEL_HIGH>;
|
||||
interrupt-names = "linestate";
|
||||
#phy-cells = <0>;
|
||||
status = "disabled";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
detect_grf: syscon@ff00b000 {
|
||||
compatible = "rockchip,rk3308-detect-grf", "syscon", "simple-mfd";
|
||||
reg = <0x0 0xff00b000 0x0 0x1000>;
|
||||
|
|
@ -579,6 +615,42 @@ spdif_tx: spdif-tx@ff3a0000 {
|
|||
status = "disabled";
|
||||
};
|
||||
|
||||
usb20_otg: usb@ff400000 {
|
||||
compatible = "rockchip,rk3308-usb", "rockchip,rk3066-usb",
|
||||
"snps,dwc2";
|
||||
reg = <0x0 0xff400000 0x0 0x40000>;
|
||||
interrupts = <GIC_SPI 66 IRQ_TYPE_LEVEL_HIGH>;
|
||||
clocks = <&cru HCLK_OTG>;
|
||||
clock-names = "otg";
|
||||
dr_mode = "otg";
|
||||
g-np-tx-fifo-size = <16>;
|
||||
g-rx-fifo-size = <280>;
|
||||
g-tx-fifo-size = <256 128 128 64 32 16>;
|
||||
phys = <&u2phy_otg>;
|
||||
phy-names = "usb2-phy";
|
||||
status = "disabled";
|
||||
};
|
||||
|
||||
usb_host_ehci: usb@ff440000 {
|
||||
compatible = "generic-ehci";
|
||||
reg = <0x0 0xff440000 0x0 0x10000>;
|
||||
interrupts = <GIC_SPI 71 IRQ_TYPE_LEVEL_HIGH>;
|
||||
clocks = <&cru HCLK_HOST>, <&cru HCLK_HOST_ARB>, <&u2phy>;
|
||||
phys = <&u2phy_host>;
|
||||
phy-names = "usb";
|
||||
status = "disabled";
|
||||
};
|
||||
|
||||
usb_host_ohci: usb@ff450000 {
|
||||
compatible = "generic-ohci";
|
||||
reg = <0x0 0xff450000 0x0 0x10000>;
|
||||
interrupts = <GIC_SPI 72 IRQ_TYPE_LEVEL_HIGH>;
|
||||
clocks = <&cru HCLK_HOST>, <&cru HCLK_HOST_ARB>, <&u2phy>;
|
||||
phys = <&u2phy_host>;
|
||||
phy-names = "usb";
|
||||
status = "disabled";
|
||||
};
|
||||
|
||||
sdmmc: mmc@ff480000 {
|
||||
compatible = "rockchip,rk3308-dw-mshc", "rockchip,rk3288-dw-mshc";
|
||||
reg = <0x0 0xff480000 0x0 0x4000>;
|
||||
|
|
|
|||
|
|
@ -165,6 +165,31 @@ blue_led: led-0 {
|
|||
};
|
||||
};
|
||||
|
||||
rk817-sound {
|
||||
compatible = "simple-audio-card";
|
||||
simple-audio-card,name = "Analog";
|
||||
simple-audio-card,format = "i2s";
|
||||
simple-audio-card,hp-det-gpio = <&gpio2 RK_PC6 GPIO_ACTIVE_HIGH>;
|
||||
simple-audio-card,mclk-fs = <256>;
|
||||
simple-audio-card,widgets =
|
||||
"Microphone", "Mic Jack",
|
||||
"Headphone", "Headphones",
|
||||
"Speaker", "Speaker";
|
||||
simple-audio-card,routing =
|
||||
"MICL", "Mic Jack",
|
||||
"Headphones", "HPOL",
|
||||
"Headphones", "HPOR",
|
||||
"Speaker", "SPKO";
|
||||
|
||||
simple-audio-card,codec {
|
||||
sound-dai = <&rk817>;
|
||||
};
|
||||
|
||||
simple-audio-card,cpu {
|
||||
sound-dai = <&i2s1_2ch>;
|
||||
};
|
||||
};
|
||||
|
||||
vccsys: vccsys {
|
||||
compatible = "regulator-fixed";
|
||||
regulator-name = "vcc3v8_sys";
|
||||
|
|
@ -239,6 +264,7 @@ panel@0 {
|
|||
backlight = <&backlight>;
|
||||
iovcc-supply = <&vcc_lcd>;
|
||||
reset-gpios = <&gpio3 RK_PC0 GPIO_ACTIVE_LOW>;
|
||||
rotation = <270>;
|
||||
vdd-supply = <&vcc_lcd>;
|
||||
|
||||
port {
|
||||
|
|
@ -269,11 +295,14 @@ rk817: pmic@20 {
|
|||
reg = <0x20>;
|
||||
interrupt-parent = <&gpio0>;
|
||||
interrupts = <RK_PB2 IRQ_TYPE_LEVEL_LOW>;
|
||||
clock-output-names = "rk808-clkout1", "xin32k";
|
||||
clock-names = "mclk";
|
||||
clocks = <&cru SCLK_I2S1_OUT>;
|
||||
pinctrl-names = "default";
|
||||
pinctrl-0 = <&pmic_int>;
|
||||
pinctrl-0 = <&pmic_int>, <&i2s1_2ch_mclk>;
|
||||
wakeup-source;
|
||||
#clock-cells = <1>;
|
||||
clock-output-names = "rk808-clkout1", "xin32k";
|
||||
#sound-dai-cells = <0>;
|
||||
|
||||
vcc1-supply = <&vccsys>;
|
||||
vcc2-supply = <&vccsys>;
|
||||
|
|
@ -432,6 +461,10 @@ regulator-state-mem {
|
|||
};
|
||||
};
|
||||
};
|
||||
|
||||
rk817_codec: codec {
|
||||
rockchip,mic-in-differential;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -14,6 +14,7 @@ / {
|
|||
compatible = "friendlyarm,nanopi-r2s", "rockchip,rk3328";
|
||||
|
||||
aliases {
|
||||
ethernet1 = &rtl8153;
|
||||
mmc0 = &sdmmc;
|
||||
};
|
||||
|
||||
|
|
@ -76,8 +77,8 @@ vcc_io_sdio: sdmmcio-regulator {
|
|||
regulator-settling-time-us = <5000>;
|
||||
regulator-type = "voltage";
|
||||
startup-delay-us = <2000>;
|
||||
states = <1800000 0x1
|
||||
3300000 0x0>;
|
||||
states = <1800000 0x1>,
|
||||
<3300000 0x0>;
|
||||
vin-supply = <&vcc_io_33>;
|
||||
};
|
||||
|
||||
|
|
@ -101,6 +102,18 @@ vdd_5v: vdd-5v {
|
|||
regulator-min-microvolt = <5000000>;
|
||||
regulator-max-microvolt = <5000000>;
|
||||
};
|
||||
|
||||
vdd_5v_lan: vdd-5v-lan {
|
||||
compatible = "regulator-fixed";
|
||||
enable-active-high;
|
||||
gpio = <&gpio2 RK_PC6 GPIO_ACTIVE_HIGH>;
|
||||
pinctrl-0 = <&lan_vdd_pin>;
|
||||
pinctrl-names = "default";
|
||||
regulator-name = "vdd_5v_lan";
|
||||
regulator-always-on;
|
||||
regulator-boot-on;
|
||||
vin-supply = <&vdd_5v>;
|
||||
};
|
||||
};
|
||||
|
||||
&cpu0 {
|
||||
|
|
@ -309,6 +322,12 @@ wan_led_pin: wan-led-pin {
|
|||
};
|
||||
};
|
||||
|
||||
lan {
|
||||
lan_vdd_pin: lan-vdd-pin {
|
||||
rockchip,pins = <2 RK_PC6 RK_FUNC_GPIO &pcfg_pull_none>;
|
||||
};
|
||||
};
|
||||
|
||||
pmic {
|
||||
pmic_int_l: pmic-int-l {
|
||||
rockchip,pins = <1 RK_PD0 RK_FUNC_GPIO &pcfg_pull_up>;
|
||||
|
|
@ -368,6 +387,19 @@ &usb20_otg {
|
|||
dr_mode = "host";
|
||||
};
|
||||
|
||||
&usbdrd3 {
|
||||
dr_mode = "host";
|
||||
status = "okay";
|
||||
#address-cells = <1>;
|
||||
#size-cells = <0>;
|
||||
|
||||
/* Second port is for USB 3.0 */
|
||||
rtl8153: device@2 {
|
||||
compatible = "usbbda,8153";
|
||||
reg = <2>;
|
||||
};
|
||||
};
|
||||
|
||||
&usb_host0_ehci {
|
||||
status = "okay";
|
||||
};
|
||||
|
|
|
|||
|
|
@ -50,8 +50,8 @@ vcc_sd: sdmmc-regulator {
|
|||
vcc_sdio: sdmmcio-regulator {
|
||||
compatible = "regulator-gpio";
|
||||
gpios = <&grf_gpio 0 GPIO_ACTIVE_HIGH>;
|
||||
states = <1800000 0x1
|
||||
3300000 0x0>;
|
||||
states = <1800000 0x1>,
|
||||
<3300000 0x0>;
|
||||
regulator-name = "vcc_sdio";
|
||||
regulator-type = "voltage";
|
||||
regulator-min-microvolt = <1800000>;
|
||||
|
|
@ -363,6 +363,11 @@ &usb20_otg {
|
|||
status = "okay";
|
||||
};
|
||||
|
||||
&usbdrd3 {
|
||||
dr_mode = "host";
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
&usb_host0_ehci {
|
||||
status = "okay";
|
||||
};
|
||||
|
|
|
|||
|
|
@ -177,8 +177,6 @@ rtl8211e: ethernet-phy@1 {
|
|||
};
|
||||
|
||||
&gmac2phy {
|
||||
pinctrl-names = "default";
|
||||
pinctrl-0 = <&fephyled_linkm1>, <&fephyled_rxm1>;
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
|
|
@ -382,6 +380,11 @@ &uart2 {
|
|||
status = "okay";
|
||||
};
|
||||
|
||||
&usbdrd3 {
|
||||
dr_mode = "host";
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
&usb_host0_ehci {
|
||||
status = "okay";
|
||||
};
|
||||
|
|
|
|||
|
|
@ -381,6 +381,11 @@ &usb20_otg {
|
|||
status = "okay";
|
||||
};
|
||||
|
||||
&usbdrd3 {
|
||||
dr_mode = "host";
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
&usb_host0_ehci {
|
||||
status = "okay";
|
||||
};
|
||||
|
|
|
|||
|
|
@ -288,7 +288,7 @@ io_domains: io-domains {
|
|||
status = "disabled";
|
||||
};
|
||||
|
||||
grf_gpio: grf-gpio {
|
||||
grf_gpio: gpio {
|
||||
compatible = "rockchip,rk3328-grf-gpio";
|
||||
gpio-controller;
|
||||
#gpio-cells = <2>;
|
||||
|
|
@ -300,15 +300,18 @@ power: power-controller {
|
|||
#address-cells = <1>;
|
||||
#size-cells = <0>;
|
||||
|
||||
pd_hevc@RK3328_PD_HEVC {
|
||||
power-domain@RK3328_PD_HEVC {
|
||||
reg = <RK3328_PD_HEVC>;
|
||||
#power-domain-cells = <0>;
|
||||
};
|
||||
pd_video@RK3328_PD_VIDEO {
|
||||
power-domain@RK3328_PD_VIDEO {
|
||||
reg = <RK3328_PD_VIDEO>;
|
||||
#power-domain-cells = <0>;
|
||||
};
|
||||
pd_vpu@RK3328_PD_VPU {
|
||||
power-domain@RK3328_PD_VPU {
|
||||
reg = <RK3328_PD_VPU>;
|
||||
clocks = <&cru ACLK_VPU>, <&cru HCLK_VPU>;
|
||||
#power-domain-cells = <0>;
|
||||
};
|
||||
};
|
||||
|
||||
|
|
@ -816,7 +819,7 @@ usb2phy_grf: syscon@ff450000 {
|
|||
#address-cells = <1>;
|
||||
#size-cells = <1>;
|
||||
|
||||
u2phy: usb2-phy@100 {
|
||||
u2phy: usb2phy@100 {
|
||||
compatible = "rockchip,rk3328-usb2phy";
|
||||
reg = <0x100 0x10>;
|
||||
clocks = <&xin24m>;
|
||||
|
|
|
|||
|
|
@ -664,6 +664,8 @@ timer0: timer@ff810000 {
|
|||
compatible = "rockchip,rk3368-timer", "rockchip,rk3288-timer";
|
||||
reg = <0x0 0xff810000 0x0 0x20>;
|
||||
interrupts = <GIC_SPI 66 IRQ_TYPE_LEVEL_HIGH>;
|
||||
clocks = <&cru PCLK_TIMER0>, <&cru SCLK_TIMER00>;
|
||||
clock-names = "pclk", "timer";
|
||||
};
|
||||
|
||||
spdif: spdif@ff880000 {
|
||||
|
|
|
|||
|
|
@ -6,6 +6,7 @@
|
|||
/dts-v1/;
|
||||
#include <dt-bindings/input/linux-event-codes.h>
|
||||
#include <dt-bindings/pwm/pwm.h>
|
||||
#include <dt-bindings/usb/pd.h>
|
||||
#include "rk3399.dtsi"
|
||||
#include "rk3399-opp.dtsi"
|
||||
|
||||
|
|
@ -94,6 +95,13 @@ power {
|
|||
};
|
||||
};
|
||||
|
||||
ir-receiver {
|
||||
compatible = "gpio-ir-receiver";
|
||||
gpios = <&gpio0 RK_PA6 GPIO_ACTIVE_LOW>;
|
||||
pinctrl-0 = <&ir_int>;
|
||||
pinctrl-names = "default";
|
||||
};
|
||||
|
||||
leds {
|
||||
compatible = "gpio-leds";
|
||||
pinctrl-names = "default";
|
||||
|
|
@ -151,6 +159,23 @@ sdio_pwrseq: sdio-pwrseq {
|
|||
reset-gpios = <&gpio0 RK_PB2 GPIO_ACTIVE_LOW>;
|
||||
};
|
||||
|
||||
sound-dit {
|
||||
compatible = "audio-graph-card";
|
||||
label = "SPDIF";
|
||||
dais = <&spdif_p0>;
|
||||
};
|
||||
|
||||
spdif-dit {
|
||||
compatible = "linux,spdif-dit";
|
||||
#sound-dai-cells = <0>;
|
||||
|
||||
port {
|
||||
dit_p0_0: endpoint {
|
||||
remote-endpoint = <&spdif_p0_0>;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
/* switched by pmic_sleep */
|
||||
vcc1v8_s3: vcca1v8_s3: vcc1v8-s3 {
|
||||
compatible = "regulator-fixed";
|
||||
|
|
@ -196,6 +221,17 @@ vcc5v0_host: vcc5v0-host-regulator {
|
|||
vin-supply = <&vcc_sys>;
|
||||
};
|
||||
|
||||
vcc5v0_typec: vcc5v0-typec-regulator {
|
||||
compatible = "regulator-fixed";
|
||||
enable-active-high;
|
||||
gpio = <&gpio1 RK_PA3 GPIO_ACTIVE_HIGH>;
|
||||
pinctrl-names = "default";
|
||||
pinctrl-0 = <&vcc5v0_typec_en>;
|
||||
regulator-name = "vcc5v0_typec";
|
||||
regulator-always-on;
|
||||
vin-supply = <&vcc_sys>;
|
||||
};
|
||||
|
||||
vcc_sys: vcc-sys {
|
||||
compatible = "regulator-fixed";
|
||||
regulator-name = "vcc_sys";
|
||||
|
|
@ -521,6 +557,53 @@ &i2c4 {
|
|||
i2c-scl-falling-time-ns = <20>;
|
||||
status = "okay";
|
||||
|
||||
fusb0: typec-portc@22 {
|
||||
compatible = "fcs,fusb302";
|
||||
reg = <0x22>;
|
||||
interrupt-parent = <&gpio1>;
|
||||
interrupts = <RK_PA2 IRQ_TYPE_LEVEL_LOW>;
|
||||
pinctrl-names = "default";
|
||||
pinctrl-0 = <&fusb0_int>;
|
||||
vbus-supply = <&vcc5v0_typec>;
|
||||
status = "okay";
|
||||
|
||||
connector {
|
||||
compatible = "usb-c-connector";
|
||||
data-role = "host";
|
||||
label = "USB-C";
|
||||
op-sink-microwatt = <1000000>;
|
||||
power-role = "dual";
|
||||
sink-pdos =
|
||||
<PDO_FIXED(5000, 2500, PDO_FIXED_USB_COMM)>;
|
||||
source-pdos =
|
||||
<PDO_FIXED(5000, 1400, PDO_FIXED_USB_COMM)>;
|
||||
try-power-role = "sink";
|
||||
|
||||
ports {
|
||||
#address-cells = <1>;
|
||||
#size-cells = <0>;
|
||||
|
||||
port@0 {
|
||||
reg = <0>;
|
||||
|
||||
usbc_hs: endpoint {
|
||||
remote-endpoint =
|
||||
<&u2phy0_typec_hs>;
|
||||
};
|
||||
};
|
||||
|
||||
port@1 {
|
||||
reg = <1>;
|
||||
|
||||
usbc_ss: endpoint {
|
||||
remote-endpoint =
|
||||
<&tcphy0_typec_ss>;
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
accelerometer@68 {
|
||||
compatible = "invensense,mpu6500";
|
||||
reg = <0x68>;
|
||||
|
|
@ -578,12 +661,34 @@ pwrbtn: pwrbtn {
|
|||
};
|
||||
};
|
||||
|
||||
fusb302x {
|
||||
fusb0_int: fusb0-int {
|
||||
rockchip,pins = <1 RK_PA2 RK_FUNC_GPIO &pcfg_pull_up>;
|
||||
};
|
||||
};
|
||||
|
||||
ir {
|
||||
ir_int: ir-int {
|
||||
rockchip,pins = <0 RK_PA6 RK_FUNC_GPIO &pcfg_pull_none>;
|
||||
};
|
||||
};
|
||||
|
||||
lcd-panel {
|
||||
lcd_panel_reset: lcd-panel-reset {
|
||||
rockchip,pins = <4 RK_PD6 RK_FUNC_GPIO &pcfg_pull_up>;
|
||||
};
|
||||
};
|
||||
|
||||
leds {
|
||||
work_led_pin: work-led-pin {
|
||||
rockchip,pins = <2 RK_PD3 RK_FUNC_GPIO &pcfg_pull_none>;
|
||||
};
|
||||
|
||||
diy_led_pin: diy-led-pin {
|
||||
rockchip,pins = <0 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>;
|
||||
};
|
||||
};
|
||||
|
||||
pcie {
|
||||
pcie_pwr_en: pcie-pwr-en {
|
||||
rockchip,pins = <1 RK_PC1 RK_FUNC_GPIO &pcfg_pull_none>;
|
||||
|
|
@ -595,6 +700,10 @@ pcie_3g_drv: pcie-3g-drv {
|
|||
};
|
||||
|
||||
pmic {
|
||||
pmic_int_l: pmic-int-l {
|
||||
rockchip,pins = <1 RK_PC5 RK_FUNC_GPIO &pcfg_pull_up>;
|
||||
};
|
||||
|
||||
vsel1_pin: vsel1-pin {
|
||||
rockchip,pins = <1 RK_PC2 RK_FUNC_GPIO &pcfg_pull_down>;
|
||||
};
|
||||
|
|
@ -604,21 +713,21 @@ vsel2_pin: vsel2-pin {
|
|||
};
|
||||
};
|
||||
|
||||
sdio-pwrseq {
|
||||
wifi_enable_h: wifi-enable-h {
|
||||
rockchip,pins = <0 RK_PB2 RK_FUNC_GPIO &pcfg_pull_none>;
|
||||
};
|
||||
};
|
||||
|
||||
rt5640 {
|
||||
rt5640_hpcon: rt5640-hpcon {
|
||||
rockchip,pins = <4 RK_PC5 RK_FUNC_GPIO &pcfg_pull_none>;
|
||||
};
|
||||
};
|
||||
|
||||
pmic {
|
||||
pmic_int_l: pmic-int-l {
|
||||
rockchip,pins = <1 RK_PC5 RK_FUNC_GPIO &pcfg_pull_up>;
|
||||
sdio-pwrseq {
|
||||
wifi_enable_h: wifi-enable-h {
|
||||
rockchip,pins = <0 RK_PB2 RK_FUNC_GPIO &pcfg_pull_none>;
|
||||
};
|
||||
};
|
||||
|
||||
usb-typec {
|
||||
vcc5v0_typec_en: vcc5v0_typec_en {
|
||||
rockchip,pins = <1 RK_PA3 RK_FUNC_GPIO &pcfg_pull_up>;
|
||||
};
|
||||
};
|
||||
|
||||
|
|
@ -633,16 +742,6 @@ wifi_host_wake_l: wifi-host-wake-l {
|
|||
rockchip,pins = <0 RK_PA3 RK_FUNC_GPIO &pcfg_pull_none>;
|
||||
};
|
||||
};
|
||||
|
||||
leds {
|
||||
work_led_pin: work-led-pin {
|
||||
rockchip,pins = <2 RK_PD3 RK_FUNC_GPIO &pcfg_pull_none>;
|
||||
};
|
||||
|
||||
diy_led_pin: diy-led-pin {
|
||||
rockchip,pins = <0 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
&pwm0 {
|
||||
|
|
@ -710,10 +809,29 @@ &sdhci {
|
|||
status = "okay";
|
||||
};
|
||||
|
||||
&spdif {
|
||||
pinctrl-0 = <&spdif_bus_1>;
|
||||
status = "okay";
|
||||
|
||||
spdif_p0: port {
|
||||
spdif_p0_0: endpoint {
|
||||
remote-endpoint = <&dit_p0_0>;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
&tcphy0 {
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
&tcphy0_usb3 {
|
||||
port {
|
||||
tcphy0_typec_ss: endpoint {
|
||||
remote-endpoint = <&usbc_ss>;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
&tcphy1 {
|
||||
status = "okay";
|
||||
};
|
||||
|
|
@ -737,6 +855,12 @@ u2phy0_host: host-port {
|
|||
phy-supply = <&vcc5v0_host>;
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
port {
|
||||
u2phy0_typec_hs: endpoint {
|
||||
remote-endpoint = <&usbc_hs>;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
&u2phy1 {
|
||||
|
|
|
|||
|
|
@ -245,7 +245,7 @@ &ppvar_gpu_pwm {
|
|||
};
|
||||
|
||||
&ppvar_sd_card_io {
|
||||
states = <1800000 0x0 3300000 0x1>;
|
||||
states = <1800000 0x0>, <3300000 0x1>;
|
||||
regulator-max-microvolt = <3300000>;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -252,8 +252,8 @@ ppvar_sd_card_io: ppvar-sd-card-io {
|
|||
enable-active-high;
|
||||
enable-gpio = <&gpio2 2 GPIO_ACTIVE_HIGH>;
|
||||
gpios = <&gpio2 28 GPIO_ACTIVE_HIGH>;
|
||||
states = <1800000 0x1
|
||||
3000000 0x0>;
|
||||
states = <1800000 0x1>,
|
||||
<3000000 0x0>;
|
||||
|
||||
regulator-min-microvolt = <1800000>;
|
||||
regulator-max-microvolt = <3000000>;
|
||||
|
|
|
|||
|
|
@ -23,6 +23,16 @@ aliases {
|
|||
mmc1 = &sdhci;
|
||||
};
|
||||
|
||||
avdd_0v9_s0: avdd-0v9-s0 {
|
||||
compatible = "regulator-fixed";
|
||||
regulator-name = "avdd_0v9_s0";
|
||||
regulator-always-on;
|
||||
regulator-boot-on;
|
||||
regulator-min-microvolt = <900000>;
|
||||
regulator-max-microvolt = <900000>;
|
||||
vin-supply = <&vcc1v8_sys_s3>;
|
||||
};
|
||||
|
||||
avdd_1v8_s0: avdd-1v8-s0 {
|
||||
compatible = "regulator-fixed";
|
||||
regulator-name = "avdd_1v8_s0";
|
||||
|
|
@ -40,6 +50,20 @@ clkin_gmac: external-gmac-clock {
|
|||
#clock-cells = <0>;
|
||||
};
|
||||
|
||||
fan1 {
|
||||
/* fan connected to P7 */
|
||||
compatible = "pwm-fan";
|
||||
pwms = <&pwm0 0 40000 0>;
|
||||
cooling-levels = <0 80 170 255>;
|
||||
};
|
||||
|
||||
fan2 {
|
||||
/* fan connected to P6 */
|
||||
compatible = "pwm-fan";
|
||||
pwms = <&pwm1 0 40000 0>;
|
||||
cooling-levels = <0 80 170 255>;
|
||||
};
|
||||
|
||||
leds {
|
||||
compatible = "gpio-leds";
|
||||
pinctrl-names = "default";
|
||||
|
|
@ -58,6 +82,18 @@ led-1 {
|
|||
};
|
||||
};
|
||||
|
||||
pcie_power: pcie-power {
|
||||
compatible = "regulator-fixed";
|
||||
enable-active-high;
|
||||
gpio = <&gpio1 RK_PD0 GPIO_ACTIVE_HIGH>;
|
||||
pinctrl-0 = <&pcie_pwr>;
|
||||
pinctrl-names = "default";
|
||||
regulator-boot-on;
|
||||
regulator-name = "pcie_power";
|
||||
startup-delay-us = <10000>;
|
||||
vin-supply = <&vcc5v0_perdev>;
|
||||
};
|
||||
|
||||
vcc1v8_sys_s0: vcc1v8-sys-s0 {
|
||||
compatible = "regulator-fixed";
|
||||
regulator-name = "vcc1v8_sys_s0";
|
||||
|
|
@ -95,6 +131,16 @@ regulator-state-mem {
|
|||
};
|
||||
};
|
||||
|
||||
vcc5v0_perdev: vcc5v0-perdev {
|
||||
compatible = "regulator-fixed";
|
||||
regulator-name = "vcc5v0_perdev";
|
||||
regulator-always-on;
|
||||
regulator-boot-on;
|
||||
regulator-min-microvolt = <5000000>;
|
||||
regulator-max-microvolt = <5000000>;
|
||||
vin-supply = <&vcc12v_dcin_bkup>;
|
||||
};
|
||||
|
||||
vcc5v0_sys: vcc5v0-sys {
|
||||
compatible = "regulator-fixed";
|
||||
regulator-name = "vcc5v0_sys";
|
||||
|
|
@ -109,6 +155,20 @@ regulator-state-mem {
|
|||
};
|
||||
};
|
||||
|
||||
vcc5v0_usb: vcc5v0-usb {
|
||||
compatible = "regulator-fixed";
|
||||
enable-active-high;
|
||||
gpio = <&gpio1 RK_PC6 GPIO_ACTIVE_HIGH>;
|
||||
pinctrl-names = "default";
|
||||
pinctrl-0 = <&vcc5v0_usb_en>;
|
||||
regulator-name = "vcc5v0_usb";
|
||||
regulator-always-on;
|
||||
regulator-boot-on;
|
||||
regulator-min-microvolt = <5000000>;
|
||||
regulator-max-microvolt = <5000000>;
|
||||
vin-supply = <&vcc5v0_perdev>;
|
||||
};
|
||||
|
||||
vcc12v_dcin: vcc12v-dcin {
|
||||
compatible = "regulator-fixed";
|
||||
regulator-name = "vcc12v_dcin";
|
||||
|
|
@ -317,6 +377,20 @@ &io_domains {
|
|||
status = "okay";
|
||||
};
|
||||
|
||||
&pcie_phy {
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
&pcie0 {
|
||||
num-lanes = <2>;
|
||||
status = "okay";
|
||||
|
||||
vpcie12v-supply = <&vcc12v_dcin>;
|
||||
vpcie3v3-supply = <&pcie_power>;
|
||||
vpcie1v8-supply = <&avdd_1v8_s0>;
|
||||
vpcie0v9-supply = <&avdd_0v9_s0>;
|
||||
};
|
||||
|
||||
&pinctrl {
|
||||
gmac {
|
||||
gphy_reset: gphy-reset {
|
||||
|
|
@ -334,12 +408,25 @@ sys_red_led_on: sys-red-led-on {
|
|||
};
|
||||
};
|
||||
|
||||
pcie {
|
||||
pcie_pwr: pcie-pwr {
|
||||
rockchip,pins =
|
||||
<1 RK_PD0 RK_FUNC_GPIO &pcfg_pull_none>;
|
||||
};
|
||||
};
|
||||
|
||||
pmic {
|
||||
pmic_int_l: pmic-int-l {
|
||||
rockchip,pins = <0 RK_PB2 RK_FUNC_GPIO &pcfg_pull_none>;
|
||||
};
|
||||
};
|
||||
|
||||
power {
|
||||
vcc5v0_usb_en: vcc5v0-usb-en {
|
||||
rockchip,pins = <1 RK_PC6 RK_FUNC_GPIO &pcfg_pull_none>;
|
||||
};
|
||||
};
|
||||
|
||||
vcc3v0-sd {
|
||||
sdmmc0_pwr_h: sdmmc0-pwr-h {
|
||||
rockchip,pins = <0 RK_PA1 RK_FUNC_GPIO &pcfg_pull_up>;
|
||||
|
|
@ -352,6 +439,16 @@ &pmu_io_domains {
|
|||
status = "okay";
|
||||
};
|
||||
|
||||
&pwm0 {
|
||||
/* pwm-fan on P7 */
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
&pwm1 {
|
||||
/* pwm-fan on P6 */
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
&sdhci {
|
||||
bus-width = <8>;
|
||||
mmc-hs200-1_8v;
|
||||
|
|
@ -372,6 +469,30 @@ &sdmmc {
|
|||
status = "okay";
|
||||
};
|
||||
|
||||
&tcphy1 {
|
||||
/* phy for &usbdrd_dwc3_1 */
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
&u2phy1 {
|
||||
status = "okay";
|
||||
|
||||
otg-port {
|
||||
/* phy for &usbdrd_dwc3_1 */
|
||||
phy-supply = <&vcc5v0_usb>;
|
||||
status = "okay";
|
||||
};
|
||||
};
|
||||
|
||||
&uart2 {
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
&usbdrd3_1 {
|
||||
status = "okay";
|
||||
|
||||
usb@fe900000 {
|
||||
dr_mode = "host";
|
||||
status = "okay";
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@ lan_led: led-lan {
|
|||
|
||||
sys_led: led-sys {
|
||||
gpios = <&gpio0 RK_PB5 GPIO_ACTIVE_HIGH>;
|
||||
label = "red:sys";
|
||||
label = "red:power";
|
||||
default-state = "on";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -510,7 +510,6 @@ &pcie_phy {
|
|||
};
|
||||
|
||||
&pcie0 {
|
||||
max-link-speed = <2>;
|
||||
num-lanes = <2>;
|
||||
vpcie0v9-supply = <&vcca0v9_s3>;
|
||||
vpcie1v8-supply = <&vcca1v8_s3>;
|
||||
|
|
|
|||
|
|
@ -63,6 +63,13 @@ power {
|
|||
};
|
||||
};
|
||||
|
||||
ir-receiver {
|
||||
compatible = "gpio-ir-receiver";
|
||||
gpios = <&gpio0 RK_PA6 GPIO_ACTIVE_LOW>;
|
||||
pinctrl-names = "default";
|
||||
pinctrl-0 = <&ir_int>;
|
||||
};
|
||||
|
||||
leds {
|
||||
compatible = "gpio-leds";
|
||||
pinctrl-names = "default";
|
||||
|
|
@ -389,6 +396,7 @@ regulator-state-mem {
|
|||
|
||||
vcc_sdio: LDO_REG4 {
|
||||
regulator-name = "vcc_sdio";
|
||||
regulator-always-on;
|
||||
regulator-boot-on;
|
||||
regulator-min-microvolt = <1800000>;
|
||||
regulator-max-microvolt = <3000000>;
|
||||
|
|
@ -493,6 +501,8 @@ vdd_gpu: regulator@41 {
|
|||
regulator-min-microvolt = <712500>;
|
||||
regulator-max-microvolt = <1500000>;
|
||||
regulator-ramp-delay = <1000>;
|
||||
regulator-always-on;
|
||||
regulator-boot-on;
|
||||
vin-supply = <&vcc3v3_sys>;
|
||||
|
||||
regulator-state-mem {
|
||||
|
|
@ -601,6 +611,12 @@ pwr_key_l: pwr-key-l {
|
|||
};
|
||||
};
|
||||
|
||||
ir {
|
||||
ir_int: ir-int {
|
||||
rockchip,pins = <0 RK_PA6 RK_FUNC_GPIO &pcfg_pull_none>;
|
||||
};
|
||||
};
|
||||
|
||||
lcd-panel {
|
||||
lcd_panel_reset: lcd-panel-reset {
|
||||
rockchip,pins = <4 RK_PD5 RK_FUNC_GPIO &pcfg_pull_up>;
|
||||
|
|
|
|||
|
|
@ -474,7 +474,6 @@ &pcie_phy {
|
|||
|
||||
&pcie0 {
|
||||
ep-gpios = <&gpio4 RK_PD3 GPIO_ACTIVE_HIGH>;
|
||||
max-link-speed = <2>;
|
||||
num-lanes = <4>;
|
||||
pinctrl-0 = <&pcie_clkreqnb_cpm>;
|
||||
pinctrl-names = "default";
|
||||
|
|
|
|||
|
|
@ -968,126 +968,146 @@ power: power-controller {
|
|||
#size-cells = <0>;
|
||||
|
||||
/* These power domains are grouped by VD_CENTER */
|
||||
pd_iep@RK3399_PD_IEP {
|
||||
power-domain@RK3399_PD_IEP {
|
||||
reg = <RK3399_PD_IEP>;
|
||||
clocks = <&cru ACLK_IEP>,
|
||||
<&cru HCLK_IEP>;
|
||||
pm_qos = <&qos_iep>;
|
||||
#power-domain-cells = <0>;
|
||||
};
|
||||
pd_rga@RK3399_PD_RGA {
|
||||
power-domain@RK3399_PD_RGA {
|
||||
reg = <RK3399_PD_RGA>;
|
||||
clocks = <&cru ACLK_RGA>,
|
||||
<&cru HCLK_RGA>;
|
||||
pm_qos = <&qos_rga_r>,
|
||||
<&qos_rga_w>;
|
||||
#power-domain-cells = <0>;
|
||||
};
|
||||
pd_vcodec@RK3399_PD_VCODEC {
|
||||
power-domain@RK3399_PD_VCODEC {
|
||||
reg = <RK3399_PD_VCODEC>;
|
||||
clocks = <&cru ACLK_VCODEC>,
|
||||
<&cru HCLK_VCODEC>;
|
||||
pm_qos = <&qos_video_m0>;
|
||||
#power-domain-cells = <0>;
|
||||
};
|
||||
pd_vdu@RK3399_PD_VDU {
|
||||
power-domain@RK3399_PD_VDU {
|
||||
reg = <RK3399_PD_VDU>;
|
||||
clocks = <&cru ACLK_VDU>,
|
||||
<&cru HCLK_VDU>;
|
||||
pm_qos = <&qos_video_m1_r>,
|
||||
<&qos_video_m1_w>;
|
||||
#power-domain-cells = <0>;
|
||||
};
|
||||
|
||||
/* These power domains are grouped by VD_GPU */
|
||||
pd_gpu@RK3399_PD_GPU {
|
||||
power-domain@RK3399_PD_GPU {
|
||||
reg = <RK3399_PD_GPU>;
|
||||
clocks = <&cru ACLK_GPU>;
|
||||
pm_qos = <&qos_gpu>;
|
||||
#power-domain-cells = <0>;
|
||||
};
|
||||
|
||||
/* These power domains are grouped by VD_LOGIC */
|
||||
pd_edp@RK3399_PD_EDP {
|
||||
power-domain@RK3399_PD_EDP {
|
||||
reg = <RK3399_PD_EDP>;
|
||||
clocks = <&cru PCLK_EDP_CTRL>;
|
||||
#power-domain-cells = <0>;
|
||||
};
|
||||
pd_emmc@RK3399_PD_EMMC {
|
||||
power-domain@RK3399_PD_EMMC {
|
||||
reg = <RK3399_PD_EMMC>;
|
||||
clocks = <&cru ACLK_EMMC>;
|
||||
pm_qos = <&qos_emmc>;
|
||||
#power-domain-cells = <0>;
|
||||
};
|
||||
pd_gmac@RK3399_PD_GMAC {
|
||||
power-domain@RK3399_PD_GMAC {
|
||||
reg = <RK3399_PD_GMAC>;
|
||||
clocks = <&cru ACLK_GMAC>,
|
||||
<&cru PCLK_GMAC>;
|
||||
pm_qos = <&qos_gmac>;
|
||||
#power-domain-cells = <0>;
|
||||
};
|
||||
pd_sd@RK3399_PD_SD {
|
||||
power-domain@RK3399_PD_SD {
|
||||
reg = <RK3399_PD_SD>;
|
||||
clocks = <&cru HCLK_SDMMC>,
|
||||
<&cru SCLK_SDMMC>;
|
||||
pm_qos = <&qos_sd>;
|
||||
#power-domain-cells = <0>;
|
||||
};
|
||||
pd_sdioaudio@RK3399_PD_SDIOAUDIO {
|
||||
power-domain@RK3399_PD_SDIOAUDIO {
|
||||
reg = <RK3399_PD_SDIOAUDIO>;
|
||||
clocks = <&cru HCLK_SDIO>;
|
||||
pm_qos = <&qos_sdioaudio>;
|
||||
#power-domain-cells = <0>;
|
||||
};
|
||||
pd_tcpc0@RK3399_PD_TCPD0 {
|
||||
power-domain@RK3399_PD_TCPD0 {
|
||||
reg = <RK3399_PD_TCPD0>;
|
||||
clocks = <&cru SCLK_UPHY0_TCPDCORE>,
|
||||
<&cru SCLK_UPHY0_TCPDPHY_REF>;
|
||||
#power-domain-cells = <0>;
|
||||
};
|
||||
pd_tcpc1@RK3399_PD_TCPD1 {
|
||||
power-domain@RK3399_PD_TCPD1 {
|
||||
reg = <RK3399_PD_TCPD1>;
|
||||
clocks = <&cru SCLK_UPHY1_TCPDCORE>,
|
||||
<&cru SCLK_UPHY1_TCPDPHY_REF>;
|
||||
#power-domain-cells = <0>;
|
||||
};
|
||||
pd_usb3@RK3399_PD_USB3 {
|
||||
power-domain@RK3399_PD_USB3 {
|
||||
reg = <RK3399_PD_USB3>;
|
||||
clocks = <&cru ACLK_USB3>;
|
||||
pm_qos = <&qos_usb_otg0>,
|
||||
<&qos_usb_otg1>;
|
||||
#power-domain-cells = <0>;
|
||||
};
|
||||
pd_vio@RK3399_PD_VIO {
|
||||
power-domain@RK3399_PD_VIO {
|
||||
reg = <RK3399_PD_VIO>;
|
||||
#power-domain-cells = <1>;
|
||||
#address-cells = <1>;
|
||||
#size-cells = <0>;
|
||||
|
||||
pd_hdcp@RK3399_PD_HDCP {
|
||||
power-domain@RK3399_PD_HDCP {
|
||||
reg = <RK3399_PD_HDCP>;
|
||||
clocks = <&cru ACLK_HDCP>,
|
||||
<&cru HCLK_HDCP>,
|
||||
<&cru PCLK_HDCP>;
|
||||
pm_qos = <&qos_hdcp>;
|
||||
#power-domain-cells = <0>;
|
||||
};
|
||||
pd_isp0@RK3399_PD_ISP0 {
|
||||
power-domain@RK3399_PD_ISP0 {
|
||||
reg = <RK3399_PD_ISP0>;
|
||||
clocks = <&cru ACLK_ISP0>,
|
||||
<&cru HCLK_ISP0>;
|
||||
pm_qos = <&qos_isp0_m0>,
|
||||
<&qos_isp0_m1>;
|
||||
#power-domain-cells = <0>;
|
||||
};
|
||||
pd_isp1@RK3399_PD_ISP1 {
|
||||
power-domain@RK3399_PD_ISP1 {
|
||||
reg = <RK3399_PD_ISP1>;
|
||||
clocks = <&cru ACLK_ISP1>,
|
||||
<&cru HCLK_ISP1>;
|
||||
pm_qos = <&qos_isp1_m0>,
|
||||
<&qos_isp1_m1>;
|
||||
#power-domain-cells = <0>;
|
||||
};
|
||||
pd_vo@RK3399_PD_VO {
|
||||
power-domain@RK3399_PD_VO {
|
||||
reg = <RK3399_PD_VO>;
|
||||
#power-domain-cells = <1>;
|
||||
#address-cells = <1>;
|
||||
#size-cells = <0>;
|
||||
|
||||
pd_vopb@RK3399_PD_VOPB {
|
||||
power-domain@RK3399_PD_VOPB {
|
||||
reg = <RK3399_PD_VOPB>;
|
||||
clocks = <&cru ACLK_VOP0>,
|
||||
<&cru HCLK_VOP0>;
|
||||
pm_qos = <&qos_vop_big_r>,
|
||||
<&qos_vop_big_w>;
|
||||
#power-domain-cells = <0>;
|
||||
};
|
||||
pd_vopl@RK3399_PD_VOPL {
|
||||
power-domain@RK3399_PD_VOPL {
|
||||
reg = <RK3399_PD_VOPL>;
|
||||
clocks = <&cru ACLK_VOP1>,
|
||||
<&cru HCLK_VOP1>;
|
||||
pm_qos = <&qos_vop_little>;
|
||||
#power-domain-cells = <0>;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
@ -1398,7 +1418,7 @@ mipi_dphy_rx0: mipi-dphy-rx0 {
|
|||
status = "disabled";
|
||||
};
|
||||
|
||||
u2phy0: usb2-phy@e450 {
|
||||
u2phy0: usb2phy@e450 {
|
||||
compatible = "rockchip,rk3399-usb2phy";
|
||||
reg = <0xe450 0x10>;
|
||||
clocks = <&cru SCLK_USB2PHY0_REF>;
|
||||
|
|
@ -1425,7 +1445,7 @@ u2phy0_otg: otg-port {
|
|||
};
|
||||
};
|
||||
|
||||
u2phy1: usb2-phy@e460 {
|
||||
u2phy1: usb2phy@e460 {
|
||||
compatible = "rockchip,rk3399-usb2phy";
|
||||
reg = <0xe460 0x10>;
|
||||
clocks = <&cru SCLK_USB2PHY1_REF>;
|
||||
|
|
@ -2354,7 +2374,7 @@ sdmmc_wp: sdmmc-wp {
|
|||
};
|
||||
};
|
||||
|
||||
sleep {
|
||||
suspend {
|
||||
ap_pwroff: ap-pwroff {
|
||||
rockchip,pins = <1 RK_PA5 1 &pcfg_pull_none>;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -329,7 +329,6 @@ &pcie_phy {
|
|||
|
||||
&pcie0 {
|
||||
ep-gpios = <&gpio0 RK_PB4 GPIO_ACTIVE_HIGH>;
|
||||
max-link-speed = <2>;
|
||||
num-lanes = <4>;
|
||||
pinctrl-0 = <&pcie_clkreqnb_cpm>;
|
||||
pinctrl-names = "default";
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user