)]}' { "log": [ { "commit": "f465d145d76803fe6332092775d891c8c509aa44", "tree": "45889e2eee7e8288ef269e9b661111364a71c25f", "parents": [ "30b842889eea1bea02dff55b13d2ddf07a46ce78", "80b9abf973462499c1a0110df47f62cc90361e2c" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat May 26 13:14:01 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat May 26 13:14:01 2012 -0700" }, "message": "Merge tag \u0027cleanup-initcall\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc\n\nPull sweeping late_initcall cleanup for arm-soc from Olof Johansson:\n \"This is a patch series from Shawn Guo that moves from individual\n late_initcalls() to using a member in the machine structure to invoke\n a platform\u0027s late initcalls.\n\n This cleanup is a step in the move towards multiplatform kernels since\n it would reduce the need to check for compatible platforms in each and\n every initcall.\"\n\nFix up trivial conflicts in arch/arm/mach-{exynos/mach-universal_c210.c,\nimx/mach-cpuimx51.c, omap2/board-generic.c} due to changes nearby (and,\nin the case of cpuimx51.c the board support being deleted)\n\n* tag \u0027cleanup-initcall\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:\n ARM: ux500: use machine specific hook for late init\n ARM: tegra: use machine specific hook for late init\n ARM: shmobile: use machine specific hook for late init\n ARM: sa1100: use machine specific hook for late init\n ARM: s3c64xx: use machine specific hook for late init\n ARM: prima2: use machine specific hook for late init\n ARM: pnx4008: use machine specific hook for late init\n ARM: omap2: use machine specific hook for late init\n ARM: omap1: use machine specific hook for late init\n ARM: msm: use machine specific hook for late init\n ARM: imx: use machine specific hook for late init\n ARM: exynos: use machine specific hook for late init\n ARM: ep93xx: use machine specific hook for late init\n ARM: davinci: use machine specific hook for late init\n ARM: provide a late_initcall hook for platform initialization\n" }, { "commit": "ce53044c68cf4fb6c50a2a0d88786be65fae7235", "tree": "19c21da7d261412192e189ef3fd1a9ff4e7ba5c2", "parents": [ "0877aa3908aaeeae8fc2850691668c4315d3db56", "046fae440d32cc6dec8148c7e06a8b4b987f8a2f" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat May 26 12:22:27 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat May 26 12:22:27 2012 -0700" }, "message": "Merge tag \u0027drivers\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc\n\nPull arm-soc driver specific updates from Olof Johansson:\n \"These changes are specific to some driver that may be used by multiple\n boards or socs. The most significant change in here is the move of\n the samsung iommu code from a platform specific in-kernel interface to\n the generic iommu subsystem.\"\n\nFix up trivial conflicts in arch/arm/mach-exynos/Kconfig\n\n* tag \u0027drivers\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (28 commits)\n mmc: dt: Consolidate DT bindings\n iommu/exynos: Add iommu driver for EXYNOS Platforms\n ARM: davinci: optimize the DMA ISR\n ARM: davinci: implement DEBUG_LL port choice\n ARM: tegra: Add SMMU enabler in AHB\n ARM: tegra: Add Tegra AHB driver\n Input: pxa27x_keypad add choice to set direct_key_mask\n Input: pxa27x_keypad direct key may be low active\n Input: pxa27x_keypad bug fix for direct_key_mask\n Input: pxa27x_keypad keep clock on as wakeup source\n ARM: dt: tegra: pinmux changes for USB ULPI\n ARM: tegra: add USB ULPI PHY reset GPIO to device tree\n ARM: tegra: don\u0027t hard-code USB ULPI PHY reset_gpio\n ARM: tegra: change pll_p_out4\u0027s rate to 24MHz\n ARM: tegra: fix pclk rate\n ARM: tegra: reparent sclk to pll_c_out1\n ARM: tegra: Add pllc clock init table\n ARM: dt: tegra cardhu: basic audio support\n ARM: dt: tegra30.dtsi: Add audio-related nodes\n ARM: tegra: add AUXDATA required for audio\n ...\n" }, { "commit": "2e341ca686042aa464efa755447e7bcee91d1eb6", "tree": "c6b16b6b6a6e871fa04396cb2c7eb759bcad5be3", "parents": [ "927ad551031798d4cba49766549600bbb33872d7", "85e184e4c3cd3e2285ceab91ff8f0cac094e8a85" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 23 13:05:43 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 23 13:05:43 2012 -0700" }, "message": "Merge tag \u0027sound-3.5\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound\n\nPull sound updates from Takashi Iwai:\n \"This is the first big chunk for 3.5 merges of sound stuff.\n\n There are a few big changes in different areas. First off, the\n streaming logic of USB-audio endpoints has been largely rewritten for\n the better support of \"implicit feedback\". If anything about USB got\n broken, this change has to be checked.\n\n For HD-audio, the resume procedure was changed; instead of delaying\n the resume of the hardware until the first use, now waking up\n immediately at resume. This is for buggy BIOS.\n\n For ASoC, dynamic PCM support and the improved support for digital\n links between off-SoC devices are major framework changes.\n\n Some highlights are below:\n\n * HD-audio\n - Avoid accesses of invalid pin-control bits that may stall the codec\n - V-ref setup cleanups\n - Fix the races in power-saving code\n - Fix the races in codec cache hashes and connection lists\n - Split some common codes for BIOS auto-parser to hda_auto_parser.c\n - Changed the PM resume code to wake up immediately for buggy BIOS\n - Creative SoundCore3D support\n - Add Conexant CX20751/2/3/4 codec support\n\n * ASoC\n - Dynamic PCM support, allowing support for SoCs with internal\n routing through components with tight sequencing and formatting\n constraints within their internal paths or where there are multiple\n components connected with CPU managed DMA controllers inside the\n SoC.\n - Greatly improved support for direct digital links between off-SoC\n devices, providing a much simpler way of connecting things like\n digital basebands to CODECs.\n - Much more fine grained and robust locking, cleaning up some of the\n confusion that crept in with multi-component.\n - CPU support for nVidia Tegra 30 I2S and audio hub controllers and\n ST-Ericsson MSP I2S controolers\n - New CODEC drivers for Cirrus CS42L52, LAPIS Semiconductor ML26124,\n Texas Instruments LM49453.\n - Some regmap changes needed by the Tegra I2S driver.\n - mc13783 audio support.\n\n * Misc\n - Rewrite with module_pci_driver()\n - Xonar DGX support for snd-oxygen\n - Improvement of packet handling in snd-firewire driver\n - New USB-endpoint streaming logic\n - Enhanced M-audio FTU quirks and relevant cleanups\n - Increment the support of OSS devices to 256\n - snd-aloop accuracy improvement\n\n There are a few more pending changes for 3.5, but they will be sent\n slightly later as partly depending on the changes of DRM.\"\n\nFix up conflicts in regmap (due to duplicate patches, with some further\nupdates then having already come in from the regmap tree). Also some\nfairly trivial context conflicts in the imx and mcx soc drivers.\n\n* tag \u0027sound-3.5\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (280 commits)\n ALSA: snd-usb: fix stream info output in /proc\n ALSA: pcm - Add proper state checks to snd_pcm_drain()\n ALSA: sh: Fix up namespace collision in sh_dac_audio.\n ALSA: hda/realtek - Fix unused variable compile warning\n ASoC: sh: fsi: enable chip specific data transfer mode\n ASoC: sh: fsi: call fsi_hw_startup/shutdown from fsi_dai_trigger()\n ASoC: sh: fsi: use same format for IN/OUT\n ASoC: sh: fsi: add fsi_version() and removed meaningless version check\n ASoC: sh: fsi: use register field macro name on IN/OUT_DMAC\n ASoC: tegra: Add machine driver for WM8753 codec\n ALSA: hda - Fix possible races of accesses to connection list array\n ASoC: OMAP: HDMI: Introduce codec\n ARM: mx31_3ds: Add sound support\n ASoC: imx-mc13783 cleanup\n mx31moboard: Add sound support\n ASoC: mc13783 codec cleanups\n ASoC: add imx-mc13783 sound support\n ASoC: Add mc13783 codec\n mfd: mc13xxx: add codec platform data\n ASoC: don\u0027t flip master of DT-instantiated DAI links\n ...\n" }, { "commit": "94b5aff4c6f72fee6b0f49d49e4fa8b204e8ded9", "tree": "39197121b6ef8cddaa0f4057fe24b4ced58e8982", "parents": [ "5d4e2d08e7fdf7339f84a1c670d296a77e02f881", "59bd234b72fc29887839d792b7d6c7e8d2a577a6" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 22 16:12:24 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 22 16:12:24 2012 -0700" }, "message": "Merge tag \u0027tty-3.5-rc1\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty\n\nPull TTY updates from Greg Kroah-Hartman:\n \"Here\u0027s the big TTY/serial driver pull request for the 3.5-rc1 merge\n window.\n\n Nothing major in here, just lots of incremental changes from Alan and\n Jiri reworking some tty core things to behave better and to get a more\n solid grasp on some of the nasty tty locking issues.\n\n There are a few tty and serial driver updates in here as well.\n\n All of this has been in the linux-next releases for a while with no\n problems.\n\n Signed-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\"\n\n* tag \u0027tty-3.5-rc1\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty: (115 commits)\n serial: bfin_uart: Make MMR access compatible with 32 bits bf609 style controller.\n serial: bfin_uart: RTS and CTS MMRs can be either 16-bit width or 32-bit width.\n serial: bfin_uart: narrow the reboot condition in DMA tx interrupt\n serial: bfin_uart: Adapt bf5xx serial driver to bf60x serial4 controller.\n Revert \"serial_core: Update buffer overrun statistics.\"\n tty: hvc_xen: NULL dereference on allocation failure\n tty: Fix LED error return\n tty: Allow uart_register/unregister/register\n tty: move global ldisc idle waitqueue to the individual ldisc\n serial8250-em: Add DT support\n serial8250-em: clk_get() IS_ERR() error handling fix\n serial_core: Update buffer overrun statistics.\n tty: drop the pty lock during hangup\n cris: fix missing tty arg in wait_event_interruptible_tty call\n tty/amiserial: Add missing argument for tty_unlock()\n tty_lock: Localise the lock\n pty: Lock the devpts bits privately\n tty_lock: undo the old tty_lock use on the ctty\n serial8250-em: Emma Mobile UART driver V2\n Add missing call to uart_update_timeout()\n ...\n" }, { "commit": "813a95e5b4fa936bbde10ef89188932745dcd7f4", "tree": "571ca345861ffb89b45fabe26fcab4e133c8537b", "parents": [ "9f639269ed1522c7d69c54cc8b80ab8ee53fcb10", "f3f08dcb9965f42378851ce888fb7539607712e6" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 22 09:39:42 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 22 09:39:42 2012 -0700" }, "message": "Merge tag \u0027pinctrl\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc\n\nPull arm soc-specific pinctrl changes from Olof Johansson:\n \"With this, five platforms are moving to the relatively new pinctrl\n subsystem for their pin management, replacing the older soc specific\n in-kernel interfaces with common code.\n\n There is quite a bit of net addition of code for each platform being\n added to the pinctrl subsystem. But the payback comes later when\n adding new boards can be done by only providing new device trees\n instead.\"\n\nFix up trivial conflicts in arch/arm/mach-ux500/{Makefile,board-mop500.c}\n\n* tag \u0027pinctrl\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (61 commits)\n mtd: nand: gpmi: fix compile error caused by pinctrl call\n ARM: PRIMA2: select PINCTRL and PINCTRL_SIRF in Kconfig\n ARM: nomadik: enable PINCTRL_NOMADIK where needed\n ARM: mxs: enable pinctrl support\n video: mxsfb: adopt pinctrl support\n ASoC: mxs-saif: adopt pinctrl support\n i2c: mxs: adopt pinctrl support\n mtd: nand: gpmi: adopt pinctrl support\n mmc: mxs-mmc: adopt pinctrl support\n serial: mxs-auart: adopt pinctrl support\n serial: amba-pl011: adopt pinctrl support\n spi/imx: adopt pinctrl support\n i2c: imx: adopt pinctrl support\n can: flexcan: adopt pinctrl support\n net: fec: adopt pinctrl support\n ARM: ux500: switch MSP to using pinctrl for pins\n ARM: ux500: alter MSP registration to return a device pointer\n ARM: ux500: switch to using pinctrl for uart0\n ARM: ux500: delete custom pin control system\n ARM: ux500: switch over to Nomadik pinctrl driver\n ...\n" }, { "commit": "8dca6010d44cc722a94dc6da96560f9083dac782", "tree": "c804c272bc3d07a05459c2688e4b1c8b141d561c", "parents": [ "9bc747bea5fad819e0c0ad96e6a67ea0640dfe2b", "74c437532b8b5db53509963ec38e8424c56ff6f4" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 22 09:27:39 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 22 09:27:39 2012 -0700" }, "message": "Merge tag \u0027fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc\n\nPull non-critical arm-soc bug fixes from Olof Johansson:\n \"These bug fixes were not important enough to have them included in the\n v3.4 release, mostly because they cover harmless warnings or\n unrealistic configurations. Instead we queue them up to be picked up\n in the next merge window.\"\n\nFixed up trivial conflict in arch/arm/mach-omap2/board-omap4panda.c\n\n* tag \u0027fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:\n ARM: spear6xx: remove board selection options\n ARM: OMAP: igep0020: Specify the VPLL2 regulator unconditionally\n ARM: OMAP2+: INTC: fix Kconfig option for TI81XX\n ARM: OMAP2+: remove incorrect irq_chip ack field\n ARM: OMAP4: Adding ID for OMAP4460 ES1.1\n ARM: OMAP4: panda: add statics to remove warnings\n ARM: OMAP2+: Incorrect Register Offsets in OMAP Mailbox\n ARM: OMAP: fix trivial warnings for dspbridge\n arm: davinci: use for_each_set_bit_from\n ARM: OMAP4: hsmmc: check for null pointer\n ARM: OMAP1: fix compilation issue in board-sx1.c\n ARM: disable SUSPEND/ARCH_SUSPEND_POSSIBLE for ARCH_TEGRA\n ARM: davinci: da850-evm: fix section mismatch\n ARM: tegra: add pll_x freq table entry for 750MHz\n ARM: davinci: mark spi_board_info arguments as const\n ARM: davinci: fix incorrect pdctl next bit position\n" }, { "commit": "9bc747bea5fad819e0c0ad96e6a67ea0640dfe2b", "tree": "d500225e7a1c90a6bd17d3e63e2f6e781810db2b", "parents": [ "32b908eea9e5ecd1049008e134eadbfcd0da5e38", "0e896b1ddc1905df904df98c204bacf028219729" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 22 09:23:24 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 22 09:23:24 2012 -0700" }, "message": "Merge tag \u0027cleanup\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc\n\nPull first batch of arm-soc cleanups from Olof Johansson:\n \"These cleanups are basically all over the place. The idea is to\n collect changes with minimal impact but large number of changes so we\n can avoid them from distracting in the diffstat in the other series.\n\n A significant number of lines get removed here, in particular because\n the ixp2000 and ixp23xx platforms get removed. These have never been\n extremely popular and have fallen into disuse over time with no active\n maintainer taking care of them. The u5500 soc never made it into a\n product, so we are removing it from the ux500 platform.\n\n Many good cleanups also went into the at91 and omap platforms, as has\n been the case for a number of releases.\"\n\nTrivial modify-delete conflicts in arch/arm/mach-{ixp2000,ixp23xx}\n\n* tag \u0027cleanup\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (152 commits)\n ARM: clps711x: Cleanup IRQ handling\n ARM clps711x: Removed unused header mach/time.h\n ARM: clps711x: Added note about support EP731x CPU to Kconfig\n ARM: clps711x: Added missing register definitions\n ARM: clps711x: Used own subarch directory for store header file\n Dove: Fix Section mismatch warnings\n ARM: orion5x: ts78xx debugging changes\n ARM: orion5x: remove PM dependency from ts78xx\n ARM: orion5x: ts78xx fix NAND resource off by one\n ARM: orion5x: ts78xx whitespace cleanups\n Orion5x: Fix Section mismatch warnings\n Orion5x: Fix warning: struct pci_dev declared inside paramter list\n ARM: clps711x: Combine header files into one for clps711x-targets\n ARM: S3C24XX: Use common macro to define resources on mach-qt2410.c\n ARM: S3C24XX: Use common macro to define resources on mach-osiris.c\n ARM: EXYNOS: Adapt to cpuidle core time keeping and irq enable\n ARM: S5PV210: Use common macro to define resources on mach-smdkv210.c\n ARM: S5PV210: Use common macro to define resources on dev-audio.c\n ARM: S5PC100: Use common macro to define resources on dev-audio.c\n ARM: S5P64X0: Use common macro to define resources on dev-audio.c\n ...\n" }, { "commit": "ff8ce5f67ddca709fe59e6173f89260f0fdc2b22", "tree": "90d3ad380b290d251b54590be485b2ffb4528e5a", "parents": [ "4f6ade91532b5b05ea28219b891f12a3cec528cd", "4ab1056766a4e49f6b9ef324313dd1583f8f8f4e" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon May 21 16:01:50 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon May 21 16:01:50 2012 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.linaro.org/people/rmk/linux-arm\n\nPull core ARM updates from Russell King:\n \"This is the bulk of the core ARM updates for this merge window.\n Included in here is a different way to handle the VIVT cache flushing\n on context switch, which should allow scheduler folk to remove a\n special case in their core code.\n\n We have architectured timer support here, which is a set of timers\n specified by the ARM architecture for future SoCs. So we should see\n less variability in timer design going forward.\n\n The last big thing here is my cleanup to the way we handle PCI across\n ARM, fixing some oddities in some platforms which hadn\u0027t realised\n there was a way to deal with their private data already built in to\n our PCI backend.\n\n I\u0027ve also removed support for the ARMv3 architecture; it hasn\u0027t worked\n properly for years so it seems pointless to keep it around.\"\n\n* \u0027for-linus\u0027 of git://git.linaro.org/people/rmk/linux-arm: (47 commits)\n ARM: PCI: remove per-pci_hw list of buses\n ARM: PCI: dove/kirkwood/mv78xx0: use sys-\u003eprivate_data\n ARM: PCI: provide a default bus scan implementation\n ARM: PCI: get rid of pci_std_swizzle()\n ARM: PCI: versatile: fix PCI interrupt setup\n ARM: PCI: integrator: use common PCI swizzle\n ARM: 7416/1: LPAE: Remove unused L_PTE_(BUFFERABLE|CACHEABLE) macros\n ARM: 7415/1: vfp: convert printk\u0027s to pr_*\u0027s\n ARM: decompressor: avoid speculative prefetch from non-RAM areas\n ARM: Remove ARMv3 support from decompressor\n ARM: 7413/1: move read_{boot,persistent}_clock to the architecture level\n ARM: Remove support for ARMv3 ARM610 and ARM710 CPUs\n ARM: 7363/1: DEBUG_LL: limit early mapping to the minimum\n ARM: 7391/1: versatile: add some auxdata for device trees\n ARM: 7389/2: plat-versatile: modernize FPGA IRQ controller\n AMBA: get rid of last two uses of NO_IRQ\n ARM: 7408/1: cacheflush: return error to userspace when flushing syscall fails\n ARM: 7409/1: Do not call flush_cache_user_range with mmap_sem held\n ARM: 7404/1: cmpxchg64: use atomic64 and local64 routines for cmpxchg64\n ARM: 7347/1: SCU: use cpu_logical_map for per-CPU low power mode\n ...\n" }, { "commit": "4175160b065e74572819a320dcd34129224a4e1c", "tree": "3298e2c9a7c7db33bf28617875e5429e17eec61c", "parents": [ "ddf90a2ff2c4a9da99acc898a4afeab3e4251fcd", "0ec8e7aa8f63f0cacd545fcd7f40f93fde2c0e6e" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Mon May 21 15:15:24 2012 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Mon May 21 15:15:24 2012 +0100" }, "message": "Merge branch \u0027misc\u0027 into for-linus\n\nConflicts:\n\tarch/arm/kernel/ptrace.c\n" }, { "commit": "21b7f153dd0d7366197c37e7a630c7585db0b8ea", "tree": "065ad22312b08aca338479a823d60bec23fde120", "parents": [ "0200c0a66cb727fae13bcd938d44a0841a6530d1", "89c788bab1f0374ae05aef7560066442ceb55384" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Mon May 14 22:53:49 2012 +0200" }, "committer": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Tue May 15 13:30:41 2012 +0200" }, "message": "Merge branch \u0027for-3.5/ahb\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra into next/drivers\n\n* tegra/ahb:\n ARM: tegra: Add SMMU enabler in AHB\n ARM: tegra: Add Tegra AHB driver\n\nSigned-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\n" }, { "commit": "97e7abc5e04bea6a5db8d54ad34407bb46e85403", "tree": "9e828cf6251c9fc3b5dce04439e1645ec8a98405", "parents": [ "36be50515fe2aef61533b516fa2576a2c7fe7664" ], "author": { "name": "Peter De Schrijver", "email": "pdeschrijver@nvidia.com", "time": "Mon May 14 13:27:09 2012 +0300" }, "committer": { "name": "Stephen Warren", "email": "swarren@nvidia.com", "time": "Mon May 14 10:22:01 2012 -0600" }, "message": "ARM: tegra: Fix flow controller accesses\n\nflowctrl_write_cpu_csr uses the cpu halt offsets and vice versa. This patch\nfixes this bug.\n\nReported-by: Dan Willemsen \u003cdwillemsen@nvidia.com\u003e\nSigned-off-by: Peter De Schrijver \u003cpdeschrijver@nvidia.com\u003e\n[swarren: This problem was introduced in v3.4-rc1, in commit 26fe681 \"ARM:\n tegra: functions to access the flowcontroller\", when this file was first\n added]\nSigned-off-by: Stephen Warren \u003cswarren@nvidia.com\u003e\n" }, { "commit": "daeb4c0c3bf2df72d0cd6e4330bad9e2e520552b", "tree": "3645ea27803ab1adb7c46e95005cfcf10bdbd846", "parents": [ "1bc39ac5dab265b76ce6e20d6c85f900539fd190" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Sat Mar 10 11:39:33 2012 +0000" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Sun May 13 17:12:16 2012 +0100" }, "message": "ARM: PCI: get rid of pci_std_swizzle()\n\nMost PCI implementations use the standard PCI swizzle function, which\nhandles the well defined behaviour of PCI-to-PCI bridges which can be\nfound on cards (eg, four port ethernet cards.)\n\nRather than having almost every platform specify the standard swizzle\nfunction, make this the default when no swizzle function is supplied.\nTherefore, a swizzle function only needs to be provided when there is\nsomething exceptional which needs to be handled.\n\nThis gets rid of the swizzle initializer from 47 files, and leaves us\nwith just two platforms specifying a swizzle function: ARM Integrator\nand Chalice CATS.\n\nAcked-by: Krzysztof Hałasa \u003ckhc@pm.waw.pl\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "af568679f51de779d0e9ad7d8360dc7727da546d", "tree": "3586a737ed6c1dec360150ce598e1f6216a107a0", "parents": [ "7a3252f8374749ae4b5cc60e02f9b9eba79311cc", "80881dae52d05d3d6c920624157d68006390f01e" ], "author": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Wed May 09 23:53:05 2012 -0700" }, "committer": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Wed May 09 23:53:05 2012 -0700" }, "message": "Merge branch \u0027for-3.5/debug\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra into next/drivers\n\nBy Stephen Warren\nvia Stephen Warren\n* \u0027for-3.5/debug\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra:\n ARM: tegra: uncompress.h: Implement TEGRA_DEBUG_UART_AUTO_ODMDATA\n" }, { "commit": "7a3252f8374749ae4b5cc60e02f9b9eba79311cc", "tree": "4eaecb237905833cca0251329d9048dbbeebfefb", "parents": [ "bd69e27304e754b18dd6be8d8575af37afbbd095", "8c6a3852f639736ca7cb0f5e7b3fd0f314b0fc6a" ], "author": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Wed May 09 23:48:44 2012 -0700" }, "committer": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Wed May 09 23:48:52 2012 -0700" }, "message": "Merge branch \u0027for-3.5/tegra30-audio\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra into next/drivers\n\nBy Stephen Warren (5) and Peter De Schrijver (1)\nvia Stephen Warren\n* \u0027for-3.5/tegra30-audio\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra:\n ARM: dt: tegra cardhu: basic audio support\n ARM: dt: tegra30.dtsi: Add audio-related nodes\n ARM: tegra: add AUXDATA required for audio\n ARM: tegra: set up audio clocks for tegra30 dt\n ARM: tegra: Initialize pll_p_out1\n ARM: tegra: provide clock aliases for AHUB configlink\n\nSigned-off-by: Olof Johansson \u003colof@lixom.net\u003e\n" }, { "commit": "89c788bab1f0374ae05aef7560066442ceb55384", "tree": "330832a873d9184a6c9e56270eee7be4d88b299c", "parents": [ "87d0bab2cba3c31624b80cc68bcf5e29ef969458" ], "author": { "name": "Hiroshi DOYU", "email": "hdoyu@nvidia.com", "time": "Mon May 07 09:43:46 2012 +0300" }, "committer": { "name": "Stephen Warren", "email": "swarren@nvidia.com", "time": "Tue May 08 13:30:49 2012 -0600" }, "message": "ARM: tegra: Add SMMU enabler in AHB\n\nAdd extern func, \"tegra_ahb_enable_smmu()\" to inform AHB that SMMU is\nready.\n\nSigned-off-by: Hiroshi DOYU \u003chdoyu@nvidia.com\u003e\nCc: Felipe Balbi \u003cbalbi@ti.com\u003e\nSigned-off-by: Stephen Warren \u003cswarren@nvidia.com\u003e\n" }, { "commit": "87d0bab2cba3c31624b80cc68bcf5e29ef969458", "tree": "1bdf28fd56102096eba91cec450a5b2cced5ce75", "parents": [ "e816b57a337ea3b755de72bec38c10c864f23015" ], "author": { "name": "Hiroshi DOYU", "email": "hdoyu@nvidia.com", "time": "Mon May 07 12:24:48 2012 +0200" }, "committer": { "name": "Stephen Warren", "email": "swarren@nvidia.com", "time": "Tue May 08 13:30:49 2012 -0600" }, "message": "ARM: tegra: Add Tegra AHB driver\n\nTegra AHB Bus conforms to the AMBA Specification (Rev 2.0) Advanced\nHigh-performance Bus (AHB) architecture.\n\nThe AHB Arbiter controls AHB bus master arbitration. This effectively\nforms a second level of arbitration for access to the memory\ncontroller through the AHB Slave Memory device. The AHB pre-fetch\nlogic can be configured to enhance performance for devices doing\nsequential access. Each AHB master is assigned to either the high or\nlow priority bin. Both Tegra20/30 have this AHB bus.\n\nSome of configuration params could be passed from DT too if needed.\n\nSigned-off-by: Hiroshi DOYU \u003chdoyu@nvidia.com\u003e\nAcked-by: Arnd Bergmann \u003carnd@arndb.de\u003e\nCc: Felipe Balbi \u003cbalbi@ti.com\u003e\nSigned-off-by: Stephen Warren \u003cswarren@nvidia.com\u003e\n" }, { "commit": "390e0cfd320b28d6964b92d83d59168a33c28866", "tree": "769a24ef3085e334922bbd8043768a1bcc69d10b", "parents": [ "21cc1b7ede3cf456cf1d51f8a906093261f7c111" ], "author": { "name": "Shawn Guo", "email": "shawn.guo@linaro.org", "time": "Wed May 02 17:08:06 2012 +0800" }, "committer": { "name": "Shawn Guo", "email": "shawn.guo@linaro.org", "time": "Tue May 08 20:36:36 2012 +0800" }, "message": "ARM: tegra: use machine specific hook for late init\n\nCc: Colin Cross \u003cccross@android.com\u003e\nCc: Olof Johansson \u003colof@lixom.net\u003e\nSigned-off-by: Shawn Guo \u003cshawn.guo@linaro.org\u003e\nAcked-by: Stephen Warren \u003cswarren@wwwdotorg.org\u003e\n" }, { "commit": "bd0493eaaf5c7a1ea00786d46cc2f4af44e76f28", "tree": "bd7fbb1d21c5c00b0c37eeb3ac1b09a9d4f123ac", "parents": [ "f67860a76f162ebcc6a2cacf3b0538d8a67d55ae" ], "author": { "name": "Marc Zyngier", "email": "Marc.Zyngier@arm.com", "time": "Sat May 05 19:28:44 2012 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Sun May 06 11:09:21 2012 +0100" }, "message": "ARM: 7413/1: move read_{boot,persistent}_clock to the architecture level\n\nAt the moment, read_persistent_clock is implemented at the\nplatform level, which makes it impossible to compile these\nplatforms in a single kernel.\n\nImplement these two functions at the architecture level, and\nprovide a thin registration interface for both read_boot_clock\nand read_persistent_clock. The two affected platforms (OMAP and\nTegra) are converted at the same time.\n\nReported-by: Jeff Ohlstein \u003cjohlstei@codeaurora.org\u003e\nTested-by: Stephen Warren \u003cswarren@wwwdotorg.org\u003e\nTested-by: Tony Lindgren \u003ctony@atomide.com\u003e\nSigned-off-by: Marc Zyngier \u003cmarc.zyngier@arm.com\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "aea812e1ac80a491d39396e2a2d15bb725933c84", "tree": "e31f1c047e43a10d410b3b11471530627c98aaf5", "parents": [ "0034102808e0dbbf3a2394b82b1bb40b5778de9e" ], "author": { "name": "Stephen Warren", "email": "swarren@nvidia.com", "time": "Wed Apr 25 12:10:19 2012 -0600" }, "committer": { "name": "Stephen Warren", "email": "swarren@nvidia.com", "time": "Wed Apr 25 15:23:14 2012 -0600" }, "message": "ARM: tegra: add pll_x freq table entry for 750MHz\n\nSome SKUs limit the maximum CPU frequency to 750MHz; see\ntegra2_pllx_clk_init(). The pll_x frequency table needs an entry for this\nfrequency, or there will be continual log spam from the cpufreq driver\nattempting to set this rate, yet there being no table entry for it.\n\nSigned-off-by: Stephen Warren \u003cswarren@nvidia.com\u003e\n" }, { "commit": "aa607ebf93a5fc26275a575781399df971dd1b91", "tree": "93dcb6f1af5f6d7e64663a4ce9e45e889866309e", "parents": [ "60d148b9f838b718e4808061ee6d5833de77fd9c" ], "author": { "name": "Stephen Warren", "email": "swarren@nvidia.com", "time": "Thu Apr 12 15:46:49 2012 -0600" }, "committer": { "name": "Stephen Warren", "email": "swarren@nvidia.com", "time": "Wed Apr 25 15:22:09 2012 -0600" }, "message": "ARM: tegra: add USB ULPI PHY reset GPIO to device tree\n\nULPI PHYs have a reset signal, and different boards use a different GPIO\nfor this task. Add a property to device tree to represent this.\n\nI\u0027m not sure if adding this property to the EHCI controller node is\nentirely correct; perhaps eventually we should have explicit separate\nnodes for the various PHYs. However, we don\u0027t have that right now, so this\nbinding seems like a reasonable choice.\n\nCc: \u003cdevicetree-discuss@lists.ozlabs.org\u003e\nCc: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\nCc: \u003clinux-usb@vger.kernel.org\u003e\nSigned-off-by: Stephen Warren \u003cswarren@nvidia.com\u003e\n" }, { "commit": "60d148b9f838b718e4808061ee6d5833de77fd9c", "tree": "eb0845d18a171176e605759ebaf52ae97c1c88b9", "parents": [ "9abafa021e223f04d6589ee2b977bbaf2e1f1367" ], "author": { "name": "Stephen Warren", "email": "swarren@nvidia.com", "time": "Thu Apr 12 15:03:52 2012 -0600" }, "committer": { "name": "Stephen Warren", "email": "swarren@nvidia.com", "time": "Wed Apr 25 15:22:09 2012 -0600" }, "message": "ARM: tegra: don\u0027t hard-code USB ULPI PHY reset_gpio\n\nNot all boards use GPIO_PV0 as the ULPI PHY reset signal. Instead of\nhard-coding this GPIO into devices.c, make the board files set it\nexplicitly. This will allow the PHY code to differentiate between set and\nunset values, and hence know when to read the value from device tree.\n\nSigned-off-by: Stephen Warren \u003cswarren@nvidia.com\u003e\n" }, { "commit": "9abafa021e223f04d6589ee2b977bbaf2e1f1367", "tree": "6029d68e9dc837b40677282e459fc807aa76e581", "parents": [ "7ff4db0967bd7d617c77dc5a66c0d95166277817" ], "author": { "name": "Stephen Warren", "email": "swarren@nvidia.com", "time": "Thu Apr 12 14:13:05 2012 -0600" }, "committer": { "name": "Stephen Warren", "email": "swarren@nvidia.com", "time": "Wed Apr 25 15:22:09 2012 -0600" }, "message": "ARM: tegra: change pll_p_out4\u0027s rate to 24MHz\n\npll_p_out4 is used on all/most Tegra boards to drive the cdev2 output pin\nto provide a reference clock to a ULPI USB PHY. This reference clock must\nrun at 24MHz, and the cdev2 output has no additional dividers.\n\nRemove board-paz00.c\u0027s now-duplicate initialization of this clock.\n\nReported-by: Marc Dietrich \u003cmarvin24@gmx.de\u003e\nSigned-off-by: Stephen Warren \u003cswarren@nvidia.com\u003e\n" }, { "commit": "7ff4db0967bd7d617c77dc5a66c0d95166277817", "tree": "43328bab20e3fe0e2c0a613b5860eabd4802342f", "parents": [ "60f975b98cf41476ba0e156f7523b197b046cf2b" ], "author": { "name": "Stephen Warren", "email": "swarren@nvidia.com", "time": "Fri Apr 20 16:58:18 2012 -0600" }, "committer": { "name": "Stephen Warren", "email": "swarren@nvidia.com", "time": "Wed Apr 25 15:22:09 2012 -0600" }, "message": "ARM: tegra: fix pclk rate\n\nCommit 40f9cf0 \"ARM: tegra: reparent sclk to pll_c_out1\" changed the\nrate of hclk. Since pclk is derived from that, and only has integer\ndividers, the pclk rate needs to change in the same fashion, from 54MHz\nto 60MHz.\n\nSigned-off-by: Stephen Warren \u003cswarren@nvidia.com\u003e\n" }, { "commit": "60f975b98cf41476ba0e156f7523b197b046cf2b", "tree": "1af645f32f8aa377307e18876b4296586c18df95", "parents": [ "c8b62ab41f76218efca5e4baa5c22ef52a9fe3a5" ], "author": { "name": "Stephen Warren", "email": "swarren@nvidia.com", "time": "Thu Apr 12 14:09:39 2012 -0600" }, "committer": { "name": "Stephen Warren", "email": "swarren@nvidia.com", "time": "Wed Apr 25 15:22:09 2012 -0600" }, "message": "ARM: tegra: reparent sclk to pll_c_out1\n\npll_p_out4 needs to be used for other purposes. Reparent sclk so that\nit runs from pll_c. Change sclk\u0027s rate to 120MHz from 108MHz since this\nis the lowest precise rate that can be achieved by dividing the pll_c\nrate without reducing the sclk rate. (600/5\u003d120, 600/5.5\u003d109.0909...,\n600/6\u003d100).\n\nSigned-off-by: Stephen Warren \u003cswarren@nvidia.com\u003e\n" }, { "commit": "c8b62ab41f76218efca5e4baa5c22ef52a9fe3a5", "tree": "b1b75cda34973167c2fddefcf8d3b807f670d57f", "parents": [ "aef7704c6cc36db9618603b22194def441d30432" ], "author": { "name": "Allen Martin", "email": "amartin@nvidia.com", "time": "Fri Sep 10 09:17:33 2010 -0500" }, "committer": { "name": "Stephen Warren", "email": "swarren@nvidia.com", "time": "Wed Apr 25 15:22:09 2012 -0600" }, "message": "ARM: tegra: Add pllc clock init table\n\npll_c will be used as a clock source. Fill in tegra_pll_c_freq_table[]\nso that it\u0027s possible to explicitly initialize the PLL.\n\nNVIDIA\u0027s downstream nv-3.1 kernel and the ChromeOS kernel have different\npll_c tables. nv-3.1 contains entries for 522MHz and 598MHz output,\nwhereas the ChromeOS kernel contains entries for 600MHz output. I chose\nto upstream the ChromeOS values for now, since the 600MHz rate appears\nto match the default rate of this PLL when the HW boots, and it\u0027s not\nclear to me why 522 or 598MHz are more useful.\n\nSigned-off-by: Allen Martin \u003camartin@nvidia.com\u003e\nSigned-off-by: Olof Johansson \u003colofj@chromium.org\u003e\nSigned-off-by: Stephen Warren \u003cswarren@nvidia.com\u003e\n[swarren: wrote commit description]\n" }, { "commit": "5657d98deadb5e245bf5608cfb06e86898032125", "tree": "ae7ab1e33fe2168b040824917e414de1aa2012c5", "parents": [ "18b81fb733356025a6ad48b85092a0456e348ff0" ], "author": { "name": "Stephen Warren", "email": "swarren@nvidia.com", "time": "Tue Mar 27 11:37:47 2012 -0600" }, "committer": { "name": "Stephen Warren", "email": "swarren@nvidia.com", "time": "Wed Apr 25 15:22:01 2012 -0600" }, "message": "ARM: tegra: add AUXDATA required for audio\n\nBoth the Tegra30 I2S and AHUB modules used clocks, and hence currently\nrequire AUXDATA in order to get specific device names so that clock\nlookups work.\n\nSigned-off-by: Stephen Warren \u003cswarren@nvidia.com\u003e\nAcked-by: Olof Johansson \u003colof@lixom.net\u003e\n" }, { "commit": "18b81fb733356025a6ad48b85092a0456e348ff0", "tree": "98299e45e3fed504421c79f48e04661916a0f9db", "parents": [ "6437626928467e81aa4a3087d88cd3f443b3e9ec" ], "author": { "name": "Stephen Warren", "email": "swarren@nvidia.com", "time": "Mon Mar 26 16:49:39 2012 -0600" }, "committer": { "name": "Stephen Warren", "email": "swarren@nvidia.com", "time": "Wed Apr 25 15:22:01 2012 -0600" }, "message": "ARM: tegra: set up audio clocks for tegra30 dt\n\nSet up the audio clock tree for Tegra30 in an equivalent fashion to the\nexisting setup for Tegra20.\n\nSigned-off-by: Stephen Warren \u003cswarren@nvidia.com\u003e\nAcked-by: Olof Johansson \u003colof@lixom.net\u003e\n" }, { "commit": "6437626928467e81aa4a3087d88cd3f443b3e9ec", "tree": "84d9d899acb8241bc359df15eb2ed65e72523b5f", "parents": [ "8703612b0abb33e6daacc0f6b709a006ac85b285" ], "author": { "name": "Peter De Schrijver", "email": "pdeschrijver@nvidia.com", "time": "Mon Apr 23 01:31:49 2012 -0700" }, "committer": { "name": "Stephen Warren", "email": "swarren@nvidia.com", "time": "Wed Apr 25 15:22:01 2012 -0600" }, "message": "ARM: tegra: Initialize pll_p_out1\n\npll_a uses pll_p_out1 as its parent. Therefore this clock needs to be\ninitialized to make sure pll_a has a known input clock. Failure to do so\nwill cause the system to crash early in the bootup.\n\nSigned-off-by: Peter De Schrijver \u003cpdeschrijver@nvidia.com\u003e\nSigned-off-by: Stephen Warren \u003cswarren@nvidia.com\u003e\n" }, { "commit": "8703612b0abb33e6daacc0f6b709a006ac85b285", "tree": "a075094c69915e448081e9895df54faad7fd948e", "parents": [ "aef7704c6cc36db9618603b22194def441d30432" ], "author": { "name": "Stephen Warren", "email": "swarren@nvidia.com", "time": "Fri Mar 30 15:50:44 2012 -0600" }, "committer": { "name": "Stephen Warren", "email": "swarren@nvidia.com", "time": "Wed Apr 25 15:22:01 2012 -0600" }, "message": "ARM: tegra: provide clock aliases for AHUB configlink\n\nThe Tegra30 AHUB driver must call tegra_periph_reset_deassert() for all\ndevices on the AHUB\u0027s configlink bus. The AHUB driver must be able to\ncall clk_get_sys() to retrieve the clock parameter for this function.\nAdd the necessary clock aliases to allow this.\n\nSigned-off-by: Stephen Warren \u003cswarren@nvidia.com\u003e\nAcked-by: Olof Johansson \u003colof@lixom.net\u003e\n" }, { "commit": "bf03f65b7967df5807ddef7b99f8a41d4c94fc70", "tree": "558ae56db6ddedae03eee1bc569321d8ab571d0a", "parents": [ "7c77c8decfd14a611ddcba071782a9520e4bb3f8" ], "author": { "name": "Dan Williams", "email": "dan.j.williams@intel.com", "time": "Tue Apr 10 14:10:53 2012 -0700" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Wed Apr 18 15:07:53 2012 -0700" }, "message": "tegra, serial8250: add -\u003ehandle_break() uart_port op\n\nThe \"KT\" serial port has another use case for a \"received break\" quirk,\nso before adding another special case to the 8250 core take this\nopportunity to push such quirks out of the core and into a uart_port op.\n\nStephen says:\n\"If the callback function is to no longer live in 8250.c itself,\n arch/arm/mach-tegra/devices.c isn\u0027t logically a good place to put it,\n and that file will be going away once we get rid of all the board files\n and move solely to device tree.\"\n\n...so since 8250_pci.c houses all the quirks for pci serial devices this\nquirk is similarly housed in of_serial.c. Once the open firmware\nconversion completes the infrastructure details\n(include/linux/of_serial.h, and the export) can all be removed to make\nthis self contained to of_serial.c.\n\nCc: Nhan H Mai \u003cnhan.h.mai@intel.com\u003e\nCc: Colin Cross \u003cccross@android.com\u003e\nCc: Olof Johansson \u003colof@lixom.net\u003e\n[stephen: kill CONFIG_SERIAL_TEGRA in favor just using CONFIG_ARCH_TEGRA]\nCc: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\nAcked-by: Arnd Bergmann \u003carnd@arndb.de\u003e\nAcked-by: Sudhakar Mamillapalli \u003csudhakar@fb.com\u003e\nReported-by: Alan Cox \u003calan@lxorguk.ukuu.org.uk\u003e\nAcked-by: Alan Cox \u003calan@linux.intel.com\u003e\nSigned-off-by: Dan Williams \u003cdan.j.williams@intel.com\u003e\nAcked-by: Stephen Warren \u003cswarren@wwwdotorg.org\u003e\nTested-by: Stephen Warren \u003cswarren@wwwdotorg.org\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\n" }, { "commit": "52f48fe00fcad83cd5fc4c961d851a3530fe032b", "tree": "68fdb2a2580914f17b74374ad6b390027824c389", "parents": [ "ecc295bbab6b9d1baf0c0a8c2d5a945b201df547" ], "author": { "name": "Stephen Warren", "email": "swarren@nvidia.com", "time": "Wed Apr 11 12:53:09 2012 -0600" }, "committer": { "name": "Stephen Warren", "email": "swarren@nvidia.com", "time": "Wed Apr 18 10:26:40 2012 -0600" }, "message": "pinctrl: tegra: refactor probe handling\n\nRather than having a single tegra-pinctrl driver that determines whether\nit\u0027s running on Tegra20 or Tegra30, instead have separate drivers for\neach that call into utility functions to implement the majority of the\ndriver. This change is based on review feedback of the SPEAr pinctrl\ndriver, which had originally copied to Tegra driver structure.\n\nThis requires that the two drivers have unique names. Update a couple\nspots in arch/arm/mach-tegra for the name change.\n\nSigned-off-by: Stephen Warren \u003cswarren@nvidia.com\u003e\nAcked-by: Linus Walleij \u003clinus.walleij@linaro.org\u003e\n" }, { "commit": "ecc295bbab6b9d1baf0c0a8c2d5a945b201df547", "tree": "34a82901da6d66fe15578133a0de90830a658376", "parents": [ "e5cbeef0a4d450787169e29b610455b7d9392b7e" ], "author": { "name": "Stephen Warren", "email": "swarren@nvidia.com", "time": "Thu Mar 15 16:27:36 2012 -0600" }, "committer": { "name": "Stephen Warren", "email": "swarren@nvidia.com", "time": "Wed Apr 18 10:26:39 2012 -0600" }, "message": "ARM: dt: tegra20: add pinmux to device tree\n\nThis adds a complete pinmux configuration to all Tegra20 device tree\nfiles. This allows removal of board-dt-tegra20.c\u0027s use of the pinmux\nboard files, and the special device tree handling in board-pinmux.c.\n\nSigned-off-by: Stephen Warren \u003cswarren@nvidia.com\u003e\nAcked-by: Linus Walleij \u003clinus.walleij@linaro.org\u003e\nAcked-by: Olof Johansson \u003colof@lixom.net\u003e\n" }, { "commit": "b7449d95b0cbfb06b9ca9de8c322c470fbc2a873", "tree": "9b504551205137e869e035a6ddf8681c741ca6ad", "parents": [ "f30d12b3ffb321c9d29bd1588940704d9bed2643" ], "author": { "name": "Stephen Warren", "email": "swarren@nvidia.com", "time": "Thu Dec 15 14:23:34 2011 -0700" }, "committer": { "name": "Stephen Warren", "email": "swarren@nvidia.com", "time": "Wed Apr 18 10:26:39 2012 -0600" }, "message": "ARM: tegra: Remove pre-pinctrl pinmux driver\n\nThe pinctrl driver is now active and used by all boards. Remove the\nold pinmux driver.\n\nSigned-off-by: Stephen Warren \u003cswarren@nvidia.com\u003e\nAcked-by: Linus Walleij \u003clinus.walleij@linaro.org\u003e\nAcked-by: Olof Johansson \u003colof@lixom.net\u003e\n" }, { "commit": "f30d12b3ffb321c9d29bd1588940704d9bed2643", "tree": "0842183a866a3b45c1881210e423f4b8932b682b", "parents": [ "3e215d0a19c2a0c389bd9117573b6dd8e46f96a8" ], "author": { "name": "Stephen Warren", "email": "swarren@nvidia.com", "time": "Tue Dec 13 15:21:01 2011 -0700" }, "committer": { "name": "Stephen Warren", "email": "swarren@nvidia.com", "time": "Wed Apr 18 10:26:39 2012 -0600" }, "message": "ARM: tegra: Switch to new pinctrl driver\n\n* Rename old pinmux and new pinctrl platform driver and DT match table\n entries, so the new driver gets instantiated.\n* Re-write board-pinmux.c, so that it uses pinctrl APIs to configura the\n pinmux.\n* Re-write board-*-pinmux.c so that the pinmux configuration tables are\n in pinctrl format.\n\nVentana\u0027s pin mux table needed some edits on top of the basic format\nconversion, since some mux options that were previously marked as\nreserved are now valid in the new pinctrl driver. Attempting to use the\nold reserved names will result in a failure. Specifically, groups lpw0,\nlpw2, lsc1, lsck, and lsda were changed from function rsvd4 to displaya,\nand group pta was changed from function rsvd2 to hdmi.\n\nAll boards\u0027 pin mux tables needed some edits on top of the based format\nconversion, since function i2c was split into i2c1 (first general I2C\ncontroller) and i2cp (power I2C controller) to better align function\ndefinitions with HW blocks.\n\nDue to the split of mux tables into pure mux and pull/tristate tables,\nmany entries in the separate Seaboard/Ventana tables could be merged\ninto the common table, since the entries differed only in the portion\nin one of the tables, not both.\n\nMost pin groups allow configuration of mux, tri-state, and pull. However,\nsome don\u0027t allow pull configuration, which is instead configured by new\ngroups that only allow pull configuration. This is a reflection of the\ntrue HW capabilities, which weren\u0027t fully represented by the old pinmux\ndriver. This required adding new pull table entries for those new groups,\nand setting many other entries\u0027 pull configuration to\nTEGRA_PINCONFIG_DONT_SET.\n\nSigned-off-by: Stephen Warren \u003cswarren@nvidia.com\u003e\nAcked-by: Linus Walleij \u003clinus.walleij@linaro.org\u003e\nAcked-by: Olof Johansson \u003colof@lixom.net\u003e\n" }, { "commit": "3e215d0a19c2a0c389bd9117573b6dd8e46f96a8", "tree": "a45a82fc3e26459c8146cbe933229344cefa8b70", "parents": [ "c61b3da0aca4cccb1dca757eb94e443faba4e88f" ], "author": { "name": "Stephen Warren", "email": "swarren@nvidia.com", "time": "Sat Feb 18 01:04:55 2012 -0700" }, "committer": { "name": "Stephen Warren", "email": "swarren@nvidia.com", "time": "Wed Apr 18 10:26:38 2012 -0600" }, "message": "gpio: tegra: Hide tegra_gpio_enable/disable()\n\nRecent pinctrl discussions concluded that gpiolib APIs should in fact do\nwhatever is required to mux a GPIO onto pins, by calling pinctrl APIs if\nrequired. This change implements this for the Tegra GPIO driver, and removes\ncalls to the Tegra-specific APIs from drivers and board files.\n\nCc: Chris Ball \u003ccjb@laptop.org\u003e\nCc: linux-mmc@vger.kernel.org\nSigned-off-by: Stephen Warren \u003cswarren@nvidia.com\u003e\nAcked-by: Chris Ball \u003ccjb@laptop.org\u003e # for sdhci-tegra.c\nAcked-by: Linus Walleij \u003clinus.walleij@linaro.org\u003e\nAcked-by: Olof Johansson \u003colof@lixom.net\u003e\n" }, { "commit": "c61b3da0aca4cccb1dca757eb94e443faba4e88f", "tree": "acd4fd0fb674b377abe2b31270b885b0ea712a1f", "parents": [ "d941136fc6ead10a7ff319bad199869b593962c5" ], "author": { "name": "Stephen Warren", "email": "swarren@nvidia.com", "time": "Mon Mar 19 10:24:41 2012 -0600" }, "committer": { "name": "Stephen Warren", "email": "swarren@nvidia.com", "time": "Wed Apr 18 10:26:38 2012 -0600" }, "message": "ARM: tegra: seaboard: Don\u0027t gpio_request() ISL29018_IRQ\n\nDon\u0027t call gpio_request() or gpio_direction_input() for ISL29018_IRQ.\nThis pin is only used as an IRQ, and hence no GPIO configuration should\nbe necessary; the GPIO/IRQ driver should (and does) perform any required\nsetup when the IRQ is requested.\n\nSigned-off-by: Stephen Warren \u003cswarren@nvidia.com\u003e\nAcked-by: Olof Johansson \u003colof@lixom.net\u003e\n" }, { "commit": "4bee6417c9444ca62e67956dcbcf25fe20feb869", "tree": "edc3da3e40b78d7363e93344a3afc5bf3d5b2db2", "parents": [ "434103adea3f63f6550f4b2bd16653328f933a66" ], "author": { "name": "Stephen Warren", "email": "swarren@nvidia.com", "time": "Fri Mar 16 16:08:29 2012 -0600" }, "committer": { "name": "Stephen Warren", "email": "swarren@nvidia.com", "time": "Wed Apr 18 10:26:37 2012 -0600" }, "message": "ARM: tegra: Remove VBUS_GPIO handling from board files\n\nInstead of having board files manually request and initialize USB VBUS\nGPIOs, fill in the USB driver\u0027s platform data and have it do it.\n\nSigned-off-by: Stephen Warren \u003cswarren@nvidia.com\u003e\nAcked-by: Olof Johansson \u003colof@lixom.net\u003e\n" }, { "commit": "434103adea3f63f6550f4b2bd16653328f933a66", "tree": "1d7d4b3fea9b3b866841e51ed848e6d52547ddf4", "parents": [ "dcb5dbc305b975cccf40942feba40964069541d3" ], "author": { "name": "Stephen Warren", "email": "swarren@nvidia.com", "time": "Fri Mar 16 16:06:07 2012 -0600" }, "committer": { "name": "Stephen Warren", "email": "swarren@nvidia.com", "time": "Wed Apr 18 10:26:37 2012 -0600" }, "message": "usb: ehci-tegra: Add vbus_gpio to platform data\n\nAdd a vbus_gpio field to platform data. This mirrors the device tree\nproperty nvidia,vbus-gpio. This makes the VBUS GPIO handling identical\nbetween booting with board files and device tree; the driver always does\nit.\n\nThis removes the need for board files to request and initialize the GPIO\nearly during their boot process, perhaps even before the GPIO driver is\nready to process the request.\n\nCc: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\nCc: Alan Stern \u003cstern@rowland.harvard.edu\u003e\nCc: linux-usb@vger.kernel.org\nSigned-off-by: Stephen Warren \u003cswarren@nvidia.com\u003e\nAcked-by: Olof Johansson \u003colof@lixom.net\u003e\n" }, { "commit": "65e8d272ba483dac3b5f724e938dda099e49a7e1", "tree": "3ee13387554e32368d4a242e2e617b59e924cc20", "parents": [ "eb75bb7a0e0ed6077ea45f2692526283e1087737" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Fri Mar 02 12:25:37 2012 +0000" }, "committer": { "name": "Stephen Warren", "email": "swarren@nvidia.com", "time": "Mon Apr 16 12:41:24 2012 -0600" }, "message": "ARM: tegra: do not hide dma declarations\n\nThe declarations are actually required for the device\ndefinitions, and are still valid even if the dma controller\nis disabled:\n\narch/arm/mach-tegra/devices.c:559:12: error: \u0027TEGRA_DMA_REQ_SEL_I2S_1\u0027 undeclared here (not in a function)\narch/arm/mach-tegra/devices.c:577:12: error: \u0027TEGRA_DMA_REQ_SEL_I2S2_1\u0027 undeclared here (not in a function)\n\nSigned-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\nSigned-off-by: Alan Ott \u003calan@signal11.us\u003e\nSigned-off-by: Stephen Warren \u003cswarren@nvidia.com\u003e\n" }, { "commit": "eb75bb7a0e0ed6077ea45f2692526283e1087737", "tree": "b3df6ef832e4f162f7a8022c99e19990508003ae", "parents": [ "0034102808e0dbbf3a2394b82b1bb40b5778de9e" ], "author": { "name": "Danny Kukawka", "email": "danny.kukawka@bisect.de", "time": "Thu Feb 16 04:44:31 2012 +0000" }, "committer": { "name": "Stephen Warren", "email": "swarren@nvidia.com", "time": "Mon Apr 16 12:40:19 2012 -0600" }, "message": "ARM: tegra: fix multiple asm/hardware/gic.h inclusion\n\narch/arm/mach-tegra/board-dt-tegra20.c: included \u0027asm/hardware/gic.h\u0027\ntwice remove the duplicates.\n\nSigned-off-by: Danny Kukawka \u003cdanny.kukawka@bisect.de\u003e\n[swarren: rewrote commit subject]\nSigned-off-by: Stephen Warren \u003cswarren@nvidia.com\u003e\n" }, { "commit": "80881dae52d05d3d6c920624157d68006390f01e", "tree": "513fcf053618f5ef83908e24c1a33d5efb2f75d6", "parents": [ "0034102808e0dbbf3a2394b82b1bb40b5778de9e" ], "author": { "name": "Stephen Warren", "email": "swarren@nvidia.com", "time": "Mon Mar 26 12:49:57 2012 -0600" }, "committer": { "name": "Stephen Warren", "email": "swarren@nvidia.com", "time": "Tue Apr 10 13:41:36 2012 -0600" }, "message": "ARM: tegra: uncompress.h: Implement TEGRA_DEBUG_UART_AUTO_ODMDATA\n\nTegra has 5 UARTS which could be used for low-level debug output. Commit\nfe26398 \"ARM: tegra: uncompress.h: Choose a UART at runtime\" implemented\none method for the kernel to automatically determine which of these to\nuse at run-time, so that the same DEBUG_LL-enabled kernel image could be\nused across multiple Tegra boards. The required bootloader-side setup for\nthat option is implemented in NVIDIA\u0027s various downstream U-Boot branches,\nbut the U-Boot maintainers have refused to accept it upstream.\n\nThis change implements an alternative automatic UART selection option\nusing ODMDATA. This is a 32-bit value programmed into Tegra\u0027s boot memory\nwhich provides a few pieces of basic board-specific information, including\na field that indicates the console UART. Setting up this value is part of\nthe standard Tegra boot architecture, and so requires no Tegra-specific\nhacks in the bootloader\u0027s UART driver.\n\nNote that in theory, the format of ODMDATA is board-specific. However, in\npractice all boards use the same location/size/values for the UART field.\nODMDATA[19:18] (which drive the type of debug console) is more problematic,\nsince some boards use value 2 for UART and others use 3. This patch just\naccepts either value; if this doesn\u0027t work well for a given board, I\u0027d\nsuggest simply not enabling this debug option when building for that board.\n\nNote that the kernel assumes the bootloader has already set up any required\npinmux settings for the UART; there is no way the kernel can do this for\nitself prior to knowing which board it\u0027s running on. In practice, people\nusing this feature are highly likely to be using bootloaders that have\nindeed configured the pinmux. This assumption existed prior to this patch.\n\nSigned-off-by: Stephen Warren \u003cswarren@nvidia.com\u003e\n" }, { "commit": "896637ac1be95a239b68dbe61c12a8a9bc00a9a3", "tree": "bd6bfa8f1ecb71d1307634354eb6e674576abd93", "parents": [ "ef280d3907cea21b6093802398bbe4193e221a64" ], "author": { "name": "Stephen Warren", "email": "swarren@nvidia.com", "time": "Fri Apr 06 10:30:52 2012 -0600" }, "committer": { "name": "Mark Brown", "email": "broonie@opensource.wolfsonmicro.com", "time": "Fri Apr 06 17:36:15 2012 +0100" }, "message": "ASoC: tegra: complete Tegra-\u003eTegra20 renaming\n\nRename Tegra20-specific Kconfig variables, module filenames, all internal\nsymbol names, clocks, and platform devices, to reflect the fact the DAS\nand I2S drivers are for a specific HW version.\n\nSigned-off-by: Stephen Warren \u003cswarren@nvidia.com\u003e\nSigned-off-by: Mark Brown \u003cbroonie@opensource.wolfsonmicro.com\u003e\n" }, { "commit": "ff9062c60e4b8e01980b1a81dcabe3965f71df77", "tree": "21cd3e66bd84d03a6101146125f8f488ad3bf210", "parents": [ "518de86ba106185212ec30fea501be024a12f5db" ], "author": { "name": "Stephen Warren", "email": "swarren@wwwdotorg.org", "time": "Tue Mar 20 14:55:50 2012 -0600" }, "committer": { "name": "Mark Brown", "email": "broonie@opensource.wolfsonmicro.com", "time": "Sun Apr 01 11:28:29 2012 +0100" }, "message": "ARM: tegra: remove tegra_pcm_device\n\ntegra_pcm_device is no longer needed now that the Tegra ASoC code has\ncleaned up its \u0027platform\u0027 registration. Remove it.\n\nSigned-off-by: Stephen Warren \u003cswarren@wwwdotorg.org\u003e\nSigned-off-by: Mark Brown \u003cbroonie@opensource.wolfsonmicro.com\u003e\n" }, { "commit": "4bde23f8751f388867766b0a62ed1ef8b7e01561", "tree": "9ad3d165483fda3349c2bf0195406eebaa7af5ce", "parents": [ "e152c38abaa92352679c9b53c4cce533c03997c6", "f00e9b11863abdb837e555a2b1e3417e8b5d80dd" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 29 21:30:28 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 29 21:30:28 2012 -0700" }, "message": "Merge tag \u0027fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc\n\nPull arm-soc fixes from Olof Johansson:\n \"This is a first pass of some of the merge window fallout for ARM\n platforms.\n\n Nothing controversial:\n - A system.h fallout fix for OMAP\n - PXA fixes for breakage caused by the regulator struct changes\n - GPIO fixes for OMAP to properly deal with dynamic IRQ allocation\n - A mismerge in our arm-soc tree of an lpc32xx change for networking\n - A fix for USB setup on tegra\n - An undo of __init annotation of display mux setup on OMAP that\u0027s\n needed at runtime\"\n\n* tag \u0027fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:\n ARM: pxa: fix build issue on stargate2\n ARM: pxa: fix build issue on cm-x300\n ARM: pxa: fix build failure for regulator consumer in em-x270.c\n ARM: LPC32xx: clock.c: Fix lpc-eth clock reference\n ARM: OMAP: pm: fix compilation break\n ARM: OMAP: Remove OMAP_GPIO_IRQ macro definition\n drivers: input: Fix OMAP_GPIO_IRQ with gpio_to_irq() in ams_delta_serio_exit()\n ARM: OMAP: boards: Fix OMAP_GPIO_IRQ usage with gpio_to_irq()\n ARM: pxa: fix regulator related build fail in magician_defconfig\n ARM: tegra: Fix device tree AUXDATA for USB/EHCI\n ARM: OMAP2+: Remove __init from DSI mux functions\n" }, { "commit": "820d41cf0cd0e94a5661e093821e2e5c6b36a9d8", "tree": "4d03046048dc52a8fa539c7e7b846e02738d8ca5", "parents": [ "6268b325c3066234e7bddb99d2b98bcedb0c0033", "88b48684fe2d4f6207223423227c80d5408bccaf" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 29 18:02:10 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 29 18:02:10 2012 -0700" }, "message": "Merge tag \u0027cleanup2\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc\n\nPull \"ARM: cleanups of io includes\" from Olof Johansson:\n \"Rob Herring has done a sweeping change cleaning up all of the\n mach/io.h includes, moving some of the oft-repeated macros to a common\n location and removing a bunch of boiler plate. This is another step\n closer to a common zImage for multiple platforms.\"\n\nFix up various fairly trivial conflicts (\u003cmach/io.h\u003e removal vs changes\naround it, tegra localtimer.o is *still* gone, yadda-yadda).\n\n* tag \u0027cleanup2\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (29 commits)\n ARM: tegra: Include assembler.h in sleep.S to fix build break\n ARM: pxa: use common IOMEM definition\n ARM: dma-mapping: convert ARCH_HAS_DMA_SET_COHERENT_MASK to kconfig symbol\n ARM: __io abuse cleanup\n ARM: create a common IOMEM definition\n ARM: iop13xx: fix missing declaration of iop13xx_init_early\n ARM: fix ioremap/iounmap for !CONFIG_MMU\n ARM: kill off __mem_pci\n ARM: remove bunch of now unused mach/io.h files\n ARM: make mach/io.h include optional\n ARM: clps711x: remove unneeded include of mach/io.h\n ARM: dove: add explicit include of dove.h to addr-map.c\n ARM: at91: add explicit include of hardware.h to uncompressor\n ARM: ep93xx: clean-up mach/io.h\n ARM: tegra: clean-up mach/io.h\n ARM: orion5x: clean-up mach/io.h\n ARM: davinci: remove unneeded mach/io.h include\n [media] davinci: remove includes of mach/io.h\n ARM: OMAP: Remove remaining includes for mach/io.h\n ARM: msm: clean-up mach/io.h\n ...\n" }, { "commit": "a99ab88815aec12bd257e121dee06003e2401a68", "tree": "89535cf82f33e2041af34433b8f2aa7f704ffa36", "parents": [ "714daf73d0889c62e90abf4510e4fab65b4668e8", "8c3ec84102d171a24f050a086bfc546e9de93f9f" ], "author": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Thu Mar 29 10:59:20 2012 -0700" }, "committer": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Thu Mar 29 11:00:56 2012 -0700" }, "message": "Merge branch \u0027for-3.4/fixes-for-rc1-and-v3.3\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra into fixes\n\n* \u0027for-3.4/fixes-for-rc1-and-v3.3\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra:\n ARM: tegra: Fix device tree AUXDATA for USB/EHCI\n" }, { "commit": "0195c00244dc2e9f522475868fa278c473ba7339", "tree": "f97ca98ae64ede2c33ad3de05ed7bbfa4f4495ed", "parents": [ "f21ce8f8447c8be8847dadcfdbcc76b0d7365fa5", "141124c02059eee9dbc5c86ea797b1ca888e77f7" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 28 15:58:21 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 28 15:58:21 2012 -0700" }, "message": "Merge tag \u0027split-asm_system_h-for-linus-20120328\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-asm_system\n\nPull \"Disintegrate and delete asm/system.h\" from David Howells:\n \"Here are a bunch of patches to disintegrate asm/system.h into a set of\n separate bits to relieve the problem of circular inclusion\n dependencies.\n\n I\u0027ve built all the working defconfigs from all the arches that I can\n and made sure that they don\u0027t break.\n\n The reason for these patches is that I recently encountered a circular\n dependency problem that came about when I produced some patches to\n optimise get_order() by rewriting it to use ilog2().\n\n This uses bitops - and on the SH arch asm/bitops.h drags in\n asm-generic/get_order.h by a circuituous route involving asm/system.h.\n\n The main difficulty seems to be asm/system.h. It holds a number of\n low level bits with no/few dependencies that are commonly used (eg.\n memory barriers) and a number of bits with more dependencies that\n aren\u0027t used in many places (eg. switch_to()).\n\n These patches break asm/system.h up into the following core pieces:\n\n (1) asm/barrier.h\n\n Move memory barriers here. This already done for MIPS and Alpha.\n\n (2) asm/switch_to.h\n\n Move switch_to() and related stuff here.\n\n (3) asm/exec.h\n\n Move arch_align_stack() here. Other process execution related bits\n could perhaps go here from asm/processor.h.\n\n (4) asm/cmpxchg.h\n\n Move xchg() and cmpxchg() here as they\u0027re full word atomic ops and\n frequently used by atomic_xchg() and atomic_cmpxchg().\n\n (5) asm/bug.h\n\n Move die() and related bits.\n\n (6) asm/auxvec.h\n\n Move AT_VECTOR_SIZE_ARCH here.\n\n Other arch headers are created as needed on a per-arch basis.\"\n\nFixed up some conflicts from other header file cleanups and moving code\naround that has happened in the meantime, so David\u0027s testing is somewhat\nweakened by that. We\u0027ll find out anything that got broken and fix it..\n\n* tag \u0027split-asm_system_h-for-linus-20120328\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-asm_system: (38 commits)\n Delete all instances of asm/system.h\n Remove all #inclusions of asm/system.h\n Add #includes needed to permit the removal of asm/system.h\n Move all declarations of free_initmem() to linux/mm.h\n Disintegrate asm/system.h for OpenRISC\n Split arch_align_stack() out from asm-generic/system.h\n Split the switch_to() wrapper out of asm-generic/system.h\n Move the asm-generic/system.h xchg() implementation to asm-generic/cmpxchg.h\n Create asm-generic/barrier.h\n Make asm-generic/cmpxchg.h #include asm-generic/cmpxchg-local.h\n Disintegrate asm/system.h for Xtensa\n Disintegrate asm/system.h for Unicore32 [based on ver #3, changed by gxt]\n Disintegrate asm/system.h for Tile\n Disintegrate asm/system.h for Sparc\n Disintegrate asm/system.h for SH\n Disintegrate asm/system.h for Score\n Disintegrate asm/system.h for S390\n Disintegrate asm/system.h for PowerPC\n Disintegrate asm/system.h for PA-RISC\n Disintegrate asm/system.h for MN10300\n ...\n" }, { "commit": "4bb2d1009f671815870e8f78e826e4f9071392a7", "tree": "4b9f4e3b349a67d47b11eff7fcebbf57a3c40a1e", "parents": [ "ff877c498eb2f9c4ea386270642e383bc867f63c", "83fe628e16d84efc8df2731bc403eae4e4f53801" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 28 12:24:40 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 28 12:24:40 2012 -0700" }, "message": "Merge tag \u0027soc2\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc\n\nPull \"ARM: More SoC support updates\" from Olof Johansson:\n \"This branch contains a handful of updates of SoC base code that had\n dependencies on other external trees that have now been merged:\n\n * Support for the new EXYNOS5250 SoC from Samsung\n * SMP and power domain support for Tegra3 from NVIDIA\n * ux500 updates for exporting SoC information through sysfs\"\n\nFix up trivial merge conflicts as per Olof.\n\n* tag \u0027soc2\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (30 commits)\n ARM: mach-shmobile: ap4evb: Reserve DMA memory for the frame buffer\n ARM: EXYNOS: Fix compilation error with mach-exynos4-dt board\n ARM: dts: add initial dts file for EXYNOS5250, SMDK5250\n ARM: EXYNOS: add support device tree enabled board file for EXYNOS5\n ARM: EXYNOS: add support ARCH_EXYNOS5 for EXYNOS5 SoCs\n ARM: EXYNOS: add support get_core_count() for EXYNOS5250\n ARM: EXYNOS: support EINT for EXYNOS4 and EXYNOS5\n ARM: EXYNOS: add interrupt definitions for EXYNOS5250\n ARM: EXYNOS: add support for EXYNOS5250 SoC\n ARM: EXYNOS: add support uart for EXYNOS4 and EXYNOS5\n ARM: EXYNOS: add initial setup-i2c0 for EXYNOS5\n ARM: EXYNOS: add clock part for EXYNOS5250 SoC\n ARM: EXYNOS: use exynos_init_uarts() instead of exynos4_init_uarts()\n ARM: EXYNOS: to declare static for mach-exynos/common.c\n ARM: EXYNOS: Add clkdev lookup entry for lcd clock\n ARM: dt: Explicitly configure all serial ports on Tegra Cardhu\n ARM: tegra: support for secondary cores on Tegra30\n ARM: tegra: support for Tegra30 CPU powerdomains\n ARM: tegra: add support for Tegra30 powerdomains\n ARM: tegra: export tegra_powergate_is_powered()\n ...\n" }, { "commit": "9f97da78bf018206fb623cd351d454af2f105fe0", "tree": "509971bf0d93f56d7ad182bdad3c89886f7ce675", "parents": [ "15d07dc9c59eae51219c40253bdf920f62bb10f2" ], "author": { "name": "David Howells", "email": "dhowells@redhat.com", "time": "Wed Mar 28 18:30:01 2012 +0100" }, "committer": { "name": "David Howells", "email": "dhowells@redhat.com", "time": "Wed Mar 28 18:30:01 2012 +0100" }, "message": "Disintegrate asm/system.h for ARM\n\nDisintegrate asm/system.h for ARM.\n\nSigned-off-by: David Howells \u003cdhowells@redhat.com\u003e\ncc: Russell King \u003clinux@arm.linux.org.uk\u003e\ncc: linux-arm-kernel@lists.infradead.org\n" }, { "commit": "15d07dc9c59eae51219c40253bdf920f62bb10f2", "tree": "d830b428bf55526b1ab80139f6b4c24d4b38d627", "parents": [ "ec2212088c42ff7d1362629ec26dda4f3e8bdad3" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Wed Mar 28 18:30:01 2012 +0100" }, "committer": { "name": "David Howells", "email": "dhowells@redhat.com", "time": "Wed Mar 28 18:30:01 2012 +0100" }, "message": "ARM: move CP15 definitions to separate header file\n\nAvoid namespace conflicts with drivers over the CP15 definitions by\nmoving CP15 related prototypes and definitions to a private header\nfile.\n\nAcked-by: Stephen Warren \u003cswarren@nvidia.com\u003e\nTested-by: Stephen Warren \u003cswarren@nvidia.com\u003e [Tegra]\nAcked-by: H Hartley Sweeten \u003chsweeten@visionengravers.com\u003e\nTested-by: H Hartley Sweeten \u003chsweeten@visionengravers.com\u003e [EP93xx]\nAcked-by: Nicolas Pitre \u003cnico@linaro.org\u003e\nAcked-by: Kukjin Kim \u003ckgene.kim@samsung.com\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\nSigned-off-by: David Howells \u003cdhowells@redhat.com\u003e\n" }, { "commit": "88b48684fe2d4f6207223423227c80d5408bccaf", "tree": "856e9ce9f7b1ec5d94569925ac78c38daef71317", "parents": [ "b521d929b330d665cb3a42b26eaaa5690dc9dad7", "7175f80ba38a6b056508c4eadaab829593abbf2b" ], "author": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Tue Mar 27 17:20:21 2012 -0700" }, "committer": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Tue Mar 27 17:25:45 2012 -0700" }, "message": "Merge branch \u0027for-3.4/fixes-for-io-cleanup\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra into next/cleanup2\n\n* \u0027for-3.4/fixes-for-io-cleanup\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra:\n ARM: tegra: Include assembler.h in sleep.S to fix build break\n" }, { "commit": "b521d929b330d665cb3a42b26eaaa5690dc9dad7", "tree": "7c1ddf1c06922c4728b6625fb10cf11de5a29387", "parents": [ "83b5938ce77bbbd9a04e5270ef2b3f17921bf0d4", "d405e4b07a15b9d24d504a459295cf00a618c10c" ], "author": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Tue Mar 27 17:19:15 2012 -0700" }, "committer": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Tue Mar 27 17:19:15 2012 -0700" }, "message": "Merge branch \u0027tegra/soc\u0027 into next/cleanup2\n\nConflicts:\n\tarch/arm/mach-tegra/Makefile\n\nSigned-off-by: Olof Johansson \u003colof@lixom.net\u003e\n" }, { "commit": "34800598b2eebe061445216473b1e4c2ff5cba99", "tree": "a6d0eb6fe45d9480888d7ddb34840e172ed80e56", "parents": [ "46b407ca4a6149c8d27fcec1881d4f184bec7c77", "511f1cb6d426938fabf9c6d69ce4861b66ffd919" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Mar 27 16:41:24 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Mar 27 16:41:24 2012 -0700" }, "message": "Merge tag \u0027drivers\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc\n\nPull \"ARM: driver specific updates\" from Arnd Bergmann:\n \"These are all specific to some driver. They are typically the\n platform side of a change in the drivers directory, such as adding a\n new driver or extending the interface to the platform. In cases where\n there is no maintainer for the driver, or the maintainer prefers to\n have the platform changes in the same branch as the driver changes,\n the patches to the drivers are included as well.\n\n A much smaller set of driver updates that depend on other branches\n getting merged first will be sent later.\n\n The new export of tegra_chip_uid conflicts with other changes in\n fuse.c. In rtc-sa1100.c, the global removal of IRQF_DISABLED\n conflicts with the cleanup of the interrupt handling of that driver.\n\n Signed-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\"\n\nFixed up aforementioned trivial conflicts.\n\n* tag \u0027drivers\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (94 commits)\n ARM: SAMSUNG: change the name from s3c-sdhci to exynos4-sdhci\n mmc: sdhci-s3c: add platform data for the second capability\n ARM: SAMSUNG: support the second capability for samsung-soc\n ARM: EXYNOS: add support DMA for EXYNOS4X12 SoC\n ARM: EXYNOS: Add apb_pclk clkdev entry for mdma1\n ARM: EXYNOS: Enable MDMA driver\n regulator: Remove bq24022 regulator driver\n rtc: sa1100: add OF support\n pxa: magician/hx4700: Convert to gpio-regulator from bq24022\n ARM: OMAP3+: SmartReflex: fix error handling\n ARM: OMAP3+: SmartReflex: fix the use of debugfs_create_* API\n ARM: OMAP3+: SmartReflex: micro-optimization for sanity check\n ARM: OMAP3+: SmartReflex: misc cleanups\n ARM: OMAP3+: SmartReflex: move late_initcall() closer to its argument\n ARM: OMAP3+: SmartReflex: add missing platform_set_drvdata()\n ARM: OMAP3+: hwmod: add SmartReflex IRQs\n ARM: OMAP3+: SmartReflex: clear ERRCONFIG_VPBOUNDINTST only on a need\n ARM: OMAP3+: SmartReflex: Fix status masking in ERRCONFIG register\n ARM: OMAP3+: SmartReflex: Add a shutdown hook\n ARM: OMAP3+: SmartReflex Class3: disable errorgen before disable VP\n ...\n\nConflicts:\n\tarch/arm/mach-tegra/Makefile\n\tarch/arm/mach-tegra/fuse.c\n\tdrivers/rtc/rtc-sa1100.c\n" }, { "commit": "1bfecd935849a45b6b47d9f011e1c278ff880512", "tree": "23c08a9c103c92e5a4a4cd3311823426c9d2bdf9", "parents": [ "281b05392fc2cb26209b4d85abaf4889ab1991f3", "a754a87ce8b17024358c1be8ee0232ef09a7055f" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Mar 27 16:27:28 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Mar 27 16:27:28 2012 -0700" }, "message": "Merge tag \u0027boards\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc\n\nPull \"ARM: board specific updates\" from Arnd Bergmann/Olof Johansson:\n \"These changes are all specific to one board only. We\u0027re trying to\n keep the number of board files low, but generally board level updates\n are ok on platforms that are working on moving towards DT based\n probing, which will eventually lead to removing them.\n\n The board-ams-delta.c board file gets a conflict between the removal\n of ams_delta_config and the addition of a lot of other data. The\n Kconfig file has two changes in the same line, and in exynos, the\n power domain cleanup conflicts with the addition of the image sensor\n device.\n\n Signed-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\n [olof: Amended a fix for a mismerge to board-omap4panda.c]\n Signed-off-by: Olof Johansson \u003colof@lixom.net\u003e\"\n\nFixed up some fairly trivial conflicts manually.\n\n* tag \u0027boards\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (82 commits)\n i.MX35-PDK: Add Camera support\n ARM : mx35: 3ds-board: add framebuffer device\n pxa/hx4700: Remove pcmcia platform_device structure\n ARM: pxa/hx4700: Reduce sleep mode battery discharge by 35%\n ARM: pxa/hx4700: Remove unwanted request for GPIO105\n ARM: EXYNOS: support Exynos4210-bus Devfreq driver on Nuri board\n ARM: EXYNOS: Register JPEG on nuri\n ARM: EXYNOS: Register JPEG on universal_c210\n ARM: S5PV210: Enable JPEG on SMDKV210\n ARM: S5PV210: Add JPEG board definition\n ARM: EXYNOS: Enable JPEG on Origen\n ARM: EXYNOS: Enable JPEG on SMDKV310\n ARM: EXYNOS: Add __init attribute to universal_camera_init()\n ARM: EXYNOS: Add __init attribute to nuri_camera_init()\n ARM: S5PV210: Enable FIMC on SMDKC110\n ARM: S5PV210: Enable FIMC on SMDKV210\n ARM: S5PV210: Enable MFC on SMDKC110\n ARM: S5PV210: Enable MFC on SMDKV210\n ARM: EXYNOS: Enable G2D on SMDKV310\n ARM: tegra: update defconfig\n ...\n" }, { "commit": "281b05392fc2cb26209b4d85abaf4889ab1991f3", "tree": "bbf5000ce7bd739b1ca85e9918741e285d267c7c", "parents": [ "48d554418d3bfbba5e9dc1ebdf352f1b1f3ff4ee", "bde755679a3ba5af0d16231f8532e8373c5e2ecc" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Mar 27 16:14:44 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Mar 27 16:14:44 2012 -0700" }, "message": "Merge tag \u0027soc\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc\n\nPull \"ARM: SoC specific updates\" from Arnd Bergmann:\n \"These changes are all specific to an soc family or the code for one\n soc. Lots of work for Tegra3 this time, but also a lot of other\n platforms. There will be another (smaller) set of soc patches later\n in the merge window for stuff that has dependencies on external trees\n or that was sent just before the merge window opened.\n\n The asoc tree added a few devices to the i.mx platform, which conflict\n with other devices added in the same place here.\n\n The tegra Makefile conflicts between a number of branches, mostly\n because of changes regarding localtimer.c, which was removed in the\n end.\n\n Signed-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\"\n\nFix up some trivial conflicts, including the mentioned Tegra Makefile.\n\n* tag \u0027soc\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (51 commits)\n ARM: EXYNOS: fix cycle count for periodic mode of clock event timers\n ARM: EXYNOS: add support JPEG\n ARM: EXYNOS: Add DMC1, allow PPMU access for DMC\n ARM: SAMSUNG: Correct MIPI-CSIS io memory resource definition\n ARM: SAMSUNG: fix __init attribute on regarding s3c_set_platdata()\n ARM: SAMSUNG: Add __init attribute to samsung_bl_set()\n ARM: S5PV210: Add usb otg phy control\n ARM: S3C64XX: Add usb otg phy control\n ARM: EXYNOS: Enable l2 configuration through device tree\n ARM: EXYNOS: remove useless code to save/restore L2\n ARM: EXYNOS: save L2 settings during bootup\n ARM: S5P: add L2 early resume code\n ARM: EXYNOS: Add support AFTR mode on EXYNOS4210\n ARM: mx35: Setup the AIPS registers\n ARM: mx5: Use common function for configuring AIPS\n ARM: mx3: Setup AIPS registers\n ARM: mx3: Let mx31 and mx35 enter in LPM mode in WFI\n ARM: defconfig: imx_v6_v7: build in REGULATOR_FIXED_VOLTAGE\n ARM: imx: update imx_v6_v7_defconfig\n ARM: tegra: Demote EMC clock inconsistency BUG to WARN\n ...\n" }, { "commit": "48d554418d3bfbba5e9dc1ebdf352f1b1f3ff4ee", "tree": "696bdc0c1087e82c6493c852bca514bb0fcd7881", "parents": [ "d61b7a572b292e2be409e13b4b3adf475f18fb29", "2cbe23e3a432e3d09a849adb197c8fcc09e7391d" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Mar 27 16:06:17 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Mar 27 16:06:17 2012 -0700" }, "message": "Merge tag \u0027timer\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc\n\nPull \"ARM: timer cleanup work\" from Arnd Bergmann:\n \"These are split out from the generic soc and driver updates because\n there was a lot of conflicting work by multiple people. Marc Zyngier\n worked on simplifying the \"localtimer\" interfaces, and some of the\n platforms are touching the same code as they move to device tree based\n booting.\n\n Signed-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\"\n\n* tag \u0027timer\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (61 commits)\n ARM: tegra: select USB_ULPI if USB is selected\n arm/tegra: pcie: fix return value of function\n ARM: ux500: fix compilation after local timer rework\n ARM: shmobile: remove additional __io() macro use\n ARM: local timers: make the runtime registration interface mandatory\n ARM: local timers: convert MSM to runtime registration interface\n ARM: local timers: convert exynos to runtime registration interface\n ARM: smp_twd: remove old local timer interface\n ARM: imx6q: convert to twd_local_timer_register() interface\n ARM: highbank: convert to twd_local_timer_register() interface\n ARM: ux500: convert to twd_local_timer_register() interface\n ARM: shmobile: convert to twd_local_timer_register() interface\n ARM: tegra: convert to twd_local_timer_register() interface\n ARM: plat-versatile: convert to twd_local_timer_register() interface\n ARM: OMAP4: convert to twd_local_timer_register() interface\n ARM: smp_twd: add device tree support\n ARM: smp_twd: add runtime registration support\n ARM: local timers: introduce a new registration interface\n ARM: smp_twd: make local_timer_stop a symbol instead of a #define\n ARM: mach-shmobile: default to no earlytimer\n ...\n" }, { "commit": "d61b7a572b292e2be409e13b4b3adf475f18fb29", "tree": "e9d30390860147136c05e66abf1edda1bc5b0562", "parents": [ "18d9946bc7e2252fe3c0f2f609ac383c627edefd", "f4e2467bad53023589cbff18dd1ab6e0aa3f004c" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Mar 27 16:03:32 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Mar 27 16:03:32 2012 -0700" }, "message": "Merge tag \u0027cleanup\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc\n\nPull \"ARM: global cleanups\" from Arnd Bergmann:\n \"Quite a bit of code gets removed, and some stuff moved around, mostly\n the old samsung s3c24xx stuff. There should be no functional changes\n in this series otherwise. Some cleanups have dependencies on other\n arm-soc branches and will be sent in the second round.\n\n Signed-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\"\n\nFixed up trivial conflicts mainly due to #include\u0027s being changes on\nboth sides.\n\n* tag \u0027cleanup\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (121 commits)\n ep93xx: Remove unnecessary includes of ep93xx-regs.h\n ep93xx: Move EP93XX_SYSCON defines to SoC private header\n ep93xx: Move crunch code to mach-ep93xx directory\n ep93xx: Make syscon access functions private to SoC\n ep93xx: Configure GPIO ports in core code\n ep93xx: Move peripheral defines to local SoC header\n ep93xx: Convert the watchdog driver into a platform device.\n ep93xx: Use ioremap for backlight driver\n ep93xx: Move GPIO defines to gpio-ep93xx.h\n ep93xx: Don\u0027t use system controller defines in audio drivers\n ep93xx: Move PHYS_BASE defines to local SoC header file\n ARM: EXYNOS: Add clock register addresses for EXYNOS4X12 bus devfreq driver\n ARM: EXYNOS: add clock registers for exynos4x12-cpufreq\n PM / devfreq: update the name of EXYNOS clock registers that were omitted\n PM / devfreq: update the name of EXYNOS clock register\n ARM: EXYNOS: change the prefix S5P_ to EXYNOS4_ for clock\n ARM: EXYNOS: use static declaration on regarding clock\n ARM: EXYNOS: replace clock.c for other new EXYNOS SoCs\n ARM: OMAP2+: Fix build error after merge\n ARM: S3C24XX: remove call to s3c24xx_setup_clocks\n ...\n" }, { "commit": "7175f80ba38a6b056508c4eadaab829593abbf2b", "tree": "8b91b504c13f57ee95c7e58b19aafd86125ecdc0", "parents": [ "1ad105fc77e61f9dd7a272659a248e2979fdb893" ], "author": { "name": "Stephen Warren", "email": "swarren@wwwdotorg.org", "time": "Mon Mar 19 09:55:12 2012 -0600" }, "committer": { "name": "Stephen Warren", "email": "swarren@wwwdotorg.org", "time": "Mon Mar 26 09:55:22 2012 -0600" }, "message": "ARM: tegra: Include assembler.h in sleep.S to fix build break\n\nCommit 6f6f6a7 \"ARM: create a common IOMEM definition\" moved macro\nIOMEM(), and requires users to include \u003casm/assembler.h\u003e. Fix Tegra\u0027s\nsleep.S to do so. This fixes:\n\narch/arm/mach-tegra/sleep.S: Assembler messages:\narch/arm/mach-tegra/sleep.S:77: Error: missing \u0027)\u0027\narch/arm/mach-tegra/sleep.S:77: Error: garbage following instruction\n -- `movw r0,#:lower16:(0x60007000-0x60000000+IOMEM(0xFE200000))\u0027\n\nNote: This only shows up after 0a25893 \"ARM: tegra: update defconfig\"\n\nSigned-off-by: Stephen Warren \u003cswarren@wwwdotorg.org\u003e\n" }, { "commit": "1ad105fc77e61f9dd7a272659a248e2979fdb893", "tree": "b8f0c64314e05c9208501d9aba89cc5abb57234e", "parents": [ "2bc856c419d9941589ff210900a60906d773f1c4", "e186ad74c0941f5caeda28bde76dab903b342c1c" ], "author": { "name": "Stephen Warren", "email": "swarren@wwwdotorg.org", "time": "Mon Mar 26 09:49:22 2012 -0600" }, "committer": { "name": "Stephen Warren", "email": "swarren@wwwdotorg.org", "time": "Mon Mar 26 09:49:22 2012 -0600" }, "message": "Merge remote branch \u0027remotes/korg_olof_tegra/for-3.4/soc\u0027 into for-3.4/fixes-for-io-cleanup\n" }, { "commit": "56c10bf82c10588b743e75a13a7949e11b9fc942", "tree": "a2eda0459abb314107ac64af770bf7fb360aefc6", "parents": [ "bab2d8c6020e1d7521cb6c4939f72b061ce947bc", "61b80086a525c8a6081257ae40da5dee2bcaee16" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 23 17:30:49 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 23 17:30:49 2012 -0700" }, "message": "Merge branch \u0027for-armsoc\u0027 of git://git.linaro.org/people/rmk/linux-arm\n\nPull #1 ARM updates from Russell King:\n \"This one covers stuff which Arnd is waiting for me to push, as this is\n shared between both our trees and probably other trees elsewhere.\n\n Essentially, this contains:\n - AMBA primecell device initializer updates - mostly shrinking the\n size of the device declarations in platform code to something more\n reasonable.\n - Getting rid of the NO_IRQ crap from AMBA primecell stuff.\n - Nicolas\u0027 idle cleanups. This in combination with the restart\n cleanups from the last merge window results in a great many\n mach/system.h files being deleted.\"\n\nYay: ~80 files, ~2000 lines deleted.\n\n* \u0027for-armsoc\u0027 of git://git.linaro.org/people/rmk/linux-arm: (60 commits)\n ARM: remove disable_fiq and arch_ret_to_user macros\n ARM: make entry-macro.S depend on !MULTI_IRQ_HANDLER\n ARM: rpc: make default fiq handler run-time installed\n ARM: make arch_ret_to_user macro optional\n ARM: amba: samsung: use common amba device initializers\n ARM: amba: spear: use common amba device initializers\n ARM: amba: nomadik: use common amba device initializers\n ARM: amba: u300: use common amba device initializers\n ARM: amba: lpc32xx: use common amba device initializers\n ARM: amba: netx: use common amba device initializers\n ARM: amba: bcmring: use common amba device initializers\n ARM: amba: ep93xx: use common amba device initializers\n ARM: amba: omap2: use common amba device initializers\n ARM: amba: integrator: use common amba device initializers\n ARM: amba: realview: get rid of private platform amba_device initializer\n ARM: amba: versatile: get rid of private platform amba_device initializer\n ARM: amba: vexpress: get rid of private platform amba_device initializer\n ARM: amba: provide common initializers for static amba devices\n ARM: amba: make use of -1 IRQs warn\n ARM: amba: u300: get rid of NO_IRQ initializers\n ...\n" }, { "commit": "0b0c9d3a5872e8a02a071c6f0775ee6bf00a1206", "tree": "12f6cc1eedffd62e4dfa3b0d41b2c643462426db", "parents": [ "fc2bb8d1cde1296d210a0f1ff9ee979a447d0a34", "7de473066f1512e52ea806e3c9698e5ea325b26c" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 23 14:15:07 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 23 14:15:07 2012 -0700" }, "message": "Merge tag \u0027iommu-updates-v3.4\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu\n\nPull IOMMU updates from Joerg Roedel:\n \"The IOMMU updates for this round are not very large patch-wise. But\n they contain two new IOMMU drivers for the ARM Tegra 2 and 3\n platforms. Besides that there are also a few patches for the AMD\n IOMMU which prepare the driver for adding intr-remapping support and a\n couple of fixes.\"\n\n* tag \u0027iommu-updates-v3.4\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu:\n iommu/amd: Fix section mismatch\n iommu/amd: Move interrupt setup code into seperate function\n iommu/amd: Make sure IOMMU interrupts are re-enabled on resume\n iommu/amd: Fix section warning for prealloc_protection_domains\n iommu/amd: Don\u0027t initialize IOMMUv2 resources when not required\n iommu/amd: Update git-tree in MAINTAINERS\n iommu/tegra-gart: fix spin_unlock in map failure path\n iommu/amd: Fix double free of mem-region in error-path\n iommu/amd: Split amd_iommu_init function\n ARM: IOMMU: Tegra30: Add iommu_ops for SMMU driver\n ARM: IOMMU: Tegra20: Add iommu_ops for GART driver\n" }, { "commit": "475c77edf826333aa61625f49d6a2bec26ecb5a6", "tree": "8e1c6c319e347cd3c649fdb0b3ab45971c6b19e7", "parents": [ "934e18b5cb4531cc6e81865bf54115cfd21d1ac6", "1488d5158dcd612fcdaf6b642451b026ee8bbcbb" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 23 14:02:12 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 23 14:02:12 2012 -0700" }, "message": "Merge branch \u0027linux-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci\n\nPull PCI changes (including maintainer change) from Jesse Barnes:\n \"This pull has some good cleanups from Bjorn and Yinghai, as well as\n some more code from Yinghai to better handle resource re-allocation\n when enabled.\n\n There\u0027s also a new initcall_debug feature from Arjan which will print\n out quirk timing information to help identify slow quirks for fixing\n or refinement (Yinghai sent in a few patches to do just that once the\n new debug code landed).\n\n Beyond that, I\u0027m handing off PCI maintainership to Bjorn Helgaas.\n He\u0027s been a core PCI and Linux contributor for some time now, and has\n kindly volunteered to take over. I just don\u0027t feel I have the time\n for PCI review and work that it deserves lately (I\u0027ve taken on some\n other projects), and haven\u0027t been as responsive lately as I\u0027d like, so\n I approached Bjorn asking if he\u0027d like to manage things. He\u0027s going\n to give it a try, and I\u0027m confident he\u0027ll do at least as well as I\n have in keeping the tree managed, patches flowing, and keeping things\n stable.\"\n\nFix up some fairly trivial conflicts due to other cleanups (mips device\nresource fixup cleanups clashing with list handling cleanup, ppc iseries\nremoval clashing with pci_probe_only cleanup etc)\n\n* \u0027linux-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci: (112 commits)\n PCI: Bjorn gets PCI hotplug too\n PCI: hand PCI maintenance over to Bjorn Helgaas\n unicore32/PCI: move \u003casm-generic/pci-bridge.h\u003e include to asm/pci.h\n sparc/PCI: convert devtree and arch-probed bus addresses to resource\n powerpc/PCI: allow reallocation on PA Semi\n powerpc/PCI: convert devtree bus addresses to resource\n powerpc/PCI: compute I/O space bus-to-resource offset consistently\n arm/PCI: don\u0027t export pci_flags\n PCI: fix bridge I/O window bus-to-resource conversion\n x86/PCI: add spinlock held check to \u0027pcibios_fwaddrmap_lookup()\u0027\n PCI / PCIe: Introduce command line option to disable ARI\n PCI: make acpihp use __pci_remove_bus_device instead\n PCI: export __pci_remove_bus_device\n PCI: Rename pci_remove_behind_bridge to pci_stop_and_remove_behind_bridge\n PCI: Rename pci_remove_bus_device to pci_stop_and_remove_bus_device\n PCI: print out PCI device info along with duration\n PCI: Move \"pci reassigndev resource alignment\" out of quirks.c\n PCI: Use class for quirk for usb host controller fixup\n PCI: Use class for quirk for ti816x class fixup\n PCI: Use class for quirk for intel e100 interrupt fixup\n ...\n" }, { "commit": "7fc86a7908a4e9eb2da4b6498f86193d113842d3", "tree": "c1b2faab48d2a6003c8e8efae5f356a4e792ce0a", "parents": [ "90597b6cfc1fc9926a4d54f09bbf5b3254b1b028", "51dddfe839a0ebcb5ff61a779e3f2768714f9957" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 22 20:25:50 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 22 20:25:50 2012 -0700" }, "message": "Merge tag \u0027pinctrl-for-3.4\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl\n\nPull pinctrl updates for v3.4 from Linus Walleij (*):\n - Switches the PXA 168, 910 and MMP over to use pinctrl\n - Locking revamped\n - Massive refactorings...\n - Reform the driver API to use multiple states\n - Support pin config in the mapping tables\n - Pinctrl drivers for the nVidia Tegra series\n - Generic pin config support lib for simple pin controllers\n - Implement pin config for the U300\n\n* tag \u0027pinctrl-for-3.4\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl: (48 commits)\n ARM: u300: configure some pins as an example\n pinctrl: support pinconfig on the U300\n pinctrl/coh901: use generic pinconf enums and parameters\n pinctrl: introduce generic pin config\n pinctrl: fix error path in pinconf_map_to_setting()\n pinctrl: allow concurrent gpio and mux function ownership of pins\n pinctrl: forward-declare struct device\n pinctrl: split pincontrol states into its own header\n pinctrl: include machine header to core.h\n ARM: tegra: Select PINCTRL Kconfig variables\n pinctrl: add a driver for NVIDIA Tegra\n pinctrl: Show selected function and group in pinmux-pins debugfs\n pinctrl: enhance mapping table to support pin config operations\n pinctrl: API changes to support multiple states per device\n pinctrl: add usecount to pins for muxing\n pinctrl: refactor struct pinctrl handling in core.c vs pinmux.c\n pinctrl: fix and simplify locking\n pinctrl: fix the pin descriptor kerneldoc\n pinctrl: assume map table entries can\u0027t have a NULL name field\n pinctrl: introduce PINCTRL_STATE_DEFAULT, define hogs as that state\n ...\n\n(*) What is it with all these Linuses these days? There\u0027s a Linus at\n google too. Some day I will get myself my own broadsword, and run\n around screaming \"There can be only one\".\n\n I used to be _special_ dammit. Snif.\n" }, { "commit": "7bfe0e66d5da32961f0060fc5d96b739b1ed64b9", "tree": "6d5dcf77248b574bb0c50930bbf9030aafb99fce", "parents": [ "6a76a6992341faab0ef31e7d97000e0cf336d0ba", "10ce3cc919f50c2043b41ca968b43c26a3672600" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 22 20:20:18 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 22 20:20:18 2012 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input\n\nPull input subsystem updates from Dmitry Torokhov:\n \"- we finally merged driver for USB version of Synaptics touchpads\n (I guess most commonly found in IBM/Lenovo keyboard/touchpad combo);\n\n - a bunch of new drivers for embedded platforms (Cypress\n touchscreens, DA9052 OnKey, MAX8997-haptic, Ilitek ILI210x\n touchscreens, TI touchscreen);\n\n - input core allows clients to specify desired clock source for\n timestamps on input events (EVIOCSCLOCKID ioctl);\n\n - input core allows querying state of all MT slots for given event\n code via EVIOCGMTSLOTS ioctl;\n\n - various driver fixes and improvements.\"\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (45 commits)\n Input: ili210x - add support for Ilitek ILI210x based touchscreens\n Input: altera_ps2 - use of_match_ptr()\n Input: synaptics_usb - switch to module_usb_driver()\n Input: convert I2C drivers to use module_i2c_driver()\n Input: convert SPI drivers to use module_spi_driver()\n Input: omap4-keypad - move platform_data to \u003clinux/platform_data\u003e\n Input: kxtj9 - who_am_i check value and initial data rate fixes\n Input: add driver support for MAX8997-haptic\n Input: tegra-kbc - revise device tree support\n Input: of_keymap - add device tree bindings for simple key matrices\n Input: wacom - fix physical size calculation for 3rd-gen Bamboo\n Input: twl4030-vibra - really switch from #if to #ifdef\n Input: hp680_ts_input - ensure arguments to request_irq and free_irq are compatible\n Input: max8925_onkey - avoid accessing input device too early\n Input: max8925_onkey - allow to be used as a wakeup source\n Input: atmel-wm97xx - convert to dev_pm_ops\n Input: atmel-wm97xx - set driver owner\n Input: add cyttsp touchscreen maintainer entry\n Input: cyttsp - remove useless checks in cyttsp_probe()\n Input: usbtouchscreen - add support for Data Modul EasyTouch TP 72037\n ...\n" }, { "commit": "7de473066f1512e52ea806e3c9698e5ea325b26c", "tree": "b5a52e0846c2f3851349dfc4e6c8ed88e64f3db8", "parents": [ "c16fa4f2ad19908a47c63d8fa436a1178438c7e7", "09c32533c064782a7989b6fecce776833bca0e12", "ae295142d2d3989e49c6425c90d2593732a068a1" ], "author": { "name": "Joerg Roedel", "email": "joro@8bytes.org", "time": "Thu Mar 22 19:28:39 2012 +0100" }, "committer": { "name": "Joerg Roedel", "email": "joro@8bytes.org", "time": "Thu Mar 22 19:28:39 2012 +0100" }, "message": "Merge branches \u0027iommu/fixes\u0027, \u0027arm/tegra\u0027 and \u0027x86/amd\u0027 into next\n" }, { "commit": "b8716614a7cc2fc15ea2a518edd04755fb08d922", "tree": "2a8a5d04066b2bd589ba2ebbeb228e2a6a178ec9", "parents": [ "31f6765266417c0d99f0e922fe82848a7c9c2ae9", "2dc9b5dbdef09840de852a4f0cc6a9c9eece7220" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 21 13:20:43 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 21 13:20:43 2012 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6\n\nPull crypto update from Herbert Xu:\n \"* sha512 bug fixes (already in your tree).\n * SHA224/SHA384 AEAD support in caam.\n * X86-64 optimised version of Camellia.\n * Tegra AES support.\n * Bulk algorithm registration interface to make driver registration easier.\n * padata race fixes.\n * Misc fixes.\"\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: (31 commits)\n padata: Fix race on sequence number wrap\n padata: Fix race in the serialization path\n crypto: camellia - add assembler implementation for x86_64\n crypto: camellia - rename camellia.c to camellia_generic.c\n crypto: camellia - fix checkpatch warnings\n crypto: camellia - rename camellia module to camellia_generic\n crypto: tcrypt - add more camellia tests\n crypto: testmgr - add more camellia test vectors\n crypto: camellia - simplify key setup and CAMELLIA_ROUNDSM macro\n crypto: twofish-x86_64/i586 - set alignmask to zero\n crypto: blowfish-x86_64 - set alignmask to zero\n crypto: serpent-sse2 - combine ablk_*_init functions\n crypto: blowfish-x86_64 - use crypto_[un]register_algs\n crypto: twofish-x86_64-3way - use crypto_[un]register_algs\n crypto: serpent-sse2 - use crypto_[un]register_algs\n crypto: serpent-sse2 - remove dead code from serpent_sse2_glue.c::serpent_sse2_init()\n crypto: twofish-x86 - Remove dead code from twofish_glue_3way.c::init()\n crypto: In crypto_add_alg(), \u0027exact\u0027 wants to be initialized to 0\n crypto: caam - fix gcc 4.6 warning\n crypto: Add bulk algorithm registration interface\n ...\n" }, { "commit": "8c3ec84102d171a24f050a086bfc546e9de93f9f", "tree": "598521643f9cb4ffdd9b121415872690254104e6", "parents": [ "c16fa4f2ad19908a47c63d8fa436a1178438c7e7" ], "author": { "name": "Stephen Warren", "email": "swarren@wwwdotorg.org", "time": "Mon Mar 19 13:57:13 2012 -0600" }, "committer": { "name": "Stephen Warren", "email": "swarren@wwwdotorg.org", "time": "Wed Mar 21 11:56:58 2012 -0600" }, "message": "ARM: tegra: Fix device tree AUXDATA for USB/EHCI\n\nCommit 4a53f4e \"USB: ehci-tegra: add probing through device tree\" added\nAUXDATA for Tegra\u0027s USB/EHCI controller. However, it pointed the platform\ndata at a location containing the address of the intended platform data,\nrather than the platform data itself. This change fixes that.\n\nSigned-off-by: Stephen Warren \u003cswarren@wwwdotorg.org\u003e\nCc: \u003cstable@vger.kernel.org\u003e # 3.3\n" }, { "commit": "2cbe23e3a432e3d09a849adb197c8fcc09e7391d", "tree": "711fe5845c4c7e7eaf8c57a597d86c0f9dda5b06", "parents": [ "b2f1df8d2fc14bf7e6d9d967043d4b60c2efd8dc", "ed1b4acc43b0c3289faa30cf184f322ab70a5be3" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Wed Mar 21 14:27:34 2012 +0000" }, "committer": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Wed Mar 21 14:27:34 2012 +0000" }, "message": "Merge branch \u0027tegra/cleanups\u0027 into next/timer\n\nConflicts:\n\tarch/arm/mach-tegra/Makefile\n\tarch/arm/mach-vexpress/core.h\n\nThe tegra Makefile was changed in four different branches\nin the same line. This merge should reduce the amount\nof churn.\n\nSigned-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\n" }, { "commit": "fdd8397497b389090a008f32bc67ba4f067bca1b", "tree": "1ad13f64c7cfce32fe3d90751529484b71efb1f4", "parents": [ "accf709b39a9cdbeaf6233000ccb9af966fd691e", "ed1b4acc43b0c3289faa30cf184f322ab70a5be3" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Mon Mar 19 21:02:20 2012 +0000" }, "committer": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Mon Mar 19 21:02:20 2012 +0000" }, "message": "Merge branch \u0027tegra/cleanups\u0027 into next/cleanup2\n" }, { "commit": "ed1b4acc43b0c3289faa30cf184f322ab70a5be3", "tree": "fc953baee9a383fe7f92c50e34a7a0c641f096a9", "parents": [ "849ad9d819f668d4bb6314f102bd92d16ab98622", "279b658525abd06645938fb607860de42c4cf31e" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Mon Mar 19 21:00:48 2012 +0000" }, "committer": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Mon Mar 19 21:00:48 2012 +0000" }, "message": "Merge branch \u0027for-3.4/cleanup-and-fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/olof/tegra into tegra/cleanups\n\n* \u0027for-3.4/cleanup-and-fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/olof/tegra:\n ARM: tegra: select USB_ULPI if USB is selected\n arm/tegra: pcie: fix return value of function\n arm/tegra: add timeout to PCIe PLL lock detection loop\n arm/tegra: fix harmony pinmux for PCIe\n" }, { "commit": "279b658525abd06645938fb607860de42c4cf31e", "tree": "b7d6926626939b7fdb1c0a1eed7309d7c901b69c", "parents": [ "2f926eecdfb6138fef91683667fc915af5071fff" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Fri Mar 02 17:26:00 2012 -0500" }, "committer": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Sun Mar 18 10:34:32 2012 -0700" }, "message": "ARM: tegra: select USB_ULPI if USB is selected\n\nAutomatically select USB_ULPI if USB is enabled on Tegra.\n\nSigned-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\nSigned-off-by: Alan Ott \u003calan@signal11.us\u003e\nAcked-by: Stephen Warren \u003cswarren@nvidia.com\u003e\nSigned-off-by: Olof Johansson \u003colof@lixom.net\u003e\n" }, { "commit": "2f926eecdfb6138fef91683667fc915af5071fff", "tree": "198b1187e300c825319153dc288aa6eda538f822", "parents": [ "795d5fd4b8b06944976c95e8592e17e2d415aa81" ], "author": { "name": "Dmitry Artamonow", "email": "mad_soft@inbox.ru", "time": "Tue Mar 13 09:46:27 2012 +0400" }, "committer": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Sun Mar 18 10:26:48 2012 -0700" }, "message": "arm/tegra: pcie: fix return value of function\n\nIn previous patch (arm/tegra: add timeout to PCIe PLL lock detection loop)\ntegra_pcie_enable_controller() function type has been changed from\nvoid to int, but the last return statement wasn\u0027t converted, so\nfunction returns undefined value. Fix it.\n\nAlso while at it, address couple of minor concerns raised by reviewers:\nuse usleep_range for delay, and lower the value of timeout to 300ms\nto be consistent with Nvidia Vibrante kernel.\n\nSigned-off-by: Dmitry Artamonow \u003cmad_soft@inbox.ru\u003e\nAcked-by: Stephen Warren \u003cswarren@wwwdotorg.org\u003e\nSigned-off-by: Olof Johansson \u003colof@lixom.net\u003e\n" }, { "commit": "38abdcd0d0689aaca94e740ac67a952c7918caef", "tree": "83051487c15c3a062eb4dbff16c13e517c309a78", "parents": [ "709baa67c676a187a63c0f0f40efceb3fb1eef72", "61b80086a525c8a6081257ae40da5dee2bcaee16" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Thu Mar 15 21:05:52 2012 +0000" }, "committer": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Thu Mar 15 21:05:52 2012 +0000" }, "message": "Merge branch \u0027for-armsoc\u0027 of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm into next/soc2\n\nConflicts:\n\tarch/arm/mach-tegra/common.c\n\tarch/arm/mach-ux500/devices-common.c\n\nThis resolves two conflicts and lets us merge the exynos5 branch\ncleanly.\n\nSigned-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\n" }, { "commit": "6f6f6a70295c6a4f89c7aca015c5db247a79d609", "tree": "e4927c35c999c3e999ac2c286f32cdeb54b81282", "parents": [ "6f71e9213c1dd31c44824e95ea4441883fceaf9c" ], "author": { "name": "Rob Herring", "email": "rob.herring@calxeda.com", "time": "Sat Mar 10 10:30:31 2012 -0600" }, "committer": { "name": "Rob Herring", "email": "rob.herring@calxeda.com", "time": "Tue Mar 13 21:22:09 2012 -0500" }, "message": "ARM: create a common IOMEM definition\n\nSeveral platforms create IOMEM defines for casting to \u0027void __iomem *\u0027,\nand other platforms are incorrectly using __io() macro for the same\npurpose. This creates a common definition and removes all the platform\nspecific versions. Rather than try to make linux/io.h and asm/io.h\nassembly safe, the assembly version of IOMEM is moved into\nasm/assembler.h.\n\nSigned-off-by: Rob Herring \u003crob.herring@calxeda.com\u003e\nCc: Russell King \u003clinux@arm.linux.org.uk\u003e\nCc: Sekhar Nori \u003cnsekhar@ti.com\u003e\nCc: Kevin Hilman \u003ckhilman@ti.com\u003e\nAcked-by: H Hartley Sweeten \u003chsweeten@visionengravers.com\u003e\nCc: Ryan Mallon \u003crmallon@gmail.com\u003e\nCc: Eric Miao \u003ceric.y.miao@gmail.com\u003e\nCc: Haojian Zhuang \u003chaojian.zhuang@marvell.com\u003e\nAcked-by: David Brown \u003cdavidb@codeaurora.org\u003e\nCc: Daniel Walker \u003cdwalker@fifo99.com\u003e\nCc: Bryan Huntsman \u003cbryanh@codeaurora.org\u003e\nCc: Sascha Hauer \u003ckernel@pengutronix.de\u003e\nCc: Shawn Guo \u003cshawn.guo@linaro.org\u003e\nAcked-by: Tony Lindgren \u003ctony@atomide.com\u003e\nAcked-by: Paul Walmsley \u003cpaul@pwsan.com\u003e\nAcked-by: Viresh Kumar \u003cviresh.kumar@st.com\u003e\nCc: Rajeev Kumar \u003crajeev-dlh.kumar@st.com\u003e\nCc: Colin Cross \u003cccross@android.com\u003e\nCc: Olof Johansson \u003colof@lixom.net\u003e\nCc: Stephen Warren \u003cswarren@nvidia.com\u003e\nAcked-by: Linus Walleij \u003clinus.walleij@linaro.org\u003e\nAcked-by: Arnd Bergmann \u003carnd@arndb.de\u003e\n" }, { "commit": "1fcf3a6edde7aeef7a207f8209231dd340a4ea89", "tree": "a146c688efe3ac47f1a2ec9665e621c58dc8a430", "parents": [ "7c380f273cf09b202e4bc9cbe137aef1870b8a20" ], "author": { "name": "Marc Zyngier", "email": "marc.zyngier@arm.com", "time": "Tue Jan 10 19:44:19 2012 +0000" }, "committer": { "name": "Marc Zyngier", "email": "marc.zyngier@arm.com", "time": "Tue Mar 13 13:30:30 2012 +0000" }, "message": "ARM: tegra: convert to twd_local_timer_register() interface\n\nAdd support for the new smp_twd runtime registration interface\nto the tegra platforms, and remove the old compile-time support.\nTested on Harmony.\n\nAcked-by: Stephen Warren \u003cswarren@nvidia.com\u003e\nCc: Colin Cross \u003cccross@android.com\u003e\nCc: Olof Johansson \u003colof@lixom.net\u003e\nSigned-off-by: Marc Zyngier \u003cmarc.zyngier@arm.com\u003e\n" }, { "commit": "b675b3667f6729dcd1036a2a129b35445947f905", "tree": "0d58791e9063d3ca2c352da6f3e7df2bdb876f9d", "parents": [ "104a5f3cad8f2f27cadbdf0029400ecd9e17ccc0", "192cfd58774b4d17b2fe8bdc77d89c2ef4e0591d" ], "author": { "name": "Dmitry Torokhov", "email": "dmitry.torokhov@gmail.com", "time": "Fri Mar 09 10:55:17 2012 -0800" }, "committer": { "name": "Dmitry Torokhov", "email": "dmitry.torokhov@gmail.com", "time": "Fri Mar 09 10:55:17 2012 -0800" }, "message": "Merge commit \u0027v3.3-rc6\u0027 into next\n" }, { "commit": "795d5fd4b8b06944976c95e8592e17e2d415aa81", "tree": "70703693cb917fbe780303f10d813d0cfcf2649b", "parents": [ "448b98047c61dd612fc3a41a2b9479da77ace27d" ], "author": { "name": "Dmitry Artamonow", "email": "mad_soft@inbox.ru", "time": "Tue Mar 06 12:45:43 2012 +0400" }, "committer": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Wed Mar 07 14:39:55 2012 -0800" }, "message": "arm/tegra: add timeout to PCIe PLL lock detection loop\n\nTegra PCIe driver waits for PLL to lock using busy loop.\nIf PLL fails to lock for some reason, this leads to silent lockup\nwhile booting (as PCIe code is not modular).\n\nFix by adding timeout, so if PLL doesn\u0027t lock in a couple\nof seconds, just PCIe driver fails and machine continues to boot.\n\nSigned-off-by: Dmitry Artamonow \u003cmad_soft@inbox.ru\u003e\nAcked-by: Stephen Warren \u003cswarren@wwwdotorg.org\u003e\nSigned-off-by: Olof Johansson \u003colof@lixom.net\u003e\n" }, { "commit": "448b98047c61dd612fc3a41a2b9479da77ace27d", "tree": "1d1e9a30d3bf9f709bf990664a5682337d0c4868", "parents": [ "f6a1ba67362fe78a1ec81c355ee638c70689b5d7" ], "author": { "name": "Dmitry Artamonow", "email": "mad_soft@inbox.ru", "time": "Tue Mar 06 12:45:42 2012 +0400" }, "committer": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Wed Mar 07 14:39:34 2012 -0800" }, "message": "arm/tegra: fix harmony pinmux for PCIe\n\nCommit 6e96aca397 (arm/tegra: Harmony PCIe: Don\u0027t touch pinmux)\nremoved runtime tri-state toggling for PCIe related pinmux groups,\nbut it seems that the fact that all of them are tri-state by default\nhas been overlooked. Change defaults for these groups to TEGRA_TRI_NORMAL.\n\nSigned-off-by: Dmitry Artamonow \u003cmad_soft@inbox.ru\u003e\nAcked-by: Stephen Warren \u003cswarren@wwwdotorg.org\u003e\nSigned-off-by: Olof Johansson \u003colof@lixom.net\u003e\n" }, { "commit": "5621caac1d9514b568f986b55ce5494b1d119d40", "tree": "5d497486f317ea95edb998825a900d01aff667a0", "parents": [ "4d5fc58dbe34b78157c05b319669bb3e064ba8bd" ], "author": { "name": "Rob Herring", "email": "rob.herring@calxeda.com", "time": "Fri Feb 10 20:04:56 2012 -0600" }, "committer": { "name": "Rob Herring", "email": "rob.herring@calxeda.com", "time": "Tue Mar 06 21:34:45 2012 -0600" }, "message": "ARM: kill off __mem_pci\n\n__mem_pci is only used to enable readl/writel and friends. Just condition\nthis on readl being defined and remove all the __mem_pci defines.\n\nSigned-off-by: Rob Herring \u003crob.herring@calxeda.com\u003e\nCc: Russell King \u003clinux@arm.linux.org.uk\u003e\nCc: Lennert Buytenhek \u003ckernel@wantstofly.org\u003e\nCc: Imre Kaloz \u003ckaloz@openwrt.org\u003e\nCc: Krzysztof Halasa \u003ckhc@pm.waw.pl\u003e\nCc: Nicolas Pitre \u003cnico@fluxnic.net\u003e\nCc: Ben Dooks \u003cben-linux@fluff.org\u003e\nCc: Kukjin Kim \u003ckgene.kim@samsung.com\u003e\nCc: Colin Cross \u003cccross@android.com\u003e\nCc: Olof Johansson \u003colof@lixom.net\u003e\nCc: Stephen Warren \u003cswarren@nvidia.com\u003e\n" }, { "commit": "6c38e25b6b9c64c8b2fc02c70095e70d97a3ace6", "tree": "b2224c9d9eceb6a9f709571d3d954767326988fb", "parents": [ "8a52dd4f94abe147bbd4080664817a389c8b6818" ], "author": { "name": "Rob Herring", "email": "rob.herring@calxeda.com", "time": "Fri Feb 10 21:22:00 2012 -0600" }, "committer": { "name": "Rob Herring", "email": "rob.herring@calxeda.com", "time": "Tue Mar 06 21:34:41 2012 -0600" }, "message": "ARM: tegra: clean-up mach/io.h\n\nMove tegra specific mach/io.h parts into iomap.h.\n\nSigned-off-by: Rob Herring \u003crob.herring@calxeda.com\u003e\nTested-by: Stephen Warren \u003cswarren@nvidia.com\u003e\nAcked-by: Stephen Warren \u003cswarren@nvidia.com\u003e\nCc: Colin Cross \u003cccross@android.com\u003e\nCc: Olof Johansson \u003colof@lixom.net\u003e\n" }, { "commit": "f1f1ffa0d2fd562b610940c7374b8217597af47f", "tree": "59d8c19fd6680e10634b307b21d03e9eb43fa9de", "parents": [ "971dac7123c785fdb0d09276b5d459b67585e242" ], "author": { "name": "Stephen Warren", "email": "swarren@nvidia.com", "time": "Wed Feb 01 14:04:48 2012 -0700" }, "committer": { "name": "Linus Walleij", "email": "linus.walleij@linaro.org", "time": "Tue Mar 06 10:52:12 2012 +0100" }, "message": "ARM: tegra: Select PINCTRL Kconfig variables\n\nThis causes the Tegra pinctrl driver to be built whenever core Tegra\nsupport is enabled.\n\nSigned-off-by: Stephen Warren \u003cswarren@nvidia.com\u003e\nAcked-by: Linus Walleij \u003clinus.walleij@linaro.org\u003e\nAcked-by: Olof Johansson \u003colof@lixom.net\u003e\nSigned-off-by: Linus Walleij \u003clinus.walleij@linaro.org\u003e\n" }, { "commit": "971dac7123c785fdb0d09276b5d459b67585e242", "tree": "bf31a25b47b9b7504e6f0765bf1a97b28d8afa44", "parents": [ "62aa2b537c6f5957afd98e29f96897419ed5ebab" ], "author": { "name": "Stephen Warren", "email": "swarren@nvidia.com", "time": "Wed Feb 01 14:04:47 2012 -0700" }, "committer": { "name": "Linus Walleij", "email": "linus.walleij@linaro.org", "time": "Tue Mar 06 10:51:46 2012 +0100" }, "message": "pinctrl: add a driver for NVIDIA Tegra\n\nThis adds a driver for the Tegra pinmux, and required parameterization\ndata for Tegra20 and Tegra30.\n\nThe driver is initially added with driver name and device tree compatible\nvalue that won\u0027t cause this driver to be used. A later change will switch\nthe pinctrl driver to use the correct values, switch the old pinmux\ndriver to be disabled, and update all code that uses the old pinmux APIs\nto use the new pinctrl APIs.\n\nSigned-off-by: Stephen Warren \u003cswarren@nvidia.com\u003e\nAcked-by: Olof Johansson \u003colof@lixom.net\u003e\n[squashed \"fix case of Tegra30\u0027s foo_groups[] arrays\"]\nSigned-off-by: Linus Walleij \u003clinus.walleij@linaro.org\u003e\n" }, { "commit": "2eed4e7d8631d8404fdef9c09d26a48376186ad1", "tree": "e3f85a5f6e0d643216b1d8994dc023fc4e0c0b2b", "parents": [ "721d6d1ecc281541a7d89989779e02af09f13c13", "c5444f39620b2b7801eb1997c41befdc8bcf78ea" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Sun Mar 04 21:21:52 2012 +0000" }, "committer": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Sun Mar 04 21:22:33 2012 +0000" }, "message": "Merge tag \u0027tegra-boards\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/olof/tegra into tegra/boards\n\nTegra board updates. Most of the board updates for tegra30 and for some\nof the driver device-tree conversions have gone in through the other\nbranches, so that leaves quite little left here -- mostly a couple\nof updates to the not-yet-converted tegra2 boards and a couple of\ndevice-tree updates.\n\n* tag \u0027tegra-boards\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/olof/tegra:\n ARM: tegra: match SoC name not board name in DT board files\n ARM: tegra: PCIe: Provide 3.3V supply voltage\n ARM: dt: tegra: add the wifi led to paz00 device tree\n ARM: dt: tegra: add the power gpio key to paz00 device tree\n ARM: dt: tegra: add ADT7461 temperature sensor to paz00 device tree\n\nSigned-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\n" }, { "commit": "7cb7f82611dddb4b471d42d0fad645dd0dc3f360", "tree": "61cb56ea1a885c96e6cb78fcd12e6abddd77e27c", "parents": [ "7169ff4a0942adf524f25713eaed30599d438926", "e77a6b313fdfe4faa8f9a8edf919c7eb8d095fb5" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Sun Mar 04 21:00:27 2012 +0000" }, "committer": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Sun Mar 04 21:03:30 2012 +0000" }, "message": "Merge tag \u0027tegra-soc-drivers\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/olof/tegra into tegra/soc-drivers\n\nTegra SoC driver support.\n\nSome device tree conversions, some new drivers. and a fix for an issue\nintroduced in Grant Likely\u0027s irq_domain conversion in his tree. Because\nof that, this branch depends on his branch to build (but not to merge):\n\ngit://git.secretlab.ca/git/linux-2.6.git irqdomain/next\n\n* tag \u0027tegra-soc-drivers\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/olof/tegra: (34 commits)\n ARM: tegra: uncompress.h: Don\u0027t depend on kernel headers\n gpio: tegra: Fix build issue due to irq_domain rework.\n ARM: tegra: Remove duplicate PMU interrupt inversion code\n ARM: tegra: Add a simple PMC driver\n ARM: tegra: dma: not required to move requestor when stopping.\n ARM: tegra: Fix EMC pdata initialization from registers\n gpio: tegra: Parameterize the number of banks\n gpio: tegra: Dynamically allocate IRQ base, and support DT\n ARM: tegra: Remove use of TEGRA_GPIO_TO_IRQ\n ARM: tegra: Pass uncompress.h UART selection to DEBUG_LL\n ARM: tegra: uncompress.h: Choose a UART at runtime\n ARM: tegra: uncompress.h: Store UART address in a variable\n ARM: tegra: Introduce define DEBUG_UART_SHIFT\n ARM: tegra: Support Tegra30 in decompressor UART setup\n ARM: tegra: Pause DMA when reading transfer count\n ARM: tegra: emc: device tree support\n ARM: tegra: emc: convert tegra2_emc to a platform driver\n ARM: tegra: fuse: add bct strapping reading\n ARM: tegra: fuse: add functions to access chip revision\n ARM: tegra: fuse: use apbio dma for register access\n ...\n\nSigned-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\n" }, { "commit": "c71656c018c8551eca45b2f873b239f0303d74cb", "tree": "bab4825a6ed993c98ac4967f2aa976536f58568a", "parents": [ "cb66bb1d6fab2d91960c20f256c6986d5afac1a1", "e186ad74c0941f5caeda28bde76dab903b342c1c" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Sun Mar 04 20:55:46 2012 +0000" }, "committer": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Sun Mar 04 20:57:06 2012 +0000" }, "message": "Merge tag \u0027tegra-soc\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/olof/tegra into tegra/soc\n\nFrom: Olof Johansson \u003colof@lixom.net\u003e\n\nSoC new development for tegra SoCs, mostly tegra30 core support.\n\nIt also includes one stray bugfix that was misapplied (should have been\nin soc-drivers), but it went out to the stable branches before I noticed\nso I\u0027ve left it in.\n\n* tag \u0027tegra-soc\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/olof/tegra:\n ARM: tegra: Demote EMC clock inconsistency BUG to WARN\n ARM: tegra: Avoid compiling cpuidle code when not configured\n ARM: tegra: cpuidle driver for tegra\n ARM: tegra: assembler code for LP3\n ARM: tegra: definitions for flow controller\n ARM: tegra: initialize basic system clocks\n ARM: tegra: enable tegra30 clock framework\n ARM: tegra: implement basic tegra30 clock framework\n ARM: tegra: add support for new clock framework features\n ARM: tegra: add support for tegra30 interrupts\n\nSigned-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\n" }, { "commit": "18bb4fb28760b3d23355f6e3cc3cbe1a07321c0a", "tree": "8adc1e462e04d6dcbc0669657adb356368db8c9e", "parents": [ "1220547bfd7f7dd97f770a04b533323e5404b8e9", "f6a1ba67362fe78a1ec81c355ee638c70689b5d7" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Sun Mar 04 20:48:42 2012 +0000" }, "committer": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Sun Mar 04 20:50:07 2012 +0000" }, "message": "Merge tag \u0027tegra-cleanups\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/olof/tegra into tegra/cleanups\n\nMinor fixes that weren\u0027t urgent enough to go into 3.3. The two paz00\npatches are in mainline already but got merged after the branch point\nfor this branch, so they\u0027re duplicated. I also ended up merging in\nrmk/for-armsoc into this later on to fix a bug introduced by it, so it\u0027s\nincluded but it\u0027s not the base of this branch.\n\n* tag \u0027tegra-cleanups\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/olof/tegra:\n ARM: tegra: Enable CPUIdle on Tegra20\n ARM: tegra: export usb phy symbols\n ARM: tegra: build localtimer support only when needed\n ARM: tegra: select CPU_FREQ_TABLE\n ARM: tegra: select required CPU and L2 errata options\n ARM: tegra: paz00: fix wrong UART port on mini-pcie plug\n ARM: tegra: paz00: fix wrong SD1 power gpio\n\nSigned-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\n" }, { "commit": "849ad9d819f668d4bb6314f102bd92d16ab98622", "tree": "eeec804cc045d6fc022e778b2dacf68e512f3ea7", "parents": [ "61b80086a525c8a6081257ae40da5dee2bcaee16", "f6a1ba67362fe78a1ec81c355ee638c70689b5d7" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Sun Mar 04 20:48:42 2012 +0000" }, "committer": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Sun Mar 04 20:49:02 2012 +0000" }, "message": "Merge tag \u0027tegra-cleanups\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/olof/tegra into tegra/cleanups\n\nMinor fixes that weren\u0027t urgent enough to go into 3.3. The two paz00\npatches are in mainline already but got merged after the branch point\nfor this branch, so they\u0027re duplicated. I also ended up merging in\nrmk/for-armsoc into this later on to fix a bug introduced by it, so it\u0027s\nincluded but it\u0027s not the base of this branch.\n\n* tag \u0027tegra-cleanups\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/olof/tegra:\n ARM: tegra: Enable CPUIdle on Tegra20\n ARM: tegra: export usb phy symbols\n ARM: tegra: build localtimer support only when needed\n ARM: tegra: select CPU_FREQ_TABLE\n ARM: tegra: select required CPU and L2 errata options\n ARM: tegra: paz00: fix wrong UART port on mini-pcie plug\n ARM: tegra: paz00: fix wrong SD1 power gpio\n\nSigned-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\n" }, { "commit": "f6a1ba67362fe78a1ec81c355ee638c70689b5d7", "tree": "174843abd91a5bba757710b207e8f815c4bf8d9d", "parents": [ "4265cbfd8dc1ae230d65f09cce9ce7f0c51a3c10" ], "author": { "name": "Peter De Schrijver", "email": "pdeschrijver@nvidia.com", "time": "Thu Feb 23 18:20:56 2012 +0200" }, "committer": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Sun Mar 04 11:17:17 2012 -0800" }, "message": "ARM: tegra: Enable CPUIdle on Tegra20\n\nAs the LP3 code also works for Tegra20, we can enable cpuidle for Tegra20.\n\nSigned-off-by: Peter De Schrijver \u003cpdeschrijver@nvidia.com\u003e\nAcked-by: Stephen Warren \u003cswarren@nvidia.com\u003e\nTested-by: Stephen Warren \u003cswarren@nvidia.com\u003e\nSigned-off-by: Olof Johansson \u003colof@lixom.net\u003e\n" }, { "commit": "4265cbfd8dc1ae230d65f09cce9ce7f0c51a3c10", "tree": "9f1cb4ead9ff6b398b0d73d92a08dae74b48b370", "parents": [ "249c5172e80acd211025da2e2cc1bd026b0ab8d4" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Fri Mar 02 15:58:42 2012 -0500" }, "committer": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Sun Mar 04 11:17:14 2012 -0800" }, "message": "ARM: tegra: export usb phy symbols\n\nThe ehci driver can be a module, so the functions provided\nby the tegra platform code used by ehci-tegra need to\nbe exported.\n\nSigned-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\nSigned-off-by: Alan Ott \u003calan@signal11.us\u003e\nSigned-off-by: Olof Johansson \u003colof@lixom.net\u003e\n" }, { "commit": "249c5172e80acd211025da2e2cc1bd026b0ab8d4", "tree": "9ee6e660e80399c19aa06b72e294878a19708b07", "parents": [ "013df38857a6272c7e6bd99d3f298599a215e988" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Fri Mar 02 15:58:32 2012 -0500" }, "committer": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Sun Mar 04 11:17:10 2012 -0800" }, "message": "ARM: tegra: build localtimer support only when needed\n\nIt is possible to build a tegra kernel without localtimer\nsupport, so the tegra specific parts should only be built\nwhen that is indeed enabled.\n\nSigned-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\nSigned-off-by: Alan Ott \u003calan@signal11.us\u003e\nSigned-off-by: Olof Johansson \u003colof@lixom.net\u003e\n" }, { "commit": "013df38857a6272c7e6bd99d3f298599a215e988", "tree": "51a993359e20283c76597083ecccbabd87737a5e", "parents": [ "0e86ca498511d1ff1224a5be7224c83cfcf000e3" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Fri Mar 02 15:58:28 2012 -0500" }, "committer": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Sun Mar 04 11:17:06 2012 -0800" }, "message": "ARM: tegra: select CPU_FREQ_TABLE\n\nThe tegra cpufreq implementation relies on the cpu_freq_table\ncode, so make sure that this is always there when needed.\n\nSigned-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\nSigned-off-by: Alan Ott \u003calan@signal11.us\u003e\nSigned-off-by: Olof Johansson \u003colof@lixom.net\u003e\n" }, { "commit": "0e86ca498511d1ff1224a5be7224c83cfcf000e3", "tree": "47d9f2d94862f7b7c0bc952af41631dfaa220ead", "parents": [ "f35b431dde39fb40944d1024f08d88fbf04a3193", "a5f17d1f4c2831b9b9bf8b1a537cdbac995d6e13" ], "author": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Sun Mar 04 11:16:38 2012 -0800" }, "committer": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Sun Mar 04 11:16:38 2012 -0800" }, "message": "Merge branch \u0027depends/rmk/for-armsoc\u0027 into for-3.4/cleanup-and-fixes\n" }, { "commit": "8c690fdf465be9d97229f6bb0e6346624d6753a9", "tree": "0c061609e566ed4aa704b99c71a45b26939c21c2", "parents": [ "86e51a2ee471062184d2f74b46c45d344a2b9b38" ], "author": { "name": "Stephen Warren", "email": "swarren@nvidia.com", "time": "Thu Feb 02 12:24:19 2012 -0700" }, "committer": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Sun Mar 04 10:47:30 2012 -0800" }, "message": "ARM: dt: Explicitly configure all serial ports on Tegra Cardhu\n\nThe ports are used as follows:\nUART1/A: Routed to debug dongle\nUART2/B: GPS\nUART3/C: Bluetooth\nUART4/D: Routed to debug dongle\nUART5/E: Not connected\n\nThe debug dongle has jumpers to connect either UART1/A or UART4/D to\nthe DB-9 connector. UART1/A is typically used on Cardhu, and is the option\nwe assume here.\n\nFor now, only enable UART1/A, and explicitly disable all other ports.\n\nThe explicit disable prevents the message \"of_serial 70006040.serial:\nno clock-frequency property set\" being printed during boot.\n\nEnabling the other ports requires their clocks to be enabled, or accesses\nto the registers will hang. At present, this requires adding entries into\nboard-dt-tegra30.c\u0027s tegra_dt_clk_init_table[]. Lets punt on that and wait\nfor the common clock bindings to set this all up, although that will also\nrequiring adding clock support to 8250.c.\n\nWhile we\u0027re at it, fix board-dt-tegra30.c to enable the correct clock for\nthe debug UART. We got away with this before, because the bootloader already\nenabled it.\n\nSigned-off-by: Stephen Warren \u003cswarren@nvidia.com\u003e\nSigned-off-by: Olof Johansson \u003colof@lixom.net\u003e\n" }, { "commit": "c5444f39620b2b7801eb1997c41befdc8bcf78ea", "tree": "872560a46c5fdaca56e6e55f7efd2357148c808f", "parents": [ "1dbe1dfa8591fce98acbac6a9398284a3f1ecc6e" ], "author": { "name": "Stephen Warren", "email": "swarren@nvidia.com", "time": "Mon Feb 27 18:26:16 2012 -0700" }, "committer": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Sun Mar 04 10:41:19 2012 -0800" }, "message": "ARM: tegra: match SoC name not board name in DT board files\n\nboard-dt-tegra*.c should support any board using Tegra when booted using\ndevice tree. Instead of explicitly listing all the supported boards,\nwhich requires a kernel change for each new board, list the supported SoC\nmodel instead.\n\nNote that the board files do currently have explicit support for setting\nup each board\u0027s pinmux. However, it\u0027s fairly likely that at least the\nbasic devices on any new board will work just fine as set up by the boot-\nloader, and the pinmux data should be moving into device tree soon anyway.\n\nSigned-off-by: Stephen Warren \u003cswarren@nvidia.com\u003e\nSigned-off-by: Olof Johansson \u003colof@lixom.net\u003e\n" }, { "commit": "8062d94a545457a83d5291bd62c3bfd14200bba0", "tree": "a6a7aaaea5dff00f7415a93189720a1164ae30dd", "parents": [ "15e68a803573974409972e761d8f08f03fce5bdb", "6e13c6505cdff9766d5268ffb8c972c1a2f996e6" ], "author": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Thu Mar 01 08:45:33 2012 -0800" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Thu Mar 01 08:45:33 2012 -0800" }, "message": "Merge tag \u0027xceiv-for-v3.4\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb into usb-next\n\nUSB: transceiver changes for 3.4\n\nHere we have a big rework done by Heikki Krogerus (thanks) which\nsplits OTG functionality away from transceivers.\n\nWe have known for quite a long time that struct otg_transceiver was\na bad name for the structure, considering transceiver is far from\nbeing OTG-specific (see 4e67185).\n" }, { "commit": "a26d3c4fcd4bb875ae5adc32f27fab7a478bb00d", "tree": "510283fbb57dc321bef9b36e37698c7fc6b588ef", "parents": [ "4d8cfec692e988b844dcaeaeb76b5780b7ef9d28", "1b35af54ee9cbbdd13fed53fd4acb0952ba522e1" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Wed Feb 29 21:17:30 2012 +0000" }, "committer": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Wed Feb 29 21:18:13 2012 +0000" }, "message": "Merge branch \u0027cleanup\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/cleanup\n\n* \u0027cleanup\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:\n ARM: OMAP2+: Fix L4_EMU_34XX_BASE error after iomap changes\n ARM: OMAP2+: Limit omap_read/write usage to legacy USB drivers\n ARM: OMAP: Remove plat/io.h by splitting it into mach/io.h and mach/hardware.h\n ARM: OMAP2+: Move most of plat/io.h into local iomap.h\n ARM: OMAP1: Move most of plat/io.h into local iomap.h\n ARM: OMAP1: Move 16xx GPIO system clock to platform init code\n ARM: OMAP: Move omap_init_consistent_dma_size() to local common.h\n ARM: OMAP2+: Move SDRC related functions from io.h into local common.h\n ARM: OMAP2+: Drop DISPC L3 firewall code\n ARM: OMAP2xxx: PM: remove obsolete timer disable code in the suspend path\n ARM: OMAP: McSPI: Remove unused flag from struct omap2_mcspi_device_config\n\n(update to latest rmk/for-arm-soc branch)\n\nSigned-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\n" }, { "commit": "fb0b82b32ce17564bc64cede50bf4a3204eecc60", "tree": "00b5e466074c6fb373d64c493b3341186024acc7", "parents": [ "a173fc693b25216c5c834978f4fafd731fd4ff94", "43de6a7dda6e9a7345e218e688f2092f991126f0" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Tue Feb 28 12:42:14 2012 +0000" }, "committer": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Tue Feb 28 12:42:21 2012 +0000" }, "message": "Merge branch \u0027board-specific\u0027 of git://github.com/hzhuang1/linux into next/boards\n\n* \u0027board-specific\u0027 of git://github.com/hzhuang1/linux: (5 commits)\n ARM: pxa: add dummy clock for pxa25x and pxa27x\n ARM: mmp: append irq name of gpio device\n pxa/hx4700: Fix PXA_GPIO_IRQ_BASE/IRQ_NUM values\n pxa/hx4700: Add ASIC3 LED support\n pxa/hx4700: Correct StrataFlash block size discovery\n\n(update to v3.3-rc5)\n" }, { "commit": "4d8cfec692e988b844dcaeaeb76b5780b7ef9d28", "tree": "67d43adab2afd18a74d08f347e3676ae1a64193f", "parents": [ "a3a3c4664184f86ef964323d106c62158e2b3f25", "1d8c38c3d1b48eeb9cfaa42a8be13a1423569eb2" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Tue Feb 28 12:39:56 2012 +0000" }, "committer": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Tue Feb 28 12:40:01 2012 +0000" }, "message": "Merge branch \u0027cleanup-3.4\u0027 of git://github.com/hzhuang1/linux into next/cleanup\n\n* \u0027cleanup-3.4\u0027 of git://github.com/hzhuang1/linux: (2 commits)\n rtc: sa1100: remove verification code of alarm\n rtc: sa1100: remove periodic code\n\n(update to v3.3-rc5)\n" }, { "commit": "abf45ce84c4e36bd64aef20d7df9a79bd5e4b799", "tree": "f118e135bdd60b680703d1b38c7fdc7b9d7c503d", "parents": [ "082f53c2f573c75a8f1610c587a43b6817e20f90", "b1f91a9ce335eb4e0fef17c10f39a438ac3fce9b" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Tue Feb 28 12:33:41 2012 +0000" }, "committer": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Tue Feb 28 12:33:46 2012 +0000" }, "message": "Merge branch \u0027imx/defconfig\u0027 of git://git.linaro.org/people/shawnguo/linux-2.6 into next/soc\n\n* \u0027imx/defconfig\u0027 of git://git.linaro.org/people/shawnguo/linux-2.6: (2 commits)\n ARM: defconfig: imx_v6_v7: build in REGULATOR_FIXED_VOLTAGE\n ARM: imx: update imx_v6_v7_defconfig\n\n(upadte to v3.3-rc5)\n" }, { "commit": "e77a6b313fdfe4faa8f9a8edf919c7eb8d095fb5", "tree": "a86e5aa454b20b1d697c88adfda68e584c3e41f6", "parents": [ "bdc93a77da75ee421125896ce4bbd91afff63809" ], "author": { "name": "Stephen Warren", "email": "swarren@nvidia.com", "time": "Mon Feb 27 14:27:19 2012 -0700" }, "committer": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Mon Feb 27 13:45:54 2012 -0800" }, "message": "ARM: tegra: uncompress.h: Don\u0027t depend on kernel headers\n\nThis fixes the following compile error:\n\n CC arch/arm/boot/compressed/misc.o\nIn file included from arch/arm/boot/compressed/misc.c:28:0:\narch/arm/mach-tegra/include/mach/uncompress.h: In function \u0027arch_decomp_setup\u0027:\narch/arm/mach-tegra/include/mach/uncompress.h:125:2: error: implicit declaration of function \u0027BUILD_BUG_ON_ZERO\u0027 [-Werror\u003dimplicit-function-declaration]\ncc1: some warnings being treated as errors\n\nThis is due to use of the ARRAY_SIZE() macro. Typically, this would be\nsolved by including \u003clinux/bug.h\u003e, but the compressor code isn\u0027t part of\nthe kernel, and so should not include kernel headers. Instead, define\nthe few macros the code uses directly, and in a way that doesn\u0027t depend\non \u003clinux/bug.h\u003e.\n\nSigned-off-by: Stephen Warren \u003cswarren@nvidia.com\u003e\nSigned-off-by: Olof Johansson \u003colof@lixom.net\u003e\n" } ], "next": "b96d3b08365f5a9603f50f3aadca6012f7eaffa1" }