Skip to content

Commit 55b65ae

Browse files
committed
Merge branch 'working-hikey-tracking-config-v4.4' into working-hikey-mainline-rebase-v4.4-c22
* working-hikey-tracking-config-v4.4: (23 commits) defconfig: enable BT_LEDS arm64: config: enable power efficiency workqueue defconfig: Add gpu configures arm64: defconfig: fix: i2c built as 'y' arm64: defcofnig: Set cma heap size to 128MB arm64: defconfig: Enable panel driver arm64: defconfig: Enable adv7511 driver arm64: defconfig: Enable HiSilicon kirin drm driver arm64: defconfig: Enable TEE and OPTEE ARM64: defconfig: support thermal for Hikey ARM64: defconfig: enable CPUFreq driver for Hikey arm64: defconfig: Enable K3_DMA to support HDMI audio arm64: defconfig: enable Hi6210 I2S driver, SND and SND debug hikey: config: enable CONFIG_HISI_POWERKEY hikey: config: enable CONFIG_PSTORE CONFIG_PSTORE_RAM built as modules hikey: config: disable ANDROID_PARANOID_NETWORK hikey: config: enable Bluetooth hikey: config: enable HI6220 MTCMOS regulators ARM64: defconfig: enable several common USB network adapters hikey: config: enable configs for TI WL1835, built as module ...
2 parents 4d73f5f + 085c515 commit 55b65ae

File tree

1 file changed

+98
-3
lines changed

1 file changed

+98
-3
lines changed

arch/arm64/configs/defconfig

