30 Aug, 2013
1 commit
-
This patch moves the pca953x.h header from include/linux/i2c to
include/linux/platform_data and updates existing support accordingly.Acked-by: Linus Walleij
Acked-by: H Hartley Sweeten
Signed-off-by: Vivien Didelot
Signed-off-by: Olof Johansson
22 Aug, 2013
1 commit
-
…gene/linux-samsung into next/cleanup
From Kukjin Kim:
samsung cleanup for v3.12
- cleanup non-dt stuff in exynos
- remove 0x from exynos dt files
- remove unused codes* tag 'samsung-cleanup-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
ARM: SAMSUNG: Remove unnecessary exynos4_default_sdhci*()
ARM: dts: Remove '0x's from Exynos5440 DTS file
ARM: dts: Remove '0x's from Exynos5420 DTS file
ARM: dts: Remove '0x's from Exynos5250 DTS file
ARM: dts: Remove '0x's from Exynos4x12 DTSI file
ARM: dts: Remove '0x's from Exynos4210 DTSI file
ARM: EXYNOS: Cleanup common.h file
irqchip: exynos: cleanup non-DT stuff in exynos-combinerSigned-off-by: Kevin Hilman <khilman@linaro.org>
21 Aug, 2013
1 commit
-
…git/swarren/linux-tegra into next/cleanup
From: Stephen Warren:
ARM: tegra: cleanups for 3.12This branch includes a single cleanup patch which removes redundant
error-handling for platform_get_resource().* tag 'tegra-for-3.12-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra:
tegra: simplify use of devm_ioremap_resourceSigned-off-by: Kevin Hilman <khilman@linaro.org>
20 Aug, 2013
1 commit
-
…el/git/tmlind/linux-omap into next/cleanup
From Tony Lindgren:
USB nop phy rename via Felipe Balbi <balbi@ti.com>:Here's a pull request of one patch to avoid conflicts during the merge
window.* tag 'omap-for-v3.12/usb-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
usb: phy: rename nop_usb_xceiv => usb_phy_gen_xceivSigned-off-by: Kevin Hilman <khilman@linaro.org>
16 Aug, 2013
1 commit
-
Remove unneeded error handling on the result of a call to
platform_get_resource when the value is passed to devm_ioremap_resource.A simplified version of the semantic patch that makes this change is as
follows: (http://coccinelle.lip6.fr/)//
@@
expression pdev,res,n,e,e1;
expression ret != 0;
identifier l;
@@- res = platform_get_resource(pdev, IORESOURCE_MEM, n);
... when != res
- if (res == NULL) { ... \(goto l;\|return ret;\) }
... when != res
+ res = platform_get_resource(pdev, IORESOURCE_MEM, n);
e = devm_ioremap_resource(e1, res);
//Signed-off-by: Julia Lawall
Signed-off-by: Stephen Warren
14 Aug, 2013
2 commits
-
From Tomasz Figa:
Here is the Samsung PWM cleanup series. Particular patches of the series
involve following modifications:
- fixing up few things in samsung_pwm_timer clocksource driver,
- moving remaining Samsung platforms to the new clocksource driver,
- removing old clocksource driver,
- adding new multiplatform- and DT-aware PWM driver,
- moving all Samsung platforms to use the new PWM driver,
- removing old PWM driver,
- removing all PWM-related code that is not used anymore.* tag 'v3.12-pwm-cleanup-for-olof' of git://github.com/tom3q/linux: (684 commits)
ARM: SAMSUNG: Remove plat/regs-timer.h header
ARM: SAMSUNG: Remove remaining uses of plat/regs-timer.h header
ARM: SAMSUNG: Remove pwm-clock infrastructure
ARM: SAMSUNG: Remove old PWM timer platform devices
pwm: Remove superseded pwm-samsung-legacy driver
ARM: SAMSUNG: Modify board files to use new PWM platform device
ARM: SAMSUNG: Rework private data handling in dev-backlight
pwm: Add new pwm-samsung driver
pwm: samsung: Rename to pwm-samsung-legacy
ARM: SAMSUNG: Remove unused PWM timer IRQ chip code
ARM: SAMSUNG: Remove old samsung-time driver
ARM: SAMSUNG: Move all platforms to new clocksource driver
ARM: SAMSUNG: Set PWM platform data
ARM: SAMSUNG: Add new PWM platform device
ARM: SAMSUNG: Unify base address definitions of timer block
clocksource: samsung_pwm_timer: Handle suspend/resume correctly
clocksource: samsung_pwm_timer: Do not use clocksource_mmio
clocksource: samsung_pwm_timer: Cache clocksource register address
clocksource: samsung_pwm_timer: Correct definition of AUTORELOAD bit
clocksource: samsung_pwm_timer: Do not request PWM mem region
+ v3.11-rc4Conflicts:
arch/arm/Kconfig.debugSigned-off-by: Olof Johansson
-
From David Brown :
* msm/cleanup:
ARM: msm: Only compile io.c on platforms that use it
iommu/msm: Move mach includes to iommu directory
ARM: msm: Remove devices-iommu.c
ARM: msm: Move mach/board.h contents to common.h
ARM: msm: Migrate msm_timer to CLOCKSOURCE_OF_DECLARE
ARM: msm: Remove TMR and TMR0 static mappings
ARM: msm: Move debug-macro.S to include/debug
ARM: msm: Don't compile __msm_ioremap_caller() unless used
ARM: msm: Remove unused and unmapped MSM_TLMM_BASE for 8x60Signed-off-by: Kevin Hilman
13 Aug, 2013
2 commits
-
This patch removes the now unused pwm-samsung-legacy driver, which was
replaced by new pwm-samsung driver.Signed-off-by: Tomasz Figa
Reviewed-by: Sylwester Nawrocki
Tested-by: Heiko Stuebner
Tested-by: Mark Brown
Tested-by: Sylwester Nawrocki
Acked-by: Arnd Bergmann
Acked-by: Thierry Reding -
This patch introduces new Samsung PWM driver, which is completely
rewritten to be multiplatform- and DeviceTree-aware.In addition, remaining problems of old driver are fixed, such as:
- proper handling of hardware variants,
- synchronization on SMP systems,
- handling of boundary parameter values,
- hardware sharing with PWM clocksource driver,
- undefined state of PWM output after stopping PWM channel.Signed-off-by: Tomasz Figa
Reviewed-by: Sylwester Nawrocki
Tested-by: Heiko Stuebner
Tested-by: Mark Brown
Tested-by: Sylwester Nawrocki
Acked-by: Arnd Bergmann
Acked-by: Thierry Reding
09 Aug, 2013
1 commit
-
The "nop" driver isn't a do-nothing-stub but supports a couple functions
like clock on/off or is able to use a voltage regulator. This patch
simply renames the driver to "generic" since it is easy possible to
extend it by a simple function istead of writing a complete driver.Signed-off-by: Sebastian Andrzej Siewior
Signed-off-by: Felipe Balbi
07 Aug, 2013
2 commits
-
Two header files exist in mach-msm's include/mach directory that
are only used by the MSM iommu driver. Move these files to the
iommu driver directory and prefix them with "msm_". This allows
us to compile the MSM iommu driver on multi-platform kernels.Acked-by: Joerg Roedel
Cc: Stepan Moskovchenko
Signed-off-by: Stephen Boyd
Signed-off-by: David Brown -
The contents of mach/board.h are only used by files within
mach-msm so there is no need to export this file outside of the
mach-msm directory. Move the contents of the file to common.h to
allow us to compile MSM in the multi-platform kernel.Cc: Florian Tobias Schandinat
Signed-off-by: Stephen Boyd
Acked-by: Tomi Valkeinen
Signed-off-by: David Brown
06 Aug, 2013
6 commits
-
This patch renames the old pwm-samsung driver to pwm-samsung-legacy to
create place for the new, rewritten, DT-aware pwm-samsung driver.Signed-off-by: Tomasz Figa
Reviewed-by: Sylwester Nawrocki
Tested-by: Heiko Stuebner
Tested-by: Mark Brown
Tested-by: Sylwester Nawrocki
Acked-by: Arnd Bergmann
Acked-by: Thierry Reding -
Current suspend/resume handling of the driver was broken, because:
- periodic timer was being enabled in CLOCK_EVT_MODE_RESUME mode, which
does not seem to be correct behavior looking at other platforms,
- PWM divisors need to be restored, but they were not,
- clockevent interrupt mask needs to be restored, but it was not,
- clocksource was being restored in clockevent resume callback.This patch fixes issues mentioned above, making suspend/resume handling
in the driver correct.Signed-off-by: Tomasz Figa
Reviewed-by: Sylwester Nawrocki
Tested-by: Heiko Stuebner
Tested-by: Mark Brown
Tested-by: Sylwester Nawrocki
Acked-by: Arnd Bergmann
Acked-by: Daniel Lezcano -
In case of Samsung PWM timer, clocksource MMIO can not be used, because
custom suspend/resume callbacks are required.Signed-off-by: Tomasz Figa
Reviewed-by: Daniel Lezcano
Reviewed-by: Sylwester Nawrocki
Tested-by: Heiko Stuebner
Tested-by: Mark Brown
Tested-by: Sylwester Nawrocki
Acked-by: Arnd Bergmann -
Instead of calculating register every time the timer should be read,
we can just do it one time at initialization and store the address in
driver data.Signed-off-by: Tomasz Figa
Reviewed-by: Sylwester Nawrocki
Tested-by: Heiko Stuebner
Tested-by: Mark Brown
Tested-by: Sylwester Nawrocki
Acked-by: Arnd Bergmann -
PWM channel 4 has its autoreload bit located at different position. This
patch fixes the driver to account for that.This fixes a problem with the clocksource hanging after it overflows because
it is not reloaded any more.Signed-off-by: Tomasz Figa
Reviewed-by: Sylwester Nawrocki
Tested-by: Heiko Stuebner
Tested-by: Mark Brown
Tested-by: Sylwester Nawrocki
Acked-by: Arnd Bergmann -
PWM registers are shared between clocksource and PWM drivers and so can
not be claimed for exclusive use.Signed-off-by: Tomasz Figa
Reviewed-by: Sylwester Nawrocki
Tested-by: Heiko Stuebner
Tested-by: Mark Brown
Tested-by: Sylwester Nawrocki
Acked-by: Arnd Bergmann
05 Aug, 2013
1 commit
-
Pull dmaengine fixes from Vinod Koul:
"Two fixes for slave dmaengine. The first fixes cyclic dma transfers
for pl330 and the second one makes us return the correct error code on
probe"* 'fixes' of git://git.infradead.org/users/vkoul/slave-dma:
dma: pl330: Fix cyclic transfers
pch_dma: fix error return code in pch_dma_probe()
04 Aug, 2013
12 commits
-
Forgot to use the appropriate math64 function.
Signed-off-by: Alex Deucher
Signed-off-by: Dave Airlie -
Pull networking fixes from David Miller:
1) Don't ignore user initiated wireless regulatory settings on cards
with custom regulatory domains, from Arik Nemtsov.2) Fix length check of bluetooth information responses, from Jaganath
Kanakkassery.3) Fix misuse of PTR_ERR in btusb, from Adam Lee.
4) Handle rfkill properly while iwlwifi devices are offline, from
Emmanuel Grumbach.5) Fix r815x devices DMA'ing to stack buffers, from Hayes Wang.
6) Kernel info leak in ATM packet scheduler, from Dan Carpenter.
7) 8139cp doesn't check for DMA mapping errors, from Neil Horman.
8) Fix bridge multicast code to not snoop when no querier exists,
otherwise mutlicast traffic is lost. From Linus Lüssing.9) Avoid soft lockups in fib6_run_gc(), from Michal Kubecek.
10) Fix races in automatic address asignment on ipv6, which can result
in incorrect lifetime assignments. From Jiri Benc.11) Cure build bustage when CONFIG_NET_LL_RX_POLL is not set and rename
it CONFIG_NET_RX_BUSY_POLL to eliminate the last reference to the
original naming of this feature. From Cong Wang.12) Fix crash in TIPC when server socket creation fails, from Ying Xue.
13) macvlan_changelink() silently succeeds when it shouldn't, from
Michael S Tsirkin.14) HTB packet scheduler can crash due to sign extension, fix from
Stephen Hemminger.15) With the cable unplugged, r8169 prints out a message every 10
seconds, make it netif_dbg() instead of netif_warn(). From Peter
Wu.16) Fix memory leak in rtm_to_ifaddr(), from Daniel Borkmann.
17) sis900 gets spurious TX queue timeouts due to mismanagement of link
carrier state, from Denis Kirjanov.18) Validate somaxconn sysctl to make sure it fits inside of a u16.
From Roman Gushchin.19) Fix MAC address filtering on qlcnic, from Shahed Shaikh.
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (68 commits)
qlcnic: Fix for flash update failure on 83xx adapter
qlcnic: Fix link speed and duplex display for 83xx adapter
qlcnic: Fix link speed display for 82xx adapter
qlcnic: Fix external loopback test.
qlcnic: Removed adapter series name from warning messages.
qlcnic: Free up memory in error path.
qlcnic: Fix ingress MAC learning
qlcnic: Fix MAC address filter issue on 82xx adapter
net: ethernet: davinci_emac: drop IRQF_DISABLED
netlabel: use domain based selectors when address based selectors are not available
net: check net.core.somaxconn sysctl values
sis900: Fix the tx queue timeout issue
net: rtm_to_ifaddr: free ifa if ifa_cacheinfo processing fails
r8169: remove "PHY reset until link up" log spam
net: ethernet: cpsw: drop IRQF_DISABLED
htb: fix sign extension bug
macvlan: handle set_promiscuity failures
macvlan: better mode validation
tipc: fix oops when creating server socket fails
net: rename CONFIG_NET_LL_RX_POLL to CONFIG_NET_RX_BUSY_POLL
... -
Flash update routine was improperly checking register read API return value.
Modify register read API and perform proper error check.Signed-off-by: Himanshu Madhani
Signed-off-by: David S. Miller -
o Set link speed and duplex to unknown when link is not up.
Signed-off-by: Rajesh Borundia
Signed-off-by: Shahed Shaikh
Signed-off-by: David S. Miller -
o Do not obtain link speed from register when adapter
link is down.Signed-off-by: Rajesh Borundia
Signed-off-by: Shahed Shaikh
Signed-off-by: David S. Miller -
Driver was not handling external loopback diagnostic
test request.Signed-off-by: Shahed Shaikh
Signed-off-by: David S. Miller -
Signed-off-by: Pratik Pujar
Signed-off-by: Shahed Shaikh
Signed-off-by: David S. Miller -
Signed-off-by: Himanshu Madhani
Signed-off-by: Shahed Shaikh
Signed-off-by: David S. Miller -
o Delete MAC address from the adapter's filter table
if the source MAC address of ingress packet matches.Signed-off-by: Shahed Shaikh
Signed-off-by: David S. Miller -
Driver was passing the address of a pointer instead of
the pointer itself.Signed-off-by: Shahed Shaikh
Signed-off-by: David S. Miller -
IRQF_DISABLED is a no-op by now and should be removed.
Signed-off-by: Mugunthan V N
Signed-off-by: David S. Miller -
Pull hwmon fix from Guenter Roeck:
"Fix chip initialization/configuration in MAX6697 driver"* tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
hwmon: (max6697) fix MAX6581 ideality
03 Aug, 2013
9 commits
-
Without this patch, the values for ideality (register 0x4b) and ideality
selection mask (register 0x4c) are inverted.Signed-off-by: Vivien Didelot
Cc: stable@vger.kernel.org # 3.9+
Signed-off-by: Guenter Roeck -
[ 198.720048] ------------[ cut here ]------------
[ 198.720108] WARNING: CPU: 0 PID: 0 at net/sched/sch_generic.c:255 dev_watchdog+0x229/0x240()
[ 198.720118] NETDEV WATCHDOG: eth0 (sis900): transmit queue 0 timed out
[ 198.720125] Modules linked in: bridge stp llc dmfe sundance 3c59x sis900 mii
[ 198.720159] CPU: 0 PID: 0 Comm: swapper Not tainted 3.11.0-rc3+ #12
[ 198.720167] Hardware name: System Manufacturer System Name/TUSI-M, BIOS ASUS TUSI-M ACPI BIOS
Revision 1013 Beta 001 12/14/2001
[ 198.720175] 000000ff c13fa6b9 c169ddcc c12208d6 c169ddf8 c1031e4d c1664a84 c169de24
[ 198.720197] 00000000 c165f5ea 000000ff c13fa6b9 00000001 000000ff c1664a84 c169de10
[ 198.720217] c1031f13 00000009 c169de08 c1664a84 c169de24 c169de50 c13fa6b9 c165f5ea
[ 198.720240] Call Trace:
[ 198.720257] [] ? dev_watchdog+0x229/0x240
[ 198.720274] [] dump_stack+0x16/0x20
[ 198.720306] [] warn_slowpath_common+0x7d/0xa0
[ 198.720318] [] ? dev_watchdog+0x229/0x240
[ 198.720330] [] warn_slowpath_fmt+0x33/0x40
[ 198.720342] [] dev_watchdog+0x229/0x240
[ 198.720357] [] call_timer_fn+0x78/0x150
[ 198.720369] [] ? internal_add_timer+0x40/0x40
[ 198.720381] [] ? dev_init_scheduler+0xa0/0xa0
[ 198.720392] [] run_timer_softirq+0x10f/0x200
[ 198.720412] [] ? __do_softirq+0x6f/0x210
[ 198.720424] [] ? dev_init_scheduler+0xa0/0xa0
[ 198.720435] [] __do_softirq+0xb8/0x210
[ 198.720467] [] ? _raw_spin_unlock+0x22/0x30
[ 198.720484] [] ? handle_irq+0x25/0xd0
[ 198.720496] [] irq_exit+0x9c/0xb0
[ 198.720508] [] do_IRQ+0x47/0x94
[ 198.720534] [] ? hrtimer_start+0x28/0x30
[ 198.720564] [] common_interrupt+0x31/0x38
[ 198.720589] [] ? default_idle+0x22/0xa0
[ 198.720600] [] arch_cpu_idle+0x17/0x30
[ 198.720631] [] cpu_startup_entry+0xcd/0x180
[ 198.720643] [] rest_init+0xaa/0xb0
[ 198.720654] [] ? reciprocal_value+0x50/0x50
[ 198.720668] [] ? repair_env_string+0x60/0x60
[ 198.720679] [] start_kernel+0x29a/0x350
[ 198.720690] [] ? repair_env_string+0x60/0x60
[ 198.720721] [] i386_start_kernel+0x39/0xa0
[ 198.720729] ---[ end trace 81e0a6266f5c73a8 ]---
[ 198.720740] eth0: Transmit timeout, status 00000204 00000000timer routine checks the link status and if it's up calls
netif_carrier_on() allowing upper layer to start the tx queue
even if the auto-negotiation process is not finished.Also remove ugly auto-negotiation check from the sis900_start_xmit()
CC: Duan Fugang
CC: Ben HutchingsSigned-off-by: Denis Kirjanov
Signed-off-by: David S. Miller -
Pull infiniband/rdma fixes from Roland Dreier:
- Fixes for the newly merged mlx5 hardware driver
- Stack info leak fixes from Dan Carpenter
- Fixes for pkey table handling with SR-IOV
- A few other small things* tag 'rdma-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband:
IPoIB: Fix pkey change flow for virtualization environments
IPoIB: Make sure child devices use valid/proper pkeys
IB/core: Create QP1 using the pkey index which contains the default pkey
mlx5_core: Variable may be used uninitialized
mlx5_core: Implement new initialization sequence
mlx5_core: Fix use after free in mlx5_cmd_comp_handler()
IB/mlx5: Fix stack info leak in mlx5_ib_alloc_ucontext()
IB/mlx5: Fix error return code in init_one()
IB/mlx4: Use default pkey when creating tunnel QPs
RDMA/cma: Only call cma_save_ib_info() for CM REQs
RDMA/cma: Fix accessing invalid private data for UD
RDMA/cma: Fix gcc warning
Revert "RDMA/nes: Fix compilation error when nes_debug is enabled"
IB/qib: Add err_decode() call for ring dump
RDMA/cxgb3: Fix stack info leak in iwch_create_cq()
RDMA/nes: Fix info leaks in nes_create_qp() and nes_create_cq()
RDMA/ocrdma: Fix several stack info leaks
RDMA/cxgb4: Fix stack info leak in c4iw_create_qp()
RDMA/ocrdma: Remove unused include -
Pull GPIO fixes from Linus Walleij:
"Yet another GPIO pull request, fixing the fix from the last one. It
turns out that fixing the boot path for device tree boots on OMAP
breaks out antique systems (such as OMAP1) and we need to find a
better way. So we're reverting that "fix" for the moment and thinking
about something better.Also fixing a build issue on the MSM driver"
* tag 'gpio-for-v3.11-3' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio:
gpio_msm: Fix build error due to missing err.h
Revert "gpio/omap: don't create an IRQ mapping for every GPIO on DT"
Revert "gpio/omap: auto request GPIO as input if used as IRQ via DT"
Revert "gpio/omap: fix build error when OF_GPIO is not defined." -
This message was added in commit a7154cb8 (June 2004, [PATCH] r8169:
link handling and phy reset rework) and is printed every ten seconds
when no cable is connected and runtime power management is disabled.
(Before that commit, "Reset RTL8169s PHY" would be printed instead.)Signed-off-by: Peter Wu
Acked-by: Francois Romieu
Signed-off-by: David S. Miller -
IRQF_DISABLED is a no-op by now and should be
removed.Signed-off-by: Felipe Balbi
Acked-by: Mugunthan V N
Signed-off-by: David S. Miller -
Pull powerpc fixes from Ben Herrenschmidt:
"Here is not quite a handful of powerpc fixes for rc3.The windfarm fix is a regression fix (though not a new one), the PMU
interrupt rename is not a fix per-se but has been submitted a long
time ago and I kept forgetting to put it in (it puts us back in sync
with x86), the other perf bit is just about putting an API/ABI bit
definition in the right place for userspace to consume, and finally,
we have a fix for the VPHN (Virtual Partition Home Node) feature
(notification that the hypervisor is moving nodes around) which could
cause lockups so we may as well fix it now"* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
powerpc/windfarm: Fix noisy slots-fan on Xserve (rm31)
powerpc: VPHN topology change updates all siblings
powerpc/perf: Export PERF_EVENT_CONFIG_EBB_SHIFT to userspace
powerpc: Rename PMU interrupts from CNT to PMI -
Pull parisc updates from Helge Deller:
"The majority of lines changed are due the addition of a defconfig for
the C8000 machine. Even the fix in parisc/kernel/cache.c file is
actually ony a 10-line fix, but the change became bigger (and much
nicer) to avoid errors of the checkpatch script.Here is the short-changelog:
This round of parisc updates includes mostly fixes for the C8000
workstation. We have a new defconfig file for this machine, as well
as fixes for it's serial port, the AGP driver and the cache routines
to cope with the vmas of the FireGL card in a C8000. The sys32.h
header file was not used and as such it's now gone"* 'parisc-3.11-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
parisc: Fix interrupt routing for C8000 serial ports
parisc: Remove arch/parisc/kernel/sys32.h header
parisc: add defconfig for c8000 machine
parisc: agp/parisc-agp: allow binding of user memory to the AGP GART
parisc: Fix cache routines to ignore vma's with an invalid pfn -
Pull HID fixes from Jiri Kosina:
- fix hid-sony PS3 sixaxxis breakage from Benjamin Tissories
- fix hidraw race condition from Yonghua Zheng
- fix/bandaid for rare device enumeration problems of Logitech Unifying
receivers from Nestor Lopez Casado* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:
HID: hidraw: fix improper mutex release
HID: sony: fix HID mapping for PS3 sixaxis controller
HID: hid-logitech-dj: querying_devices was never set
HID: Revert "Revert "HID: Fix logitech-dj: missing Unifying device issue""
