diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2025-01-15 17:05:12 +0300 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2025-01-15 17:05:13 +0300 |
| commit | 8dc9697921b38f2fb3d23c7a658506738f0e2a3a (patch) | |
| tree | 7aa1a36b916794085985488683a339f40d38cc8b | |
| parent | 5eb5d4c6d4a31319a982c43669f46099c088b5d5 (diff) | |
| parent | 06835ccec2efb71d54a810265e8ef69b1011608e (diff) | |
| download | linux-8dc9697921b38f2fb3d23c7a658506738f0e2a3a.tar.xz | |
Merge tag 'v6.14-rockchip-defconfig64-1' of https://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into soc/defconfig
Rockchip DRM extension for the DW-HDMI-QP controller and rfkill-gpio.
* tag 'v6.14-rockchip-defconfig64-1' of https://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
arm64: defconfig: Enable Rockchip extensions for Synopsys DW HDMI QP
arm64: defconfig: Enable RFKILL GPIO
Link: https://lore.kernel.org/r/3095859.687JKscXgg@diego
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
| -rw-r--r-- | arch/arm64/configs/defconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig index 971d8135db08..161553dfce21 100644 --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig @@ -200,6 +200,7 @@ CONFIG_CFG80211=m CONFIG_MAC80211=m CONFIG_MAC80211_LEDS=y CONFIG_RFKILL=m +CONFIG_RFKILL_GPIO=m CONFIG_NET_9P=y CONFIG_NET_9P_VIRTIO=y CONFIG_NFC=m @@ -877,6 +878,7 @@ CONFIG_ROCKCHIP_VOP2=y CONFIG_ROCKCHIP_ANALOGIX_DP=y CONFIG_ROCKCHIP_CDN_DP=y CONFIG_ROCKCHIP_DW_HDMI=y +CONFIG_ROCKCHIP_DW_HDMI_QP=y CONFIG_ROCKCHIP_DW_MIPI_DSI=y CONFIG_ROCKCHIP_INNO_HDMI=y CONFIG_ROCKCHIP_LVDS=y |