mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-22 06:57:57 +00:00
67 lines
2.2 KiB
Diff
67 lines
2.2 KiB
Diff
|
From 8fdcc86186312dba7921a3d269a100ec81c7cf5a Mon Sep 17 00:00:00 2001
|
||
|
|
From: Maxime Ripard <maxime@cerno.tech>
|
||
|
|
Date: Tue, 25 Apr 2023 10:21:53 +0200
|
||
|
|
Subject: [PATCH 0614/1085] drm/vc4: txp: Rename TXP data structure
|
||
|
|
|
||
|
|
The TXP data structure has a name too generic for the multiple variants
|
||
|
|
we'll have to support. Let's rename it to mention the SoC it applies to.
|
||
|
|
|
||
|
|
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
|
||
|
|
---
|
||
|
|
drivers/gpu/drm/vc4/tests/vc4_mock.c | 4 ++--
|
||
|
|
drivers/gpu/drm/vc4/vc4_drv.h | 2 +-
|
||
|
|
drivers/gpu/drm/vc4/vc4_txp.c | 4 ++--
|
||
|
|
3 files changed, 5 insertions(+), 5 deletions(-)
|
||
|
|
|
||
|
|
--- a/drivers/gpu/drm/vc4/tests/vc4_mock.c
|
||
|
|
+++ b/drivers/gpu/drm/vc4/tests/vc4_mock.c
|
||
|
|
@@ -51,7 +51,7 @@ struct vc4_mock_desc {
|
||
|
|
|
||
|
|
static const struct vc4_mock_desc vc4_mock =
|
||
|
|
VC4_MOCK_DESC(
|
||
|
|
- VC4_MOCK_CRTC_DESC(&vc4_txp_data.base,
|
||
|
|
+ VC4_MOCK_CRTC_DESC(&bcm2835_txp_data.base,
|
||
|
|
VC4_MOCK_OUTPUT_DESC(VC4_ENCODER_TYPE_TXP,
|
||
|
|
DRM_MODE_ENCODER_VIRTUAL,
|
||
|
|
DRM_MODE_CONNECTOR_WRITEBACK)),
|
||
|
|
@@ -77,7 +77,7 @@ static const struct vc4_mock_desc vc4_mo
|
||
|
|
|
||
|
|
static const struct vc4_mock_desc vc5_mock =
|
||
|
|
VC4_MOCK_DESC(
|
||
|
|
- VC4_MOCK_CRTC_DESC(&vc4_txp_data.base,
|
||
|
|
+ VC4_MOCK_CRTC_DESC(&bcm2835_txp_data.base,
|
||
|
|
VC4_MOCK_OUTPUT_DESC(VC4_ENCODER_TYPE_TXP,
|
||
|
|
DRM_MODE_ENCODER_VIRTUAL,
|
||
|
|
DRM_MODE_CONNECTOR_WRITEBACK)),
|
||
|
|
--- a/drivers/gpu/drm/vc4/vc4_drv.h
|
||
|
|
+++ b/drivers/gpu/drm/vc4/vc4_drv.h
|
||
|
|
@@ -550,7 +550,7 @@ struct vc4_txp_data {
|
||
|
|
struct vc4_crtc_data base;
|
||
|
|
};
|
||
|
|
|
||
|
|
-extern const struct vc4_txp_data vc4_txp_data;
|
||
|
|
+extern const struct vc4_txp_data bcm2835_txp_data;
|
||
|
|
|
||
|
|
struct vc4_pv_data {
|
||
|
|
struct vc4_crtc_data base;
|
||
|
|
--- a/drivers/gpu/drm/vc4/vc4_txp.c
|
||
|
|
+++ b/drivers/gpu/drm/vc4/vc4_txp.c
|
||
|
|
@@ -485,7 +485,7 @@ static irqreturn_t vc4_txp_interrupt(int
|
||
|
|
return IRQ_HANDLED;
|
||
|
|
}
|
||
|
|
|
||
|
|
-const struct vc4_txp_data vc4_txp_data = {
|
||
|
|
+const struct vc4_txp_data bcm2835_txp_data = {
|
||
|
|
.base = {
|
||
|
|
.name = "txp",
|
||
|
|
.debugfs_name = "txp_regs",
|
||
|
|
@@ -588,7 +588,7 @@ static void vc4_txp_remove(struct platfo
|
||
|
|
}
|
||
|
|
|
||
|
|
static const struct of_device_id vc4_txp_dt_match[] = {
|
||
|
|
- { .compatible = "brcm,bcm2835-txp", .data = &vc4_txp_data },
|
||
|
|
+ { .compatible = "brcm,bcm2835-txp", .data = &bcm2835_txp_data },
|
||
|
|
{ /* sentinel */ },
|
||
|
|
};
|
||
|
|
|