* [GIT PULL 00/15] arm-soc: changes for v3.6
@ 2012-07-23 20:32 ` Arnd Bergmann
0 siblings, 0 replies; 44+ messages in thread
From: Arnd Bergmann @ 2012-07-23 20:32 UTC (permalink / raw)
To: Linus Torvalds; +Cc: linux-kernel, linux-arm-kernel, arm
Hi Linus,
Here are the main changes for the arm-soc tree for the 3.6 merge window.
All dependencies are merged already, but there are a few small branches
that I'd like to give some more time in linux-next before sending them to
you. We've been discussing some large-scale reorganizations where lots
of files get moved around and were thinking about sending them at the
end of the merge window, but right now it seems a bit premature.
We'll see how that goes.
There are about 600 changesets in here, and a bunch of simple
conflicts between the 15 branches, but so far no conflicts with
stuff that you have merged already. For reference, you can check
the "for-linus" branch in the same tree to see how we resolved
the conflicts.
Arnd
Afzal Mohammed (3):
ARM: OMAP2+: am33xx: Add low level debugging support
ARM: OMAP2+: am33xx: Add AM335XEVM machine support
arm/dts: am33xx wdt node
Alexander Shiyan (8):
ARM: i.MX51 iomux: added missing pin definitions
ARM: i.MX5x clocks: Add EPIT support
ARM: i.MX5x clocks: Fix parent for PWM clocks
ARM: i.MX5x clocks: Fix GPT clocks
ARM: i.MX5x CSPI: Fixed clock name for CSPI
ARM: clps711x/p720t: Replace __initcall by .init_early call
ARM: clps711x: Removed superfluous transform virt_to_bus and related functions
ARM: clps711x: Remove the setting of the time
Alexandre Pereira da Silva (13):
ARM: LPC32xx: Build arch dtbs
ARM: LPC32xx: Add dt settings to the at25 node
ARM: LPC32xx: Remove spi chipselect request from board init
ARM: LPC32xx: Remove spi chip definitions
ARM: LPC32xx: Cleanup board init, remove duplicate clock init
ARM: LPC32xx: Move uart6 irda disable to serial.c
ARM: LPC32xx: Move i2s1 dma enabling to clock.c
ARM: LPC32xx: Cleanup USB clock init
ARM: LPC32xx: Remove unused gpios
ARM: LPC32xx: Add PWM to base dts file
ARM: LPC32xx: Set system serial based on cpu unique id
ARM: LPC32xx: Add PWM clock
ARM: LPC32xx: Add PWM support
Andy Gross (1):
omap2+: add drm device
AnilKumar Ch (4):
arm/dts: Add initial DT support for AM33XX SoC family
arm/dts: Add support for AM335x EVM
arm/dts: Add support for AM335x BeagleBone
arm/dts: remove MMC/SD and SPI related entries from am33xx.dtsi
Arnd Bergmann (79):
ARM: OMAP depends on MMU
Merge tag 'at91-for-next-cleanup' of git://github.com/at91linux/linux-at91 into next/cleanup
Merge branch 'prima2/drivers' of git://gitorious.org/sirfprima2-kernel/sirfprima2-kernel into next/pinctrl
Merge branch 'imx/sparse-irq' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/irq
Merge branch 'lpc32xx/dts' of git://git.antcom.de/linux-2.6 into next/dt
Merge branch 'lpc32xx/defconfig' of git://git.antcom.de/linux-2.6 into next/defconfig
Merge branch 'lpc32xx/core' of git://git.antcom.de/linux-2.6 into next/soc
Merge tag 'omap-fixes-non-critical-for-v3.6' of git://git.kernel.org/.../tmlind/linux-omap into next/fixes-non-critical
Merge tag 'omap-cleanup-for-v3.6' of git://git.kernel.org/.../tmlind/linux-omap into next/cleanup
Merge tag 'omap-devel-dmtimer-for-v3.6' of git://git.kernel.org/.../tmlind/linux-omap into next/timer
Merge tag 'omap-devel-driver-for-v3.6' of git://git.kernel.org/.../tmlind/linux-omap into next/pm
Merge tag 'omap-devel-pm-for-v3.6' of git://git.kernel.org/.../tmlind/linux-omap into next/pm
Merge tag 'omap-devel-am33xx-for-v3.6' of git://git.kernel.org/.../tmlind/linux-omap into next/soc
ARM: at91: fix new build errors
ARM: prima2: enable gpiolib unconditionally
Merge branch 'prima2/pinctrl' into next/pinctrl
Merge branch 'mxs/fixes-for-3.6' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/fixes-non-critical
Merge tag 'v3.5-rc5' into next/dt
Merge branch 'mxs/dt-for-3.6' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/dt
Merge branch 'mxs/defconfig-for-3.6' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/defconfig
Merge branch 'imx/cleanup-for-3.6' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/cleanup
Merge branch 'imx/dt-for-3.6' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/dt
Merge branch 'imx/sparse-irq' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/irq
Merge tag 'imx-cleanup' of git://git.pengutronix.de/git/imx/linux-2.6 into next/cleanup
Merge branch 'for-3.6/cleanup' of git://git.kernel.org/.../swarren/linux-tegra into next/cleanup
Merge branch 'for-3.6/fixes' of git://git.kernel.org/.../swarren/linux-tegra into next/cleanup
Merge branch 'tegra/cleanup' into next/soc
Merge branch 'for-3.6/soc' of git://git.kernel.org/.../swarren/linux-tegra into next/soc
Merge branch 'for-3.6/boards' of git://git.kernel.org/.../swarren/linux-tegra into next/boards
Merge branch 'tegra/cleanup' into next/clk
Merge branch 'for-3.6/common-clk' of git://git.kernel.org/.../swarren/linux-tegra into next/clk
Merge branch 'for-3.6/defconfig' of git://git.kernel.org/.../swarren/linux-tegra into next/defconfig
Merge branch 'next/cleanup-samsung' of git://git.kernel.org/.../kgene/linux-samsung into next/cleanup
Merge branch 'next/devel-dma-ops' of git://git.kernel.org/.../kgene/linux-samsung into next/dma
Merge branch 'next/board-samsung' of git://git.kernel.org/.../kgene/linux-samsung into next/boards
Merge branch 'mvebu/newsoc' into next/newsoc
Merge tag 'davinci-v3.6-cleanup' of git://gitorious.org/linux-davinci/linux-davinci into next/cleanup
Merge tag 'davinci-v3.6-soc' of git://gitorious.org/linux-davinci/linux-davinci into next/soc
Merge tag 'davinci-v3.6-fixes' of git://gitorious.org/linux-davinci/linux-davinci into next/fixes-non-critical
Merge tag 'omap-devel-board-for-v3.6' of git://git.kernel.org/.../tmlind/linux-omap into next/boards
Merge tag 'omap-cleanup-part2-for-v3.6' of git://git.kernel.org/.../tmlind/linux-omap into next/cleanup2
Merge branch 'omap/cleanup2' into next/clk
Merge tag 'omap-devel-am33xx-data-for-v3.6' of git://git.kernel.org/.../tmlind/linux-omap into next/clk
Merge branch 'omap/cleanup2' into next/newsoc
Merge branch 'devel-omap5' of git://git.kernel.org/.../tmlind/linux-omap into next/newsoc
Merge tag 'v3.5-rc6' into next/soc
Merge tag 'imx-soc' of git://git.pengutronix.de/git/imx/linux-2.6 into next/soc
Merge branch 'lpc32xx/core-fixes' of git://git.antcom.de/linux-2.6 into next/soc
Merge branch 'picoxcell/timer' into next/timer
Merge branch 'tegra/cleanup' into next/dt
Merge branch 'for-3.6/dt' of git://git.kernel.org/.../swarren/linux-tegra into next/dt
Merge tag 'v3.5-rc6' into next/dt
Merge tag 'at91-for-next-dt' of git://github.com/at91linux/linux-at91 into next/dt
Merge tag 'omap-devel-dt-for-v3.6' of git://git.kernel.org/.../tmlind/linux-omap into next/dt
Merge tag 'imx-dt' of git://git.pengutronix.de/git/imx/linux-2.6 into next/dt
Merge branch 'imx/dt-for-3.6' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/dt
Merge tag 'imx-defconfig' of git://git.pengutronix.de/git/imx/linux-2.6 into next/defconfig
Merge branch 'mxs/dt-for-3.6' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/dt
Merge tag 'davinci-v3.6-dt' of git://gitorious.org/linux-davinci/linux-davinci into next/dt
Merge branch 'vexpress-v3.5-rc6' of git://git.linaro.org/people/pawelmoll/linux into next/soc
Merge branch 'clps711x/cleanup' into next/cleanup
Merge branch 'mvebu/newsoc' into next/newsoc
Merge tag 'imx-clk' of git://git.pengutronix.de/git/imx/linux-2.6 into next/clk
Merge branch 'next/cleanup-samsung-2' of git://git.kernel.org/.../kgene/linux-samsung into next/cleanup
Merge branch 'next/board-samsung-2' of git://git.kernel.org/.../kgene/linux-samsung into next/boards
Merge branch 'samsung/dma' into next/dt
Merge branch 'next/dt-samsung' of git://git.kernel.org/.../kgene/linux-samsung into next/dt
ARM: EXYNOS: mark the DMA channel binding for SPI as preliminary
Merge branch 'next/devel-samsung' of git://git.kernel.org/.../kgene/linux-samsung into next/soc
Merge branch 'ux500/fixes-3.5' into next/dt
Merge branch 'for-arm-soc-next' of git://git.linaro.org/people/ljones/linux-3.0-ux500 into next/dt
Merge tag 'ep93xx-fixes-for-3.6' of git://github.com/RyanMallon/linux-ep93xx into next/fixes-non-critical
Merge tag 'ep93xx-devel-for-3.6' of git://github.com/RyanMallon/linux-ep93xx into next/soc
Merge branch 'lpc32xx/dts2' of git://git.antcom.de/linux-2.6 into next/dt
Merge branch 'lpc32xx/core2' of git://git.antcom.de/linux-2.6 into next/soc
Merge tag 'v3.5-rc7' into next/boards
Merge branch 'next/board-samsung-3' of git://git.kernel.org/.../kgene/linux-samsung into next/boards
Merge branch 'next/devel-samsung-spi' of git://git.kernel.org/.../kgene/linux-samsung into next/spi
Merge branch 'samsung/defconfig' into next/defconfig
Barry Song (1):
PINCTRL: SiRF: add GPIO and GPIO irq support in CSR SiRFprimaII
Bartlomiej Zolnierkiewicz (1):
ARM: EXYNOS: Remove leftovers of the Samsung specific power domain control
Ben Dooks (1):
ARM: mvebu: MPIC: read number of interrupts from control register
Benoît Thébaudeau (7):
ARM: imx: cleanup otg_mode
ARM: imx: remove unused pdata from device macros
ARM: imx: fix i.MX35 CPU architecture
ARM: imx: enable support for mx35 rtc
ARM: imx: add rtc support to mx35_3ds
ARM: imx: make ehci power/oc polarities configurable
ARM: imx: fix mx51 ehci setup errors
Boojin Kim (4):
ARM: SAMSUNG: Add config() function in DMA common operations
spi/s3c64xx: Add the use of DMA config operation
ASoC: follow the updated samsung DMA common operations
ARM: EXYNOS: Remove the L2 cache latency setting for EXYNOS5
Brian Austin (1):
ARM: OMAP: beagle: Set USB Host Port 1 to OMAP_USBHS_PORT_MODE_UNUSED
Daniel Lezcano (1):
ARM: OMAP3/4: consolidate cpuidle Makefile
Denis 'GNUtoo' Carikli (2):
ARM i.MX31: Add devicetree support
arm/dts: Add support for i.MX31 bug 1.x board from buglabs.
Dimitris Papastamos (1):
ARM: S3C64XX: Add IRQ mapping for wm0010 on Cragganmore
Dinh Nguyen (2):
clocksource: dw_apb_timer: Add common DTS glue for dw_apb_timer
ARM: socfpga: initial support for Altera's SOCFPGA platform
Dmitry Lifshitz (2):
ARM: OMAP3: cm-t35: add mt9t001 camera sensor support
ARM: OMAP3: cm-t35: add tvp5150 decoder support
Fabio Estevam (14):
ARM: mxs: Let GPMI driver be built by default
ARM: mxs: Enable MACH_APX4DEVKIT
ARM: mxs_defconfig: Let AUART driver be built by default
serial: mxs-auart: Allow device tree probing
ARM: dts: mx28evk: Add auart0 and auart3 support
ARM: imx: Fix build error due to missing irqs.h include
ARM: mx23: Add initial support for olinuxino board
ARM: mxs_defconfig: Enable RTC driver
ARM: imx: Kconfig: Remove IMX_HAVE_PLATFORM_IMX_SSI from MACH_MX25_3DS
ARM: mxs: defconfig: Enable CONFIG_COMMON_CLK_DEBUG
ARM: clk-imx27: Fix rtc clock id
ARM: mx27: Reenable silicon version print
ARM: dts: Add basic support for mx27_3ds board
ARM: imx: clk-imx31: Fix clock id for rnga driver
Fabio Porcedda (1):
ARM: at91: add support for Telit EVK-PRO3 with Telit GE863-PRO3
Gregory CLEMENT (4):
clocksource: time-armada-370-xp: Marvell Armada 370/XP SoC timer driver
arm: mach-mvebu: add source files
arm: mach-mvebu: add documentation for new device tree bindings
arm: mach-mvebu: add compilation/configuration change
Heiko Schocher (2):
ARM: davinci: cp_intc: Add irq domain support
ARM: davinci: cp_intc: Add OF support for TI interrupt controller
Huang Shijie (6):
ARM: imx6q: add DT node for apbh-dma
ARM: imx6q: add clock for apbh-dma
ARM: imx6q: add DT node for gpmi nand
ARM: imx6q: add clocks for gpmi-nand
ARM: mx28: add gpmi-nand support
ARM: dts: mx23: add gpmi nand support
Hui Wang (1):
ARM: dts: imx6q-sabrelite: add ecspi1 pinctrl support
Igor Grinberg (1):
ARM: OMAP: fix the ads7846 init code
J Keerthy (1):
ARM: OMAP2+: Voltage: Move the omap_volt_data structure to plat
Javier Martinez Canillas (1):
ARM: OMAP: omap2plus_defconfig: Enable EXT4 support
Jean Pihet (13):
ARM: OMAP2+: SmartReflex: move the smartreflex header to include/linux/power
ARM: OMAP3+: SmartReflex: class drivers should use struct omap_sr *
ARM: OMAP2+: smartreflex: Use the names from hwmod data instead of voltage domains.
ARM: OMAP3: hwmod: rename the smartreflex entries
ARM: OMAP2+: SmartReflex: introduce a busy loop condition test macro
ARM: OMAP2+: SmartReflex: Use per-OPP data structure
ARM: OMAP2+: SmartReflex: Create per-opp debugfs node for errminlimit
ARM: OMAP2+: SmartReflex: add POWER_AVS Kconfig options
ARM: OMAP: SmartReflex: Move smartreflex driver to drivers/
ARM: OMAP3: PM: cpuidle: default to C1 in next_valid_state
ARM: OMAP3: PM: cpuidle: optimize the PER latency in C1 state
ARM: OMAP3: PM: cpuidle: optimize the clkdm idle latency in C1 state
ARM: OMAP2+: do not allow SmartReflex to be built as a module
Jean-Christophe PLAGNIOL-VILLARD (1):
ARM: at91: aic add dt support for external irqs
Jiri Prchal (1):
ARM: at91: Add support for board aks-cdu
Jon Hunter (15):
ARM: OMAP: Remove unnecessary clk structure
ARM: OMAP2+: Remove unused max number of timers definition
ARM: OMAP2+: Add dmtimer platform function to reserve systimers
ARM: OMAP: Add DMTIMER capability variable to represent timer features
ARM: OMAP2+: HWMOD: Correct timer device attributes
ARM: OMAP2+: Fix external clock support for dmtimers
ARM: OMAP: Remove loses_context variable from timer platform data
ARM: OMAP: Remove timer function pointer for context loss counter
ARM: OMAP: Add flag to indicate if a timer needs a manual reset
ARM: OMAP1: Fix dmtimer support
ARM: OMAP2+: Move dmtimer clock set function to dmtimer driver
ARM: OMAP2+: Simplify dmtimer clock aliases
arm/dts: OMAP2: Add support for OMAP2420H4 Board
ARM: OMAP4: clockdomain/CM code: Update supported transition modes
ARM: OMAP2+: powerdomain code: Fix Wake-up power domain power status
Jonghwan Choi (2):
ARM: SAMSUNG: Remove unused variable 'running' on PWM
ARM: EXYNOS: Clear SYS_WDTRESET bit to use watchdog reset
Juan Gutierrez (2):
ARM: OMAP: enable mailbox irq per instance
ARM: OMAP4: fix irq and clock name for dsp-iommu
Kevin Hilman (16):
ARM: OMAP4: hwmod: rename _enable_module to _omap4_enable_module()
ARM: OMAP2+: hwmod: use init-time function ptrs for enable/disable module
ARM: OMAP4: hwmod: drop extra cpu_is check from _wait_target_disable()
ARM: OMAP2+: hwmod: use init-time function pointer for wait_target_ready
ARM: OMAP2+: hwmod: use init-time function pointer for hardreset
ARM: OMAP2+: hwmod: use init-time function pointer for _init_clkdm
ARM: OMAP2+: CLEANUP: Remove ARCH_OMAPx ifdef from struct dpll_data
ARM: OMAP2+: TWL: remove usage of pdata->irq_base/_end
mfd: twl: remove pdata->irq_base/_end, no more users
ARM: OMAP2+: PRM: fix compile for OMAP4-only build
ARM: OMAP2+: powerdomain: allow pre/post transtion to be per pwrdm
ARM: OMAP3: PM: call pre/post transition per powerdomain
ARM: OMAP3: PM: cleanup cam_pwrdm leftovers
ARM: OMAP2+: fix CONFIG_CPU_IDLE dependency on CONFIG_PM
ARM: OMAP2+: PM: fix IRQ_NOAUTOEN removal by mis-merge
ARM: davinci: add runtime PM support for clock management
Kishon Vijay Abraham I (1):
ARM: OMAP2+: hwmod code: add support to set dmadisable in hwmod framework
Kukjin Kim (5):
Merge branch 'next/devel-dma-ops' into next/dt-samsung
Merge branch 'next/board-samsung' into next/board-samsung-2
Merge branch 'next/dt-samsung' into next/devel-samsung-spi
Merge branch 'next/board-samsung-2' into next/board-samsung-3
ARM: SAMSUNG: no need to set the value for clk_xusbxti when it is 24Mhz
Lauri Hintsala (6):
ARM: apx4devkit: add NAND support
ARM: apx4devkit: add display support
ARM: apx4devkit: fix the bus-width of SSP0 to 4 bits
ARM: apx4devkit: add SSP2 support
ARM: apx4devkit: remove AUART3
ARM: apx4devkit: add pin muxing for GPIOs
Laxman Dewangan (4):
ARM: tegra: dma: rename driver name for clock to "tegra-apbdma"
ARM: tegra: add device tree AUXDATA for APBDMA
ARM: tegra: apbio access using dma for tegra20 only
ARM: tegra: apbio: use dmaengine based dma driver
Lee Jones (20):
ARM: ux500: Enable Device Tree support mmci for Snowball
ARM: ux500: Remove unused i2c platform_data initialisation code
ARM: ux500: Provide auxdata to be used as name base clock search for nmk-i2c
ARM: ux500: Kconfig: Compile in leds-gpio support for Snowball
ARM: ux500: Enable the user LED on Snowball via Device Tree
ARM: ux500: Add a ab8500-gpadc node to the db8500 Device Tree
ARM: ux500: Add support for input/ponkey into the db8500's Device Tree
ARM: ux500: Enable LED heartbeat functionality on Snowball
ARM: ux500: Enable LED heartbeat functionality on Snowbal via DT
ARM: ux500: Add db8500 Device Tree node for ab8500-sysctrl
ARM: ux500: Add db8500 Device Tree node for misc/ab8500-pwm
ARM: ux500: Add a ab8500-usb Device Tree node for db8500 based devices
ARM: ux500: Apply ab8500-debug node do the db8500 DT structure
ARM: ux500: Correctly reference IRQs supplied by the AB8500 from Device Tree
ARM: ux500: Enable the AB8500 RTC for all DT:ed DB8500 based devices
ARM: ux500: Move rtc-pl031 registration to Device Tree when enabled
pinctrl: pinctrl-nomadik: Append sleepmode property with vendor specific prefixes
ARM: ux500: Ensure vendor specific properties have the vendor's identifier
ARM: ux500: Remove temporary snowball_of_platform_devs enablement structure
ARM: ux500: Remove PMU platform registration when booting with DT
Linus Walleij (8):
ARM: nomadik: register GPIOs dynamically
ARM: nomadik: register AMBA devices dynamically
ARM: nomadik: register PL031 RTC
ARM: nomadik: convert to generic clock
ARM: nomadik: register all three I2C busses
ARM: nomadik: register the I2C devices
ARM: nomadik: register the MMC/SD device
ARM: nomadik: bump all IRQ numbers by one
Ludovic Desroches (8):
ARM: at91: fix at91_aic_write macro
ARM: at91: aic can use fast eoi handler type
ARM: at91: add of irq priorities support
ARM: at91: remove static irq priorities for sam9x5
ARM: at91: at91 based machines specify their own irq handler at run time
ARM: at91: sparse irq support
ARM: at91: remove mach/irqs.h
ARM: at91: add AIC5 support
Marc Kleine-Budde (2):
ARM: imx: enable flexcan on imx25, imx35, imx53, imx6q
ARM: mxs: enable flexcan on imx28
Marek Vasut (3):
ARM: dts: imx23: Fix the gpmi/gpmi-nand DT name
rtc: stmp3xxx: Add simple binding for the stmp3xxx-rtc
ARM: mxs: convert m28evk board to device tree
Mark A. Greer (4):
ARM: OMAP3: PM: Only access IVA if one exists
ARM: OMAP AM35x: EMAC/MDIO integration: Add Davinci EMAC/MDIO hwmod support
ARM: OMAP AM35x: clockdomain data: Fix clockdomain dependencies
arm: omap3: am35x: Set proper powerdomain states
Mark Brown (12):
ARM: S3C64XX: Add module identification for Balblair Cragganmore module
ARM: S3C64XX: Add WM5102 EVM to Cragganmore modules
ARM: S3C64XX: Dynamically allocate the IRQ range for WM8994 on Cragganmore
ARM: S3C64XX: Dynamically assign interrupts for CPU PMIC on Cragganmore
ARM: SAMSUNG: Introduce Kconfig variable for Samsung custom clk API
ARM: S3C64XX: Don't specify an irq_base for WM1192-EV1 board
ARM: S3C64XX: Clean up after SPI driver platform data updates
spi/s3c64xx: Fix handling of errors in gpio_request()
spi/s3c64xx: Put the /CS GPIO into output mode
spi/s3c64xx: Convert to devm_request_and_ioremap()
spi/s3c64xx: Expand S3C64XX_SPI_{DE,}ACT macros at call sites
ARM: S3C64XX: Mark most Cragganmore initdata devinitdata
Maxime Ripard (3):
ARM: dts: imx28: Add additionnal muxing options to iMX28 DTSI
ARM: mxs: Add Crystalfontz CFA-10036 DTS
ARM: dts: cfa10036: Add Power LED to the CFA-10036 board
Mohan V (1):
ARM: OMAP3: PM: correct enable/disable of daisy io chain
Nishanth Menon (1):
ARM: OMAP2+: OPP: Fix to ensure check of right oppdef after bad one
Ohad Ben-Cohen (1):
ARM: OMAP4: hwspinlocks_init() should be static
Oleg Matcovschi (1):
ARM: OMAP: dma: Clear status registers on enable/disable irq
Olof Johansson (4):
Merge branch 'nomadik-for-arm-soc' of git://git.kernel.org/.../linusw/linux-nomadik into next/soc
Merge branch 'imx/cpuidle' into next/pm
Merge branch 'lpc32xx/devel' into next/soc
ARM: exynos_defconfig: enable more platforms in defconfig
Omar Ramirez Luna (2):
ARM: OMAP2+: control: new APIs to configure boot address and mode
ARM: OMAP: dsp: interface to control module functions
Otavio Salvador (1):
ARM: imx6q: ensure ANATOP controller is available
Paul Bolle (8):
ARM: davinci: remove dummy header files
ARM: S3C24XX: remove unused header <mach/bast-pmu.h>
ARM: SAMSUNG: remove unused SPI clock headers
ARM: OMAP7XX: Remove omap730.h and omap850.h
ARM: OMAP: fix typos related to OMAP330
ARM: OMAP: remove unused cpu detection macros
ARM: mxs/tx28: fix odd include
ARM: at91: remove two unused headers
Paul Walmsley (12):
ARM: OMAP2+: hwmod: remove prm_clkdm, cm_clkdm; allow hwmods to have no clockdomain
Merge branches 'clock_cleanup_misc_3.6', 'control_clean_dspbridge_writes_cleanup_3.6', 'hwmod_soc_conditional_cleanup_3.6', 'mcbsp_clock_aliases_cleanup_3.6' and 'remove_clkdm_requirement_from_hwmod_3.6' into omap_cleanup_a_3.6
W1: OMAP HDQ1W: allow driver to be built on all OMAP2+
W1: OMAP HDQ1W: use 32-bit register accesses
ARM: OMAP2+: HDQ1W: use omap_device
W1: OMAP HDQ1W: use runtime PM
ARM: OMAP3+: clock: Move common clksel_rate & clock data to common file
ARM: OMAP AM35xx: clock and hwmod data: fix AM35xx HSOTGUSB hwmod
ARM: OMAP AM35xx: clock and hwmod data: fix UART4 data
ARM: OMAP: AM35xx: fix UART4 softreset
Merge branches 'am35xx_hwmod_data_fixes_a_3.6', 'am35xx_emac_mdio_devel_3.6' and 'am35xx_prcm_data_devel_3.6' into am35xx_devel_3.6
Merge branches 'hwmod_am335x_support_3.6', 'clkdm_pwrdm_devel_a_3.6' and 'misc_devel_3.6' into omap_devel_f_3.6
Pawel Moll (8):
ARM: vexpress: Check master site in daughterboard's sysctl operations
ARM: versatile: Make plat-versatile clock optional
ARM: vexpress: Initial common clock support
ARM: vexpress: Add missing SP804 interrupt in motherboard's DTS files
ARM: vexpress: Add fixed regulator for SMSC
ARM: vexpress: Convert V2P-CA15 Device Tree to 64 bit addresses
ARM: vexpress: Add Device Tree for V2P-CA15_CA7 core tile
ARM: vexpress: Config option for early printk console
Peter Ujfalusi (13):
ARM: OMAP2: Move McBSP fck clock alias to hwmod data for OMAP2420
ARM: OMAP2: Move McBSP fck clock alias to hwmod data for OMAP2430
ARM: OMAP3: Move McBSP fck clock alias to hwmod data
ARM: OMAP2: twl-common: Fix compiler warning
ARM: OMAP: board-4430sdp: MUX configuration for sys_nirq2
ARM: OMAP: board-omap4panda: MUX configuration for sys_nirq2
arm/dts: omap4: Add entry for OMAP McPDM IP
arm/dts: omap4: Add entry for OMAP DMIC IP
arm/dts: omap4-sdp: Add fixed regulator to represent VBAT
arm/dts: omap4-sdp: Add support for twl6040
arm/dts: omap4-sdp: Enable audio support via device tree
arm/dts: omap4-panda: Audio support for PandaBoard 4430
arm/dts: New dts file for PandaBoardES (4460)
Prashant Gaikwad (11):
ARM: tegra: Remove flow controller programming
ARM: tegra: add clk_prepare/clk_unprepare
i2c: tegra: Add clk_prepare/clk_unprepare
mmc: tegra: add clk_prepare/clk_unprepare
USB: ehci-tegra: add clk_prepare/clk_unprepare
Input: tegra-kbc - add clk_prepare/clk_unprepare
spi/tegra: add clk_prepare/clk_unprepare
staging: nvec: add clk_prepare/clk_unprepare
ASoC: tegra: add clk_prepare/clk_unprepare
crypto: add clk_prepare/clk_unprepare
ARM: tegra: Remove second instance of uart clk
R Sricharan (12):
ARM: OMAP2+: PRM/CM: Move the stubbed prm and cm functions to prcm.c file and make them __weak
ARM: OMAP2+: Move stubbed secure_sram_reserve function to a common.c and call it __weak
ARM: OMAP: counter-32k: Select the CR register offset using the IP scheme
ARM: OMAP5: id: Add cpu id for ES versions
ARM: OMAP5: Add minimal support for OMAP5430 SOC
ARM: OMAP5: timer: Add clocksource, clockevent support
ARM: OMAP5: gpmc: Update gpmc_init()
ARM: OMAP5: l3: Add l3 error handler support for omap5
ARM: omap2+: board-generic: clean up the irq data from board file
ARM: OMAP5: board-generic: Add device tree support
arm/dts: OMAP5: Add omap5 dts files
ARM: OMAP5: Add the build support
Rafal Prylowski (2):
ep93xx: IDE driver platform support code
ep93xx: Add IDE support to edb93xx boards
Rajendra Nayak (1):
ARM: OMAP4: PRM: Add IO Daisychain support
Ricardo Salveti de Araujo (1):
ARM: EXYNOS: Add leds status1 and status2 on Origen board
Richard Zhao (5):
ARM: dts: imx28-evk: add usb devices
ARM: imx6q: add usb controller clock lookups
ARM: imx6q: add usbphy clocks
ARM: imx6q: disable usb charger detector
ARM: dts: imx6q-sabrelite: add usb devices
Robert Lee (7):
ARM: imx: Modify IMX_IO_P2V macro
ARM: imx: Add comments to tzic_enable_waker()
ARM: imx: clean and consolidate imx5 suspend and idle code
ARM: imx: Enable imx53 low power idle
ARM: imx: Add common imx cpuidle init functionality.
ARM: imx: Add imx5 cpuidle
ARM: imx: Add imx6q cpuidle driver
Roland Stigge (24):
ARM: LPC32xx: Add NAND flash timing to PHY3250 board dts
ARM: LPC32xx: Clock initialization for NAND controllers
ARM: LPC32xx: Remove SLC controller initialization from platform init
ARM: LPC32xx: Add DMA configuration to platform data
ARM: LPC32xx: Adjust dtsi file for MLC controller configuration
ARM: LPC32xx: Add dts for EA3250 reference board
ARM: LPC32xx: DTS adjustment for key matrix controller
ARM: LPC32xx: Clock adjustment for key matrix controller
ARM: LPC32xx: Defconfig update
ARM: LPC32xx: Add MMC controller support
ARM: LPC32xx: DTS adjustment for using pl18x primecell
ARM: LPC32xx: DT conversion of Standard UARTs
ARM: LPC32xx: High Speed UART configuration via DT
ARM: LPC32xx: Remove mach specific ARCH_NR_GPIOS, use default
ARM: LPC32xx: Fix lpc32xx.dtsi status property: "disable" -> "disabled"
ARM: tegra: Fix dts files w/ status property: "disable" -> "disabled"
ARM: OMAP: Fix dts files w/ status property: "disable" -> "disabled"
ARM: LPC32xx: Update DTS file for EA3250 board
ARM: LPC32xx: Defconfig update
ARM: LPC32xx: Init MMC via clock
ARM: LPC32xx: Add further bits to MMC init
ARM: LPC32xx: Remove wrong re-initialization of MMC clock register
ARM: LPC32xx: Remove USB and I2C init from phy3250.c
ARM: LPC32xx: Adjust to pl08x DMA interface changes
Sachin Kamat (19):
ARM: EXYNOS: Add HSOTG support to Origen
ARM: EXYNOS: Add HSOTG support to SMDKV310
ARM: S5P64X0: Remove unused variable in dma.c file
ARM: S5PC100: Remove unused variable in dma.c file
ARM: SAMSUNG: Remove description corresponding to a deleted element
ARM: S3C24XX: Remove duplicate header file inclusion
ARM: EXYNOS: Update keypad entries for SMDK4X12
ARM: S5PV210: Add HSOTG support to SMDKV210
ARM: SAMSUNG: Fix compiler warning in dma-ops.c file
ARM: EXYNOS: Update HSOTG PHY clock setting for EXYNOS4X12
ARM: EXYNOS: Make combiner_init function static
ARM: EXYNOS: Add missing static storage class specifier in pmu.c file
ARM: EXYNOS: Add audio platform device in SMDKV310 board
ARM: S5PV210: Add audio platform device in Aquila board
ARM: S5PV210: Add audio platform device in Goni board
ARM: EXYNOS: Add HSOTG support to SMDK4X12
ARM: EXYNOS: Add framebuffer support for SMDK4X12
ARM: EXYNOS: Add DRM device to SMDK4X12 board
ARM: EXYNOS: Add missing .reserve field to SMDKC210
Sakari Ailus (1):
ARM: OMAP3: control: add definition for CONTROL_CAMERA_PHY_CTRL
Santosh Shilimkar (3):
ARM: OMAP: sdrc: Fix the build break for OMAP4 only builds
ARM: OMAP5: Add the WakeupGen IP updates
ARM: OMAP5: Add SMP support
Sascha Hauer (2):
ARM: imx_v6_v7_defconfig: update features
ARM: imx_v4_v5_defconfig: update features
Sekhar Nori (1):
ARM: davinci: da8xx: fix interrupt handling
Shawn Guo (41):
ARM: imx: eliminate macro IMX_GPIO_TO_IRQ()
ARM: imx: eliminate macro IOMUX_TO_IRQ()
ARM: imx: eliminate macro IRQ_GPIOx()
gpio/mxc: move irq_domain_add_legacy call into gpio driver
ARM: imx: move irq_domain_add_legacy call into tzic driver
ARM: imx: move irq_domain_add_legacy call into avic driver
dma: ipu: remove the use of ipu_platform_data
ARM: imx: leave irq_base of wm8350_platform_data uninitialized
ARM: imx: pass gpio than irq number into mxc_expio_init
ARM: imx: add a legacy irqdomain for 3ds_debugboard
ARM: imx: add a legacy irqdomain for mx31ads
i2c: imx: remove unneeded mach/irqs.h inclusion
ARM: imx: remove unneeded mach/irq.h inclusion
tty: serial: imx: remove the use of MXC_INTERNAL_IRQS
ARM: fiq: change FIQ_START to a variable
ARM: imx: enable SPARSE_IRQ for imx platform
ARM: imx6q: remove unneeded clkdev lookups
ARM: mxs: store mac address read from OTP in device tree
video: mxsfb: move mxsfb.h into include/linux
video: mxsfb: add simple device tree probe
ARM: mxs: use auxdata to attach mxsfb_platform_data
ARM: dts: mxs: add comments for pinmux-ids
ARM: dts: mxs: add hog-gpios for imx23-evk and imx28-evk
ARM: dts: imx23-evk: updates for mmc device
ARM: dts: imx23-evk: add auart device
ARM: dts: imx28-evk: add vmmc-supply for mmc device
ARM: dts: imx28-evk: add missing properties for fec
ARM: dts: imx28-evk: add heartbeat gpio-leds
ARM: dts: mxs: enable rtc for imx23 and imx28
ARM: dts: mxs: add pwm-backlight for imx23-evk and imx28-evk
ARM: dts: mxs: add lcd support for imx23-evk and imx28-evk
ARM: dts: imx28-evk: add flexan devices
bindings: update imx and mxs #gpio-cells
ARM: dts: imx: update #interrupt-cells for gpio nodes
ARM: dts: imx28: move extra gpmi-nand pins into board dts
ARM: dts: imx28: move lcdif control pins into board dts
ARM: mxs: convert apx4devkit board to device tree
ARM: mxs: convert tx28 board to device tree
ARM: mxs: convert stmp378x_devb board to device tree
ARM: mxs: add dtb-y target into Makefile.boot
ARM: mxs: rename dts files with soc name being the prefix
Simon Que (1):
ARM: tegra: Fix PWM clock programming
Stephen Warren (16):
dt: name all Tegra binding docs consistently
mmc: tegra: use bus-width property instead of support-8bit
ARM: dt: tegra: remove legacy support-8bit property
ASoC: tegra: simplify Kconfig dependencies
ARM: tegra: defconfig updates
ARM: dt: tegra: rename board files to match SoC
ARM: tegra: make .dts compilation depend on Tegra2 support
ARM: tegra: remove CONFIG_MACH_TEGRA_DT
ARM: tegra: remove Seaboard board files
ARM: tegra: trimslice: enable PCIe when booting from device tree
ARM: tegra: harmony: init regulators, PCIe when booting from DT
ARM: tegra: paz00: enable WiFi rfkill when booting from device tree
ARM: tegra: use of_default_bus_match_table
ARM: dt: tegra: add Whistler device tree file
ARM: dt: tegra: seaboard: instantiate pinctrl-based I2C bus mux
ARM: dt: tegra seaboard: move battery monitor to mux'd I2C bus.
Sylwester Nawrocki (8):
ARM: S3C24XX: Free the backlight gpio requested in Mini2440 board code
ARM: S3C24XX: Convert SMDK board file to the gpiolib API
ARM: S3C24XX: Convert QT2410 board file to the gpiolib API
ARM: S3C24XX: Convert the PM code to gpiolib API
ARM: S3C24XX: Convert the touchscreen setup code to common GPIO API
ARM: S3C24XX: Remove unused GPA, GPE, GPH bank GPIO aliases
ARM: S3C24XX: Remove unused GPIO definitions for port J
ARM: S3C24XX: Remove unused GPIO definitions for Openmoko GTA02 board
Tarun Kanti DebBarma (4):
ARM: OMAP2+: hwmod: add omap_hwmod_get_main_clk() API
ARM: OMAP: dmtimer: use devm_ API and do some cleanup in probe()
ARM: OMAP2+: dmtimer: cleanup fclk usage
ARM: Kconfig update to support additional GPIOs in OMAP5
Tero Kristo (1):
ARM: OMAP3+: PRM: Enable IO wake up
Thierry Reding (1):
ARM: tegra: Provide clock for only one PWM controller
Thomas Abraham (14):
ARM: S3C64XX: Add a new dma request id for device tree based dma channel lookup
spi: s3c64xx: remove unused S3C64XX_SPI_ST_TRLCNTZ macro
spi: s3c64xx: move controller information into driver data
ARM: SAMSUNG: Remove pdev pointer parameter from spi gpio setup functions
ARM: SAMSUNG: Modify s3c64xx_spi{0|1|2}_set_platdata function
spi: s3c64xx: Remove the 'set_level' callback from controller data
spi: s3c64xx: add device tree support
ARM: EXYNOS: Add device tree node for EXYNOS4 interrupt combiner controller
ARM: EXYNOS: Fix the incorrect hierarchy of spi controller bus clock
ARM: EXYNOS: Enable platform support for SPI controllers for EXYNOX4
ARM: dts: Add nodes for spi controllers for SAMSUNG EXYNOS4 platforms
ARM: EXYNOS: Add spi clock support for EXYNOS5
ARM: EXYNOS: Enable platform support for SPI controllers for EXYNOS5
ARM: dts: Add nodes for spi controllers for SAMSUNG EXYNOS5 platforms
Thomas Petazzoni (5):
arm: mach-mvebu: add header
arm: mach-mvebu: add support for Armada 370 and Armada XP with DT
arm: mach-mvebu: add defconfig
arm: mach-mvebu: add entry to MAINTAINERS
arm: mvebu: generate DTBs for supported SoCs
Todor Colov (1):
arm: ep93xx: Enable i2c support for ep9302
Tony Lindgren (22):
Merge branch 'for-tony' of git://git.kernel.org/.../ohad/linux into fixes-omap4-dsp
ARM: OMAP3: There is no FS USB controller on omap3
ARM: OMAP2: Remove legacy USB FS support
ARM: OMAP: Make FS USB omap1 only
Merge tag 'omap-cleanup-a-for-3.6' of git://git.kernel.org/.../pjw/omap-pending into cleanup-hwmod
Merge tag 'omap-devel-a-for-3.6' of git://git.kernel.org/.../pjw/omap-pending into devel-am33xx
Merge tag 'omap-devel-b-for-3.6' of git://git.kernel.org/.../pjw/omap-pending into devel-driver
Merge tag 'omap-devel-c-for-3.6' of git://git.kernel.org/.../pjw/omap-pending into devel-pm
ARM: OMAP2: Use hwmod to initialize mmc for 2420
Merge branch 'for_3.6/pm/sr-move' of git://git.kernel.org/.../khilman/linux-omap-pm into devel-driver
Merge branch 'for_3.6/pm/performance' of git://git.kernel.org/.../khilman/linux-omap-pm into devel-pm
Merge branch 'fixes-omap4-dsp' into fixes-non-critical
Merge branch 'for_3.6/cleanup/pm' of git://git.kernel.org/.../khilman/linux-omap-pm into fixes-non-critical
Merge branch 'for_3.6/cleanup/twl-irq' of git://git.kernel.org/.../khilman/linux-omap-pm into fixes-non-critical
Merge branches 'cleanup-udc' and 'cleanup-dma' into cleanup
Merge branch 'cleanup-hwmod' into cleanup
Merge tag 'omap-devel-d-for-3.6' of git://git.kernel.org/.../pjw/omap-pending into fixes-non-critical
Merge tags 'omap-cleanup-for-v3.6', 'omap-devel-dmtimer-for-v3.6' and 'omap-devel-am33xx-for-v3.6' into devel-am33xx-part2
Merge tag 'omap-devel-f-for-3.6' of git://git.kernel.org/.../pjw/omap-pending into cleanup-part2
Merge tag 'omap-devel-e-for-3.5' of git://git.kernel.org/.../pjw/omap-pending into devel-am33xx-data
ARM: OMAP2+: Fix mismerge for omap_hwmod_get_main_clk() API
ARM: OMAP3: Fix omap3evm randconfig error introduced by VBUS support
Tony Prisk (1):
ARM:vt8500: Convert to use .restart and remove arch_reset()
Uri Yosef (1):
arm/dts: OMAP4: Add Variscite OMAP4 System-On-Modeule support
Uwe Kleine-König (3):
ARM: imx27/dt: make dt_compat entry const
ARM: imx: select USE_OF
ARM: imx: add missing item to the list of clock event modes
Vaibhav Hiremath (16):
ARM: OMAP2+: control: Add AM33XX control reg & sec clkctrl offset
ARM: OMAP AM33xx: voltagedomain: Add voltage domain data
ARM: OMAP AM33xx: PRM: add PRM support
ARM: OMAP AM33xx: CM: Introduce AM33xx CM APIs and register level details
ARM: OMAP AM33xx: powerdomains: add AM335x support
ARM: OMAP AM33xx: clockdomains: Add clockdomain data and respective operations
ARM: OMAP3+: clock33xx: Add AM33XX clock tree data
arm/dts: Add support for TI AM3517/05 EVM board
arm/dts: omap3-evm: Add i2c and twl4030 support
ARM: OMAP2+: hwmod: Add new sysc_type3 into omap_hwmod required for am33xx
ARM: OMAP3/4: omap_hwmod: Add rstst_offs field to struct omap_hwmod_omap4_prcm
ARM: OMAP2+: All OMAP2PLUS uses omap-device.o target so add one entry
ARM: OMAP2+: Move omap3 dpll ops to dpll3xxx.c
ARM: OMAP2+: am33xx: Make am33xx as a separate class
ARM: OMAP2+: am33xx: Change cpu_is_am33xx to soc_is_am33xx
ARM: OMAP2+: Remove unnecessary ifdef around __omap2_set_globals
Venkatraman S (1):
ARM: OMAP2+: fix naming collision of variable nr_irqs
Vikram Pandita (1):
ARM: OMAP3+: dpll: optimize noncore dpll locking logic
Vishwanath BS (3):
ARM: OMAP3: PM: Move IO Daisychain function to omap3 prm file
ARM: OMAP3PLUS: hwmod: reconfigure IO Daisychain during hwmod mux
ARM: OMAP3: PM: Remove IO Daisychain control from cpuidle
Will Deacon (1):
ARM: vexpress: remove automatic errata workaround selection
Wolfram Sang (1):
ARM: tegra: build powergate unconditionally
Xiao Jiang (3):
arm/dts: add wdt node for omap3 and omap4
ARM: OMAP: avoid build wdt platform device if with dt support
watchdog: omap_wdt: add device tree support
Zumeng Chen (4):
ARM: OMAP3EVM: Add NAND flash definition
ARM: OMAP3EVM: Adding USB internal LDOs board file
ARM: omap3evm: enable VBUS switch for EHCI tranceiver
ARM: OMAP3530evm: set pendown_state and debounce time for ads7846
hdoyu@nvidia.com (5):
amba: tegra-ahb: Remove empty *_remove()
ARM: dt: tegra{20,30}.dtsi: Rename "mc" to "memory-controller"
ARM: tegra{20,30}: Rename "mc" to "memory-controller"
ARM: dt: tegra20: Rename "emc" to "memory-controller"
ARM: tegra20: Rename "emc" to "memory-controller"
.../devicetree/bindings/arm/armada-370-xp-mpic.txt | 23 +
.../bindings/arm/armada-370-xp-timer.txt | 11 +
.../devicetree/bindings/arm/armada-370-xp.txt | 24 +
.../devicetree/bindings/arm/atmel-aic.txt | 9 +-
.../devicetree/bindings/arm/davinci/cp-intc.txt | 27 +
.../bindings/arm/mvebu-system-controller.txt | 17 +
Documentation/devicetree/bindings/arm/olimex.txt | 6 +
.../devicetree/bindings/arm/omap/omap.txt | 6 +
.../devicetree/bindings/arm/tegra/emc.txt | 100 --
.../bindings/arm/tegra/nvidia,tegra20-emc.txt | 100 ++
.../bindings/arm/tegra/nvidia,tegra20-mc.txt | 2 +-
.../bindings/arm/tegra/nvidia,tegra30-mc.txt | 2 +-
Documentation/devicetree/bindings/fb/mxsfb.txt | 19 +
.../devicetree/bindings/gpio/fsl-imx-gpio.txt | 14 +-
.../devicetree/bindings/gpio/gpio-mxs.txt | 5 +-
.../devicetree/bindings/gpio/gpio-nmk.txt | 2 +-
.../devicetree/bindings/gpio/gpio_nvidia.txt | 40 -
.../bindings/gpio/nvidia,tegra20-gpio.txt | 40 +
.../bindings/input/nvidia,tegra20-kbc.txt | 23 +
.../devicetree/bindings/input/tegra-kbc.txt | 23 -
.../bindings/mmc/nvidia,tegra20-sdhci.txt | 27 +
.../devicetree/bindings/mmc/nvidia-sdhci.txt | 27 -
.../devicetree/bindings/nvec/nvec_nvidia.txt | 9 -
.../devicetree/bindings/nvec/nvidia,nvec.txt | 9 +
Documentation/devicetree/bindings/rtc/dw-apb.txt | 25 +
.../devicetree/bindings/rtc/stmp3xxx-rtc.txt | 16 +
.../bindings/sound/nvidia,tegra-audio-alc5632.txt | 59 +
.../sound/nvidia,tegra-audio-trimslice.txt | 14 +
.../bindings/sound/nvidia,tegra-audio-wm8753.txt | 54 +
.../bindings/sound/nvidia,tegra-audio-wm8903.txt | 71 ++
.../bindings/sound/nvidia,tegra20-das.txt | 12 +
.../bindings/sound/nvidia,tegra20-i2s.txt | 17 +
.../bindings/sound/tegra-audio-alc5632.txt | 59 -
.../bindings/sound/tegra-audio-trimslice.txt | 14 -
.../bindings/sound/tegra-audio-wm8753.txt | 54 -
.../bindings/sound/tegra-audio-wm8903.txt | 71 --
.../devicetree/bindings/sound/tegra20-das.txt | 12 -
.../devicetree/bindings/sound/tegra20-i2s.txt | 17 -
.../devicetree/bindings/spi/nvidia,tegra20-spi.txt | 5 +
.../devicetree/bindings/spi/spi-samsung.txt | 116 ++
.../devicetree/bindings/spi/spi_nvidia.txt | 5 -
.../bindings/tty/serial/fsl-mxs-auart.txt | 27 +
.../bindings/usb/nvidia,tegra20-ehci.txt | 29 +
.../devicetree/bindings/usb/tegra-usb.txt | 29 -
.../devicetree/bindings/watchdog/omap-wdt.txt | 14 +
MAINTAINERS | 18 +
arch/arm/Kconfig | 51 +-
arch/arm/Kconfig.debug | 26 +
arch/arm/Makefile | 2 +
arch/arm/boot/dts/aks-cdu.dts | 113 ++
arch/arm/boot/dts/am335x-bone.dts | 20 +
arch/arm/boot/dts/am335x-evm.dts | 20 +
arch/arm/boot/dts/am33xx.dtsi | 158 +++
arch/arm/boot/dts/am3517-evm.dts | 32 +
arch/arm/boot/dts/armada-370-db.dts | 42 +
arch/arm/boot/dts/armada-370-xp.dtsi | 68 ++
arch/arm/boot/dts/armada-370.dtsi | 35 +
arch/arm/boot/dts/armada-xp-db.dts | 50 +
arch/arm/boot/dts/armada-xp.dtsi | 55 +
arch/arm/boot/dts/at91sam9260.dtsi | 37 +-
arch/arm/boot/dts/at91sam9263.dtsi | 31 +-
arch/arm/boot/dts/at91sam9g45.dtsi | 39 +-
arch/arm/boot/dts/at91sam9n12.dtsi | 30 +-
arch/arm/boot/dts/at91sam9x5.dtsi | 39 +-
arch/arm/boot/dts/db8500.dtsi | 77 +-
arch/arm/boot/dts/ea3250.dts | 174 +++
arch/arm/boot/dts/evk-pro3.dts | 41 +
arch/arm/boot/dts/exynos4210-origen.dts | 12 +
arch/arm/boot/dts/exynos4210-smdkv310.dts | 38 +
arch/arm/boot/dts/exynos4210.dtsi | 47 +
arch/arm/boot/dts/exynos5250-smdk5250.dts | 38 +
arch/arm/boot/dts/exynos5250.dtsi | 36 +
arch/arm/boot/dts/ge863-pro3.dtsi | 52 +
arch/arm/boot/dts/imx23-evk.dts | 66 +-
arch/arm/boot/dts/imx23-olinuxino.dts | 44 +
arch/arm/boot/dts/imx23-stmp378x_devb.dts | 78 ++
arch/arm/boot/dts/imx23.dtsi | 169 ++-
arch/arm/boot/dts/imx27-3ds.dts | 41 +
arch/arm/boot/dts/imx27.dtsi | 12 +-
arch/arm/boot/dts/imx28-apx4devkit.dts | 198 ++++
arch/arm/boot/dts/imx28-cfa10036.dts | 52 +
arch/arm/boot/dts/imx28-evk.dts | 164 +++
arch/arm/boot/dts/imx28-m28evk.dts | 210 ++++
arch/arm/boot/dts/imx28-tx28.dts | 97 ++
arch/arm/boot/dts/imx28.dtsi | 353 +++++-
arch/arm/boot/dts/imx31-bug.dts | 31 +
arch/arm/boot/dts/imx31.dtsi | 88 ++
arch/arm/boot/dts/imx51.dtsi | 8 +-
arch/arm/boot/dts/imx53.dtsi | 14 +-
arch/arm/boot/dts/imx6q-arm2.dts | 6 +
arch/arm/boot/dts/imx6q-sabrelite.dts | 33 +
arch/arm/boot/dts/imx6q.dtsi | 99 +-
arch/arm/boot/dts/lpc32xx.dtsi | 79 +-
arch/arm/boot/dts/omap2420-h4.dts | 20 +
arch/arm/boot/dts/omap3-beagle.dts | 4 +-
arch/arm/boot/dts/omap3-evm.dts | 28 +
arch/arm/boot/dts/omap3.dtsi | 5 +
arch/arm/boot/dts/omap4-panda.dts | 43 +-
arch/arm/boot/dts/omap4-pandaES.dts | 24 +
arch/arm/boot/dts/omap4-sdp.dts | 72 +-
arch/arm/boot/dts/omap4-var_som.dts | 96 ++
arch/arm/boot/dts/omap4.dtsi | 23 +
arch/arm/boot/dts/omap5-evm.dts | 20 +
arch/arm/boot/dts/omap5.dtsi | 184 ++++
arch/arm/boot/dts/phy3250.dts | 61 +
arch/arm/boot/dts/snowball.dts | 21 +-
arch/arm/boot/dts/socfpga.dtsi | 147 +++
arch/arm/boot/dts/socfpga_cyclone5.dts | 34 +
arch/arm/boot/dts/tegra-cardhu.dts | 172 ---
arch/arm/boot/dts/tegra-harmony.dts | 337 ------
arch/arm/boot/dts/tegra-paz00.dts | 348 ------
arch/arm/boot/dts/tegra-seaboard.dts | 445 --------
arch/arm/boot/dts/tegra-trimslice.dts | 306 -----
arch/arm/boot/dts/tegra-ventana.dts | 344 ------
arch/arm/boot/dts/tegra20-harmony.dts | 336 ++++++
arch/arm/boot/dts/tegra20-paz00.dts | 347 ++++++
arch/arm/boot/dts/tegra20-seaboard.dts | 497 +++++++++
arch/arm/boot/dts/tegra20-trimslice.dts | 306 +++++
arch/arm/boot/dts/tegra20-ventana.dts | 343 ++++++
arch/arm/boot/dts/tegra20-whistler.dts | 301 +++++
arch/arm/boot/dts/tegra20.dtsi | 40 +-
arch/arm/boot/dts/tegra30-cardhu.dts | 171 +++
arch/arm/boot/dts/tegra30.dtsi | 40 +-
arch/arm/boot/dts/vexpress-v2m-rs1.dtsi | 11 +
arch/arm/boot/dts/vexpress-v2m.dtsi | 11 +
arch/arm/boot/dts/vexpress-v2p-ca15-tc1.dts | 36 +-
arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts | 188 ++++
arch/arm/configs/exynos_defconfig | 92 ++
arch/arm/configs/imx_v4_v5_defconfig | 51 +-
arch/arm/configs/imx_v6_v7_defconfig | 61 +-
arch/arm/configs/lpc32xx_defconfig | 26 +-
arch/arm/configs/mvebu_defconfig | 46 +
arch/arm/configs/mxs_defconfig | 7 +
arch/arm/configs/omap2plus_defconfig | 2 +
arch/arm/configs/socfpga_defconfig | 83 ++
arch/arm/configs/tegra_defconfig | 13 +-
arch/arm/include/asm/mach/irq.h | 2 +-
arch/arm/kernel/fiq.c | 9 +-
arch/arm/kernel/irq.c | 10 -
arch/arm/mach-at91/Kconfig | 6 +
arch/arm/mach-at91/Makefile.boot | 2 +
arch/arm/mach-at91/at91rm9200.c | 1 +
arch/arm/mach-at91/at91rm9200_devices.c | 84 +-
arch/arm/mach-at91/at91sam9260.c | 1 +
arch/arm/mach-at91/at91sam9260_devices.c | 92 +-
arch/arm/mach-at91/at91sam9261.c | 1 +
arch/arm/mach-at91/at91sam9261_devices.c | 68 +-
arch/arm/mach-at91/at91sam9263.c | 1 +
arch/arm/mach-at91/at91sam9263_devices.c | 80 +-
arch/arm/mach-at91/at91sam926x_time.c | 2 +-
arch/arm/mach-at91/at91sam9g45.c | 1 +
arch/arm/mach-at91/at91sam9g45_devices.c | 108 +-
arch/arm/mach-at91/at91sam9rl.c | 1 +
arch/arm/mach-at91/at91sam9rl_devices.c | 76 +-
arch/arm/mach-at91/at91sam9x5.c | 40 -
arch/arm/mach-at91/at91x40.c | 2 +
arch/arm/mach-at91/board-1arm.c | 2 +
arch/arm/mach-at91/board-afeb-9260v1.c | 2 +
arch/arm/mach-at91/board-cam60.c | 2 +
arch/arm/mach-at91/board-carmeva.c | 2 +
arch/arm/mach-at91/board-cpu9krea.c | 2 +
arch/arm/mach-at91/board-cpuat91.c | 2 +
arch/arm/mach-at91/board-csb337.c | 2 +
arch/arm/mach-at91/board-csb637.c | 2 +
arch/arm/mach-at91/board-dt.c | 2 +
arch/arm/mach-at91/board-eb01.c | 2 +
arch/arm/mach-at91/board-eb9200.c | 2 +
arch/arm/mach-at91/board-ecbat91.c | 2 +
arch/arm/mach-at91/board-eco920.c | 2 +
arch/arm/mach-at91/board-flexibity.c | 2 +
arch/arm/mach-at91/board-foxg20.c | 2 +
arch/arm/mach-at91/board-gsia18s.c | 2 +
arch/arm/mach-at91/board-kafa.c | 2 +
arch/arm/mach-at91/board-kb9202.c | 2 +
arch/arm/mach-at91/board-neocore926.c | 2 +
arch/arm/mach-at91/board-pcontrol-g20.c | 2 +
arch/arm/mach-at91/board-picotux200.c | 2 +
arch/arm/mach-at91/board-qil-a9260.c | 2 +
arch/arm/mach-at91/board-rm9200dk.c | 2 +
arch/arm/mach-at91/board-rm9200ek.c | 2 +
arch/arm/mach-at91/board-rsi-ews.c | 2 +
arch/arm/mach-at91/board-sam9-l9260.c | 2 +
arch/arm/mach-at91/board-sam9260ek.c | 2 +
arch/arm/mach-at91/board-sam9261ek.c | 2 +
arch/arm/mach-at91/board-sam9263ek.c | 2 +
arch/arm/mach-at91/board-sam9g20ek.c | 3 +
arch/arm/mach-at91/board-sam9m10g45ek.c | 2 +
arch/arm/mach-at91/board-sam9rlek.c | 2 +
arch/arm/mach-at91/board-snapper9260.c | 2 +
arch/arm/mach-at91/board-stamp9g20.c | 3 +
arch/arm/mach-at91/board-usb-a926x.c | 4 +
arch/arm/mach-at91/board-yl-9200.c | 2 +
arch/arm/mach-at91/generic.h | 2 +
arch/arm/mach-at91/gpio.c | 9 +-
arch/arm/mach-at91/include/mach/at91_aic.h | 36 +-
arch/arm/mach-at91/include/mach/at91_spi.h | 81 --
arch/arm/mach-at91/include/mach/at91_ssc.h | 106 --
arch/arm/mach-at91/include/mach/entry-macro.S | 27 -
arch/arm/mach-at91/include/mach/irqs.h | 48 -
arch/arm/mach-at91/irq.c | 414 ++++++-
arch/arm/mach-at91/pm.c | 1 +
arch/arm/mach-clps711x/common.c | 6 -
arch/arm/mach-clps711x/include/mach/memory.h | 37 -
arch/arm/mach-clps711x/p720t.c | 34 +-
arch/arm/mach-davinci/Kconfig | 1 +
arch/arm/mach-davinci/Makefile | 1 +
arch/arm/mach-davinci/cp_intc.c | 75 +-
arch/arm/mach-davinci/include/mach/cp_intc.h | 1 +
arch/arm/mach-davinci/include/mach/dm365.h | 1 -
arch/arm/mach-davinci/include/mach/dm646x.h | 1 -
arch/arm/mach-davinci/include/mach/entry-macro.S | 8 +-
arch/arm/mach-davinci/pm_domain.c | 64 ++
arch/arm/mach-ep93xx/core.c | 96 ++
arch/arm/mach-ep93xx/edb93xx.c | 28 +-
arch/arm/mach-ep93xx/include/mach/platform.h | 3 +
arch/arm/mach-ep93xx/soc.h | 1 +
arch/arm/mach-exynos/Kconfig | 7 +
arch/arm/mach-exynos/clock-exynos4.c | 67 +-
arch/arm/mach-exynos/clock-exynos5.c | 95 ++
arch/arm/mach-exynos/common.c | 28 +-
arch/arm/mach-exynos/include/mach/irqs.h | 4 +
arch/arm/mach-exynos/include/mach/map.h | 3 +
arch/arm/mach-exynos/include/mach/regs-pmu.h | 5 +
arch/arm/mach-exynos/include/mach/regs-usb-phy.h | 20 +-
arch/arm/mach-exynos/include/mach/spi-clocks.h | 16 -
arch/arm/mach-exynos/mach-exynos4-dt.c | 6 +
arch/arm/mach-exynos/mach-exynos5-dt.c | 6 +
arch/arm/mach-exynos/mach-nuri.c | 4 +-
arch/arm/mach-exynos/mach-origen.c | 40 +-
arch/arm/mach-exynos/mach-smdk4x12.c | 83 +-
arch/arm/mach-exynos/mach-smdkv310.c | 18 +-
arch/arm/mach-exynos/mach-universal_c210.c | 4 +-
arch/arm/mach-exynos/pmu.c | 18 +-
arch/arm/mach-exynos/setup-spi.c | 33 +-
arch/arm/mach-exynos/setup-usb-phy.c | 60 +-
arch/arm/mach-imx/Kconfig | 21 +-
arch/arm/mach-imx/Makefile | 1 +
arch/arm/mach-imx/clk-imx27.c | 4 +-
arch/arm/mach-imx/clk-imx31.c | 23 +-
arch/arm/mach-imx/clk-imx51-imx53.c | 25 +-
arch/arm/mach-imx/clk-imx6q.c | 25 +-
arch/arm/mach-imx/devices-imx21.h | 4 +-
arch/arm/mach-imx/devices-imx25.h | 4 +-
arch/arm/mach-imx/devices-imx27.h | 6 +-
arch/arm/mach-imx/devices-imx31.h | 10 +-
arch/arm/mach-imx/devices-imx35.h | 12 +-
arch/arm/mach-imx/devices-imx51.h | 2 +-
arch/arm/mach-imx/devices-imx53.h | 2 +-
arch/arm/mach-imx/ehci-imx25.c | 24 +-
arch/arm/mach-imx/ehci-imx35.c | 24 +-
arch/arm/mach-imx/ehci-imx5.c | 31 +-
arch/arm/mach-imx/eukrea_mbimx27-baseboard.c | 3 +-
arch/arm/mach-imx/eukrea_mbimxsd35-baseboard.c | 6 +-
arch/arm/mach-imx/imx27-dt.c | 30 +-
arch/arm/mach-imx/imx31-dt.c | 63 ++
arch/arm/mach-imx/imx51-dt.c | 27 -
arch/arm/mach-imx/imx53-dt.c | 28 +-
arch/arm/mach-imx/mach-apf9328.c | 7 +-
arch/arm/mach-imx/mach-armadillo5x0.c | 18 +-
arch/arm/mach-imx/mach-cpuimx27.c | 24 +-
arch/arm/mach-imx/mach-cpuimx35.c | 13 +-
arch/arm/mach-imx/mach-cpuimx51sd.c | 13 +-
arch/arm/mach-imx/mach-eukrea_cpuimx25.c | 12 +-
arch/arm/mach-imx/mach-imx27_visstrim_m10.c | 9 +-
arch/arm/mach-imx/mach-imx27ipcam.c | 2 +-
arch/arm/mach-imx/mach-imx6q.c | 74 +-
arch/arm/mach-imx/mach-kzm_arm11_01.c | 20 +-
arch/arm/mach-imx/mach-mx1ads.c | 1 -
arch/arm/mach-imx/mach-mx21ads.c | 16 +-
arch/arm/mach-imx/mach-mx25_3ds.c | 4 +-
arch/arm/mach-imx/mach-mx27_3ds.c | 17 +-
arch/arm/mach-imx/mach-mx27ads.c | 14 +-
arch/arm/mach-imx/mach-mx31_3ds.c | 28 +-
arch/arm/mach-imx/mach-mx31ads.c | 63 +-
arch/arm/mach-imx/mach-mx31lilly.c | 10 +-
arch/arm/mach-imx/mach-mx31lite.c | 11 +-
arch/arm/mach-imx/mach-mx31moboard.c | 12 +-
arch/arm/mach-imx/mach-mx35_3ds.c | 29 +-
arch/arm/mach-imx/mach-mx51_3ds.c | 5 +-
arch/arm/mach-imx/mach-mx51_babbage.c | 10 +-
arch/arm/mach-imx/mach-mx53_ard.c | 8 +-
arch/arm/mach-imx/mach-mx53_evk.c | 3 +-
arch/arm/mach-imx/mach-mx53_loco.c | 3 +-
arch/arm/mach-imx/mach-mx53_smd.c | 3 +-
arch/arm/mach-imx/mach-mxt_td60.c | 6 +-
arch/arm/mach-imx/mach-pca100.c | 17 +-
arch/arm/mach-imx/mach-pcm037.c | 36 +-
arch/arm/mach-imx/mach-pcm038.c | 8 +-
arch/arm/mach-imx/mach-pcm043.c | 16 +-
arch/arm/mach-imx/mach-qong.c | 12 +-
arch/arm/mach-imx/mach-scb9328.c | 7 +-
arch/arm/mach-imx/mach-vpr200.c | 12 +-
arch/arm/mach-imx/mm-imx1.c | 1 -
arch/arm/mach-imx/mm-imx21.c | 1 -
arch/arm/mach-imx/mm-imx25.c | 1 -
arch/arm/mach-imx/mm-imx27.c | 1 -
arch/arm/mach-imx/mm-imx3.c | 1 -
arch/arm/mach-imx/mm-imx5.c | 26 +-
arch/arm/mach-imx/mx31lilly-db.c | 11 +-
arch/arm/mach-imx/mx31lite-db.c | 9 +-
arch/arm/mach-imx/mx51_efika.c | 3 +-
arch/arm/mach-imx/pcm970-baseboard.c | 13 +-
arch/arm/mach-imx/pm-imx5.c | 111 +-
arch/arm/mach-lpc32xx/Kconfig | 32 -
arch/arm/mach-lpc32xx/Makefile.boot | 1 +
arch/arm/mach-lpc32xx/clock.c | 123 ++-
arch/arm/mach-lpc32xx/common.c | 10 +-
arch/arm/mach-lpc32xx/include/mach/gpio.h | 2 -
arch/arm/mach-lpc32xx/include/mach/platform.h | 14 +
arch/arm/mach-lpc32xx/phy3250.c | 163 +--
arch/arm/mach-lpc32xx/serial.c | 90 +-
arch/arm/mach-mvebu/Kconfig | 16 +
arch/arm/mach-mvebu/Makefile | 2 +
arch/arm/mach-mvebu/Makefile.boot | 3 +
arch/arm/mach-mvebu/armada-370-xp.c | 63 ++
arch/arm/mach-mvebu/common.h | 23 +
arch/arm/mach-mvebu/include/mach/armada-370-xp.h | 22 +
arch/arm/mach-mvebu/include/mach/debug-macro.S | 24 +
arch/arm/mach-mvebu/include/mach/timex.h | 13 +
arch/arm/mach-mvebu/include/mach/uncompress.h | 43 +
arch/arm/mach-mvebu/irq-armada-370-xp.c | 133 +++
arch/arm/mach-mvebu/system-controller.c | 105 ++
arch/arm/mach-mxs/Kconfig | 1 +
arch/arm/mach-mxs/Makefile.boot | 9 +
arch/arm/mach-mxs/devices-mx23.h | 2 +-
arch/arm/mach-mxs/devices-mx28.h | 2 +-
arch/arm/mach-mxs/devices/platform-mxsfb.c | 2 +-
arch/arm/mach-mxs/include/mach/mxsfb.h | 49 -
arch/arm/mach-mxs/mach-mxs.c | 215 +++-
arch/arm/mach-mxs/module-tx28.c | 2 +-
arch/arm/mach-nomadik/Makefile | 2 -
arch/arm/mach-nomadik/board-nhk8815.c | 67 +-
arch/arm/mach-nomadik/clock.c | 75 --
arch/arm/mach-nomadik/clock.h | 15 -
arch/arm/mach-nomadik/cpu-8815.c | 126 +--
arch/arm/mach-nomadik/i2c-8815nhk.c | 38 +-
arch/arm/mach-nomadik/include/mach/irqs.h | 85 +-
arch/arm/mach-omap1/board-ams-delta.c | 2 +-
arch/arm/mach-omap1/board-generic.c | 4 +-
arch/arm/mach-omap1/board-h2.c | 2 +-
arch/arm/mach-omap1/board-h3.c | 2 +-
arch/arm/mach-omap1/board-htcherald.c | 2 +-
arch/arm/mach-omap1/board-innovator.c | 2 +-
arch/arm/mach-omap1/board-nokia770.c | 2 +-
arch/arm/mach-omap1/board-osk.c | 2 +-
arch/arm/mach-omap1/board-palmte.c | 2 +-
arch/arm/mach-omap1/board-palmtt.c | 2 +-
arch/arm/mach-omap1/board-palmz71.c | 2 +-
arch/arm/mach-omap1/board-sx1.c | 2 +-
arch/arm/mach-omap1/board-voiceblue.c | 3 +-
arch/arm/mach-omap1/clock_data.c | 3 +-
arch/arm/mach-omap1/include/mach/usb.h | 165 +++
arch/arm/mach-omap1/timer.c | 3 +-
arch/arm/mach-omap1/usb.c | 116 +-
arch/arm/mach-omap2/Kconfig | 25 +-
arch/arm/mach-omap2/Makefile | 59 +-
arch/arm/mach-omap2/am35xx-emac.c | 90 +-
arch/arm/mach-omap2/board-2430sdp.c | 14 -
arch/arm/mach-omap2/board-4430sdp.c | 3 +
arch/arm/mach-omap2/board-apollon.c | 18 -
arch/arm/mach-omap2/board-cm-t35.c | 89 ++
arch/arm/mach-omap2/board-generic.c | 58 +-
arch/arm/mach-omap2/board-h4.c | 13 -
arch/arm/mach-omap2/board-omap3beagle.c | 2 +-
arch/arm/mach-omap2/board-omap3evm.c | 78 +-
arch/arm/mach-omap2/board-omap3logic.c | 3 -
arch/arm/mach-omap2/board-omap4panda.c | 3 +
arch/arm/mach-omap2/clock.c | 18 -
arch/arm/mach-omap2/clock.h | 14 +
arch/arm/mach-omap2/clock2420_data.c | 43 +-
arch/arm/mach-omap2/clock2430_data.c | 49 +-
arch/arm/mach-omap2/clock33xx_data.c | 1105 +++++++++++++++++++
arch/arm/mach-omap2/clock3xxx_data.c | 86 +-
arch/arm/mach-omap2/clock44xx_data.c | 128 +--
arch/arm/mach-omap2/clock_common_data.c | 77 ++
arch/arm/mach-omap2/clockdomain.h | 4 +-
arch/arm/mach-omap2/clockdomain33xx.c | 74 ++
arch/arm/mach-omap2/clockdomain44xx.c | 10 +-
arch/arm/mach-omap2/clockdomains2420_data.c | 2 -
arch/arm/mach-omap2/clockdomains2430_data.c | 2 -
arch/arm/mach-omap2/clockdomains33xx_data.c | 196 ++++
arch/arm/mach-omap2/clockdomains3xxx_data.c | 158 ++-
arch/arm/mach-omap2/clockdomains44xx_data.c | 2 -
arch/arm/mach-omap2/clockdomains_common_data.c | 24 -
arch/arm/mach-omap2/cm-regbits-33xx.h | 687 ++++++++++++
arch/arm/mach-omap2/cm-regbits-34xx.h | 4 +-
arch/arm/mach-omap2/cm33xx.c | 313 ++++++
arch/arm/mach-omap2/cm33xx.h | 420 +++++++
arch/arm/mach-omap2/cminst44xx.c | 14 -
arch/arm/mach-omap2/cminst44xx.h | 25 -
arch/arm/mach-omap2/common-board-devices.c | 33 +-
arch/arm/mach-omap2/common-board-devices.h | 1 +
arch/arm/mach-omap2/common.c | 34 +-
arch/arm/mach-omap2/common.h | 27 +-
arch/arm/mach-omap2/control.c | 43 +
arch/arm/mach-omap2/control.h | 46 +-
arch/arm/mach-omap2/cpuidle34xx.c | 79 +-
arch/arm/mach-omap2/cpuidle44xx.c | 8 -
arch/arm/mach-omap2/devices.c | 112 +-
arch/arm/mach-omap2/dpll3xxx.c | 26 +-
arch/arm/mach-omap2/drm.c | 61 +
arch/arm/mach-omap2/dsp.c | 4 +
arch/arm/mach-omap2/gpmc.c | 3 +-
arch/arm/mach-omap2/hdq1w.c | 26 +
arch/arm/mach-omap2/id.c | 46 +-
arch/arm/mach-omap2/include/mach/am35xx.h | 2 +
.../include/mach/ctrl_module_core_44xx.h | 1 +
arch/arm/mach-omap2/include/mach/debug-macro.S | 25 +-
arch/arm/mach-omap2/include/mach/omap-wakeupgen.h | 7 +
arch/arm/mach-omap2/io.c | 59 +
arch/arm/mach-omap2/iomap.h | 27 +
arch/arm/mach-omap2/irq.c | 23 +-
arch/arm/mach-omap2/mailbox.c | 2 -
arch/arm/mach-omap2/msdi.c | 73 ++
arch/arm/mach-omap2/omap-headsmp.S | 21 +
arch/arm/mach-omap2/omap-hotplug.c | 24 +-
arch/arm/mach-omap2/omap-iommu.c | 6 +-
arch/arm/mach-omap2/omap-mpuss-lowpower.c | 4 +-
arch/arm/mach-omap2/omap-smp.c | 52 +-
arch/arm/mach-omap2/omap-wakeupgen.c | 114 +-
arch/arm/mach-omap2/omap4-common.c | 14 +
arch/arm/mach-omap2/omap4-sar-layout.h | 12 +-
arch/arm/mach-omap2/omap_hwmod.c | 541 ++++++---
arch/arm/mach-omap2/omap_hwmod_2420_data.c | 10 +
arch/arm/mach-omap2/omap_hwmod_2430_data.c | 16 +
arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c | 8 -
arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 188 +++-
arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 13 +-
arch/arm/mach-omap2/omap_hwmod_common_data.c | 10 +
arch/arm/mach-omap2/omap_l3_noc.h | 22 +-
arch/arm/mach-omap2/opp.c | 3 +-
arch/arm/mach-omap2/pm.h | 19 +-
arch/arm/mach-omap2/pm34xx.c | 78 +-
arch/arm/mach-omap2/powerdomain.c | 22 +-
arch/arm/mach-omap2/powerdomain.h | 27 +-
arch/arm/mach-omap2/powerdomain33xx.c | 229 ++++
arch/arm/mach-omap2/powerdomains33xx_data.c | 185 ++++
arch/arm/mach-omap2/powerdomains3xxx_data.c | 139 ++-
arch/arm/mach-omap2/prcm-common.h | 14 +-
arch/arm/mach-omap2/prcm.c | 25 +-
arch/arm/mach-omap2/prm-regbits-33xx.h | 357 ++++++
arch/arm/mach-omap2/prm2xxx_3xxx.c | 48 +
arch/arm/mach-omap2/prm2xxx_3xxx.h | 67 +-
arch/arm/mach-omap2/prm33xx.c | 135 +++
arch/arm/mach-omap2/prm33xx.h | 129 +++
arch/arm/mach-omap2/prm44xx.c | 63 +-
arch/arm/mach-omap2/prm44xx.h | 2 +
arch/arm/mach-omap2/prm_common.c | 70 +-
arch/arm/mach-omap2/smartreflex-class3.c | 29 +-
arch/arm/mach-omap2/smartreflex.c | 1165 --------------------
arch/arm/mach-omap2/smartreflex.h | 256 -----
arch/arm/mach-omap2/sr_device.c | 39 +-
arch/arm/mach-omap2/timer.c | 93 +-
arch/arm/mach-omap2/twl-common.c | 11 +-
arch/arm/mach-omap2/usb-fs.c | 359 ------
arch/arm/mach-omap2/voltage.h | 22 +-
arch/arm/mach-omap2/voltagedomains33xx_data.c | 43 +
arch/arm/mach-picoxcell/Makefile | 1 -
arch/arm/mach-picoxcell/common.c | 3 +-
arch/arm/mach-picoxcell/common.h | 2 +-
arch/arm/mach-picoxcell/time.c | 121 --
arch/arm/mach-prima2/include/mach/gpio.h | 13 +
arch/arm/mach-prima2/include/mach/irqs.h | 2 +-
arch/arm/mach-rpc/irq.c | 2 +-
arch/arm/mach-s3c24xx/clock-s3c2416.c | 3 +-
arch/arm/mach-s3c24xx/clock-s3c2443.c | 2 +-
arch/arm/mach-s3c24xx/common-s3c2443.c | 4 +-
arch/arm/mach-s3c24xx/common-smdk.c | 20 +-
arch/arm/mach-s3c24xx/common.c | 1 -
arch/arm/mach-s3c24xx/include/mach/bast-pmu.h | 40 -
arch/arm/mach-s3c24xx/include/mach/gpio-nrs.h | 21 -
arch/arm/mach-s3c24xx/include/mach/gta02.h | 69 --
arch/arm/mach-s3c24xx/include/mach/regs-gpio.h | 17 +-
arch/arm/mach-s3c24xx/include/mach/regs-gpioj.h | 70 --
arch/arm/mach-s3c24xx/mach-gta02.c | 1 -
arch/arm/mach-s3c24xx/mach-mini2440.c | 4 +-
arch/arm/mach-s3c24xx/mach-qt2410.c | 6 +-
arch/arm/mach-s3c24xx/mach-rx1950.c | 1 -
arch/arm/mach-s3c24xx/pm-s3c2410.c | 12 +-
arch/arm/mach-s3c24xx/pm-s3c2412.c | 1 -
arch/arm/mach-s3c24xx/s3c2412.c | 1 -
arch/arm/mach-s3c24xx/s3c244x.c | 1 -
arch/arm/mach-s3c24xx/setup-spi.c | 10 +-
arch/arm/mach-s3c24xx/setup-ts.c | 6 +-
arch/arm/mach-s3c64xx/clock.c | 20 +-
arch/arm/mach-s3c64xx/include/mach/crag6410.h | 4 +-
arch/arm/mach-s3c64xx/include/mach/dma.h | 1 +
arch/arm/mach-s3c64xx/include/mach/spi-clocks.h | 18 -
arch/arm/mach-s3c64xx/mach-crag6410-module.c | 11 +-
arch/arm/mach-s3c64xx/mach-crag6410.c | 71 +-
arch/arm/mach-s3c64xx/mach-smdk6410.c | 1 -
arch/arm/mach-s3c64xx/setup-spi.c | 19 +-
arch/arm/mach-s5p64x0/clock-s5p6440.c | 12 +-
arch/arm/mach-s5p64x0/clock-s5p6450.c | 12 +-
arch/arm/mach-s5p64x0/dma.c | 2 -
arch/arm/mach-s5p64x0/include/mach/spi-clocks.h | 20 -
arch/arm/mach-s5p64x0/setup-spi.c | 21 +-
arch/arm/mach-s5pc100/clock.c | 30 +-
arch/arm/mach-s5pc100/dma.c | 2 -
arch/arm/mach-s5pc100/include/mach/spi-clocks.h | 18 -
arch/arm/mach-s5pc100/setup-spi.c | 30 +-
arch/arm/mach-s5pv210/Kconfig | 2 +
arch/arm/mach-s5pv210/clock.c | 14 +-
arch/arm/mach-s5pv210/include/mach/spi-clocks.h | 17 -
arch/arm/mach-s5pv210/mach-aquila.c | 7 +
arch/arm/mach-s5pv210/mach-goni.c | 11 +-
arch/arm/mach-s5pv210/mach-smdkv210.c | 10 +-
arch/arm/mach-s5pv210/setup-spi.c | 21 +-
arch/arm/mach-socfpga/Makefile | 5 +
arch/arm/mach-socfpga/Makefile.boot | 1 +
arch/arm/mach-socfpga/include/mach/debug-macro.S | 16 +
arch/arm/mach-socfpga/include/mach/timex.h | 19 +
arch/arm/mach-socfpga/include/mach/uncompress.h | 9 +
arch/arm/mach-socfpga/socfpga.c | 62 ++
arch/arm/mach-tegra/Kconfig | 39 -
arch/arm/mach-tegra/Makefile | 18 +-
arch/arm/mach-tegra/Makefile.boot | 13 +-
arch/arm/mach-tegra/apbio.c | 194 +++-
arch/arm/mach-tegra/apbio.h | 19 +-
arch/arm/mach-tegra/board-dt-tegra20.c | 74 +-
arch/arm/mach-tegra/board-dt-tegra30.c | 8 +-
arch/arm/mach-tegra/board-harmony-pcie.c | 15 +-
arch/arm/mach-tegra/board-harmony-power.c | 25 +-
arch/arm/mach-tegra/board-paz00.c | 7 +-
arch/arm/mach-tegra/board-seaboard-pinmux.c | 197 ----
arch/arm/mach-tegra/board-seaboard.c | 306 -----
arch/arm/mach-tegra/board-seaboard.h | 47 -
arch/arm/mach-tegra/board.h | 9 +
arch/arm/mach-tegra/common.c | 3 +
arch/arm/mach-tegra/cpu-tegra.c | 6 +-
arch/arm/mach-tegra/cpuidle.c | 6 +-
arch/arm/mach-tegra/dma.c | 4 +-
arch/arm/mach-tegra/pcie.c | 6 +-
arch/arm/mach-tegra/powergate.c | 4 +-
arch/arm/mach-tegra/sleep.S | 29 -
arch/arm/mach-tegra/tegra2_clocks.c | 58 +-
arch/arm/mach-tegra/tegra30_clocks.c | 28 +-
arch/arm/mach-tegra/timer.c | 4 +-
arch/arm/mach-tegra/usb_phy.c | 16 +-
arch/arm/mach-ux500/Kconfig | 1 +
arch/arm/mach-ux500/board-mop500-sdi.c | 4 +-
arch/arm/mach-ux500/board-mop500.c | 63 +-
arch/arm/mach-ux500/board-mop500.h | 3 +
arch/arm/mach-ux500/cpu-db8500.c | 4 +-
arch/arm/mach-vexpress/Kconfig | 5 +-
arch/arm/mach-vexpress/Makefile.boot | 3 +-
arch/arm/mach-vexpress/ct-ca9x4.c | 64 +-
arch/arm/mach-vexpress/include/mach/clkdev.h | 15 -
arch/arm/mach-vexpress/include/mach/debug-macro.S | 41 +
arch/arm/mach-vexpress/include/mach/motherboard.h | 28 +-
arch/arm/mach-vexpress/include/mach/uncompress.h | 14 +
arch/arm/mach-vexpress/v2m.c | 296 +++--
arch/arm/mach-vt8500/Makefile | 2 +-
arch/arm/mach-vt8500/bv07.c | 3 +
arch/arm/mach-vt8500/include/mach/restart.h | 17 +
arch/arm/mach-vt8500/include/mach/system.h | 13 -
arch/arm/mach-vt8500/restart.c | 54 +
arch/arm/mach-vt8500/wm8505_7in.c | 4 +-
arch/arm/plat-mxc/3ds_debugboard.c | 50 +-
arch/arm/plat-mxc/Makefile | 1 +
arch/arm/plat-mxc/avic.c | 35 +-
arch/arm/plat-mxc/cpuidle.c | 80 ++
arch/arm/plat-mxc/devices/platform-ipu-core.c | 5 +-
arch/arm/plat-mxc/devices/platform-mxc_rtc.c | 5 +
arch/arm/plat-mxc/devices/platform-spi_imx.c | 2 +-
arch/arm/plat-mxc/include/mach/3ds_debugboard.h | 2 +-
arch/arm/plat-mxc/include/mach/common.h | 7 +-
arch/arm/plat-mxc/include/mach/cpuidle.h | 22 +
arch/arm/plat-mxc/include/mach/devices-common.h | 4 +-
arch/arm/plat-mxc/include/mach/hardware.h | 27 +-
arch/arm/plat-mxc/include/mach/iomux-mx3.h | 3 -
arch/arm/plat-mxc/include/mach/iomux-mx51.h | 14 +
arch/arm/plat-mxc/include/mach/iomux-v1.h | 7 -
arch/arm/plat-mxc/include/mach/ipu.h | 4 -
arch/arm/plat-mxc/include/mach/irqs.h | 44 -
arch/arm/plat-mxc/include/mach/mx1.h | 111 +-
arch/arm/plat-mxc/include/mach/mx21.h | 107 +-
arch/arm/plat-mxc/include/mach/mx25.h | 72 +-
arch/arm/plat-mxc/include/mach/mx27.h | 127 +--
arch/arm/plat-mxc/include/mach/mx2x.h | 87 +-
arch/arm/plat-mxc/include/mach/mx31.h | 118 +-
arch/arm/plat-mxc/include/mach/mx35.h | 109 +-
arch/arm/plat-mxc/include/mach/mx3x.h | 77 +-
arch/arm/plat-mxc/include/mach/mx50.h | 187 ++--
arch/arm/plat-mxc/include/mach/mx51.h | 209 ++--
arch/arm/plat-mxc/include/mach/mx53.h | 217 ++--
arch/arm/plat-mxc/include/mach/mxc_ehci.h | 16 +-
arch/arm/plat-mxc/time.c | 3 +-
arch/arm/plat-mxc/tzic.c | 34 +-
arch/arm/plat-omap/Kconfig | 35 +-
arch/arm/plat-omap/Makefile | 6 +-
arch/arm/plat-omap/common.c | 9 +
arch/arm/plat-omap/counter_32k.c | 16 +-
arch/arm/plat-omap/dma.c | 59 +-
arch/arm/plat-omap/dmtimer.c | 164 ++-
arch/arm/plat-omap/include/plat/board.h | 38 -
arch/arm/plat-omap/include/plat/clkdev_omap.h | 1 +
arch/arm/plat-omap/include/plat/clock.h | 2 -
arch/arm/plat-omap/include/plat/cpu.h | 59 +-
arch/arm/plat-omap/include/plat/dmtimer.h | 22 +-
arch/arm/plat-omap/include/plat/dsp.h | 3 +
arch/arm/plat-omap/include/plat/hardware.h | 1 +
arch/arm/plat-omap/include/plat/multi.h | 9 +
arch/arm/plat-omap/include/plat/mux.h | 2 +-
arch/arm/plat-omap/include/plat/omap-secure.h | 5 -
arch/arm/plat-omap/include/plat/omap54xx.h | 32 +
arch/arm/plat-omap/include/plat/omap730.h | 102 --
arch/arm/plat-omap/include/plat/omap850.h | 102 --
arch/arm/plat-omap/include/plat/omap_hwmod.h | 21 +
arch/arm/plat-omap/include/plat/sdrc.h | 2 +-
arch/arm/plat-omap/include/plat/serial.h | 14 +
arch/arm/plat-omap/include/plat/uncompress.h | 12 +
arch/arm/plat-omap/include/plat/usb.h | 196 +---
arch/arm/plat-omap/include/plat/voltage.h | 21 +-
arch/arm/plat-omap/mailbox.c | 13 +-
arch/arm/plat-omap/sram.c | 17 +-
arch/arm/plat-omap/usb.c | 145 ---
arch/arm/plat-s3c24xx/irq.c | 2 +-
arch/arm/plat-samsung/Kconfig | 12 +-
arch/arm/plat-samsung/Makefile | 8 +-
arch/arm/plat-samsung/devs.c | 60 +-
arch/arm/plat-samsung/dma-ops.c | 76 +-
arch/arm/plat-samsung/include/plat/cpu.h | 4 +
arch/arm/plat-samsung/include/plat/devs.h | 1 -
arch/arm/plat-samsung/include/plat/dma-ops.h | 20 +-
arch/arm/plat-samsung/include/plat/fb.h | 1 -
arch/arm/plat-samsung/include/plat/pd.h | 30 -
arch/arm/plat-samsung/include/plat/s3c64xx-spi.h | 39 +-
arch/arm/plat-samsung/pd.c | 95 --
arch/arm/plat-samsung/pwm.c | 4 -
arch/arm/plat-samsung/s3c-dma-ops.c | 39 +-
arch/arm/plat-versatile/Kconfig | 3 +
arch/arm/plat-versatile/Makefile | 2 +-
drivers/amba/tegra-ahb.c | 6 -
drivers/clk/Makefile | 2 +
drivers/clk/clk-nomadik.c | 47 +
drivers/clk/socfpga/Makefile | 1 +
drivers/clk/socfpga/clk.c | 51 +
drivers/clocksource/Kconfig | 6 +
drivers/clocksource/Makefile | 4 +-
drivers/clocksource/dw_apb_timer_of.c | 131 +++
drivers/clocksource/time-armada-370-xp.c | 226 ++++
drivers/crypto/tegra-aes.c | 12 +-
drivers/dma/ipu/ipu_idmac.c | 8 +-
drivers/dma/ipu/ipu_irq.c | 14 +-
drivers/gpio/gpio-mxc.c | 56 +-
drivers/i2c/busses/i2c-imx.c | 1 -
drivers/i2c/busses/i2c-nomadik.c | 3 +-
drivers/i2c/busses/i2c-tegra.c | 10 +-
drivers/input/keyboard/tegra-kbc.c | 4 +-
drivers/media/video/mx1_camera.c | 1 +
drivers/mmc/host/sdhci-tegra.c | 11 +-
drivers/pinctrl/pinctrl-nomadik.c | 2 +-
drivers/pinctrl/pinctrl-sirf.c | 489 +++++++-
drivers/power/Kconfig | 2 +
drivers/power/Makefile | 1 +
drivers/power/avs/Kconfig | 12 +
drivers/power/avs/Makefile | 1 +
drivers/power/avs/smartreflex.c | 1126 +++++++++++++++++++
drivers/rtc/rtc-at91rm9200.c | 1 +
drivers/rtc/rtc-stmp3xxx.c | 8 +
drivers/spi/spi-s3c64xx.c | 542 +++++++--
drivers/spi/spi-tegra.c | 4 +-
drivers/staging/nvec/nvec.c | 8 +-
drivers/staging/omapdrm/omap_drv.h | 2 +-
drivers/staging/omapdrm/omap_priv.h | 55 -
drivers/tty/serial/imx.c | 6 +-
drivers/tty/serial/mxs-auart.c | 42 +-
drivers/usb/gadget/Kconfig | 2 +-
drivers/usb/gadget/omap_udc.c | 3 +-
drivers/usb/host/Kconfig | 2 +-
drivers/usb/host/ehci-tegra.c | 20 +-
drivers/usb/host/ohci-omap.c | 7 +-
drivers/usb/otg/isp1301_omap.c | 2 +-
drivers/video/mxsfb.c | 62 +-
drivers/w1/masters/Kconfig | 2 +-
drivers/w1/masters/omap_hdq.c | 86 +-
drivers/watchdog/omap_wdt.c | 7 +
include/linux/dw_apb_timer.h | 1 +
include/linux/i2c/twl.h | 1 -
include/linux/mxsfb.h | 49 +
include/linux/platform_data/clk-nomadik.h | 2 +
include/linux/platform_data/omap_drm.h | 52 +
include/linux/power/smartreflex.h | 308 ++++++
include/linux/time-armada-370-xp.h | 18 +
sound/soc/fsl/imx-pcm-fiq.c | 1 +
sound/soc/samsung/dma.c | 18 +-
sound/soc/tegra/Kconfig | 10 +-
sound/soc/tegra/tegra20_i2s.c | 4 +-
sound/soc/tegra/tegra20_spdif.c | 4 +-
sound/soc/tegra/tegra30_ahub.c | 8 +-
sound/soc/tegra/tegra30_i2s.c | 4 +-
sound/soc/tegra/tegra_asoc_utils.c | 12 +-
694 files changed, 23069 insertions(+), 11480 deletions(-)
^ permalink raw reply [flat|nested] 44+ messages in thread
* [GIT PULL 00/15] arm-soc: changes for v3.6
@ 2012-07-23 20:32 ` Arnd Bergmann
0 siblings, 0 replies; 44+ messages in thread
From: Arnd Bergmann @ 2012-07-23 20:32 UTC (permalink / raw)
To: linux-arm-kernel
Hi Linus,
Here are the main changes for the arm-soc tree for the 3.6 merge window.
All dependencies are merged already, but there are a few small branches
that I'd like to give some more time in linux-next before sending them to
you. We've been discussing some large-scale reorganizations where lots
of files get moved around and were thinking about sending them at the
end of the merge window, but right now it seems a bit premature.
We'll see how that goes.
There are about 600 changesets in here, and a bunch of simple
conflicts between the 15 branches, but so far no conflicts with
stuff that you have merged already. For reference, you can check
the "for-linus" branch in the same tree to see how we resolved
the conflicts.
Arnd
Afzal Mohammed (3):
ARM: OMAP2+: am33xx: Add low level debugging support
ARM: OMAP2+: am33xx: Add AM335XEVM machine support
arm/dts: am33xx wdt node
Alexander Shiyan (8):
ARM: i.MX51 iomux: added missing pin definitions
ARM: i.MX5x clocks: Add EPIT support
ARM: i.MX5x clocks: Fix parent for PWM clocks
ARM: i.MX5x clocks: Fix GPT clocks
ARM: i.MX5x CSPI: Fixed clock name for CSPI
ARM: clps711x/p720t: Replace __initcall by .init_early call
ARM: clps711x: Removed superfluous transform virt_to_bus and related functions
ARM: clps711x: Remove the setting of the time
Alexandre Pereira da Silva (13):
ARM: LPC32xx: Build arch dtbs
ARM: LPC32xx: Add dt settings to the at25 node
ARM: LPC32xx: Remove spi chipselect request from board init
ARM: LPC32xx: Remove spi chip definitions
ARM: LPC32xx: Cleanup board init, remove duplicate clock init
ARM: LPC32xx: Move uart6 irda disable to serial.c
ARM: LPC32xx: Move i2s1 dma enabling to clock.c
ARM: LPC32xx: Cleanup USB clock init
ARM: LPC32xx: Remove unused gpios
ARM: LPC32xx: Add PWM to base dts file
ARM: LPC32xx: Set system serial based on cpu unique id
ARM: LPC32xx: Add PWM clock
ARM: LPC32xx: Add PWM support
Andy Gross (1):
omap2+: add drm device
AnilKumar Ch (4):
arm/dts: Add initial DT support for AM33XX SoC family
arm/dts: Add support for AM335x EVM
arm/dts: Add support for AM335x BeagleBone
arm/dts: remove MMC/SD and SPI related entries from am33xx.dtsi
Arnd Bergmann (79):
ARM: OMAP depends on MMU
Merge tag 'at91-for-next-cleanup' of git://github.com/at91linux/linux-at91 into next/cleanup
Merge branch 'prima2/drivers' of git://gitorious.org/sirfprima2-kernel/sirfprima2-kernel into next/pinctrl
Merge branch 'imx/sparse-irq' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/irq
Merge branch 'lpc32xx/dts' of git://git.antcom.de/linux-2.6 into next/dt
Merge branch 'lpc32xx/defconfig' of git://git.antcom.de/linux-2.6 into next/defconfig
Merge branch 'lpc32xx/core' of git://git.antcom.de/linux-2.6 into next/soc
Merge tag 'omap-fixes-non-critical-for-v3.6' of git://git.kernel.org/.../tmlind/linux-omap into next/fixes-non-critical
Merge tag 'omap-cleanup-for-v3.6' of git://git.kernel.org/.../tmlind/linux-omap into next/cleanup
Merge tag 'omap-devel-dmtimer-for-v3.6' of git://git.kernel.org/.../tmlind/linux-omap into next/timer
Merge tag 'omap-devel-driver-for-v3.6' of git://git.kernel.org/.../tmlind/linux-omap into next/pm
Merge tag 'omap-devel-pm-for-v3.6' of git://git.kernel.org/.../tmlind/linux-omap into next/pm
Merge tag 'omap-devel-am33xx-for-v3.6' of git://git.kernel.org/.../tmlind/linux-omap into next/soc
ARM: at91: fix new build errors
ARM: prima2: enable gpiolib unconditionally
Merge branch 'prima2/pinctrl' into next/pinctrl
Merge branch 'mxs/fixes-for-3.6' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/fixes-non-critical
Merge tag 'v3.5-rc5' into next/dt
Merge branch 'mxs/dt-for-3.6' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/dt
Merge branch 'mxs/defconfig-for-3.6' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/defconfig
Merge branch 'imx/cleanup-for-3.6' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/cleanup
Merge branch 'imx/dt-for-3.6' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/dt
Merge branch 'imx/sparse-irq' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/irq
Merge tag 'imx-cleanup' of git://git.pengutronix.de/git/imx/linux-2.6 into next/cleanup
Merge branch 'for-3.6/cleanup' of git://git.kernel.org/.../swarren/linux-tegra into next/cleanup
Merge branch 'for-3.6/fixes' of git://git.kernel.org/.../swarren/linux-tegra into next/cleanup
Merge branch 'tegra/cleanup' into next/soc
Merge branch 'for-3.6/soc' of git://git.kernel.org/.../swarren/linux-tegra into next/soc
Merge branch 'for-3.6/boards' of git://git.kernel.org/.../swarren/linux-tegra into next/boards
Merge branch 'tegra/cleanup' into next/clk
Merge branch 'for-3.6/common-clk' of git://git.kernel.org/.../swarren/linux-tegra into next/clk
Merge branch 'for-3.6/defconfig' of git://git.kernel.org/.../swarren/linux-tegra into next/defconfig
Merge branch 'next/cleanup-samsung' of git://git.kernel.org/.../kgene/linux-samsung into next/cleanup
Merge branch 'next/devel-dma-ops' of git://git.kernel.org/.../kgene/linux-samsung into next/dma
Merge branch 'next/board-samsung' of git://git.kernel.org/.../kgene/linux-samsung into next/boards
Merge branch 'mvebu/newsoc' into next/newsoc
Merge tag 'davinci-v3.6-cleanup' of git://gitorious.org/linux-davinci/linux-davinci into next/cleanup
Merge tag 'davinci-v3.6-soc' of git://gitorious.org/linux-davinci/linux-davinci into next/soc
Merge tag 'davinci-v3.6-fixes' of git://gitorious.org/linux-davinci/linux-davinci into next/fixes-non-critical
Merge tag 'omap-devel-board-for-v3.6' of git://git.kernel.org/.../tmlind/linux-omap into next/boards
Merge tag 'omap-cleanup-part2-for-v3.6' of git://git.kernel.org/.../tmlind/linux-omap into next/cleanup2
Merge branch 'omap/cleanup2' into next/clk
Merge tag 'omap-devel-am33xx-data-for-v3.6' of git://git.kernel.org/.../tmlind/linux-omap into next/clk
Merge branch 'omap/cleanup2' into next/newsoc
Merge branch 'devel-omap5' of git://git.kernel.org/.../tmlind/linux-omap into next/newsoc
Merge tag 'v3.5-rc6' into next/soc
Merge tag 'imx-soc' of git://git.pengutronix.de/git/imx/linux-2.6 into next/soc
Merge branch 'lpc32xx/core-fixes' of git://git.antcom.de/linux-2.6 into next/soc
Merge branch 'picoxcell/timer' into next/timer
Merge branch 'tegra/cleanup' into next/dt
Merge branch 'for-3.6/dt' of git://git.kernel.org/.../swarren/linux-tegra into next/dt
Merge tag 'v3.5-rc6' into next/dt
Merge tag 'at91-for-next-dt' of git://github.com/at91linux/linux-at91 into next/dt
Merge tag 'omap-devel-dt-for-v3.6' of git://git.kernel.org/.../tmlind/linux-omap into next/dt
Merge tag 'imx-dt' of git://git.pengutronix.de/git/imx/linux-2.6 into next/dt
Merge branch 'imx/dt-for-3.6' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/dt
Merge tag 'imx-defconfig' of git://git.pengutronix.de/git/imx/linux-2.6 into next/defconfig
Merge branch 'mxs/dt-for-3.6' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/dt
Merge tag 'davinci-v3.6-dt' of git://gitorious.org/linux-davinci/linux-davinci into next/dt
Merge branch 'vexpress-v3.5-rc6' of git://git.linaro.org/people/pawelmoll/linux into next/soc
Merge branch 'clps711x/cleanup' into next/cleanup
Merge branch 'mvebu/newsoc' into next/newsoc
Merge tag 'imx-clk' of git://git.pengutronix.de/git/imx/linux-2.6 into next/clk
Merge branch 'next/cleanup-samsung-2' of git://git.kernel.org/.../kgene/linux-samsung into next/cleanup
Merge branch 'next/board-samsung-2' of git://git.kernel.org/.../kgene/linux-samsung into next/boards
Merge branch 'samsung/dma' into next/dt
Merge branch 'next/dt-samsung' of git://git.kernel.org/.../kgene/linux-samsung into next/dt
ARM: EXYNOS: mark the DMA channel binding for SPI as preliminary
Merge branch 'next/devel-samsung' of git://git.kernel.org/.../kgene/linux-samsung into next/soc
Merge branch 'ux500/fixes-3.5' into next/dt
Merge branch 'for-arm-soc-next' of git://git.linaro.org/people/ljones/linux-3.0-ux500 into next/dt
Merge tag 'ep93xx-fixes-for-3.6' of git://github.com/RyanMallon/linux-ep93xx into next/fixes-non-critical
Merge tag 'ep93xx-devel-for-3.6' of git://github.com/RyanMallon/linux-ep93xx into next/soc
Merge branch 'lpc32xx/dts2' of git://git.antcom.de/linux-2.6 into next/dt
Merge branch 'lpc32xx/core2' of git://git.antcom.de/linux-2.6 into next/soc
Merge tag 'v3.5-rc7' into next/boards
Merge branch 'next/board-samsung-3' of git://git.kernel.org/.../kgene/linux-samsung into next/boards
Merge branch 'next/devel-samsung-spi' of git://git.kernel.org/.../kgene/linux-samsung into next/spi
Merge branch 'samsung/defconfig' into next/defconfig
Barry Song (1):
PINCTRL: SiRF: add GPIO and GPIO irq support in CSR SiRFprimaII
Bartlomiej Zolnierkiewicz (1):
ARM: EXYNOS: Remove leftovers of the Samsung specific power domain control
Ben Dooks (1):
ARM: mvebu: MPIC: read number of interrupts from control register
Beno?t Th?baudeau (7):
ARM: imx: cleanup otg_mode
ARM: imx: remove unused pdata from device macros
ARM: imx: fix i.MX35 CPU architecture
ARM: imx: enable support for mx35 rtc
ARM: imx: add rtc support to mx35_3ds
ARM: imx: make ehci power/oc polarities configurable
ARM: imx: fix mx51 ehci setup errors
Boojin Kim (4):
ARM: SAMSUNG: Add config() function in DMA common operations
spi/s3c64xx: Add the use of DMA config operation
ASoC: follow the updated samsung DMA common operations
ARM: EXYNOS: Remove the L2 cache latency setting for EXYNOS5
Brian Austin (1):
ARM: OMAP: beagle: Set USB Host Port 1 to OMAP_USBHS_PORT_MODE_UNUSED
Daniel Lezcano (1):
ARM: OMAP3/4: consolidate cpuidle Makefile
Denis 'GNUtoo' Carikli (2):
ARM i.MX31: Add devicetree support
arm/dts: Add support for i.MX31 bug 1.x board from buglabs.
Dimitris Papastamos (1):
ARM: S3C64XX: Add IRQ mapping for wm0010 on Cragganmore
Dinh Nguyen (2):
clocksource: dw_apb_timer: Add common DTS glue for dw_apb_timer
ARM: socfpga: initial support for Altera's SOCFPGA platform
Dmitry Lifshitz (2):
ARM: OMAP3: cm-t35: add mt9t001 camera sensor support
ARM: OMAP3: cm-t35: add tvp5150 decoder support
Fabio Estevam (14):
ARM: mxs: Let GPMI driver be built by default
ARM: mxs: Enable MACH_APX4DEVKIT
ARM: mxs_defconfig: Let AUART driver be built by default
serial: mxs-auart: Allow device tree probing
ARM: dts: mx28evk: Add auart0 and auart3 support
ARM: imx: Fix build error due to missing irqs.h include
ARM: mx23: Add initial support for olinuxino board
ARM: mxs_defconfig: Enable RTC driver
ARM: imx: Kconfig: Remove IMX_HAVE_PLATFORM_IMX_SSI from MACH_MX25_3DS
ARM: mxs: defconfig: Enable CONFIG_COMMON_CLK_DEBUG
ARM: clk-imx27: Fix rtc clock id
ARM: mx27: Reenable silicon version print
ARM: dts: Add basic support for mx27_3ds board
ARM: imx: clk-imx31: Fix clock id for rnga driver
Fabio Porcedda (1):
ARM: at91: add support for Telit EVK-PRO3 with Telit GE863-PRO3
Gregory CLEMENT (4):
clocksource: time-armada-370-xp: Marvell Armada 370/XP SoC timer driver
arm: mach-mvebu: add source files
arm: mach-mvebu: add documentation for new device tree bindings
arm: mach-mvebu: add compilation/configuration change
Heiko Schocher (2):
ARM: davinci: cp_intc: Add irq domain support
ARM: davinci: cp_intc: Add OF support for TI interrupt controller
Huang Shijie (6):
ARM: imx6q: add DT node for apbh-dma
ARM: imx6q: add clock for apbh-dma
ARM: imx6q: add DT node for gpmi nand
ARM: imx6q: add clocks for gpmi-nand
ARM: mx28: add gpmi-nand support
ARM: dts: mx23: add gpmi nand support
Hui Wang (1):
ARM: dts: imx6q-sabrelite: add ecspi1 pinctrl support
Igor Grinberg (1):
ARM: OMAP: fix the ads7846 init code
J Keerthy (1):
ARM: OMAP2+: Voltage: Move the omap_volt_data structure to plat
Javier Martinez Canillas (1):
ARM: OMAP: omap2plus_defconfig: Enable EXT4 support
Jean Pihet (13):
ARM: OMAP2+: SmartReflex: move the smartreflex header to include/linux/power
ARM: OMAP3+: SmartReflex: class drivers should use struct omap_sr *
ARM: OMAP2+: smartreflex: Use the names from hwmod data instead of voltage domains.
ARM: OMAP3: hwmod: rename the smartreflex entries
ARM: OMAP2+: SmartReflex: introduce a busy loop condition test macro
ARM: OMAP2+: SmartReflex: Use per-OPP data structure
ARM: OMAP2+: SmartReflex: Create per-opp debugfs node for errminlimit
ARM: OMAP2+: SmartReflex: add POWER_AVS Kconfig options
ARM: OMAP: SmartReflex: Move smartreflex driver to drivers/
ARM: OMAP3: PM: cpuidle: default to C1 in next_valid_state
ARM: OMAP3: PM: cpuidle: optimize the PER latency in C1 state
ARM: OMAP3: PM: cpuidle: optimize the clkdm idle latency in C1 state
ARM: OMAP2+: do not allow SmartReflex to be built as a module
Jean-Christophe PLAGNIOL-VILLARD (1):
ARM: at91: aic add dt support for external irqs
Jiri Prchal (1):
ARM: at91: Add support for board aks-cdu
Jon Hunter (15):
ARM: OMAP: Remove unnecessary clk structure
ARM: OMAP2+: Remove unused max number of timers definition
ARM: OMAP2+: Add dmtimer platform function to reserve systimers
ARM: OMAP: Add DMTIMER capability variable to represent timer features
ARM: OMAP2+: HWMOD: Correct timer device attributes
ARM: OMAP2+: Fix external clock support for dmtimers
ARM: OMAP: Remove loses_context variable from timer platform data
ARM: OMAP: Remove timer function pointer for context loss counter
ARM: OMAP: Add flag to indicate if a timer needs a manual reset
ARM: OMAP1: Fix dmtimer support
ARM: OMAP2+: Move dmtimer clock set function to dmtimer driver
ARM: OMAP2+: Simplify dmtimer clock aliases
arm/dts: OMAP2: Add support for OMAP2420H4 Board
ARM: OMAP4: clockdomain/CM code: Update supported transition modes
ARM: OMAP2+: powerdomain code: Fix Wake-up power domain power status
Jonghwan Choi (2):
ARM: SAMSUNG: Remove unused variable 'running' on PWM
ARM: EXYNOS: Clear SYS_WDTRESET bit to use watchdog reset
Juan Gutierrez (2):
ARM: OMAP: enable mailbox irq per instance
ARM: OMAP4: fix irq and clock name for dsp-iommu
Kevin Hilman (16):
ARM: OMAP4: hwmod: rename _enable_module to _omap4_enable_module()
ARM: OMAP2+: hwmod: use init-time function ptrs for enable/disable module
ARM: OMAP4: hwmod: drop extra cpu_is check from _wait_target_disable()
ARM: OMAP2+: hwmod: use init-time function pointer for wait_target_ready
ARM: OMAP2+: hwmod: use init-time function pointer for hardreset
ARM: OMAP2+: hwmod: use init-time function pointer for _init_clkdm
ARM: OMAP2+: CLEANUP: Remove ARCH_OMAPx ifdef from struct dpll_data
ARM: OMAP2+: TWL: remove usage of pdata->irq_base/_end
mfd: twl: remove pdata->irq_base/_end, no more users
ARM: OMAP2+: PRM: fix compile for OMAP4-only build
ARM: OMAP2+: powerdomain: allow pre/post transtion to be per pwrdm
ARM: OMAP3: PM: call pre/post transition per powerdomain
ARM: OMAP3: PM: cleanup cam_pwrdm leftovers
ARM: OMAP2+: fix CONFIG_CPU_IDLE dependency on CONFIG_PM
ARM: OMAP2+: PM: fix IRQ_NOAUTOEN removal by mis-merge
ARM: davinci: add runtime PM support for clock management
Kishon Vijay Abraham I (1):
ARM: OMAP2+: hwmod code: add support to set dmadisable in hwmod framework
Kukjin Kim (5):
Merge branch 'next/devel-dma-ops' into next/dt-samsung
Merge branch 'next/board-samsung' into next/board-samsung-2
Merge branch 'next/dt-samsung' into next/devel-samsung-spi
Merge branch 'next/board-samsung-2' into next/board-samsung-3
ARM: SAMSUNG: no need to set the value for clk_xusbxti when it is 24Mhz
Lauri Hintsala (6):
ARM: apx4devkit: add NAND support
ARM: apx4devkit: add display support
ARM: apx4devkit: fix the bus-width of SSP0 to 4 bits
ARM: apx4devkit: add SSP2 support
ARM: apx4devkit: remove AUART3
ARM: apx4devkit: add pin muxing for GPIOs
Laxman Dewangan (4):
ARM: tegra: dma: rename driver name for clock to "tegra-apbdma"
ARM: tegra: add device tree AUXDATA for APBDMA
ARM: tegra: apbio access using dma for tegra20 only
ARM: tegra: apbio: use dmaengine based dma driver
Lee Jones (20):
ARM: ux500: Enable Device Tree support mmci for Snowball
ARM: ux500: Remove unused i2c platform_data initialisation code
ARM: ux500: Provide auxdata to be used as name base clock search for nmk-i2c
ARM: ux500: Kconfig: Compile in leds-gpio support for Snowball
ARM: ux500: Enable the user LED on Snowball via Device Tree
ARM: ux500: Add a ab8500-gpadc node to the db8500 Device Tree
ARM: ux500: Add support for input/ponkey into the db8500's Device Tree
ARM: ux500: Enable LED heartbeat functionality on Snowball
ARM: ux500: Enable LED heartbeat functionality on Snowbal via DT
ARM: ux500: Add db8500 Device Tree node for ab8500-sysctrl
ARM: ux500: Add db8500 Device Tree node for misc/ab8500-pwm
ARM: ux500: Add a ab8500-usb Device Tree node for db8500 based devices
ARM: ux500: Apply ab8500-debug node do the db8500 DT structure
ARM: ux500: Correctly reference IRQs supplied by the AB8500 from Device Tree
ARM: ux500: Enable the AB8500 RTC for all DT:ed DB8500 based devices
ARM: ux500: Move rtc-pl031 registration to Device Tree when enabled
pinctrl: pinctrl-nomadik: Append sleepmode property with vendor specific prefixes
ARM: ux500: Ensure vendor specific properties have the vendor's identifier
ARM: ux500: Remove temporary snowball_of_platform_devs enablement structure
ARM: ux500: Remove PMU platform registration when booting with DT
Linus Walleij (8):
ARM: nomadik: register GPIOs dynamically
ARM: nomadik: register AMBA devices dynamically
ARM: nomadik: register PL031 RTC
ARM: nomadik: convert to generic clock
ARM: nomadik: register all three I2C busses
ARM: nomadik: register the I2C devices
ARM: nomadik: register the MMC/SD device
ARM: nomadik: bump all IRQ numbers by one
Ludovic Desroches (8):
ARM: at91: fix at91_aic_write macro
ARM: at91: aic can use fast eoi handler type
ARM: at91: add of irq priorities support
ARM: at91: remove static irq priorities for sam9x5
ARM: at91: at91 based machines specify their own irq handler at run time
ARM: at91: sparse irq support
ARM: at91: remove mach/irqs.h
ARM: at91: add AIC5 support
Marc Kleine-Budde (2):
ARM: imx: enable flexcan on imx25, imx35, imx53, imx6q
ARM: mxs: enable flexcan on imx28
Marek Vasut (3):
ARM: dts: imx23: Fix the gpmi/gpmi-nand DT name
rtc: stmp3xxx: Add simple binding for the stmp3xxx-rtc
ARM: mxs: convert m28evk board to device tree
Mark A. Greer (4):
ARM: OMAP3: PM: Only access IVA if one exists
ARM: OMAP AM35x: EMAC/MDIO integration: Add Davinci EMAC/MDIO hwmod support
ARM: OMAP AM35x: clockdomain data: Fix clockdomain dependencies
arm: omap3: am35x: Set proper powerdomain states
Mark Brown (12):
ARM: S3C64XX: Add module identification for Balblair Cragganmore module
ARM: S3C64XX: Add WM5102 EVM to Cragganmore modules
ARM: S3C64XX: Dynamically allocate the IRQ range for WM8994 on Cragganmore
ARM: S3C64XX: Dynamically assign interrupts for CPU PMIC on Cragganmore
ARM: SAMSUNG: Introduce Kconfig variable for Samsung custom clk API
ARM: S3C64XX: Don't specify an irq_base for WM1192-EV1 board
ARM: S3C64XX: Clean up after SPI driver platform data updates
spi/s3c64xx: Fix handling of errors in gpio_request()
spi/s3c64xx: Put the /CS GPIO into output mode
spi/s3c64xx: Convert to devm_request_and_ioremap()
spi/s3c64xx: Expand S3C64XX_SPI_{DE,}ACT macros at call sites
ARM: S3C64XX: Mark most Cragganmore initdata devinitdata
Maxime Ripard (3):
ARM: dts: imx28: Add additionnal muxing options to iMX28 DTSI
ARM: mxs: Add Crystalfontz CFA-10036 DTS
ARM: dts: cfa10036: Add Power LED to the CFA-10036 board
Mohan V (1):
ARM: OMAP3: PM: correct enable/disable of daisy io chain
Nishanth Menon (1):
ARM: OMAP2+: OPP: Fix to ensure check of right oppdef after bad one
Ohad Ben-Cohen (1):
ARM: OMAP4: hwspinlocks_init() should be static
Oleg Matcovschi (1):
ARM: OMAP: dma: Clear status registers on enable/disable irq
Olof Johansson (4):
Merge branch 'nomadik-for-arm-soc' of git://git.kernel.org/.../linusw/linux-nomadik into next/soc
Merge branch 'imx/cpuidle' into next/pm
Merge branch 'lpc32xx/devel' into next/soc
ARM: exynos_defconfig: enable more platforms in defconfig
Omar Ramirez Luna (2):
ARM: OMAP2+: control: new APIs to configure boot address and mode
ARM: OMAP: dsp: interface to control module functions
Otavio Salvador (1):
ARM: imx6q: ensure ANATOP controller is available
Paul Bolle (8):
ARM: davinci: remove dummy header files
ARM: S3C24XX: remove unused header <mach/bast-pmu.h>
ARM: SAMSUNG: remove unused SPI clock headers
ARM: OMAP7XX: Remove omap730.h and omap850.h
ARM: OMAP: fix typos related to OMAP330
ARM: OMAP: remove unused cpu detection macros
ARM: mxs/tx28: fix odd include
ARM: at91: remove two unused headers
Paul Walmsley (12):
ARM: OMAP2+: hwmod: remove prm_clkdm, cm_clkdm; allow hwmods to have no clockdomain
Merge branches 'clock_cleanup_misc_3.6', 'control_clean_dspbridge_writes_cleanup_3.6', 'hwmod_soc_conditional_cleanup_3.6', 'mcbsp_clock_aliases_cleanup_3.6' and 'remove_clkdm_requirement_from_hwmod_3.6' into omap_cleanup_a_3.6
W1: OMAP HDQ1W: allow driver to be built on all OMAP2+
W1: OMAP HDQ1W: use 32-bit register accesses
ARM: OMAP2+: HDQ1W: use omap_device
W1: OMAP HDQ1W: use runtime PM
ARM: OMAP3+: clock: Move common clksel_rate & clock data to common file
ARM: OMAP AM35xx: clock and hwmod data: fix AM35xx HSOTGUSB hwmod
ARM: OMAP AM35xx: clock and hwmod data: fix UART4 data
ARM: OMAP: AM35xx: fix UART4 softreset
Merge branches 'am35xx_hwmod_data_fixes_a_3.6', 'am35xx_emac_mdio_devel_3.6' and 'am35xx_prcm_data_devel_3.6' into am35xx_devel_3.6
Merge branches 'hwmod_am335x_support_3.6', 'clkdm_pwrdm_devel_a_3.6' and 'misc_devel_3.6' into omap_devel_f_3.6
Pawel Moll (8):
ARM: vexpress: Check master site in daughterboard's sysctl operations
ARM: versatile: Make plat-versatile clock optional
ARM: vexpress: Initial common clock support
ARM: vexpress: Add missing SP804 interrupt in motherboard's DTS files
ARM: vexpress: Add fixed regulator for SMSC
ARM: vexpress: Convert V2P-CA15 Device Tree to 64 bit addresses
ARM: vexpress: Add Device Tree for V2P-CA15_CA7 core tile
ARM: vexpress: Config option for early printk console
Peter Ujfalusi (13):
ARM: OMAP2: Move McBSP fck clock alias to hwmod data for OMAP2420
ARM: OMAP2: Move McBSP fck clock alias to hwmod data for OMAP2430
ARM: OMAP3: Move McBSP fck clock alias to hwmod data
ARM: OMAP2: twl-common: Fix compiler warning
ARM: OMAP: board-4430sdp: MUX configuration for sys_nirq2
ARM: OMAP: board-omap4panda: MUX configuration for sys_nirq2
arm/dts: omap4: Add entry for OMAP McPDM IP
arm/dts: omap4: Add entry for OMAP DMIC IP
arm/dts: omap4-sdp: Add fixed regulator to represent VBAT
arm/dts: omap4-sdp: Add support for twl6040
arm/dts: omap4-sdp: Enable audio support via device tree
arm/dts: omap4-panda: Audio support for PandaBoard 4430
arm/dts: New dts file for PandaBoardES (4460)
Prashant Gaikwad (11):
ARM: tegra: Remove flow controller programming
ARM: tegra: add clk_prepare/clk_unprepare
i2c: tegra: Add clk_prepare/clk_unprepare
mmc: tegra: add clk_prepare/clk_unprepare
USB: ehci-tegra: add clk_prepare/clk_unprepare
Input: tegra-kbc - add clk_prepare/clk_unprepare
spi/tegra: add clk_prepare/clk_unprepare
staging: nvec: add clk_prepare/clk_unprepare
ASoC: tegra: add clk_prepare/clk_unprepare
crypto: add clk_prepare/clk_unprepare
ARM: tegra: Remove second instance of uart clk
R Sricharan (12):
ARM: OMAP2+: PRM/CM: Move the stubbed prm and cm functions to prcm.c file and make them __weak
ARM: OMAP2+: Move stubbed secure_sram_reserve function to a common.c and call it __weak
ARM: OMAP: counter-32k: Select the CR register offset using the IP scheme
ARM: OMAP5: id: Add cpu id for ES versions
ARM: OMAP5: Add minimal support for OMAP5430 SOC
ARM: OMAP5: timer: Add clocksource, clockevent support
ARM: OMAP5: gpmc: Update gpmc_init()
ARM: OMAP5: l3: Add l3 error handler support for omap5
ARM: omap2+: board-generic: clean up the irq data from board file
ARM: OMAP5: board-generic: Add device tree support
arm/dts: OMAP5: Add omap5 dts files
ARM: OMAP5: Add the build support
Rafal Prylowski (2):
ep93xx: IDE driver platform support code
ep93xx: Add IDE support to edb93xx boards
Rajendra Nayak (1):
ARM: OMAP4: PRM: Add IO Daisychain support
Ricardo Salveti de Araujo (1):
ARM: EXYNOS: Add leds status1 and status2 on Origen board
Richard Zhao (5):
ARM: dts: imx28-evk: add usb devices
ARM: imx6q: add usb controller clock lookups
ARM: imx6q: add usbphy clocks
ARM: imx6q: disable usb charger detector
ARM: dts: imx6q-sabrelite: add usb devices
Robert Lee (7):
ARM: imx: Modify IMX_IO_P2V macro
ARM: imx: Add comments to tzic_enable_waker()
ARM: imx: clean and consolidate imx5 suspend and idle code
ARM: imx: Enable imx53 low power idle
ARM: imx: Add common imx cpuidle init functionality.
ARM: imx: Add imx5 cpuidle
ARM: imx: Add imx6q cpuidle driver
Roland Stigge (24):
ARM: LPC32xx: Add NAND flash timing to PHY3250 board dts
ARM: LPC32xx: Clock initialization for NAND controllers
ARM: LPC32xx: Remove SLC controller initialization from platform init
ARM: LPC32xx: Add DMA configuration to platform data
ARM: LPC32xx: Adjust dtsi file for MLC controller configuration
ARM: LPC32xx: Add dts for EA3250 reference board
ARM: LPC32xx: DTS adjustment for key matrix controller
ARM: LPC32xx: Clock adjustment for key matrix controller
ARM: LPC32xx: Defconfig update
ARM: LPC32xx: Add MMC controller support
ARM: LPC32xx: DTS adjustment for using pl18x primecell
ARM: LPC32xx: DT conversion of Standard UARTs
ARM: LPC32xx: High Speed UART configuration via DT
ARM: LPC32xx: Remove mach specific ARCH_NR_GPIOS, use default
ARM: LPC32xx: Fix lpc32xx.dtsi status property: "disable" -> "disabled"
ARM: tegra: Fix dts files w/ status property: "disable" -> "disabled"
ARM: OMAP: Fix dts files w/ status property: "disable" -> "disabled"
ARM: LPC32xx: Update DTS file for EA3250 board
ARM: LPC32xx: Defconfig update
ARM: LPC32xx: Init MMC via clock
ARM: LPC32xx: Add further bits to MMC init
ARM: LPC32xx: Remove wrong re-initialization of MMC clock register
ARM: LPC32xx: Remove USB and I2C init from phy3250.c
ARM: LPC32xx: Adjust to pl08x DMA interface changes
Sachin Kamat (19):
ARM: EXYNOS: Add HSOTG support to Origen
ARM: EXYNOS: Add HSOTG support to SMDKV310
ARM: S5P64X0: Remove unused variable in dma.c file
ARM: S5PC100: Remove unused variable in dma.c file
ARM: SAMSUNG: Remove description corresponding to a deleted element
ARM: S3C24XX: Remove duplicate header file inclusion
ARM: EXYNOS: Update keypad entries for SMDK4X12
ARM: S5PV210: Add HSOTG support to SMDKV210
ARM: SAMSUNG: Fix compiler warning in dma-ops.c file
ARM: EXYNOS: Update HSOTG PHY clock setting for EXYNOS4X12
ARM: EXYNOS: Make combiner_init function static
ARM: EXYNOS: Add missing static storage class specifier in pmu.c file
ARM: EXYNOS: Add audio platform device in SMDKV310 board
ARM: S5PV210: Add audio platform device in Aquila board
ARM: S5PV210: Add audio platform device in Goni board
ARM: EXYNOS: Add HSOTG support to SMDK4X12
ARM: EXYNOS: Add framebuffer support for SMDK4X12
ARM: EXYNOS: Add DRM device to SMDK4X12 board
ARM: EXYNOS: Add missing .reserve field to SMDKC210
Sakari Ailus (1):
ARM: OMAP3: control: add definition for CONTROL_CAMERA_PHY_CTRL
Santosh Shilimkar (3):
ARM: OMAP: sdrc: Fix the build break for OMAP4 only builds
ARM: OMAP5: Add the WakeupGen IP updates
ARM: OMAP5: Add SMP support
Sascha Hauer (2):
ARM: imx_v6_v7_defconfig: update features
ARM: imx_v4_v5_defconfig: update features
Sekhar Nori (1):
ARM: davinci: da8xx: fix interrupt handling
Shawn Guo (41):
ARM: imx: eliminate macro IMX_GPIO_TO_IRQ()
ARM: imx: eliminate macro IOMUX_TO_IRQ()
ARM: imx: eliminate macro IRQ_GPIOx()
gpio/mxc: move irq_domain_add_legacy call into gpio driver
ARM: imx: move irq_domain_add_legacy call into tzic driver
ARM: imx: move irq_domain_add_legacy call into avic driver
dma: ipu: remove the use of ipu_platform_data
ARM: imx: leave irq_base of wm8350_platform_data uninitialized
ARM: imx: pass gpio than irq number into mxc_expio_init
ARM: imx: add a legacy irqdomain for 3ds_debugboard
ARM: imx: add a legacy irqdomain for mx31ads
i2c: imx: remove unneeded mach/irqs.h inclusion
ARM: imx: remove unneeded mach/irq.h inclusion
tty: serial: imx: remove the use of MXC_INTERNAL_IRQS
ARM: fiq: change FIQ_START to a variable
ARM: imx: enable SPARSE_IRQ for imx platform
ARM: imx6q: remove unneeded clkdev lookups
ARM: mxs: store mac address read from OTP in device tree
video: mxsfb: move mxsfb.h into include/linux
video: mxsfb: add simple device tree probe
ARM: mxs: use auxdata to attach mxsfb_platform_data
ARM: dts: mxs: add comments for pinmux-ids
ARM: dts: mxs: add hog-gpios for imx23-evk and imx28-evk
ARM: dts: imx23-evk: updates for mmc device
ARM: dts: imx23-evk: add auart device
ARM: dts: imx28-evk: add vmmc-supply for mmc device
ARM: dts: imx28-evk: add missing properties for fec
ARM: dts: imx28-evk: add heartbeat gpio-leds
ARM: dts: mxs: enable rtc for imx23 and imx28
ARM: dts: mxs: add pwm-backlight for imx23-evk and imx28-evk
ARM: dts: mxs: add lcd support for imx23-evk and imx28-evk
ARM: dts: imx28-evk: add flexan devices
bindings: update imx and mxs #gpio-cells
ARM: dts: imx: update #interrupt-cells for gpio nodes
ARM: dts: imx28: move extra gpmi-nand pins into board dts
ARM: dts: imx28: move lcdif control pins into board dts
ARM: mxs: convert apx4devkit board to device tree
ARM: mxs: convert tx28 board to device tree
ARM: mxs: convert stmp378x_devb board to device tree
ARM: mxs: add dtb-y target into Makefile.boot
ARM: mxs: rename dts files with soc name being the prefix
Simon Que (1):
ARM: tegra: Fix PWM clock programming
Stephen Warren (16):
dt: name all Tegra binding docs consistently
mmc: tegra: use bus-width property instead of support-8bit
ARM: dt: tegra: remove legacy support-8bit property
ASoC: tegra: simplify Kconfig dependencies
ARM: tegra: defconfig updates
ARM: dt: tegra: rename board files to match SoC
ARM: tegra: make .dts compilation depend on Tegra2 support
ARM: tegra: remove CONFIG_MACH_TEGRA_DT
ARM: tegra: remove Seaboard board files
ARM: tegra: trimslice: enable PCIe when booting from device tree
ARM: tegra: harmony: init regulators, PCIe when booting from DT
ARM: tegra: paz00: enable WiFi rfkill when booting from device tree
ARM: tegra: use of_default_bus_match_table
ARM: dt: tegra: add Whistler device tree file
ARM: dt: tegra: seaboard: instantiate pinctrl-based I2C bus mux
ARM: dt: tegra seaboard: move battery monitor to mux'd I2C bus.
Sylwester Nawrocki (8):
ARM: S3C24XX: Free the backlight gpio requested in Mini2440 board code
ARM: S3C24XX: Convert SMDK board file to the gpiolib API
ARM: S3C24XX: Convert QT2410 board file to the gpiolib API
ARM: S3C24XX: Convert the PM code to gpiolib API
ARM: S3C24XX: Convert the touchscreen setup code to common GPIO API
ARM: S3C24XX: Remove unused GPA, GPE, GPH bank GPIO aliases
ARM: S3C24XX: Remove unused GPIO definitions for port J
ARM: S3C24XX: Remove unused GPIO definitions for Openmoko GTA02 board
Tarun Kanti DebBarma (4):
ARM: OMAP2+: hwmod: add omap_hwmod_get_main_clk() API
ARM: OMAP: dmtimer: use devm_ API and do some cleanup in probe()
ARM: OMAP2+: dmtimer: cleanup fclk usage
ARM: Kconfig update to support additional GPIOs in OMAP5
Tero Kristo (1):
ARM: OMAP3+: PRM: Enable IO wake up
Thierry Reding (1):
ARM: tegra: Provide clock for only one PWM controller
Thomas Abraham (14):
ARM: S3C64XX: Add a new dma request id for device tree based dma channel lookup
spi: s3c64xx: remove unused S3C64XX_SPI_ST_TRLCNTZ macro
spi: s3c64xx: move controller information into driver data
ARM: SAMSUNG: Remove pdev pointer parameter from spi gpio setup functions
ARM: SAMSUNG: Modify s3c64xx_spi{0|1|2}_set_platdata function
spi: s3c64xx: Remove the 'set_level' callback from controller data
spi: s3c64xx: add device tree support
ARM: EXYNOS: Add device tree node for EXYNOS4 interrupt combiner controller
ARM: EXYNOS: Fix the incorrect hierarchy of spi controller bus clock
ARM: EXYNOS: Enable platform support for SPI controllers for EXYNOX4
ARM: dts: Add nodes for spi controllers for SAMSUNG EXYNOS4 platforms
ARM: EXYNOS: Add spi clock support for EXYNOS5
ARM: EXYNOS: Enable platform support for SPI controllers for EXYNOS5
ARM: dts: Add nodes for spi controllers for SAMSUNG EXYNOS5 platforms
Thomas Petazzoni (5):
arm: mach-mvebu: add header
arm: mach-mvebu: add support for Armada 370 and Armada XP with DT
arm: mach-mvebu: add defconfig
arm: mach-mvebu: add entry to MAINTAINERS
arm: mvebu: generate DTBs for supported SoCs
Todor Colov (1):
arm: ep93xx: Enable i2c support for ep9302
Tony Lindgren (22):
Merge branch 'for-tony' of git://git.kernel.org/.../ohad/linux into fixes-omap4-dsp
ARM: OMAP3: There is no FS USB controller on omap3
ARM: OMAP2: Remove legacy USB FS support
ARM: OMAP: Make FS USB omap1 only
Merge tag 'omap-cleanup-a-for-3.6' of git://git.kernel.org/.../pjw/omap-pending into cleanup-hwmod
Merge tag 'omap-devel-a-for-3.6' of git://git.kernel.org/.../pjw/omap-pending into devel-am33xx
Merge tag 'omap-devel-b-for-3.6' of git://git.kernel.org/.../pjw/omap-pending into devel-driver
Merge tag 'omap-devel-c-for-3.6' of git://git.kernel.org/.../pjw/omap-pending into devel-pm
ARM: OMAP2: Use hwmod to initialize mmc for 2420
Merge branch 'for_3.6/pm/sr-move' of git://git.kernel.org/.../khilman/linux-omap-pm into devel-driver
Merge branch 'for_3.6/pm/performance' of git://git.kernel.org/.../khilman/linux-omap-pm into devel-pm
Merge branch 'fixes-omap4-dsp' into fixes-non-critical
Merge branch 'for_3.6/cleanup/pm' of git://git.kernel.org/.../khilman/linux-omap-pm into fixes-non-critical
Merge branch 'for_3.6/cleanup/twl-irq' of git://git.kernel.org/.../khilman/linux-omap-pm into fixes-non-critical
Merge branches 'cleanup-udc' and 'cleanup-dma' into cleanup
Merge branch 'cleanup-hwmod' into cleanup
Merge tag 'omap-devel-d-for-3.6' of git://git.kernel.org/.../pjw/omap-pending into fixes-non-critical
Merge tags 'omap-cleanup-for-v3.6', 'omap-devel-dmtimer-for-v3.6' and 'omap-devel-am33xx-for-v3.6' into devel-am33xx-part2
Merge tag 'omap-devel-f-for-3.6' of git://git.kernel.org/.../pjw/omap-pending into cleanup-part2
Merge tag 'omap-devel-e-for-3.5' of git://git.kernel.org/.../pjw/omap-pending into devel-am33xx-data
ARM: OMAP2+: Fix mismerge for omap_hwmod_get_main_clk() API
ARM: OMAP3: Fix omap3evm randconfig error introduced by VBUS support
Tony Prisk (1):
ARM:vt8500: Convert to use .restart and remove arch_reset()
Uri Yosef (1):
arm/dts: OMAP4: Add Variscite OMAP4 System-On-Modeule support
Uwe Kleine-K?nig (3):
ARM: imx27/dt: make dt_compat entry const
ARM: imx: select USE_OF
ARM: imx: add missing item to the list of clock event modes
Vaibhav Hiremath (16):
ARM: OMAP2+: control: Add AM33XX control reg & sec clkctrl offset
ARM: OMAP AM33xx: voltagedomain: Add voltage domain data
ARM: OMAP AM33xx: PRM: add PRM support
ARM: OMAP AM33xx: CM: Introduce AM33xx CM APIs and register level details
ARM: OMAP AM33xx: powerdomains: add AM335x support
ARM: OMAP AM33xx: clockdomains: Add clockdomain data and respective operations
ARM: OMAP3+: clock33xx: Add AM33XX clock tree data
arm/dts: Add support for TI AM3517/05 EVM board
arm/dts: omap3-evm: Add i2c and twl4030 support
ARM: OMAP2+: hwmod: Add new sysc_type3 into omap_hwmod required for am33xx
ARM: OMAP3/4: omap_hwmod: Add rstst_offs field to struct omap_hwmod_omap4_prcm
ARM: OMAP2+: All OMAP2PLUS uses omap-device.o target so add one entry
ARM: OMAP2+: Move omap3 dpll ops to dpll3xxx.c
ARM: OMAP2+: am33xx: Make am33xx as a separate class
ARM: OMAP2+: am33xx: Change cpu_is_am33xx to soc_is_am33xx
ARM: OMAP2+: Remove unnecessary ifdef around __omap2_set_globals
Venkatraman S (1):
ARM: OMAP2+: fix naming collision of variable nr_irqs
Vikram Pandita (1):
ARM: OMAP3+: dpll: optimize noncore dpll locking logic
Vishwanath BS (3):
ARM: OMAP3: PM: Move IO Daisychain function to omap3 prm file
ARM: OMAP3PLUS: hwmod: reconfigure IO Daisychain during hwmod mux
ARM: OMAP3: PM: Remove IO Daisychain control from cpuidle
Will Deacon (1):
ARM: vexpress: remove automatic errata workaround selection
Wolfram Sang (1):
ARM: tegra: build powergate unconditionally
Xiao Jiang (3):
arm/dts: add wdt node for omap3 and omap4
ARM: OMAP: avoid build wdt platform device if with dt support
watchdog: omap_wdt: add device tree support
Zumeng Chen (4):
ARM: OMAP3EVM: Add NAND flash definition
ARM: OMAP3EVM: Adding USB internal LDOs board file
ARM: omap3evm: enable VBUS switch for EHCI tranceiver
ARM: OMAP3530evm: set pendown_state and debounce time for ads7846
hdoyu at nvidia.com (5):
amba: tegra-ahb: Remove empty *_remove()
ARM: dt: tegra{20,30}.dtsi: Rename "mc" to "memory-controller"
ARM: tegra{20,30}: Rename "mc" to "memory-controller"
ARM: dt: tegra20: Rename "emc" to "memory-controller"
ARM: tegra20: Rename "emc" to "memory-controller"
.../devicetree/bindings/arm/armada-370-xp-mpic.txt | 23 +
.../bindings/arm/armada-370-xp-timer.txt | 11 +
.../devicetree/bindings/arm/armada-370-xp.txt | 24 +
.../devicetree/bindings/arm/atmel-aic.txt | 9 +-
.../devicetree/bindings/arm/davinci/cp-intc.txt | 27 +
.../bindings/arm/mvebu-system-controller.txt | 17 +
Documentation/devicetree/bindings/arm/olimex.txt | 6 +
.../devicetree/bindings/arm/omap/omap.txt | 6 +
.../devicetree/bindings/arm/tegra/emc.txt | 100 --
.../bindings/arm/tegra/nvidia,tegra20-emc.txt | 100 ++
.../bindings/arm/tegra/nvidia,tegra20-mc.txt | 2 +-
.../bindings/arm/tegra/nvidia,tegra30-mc.txt | 2 +-
Documentation/devicetree/bindings/fb/mxsfb.txt | 19 +
.../devicetree/bindings/gpio/fsl-imx-gpio.txt | 14 +-
.../devicetree/bindings/gpio/gpio-mxs.txt | 5 +-
.../devicetree/bindings/gpio/gpio-nmk.txt | 2 +-
.../devicetree/bindings/gpio/gpio_nvidia.txt | 40 -
.../bindings/gpio/nvidia,tegra20-gpio.txt | 40 +
.../bindings/input/nvidia,tegra20-kbc.txt | 23 +
.../devicetree/bindings/input/tegra-kbc.txt | 23 -
.../bindings/mmc/nvidia,tegra20-sdhci.txt | 27 +
.../devicetree/bindings/mmc/nvidia-sdhci.txt | 27 -
.../devicetree/bindings/nvec/nvec_nvidia.txt | 9 -
.../devicetree/bindings/nvec/nvidia,nvec.txt | 9 +
Documentation/devicetree/bindings/rtc/dw-apb.txt | 25 +
.../devicetree/bindings/rtc/stmp3xxx-rtc.txt | 16 +
.../bindings/sound/nvidia,tegra-audio-alc5632.txt | 59 +
.../sound/nvidia,tegra-audio-trimslice.txt | 14 +
.../bindings/sound/nvidia,tegra-audio-wm8753.txt | 54 +
.../bindings/sound/nvidia,tegra-audio-wm8903.txt | 71 ++
.../bindings/sound/nvidia,tegra20-das.txt | 12 +
.../bindings/sound/nvidia,tegra20-i2s.txt | 17 +
.../bindings/sound/tegra-audio-alc5632.txt | 59 -
.../bindings/sound/tegra-audio-trimslice.txt | 14 -
.../bindings/sound/tegra-audio-wm8753.txt | 54 -
.../bindings/sound/tegra-audio-wm8903.txt | 71 --
.../devicetree/bindings/sound/tegra20-das.txt | 12 -
.../devicetree/bindings/sound/tegra20-i2s.txt | 17 -
.../devicetree/bindings/spi/nvidia,tegra20-spi.txt | 5 +
.../devicetree/bindings/spi/spi-samsung.txt | 116 ++
.../devicetree/bindings/spi/spi_nvidia.txt | 5 -
.../bindings/tty/serial/fsl-mxs-auart.txt | 27 +
.../bindings/usb/nvidia,tegra20-ehci.txt | 29 +
.../devicetree/bindings/usb/tegra-usb.txt | 29 -
.../devicetree/bindings/watchdog/omap-wdt.txt | 14 +
MAINTAINERS | 18 +
arch/arm/Kconfig | 51 +-
arch/arm/Kconfig.debug | 26 +
arch/arm/Makefile | 2 +
arch/arm/boot/dts/aks-cdu.dts | 113 ++
arch/arm/boot/dts/am335x-bone.dts | 20 +
arch/arm/boot/dts/am335x-evm.dts | 20 +
arch/arm/boot/dts/am33xx.dtsi | 158 +++
arch/arm/boot/dts/am3517-evm.dts | 32 +
arch/arm/boot/dts/armada-370-db.dts | 42 +
arch/arm/boot/dts/armada-370-xp.dtsi | 68 ++
arch/arm/boot/dts/armada-370.dtsi | 35 +
arch/arm/boot/dts/armada-xp-db.dts | 50 +
arch/arm/boot/dts/armada-xp.dtsi | 55 +
arch/arm/boot/dts/at91sam9260.dtsi | 37 +-
arch/arm/boot/dts/at91sam9263.dtsi | 31 +-
arch/arm/boot/dts/at91sam9g45.dtsi | 39 +-
arch/arm/boot/dts/at91sam9n12.dtsi | 30 +-
arch/arm/boot/dts/at91sam9x5.dtsi | 39 +-
arch/arm/boot/dts/db8500.dtsi | 77 +-
arch/arm/boot/dts/ea3250.dts | 174 +++
arch/arm/boot/dts/evk-pro3.dts | 41 +
arch/arm/boot/dts/exynos4210-origen.dts | 12 +
arch/arm/boot/dts/exynos4210-smdkv310.dts | 38 +
arch/arm/boot/dts/exynos4210.dtsi | 47 +
arch/arm/boot/dts/exynos5250-smdk5250.dts | 38 +
arch/arm/boot/dts/exynos5250.dtsi | 36 +
arch/arm/boot/dts/ge863-pro3.dtsi | 52 +
arch/arm/boot/dts/imx23-evk.dts | 66 +-
arch/arm/boot/dts/imx23-olinuxino.dts | 44 +
arch/arm/boot/dts/imx23-stmp378x_devb.dts | 78 ++
arch/arm/boot/dts/imx23.dtsi | 169 ++-
arch/arm/boot/dts/imx27-3ds.dts | 41 +
arch/arm/boot/dts/imx27.dtsi | 12 +-
arch/arm/boot/dts/imx28-apx4devkit.dts | 198 ++++
arch/arm/boot/dts/imx28-cfa10036.dts | 52 +
arch/arm/boot/dts/imx28-evk.dts | 164 +++
arch/arm/boot/dts/imx28-m28evk.dts | 210 ++++
arch/arm/boot/dts/imx28-tx28.dts | 97 ++
arch/arm/boot/dts/imx28.dtsi | 353 +++++-
arch/arm/boot/dts/imx31-bug.dts | 31 +
arch/arm/boot/dts/imx31.dtsi | 88 ++
arch/arm/boot/dts/imx51.dtsi | 8 +-
arch/arm/boot/dts/imx53.dtsi | 14 +-
arch/arm/boot/dts/imx6q-arm2.dts | 6 +
arch/arm/boot/dts/imx6q-sabrelite.dts | 33 +
arch/arm/boot/dts/imx6q.dtsi | 99 +-
arch/arm/boot/dts/lpc32xx.dtsi | 79 +-
arch/arm/boot/dts/omap2420-h4.dts | 20 +
arch/arm/boot/dts/omap3-beagle.dts | 4 +-
arch/arm/boot/dts/omap3-evm.dts | 28 +
arch/arm/boot/dts/omap3.dtsi | 5 +
arch/arm/boot/dts/omap4-panda.dts | 43 +-
arch/arm/boot/dts/omap4-pandaES.dts | 24 +
arch/arm/boot/dts/omap4-sdp.dts | 72 +-
arch/arm/boot/dts/omap4-var_som.dts | 96 ++
arch/arm/boot/dts/omap4.dtsi | 23 +
arch/arm/boot/dts/omap5-evm.dts | 20 +
arch/arm/boot/dts/omap5.dtsi | 184 ++++
arch/arm/boot/dts/phy3250.dts | 61 +
arch/arm/boot/dts/snowball.dts | 21 +-
arch/arm/boot/dts/socfpga.dtsi | 147 +++
arch/arm/boot/dts/socfpga_cyclone5.dts | 34 +
arch/arm/boot/dts/tegra-cardhu.dts | 172 ---
arch/arm/boot/dts/tegra-harmony.dts | 337 ------
arch/arm/boot/dts/tegra-paz00.dts | 348 ------
arch/arm/boot/dts/tegra-seaboard.dts | 445 --------
arch/arm/boot/dts/tegra-trimslice.dts | 306 -----
arch/arm/boot/dts/tegra-ventana.dts | 344 ------
arch/arm/boot/dts/tegra20-harmony.dts | 336 ++++++
arch/arm/boot/dts/tegra20-paz00.dts | 347 ++++++
arch/arm/boot/dts/tegra20-seaboard.dts | 497 +++++++++
arch/arm/boot/dts/tegra20-trimslice.dts | 306 +++++
arch/arm/boot/dts/tegra20-ventana.dts | 343 ++++++
arch/arm/boot/dts/tegra20-whistler.dts | 301 +++++
arch/arm/boot/dts/tegra20.dtsi | 40 +-
arch/arm/boot/dts/tegra30-cardhu.dts | 171 +++
arch/arm/boot/dts/tegra30.dtsi | 40 +-
arch/arm/boot/dts/vexpress-v2m-rs1.dtsi | 11 +
arch/arm/boot/dts/vexpress-v2m.dtsi | 11 +
arch/arm/boot/dts/vexpress-v2p-ca15-tc1.dts | 36 +-
arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts | 188 ++++
arch/arm/configs/exynos_defconfig | 92 ++
arch/arm/configs/imx_v4_v5_defconfig | 51 +-
arch/arm/configs/imx_v6_v7_defconfig | 61 +-
arch/arm/configs/lpc32xx_defconfig | 26 +-
arch/arm/configs/mvebu_defconfig | 46 +
arch/arm/configs/mxs_defconfig | 7 +
arch/arm/configs/omap2plus_defconfig | 2 +
arch/arm/configs/socfpga_defconfig | 83 ++
arch/arm/configs/tegra_defconfig | 13 +-
arch/arm/include/asm/mach/irq.h | 2 +-
arch/arm/kernel/fiq.c | 9 +-
arch/arm/kernel/irq.c | 10 -
arch/arm/mach-at91/Kconfig | 6 +
arch/arm/mach-at91/Makefile.boot | 2 +
arch/arm/mach-at91/at91rm9200.c | 1 +
arch/arm/mach-at91/at91rm9200_devices.c | 84 +-
arch/arm/mach-at91/at91sam9260.c | 1 +
arch/arm/mach-at91/at91sam9260_devices.c | 92 +-
arch/arm/mach-at91/at91sam9261.c | 1 +
arch/arm/mach-at91/at91sam9261_devices.c | 68 +-
arch/arm/mach-at91/at91sam9263.c | 1 +
arch/arm/mach-at91/at91sam9263_devices.c | 80 +-
arch/arm/mach-at91/at91sam926x_time.c | 2 +-
arch/arm/mach-at91/at91sam9g45.c | 1 +
arch/arm/mach-at91/at91sam9g45_devices.c | 108 +-
arch/arm/mach-at91/at91sam9rl.c | 1 +
arch/arm/mach-at91/at91sam9rl_devices.c | 76 +-
arch/arm/mach-at91/at91sam9x5.c | 40 -
arch/arm/mach-at91/at91x40.c | 2 +
arch/arm/mach-at91/board-1arm.c | 2 +
arch/arm/mach-at91/board-afeb-9260v1.c | 2 +
arch/arm/mach-at91/board-cam60.c | 2 +
arch/arm/mach-at91/board-carmeva.c | 2 +
arch/arm/mach-at91/board-cpu9krea.c | 2 +
arch/arm/mach-at91/board-cpuat91.c | 2 +
arch/arm/mach-at91/board-csb337.c | 2 +
arch/arm/mach-at91/board-csb637.c | 2 +
arch/arm/mach-at91/board-dt.c | 2 +
arch/arm/mach-at91/board-eb01.c | 2 +
arch/arm/mach-at91/board-eb9200.c | 2 +
arch/arm/mach-at91/board-ecbat91.c | 2 +
arch/arm/mach-at91/board-eco920.c | 2 +
arch/arm/mach-at91/board-flexibity.c | 2 +
arch/arm/mach-at91/board-foxg20.c | 2 +
arch/arm/mach-at91/board-gsia18s.c | 2 +
arch/arm/mach-at91/board-kafa.c | 2 +
arch/arm/mach-at91/board-kb9202.c | 2 +
arch/arm/mach-at91/board-neocore926.c | 2 +
arch/arm/mach-at91/board-pcontrol-g20.c | 2 +
arch/arm/mach-at91/board-picotux200.c | 2 +
arch/arm/mach-at91/board-qil-a9260.c | 2 +
arch/arm/mach-at91/board-rm9200dk.c | 2 +
arch/arm/mach-at91/board-rm9200ek.c | 2 +
arch/arm/mach-at91/board-rsi-ews.c | 2 +
arch/arm/mach-at91/board-sam9-l9260.c | 2 +
arch/arm/mach-at91/board-sam9260ek.c | 2 +
arch/arm/mach-at91/board-sam9261ek.c | 2 +
arch/arm/mach-at91/board-sam9263ek.c | 2 +
arch/arm/mach-at91/board-sam9g20ek.c | 3 +
arch/arm/mach-at91/board-sam9m10g45ek.c | 2 +
arch/arm/mach-at91/board-sam9rlek.c | 2 +
arch/arm/mach-at91/board-snapper9260.c | 2 +
arch/arm/mach-at91/board-stamp9g20.c | 3 +
arch/arm/mach-at91/board-usb-a926x.c | 4 +
arch/arm/mach-at91/board-yl-9200.c | 2 +
arch/arm/mach-at91/generic.h | 2 +
arch/arm/mach-at91/gpio.c | 9 +-
arch/arm/mach-at91/include/mach/at91_aic.h | 36 +-
arch/arm/mach-at91/include/mach/at91_spi.h | 81 --
arch/arm/mach-at91/include/mach/at91_ssc.h | 106 --
arch/arm/mach-at91/include/mach/entry-macro.S | 27 -
arch/arm/mach-at91/include/mach/irqs.h | 48 -
arch/arm/mach-at91/irq.c | 414 ++++++-
arch/arm/mach-at91/pm.c | 1 +
arch/arm/mach-clps711x/common.c | 6 -
arch/arm/mach-clps711x/include/mach/memory.h | 37 -
arch/arm/mach-clps711x/p720t.c | 34 +-
arch/arm/mach-davinci/Kconfig | 1 +
arch/arm/mach-davinci/Makefile | 1 +
arch/arm/mach-davinci/cp_intc.c | 75 +-
arch/arm/mach-davinci/include/mach/cp_intc.h | 1 +
arch/arm/mach-davinci/include/mach/dm365.h | 1 -
arch/arm/mach-davinci/include/mach/dm646x.h | 1 -
arch/arm/mach-davinci/include/mach/entry-macro.S | 8 +-
arch/arm/mach-davinci/pm_domain.c | 64 ++
arch/arm/mach-ep93xx/core.c | 96 ++
arch/arm/mach-ep93xx/edb93xx.c | 28 +-
arch/arm/mach-ep93xx/include/mach/platform.h | 3 +
arch/arm/mach-ep93xx/soc.h | 1 +
arch/arm/mach-exynos/Kconfig | 7 +
arch/arm/mach-exynos/clock-exynos4.c | 67 +-
arch/arm/mach-exynos/clock-exynos5.c | 95 ++
arch/arm/mach-exynos/common.c | 28 +-
arch/arm/mach-exynos/include/mach/irqs.h | 4 +
arch/arm/mach-exynos/include/mach/map.h | 3 +
arch/arm/mach-exynos/include/mach/regs-pmu.h | 5 +
arch/arm/mach-exynos/include/mach/regs-usb-phy.h | 20 +-
arch/arm/mach-exynos/include/mach/spi-clocks.h | 16 -
arch/arm/mach-exynos/mach-exynos4-dt.c | 6 +
arch/arm/mach-exynos/mach-exynos5-dt.c | 6 +
arch/arm/mach-exynos/mach-nuri.c | 4 +-
arch/arm/mach-exynos/mach-origen.c | 40 +-
arch/arm/mach-exynos/mach-smdk4x12.c | 83 +-
arch/arm/mach-exynos/mach-smdkv310.c | 18 +-
arch/arm/mach-exynos/mach-universal_c210.c | 4 +-
arch/arm/mach-exynos/pmu.c | 18 +-
arch/arm/mach-exynos/setup-spi.c | 33 +-
arch/arm/mach-exynos/setup-usb-phy.c | 60 +-
arch/arm/mach-imx/Kconfig | 21 +-
arch/arm/mach-imx/Makefile | 1 +
arch/arm/mach-imx/clk-imx27.c | 4 +-
arch/arm/mach-imx/clk-imx31.c | 23 +-
arch/arm/mach-imx/clk-imx51-imx53.c | 25 +-
arch/arm/mach-imx/clk-imx6q.c | 25 +-
arch/arm/mach-imx/devices-imx21.h | 4 +-
arch/arm/mach-imx/devices-imx25.h | 4 +-
arch/arm/mach-imx/devices-imx27.h | 6 +-
arch/arm/mach-imx/devices-imx31.h | 10 +-
arch/arm/mach-imx/devices-imx35.h | 12 +-
arch/arm/mach-imx/devices-imx51.h | 2 +-
arch/arm/mach-imx/devices-imx53.h | 2 +-
arch/arm/mach-imx/ehci-imx25.c | 24 +-
arch/arm/mach-imx/ehci-imx35.c | 24 +-
arch/arm/mach-imx/ehci-imx5.c | 31 +-
arch/arm/mach-imx/eukrea_mbimx27-baseboard.c | 3 +-
arch/arm/mach-imx/eukrea_mbimxsd35-baseboard.c | 6 +-
arch/arm/mach-imx/imx27-dt.c | 30 +-
arch/arm/mach-imx/imx31-dt.c | 63 ++
arch/arm/mach-imx/imx51-dt.c | 27 -
arch/arm/mach-imx/imx53-dt.c | 28 +-
arch/arm/mach-imx/mach-apf9328.c | 7 +-
arch/arm/mach-imx/mach-armadillo5x0.c | 18 +-
arch/arm/mach-imx/mach-cpuimx27.c | 24 +-
arch/arm/mach-imx/mach-cpuimx35.c | 13 +-
arch/arm/mach-imx/mach-cpuimx51sd.c | 13 +-
arch/arm/mach-imx/mach-eukrea_cpuimx25.c | 12 +-
arch/arm/mach-imx/mach-imx27_visstrim_m10.c | 9 +-
arch/arm/mach-imx/mach-imx27ipcam.c | 2 +-
arch/arm/mach-imx/mach-imx6q.c | 74 +-
arch/arm/mach-imx/mach-kzm_arm11_01.c | 20 +-
arch/arm/mach-imx/mach-mx1ads.c | 1 -
arch/arm/mach-imx/mach-mx21ads.c | 16 +-
arch/arm/mach-imx/mach-mx25_3ds.c | 4 +-
arch/arm/mach-imx/mach-mx27_3ds.c | 17 +-
arch/arm/mach-imx/mach-mx27ads.c | 14 +-
arch/arm/mach-imx/mach-mx31_3ds.c | 28 +-
arch/arm/mach-imx/mach-mx31ads.c | 63 +-
arch/arm/mach-imx/mach-mx31lilly.c | 10 +-
arch/arm/mach-imx/mach-mx31lite.c | 11 +-
arch/arm/mach-imx/mach-mx31moboard.c | 12 +-
arch/arm/mach-imx/mach-mx35_3ds.c | 29 +-
arch/arm/mach-imx/mach-mx51_3ds.c | 5 +-
arch/arm/mach-imx/mach-mx51_babbage.c | 10 +-
arch/arm/mach-imx/mach-mx53_ard.c | 8 +-
arch/arm/mach-imx/mach-mx53_evk.c | 3 +-
arch/arm/mach-imx/mach-mx53_loco.c | 3 +-
arch/arm/mach-imx/mach-mx53_smd.c | 3 +-
arch/arm/mach-imx/mach-mxt_td60.c | 6 +-
arch/arm/mach-imx/mach-pca100.c | 17 +-
arch/arm/mach-imx/mach-pcm037.c | 36 +-
arch/arm/mach-imx/mach-pcm038.c | 8 +-
arch/arm/mach-imx/mach-pcm043.c | 16 +-
arch/arm/mach-imx/mach-qong.c | 12 +-
arch/arm/mach-imx/mach-scb9328.c | 7 +-
arch/arm/mach-imx/mach-vpr200.c | 12 +-
arch/arm/mach-imx/mm-imx1.c | 1 -
arch/arm/mach-imx/mm-imx21.c | 1 -
arch/arm/mach-imx/mm-imx25.c | 1 -
arch/arm/mach-imx/mm-imx27.c | 1 -
arch/arm/mach-imx/mm-imx3.c | 1 -
arch/arm/mach-imx/mm-imx5.c | 26 +-
arch/arm/mach-imx/mx31lilly-db.c | 11 +-
arch/arm/mach-imx/mx31lite-db.c | 9 +-
arch/arm/mach-imx/mx51_efika.c | 3 +-
arch/arm/mach-imx/pcm970-baseboard.c | 13 +-
arch/arm/mach-imx/pm-imx5.c | 111 +-
arch/arm/mach-lpc32xx/Kconfig | 32 -
arch/arm/mach-lpc32xx/Makefile.boot | 1 +
arch/arm/mach-lpc32xx/clock.c | 123 ++-
arch/arm/mach-lpc32xx/common.c | 10 +-
arch/arm/mach-lpc32xx/include/mach/gpio.h | 2 -
arch/arm/mach-lpc32xx/include/mach/platform.h | 14 +
arch/arm/mach-lpc32xx/phy3250.c | 163 +--
arch/arm/mach-lpc32xx/serial.c | 90 +-
arch/arm/mach-mvebu/Kconfig | 16 +
arch/arm/mach-mvebu/Makefile | 2 +
arch/arm/mach-mvebu/Makefile.boot | 3 +
arch/arm/mach-mvebu/armada-370-xp.c | 63 ++
arch/arm/mach-mvebu/common.h | 23 +
arch/arm/mach-mvebu/include/mach/armada-370-xp.h | 22 +
arch/arm/mach-mvebu/include/mach/debug-macro.S | 24 +
arch/arm/mach-mvebu/include/mach/timex.h | 13 +
arch/arm/mach-mvebu/include/mach/uncompress.h | 43 +
arch/arm/mach-mvebu/irq-armada-370-xp.c | 133 +++
arch/arm/mach-mvebu/system-controller.c | 105 ++
arch/arm/mach-mxs/Kconfig | 1 +
arch/arm/mach-mxs/Makefile.boot | 9 +
arch/arm/mach-mxs/devices-mx23.h | 2 +-
arch/arm/mach-mxs/devices-mx28.h | 2 +-
arch/arm/mach-mxs/devices/platform-mxsfb.c | 2 +-
arch/arm/mach-mxs/include/mach/mxsfb.h | 49 -
arch/arm/mach-mxs/mach-mxs.c | 215 +++-
arch/arm/mach-mxs/module-tx28.c | 2 +-
arch/arm/mach-nomadik/Makefile | 2 -
arch/arm/mach-nomadik/board-nhk8815.c | 67 +-
arch/arm/mach-nomadik/clock.c | 75 --
arch/arm/mach-nomadik/clock.h | 15 -
arch/arm/mach-nomadik/cpu-8815.c | 126 +--
arch/arm/mach-nomadik/i2c-8815nhk.c | 38 +-
arch/arm/mach-nomadik/include/mach/irqs.h | 85 +-
arch/arm/mach-omap1/board-ams-delta.c | 2 +-
arch/arm/mach-omap1/board-generic.c | 4 +-
arch/arm/mach-omap1/board-h2.c | 2 +-
arch/arm/mach-omap1/board-h3.c | 2 +-
arch/arm/mach-omap1/board-htcherald.c | 2 +-
arch/arm/mach-omap1/board-innovator.c | 2 +-
arch/arm/mach-omap1/board-nokia770.c | 2 +-
arch/arm/mach-omap1/board-osk.c | 2 +-
arch/arm/mach-omap1/board-palmte.c | 2 +-
arch/arm/mach-omap1/board-palmtt.c | 2 +-
arch/arm/mach-omap1/board-palmz71.c | 2 +-
arch/arm/mach-omap1/board-sx1.c | 2 +-
arch/arm/mach-omap1/board-voiceblue.c | 3 +-
arch/arm/mach-omap1/clock_data.c | 3 +-
arch/arm/mach-omap1/include/mach/usb.h | 165 +++
arch/arm/mach-omap1/timer.c | 3 +-
arch/arm/mach-omap1/usb.c | 116 +-
arch/arm/mach-omap2/Kconfig | 25 +-
arch/arm/mach-omap2/Makefile | 59 +-
arch/arm/mach-omap2/am35xx-emac.c | 90 +-
arch/arm/mach-omap2/board-2430sdp.c | 14 -
arch/arm/mach-omap2/board-4430sdp.c | 3 +
arch/arm/mach-omap2/board-apollon.c | 18 -
arch/arm/mach-omap2/board-cm-t35.c | 89 ++
arch/arm/mach-omap2/board-generic.c | 58 +-
arch/arm/mach-omap2/board-h4.c | 13 -
arch/arm/mach-omap2/board-omap3beagle.c | 2 +-
arch/arm/mach-omap2/board-omap3evm.c | 78 +-
arch/arm/mach-omap2/board-omap3logic.c | 3 -
arch/arm/mach-omap2/board-omap4panda.c | 3 +
arch/arm/mach-omap2/clock.c | 18 -
arch/arm/mach-omap2/clock.h | 14 +
arch/arm/mach-omap2/clock2420_data.c | 43 +-
arch/arm/mach-omap2/clock2430_data.c | 49 +-
arch/arm/mach-omap2/clock33xx_data.c | 1105 +++++++++++++++++++
arch/arm/mach-omap2/clock3xxx_data.c | 86 +-
arch/arm/mach-omap2/clock44xx_data.c | 128 +--
arch/arm/mach-omap2/clock_common_data.c | 77 ++
arch/arm/mach-omap2/clockdomain.h | 4 +-
arch/arm/mach-omap2/clockdomain33xx.c | 74 ++
arch/arm/mach-omap2/clockdomain44xx.c | 10 +-
arch/arm/mach-omap2/clockdomains2420_data.c | 2 -
arch/arm/mach-omap2/clockdomains2430_data.c | 2 -
arch/arm/mach-omap2/clockdomains33xx_data.c | 196 ++++
arch/arm/mach-omap2/clockdomains3xxx_data.c | 158 ++-
arch/arm/mach-omap2/clockdomains44xx_data.c | 2 -
arch/arm/mach-omap2/clockdomains_common_data.c | 24 -
arch/arm/mach-omap2/cm-regbits-33xx.h | 687 ++++++++++++
arch/arm/mach-omap2/cm-regbits-34xx.h | 4 +-
arch/arm/mach-omap2/cm33xx.c | 313 ++++++
arch/arm/mach-omap2/cm33xx.h | 420 +++++++
arch/arm/mach-omap2/cminst44xx.c | 14 -
arch/arm/mach-omap2/cminst44xx.h | 25 -
arch/arm/mach-omap2/common-board-devices.c | 33 +-
arch/arm/mach-omap2/common-board-devices.h | 1 +
arch/arm/mach-omap2/common.c | 34 +-
arch/arm/mach-omap2/common.h | 27 +-
arch/arm/mach-omap2/control.c | 43 +
arch/arm/mach-omap2/control.h | 46 +-
arch/arm/mach-omap2/cpuidle34xx.c | 79 +-
arch/arm/mach-omap2/cpuidle44xx.c | 8 -
arch/arm/mach-omap2/devices.c | 112 +-
arch/arm/mach-omap2/dpll3xxx.c | 26 +-
arch/arm/mach-omap2/drm.c | 61 +
arch/arm/mach-omap2/dsp.c | 4 +
arch/arm/mach-omap2/gpmc.c | 3 +-
arch/arm/mach-omap2/hdq1w.c | 26 +
arch/arm/mach-omap2/id.c | 46 +-
arch/arm/mach-omap2/include/mach/am35xx.h | 2 +
.../include/mach/ctrl_module_core_44xx.h | 1 +
arch/arm/mach-omap2/include/mach/debug-macro.S | 25 +-
arch/arm/mach-omap2/include/mach/omap-wakeupgen.h | 7 +
arch/arm/mach-omap2/io.c | 59 +
arch/arm/mach-omap2/iomap.h | 27 +
arch/arm/mach-omap2/irq.c | 23 +-
arch/arm/mach-omap2/mailbox.c | 2 -
arch/arm/mach-omap2/msdi.c | 73 ++
arch/arm/mach-omap2/omap-headsmp.S | 21 +
arch/arm/mach-omap2/omap-hotplug.c | 24 +-
arch/arm/mach-omap2/omap-iommu.c | 6 +-
arch/arm/mach-omap2/omap-mpuss-lowpower.c | 4 +-
arch/arm/mach-omap2/omap-smp.c | 52 +-
arch/arm/mach-omap2/omap-wakeupgen.c | 114 +-
arch/arm/mach-omap2/omap4-common.c | 14 +
arch/arm/mach-omap2/omap4-sar-layout.h | 12 +-
arch/arm/mach-omap2/omap_hwmod.c | 541 ++++++---
arch/arm/mach-omap2/omap_hwmod_2420_data.c | 10 +
arch/arm/mach-omap2/omap_hwmod_2430_data.c | 16 +
arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c | 8 -
arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 188 +++-
arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 13 +-
arch/arm/mach-omap2/omap_hwmod_common_data.c | 10 +
arch/arm/mach-omap2/omap_l3_noc.h | 22 +-
arch/arm/mach-omap2/opp.c | 3 +-
arch/arm/mach-omap2/pm.h | 19 +-
arch/arm/mach-omap2/pm34xx.c | 78 +-
arch/arm/mach-omap2/powerdomain.c | 22 +-
arch/arm/mach-omap2/powerdomain.h | 27 +-
arch/arm/mach-omap2/powerdomain33xx.c | 229 ++++
arch/arm/mach-omap2/powerdomains33xx_data.c | 185 ++++
arch/arm/mach-omap2/powerdomains3xxx_data.c | 139 ++-
arch/arm/mach-omap2/prcm-common.h | 14 +-
arch/arm/mach-omap2/prcm.c | 25 +-
arch/arm/mach-omap2/prm-regbits-33xx.h | 357 ++++++
arch/arm/mach-omap2/prm2xxx_3xxx.c | 48 +
arch/arm/mach-omap2/prm2xxx_3xxx.h | 67 +-
arch/arm/mach-omap2/prm33xx.c | 135 +++
arch/arm/mach-omap2/prm33xx.h | 129 +++
arch/arm/mach-omap2/prm44xx.c | 63 +-
arch/arm/mach-omap2/prm44xx.h | 2 +
arch/arm/mach-omap2/prm_common.c | 70 +-
arch/arm/mach-omap2/smartreflex-class3.c | 29 +-
arch/arm/mach-omap2/smartreflex.c | 1165 --------------------
arch/arm/mach-omap2/smartreflex.h | 256 -----
arch/arm/mach-omap2/sr_device.c | 39 +-
arch/arm/mach-omap2/timer.c | 93 +-
arch/arm/mach-omap2/twl-common.c | 11 +-
arch/arm/mach-omap2/usb-fs.c | 359 ------
arch/arm/mach-omap2/voltage.h | 22 +-
arch/arm/mach-omap2/voltagedomains33xx_data.c | 43 +
arch/arm/mach-picoxcell/Makefile | 1 -
arch/arm/mach-picoxcell/common.c | 3 +-
arch/arm/mach-picoxcell/common.h | 2 +-
arch/arm/mach-picoxcell/time.c | 121 --
arch/arm/mach-prima2/include/mach/gpio.h | 13 +
arch/arm/mach-prima2/include/mach/irqs.h | 2 +-
arch/arm/mach-rpc/irq.c | 2 +-
arch/arm/mach-s3c24xx/clock-s3c2416.c | 3 +-
arch/arm/mach-s3c24xx/clock-s3c2443.c | 2 +-
arch/arm/mach-s3c24xx/common-s3c2443.c | 4 +-
arch/arm/mach-s3c24xx/common-smdk.c | 20 +-
arch/arm/mach-s3c24xx/common.c | 1 -
arch/arm/mach-s3c24xx/include/mach/bast-pmu.h | 40 -
arch/arm/mach-s3c24xx/include/mach/gpio-nrs.h | 21 -
arch/arm/mach-s3c24xx/include/mach/gta02.h | 69 --
arch/arm/mach-s3c24xx/include/mach/regs-gpio.h | 17 +-
arch/arm/mach-s3c24xx/include/mach/regs-gpioj.h | 70 --
arch/arm/mach-s3c24xx/mach-gta02.c | 1 -
arch/arm/mach-s3c24xx/mach-mini2440.c | 4 +-
arch/arm/mach-s3c24xx/mach-qt2410.c | 6 +-
arch/arm/mach-s3c24xx/mach-rx1950.c | 1 -
arch/arm/mach-s3c24xx/pm-s3c2410.c | 12 +-
arch/arm/mach-s3c24xx/pm-s3c2412.c | 1 -
arch/arm/mach-s3c24xx/s3c2412.c | 1 -
arch/arm/mach-s3c24xx/s3c244x.c | 1 -
arch/arm/mach-s3c24xx/setup-spi.c | 10 +-
arch/arm/mach-s3c24xx/setup-ts.c | 6 +-
arch/arm/mach-s3c64xx/clock.c | 20 +-
arch/arm/mach-s3c64xx/include/mach/crag6410.h | 4 +-
arch/arm/mach-s3c64xx/include/mach/dma.h | 1 +
arch/arm/mach-s3c64xx/include/mach/spi-clocks.h | 18 -
arch/arm/mach-s3c64xx/mach-crag6410-module.c | 11 +-
arch/arm/mach-s3c64xx/mach-crag6410.c | 71 +-
arch/arm/mach-s3c64xx/mach-smdk6410.c | 1 -
arch/arm/mach-s3c64xx/setup-spi.c | 19 +-
arch/arm/mach-s5p64x0/clock-s5p6440.c | 12 +-
arch/arm/mach-s5p64x0/clock-s5p6450.c | 12 +-
arch/arm/mach-s5p64x0/dma.c | 2 -
arch/arm/mach-s5p64x0/include/mach/spi-clocks.h | 20 -
arch/arm/mach-s5p64x0/setup-spi.c | 21 +-
arch/arm/mach-s5pc100/clock.c | 30 +-
arch/arm/mach-s5pc100/dma.c | 2 -
arch/arm/mach-s5pc100/include/mach/spi-clocks.h | 18 -
arch/arm/mach-s5pc100/setup-spi.c | 30 +-
arch/arm/mach-s5pv210/Kconfig | 2 +
arch/arm/mach-s5pv210/clock.c | 14 +-
arch/arm/mach-s5pv210/include/mach/spi-clocks.h | 17 -
arch/arm/mach-s5pv210/mach-aquila.c | 7 +
arch/arm/mach-s5pv210/mach-goni.c | 11 +-
arch/arm/mach-s5pv210/mach-smdkv210.c | 10 +-
arch/arm/mach-s5pv210/setup-spi.c | 21 +-
arch/arm/mach-socfpga/Makefile | 5 +
arch/arm/mach-socfpga/Makefile.boot | 1 +
arch/arm/mach-socfpga/include/mach/debug-macro.S | 16 +
arch/arm/mach-socfpga/include/mach/timex.h | 19 +
arch/arm/mach-socfpga/include/mach/uncompress.h | 9 +
arch/arm/mach-socfpga/socfpga.c | 62 ++
arch/arm/mach-tegra/Kconfig | 39 -
arch/arm/mach-tegra/Makefile | 18 +-
arch/arm/mach-tegra/Makefile.boot | 13 +-
arch/arm/mach-tegra/apbio.c | 194 +++-
arch/arm/mach-tegra/apbio.h | 19 +-
arch/arm/mach-tegra/board-dt-tegra20.c | 74 +-
arch/arm/mach-tegra/board-dt-tegra30.c | 8 +-
arch/arm/mach-tegra/board-harmony-pcie.c | 15 +-
arch/arm/mach-tegra/board-harmony-power.c | 25 +-
arch/arm/mach-tegra/board-paz00.c | 7 +-
arch/arm/mach-tegra/board-seaboard-pinmux.c | 197 ----
arch/arm/mach-tegra/board-seaboard.c | 306 -----
arch/arm/mach-tegra/board-seaboard.h | 47 -
arch/arm/mach-tegra/board.h | 9 +
arch/arm/mach-tegra/common.c | 3 +
arch/arm/mach-tegra/cpu-tegra.c | 6 +-
arch/arm/mach-tegra/cpuidle.c | 6 +-
arch/arm/mach-tegra/dma.c | 4 +-
arch/arm/mach-tegra/pcie.c | 6 +-
arch/arm/mach-tegra/powergate.c | 4 +-
arch/arm/mach-tegra/sleep.S | 29 -
arch/arm/mach-tegra/tegra2_clocks.c | 58 +-
arch/arm/mach-tegra/tegra30_clocks.c | 28 +-
arch/arm/mach-tegra/timer.c | 4 +-
arch/arm/mach-tegra/usb_phy.c | 16 +-
arch/arm/mach-ux500/Kconfig | 1 +
arch/arm/mach-ux500/board-mop500-sdi.c | 4 +-
arch/arm/mach-ux500/board-mop500.c | 63 +-
arch/arm/mach-ux500/board-mop500.h | 3 +
arch/arm/mach-ux500/cpu-db8500.c | 4 +-
arch/arm/mach-vexpress/Kconfig | 5 +-
arch/arm/mach-vexpress/Makefile.boot | 3 +-
arch/arm/mach-vexpress/ct-ca9x4.c | 64 +-
arch/arm/mach-vexpress/include/mach/clkdev.h | 15 -
arch/arm/mach-vexpress/include/mach/debug-macro.S | 41 +
arch/arm/mach-vexpress/include/mach/motherboard.h | 28 +-
arch/arm/mach-vexpress/include/mach/uncompress.h | 14 +
arch/arm/mach-vexpress/v2m.c | 296 +++--
arch/arm/mach-vt8500/Makefile | 2 +-
arch/arm/mach-vt8500/bv07.c | 3 +
arch/arm/mach-vt8500/include/mach/restart.h | 17 +
arch/arm/mach-vt8500/include/mach/system.h | 13 -
arch/arm/mach-vt8500/restart.c | 54 +
arch/arm/mach-vt8500/wm8505_7in.c | 4 +-
arch/arm/plat-mxc/3ds_debugboard.c | 50 +-
arch/arm/plat-mxc/Makefile | 1 +
arch/arm/plat-mxc/avic.c | 35 +-
arch/arm/plat-mxc/cpuidle.c | 80 ++
arch/arm/plat-mxc/devices/platform-ipu-core.c | 5 +-
arch/arm/plat-mxc/devices/platform-mxc_rtc.c | 5 +
arch/arm/plat-mxc/devices/platform-spi_imx.c | 2 +-
arch/arm/plat-mxc/include/mach/3ds_debugboard.h | 2 +-
arch/arm/plat-mxc/include/mach/common.h | 7 +-
arch/arm/plat-mxc/include/mach/cpuidle.h | 22 +
arch/arm/plat-mxc/include/mach/devices-common.h | 4 +-
arch/arm/plat-mxc/include/mach/hardware.h | 27 +-
arch/arm/plat-mxc/include/mach/iomux-mx3.h | 3 -
arch/arm/plat-mxc/include/mach/iomux-mx51.h | 14 +
arch/arm/plat-mxc/include/mach/iomux-v1.h | 7 -
arch/arm/plat-mxc/include/mach/ipu.h | 4 -
arch/arm/plat-mxc/include/mach/irqs.h | 44 -
arch/arm/plat-mxc/include/mach/mx1.h | 111 +-
arch/arm/plat-mxc/include/mach/mx21.h | 107 +-
arch/arm/plat-mxc/include/mach/mx25.h | 72 +-
arch/arm/plat-mxc/include/mach/mx27.h | 127 +--
arch/arm/plat-mxc/include/mach/mx2x.h | 87 +-
arch/arm/plat-mxc/include/mach/mx31.h | 118 +-
arch/arm/plat-mxc/include/mach/mx35.h | 109 +-
arch/arm/plat-mxc/include/mach/mx3x.h | 77 +-
arch/arm/plat-mxc/include/mach/mx50.h | 187 ++--
arch/arm/plat-mxc/include/mach/mx51.h | 209 ++--
arch/arm/plat-mxc/include/mach/mx53.h | 217 ++--
arch/arm/plat-mxc/include/mach/mxc_ehci.h | 16 +-
arch/arm/plat-mxc/time.c | 3 +-
arch/arm/plat-mxc/tzic.c | 34 +-
arch/arm/plat-omap/Kconfig | 35 +-
arch/arm/plat-omap/Makefile | 6 +-
arch/arm/plat-omap/common.c | 9 +
arch/arm/plat-omap/counter_32k.c | 16 +-
arch/arm/plat-omap/dma.c | 59 +-
arch/arm/plat-omap/dmtimer.c | 164 ++-
arch/arm/plat-omap/include/plat/board.h | 38 -
arch/arm/plat-omap/include/plat/clkdev_omap.h | 1 +
arch/arm/plat-omap/include/plat/clock.h | 2 -
arch/arm/plat-omap/include/plat/cpu.h | 59 +-
arch/arm/plat-omap/include/plat/dmtimer.h | 22 +-
arch/arm/plat-omap/include/plat/dsp.h | 3 +
arch/arm/plat-omap/include/plat/hardware.h | 1 +
arch/arm/plat-omap/include/plat/multi.h | 9 +
arch/arm/plat-omap/include/plat/mux.h | 2 +-
arch/arm/plat-omap/include/plat/omap-secure.h | 5 -
arch/arm/plat-omap/include/plat/omap54xx.h | 32 +
arch/arm/plat-omap/include/plat/omap730.h | 102 --
arch/arm/plat-omap/include/plat/omap850.h | 102 --
arch/arm/plat-omap/include/plat/omap_hwmod.h | 21 +
arch/arm/plat-omap/include/plat/sdrc.h | 2 +-
arch/arm/plat-omap/include/plat/serial.h | 14 +
arch/arm/plat-omap/include/plat/uncompress.h | 12 +
arch/arm/plat-omap/include/plat/usb.h | 196 +---
arch/arm/plat-omap/include/plat/voltage.h | 21 +-
arch/arm/plat-omap/mailbox.c | 13 +-
arch/arm/plat-omap/sram.c | 17 +-
arch/arm/plat-omap/usb.c | 145 ---
arch/arm/plat-s3c24xx/irq.c | 2 +-
arch/arm/plat-samsung/Kconfig | 12 +-
arch/arm/plat-samsung/Makefile | 8 +-
arch/arm/plat-samsung/devs.c | 60 +-
arch/arm/plat-samsung/dma-ops.c | 76 +-
arch/arm/plat-samsung/include/plat/cpu.h | 4 +
arch/arm/plat-samsung/include/plat/devs.h | 1 -
arch/arm/plat-samsung/include/plat/dma-ops.h | 20 +-
arch/arm/plat-samsung/include/plat/fb.h | 1 -
arch/arm/plat-samsung/include/plat/pd.h | 30 -
arch/arm/plat-samsung/include/plat/s3c64xx-spi.h | 39 +-
arch/arm/plat-samsung/pd.c | 95 --
arch/arm/plat-samsung/pwm.c | 4 -
arch/arm/plat-samsung/s3c-dma-ops.c | 39 +-
arch/arm/plat-versatile/Kconfig | 3 +
arch/arm/plat-versatile/Makefile | 2 +-
drivers/amba/tegra-ahb.c | 6 -
drivers/clk/Makefile | 2 +
drivers/clk/clk-nomadik.c | 47 +
drivers/clk/socfpga/Makefile | 1 +
drivers/clk/socfpga/clk.c | 51 +
drivers/clocksource/Kconfig | 6 +
drivers/clocksource/Makefile | 4 +-
drivers/clocksource/dw_apb_timer_of.c | 131 +++
drivers/clocksource/time-armada-370-xp.c | 226 ++++
drivers/crypto/tegra-aes.c | 12 +-
drivers/dma/ipu/ipu_idmac.c | 8 +-
drivers/dma/ipu/ipu_irq.c | 14 +-
drivers/gpio/gpio-mxc.c | 56 +-
drivers/i2c/busses/i2c-imx.c | 1 -
drivers/i2c/busses/i2c-nomadik.c | 3 +-
drivers/i2c/busses/i2c-tegra.c | 10 +-
drivers/input/keyboard/tegra-kbc.c | 4 +-
drivers/media/video/mx1_camera.c | 1 +
drivers/mmc/host/sdhci-tegra.c | 11 +-
drivers/pinctrl/pinctrl-nomadik.c | 2 +-
drivers/pinctrl/pinctrl-sirf.c | 489 +++++++-
drivers/power/Kconfig | 2 +
drivers/power/Makefile | 1 +
drivers/power/avs/Kconfig | 12 +
drivers/power/avs/Makefile | 1 +
drivers/power/avs/smartreflex.c | 1126 +++++++++++++++++++
drivers/rtc/rtc-at91rm9200.c | 1 +
drivers/rtc/rtc-stmp3xxx.c | 8 +
drivers/spi/spi-s3c64xx.c | 542 +++++++--
drivers/spi/spi-tegra.c | 4 +-
drivers/staging/nvec/nvec.c | 8 +-
drivers/staging/omapdrm/omap_drv.h | 2 +-
drivers/staging/omapdrm/omap_priv.h | 55 -
drivers/tty/serial/imx.c | 6 +-
drivers/tty/serial/mxs-auart.c | 42 +-
drivers/usb/gadget/Kconfig | 2 +-
drivers/usb/gadget/omap_udc.c | 3 +-
drivers/usb/host/Kconfig | 2 +-
drivers/usb/host/ehci-tegra.c | 20 +-
drivers/usb/host/ohci-omap.c | 7 +-
drivers/usb/otg/isp1301_omap.c | 2 +-
drivers/video/mxsfb.c | 62 +-
drivers/w1/masters/Kconfig | 2 +-
drivers/w1/masters/omap_hdq.c | 86 +-
drivers/watchdog/omap_wdt.c | 7 +
include/linux/dw_apb_timer.h | 1 +
include/linux/i2c/twl.h | 1 -
include/linux/mxsfb.h | 49 +
include/linux/platform_data/clk-nomadik.h | 2 +
include/linux/platform_data/omap_drm.h | 52 +
include/linux/power/smartreflex.h | 308 ++++++
include/linux/time-armada-370-xp.h | 18 +
sound/soc/fsl/imx-pcm-fiq.c | 1 +
sound/soc/samsung/dma.c | 18 +-
sound/soc/tegra/Kconfig | 10 +-
sound/soc/tegra/tegra20_i2s.c | 4 +-
sound/soc/tegra/tegra20_spdif.c | 4 +-
sound/soc/tegra/tegra30_ahub.c | 8 +-
sound/soc/tegra/tegra30_i2s.c | 4 +-
sound/soc/tegra/tegra_asoc_utils.c | 12 +-
694 files changed, 23069 insertions(+), 11480 deletions(-)
^ permalink raw reply [flat|nested] 44+ messages in thread
* [GIT PULL 01/15] arm-soc: non-critical bug fixes
2012-07-23 20:32 ` Arnd Bergmann
@ 2012-07-23 20:33 ` Arnd Bergmann
-1 siblings, 0 replies; 44+ messages in thread
From: Arnd Bergmann @ 2012-07-23 20:32 UTC (permalink / raw)
To: Linus Torvalds; +Cc: linux-kernel, linux-arm-kernel, arm
The following changes since commit 6887a4131da3adaab011613776d865f4bcfb5678:
Linux 3.5-rc5 (2012-06-30 16:08:57 -0700)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git next/fixes-non-critical
for you to fetch changes up to 913bdf1217f40c5e68c6b09f299177e5cd9629bd:
Merge tag 'ep93xx-fixes-for-3.6' of git://github.com/RyanMallon/linux-ep93xx into next/fixes-non-critical (2012-07-18 18:56:34 +0200)
----------------------------------------------------------------
arm-soc: non-critical bug fixes
These were submitted as bug fixes before v3.5 but not considered
important enough to be included in it.
----------------------------------------------------------------
Arnd Bergmann (6):
ARM: OMAP depends on MMU
Merge tag 'omap-fixes-non-critical-for-v3.6' of git://git.kernel.org/.../tmlind/linux-omap into next/fixes-non-critical
Merge branch 'mxs/fixes-for-3.6' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/fixes-non-critical
Merge tag 'davinci-v3.6-fixes' of git://gitorious.org/linux-davinci/linux-davinci into next/fixes-non-critical
Merge tag 'ep93xx-fixes-for-3.6' of git://github.com/RyanMallon/linux-ep93xx into next/fixes-non-critical
Merge branch 'next/fixes-non-critical' into for-next
Brian Austin (1):
ARM: OMAP: beagle: Set USB Host Port 1 to OMAP_USBHS_PORT_MODE_UNUSED
Daniel Lezcano (1):
ARM: OMAP3/4: consolidate cpuidle Makefile
Igor Grinberg (1):
ARM: OMAP: fix the ads7846 init code
Javier Martinez Canillas (1):
ARM: OMAP: omap2plus_defconfig: Enable EXT4 support
Juan Gutierrez (2):
ARM: OMAP: enable mailbox irq per instance
ARM: OMAP4: fix irq and clock name for dsp-iommu
Kevin Hilman (3):
ARM: OMAP2+: TWL: remove usage of pdata->irq_base/_end
mfd: twl: remove pdata->irq_base/_end, no more users
ARM: OMAP2+: fix CONFIG_CPU_IDLE dependency on CONFIG_PM
Mark A. Greer (4):
ARM: OMAP3: PM: Only access IVA if one exists
ARM: OMAP AM35x: EMAC/MDIO integration: Add Davinci EMAC/MDIO hwmod support
ARM: OMAP AM35x: clockdomain data: Fix clockdomain dependencies
arm: omap3: am35x: Set proper powerdomain states
Nishanth Menon (1):
ARM: OMAP2+: OPP: Fix to ensure check of right oppdef after bad one
Ohad Ben-Cohen (1):
ARM: OMAP4: hwspinlocks_init() should be static
Paul Bolle (4):
ARM: OMAP7XX: Remove omap730.h and omap850.h
ARM: OMAP: fix typos related to OMAP330
ARM: OMAP: remove unused cpu detection macros
ARM: mxs/tx28: fix odd include
Paul Walmsley (4):
ARM: OMAP AM35xx: clock and hwmod data: fix AM35xx HSOTGUSB hwmod
ARM: OMAP AM35xx: clock and hwmod data: fix UART4 data
ARM: OMAP: AM35xx: fix UART4 softreset
Merge branches 'am35xx_hwmod_data_fixes_a_3.6', 'am35xx_emac_mdio_devel_3.6' and 'am35xx_prcm_data_devel_3.6' into am35xx_devel_3.6
Peter Ujfalusi (1):
ARM: OMAP2: twl-common: Fix compiler warning
Roland Stigge (1):
ARM: OMAP: Fix dts files w/ status property: "disable" -> "disabled"
Sekhar Nori (1):
ARM: davinci: da8xx: fix interrupt handling
Todor Colov (1):
arm: ep93xx: Enable i2c support for ep9302
Tony Lindgren (5):
Merge branch 'for-tony' of git://git.kernel.org/.../ohad/linux into fixes-omap4-dsp
Merge branch 'fixes-omap4-dsp' into fixes-non-critical
Merge branch 'for_3.6/cleanup/pm' of git://git.kernel.org/.../khilman/linux-omap-pm into fixes-non-critical
Merge branch 'for_3.6/cleanup/twl-irq' of git://git.kernel.org/.../khilman/linux-omap-pm into fixes-non-critical
Merge tag 'omap-devel-d-for-3.6' of git://git.kernel.org/.../pjw/omap-pending into fixes-non-critical
Tony Prisk (1):
ARM:vt8500: Convert to use .restart and remove arch_reset()
Venkatraman S (1):
ARM: OMAP2+: fix naming collision of variable nr_irqs
arch/arm/Kconfig | 1 +
arch/arm/boot/dts/omap3-beagle.dts | 4 +-
arch/arm/boot/dts/omap4-panda.dts | 6 +-
arch/arm/boot/dts/omap4-sdp.dts | 4 +-
arch/arm/configs/omap2plus_defconfig | 1 +
arch/arm/mach-davinci/include/mach/entry-macro.S | 8 +-
arch/arm/mach-ep93xx/edb93xx.c | 4 +-
arch/arm/mach-mxs/module-tx28.c | 2 +-
arch/arm/mach-omap2/Kconfig | 2 +
arch/arm/mach-omap2/Makefile | 7 +-
arch/arm/mach-omap2/am35xx-emac.c | 90 +++++++------
arch/arm/mach-omap2/board-2430sdp.c | 3 -
arch/arm/mach-omap2/board-omap3beagle.c | 2 +-
arch/arm/mach-omap2/board-omap3logic.c | 3 -
arch/arm/mach-omap2/clock3xxx_data.c | 28 ++--
arch/arm/mach-omap2/clockdomains3xxx_data.c | 157 ++++++++++++++++++++--
arch/arm/mach-omap2/cm-regbits-34xx.h | 4 +-
arch/arm/mach-omap2/common-board-devices.c | 22 +--
arch/arm/mach-omap2/cpuidle34xx.c | 8 --
arch/arm/mach-omap2/cpuidle44xx.c | 8 --
arch/arm/mach-omap2/include/mach/am35xx.h | 2 +
arch/arm/mach-omap2/irq.c | 8 +-
arch/arm/mach-omap2/mailbox.c | 2 -
arch/arm/mach-omap2/omap-iommu.c | 6 +-
arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 143 ++++++++++++++++++--
arch/arm/mach-omap2/opp.c | 3 +-
arch/arm/mach-omap2/pm.h | 17 ++-
arch/arm/mach-omap2/pm34xx.c | 15 ++-
arch/arm/mach-omap2/powerdomains3xxx_data.c | 139 +++++++++++++++++--
arch/arm/mach-omap2/prcm-common.h | 4 +-
arch/arm/mach-omap2/prm_common.c | 8 +-
arch/arm/mach-omap2/twl-common.c | 11 +-
arch/arm/mach-vt8500/Makefile | 2 +-
arch/arm/mach-vt8500/bv07.c | 3 +
arch/arm/mach-vt8500/include/mach/restart.h | 17 +++
arch/arm/mach-vt8500/include/mach/system.h | 13 --
arch/arm/mach-vt8500/restart.c | 54 ++++++++
arch/arm/mach-vt8500/wm8505_7in.c | 4 +-
arch/arm/plat-omap/include/plat/cpu.h | 20 +--
arch/arm/plat-omap/include/plat/mux.h | 2 +-
arch/arm/plat-omap/include/plat/omap730.h | 102 --------------
arch/arm/plat-omap/include/plat/omap850.h | 102 --------------
arch/arm/plat-omap/mailbox.c | 13 +-
include/linux/i2c/twl.h | 1 -
44 files changed, 634 insertions(+), 421 deletions(-)
^ permalink raw reply [flat|nested] 44+ messages in thread
* [GIT PULL 02/15] arm-soc: general cleanups
2012-07-23 20:32 ` Arnd Bergmann
@ 2012-07-23 20:33 ` Arnd Bergmann
-1 siblings, 0 replies; 44+ messages in thread
From: Arnd Bergmann @ 2012-07-23 20:32 UTC (permalink / raw)
To: Linus Torvalds; +Cc: linux-kernel, linux-arm-kernel, arm
The following changes since commit bd0a521e88aa7a06ae7aabaed7ae196ed4ad867a:
Linux 3.5-rc6 (2012-07-07 17:23:56 -0700)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git next/cleanup
for you to fetch changes up to 1a33a4ebecce89163de27cba57ba84fd7aa16137:
Merge branch 'next/cleanup-samsung-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/cleanup (2012-07-17 22:53:38 +0200)
----------------------------------------------------------------
arm-soc: general cleanups
These are all boring changes, moving stuff around or renaming things
mostly, and also getting rid of stuff that is duplicate or should
not be there to start with. Platform-wise this is all over the place,
mainly omap, samsung, at91, imx and tegra.
----------------------------------------------------------------
Alexander Shiyan (3):
ARM: clps711x/p720t: Replace __initcall by .init_early call
ARM: clps711x: Removed superfluous transform virt_to_bus and related functions
ARM: clps711x: Remove the setting of the time
Arnd Bergmann (12):
Merge tag 'at91-for-next-cleanup' of git://github.com/at91linux/linux-at91 into next/cleanup
Merge tag 'omap-cleanup-for-v3.6' of git://git.kernel.org/.../tmlind/linux-omap into next/cleanup
ARM: at91: fix new build errors
Merge branch 'imx/cleanup-for-3.6' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/cleanup
Merge tag 'imx-cleanup' of git://git.pengutronix.de/git/imx/linux-2.6 into next/cleanup
Merge branch 'for-3.6/cleanup' of git://git.kernel.org/.../swarren/linux-tegra into next/cleanup
Merge branch 'for-3.6/fixes' of git://git.kernel.org/.../swarren/linux-tegra into next/cleanup
Merge branch 'next/cleanup-samsung' of git://git.kernel.org/.../kgene/linux-samsung into next/cleanup
Merge tag 'davinci-v3.6-cleanup' of git://gitorious.org/linux-davinci/linux-davinci into next/cleanup
Merge branch 'clps711x/cleanup' into next/cleanup
Merge branch 'next/cleanup-samsung-2' of git://git.kernel.org/.../kgene/linux-samsung into next/cleanup
Merge branch 'next/cleanup' into for-next
Bartlomiej Zolnierkiewicz (1):
ARM: EXYNOS: Remove leftovers of the Samsung specific power domain control
Benoît Thébaudeau (2):
ARM: imx: cleanup otg_mode
ARM: imx: remove unused pdata from device macros
Boojin Kim (1):
ARM: EXYNOS: Remove the L2 cache latency setting for EXYNOS5
Fabio Estevam (1):
ARM: imx: Kconfig: Remove IMX_HAVE_PLATFORM_IMX_SSI from MACH_MX25_3DS
Jean-Christophe PLAGNIOL-VILLARD (1):
ARM: at91: aic add dt support for external irqs
Jonghwan Choi (1):
ARM: SAMSUNG: Remove unused variable 'running' on PWM
Kevin Hilman (7):
ARM: OMAP4: hwmod: rename _enable_module to _omap4_enable_module()
ARM: OMAP2+: hwmod: use init-time function ptrs for enable/disable module
ARM: OMAP4: hwmod: drop extra cpu_is check from _wait_target_disable()
ARM: OMAP2+: hwmod: use init-time function pointer for wait_target_ready
ARM: OMAP2+: hwmod: use init-time function pointer for hardreset
ARM: OMAP2+: hwmod: use init-time function pointer for _init_clkdm
ARM: OMAP2+: CLEANUP: Remove ARCH_OMAPx ifdef from struct dpll_data
Ludovic Desroches (8):
ARM: at91: fix at91_aic_write macro
ARM: at91: aic can use fast eoi handler type
ARM: at91: add of irq priorities support
ARM: at91: remove static irq priorities for sam9x5
ARM: at91: at91 based machines specify their own irq handler at run time
ARM: at91: sparse irq support
ARM: at91: remove mach/irqs.h
ARM: at91: add AIC5 support
Oleg Matcovschi (1):
ARM: OMAP: dma: Clear status registers on enable/disable irq
Omar Ramirez Luna (2):
ARM: OMAP2+: control: new APIs to configure boot address and mode
ARM: OMAP: dsp: interface to control module functions
Paul Bolle (4):
ARM: davinci: remove dummy header files
ARM: S3C24XX: remove unused header <mach/bast-pmu.h>
ARM: SAMSUNG: remove unused SPI clock headers
ARM: at91: remove two unused headers
Paul Walmsley (2):
ARM: OMAP2+: hwmod: remove prm_clkdm, cm_clkdm; allow hwmods to have no clockdomain
Merge branches 'clock_cleanup_misc_3.6', 'control_clean_dspbridge_writes_cleanup_3.6', 'hwmod_soc_conditional_cleanup_3.6', 'mcbsp_clock_aliases_cleanup_3.6' and 'remove_clkdm_requirement_from_hwmod_3.6' into omap_cleanup_a_3.6
Peter Ujfalusi (3):
ARM: OMAP2: Move McBSP fck clock alias to hwmod data for OMAP2420
ARM: OMAP2: Move McBSP fck clock alias to hwmod data for OMAP2430
ARM: OMAP3: Move McBSP fck clock alias to hwmod data
Prashant Gaikwad (1):
ARM: tegra: Remove flow controller programming
Roland Stigge (1):
ARM: tegra: Fix dts files w/ status property: "disable" -> "disabled"
Sachin Kamat (4):
ARM: S5P64X0: Remove unused variable in dma.c file
ARM: S5PC100: Remove unused variable in dma.c file
ARM: SAMSUNG: Remove description corresponding to a deleted element
ARM: S3C24XX: Remove duplicate header file inclusion
Shawn Guo (1):
ARM: imx6q: remove unneeded clkdev lookups
Stephen Warren (5):
dt: name all Tegra binding docs consistently
mmc: tegra: use bus-width property instead of support-8bit
ARM: dt: tegra: remove legacy support-8bit property
ASoC: tegra: simplify Kconfig dependencies
ARM: dt: tegra: rename board files to match SoC
Sylwester Nawrocki (8):
ARM: S3C24XX: Free the backlight gpio requested in Mini2440 board code
ARM: S3C24XX: Convert SMDK board file to the gpiolib API
ARM: S3C24XX: Convert QT2410 board file to the gpiolib API
ARM: S3C24XX: Convert the PM code to gpiolib API
ARM: S3C24XX: Convert the touchscreen setup code to common GPIO API
ARM: S3C24XX: Remove unused GPA, GPE, GPH bank GPIO aliases
ARM: S3C24XX: Remove unused GPIO definitions for port J
ARM: S3C24XX: Remove unused GPIO definitions for Openmoko GTA02 board
Tony Lindgren (6):
ARM: OMAP3: There is no FS USB controller on omap3
ARM: OMAP2: Remove legacy USB FS support
ARM: OMAP: Make FS USB omap1 only
Merge tag 'omap-cleanup-a-for-3.6' of git://git.kernel.org/.../pjw/omap-pending into cleanup-hwmod
Merge branches 'cleanup-udc' and 'cleanup-dma' into cleanup
Merge branch 'cleanup-hwmod' into cleanup
Uwe Kleine-König (1):
ARM: imx27/dt: make dt_compat entry const
Wolfram Sang (1):
ARM: tegra: build powergate unconditionally
hdoyu@nvidia.com (5):
amba: tegra-ahb: Remove empty *_remove()
ARM: dt: tegra{20,30}.dtsi: Rename "mc" to "memory-controller"
ARM: tegra{20,30}: Rename "mc" to "memory-controller"
ARM: dt: tegra20: Rename "emc" to "memory-controller"
ARM: tegra20: Rename "emc" to "memory-controller"
.../devicetree/bindings/arm/atmel-aic.txt | 9 +-
.../arm/tegra/{emc.txt => nvidia,tegra20-emc.txt} | 2 +-
.../bindings/arm/tegra/nvidia,tegra20-mc.txt | 2 +-
.../bindings/arm/tegra/nvidia,tegra30-mc.txt | 2 +-
.../{gpio_nvidia.txt => nvidia,tegra20-gpio.txt} | 0
.../{tegra-kbc.txt => nvidia,tegra20-kbc.txt} | 0
.../{nvidia-sdhci.txt => nvidia,tegra20-sdhci.txt} | 0
.../nvec/{nvec_nvidia.txt => nvidia,nvec.txt} | 0
...-alc5632.txt => nvidia,tegra-audio-alc5632.txt} | 0
...mslice.txt => nvidia,tegra-audio-trimslice.txt} | 0
...io-wm8753.txt => nvidia,tegra-audio-wm8753.txt} | 0
...io-wm8903.txt => nvidia,tegra-audio-wm8903.txt} | 0
.../{tegra20-das.txt => nvidia,tegra20-das.txt} | 0
.../{tegra20-i2s.txt => nvidia,tegra20-i2s.txt} | 0
.../spi/{spi_nvidia.txt => nvidia,tegra20-spi.txt} | 0
.../usb/{tegra-usb.txt => nvidia,tegra20-ehci.txt} | 0
arch/arm/boot/dts/at91sam9260.dtsi | 37 +-
arch/arm/boot/dts/at91sam9263.dtsi | 31 +-
arch/arm/boot/dts/at91sam9g45.dtsi | 39 +-
arch/arm/boot/dts/at91sam9n12.dtsi | 30 +-
arch/arm/boot/dts/at91sam9x5.dtsi | 39 +-
.../dts/{tegra-harmony.dts => tegra20-harmony.dts} | 1 -
.../dts/{tegra-paz00.dts => tegra20-paz00.dts} | 1 -
.../{tegra-seaboard.dts => tegra20-seaboard.dts} | 3 +-
.../{tegra-trimslice.dts => tegra20-trimslice.dts} | 0
.../dts/{tegra-ventana.dts => tegra20-ventana.dts} | 1 -
arch/arm/boot/dts/tegra20.dtsi | 40 +-
.../dts/{tegra-cardhu.dts => tegra30-cardhu.dts} | 1 -
arch/arm/boot/dts/tegra30.dtsi | 40 +-
arch/arm/kernel/irq.c | 10 -
arch/arm/mach-at91/Kconfig | 6 +
arch/arm/mach-at91/at91rm9200.c | 1 +
arch/arm/mach-at91/at91rm9200_devices.c | 84 ++--
arch/arm/mach-at91/at91sam9260.c | 1 +
arch/arm/mach-at91/at91sam9260_devices.c | 92 ++---
arch/arm/mach-at91/at91sam9261.c | 1 +
arch/arm/mach-at91/at91sam9261_devices.c | 68 ++--
arch/arm/mach-at91/at91sam9263.c | 1 +
arch/arm/mach-at91/at91sam9263_devices.c | 80 ++--
arch/arm/mach-at91/at91sam926x_time.c | 2 +-
arch/arm/mach-at91/at91sam9g45.c | 1 +
arch/arm/mach-at91/at91sam9g45_devices.c | 108 ++---
arch/arm/mach-at91/at91sam9rl.c | 1 +
arch/arm/mach-at91/at91sam9rl_devices.c | 76 ++--
arch/arm/mach-at91/at91sam9x5.c | 40 --
arch/arm/mach-at91/at91x40.c | 2 +
arch/arm/mach-at91/board-1arm.c | 2 +
arch/arm/mach-at91/board-afeb-9260v1.c | 2 +
arch/arm/mach-at91/board-cam60.c | 2 +
arch/arm/mach-at91/board-carmeva.c | 2 +
arch/arm/mach-at91/board-cpu9krea.c | 2 +
arch/arm/mach-at91/board-cpuat91.c | 2 +
arch/arm/mach-at91/board-csb337.c | 2 +
arch/arm/mach-at91/board-csb637.c | 2 +
arch/arm/mach-at91/board-dt.c | 2 +
arch/arm/mach-at91/board-eb01.c | 2 +
arch/arm/mach-at91/board-eb9200.c | 2 +
arch/arm/mach-at91/board-ecbat91.c | 2 +
arch/arm/mach-at91/board-eco920.c | 2 +
arch/arm/mach-at91/board-flexibity.c | 2 +
arch/arm/mach-at91/board-foxg20.c | 2 +
arch/arm/mach-at91/board-gsia18s.c | 2 +
arch/arm/mach-at91/board-kafa.c | 2 +
arch/arm/mach-at91/board-kb9202.c | 2 +
arch/arm/mach-at91/board-neocore926.c | 2 +
arch/arm/mach-at91/board-pcontrol-g20.c | 2 +
arch/arm/mach-at91/board-picotux200.c | 2 +
arch/arm/mach-at91/board-qil-a9260.c | 2 +
arch/arm/mach-at91/board-rm9200dk.c | 2 +
arch/arm/mach-at91/board-rm9200ek.c | 2 +
arch/arm/mach-at91/board-rsi-ews.c | 2 +
arch/arm/mach-at91/board-sam9-l9260.c | 2 +
arch/arm/mach-at91/board-sam9260ek.c | 2 +
arch/arm/mach-at91/board-sam9261ek.c | 2 +
arch/arm/mach-at91/board-sam9263ek.c | 2 +
arch/arm/mach-at91/board-sam9g20ek.c | 3 +
arch/arm/mach-at91/board-sam9m10g45ek.c | 2 +
arch/arm/mach-at91/board-sam9rlek.c | 2 +
arch/arm/mach-at91/board-snapper9260.c | 2 +
arch/arm/mach-at91/board-stamp9g20.c | 3 +
arch/arm/mach-at91/board-usb-a926x.c | 4 +
arch/arm/mach-at91/board-yl-9200.c | 2 +
arch/arm/mach-at91/generic.h | 2 +
arch/arm/mach-at91/gpio.c | 9 +-
arch/arm/mach-at91/include/mach/at91_aic.h | 36 +-
arch/arm/mach-at91/include/mach/at91_spi.h | 81 ----
arch/arm/mach-at91/include/mach/at91_ssc.h | 106 -----
arch/arm/mach-at91/include/mach/entry-macro.S | 27 --
arch/arm/mach-at91/include/mach/irqs.h | 48 ---
arch/arm/mach-at91/irq.c | 414 ++++++++++++++++---
arch/arm/mach-at91/pm.c | 1 +
arch/arm/mach-clps711x/common.c | 6 -
arch/arm/mach-clps711x/include/mach/memory.h | 37 --
arch/arm/mach-clps711x/p720t.c | 34 +-
arch/arm/mach-davinci/include/mach/dm365.h | 1 -
arch/arm/mach-davinci/include/mach/dm646x.h | 1 -
arch/arm/mach-exynos/common.c | 25 --
arch/arm/mach-exynos/include/mach/spi-clocks.h | 16 -
arch/arm/mach-exynos/mach-nuri.c | 1 -
arch/arm/mach-exynos/mach-origen.c | 1 -
arch/arm/mach-exynos/mach-smdkv310.c | 1 -
arch/arm/mach-exynos/mach-universal_c210.c | 1 -
arch/arm/mach-imx/Kconfig | 1 -
arch/arm/mach-imx/clk-imx6q.c | 3 -
arch/arm/mach-imx/devices-imx21.h | 4 +-
arch/arm/mach-imx/devices-imx25.h | 4 +-
arch/arm/mach-imx/devices-imx27.h | 6 +-
arch/arm/mach-imx/devices-imx31.h | 6 +-
arch/arm/mach-imx/devices-imx35.h | 4 +-
arch/arm/mach-imx/devices-imx51.h | 2 +-
arch/arm/mach-imx/devices-imx53.h | 2 +-
arch/arm/mach-imx/imx27-dt.c | 2 +-
arch/arm/mach-imx/mach-cpuimx27.c | 12 +-
arch/arm/mach-imx/mach-cpuimx35.c | 10 +-
arch/arm/mach-imx/mach-cpuimx51sd.c | 10 +-
arch/arm/mach-imx/mach-eukrea_cpuimx25.c | 12 +-
arch/arm/mach-imx/mach-imx27ipcam.c | 2 +-
arch/arm/mach-imx/mach-mx25_3ds.c | 4 +-
arch/arm/mach-imx/mach-mx27_3ds.c | 10 +-
arch/arm/mach-imx/mach-mx27ads.c | 2 +-
arch/arm/mach-imx/mach-mx31_3ds.c | 10 +-
arch/arm/mach-imx/mach-mx31moboard.c | 2 +-
arch/arm/mach-imx/mach-mx35_3ds.c | 10 +-
arch/arm/mach-imx/mach-mx51_3ds.c | 2 +-
arch/arm/mach-imx/mach-mx51_babbage.c | 10 +-
arch/arm/mach-imx/mach-mx53_ard.c | 2 +-
arch/arm/mach-imx/mach-mx53_evk.c | 2 +-
arch/arm/mach-imx/mach-mx53_loco.c | 2 +-
arch/arm/mach-imx/mach-mx53_smd.c | 2 +-
arch/arm/mach-imx/mach-pca100.c | 12 +-
arch/arm/mach-imx/mach-pcm037.c | 12 +-
arch/arm/mach-imx/mach-pcm038.c | 4 +-
arch/arm/mach-imx/mach-pcm043.c | 10 +-
arch/arm/mach-imx/mach-qong.c | 2 +-
arch/arm/mach-imx/mach-vpr200.c | 2 +-
arch/arm/mach-imx/mx31lite-db.c | 4 +-
arch/arm/mach-omap1/board-ams-delta.c | 2 +-
arch/arm/mach-omap1/board-generic.c | 4 +-
arch/arm/mach-omap1/board-h2.c | 2 +-
arch/arm/mach-omap1/board-h3.c | 2 +-
arch/arm/mach-omap1/board-htcherald.c | 2 +-
arch/arm/mach-omap1/board-innovator.c | 2 +-
arch/arm/mach-omap1/board-nokia770.c | 2 +-
arch/arm/mach-omap1/board-osk.c | 2 +-
arch/arm/mach-omap1/board-palmte.c | 2 +-
arch/arm/mach-omap1/board-palmtt.c | 2 +-
arch/arm/mach-omap1/board-palmz71.c | 2 +-
arch/arm/mach-omap1/board-sx1.c | 2 +-
arch/arm/mach-omap1/board-voiceblue.c | 3 +-
arch/arm/mach-omap1/clock_data.c | 3 +-
arch/arm/mach-omap1/include/mach/usb.h | 165 ++++++++
arch/arm/mach-omap1/usb.c | 116 +++++-
arch/arm/mach-omap2/Kconfig | 3 -
arch/arm/mach-omap2/Makefile | 4 -
arch/arm/mach-omap2/board-2430sdp.c | 11 -
arch/arm/mach-omap2/board-apollon.c | 18 -
arch/arm/mach-omap2/board-h4.c | 13 -
arch/arm/mach-omap2/clock2420_data.c | 4 -
arch/arm/mach-omap2/clock2430_data.c | 10 -
arch/arm/mach-omap2/clock3xxx_data.c | 10 -
arch/arm/mach-omap2/clockdomain.h | 2 -
arch/arm/mach-omap2/clockdomains2420_data.c | 2 -
arch/arm/mach-omap2/clockdomains2430_data.c | 2 -
arch/arm/mach-omap2/clockdomains3xxx_data.c | 3 +-
arch/arm/mach-omap2/clockdomains44xx_data.c | 2 -
arch/arm/mach-omap2/clockdomains_common_data.c | 24 --
arch/arm/mach-omap2/control.c | 43 ++
arch/arm/mach-omap2/control.h | 2 +
arch/arm/mach-omap2/dsp.c | 4 +
.../include/mach/ctrl_module_core_44xx.h | 1 +
arch/arm/mach-omap2/omap_hwmod.c | 427 ++++++++++++++------
arch/arm/mach-omap2/omap_hwmod_2420_data.c | 10 +
arch/arm/mach-omap2/omap_hwmod_2430_data.c | 16 +
arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 23 ++
arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 4 +-
arch/arm/mach-omap2/usb-fs.c | 359 ----------------
arch/arm/mach-s3c24xx/common-smdk.c | 20 +-
arch/arm/mach-s3c24xx/common.c | 1 -
arch/arm/mach-s3c24xx/include/mach/bast-pmu.h | 40 --
arch/arm/mach-s3c24xx/include/mach/gpio-nrs.h | 21 -
arch/arm/mach-s3c24xx/include/mach/gta02.h | 69 ----
arch/arm/mach-s3c24xx/include/mach/regs-gpio.h | 17 +-
arch/arm/mach-s3c24xx/include/mach/regs-gpioj.h | 70 ----
arch/arm/mach-s3c24xx/mach-gta02.c | 1 -
arch/arm/mach-s3c24xx/mach-mini2440.c | 4 +-
arch/arm/mach-s3c24xx/mach-qt2410.c | 6 +-
arch/arm/mach-s3c24xx/mach-rx1950.c | 1 -
arch/arm/mach-s3c24xx/pm-s3c2410.c | 12 +-
arch/arm/mach-s3c24xx/pm-s3c2412.c | 1 -
arch/arm/mach-s3c24xx/s3c2412.c | 1 -
arch/arm/mach-s3c24xx/s3c244x.c | 1 -
arch/arm/mach-s3c24xx/setup-ts.c | 6 +-
arch/arm/mach-s3c64xx/include/mach/spi-clocks.h | 18 -
arch/arm/mach-s5p64x0/dma.c | 2 -
arch/arm/mach-s5p64x0/include/mach/spi-clocks.h | 20 -
arch/arm/mach-s5pc100/dma.c | 2 -
arch/arm/mach-s5pc100/include/mach/spi-clocks.h | 18 -
arch/arm/mach-s5pv210/include/mach/spi-clocks.h | 17 -
arch/arm/mach-tegra/Kconfig | 3 -
arch/arm/mach-tegra/Makefile | 2 +-
arch/arm/mach-tegra/Makefile.boot | 12 +-
arch/arm/mach-tegra/cpuidle.c | 6 +-
arch/arm/mach-tegra/sleep.S | 29 --
arch/arm/plat-omap/Makefile | 2 +-
arch/arm/plat-omap/dma.c | 59 ++-
arch/arm/plat-omap/include/plat/board.h | 38 --
arch/arm/plat-omap/include/plat/clock.h | 2 -
arch/arm/plat-omap/include/plat/dsp.h | 3 +
arch/arm/plat-omap/include/plat/omap_hwmod.h | 2 +
arch/arm/plat-omap/include/plat/usb.h | 196 +--------
arch/arm/plat-omap/usb.c | 145 -------
arch/arm/plat-samsung/Kconfig | 8 -
arch/arm/plat-samsung/Makefile | 4 -
arch/arm/plat-samsung/include/plat/devs.h | 1 -
arch/arm/plat-samsung/include/plat/fb.h | 1 -
arch/arm/plat-samsung/include/plat/pd.h | 30 --
arch/arm/plat-samsung/pd.c | 95 -----
arch/arm/plat-samsung/pwm.c | 4 -
drivers/amba/tegra-ahb.c | 6 -
drivers/mmc/host/sdhci-tegra.c | 5 +-
drivers/rtc/rtc-at91rm9200.c | 1 +
drivers/usb/gadget/Kconfig | 2 +-
drivers/usb/gadget/omap_udc.c | 3 +-
drivers/usb/host/Kconfig | 2 +-
drivers/usb/host/ohci-omap.c | 7 +-
drivers/usb/otg/isp1301_omap.c | 2 +-
sound/soc/tegra/Kconfig | 10 +-
227 files changed, 1794 insertions(+), 2504 deletions(-)
^ permalink raw reply [flat|nested] 44+ messages in thread
* [GIT PULL 03/15] arm-soc: soc-specific updates
2012-07-23 20:32 ` Arnd Bergmann
@ 2012-07-23 20:33 ` Arnd Bergmann
-1 siblings, 0 replies; 44+ messages in thread
From: Arnd Bergmann @ 2012-07-23 20:32 UTC (permalink / raw)
To: Linus Torvalds; +Cc: linux-kernel, linux-arm-kernel, arm
The following changes since commit bd0a521e88aa7a06ae7aabaed7ae196ed4ad867a:
Linux 3.5-rc6 (2012-07-07 17:23:56 -0700)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git next/soc
for you to fetch changes up to 233de298cb44e7dd300cd68f5abd7f1a75561fd5:
Merge branch 'lpc32xx/core2' of git://git.antcom.de/linux-2.6 into next/soc (2012-07-21 00:15:59 +0200)
----------------------------------------------------------------
arm-soc: soc-specific updates
This is stuff that does not fit well into another category and in
particular is not related to a particular board. The largest part
in here is extending the am33xx support in the omap platform.
----------------------------------------------------------------
Afzal Mohammed (2):
ARM: OMAP2+: am33xx: Add low level debugging support
ARM: OMAP2+: am33xx: Add AM335XEVM machine support
Alexander Shiyan (1):
ARM: i.MX51 iomux: added missing pin definitions
Alexandre Pereira da Silva (12):
ARM: LPC32xx: Build arch dtbs
ARM: LPC32xx: Add dt settings to the at25 node
ARM: LPC32xx: Remove spi chipselect request from board init
ARM: LPC32xx: Remove spi chip definitions
ARM: LPC32xx: Cleanup board init, remove duplicate clock init
ARM: LPC32xx: Move uart6 irda disable to serial.c
ARM: LPC32xx: Move i2s1 dma enabling to clock.c
ARM: LPC32xx: Cleanup USB clock init
ARM: LPC32xx: Remove unused gpios
ARM: LPC32xx: Set system serial based on cpu unique id
ARM: LPC32xx: Add PWM clock
ARM: LPC32xx: Add PWM support
Arnd Bergmann (13):
Merge branch 'lpc32xx/core' of git://git.antcom.de/linux-2.6 into next/soc
Merge tag 'omap-devel-am33xx-for-v3.6' of git://git.kernel.org/.../tmlind/linux-omap into next/soc
Merge branch 'tegra/cleanup' into next/soc
Merge branch 'for-3.6/soc' of git://git.kernel.org/.../swarren/linux-tegra into next/soc
Merge tag 'davinci-v3.6-soc' of git://gitorious.org/linux-davinci/linux-davinci into next/soc
Merge tag 'v3.5-rc6' into next/soc
Merge tag 'imx-soc' of git://git.pengutronix.de/git/imx/linux-2.6 into next/soc
Merge branch 'lpc32xx/core-fixes' of git://git.antcom.de/linux-2.6 into next/soc
Merge branch 'vexpress-v3.5-rc6' of git://git.linaro.org/people/pawelmoll/linux into next/soc
Merge branch 'next/devel-samsung' of git://git.kernel.org/.../kgene/linux-samsung into next/soc
Merge tag 'ep93xx-devel-for-3.6' of git://github.com/RyanMallon/linux-ep93xx into next/soc
Merge branch 'lpc32xx/core2' of git://git.antcom.de/linux-2.6 into next/soc
Merge branch 'next/soc' into for-next
Benoît Thébaudeau (5):
ARM: imx: fix i.MX35 CPU architecture
ARM: imx: enable support for mx35 rtc
ARM: imx: add rtc support to mx35_3ds
ARM: imx: make ehci power/oc polarities configurable
ARM: imx: fix mx51 ehci setup errors
Heiko Schocher (1):
ARM: davinci: cp_intc: Add irq domain support
Jonghwan Choi (1):
ARM: EXYNOS: Clear SYS_WDTRESET bit to use watchdog reset
Kevin Hilman (1):
ARM: davinci: add runtime PM support for clock management
Laxman Dewangan (2):
ARM: tegra: apbio access using dma for tegra20 only
ARM: tegra: apbio: use dmaengine based dma driver
Linus Walleij (8):
ARM: nomadik: register GPIOs dynamically
ARM: nomadik: register AMBA devices dynamically
ARM: nomadik: register PL031 RTC
ARM: nomadik: convert to generic clock
ARM: nomadik: register all three I2C busses
ARM: nomadik: register the I2C devices
ARM: nomadik: register the MMC/SD device
ARM: nomadik: bump all IRQ numbers by one
Mark Brown (1):
ARM: SAMSUNG: Introduce Kconfig variable for Samsung custom clk API
Olof Johansson (2):
Merge branch 'nomadik-for-arm-soc' of git://git.kernel.org/.../linusw/linux-nomadik into next/soc
Merge branch 'lpc32xx/devel' into next/soc
Pawel Moll (8):
ARM: vexpress: Check master site in daughterboard's sysctl operations
ARM: versatile: Make plat-versatile clock optional
ARM: vexpress: Initial common clock support
ARM: vexpress: Add missing SP804 interrupt in motherboard's DTS files
ARM: vexpress: Add fixed regulator for SMSC
ARM: vexpress: Convert V2P-CA15 Device Tree to 64 bit addresses
ARM: vexpress: Add Device Tree for V2P-CA15_CA7 core tile
ARM: vexpress: Config option for early printk console
Rafal Prylowski (2):
ep93xx: IDE driver platform support code
ep93xx: Add IDE support to edb93xx boards
Roland Stigge (20):
ARM: LPC32xx: Add NAND flash timing to PHY3250 board dts
ARM: LPC32xx: Clock initialization for NAND controllers
ARM: LPC32xx: Remove SLC controller initialization from platform init
ARM: LPC32xx: Add DMA configuration to platform data
ARM: LPC32xx: Adjust dtsi file for MLC controller configuration
ARM: LPC32xx: Add dts for EA3250 reference board
ARM: LPC32xx: DTS adjustment for key matrix controller
ARM: LPC32xx: Clock adjustment for key matrix controller
ARM: LPC32xx: Defconfig update
ARM: LPC32xx: Add MMC controller support
ARM: LPC32xx: DTS adjustment for using pl18x primecell
ARM: LPC32xx: DT conversion of Standard UARTs
ARM: LPC32xx: High Speed UART configuration via DT
ARM: LPC32xx: Remove mach specific ARCH_NR_GPIOS, use default
ARM: LPC32xx: Fix lpc32xx.dtsi status property: "disable" -> "disabled"
ARM: LPC32xx: Init MMC via clock
ARM: LPC32xx: Add further bits to MMC init
ARM: LPC32xx: Remove wrong re-initialization of MMC clock register
ARM: LPC32xx: Remove USB and I2C init from phy3250.c
ARM: LPC32xx: Adjust to pl08x DMA interface changes
Sachin Kamat (3):
ARM: EXYNOS: Update HSOTG PHY clock setting for EXYNOS4X12
ARM: EXYNOS: Make combiner_init function static
ARM: EXYNOS: Add missing static storage class specifier in pmu.c file
Tony Lindgren (1):
Merge tag 'omap-devel-a-for-3.6' of git://git.kernel.org/.../pjw/omap-pending into devel-am33xx
Vaibhav Hiremath (6):
ARM: OMAP2+: control: Add AM33XX control reg & sec clkctrl offset
ARM: OMAP AM33xx: voltagedomain: Add voltage domain data
ARM: OMAP AM33xx: PRM: add PRM support
ARM: OMAP AM33xx: CM: Introduce AM33xx CM APIs and register level details
ARM: OMAP AM33xx: powerdomains: add AM335x support
ARM: OMAP AM33xx: clockdomains: Add clockdomain data and respective operations
Will Deacon (1):
ARM: vexpress: remove automatic errata workaround selection
arch/arm/Kconfig | 11 +-
arch/arm/Kconfig.debug | 26 +
arch/arm/boot/dts/ea3250.dts | 157 +++++
arch/arm/boot/dts/lpc32xx.dtsi | 74 ++-
arch/arm/boot/dts/phy3250.dts | 61 ++
arch/arm/boot/dts/vexpress-v2m-rs1.dtsi | 11 +
arch/arm/boot/dts/vexpress-v2m.dtsi | 11 +
arch/arm/boot/dts/vexpress-v2p-ca15-tc1.dts | 36 +-
arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts | 188 ++++++
arch/arm/configs/lpc32xx_defconfig | 24 +-
arch/arm/mach-davinci/Kconfig | 1 +
arch/arm/mach-davinci/Makefile | 1 +
arch/arm/mach-davinci/cp_intc.c | 63 +-
arch/arm/mach-davinci/pm_domain.c | 64 ++
arch/arm/mach-ep93xx/core.c | 96 +++
arch/arm/mach-ep93xx/edb93xx.c | 24 +
arch/arm/mach-ep93xx/include/mach/platform.h | 3 +
arch/arm/mach-ep93xx/soc.h | 1 +
arch/arm/mach-exynos/common.c | 3 +-
arch/arm/mach-exynos/include/mach/regs-pmu.h | 5 +
arch/arm/mach-exynos/include/mach/regs-usb-phy.h | 20 +-
arch/arm/mach-exynos/pmu.c | 18 +-
arch/arm/mach-exynos/setup-usb-phy.c | 60 +-
arch/arm/mach-imx/Kconfig | 3 +-
arch/arm/mach-imx/devices-imx35.h | 4 +
arch/arm/mach-imx/ehci-imx25.c | 24 +-
arch/arm/mach-imx/ehci-imx35.c | 24 +-
arch/arm/mach-imx/ehci-imx5.c | 31 +-
arch/arm/mach-imx/mach-mx35_3ds.c | 1 +
arch/arm/mach-lpc32xx/Kconfig | 32 -
arch/arm/mach-lpc32xx/Makefile.boot | 1 +
arch/arm/mach-lpc32xx/clock.c | 123 +++-
arch/arm/mach-lpc32xx/common.c | 10 +-
arch/arm/mach-lpc32xx/include/mach/gpio.h | 2 -
arch/arm/mach-lpc32xx/include/mach/platform.h | 14 +
arch/arm/mach-lpc32xx/phy3250.c | 163 ++---
arch/arm/mach-lpc32xx/serial.c | 90 +--
arch/arm/mach-nomadik/Makefile | 2 -
arch/arm/mach-nomadik/board-nhk8815.c | 67 +-
arch/arm/mach-nomadik/clock.c | 75 ---
arch/arm/mach-nomadik/clock.h | 15 -
arch/arm/mach-nomadik/cpu-8815.c | 126 ++--
arch/arm/mach-nomadik/i2c-8815nhk.c | 38 +-
arch/arm/mach-nomadik/include/mach/irqs.h | 85 ++-
arch/arm/mach-omap2/Makefile | 6 +
arch/arm/mach-omap2/board-generic.c | 18 +
arch/arm/mach-omap2/clockdomain.h | 2 +
arch/arm/mach-omap2/clockdomain33xx.c | 74 +++
arch/arm/mach-omap2/clockdomains33xx_data.c | 196 ++++++
arch/arm/mach-omap2/cm-regbits-33xx.h | 687 +++++++++++++++++++++
arch/arm/mach-omap2/cm33xx.c | 313 ++++++++++
arch/arm/mach-omap2/cm33xx.h | 420 +++++++++++++
arch/arm/mach-omap2/common.h | 3 +
arch/arm/mach-omap2/control.h | 39 +-
arch/arm/mach-omap2/include/mach/debug-macro.S | 17 +-
arch/arm/mach-omap2/io.c | 13 +
arch/arm/mach-omap2/irq.c | 2 +-
arch/arm/mach-omap2/powerdomain.h | 23 +-
arch/arm/mach-omap2/powerdomain33xx.c | 229 +++++++
arch/arm/mach-omap2/powerdomains33xx_data.c | 185 ++++++
arch/arm/mach-omap2/prm-regbits-33xx.h | 357 +++++++++++
arch/arm/mach-omap2/prm33xx.c | 135 ++++
arch/arm/mach-omap2/prm33xx.h | 129 ++++
arch/arm/mach-omap2/timer.c | 5 +
arch/arm/mach-omap2/voltage.h | 1 +
arch/arm/mach-omap2/voltagedomains33xx_data.c | 43 ++
arch/arm/mach-tegra/Makefile | 3 +-
arch/arm/mach-tegra/apbio.c | 194 +++++-
arch/arm/mach-tegra/apbio.h | 19 +-
arch/arm/mach-tegra/common.c | 3 +
arch/arm/mach-vexpress/Kconfig | 5 +-
arch/arm/mach-vexpress/Makefile.boot | 3 +-
arch/arm/mach-vexpress/ct-ca9x4.c | 64 +-
arch/arm/mach-vexpress/include/mach/clkdev.h | 15 -
arch/arm/mach-vexpress/include/mach/debug-macro.S | 41 ++
arch/arm/mach-vexpress/include/mach/motherboard.h | 28 +-
arch/arm/mach-vexpress/include/mach/uncompress.h | 14 +
arch/arm/mach-vexpress/v2m.c | 296 +++++----
arch/arm/plat-mxc/devices/platform-mxc_rtc.c | 5 +
arch/arm/plat-mxc/include/mach/iomux-mx51.h | 14 +
arch/arm/plat-mxc/include/mach/mxc_ehci.h | 16 +-
arch/arm/plat-omap/include/plat/serial.h | 4 +
arch/arm/plat-omap/include/plat/uncompress.h | 6 +
arch/arm/plat-samsung/Kconfig | 4 +
arch/arm/plat-samsung/Makefile | 4 +-
arch/arm/plat-samsung/include/plat/cpu.h | 4 +
arch/arm/plat-versatile/Kconfig | 3 +
arch/arm/plat-versatile/Makefile | 2 +-
drivers/clk/Makefile | 1 +
drivers/clk/clk-nomadik.c | 47 ++
include/linux/platform_data/clk-nomadik.h | 2 +
91 files changed, 4730 insertions(+), 852 deletions(-)
^ permalink raw reply [flat|nested] 44+ messages in thread
* [GIT PULL 04/15] arm-soc: samsung dma changes
2012-07-23 20:32 ` Arnd Bergmann
@ 2012-07-23 20:33 ` Arnd Bergmann
-1 siblings, 0 replies; 44+ messages in thread
From: Arnd Bergmann @ 2012-07-23 20:32 UTC (permalink / raw)
To: Linus Torvalds; +Cc: linux-kernel, linux-arm-kernel, arm
The following changes since commit bd0a521e88aa7a06ae7aabaed7ae196ed4ad867a:
Linux 3.5-rc6 (2012-07-07 17:23:56 -0700)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git next/dma
for you to fetch changes up to 31dfec74c0dc49521b2e17543ff9dd9dd0221702:
Merge branch 'next/devel-dma-ops' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/dma (2012-07-10 14:12:05 +0200)
----------------------------------------------------------------
arm-soc: samsung dma changes
Some platforms are not yet converted to use the dmaengine framework,
including some of the samsung SoCs. In the meantime, we treat this
as platform code and merge the patches through the arm-soc tree.
----------------------------------------------------------------
Arnd Bergmann (2):
Merge branch 'next/devel-dma-ops' of git://git.kernel.org/.../kgene/linux-samsung into next/dma
Merge branch 'next/dma' into for-next
Boojin Kim (3):
ARM: SAMSUNG: Add config() function in DMA common operations
spi/s3c64xx: Add the use of DMA config operation
ASoC: follow the updated samsung DMA common operations
Sachin Kamat (1):
ARM: SAMSUNG: Fix compiler warning in dma-ops.c file
arch/arm/plat-samsung/dma-ops.c | 76 ++++++++++++++------------
arch/arm/plat-samsung/include/plat/dma-ops.h | 20 ++++---
arch/arm/plat-samsung/s3c-dma-ops.c | 39 +++++++------
drivers/spi/spi-s3c64xx.c | 33 ++++++-----
sound/soc/samsung/dma.c | 18 +++---
5 files changed, 105 insertions(+), 81 deletions(-)
^ permalink raw reply [flat|nested] 44+ messages in thread
* [GIT PULL 05/15] arm-soc: device tree description updates
2012-07-23 20:32 ` Arnd Bergmann
@ 2012-07-23 20:33 ` Arnd Bergmann
-1 siblings, 0 replies; 44+ messages in thread
From: Arnd Bergmann @ 2012-07-23 20:32 UTC (permalink / raw)
To: Linus Torvalds; +Cc: linux-kernel, linux-arm-kernel, arm
The following changes since commit bd0a521e88aa7a06ae7aabaed7ae196ed4ad867a:
Linux 3.5-rc6 (2012-07-07 17:23:56 -0700)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git next/dt
for you to fetch changes up to 1fc5f7d5c680ac36bd41e13a3d77cbe2eaa312e0:
Merge branch 'lpc32xx/dts2' of git://git.antcom.de/linux-2.6 into next/dt (2012-07-21 00:11:16 +0200)
----------------------------------------------------------------
arm-soc: device tree description updates
This branch contains two kinds of updates: Some platforms in the process
of getting converted to device tree based booting, and the platform
specific patches necessary for that are included here. Other platforms
are already converted, so we just need to update the actual device
tree source files and the binding documents to add support for new board
and new drivers.
In the future we will probably separate those into two branches, and
in the long run, the plan is to move the device tree source files out
of the kernel repository, but that has to wait until we have completed
a much larger portion of the binding documents.
----------------------------------------------------------------
Afzal Mohammed (1):
arm/dts: am33xx wdt node
Alexandre Pereira da Silva (1):
ARM: LPC32xx: Add PWM to base dts file
AnilKumar Ch (4):
arm/dts: Add initial DT support for AM33XX SoC family
arm/dts: Add support for AM335x EVM
arm/dts: Add support for AM335x BeagleBone
arm/dts: remove MMC/SD and SPI related entries from am33xx.dtsi
Arnd Bergmann (20):
Merge branch 'lpc32xx/dts' of git://git.antcom.de/linux-2.6 into next/dt
Merge tag 'v3.5-rc5' into next/dt
Merge branch 'mxs/dt-for-3.6' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/dt
Merge branch 'imx/dt-for-3.6' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/dt
Merge branch 'tegra/cleanup' into next/dt
Merge branch 'for-3.6/dt' of git://git.kernel.org/.../swarren/linux-tegra into next/dt
Merge tag 'v3.5-rc6' into next/dt
Merge tag 'at91-for-next-dt' of git://github.com/at91linux/linux-at91 into next/dt
Merge tag 'omap-devel-dt-for-v3.6' of git://git.kernel.org/.../tmlind/linux-omap into next/dt
Merge tag 'imx-dt' of git://git.pengutronix.de/git/imx/linux-2.6 into next/dt
Merge branch 'imx/dt-for-3.6' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/dt
Merge branch 'mxs/dt-for-3.6' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/dt
Merge tag 'davinci-v3.6-dt' of git://gitorious.org/linux-davinci/linux-davinci into next/dt
Merge branch 'samsung/dma' into next/dt
Merge branch 'next/dt-samsung' of git://git.kernel.org/.../kgene/linux-samsung into next/dt
ARM: EXYNOS: mark the DMA channel binding for SPI as preliminary
Merge branch 'ux500/fixes-3.5' into next/dt
Merge branch 'for-arm-soc-next' of git://git.linaro.org/people/ljones/linux-3.0-ux500 into next/dt
Merge branch 'lpc32xx/dts2' of git://git.antcom.de/linux-2.6 into next/dt
Merge branch 'next/dt' into for-next
Denis 'GNUtoo' Carikli (2):
ARM i.MX31: Add devicetree support
arm/dts: Add support for i.MX31 bug 1.x board from buglabs.
Fabio Estevam (4):
serial: mxs-auart: Allow device tree probing
ARM: dts: mx28evk: Add auart0 and auart3 support
ARM: mx23: Add initial support for olinuxino board
ARM: dts: Add basic support for mx27_3ds board
Fabio Porcedda (1):
ARM: at91: add support for Telit EVK-PRO3 with Telit GE863-PRO3
Heiko Schocher (1):
ARM: davinci: cp_intc: Add OF support for TI interrupt controller
Huang Shijie (6):
ARM: imx6q: add DT node for apbh-dma
ARM: imx6q: add clock for apbh-dma
ARM: imx6q: add DT node for gpmi nand
ARM: imx6q: add clocks for gpmi-nand
ARM: mx28: add gpmi-nand support
ARM: dts: mx23: add gpmi nand support
Hui Wang (1):
ARM: dts: imx6q-sabrelite: add ecspi1 pinctrl support
Jiri Prchal (1):
ARM: at91: Add support for board aks-cdu
Jon Hunter (1):
arm/dts: OMAP2: Add support for OMAP2420H4 Board
Kukjin Kim (1):
Merge branch 'next/devel-dma-ops' into next/dt-samsung
Lauri Hintsala (6):
ARM: apx4devkit: add NAND support
ARM: apx4devkit: add display support
ARM: apx4devkit: fix the bus-width of SSP0 to 4 bits
ARM: apx4devkit: add SSP2 support
ARM: apx4devkit: remove AUART3
ARM: apx4devkit: add pin muxing for GPIOs
Lee Jones (20):
ARM: ux500: Enable Device Tree support mmci for Snowball
ARM: ux500: Remove unused i2c platform_data initialisation code
ARM: ux500: Provide auxdata to be used as name base clock search for nmk-i2c
ARM: ux500: Kconfig: Compile in leds-gpio support for Snowball
ARM: ux500: Enable the user LED on Snowball via Device Tree
ARM: ux500: Add a ab8500-gpadc node to the db8500 Device Tree
ARM: ux500: Add support for input/ponkey into the db8500's Device Tree
ARM: ux500: Enable LED heartbeat functionality on Snowball
ARM: ux500: Enable LED heartbeat functionality on Snowbal via DT
ARM: ux500: Add db8500 Device Tree node for ab8500-sysctrl
ARM: ux500: Add db8500 Device Tree node for misc/ab8500-pwm
ARM: ux500: Add a ab8500-usb Device Tree node for db8500 based devices
ARM: ux500: Apply ab8500-debug node do the db8500 DT structure
ARM: ux500: Correctly reference IRQs supplied by the AB8500 from Device Tree
ARM: ux500: Enable the AB8500 RTC for all DT:ed DB8500 based devices
ARM: ux500: Move rtc-pl031 registration to Device Tree when enabled
pinctrl: pinctrl-nomadik: Append sleepmode property with vendor specific prefixes
ARM: ux500: Ensure vendor specific properties have the vendor's identifier
ARM: ux500: Remove temporary snowball_of_platform_devs enablement structure
ARM: ux500: Remove PMU platform registration when booting with DT
Marc Kleine-Budde (2):
ARM: imx: enable flexcan on imx25, imx35, imx53, imx6q
ARM: mxs: enable flexcan on imx28
Marek Vasut (3):
ARM: dts: imx23: Fix the gpmi/gpmi-nand DT name
rtc: stmp3xxx: Add simple binding for the stmp3xxx-rtc
ARM: mxs: convert m28evk board to device tree
Maxime Ripard (3):
ARM: dts: imx28: Add additionnal muxing options to iMX28 DTSI
ARM: mxs: Add Crystalfontz CFA-10036 DTS
ARM: dts: cfa10036: Add Power LED to the CFA-10036 board
Otavio Salvador (1):
ARM: imx6q: ensure ANATOP controller is available
Peter Ujfalusi (7):
arm/dts: omap4: Add entry for OMAP McPDM IP
arm/dts: omap4: Add entry for OMAP DMIC IP
arm/dts: omap4-sdp: Add fixed regulator to represent VBAT
arm/dts: omap4-sdp: Add support for twl6040
arm/dts: omap4-sdp: Enable audio support via device tree
arm/dts: omap4-panda: Audio support for PandaBoard 4430
arm/dts: New dts file for PandaBoardES (4460)
Richard Zhao (5):
ARM: dts: imx28-evk: add usb devices
ARM: imx6q: add usb controller clock lookups
ARM: imx6q: add usbphy clocks
ARM: imx6q: disable usb charger detector
ARM: dts: imx6q-sabrelite: add usb devices
Roland Stigge (1):
ARM: LPC32xx: Update DTS file for EA3250 board
Shawn Guo (24):
ARM: mxs: store mac address read from OTP in device tree
video: mxsfb: move mxsfb.h into include/linux
video: mxsfb: add simple device tree probe
ARM: mxs: use auxdata to attach mxsfb_platform_data
ARM: dts: mxs: add comments for pinmux-ids
ARM: dts: mxs: add hog-gpios for imx23-evk and imx28-evk
ARM: dts: imx23-evk: updates for mmc device
ARM: dts: imx23-evk: add auart device
ARM: dts: imx28-evk: add vmmc-supply for mmc device
ARM: dts: imx28-evk: add missing properties for fec
ARM: dts: imx28-evk: add heartbeat gpio-leds
ARM: dts: mxs: enable rtc for imx23 and imx28
ARM: dts: mxs: add pwm-backlight for imx23-evk and imx28-evk
ARM: dts: mxs: add lcd support for imx23-evk and imx28-evk
ARM: dts: imx28-evk: add flexan devices
bindings: update imx and mxs #gpio-cells
ARM: dts: imx: update #interrupt-cells for gpio nodes
ARM: dts: imx28: move extra gpmi-nand pins into board dts
ARM: dts: imx28: move lcdif control pins into board dts
ARM: mxs: convert apx4devkit board to device tree
ARM: mxs: convert tx28 board to device tree
ARM: mxs: convert stmp378x_devb board to device tree
ARM: mxs: add dtb-y target into Makefile.boot
ARM: mxs: rename dts files with soc name being the prefix
Stephen Warren (3):
ARM: dt: tegra: add Whistler device tree file
ARM: dt: tegra: seaboard: instantiate pinctrl-based I2C bus mux
ARM: dt: tegra seaboard: move battery monitor to mux'd I2C bus.
Thomas Abraham (14):
ARM: S3C64XX: Add a new dma request id for device tree based dma channel lookup
spi: s3c64xx: remove unused S3C64XX_SPI_ST_TRLCNTZ macro
spi: s3c64xx: move controller information into driver data
ARM: SAMSUNG: Remove pdev pointer parameter from spi gpio setup functions
ARM: SAMSUNG: Modify s3c64xx_spi{0|1|2}_set_platdata function
spi: s3c64xx: Remove the 'set_level' callback from controller data
spi: s3c64xx: add device tree support
ARM: EXYNOS: Add device tree node for EXYNOS4 interrupt combiner controller
ARM: EXYNOS: Fix the incorrect hierarchy of spi controller bus clock
ARM: EXYNOS: Enable platform support for SPI controllers for EXYNOX4
ARM: dts: Add nodes for spi controllers for SAMSUNG EXYNOS4 platforms
ARM: EXYNOS: Add spi clock support for EXYNOS5
ARM: EXYNOS: Enable platform support for SPI controllers for EXYNOS5
ARM: dts: Add nodes for spi controllers for SAMSUNG EXYNOS5 platforms
Uri Yosef (1):
arm/dts: OMAP4: Add Variscite OMAP4 System-On-Modeule support
Vaibhav Hiremath (2):
arm/dts: Add support for TI AM3517/05 EVM board
arm/dts: omap3-evm: Add i2c and twl4030 support
Xiao Jiang (3):
arm/dts: add wdt node for omap3 and omap4
ARM: OMAP: avoid build wdt platform device if with dt support
watchdog: omap_wdt: add device tree support
.../devicetree/bindings/arm/davinci/cp-intc.txt | 27 ++
Documentation/devicetree/bindings/arm/olimex.txt | 6 +
.../devicetree/bindings/arm/omap/omap.txt | 3 +
Documentation/devicetree/bindings/fb/mxsfb.txt | 19 +
.../devicetree/bindings/gpio/fsl-imx-gpio.txt | 14 +-
.../devicetree/bindings/gpio/gpio-mxs.txt | 5 +-
.../devicetree/bindings/gpio/gpio-nmk.txt | 2 +-
.../devicetree/bindings/rtc/stmp3xxx-rtc.txt | 16 +
.../devicetree/bindings/spi/spi-samsung.txt | 116 +++++
.../bindings/tty/serial/fsl-mxs-auart.txt | 27 ++
.../devicetree/bindings/watchdog/omap-wdt.txt | 14 +
arch/arm/boot/dts/aks-cdu.dts | 113 +++++
arch/arm/boot/dts/am335x-bone.dts | 20 +
arch/arm/boot/dts/am335x-evm.dts | 20 +
arch/arm/boot/dts/am33xx.dtsi | 158 +++++++
arch/arm/boot/dts/am3517-evm.dts | 32 ++
arch/arm/boot/dts/db8500.dtsi | 77 +++-
arch/arm/boot/dts/ea3250.dts | 17 +
arch/arm/boot/dts/evk-pro3.dts | 41 ++
arch/arm/boot/dts/exynos4210-origen.dts | 12 +
arch/arm/boot/dts/exynos4210-smdkv310.dts | 38 ++
arch/arm/boot/dts/exynos4210.dtsi | 47 ++
arch/arm/boot/dts/exynos5250-smdk5250.dts | 38 ++
arch/arm/boot/dts/exynos5250.dtsi | 36 ++
arch/arm/boot/dts/ge863-pro3.dtsi | 52 +++
arch/arm/boot/dts/imx23-evk.dts | 66 ++-
arch/arm/boot/dts/imx23-olinuxino.dts | 44 ++
arch/arm/boot/dts/imx23-stmp378x_devb.dts | 78 ++++
arch/arm/boot/dts/imx23.dtsi | 169 ++++++-
arch/arm/boot/dts/imx27-3ds.dts | 41 ++
arch/arm/boot/dts/imx27.dtsi | 12 +-
arch/arm/boot/dts/imx28-apx4devkit.dts | 198 ++++++++
arch/arm/boot/dts/imx28-cfa10036.dts | 52 +++
arch/arm/boot/dts/imx28-evk.dts | 164 +++++++
arch/arm/boot/dts/imx28-m28evk.dts | 210 +++++++++
arch/arm/boot/dts/imx28-tx28.dts | 97 ++++
arch/arm/boot/dts/imx28.dtsi | 353 ++++++++++++--
arch/arm/boot/dts/imx31-bug.dts | 31 ++
arch/arm/boot/dts/imx31.dtsi | 88 ++++
arch/arm/boot/dts/imx51.dtsi | 8 +-
arch/arm/boot/dts/imx53.dtsi | 14 +-
arch/arm/boot/dts/imx6q-arm2.dts | 6 +
arch/arm/boot/dts/imx6q-sabrelite.dts | 33 ++
arch/arm/boot/dts/imx6q.dtsi | 99 +++-
arch/arm/boot/dts/lpc32xx.dtsi | 5 +
arch/arm/boot/dts/omap2420-h4.dts | 20 +
arch/arm/boot/dts/omap3-evm.dts | 28 ++
arch/arm/boot/dts/omap3.dtsi | 5 +
arch/arm/boot/dts/omap4-panda.dts | 37 ++
arch/arm/boot/dts/omap4-pandaES.dts | 24 +
arch/arm/boot/dts/omap4-sdp.dts | 68 +++
arch/arm/boot/dts/omap4-var_som.dts | 96 ++++
arch/arm/boot/dts/omap4.dtsi | 23 +
arch/arm/boot/dts/snowball.dts | 21 +-
arch/arm/boot/dts/tegra20-seaboard.dts | 85 +++-
arch/arm/boot/dts/tegra20-whistler.dts | 301 ++++++++++++
arch/arm/mach-at91/Makefile.boot | 2 +
arch/arm/mach-davinci/cp_intc.c | 16 +-
arch/arm/mach-davinci/include/mach/cp_intc.h | 1 +
arch/arm/mach-exynos/clock-exynos4.c | 67 ++-
arch/arm/mach-exynos/clock-exynos5.c | 95 ++++
arch/arm/mach-exynos/include/mach/irqs.h | 4 +
arch/arm/mach-exynos/include/mach/map.h | 3 +
arch/arm/mach-exynos/mach-exynos4-dt.c | 6 +
arch/arm/mach-exynos/mach-exynos5-dt.c | 6 +
arch/arm/mach-exynos/setup-spi.c | 33 +-
arch/arm/mach-imx/Kconfig | 13 +
arch/arm/mach-imx/Makefile | 1 +
arch/arm/mach-imx/clk-imx31.c | 19 +
arch/arm/mach-imx/clk-imx6q.c | 22 +-
arch/arm/mach-imx/imx31-dt.c | 63 +++
arch/arm/mach-imx/mach-imx6q.c | 41 ++
arch/arm/mach-mxs/Kconfig | 1 +
arch/arm/mach-mxs/Makefile.boot | 9 +
arch/arm/mach-mxs/devices-mx23.h | 2 +-
arch/arm/mach-mxs/devices-mx28.h | 2 +-
arch/arm/mach-mxs/devices/platform-mxsfb.c | 2 +-
arch/arm/mach-mxs/mach-mxs.c | 215 ++++++++-
arch/arm/mach-omap2/devices.c | 2 +-
arch/arm/mach-s3c24xx/clock-s3c2416.c | 3 +-
arch/arm/mach-s3c24xx/clock-s3c2443.c | 2 +-
arch/arm/mach-s3c24xx/common-s3c2443.c | 4 +-
arch/arm/mach-s3c24xx/setup-spi.c | 10 +-
arch/arm/mach-s3c64xx/clock.c | 20 +-
arch/arm/mach-s3c64xx/include/mach/dma.h | 1 +
arch/arm/mach-s3c64xx/mach-crag6410.c | 2 +-
arch/arm/mach-s3c64xx/setup-spi.c | 19 +-
arch/arm/mach-s5p64x0/clock-s5p6440.c | 12 +-
arch/arm/mach-s5p64x0/clock-s5p6450.c | 12 +-
arch/arm/mach-s5p64x0/setup-spi.c | 21 +-
arch/arm/mach-s5pc100/clock.c | 30 +-
arch/arm/mach-s5pc100/setup-spi.c | 30 +-
arch/arm/mach-s5pv210/clock.c | 14 +-
arch/arm/mach-s5pv210/setup-spi.c | 21 +-
arch/arm/mach-tegra/Makefile.boot | 1 +
arch/arm/mach-ux500/Kconfig | 1 +
arch/arm/mach-ux500/board-mop500-sdi.c | 4 +-
arch/arm/mach-ux500/board-mop500.c | 63 +--
arch/arm/mach-ux500/board-mop500.h | 3 +
arch/arm/mach-ux500/cpu-db8500.c | 4 +-
arch/arm/plat-mxc/include/mach/common.h | 1 +
arch/arm/plat-samsung/devs.c | 60 +--
arch/arm/plat-samsung/include/plat/s3c64xx-spi.h | 39 +-
drivers/i2c/busses/i2c-nomadik.c | 3 +-
drivers/pinctrl/pinctrl-nomadik.c | 2 +-
drivers/rtc/rtc-stmp3xxx.c | 8 +
drivers/spi/spi-s3c64xx.c | 481 +++++++++++++++++---
drivers/tty/serial/mxs-auart.c | 42 +-
drivers/video/mxsfb.c | 62 ++-
drivers/watchdog/omap_wdt.c | 7 +
.../include/mach => include/linux}/mxsfb.h | 6 +-
111 files changed, 4516 insertions(+), 523 deletions(-)
^ permalink raw reply [flat|nested] 44+ messages in thread
* [GIT PULL 06/15] arm-soc: spi updates
2012-07-23 20:32 ` Arnd Bergmann
@ 2012-07-23 20:33 ` Arnd Bergmann
-1 siblings, 0 replies; 44+ messages in thread
From: Arnd Bergmann @ 2012-07-23 20:32 UTC (permalink / raw)
To: Linus Torvalds; +Cc: linux-kernel, linux-arm-kernel, arm
The following changes since commit 84a1caf1453c3d44050bd22db958af4a7f99315c:
Linux 3.5-rc7 (2012-07-14 15:40:28 -0700)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git next/spi
for you to fetch changes up to 85644d2a8893d72d1869c6347e791902dd414288:
Merge branch 'next/devel-samsung-spi' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/spi (2012-07-21 23:12:15 +0200)
----------------------------------------------------------------
arm-soc: spi updates
These changes conceptually belong into the spi tree, but we decided to
put them into arm-soc to better deal with interdependencies with other
platform specific patches that are already there.
----------------------------------------------------------------
Arnd Bergmann (2):
Merge branch 'next/devel-samsung-spi' of git://git.kernel.org/.../kgene/linux-samsung into next/spi
Merge branch 'next/spi' into for-next
Kukjin Kim (1):
Merge branch 'next/dt-samsung' into next/devel-samsung-spi
Mark Brown (4):
spi/s3c64xx: Fix handling of errors in gpio_request()
spi/s3c64xx: Put the /CS GPIO into output mode
spi/s3c64xx: Convert to devm_request_and_ioremap()
spi/s3c64xx: Expand S3C64XX_SPI_{DE,}ACT macros at call sites
drivers/spi/spi-s3c64xx.c | 42 ++++++++++++------------------------------
1 file changed, 12 insertions(+), 30 deletions(-)
^ permalink raw reply [flat|nested] 44+ messages in thread
* [GIT PULL 07/15] arm-soc: timer updates
2012-07-23 20:32 ` Arnd Bergmann
@ 2012-07-23 20:33 ` Arnd Bergmann
-1 siblings, 0 replies; 44+ messages in thread
From: Arnd Bergmann @ 2012-07-23 20:32 UTC (permalink / raw)
To: Linus Torvalds; +Cc: linux-kernel, linux-arm-kernel, arm
The following changes since commit bd0a521e88aa7a06ae7aabaed7ae196ed4ad867a:
Linux 3.5-rc6 (2012-07-07 17:23:56 -0700)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git next/timer
for you to fetch changes up to 35bf8cc74b2b1dfad18df6d330b271e68ab6e3f5:
Merge branch 'picoxcell/timer' into next/timer (2012-07-12 17:27:36 +0200)
----------------------------------------------------------------
arm-soc: timer updates
This contains two branches dealing with timers, one for the picoxcell
platform that is now using DT with the platform-independent
dw_apb_timer driver. The other change is for the omap-specific
dmtimer driver.
----------------------------------------------------------------
Arnd Bergmann (3):
Merge tag 'omap-devel-dmtimer-for-v3.6' of git://git.kernel.org/.../tmlind/linux-omap into next/timer
Merge branch 'picoxcell/timer' into next/timer
Merge branch 'next/timer' into for-next
Dinh Nguyen (1):
clocksource: dw_apb_timer: Add common DTS glue for dw_apb_timer
Jon Hunter (12):
ARM: OMAP: Remove unnecessary clk structure
ARM: OMAP2+: Remove unused max number of timers definition
ARM: OMAP2+: Add dmtimer platform function to reserve systimers
ARM: OMAP: Add DMTIMER capability variable to represent timer features
ARM: OMAP2+: HWMOD: Correct timer device attributes
ARM: OMAP2+: Fix external clock support for dmtimers
ARM: OMAP: Remove loses_context variable from timer platform data
ARM: OMAP: Remove timer function pointer for context loss counter
ARM: OMAP: Add flag to indicate if a timer needs a manual reset
ARM: OMAP1: Fix dmtimer support
ARM: OMAP2+: Move dmtimer clock set function to dmtimer driver
ARM: OMAP2+: Simplify dmtimer clock aliases
Documentation/devicetree/bindings/rtc/dw-apb.txt | 25 +++++
arch/arm/Kconfig | 1 +
arch/arm/mach-omap1/timer.c | 3 +-
arch/arm/mach-omap2/clock2420_data.c | 39 +------
arch/arm/mach-omap2/clock2430_data.c | 39 +------
arch/arm/mach-omap2/clock3xxx_data.c | 26 +----
arch/arm/mach-omap2/clock44xx_data.c | 34 +++---
arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c | 8 --
arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 10 +-
arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 6 --
arch/arm/mach-omap2/timer.c | 82 +--------------
arch/arm/mach-picoxcell/Makefile | 1 -
arch/arm/mach-picoxcell/common.c | 3 +-
arch/arm/mach-picoxcell/common.h | 2 +-
arch/arm/plat-omap/dmtimer.c | 111 +++++++++++++++-----
arch/arm/plat-omap/include/plat/dmtimer.h | 22 +---
drivers/clocksource/Kconfig | 3 +
drivers/clocksource/Makefile | 1 +
.../clocksource/dw_apb_timer_of.c | 52 +++++----
19 files changed, 182 insertions(+), 286 deletions(-)
^ permalink raw reply [flat|nested] 44+ messages in thread
* [GIT PULL 08/15] arm-soc: cleanups, part 2
2012-07-23 20:32 ` Arnd Bergmann
@ 2012-07-23 20:33 ` Arnd Bergmann
-1 siblings, 0 replies; 44+ messages in thread
From: Arnd Bergmann @ 2012-07-23 20:32 UTC (permalink / raw)
To: Linus Torvalds; +Cc: linux-kernel, linux-arm-kernel, arm
The following changes since commit 6887a4131da3adaab011613776d865f4bcfb5678:
Linux 3.5-rc5 (2012-06-30 16:08:57 -0700)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git next/cleanup2
for you to fetch changes up to db3c47a3af96e8109b1bb114c32f0854259d5970:
Merge tag 'omap-cleanup-part2-for-v3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/cleanup2 (2012-07-10 16:58:19 +0200)
----------------------------------------------------------------
arm-soc: cleanups, part 2
These omap cleanups have dependencies on earlier omap branches that in
turn depend on other cleanups, so they could not go into the same
branch.
----------------------------------------------------------------
Arnd Bergmann (2):
Merge tag 'omap-cleanup-part2-for-v3.6' of git://git.kernel.org/.../tmlind/linux-omap into next/cleanup2
Merge branch 'next/cleanup2' into for-next
Jon Hunter (2):
ARM: OMAP4: clockdomain/CM code: Update supported transition modes
ARM: OMAP2+: powerdomain code: Fix Wake-up power domain power status
Kishon Vijay Abraham I (1):
ARM: OMAP2+: hwmod code: add support to set dmadisable in hwmod framework
Paul Walmsley (1):
Merge branches 'hwmod_am335x_support_3.6', 'clkdm_pwrdm_devel_a_3.6' and 'misc_devel_3.6' into omap_devel_f_3.6
R Sricharan (1):
ARM: OMAP2+: PRM/CM: Move the stubbed prm and cm functions to prcm.c file and make them __weak
Sakari Ailus (1):
ARM: OMAP3: control: add definition for CONTROL_CAMERA_PHY_CTRL
Santosh Shilimkar (1):
ARM: OMAP: sdrc: Fix the build break for OMAP4 only builds
Tarun Kanti DebBarma (3):
ARM: OMAP2+: hwmod: add omap_hwmod_get_main_clk() API
ARM: OMAP: dmtimer: use devm_ API and do some cleanup in probe()
ARM: OMAP2+: dmtimer: cleanup fclk usage
Tony Lindgren (3):
Merge tags 'omap-cleanup-for-v3.6', 'omap-devel-dmtimer-for-v3.6' and 'omap-devel-am33xx-for-v3.6' into devel-am33xx-part2
Merge tag 'omap-devel-f-for-3.6' of git://git.kernel.org/.../pjw/omap-pending into cleanup-part2
ARM: OMAP2+: Fix mismerge for omap_hwmod_get_main_clk() API
Vaibhav Hiremath (7):
ARM: OMAP2+: hwmod: Add new sysc_type3 into omap_hwmod required for am33xx
ARM: OMAP3/4: omap_hwmod: Add rstst_offs field to struct omap_hwmod_omap4_prcm
ARM: OMAP2+: All OMAP2PLUS uses omap-device.o target so add one entry
ARM: OMAP2+: Move omap3 dpll ops to dpll3xxx.c
ARM: OMAP2+: am33xx: Make am33xx as a separate class
ARM: OMAP2+: am33xx: Change cpu_is_am33xx to soc_is_am33xx
ARM: OMAP2+: Remove unnecessary ifdef around __omap2_set_globals
Vikram Pandita (1):
ARM: OMAP3+: dpll: optimize noncore dpll locking logic
arch/arm/mach-omap2/Kconfig | 12 +++-
arch/arm/mach-omap2/Makefile | 8 ++-
arch/arm/mach-omap2/clock.c | 18 ------
arch/arm/mach-omap2/clock3xxx_data.c | 2 +-
arch/arm/mach-omap2/clock44xx_data.c | 22 ++++----
arch/arm/mach-omap2/clockdomain44xx.c | 10 +++-
arch/arm/mach-omap2/cminst44xx.c | 14 -----
arch/arm/mach-omap2/cminst44xx.h | 25 ---------
arch/arm/mach-omap2/common.c | 10 +---
arch/arm/mach-omap2/common.h | 5 ++
arch/arm/mach-omap2/control.h | 1 +
arch/arm/mach-omap2/dpll3xxx.c | 26 ++++++++-
arch/arm/mach-omap2/id.c | 4 +-
arch/arm/mach-omap2/omap_hwmod.c | 76 ++++++++++++++++++++++++--
arch/arm/mach-omap2/omap_hwmod_common_data.c | 10 ++++
arch/arm/mach-omap2/powerdomain.c | 6 +-
arch/arm/mach-omap2/prcm.c | 23 ++++++++
arch/arm/mach-omap2/prm2xxx_3xxx.h | 65 ----------------------
arch/arm/mach-omap2/prm_common.c | 62 +++++++++++++++++++++
arch/arm/mach-omap2/timer.c | 3 +-
arch/arm/plat-omap/Makefile | 4 +-
arch/arm/plat-omap/dmtimer.c | 53 ++++++------------
arch/arm/plat-omap/include/plat/cpu.h | 17 +++---
arch/arm/plat-omap/include/plat/omap_hwmod.h | 19 +++++++
arch/arm/plat-omap/include/plat/sdrc.h | 2 +-
arch/arm/plat-omap/sram.c | 6 +-
26 files changed, 296 insertions(+), 207 deletions(-)
^ permalink raw reply [flat|nested] 44+ messages in thread
* [GIT PULL 09/15] arm-soc: new SoC support
2012-07-23 20:32 ` Arnd Bergmann
@ 2012-07-23 20:33 ` Arnd Bergmann
-1 siblings, 0 replies; 44+ messages in thread
From: Arnd Bergmann @ 2012-07-23 20:32 UTC (permalink / raw)
To: Linus Torvalds; +Cc: linux-kernel, linux-arm-kernel, arm
The following changes since commit fb584511c4664573097ece7df0de06ad00b713a2:
ARM: OMAP: sdrc: Fix the build break for OMAP4 only builds (2012-07-09 01:44:11 -0700)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git next/newsoc
for you to fetch changes up to 66314223aa5e862c9d1d068cb7186b4fd58ebeaa:
ARM: socfpga: initial support for Altera's SOCFPGA platform (2012-07-19 10:39:00 +0200)
----------------------------------------------------------------
arm-soc: new SoC support
This adds support for three new SoC types:
* The mvebu platform includes Marvell's Armada XP and Armada 370 chips,
made by the mvebu business unit inside of Marvell. Since the same
group also made the older but similar platforms we call "orion5x",
"kirkwood", "mv78xx0" and "dove", we plan to move all of them into
the mach-mvebu directory in the future.
* socfpga is Altera's platform based on Cortex-A9 cores and a lot of
FPGA space. This is similar to the Xilinx zynq platform we already
support. The code is particularly clean, which is helped by the fact
that the hardware doesn't do much besides the parts that are
expected to get added in the FPGA.
* The OMAP subarchitecture gains support for the latest generation,
the OMAP5 based on the new Cortex-A15 core. Support is rather
rudimentary for now, but will be extended in the future.
----------------------------------------------------------------
Arnd Bergmann (5):
Merge branch 'mvebu/newsoc' into next/newsoc
Merge branch 'omap/cleanup2' into next/newsoc
Merge branch 'devel-omap5' of git://git.kernel.org/.../tmlind/linux-omap into next/newsoc
Merge branch 'mvebu/newsoc' into next/newsoc
Merge branch 'next/newsoc' into for-next
Ben Dooks (1):
ARM: mvebu: MPIC: read number of interrupts from control register
Dinh Nguyen (1):
ARM: socfpga: initial support for Altera's SOCFPGA platform
Gregory CLEMENT (4):
clocksource: time-armada-370-xp: Marvell Armada 370/XP SoC timer driver
arm: mach-mvebu: add source files
arm: mach-mvebu: add documentation for new device tree bindings
arm: mach-mvebu: add compilation/configuration change
R Sricharan (11):
ARM: OMAP2+: Move stubbed secure_sram_reserve function to a common.c and call it __weak
ARM: OMAP: counter-32k: Select the CR register offset using the IP scheme
ARM: OMAP5: id: Add cpu id for ES versions
ARM: OMAP5: Add minimal support for OMAP5430 SOC
ARM: OMAP5: timer: Add clocksource, clockevent support
ARM: OMAP5: gpmc: Update gpmc_init()
ARM: OMAP5: l3: Add l3 error handler support for omap5
ARM: omap2+: board-generic: clean up the irq data from board file
ARM: OMAP5: board-generic: Add device tree support
arm/dts: OMAP5: Add omap5 dts files
ARM: OMAP5: Add the build support
Santosh Shilimkar (2):
ARM: OMAP5: Add the WakeupGen IP updates
ARM: OMAP5: Add SMP support
Tarun Kanti DebBarma (1):
ARM: Kconfig update to support additional GPIOs in OMAP5
Thomas Petazzoni (5):
arm: mach-mvebu: add header
arm: mach-mvebu: add support for Armada 370 and Armada XP with DT
arm: mach-mvebu: add defconfig
arm: mach-mvebu: add entry to MAINTAINERS
arm: mvebu: generate DTBs for supported SoCs
.../devicetree/bindings/arm/armada-370-xp-mpic.txt | 23 ++
.../bindings/arm/armada-370-xp-timer.txt | 11 +
.../devicetree/bindings/arm/armada-370-xp.txt | 24 +++
.../bindings/arm/mvebu-system-controller.txt | 17 ++
.../devicetree/bindings/arm/omap/omap.txt | 3 +
MAINTAINERS | 18 ++
arch/arm/Kconfig | 34 +++
arch/arm/Makefile | 2 +
arch/arm/boot/dts/armada-370-db.dts | 42 ++++
arch/arm/boot/dts/armada-370-xp.dtsi | 68 ++++++
arch/arm/boot/dts/armada-370.dtsi | 35 +++
arch/arm/boot/dts/armada-xp-db.dts | 50 +++++
arch/arm/boot/dts/armada-xp.dtsi | 55 +++++
arch/arm/boot/dts/omap5-evm.dts | 20 ++
arch/arm/boot/dts/omap5.dtsi | 184 ++++++++++++++++
arch/arm/boot/dts/socfpga.dtsi | 147 +++++++++++++
arch/arm/boot/dts/socfpga_cyclone5.dts | 34 +++
arch/arm/configs/mvebu_defconfig | 46 ++++
arch/arm/configs/omap2plus_defconfig | 1 +
arch/arm/configs/socfpga_defconfig | 83 +++++++
arch/arm/mach-mvebu/Kconfig | 16 ++
arch/arm/mach-mvebu/Makefile | 2 +
arch/arm/mach-mvebu/Makefile.boot | 3 +
arch/arm/mach-mvebu/armada-370-xp.c | 63 ++++++
arch/arm/mach-mvebu/common.h | 23 ++
arch/arm/mach-mvebu/include/mach/armada-370-xp.h | 22 ++
arch/arm/mach-mvebu/include/mach/debug-macro.S | 24 +++
arch/arm/mach-mvebu/include/mach/timex.h | 13 ++
arch/arm/mach-mvebu/include/mach/uncompress.h | 43 ++++
arch/arm/mach-mvebu/irq-armada-370-xp.c | 133 ++++++++++++
arch/arm/mach-mvebu/system-controller.c | 105 +++++++++
arch/arm/mach-omap2/Kconfig | 8 +-
arch/arm/mach-omap2/Makefile | 24 ++-
arch/arm/mach-omap2/board-generic.c | 42 ++--
arch/arm/mach-omap2/common.c | 24 +++
arch/arm/mach-omap2/common.h | 19 +-
arch/arm/mach-omap2/control.h | 4 +
arch/arm/mach-omap2/devices.c | 2 +-
arch/arm/mach-omap2/gpmc.c | 3 +-
arch/arm/mach-omap2/id.c | 42 +++-
arch/arm/mach-omap2/include/mach/debug-macro.S | 8 +-
arch/arm/mach-omap2/include/mach/omap-wakeupgen.h | 7 +
arch/arm/mach-omap2/io.c | 44 ++++
arch/arm/mach-omap2/iomap.h | 27 +++
arch/arm/mach-omap2/irq.c | 13 +-
arch/arm/mach-omap2/omap-headsmp.S | 21 ++
arch/arm/mach-omap2/omap-hotplug.c | 24 ++-
arch/arm/mach-omap2/omap-smp.c | 52 +++--
arch/arm/mach-omap2/omap-wakeupgen.c | 114 +++++++---
arch/arm/mach-omap2/omap4-common.c | 14 ++
arch/arm/mach-omap2/omap4-sar-layout.h | 12 +-
arch/arm/mach-omap2/omap_hwmod.c | 2 +-
arch/arm/mach-omap2/omap_l3_noc.h | 22 +-
arch/arm/mach-omap2/prcm-common.h | 2 +-
arch/arm/mach-omap2/prcm.c | 2 +-
arch/arm/mach-omap2/timer.c | 5 +
arch/arm/mach-socfpga/Makefile | 5 +
arch/arm/mach-socfpga/Makefile.boot | 1 +
arch/arm/mach-socfpga/include/mach/debug-macro.S | 16 ++
arch/arm/mach-socfpga/include/mach/timex.h | 19 ++
arch/arm/mach-socfpga/include/mach/uncompress.h | 9 +
arch/arm/mach-socfpga/socfpga.c | 62 ++++++
arch/arm/plat-omap/Kconfig | 4 +-
arch/arm/plat-omap/common.c | 9 +
arch/arm/plat-omap/counter_32k.c | 16 +-
arch/arm/plat-omap/include/plat/cpu.h | 22 +-
arch/arm/plat-omap/include/plat/hardware.h | 1 +
arch/arm/plat-omap/include/plat/multi.h | 9 +
arch/arm/plat-omap/include/plat/omap-secure.h | 5 -
arch/arm/plat-omap/include/plat/omap54xx.h | 32 +++
arch/arm/plat-omap/include/plat/serial.h | 10 +
arch/arm/plat-omap/include/plat/uncompress.h | 6 +
arch/arm/plat-omap/sram.c | 11 +-
drivers/clk/Makefile | 1 +
drivers/clk/socfpga/Makefile | 1 +
drivers/clk/socfpga/clk.c | 51 +++++
drivers/clocksource/Kconfig | 3 +
drivers/clocksource/Makefile | 3 +-
drivers/clocksource/time-armada-370-xp.c | 226 ++++++++++++++++++++
include/linux/dw_apb_timer.h | 1 +
include/linux/time-armada-370-xp.h | 18 ++
81 files changed, 2323 insertions(+), 99 deletions(-)
^ permalink raw reply [flat|nested] 44+ messages in thread
* [GIT PULL 10/15] arm-soc: defconfig updates
2012-07-23 20:32 ` Arnd Bergmann
@ 2012-07-23 20:33 ` Arnd Bergmann
-1 siblings, 0 replies; 44+ messages in thread
From: Arnd Bergmann @ 2012-07-23 20:32 UTC (permalink / raw)
To: Linus Torvalds; +Cc: linux-kernel, linux-arm-kernel, arm
The following changes since commit 84a1caf1453c3d44050bd22db958af4a7f99315c:
Linux 3.5-rc7 (2012-07-14 15:40:28 -0700)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git next/defconfig
for you to fetch changes up to 2d05bf6ef7391ac3642ab62bc3a649fdb32731fe:
Merge branch 'samsung/defconfig' into next/defconfig (2012-07-21 23:22:35 +0200)
----------------------------------------------------------------
arm-soc: defconfig updates
These are changes to the default configuration files, to account for
kernel changes and new hardware.
----------------------------------------------------------------
Arnd Bergmann (6):
Merge branch 'lpc32xx/defconfig' of git://git.antcom.de/linux-2.6 into next/defconfig
Merge branch 'mxs/defconfig-for-3.6' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/defconfig
Merge branch 'for-3.6/defconfig' of git://git.kernel.org/.../swarren/linux-tegra into next/defconfig
Merge tag 'imx-defconfig' of git://git.pengutronix.de/git/imx/linux-2.6 into next/defconfig
Merge branch 'samsung/defconfig' into next/defconfig
Merge branch 'next/defconfig' into for-next
Fabio Estevam (5):
ARM: mxs: Let GPMI driver be built by default
ARM: mxs: Enable MACH_APX4DEVKIT
ARM: mxs_defconfig: Let AUART driver be built by default
ARM: mxs_defconfig: Enable RTC driver
ARM: mxs: defconfig: Enable CONFIG_COMMON_CLK_DEBUG
Olof Johansson (1):
ARM: exynos_defconfig: enable more platforms in defconfig
Roland Stigge (1):
ARM: LPC32xx: Defconfig update
Sascha Hauer (2):
ARM: imx_v6_v7_defconfig: update features
ARM: imx_v4_v5_defconfig: update features
Stephen Warren (1):
ARM: tegra: defconfig updates
arch/arm/configs/exynos_defconfig | 92 ++++++++++++++++++++++++++++++++++
arch/arm/configs/imx_v4_v5_defconfig | 51 +++++++++----------
arch/arm/configs/imx_v6_v7_defconfig | 61 +++++++++++++---------
arch/arm/configs/lpc32xx_defconfig | 2 +
arch/arm/configs/mxs_defconfig | 7 +++
arch/arm/configs/tegra_defconfig | 13 +++--
6 files changed, 170 insertions(+), 56 deletions(-)
^ permalink raw reply [flat|nested] 44+ messages in thread
* [GIT PULL 11/15] arm-soc: board specific updates
2012-07-23 20:32 ` Arnd Bergmann
@ 2012-07-23 20:33 ` Arnd Bergmann
-1 siblings, 0 replies; 44+ messages in thread
From: Arnd Bergmann @ 2012-07-23 20:32 UTC (permalink / raw)
To: Linus Torvalds; +Cc: linux-kernel, linux-arm-kernel, arm
The following changes since commit 84a1caf1453c3d44050bd22db958af4a7f99315c:
Linux 3.5-rc7 (2012-07-14 15:40:28 -0700)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git next/boards
for you to fetch changes up to d003e09891fdc0c170b99328eba7ed004809ef5a:
Merge branch 'next/board-samsung-3' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/boards (2012-07-21 23:08:03 +0200)
----------------------------------------------------------------
arm-soc: board specific updates
These changes are all for individual board files. In the long run, those
files will largely go away, and the amount of changes appears to be
continuously decreasing, which is a good sign. This time around, changes
are focused on tegra, omap and samsung.
----------------------------------------------------------------
Andy Gross (1):
omap2+: add drm device
Arnd Bergmann (7):
Merge branch 'for-3.6/boards' of git://git.kernel.org/.../swarren/linux-tegra into next/boards
Merge branch 'next/board-samsung' of git://git.kernel.org/.../kgene/linux-samsung into next/boards
Merge tag 'omap-devel-board-for-v3.6' of git://git.kernel.org/.../tmlind/linux-omap into next/boards
Merge branch 'next/board-samsung-2' of git://git.kernel.org/.../kgene/linux-samsung into next/boards
Merge tag 'v3.5-rc7' into next/boards
Merge branch 'next/board-samsung-3' of git://git.kernel.org/.../kgene/linux-samsung into next/boards
Merge branch 'next/boards' into for-next
Dimitris Papastamos (1):
ARM: S3C64XX: Add IRQ mapping for wm0010 on Cragganmore
Dmitry Lifshitz (2):
ARM: OMAP3: cm-t35: add mt9t001 camera sensor support
ARM: OMAP3: cm-t35: add tvp5150 decoder support
Kukjin Kim (3):
Merge branch 'next/board-samsung' into next/board-samsung-2
Merge branch 'next/board-samsung-2' into next/board-samsung-3
ARM: SAMSUNG: no need to set the value for clk_xusbxti when it is 24Mhz
Laxman Dewangan (1):
ARM: tegra: add device tree AUXDATA for APBDMA
Mark Brown (7):
ARM: S3C64XX: Add module identification for Balblair Cragganmore module
ARM: S3C64XX: Add WM5102 EVM to Cragganmore modules
ARM: S3C64XX: Dynamically allocate the IRQ range for WM8994 on Cragganmore
ARM: S3C64XX: Dynamically assign interrupts for CPU PMIC on Cragganmore
ARM: S3C64XX: Don't specify an irq_base for WM1192-EV1 board
ARM: S3C64XX: Clean up after SPI driver platform data updates
ARM: S3C64XX: Mark most Cragganmore initdata devinitdata
Peter Ujfalusi (2):
ARM: OMAP: board-4430sdp: MUX configuration for sys_nirq2
ARM: OMAP: board-omap4panda: MUX configuration for sys_nirq2
Ricardo Salveti de Araujo (1):
ARM: EXYNOS: Add leds status1 and status2 on Origen board
Sachin Kamat (11):
ARM: EXYNOS: Add HSOTG support to Origen
ARM: EXYNOS: Add HSOTG support to SMDKV310
ARM: EXYNOS: Update keypad entries for SMDK4X12
ARM: S5PV210: Add HSOTG support to SMDKV210
ARM: EXYNOS: Add audio platform device in SMDKV310 board
ARM: S5PV210: Add audio platform device in Aquila board
ARM: S5PV210: Add audio platform device in Goni board
ARM: EXYNOS: Add HSOTG support to SMDK4X12
ARM: EXYNOS: Add framebuffer support for SMDK4X12
ARM: EXYNOS: Add DRM device to SMDK4X12 board
ARM: EXYNOS: Add missing .reserve field to SMDKC210
Stephen Warren (7):
ARM: tegra: make .dts compilation depend on Tegra2 support
ARM: tegra: remove CONFIG_MACH_TEGRA_DT
ARM: tegra: remove Seaboard board files
ARM: tegra: trimslice: enable PCIe when booting from device tree
ARM: tegra: harmony: init regulators, PCIe when booting from DT
ARM: tegra: paz00: enable WiFi rfkill when booting from device tree
ARM: tegra: use of_default_bus_match_table
Tony Lindgren (1):
ARM: OMAP3: Fix omap3evm randconfig error introduced by VBUS support
Zumeng Chen (4):
ARM: OMAP3EVM: Add NAND flash definition
ARM: OMAP3EVM: Adding USB internal LDOs board file
ARM: omap3evm: enable VBUS switch for EHCI tranceiver
ARM: OMAP3530evm: set pendown_state and debounce time for ads7846
arch/arm/Kconfig | 1 +
arch/arm/mach-exynos/Kconfig | 7 +
arch/arm/mach-exynos/mach-nuri.c | 3 +-
arch/arm/mach-exynos/mach-origen.c | 39 ++-
arch/arm/mach-exynos/mach-smdk4x12.c | 83 +++++-
arch/arm/mach-exynos/mach-smdkv310.c | 17 +-
arch/arm/mach-exynos/mach-universal_c210.c | 3 +-
arch/arm/mach-omap2/Makefile | 4 +
arch/arm/mach-omap2/board-4430sdp.c | 3 +
arch/arm/mach-omap2/board-cm-t35.c | 89 ++++++
arch/arm/mach-omap2/board-omap3evm.c | 78 ++++-
arch/arm/mach-omap2/board-omap4panda.c | 3 +
arch/arm/mach-omap2/common-board-devices.c | 11 +
arch/arm/mach-omap2/common-board-devices.h | 1 +
arch/arm/mach-omap2/drm.c | 61 ++++
arch/arm/mach-s3c64xx/include/mach/crag6410.h | 4 +-
arch/arm/mach-s3c64xx/mach-crag6410-module.c | 11 +-
arch/arm/mach-s3c64xx/mach-crag6410.c | 69 +++--
arch/arm/mach-s3c64xx/mach-smdk6410.c | 1 -
arch/arm/mach-s5pv210/Kconfig | 2 +
arch/arm/mach-s5pv210/mach-aquila.c | 7 +
arch/arm/mach-s5pv210/mach-goni.c | 11 +-
arch/arm/mach-s5pv210/mach-smdkv210.c | 10 +-
arch/arm/mach-tegra/Kconfig | 36 ---
arch/arm/mach-tegra/Makefile | 13 +-
arch/arm/mach-tegra/Makefile.boot | 10 +-
arch/arm/mach-tegra/board-dt-tegra20.c | 74 ++++-
arch/arm/mach-tegra/board-dt-tegra30.c | 8 +-
arch/arm/mach-tegra/board-harmony-pcie.c | 15 +-
arch/arm/mach-tegra/board-harmony-power.c | 25 +-
arch/arm/mach-tegra/board-paz00.c | 7 +-
arch/arm/mach-tegra/board-seaboard-pinmux.c | 197 -------------
arch/arm/mach-tegra/board-seaboard.c | 306 --------------------
arch/arm/mach-tegra/board-seaboard.h | 47 ---
arch/arm/mach-tegra/board.h | 9 +
drivers/staging/omapdrm/omap_drv.h | 2 +-
.../linux/platform_data/omap_drm.h | 19 +-
37 files changed, 593 insertions(+), 693 deletions(-)
^ permalink raw reply [flat|nested] 44+ messages in thread
* [GIT PULL 12/15] arm-soc: sparse IRQ conversion
2012-07-23 20:32 ` Arnd Bergmann
@ 2012-07-23 20:33 ` Arnd Bergmann
-1 siblings, 0 replies; 44+ messages in thread
From: Arnd Bergmann @ 2012-07-23 20:32 UTC (permalink / raw)
To: Linus Torvalds; +Cc: linux-kernel, linux-arm-kernel, arm
The following changes since commit 6887a4131da3adaab011613776d865f4bcfb5678:
Linux 3.5-rc5 (2012-06-30 16:08:57 -0700)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git next/irq
for you to fetch changes up to c7b0807b9d4faddd87a75a5acb079e5dbfedd211:
Merge branch 'imx/sparse-irq' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/irq (2012-07-06 21:12:59 +0200)
----------------------------------------------------------------
arm-soc: sparse IRQ conversion
The I.MX platform is getting converted to use sparse IRQs. We are doing
this for all platforms over time, because this is one of the
requirements for building a multiplatform kernel, and generally a good
idea.
----------------------------------------------------------------
Arnd Bergmann (3):
Merge branch 'imx/sparse-irq' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/irq
Merge branch 'imx/sparse-irq' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/irq
Merge branch 'next/irq' into for-next
Fabio Estevam (1):
ARM: imx: Fix build error due to missing irqs.h include
Shawn Guo (16):
ARM: imx: eliminate macro IMX_GPIO_TO_IRQ()
ARM: imx: eliminate macro IOMUX_TO_IRQ()
ARM: imx: eliminate macro IRQ_GPIOx()
gpio/mxc: move irq_domain_add_legacy call into gpio driver
ARM: imx: move irq_domain_add_legacy call into tzic driver
ARM: imx: move irq_domain_add_legacy call into avic driver
dma: ipu: remove the use of ipu_platform_data
ARM: imx: leave irq_base of wm8350_platform_data uninitialized
ARM: imx: pass gpio than irq number into mxc_expio_init
ARM: imx: add a legacy irqdomain for 3ds_debugboard
ARM: imx: add a legacy irqdomain for mx31ads
i2c: imx: remove unneeded mach/irqs.h inclusion
ARM: imx: remove unneeded mach/irq.h inclusion
tty: serial: imx: remove the use of MXC_INTERNAL_IRQS
ARM: fiq: change FIQ_START to a variable
ARM: imx: enable SPARSE_IRQ for imx platform
Uwe Kleine-König (1):
ARM: imx: select USE_OF
arch/arm/Kconfig | 2 +
arch/arm/include/asm/mach/irq.h | 2 +-
arch/arm/kernel/fiq.c | 9 +-
arch/arm/mach-imx/Kconfig | 4 -
arch/arm/mach-imx/devices-imx31.h | 4 +-
arch/arm/mach-imx/devices-imx35.h | 4 +-
arch/arm/mach-imx/eukrea_mbimx27-baseboard.c | 3 +-
arch/arm/mach-imx/eukrea_mbimxsd35-baseboard.c | 6 +-
arch/arm/mach-imx/imx27-dt.c | 28 ---
arch/arm/mach-imx/imx51-dt.c | 27 ---
arch/arm/mach-imx/imx53-dt.c | 27 ---
arch/arm/mach-imx/mach-apf9328.c | 7 +-
arch/arm/mach-imx/mach-armadillo5x0.c | 18 +-
arch/arm/mach-imx/mach-cpuimx27.c | 12 +-
arch/arm/mach-imx/mach-cpuimx35.c | 3 +-
arch/arm/mach-imx/mach-cpuimx51sd.c | 3 +-
arch/arm/mach-imx/mach-imx27_visstrim_m10.c | 9 +-
arch/arm/mach-imx/mach-imx6q.c | 14 --
arch/arm/mach-imx/mach-kzm_arm11_01.c | 20 ++-
arch/arm/mach-imx/mach-mx1ads.c | 1 -
arch/arm/mach-imx/mach-mx21ads.c | 16 +-
arch/arm/mach-imx/mach-mx27_3ds.c | 7 +-
arch/arm/mach-imx/mach-mx27ads.c | 12 +-
arch/arm/mach-imx/mach-mx31_3ds.c | 18 +-
arch/arm/mach-imx/mach-mx31ads.c | 63 ++++---
arch/arm/mach-imx/mach-mx31lilly.c | 10 +-
arch/arm/mach-imx/mach-mx31lite.c | 11 +-
arch/arm/mach-imx/mach-mx31moboard.c | 10 +-
arch/arm/mach-imx/mach-mx35_3ds.c | 18 +-
arch/arm/mach-imx/mach-mx51_3ds.c | 3 +-
arch/arm/mach-imx/mach-mx53_ard.c | 5 +-
arch/arm/mach-imx/mach-mxt_td60.c | 6 +-
arch/arm/mach-imx/mach-pca100.c | 5 +-
arch/arm/mach-imx/mach-pcm037.c | 24 +--
arch/arm/mach-imx/mach-pcm038.c | 4 +-
arch/arm/mach-imx/mach-pcm043.c | 6 +-
arch/arm/mach-imx/mach-qong.c | 10 +-
arch/arm/mach-imx/mach-scb9328.c | 7 +-
arch/arm/mach-imx/mach-vpr200.c | 10 +-
arch/arm/mach-imx/mm-imx1.c | 1 -
arch/arm/mach-imx/mm-imx21.c | 1 -
arch/arm/mach-imx/mm-imx25.c | 1 -
arch/arm/mach-imx/mm-imx27.c | 1 -
arch/arm/mach-imx/mm-imx3.c | 1 -
arch/arm/mach-imx/mx31lilly-db.c | 11 +-
arch/arm/mach-imx/mx31lite-db.c | 5 +-
arch/arm/mach-imx/mx51_efika.c | 3 +-
arch/arm/mach-imx/pcm970-baseboard.c | 13 +-
arch/arm/mach-rpc/irq.c | 2 +-
arch/arm/plat-mxc/3ds_debugboard.c | 50 +++---
arch/arm/plat-mxc/avic.c | 35 +++-
arch/arm/plat-mxc/devices/platform-ipu-core.c | 5 +-
arch/arm/plat-mxc/include/mach/3ds_debugboard.h | 2 +-
arch/arm/plat-mxc/include/mach/devices-common.h | 4 +-
arch/arm/plat-mxc/include/mach/hardware.h | 2 -
arch/arm/plat-mxc/include/mach/iomux-mx3.h | 3 -
arch/arm/plat-mxc/include/mach/iomux-v1.h | 7 -
arch/arm/plat-mxc/include/mach/ipu.h | 4 -
arch/arm/plat-mxc/include/mach/irqs.h | 44 -----
arch/arm/plat-mxc/include/mach/mx1.h | 111 ++++++------
arch/arm/plat-mxc/include/mach/mx21.h | 107 +++++------
arch/arm/plat-mxc/include/mach/mx25.h | 72 ++++----
arch/arm/plat-mxc/include/mach/mx27.h | 127 ++++++-------
arch/arm/plat-mxc/include/mach/mx2x.h | 87 ++++-----
arch/arm/plat-mxc/include/mach/mx31.h | 118 ++++++------
arch/arm/plat-mxc/include/mach/mx35.h | 109 ++++++------
arch/arm/plat-mxc/include/mach/mx3x.h | 77 ++++----
arch/arm/plat-mxc/include/mach/mx50.h | 187 +++++++++----------
arch/arm/plat-mxc/include/mach/mx51.h | 209 +++++++++++-----------
arch/arm/plat-mxc/include/mach/mx53.h | 217 ++++++++++++-----------
arch/arm/plat-mxc/tzic.c | 30 +++-
arch/arm/plat-s3c24xx/irq.c | 2 +-
drivers/dma/ipu/ipu_idmac.c | 8 +-
drivers/dma/ipu/ipu_irq.c | 14 +-
drivers/gpio/gpio-mxc.c | 56 +++---
drivers/i2c/busses/i2c-imx.c | 1 -
drivers/media/video/mx1_camera.c | 1 +
drivers/tty/serial/imx.c | 6 +-
sound/soc/fsl/imx-pcm-fiq.c | 1 +
79 files changed, 1052 insertions(+), 1131 deletions(-)
^ permalink raw reply [flat|nested] 44+ messages in thread
* [GIT PULL 13/15] arm-soc: pincontrol drivers
2012-07-23 20:32 ` Arnd Bergmann
@ 2012-07-23 20:33 ` Arnd Bergmann
-1 siblings, 0 replies; 44+ messages in thread
From: Arnd Bergmann @ 2012-07-23 20:32 UTC (permalink / raw)
To: Linus Torvalds; +Cc: linux-kernel, linux-arm-kernel, arm
The following changes since commit ca24a145573124732152daff105ba68cc9a2b545:
Merge branch 'fixes' of git://git.linaro.org/people/rmk/linux-arm (2012-07-01 11:02:25 -0700)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git next/pinctrl
for you to fetch changes up to 8ee41a62a3800b8450985d2970fd985421ad7043:
Merge branch 'prima2/pinctrl' into next/pinctrl (2012-07-04 16:54:54 +0200)
----------------------------------------------------------------
arm-soc: pincontrol drivers
We are converting platforms to use the pinctrl framework over time,
rather than using platform specific code for the same effect. This
adds the respective driver for the prima2 platform.
----------------------------------------------------------------
Arnd Bergmann (4):
Merge branch 'prima2/drivers' of git://gitorious.org/sirfprima2-kernel/sirfprima2-kernel into next/pinctrl
ARM: prima2: enable gpiolib unconditionally
Merge branch 'prima2/pinctrl' into next/pinctrl
Merge branch 'next/pinctrl' into for-next
Barry Song (1):
PINCTRL: SiRF: add GPIO and GPIO irq support in CSR SiRFprimaII
arch/arm/Kconfig | 1 +
arch/arm/mach-prima2/include/mach/gpio.h | 13 +
arch/arm/mach-prima2/include/mach/irqs.h | 2 +-
drivers/pinctrl/pinctrl-sirf.c | 489 +++++++++++++++++++++++++++++-
4 files changed, 503 insertions(+), 2 deletions(-)
^ permalink raw reply [flat|nested] 44+ messages in thread
* [GIT PULL 14/15] arm-soc: power management changes
2012-07-23 20:32 ` Arnd Bergmann
@ 2012-07-23 20:33 ` Arnd Bergmann
-1 siblings, 0 replies; 44+ messages in thread
From: Arnd Bergmann @ 2012-07-23 20:32 UTC (permalink / raw)
To: Linus Torvalds; +Cc: linux-kernel, linux-arm-kernel, arm
The following changes since commit 6b16351acbd415e66ba16bf7d473ece1574cf0bc:
Linux 3.5-rc4 (2012-06-24 12:53:04 -0700)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git next/pm
for you to fetch changes up to 6b21a9ce0402e0c5fd2adfa3d41328fdd8f55a9a:
Merge tag 'omap-devel-pm-for-v3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/pm (2012-07-03 22:02:17 +0200)
----------------------------------------------------------------
arm-soc: power management changes
These are various power management related changes, mainly concerning
cpuidle on i.MX and OMAP, as well as a the move of the omap smartreflex
driver to live in the power subsystem.
----------------------------------------------------------------
Arnd Bergmann (3):
Merge tag 'omap-devel-driver-for-v3.6' of git://git.kernel.org/.../tmlind/linux-omap into next/pm
Merge tag 'omap-devel-pm-for-v3.6' of git://git.kernel.org/.../tmlind/linux-omap into next/pm
Merge branch 'next/pm' into for-next
J Keerthy (1):
ARM: OMAP2+: Voltage: Move the omap_volt_data structure to plat
Jean Pihet (13):
ARM: OMAP2+: SmartReflex: move the smartreflex header to include/linux/power
ARM: OMAP3+: SmartReflex: class drivers should use struct omap_sr *
ARM: OMAP2+: smartreflex: Use the names from hwmod data instead of voltage domains.
ARM: OMAP3: hwmod: rename the smartreflex entries
ARM: OMAP2+: SmartReflex: introduce a busy loop condition test macro
ARM: OMAP2+: SmartReflex: Use per-OPP data structure
ARM: OMAP2+: SmartReflex: Create per-opp debugfs node for errminlimit
ARM: OMAP2+: SmartReflex: add POWER_AVS Kconfig options
ARM: OMAP: SmartReflex: Move smartreflex driver to drivers/
ARM: OMAP3: PM: cpuidle: default to C1 in next_valid_state
ARM: OMAP3: PM: cpuidle: optimize the PER latency in C1 state
ARM: OMAP3: PM: cpuidle: optimize the clkdm idle latency in C1 state
ARM: OMAP2+: do not allow SmartReflex to be built as a module
Kevin Hilman (5):
ARM: OMAP2+: PRM: fix compile for OMAP4-only build
ARM: OMAP2+: powerdomain: allow pre/post transtion to be per pwrdm
ARM: OMAP3: PM: call pre/post transition per powerdomain
ARM: OMAP3: PM: cleanup cam_pwrdm leftovers
ARM: OMAP2+: PM: fix IRQ_NOAUTOEN removal by mis-merge
Mohan V (1):
ARM: OMAP3: PM: correct enable/disable of daisy io chain
Olof Johansson (1):
Merge branch 'imx/cpuidle' into next/pm
Paul Walmsley (4):
W1: OMAP HDQ1W: allow driver to be built on all OMAP2+
W1: OMAP HDQ1W: use 32-bit register accesses
ARM: OMAP2+: HDQ1W: use omap_device
W1: OMAP HDQ1W: use runtime PM
Rajendra Nayak (1):
ARM: OMAP4: PRM: Add IO Daisychain support
Robert Lee (7):
ARM: imx: Modify IMX_IO_P2V macro
ARM: imx: Add comments to tzic_enable_waker()
ARM: imx: clean and consolidate imx5 suspend and idle code
ARM: imx: Enable imx53 low power idle
ARM: imx: Add common imx cpuidle init functionality.
ARM: imx: Add imx5 cpuidle
ARM: imx: Add imx6q cpuidle driver
Tero Kristo (1):
ARM: OMAP3+: PRM: Enable IO wake up
Tony Lindgren (5):
Merge tag 'omap-devel-b-for-3.6' of git://git.kernel.org/.../pjw/omap-pending into devel-driver
Merge tag 'omap-devel-c-for-3.6' of git://git.kernel.org/.../pjw/omap-pending into devel-pm
ARM: OMAP2: Use hwmod to initialize mmc for 2420
Merge branch 'for_3.6/pm/sr-move' of git://git.kernel.org/.../khilman/linux-omap-pm into devel-driver
Merge branch 'for_3.6/pm/performance' of git://git.kernel.org/.../khilman/linux-omap-pm into devel-pm
Vishwanath BS (3):
ARM: OMAP3: PM: Move IO Daisychain function to omap3 prm file
ARM: OMAP3PLUS: hwmod: reconfigure IO Daisychain during hwmod mux
ARM: OMAP3: PM: Remove IO Daisychain control from cpuidle
arch/arm/mach-imx/clk-imx51-imx53.c | 2 +-
arch/arm/mach-imx/imx53-dt.c | 1 +
arch/arm/mach-imx/mach-imx6q.c | 19 +++
arch/arm/mach-imx/mach-mx53_ard.c | 1 +
arch/arm/mach-imx/mach-mx53_evk.c | 1 +
arch/arm/mach-imx/mach-mx53_loco.c | 1 +
arch/arm/mach-imx/mach-mx53_smd.c | 1 +
arch/arm/mach-imx/mm-imx5.c | 26 +---
arch/arm/mach-imx/pm-imx5.c | 111 ++++++++++----
arch/arm/mach-omap2/Makefile | 5 +-
arch/arm/mach-omap2/cpuidle34xx.c | 71 ++++-----
arch/arm/mach-omap2/devices.c | 108 -------------
arch/arm/mach-omap2/hdq1w.c | 26 ++++
arch/arm/mach-omap2/msdi.c | 73 +++++++++
arch/arm/mach-omap2/omap-mpuss-lowpower.c | 4 +-
arch/arm/mach-omap2/omap_hwmod.c | 38 ++++-
arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 12 +-
arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 3 +-
arch/arm/mach-omap2/pm.h | 2 +-
arch/arm/mach-omap2/pm34xx.c | 63 ++------
arch/arm/mach-omap2/powerdomain.c | 16 +-
arch/arm/mach-omap2/powerdomain.h | 4 +-
arch/arm/mach-omap2/prcm-common.h | 8 +
arch/arm/mach-omap2/prm2xxx_3xxx.c | 48 ++++++
arch/arm/mach-omap2/prm2xxx_3xxx.h | 2 +
arch/arm/mach-omap2/prm44xx.c | 63 +++++++-
arch/arm/mach-omap2/prm44xx.h | 2 +
arch/arm/mach-omap2/smartreflex-class3.c | 29 ++--
arch/arm/mach-omap2/sr_device.c | 39 ++++-
arch/arm/mach-omap2/voltage.h | 21 +--
arch/arm/plat-mxc/Makefile | 1 +
arch/arm/plat-mxc/cpuidle.c | 80 ++++++++++
arch/arm/plat-mxc/include/mach/common.h | 6 +-
arch/arm/plat-mxc/include/mach/cpuidle.h | 22 +++
arch/arm/plat-mxc/include/mach/hardware.h | 25 +--
arch/arm/plat-mxc/tzic.c | 4 +
arch/arm/plat-omap/Kconfig | 31 ++--
arch/arm/plat-omap/include/plat/voltage.h | 21 ++-
drivers/power/Kconfig | 2 +
drivers/power/Makefile | 1 +
drivers/power/avs/Kconfig | 12 ++
drivers/power/avs/Makefile | 1 +
.../mach-omap2 => drivers/power/avs}/smartreflex.c | 161 ++++++++------------
drivers/w1/masters/Kconfig | 2 +-
drivers/w1/masters/omap_hdq.c | 86 +++--------
.../linux/power}/smartreflex.h | 74 +++++++--
46 files changed, 808 insertions(+), 521 deletions(-)
^ permalink raw reply [flat|nested] 44+ messages in thread
* [GIT PULL 15/15] arm-soc: clk changes
2012-07-23 20:32 ` Arnd Bergmann
@ 2012-07-23 20:33 ` Arnd Bergmann
-1 siblings, 0 replies; 44+ messages in thread
From: Arnd Bergmann @ 2012-07-23 20:32 UTC (permalink / raw)
To: Linus Torvalds; +Cc: linux-kernel, linux-arm-kernel, arm
The following changes since commit fb584511c4664573097ece7df0de06ad00b713a2:
ARM: OMAP: sdrc: Fix the build break for OMAP4 only builds (2012-07-09 01:44:11 -0700)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git next/clk
for you to fetch changes up to 36c678f3c91ac92e9524abcf9b39f9f539d60279:
Merge tag 'imx-clk' of git://git.pengutronix.de/git/imx/linux-2.6 into next/clk (2012-07-17 22:41:50 +0200)
----------------------------------------------------------------
arm-soc: clk changes
Clock support is moving to the clk subsystem. These tegra, omap and imx
changes are for code that is still platform specific and not (yet)
part of that subsystem.
----------------------------------------------------------------
Alexander Shiyan (4):
ARM: i.MX5x clocks: Add EPIT support
ARM: i.MX5x clocks: Fix parent for PWM clocks
ARM: i.MX5x clocks: Fix GPT clocks
ARM: i.MX5x CSPI: Fixed clock name for CSPI
Arnd Bergmann (6):
Merge branch 'tegra/cleanup' into next/clk
Merge branch 'for-3.6/common-clk' of git://git.kernel.org/.../swarren/linux-tegra into next/clk
Merge branch 'omap/cleanup2' into next/clk
Merge tag 'omap-devel-am33xx-data-for-v3.6' of git://git.kernel.org/.../tmlind/linux-omap into next/clk
Merge tag 'imx-clk' of git://git.pengutronix.de/git/imx/linux-2.6 into next/clk
Merge branch 'next/clk' into for-next
Fabio Estevam (3):
ARM: clk-imx27: Fix rtc clock id
ARM: mx27: Reenable silicon version print
ARM: imx: clk-imx31: Fix clock id for rnga driver
Laxman Dewangan (1):
ARM: tegra: dma: rename driver name for clock to "tegra-apbdma"
Paul Walmsley (1):
ARM: OMAP3+: clock: Move common clksel_rate & clock data to common file
Prashant Gaikwad (10):
ARM: tegra: add clk_prepare/clk_unprepare
i2c: tegra: Add clk_prepare/clk_unprepare
mmc: tegra: add clk_prepare/clk_unprepare
USB: ehci-tegra: add clk_prepare/clk_unprepare
Input: tegra-kbc - add clk_prepare/clk_unprepare
spi/tegra: add clk_prepare/clk_unprepare
staging: nvec: add clk_prepare/clk_unprepare
ASoC: tegra: add clk_prepare/clk_unprepare
crypto: add clk_prepare/clk_unprepare
ARM: tegra: Remove second instance of uart clk
Simon Que (1):
ARM: tegra: Fix PWM clock programming
Thierry Reding (1):
ARM: tegra: Provide clock for only one PWM controller
Tony Lindgren (1):
Merge tag 'omap-devel-e-for-3.5' of git://git.kernel.org/.../pjw/omap-pending into devel-am33xx-data
Uwe Kleine-König (1):
ARM: imx: add missing item to the list of clock event modes
Vaibhav Hiremath (1):
ARM: OMAP3+: clock33xx: Add AM33XX clock tree data
arch/arm/mach-imx/clk-imx27.c | 4 +-
arch/arm/mach-imx/clk-imx31.c | 4 +-
arch/arm/mach-imx/clk-imx51-imx53.c | 23 +-
arch/arm/mach-omap2/Makefile | 1 +
arch/arm/mach-omap2/clock.h | 14 +
arch/arm/mach-omap2/clock33xx_data.c | 1105 +++++++++++++++++++++++++
arch/arm/mach-omap2/clock3xxx_data.c | 20 +-
arch/arm/mach-omap2/clock44xx_data.c | 72 --
arch/arm/mach-omap2/clock_common_data.c | 77 ++
arch/arm/mach-omap2/io.c | 2 +
arch/arm/mach-tegra/cpu-tegra.c | 6 +-
arch/arm/mach-tegra/dma.c | 4 +-
arch/arm/mach-tegra/pcie.c | 6 +-
arch/arm/mach-tegra/powergate.c | 4 +-
arch/arm/mach-tegra/tegra2_clocks.c | 58 +-
arch/arm/mach-tegra/tegra30_clocks.c | 28 +-
arch/arm/mach-tegra/timer.c | 4 +-
arch/arm/mach-tegra/usb_phy.c | 16 +-
arch/arm/plat-mxc/devices/platform-spi_imx.c | 2 +-
arch/arm/plat-mxc/time.c | 3 +-
arch/arm/plat-omap/include/plat/clkdev_omap.h | 1 +
drivers/crypto/tegra-aes.c | 12 +-
drivers/i2c/busses/i2c-tegra.c | 10 +-
drivers/input/keyboard/tegra-kbc.c | 4 +-
drivers/mmc/host/sdhci-tegra.c | 6 +-
drivers/spi/spi-tegra.c | 4 +-
drivers/staging/nvec/nvec.c | 8 +-
drivers/usb/host/ehci-tegra.c | 20 +-
sound/soc/tegra/tegra20_i2s.c | 4 +-
sound/soc/tegra/tegra20_spdif.c | 4 +-
sound/soc/tegra/tegra30_ahub.c | 8 +-
sound/soc/tegra/tegra30_i2s.c | 4 +-
sound/soc/tegra/tegra_asoc_utils.c | 12 +-
33 files changed, 1347 insertions(+), 203 deletions(-)
^ permalink raw reply [flat|nested] 44+ messages in thread
* [GIT PULL 01/15] arm-soc: non-critical bug fixes
@ 2012-07-23 20:33 ` Arnd Bergmann
0 siblings, 0 replies; 44+ messages in thread
From: Arnd Bergmann @ 2012-07-23 20:33 UTC (permalink / raw)
To: linux-arm-kernel
The following changes since commit 6887a4131da3adaab011613776d865f4bcfb5678:
Linux 3.5-rc5 (2012-06-30 16:08:57 -0700)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git next/fixes-non-critical
for you to fetch changes up to 913bdf1217f40c5e68c6b09f299177e5cd9629bd:
Merge tag 'ep93xx-fixes-for-3.6' of git://github.com/RyanMallon/linux-ep93xx into next/fixes-non-critical (2012-07-18 18:56:34 +0200)
----------------------------------------------------------------
arm-soc: non-critical bug fixes
These were submitted as bug fixes before v3.5 but not considered
important enough to be included in it.
----------------------------------------------------------------
Arnd Bergmann (6):
ARM: OMAP depends on MMU
Merge tag 'omap-fixes-non-critical-for-v3.6' of git://git.kernel.org/.../tmlind/linux-omap into next/fixes-non-critical
Merge branch 'mxs/fixes-for-3.6' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/fixes-non-critical
Merge tag 'davinci-v3.6-fixes' of git://gitorious.org/linux-davinci/linux-davinci into next/fixes-non-critical
Merge tag 'ep93xx-fixes-for-3.6' of git://github.com/RyanMallon/linux-ep93xx into next/fixes-non-critical
Merge branch 'next/fixes-non-critical' into for-next
Brian Austin (1):
ARM: OMAP: beagle: Set USB Host Port 1 to OMAP_USBHS_PORT_MODE_UNUSED
Daniel Lezcano (1):
ARM: OMAP3/4: consolidate cpuidle Makefile
Igor Grinberg (1):
ARM: OMAP: fix the ads7846 init code
Javier Martinez Canillas (1):
ARM: OMAP: omap2plus_defconfig: Enable EXT4 support
Juan Gutierrez (2):
ARM: OMAP: enable mailbox irq per instance
ARM: OMAP4: fix irq and clock name for dsp-iommu
Kevin Hilman (3):
ARM: OMAP2+: TWL: remove usage of pdata->irq_base/_end
mfd: twl: remove pdata->irq_base/_end, no more users
ARM: OMAP2+: fix CONFIG_CPU_IDLE dependency on CONFIG_PM
Mark A. Greer (4):
ARM: OMAP3: PM: Only access IVA if one exists
ARM: OMAP AM35x: EMAC/MDIO integration: Add Davinci EMAC/MDIO hwmod support
ARM: OMAP AM35x: clockdomain data: Fix clockdomain dependencies
arm: omap3: am35x: Set proper powerdomain states
Nishanth Menon (1):
ARM: OMAP2+: OPP: Fix to ensure check of right oppdef after bad one
Ohad Ben-Cohen (1):
ARM: OMAP4: hwspinlocks_init() should be static
Paul Bolle (4):
ARM: OMAP7XX: Remove omap730.h and omap850.h
ARM: OMAP: fix typos related to OMAP330
ARM: OMAP: remove unused cpu detection macros
ARM: mxs/tx28: fix odd include
Paul Walmsley (4):
ARM: OMAP AM35xx: clock and hwmod data: fix AM35xx HSOTGUSB hwmod
ARM: OMAP AM35xx: clock and hwmod data: fix UART4 data
ARM: OMAP: AM35xx: fix UART4 softreset
Merge branches 'am35xx_hwmod_data_fixes_a_3.6', 'am35xx_emac_mdio_devel_3.6' and 'am35xx_prcm_data_devel_3.6' into am35xx_devel_3.6
Peter Ujfalusi (1):
ARM: OMAP2: twl-common: Fix compiler warning
Roland Stigge (1):
ARM: OMAP: Fix dts files w/ status property: "disable" -> "disabled"
Sekhar Nori (1):
ARM: davinci: da8xx: fix interrupt handling
Todor Colov (1):
arm: ep93xx: Enable i2c support for ep9302
Tony Lindgren (5):
Merge branch 'for-tony' of git://git.kernel.org/.../ohad/linux into fixes-omap4-dsp
Merge branch 'fixes-omap4-dsp' into fixes-non-critical
Merge branch 'for_3.6/cleanup/pm' of git://git.kernel.org/.../khilman/linux-omap-pm into fixes-non-critical
Merge branch 'for_3.6/cleanup/twl-irq' of git://git.kernel.org/.../khilman/linux-omap-pm into fixes-non-critical
Merge tag 'omap-devel-d-for-3.6' of git://git.kernel.org/.../pjw/omap-pending into fixes-non-critical
Tony Prisk (1):
ARM:vt8500: Convert to use .restart and remove arch_reset()
Venkatraman S (1):
ARM: OMAP2+: fix naming collision of variable nr_irqs
arch/arm/Kconfig | 1 +
arch/arm/boot/dts/omap3-beagle.dts | 4 +-
arch/arm/boot/dts/omap4-panda.dts | 6 +-
arch/arm/boot/dts/omap4-sdp.dts | 4 +-
arch/arm/configs/omap2plus_defconfig | 1 +
arch/arm/mach-davinci/include/mach/entry-macro.S | 8 +-
arch/arm/mach-ep93xx/edb93xx.c | 4 +-
arch/arm/mach-mxs/module-tx28.c | 2 +-
arch/arm/mach-omap2/Kconfig | 2 +
arch/arm/mach-omap2/Makefile | 7 +-
arch/arm/mach-omap2/am35xx-emac.c | 90 +++++++------
arch/arm/mach-omap2/board-2430sdp.c | 3 -
arch/arm/mach-omap2/board-omap3beagle.c | 2 +-
arch/arm/mach-omap2/board-omap3logic.c | 3 -
arch/arm/mach-omap2/clock3xxx_data.c | 28 ++--
arch/arm/mach-omap2/clockdomains3xxx_data.c | 157 ++++++++++++++++++++--
arch/arm/mach-omap2/cm-regbits-34xx.h | 4 +-
arch/arm/mach-omap2/common-board-devices.c | 22 +--
arch/arm/mach-omap2/cpuidle34xx.c | 8 --
arch/arm/mach-omap2/cpuidle44xx.c | 8 --
arch/arm/mach-omap2/include/mach/am35xx.h | 2 +
arch/arm/mach-omap2/irq.c | 8 +-
arch/arm/mach-omap2/mailbox.c | 2 -
arch/arm/mach-omap2/omap-iommu.c | 6 +-
arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 143 ++++++++++++++++++--
arch/arm/mach-omap2/opp.c | 3 +-
arch/arm/mach-omap2/pm.h | 17 ++-
arch/arm/mach-omap2/pm34xx.c | 15 ++-
arch/arm/mach-omap2/powerdomains3xxx_data.c | 139 +++++++++++++++++--
arch/arm/mach-omap2/prcm-common.h | 4 +-
arch/arm/mach-omap2/prm_common.c | 8 +-
arch/arm/mach-omap2/twl-common.c | 11 +-
arch/arm/mach-vt8500/Makefile | 2 +-
arch/arm/mach-vt8500/bv07.c | 3 +
arch/arm/mach-vt8500/include/mach/restart.h | 17 +++
arch/arm/mach-vt8500/include/mach/system.h | 13 --
arch/arm/mach-vt8500/restart.c | 54 ++++++++
arch/arm/mach-vt8500/wm8505_7in.c | 4 +-
arch/arm/plat-omap/include/plat/cpu.h | 20 +--
arch/arm/plat-omap/include/plat/mux.h | 2 +-
arch/arm/plat-omap/include/plat/omap730.h | 102 --------------
arch/arm/plat-omap/include/plat/omap850.h | 102 --------------
arch/arm/plat-omap/mailbox.c | 13 +-
include/linux/i2c/twl.h | 1 -
44 files changed, 634 insertions(+), 421 deletions(-)
^ permalink raw reply [flat|nested] 44+ messages in thread
* [GIT PULL 06/15] arm-soc: spi updates
@ 2012-07-23 20:33 ` Arnd Bergmann
0 siblings, 0 replies; 44+ messages in thread
From: Arnd Bergmann @ 2012-07-23 20:33 UTC (permalink / raw)
To: linux-arm-kernel
The following changes since commit 84a1caf1453c3d44050bd22db958af4a7f99315c:
Linux 3.5-rc7 (2012-07-14 15:40:28 -0700)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git next/spi
for you to fetch changes up to 85644d2a8893d72d1869c6347e791902dd414288:
Merge branch 'next/devel-samsung-spi' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/spi (2012-07-21 23:12:15 +0200)
----------------------------------------------------------------
arm-soc: spi updates
These changes conceptually belong into the spi tree, but we decided to
put them into arm-soc to better deal with interdependencies with other
platform specific patches that are already there.
----------------------------------------------------------------
Arnd Bergmann (2):
Merge branch 'next/devel-samsung-spi' of git://git.kernel.org/.../kgene/linux-samsung into next/spi
Merge branch 'next/spi' into for-next
Kukjin Kim (1):
Merge branch 'next/dt-samsung' into next/devel-samsung-spi
Mark Brown (4):
spi/s3c64xx: Fix handling of errors in gpio_request()
spi/s3c64xx: Put the /CS GPIO into output mode
spi/s3c64xx: Convert to devm_request_and_ioremap()
spi/s3c64xx: Expand S3C64XX_SPI_{DE,}ACT macros at call sites
drivers/spi/spi-s3c64xx.c | 42 ++++++++++++------------------------------
1 file changed, 12 insertions(+), 30 deletions(-)
^ permalink raw reply [flat|nested] 44+ messages in thread
* [GIT PULL 08/15] arm-soc: cleanups, part 2
@ 2012-07-23 20:33 ` Arnd Bergmann
0 siblings, 0 replies; 44+ messages in thread
From: Arnd Bergmann @ 2012-07-23 20:33 UTC (permalink / raw)
To: linux-arm-kernel
The following changes since commit 6887a4131da3adaab011613776d865f4bcfb5678:
Linux 3.5-rc5 (2012-06-30 16:08:57 -0700)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git next/cleanup2
for you to fetch changes up to db3c47a3af96e8109b1bb114c32f0854259d5970:
Merge tag 'omap-cleanup-part2-for-v3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/cleanup2 (2012-07-10 16:58:19 +0200)
----------------------------------------------------------------
arm-soc: cleanups, part 2
These omap cleanups have dependencies on earlier omap branches that in
turn depend on other cleanups, so they could not go into the same
branch.
----------------------------------------------------------------
Arnd Bergmann (2):
Merge tag 'omap-cleanup-part2-for-v3.6' of git://git.kernel.org/.../tmlind/linux-omap into next/cleanup2
Merge branch 'next/cleanup2' into for-next
Jon Hunter (2):
ARM: OMAP4: clockdomain/CM code: Update supported transition modes
ARM: OMAP2+: powerdomain code: Fix Wake-up power domain power status
Kishon Vijay Abraham I (1):
ARM: OMAP2+: hwmod code: add support to set dmadisable in hwmod framework
Paul Walmsley (1):
Merge branches 'hwmod_am335x_support_3.6', 'clkdm_pwrdm_devel_a_3.6' and 'misc_devel_3.6' into omap_devel_f_3.6
R Sricharan (1):
ARM: OMAP2+: PRM/CM: Move the stubbed prm and cm functions to prcm.c file and make them __weak
Sakari Ailus (1):
ARM: OMAP3: control: add definition for CONTROL_CAMERA_PHY_CTRL
Santosh Shilimkar (1):
ARM: OMAP: sdrc: Fix the build break for OMAP4 only builds
Tarun Kanti DebBarma (3):
ARM: OMAP2+: hwmod: add omap_hwmod_get_main_clk() API
ARM: OMAP: dmtimer: use devm_ API and do some cleanup in probe()
ARM: OMAP2+: dmtimer: cleanup fclk usage
Tony Lindgren (3):
Merge tags 'omap-cleanup-for-v3.6', 'omap-devel-dmtimer-for-v3.6' and 'omap-devel-am33xx-for-v3.6' into devel-am33xx-part2
Merge tag 'omap-devel-f-for-3.6' of git://git.kernel.org/.../pjw/omap-pending into cleanup-part2
ARM: OMAP2+: Fix mismerge for omap_hwmod_get_main_clk() API
Vaibhav Hiremath (7):
ARM: OMAP2+: hwmod: Add new sysc_type3 into omap_hwmod required for am33xx
ARM: OMAP3/4: omap_hwmod: Add rstst_offs field to struct omap_hwmod_omap4_prcm
ARM: OMAP2+: All OMAP2PLUS uses omap-device.o target so add one entry
ARM: OMAP2+: Move omap3 dpll ops to dpll3xxx.c
ARM: OMAP2+: am33xx: Make am33xx as a separate class
ARM: OMAP2+: am33xx: Change cpu_is_am33xx to soc_is_am33xx
ARM: OMAP2+: Remove unnecessary ifdef around __omap2_set_globals
Vikram Pandita (1):
ARM: OMAP3+: dpll: optimize noncore dpll locking logic
arch/arm/mach-omap2/Kconfig | 12 +++-
arch/arm/mach-omap2/Makefile | 8 ++-
arch/arm/mach-omap2/clock.c | 18 ------
arch/arm/mach-omap2/clock3xxx_data.c | 2 +-
arch/arm/mach-omap2/clock44xx_data.c | 22 ++++----
arch/arm/mach-omap2/clockdomain44xx.c | 10 +++-
arch/arm/mach-omap2/cminst44xx.c | 14 -----
arch/arm/mach-omap2/cminst44xx.h | 25 ---------
arch/arm/mach-omap2/common.c | 10 +---
arch/arm/mach-omap2/common.h | 5 ++
arch/arm/mach-omap2/control.h | 1 +
arch/arm/mach-omap2/dpll3xxx.c | 26 ++++++++-
arch/arm/mach-omap2/id.c | 4 +-
arch/arm/mach-omap2/omap_hwmod.c | 76 ++++++++++++++++++++++++--
arch/arm/mach-omap2/omap_hwmod_common_data.c | 10 ++++
arch/arm/mach-omap2/powerdomain.c | 6 +-
arch/arm/mach-omap2/prcm.c | 23 ++++++++
arch/arm/mach-omap2/prm2xxx_3xxx.h | 65 ----------------------
arch/arm/mach-omap2/prm_common.c | 62 +++++++++++++++++++++
arch/arm/mach-omap2/timer.c | 3 +-
arch/arm/plat-omap/Makefile | 4 +-
arch/arm/plat-omap/dmtimer.c | 53 ++++++------------
arch/arm/plat-omap/include/plat/cpu.h | 17 +++---
arch/arm/plat-omap/include/plat/omap_hwmod.h | 19 +++++++
arch/arm/plat-omap/include/plat/sdrc.h | 2 +-
arch/arm/plat-omap/sram.c | 6 +-
26 files changed, 296 insertions(+), 207 deletions(-)
^ permalink raw reply [flat|nested] 44+ messages in thread
* [GIT PULL 15/15] arm-soc: clk changes
@ 2012-07-23 20:33 ` Arnd Bergmann
0 siblings, 0 replies; 44+ messages in thread
From: Arnd Bergmann @ 2012-07-23 20:33 UTC (permalink / raw)
To: linux-arm-kernel
The following changes since commit fb584511c4664573097ece7df0de06ad00b713a2:
ARM: OMAP: sdrc: Fix the build break for OMAP4 only builds (2012-07-09 01:44:11 -0700)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git next/clk
for you to fetch changes up to 36c678f3c91ac92e9524abcf9b39f9f539d60279:
Merge tag 'imx-clk' of git://git.pengutronix.de/git/imx/linux-2.6 into next/clk (2012-07-17 22:41:50 +0200)
----------------------------------------------------------------
arm-soc: clk changes
Clock support is moving to the clk subsystem. These tegra, omap and imx
changes are for code that is still platform specific and not (yet)
part of that subsystem.
----------------------------------------------------------------
Alexander Shiyan (4):
ARM: i.MX5x clocks: Add EPIT support
ARM: i.MX5x clocks: Fix parent for PWM clocks
ARM: i.MX5x clocks: Fix GPT clocks
ARM: i.MX5x CSPI: Fixed clock name for CSPI
Arnd Bergmann (6):
Merge branch 'tegra/cleanup' into next/clk
Merge branch 'for-3.6/common-clk' of git://git.kernel.org/.../swarren/linux-tegra into next/clk
Merge branch 'omap/cleanup2' into next/clk
Merge tag 'omap-devel-am33xx-data-for-v3.6' of git://git.kernel.org/.../tmlind/linux-omap into next/clk
Merge tag 'imx-clk' of git://git.pengutronix.de/git/imx/linux-2.6 into next/clk
Merge branch 'next/clk' into for-next
Fabio Estevam (3):
ARM: clk-imx27: Fix rtc clock id
ARM: mx27: Reenable silicon version print
ARM: imx: clk-imx31: Fix clock id for rnga driver
Laxman Dewangan (1):
ARM: tegra: dma: rename driver name for clock to "tegra-apbdma"
Paul Walmsley (1):
ARM: OMAP3+: clock: Move common clksel_rate & clock data to common file
Prashant Gaikwad (10):
ARM: tegra: add clk_prepare/clk_unprepare
i2c: tegra: Add clk_prepare/clk_unprepare
mmc: tegra: add clk_prepare/clk_unprepare
USB: ehci-tegra: add clk_prepare/clk_unprepare
Input: tegra-kbc - add clk_prepare/clk_unprepare
spi/tegra: add clk_prepare/clk_unprepare
staging: nvec: add clk_prepare/clk_unprepare
ASoC: tegra: add clk_prepare/clk_unprepare
crypto: add clk_prepare/clk_unprepare
ARM: tegra: Remove second instance of uart clk
Simon Que (1):
ARM: tegra: Fix PWM clock programming
Thierry Reding (1):
ARM: tegra: Provide clock for only one PWM controller
Tony Lindgren (1):
Merge tag 'omap-devel-e-for-3.5' of git://git.kernel.org/.../pjw/omap-pending into devel-am33xx-data
Uwe Kleine-K?nig (1):
ARM: imx: add missing item to the list of clock event modes
Vaibhav Hiremath (1):
ARM: OMAP3+: clock33xx: Add AM33XX clock tree data
arch/arm/mach-imx/clk-imx27.c | 4 +-
arch/arm/mach-imx/clk-imx31.c | 4 +-
arch/arm/mach-imx/clk-imx51-imx53.c | 23 +-
arch/arm/mach-omap2/Makefile | 1 +
arch/arm/mach-omap2/clock.h | 14 +
arch/arm/mach-omap2/clock33xx_data.c | 1105 +++++++++++++++++++++++++
arch/arm/mach-omap2/clock3xxx_data.c | 20 +-
arch/arm/mach-omap2/clock44xx_data.c | 72 --
arch/arm/mach-omap2/clock_common_data.c | 77 ++
arch/arm/mach-omap2/io.c | 2 +
arch/arm/mach-tegra/cpu-tegra.c | 6 +-
arch/arm/mach-tegra/dma.c | 4 +-
arch/arm/mach-tegra/pcie.c | 6 +-
arch/arm/mach-tegra/powergate.c | 4 +-
arch/arm/mach-tegra/tegra2_clocks.c | 58 +-
arch/arm/mach-tegra/tegra30_clocks.c | 28 +-
arch/arm/mach-tegra/timer.c | 4 +-
arch/arm/mach-tegra/usb_phy.c | 16 +-
arch/arm/plat-mxc/devices/platform-spi_imx.c | 2 +-
arch/arm/plat-mxc/time.c | 3 +-
arch/arm/plat-omap/include/plat/clkdev_omap.h | 1 +
drivers/crypto/tegra-aes.c | 12 +-
drivers/i2c/busses/i2c-tegra.c | 10 +-
drivers/input/keyboard/tegra-kbc.c | 4 +-
drivers/mmc/host/sdhci-tegra.c | 6 +-
drivers/spi/spi-tegra.c | 4 +-
drivers/staging/nvec/nvec.c | 8 +-
drivers/usb/host/ehci-tegra.c | 20 +-
sound/soc/tegra/tegra20_i2s.c | 4 +-
sound/soc/tegra/tegra20_spdif.c | 4 +-
sound/soc/tegra/tegra30_ahub.c | 8 +-
sound/soc/tegra/tegra30_i2s.c | 4 +-
sound/soc/tegra/tegra_asoc_utils.c | 12 +-
33 files changed, 1347 insertions(+), 203 deletions(-)
^ permalink raw reply [flat|nested] 44+ messages in thread
* [GIT PULL 04/15] arm-soc: samsung dma changes
@ 2012-07-23 20:33 ` Arnd Bergmann
0 siblings, 0 replies; 44+ messages in thread
From: Arnd Bergmann @ 2012-07-23 20:33 UTC (permalink / raw)
To: linux-arm-kernel
The following changes since commit bd0a521e88aa7a06ae7aabaed7ae196ed4ad867a:
Linux 3.5-rc6 (2012-07-07 17:23:56 -0700)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git next/dma
for you to fetch changes up to 31dfec74c0dc49521b2e17543ff9dd9dd0221702:
Merge branch 'next/devel-dma-ops' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/dma (2012-07-10 14:12:05 +0200)
----------------------------------------------------------------
arm-soc: samsung dma changes
Some platforms are not yet converted to use the dmaengine framework,
including some of the samsung SoCs. In the meantime, we treat this
as platform code and merge the patches through the arm-soc tree.
----------------------------------------------------------------
Arnd Bergmann (2):
Merge branch 'next/devel-dma-ops' of git://git.kernel.org/.../kgene/linux-samsung into next/dma
Merge branch 'next/dma' into for-next
Boojin Kim (3):
ARM: SAMSUNG: Add config() function in DMA common operations
spi/s3c64xx: Add the use of DMA config operation
ASoC: follow the updated samsung DMA common operations
Sachin Kamat (1):
ARM: SAMSUNG: Fix compiler warning in dma-ops.c file
arch/arm/plat-samsung/dma-ops.c | 76 ++++++++++++++------------
arch/arm/plat-samsung/include/plat/dma-ops.h | 20 ++++---
arch/arm/plat-samsung/s3c-dma-ops.c | 39 +++++++------
drivers/spi/spi-s3c64xx.c | 33 ++++++-----
sound/soc/samsung/dma.c | 18 +++---
5 files changed, 105 insertions(+), 81 deletions(-)
^ permalink raw reply [flat|nested] 44+ messages in thread
* [GIT PULL 09/15] arm-soc: new SoC support
@ 2012-07-23 20:33 ` Arnd Bergmann
0 siblings, 0 replies; 44+ messages in thread
From: Arnd Bergmann @ 2012-07-23 20:33 UTC (permalink / raw)
To: linux-arm-kernel
The following changes since commit fb584511c4664573097ece7df0de06ad00b713a2:
ARM: OMAP: sdrc: Fix the build break for OMAP4 only builds (2012-07-09 01:44:11 -0700)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git next/newsoc
for you to fetch changes up to 66314223aa5e862c9d1d068cb7186b4fd58ebeaa:
ARM: socfpga: initial support for Altera's SOCFPGA platform (2012-07-19 10:39:00 +0200)
----------------------------------------------------------------
arm-soc: new SoC support
This adds support for three new SoC types:
* The mvebu platform includes Marvell's Armada XP and Armada 370 chips,
made by the mvebu business unit inside of Marvell. Since the same
group also made the older but similar platforms we call "orion5x",
"kirkwood", "mv78xx0" and "dove", we plan to move all of them into
the mach-mvebu directory in the future.
* socfpga is Altera's platform based on Cortex-A9 cores and a lot of
FPGA space. This is similar to the Xilinx zynq platform we already
support. The code is particularly clean, which is helped by the fact
that the hardware doesn't do much besides the parts that are
expected to get added in the FPGA.
* The OMAP subarchitecture gains support for the latest generation,
the OMAP5 based on the new Cortex-A15 core. Support is rather
rudimentary for now, but will be extended in the future.
----------------------------------------------------------------
Arnd Bergmann (5):
Merge branch 'mvebu/newsoc' into next/newsoc
Merge branch 'omap/cleanup2' into next/newsoc
Merge branch 'devel-omap5' of git://git.kernel.org/.../tmlind/linux-omap into next/newsoc
Merge branch 'mvebu/newsoc' into next/newsoc
Merge branch 'next/newsoc' into for-next
Ben Dooks (1):
ARM: mvebu: MPIC: read number of interrupts from control register
Dinh Nguyen (1):
ARM: socfpga: initial support for Altera's SOCFPGA platform
Gregory CLEMENT (4):
clocksource: time-armada-370-xp: Marvell Armada 370/XP SoC timer driver
arm: mach-mvebu: add source files
arm: mach-mvebu: add documentation for new device tree bindings
arm: mach-mvebu: add compilation/configuration change
R Sricharan (11):
ARM: OMAP2+: Move stubbed secure_sram_reserve function to a common.c and call it __weak
ARM: OMAP: counter-32k: Select the CR register offset using the IP scheme
ARM: OMAP5: id: Add cpu id for ES versions
ARM: OMAP5: Add minimal support for OMAP5430 SOC
ARM: OMAP5: timer: Add clocksource, clockevent support
ARM: OMAP5: gpmc: Update gpmc_init()
ARM: OMAP5: l3: Add l3 error handler support for omap5
ARM: omap2+: board-generic: clean up the irq data from board file
ARM: OMAP5: board-generic: Add device tree support
arm/dts: OMAP5: Add omap5 dts files
ARM: OMAP5: Add the build support
Santosh Shilimkar (2):
ARM: OMAP5: Add the WakeupGen IP updates
ARM: OMAP5: Add SMP support
Tarun Kanti DebBarma (1):
ARM: Kconfig update to support additional GPIOs in OMAP5
Thomas Petazzoni (5):
arm: mach-mvebu: add header
arm: mach-mvebu: add support for Armada 370 and Armada XP with DT
arm: mach-mvebu: add defconfig
arm: mach-mvebu: add entry to MAINTAINERS
arm: mvebu: generate DTBs for supported SoCs
.../devicetree/bindings/arm/armada-370-xp-mpic.txt | 23 ++
.../bindings/arm/armada-370-xp-timer.txt | 11 +
.../devicetree/bindings/arm/armada-370-xp.txt | 24 +++
.../bindings/arm/mvebu-system-controller.txt | 17 ++
.../devicetree/bindings/arm/omap/omap.txt | 3 +
MAINTAINERS | 18 ++
arch/arm/Kconfig | 34 +++
arch/arm/Makefile | 2 +
arch/arm/boot/dts/armada-370-db.dts | 42 ++++
arch/arm/boot/dts/armada-370-xp.dtsi | 68 ++++++
arch/arm/boot/dts/armada-370.dtsi | 35 +++
arch/arm/boot/dts/armada-xp-db.dts | 50 +++++
arch/arm/boot/dts/armada-xp.dtsi | 55 +++++
arch/arm/boot/dts/omap5-evm.dts | 20 ++
arch/arm/boot/dts/omap5.dtsi | 184 ++++++++++++++++
arch/arm/boot/dts/socfpga.dtsi | 147 +++++++++++++
arch/arm/boot/dts/socfpga_cyclone5.dts | 34 +++
arch/arm/configs/mvebu_defconfig | 46 ++++
arch/arm/configs/omap2plus_defconfig | 1 +
arch/arm/configs/socfpga_defconfig | 83 +++++++
arch/arm/mach-mvebu/Kconfig | 16 ++
arch/arm/mach-mvebu/Makefile | 2 +
arch/arm/mach-mvebu/Makefile.boot | 3 +
arch/arm/mach-mvebu/armada-370-xp.c | 63 ++++++
arch/arm/mach-mvebu/common.h | 23 ++
arch/arm/mach-mvebu/include/mach/armada-370-xp.h | 22 ++
arch/arm/mach-mvebu/include/mach/debug-macro.S | 24 +++
arch/arm/mach-mvebu/include/mach/timex.h | 13 ++
arch/arm/mach-mvebu/include/mach/uncompress.h | 43 ++++
arch/arm/mach-mvebu/irq-armada-370-xp.c | 133 ++++++++++++
arch/arm/mach-mvebu/system-controller.c | 105 +++++++++
arch/arm/mach-omap2/Kconfig | 8 +-
arch/arm/mach-omap2/Makefile | 24 ++-
arch/arm/mach-omap2/board-generic.c | 42 ++--
arch/arm/mach-omap2/common.c | 24 +++
arch/arm/mach-omap2/common.h | 19 +-
arch/arm/mach-omap2/control.h | 4 +
arch/arm/mach-omap2/devices.c | 2 +-
arch/arm/mach-omap2/gpmc.c | 3 +-
arch/arm/mach-omap2/id.c | 42 +++-
arch/arm/mach-omap2/include/mach/debug-macro.S | 8 +-
arch/arm/mach-omap2/include/mach/omap-wakeupgen.h | 7 +
arch/arm/mach-omap2/io.c | 44 ++++
arch/arm/mach-omap2/iomap.h | 27 +++
arch/arm/mach-omap2/irq.c | 13 +-
arch/arm/mach-omap2/omap-headsmp.S | 21 ++
arch/arm/mach-omap2/omap-hotplug.c | 24 ++-
arch/arm/mach-omap2/omap-smp.c | 52 +++--
arch/arm/mach-omap2/omap-wakeupgen.c | 114 +++++++---
arch/arm/mach-omap2/omap4-common.c | 14 ++
arch/arm/mach-omap2/omap4-sar-layout.h | 12 +-
arch/arm/mach-omap2/omap_hwmod.c | 2 +-
arch/arm/mach-omap2/omap_l3_noc.h | 22 +-
arch/arm/mach-omap2/prcm-common.h | 2 +-
arch/arm/mach-omap2/prcm.c | 2 +-
arch/arm/mach-omap2/timer.c | 5 +
arch/arm/mach-socfpga/Makefile | 5 +
arch/arm/mach-socfpga/Makefile.boot | 1 +
arch/arm/mach-socfpga/include/mach/debug-macro.S | 16 ++
arch/arm/mach-socfpga/include/mach/timex.h | 19 ++
arch/arm/mach-socfpga/include/mach/uncompress.h | 9 +
arch/arm/mach-socfpga/socfpga.c | 62 ++++++
arch/arm/plat-omap/Kconfig | 4 +-
arch/arm/plat-omap/common.c | 9 +
arch/arm/plat-omap/counter_32k.c | 16 +-
arch/arm/plat-omap/include/plat/cpu.h | 22 +-
arch/arm/plat-omap/include/plat/hardware.h | 1 +
arch/arm/plat-omap/include/plat/multi.h | 9 +
arch/arm/plat-omap/include/plat/omap-secure.h | 5 -
arch/arm/plat-omap/include/plat/omap54xx.h | 32 +++
arch/arm/plat-omap/include/plat/serial.h | 10 +
arch/arm/plat-omap/include/plat/uncompress.h | 6 +
arch/arm/plat-omap/sram.c | 11 +-
drivers/clk/Makefile | 1 +
drivers/clk/socfpga/Makefile | 1 +
drivers/clk/socfpga/clk.c | 51 +++++
drivers/clocksource/Kconfig | 3 +
drivers/clocksource/Makefile | 3 +-
drivers/clocksource/time-armada-370-xp.c | 226 ++++++++++++++++++++
include/linux/dw_apb_timer.h | 1 +
include/linux/time-armada-370-xp.h | 18 ++
81 files changed, 2323 insertions(+), 99 deletions(-)
^ permalink raw reply [flat|nested] 44+ messages in thread
* [GIT PULL 07/15] arm-soc: timer updates
@ 2012-07-23 20:33 ` Arnd Bergmann
0 siblings, 0 replies; 44+ messages in thread
From: Arnd Bergmann @ 2012-07-23 20:33 UTC (permalink / raw)
To: linux-arm-kernel
The following changes since commit bd0a521e88aa7a06ae7aabaed7ae196ed4ad867a:
Linux 3.5-rc6 (2012-07-07 17:23:56 -0700)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git next/timer
for you to fetch changes up to 35bf8cc74b2b1dfad18df6d330b271e68ab6e3f5:
Merge branch 'picoxcell/timer' into next/timer (2012-07-12 17:27:36 +0200)
----------------------------------------------------------------
arm-soc: timer updates
This contains two branches dealing with timers, one for the picoxcell
platform that is now using DT with the platform-independent
dw_apb_timer driver. The other change is for the omap-specific
dmtimer driver.
----------------------------------------------------------------
Arnd Bergmann (3):
Merge tag 'omap-devel-dmtimer-for-v3.6' of git://git.kernel.org/.../tmlind/linux-omap into next/timer
Merge branch 'picoxcell/timer' into next/timer
Merge branch 'next/timer' into for-next
Dinh Nguyen (1):
clocksource: dw_apb_timer: Add common DTS glue for dw_apb_timer
Jon Hunter (12):
ARM: OMAP: Remove unnecessary clk structure
ARM: OMAP2+: Remove unused max number of timers definition
ARM: OMAP2+: Add dmtimer platform function to reserve systimers
ARM: OMAP: Add DMTIMER capability variable to represent timer features
ARM: OMAP2+: HWMOD: Correct timer device attributes
ARM: OMAP2+: Fix external clock support for dmtimers
ARM: OMAP: Remove loses_context variable from timer platform data
ARM: OMAP: Remove timer function pointer for context loss counter
ARM: OMAP: Add flag to indicate if a timer needs a manual reset
ARM: OMAP1: Fix dmtimer support
ARM: OMAP2+: Move dmtimer clock set function to dmtimer driver
ARM: OMAP2+: Simplify dmtimer clock aliases
Documentation/devicetree/bindings/rtc/dw-apb.txt | 25 +++++
arch/arm/Kconfig | 1 +
arch/arm/mach-omap1/timer.c | 3 +-
arch/arm/mach-omap2/clock2420_data.c | 39 +------
arch/arm/mach-omap2/clock2430_data.c | 39 +------
arch/arm/mach-omap2/clock3xxx_data.c | 26 +----
arch/arm/mach-omap2/clock44xx_data.c | 34 +++---
arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c | 8 --
arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 10 +-
arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 6 --
arch/arm/mach-omap2/timer.c | 82 +--------------
arch/arm/mach-picoxcell/Makefile | 1 -
arch/arm/mach-picoxcell/common.c | 3 +-
arch/arm/mach-picoxcell/common.h | 2 +-
arch/arm/plat-omap/dmtimer.c | 111 +++++++++++++++-----
arch/arm/plat-omap/include/plat/dmtimer.h | 22 +---
drivers/clocksource/Kconfig | 3 +
drivers/clocksource/Makefile | 1 +
.../clocksource/dw_apb_timer_of.c | 52 +++++----
19 files changed, 182 insertions(+), 286 deletions(-)
^ permalink raw reply [flat|nested] 44+ messages in thread
* [GIT PULL 14/15] arm-soc: power management changes
@ 2012-07-23 20:33 ` Arnd Bergmann
0 siblings, 0 replies; 44+ messages in thread
From: Arnd Bergmann @ 2012-07-23 20:33 UTC (permalink / raw)
To: linux-arm-kernel
The following changes since commit 6b16351acbd415e66ba16bf7d473ece1574cf0bc:
Linux 3.5-rc4 (2012-06-24 12:53:04 -0700)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git next/pm
for you to fetch changes up to 6b21a9ce0402e0c5fd2adfa3d41328fdd8f55a9a:
Merge tag 'omap-devel-pm-for-v3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/pm (2012-07-03 22:02:17 +0200)
----------------------------------------------------------------
arm-soc: power management changes
These are various power management related changes, mainly concerning
cpuidle on i.MX and OMAP, as well as a the move of the omap smartreflex
driver to live in the power subsystem.
----------------------------------------------------------------
Arnd Bergmann (3):
Merge tag 'omap-devel-driver-for-v3.6' of git://git.kernel.org/.../tmlind/linux-omap into next/pm
Merge tag 'omap-devel-pm-for-v3.6' of git://git.kernel.org/.../tmlind/linux-omap into next/pm
Merge branch 'next/pm' into for-next
J Keerthy (1):
ARM: OMAP2+: Voltage: Move the omap_volt_data structure to plat
Jean Pihet (13):
ARM: OMAP2+: SmartReflex: move the smartreflex header to include/linux/power
ARM: OMAP3+: SmartReflex: class drivers should use struct omap_sr *
ARM: OMAP2+: smartreflex: Use the names from hwmod data instead of voltage domains.
ARM: OMAP3: hwmod: rename the smartreflex entries
ARM: OMAP2+: SmartReflex: introduce a busy loop condition test macro
ARM: OMAP2+: SmartReflex: Use per-OPP data structure
ARM: OMAP2+: SmartReflex: Create per-opp debugfs node for errminlimit
ARM: OMAP2+: SmartReflex: add POWER_AVS Kconfig options
ARM: OMAP: SmartReflex: Move smartreflex driver to drivers/
ARM: OMAP3: PM: cpuidle: default to C1 in next_valid_state
ARM: OMAP3: PM: cpuidle: optimize the PER latency in C1 state
ARM: OMAP3: PM: cpuidle: optimize the clkdm idle latency in C1 state
ARM: OMAP2+: do not allow SmartReflex to be built as a module
Kevin Hilman (5):
ARM: OMAP2+: PRM: fix compile for OMAP4-only build
ARM: OMAP2+: powerdomain: allow pre/post transtion to be per pwrdm
ARM: OMAP3: PM: call pre/post transition per powerdomain
ARM: OMAP3: PM: cleanup cam_pwrdm leftovers
ARM: OMAP2+: PM: fix IRQ_NOAUTOEN removal by mis-merge
Mohan V (1):
ARM: OMAP3: PM: correct enable/disable of daisy io chain
Olof Johansson (1):
Merge branch 'imx/cpuidle' into next/pm
Paul Walmsley (4):
W1: OMAP HDQ1W: allow driver to be built on all OMAP2+
W1: OMAP HDQ1W: use 32-bit register accesses
ARM: OMAP2+: HDQ1W: use omap_device
W1: OMAP HDQ1W: use runtime PM
Rajendra Nayak (1):
ARM: OMAP4: PRM: Add IO Daisychain support
Robert Lee (7):
ARM: imx: Modify IMX_IO_P2V macro
ARM: imx: Add comments to tzic_enable_waker()
ARM: imx: clean and consolidate imx5 suspend and idle code
ARM: imx: Enable imx53 low power idle
ARM: imx: Add common imx cpuidle init functionality.
ARM: imx: Add imx5 cpuidle
ARM: imx: Add imx6q cpuidle driver
Tero Kristo (1):
ARM: OMAP3+: PRM: Enable IO wake up
Tony Lindgren (5):
Merge tag 'omap-devel-b-for-3.6' of git://git.kernel.org/.../pjw/omap-pending into devel-driver
Merge tag 'omap-devel-c-for-3.6' of git://git.kernel.org/.../pjw/omap-pending into devel-pm
ARM: OMAP2: Use hwmod to initialize mmc for 2420
Merge branch 'for_3.6/pm/sr-move' of git://git.kernel.org/.../khilman/linux-omap-pm into devel-driver
Merge branch 'for_3.6/pm/performance' of git://git.kernel.org/.../khilman/linux-omap-pm into devel-pm
Vishwanath BS (3):
ARM: OMAP3: PM: Move IO Daisychain function to omap3 prm file
ARM: OMAP3PLUS: hwmod: reconfigure IO Daisychain during hwmod mux
ARM: OMAP3: PM: Remove IO Daisychain control from cpuidle
arch/arm/mach-imx/clk-imx51-imx53.c | 2 +-
arch/arm/mach-imx/imx53-dt.c | 1 +
arch/arm/mach-imx/mach-imx6q.c | 19 +++
arch/arm/mach-imx/mach-mx53_ard.c | 1 +
arch/arm/mach-imx/mach-mx53_evk.c | 1 +
arch/arm/mach-imx/mach-mx53_loco.c | 1 +
arch/arm/mach-imx/mach-mx53_smd.c | 1 +
arch/arm/mach-imx/mm-imx5.c | 26 +---
arch/arm/mach-imx/pm-imx5.c | 111 ++++++++++----
arch/arm/mach-omap2/Makefile | 5 +-
arch/arm/mach-omap2/cpuidle34xx.c | 71 ++++-----
arch/arm/mach-omap2/devices.c | 108 -------------
arch/arm/mach-omap2/hdq1w.c | 26 ++++
arch/arm/mach-omap2/msdi.c | 73 +++++++++
arch/arm/mach-omap2/omap-mpuss-lowpower.c | 4 +-
arch/arm/mach-omap2/omap_hwmod.c | 38 ++++-
arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 12 +-
arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 3 +-
arch/arm/mach-omap2/pm.h | 2 +-
arch/arm/mach-omap2/pm34xx.c | 63 ++------
arch/arm/mach-omap2/powerdomain.c | 16 +-
arch/arm/mach-omap2/powerdomain.h | 4 +-
arch/arm/mach-omap2/prcm-common.h | 8 +
arch/arm/mach-omap2/prm2xxx_3xxx.c | 48 ++++++
arch/arm/mach-omap2/prm2xxx_3xxx.h | 2 +
arch/arm/mach-omap2/prm44xx.c | 63 +++++++-
arch/arm/mach-omap2/prm44xx.h | 2 +
arch/arm/mach-omap2/smartreflex-class3.c | 29 ++--
arch/arm/mach-omap2/sr_device.c | 39 ++++-
arch/arm/mach-omap2/voltage.h | 21 +--
arch/arm/plat-mxc/Makefile | 1 +
arch/arm/plat-mxc/cpuidle.c | 80 ++++++++++
arch/arm/plat-mxc/include/mach/common.h | 6 +-
arch/arm/plat-mxc/include/mach/cpuidle.h | 22 +++
arch/arm/plat-mxc/include/mach/hardware.h | 25 +--
arch/arm/plat-mxc/tzic.c | 4 +
arch/arm/plat-omap/Kconfig | 31 ++--
arch/arm/plat-omap/include/plat/voltage.h | 21 ++-
drivers/power/Kconfig | 2 +
drivers/power/Makefile | 1 +
drivers/power/avs/Kconfig | 12 ++
drivers/power/avs/Makefile | 1 +
.../mach-omap2 => drivers/power/avs}/smartreflex.c | 161 ++++++++------------
drivers/w1/masters/Kconfig | 2 +-
drivers/w1/masters/omap_hdq.c | 86 +++--------
.../linux/power}/smartreflex.h | 74 +++++++--
46 files changed, 808 insertions(+), 521 deletions(-)
^ permalink raw reply [flat|nested] 44+ messages in thread
* [GIT PULL 13/15] arm-soc: pincontrol drivers
@ 2012-07-23 20:33 ` Arnd Bergmann
0 siblings, 0 replies; 44+ messages in thread
From: Arnd Bergmann @ 2012-07-23 20:33 UTC (permalink / raw)
To: linux-arm-kernel
The following changes since commit ca24a145573124732152daff105ba68cc9a2b545:
Merge branch 'fixes' of git://git.linaro.org/people/rmk/linux-arm (2012-07-01 11:02:25 -0700)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git next/pinctrl
for you to fetch changes up to 8ee41a62a3800b8450985d2970fd985421ad7043:
Merge branch 'prima2/pinctrl' into next/pinctrl (2012-07-04 16:54:54 +0200)
----------------------------------------------------------------
arm-soc: pincontrol drivers
We are converting platforms to use the pinctrl framework over time,
rather than using platform specific code for the same effect. This
adds the respective driver for the prima2 platform.
----------------------------------------------------------------
Arnd Bergmann (4):
Merge branch 'prima2/drivers' of git://gitorious.org/sirfprima2-kernel/sirfprima2-kernel into next/pinctrl
ARM: prima2: enable gpiolib unconditionally
Merge branch 'prima2/pinctrl' into next/pinctrl
Merge branch 'next/pinctrl' into for-next
Barry Song (1):
PINCTRL: SiRF: add GPIO and GPIO irq support in CSR SiRFprimaII
arch/arm/Kconfig | 1 +
arch/arm/mach-prima2/include/mach/gpio.h | 13 +
arch/arm/mach-prima2/include/mach/irqs.h | 2 +-
drivers/pinctrl/pinctrl-sirf.c | 489 +++++++++++++++++++++++++++++-
4 files changed, 503 insertions(+), 2 deletions(-)
^ permalink raw reply [flat|nested] 44+ messages in thread
* [GIT PULL 03/15] arm-soc: soc-specific updates
@ 2012-07-23 20:33 ` Arnd Bergmann
0 siblings, 0 replies; 44+ messages in thread
From: Arnd Bergmann @ 2012-07-23 20:33 UTC (permalink / raw)
To: linux-arm-kernel
The following changes since commit bd0a521e88aa7a06ae7aabaed7ae196ed4ad867a:
Linux 3.5-rc6 (2012-07-07 17:23:56 -0700)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git next/soc
for you to fetch changes up to 233de298cb44e7dd300cd68f5abd7f1a75561fd5:
Merge branch 'lpc32xx/core2' of git://git.antcom.de/linux-2.6 into next/soc (2012-07-21 00:15:59 +0200)
----------------------------------------------------------------
arm-soc: soc-specific updates
This is stuff that does not fit well into another category and in
particular is not related to a particular board. The largest part
in here is extending the am33xx support in the omap platform.
----------------------------------------------------------------
Afzal Mohammed (2):
ARM: OMAP2+: am33xx: Add low level debugging support
ARM: OMAP2+: am33xx: Add AM335XEVM machine support
Alexander Shiyan (1):
ARM: i.MX51 iomux: added missing pin definitions
Alexandre Pereira da Silva (12):
ARM: LPC32xx: Build arch dtbs
ARM: LPC32xx: Add dt settings to the at25 node
ARM: LPC32xx: Remove spi chipselect request from board init
ARM: LPC32xx: Remove spi chip definitions
ARM: LPC32xx: Cleanup board init, remove duplicate clock init
ARM: LPC32xx: Move uart6 irda disable to serial.c
ARM: LPC32xx: Move i2s1 dma enabling to clock.c
ARM: LPC32xx: Cleanup USB clock init
ARM: LPC32xx: Remove unused gpios
ARM: LPC32xx: Set system serial based on cpu unique id
ARM: LPC32xx: Add PWM clock
ARM: LPC32xx: Add PWM support
Arnd Bergmann (13):
Merge branch 'lpc32xx/core' of git://git.antcom.de/linux-2.6 into next/soc
Merge tag 'omap-devel-am33xx-for-v3.6' of git://git.kernel.org/.../tmlind/linux-omap into next/soc
Merge branch 'tegra/cleanup' into next/soc
Merge branch 'for-3.6/soc' of git://git.kernel.org/.../swarren/linux-tegra into next/soc
Merge tag 'davinci-v3.6-soc' of git://gitorious.org/linux-davinci/linux-davinci into next/soc
Merge tag 'v3.5-rc6' into next/soc
Merge tag 'imx-soc' of git://git.pengutronix.de/git/imx/linux-2.6 into next/soc
Merge branch 'lpc32xx/core-fixes' of git://git.antcom.de/linux-2.6 into next/soc
Merge branch 'vexpress-v3.5-rc6' of git://git.linaro.org/people/pawelmoll/linux into next/soc
Merge branch 'next/devel-samsung' of git://git.kernel.org/.../kgene/linux-samsung into next/soc
Merge tag 'ep93xx-devel-for-3.6' of git://github.com/RyanMallon/linux-ep93xx into next/soc
Merge branch 'lpc32xx/core2' of git://git.antcom.de/linux-2.6 into next/soc
Merge branch 'next/soc' into for-next
Beno?t Th?baudeau (5):
ARM: imx: fix i.MX35 CPU architecture
ARM: imx: enable support for mx35 rtc
ARM: imx: add rtc support to mx35_3ds
ARM: imx: make ehci power/oc polarities configurable
ARM: imx: fix mx51 ehci setup errors
Heiko Schocher (1):
ARM: davinci: cp_intc: Add irq domain support
Jonghwan Choi (1):
ARM: EXYNOS: Clear SYS_WDTRESET bit to use watchdog reset
Kevin Hilman (1):
ARM: davinci: add runtime PM support for clock management
Laxman Dewangan (2):
ARM: tegra: apbio access using dma for tegra20 only
ARM: tegra: apbio: use dmaengine based dma driver
Linus Walleij (8):
ARM: nomadik: register GPIOs dynamically
ARM: nomadik: register AMBA devices dynamically
ARM: nomadik: register PL031 RTC
ARM: nomadik: convert to generic clock
ARM: nomadik: register all three I2C busses
ARM: nomadik: register the I2C devices
ARM: nomadik: register the MMC/SD device
ARM: nomadik: bump all IRQ numbers by one
Mark Brown (1):
ARM: SAMSUNG: Introduce Kconfig variable for Samsung custom clk API
Olof Johansson (2):
Merge branch 'nomadik-for-arm-soc' of git://git.kernel.org/.../linusw/linux-nomadik into next/soc
Merge branch 'lpc32xx/devel' into next/soc
Pawel Moll (8):
ARM: vexpress: Check master site in daughterboard's sysctl operations
ARM: versatile: Make plat-versatile clock optional
ARM: vexpress: Initial common clock support
ARM: vexpress: Add missing SP804 interrupt in motherboard's DTS files
ARM: vexpress: Add fixed regulator for SMSC
ARM: vexpress: Convert V2P-CA15 Device Tree to 64 bit addresses
ARM: vexpress: Add Device Tree for V2P-CA15_CA7 core tile
ARM: vexpress: Config option for early printk console
Rafal Prylowski (2):
ep93xx: IDE driver platform support code
ep93xx: Add IDE support to edb93xx boards
Roland Stigge (20):
ARM: LPC32xx: Add NAND flash timing to PHY3250 board dts
ARM: LPC32xx: Clock initialization for NAND controllers
ARM: LPC32xx: Remove SLC controller initialization from platform init
ARM: LPC32xx: Add DMA configuration to platform data
ARM: LPC32xx: Adjust dtsi file for MLC controller configuration
ARM: LPC32xx: Add dts for EA3250 reference board
ARM: LPC32xx: DTS adjustment for key matrix controller
ARM: LPC32xx: Clock adjustment for key matrix controller
ARM: LPC32xx: Defconfig update
ARM: LPC32xx: Add MMC controller support
ARM: LPC32xx: DTS adjustment for using pl18x primecell
ARM: LPC32xx: DT conversion of Standard UARTs
ARM: LPC32xx: High Speed UART configuration via DT
ARM: LPC32xx: Remove mach specific ARCH_NR_GPIOS, use default
ARM: LPC32xx: Fix lpc32xx.dtsi status property: "disable" -> "disabled"
ARM: LPC32xx: Init MMC via clock
ARM: LPC32xx: Add further bits to MMC init
ARM: LPC32xx: Remove wrong re-initialization of MMC clock register
ARM: LPC32xx: Remove USB and I2C init from phy3250.c
ARM: LPC32xx: Adjust to pl08x DMA interface changes
Sachin Kamat (3):
ARM: EXYNOS: Update HSOTG PHY clock setting for EXYNOS4X12
ARM: EXYNOS: Make combiner_init function static
ARM: EXYNOS: Add missing static storage class specifier in pmu.c file
Tony Lindgren (1):
Merge tag 'omap-devel-a-for-3.6' of git://git.kernel.org/.../pjw/omap-pending into devel-am33xx
Vaibhav Hiremath (6):
ARM: OMAP2+: control: Add AM33XX control reg & sec clkctrl offset
ARM: OMAP AM33xx: voltagedomain: Add voltage domain data
ARM: OMAP AM33xx: PRM: add PRM support
ARM: OMAP AM33xx: CM: Introduce AM33xx CM APIs and register level details
ARM: OMAP AM33xx: powerdomains: add AM335x support
ARM: OMAP AM33xx: clockdomains: Add clockdomain data and respective operations
Will Deacon (1):
ARM: vexpress: remove automatic errata workaround selection
arch/arm/Kconfig | 11 +-
arch/arm/Kconfig.debug | 26 +
arch/arm/boot/dts/ea3250.dts | 157 +++++
arch/arm/boot/dts/lpc32xx.dtsi | 74 ++-
arch/arm/boot/dts/phy3250.dts | 61 ++
arch/arm/boot/dts/vexpress-v2m-rs1.dtsi | 11 +
arch/arm/boot/dts/vexpress-v2m.dtsi | 11 +
arch/arm/boot/dts/vexpress-v2p-ca15-tc1.dts | 36 +-
arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts | 188 ++++++
arch/arm/configs/lpc32xx_defconfig | 24 +-
arch/arm/mach-davinci/Kconfig | 1 +
arch/arm/mach-davinci/Makefile | 1 +
arch/arm/mach-davinci/cp_intc.c | 63 +-
arch/arm/mach-davinci/pm_domain.c | 64 ++
arch/arm/mach-ep93xx/core.c | 96 +++
arch/arm/mach-ep93xx/edb93xx.c | 24 +
arch/arm/mach-ep93xx/include/mach/platform.h | 3 +
arch/arm/mach-ep93xx/soc.h | 1 +
arch/arm/mach-exynos/common.c | 3 +-
arch/arm/mach-exynos/include/mach/regs-pmu.h | 5 +
arch/arm/mach-exynos/include/mach/regs-usb-phy.h | 20 +-
arch/arm/mach-exynos/pmu.c | 18 +-
arch/arm/mach-exynos/setup-usb-phy.c | 60 +-
arch/arm/mach-imx/Kconfig | 3 +-
arch/arm/mach-imx/devices-imx35.h | 4 +
arch/arm/mach-imx/ehci-imx25.c | 24 +-
arch/arm/mach-imx/ehci-imx35.c | 24 +-
arch/arm/mach-imx/ehci-imx5.c | 31 +-
arch/arm/mach-imx/mach-mx35_3ds.c | 1 +
arch/arm/mach-lpc32xx/Kconfig | 32 -
arch/arm/mach-lpc32xx/Makefile.boot | 1 +
arch/arm/mach-lpc32xx/clock.c | 123 +++-
arch/arm/mach-lpc32xx/common.c | 10 +-
arch/arm/mach-lpc32xx/include/mach/gpio.h | 2 -
arch/arm/mach-lpc32xx/include/mach/platform.h | 14 +
arch/arm/mach-lpc32xx/phy3250.c | 163 ++---
arch/arm/mach-lpc32xx/serial.c | 90 +--
arch/arm/mach-nomadik/Makefile | 2 -
arch/arm/mach-nomadik/board-nhk8815.c | 67 +-
arch/arm/mach-nomadik/clock.c | 75 ---
arch/arm/mach-nomadik/clock.h | 15 -
arch/arm/mach-nomadik/cpu-8815.c | 126 ++--
arch/arm/mach-nomadik/i2c-8815nhk.c | 38 +-
arch/arm/mach-nomadik/include/mach/irqs.h | 85 ++-
arch/arm/mach-omap2/Makefile | 6 +
arch/arm/mach-omap2/board-generic.c | 18 +
arch/arm/mach-omap2/clockdomain.h | 2 +
arch/arm/mach-omap2/clockdomain33xx.c | 74 +++
arch/arm/mach-omap2/clockdomains33xx_data.c | 196 ++++++
arch/arm/mach-omap2/cm-regbits-33xx.h | 687 +++++++++++++++++++++
arch/arm/mach-omap2/cm33xx.c | 313 ++++++++++
arch/arm/mach-omap2/cm33xx.h | 420 +++++++++++++
arch/arm/mach-omap2/common.h | 3 +
arch/arm/mach-omap2/control.h | 39 +-
arch/arm/mach-omap2/include/mach/debug-macro.S | 17 +-
arch/arm/mach-omap2/io.c | 13 +
arch/arm/mach-omap2/irq.c | 2 +-
arch/arm/mach-omap2/powerdomain.h | 23 +-
arch/arm/mach-omap2/powerdomain33xx.c | 229 +++++++
arch/arm/mach-omap2/powerdomains33xx_data.c | 185 ++++++
arch/arm/mach-omap2/prm-regbits-33xx.h | 357 +++++++++++
arch/arm/mach-omap2/prm33xx.c | 135 ++++
arch/arm/mach-omap2/prm33xx.h | 129 ++++
arch/arm/mach-omap2/timer.c | 5 +
arch/arm/mach-omap2/voltage.h | 1 +
arch/arm/mach-omap2/voltagedomains33xx_data.c | 43 ++
arch/arm/mach-tegra/Makefile | 3 +-
arch/arm/mach-tegra/apbio.c | 194 +++++-
arch/arm/mach-tegra/apbio.h | 19 +-
arch/arm/mach-tegra/common.c | 3 +
arch/arm/mach-vexpress/Kconfig | 5 +-
arch/arm/mach-vexpress/Makefile.boot | 3 +-
arch/arm/mach-vexpress/ct-ca9x4.c | 64 +-
arch/arm/mach-vexpress/include/mach/clkdev.h | 15 -
arch/arm/mach-vexpress/include/mach/debug-macro.S | 41 ++
arch/arm/mach-vexpress/include/mach/motherboard.h | 28 +-
arch/arm/mach-vexpress/include/mach/uncompress.h | 14 +
arch/arm/mach-vexpress/v2m.c | 296 +++++----
arch/arm/plat-mxc/devices/platform-mxc_rtc.c | 5 +
arch/arm/plat-mxc/include/mach/iomux-mx51.h | 14 +
arch/arm/plat-mxc/include/mach/mxc_ehci.h | 16 +-
arch/arm/plat-omap/include/plat/serial.h | 4 +
arch/arm/plat-omap/include/plat/uncompress.h | 6 +
arch/arm/plat-samsung/Kconfig | 4 +
arch/arm/plat-samsung/Makefile | 4 +-
arch/arm/plat-samsung/include/plat/cpu.h | 4 +
arch/arm/plat-versatile/Kconfig | 3 +
arch/arm/plat-versatile/Makefile | 2 +-
drivers/clk/Makefile | 1 +
drivers/clk/clk-nomadik.c | 47 ++
include/linux/platform_data/clk-nomadik.h | 2 +
91 files changed, 4730 insertions(+), 852 deletions(-)
^ permalink raw reply [flat|nested] 44+ messages in thread
* [GIT PULL 10/15] arm-soc: defconfig updates
@ 2012-07-23 20:33 ` Arnd Bergmann
0 siblings, 0 replies; 44+ messages in thread
From: Arnd Bergmann @ 2012-07-23 20:33 UTC (permalink / raw)
To: linux-arm-kernel
The following changes since commit 84a1caf1453c3d44050bd22db958af4a7f99315c:
Linux 3.5-rc7 (2012-07-14 15:40:28 -0700)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git next/defconfig
for you to fetch changes up to 2d05bf6ef7391ac3642ab62bc3a649fdb32731fe:
Merge branch 'samsung/defconfig' into next/defconfig (2012-07-21 23:22:35 +0200)
----------------------------------------------------------------
arm-soc: defconfig updates
These are changes to the default configuration files, to account for
kernel changes and new hardware.
----------------------------------------------------------------
Arnd Bergmann (6):
Merge branch 'lpc32xx/defconfig' of git://git.antcom.de/linux-2.6 into next/defconfig
Merge branch 'mxs/defconfig-for-3.6' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/defconfig
Merge branch 'for-3.6/defconfig' of git://git.kernel.org/.../swarren/linux-tegra into next/defconfig
Merge tag 'imx-defconfig' of git://git.pengutronix.de/git/imx/linux-2.6 into next/defconfig
Merge branch 'samsung/defconfig' into next/defconfig
Merge branch 'next/defconfig' into for-next
Fabio Estevam (5):
ARM: mxs: Let GPMI driver be built by default
ARM: mxs: Enable MACH_APX4DEVKIT
ARM: mxs_defconfig: Let AUART driver be built by default
ARM: mxs_defconfig: Enable RTC driver
ARM: mxs: defconfig: Enable CONFIG_COMMON_CLK_DEBUG
Olof Johansson (1):
ARM: exynos_defconfig: enable more platforms in defconfig
Roland Stigge (1):
ARM: LPC32xx: Defconfig update
Sascha Hauer (2):
ARM: imx_v6_v7_defconfig: update features
ARM: imx_v4_v5_defconfig: update features
Stephen Warren (1):
ARM: tegra: defconfig updates
arch/arm/configs/exynos_defconfig | 92 ++++++++++++++++++++++++++++++++++
arch/arm/configs/imx_v4_v5_defconfig | 51 +++++++++----------
arch/arm/configs/imx_v6_v7_defconfig | 61 +++++++++++++---------
arch/arm/configs/lpc32xx_defconfig | 2 +
arch/arm/configs/mxs_defconfig | 7 +++
arch/arm/configs/tegra_defconfig | 13 +++--
6 files changed, 170 insertions(+), 56 deletions(-)
^ permalink raw reply [flat|nested] 44+ messages in thread
* [GIT PULL 11/15] arm-soc: board specific updates
@ 2012-07-23 20:33 ` Arnd Bergmann
0 siblings, 0 replies; 44+ messages in thread
From: Arnd Bergmann @ 2012-07-23 20:33 UTC (permalink / raw)
To: linux-arm-kernel
The following changes since commit 84a1caf1453c3d44050bd22db958af4a7f99315c:
Linux 3.5-rc7 (2012-07-14 15:40:28 -0700)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git next/boards
for you to fetch changes up to d003e09891fdc0c170b99328eba7ed004809ef5a:
Merge branch 'next/board-samsung-3' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/boards (2012-07-21 23:08:03 +0200)
----------------------------------------------------------------
arm-soc: board specific updates
These changes are all for individual board files. In the long run, those
files will largely go away, and the amount of changes appears to be
continuously decreasing, which is a good sign. This time around, changes
are focused on tegra, omap and samsung.
----------------------------------------------------------------
Andy Gross (1):
omap2+: add drm device
Arnd Bergmann (7):
Merge branch 'for-3.6/boards' of git://git.kernel.org/.../swarren/linux-tegra into next/boards
Merge branch 'next/board-samsung' of git://git.kernel.org/.../kgene/linux-samsung into next/boards
Merge tag 'omap-devel-board-for-v3.6' of git://git.kernel.org/.../tmlind/linux-omap into next/boards
Merge branch 'next/board-samsung-2' of git://git.kernel.org/.../kgene/linux-samsung into next/boards
Merge tag 'v3.5-rc7' into next/boards
Merge branch 'next/board-samsung-3' of git://git.kernel.org/.../kgene/linux-samsung into next/boards
Merge branch 'next/boards' into for-next
Dimitris Papastamos (1):
ARM: S3C64XX: Add IRQ mapping for wm0010 on Cragganmore
Dmitry Lifshitz (2):
ARM: OMAP3: cm-t35: add mt9t001 camera sensor support
ARM: OMAP3: cm-t35: add tvp5150 decoder support
Kukjin Kim (3):
Merge branch 'next/board-samsung' into next/board-samsung-2
Merge branch 'next/board-samsung-2' into next/board-samsung-3
ARM: SAMSUNG: no need to set the value for clk_xusbxti when it is 24Mhz
Laxman Dewangan (1):
ARM: tegra: add device tree AUXDATA for APBDMA
Mark Brown (7):
ARM: S3C64XX: Add module identification for Balblair Cragganmore module
ARM: S3C64XX: Add WM5102 EVM to Cragganmore modules
ARM: S3C64XX: Dynamically allocate the IRQ range for WM8994 on Cragganmore
ARM: S3C64XX: Dynamically assign interrupts for CPU PMIC on Cragganmore
ARM: S3C64XX: Don't specify an irq_base for WM1192-EV1 board
ARM: S3C64XX: Clean up after SPI driver platform data updates
ARM: S3C64XX: Mark most Cragganmore initdata devinitdata
Peter Ujfalusi (2):
ARM: OMAP: board-4430sdp: MUX configuration for sys_nirq2
ARM: OMAP: board-omap4panda: MUX configuration for sys_nirq2
Ricardo Salveti de Araujo (1):
ARM: EXYNOS: Add leds status1 and status2 on Origen board
Sachin Kamat (11):
ARM: EXYNOS: Add HSOTG support to Origen
ARM: EXYNOS: Add HSOTG support to SMDKV310
ARM: EXYNOS: Update keypad entries for SMDK4X12
ARM: S5PV210: Add HSOTG support to SMDKV210
ARM: EXYNOS: Add audio platform device in SMDKV310 board
ARM: S5PV210: Add audio platform device in Aquila board
ARM: S5PV210: Add audio platform device in Goni board
ARM: EXYNOS: Add HSOTG support to SMDK4X12
ARM: EXYNOS: Add framebuffer support for SMDK4X12
ARM: EXYNOS: Add DRM device to SMDK4X12 board
ARM: EXYNOS: Add missing .reserve field to SMDKC210
Stephen Warren (7):
ARM: tegra: make .dts compilation depend on Tegra2 support
ARM: tegra: remove CONFIG_MACH_TEGRA_DT
ARM: tegra: remove Seaboard board files
ARM: tegra: trimslice: enable PCIe when booting from device tree
ARM: tegra: harmony: init regulators, PCIe when booting from DT
ARM: tegra: paz00: enable WiFi rfkill when booting from device tree
ARM: tegra: use of_default_bus_match_table
Tony Lindgren (1):
ARM: OMAP3: Fix omap3evm randconfig error introduced by VBUS support
Zumeng Chen (4):
ARM: OMAP3EVM: Add NAND flash definition
ARM: OMAP3EVM: Adding USB internal LDOs board file
ARM: omap3evm: enable VBUS switch for EHCI tranceiver
ARM: OMAP3530evm: set pendown_state and debounce time for ads7846
arch/arm/Kconfig | 1 +
arch/arm/mach-exynos/Kconfig | 7 +
arch/arm/mach-exynos/mach-nuri.c | 3 +-
arch/arm/mach-exynos/mach-origen.c | 39 ++-
arch/arm/mach-exynos/mach-smdk4x12.c | 83 +++++-
arch/arm/mach-exynos/mach-smdkv310.c | 17 +-
arch/arm/mach-exynos/mach-universal_c210.c | 3 +-
arch/arm/mach-omap2/Makefile | 4 +
arch/arm/mach-omap2/board-4430sdp.c | 3 +
arch/arm/mach-omap2/board-cm-t35.c | 89 ++++++
arch/arm/mach-omap2/board-omap3evm.c | 78 ++++-
arch/arm/mach-omap2/board-omap4panda.c | 3 +
arch/arm/mach-omap2/common-board-devices.c | 11 +
arch/arm/mach-omap2/common-board-devices.h | 1 +
arch/arm/mach-omap2/drm.c | 61 ++++
arch/arm/mach-s3c64xx/include/mach/crag6410.h | 4 +-
arch/arm/mach-s3c64xx/mach-crag6410-module.c | 11 +-
arch/arm/mach-s3c64xx/mach-crag6410.c | 69 +++--
arch/arm/mach-s3c64xx/mach-smdk6410.c | 1 -
arch/arm/mach-s5pv210/Kconfig | 2 +
arch/arm/mach-s5pv210/mach-aquila.c | 7 +
arch/arm/mach-s5pv210/mach-goni.c | 11 +-
arch/arm/mach-s5pv210/mach-smdkv210.c | 10 +-
arch/arm/mach-tegra/Kconfig | 36 ---
arch/arm/mach-tegra/Makefile | 13 +-
arch/arm/mach-tegra/Makefile.boot | 10 +-
arch/arm/mach-tegra/board-dt-tegra20.c | 74 ++++-
arch/arm/mach-tegra/board-dt-tegra30.c | 8 +-
arch/arm/mach-tegra/board-harmony-pcie.c | 15 +-
arch/arm/mach-tegra/board-harmony-power.c | 25 +-
arch/arm/mach-tegra/board-paz00.c | 7 +-
arch/arm/mach-tegra/board-seaboard-pinmux.c | 197 -------------
arch/arm/mach-tegra/board-seaboard.c | 306 --------------------
arch/arm/mach-tegra/board-seaboard.h | 47 ---
arch/arm/mach-tegra/board.h | 9 +
drivers/staging/omapdrm/omap_drv.h | 2 +-
.../linux/platform_data/omap_drm.h | 19 +-
37 files changed, 593 insertions(+), 693 deletions(-)
^ permalink raw reply [flat|nested] 44+ messages in thread
* [GIT PULL 05/15] arm-soc: device tree description updates
@ 2012-07-23 20:33 ` Arnd Bergmann
0 siblings, 0 replies; 44+ messages in thread
From: Arnd Bergmann @ 2012-07-23 20:33 UTC (permalink / raw)
To: linux-arm-kernel
The following changes since commit bd0a521e88aa7a06ae7aabaed7ae196ed4ad867a:
Linux 3.5-rc6 (2012-07-07 17:23:56 -0700)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git next/dt
for you to fetch changes up to 1fc5f7d5c680ac36bd41e13a3d77cbe2eaa312e0:
Merge branch 'lpc32xx/dts2' of git://git.antcom.de/linux-2.6 into next/dt (2012-07-21 00:11:16 +0200)
----------------------------------------------------------------
arm-soc: device tree description updates
This branch contains two kinds of updates: Some platforms in the process
of getting converted to device tree based booting, and the platform
specific patches necessary for that are included here. Other platforms
are already converted, so we just need to update the actual device
tree source files and the binding documents to add support for new board
and new drivers.
In the future we will probably separate those into two branches, and
in the long run, the plan is to move the device tree source files out
of the kernel repository, but that has to wait until we have completed
a much larger portion of the binding documents.
----------------------------------------------------------------
Afzal Mohammed (1):
arm/dts: am33xx wdt node
Alexandre Pereira da Silva (1):
ARM: LPC32xx: Add PWM to base dts file
AnilKumar Ch (4):
arm/dts: Add initial DT support for AM33XX SoC family
arm/dts: Add support for AM335x EVM
arm/dts: Add support for AM335x BeagleBone
arm/dts: remove MMC/SD and SPI related entries from am33xx.dtsi
Arnd Bergmann (20):
Merge branch 'lpc32xx/dts' of git://git.antcom.de/linux-2.6 into next/dt
Merge tag 'v3.5-rc5' into next/dt
Merge branch 'mxs/dt-for-3.6' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/dt
Merge branch 'imx/dt-for-3.6' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/dt
Merge branch 'tegra/cleanup' into next/dt
Merge branch 'for-3.6/dt' of git://git.kernel.org/.../swarren/linux-tegra into next/dt
Merge tag 'v3.5-rc6' into next/dt
Merge tag 'at91-for-next-dt' of git://github.com/at91linux/linux-at91 into next/dt
Merge tag 'omap-devel-dt-for-v3.6' of git://git.kernel.org/.../tmlind/linux-omap into next/dt
Merge tag 'imx-dt' of git://git.pengutronix.de/git/imx/linux-2.6 into next/dt
Merge branch 'imx/dt-for-3.6' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/dt
Merge branch 'mxs/dt-for-3.6' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/dt
Merge tag 'davinci-v3.6-dt' of git://gitorious.org/linux-davinci/linux-davinci into next/dt
Merge branch 'samsung/dma' into next/dt
Merge branch 'next/dt-samsung' of git://git.kernel.org/.../kgene/linux-samsung into next/dt
ARM: EXYNOS: mark the DMA channel binding for SPI as preliminary
Merge branch 'ux500/fixes-3.5' into next/dt
Merge branch 'for-arm-soc-next' of git://git.linaro.org/people/ljones/linux-3.0-ux500 into next/dt
Merge branch 'lpc32xx/dts2' of git://git.antcom.de/linux-2.6 into next/dt
Merge branch 'next/dt' into for-next
Denis 'GNUtoo' Carikli (2):
ARM i.MX31: Add devicetree support
arm/dts: Add support for i.MX31 bug 1.x board from buglabs.
Fabio Estevam (4):
serial: mxs-auart: Allow device tree probing
ARM: dts: mx28evk: Add auart0 and auart3 support
ARM: mx23: Add initial support for olinuxino board
ARM: dts: Add basic support for mx27_3ds board
Fabio Porcedda (1):
ARM: at91: add support for Telit EVK-PRO3 with Telit GE863-PRO3
Heiko Schocher (1):
ARM: davinci: cp_intc: Add OF support for TI interrupt controller
Huang Shijie (6):
ARM: imx6q: add DT node for apbh-dma
ARM: imx6q: add clock for apbh-dma
ARM: imx6q: add DT node for gpmi nand
ARM: imx6q: add clocks for gpmi-nand
ARM: mx28: add gpmi-nand support
ARM: dts: mx23: add gpmi nand support
Hui Wang (1):
ARM: dts: imx6q-sabrelite: add ecspi1 pinctrl support
Jiri Prchal (1):
ARM: at91: Add support for board aks-cdu
Jon Hunter (1):
arm/dts: OMAP2: Add support for OMAP2420H4 Board
Kukjin Kim (1):
Merge branch 'next/devel-dma-ops' into next/dt-samsung
Lauri Hintsala (6):
ARM: apx4devkit: add NAND support
ARM: apx4devkit: add display support
ARM: apx4devkit: fix the bus-width of SSP0 to 4 bits
ARM: apx4devkit: add SSP2 support
ARM: apx4devkit: remove AUART3
ARM: apx4devkit: add pin muxing for GPIOs
Lee Jones (20):
ARM: ux500: Enable Device Tree support mmci for Snowball
ARM: ux500: Remove unused i2c platform_data initialisation code
ARM: ux500: Provide auxdata to be used as name base clock search for nmk-i2c
ARM: ux500: Kconfig: Compile in leds-gpio support for Snowball
ARM: ux500: Enable the user LED on Snowball via Device Tree
ARM: ux500: Add a ab8500-gpadc node to the db8500 Device Tree
ARM: ux500: Add support for input/ponkey into the db8500's Device Tree
ARM: ux500: Enable LED heartbeat functionality on Snowball
ARM: ux500: Enable LED heartbeat functionality on Snowbal via DT
ARM: ux500: Add db8500 Device Tree node for ab8500-sysctrl
ARM: ux500: Add db8500 Device Tree node for misc/ab8500-pwm
ARM: ux500: Add a ab8500-usb Device Tree node for db8500 based devices
ARM: ux500: Apply ab8500-debug node do the db8500 DT structure
ARM: ux500: Correctly reference IRQs supplied by the AB8500 from Device Tree
ARM: ux500: Enable the AB8500 RTC for all DT:ed DB8500 based devices
ARM: ux500: Move rtc-pl031 registration to Device Tree when enabled
pinctrl: pinctrl-nomadik: Append sleepmode property with vendor specific prefixes
ARM: ux500: Ensure vendor specific properties have the vendor's identifier
ARM: ux500: Remove temporary snowball_of_platform_devs enablement structure
ARM: ux500: Remove PMU platform registration when booting with DT
Marc Kleine-Budde (2):
ARM: imx: enable flexcan on imx25, imx35, imx53, imx6q
ARM: mxs: enable flexcan on imx28
Marek Vasut (3):
ARM: dts: imx23: Fix the gpmi/gpmi-nand DT name
rtc: stmp3xxx: Add simple binding for the stmp3xxx-rtc
ARM: mxs: convert m28evk board to device tree
Maxime Ripard (3):
ARM: dts: imx28: Add additionnal muxing options to iMX28 DTSI
ARM: mxs: Add Crystalfontz CFA-10036 DTS
ARM: dts: cfa10036: Add Power LED to the CFA-10036 board
Otavio Salvador (1):
ARM: imx6q: ensure ANATOP controller is available
Peter Ujfalusi (7):
arm/dts: omap4: Add entry for OMAP McPDM IP
arm/dts: omap4: Add entry for OMAP DMIC IP
arm/dts: omap4-sdp: Add fixed regulator to represent VBAT
arm/dts: omap4-sdp: Add support for twl6040
arm/dts: omap4-sdp: Enable audio support via device tree
arm/dts: omap4-panda: Audio support for PandaBoard 4430
arm/dts: New dts file for PandaBoardES (4460)
Richard Zhao (5):
ARM: dts: imx28-evk: add usb devices
ARM: imx6q: add usb controller clock lookups
ARM: imx6q: add usbphy clocks
ARM: imx6q: disable usb charger detector
ARM: dts: imx6q-sabrelite: add usb devices
Roland Stigge (1):
ARM: LPC32xx: Update DTS file for EA3250 board
Shawn Guo (24):
ARM: mxs: store mac address read from OTP in device tree
video: mxsfb: move mxsfb.h into include/linux
video: mxsfb: add simple device tree probe
ARM: mxs: use auxdata to attach mxsfb_platform_data
ARM: dts: mxs: add comments for pinmux-ids
ARM: dts: mxs: add hog-gpios for imx23-evk and imx28-evk
ARM: dts: imx23-evk: updates for mmc device
ARM: dts: imx23-evk: add auart device
ARM: dts: imx28-evk: add vmmc-supply for mmc device
ARM: dts: imx28-evk: add missing properties for fec
ARM: dts: imx28-evk: add heartbeat gpio-leds
ARM: dts: mxs: enable rtc for imx23 and imx28
ARM: dts: mxs: add pwm-backlight for imx23-evk and imx28-evk
ARM: dts: mxs: add lcd support for imx23-evk and imx28-evk
ARM: dts: imx28-evk: add flexan devices
bindings: update imx and mxs #gpio-cells
ARM: dts: imx: update #interrupt-cells for gpio nodes
ARM: dts: imx28: move extra gpmi-nand pins into board dts
ARM: dts: imx28: move lcdif control pins into board dts
ARM: mxs: convert apx4devkit board to device tree
ARM: mxs: convert tx28 board to device tree
ARM: mxs: convert stmp378x_devb board to device tree
ARM: mxs: add dtb-y target into Makefile.boot
ARM: mxs: rename dts files with soc name being the prefix
Stephen Warren (3):
ARM: dt: tegra: add Whistler device tree file
ARM: dt: tegra: seaboard: instantiate pinctrl-based I2C bus mux
ARM: dt: tegra seaboard: move battery monitor to mux'd I2C bus.
Thomas Abraham (14):
ARM: S3C64XX: Add a new dma request id for device tree based dma channel lookup
spi: s3c64xx: remove unused S3C64XX_SPI_ST_TRLCNTZ macro
spi: s3c64xx: move controller information into driver data
ARM: SAMSUNG: Remove pdev pointer parameter from spi gpio setup functions
ARM: SAMSUNG: Modify s3c64xx_spi{0|1|2}_set_platdata function
spi: s3c64xx: Remove the 'set_level' callback from controller data
spi: s3c64xx: add device tree support
ARM: EXYNOS: Add device tree node for EXYNOS4 interrupt combiner controller
ARM: EXYNOS: Fix the incorrect hierarchy of spi controller bus clock
ARM: EXYNOS: Enable platform support for SPI controllers for EXYNOX4
ARM: dts: Add nodes for spi controllers for SAMSUNG EXYNOS4 platforms
ARM: EXYNOS: Add spi clock support for EXYNOS5
ARM: EXYNOS: Enable platform support for SPI controllers for EXYNOS5
ARM: dts: Add nodes for spi controllers for SAMSUNG EXYNOS5 platforms
Uri Yosef (1):
arm/dts: OMAP4: Add Variscite OMAP4 System-On-Modeule support
Vaibhav Hiremath (2):
arm/dts: Add support for TI AM3517/05 EVM board
arm/dts: omap3-evm: Add i2c and twl4030 support
Xiao Jiang (3):
arm/dts: add wdt node for omap3 and omap4
ARM: OMAP: avoid build wdt platform device if with dt support
watchdog: omap_wdt: add device tree support
.../devicetree/bindings/arm/davinci/cp-intc.txt | 27 ++
Documentation/devicetree/bindings/arm/olimex.txt | 6 +
.../devicetree/bindings/arm/omap/omap.txt | 3 +
Documentation/devicetree/bindings/fb/mxsfb.txt | 19 +
.../devicetree/bindings/gpio/fsl-imx-gpio.txt | 14 +-
.../devicetree/bindings/gpio/gpio-mxs.txt | 5 +-
.../devicetree/bindings/gpio/gpio-nmk.txt | 2 +-
.../devicetree/bindings/rtc/stmp3xxx-rtc.txt | 16 +
.../devicetree/bindings/spi/spi-samsung.txt | 116 +++++
.../bindings/tty/serial/fsl-mxs-auart.txt | 27 ++
.../devicetree/bindings/watchdog/omap-wdt.txt | 14 +
arch/arm/boot/dts/aks-cdu.dts | 113 +++++
arch/arm/boot/dts/am335x-bone.dts | 20 +
arch/arm/boot/dts/am335x-evm.dts | 20 +
arch/arm/boot/dts/am33xx.dtsi | 158 +++++++
arch/arm/boot/dts/am3517-evm.dts | 32 ++
arch/arm/boot/dts/db8500.dtsi | 77 +++-
arch/arm/boot/dts/ea3250.dts | 17 +
arch/arm/boot/dts/evk-pro3.dts | 41 ++
arch/arm/boot/dts/exynos4210-origen.dts | 12 +
arch/arm/boot/dts/exynos4210-smdkv310.dts | 38 ++
arch/arm/boot/dts/exynos4210.dtsi | 47 ++
arch/arm/boot/dts/exynos5250-smdk5250.dts | 38 ++
arch/arm/boot/dts/exynos5250.dtsi | 36 ++
arch/arm/boot/dts/ge863-pro3.dtsi | 52 +++
arch/arm/boot/dts/imx23-evk.dts | 66 ++-
arch/arm/boot/dts/imx23-olinuxino.dts | 44 ++
arch/arm/boot/dts/imx23-stmp378x_devb.dts | 78 ++++
arch/arm/boot/dts/imx23.dtsi | 169 ++++++-
arch/arm/boot/dts/imx27-3ds.dts | 41 ++
arch/arm/boot/dts/imx27.dtsi | 12 +-
arch/arm/boot/dts/imx28-apx4devkit.dts | 198 ++++++++
arch/arm/boot/dts/imx28-cfa10036.dts | 52 +++
arch/arm/boot/dts/imx28-evk.dts | 164 +++++++
arch/arm/boot/dts/imx28-m28evk.dts | 210 +++++++++
arch/arm/boot/dts/imx28-tx28.dts | 97 ++++
arch/arm/boot/dts/imx28.dtsi | 353 ++++++++++++--
arch/arm/boot/dts/imx31-bug.dts | 31 ++
arch/arm/boot/dts/imx31.dtsi | 88 ++++
arch/arm/boot/dts/imx51.dtsi | 8 +-
arch/arm/boot/dts/imx53.dtsi | 14 +-
arch/arm/boot/dts/imx6q-arm2.dts | 6 +
arch/arm/boot/dts/imx6q-sabrelite.dts | 33 ++
arch/arm/boot/dts/imx6q.dtsi | 99 +++-
arch/arm/boot/dts/lpc32xx.dtsi | 5 +
arch/arm/boot/dts/omap2420-h4.dts | 20 +
arch/arm/boot/dts/omap3-evm.dts | 28 ++
arch/arm/boot/dts/omap3.dtsi | 5 +
arch/arm/boot/dts/omap4-panda.dts | 37 ++
arch/arm/boot/dts/omap4-pandaES.dts | 24 +
arch/arm/boot/dts/omap4-sdp.dts | 68 +++
arch/arm/boot/dts/omap4-var_som.dts | 96 ++++
arch/arm/boot/dts/omap4.dtsi | 23 +
arch/arm/boot/dts/snowball.dts | 21 +-
arch/arm/boot/dts/tegra20-seaboard.dts | 85 +++-
arch/arm/boot/dts/tegra20-whistler.dts | 301 ++++++++++++
arch/arm/mach-at91/Makefile.boot | 2 +
arch/arm/mach-davinci/cp_intc.c | 16 +-
arch/arm/mach-davinci/include/mach/cp_intc.h | 1 +
arch/arm/mach-exynos/clock-exynos4.c | 67 ++-
arch/arm/mach-exynos/clock-exynos5.c | 95 ++++
arch/arm/mach-exynos/include/mach/irqs.h | 4 +
arch/arm/mach-exynos/include/mach/map.h | 3 +
arch/arm/mach-exynos/mach-exynos4-dt.c | 6 +
arch/arm/mach-exynos/mach-exynos5-dt.c | 6 +
arch/arm/mach-exynos/setup-spi.c | 33 +-
arch/arm/mach-imx/Kconfig | 13 +
arch/arm/mach-imx/Makefile | 1 +
arch/arm/mach-imx/clk-imx31.c | 19 +
arch/arm/mach-imx/clk-imx6q.c | 22 +-
arch/arm/mach-imx/imx31-dt.c | 63 +++
arch/arm/mach-imx/mach-imx6q.c | 41 ++
arch/arm/mach-mxs/Kconfig | 1 +
arch/arm/mach-mxs/Makefile.boot | 9 +
arch/arm/mach-mxs/devices-mx23.h | 2 +-
arch/arm/mach-mxs/devices-mx28.h | 2 +-
arch/arm/mach-mxs/devices/platform-mxsfb.c | 2 +-
arch/arm/mach-mxs/mach-mxs.c | 215 ++++++++-
arch/arm/mach-omap2/devices.c | 2 +-
arch/arm/mach-s3c24xx/clock-s3c2416.c | 3 +-
arch/arm/mach-s3c24xx/clock-s3c2443.c | 2 +-
arch/arm/mach-s3c24xx/common-s3c2443.c | 4 +-
arch/arm/mach-s3c24xx/setup-spi.c | 10 +-
arch/arm/mach-s3c64xx/clock.c | 20 +-
arch/arm/mach-s3c64xx/include/mach/dma.h | 1 +
arch/arm/mach-s3c64xx/mach-crag6410.c | 2 +-
arch/arm/mach-s3c64xx/setup-spi.c | 19 +-
arch/arm/mach-s5p64x0/clock-s5p6440.c | 12 +-
arch/arm/mach-s5p64x0/clock-s5p6450.c | 12 +-
arch/arm/mach-s5p64x0/setup-spi.c | 21 +-
arch/arm/mach-s5pc100/clock.c | 30 +-
arch/arm/mach-s5pc100/setup-spi.c | 30 +-
arch/arm/mach-s5pv210/clock.c | 14 +-
arch/arm/mach-s5pv210/setup-spi.c | 21 +-
arch/arm/mach-tegra/Makefile.boot | 1 +
arch/arm/mach-ux500/Kconfig | 1 +
arch/arm/mach-ux500/board-mop500-sdi.c | 4 +-
arch/arm/mach-ux500/board-mop500.c | 63 +--
arch/arm/mach-ux500/board-mop500.h | 3 +
arch/arm/mach-ux500/cpu-db8500.c | 4 +-
arch/arm/plat-mxc/include/mach/common.h | 1 +
arch/arm/plat-samsung/devs.c | 60 +--
arch/arm/plat-samsung/include/plat/s3c64xx-spi.h | 39 +-
drivers/i2c/busses/i2c-nomadik.c | 3 +-
drivers/pinctrl/pinctrl-nomadik.c | 2 +-
drivers/rtc/rtc-stmp3xxx.c | 8 +
drivers/spi/spi-s3c64xx.c | 481 +++++++++++++++++---
drivers/tty/serial/mxs-auart.c | 42 +-
drivers/video/mxsfb.c | 62 ++-
drivers/watchdog/omap_wdt.c | 7 +
.../include/mach => include/linux}/mxsfb.h | 6 +-
111 files changed, 4516 insertions(+), 523 deletions(-)
^ permalink raw reply [flat|nested] 44+ messages in thread
* [GIT PULL 12/15] arm-soc: sparse IRQ conversion
@ 2012-07-23 20:33 ` Arnd Bergmann
0 siblings, 0 replies; 44+ messages in thread
From: Arnd Bergmann @ 2012-07-23 20:33 UTC (permalink / raw)
To: linux-arm-kernel
The following changes since commit 6887a4131da3adaab011613776d865f4bcfb5678:
Linux 3.5-rc5 (2012-06-30 16:08:57 -0700)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git next/irq
for you to fetch changes up to c7b0807b9d4faddd87a75a5acb079e5dbfedd211:
Merge branch 'imx/sparse-irq' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/irq (2012-07-06 21:12:59 +0200)
----------------------------------------------------------------
arm-soc: sparse IRQ conversion
The I.MX platform is getting converted to use sparse IRQs. We are doing
this for all platforms over time, because this is one of the
requirements for building a multiplatform kernel, and generally a good
idea.
----------------------------------------------------------------
Arnd Bergmann (3):
Merge branch 'imx/sparse-irq' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/irq
Merge branch 'imx/sparse-irq' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/irq
Merge branch 'next/irq' into for-next
Fabio Estevam (1):
ARM: imx: Fix build error due to missing irqs.h include
Shawn Guo (16):
ARM: imx: eliminate macro IMX_GPIO_TO_IRQ()
ARM: imx: eliminate macro IOMUX_TO_IRQ()
ARM: imx: eliminate macro IRQ_GPIOx()
gpio/mxc: move irq_domain_add_legacy call into gpio driver
ARM: imx: move irq_domain_add_legacy call into tzic driver
ARM: imx: move irq_domain_add_legacy call into avic driver
dma: ipu: remove the use of ipu_platform_data
ARM: imx: leave irq_base of wm8350_platform_data uninitialized
ARM: imx: pass gpio than irq number into mxc_expio_init
ARM: imx: add a legacy irqdomain for 3ds_debugboard
ARM: imx: add a legacy irqdomain for mx31ads
i2c: imx: remove unneeded mach/irqs.h inclusion
ARM: imx: remove unneeded mach/irq.h inclusion
tty: serial: imx: remove the use of MXC_INTERNAL_IRQS
ARM: fiq: change FIQ_START to a variable
ARM: imx: enable SPARSE_IRQ for imx platform
Uwe Kleine-K?nig (1):
ARM: imx: select USE_OF
arch/arm/Kconfig | 2 +
arch/arm/include/asm/mach/irq.h | 2 +-
arch/arm/kernel/fiq.c | 9 +-
arch/arm/mach-imx/Kconfig | 4 -
arch/arm/mach-imx/devices-imx31.h | 4 +-
arch/arm/mach-imx/devices-imx35.h | 4 +-
arch/arm/mach-imx/eukrea_mbimx27-baseboard.c | 3 +-
arch/arm/mach-imx/eukrea_mbimxsd35-baseboard.c | 6 +-
arch/arm/mach-imx/imx27-dt.c | 28 ---
arch/arm/mach-imx/imx51-dt.c | 27 ---
arch/arm/mach-imx/imx53-dt.c | 27 ---
arch/arm/mach-imx/mach-apf9328.c | 7 +-
arch/arm/mach-imx/mach-armadillo5x0.c | 18 +-
arch/arm/mach-imx/mach-cpuimx27.c | 12 +-
arch/arm/mach-imx/mach-cpuimx35.c | 3 +-
arch/arm/mach-imx/mach-cpuimx51sd.c | 3 +-
arch/arm/mach-imx/mach-imx27_visstrim_m10.c | 9 +-
arch/arm/mach-imx/mach-imx6q.c | 14 --
arch/arm/mach-imx/mach-kzm_arm11_01.c | 20 ++-
arch/arm/mach-imx/mach-mx1ads.c | 1 -
arch/arm/mach-imx/mach-mx21ads.c | 16 +-
arch/arm/mach-imx/mach-mx27_3ds.c | 7 +-
arch/arm/mach-imx/mach-mx27ads.c | 12 +-
arch/arm/mach-imx/mach-mx31_3ds.c | 18 +-
arch/arm/mach-imx/mach-mx31ads.c | 63 ++++---
arch/arm/mach-imx/mach-mx31lilly.c | 10 +-
arch/arm/mach-imx/mach-mx31lite.c | 11 +-
arch/arm/mach-imx/mach-mx31moboard.c | 10 +-
arch/arm/mach-imx/mach-mx35_3ds.c | 18 +-
arch/arm/mach-imx/mach-mx51_3ds.c | 3 +-
arch/arm/mach-imx/mach-mx53_ard.c | 5 +-
arch/arm/mach-imx/mach-mxt_td60.c | 6 +-
arch/arm/mach-imx/mach-pca100.c | 5 +-
arch/arm/mach-imx/mach-pcm037.c | 24 +--
arch/arm/mach-imx/mach-pcm038.c | 4 +-
arch/arm/mach-imx/mach-pcm043.c | 6 +-
arch/arm/mach-imx/mach-qong.c | 10 +-
arch/arm/mach-imx/mach-scb9328.c | 7 +-
arch/arm/mach-imx/mach-vpr200.c | 10 +-
arch/arm/mach-imx/mm-imx1.c | 1 -
arch/arm/mach-imx/mm-imx21.c | 1 -
arch/arm/mach-imx/mm-imx25.c | 1 -
arch/arm/mach-imx/mm-imx27.c | 1 -
arch/arm/mach-imx/mm-imx3.c | 1 -
arch/arm/mach-imx/mx31lilly-db.c | 11 +-
arch/arm/mach-imx/mx31lite-db.c | 5 +-
arch/arm/mach-imx/mx51_efika.c | 3 +-
arch/arm/mach-imx/pcm970-baseboard.c | 13 +-
arch/arm/mach-rpc/irq.c | 2 +-
arch/arm/plat-mxc/3ds_debugboard.c | 50 +++---
arch/arm/plat-mxc/avic.c | 35 +++-
arch/arm/plat-mxc/devices/platform-ipu-core.c | 5 +-
arch/arm/plat-mxc/include/mach/3ds_debugboard.h | 2 +-
arch/arm/plat-mxc/include/mach/devices-common.h | 4 +-
arch/arm/plat-mxc/include/mach/hardware.h | 2 -
arch/arm/plat-mxc/include/mach/iomux-mx3.h | 3 -
arch/arm/plat-mxc/include/mach/iomux-v1.h | 7 -
arch/arm/plat-mxc/include/mach/ipu.h | 4 -
arch/arm/plat-mxc/include/mach/irqs.h | 44 -----
arch/arm/plat-mxc/include/mach/mx1.h | 111 ++++++------
arch/arm/plat-mxc/include/mach/mx21.h | 107 +++++------
arch/arm/plat-mxc/include/mach/mx25.h | 72 ++++----
arch/arm/plat-mxc/include/mach/mx27.h | 127 ++++++-------
arch/arm/plat-mxc/include/mach/mx2x.h | 87 ++++-----
arch/arm/plat-mxc/include/mach/mx31.h | 118 ++++++------
arch/arm/plat-mxc/include/mach/mx35.h | 109 ++++++------
arch/arm/plat-mxc/include/mach/mx3x.h | 77 ++++----
arch/arm/plat-mxc/include/mach/mx50.h | 187 +++++++++----------
arch/arm/plat-mxc/include/mach/mx51.h | 209 +++++++++++-----------
arch/arm/plat-mxc/include/mach/mx53.h | 217 ++++++++++++-----------
arch/arm/plat-mxc/tzic.c | 30 +++-
arch/arm/plat-s3c24xx/irq.c | 2 +-
drivers/dma/ipu/ipu_idmac.c | 8 +-
drivers/dma/ipu/ipu_irq.c | 14 +-
drivers/gpio/gpio-mxc.c | 56 +++---
drivers/i2c/busses/i2c-imx.c | 1 -
drivers/media/video/mx1_camera.c | 1 +
drivers/tty/serial/imx.c | 6 +-
sound/soc/fsl/imx-pcm-fiq.c | 1 +
79 files changed, 1052 insertions(+), 1131 deletions(-)
^ permalink raw reply [flat|nested] 44+ messages in thread
* [GIT PULL 02/15] arm-soc: general cleanups
@ 2012-07-23 20:33 ` Arnd Bergmann
0 siblings, 0 replies; 44+ messages in thread
From: Arnd Bergmann @ 2012-07-23 20:33 UTC (permalink / raw)
To: linux-arm-kernel
The following changes since commit bd0a521e88aa7a06ae7aabaed7ae196ed4ad867a:
Linux 3.5-rc6 (2012-07-07 17:23:56 -0700)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git next/cleanup
for you to fetch changes up to 1a33a4ebecce89163de27cba57ba84fd7aa16137:
Merge branch 'next/cleanup-samsung-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/cleanup (2012-07-17 22:53:38 +0200)
----------------------------------------------------------------
arm-soc: general cleanups
These are all boring changes, moving stuff around or renaming things
mostly, and also getting rid of stuff that is duplicate or should
not be there to start with. Platform-wise this is all over the place,
mainly omap, samsung, at91, imx and tegra.
----------------------------------------------------------------
Alexander Shiyan (3):
ARM: clps711x/p720t: Replace __initcall by .init_early call
ARM: clps711x: Removed superfluous transform virt_to_bus and related functions
ARM: clps711x: Remove the setting of the time
Arnd Bergmann (12):
Merge tag 'at91-for-next-cleanup' of git://github.com/at91linux/linux-at91 into next/cleanup
Merge tag 'omap-cleanup-for-v3.6' of git://git.kernel.org/.../tmlind/linux-omap into next/cleanup
ARM: at91: fix new build errors
Merge branch 'imx/cleanup-for-3.6' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/cleanup
Merge tag 'imx-cleanup' of git://git.pengutronix.de/git/imx/linux-2.6 into next/cleanup
Merge branch 'for-3.6/cleanup' of git://git.kernel.org/.../swarren/linux-tegra into next/cleanup
Merge branch 'for-3.6/fixes' of git://git.kernel.org/.../swarren/linux-tegra into next/cleanup
Merge branch 'next/cleanup-samsung' of git://git.kernel.org/.../kgene/linux-samsung into next/cleanup
Merge tag 'davinci-v3.6-cleanup' of git://gitorious.org/linux-davinci/linux-davinci into next/cleanup
Merge branch 'clps711x/cleanup' into next/cleanup
Merge branch 'next/cleanup-samsung-2' of git://git.kernel.org/.../kgene/linux-samsung into next/cleanup
Merge branch 'next/cleanup' into for-next
Bartlomiej Zolnierkiewicz (1):
ARM: EXYNOS: Remove leftovers of the Samsung specific power domain control
Beno?t Th?baudeau (2):
ARM: imx: cleanup otg_mode
ARM: imx: remove unused pdata from device macros
Boojin Kim (1):
ARM: EXYNOS: Remove the L2 cache latency setting for EXYNOS5
Fabio Estevam (1):
ARM: imx: Kconfig: Remove IMX_HAVE_PLATFORM_IMX_SSI from MACH_MX25_3DS
Jean-Christophe PLAGNIOL-VILLARD (1):
ARM: at91: aic add dt support for external irqs
Jonghwan Choi (1):
ARM: SAMSUNG: Remove unused variable 'running' on PWM
Kevin Hilman (7):
ARM: OMAP4: hwmod: rename _enable_module to _omap4_enable_module()
ARM: OMAP2+: hwmod: use init-time function ptrs for enable/disable module
ARM: OMAP4: hwmod: drop extra cpu_is check from _wait_target_disable()
ARM: OMAP2+: hwmod: use init-time function pointer for wait_target_ready
ARM: OMAP2+: hwmod: use init-time function pointer for hardreset
ARM: OMAP2+: hwmod: use init-time function pointer for _init_clkdm
ARM: OMAP2+: CLEANUP: Remove ARCH_OMAPx ifdef from struct dpll_data
Ludovic Desroches (8):
ARM: at91: fix at91_aic_write macro
ARM: at91: aic can use fast eoi handler type
ARM: at91: add of irq priorities support
ARM: at91: remove static irq priorities for sam9x5
ARM: at91: at91 based machines specify their own irq handler at run time
ARM: at91: sparse irq support
ARM: at91: remove mach/irqs.h
ARM: at91: add AIC5 support
Oleg Matcovschi (1):
ARM: OMAP: dma: Clear status registers on enable/disable irq
Omar Ramirez Luna (2):
ARM: OMAP2+: control: new APIs to configure boot address and mode
ARM: OMAP: dsp: interface to control module functions
Paul Bolle (4):
ARM: davinci: remove dummy header files
ARM: S3C24XX: remove unused header <mach/bast-pmu.h>
ARM: SAMSUNG: remove unused SPI clock headers
ARM: at91: remove two unused headers
Paul Walmsley (2):
ARM: OMAP2+: hwmod: remove prm_clkdm, cm_clkdm; allow hwmods to have no clockdomain
Merge branches 'clock_cleanup_misc_3.6', 'control_clean_dspbridge_writes_cleanup_3.6', 'hwmod_soc_conditional_cleanup_3.6', 'mcbsp_clock_aliases_cleanup_3.6' and 'remove_clkdm_requirement_from_hwmod_3.6' into omap_cleanup_a_3.6
Peter Ujfalusi (3):
ARM: OMAP2: Move McBSP fck clock alias to hwmod data for OMAP2420
ARM: OMAP2: Move McBSP fck clock alias to hwmod data for OMAP2430
ARM: OMAP3: Move McBSP fck clock alias to hwmod data
Prashant Gaikwad (1):
ARM: tegra: Remove flow controller programming
Roland Stigge (1):
ARM: tegra: Fix dts files w/ status property: "disable" -> "disabled"
Sachin Kamat (4):
ARM: S5P64X0: Remove unused variable in dma.c file
ARM: S5PC100: Remove unused variable in dma.c file
ARM: SAMSUNG: Remove description corresponding to a deleted element
ARM: S3C24XX: Remove duplicate header file inclusion
Shawn Guo (1):
ARM: imx6q: remove unneeded clkdev lookups
Stephen Warren (5):
dt: name all Tegra binding docs consistently
mmc: tegra: use bus-width property instead of support-8bit
ARM: dt: tegra: remove legacy support-8bit property
ASoC: tegra: simplify Kconfig dependencies
ARM: dt: tegra: rename board files to match SoC
Sylwester Nawrocki (8):
ARM: S3C24XX: Free the backlight gpio requested in Mini2440 board code
ARM: S3C24XX: Convert SMDK board file to the gpiolib API
ARM: S3C24XX: Convert QT2410 board file to the gpiolib API
ARM: S3C24XX: Convert the PM code to gpiolib API
ARM: S3C24XX: Convert the touchscreen setup code to common GPIO API
ARM: S3C24XX: Remove unused GPA, GPE, GPH bank GPIO aliases
ARM: S3C24XX: Remove unused GPIO definitions for port J
ARM: S3C24XX: Remove unused GPIO definitions for Openmoko GTA02 board
Tony Lindgren (6):
ARM: OMAP3: There is no FS USB controller on omap3
ARM: OMAP2: Remove legacy USB FS support
ARM: OMAP: Make FS USB omap1 only
Merge tag 'omap-cleanup-a-for-3.6' of git://git.kernel.org/.../pjw/omap-pending into cleanup-hwmod
Merge branches 'cleanup-udc' and 'cleanup-dma' into cleanup
Merge branch 'cleanup-hwmod' into cleanup
Uwe Kleine-K?nig (1):
ARM: imx27/dt: make dt_compat entry const
Wolfram Sang (1):
ARM: tegra: build powergate unconditionally
hdoyu at nvidia.com (5):
amba: tegra-ahb: Remove empty *_remove()
ARM: dt: tegra{20,30}.dtsi: Rename "mc" to "memory-controller"
ARM: tegra{20,30}: Rename "mc" to "memory-controller"
ARM: dt: tegra20: Rename "emc" to "memory-controller"
ARM: tegra20: Rename "emc" to "memory-controller"
.../devicetree/bindings/arm/atmel-aic.txt | 9 +-
.../arm/tegra/{emc.txt => nvidia,tegra20-emc.txt} | 2 +-
.../bindings/arm/tegra/nvidia,tegra20-mc.txt | 2 +-
.../bindings/arm/tegra/nvidia,tegra30-mc.txt | 2 +-
.../{gpio_nvidia.txt => nvidia,tegra20-gpio.txt} | 0
.../{tegra-kbc.txt => nvidia,tegra20-kbc.txt} | 0
.../{nvidia-sdhci.txt => nvidia,tegra20-sdhci.txt} | 0
.../nvec/{nvec_nvidia.txt => nvidia,nvec.txt} | 0
...-alc5632.txt => nvidia,tegra-audio-alc5632.txt} | 0
...mslice.txt => nvidia,tegra-audio-trimslice.txt} | 0
...io-wm8753.txt => nvidia,tegra-audio-wm8753.txt} | 0
...io-wm8903.txt => nvidia,tegra-audio-wm8903.txt} | 0
.../{tegra20-das.txt => nvidia,tegra20-das.txt} | 0
.../{tegra20-i2s.txt => nvidia,tegra20-i2s.txt} | 0
.../spi/{spi_nvidia.txt => nvidia,tegra20-spi.txt} | 0
.../usb/{tegra-usb.txt => nvidia,tegra20-ehci.txt} | 0
arch/arm/boot/dts/at91sam9260.dtsi | 37 +-
arch/arm/boot/dts/at91sam9263.dtsi | 31 +-
arch/arm/boot/dts/at91sam9g45.dtsi | 39 +-
arch/arm/boot/dts/at91sam9n12.dtsi | 30 +-
arch/arm/boot/dts/at91sam9x5.dtsi | 39 +-
.../dts/{tegra-harmony.dts => tegra20-harmony.dts} | 1 -
.../dts/{tegra-paz00.dts => tegra20-paz00.dts} | 1 -
.../{tegra-seaboard.dts => tegra20-seaboard.dts} | 3 +-
.../{tegra-trimslice.dts => tegra20-trimslice.dts} | 0
.../dts/{tegra-ventana.dts => tegra20-ventana.dts} | 1 -
arch/arm/boot/dts/tegra20.dtsi | 40 +-
.../dts/{tegra-cardhu.dts => tegra30-cardhu.dts} | 1 -
arch/arm/boot/dts/tegra30.dtsi | 40 +-
arch/arm/kernel/irq.c | 10 -
arch/arm/mach-at91/Kconfig | 6 +
arch/arm/mach-at91/at91rm9200.c | 1 +
arch/arm/mach-at91/at91rm9200_devices.c | 84 ++--
arch/arm/mach-at91/at91sam9260.c | 1 +
arch/arm/mach-at91/at91sam9260_devices.c | 92 ++---
arch/arm/mach-at91/at91sam9261.c | 1 +
arch/arm/mach-at91/at91sam9261_devices.c | 68 ++--
arch/arm/mach-at91/at91sam9263.c | 1 +
arch/arm/mach-at91/at91sam9263_devices.c | 80 ++--
arch/arm/mach-at91/at91sam926x_time.c | 2 +-
arch/arm/mach-at91/at91sam9g45.c | 1 +
arch/arm/mach-at91/at91sam9g45_devices.c | 108 ++---
arch/arm/mach-at91/at91sam9rl.c | 1 +
arch/arm/mach-at91/at91sam9rl_devices.c | 76 ++--
arch/arm/mach-at91/at91sam9x5.c | 40 --
arch/arm/mach-at91/at91x40.c | 2 +
arch/arm/mach-at91/board-1arm.c | 2 +
arch/arm/mach-at91/board-afeb-9260v1.c | 2 +
arch/arm/mach-at91/board-cam60.c | 2 +
arch/arm/mach-at91/board-carmeva.c | 2 +
arch/arm/mach-at91/board-cpu9krea.c | 2 +
arch/arm/mach-at91/board-cpuat91.c | 2 +
arch/arm/mach-at91/board-csb337.c | 2 +
arch/arm/mach-at91/board-csb637.c | 2 +
arch/arm/mach-at91/board-dt.c | 2 +
arch/arm/mach-at91/board-eb01.c | 2 +
arch/arm/mach-at91/board-eb9200.c | 2 +
arch/arm/mach-at91/board-ecbat91.c | 2 +
arch/arm/mach-at91/board-eco920.c | 2 +
arch/arm/mach-at91/board-flexibity.c | 2 +
arch/arm/mach-at91/board-foxg20.c | 2 +
arch/arm/mach-at91/board-gsia18s.c | 2 +
arch/arm/mach-at91/board-kafa.c | 2 +
arch/arm/mach-at91/board-kb9202.c | 2 +
arch/arm/mach-at91/board-neocore926.c | 2 +
arch/arm/mach-at91/board-pcontrol-g20.c | 2 +
arch/arm/mach-at91/board-picotux200.c | 2 +
arch/arm/mach-at91/board-qil-a9260.c | 2 +
arch/arm/mach-at91/board-rm9200dk.c | 2 +
arch/arm/mach-at91/board-rm9200ek.c | 2 +
arch/arm/mach-at91/board-rsi-ews.c | 2 +
arch/arm/mach-at91/board-sam9-l9260.c | 2 +
arch/arm/mach-at91/board-sam9260ek.c | 2 +
arch/arm/mach-at91/board-sam9261ek.c | 2 +
arch/arm/mach-at91/board-sam9263ek.c | 2 +
arch/arm/mach-at91/board-sam9g20ek.c | 3 +
arch/arm/mach-at91/board-sam9m10g45ek.c | 2 +
arch/arm/mach-at91/board-sam9rlek.c | 2 +
arch/arm/mach-at91/board-snapper9260.c | 2 +
arch/arm/mach-at91/board-stamp9g20.c | 3 +
arch/arm/mach-at91/board-usb-a926x.c | 4 +
arch/arm/mach-at91/board-yl-9200.c | 2 +
arch/arm/mach-at91/generic.h | 2 +
arch/arm/mach-at91/gpio.c | 9 +-
arch/arm/mach-at91/include/mach/at91_aic.h | 36 +-
arch/arm/mach-at91/include/mach/at91_spi.h | 81 ----
arch/arm/mach-at91/include/mach/at91_ssc.h | 106 -----
arch/arm/mach-at91/include/mach/entry-macro.S | 27 --
arch/arm/mach-at91/include/mach/irqs.h | 48 ---
arch/arm/mach-at91/irq.c | 414 ++++++++++++++++---
arch/arm/mach-at91/pm.c | 1 +
arch/arm/mach-clps711x/common.c | 6 -
arch/arm/mach-clps711x/include/mach/memory.h | 37 --
arch/arm/mach-clps711x/p720t.c | 34 +-
arch/arm/mach-davinci/include/mach/dm365.h | 1 -
arch/arm/mach-davinci/include/mach/dm646x.h | 1 -
arch/arm/mach-exynos/common.c | 25 --
arch/arm/mach-exynos/include/mach/spi-clocks.h | 16 -
arch/arm/mach-exynos/mach-nuri.c | 1 -
arch/arm/mach-exynos/mach-origen.c | 1 -
arch/arm/mach-exynos/mach-smdkv310.c | 1 -
arch/arm/mach-exynos/mach-universal_c210.c | 1 -
arch/arm/mach-imx/Kconfig | 1 -
arch/arm/mach-imx/clk-imx6q.c | 3 -
arch/arm/mach-imx/devices-imx21.h | 4 +-
arch/arm/mach-imx/devices-imx25.h | 4 +-
arch/arm/mach-imx/devices-imx27.h | 6 +-
arch/arm/mach-imx/devices-imx31.h | 6 +-
arch/arm/mach-imx/devices-imx35.h | 4 +-
arch/arm/mach-imx/devices-imx51.h | 2 +-
arch/arm/mach-imx/devices-imx53.h | 2 +-
arch/arm/mach-imx/imx27-dt.c | 2 +-
arch/arm/mach-imx/mach-cpuimx27.c | 12 +-
arch/arm/mach-imx/mach-cpuimx35.c | 10 +-
arch/arm/mach-imx/mach-cpuimx51sd.c | 10 +-
arch/arm/mach-imx/mach-eukrea_cpuimx25.c | 12 +-
arch/arm/mach-imx/mach-imx27ipcam.c | 2 +-
arch/arm/mach-imx/mach-mx25_3ds.c | 4 +-
arch/arm/mach-imx/mach-mx27_3ds.c | 10 +-
arch/arm/mach-imx/mach-mx27ads.c | 2 +-
arch/arm/mach-imx/mach-mx31_3ds.c | 10 +-
arch/arm/mach-imx/mach-mx31moboard.c | 2 +-
arch/arm/mach-imx/mach-mx35_3ds.c | 10 +-
arch/arm/mach-imx/mach-mx51_3ds.c | 2 +-
arch/arm/mach-imx/mach-mx51_babbage.c | 10 +-
arch/arm/mach-imx/mach-mx53_ard.c | 2 +-
arch/arm/mach-imx/mach-mx53_evk.c | 2 +-
arch/arm/mach-imx/mach-mx53_loco.c | 2 +-
arch/arm/mach-imx/mach-mx53_smd.c | 2 +-
arch/arm/mach-imx/mach-pca100.c | 12 +-
arch/arm/mach-imx/mach-pcm037.c | 12 +-
arch/arm/mach-imx/mach-pcm038.c | 4 +-
arch/arm/mach-imx/mach-pcm043.c | 10 +-
arch/arm/mach-imx/mach-qong.c | 2 +-
arch/arm/mach-imx/mach-vpr200.c | 2 +-
arch/arm/mach-imx/mx31lite-db.c | 4 +-
arch/arm/mach-omap1/board-ams-delta.c | 2 +-
arch/arm/mach-omap1/board-generic.c | 4 +-
arch/arm/mach-omap1/board-h2.c | 2 +-
arch/arm/mach-omap1/board-h3.c | 2 +-
arch/arm/mach-omap1/board-htcherald.c | 2 +-
arch/arm/mach-omap1/board-innovator.c | 2 +-
arch/arm/mach-omap1/board-nokia770.c | 2 +-
arch/arm/mach-omap1/board-osk.c | 2 +-
arch/arm/mach-omap1/board-palmte.c | 2 +-
arch/arm/mach-omap1/board-palmtt.c | 2 +-
arch/arm/mach-omap1/board-palmz71.c | 2 +-
arch/arm/mach-omap1/board-sx1.c | 2 +-
arch/arm/mach-omap1/board-voiceblue.c | 3 +-
arch/arm/mach-omap1/clock_data.c | 3 +-
arch/arm/mach-omap1/include/mach/usb.h | 165 ++++++++
arch/arm/mach-omap1/usb.c | 116 +++++-
arch/arm/mach-omap2/Kconfig | 3 -
arch/arm/mach-omap2/Makefile | 4 -
arch/arm/mach-omap2/board-2430sdp.c | 11 -
arch/arm/mach-omap2/board-apollon.c | 18 -
arch/arm/mach-omap2/board-h4.c | 13 -
arch/arm/mach-omap2/clock2420_data.c | 4 -
arch/arm/mach-omap2/clock2430_data.c | 10 -
arch/arm/mach-omap2/clock3xxx_data.c | 10 -
arch/arm/mach-omap2/clockdomain.h | 2 -
arch/arm/mach-omap2/clockdomains2420_data.c | 2 -
arch/arm/mach-omap2/clockdomains2430_data.c | 2 -
arch/arm/mach-omap2/clockdomains3xxx_data.c | 3 +-
arch/arm/mach-omap2/clockdomains44xx_data.c | 2 -
arch/arm/mach-omap2/clockdomains_common_data.c | 24 --
arch/arm/mach-omap2/control.c | 43 ++
arch/arm/mach-omap2/control.h | 2 +
arch/arm/mach-omap2/dsp.c | 4 +
.../include/mach/ctrl_module_core_44xx.h | 1 +
arch/arm/mach-omap2/omap_hwmod.c | 427 ++++++++++++++------
arch/arm/mach-omap2/omap_hwmod_2420_data.c | 10 +
arch/arm/mach-omap2/omap_hwmod_2430_data.c | 16 +
arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 23 ++
arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 4 +-
arch/arm/mach-omap2/usb-fs.c | 359 ----------------
arch/arm/mach-s3c24xx/common-smdk.c | 20 +-
arch/arm/mach-s3c24xx/common.c | 1 -
arch/arm/mach-s3c24xx/include/mach/bast-pmu.h | 40 --
arch/arm/mach-s3c24xx/include/mach/gpio-nrs.h | 21 -
arch/arm/mach-s3c24xx/include/mach/gta02.h | 69 ----
arch/arm/mach-s3c24xx/include/mach/regs-gpio.h | 17 +-
arch/arm/mach-s3c24xx/include/mach/regs-gpioj.h | 70 ----
arch/arm/mach-s3c24xx/mach-gta02.c | 1 -
arch/arm/mach-s3c24xx/mach-mini2440.c | 4 +-
arch/arm/mach-s3c24xx/mach-qt2410.c | 6 +-
arch/arm/mach-s3c24xx/mach-rx1950.c | 1 -
arch/arm/mach-s3c24xx/pm-s3c2410.c | 12 +-
arch/arm/mach-s3c24xx/pm-s3c2412.c | 1 -
arch/arm/mach-s3c24xx/s3c2412.c | 1 -
arch/arm/mach-s3c24xx/s3c244x.c | 1 -
arch/arm/mach-s3c24xx/setup-ts.c | 6 +-
arch/arm/mach-s3c64xx/include/mach/spi-clocks.h | 18 -
arch/arm/mach-s5p64x0/dma.c | 2 -
arch/arm/mach-s5p64x0/include/mach/spi-clocks.h | 20 -
arch/arm/mach-s5pc100/dma.c | 2 -
arch/arm/mach-s5pc100/include/mach/spi-clocks.h | 18 -
arch/arm/mach-s5pv210/include/mach/spi-clocks.h | 17 -
arch/arm/mach-tegra/Kconfig | 3 -
arch/arm/mach-tegra/Makefile | 2 +-
arch/arm/mach-tegra/Makefile.boot | 12 +-
arch/arm/mach-tegra/cpuidle.c | 6 +-
arch/arm/mach-tegra/sleep.S | 29 --
arch/arm/plat-omap/Makefile | 2 +-
arch/arm/plat-omap/dma.c | 59 ++-
arch/arm/plat-omap/include/plat/board.h | 38 --
arch/arm/plat-omap/include/plat/clock.h | 2 -
arch/arm/plat-omap/include/plat/dsp.h | 3 +
arch/arm/plat-omap/include/plat/omap_hwmod.h | 2 +
arch/arm/plat-omap/include/plat/usb.h | 196 +--------
arch/arm/plat-omap/usb.c | 145 -------
arch/arm/plat-samsung/Kconfig | 8 -
arch/arm/plat-samsung/Makefile | 4 -
arch/arm/plat-samsung/include/plat/devs.h | 1 -
arch/arm/plat-samsung/include/plat/fb.h | 1 -
arch/arm/plat-samsung/include/plat/pd.h | 30 --
arch/arm/plat-samsung/pd.c | 95 -----
arch/arm/plat-samsung/pwm.c | 4 -
drivers/amba/tegra-ahb.c | 6 -
drivers/mmc/host/sdhci-tegra.c | 5 +-
drivers/rtc/rtc-at91rm9200.c | 1 +
drivers/usb/gadget/Kconfig | 2 +-
drivers/usb/gadget/omap_udc.c | 3 +-
drivers/usb/host/Kconfig | 2 +-
drivers/usb/host/ohci-omap.c | 7 +-
drivers/usb/otg/isp1301_omap.c | 2 +-
sound/soc/tegra/Kconfig | 10 +-
227 files changed, 1794 insertions(+), 2504 deletions(-)
^ permalink raw reply [flat|nested] 44+ messages in thread
* Re: [GIT PULL 00/15] arm-soc: changes for v3.6
2012-07-23 20:32 ` Arnd Bergmann
@ 2012-07-24 1:03 ` Linus Torvalds
-1 siblings, 0 replies; 44+ messages in thread
From: Linus Torvalds @ 2012-07-24 1:03 UTC (permalink / raw)
To: Arnd Bergmann; +Cc: linux-kernel, linux-arm-kernel, arm
On Mon, Jul 23, 2012 at 1:32 PM, Arnd Bergmann <arnd@arndb.de> wrote:
>
> There are about 600 changesets in here, and a bunch of simple
> conflicts between the 15 branches, but so far no conflicts with
> stuff that you have merged already. For reference, you can check
> the "for-linus" branch in the same tree to see how we resolved
> the conflicts.
Ok, so I've merged some things a bit differently, but afaik it's all
semantically identical *except* for the merge of the file
arch/arm/mach-omap2/clockdomains3xxx_data.c
in my merge of your "general arm-soc cleanups" pull request.
In your "for-linus" branch, "&mpu_3xxx_clkdm" remains in the
clockdomains_common[] array. In my merge, it is gone. But I think I
did the merge correctly, and you did it wrong. HOWEVER, I don't know
the code, maybe there is some subtle reason why you did it like you
did.
Your "for-linus" branch also had that
arch/arm/arm-soc-for-next-contents.txt
file that shouldn't have been there, but whatever.
Anyway, apart from that "please check" comment, I also have small
complaint: your pull requests didn't actually point to the tags, they
pointed to the next/xyz commits. So every time I did a pull, I had to
change "next/xyz" to "tags/xyz". That's just annoying make-work. I
think it's because you just said "xyz" to the git request-pull script,
and then git had to pick one of the things and picked next. Please
disambiguate by just saying "tags/xyz" explicitly.
Linus
^ permalink raw reply [flat|nested] 44+ messages in thread
* [GIT PULL 00/15] arm-soc: changes for v3.6
@ 2012-07-24 1:03 ` Linus Torvalds
0 siblings, 0 replies; 44+ messages in thread
From: Linus Torvalds @ 2012-07-24 1:03 UTC (permalink / raw)
To: linux-arm-kernel
On Mon, Jul 23, 2012 at 1:32 PM, Arnd Bergmann <arnd@arndb.de> wrote:
>
> There are about 600 changesets in here, and a bunch of simple
> conflicts between the 15 branches, but so far no conflicts with
> stuff that you have merged already. For reference, you can check
> the "for-linus" branch in the same tree to see how we resolved
> the conflicts.
Ok, so I've merged some things a bit differently, but afaik it's all
semantically identical *except* for the merge of the file
arch/arm/mach-omap2/clockdomains3xxx_data.c
in my merge of your "general arm-soc cleanups" pull request.
In your "for-linus" branch, "&mpu_3xxx_clkdm" remains in the
clockdomains_common[] array. In my merge, it is gone. But I think I
did the merge correctly, and you did it wrong. HOWEVER, I don't know
the code, maybe there is some subtle reason why you did it like you
did.
Your "for-linus" branch also had that
arch/arm/arm-soc-for-next-contents.txt
file that shouldn't have been there, but whatever.
Anyway, apart from that "please check" comment, I also have small
complaint: your pull requests didn't actually point to the tags, they
pointed to the next/xyz commits. So every time I did a pull, I had to
change "next/xyz" to "tags/xyz". That's just annoying make-work. I
think it's because you just said "xyz" to the git request-pull script,
and then git had to pick one of the things and picked next. Please
disambiguate by just saying "tags/xyz" explicitly.
Linus
^ permalink raw reply [flat|nested] 44+ messages in thread
* Re: [GIT PULL 00/15] arm-soc: changes for v3.6
2012-07-24 1:03 ` Linus Torvalds
@ 2012-07-24 7:51 ` Arnd Bergmann
-1 siblings, 0 replies; 44+ messages in thread
From: Arnd Bergmann @ 2012-07-24 7:51 UTC (permalink / raw)
To: Linus Torvalds
Cc: linux-kernel, linux-arm-kernel, arm, Mark A. Greer, Paul Walmsley
On Tuesday 24 July 2012, Linus Torvalds wrote:
> In your "for-linus" branch, "&mpu_3xxx_clkdm" remains in the
> clockdomains_common[] array. In my merge, it is gone. But I think I
> did the merge correctly, and you did it wrong. HOWEVER, I don't know
> the code, maybe there is some subtle reason why you did it like you
> did.
Yes, I think you are right now that I look at it again. Paul Walmsley
can have another look at the merge and send an update if we are both
missing something now.
> Your "for-linus" branch also had that
>
> arch/arm/arm-soc-for-next-contents.txt
>
> file that shouldn't have been there, but whatever.
That's the file I use for communication with Olof about stuff we
merge. I briefly considered rebuilding a branch for your reference
without it, but since you always do the merges yourself I figured there
would be no need.
We do leave this file in the for-next branch because it helps some
people sending us patches to see what the existing branches and
interdependencies are.
> Anyway, apart from that "please check" comment, I also have small
> complaint: your pull requests didn't actually point to the tags, they
> pointed to the next/xyz commits. So every time I did a pull, I had to
> change "next/xyz" to "tags/xyz". That's just annoying make-work. I
> think it's because you just said "xyz" to the git request-pull script,
> and then git had to pick one of the things and picked next. Please
> disambiguate by just saying "tags/xyz" explicitly.
I spent too much time fiddling with my scripts again in an attempt to
get closer to the regular git-request-pull version. The older version
got this right, but unfortunately I removed the part where I manually
print the right pull address because that had caused other problems
before.
I did the trivial fix you suggested now.
Arnd
^ permalink raw reply [flat|nested] 44+ messages in thread
* [GIT PULL 00/15] arm-soc: changes for v3.6
@ 2012-07-24 7:51 ` Arnd Bergmann
0 siblings, 0 replies; 44+ messages in thread
From: Arnd Bergmann @ 2012-07-24 7:51 UTC (permalink / raw)
To: linux-arm-kernel
On Tuesday 24 July 2012, Linus Torvalds wrote:
> In your "for-linus" branch, "&mpu_3xxx_clkdm" remains in the
> clockdomains_common[] array. In my merge, it is gone. But I think I
> did the merge correctly, and you did it wrong. HOWEVER, I don't know
> the code, maybe there is some subtle reason why you did it like you
> did.
Yes, I think you are right now that I look at it again. Paul Walmsley
can have another look at the merge and send an update if we are both
missing something now.
> Your "for-linus" branch also had that
>
> arch/arm/arm-soc-for-next-contents.txt
>
> file that shouldn't have been there, but whatever.
That's the file I use for communication with Olof about stuff we
merge. I briefly considered rebuilding a branch for your reference
without it, but since you always do the merges yourself I figured there
would be no need.
We do leave this file in the for-next branch because it helps some
people sending us patches to see what the existing branches and
interdependencies are.
> Anyway, apart from that "please check" comment, I also have small
> complaint: your pull requests didn't actually point to the tags, they
> pointed to the next/xyz commits. So every time I did a pull, I had to
> change "next/xyz" to "tags/xyz". That's just annoying make-work. I
> think it's because you just said "xyz" to the git request-pull script,
> and then git had to pick one of the things and picked next. Please
> disambiguate by just saying "tags/xyz" explicitly.
I spent too much time fiddling with my scripts again in an attempt to
get closer to the regular git-request-pull version. The older version
got this right, but unfortunately I removed the part where I manually
print the right pull address because that had caused other problems
before.
I did the trivial fix you suggested now.
Arnd
^ permalink raw reply [flat|nested] 44+ messages in thread
* Re: [GIT PULL 00/15] arm-soc: changes for v3.6
2012-07-24 7:51 ` Arnd Bergmann
@ 2012-07-24 8:12 ` Tony Lindgren
-1 siblings, 0 replies; 44+ messages in thread
From: Tony Lindgren @ 2012-07-24 8:12 UTC (permalink / raw)
To: Arnd Bergmann
Cc: Linus Torvalds, linux-kernel, linux-arm-kernel, arm,
Mark A. Greer, Paul Walmsley
* Arnd Bergmann <arnd@arndb.de> [120724 00:57]:
> On Tuesday 24 July 2012, Linus Torvalds wrote:
>
> > In your "for-linus" branch, "&mpu_3xxx_clkdm" remains in the
> > clockdomains_common[] array. In my merge, it is gone. But I think I
> > did the merge correctly, and you did it wrong. HOWEVER, I don't know
> > the code, maybe there is some subtle reason why you did it like you
> > did.
>
> Yes, I think you are right now that I look at it again. Paul Walmsley
> can have another look at the merge and send an update if we are both
> missing something now.
Yes thanks looks good. We've had the mismerge there from my earlier
merge as noted by Paul. Looks like clockdomain.[ch] parts need some
patching.
> > Anyway, apart from that "please check" comment, I also have small
> > complaint: your pull requests didn't actually point to the tags, they
> > pointed to the next/xyz commits. So every time I did a pull, I had to
> > change "next/xyz" to "tags/xyz". That's just annoying make-work. I
> > think it's because you just said "xyz" to the git request-pull script,
> > and then git had to pick one of the things and picked next. Please
> > disambiguate by just saying "tags/xyz" explicitly.
>
> I spent too much time fiddling with my scripts again in an attempt to
> get closer to the regular git-request-pull version. The older version
> got this right, but unfortunately I removed the part where I manually
> print the right pull address because that had caused other problems
> before.
FYI, this issue happens also with git request-pull if the tag has not
yet gotten mirrored but the branch is already mirrored.
Regards,
Tony
^ permalink raw reply [flat|nested] 44+ messages in thread
* [GIT PULL 00/15] arm-soc: changes for v3.6
@ 2012-07-24 8:12 ` Tony Lindgren
0 siblings, 0 replies; 44+ messages in thread
From: Tony Lindgren @ 2012-07-24 8:12 UTC (permalink / raw)
To: linux-arm-kernel
* Arnd Bergmann <arnd@arndb.de> [120724 00:57]:
> On Tuesday 24 July 2012, Linus Torvalds wrote:
>
> > In your "for-linus" branch, "&mpu_3xxx_clkdm" remains in the
> > clockdomains_common[] array. In my merge, it is gone. But I think I
> > did the merge correctly, and you did it wrong. HOWEVER, I don't know
> > the code, maybe there is some subtle reason why you did it like you
> > did.
>
> Yes, I think you are right now that I look at it again. Paul Walmsley
> can have another look at the merge and send an update if we are both
> missing something now.
Yes thanks looks good. We've had the mismerge there from my earlier
merge as noted by Paul. Looks like clockdomain.[ch] parts need some
patching.
> > Anyway, apart from that "please check" comment, I also have small
> > complaint: your pull requests didn't actually point to the tags, they
> > pointed to the next/xyz commits. So every time I did a pull, I had to
> > change "next/xyz" to "tags/xyz". That's just annoying make-work. I
> > think it's because you just said "xyz" to the git request-pull script,
> > and then git had to pick one of the things and picked next. Please
> > disambiguate by just saying "tags/xyz" explicitly.
>
> I spent too much time fiddling with my scripts again in an attempt to
> get closer to the regular git-request-pull version. The older version
> got this right, but unfortunately I removed the part where I manually
> print the right pull address because that had caused other problems
> before.
FYI, this issue happens also with git request-pull if the tag has not
yet gotten mirrored but the branch is already mirrored.
Regards,
Tony
^ permalink raw reply [flat|nested] 44+ messages in thread
* Re: [GIT PULL 00/15] arm-soc: changes for v3.6
2012-07-24 8:12 ` Tony Lindgren
@ 2012-07-24 12:00 ` Arnd Bergmann
-1 siblings, 0 replies; 44+ messages in thread
From: Arnd Bergmann @ 2012-07-24 12:00 UTC (permalink / raw)
To: linux-arm-kernel
Cc: Tony Lindgren, Paul Walmsley, linux-kernel, Mark A. Greer, arm,
Linus Torvalds
On Tuesday 24 July 2012, Tony Lindgren wrote:
> > I spent too much time fiddling with my scripts again in an attempt to
> > get closer to the regular git-request-pull version. The older version
> > got this right, but unfortunately I removed the part where I manually
> > print the right pull address because that had caused other problems
> > before.
>
> FYI, this issue happens also with git request-pull if the tag has not
> yet gotten mirrored but the branch is already mirrored.
In this case it they were both there, but it picked up the branch
anyway. I actually made sure that the tag description was included
by git-request-pull, and the tag has a different name from the
branch (no "next/" prefix), but the tool is not does not attempt
to pick up the tag rather than the branch when both are available.
Apparently, the problem is that it treats the branch "next/foo"
as as exact match for a pull request on the "foo" tag even when
that tag is present as "foo" on the server. If I either name the
branch or the tag differently, or pass "tags/foo" as the
argument to git-request-pull, it reports back the tag instead.
Arnd
^ permalink raw reply [flat|nested] 44+ messages in thread
* [GIT PULL 00/15] arm-soc: changes for v3.6
@ 2012-07-24 12:00 ` Arnd Bergmann
0 siblings, 0 replies; 44+ messages in thread
From: Arnd Bergmann @ 2012-07-24 12:00 UTC (permalink / raw)
To: linux-arm-kernel
On Tuesday 24 July 2012, Tony Lindgren wrote:
> > I spent too much time fiddling with my scripts again in an attempt to
> > get closer to the regular git-request-pull version. The older version
> > got this right, but unfortunately I removed the part where I manually
> > print the right pull address because that had caused other problems
> > before.
>
> FYI, this issue happens also with git request-pull if the tag has not
> yet gotten mirrored but the branch is already mirrored.
In this case it they were both there, but it picked up the branch
anyway. I actually made sure that the tag description was included
by git-request-pull, and the tag has a different name from the
branch (no "next/" prefix), but the tool is not does not attempt
to pick up the tag rather than the branch when both are available.
Apparently, the problem is that it treats the branch "next/foo"
as as exact match for a pull request on the "foo" tag even when
that tag is present as "foo" on the server. If I either name the
branch or the tag differently, or pass "tags/foo" as the
argument to git-request-pull, it reports back the tag instead.
Arnd
^ permalink raw reply [flat|nested] 44+ messages in thread
* Re: [GIT PULL 00/15] arm-soc: changes for v3.6
2012-07-24 7:51 ` Arnd Bergmann
@ 2012-07-24 20:51 ` Paul Walmsley
-1 siblings, 0 replies; 44+ messages in thread
From: Paul Walmsley @ 2012-07-24 20:51 UTC (permalink / raw)
To: Arnd Bergmann
Cc: Linus Torvalds, linux-kernel, linux-arm-kernel, arm, Mark A. Greer
Hi
On Tue, 24 Jul 2012, Arnd Bergmann wrote:
> On Tuesday 24 July 2012, Linus Torvalds wrote:
>
> > In your "for-linus" branch, "&mpu_3xxx_clkdm" remains in the
> > clockdomains_common[] array. In my merge, it is gone. But I think I
> > did the merge correctly, and you did it wrong. HOWEVER, I don't know
> > the code, maybe there is some subtle reason why you did it like you
> > did.
>
> Yes, I think you are right now that I look at it again. Paul Walmsley
> can have another look at the merge and send an update if we are both
> missing something now.
Linus' merge is correct.
thanks for asking,
- Paul
^ permalink raw reply [flat|nested] 44+ messages in thread
* [GIT PULL 00/15] arm-soc: changes for v3.6
@ 2012-07-24 20:51 ` Paul Walmsley
0 siblings, 0 replies; 44+ messages in thread
From: Paul Walmsley @ 2012-07-24 20:51 UTC (permalink / raw)
To: linux-arm-kernel
Hi
On Tue, 24 Jul 2012, Arnd Bergmann wrote:
> On Tuesday 24 July 2012, Linus Torvalds wrote:
>
> > In your "for-linus" branch, "&mpu_3xxx_clkdm" remains in the
> > clockdomains_common[] array. In my merge, it is gone. But I think I
> > did the merge correctly, and you did it wrong. HOWEVER, I don't know
> > the code, maybe there is some subtle reason why you did it like you
> > did.
>
> Yes, I think you are right now that I look at it again. Paul Walmsley
> can have another look at the merge and send an update if we are both
> missing something now.
Linus' merge is correct.
thanks for asking,
- Paul
^ permalink raw reply [flat|nested] 44+ messages in thread
* Re: [GIT PULL 00/15] arm-soc: changes for v3.6
2012-07-24 20:51 ` Paul Walmsley
@ 2012-07-26 23:10 ` Mark A. Greer
-1 siblings, 0 replies; 44+ messages in thread
From: Mark A. Greer @ 2012-07-26 23:10 UTC (permalink / raw)
To: Paul Walmsley
Cc: Arnd Bergmann, Linus Torvalds, linux-kernel, linux-arm-kernel, arm
On Tue, Jul 24, 2012 at 02:51:35PM -0600, Paul Walmsley wrote:
> Hi
>
> On Tue, 24 Jul 2012, Arnd Bergmann wrote:
>
> > On Tuesday 24 July 2012, Linus Torvalds wrote:
> >
> > > In your "for-linus" branch, "&mpu_3xxx_clkdm" remains in the
> > > clockdomains_common[] array. In my merge, it is gone. But I think I
> > > did the merge correctly, and you did it wrong. HOWEVER, I don't know
> > > the code, maybe there is some subtle reason why you did it like you
> > > did.
> >
> > Yes, I think you are right now that I look at it again. Paul Walmsley
> > can have another look at the merge and send an update if we are both
> > missing something now.
>
> Linus' merge is correct.
FWIW, it looks right to me too.
Thanks,
Mark
^ permalink raw reply [flat|nested] 44+ messages in thread
* [GIT PULL 00/15] arm-soc: changes for v3.6
@ 2012-07-26 23:10 ` Mark A. Greer
0 siblings, 0 replies; 44+ messages in thread
From: Mark A. Greer @ 2012-07-26 23:10 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, Jul 24, 2012 at 02:51:35PM -0600, Paul Walmsley wrote:
> Hi
>
> On Tue, 24 Jul 2012, Arnd Bergmann wrote:
>
> > On Tuesday 24 July 2012, Linus Torvalds wrote:
> >
> > > In your "for-linus" branch, "&mpu_3xxx_clkdm" remains in the
> > > clockdomains_common[] array. In my merge, it is gone. But I think I
> > > did the merge correctly, and you did it wrong. HOWEVER, I don't know
> > > the code, maybe there is some subtle reason why you did it like you
> > > did.
> >
> > Yes, I think you are right now that I look at it again. Paul Walmsley
> > can have another look at the merge and send an update if we are both
> > missing something now.
>
> Linus' merge is correct.
FWIW, it looks right to me too.
Thanks,
Mark
^ permalink raw reply [flat|nested] 44+ messages in thread
end of thread, other threads:[~2012-07-26 23:10 UTC | newest]
Thread overview: 44+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-07-23 20:32 [GIT PULL 00/15] arm-soc: changes for v3.6 Arnd Bergmann
2012-07-23 20:32 ` Arnd Bergmann
2012-07-23 20:32 ` [GIT PULL 01/15] arm-soc: non-critical bug fixes Arnd Bergmann
2012-07-23 20:33 ` Arnd Bergmann
2012-07-23 20:32 ` [GIT PULL 02/15] arm-soc: general cleanups Arnd Bergmann
2012-07-23 20:33 ` Arnd Bergmann
2012-07-23 20:32 ` [GIT PULL 03/15] arm-soc: soc-specific updates Arnd Bergmann
2012-07-23 20:33 ` Arnd Bergmann
2012-07-23 20:32 ` [GIT PULL 04/15] arm-soc: samsung dma changes Arnd Bergmann
2012-07-23 20:33 ` Arnd Bergmann
2012-07-23 20:32 ` [GIT PULL 05/15] arm-soc: device tree description updates Arnd Bergmann
2012-07-23 20:33 ` Arnd Bergmann
2012-07-23 20:32 ` [GIT PULL 06/15] arm-soc: spi updates Arnd Bergmann
2012-07-23 20:33 ` Arnd Bergmann
2012-07-23 20:32 ` [GIT PULL 07/15] arm-soc: timer updates Arnd Bergmann
2012-07-23 20:33 ` Arnd Bergmann
2012-07-23 20:32 ` [GIT PULL 08/15] arm-soc: cleanups, part 2 Arnd Bergmann
2012-07-23 20:33 ` Arnd Bergmann
2012-07-23 20:32 ` [GIT PULL 09/15] arm-soc: new SoC support Arnd Bergmann
2012-07-23 20:33 ` Arnd Bergmann
2012-07-23 20:32 ` [GIT PULL 10/15] arm-soc: defconfig updates Arnd Bergmann
2012-07-23 20:33 ` Arnd Bergmann
2012-07-23 20:32 ` [GIT PULL 11/15] arm-soc: board specific updates Arnd Bergmann
2012-07-23 20:33 ` Arnd Bergmann
2012-07-23 20:32 ` [GIT PULL 12/15] arm-soc: sparse IRQ conversion Arnd Bergmann
2012-07-23 20:33 ` Arnd Bergmann
2012-07-23 20:32 ` [GIT PULL 13/15] arm-soc: pincontrol drivers Arnd Bergmann
2012-07-23 20:33 ` Arnd Bergmann
2012-07-23 20:32 ` [GIT PULL 14/15] arm-soc: power management changes Arnd Bergmann
2012-07-23 20:33 ` Arnd Bergmann
2012-07-23 20:32 ` [GIT PULL 15/15] arm-soc: clk changes Arnd Bergmann
2012-07-23 20:33 ` Arnd Bergmann
2012-07-24 1:03 ` [GIT PULL 00/15] arm-soc: changes for v3.6 Linus Torvalds
2012-07-24 1:03 ` Linus Torvalds
2012-07-24 7:51 ` Arnd Bergmann
2012-07-24 7:51 ` Arnd Bergmann
2012-07-24 8:12 ` Tony Lindgren
2012-07-24 8:12 ` Tony Lindgren
2012-07-24 12:00 ` Arnd Bergmann
2012-07-24 12:00 ` Arnd Bergmann
2012-07-24 20:51 ` Paul Walmsley
2012-07-24 20:51 ` Paul Walmsley
2012-07-26 23:10 ` Mark A. Greer
2012-07-26 23:10 ` Mark A. Greer
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.