ARM: dts: rockchip: rk312x-linux: enable mpp_srv node

Change-Id: Ic226f8ccdb8cdb803fad3c6e450aeb9d0115ea82
Signed-off-by: Jianlong Wang <jianlong.wang@rock-chips.com>
This commit is contained in:
Jianlong Wang
2022-11-17 10:35:01 +08:00
committed by Tao Huang
parent 38a4540cd6
commit ad1c79a5b7
2 changed files with 86 additions and 78 deletions

View File

@@ -139,25 +139,6 @@
};
};
&codec {
#sound-dai-cells = <0>;
spk-ctl-gpios = <&gpio2 9 GPIO_ACTIVE_HIGH>;
spk-mute-delay = <200>;
hp-mute-delay = <100>;
rk312x_for_mid = <0>;
is_rk3128 = <0>;
spk_volume = <25>;
hp_volume = <25>;
capture_volume = <26>;
gpio_debug = <1>;
codec_hp_det = <0>;
status = "okay";
};
&cpu0 {
cpu-supply = <&vdd_arm>;
};
&cif_new {
status = "okay";
@@ -178,6 +159,25 @@
};
};
&codec {
#sound-dai-cells = <0>;
spk-ctl-gpios = <&gpio2 9 GPIO_ACTIVE_HIGH>;
spk-mute-delay = <200>;
hp-mute-delay = <100>;
rk312x_for_mid = <0>;
is_rk3128 = <0>;
spk_volume = <25>;
hp_volume = <25>;
capture_volume = <26>;
gpio_debug = <1>;
codec_hp_det = <0>;
status = "okay";
};
&cpu0 {
cpu-supply = <&vdd_arm>;
};
&display_subsystem {
status = "okay";
};
@@ -751,6 +751,10 @@
status = "okay";
};
&mpp_srv {
status = "okay";
};
&nandc {
status = "okay";
};
@@ -792,16 +796,6 @@
vref-supply = <&vccadc_ref>;
};
&sdmmc {
cap-mmc-highspeed;
supports-sd;
card-detect-delay = <800>;
ignore-pm-notify;
keep-power-in-suspend;
cd-gpios = <&gpio1 11 GPIO_ACTIVE_LOW>; /* CD GPIO */
status = "disabled";
};
&sdio {
bus-width = <4>;
max-frequency = <50000000>;
@@ -814,6 +808,16 @@
status = "okay";
};
&sdmmc {
cap-mmc-highspeed;
supports-sd;
card-detect-delay = <800>;
ignore-pm-notify;
keep-power-in-suspend;
cd-gpios = <&gpio1 11 GPIO_ACTIVE_LOW>; /* CD GPIO */
status = "disabled";
};
&tsadc {
status = "okay";
};
@@ -849,6 +853,14 @@
status = "okay";
};
&vdpu {
status = "okay";
};
&vepu {
status = "okay";
};
&video_phy {
status = "okay";
};
@@ -861,14 +873,6 @@
status = "okay";
};
&vdpu {
status = "okay";
};
&vepu {
status = "okay";
};
&vpu_mmu {
status = "okay";
};

View File

@@ -242,6 +242,20 @@
};
};
&cif_new {
status = "okay";
ports {
port@0 {
cif_in_bcam: endpoint@0 {
remote-endpoint = <&gc2145_out>;
vsync-active = <0>;
hsync-active = <1>;
};
};
};
};
&codec{
spk-ctl-gpios = <&gpio0 RK_PD6 GPIO_ACTIVE_HIGH>;
hp-ctl-gpios = <&gpio3 RK_PC4 GPIO_ACTIVE_LOW>;
@@ -264,20 +278,6 @@
cpu-supply = <&vdd_arm>;
};
&cif_new {
status = "okay";
ports {
port@0 {
cif_in_bcam: endpoint@0 {
remote-endpoint = <&gc2145_out>;
vsync-active = <0>;
hsync-active = <1>;
};
};
};
};
&display_subsystem {
status = "okay";
};
@@ -785,6 +785,10 @@
#sound-dai-cells = <0>;
};
&mpp_srv {
status = "okay";
};
&pinctrl {
codec{
spk_ctl_h: spk-ctl-h{
@@ -895,19 +899,6 @@
vref-supply = <&vcc_io>;
};
&sdmmc {
cap-mmc-highspeed;
cap-sd-highspeed;
supports-sd;
vmmc-supply = <&vcc_sdmmc>;
broken-cd;
card-detect-delay = <800>;
ignore-pm-notify;
keep-power-in-suspend;
cd-gpios = <&gpio1 RK_PC1 GPIO_ACTIVE_HIGH>; /* CD GPIO */
status = "disabled";
};
&sdio {
max-frequency = <50000000>;
supports-sdio;
@@ -923,6 +914,19 @@
status = "okay";
};
&sdmmc {
cap-mmc-highspeed;
cap-sd-highspeed;
supports-sd;
vmmc-supply = <&vcc_sdmmc>;
broken-cd;
card-detect-delay = <800>;
ignore-pm-notify;
keep-power-in-suspend;
cd-gpios = <&gpio1 RK_PC1 GPIO_ACTIVE_HIGH>; /* CD GPIO */
status = "disabled";
};
&spdif{
compatible = "rockchip,rk3188-spdif";
status = "okay";
@@ -931,12 +935,6 @@
#sound-dai-cells = <0>;
};
&uart0{
pinctrl-names = "default";
pinctrl-0 = <&uart0_xfer &uart0_cts>;
status = "okay";
};
&u2phy {
status = "okay";
@@ -950,6 +948,12 @@
};
};
&uart0{
pinctrl-names = "default";
pinctrl-0 = <&uart0_xfer &uart0_cts>;
status = "okay";
};
&usb_host_ehci {
status = "okay";
};
@@ -962,14 +966,6 @@
status = "okay";
};
&vop {
status = "okay";
};
&vop_mmu {
status = "okay";
};
&vdpu {
status = "okay";
};
@@ -978,6 +974,14 @@
status = "okay";
};
&vop {
status = "okay";
};
&vop_mmu {
status = "okay";
};
&vpu_mmu {
status = "okay";
};