LinuxLists.cc - [PATCH] ARM: sunxi: Re-enable SID driver in multi_v7

2015-11-17 01:49:32

Subject: [PATCH] ARM: sunxi: Re-enable SID driver in multi_v7_defconfig

Commit 3d0b16a66c8a ("nvmem: sunxi: Move the SID driver to the nvmem
framework") moved the the sunxi SID driver to a new framework, but left
multi_v7_defconfig with the deprecated config symbol EEPROM_SUNXI_SID
instead of the new symbold NVMEM_SUNXI_SID. Hence, re-enable the driver
in multi_v7_defconfig.

While at it, clean up multi_v7_defconfig by generating a fresh file via
make multi_v7_defconfig
make savedefconfig
While this moves around a few lines and removes unnecessary symbols,
it doesn't introduce any functional changes.

Signed-off-by: Timo Sigurdsson <[email protected]>

diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig
index 69a22fd..f712ea3 100644
--- a/arch/arm/configs/multi_v7_defconfig
+++ b/arch/arm/configs/multi_v7_defconfig
@@ -12,7 +12,6 @@ CONFIG_MODULE_UNLOAD=y
CONFIG_PARTITION_ADVANCED=y
CONFIG_CMDLINE_PARTITION=y
CONFIG_ARCH_VIRT=y
-CONFIG_ARCH_ALPINE=y
CONFIG_ARCH_MVEBU=y
CONFIG_MACH_ARMADA_370=y
CONFIG_MACH_ARMADA_375=y
@@ -20,6 +19,7 @@ CONFIG_MACH_ARMADA_38X=y
CONFIG_MACH_ARMADA_39X=y
CONFIG_MACH_ARMADA_XP=y
CONFIG_MACH_DOVE=y
+CONFIG_ARCH_ALPINE=y
CONFIG_ARCH_AT91=y
CONFIG_SOC_SAMA5D2=y
CONFIG_SOC_SAMA5D3=y
@@ -27,9 +27,9 @@ CONFIG_SOC_SAMA5D4=y
CONFIG_ARCH_BCM=y
CONFIG_ARCH_BCM_CYGNUS=y
CONFIG_ARCH_BCM_NSP=y
-CONFIG_ARCH_BCM_21664=y
-CONFIG_ARCH_BCM_281XX=y
CONFIG_ARCH_BCM_5301X=y
+CONFIG_ARCH_BCM_281XX=y
+CONFIG_ARCH_BCM_21664=y
CONFIG_ARCH_BRCMSTB=y
CONFIG_ARCH_BERLIN=y
CONFIG_MACH_BERLIN_BG2=y
@@ -39,9 +39,9 @@ CONFIG_ARCH_DIGICOLOR=y
CONFIG_ARCH_HIGHBANK=y
CONFIG_ARCH_HISI=y
CONFIG_ARCH_HI3xxx=y
-CONFIG_ARCH_HIX5HD2=y
CONFIG_ARCH_HIP01=y
CONFIG_ARCH_HIP04=y
+CONFIG_ARCH_HIX5HD2=y
CONFIG_ARCH_KEYSTONE=y
CONFIG_ARCH_MESON=y
CONFIG_ARCH_MXC=y
@@ -53,8 +53,9 @@ CONFIG_SOC_IMX6SL=y
CONFIG_SOC_IMX6SX=y
CONFIG_SOC_IMX6UL=y
CONFIG_SOC_IMX7D=y
-CONFIG_SOC_VF610=y
CONFIG_SOC_LS1021A=y
+CONFIG_SOC_VF610=y
+CONFIG_ARCH_MEDIATEK=y
CONFIG_ARCH_OMAP3=y
CONFIG_ARCH_OMAP4=y
CONFIG_SOC_OMAP5=y
@@ -62,7 +63,6 @@ CONFIG_SOC_AM33XX=y
CONFIG_SOC_AM43XX=y
CONFIG_SOC_DRA7XX=y
CONFIG_ARCH_QCOM=y
-CONFIG_ARCH_MEDIATEK=y
CONFIG_ARCH_MSM8X60=y
CONFIG_ARCH_MSM8960=y
CONFIG_ARCH_MSM8974=y
@@ -94,30 +94,22 @@ CONFIG_ARCH_TEGRA_2x_SOC=y
CONFIG_ARCH_TEGRA_3x_SOC=y
CONFIG_ARCH_TEGRA_114_SOC=y
CONFIG_ARCH_TEGRA_124_SOC=y
-CONFIG_TEGRA_EMC_SCALING_ENABLE=y
CONFIG_ARCH_UNIPHIER=y
CONFIG_ARCH_U8500=y
CONFIG_MACH_HREFV60=y
CONFIG_MACH_SNOWBALL=y
-CONFIG_MACH_UX500_DT=y
CONFIG_ARCH_VEXPRESS=y
-CONFIG_ARCH_VEXPRESS_CA9X4=y
CONFIG_ARCH_VEXPRESS_TC2_PM=y
CONFIG_ARCH_WM8850=y
CONFIG_ARCH_ZYNQ=y
-CONFIG_TRUSTED_FOUNDATIONS=y
-CONFIG_PCI=y
-CONFIG_PCI_HOST_GENERIC=y
-CONFIG_PCI_KEYSTONE=y
CONFIG_PCI_MSI=y
CONFIG_PCI_MVEBU=y
CONFIG_PCI_TEGRA=y
CONFIG_PCI_RCAR_GEN2=y
CONFIG_PCI_RCAR_GEN2_PCIE=y
-CONFIG_PCIEPORTBUS=y
+CONFIG_PCI_KEYSTONE=y
CONFIG_SMP=y
CONFIG_NR_CPUS=16
-CONFIG_HIGHPTE=y
CONFIG_CMA=y
CONFIG_ARM_APPENDED_DTB=y
CONFIG_ARM_ATAG_DTB_COMPAT=y
@@ -125,12 +117,12 @@ CONFIG_KEXEC=y
CONFIG_CPU_FREQ=y
CONFIG_CPU_FREQ_STAT_DETAILS=y
CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
+CONFIG_CPUFREQ_DT=y
CONFIG_CPU_IDLE=y
CONFIG_ARM_CPUIDLE=y
-CONFIG_NEON=y
-CONFIG_KERNEL_MODE_NEON=y
CONFIG_ARM_ZYNQ_CPUIDLE=y
CONFIG_ARM_EXYNOS_CPUIDLE=y
+CONFIG_KERNEL_MODE_NEON=y
CONFIG_NET=y
CONFIG_PACKET=y
CONFIG_UNIX=y
@@ -148,13 +140,10 @@ CONFIG_IPV6_MIP6=m
CONFIG_IPV6_TUNNEL=m
CONFIG_IPV6_MULTIPLE_TABLES=y
CONFIG_CAN=y
-CONFIG_CAN_RAW=y
-CONFIG_CAN_BCM=y
-CONFIG_CAN_DEV=y
CONFIG_CAN_AT91=m
+CONFIG_CAN_SUN4I=y
CONFIG_CAN_XILINXCAN=y
CONFIG_CAN_MCP251X=y
-CONFIG_CAN_SUN4I=y
CONFIG_BT=m
CONFIG_BT_MRVL=m
CONFIG_BT_MRVL_SDIO=m
@@ -188,10 +177,8 @@ CONFIG_ATMEL_SSC=m
CONFIG_APDS9802ALS=y
CONFIG_ISL29003=y
CONFIG_EEPROM_AT24=y
-CONFIG_EEPROM_SUNXI_SID=y
CONFIG_BLK_DEV_SD=y
CONFIG_BLK_DEV_SR=y
-CONFIG_SCSI_MULTI_LUN=y
CONFIG_ATA=y
CONFIG_SATA_AHCI=y
CONFIG_SATA_AHCI_PLATFORM=y
@@ -202,10 +189,10 @@ CONFIG_SATA_HIGHBANK=y
CONFIG_SATA_MV=y
CONFIG_SATA_RCAR=y
CONFIG_NETDEVICES=y
-CONFIG_HIX5HD2_GMAC=y
CONFIG_SUN4I_EMAC=y
CONFIG_MACB=y
CONFIG_NET_CALXEDA_XGMAC=y
+CONFIG_HIX5HD2_GMAC=y
CONFIG_IGB=y
CONFIG_MV643XX_ETH=y
CONFIG_MVNETA=y
@@ -223,7 +210,6 @@ CONFIG_SMSC_PHY=y
CONFIG_BROADCOM_PHY=y
CONFIG_ICPLUS_PHY=y
CONFIG_MICREL_PHY=y
-CONFIG_FIXED_PHY=y
CONFIG_USB_PEGASUS=y
CONFIG_USB_RTL8152=m
CONFIG_USB_USBNET=y
@@ -239,18 +225,18 @@ CONFIG_INPUT_EVDEV=y
CONFIG_KEYBOARD_QT1070=m
CONFIG_KEYBOARD_GPIO=y
CONFIG_KEYBOARD_TEGRA=y
-CONFIG_KEYBOARD_SPEAR=y
CONFIG_KEYBOARD_ST_KEYSCAN=y
+CONFIG_KEYBOARD_SPEAR=y
CONFIG_KEYBOARD_CROS_EC=y
CONFIG_MOUSE_PS2_ELANTECH=y
CONFIG_MOUSE_CYAPA=m
CONFIG_MOUSE_ELAN_I2C=y
CONFIG_INPUT_TOUCHSCREEN=y
CONFIG_TOUCHSCREEN_ATMEL_MXT=y
+CONFIG_TOUCHSCREEN_WM97XX=m
CONFIG_TOUCHSCREEN_ST1232=m
CONFIG_TOUCHSCREEN_STMPE=y
CONFIG_TOUCHSCREEN_SUN4I=y
-CONFIG_TOUCHSCREEN_WM97XX=m
CONFIG_INPUT_MISC=y
CONFIG_INPUT_MPU3050=y
CONFIG_INPUT_AXP20X_PEK=y
@@ -295,17 +281,16 @@ CONFIG_SERIAL_CONEXANT_DIGICOLOR_CONSOLE=y
CONFIG_SERIAL_ST_ASC=y
CONFIG_SERIAL_ST_ASC_CONSOLE=y
CONFIG_I2C_CHARDEV=y
-CONFIG_I2C_DAVINCI=y
CONFIG_I2C_MUX=y
CONFIG_I2C_ARB_GPIO_CHALLENGE=m
CONFIG_I2C_MUX_PCA954x=y
CONFIG_I2C_MUX_PINCTRL=y
CONFIG_I2C_AT91=m
CONFIG_I2C_CADENCE=y
+CONFIG_I2C_DAVINCI=y
CONFIG_I2C_DESIGNWARE_PLATFORM=y
CONFIG_I2C_DIGICOLOR=m
CONFIG_I2C_GPIO=m
-CONFIG_I2C_EXYNOS5=y
CONFIG_I2C_MV64XXX=y
CONFIG_I2C_RIIC=y
CONFIG_I2C_RK3X=y
@@ -345,21 +330,20 @@ CONFIG_PINCTRL_PALMAS=y
CONFIG_PINCTRL_APQ8064=y
CONFIG_PINCTRL_APQ8084=y
CONFIG_GPIO_SYSFS=y
-CONFIG_GPIO_GENERIC_PLATFORM=y
CONFIG_GPIO_DAVINCI=y
CONFIG_GPIO_DWAPB=y
CONFIG_GPIO_EM=y
CONFIG_GPIO_RCAR=y
+CONFIG_GPIO_SYSCON=y
CONFIG_GPIO_XILINX=y
CONFIG_GPIO_ZYNQ=y
CONFIG_GPIO_PCA953X=y
CONFIG_GPIO_PCA953X_IRQ=y
CONFIG_GPIO_PCF857X=y
-CONFIG_GPIO_TWL4030=y
CONFIG_GPIO_PALMAS=y
-CONFIG_GPIO_SYSCON=y
CONFIG_GPIO_TPS6586X=y
CONFIG_GPIO_TPS65910=y
+CONFIG_GPIO_TWL4030=y
CONFIG_BATTERY_SBS=y
CONFIG_BATTERY_MAX17040=m
CONFIG_BATTERY_MAX17042=m
@@ -370,25 +354,24 @@ CONFIG_POWER_RESET_AS3722=y
CONFIG_POWER_RESET_GPIO=y
CONFIG_POWER_RESET_GPIO_RESTART=y
CONFIG_POWER_RESET_KEYSTONE=y
+CONFIG_POWER_RESET_SYSCON=y
CONFIG_POWER_RESET_RMOBILE=y
CONFIG_SENSORS_LM90=y
CONFIG_SENSORS_LM95245=y
CONFIG_SENSORS_NTC_THERMISTOR=m
-CONFIG_THERMAL=y
CONFIG_CPU_THERMAL=y
CONFIG_ROCKCHIP_THERMAL=y
CONFIG_RCAR_THERMAL=y
CONFIG_ARMADA_THERMAL=y
-CONFIG_DAVINCI_WATCHDOG=m
-CONFIG_EXYNOS_THERMAL=m
CONFIG_ST_THERMAL_SYSCFG=y
CONFIG_ST_THERMAL_MEMMAP=y
CONFIG_WATCHDOG=y
CONFIG_XILINX_WATCHDOG=y
CONFIG_ARM_SP805_WATCHDOG=y
+CONFIG_DAVINCI_WATCHDOG=m
CONFIG_ORION_WATCHDOG=y
-CONFIG_ST_LPC_WATCHDOG=y
CONFIG_SUNXI_WATCHDOG=y
+CONFIG_ST_LPC_WATCHDOG=y
CONFIG_TEGRA_WATCHDOG=m
CONFIG_MESON_WATCHDOG=y
CONFIG_DIGICOLOR_WATCHDOG=y
@@ -404,27 +387,24 @@ CONFIG_MFD_MAX14577=y
CONFIG_MFD_MAX77686=y
CONFIG_MFD_MAX77693=y
CONFIG_MFD_MAX8907=y
-CONFIG_MFD_RK808=y
CONFIG_MFD_PM8921_CORE=y
CONFIG_MFD_QCOM_RPM=y
+CONFIG_MFD_RK808=y
CONFIG_MFD_SEC_CORE=y
CONFIG_MFD_STMPE=y
CONFIG_MFD_PALMAS=y
CONFIG_MFD_TPS65090=y
CONFIG_MFD_TPS6586X=y
CONFIG_MFD_TPS65910=y
-CONFIG_REGULATOR_AB8500=y
CONFIG_REGULATOR_ACT8865=y
+CONFIG_REGULATOR_AB8500=y
CONFIG_REGULATOR_AS3711=y
CONFIG_REGULATOR_AS3722=y
CONFIG_REGULATOR_AXP20X=y
CONFIG_REGULATOR_BCM590XX=y
CONFIG_REGULATOR_DA9210=y
CONFIG_REGULATOR_FAN53555=y
-CONFIG_REGULATOR_RK808=y
CONFIG_REGULATOR_GPIO=y
-CONFIG_MFD_SYSCON=y
-CONFIG_POWER_RESET_SYSCON=y
CONFIG_REGULATOR_MAX14577=m
CONFIG_REGULATOR_MAX8907=y
CONFIG_REGULATOR_MAX8973=y
@@ -436,6 +416,7 @@ CONFIG_REGULATOR_PBIAS=y
CONFIG_REGULATOR_PWM=m
CONFIG_REGULATOR_QCOM_RPM=y
CONFIG_REGULATOR_QCOM_SMD_RPM=y
+CONFIG_REGULATOR_RK808=y
CONFIG_REGULATOR_S2MPS11=y
CONFIG_REGULATOR_S5M8767=y
CONFIG_REGULATOR_TPS51632=y
@@ -450,8 +431,7 @@ CONFIG_MEDIA_CAMERA_SUPPORT=y
CONFIG_MEDIA_CONTROLLER=y
CONFIG_VIDEO_V4L2_SUBDEV_API=y
CONFIG_MEDIA_USB_SUPPORT=y
-CONFIG_USB_VIDEO_CLASS=y
-CONFIG_USB_GSPCA=y
+CONFIG_USB_VIDEO_CLASS=m
CONFIG_V4L_PLATFORM_DRIVERS=y
CONFIG_SOC_CAMERA=m
CONFIG_SOC_CAMERA_PLATFORM=m
@@ -465,28 +445,25 @@ CONFIG_DRM=y
CONFIG_DRM_I2C_ADV7511=m
# CONFIG_DRM_I2C_CH7006 is not set
# CONFIG_DRM_I2C_SIL164 is not set
-CONFIG_DRM_NXP_PTN3460=m
-CONFIG_DRM_PARADE_PS8622=m
CONFIG_DRM_NOUVEAU=m
CONFIG_DRM_EXYNOS=m
-CONFIG_DRM_EXYNOS_DSI=y
CONFIG_DRM_EXYNOS_FIMD=y
-CONFIG_DRM_EXYNOS_HDMI=y
+CONFIG_DRM_EXYNOS_DSI=y
CONFIG_DRM_ROCKCHIP=m
CONFIG_ROCKCHIP_DW_HDMI=m
CONFIG_DRM_RCAR_DU=m
CONFIG_DRM_RCAR_HDMI=y
CONFIG_DRM_RCAR_LVDS=y
CONFIG_DRM_TEGRA=y
-CONFIG_DRM_PANEL_SAMSUNG_S6E8AA0=m
CONFIG_DRM_PANEL_SIMPLE=y
+CONFIG_DRM_PANEL_SAMSUNG_S6E8AA0=m
+CONFIG_DRM_NXP_PTN3460=m
+CONFIG_DRM_PARADE_PS8622=m
CONFIG_FB_ARMCLCD=y
CONFIG_FB_WM8505=y
CONFIG_FB_SH_MOBILE_LCDC=y
CONFIG_FB_SIMPLE=y
CONFIG_FB_SH_MOBILE_MERAM=y
-CONFIG_BACKLIGHT_LCD_SUPPORT=y
-CONFIG_BACKLIGHT_CLASS_DEVICE=y
CONFIG_LCD_PLATFORM=m
CONFIG_BACKLIGHT_PWM=y
CONFIG_BACKLIGHT_AS3711=y
@@ -500,7 +477,7 @@ CONFIG_SND_HDA_INPUT_BEEP=y
CONFIG_SND_HDA_PATCH_LOADER=y
CONFIG_SND_HDA_CODEC_REALTEK=m
CONFIG_SND_HDA_CODEC_HDMI=m
-CONFIG_SND_USB_AUDIO=y
+CONFIG_SND_USB_AUDIO=m
CONFIG_SND_SOC=m
CONFIG_SND_ATMEL_SOC=m
CONFIG_SND_ATMEL_SOC_WM8904=m
@@ -521,15 +498,12 @@ CONFIG_USB=y
CONFIG_USB_XHCI_HCD=y
CONFIG_USB_XHCI_MVEBU=y
CONFIG_USB_EHCI_HCD=y
+CONFIG_USB_EHCI_HCD_STI=y
CONFIG_USB_EHCI_MSM=m
-CONFIG_USB_EHCI_EXYNOS=y
CONFIG_USB_EHCI_TEGRA=y
-CONFIG_USB_EHCI_HCD_STI=y
-CONFIG_USB_EHCI_HCD_PLATFORM=y
-CONFIG_USB_ISP1760=y
+CONFIG_USB_EHCI_EXYNOS=y
CONFIG_USB_OHCI_HCD=y
CONFIG_USB_OHCI_HCD_STI=y
-CONFIG_USB_OHCI_HCD_PLATFORM=y
CONFIG_USB_OHCI_EXYNOS=m
CONFIG_USB_R8A66597_HCD=m
CONFIG_USB_RENESAS_USBHS=m
@@ -538,9 +512,9 @@ CONFIG_USB_DWC3=y
CONFIG_USB_DWC2=m
CONFIG_USB_CHIPIDEA=y
CONFIG_USB_CHIPIDEA_HOST=y
+CONFIG_USB_ISP1760=y
CONFIG_AB8500_USB=y
CONFIG_KEYSTONE_USB_PHY=y
-CONFIG_OMAP_USB3=y
CONFIG_USB_GPIO_VBUS=y
CONFIG_USB_ISP1301=y
CONFIG_USB_MSM_OTG=m
@@ -559,9 +533,9 @@ CONFIG_MMC_SDHCI_OF_AT91=y
CONFIG_MMC_SDHCI_ESDHC_IMX=y
CONFIG_MMC_SDHCI_DOVE=y
CONFIG_MMC_SDHCI_TEGRA=y
+CONFIG_MMC_SDHCI_S3C=y
CONFIG_MMC_SDHCI_PXAV3=y
CONFIG_MMC_SDHCI_SPEAR=y
-CONFIG_MMC_SDHCI_S3C=y
CONFIG_MMC_SDHCI_S3C_DMA=y
CONFIG_MMC_SDHCI_BCM_KONA=y
CONFIG_MMC_SDHCI_ST=y
@@ -571,8 +545,6 @@ CONFIG_MMC_ATMELMCI=y
CONFIG_MMC_MVSDIO=y
CONFIG_MMC_SDHI=y
CONFIG_MMC_DW=y
-CONFIG_MMC_DW_IDMAC=y
-CONFIG_MMC_DW_PLTFM=y
CONFIG_MMC_DW_EXYNOS=y
CONFIG_MMC_DW_ROCKCHIP=y
CONFIG_MMC_SH_MMCIF=y
@@ -605,15 +577,14 @@ CONFIG_RTC_DRV_RK808=m
CONFIG_RTC_DRV_MAX77802=m
CONFIG_RTC_DRV_RS5C372=m
CONFIG_RTC_DRV_PALMAS=y
-CONFIG_RTC_DRV_ST_LPC=y
CONFIG_RTC_DRV_TWL4030=y
CONFIG_RTC_DRV_TPS6586X=y
CONFIG_RTC_DRV_TPS65910=y
CONFIG_RTC_DRV_S35390A=m
CONFIG_RTC_DRV_RX8581=m
CONFIG_RTC_DRV_EM3027=y
-CONFIG_RTC_DRV_DIGICOLOR=m
CONFIG_RTC_DRV_S5M=m
+CONFIG_RTC_DRV_DIGICOLOR=m
CONFIG_RTC_DRV_S3C=m
CONFIG_RTC_DRV_PL031=y
CONFIG_RTC_DRV_AT91RM9200=m
@@ -623,25 +594,26 @@ CONFIG_RTC_DRV_SUN6I=y
CONFIG_RTC_DRV_SUNXI=y
CONFIG_RTC_DRV_MV=y
CONFIG_RTC_DRV_TEGRA=y
+CONFIG_RTC_DRV_ST_LPC=y
CONFIG_DMADEVICES=y
-CONFIG_DW_DMAC=y
CONFIG_AT_HDMAC=y
CONFIG_AT_XDMAC=y
-CONFIG_MV_XOR=y
-CONFIG_TEGRA20_APB_DMA=y
-CONFIG_SH_DMAE=y
-CONFIG_RCAR_DMAC=y
-CONFIG_STE_DMA40=y
-CONFIG_SIRF_DMA=y
-CONFIG_TI_EDMA=y
-CONFIG_PL330_DMA=y
-CONFIG_IMX_SDMA=y
+CONFIG_DMA_OMAP=y
+CONFIG_DMA_SUN6I=y
CONFIG_IMX_DMA=y
+CONFIG_IMX_SDMA=y
+CONFIG_MV_XOR=y
CONFIG_MXS_DMA=y
-CONFIG_DMA_OMAP=y
+CONFIG_PL330_DMA=y
CONFIG_QCOM_BAM_DMA=y
+CONFIG_SIRF_DMA=y
+CONFIG_STE_DMA40=y
+CONFIG_TEGRA20_APB_DMA=y
+CONFIG_TI_EDMA=y
CONFIG_XILINX_VDMA=y
-CONFIG_DMA_SUN6I=y
+CONFIG_DW_DMAC=y
+CONFIG_SH_DMAE=y
+CONFIG_RCAR_DMAC=y
CONFIG_STAGING=y
CONFIG_SENSORS_ISL29018=y
CONFIG_SENSORS_ISL29028=y
@@ -650,17 +622,11 @@ CONFIG_KEYBOARD_NVEC=y
CONFIG_SERIO_NVEC_PS2=y
CONFIG_NVEC_POWER=y
CONFIG_NVEC_PAZ00=y
-CONFIG_QCOM_GSBI=y
-CONFIG_QCOM_PM=y
-CONFIG_QCOM_SMD=y
-CONFIG_QCOM_SMD_RPM=y
-CONFIG_QCOM_SMEM=y
-CONFIG_COMMON_CLK_QCOM=y
-CONFIG_CHROME_PLATFORMS=y
CONFIG_CROS_EC_CHARDEV=m
CONFIG_COMMON_CLK_MAX77686=y
CONFIG_COMMON_CLK_MAX77802=m
CONFIG_COMMON_CLK_S2MPS11=m
+CONFIG_COMMON_CLK_QCOM=y
CONFIG_APQ_MMCC_8084=y
CONFIG_MSM_GCC_8660=y
CONFIG_MSM_MMCC_8960=y
@@ -669,10 +635,13 @@ CONFIG_HWSPINLOCK_QCOM=y
CONFIG_ROCKCHIP_IOMMU=y
CONFIG_TEGRA_IOMMU_GART=y
CONFIG_TEGRA_IOMMU_SMMU=y
+CONFIG_QCOM_GSBI=y
+CONFIG_QCOM_PM=y
+CONFIG_QCOM_SMEM=y
+CONFIG_QCOM_SMD=y
+CONFIG_QCOM_SMD_RPM=y
CONFIG_PM_DEVFREQ=y
CONFIG_ARM_TEGRA_DEVFREQ=m
-CONFIG_MEMORY=y
-CONFIG_EXTCON=y
CONFIG_TI_AEMIF=y
CONFIG_IIO=y
CONFIG_AT91_ADC=m
@@ -686,25 +655,28 @@ CONFIG_PWM_ATMEL_TCB=m
CONFIG_PWM_RENESAS_TPU=y
CONFIG_PWM_ROCKCHIP=m
CONFIG_PWM_SAMSUNG=m
+CONFIG_PWM_STI=m
CONFIG_PWM_SUN4I=y
CONFIG_PWM_TEGRA=y
CONFIG_PWM_VT8500=y
-CONFIG_PHY_HIX5HD2_SATA=y
-CONFIG_PWM_STI=m
-CONFIG_OMAP_USB2=y
-CONFIG_TI_PIPE3=y
+CONFIG_KEYSTONE_IRQ=y
CONFIG_PHY_BERLIN_USB=y
CONFIG_PHY_BERLIN_SATA=y
-CONFIG_PHY_ROCKCHIP_USB=m
-CONFIG_PHY_QCOM_APQ8064_SATA=m
CONFIG_PHY_MIPHY28LP=y
CONFIG_PHY_MIPHY365X=y
CONFIG_PHY_RCAR_GEN2=m
-CONFIG_PHY_STIH41X_USB=y
-CONFIG_PHY_STIH407_USB=y
+CONFIG_OMAP_USB2=y
+CONFIG_TI_PIPE3=y
+CONFIG_PHY_HIX5HD2_SATA=y
CONFIG_PHY_SUN4I_USB=y
CONFIG_PHY_SUN9I_USB=y
CONFIG_PHY_SAMSUNG_USB2=m
+CONFIG_PHY_QCOM_APQ8064_SATA=m
+CONFIG_PHY_ROCKCHIP_USB=m
+CONFIG_PHY_STIH407_USB=y
+CONFIG_PHY_STIH41X_USB=y
+CONFIG_NVMEM=y
+CONFIG_NVMEM_SUNXI_SID=y
CONFIG_EXT4_FS=y
CONFIG_AUTOFS4_FS=y
CONFIG_MSDOS_FS=y
@@ -712,7 +684,6 @@ CONFIG_VFAT_FS=y
CONFIG_NTFS_FS=y
CONFIG_TMPFS_POSIX_ACL=y
CONFIG_UBIFS_FS=y
-CONFIG_TMPFS=y
CONFIG_SQUASHFS=y
CONFIG_SQUASHFS_LZO=y
CONFIG_SQUASHFS_XZ=y
@@ -727,21 +698,15 @@ CONFIG_PRINTK_TIME=y
CONFIG_DEBUG_FS=y
CONFIG_MAGIC_SYSRQ=y
CONFIG_LOCKUP_DETECTOR=y
-CONFIG_CRYPTO_DEV_TEGRA_AES=y
-CONFIG_CPUFREQ_DT=y
-CONFIG_KEYSTONE_IRQ=y
+CONFIG_CRYPTO_DEV_ATMEL_AES=m
+CONFIG_CRYPTO_DEV_ATMEL_TDES=m
+CONFIG_CRYPTO_DEV_ATMEL_SHA=m
CONFIG_CRYPTO_DEV_SUN4I_SS=m
CONFIG_ARM_CRYPTO=y
-CONFIG_CRYPTO_SHA1_ARM=m
CONFIG_CRYPTO_SHA1_ARM_NEON=m
CONFIG_CRYPTO_SHA1_ARM_CE=m
CONFIG_CRYPTO_SHA2_ARM_CE=m
-CONFIG_CRYPTO_SHA256_ARM=m
CONFIG_CRYPTO_SHA512_ARM=m
-CONFIG_CRYPTO_AES_ARM=m
CONFIG_CRYPTO_AES_ARM_BS=m
CONFIG_CRYPTO_AES_ARM_CE=m
CONFIG_CRYPTO_GHASH_ARM_CE=m
-CONFIG_CRYPTO_DEV_ATMEL_AES=m
-CONFIG_CRYPTO_DEV_ATMEL_TDES=m
-CONFIG_CRYPTO_DEV_ATMEL_SHA=m
--
2.1.4

2015-11-17 02:11:08

by Krzysztof Kozlowski

[permalink] [raw]

Subject: Re: [PATCH] ARM: sunxi: Re-enable SID driver in multi_v7_defconfig

On 17.11.2015 10:49, Timo Sigurdsson wrote:
> Commit 3d0b16a66c8a ("nvmem: sunxi: Move the SID driver to the nvmem
> framework") moved the the sunxi SID driver to a new framework, but left
> multi_v7_defconfig with the deprecated config symbol EEPROM_SUNXI_SID
> instead of the new symbold NVMEM_SUNXI_SID. Hence, re-enable the driver
> in multi_v7_defconfig.
>
> While at it, clean up multi_v7_defconfig by generating a fresh file via
> make multi_v7_defconfig
> make savedefconfig
> While this moves around a few lines and removes unnecessary symbols,
> it doesn't introduce any functional changes.

Split it per change. One change is savedefconfig and second is removing
or enabling other drivers.

On which tree you generated the defconfig? There is a minor nit below
(at least for Exynos platform, I did not checked the others).

>
> Signed-off-by: Timo Sigurdsson <[email protected]>
>
> diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig
> index 69a22fd..f712ea3 100644
> --- a/arch/arm/configs/multi_v7_defconfig
> +++ b/arch/arm/configs/multi_v7_defconfig

(...)

> @@ -450,8 +431,7 @@ CONFIG_MEDIA_CAMERA_SUPPORT=y
> CONFIG_MEDIA_CONTROLLER=y
> CONFIG_VIDEO_V4L2_SUBDEV_API=y
> CONFIG_MEDIA_USB_SUPPORT=y
> -CONFIG_USB_VIDEO_CLASS=y
> -CONFIG_USB_GSPCA=y
> +CONFIG_USB_VIDEO_CLASS=m
> CONFIG_V4L_PLATFORM_DRIVERS=y
> CONFIG_SOC_CAMERA=m
> CONFIG_SOC_CAMERA_PLATFORM=m
> @@ -465,28 +445,25 @@ CONFIG_DRM=y
> CONFIG_DRM_I2C_ADV7511=m
> # CONFIG_DRM_I2C_CH7006 is not set
> # CONFIG_DRM_I2C_SIL164 is not set
> -CONFIG_DRM_NXP_PTN3460=m
> -CONFIG_DRM_PARADE_PS8622=m
> CONFIG_DRM_NOUVEAU=m
> CONFIG_DRM_EXYNOS=m
> -CONFIG_DRM_EXYNOS_DSI=y
> CONFIG_DRM_EXYNOS_FIMD=y
> -CONFIG_DRM_EXYNOS_HDMI=y

I would prefer leaving the EXYNOS_HDMI. Dependencies are now not enabled
but we are fixing it in:
http://www.spinics.net/lists/dri-devel/msg93299.html

Best regards,
Krzysztof

> +CONFIG_DRM_EXYNOS_DSI=y
> CONFIG_DRM_ROCKCHIP=m
> CONFIG_ROCKCHIP_DW_HDMI=m
> CONFIG_DRM_RCAR_DU=m
> CONFIG_DRM_RCAR_HDMI=y
> CONFIG_DRM_RCAR_LVDS=y
> CONFIG_DRM_TEGRA=y
> -CONFIG_DRM_PANEL_SAMSUNG_S6E8AA0=m
> CONFIG_DRM_PANEL_SIMPLE=y
> +CONFIG_DRM_PANEL_SAMSUNG_S6E8AA0=m
> +CONFIG_DRM_NXP_PTN3460=m
> +CONFIG_DRM_PARADE_PS8622=m
> CONFIG_FB_ARMCLCD=y
> CONFIG_FB_WM8505=y
> CONFIG_FB_SH_MOBILE_LCDC=y
> CONFIG_FB_SIMPLE=y
> CONFIG_FB_SH_MOBILE_MERAM=y
> -CONFIG_BACKLIGHT_LCD_SUPPORT=y
> -CONFIG_BACKLIGHT_CLASS_DEVICE=y
> CONFIG_LCD_PLATFORM=m
> CONFIG_BACKLIGHT_PWM=y
> CONFIG_BACKLIGHT_AS3711=y

2015-11-17 08:01:46

by Timo Sigurdsson

[permalink] [raw]

Subject: Re: [PATCH] ARM: sunxi: Re-enable SID driver in multi_v7_defconfig

Hi,

Am Dienstag, den 17.11.2015, 11:10 +0900 schrieb Krzysztof Kozlowski:
> On 17.11.2015 10:49, Timo Sigurdsson wrote:
> > Commit 3d0b16a66c8a ("nvmem: sunxi: Move the SID driver to the nvmem
> > framework") moved the the sunxi SID driver to a new framework, but left
> > multi_v7_defconfig with the deprecated config symbol EEPROM_SUNXI_SID
> > instead of the new symbold NVMEM_SUNXI_SID. Hence, re-enable the driver
> > in multi_v7_defconfig.
> >
> > While at it, clean up multi_v7_defconfig by generating a fresh file via
> > make multi_v7_defconfig
> > make savedefconfig
> > While this moves around a few lines and removes unnecessary symbols,
> > it doesn't introduce any functional changes.
>
> Split it per change. One change is savedefconfig and second is removing
> or enabling other drivers.
Ok, I can do that.

>
> On which tree you generated the defconfig? There is a minor nit below
> (at least for Exynos platform, I did not checked the others).

The patch was based on torvalds/master (at v4.4-rc1), but I checked
and it applies on linux-next/master just fine.

>
> >
> > Signed-off-by: Timo Sigurdsson <[email protected]>
> >
> > diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig
> > index 69a22fd..f712ea3 100644
> > --- a/arch/arm/configs/multi_v7_defconfig
> > +++ b/arch/arm/configs/multi_v7_defconfig
>
> (...)
>
> > @@ -450,8 +431,7 @@ CONFIG_MEDIA_CAMERA_SUPPORT=y
> > CONFIG_MEDIA_CONTROLLER=y
> > CONFIG_VIDEO_V4L2_SUBDEV_API=y
> > CONFIG_MEDIA_USB_SUPPORT=y
> > -CONFIG_USB_VIDEO_CLASS=y
> > -CONFIG_USB_GSPCA=y
> > +CONFIG_USB_VIDEO_CLASS=m
> > CONFIG_V4L_PLATFORM_DRIVERS=y
> > CONFIG_SOC_CAMERA=m
> > CONFIG_SOC_CAMERA_PLATFORM=m
> > @@ -465,28 +445,25 @@ CONFIG_DRM=y
> > CONFIG_DRM_I2C_ADV7511=m
> > # CONFIG_DRM_I2C_CH7006 is not set
> > # CONFIG_DRM_I2C_SIL164 is not set
> > -CONFIG_DRM_NXP_PTN3460=m
> > -CONFIG_DRM_PARADE_PS8622=m
> > CONFIG_DRM_NOUVEAU=m
> > CONFIG_DRM_EXYNOS=m
> > -CONFIG_DRM_EXYNOS_DSI=y
> > CONFIG_DRM_EXYNOS_FIMD=y
> > -CONFIG_DRM_EXYNOS_HDMI=y
>
> I would prefer leaving the EXYNOS_HDMI. Dependencies are now not enabled
> but we are fixing it in:
> http://www.spinics.net/lists/dri-devel/msg93299.html

I think the problem here is that I don't see this patch in linux-next
yet.

Regards,

Timo

[...]
<snip>

2015-11-17 08:08:01

by Lee Jones

[permalink] [raw]

Subject: Re: [PATCH] ARM: sunxi: Re-enable SID driver in multi_v7_defconfig

On Tue, 17 Nov 2015, Timo Sigurdsson wrote:

> Commit 3d0b16a66c8a ("nvmem: sunxi: Move the SID driver to the nvmem
> framework") moved the the sunxi SID driver to a new framework, but left
> multi_v7_defconfig with the deprecated config symbol EEPROM_SUNXI_SID
> instead of the new symbold NVMEM_SUNXI_SID. Hence, re-enable the driver
> in multi_v7_defconfig.
>
> While at it, clean up multi_v7_defconfig by generating a fresh file via
> make multi_v7_defconfig
> make savedefconfig
> While this moves around a few lines and removes unnecessary symbols,
> it doesn't introduce any functional changes.
>
> Signed-off-by: Timo Sigurdsson <[email protected]>

Please either use Git to submit your changes, or add a diffstat in
manually. They *are* helpful.

> diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig
> index 69a22fd..f712ea3 100644
> --- a/arch/arm/configs/multi_v7_defconfig
> +++ b/arch/arm/configs/multi_v7_defconfig
> @@ -12,7 +12,6 @@ CONFIG_MODULE_UNLOAD=y
> CONFIG_PARTITION_ADVANCED=y
> CONFIG_CMDLINE_PARTITION=y
> CONFIG_ARCH_VIRT=y
> -CONFIG_ARCH_ALPINE=y
> CONFIG_ARCH_MVEBU=y
> CONFIG_MACH_ARMADA_370=y
> CONFIG_MACH_ARMADA_375=y
> @@ -20,6 +19,7 @@ CONFIG_MACH_ARMADA_38X=y
> CONFIG_MACH_ARMADA_39X=y
> CONFIG_MACH_ARMADA_XP=y
> CONFIG_MACH_DOVE=y
> +CONFIG_ARCH_ALPINE=y
> CONFIG_ARCH_AT91=y
> CONFIG_SOC_SAMA5D2=y
> CONFIG_SOC_SAMA5D3=y
> @@ -27,9 +27,9 @@ CONFIG_SOC_SAMA5D4=y
> CONFIG_ARCH_BCM=y
> CONFIG_ARCH_BCM_CYGNUS=y
> CONFIG_ARCH_BCM_NSP=y
> -CONFIG_ARCH_BCM_21664=y
> -CONFIG_ARCH_BCM_281XX=y
> CONFIG_ARCH_BCM_5301X=y
> +CONFIG_ARCH_BCM_281XX=y
> +CONFIG_ARCH_BCM_21664=y
> CONFIG_ARCH_BRCMSTB=y
> CONFIG_ARCH_BERLIN=y
> CONFIG_MACH_BERLIN_BG2=y
> @@ -39,9 +39,9 @@ CONFIG_ARCH_DIGICOLOR=y
> CONFIG_ARCH_HIGHBANK=y
> CONFIG_ARCH_HISI=y
> CONFIG_ARCH_HI3xxx=y
> -CONFIG_ARCH_HIX5HD2=y
> CONFIG_ARCH_HIP01=y
> CONFIG_ARCH_HIP04=y
> +CONFIG_ARCH_HIX5HD2=y
> CONFIG_ARCH_KEYSTONE=y
> CONFIG_ARCH_MESON=y
> CONFIG_ARCH_MXC=y
> @@ -53,8 +53,9 @@ CONFIG_SOC_IMX6SL=y
> CONFIG_SOC_IMX6SX=y
> CONFIG_SOC_IMX6UL=y
> CONFIG_SOC_IMX7D=y
> -CONFIG_SOC_VF610=y
> CONFIG_SOC_LS1021A=y
> +CONFIG_SOC_VF610=y
> +CONFIG_ARCH_MEDIATEK=y
> CONFIG_ARCH_OMAP3=y
> CONFIG_ARCH_OMAP4=y
> CONFIG_SOC_OMAP5=y
> @@ -62,7 +63,6 @@ CONFIG_SOC_AM33XX=y
> CONFIG_SOC_AM43XX=y
> CONFIG_SOC_DRA7XX=y
> CONFIG_ARCH_QCOM=y
> -CONFIG_ARCH_MEDIATEK=y
> CONFIG_ARCH_MSM8X60=y
> CONFIG_ARCH_MSM8960=y
> CONFIG_ARCH_MSM8974=y
> @@ -94,30 +94,22 @@ CONFIG_ARCH_TEGRA_2x_SOC=y
> CONFIG_ARCH_TEGRA_3x_SOC=y
> CONFIG_ARCH_TEGRA_114_SOC=y
> CONFIG_ARCH_TEGRA_124_SOC=y
> -CONFIG_TEGRA_EMC_SCALING_ENABLE=y
> CONFIG_ARCH_UNIPHIER=y
> CONFIG_ARCH_U8500=y
> CONFIG_MACH_HREFV60=y
> CONFIG_MACH_SNOWBALL=y
> -CONFIG_MACH_UX500_DT=y
> CONFIG_ARCH_VEXPRESS=y
> -CONFIG_ARCH_VEXPRESS_CA9X4=y
> CONFIG_ARCH_VEXPRESS_TC2_PM=y
> CONFIG_ARCH_WM8850=y
> CONFIG_ARCH_ZYNQ=y
> -CONFIG_TRUSTED_FOUNDATIONS=y
> -CONFIG_PCI=y
> -CONFIG_PCI_HOST_GENERIC=y
> -CONFIG_PCI_KEYSTONE=y
> CONFIG_PCI_MSI=y
> CONFIG_PCI_MVEBU=y
> CONFIG_PCI_TEGRA=y
> CONFIG_PCI_RCAR_GEN2=y
> CONFIG_PCI_RCAR_GEN2_PCIE=y
> -CONFIG_PCIEPORTBUS=y
> +CONFIG_PCI_KEYSTONE=y
> CONFIG_SMP=y
> CONFIG_NR_CPUS=16
> -CONFIG_HIGHPTE=y
> CONFIG_CMA=y
> CONFIG_ARM_APPENDED_DTB=y
> CONFIG_ARM_ATAG_DTB_COMPAT=y
> @@ -125,12 +117,12 @@ CONFIG_KEXEC=y
> CONFIG_CPU_FREQ=y
> CONFIG_CPU_FREQ_STAT_DETAILS=y
> CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
> +CONFIG_CPUFREQ_DT=y
> CONFIG_CPU_IDLE=y
> CONFIG_ARM_CPUIDLE=y
> -CONFIG_NEON=y
> -CONFIG_KERNEL_MODE_NEON=y
> CONFIG_ARM_ZYNQ_CPUIDLE=y
> CONFIG_ARM_EXYNOS_CPUIDLE=y
> +CONFIG_KERNEL_MODE_NEON=y
> CONFIG_NET=y
> CONFIG_PACKET=y
> CONFIG_UNIX=y
> @@ -148,13 +140,10 @@ CONFIG_IPV6_MIP6=m
> CONFIG_IPV6_TUNNEL=m
> CONFIG_IPV6_MULTIPLE_TABLES=y
> CONFIG_CAN=y
> -CONFIG_CAN_RAW=y
> -CONFIG_CAN_BCM=y
> -CONFIG_CAN_DEV=y
> CONFIG_CAN_AT91=m
> +CONFIG_CAN_SUN4I=y
> CONFIG_CAN_XILINXCAN=y
> CONFIG_CAN_MCP251X=y
> -CONFIG_CAN_SUN4I=y
> CONFIG_BT=m
> CONFIG_BT_MRVL=m
> CONFIG_BT_MRVL_SDIO=m
> @@ -188,10 +177,8 @@ CONFIG_ATMEL_SSC=m
> CONFIG_APDS9802ALS=y
> CONFIG_ISL29003=y
> CONFIG_EEPROM_AT24=y
> -CONFIG_EEPROM_SUNXI_SID=y
> CONFIG_BLK_DEV_SD=y
> CONFIG_BLK_DEV_SR=y
> -CONFIG_SCSI_MULTI_LUN=y
> CONFIG_ATA=y
> CONFIG_SATA_AHCI=y
> CONFIG_SATA_AHCI_PLATFORM=y
> @@ -202,10 +189,10 @@ CONFIG_SATA_HIGHBANK=y
> CONFIG_SATA_MV=y
> CONFIG_SATA_RCAR=y
> CONFIG_NETDEVICES=y
> -CONFIG_HIX5HD2_GMAC=y
> CONFIG_SUN4I_EMAC=y
> CONFIG_MACB=y
> CONFIG_NET_CALXEDA_XGMAC=y
> +CONFIG_HIX5HD2_GMAC=y
> CONFIG_IGB=y
> CONFIG_MV643XX_ETH=y
> CONFIG_MVNETA=y
> @@ -223,7 +210,6 @@ CONFIG_SMSC_PHY=y
> CONFIG_BROADCOM_PHY=y
> CONFIG_ICPLUS_PHY=y
> CONFIG_MICREL_PHY=y
> -CONFIG_FIXED_PHY=y
> CONFIG_USB_PEGASUS=y
> CONFIG_USB_RTL8152=m
> CONFIG_USB_USBNET=y
> @@ -239,18 +225,18 @@ CONFIG_INPUT_EVDEV=y
> CONFIG_KEYBOARD_QT1070=m
> CONFIG_KEYBOARD_GPIO=y
> CONFIG_KEYBOARD_TEGRA=y
> -CONFIG_KEYBOARD_SPEAR=y
> CONFIG_KEYBOARD_ST_KEYSCAN=y
> +CONFIG_KEYBOARD_SPEAR=y
> CONFIG_KEYBOARD_CROS_EC=y
> CONFIG_MOUSE_PS2_ELANTECH=y
> CONFIG_MOUSE_CYAPA=m
> CONFIG_MOUSE_ELAN_I2C=y
> CONFIG_INPUT_TOUCHSCREEN=y
> CONFIG_TOUCHSCREEN_ATMEL_MXT=y
> +CONFIG_TOUCHSCREEN_WM97XX=m
> CONFIG_TOUCHSCREEN_ST1232=m
> CONFIG_TOUCHSCREEN_STMPE=y
> CONFIG_TOUCHSCREEN_SUN4I=y
> -CONFIG_TOUCHSCREEN_WM97XX=m
> CONFIG_INPUT_MISC=y
> CONFIG_INPUT_MPU3050=y
> CONFIG_INPUT_AXP20X_PEK=y
> @@ -295,17 +281,16 @@ CONFIG_SERIAL_CONEXANT_DIGICOLOR_CONSOLE=y
> CONFIG_SERIAL_ST_ASC=y
> CONFIG_SERIAL_ST_ASC_CONSOLE=y
> CONFIG_I2C_CHARDEV=y
> -CONFIG_I2C_DAVINCI=y
> CONFIG_I2C_MUX=y
> CONFIG_I2C_ARB_GPIO_CHALLENGE=m
> CONFIG_I2C_MUX_PCA954x=y
> CONFIG_I2C_MUX_PINCTRL=y
> CONFIG_I2C_AT91=m
> CONFIG_I2C_CADENCE=y
> +CONFIG_I2C_DAVINCI=y
> CONFIG_I2C_DESIGNWARE_PLATFORM=y
> CONFIG_I2C_DIGICOLOR=m
> CONFIG_I2C_GPIO=m
> -CONFIG_I2C_EXYNOS5=y
> CONFIG_I2C_MV64XXX=y
> CONFIG_I2C_RIIC=y
> CONFIG_I2C_RK3X=y
> @@ -345,21 +330,20 @@ CONFIG_PINCTRL_PALMAS=y
> CONFIG_PINCTRL_APQ8064=y
> CONFIG_PINCTRL_APQ8084=y
> CONFIG_GPIO_SYSFS=y
> -CONFIG_GPIO_GENERIC_PLATFORM=y
> CONFIG_GPIO_DAVINCI=y
> CONFIG_GPIO_DWAPB=y
> CONFIG_GPIO_EM=y
> CONFIG_GPIO_RCAR=y
> +CONFIG_GPIO_SYSCON=y
> CONFIG_GPIO_XILINX=y
> CONFIG_GPIO_ZYNQ=y
> CONFIG_GPIO_PCA953X=y
> CONFIG_GPIO_PCA953X_IRQ=y
> CONFIG_GPIO_PCF857X=y
> -CONFIG_GPIO_TWL4030=y
> CONFIG_GPIO_PALMAS=y
> -CONFIG_GPIO_SYSCON=y
> CONFIG_GPIO_TPS6586X=y
> CONFIG_GPIO_TPS65910=y
> +CONFIG_GPIO_TWL4030=y
> CONFIG_BATTERY_SBS=y
> CONFIG_BATTERY_MAX17040=m
> CONFIG_BATTERY_MAX17042=m
> @@ -370,25 +354,24 @@ CONFIG_POWER_RESET_AS3722=y
> CONFIG_POWER_RESET_GPIO=y
> CONFIG_POWER_RESET_GPIO_RESTART=y
> CONFIG_POWER_RESET_KEYSTONE=y
> +CONFIG_POWER_RESET_SYSCON=y
> CONFIG_POWER_RESET_RMOBILE=y
> CONFIG_SENSORS_LM90=y
> CONFIG_SENSORS_LM95245=y
> CONFIG_SENSORS_NTC_THERMISTOR=m
> -CONFIG_THERMAL=y
> CONFIG_CPU_THERMAL=y
> CONFIG_ROCKCHIP_THERMAL=y
> CONFIG_RCAR_THERMAL=y
> CONFIG_ARMADA_THERMAL=y
> -CONFIG_DAVINCI_WATCHDOG=m
> -CONFIG_EXYNOS_THERMAL=m
> CONFIG_ST_THERMAL_SYSCFG=y
> CONFIG_ST_THERMAL_MEMMAP=y
> CONFIG_WATCHDOG=y
> CONFIG_XILINX_WATCHDOG=y
> CONFIG_ARM_SP805_WATCHDOG=y
> +CONFIG_DAVINCI_WATCHDOG=m
> CONFIG_ORION_WATCHDOG=y
> -CONFIG_ST_LPC_WATCHDOG=y
> CONFIG_SUNXI_WATCHDOG=y
> +CONFIG_ST_LPC_WATCHDOG=y
> CONFIG_TEGRA_WATCHDOG=m
> CONFIG_MESON_WATCHDOG=y
> CONFIG_DIGICOLOR_WATCHDOG=y
> @@ -404,27 +387,24 @@ CONFIG_MFD_MAX14577=y
> CONFIG_MFD_MAX77686=y
> CONFIG_MFD_MAX77693=y
> CONFIG_MFD_MAX8907=y
> -CONFIG_MFD_RK808=y
> CONFIG_MFD_PM8921_CORE=y
> CONFIG_MFD_QCOM_RPM=y
> +CONFIG_MFD_RK808=y
> CONFIG_MFD_SEC_CORE=y
> CONFIG_MFD_STMPE=y
> CONFIG_MFD_PALMAS=y
> CONFIG_MFD_TPS65090=y
> CONFIG_MFD_TPS6586X=y
> CONFIG_MFD_TPS65910=y
> -CONFIG_REGULATOR_AB8500=y
> CONFIG_REGULATOR_ACT8865=y
> +CONFIG_REGULATOR_AB8500=y
> CONFIG_REGULATOR_AS3711=y
> CONFIG_REGULATOR_AS3722=y
> CONFIG_REGULATOR_AXP20X=y
> CONFIG_REGULATOR_BCM590XX=y
> CONFIG_REGULATOR_DA9210=y
> CONFIG_REGULATOR_FAN53555=y
> -CONFIG_REGULATOR_RK808=y
> CONFIG_REGULATOR_GPIO=y
> -CONFIG_MFD_SYSCON=y
> -CONFIG_POWER_RESET_SYSCON=y
> CONFIG_REGULATOR_MAX14577=m
> CONFIG_REGULATOR_MAX8907=y
> CONFIG_REGULATOR_MAX8973=y
> @@ -436,6 +416,7 @@ CONFIG_REGULATOR_PBIAS=y
> CONFIG_REGULATOR_PWM=m
> CONFIG_REGULATOR_QCOM_RPM=y
> CONFIG_REGULATOR_QCOM_SMD_RPM=y
> +CONFIG_REGULATOR_RK808=y
> CONFIG_REGULATOR_S2MPS11=y
> CONFIG_REGULATOR_S5M8767=y
> CONFIG_REGULATOR_TPS51632=y
> @@ -450,8 +431,7 @@ CONFIG_MEDIA_CAMERA_SUPPORT=y
> CONFIG_MEDIA_CONTROLLER=y
> CONFIG_VIDEO_V4L2_SUBDEV_API=y
> CONFIG_MEDIA_USB_SUPPORT=y
> -CONFIG_USB_VIDEO_CLASS=y
> -CONFIG_USB_GSPCA=y
> +CONFIG_USB_VIDEO_CLASS=m
> CONFIG_V4L_PLATFORM_DRIVERS=y
> CONFIG_SOC_CAMERA=m
> CONFIG_SOC_CAMERA_PLATFORM=m
> @@ -465,28 +445,25 @@ CONFIG_DRM=y
> CONFIG_DRM_I2C_ADV7511=m
> # CONFIG_DRM_I2C_CH7006 is not set
> # CONFIG_DRM_I2C_SIL164 is not set
> -CONFIG_DRM_NXP_PTN3460=m
> -CONFIG_DRM_PARADE_PS8622=m
> CONFIG_DRM_NOUVEAU=m
> CONFIG_DRM_EXYNOS=m
> -CONFIG_DRM_EXYNOS_DSI=y
> CONFIG_DRM_EXYNOS_FIMD=y
> -CONFIG_DRM_EXYNOS_HDMI=y
> +CONFIG_DRM_EXYNOS_DSI=y
> CONFIG_DRM_ROCKCHIP=m
> CONFIG_ROCKCHIP_DW_HDMI=m
> CONFIG_DRM_RCAR_DU=m
> CONFIG_DRM_RCAR_HDMI=y
> CONFIG_DRM_RCAR_LVDS=y
> CONFIG_DRM_TEGRA=y
> -CONFIG_DRM_PANEL_SAMSUNG_S6E8AA0=m
> CONFIG_DRM_PANEL_SIMPLE=y
> +CONFIG_DRM_PANEL_SAMSUNG_S6E8AA0=m
> +CONFIG_DRM_NXP_PTN3460=m
> +CONFIG_DRM_PARADE_PS8622=m
> CONFIG_FB_ARMCLCD=y
> CONFIG_FB_WM8505=y
> CONFIG_FB_SH_MOBILE_LCDC=y
> CONFIG_FB_SIMPLE=y
> CONFIG_FB_SH_MOBILE_MERAM=y
> -CONFIG_BACKLIGHT_LCD_SUPPORT=y
> -CONFIG_BACKLIGHT_CLASS_DEVICE=y
> CONFIG_LCD_PLATFORM=m
> CONFIG_BACKLIGHT_PWM=y
> CONFIG_BACKLIGHT_AS3711=y
> @@ -500,7 +477,7 @@ CONFIG_SND_HDA_INPUT_BEEP=y
> CONFIG_SND_HDA_PATCH_LOADER=y
> CONFIG_SND_HDA_CODEC_REALTEK=m
> CONFIG_SND_HDA_CODEC_HDMI=m
> -CONFIG_SND_USB_AUDIO=y
> +CONFIG_SND_USB_AUDIO=m
> CONFIG_SND_SOC=m
> CONFIG_SND_ATMEL_SOC=m
> CONFIG_SND_ATMEL_SOC_WM8904=m
> @@ -521,15 +498,12 @@ CONFIG_USB=y
> CONFIG_USB_XHCI_HCD=y
> CONFIG_USB_XHCI_MVEBU=y
> CONFIG_USB_EHCI_HCD=y
> +CONFIG_USB_EHCI_HCD_STI=y
> CONFIG_USB_EHCI_MSM=m
> -CONFIG_USB_EHCI_EXYNOS=y
> CONFIG_USB_EHCI_TEGRA=y
> -CONFIG_USB_EHCI_HCD_STI=y
> -CONFIG_USB_EHCI_HCD_PLATFORM=y
> -CONFIG_USB_ISP1760=y
> +CONFIG_USB_EHCI_EXYNOS=y
> CONFIG_USB_OHCI_HCD=y
> CONFIG_USB_OHCI_HCD_STI=y
> -CONFIG_USB_OHCI_HCD_PLATFORM=y
> CONFIG_USB_OHCI_EXYNOS=m
> CONFIG_USB_R8A66597_HCD=m
> CONFIG_USB_RENESAS_USBHS=m
> @@ -538,9 +512,9 @@ CONFIG_USB_DWC3=y
> CONFIG_USB_DWC2=m
> CONFIG_USB_CHIPIDEA=y
> CONFIG_USB_CHIPIDEA_HOST=y
> +CONFIG_USB_ISP1760=y
> CONFIG_AB8500_USB=y
> CONFIG_KEYSTONE_USB_PHY=y
> -CONFIG_OMAP_USB3=y
> CONFIG_USB_GPIO_VBUS=y
> CONFIG_USB_ISP1301=y
> CONFIG_USB_MSM_OTG=m
> @@ -559,9 +533,9 @@ CONFIG_MMC_SDHCI_OF_AT91=y
> CONFIG_MMC_SDHCI_ESDHC_IMX=y
> CONFIG_MMC_SDHCI_DOVE=y
> CONFIG_MMC_SDHCI_TEGRA=y
> +CONFIG_MMC_SDHCI_S3C=y
> CONFIG_MMC_SDHCI_PXAV3=y
> CONFIG_MMC_SDHCI_SPEAR=y
> -CONFIG_MMC_SDHCI_S3C=y
> CONFIG_MMC_SDHCI_S3C_DMA=y
> CONFIG_MMC_SDHCI_BCM_KONA=y
> CONFIG_MMC_SDHCI_ST=y
> @@ -571,8 +545,6 @@ CONFIG_MMC_ATMELMCI=y
> CONFIG_MMC_MVSDIO=y
> CONFIG_MMC_SDHI=y
> CONFIG_MMC_DW=y
> -CONFIG_MMC_DW_IDMAC=y
> -CONFIG_MMC_DW_PLTFM=y
> CONFIG_MMC_DW_EXYNOS=y
> CONFIG_MMC_DW_ROCKCHIP=y
> CONFIG_MMC_SH_MMCIF=y
> @@ -605,15 +577,14 @@ CONFIG_RTC_DRV_RK808=m
> CONFIG_RTC_DRV_MAX77802=m
> CONFIG_RTC_DRV_RS5C372=m
> CONFIG_RTC_DRV_PALMAS=y
> -CONFIG_RTC_DRV_ST_LPC=y
> CONFIG_RTC_DRV_TWL4030=y
> CONFIG_RTC_DRV_TPS6586X=y
> CONFIG_RTC_DRV_TPS65910=y
> CONFIG_RTC_DRV_S35390A=m
> CONFIG_RTC_DRV_RX8581=m
> CONFIG_RTC_DRV_EM3027=y
> -CONFIG_RTC_DRV_DIGICOLOR=m
> CONFIG_RTC_DRV_S5M=m
> +CONFIG_RTC_DRV_DIGICOLOR=m
> CONFIG_RTC_DRV_S3C=m
> CONFIG_RTC_DRV_PL031=y
> CONFIG_RTC_DRV_AT91RM9200=m
> @@ -623,25 +594,26 @@ CONFIG_RTC_DRV_SUN6I=y
> CONFIG_RTC_DRV_SUNXI=y
> CONFIG_RTC_DRV_MV=y
> CONFIG_RTC_DRV_TEGRA=y
> +CONFIG_RTC_DRV_ST_LPC=y
> CONFIG_DMADEVICES=y
> -CONFIG_DW_DMAC=y
> CONFIG_AT_HDMAC=y
> CONFIG_AT_XDMAC=y
> -CONFIG_MV_XOR=y
> -CONFIG_TEGRA20_APB_DMA=y
> -CONFIG_SH_DMAE=y
> -CONFIG_RCAR_DMAC=y
> -CONFIG_STE_DMA40=y
> -CONFIG_SIRF_DMA=y
> -CONFIG_TI_EDMA=y
> -CONFIG_PL330_DMA=y
> -CONFIG_IMX_SDMA=y
> +CONFIG_DMA_OMAP=y
> +CONFIG_DMA_SUN6I=y
> CONFIG_IMX_DMA=y
> +CONFIG_IMX_SDMA=y
> +CONFIG_MV_XOR=y
> CONFIG_MXS_DMA=y
> -CONFIG_DMA_OMAP=y
> +CONFIG_PL330_DMA=y
> CONFIG_QCOM_BAM_DMA=y
> +CONFIG_SIRF_DMA=y
> +CONFIG_STE_DMA40=y
> +CONFIG_TEGRA20_APB_DMA=y
> +CONFIG_TI_EDMA=y
> CONFIG_XILINX_VDMA=y
> -CONFIG_DMA_SUN6I=y
> +CONFIG_DW_DMAC=y
> +CONFIG_SH_DMAE=y
> +CONFIG_RCAR_DMAC=y
> CONFIG_STAGING=y
> CONFIG_SENSORS_ISL29018=y
> CONFIG_SENSORS_ISL29028=y
> @@ -650,17 +622,11 @@ CONFIG_KEYBOARD_NVEC=y
> CONFIG_SERIO_NVEC_PS2=y
> CONFIG_NVEC_POWER=y
> CONFIG_NVEC_PAZ00=y
> -CONFIG_QCOM_GSBI=y
> -CONFIG_QCOM_PM=y
> -CONFIG_QCOM_SMD=y
> -CONFIG_QCOM_SMD_RPM=y
> -CONFIG_QCOM_SMEM=y
> -CONFIG_COMMON_CLK_QCOM=y
> -CONFIG_CHROME_PLATFORMS=y
> CONFIG_CROS_EC_CHARDEV=m
> CONFIG_COMMON_CLK_MAX77686=y
> CONFIG_COMMON_CLK_MAX77802=m
> CONFIG_COMMON_CLK_S2MPS11=m
> +CONFIG_COMMON_CLK_QCOM=y
> CONFIG_APQ_MMCC_8084=y
> CONFIG_MSM_GCC_8660=y
> CONFIG_MSM_MMCC_8960=y
> @@ -669,10 +635,13 @@ CONFIG_HWSPINLOCK_QCOM=y
> CONFIG_ROCKCHIP_IOMMU=y
> CONFIG_TEGRA_IOMMU_GART=y
> CONFIG_TEGRA_IOMMU_SMMU=y
> +CONFIG_QCOM_GSBI=y
> +CONFIG_QCOM_PM=y
> +CONFIG_QCOM_SMEM=y
> +CONFIG_QCOM_SMD=y
> +CONFIG_QCOM_SMD_RPM=y
> CONFIG_PM_DEVFREQ=y
> CONFIG_ARM_TEGRA_DEVFREQ=m
> -CONFIG_MEMORY=y
> -CONFIG_EXTCON=y
> CONFIG_TI_AEMIF=y
> CONFIG_IIO=y
> CONFIG_AT91_ADC=m
> @@ -686,25 +655,28 @@ CONFIG_PWM_ATMEL_TCB=m
> CONFIG_PWM_RENESAS_TPU=y
> CONFIG_PWM_ROCKCHIP=m
> CONFIG_PWM_SAMSUNG=m
> +CONFIG_PWM_STI=m
> CONFIG_PWM_SUN4I=y
> CONFIG_PWM_TEGRA=y
> CONFIG_PWM_VT8500=y
> -CONFIG_PHY_HIX5HD2_SATA=y
> -CONFIG_PWM_STI=m
> -CONFIG_OMAP_USB2=y
> -CONFIG_TI_PIPE3=y
> +CONFIG_KEYSTONE_IRQ=y
> CONFIG_PHY_BERLIN_USB=y
> CONFIG_PHY_BERLIN_SATA=y
> -CONFIG_PHY_ROCKCHIP_USB=m
> -CONFIG_PHY_QCOM_APQ8064_SATA=m
> CONFIG_PHY_MIPHY28LP=y
> CONFIG_PHY_MIPHY365X=y
> CONFIG_PHY_RCAR_GEN2=m
> -CONFIG_PHY_STIH41X_USB=y
> -CONFIG_PHY_STIH407_USB=y
> +CONFIG_OMAP_USB2=y
> +CONFIG_TI_PIPE3=y
> +CONFIG_PHY_HIX5HD2_SATA=y
> CONFIG_PHY_SUN4I_USB=y
> CONFIG_PHY_SUN9I_USB=y
> CONFIG_PHY_SAMSUNG_USB2=m
> +CONFIG_PHY_QCOM_APQ8064_SATA=m
> +CONFIG_PHY_ROCKCHIP_USB=m
> +CONFIG_PHY_STIH407_USB=y
> +CONFIG_PHY_STIH41X_USB=y
> +CONFIG_NVMEM=y
> +CONFIG_NVMEM_SUNXI_SID=y
> CONFIG_EXT4_FS=y
> CONFIG_AUTOFS4_FS=y
> CONFIG_MSDOS_FS=y
> @@ -712,7 +684,6 @@ CONFIG_VFAT_FS=y
> CONFIG_NTFS_FS=y
> CONFIG_TMPFS_POSIX_ACL=y
> CONFIG_UBIFS_FS=y
> -CONFIG_TMPFS=y
> CONFIG_SQUASHFS=y
> CONFIG_SQUASHFS_LZO=y
> CONFIG_SQUASHFS_XZ=y
> @@ -727,21 +698,15 @@ CONFIG_PRINTK_TIME=y
> CONFIG_DEBUG_FS=y
> CONFIG_MAGIC_SYSRQ=y
> CONFIG_LOCKUP_DETECTOR=y
> -CONFIG_CRYPTO_DEV_TEGRA_AES=y
> -CONFIG_CPUFREQ_DT=y
> -CONFIG_KEYSTONE_IRQ=y
> +CONFIG_CRYPTO_DEV_ATMEL_AES=m
> +CONFIG_CRYPTO_DEV_ATMEL_TDES=m
> +CONFIG_CRYPTO_DEV_ATMEL_SHA=m
> CONFIG_CRYPTO_DEV_SUN4I_SS=m
> CONFIG_ARM_CRYPTO=y
> -CONFIG_CRYPTO_SHA1_ARM=m
> CONFIG_CRYPTO_SHA1_ARM_NEON=m
> CONFIG_CRYPTO_SHA1_ARM_CE=m
> CONFIG_CRYPTO_SHA2_ARM_CE=m
> -CONFIG_CRYPTO_SHA256_ARM=m
> CONFIG_CRYPTO_SHA512_ARM=m
> -CONFIG_CRYPTO_AES_ARM=m
> CONFIG_CRYPTO_AES_ARM_BS=m
> CONFIG_CRYPTO_AES_ARM_CE=m
> CONFIG_CRYPTO_GHASH_ARM_CE=m
> -CONFIG_CRYPTO_DEV_ATMEL_AES=m
> -CONFIG_CRYPTO_DEV_ATMEL_TDES=m
> -CONFIG_CRYPTO_DEV_ATMEL_SHA=m

--
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog

2015-11-17 08:21:52

by Krzysztof Kozlowski

[permalink] [raw]

Subject: Re: [PATCH] ARM: sunxi: Re-enable SID driver in multi_v7_defconfig

2015-11-17 17:01 GMT+09:00 Timo Sigurdsson <[email protected]>:
> Hi,
>
> Am Dienstag, den 17.11.2015, 11:10 +0900 schrieb Krzysztof Kozlowski:
>> On 17.11.2015 10:49, Timo Sigurdsson wrote:
>> > Commit 3d0b16a66c8a ("nvmem: sunxi: Move the SID driver to the nvmem
>> > framework") moved the the sunxi SID driver to a new framework, but left
>> > multi_v7_defconfig with the deprecated config symbol EEPROM_SUNXI_SID
>> > instead of the new symbold NVMEM_SUNXI_SID. Hence, re-enable the driver
>> > in multi_v7_defconfig.
>> >
>> > While at it, clean up multi_v7_defconfig by generating a fresh file via
>> > make multi_v7_defconfig
>> > make savedefconfig
>> > While this moves around a few lines and removes unnecessary symbols,
>> > it doesn't introduce any functional changes.
>>
>> Split it per change. One change is savedefconfig and second is removing
>> or enabling other drivers.
> Ok, I can do that.
>
>>
>> On which tree you generated the defconfig? There is a minor nit below
>> (at least for Exynos platform, I did not checked the others).
>
> The patch was based on torvalds/master (at v4.4-rc1), but I checked
> and it applies on linux-next/master just fine.

You cannot base such patch on mainline because you can overwrite (or
disregard) other people's patches already waiting in next. Although we
are just after rc1 so there shouldn't be much new stuff in linux-next
but still - please base on next.

>
>>
>> >
>> > Signed-off-by: Timo Sigurdsson <[email protected]>
>> >
>> > diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig
>> > index 69a22fd..f712ea3 100644
>> > --- a/arch/arm/configs/multi_v7_defconfig
>> > +++ b/arch/arm/configs/multi_v7_defconfig
>>
>> (...)
>>
>> > @@ -450,8 +431,7 @@ CONFIG_MEDIA_CAMERA_SUPPORT=y
>> > CONFIG_MEDIA_CONTROLLER=y
>> > CONFIG_VIDEO_V4L2_SUBDEV_API=y
>> > CONFIG_MEDIA_USB_SUPPORT=y
>> > -CONFIG_USB_VIDEO_CLASS=y
>> > -CONFIG_USB_GSPCA=y
>> > +CONFIG_USB_VIDEO_CLASS=m
>> > CONFIG_V4L_PLATFORM_DRIVERS=y
>> > CONFIG_SOC_CAMERA=m
>> > CONFIG_SOC_CAMERA_PLATFORM=m
>> > @@ -465,28 +445,25 @@ CONFIG_DRM=y
>> > CONFIG_DRM_I2C_ADV7511=m
>> > # CONFIG_DRM_I2C_CH7006 is not set
>> > # CONFIG_DRM_I2C_SIL164 is not set
>> > -CONFIG_DRM_NXP_PTN3460=m
>> > -CONFIG_DRM_PARADE_PS8622=m
>> > CONFIG_DRM_NOUVEAU=m
>> > CONFIG_DRM_EXYNOS=m
>> > -CONFIG_DRM_EXYNOS_DSI=y
>> > CONFIG_DRM_EXYNOS_FIMD=y
>> > -CONFIG_DRM_EXYNOS_HDMI=y
>>
>> I would prefer leaving the EXYNOS_HDMI. Dependencies are now not enabled
>> but we are fixing it in:
>> http://www.spinics.net/lists/dri-devel/msg93299.html
>
> I think the problem here is that I don't see this patch in linux-next
> yet.
>

Indeed... and I don't know when it will go there so actually maybe it
should be removed... but in the same time removing DRM_EXYNOS_HDMI
will probably make some conflicts because mentioned patch will go
through Exynos DRM tree or Samsung SoC.

Best regards,
Krzysztof

2015-11-17 08:38:54

by Timo Sigurdsson

[permalink] [raw]

Subject: Re: [PATCH] ARM: sunxi: Re-enable SID driver in multi_v7_defconfig

Hi,

Lee Jones schrieb am 17.11.2015 09:07:

> On Tue, 17 Nov 2015, Timo Sigurdsson wrote:
>
>> Commit 3d0b16a66c8a ("nvmem: sunxi: Move the SID driver to the nvmem
>> framework") moved the the sunxi SID driver to a new framework, but left
>> multi_v7_defconfig with the deprecated config symbol EEPROM_SUNXI_SID
>> instead of the new symbold NVMEM_SUNXI_SID. Hence, re-enable the driver
>> in multi_v7_defconfig.
>>
>> While at it, clean up multi_v7_defconfig by generating a fresh file via
>> make multi_v7_defconfig
>> make savedefconfig
>> While this moves around a few lines and removes unnecessary symbols,
>> it doesn't introduce any functional changes.
>>
>> Signed-off-by: Timo Sigurdsson <[email protected]>
>
> Please either use Git to submit your changes, or add a diffstat in
> manually. They *are* helpful.

I do use git. But I guess I messed up the command somehow so the diffstat
wasn't included. Sorry about that. I'll make sure it's there next time.

Thanks,

Timo

[...]
<snip>

2015-11-17 09:03:17

by Timo Sigurdsson

[permalink] [raw]

Subject: Re: [PATCH] ARM: sunxi: Re-enable SID driver in multi_v7_defconfig

Hi,

Krzysztof Kozlowski schrieb am 17.11.2015 09:21:

[...]

>>> > @@ -450,8 +431,7 @@ CONFIG_MEDIA_CAMERA_SUPPORT=y
>>> > CONFIG_MEDIA_CONTROLLER=y
>>> > CONFIG_VIDEO_V4L2_SUBDEV_API=y
>>> > CONFIG_MEDIA_USB_SUPPORT=y
>>> > -CONFIG_USB_VIDEO_CLASS=y
>>> > -CONFIG_USB_GSPCA=y
>>> > +CONFIG_USB_VIDEO_CLASS=m
>>> > CONFIG_V4L_PLATFORM_DRIVERS=y
>>> > CONFIG_SOC_CAMERA=m
>>> > CONFIG_SOC_CAMERA_PLATFORM=m
>>> > @@ -465,28 +445,25 @@ CONFIG_DRM=y
>>> > CONFIG_DRM_I2C_ADV7511=m
>>> > # CONFIG_DRM_I2C_CH7006 is not set
>>> > # CONFIG_DRM_I2C_SIL164 is not set
>>> > -CONFIG_DRM_NXP_PTN3460=m
>>> > -CONFIG_DRM_PARADE_PS8622=m
>>> > CONFIG_DRM_NOUVEAU=m
>>> > CONFIG_DRM_EXYNOS=m
>>> > -CONFIG_DRM_EXYNOS_DSI=y
>>> > CONFIG_DRM_EXYNOS_FIMD=y
>>> > -CONFIG_DRM_EXYNOS_HDMI=y
>>>
>>> I would prefer leaving the EXYNOS_HDMI. Dependencies are now not enabled
>>> but we are fixing it in:
>>> http://www.spinics.net/lists/dri-devel/msg93299.html
>>
>> I think the problem here is that I don't see this patch in linux-next
>> yet.
>>
>
> Indeed... and I don't know when it will go there so actually maybe it
> should be removed... but in the same time removing DRM_EXYNOS_HDMI
> will probably make some conflicts because mentioned patch will go
> through Exynos DRM tree or Samsung SoC.

Since you suggested to split my patch into two, I might as well just
hold off the "cleanup" patch until Andrzejs patch hits linux-next.
Is that ok?

Regards,

Timo

2015-11-18 01:09:31

by Krzysztof Kozlowski

[permalink] [raw]

Subject: Re: [PATCH] ARM: sunxi: Re-enable SID driver in multi_v7_defconfig

On 17.11.2015 18:03, Timo Sigurdsson wrote:
> Hi,
>
> Krzysztof Kozlowski schrieb am 17.11.2015 09:21:
>
> [...]
>
>>>>> @@ -450,8 +431,7 @@ CONFIG_MEDIA_CAMERA_SUPPORT=y
>>>>> CONFIG_MEDIA_CONTROLLER=y
>>>>> CONFIG_VIDEO_V4L2_SUBDEV_API=y
>>>>> CONFIG_MEDIA_USB_SUPPORT=y
>>>>> -CONFIG_USB_VIDEO_CLASS=y
>>>>> -CONFIG_USB_GSPCA=y
>>>>> +CONFIG_USB_VIDEO_CLASS=m
>>>>> CONFIG_V4L_PLATFORM_DRIVERS=y
>>>>> CONFIG_SOC_CAMERA=m
>>>>> CONFIG_SOC_CAMERA_PLATFORM=m
>>>>> @@ -465,28 +445,25 @@ CONFIG_DRM=y
>>>>> CONFIG_DRM_I2C_ADV7511=m
>>>>> # CONFIG_DRM_I2C_CH7006 is not set
>>>>> # CONFIG_DRM_I2C_SIL164 is not set
>>>>> -CONFIG_DRM_NXP_PTN3460=m
>>>>> -CONFIG_DRM_PARADE_PS8622=m
>>>>> CONFIG_DRM_NOUVEAU=m
>>>>> CONFIG_DRM_EXYNOS=m
>>>>> -CONFIG_DRM_EXYNOS_DSI=y
>>>>> CONFIG_DRM_EXYNOS_FIMD=y
>>>>> -CONFIG_DRM_EXYNOS_HDMI=y
>>>>
>>>> I would prefer leaving the EXYNOS_HDMI. Dependencies are now not enabled
>>>> but we are fixing it in:
>>>> http://www.spinics.net/lists/dri-devel/msg93299.html
>>>
>>> I think the problem here is that I don't see this patch in linux-next
>>> yet.
>>>
>>
>> Indeed... and I don't know when it will go there so actually maybe it
>> should be removed... but in the same time removing DRM_EXYNOS_HDMI
>> will probably make some conflicts because mentioned patch will go
>> through Exynos DRM tree or Samsung SoC.
>
> Since you suggested to split my patch into two, I might as well just
> hold off the "cleanup" patch until Andrzejs patch hits linux-next.
> Is that ok?

>From my point of view - OK. However this may take time... I don't know
when Andrzej's patch will be applied so for me would work also
savedefconfig without removing HDMI.

Best regards,
Krzysztof

2015-11-19 21:34:19

by Timo Sigurdsson

[permalink] [raw]

Subject: [PATCH v2] ARM: sunxi: Re-enable SID driver in multi_v7_defconfig

2015-11-20 00:01:41

by Krzysztof Kozlowski

[permalink] [raw]

Subject: Re: [PATCH v2] ARM: sunxi: Re-enable SID driver in multi_v7_defconfig

On 20.11.2015 06:33, Timo Sigurdsson wrote:
> Commit 3d0b16a66c8a ("nvmem: sunxi: Move the SID driver to the nvmem
> framework") moved the the sunxi SID driver to a new framework, but left
> multi_v7_defconfig with the deprecated config symbol EEPROM_SUNXI_SID
> instead of the new symbol NVMEM_SUNXI_SID. Hence, re-enable the driver
> in multi_v7_defconfig.
>
> Signed-off-by: Timo Sigurdsson <[email protected]>
> ---
> Changes in v2:
> - Move the extra cleanup work for multi_v7_defconfig to a separate
> patch (to be submitted at a later point to avoid conflicts with
> another patch waiting to be merged)
> ---
> arch/arm/configs/multi_v7_defconfig | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>

Fully satisfies my v1's comments:

Acked-by: Krzysztof Kozlowski <[email protected]>

Best regards,
Krzysztof

2015-11-20 11:46:01

by Maxime Ripard

[permalink] [raw]

Subject: Re: [PATCH v2] ARM: sunxi: Re-enable SID driver in multi_v7_defconfig

Hi,

On Fri, Nov 20, 2015 at 09:01:35AM +0900, Krzysztof Kozlowski wrote:
> On 20.11.2015 06:33, Timo Sigurdsson wrote:
> > Commit 3d0b16a66c8a ("nvmem: sunxi: Move the SID driver to the nvmem
> > framework") moved the the sunxi SID driver to a new framework, but left
> > multi_v7_defconfig with the deprecated config symbol EEPROM_SUNXI_SID
> > instead of the new symbol NVMEM_SUNXI_SID. Hence, re-enable the driver
> > in multi_v7_defconfig.
> >
> > Signed-off-by: Timo Sigurdsson <[email protected]>
> > ---
> > Changes in v2:
> > - Move the extra cleanup work for multi_v7_defconfig to a separate
> > patch (to be submitted at a later point to avoid conflicts with
> > another patch waiting to be merged)
> > ---
> > arch/arm/configs/multi_v7_defconfig | 3 ++-
> > 1 file changed, 2 insertions(+), 1 deletion(-)
> >
>
> Fully satisfies my v1's comments:
>
> Acked-by: Krzysztof Kozlowski <[email protected]>

Applied, thanks!
Maxime

--
Maxime Ripard, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

Attachments:

(No filename) (1.05 kB)
signature.asc (819.00 B)
Digital signature Download all attachments