summaryrefslogtreecommitdiff
path: root/arch/arm
AgeCommit message (Collapse)Author
2012-01-03Merge branch 'imx/board' into next/boardsArnd Bergmann
* imx/board: (4 commits) Enable 32 bit flash support for iMX21ADS board ARM: mx31pdk: Add MC13783 RTC support iomux-mx25: configuration to support CSPI3 on CSI pins MX1:apf9328: Add i2c support Updated to v3.2-rc6, conflicts: arch/arm/kernel/setup.c
2012-01-03Enable 32 bit flash support for iMX21ADS boardJaccon Bastiaansen
The kernel configuration for the i.MX21ADS board (imx_v4_v5_defconfig) doesn't enable 32 bit flash support. But the i.MX21ADS specific code adds a 32 bit flash device, resulting in a kernel that refuses to boot. Signed-off-by: Jaccon Bastiaansen <jaccon.bastiaansen@gmail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2012-01-03ARM: mx31pdk: Add MC13783 RTC supportFabio Estevam
MX31PDK board has a MC13783 PMIC, which provides RTC functionality. Add support for it. Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2012-01-03iomux-mx25: configuration to support CSPI3 on CSI pinsPaul Fertser
This adds necessary defines for the CSPI3 module (activated with imx25_add_spi_imx2()) to work on the CSI pins (alternative mode 7). Signed-off-by: Paul Fertser <fercerpav@gmail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2012-01-03MX1:apf9328: Add i2c supportGwenhael Goavec-Merou
Signed-off-by: Gwenhael Goavec-Merou <gwenhael.goavec-merou@armadeus.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2011-12-28Merge branch 'pxa/board' into next/boardsArnd Bergmann
* pxa/board: mioa701: add newly available DoC G3 chip
2011-12-28mioa701: add newly available DoC G3 chipRobert Jarzmik
As the mioa701 board has a M-Systems DiskOnChip G3 chip, add it to the platform resources of the board. Signed-off-by: Robert Jarzmik <robert.jarzmik@atosorigin.com> Acked-by: Haojian Zhuang <haojian.zhuang@gmail.com> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2011-12-27Merge branch 'tegra/boards' into next/boardsArnd Bergmann
* tegra/boards: arm/tegra: remove __initdata annotation from pinmux tables arm/tegra: Use bus notifiers to trigger pinmux setup arm/tegra: Refactor board-*-pinmux.c to share code arm/tegra: Fix mistake in Trimslice's pinmux arm/tegra: Rework Seaboard-vs-Ventana pinmux table arm/tegra: Remove useless entries from ventana_pinmux[] arm/tegra: PCIe: Remove include of mach/pinmux.h arm/tegra: Harmony PCIe: Don't touch pinmux arm/tegra: Add AUXDATA for tegra-pinmux and tegra-gpio arm/tegra: Split Seaboard GPIO table to allow for Ventana ARM: tegra: paz00: Fix board pinmux table. ARM: tegra: paz00: add support for wakeup gpio key
2011-12-20arm/tegra: remove __initdata annotation from pinmux tablesOlof Johansson
Instead of reshuffling what functions in the pinmux paths should be __init and thus could keep references to __initdata, let's just remove the annotations for now -- the tables are moving to device tree in the next version anyway and the whole subsystem is being wired up. We will go back and re-annotate where appropriate once things settle down. Signed-off-by: Olof Johansson <olof@lixom.net> Acked-by: Stephen Warren <swarren@nvidia.com>
2011-12-19arm/tegra: Use bus notifiers to trigger pinmux setupStephen Warren
Currently, the Tegra pinmux is initialized at different times when booting with and without device tree: Without device tree: 1) Pinmux and GPIO drivers are registered. 2) Pinmux is configured. 3) All other drivers are registered. With device tree: 1) All drivers are registered and probed, including pinmux and GPIO. 2) Pinmux is configured. This change modifies board-pinmux.c to detect pinmux and GPIO driver registration using bus notifiers. This allows pinmux configuration to happen immediately after the pinmux driver is probed, irrespective of whether the pinmux driver is manually registered by board-pinmux.c, or if it's instantiated during device tree parsing. To support this with device tree, the pinmux init functions must be called prior to instantiating devices from device tree, so that the notifiers are set up before-hand. Signed-off-by: Stephen Warren <swarren@nvidia.com> Signed-off-by: Olof Johansson <olof@lixom.net>
2011-12-19arm/tegra: Refactor board-*-pinmux.c to share codeStephen Warren
This moves the implementation of *_pinmux_init() into a single location. The board-specific pinmux data is left in each board's own file. This will allow future changes that set up the pinmux in a more complex fashion to do so without duplicating that code in each board's pinmux file. Signed-off-by: Stephen Warren <swarren@nvidia.com> Signed-off-by: Olof Johansson <olof@lixom.net>
2011-12-19arm/tegra: Fix mistake in Trimslice's pinmuxStephen Warren
Pin group PTA does not support function RSVD3. However, the current pinmux driver doesn't check this when setting RSVD functions, and ends up writing 3 to the HW register. 3 is actually represented by function GMI, so update the pinmux table to request that instead in order to obtain the same register programming without requesting invalid configurations. Signed-off-by: Stephen Warren <swarren@nvidia.com> Signed-off-by: Olof Johansson <olof@lixom.net>
2011-12-19arm/tegra: Rework Seaboard-vs-Ventana pinmux tableStephen Warren
Rather than modifying seaboard_pinmux[] using ventana_pinmux[], split seaboard_pinmux[] into common_pinmux[] and seaboard_pinmux[], and then actually apply common_pinmux[] always, followed by the appopriate one of seaboard_pinmux[] or ventana_pinmux[]. Signed-off-by: Stephen Warren <swarren@nvidia.com> Signed-off-by: Olof Johansson <olof@lixom.net>
2011-12-19arm/tegra: Remove useless entries from ventana_pinmux[]Stephen Warren
Some of the entries in ventana_pinmux[] are identical to what's already in seaboard_pinmux[]. Remove the overrides from the Ventana table. Signed-off-by: Stephen Warren <swarren@nvidia.com> Signed-off-by: Olof Johansson <olof@lixom.net>
2011-12-19arm/tegra: PCIe: Remove include of mach/pinmux.hStephen Warren
Nothing in this file needs this header. Signed-off-by: Stephen Warren <swarren@nvidia.com> Signed-off-by: Olof Johansson <olof@lixom.net>
2011-12-19arm/tegra: Harmony PCIe: Don't touch pinmuxStephen Warren
The Harmony pinmux table is already set up to mux the PCIe signals onto the appropriate pin groups. Don't manually fiddle with the pinmux in the Harmony PCIe setup code. Merge note: This will have a merge conflict with Peter De Schrijver's "arm/tegra: prepare pinmux code for multiple tegra variants" due to context. When merging the two, make sure to also remove the include of <mach/pinmux-tegra20.h> that his patch added, since it's no longer needed after this patch. Signed-off-by: Stephen Warren <swarren@nvidia.com> Signed-off-by: Olof Johansson <olof@lixom.net>
2011-12-19arm/tegra: Add AUXDATA for tegra-pinmux and tegra-gpioStephen Warren
The pinctrl device name is included in the pinctrl map table, and used as a parameter to pin_config_*() functions. Hence, it must be the same for non-DT and DT kernels. Add AUXDATA to cause this. The GPIO device name will be used by the pinmux/GPIO initialization code in a later patch, and needs to stay constant. Signed-off-by: Stephen Warren <swarren@nvidia.com> Signed-off-by: Olof Johansson <olof@lixom.net>
2011-12-19arm/tegra: Split Seaboard GPIO table to allow for VentanaStephen Warren
Seaboard and Ventana share some GPIOs, but others are different. Split the GPIO table into common, seaboard-specific, and ventana-specific tables, so that only the correct ones are enabled for each board. Add a few missing audio-related GPIOs for Ventana. Signed-off-by: Stephen Warren <swarren@nvidia.com> Signed-off-by: Olof Johansson <olof@lixom.net>
2011-12-16Merge branch 'samsung/board' into next/boardsOlof Johansson
* samsung/board: ARM: S3C64XX: Hook up VDDINT on Cragganmore ARM: S3C2440: Add new LCD (W35i) support for Mini2440 board ARM: S3C64XX: Power gate unused domains ARM: S3C64XX: Hook up Littlemill audio card on Cragganmore ARM: S3C64XX: Hook up platform data for Kilchomin module on Cragganmore ARM: S3C64XX: Run Tobermory interrupts in the default mode ARM: S3C64XX: Improve logging of unknown Cragganmore module types ARM: S3C64XX: Configure WM1250 EV1 GPIOs on Cragganmore ARM: S3C64XX: Use software initiated powerdown for Cragganmore ARM: S3C64XX: Raise the frequency of the second I2C bus on Cragganmore ARM: S3C64XX: Correct reservation of GPIOs for CPU module on Cragganmore ARM: SAMSUNG: Fix GPIO space reservation for S3C64xx platforms ARM: S3C64XX: Update for conversion to SAMSUNG_GPIO_EXTRA Conflicts: arch/arm/mach-s3c64xx/mach-crag6410.c
2011-12-16Merge branch 'imx6/boards' into next/boardsOlof Johansson
* imx6/boards: ARM: imx6q: generate imx6q dtb files arm/imx6q: Rename Sabreauto to Armadillo2 arm/imx6q-sabrelite: add enet phy ksz9021rn fixup arm/imx6: add imx6q sabrelite board support dts/imx: rename uart labels to consistent with hw spec dts/imx: rename gpio labels to consistent with hw spec
2011-12-16Merge branch 'omap/musb' into next/boardsOlof Johansson
* omap/musb: ARM: OMAP: musb: Add support for ti816evm ARM: OMAP: musb: Add ti81xx phy power function ARM: OMAP: musb: Adding support for ti81xx
2011-12-16Merge branch 'omap/board' into next/boardsOlof Johansson
* omap/board: ARM: OMAP: TI814X: Create board support and enable build for TI8148 EVM ARM: OMAP4: board-4430sdp: Register platform device for digimic codec ARM: OMAP4: devices: Register OMAP4 DMIC platform device ARM: OMAP3: sdram-nokia: add 200 MHz memory timings info ARM: OMAP3: rx51: enable tsc2005 touchscreen ARM: OMAP3: cm-t35: fix mux mode for DSS pins ARM: OMAP3: cm-t35: Add reset for USB hub ARM: OMAP3: cm-t35: enable audio ARM: OMAP3: cm-t35: Use correct DSS regulator supply ARM: OMAP3: cm-t35: Add regulator for ads7846 touchscreen ARM: OMAP: TI814X: Add cpu type macros and detection support ARM: OMAP: TI81XX: Prepare for addition of TI814X support ARM: OMAP: ID: Chip detection for OMAP4470 ARM: OMAP: id: add chip id recognition for omap4430 es2.3 ARM: OMAP: am33xx: Update common OMAP machine specific sources ARM: OMAP: am33xx: Update common omap platform files
2011-12-16Merge branch 'depends/rmk/devel-stable' into next/boardsOlof Johansson
2011-12-16Merge branch 'fixes' of ↵Linus Torvalds
git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc * 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: ARM: OMAP: rx51: fix USB ARM: OMAP: mcbsp: Fix possible memory corruption arm/imx: fix power button on imx51 babbage board ARM: imx: fix cpufreq build errors ARM: mx5: add __initconst for fec pdata MXC PWM: should active during DOZE/WAIT/DBG mode ARM: EXYNOS: Fix build error without CONFIG_LOCAL_TIMERS ARM: EXYNOS: Fix for stall in case of cpu hotplug or sleep ARM: S5PV210: Set 1000ns as PWM backlight period on SMDKV210 ARM: SAMSUNG: remove duplicated header include
2011-12-15Merge branch 'samsung-fixes-3' of ↵Olof Johansson
git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into fixes
2011-12-15Merge branch 'musb' of ↵Olof Johansson
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into omap/musb
2011-12-15Merge branch 'board' of ↵Olof Johansson
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into omap/board
2011-12-15Merge branch 'fixes' of ↵Olof Johansson
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes
2011-12-15ARM: unwinder: fix bisection to find origin in .idx sectionUwe Kleine-König
The bisection implemented in unwind_find_origin() stopped to early. If there is only a single entry left to check the original code just took the end point as origin which might be wrong. This was introduced in commit de66a979012d ("ARM: 7187/1: fix unwinding for XIP kernels"). Reported-and-tested-by: Nick Bowler <nbowler@elliptictech.com> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2011-12-14ARM: imx6q: generate imx6q dtb filesEric Miao
Signed-off-by: Eric Miao <eric.miao@linaro.org> Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
2011-12-14arm/imx6q: Rename Sabreauto to Armadillo2Dirk Behme
The Sabreauto board was renamed to Armadillo2 recently. To avoid confusion, rename Sabreauto to Armadillo2/arm2. Signed-off-by: Dirk Behme <dirk.behme@de.bosch.com> Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
2011-12-14arm/imx6q-sabrelite: add enet phy ksz9021rn fixupRichard Zhao
The default phy RGMII pad settings can not work, tune pad skew. Signed-off-by: Richard Zhao <richard.zhao@linaro.org> Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
2011-12-14arm/imx6: add imx6q sabrelite board supportRichard Zhao
- Add basic board dts file - Add board compatible string to mach-imx6q. - Update fsl DT board doc. Signed-off-by: Richard Zhao <richard.zhao@linaro.org> Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
2011-12-14dts/imx: rename uart labels to consistent with hw specRichard Zhao
UART1/UART2/... is more readable than UART0/UART1/... . Remove redundant UART comments. Signed-off-by: Richard Zhao <richard.zhao@linaro.org> Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
2011-12-14dts/imx: rename gpio labels to consistent with hw specRichard Zhao
GPIO1/GPIO2/... is more readable than GPIO0/GPIO1/... . Remove redundant gpio comments. Signed-off-by: Richard Zhao <richard.zhao@linaro.org> Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
2011-12-13ARM: OMAP: rx51: fix USBFelipe Contreras
Commit 10299e2e4e3ed3b16503d4e04edd48b33083f4e2 (ARM: RX-51: Enable isp1704 power on/off) added power management for isp1704. However, the transceiver should be powered on by default, otherwise USB doesn't work at all for networking during boot. All kernels after v3.0 are affected. Cc: stable@kernel.org Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Reviewed-by: Sebastian Reichel <sre@debian.org> [tony@atomide.com: updated comments] Signed-off-by: Tony Lindgren <tony@atomide.com>
2011-12-13ARM: OMAP: musb: Add support for ti816evmRavi Babu
Adding musb support in ti816 EVM board file. Signed-off-by: Ajay Kumar Gupta <ajay.gupta@ti.com> Signed-off-by: Ravi Babu <ravibabu@ti.com> Acked-by: Felipe Balbi <balbi@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
2011-12-13ARM: OMAP: musb: Add ti81xx phy power functionAjay Kumar Gupta
Adding ti81xx_musb_phy_power() which will be used by musb driver through its function pointer in board_data. Signed-off-by: Ajay Kumar Gupta <ajay.gupta@ti.com> Signed-off-by: Ravi Babu <ravibabu@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
2011-12-13ARM: OMAP: musb: Adding support for ti81xxRavi Babu
Added musb support for ti81xx platform which has two instances of musb interface and uses CPPI4.1 DMA. The current patch set adds support for single instance and in PIO mode only. Signed-off-by: Ajay Kumar Gupta <ajay.gupta@ti.com> Signed-off-by: Ravi Babu <ravibabu@ti.com> Acked-by: Felipe Balbi <balbi@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
2011-12-13ARM: OMAP: TI814X: Create board support and enable build for TI8148 EVMHemant Pedanekar
This patch adds minimal support and build configuration for TI8148 EVM. Also adds support for low level debugging on UART1 console on the EVM. Note that existing TI8168 EVM file (board-ti8168evm.c) is updated with machine info for TI8148 EVM. Signed-off-by: Hemant Pedanekar <hemantp@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
2011-12-13ARM: OMAP4: board-4430sdp: Register platform device for digimic codecPeter Ujfalusi
OMAP4 SDP/Blaze boards have onboard digital microphones. Register the platform device for the dmic-codec to be able to use the microphones. Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
2011-12-13ARM: OMAP4: devices: Register OMAP4 DMIC platform devicePeter Ujfalusi
Add platform device registration for OMAP4 DMIC. Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
2011-12-13ARM: OMAP3: sdram-nokia: add 200 MHz memory timings infoIgor Dmitriev
Add memory timing info regarding the 200 MHz memory in sdram-nokia. Note that 100 MHz mode uses these same timings too. Signed-off-by: Igor Dmitriev <ext-dmitriev.igor@nokia.com> Signed-off-by: Eduardo Valentin <eduardo.valentin@nokia.com> Signed-off-by: Aaro Koskinen <aaro.koskinen@nokia.com> [tony@atomide.com: updated comments for 100 MHz timings] Signed-off-by: Tony Lindgren <tony@atomide.com>
2011-12-13ARM: OMAP3: rx51: enable tsc2005 touchscreenAaro Koskinen
Enable TSC2005 touchscreen driver on the RX-51 board by providing the needed platform data. Signed-off-by: Aaro Koskinen <aaro.koskinen@nokia.com> Reviewed-by: Sebastian Reichel <sre@debian.org> Signed-off-by: Tony Lindgren <tony@atomide.com>
2011-12-13ARM: OMAP3: cm-t35: fix mux mode for DSS pinsIgor Grinberg
OMAP pin mux configuration API has been used incorrectly resulting in wrong mux mode set for several DSS pins. Signed-off-by: Igor Grinberg <grinberg@compulab.co.il> Signed-off-by: Tony Lindgren <tony@atomide.com>
2011-12-13ARM: OMAP3: cm-t35: Add reset for USB hubIgor Grinberg
USB hub is not functional until is reset. Reset the USB hub on SB-T35. Signed-off-by: Igor Grinberg <grinberg@compulab.co.il> [tony@atomide.com: updated subject] Signed-off-by: Tony Lindgren <tony@atomide.com>
2011-12-13ARM: OMAP3: cm-t35: enable audioIgor Grinberg
TWL4030 audio codec is not being registered if no platform data is supplied. Provide platform data for the TWL4030 audio codec. Signed-off-by: Igor Grinberg <grinberg@compulab.co.il> [tony@atomide.com: updated subject] Signed-off-by: Tony Lindgren <tony@atomide.com>
2011-12-13ARM: OMAP3: cm-t35: Use correct DSS regulator supplyIgor Grinberg
cm-t35 DSS suplies are connected to VIO. In fact, TPS65930 does not have VPLL2. Signed-off-by: Igor Grinberg <grinberg@compulab.co.il> [tony@atomide.com: updated subject] Signed-off-by: Tony Lindgren <tony@atomide.com>
2011-12-13ARM: OMAP3: cm-t35: Add regulator for ads7846 touchscreenIgor Grinberg
ads7846 driver fails to find the regulator supply and as a result the touchscreen is not working. Fix this by adding a regulator supply for the ads7846 driver. Signed-off-by: Igor Grinberg <grinberg@compulab.co.il> [tony@atomide.com: updated subject] Signed-off-by: Tony Lindgren <tony@atomide.com>
2011-12-13ARM: OMAP: TI814X: Add cpu type macros and detection supportHemant Pedanekar
This patch adds cpu type, macros for identification of TI814X device. Signed-off-by: Hemant Pedanekar <hemantp@ti.com> [tony@atomide.com: left out CK_TI814X for now] Signed-off-by: Tony Lindgren <tony@atomide.com>
generated by cgit v1.2.3 (git 2.0.4) at 2025-01-26 20:55:42 +0000