summaryrefslogtreecommitdiffstats
path: root/drivers
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'for-next/misc'Sascha Hauer2014-11-054-6/+100
|\
| * serial: ns16550: Remove unused fields from NS16550_plat structureAlexander Shiyan2014-11-031-4/+1
| | | | | | | | | | Signed-off-by: Alexander Shiyan <shc_work@mail.ru> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * Typoes: "whith" -> "with"Antony Pavlov2014-11-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch is based on linux kernel commit commit e1b8513d21845fbeb93d6d2c4973db874385059f Author: Robert P. J. Day <rpjday@crashcourse.ca> Date: Sun Feb 3 15:14:02 2008 +0200 Typoes: "whith" -> "with" Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com> Cc: Robert P. J. Day <rpjday@crashcourse.ca> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * net: cpsw: Set phy device_node pointer in probeWadim Egorov2014-11-031-0/+13
| | | | | | | | | | | | | | | | | | | | | | Set the phy device_node pointer to the equivalent cpsw slave node. We need this, because phy drivers using this pointer for their configuration. Create and register the phy device in cpsw_probe(), so that this phy device can be found later by phy_device_connect() in cpsw_open(). Signed-off-by: Wadim Egorov <w.egorov@phytec.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * net: phy: micrel: Add OF conf. support for ksz9031Wadim Egorov2014-11-031-1/+85
| | | | | | | | | | | | | | | | | | | | | | Adds support for ksz9031 PAD skew configuration over devicetree. Based on a patch from the linux kernel. Author: Hubert Chaumette <hchaumette@adeneo-embedded.com> Original commit: 6e4b82730c7525504fc485b370c7f09e594e2e96 Signed-off-by: Wadim Egorov <w.egorov@phytec.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | Merge branch 'for-next/led'Sascha Hauer2014-11-051-3/+6
|\ \
| * | led: trigger: Turn of flashing leds only onceSascha Hauer2014-10-081-1/+4
| | | | | | | | | | | | | | | | | | | | | The current code continuously turns leds off. Preserve the current led status so that we only turn it off once. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | led: trigger: use max_value to turn on led instead of hardcoded '1'Sascha Hauer2014-10-081-2/+2
| |/ | | | | | | | | | | For PWM LEDs '1' may be really dark. Use max_value instead. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | Merge branch 'for-next/am335x'Sascha Hauer2014-11-053-5/+55
|\ \
| * | of: Add of_device_enable_and_register functionsTeresa Gámez2014-11-031-0/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Function to enable and register a disabled device. The devices can be registered using the device node with of_device_enable_and_register() or with the device node name/path by using the of_device_enable_and_register_by_name() function. Signed-off-by: Teresa Gámez <t.gamez@phytec.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | net: cpsw: Fix probe for one port ethernetTeresa Gámez2014-10-141-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | If only one port is pinned out, probe fails as the second port phy_id is not found. Signed-off-by: Teresa Gámez <t.gamez@phytec.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | net: micrel: Add ksz8081 supportJan Weitzel2014-10-081-1/+9
| | | | | | | | | | | | | | | Signed-off-by: Jan Weitzel <j.weitzel@phytec.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | net: cpsw: Allow gigabit connectionJan Weitzel2014-10-081-2/+1
| |/ | | | | | | | | Signed-off-by: Jan Weitzel <j.weitzel@phytec.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | clk: gate: remove superfluous codeLucas Stach2014-10-211-10/+1
| | | | | | | | | | | | | | This code didn't have any effect. Signed-off-by: Lucas Stach <dev@lynxeye.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | i2c: at91: fix invalid length checkLucas Stach2014-10-211-2/+2
| | | | | | | | | | | | Signed-off-by: Lucas Stach <dev@lynxeye.de> Acked-by: Bo Shen <voice.shen@atmel.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | dfu: fix possible usage of uninitialized varLucas Stach2014-10-211-0/+1
| | | | | | | | | | | | | | | | The error path would in fact use the status variable without it being initialized first. Signed-off-by: Lucas Stach <dev@lynxeye.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | imx: ipu-v3: fix typo leading to build warningLucas Stach2014-10-211-1/+1
| | | | | | | | | | | | | | This PAGE_SIZE clearly should not be there. Signed-off-by: Lucas Stach <dev@lynxeye.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | usb: ehci-hcd: Correct CLEAR_FEATURE codeDmitry Voytik2014-10-211-4/+6
|/ | | | | | | | | | | | | | | This commit broke USB on olinuxino board: 87b9bea USB: host: hub: Use usb_hub_power_on from U-Boot This patch was ported from U-Boot with small changes. See discussion: http://lists.denx.de/pipermail/u-boot/2013-May/153920.html The root cause seems to be a missing mask and missing 'break' in ehci-hcd.c. Fix both. Signed-off-by: Dmitry Voytik <voytikd@gmail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* input: Let input support depend on !CONSOLE_NONESascha Hauer2014-10-081-0/+1
| | | | | | | Without console support the input devices make no sense, so add a depends on !CONSOLE_NONE. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* Merge branch 'for-next/ubi'Sascha Hauer2014-10-025-42/+40
|\
| * UBI: bugfix in ubi_wl_flush()Richard Weinberger2014-09-111-2/+2
| | | | | | | | | | | | | | | | Use the _safe variant because we're iterating over a list where items get deleted and freed. Signed-off-by: Richard Weinberger <richard@nod.at> Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
| * UBI: init_volumes: Ignore volumes with no LEBsRichard Weinberger2014-09-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | UBI assumes that ubi_attach_info will only contain ubi_ainf_volume structures for volumes with at least one LEB. In scanning mode this is true because UBI can nicely create a ubi_ainf_volume on demand while creating the EBA table. For fastmap this is not true, the fastmap on-flash structure has a list of all volumes, the ubi_ainf_volume structures are created from this list. So it can happen that an empty volume ends up in init_volumes(). We can easely deal with that by looking into ->leb_count too. Signed-off-by: Richard Weinberger <richard@nod.at> Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
| * UBI: fastmap: do not miss bit-flipsBrian Norris2014-09-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The return value from 'ubi_io_read_ec_hdr()' was stored in 'err', not in 'ret'. This fix makes sure Fastmap-enabled UBI does not miss bit-flip while reading EC headers, events and scrubs the affected PEBs. This issue was reported by Coverity Scan. Artem: improved the commit message. Signed-off-by: Brian Norris <computersforpeace@gmail.com> Acked-by: Richard Weinberger <richard@nod.at> Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
| * UBI: fix the volumes tree sorting criteriaHeiko Schocher2014-09-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | Commig "604b592 UBI: fix rb_tree node comparison in add_map" broke fastmap backward compatibility and older fastmap images cannot be mounted anymore. The reason is that it changes the volumes RB-tree sorting criteria. This patch fixes the problem. Artem: re-write the commit message Signed-off-by: Heiko Schocher <hs@denx.de> Acked-by: Richard Weinberger <richard@nod.at> Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
| * UBI: fix rb_tree node comparison in add_mapMike Snitzer2014-09-111-2/+2
| | | | | | | | | | | | | | | | | | The comparisons used in add_vol() shouldn't be identical. Pretty sure the following is correct but it is completely untested. Signed-off-by: Mike Snitzer <snitzer@redhat.com> Acked-by: Richard Weinberger <richard@nod.at> Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
| * UBI: fix ubi free PEBs count calculationTanya Brokhman2014-09-111-0/+3
| | | | | | | | | | | | | | | | | | | | The ubi->free_count should be updated with every insert/remove to/from the ubi->free list. Signed-off-by: Tanya Brokhman <tlinder@codeaurora.org> Reviewed-by: Dolev Raviv <draviv@codeaurora.org> Acked-by: Richard Weinberger <richard@nod.at> Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
| * UBI: fix error path in __wl_get_pebTanya Brokhman2014-09-111-0/+3
| | | | | | | | | | | | | | | | | | | | | | In case of an error (if there are not free PEB's for example), __wl_get_peb will return a negative value. In order to prevent access violation we need to test the returned value prior to using it later on. Signed-off-by: Tatyana Brokhman <tlinder@codeaurora.org> Reviewed-by: Dolev Raviv <draviv@codeaurora.org> Acked-by: Richard Weinberger <richard@nod.at> Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
| * UBI: fix some use after free bugsDan Carpenter2014-09-111-4/+4
| | | | | | | | | | | | | | Move the kmem_cache_free() calls down a couple lines. Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
| * UBI: avoid program operation on NOR flash after erasure interruptedQi Wang 王起 (qiwang)2014-09-111-32/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | nor_erase_prepare() will be called before erase a NOR flash, it will program '0' into a block to mark this block. But program data into a erasure interrupted block can cause program timtout(several minutes at most) error, could impact other operation on NOR flash. So UBIFS can read this block first to avoid unneeded program operation. This patch try to put read operation at head of write operation in nor_erase_prepare(), read out the data. If the data is already corrupt, then no need to program any data into this block, just go to erase this block. This patch is validated on Micron NOR flash, part number is:JS28F512M29EWHA Signed-off-by: Qi Wang <qiwang@micron.com> Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
| * UBI: fix error return codeJulia Lawall2014-09-111-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set the return variable to an error code as done elsewhere in the function. A simplified version of the semantic match that finds this problem is as follows: (http://coccinelle.lip6.fr/) // <smpl> ( if@p1 (\(ret < 0\|ret != 0\)) { ... return ret; } | ret@p1 = 0 ) ... when != ret = e1 when != &ret *if(...) { ... when != ret = e2 when forall return ret; } // </smpl> Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr> Reviewed-by: Richard Weinberger <richard@nod.at>
* | Merge branch 'for-next/resource-err-ptr'Sascha Hauer2014-10-0298-141/+343
|\ \
| * | resource: Let request_ioport_region return an error pointerSascha Hauer2014-09-161-2/+2
| | | | | | | | | | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | resource: Let dev_request_mem_region return an error pointerSascha Hauer2014-09-1686-78/+248
| | | | | | | | | | | | | | | | | | For all users fix or add the error check. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | resource: Let dev_request_mem_region_by_name return an error pointerSascha Hauer2014-09-163-3/+11
| | | | | | | | | | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | resource: Let dev_get_mem_region return an error pointerSascha Hauer2014-09-167-9/+29
| | | | | | | | | | | | | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> Acked-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
| * | resource: Let dev_get_resource return an error pointerSascha Hauer2014-09-165-12/+14
| | | | | | | | | | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | resource: Let request_iomem_region return an error pointerSascha Hauer2014-09-166-10/+13
| | | | | | | | | | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | resource: Let dev_get_mem_region_by_name return an error pointerSascha Hauer2014-09-161-1/+1
| | | | | | | | | | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | resource: Let dev_get_resource_by_name return an error pointerSascha Hauer2014-09-162-6/+8
| | | | | | | | | | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | ata: platform_ide: cleanup resource requestingSascha Hauer2014-09-121-25/+22
| | | | | | | | | | | | | | | | | | | | | - use dev_request_mem_region to simplify code - check return values and bail out Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | | Merge branch 'for-next/phycore-imx6'Sascha Hauer2014-10-021-2/+2
|\ \ \
| * | | phy/micrel: disable Asym_Pause supportJan Weitzel2014-09-171-2/+2
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | With SUPPORTED_Asym_Pause enabled we need to hotplug the ethernet cable. So disable it like done with PHY_ID_KSZ9021. Signed-off-by: Jan Weitzel <j.weitzel@phytec.de> Signed-off-by: Christian Hemp <c.hemp@phytec.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | | Merge branch 'for-next/openrisc'Sascha Hauer2014-10-022-1/+7
|\ \ \
| * | | openrisc: add initial device tree supportAntony Pavlov2014-09-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com> Cc: Franck Jullien <franck.jullien@gmail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | net: ethoc: add device tree supportAntony Pavlov2014-09-091-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com> Cc: Franck Jullien <franck.jullien@gmail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | | | Merge branch 'for-next/of'Sascha Hauer2014-10-021-8/+69
|\ \ \ \
| * | | | of: Added of_set_property_to_child_phandleTeresa Gámez2014-10-011-0/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set a property to a phandle of a child node. This may be used for selections like display-timings. Signed-off-by: Teresa Gámez <t.gamez@phytec.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | | of: base: Add of_parse_phandle_fromTeresa Gámez2014-10-011-4/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added of_parse_phandle_from() to be able to use external root nodes. Signed-off-by: Teresa Gámez <t.gamez@phytec.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | | of: base: Add of_find_node_by_phandle_fromTeresa Gámez2014-10-011-4/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added of_find_node_by_phandle_from() to find nodes by phandle with a given root node. Signed-off-by: Teresa Gámez <t.gamez@phytec.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | | | | Merge branch 'for-next/net-phy'Sascha Hauer2014-10-021-56/+86
|\ \ \ \ \