Lines changed: 98 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
CONFIG_TEE=y
2+
CONFIG_OPTEE=y
13
# CONFIG_LOCALVERSION_AUTO is not set
24
CONFIG_SYSVIPC=y
35
CONFIG_POSIX_MQUEUE=y
@@ -58,11 +60,23 @@ CONFIG_PREEMPT=y
5860
CONFIG_KSM=y
5961
CONFIG_TRANSPARENT_HUGEPAGE=y
6062
CONFIG_CMA=y
63+
CONFIG_CMA_SIZE_MBYTES=128
6164
CONFIG_CMDLINE="console=ttyAMA0"
6265
# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
6366
CONFIG_COMPAT=y
67+
CONFIG_WQ_POWER_EFFICIENT_DEFAULT=y
6468
CONFIG_CPU_IDLE=y
6569
CONFIG_ARM_CPUIDLE=y
70+
CONFIG_CPU_FREQ=y
71+
CONFIG_CPU_FREQ_GOV_COMMON=y
72+
CONFIG_CPU_FREQ_STAT=y
73+
CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
74+
CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
75+
CONFIG_CPU_FREQ_GOV_POWERSAVE=y
76+
CONFIG_CPU_FREQ_GOV_USERSPACE=y
77+
CONFIG_CPU_FREQ_GOV_ONDEMAND=y
78+
CONFIG_CPUFREQ_DT=y
79+
CONFIG_ARM_HISI_ACPU_CPUFREQ=y
6680
CONFIG_NET=y
6781
CONFIG_PACKET=y
6882
CONFIG_UNIX=y
@@ -72,8 +86,25 @@ CONFIG_IP_PNP_DHCP=y
7286
CONFIG_IP_PNP_BOOTP=y
7387
# CONFIG_INET_LRO is not set
7488
# CONFIG_IPV6 is not set
89+
# CONFIG_ANDROID_PARANOID_NETWORK is not set
7590
CONFIG_BPF_JIT=y
76-
# CONFIG_WIRELESS is not set
91+
CONFIG_BT=m
92+
CONFIG_BT_LEDS=y
93+
CONFIG_BT_RFCOMM=m
94+
CONFIG_BT_RFCOMM_TTY=y
95+
CONFIG_BT_BNEP=m
96+
CONFIG_BT_BNEP_MC_FILTER=y
97+
CONFIG_BT_BNEP_PROTO_FILTER=y
98+
CONFIG_BT_HIDP=m
99+
CONFIG_BT_SELFTEST=y
100+
CONFIG_BT_HCIUART=m
101+
CONFIG_BT_WILINK=m
102+
CONFIG_CFG80211=m
103+
# CONFIG_CFG80211_DEFAULT_PS is not set
104+
CONFIG_MAC80211=m
105+
CONFIG_MAC80211_LEDS=y
106+
CONFIG_RFKILL=m
107+
# CONFIG_RFKILL_PM is not set
77108
CONFIG_NET_9P=y
78109
CONFIG_NET_9P_VIRTIO=y
79110
# CONFIG_TEGRA_AHB is not set
@@ -83,6 +114,8 @@ CONFIG_DEVTMPFS_MOUNT=y
83114
CONFIG_DMA_CMA=y
84115
CONFIG_BLK_DEV_LOOP=y
85116
CONFIG_VIRTIO_BLK=y
117+
CONFIG_TI_ST=m
118+
CONFIG_ST_HCI=m
86119
# CONFIG_SCSI_PROC_FS is not set
87120
CONFIG_BLK_DEV_SD=y
88121
# CONFIG_SCSI_LOWLEVEL is not set
@@ -100,9 +133,24 @@ CONFIG_NET_XGENE=y
100133
CONFIG_SKY2=y
101134
CONFIG_SMC91X=y
102135
CONFIG_SMSC911X=y
103-
# CONFIG_WLAN is not set
136+
CONFIG_USB_NET_DRIVERS=y
137+
CONFIG_USB_PEGASUS=m
138+
CONFIG_USB_RTL8150=m
139+
CONFIG_USB_RTL8152=m
140+
CONFIG_USB_USBNET=m
141+
CONFIG_USB_NET_DM9601=m
142+
CONFIG_USB_NET_SR9800=m
143+
CONFIG_USB_NET_SMSC75XX=m
144+
CONFIG_USB_NET_SMSC95XX=m
145+
CONFIG_USB_NET_PLUSB=m
146+
CONFIG_USB_NET_MCS7830=m
147+
CONFIG_WL_TI=y
148+
CONFIG_WL18XX=m
149+
CONFIG_WLCORE_SDIO=m
104150
CONFIG_INPUT_EVDEV=y
105151
CONFIG_KEYBOARD_GPIO=y
152+
CONFIG_INPUT_MISC=y
153+
CONFIG_HISI_POWERKEY=y
106154
# CONFIG_SERIO_SERPORT is not set
107155
CONFIG_SERIO_AMBAKMI=y
108156
CONFIG_LEGACY_PTY_COUNT=16
@@ -124,34 +172,72 @@ CONFIG_SERIAL_XILINX_PS_UART_CONSOLE=y
124172
CONFIG_VIRTIO_CONSOLE=y
125173
# CONFIG_HW_RANDOM is not set
126174
CONFIG_I2C=y
175+
CONFIG_I2C_CHARDEV=y
176+
CONFIG_I2C_DESIGNWARE_PLATFORM=y
127177
CONFIG_I2C_QUP=y
128178
CONFIG_SPI=y
129179
CONFIG_SPI_PL022=y
130180
CONFIG_SPI_QUP=y
181+
CONFIG_SPI_SPIDEV=m
182+
CONFIG_PINCTRL_SINGLE=y
131183
CONFIG_PINCTRL_MSM8916=y
184+
CONFIG_GPIO_SYSFS=y
132185
CONFIG_GPIO_PL061=y
133186
CONFIG_GPIO_XGENE=y
134187
CONFIG_POWER_RESET_XGENE=y
135188
CONFIG_POWER_RESET_SYSCON=y
136189
# CONFIG_HWMON is not set
190+
CONFIG_THERMAL=y
191+
CONFIG_THERMAL_OF=y
192+
CONFIG_THERMAL_DEFAULT_GOV_POWER_ALLOCATOR=y
193+
CONFIG_THERMAL_GOV_POWER_ALLOCATOR=y
194+
CONFIG_CPU_THERMAL=y
195+
CONFIG_HISI_THERMAL=y
196+
CONFIG_MFD_HI655X_PMIC=y
137197
CONFIG_REGULATOR=y
138198
CONFIG_REGULATOR_FIXED_VOLTAGE=y
199+
CONFIG_REGULATOR_HI6220_MTCMOS=y
200+
CONFIG_REGULATOR_HI655X=y
139201
CONFIG_REGULATOR_QCOM_SMD_RPM=y
140202
CONFIG_FB=y
203+
CONFIG_DRM=y
204+
CONFIG_DRM_HISI_KIRIN=y
205+
CONFIG_HISI_KIRIN_DW_DSI=y
206+
CONFIG_DRM_CMA_FBDEV_BUFFER_NUM=2
207+
CONFIG_DRM_I2C_ADV7511=y
208+
CONFIG_DRM_PANEL_HIKEY=y
209+
CONFIG_ION_DUMMY=y
210+
CONFIG_MALI400=y
211+
CONFIG_MALI450=y
212+
CONFIG_MALI400_DEBUG=y
213+
# CONFIG_MALI400_PROFILING is not set
214+
# CONFIG_MALI_DVFS is not set
215+
CONFIG_MALI_SHARED_INTERRUPTS=y
216+
CONFIG_MALI_DT=y
217+
CONFIG_MALI_PLAT_SPECIFIC_DT=y
141218
CONFIG_FB_ARMCLCD=y
142219
CONFIG_FRAMEBUFFER_CONSOLE=y
143220
CONFIG_LOGO=y
144221
# CONFIG_LOGO_LINUX_MONO is not set
145222
# CONFIG_LOGO_LINUX_VGA16 is not set
223+
CONFIG_SOUND=y
224+
CONFIG_SND=y
225+
CONFIG_SND_VERBOSE_PRINTK=y
226+
CONFIG_SND_DEBUG=y
227+
CONFIG_SND_DEBUG_VERBOSE=y
228+
CONFIG_SND_SOC=y
229+
CONFIG_SND_I2S_HI6210_I2S=y
146230
CONFIG_USB=y
147231
CONFIG_USB_EHCI_HCD=y
148232
CONFIG_USB_EHCI_HCD_PLATFORM=y
149233
CONFIG_USB_OHCI_HCD=y
150234
CONFIG_USB_OHCI_HCD_PLATFORM=y
151235
CONFIG_USB_STORAGE=y
236+
CONFIG_USB_DWC2=y
152237
CONFIG_USB_ISP1760=y
153238
CONFIG_USB_ULPI=y
154239
CONFIG_MMC=y
240+
CONFIG_MMC_BLOCK_MINORS=16
155241
CONFIG_MMC_ARMMMCI=y
156242
CONFIG_MMC_SDHCI=y
157243
CONFIG_MMC_SDHCI_PLTFM=y
@@ -160,8 +246,10 @@ CONFIG_MMC_DW=y
160246
CONFIG_MMC_DW_IDMAC=y
161247
CONFIG_MMC_DW_PLTFM=y
162248
CONFIG_MMC_DW_EXYNOS=y
249+
CONFIG_MMC_DW_K3=y
163250
CONFIG_NEW_LEDS=y
164251
CONFIG_LEDS_CLASS=y
252+
CONFIG_LEDS_GPIO=y
165253
CONFIG_LEDS_SYSCON=y
166254
CONFIG_LEDS_TRIGGERS=y
167255
CONFIG_LEDS_TRIGGER_HEARTBEAT=y
@@ -170,17 +258,23 @@ CONFIG_RTC_CLASS=y
170258
CONFIG_RTC_DRV_EFI=y
171259
CONFIG_RTC_DRV_XGENE=y
172260
CONFIG_DMADEVICES=y
261+
CONFIG_K3_DMA=y
173262
CONFIG_QCOM_BAM_DMA=y
174263
CONFIG_VIRTIO_PCI=y
175264
CONFIG_VIRTIO_BALLOON=y
176265
CONFIG_VIRTIO_MMIO=y
266+
CONFIG_STUB_CLK_HI6220=y
177267
CONFIG_COMMON_CLK_QCOM=y
178268
CONFIG_MSM_GCC_8916=y
179269
CONFIG_HWSPINLOCK_QCOM=y
270+
CONFIG_MAILBOX=y
271+
CONFIG_HI6220_MBOX=y
180272
# CONFIG_IOMMU_SUPPORT is not set
181273
CONFIG_QCOM_SMEM=y
182274
CONFIG_QCOM_SMD=y
183275
CONFIG_QCOM_SMD_RPM=y
276+
CONFIG_COMMON_RESET_HI6220=y
277+
CONFIG_PHY_HI6220_USB=y
184278
CONFIG_PHY_XGENE=y
185279
CONFIG_EXT2_FS=y
186280
CONFIG_EXT3_FS=y
@@ -197,7 +291,8 @@ CONFIG_VFAT_FS=y
197291
CONFIG_TMPFS=y
198292
CONFIG_HUGETLBFS=y
199293
CONFIG_EFIVAR_FS=y
200-
# CONFIG_MISC_FILESYSTEMS is not set
294+
CONFIG_PSTORE=m
295+
CONFIG_PSTORE_RAM=m
201296
CONFIG_NFS_FS=y
202297
CONFIG_NFS_V4=y
203298
CONFIG_ROOT_NFS=y

0 commit comments

Comments
 (0)