Skip to content

Commit 54ec74c

Browse files
committed
ARM: dts: bcm2712-cm5: i2c_csi_dsi is i2c_csi_dsi1
Make i2c_csi_dsi an alias for i2c_csi_dsi1, and remove the spurious redefinition in the cm5 .dts files. Signed-off-by: Phil Elwell <[email protected]>
1 parent ec0f4ba commit 54ec74c

File tree

3 files changed

+1
-5
lines changed

3 files changed

+1
-5
lines changed

arch/arm/boot/dts/broadcom/bcm2712-rpi-cm5-cm4io.dts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33

44
#include "bcm2712-rpi-cm5.dtsi"
55

6-
i2c_csi_dsi: &i2c_csi_dsi0 { }; // An alias for compatibility
7-
86
// The RP1 USB3 interfaces are not usable on CM4IO
97

108
&rp1_usb0 {

arch/arm/boot/dts/broadcom/bcm2712-rpi-cm5-cm5io.dts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33

44
#include "bcm2712-rpi-cm5.dtsi"
55

6-
i2c_csi_dsi: &i2c_csi_dsi0 { }; // An alias for compatibility
7-
86
/ {
97
__overrides__ {
108
i2c_csi_dsi = <&i2c_csi_dsi>, "status";

arch/arm/boot/dts/broadcom/bcm2712-rpi-cm5.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,7 @@ i2c_csi_dsi0: &i2c6 { // Note: This is for MIPI0 connector only
249249
i2c_csi_dsi1: &i2c0 { // Note: This is for MIPI1 connector
250250
};
251251

252-
i2c_csi_dsi: &i2c_csi_dsi0 { }; // An alias for compatibility
252+
i2c_csi_dsi: &i2c_csi_dsi1 { }; // An alias for compatibility
253253

254254
cam1_reg: &cam0_reg { // Shares CAM_GPIO with cam0_reg
255255
};

0 commit comments

Comments
 (0)