mirror of
https://github.com/torvalds/linux.git
synced 2026-06-01 19:13:47 +02:00
RK3399-Nanopi-R4S-enterprise as variant board, Gru-Scarlet SKU variants,
DSI support for rk356x, display-gamma-control for rk3399, display
output for quartz64-b and rk3566-roc-pc, hdmi supplies for rk3399-roc-pc,
some pinctrl improvements for the px30-evb and a number of changes to
bring rk3399 rock4 and rock-pi4 structure closer to names used in schematics.
-----BEGIN PGP SIGNATURE-----
iQFEBAABCAAuFiEE7v+35S2Q1vLNA3Lx86Z5yZzRHYEFAmMvDVkQHGhlaWtvQHNu
dGVjaC5kZQAKCRDzpnnJnNEdgdM7B/0XJOFHfOczgScJ/U0lGKOSdyunaBKxjzJ5
Hdz9Zy7SaW0NztHJA8F5TY+Llw6VKR0jULhcJ/HFxQlAlVKlLyQBpL0K71+9evo/
3EKugxgwWTXVUeCycVRIBcHTCB0F2lrITCTudTyA3C+sJWOOX9NJyccQXnwFtf/D
ScQpIEXGB6/iiU9mTup/JY48HiojnXeJLQsXGos+4D+nY9Pm+KwKhpGlBLvNjf/D
wvmGJTgcuDkoXoPHQ15vvUjUbYrqIIehV7s3zKJSTVjZ7upOcDXsnN/CZBtrYiac
HghziTm5Bn66aNY2Q5/iQ8u3a5Vgxx7+li1SR3+iwCr1YERIDjEA
=nNLu
-----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
iQIzBAABCgAdFiEEo6/YBQwIrVS28WGKmmx57+YAGNkFAmM0re0ACgkQmmx57+YA
GNk5pw/9EShdi6HdhH60llnYSH3tAwnLFNUCKkQ0ZrDyINRcGLCyiEgxayy1pVyU
zc6yTlpH1Irjc3nv5pNPme8mOItw5V78Jb04rA1g/Oie/hQ/hLA6JOP86fzdiDEN
Rbt24llOSExStEBePBFwV87Adt60K6HCIE5MNfX+qW97YMpacyiTSbbee19AcliN
mhYskbZPmuMSO3yMYkHYbJa9yzYqxq+ccipz8AcJFLXvlTIrM/MfgYSp+zCHnaRW
/6r0ApfA7FvUXMkBKXNeAL4yh5jKmfFB+wQuYY9z0AvB53oBxGKmDubMrY3IdT2Q
LBaoiIQG/5oz3DBWRZe9RxWusIyacgyInaNBcAYiPMnInb2dL9XCgMlOemPRTQLO
NavC1cA+TXXAMmgISTnGFeVCYcIY8F8KkfWWAobpjnzKrdic6axncl8eiAK80JOT
yM6yS7lDnWtIWCUq4zgkJxCnFD4PtUHOwusz0wurrwiSz5TveESKDyOnQ6evSqry
ka6UdN2DtX8Dd7c6vTtu0labY8o2Qdz6r2N+ooRAhaujhh9tYA59Yxrp9pV8cwJe
ysHvbJBJLpE/lEbHYNPWqz2lOyPJ+JWj9s3aPn7jDv+gOxmP8z1NdbTVpcSRJj0B
T4c6cMoQ6PyF5P11vUg7nKJ0JNH8/dUYUgPur/qL60O6JIbiFXE=
=oYll
-----END PGP SIGNATURE-----
Merge tag 'v6.1-rockchip-dts64-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into arm/dt
RK3399-Nanopi-R4S-enterprise as variant board, Gru-Scarlet SKU variants,
DSI support for rk356x, display-gamma-control for rk3399, display
output for quartz64-b and rk3566-roc-pc, hdmi supplies for rk3399-roc-pc,
some pinctrl improvements for the px30-evb and a number of changes to
bring rk3399 rock4 and rock-pi4 structure closer to names used in schematics.
* tag 'v6.1-rockchip-dts64-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
arm64: dts: rockchip: use pin constant for reset-gpios on px30-evb
arm64: dts: rockchip: add pinctrl for mipi-pdn pin on px30-evb
arm64: dts: rockchip: set max drive-strength for cif_clkout_m0 on px30-evb
arm64: dts: rockchip: add avdd-0v9-supply and avdd-1v8-supply on rk3399 rock 4c and pi4
arm64: dts: rockchip: sort nodes/properties on rk3399-rock-4
arm64: dts: rockchip: fix regulator name on rk3399-rock-4
arm64: dts: rockchip: sort nodes/properties on rk3399-rock-4c-plus
arm64: dts: rockchip: fix regulator structure on rk3399-rock-4c-plus
arm64: dts: rockchip: connect vcca_1v8 to APIO5_VDD on rk3399-rock-4c-plus
arm64: dts: rockchip: Add DSI and DSI-DPHY nodes to rk356x
arm64: dts: rockchip: Enable HDMI and GPU on quartz64-b
arm64: dts: rockchip: Add RK3399 NanoPi R4S Enterprise Edition
dt-bindings: Add doc for FriendlyARM NanoPi R4S Enterprise Edition
arm64: dts: rockchip: add i2s0 I2S/PDM/TDM 8ch controller to px30
arm64: dts: rockchip: Add HDMI supplies on rk3399-roc-pc
arm64: dts: rockchip: Support gru-scarlet sku{2,4} variants
dt-bindings: arm: rockchip: Add gru-scarlet sku{2,4} variants
arm64: dts: rockchip: enable gamma control on RK3399
arm64: dts: rockchip: Enable video output on rk3566-roc-pc
Link: https://lore.kernel.org/r/38114097.10thIPus4b@phil
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann
commit
286c1d1c30
|
|
@ -161,6 +161,7 @@ properties:
|
|||
- friendlyarm,nanopi-m4b
|
||||
- friendlyarm,nanopi-neo4
|
||||
- friendlyarm,nanopi-r4s
|
||||
- friendlyarm,nanopi-r4s-enterprise
|
||||
- const: rockchip,rk3399
|
||||
|
||||
- description: GeekBuying GeekBox
|
||||
|
|
@ -373,30 +374,55 @@ properties:
|
|||
- const: google,gru
|
||||
- const: rockchip,rk3399
|
||||
|
||||
- description: Google Scarlet - Innolux display (Acer Chromebook Tab 10)
|
||||
- description: |
|
||||
Google Scarlet - Innolux display (Acer Chromebook Tab 10 and more)
|
||||
items:
|
||||
- const: google,scarlet-rev15-sku2
|
||||
- const: google,scarlet-rev15-sku4
|
||||
- const: google,scarlet-rev15-sku6
|
||||
- const: google,scarlet-rev15
|
||||
- const: google,scarlet-rev14-sku2
|
||||
- const: google,scarlet-rev14-sku4
|
||||
- const: google,scarlet-rev14-sku6
|
||||
- const: google,scarlet-rev14
|
||||
- const: google,scarlet-rev13-sku2
|
||||
- const: google,scarlet-rev13-sku4
|
||||
- const: google,scarlet-rev13-sku6
|
||||
- const: google,scarlet-rev13
|
||||
- const: google,scarlet-rev12-sku2
|
||||
- const: google,scarlet-rev12-sku4
|
||||
- const: google,scarlet-rev12-sku6
|
||||
- const: google,scarlet-rev12
|
||||
- const: google,scarlet-rev11-sku2
|
||||
- const: google,scarlet-rev11-sku4
|
||||
- const: google,scarlet-rev11-sku6
|
||||
- const: google,scarlet-rev11
|
||||
- const: google,scarlet-rev10-sku2
|
||||
- const: google,scarlet-rev10-sku4
|
||||
- const: google,scarlet-rev10-sku6
|
||||
- const: google,scarlet-rev10
|
||||
- const: google,scarlet-rev9-sku2
|
||||
- const: google,scarlet-rev9-sku4
|
||||
- const: google,scarlet-rev9-sku6
|
||||
- const: google,scarlet-rev9
|
||||
- const: google,scarlet-rev8-sku2
|
||||
- const: google,scarlet-rev8-sku4
|
||||
- const: google,scarlet-rev8-sku6
|
||||
- const: google,scarlet-rev8
|
||||
- const: google,scarlet-rev7-sku2
|
||||
- const: google,scarlet-rev7-sku4
|
||||
- const: google,scarlet-rev7-sku6
|
||||
- const: google,scarlet-rev7
|
||||
- const: google,scarlet-rev6-sku2
|
||||
- const: google,scarlet-rev6-sku4
|
||||
- const: google,scarlet-rev6-sku6
|
||||
- const: google,scarlet-rev6
|
||||
- const: google,scarlet-rev5-sku2
|
||||
- const: google,scarlet-rev5-sku4
|
||||
- const: google,scarlet-rev5-sku6
|
||||
- const: google,scarlet-rev5
|
||||
- const: google,scarlet-rev4-sku2
|
||||
- const: google,scarlet-rev4-sku4
|
||||
- const: google,scarlet-rev4-sku6
|
||||
- const: google,scarlet-rev4
|
||||
- const: google,scarlet
|
||||
|
|
|
|||
|
|
@ -41,6 +41,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-nanopi-m4.dtb
|
|||
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-nanopi-m4b.dtb
|
||||
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-nanopi-neo4.dtb
|
||||
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-nanopi-r4s.dtb
|
||||
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-nanopi-r4s-enterprise.dtb
|
||||
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-orangepi.dtb
|
||||
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-pinebook-pro.dtb
|
||||
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-pinephone-pro.dtb
|
||||
|
|
|
|||
|
|
@ -450,8 +450,8 @@ ov5695: ov5695@36 {
|
|||
dvdd-supply = <&vcc1v5_dvp>;
|
||||
dovdd-supply = <&vcc1v8_dvp>;
|
||||
pinctrl-names = "default";
|
||||
pinctrl-0 = <&cif_clkout_m0>;
|
||||
reset-gpios = <&gpio2 14 GPIO_ACTIVE_LOW>;
|
||||
pinctrl-0 = <&cif_clkout_m0 &mipi_pdn>;
|
||||
reset-gpios = <&gpio2 RK_PB6 GPIO_ACTIVE_LOW>;
|
||||
|
||||
port {
|
||||
ucam_out: endpoint {
|
||||
|
|
@ -537,6 +537,19 @@ wifi_enable_h: wifi-enable-h {
|
|||
<0 RK_PA2 RK_FUNC_GPIO &pcfg_pull_none>;
|
||||
};
|
||||
};
|
||||
|
||||
cif-m0 {
|
||||
cif_clkout_m0: cif-clkout-m0 {
|
||||
rockchip,pins =
|
||||
<2 RK_PB3 1 &pcfg_pull_none_12ma>;
|
||||
};
|
||||
};
|
||||
|
||||
mipi {
|
||||
mipi_pdn: mipi-pdn {
|
||||
rockchip,pins = <2 RK_PB6 RK_FUNC_GPIO &pcfg_pull_none>;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
&pmu_io_domains {
|
||||
|
|
|
|||
|
|
@ -365,6 +365,28 @@ uart0: serial@ff030000 {
|
|||
status = "disabled";
|
||||
};
|
||||
|
||||
i2s0_8ch: i2s@ff060000 {
|
||||
compatible = "rockchip,px30-i2s-tdm";
|
||||
reg = <0x0 0xff060000 0x0 0x1000>;
|
||||
interrupts = <GIC_SPI 12 IRQ_TYPE_LEVEL_HIGH>;
|
||||
clocks = <&cru SCLK_I2S0_TX>, <&cru SCLK_I2S0_RX>, <&cru HCLK_I2S0>;
|
||||
clock-names = "mclk_tx", "mclk_rx", "hclk";
|
||||
dmas = <&dmac 16>, <&dmac 17>;
|
||||
dma-names = "tx", "rx";
|
||||
rockchip,grf = <&grf>;
|
||||
resets = <&cru SRST_I2S0_TX>, <&cru SRST_I2S0_RX>;
|
||||
reset-names = "tx-m", "rx-m";
|
||||
pinctrl-names = "default";
|
||||
pinctrl-0 = <&i2s0_8ch_sclktx &i2s0_8ch_sclkrx
|
||||
&i2s0_8ch_lrcktx &i2s0_8ch_lrckrx
|
||||
&i2s0_8ch_sdo0 &i2s0_8ch_sdi0
|
||||
&i2s0_8ch_sdo1 &i2s0_8ch_sdi1
|
||||
&i2s0_8ch_sdo2 &i2s0_8ch_sdi2
|
||||
&i2s0_8ch_sdo3 &i2s0_8ch_sdi3>;
|
||||
#sound-dai-cells = <0>;
|
||||
status = "disabled";
|
||||
};
|
||||
|
||||
i2s1_2ch: i2s@ff070000 {
|
||||
compatible = "rockchip,px30-i2s", "rockchip,rk3066-i2s";
|
||||
reg = <0x0 0xff070000 0x0 0x1000>;
|
||||
|
|
|
|||
|
|
@ -11,17 +11,29 @@
|
|||
|
||||
/ {
|
||||
model = "Google Scarlet";
|
||||
compatible = "google,scarlet-rev15-sku6", "google,scarlet-rev15",
|
||||
compatible = "google,scarlet-rev15-sku2", "google,scarlet-rev15-sku4",
|
||||
"google,scarlet-rev15-sku6", "google,scarlet-rev15",
|
||||
"google,scarlet-rev14-sku2", "google,scarlet-rev14-sku4",
|
||||
"google,scarlet-rev14-sku6", "google,scarlet-rev14",
|
||||
"google,scarlet-rev13-sku2", "google,scarlet-rev13-sku4",
|
||||
"google,scarlet-rev13-sku6", "google,scarlet-rev13",
|
||||
"google,scarlet-rev12-sku2", "google,scarlet-rev12-sku4",
|
||||
"google,scarlet-rev12-sku6", "google,scarlet-rev12",
|
||||
"google,scarlet-rev11-sku2", "google,scarlet-rev11-sku4",
|
||||
"google,scarlet-rev11-sku6", "google,scarlet-rev11",
|
||||
"google,scarlet-rev10-sku2", "google,scarlet-rev10-sku4",
|
||||
"google,scarlet-rev10-sku6", "google,scarlet-rev10",
|
||||
"google,scarlet-rev9-sku2", "google,scarlet-rev9-sku4",
|
||||
"google,scarlet-rev9-sku6", "google,scarlet-rev9",
|
||||
"google,scarlet-rev8-sku2", "google,scarlet-rev8-sku4",
|
||||
"google,scarlet-rev8-sku6", "google,scarlet-rev8",
|
||||
"google,scarlet-rev7-sku2", "google,scarlet-rev7-sku4",
|
||||
"google,scarlet-rev7-sku6", "google,scarlet-rev7",
|
||||
"google,scarlet-rev6-sku2", "google,scarlet-rev6-sku4",
|
||||
"google,scarlet-rev6-sku6", "google,scarlet-rev6",
|
||||
"google,scarlet-rev5-sku2", "google,scarlet-rev5-sku4",
|
||||
"google,scarlet-rev5-sku6", "google,scarlet-rev5",
|
||||
"google,scarlet-rev4-sku2", "google,scarlet-rev4-sku4",
|
||||
"google,scarlet-rev4-sku6", "google,scarlet-rev4",
|
||||
"google,scarlet", "google,gru", "rockchip,rk3399";
|
||||
};
|
||||
|
|
|
|||
|
|
@ -0,0 +1,29 @@
|
|||
// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
|
||||
|
||||
/dts-v1/;
|
||||
#include "rk3399-nanopi-r4s.dts"
|
||||
|
||||
/ {
|
||||
model = "FriendlyElec NanoPi R4S Enterprise Edition";
|
||||
compatible = "friendlyarm,nanopi-r4s-enterprise", "rockchip,rk3399";
|
||||
};
|
||||
|
||||
&gmac {
|
||||
nvmem-cells = <&mac_address>;
|
||||
nvmem-cell-names = "mac-address";
|
||||
};
|
||||
|
||||
&i2c2 {
|
||||
eeprom@51 {
|
||||
compatible = "microchip,24c02", "atmel,24c02";
|
||||
reg = <0x51>;
|
||||
pagesize = <16>;
|
||||
size = <256>;
|
||||
#address-cells = <1>;
|
||||
#size-cells = <1>;
|
||||
|
||||
mac_address: mac-address@fa {
|
||||
reg = <0xfa 0x06>;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
@ -271,6 +271,8 @@ &gpu {
|
|||
};
|
||||
|
||||
&hdmi {
|
||||
avdd-0v9-supply = <&vcca0v9_hdmi>;
|
||||
avdd-1v8-supply = <&vcca1v8_hdmi>;
|
||||
ddc-i2c-bus = <&i2c3>;
|
||||
pinctrl-names = "default";
|
||||
pinctrl-0 = <&hdmi_cec>;
|
||||
|
|
@ -369,8 +371,8 @@ regulator-state-mem {
|
|||
};
|
||||
};
|
||||
|
||||
vcc1v8_hdmi: LDO_REG2 {
|
||||
regulator-name = "vcc1v8_hdmi";
|
||||
vcca1v8_hdmi: LDO_REG2 {
|
||||
regulator-name = "vcca1v8_hdmi";
|
||||
regulator-always-on;
|
||||
regulator-boot-on;
|
||||
regulator-min-microvolt = <1800000>;
|
||||
|
|
|
|||
|
|
@ -23,15 +23,6 @@ chosen {
|
|||
stdout-path = "serial2:1500000n8";
|
||||
};
|
||||
|
||||
sdio_pwrseq: sdio-pwrseq {
|
||||
compatible = "mmc-pwrseq-simple";
|
||||
clocks = <&rk809 1>;
|
||||
clock-names = "ext_clock";
|
||||
pinctrl-names = "default";
|
||||
pinctrl-0 = <&wifi_enable_h>;
|
||||
reset-gpios = <&gpio0 RK_PB2 GPIO_ACTIVE_LOW>;
|
||||
};
|
||||
|
||||
clkin_gmac: external-gmac-clock {
|
||||
compatible = "fixed-clock";
|
||||
clock-frequency = <125000000>;
|
||||
|
|
@ -61,13 +52,33 @@ led-1 {
|
|||
};
|
||||
};
|
||||
|
||||
vcc5v0_sys: vcc5v0-sys-regulator {
|
||||
sdio_pwrseq: sdio-pwrseq {
|
||||
compatible = "mmc-pwrseq-simple";
|
||||
clocks = <&rk809 1>;
|
||||
clock-names = "ext_clock";
|
||||
pinctrl-names = "default";
|
||||
pinctrl-0 = <&wifi_enable_h>;
|
||||
reset-gpios = <&gpio0 RK_PB2 GPIO_ACTIVE_LOW>;
|
||||
};
|
||||
|
||||
vcc_3v3: vcc-3v3-regulator {
|
||||
compatible = "regulator-fixed";
|
||||
regulator-name = "vcc5v0_sys";
|
||||
regulator-name = "vcc_3v3";
|
||||
regulator-always-on;
|
||||
regulator-boot-on;
|
||||
regulator-min-microvolt = <5000000>;
|
||||
regulator-max-microvolt = <5000000>;
|
||||
regulator-min-microvolt = <3300000>;
|
||||
regulator-max-microvolt = <3300000>;
|
||||
vin-supply = <&vcc3v3_sys>;
|
||||
};
|
||||
|
||||
vcc3v3_phy1: vcc3v3-phy1-regulator {
|
||||
compatible = "regulator-fixed";
|
||||
regulator-name = "vcc3v3_phy1";
|
||||
regulator-always-on;
|
||||
regulator-boot-on;
|
||||
regulator-min-microvolt = <3300000>;
|
||||
regulator-max-microvolt = <3300000>;
|
||||
vin-supply = <&vcc_3v3>;
|
||||
};
|
||||
|
||||
vcc5v0_host1: vcc5v0-host-regulator {
|
||||
|
|
@ -82,6 +93,15 @@ vcc5v0_host1: vcc5v0-host-regulator {
|
|||
vin-supply = <&vcc5v0_host0_s0>;
|
||||
};
|
||||
|
||||
vcc5v0_sys: vcc5v0-sys-regulator {
|
||||
compatible = "regulator-fixed";
|
||||
regulator-name = "vcc5v0_sys";
|
||||
regulator-always-on;
|
||||
regulator-boot-on;
|
||||
regulator-min-microvolt = <5000000>;
|
||||
regulator-max-microvolt = <5000000>;
|
||||
};
|
||||
|
||||
vcc5v0_typec: vcc5v0-typec-regulator {
|
||||
compatible = "regulator-fixed";
|
||||
enable-active-high;
|
||||
|
|
@ -94,13 +114,14 @@ vcc5v0_typec: vcc5v0-typec-regulator {
|
|||
vin-supply = <&vcc5v0_sys>;
|
||||
};
|
||||
|
||||
vcc_lan: vcc3v3-phy-regulator {
|
||||
vdd_log: vdd-log-regulator {
|
||||
compatible = "regulator-fixed";
|
||||
regulator-name = "vcc_lan";
|
||||
regulator-name = "vdd_log";
|
||||
regulator-always-on;
|
||||
regulator-boot-on;
|
||||
regulator-min-microvolt = <3300000>;
|
||||
regulator-max-microvolt = <3300000>;
|
||||
regulator-min-microvolt = <950000>;
|
||||
regulator-max-microvolt = <950000>;
|
||||
vin-supply = <&vcc5v0_sys>;
|
||||
};
|
||||
};
|
||||
|
||||
|
|
@ -136,7 +157,7 @@ &gmac {
|
|||
assigned-clocks = <&cru SCLK_RMII_SRC>;
|
||||
assigned-clock-parents = <&clkin_gmac>;
|
||||
clock_in_out = "input";
|
||||
phy-supply = <&vcc_lan>;
|
||||
phy-supply = <&vcc3v3_phy1>;
|
||||
phy-mode = "rgmii";
|
||||
pinctrl-names = "default";
|
||||
pinctrl-0 = <&rgmii_pins>;
|
||||
|
|
@ -154,6 +175,8 @@ &gpu {
|
|||
};
|
||||
|
||||
&hdmi {
|
||||
avdd-0v9-supply = <&vcc_0v9_s0>;
|
||||
avdd-1v8-supply = <&vcc_1v8_s0>;
|
||||
ddc-i2c-bus = <&i2c3>;
|
||||
pinctrl-names = "default";
|
||||
pinctrl-0 = <&hdmi_cec>;
|
||||
|
|
@ -186,20 +209,20 @@ rk809: pmic@20 {
|
|||
vcc2-supply = <&vcc5v0_sys>;
|
||||
vcc3-supply = <&vcc5v0_sys>;
|
||||
vcc4-supply = <&vcc5v0_sys>;
|
||||
vcc5-supply = <&vcc_buck5>;
|
||||
vcc6-supply = <&vcc_buck5>;
|
||||
vcc5-supply = <&vcc_buck5_s3>;
|
||||
vcc6-supply = <&vcc_buck5_s3>;
|
||||
vcc7-supply = <&vcc5v0_sys>;
|
||||
vcc8-supply = <&vcc3v3_sys>;
|
||||
vcc9-supply = <&vcc5v0_sys>;
|
||||
|
||||
regulators {
|
||||
vdd_log: DCDC_REG1 {
|
||||
vdd_center: DCDC_REG1 {
|
||||
regulator-always-on;
|
||||
regulator-boot-on;
|
||||
regulator-min-microvolt = <750000>;
|
||||
regulator-max-microvolt = <1350000>;
|
||||
regulator-initial-mode = <0x2>;
|
||||
regulator-name = "vdd_log";
|
||||
regulator-name = "vdd_center";
|
||||
regulator-state-mem {
|
||||
regulator-off-in-suspend;
|
||||
regulator-suspend-microvolt = <900000>;
|
||||
|
|
@ -242,59 +265,59 @@ regulator-state-mem {
|
|||
};
|
||||
};
|
||||
|
||||
vcc_buck5: DCDC_REG5 {
|
||||
vcc_buck5_s3: DCDC_REG5 {
|
||||
regulator-always-on;
|
||||
regulator-boot-on;
|
||||
regulator-min-microvolt = <3300000>;
|
||||
regulator-max-microvolt = <3300000>;
|
||||
regulator-name = "vcc_buck5";
|
||||
regulator-name = "vcc_buck5_s3";
|
||||
regulator-state-mem {
|
||||
regulator-on-in-suspend;
|
||||
regulator-suspend-microvolt = <3300000>;
|
||||
};
|
||||
};
|
||||
|
||||
vcca_0v9: LDO_REG1 {
|
||||
vcc_0v9_s3: LDO_REG1 {
|
||||
regulator-always-on;
|
||||
regulator-boot-on;
|
||||
regulator-min-microvolt = <900000>;
|
||||
regulator-max-microvolt = <900000>;
|
||||
regulator-name = "vcca_0v9";
|
||||
regulator-name = "vcc_0v9_s3";
|
||||
regulator-state-mem {
|
||||
regulator-off-in-suspend;
|
||||
};
|
||||
};
|
||||
|
||||
vcc_1v8: LDO_REG2 {
|
||||
vcc_1v8_s3: LDO_REG2 {
|
||||
regulator-always-on;
|
||||
regulator-boot-on;
|
||||
regulator-min-microvolt = <1800000>;
|
||||
regulator-max-microvolt = <1800000>;
|
||||
regulator-name = "vcc_1v8";
|
||||
regulator-name = "vcc_1v8_s3";
|
||||
regulator-state-mem {
|
||||
regulator-on-in-suspend;
|
||||
regulator-suspend-microvolt = <1800000>;
|
||||
};
|
||||
};
|
||||
|
||||
vcc0v9_soc: LDO_REG3 {
|
||||
vcc_0v9_s0: LDO_REG3 {
|
||||
regulator-always-on;
|
||||
regulator-boot-on;
|
||||
regulator-min-microvolt = <900000>;
|
||||
regulator-max-microvolt = <900000>;
|
||||
regulator-name = "vcc0v9_soc";
|
||||
regulator-name = "vcc_0v9_s0";
|
||||
regulator-state-mem {
|
||||
regulator-on-in-suspend;
|
||||
regulator-suspend-microvolt = <900000>;
|
||||
};
|
||||
};
|
||||
|
||||
vcca_1v8: LDO_REG4 {
|
||||
vcc_1v8_s0: LDO_REG4 {
|
||||
regulator-always-on;
|
||||
regulator-boot-on;
|
||||
regulator-min-microvolt = <1800000>;
|
||||
regulator-max-microvolt = <1800000>;
|
||||
regulator-name = "vcca_1v8";
|
||||
regulator-name = "vcc_1v8_s0";
|
||||
regulator-state-mem {
|
||||
regulator-off-in-suspend;
|
||||
};
|
||||
|
|
@ -311,34 +334,34 @@ regulator-state-mem {
|
|||
};
|
||||
};
|
||||
|
||||
vcc_1v5: LDO_REG6 {
|
||||
vcc_1v5_s0: LDO_REG6 {
|
||||
regulator-always-on;
|
||||
regulator-boot-on;
|
||||
regulator-min-microvolt = <1500000>;
|
||||
regulator-max-microvolt = <1500000>;
|
||||
regulator-name = "vcc_1v5";
|
||||
regulator-name = "vcc_1v5_s0";
|
||||
regulator-state-mem {
|
||||
regulator-off-in-suspend;
|
||||
};
|
||||
};
|
||||
|
||||
vcc_3v0: LDO_REG7 {
|
||||
vcc_3v0_s0: LDO_REG7 {
|
||||
regulator-always-on;
|
||||
regulator-boot-on;
|
||||
regulator-min-microvolt = <3000000>;
|
||||
regulator-max-microvolt = <3000000>;
|
||||
regulator-name = "vcc_3v0";
|
||||
regulator-name = "vcc_3v0_s0";
|
||||
regulator-state-mem {
|
||||
regulator-off-in-suspend;
|
||||
};
|
||||
};
|
||||
|
||||
vccio_sd: LDO_REG8 {
|
||||
vcc_sdio_s0: LDO_REG8 {
|
||||
regulator-always-on;
|
||||
regulator-boot-on;
|
||||
regulator-min-microvolt = <1800000>;
|
||||
regulator-max-microvolt = <3300000>;
|
||||
regulator-name = "vccio_sd";
|
||||
regulator-name = "vcc_sdio_s0";
|
||||
regulator-state-mem {
|
||||
regulator-off-in-suspend;
|
||||
};
|
||||
|
|
@ -426,9 +449,10 @@ &i2s2 {
|
|||
};
|
||||
|
||||
&io_domains {
|
||||
bt656-supply = <&vcc_3v0>;
|
||||
gpio1830-supply = <&vcc_3v0>;
|
||||
sdmmc-supply = <&vccio_sd>;
|
||||
audio-supply = <&vcc_1v8_s0>;
|
||||
bt656-supply = <&vcc_3v0_s0>;
|
||||
gpio1830-supply = <&vcc_3v0_s0>;
|
||||
sdmmc-supply = <&vcc_sdio_s0>;
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
|
|
@ -512,13 +536,13 @@ wifi_host_wake_l: wifi-host-wake-l {
|
|||
};
|
||||
|
||||
&pmu_io_domains {
|
||||
pmu1830-supply = <&vcc_3v0>;
|
||||
pmu1830-supply = <&vcc_3v0_s0>;
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
&saradc {
|
||||
status = "okay";
|
||||
vref-supply = <&vcc_1v8>;
|
||||
vref-supply = <&vcc_1v8_s3>;
|
||||
};
|
||||
|
||||
&sdhci {
|
||||
|
|
@ -565,7 +589,7 @@ &sdmmc {
|
|||
pinctrl-names = "default";
|
||||
pinctrl-0 = <&sdmmc_clk &sdmmc_cmd &sdmmc_bus4>;
|
||||
cd-gpios = <&gpio0 RK_PA7 GPIO_ACTIVE_LOW>;
|
||||
vqmmc-supply = <&vccio_sd>;
|
||||
vqmmc-supply = <&vcc_sdio_s0>;
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
|
|
@ -619,7 +643,7 @@ bluetooth {
|
|||
pinctrl-names = "default";
|
||||
pinctrl-0 = <&bt_host_wake_l &bt_wake_l &bt_enable_h>;
|
||||
vbat-supply = <&vcc3v3_sys>;
|
||||
vddio-supply = <&vcc_1v8>;
|
||||
vddio-supply = <&vcc_1v8_s3>;
|
||||
};
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -74,6 +74,17 @@ dit_p0_0: endpoint {
|
|||
};
|
||||
};
|
||||
|
||||
vbus_typec: vbus-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 = "vbus_typec";
|
||||
regulator-always-on;
|
||||
vin-supply = <&vcc5v0_sys>;
|
||||
};
|
||||
|
||||
vcc12v_dcin: dc-12v {
|
||||
compatible = "regulator-fixed";
|
||||
regulator-name = "vcc12v_dcin";
|
||||
|
|
@ -83,23 +94,13 @@ vcc12v_dcin: dc-12v {
|
|||
regulator-max-microvolt = <12000000>;
|
||||
};
|
||||
|
||||
vcc5v0_sys: vcc-sys {
|
||||
vcc3v3_lan: vcc3v3-lan-regulator {
|
||||
compatible = "regulator-fixed";
|
||||
regulator-name = "vcc5v0_sys";
|
||||
regulator-name = "vcc3v3_lan";
|
||||
regulator-always-on;
|
||||
regulator-boot-on;
|
||||
regulator-min-microvolt = <5000000>;
|
||||
regulator-max-microvolt = <5000000>;
|
||||
vin-supply = <&vcc12v_dcin>;
|
||||
};
|
||||
|
||||
vcc_0v9: vcc-0v9 {
|
||||
compatible = "regulator-fixed";
|
||||
regulator-name = "vcc_0v9";
|
||||
regulator-always-on;
|
||||
regulator-boot-on;
|
||||
regulator-min-microvolt = <900000>;
|
||||
regulator-max-microvolt = <900000>;
|
||||
regulator-min-microvolt = <3300000>;
|
||||
regulator-max-microvolt = <3300000>;
|
||||
vin-supply = <&vcc3v3_sys>;
|
||||
};
|
||||
|
||||
|
|
@ -136,24 +137,24 @@ vcc5v0_host: vcc5v0-host-regulator {
|
|||
vin-supply = <&vcc5v0_sys>;
|
||||
};
|
||||
|
||||
vcc5v0_typec: vcc5v0-typec-regulator {
|
||||
vcc5v0_sys: vcc-sys {
|
||||
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 = <&vcc5v0_sys>;
|
||||
};
|
||||
|
||||
vcc_lan: vcc3v3-phy-regulator {
|
||||
compatible = "regulator-fixed";
|
||||
regulator-name = "vcc_lan";
|
||||
regulator-name = "vcc5v0_sys";
|
||||
regulator-always-on;
|
||||
regulator-boot-on;
|
||||
regulator-min-microvolt = <3300000>;
|
||||
regulator-max-microvolt = <3300000>;
|
||||
regulator-min-microvolt = <5000000>;
|
||||
regulator-max-microvolt = <5000000>;
|
||||
vin-supply = <&vcc12v_dcin>;
|
||||
};
|
||||
|
||||
vcc_0v9: vcc-0v9 {
|
||||
compatible = "regulator-fixed";
|
||||
regulator-name = "vcc_0v9";
|
||||
regulator-always-on;
|
||||
regulator-boot-on;
|
||||
regulator-min-microvolt = <900000>;
|
||||
regulator-max-microvolt = <900000>;
|
||||
vin-supply = <&vcc3v3_sys>;
|
||||
};
|
||||
|
||||
vdd_log: vdd-log {
|
||||
|
|
@ -200,7 +201,7 @@ &gmac {
|
|||
assigned-clocks = <&cru SCLK_RMII_SRC>;
|
||||
assigned-clock-parents = <&clkin_gmac>;
|
||||
clock_in_out = "input";
|
||||
phy-supply = <&vcc_lan>;
|
||||
phy-supply = <&vcc3v3_lan>;
|
||||
phy-mode = "rgmii";
|
||||
pinctrl-names = "default";
|
||||
pinctrl-0 = <&rgmii_pins>;
|
||||
|
|
@ -218,6 +219,8 @@ &gpu {
|
|||
};
|
||||
|
||||
&hdmi {
|
||||
avdd-0v9-supply = <&vcca0v9_hdmi>;
|
||||
avdd-1v8-supply = <&vcca1v8_hdmi>;
|
||||
ddc-i2c-bus = <&i2c3>;
|
||||
pinctrl-names = "default";
|
||||
pinctrl-0 = <&hdmi_cec>;
|
||||
|
|
@ -305,8 +308,8 @@ regulator-state-mem {
|
|||
};
|
||||
};
|
||||
|
||||
vcc1v8_codec: LDO_REG1 {
|
||||
regulator-name = "vcc1v8_codec";
|
||||
vcca1v8_codec: LDO_REG1 {
|
||||
regulator-name = "vcca1v8_codec";
|
||||
regulator-always-on;
|
||||
regulator-boot-on;
|
||||
regulator-min-microvolt = <1800000>;
|
||||
|
|
@ -316,8 +319,8 @@ regulator-state-mem {
|
|||
};
|
||||
};
|
||||
|
||||
vcc1v8_hdmi: LDO_REG2 {
|
||||
regulator-name = "vcc1v8_hdmi";
|
||||
vcca1v8_hdmi: LDO_REG2 {
|
||||
regulator-name = "vcca1v8_hdmi";
|
||||
regulator-always-on;
|
||||
regulator-boot-on;
|
||||
regulator-min-microvolt = <1800000>;
|
||||
|
|
@ -374,8 +377,8 @@ regulator-state-mem {
|
|||
};
|
||||
};
|
||||
|
||||
vcc0v9_hdmi: LDO_REG7 {
|
||||
regulator-name = "vcc0v9_hdmi";
|
||||
vcca0v9_hdmi: LDO_REG7 {
|
||||
regulator-name = "vcca0v9_hdmi";
|
||||
regulator-always-on;
|
||||
regulator-boot-on;
|
||||
regulator-min-microvolt = <900000>;
|
||||
|
|
@ -514,21 +517,10 @@ &i2s2 {
|
|||
};
|
||||
|
||||
&io_domains {
|
||||
status = "okay";
|
||||
|
||||
audio-supply = <&vcca1v8_codec>;
|
||||
bt656-supply = <&vcc_3v0>;
|
||||
audio-supply = <&vcc1v8_codec>;
|
||||
sdmmc-supply = <&vcc_sdio>;
|
||||
gpio1830-supply = <&vcc_3v0>;
|
||||
};
|
||||
|
||||
&pmu_io_domains {
|
||||
status = "okay";
|
||||
|
||||
pmu1830-supply = <&vcc_3v0>;
|
||||
};
|
||||
|
||||
&pcie_phy {
|
||||
sdmmc-supply = <&vcc_sdio>;
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
|
|
@ -543,6 +535,10 @@ &pcie0 {
|
|||
status = "okay";
|
||||
};
|
||||
|
||||
&pcie_phy {
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
&pinctrl {
|
||||
bt {
|
||||
bt_enable_h: bt-enable-h {
|
||||
|
|
@ -580,6 +576,20 @@ pcie_pwr_en: pcie-pwr-en {
|
|||
};
|
||||
};
|
||||
|
||||
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_PC1 RK_FUNC_GPIO &pcfg_pull_down>;
|
||||
};
|
||||
|
||||
vsel2_pin: vsel2-pin {
|
||||
rockchip,pins = <1 RK_PB6 RK_FUNC_GPIO &pcfg_pull_down>;
|
||||
};
|
||||
};
|
||||
|
||||
sdio0 {
|
||||
sdio0_bus4: sdio0-bus4 {
|
||||
rockchip,pins = <2 RK_PC4 1 &pcfg_pull_up_20ma>,
|
||||
|
|
@ -597,20 +607,6 @@ sdio0_clk: sdio0-clk {
|
|||
};
|
||||
};
|
||||
|
||||
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_PC1 RK_FUNC_GPIO &pcfg_pull_down>;
|
||||
};
|
||||
|
||||
vsel2_pin: vsel2-pin {
|
||||
rockchip,pins = <1 RK_PB6 RK_FUNC_GPIO &pcfg_pull_down>;
|
||||
};
|
||||
};
|
||||
|
||||
usb-typec {
|
||||
vcc5v0_typec_en: vcc5v0-typec-en {
|
||||
rockchip,pins = <1 RK_PA3 RK_FUNC_GPIO &pcfg_pull_up>;
|
||||
|
|
@ -634,6 +630,11 @@ wifi_host_wake_l: wifi-host-wake-l {
|
|||
};
|
||||
};
|
||||
|
||||
&pmu_io_domains {
|
||||
pmu1830-supply = <&vcc_3v0>;
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
&pwm2 {
|
||||
status = "okay";
|
||||
};
|
||||
|
|
@ -644,6 +645,14 @@ &saradc {
|
|||
vref-supply = <&vcc_1v8>;
|
||||
};
|
||||
|
||||
&sdhci {
|
||||
bus-width = <8>;
|
||||
mmc-hs400-1_8v;
|
||||
mmc-hs400-enhanced-strobe;
|
||||
non-removable;
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
&sdio0 {
|
||||
#address-cells = <1>;
|
||||
#size-cells = <0>;
|
||||
|
|
@ -671,14 +680,6 @@ &sdmmc {
|
|||
status = "okay";
|
||||
};
|
||||
|
||||
&sdhci {
|
||||
bus-width = <8>;
|
||||
mmc-hs400-1_8v;
|
||||
mmc-hs400-enhanced-strobe;
|
||||
non-removable;
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
&spdif {
|
||||
|
||||
spdif_p0: port {
|
||||
|
|
@ -760,15 +761,15 @@ &usbdrd3_0 {
|
|||
status = "okay";
|
||||
};
|
||||
|
||||
&usbdrd3_1 {
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
&usbdrd_dwc3_0 {
|
||||
status = "okay";
|
||||
dr_mode = "host";
|
||||
};
|
||||
|
||||
&usbdrd3_1 {
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
&usbdrd_dwc3_1 {
|
||||
status = "okay";
|
||||
dr_mode = "host";
|
||||
|
|
|
|||
|
|
@ -1702,7 +1702,7 @@ i2s2: i2s@ff8a0000 {
|
|||
|
||||
vopl: vop@ff8f0000 {
|
||||
compatible = "rockchip,rk3399-vop-lit";
|
||||
reg = <0x0 0xff8f0000 0x0 0x3efc>;
|
||||
reg = <0x0 0xff8f0000 0x0 0x2000>, <0x0 0xff8f2000 0x0 0x400>;
|
||||
interrupts = <GIC_SPI 119 IRQ_TYPE_LEVEL_HIGH 0>;
|
||||
assigned-clocks = <&cru ACLK_VOP1>, <&cru HCLK_VOP1>;
|
||||
assigned-clock-rates = <400000000>, <100000000>;
|
||||
|
|
@ -1758,7 +1758,7 @@ vopl_mmu: iommu@ff8f3f00 {
|
|||
|
||||
vopb: vop@ff900000 {
|
||||
compatible = "rockchip,rk3399-vop-big";
|
||||
reg = <0x0 0xff900000 0x0 0x3efc>;
|
||||
reg = <0x0 0xff900000 0x0 0x2000>, <0x0 0xff902000 0x0 0x1000>;
|
||||
interrupts = <GIC_SPI 118 IRQ_TYPE_LEVEL_HIGH 0>;
|
||||
assigned-clocks = <&cru ACLK_VOP0>, <&cru HCLK_VOP0>;
|
||||
assigned-clock-rates = <400000000>, <100000000>;
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@
|
|||
|
||||
#include <dt-bindings/gpio/gpio.h>
|
||||
#include <dt-bindings/pinctrl/rockchip.h>
|
||||
#include <dt-bindings/soc/rockchip,vop2.h>
|
||||
#include "rk3566.dtsi"
|
||||
|
||||
/ {
|
||||
|
|
@ -28,6 +29,17 @@ gmac1_clkin: external-gmac1-clock {
|
|||
#clock-cells = <0>;
|
||||
};
|
||||
|
||||
hdmi-con {
|
||||
compatible = "hdmi-connector";
|
||||
type = "a";
|
||||
|
||||
port {
|
||||
hdmi_con_in: endpoint {
|
||||
remote-endpoint = <&hdmi_out_con>;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
leds {
|
||||
compatible = "gpio-leds";
|
||||
|
||||
|
|
@ -183,6 +195,33 @@ &gmac1m1_clkinout
|
|||
status = "okay";
|
||||
};
|
||||
|
||||
&gpu {
|
||||
mali-supply = <&vdd_gpu>;
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
&hdmi {
|
||||
avdd-0v9-supply = <&vdda0v9_image>;
|
||||
avdd-1v8-supply = <&vcca1v8_image>;
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
&hdmi_in {
|
||||
hdmi_in_vp0: endpoint {
|
||||
remote-endpoint = <&vp0_out_hdmi>;
|
||||
};
|
||||
};
|
||||
|
||||
&hdmi_out {
|
||||
hdmi_out_con: endpoint {
|
||||
remote-endpoint = <&hdmi_con_in>;
|
||||
};
|
||||
};
|
||||
|
||||
&hdmi_sound {
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
&i2c0 {
|
||||
status = "okay";
|
||||
|
||||
|
|
@ -456,6 +495,10 @@ &i2c5 {
|
|||
status = "disabled";
|
||||
};
|
||||
|
||||
&i2s0_8ch {
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
&i2s1_8ch {
|
||||
pinctrl-names = "default";
|
||||
pinctrl-0 = <&i2s1m0_sclktx
|
||||
|
|
@ -677,3 +720,20 @@ &usb_host0_ehci {
|
|||
&usb_host0_ohci {
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
&vop {
|
||||
assigned-clocks = <&cru DCLK_VOP0>, <&cru DCLK_VOP1>;
|
||||
assigned-clock-parents = <&pmucru PLL_HPLL>, <&cru PLL_VPLL>;
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
&vop_mmu {
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
&vp0 {
|
||||
vp0_out_hdmi: endpoint@ROCKCHIP_VOP2_EP_HDMI0 {
|
||||
reg = <ROCKCHIP_VOP2_EP_HDMI0>;
|
||||
remote-endpoint = <&hdmi_in_vp0>;
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@
|
|||
|
||||
#include <dt-bindings/gpio/gpio.h>
|
||||
#include <dt-bindings/pinctrl/rockchip.h>
|
||||
#include <dt-bindings/soc/rockchip,vop2.h>
|
||||
#include "rk3566.dtsi"
|
||||
|
||||
/ {
|
||||
|
|
@ -27,6 +28,17 @@ gmac1_clkin: external-gmac1-clock {
|
|||
#clock-cells = <0>;
|
||||
};
|
||||
|
||||
hdmi-con {
|
||||
compatible = "hdmi-connector";
|
||||
type = "a";
|
||||
|
||||
port {
|
||||
hdmi_con_in: endpoint {
|
||||
remote-endpoint = <&hdmi_out_con>;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
leds {
|
||||
compatible = "gpio-leds";
|
||||
|
||||
|
|
@ -149,6 +161,29 @@ &gmac1m0_clkinout
|
|||
status = "okay";
|
||||
};
|
||||
|
||||
&gpu {
|
||||
mali-supply = <&vdd_gpu>;
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
&hdmi {
|
||||
avdd-0v9-supply = <&vdda0v9_image>;
|
||||
avdd-1v8-supply = <&vcca1v8_image>;
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
&hdmi_in {
|
||||
hdmi_in_vp0: endpoint {
|
||||
remote-endpoint = <&vp0_out_hdmi>;
|
||||
};
|
||||
};
|
||||
|
||||
&hdmi_out {
|
||||
hdmi_out_con: endpoint {
|
||||
remote-endpoint = <&hdmi_con_in>;
|
||||
};
|
||||
};
|
||||
|
||||
&i2c0 {
|
||||
status = "okay";
|
||||
|
||||
|
|
@ -577,3 +612,20 @@ &usb_host0_ehci {
|
|||
&usb_host0_ohci {
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
&vop {
|
||||
assigned-clocks = <&cru DCLK_VOP0>, <&cru DCLK_VOP1>;
|
||||
assigned-clock-parents = <&pmucru PLL_HPLL>, <&cru PLL_VPLL>;
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
&vop_mmu {
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
&vp0 {
|
||||
vp0_out_hdmi: endpoint@ROCKCHIP_VOP2_EP_HDMI0 {
|
||||
reg = <ROCKCHIP_VOP2_EP_HDMI0>;
|
||||
remote-endpoint = <&hdmi_in_vp0>;
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -739,6 +739,62 @@ vop_mmu: iommu@fe043e00 {
|
|||
status = "disabled";
|
||||
};
|
||||
|
||||
dsi0: dsi@fe060000 {
|
||||
compatible = "rockchip,rk3568-mipi-dsi", "snps,dw-mipi-dsi";
|
||||
reg = <0x00 0xfe060000 0x00 0x10000>;
|
||||
interrupts = <GIC_SPI 68 IRQ_TYPE_LEVEL_HIGH>;
|
||||
clock-names = "pclk", "hclk";
|
||||
clocks = <&cru PCLK_DSITX_0>, <&cru HCLK_VO>;
|
||||
phy-names = "dphy";
|
||||
phys = <&dsi_dphy0>;
|
||||
power-domains = <&power RK3568_PD_VO>;
|
||||
reset-names = "apb";
|
||||
resets = <&cru SRST_P_DSITX_0>;
|
||||
rockchip,grf = <&grf>;
|
||||
status = "disabled";
|
||||
|
||||
ports {
|
||||
#address-cells = <1>;
|
||||
#size-cells = <0>;
|
||||
|
||||
dsi0_in: port@0 {
|
||||
reg = <0>;
|
||||
};
|
||||
|
||||
dsi0_out: port@1 {
|
||||
reg = <1>;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
dsi1: dsi@fe070000 {
|
||||
compatible = "rockchip,rk3568-mipi-dsi", "snps,dw-mipi-dsi";
|
||||
reg = <0x0 0xfe070000 0x0 0x10000>;
|
||||
interrupts = <GIC_SPI 69 IRQ_TYPE_LEVEL_HIGH>;
|
||||
clock-names = "pclk", "hclk";
|
||||
clocks = <&cru PCLK_DSITX_1>, <&cru HCLK_VO>;
|
||||
phy-names = "dphy";
|
||||
phys = <&dsi_dphy1>;
|
||||
power-domains = <&power RK3568_PD_VO>;
|
||||
reset-names = "apb";
|
||||
resets = <&cru SRST_P_DSITX_1>;
|
||||
rockchip,grf = <&grf>;
|
||||
status = "disabled";
|
||||
|
||||
ports {
|
||||
#address-cells = <1>;
|
||||
#size-cells = <0>;
|
||||
|
||||
dsi1_in: port@0 {
|
||||
reg = <0>;
|
||||
};
|
||||
|
||||
dsi1_out: port@1 {
|
||||
reg = <1>;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
hdmi: hdmi@fe0a0000 {
|
||||
compatible = "rockchip,rk3568-dw-hdmi";
|
||||
reg = <0x0 0xfe0a0000 0x0 0x20000>;
|
||||
|
|
@ -1646,6 +1702,30 @@ csi_dphy: phy@fe870000 {
|
|||
status = "disabled";
|
||||
};
|
||||
|
||||
dsi_dphy0: mipi-dphy@fe850000 {
|
||||
compatible = "rockchip,rk3568-dsi-dphy";
|
||||
reg = <0x0 0xfe850000 0x0 0x10000>;
|
||||
clock-names = "ref", "pclk";
|
||||
clocks = <&pmucru CLK_MIPIDSIPHY0_REF>, <&cru PCLK_MIPIDSIPHY0>;
|
||||
#phy-cells = <0>;
|
||||
power-domains = <&power RK3568_PD_VO>;
|
||||
reset-names = "apb";
|
||||
resets = <&cru SRST_P_MIPIDSIPHY0>;
|
||||
status = "disabled";
|
||||
};
|
||||
|
||||
dsi_dphy1: mipi-dphy@fe860000 {
|
||||
compatible = "rockchip,rk3568-dsi-dphy";
|
||||
reg = <0x0 0xfe860000 0x0 0x10000>;
|
||||
clock-names = "ref", "pclk";
|
||||
clocks = <&pmucru CLK_MIPIDSIPHY1_REF>, <&cru PCLK_MIPIDSIPHY1>;
|
||||
#phy-cells = <0>;
|
||||
power-domains = <&power RK3568_PD_VO>;
|
||||
reset-names = "apb";
|
||||
resets = <&cru SRST_P_MIPIDSIPHY1>;
|
||||
status = "disabled";
|
||||
};
|
||||
|
||||
usb2phy0: usb2phy@fe8a0000 {
|
||||
compatible = "rockchip,rk3568-usb2phy";
|
||||
reg = <0x0 0xfe8a0000 0x0 0x10000>;
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user