UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

Samsung defconfig changes for v5.10 

1. Re-enable platform media drivers as new dependency on
    MEDIA_PLATFORM_SUPPORT appeared.
 2. Enable ROHM BD718x7 PMIC present on some of boards with i.MX 8 SoCs.
 3. Enable Samsung S3FWRN5 NFC driver present on TM2/TM2E boards.
 -----BEGIN PGP SIGNATURE-----
 
 iQJEBAABCgAuFiEE3dJiKD0RGyM7briowTdm5oaLg9cFAl9nd60QHGtyemtAa2Vy
 bmVsLm9yZwAKCRDBN2bmhouD18rOD/9ucWc/yY8pHekt0/n8XfCzhCcQzrbvt9v6
 sCpA9B99lzswia3O2MxS6k7hmc/RDFckNJlcE+SVTlfArpGyoPRIUHivMpbD1CiV
 OTT4fzdLv3rzuK3EgE2Z9HgwABvu6VBcucPs3bOn2fswqLU0JqG938QY30Lu2uT1
 Anr9Bxoc0HW3MCVnPhK1XidT0fwDLWRi/ks2TMChbVVg1Fzt+ootiy7IWu6Eg/dw
 jxwfxbmnkfPHB8axEsLg28JfMQTXmOIHyMn1da1wW0nPSnrvlcRfD/nzt91e8Grr
 a3xQwOFrVesZXzQuhaxda4xxHzqkuCBzNTIqDC7U5mRxNUMOe9E2P/kAS8b19BTn
 Ays7maJgkKIKC8EwKGRcOVUYnzoiEbYOH4y3pgh5SFKEgimKy+PLSXlTAb1Ot45K
 k1Gct0yVeAK8Hz+FFsm014hdfiy6lu4P22T6wt5kVwtIGRaE0R2z7qzEEVg1yX6V
 M6/QFithA21WyN4IuoUqEqJZ3q4WZjH9N83a3uY63l/aKy+lVeNiYMLZZAU4g3m5
 DmGLYa8xAAgoVl6AuxFVMmrJFy+k5v4jzVlV3tFQchX3YP1IidmYs6N0QKfrOmvI
 pj9K8Mxr7MAkHpV3Nt3XwV32SX39umGiP5bN8L1FFZGiO6iSoJsWgN65pdf2xnKQ
 rrOjXPpFPQ==
 =oMmC
 -----END PGP SIGNATURE-----

Merge tag 'samsung-defconfig-5.10' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into arm/defconfig

Samsung defconfig changes for v5.10

1. Re-enable platform media drivers as new dependency on
   MEDIA_PLATFORM_SUPPORT appeared.
2. Enable ROHM BD718x7 PMIC present on some of boards with i.MX 8 SoCs.
3. Enable Samsung S3FWRN5 NFC driver present on TM2/TM2E boards.

* tag 'samsung-defconfig-5.10' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux:
  arm64: defconfig: Enable Samsung S3FWRN5 NFC driver
  arm64: defconfig: Enable clock driver for ROHM BD718x7 PMIC
  ARM: exynos_defconfig: enable platform media drivers

Link: https://lore.kernel.org/r/20200920160705.9651-2-krzk@kernel.org
Signed-off-by: Olof Johansson <olof@lixom.net>
This commit is contained in:
Olof Johansson 2020-09-26 12:44:10 -07:00
parent a8ba256afe 4c42831b30
commit 0059e8d648
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
arch/arm/configs/exynos_defconfig
View File

@ -191,11 +191,14 @@ CONFIG_REGULATOR_S2MPS11=y
CONFIG_REGULATOR_S5M8767=y
CONFIG_REGULATOR_TPS65090=y
CONFIG_REGULATOR_WM8994=y
CONFIG_MEDIA_SUPPORT=m
CONFIG_MEDIA_CAMERA_SUPPORT=y
CONFIG_MEDIA_CEC_SUPPORT=y
CONFIG_CEC_SAMSUNG_S5P=m
CONFIG_MEDIA_SUPPORT=m
# CONFIG_MEDIA_SUBDRV_AUTOSELECT is not set
CONFIG_MEDIA_CAMERA_SUPPORT=y
CONFIG_MEDIA_CONTROLLER=y
CONFIG_VIDEO_V4L2_SUBDEV_API=y
CONFIG_MEDIA_PLATFORM_SUPPORT=y
CONFIG_MEDIA_USB_SUPPORT=y
CONFIG_USB_VIDEO_CLASS=m
CONFIG_V4L_PLATFORM_DRIVERS=y
@ -210,9 +213,6 @@ CONFIG_VIDEO_SAMSUNG_S5P_MFC=m
CONFIG_VIDEO_SAMSUNG_EXYNOS_GSC=m
CONFIG_V4L_TEST_DRIVERS=y
CONFIG_VIDEO_VIVID=m
CONFIG_CEC_PLATFORM_DRIVERS=y
CONFIG_CEC_SAMSUNG_S5P=m
# CONFIG_MEDIA_SUBDRV_AUTOSELECT is not set
CONFIG_VIDEO_S5K6A3=m
CONFIG_VIDEO_S5C73M3=m
CONFIG_DRM=y

4
arch/arm64/configs/defconfig
View File

@ -199,6 +199,9 @@ CONFIG_MAC80211_LEDS=y
CONFIG_RFKILL=m
CONFIG_NET_9P=y
CONFIG_NET_9P_VIRTIO=y
CONFIG_NFC=m
CONFIG_NFC_NCI=m
CONFIG_NFC_S3FWRN5_I2C=m
CONFIG_PCI=y
CONFIG_PCIEPORTBUS=y
CONFIG_PCI_IOV=y
@ -841,6 +844,7 @@ CONFIG_COMMON_CLK_FSL_SAI=y
CONFIG_COMMON_CLK_S2MPS11=y
CONFIG_COMMON_CLK_PWM=y
CONFIG_COMMON_CLK_VC5=y
CONFIG_COMMON_CLK_BD718XX=m
CONFIG_CLK_RASPBERRYPI=m
CONFIG_CLK_IMX8MM=y
CONFIG_CLK_IMX8MN=y