]> git.karo-electronics.de Git - karo-tx-linux.git/log
karo-tx-linux.git
11 years agoMerge remote-tracking branch 'kgdb/kgdb-next'
Stephen Rothwell [Wed, 5 Dec 2012 01:29:16 +0000 (12:29 +1100)]
Merge remote-tracking branch 'kgdb/kgdb-next'

11 years agoMerge remote-tracking branch 'mmc/mmc-next'
Stephen Rothwell [Wed, 5 Dec 2012 01:27:33 +0000 (12:27 +1100)]
Merge remote-tracking branch 'mmc/mmc-next'

11 years agoMerge branch 'device-mapper/master'
Stephen Rothwell [Wed, 5 Dec 2012 01:25:41 +0000 (12:25 +1100)]
Merge branch 'device-mapper/master'

11 years agoMerge remote-tracking branch 'block/for-next'
Stephen Rothwell [Wed, 5 Dec 2012 01:18:09 +0000 (12:18 +1100)]
Merge remote-tracking branch 'block/for-next'

11 years agoMerge remote-tracking branch 'cgroup/for-next'
Stephen Rothwell [Wed, 5 Dec 2012 01:13:46 +0000 (12:13 +1100)]
Merge remote-tracking branch 'cgroup/for-next'

Conflicts:
mm/memcontrol.c
net/sched/cls_cgroup.c

11 years agoMerge remote-tracking branch 'input/next'
Stephen Rothwell [Wed, 5 Dec 2012 01:11:43 +0000 (12:11 +1100)]
Merge remote-tracking branch 'input/next'

11 years agoMerge remote-tracking branch 'virtio/virtio-next'
Stephen Rothwell [Wed, 5 Dec 2012 01:10:06 +0000 (12:10 +1100)]
Merge remote-tracking branch 'virtio/virtio-next'

11 years agoMerge remote-tracking branch 'modules/modules-next'
Stephen Rothwell [Wed, 5 Dec 2012 01:02:36 +0000 (12:02 +1100)]
Merge remote-tracking branch 'modules/modules-next'

11 years agoMerge remote-tracking branch 'sound-asoc/for-next'
Stephen Rothwell [Wed, 5 Dec 2012 00:59:52 +0000 (11:59 +1100)]
Merge remote-tracking branch 'sound-asoc/for-next'

11 years agoMerge remote-tracking branch 'sound/for-next'
Stephen Rothwell [Wed, 5 Dec 2012 00:57:51 +0000 (11:57 +1100)]
Merge remote-tracking branch 'sound/for-next'

11 years agoMerge remote-tracking branch 'drm/drm-next'
Stephen Rothwell [Wed, 5 Dec 2012 00:50:20 +0000 (11:50 +1100)]
Merge remote-tracking branch 'drm/drm-next'

Conflicts:
drivers/gpu/drm/nouveau/core/engine/disp/nv50.c

11 years agoMerge remote-tracking branch 'crypto/master'
Stephen Rothwell [Wed, 5 Dec 2012 00:48:41 +0000 (11:48 +1100)]
Merge remote-tracking branch 'crypto/master'

11 years agoMerge remote-tracking branch 'l2-mtd/master'
Stephen Rothwell [Wed, 5 Dec 2012 00:46:54 +0000 (11:46 +1100)]
Merge remote-tracking branch 'l2-mtd/master'

11 years agoMerge remote-tracking branch 'wireless-next/master'
Stephen Rothwell [Wed, 5 Dec 2012 00:45:00 +0000 (11:45 +1100)]
Merge remote-tracking branch 'wireless-next/master'

11 years agoMerge remote-tracking branch 'net-next/master'
Stephen Rothwell [Wed, 5 Dec 2012 00:37:24 +0000 (11:37 +1100)]
Merge remote-tracking branch 'net-next/master'

Conflicts:
arch/m68k/include/uapi/asm/socket.h
drivers/net/ethernet/mellanox/mlx4/en_rx.c

11 years agoMerge remote-tracking branch 'slave-dma/next'
Stephen Rothwell [Wed, 5 Dec 2012 00:06:22 +0000 (11:06 +1100)]
Merge remote-tracking branch 'slave-dma/next'

11 years agoMerge remote-tracking branch 'target-updates/for-next'
Stephen Rothwell [Wed, 5 Dec 2012 00:04:22 +0000 (11:04 +1100)]
Merge remote-tracking branch 'target-updates/for-next'

Conflicts:
drivers/target/target_core_transport.c

