ARM/ARM64: configs: tizen: Sync from non-rt to rt and with savedefconfig

After some config commits, non-rt and rt defconfigs have different
configs. Sync from non-rt to rt defconfig.
Also, sync with minimized defconfig made with "make savedefconfig".

Change-Id: I047268bf8e345228b4487433000d511e805d56f1
Signed-off-by: Seung-Woo Kim <sw0312.kim@samsung.com>

diff --git a/arch/arm/configs/tizen_bcm2711_rt_defconfig b/arch/arm/configs/tizen_bcm2711_rt_defconfig
index d4b4520..f4b6db2 100644 (file)
--- a/arch/arm/configs/tizen_bcm2711_rt_defconfig
+++ b/arch/arm/configs/tizen_bcm2711_rt_defconfig
@@ -14,6 +14,7 @@ CONFIG_TASKSTATS=y
 CONFIG_TASK_DELAY_ACCT=y
 CONFIG_TASK_XACCT=y
 CONFIG_TASK_IO_ACCOUNTING=y
+CONFIG_PSI=y
 CONFIG_MEMCG=y
 CONFIG_BLK_CGROUP=y
 CONFIG_CGROUP_FREEZER=y
@@ -194,7 +195,6 @@ CONFIG_MAC80211_LEDS=y
 CONFIG_RFKILL=y
 CONFIG_PCI=y
 CONFIG_PCIEPORTBUS=y
-# CONFIG_PCIEASPM is not set
 CONFIG_PCI_MSI=y
 CONFIG_PCIE_BRCMSTB=y
 CONFIG_DEVTMPFS=y
@@ -241,6 +241,7 @@ CONFIG_USB_EPSON2888=y
 CONFIG_USB_KC2190=y
 CONFIG_BRCMFMAC=m
 CONFIG_BRCMDBG=y
+CONFIG_MT7921U=m
 CONFIG_RT2X00=y
 CONFIG_RT2800USB=y
 CONFIG_RT2800USB_RT3573=y
@@ -263,7 +264,6 @@ CONFIG_BCM_VCIO=y
 CONFIG_SERIAL_8250=y
 # CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set
 CONFIG_SERIAL_8250_CONSOLE=y
-# CONFIG_SERIAL_8250_DMA is not set
 CONFIG_SERIAL_8250_NR_UARTS=1
 CONFIG_SERIAL_8250_RUNTIME_UARTS=0
 CONFIG_SERIAL_8250_EXTENDED=y
@@ -354,6 +354,7 @@ CONFIG_SND_SOC_PCM512x_I2C=m
 CONFIG_SND_SOC_SGTL5000=m
 CONFIG_SND_SOC_WM8741=m
 CONFIG_SND_SOC_TPA6130A2=m
+CONFIG_SND_SIMPLE_CARD=y
 CONFIG_HIDRAW=y
 CONFIG_HID_LED=m
 CONFIG_HID_MULTITOUCH=y

diff --git a/arch/arm64/configs/tizen_bcm2711_defconfig b/arch/arm64/configs/tizen_bcm2711_defconfig
index 8b96bd7..b3e3e3a 100644 (file)
--- a/arch/arm64/configs/tizen_bcm2711_defconfig
+++ b/arch/arm64/configs/tizen_bcm2711_defconfig
@@ -193,7 +193,6 @@ CONFIG_MAC80211_MESH=y
 CONFIG_MAC80211_LEDS=y
 CONFIG_RFKILL=y
 CONFIG_PCI=y
-CONFIG_PCIE_BRCMSTB=y
 CONFIG_DEVTMPFS=y
 CONFIG_DEVTMPFS_MOUNT=y
 CONFIG_CONNECTOR=y
@@ -373,7 +372,6 @@ CONFIG_USB_HIDDEV=y
 CONFIG_USB=y
 CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
 CONFIG_USB_XHCI_HCD=y
