Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6ba5a63a authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: Make crypto address part of host controller node"

parents f156a1c0 077c1852

arch/arm64/boot/dts/qcom/trinket.dtsi

+5 −5
Original line number Diff line number Diff line
@@ -942,11 +942,11 @@ 


	ufshc_mem: ufshc@4804000 {

		compatible = "qcom,ufshc";

		reg = <0x4804000 0x3000>;

		reg = <0x4804000 0x3000>, <0x4810000 0x8000>;

		reg-names = "ufs_mem", "ufs_ice";

		interrupts = <0 356 0>;

		phys = <&ufsphy_mem>;

		phy-names = "ufsphy";

		ufs-qcom-crypto = <&ufs_ice>;



		lanes-per-direction = <1>;

		dev-ref-clk-freq = <0>; /* 19.2 MHz */
@@ -2180,13 +2180,13 @@ 


	sdhc_1: sdhci@4744000 {

		compatible = "qcom,sdhci-msm-v5";

		reg = <0x4744000 0x1000>, <0x4745000 0x1000>;

		reg-names = "hc_mem", "cmdq_mem";

		reg = <0x4744000 0x1000>, <0x4745000 0x1000>,

		      <0x4748000 0x8000>;

		reg-names = "hc_mem", "cmdq_mem", "cmdq_ice";



		interrupts = <GIC_SPI 348 IRQ_TYPE_NONE>,

					<GIC_SPI 352 IRQ_TYPE_NONE>;

		interrupt-names = "hc_irq", "pwr_irq";

		sdhc-msm-crypto = <&sdcc1_ice>;



		qcom,bus-width = <8>;

		qcom,large-address-bus;

arch/arm64/configs/vendor/trinket-perf_defconfig

+10 −0
Original line number Diff line number Diff line
@@ -52,6 +52,8 @@ CONFIG_MODULE_SIG=y 
CONFIG_MODULE_SIG_FORCE=y

CONFIG_MODULE_SIG_SHA512=y

# CONFIG_BLK_DEV_BSG is not set

CONFIG_BLK_INLINE_ENCRYPTION=y

CONFIG_BLK_INLINE_ENCRYPTION_FALLBACK=y

CONFIG_PARTITION_ADVANCED=y

# CONFIG_IOSCHED_DEADLINE is not set

CONFIG_CFQ_GROUP_IOSCHED=y
@@ -279,9 +281,12 @@ CONFIG_SCSI_SCAN_ASYNC=y 
CONFIG_SCSI_UFSHCD=y

CONFIG_SCSI_UFSHCD_PLATFORM=y

CONFIG_SCSI_UFS_QCOM=y

CONFIG_SCSI_UFS_CRYPTO=y

CONFIG_SCSI_UFS_CRYPTO_QTI=y

CONFIG_MD=y

CONFIG_BLK_DEV_DM=y

CONFIG_DM_CRYPT=y

CONFIG_DM_DEFAULT_KEY=y

CONFIG_DM_SNAPSHOT=y

CONFIG_DM_UEVENT=y

CONFIG_DM_VERITY=y
@@ -509,6 +514,8 @@ CONFIG_MMC_SDHCI=y 
CONFIG_MMC_SDHCI_PLTFM=y

CONFIG_MMC_SDHCI_MSM=y

CONFIG_MMC_CQ_HCI=y

CONFIG_MMC_CQ_HCI_CRYPTO=y

CONFIG_MMC_CQ_HCI_CRYPTO_QTI=y

CONFIG_LEDS_QPNP_FLASH_V2=y

CONFIG_LEDS_QPNP_HAPTICS=y

CONFIG_LEDS_QTI_TRI_LED=y
@@ -608,6 +615,8 @@ CONFIG_QMP_DEBUGFS_CLIENT=y 
CONFIG_QCOM_SMP2P_SLEEPSTATE=y

CONFIG_QCOM_CDSP_RM=y

CONFIG_QCOM_CX_IPEAK=y

CONFIG_QTI_CRYPTO_COMMON=y

CONFIG_QTI_CRYPTO_TZ=y

CONFIG_DEVFREQ_GOV_PASSIVE=y

CONFIG_QCOM_BIMC_BWMON=y

CONFIG_ARM_MEMLAT_MON=y
@@ -640,6 +649,7 @@ CONFIG_EXT4_FS_SECURITY=y 
CONFIG_F2FS_FS=y

CONFIG_F2FS_FS_SECURITY=y

CONFIG_F2FS_FS_ENCRYPTION=y

CONFIG_FS_ENCRYPTION_INLINE_CRYPT=y

CONFIG_FS_VERITY=y

CONFIG_FS_VERITY_BUILTIN_SIGNATURES=y

CONFIG_QUOTA=y

arch/arm64/configs/vendor/trinket_defconfig

+10 −0
Original line number Diff line number Diff line
@@ -54,6 +54,8 @@ CONFIG_MODULE_SIG=y 
CONFIG_MODULE_SIG_FORCE=y

CONFIG_MODULE_SIG_SHA512=y

# CONFIG_BLK_DEV_BSG is not set

CONFIG_BLK_INLINE_ENCRYPTION=y

CONFIG_BLK_INLINE_ENCRYPTION_FALLBACK=y

CONFIG_PARTITION_ADVANCED=y

# CONFIG_IOSCHED_DEADLINE is not set

CONFIG_CFQ_GROUP_IOSCHED=y
@@ -290,9 +292,12 @@ CONFIG_SCSI_UFSHCD=y 
CONFIG_SCSI_UFSHCD_PLATFORM=y

CONFIG_SCSI_UFS_QCOM=y

CONFIG_SCSI_UFSHCD_CMD_LOGGING=y

CONFIG_SCSI_UFS_CRYPTO=y

CONFIG_SCSI_UFS_CRYPTO_QTI=y

CONFIG_MD=y

CONFIG_BLK_DEV_DM=y

CONFIG_DM_CRYPT=y

CONFIG_DM_DEFAULT_KEY=y

CONFIG_DM_SNAPSHOT=y

CONFIG_DM_UEVENT=y

CONFIG_DM_VERITY=y
@@ -524,6 +529,8 @@ CONFIG_MMC_SDHCI=y 
CONFIG_MMC_SDHCI_PLTFM=y

CONFIG_MMC_SDHCI_MSM=y

CONFIG_MMC_CQ_HCI=y

CONFIG_MMC_CQ_HCI_CRYPTO=y

CONFIG_MMC_CQ_HCI_CRYPTO_QTI=y

CONFIG_LEDS_QPNP_FLASH_V2=y

CONFIG_LEDS_QPNP_HAPTICS=y

CONFIG_LEDS_QTI_TRI_LED=y
@@ -638,6 +645,8 @@ CONFIG_QMP_DEBUGFS_CLIENT=y 
CONFIG_QCOM_SMP2P_SLEEPSTATE=y

CONFIG_QCOM_CDSP_RM=y

CONFIG_QCOM_CX_IPEAK=y

CONFIG_QTI_CRYPTO_COMMON=y

CONFIG_QTI_CRYPTO_TZ=y

CONFIG_DEVFREQ_GOV_PASSIVE=y

CONFIG_QCOM_BIMC_BWMON=y

CONFIG_ARM_MEMLAT_MON=y
@@ -671,6 +680,7 @@ CONFIG_EXT4_FS_SECURITY=y 
CONFIG_F2FS_FS=y

CONFIG_F2FS_FS_SECURITY=y

CONFIG_F2FS_FS_ENCRYPTION=y

CONFIG_FS_ENCRYPTION_INLINE_CRYPT=y

CONFIG_FS_VERITY=y

CONFIG_FS_VERITY_BUILTIN_SIGNATURES=y

CONFIG_QUOTA=y