summaryrefslogtreecommitdiff
path: root/arch
AgeCommit message (Collapse)Author
2015-12-23powerpc/mpc85xx: Add TMU device tree support for T1040/T1042Hongtao Jia
Also add nodes and properties for thermal management support. Meanwhile preprocessor support is needed using thermal of framework. Signed-off-by: Jia Hongtao <hongtao.jia@freescale.com> Reviewed-by: Scott Wood <scottwood@freescale.com> Signed-off-by: Scott Wood <scottwood@freescale.com>
2015-12-24Backmerge drm-fixes merge into Linus's tree into drm-next.Dave Airlie
This merges '5b726e06d6e8309e5c9ef4109a32caf27c71dfc8' into drm-next Just to resolve some merges to make Daniel's life easier. Signed-off-by: DAve Airlie <airlied@redhat.com>
2015-12-23powerpc/fsl_lbc: removal of dead codeRaghav Dogra
The condition check is not used. Signed-off-by: Raghav Dogra <raghav@freescale.com> Signed-off-by: Scott Wood <scottwood@freescale.com>
2015-12-23sparc: Hook up userfaultfd system callMike Kravetz
After hooking up system call, userfaultfd selftest was successful for both 32 and 64 bit version of test. Signed-off-by: Mike Kravetz <mike.kravetz@oracle.com> Signed-off-by: David S. Miller <davem@davemloft.net>
2015-12-23metag: ftrace: Fix the comments for ftrace_modify_codeLi Bin
There is no need to worry about module and __init text disappearing case, because that ftrace has a module notifier that is called when a module is being unloaded and before the text goes away and this code grabs the ftrace_lock mutex and removes the module functions from the ftrace list, such that it will no longer do any modifications to that module's text, the update to make functions be traced or not is done under the ftrace_lock mutex as well. And by now, __init section codes should not been modified by ftrace, because it is black listed in recordmcount.c and ignored by ftrace. Link: http://lkml.kernel.org/r/1449367378-29430-3-git-send-email-huawei.libin@huawei.com Cc: linux-metag@vger.kernel.org Acked-by: James Hogan <james.hogan@imgtec.com> Suggested-by: Steven Rostedt <rostedt@goodmis.org> Signed-off-by: Li Bin <huawei.libin@huawei.com> Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
2015-12-23sh: ftrace: Fix the comments for ftrace_modify_code()Li Bin
There is no need to worry about module and __init text disappearing case, because that ftrace has a module notifier that is called when a module is being unloaded and before the text goes away and this code grabs the ftrace_lock mutex and removes the module functions from the ftrace list, such that it will no longer do any modifications to that module's text, the update to make functions be traced or not is done under the ftrace_lock mutex as well. And by now, __init section codes should not been modified by ftrace, because it is black listed in recordmcount.c and ignored by ftrace. Link: http://lkml.kernel.org/r/1449367378-29430-5-git-send-email-huawei.libin@huawei.com Cc: linux-sh@vger.kernel.org Suggested-by: Steven Rostedt <rostedt@goodmis.org> Signed-off-by: Li Bin <huawei.libin@huawei.com> Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
2015-12-23ia64: ftrace: Fix the comments for ftrace_modify_code()Li Bin
There is no need to worry about module and __init text disappearing case, because that ftrace has a module notifier that is called when a module is being unloaded and before the text goes away and this code grabs the ftrace_lock mutex and removes the module functions from the ftrace list, such that it will no longer do any modifications to that module's text, the update to make functions be traced or not is done under the ftrace_lock mutex as well. And by now, __init section codes should not been modified by ftrace, because it is black listed in recordmcount.c and ignored by ftrace. Link: http://lkml.kernel.org/r/1449214067-12177-2-git-send-email-huawei.libin@huawei.com Cc: linux-ia64@vger.kernel.org Acked-by: Tony Luck <tony.luck@intel.com> Suggested-by: Steven Rostedt <rostedt@goodmis.org> Signed-off-by: Li Bin <huawei.libin@huawei.com> Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
2015-12-23[mips] switch pvc_proc_cleanup() to remove_proc_subtree()Al Viro
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
2015-12-23new helpers: no_seek_end_llseek{,_size}()Al Viro
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
2015-12-23Revert "x86/kvm: On KVM re-enable (e.g. after suspend), update clocks"Thomas Gleixner
This reverts commit 677a73a9aa54. This patch was not meant to be merged and has issues. Revert it. Requested-by: Andy Lutomirski <luto@amacapital.net> Cc: Borislav Petkov <bp@alien8.de> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
2015-12-23Merge tag 'asoc-v4.5' of ↵Takashi Iwai
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-next ASoC: Updates for v4.5 This is quite a busy release on the driver front with a lot of new drivers being added but comparatively quiet on the core side with only one big change going in and that a fairly straightforward refactoring. - Conversion of the array of DAI links to a list by Mengdong Lin, supporting dynamically adding and removing DAI links. - Some more fixes for the topology code, though it is still not final and ready for enabling in production. We really need to get to the point where that can be done. - A pile of changes for Intel SkyLake drivers which hopefully deliver some useful initial functionality for systems with this chipset, though there is more work still to come. - New drivers for a number of Imagination Technologies IPs. - Lots of new features and cleanups for the Renesas drivers. - ANC support for WM5110. - New driver for Atmel class D speaker drivers. - New drivers for Cirrus CS47L24 and WM1831. - New driver for Dialog DA7128. - New drivers for Realtek RT5659 and RT56156. - New driver for Rockchip RK3036. - New driver for TI PC3168A
2015-12-23Merge branch 'for-linus' into for-nextTakashi Iwai
Conflicts: drivers/gpu/drm/i915/intel_pm.c
2015-12-22ARM: OMAP2+: Fix randconfig build warning for dm814_pllss_dataTony Lindgren
Fix warning for arch/arm/mach-omap2/prm_common.c:666:35: warning: ‘dm814_pllss_data’ defined but not used [-Wunused-variable]". This can happen if CONFIG_SOC_TI81XX is not selected. Signed-off-by: Tony Lindgren <tony@atomide.com>
2015-12-23Merge remote-tracking branches 'asoc/topic/samsung', 'asoc/topic/sh', ↵Mark Brown
'asoc/topic/ssm2518' and 'asoc/topic/sti' into asoc-next
2015-12-23Merge remote-tracking branches 'asoc/topic/fsl-spdif', 'asoc/topic/img' and ↵Mark Brown
'asoc/topic/intel' into asoc-next
2015-12-22powerpc/p1010rdb: Update dts for pcie interrupt-mapZhao Qiang
p1010rdb uses the irq[4:5] for inta and intb to pcie, it is active-high, so set it. Signed-off-by: Zhao Qiang <qiang.zhao@freescale.com> Signed-off-by: Scott Wood <scottwood@freescale.com>
2015-12-22powerpc/e6500: add locking to hugetlbScott Wood
e6500 has threads but does not have TLB write conditional. Thus, the hugetlb code needs to take the same lock that the normal TLB miss handlers take, to ensure that the tlbsx and tlbwe are atomic. Signed-off-by: Scott Wood <scottwood@freescale.com>
2015-12-22powerpc/85xx: Enable TWR_P102x in mpc85xx_basic_defconfigli pengbo
Enable TWR_P102x option by default in mpc85xx_basic_defconfig to support p1025twr board. Signed-off-by: Pengbo Li <Pengbo.Li@freescale.com> Signed-off-by: Scott Wood <scottwood@freescale.com>
2015-12-22powerpc/85xx: mpc85xx ADS: remove pci excludeDaniel Walker
This code was reworked in commit, 905e75c46dba5f3061049277e4eb7110beedba43 This change removed the fsl_add_bridge() which originally was above the addition of the pci_exclude_device function. I think the assumption was that the pci_exclude_device would prevent changes to the bridge PCI config after it's been added. It seems it wasn't fully tested on MPC85xx ADS because if you move the fsl_add_bridge() the pci_exclude_device is set in the machine description then you can never update the PCI Config since the exclude prevents it. This disrupts things like DMA. This issue was extensively debugged by David Beazley. Cc: xe-kernel@external.cisco.com Cc: dbeazley@cisco.com Cc: dwalker@fifo99.com Signed-off-by: Daniel Walker <danielwa@cisco.com> Signed-off-by: Scott Wood <scottwood@freescale.com>
2015-12-22powerpc/mpc85xx: Update B4 FMan MURAM sizeIgal Liberman
FMan V3H has 2 different MURAM sizes: In B4860/4420 the MURAM size is 512KB. In T4240 and T2080 the MURAM size is 384KB. The MURAM size in FMan V3H device tree is 384KB. This patch updates the MURAM size for B4 to 512KB. Signed-off-by: Igal Liberman <igal.liberman@freescale.com> Signed-off-by: Scott Wood <scottwood@freescale.com>
2015-12-22ARM: OMAP2+: Add support for dm814x and dra62x usbTony Lindgren
The usb phys are different on dm814x compared to dm816x so we need to use the clkdcoldo output for usb. Cc: Paul Walmsley <paul@pwsan.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
2015-12-22ARM: OMAP2+: Add mmc hwmod entries for dm814xTony Lindgren
Let's add mmc entries for dm814x. To do that, we need to rename some entries to be common for 81xx. Cc: Paul Walmsley <paul@pwsan.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
2015-12-22ARM: OMAP2+: Update 81xx clock and power domains for default, active and sgxTony Lindgren
These offsets seem to be common, so let's rename the defines. And let's set up the default_l3_slow_81xx_clkdm with active and default powerdomains for dm814x. These are needed for usb to work. Cc: Paul Walmsley <paul@pwsan.com> Cc: Tero Kristo <t-kristo@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
2015-12-22powerpc/85xx: Add PCIe controller support for bsc9132qdsHarninder Rai
1. Use machine_arch_initcall to hook mpc85xx_common_publish_devices This can ensure before pcibios_init() is called, pci controllers have been probed and added to the hose_list. 2. Add a workaround for errata A-005434 For the BSC9132, PEX_PEXIWARn[TRGT] for all windows defaults to 0xF, which is mapped to CCSRBAR. However, for other products, 0xF is mapped to the local memory. Therefore, for the BSC9132, any default PCI Express access to the local memory (DDR) will now access the CCSRBAR. This patch changes the mapping of targets of inbound windows PEX_PEXIWARn[TRGT] to the Local address space – 0x0 (from 0xF). Signed-off-by: Harninder Rai <harninder.rai@freescale.com> Signed-off-by: Minghuan Lian <Minghuan.Lian@freescale.com> Signed-off-by: Hou Zhiqiang <B48286@freescale.com> Signed-off-by: Scott Wood <scottwood@freescale.com>
2015-12-22powerpc/fsl: Add PCI node in device tree of bsc9132qdsHarninder Rai
Signed-off-by: Harninder Rai <harninder.rai@freescale.com> Signed-off-by: Minghuan Lian <Minghuan.Lian@freescale.com> Signed-off-by: Hou Zhiqiang <B48286@freescale.com> Signed-off-by: Scott Wood <scottwood@freescale.com>
2015-12-22ARM: dts: Add usb support for j5-eco evmTony Lindgren
Add usb support for j5-eco evm. Cc: Felipe Balbi <balbi@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
2015-12-22ARM: dts: Add usb support for hp t410Tony Lindgren
Add usb support for hp t410 and a fixed regulator for the hub power. Cc: Felipe Balbi <balbi@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
2015-12-22ARM: dts: Add usb support for dm814x-evmTony Lindgren
Add usb support for dm814x-evm Cc: Felipe Balbi <balbi@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
2015-12-22ARM: dts: Add usb support for dm814x and dra62xTony Lindgren
The usb is very much like on am33xx, we just put the some of the componends under scm where they belong. Cc: Felipe Balbi <balbi@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
2015-12-22ARM: dts: Enable emmc on hp t410Tony Lindgren
There's a 2GB emmc on hp t410 that's wired to the sd_2 interface. Note that we also need to configure the evtmux using edma_xbar for edma channels. Let's use the McASP2 channels like the original kernel seems to be doing, most likely the audio on t410 is different from dm814x-evm. Reviewed-by: Peter Ujfalusi <peter.ujfalusi@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
2015-12-22ARM: dts: Add mmc support for dra62x j5-eco evmTony Lindgren
There's mmc interface on j5-eco evm that's wired to the sd_1 interface. Signed-off-by: Tony Lindgren <tony@atomide.com>
2015-12-22ARM: dts: Add mmc support for dm8148-evmTony Lindgren
There is a mmc slot on the dm8148-evm that's wired to the sd_1 interface. Signed-off-by: Tony Lindgren <tony@atomide.com>
2015-12-22ARM: dts: Add mmc device entries for dm814xTony Lindgren
Add mmc device entries for dm814x. Signed-off-by: Tony Lindgren <tony@atomide.com>
2015-12-22ARM: dts: Update edma bindings on dm814x to use edma_xbarTony Lindgren
The edma is the same as on am33xx, except it has four tptc instances. And we need the edma_xbar for at least mmc3, so let's use the edma_xbar and the new binding as suggested by Peter Ujfalusi <peter.ujfalusi@ti.com>. Reviewed-by: Peter Ujfalusi <peter.ujfalusi@ti.com> [tony@atomide.com: updated for ti,edma-memcpy-channels binding] Signed-off-by: Tony Lindgren <tony@atomide.com>
2015-12-22ARM: dts: Add pinctrl macros for dm814xTony Lindgren
Let's add the DM814X_IOPAD macro the same way as we have for dm816x and am33xx as this allows comparing the registers with the documentation easily. The pinctrl bits are yet again different on dm814x. Cc: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Tony Lindgren <tony@atomide.com>
2015-12-22ARM: dts: Add minimal dra62x j5-eco evm supportTony Lindgren
This allows us to boot dra62x j5-eco evm with NFSroot. Signed-off-by: Tony Lindgren <tony@atomide.com>
2015-12-22ARM: dts: Add basic support for dra62x j5-eco SoCTony Lindgren
The dra762x j5-eco is similar to dm814x with a bit different clocks and devices. [tony@atomide.com: updated to leave out adpll clock driver references] Signed-off-by: Tony Lindgren <tony@atomide.com>
2015-12-22Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvmLinus Torvalds
Pull kvm fixes from Paolo Bonzini: - A series of fixes to the MTRR emulation, tested in the BZ by several users so they should be safe this late - A fix for a division by zero - Two very simple ARM and PPC fixes * tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm: KVM: x86: Reload pit counters for all channels when restoring state KVM: MTRR: treat memory as writeback if MTRR is disabled in guest CPUID KVM: MTRR: observe maxphyaddr from guest CPUID, not host KVM: MTRR: fix fixed MTRR segment look up KVM: VMX: Fix host initiated access to guest MSR_TSC_AUX KVM: arm/arm64: vgic: Fix kvm_vgic_map_is_active's dist check kvm: x86: move tracepoints outside extended quiescent state KVM: PPC: Book3S HV: Prohibit setting illegal transaction state in MSR
2015-12-22Merge branch 'for-linus' of ↵Linus Torvalds
git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux Pull s390 fixes from Martin Schwidefsky: "Two late bug fixes for kernel 4.4. Merry Christmas" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux: s390/dis: Fix handling of format specifiers s390/zcrypt: Fix AP queue handling if queue is full
2015-12-22ARM: tegra: Fix suspend hang on Tegra124 ChromebooksJon Hunter
Enabling CPUFreq support for Tegra124 Chromebooks is causing the Tegra124 to hang when resuming from suspend. When CPUFreq is enabled, the CPU clock is changed from the PLLX clock to the DFLL clock during kernel boot. When resuming from suspend the CPU clock is temporarily changed back to the PLLX clock before switching back to the DFLL. If the DFLL is operating at a much lower frequency than the PLLX when we enter suspend, and so the CPU voltage rail is at a voltage too low for the CPUs to operate at the PLLX frequency, then the device will hang. Please note that the PLLX is used in the resume sequence to switch the CPU clock from the very slow 32K clock to a faster clock during early resume to speed up the resume sequence before the DFLL is resumed. Ideally, we should fix this by setting the suspend frequency so that it matches the PLLX frequency, however, that would be a bigger change. For now simply disable CPUFreq support for Tegra124 Chromebooks to avoid the hang when resuming from suspend. Fixes: 9a0baee960a7 ("ARM: tegra: Enable CPUFreq support for Tegra124 Chromebooks") Signed-off-by: Jon Hunter <jonathanh@nvidia.com> Signed-off-by: Olof Johansson <olof@lixom.net>
2015-12-22ARM: OMAP2+: Fix SoC detection for dra62x j5-ecoTony Lindgren
We can boot dra62x j5-eco using the dm814x code as the clocks and devices are mapped in the device tree. The dra62x is also known as jacinto 5 eco. We may want to add separate soc_is macros for dra62x if needed, but this gets us to the point where we can boot dra62x with just dts changes. Let's also print out the unknown hawkeye register to make things a bit easier for new SoC variants. Signed-off-by: Tony Lindgren <tony@atomide.com>
2015-12-22um: Fix pointer castMickaël Salaün
Fix a pointer cast typo introduced in v4.4-rc5 especially visible for the i386 subarchitecture where it results in a kernel crash. [ Also removed pointless cast as per Al Viro - Linus ] Fixes: 8090bfd2bb9a ("um: Fix fpstate handling") Signed-off-by: Mickaël Salaün <mic@digikod.net> Cc: Jeff Dike <jdike@addtoit.com> Acked-by: Richard Weinberger <richard@nod.at> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2015-12-22QE: Move QE from arch/powerpc to drivers/socZhao Qiang
ls1 has qe and ls1 has arm cpu. move qe from arch/powerpc to drivers/soc/fsl to adapt to powerpc and arm Signed-off-by: Zhao Qiang <qiang.zhao@freescale.com> Signed-off-by: Scott Wood <scottwood@freescale.com>
2015-12-22ARM: dts: tango4: Initial device treesMarc Gonzalez
This device tree was tested on a Sigma Designs SMP8758 Vantage-1172 Rev E1 development board. Signed-off-by: Marc Gonzalez <marc_gonzalez@sigmadesigns.com> Reviewed-by: Kevin Hilman <khilman@linaro.org> Signed-off-by: Olof Johansson <olof@lixom.net>
2015-12-22ARM: tango4: Initial platform supportMarc Gonzalez
Support Sigma Designs ARM-based (specifically, Cortex-A9 MPCore r3p0) Tango4 "Secure Media Processor" platforms: smp8756, smp8758, smp8759 (8756 is single-core, the latter are dual-core). Note: 8758 vs 8759: same chip, different package. Support for older MIPS-based platforms can be found elsewhere: https://github.com/mansr/linux-tangox Signed-off-by: Marc Gonzalez <marc_gonzalez@sigmadesigns.com> Reviewed-by: Kevin Hilman <khilman@linaro.org> Signed-off-by: Olof Johansson <olof@lixom.net>
2015-12-22QE: use subsys_initcall to init qeZhao Qiang
Use subsys_initcall to init qe to adapt ARM architecture. Remove qe_reset from PowerPC platform file. Signed-off-by: Zhao Qiang <qiang.zhao@freescale.com> Signed-off-by: Scott Wood <scottwood@freescale.com>
2015-12-22QE/CPM: move muram management functions to qe_commonZhao Qiang
QE and CPM have the same muram, they use the same management functions. Now QE support both ARM and PowerPC, it is necessary to move QE to "driver/soc", so move the muram management functions from cpm_common to qe_common for preparing to move QE code to "driver/soc" Signed-off-by: Zhao Qiang <qiang.zhao@freescale.com> Signed-off-by: Scott Wood <scottwood@freescale.com>
2015-12-22CPM/QE: use genalloc to manage CPM/QE muramZhao Qiang
Use genalloc to manage CPM/QE muram instead of rheap. Signed-off-by: Zhao Qiang <qiang.zhao@freescale.com> Signed-off-by: Scott Wood <scottwood@freescale.com>
2015-12-22Merge tag 'sunxi-dt-for-4.5-2' of ↵Olof Johansson
https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux into next/dt Allwinner DT patches, round 2 Mostly some audio codec patches to enable it on more boards, and a bunch devices activation (Ethernet, touchscreen, backlights). One more board has been added too. * tag 'sunxi-dt-for-4.5-2' of https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux: ARM: dts: sun5i: Add dts file for the Empire Electronix D709 tablet ARM: dts: sun7i: Enable gmac on Wits Pro A20 DKT ARM: dt: sun7i: Enable audio codec on MK808C ARM: sunxi: dt: enable audio codec on mk802 ARM: dts: sun7i: Add PA gpio pin to Wexler TAB7200 tablet ARM: dts: sun7i: Add backlight node to Wexler TAB7200 tablet ARM: dts: sun7i: Enable touchscreen on Wexler TAB7200 tablet ARM: dts: sun7i: Enable PWM controller on Wexler TAB7200 tablet ARM: dts: sun4i: gemei-g9: Enable PA GPIO pin configuration ARM: dts: sun4i: Enable onboard codec used on the pov protab2-ips9 tablet ARM: dts: sun5i: Enable onboard codec used on the UTOO P66 tablet Signed-off-by: Olof Johansson <olof@lixom.net>
2015-12-22Merge tag 'at91-4.5-dt2' of ↵Olof Johansson
git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux into next/dt Second batch of DT changes for 4.5: - addition of sound nodes for sama5d2 and the xplained - addition of a new patform by Landis+Gyr: VInCo * tag 'at91-4.5-dt2' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux: ARM: at91/dt: sama5d2 Xplained: add pdmic node ARM: at91/dt: sama5d2: add pdmic node ARM: at91/dt: Add Support for the L+G VInCo platform Signed-off-by: Olof Johansson <olof@lixom.net>