11 years agoMerge remote-tracking branch 'scsi/for-next'
Stephen Rothwell [Tue, 4 Dec 2012 23:59:51 +0000 (10:59 +1100)]
Merge remote-tracking branch 'scsi/for-next'

11 years agoMerge remote-tracking branch 'swiotlb/linux-next'
Stephen Rothwell [Tue, 4 Dec 2012 23:54:40 +0000 (10:54 +1100)]
Merge remote-tracking branch 'swiotlb/linux-next'

11 years agoMerge remote-tracking branch 'dlm/next'
Stephen Rothwell [Tue, 4 Dec 2012 23:53:04 +0000 (10:53 +1100)]
Merge remote-tracking branch 'dlm/next'

11 years agoMerge remote-tracking branch 'ubi/linux-next'
Stephen Rothwell [Tue, 4 Dec 2012 23:51:27 +0000 (10:51 +1100)]
Merge remote-tracking branch 'ubi/linux-next'

11 years agoMerge remote-tracking branch 'ieee1394/for-next'
Stephen Rothwell [Tue, 4 Dec 2012 23:49:48 +0000 (10:49 +1100)]
Merge remote-tracking branch 'ieee1394/for-next'

11 years agoMerge remote-tracking branch 'thermal/next'
Stephen Rothwell [Tue, 4 Dec 2012 23:48:07 +0000 (10:48 +1100)]
Merge remote-tracking branch 'thermal/next'

11 years agoMerge remote-tracking branch 'cpuidle/cpuidle-next'
Stephen Rothwell [Tue, 4 Dec 2012 23:47:59 +0000 (10:47 +1100)]
Merge remote-tracking branch 'cpuidle/cpuidle-next'

Conflicts:
drivers/cpuidle/coupled.c
include/linux/cpuidle.h

11 years agoMerge remote-tracking branch 'acpi/next'
Stephen Rothwell [Tue, 4 Dec 2012 23:41:31 +0000 (10:41 +1100)]
Merge remote-tracking branch 'acpi/next'

11 years agoMerge remote-tracking branch 'pstore/master'
Stephen Rothwell [Tue, 4 Dec 2012 23:39:55 +0000 (10:39 +1100)]
Merge remote-tracking branch 'pstore/master'

11 years agoMerge remote-tracking branch 'infiniband/for-next'
Stephen Rothwell [Tue, 4 Dec 2012 23:38:13 +0000 (10:38 +1100)]
Merge remote-tracking branch 'infiniband/for-next'

11 years agoMerge remote-tracking branch 'libata/NEXT'
Stephen Rothwell [Tue, 4 Dec 2012 23:36:25 +0000 (10:36 +1100)]
Merge remote-tracking branch 'libata/NEXT'

11 years agoMerge remote-tracking branch 'kbuild/for-next'
Stephen Rothwell [Tue, 4 Dec 2012 23:34:34 +0000 (10:34 +1100)]
Merge remote-tracking branch 'kbuild/for-next'

11 years agoMerge remote-tracking branch 'v4l-dvb/master'
Stephen Rothwell [Tue, 4 Dec 2012 23:32:37 +0000 (10:32 +1100)]
Merge remote-tracking branch 'v4l-dvb/master'

11 years agoMerge remote-tracking branch 'hwmon-staging/hwmon-next'
Stephen Rothwell [Tue, 4 Dec 2012 23:31:03 +0000 (10:31 +1100)]
Merge remote-tracking branch 'hwmon-staging/hwmon-next'

11 years agoMerge branch 'jdelvare-hwmon/master'
Stephen Rothwell [Tue, 4 Dec 2012 23:29:30 +0000 (10:29 +1100)]
Merge branch 'jdelvare-hwmon/master'

11 years agoMerge remote-tracking branch 'i2c-embedded/i2c-embedded/for-next'
Stephen Rothwell [Tue, 4 Dec 2012 23:27:54 +0000 (10:27 +1100)]
Merge remote-tracking branch 'i2c-embedded/i2c-embedded/for-next'

Conflicts:
drivers/i2c/busses/i2c-omap.c

11 years agoMerge branch 'i2c/master'
Stephen Rothwell [Tue, 4 Dec 2012 23:26:23 +0000 (10:26 +1100)]
Merge branch 'i2c/master'

11 years agoMerge remote-tracking branch 'hid/for-next'
Stephen Rothwell [Tue, 4 Dec 2012 23:24:28 +0000 (10:24 +1100)]
Merge remote-tracking branch 'hid/for-next'

11 years agoMerge remote-tracking branch 'pci/next'
Stephen Rothwell [Tue, 4 Dec 2012 23:21:00 +0000 (10:21 +1100)]
Merge remote-tracking branch 'pci/next'

