Skip to contentSkip to conversation

arm: rockchip: switch to mainline dts for bpi-r2-pro

PATCH Applied Frank Wunderlich 2 participants 2 messages Aug 21, 2022 – Aug 22, 2022

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH v3 1/1 arm: rockchip: switch to mainline dts for bpi-r2-pro

From: Frank Wunderlich <[email protected]>

Use mainline DTS for Bananapi R2 Pro like the other rk356x devices.

Xhci0 has to be set to host again, as board has no id-pin to switch between otg and hostmode.

---
v3:
- accidentally squashed raminit-bins, buildscript and my defconfig from test

v2:
- fixed patch to apply on master

---
 .../boards/rockchip-rk3568-bpi-r2pro/board.c  |   5 +-
 arch/arm/dts/rk3568-bpi-r2-pro.dts            | 522 +-----------------
 2 files changed, 4 insertions(+), 523 deletions(-)
arch/arm/boards/rockchip-rk3568-bpi-r2pro/board.c +3 -2
index 1a5faa8afb12..b5d406576f89 100644
@@ -28,8 +28,9 @@ static int rk3568_bpi_r2pro_probe(struct device_d *dev)
 	else
 		of_device_enable_path("/chosen/environment-emmc");
 
-	rk3568_bbu_mmc_register("emmc", BBU_HANDLER_FLAG_DEFAULT, "/dev/emmc");
-	rk3568_bbu_mmc_register("sd", 0, "/dev/sd");
+	rk3568_bbu_mmc_register("sd", 0, "/dev/mmc0");
+	rk3568_bbu_mmc_register("emmc", BBU_HANDLER_FLAG_DEFAULT,
+				"/dev/mmc1");
 
 	return 0;
 }
arch/arm/dts/rk3568-bpi-r2-pro.dts +1 -521

552 lines not on this page · raw message

Signature · 1 line
2.34.1
Applied
#1 lore raw
Quoted 12 lines · Frank Wunderlich

From: Frank Wunderlich <[email protected]>

Use mainline DTS for Bananapi R2 Pro like the other rk356x devices.

Xhci0 has to be set to host again, as board has no id-pin to switch between otg and hostmode.

---
v3:
- accidentally squashed raminit-bins, buildscript and my defconfig from test

Quoted 6 lines

v2:
- fixed patch to apply on master

---
 .../boards/rockchip-rk3568-bpi-r2pro/board.c  |   5 +-
 arch/arm/dts/rk3568-bpi-r2-pro.dts            | 522 +-----------------
 2 files changed, 4 insertions(+), 523 deletions(-)

Applied, thanks

Sascha

Signature · 4 lines
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |