)]}' { "log": [ { "commit": "623ff7739e7c00fa3d55dbfd42a492a68298fd7a", "tree": "0b7461753a1b13b27ea2958a7d48c6efb47bba54", "parents": [ "c39e8ede284f469971589f2e04af78216e1a771d", "7b0e67f604e1829e5292e1ad7743eb18dc42ea7c" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 30 17:31:56 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 30 17:31:56 2012 -0700" }, "message": "Merge tag \u0027for-linus-3.4\u0027 of git://git.infradead.org/mtd-2.6\n\nPull MTD changes from David Woodhouse:\n - Artem\u0027s cleanup of the MTD API continues apace.\n - Fixes and improvements for ST FSMC and SuperH FLCTL NAND, amongst\n others.\n - More work on DiskOnChip G3, new driver for DiskOnChip G4.\n - Clean up debug/warning printks in JFFS2 to use pr_\u003clevel\u003e.\n\nFix up various trivial conflicts, largely due to changes in calling\nconventions for things like dmaengine_prep_slave_sg() (new inline\nwrapper to hide new parameter, clashing with rewrite of previously last\nparameter that used to be an \u0027append\u0027 flag, and is now a bitmap of\n\u0027unsigned long flags\u0027).\n\n(Also some header file fallout - like so many merges this merge window -\nand silly conflicts with sparse fixes)\n\n* tag \u0027for-linus-3.4\u0027 of git://git.infradead.org/mtd-2.6: (120 commits)\n mtd: docg3 add protection against concurrency\n mtd: docg3 refactor cascade floors structure\n mtd: docg3 increase write/erase timeout\n mtd: docg3 fix inbound calculations\n mtd: nand: gpmi: fix function annotations\n mtd: phram: fix section mismatch for phram_setup\n mtd: unify initialization of erase_info-\u003efail_addr\n mtd: support ONFI multi lun NAND\n mtd: sm_ftl: fix typo in major number.\n mtd: add device-tree support to spear_smi\n mtd: spear_smi: Remove default partition information from driver\n mtd: Add device-tree support to fsmc_nand\n mtd: fix section mismatch for doc_probe_device\n mtd: nand/fsmc: Remove sparse warnings and errors\n mtd: nand/fsmc: Add DMA support\n mtd: nand/fsmc: Access the NAND device word by word whenever possible\n mtd: nand/fsmc: Use dev_err to report error scenario\n mtd: nand/fsmc: Use devm routines\n mtd: nand/fsmc: Modify fsmc driver to accept nand timing parameters via platform\n mtd: fsmc_nand: add pm callbacks to support hibernation\n ...\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": "2533c2cfbff8f0ee53b8448d6362b54c272125aa", "tree": "e254f804f2da2f79e66ea71a1e534574ae9da2ac", "parents": [ "a2cb960f171228e17a28ff734289be60b75417c7", "21235bdb8aa5e8320b08f79525a45185a52b07df" ], "author": { "name": "Tony Lindgren", "email": "tony@atomide.com", "time": "Thu Mar 29 10:16:04 2012 -0700" }, "committer": { "name": "Tony Lindgren", "email": "tony@atomide.com", "time": "Thu Mar 29 10:16:04 2012 -0700" }, "message": "Merge branch \u0027fixes-gpio-to-irq\u0027 into fixes\n\nConflicts:\n\tarch/arm/mach-omap1/board-htcherald.c\n\tarch/arm/mach-omap2/board-rx51-peripherals.c\n\tarch/arm/plat-omap/include/plat/gpio.h\n\tdrivers/input/serio/ams_delta_serio.c\n" }, { "commit": "335aece5c502672fd0eb26ede5427ab14f4f7948", "tree": "84004d6c4450809d7f88be35355345060e17d09e", "parents": [ "0195c00244dc2e9f522475868fa278c473ba7339" ], "author": { "name": "Govindraj.R", "email": "govindraj.raja@ti.com", "time": "Thu Mar 29 09:30:28 2012 -0700" }, "committer": { "name": "Tony Lindgren", "email": "tony@atomide.com", "time": "Thu Mar 29 10:05:02 2012 -0700" }, "message": "ARM: OMAP: pm: fix compilation break\n\nFix the compilation break observed on latest mainline caused\nby 9f97da78 (Disintegrate asm/system.h for ARM):\n\narch/arm/mach-omap1/pm.c: In function \u0027omap_pm_prepare\u0027:\narch/arm/mach-omap1/pm.c:587: error: implicit declaration of function \u0027disable_hlt\u0027\narch/arm/mach-omap1/pm.c: In function \u0027omap_pm_finish\u0027:\narch/arm/mach-omap1/pm.c:624: error: implicit declaration of function \u0027enable_hlt\u0027\narch/arm/mach-omap1/pm.c: In function \u0027omap_pm_init\u0027:\narch/arm/mach-omap1/pm.c:681: error: \u0027arm_pm_idle\u0027 undeclared (first use in this function)\n...\n\narch/arm/mach-omap2/pm.c: In function \u0027omap_pm_begin\u0027:\narch/arm/mach-omap2/pm.c:239: error: implicit declaration of function \u0027disable_hlt\u0027\narch/arm/mach-omap2/pm.c: In function \u0027omap_pm_end\u0027:\narch/arm/mach-omap2/pm.c:247: error: implicit declaration of function \u0027enable_hlt\u0027\n\nSigned-off-by: Govindraj.R \u003cgovindraj.raja@ti.com\u003e\nAcked-by: Kevin Hilman \u003ckhilman@ti.com\u003e\n[tony@atomide.com: updated to fix omap1 too]\nSigned-off-by: Tony Lindgren \u003ctony@atomide.com\u003e\n" }, { "commit": "46a0a5402f7b477bc98bf26596c2234f2ddbf473", "tree": "a42f80deeecb3d59b2fa771c1ab031c68307f7b2", "parents": [ "a26d3c4fcd4bb875ae5adc32f27fab7a478bb00d" ], "author": { "name": "Tarun Kanti DebBarma", "email": "tarun.kanti@ti.com", "time": "Thu Mar 29 08:41:01 2012 -0700" }, "committer": { "name": "Tony Lindgren", "email": "tony@atomide.com", "time": "Thu Mar 29 08:41:01 2012 -0700" }, "message": "ARM: OMAP: boards: Fix OMAP_GPIO_IRQ usage with gpio_to_irq()\n\nThe following commits change gpio-omap to use dynamic\nIRQ allocation:\n\n25db711 gpio/omap: Fix IRQ handling for SPARSE_IRQ\n384ebe1 gpio/omap: Add DT support to GPIO driver\n\nWith dynamic allocation of IRQ the usage of OMAP_GPIO_IRQ\nis no longer valid. We must be using gpio_to_irq() instead.\n\nSigned-off-by: Tarun Kanti DebBarma \u003ctarun.kanti@ti.com\u003e\n[tony@atomide.com: updated comments]\nSigned-off-by: Tony Lindgren \u003ctony@atomide.com\u003e\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": "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": "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": "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": "c8bc5e39ac110acc88e41dd45d3f99956686f074", "tree": "1e4c21347e6d7b3cd7ac649436bbf3e2c1854229", "parents": [ "e22057c8599373e5caef0bc42bdb95d2a361ab0d", "489e7bece7f6859a7df484a4dce08fa51fb0d876" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Mar 27 15:55:54 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Mar 27 15:55:54 2012 -0700" }, "message": "Merge tag \u0027fixes-non-critical\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc\n\nPull \"ARM: Non-critical bug fixes\" from Ardn Bergmann:\n \"Simple bug fixes that were not considered important enough for\n inclusion into 3.3. One bug fix was originally intended for 3.3 but\n accidentally got missed, but is not marked stable because it should\n only get backported once later fixes also make it into v3.4.\n\n Signed-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\"\n\n* tag \u0027fixes-non-critical\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (66 commits)\n iomux-mx25.h slew rate adjusted for LCD __LD pins\n ARM: davinci: DA850: move da850_register_pm to .init.text\n ARM: davinci: cpufreq: fix compiler warning\n ARM: OMAP2+: Fix build for omap4 only builds with missing include of linux/bug.h\n ARM: OMAP2+: Fix section warnings for hsmmc_init_one\n ARM: OMAP2+: Fix build issues with missing include of linux/bug.h\n ARM: OMAP2+: gpmc-smsc911x: only register regulator for first instance\n ARM: OMAP3+: PM: VP: fix integer truncation error\n ARM: OMAP2+: PM: fix wakeupgen warning when hotplug disabled\n ARM: OMAP2+: PM: fix section mismatch with omap2_init_processor_devices()\n ARM: OMAP2: Fix section warning for n8x0 when CONFIG_MMC_OMAP is not set\n ARM: OMAP2+: Fix omap24xx_io_desc warning if SoC subtypes are not selected\n ARM: OMAP1: Fix section mismatch for omap1_init_early()\n ARM: OMAP1: Fix typo in lcd_dma.c\n ARM: OMAP: mailbox: trivial whitespace fix\n ARM: OMAP: Remove definition cpu_is_omap4430()\n ARM: OMAP2+: included some headers twice\n ARM: OMAP: clock.c: included linux/debugfs.h twice\n ARM: OMAP: don\u0027t build hwspinlock in vain\n ARM: OMAP2+: ads7846_init: put gpio_pendown into pdata if it\u0027s provided\n ...\n" }, { "commit": "876fe76d793d03077eb61ba3afab4a383f46c554", "tree": "fb7d98bd746ebd1c3c5919f10a998e8f2dbd9e8b", "parents": [ "e7d9377e0440c25805dcc5b0af189a87beb69f5e" ], "author": { "name": "Paul Parsons", "email": "lost.distance@yahoo.com", "time": "Wed Mar 07 14:12:08 2012 +0000" }, "committer": { "name": "David Woodhouse", "email": "David.Woodhouse@intel.com", "time": "Tue Mar 27 00:52:28 2012 +0100" }, "message": "mtd: maps: physmap: Add reference counter to set_vpp()\n\nThis patch is part of a set which fixes unnecessary flash erase and write errors\nresulting from the MTD CFI driver turning off vpp while an erase is in progress.\nThis patch allows physmap_set_vpp() calls to be nested by adding a reference\ncounter.\n\nomap1_set_vpp() already used a reference counter. Since it is called from\nphysmap_set_vpp(), omap1_set_vpp() can now be simplified.\n\nsimtec_nor_vpp() already disabled hard interrupts. Since it is called from\nphysmap_set_vpp(), simtec_nor_vpp() can now be simplified.\n\nSigned-off-by: Paul Parsons \u003clost.distance@yahoo.com\u003e\nSigned-off-by: Artem Bityutskiy \u003cartem.bityutskiy@linux.intel.com\u003e\nSigned-off-by: David Woodhouse \u003cDavid.Woodhouse@intel.com\u003e\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": "437538267b672f9320833907f1b5acbb2605f4be", "tree": "d10173b35a5b86bc037bb2ece1b406d5575a2094", "parents": [ "9586c959bfc917695893bef0102433a7d0675691", "6bff98b455cf3e666fd0e3d0d908eba874de0eee" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 22 20:43:40 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 22 20:43:40 2012 -0700" }, "message": "Merge tag \u0027fbdev-updates-for-3.4\u0027 of git://github.com/schandinat/linux-2.6\n\nPull fbdev updates for 3.4 from Florian Tobias Schandinat:\n - drivers for Samsung Exynos MIPI DSI and display port\n - i740fb to support those old Intel chips\n - large updates to OMAP, viafb and sh_mobile_lcdcfb\n - some updates to s3c-fb and udlfb, few patches to others\n\nFix up conflicts in drivers/video/udlfb.c due to Key Sievers\u0027 fix making\nit in twice.\n\n* tag \u0027fbdev-updates-for-3.4\u0027 of git://github.com/schandinat/linux-2.6: (156 commits)\n Revert \"video:uvesafb: Fix oops that uvesafb try to execute NX-protected page\"\n OMAPDSS: register dss drivers in module init\n video: pxafb: add clk_prepare/clk_unprepare calls\n fbdev: bfin_adv7393fb: Drop needless include\n fbdev: sh_mipi_dsi: add extra phyctrl for sh_mipi_dsi_info\n fbdev: remove dependency of FB_SH_MOBILE_MERAM from FB_SH_MOBILE_LCDC\n Revert \"MAINTAINERS: add entry for exynos mipi display drivers\"\n fbdev: da8xx: add support for SP10Q010 display\n fbdev: da8xx:: fix reporting of the display timing info\n drivers/video/pvr2fb.c: ensure arguments to request_irq and free_irq are compatible\n OMAPDSS: APPLY: fix clearing shadow dirty flag with manual update\n fbdev: sh_mobile_meram: Implement system suspend/resume\n fbdev: sh_mobile_meram: Remove unneeded sanity checks\n fbdev: sh_mobile_meram: Don\u0027t perform update in register operation\n arm: mach-shmobile: Constify sh_mobile_meram_cfg structures\n fbdev: sh_mobile_lcdc: Don\u0027t store copy of platform data\n fbdev: sh_mobile_meram: Remove unused sh_mobile_meram_icb_cfg fields\n arm: mach-shmobile: Don\u0027t set MERAM ICB numbers in platform data\n fbdev: sh_mobile_meram: Allocate ICBs automatically\n fbdev: sh_mobile_meram: Use genalloc to manage MERAM allocation\n ...\n" }, { "commit": "b2094ef840697bc8ca5d17a83b7e30fad5f1e9fa", "tree": "64e5f7253b6a85b6d5d36f95c0d3c67c1798918d", "parents": [ "424a6f6ef990b7e9f56f6627bfc6c46b493faeb4", "6681bc0deba495fad0d6fb349e40524abd1b1732" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 22 13:00:13 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 22 13:00:13 2012 -0700" }, "message": "Merge tag \u0027sound-3.4\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound\n\nPull updates of sound stuff from Takashi Iwai:\n \"Here is the first big update chunk of sound stuff for 3.4-rc1.\n\n In the common sound infrastructure, there are a few changes for\n dynamic PCM support (used in ASoC) and a few clean-ups. Majority of\n changes are found, as usual, in HD-audio and ASoC.\n\n Some highlights of HD-audio changes:\n\n - All the long-standing static quirk codes for Realtek codec were\n finally removed by fixing and extending the Realtek auto-parser.\n\n - The mute-LED control is standardized over all HD-audio codec\n drivers using the extended vmaster hook.\n\n - The vmaster slave mixer elements are initialized to 0dB as default\n so that the user won\u0027t be annoyed by the silent output after\n updates, e.g. due to the additions of new elements.\n\n - Other many fix-ups for the misc HD-audio devices.\n\n In the ASoC side, this is a very active release, including a quite a\n few framework enhancements. Some highlights:\n\n - Support for widgets not associated with a CODEC, an important part\n of the dynamic PCM framework.\n\n - A library factoring out the common code shared by dmaengine based\n DMA drivers contributed by Lars-Peter Clausen. This will save a\n lot of code and make it much easier to deploy enhancements to\n dmaengine.\n\n - Support for binary controls, used for providing runtime\n configuration of algorithm coefficients.\n\n - A new DAPM widget type for regulator supplies allowing drivers for\n devices that can power down unused supplies while active to do\n without any per-driver code.\n\n - DAPM widgets for DAIs, initially giving a speed boost for playback\n startup and shutdown and also the basis for CODEC\u003c-\u003eCODEC DAI link\n support.\n\n - Support for specifying the number of significant bits on audio\n interfaces, useful for allowing applications to know how much\n effort to put into generating data for a larger sample format.\n\n - Conversion of the FSI driver used on some SH processors to\n DMAEngine.\n\n - Conversion of EP93xx drivers to DMAEngine.\n\n - New CODEC drivers for Maxim MAX9768 and Wolfson Microelectronics\n WM2200.\n\n - Move audmux driver from arc/arm to sound/soc\n\n - McBSP move from arch/ to sound/ and updates\n\n Also, a few small updates and fixes for other drivers like au88x0,\n ymfpci, USB 6fire, USB usx2yaudio are included.\"\n\n* tag \u0027sound-3.4\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (446 commits)\n ASoC: wm8994: Provide VMID mode control and fix default sequence\n ASoC: wm8994: Add missing break in resume\n ASoC: wm_hubs: Don\u0027t actively manage LINEOUT_VMID_BUF\n ASoC: pxa-ssp: atomically set stream active masks\n ASoC: fsl: p1022ds: tell the WM8776 codec driver that it\u0027s the master\n ASoC: Samsung: Added to support mono recording\n ALSA: hda - Fix build with CONFIG_PM\u003dn\n ALSA: au88x0 - Avoid possible Oops at unbinding\n ALSA: usb-audio - Fix build error by consitification of rate list\n ASoC: core: Fix obscure leak of runtime array\n ALSA: pcm - Avoid GFP_ATOMIC in snd_pcm_link()\n ALSA: pcm: Constify the list in snd_pcm_hw_constraint_list\n ASoC: wm8996: Add 44.1kHz support\n ALSA: hda - Fix build of patch_sigmatel.c without CONFIG_SND_HDA_POWER_SAVE\n ASoC: mx27vis-aic32x4: Convert it to platform driver\n ALSA: hda - fix printing of high HDMI sample rates\n ALSA: ymfpci - Fix legacy registers on S3/S4 resume\n ALSA: control - Fixe a trailing white space error\n ALSA: hda - Add expose_enum_ctl flag to snd_hda_add_vmaster_hook()\n ALSA: hda - Add \"Mute-LED Mode\" enum control\n ...\n" }, { "commit": "69a7aebcf019ab3ff5764525ad6858fbe23bb86d", "tree": "7211df5704b743a7667159748c670a9744164482", "parents": [ "d464c92b5234227c1698862a1906827e2e398ae0", "f1f996b66cc3908a8f5ffccc2ff41840e92f3b10" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Mar 20 21:12:50 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Mar 20 21:12:50 2012 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial\n\nPull trivial tree from Jiri Kosina:\n \"It\u0027s indeed trivial -- mostly documentation updates and a bunch of\n typo fixes from Masanari.\n\n There are also several linux/version.h include removals from Jesper.\"\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (101 commits)\n kcore: fix spelling in read_kcore() comment\n constify struct pci_dev * in obvious cases\n Revert \"char: Fix typo in viotape.c\"\n init: fix wording error in mm_init comment\n usb: gadget: Kconfig: fix typo for \u0027different\u0027\n Revert \"power, max8998: Include linux/module.h just once in drivers/power/max8998_charger.c\"\n writeback: fix fn name in writeback_inodes_sb_nr_if_idle() comment header\n writeback: fix typo in the writeback_control comment\n Documentation: Fix multiple typo in Documentation\n tpm_tis: fix tis_lock with respect to RCU\n Revert \"media: Fix typo in mixer_drv.c and hdmi_drv.c\"\n Doc: Update numastat.txt\n qla4xxx: Add missing spaces to error messages\n compiler.h: Fix typo\n security: struct security_operations kerneldoc fix\n Documentation: broken URL in libata.tmpl\n Documentation: broken URL in filesystems.tmpl\n mtd: simplify return logic in do_map_probe()\n mm: fix comment typo of truncate_inode_pages_range\n power: bq27x00: Fix typos in comment\n ...\n" }, { "commit": "695d82fae9160406acb9de204c471248abcc2a9f", "tree": "1a3b3f48e3e0d1783fc75fa50dc77b41a1a88b88", "parents": [ "74c46469a5f70a29ac961cfaa90a0422f1d09230", "1dde9f75b658edcd4fb7e00259206d727702ce61" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Thu Mar 15 13:49:36 2012 +0000" }, "committer": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Thu Mar 15 13:49:42 2012 +0000" }, "message": "Merge tag \u0027imx25-iomux-ds\u0027 of git://git.pengutronix.de/git/imx/linux-2.6 into next/fixes-non-critical\n\n* tag \u0027imx25-iomux-ds\u0027 of git://git.pengutronix.de/git/imx/linux-2.6:\n iomux-mx25.h slew rate adjusted for LCD __LD pins\n\n(update to v3.3-rc6)\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": "e3643b77de143c5548ec93abd8aa68f4123295ea", "tree": "41981957bc93e8211fe55cd04b7cac47e74bc770", "parents": [ "86ca5b6fef2bf1aa77a62f29d844400e4fed8dde", "44b2cef5ae6da48523fa634230ca66107110a7dd" ], "author": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Tue Mar 13 16:08:06 2012 -0700" }, "committer": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Tue Mar 13 16:08:06 2012 -0700" }, "message": "Merge branch \u0027next/cleanup-exynos-clock\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/cleanup\n\n* \u0027next/cleanup-exynos-clock\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:\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 (includes an update to v3.3-rc6)\n" }, { "commit": "3ead4679e579560f4b5370e4a2f4c00ae4f1988b", "tree": "f09ca526c59909047ca3e11741bfc9eefbee639a", "parents": [ "94a504c2e059fb88f05ede6d614504779275b099" ], "author": { "name": "Peter Ujfalusi", "email": "peter.ujfalusi@ti.com", "time": "Fri Mar 09 10:23:27 2012 +0200" }, "committer": { "name": "Liam Girdwood", "email": "lrg@ti.com", "time": "Mon Mar 12 13:34:24 2012 +0000" }, "message": "ARM: OMAP: Remove CONFIG_OMAP_MCBSP references\n\nThe McBSP driver stack has been moved to ASoC. The CONFIG_OMAP_MCBSP will\nbe removed since the CONFIG_SND_OMAP_SOC_MCBSP will trigger to build the\nMcBSP (audio) drivers.\n\nSigned-off-by: Peter Ujfalusi \u003cpeter.ujfalusi@ti.com\u003e\nAcked-by: Tony Lindgren \u003ctony@atomide.com\u003e\nSigned-off-by: Liam Girdwood \u003clrg@ti.com\u003e\n" }, { "commit": "20456242e8d13287b476264223caef7f1193741a", "tree": "cc6ed3f8207582ea43435372d9d9fba7e0339a43", "parents": [ "45656b44f6d1968d838f3abcf3a264ee9fa2fc62" ], "author": { "name": "Peter Ujfalusi", "email": "peter.ujfalusi@ti.com", "time": "Wed Feb 15 12:00:26 2012 +0200" }, "committer": { "name": "Liam Girdwood", "email": "lrg@ti.com", "time": "Mon Mar 12 13:34:20 2012 +0000" }, "message": "ARM: OMAP: Do not register omap-mcbsp-dai device\n\nThe driver for omap-mcbsp-dai no longer exist since it has been merged with\nthe omap-mcbsp driver.\n\nSigned-off-by: Peter Ujfalusi \u003cpeter.ujfalusi@ti.com\u003e\nAcked-by: Tony Lindgren \u003ctony@atomide.com\u003e\nTested-by: Grazvydas Ignotas \u003cnotasas@gmail.com\u003e\nTested-by: Janusz Krzysztofik \u003cjkrzyszt@tis.icnet.pl\u003e\nAcked-by: Jarkko Nikula \u003cjarkko.nikula@bitmer.com\u003e\nSigned-off-by: Liam Girdwood \u003clrg@ti.com\u003e\n" }, { "commit": "45656b44f6d1968d838f3abcf3a264ee9fa2fc62", "tree": "af489389d8565bdd83f756115239524814b902d9", "parents": [ "219f43164e8c611c6b8e7b628def9183098b430b" ], "author": { "name": "Peter Ujfalusi", "email": "peter.ujfalusi@ti.com", "time": "Tue Feb 14 18:20:58 2012 +0200" }, "committer": { "name": "Liam Girdwood", "email": "lrg@ti.com", "time": "Mon Mar 12 13:34:19 2012 +0000" }, "message": "ASoC: omap-mcbsp: Create a single driver for McBSP\n\nThe OMAP McBSP driver stack used to contain two different\ndrivers. One of them was used as kind low-level access to\nthe IP, while the other driver was the ASoC DAI driver.\nThere were global, shared structures, in different places,\nthe McBSP instances are reffered with id numbers (sometimes\n0 based, in other cases 1 based id numbers).\n\nCreate one single driver for OMAP McBSP with name: omap-mcbsp.\nConvert the old omap-mcbsp driver initially to be a library\nfor the omap-mcbsp DAI driver. With this change we can get rid\nof all global variables, structures.\n\nFurther cleanup is coming...\n\nSigned-off-by: Peter Ujfalusi \u003cpeter.ujfalusi@ti.com\u003e\nTested-by: Grazvydas Ignotas \u003cnotasas@gmail.com\u003e\nTested-by: Janusz Krzysztofik \u003cjkrzyszt@tis.icnet.pl\u003e\nAcked-by: Mark Brown \u003cbroonie@opensource.wolfsonmicro.com\u003e\nAcked-by: Jarkko Nikula \u003cjarkko.nikula@bitmer.com\u003e\nSigned-off-by: Liam Girdwood \u003clrg@ti.com\u003e\n" }, { "commit": "0210dc4eafcfd1b38ac178ebf63627f359d6371d", "tree": "1106068c62c7c79e5606193eff1224135a557192", "parents": [ "0324e02a077de6bffff566fa43fd7b46f4b3ebd8" ], "author": { "name": "Peter Ujfalusi", "email": "peter.ujfalusi@ti.com", "time": "Thu Jan 26 12:38:31 2012 +0200" }, "committer": { "name": "Liam Girdwood", "email": "lrg@ti.com", "time": "Mon Mar 12 13:34:19 2012 +0000" }, "message": "ARM: OMAP: mcbsp: Convert core driver to proper platform driver\n\nConvert the plat-omap/mcbsp.c driver to be proper platform driver.\nRemove the omap_mcbsp_init function call which was called from\nmach-omap1/2/mcbsp.c to register the platform driver for the just\ncreated platform device in the same function.\n\nSigned-off-by: Peter Ujfalusi \u003cpeter.ujfalusi@ti.com\u003e\nAcked-by: Tony Lindgren \u003ctony@atomide.com\u003e\nTested-by: Grazvydas Ignotas \u003cnotasas@gmail.com\u003e\nTested-by: Janusz Krzysztofik \u003cjkrzyszt@tis.icnet.pl\u003e\nAcked-by: Jarkko Nikula \u003cjarkko.nikula@bitmer.com\u003e\nSigned-off-by: Liam Girdwood \u003clrg@ti.com\u003e\n" }, { "commit": "c15a04338b5a6d4305d107a5b6c0cd43418b7f3e", "tree": "04d40a3b4fbc0477aa71c11044a20ff2d6666004", "parents": [ "192cfd58774b4d17b2fe8bdc77d89c2ef4e0591d", "60571f98d292b74586ff8330d8bc965eb01e8df0" ], "author": { "name": "Kukjin Kim", "email": "kgene.kim@samsung.com", "time": "Sat Mar 10 22:21:36 2012 -0800" }, "committer": { "name": "Kukjin Kim", "email": "kgene.kim@samsung.com", "time": "Sat Mar 10 22:21:36 2012 -0800" }, "message": "Merge branch \u0027next/cleanup-use-static\u0027 into next/cleanup-exynos-clock\n" }, { "commit": "c454f813501b94cd687bf3c5c0783f815a854905", "tree": "8b6e1719ba4470e478d719ca0cf935501370e237", "parents": [ "1ad4fb2f7cbc21db9cdbb53e25ce348d93bbd6e7", "63fc5f3bb3d0ca9ab4767a801b518aa6335f87ad" ], "author": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Sat Mar 10 09:15:30 2012 -0800" }, "committer": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Sat Mar 10 09:15:30 2012 -0800" }, "message": "Merge branch \u0027board\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/boards\n\n* \u0027board\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:\n ARM: OMAP: add minimal support for Nokia RM-696\n ARM: OMAP: enable Bluetooth on the PandaBoard\n ARM: OMAP: pandora: add support for backlight and poweroff\n ARM: OMAP4: board-4430sdp: don\u0027t initialize value that is never used\n ARM: OMAP3: cm-t3517: add EMAC support\n ARM: OMAP: move generic EMAC init to separate file\n ARM: OMAP3: RX-51: add explicit mux configuration of tsc2005 control gpios\n ARM: OMAP: Add omap_reserve functionality\n\n (includes sync-up to 3.3-rc6)\n" }, { "commit": "1ad4fb2f7cbc21db9cdbb53e25ce348d93bbd6e7", "tree": "ab448afc1422107919c832cf916a39c20efc77d3", "parents": [ "2eed4e7d8631d8404fdef9c09d26a48376186ad1", "0379c1f55b734d9d112f535e12f4508b90a1bab1" ], "author": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Sat Mar 10 09:04:14 2012 -0800" }, "committer": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Sat Mar 10 09:04:14 2012 -0800" }, "message": "Merge branch \u0027ams-delta\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/boards\n\n* \u0027ams-delta\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:\n ASoC: OMAP: ams-delta: drop .set_bias_level callback\n ARM: OMAP1: ams-delta: update the modem to use regulator API\n ARM: OMAP1: ams-delta: set up regulator over modem reset GPIO pin\n ARM: OMAP1: ams-delta: clean up init data section assignments\n ARM: OMAP1: ams-delta: fix incorrect section tags\n" }, { "commit": "4d5fc58dbe34b78157c05b319669bb3e064ba8bd", "tree": "e059d572e3591d9314e712daa19b8adad7671e43", "parents": [ "c334bc150524f833db3c76a0aaf55fb5044444e1" ], "author": { "name": "Rob Herring", "email": "rob.herring@calxeda.com", "time": "Thu Feb 09 22:21:18 2012 -0600" }, "committer": { "name": "Rob Herring", "email": "rob.herring@calxeda.com", "time": "Tue Mar 06 21:34:44 2012 -0600" }, "message": "ARM: remove bunch of now unused mach/io.h files\n\nNow that many platforms don\u0027t need mach/io.h, remove the unused ones.\n\nSigned-off-by: Rob Herring \u003crob.herring@calxeda.com\u003e\nAcked-by: Shawn Guo \u003cshawn.guo@linaro.org\u003e\nAcked-by: Linus Walleij \u003clinus.walleij@linaro.org\u003e\nAcked-by: H Hartley Sweeten \u003chsweeten@visionengravers.com\u003e\nAcked-by: Jean-Christophe PLAGNIOL-VILLARD \u003cplagnioj@jcrosoft.com\u003e\nAcked-by: Jamie Iles \u003cjamie@jamieiles.com\u003e\nAcked-by: Pawel Moll \u003cpawel.moll@arm.com\u003e\nAcked-by: Nicolas Pitre \u003cnico@linaro.org\u003e\n" }, { "commit": "6076c644126e5424f32aec6c8f2bdc19bbcc8859", "tree": "014d9da4c98f7b3d81cc2d6e669a2a5e4c8d1709", "parents": [ "68a7f1f79f004e7a2a53352c82319d567ebb1da1" ], "author": { "name": "Tony Lindgren", "email": "tony@atomide.com", "time": "Thu Mar 01 08:35:01 2012 -0600" }, "committer": { "name": "Rob Herring", "email": "rob.herring@calxeda.com", "time": "Tue Mar 06 21:34:38 2012 -0600" }, "message": "ARM: OMAP: Remove remaining includes for mach/io.h\n\nThese are no longer needed with the recent iomap.h\nchanges.\n\nReported-by: Rob Herring \u003crobherring2@gmail.com\u003e\nSigned-off-by: Tony Lindgren \u003ctony@atomide.com\u003e\nCc: Tomi Valkeinen \u003ctomi.valkeinen@ti.com\u003e\nCc: Florian Tobias Schandinat \u003cFlorianSchandinat@gmx.de\u003e\n" }, { "commit": "8eaa7bb0b363707db6d1323e4fbc0783bc55d22d", "tree": "a76980089ded585a2b23412ecbe53b53bbb3482b", "parents": [ "33c3f71cf7033ffd108cbab7a75665a5e66a1be0" ], "author": { "name": "Tony Lindgren", "email": "tony@atomide.com", "time": "Mon Mar 05 16:11:04 2012 -0800" }, "committer": { "name": "Tony Lindgren", "email": "tony@atomide.com", "time": "Mon Mar 05 16:11:04 2012 -0800" }, "message": "ARM: OMAP1: Fix section mismatch for omap1_init_early()\n\nFix the following warning:\n\nWARNING: vmlinux.o(.text+0x1286c): Section mismatch in reference\nfrom the function omap1_init_early() to the function .init.text:omap1_clk_init()\nThe function omap1_init_early() references\nthe function __init omap1_clk_init().\nThis is often because omap1_init_early lacks a __init \nannotation or the annotation of omap1_clk_init is wrong.\n\nSigned-off-by: Tony Lindgren \u003ctony@atomide.com\u003e\n" }, { "commit": "33c3f71cf7033ffd108cbab7a75665a5e66a1be0", "tree": "26494e53b0253f0dfa83f9aa068fa24e701b0498", "parents": [ "44c568a8bb3cd59f27d5cca1b9c6977a002c1913" ], "author": { "name": "Masanari Iida", "email": "standby24x7@gmail.com", "time": "Mon Mar 05 16:11:04 2012 -0800" }, "committer": { "name": "Tony Lindgren", "email": "tony@atomide.com", "time": "Mon Mar 05 16:11:04 2012 -0800" }, "message": "ARM: OMAP1: Fix typo in lcd_dma.c\n\nCorrect spelling \"resulotion\" to \"resolution\" in\narch/arm/mach-omap1/lcd_dma.c\n\nSigned-off-by: Masanari Iida \u003cstandby24x7@gmail.com\u003e\nSigned-off-by: Tony Lindgren \u003ctony@atomide.com\u003e\n" }, { "commit": "0379c1f55b734d9d112f535e12f4508b90a1bab1", "tree": "91fa87d36cb93868bc05b7e05e4f6af86c1d0fec", "parents": [ "aabf31737a6a5eb0c4d73857409cd5bcc914d5f5" ], "author": { "name": "Janusz Krzysztofik", "email": "jkrzyszt@tis.icnet.pl", "time": "Mon Mar 05 17:05:12 2012 +0100" }, "committer": { "name": "Tony Lindgren", "email": "tony@atomide.com", "time": "Mon Mar 05 11:25:34 2012 -0800" }, "message": "ASoC: OMAP: ams-delta: drop .set_bias_level callback\n\nThis functionality has already been implemented in the cx20442 codec\ndriver (commit f75a8ff67d161b5166a2c2360bb2ffaefd5eb853, \"ASoC: cx20442:\nadd bias control over a platform provided regulator\"), no need to keep\nit here duplicated.\n\nOnce done, remove the no longer used AMS_DELTA_LATCH2_MODEM_NRESET\nsymbol from the board header file and a call to the regulator_toggle()\nhelper function from the old API wrapper found in the board file. While\nbeing at it, simplify the way the modem .pm callback handles the\nregulator and drop that helper function and its related consumer setup\ncompletely.\n\nDepends on patches 1/3 and 2/3 for clean apply and keep things working.\n\nSigned-off-by: Janusz Krzysztofik \u003cjkrzyszt@tis.icnet.pl\u003e\nAcked-by: Mark Brown \u003cbroonie@opensource.wolfsonmicro.com\u003e\nCc: Tony Lindgren \u003ctony@atomide.com\u003e\nSigned-off-by: Tony Lindgren \u003ctony@atomide.com\u003e\n" }, { "commit": "aabf31737a6a5eb0c4d73857409cd5bcc914d5f5", "tree": "eda335fb96d06f686d87bc61d7e79d41b2fa8645", "parents": [ "ac2885df30e2597d627ad619c01b6fc55ac540a7" ], "author": { "name": "Janusz Krzysztofik", "email": "jkrzyszt@tis.icnet.pl", "time": "Mon Mar 05 17:05:11 2012 +0100" }, "committer": { "name": "Tony Lindgren", "email": "tony@atomide.com", "time": "Mon Mar 05 11:24:30 2012 -0800" }, "message": "ARM: OMAP1: ams-delta: update the modem to use regulator API\n\nAfter the CX20442 codec driver already takes care of enabling the codec\npower for itself (commit f75a8ff67d161b5166a2c2360bb2ffaefd5eb853,\n\"ASoC: cx20442: add bias control over a platform provided regulator\"),\nbut before dropping the old bias control method from the Amstrad Delta\nASoC sound card file, which in fact keeps the modem power always on,\neven on the ASoC device close for now, extend the modem setup with a\npower management callback which toggles the regulator up to the modem\u0027s\nneeds, reusing the previously set up regulator consumer for this. Also,\ndrop the MODEM_NRESET pin setup from the modem initialization procedure,\nas this operation was already ineffective since patch 1/3, and not\nneeded because the regulator is set up as initially enabled.\n\nDepends on patch 1/3 \"ARM: OMAP1: ams-delta: set up regulator over modem\nreset GPIO pin\" to apply cleanly.\n\nSigned-off-by: Janusz Krzysztofik \u003cjkrzyszt@tis.icnet.pl\u003e\nCc: Tony Lindgren \u003ctony@atomide.com\u003e\nSigned-off-by: Tony Lindgren \u003ctony@atomide.com\u003e\n" }, { "commit": "ac2885df30e2597d627ad619c01b6fc55ac540a7", "tree": "d2762c429dd7016f4fb735abad74208b407c15ea", "parents": [ "da564a05b3aefe403062411b67d64b7e992718f7" ], "author": { "name": "Janusz Krzysztofik", "email": "jkrzyszt@tis.icnet.pl", "time": "Mon Mar 05 17:05:10 2012 +0100" }, "committer": { "name": "Tony Lindgren", "email": "tony@atomide.com", "time": "Mon Mar 05 11:17:10 2012 -0800" }, "message": "ARM: OMAP1: ams-delta: set up regulator over modem reset GPIO pin\n\nThe Amstrad Delta on-board latch2 bit named MODEM_NRESET, now available\nas a GPIO pin AMS_DELTA_GPIO_PIN_NMODEM_RESET, is used to power up/down\n(bring into/out of a reset state) two distinct on-board devices\nsimultaneously: the modem, and the voice codec. As a consequence, that\nbit is, or can be, manipulated concurrently by two drivers, or their\nplatform provided hooks.\n\nInstead of updating those drivers to use the gpiolib API as a new method\nof controlling the MODEM_NRESET pin state, like it was done to other\ndrivers accessing latch2 pins, and still being vulnerable to potential\nconcurrency conflicts, or trying to solve that sharing issue with a\ncustom piece of code, set up a fixed regulator device on top of that\nGPIO pin, with the intention of updating both drivers to manipulate that\nregulator, not the GPIO pin directly.\n\nBefore the ASoC driver is updated and the modem platform data expanded\nwith a power management callback for switching its power, the\nams_delta_latch_write() function, which still provides the old API for\naccessing latch2 functionality from not updated drivers, is modified to\ntoggle the regulator instead of the MODEM_NRESET GPIO pin. A helper\nfunction provided for balancing the regulator enable/disable operations,\ntogether with the consumer data needed for tracking the regulator state,\nwill be removed once the drivers are updated.\n\nDepends on patch series \"ARM: OMAP1: ams-delta: replace custom I/O with\nGPIO\".\n\nSigned-off-by: Janusz Krzysztofik \u003cjkrzyszt@tis.icnet.pl\u003e\nSigned-off-by: Tony Lindgren \u003ctony@atomide.com\u003e\n" }, { "commit": "1220547bfd7f7dd97f770a04b533323e5404b8e9", "tree": "a4231b9570f3302f032a2d757fb3af24a4238d46", "parents": [ "a26d3c4fcd4bb875ae5adc32f27fab7a478bb00d", "f86bcc302a8c570dd0f5a50097a6af96a0e717c2" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Fri Mar 02 13:05:00 2012 +0000" }, "committer": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Fri Mar 02 13:05:00 2012 +0000" }, "message": "Merge branch \u0027depends/omap/gpio/runtime-pm-cleanup\u0027 into next/cleanup\n\nConflicts:\n\tarch/arm/mach-omap1/gpio16xx.c\n\tdrivers/gpio/gpio-omap.c\n\nMerge in the runtime-pm-cleanup branch from the gpio tree into\nnext/cleanup, this resolves a nonobvious merge conflict between\nthe two branches. Both branches move parts of the gpio-omap\ndriver into platform code, this takes the superset of both\nchanges.\n\nSigned-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\n" }, { "commit": "da564a05b3aefe403062411b67d64b7e992718f7", "tree": "3f075ad74fbd4e4f843072cb887ef1a2d573ac01", "parents": [ "dc0caefdf48713fce373c8663e5a0d292a424746" ], "author": { "name": "Janusz Krzysztofik", "email": "jkrzyszt@tis.icnet.pl", "time": "Fri Feb 10 17:48:43 2012 +0100" }, "committer": { "name": "Tony Lindgren", "email": "tony@atomide.com", "time": "Thu Mar 01 15:20:26 2012 -0800" }, "message": "ARM: OMAP1: ams-delta: clean up init data section assignments\n\nThe main purpose of this patch is to fix several section mismatch\nwarnings from the board file and a few board specific drivers,\nintroduced with recent Amstrad Delta patch series, some of them rising\nup only when building with CONFIG_MODULES not set.\n\nWhile being at it, section tagging of all init data found in the board\nfile have been revised and hopefully corrected and/or optimized.\n\nSigned-off-by: Janusz Krzysztofik \u003cjkrzyszt@tis.icnet.pl\u003e\nSigned-off-by: Tony Lindgren \u003ctony@atomide.com\u003e\n" }, { "commit": "dc0caefdf48713fce373c8663e5a0d292a424746", "tree": "61a276d1b88fc3a5043a1064164b5a3f01c3fe9b", "parents": [ "42392762149cba0a74c1c5b1b1bb868d86e62383" ], "author": { "name": "Janusz Krzysztofik", "email": "jkrzyszt@tis.icnet.pl", "time": "Thu Mar 01 15:19:15 2012 -0800" }, "committer": { "name": "Tony Lindgren", "email": "tony@atomide.com", "time": "Thu Mar 01 15:20:24 2012 -0800" }, "message": "ARM: OMAP1: ams-delta: fix incorrect section tags\n\nWhile resolving section mismatches introduced with recent patches\nto for-next, a few dangerous, driver bind/unbind unaware section\ntagging already present in mainline have been identified. Fix them.\n\nSigned-off-by: Janusz Krzysztofik \u003cjkrzyszt@tis.icnet.pl\u003e\nSigned-off-by: Tony Lindgren \u003ctony@atomide.com\u003e\n" }, { "commit": "235ecf4c59ebe13e065a40755d999fa9850b8179", "tree": "fc1048fe799b67413bb5716c1f0775f188500822", "parents": [ "fb0b82b32ce17564bc64cede50bf4a3204eecc60", "967809bd7faf71ddc29c8081e0f21db8b201a0f4" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Wed Feb 29 21:05:03 2012 +0000" }, "committer": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Wed Feb 29 21:05:03 2012 +0000" }, "message": "Merge branch \u0027omap1\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/boards\n\n* \u0027omap1\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:\n input: serio: ams-delta: toggle keyboard power over GPIO\n omapfb: lcd_ams_delta: drive control lines over GPIO\n MTD: NAND: ams-delta: use GPIO instead of custom I/O\n LED: drop leds-ams-delta driver\n ARM: OMAP1: ams-delta: supersede custom led device by leds-gpio\n ARM: OMAP1: ams-delta: convert latches to basic_mmio_gpio\n ARM: OMAP1: ams-delta: register latch dependent devices later\n" }, { "commit": "a5bee307ba7befc96a97915d6d45ffbe1e5f9a20", "tree": "544713c8b4359221df3677fb93a52892c57fbcee", "parents": [ "0aac881246fb25d017617cd7be68e93326d51ce1", "acea7c7b81e8f67513aebade8cb99c7789c44d8c" ], "author": { "name": "Tony Lindgren", "email": "tony@atomide.com", "time": "Tue Feb 28 14:27:01 2012 -0800" }, "committer": { "name": "Tony Lindgren", "email": "tony@atomide.com", "time": "Tue Feb 28 14:27:01 2012 -0800" }, "message": "Merge branch \u0027iomap\u0027 into cleanup\n" }, { "commit": "2c799cef4d145af2182594a41cb5e5b42f2535c5", "tree": "0d2f7e028e2b5e3c616243828d743b818d23c93a", "parents": [ "ee0839c22cdda7f2e5f06e2d0351e2b49e0975ff" ], "author": { "name": "Tony Lindgren", "email": "tony@atomide.com", "time": "Fri Feb 24 10:34:35 2012 -0800" }, "committer": { "name": "Tony Lindgren", "email": "tony@atomide.com", "time": "Fri Feb 24 10:34:35 2012 -0800" }, "message": "ARM: OMAP: Remove plat/io.h by splitting it into mach/io.h and mach/hardware.h\n\nThis is needed to minimize io.h so the SoC specific io.h\nfor ARMs can removed.\n\nNote that minimal driver changes for DSS and RNG are needed to\ninclude cpu.h for SoC detection macros.\n\nCc: Tomi Valkeinen \u003ctomi.valkeinen@ti.com\u003e\nCc: Matt Mackall \u003cmpm@selenic.com\u003e\nCc: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\nSigned-off-by: Tony Lindgren \u003ctony@atomide.com\u003e\n" }, { "commit": "2e3ee9f45b3c25faa012abc9a62ab7aa515cd617", "tree": "0573cc65c3c8906453d949b5fe7f7499d1a25da1", "parents": [ "63325ff235deeed5a5fc25705e292239115c76cd" ], "author": { "name": "Tony Lindgren", "email": "tony@atomide.com", "time": "Fri Feb 24 10:34:34 2012 -0800" }, "committer": { "name": "Tony Lindgren", "email": "tony@atomide.com", "time": "Fri Feb 24 10:34:34 2012 -0800" }, "message": "ARM: OMAP1: Move most of plat/io.h into local iomap.h\n\nThere\u0027s no need to have these in plat/io.h.\n\nWhile at it, clean up the includes to group them\nlike they typically are grouped.\n\nSigned-off-by: Tony Lindgren \u003ctony@atomide.com\u003e\n" }, { "commit": "63325ff235deeed5a5fc25705e292239115c76cd", "tree": "115ac82cd6f5c5abaaf7b1e622a9b522914ca05a", "parents": [ "a4f34197120be8edfe099bb6cde35740d299b6d1" ], "author": { "name": "Tony Lindgren", "email": "tony@atomide.com", "time": "Fri Feb 24 10:34:33 2012 -0800" }, "committer": { "name": "Tony Lindgren", "email": "tony@atomide.com", "time": "Fri Feb 24 10:34:33 2012 -0800" }, "message": "ARM: OMAP1: Move 16xx GPIO system clock to platform init code\n\nThis way we can remove omap_read/write call from the GPIO driver\nand remove include to linux/io.h.\n\nCc: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\nSigned-off-by: Tony Lindgren \u003ctony@atomide.com\u003e\n" }, { "commit": "a4f34197120be8edfe099bb6cde35740d299b6d1", "tree": "f330f501a88c3bbda394c373623a0d8760287f30", "parents": [ "258ee922d7a4b4a9cfb947ce0e24d89f1ef20eb5" ], "author": { "name": "Tony Lindgren", "email": "tony@atomide.com", "time": "Fri Feb 24 10:34:33 2012 -0800" }, "committer": { "name": "Tony Lindgren", "email": "tony@atomide.com", "time": "Fri Feb 24 10:34:33 2012 -0800" }, "message": "ARM: OMAP: Move omap_init_consistent_dma_size() to local common.h\n\nWe don\u0027t want to keep it in io.h as we want to remove io.h\nfor omap2+ for the common zImage support.\n\nSigned-off-by: Tony Lindgren \u003ctony@atomide.com\u003e\n" }, { "commit": "5f1cc13fbf4cd0f798a08af2e0c04ae80ceac5e3", "tree": "c37a01284259f558f1994cce2128081f7b06de88", "parents": [ "1b2240eff66cb44f1d1c7c2c2497ff50ad3d1538" ], "author": { "name": "Tomi Valkeinen", "email": "tomi.valkeinen@ti.com", "time": "Tue Sep 20 15:35:37 2011 +0300" }, "committer": { "name": "Tomi Valkeinen", "email": "tomi.valkeinen@ti.com", "time": "Thu Feb 23 09:39:31 2012 +0200" }, "message": "OMAP1: Remove unused LCD devices from board files\n\nSome OMAP1 board files define LCD platform_devices, but there are no\ncorresponding LCD drivers for those in the kernel. Thus remove these LCD\ndevices.\n\nSigned-off-by: Tomi Valkeinen \u003ctomi.valkeinen@ti.com\u003e\nAcked-by: Tony Lindgren \u003ctony@atomide.com\u003e\n" }, { "commit": "ddba6c7f7ec6a82ccbce4126d615e73e00b4be12", "tree": "6dfd41afcce098982958c2cd137f57a85fc25462", "parents": [ "f060f95365ce71acbf29ef5dac580ab067600f4c" ], "author": { "name": "Tomi Valkeinen", "email": "tomi.valkeinen@ti.com", "time": "Tue Sep 20 15:23:13 2011 +0300" }, "committer": { "name": "Tomi Valkeinen", "email": "tomi.valkeinen@ti.com", "time": "Thu Feb 23 09:39:23 2012 +0200" }, "message": "OMAP1: pass LCD config with omapfb_set_lcd_config()\n\nLCD config for old omapfb driver is passed with OMAP_TAG_LCD from board\nfiles or from the bootloader. In an effort to remove OMAP_TAG_LCD, this\npatch adds omapfb_set_lcd_config() function that the board files can\ncall to set the LCD config.\n\nThis has the drawback that configuration can no longer come from the\nbootloader. Of the boards supported by the kernel, this should only\naffect N770 which depends on the data from the bootloader. This patch\nadds an LCD config for N770 to its board files, but that is most\nprobably broken. Fixing this would need information about the HW setup\nin N770 boards.\n\nSigned-off-by: Tomi Valkeinen \u003ctomi.valkeinen@ti.com\u003e\nAcked-by: Tony Lindgren \u003ctony@atomide.com\u003e\n" }, { "commit": "58e0d6ab02eb90e67720ef1c20ab606749a9ef29", "tree": "e020e9fecd5973d6781731a5806839c3175e3282", "parents": [ "f0e41ab53d97aa991f9cb48ec474a22108c97527" ], "author": { "name": "Tomi Valkeinen", "email": "tomi.valkeinen@ti.com", "time": "Tue Sep 20 12:16:49 2011 +0300" }, "committer": { "name": "Tomi Valkeinen", "email": "tomi.valkeinen@ti.com", "time": "Thu Feb 23 09:39:05 2012 +0200" }, "message": "OMAP: N770: remove HWA742 platform data\n\nIn an effort to clean up the old omapfb driver, this patch removes\nHWA742 (the display chip used in N770) platform data. This can be done\nas N770 is the only user of HWA742, and the platform data contains only\none field, te_connected, which we can just presume to be true in the\nHWA742 driver.\n\nThis allows us to remove omapfb_set_ctrl_platform_data(), and the\nmechanism to pass the platform data, in a later patch.\n\nSigned-off-by: Tomi Valkeinen \u003ctomi.valkeinen@ti.com\u003e\nAcked-by: Tony Lindgren \u003ctony@atomide.com\u003e\n" }, { "commit": "61b80086a525c8a6081257ae40da5dee2bcaee16", "tree": "675da35e4c03be3a5ca17bf6430e5b51dfed6296", "parents": [ "a5f17d1f4c2831b9b9bf8b1a537cdbac995d6e13", "230f984662d7e0e4a9597c665fd4f53130666e7d" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Wed Feb 22 22:04:41 2012 +0000" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Wed Feb 22 22:04:41 2012 +0000" }, "message": "Merge branch \u0027entry-macro-cleanup\u0027 of git://sources.calxeda.com/kernel/linux into for-armsoc\n" }, { "commit": "2226957ed2d84add88368aa4c4f69eae4b4843a3", "tree": "232a8933c7751ded58fc1f8f3d1e41f9bd2e5bc7", "parents": [ "ebe8f7e59d0de3a97d264220deeffa90b8b14003" ], "author": { "name": "Tony Lindgren", "email": "tony@atomide.com", "time": "Tue Feb 21 16:33:08 2012 -0800" }, "committer": { "name": "Tony Lindgren", "email": "tony@atomide.com", "time": "Tue Feb 21 16:33:08 2012 -0800" }, "message": "ARM: OMAP1: Fix out-of-bounds array access for Innovator\n\nOtherwise we can get the following on some compilers:\n\narch/arm/mach-omap1/board-innovator.c:419:19: warning:\narray subscript is above array bounds [-Warray-bounds]\narch/arm/mach-omap1/board-innovator.c:425:19: warning:\narray subscript is above array bounds [-Warray-bounds]\n\nSigned-off-by: Tony Lindgren \u003ctony@atomide.com\u003e\n" }, { "commit": "230f984662d7e0e4a9597c665fd4f53130666e7d", "tree": "7882d2ab796b9266db2e06676afd8fef9c418abd", "parents": [ "243c86542aeeb41d9ab78d3aa44fa6b4854fdb67" ], "author": { "name": "Rob Herring", "email": "rob.herring@calxeda.com", "time": "Sat Feb 04 09:41:36 2012 -0600" }, "committer": { "name": "Rob Herring", "email": "rob.herring@calxeda.com", "time": "Tue Feb 21 17:05:18 2012 -0600" }, "message": "ARM: remove disable_fiq and arch_ret_to_user macros\n\nNow that most platforms don\u0027t need disable_fiq and arch_ret_to_user\nmacros, we can remove the empty macros or empty entry-macro.S files.\n\nSigned-off-by: Rob Herring \u003crob.herring@calxeda.com\u003e\nAcked-by: Jamie Iles \u003cjamie@jamieiles.com\u003e\nAcked-by: Nicolas Pitre \u003cnico@linaro.org\u003e\nAcked-by: Tony Lindgren \u003ctony@atomide.com\u003e\nAcked-by: Linus Walleij \u003clinus.walleij@linaro.org\u003e\nAcked-by: Ryan Mallon \u003crmallon@gmail.com\u003e\nAcked-by: Nicolas Ferre \u003cnicolas.ferre@atmel.com\u003e\nAcked-by: H Hartley Sweeten \u003chsweeten@visionengravers.com\u003e\nAcked-by: Shawn Guo \u003cshawn.guo@linaro.org\u003e\n" }, { "commit": "6bd1d5867abfd3675cf17a8c46f2425bcf844804", "tree": "d01c2f0439ec8421a53475848c0518639f607f00", "parents": [ "481e6283bbccc20a3a7e6a8e50f9562a20e9b45d" ], "author": { "name": "Masanari Iida", "email": "standby24x7@gmail.com", "time": "Mon Feb 06 23:16:44 2012 +0900" }, "committer": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Thu Feb 09 23:09:36 2012 +0100" }, "message": "mach-omap1: Fix typo in lcd_dma.c\n\nCorrect spelling \"resulotion\" to \"resolution\" in\narch/arm/mach-omap1/lcd_dma.c\n\nSigned-off-by: Masanari Iida \u003cstandby24x7@gmail.com\u003e\nSigned-off-by: Jiri Kosina \u003cjkosina@suse.cz\u003e\n" }, { "commit": "ec9af5d9f9399ceb340ee26afcc7d23e9d2a94c2", "tree": "a5bde75783f66abd4ac6bca5e3f8cc194268f0f9", "parents": [ "d0d665a896c5b9a0aa60e8bac15c270cb59aa9e7" ], "author": { "name": "Charulatha V", "email": "charu@ti.com", "time": "Wed May 25 12:44:28 2011 +0530" }, "committer": { "name": "Tarun Kanti DebBarma", "email": "tarun.kanti@ti.com", "time": "Mon Feb 06 14:13:44 2012 +0530" }, "message": "gpio/omap: fix bankwidth for OMAP7xx MPUIO\n\nIn all OMAP1 SoCs, the MPUIO bank width is 16 bits. But, in OMAP7xx,\nit is wrongly initialised to 32. Fix this.\n\nSigned-off-by: Charulatha V \u003ccharu@ti.com\u003e\nReviewed-by: Santosh Shilimkar \u003csantosh.shilimkar@ti.com\u003e\nAcked-by: Tony Lindgren \u003ctony@atomide.com\u003e\nReviewed-by: Kevin Hilman \u003ckhilman@ti.com\u003e\nSigned-off-by: Kevin Hilman \u003ckhilman@ti.com\u003e\n" }, { "commit": "d0d665a896c5b9a0aa60e8bac15c270cb59aa9e7", "tree": "de66912f404bbf0987427e4b0bfc772ebb963e3e", "parents": [ "d3901eaf1fc289e8175faa8c7c460d542b6eb7dd" ], "author": { "name": "Charulatha V", "email": "charu@ti.com", "time": "Wed Aug 31 00:02:21 2011 +0530" }, "committer": { "name": "Tarun Kanti DebBarma", "email": "tarun.kanti@ti.com", "time": "Mon Feb 06 14:13:43 2012 +0530" }, "message": "gpio/omap: remove bank-\u003emethod \u0026 METHOD_* macros\n\nThe only bank-\u003etype (method) used in the OMAP GPIO driver is MPUIO type as they\nneed to be handled separately. Identify the same using a flag and remove all\nMETHOD_* macros.\n\nmpuio_init() function is defined under #ifdefs. It is required only in case\nof MPUIO bank type and only when PM operations are supported by it.\nThis is applicable only in case of OMAP16xx SoC\u0027s MPUIO GPIO bank type.\nFor all the other cases it is a dummy function. Hence clean up the same\nand remove all the OMAP SoC specific #ifdefs.\n\nSigned-off-by: Charulatha V \u003ccharu@ti.com\u003e\nSigned-off-by: Tarun Kanti DebBarma \u003ctarun.kanti@ti.com\u003e\nReviewed-by: Santosh Shilimkar \u003csantosh.shilimkar@ti.com\u003e\nAcked-by: Tony Lindgren \u003ctony@atomide.com\u003e\nReviewed-by: Kevin Hilman \u003ckhilman@ti.com\u003e\nSigned-off-by: Kevin Hilman \u003ckhilman@ti.com\u003e\n" }, { "commit": "fad96ea825e7a8ee0c5b77292b470e4978157ee7", "tree": "1e013b7a881a3abaa6a6e6b1812bfdd38537cae1", "parents": [ "ab985f0f7c2c0ef90b7c832f0c04f470dda0593d" ], "author": { "name": "Charulatha V", "email": "charu@ti.com", "time": "Wed May 25 11:23:50 2011 +0530" }, "committer": { "name": "Tarun Kanti DebBarma", "email": "tarun.kanti@ti.com", "time": "Mon Feb 06 14:13:43 2012 +0530" }, "message": "gpio/omap: use pinctrl offset instead of macro\n\nUse regs-\u003epinctrl field instead of using the macro OMAP1510_GPIO_PIN_CONTROL\n\nSigned-off-by: Charulatha V \u003ccharu@ti.com\u003e\nReviewed-by: Santosh Shilimkar \u003csantosh.shilimkar@ti.com\u003e\nAcked-by: Tony Lindgren \u003ctony@atomide.com\u003e\nReviewed-by: Kevin Hilman \u003ckhilman@ti.com\u003e\nSigned-off-by: Kevin Hilman \u003ckhilman@ti.com\u003e\n" }, { "commit": "ab985f0f7c2c0ef90b7c832f0c04f470dda0593d", "tree": "6a65b11d802d12787147d6cfab49758101f5389f", "parents": [ "5e571f38f6a44ef541fac0821631509d787ef0cd" ], "author": { "name": "Tarun Kanti DebBarma", "email": "tarun.kanti@ti.com", "time": "Tue Sep 13 15:12:05 2011 +0530" }, "committer": { "name": "Tarun Kanti DebBarma", "email": "tarun.kanti@ti.com", "time": "Mon Feb 06 14:13:42 2012 +0530" }, "message": "gpio/omap: cleanup omap_gpio_mod_init function\n\nWith register offsets now defined for respective OMAP versions we can get rid\nof cpu_class_* checks. This function now has common initialization code for\nall OMAP versions. Initialization specific to OMAP16xx has been moved within\nomap16xx_gpio_init().\n\nSigned-off-by: Tarun Kanti DebBarma \u003ctarun.kanti@ti.com\u003e\nSigned-off-by: Charulatha V \u003ccharu@ti.com\u003e\nReviewed-by: Santosh Shilimkar \u003csantosh.shilimkar@ti.com\u003e\nAcked-by: Tony Lindgren \u003ctony@atomide.com\u003e\nReviewed-by: Kevin Hilman \u003ckhilman@ti.com\u003e\nSigned-off-by: Kevin Hilman \u003ckhilman@ti.com\u003e\n" }, { "commit": "5e571f38f6a44ef541fac0821631509d787ef0cd", "tree": "eb19a3db74cae81d503ec8689fcc03bde8c27dfb", "parents": [ "ae10f2336b9c0c8da73da2878eba684ab876eb8f" ], "author": { "name": "Tarun Kanti DebBarma", "email": "tarun.kanti@ti.com", "time": "Tue Sep 13 15:02:14 2011 +0530" }, "committer": { "name": "Tarun Kanti DebBarma", "email": "tarun.kanti@ti.com", "time": "Mon Feb 06 14:13:42 2012 +0530" }, "message": "gpio/omap: cleanup set_gpio_triggering function\n\nGetting rid of ifdefs within the function by adding register offset intctrl\nand associating OMAPXXXX_GPIO_INT_CONTROL in respective SoC specific files.\nAlso, use wkup_status register consistently instead of referring to wakeup\nclear and wakeup set register offsets. Get rid of cpu_is_xxxx checks in\nset_gpio_trigger() using irqctrl.\n\nSigned-off-by: Charulatha V \u003ccharu@ti.com\u003e\nSigned-off-by: Tarun Kanti DebBarma \u003ctarun.kanti@ti.com\u003e\nReviewed-by: Santosh Shilimkar \u003csantosh.shilimkar@ti.com\u003e\nAcked-by: Tony Lindgren \u003ctony@atomide.com\u003e\nReviewed-by: Kevin Hilman \u003ckhilman@ti.com\u003e\nSigned-off-by: Kevin Hilman \u003ckhilman@ti.com\u003e\n" }, { "commit": "6ed87c5b66ca81996fae2dae6d1e702d66b9832b", "tree": "af6b3cfb3ec6627ebc7fec876abf470dd8482bec", "parents": [ "c8eef65a2fc311f8edca47f2e4ac2cccb70eb192" ], "author": { "name": "Tarun Kanti DebBarma", "email": "tarun.kanti@ti.com", "time": "Tue Sep 13 14:41:44 2011 +0530" }, "committer": { "name": "Tarun Kanti DebBarma", "email": "tarun.kanti@ti.com", "time": "Mon Feb 06 14:13:41 2012 +0530" }, "message": "gpio/omap: further cleanup using wkup_en register\n\nWakeup enable register offset initialized according to OMAP versions\nduring device registration. Use this to avoid version checks.\nStarting with OMAP4, legacy registers should not be used in combination\nwith the updated regsiters. Use wkup_en register consistently for\nall SoCs wherever applicable.\n\nSigned-off-by: Tarun Kanti DebBarma \u003ctarun.kanti@ti.com\u003e\nSigned-off-by: Charulatha V \u003ccharu@ti.com\u003e\nReviewed-by: Santosh Shilimkar \u003csantosh.shilimkar@ti.com\u003e\nAcked-by: Tony Lindgren \u003ctony@atomide.com\u003e\nReviewed-by: Kevin Hilman \u003ckhilman@ti.com\u003e\nSigned-off-by: Kevin Hilman \u003ckhilman@ti.com\u003e\n" }, { "commit": "03e128ca35e5da22e9e65ec8ab158ec0e905fdea", "tree": "2c1a95e5a8dd50429291f27a537e6b8cfadf22e5", "parents": [ "62aa2b537c6f5957afd98e29f96897419ed5ebab" ], "author": { "name": "Charulatha V", "email": "charu@ti.com", "time": "Thu May 05 19:58:01 2011 +0530" }, "committer": { "name": "Tarun Kanti DebBarma", "email": "tarun.kanti@ti.com", "time": "Mon Feb 06 14:13:40 2012 +0530" }, "message": "gpio/omap: remove dependency on gpio_bank_count\n\nThe gpio_bank_count is the count of number of GPIO devices in a SoC. Remove this\ndependency from the driver by using list. Also remove the dependency on array of\npointers to gpio_bank struct of all GPIO devices.\n\nSigned-off-by: Charulatha V \u003ccharu@ti.com\u003e\nReviewed-by: Santosh Shilimkar \u003csantosh.shilimkar@ti.com\u003e\nAcked-by: Tony Lindgren \u003ctony@atomide.com\u003e\nReviewed-by: Kevin Hilman \u003ckhilman@ti.com\u003e\nSigned-off-by: Kevin Hilman \u003ckhilman@ti.com\u003e\n" }, { "commit": "a570067df9cc1b1821ca5255bbbe8adb67aca199", "tree": "68303401d0e4eeca83373155af908a15ac402799", "parents": [ "ae940913030386884f259eb4d95ac4d93b57144f" ], "author": { "name": "Nicolas Pitre", "email": "nicolas.pitre@linaro.org", "time": "Mon Dec 19 03:29:16 2011 -0500" }, "committer": { "name": "Nicolas Pitre", "email": "nico@fluxnic.net", "time": "Fri Jan 20 19:25:58 2012 -0500" }, "message": "ARM: big removal of now unused arch_idle()\n\nWhen this is the only content remaining in mach/system.h then the\nwhole file is removed.\n\nSigned-off-by: Nicolas Pitre \u003cnicolas.pitre@linaro.org\u003e\nAcked-by: H Hartley Sweeten \u003chsweeten@visionengravers.com\u003e\nAcked-and-tested-by: Jamie Iles \u003cjamie@jamieiles.com\u003e\nAcked-by: Tony Lindgren \u003ctony@atomide.com\u003e\nAcked-by: David Brown \u003cdavidb@codeaurora.org\u003e\nAcked-by: Stephen Warren \u003cswarren@nvidia.com\u003e\nAcked-by: Linus Walleij \u003clinus.walleij@linaro.org\u003e\n" }, { "commit": "0bcd24b0f414003c695e2ecf16b9ffa14d184f48", "tree": "eee9b72c44f0b745b29cf2733e625f4f654a1a28", "parents": [ "4fa20439a80c008d33f2865b0db94dcb5da467e2" ], "author": { "name": "Nicolas Pitre", "email": "nicolas.pitre@linaro.org", "time": "Wed Jan 04 16:27:48 2012 -0500" }, "committer": { "name": "Nicolas Pitre", "email": "nico@fluxnic.net", "time": "Fri Jan 20 18:55:06 2012 -0500" }, "message": "ARM: OMAP: convert idle handlers from pm_idle to arm_pm_idle\n\nSigned-off-by: Nicolas Pitre \u003cnico@linaro.org\u003e\nTested-by: Tony Lindgren \u003ctony@atomide.com\u003e\n" }, { "commit": "3c0b2cef913c8f92b15a5a1fe7b611836f7f80bf", "tree": "51274bccadd592591d4e3e0857047b5bd498517f", "parents": [ "dcd6c92267155e70a94b3927bce681ce74b80d1f" ], "author": { "name": "Nicolas Pitre", "email": "nicolas.pitre@linaro.org", "time": "Mon Dec 19 09:11:11 2011 -0800" }, "committer": { "name": "Nicolas Pitre", "email": "nico@fluxnic.net", "time": "Fri Jan 20 18:55:05 2012 -0500" }, "message": "ARM: OMAP1: Fix pm_idle during suspend\n\nCommit 9ccdac3662dbf3c75e8f8851a214bdf7d365a4bd ([ARM] idle:\nclean up pm_idle calling, obey hlt_counter) removed a check\nfor NULL pm_idle.\n\nReplace the NULL assignment in the OMAP1 code with disable_hlt()\nto be in sync with the core code and restore the intended behavior.\n\nSigned-off-by: Nicolas Pitre \u003cnicolas.pitre@linaro.org\u003e\nAcked-by: Tony Lindgren \u003ctony@atomide.com\u003e\n" }, { "commit": "967809bd7faf71ddc29c8081e0f21db8b201a0f4", "tree": "256bcce2b13a45b573b02ef73dcebe1f08a03593", "parents": [ "dcd6c92267155e70a94b3927bce681ce74b80d1f", "8d09a1bb3147ddbcf0a9483021ca699c54c54732" ], "author": { "name": "Tony Lindgren", "email": "tony@atomide.com", "time": "Fri Jan 20 05:31:52 2012 -0800" }, "committer": { "name": "Tony Lindgren", "email": "tony@atomide.com", "time": "Fri Jan 20 05:31:52 2012 -0800" }, "message": "Merge branch \u0027omap1-part2\u0027 into omap1\n\nConflicts:\n\tdrivers/leds/leds-ams-delta.c\n" }, { "commit": "5ede3ceb7b2c2843e153a1803edbdc8c56655950", "tree": "4cfa82b619f7d39b671e4a2a213f4d040b09c486", "parents": [ "6d889d03ab1417645e76e129834f76204bae37c0", "3e2762c8f1141ae8dc708034ea41d6827818c328" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 09 14:38:51 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 09 14:38:51 2012 -0800" }, "message": "Merge tag \u0027devel\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc\n\nNew feature development\n\nThis adds support for new features, and contains stuff from most\nplatforms. A number of these patches could have fit into other\nbranches, too, but were small enough not to cause too much\nconfusion here.\n\n* tag \u0027devel\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (28 commits)\n mfd/db8500-prcmu: remove support for early silicon revisions\n ARM: ux500: fix the smp_twd clock calculation\n ARM: ux500: remove support for early silicon revisions\n ARM: ux500: update register files\n ARM: ux500: register DB5500 PMU dynamically\n ARM: ux500: update ASIC detection for U5500\n ARM: ux500: support DB8520\n ARM: picoxcell: implement watchdog restart\n ARM: OMAP3+: hwmod data: Add the default clockactivity for I2C\n ARM: OMAP3: hwmod data: disable multiblock reads on MMC1/2 on OMAP34xx/35xx \u003c\u003d ES2.1\n ARM: OMAP: USB: EHCI and OHCI hwmod structures for OMAP4\n ARM: OMAP: USB: EHCI and OHCI hwmod structures for OMAP3\n ARM: OMAP: hwmod data: Add support for AM35xx UART4/ttyO3\n ARM: Orion: Remove address map info from all platform data structures\n ARM: Orion: Get address map from plat-orion instead of via platform_data\n ARM: Orion: mbus_dram_info consolidation\n ARM: Orion: Consolidate the address map setup\n ARM: Kirkwood: Add configuration for MPP12 as GPIO\n ARM: Kirkwood: Recognize A1 revision of 6282 chip\n ARM: ux500: update the MOP500 GPIO assignments\n ...\n" }, { "commit": "7b9dd47136c07ffd883aff6926c7b281e4c1eea4", "tree": "b835312e76fe323de3e1cbbb0d15fca5a3f7ef9c", "parents": [ "2e0e943436912ffe0848ece58167edfe754edb96", "0575fb754dbfc32a01f297e778533340a533ec68" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Thu Jan 05 13:25:15 2012 +0000" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Thu Jan 05 13:25:27 2012 +0000" }, "message": "Merge branch \u0027restart\u0027 into for-linus\n\nConflicts:\n\tarch/arm/mach-exynos/cpu.c\n\nThe changes to arch/arm/mach-exynos/cpu.c were moved to\nmach-exynos/common.c.\n" }, { "commit": "2e0e943436912ffe0848ece58167edfe754edb96", "tree": "b91919095c74742fa06e2105db6d859bee39b2b4", "parents": [ "a32737e1ca650504f172292dd344eb64c02311f3", "ef3a0bf5bfadbace156fa2a3b9c753df2de41df2" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Thu Jan 05 13:24:33 2012 +0000" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Thu Jan 05 13:24:33 2012 +0000" }, "message": "Merge branch \u0027devel-stable\u0027 into for-linus\n\nConflicts:\n\tarch/arm/kernel/setup.c\n\tarch/arm/mach-shmobile/board-kota2.c\n" }, { "commit": "baa9588344d35d751d6e2b1677ec67e7b32d2878", "tree": "16996ca64d788d0fcd66053dd9d50d4557eea5c2", "parents": [ "35b47a405db2b26ce4e541e7add02e792b04f1fe" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Sat Nov 05 17:06:28 2011 +0000" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Thu Jan 05 12:57:16 2012 +0000" }, "message": "ARM: restart: omap: use new restart hook\n\nHook these platforms restart code into the new restart hook rather\nthan using arch_reset().\n\nAcked-by: Tony Lindgren \u003ctony@atomide.com\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "4c5f830c4c9d4f19c1eef356c0cd322b46d695c9", "tree": "a14ad6c652736bb28859a7aec392a01b236ae58d", "parents": [ "cc511b8d84d88ab788cddbfe8d21485b1c387493", "2e3d256de9d3db5a7ca19b61305627a516b54b45" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Thu Jan 05 12:55:03 2012 +0000" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Thu Jan 05 12:55:03 2012 +0000" }, "message": "Merge branch \u0027for-russell\u0027 of git://hansjkoch.de/git/linux-tcc into HEAD\n\nConflicts:\n\tarch/arm/plat-omap/include/plat/common.h\n" }, { "commit": "8d09a1bb3147ddbcf0a9483021ca699c54c54732", "tree": "5d968498a2d40612b94e93831ce6f59d9cb355cc", "parents": [ "a218d19f6a91c076c7ed8a7c0082f777248c5394" ], "author": { "name": "Janusz Krzysztofik", "email": "jkrzyszt@tis.icnet.pl", "time": "Tue Dec 20 23:10:34 2011 +0100" }, "committer": { "name": "Tony Lindgren", "email": "tony@atomide.com", "time": "Thu Dec 22 09:00:46 2011 -0800" }, "message": "input: serio: ams-delta: toggle keyboard power over GPIO\n\nDon\u0027t use Amstrad Delta custom I/O functions once GPIO interface is\navailable for the underlying hardware.\n\nWhile requesting and initializing GPIO pins used, also take care of one\nextra pin KEYBRD_DATAOUT which, even if not used by the driver, belongs\nto the device and affects its functioning.\n\nOnce done, move the driver initialization back to the device_initcall\nlevel, reverting the temporary chane introduced with patch 1/7 \"ARM:\nOMAP1: ams-delta: register latch dependent devices later\". That change\nis no longer required once the driver takes care of registering used\nGPIO pins, and it\u0027s better to initialize the device before others using\nthe latch2 based GPIO pins, otherwise a garbage is reported on boot,\nperhaps due to random data already captured by the FIQ handler while the\nkeyboard related latch bits are written with random values during\ninitialization of those other latch2 dependent devices.\n\nSigned-off-by: Janusz Krzysztofik \u003cjkrzyszt@tis.icnet.pl\u003e\nAcked-by: Dmitry Torokhov \u003cdtor@mail.ru\u003e\n[tony@atomide.com: renamed _gpios to ams_delta_gpios]\nSigned-off-by: Tony Lindgren \u003ctony@atomide.com\u003e\n" }, { "commit": "a218d19f6a91c076c7ed8a7c0082f777248c5394", "tree": "5506a689551166dd05412612fc660ce6b7b56849", "parents": [ "68f0676699fb0e0b18feb8459c35ecdfe3127b3d" ], "author": { "name": "Janusz Krzysztofik", "email": "jkrzyszt@tis.icnet.pl", "time": "Tue Dec 20 00:08:56 2011 +0100" }, "committer": { "name": "Tony Lindgren", "email": "tony@atomide.com", "time": "Thu Dec 22 09:00:46 2011 -0800" }, "message": "omapfb: lcd_ams_delta: drive control lines over GPIO\n\nDon\u0027t use Amstrad Delta custom I/O functions any longer, use GPIO API\ninstead.\n\nSigned-off-by: Janusz Krzysztofik \u003cjkrzyszt@tis.icnet.pl\u003e\nAcked-by: Tomi Valkeinen \u003ctomi.valkeinen@ti.com\u003e\nSigned-off-by: Tony Lindgren \u003ctony@atomide.com\u003e\n" }, { "commit": "68f0676699fb0e0b18feb8459c35ecdfe3127b3d", "tree": "3104af9427508e6f0ebed0e143ab5965052bbb58", "parents": [ "f6fc8a6a1a08e520ae58b9abd54152aa101af14a" ], "author": { "name": "Janusz Krzysztofik", "email": "jkrzyszt@tis.icnet.pl", "time": "Tue Dec 20 00:08:55 2011 +0100" }, "committer": { "name": "Tony Lindgren", "email": "tony@atomide.com", "time": "Thu Dec 22 08:59:49 2011 -0800" }, "message": "MTD: NAND: ams-delta: use GPIO instead of custom I/O\n\nDon\u0027t use Amstrad Delta custom I/O functions for controlling the device,\nuse GPIO API instead.\n\nWhile being at it, add missing gpio_free(AMS_DELTA_GPIO_PIN_NAND_RB).\n\nSigned-off-by: Janusz Krzysztofik \u003cjkrzyszt@tis.icnet.pl\u003e\nCc: David Woodhouse \u003cdwmw2@infradead.org\u003e\nReviewed-by: Artem Bityutskiy \u003cArtem.Bityutskiy@linux.intel.com\u003e\nSigned-off-by: Tony Lindgren \u003ctony@atomide.com\u003e\n" }, { "commit": "5ca6180fa6d7333fb5fabf30420b0e3cc32dd731", "tree": "d2bcd9a2e73ceece085b8a0c3680c395c125040e", "parents": [ "937eb4bb00588571f223eade260f9b509bf223ab" ], "author": { "name": "Janusz Krzysztofik", "email": "jkrzyszt@tis.icnet.pl", "time": "Tue Dec 20 00:08:53 2011 +0100" }, "committer": { "name": "Tony Lindgren", "email": "tony@atomide.com", "time": "Thu Dec 22 08:59:49 2011 -0800" }, "message": "ARM: OMAP1: ams-delta: supersede custom led device by leds-gpio\n\nNow that the Amstrad Delta on-board latches have been converted to GPIO\ndevices, use the generic driver to control on-board LEDs which hang off\nthose latches.\n\nSigned-off-by: Janusz Krzysztofik \u003cjkrzyszt@tis.icnet.pl\u003e\nSigned-off-by: Tony Lindgren \u003ctony@atomide.com\u003e\n" }, { "commit": "937eb4bb00588571f223eade260f9b509bf223ab", "tree": "d8074b6a3126f556238ffbeac59a17431564b5e3", "parents": [ "f7519d8c8290765a9408a52db4ba4a368ff72ca5" ], "author": { "name": "Janusz Krzysztofik", "email": "jkrzyszt@tis.icnet.pl", "time": "Tue Dec 20 03:24:21 2011 +0100" }, "committer": { "name": "Tony Lindgren", "email": "tony@atomide.com", "time": "Thu Dec 22 08:59:49 2011 -0800" }, "message": "ARM: OMAP1: ams-delta: convert latches to basic_mmio_gpio\n\nOnce ready, ams-delta specific device drivers currently calling custom\nams_delta_latch[12]_write() functions can be updated to call generic\ngpio_set_value() instead, which will make them less platform dependent.\nEven more, some custom ams-delta only drivers can perhaps be dropped\nfrom the tree after converting selected ams-delta platform devices to\nfollow generic GPIO based device models.\n\nThe latch_gpios[] table is initially filled with all latch1 and latch2\nGPIO pins in order to register and initialize them from the board file\nuntil those are handled by respective existing device drivers (leds,\nnand, lcd, serio, asoc, serial). That table will get almost empty after\nthe transision process is completed, holding only pins not used by any\ndrivers / connected to unused devices, in order to initialize them from\nthe board file for power saving purposes.\n\nThe new ams_delta_latch_write() function is a unified replacement for\nthose removed ams_delta_latch[12]_write(), and serves as a temporary\nwrapper over gpio_set_value(), providing the old API for those not yet\nupdated device drivers, and will be removed after all custom drivers are\nconverted or replaced.\n\nSigned-off-by: Janusz Krzysztofik \u003cjkrzyszt@tis.icnet.pl\u003e\nSigned-off-by: Tony Lindgren \u003ctony@atomide.com\u003e\n" }, { "commit": "f7519d8c8290765a9408a52db4ba4a368ff72ca5", "tree": "2942b23d36d15a87588e1a1660b0f552c02eedae", "parents": [ "c116abc43df9ce3ebe5fbf2fbd6ae2edd6a9bd87" ], "author": { "name": "Janusz Krzysztofik", "email": "jkrzyszt@tis.icnet.pl", "time": "Tue Dec 20 22:54:18 2011 +0100" }, "committer": { "name": "Tony Lindgren", "email": "tony@atomide.com", "time": "Wed Dec 21 10:47:01 2011 -0800" }, "message": "ARM: OMAP1: ams-delta: register latch dependent devices later\n\nIn preparation to converting Amstrad Delta on-board latches to\nbasic_mmio_gpio devices, registration of platform devices which depend\non latches and will require initialization of their GPIO pins first,\nshould be moved out of .machine_init down to late_initcall level, as the\ngpio-generic driver is not available until device_initcall time. The\nlatch reset operation, which will be replaced with GPIO initialization,\nmust also be moved to late_initcall for the same reason.\n\nSince there was already another, separate arch_initcall function for\nsetting up one of those latch dependent devices, the on-board modem\ndevice, reuse that function, i.e., rename it to a name that matches the\nnew purpose, extend with other device setup relocated from\n.machine_init, and move down to the late_initcall level.\n\nWhile being at it, add missing gpio_free() in case the modem platform\ndevice registration fails.\n\nThanks to Tony Lindgren \u003ctony@atomide.com\u003e who suggested this approach\ninstead of shifting up the gpio-generic driver initialization.\n\nIn addition, defer registration of the Amstrad Delta ASoC and serio\ndevices, done from their device driver files, until late_initcall time,\nas those drivers will depend on their GPIO pins already requested from\nthe board late_init() function until updated to register their GPIO pins\nthemselves.\n\nSigned-off-by: Janusz Krzysztofik \u003cjkrzyszt@tis.icnet.pl\u003e\nAcked-by: Mark Brown \u003cbroonie@opensource.wolfsonmicro.com\u003e\nSigned-off-by: Tony Lindgren \u003ctony@atomide.com\u003e\n" }, { "commit": "4b3ee30b5201ddeefdc56ad32b6bbc1fab8b084a", "tree": "0ac643f1a0c57a88452ef017c61d325fab98d00a", "parents": [ "f68453e076dcf140c4a7bdd385f239b1e41be983", "1b46f8782c2607afa1298b0c7f7fe307fc0f7a5b" ], "author": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Mon Dec 19 21:12:47 2011 -0800" }, "committer": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Mon Dec 19 21:12:53 2011 -0800" }, "message": "Merge branch \u0027picoxcell/devel\u0027 into next/devel\n\n* picoxcell/devel: (1 commit)\n ARM: picoxcell: implement watchdog restart\n" }, { "commit": "2f0778afac79bd8d226225556858a636931eeabc", "tree": "e00cea674f3d6cc8c5584aa5b75239f11f6d229d", "parents": [ "3bdc3484e8f2b1b219ad0397d81ce4601fbaf76d" ], "author": { "name": "Marc Zyngier", "email": "Marc.Zyngier@arm.com", "time": "Thu Dec 15 12:19:23 2011 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Sun Dec 18 23:00:26 2011 +0000" }, "message": "ARM: 7205/2: sched_clock: allow sched_clock to be selected at runtime\n\nsched_clock() is yet another blocker on the road to the single\nimage. This patch implements an idea by Russell King:\n\nhttp://www.spinics.net/lists/linux-omap/msg49561.html\n\nInstead of asking the platform to implement both sched_clock()\nitself and the rollover callback, simply register a read()\nfunction, and let the ARM code care about sched_clock() itself,\nthe conversion to ns and the rollover. sched_clock() uses\nthis read() function as an indirection to the platform code.\nIf the platform doesn\u0027t provide a read(), the code falls back\nto the jiffy counter (just like the default sched_clock).\n\nThis allow some simplifications and possibly some footprint gain\nwhen multiple platforms are compiled in. Among the drawbacks,\nthe removal of the *_fixed_sched_clock optimization which could\nnegatively impact some platforms (sa1100, tegra, versatile\nand omap).\n\nTested on 11MPCore, OMAP4 and Tegra.\n\nCc: Imre Kaloz \u003ckaloz@openwrt.org\u003e\nCc: Eric Miao \u003ceric.y.miao@gmail.com\u003e\nCc: Colin Cross \u003cccross@android.com\u003e\nCc: Erik Gilling \u003ckonkers@android.com\u003e\nCc: Olof Johansson \u003colof@lixom.net\u003e\nCc: Sascha Hauer \u003ckernel@pengutronix.de\u003e\nCc: Alessandro Rubini \u003crubini@unipv.it\u003e\nCc: STEricsson \u003cSTEricsson_nomadik_linux@list.st.com\u003e\nCc: Lennert Buytenhek \u003ckernel@wantstofly.org\u003e\nCc: Ben Dooks \u003cben-linux@fluff.org\u003e\nTested-by: Jamie Iles \u003cjamie@jamieiles.com\u003e\nTested-by: Tony Lindgren \u003ctony@atomide.com\u003e\nTested-by: Kyungmin Park \u003ckyungmin.park@samsung.com\u003e\nAcked-by: Linus Walleij \u003clinus.walleij@linaro.org\u003e\nAcked-by: Nicolas Pitre \u003cnico@linaro.org\u003e\nAcked-by: Krzysztof Halasa \u003ckhc@pm.waw.pl\u003e\nAcked-by: Kukjin Kim \u003ckgene.kim@samsung.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": "c116abc43df9ce3ebe5fbf2fbd6ae2edd6a9bd87", "tree": "192d5179faf468851e1782273a788d275e0c8213", "parents": [ "f9e5908fa04e15a681dc4695b53c2c0c1d9b9a03" ], "author": { "name": "Janusz Krzysztofik", "email": "jkrzyszt@tis.icnet.pl", "time": "Sun Dec 04 16:07:47 2011 +0100" }, "committer": { "name": "Tony Lindgren", "email": "tony@atomide.com", "time": "Thu Dec 08 18:02:28 2011 -0800" }, "message": "ARM: OMAP1: Always reprogram dpll1 rate at boot\n\nDPLL1 reprogramming to a different rate is actually blocked inside\nomap1_select_table_rate(). However, it is already forced at boot, for\nboards which boot at unusable clock rates, and this seems to work\ncorrectly.\n\nOTOH, we now have a fine, run time performed clock selection algorithm\nimplemented, which prevents less powerfull SoCs from being overclocked\nunintentionally.\n\nAllow reprogramming of dpll1 by default, and use it for switching to the\nhigest supported clock rate with all boards, including those already\nbooting at a usable rate of 60 MHz or above.\n\nCreated against linux-omap/master tip as of Thu Dec 1,\ncommit f83c2a8cbb59981722d1ab610c79adfd034a2667. Requires the just\nsubmitted patch \"ARM: OMAP1: Move dpll1 rates selection from config to\nruntime\" to prevent from unintentional overclocking. Tested on Amstrad\nDelta.\n\nSigned-off-by: Janusz Krzysztofik \u003cjkrzyszt@tis.icnet.pl\u003e\nSigned-off-by: Tony Lindgren \u003ctony@atomide.com\u003e\n" }, { "commit": "f9e5908fa04e15a681dc4695b53c2c0c1d9b9a03", "tree": "e5174f71bffc3b93d4043a2e65756ff9ac85769d", "parents": [ "24ce2705c2dd50e51f325c6e57dec378adc8c135" ], "author": { "name": "Janusz Krzysztofik", "email": "jkrzyszt@tis.icnet.pl", "time": "Thu Dec 01 22:16:26 2011 +0100" }, "committer": { "name": "Tony Lindgren", "email": "tony@atomide.com", "time": "Thu Dec 08 18:02:25 2011 -0800" }, "message": "ARM: OMAP1: Update dpll1 default rate reprogramming method\n\nAccording to comments in omap1_select_table_rate(), reprogramming dpll1\nis tricky, and should always be done from SRAM.\n\nWhile being at it, move OMAP730 special case handling inside\nomap_sram_reprogram_clock().\n\nCreated on top of version 2 of the series \"ARM: OMAP1: Fix dpll1\nreprogramming related issues\", which it depends on.\nTested on Amstrad Delta.\n\nSigned-off-by: Janusz Krzysztofik \u003cjkrzyszt@tis.icnet.pl\u003e\nSigned-off-by: Tony Lindgren \u003ctony@atomide.com\u003e\n" }, { "commit": "24ce2705c2dd50e51f325c6e57dec378adc8c135", "tree": "9f0688dae115c48d87ea8cda615a64831fb3c80d", "parents": [ "ee62e93a3c135ae18f2fa18615ce065fe5487259" ], "author": { "name": "Janusz Krzysztofik", "email": "jkrzyszt@tis.icnet.pl", "time": "Thu Dec 08 18:01:41 2011 -0800" }, "committer": { "name": "Tony Lindgren", "email": "tony@atomide.com", "time": "Thu Dec 08 18:02:23 2011 -0800" }, "message": "ARM: OMAP1: Move dpll1 rates selection from config to runtime\n\nFor still better multi-OMAP1 support, expand omap1_rate_table with flags\nfor different SoC types and match them while selecting clock rates. The\nidea is stolen from current omap24xx clock rate selection algorithm.\n\nSince clkdev platform flag definitions are reused here, those had to be\nexpanded with one extra entry for OMAP1710 subtype, as this is the only\nSoC for which we allow selection of the highest, 216 MHz rate.\n\nOnce done, remove no longer needed clock rate configure time options.\n\nTested on Amstrad Delta.\n\nSigned-off-by: Janusz Krzysztofik \u003cjkrzyszt@tis.icnet.pl\u003e\n[tony@atomide.com: updated comments]\nSigned-off-by: Tony Lindgren \u003ctony@atomide.com\u003e\n" }, { "commit": "73829af71fdb8655e7ba4b5a2a6612ad34a75a11", "tree": "4277605ab142a4f02ff4efad9a7fe522054b7a7f", "parents": [ "742eaa6a6e356a16788ce6530271de89bc4f8fb5", "0af362f8440a78b970d5f215e234420fa87d0f3f" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Mon Dec 05 23:27:54 2011 +0000" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Mon Dec 05 23:27:59 2011 +0000" }, "message": "Merge branch \u0027vmalloc\u0027 of git://git.linaro.org/people/nico/linux into devel-stable\n" }, { "commit": "742eaa6a6e356a16788ce6530271de89bc4f8fb5", "tree": "12fc040daab06ac796c61c1d92bfad9bb054d1c1", "parents": [ "ba8bb18a03f8c7508565c385576a5431a4ad804a", "ae72fd588a2b302222769b44775912b83f0785eb" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Mon Dec 05 23:20:17 2011 +0000" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Mon Dec 05 23:20:17 2011 +0000" }, "message": "Merge branch \u0027for-rmk\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux into devel-stable\n\nConflicts:\n\tarch/arm/common/gic.c\n\tarch/arm/plat-omap/include/plat/common.h\n" }, { "commit": "6560ee07dc946e94f7cc2cd8e3b5a5f5ee7340c1", "tree": "841f39266d251748f097ce753ee1b0da647b9d06", "parents": [ "c2cb211116192690605eaa70d39deb04241003e2" ], "author": { "name": "Janusz Krzysztofik", "email": "jkrzyszt@tis.icnet.pl", "time": "Thu Dec 01 21:13:02 2011 +0100" }, "committer": { "name": "Tony Lindgren", "email": "tony@atomide.com", "time": "Mon Dec 05 09:28:32 2011 -0800" }, "message": "ARM: OMAP1: recalculate loops per jiffy after dpll1 reprogram\n\nOtherwise timing is inaccurate, resulting in devices which depend on it,\nlike omap-keypad, broken.\n\nTested on Amstrad Delta.\n\nSigned-off-by: Janusz Krzysztofik \u003cjkrzyszt@tis.icnet.pl\u003e\n[tony@atomide.com: removed comment referencing a development branch]\nSigned-off-by: Tony Lindgren \u003ctony@atomide.com\u003e\n" }, { "commit": "c2cb211116192690605eaa70d39deb04241003e2", "tree": "4c98392b4459c5c86249e0b7f044885bcf5cce4f", "parents": [ "b29e23547ecb2a609777288cd81fc83b01f9f43f" ], "author": { "name": "Janusz Krzysztofik", "email": "jkrzyszt@tis.icnet.pl", "time": "Thu Dec 01 21:13:01 2011 +0100" }, "committer": { "name": "Tony Lindgren", "email": "tony@atomide.com", "time": "Thu Dec 01 17:51:34 2011 -0800" }, "message": "ARM: OMAP1: Fix ckctl value used for dpll1 defualt rate\n\nUse the exact value found in omap1_rate_table, otherwise I have been\nexperiencing issues with correct timekeeping on my Amstrad Delta.\n\nSigned-off-by: Janusz Krzysztofik \u003cjkrzyszt@tis.icnet.pl\u003e\n[tony@atomide.com: removed comment referencing a development branch]\nSigned-off-by: Tony Lindgren \u003ctony@atomide.com\u003e\n" }, { "commit": "650f7a72b8cc235ffe4a0e3eff37954349026721", "tree": "e11c493ab95ac78e8ab7d0da8eaf4e590408fa67", "parents": [ "5611cc4572e889b62a7b4c72a413536bf6a9c416" ], "author": { "name": "Tony Lindgren", "email": "tony@atomide.com", "time": "Thu Dec 01 17:47:06 2011 -0800" }, "committer": { "name": "Tony Lindgren", "email": "tony@atomide.com", "time": "Thu Dec 01 17:47:06 2011 -0800" }, "message": "ARM: OMAP1: Fix reprogramming of DPLL1 for systems that boot at rates below 60MHz\n\nCommit e9b7086b80c4d9e354f4edc9e280ae85a60df408 (ARM: OMAP: Fix\nreprogramming of dpll1 rate) fixed a regression for systems that\ndid not rely on bootloader set rates.\n\nHowever, it also introduced a new problem where the rates selected\nin .config would not take affect as omap1_select_table_rate\ncurrently refuses to reprogram DPLL1 if it\u0027s already initialized.\n\nThis was not a problem earlier, as the reprogramming was done\nearlier with ck_dpll1_p-\u003erate uninitialized.\n\nFix this by forcing the reprogramming on systems booting at rates\nbelow 60MHz. Note that the long term fix is to make the rates\nSoC specific later on.\n\nThanks for Janusz Krzysztofik \u003cjkrzyszt@tis.icnet.pl\u003e for figuring\nthis one out.\n\nReported-by: Janusz Krzysztofik \u003cjkrzyszt@tis.icnet.pl\u003e\nAcked-by: Janusz Krzysztofik \u003cjkrzyszt@tis.icnet.pl\u003e\nSigned-off-by: Tony Lindgren \u003ctony@atomide.com\u003e\n" }, { "commit": "d0e6b2236a26711939bfcdd97370fedcd526a191", "tree": "63cceb3ab98b24831bb091dfa5cbe6ce91be420d", "parents": [ "576d2f2525612ecb5af029a76f21f22a3b82563d" ], "author": { "name": "Nicolas Pitre", "email": "nicolas.pitre@linaro.org", "time": "Thu Sep 15 16:30:54 2011 -0400" }, "committer": { "name": "Nicolas Pitre", "email": "nico@fluxnic.net", "time": "Sat Nov 26 19:21:29 2011 -0500" }, "message": "ARM: big removal of now unused vmalloc.h files\n\nSigned-off-by: Nicolas Pitre \u003cnicolas.pitre@linaro.org\u003e\n" }, { "commit": "7146182c7f446903dea032fc992dca8d61c12750", "tree": "3cb6c69712b645a90b88cdfe03f5ae029255039e", "parents": [ "3c4c342fea35fa1976853d8ebc518a06c98259a3" ], "author": { "name": "Nicolas Pitre", "email": "nicolas.pitre@linaro.org", "time": "Wed Sep 14 17:06:22 2011 -0400" }, "committer": { "name": "Nicolas Pitre", "email": "nico@fluxnic.net", "time": "Fri Nov 18 13:51:02 2011 -0500" }, "message": "ARM: plat-omap: remove arch specific special handling for ioremap\n\nA generic version should replace this later.\n\nAs io.c has become nearly empty, omap_init_consistent_dma_size() is moved\ninto common.c so that io.c can be removed entirely.\n\nSigned-off-by: Nicolas Pitre \u003cnicolas.pitre@linaro.org\u003e\nTested-by: Kevin Hilman \u003ckhilman@ti.com\u003e\n" }, { "commit": "4e65331c6bb4a777bd61a4dac0daa9fc47777b63", "tree": "0081e367204e9ec7ed922e3089a72c666df193b5", "parents": [ "6a6f1efaced2ca7f8cd581a220af428c6bfc909d" ], "author": { "name": "Tony Lindgren", "email": "tony@atomide.com", "time": "Thu Nov 10 22:45:17 2011 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Thu Nov 17 17:09:30 2011 +0000" }, "message": "ARM: 7159/1: OMAP: Introduce local common.h files\n\nAs suggested by Russell King - ARM Linux \u003clinux@arm.linux.org.uk\u003e,\nthere\u0027s no need to keep local prototypes in non-local headers.\n\nAdd mach-omap1/common.h and mach-omap2/common.h and move the\nlocal prototypes there from plat/common.h and mach/omap4-common.h.\n\nSigned-off-by: Tony Lindgren \u003ctony@atomide.com\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "e9b7086b80c4d9e354f4edc9e280ae85a60df408", "tree": "2598427ece342e0cbe34c7521f81efb6caea33bd", "parents": [ "7be620f79714b6598275bd5c71d89bb24dfe332e" ], "author": { "name": "Tony Lindgren", "email": "tony@atomide.com", "time": "Fri Nov 11 10:15:11 2011 -0800" }, "committer": { "name": "Tony Lindgren", "email": "tony@atomide.com", "time": "Fri Nov 11 10:15:11 2011 -0800" }, "message": "ARM: OMAP: Fix reprogramming of dpll1 rate\n\nCommit a66cb3454f220f49f900646ebdc76cb943319eb7 (ARM: OMAP: Map SRAM\nlater on with ioremap_exec()) moved the SRAM init to happen later\nto remove a dependency to early SoC detection for map_io.\n\nThis broke booting on some boards not using Kconfig option for\nOMAP_CLOCKS_SET_BY_BOOTLOADER as the dpll1 reprogramming would\ncause the following error:\n\nkernel BUG at arch/arm/plat-omap/sram.c:226!\nInternal error: Oops - undefined instruction: 0 [#1] PREEMPT\nModules linked in:\n\nCPU: 0 Not tainted (3.2.0-rc1-e3 #9)\nPC is at omap_sram_reprogram_clock+0x28/0x30\nLR is at omap1_select_table_rate+0x88/0xb4\npc : [\u003cc001b0c4\u003e] lr : [\u003cc0019f54\u003e] psr: 600000d3\nsp : c035bf10 ip : c035bf20 fp : c035bf1c\nr10: c035bfd4 r9 : 54029252 r8 : c03f8120\nr7 : c0362b50 r6 : 00b71b00 r5 : c03873cc r4 : c0362b40\nr3 : 00000000 r2 : c0362b40 r1 : 0000010a r0 : 00002cb0\nFlags: nZCv IRQs off FIQs off Mode SVC_32 ISA ARM Segment kernel\nControl: 0000317f Table: 10004000 DAC: 00000017\nProcess swapper (pid: 0, stack limit \u003d 0xc035a270)\nStack: (0xc035bf10 to 0xc035c000)\nbf00: c035bf3c c035bf20 c0019f54 c001b0ac\nbf20: 00001000 00002cb3 00000004 c035ed4c c035bf74 c035bf40 c033ea24 c0019edc\nbf40: c02f526c 00000002 00000015 bc058c9b 93111a16 c035335c 02000000 c035ed4c\nbf60: c035ed4c c03f8120 c035bf84 c035bf78 c00194c4 c033e8ec c035bfc4 c035bf88\nbf80: c033bc24 c00194a0 c035bf90 c035bf98 00000000 00000000 00000000 00000000\nbfa0: 00000001 00000000 c0354678 c035ece4 10004000 103532f4 c035bff4 c035bfc8\nbfc0: c0338574 c033b598 00000000 00000000 00000000 c035467c 0000317d c035c03c\nbfe0: c0354678 c035ece4 00000000 c035bff8 10008040 c0338508 00000000 00000000\nBacktrace:\n[\u003cc001b09c\u003e] (omap_sram_reprogram_clock+0x0/0x30) from [\u003cc0019f54\u003e] (omap1_select_table_rate+0x88/0xb4)\n[\u003cc0019ecc\u003e] (omap1_select_table_rate+0x0/0xb4) from [\u003cc033ea24\u003e] (omap1_clk_init+0x148/0x334)\n r7:c035ed4c r6:00000004 r5:00002cb3 r4:00001000\n[\u003cc033e8dc\u003e] (omap1_clk_init+0x0/0x334) from [\u003cc00194c4\u003e] (omap1_init_early+0x34/0x48)\n r8:c03f8120 r7:c035ed4c r6:c035ed4c r5:02000000 r4:c035335c\n[\u003cc0019490\u003e] (omap1_init_early+0x0/0x48) from [\u003cc033bc24\u003e] (setup_arch+0x69c/0x79c)\n[\u003cc033b588\u003e] (setup_arch+0x0/0x79c) from [\u003cc0338574\u003e] (start_kernel+0x7c/0x2f4)\n[\u003cc03384f8\u003e] (start_kernel+0x0/0x2f4) from [\u003c10008040\u003e] (0x10008040)\n r7:c035ece4 r6:c0354678 r5:c035c03c r4:0000317d\nCode: 0a000002 e1a0e00f e12fff13 e89da800 (e7f001f2)\n\nFix this by adding omap1_clk_late_init() that only reprograms dpll1\nif the bootloader rate is less than 60MHz. This also allows removing\nof the OMAP_CLOCKS_SET_BY_BOOTLOADER option.\n\nReported-by: Aaro Koskinen \u003caaro.koskinen@iki.fi\u003e\nTested-by: Aaro Koskinen \u003caaro.koskinen@iki.fi\u003e\nSigned-off-by: Tony Lindgren \u003ctony@atomide.com\u003e\n" }, { "commit": "5bb01a991897d74295ff8de548d350400d7370a9", "tree": "338190039d472375cade35a225a4777bc9433652", "parents": [ "5698eb4eda657fd4a74612a65cd5d583f35a5bdb" ], "author": { "name": "Tony Lindgren", "email": "tony@atomide.com", "time": "Wed Nov 09 15:29:31 2011 -0800" }, "committer": { "name": "Tony Lindgren", "email": "tony@atomide.com", "time": "Wed Nov 09 15:29:31 2011 -0800" }, "message": "ARM: OMAP: Fix map_io for Amstrad E3\n\nCommit 7b88e62f5d219a86d81bdf4388012c97dc42e8f8 (ARM: OMAP1: Use generic\nmap_io, init_early and init_irq) changed omap1 to use generic map_io.\n\nLooks like I missed one board though. Fix this by adding a custom\nmap_io for Amstrad E3.\n\nReported-by: Aaro Koskinen \u003caaro.koskinen@iki.fi\u003e\nSigned-off-by: Tony Lindgren \u003ctony@atomide.com\u003e\n" }, { "commit": "d30cc16c8e48368e0518f4975a78711e53e14a0f", "tree": "26b57f7ab5a963cc3d6c57dff6951bd930875583", "parents": [ "41eb2d813f558900884e240c2f723e36c7bd151f", "a1bcc1dcef8451b4291ea2a1b2677cb194102952" ], "author": { "name": "Tony Lindgren", "email": "tony@atomide.com", "time": "Mon Nov 07 12:27:23 2011 -0800" }, "committer": { "name": "Tony Lindgren", "email": "tony@atomide.com", "time": "Mon Nov 07 12:27:23 2011 -0800" }, "message": "Merge branch \u0027fixes-modulesplit\u0027 into fixes\n" }, { "commit": "32aaeffbd4a7457bf2f7448b33b5946ff2a960eb", "tree": "faf7ad871d87176423ff9ed1d1ba4d9c688fc23f", "parents": [ "208bca0860406d16398145ddd950036a737c3c9d", "67b84999b1a8b1af5625b1eabe92146c5eb42932" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Nov 06 19:44:47 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Nov 06 19:44:47 2011 -0800" }, "message": "Merge branch \u0027modsplit-Oct31_2011\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux\n\n* \u0027modsplit-Oct31_2011\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux: (230 commits)\n Revert \"tracing: Include module.h in define_trace.h\"\n irq: don\u0027t put module.h into irq.h for tracking irqgen modules.\n bluetooth: macroize two small inlines to avoid module.h\n ip_vs.h: fix implicit use of module_get/module_put from module.h\n nf_conntrack.h: fix up fallout from implicit moduleparam.h presence\n include: replace linux/module.h with \"struct module\" wherever possible\n include: convert various register fcns to macros to avoid include chaining\n crypto.h: remove unused crypto_tfm_alg_modname() inline\n uwb.h: fix implicit use of asm/page.h for PAGE_SIZE\n pm_runtime.h: explicitly requires notifier.h\n linux/dmaengine.h: fix implicit use of bitmap.h and asm/page.h\n miscdevice.h: fix up implicit use of lists and types\n stop_machine.h: fix implicit use of smp.h for smp_processor_id\n of: fix implicit use of errno.h in include/linux/of.h\n of_platform.h: delete needless include \u003clinux/module.h\u003e\n acpi: remove module.h include from platform/aclinux.h\n miscdevice.h: delete unnecessary inclusion of module.h\n device_cgroup.h: delete needless include \u003clinux/module.h\u003e\n net: sch_generic remove redundant use of \u003clinux/module.h\u003e\n net: inet_timewait_sock doesnt need \u003clinux/module.h\u003e\n ...\n\nFix up trivial conflicts (other header files, and removal of the ab3550 mfd driver) in\n - drivers/media/dvb/frontends/dibx000_common.c\n - drivers/media/video/{mt9m111.c,ov6650.c}\n - drivers/mfd/ab3550-core.c\n - include/linux/dmaengine.h\n" }, { "commit": "98e541ffaadf01fc4d202ad2bd187a14b671f1a4", "tree": "32cdf16e4777304d192e6c584bb3c7e9455aa422", "parents": [ "be26a008414414c69a4ae9fe9877401c3ba62c5a" ], "author": { "name": "Jarkko Nikula", "email": "jarkko.nikula@bitmer.com", "time": "Fri Nov 04 13:28:04 2011 +0200" }, "committer": { "name": "Tony Lindgren", "email": "tony@atomide.com", "time": "Fri Nov 04 18:07:17 2011 -0700" }, "message": "ARM: OMAP1: Remove unused omap-alsa.h\n\nThere is no use for omap-alsa.h and board-palmz71.c doesn\u0027t need it either.\n\nSigned-off-by: Jarkko Nikula \u003cjarkko.nikula@bitmer.com\u003e\nSigned-off-by: Tony Lindgren \u003ctony@atomide.com\u003e\n" }, { "commit": "be26a008414414c69a4ae9fe9877401c3ba62c5a", "tree": "f3cf7ef42e655eef98fdcc3f5f1ece89124c9658", "parents": [ "c16ae1e64e292054bc4c5a20724b40217bdc43dd" ], "author": { "name": "Tony Lindgren", "email": "tony@atomide.com", "time": "Thu Oct 06 17:05:51 2011 -0700" }, "committer": { "name": "Tony Lindgren", "email": "tony@atomide.com", "time": "Fri Nov 04 18:07:15 2011 -0700" }, "message": "ARM: OMAP1: Fix warnings about enabling 32 KiHz timer\n\nFix \"Enable 32kHz OS timer in order to allow sleep states in idle\"\nwarning. We are now compiling in bothe MPU timer and 32 KiHz timer,\nso this warning is only valid when MPU_TIMER is set and OMAP_DM_TIMER\nis not set.\n\nSigned-off-by: Tony Lindgren \u003ctony@atomide.com\u003e\n" }, { "commit": "81a3c10ce8a7fd5bf9a06bfc38bd417512911831", "tree": "12ceac10fae8c4b2dc17b362672a5db305a8d960", "parents": [ "6585dea1f99cc2265582ff2e4cc1727062136e92", "df80442d1ee2902c2e39f90f18160f2e08d14c06" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Nov 01 20:58:25 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Nov 01 20:58:25 2011 -0700" }, "message": "Merge branch \u0027next/cleanup2\u0027 of git://git.linaro.org/people/arnd/arm-soc\n\n* \u0027next/cleanup2\u0027 of git://git.linaro.org/people/arnd/arm-soc: (31 commits)\n ARM: OMAP: Warn if omap_ioremap is called before SoC detection\n ARM: OMAP: Move set_globals initialization to happen in init_early\n ARM: OMAP: Map SRAM later on with ioremap_exec()\n ARM: OMAP: Remove calls to SRAM allocations for framebuffer\n ARM: OMAP: Avoid cpu_is_omapxxxx usage until map_io is done\n ARM: OMAP1: Use generic map_io, init_early and init_irq\n arm/dts: OMAP3+: Add mpu, dsp and iva nodes\n arm/dts: OMAP4: Add a main ocp entry bound to l3-noc driver\n ARM: OMAP2+: l3-noc: Add support for device-tree\n ARM: OMAP2+: board-generic: Add i2c static init\n ARM: OMAP2+: board-generic: Add DT support to generic board\n arm/dts: Add support for OMAP3 Beagle board\n arm/dts: Add initial device tree support for OMAP3 SoC\n arm/dts: Add support for OMAP4 SDP board\n arm/dts: Add support for OMAP4 PandaBoard\n arm/dts: Add initial device tree support for OMAP4 SoC\n ARM: OMAP: omap_device: Add a method to build an omap_device from a DT node\n ARM: OMAP: omap_device: Add omap_device_[alloc|delete] for DT integration\n of: Add helpers to get one string in multiple strings property\n ARM: OMAP2+: devices: Remove all omap_device_pm_latency structures\n ...\n\nFix up trivial header file conflicts in arch/arm/mach-omap2/board-generic.c\n" }, { "commit": "ac5761a650d22dd7dfad4d417463a0981d2da0a4", "tree": "c01a46a889dde74fbbb05d3b2da22387bb4875c6", "parents": [ "25498e5b3df931a3d52a6e0642ae242e4ee19488", "eed1e576507b52e03e549e0c9e0c747978122403" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Nov 01 20:18:05 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Nov 01 20:18:05 2011 -0700" }, "message": "Merge branch \u0027next/timer\u0027 of git://git.linaro.org/people/arnd/arm-soc\n\n* \u0027next/timer\u0027 of git://git.linaro.org/people/arnd/arm-soc:\n clocksource: fixup ux500 build problems\n ARM: omap: use __devexit_p in dmtimer driver\n ARM: ux500: Reprogram timers upon resume\n ARM: plat-nomadik: timer: Export reset functions\n ARM: plat-nomadik: timer: Add support for periodic timers\n ARM: ux500: Move timer code to separate file\n ARM: ux500: add support for clocksource DBX500 PRCMU\n clocksource: add DBX500 PRCMU Timer support\n ARM: plat-nomadik: MTU sched_clock as an option\n ARM: OMAP: dmtimer: add error handling to export APIs\n ARM: OMAP: dmtimer: low-power mode support\n ARM: OMAP: dmtimer: skip reserved timers\n ARM: OMAP: dmtimer: pm_runtime support\n ARM: OMAP: dmtimer: switch-over to platform device driver\n ARM: OMAP: dmtimer: platform driver\n ARM: OMAP2+: dmtimer: convert to platform devices\n ARM: OMAP1: dmtimer: conversion to platform devices\n ARM: OMAP2+: dmtimer: add device names to flck nodes\n ARM: OMAP: Add support for dmtimer v2 ip\n" }, { "commit": "952414505f55afe5cd6dc004765076aa22b3ed7e", "tree": "eba11ed702ae02fea7f1a0d422346454fc98296f", "parents": [ "68e24ba70465b82ad24e0774ceab5360180d4627", "3e965b176341b78620f7404fd8b7f9a0d061f8a2" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Nov 01 20:11:00 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Nov 01 20:11:00 2011 -0700" }, "message": "Merge branch \u0027next/cleanup\u0027 of git://git.linaro.org/people/arnd/arm-soc\n\n* \u0027next/cleanup\u0027 of git://git.linaro.org/people/arnd/arm-soc: (125 commits)\n ARM: mach-mxs: fix machines\u0027 initializers order\n mmc: mxcmmc: explicitly includes mach/hardware.h\n arm/imx: explicitly includes mach/hardware.h in pm-imx27.c\n arm/imx: remove mx27_setup_weimcs() from mx27.h\n arm/imx: explicitly includes mach/hardware.h in mach-kzm_arm11_01.c\n arm/imx: remove mx31_setup_weimcs() from mx31.h\n ARM: tegra: devices.c should include devices.h\n ARM: tegra: cpu-tegra: unexport two functions\n ARM: tegra: cpu-tegra: sparse type fix\n ARM: tegra: dma: staticify some tables and functions\n ARM: tegra: tegra2_clocks: don\u0027t export some tables\n ARM: tegra: tegra_powergate_is_powered should be static\n ARM: tegra: tegra_rtc_read_ms should be static\n ARM: tegra: tegra_init_cache should be static\n ARM: tegra: pcie: 0 -\u003e NULL changes\n ARM: tegra: pcie: include board.h\n ARM: tegra: pcie: don\u0027t cast __iomem pointers\n ARM: tegra: tegra2_clocks: 0 -\u003e NULL changes\n ARM: tegra: tegra2_clocks: don\u0027t cast __iomem pointers\n ARM: tegra: timer: don\u0027t cast __iomem pointers\n ...\n\nFix up trivial conflicts in\n arch/arm/mach-omap2/Makefile,\n arch/arm/mach-u300/{Makefile.boot,core.c}\n arch/arm/plat-{mxc,omap}/devices.c\n" }, { "commit": "df80442d1ee2902c2e39f90f18160f2e08d14c06", "tree": "e7c2080df1a5851e0c5353c48a211d9af91aae68", "parents": [ "8aca3ab5865f8cfbde841b6daf9442cc2279ced3", "0cdc8b921d68817b687755b4f6ae20cd8ff1d026" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Tue Nov 01 13:47:27 2011 +0100" }, "committer": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Tue Nov 01 13:47:27 2011 +0100" }, "message": "Merge branch \u0027depends/rmk/memory_h\u0027 into next/cleanup2\n\nTheis resolves lots of simple conflicts between the omap\ncleanup and the mach/memory.h removal series.\n\nConflicts:\n\tarch/arm/mach-imx/mach-cpuimx27.c\n\tarch/arm/mach-omap1/board-ams-delta.c\n\tarch/arm/mach-omap1/board-generic.c\n\tarch/arm/mach-omap1/board-h2.c\n\tarch/arm/mach-omap1/board-h3.c\n\tarch/arm/mach-omap1/board-nokia770.c\n\tarch/arm/mach-omap1/board-osk.c\n\tarch/arm/mach-omap1/board-palmte.c\n\tarch/arm/mach-omap1/board-palmtt.c\n\tarch/arm/mach-omap1/board-palmz71.c\n\tarch/arm/mach-omap1/board-sx1.c\n\tarch/arm/mach-omap1/board-voiceblue.c\n\tarch/arm/mach-omap1/io.c\n\tarch/arm/mach-omap2/board-generic.c\n\tarch/arm/mach-omap2/io.c\n\tarch/arm/plat-omap/io.c\n\nSigned-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\n" }, { "commit": "73017a542fd2e92a02464eb8b727c200c97e6c0c", "tree": "39063d55b4110c321433678169078ea86b81781f", "parents": [ "dc28094b905a872f8884f1f1c48ca86b3b78583a" ], "author": { "name": "Paul Gortmaker", "email": "paul.gortmaker@windriver.com", "time": "Sun Jul 31 16:14:14 2011 -0400" }, "committer": { "name": "Paul Gortmaker", "email": "paul.gortmaker@windriver.com", "time": "Mon Oct 31 19:30:50 2011 -0400" }, "message": "arm: fix implicit module.h users by adding it to arch/arm as required.\n\nThese files will fail to compile if we dont clean them up in advance\nand have them include the appropriate headers they need.\n\nSigned-off-by: Paul Gortmaker \u003cpaul.gortmaker@windriver.com\u003e\n" }, { "commit": "dc28094b905a872f8884f1f1c48ca86b3b78583a", "tree": "7d598103fed9dd3e12c4526647eebe678c35ff34", "parents": [ "ecea4ab6d3d8bb4122522398200f1cd2a06af6d5" ], "author": { "name": "Paul Gortmaker", "email": "paul.gortmaker@windriver.com", "time": "Sun Jul 31 16:17:29 2011 -0400" }, "committer": { "name": "Paul Gortmaker", "email": "paul.gortmaker@windriver.com", "time": "Mon Oct 31 19:30:50 2011 -0400" }, "message": "arm: Add export.h to ARM specific files as required.\n\nThese files all make use of one of the EXPORT_SYMBOL variants\nor the THIS_MODULE macro. So they will need \u003clinux/export.h\u003e\n\nSigned-off-by: Paul Gortmaker \u003cpaul.gortmaker@windriver.com\u003e\n" }, { "commit": "3e965b176341b78620f7404fd8b7f9a0d061f8a2", "tree": "a2dbf06d6ae20fbe417b70f0a471cc4f93ff0a71", "parents": [ "034ee299122c6b145d6d3cafb9ef5c329a4ab990", "5839fec9d8db35b2b07359b18a77295418e239ad" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Mon Oct 31 23:25:41 2011 +0100" }, "committer": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Mon Oct 31 23:25:41 2011 +0100" }, "message": "Merge branch \u0027next/fixes\u0027 into next/cleanup\n\nConflicts:\n\tarch/arm/mach-mxs/include/mach/gpio.h\n\tarch/arm/plat-mxc/include/mach/gpio.h\n\tdrivers/video/omap/lcd_apollon.c\n\tdrivers/video/omap/lcd_ldp.c\n\tdrivers/video/omap/lcd_overo.c\n" }, { "commit": "5839fec9d8db35b2b07359b18a77295418e239ad", "tree": "f060f613c7d76b2784a93c96b7b8cd3f0d201254", "parents": [ "43872fa788060eef91ae437957e0a5e39f1c56fd", "0cdc8b921d68817b687755b4f6ae20cd8ff1d026" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Mon Oct 31 23:11:46 2011 +0100" }, "committer": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Mon Oct 31 23:11:53 2011 +0100" }, "message": "Merge branch \u0027depends/rmk/memory_h\u0027 into next/fixes\n\nFix up all conflicts between the memory.h cleanup and bug fixes.\n\nSigned-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\n" }, { "commit": "1fdb24e969110fafea36d3b393bea438f702c87f", "tree": "47a1dfef8a259e7922285315f8a02d31b4efe2f1", "parents": [ "f362f98e7c445643d27c610bb7a86b79727b592e", "531a6a941745e1e045dd2a6bd09e1dc01247a5f3" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Oct 28 12:02:27 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Oct 28 12:02:27 2011 -0700" }, "message": "Merge branch \u0027devel-stable\u0027 of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm\n\n* \u0027devel-stable\u0027 of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm: (178 commits)\n ARM: 7139/1: fix compilation with CONFIG_ARM_ATAG_DTB_COMPAT and large TEXT_OFFSET\n ARM: gic, local timers: use the request_percpu_irq() interface\n ARM: gic: consolidate PPI handling\n ARM: switch from NO_MACH_MEMORY_H to NEED_MACH_MEMORY_H\n ARM: mach-s5p64x0: remove mach/memory.h\n ARM: mach-s3c64xx: remove mach/memory.h\n ARM: plat-mxc: remove mach/memory.h\n ARM: mach-prima2: remove mach/memory.h\n ARM: mach-zynq: remove mach/memory.h\n ARM: mach-bcmring: remove mach/memory.h\n ARM: mach-davinci: remove mach/memory.h\n ARM: mach-pxa: remove mach/memory.h\n ARM: mach-ixp4xx: remove mach/memory.h\n ARM: mach-h720x: remove mach/memory.h\n ARM: mach-vt8500: remove mach/memory.h\n ARM: mach-s5pc100: remove mach/memory.h\n ARM: mach-tegra: remove mach/memory.h\n ARM: plat-tcc: remove mach/memory.h\n ARM: mach-mmp: remove mach/memory.h\n ARM: mach-cns3xxx: remove mach/memory.h\n ...\n\nFix up mostly pretty trivial conflicts in:\n - arch/arm/Kconfig\n - arch/arm/include/asm/localtimer.h\n - arch/arm/kernel/Makefile\n - arch/arm/mach-shmobile/board-ap4evb.c\n - arch/arm/mach-u300/core.c\n - arch/arm/mm/dma-mapping.c\n - arch/arm/mm/proc-v7.S\n - arch/arm/plat-omap/Kconfig\nlargely due to some CONFIG option renaming (ie CONFIG_PM_SLEEP -\u003e\nCONFIG_ARM_CPU_SUSPEND for the arm-specific suspend code etc) and\naddition of NEED_MACH_MEMORY_H next to HAVE_IDE.\n" }, { "commit": "ca90666287401b475d9e0becf85bd02f069f1de8", "tree": "ad4dd789f8d5ab639c78997d3655b94fcbf660ef", "parents": [ "60325f0c6ee7c6b68f95aaa643260fb33d4bdd88", "374e759db148d1e874e3afb76707082af67e0984" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Oct 27 08:39:10 2011 +0200" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Oct 27 08:39:10 2011 +0200" }, "message": "Merge branch \u0027gpio\u0027 of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm\n\n* \u0027gpio\u0027 of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm: (43 commits)\n ARM: 7135/1: ep93xx: bring back missing \u003cmach/gpio.h\u003e\n ARM: 7104/1: plat-pxa: break out GPIO driver specifics\n ARM: 7103/1: plat-pxa: move PXA GPIO driver to GPIO subsystem\n ARM: 7042/3: mach-ep93xx: break out GPIO driver specifics\n ARM: 7101/1: arm/tegra: Replace \u003cmach/gpio.h\u003e with \u003cmach/gpio-tegra.h\u003e\n ARM: 7094/1: arm/tegra: Move EN_VDD_1V05_GPIO to board-harmony.h\n ARM: 7083/1: rewrite U300 GPIO to use gpiolib\n ARM: 7074/1: gpio: davinci: eliminate unused variable warnings\n ARM: 7063/1: Orion: gpio: add missing include of linux/types.h\n ARM: 7055/1: arm/tegra: mach/gpio.h: include linux/types.h to fix build\n ARM: 7054/1: arm/tegra: Delete custom gpio_to_irq, and irq_to_gpio\n ARM: 7053/1: gpio/tegra: Implement gpio_chip.to_irq\n ARM: 7052/1: gpio/tegra: Remove use of irq_to_gpio\n ARM: 7057/1: mach-pnx4008: rename GPIO header\n ARM: 7056/1: plat-nomadik: kill off \u003cplat/gpio.h\u003e\n ARM: 7050/1: mach-sa1100: delete irq_to_gpio() function\n ARM: 7049/1: mach-sa1100: move SA1100 GPIO driver to GPIO subsystem\n ARM: 7045/1: mach-lpc32xx: break out GPIO driver specifics\n ARM: 7044/1: mach-lpc32xx: move LPC32XX GPIO driver to GPIO subsystem\n ARM: 7043/1: mach-ixp2000: rename GPIO header\n ...\n\nFix up trivial conflicts in arch/arm/mach-u300/Kconfig manually\n" } ], "next": "7e0bb71e75020348bee523720a0c2f04cc72f540" }