11 years agoMerge remote-tracking branch 'xfs/for-next'
Stephen Rothwell [Tue, 4 Dec 2012 23:19:15 +0000 (10:19 +1100)]
Merge remote-tracking branch 'xfs/for-next'

Conflicts:
fs/xfs/xfs_fsops.c

11 years agoMerge remote-tracking branch 'v9fs/for-next'
Stephen Rothwell [Tue, 4 Dec 2012 23:19:06 +0000 (10:19 +1100)]
Merge remote-tracking branch 'v9fs/for-next'

11 years agoMerge remote-tracking branch 'ocfs2/linux-next'
Stephen Rothwell [Tue, 4 Dec 2012 23:17:12 +0000 (10:17 +1100)]
Merge remote-tracking branch 'ocfs2/linux-next'

11 years agoMerge remote-tracking branch 'nfsd/nfsd-next'
Stephen Rothwell [Tue, 4 Dec 2012 23:15:27 +0000 (10:15 +1100)]
Merge remote-tracking branch 'nfsd/nfsd-next'

11 years agoMerge remote-tracking branch 'nfs/linux-next'
Stephen Rothwell [Tue, 4 Dec 2012 23:13:50 +0000 (10:13 +1100)]
Merge remote-tracking branch 'nfs/linux-next'

11 years agoMerge remote-tracking branch 'logfs/master'
Stephen Rothwell [Tue, 4 Dec 2012 23:12:11 +0000 (10:12 +1100)]
Merge remote-tracking branch 'logfs/master'

11 years agoMerge remote-tracking branch 'gfs2/master'
Stephen Rothwell [Tue, 4 Dec 2012 23:10:39 +0000 (10:10 +1100)]
Merge remote-tracking branch 'gfs2/master'

11 years agoMerge remote-tracking branch 'fuse/for-next'
Stephen Rothwell [Tue, 4 Dec 2012 23:04:06 +0000 (10:04 +1100)]
Merge remote-tracking branch 'fuse/for-next'

11 years agoMerge remote-tracking branch 'f2fs/dev'
Stephen Rothwell [Tue, 4 Dec 2012 22:59:30 +0000 (09:59 +1100)]
Merge remote-tracking branch 'f2fs/dev'

11 years agoMerge remote-tracking branch 'ext4/dev'
Stephen Rothwell [Tue, 4 Dec 2012 22:57:49 +0000 (09:57 +1100)]
Merge remote-tracking branch 'ext4/dev'

11 years agoMerge remote-tracking branch 'ext3/for_next'
Stephen Rothwell [Tue, 4 Dec 2012 22:56:20 +0000 (09:56 +1100)]
Merge remote-tracking branch 'ext3/for_next'

11 years agoMerge remote-tracking branch 'ecryptfs/next'
Stephen Rothwell [Tue, 4 Dec 2012 22:54:52 +0000 (09:54 +1100)]
Merge remote-tracking branch 'ecryptfs/next'

11 years agoMerge remote-tracking branch 'cifs/for-next'
Stephen Rothwell [Tue, 4 Dec 2012 22:53:18 +0000 (09:53 +1100)]
Merge remote-tracking branch 'cifs/for-next'

11 years agoMerge remote-tracking branch 'ceph/master'
Stephen Rothwell [Tue, 4 Dec 2012 22:51:36 +0000 (09:51 +1100)]
Merge remote-tracking branch 'ceph/master'

11 years agoMerge remote-tracking branch 'xtensa/for_next'
Stephen Rothwell [Tue, 4 Dec 2012 22:50:08 +0000 (09:50 +1100)]
Merge remote-tracking branch 'xtensa/for_next'

11 years agoMerge remote-tracking branch 'tile/master'
Stephen Rothwell [Tue, 4 Dec 2012 22:48:36 +0000 (09:48 +1100)]
Merge remote-tracking branch 'tile/master'

11 years agoMerge remote-tracking branch 's390/features'
Stephen Rothwell [Tue, 4 Dec 2012 22:42:22 +0000 (09:42 +1100)]
Merge remote-tracking branch 's390/features'

11 years agoMerge remote-tracking branch 'mpc5xxx/next'
Stephen Rothwell [Tue, 4 Dec 2012 22:40:46 +0000 (09:40 +1100)]
Merge remote-tracking branch 'mpc5xxx/next'

11 years agoMerge remote-tracking branch 'powerpc/next'
Stephen Rothwell [Tue, 4 Dec 2012 22:37:22 +0000 (09:37 +1100)]
Merge remote-tracking branch 'powerpc/next'

