aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2012-11-16Merge branch 'for-linus' of ↵Linus Torvalds9-19/+42
git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux Pull s390 patches from Martin Schwidefsky: "Some more bug fixes and a config change. The signal bug is nasty, if the clock_gettime vdso function is interrupted by a signal while in access-register-mode we end up with an endless signal loop until the signal stack is full. The config change is for aligned struct pages, gives us 8% improvement with hackbench." * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux: s390/3215: fix tty close handling s390/mm: have 16 byte aligned struct pages s390/gup: fix access_ok() usage in __get_user_pages_fast() s390/gup: add missing TASK_SIZE check to get_user_pages_fast() s390/topology: fix core id vs physical package id mix-up s390/signal: set correct address space control
2012-11-16Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linuxLinus Torvalds7-10/+38
Pull drm fixes from Dave Airlie: "All pretty normal: one TTM oops fix, one radeon, a few intel and a vmwgfx fix." * 'drm-fixes' of git://people.freedesktop.org/~airlied/linux: drm/ttm: remove unneeded preempt_disable/enable ttm: Clear the ttm page allocated from high memory zone correctly vmwgfx: return an -EFAULT if copy_to_user() fails drm/radeon: fix logic error in atombios_encoders.c drm/i915: do not ignore eDP bpc settings from vbt drm/i915/sdvo: clean up connectors on intel_sdvo_init() failures drm/i915/crt: fix DPMS standby and suspend mode handling
2012-11-16Merge tag 'clk-fixes-for-linus' of git://git.linaro.org/people/mturquette/linuxLinus Torvalds1-2/+2
Pull another clk layer fix from Michael Turquette: "GCC 4.7 users get compilation errors from unnecessary use of inline in clk-provider.h. This pull request fixes the regression by removing inline usage from those function declarations." * tag 'clk-fixes-for-linus' of git://git.linaro.org/people/mturquette/linux: clk: remove inline usage from clk-provider.h
2012-11-16ARM: imx: ehci: fix host power mask bitChristoph Fritz2-2/+2
This patch sets HPM (Host power mask bit) to bit 16 according to i.MX Reference Manual. Falsely it was set to bit 8, but this controls pull-up Impedance. Reported-by: Michael Burkey <[email protected]> Cc: Stable <[email protected]> Signed-off-by: Christoph Fritz <[email protected]> Acked-by: Eric Bénard <[email protected]> Signed-off-by: Sascha Hauer <[email protected]>
2012-11-16ARM i.MX: fix error-valued pointer dereference in clk_register_gate2()Wei Yongjun1-1/+1
The error-valued pointer clk is used for the arg of kfree, it should be kfree(gate) if clk_register() return ERR_PTR(). dpatch engine is used to auto generate this patch. (https://github.com/weiyj/dpatch) Signed-off-by: Wei Yongjun <[email protected]> Signed-off-by: Sascha Hauer <[email protected]>
2012-11-16ARM: at91/dts: evk-pro3: enable watchdogFabio Porcedda1-0/+4
Tested on evk-pro3. Signed-off-by: Fabio Porcedda <[email protected]> Signed-off-by: Nicolas Ferre <[email protected]>
2012-11-16ARM: at91/dts: add at91sam9_wdt driver to at91sam926x, at91sam9g45Fabio Porcedda3-0/+18
Tested on an at91sam9260 board (evk-pro3). Signed-off-by: Fabio Porcedda <[email protected]> Signed-off-by: Nicolas Ferre <[email protected]>
2012-11-16watchdog: at91sam9_wdt: add device tree supportFabio Porcedda2-0/+26
Tested on an at91sam9260 board (evk-pro3) Signed-off-by: Fabio Porcedda <[email protected]> Signed-off-by: Nicolas Ferre <[email protected]>
2012-11-16ARM: at91: dt: evk-pro3: enable uart0 and uart2Fabio Porcedda1-0/+8
Signed-off-by: Fabio Porcedda <[email protected]> Signed-off-by: Nicolas Ferre <[email protected]>
2012-11-16ARM: at91/usbh: fix overcurrent gpio setupJohan Hovold4-4/+4
Use gpio_is_valid also for overcurrent pins (which are currently negative in many board files). Signed-off-by: Johan Hovold <[email protected]> Acked-by: Jean-Christophe PLAGNIOL-VILLARD <[email protected]> Signed-off-by: Nicolas Ferre <[email protected]>
2012-11-16ARM: at91/AT91SAM9G45: fix crypto peripherals irq issue due to sparse irq ↵Nicolas Royer1-6/+6
support Spare irq support introduced by commit 8fe82a5 (ARM: at91: sparse irq support) involves to add the NR_IRQS_LEGACY offset to irq number. Signed-off-by: Nicolas Royer <[email protected]> Acked-by: Nicolas Ferre <[email protected]> Acked-by: Eric Bénard <[email protected]> Tested-by: Eric Bénard <[email protected]> Cc: [email protected] # 3.6
2012-11-16batman-adv: process broadcast packets in BLA earlierAntonio Quartulli1-6/+6
The logic in the BLA mechanism may decide to drop broadcast packets because the node may still be in the setup phase. For this reason, further broadcast processing like the early client detection mechanism must be done only after the BLA check. This patches moves the invocation to BLA before any other broadcast processing. This was introduced 30cfd02b60e1cb16f5effb0a01f826c5bb7e4c59 ("batman-adv: detect not yet announced clients") Reported-by: Glen Page <[email protected]> Signed-off-by: Simon Wunderlich <[email protected]> Signed-off-by: Antonio Quartulli <[email protected]> Signed-off-by: Marek Lindner <[email protected]>
2012-11-16batman-adv: don't add TEMP clients belonging to other backbone nodesAntonio Quartulli1-0/+7
The "early client detection" mechanism must not add clients belonging to other backbone nodes. Such clients must be reached by directly using the LAN instead of the mesh. This was introduced by 30cfd02b60e1cb16f5effb0a01f826c5bb7e4c59 ("batman-adv: detect not yet announced clients") Reported-by: Glen Page <[email protected]> Signed-off-by: Antonio Quartulli <[email protected]> Signed-off-by: Marek Lindner <[email protected]>
2012-11-16batman-adv: correctly pass the client flag on tt_responseAntonio Quartulli1-1/+1
When a TT response with the full table is sent, the client flags should be sent as well. This patch fix the flags assignment when populating the tt_response to send back This was introduced by 30cfd02b60e1cb16f5effb0a01f826c5bb7e4c59 ("batman-adv: detect not yet announced clients") Signed-off-by: Antonio Quartulli <[email protected]> Signed-off-by: Marek Lindner <[email protected]>
2012-11-16batman-adv: fix tt_global_entries flags updateAntonio Quartulli1-0/+6
Flags carried by a change_entry have to be always copied into the client entry as they may contain important attributes (e.g. TT_CLIENT_WIFI). For instance, a client added by means of the "early detection mechanism" has no flag set at the beginning, so they must be updated once the proper ADD event is received. This was introduced by 30cfd02b60e1cb16f5effb0a01f826c5bb7e4c59 ("batman-adv: detect not yet announced clients") Signed-off-by: Antonio Quartulli <[email protected]> Signed-off-by: Marek Lindner <[email protected]>
2012-11-16Add device tree file for the armadeus apf27Philippe Reynes1-0/+89
Signed-off-by: Philippe Reynes <[email protected]> Signed-off-by: Eric Jarrige <[email protected]> Signed-off-by: Sascha Hauer <[email protected]>
2012-11-16ARM: mxs_defconfig: Improve USB related supportFabio Estevam1-0/+6
Select the following USB related options: - USB Ethernet adapter (needed for mx23-olinuxino) - Native language support (needed for mounting USB pen drives, for example) Signed-off-by: Fabio Estevam <[email protected]> Signed-off-by: Shawn Guo <[email protected]>
2012-11-16ARM: imx6q: select ARM and PL310 errataShawn Guo1-0/+8
ARM core r2p10 and PL310 r3p2 are integrated on imx6q. Select corresponding errata. Signed-off-by: Shawn Guo <[email protected]>
2012-11-16tilegx: request_irq with a non-null device nameSimon Marchi1-1/+1
This patch simply makes the tilegx net driver call request_irq with a non-null name. It makes the output in /proc/interrupts more obvious, but also helps tools that don't expect to find null there. Signed-off-by: Simon Marchi <[email protected]> Acked-by: Chris Metcalf <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2012-11-16ARM: imx6q: print silicon version on bootShawn Guo1-0/+35
i.MX6Q has 3 revisions 1.0, 1.1 and 1.2. Print revision on boot. Signed-off-by: Drew Moseley <[email protected]> [drew: add proper error checking for function imx6q_revision()] Signed-off-by: Shawn Guo <[email protected]>
2012-11-16ARM i.MX dts: Consistently add labels to devicenodesSascha Hauer4-87/+88
Having labels before each node allows board bindings to reference to nodes by using the &nodename {} notation. This way boards do not have to resemble the whole devicetree layout. Due to less indention needed the board files also get better readability. Since the label make the documentation behind the nodes unnecessary it is removed. Signed-off-by: Sascha Hauer <[email protected]> Signed-off-by: Shawn Guo <[email protected]>
2012-11-16ARM: dts: imx6q-sabresd: add volume up/down gpio keysLiu Ying1-0/+18
Add volume up/down gpio keys support in imx6q-sabresd.dts. Signed-off-by: Liu Ying <[email protected]> Signed-off-by: Shawn Guo <[email protected]>
2012-11-16ARM: dts: imx53: pinctl updateRoland Stigge1-0/+46
This patch supplements pinctl support on i.MX53. Signed-off-by: Roland Stigge <[email protected]> Acked-by: Sascha Hauer <[email protected]> Signed-off-by: Shawn Guo <[email protected]>
2012-11-16ARM: imx: enable cpufreq for imx6qShawn Guo3-1/+13
It enables cpufreq support for imx6q with generic cpufreq-cpu0 driver. Signed-off-by: Shawn Guo <[email protected]>
2012-11-16ARM: dts: imx6q: enable snvs lp rtcShawn Guo1-2/+10
Signed-off-by: Shawn Guo <[email protected]>
2012-11-16ARM: dts: imx6q-sabreauto: Add basic supportFabio Estevam3-0/+69
mx6qsabreauto is a board based on mx6q SoC with the following features: - 2GB of DDR3 - 2 USB ports - 1 HDMI output port - SPI NOR - 2 LVDS LCD ports - Gigabit Ethernet - Camera - eMMC and SD card slot - Multichannel Audio - CAN - SATA - NAND - PCIE - Video Input Add very basic support for it. Signed-off-by: Fabio Estevam <[email protected]> Signed-off-by: Shawn Guo <[email protected]>
2012-11-16ARM: imx6q: let users input debug uart port numberShawn Guo4-31/+47
imx6q gets 5 uart ports in total. Different board design may choose different port as debug uart. For example, imx6q-sabresd uses UART1, imx6q-sabrelite uses UART2 and imx6q-arm2 uses UART4. Rather than bloating DEBUG_LL choice list with all these uart ports, the patch introduces DEBUG_IMX6Q_UART_PORT for users to input uart port number when DEBUG_IMX6Q_UART is selected inside DEBUG_LL choice. Signed-off-by: Shawn Guo <[email protected]>
2012-11-16ARM: dts: imx53-qsb: Make DA9053 regulator functionalFabio Estevam1-18/+36
Setup the GPIO7_11 pin as interrupt to the DA9053 and also rename the regulator nodes so that they match with the datasheet. This allows probing of DA9053 to succeed. Signed-off-by: Fabio Estevam <[email protected]> Signed-off-by: Shawn Guo <[email protected]>
2012-11-16ARM: dts: imx53-qsb: Use pinctrl for gpio-ledFabio Estevam1-0/+8
Since commit 8fe4554f (leds: leds-gpio: adopt pinctrl support) gpio-led driver has pinctrl support, so setup the gpio led pin via pinctrl and avoid the following warning: leds-gpio leds.2: pins are not configured from the driver Signed-off-by: Fabio Estevam <[email protected]> Reviewed-by: Marek Vasut <[email protected]> Signed-off-by: Shawn Guo <[email protected]>
2012-11-16ARM i.MX dtsi: Add default bus-width property for esdhc controllerSascha Hauer3-0/+11
According to Documentation/devicetree/bindings/mmc/mmc.txt bus-width is a mandatory property. While this is currently enforced nowhere, it's a good habit to just add the property now to allow to add common helper functionality for the mmc property parsing later. Signed-off-by: Sascha Hauer <[email protected]> Signed-off-by: Shawn Guo <[email protected]>
2012-11-16Merge branch 'drm-intel-fixes' of ↵Dave Airlie3-4/+31
git://people.freedesktop.org/~danvet/drm-intel into drm-fixes Daniel writes: Just a few small things to fix regressions, somehow all patches from Jani: - Fix dpms confusion about which platforms support intermediate modes on vga. - Revert the "ignore vbt for eDP bpc" patch, it breaks machines. This will annoy mbp retina owners again, but windows machines seem to _really_ depend upon this. We can try to quirk the mbp retinas again in 3.8 and backport the patch. - Fix connector leaks when the sdvo setup failed, resulted in an OOPS later on when trying to probe that connector (with it's encoder kfree'd already). * 'drm-intel-fixes' of git://people.freedesktop.org/~danvet/drm-intel: drm/i915: do not ignore eDP bpc settings from vbt drm/i915/sdvo: clean up connectors on intel_sdvo_init() failures drm/i915/crt: fix DPMS standby and suspend mode handling
2012-11-16Merge branch 'drm-fixes-3.7' of git://people.freedesktop.org/~agd5f/linux ↵Dave Airlie1-1/+1
into drm-fixes Just a single radeon fix from Alex. * 'drm-fixes-3.7' of git://people.freedesktop.org/~agd5f/linux: drm/radeon: fix logic error in atombios_encoders.c
2012-11-16drm/ttm: remove unneeded preempt_disable/enableAkinobu Mita1-4/+0
It is unnecessary to disable preemption explicitly while calling copy_highpage(). Because copy_highpage() will do it again through kmap_atomic/kunmap_atomic. Signed-off-by: Akinobu Mita <[email protected]> Reviewed-by: Thomas Hellstrom <[email protected]> Signed-off-by: Dave Airlie <[email protected]>
2012-11-16ttm: Clear the ttm page allocated from high memory zone correctlyZhao Yakui1-1/+4
The TTM page can be allocated from high memory. In such case it is wrong to use the page_address(page) as the virtual address for the high memory page. bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=50241 Signed-off-by: Zhao Yakui <[email protected]> Cc: [email protected] Reviewed-by: Thomas Hellstrom <[email protected]> Signed-off-by: Dave Airlie <[email protected]>
2012-11-16vmwgfx: return an -EFAULT if copy_to_user() failsDan Carpenter1-0/+2
copy_to_user() returns the number of bytes remaining to be copied, but we want to return a negative error code here. I fixed a couple of these last year, but I missed this one. Signed-off-by: Dan Carpenter <[email protected]> Reviewed-by: Thomas Hellstrom <[email protected]> Signed-off-by: Dave Airlie <[email protected]>
2012-11-15net: correct check in dev_addr_del()Jiri Pirko1-1/+2
Check (ha->addr == dev->dev_addr) is always true because dev_addr_init() sets this. Correct the check to behave properly on addr removal. Signed-off-by: Jiri Pirko <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2012-11-15tcp: fix retransmission in repair modeAndrew Vagin2-2/+6
Currently if a socket was repaired with a few packet in a write queue, a kernel bug may be triggered: kernel BUG at net/ipv4/tcp_output.c:2330! RIP: 0010:[<ffffffff8155784f>] tcp_retransmit_skb+0x5ff/0x610 According to the initial realization v3.4-rc2-963-gc0e88ff, all skb-s should look like already posted. This patch fixes code according with this sentence. Here are three points, which were not done in the initial patch: 1. A tcp send head should not be changed 2. Initialize TSO state of a skb 3. Reset the retransmission time This patch moves logic from tcp_sendmsg to tcp_write_xmit. A packet passes the ussual way, but isn't sent to network. This patch solves all described problems and handles tcp_sendpages. Cc: Pavel Emelyanov <[email protected]> Cc: "David S. Miller" <[email protected]> Cc: Alexey Kuznetsov <[email protected]> Cc: James Morris <[email protected]> Cc: Hideaki YOSHIFUJI <[email protected]> Cc: Patrick McHardy <[email protected]> Signed-off-by: Andrey Vagin <[email protected]> Acked-by: Pavel Emelyanov <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2012-11-15ARM: tegra: Add Tegra30 host1x supportThierry Reding1-0/+87
Add the host1x node along with its children to the Tegra30 DTSI. Board- specific DTS files are expected to enable the available outputs and complement the device tree with data specific to the hardware. Signed-off-by: Thierry Reding <[email protected]> Signed-off-by: Stephen Warren <[email protected]>
2012-11-15ARM: tegra: Add Tegra20 host1x supportThierry Reding1-0/+87
Add the host1x node along with its children to the Tegra20 DTSI. Board- specific DTS files are expected to enable the available outputs and complement the device tree with data specific to the hardware. Signed-off-by: Thierry Reding <[email protected]> Signed-off-by: Stephen Warren <[email protected]>
2012-11-15ARM: tegra: trimslice: enable SPI flashStephen Warren1-0/+10
TrimSlice contains a 1MiB SPI flash. Represent this in the device tree. Signed-off-by: Stephen Warren <[email protected]>
2012-11-15ARM: tegra: dts: add sflash controller dt entryLaxman Dewangan1-0/+10
Nvidia's Tegra20 have the SPI (SFLASH) controller to interface with spi flash device which is used for system boot. Add DT entry for this controller. Signed-off-by: Laxman Dewangan <[email protected]> [swarren: move sflash node to keep file sorted] Signed-off-by: Stephen Warren <[email protected]>
2012-11-15ARM: tegra: ventana: Add NCT1008 temperature sensorThierry Reding1-0/+5
The Harmony board has an ON Semiconductors NCT1008 temperature sensor connected to the DVC bus. It can be used to monitor the ambient (local) and on-die (remote) temperatures. Signed-off-by: Thierry Reding <[email protected]> Tested-by: Stephen Warren <[email protected]> Signed-off-by: Stephen Warren <[email protected]>
2012-11-15ARM: tegra: tamonten: Add NCT1008 temperature sensorThierry Reding1-0/+5
The Tamonten SOM has an ON Semiconductor NCT1008 connected to the DVC bus which is used to measure the ambient (local) temperature as well as the on-die (remote) temperature. Signed-off-by: Thierry Reding <[email protected]> Signed-off-by: Stephen Warren <[email protected]>
2012-11-15ARM: tegra: harmony: Add ADT7641 temperature sensorThierry Reding1-0/+5
The Harmony board has an Analog Devices ADT7461 temperature sensor connected to the DVC bus. It can be used to monitor the ambient (local) and on-die (remote) temperatures. Signed-off-by: Thierry Reding <[email protected]> Tested-by: Stephen Warren <[email protected]> Signed-off-by: Stephen Warren <[email protected]>
2012-11-15ARM: tegra: tec: Remove redundant DT propertiesThierry Reding1-3/+0
These properties are already set by the tegra20-tamonten.dtsi, so they don't need to be repeated. Signed-off-by: Thierry Reding <[email protected]> Signed-off-by: Stephen Warren <[email protected]>
2012-11-15ARM: tegra: tamonten: Add DDC/PTA pinmuxThierry Reding1-5/+64
This commit allows the I2C2 controller on Tegra20 to be routed either to the DDC or the PTA pin group at runtime. On Tamonten this allows the I2C bus to be used for the DDC of the HDMI connector or to access I2C chips on the carrier board. Signed-off-by: Thierry Reding <[email protected]> Signed-off-by: Stephen Warren <[email protected]>
2012-11-15ARM: tegra: dts: cardhu: enable SLINK4Laxman Dewangan2-0/+11
Enable SLINK4 and connected device in Tegra30 based platform Cardhu. Setting maximum spi frequency to 25MHz. SPI serial flash is connected on CS1 of SLINK4 on cardhu platform. Signed-off-by: Laxman Dewangan <[email protected]> [swarren: swapped reg/compatible order to be consistent] Signed-off-by: Stephen Warren <[email protected]>
2012-11-15ARM: tegra: dts: add slink controller dt entryLaxman Dewangan2-0/+100
Add slink controller details in the dts file of Tegra20 and Tegra30. Signed-off-by: Laxman Dewangan <[email protected]> Signed-off-by: Stephen Warren <[email protected]>
2012-11-15ARM: dt: tegra: ventana: define pinmux for ddcMark Zhang1-6/+63
Tegra 2's I2C2 controller can be routed to either the PTA or DDC pin group on Ventana. So: - Remove the HDMI function definition of pta pingroup - Define child i2c adapters(ddc & pta) for I2C2 controller Signed-off-by: Mark Zhang <[email protected]> Signed-off-by: Stephen Warren <[email protected]>
2012-11-15ARM: dt: t30 cardhu: set pinmux and power for wlanWei Ni3-0/+39
Configure pinmux as required for WiFi. Enable the SDHCI1 controller for a02 and a04 board, which is connected to the WiFi module. For now, always enable the regulator that provides power to the Wifi module. Signed-off-by: Wei Ni <[email protected]> Signed-off-by: Stephen Warren <[email protected]>
Powered by cgit, Gruvboxed by Blaster4385.