aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2015-08-19perf tools: Fix buildid processingAdrian Hunter1-0/+11
After recording, 'perf record' post-processes the data to determine which buildids are needed. That processing must process the data in time order, if possible, because otherwise dependent events, like forks and mmaps, will not make sense. Signed-off-by: Adrian Hunter <[email protected]> Tested-by: Jiri Olsa <[email protected]> Cc: Linus Torvalds <[email protected]> Link: http://lkml.kernel.org/r/[email protected] [ Moved the sample_id_add to after trying to open the events, use pr_warning ] Signed-off-by: Arnaldo Carvalho de Melo <[email protected]>
2015-08-19perf tools: Make fork event processing more resilientAdrian Hunter1-2/+18
When processing a fork event, the tools lookup the parent thread by its tid. In a couple of cases, it is possible for that thread to have the wrong pid. That can happen if the data is being processed out of order, or if the (fork) event that would have removed the erroneous thread was lost. Assume the latter case, print a dump message, remove the erroneous thread, create a new one with the correct pid, and keep going. Reported-by: Arnaldo Carvalho de Melo <[email protected]> Signed-off-by: Adrian Hunter <[email protected]> Tested-by: Jiri Olsa <[email protected]> Cc: Linus Torvalds <[email protected]> Link: http://lkml.kernel.org/r/[email protected] Signed-off-by: Arnaldo Carvalho de Melo <[email protected]>
2015-08-19perf tools: Avoid deadlock when map_groups are brokenAdrian Hunter1-0/+6
Attempting to clone map groups onto themselves will deadlock. It only happens because of other bugs, but the code should protect itself anyway. Reported-by: Linus Torvalds <[email protected]> Signed-off-by: Adrian Hunter <[email protected]> Tested-by: Jiri Olsa <[email protected]> Link: http://lkml.kernel.org/r/[email protected] [ Use pr_debug() instead of dump_fprintf() ] Signed-off-by: Arnaldo Carvalho de Melo <[email protected]>
2015-08-19Merge tag 'asoc-v4.2-disable-topology' of ↵Takashi Iwai4-0/+24
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus ASoC: Disable topology support for v4.2 The topology code merged in the v4.2 merge window introduced a new ABI which was believed to be suitable for use but subsequently additional work by the developers of this feature have revealed some problems that need to be addressed. In order to allow this to be done without having to support the initial ABI add Kconfig to disable the build and also add some #error statements to the UAPI header so users can't use them.
2015-08-19regulator: qcom_smd: Set n_voltages for pm8941_lnldoAxel Lin1-0/+1
Just setting fixed_uV is not enough, the regulator core will also check n_voltages setting. The fixed_uV only works when n_voltages is 1. Signed-off-by: Axel Lin <[email protected]> Reviewed-by: Bjorn Andersson <[email protected]> Signed-off-by: Mark Brown <[email protected]>
2015-08-19hwmon: (ltc2978) Add support for LTM4675Guenter Roeck3-11/+25
LTM2975 is a dual 9A or single 18A μModule regulator. It is register compatible with LTM4676. Signed-off-by: Guenter Roeck <[email protected]>
2015-08-19hwmon: (ltc2978) Add polling for chips requiring itMichael Jones1-10/+101
Some of the LTC chips supported by this driver have to be polled to ensure that they are ready to accept commands. Signed-off-by: Michael Jones <[email protected]> [Guenter Roeck: simplifications and formatting changes] Signed-off-by: Guenter Roeck <[email protected]>
2015-08-19hwmon: (pmbus) Enable PEC if the controller supports itGuenter Roeck1-0/+5
PMBus controllers optionally support PEC. Configure the driver to use it if available to improve operational security. Suggested-by: Michael Jones <[email protected]> Signed-off-by: Guenter Roeck <[email protected]>
2015-08-19hwmon: (pmbus) Use BIT macroGuenter Roeck5-102/+107
Using the BIT macro makes the code a little easier to read. Signed-off-by: Guenter Roeck <[email protected]>
2015-08-19crypto: cmac - allow usage in FIPS modeStephan Mueller1-0/+2
CMAC is an approved cipher in FIPS 140-2. The patch allows the use of CMAC with TDES and AES in FIPS mode. Signed-off-by: Stephan Mueller <[email protected]> Signed-off-by: Herbert Xu <[email protected]>
2015-08-19crypto: sahara - Use dmam_alloc_coherentVaishali Thakkar1-37/+9
This patch moves the data allocated using dma_alloc_coherent to the corresponding managed interface. To be compatible with the change, various gotos are replaced with direct returns and unneeded labels are dropped. Signed-off-by: Vaishali Thakkar <[email protected]> Signed-off-by: Herbert Xu <[email protected]>
2015-08-19FIRMWARE: bcm47xx_nvram: Fix module license.Axel Lin1-1/+1
Signed-off-by: Axel Lin <[email protected]> Cc: Hauke Mehrtens <[email protected]> Cc: Rafał Miłecki <[email protected]> Cc: Paul Walmsley <[email protected]> Cc: [email protected] Patchwork: https://patchwork.linux-mips.org/patch/11020/ Signed-off-by: Ralf Baechle <[email protected]>
2015-08-19ALSA: hda - Add dock support for Thinkpad W541 (17aa:2211)Rick Sherman1-0/+1
Tested with W541 and Ultra Dock 170w Signed-off-by: Rick Sherman <[email protected]> Signed-off-by: Takashi Iwai <[email protected]>
2015-08-19ALSA: usb-audio: Fix runtime PM unbalanceTakashi Iwai1-1/+1
The fix for deadlock in PM in commit [1ee23fe07ee8: ALSA: usb-audio: Fix deadlocks at resuming] introduced a new check of in_pm flag. However, the brainless patch author evaluated it in a wrong way (logical AND instead of logical OR), thus usb_autopm_get_interface() is wrongly called at probing, leading to unbalance of runtime PM refcount. This patch fixes it by correcting the logic. Reported-by: Hans Yang <[email protected]> Fixes: 1ee23fe07ee8 ('ALSA: usb-audio: Fix deadlocks at resuming') Cc: <[email protected]> [v3.15+] Signed-off-by: Takashi Iwai <[email protected]>
2015-08-19[media] mantis: Fix error handling in mantis_dma_init()Fabio Estevam1-2/+3
Current code assigns 0 to variable 'err', which makes mantis_dma_init() to return success even if mantis_alloc_buffers() fails. Fix it by checking the return value from mantis_alloc_buffers() and propagating it in the case of error. Reported-by: RUC_Soft_Sec <[email protected]> Signed-off-by: Fabio Estevam <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
2015-08-19Revert "[media] rc: rc-ir-raw: Add scancode encoder callback"David Härdeman3-42/+0
This reverts commit 9869da5bacc5c9b865a183bd36c04be76cdd325d. The current code is not mature enough, the API should allow a single protocol to be specified. Also, the current code contains heuristics that will depend on module load order. Signed-off-by: David Härdeman <[email protected]> Acked-by: Antti Seppälä <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
2015-08-19Revert "[media] rc: rc-ir-raw: Add Manchester encoder (phase encoder) helper"David Härdeman2-118/+0
This reverts commit 1d971d927efa2e10194c96ed0475b6d6054342d8. The current code is not mature enough, the API should allow a single protocol to be specified. Also, the current code contains heuristics that will depend on module load order. Signed-off-by: David Härdeman <[email protected]> Acked-by: Antti Seppälä <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
2015-08-19Revert "[media] rc: ir-rc5-decoder: Add encode capability"David Härdeman1-116/+0
This reverts commit a0466f15b4654cf1ac9e387d7c1a401eff494b4f. The current code is not mature enough, the API should allow a single protocol to be specified. Also, the current code contains heuristics that will depend on module load order. Signed-off-by: David Härdeman <[email protected]> Acked-by: Antti Seppälä <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
2015-08-19Revert "[media] rc: ir-rc6-decoder: Add encode capability"David Härdeman1-122/+0
This reverts commit cf257e288ad3a134d4bb809c542a3ae6c87ddfa3. The current code is not mature enough, the API should allow a single protocol to be specified. Also, the current code contains heuristics that will depend on module load order. Signed-off-by: David Härdeman <[email protected]> Acked-by: Antti Seppälä <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
2015-08-19Revert "[media] rc: rc-core: Add support for encode_wakeup drivers"David Härdeman4-27/+1
This reverts commit 0d830b2d1295fee82546d57185da5a6604f11ae2. The current code is not mature enough, the API should allow a single protocol to be specified. Also, the current code contains heuristics that will depend on module load order. Signed-off-by: David Härdeman <[email protected]> Acked-by: Antti Seppälä <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
2015-08-19Revert "[media] rc: rc-loopback: Add loopback of filter scancodes"David Härdeman1-36/+0
This reverts commit 2e4ebde269236da2a41183522127715b6d9d80ce. The current code is not mature enough, the API should allow a single protocol to be specified. Also, the current code contains heuristics that will depend on module load order. Signed-off-by: David Härdeman <[email protected]> Acked-by: Antti Seppälä <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
2015-08-19Revert "[media] rc: nuvoton-cir: Add support for writing wakeup samples via ↵David Härdeman3-129/+0
sysfs filter callback" This reverts commit da7ee60b03bd66bb10974d7444aa444de6391312. The current code is not mature enough, the API should allow a single protocol to be specified. Also, the current code contains heuristics that will depend on module load order. Signed-off-by: David Härdeman <[email protected]> Acked-by: Antti Seppälä <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
2015-08-19s390/dcssblk: correct out of bounds array indexesMartin Schwidefsky1-7/+7
Fix a couple of warnings like this: [linux-4.2-rc7/drivers/s390/block/dcssblk.c:553]: (style) Array index 'j' is used before limits check. Reported-by: David Binderman <[email protected]> Signed-off-by: Martin Schwidefsky <[email protected]>
2015-08-19s390/mm: simplify page table alloc/free codeMartin Schwidefsky1-136/+89
With the removal of the dynamic reallocation of page tables for KVM (see git commit 0b46e0a3ec0d7a04af6a091354f1b5e1b952d70a) the page table allocation / freeing code can be simplified. The page table free code can now use the alloc_pgste bit in the mm context to decide if a page table is 2K or 4K, there is no mix of different sized page tables anymore. This eliminates the need to use "page->_mapcount == 0" to check for 4K page table. Use the lower two bits in page->_mapcount to indicate which 2K fragments of the 4K page are in use. As 31-bit support is gone, remove the two defines ALLOC_ORDER and FRAG_MASK and use the constants directly where appropriate. Signed-off-by: Martin Schwidefsky <[email protected]>
2015-08-19s390/pci: move debug messages to debugfsSebastian Ott1-10/+23
The error messages in pci_insn are for debug purposes only. Move them to the debugfs. Reviewed-by: Gerald Schaefer <[email protected]> Signed-off-by: Sebastian Ott <[email protected]> Signed-off-by: Martin Schwidefsky <[email protected]>
2015-08-19s390/nmi: initialize control register 0 earlierHeiko Carstens1-1/+1
Change machine_check_init() to an early_initcall(). This makes sure it will be called before all other cpus are online and therfore saves us a lot of pointless smp_call_function() calls. The control register settings will be forwarded to the other cpus when they will be brought online. Signed-off-by: Heiko Carstens <[email protected]> Reviewed-by: Hendrik Brueckner <[email protected]> Signed-off-by: Martin Schwidefsky <[email protected]>
2015-08-19s390/zcrypt: use msleep() instead of mdelay()Heiko Carstens2-2/+2
There is no need to busy loop and monopolize a cpu for up to ~2 seconds. The code in question that calls mdelay() is preemptible anyway, so better let the kernel schedule different processes than just looping and causing unnecessary delays. Signed-off-by: Heiko Carstens <[email protected]> Acked-by: Martin Schwidefsky <[email protected]> Signed-off-by: Martin Schwidefsky <[email protected]>
2015-08-19s390/hmcdrv: fix interrupt registrationHeiko Carstens1-2/+2
The z/VM driver sets bit "63-22" in control register zero to one in order to enable the CP Service interrupt (0x2603). However the irq subclass mask that normally corresponds to the CP Service interrupt is "63-54" (== "63-22-32"). So it looks like the author read the documentation with the 32 bit sized cr0 register bit positions (== 22), but didn't realize that bit numbers change, if applied to a 64 bit register (== 54) due to the numbering scheme. Also use irq_subclass_register() instead if ctl_set_bit() since multiple services depend on the service signal subclass mask, which is the correct bit. This also explains why nobody noticed the bug, since the bit is always enabled anyway (e.g. pfault). Signed-off-by: Heiko Carstens <[email protected]> Reviewed-by: Hendrik Brueckner <[email protected]> Acked-by: Martin Schwidefsky <[email protected]> Signed-off-by: Martin Schwidefsky <[email protected]>
2015-08-19s390/setup: fix novx parameterMartin Schwidefsky1-8/+7
The novx parameter disables the vector facility but the HWCAP_S390_VXRS bit in the ELf hardware capabilies is always set if the machine has the vector facility. If the user space program uses the "vx" string in the features field of /proc/cpuinfo to utilize vector instruction it will crash if the novx kernel paramter is set. Convert setup_hwcaps to an arch_initcall and use MACHINE_HAS_VX to decide if the HWCAPS_S390_VXRS bit needs to be set. Cc: [email protected] # 3.18+ Reported-by: Ulrich Weigand <[email protected]> Reviewed-by: Heiko Carstens <[email protected]> Signed-off-by: Martin Schwidefsky <[email protected]>
2015-08-19s390/uaccess: remove uaccess_primary kernel parameterHeiko Carstens1-14/+1
get_user() and put_user() are inline functions in the meantime again. Both will generate the mvcos instruction if compiled with -march=z10 (or greater). The kernel parameter "uaccess_primary" can only change the behavior of out-of-line uaccess functions like copy_from_user() to not use the mvcos instruction, but not for the above named inlined functions. Therefore it is quite useless and the parameter can be removed. Signed-off-by: Heiko Carstens <[email protected]> Signed-off-by: Martin Schwidefsky <[email protected]>
2015-08-19drm/i915: Avoid TP3 on CHVThulasimani,Sivakumar1-8/+22
This patch removes TP3 support on CHV since there is no support for HBR2 on this platform. v2: rename the function to indicate it checks source rates (Jani) v3: update comment to indicate TP3 dependency on HBR2 supported hardware (Jani) Cc: [email protected] # v4.1+ Reviewed-by: Ville Syrjälä <[email protected]> Signed-off-by: Sivakumar Thulasimani <[email protected]> [Jani: fixed a couple of checkpatch warnings.] Signed-off-by: Jani Nikula <[email protected]>
2015-08-19drm/i915: remove HBR2 from chv supported listThulasimani,Sivakumar1-3/+4
This patch removes 5.4Gbps from supported link rate for CHV since it is not supported in it. v2: change the ordering for better readability (Ville) Cc: [email protected] # v4.1+ Reviewed-by: Ville Syrjälä <[email protected]> Signed-off-by: Sivakumar Thulasimani <[email protected]> Signed-off-by: Jani Nikula <[email protected]>
2015-08-19Revert "drm/i915: Add eDP intermediate frequencies for CHV"Thulasimani,Sivakumar1-6/+0
This reverts commit fe51bfb95c996733150c44d21e1c9f4b6322a326. Author: Ville Syrjälä <[email protected]> Date: Thu Mar 12 17:10:38 2015 +0200 CHV does not support intermediate frequencies so reverting the patch that added it in the first place Cc: [email protected] # v4.1+ Reviewed-by: Ville Syrjälä <[email protected]> Signed-off-by: Sivakumar Thulasimani <[email protected]> Signed-off-by: Jani Nikula <[email protected]>
2015-08-19s390: remove unneeded sizeof(void *) comparisonsHeiko Carstens2-2/+2
Remove two more statements which always evaluate to 'false'. These are more leftovers from the 31 bit era. Signed-off-by: Heiko Carstens <[email protected]> Reviewed-by: David Hildenbrand <[email protected]> Signed-off-by: Martin Schwidefsky <[email protected]>
2015-08-19s390/facilities: remove transactional-execution bitsHeiko Carstens1-2/+2
Remove the two facility bits 50 - constrained transactional-execution facility 74 - transactional-execution facility from the required facilities if the kernel is built with -march=zEC12. E.g. z/VM 6.3 doesn't virtualize the TX facility yet. Therefore a kernel built with -march=zEC12 and ipl'ed on a zEC12 machine as a z/VM 6.3 guest will emit a message about the missing facilities and stop working. The kernel however doesn't make use of the TX facility, therefore remove the two TX related facility bits and fix this unpleasant behavior. Signed-off-by: Heiko Carstens <[email protected]> Reviewed-by: David Hildenbrand <[email protected]> Signed-off-by: Martin Schwidefsky <[email protected]>
2015-08-19s390/numa: re-add DIE sched_domain_topology_levelMichael Holzheu1-0/+1
By accident this level has been removed by the NUMA infrastructure patch. For non-NUMA systems with CPUs that span more than one book, this makes the scheduler only use one of the books and the other books remain idle. Fix this and re-add the missing level. For NUMA and non-NUMA we have the following scheduling domains and groups: - SMT (Groups: CPU threads) - MC (Groups: Cores) - BOOK (Groups: Books) For the non-NUMA case we have one last level scheduling domain: - DIE (Groups: Whole system, has all CPUs -> cpu_cpu_mask) For the NUMA case we have the following two last level scheduling domains: - DIE (Groups: NUMA nodes -> cpu_cpu_mask -> returns node siblings) - NUMA (Groups: Whole system, has all CPUs -> created in sched_init_numa()) Fixes: e8054b654bf5 ("s390/numa: add topology tree infrastructure") Reported-and-tested-by: Evgeny Cherkashin <[email protected]> Signed-off-by: Michael Holzheu <[email protected]> Acked-by: Heiko Carstens <[email protected]> Signed-off-by: Martin Schwidefsky <[email protected]>
2015-08-19Merge branch 'x86/asm/urgent' to pick up an entry code fixIngo Molnar1-8/+4
Signed-off-by: Ingo Molnar <[email protected]>
2015-08-19Revert "drm/i915: Allow parsing of variable size child device entries from VBT"Jani Nikula1-23/+4
This reverts commit 047fe6e6db9161e69271f56daaafdaf2add023b1 Author: David Weinehall <[email protected]> Date: Tue Aug 4 16:55:52 2015 +0300 drm/i915: Allow parsing of variable size child device entries from VBT That commit is not valid for v4.2, however it will be valid for v4.3. It was simply queued too early. The referenced regressing commit is just fine until the size of struct common_child_dev_config changes, and that won't happen until v4.3. Indeed, the expected size checks here rely on the increased size of the struct, breaking new platforms. Fixes: 047fe6e6db91 ("drm/i915: Allow parsing of variable size child device entries from VBT") Cc: Daniel Vetter <[email protected]> Cc: David Weinehall <[email protected]> Cc: Ville Syrjälä <[email protected]> Reviewed-by: Ville Syrjälä <[email protected]> Signed-off-by: Jani Nikula <[email protected]>
2015-08-18target: Fix handling of small allocation lengths in REPORT LUNSRoland Dreier1-16/+16
REPORT LUNS should not fail just because the allocation length is less than 16. The relevant section of SPC-4 is: 4.2.5.6 Allocation length The ALLOCATION LENGTH field specifies the maximum number of bytes or blocks that an application client has allocated in the Data-In Buffer. The ALLOCATION LENGTH field specifies bytes unless a different requirement is stated in the command definition. An allocation length of zero specifies that no data shall be transferred. This condition shall not be considered an error. So we should just truncate our response rather than return an error. Signed-off-by: Roland Dreier <[email protected]> Signed-off-by: Spencer Baugh <[email protected]> Signed-off-by: Nicholas Bellinger <[email protected]>
2015-08-18staging/lustre/o2iblnd: remove references to ib_reg_phsy_mr()Oleg Drokin4-325/+19
Removed references to ib_reg_phsy_mr() and PMR which was added to deal with some Chelsio specific scenario, but no longer needed now. Reported-by: Stephen Rothwell <[email protected]> Signed-off-by: Amir Shehata <[email protected]> Signed-off-by: Oleg Drokin <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2015-08-18batman-adv: Fix memory leak on tt add with invalid vlanSven Eckelmann1-1/+4
The object tt_local is allocated with kmalloc and not initialized when the function batadv_tt_local_add checks for the vlan. But this function can only cleanup the object when the (not yet initialized) reference counter of the object is 1. This is unlikely and thus the object would leak when the vlan could not be found. Instead the uninitialized object tt_local has to be freed manually and the pointer has to set to NULL to avoid calling the function which would try to decrement the reference counter of the not existing object. CID: 1316518 Fixes: 354136bcc3c4 ("batman-adv: fix kernel crash due to missing NULL checks") Signed-off-by: Sven Eckelmann <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2015-08-18ARM: add TC2 PM support to multi_v7_defconfigNicolas Pitre1-0/+1
Without this, the multi_v7_defconfig kernel cannot boot all CPUs nor do deep cpuidle power saving on a TC2 board. Signed-off-by: Nicolas Pitre <[email protected]> Signed-off-by: Olof Johansson <[email protected]>
2015-08-18Merge tag 'omap-for-v4.3/dt-pt4-v2' of ↵Olof Johansson4-3/+39
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/dt Fix up bogus RTC compatible change for am4372 and add missing DPLL for am4372 cpsw Ethernet driver. Also add ARM global and local timers for am4372. * tag 'omap-for-v4.3/dt-pt4-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: arm: boot: dts: am4372: add ARM timers and SCU nodes ARM: dts: AM4372: Add the am4372-rtc compatible string ARM: dts: am4372: Set the default clock rate for dpll_clksel_mac_clk clock ARM: dts: AM437X: add dpll_clksel_mac_clk node Signed-off-by: Olof Johansson <[email protected]>
2015-08-18Merge tag 'omap-for-v4.3/soc-pt2' of ↵Olof Johansson2-4/+7
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/soc Fix omap PM regression in Linux next and kill set_irq_flags usage for GPMC. * tag 'omap-for-v4.3/soc-pt2' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: memory: kill off set_irq_flags usage ARM: OMAP2+: Fix power domain operations regression caused by 81xx Signed-off-by: Olof Johansson <[email protected]>
2015-08-18Merge tag 'renesas-dt4-for-v4.3' of ↵Olof Johansson18-28/+470
git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/dt Fourth Round of Renesas ARM Based SoC DT Updates for v4.3 * Enable Clock Domain support of the Clock Pulse Generator (CPG) Module Stop (MSTP) Clocks driver. * tag 'renesas-dt4-for-v4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: ARM: shmobile: r8a7794 dtsi: Add CPG/MSTP Clock Domain ARM: shmobile: r8a7793 dtsi: Add CPG/MSTP Clock Domain ARM: shmobile: r8a7791 dtsi: Add CPG/MSTP Clock Domain ARM: shmobile: r8a7790 dtsi: Add CPG/MSTP Clock Domain ARM: shmobile: r8a7779 dtsi: Add CPG/MSTP Clock Domain ARM: shmobile: r8a7778 dtsi: Add CPG/MSTP Clock Domain ARM: shmobile: r7s72100 dtsi: Add CPG/MSTP Clock Domain clk: shmobile: rz: Add CPG/MSTP Clock Domain support clk: shmobile: rcar-gen2: Add CPG/MSTP Clock Domain support clk: shmobile: r8a7779: Add CPG/MSTP Clock Domain support clk: shmobile: r8a7778: Add CPG/MSTP Clock Domain support clk: shmobile: Add CPG/MSTP Clock Domain support Signed-off-by: Olof Johansson <[email protected]>
2015-08-18Merge tag 'renesas-clk-for-v4.3' of ↵Olof Johansson11-11/+213
git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/drivers Renesas ARM Based SoC CPG/MSTP Clock Driver Updates for v4.3 * Add Clock Domain support to the Clock Pulse Generator (CPG) Module Stop (MSTP) Clocks driver using the generic PM Domain. * tag 'renesas-clk-for-v4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: clk: shmobile: rz: Add CPG/MSTP Clock Domain support clk: shmobile: rcar-gen2: Add CPG/MSTP Clock Domain support clk: shmobile: r8a7779: Add CPG/MSTP Clock Domain support clk: shmobile: r8a7778: Add CPG/MSTP Clock Domain support clk: shmobile: Add CPG/MSTP Clock Domain support Signed-off-by: Olof Johansson <[email protected]>
2015-08-18ARM64: dts: vexpress: Use assigned-clock-parents for sp810Stephen Boyd2-0/+4
The sp810 clk driver is calling the clk consumer APIs from clk_prepare ops to change the parent to a 1 MHz fixed rate clock for each of the clocks that the driver provides. Use assigned-clock-parents for this instead of doing it in the driver to avoid using the consumer API in provider code. This also allows us to remove the usage of clk provider APIs that take a struct clk as an argument from the sp810 driver. Cc: Pawel Moll <[email protected]> Cc: Linus Walleij <[email protected]> Tested-by: Sudeep Holla <[email protected]> Signed-off-by: Stephen Boyd <[email protected]> Signed-off-by: Olof Johansson <[email protected]>
2015-08-18ARM: dts: vexpress: Use assigned-clock-parents for sp810Stephen Boyd2-0/+4
The sp810 clk driver is calling the clk consumer APIs from clk_prepare ops to change the parent to a 1 MHz fixed rate clock for each of the clocks that the driver provides. Use assigned-clock-parents for this instead of doing it in the driver to avoid using the consumer API in provider code. This also allows us to remove the usage of clk provider APIs that take a struct clk as an argument from the sp810 driver. Cc: Pawel Moll <[email protected]> Cc: Linus Walleij <[email protected]> Tested-by: Sudeep Holla <[email protected]> Signed-off-by: Stephen Boyd <[email protected]> Signed-off-by: Olof Johansson <[email protected]>
2015-08-18Merge tag 'imx-defconfig-4.3' of ↵Olof Johansson1-13/+18
git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into next/defconfig The i.MX defconfig updates for 4.3: - Enable i.MX6UL SoC build - Enable powerkey and syscon poweroff support - Build in multi-channel audio support, including i.MX ASRC and CS42xx8 codec drivers. - Enable kexec build, HCIUART_H4 and IKCONFIG_PROC support. * tag 'imx-defconfig-4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: ARM: imx_v6_v7_defconfig: Select CONFIG_IKCONFIG_PROC ARM: imx: imx_v6_v7_defconfig enable imx6ul support ARM: imx_v6_v7_defconfig: enable powerkey and syscon power off ARM: imx_v6_v7_defconfig: Select HCIUART_H4 ARM: imx_v6_v7_defconfig: build in audio driver ARM: imx_v6_v7_defconfig: Enable kexec support Signed-off-by: Olof Johansson <[email protected]>
2015-08-18Merge tag 'imx-dt-4.3' of ↵Olof Johansson33-90/+3739
git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into next/dt The i.MX device tree updates for 4.3: - Add audio and eTSEC device support and update dspi node for LS1021A. - Add initial i.MX6UL and imx6ul-14x14-evk board support, and enable a bunch of device support for i.MX6UL, including RTC, power key, USB, QSPI, and dual FEC. - Enable HDMI and LVDS dual display support for a few imx6qdl boards. - Support of imx6sl-warp board rev1.12, the version which will be publicly available for the customers. - A few i.MX7D device additions, watchdog, cortex-a7 coresight components, RTC, power key, power off. - Some Vybrid updates: add device support for I2C, QSPI, eSDHC etc., update ADC node, and define stdout-path property. - A few random updates for i.MX27 and i.MX53 devices. * tag 'imx-dt-4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: (44 commits) ARM: dts: imx6ul: add snvs power key support ARM: dts: imx6ul: add RTC support ARM: dts: imx6ul: enable GPC as extended interrupt controller ARM: dts: imx6sx: correct property name for wakeup source ARM: dts: add property for maximum ADC clock frequencies ARM: dts: imx7d: enable snvs rtc, onoffkey and power off ARM: dts: imx6ul-14x14-evk: add fec1 and fec2 support ARM: dts: imx: add fec1 and fec2 nodes for SOC i.MX6UL ARM: dts: imx27: add support of internal rtc ARM: dts: vf-colibri: define stdout-path property ARM: dts: ls1021a: Enable the eTSEC ports on QDS and TWR ARM: dts: ls1021a: Add the eTSEC controller nodes ARM: dts: imx6ul: add qspi support ARM: dts: imx6ul: fix low case define in imx6ul-pinfunc.h ARM: dts: imx6ul: add usb host and function support ARM: dts: vfxxx: Add io-channel-cells property for ADC node ARM: dts: ls1021a: Add dts nodes for audio on LS1021A ARM: imx6qdl-sabreauto.dtsi: enable USB support ARM: dts: imx: update snvs to use syscon access register ARM: dts: imx: add imx6ul and imx6ul evk board support ... Signed-off-by: Olof Johansson <[email protected]>