Conflicts:
tools/perf/perf.h

11 years agoMerge remote-tracking branch 'openrisc/for-upstream'
Stephen Rothwell [Tue, 4 Dec 2012 22:35:53 +0000 (09:35 +1100)]
Merge remote-tracking branch 'openrisc/for-upstream'

11 years agoMerge remote-tracking branch 'mips/mips-for-linux-next'
Stephen Rothwell [Tue, 4 Dec 2012 22:34:18 +0000 (09:34 +1100)]
Merge remote-tracking branch 'mips/mips-for-linux-next'

11 years agoMerge remote-tracking branch 'microblaze/next'
Stephen Rothwell [Tue, 4 Dec 2012 22:32:45 +0000 (09:32 +1100)]
Merge remote-tracking branch 'microblaze/next'

11 years agoMerge remote-tracking branch 'm68knommu/for-next'
Stephen Rothwell [Tue, 4 Dec 2012 22:31:16 +0000 (09:31 +1100)]
Merge remote-tracking branch 'm68knommu/for-next'

11 years agoMerge remote-tracking branch 'm68k/for-next'
Stephen Rothwell [Tue, 4 Dec 2012 22:29:40 +0000 (09:29 +1100)]
Merge remote-tracking branch 'm68k/for-next'

11 years agoMerge remote-tracking branch 'ia64/next'
Stephen Rothwell [Tue, 4 Dec 2012 22:28:09 +0000 (09:28 +1100)]
Merge remote-tracking branch 'ia64/next'

11 years agoMerge remote-tracking branch 'cris/for-next'
Stephen Rothwell [Tue, 4 Dec 2012 22:26:40 +0000 (09:26 +1100)]
Merge remote-tracking branch 'cris/for-next'

11 years agoMerge remote-tracking branch 'blackfin/for-linus'
Stephen Rothwell [Tue, 4 Dec 2012 22:25:08 +0000 (09:25 +1100)]
Merge remote-tracking branch 'blackfin/for-linus'

11 years agoMerge remote-tracking branch 'arm64/upstream'
Stephen Rothwell [Tue, 4 Dec 2012 22:23:40 +0000 (09:23 +1100)]
Merge remote-tracking branch 'arm64/upstream'

11 years agoMerge remote-tracking branch 'xilinx/arm-next'
Stephen Rothwell [Tue, 4 Dec 2012 22:22:10 +0000 (09:22 +1100)]
Merge remote-tracking branch 'xilinx/arm-next'

11 years agoMerge remote-tracking branch 'arm/for-next'
Stephen Rothwell [Tue, 4 Dec 2012 22:20:09 +0000 (09:20 +1100)]
Merge remote-tracking branch 'arm/for-next'

11 years agoMerge remote-tracking branch 'asm-generic/master'
Stephen Rothwell [Tue, 4 Dec 2012 22:18:41 +0000 (09:18 +1100)]
Merge remote-tracking branch 'asm-generic/master'

11 years agoMerge remote-tracking branch 'input-current/for-linus'
Stephen Rothwell [Tue, 4 Dec 2012 22:16:55 +0000 (09:16 +1100)]
Merge remote-tracking branch 'input-current/for-linus'

11 years agoMerge branch 'bugfixes' into linux-next
Trond Myklebust [Tue, 4 Dec 2012 21:54:37 +0000 (16:54 -0500)]
Merge branch 'bugfixes' into linux-next

11 years agoMerge branch 'current/for-linus' into mips-for-linux-next
Ralf Baechle [Tue, 4 Dec 2012 21:13:55 +0000 (22:13 +0100)]
Merge branch 'current/for-linus' into mips-for-linux-next

11 years agoipv6: Protect ->mc_forwarding access with CONFIG_IPV6_MROUTE
David S. Miller [Tue, 4 Dec 2012 19:46:34 +0000 (14:46 -0500)]
ipv6: Protect ->mc_forwarding access with CONFIG_IPV6_MROUTE

Reported-by: Fengguang Wu <fengguang.wu@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
11 years agommc: sdhci-dove: allow GPIOs to be used for card detection on Dove
Russell King [Thu, 22 Nov 2012 23:55:51 +0000 (23:55 +0000)]
mmc: sdhci-dove: allow GPIOs to be used for card detection on Dove

This commit taken from Rabeeh's Cubox kernel and re-worked for DT;
Sebastian Hasselbrath is believed to be the original author.

