aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-mmp
Commit message (Collapse)AuthorAgeFilesLines
* ARM: mmp: PXA910 drive strength FAST using wrong valuePhilip Rakity2011-01-151-1/+1
| | | | | | | | | | | | | Drive strength for PXA910 is a 2 bit value but because of the mapping in plat-pxa/mfp.h needs to be shifted up one bit to handle real location in mfp registers. (MMP2 and PXA910 drive strength start at bit 11 while PXA168 starts at bit 10). Values 0, 1, 2, and 3 effectively need to be 0, 2, 4, and 6 to fit into register. 8 does not work. Signed-off-by: Philip Rakity <prakity@marvell.com> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
* ARM: mmp: MMP2 drive strength FAST using wrong valuePhilip Rakity2011-01-151-1/+1
| | | | | | | | | | | | | | Drive strength for MMP2 is a 2 bit value but because of the mapping in plat-pxa/mfp.h needs to be shifted up one bit to handle real location in mfp registers. (MMP2 and PXA910 drive strength start at bit 11 while PXA168 starts at bit 10). Values 0, 1, 2, and 3 effectively need to be 0, 2, 4, and 6 to fit into register. 8 does not work. Signed-off-by: Philip Rakity <prakity@marvell.com> Tested-by: John Watlington <wad@laptop.org> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
* ARM: mmp: irq_data conversion.Lennert Buytenhek2011-01-132-31/+33
| | | | Signed-off-by: Lennert Buytenhek <buytenh@secretlab.ca>
* Merge branch 'devel-stable' into develRussell King2011-01-0610-175/+488
|\ | | | | | | | | | | Conflicts: arch/arm/mach-pxa/clock.c arch/arm/mach-pxa/clock.h
| * ARM: mmp: refactored 5V regulator support using fixed-regulatorMark F. Brown2010-12-201-0/+38
| | | | | | | | | | | | Signed-off-by: Mark F. Brown <mark.brown314@gmail.com> Reviewed-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
| * ARM: mmp: correct the naming of GPIOxx_GPIO definitionsEric Miao2010-12-202-170/+170
| | | | | | | | Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
| * ARM: mmp: select CPU_PJ4Haojian Zhuang2010-12-181-3/+4
| | | | | | | | | | | | | | | | Since CPU_PJ4 is shared between PXA95x and MMP2, select CPU_PJ4 in MMP2 configuration. Signed-off-by: Haojian Zhuang <haojian.zhuang@marvell.com> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
| * ARM: mmp: fix the typo - MMP2 is compatible with ARMv7Haojian Zhuang2010-12-161-2/+2
| | | | | | | | | | Signed-off-by: Haojian Zhuang <haojian.zhuang@marvell.com> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
| * ARM: mmp: append brownstone supportHaojian Zhuang2010-12-163-0/+178
| | | | | | | | | | Signed-off-by: Haojian Zhuang <haojian.zhuang@marvell.com> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
| * ARM: mmp: add usb clock for pxa168/pxa910cxie42010-12-161-0/+2
| | | | | | | | | | Signed-off-by: Chao Xie <chao.xie@marvell.com> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
| * ARM: mmp: add sd card to jasperZhangfei Gao2010-12-161-0/+35
| | | | | | | | | | | | Signed-off-by: Zhangfei Gao <zhangfei.gao@marvell.com> Acked-by: Haojian Zhuang <haojian.zhuang@marvell.com> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
| * ARM: mmp: add mmc resourceZhangfei Gao2010-12-163-0/+59
| | | | | | | | | | | | Signed-off-by: Zhangfei Gao <zhangfei.gao@marvell.com> Acked-by: Haojian Zhuang <haojian.zhuang@marvell.com> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
* | Merge branch 'misc' into develRussell King2011-01-061-1/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: arch/arm/Kconfig arch/arm/common/Makefile arch/arm/kernel/Makefile arch/arm/kernel/smp.c
| * \ Merge branch 'smp' into miscRussell King2011-01-061-1/+2
| |\ \ | | | | | | | | | | | | | | | | | | | | Conflicts: arch/arm/kernel/entry-armv.S arch/arm/mm/ioremap.c
| * | | ARM: 6483/1: arm & sh: factorised duplicated clkdev.cJean-Christop PLAGNIOL-VILLARD2010-11-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | factorise some generic infrastructure to assist looking up struct clks for the ARM & SH architecture. as the code is identical at 99% put the arch specific code for allocation as example in asm/clkdev.h Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Acked-by: Paul Mundt <lethal@linux-sh.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* | | | Merge branch 'clksrc' into develRussell King2011-01-051-26/+13
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | Conflicts: arch/arm/mach-vexpress/v2m.c arch/arm/plat-omap/counter_32k.c arch/arm/plat-versatile/Makefile
| * | | ARM: mmp: convert sched_clock() to use new infrastructureRussell King2010-12-221-21/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Convert mmp to use the new sched_clock() infrastructure for extending 32bit counters to full 64-bit nanoseconds. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * | | ARM: ensure all sched_clock() implementations are notrace markedRussell King2010-12-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ftrace requires sched_clock() to be notrace. Ensure that all implementations are so marked. Also make sure that they include linux/sched.h Also ensure OMAP clocksource read functions are marked notrace as they're used for sched_clock() too. Tested-by: Santosh Shilimkar <santosh.shilimkar@ti.com> Tested-by: Will Deacon <will.deacon@arm.com> Tested-by: Mikael Pettersson <mikpe@it.uu.se> Tested-by: Eric Miao <eric.y.miao@gmail.com> Tested-by: Olof Johansson <olof@lixom.net> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * | | ARM: mmp: update clock source registrationRussell King2010-12-221-4/+1
| | |/ | |/| | | | | | | | | | | | | | | | | | | In d7e81c2 (clocksource: Add clocksource_register_hz/khz interface) new interfaces were added which simplify (and optimize) the selection of the divisor shift/mult constants. Switch over to using this new interface. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* | | ARM: mmp2: remove not used clk_rtcJason Chagas2010-11-301-1/+0
|/ / | | | | | | | | | | | | | | RTC clock will remain at 32KHz and powered on, there is no need for it at this moment. Signed-off-by: Jason Chagas <jason.chagas@marvell.com> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
* | ARM: mmp: fix cpuid detection on mmp2Haojian Zhuang2010-11-031-1/+2
|/ | | | | | | | Fix typo error on cpu_is_mmp2(). Correct cpu_readid_id() to read_cpuid_id(). Append missing parenthesis. Signed-off-by: Haojian Zhuang <haojian.zhuang@marvell.com> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
* arm: remove machine_desc.io_pg_offst and .phys_ioNicolas Pitre2010-10-207-16/+0
| | | | | | | | | | | | | | | Since we're now using addruart to establish the debug mapping, we can remove the io_pg_offst and phys_io members of struct machine_desc. The various declarations were removed using the following script: grep -rl MACHINE_START arch/arm | xargs \ sed -i '/MACHINE_START/,/MACHINE_END/ { /\.\(phys_io\|io_pg_offst\)/d }' [ Initial patch was from Jeremy Kerr, example script from Russell King ] Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org> Acked-by: Eric Miao <eric.miao at canonical.com>
* arm: return both physical and virtual addresses from addruartJeremy Kerr2010-10-201-6/+5
| | | | | | | | | | | | | | | | | | | | Rather than checking the MMU status in every instance of addruart, do it once in kernel/debug.S, and change the existing addruart macros to return both physical and virtual addresses. The main debug code can then select the appropriate address to use. This will also allow us to retreive the address of a uart for the MMU state that we're not current in. Updated with fixes for OMAP from Jason Wang <jason77.wang@gmail.com> and Tony Lindgren <tony@atomide.com>, and fix for versatile express from Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>. Signed-off-by: Jeremy Kerr <jeremy.kerr@canonical.com> Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com> Signed-off-by: Jason Wang <jason77.wang@gmail.com> Signed-off-by: Tony Lindgren <tony@atomide.com> Tested-by: Kevin Hilman <khilman@deeprootsystems.com>
* ARM: mmp: update cpuid of pxa168 and pxa910Haojian Zhuang2010-10-092-17/+42
| | | | | | | Correct the cpuid of pxa168 and pxa910. Signed-off-by: Haojian Zhuang <haojian.zhuang@marvell.com> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
* ARM: pxa168/teton bga: add board support for i2c and rtc-ds1337Mark F. Brown2010-10-091-0/+16
| | | | | | | | | | Defined I2C/ALARM pin definitions DS1337 RTC alarm support is tied to RTC_INT_GPIO Signed-off-by: Mark F. Brown <mark.brown314@gmail.com> Acked-by: Haojian Zhuang <haojian.zhuang@marvell.com> Acked-by: Marek Vasut <marek.vasut@gmail.com> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
* ARM: pxa168/teton bga: added keypad supportMark F. Brown2010-10-091-0/+24
| | | | | | | Support for Matrix keypad ESC, ENTER, LEFT, and RIGHT Signed-off-by: Mark F. Brown <mark.brown314@gmail.com> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
* ARM: pxa168: added support for Teton BGA platformMark F. Brown2010-10-094-0/+86
| | | | | | | Added board defintion, header, and debug UART support. Signed-off-by: Mark F. Brown <mark.brown314@gmail.com> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
* ARM: mmp: support sparse irqHaojian Zhuang2010-10-095-4/+16
| | | | | | | Add sparse IRQ support in ARCH_MMP. Signed-off-by: Haojian Zhuang <haojian.zhuang@marvell.com> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
* ARM: pxa168/aspenite: add board support for keypadMark F. Brown2010-10-091-0/+27
| | | | | Signed-off-by: Mark F. Brown <mark.brown314@gmail.com> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
* ARM: pxa168: added keypad wake clear event support for platformMark F. Brown2010-10-092-0/+15
| | | | | Signed-off-by: Mark F. Brown <mark.brown314@gmail.com> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
* ARM: pxa168: added wake clear register support for APMUMark F. Brown2010-10-091-0/+12
| | | | | Signed-off-by: Mark F. Brown <mark.brown314@gmail.com> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
* ARM: pxa168: added keypad supportMark F. Brown2010-10-093-0/+17
| | | | | Signed-off-by: Mark F. Brown <mark.brown314@gmail.com> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
* ARM: pxa168/aspenite: added initial support for TPO TD043MTEA1 LCDMark F. Brown2010-10-081-0/+60
| | | | | | | Signed-off-by: Mark F. Brown <mark.brown314@gmail.com> Cc: Haojian Zhuang <haojian.zhuang@marvell.com> Cc: Marek Vasut <marek.vasut@gmail.com> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
* ARM: pxa168: added framebuffer support codeMark F. Brown2010-10-082-0/+11
| | | | | Signed-off-by: Mark F. Brown <mark.brown314@gmail.com> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
* ARM: pxa168: fix corrected reset vectorMark F. Brown2010-09-251-1/+6
| | | | | | | | Reset vector for pxa168 is 0xffff_0000 not 0x0. This fix allows reboot to work Signed-off-by: Mark F. Brown <mark.brown314@gmail.com> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
* [ARM] mmp: move declarations into SoC specific header file from common.hEric Miao2010-08-056-9/+19
| | | | Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
* [ARM] mmp: avoid devices.h being included multiple timesEric Miao2010-08-051-0/+4
| | | | Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
* [ARM] mmp: move mmp2 specific timer code to mmp2.cEric Miao2010-08-052-21/+21
| | | | Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
* [ARM] mmp: rename pxa_map_io() to mmp_map_io()Eric Miao2010-08-058-9/+9
| | | | Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
* [ARM] mmp: remove never supported .boot_params for MMPEric Miao2010-08-056-7/+0
| | | | Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
* [ARM] mmp: append device support in jasperHaojian Zhuang2010-05-111-0/+64
| | | | | | | | | Support regulator MAX8649, PMIC MAX8925 into the Jasper. Backlight & power supply components of MAX8925 are enabled in Jasper. Signed-off-by: Haojian Zhuang <haojian.zhuang@marvell.com> Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
* [ARM] mmp: update twsi indexHaojian Zhuang2010-05-111-7/+7
| | | | | | | Sync twsi index to register index. It's used to avoid typo error. Signed-off-by: Haojian Zhuang <haojian.zhuang@marvell.com> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
* [ARM] mmp: add smc registers definitionMingliang Hu2010-05-111-0/+37
| | | | | | Signed-off-by: Mingliang Hu <mhu4@marvell.com> Signed-off-by: Haojian Zhuang <haojian.zhuang@marvell.com> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
* [ARM] mmp: add dma support to mmp2Haojian Zhuang2010-05-111-0/+2
| | | | | | | | Add DMA support in MMP2. Signed-off-by: Lei Wen <leiwen@marvell.com> Signed-off-by: Haojian Zhuang <haojian.zhuang@marvell.com> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
* [ARM] mmp: update mfp settingHaojian Zhuang2010-05-112-16/+214
| | | | | | | Update mfp setting for mmp2. Signed-off-by: Haojian Zhuang <haojian.zhuang@marvell.com> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
* [ARM] mmp: fix clock tick rate in mmp2Mingliang Hu2010-05-111-0/+4
| | | | | | | | In MMP2, clock tick rate should be 6500000. Signed-off-by: Mingliang Hu <mhu4@marvell.com> Signed-off-by: Haojian Zhuang <haojian.zhuang@marvell.com> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
* [ARM] mmp: configure gpio pins from 128 to 192Haojian Zhuang2010-05-111-1/+1
| | | | | | | | In mmp2, 6 banks of GPIO registers are supported. So we can support 192 GPIO pins at most. Signed-off-by: Haojian Zhuang <haojian.zhuang@marvell.com> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
* [ARM] mmp: enable L2 in mmp2Haojian Zhuang2010-05-111-0/+5
| | | | | | | Enable Tauros2 L2 in mmp2. Tauros2 L2 is shared in Marvell ARM cores. Signed-off-by: Haojian Zhuang <haojian.zhuang@marvell.com> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
* [ARM] mmp: update clock register functionHaojian Zhuang2010-05-111-1/+1
| | | | | | | Use clk_add_table in order to sync with clock driver. Signed-off-by: Haojian Zhuang <haojian.zhuang@marvell.com> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
* [ARM] mmp: enable ssp in aspeniteHaojian Zhuang2010-05-111-0/+13
| | | | | | | Configure both ssp and wm8753 in aspenite. Signed-off-by: Haojian Zhuang <haojian.zhuang@marvell.com> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
generated by cgit v1.1 at 2024-09-12 07:42:14 +0000