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

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

Merge "mmc: host: Register changes for msmfalcon"

parents 244d98cc 4d0e9474

Documentation/devicetree/bindings/mmc/sdhci-msm.txt

+3 −0
Original line number Diff line number Diff line
@@ -4,6 +4,9 @@ Secure Digital Host Controller provides standard host interface to SD/MMC/SDIO c 


Required properties:

  - compatible : should be "qcom,sdhci-msm"

		For SDCC version 5.0.0, MCI registers are removed from SDCC interface

		and some registers are moved to HC. New compatible string is added to

		support this change - "qcom,sdhci-msm-v5".

  - reg : should contain SDHC, SD Core register map.

  - reg-names : indicates various resources passed to driver (via reg proptery) by name.

		Required "reg-names" are "hc_mem" and "core_mem"

drivers/mmc/host/sdhci-msm.c

+500 −227

File changed.

Preview size limit exceeded, changes collapsed.

drivers/mmc/host/sdhci-msm.h

+3 −1
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2015, The Linux Foundation. All rights reserved.

 * Copyright (c) 2016, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -214,6 +214,8 @@ struct sdhci_msm_host { 
	bool pm_qos_group_enable;

	struct sdhci_msm_pm_qos_irq pm_qos_irq;

	bool tuning_in_progress;

	bool mci_removed;

	const struct sdhci_msm_offset *offset;

};



extern char *saved_command_line;