Some Cuboxes require a GPIO for card detection; this implements the
optional GPIO support for card detection.  This GPIO is logic 0 for
card inserted.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: Chris Ball <cjb@laptop.org>
11 years agommc: sdhci-dove: use two-stage initialization for sdhci-pltfm
Russell King [Thu, 22 Nov 2012 23:55:30 +0000 (23:55 +0000)]
mmc: sdhci-dove: use two-stage initialization for sdhci-pltfm

We need to use the two-stage initialization for sdhci-pltfm if we're
going to do anything extra at initialization time.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: Chris Ball <cjb@laptop.org>
11 years agommc: sdhci-dove: use devm_clk_get()
Russell King [Thu, 22 Nov 2012 23:55:10 +0000 (23:55 +0000)]
mmc: sdhci-dove: use devm_clk_get()

Use devm_clk_get() rather than clk_get() to make cleanup paths more simple.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: Chris Ball <cjb@laptop.org>
11 years agommc: eSDHC: Recover from ADMA errors
Haijun Zhang [Tue, 4 Dec 2012 02:41:28 +0000 (10:41 +0800)]
mmc: eSDHC: Recover from ADMA errors

A-003500: False ADMA Error might be reported when ADMA is used for
multiple block read command with Stop at Block Gap. If PROCTL[SABGREQ]
is set when the particular block's data is received by the System side
logic before entire block (with CRC) data is received by the SD side
logic, and also if ADMA descriptor line is fetched at the same time,
then DMA engine might report false ADMA error. eSDHC might not be able
to Continue (PROCTL[CREQ]=1) after Stop at Block Gap.
This issue will impact the eSDHC IP VVN2.3.

Signed-off-by: Haijun Zhang <Haijun.Zhang@freescale.com>
Signed-off-by: Jerry Huang <Chang-Ming.Huang@freescale.com>
Acked-by: Anton Vorontsov <cbouatmailru@gmail.com>
Signed-off-by: Chris Ball <cjb@laptop.org>
11 years agommc: dw_mmc: remove duplicated buswidth code
Jaehoon Chung [Thu, 8 Nov 2012 08:35:31 +0000 (17:35 +0900)]
mmc: dw_mmc: remove duplicated buswidth code

ctype is using 1-bit buswidth mode by default.

Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Acked-by: James Hogan <james.hogan@imgtec.com>
Signed-off-by: Chris Ball <cjb@laptop.org>
11 years agommc: dw_mmc: relocate where dw_mci_setup_bus() is called from
Jaehoon Chung [Thu, 8 Nov 2012 08:35:29 +0000 (17:35 +0900)]
mmc: dw_mmc: relocate where dw_mci_setup_bus() is called from

To ensure the stable clock need to enable before set the
DW_MMC_CARD_NEED_INIT flag.  If set DW_MMC_CARD_NEED_INIT flag,
wait for 80-clock before first command after power-up.

Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Acked-by: Seungwon Jeon <tgih.jun@samsung.com>
Acked-by: Will Newton <will.newton@imgtec.com>
Signed-off-by: Chris Ball <cjb@laptop.org>
11 years agommc: Limit MMC speed to 52MHz if not HS200
Al Cooper [Fri, 30 Nov 2012 15:53:35 +0000 (10:53 -0500)]
mmc: Limit MMC speed to 52MHz if not HS200

If "caps2" host capabilities does not indicate support for MMC
HS200, don't allow clock speeds >52MHz. Currently, for MMC, the
clock speed is set to the lesser of the max speed the eMMC module
supports (card->ext_csd.hs_max_dtr) or the max base clock of the
host controller (host->f_max based on BASE_CLK_FREQ in the host
CAPS register). This means that a host controller that doesn't
support HS200 mode but has a base clock of 100MHz and an eMMC module
that supports HS200 speeds will end up using a 100MHz clock.

Signed-off-by: Al Cooper <alcooperx@gmail.com>
Signed-off-by: Chris Ball <cjb@laptop.org>
11 years agommc: dw_mmc: use devres functions in dw_mmc
Seungwon Jeon [Wed, 28 Nov 2012 10:26:03 +0000 (19:26 +0900)]
mmc: dw_mmc: use devres functions in dw_mmc

Use managed device resource functions for easy handling.
This makes driver simpler in the routine of error and exit.

Signed-off-by: Seungwon Jeon <tgih.jun@samsung.com>
Acked-by: James Hogan <james.hogan@imgtec.com>
Signed-off-by: Chris Ball <cjb@laptop.org>
11 years agommc: sh_mmcif: remove unneeded clock connection ID
Guennadi Liakhovetski [Wed, 28 Nov 2012 09:24:27 +0000 (10:24 +0100)]
mmc: sh_mmcif: remove unneeded clock connection ID

