tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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>

Arnd Bergmann 2925732f ff68e816

+34 -3
+6
arch/arm/boot/dts/rk3288-veyron-sdmmc.dtsi
··· 5 5 * Copyright 2015 Google, Inc 6 6 */ 7 7 8 + / { 9 + aliases { 10 + mmc1 = &sdmmc; 11 + }; 12 + }; 13 + 8 14 &io_domains { 9 15 sdcard-supply = <&vccio_sd>; 10 16 };
+4
arch/arm/boot/dts/rk3288-veyron.dtsi
··· 10 10 #include "rk3288.dtsi" 11 11 12 12 / { 13 + aliases { 14 + mmc0 = &emmc; 15 + }; 16 + 13 17 chosen { 14 18 stdout-path = "serial2:115200n8"; 15 19 };
+24 -3
arch/arm/boot/dts/rk3288.dtsi
··· 1114 1114 status = "disabled"; 1115 1115 }; 1116 1116 1117 - mipi_dsi: mipi@ff960000 { 1117 + mipi_dsi: dsi@ff960000 { 1118 1118 compatible = "rockchip,rk3288-mipi-dsi", "snps,dw-mipi-dsi"; 1119 1119 reg = <0x0 0xff960000 0x0 0x4000>; 1120 1120 interrupts = <GIC_SPI 19 IRQ_TYPE_LEVEL_HIGH>; ··· 1125 1125 status = "disabled"; 1126 1126 1127 1127 ports { 1128 - mipi_in: port { 1128 + #address-cells = <1>; 1129 + #size-cells = <0>; 1130 + 1131 + mipi_in: port@0 { 1132 + reg = <0>; 1129 1133 #address-cells = <1>; 1130 1134 #size-cells = <0>; 1135 + 1131 1136 mipi_in_vopb: endpoint@0 { 1132 1137 reg = <0>; 1133 1138 remote-endpoint = <&vopb_out_mipi>; 1134 1139 }; 1140 + 1135 1141 mipi_in_vopl: endpoint@1 { 1136 1142 reg = <1>; 1137 1143 remote-endpoint = <&vopl_out_mipi>; 1138 1144 }; 1145 + }; 1146 + 1147 + mipi_out: port@1 { 1148 + reg = <1>; 1139 1149 }; 1140 1150 }; 1141 1151 }; ··· 1167 1157 1168 1158 lvds_in: port@0 { 1169 1159 reg = <0>; 1170 - 1171 1160 #address-cells = <1>; 1172 1161 #size-cells = <0>; 1173 1162 ··· 1174 1165 reg = <0>; 1175 1166 remote-endpoint = <&vopb_out_lvds>; 1176 1167 }; 1168 + 1177 1169 lvds_in_vopl: endpoint@1 { 1178 1170 reg = <1>; 1179 1171 remote-endpoint = <&vopl_out_lvds>; 1180 1172 }; 1173 + }; 1174 + 1175 + lvds_out: port@1 { 1176 + reg = <1>; 1181 1177 }; 1182 1178 }; 1183 1179 }; ··· 1204 1190 ports { 1205 1191 #address-cells = <1>; 1206 1192 #size-cells = <0>; 1193 + 1207 1194 edp_in: port@0 { 1208 1195 reg = <0>; 1209 1196 #address-cells = <1>; 1210 1197 #size-cells = <0>; 1198 + 1211 1199 edp_in_vopb: endpoint@0 { 1212 1200 reg = <0>; 1213 1201 remote-endpoint = <&vopb_out_edp>; 1214 1202 }; 1203 + 1215 1204 edp_in_vopl: endpoint@1 { 1216 1205 reg = <1>; 1217 1206 remote-endpoint = <&vopl_out_edp>; 1218 1207 }; 1208 + }; 1209 + 1210 + edp_out: port@1 { 1211 + reg = <1>; 1219 1212 }; 1220 1213 }; 1221 1214 };