diff options
author | Álvaro Fernández Rojas <noltari@gmail.com> | 2020-05-28 19:08:55 +0200 |
---|---|---|
committer | Álvaro Fernández Rojas <noltari@gmail.com> | 2020-05-28 19:12:43 +0200 |
commit | 77e97abf129c5028385dd72587eabab68db0d954 (patch) | |
tree | fc52a8c2ba346da77281f00538a1eb6de49deb5d /target/linux/bcm27xx/patches-5.4/950-0552-drm-vc4-crtc-Rename-SoC-data-structures.patch | |
parent | 5d3a0c6b26144eb5d62515b99613b5ad8dbdc717 (diff) | |
download | upstream-77e97abf129c5028385dd72587eabab68db0d954.tar.gz upstream-77e97abf129c5028385dd72587eabab68db0d954.tar.bz2 upstream-77e97abf129c5028385dd72587eabab68db0d954.zip |
bcm27xx: update to latest patches from RPi foundation
Also removes random module and switches to new bcm2711 thermal driver.
Boot tested on RPi 4B v1.1 4G.
Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
Diffstat (limited to 'target/linux/bcm27xx/patches-5.4/950-0552-drm-vc4-crtc-Rename-SoC-data-structures.patch')
-rw-r--r-- | target/linux/bcm27xx/patches-5.4/950-0552-drm-vc4-crtc-Rename-SoC-data-structures.patch | 56 |
1 files changed, 56 insertions, 0 deletions
diff --git a/target/linux/bcm27xx/patches-5.4/950-0552-drm-vc4-crtc-Rename-SoC-data-structures.patch b/target/linux/bcm27xx/patches-5.4/950-0552-drm-vc4-crtc-Rename-SoC-data-structures.patch new file mode 100644 index 0000000000..8b8eeea737 --- /dev/null +++ b/target/linux/bcm27xx/patches-5.4/950-0552-drm-vc4-crtc-Rename-SoC-data-structures.patch @@ -0,0 +1,56 @@ +From f071c70678b875d2e5411ead123015381647e9f9 Mon Sep 17 00:00:00 2001 +From: Maxime Ripard <maxime@cerno.tech> +Date: Thu, 26 Dec 2019 11:45:04 +0100 +Subject: [PATCH] drm/vc4: crtc: Rename SoC data structures + +Since we're going to introduce pixelvalve data structures for other SoCs +than the BCM2835, let's rename the structures defined in the code to +make it obvious which SoC we're targetting. + +Signed-off-by: Maxime Ripard <maxime@cerno.tech> +--- + drivers/gpu/drm/vc4/vc4_crtc.c | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +--- a/drivers/gpu/drm/vc4/vc4_crtc.c ++++ b/drivers/gpu/drm/vc4/vc4_crtc.c +@@ -1056,7 +1056,7 @@ static const struct drm_crtc_helper_func + .atomic_disable = vc4_crtc_atomic_disable, + }; + +-static const struct vc4_crtc_data pv0_data = { ++static const struct vc4_crtc_data bcm2835_pv0_data = { + .hvs_channel = 0, + .debugfs_name = "crtc0_regs", + .encoder_types = { +@@ -1065,7 +1065,7 @@ static const struct vc4_crtc_data pv0_da + }, + }; + +-static const struct vc4_crtc_data pv1_data = { ++static const struct vc4_crtc_data bcm2835_pv1_data = { + .hvs_channel = 2, + .debugfs_name = "crtc1_regs", + .encoder_types = { +@@ -1074,7 +1074,7 @@ static const struct vc4_crtc_data pv1_da + }, + }; + +-static const struct vc4_crtc_data pv2_data = { ++static const struct vc4_crtc_data bcm2835_pv2_data = { + .hvs_channel = 1, + .debugfs_name = "crtc2_regs", + .encoder_types = { +@@ -1084,9 +1084,9 @@ static const struct vc4_crtc_data pv2_da + }; + + static const struct of_device_id vc4_crtc_dt_match[] = { +- { .compatible = "brcm,bcm2835-pixelvalve0", .data = &pv0_data }, +- { .compatible = "brcm,bcm2835-pixelvalve1", .data = &pv1_data }, +- { .compatible = "brcm,bcm2835-pixelvalve2", .data = &pv2_data }, ++ { .compatible = "brcm,bcm2835-pixelvalve0", .data = &bcm2835_pv0_data }, ++ { .compatible = "brcm,bcm2835-pixelvalve1", .data = &bcm2835_pv1_data }, ++ { .compatible = "brcm,bcm2835-pixelvalve2", .data = &bcm2835_pv2_data }, + {} + }; + |