MMCIF only uses one clock, all ARM and SuperH platforms register MMCIF
clock lookup entries with no connection ID, hence it can be dropped in
the driver too.

Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Reviewed-by: Simon Horman <horms+renesas@verge.net.au>
Signed-off-by: Chris Ball <cjb@laptop.org>
11 years agommc: sh_mobile_sdhi: remove unneeded clock connection ID
Guennadi Liakhovetski [Wed, 28 Nov 2012 09:24:21 +0000 (10:24 +0100)]
mmc: sh_mobile_sdhi: remove unneeded clock connection ID

SDHI only uses one clock, all ARM and SuperH platform register SDHI clock
lookup entries with no connection ID, hence it can be dropped in the
driver too.

Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Reviewed-by: Simon Horman <horms+renesas@verge.net.au>
Signed-off-by: Chris Ball <cjb@laptop.org>
11 years agommc: sh_mobile_sdhi: fix clock frequency printing
Guennadi Liakhovetski [Wed, 28 Nov 2012 09:24:13 +0000 (10:24 +0100)]
mmc: sh_mobile_sdhi: fix clock frequency printing

During its probing the SDHI driver prints out the clock frequency, but
does it wrongly, always reporting 0Hz. Use the MMC host frequency value
to fix this issue.

Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Reviewed-by: Simon Horman <horms+renesas@verge.net.au>
Signed-off-by: Chris Ball <cjb@laptop.org>
11 years agommc: Remove redundant null check before kfree in bus.c
Sachin Kamat [Tue, 20 Nov 2012 09:13:17 +0000 (14:43 +0530)]
mmc: Remove redundant null check before kfree in bus.c

kfree on a null pointer is a no-op.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Signed-off-by: Chris Ball <cjb@laptop.org>
11 years agommc: Remove redundant null check before kfree in sdio_bus.c
Sachin Kamat [Tue, 20 Nov 2012 09:13:16 +0000 (14:43 +0530)]
mmc: Remove redundant null check before kfree in sdio_bus.c

kfree on a null pointer is a no-op.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Signed-off-by: Chris Ball <cjb@laptop.org>
11 years agommc: sdhci-imx-esdhc: use more devm_* functions
Shawn Guo [Mon, 26 Nov 2012 06:39:43 +0000 (14:39 +0800)]
mmc: sdhci-imx-esdhc: use more devm_* functions

Use devm_kzalloc, devm_gpio_request_one and devm_request_irq to make
cleanup path simpler.

Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Signed-off-by: Chris Ball <cjb@laptop.org>
11 years agommc: dt: add no-1-8-v device tree flag
Daniel Drake [Sun, 25 Nov 2012 18:02:54 +0000 (13:02 -0500)]
mmc: dt: add no-1-8-v device tree flag

The OLPC XO-1.75 laptop includes a SDHCI controller which is 1.8v
capable, and it truthfully reports so in its capabilities. This
alternate voltage is used for driving new "UHS-I" SD cards at their
full speed.

However, what the controller doesn't know is that the motherboard
physically doesn't have a 1.8v supply available, so attempting to
switch to the 1.8v level will result in a situation that cannot be
recovered from without physically replugging the SD card.

Add a device tree flag that can be used on systems like these,
and hook it up to the equivalent SDHCI quirk.

Signed-off-by: Daniel Drake <dsd@laptop.org>
Reviewed-by: Philip Rakity <prakity@nvidia.com>
Signed-off-by: Chris Ball <cjb@laptop.org>
11 years agommc: sdhci: add quirk for lack of 1.8v support
Daniel Drake [Sun, 25 Nov 2012 18:01:19 +0000 (13:01 -0500)]
mmc: sdhci: add quirk for lack of 1.8v support

The OLPC XO-1.75 laptop includes a SDHCI controller which is 1.8v
capable, and it truthfully reports so in its capabilities. This
alternate voltage is used for driving new "UHS-I" SD cards at their
full speed.

However, what the controller doesn't know is that the motherboard
physically doesn't have a 1.8v supply available.

Add a quirk so that systems such as this one can override disable
1.8v support, adding support for UHS-I cards (by running them at
3.3v).

This avoids a problem where the system would first try to run the
card at 1.8v, fail, and then not be able to fully reset the card
to retry at the normal 3.3v voltage.

This is more appropriate than using the MISSING_CAPS quirk, which
is intended for cases where the SDHCI controller is actually lying
about its capabilities, and would force us to somehow override both
caps words from another source.

