aboutsummaryrefslogtreecommitdiff
path: root/arch/arm/plat-mxc/include
AgeCommit message (Collapse)Author
2012-01-11Merge branch 'lt-3.2-imx5' into topic/lt-3.2-imx6-uglytopic/lt-3.2-imx6-uglyEric Miao
* lt-3.2-imx5: (124 commits) SAUCE: fix the missing header of <linux/module.h> SAUCE: fix the removal of mxc_register_device() SAUCE: mx53_loco: fix gpio_to_irq() being non-constant SAUCE: fix building errors after rebased to v3.2 LINARO: Add lt-mx5_defconfig ARM i.MX5: fix system_rev if not set by atag or DT ENGR00162701 mxc_vout: fix potential deadlock of fb_blank ENGR00162666 mxc_vout: v4l2 playback blocking issue ENGR00162665 ipuv3 fb: fix non-interleave format wrong color issue ENGR00162664 mxc_vout: modify pp bypass condition ENGR00162663 ipuv3 fb: add vertical flip support ENGR00162475 ipuv3 fb: fix camera preview failure ENGR00162360 mxc_vout: fix STREAMOFF and G_CROP issues ENGR00162358 ipuv3 fb: only check pos when fb is unblank ENGR00162354 ipuv3 device: correct kthread operation for split task SAUCE: mx53: add mxc_lcdif support SAUCE: add arm-pmu device SAUCE: remove unnecessary suspend/resume functions from mxc_spdif ENGR00162218 mxc_vout: put set position function before set var ENGR00162208 ipuv3 device: fix jitter issue of split mode ...
2012-01-11iomux: add and export mxc_iomux_set_gpr_register()Jason Chen
2012-01-11imx6q: add iomux v3 supportJason Chen
Signed-off-by: Jason Chen <jason.chen@linaro.org> Signed-off-by: Eric Miao <eric.miao@linaro.org>
2012-01-11imx6q: add UART2 as debug UART (to be removed)Eric Miao
Signed-off-by: Richard Zhao <richard.zhao@linaro.org> Signed-off-by: Eric Miao <eric.miao@linaro.org>
2012-01-06ARM: imx6q: add support for IRAMJason Chen
Signed-off-by: Jason Chen <jason.chen@linaro.org> Signed-off-by: Eric Miao <eric.miao@linaro.org>
2012-01-06ARM: imx6q: build pm code only when CONFIG_PM selectedEric Miao
Cc: Shawn Guo <shawn.guo@linaro.org> Signed-off-by: Eric Miao <eric.miao@linaro.org>
2011-12-19enable uncompress log on cpuimx35sdEric Bénard
Signed-off-by: Eric Bénard <eric@eukrea.com> Cc: Sascha Hauer <kernel@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2011-12-19SAUCE: fix building errors after rebased to v3.2Eric Miao
Signed-off-by: Eric Miao <eric.miao@linaro.org>
2011-12-19ENGR00160875-2 ipuv3 dev: low performance if enable rotationJason Chen
1. no dma alloc for rot buf every time which will cost time. 2. fix split mode condition. 3. export some functions. This patch for MSL file. Signed-off-by: Jason Chen <b02280@freescale.com>
2011-12-19add dummy cpu_is_mx6q support.Jason Chen
Signed-off-by: Jason Chen <b02280@freescale.com>
2011-12-19ENGR00156673-2 ipuv3: move mach related definition to mach dirJason Chen
for arch/arm/plat-mxc/include/mach/ipu-v3.h Signed-off-by: Jason Chen <b02280@freescale.com>
2011-12-19ipu3: Backport to freescale commitJason Chen
commit ad19aef4a80094221b1b826185aea924627e8642 ENGR00155140 ipuv3: add support of power suspend/resume add support of power suspend/resume. because IPU has issue of restore current buffer register, this code only work for single buffer mode. Signed-off-by: Jason Chen <b02280@freescale.com>
2011-12-19SAUCE: ENGR00139461-1 mxc alsa soc spdif driverAlan Tull
BugLink: http://bugs.launchpad.net/bugs/837155 S/PDIF tx and rx using ASoC layer. Signed-off-by: Alan Tull <alan.tull@freescale.com> Signed-off-by: Eric Miao <eric.miao@linaro.org>
2011-12-19usb: add gadget support for the USB device controllerEric Miao
Copied directly from linux-linaro-2.6.38, largely commit bb9ebb9a5: ENGR00141217-4 USB: Add USB Host/device/otg drivers support Signed-off-by: Zhang Yan <b34916@freescale.com> Signed-off-by: Eric Miao <eric.miao@linaro.org>
2011-12-19usb: add ehci host driverEric Miao
Copied directly from linux-linaro-2.6.38, largely commit bb9ebb9a5: ENGR00141217-4 USB: Add USB Host/device/otg drivers support Signed-off-by: Zhang Yan <b34916@freescale.com> Signed-off-by: Eric Miao <eric.miao@linaro.org>
2011-12-19usb: add usb_common.c for common codeEric Miao
Copied directly from linux-linaro-2.6.38, commit b313cadcc: ENGR00141217-3 MX53 MSL part upgrade to 2.6.38 Signed-off-by: Richard Zhao <richard.zhao@freescale.com> Signed-off-by: Frank Li <Frank.Li@freescale.com> Signed-off-by: Jason Chen <b02280@freescale.com> Signed-off-by: Zeng Zhaoming <b32542@freescale.com> Signed-off-by: Richard Zhu <r65037@freescale.com> Signed-off-by: Zhou Jingyu <Jingyu.Zhou@freescale.com> Signed-off-by: Zhang Yan <b34916@freescale.com> Signed-off-by: Eric Miao <eric.miao@linaro.org>
2011-12-19imx: add support for board revision and imx_cpu_ver()Eric Miao
Change copied directly from commit: c3c5711 ENGR00141217-2 include file upgrade to 2.6.38 Signed-off-by: Richard Zhao <richard.zhao@linaro.org> Signed-off-by: Eric Miao <eric.miao@linaro.org>
2011-12-19mx53_loco: add amd_gpu deviceRichard Zhao
Signed-off-by: Richard Zhao <richard.zhao@linaro.org>
2011-12-19amd-gpu: add driver codeRichard Zhao
Signed-off-by: Richard Zhao <richard.zhao@linaro.org>
2011-12-19mx53_loco: add vpu deviceJason Chen
Signed-off-by: Jason Chen <b02280@freescale.com> Signed-off-by: Eric Miao <eric.miao@linaro.org>
2011-12-19vpu: add driver for mxc vpuJason Chen
Signed-off-by: Jason Chen <b02280@freescale.com>
2011-12-19ipuv3: add driver for LDB - LVDS Display BridgeJason Chen
Signed-off-by: Jason Chen <b02280@freescale.com>
2011-12-19ipuv3: add tve.c driver for TVOUT and VGA outputJason Chen
Signed-off-by: Jason Chen <b02280@freescale.com>
2011-12-19ipuv3: add base driver for ipuv3Jason Chen
Base IPUv3 driver copied directly from linux-imx-2.6.38. Signed-off-by: Jason Chen <b02280@freescale.com>
2011-12-19iim: add IIM driver supportEric Miao
Signed-off-by: Frank Li <Frank.Li@freescale.com> Signed-off-by: Eric Miao <eric.miao@linaro.org>
2011-12-19mx5: add GPC and PGC registers definitions for IPU/VPU/GPUEric Miao
Signed-off-by: Eric Miao <eric.miao@linaro.org>
2011-12-19mx53_loco: add srtc deviceRichard Zhao
Signed-off-by: Richard Zhao <richard.zhao@linaro.org>
2011-12-19imx: forward porting of the clock from .38Eric Miao
Signed-off-by: Eric Miao <eric.miao@linaro.org>
2011-12-19imx: add clk_get_usecount()Eric Miao
Signed-off-by: Eric Miao <eric.miao@linaro.org>
2011-12-19imx: add clock debug implementationEric Miao
Signed-off-by: Yong Shen <yong.shen@linaro.org> Signed-off-by: Eric Miao <eric.miao@linaro.org>
2011-11-23Merge branch 'imx-for-arnd' of git://git.pengutronix.de/git/imx/linux-2.6 ↵Arnd Bergmann
into fixes
2011-11-22Merge branch 'cleanups/assorted' into imx-fixes-for-arndSascha Hauer
Conflicts: arch/arm/mach-imx/mm-imx3.c Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2011-11-17ARM: imx6q: move clock register map to machine_desc.map_ioRichard Zhao
map_io is the only place to call iotable_init. Signed-off-by: Richard Zhao <richard.zhao@linaro.org> [shawn.guo: rename imx_clock_map_io() to imx6q_clock_map_io()] Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
2011-11-11arm/imx: remove imx_idle hook and use pm_idle insteadShawn Guo
The patch removes imx_idle hook and use pm_idle instead to get imx arch_idle prepared for the cleanup. It's suggested by Russel King as below. > The final removal of mach/system.h depends on getting rid of the arch_idle > thing. While going through these headers, I was dismayed to find these: > > arch/arm/mach-s3c2410/include/mach/system.h:void (*s3c24xx_idle)(void); > arch/arm/plat-mxc/include/mach/system.h:extern void (*imx_idle)(void); > > when we have a perfectly good pm_idle hook already in place - so there's > no excuse for these especially when other platforms are already using > pm_idle to hook their platform specific idle function into. This is > something that better be gone at the next merge window! Suggested-by: Russell King <rmk+kernel@arm.linux.org.uk> Signed-off-by: Shawn Guo <shawn.guo@linaro.org> Acked-by: Russell King <rmk+kernel@arm.linux.org.uk> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2011-11-11ARM: imx: Remove unused chip revision stringsFabio Estevam
Since commit (167a19d2: ARM: imx: Introduce generic function for displaying silicon revision) we no longer need the chip revision strings, so remove them. Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2011-11-04ARM: mxc: Remove test_for_ltirqDirk Behme
The patch "ARM: gic: consolidate PPI handling" removes the usage of test_for_ltirq. After the merge of imx6q remove this there, too. Cc: Sascha Hauer <kernel@pengutronix.de> Signed-off-by: Dirk Behme <dirk.behme@de.bosch.com> Acked-by: Shawn Guo <shawn.guo@linaro.org> Acked-by: Marc Zyngier <marc.zyngier@arm.com>
2011-11-01Merge branch 'next/soc' of git://git.linaro.org/people/arnd/arm-socLinus Torvalds
* 'next/soc' of git://git.linaro.org/people/arnd/arm-soc: (21 commits) MAINTAINERS: add ARM/FREESCALE IMX6 entry arm/imx: merge i.MX3 and i.MX6 arm/imx6q: add suspend/resume support arm/imx6q: add device tree machine support arm/imx6q: add smp and cpu hotplug support arm/imx6q: add core drivers clock, gpc, mmdc and src arm/imx: add gic_handle_irq function arm/imx6q: add core definitions and low-level debug uart arm/imx6q: add device tree source ARM: highbank: add suspend support ARM: highbank: Add cpu hotplug support ARM: highbank: add SMP support MAINTAINERS: add Calxeda Highbank ARM platform ARM: add Highbank core platform support ARM: highbank: add devicetree source ARM: l2x0: add empty l2x0_of_init picoxcell: add a definition of VMALLOC_END picoxcell: remove custom ioremap implementation picoxcell: add the DTS for the PC7302 board picoxcell: add the DTS for pc3x2 and pc3x3 devices ... Fix up trivial conflicts in arch/arm/Kconfig, and some more header file conflicts in arch/arm/mach-omap2/board-generic.c (as per an ealier merge by Arnd).
2011-11-01Merge branch 'next/dt' of git://git.linaro.org/people/arnd/arm-socLinus Torvalds
* 'next/dt' of git://git.linaro.org/people/arnd/arm-soc: ARM: gic: use module.h instead of export.h ARM: gic: fix irq_alloc_descs handling for sparse irq ARM: gic: add OF based initialization ARM: gic: add irq_domain support irq: support domains with non-zero hwirq base of/irq: introduce of_irq_init ARM: at91: add at91sam9g20 and Calao USB A9G20 DT support ARM: at91: dt: at91sam9g45 family and board device tree files arm/mx5: add device tree support for imx51 babbage arm/mx5: add device tree support for imx53 boards ARM: msm: Add devicetree support for msm8660-surf msm_serial: Add devicetree support msm_serial: Use relative resources for iomem Fix up conflicts in arch/arm/mach-at91/{at91sam9260.c,at91sam9g45.c}
2011-11-01Merge branch 'next/cross-platform' of git://git.linaro.org/people/arnd/arm-socLinus Torvalds
* 'next/cross-platform' of git://git.linaro.org/people/arnd/arm-soc: arm/imx: use Kconfig choice for low-level debug UART selection ARM: realview: use Kconfig choice for debug UART selection ARM: plat-samsung: use Kconfig choice for debug UART selection ARM: versatile: convert logical CPU numbers to physical numbers ARM: ux500: convert logical CPU numbers to physical numbers ARM: shmobile: convert logical CPU numbers to physical numbers ARM: msm: convert logical CPU numbers to physical numbers ARM: exynos4: convert logical CPU numbers to physical numbers Fix up trivial conflict (config DEBUG_S3C_UART move/split vs addition of ARM_KPROBES_TEST option) in arch/arm/Kconfig.debug
2011-11-01Merge branch 'next/devel' of git://git.linaro.org/people/arnd/arm-socLinus Torvalds
* 'next/devel' of git://git.linaro.org/people/arnd/arm-soc: (50 commits) ARM: tegra: update defconfig arm/tegra: Harmony: Configure PMC for low-level interrupts arm/tegra: device tree support for ventana board arm/tegra: add support for ventana pinmuxing arm/tegra: prepare Seaboard pinmux code for derived boards arm/tegra: pinmux: ioremap registers gpio/tegra: Convert to a platform device arm/tegra: Convert pinmux driver to a platform device arm/dt: Tegra: Add pinmux node to tegra20.dtsi arm/tegra: Prep boards for gpio/pinmux conversion to pdevs ARM: mx5: fix clock usage for suspend ARM i.MX entry-macro.S: remove now unused code ARM i.MX boards: use CONFIG_MULTI_IRQ_HANDLER ARM i.MX tzic: add handle_irq function ARM i.MX avic: add handle_irq function ARM: mx25: Add the missing IIM base definition ARM i.MX avic: convert to use generic irq chip mx31moboard: Add poweroff support ARM: mach-qong: Add watchdog support ARM: davinci: AM18x: Add wl1271/wlan support ... Fix up conflicts in: arch/arm/mach-at91/at91sam9g45.c arch/arm/mach-mx5/devices-imx53.h arch/arm/plat-mxc/include/mach/memory.h
2011-11-01Merge branch 'next/driver' of git://git.linaro.org/people/arnd/arm-socLinus Torvalds
* 'next/driver' of git://git.linaro.org/people/arnd/arm-soc: hw_random: add driver for atmel true hardware random number generator ARM: at91: at91sam9g45: add trng clock and platform device MX53 Enable the AHCI SATA on MX53 SMD board MX53 Enable the AHCI SATA on MX53 LOCO board MX53 Enable the AHCI SATA on MX53 ARD board AHCI Add the AHCI SATA feature on the MX53 platforms Fix pata imx resource ARM: imx: Define functions for registering PATA ARM: imx: Add PATA clock support ARM: imx: Add PATA resources for other i.MX processors imx: efika: Enable pata. imx51: add pata clock imx51: add pata device Fix up trivial conflict (new selects next to each other from separate branches for EFIKA_COMMON) in arch/arm/mach-mx5/Kconfig
2011-11-01Merge branch 'next/cleanup' of git://git.linaro.org/people/arnd/arm-socLinus Torvalds
* 'next/cleanup' of git://git.linaro.org/people/arnd/arm-soc: (125 commits) ARM: mach-mxs: fix machines' initializers order mmc: mxcmmc: explicitly includes mach/hardware.h arm/imx: explicitly includes mach/hardware.h in pm-imx27.c arm/imx: remove mx27_setup_weimcs() from mx27.h arm/imx: explicitly includes mach/hardware.h in mach-kzm_arm11_01.c arm/imx: remove mx31_setup_weimcs() from mx31.h ARM: tegra: devices.c should include devices.h ARM: tegra: cpu-tegra: unexport two functions ARM: tegra: cpu-tegra: sparse type fix ARM: tegra: dma: staticify some tables and functions ARM: tegra: tegra2_clocks: don't export some tables ARM: tegra: tegra_powergate_is_powered should be static ARM: tegra: tegra_rtc_read_ms should be static ARM: tegra: tegra_init_cache should be static ARM: tegra: pcie: 0 -> NULL changes ARM: tegra: pcie: include board.h ARM: tegra: pcie: don't cast __iomem pointers ARM: tegra: tegra2_clocks: 0 -> NULL changes ARM: tegra: tegra2_clocks: don't cast __iomem pointers ARM: tegra: timer: don't cast __iomem pointers ... Fix up trivial conflicts in arch/arm/mach-omap2/Makefile, arch/arm/mach-u300/{Makefile.boot,core.c} arch/arm/plat-{mxc,omap}/devices.c
2011-11-01Merge branch 'next/fixes' of git://git.linaro.org/people/arnd/arm-socLinus Torvalds
* 'next/fixes' of git://git.linaro.org/people/arnd/arm-soc: (28 commits) ARM: pxa/cm-x300: properly set bt_reset pin ARM: mmp: rename SHEEVAD to GPLUGD ARM: imx: Fix typo 'MACH_MX31_3DS_MXC_NAND_USE_BBT' ARM: i.MX28: shift frac value in _CLK_SET_RATE plat-mxc: iomux-v3.h: implicitly enable pull-up/down when that's desired ARM: mx5: fix clock usage for suspend ARM: pxa: use correct __iomem annotations ARM: pxa: sharpsl pm needs SPI ARM: pxa: centro and treo680 need palm27x ARM: pxa: make pxafb_smart_*() empty when not enabled ARM: pxa: select POWER_SUPPLY on raumfeld ARM: pxa: pxa95x is incompatible with earlier pxa ARM: pxa: CPU_FREQ_TABLE is needed for CPU_FREQ ARM: pxa: pxa95x/saarb depends on pxa3xx code ARM: pxa: allow selecting just one of TREO680/CENTRO ARM: pxa: export symbols from pxa3xx-ulpi ARM: pxa: make zylonite_pxa*_init declaration match code ARM: pxa/z2: fix building error of pxa27x_cpu_suspend() no longer available ARM: at91: add defconfig for at91sam9g45 family ARM: at91: remove dependency for Atmel PWM driver selector in Kconfig ...
2011-11-02Merge branch 'imx/imx6q' into next/socArnd Bergmann
Conflicts: Documentation/devicetree/bindings/arm/fsl.txt arch/arm/Kconfig arch/arm/Kconfig.debug arch/arm/plat-mxc/include/mach/common.h
2011-11-02Merge branch 'highbank/soc' into next/socArnd Bergmann
Conflicts: arch/arm/mach-mxs/include/mach/gpio.h arch/arm/mach-omap2/board-generic.c arch/arm/plat-mxc/include/mach/gpio.h
2011-11-01Merge branch 'imx/devel' into next/dtArnd Bergmann
The board changes in the imx/devel branch conflict with other changes in the device imx/dt branch. Conflicts: arch/arm/mach-mx5/board-mx53_loco.c arch/arm/mach-mx5/board-mx53_smd.c arch/arm/plat-mxc/include/mach/common.h arch/arm/plat-mxc/include/mach/memory.h Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2011-11-01Merge branches 'for-32/i2c/omap-v4', 'for-32/i2c/imx-dt', ↵Ben Dooks
'for-32/i2c/eg20t-v4', 'for-32/i2c/designware-v5' and 'for-32/i2c/au1550' into for-linus/i2c-3.2
2011-11-01Merge branch 'depends/rmk/memory_h' into next/fixesArnd Bergmann
Fix up all conflicts between the memory.h cleanup and bug fixes. Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2011-10-31Merge branch 'depends/rmk/gpio' into next/develArnd Bergmann
Conflicts: arch/arm/mach-mxs/include/mach/gpio.h arch/arm/plat-mxc/include/mach/gpio.h Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2011-10-31Merge branch 'next/fixes' into next/cleanupArnd Bergmann
Conflicts: arch/arm/mach-mxs/include/mach/gpio.h arch/arm/plat-mxc/include/mach/gpio.h drivers/video/omap/lcd_apollon.c drivers/video/omap/lcd_ldp.c drivers/video/omap/lcd_overo.c
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-07 18:05:41 +0000