MMC-aliases for rk3288-veyron devices and some dts node adaptions

for yaml conversions recently merged into the drm tree.
 -----BEGIN PGP SIGNATURE-----
 
 iQFEBAABCAAuFiEE7v+35S2Q1vLNA3Lx86Z5yZzRHYEFAmQyBQEQHGhlaWtvQHNu
 dGVjaC5kZQAKCRDzpnnJnNEdgQ0XB/9l5539KSxSHBmaPjBmFHaPpjthBHR4SzVp
 /xaa7ReOYJWpe4gT2u73S1PQQdGub84TD6x00ImIwJoUlbAKE656skgqDe4dkzMb
 WN29KFBYaFZ2vAyvgM4RTDfNtadyrQeW9PO8ZDQAJ5Ys4E9bfz5U5oy1f3MyTQ5I
 wmYOPTdtFGrzJeRmYa5o2fiHdj/FBUc0G5Vvg0qwIKaDR1NkhmrNXcwlpK/uP6QB
 +o2icz61jvFMIdBgv9G7AApofIp9x7LhpesL8C5w1oj+cFINGHhjlca1L98TGA9c
 HDutfCqv4GElCy325CfgSgCnZrOyfYQZjCwE37cmqIbZElLJpLFR
 =fEIi
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEiK/NIGsWEZVxh/FrYKtH/8kJUicFAmQ5dYIACgkQYKtH/8kJ
 UieIRRAAysy1znBxAwVOVVBxWvnllkeomG3nPlG6Xq6oDk89G9KrDeuuvPYta8/Y
 BeFZd+lNm35p5MJMUSGCvcxTNauoKwf/KF2F3WcFyFEqG8kVqD8IJhiD5LGKMnWE
 04GYT0tV/ikX/QzXEVVzZmsw5GGxpYv9G7xvnNe5JAJmfhyavUmWGQF3Or5x7cCK
 sBmIZ4DPymEM2RuACZqS5dkjRPei64Gc0C/axkzZNL0LQQ48MgEdUQvWgo8KTTIr
 mSeATRk6Lui3/ajSGjeSbqzQiBp/A+qE1/4jZzVvvuhZ/wj5EdkKKUUa7d64wHKS
 7KRv6Y0/c1nbETm0Olaw43L7rRn1lBDl+0WkdIAgEPsqp87LJpdPmzyTWLWA8A8N
 vyLtkMpvUymgLuELdUuGxYzy+9l7E2qYUuTJN6HzR8xkOBku/B+HTS0eYfygElwn
 7LupHbef/AHuAdY7eCSr/tBtXEZyTklvMEAMXR9ATqg1cavqi5nW5IHUH1t4mTnS
 wMu/O5Md59R90gqJ9xv8wOKRe+i/LJnDbmKbY0tWBq/Jh9wBW8VvdrXdVHfZ95lU
 hbGpEFM+vV6HtzrJqcGSGQBtdpvoR/k8J5Yqc7D6U7xfzhsr9jDZo5cOkyWYz5nv
 9WbJqZaag1F3OEYso+WQ/la88M9INch59+MIfFxCO5+c+fuZiwA=
 =IDjR
 -----END PGP SIGNATURE-----

Merge tag 'v6.4-rockchip-dts32-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into soc/dt

MMC-aliases for rk3288-veyron devices and some dts node adaptions
for yaml conversions recently merged into the drm tree.

* tag 'v6.4-rockchip-dts32-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
  ARM: dts: rockchip: fix rk3288 dp node
  ARM: dts: rockchip: fix rk3288 lvds node
  ARM: dts: rockchip: fix rk3288 dsi node
  ARM: dts: rockchip: Add mmc aliases for rk3288-veyron devices

Link: https://lore.kernel.org/r/9713202.NyiUUSuA9g@phil
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann 2023-04-14 17:47:14 +02:00
commit 2925732f0c
3 changed files with 34 additions and 3 deletions

View File

@ -5,6 +5,12 @@
* Copyright 2015 Google, Inc
*/
/ {
aliases {
mmc1 = &sdmmc;
};
};
&io_domains {
sdcard-supply = <&vccio_sd>;
};

View File

@ -10,6 +10,10 @@
#include "rk3288.dtsi"
/ {
aliases {
mmc0 = &emmc;
};
chosen {
stdout-path = "serial2:115200n8";
};

View File

@ -1114,7 +1114,7 @@
status = "disabled";
};
mipi_dsi: mipi@ff960000 {
mipi_dsi: dsi@ff960000 {
compatible = "rockchip,rk3288-mipi-dsi", "snps,dw-mipi-dsi";
reg = <0x0 0xff960000 0x0 0x4000>;
interrupts = <GIC_SPI 19 IRQ_TYPE_LEVEL_HIGH>;
@ -1125,18 +1125,28 @@
status = "disabled";
ports {
mipi_in: port {
#address-cells = <1>;
#size-cells = <0>;
mipi_in: port@0 {
reg = <0>;
#address-cells = <1>;
#size-cells = <0>;
mipi_in_vopb: endpoint@0 {
reg = <0>;
remote-endpoint = <&vopb_out_mipi>;
};
mipi_in_vopl: endpoint@1 {
reg = <1>;
remote-endpoint = <&vopl_out_mipi>;
};
};
mipi_out: port@1 {
reg = <1>;
};
};
};
@ -1157,7 +1167,6 @@
lvds_in: port@0 {
reg = <0>;
#address-cells = <1>;
#size-cells = <0>;
@ -1165,11 +1174,16 @@
reg = <0>;
remote-endpoint = <&vopb_out_lvds>;
};
lvds_in_vopl: endpoint@1 {
reg = <1>;
remote-endpoint = <&vopl_out_lvds>;
};
};
lvds_out: port@1 {
reg = <1>;
};
};
};
@ -1190,19 +1204,26 @@
ports {
#address-cells = <1>;
#size-cells = <0>;
edp_in: port@0 {
reg = <0>;
#address-cells = <1>;
#size-cells = <0>;
edp_in_vopb: endpoint@0 {
reg = <0>;
remote-endpoint = <&vopb_out_edp>;
};
edp_in_vopl: endpoint@1 {
reg = <1>;
remote-endpoint = <&vopl_out_edp>;
};
};
edp_out: port@1 {
reg = <1>;
};
};
};