Signed-off-by: Daniel Drake <dsd@laptop.org>
Reviewed-by: Philip Rakity <prakity@nvidia.com>
Signed-off-by: Chris Ball <cjb@laptop.org>
11 years agommc: sh-mmcif: avoid oops on spurious interrupts (second try)
Guennadi Liakhovetski [Wed, 22 Aug 2012 06:49:47 +0000 (06:49 +0000)]
mmc: sh-mmcif: avoid oops on spurious interrupts (second try)

On some systems, e.g., kzm9g, MMCIF interfaces can produce spurious
interrupts without any active request. To prevent the Oops, that results
in such cases, don't dereference the mmc request pointer until we make
sure, that we are indeed processing such a request.

Reported-by: Tetsuyuki Kobayashi <koba@kmckk.co.jp>
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Tested-by: Tetsuyuki Kobayashi <koba@kmckk.co.jp>
Cc: stable@vger.kernel.org
Signed-off-by: Chris Ball <cjb@laptop.org>
11 years agoRevert misapplied "mmc: sh-mmcif: avoid oops on spurious interrupts"
Chris Ball [Mon, 3 Dec 2012 14:17:19 +0000 (09:17 -0500)]
Revert misapplied "mmc: sh-mmcif: avoid oops on spurious interrupts"

This reverts commit 8464dd52d3198dd05, which was a misapplied debugging
version of the patch, not the final patch itself.

Signed-off-by: Chris Ball <cjb@laptop.org>
Cc: stable@vger.kernel.org
11 years agommc: sdio: Add empty bus-level suspend/resume callbacks
Rafael J. Wysocki [Sun, 2 Dec 2012 13:48:50 +0000 (14:48 +0100)]
mmc: sdio: Add empty bus-level suspend/resume callbacks

Suspend methods provided by SDIO drivers are not supposed to be called by
the PM core.  Instead, when the SDIO core gets to suspend a device's
ancestor, it calls the device driver's suspend routine.  However, the PM
core executes suspend callback routines directly for device drivers whose
bus types don't provide suspend callbacks.  In consequece, because the
SDIO bus type doesn't provide a suspend callback, the SDIO drivers'
suspend routines will be executed by the PM core (which shouldn't
happen).

To prevent this from happening, add empty system suspend/resume callbacks
for the SDIO bus type.

An analogous change had been made already by commit (e841a7c mmc: sdio:
Use empty system suspend/resume callbacks at the bus level), but then it
was reverted inadvertently by commit (d8e2ac3 mmc: sdio: Fix PM_SLEEP
related build warnings) that attempted to fix build warnings introduced
by commit e841a7c.

Reported-by: NeilBrown <neilb@suse.de>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Signed-off-by: Chris Ball <cjb@laptop.org>
11 years agommc: vub300: add missing usb_put_dev
Marina Makienko [Tue, 27 Nov 2012 06:46:57 +0000 (10:46 +0400)]
mmc: vub300: add missing usb_put_dev

Add missing usb_put_dev on failure path in vub300_probe().

Found by Linux Driver Verification project (linuxtesting.org).

Signed-off-by: Marina Makienko <makienko@ispras.ru>
Signed-off-by: Chris Ball <cjb@laptop.org>
11 years agommc: sdhci-spear: Don't call clk_{un}prepare() in suspend/resume
Viresh Kumar [Thu, 8 Nov 2012 15:09:10 +0000 (20:39 +0530)]
mmc: sdhci-spear: Don't call clk_{un}prepare() in suspend/resume

clk_{un}prepare is mandatory for platforms using common clock
framework. Because for SPEAr we don't do anything in clk_{un}prepare()
calls, just call them once in probe/remove.

Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: Chris Ball <cjb@laptop.org>
11 years agommc: sdhci-spear: Initialize sdhci clk to 50 MHz
Vipul Kumar Samar [Thu, 8 Nov 2012 15:09:09 +0000 (20:39 +0530)]
mmc: sdhci-spear: Initialize sdhci clk to 50 MHz

SPEAr sdhci driver expects the clock to be set to 50 MHz for proper
functioning.  This patch sets clk to 50 MHz in probe.

Signed-off-by: Vipul Kumar Samar <vipulkumar.samar@st.com>
Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: Chris Ball <cjb@laptop.org>
11 years agommc: host: sdhci-s3c: Add support for pinctrl
Tomasz Figa [Fri, 16 Nov 2012 14:28:17 +0000 (15:28 +0100)]
mmc: host: sdhci-s3c: Add support for pinctrl

