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

Commit 8c1c77ff authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc 

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc: (75 commits)
  mmc: core: eMMC bus width may not work on all platforms
  mmc: sdhci: Auto-CMD23 fixes.
  mmc: sdhci: Auto-CMD23 support.
  mmc: core: Block CMD23 support for UHS104/SDXC cards.
  mmc: sdhci: Implement MMC_CAP_CMD23 for SDHCI.
  mmc: core: Use CMD23 for multiblock transfers when we can.
  mmc: quirks: Add/remove quirks conditional support.
  mmc: Add new VUB300 USB-to-SD/SDIO/MMC driver
  mmc: sdhci-pxa: Add quirks for DMA/ADMA to match h/w
  mmc: core: duplicated trial with same freq in mmc_rescan_try_freq()
  mmc: core: add support for eMMC Dual Data Rate
  mmc: core: eMMC signal voltage does not use CMD11
  mmc: sdhci-pxa: add platform code for UHS signaling
  mmc: sdhci: add hooks for setting UHS in platform specific code
  mmc: core: clear MMC_PM_KEEP_POWER flag on resume
  mmc: dw_mmc: fixed wrong regulator_enable in suspend/resume
  mmc: sdhi: allow powering down controller with no card inserted
  mmc: tmio: runtime suspend the controller, where possible
  mmc: sdhi: support up to 3 interrupt sources
  mmc: sdhi: print physical base address and clock rate
  ...
parents f3ae1c75 08ee80cc

Documentation/ioctl/ioctl-number.txt

+1 −0
Original line number Diff line number Diff line
@@ -304,6 +304,7 @@ Code Seq#(hex) Include File Comments 
0xB0	all	RATIO devices		in development:

					<mailto:vgo@ratio.de>

0xB1	00-1F	PPPoX			<mailto:mostrows@styx.uwaterloo.ca>

0xB3	00	linux/mmc/ioctl.h

0xC0	00-0F	linux/usb/iowarrior.h

0xCB	00-1F	CBM serial IEC bus	in development:

					<mailto:michael.klein@puffin.lb.shuttle.de>

Documentation/mmc/00-INDEX

+2 −0
Original line number Diff line number Diff line
@@ -2,3 +2,5 @@ 
        - this file

mmc-dev-attrs.txt

        - info on SD and MMC device attributes

mmc-dev-parts.txt

        - info on SD and MMC device partitions

Documentation/mmc/mmc-dev-attrs.txt

+10 −0
Original line number Diff line number Diff line 
SD and MMC Block Device Attributes

==================================



These attributes are defined for the block devices associated with the

SD or MMC device.



The following attributes are read/write.



	force_ro		Enforce read-only access even if write protect switch is off.



SD and MMC Device Attributes

============================

Documentation/mmc/mmc-dev-parts.txt

0 → 100644
+27 −0
Original line number Diff line number Diff line 
SD and MMC Device Partitions

============================



Device partitions are additional logical block devices present on the

SD/MMC device.



As of this writing, MMC boot partitions as supported and exposed as

/dev/mmcblkXboot0 and /dev/mmcblkXboot1, where X is the index of the

parent /dev/mmcblkX.



MMC Boot Partitions

===================



Read and write access is provided to the two MMC boot partitions. Due to

the sensitive nature of the boot partition contents, which often store

a bootloader or bootloader configuration tables crucial to booting the

platform, write access is disabled by default to reduce the chance of

accidental bricking.



To enable write access to /dev/mmcblkXbootY, disable the forced read-only

access with:



echo 0 > /sys/block/mmcblkXbootY/force_ro



To re-enable read-only access:



echo 1 > /sys/block/mmcblkXbootY/force_ro

MAINTAINERS

+7 −0
Original line number Diff line number Diff line
@@ -6800,6 +6800,13 @@ L: lm-sensors@lm-sensors.org 
S:	Maintained

F:	drivers/hwmon/vt8231.c



VUB300 USB to SDIO/SD/MMC bridge chip

M:	Tony Olech <tony.olech@elandigitalsystems.com>

L:	linux-mmc@vger.kernel.org

L:	linux-usb@vger.kernel.org

S:	Supported

F:	drivers/mmc/host/vub300.c



W1 DALLAS'S 1-WIRE BUS

M:	Evgeniy Polyakov <johnpol@2ka.mipt.ru>

S:	Maintained