summaryrefslogtreecommitdiffstats
path: root/arch/arm
AgeCommit message (Collapse)Author
2012-05-11ARM: imx6: Add UART2 for low-level debugDirk Behme
To be able to enable early debugging on boards using the UART2 for the console, add the option for early debugging on UART2. Signed-off-by: Dirk Behme <dirk.behme@de.bosch.com> Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
2012-05-11ARM: imx6q: register phy fixup only when CONFIG_PHYLIB is enabledShawn Guo
It fixes the following compile error with network disabled in imx_v6_v7_defconfig. arch/arm/mach-imx/built-in.o: In function `ksz9021rn_phy_fixup': imx53-dt.c:(.text+0x5f70): undefined reference to `mdiobus_write' imx53-dt.c:(.text+0x5f84): undefined reference to `mdiobus_write' imx53-dt.c:(.text+0x5f98): undefined reference to `mdiobus_write' imx53-dt.c:(.text+0x5fac): undefined reference to `mdiobus_write' imx53-dt.c:(.text+0x5fc0): undefined reference to `mdiobus_write' arch/arm/mach-imx/built-in.o: In function `imx6q_init_machine': imx53-dt.c:(.init.text+0x387c): undefined reference to `phy_register_fixup_for_uid' make: *** [.tmp_vmlinux1] Error 1 Reported-by: Artem Bityutskiy <dedekind1@gmail.com> Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
2012-05-11ARM: imx6q: move imx6q_sabrelite specific code to a dedicated functionRichard Zhao
It'll be easier to add other board specific code. Signed-off-by: Richard Zhao <richard.zhao@freescale.com> Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
2012-05-11ARM: dts: imx6q-sabrelite: Add SPI NOR supportFabio Estevam
mx6qsabrelite has a sst25vf016b SPI NOR flash connected to eCSPI1. Add support for it. Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
2012-05-11ARM: dts: Add basic support for imx6q-sabresdFabio Estevam
Add basic support for imx6q-sabresd. Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
2012-05-11ARM: imx6q-arm2: Remove hardcoded mac addressFabio Estevam
Do not hardcode the local mac address. Let bootloader retrieve it. Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
2012-05-11ARM: imx: rename uart and fec device tree nodesShawn Guo
It has been pointed out by device tree maintainer for several times that the generic names 'serial' and 'ethernet' should be used for those devices per ePAPR. Renames imx uart and fec device tree nodes to stop them being bad examples. Signed-off-by: Shawn Guo <shawn.guo@linaro.org> Acked-by: Sascha Hauer <s.hauer@pengutronix.de>
2012-05-11ARM: dts: imx: Remove bootargs fieldFabio Estevam
Remove bootargs field as this information is retrieved from the bootloader. Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
2012-05-11ARM: dts: imx6q: add anatop regulatorsYing-Chun Liu (PaulLiu)
Add anatop regulators to imx6q.dtsi for all imx6q platforms. Signed-off-by: Ying-Chun Liu (PaulLiu) <paul.liu@linaro.org> Signed-off-by: Richard Zhao <richard.zhao@linaro.org> Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
2012-05-10Merge tag 'omap-cleanup-dss-for-v3.5' of ↵Olof Johansson
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/cleanup Clean up for omap DSS board init in preparation for adding DT support. By Tomi Valkeinen via Tomi Valkeinen (1) and Tony Lindgren (1) * tag 'omap-cleanup-dss-for-v3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: OMAPDSS: DSI: implement generic DSI pin config OMAPDSS: Taal: move reset gpio handling to taal driver OMAPDSS: TFP410: rename dvi files to tfp410 OMAPDSS: TFP410: rename dvi -> tfp410 OMAP: board-files: remove custom PD GPIO handling for DVI output OMAPDSS: panel-dvi: add PD gpio handling Resolved context conflicts in arch/arm/mach-omap2/board-omap4panda.c. Signed-off-by: Olof Johansson <olof@lixom.net>
2012-05-10Merge tag 'omap-dt-for-v3.5' of ↵Olof Johansson
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/dt Minor DT updates based on the dt-missed-3.4 branch By Benoit Cousson (3) and Peter Ujfalusi (2) via Tony Lindgren * tag 'omap-dt-for-v3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: arm/dts: omap4-panda: Add LEDs support arm/dts: omap4-sdp: Add LEDs support arm/dts: twl4030: Add twl4030-gpio node OMAP4: devices: Do not create mcpdm device if the dtb has been provided OMAP4: devices: Do not create dmic device if the dtb has been provided
2012-05-10Merge tag 'omap-cleanup-timer-for-v3.5' of ↵Olof Johansson
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/cleanup2 Timer changes to make it easier to support various SoCs By Vaibhav Hiremath via Tony Lindgren * tag 'omap-cleanup-timer-for-v3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: ARM: OMAP: Make OMAP clocksource source selection using kernel param ARM: OMAP2+: Replace space with underscore in the name field of system timers ARM: OMAP1: Add checks for possible error condition in timer_init
2012-05-10Merge tag 'omap-cleanup-devices-for-v3.5' of ↵Olof Johansson
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/cleanup2 Changes to split plat-omap/devices.c into mach-omap1 and mach-omap2 except for the RNG driver that will be done later on. As this depends on omap-devel-hwmod-data-for-v3.5 and causes merge conflict with omap-fixes-non-critical-for-v3.5, this branch is based on merge of the two. By Tony Lindgren (7) and others via Tony Lindgren (4) and Paul Walmsley (1) * tag 'omap-cleanup-devices-for-v3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: (27 commits) ARM: OMAP1: Pass dma request lines in platform data to MMC driver ARM: OMAP: Move omap_mmc_add() to mach-omap1 ARM: OMAP2: Use hwmod to initialize mmc for 2420 ARM: OMAP2+: Move omap_dsp_reserve_sdram_memblock() to mach-omap2 ARM: OMAP1: Move omap_init_uwire to mach-omap1 ARM: OMAP1: Move omap_init_audio() to keep the devices in alphabetical order ARM: OMAP2+: WDTIMER integration: fix !PM boot crash, disarm timer after hwmod reset ARM: OMAP2/3: hwmod data: Add 32k-sync timer data to hwmod database ARM: OMAP4: hwmod_data: Name the common irq for McBSP ports ARM: OMAP4: hwmod data: I2C: add flag for context restore ARM: OMAP3: hwmod_data: Rename the common irq for McBSP ports ARM: OMAP2xxx: hwmod data: add HDQ/1-wire hwmod ARM: OMAP3: hwmod data: add HDQ/1-wire hwmod ARM: OMAP2+: hwmod data: add HDQ/1-wire hwmod shared data ARM: OMAP2+: HDQ1W: add custom reset function ARM: OMAP2420: hwmod data: Add MMC hwmod data for 2420 arm: omap3: clockdomain data: Remove superfluous commas from gfx_sgx_3xxx_wkdeps[] ARM: OMAP2+: powerdomain: Get rid off duplicate pwrdm_clkdm_state_switch() API ARM: OMAP3: clock data: add clockdomain for HDQ functional clock ARM: OMAP3+: dpll: Configure autoidle mode only if it's supported ...
2012-05-10Merge tag 'omap-devel-hwmod-data-for-v3.5' of ↵Olof Johansson
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/pm Data changes related to omap hwmod By Paul Walmsley (4) and others via Paul Walmsley (1) and Tony Lindgren (1) * tag 'omap-devel-hwmod-data-for-v3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: ARM: OMAP2+: WDTIMER integration: fix !PM boot crash, disarm timer after hwmod reset ARM: OMAP2/3: hwmod data: Add 32k-sync timer data to hwmod database ARM: OMAP4: hwmod_data: Name the common irq for McBSP ports ARM: OMAP4: hwmod data: I2C: add flag for context restore ARM: OMAP3: hwmod_data: Rename the common irq for McBSP ports ARM: OMAP2xxx: hwmod data: add HDQ/1-wire hwmod ARM: OMAP3: hwmod data: add HDQ/1-wire hwmod ARM: OMAP2+: hwmod data: add HDQ/1-wire hwmod shared data ARM: OMAP2+: HDQ1W: add custom reset function ARM: OMAP2420: hwmod data: Add MMC hwmod data for 2420
2012-05-10Merge tag 'omap-board-for-v3.5' of ↵Olof Johansson
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/boards Board specific changes for omap. Note that these are based on omap-pm-regulator-for-v3.5 as both branches are adding twl regulators. By Paul Gortmaker (8) and others via Linus Torvalds (38) and others * tag 'omap-board-for-v3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: OMAP: omap4panda: Use common configuration for V1V8, V2V1 supplies OMAP: 4430SDP: Use common configuration for V1V8, V2V1 supplies OMAP4: twl-common: Add twl6030 V1V8, V2V1 SMPS common configuration ARM: OMAP: Mark Beagleboard-xM MMC bus as 4-bit Add MSUB support for the LogicPD OMAP3530 DevKits ARM: OMAP: rx51: Platform support for lis3lv02d accelerometer ARM: OMAP2+: craneboard: register emac device ARM: OMAP4: board-omap4panda: Register platform device for HDMI audio codec ARM: OMAP4: board-4430sdp: Register platform device for HDMI audio codec ARM: OMAP: devices: Register platform devices for HDMI audio ARM: OMAP3: igep0020: Add support for Micron NAND Flash storage memory ARM: OMAP2+: nand: Make board_onenand_init() visible to board code ARM: OMAP3: cm-t35: add support for power off ARM: OMAP: WiLink platform data for the PandaBoard ARM: OMAP2PLUS: Enable HIGHMEM ARM: OMAP: omap2plus_defconfig: Enable ehci-omap and sms95xx support Signed-off-by: Olof Johansson <olof@lixom.net>
2012-05-10Merge tag 'omap-devel-prcm-for-v3.5' of ↵Olof Johansson
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/pm Updates for PRCM (Power, Reset, Clock Management). Note that this depends on omap-devel-hwmod-for-v3.5. By Kevin Hilman (3) and others via Paul Walmsley (2) and Tony Lindgren (1) * tag 'omap-devel-prcm-for-v3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: arm: omap3: clockdomain data: Remove superfluous commas from gfx_sgx_3xxx_wkdeps[] ARM: OMAP2+: powerdomain: Get rid off duplicate pwrdm_clkdm_state_switch() API ARM: OMAP3: clock data: add clockdomain for HDQ functional clock ARM: OMAP3+: dpll: Configure autoidle mode only if it's supported ARM: OMAP2+: dmtimer: cleanup iclk usage ARM: OMAP4+: Add prm and cm base init function. ARM: OMAP2/3: Add idle_st bits for ST_32KSYNC timer to prcm-common header ARM: OMAP3: Fix CM register bit masks ARM: OMAP: clock: convert AM3517/3505 detection/flags to AM35xx ARM: OMAP3: clock data: treat all AM35x devices the same ARM: OMAP3: clock data: replace 3503/3517 flag with AM35x flag for UART4
2012-05-10Merge tag 'omap-cleanup-renames-for-v3.5' of ↵Olof Johansson
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/cleanup2 Simplify some SoC config options before things get too unreadable. Note that this depends on a fix in omap-fixes-non-critical-for-v3.5, so it's based on that. By Kevin Hilman (3) and others via Tony Lindgren * tag 'omap-cleanup-renames-for-v3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: ARM: OMAP2+: Kconfig: convert SOC_OMAPAM33XX to SOC_AM33XX ARM: OMAP2+: Kconfig: convert SOC_OMAPTI81XX to SOC_TI81XX ARM: OMAP: igep0020: Specify the VPLL2 regulator unconditionally ARM: OMAP2+: INTC: fix Kconfig option for TI81XX ARM: OMAP2+: remove incorrect irq_chip ack field ARM: OMAP4: Adding ID for OMAP4460 ES1.1 ARM: OMAP4: panda: add statics to remove warnings ARM: OMAP2+: Incorrect Register Offsets in OMAP Mailbox ARM: OMAP: fix trivial warnings for dspbridge ARM: OMAP4: hsmmc: check for null pointer ARM: OMAP1: fix compilation issue in board-sx1.c
2012-05-10Merge tag 'omap-fixes-non-critical-for-v3.5' of ↵Olof Johansson
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/fixes Omap fixes that were considered too intrusive or not critical for the -rc cycle By Artem Bityutskiy (1) and others via Tony Lindgren * tag 'omap-fixes-non-critical-for-v3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: ARM: OMAP: igep0020: Specify the VPLL2 regulator unconditionally ARM: OMAP2+: INTC: fix Kconfig option for TI81XX ARM: OMAP2+: remove incorrect irq_chip ack field ARM: OMAP4: Adding ID for OMAP4460 ES1.1 ARM: OMAP4: panda: add statics to remove warnings ARM: OMAP2+: Incorrect Register Offsets in OMAP Mailbox ARM: OMAP: fix trivial warnings for dspbridge ARM: OMAP4: hsmmc: check for null pointer ARM: OMAP1: fix compilation issue in board-sx1.c
2012-05-10Merge tag 'ep93xx-cleanup-for-3.5' of ↵Olof Johansson
git://github.com/RyanMallon/linux-ep93xx into next/cleanup By H Hartley Sweeten (2) and Ryan Mallon (1) via Ryan Mallon * tag 'ep93xx-cleanup-for-3.5' of git://github.com/RyanMallon/linux-ep93xx: arm: ep93xx: use gpio_led_register_device Fix build breakage in ep93xx-core arm: ep93xx: use DEFINE_RES_* macros
2012-05-10ARM: OMAP2+: Kconfig: convert SOC_OMAPAM33XX to SOC_AM33XXKevin Hilman
No need to have an OMAP prefix on these SoCs that are in the family but arent' really called OMAP. Simple rename: CONFIG_SOC_OMAPAM33XX --> CONFIG_SOC_AM33XX No functional change. Signed-off-by: Kevin Hilman <khilman@ti.com> Acked-by: Vaibhav Hiremath <hvaibhav@ti.com> [tony@atomide.com: updated for the driver config change also] Signed-off-by: Tony Lindgren <tony@atomide.com>
2012-05-10ARM: OMAP2+: Kconfig: convert SOC_OMAPTI81XX to SOC_TI81XXKevin Hilman
No need to have an OMAP prefix on these SoCs that are in the family but arent' really called OMAP. Simple rename: CONFIG_SOC_OMAPTI81XX --> CONFIG_SOC_TI81XX No functional change. Signed-off-by: Kevin Hilman <khilman@ti.com> Acked-by: Vaibhav Hiremath <hvaibhav@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
2012-05-10Merge branch 'for-l-o-3.5'Tomi Valkeinen
Conflicts: drivers/video/omap2/displays/panel-taal.c Merge OMAP DSS related board file changes. The branch will also be merged through linux-omap tree to solve conflicts.
2012-05-10GPMC: add ECC control definitionsYegor Yefremov
Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
2012-05-10ARM: OMAP2+: dmtimer: remove redundant sysconfig context restoreTarun Kanti DebBarma
Since hwmod framework now manages sysconfig context save/restore there is no more need to touch this register in driver. Hence, remove restore of sysconfig register in omap_timer_restore_context. This was causing incorrect context restore of sysconfig register. Signed-off-by: Tarun Kanti DebBarma <tarun.kanti@ti.com> Acked-by: Santosh Shilimkar <santosh.shilimkar@ti.com> Acked-by: Kevin Hilman <khilman@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
2012-05-10ARM: OMAP: AM35xx: convert 3517 detection/flags to AM35xxKevin Hilman
Currently cpu_is_omap3517() actually detects any device in the AM35x family (3517 and no-SGX version 3505.) To make it more clear what is being detected, convert the names from 3517 to AM35xx. This adds a new soc_is_am35xx() which duplicates the cpu_is_omap3517(). In order to avoid cross-tree dependencies with clock-tree changes, cpu_is_omap3517() is left until the clock changes are merged, at which point cpu_is_omap3517() will be completely removed. Acked-by: Vaibhav Hiremath <hvaibhav@ti.com> Tested-by: Vaibhav Hiremath <hvaibhav@ti.com> Tested-by: Mark A. Greer <mgreer@animalcreek.com> Signed-off-by: Kevin Hilman <khilman@ti.com> [tony@atomide.com: change to use soc_is_omap instead] Signed-off-by: Tony Lindgren <tony@atomide.com>
2012-05-10ARM: OMAP: AM35xx: remove redunant cpu_is checks for AM3505Kevin Hilman
There are several checks for AM35x devices done using if (cpu_is_omap3517() || cpu_is_omap3505()) However, since the 3505 is just a 3517 without an SGX, the 3505 check is redundant because cpu_is_omap3517() will always be true whenever cpu_is_omap3505() is true. From <plat/cpu.h>: #define cpu_is_omap3505() (cpu_is_omap3517() && !omap3_has_sgx()) Therefore, remove the redunant 3505 checks. This helps move towards removal of SoC detection that depends on specific IP detection. Acked-by: Vaibhav Hiremath <hvaibhav@ti.com> Tested-by: Vaibhav Hiremath <hvaibhav@ti.com> Tested-by: Mark A. Greer <mgreer@animalcreek.com> Signed-off-by: Kevin Hilman <khilman@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
2012-05-10Merge branch 'cleanup-soc' into cleanupTony Lindgren
Conflicts: arch/arm/mach-omap2/Makefile
2012-05-10ARM: decompressor: avoid speculative prefetch from non-RAM areasRussell King
We setup identity MMU mappings across the entire 4GB of space, which are permissionless because the domain is set to manager. This unfortunately allows ARMv6 and later CPUs to speculatively prefetch from the entire address space, which can cause undesirable side effects if those regions contain devices. As we setup the mappings with read/write permission, we can switch the domain to client mode, and then use the XN bit for ARMv6 and above to control speculative prefetch to non-RAM areas. Reported-by: R Sricharan <r.sricharan@ti.com> Acked-by: Santosh Shilimkar <santosh.shilimkar@ti.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2012-05-10Merge tag 'v3.5-soc' of git://gitorious.org/linux-davinci/linux-davinci into ↵Olof Johansson
next/drivers DaVinci SoC updates for v3.5 This pull request updates the DaVinci SoC support to implement DEBUG_LL port choice and optimizes the DMA ISR by removing unnecessary register reads. * tag 'v3.5-soc' of git://gitorious.org/linux-davinci/linux-davinci: ARM: davinci: optimize the DMA ISR ARM: davinci: implement DEBUG_LL port choice + sync with Linux 3.4-rc6 Signed-off-by: Olof Johansson <olof@lixom.net>
2012-05-10Merge tag 'v3.5-fixes-and-cleanups' of ↵Olof Johansson
git://gitorious.org/linux-davinci/linux-davinci into next/fixes DaVinci fixes and cleanups for v3.5 This pull request: 1) improves code readability by using for_each_set_bit_from in DMA driver. 2) fixes incorrect bit position being used in power domain switching code 3) fixes not marking some variables as const when they could be const 4) fixes section mismatch warning in da850 evm code By Uwe Kleine-König (2) and others via Sekhar Nori * tag 'v3.5-fixes-and-cleanups' of git://gitorious.org/linux-davinci/linux-davinci: arm: davinci: use for_each_set_bit_from ARM: davinci: da850-evm: fix section mismatch ARM: davinci: mark spi_board_info arguments as const ARM: davinci: fix incorrect pdctl next bit position Signed-off-by: Olof Johansson <olof@lixom.net>
2012-05-09Merge branch 'for-3.5/defconfig' of ↵Olof Johansson
git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra into next/defconfig By Stephen Warren via Stephen Warren * 'for-3.5/defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra: ARM: tegra: update defconfig
2012-05-09Merge branch 'for-3.5/debug' of ↵Olof Johansson
git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra into next/drivers By Stephen Warren via Stephen Warren * 'for-3.5/debug' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra: ARM: tegra: uncompress.h: Implement TEGRA_DEBUG_UART_AUTO_ODMDATA
2012-05-09Merge branch 'for-3.5/dt' of ↵Olof Johansson
git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra into next/dt2 By Stephen Warren (29) and others via Stephen Warren * 'for-3.5/dt' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra: (43 commits) ARM: dt: tegra trimslice: add support for audio ARM: dt: tegra trimslice: enable SDHCI1 controller ARM: dt: tegra trimslice: add RTC I2C device ARM: dt: tegra seaboard: add i2c devices ARM: dt: tegra seaboard: configure I2C2 pinmux ARM: dt: tegra seaboard: fix I2C2 SCL rate ARM: dt: tegra: enable als and proximity sensor + pinctrl mergebase branch The pinctrl mergebase branch merge conflicts in drivers/pinctrl/core.c that were resolved. Signed-off-by: Olof Johansson <olof@lixom.net>
2012-05-09Merge branch 'for-3.5/tegra30-audio' of ↵Olof Johansson
git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra into next/drivers By Stephen Warren (5) and Peter De Schrijver (1) via Stephen Warren * 'for-3.5/tegra30-audio' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra: ARM: dt: tegra cardhu: basic audio support ARM: dt: tegra30.dtsi: Add audio-related nodes ARM: tegra: add AUXDATA required for audio ARM: tegra: set up audio clocks for tegra30 dt ARM: tegra: Initialize pll_p_out1 ARM: tegra: provide clock aliases for AHUB configlink Signed-off-by: Olof Johansson <olof@lixom.net>
2012-05-09Merge branch 'for-3.5/usb-ulpi' of ↵Olof Johansson
git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra into next/drivers By Stephen Warren (30) and others via Stephen Warren * 'for-3.5/usb-ulpi' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra: (7 commits) ARM: dt: tegra: pinmux changes for USB ULPI ARM: tegra: add USB ULPI PHY reset GPIO to device tree ARM: tegra: don't hard-code USB ULPI PHY reset_gpio ARM: tegra: change pll_p_out4's rate to 24MHz ARM: tegra: fix pclk rate ARM: tegra: reparent sclk to pll_c_out1 ARM: tegra: Add pllc clock init table + depends/pinctrl/mergebase branch Pinctrl mergebase has a conflict in drivers/pinctrl/core.c that was resolved. Signed-off-by: Olof Johansson <olof@lixom.net>
2012-05-09Merge branch 'for-3.5/gpio-pinmux' of ↵Olof Johansson
git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra into next/pinctrl By Stephen Warren via Stephen Warren * 'for-3.5/gpio-pinmux' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra: pinctrl: tegra: error reporting cleanup pinctrl: tegra: debugfs enhancements pinctrl: tegra: refactor probe handling ARM: dt: tegra20: add pinmux to device tree ARM: dt: tegra cardhu: add pinmux to device tree ARM: tegra: Remove pre-pinctrl pinmux driver ARM: tegra: Switch to new pinctrl driver gpio: tegra: Hide tegra_gpio_enable/disable() ARM: tegra: seaboard: Don't gpio_request() ISL29018_IRQ gpio: tegra: configure pins during irq_set_type ARM: tegra: Remove VBUS_GPIO handling from board files usb: ehci-tegra: Add vbus_gpio to platform data
2012-05-09Merge branch 'for-3.5/cleanup' of ↵Olof Johansson
git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra into next/cleanup By Arnd Bergmann (1) and Danny Kukawka (1) via Stephen Warren * 'for-3.5/cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra: ARM: tegra: do not hide dma declarations ARM: tegra: fix multiple asm/hardware/gic.h inclusion Signed-off-by: Olof Johansson <olof@lixom.net>
2012-05-09Merge branch 'for-3.5/fixes' of ↵Olof Johansson
git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra into next/fixes By Stephen Warren via Stephen Warren * 'for-3.5/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra: ARM: disable SUSPEND/ARCH_SUSPEND_POSSIBLE for ARCH_TEGRA ARM: tegra: add pll_x freq table entry for 750MHz Signed-off-by: Olof Johansson <olof@lixom.net>
2012-05-09arm/dts: omap4-panda: Add LEDs supportBenoit Cousson
Add the debug LEDs nodes for an OMAP4 PandaBoard. Signed-off-by: Benoit Cousson <b-cousson@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
2012-05-09arm/dts: omap4-sdp: Add LEDs supportBenoit Cousson
Add the debug LEDs nodes for an OMAP4 SDP/Blaze. Signed-off-by: Benoit Cousson <b-cousson@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
2012-05-09arm/dts: twl4030: Add twl4030-gpio nodeBenoit Cousson
Add the twl-gpio node inside twl4030 definition. Cc: Felipe Balbi <balbi@ti.com> Signed-off-by: Benoit Cousson <b-cousson@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
2012-05-09ARM: OMAP1: Pass dma request lines in platform data to MMC driverTony Lindgren
Pass dma request lines in platform data to MMC driver. Signed-off-by: Tony Lindgren <tony@atomide.com>
2012-05-09ARM: OMAP: Move omap_mmc_add() to mach-omap1Tony Lindgren
Now that omap2420 is using hwmod for MMC, this code is omap1 only used on omap1. Signed-off-by: Tony Lindgren <tony@atomide.com>
2012-05-09usb:hsotg:samsung:cosmetic Move <linux/platform_data/s3c-hsotg.h> to proper ↵Lukasz Majewski
place This commit adds a cosmetic change to the s3c-hsotg UDC driver. It moves s3c-hsotg.h to other linux/ related inclusions. Signed-off-by: Lukasz Majewski <l.majewski@samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-05-09ARM: OMAP2: Use hwmod to initialize mmc for 2420Tony Lindgren
This allows us to pass dma request lines in platform data to MMC driver the same way as we already do for omap2430 and later. Signed-off-by: Tony Lindgren <tony@atomide.com>
2012-05-09ARM: OMAP2+: Move omap_dsp_reserve_sdram_memblock() to mach-omap2Tony Lindgren
This hardware exists only on 2430 and later omaps, so there's no need to have it in plat-omap/devices.c. Note that we don't have any users for exported omap_dsp_get_mempool_base(), so we can make it static. Signed-off-by: Tony Lindgren <tony@atomide.com>
2012-05-09ARM: OMAP1: Move omap_init_uwire to mach-omap1Tony Lindgren
This hardware exists on omap1 only and there's no need to keep it in plat-omap/devices.c. No functional changes. Signed-off-by: Tony Lindgren <tony@atomide.com>
2012-05-09ARM: OMAP1: Move omap_init_audio() to keep the devices in alphabetical orderTony Lindgren
The comments in omap1_init_devices() ask to keep the devices in alphabetical order. Only omap_init_audio() is not following this, so let's move it. No functional changes. Signed-off-by: Tony Lindgren <tony@atomide.com>
2012-05-09Merge branch 'fixes-non-critical' into cleanup-devicesTony Lindgren
2012-05-09OMAP: omap4panda: Use common configuration for V1V8, V2V1 suppliesPeter Ujfalusi
These supplies going to be needed for the twl6040 driver. Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>