mmc: mmci: Add Qualcomm Id to amba id table (55b604ae) · Commits · 戴 / test

This patch adds a fake Qualcomm ID 0x00051180 to the amba_ids, as Qualcomm SDCC controller is pl180, but amba id registers read 0x0's. The plan is to remove SDCC driver totally and use mmci as the main SD controller driver for Qualcomm SOCs. Signed-off-by:

Srinivas Kandagatla <srinivas.kandagatla@linaro.org> Reviewed-by:

Linus Walleij <linus.walleij@linaro.org> Signed-off-by:

Ulf Hansson <ulf.hansson@linaro.org>

drivers/mmc/host/mmci.c

+23 −0

Original line number	Diff line number	Diff line
		@@ -190,6 +190,23 @@ static struct variant_data variant_ux500v2 = {
		.pwrreg_nopower = true,
		};

		static struct variant_data variant_qcom = {
		.fifosize = 16 * 4,
		.fifohalfsize = 8 * 4,
		.clkreg = MCI_CLK_ENABLE,
		.clkreg_enable = MCI_QCOM_CLK_FLOWENA \|
		MCI_QCOM_CLK_SELECT_IN_FBCLK,
		.clkreg_8bit_bus_enable = MCI_QCOM_CLK_WIDEBUS_8,
		.datactrl_mask_ddrmode = MCI_QCOM_CLK_SELECT_IN_DDR_MODE,
		.data_cmd_enable = MCI_QCOM_CSPM_DATCMD,
		.blksz_datactrl4 = true,
		.datalength_bits = 24,
		.pwrreg_powerup = MCI_PWR_UP,
		.f_max = 208000000,
		.explicit_mclk_control = true,
		.qcom_fifo = true,
		};

		static int mmci_card_busy(struct mmc_host *mmc)
		{
		struct mmci_host *host = mmc_priv(mmc);
		@@ -1832,6 +1849,12 @@ static struct amba_id mmci_ids[] = {
		.mask = 0xf0ffffff,
		.data = &variant_ux500v2,
		},
		/* Qualcomm variants */
		{
		.id = 0x00051180,
		.mask = 0x000fffff,
		.data = &variant_qcom,
		},
		{ 0, 0 },
		};

Admin message