History

Merge tag 'mmc-v5.5' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc

Pull MMC updates from Ulf Hansson: "These are the updates for MMC and MEMSTICK for v5.5. Note that this also contains quite some additional changes reaching beyond both the MMC and MEMSTICK subsystems. This is primarily because of fixing an old regression for a WiFi driver based on the SDIO interface on an OMAP openpandora board MMC core: - Add CMD13 polling for MMC IOCTLS with R1B response. - Add common DT properties for clk-phase-delays for various speed modes. - Fix size overflow for mmc gp-partitions. - Re-work HW reset for SDIO cards, which also includes a re-work for Marvell's WiFi mwifiex SDIO func driver. MMC host: - jz4740: Add support for X1000 and JZ4760. - jz4740: Add support for 8-bit bus and for low power mode. - mmci: Add support for HW busy timeout for the stm32_sdmmc variant. - owl-mmc: Add driver for Actions Semi Owl SoCs SD/MMC controller. - renesas_sdhi: Add support for r8a774b1. - sdhci_am654: Add support for Command Queuing Engine for J721E. - sdhci-milbeaut: Add driver for the Milbeaut SD controller. - sdhci-of-arasan: Add support for ZynqMP tap-delays. - sdhci-of-arasan: Add support for clk-phase-delays for SD cards. - sdhci-of-arasan: Add support for Intel LGM SDXC. - sdhci-of-aspeed: Allow inversion of the internal card detect signal. - sdhci-of-esdhc: Fixup workaround for erratum A-008171 for tunings. - sdhci-of-at91: Improve support for calibration. - sdhci-pci: Add support for Intel JSL. - sdhci-pci: Add quirk for AMD SDHC Device 0x7906. - tmio: Enable support for erase/discard/trim requests. MMC/OMAP/pandora/wl1251: The TI wl1251 WiFi driver for SDIO on the OMAP openpandora board has been broken since v4.7. To fix the problems, changes have been made cross subsystems, but also to OMAP2 machine code and to openpandora DTS files, as summarized below. Relevant changes have been tagged for stable. - mmc/wl1251: Re-introduce lost SDIO quirks and vendor-id for wl1251 - omap/omap_hsmmc: Remove redundant platform config for openpandora - omap_hsmmc: Initialize non-std SDIO card for wl1251 for pandora - omap/dts/pandora: Specify wl1251 through a child node of mmc3 - wl1251: Add devicetree support for TI wl1251 SDIO" * tag 'mmc-v5.5' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc: (73 commits) dt-bindings: mmc: Correct the type of the clk phase properties Revert "mmc: tmio: remove workaround for NON_REMOVABLE" memstick: Fix Kconfig indentation mmc: sdhci-of-arasan: Add support for ZynqMP Platform Tap Delays Setup dt-bindings: mmc: arasan: Document 'xlnx,zynqmp-8.9a' controller firmware: xilinx: Add SDIO Tap Delay nodes mmc: sdhci-of-arasan: Add support to set clock phase delays for SD dt-bindings: mmc: Add optional generic properties for mmc mmc: sdhci-of-arasan: Add sampling clock for a phy to use dt-bindings: mmc: arasan: Update Documentation for the input clock mmc: sdhci-of-arasan: Separate out clk related data to another structure mmc: sdhci: Fix grammar in warning message mmc: sdhci-of-aspeed: add inversion signal presence mmc: sdhci-of-aspeed: enable CONFIG_MMC_SDHCI_IO_ACCESSORS mmc: sdhci_am654: Add Support for Command Queuing Engine to J721E mmc: core: Fix size overflow for mmc partitions mmc: tmio: Add MMC_CAP_ERASE to allow erase/discard/trim requests net: wireless: ti: remove local VENDOR_ID and DEVICE_ID definitions net: wireless: ti: wl1251 use new SDIO_VENDOR_ID_TI_WL1251 definition mmc: core: fix wl1251 sdio quirks ...

Linus Torvalds committed 6 years ago

Commit 0e453842 parents dc5fa46 def7bd964 files · +2631 −694Browse files

Showing the changes to include/linux (4 of 64 files). Show all

Unified · Split

4 files
  1. include/linux/firmware/xlnx-zynqmp.h +12 −1
  2. include/linux/mmc/card.h +2 −1
  3. include/linux/mmc/sdio_ids.h +2 −0
  4. include/linux/platform_data/hsmmc-omap.h +0 −3
