From 4186e8924a9a6cb9a92bc8078a4ff4cb653d0122 Mon Sep 17 00:00:00 2001 From: Chen Jiali Date: Fri, 22 Nov 2024 18:36:19 +0800 Subject: [PATCH] feat: rockchip: completion of renamed macro definitions Associated commit: * https://github.com/radxa/kernel/commit/1f429c9dc145fca4b964290258c9fd44a024e5b1#diff-785702ddd5f53d374d20d20a5792468453e9ac9400504c53b2169624cb138104R39 --- .../display/drm_mipi_dsi_overlay.h | 22 +++++++++++++++++++ .../radxa-cm3-io-jymx1013833281be-display.dts | 1 + .../radxa-cm3-io-radxa-10p1inch-display.dts | 1 + .../radxa-cm3-io-radxa-display-10fhd.dts | 1 + .../radxa-cm3-io-radxa-display-8hd.dts | 1 + ...radxa-cm3-sodimm-io-radxa-display-10hd.dts | 1 + .../radxa-cm3-sodimm-io-radxa-display-8hd.dts | 1 + .../radxa-cm3i-io-radxa-8inch-display.dts | 1 + .../radxa-cm3i-io-radxa-display-10fhd.dts | 1 + .../radxa-cm3i-io-radxa-display-10hd.dts | 1 + .../radxa-cm5-io-radxa-display-10fhd.dts | 1 + .../radxa-cm5-io-radxa-display-10hd.dts | 1 + .../overlays/rk3399-cs003-display.dts | 1 + .../overlays/rock-3a-radxa-display-10hd.dts | 1 + .../overlays/rock-3a-radxa-display-8hd.dts | 1 + .../rock-3b-radxa-10p1inch-display.dts | 1 + .../overlays/rock-3b-radxa-8inch-display.dts | 1 + .../overlays/rock-3b-radxa-display-10fhd.dts | 1 + .../overlays/rock-3c-radxa-display-10hd.dts | 1 + .../overlays/rock-3c-radxa-display-8hd.dts | 1 + .../overlays/rock-4-radxa-display-10hd.dts | 1 + .../rock-4c-plus-radxa-display-10fhd.dts | 1 + .../overlays/rock-4se-radxa-display-8hd.dts | 1 + ...rock-5-itx-radxa-display-10fhd-on-lcd0.dts | 1 + ...rock-5-itx-radxa-display-10fhd-on-lcd1.dts | 1 + .../overlays/rock-5a-radxa-display-10fhd.dts | 1 + .../rock-5b-plus-radxa-display-10fhd.dts | 1 + .../overlays/rock-5b-radxa-display-10fhd.dts | 1 + .../overlays/rock-5t-radxa-display-10fhd.dts | 1 + 29 files changed, 50 insertions(+) create mode 100644 arch/arm64/boot/dts/rockchip/overlays/dt-bindings/display/drm_mipi_dsi_overlay.h diff --git a/arch/arm64/boot/dts/rockchip/overlays/dt-bindings/display/drm_mipi_dsi_overlay.h b/arch/arm64/boot/dts/rockchip/overlays/dt-bindings/display/drm_mipi_dsi_overlay.h new file mode 100644 index 00000000..f7469e0a --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/overlays/dt-bindings/display/drm_mipi_dsi_overlay.h @@ -0,0 +1,22 @@ +#ifndef _DRM_MIPI_DSI_H_OVERLAY_ +#define _DRM_MIPI_DSI_H_OVERLAY_ + +#include + +#ifndef MIPI_DSI_MODE_VIDEO_HFP +#define MIPI_DSI_MODE_VIDEO_HFP MIPI_DSI_MODE_VIDEO_NO_HFP +#endif /* MIPI_DSI_MODE_VIDEO_HFP */ + +#ifndef MIPI_DSI_MODE_VIDEO_HBP +#define MIPI_DSI_MODE_VIDEO_HBP MIPI_DSI_MODE_VIDEO_NO_HBP +#endif /* MIPI_DSI_MODE_VIDEO_HBP */ + +#ifndef MIPI_DSI_MODE_VIDEO_HSA +#define MIPI_DSI_MODE_VIDEO_HSA MIPI_DSI_MODE_VIDEO_NO_HSA +#endif /* MIPI_DSI_MODE_VIDEO_HSA */ + +#ifndef MIPI_DSI_MODE_EOT_PACKET +#define MIPI_DSI_MODE_EOT_PACKET MIPI_DSI_MODE_NO_EOT_PACKET +#endif /* MIPI_DSI_MODE_EOT_PACKET */ + +#endif /* _DRM_MIPI_DSI_H_OVERLAY_ */ diff --git a/arch/arm64/boot/dts/rockchip/overlays/radxa-cm3-io-jymx1013833281be-display.dts b/arch/arm64/boot/dts/rockchip/overlays/radxa-cm3-io-jymx1013833281be-display.dts index 61bd1274..340a3b24 100644 --- a/arch/arm64/boot/dts/rockchip/overlays/radxa-cm3-io-jymx1013833281be-display.dts +++ b/arch/arm64/boot/dts/rockchip/overlays/radxa-cm3-io-jymx1013833281be-display.dts @@ -4,6 +4,7 @@ #include #include #include +#include "dt-bindings/display/drm_mipi_dsi_overlay.h" #include / { diff --git a/arch/arm64/boot/dts/rockchip/overlays/radxa-cm3-io-radxa-10p1inch-display.dts b/arch/arm64/boot/dts/rockchip/overlays/radxa-cm3-io-radxa-10p1inch-display.dts index 63c9753f..c87b172c 100644 --- a/arch/arm64/boot/dts/rockchip/overlays/radxa-cm3-io-radxa-10p1inch-display.dts +++ b/arch/arm64/boot/dts/rockchip/overlays/radxa-cm3-io-radxa-10p1inch-display.dts @@ -5,6 +5,7 @@ #include #include #include +#include "dt-bindings/display/drm_mipi_dsi_overlay.h" #include / { diff --git a/arch/arm64/boot/dts/rockchip/overlays/radxa-cm3-io-radxa-display-10fhd.dts b/arch/arm64/boot/dts/rockchip/overlays/radxa-cm3-io-radxa-display-10fhd.dts index d731ae38..95531b32 100644 --- a/arch/arm64/boot/dts/rockchip/overlays/radxa-cm3-io-radxa-display-10fhd.dts +++ b/arch/arm64/boot/dts/rockchip/overlays/radxa-cm3-io-radxa-display-10fhd.dts @@ -5,6 +5,7 @@ #include #include #include +#include "dt-bindings/display/drm_mipi_dsi_overlay.h" #include / { diff --git a/arch/arm64/boot/dts/rockchip/overlays/radxa-cm3-io-radxa-display-8hd.dts b/arch/arm64/boot/dts/rockchip/overlays/radxa-cm3-io-radxa-display-8hd.dts index 9ad0712e..28c069a6 100644 --- a/arch/arm64/boot/dts/rockchip/overlays/radxa-cm3-io-radxa-display-8hd.dts +++ b/arch/arm64/boot/dts/rockchip/overlays/radxa-cm3-io-radxa-display-8hd.dts @@ -5,6 +5,7 @@ #include #include #include +#include "dt-bindings/display/drm_mipi_dsi_overlay.h" #include / { diff --git a/arch/arm64/boot/dts/rockchip/overlays/radxa-cm3-sodimm-io-radxa-display-10hd.dts b/arch/arm64/boot/dts/rockchip/overlays/radxa-cm3-sodimm-io-radxa-display-10hd.dts index 554be5f2..b5cb98b0 100644 --- a/arch/arm64/boot/dts/rockchip/overlays/radxa-cm3-sodimm-io-radxa-display-10hd.dts +++ b/arch/arm64/boot/dts/rockchip/overlays/radxa-cm3-sodimm-io-radxa-display-10hd.dts @@ -5,6 +5,7 @@ #include #include #include +#include "dt-bindings/display/drm_mipi_dsi_overlay.h" / { metadata { diff --git a/arch/arm64/boot/dts/rockchip/overlays/radxa-cm3-sodimm-io-radxa-display-8hd.dts b/arch/arm64/boot/dts/rockchip/overlays/radxa-cm3-sodimm-io-radxa-display-8hd.dts index c2525bfe..ea4c60e8 100644 --- a/arch/arm64/boot/dts/rockchip/overlays/radxa-cm3-sodimm-io-radxa-display-8hd.dts +++ b/arch/arm64/boot/dts/rockchip/overlays/radxa-cm3-sodimm-io-radxa-display-8hd.dts @@ -5,6 +5,7 @@ #include #include #include +#include "dt-bindings/display/drm_mipi_dsi_overlay.h" / { metadata { diff --git a/arch/arm64/boot/dts/rockchip/overlays/radxa-cm3i-io-radxa-8inch-display.dts b/arch/arm64/boot/dts/rockchip/overlays/radxa-cm3i-io-radxa-8inch-display.dts index c2169ea8..e62edd1c 100644 --- a/arch/arm64/boot/dts/rockchip/overlays/radxa-cm3i-io-radxa-8inch-display.dts +++ b/arch/arm64/boot/dts/rockchip/overlays/radxa-cm3i-io-radxa-8inch-display.dts @@ -4,6 +4,7 @@ #include #include #include +#include "dt-bindings/display/drm_mipi_dsi_overlay.h" #include #include diff --git a/arch/arm64/boot/dts/rockchip/overlays/radxa-cm3i-io-radxa-display-10fhd.dts b/arch/arm64/boot/dts/rockchip/overlays/radxa-cm3i-io-radxa-display-10fhd.dts index aa54922d..62635b6c 100644 --- a/arch/arm64/boot/dts/rockchip/overlays/radxa-cm3i-io-radxa-display-10fhd.dts +++ b/arch/arm64/boot/dts/rockchip/overlays/radxa-cm3i-io-radxa-display-10fhd.dts @@ -4,6 +4,7 @@ #include #include #include +#include "dt-bindings/display/drm_mipi_dsi_overlay.h" #include #include diff --git a/arch/arm64/boot/dts/rockchip/overlays/radxa-cm3i-io-radxa-display-10hd.dts b/arch/arm64/boot/dts/rockchip/overlays/radxa-cm3i-io-radxa-display-10hd.dts index 41f13a06..e2b00423 100644 --- a/arch/arm64/boot/dts/rockchip/overlays/radxa-cm3i-io-radxa-display-10hd.dts +++ b/arch/arm64/boot/dts/rockchip/overlays/radxa-cm3i-io-radxa-display-10hd.dts @@ -4,6 +4,7 @@ #include #include #include +#include "dt-bindings/display/drm_mipi_dsi_overlay.h" #include #include diff --git a/arch/arm64/boot/dts/rockchip/overlays/radxa-cm5-io-radxa-display-10fhd.dts b/arch/arm64/boot/dts/rockchip/overlays/radxa-cm5-io-radxa-display-10fhd.dts index 6fed7879..9a13fc2b 100644 --- a/arch/arm64/boot/dts/rockchip/overlays/radxa-cm5-io-radxa-display-10fhd.dts +++ b/arch/arm64/boot/dts/rockchip/overlays/radxa-cm5-io-radxa-display-10fhd.dts @@ -5,6 +5,7 @@ #include #include #include +#include "dt-bindings/display/drm_mipi_dsi_overlay.h" / { metadata { diff --git a/arch/arm64/boot/dts/rockchip/overlays/radxa-cm5-io-radxa-display-10hd.dts b/arch/arm64/boot/dts/rockchip/overlays/radxa-cm5-io-radxa-display-10hd.dts index d07ed66d..85b8653e 100644 --- a/arch/arm64/boot/dts/rockchip/overlays/radxa-cm5-io-radxa-display-10hd.dts +++ b/arch/arm64/boot/dts/rockchip/overlays/radxa-cm5-io-radxa-display-10hd.dts @@ -5,6 +5,7 @@ #include #include #include +#include "dt-bindings/display/drm_mipi_dsi_overlay.h" / { metadata { diff --git a/arch/arm64/boot/dts/rockchip/overlays/rk3399-cs003-display.dts b/arch/arm64/boot/dts/rockchip/overlays/rk3399-cs003-display.dts index 91967bc0..34b48081 100644 --- a/arch/arm64/boot/dts/rockchip/overlays/rk3399-cs003-display.dts +++ b/arch/arm64/boot/dts/rockchip/overlays/rk3399-cs003-display.dts @@ -5,6 +5,7 @@ #include #include #include +#include "dt-bindings/display/drm_mipi_dsi_overlay.h" #include / { diff --git a/arch/arm64/boot/dts/rockchip/overlays/rock-3a-radxa-display-10hd.dts b/arch/arm64/boot/dts/rockchip/overlays/rock-3a-radxa-display-10hd.dts index 1bbb05a3..4a31b943 100644 --- a/arch/arm64/boot/dts/rockchip/overlays/rock-3a-radxa-display-10hd.dts +++ b/arch/arm64/boot/dts/rockchip/overlays/rock-3a-radxa-display-10hd.dts @@ -5,6 +5,7 @@ #include #include #include +#include "dt-bindings/display/drm_mipi_dsi_overlay.h" / { metadata { diff --git a/arch/arm64/boot/dts/rockchip/overlays/rock-3a-radxa-display-8hd.dts b/arch/arm64/boot/dts/rockchip/overlays/rock-3a-radxa-display-8hd.dts index 47023dbe..6f242dec 100644 --- a/arch/arm64/boot/dts/rockchip/overlays/rock-3a-radxa-display-8hd.dts +++ b/arch/arm64/boot/dts/rockchip/overlays/rock-3a-radxa-display-8hd.dts @@ -5,6 +5,7 @@ #include #include #include +#include "dt-bindings/display/drm_mipi_dsi_overlay.h" / { metadata { diff --git a/arch/arm64/boot/dts/rockchip/overlays/rock-3b-radxa-10p1inch-display.dts b/arch/arm64/boot/dts/rockchip/overlays/rock-3b-radxa-10p1inch-display.dts index dabe1202..67e70f2a 100644 --- a/arch/arm64/boot/dts/rockchip/overlays/rock-3b-radxa-10p1inch-display.dts +++ b/arch/arm64/boot/dts/rockchip/overlays/rock-3b-radxa-10p1inch-display.dts @@ -4,6 +4,7 @@ #include #include #include +#include "dt-bindings/display/drm_mipi_dsi_overlay.h" #include / { diff --git a/arch/arm64/boot/dts/rockchip/overlays/rock-3b-radxa-8inch-display.dts b/arch/arm64/boot/dts/rockchip/overlays/rock-3b-radxa-8inch-display.dts index a2cc6350..f6d30d9b 100644 --- a/arch/arm64/boot/dts/rockchip/overlays/rock-3b-radxa-8inch-display.dts +++ b/arch/arm64/boot/dts/rockchip/overlays/rock-3b-radxa-8inch-display.dts @@ -4,6 +4,7 @@ #include #include #include +#include "dt-bindings/display/drm_mipi_dsi_overlay.h" #include / { diff --git a/arch/arm64/boot/dts/rockchip/overlays/rock-3b-radxa-display-10fhd.dts b/arch/arm64/boot/dts/rockchip/overlays/rock-3b-radxa-display-10fhd.dts index 51fb1f86..320a3c74 100644 --- a/arch/arm64/boot/dts/rockchip/overlays/rock-3b-radxa-display-10fhd.dts +++ b/arch/arm64/boot/dts/rockchip/overlays/rock-3b-radxa-display-10fhd.dts @@ -4,6 +4,7 @@ #include #include #include +#include "dt-bindings/display/drm_mipi_dsi_overlay.h" #include / { diff --git a/arch/arm64/boot/dts/rockchip/overlays/rock-3c-radxa-display-10hd.dts b/arch/arm64/boot/dts/rockchip/overlays/rock-3c-radxa-display-10hd.dts index 38c9700a..9bc19cea 100644 --- a/arch/arm64/boot/dts/rockchip/overlays/rock-3c-radxa-display-10hd.dts +++ b/arch/arm64/boot/dts/rockchip/overlays/rock-3c-radxa-display-10hd.dts @@ -5,6 +5,7 @@ #include #include #include +#include "dt-bindings/display/drm_mipi_dsi_overlay.h" / { metadata { diff --git a/arch/arm64/boot/dts/rockchip/overlays/rock-3c-radxa-display-8hd.dts b/arch/arm64/boot/dts/rockchip/overlays/rock-3c-radxa-display-8hd.dts index 38602c5a..9f82a3a1 100644 --- a/arch/arm64/boot/dts/rockchip/overlays/rock-3c-radxa-display-8hd.dts +++ b/arch/arm64/boot/dts/rockchip/overlays/rock-3c-radxa-display-8hd.dts @@ -5,6 +5,7 @@ #include #include #include +#include "dt-bindings/display/drm_mipi_dsi_overlay.h" / { metadata { diff --git a/arch/arm64/boot/dts/rockchip/overlays/rock-4-radxa-display-10hd.dts b/arch/arm64/boot/dts/rockchip/overlays/rock-4-radxa-display-10hd.dts index 31cacec0..94873ce0 100644 --- a/arch/arm64/boot/dts/rockchip/overlays/rock-4-radxa-display-10hd.dts +++ b/arch/arm64/boot/dts/rockchip/overlays/rock-4-radxa-display-10hd.dts @@ -5,6 +5,7 @@ #include #include #include +#include "dt-bindings/display/drm_mipi_dsi_overlay.h" / { metadata { diff --git a/arch/arm64/boot/dts/rockchip/overlays/rock-4c-plus-radxa-display-10fhd.dts b/arch/arm64/boot/dts/rockchip/overlays/rock-4c-plus-radxa-display-10fhd.dts index 7b5b17bc..740ef776 100644 --- a/arch/arm64/boot/dts/rockchip/overlays/rock-4c-plus-radxa-display-10fhd.dts +++ b/arch/arm64/boot/dts/rockchip/overlays/rock-4c-plus-radxa-display-10fhd.dts @@ -5,6 +5,7 @@ #include #include #include +#include "dt-bindings/display/drm_mipi_dsi_overlay.h" / { metadata { diff --git a/arch/arm64/boot/dts/rockchip/overlays/rock-4se-radxa-display-8hd.dts b/arch/arm64/boot/dts/rockchip/overlays/rock-4se-radxa-display-8hd.dts index 81586a51..e3491b6b 100644 --- a/arch/arm64/boot/dts/rockchip/overlays/rock-4se-radxa-display-8hd.dts +++ b/arch/arm64/boot/dts/rockchip/overlays/rock-4se-radxa-display-8hd.dts @@ -5,6 +5,7 @@ #include #include #include +#include "dt-bindings/display/drm_mipi_dsi_overlay.h" / { metadata { diff --git a/arch/arm64/boot/dts/rockchip/overlays/rock-5-itx-radxa-display-10fhd-on-lcd0.dts b/arch/arm64/boot/dts/rockchip/overlays/rock-5-itx-radxa-display-10fhd-on-lcd0.dts index 8b2e89b8..371649a0 100644 --- a/arch/arm64/boot/dts/rockchip/overlays/rock-5-itx-radxa-display-10fhd-on-lcd0.dts +++ b/arch/arm64/boot/dts/rockchip/overlays/rock-5-itx-radxa-display-10fhd-on-lcd0.dts @@ -5,6 +5,7 @@ #include #include #include +#include "dt-bindings/display/drm_mipi_dsi_overlay.h" / { metadata { diff --git a/arch/arm64/boot/dts/rockchip/overlays/rock-5-itx-radxa-display-10fhd-on-lcd1.dts b/arch/arm64/boot/dts/rockchip/overlays/rock-5-itx-radxa-display-10fhd-on-lcd1.dts index 3f6d0a70..adcc1651 100644 --- a/arch/arm64/boot/dts/rockchip/overlays/rock-5-itx-radxa-display-10fhd-on-lcd1.dts +++ b/arch/arm64/boot/dts/rockchip/overlays/rock-5-itx-radxa-display-10fhd-on-lcd1.dts @@ -5,6 +5,7 @@ #include #include #include +#include "dt-bindings/display/drm_mipi_dsi_overlay.h" / { metadata { diff --git a/arch/arm64/boot/dts/rockchip/overlays/rock-5a-radxa-display-10fhd.dts b/arch/arm64/boot/dts/rockchip/overlays/rock-5a-radxa-display-10fhd.dts index 5fdca04b..8677d241 100644 --- a/arch/arm64/boot/dts/rockchip/overlays/rock-5a-radxa-display-10fhd.dts +++ b/arch/arm64/boot/dts/rockchip/overlays/rock-5a-radxa-display-10fhd.dts @@ -5,6 +5,7 @@ #include #include #include +#include "dt-bindings/display/drm_mipi_dsi_overlay.h" #include / { diff --git a/arch/arm64/boot/dts/rockchip/overlays/rock-5b-plus-radxa-display-10fhd.dts b/arch/arm64/boot/dts/rockchip/overlays/rock-5b-plus-radxa-display-10fhd.dts index ed2a94a7..7ca35b44 100644 --- a/arch/arm64/boot/dts/rockchip/overlays/rock-5b-plus-radxa-display-10fhd.dts +++ b/arch/arm64/boot/dts/rockchip/overlays/rock-5b-plus-radxa-display-10fhd.dts @@ -5,6 +5,7 @@ #include #include #include +#include "dt-bindings/display/drm_mipi_dsi_overlay.h" #include / { diff --git a/arch/arm64/boot/dts/rockchip/overlays/rock-5b-radxa-display-10fhd.dts b/arch/arm64/boot/dts/rockchip/overlays/rock-5b-radxa-display-10fhd.dts index 4ca09d9b..c18b6545 100644 --- a/arch/arm64/boot/dts/rockchip/overlays/rock-5b-radxa-display-10fhd.dts +++ b/arch/arm64/boot/dts/rockchip/overlays/rock-5b-radxa-display-10fhd.dts @@ -5,6 +5,7 @@ #include #include #include +#include "dt-bindings/display/drm_mipi_dsi_overlay.h" / { metadata { diff --git a/arch/arm64/boot/dts/rockchip/overlays/rock-5t-radxa-display-10fhd.dts b/arch/arm64/boot/dts/rockchip/overlays/rock-5t-radxa-display-10fhd.dts index 706df729..cab953cc 100644 --- a/arch/arm64/boot/dts/rockchip/overlays/rock-5t-radxa-display-10fhd.dts +++ b/arch/arm64/boot/dts/rockchip/overlays/rock-5t-radxa-display-10fhd.dts @@ -5,6 +5,7 @@ #include #include #include +#include "dt-bindings/display/drm_mipi_dsi_overlay.h" #include / {