31 May, 2014
3 commits
-
…/linux into ti-linux-3.15.y
* 'master' of http://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux:
x86_64: expand kernel stack to 16K
firewire: revert to 4 GB RDMA, fix protocols using Memory Space
dm mpath: really fix lockdep warning
dm cache: always split discards on cache block boundaries
Input: synaptics - change min/max quirk table to pnp-id matching
Input: synaptics - add a matches_pnp_id helper function
Input: synaptics - T540p - unify with other LEN0034 models
dm thin: add 'no_space_timeout' dm-thin-pool module param
Input: synaptics - add min/max quirk for the ThinkPad W540
Input: ambakmi - request a shared interrupt for AMBA KMI devices
Input: pxa27x-keypad - fix generating scancode
Input: atmel-wm97xx - only build for AVR32
Input: fix ps2/serio module dependencySigned-off-by: Dan Murphy <DMurphy@ti.com>
-
Pull firewire fix from Stefan Richter:
"A regression fix for the IEEE 1394 subsystem: re-enable IRQ-based
asynchronous request reception at addresses below 128 TB"* tag 'firewire-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394:
firewire: revert to 4 GB RDMA, fix protocols using Memory Space -
Pull device-mapper fixes from Mike Snitzer:
"A dm-cache stable fix to split discards on cache block boundaries
because dm-cache cannot yet handle discards that span cache blocks.Really fix a dm-mpath LOCKDEP warning that was introduced in -rc1.
Add a 'no_space_timeout' control to dm-thinp to restore the ability to
queue IO indefinitely when no data space is available. This fixes a
change in behavior that was introduced in -rc6 where the timeout
couldn't be disabled"* tag 'dm-3.15-fixes-3' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm:
dm mpath: really fix lockdep warning
dm cache: always split discards on cache block boundaries
dm thin: add 'no_space_timeout' dm-thin-pool module param
29 May, 2014
2 commits
-
Undo a feature introduced in v3.14 by commit fcd46b34425d
"firewire: Enable remote DMA above 4 GB". That change raised the
minimum address at which protocol drivers and user programs can register
for request reception from 0x0001'0000'0000 to 0x8000'0000'0000.
It turned out that at least one vendor-specific protocol exists which
uses lower addresses: https://bugzilla.kernel.org/show_bug.cgi?id=76921For the time being, revert most of commit fcd46b34425d so that affected
protocols work like with kernel v3.13 and before. Just keep the valid
documentation parts from the regressing commit, and the ability to
identify controllers which could be programmed to accept >32 bit
physical DMA addresses. The rest of fcd46b34425d should probably be
brought back as an optional instead of default feature.Reported-by: Fabien Spindler
Cc: # 3.14+
Signed-off-by: Stefan Richter -
…/linux into ti-linux-3.15.y
* 'master' of http://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux:
powerpc, kexec: Fix "Processor X is stuck" issue during kexec from ST mode
powerpc: Fix 64 bit builds with binutils 2.24
KVM: s390: announce irqfd capability
KVM: x86: disable master clock if TSC is reset during suspend
KVM: vmx: disable APIC virtualization in nested guests
KVM guest: Make pv trampoline code executable
KVM: PPC: Book3S: ifdef on CONFIG_KVM_BOOK3S_32_HANDLER for 32bit
KVM: PPC: Book3S HV: Add missing code for transaction reclaim on guest exit
KVM: PPC: Book3S: HV: make _PAGE_NUMA take effectSigned-off-by: Dan Murphy <DMurphy@ti.com>
28 May, 2014
1 commit
-
Pull kvm fixes from Paolo Bonzini:
"Small fixes for x86, slightly larger fixes for PPC, and a forgotten
s390 patch. The PPC fixes are important because they fix breakage
that is new in 3.15"* tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
KVM: s390: announce irqfd capability
KVM: x86: disable master clock if TSC is reset during suspend
KVM: vmx: disable APIC virtualization in nested guests
KVM guest: Make pv trampoline code executable
KVM: PPC: Book3S: ifdef on CONFIG_KVM_BOOK3S_32_HANDLER for 32bit
KVM: PPC: Book3S HV: Add missing code for transaction reclaim on guest exit
KVM: PPC: Book3S: HV: make _PAGE_NUMA take effect
26 May, 2014
8 commits
-
…/linux into ti-linux-3.15.y
* 'master' of http://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux:
Documentation: update /proc/stat "intr" count summary
Documentation: update java sample wrapper for java 7
Documentation: update thunderbird email client settings
Documentation: fix typos in drm docbook
AFS: Pass an afs_call* to call->async_workfn() instead of a work_struct*
AFS: Fix kafs module unloading
AFS: Part of afs_end_call() is identical to code elsewhere, so split it
AFS: Fix cache manager service handlersSigned-off-by: Dan Murphy <DMurphy@ti.com>
-
Merge documentation fixes from Randy Dunlap.
* emailed patches from Randy Dunlap :
Documentation: update /proc/stat "intr" count summary
Documentation: update java sample wrapper for java 7
Documentation: update thunderbird email client settings
Documentation: fix typos in drm docbook -
The sum at the beginning of line "intr" includes also unnumbered
interrupts. It implies that the sum at the beginning isn't the sum
of the remainder of the line, not even an estimation.Fixed the documentation to mention that.
This behaviour was added to /proc/stat in commit a2eddfa95919 ("x86:
make /proc/stat account for all interrupts")Signed-off-by: Jan Moskyto Matejka
Signed-off-by: Randy Dunlap
Signed-off-by: Linus Torvalds -
The sample wrapper currently fails on some Java 7 .class files. This
updates the wrapper to properly handle those files.Signed-off-by: Jonathan Callen
Signed-off-by: Randy Dunlap
Signed-off-by: Linus Torvalds -
Added setting to email-clients that is easier to read and is easier to
setup thunderbird. Removed config settings and added GUI settings.Signed-off-by: Paul McQuade
Signed-off-by: Randy Dunlap
Signed-off-by: Linus Torvalds -
Fix spelling typo in DocBook/drm.tmpl
Signed-off-by: Masanari Iida
Signed-off-by: Randy Dunlap
Signed-off-by: Linus Torvalds -
…/linux into ti-linux-3.15.y
* 'master' of http://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux:
hwmon: (ntc_thermistor) Fix OF device ID mapping
hwmon: (ntc_thermistor) Fix dependencies
hwmon: Document temp[1-*]_min_hyst sysfs attribute
[SCSI] scsi_transport_sas: move bsg destructor into sas_rphy_remove
dmaengine: fix dmaengine_unmap failure
dma: mv_xor: Flush descriptors before activating a channel
nfsd4: warn on finding lockowner without stateid's
nfsd4: remove lockowner when removing lock stateid
nfsd4: fix corruption on setting an ACL.Signed-off-by: Dan Murphy <DMurphy@ti.com>
-
Pull hwmon subsystem fixes from Jean Delvare.
* 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
hwmon: (ntc_thermistor) Fix OF device ID mapping
hwmon: (ntc_thermistor) Fix dependencies
hwmon: Document temp[1-*]_min_hyst sysfs attribute
25 May, 2014
1 commit
-
The temp[1-*]_min_hyst sysfs attribute is already implemented by 3
hwmon drivers (adt7x10, lm77 and lm92) but was missing from the
standard interface.Also add temp[1-*]_lcrit_hyst for consistency, even though no driver
implement that one for the time being.Signed-off-by: Jean Delvare
Reviewed-by: Guenter Roeck
24 May, 2014
4 commits
-
…/linux into ti-linux-3.15.y
* 'master' of http://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux: (120 commits)
batman: fix a bogus warning from batadv_is_on_batman_iface()
ipv4: initialise the itag variable in __mkroute_input
bonding: Send ALB learning packets using the right source
bonding: Don't assume 802.1Q when sending alb learning packets.
net: doc: Update references to skb->rxhash
stmmac: Remove unbalanced clk_disable call
ipv6: gro: fix CHECKSUM_COMPLETE support
net_sched: fix an oops in tcindex filter
sparc64: fix format string mismatch in arch/sparc/kernel/sysfs.c
can: peak_pci: prevent use after free at netdev removal
ip_tunnel: Initialize the fallback device properly
vlan: Fix build error wth vlan_get_encap_level()
can: c_can: remove obsolete STRICT_FRAME_ORDERING Kconfig option
MAINTAINERS: Pravin Shelar is Open vSwitch maintainer.
bnx2x: Convert return 0 to return rc
sparc64: Add membar to Niagara2 memcpy code.
bonding: Fix alb mode to only use first level vlans.
bonding: Fix stacked device detection in arp monitoring
macvlan: Fix lockdep warnings with stacked macvlan devices
vlan: Fix lockdep warning with stacked vlan devices.
...Signed-off-by: Dan Murphy <DMurphy@ti.com>
-
Pull networking fixes from David Miller:
"It looks like a sizeble collection but this is nearly 3 weeks of bug
fixing while you were away.1) Fix crashes over IPSEC tunnels with NAT, the latter can reroute
the packet through a non-IPSEC protected path and the code has to
be able to handle SKBs attached to routes lacking an attached xfrm
state. From Steffen Klassert.2) Fix OOPSs in ipv4 and ipv6 ipsec layers for unsupported
sub-protocols, also from Steffen Klassert.3) Set local_df on fragmented netfilter skbs otherwise we won't be
able to forward successfully, from Florian Westphal.4) cdc_mbim ipv6 neighbour code does __vlan_find_dev_deep without
holding RCU lock, from Bjorn Mork.5) local_df test in ip_may_fragment is inverted, from Florian
Westphal.6) jme driver doesn't check for DMA mapping failures, from Neil
Horman.7) qlogic driver doesn't calculate number of TX queues properly, from
Shahed Shaikh.8) fib_info_cnt can drift irreversibly positive if we fail to
allocate the fi->fib_metrics array, from Sergey Popovich.9) Fix use after free in ip6_route_me_harder(), also from Sergey
Popovich.10) When SYSCTL is disabled, we don't handle local_port_range and
ping_group_range defaults properly at all, from Cong Wang.11) Unaccelerated VLAN tagged frames improperly handled by cdc_mbim
driver, fix from Bjorn Mork.12) cassini driver needs nested lock annotations for TX locking, from
Emil Goode.13) On init error ipv6 VTI driver can unregister pernet ops twice,
oops. Fix from Mahtias Krause.14) If macvlan device is down, don't propagate IFF_ALLMULTI changes,
from Peter Christensen.15) Missing NULL pointer check while parsing netlink config options in
ip6_tnl_validate(). From Susant Sahani.16) Fix handling of neighbour entries during ipv6 router reachability
probing, from Duan Jiong.17) x86 and s390 JIT address randomization has some address
calculation bugs leading to crashes, from Alexei Starovoitov and
Heiko Carstens.18) Clear up those uglies with nop patching and net_get_random_once(),
from Hannes Frederic Sowa.19) Option length miscalculated in ip6_append_data(), fix also from
Hannes Frederic Sowa.20) A while ago we fixed a race during device unregistry when a
namespace went down, turns out there is a second place that needs
similar protection. From Cong Wang.21) In the new Altera TSE driver multicast filtering isn't working,
disable it and just use promisc mode until the cause is found.
From Vince Bridgers.22) When we disable router enabling in ipv6 we have to flush the
cached routes explicitly, from Duan Jiong.23) NBMA tunnels should not cache routes on the tunnel object because
the key is variable, from Timo Teräs.24) With stacked devices GRO information in skb->cb[] can be not setup
properly, make sure it is in all code paths. From Eric Dumazet.25) Really fix stacked vlan locking, multiple levels of nesting with
intervening non-vlan devices are possible. From Vlad Yasevich.26) Fallback ipip tunnel device's mtu is not setup properly, from
Steffen Klassert.27) The packet scheduler's tcindex filter can crash because we
structure copy objects with list_head's inside, oops. From Cong
Wang.28) Fix CHECKSUM_COMPLETE handling for ipv6 GRE tunnels, from Eric
Dumazet.29) In some configurations 'itag' in __mkroute_input() can end up
being used uninitialized because of how fib_validate_source()
works. Fix it by explitly initializing itag to zero like all the
other fib_validate_source() callers do, from Li RongQing"* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (116 commits)
batman: fix a bogus warning from batadv_is_on_batman_iface()
ipv4: initialise the itag variable in __mkroute_input
bonding: Send ALB learning packets using the right source
bonding: Don't assume 802.1Q when sending alb learning packets.
net: doc: Update references to skb->rxhash
stmmac: Remove unbalanced clk_disable call
ipv6: gro: fix CHECKSUM_COMPLETE support
net_sched: fix an oops in tcindex filter
can: peak_pci: prevent use after free at netdev removal
ip_tunnel: Initialize the fallback device properly
vlan: Fix build error wth vlan_get_encap_level()
can: c_can: remove obsolete STRICT_FRAME_ORDERING Kconfig option
MAINTAINERS: Pravin Shelar is Open vSwitch maintainer.
bnx2x: Convert return 0 to return rc
bonding: Fix alb mode to only use first level vlans.
bonding: Fix stacked device detection in arp monitoring
macvlan: Fix lockdep warnings with stacked macvlan devices
vlan: Fix lockdep warning with stacked vlan devices.
net: Allow for more then a single subclass for netif_addr_lock
net: Find the nesting level of a given device by type.
... -
…/linux into ti-linux-3.15.y
* 'master' of http://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux: (22 commits)
MAINTAINERS: add closing angle bracket to Vince Bridgers' email address
Documentation: fix DOCBOOKS=... building
ocfs2: fix double kmem_cache_destroy in dlm_init
mm/memory-failure.c: fix memory leak by race between poison and unpoison
wait: swap EXIT_ZOMBIE(Z) and EXIT_DEAD(X) chars in TASK_STATE_TO_CHAR_STR
memcg: fix swapcache charge from kernel thread context
mm: madvise: fix MADV_WILLNEED on shmem swapouts
mm/filemap.c: avoid always dirtying mapping->flags on O_DIRECT
hwpoison, hugetlb: lock_page/unlock_page does not match for handling a free hugepage
parisc: 'renameat2()' doesn't need (or have) a separate compat system call
drm/radeon/pm: don't allow debugfs/sysfs access when PX card is off (v2)
drm/radeon: avoid segfault on device open when accel is not working.
drm/radeon: fix typo in finding PLL params
drm/radeon: fix register typo on si
drm/radeon: fix buffer placement under memory pressure v2
drm/radeon: fix page directory update size estimation
drm/radeon: handle non-VGA class pci devices with ATRM
drm/radeon: fix DCE83 check for mullins
drm/radeon: check VCE relocation buffer range v3
drm/radeon: also try GART for CPU accessed buffers
...Signed-off-by: Dan Murphy <DMurphy@ti.com>
-
Prior to commit 4266129964b8 ("[media] DocBook: Move all media docbook
stuff into its own directory") it was possible to build only a single
(or more) book(s) by calling, for examplemake htmldocs DOCBOOKS=80211.xml
This now fails:
cp: target `.../Documentation/DocBook//media_api' is not a directory
Ignore errors from that copy to make this possible again.
Fixes: 4266129964b8 ("[media] DocBook: Move all media docbook stuff into its own directory")
Signed-off-by: Johannes Berg
Acked-by: Randy Dunlap
Cc: Mauro Carvalho Chehab
Signed-off-by: Andrew Morton
Signed-off-by: Linus Torvalds
23 May, 2014
1 commit
-
In commit 61b905da33 ("net: Rename skb->rxhash to skb->hash"), skb->rxhash
was renamed to skb->hash. Update references in Documentation
accordingly.Signed-off-by: Tobias Klauser
Acked-by: Daniel Borkmann
Signed-off-by: David S. Miller
21 May, 2014
4 commits
-
…/linux into ti-linux-3.15.y
* 'master' of http://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux: (39 commits)
sysfs: make sure read buffer is zeroed
PCI: Wrong register used to check pending traffic
random: fix BUG_ON caused by accounting simplification
clk: tegra: Fix wrong value written to PLLE_AUX
staging: rtl8723au: Do not reset wdev->iftype in netdev_close()
staging: rtl8723au: Use correct pipe type for USB interrupts
PCI: shpchp: Check bridge's secondary (not primary) bus speed
[media] V4L2: fix VIDIOC_CREATE_BUFS in 64- / 32-bit compatibility mode
[media] V4L2: ov7670: fix a wrong index, potentially Oopsing the kernel from user-space
kernfs, sysfs, cgroup: restrict extra perm check on open to sysfs
clk: shmobile: clk-mstp: change to using clock-indices
spi/pxa2xx: Prevent DMA from transferring too many bytes
gpio: mcp23s08: Bug fix of SPI device tree registration.
gpio: ich: set regs and reglen for i3100 and ich6 chipset
spi: core: Don't destroy master queue if we fail to create it
spi: qup: Fix return value checking for pm_runtime_get_sync()
spi: core: Protect DMA code by #ifdef CONFIG_HAS_DMA
[media] media-device: fix infoleak in ioctl media_enum_entities()
clk: Fix slab corruption in clk_unregister()
clk: Fix double free due to devm_clk_register()
...Signed-off-by: Dan Murphy <DMurphy@ti.com>
-
Pull PCI fixes from Bjorn Helgaas:
"These are fixes for an SHPCHP hotplug regression, a "wait for pending
transaction" problem (used in device reset paths), and an email
address update.PCI device hotplug:
- Fix SHPCHP bus speed mismatch issue (Marcel Apfelbaum)Miscellaneous:
- Fix pci_wait_for_pending_transaction() (Gavin Shan)
- Update email address (Ben Hutchings)"* tag 'pci-v3.15-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci:
PCI: Wrong register used to check pending traffic
PCI: shpchp: Check bridge's secondary (not primary) bus speed
PCI: Update my email address -
Pull clock framework fixes from Mike Turquette:
"Clock framework and driver fixes, all of which fix user-visible
regressions.As usual most fixes are for platform-specific clock drivers, but there
are also two fixes to the clk core after recent changes to the way
that clock unregistration is handled"* tag 'clk-fixes-for-linus' of git://git.linaro.org/people/mike.turquette/linux:
clk: tegra: Fix wrong value written to PLLE_AUX
clk: shmobile: clk-mstp: change to using clock-indices
clk: Fix slab corruption in clk_unregister()
clk: Fix double free due to devm_clk_register()
clk: socfpga: fix clock driver for 3.15
clk: divider: Fix best div calculation for power-of-two and table dividers
clk: bcm281xx: don't use unnamed structs or unions -
Commit 85ad643b ("dm thin: add timeout to stop out-of-data-space mode
holding IO forever") introduced a fixed 60 second timeout. Users may
want to either disable or modify this timeout.Allow the out-of-data-space timeout to be configured using the
'no_space_timeout' dm-thin-pool module param. Setting it to 0 will
disable the timeout, resulting in IO being queued until more data space
is added to the thin-pool.Signed-off-by: Mike Snitzer
Cc: stable@vger.kernel.org # 3.14+
20 May, 2014
3 commits
-
…egration-tree/connectivity-ti-linux-kernel into ti-linux-3.15.y
TI-Feature: connectivity
TI-Tree: git://git.ti.com/connectivity-integration-tree/connectivity-ti-linux-kernel.git
TI-Branch: connectivity-ti-linux-3.15.y* 'connectivity-ti-linux-3.15.y' of git://git.ti.com/connectivity-integration-tree/connectivity-ti-linux-kernel:
ARM: dts: am437x-gp-evm: Add ethernet support for GP EVM
ARM: dts: am4372: Add cpsw phy sel dt node
arm/dts: dra7xx: Enable CPSW and MDIO for dra7xx EVM
pinctrl: dra7: dt-bindings: add pin off modes for dra7 SoC
arm/dts: dra7xx: Add CPSW and MDIO module nodes for dra7xx
arm: dra7xx: Add hwmod data for MDIO and CPSW
drivers: net: cpsw-phy-sel: add am43xx platform support
drivers: net: cpsw-phy-sel: add dra7xx support for phy sel
drivers: net: cpsw-phy-sel: initialize priv->devSigned-off-by: Dan Murphy <DMurphy@ti.com>
-
…/linux into ti-linux-3.15.y
* 'master' of http://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux: (24 commits)
arm64: fix pud_huge() for 2-level pagetables
parisc: Improve LWS-CAS performance
parisc: ratelimit userspace segfault printing
drm/i915: Increase WM memory latency values on SNB
drm/i915: restore backlight precision when converting from ACPI
drm/i915: Use the first mode if there is no preferred mode in the EDID
drm/i915/dp: force eDP lane count to max available lanes on BDW
x86-64, modify_ldt: Make support for 16-bit segments a runtime option
asm-generic: remove _STK_LIM_MAX
metag: Remove _STK_LIM_MAX override
parisc,metag: Do not hardcode maximum userspace stack size
metag: Reduce maximum stack size to 256MB
metag: fix memory barriers
x86, mm, hugetlb: Add missing TLB page invalidation for hugetlb_cow()
MAINTAINERS: Add co-maintainer for drivers/irqchip
arm64: use cpu_online_mask when using forced irq_set_affinity
hrtimer: Set expiry time before switch_hrtimer_base()
x86, rdrand: When nordrand is specified, disable RDSEED as well
drm/i915/vlv: reset VLV media force wake request register
drm/i915/SDVO: For sysfs link put directory and target in correct order
...Signed-off-by: Dan Murphy <DMurphy@ti.com>
-
Pull x86 fixes from Peter Anvin.
* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86-64, modify_ldt: Make support for 16-bit segments a runtime option
x86, mm, hugetlb: Add missing TLB page invalidation for hugetlb_cow()
x86, rdrand: When nordrand is specified, disable RDSEED as well
19 May, 2014
2 commits
-
AM43xx phy mode selection is similar to AM33xx platform, so adding only
the compatibility string to the driverSigned-off-by: Mugunthan V N
Signed-off-by: David S. Miller -
Add dra7xx support for selecting the phy mode which is present in control
module of dra7xx SoCSigned-off-by: Mugunthan V N
15 May, 2014
3 commits
-
…/linux into ti-linux-3.15.y
* 'master' of http://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux: (350 commits)
hwmon: (emc1403) Support full range of known chip revision numbers
hwmon: (emc1403) Fix resource leak on module unload
hwmon: (emc1403) fix inverted store_hyst()
arm64: introduce virt_to_pfn
mm, thp: close race between mremap() and split_huge_page()
mm: postpone the disabling of kmemleak early logging
MAINTAINERS: update maintainership of LTP
drivers/rtc/rtc-hym8563.c: set uie_unsupported
MAINTAINERS: update Broadcom ARM tree location and add an SoC family
ARM: dts: i.MX53: Fix ipu register space size
Linux 3.15-rc5
x86, vdso, time: Cast tv_nsec to u64 for proper shifting in update_vsyscall()
x86: Fix typo in MSR_IA32_MISC_ENABLE_LIMIT_CPUID macro
x86: Fix typo preventing msr_set/clear_bit from having an effect
locks: only validate the lock vs. f_mode in F_SETLK codepaths
NFSD: Call ->set_acl with a NULL ACL structure if no entries
tracepoint: Fix use of tracepoint funcs after rcu free
trace: module: Maintain a valid user count
mmc: rtsx: Revert "mmc: rtsx: add support for pre_req and post_req"
x86/intel: Add quirk to disable HPET for the Baytrail platform
...Signed-off-by: Dan Murphy <DMurphy@ti.com>
-
s390 has acquired irqfd support with commit "KVM: s390: irq routing for
adapter interrupts" (84223598778ba08041f4297fda485df83414d57e) but
failed to announce it. Let's fix that.Signed-off-by: Cornelia Huck
Acked-by: Christian Borntraeger
Signed-off-by: Christian Borntraeger -
…egration-tree/connectivity-ti-linux-kernel into ti-linux-3.15.y
TI-Feature: connectivity
TI-Tree: git://git.ti.com/connectivity-integration-tree/connectivity-ti-linux-kernel.git
TI-Branch: connectivity-ti-linux-3.15.y* 'connectivity-ti-linux-3.15.y' of git://git.ti.com/connectivity-integration-tree/connectivity-ti-linux-kernel:
arm: dts: am43x-clock: add tbclk data for ehrpwm.
arm: dts: am33xx-clock: Fix ehrpwm tbclk data.
pwm: core: Rearrange pwm lock.
driver: pwmss: Disable stop clk bit during enable clock call.
arm: dts: am4372: Add hdq device tree data.
arm: hwmod: am437x: Add hwmod data for hdq1w.
arm: omap2: skip device build from platform code for dt.
w1: omap_hdq: Add compatible property for omap hdq driver.
drivers: w1: omap_hdq: cleanup and bug fixes.
ARM: dts: AM437x: Add touchscreen support for GP EVM
ARM: dts: am43x-epos-evm: Correct Touch controller info
Input: pixcir_i2c_ts: Add device tree support
Input: pixcir_i2c_ts: Implement wakeup from suspend
Input: pixcir_i2c_ts: support upto 5 fingers and hardware provided tracking IDs
Input: pixcir_i2c_ts: Use Type-B Multi-Touch protocol
Input: pixcir_i2c_ts: Get rid of pdata->attb_read_val()
Input: pixcir_i2c_ts - initialize interrupt mode and power mode
Input: pixcir_i2c_ts: Use devres managed resource allocationsSigned-off-by: Dan Murphy <DMurphy@ti.com>
13 May, 2014
4 commits
-
Add TPS65917 Bindings.
Signed-off-by: Keerthy
-
Add the various binding files for the TPS65917 family of chips. There is a
top level MFD binding then a seperate binding for regulators IP blocks on chips.Signed-off-by: Keerthy
-
Pull ARM SoC fixes from Olof Johansson:
"Seems like we've had more fixes than usual this release cycle, but
there's nothing in particular that we're doing differently. Perhaps
it's just one of those cycles where more people are finding more
regressions (and/or that the latency of when people actually test
what's been in the tree for a while is catching up so that we get the
bug reports now).The bigger changes here are are for TI and Marvell platforms:
* Timing changes for GPMC (generic localbus) on OMAP causing some
largeish DTS deltas.
* Fixes to window allocation on PCI for mvebu touching drivers/
stuff. Patches have acks from subsystem maintainers where needed.
* A fix from Thomas for a botched DT conversion in drivers/edma.There's a handful of other fixes for the above platforms as well as
sunxi, at91, i.MX. I also included a MAINTAINER update for Broadcom,
and a trivial move of a binding doc.I know you said you'd be offline this week, but I might as well post
it for when you return. :)"I'm not quite offline yet. Doing a few pulls in the last hour before my
internet goes away..* tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (31 commits)
MAINTAINERS: update Broadcom ARM tree location and add an SoC family
ARM: dts: i.MX53: Fix ipu register space size
ARM: dts: kirkwood: fix mislocated pcie-controller nodes
ARM: sunxi: Enable GMAC in sunxi_defconfig
ARM: common: edma: Fix xbar mapping
ARM: sun7i: Fix i2c4 base address
ARM: Kirkwood: T5325: Fix double probe of Codec
ARM: mvebu: enable the SATA interface on Armada 375 DB
ARM: mvebu: specify I2C bus frequency on Armada 370 DB
ARM: mvebu: use qsgmii phy-mode for Armada XP GP interfaces
ARM: mvebu: fix NOR bus-width in Armada XP OpenBlocks AX3 Device Tree
ARM: mvebu: fix NOR bus-width in Armada XP DB Device Tree
ARM: mvebu: fix NOR bus-width in Armada XP GP Device Tree
ARM: dts: AM3517: Disable absent IPs inherited from OMAP3
ARM: dts: OMAP2: Fix interrupts for OMAP2420 mailbox
ARM: dts: OMAP5: Add mailbox dt node to fix boot warning
ARM: OMAP5: Switch to THUMB mode if needed on secondary CPU
ARM: dts: am437x-gp-evm: Do not reset gpio5
ARM: dts: omap3-igep0020: use SMSC9221 timings
PCI: mvebu: split PCIe BARs into multiple MBus windows when needed
... -
With the addition of clock-indices, we need to change the renesas
clock implementation to use these instead of the local definition
of "renesas,clock-indices".Since this will break booting with older device trees, we add a
simple auto-detection of which properties are present.Signed-off-by: Ben Dooks
Acked-by: Geert Uytterhoeven
Reviewed-by: Wolfram Sang
Signed-off-by: Mike Turquette
12 May, 2014
1 commit
-
One can logically expect that when the user has specified "nordrand",
the user doesn't want any use of the CPU random number generator,
neither RDRAND nor RDSEED, so disable both.Reported-by: Stephan Mueller
Cc: Theodore Ts'o
Link: http://lkml.kernel.org/r/21542339.0lFnPSyGRS@myon.chronox.de
Signed-off-by: H. Peter Anvin
11 May, 2014
1 commit
-
…rnel/git/nsekhar/linux-davinci into fixes
Pull "DaVinci fixes for v3.15" from Sekhar Nori:
The patch fixes EDMA crossbar mapping to actually
make it work. The patch has been tagged for stable.* tag 'davinci-fixes-for-v3.15-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci:
ARM: common: edma: Fix xbar mappingSigned-off-by: Olof Johansson <olof@lixom.net>
10 May, 2014
1 commit
-
Fix aliases syntax in device-tree binding example to avoid
copy-paste errors (the alias would be dropped silently).Signed-off-by: Johan Hovold
Signed-off-by: David S. Miller
09 May, 2014
1 commit
-
Add compatible property for omap hdq driver.
Signed-off-by: Sourav Poddar