Skip to content

Commit ecd6526

Browse files
committed
Merge branch 'working-hikey960-upstream-defconfig-v4.9' into working-hikey960-upstream-rebase-v4.9-2017-07-06-11-02-50
* working-hikey960-upstream-defconfig-v4.9: hikey960_defconfig: append CPUFREQ configs hikey960_defconfig: append CONFIG_CPU_IDLE_MULTIPLE_DRIVERS configs hikey960_defconfig: append F2FS and SQUASHFS configs hikey960_defconfig: append MALI configs hikey960_defconfig: append USB configs hikey960_defconfig: add configs for thermal sensor arm64: defconfig: add configs for thermal sensor hikey960_defconfig: Add initial defconfig arm64: defconfig: enable usb for hikey960 arm64: defconfig: enable power management for Hi3660 arm64: defconfig: PCI: add PCIe drivers defconfig for hisilicon Kirin SoC arm64: defconfig: enable Mali GPU arm64: defconfig: enable f2fs and squashfs arm64: defconfig: enable configs for hi3660 ufs arm64: defconfig: enable support hi6421v530 PMIC
2 parents 58017c5 + ba5a478 commit ecd6526

File tree

2 files changed

+595
-0
lines changed

2 files changed

+595
-0
lines changed

arch/arm64/configs/defconfig

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@ CONFIG_PCI_XGENE=y
6969
CONFIG_PCI_LAYERSCAPE=y
7070
CONFIG_PCI_HISI=y
7171
CONFIG_PCIE_QCOM=y
72+
CONFIG_PCIE_KIRIN=y
7273
CONFIG_PCIE_ARMADA_8K=y
7374
CONFIG_ARM64_VA_BITS_48=y
7475
CONFIG_SCHED_MC=y
@@ -82,8 +83,12 @@ CONFIG_KEXEC=y
8283
# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
8384
CONFIG_COMPAT=y
8485
CONFIG_CPU_IDLE=y
86+
CONFIG_CPU_IDLE_MULTIPLE_DRIVERS=y
8587
CONFIG_ARM_CPUIDLE=y
88+
CONFIG_ARM_HISI_CPUIDLE=y
8689
CONFIG_CPU_FREQ=y
90+
CONFIG_CPU_FREQ_DEFAULT_GOV_SCHEDUTIL=y
91+
CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y
8792
CONFIG_CPUFREQ_DT=y
8893
CONFIG_ARM_BIG_LITTLE_CPUFREQ=y
8994
CONFIG_ARM_SCPI_CPUFREQ=y
@@ -152,6 +157,9 @@ CONFIG_SRAM=y
152157
CONFIG_BLK_DEV_SD=y
153158
CONFIG_SCSI_SAS_ATA=y
154159
CONFIG_SCSI_HISI_SAS=y
160+
CONFIG_SCSI_UFSHCD=y
161+
CONFIG_SCSI_UFSHCD_PLATFORM=y
162+
CONFIG_SCSI_UFS_HI3660=y
155163
CONFIG_ATA=y
156164
CONFIG_SATA_AHCI=y
157165
CONFIG_SATA_AHCI_PLATFORM=y
@@ -272,6 +280,7 @@ CONFIG_THERMAL=y
272280
CONFIG_THERMAL_EMULATION=y
273281
CONFIG_THERMAL_GOV_POWER_ALLOCATOR=y
274282
CONFIG_CPU_THERMAL=y
283+
CONFIG_HI3660_THERMAL=y
275284
CONFIG_EXYNOS_THERMAL=y
276285
CONFIG_WATCHDOG=y
277286
CONFIG_RENESAS_WDT=y
@@ -281,12 +290,14 @@ CONFIG_MESON_WATCHDOG=m
281290
CONFIG_MFD_MAX77620=y
282291
CONFIG_MFD_SPMI_PMIC=y
283292
CONFIG_MFD_SEC_CORE=y
293+
CONFIG_MFD_HI6421_PMIC=y
284294
CONFIG_MFD_HI655X_PMIC=y
285295
CONFIG_REGULATOR=y
286296
CONFIG_MFD_CROS_EC=y
287297
CONFIG_MFD_CROS_EC_I2C=y
288298
CONFIG_REGULATOR_FIXED_VOLTAGE=y
289299
CONFIG_REGULATOR_GPIO=y
300+
CONFIG_REGULATOR_HI6421V530=y
290301
CONFIG_REGULATOR_HI655X=y
291302
CONFIG_REGULATOR_MAX77620=y
292303
CONFIG_REGULATOR_PWM=y
@@ -313,6 +324,7 @@ CONFIG_SND_SOC=y
313324
CONFIG_SND_SOC_RCAR=y
314325
CONFIG_SND_SOC_SAMSUNG=y
315326
CONFIG_SND_SOC_AK4613=y
327+
CONFIG_HUB_USB5734=y
316328
CONFIG_USB=y
317329
CONFIG_USB_OTG=y
318330
CONFIG_USB_XHCI_HCD=y
@@ -328,12 +340,20 @@ CONFIG_USB_OHCI_HCD=y
328340
CONFIG_USB_OHCI_HCD_PLATFORM=y
329341
CONFIG_USB_RENESAS_USBHS=m
330342
CONFIG_USB_STORAGE=y
343+
CONFIG_USB_DWC3=y
344+
CONFIG_USB_DWC3_HISI=y
345+
CONFIG_USB_DWC3_OTG=y
331346
CONFIG_USB_DWC2=y
332347
CONFIG_USB_DWC3=y
333348
CONFIG_USB_CHIPIDEA=y
334349
CONFIG_USB_CHIPIDEA_UDC=y
335350
CONFIG_USB_CHIPIDEA_HOST=y
336351
CONFIG_USB_ISP1760=y
352+
CONFIG_TCPC_CLASS=y
353+
CONFIG_USB_POWER_DELIVERY=y
354+
CONFIG_TCPC_RT1711H=y
355+
CONFIG_USB_PD_VBUS_STABLE_TOUT=125
356+
CONFIG_USB_PD_VBUS_PRESENT_TOUT=20
337357
CONFIG_USB_HSIC_USB3503=y
338358
CONFIG_USB_MSM_OTG=y
339359
CONFIG_USB_ULPI=y
@@ -389,13 +409,15 @@ CONFIG_COMMON_CLK_SCPI=y
389409
CONFIG_COMMON_CLK_CS2000_CP=y
390410
CONFIG_COMMON_CLK_S2MPS11=y
391411
CONFIG_CLK_QORIQ=y
412+
CONFIG_STUB_CLK_HI3660=y
392413
CONFIG_COMMON_CLK_QCOM=y
393414
CONFIG_MSM_GCC_8916=y
394415
CONFIG_MSM_MMCC_8996=y
395416
CONFIG_HWSPINLOCK_QCOM=y
396417
CONFIG_MAILBOX=y
397418
CONFIG_ARM_MHU=y
398419
CONFIG_HI6220_MBOX=y
420+
CONFIG_HI3660_MBOX=y
399421
CONFIG_ARM_SMMU=y
400422
CONFIG_QCOM_SMEM=y
401423
CONFIG_QCOM_SMD=y
@@ -406,6 +428,30 @@ CONFIG_EXTCON_USB_GPIO=y
406428
CONFIG_PWM=y
407429
CONFIG_PWM_TEGRA=m
408430
CONFIG_COMMON_RESET_HI6220=y
431+
#
432+
# ARM GPU Configuration
433+
#
434+
CONFIG_MALI_MIDGARD=y
435+
# CONFIG_MALI_GATOR_SUPPORT is not set
436+
CONFIG_MALI_MIDGARD_DVFS=y
437+
# CONFIG_MALI_MIDGARD_RT_PM is not set
438+
# CONFIG_MALI_MIDGARD_ENABLE_TRACE is not set
439+
# CONFIG_MALI_MIDGARD_DEBUG_SYS is not set
440+
# CONFIG_MALI_DEVFREQ is not set
441+
CONFIG_MALI_EXPERT=y
442+
# CONFIG_MALI_DEBUG_SHADER_SPLIT_FS is not set
443+
CONFIG_MALI_PLATFORM_FAKE=y
444+
CONFIG_MALI_PLATFORM_HISILICON=y
445+
# CONFIG_MALI_DEBUG is not set
446+
# CONFIG_MALI_NO_MALI is not set
447+
# CONFIG_MALI_TRACE_TIMELINE is not set
448+
# CONFIG_MALI_SYSTEM_TRACE is not set
449+
# CONFIG_MALI_PM_DEMAND is not set
450+
CONFIG_REPORT_VSYNC=y
451+
CONFIG_MALI_IDLE_AUTO_CLK_DIV=y
452+
# CONFIG_MALI_DMA_FENCE is not set
453+
# CONFIG_MALI_PRFCNT_SET_SECONDARY is not set
454+
# CONFIG_FMC is not set
409455
CONFIG_PHY_RCAR_GEN3_USB2=y
410456
CONFIG_PHY_HI6220_USB=y
411457
CONFIG_PHY_XGENE=y
@@ -417,6 +463,7 @@ CONFIG_EXYNOS_ADC=y
417463
CONFIG_PWM_SAMSUNG=y
418464
CONFIG_EXT2_FS=y
419465
CONFIG_EXT3_FS=y
466+
CONFIG_F2FS_FS=y
420467
CONFIG_EXT4_FS_POSIX_ACL=y
421468
CONFIG_BTRFS_FS=m
422469
CONFIG_BTRFS_FS_POSIX_ACL=y
@@ -433,6 +480,13 @@ CONFIG_HUGETLBFS=y
433480
CONFIG_CONFIGFS_FS=y
434481
CONFIG_EFIVAR_FS=y
435482
CONFIG_SQUASHFS=y
483+
CONFIG_SQUASHFS_FILE_DIRECT=y
484+
CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU=y
485+
CONFIG_SQUASHFS_XATTR=y
486+
CONFIG_SQUASHFS_LZ4=y
487+
CONFIG_SQUASHFS_LZO=y
488+
CONFIG_SQUASHFS_XZ=y
489+
CONFIG_SQUASHFS_4K_DEVBLK_SIZE=y
436490
CONFIG_NFS_FS=y
437491
CONFIG_NFS_V4=y
438492
CONFIG_NFS_V4_1=y

0 commit comments

Comments
 (0)