Linux kernel stable tree (mirror) https://git.radix-linux.su/kernel/linux.git/atom?h=v3.18.62 2015-01-16T14:59:53+00:00 2015-01-16T14:59:53+00:00 Alison Chaiken alison_chaiken@mentor.com 2014-11-10T15:54:54+00:00 urn:sha1:d019b4693b4f9c01891d87159c14cdbb04ea1c23 commit 834b686552d9018e2d17bd56ac5361b78bcc75b8 upstream. As stated in a5b7616c5, "mtd: m25p80,spi-nor: Fix module aliases for m25p80", m25p_ids[] in m25p80.c needs to be kept in sync with spi_nor_ids[] in spi-nor.c. The change here corrects a misalignment. (We were missing m25px80 and we had a duplicate w25q128.) Signed-off-by: Alison Chaiken <alison_chaiken@mentor.com> Signed-off-by: Brian Norris <computersforpeace@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> 2014-10-21T20:46:03+00:00 Ben Hutchings ben@decadent.org.uk 2014-09-30T02:14:55+00:00 urn:sha1:a5b7616c55e188fe3d6ef686bef402d4703ecb62 m25p80's device ID table is now spi_nor_ids, defined in spi-nor. The MODULE_DEVICE_TABLE() macro doesn't work with extern definitions, but its use was also removed at the same time. Now if m25p80 is built as a module it doesn't get the necessary aliases to be loaded automatically. A clean solution to this will involve defining the list of device IDs in spi-nor.h and removing struct spi_device_id from the spi-nor API, but this is quite a large change. As a quick fix suitable for stable, copy the device IDs back into m25p80. Fixes: 03e296f613af ("mtd: m25p80: use the SPI nor framework") Cc: <stable@vger.kernel.org> # 3.16.x: 32f1b7c8352f: mtd: move support for struct flash_platform_data into m25p80 Cc: <stable@vger.kernel.org> # 3.16.x: 90e55b3812a1: mtd: m25p80: get rid of spi_get_device_id Cc: <stable@vger.kernel.org> # 3.16.x: 70f3ce0510af: mtd: spi-nor: make spi_nor_scan() take a chip type name, not spi_device_id Cc: <stable@vger.kernel.org> # 3.16.x Signed-off-by: Ben Hutchings <ben@decadent.org.uk> Signed-off-by: Brian Norris <computersforpeace@gmail.com> 2014-10-17T16:29:21+00:00 Ben Hutchings ben@decadent.org.uk 2014-09-29T09:47:54+00:00 urn:sha1:70f3ce0510afdad7cbaf27ab7ab961377205c782 Drivers currently call spi_nor_match_id() and then spi_nor_scan(). This adds a dependency on struct spi_device_id which we want to avoid. Make spi_nor_scan() do it for them. Signed-off-by: Ben Hutchings <ben@decadent.org.uk> Signed-off-by: Rafał Miłecki <zajec5@gmail.com> Signed-off-by: Brian Norris <computersforpeace@gmail.com> 2014-10-17T16:29:21+00:00 Rafał Miłecki zajec5@gmail.com 2014-09-29T09:47:53+00:00 urn:sha1:90e55b3812a1245bb674afcc4410ddba7db402f6 This simplifies the way we use spi_nor framework and will allow us to drop spi_nor_match_id. Signed-off-by: Rafał Miłecki <zajec5@gmail.com> Signed-off-by: Brian Norris <computersforpeace@gmail.com> 2014-09-28T22:27:03+00:00 Rafał Miłecki zajec5@gmail.com 2014-09-28T20:36:54+00:00 urn:sha1:32f1b7c8352fd33d41bcec3cfb054ccdcfd40a42 This "type" seems to be an extra hint for m25p80 about the flash. Some archs register flash_platform_data with "name" set to "m25p80" and then with a real flash name set in "type". It seems to be a trick specific to the m25p80 so let's move it out of spi-nor. Btw switch to the spi_nor_match_id instead of iterating spi_nor_ids. Signed-off-by: Rafał Miłecki <zajec5@gmail.com> Signed-off-by: Brian Norris <computersforpeace@gmail.com> 2014-09-22T18:39:26+00:00 Ezequiel García ezequiel@vanguardiasur.com.ar 2014-09-20T16:53:14+00:00 urn:sha1:6d178ef2fd5e4a7f601874a6e641090e706da3c8 The ELM driver is only used by the OMAP NAND driver, so let's move it to the nand/ directory. Additionally, let's rename it to a less confusing name, so the module is built with a meaningful name, instead of the previous 'elm.ko'. Acked-by: Roger Quadros <rogerq@ti.com> Signed-off-by: Ezequiel Garcia <ezequiel@vanguardiasur.com.ar> Signed-off-by: Brian Norris <computersforpeace@gmail.com> 2014-08-19T18:53:07+00:00 Samarth Parikh samarthp@ymail.com 2014-07-16T10:44:37+00:00 urn:sha1:6f3c0f163103fb225c77b73ca17fc4ecea308103 Fixed checkpatch warnings: "WARNING: Prefer seq_puts to seq_printf" This patch is created with reference to the ongoing lkml thread https://lkml.org/lkml/2014/7/15/646 where Andrew Morton wrote: " - puts is presumably faster - puts doesn't go rogue if you accidentally pass it a "%". - this patch would actually make compiled object files few bytes smaller. Perhaps because seq_printf() is a varargs function, forcing the caller to pass args on the stack instead of in registers. " Signed-off-by: Samarth Parikh <samarthp@ymail.com> Signed-off-by: Brian Norris <computersforpeace@gmail.com> 2014-07-21T07:01:16+00:00 Brian Norris computersforpeace@gmail.com 2014-07-21T06:59:16+00:00 urn:sha1:d0d5864676dbccfb1337864a0ae6ce97e6342678 Linux 3.16-rc6 2014-07-14T17:20:19+00:00 Rob Ward robert.ward114@googlemail.com 2014-07-13T19:39:01+00:00 urn:sha1:c95777a4bb5daca9857157cc18cb7b8d470364aa Fix various whitespace issues. No functional changes. Signed-off-by: Rob Ward <robert.ward114@googlemail.com> Signed-off-by: Brian Norris <computersforpeace@gmail.com> 2014-07-05T22:44:42+00:00 Ted Juan ted.juan@gmail.com 2014-06-20T09:32:05+00:00 urn:sha1:6938ad40cb97a52d88a763008935340729a4acc7 These two function's switch case lack the 'break' that make them always return error. Signed-off-by: Ted Juan <ted.juan@gmail.com> Acked-by: Pekon Gupta <pekon@ti.com> Cc: <stable@vger.kernel.org> # 3.12.x+ Signed-off-by: Brian Norris <computersforpeace@gmail.com>