)]}' { "log": [ { "commit": "ed893559c9799df3b32051871c22017151394d82", "tree": "09b08825a81f00911a66b4c133fc9f00d6c4548d", "parents": [ "592cd34d9431736493c375b609f7f7d4458a8637", "913b19660e166e718d419cccd753c3990881f17c" ], "author": { "name": "Mark Brown", "email": "broonie@linaro.org", "time": "Wed Jun 26 16:21:06 2013 +0100" }, "committer": { "name": "Mark Brown", "email": "broonie@linaro.org", "time": "Wed Jun 26 16:21:06 2013 +0100" }, "message": "Merge remote-tracking branch \u0027spi/topic/xilinx\u0027 into spi-next\n" }, { "commit": "082339bc63cccf8ea49b1f3cf4ee39ce00742849", "tree": "870667862ca5d9d06ecc9233ea1f79a44f1b948d", "parents": [ "d683b96b072dc4680fc74964eca77e6a23d1fa6e" ], "author": { "name": "Michal Simek", "email": "michal.simek@xilinx.com", "time": "Tue Jun 04 16:02:36 2013 +0200" }, "committer": { "name": "Mark Brown", "email": "broonie@linaro.org", "time": "Tue Jun 04 18:37:35 2013 +0100" }, "message": "spi: spi-xilinx: Add run run-time endian detection\n\nDo not load endian value from platform data\nand rather autodetect it.\n\nSigned-off-by: Michal Simek \u003cmichal.simek@xilinx.com\u003e\nSigned-off-by: Mark Brown \u003cbroonie@linaro.org\u003e\n" }, { "commit": "eca8960a8e0f48dc62c1063bcc33a626455d766e", "tree": "1ce5946e80204bd51db2e6dae7b9c592079046ad", "parents": [ "4dd9572abc224019a042b662fb0eececca283cb9" ], "author": { "name": "Stephen Warren", "email": "swarren@nvidia.com", "time": "Thu May 30 09:59:40 2013 -0600" }, "committer": { "name": "Mark Brown", "email": "broonie@linaro.org", "time": "Sat Jun 01 19:46:16 2013 +0100" }, "message": "spi: fix incorrect handling of min param in SPI_BPW_RANGE_MASK\n\nSPI_BPW_RANGE_MASK is intended to work by calculating two masks; one\nrepresenting support for all bits up-to-and-including the \"max\" supported\nvalue, and one representing support for all bits up-to-but-not-including\nthe \"min\" supported value, and then taking the difference between the\ntwo, resulting in a mask representing support for all bits between\n(inclusive) the min and max values.\n\nHowever, the second mask ended up representing all bits up-to-and-\nincluding rather up-to-but-not-including. Fix this bug.\n\nSigned-off-by: Stephen Warren \u003cswarren@nvidia.com\u003e\nSigned-off-by: Mark Brown \u003cbroonie@linaro.org\u003e\n" }, { "commit": "4dd9572abc224019a042b662fb0eececca283cb9", "tree": "920636df3ca9198c43fd89973703b6e177cb27cc", "parents": [ "6051426fd0538eac4e28c55a08e4f4fb1c709b65" ], "author": { "name": "Stephen Warren", "email": "swarren@nvidia.com", "time": "Thu May 30 09:59:39 2013 -0600" }, "committer": { "name": "Mark Brown", "email": "broonie@linaro.org", "time": "Sat Jun 01 19:46:16 2013 +0100" }, "message": "spi: fix undefined behaviour in SPI_BPW_RANGE_MASK\n\nThe parameters to SPI_BPW_RANGE_MASK() are in the range 1..32. If 32 is\nused as a parameter, part of the expression is \"1 \u003c\u003c 32\". Since 32 is \u003e\u003d\nthe size of the type in use, such a shift is undefined behaviour. Add\nmacro SPI_BIT_MASK to Implement a special case and thus avoid undefined\nbehaviour. Use this new macro rather than BIT() when implementing\nSPI_BPW_RANGE_MASK().\n\nThis fixes build warnings such as:\ndrivers/spi/spi-gpio.c:446:2: warning: left shift count \u003e\u003d width of type [enabled by default]\n\nSPI_BPW_MASK() already avoids this, since its parameter is also in range\n1..32, yet it only shifts by up to one less than the input parameter.\n\nReported-by: Fengguang Wu \u003cfengguang.wu@intel.com\u003e\nSigned-off-by: Stephen Warren \u003cswarren@nvidia.com\u003e\nSigned-off-by: Mark Brown \u003cbroonie@linaro.org\u003e\n" }, { "commit": "2922a8de996956893bb98e4aa91be9774c958336", "tree": "c9181673361f52877caa50047ecc04dabbd13c0d", "parents": [ "c7788792a5e7b0d5d7f96d0766b4cb6112d47d75" ], "author": { "name": "Stephen Warren", "email": "swarren@wwwdotorg.org", "time": "Tue May 21 20:36:34 2013 -0600" }, "committer": { "name": "Mark Brown", "email": "broonie@opensource.wolfsonmicro.com", "time": "Wed May 22 10:57:43 2013 -0500" }, "message": "spi: introduce macros to set bits_per_word_mask\n\nIntroduce two macros to make setting up spi_master.bits_per_word_mask\neasier, and avoid mistakes like writing BIT(n) instead of BIT(n - 1).\n\nSPI_BPW_MASK is for a single supported value of bits_per_word_mask.\n\nSPI_BPW_RANGE_MASK represents a contiguous set of bit lengths.\n\nSigned-off-by: Stephen Warren \u003cswarren@wwwdotorg.org\u003e\nSigned-off-by: Mark Brown \u003cbroonie@opensource.wolfsonmicro.com\u003e\n" }, { "commit": "88b0357dde1c2721a64268e4601d1c2dec1158b0", "tree": "a86c0af317bbb3f501c4d5b3517b02640a9f69c0", "parents": [ "0faa3146f17295f612abadafbfe3d4346178f10f", "3086c9f6482101b3c06935cdfb4d4b56adb60097" ], "author": { "name": "Mark Brown", "email": "broonie@opensource.wolfsonmicro.com", "time": "Mon May 13 18:27:18 2013 +0400" }, "committer": { "name": "Mark Brown", "email": "broonie@opensource.wolfsonmicro.com", "time": "Mon May 13 18:27:18 2013 +0400" }, "message": "Merge remote-tracking branch \u0027spi/fix/grant\u0027 into spi-linus\n" }, { "commit": "38f56f33ca381751f9b8910f67e7a805ec0b68cb", "tree": "202f2ce60f3f43a948607ec76c8cc48c1cf73a4b", "parents": [ "fcba914542082b272f31c8e4c40000b88ed3208d", "4183bef2e093a2f0aab45f2d5fed82b0e02aeacf" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 07 11:06:17 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 07 11:06:17 2013 -0700" }, "message": "Merge tag \u0027dt-for-linus-2\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc\n\nPull ARM SoC device tree updates (part 2) from Arnd Bergmann:\n \"These are mostly new device tree bindings for existing drivers, as\n well as changes to the device tree source files to add support for\n those devices, and a couple of new boards, most notably Samsung\u0027s\n Exynos5 based Chromebook.\n\n The changes depend on earlier platform specific updates and touch the\n usual platforms: omap, exynos, tegra, mxs, mvebu and davinci.\"\n\n* tag \u0027dt-for-linus-2\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (169 commits)\n ARM: exynos: dts: cros5250: add EC device\n ARM: dts: Add sbs-battery for exynos5250-snow\n ARM: dts: Add i2c-arbitrator bus for exynos5250-snow\n ARM: dts: add mshc controller node for Exynos4x12 SoCs\n ARM: dts: Add chip-id controller node on Exynos4/5 SoC\n ARM: EXYNOS: Create virtual I/O mapping for Chip-ID controller using device tree\n ARM: davinci: da850-evm: add SPI flash support\n ARM: davinci: da850: override SPI DT node device name\n ARM: davinci: da850: add SPI1 DT node\n spi/davinci: add DT binding documentation\n spi/davinci: no wildcards in DT compatible property\n ARM: dts: mvebu: Convert mvebu device tree files to 64 bits\n ARM: dts: mvebu: introduce internal-regs node\n ARM: dts: mvebu: Convert all the mvebu files to use the range property\n ARM: dts: mvebu: move all peripherals inside soc\n ARM: dts: mvebu: fix cpus section indentation\n ARM: davinci: da850: add EHRPWM \u0026 ECAP DT node\n ARM/dts: OMAP3: fix pinctrl-single configuration\n ARM: dts: Add OMAP3430 SDP NOR flash memory binding\n ARM: dts: Add NOR flash bindings for OMAP2420 H4\n ...\n" }, { "commit": "73287a43cc79ca06629a88d1a199cd283f42456a", "tree": "acf4456e260115bea77ee31a29f10ce17f0db45c", "parents": [ "251df49db3327c64bf917bfdba94491fde2b4ee0", "20074f357da4a637430aec2879c9d864c5d2c23c" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 01 14:08:52 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 01 14:08:52 2013 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next\n\nPull networking updates from David Miller:\n \"Highlights (1721 non-merge commits, this has to be a record of some\n sort):\n\n 1) Add \u0027random\u0027 mode to team driver, from Jiri Pirko and Eric\n Dumazet.\n\n 2) Make it so that any driver that supports configuration of multiple\n MAC addresses can provide the forwarding database add and del\n calls by providing a default implementation and hooking that up if\n the driver doesn\u0027t have an explicit set of handlers. From Vlad\n Yasevich.\n\n 3) Support GSO segmentation over tunnels and other encapsulating\n devices such as VXLAN, from Pravin B Shelar.\n\n 4) Support L2 GRE tunnels in the flow dissector, from Michael Dalton.\n\n 5) Implement Tail Loss Probe (TLP) detection in TCP, from Nandita\n Dukkipati.\n\n 6) In the PHY layer, allow supporting wake-on-lan in situations where\n the PHY registers have to be written for it to be configured.\n\n Use it to support wake-on-lan in mv643xx_eth.\n\n From Michael Stapelberg.\n\n 7) Significantly improve firewire IPV6 support, from YOSHIFUJI\n Hideaki.\n\n 8) Allow multiple packets to be sent in a single transmission using\n network coding in batman-adv, from Martin Hundebøll.\n\n 9) Add support for T5 cxgb4 chips, from Santosh Rastapur.\n\n 10) Generalize the VXLAN forwarding tables so that there is more\n flexibility in configurating various aspects of the endpoints.\n From David Stevens.\n\n 11) Support RSS and TSO in hardware over GRE tunnels in bxn2x driver,\n from Dmitry Kravkov.\n\n 12) Zero copy support in nfnelink_queue, from Eric Dumazet and Pablo\n Neira Ayuso.\n\n 13) Start adding networking selftests.\n\n 14) In situations of overload on the same AF_PACKET fanout socket, or\n per-cpu packet receive queue, minimize drop by distributing the\n load to other cpus/fanouts. From Willem de Bruijn and Eric\n Dumazet.\n\n 15) Add support for new payload offset BPF instruction, from Daniel\n Borkmann.\n\n 16) Convert several drivers over to mdoule_platform_driver(), from\n Sachin Kamat.\n\n 17) Provide a minimal BPF JIT image disassembler userspace tool, from\n Daniel Borkmann.\n\n 18) Rewrite F-RTO implementation in TCP to match the final\n specification of it in RFC4138 and RFC5682. From Yuchung Cheng.\n\n 19) Provide netlink socket diag of netlink sockets (\"Yo dawg, I hear\n you like netlink, so I implemented netlink dumping of netlink\n sockets.\") From Andrey Vagin.\n\n 20) Remove ugly passing of rtnetlink attributes into rtnl_doit\n functions, from Thomas Graf.\n\n 21) Allow userspace to be able to see if a configuration change occurs\n in the middle of an address or device list dump, from Nicolas\n Dichtel.\n\n 22) Support RFC3168 ECN protection for ipv6 fragments, from Hannes\n Frederic Sowa.\n\n 23) Increase accuracy of packet length used by packet scheduler, from\n Jason Wang.\n\n 24) Beginning set of changes to make ipv4/ipv6 fragment handling more\n scalable and less susceptible to overload and locking contention,\n from Jesper Dangaard Brouer.\n\n 25) Get rid of using non-type-safe NLMSG_* macros and use nlmsg_*()\n instead. From Hong Zhiguo.\n\n 26) Optimize route usage in IPVS by avoiding reference counting where\n possible, from Julian Anastasov.\n\n 27) Convert IPVS schedulers to RCU, also from Julian Anastasov.\n\n 28) Support cpu fanouts in xt_NFQUEUE netfilter target, from Holger\n Eitzenberger.\n\n 29) Network namespace support for nf_log, ebt_log, xt_LOG, ipt_ULOG,\n nfnetlink_log, and nfnetlink_queue. From Gao feng.\n\n 30) Implement RFC3168 ECN protection, from Hannes Frederic Sowa.\n\n 31) Support several new r8169 chips, from Hayes Wang.\n\n 32) Support tokenized interface identifiers in ipv6, from Daniel\n Borkmann.\n\n 33) Use usbnet_link_change() helper in USB net driver, from Ming Lei.\n\n 34) Add 802.1ad vlan offload support, from Patrick McHardy.\n\n 35) Support mmap() based netlink communication, also from Patrick\n McHardy.\n\n 36) Support HW timestamping in mlx4 driver, from Amir Vadai.\n\n 37) Rationalize AF_PACKET packet timestamping when transmitting, from\n Willem de Bruijn and Daniel Borkmann.\n\n 38) Bring parity to what\u0027s provided by /proc/net/packet socket dumping\n and the info provided by netlink socket dumping of AF_PACKET\n sockets. From Nicolas Dichtel.\n\n 39) Fix peeking beyond zero sized SKBs in AF_UNIX, from Benjamin\n Poirier\"\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next: (1722 commits)\n filter: fix va_list build error\n af_unix: fix a fatal race with bit fields\n bnx2x: Prevent memory leak when cnic is absent\n bnx2x: correct reading of speed capabilities\n net: sctp: attribute printl with __printf for gcc fmt checks\n netlink: kconfig: move mmap i/o into netlink kconfig\n netpoll: convert mutex into a semaphore\n netlink: Fix skb ref counting.\n net_sched: act_ipt forward compat with xtables\n mlx4_en: fix a build error on 32bit arches\n Revert \"bnx2x: allow nvram test to run when device is down\"\n bridge: avoid OOPS if root port not found\n drivers: net: cpsw: fix kernel warn on cpsw irq enable\n sh_eth: use random MAC address if no valid one supplied\n 3c509.c: call SET_NETDEV_DEV for all device types (ISA/ISAPnP/EISA)\n tg3: fix to append hardware time stamping flags\n unix/stream: fix peeking with an offset larger than data in queue\n unix/dgram: fix peeking with an offset larger than data in queue\n unix/dgram: peek beyond 0-sized skbs\n openvswitch: Remove unneeded ovs_netdev_get_ifindex()\n ...\n" }, { "commit": "43b5abe0640100a9e9424c91298c7993d443ffb7", "tree": "be50d3b735590b8c81413266de199d3338a8bf7a", "parents": [ "8ac2b3c0e270f9792edc15fb66808143eb48a53f" ], "author": { "name": "Sascha Herrmann", "email": "sascha@ps.nvbi.de", "time": "Sun Apr 14 22:33:28 2013 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Apr 16 16:34:07 2013 -0400" }, "message": "at86rf230: add irq type configuration option\n\nAdd option to at86rf230 platform data to configure the type of the\ninterrupt used by the driver. The irq polarity of the device will\nbe configured accordingly.\n\nSigned-off-by: Sascha Herrmann \u003csascha@ps.nvbi.de\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "446411e18b2cb17d153e45f634a3c9a79ada3ac2", "tree": "d0b227257591b9a010d453bef1bd2645901e3f0d", "parents": [ "3d3522604a5557e80fdcab61c54bd04eaf15b525" ], "author": { "name": "Andreas Larsson", "email": "andreas@gaisler.com", "time": "Wed Feb 13 14:20:25 2013 +0100" }, "committer": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Sun Apr 07 10:12:20 2013 +0100" }, "message": "spi: Initialize cs_gpio and cs_gpios with -ENOENT\n\nThe return value from of_get_named_gpio is -ENOENT when the given index\nmatches a hole in the \"cs-gpios\" property phandle list. However, the\ndefault value of cs_gpio in struct spi_device and entries of cs_gpios in\nstruct spi_master is -EINVAL, which is documented to indicate that a\nGPIO line should not be used for the given spi_device.\n\nThis sets the default value of cs_gpio in struct spi_device and entries\nof cs_gpios in struct spi_master to -ENOENT. Thus, -ENOENT is the only\nvalue used to indicate that no GPIO line should be used.\n\nSigned-off-by: Andreas Larsson \u003candreas@gaisler.com\u003e\nSigned-off-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\n" }, { "commit": "5e49035e26abf557737c1281439548f33b41578e", "tree": "426fcc798c994114f4c2268354a682dc13c3554a", "parents": [ "c60fea02141167cc277ff92fd6ee21448f56449f" ], "author": { "name": "Stephen Warren", "email": "swarren@nvidia.com", "time": "Fri Feb 15 15:03:50 2013 -0700" }, "committer": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Sun Apr 07 10:07:59 2013 +0100" }, "message": "spi/tegra: remove unused Tegra platform data header\n\nThe platform data header is no longer used. Delete it.\n\nSigned-off-by: Stephen Warren \u003cswarren@nvidia.com\u003e\nSigned-off-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\n" }, { "commit": "26aafa77df61c4190eae80646211ee6f07c88eaf", "tree": "5ae896947ebde38999bd5271a8a13ad09a2b117d", "parents": [ "0e91e434c86c84e84c46cf8bff2b5e53daee85d5" ], "author": { "name": "Shawn Guo", "email": "shawn.guo@linaro.org", "time": "Tue Feb 26 11:07:32 2013 +0800" }, "committer": { "name": "Shawn Guo", "email": "shawn.guo@linaro.org", "time": "Thu Apr 04 21:22:44 2013 +0800" }, "message": "spi: mxs-spi: move to use generic DMA helper\n\nWith the generic DMA device tree helper supported by mxs-dma driver,\nclient devices only need to call dma_request_slave_channel() for\nrequesting a DMA channel from dmaengine.\n\nSince mxs is a DT only platform now, along with the changes, the non-DT\ncase handling in probe function also gets removed.\n\nSigned-off-by: Shawn Guo \u003cshawn.guo@linaro.org\u003e\nAcked-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\nReviewed-by: Arnd Bergmann \u003carnd@arndb.de\u003e\n" }, { "commit": "543bb255a1987836e64f5b7a63664ead8b32b042", "tree": "818ee5b60f8d24ccfd495ebdb50ea0a175c340b1", "parents": [ "5c725b34d438fdd3c528673a5f53f4b07f879c68" ], "author": { "name": "Stephen Warren", "email": "swarren@wwwdotorg.org", "time": "Tue Mar 26 20:37:57 2013 -0600" }, "committer": { "name": "Mark Brown", "email": "broonie@opensource.wolfsonmicro.com", "time": "Mon Apr 01 14:14:32 2013 +0100" }, "message": "spi: add ability to validate xfer-\u003ebits_per_word in SPI core\n\nAllow SPI masters to define the set of bits_per_word values they support.\nIf they do this, then the SPI core will reject transfers that attempt to\nuse an unsupported bits_per_word value. This eliminates the need for each\nSPI driver to implement this checking in most cases.\n\nSigned-off-by: Stephen Warren \u003cswarren@wwwdotorg.org\u003e\nSigned-off-by: Mark Brown \u003cbroonie@opensource.wolfsonmicro.com\u003e\n" }, { "commit": "b5c78e04dd061b776978dad61dd85357081147b0", "tree": "2416b2dc61c452c3aeb2a32bcedf15e6257be638", "parents": [ "06991c28f37ad68e5c03777f5c3b679b56e3dac1", "951348b377385475aa256c27e1c9e2564c9ec160" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Feb 21 12:11:44 2013 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Feb 21 12:11:44 2013 -0800" }, "message": "Merge tag \u0027staging-3.9-rc1\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging\n\nPull staging tree update from Greg Kroah-Hartman:\n \"Here\u0027s the big staging tree merge for 3.9-rc1\n\n Lots of cleanups and updates for drivers all through the staging tree.\n We are pretty much \"code neutral\" here, adding just about as many\n lines as we removed.\n\n All of these have been in linux-next for a while.\"\n\n* tag \u0027staging-3.9-rc1\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (804 commits)\n staging: comedi: vmk80xx: wait for URBs to complete\n staging: comedi: drivers: addi-data: hwdrv_apci3200.c: Add a missing semicolon\n staging: et131x: Update TODO list\n staging: et131x: Remove assignment of skb-\u003edev\n staging: wlan-ng: hfa384x.h: fix for error reported by smatch\n staging/zache checkpatch ERROR: spaces prohibited around that\n staging/ozwpan: Mark read only parameters and structs as const\n staging/ozwpan: Remove empty and unused function oz_cdev_heartbeat\n staging/ozwpan: Mark local functions as static (fix sparse warnings)\n staging/ozwpan: Add missing header includes\n staging/usbip: Mark local functions as static (fix sparse warnings)\n staging/xgifb: Remove duplicated code in loops.\n staging/xgifb: Consolidate return paths\n staging/xgifb: Remove code without effect\n staging/xgifb: Remove unnecessary casts\n staging/xgifb: Consolidate if/else if with identical code branches\n staging: vt6656: replaced custom TRUE definition with true\n staging: vt6656: replaced custom FALSE definition with false\n staging: vt6656: replace custom BOOL definition with bool\n staging/rtl8187se: Mark functions as static to silence sparse\n ...\n" }, { "commit": "095c3752e673c0ba039a2f67fd867297fde75ae7", "tree": "0cc9b6fd90608119d08f88d232ce2b48aadc459d", "parents": [ "0da83bb1c9d2690465d27cb8887918e6664f647e" ], "author": { "name": "Andreas Larsson", "email": "andreas@gaisler.com", "time": "Tue Jan 29 15:53:41 2013 +0100" }, "committer": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Mon Feb 11 00:05:31 2013 +0000" }, "message": "spi: Document cs_gpios and cs_gpio in kernel-doc\n\nThis adds missing kernel-doc entries for cs_gpios in struct spi_master and\ncs_gpio in struct spi_device.\n\nSigned-off-by: Andreas Larsson \u003candreas@gaisler.com\u003e\n[grant.likely: tweaked the language of the descriptions]\nSigned-off-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\n" }, { "commit": "6d9eecd418afb2c12e5db5be3d72f0f1df43bdd9", "tree": "6c9fc5330e8e6970ab08f1c1220d612caeb44344", "parents": [ "ad76fda78318821fe8823b4b7c587a46a268eecf" ], "author": { "name": "Lars-Peter Clausen", "email": "lars@metafoo.de", "time": "Wed Jan 09 17:31:00 2013 +0000" }, "committer": { "name": "Jonathan Cameron", "email": "jic23@kernel.org", "time": "Sat Feb 09 11:02:07 2013 +0000" }, "message": "spi: Add helper functions for setting up transfers\n\nQuite often the pattern used for setting up and transferring a synchronous SPI\ntransaction looks very much like the following:\n\n\tstruct spi_message msg;\n\tstruct spi_transfer xfers[] \u003d {\n\t\t...\n\t};\n\n\tspi_message_init(\u0026msg);\n\tspi_message_add_tail(\u0026xfers[0], \u0026msg);\n\t...\n\tspi_message_add_tail(\u0026xfers[ARRAY_SIZE(xfers) - 1], \u0026msg);\n\n\tret \u003d spi_sync(\u0026msg);\n\nThis patch adds two new helper functions for handling this case. The first\nhelper function spi_message_init_with_transfers() takes a spi_message and an\narray of spi_transfers. It will initialize the message and then call\nspi_message_add_tail() for each transfer in the array. E.g. the following\n\n\tspi_message_init(\u0026msg);\n\tspi_message_add_tail(\u0026xfers[0], \u0026msg);\n\t...\n\tspi_message_add_tail(\u0026xfers[ARRAY_SIZE(xfers) - 1], \u0026msg);\n\ncan be rewritten as\n\n\tspi_message_init_with_transfers(\u0026msg, xfers, ARRAY_SIZE(xfers));\n\nThe second function spi_sync_transfer() takes a SPI device and an array of\nspi_transfers. It will allocate a new spi_message (on the stack) and add all\ntransfers in the array to the message. Finally it will call spi_sync() on the\nmessage.\n\nE.g. the follwing\n\n\tstruct spi_message msg;\n\tstruct spi_transfer xfers[] \u003d {\n\t\t...\n\t};\n\n\tspi_message_init(\u0026msg);\n\tspi_message_add_tail(\u0026xfers[0], \u0026msg);\n\t...\n\tspi_message_add_tail(\u0026xfers[ARRAY_SIZE(xfers) - 1], \u0026msg);\n\n\tret \u003d spi_sync(spi, \u0026msg);\n\ncan be rewritten as\n\n\tstruct spi_transfer xfers[] \u003d {\n\t\t...\n\t};\n\n\tret \u003d spi_sync_transfer(spi, xfers, ARRAY_SIZE(xfers));\n\nA coccinelle script to find such instances will follow.\n\nSigned-off-by: Lars-Peter Clausen \u003clars@metafoo.de\u003e\nReviewed-by: Mark Brown \u003cbroonie@opensource.wolfsonmicro.com\u003e\nSigned-off-by: Jonathan Cameron \u003cjic23@kernel.org\u003e\n" }, { "commit": "a0d2642e9296882cda3ad03ff3d9a6649cd70439", "tree": "4c3f4a29ba904a357789cd7c2286eb035fa16340", "parents": [ "b833172fd8f44fb56e0b3cb810155a6baecc65dc" ], "author": { "name": "Mika Westerberg", "email": "mika.westerberg@linux.intel.com", "time": "Tue Jan 22 12:26:32 2013 +0200" }, "committer": { "name": "Mark Brown", "email": "broonie@opensource.wolfsonmicro.com", "time": "Fri Feb 08 13:14:40 2013 +0000" }, "message": "spi/pxa2xx: add support for Intel Low Power Subsystem SPI\n\nIntel LPSS SPI is pretty much the same as the PXA27xx SPI except that it\nhas few additional features over the original:\n\n\to FIFO depth is 256 entries\n\to RX FIFO has one watermark\n\to TX FIFO has two watermarks, low and high\n\to chip select can be controlled by writing to a register\n\nThe new FIFO registers follow immediately the PXA27xx registers but then there\nare some additional LPSS private registers at offset 1k or 2k from the base\naddress. For these private registers we add new accessors that take advantage\nof drv_data-\u003elpss_base once it is resolved.\n\nWe add a new type LPSS_SSP that can be used to distinguish the LPSS devices\nfrom others.\n\nSigned-off-by: Mika Westerberg \u003cmika.westerberg@linux.intel.com\u003e\nTested-by: Lu Cao \u003clucao@marvell.com\u003e\nSigned-off-by: Mark Brown \u003cbroonie@opensource.wolfsonmicro.com\u003e\n" }, { "commit": "5928808ef623347e0d4aa22327b992e9e125b6ad", "tree": "224237a53eaa3e75c093430f967d5f2bd255f1f4", "parents": [ "cd7bed00340475ee72a013a070e200e065085ef3" ], "author": { "name": "Mika Westerberg", "email": "mika.westerberg@linux.intel.com", "time": "Tue Jan 22 12:26:29 2013 +0200" }, "committer": { "name": "Mark Brown", "email": "broonie@opensource.wolfsonmicro.com", "time": "Fri Feb 08 12:15:28 2013 +0000" }, "message": "spi/pxa2xx: add support for DMA engine\n\nTo be able to use DMA with this driver on non-PXA platforms we implement\nsupport for the generic DMA engine API. This lets user to use different DMA\nengines with little or no modification to the driver.\n\nRequest lines and channel numbers can be passed to the driver from the\nplatform specific data.\n\nThe DMA engine implementation will be selected by default even on PXA\nplatform. User can select the legacy DMA API by enabling Kconfig option\nCONFIG_SPI_PXA2XX_PXADMA.\n\nSigned-off-by: Mika Westerberg \u003cmika.westerberg@linux.intel.com\u003e\nAcked-by: Linus Walleij \u003clinus.walleij@linaro.org\u003e\nTested-by: Lu Cao \u003clucao@marvell.com\u003e\nSigned-off-by: Mark Brown \u003cbroonie@opensource.wolfsonmicro.com\u003e\n" }, { "commit": "cd7bed00340475ee72a013a070e200e065085ef3", "tree": "98f3cd20ecfaf090a772d0c0b185df7260a8336e", "parents": [ "d560040f7d6fbe0a2990b8f6edca1815e19e72f5" ], "author": { "name": "Mika Westerberg", "email": "mika.westerberg@linux.intel.com", "time": "Tue Jan 22 12:26:28 2013 +0200" }, "committer": { "name": "Mark Brown", "email": "broonie@opensource.wolfsonmicro.com", "time": "Fri Feb 08 12:15:21 2013 +0000" }, "message": "spi/pxa2xx: break out the private DMA API usage into a separate file\n\nThe PXA SPI driver uses PXA platform specific private DMA implementation\nwhich does not work on non-PXA platforms. In order to use this driver on\nother platforms we break out the private DMA implementation into a separate\nfile that gets compiled only when CONFIG_SPI_PXA2XX_PXADMA is set. The DMA\nfunctions are stubbed out if there is no DMA implementation selected (i.e\nwe are building on non-PXA platform).\n\nWhile we are there we can kill the dummy DMA bits in pxa2xx_spi.h as they\nare not needed anymore for CE4100.\n\nOnce this is done we can add the generic DMA engine support to the driver\nthat allows usage of any DMA controller that implements DMA engine API.\n\nSigned-off-by: Mika Westerberg \u003cmika.westerberg@linux.intel.com\u003e\nAcked-by: Linus Walleij \u003clinus.walleij@linaro.org\u003e\nTested-by: Lu Cao \u003clucao@marvell.com\u003e\nSigned-off-by: Mark Brown \u003cbroonie@opensource.wolfsonmicro.com\u003e\n" }, { "commit": "d560040f7d6fbe0a2990b8f6edca1815e19e72f5", "tree": "0cec0d54116d6b10e640108e76476c5e03933ba9", "parents": [ "5cbc7ca987fb3f293203dc14a6c53b91b7c978a5" ], "author": { "name": "Maxime Ripard", "email": "maxime.ripard@free-electrons.com", "time": "Thu Jan 31 11:12:56 2013 +0100" }, "committer": { "name": "Mark Brown", "email": "broonie@opensource.wolfsonmicro.com", "time": "Thu Jan 31 18:25:44 2013 +0800" }, "message": "spi: spi-gpio: fix compilation warning on 64 bits systems\n\nSPI_GPIO_NO_MOSI and SPI_GPIO_NO_MISO flags are type casted to unsigned\nlong, yet, they are to be stored in an unsigned int field in the\nspi_gpio_platform_data structure.\n\nThis leads to the following warning during compilation on 64 bits systems:\nwarning: large integer implicitly truncated to unsigned type [-Woverflow]\n\nSigned-off-by: Maxime Ripard \u003cmaxime.ripard@free-electrons.com\u003e\nReported-by: Fengguang Wu \u003cfengguang.wu@intel.com\u003e\nSigned-off-by: Mark Brown \u003cbroonie@opensource.wolfsonmicro.com\u003e\n" }, { "commit": "3343b7a6d2cd0a980d0c4a0ce02ef48b6bfcc12a", "tree": "09a2525b7710c0366dc99ba86cd51ec5a6e4c6f8", "parents": [ "7f86bde90e2e1f693d93922fc0f4d50f001ce1a5" ], "author": { "name": "Mika Westerberg", "email": "mika.westerberg@linux.intel.com", "time": "Tue Jan 22 12:26:27 2013 +0200" }, "committer": { "name": "Mark Brown", "email": "broonie@opensource.wolfsonmicro.com", "time": "Sat Jan 26 15:21:37 2013 +0800" }, "message": "spi/pxa2xx: convert to the common clk framework\n\nConvert clk_enable() to clk_prepare_enable() and clk_disable() to\nclk_disable_unprepare() respectively in order to support the common clk\nframework. Otherwise we get warnings on the console as the clock is not\nprepared before it is enabled.\n\nIn addition we must cache the maximum clock rate to drv_data-\u003emax_clk_rate\nat probe time because clk_get_rate() cannot be called in tasklet context.\n\nSigned-off-by: Mika Westerberg \u003cmika.westerberg@linux.intel.com\u003e\nSigned-off-by: Mark Brown \u003cbroonie@opensource.wolfsonmicro.com\u003e\n" }, { "commit": "851bacf5902cad15f9bb789d278a1ee9608c8f25", "tree": "521b8652658684d9a6ff1ad5a7263d361c77114a", "parents": [ "0202775bc3a28f2436ea6ee13ef3eb0e8f237857" ], "author": { "name": "Mika Westerberg", "email": "mika.westerberg@linux.intel.com", "time": "Mon Jan 07 12:44:33 2013 +0200" }, "committer": { "name": "Mark Brown", "email": "broonie@opensource.wolfsonmicro.com", "time": "Tue Jan 08 11:00:32 2013 +0000" }, "message": "spi/pxa2xx: embed the ssp_device to platform data\n\nThe spi-pxa2xx-pci glue driver had to implement pxa_ssp_request()/free() in\norder to support the spi-pxa2xx platform driver. Since the ACPI enabled\nplatforms can use the same platform driver we would need to implement\npxa_ssp_request()/free() in some central place that can be shared by the\nACPI and PCI glue code.\n\nInstead of doing that we can make pxa_ssp_request()/free() to be available\nonly when CONFIG_ARCH_PXA is set. On other arches these are being stubbed\nout in preference to passing the ssp_device from the platform data\ndirectly.\n\nWe also change the SPI bus number to be taken from ssp-\u003eport_id instead of\nplatform device id. This way the supporting code that passes the ssp can\ndecide the number (or it can set it to the same as pdev-\u003eid).\n\nSigned-off-by: Mika Westerberg \u003cmika.westerberg@linux.intel.com\u003e\nSigned-off-by: Mark Brown \u003cbroonie@opensource.wolfsonmicro.com\u003e\n" }, { "commit": "7730cba2a50332c194f50a58b86359ea39a82bd1", "tree": "64c8d7228da1454c02288068e57a9c61f8b0acd0", "parents": [ "c20151dff8a6d503c0d0cc4387c33a618cdabcb7", "b69f0859dc8e633c5d8c06845811588fe17e68b3" ], "author": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Fri Dec 07 17:02:47 2012 +0000" }, "committer": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Fri Dec 07 17:02:47 2012 +0000" }, "message": "Merge tag \u0027v3.7-rc8\u0027 into spi/next\n\nLinux 3.7-rc8\n" }, { "commit": "a34fc82e234255b657e62c3ce0c12e9439a59e80", "tree": "a305e3c3c271bb5d6cd7980780f39938a02e32ce", "parents": [ "161b96c383c442f4d7dabbb8500a5fbd551b344d", "227c4ce6eac9fe6566d9718546a0e31b5b4633cd" ], "author": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Thu Dec 06 13:58:31 2012 +0000" }, "committer": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Thu Dec 06 13:58:31 2012 +0000" }, "message": "Merge branch \u0027spi-next\u0027 from git://git.kernel.org/pub/scm/linux/kernel/git/broonie/misc.git\n\nPull in the changes Mark has queued up for SPI\n" }, { "commit": "743179849015dc71bb2ea63d8cd4bfa7fdfb4bc6", "tree": "dcf0d554dd907740a5f4519355d4e896a94efd3b", "parents": [ "15d0983f5cc862facc8453a592220598a36d7f9d" ], "author": { "name": "Jean-Christophe PLAGNIOL-VILLARD", "email": "plagnioj@jcrosoft.com", "time": "Thu Nov 15 20:19:57 2012 +0100" }, "committer": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Wed Nov 21 23:25:33 2012 +0000" }, "message": "of_spi: add generic binding support to specify cs gpio\n\nThis will allow to use gpio for chip select with no modification in the\ndriver binding\n\nWhen use the cs-gpios, the gpio number will be passed via the cs_gpio field\nand the number of chip select will automatically increased with max(hw cs, gpio cs).\n\nSo if for example the controller has 2 CS lines, and the cs-gpios\nproperty looks like this:\n\ncs-gpios \u003d \u003c\u0026gpio1 0 0\u003e \u003c0\u003e \u003c\u0026gpio1 1 0\u003e \u003c\u0026gpio1 2 0\u003e;\n\nThen it should be configured so that num_chipselect \u003d 4 with the\nfollowing mapping:\n\ncs0 : \u0026gpio1 0 0\ncs1 : native\ncs2 : \u0026gpio1 1 0\ncs3 : \u0026gpio1 2 0\n\nSigned-off-by: Jean-Christophe PLAGNIOL-VILLARD \u003cplagnioj@jcrosoft.com\u003e\nCc: devicetree-discuss@lists.ozlabs.org\nCc: spi-devel-general@lists.sourceforge.net\nSigned-off-by: Richard Genoud \u003crichard.genoud@gmail.com\u003e\n[grant.likely: fixed up type of cs count so min() can do type checking]\nSigned-off-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\n" }, { "commit": "c4f4925439f13a243aecfb36c693613603c0bfbd", "tree": "aa8bc2513739c4729300d8c7dcf86184d9708d99", "parents": [ "c91cb7a75eaf65358aac5ea2b512ac60a9437ff4" ], "author": { "name": "Igor Grinberg", "email": "grinberg@compulab.co.il", "time": "Tue Nov 20 23:00:10 2012 -0800" }, "committer": { "name": "Dmitry Torokhov", "email": "dmitry.torokhov@gmail.com", "time": "Wed Nov 21 13:09:56 2012 -0800" }, "message": "Input: ads7846 - enable pendown GPIO debounce time setting\n\nSome platforms need the pendown GPIO debounce time setting programmed.\nSince the pendown GPIO is handled by the driver, the debounce time\nshould also be handled along with the pendown GPIO request.\n\nSigned-off-by: Igor Grinberg \u003cgrinberg@compulab.co.il\u003e\nSigned-off-by: Dmitry Torokhov \u003cdmitry.torokhov@gmail.com\u003e\n" }, { "commit": "dc4dc36056392c0b0b1ca9e81bebff964b9297e0", "tree": "adbe20e39ba98a2ae893548511b656048686cd85", "parents": [ "8f0d8163b50e01f398b14bcd4dc039ac5ab18d64" ], "author": { "name": "Laxman Dewangan", "email": "ldewangan@nvidia.com", "time": "Tue Oct 30 12:34:05 2012 +0530" }, "committer": { "name": "Mark Brown", "email": "broonie@opensource.wolfsonmicro.com", "time": "Tue Oct 30 18:38:35 2012 +0000" }, "message": "spi: tegra: add spi driver for SLINK controller\n\nTegra20/Tegra30 supports the spi interface through its SLINK\ncontroller. Add spi driver for SLINK controller.\n\nSigned-off-by: Laxman Dewangan \u003cldewangan@nvidia.com\u003e\nReviewed-by: Stephen Warren \u003cswarren@nvidia.com\u003e\nSigned-off-by: Mark Brown \u003cbroonie@opensource.wolfsonmicro.com\u003e\n" }, { "commit": "4864ccbb5a6f99e4c44dc816304007547a268b9f", "tree": "d6cbb0ea8671dffcaab98b17fbf9a72e16245ad0", "parents": [ "735f0a985ac414b6e5f09cf6199b6fd5e118ff62", "213d27a42ce1646989966011d2af8563feac5635" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Oct 24 18:00:17 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Oct 24 18:00:17 2012 -0700" }, "message": "Merge tag \u0027spi-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/misc\n\nPull spi fixes from Mark Brown:\n \"A bunch of fixes here, mostly minor except for the pl022 which has\n just been a bit of a shambles all round, the recent runtime PM changes\n have as far as I can tell never worked so they\u0027re just getting thrown\n out.\"\n\n* tag \u0027spi-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/misc:\n spi/pl022: Revert recent runtime PM changes\n spi: tsc2005: delete soon-obsolete e-mail address\n spi: spi-rspi: fix build error for the latest shdma driver\n" }, { "commit": "64d7155cdfe5546ca0730daf7dd73ee52a74eeaf", "tree": "7d58409a555f89b8fb9c81012809c108b5d32b01", "parents": [ "0238047018d34946c08afc2f9e19053a3c25f0e1" ], "author": { "name": "David Howells", "email": "dhowells@redhat.com", "time": "Wed Oct 17 12:31:15 2012 +0100" }, "committer": { "name": "David Howells", "email": "dhowells@redhat.com", "time": "Wed Oct 17 12:31:15 2012 +0100" }, "message": "UAPI: Remove empty non-UAPI Kbuild files\n\nRemove non-UAPI Kbuild files that have become empty as a result of UAPI\ndisintegration. They used to have only header-y lines in them and those have\nnow moved to the Kbuild files in the corresponding uapi/ directories.\n\nPossibly these should not be removed but rather have a comment inserted to say\nthey are intentionally left blank. This would make it easier to add generated\nheader lines in future without having to restore the infrastructure.\n\nNote that at this point not all the UAPI disintegration parts have been merged,\nso it is likely that more empty Kbuild files will turn up.\n\nIt is probably necessary to make the files non-empty to prevent the patch\nprogram from automatically deleting them when it reduces them to nothing.\n\nSigned-off-by: David Howells \u003cdhowells@redhat.com\u003e\n" }, { "commit": "2f5f1ce90a5fa097372bb895452a718e4d33e4e3", "tree": "b905aa0ee4e37545014907ecfe91e9319a00e09c", "parents": [ "0243c53634987ce7a3d1e39ae55c17800d9436c8" ], "author": { "name": "Aaro Koskinen", "email": "aaro.koskinen@nokia.com", "time": "Fri Aug 17 14:47:30 2012 +0300" }, "committer": { "name": "Mark Brown", "email": "broonie@opensource.wolfsonmicro.com", "time": "Wed Oct 17 16:32:46 2012 +0900" }, "message": "spi: tsc2005: delete soon-obsolete e-mail address\n\nDelete soon-obsolete e-mail address.\n\nSigned-off-by: Aaro Koskinen \u003caaro.koskinen@nokia.com\u003e\nSigned-off-by: Mark Brown \u003cbroonie@opensource.wolfsonmicro.com\u003e\n" }, { "commit": "7939d3c2a677b06cf111a1304710dd97892f3695", "tree": "86defb65707d8b5c22cc02965b1bc3f3f67078ac", "parents": [ "9e2d8656f5e8aa214e66b462680cf86b210b74a8" ], "author": { "name": "David Howells", "email": "dhowells@redhat.com", "time": "Tue Oct 09 09:49:03 2012 +0100" }, "committer": { "name": "David Howells", "email": "dhowells@redhat.com", "time": "Tue Oct 09 09:49:03 2012 +0100" }, "message": "UAPI: (Scripted) Disintegrate include/linux/spi\n\nSigned-off-by: David Howells \u003cdhowells@redhat.com\u003e\nAcked-by: Arnd Bergmann \u003carnd@arndb.de\u003e\nAcked-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nAcked-by: Michael Kerrisk \u003cmtk.manpages@gmail.com\u003e\nAcked-by: Paul E. McKenney \u003cpaulmck@linux.vnet.ibm.com\u003e\nAcked-by: Dave Jones \u003cdavej@redhat.com\u003e\n" }, { "commit": "65defb9b3ba67c1d6f88ac62c24644eb23a7b676", "tree": "68b68b0eb966f6691353363deea65de0d1ea06d1", "parents": [ "646781d3325cdcc648b8eeb3b7cda393bcb78659" ], "author": { "name": "Marek Vasut", "email": "marex@denx.de", "time": "Fri Aug 03 17:26:12 2012 +0200" }, "committer": { "name": "Mark Brown", "email": "broonie@opensource.wolfsonmicro.com", "time": "Fri Aug 17 22:54:15 2012 +0100" }, "message": "mmc: spi: Pull out common DMA parts from MXS MMC\n\nThese parts will be used by the MXS SPI driver too.\n\nSigned-off-by: Marek Vasut \u003cmarex@denx.de\u003e\nAcked-by: Chris Ball \u003ccjb@laptop.org\u003e\nAcked-by: Shawn Guo \u003cshawn.guo@linaro.org\u003e\nSigned-off-by: Mark Brown \u003cbroonie@opensource.wolfsonmicro.com\u003e\n" }, { "commit": "1308239858c33feeeb67003d08c754ee181f33cf", "tree": "bc74532d1085d85776c2dde1183996f5baeddcf9", "parents": [ "829c1bf40b926a86e545733f6252262add3abe39" ], "author": { "name": "Marek Vasut", "email": "marex@denx.de", "time": "Fri Aug 03 17:26:10 2012 +0200" }, "committer": { "name": "Mark Brown", "email": "broonie@opensource.wolfsonmicro.com", "time": "Fri Aug 17 22:53:00 2012 +0100" }, "message": "mmc: spi: Pull out the SSP clock configuration function\n\nPull out the MMC clock configuration function and make it\ninto SSP clock configuration function, so it can be used by\nthe SPI driver too.\n\nSigned-off-by: Marek Vasut \u003cmarex@denx.de\u003e\nAcked-by: Chris Ball \u003ccjb@laptop.org\u003e\nAcked-by: Shawn Guo \u003cshawn.guo@linaro.org\u003e\nSigned-off-by: Mark Brown \u003cbroonie@opensource.wolfsonmicro.com\u003e\n" }, { "commit": "829c1bf40b926a86e545733f6252262add3abe39", "tree": "8d94e9dc8ccc86a7f2cf9d1a72fae88efc9209c2", "parents": [ "f83b73806579c666fe6f1a4ed4800092c89e81db" ], "author": { "name": "Marek Vasut", "email": "marex@denx.de", "time": "Fri Aug 03 17:26:09 2012 +0200" }, "committer": { "name": "Mark Brown", "email": "broonie@opensource.wolfsonmicro.com", "time": "Fri Aug 17 22:52:51 2012 +0100" }, "message": "mmc: spi: Pull out parts shared between MMC and SPI\n\nAbstract out the common part of private data shared between MMC\nand SPI. These shall later allow to use common clock configuration\nfunction.\n\nSigned-off-by: Marek Vasut \u003cmarex@denx.de\u003e\nAcked-by: Chris Ball \u003ccjb@laptop.org\u003e\nAcked-by: Shawn Guo \u003cshawn.guo@linaro.org\u003e\nSigned-off-by: Mark Brown \u003cbroonie@opensource.wolfsonmicro.com\u003e\n" }, { "commit": "f83b73806579c666fe6f1a4ed4800092c89e81db", "tree": "2f50cf45ae5da854a2a0ab821292bd68f956c13e", "parents": [ "600a991f98d94c97f72870f85df687c517c3af53" ], "author": { "name": "Marek Vasut", "email": "marex@denx.de", "time": "Fri Aug 03 17:26:08 2012 +0200" }, "committer": { "name": "Mark Brown", "email": "broonie@opensource.wolfsonmicro.com", "time": "Fri Aug 17 22:52:42 2012 +0100" }, "message": "mmc: spi: Add necessary bits into mxs-spi.h\n\nAdd missing register bits and registers into mxs-spi.h .\nThese will be used by the SPI driver.\n\nBased on previous attempt by:\nFabio Estevam \u003cfabio.estevam@freescale.com\u003e\n\nSigned-off-by: Fabio Estevam \u003cfabio.estevam@freescale.com\u003e\nSigned-off-by: Marek Vasut \u003cmarex@denx.de\u003e\nAcked-by: Chris Ball \u003ccjb@laptop.org\u003e\nAcked-by: Shawn Guo \u003cshawn.guo@linaro.org\u003e\nSigned-off-by: Mark Brown \u003cbroonie@opensource.wolfsonmicro.com\u003e\n" }, { "commit": "600a991f98d94c97f72870f85df687c517c3af53", "tree": "b807fd2032e1a8e6d150629d3eff61ad3801c560", "parents": [ "8be3d3b2ac87955455c7ce852e0d489cb04fff59" ], "author": { "name": "Marek Vasut", "email": "marex@denx.de", "time": "Fri Aug 03 17:26:07 2012 +0200" }, "committer": { "name": "Mark Brown", "email": "broonie@opensource.wolfsonmicro.com", "time": "Fri Aug 17 22:52:31 2012 +0100" }, "message": "mmc: spi: Rename IMX2[38]_MMC to IMX2[38]_SSP\n\nSince the SSP controller can act as both SPI and MMC host,\nrenaming the enum to properly reflect the naming seems\nappropriate.\n\nBased on previous attempt by:\nFabio Estevam \u003cfabio.estevam@freescale.com\u003e\n\nSigned-off-by: Fabio Estevam \u003cfabio.estevam@freescale.com\u003e\nSigned-off-by: Marek Vasut \u003cmarex@denx.de\u003e\nAcked-by: Chris Ball \u003ccjb@laptop.org\u003e\nAcked-by: Shawn Guo \u003cshawn.guo@linaro.org\u003e\nSigned-off-by: Mark Brown \u003cbroonie@opensource.wolfsonmicro.com\u003e\n" }, { "commit": "8be3d3b2ac87955455c7ce852e0d489cb04fff59", "tree": "6c4f0004758832fc795ec8cbc4db4859d8eb061f", "parents": [ "d9875690d9b89a866022ff49e3fcea892345ad92" ], "author": { "name": "Marek Vasut", "email": "marex@denx.de", "time": "Fri Aug 03 17:26:06 2012 +0200" }, "committer": { "name": "Mark Brown", "email": "broonie@opensource.wolfsonmicro.com", "time": "Fri Aug 17 22:52:14 2012 +0100" }, "message": "mmc: spi: Move SSP register definitions into separate file\n\nMove the definitions into separate file so separate SPI driver can be\nimplemented. The SSP controller in MXS can act both as a MMC host and\nas a SPI host.\n\nBased on previous attempt by:\nFabio Estevam \u003cfabio.estevam@freescale.com\u003e\n\nSigned-off-by: Fabio Estevam \u003cfabio.estevam@freescale.com\u003e\nSigned-off-by: Marek Vasut \u003cmarex@denx.de\u003e\nAcked-by: Chris Ball \u003ccjb@laptop.org\u003e\nAcked-by: Shawn Guo \u003cshawn.guo@linaro.org\u003e\nSigned-off-by: Mark Brown \u003cbroonie@opensource.wolfsonmicro.com\u003e\n" }, { "commit": "945c40c6b007eb4b07374a38ea37b2a34da306b1", "tree": "09d36ed7d59cd7d63162de84671761366939450b", "parents": [ "0082c16e3a6d87c7b156ccf21f5e6c448b102809", "314820c9e892d8f41ba4db300ec96770d9c8294b" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jul 26 12:59:53 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jul 26 12:59:53 2012 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input\n\nPull input layer updates from Dmitry Torokhov:\n \"First set of updates for the input subsystem. You will get a new\n touchscreen driver (Melfas mms114), a new keypad driver for LPC32xx\n SoC, large update to Atmel mXT touchscreen driver, a lot of drivers\n acquired device tree support and a slew of other fixes.\"\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (57 commits)\n Input: add MELFAS mms114 touchscreen driver\n Input: add support for key scan interface of the LPC32xx SoC\n Input: omap4-keypad - add device tree support\n Input: hanwang - add support for Art Master II tablet\n Input: spear_keyboard - reconfigure operating frequency on suspend\n Input: spear_keyboard - fix clock handling during suspend/resume\n Input: ff-memless - fix a couple min_t() casts\n Input: synaptics - print firmware ID and board number at init\n Input: spear_keyboard - generalize keyboard frequency configuration\n Input: spear_keyboard - rename bit definitions to reflect register\n Input: spear_keyboard - use correct io accessors\n Input: spear-keyboard - fix disable device_init_wakeup in remove\n Input: wacom_i2c - fix compiler warning\n Input: imx_keypad - check error returned by clk_prepare_enable()\n Input: imx_keypad - adapt the new kpp clock name\n Input: imx_keypad - use clk_prepare_enable/clk_disable_unprepare()\n Input: ad7879 - add option to correct xy axis\n Input: synaptics_usb - Remove TrackPoint name trailing whitespace\n Revert \"Input: atmel_mxt_ts - warn if sysfs could not be created\"\n Input: MT - Include win8 support\n ...\n" }, { "commit": "6680884a44207efe8ef6bc56b1c932cce2b89994", "tree": "aca3138305a44c4766e19c69d4da43fc16e810d4", "parents": [ "f2bb26b9b7652287719f08f080c09c2d7ddcf6b5" ], "author": { "name": "Michael Hennerich", "email": "michael.hennerich@analog.com", "time": "Fri Jul 06 10:44:19 2012 -0700" }, "committer": { "name": "Dmitry Torokhov", "email": "dmitry.torokhov@gmail.com", "time": "Fri Jul 06 19:12:26 2012 -0700" }, "message": "Input: ad7879 - add option to correct xy axis\n\nSebastian Zenker reported that driver swaps x and y samples when the\ntouchscreen leads are connected in accordance with the datasheet\nspecification. Transposed axis can be typically corrected by touch\nscreen calibration however this bug also negatively influences touch\npressure measurements.\n\nAdd an option to correct x and y axis.\n\nSigned-off-by: Michael Hennerich \u003cmichael.hennerich@analog.com\u003e\nReported-and-tested-by: Sebastian Zenker \u003csebastian.zenker@gmx.de\u003e\nSigned-off-by: Dmitry Torokhov \u003cdmitry.torokhov@gmail.com\u003e\n" }, { "commit": "b26d344c6b87058ae3e8f919a18580abfc4204eb", "tree": "ff7026df8e8715e3c63d0ff4ff697a9fac6323fb", "parents": [ "82aee5d7c01fd1a398e938e496e6cb8841775f91", "76fbc247b9aebc30f6d2c8ec1f69edcb68eaa328" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Jun 28 17:37:00 2012 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Jun 28 17:37:00 2012 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net\n\nConflicts:\n\tdrivers/net/caif/caif_hsi.c\n\tdrivers/net/usb/qmi_wwan.c\n\nThe qmi_wwan merge was trivial.\n\nThe caif_hsi.c, on the other hand, was not. It\u0027s a conflict between\n1c385f1fdf6f9c66d982802cd74349c040980b50 (\"caif-hsi: Replace platform\ndevice with ops structure.\") in the net-next tree and commit\n39abbaef19cd0a30be93794aa4773c779c3eb1f3 (\"caif-hsi: Postpone init of\nHIS until open()\") in the net tree.\n\nI did my best with that one and will ask Sjur to check it out.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "7b8e19b67c1b171a04f6bd2f973d0b38cb496bf6", "tree": "3d900905a1ae08f72b0cceabb91419a9b3b11fb5", "parents": [ "5265f46711ca4e6c389519a00e97036ddb892781" ], "author": { "name": "alex.bluesman.smirnov@gmail.com", "email": "alex.bluesman.smirnov@gmail.com", "time": "Mon Jun 25 23:24:53 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jun 26 21:06:11 2012 -0700" }, "message": "drivers/ieee802154: add support for the at86rf230/231 transceivers\n\nThe AT86RF231 is a feature rich, low-power 2.4 GHz radio transceiver\ndesigned for industrial and consumer ZigBee/IEEE 802.15.4, 6LoWPAN,\nRF4CE and high data rate 2.4 GHz ISM band applications.\n\nThis patch adds support for the Atmel RF230/231 radio transceivers.\n\nSigned-off-by: Alexander Smirnov \u003calex.bluesman.smirnov@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "601722157b3f6be73623644eeae6f14940f0bd8f", "tree": "e927c9e5571795a8f99abf623c4c84805f39b892", "parents": [ "69c5b7530651c8e375d2fbecd157a9a9a20c4cc9" ], "author": { "name": "Qiao Zhou", "email": "zhouqiao@marvell.com", "time": "Mon Jun 04 10:41:03 2012 +0800" }, "committer": { "name": "Mark Brown", "email": "broonie@opensource.wolfsonmicro.com", "time": "Mon Jun 11 12:25:50 2012 +0800" }, "message": "ARM: MMP: add pxa910-ssp into ssp_id_table\n\nadd pxa910-ssp into ssp_id_table, and fix pxa-ssp compiling issue\nunder mach-mmp architect.\n\nSigned-off-by: Qiao Zhou \u003czhouqiao@marvell.com\u003e\nAcked-by: Haojian Zhuang \u003chaojian.zhuang@gmail.com\u003e\nSigned-off-by: Mark Brown \u003cbroonie@opensource.wolfsonmicro.com\u003e\n" }, { "commit": "27953437059c64d14086196eb96f43c78caa9db3", "tree": "0cfd5fb21262a6db3de0c64462847b4c0c43e9df", "parents": [ "2c757fd5d1a92086f225a75a8fac7cab242d11b0", "3c0dec5f58b3c7b3627715126d1bf9b030a076f0" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat May 26 12:42:29 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat May 26 12:42:29 2012 -0700" }, "message": "Merge tag \u0027clock\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc\n\nPull arm-soc clock driver changes from Olof Johansson:\n \"The new clock subsystem was merged in linux-3.4 without any users,\n this now moves the first three platforms over to it: imx, mxs and\n spear.\n\n The series also contains the changes for the clock subsystem itself,\n since Mike preferred to have it together with the platforms that\n require these changes, in order to avoid interdependencies and\n conflicts.\"\n\nFix up trivial conflicts in arch/arm/mach-kirkwood/common.c (code\nremoved in one branch, added OF support in another) and\ndrivers/dma/imx-sdma.c (independent changes next to each other).\n\n* tag \u0027clock\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (97 commits)\n clk: Fix CLK_SET_RATE_GATE flag validation in clk_set_rate().\n clk: Provide dummy clk_unregister()\n SPEAr: Update defconfigs\n SPEAr: Add SMI NOR partition info in dts files\n SPEAr: Switch to common clock framework\n SPEAr: Call clk_prepare() before calling clk_enable\n SPEAr: clk: Add General Purpose Timer Synthesizer clock\n SPEAr: clk: Add Fractional Synthesizer clock\n SPEAr: clk: Add Auxiliary Synthesizer clock\n SPEAr: clk: Add VCO-PLL Synthesizer clock\n SPEAr: Add DT bindings for SPEAr\u0027s timer\n ARM i.MX: remove now unused clock files\n ARM: i.MX6: implement clocks using common clock framework\n ARM i.MX35: implement clocks using common clock framework\n ARM i.MX5: implement clocks using common clock framework\n ARM: Kirkwood: Replace clock gating\n ARM: Orion: Audio: Add clk/clkdev support\n ARM: Orion: PCIE: Add support for clk\n ARM: Orion: XOR: Add support for clk\n ARM: Orion: CESA: Add support for clk\n ...\n" }, { "commit": "be122abe4bcd6d39b37892daae28c8bf5e4030fc", "tree": "e8ad84c41c2acde27c77fa212b8865cd3acfe6fb", "parents": [ "b343c8beec664ef6f0e9964d3001c7c7966331ae", "1e8a52e18cfb381bc9cc1f0b720540364d2a6edd" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 24 13:56:24 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 24 13:56:24 2012 -0700" }, "message": "Merge tag \u0027spi-for-linus\u0027 of git://git.secretlab.ca/git/linux-2.6\n\nPull SPI changes from Grant Likely:\n \"Bug fixes and new features for SPI device drivers. Also move device\n tree support code out of drivers/of and into drivers/spi/spi.c where\n it makes more sense.\"\n\n* tag \u0027spi-for-linus\u0027 of git://git.secretlab.ca/git/linux-2.6:\n spi: By default setup spi_masters with 1 chipselect and dynamics bus number\n SPI: PRIMA2: use the newest APIs of PINCTRL to fix compiling errors\n spi/spi-fsl-spi: reference correct pdata in fsl_spi_cs_control\n spi: refactor spi-coldfire-qspi to use SPI queue framework.\n spi/omap2-mcspi: convert to the pump message infrastructure\n spi/rspi: add dmaengine support\n spi/topcliff: use correct __devexit_p annotation\n spi: Dont call prepare/unprepare transfer if not populated\n spi/ep93xx: clean probe/remove routines\n spi/devicetree: Move devicetree support code into spi directory\n spi: use module_pci_driver\n spi/omap2-mcspi: Trivial optimisation\n spi: omap2-mcspi: add support for pm_runtime autosuspend\n spi/omap: Remove bus_num usage for instance index\n OMAP : SPI : use devm_* functions\n spi: omap2-mcspi: convert to module_platform_driver\n spi: omap2-mcspi: make it behave as a module\n" }, { "commit": "fb2123fad3b499f0898835b19dbb93b18d27ee98", "tree": "7273754cded304f52dbbef86d23dda96e0a8452a", "parents": [ "a481991467d38afb43c3921d5b5b59ccb61b04ba", "991214386dee8a3cd9adc743778f472ac8a12bbc" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 22 15:53:59 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 22 15:53:59 2012 -0700" }, "message": "Merge tag \u0027char-misc-3.5-rc1\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc\n\nPull Char/Misc patches from Greg Kroah-Hartman:\n \"Here are a few various char/misc tree patches for the 3.5-rc1 merge\n window.\n\n Nothing major here at all, just different driver updates and some\n parport dead code removal.\n\n Signed-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\"\n\n* tag \u0027char-misc-3.5-rc1\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc:\n parport: remove unused dead code from lowlevel drivers\n xilinx_hwicap: reset XHI_MAX_RETRIES\n xilinx_hwicap: add support for virtex6 FPGAs\n Support M95040 SPI EEPROM\n misc: add support for bmp18x chips to the bmp085 driver\n misc: bmp085: add device tree properties\n misc: clean up bmp085 driver\n misc: do not mark exported functions __devexit\n misc: add missing __devexit_p() annotations\n pch_phub: delete duplicate definitions\n misc: Fix irq leak in max8997_muic_probe error path\n" }, { "commit": "a3633fe7aa7022e2e9b2b799a0cbf3d6944d8ba5", "tree": "acd8bfc00d867708e90b8e28e84de5617c9c7ac4", "parents": [ "d195f7bebc14ece71bf11d09f1726ee6f6b4f4b9" ], "author": { "name": "Shimoda, Yoshihiro", "email": "yoshihiro.shimoda.uh@renesas.com", "time": "Fri Apr 20 14:50:36 2012 +0900" }, "committer": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Sat May 19 22:37:16 2012 -0600" }, "message": "spi/rspi: add dmaengine support\n\nThis patch adds dmaengine supporting using sh_dma driver. The module\nreceives data by DMAC, it also needs TX DMAC to generate SPI\u0027s clocks.\n\nSigned-off-by: Yoshihiro Shimoda \u003cyoshihiro.shimoda.uh@renesas.com\u003e\nSigned-off-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\n" }, { "commit": "3c0dec5f58b3c7b3627715126d1bf9b030a076f0", "tree": "4bf8f56fca3bf6be109209b116fc8e32cb2e0f9e", "parents": [ "fcd8d84a585f3578a9ebdd27e757495a27415322", "7e0fa1b5fa91d9aa456d102c273b2cf0f2e95d39" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Wed May 16 16:35:25 2012 +0200" }, "committer": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Wed May 16 16:35:25 2012 +0200" }, "message": "Merge branch \u0027clk-next\u0027 of git://git.linaro.org/people/mturquette/linux into next/clock\n\n* \u0027clk-next\u0027 of git://git.linaro.org/people/mturquette/linux:\n clk: Fix CLK_SET_RATE_GATE flag validation in clk_set_rate().\n clk: Provide dummy clk_unregister()\n ARM: Kirkwood: Replace clock gating\n ARM: Orion: Audio: Add clk/clkdev support\n ARM: Orion: PCIE: Add support for clk\n ARM: Orion: XOR: Add support for clk\n ARM: Orion: CESA: Add support for clk\n ARM: Orion: SDIO: Add support for clk.\n ARM: Orion: NAND: Add support for clk, if there is one.\n ARM: Orion: EHCI: Add support for enabling clocks\n ARM: Orion: SATA: Add per channel clk/clkdev support.\n ARM: Orion: UART: Get the clock rate via clk_get_rate().\n ARM: Orion: WDT: Add clk/clkdev support\n ARM: Orion: Eth: Add clk/clkdev support.\n ARM: Orion: SPI: Add clk/clkdev support.\n ARM: Orion: Add clocks using the generic clk infrastructure.\n\nSigned-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\n" }, { "commit": "4574b886698dfad6209102fed6136622b5fe1c21", "tree": "2f1deee540c68261f4531d09337a19a130a7ea45", "parents": [ "2f129bf4aab684bef1e82e747b709a5025ecb698" ], "author": { "name": "Andrew Lunn", "email": "andrew@lunn.ch", "time": "Fri Apr 06 17:17:26 2012 +0200" }, "committer": { "name": "Mike Turquette", "email": "mturquette@linaro.org", "time": "Tue May 08 16:33:55 2012 -0700" }, "message": "ARM: Orion: SPI: Add clk/clkdev support.\n\nRemove now redundant tclk from SPI platform data. This makes the platform\ndata empty, so remove it.\n\nSigned-off-by: Andrew Lunn \u003candrew@lunn.ch\u003e\nTested-by: Jamie Lentin \u003cjm@lentin.co.uk\u003e\nSigned-off-by: Mike Turquette \u003cmturquette@linaro.org\u003e\n" }, { "commit": "dbabe0d659d3cfe42830a779909ab3cd42f7b027", "tree": "bc058a8d9f92df91064e0dc458a145be448a194f", "parents": [ "5eb806a3a68920a9f373f18b03fa14852047e62b" ], "author": { "name": "Randy Dunlap", "email": "rdunlap@xenotime.net", "time": "Tue Apr 17 17:03:50 2012 -0700" }, "committer": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Fri Apr 27 11:03:38 2012 -0600" }, "message": "spi: fix spi.h kernel-doc warning\n\nFix kernel-doc warning in spi.h (copy/paste):\n\nWarning(include/linux/spi/spi.h:365): No description found for parameter \u0027unprepare_transfer_hardware\u0027\n\nSigned-off-by: Randy Dunlap \u003crdunlap@xenotime.net\u003e\nSigned-off-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\n" }, { "commit": "b4161f0bb5f815ca6d8108062b8e3b650c18fe39", "tree": "d2a6fc73e380a351f9f2224c8443522f2d4ef9fc", "parents": [ "985087dbcb0265f46e8651fdc7e974f8a7184423" ], "author": { "name": "Ivo Sieben", "email": "meltedpianoman@gmail.com", "time": "Wed Apr 18 08:29:34 2012 +0200" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Wed Apr 18 14:57:57 2012 -0700" }, "message": "Support M95040 SPI EEPROM\n\nUpdated the generic SPI EEPROM driver AT25 for support of an additional address\nbit in the instruction byte. Certain EEPROMS have a size that is larger than the\nnumber of address bytes would allow (e.g. like M95040 from ST that has 512 Byte\nsize but uses only one address byte (A0 to A7) for addressing.) For the extra\naddress bit (A8, A16 or A24) bit 3 of the instruction byte is used. This\ninstruction bit is normally defined as don\u0027t care for other AT25 like chips.\n\nReviewed-by: Wolfram Sang \u003cw.sang@pengutronix.de\u003e\nSigned-off-by: Ivo Sieben \u003cmeltedpianoman@gmail.com\u003e\nAcked-by: Chris Wright \u003cchrisw@sous-sol.org\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\n" }, { "commit": "09893ee84591b0417a9186a7e7cf1503ccf99ac2", "tree": "da8b044ad157b82203df04ae48cb60f4737cc390", "parents": [ "4bb2d1009f671815870e8f78e826e4f9071392a7", "7d1206bc2859c6e9f46e35ae697c138e7d7858a7" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 28 12:34:33 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 28 12:34:33 2012 -0700" }, "message": "Merge tag \u0027dt2\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc\n\nPull \"ARM: More device tree support updates\" from Olof Johansson:\n \"This branch contains a number of updates for device tree support on\n several ARM platforms, in particular:\n\n * AT91 continues the device tree conversion adding support for a\n number of on-chip drivers and other functionality\n * ux500 adds probing of some of the core SoC blocks through device\n tree\n * Initial device tree support for ST SPEAr600 platforms\n * kirkwood continues the conversion to device-tree probing\"\n\nManually merge arch/arm/mach-ux500/Kconfig due to MACH_U8500 rename, and\ndrivers/usb/gadget/at91_udc.c due to header file include cleanups.\n\nAlso do an \"evil merge\" for the MACH_U8500 config option rename that the\naffected RMI4 touchscreen driver in staging. It\u0027s called MACH_MOP500\nnow, and it was missed during previous merges.\n\n* tag \u0027dt2\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (48 commits)\n ARM: SPEAr600: Add device-tree support to SPEAr600 boards\n ARM: ux500: Provide local timer support for Device Tree\n ARM: ux500: Enable PL022 SSP Controller in Device Tree\n ARM: ux500: Enable PL310 Level 2 Cache Controller in Device Tree\n ARM: ux500: Enable PL011 AMBA UART Controller for Device Tree\n ARM: ux500: Enable Cortex-A9 GIC (Generic Interrupt Controller) in Device Tree\n ARM: ux500: db8500: list most devices in the snowball device tree\n ARM: ux500: split dts file for snowball into generic part\n ARM: ux500: combine the board init functions for DT boot\n ARM: ux500: Initial Device Tree support for Snowball\n ARM: ux500: CONFIG: Enable Device Tree support for future endeavours\n ARM: kirkwood: use devicetree for rtc-mv\n ARM: kirkwood: rtc-mv devicetree bindings\n ARM: kirkwood: fdt: define uart[01] as disabled, enable uart0\n ARM: kirkwood: fdt: facilitate new boards during fdt migration\n ARM: kirkwood: fdt: absorb kirkwood_init()\n ARM: kirkwood: fdt: use mrvl ticker symbol\n ARM: orion: wdt: use resource vice direct access\n ARM: Kirkwood: Remove tclk from kirkwood_asoc_platform_data.\n ARM: orion: spi: remove enable_clock_fix which is not used\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": "250f6715a4112d6686670c5a62ceb9305da94616", "tree": "ee1c9b41ed1fed8174efb312421902f19c877e8c", "parents": [ "11bcb32848ddb5ab28f09f142b625e2ba4d55c4c", "313162d0b83836e2f57e51b9b8650fb4b9c396ea" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Mar 24 10:41:37 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Mar 24 10:41:37 2012 -0700" }, "message": "Merge tag \u0027device-for-3.4\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux\n\nPull \u003clinux/device.h\u003e avoidance patches from Paul Gortmaker:\n \"Nearly every subsystem has some kind of header with a proto like:\n\n\tvoid foo(struct device *dev);\n\n and yet there is no reason for most of these guys to care about the\n sub fields within the device struct. This allows us to significantly\n reduce the scope of headers including headers. For this instance, a\n reduction of about 40% is achieved by replacing the include with the\n simple fact that the device is some kind of a struct.\n\n Unlike the much larger module.h cleanup, this one is simply two\n commits. One to fix the implicit \u003clinux/device.h\u003e users, and then one\n to delete the device.h includes from the linux/include/ dir wherever\n possible.\"\n\n* tag \u0027device-for-3.4\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux:\n device.h: audit and cleanup users in main include dir\n device.h: cleanup users outside of linux/include (C files)\n" }, { "commit": "313162d0b83836e2f57e51b9b8650fb4b9c396ea", "tree": "8f39f20515a924d392cf9a72db0918fda07a34c7", "parents": [ "51990e825431089747f8896244b5c17d3a6423f1" ], "author": { "name": "Paul Gortmaker", "email": "paul.gortmaker@windriver.com", "time": "Mon Jan 30 11:46:54 2012 -0500" }, "committer": { "name": "Paul Gortmaker", "email": "paul.gortmaker@windriver.com", "time": "Fri Mar 16 10:38:24 2012 -0400" }, "message": "device.h: audit and cleanup users in main include dir\n\nThe \u003clinux/device.h\u003e header includes a lot of stuff, and\nit in turn gets a lot of use just for the basic \"struct device\"\nwhich appears so often.\n\nClean up the users as follows:\n\n1) For those headers only needing \"struct device\" as a pointer\nin fcn args, replace the include with exactly that.\n\n2) For headers not really using anything from device.h, simply\ndelete the include altogether.\n\n3) For headers relying on getting device.h implicitly before\nbeing included themselves, now explicitly include device.h\n\n4) For files in which doing #1 or #2 uncovers an implicit\ndependency on some other header, fix by explicitly adding\nthe required header(s).\n\nAny C files that were implicitly relying on device.h to be\npresent have already been dealt with in advance.\n\nTotal removals from #1 and #2: 51. Total additions coming\nfrom #3: 9. Total other implicit dependencies from #4: 7.\n\nAs of 3.3-rc1, there were 110, so a net removal of 42 gives\nabout a 38% reduction in device.h presence in include/*\n\nSigned-off-by: Paul Gortmaker \u003cpaul.gortmaker@windriver.com\u003e\n" }, { "commit": "d34b7d452397d16a895b9a0eddcf6b69f46074d2", "tree": "bc4f702872812aada09313bf5f89bb7cdbfeab74", "parents": [ "2eed4e7d8631d8404fdef9c09d26a48376186ad1" ], "author": { "name": "Andrew Lunn", "email": "andrew@lunn.ch", "time": "Tue Mar 06 07:31:00 2012 +0100" }, "committer": { "name": "Jason Cooper", "email": "jason@lakedaemon.net", "time": "Fri Mar 16 04:28:40 2012 +0000" }, "message": "ARM: orion: spi: remove enable_clock_fix which is not used\n\nSigned-off-by: Andrew Lunn \u003candrew@lunn.ch\u003e\nSigned-off-by: Jason Cooper \u003cjason@lakedaemon.net\u003e\nAcked-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\n" }, { "commit": "49e599b8595f9d33276860c6a02e05f240c4ceca", "tree": "50259b5e076f6551a86e7b8dcfcf96aaf3f19398", "parents": [ "ec139b67ad00647239b804d6f15315b83dba9a58" ], "author": { "name": "Kuninori Morimoto", "email": "kuninori.morimoto.gx@renesas.com", "time": "Wed Mar 14 02:48:05 2012 -0700" }, "committer": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Thu Mar 15 03:41:01 2012 -0600" }, "message": "spi: sh-hspi: control spi clock more correctly\n\nCurrent sh-hspi had used platform-specific speed.\nThis patch remove it, and use spi_transfer specific speed.\nIt removes unnecessary flags from struct sh_hspi_info,\nbut struct sh_hspi_info is still exist, since sh-hspi needs\nplatform info in the future.\n\nSigned-off-by: Kuninori Morimoto \u003ckuninori.morimoto.gx@renesas.com\u003e\nSigned-off-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\n" }, { "commit": "8f53602be555e500cfcd957955bb40fac19f2a6b", "tree": "66ae924690cd01f7cd4a217a5c4f9ddeae085c26", "parents": [ "d1c8bbd793e4c2f346f8788ad312f5b5b530aff5" ], "author": { "name": "Shubhrajyoti D", "email": "shubhrajyoti@ti.com", "time": "Mon Feb 27 19:29:05 2012 +0530" }, "committer": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Fri Mar 09 10:56:10 2012 -0700" }, "message": "spi: Trivial warning fix\n\nThe loop count i traverses for ntrans which is unsigned\nso make the loop count i also unsigned.\n\nFix the below warning\nIn file included from drivers/spi/spi-omap2-mcspi.c:38:\ninclude/linux/spi/spi.h: In function \u0027spi_message_alloc\u0027:\ninclude/linux/spi/spi.h:556: warning: comparison between signed and unsigned integer expressions\n\nCc: Vitaly Wool \u003cvwool@ru.mvista.com\u003e\nSigned-off-by: Shubhrajyoti D \u003cshubhrajyoti@ti.com\u003e\nSigned-off-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\n" }, { "commit": "d1c8bbd793e4c2f346f8788ad312f5b5b530aff5", "tree": "136cf736f0a21f4414fa26ea480848e48e9aadbe", "parents": [ "ffbbdd21329f3e15eeca6df2d4bc11c04d9d91c0" ], "author": { "name": "Kuninori Morimoto", "email": "kuninori.morimoto.gx@renesas.com", "time": "Thu Mar 01 17:10:17 2012 -0800" }, "committer": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Fri Mar 09 09:50:09 2012 -0700" }, "message": "spi: Add SuperH HSPI prototype driver\n\nThis patch adds SuperH HSPI driver.\nIt is still prototype driver, but has enough function at this point.\n\nSigned-off-by: Kuninori Morimoto \u003ckuninori.morimoto.gx@renesas.com\u003e\nSigned-off-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\n" }, { "commit": "ffbbdd21329f3e15eeca6df2d4bc11c04d9d91c0", "tree": "964ce05f044aa6917b4a1ed58ed055ed2e899dcc", "parents": [ "0b2182ddac4b8837bbba996d03b7b28f4346db0a" ], "author": { "name": "Linus Walleij", "email": "linus.walleij@linaro.org", "time": "Wed Feb 22 10:05:38 2012 +0100" }, "committer": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Wed Mar 07 19:19:48 2012 -0700" }, "message": "spi: create a message queueing infrastructure\n\nThis rips the message queue in the PL022 driver out and pushes\nit into (optional) common infrastructure. Drivers that want to\nuse the message pumping thread will need to define the new\nper-messags transfer methods and leave the deprecated transfer()\nmethod as NULL.\n\nMost of the design is described in the documentation changes that\nare included in this patch.\n\nSince there is a queue that need to be stopped when the system\nis suspending/resuming, two new calls are implemented for the\ndevice drivers to call in their suspend()/resume() functions:\nspi_master_suspend() and spi_master_resume().\n\nChangeLog v1-\u003ev2:\n- Remove Kconfig entry and do not make the queue support optional\n at all, instead be more agressive and have it as part of the\n compulsory infrastructure.\n- If the .transfer() method is implemented, delete print a small\n deprecation notice and do not start the transfer pump.\n- Fix a bitrotted comment.\nChangeLog v2-\u003ev3:\n- Fix up a problematic sequence courtesy of Chris Blair.\n- Stop rather than destroy the queue on suspend() courtesy of\n Chris Blair.\n\nSigned-off-by: Chris Blair \u003cchris.blair@stericsson.com\u003e\nSigned-off-by: Linus Walleij \u003clinus.walleij@linaro.org\u003e\nTested-by: Mark Brown \u003cbroonie@opensource.wolfsonmicro.com\u003e\nReviewed-by: Mark Brown \u003cbroonie@opensource.wolfsonmicro.com\u003e\nSigned-off-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\n" }, { "commit": "f35ef7cab2db0a8b577bef59122b59220efdac44", "tree": "0e15507c053b78f7a9fa1bb2d891fb428d1e93f1", "parents": [ "0f78b2443a654afad7c5efdf0157c80747078682" ], "author": { "name": "Heiko Stuebner", "email": "heiko@sntech.de", "time": "Tue Jan 31 20:06:07 2012 +0900" }, "committer": { "name": "Kukjin Kim", "email": "kgene.kim@samsung.com", "time": "Tue Jan 31 20:06:27 2012 +0900" }, "message": "ARM: S3C24XX: move spi-s3c24xx platdata out of mach\n\nspi.h now only contains the definition of the platform data structure\nfor the driver in spi-s3c24xx.c . Therefore it does not need to stay\nin include/mach but can instead live in linux/spi/s3c24xx.h .\n\nSigned-off-by: Heiko Stuebner \u003cheiko@sntech.de\u003e\nCc: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\nSigned-off-by: Kukjin Kim \u003ckgene.kim@samsung.com\u003e\n" }, { "commit": "3acbb0142d48713a8f65cde678a54f419801c189", "tree": "44791fcc15a7456574dc0fdae6404dccbce130f2", "parents": [ "7c92784a546d2945b6d6973a30f7134be78eb7a4" ], "author": { "name": "Lars-Peter Clausen", "email": "lars@metafoo.de", "time": "Wed Nov 16 10:13:37 2011 +0100" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Thu Nov 17 12:15:39 2011 -0800" }, "message": "SPI: Add helper macro for spi_driver boilerplate\n\nThis patch introduces the module_spi_driver macro which is a convenience macro\nfor SPI driver modules similar to module_platform_driver. It is intended to be\nused by drivers which init/exit section does nothing but register/unregister\nthe SPI driver. By using this macro it is possible to eliminate a few lines of\nboilerplate code per SPI driver.\n\nSigned-off-by: Lars-Peter Clausen \u003clars@metafoo.de\u003e\nAcked-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\nAcked-by: Wolfram Sang \u003cw.sang@pengutronix.de\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n" }, { "commit": "0556dc340e5159cdff925a5ab7f3a72f49745661", "tree": "cad2c9b013734b7968ce1a82667e34c294013495", "parents": [ "2967b0ad3302d8627c0d99bfed4b8f167e21fdee" ], "author": { "name": "Mark Brown", "email": "broonie@opensource.wolfsonmicro.com", "time": "Mon Oct 31 17:11:48 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Oct 31 17:30:54 2011 -0700" }, "message": "backlight: fix broken regulator API usage in l4f00242t03\n\nThe regulator support in the l4f00242t03 is very non-idiomatic. Rather\nthan requesting the regulators based on the device name and the supply\nnames used by the device the driver requires boards to pass system\nspecific supply names around through platform data. The driver also\nconditionally requests the regulators based on this platform data, adding\nunneeded conditional code to the driver.\n\nFix this by removing the platform data and converting to the standard\nidiom, also updating all in tree users of the driver. As no datasheet\nappears to be available for the LCD I\u0027m guessing the names for the\nsupplies based on the existing users and I\u0027ve no ability to do anything\nmore than compile test.\n\nThe use of regulator_set_voltage() in the driver is also problematic,\nsince fixed voltages are required the expectation would be that the\nvoltages would be fixed in the constraints set by the machines rather than\nmanually configured by the driver, but is less problematic.\n\nSigned-off-by: Mark Brown \u003cbroonie@opensource.wolfsonmicro.com\u003e\nTested-by: Fabio Estevam \u003cfabio.estevam@freescale.com\u003e\nCc: Richard Purdie \u003crpurdie@rpsys.net\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "1bb6f9b042eb1428ba927d2e851a00df6308877a", "tree": "6f9c2a14b9b852ad99cfbba775370aae89461c71", "parents": [ "eb5064db408eaffa332f93ddcc19c0b653849093" ], "author": { "name": "Peter Korsgaard", "email": "jacmet@sunsite.dk", "time": "Fri Jul 15 10:25:30 2011 +0200" }, "committer": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Fri Jul 15 13:54:17 2011 -0600" }, "message": "mcp23s08: get rid of setup/teardown callbacks\n\nThere\u0027s no in-tree users, and bus notifiers are more generic anyway.\n\nSigned-off-by: Peter Korsgaard \u003cjacmet@sunsite.dk\u003e\nSigned-off-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\n" }, { "commit": "a3cc68c37897f0656489a0d853d6e342fc6f076b", "tree": "0ac029941fa3326b563579b37ab589b3b2a7889a", "parents": [ "1fa7b6a29c61358cc2ca6f64cef4aa0e1a7ca74c" ], "author": { "name": "H Hartley Sweeten", "email": "hartleys@visionengravers.com", "time": "Fri May 27 16:35:59 2011 -0700" }, "committer": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Fri Jun 03 12:14:16 2011 -0600" }, "message": "gpio/74x164: remove unnecessary defines and prototype\n\nRemove the #define GEN_74X164_GPIO_COUNT since it\u0027s only used in\none place and it\u0027s meaning is obvious. Also remove the #define\nGEN_74X164_DRIVER_NAME and use spi-\u003emodalias to set the gpio chip\u0027s\nlabel and the string \"74x164\" for the driver name.\n\nReorder the code slightly to remove the need to prototype\ngen_74x164_set_value.\n\nSigned-off-by: H Hartley Sweeten \u003chsweeten@visionengravers.com\u003e\nSigned-off-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\n" }, { "commit": "20e0ec119b2c6cc412addefbe169f4f5e38701e8", "tree": "fd8b882f4027f1a60857cbcd3bb85a83261db07f", "parents": [ "829ae2732998e628d762b97627e4e5cc6c1b5625", "43c640157d4366a3ea9ba01f903ea892f46376ee" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 26 12:13:22 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 26 12:13:22 2011 -0700" }, "message": "Merge branch \u0027spi/next\u0027 of git://git.secretlab.ca/git/linux-2.6\n\n* \u0027spi/next\u0027 of git://git.secretlab.ca/git/linux-2.6:\n spi/amba-pl022: work in polling or interrupt mode if pl022_dma_probe fails\n spi/spi_s3c24xx: Use spi_bitbang_stop instead of spi_unregister_master in s3c24xx_spi_remove\n spi/spi_nuc900: Use spi_bitbang_stop instead of spi_unregister_master in nuc900_spi_remove\n spi/spi_tegra: use spi_unregister_master() instead of spi_master_put()\n spi/spi_sh: use spi_unregister_master instead of spi_master_put in remove path\n spi: Use void pointers for data in simple SPI I/O operations\n spi/pl022: use cpu_relax in the busy loop\n spi/pl022: mark driver non-experimental\n spi/pl022: timeout on polled transfer v2\n spi/dw_spi: improve the interrupt mode with the batch ops\n spi/dw_spi: change poll mode transfer from byte ops to batch ops\n spi/dw_spi: remove the un-necessary flush()\n spi/dw_spi: unify the low level read/write routines\n" }, { "commit": "0c4a1590189b426814748d2e03b95541852b3af6", "tree": "b4b1d2eee1ea2b5d1700df4519e182cca816607b", "parents": [ "521999bd4a8c47a86136b9d8223a9480f5906db8" ], "author": { "name": "Mark Brown", "email": "broonie@opensource.wolfsonmicro.com", "time": "Wed May 11 00:09:30 2011 +0200" }, "committer": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Fri May 20 00:43:07 2011 -0600" }, "message": "spi: Use void pointers for data in simple SPI I/O operations\n\nCurrently the simple SPI I/O operations all take pointers to u8 * buffers\nto operate on. This creates needless type compatibility issues and the\nunderlying spi_transfer structure uses void pointers anyway so convert the\nAPI over to take void pointers too.\n\nSigned-off-by: Mark Brown \u003cbroonie@opensource.wolfsonmicro.com\u003e\nSigned-off-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\n" }, { "commit": "ebcaaad9d5e8fd284b8dcf25a24999420f0f56d8", "tree": "041e210499460d21c7acb75ced6b819f88bb4749", "parents": [ "e70bdd41bd0ead91b4a43e9d656ac1569d7c8779" ], "author": { "name": "Alexander Stein", "email": "alexander.stein@systec-electronic.com", "time": "Wed May 11 16:24:08 2011 -0700" }, "committer": { "name": "Dmitry Torokhov", "email": "dmitry.torokhov@gmail.com", "time": "Thu May 12 08:28:56 2011 -0700" }, "message": "Input: ads7846 - add possibility to use external vref on ads7846\n\nJust set vref_mv in your platform config to use external vref. Otherwise\nthe internal one is used.\n\nSigned-off-by: Alexander Stein \u003calexander.stein@systec-electronic.com\u003e\nSigned-off-by: Dmitry Torokhov \u003cdtor@mail.ru\u003e\n" }, { "commit": "25985edcedea6396277003854657b5f3cb31a628", "tree": "f026e810210a2ee7290caeb737c23cb6472b7c38", "parents": [ "6aba74f2791287ec407e0f92487a725a25908067" ], "author": { "name": "Lucas De Marchi", "email": "lucas.demarchi@profusion.mobi", "time": "Wed Mar 30 22:57:33 2011 -0300" }, "committer": { "name": "Lucas De Marchi", "email": "lucas.demarchi@profusion.mobi", "time": "Thu Mar 31 11:26:23 2011 -0300" }, "message": "Fix common misspellings\n\nFixes generated by \u0027codespell\u0027 and manually reviewed.\n\nSigned-off-by: Lucas De Marchi \u003clucas.demarchi@profusion.mobi\u003e\n" }, { "commit": "a952baa034ae7c2e4a66932005cbc7ebbccfe28d", "tree": "ff5abe0c77f5b129946300677d9b57b00d926a1e", "parents": [ "5bab188a316718a26346cdb25c4cc6b319f8f907", "97eb3f24352ec6632c2127b35d8087d2a809a9b9" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Mar 19 22:27:06 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Mar 19 22:27:06 2011 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (64 commits)\n Input: tsc2005 - remove \u0027disable\u0027 sysfs attribute\n Input: tsc2005 - add open/close\n Input: tsc2005 - handle read errors from SPI layer\n Input: tsc2005 - do not rearm timer in hardirq handler\n Input: tsc2005 - don\u0027t use work for \u0027pen up\u0027 handling\n Input: tsc2005 - do not use 0 in place of NULL\n Input: tsc2005 - use true/false for boolean variables\n Input: tsc2005 - hide selftest attribute if we can\u0027t reset\n Input: tsc2005 - rework driver initialization code\n Input: tsc2005 - set up bus type in input device\n Input: tsc2005 - set up parent device\n Input: tsc2005 - clear driver data after unbinding\n Input: tsc2005 - add module description\n Input: tsc2005 - remove driver banner message\n Input: tsc2005 - remove incorrect module alias\n Input: tsc2005 - convert to using dev_pm_ops\n Input: tsc2005 - use spi_get/set_drvdata()\n Input: introduce tsc2005 driver\n Input: xen-kbdfront - move to drivers/input/misc\n Input: xen-kbdfront - add grant reference for shared page\n ...\n" }, { "commit": "568a60eda2e90a11bb3d7f8ef3f6800e9b60d4e5", "tree": "625f09d2944b7359ff5dfe845a8482e58581dfb4", "parents": [ "46165a3d00db7526fb43a3dfe5c01a4aa7e236af" ], "author": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Mon Feb 28 12:47:12 2011 -0700" }, "committer": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Fri Mar 18 10:26:52 2011 -0600" }, "message": "spi/dw_spi: move dw_spi.h into drivers/spi\n\ninclude/linux/dw_spi.h only includes driver internal data. It doesn\u0027t\nexpose a platform_data configuration structure or similar (at least\nnothing in-tree). This patch moves the header into drivers/spi so\nthat the scope is limited to only the dw_spi_*.c driver files\n\nSigned-off-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\nCc: Feng Tang \u003cfeng.tang@intel.com\u003e\nCc: spi-devel-general@lists.sourceforge.net\n" }, { "commit": "46165a3d00db7526fb43a3dfe5c01a4aa7e236af", "tree": "33516584a1bf2d109bebdc74a686b3f8936391bd", "parents": [ "84bead6c38b0374e6e7db06b3097f0e700b8f148" ], "author": { "name": "Jiri Slaby", "email": "jslaby@suse.cz", "time": "Fri Mar 18 10:41:17 2011 +0100" }, "committer": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Fri Mar 18 09:50:50 2011 -0600" }, "message": "spi/dw_spi: Fix missing header\n\nCurrently, build on PPC dies with:\nIn file included from drivers/spi/dw_spi_mmio.c:16:\ninclude/linux/spi/dw_spi.h:147: error: field ‘tx_sgl’ has incomplete type\ninclude/linux/spi/dw_spi.h:149: error: field ‘rx_sgl’ has incomplete type\n\nAdd linux/scatterlist.h include to dw_spi.h, because we need to know\nthe contents of the structure.\n\nSigned-off-by: Jiri Slaby \u003cjslaby@suse.cz\u003e\nSigned-off-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\n" }, { "commit": "2dd22997679a88874c131f6e6ffb963e6d43b3a6", "tree": "bfe1707dda7e755b8b550c6796e2649813bcfbb9", "parents": [ "36885ff0e6563687e6152da6d311abbf83c0198f", "7b7adc4a016a1decb806eb71ecab98721fa7f146" ], "author": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Thu Mar 17 13:46:58 2011 -0600" }, "committer": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Thu Mar 17 13:48:06 2011 -0600" }, "message": "Merge remote-tracking branch \u0027origin\u0027 into spi/next\n\nPull in Linus\u0027 tree to pick up changes required for the langwell gpio fixes\n" }, { "commit": "def179c271ac9b5020deca798470521f14d11edd", "tree": "01e78608ec3c458226a8f39572db4f51100223fa", "parents": [ "49851ca04c7f941ef6f5ca04751b0e0fefe9d50d", "5cb81d19bae47adcb073a5e5a3bc40dd252f239e" ], "author": { "name": "Dmitry Torokhov", "email": "dmitry.torokhov@gmail.com", "time": "Wed Mar 16 23:29:56 2011 -0700" }, "committer": { "name": "Dmitry Torokhov", "email": "dmitry.torokhov@gmail.com", "time": "Wed Mar 16 23:29:56 2011 -0700" }, "message": "Merge branch \u0027tsc2005\u0027 into next\n" }, { "commit": "37bd44694c7215e3e46e6ee4a930d197325a7168", "tree": "2e6c6073d6ac4ffcf8e2ddff279911878b25e963", "parents": [ "3c0eee3fe6a3a1c745379547c7e7c904aa64f6d5" ], "author": { "name": "Lauri Leukkunen", "email": "lauri.leukkunen@nokia.com", "time": "Wed Mar 16 22:07:36 2011 -0700" }, "committer": { "name": "Dmitry Torokhov", "email": "dmitry.torokhov@gmail.com", "time": "Wed Mar 16 23:27:39 2011 -0700" }, "message": "Input: introduce tsc2005 driver\n\nDiscussions:\n\nhttp://www.mail-archive.com/linux-omap@vger.kernel.org/msg26748.html\n\nIntroduce a driver for the Texas Instruments TSC2005 touchscreen\ncontroller (http://focus.ti.com/docs/prod/folders/print/tsc2005.html).\n\nThe patch is based on a driver by Lauri Leukkunen, with modifications\nby David Brownell, Phil Carmody, Imre Deak, Hiroshi DOYU, Ari Kauppi,\nTony Lindgren, Jarkko Nikula, Eero Nurkkala and Roman Tereshonkov.\n\nSigned-off-by: Lauri Leukkunen \u003clauri.leukkunen@nokia.com\u003e\n[aaro.koskinen@nokia.com: patch description, rebasing \u0026 cleanup]\nSigned-off-by: Aaro Koskinen \u003caaro.koskinen@nokia.com\u003e\n[ext-srikar.1.bhavanarayana@nokia.com: various fixes]\nSigned-off-by: Srikar \u003cext-srikar.1.bhavanarayana@nokia.com\u003e\nSigned-off-by: Dmitry Torokhov \u003cdtor@mail.ru\u003e\n" }, { "commit": "0b7bb77fd55903ff9dc7c0474c49002aa6b9c78c", "tree": "d6f20011adc132700bc3e98d8686cbe838d7c86d", "parents": [ "9c3c8afccb6a163fd2be739f511e863eab668702" ], "author": { "name": "Peter Korsgaard", "email": "jacmet@sunsite.dk", "time": "Wed Mar 09 17:56:30 2011 +0100" }, "committer": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Sat Mar 12 01:26:34 2011 -0700" }, "message": "gpio/mcp23s08: support mcp23s17 variant\n\nmpc23s17 is very similar to the mcp23s08, except that registers are 16bit\nwide, so extend the interface to work with both variants.\n\nThe s17 variant also has an additional address pin, so adjust platform\ndata structure to support up to 8 devices per SPI chipselect.\n\nSigned-off-by: Peter Korsgaard \u003cjacmet@sunsite.dk\u003e\nSigned-off-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\n" }, { "commit": "ce792580ea2ce6f7259b45124e9ccc4574c31606", "tree": "f2ec419aade609b4e425ed4995c01ba818e363af", "parents": [ "9bde36afcaf0ec2ad9f03974da41875c759a4fe8" ], "author": { "name": "Thomas Chou", "email": "thomas@wytron.com.tw", "time": "Mon Feb 14 10:20:39 2011 +0800" }, "committer": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Tue Feb 22 14:59:53 2011 -0700" }, "message": "spi: add OpenCores tiny SPI driver\n\nThis patch adds support of OpenCores tiny SPI driver.\n\nhttp://opencores.org/project,tiny_spi\n\nSigned-off-by: Thomas Chou \u003cthomas@wytron.com.tw\u003e\nSigned-off-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\n" }, { "commit": "2f1522eccb09188f0008168f75420bc2fedc9cae", "tree": "8b9fd188706ec80a763545960cf929ab0149a511", "parents": [ "a5f4dbf0ae972510faca799a809d3771fab323b7" ], "author": { "name": "Russ Gorby", "email": "russ.gorby@intel.com", "time": "Wed Feb 02 12:56:58 2011 -0800" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Thu Feb 03 11:43:10 2011 -0800" }, "message": "serial: ifx6x60: expanded info available from platform data\n\nSome platform attributes (e.g. max_hz, use_dma) were being intuited\nfrom the modem type. These things should be specified by the platform\ndata.\n\nAdded max_hz, use_dma to ifx_modem_platform_data definition,\nreplaced is_6160 w/ modem_type, and changed clients accordingly\n\nSigned-off-by: Russ Gorby \u003cruss.gorby@intel.com\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n" }, { "commit": "021db8e2bde53024a163fb4417a185de46fe77aa", "tree": "098a28bd2414ea2622493a1736a677dab5085dfc", "parents": [ "72eb6a791459c87a0340318840bb3bd9252b627b", "07fe0351702b6f0c9749e80cdbcb758686b0fe9b" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 07 17:08:46 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 07 17:08:46 2011 -0800" }, "message": "Merge branch \u0027next-spi\u0027 of git://git.secretlab.ca/git/linux-2.6\n\n* \u0027next-spi\u0027 of git://git.secretlab.ca/git/linux-2.6: (77 commits)\n spi/omap: Fix DMA API usage in OMAP MCSPI driver\n spi/imx: correct the test on platform_get_irq() return value\n spi/topcliff: Typo fix threhold to threshold\n spi/dw_spi Typo change diable to disable.\n spi/fsl_espi: change the read behaviour of the SPIRF\n spi/mpc52xx-psc-spi: move probe/remove to proper sections\n spi/dw_spi: add DMA support\n spi/dw_spi: change to EXPORT_SYMBOL_GPL for exported APIs\n spi/dw_spi: Fix too short timeout in spi polling loop\n spi/pl022: convert running variable\n spi/pl022: convert busy flag to a bool\n spi/pl022: pass the returned sglen to the DMA engine\n spi/pl022: map the buffers on the DMA engine\n spi/topcliff_pch: Fix data transfer issue\n spi/imx: remove autodetection\n spi/pxa2xx: pass of_node to spi device and set a parent device\n spi/pxa2xx: Modify RX-Tresh instead of busy-loop for the remaining RX bytes.\n spi/pxa2xx: Add chipselect support for Sodaville\n spi/pxa2xx: Consider CE4100\u0027s FIFO depth\n spi/pxa2xx: Add CE4100 support\n ...\n" }, { "commit": "94a544a4e8d05a027613443c529c399c39cc3371", "tree": "edada38e93a958a918b5826eaef173b1b92079d1", "parents": [ "496a2e360a34e1f41c336d23947f800216cb9bdf", "21486af0f34d03b813b023d7a2b887b329f60486" ], "author": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Wed Dec 29 01:05:14 2010 -0700" }, "committer": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Wed Dec 29 01:05:50 2010 -0700" }, "message": "Merge branch \u0027spi\u0027 of git://git.linutronix.de/users/bigeasy/soda into spi/next\n\n* \u0027spi\u0027 of git://git.linutronix.de/users/bigeasy/soda into spi/next\n spi/pxa2xx: register driver properly\n spi/pxa2xx: add support for shared IRQ handler\n spi/pxa2xx: Use define for SSSR_TFL_MASK instead of plain numbers\n arm/pxa2xx: reorgazine SSP and SPI header files\n spi/pxa2xx: Add CE4100 support\n spi/pxa2xx: Consider CE4100\u0027s FIFO depth\n spi/pxa2xx: Add chipselect support for Sodaville\n spi/pxa2xx: Modify RX-Tresh instead of busy-loop for the remaining RX bytes.\n spi/pxa2xx: pass of_node to spi device and set a parent device\n" }, { "commit": "7063c0d942a1af2993531fbe52b4c74c1db818c4", "tree": "fe91b01bd61449849736c47e0a05840fc47a5eb3", "parents": [ "79290a2aa2fd1c179a285218472092475630dc0e" ], "author": { "name": "Feng Tang", "email": "feng.tang@intel.com", "time": "Fri Dec 24 13:59:11 2010 +0800" }, "committer": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Fri Dec 24 01:23:25 2010 -0700" }, "message": "spi/dw_spi: add DMA support\n\ndw_spi driver in upstream only supports PIO mode, and this patch\nwill support it to cowork with the Designware dma controller used\non Intel Moorestown platform, at the same time it provides a general\nframework to support dw_spi core to cowork with dma controllers on\nother platforms\n\nIt has been tested with a Option GTM501L 3G modem and Infenion 60x60\nmodem. To use DMA mode, DMA controller 2 of Moorestown has to be enabled\n\nAlso change the dma interface suggested by Linus Walleij.\n\nAcked-by: Linus Walleij \u003clinus.walleij@stericsson.com\u003e\nSigned-off-by: Feng Tang \u003cfeng.tang@intel.com\u003e\n[Typo fix and renames to match intel_mid_dma renaming]\nSigned-off-by: Vinod Koul \u003cvinod.koul@intel.com\u003e\nSigned-off-by: Alan Cox \u003calan@linux.intel.com\u003e\nSigned-off-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\n" }, { "commit": "d6ea3df0d470fb9260db93883f97764cf9f0e562", "tree": "277838ea93d6dc0c7d2a05be757dfa1b8bedb619", "parents": [ "8348c259dd6a6019a8fa01b0a3443409480f7b9d" ], "author": { "name": "Sebastian Andrzej Siewior", "email": "bigeasy@linutronix.de", "time": "Wed Nov 24 10:17:14 2010 +0100" }, "committer": { "name": "Sebastian Andrzej Siewior", "email": "bigeasy@linutronix.de", "time": "Wed Dec 01 13:48:30 2010 +0100" }, "message": "spi/pxa2xx: Add CE4100 support\n\nSodaville\u0027s SPI controller is very much the same as in PXA25x. The\ndifference:\n- The RX/TX FIFO is only 4 words deep instead of 16\n- No DMA support\n- The SPI controller offers a CS functionality\n\nSigned-off-by: Sebastian Andrzej Siewior \u003cbigeasy@linutronix.de\u003e\nSigned-off-by: Dirk Brandewie \u003cdirk.brandewie@gmail.com\u003e\n" }, { "commit": "8348c259dd6a6019a8fa01b0a3443409480f7b9d", "tree": "4b886c8a8acbad09f27640a78c2083c5bec16c99", "parents": [ "4a25605fb71f02b4f80091df91f777225a0309c5" ], "author": { "name": "Sebastian Andrzej Siewior", "email": "bigeasy@linutronix.de", "time": "Mon Nov 22 17:12:15 2010 -0800" }, "committer": { "name": "Sebastian Andrzej Siewior", "email": "bigeasy@linutronix.de", "time": "Wed Dec 01 12:18:33 2010 +0100" }, "message": "arm/pxa2xx: reorgazine SSP and SPI header files\n\nThe PXA-SPI driver relies on some files / defines which are arm specific\nand are within the ARM tree. The CE4100 SoC which is x86 has also the\nSPI core.\nThis patch moves the ssp and spi files from arm/mach-pxa and plat-pxa to\ninclude/linux where the CE4100 can access them.\n\nThis move got verified by building the following defconfigs:\n cm_x2xx_defconfig corgi_defconfig em_x270_defconfig ezx_defconfig\n imote2_defconfig pxa3xx_defconfig spitz_defconfig zeus_defconfig\n raumfeld_defconfig magician_defconfig\n\nSigned-off-by: Sebastian Andrzej Siewior \u003cbigeasy@linutronix.de\u003e\nSigned-off-by: Dirk Brandewie \u003cdirk.brandewie@gmail.com\u003e\n" }, { "commit": "af3b8881f4c9852eefe9c7f1a997b3ecf580561b", "tree": "13cf6f7d955dfc395e3bc41940cf4d89b18f4e96", "parents": [ "a7bcf21e60c73cb7f7c13fad928967d7e47c3cac" ], "author": { "name": "Russ Gorby", "email": "richardx.r.gorby@intel.com", "time": "Tue Oct 26 14:13:52 2010 +0100" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Thu Nov 11 11:35:57 2010 -0800" }, "message": "ifx6x60: SPI protocol driver for Infineon 6x60 modem\n\nPrototype driver for the IFX6x60 series of SPI attached modems by Jim\nStanley and Russ Gorby\n\nSigned-off-by: Russ Gorby \u003crichardx.r.gorby@intel.com\u003e\n\n[Some reworking and a major cleanup]\n\nSigned-off-by: Alan Cox \u003calan@linux.intel.com\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n" }, { "commit": "90ae83f7fc32733e5829d806306c0c590f1a383f", "tree": "5b4cd7290c70d9899ca7caa99998395218b15cab", "parents": [ "47c5ba53bc5e5f88b5d1bbb97acd25afc27f74eb", "65289d6345d93abd860e43fd2119ac176d6cc697" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Nov 01 07:50:43 2010 -0400" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Nov 01 07:50:43 2010 -0400" }, "message": "Merge branch \u0027next-spi\u0027 of git://git.secretlab.ca/git/linux-2.6\n\n* \u0027next-spi\u0027 of git://git.secretlab.ca/git/linux-2.6:\n spi/pl022: fix erroneous platform data in U300\n spi: fixed odd static string conventions in core code\n spi/bfin_spi: only request GPIO on first load\n spi/bfin_spi: handle error/status changes after data interrupts\n spi: enable spi_board_info to be registered after spi_master\n" }, { "commit": "ead6db084392349ad33323b1bb2916058dd7e82b", "tree": "8288fb20f86550ba8bb5d9984a7d09ead9b333d7", "parents": [ "76d800a5b6e198c4fda07b88bb42a545709f193b" ], "author": { "name": "Miguel Gaio", "email": "miguel.gaio@efixo.com", "time": "Wed Oct 27 15:33:18 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Oct 27 18:03:07 2010 -0700" }, "message": "gpio: add support for 74x164 serial-in/parallel-out 8-bit shift register\n\nAdd support for generic 74x164 serial-in/parallel-out 8-bits shift\nregister. This driver can be used as a GPIO output expander.\n\n[akpm@linux-foundation.org: remove unused local `refresh\u0027]\nSigned-off-by: Miguel Gaio \u003cmiguel.gaio@efixo.com\u003e\nSigned-off-by: Juhos Gabor \u003cjuhosg@openwrt.org\u003e\nSigned-off-by: Florian Fainelli \u003cflorian@openwrt.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "2b9603a0d7e395fb844af90fba71448bc8019077", "tree": "b828ff7c6819766e92dd304eb5e63e12527e516a", "parents": [ "d4429f608abde89e8bc1e24b43cd503feb95c496" ], "author": { "name": "Feng Tang", "email": "feng.tang@intel.com", "time": "Mon Aug 02 15:52:15 2010 +0800" }, "committer": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Thu Oct 21 23:52:16 2010 -0600" }, "message": "spi: enable spi_board_info to be registered after spi_master\n\nCurrently spi_register_board_info() has to be called before its related\nspi_master be registered, otherwise these board info will be just ignored.\n\nThis patch will remove this order limit, it adds a global spi master list\nlike the existing global board info listr. Whenever a board info or a\nspi_master is registered, the spi master list or board info list\nwill be scanned, and a new spi device will be created if there is a\nmaster-board info match.\n\nSigned-off-by: Feng Tang \u003cfeng.tang@intel.com\u003e\nSigned-off-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\n" }, { "commit": "69259abb64d4da77273bf59accfc9fa79e7165f4", "tree": "bd043ab03a788b749c8d5ae4049d8defae9abf34", "parents": [ "dd53df265b1ee7a1fbbc76bb62c3bec2383bbd44", "12e94471b2be5ef9b55b10004a3a2cd819490036" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Oct 06 19:39:31 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Oct 06 19:39:31 2010 -0700" }, "message": "Merge branch \u0027master\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6\n\nConflicts:\n\tdrivers/net/pcmcia/pcnet_cs.c\n\tnet/caif/caif_socket.c\n" }, { "commit": "b618f6f885579a6237e5bf4582fa6167972ddef4", "tree": "b11508178570b98ce9cb2d76ecebd046a6f0e77c", "parents": [ "462fb2af9788a82a534f8184abfde31574e1cfa0", "6e5c2b4e8addfaab8ef54dedaf7b607e1585c35b" ], "author": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Tue Sep 21 15:49:14 2010 -0400" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Tue Sep 21 15:49:14 2010 -0400" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem\n\nConflicts:\n\tarch/arm/mach-omap2/board-omap3pandora.c\n\tdrivers/net/wireless/ath/ath5k/base.c\n" }, { "commit": "c1f9a095600e07fefe64eb94eb711f410100824a", "tree": "7117a504f324b2b835fea50a5379cd94429978f5", "parents": [ "09f250ac8faefa9deb14854e4715a139ed99617b" ], "author": { "name": "Ohad Ben-Cohen", "email": "ohad@wizery.com", "time": "Thu Sep 16 13:16:02 2010 +0200" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Tue Sep 21 11:04:38 2010 -0400" }, "message": "wl12xx: make wl12xx.h common to both spi and sdio\n\nMove wl12xx.h outside of the spi-specific location,\nso it can be shared with both spi and sdio solutions.\n\nUpdate all users of spi/wl12xx.h accordingly\n\nSigned-off-by: Ohad Ben-Cohen \u003cohad@wizery.com\u003e\nAcked-by: Luciano Coelho \u003cluciano.coelho@nokia.com\u003e\nAcked-by: Tony Lindgren \u003ctony@atomide.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "e548833df83c3554229eff0672900bfe958b45fd", "tree": "85efc4a76dc356593d6d394776aeb845dc580fb6", "parents": [ "cbd9da7be869f676afc204e1a664163778c770bd", "053d8f6622701f849fda2ca2c9ae596c13599ba9" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Sep 09 22:27:33 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Sep 09 22:27:33 2010 -0700" }, "message": "Merge branch \u0027master\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6\n\nConflicts:\n\tnet/mac80211/main.c\n" }, { "commit": "e3e55ff5854655d8723ad8b307f02515aecc3df5", "tree": "7c30c2c00b7c8f8ce9a95d371b3ccd1408188d7f", "parents": [ "cbcc062abb16d39839b3d8d4e3d20360fc21eb58" ], "author": { "name": "Feng Tang", "email": "feng.tang@intel.com", "time": "Tue Sep 07 15:52:06 2010 +0800" }, "committer": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Wed Sep 08 10:50:00 2010 -0600" }, "message": "spi/dw_spi: clean the cs_control code\n\ncommit 052dc7c45i \"spi/dw_spi: conditional transfer mode change\"\nintroduced cs_control code, which has a bug by using bit offset\nfor spi mode to set transfer mode in control register. Also it\nforces devices who don\u0027t need cs_control to re-configure the\ncontrol registers for each spi transfer. This patch will fix them\n\nSigned-off-by: Feng Tang \u003cfeng.tang@intel.com\u003e\nSigned-off-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\n" }, { "commit": "78ab952717b62c0ba6ca7f7a27eaa0486685e45f", "tree": "a4ab2bfc578f279fc6847031f501d84c75057531", "parents": [ "3e502e63586920f219ed2590f69c1f5a8888cfa4", "85f72bc839705294b32b6c16b491c0422f0a71b3" ], "author": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Thu Sep 02 13:30:07 2010 -0400" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Thu Sep 02 13:30:07 2010 -0400" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem\n" }, { "commit": "4c5f7d7a1e6cf20ad515dad8a63c0813fac5bcea", "tree": "f49374562261f98bb92d0b4773d300eb2cc11d82", "parents": [ "31c726f0963cd022680dacd0c9f0036d7e12a8b2" ], "author": { "name": "Kalle Valo", "email": "kvalo@adurom.com", "time": "Sun Aug 22 22:46:28 2010 +0300" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Wed Aug 25 14:33:19 2010 -0400" }, "message": "wl12xx: change contact person for the include file\n\nLuciano should be the contact person for the include/linux/spi/wl12xx.h file.\n\nSigned-off-by: Kalle Valo \u003ckvalo@adurom.com\u003e\nAcked-by: Luciano Coelho \u003cluciano.coelho@nokia.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "5c79a5ae23e72fa12f1c7c528f62bf3ea35da0dc", "tree": "7b93dcd7903d9cc77992ac0c61f657d0acb67080", "parents": [ "7a50d06e242614f02004faed2972a8f2c9336d61" ], "author": { "name": "Ernst Schwab", "email": "eschwab@online.de", "time": "Mon Aug 16 15:10:11 2010 +0200" }, "committer": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Tue Aug 17 22:55:38 2010 -0600" }, "message": "spi.h: missing kernel-doc notation, please fix\n\nAdded comments in kernel-doc notation for previously added struct fields.\n\nSigned-off-by: Ernst Schwab \u003ceschwab@online.de\u003e\nAcked-by: Randy Dunlap \u003crdunlap@xenotime.net\u003e\nSigned-off-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\n" }, { "commit": "b171aa27700c78511086a759383b033949c9d7f0", "tree": "2775b0682ea342dd49c5b997de248da73ec83049", "parents": [ "11ac552477e32835cb6970bf0a70c210807f5673", "b4225885deb569f7afcf1f3a9f069f74cc9db591" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Aug 14 11:54:09 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Aug 14 11:54:09 2010 -0700" }, "message": "Merge branch \u0027next-spi\u0027 of git://git.secretlab.ca/git/linux-2.6\n\n* \u0027next-spi\u0027 of git://git.secretlab.ca/git/linux-2.6:\n spi/amba_pl022: Fix probe and remove hook section annotations.\n spi/mpc5121: change annotations for probe and remove functions\n spi/bitbang: reinitialize transfer parameters for every message\n spi/spi-gpio: add support for controllers without MISO or MOSI pin\n spi/bitbang: add support for SPI_MASTER_NO_{TX, RX} modes\n SPI100k: Fix 8-bit and RX-only transfers\n spi/mmc_spi: mmc_spi adaptations for SPI bus locking API\n spi/mmc_spi: SPI bus locking API, using mutex\n\nFix trivial conflict in drivers/spi/mpc512x_psc_spi.c due to \u0027struct\nof_device\u0027 \u003d\u003e \u0027struct platform_device\u0027 rename and __init/__exit to\n__devinit/__devexit fix.\n" }, { "commit": "4a22b8a4ad5561436b16f5278d2f9e406ffb8705", "tree": "8569c6dd4cc215876156fa5b2721ad1a487b9c88", "parents": [ "22e3d63147c9608dc48ac6a6d9973eba8672efbe" ], "author": { "name": "Marc Kleine-Budde", "email": "mkl@pengutronix.de", "time": "Tue Aug 10 18:02:23 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Aug 11 08:59:08 2010 -0700" }, "message": "gpio: max730x: make pullups configurable via platformdata\n\nThe gpios on the max730x chips have support for internal pullups while in\ninput mode.\n\nThis patch adds support for configuring these pullups via platform data.\nA new member (\"input_pullup_active\") to the platform data struct is\nintroduced. A set bit in this variable activates the pullups while the\nrespective port is in input mode. This is a compatible enhancement since\nunset bits lead to disables pullups which was the default in the original\ndriver.\n\n_Note_: the 4 lowest bits in \"input_pullup_active\" are unused because the\nfirst 4 ports of the controller are not used, too.\n\nSigned-off-by: Marc Kleine-Budde \u003cmkl@pengutronix.de\u003e\nReviewed-by: Wolfram Sang \u003cw.sang@pengutronix.de\u003e\nCc: David Brownell \u003cdavid-b@pacbell.net\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "3c8e1a84fd6b984a7bce8816db2e3defc57bbfe4", "tree": "52761ad5f2229d0b176ca36b7107a0ec43e1168f", "parents": [ "04bb2a031cf95b34b7432dd47b318a932a895b4c" ], "author": { "name": "Marek Szyprowski", "email": "m.szyprowski@samsung.com", "time": "Wed Jun 30 14:27:37 2010 -0600" }, "committer": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Sat Jul 03 22:45:44 2010 -0600" }, "message": "spi/spi-gpio: add support for controllers without MISO or MOSI pin\n\nThere are some boards that do not strictly follow SPI standard and use\nonly 3 wires (SCLK, MOSI or MISO, SS) for connecting some simple auxiliary\nchips and controls them with GPIO based \u0027spi controller\u0027. In this\nconfiguration the MISO or MOSI line is missing (it is not required if the\nchip does not transfer any data back to host or host only reads data from\nchip).\n\nThis patch adds support for such non-standard configuration in GPIO-based\nSPI controller. It has been tested in configuration without MISO pin.\n\nReviewed-by: Kyungmin Park \u003ckyungmin.park@samsung.com\u003e\nSigned-off-by: Marek Szyprowski \u003cm.szyprowski@samsung.com\u003e\nAcked-by: David Brownell \u003cdbrownell@users.sourceforge.net\u003e\nSigned-off-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\n" }, { "commit": "0f622bf465e78c390e13c5f4a14d0b3f8fb7c7e5", "tree": "f261ab1f1707cdcd3b84e5661a3e0c332c8fcc21", "parents": [ "af6e1d99ea525161f70f68ecb83d0d0f54f1bf62" ], "author": { "name": "Dmitry Torokhov", "email": "dmitry.torokhov@gmail.com", "time": "Thu Jul 01 09:01:50 2010 -0700" }, "committer": { "name": "Dmitry Torokhov", "email": "dmitry.torokhov@gmail.com", "time": "Sat Jul 03 13:13:22 2010 -0700" }, "message": "Input: ads7846 - do not allow altering platform data\n\nTested-by: Anatolij Gustschin \u003cagust@denx.de\u003e\nSigned-off-by: Dmitry Torokhov \u003cdtor@mail.ru\u003e\n" }, { "commit": "cf32b71e981ca63e8f349d8585ca2a3583b556e0", "tree": "e704942f6843114446c73478a79e615a57d2eb49", "parents": [ "7e27d6e778cd87b6f2415515d7127eba53fe5d02" ], "author": { "name": "Ernst Schwab", "email": "eschwab@online.de", "time": "Mon Jun 28 17:49:29 2010 -0700" }, "committer": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Mon Jun 28 17:49:29 2010 -0700" }, "message": "spi/mmc_spi: SPI bus locking API, using mutex\n\nSPI bus locking API to allow exclusive access to the SPI bus, especially, but\nnot limited to, for the mmc_spi driver.\n\nCoded according to an outline from Grant Likely; here is his\nspecification (accidentally swapped function names corrected):\n\nIt requires 3 things to be added to struct spi_master.\n- 1 Mutex\n- 1 spin lock\n- 1 flag.\n\nThe mutex protects spi_sync, and provides sleeping \"for free\"\nThe spinlock protects the atomic spi_async call.\nThe flag is set when the lock is obtained, and checked while holding\nthe spinlock in spi_async(). If the flag is checked, then spi_async()\nmust fail immediately.\n\nThe current runtime API looks like this:\nspi_async(struct spi_device*, struct spi_message*);\nspi_sync(struct spi_device*, struct spi_message*);\n\nThe API needs to be extended to this:\nspi_async(struct spi_device*, struct spi_message*)\nspi_sync(struct spi_device*, struct spi_message*)\nspi_bus_lock(struct spi_master*) /* although struct spi_device* might\nbe easier */\nspi_bus_unlock(struct spi_master*)\nspi_async_locked(struct spi_device*, struct spi_message*)\nspi_sync_locked(struct spi_device*, struct spi_message*)\n\nDrivers can only call the last two if they already hold the spi_master_lock().\n\nspi_bus_lock() obtains the mutex, obtains the spin lock, sets the\nflag, and releases the spin lock before returning. It doesn\u0027t even\nneed to sleep while waiting for \"in-flight\" spi_transactions to\ncomplete because its purpose is to guarantee no additional\ntransactions are added. It does not guarantee that the bus is idle.\n\nspi_bus_unlock() clears the flag and releases the mutex, which will\nwake up any waiters.\n\nThe difference between spi_async() and spi_async_locked() is that the\nlocked version bypasses the check of the lock flag. Both versions\nneed to obtain the spinlock.\n\nThe difference between spi_sync() and spi_sync_locked() is that\nspi_sync() must hold the mutex while enqueuing a new transfer.\nspi_sync_locked() doesn\u0027t because the mutex is already held. Note\nhowever that spi_sync must *not* continue to hold the mutex while\nwaiting for the transfer to complete, otherwise only one transfer\ncould be queued up at a time!\n\nAlmost no code needs to be written. The current spi_async() and\nspi_sync() can probably be renamed to __spi_async() and __spi_sync()\nso that spi_async(), spi_sync(), spi_async_locked() and\nspi_sync_locked() can just become wrappers around the common code.\n\nspi_sync() is protected by a mutex because it can sleep\nspi_async() needs to be protected with a flag and a spinlock because\nit can be called atomically and must not sleep\n\nSigned-off-by: Ernst Schwab \u003ceschwab@online.de\u003e\n[grant.likely@secretlab.ca: use spin_lock_irqsave()]\nSigned-off-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\nTested-by: Matt Fleming \u003cmatt@console-pimps.org\u003e\nTested-by: Antonio Ospite \u003cospite@studenti.unina.it\u003e\n" }, { "commit": "7804302b14032d357d889e4a23e463eb6a6c5136", "tree": "c71800f52507e70691786347c96168724dcf6ea4", "parents": [ "c8f2edc56acf0a55ede777c07314c9744bb723be" ], "author": { "name": "Anatolij Gustschin", "email": "agust@denx.de", "time": "Mon Jun 28 01:25:19 2010 -0700" }, "committer": { "name": "Dmitry Torokhov", "email": "dmitry.torokhov@gmail.com", "time": "Mon Jun 28 01:34:25 2010 -0700" }, "message": "Input: ads7846 - allow specifying irq trigger type in platform data\n\nOn some platforms, for example with GPIO interrupts on mpc5121,\nit is not possible to configure falling edge interrupts.\n\nSpecifying irq trigger type in platform data structure\nallows using ads7846 driver on such platforms.\n\nSigned-off-by: Anatolij Gustschin \u003cagust@denx.de\u003e\nSigned-off-by: Dmitry Torokhov \u003cdtor@mail.ru\u003e\n" } ], "next": "b1e50ebcf24668e57f058deb48b0704b5391ed0f" }