-CONFIG_USB_XHCI_PLATFORM=y
 CONFIG_USB_ACM=m
 CONFIG_USB_PRINTER=y
 CONFIG_USB_STORAGE=y

diff --git a/arch/arm64/configs/tizen_bcm2711_rt_defconfig b/arch/arm64/configs/tizen_bcm2711_rt_defconfig
index 086de96..14005e3 100644 (file)
--- a/arch/arm64/configs/tizen_bcm2711_rt_defconfig
+++ b/arch/arm64/configs/tizen_bcm2711_rt_defconfig
@@ -14,6 +14,7 @@ CONFIG_TASKSTATS=y
 CONFIG_TASK_DELAY_ACCT=y
 CONFIG_TASK_XACCT=y
 CONFIG_TASK_IO_ACCOUNTING=y
+CONFIG_PSI=y
 CONFIG_MEMCG=y
 CONFIG_BLK_CGROUP=y
 CONFIG_CGROUP_FREEZER=y
@@ -28,6 +29,7 @@ CONFIG_EXPERT=y
 CONFIG_PROFILING=y
 CONFIG_ARCH_BCM=y
 CONFIG_ARCH_BCM2835=y
+CONFIG_ARCH_BRCMSTB=y
 # CONFIG_CAVIUM_ERRATUM_22375 is not set
 # CONFIG_CAVIUM_ERRATUM_23154 is not set
 # CONFIG_CAVIUM_ERRATUM_27456 is not set
@@ -193,7 +195,6 @@ CONFIG_MAC80211_MESH=y
 CONFIG_MAC80211_LEDS=y
 CONFIG_RFKILL=y
 CONFIG_PCI=y
-CONFIG_PCIE_BRCMSTB=y
 CONFIG_DEVTMPFS=y
 CONFIG_DEVTMPFS_MOUNT=y
 CONFIG_CONNECTOR=y
@@ -222,6 +223,8 @@ CONFIG_WIREGUARD=y
 CONFIG_TUN=y
 CONFIG_VETH=y
 CONFIG_BCMGENET=y
+CONFIG_MACB=y
+CONFIG_MACB_PCI=y
 CONFIG_PPP=y
 CONFIG_PPP_BSDCOMP=y
 CONFIG_PPP_DEFLATE=y
@@ -239,8 +242,14 @@ CONFIG_USB_EPSON2888=y
 CONFIG_USB_KC2190=y
 CONFIG_BRCMFMAC=m
 CONFIG_BRCMDBG=y
+CONFIG_MT7921U=m
 CONFIG_RT2X00=y
 CONFIG_RT2500USB=y
+CONFIG_RT73USB=m
+CONFIG_RT2800USB=m
+CONFIG_RT2800USB_RT3573=y
+CONFIG_RT2800USB_RT53XX=y
+CONFIG_RT2800USB_RT55XX=y
 CONFIG_INPUT_MOUSEDEV=y
 CONFIG_INPUT_JOYDEV=m
 CONFIG_INPUT_EVDEV=y
@@ -280,11 +289,18 @@ CONFIG_I2C_STUB=m
 CONFIG_SPI=y
 CONFIG_SPI_BCM2835=y
 CONFIG_SPI_BCM2835AUX=m
+CONFIG_SPI_DESIGNWARE=y
+CONFIG_SPI_DW_DMA=y
+CONFIG_SPI_DW_MMIO=y
 CONFIG_SPI_SPIDEV=y
+CONFIG_PINCTRL_RP1=y
+CONFIG_PINCTRL_BCM2712=y
 CONFIG_GPIO_SYSFS=y
 CONFIG_GPIO_BCM_VIRT=y
 CONFIG_GPIO_STMPE=y
 CONFIG_POWER_RESET_GPIO=y
+CONFIG_SENSORS_PWM_FAN=y
+CONFIG_SENSORS_RP1_ADC=y
 CONFIG_THERMAL=y
 CONFIG_BCM2711_THERMAL=y
 CONFIG_BCM2835_THERMAL=y