include/linux/firmware/xlnx-zynqmp.h+12−1
@@ -91,7 +91,8 @@ enum pm_ret_status { · 90 unmodified lines
91};91};
92 92
93enum pm_ioctl_id {93enum pm_ioctl_id {
94 IOCTL_SET_PLL_FRAC_MODE = 8,94 IOCTL_SET_SD_TAPDELAY = 7,
95 IOCTL_SET_PLL_FRAC_MODE,
95 IOCTL_GET_PLL_FRAC_MODE,96 IOCTL_GET_PLL_FRAC_MODE,
96 IOCTL_SET_PLL_FRAC_DATA,97 IOCTL_SET_PLL_FRAC_DATA,
97 IOCTL_GET_PLL_FRAC_DATA,98 IOCTL_GET_PLL_FRAC_DATA,
@@ -250,6 +251,16 @@ enum zynqmp_pm_request_ack { · 152 unmodified lines
250 ZYNQMP_PM_REQUEST_ACK_NON_BLOCKING,251 ZYNQMP_PM_REQUEST_ACK_NON_BLOCKING,
251};252};
252 253
254enum pm_node_id {
255 NODE_SD_0 = 39,
256 NODE_SD_1,
257};
258
259enum tap_delay_type {
260 PM_TAPDELAY_INPUT = 0,
261 PM_TAPDELAY_OUTPUT,
262};
263
253/**264/**
254 * struct zynqmp_pm_query_data - PM query data265 * struct zynqmp_pm_query_data - PM query data
255 * @qid: query ID266 * @qid: query ID
include/linux/mmc/card.h+2−1
@@ -226,7 +226,7 @@ struct mmc_queue_req; · 225 unmodified lines
226 * MMC Physical partitions226 * MMC Physical partitions
227 */227 */
228struct mmc_part {228struct mmc_part {
229 unsigned int size; /* partition size (in bytes) */229 u64 size; /* partition size (in bytes) */
230 unsigned int part_cfg; /* partition type */230 unsigned int part_cfg; /* partition type */
231 char name[MAX_MMC_PART_NAME_LEN];231 char name[MAX_MMC_PART_NAME_LEN];
232 bool force_ro; /* to make boot parts RO by default */232 bool force_ro; /* to make boot parts RO by default */
@@ -291,6 +291,7 @@ struct mmc_card { · 58 unmodified lines
291 struct sd_switch_caps sw_caps; /* switch (CMD6) caps */291 struct sd_switch_caps sw_caps; /* switch (CMD6) caps */
292 292
293 unsigned int sdio_funcs; /* number of SDIO functions */293 unsigned int sdio_funcs; /* number of SDIO functions */
294 atomic_t sdio_funcs_probed; /* number of probed SDIO funcs */
294 struct sdio_cccr cccr; /* common card info */295 struct sdio_cccr cccr; /* common card info */
295 struct sdio_cis cis; /* common tuple info */296 struct sdio_cis cis; /* common tuple info */
296 struct sdio_func *sdio_func[SDIO_MAX_FUNCS]; /* SDIO functions (devices) */297 struct sdio_func *sdio_func[SDIO_MAX_FUNCS]; /* SDIO functions (devices) */
include/linux/mmc/sdio_ids.h+2−0
@@ -71,6 +71,8 @@ · 70 unmodified lines
71 71
72#define SDIO_VENDOR_ID_TI 0x009772#define SDIO_VENDOR_ID_TI 0x0097
73#define SDIO_DEVICE_ID_TI_WL1271 0x407673#define SDIO_DEVICE_ID_TI_WL1271 0x4076
74#define SDIO_VENDOR_ID_TI_WL1251 0x104c
75#define SDIO_DEVICE_ID_TI_WL1251 0x9066
74 76
75#define SDIO_VENDOR_ID_STE 0x002077#define SDIO_VENDOR_ID_STE 0x0020
76#define SDIO_DEVICE_ID_STE_CW1200 0x228078#define SDIO_DEVICE_ID_STE_CW1200 0x2280
include/linux/platform_data/hsmmc-omap.h+0−3
@@ -67,9 +67,6 @@ struct omap_hsmmc_platform_data { · 66 unmodified lines
67 /* string specifying a particular variant of hardware */67 /* string specifying a particular variant of hardware */
68 char *version;68 char *version;
69 69
70 /* if we have special card, init it using this callback */
71 void (*init_card)(struct mmc_card *card);
72
73 const char *name;70 const char *name;
74 u32 ocr_mask;71 u32 ocr_mask;
75};72};

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t