mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-19 21:58:04 +00:00
20fe7e687e
Sync 6.1 patches with the RPi foundation. Since rpi-6.6.y is now the main branch of the RPi foundation, there won't be any new patches for linux 6.1. Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
60 lines
1.9 KiB
Diff
60 lines
1.9 KiB
Diff
From 57695002a68bdd4c077ea2173b64aeee6e1ef24f Mon Sep 17 00:00:00 2001
|
|
From: Ratchanan Srirattanamet <peathot@hotmail.com>
|
|
Date: Fri, 26 Jan 2024 18:49:42 +0700
|
|
Subject: [PATCH 1261/1295] drm/rp1: depends on, instead of select, MFD_RP1
|
|
|
|
According to kconfig-language.txt [1], select should be used only for
|
|
"non-visible symbols ... and for symbols with no dependencies". Since
|
|
MFD_RP1 both is visible and has a dependency, "select" should not be
|
|
used and "depends on" should be used instead.
|
|
|
|
In particular, this fixes the build of this kernel tree on NixOS, where
|
|
its kernel config system will try to answer 'M' to as many config as
|
|
possible.
|
|
|
|
[1] https://www.kernel.org/doc/html/latest/kbuild/kconfig-language.html
|
|
|
|
Signed-off-by: Ratchanan Srirattanamet <peathot@hotmail.com>
|
|
---
|
|
drivers/gpu/drm/rp1/rp1-dpi/Kconfig | 3 +--
|
|
drivers/gpu/drm/rp1/rp1-dsi/Kconfig | 3 +--
|
|
drivers/gpu/drm/rp1/rp1-vec/Kconfig | 3 +--
|
|
3 files changed, 3 insertions(+), 6 deletions(-)
|
|
|
|
--- a/drivers/gpu/drm/rp1/rp1-dpi/Kconfig
|
|
+++ b/drivers/gpu/drm/rp1/rp1-dpi/Kconfig
|
|
@@ -1,8 +1,7 @@
|
|
# SPDX-License-Identifier: GPL-2.0-only
|
|
config DRM_RP1_DPI
|
|
tristate "DRM Support for RP1 DPI"
|
|
- depends on DRM
|
|
- select MFD_RP1
|
|
+ depends on DRM && MFD_RP1
|
|
select DRM_GEM_DMA_HELPER
|
|
select DRM_KMS_HELPER
|
|
select DRM_VRAM_HELPER
|
|
--- a/drivers/gpu/drm/rp1/rp1-dsi/Kconfig
|
|
+++ b/drivers/gpu/drm/rp1/rp1-dsi/Kconfig
|
|
@@ -1,8 +1,7 @@
|
|
# SPDX-License-Identifier: GPL-2.0-only
|
|
config DRM_RP1_DSI
|
|
tristate "DRM Support for RP1 DSI"
|
|
- depends on DRM
|
|
- select MFD_RP1
|
|
+ depends on DRM && MFD_RP1
|
|
select DRM_GEM_DMA_HELPER
|
|
select DRM_KMS_HELPER
|
|
select DRM_MIPI_DSI
|
|
--- a/drivers/gpu/drm/rp1/rp1-vec/Kconfig
|
|
+++ b/drivers/gpu/drm/rp1/rp1-vec/Kconfig
|
|
@@ -1,8 +1,7 @@
|
|
# SPDX-License-Identifier: GPL-2.0-only
|
|
config DRM_RP1_VEC
|
|
tristate "DRM Support for RP1 VEC"
|
|
- depends on DRM
|
|
- select MFD_RP1
|
|
+ depends on DRM && MFD_RP1
|
|
select DRM_GEM_DMA_HELPER
|
|
select DRM_KMS_HELPER
|
|
select DRM_VRAM_HELPER
|