Skip to content

Commit 8dc9697

Browse files
committed
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>
2 parents 5eb5d4c + 06835cc commit 8dc9697

File tree

1 file changed

+2
-0
lines changed

1 file changed

+2
-0
lines changed

arch/arm64/configs/defconfig

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -200,6 +200,7 @@ CONFIG_CFG80211=m
200200
CONFIG_MAC80211=m
201201
CONFIG_MAC80211_LEDS=y
202202
CONFIG_RFKILL=m
203+
CONFIG_RFKILL_GPIO=m
203204
CONFIG_NET_9P=y
204205
CONFIG_NET_9P_VIRTIO=y
205206
CONFIG_NFC=m
@@ -877,6 +878,7 @@ CONFIG_ROCKCHIP_VOP2=y
877878
CONFIG_ROCKCHIP_ANALOGIX_DP=y
878879
CONFIG_ROCKCHIP_CDN_DP=y
879880
CONFIG_ROCKCHIP_DW_HDMI=y
881+
CONFIG_ROCKCHIP_DW_HDMI_QP=y
880882
CONFIG_ROCKCHIP_DW_MIPI_DSI=y
881883
CONFIG_ROCKCHIP_INNO_HDMI=y
882884
CONFIG_ROCKCHIP_LVDS=y

0 commit comments

Comments
 (0)