mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-30 19:51:31 -04:00
ARM: arm-soc cleanup for 3.10
Here is a collection of cleanup patches. Among the pieces that stand out are:
- The deletion of h720x platforms
- Split of at91 non-dt platforms to their own Kconfig file to keep them separate
- General cleanups and refactoring of i.MX and MXS platforms
- Some restructuring of clock tables for OMAP
- Convertion of PMC driver for Tegra to dt-only
- Some renames of sunxi -> sun4i (Allwinner A10)
- ... plus a bunch of other stuff that I haven't mentioned
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
iQIcBAABAgAGBQJRggUqAAoJEIwa5zzehBx3HjEQAJwp7heRs/HwTDzmzcyHkRMV
usbaa9dHBuAZ0DzsWjLK99xEn8VWD9TvbeP6hN5gNhxko06UVza3o8PI2iV1ztMB
9K3u2+LS5on/5cOxnsU1va16h5hBZ0ZIgNx5NY+PZ5mBY6v1U3qTjljPP62iXp63
w+sdXeZDe/c5JvuoDRbY0OBR++3Jp8cQg7KbU78jWz3r5D2rC1zwhkf2audcRY6b
jIWTj9M8CHynh/D6OzKqDcOYorBHNSRj0YbiWS2nnMfm+0V8nya00EPRpCPRiBUb
sobSy1CI9Qxiih3bOf6QCfzCRzJ5hbtE0zlI8g3bqtEZ1yOsE949HrKapWHJJdIU
JNTXrxXORAnaRhbzvSPNpp/iJBSDQRsfEETgv5BuHg/4lzTQfzElySbcgb4EeoHr
7Zt8ZR2/Du+u76qIPqs19ES3Wx+nOEOfSDAgZmlfPvlwmlGDYvqAXoeJ006VXnhG
JacLuD/cFnJ1w00Bcl48ZXMIsVkoRqjvsCG5q688HGXMM1lU8DfgUpQY6OCWAbdu
kFnBinJZk+HbE8FGS8O0BoQ+oiC0YIr2XhATL66PGHq7bLHb5ycwvZ7mrfC0AN9j
M9hqTFednwfo9wF8vSj5nMsxXwP8/mky4ECGoFvLsMYDosunrNVnAHtTgDSE+ZgO
6kQJ1P8jBBXn2LyjF88W
=xCAx
-----END PGP SIGNATURE-----
Merge tag 'cleanup-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull ARM SoC cleanup from Olof Johansson:
"Here is a collection of cleanup patches. Among the pieces that stand
out are:
- The deletion of h720x platforms
- Split of at91 non-dt platforms to their own Kconfig file to keep
them separate
- General cleanups and refactoring of i.MX and MXS platforms
- Some restructuring of clock tables for OMAP
- Convertion of PMC driver for Tegra to dt-only
- Some renames of sunxi -> sun4i (Allwinner A10)
- ... plus a bunch of other stuff that I haven't mentioned"
* tag 'cleanup-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (119 commits)
ARM: i.MX: remove unused ARCH_* configs
ARM i.MX53: remove platform ahci support
ARM: sunxi: Rework the restart code
irqchip: sunxi: Rename sunxi to sun4i
irqchip: sunxi: Make use of the IRQCHIP_DECLARE macro
clocksource: sunxi: Rename sunxi to sun4i
clocksource: sunxi: make use of CLKSRC_OF
clocksource: sunxi: Cleanup the timer code
ARM: at91: remove trailing semicolon from macros
ARM: at91/setup: fix trivial typos
ARM: EXYNOS: remove "config EXYNOS_DEV_DRM"
ARM: EXYNOS: change the name of USB ohci header
ARM: SAMSUNG: Remove unnecessary code for dma
ARM: S3C24XX: Remove unused GPIO drive strength register definitions
ARM: OMAP4+: PM: Restore CPU power state to ON with clockdomain force wakeup method
ARM: S3C24XX: Removed unneeded dependency on CPU_S3C2412
ARM: S3C24XX: Removed unneeded dependency on CPU_S3C2410
ARM: S3C24XX: Removed unneeded dependency on ARCH_S3C24XX for boards
ARM: SAMSUNG: Fix typo "CONFIG_SAMSUNG_DEV_RTC"
ARM: S5P64X0: Fix typo "CONFIG_S5P64X0_SETUP_SDHCI"
...
This commit is contained in:
commit
a7726350e0
263 changed files with 2919 additions and 6559 deletions
|
|
@ -43,7 +43,6 @@
|
|||
#include <asm/sizes.h>
|
||||
|
||||
#include <linux/platform_data/mmc-msm_sdcc.h>
|
||||
#include <mach/msm_iomap.h>
|
||||
#include <mach/dma.h>
|
||||
#include <mach/clk.h>
|
||||
|
||||
|
|
|
|||
|
|
@ -25,14 +25,93 @@
|
|||
|
||||
#include <mach/dma.h>
|
||||
|
||||
#include <mach/regs-sdi.h>
|
||||
|
||||
#include <linux/platform_data/mmc-s3cmci.h>
|
||||
|
||||
#include "s3cmci.h"
|
||||
|
||||
#define DRIVER_NAME "s3c-mci"
|
||||
|
||||
#define S3C2410_SDICON (0x00)
|
||||
#define S3C2410_SDIPRE (0x04)
|
||||
#define S3C2410_SDICMDARG (0x08)
|
||||
#define S3C2410_SDICMDCON (0x0C)
|
||||
#define S3C2410_SDICMDSTAT (0x10)
|
||||
#define S3C2410_SDIRSP0 (0x14)
|
||||
#define S3C2410_SDIRSP1 (0x18)
|
||||
#define S3C2410_SDIRSP2 (0x1C)
|
||||
#define S3C2410_SDIRSP3 (0x20)
|
||||
#define S3C2410_SDITIMER (0x24)
|
||||
#define S3C2410_SDIBSIZE (0x28)
|
||||
#define S3C2410_SDIDCON (0x2C)
|
||||
#define S3C2410_SDIDCNT (0x30)
|
||||
#define S3C2410_SDIDSTA (0x34)
|
||||
#define S3C2410_SDIFSTA (0x38)
|
||||
|
||||
#define S3C2410_SDIDATA (0x3C)
|
||||
#define S3C2410_SDIIMSK (0x40)
|
||||
|
||||
#define S3C2440_SDIDATA (0x40)
|
||||
#define S3C2440_SDIIMSK (0x3C)
|
||||
|
||||
#define S3C2440_SDICON_SDRESET (1 << 8)
|
||||
#define S3C2410_SDICON_SDIOIRQ (1 << 3)
|
||||
#define S3C2410_SDICON_FIFORESET (1 << 1)
|
||||
#define S3C2410_SDICON_CLOCKTYPE (1 << 0)
|
||||
|
||||
#define S3C2410_SDICMDCON_LONGRSP (1 << 10)
|
||||
#define S3C2410_SDICMDCON_WAITRSP (1 << 9)
|
||||
#define S3C2410_SDICMDCON_CMDSTART (1 << 8)
|
||||
#define S3C2410_SDICMDCON_SENDERHOST (1 << 6)
|
||||
#define S3C2410_SDICMDCON_INDEX (0x3f)
|
||||
|
||||
#define S3C2410_SDICMDSTAT_CRCFAIL (1 << 12)
|
||||
#define S3C2410_SDICMDSTAT_CMDSENT (1 << 11)
|
||||
#define S3C2410_SDICMDSTAT_CMDTIMEOUT (1 << 10)
|
||||
#define S3C2410_SDICMDSTAT_RSPFIN (1 << 9)
|
||||
|
||||
#define S3C2440_SDIDCON_DS_WORD (2 << 22)
|
||||
#define S3C2410_SDIDCON_TXAFTERRESP (1 << 20)
|
||||
#define S3C2410_SDIDCON_RXAFTERCMD (1 << 19)
|
||||
#define S3C2410_SDIDCON_BLOCKMODE (1 << 17)
|
||||
#define S3C2410_SDIDCON_WIDEBUS (1 << 16)
|
||||
#define S3C2410_SDIDCON_DMAEN (1 << 15)
|
||||
#define S3C2410_SDIDCON_STOP (1 << 14)
|
||||
#define S3C2440_SDIDCON_DATSTART (1 << 14)
|
||||
|
||||
#define S3C2410_SDIDCON_XFER_RXSTART (2 << 12)
|
||||
#define S3C2410_SDIDCON_XFER_TXSTART (3 << 12)
|
||||
|
||||
#define S3C2410_SDIDCON_BLKNUM_MASK (0xFFF)
|
||||
|
||||
#define S3C2410_SDIDSTA_SDIOIRQDETECT (1 << 9)
|
||||
#define S3C2410_SDIDSTA_FIFOFAIL (1 << 8)
|
||||
#define S3C2410_SDIDSTA_CRCFAIL (1 << 7)
|
||||
#define S3C2410_SDIDSTA_RXCRCFAIL (1 << 6)
|
||||
#define S3C2410_SDIDSTA_DATATIMEOUT (1 << 5)
|
||||
#define S3C2410_SDIDSTA_XFERFINISH (1 << 4)
|
||||
#define S3C2410_SDIDSTA_TXDATAON (1 << 1)
|
||||
#define S3C2410_SDIDSTA_RXDATAON (1 << 0)
|
||||
|
||||
#define S3C2440_SDIFSTA_FIFORESET (1 << 16)
|
||||
#define S3C2440_SDIFSTA_FIFOFAIL (3 << 14)
|
||||
#define S3C2410_SDIFSTA_TFDET (1 << 13)
|
||||
#define S3C2410_SDIFSTA_RFDET (1 << 12)
|
||||
#define S3C2410_SDIFSTA_COUNTMASK (0x7f)
|
||||
|
||||
#define S3C2410_SDIIMSK_RESPONSECRC (1 << 17)
|
||||
#define S3C2410_SDIIMSK_CMDSENT (1 << 16)
|
||||
#define S3C2410_SDIIMSK_CMDTIMEOUT (1 << 15)
|
||||
#define S3C2410_SDIIMSK_RESPONSEND (1 << 14)
|
||||
#define S3C2410_SDIIMSK_SDIOIRQ (1 << 12)
|
||||
#define S3C2410_SDIIMSK_FIFOFAIL (1 << 11)
|
||||
#define S3C2410_SDIIMSK_CRCSTATUS (1 << 10)
|
||||
#define S3C2410_SDIIMSK_DATACRC (1 << 9)
|
||||
#define S3C2410_SDIIMSK_DATATIMEOUT (1 << 8)
|
||||
#define S3C2410_SDIIMSK_DATAFINISH (1 << 7)
|
||||
#define S3C2410_SDIIMSK_TXFIFOHALF (1 << 4)
|
||||
#define S3C2410_SDIIMSK_RXFIFOLAST (1 << 2)
|
||||
#define S3C2410_SDIIMSK_RXFIFOHALF (1 << 0)
|
||||
|
||||
enum dbg_channels {
|
||||
dbg_err = (1 << 0),
|
||||
dbg_debug = (1 << 1),
|
||||
|
|
|
|||
Loading…
Reference in a new issue