This patch adds support for pin configuration using pinctrl subsystem
to the sdhci-s3c driver.

Signed-off-by: Tomasz Figa <t.figa@samsung.com>
Acked-by: Thomas Abraham <thomas.abraham@linaro.org>
Signed-off-by: Chris Ball <cjb@laptop.org>
11 years agommc: host: sdhci-s3c: Use devm_gpio_request to request GPIOs
Tomasz Figa [Sun, 25 Nov 2012 20:40:44 +0000 (15:40 -0500)]
mmc: host: sdhci-s3c: Use devm_gpio_request to request GPIOs

The set of GPIO pins used by sdhci-s3c driver varies between
configurations, such as card detect method, pinctrl availability, etc.
This overly complicates the code requesting and freeing GPIO pins, which
must check which pins are used, when freeing them.

This patch modifies the sdhci-s3c driver to use devm_gpio_request to
free requested pins automatically after unbinding the driver.

Signed-off-by: Tomasz Figa <t.figa@samsung.com>
Acked-by: Thomas Abraham <thomas.abraham@linaro.org>
Signed-off-by: Chris Ball <cjb@laptop.org>
11 years agommc: sdhci-of-esdhc: support command with busy response expecting for TC
Jerry Huang [Fri, 23 Nov 2012 09:25:03 +0000 (17:25 +0800)]
mmc: sdhci-of-esdhc: support command with busy response expecting for TC

The IP versions older than 2.3 didn't support the command with busy response
which expect for TC bit set. But after the VVN2.3, eSDHC IP has supported it.

Signed-off-by: Jerry Huang <Chang-Ming.Huang@freescale.com>
Signed-off-by: Chris Ball <cjb@laptop.org>
11 years agommc: sdhci-s3c: Use NULL instead of 0 for pointers
Tushar Behera [Tue, 20 Nov 2012 04:11:53 +0000 (09:41 +0530)]
mmc: sdhci-s3c: Use NULL instead of 0 for pointers

The third argument for of_get_property() is a pointer, hence pass
NULL instead of 0.

Fixes the following sparse warning:
sdhci-s3c.c:452:48: warning: Using plain integer as NULL pointer
sdhci-s3c.c:457:52: warning: Using plain integer as NULL pointer

Signed-off-by: Tushar Behera <tushar.behera@linaro.org>
Signed-off-by: Chris Ball <cjb@laptop.org>
11 years agommc: omap_hsmmc: Cleanup bitmap definitions of Interrupt Register
Venkatraman S [Mon, 19 Nov 2012 16:30:01 +0000 (22:00 +0530)]
mmc: omap_hsmmc: Cleanup bitmap definitions of Interrupt Register

Define the most frequently used bitmasks of the Interrupt Enable /
Interrupt Status register with consistent naming ( with _EN suffix).

Use meaningful concatenation of bitfields for INT_EN_MASK, which shows
which interrupts are enabled by default.  No functional changes.

Signed-off-by: Venkatraman S <svenkatr@ti.com>
Acked-by: Felipe Balbi <balbi@ti.com>
Signed-off-by: Chris Ball <cjb@laptop.org>
11 years agommc: omap_hsmmc: Convert critical failure reports to dev_err
Venkatraman S [Mon, 19 Nov 2012 16:30:00 +0000 (22:00 +0530)]
mmc: omap_hsmmc: Convert critical failure reports to dev_err

Fatal errors for the driver are not reported when just error debug
is enabled. Convert selected dev_dbg to dev_err for accurate error
reporting.

Reported-by: Benoit Cousson <b-cousson@ti.com>
Signed-off-by: Venkatraman S <svenkatr@ti.com>
Signed-off-by: Chris Ball <cjb@laptop.org>
11 years agommc: omap_hsmmc: Introduce omap_hsmmc_prepare/complete
Felipe Balbi [Mon, 19 Nov 2012 16:29:59 +0000 (21:59 +0530)]
mmc: omap_hsmmc: Introduce omap_hsmmc_prepare/complete

prepare() is supposed to prevent new children from being registered.
On the MMC subsystem, children (new cards) registration starts with
the card detect IRQ.

Move card detect IRQ disabling to prepare() so that no new cards
will be registered while we're trying to suspend.

Likewise, move card detect IRQ enabling to complete() so we only
try to register new children after our MMC IP is back up.

Signed-off-by: Felipe Balbi <balbi@ti.com>
Signed-off-by: Venkatraman S <svenkatr@ti.com>
Signed-off-by: Chris Ball <cjb@laptop.org>