From c73720e04eb10e7c930a37e0427e7a788867193a Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Sun, 5 Jul 2020 11:18:58 +0200 Subject: [PATCH 01/10] ARM: configs: sunxi: Run savedefconfig We haven't run savedefconfig for a while and some options have moved around. In order to ease the patch application / conflict resolution, let's run it. Signed-off-by: Maxime Ripard Acked-by: Chen-Yu Tsai Link: https://lore.kernel.org/r/20200705091904.42795-1-maxime@cerno.tech --- arch/arm/configs/sunxi_defconfig | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) diff --git a/arch/arm/configs/sunxi_defconfig b/arch/arm/configs/sunxi_defconfig index b105ce7120cc..aff901a7c00e 100644 --- a/arch/arm/configs/sunxi_defconfig +++ b/arch/arm/configs/sunxi_defconfig @@ -3,20 +3,19 @@ CONFIG_HIGH_RES_TIMERS=y CONFIG_CGROUPS=y CONFIG_BLK_DEV_INITRD=y CONFIG_PERF_EVENTS=y -CONFIG_MODULES=y -CONFIG_MODULE_UNLOAD=y CONFIG_ARCH_SUNXI=y CONFIG_SMP=y CONFIG_NR_CPUS=8 -CONFIG_AEABI=y CONFIG_HIGHMEM=y -CONFIG_CMA=y CONFIG_ARM_APPENDED_DTB=y CONFIG_ARM_ATAG_DTB_COMPAT=y CONFIG_CPU_FREQ=y CONFIG_CPUFREQ_DT=y CONFIG_VFP=y CONFIG_NEON=y +CONFIG_MODULES=y +CONFIG_MODULE_UNLOAD=y +CONFIG_CMA=y CONFIG_NET=y CONFIG_PACKET=y CONFIG_UNIX=y @@ -24,9 +23,6 @@ CONFIG_INET=y CONFIG_IP_PNP=y CONFIG_IP_PNP_DHCP=y CONFIG_IP_PNP_BOOTP=y -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET_XFRM_MODE_TUNNEL is not set -# CONFIG_INET_XFRM_MODE_BEET is not set # CONFIG_INET_DIAG is not set # CONFIG_IPV6 is not set CONFIG_CAN=y @@ -34,14 +30,12 @@ CONFIG_CAN_SUN4I=y # CONFIG_WIRELESS is not set CONFIG_DEVTMPFS=y CONFIG_DEVTMPFS_MOUNT=y -CONFIG_DMA_CMA=y CONFIG_BLK_DEV_SD=y CONFIG_ATA=y CONFIG_AHCI_SUNXI=y CONFIG_NETDEVICES=y CONFIG_SUN4I_EMAC=y # CONFIG_NET_VENDOR_ARC is not set -# CONFIG_NET_CADENCE is not set # CONFIG_NET_VENDOR_BROADCOM is not set # CONFIG_NET_VENDOR_CIRRUS is not set # CONFIG_NET_VENDOR_FARADAY is not set @@ -95,10 +89,10 @@ CONFIG_REGULATOR=y CONFIG_REGULATOR_FIXED_VOLTAGE=y CONFIG_REGULATOR_AXP20X=y CONFIG_REGULATOR_GPIO=y -CONFIG_MEDIA_SUPPORT=y CONFIG_RC_CORE=y CONFIG_RC_DEVICES=y CONFIG_IR_SUNXI=y +CONFIG_MEDIA_SUPPORT=y CONFIG_DRM=y CONFIG_DRM_SUN4I=y CONFIG_DRM_SIMPLE_BRIDGE=y @@ -133,14 +127,12 @@ CONFIG_RTC_DRV_SUNXI=y CONFIG_DMADEVICES=y CONFIG_DMA_SUN6I=y # CONFIG_IOMMU_SUPPORT is not set -CONFIG_EXTCON=y CONFIG_IIO=y CONFIG_AXP20X_ADC=y CONFIG_PWM=y CONFIG_PWM_SUN4I=y CONFIG_PHY_SUN4I_USB=y CONFIG_PHY_SUN9I_USB=y -CONFIG_NVMEM=y CONFIG_NVMEM_SUNXI_SID=y CONFIG_EXT4_FS=y CONFIG_VFAT_FS=y @@ -151,8 +143,8 @@ CONFIG_NFS_V4=y CONFIG_ROOT_NFS=y CONFIG_NLS_CODEPAGE_437=y CONFIG_NLS_ISO8859_1=y +CONFIG_CRYPTO_DEV_SUN4I_SS=y +CONFIG_CRYPTO_DEV_SUN8I_CE=y +CONFIG_DMA_CMA=y CONFIG_PRINTK_TIME=y CONFIG_DEBUG_FS=y -CONFIG_CRYPTO_DEV_ALLWINNER=y -CONFIG_CRYPTO_DEV_SUN8I_CE=y -CONFIG_CRYPTO_DEV_SUN4I_SS=y From 4ac048266b734e1ecad6c32f94ea3741f6357510 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Sun, 5 Jul 2020 11:18:59 +0200 Subject: [PATCH 02/10] ARM: configs: sunxi: Enable the CSI drivers We've had CSI drivers for the older and newer SoCs for a while now, let's enable them in the defconfig. Signed-off-by: Maxime Ripard Link: https://lore.kernel.org/r/20200705091904.42795-2-maxime@cerno.tech Acked-by: Chen-Yu Tsai --- arch/arm/configs/sunxi_defconfig | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/arch/arm/configs/sunxi_defconfig b/arch/arm/configs/sunxi_defconfig index aff901a7c00e..45dd6fabc1cb 100644 --- a/arch/arm/configs/sunxi_defconfig +++ b/arch/arm/configs/sunxi_defconfig @@ -93,6 +93,10 @@ CONFIG_RC_CORE=y CONFIG_RC_DEVICES=y CONFIG_IR_SUNXI=y CONFIG_MEDIA_SUPPORT=y +CONFIG_MEDIA_PLATFORM_SUPPORT=y +CONFIG_V4L_PLATFORM_DRIVERS=y +CONFIG_VIDEO_SUN4I_CSI=y +CONFIG_VIDEO_SUN6I_CSI=y CONFIG_DRM=y CONFIG_DRM_SUN4I=y CONFIG_DRM_SIMPLE_BRIDGE=y From a40406fa85a70f7ed5cf026df57d339be8a30d25 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Sun, 5 Jul 2020 11:19:00 +0200 Subject: [PATCH 03/10] ARM: configs: sunxi: Enable the deinterlace and rotation engines We've had drivers for the deinterlace and rotation engines for a while now, let's enable them in the defconfig. Signed-off-by: Maxime Ripard Link: https://lore.kernel.org/r/20200705091904.42795-3-maxime@cerno.tech Acked-by: Chen-Yu Tsai --- arch/arm/configs/sunxi_defconfig | 3 +++ 1 file changed, 3 insertions(+) diff --git a/arch/arm/configs/sunxi_defconfig b/arch/arm/configs/sunxi_defconfig index 45dd6fabc1cb..09cf2ab06a3d 100644 --- a/arch/arm/configs/sunxi_defconfig +++ b/arch/arm/configs/sunxi_defconfig @@ -97,6 +97,9 @@ CONFIG_MEDIA_PLATFORM_SUPPORT=y CONFIG_V4L_PLATFORM_DRIVERS=y CONFIG_VIDEO_SUN4I_CSI=y CONFIG_VIDEO_SUN6I_CSI=y +CONFIG_V4L_MEM2MEM_DRIVERS=y +CONFIG_VIDEO_SUN8I_DEINTERLACE=y +CONFIG_VIDEO_SUN8I_ROTATE=y CONFIG_DRM=y CONFIG_DRM_SUN4I=y CONFIG_DRM_SIMPLE_BRIDGE=y From 3db1b796010a535880efc1ef9a321c8ab27b354e Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Sun, 5 Jul 2020 11:19:01 +0200 Subject: [PATCH 04/10] ARM: configs: sunxi: Enable Cedrus Let's enable the staging related options and Cedrus in our defconfig. Signed-off-by: Maxime Ripard Link: https://lore.kernel.org/r/20200705091904.42795-4-maxime@cerno.tech Acked-by: Chen-Yu Tsai --- arch/arm/configs/sunxi_defconfig | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/arch/arm/configs/sunxi_defconfig b/arch/arm/configs/sunxi_defconfig index 09cf2ab06a3d..bb6b279dc3b7 100644 --- a/arch/arm/configs/sunxi_defconfig +++ b/arch/arm/configs/sunxi_defconfig @@ -133,6 +133,10 @@ CONFIG_RTC_DRV_AC100=y CONFIG_RTC_DRV_SUNXI=y CONFIG_DMADEVICES=y CONFIG_DMA_SUN6I=y +CONFIG_STAGING=y +CONFIG_STAGING_MEDIA=y +CONFIG_VIDEO_SUNXI=y +CONFIG_VIDEO_SUNXI_CEDRUS=y # CONFIG_IOMMU_SUPPORT is not set CONFIG_IIO=y CONFIG_AXP20X_ADC=y From 373c13c258877734c59a3adb57b7ebb8cae1532f Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Sun, 5 Jul 2020 11:19:03 +0200 Subject: [PATCH 05/10] ARM: configs: sunxi: Enable ASoC options Most of our ASoC drivers were left out of the defconfig. Let's add them. Signed-off-by: Maxime Ripard Link: https://lore.kernel.org/r/20200705091904.42795-6-maxime@cerno.tech Acked-by: Chen-Yu Tsai --- arch/arm/configs/sunxi_defconfig | 3 +++ 1 file changed, 3 insertions(+) diff --git a/arch/arm/configs/sunxi_defconfig b/arch/arm/configs/sunxi_defconfig index bb6b279dc3b7..3b1aa1a1d07f 100644 --- a/arch/arm/configs/sunxi_defconfig +++ b/arch/arm/configs/sunxi_defconfig @@ -108,7 +108,10 @@ CONFIG_SOUND=y CONFIG_SND=y CONFIG_SND_SOC=y CONFIG_SND_SUN4I_CODEC=y +CONFIG_SND_SUN8I_CODEC=y CONFIG_SND_SUN8I_CODEC_ANALOG=y +CONFIG_SND_SUN4I_I2S=y +CONFIG_SND_SUN4I_SPDIF=y CONFIG_USB=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_EHCI_HCD_PLATFORM=y From c822a3ec1700f392bbb46b8526e2a0bc53d9df49 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Sun, 5 Jul 2020 11:19:02 +0200 Subject: [PATCH 06/10] ARM: configs: sunxi: Add DRM output-related options We're missing a bunch of options related to the DRM driver options (panels, HDMI, CEC) that seems useful. Let's add them in the defconfig. Signed-off-by: Maxime Ripard Link: https://lore.kernel.org/r/20200705091904.42795-5-maxime@cerno.tech Acked-by: Chen-Yu Tsai --- arch/arm/configs/sunxi_defconfig | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/arch/arm/configs/sunxi_defconfig b/arch/arm/configs/sunxi_defconfig index 3b1aa1a1d07f..117e9215c8fe 100644 --- a/arch/arm/configs/sunxi_defconfig +++ b/arch/arm/configs/sunxi_defconfig @@ -102,8 +102,15 @@ CONFIG_VIDEO_SUN8I_DEINTERLACE=y CONFIG_VIDEO_SUN8I_ROTATE=y CONFIG_DRM=y CONFIG_DRM_SUN4I=y +CONFIG_DRM_SUN4I_HDMI_CEC=y +CONFIG_DRM_SUN8I_DW_HDMI=y +CONFIG_DRM_PANEL_LVDS=y +CONFIG_DRM_PANEL_SIMPLE=y CONFIG_DRM_SIMPLE_BRIDGE=y CONFIG_FB_SIMPLE=y +CONFIG_BACKLIGHT_CLASS_DEVICE=y +# CONFIG_BACKLIGHT_GENERIC is not set +CONFIG_BACKLIGHT_PWM=y CONFIG_SOUND=y CONFIG_SND=y CONFIG_SND_SOC=y From db33b1f5fd9386c11904a27b4d91a5918dc7d503 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Sun, 5 Jul 2020 11:19:04 +0200 Subject: [PATCH 07/10] ARM: configs: sunxi: Enable Lima Lima is fairly stable now, so let's enable it by default. Signed-off-by: Maxime Ripard Link: https://lore.kernel.org/r/20200705091904.42795-7-maxime@cerno.tech Acked-by: Chen-Yu Tsai --- arch/arm/configs/sunxi_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm/configs/sunxi_defconfig b/arch/arm/configs/sunxi_defconfig index 117e9215c8fe..da1532a972bb 100644 --- a/arch/arm/configs/sunxi_defconfig +++ b/arch/arm/configs/sunxi_defconfig @@ -107,6 +107,7 @@ CONFIG_DRM_SUN8I_DW_HDMI=y CONFIG_DRM_PANEL_LVDS=y CONFIG_DRM_PANEL_SIMPLE=y CONFIG_DRM_SIMPLE_BRIDGE=y +CONFIG_DRM_LIMA=y CONFIG_FB_SIMPLE=y CONFIG_BACKLIGHT_CLASS_DEVICE=y # CONFIG_BACKLIGHT_GENERIC is not set From 508d4549e8de4bd91b44b79c465e4f3bdaf7d803 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Mon, 6 Jul 2020 15:23:21 +0200 Subject: [PATCH 08/10] ARM: configs: sunxi: Enable the PS/2 controller The A20 has a PS/2 controller and we have a driver for it, so let's enable it in our defconfig. Signed-off-by: Maxime Ripard Acked-by: Chen-Yu Tsai Link: https://lore.kernel.org/r/20200706132323.147562-1-maxime@cerno.tech --- arch/arm/configs/sunxi_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm/configs/sunxi_defconfig b/arch/arm/configs/sunxi_defconfig index da1532a972bb..f15c5fffa050 100644 --- a/arch/arm/configs/sunxi_defconfig +++ b/arch/arm/configs/sunxi_defconfig @@ -59,6 +59,7 @@ CONFIG_INPUT_TOUCHSCREEN=y CONFIG_TOUCHSCREEN_SUN4I=y CONFIG_INPUT_MISC=y CONFIG_INPUT_AXP20X_PEK=y +CONFIG_SERIO_SUN4I_PS2=y CONFIG_SERIAL_8250=y CONFIG_SERIAL_8250_CONSOLE=y CONFIG_SERIAL_8250_NR_UARTS=8 From 80dcf024929788f155aaff3d2cffb4975ce1e3fd Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Mon, 6 Jul 2020 15:23:22 +0200 Subject: [PATCH 09/10] ARM: sunxi: configs: Enable the Mailbox driver The mailbox found on the A31 and later SoCs have recently gained some support in Linux. Since it's going to be useful for crust, let's enable it in our defconfig. Signed-off-by: Maxime Ripard Acked-by: Chen-Yu Tsai Link: https://lore.kernel.org/r/20200706132323.147562-2-maxime@cerno.tech --- arch/arm/configs/sunxi_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm/configs/sunxi_defconfig b/arch/arm/configs/sunxi_defconfig index f15c5fffa050..305bbe971474 100644 --- a/arch/arm/configs/sunxi_defconfig +++ b/arch/arm/configs/sunxi_defconfig @@ -149,6 +149,7 @@ CONFIG_STAGING=y CONFIG_STAGING_MEDIA=y CONFIG_VIDEO_SUNXI=y CONFIG_VIDEO_SUNXI_CEDRUS=y +CONFIG_MAILBOX=y # CONFIG_IOMMU_SUPPORT is not set CONFIG_IIO=y CONFIG_AXP20X_ADC=y From 6129225fb6e409257fce183165df5c5d1852e397 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Mon, 6 Jul 2020 15:23:23 +0200 Subject: [PATCH 10/10] ARM: configs: sunxi: Enable crypto related options Some crypto drivers were not enabled so far, so let's make sure we have them compiled in our defconfig. Signed-off-by: Maxime Ripard Acked-by: Chen-Yu Tsai Link: https://lore.kernel.org/r/20200706132323.147562-3-maxime@cerno.tech --- arch/arm/configs/sunxi_defconfig | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/arm/configs/sunxi_defconfig b/arch/arm/configs/sunxi_defconfig index 305bbe971474..244126172fd6 100644 --- a/arch/arm/configs/sunxi_defconfig +++ b/arch/arm/configs/sunxi_defconfig @@ -168,7 +168,9 @@ CONFIG_ROOT_NFS=y CONFIG_NLS_CODEPAGE_437=y CONFIG_NLS_ISO8859_1=y CONFIG_CRYPTO_DEV_SUN4I_SS=y +CONFIG_CRYPTO_DEV_SUN4I_SS_PRNG=y CONFIG_CRYPTO_DEV_SUN8I_CE=y +CONFIG_CRYPTO_DEV_SUN8I_SS=y CONFIG_DMA_CMA=y CONFIG_PRINTK_TIME=y CONFIG_DEBUG_FS=y