Skip to content

Commit 412f67c

Browse files
authored
rockchip: Add NanoPi M5 board support to edge kernel (#8684)
* rockchip: Add NanoPi M5 board support to edge kernel * rockchip64: enable Rockchip ASoC drivers and codecs in kernel config * config: Fix audio Kconfig tristate hierarchy Set CONFIG_SOUND, CONFIG_SND, and CONFIG_SND_SOC to built-in (y) to allow Rockchip audio drivers to be built-in instead of being silently downgraded to modules by olddefconfig. * nanopi-m5: Add asound.state for audio configuration * nanopi-m5: Fix SAI2 clock output
1 parent a96702d commit 412f67c

File tree

4 files changed

+2017
-12
lines changed

4 files changed

+2017
-12
lines changed

config/boards/nanopi-m5.conf

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,9 @@
22
BOARD_NAME="NanoPi M5"
33
BOARDFAMILY="rk35xx"
44
BOOTCONFIG="nanopi-m5-rk3576_defconfig"
5-
KERNEL_TARGET="vendor" # WIP: current, edge kernel
5+
KERNEL_TARGET="vendor, edge" # WIP: current kernel
66
FULL_DESKTOP="yes"
7+
ASOUND_STATE="asound.state.nanopi-m5"
78
BOOT_LOGO="desktop"
89
BOOT_FDT_FILE="rockchip/rk3576-nanopi-m5.dtb"
910
BOOT_SCENARIO="spl-blobs"

config/kernel/linux-rockchip64-edge.config

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2142,8 +2142,8 @@ CONFIG_BACKLIGHT_RAVE_SP=m
21422142
CONFIG_BACKLIGHT_LED=m
21432143
CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
21442144
CONFIG_LOGO=y
2145-
CONFIG_SOUND=m
2146-
CONFIG_SND=m
2145+
CONFIG_SOUND=y
2146+
CONFIG_SND=y
21472147
# CONFIG_SND_SUPPORT_OLD_API is not set
21482148
CONFIG_SND_SEQUENCER=m
21492149
CONFIG_SND_SEQ_DUMMY=m
@@ -2177,7 +2177,7 @@ CONFIG_SND_USB_POD=m
21772177
CONFIG_SND_USB_PODHD=m
21782178
CONFIG_SND_USB_TONEPORT=m
21792179
CONFIG_SND_USB_VARIAX=m
2180-
CONFIG_SND_SOC=m
2180+
CONFIG_SND_SOC=y
21812181
CONFIG_SND_SOC_UTILS_KUNIT_TEST=m
21822182
CONFIG_SND_SOC_ADI=m
21832183
CONFIG_SND_SOC_ADI_AXI_I2S=m
@@ -2188,13 +2188,18 @@ CONFIG_SND_DESIGNWARE_I2S=m
21882188
CONFIG_SND_SOC_FSL_AUDMIX=m
21892189
CONFIG_SND_SOC_FSL_MICFIL=m
21902190
CONFIG_SND_SOC_FSL_XCVR=m
2191-
CONFIG_SND_SOC_ROCKCHIP=m
2192-
CONFIG_SND_SOC_ROCKCHIP_I2S_TDM=m
2193-
CONFIG_SND_SOC_ROCKCHIP_PDM=m
2194-
CONFIG_SND_SOC_ROCKCHIP_SPDIF=m
2195-
CONFIG_SND_SOC_ROCKCHIP_MAX98090=m
2196-
CONFIG_SND_SOC_ROCKCHIP_RT5645=m
2197-
CONFIG_SND_SOC_ROCKCHIP_RT5651=m
2191+
CONFIG_SND_SOC_ROCKCHIP=y
2192+
CONFIG_SND_SOC_ROCKCHIP_I2S_TDM=y
2193+
CONFIG_SND_SOC_ROCKCHIP_PDM=y
2194+
CONFIG_SND_SOC_ROCKCHIP_PDM_V2=m
2195+
CONFIG_SND_SOC_ROCKCHIP_SAI=y
2196+
CONFIG_SND_SOC_ROCKCHIP_SPDIF=y
2197+
CONFIG_SND_SOC_ROCKCHIP_MAX98090=y
2198+
CONFIG_SND_SOC_ROCKCHIP_MULTICODECS=y
2199+
CONFIG_SND_SOC_ROCKCHIP_RT5645=y
2200+
CONFIG_SND_SOC_ROCKCHIP_RT5651=y
2201+
CONFIG_SND_SOC_ROCKCHIP_HDMI=y
2202+
CONFIG_SND_SOC_DUMMY_CODEC=y
21982203
CONFIG_SND_SOC_RK3288_HDMI_ANALOG=m
21992204
CONFIG_SND_SOC_RK3399_GRU_SOUND=m
22002205
CONFIG_SND_SOC_XILINX_I2S=m
@@ -2243,7 +2248,7 @@ CONFIG_SND_SOC_PCM512x_SPI=m
22432248
CONFIG_SND_SOC_RK3308=m
22442249
CONFIG_SND_SOC_RK3328=m
22452250
CONFIG_SND_SOC_RK817=m
2246-
CONFIG_SND_SOC_RT5616=m
2251+
CONFIG_SND_SOC_RT5616=y
22472252
CONFIG_SND_SOC_RT5631=m
22482253
CONFIG_SND_SOC_RT5640=m
22492254
CONFIG_SND_SOC_RT5659=m

0 commit comments

Comments
 (0)