diff options
| author | Dan Willemsen <dwillemsen@nvidia.com> | 2011-11-30 21:41:43 -0800 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@nvidia.com> | 2011-11-30 21:41:43 -0800 |
| commit | fabe9aa0c0b7c0a3182c09d566b15f34f96ae0e4 (patch) | |
| tree | f98c7c56086684bb205cc6102db0a74033733eb3 | |
| parent | 4c4f2746ab1c677b4f8652b82968c4d1655388ea (diff) | |
| parent | ce63d6103f88d9594ba8e36111ef612e574d7941 (diff) | |
Merge branch 'pre-hacks/from-google' into after-pre-hacks
| -rw-r--r-- | arch/arm/include/asm/mach/mmc.h | 28 | ||||
| -rw-r--r-- | drivers/mmc/host/sdhci-tegra.c | 4 | ||||
| -rw-r--r-- | fs/ext4/super.c | 4 | ||||
| -rw-r--r-- | include/linux/fsl_devices.h | 2 |
4 files changed, 32 insertions, 6 deletions
diff --git a/arch/arm/include/asm/mach/mmc.h b/arch/arm/include/asm/mach/mmc.h new file mode 100644 index 000000000000..bca864ac945f --- /dev/null +++ b/arch/arm/include/asm/mach/mmc.h @@ -0,0 +1,28 @@ +/* + * arch/arm/include/asm/mach/mmc.h + */ +#ifndef ASMARM_MACH_MMC_H +#define ASMARM_MACH_MMC_H + +#include <linux/mmc/host.h> +#include <linux/mmc/card.h> +#include <linux/mmc/sdio_func.h> + +struct embedded_sdio_data { + struct sdio_cis cis; + struct sdio_cccr cccr; + struct sdio_embedded_func *funcs; + int num_funcs; +}; + +struct mmc_platform_data { + unsigned int ocr_mask; /* available voltages */ + int built_in; /* built-in device flag */ + int card_present; /* card detect state */ + u32 (*translate_vdd)(struct device *, unsigned int); + unsigned int (*status)(struct device *); + struct embedded_sdio_data *embedded_sdio; + int (*register_status_notify)(void (*callback)(int card_present, void *dev_id), void *dev_id); +}; + +#endif diff --git a/drivers/mmc/host/sdhci-tegra.c b/drivers/mmc/host/sdhci-tegra.c index da3bf521c956..6626eb8546d7 100644 --- a/drivers/mmc/host/sdhci-tegra.c +++ b/drivers/mmc/host/sdhci-tegra.c @@ -310,10 +310,6 @@ static int __devinit sdhci_tegra_probe(struct platform_device *pdev) if (plat->is_8bit) host->mmc->caps |= MMC_CAP_8_BIT_DATA; - host->mmc->pm_caps = MMC_PM_KEEP_POWER | MMC_PM_IGNORE_PM_NOTIFY; - if (plat->mmc_data.built_in) - host->mmc->pm_flags = MMC_PM_KEEP_POWER | MMC_PM_IGNORE_PM_NOTIFY; - rc = sdhci_add_host(host); if (rc) goto err_add_host; diff --git a/fs/ext4/super.c b/fs/ext4/super.c index 44d0c8db2239..98250f20a0be 100644 --- a/fs/ext4/super.c +++ b/fs/ext4/super.c @@ -3345,8 +3345,8 @@ static int ext4_fill_super(struct super_block *sb, void *data, int silent) sbi->s_inodes_per_block = blocksize / EXT4_INODE_SIZE(sb); if (sbi->s_inodes_per_block == 0) goto cantfind_ext4; - sbi->s_itb_per_group = sbi->s_inodes_per_group / - sbi->s_inodes_per_block; + sbi->s_itb_per_group = DIV_ROUND_UP(sbi->s_inodes_per_group, + sbi->s_inodes_per_block); sbi->s_desc_per_block = blocksize / EXT4_DESC_SIZE(sb); sbi->s_sbh = bh; sbi->s_mount_state = le16_to_cpu(es->s_state); diff --git a/include/linux/fsl_devices.h b/include/linux/fsl_devices.h index fffdf00f87b9..036272c5621c 100644 --- a/include/linux/fsl_devices.h +++ b/include/linux/fsl_devices.h @@ -95,6 +95,8 @@ struct fsl_usb2_platform_data { u32 pm_configured_flag; u32 pm_portsc; u32 pm_usbgenctrl; + + void *phy_config; }; /* Flags in fsl_usb2_mph_platform_data */ |