@@ -295,6 +311,7 @@ CONFIG_MFD_STMPE=y
 CONFIG_STMPE_SPI=y
 CONFIG_MFD_SYSCON=y
 CONFIG_MFD_WL1273_CORE=m
+CONFIG_MFD_RP1=y
 CONFIG_REGULATOR=y
 CONFIG_REGULATOR_FIXED_VOLTAGE=y
 CONFIG_REGULATOR_GPIO=y
@@ -319,6 +336,7 @@ CONFIG_USB_VIDEO_CLASS=y
 CONFIG_V4L_PLATFORM_DRIVERS=y
 CONFIG_VIDEO_MUX=y
 CONFIG_VIDEO_BCM2835_UNICAM=y
+CONFIG_VIDEO_RP1_CFE=y
 CONFIG_VIDEO_IMX219=y
 CONFIG_VIDEO_IMX708=y
 CONFIG_VIDEO_OV5647=y
@@ -332,6 +350,9 @@ CONFIG_DRM_TOSHIBA_TC358762=y
 CONFIG_DRM_V3D=y
 CONFIG_DRM_VC4=y
 CONFIG_DRM_VC4_HDMI_CEC=y
+CONFIG_DRM_RP1_DSI=y
+CONFIG_DRM_RP1_DPI=y
+CONFIG_DRM_RP1_VEC=y
 CONFIG_FB=y
 CONFIG_FB_SIMPLE=y
 CONFIG_BACKLIGHT_CLASS_DEVICE=y
@@ -353,11 +374,11 @@ CONFIG_USB_HIDDEV=y
 CONFIG_USB=y
 CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
 CONFIG_USB_XHCI_HCD=y
-CONFIG_USB_XHCI_PLATFORM=y
 CONFIG_USB_ACM=m
 CONFIG_USB_PRINTER=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_UAS=y
+CONFIG_USB_DWC3=y
 CONFIG_USB_DWC2=y
 CONFIG_USB_SERIAL=m
 CONFIG_USB_SERIAL_GENERIC=y
@@ -379,6 +400,7 @@ CONFIG_MMC_BCM2835_DMA=y
 CONFIG_MMC_BCM2835_SDHOST=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_PLTFM=y
+CONFIG_MMC_SDHCI_OF_DWCMSHC=y
 CONFIG_MMC_SDHCI_IPROC=y
 CONFIG_NEW_LEDS=y
 CONFIG_LEDS_CLASS=y
@@ -396,6 +418,7 @@ CONFIG_RTC_CLASS=y
 # CONFIG_RTC_HCTOSYS is not set
 CONFIG_DMADEVICES=y
 CONFIG_DMA_BCM2835=y
+CONFIG_DW_AXI_DMAC=y
 CONFIG_DMA_BCM2708=y
 CONFIG_SW_SYNC=y
 CONFIG_STAGING=y
@@ -405,14 +428,18 @@ CONFIG_SND_BCM2835=y
 CONFIG_VIDEO_BCM2835=y
 CONFIG_VIDEO_CODEC_BCM2835=y
 CONFIG_VIDEO_ISP_BCM2835=y
+CONFIG_COMMON_CLK_RP1=y
+CONFIG_COMMON_CLK_RP1_SDIO=y
 CONFIG_CLK_RASPBERRYPI=y
 CONFIG_MAILBOX=y
 CONFIG_BCM2835_MBOX=y
-# CONFIG_IOMMU_SUPPORT is not set
+CONFIG_BCM2712_IOMMU=y
 CONFIG_RASPBERRYPI_POWER=y
 CONFIG_PWM=y
 CONFIG_PWM_BCM2835=y
-CONFIG_GENERIC_PHY=y
+CONFIG_PWM_BRCMSTB=y
+CONFIG_PWM_RP1=y
+CONFIG_BCM2712_MIP=y
 CONFIG_ANDROID_BINDER_IPC=y
 CONFIG_ANDROID_BINDERFS=y
 CONFIG_EXT4_FS=y