mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 03:01:39 -04:00
ARM: arm-soc multiplatform updates for 3.10
More multiplatform enablement for ARM platforms. The ones converted in this branch are: - bcm2835 - cns3xxx - sirf - nomadik - msx - spear - tegra - ux500 We're getting close to having most of them converted! One of the larger platforms remaining is Samsung Exynos, and there are a bunch of supporting patches in this merge window for it. There was a patch in this branch to a early version of multiplatform conversion, but it ended up being reverted due to need of more bake time. The revert commit is part of the branch since it would have required rebasing multiple dependent branches and they were stable by then. -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) iQIcBAABAgAGBQJRgg99AAoJEIwa5zzehBx3n78P/j0w/8v+F4dM29ba5M/tqbFI e3wpeFykZ/HJH+FFIEYfIablpfHsLB0LEMh0dZmwHESFC6eR0RfGL2jOkpfcH9Ne 7B/JIFN4l1iwqqKCXf+QbYL6e8YFxlJkg6BIB4KhNgliQoO/ASP/8EbcgROYuxmN KPVdw9laUCCvb5Ogh2NWVAkBHhVGAEiqK20r4TQz8alI8RUmMleWM3o+wLBWVhOO d3gtYSfuFSbrJfbpKSdycLizoV/NekdOC1A9Ov9YuOdw8DzNbrThCRQtu0tIUgxN JjfnGlEJLsJS9SESfr8SYWxTuhe/lB2dGqjQPvRtl2HGBhbtTlnWfQ0k2ZHdeJuD J50SLrGA2gN9E5PlHJXjYk8uhhGIq8bNTJ//CtDkfKTq1D7PuHVEpEctsaz3BBbM U+x9zP2v4FB+yrZu8w+gkQY/wDgHsxj08mT6BK0+l8ePdyQV22CvwmM5XlJFI03x 5J0nLYiYfef+ZN9rGgVrQbn+yv+IEkE4DmeiscjeVJE5LVdVrDpYGfx7UA7V0UA7 i3KRVpNKuy1v7GJDnKlEBPkmB+vgXTRXUPDVCuC4n0Hi5PYj4es1gY6AoXGF90wm vtKxGr/2XDLP7Ro+m0OXMttSgQShnmbrbOngfkWcFwUmG7cB3SSUUOGKM+2LNnXM MJTqVhPjkZ2GYBi/J6S/ =4hSo -----END PGP SIGNATURE----- Merge tag 'multiplatform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc Pull ARM SoC multiplatform updates from Olof Johansson: "More multiplatform enablement for ARM platforms. The ones converted in this branch are: - bcm2835 - cns3xxx - sirf - nomadik - msx - spear - tegra - ux500 We're getting close to having most of them converted! One of the larger platforms remaining is Samsung Exynos, and there are a bunch of supporting patches in this merge window for it. There was a patch in this branch to a early version of multiplatform conversion, but it ended up being reverted due to need of more bake time. The revert commit is part of the branch since it would have required rebasing multiple dependent branches and they were stable by then" * tag 'multiplatform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (70 commits) mmc: sdhci-s3c: Fix operation on non-single image Samsung platforms clocksource: nomadik-mtu: fix up clocksource/timer Revert "ARM: exynos: enable multiplatform support" ARM: SPEAr13xx: Fix typo "ARCH_HAVE_CPUFREQ" ARM: exynos: enable multiplatform support rtc: s3c: make header file local mtd: onenand/samsung: make regs-onenand.h file local thermal/exynos: remove unnecessary header inclusions mmc: sdhci-s3c: remove platform dependencies ARM: samsung: move mfc device definition to s5p-dev-mfc.c ARM: exynos: move debug-macro.S to include/debug/ ARM: exynos: prepare for sparse IRQ ARM: exynos: introduce EXYNOS_ATAGS symbol ARM: tegra: build assembly files with -march=armv7-a ARM: Push selects for TWD/SCU into machine entries ARM: ux500: build hotplug.o for ARMv7-a ARM: ux500: move to multiplatform ARM: ux500: make remaining headers local ARM: ux500: make irqs.h local to platform ARM: ux500: get rid of <mach/[hardware|db8500-regs].h> ...
This commit is contained in:
Linus Torvalds
commit
99c6bcf46d
236 changed files with 1834 additions and 2887 deletions
|
|
@ -16,7 +16,6 @@
|
|||
#include <linux/device.h>
|
||||
#include <linux/mmc/host.h>
|
||||
#include <linux/module.h>
|
||||
#include <mach/cns3xxx.h>
|
||||
#include "sdhci-pltfm.h"
|
||||
|
||||
static unsigned int sdhci_cns3xxx_get_max_clk(struct sdhci_host *host)
|
||||
|
|
|
|||
87
drivers/mmc/host/sdhci-s3c-regs.h
Normal file
87
drivers/mmc/host/sdhci-s3c-regs.h
Normal file
|
|
@ -0,0 +1,87 @@
|
|||
/* linux/arch/arm/plat-s3c/include/plat/regs-sdhci.h
|
||||
*
|
||||
* Copyright 2008 Openmoko, Inc.
|
||||
* Copyright 2008 Simtec Electronics
|
||||
* http://armlinux.simtec.co.uk/
|
||||
* Ben Dooks <ben@simtec.co.uk>
|
||||
*
|
||||
* S3C Platform - SDHCI (HSMMC) register definitions
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License version 2 as
|
||||
* published by the Free Software Foundation.
|
||||
*/
|
||||
|
||||
#ifndef __PLAT_S3C_SDHCI_REGS_H
|
||||
#define __PLAT_S3C_SDHCI_REGS_H __FILE__
|
||||
|
||||
#define S3C_SDHCI_CONTROL2 (0x80)
|
||||
#define S3C_SDHCI_CONTROL3 (0x84)
|
||||
#define S3C64XX_SDHCI_CONTROL4 (0x8C)
|
||||
|
||||
#define S3C64XX_SDHCI_CTRL2_ENSTAASYNCCLR (1 << 31)
|
||||
#define S3C64XX_SDHCI_CTRL2_ENCMDCNFMSK (1 << 30)
|
||||
#define S3C_SDHCI_CTRL2_CDINVRXD3 (1 << 29)
|
||||
#define S3C_SDHCI_CTRL2_SLCARDOUT (1 << 28)
|
||||
|
||||
#define S3C_SDHCI_CTRL2_FLTCLKSEL_MASK (0xf << 24)
|
||||
#define S3C_SDHCI_CTRL2_FLTCLKSEL_SHIFT (24)
|
||||
#define S3C_SDHCI_CTRL2_FLTCLKSEL(_x) ((_x) << 24)
|
||||
|
||||
#define S3C_SDHCI_CTRL2_LVLDAT_MASK (0xff << 16)
|
||||
#define S3C_SDHCI_CTRL2_LVLDAT_SHIFT (16)
|
||||
#define S3C_SDHCI_CTRL2_LVLDAT(_x) ((_x) << 16)
|
||||
|
||||
#define S3C_SDHCI_CTRL2_ENFBCLKTX (1 << 15)
|
||||
#define S3C_SDHCI_CTRL2_ENFBCLKRX (1 << 14)
|
||||
#define S3C_SDHCI_CTRL2_SDCDSEL (1 << 13)
|
||||
#define S3C_SDHCI_CTRL2_SDSIGPC (1 << 12)
|
||||
#define S3C_SDHCI_CTRL2_ENBUSYCHKTXSTART (1 << 11)
|
||||
|
||||
#define S3C_SDHCI_CTRL2_DFCNT_MASK (0x3 << 9)
|
||||
#define S3C_SDHCI_CTRL2_DFCNT_SHIFT (9)
|
||||
#define S3C_SDHCI_CTRL2_DFCNT_NONE (0x0 << 9)
|
||||
#define S3C_SDHCI_CTRL2_DFCNT_4SDCLK (0x1 << 9)
|
||||
#define S3C_SDHCI_CTRL2_DFCNT_16SDCLK (0x2 << 9)
|
||||
#define S3C_SDHCI_CTRL2_DFCNT_64SDCLK (0x3 << 9)
|
||||
|
||||
#define S3C_SDHCI_CTRL2_ENCLKOUTHOLD (1 << 8)
|
||||
#define S3C_SDHCI_CTRL2_RWAITMODE (1 << 7)
|
||||
#define S3C_SDHCI_CTRL2_DISBUFRD (1 << 6)
|
||||
#define S3C_SDHCI_CTRL2_SELBASECLK_MASK (0x3 << 4)
|
||||
#define S3C_SDHCI_CTRL2_SELBASECLK_SHIFT (4)
|
||||
#define S3C_SDHCI_CTRL2_PWRSYNC (1 << 3)
|
||||
#define S3C_SDHCI_CTRL2_ENCLKOUTMSKCON (1 << 1)
|
||||
#define S3C_SDHCI_CTRL2_HWINITFIN (1 << 0)
|
||||
|
||||
#define S3C_SDHCI_CTRL3_FCSEL3 (1 << 31)
|
||||
#define S3C_SDHCI_CTRL3_FCSEL2 (1 << 23)
|
||||
#define S3C_SDHCI_CTRL3_FCSEL1 (1 << 15)
|
||||
#define S3C_SDHCI_CTRL3_FCSEL0 (1 << 7)
|
||||
|
||||
#define S3C_SDHCI_CTRL3_FIA3_MASK (0x7f << 24)
|
||||
#define S3C_SDHCI_CTRL3_FIA3_SHIFT (24)
|
||||
#define S3C_SDHCI_CTRL3_FIA3(_x) ((_x) << 24)
|
||||
|
||||
#define S3C_SDHCI_CTRL3_FIA2_MASK (0x7f << 16)
|
||||
#define S3C_SDHCI_CTRL3_FIA2_SHIFT (16)
|
||||
#define S3C_SDHCI_CTRL3_FIA2(_x) ((_x) << 16)
|
||||
|
||||
#define S3C_SDHCI_CTRL3_FIA1_MASK (0x7f << 8)
|
||||
#define S3C_SDHCI_CTRL3_FIA1_SHIFT (8)
|
||||
#define S3C_SDHCI_CTRL3_FIA1(_x) ((_x) << 8)
|
||||
|
||||
#define S3C_SDHCI_CTRL3_FIA0_MASK (0x7f << 0)
|
||||
#define S3C_SDHCI_CTRL3_FIA0_SHIFT (0)
|
||||
#define S3C_SDHCI_CTRL3_FIA0(_x) ((_x) << 0)
|
||||
|
||||
#define S3C64XX_SDHCI_CONTROL4_DRIVE_MASK (0x3 << 16)
|
||||
#define S3C64XX_SDHCI_CONTROL4_DRIVE_SHIFT (16)
|
||||
#define S3C64XX_SDHCI_CONTROL4_DRIVE_2mA (0x0 << 16)
|
||||
#define S3C64XX_SDHCI_CONTROL4_DRIVE_4mA (0x1 << 16)
|
||||
#define S3C64XX_SDHCI_CONTROL4_DRIVE_7mA (0x2 << 16)
|
||||
#define S3C64XX_SDHCI_CONTROL4_DRIVE_9mA (0x3 << 16)
|
||||
|
||||
#define S3C64XX_SDHCI_CONTROL4_BUSY (1)
|
||||
|
||||
#endif /* __PLAT_S3C_SDHCI_REGS_H */
|
||||
|
|
@ -15,6 +15,7 @@
|
|||
#include <linux/delay.h>
|
||||
#include <linux/dma-mapping.h>
|
||||
#include <linux/platform_device.h>
|
||||
#include <linux/platform_data/mmc-sdhci-s3c.h>
|
||||
#include <linux/slab.h>
|
||||
#include <linux/clk.h>
|
||||
#include <linux/io.h>
|
||||
|
|
@ -28,9 +29,7 @@
|
|||
|
||||
#include <linux/mmc/host.h>
|
||||
|
||||
#include <plat/sdhci.h>
|
||||
#include <plat/regs-sdhci.h>
|
||||
|
||||
#include "sdhci-s3c-regs.h"
|
||||
#include "sdhci.h"
|
||||
|
||||
#define MAX_BUS_CLK (4)
|
||||
|
|
|
|||
Loading…
Reference in a new issue