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

Commit 5e5c8b55 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "mmc: sdhci-msm-ice: implement crypto_cfg_reset host operation"

parents 07479c04 8db42d4a

drivers/mmc/host/sdhci-msm-ice.c

+6 −0
Original line number Diff line number Diff line
@@ -146,6 +146,12 @@ int sdhci_msm_ice_init(struct sdhci_host *host) 
	return 0;

}



void sdhci_msm_ice_cfg_reset(struct sdhci_host *host, u32 slot)

{

	writel_relaxed(SDHCI_MSM_ICE_ENABLE_BYPASS,

		host->ioaddr + CORE_VENDOR_SPEC_ICE_CTRL_INFO_3_n + 16 * slot);

}



int sdhci_msm_ice_cfg(struct sdhci_host *host, struct mmc_request *mrq,

			u32 slot)

{

drivers/mmc/host/sdhci-msm-ice.h

+6 −0
Original line number Diff line number Diff line
@@ -80,6 +80,7 @@ enum { 
#ifdef CONFIG_MMC_SDHCI_MSM_ICE

int sdhci_msm_ice_get_dev(struct sdhci_host *host);

int sdhci_msm_ice_init(struct sdhci_host *host);

void sdhci_msm_ice_cfg_reset(struct sdhci_host *host, u32 slot);

int sdhci_msm_ice_cfg(struct sdhci_host *host, struct mmc_request *mrq,

			u32 slot);

int sdhci_msm_ice_reset(struct sdhci_host *host);
@@ -103,6 +104,11 @@ inline int sdhci_msm_ice_init(struct sdhci_host *host) 
{

	return 0;

}



inline void sdhci_msm_ice_cfg_reset(struct sdhci_host *host, u32 slot)

{

}



inline int sdhci_msm_ice_cfg(struct sdhci_host *host,

		struct mmc_request *mrq, u32 slot)

{

drivers/mmc/host/sdhci-msm.c

+1 −0
Original line number Diff line number Diff line
@@ -3143,6 +3143,7 @@ void sdhci_msm_reset_workaround(struct sdhci_host *host, u32 enable) 


static struct sdhci_ops sdhci_msm_ops = {

	.crypto_engine_cfg = sdhci_msm_ice_cfg,

	.crypto_cfg_reset = sdhci_msm_ice_cfg_reset,

	.crypto_engine_reset = sdhci_msm_ice_reset,

	.set_uhs_signaling = sdhci_msm_set_uhs_signaling,

	.check_power_status = sdhci_msm_check_power_status,