summaryrefslogtreecommitdiff
path: root/arch
AgeCommit message (Collapse)Author
2017-03-31Merge tag 'mvebu-dt64-4.12-1' of git://git.infradead.org/linux-mvebu into ↵Arnd Bergmann
next/dt64 Pull "mvebu dt64 for 4.12 (part 1)" from Gregory CLEMENT: - Add RTC support on Armada 7k/8k - Improve i2c support on Armada 37xx - Add gpio expander and RTC on Armada 3720 board - Improve USB3 support on Armada 37xx - Add network support on Armada 7k/8k * tag 'mvebu-dt64-4.12-1' of git://git.infradead.org/linux-mvebu: arm64: marvell: dts: add PPv2.2 description to Armada 7K/8K ARM64: dts: marvell: armada-3720 add RTC support ARM64: dts: marvell: armada-3720-db: Add phy for USB3 ARM64: dts: marvell: armada-37xx: Add clock resource for USB3 ARM64: dts: marvell: armada-37xx: Fix interrupt mapping for USB3 ARM64: dts: marvell: armada-3720-db: add gpio expander ARM64: dts: marvell: armada37xx: add address and size property for i2c cells arm64: dts: marvell: add RTC description for Armada 7K/8K
2017-03-31Merge tag 'uniphier-dt64-v4.12' of ↵Arnd Bergmann
git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-uniphier into next/dt64 Pull "UniPhier ARM64 SoC DT updates for v4.12" from Masahiro Yamada: - Fix W=* build warnings - Add pinctrl properties to eMMC nodes - Fix resets properties of USB nodes * tag 'uniphier-dt64-v4.12' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-uniphier: arm64: dts: uniphier: re-order reset deassertion of USB of LD11 arm64: dts: uniphier: add pinctrl property to eMMC node for LD11/LD20 arm64: dts: uniphier: move memory node below aliases node arm64: dts: uniphier: fix no unit name warnings
2017-03-31arm64: dts: move from ARCH_VULCAN to ARCH_THUNDER2Jayachandran C
Move and update device tree files as part of transition from Broadcom Vulcan to Cavium ThunderX2. The changes are to: * rename dts/broadcom/vulcan.dtsi to cavium/thunder2-99xx.dtsi, update cpu cores to be "cavium,thunder2", and update SoC to be "cavium,thunderx2-cn9900" * move SoC dts/broadcom/vulcan-eval.dtsi to cavium/thunder2-99xx.dtsi and update board name string * Update dts/broadcom/Makefile not to build vulcan dtbs * Update dts/cavium/Makefile to build thunder2 dtbs No changes to the dts contents except the updated "compatible" and "model" properties. Signed-off-by: Jayachandran C <jnair@caviumnetworks.com> Reviewed-by: Matthias Brugger <matthias.bgg@gmail.com> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2017-03-31Merge tag 'arm-soc/for-4.12/defconfig-arm64' of ↵Arnd Bergmann
http://github.com/Broadcom/stblinux into next/arm64 Pull "Broadcom defconfig-arm64 changes for 4.12" from Florian Fainelli: This pull request contains Broadcom ARM64-based SoCs defconfig updates for 4.12, please pull the following: - Gerd enables the BCM2835 MMC driver which yields better performance than the default one (iProc) * tag 'arm-soc/for-4.12/defconfig-arm64' of http://github.com/Broadcom/stblinux: arm64: set CONFIG_MMC_BCM2835=y in defconfig
2017-03-31Merge tag 'arm-soc/for-4.12/defconfig' of ↵Arnd Bergmann
http://github.com/Broadcom/stblinux into next/defconfig Pull "Broadcom defconfig changes for 4.12" from Florian Fainelli: This pull request contains Broadcom ARM-based SoCs defconfig updates for 4.12, please pull the following: - Gerd enables the BCM2835 MMC driver which yields better performance than the default one (iProc) * tag 'arm-soc/for-4.12/defconfig' of http://github.com/Broadcom/stblinux: arm: set CONFIG_MMC_BCM2835=y in bcm2835_defconfig and multi_v7_defconfig ARM: bcm2835: Enable missing CMA settings for VC4 driver
2017-03-31Merge tag 'arm-soc/for-4.12/soc' of http://github.com/Broadcom/stblinux into ↵Arnd Bergmann
next/soc Pull "Broadcom soc changes for 4.12" from Florian Fainelli: This pull request contains Broadcom ARM-based SoC Kconfig/platform changes for 4.12, please pull the following: - Al enables ZONE_DMA for BRCMSTB platforms since a bunch of on-chip peripherals such as USB (OHCI and EHCI) and SDHCI cannot support physical addresses > 32-bit. This is only required when ARM_LPAE is enabled - Danesh enables ARCH_HAS_HOLES_MEMORYMODEL in order for the kernel to provide a pfn_valid() implementation despite BRCMSTB enabling the SPARSEMEM model by default. - Florian adds support for a new 28nm generation chip: 7260 by updating the runtime detection UART debuggin stub used for DEBUG_LL. * tag 'arm-soc/for-4.12/soc' of http://github.com/Broadcom/stblinux: ARM: brcmstb: Add entry for 7260 ARM: brcmstb: Enable ARCH_HAS_HOLES_MEMORYMODEL ARM: brcmstb: Enable ZONE_DMA for non 64-bit capable peripherals
2017-03-31x86/boot: Include missing header fileZhengyi Shen
Sparse complains about missing forward declarations: arch/x86/boot/compressed/error.c:8:6: warning: symbol 'warn' was not declared. Should it be static? arch/x86/boot/compressed/error.c:15:6: warning: symbol 'error' was not declared. Should it be static? Include the missing header file. Signed-off-by: Zhengyi Shen <shenzhengyi@gmail.com> Acked-by: Kess Cook <keescook@chromium.org> Link: http://lkml.kernel.org/r/1490770820-24472-1-git-send-email-shenzhengyi@gmail.com Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
2017-03-31x86/pci-calgary: Use setup_timer() instead of open coding it.Geliang Tang
Use setup_timer() instead of init_timer() to simplify the code. Signed-off-by: Geliang Tang <geliangtang@gmail.com> Cc: iommu@lists.linux-foundation.org Cc: Jon Mason <jdmason@kudzu.us> Cc: Muli Ben-Yehuda <mulix@mulix.org> Link: http://lkml.kernel.org/r/e4f1888b9e4a87f6a6345f86ed23071483763b22.1490340972.git.geliangtang@gmail.com Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
2017-03-31x86/mce/AMD: Give a name to MCA bank 3 when accessed with legacy MSRsYazen Ghannam
MCA bank 3 is reserved on systems pre-Fam17h, so it didn't have a name. However, MCA bank 3 is defined on Fam17h systems and can be accessed using legacy MSRs. Without a name we get a stack trace on Fam17h systems when trying to register sysfs files for bank 3 on kernels that don't recognize Scalable MCA. Call MCA bank 3 "decode_unit" since this is what it represents on Fam17h. This will allow kernels without SMCA support to see this bank on Fam17h+ and prevent the stack trace. This will not affect older systems since this bank is reserved on them, i.e. it'll be ignored. Tested on AMD Fam15h and Fam17h systems. WARNING: CPU: 26 PID: 1 at lib/kobject.c:210 kobject_add_internal kobject: (ffff88085bb256c0): attempted to be registered with empty name! ... Call Trace: kobject_add_internal kobject_add kobject_create_and_add threshold_create_device threshold_init_device Signed-off-by: Yazen Ghannam <yazen.ghannam@amd.com> Signed-off-by: Borislav Petkov <bp@suse.de> Link: http://lkml.kernel.org/r/1490102285-3659-1-git-send-email-Yazen.Ghannam@amd.com Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
2017-03-31x86/boot: Fix Sparse warning by including required header fileZhengyi Shen
Include declarations for various symbols defined in the error.h header file to fix the following Sparse warnings: arch/x86/boot/compressed/error.c:8:6: warning: symbol 'warn' was not declared. Should it be static? arch/x86/boot/compressed/error.c:15:6: warning: symbol 'error' was not declared. Should it be static? Signed-off-by: Zhengyi Shen <shenzhengyi@gmail.com> Cc: Kees Cook <keescook@chromium.org> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Thomas Gleixner <tglx@linutronix.de> Link: http://lkml.kernel.org/r/1490770820-24472-1-git-send-email-shenzhengyi@gmail.com [ Fixed/enhanced the changelog. ] Signed-off-by: Ingo Molnar <mingo@kernel.org>
2017-03-31x86/boot/32: Flip the logic in test_wp_bit()Borislav Petkov
... to have a natural "likely()" in the code flow and thus have the success case with a branch 99.999% of the times non-taken and function return code following it instead of jumping to it each time. This puts the panic() call at the end of the function - it is going to be practically unreachable anyway. The C code is a bit more readable too. No functionality change. Signed-off-by: Borislav Petkov <bp@suse.de> Cc: Andy Lutomirski <luto@kernel.org> Cc: Borislav Petkov <bp@alien8.de> Cc: Brian Gerst <brgerst@gmail.com> Cc: Denys Vlasenko <dvlasenk@redhat.com> Cc: H. Peter Anvin <hpa@zytor.com> Cc: Josh Poimboeuf <jpoimboe@redhat.com> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: boris.ostrovsky@oracle.com Cc: jgross@suse.com Cc: thgarnie@google.com Link: http://lkml.kernel.org/r/20170330080101.ywsf5rg6ilzu4itk@pd.tnic Signed-off-by: Ingo Molnar <mingo@kernel.org>
2017-03-31x86/platform/intel-mid: Enable Bluetooth support on Intel EdisonAndy Shevchenko
Intel Edison has Wi-Fi + BT module attached and, since it's an SFI-enumerated platform, needs platform data. Here we add bits to enable the Bluetooth device. Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Thomas Gleixner <tglx@linutronix.de> Link: http://lkml.kernel.org/r/20170330100443.22701-1-andriy.shevchenko@linux.intel.com Signed-off-by: Ingo Molnar <mingo@kernel.org>
2017-03-31s390/cpum_cf: make hw_perf_event_update() a void functionHendrik Brueckner
The return code of hw_perf_event_update() is not evaluated by its callers. Hence, simplify the function by removing the return code. Reported-by: Heiko Carstens <heiko.carstens@de.ibm.com> Signed-off-by: Hendrik Brueckner <brueckner@linux.vnet.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
2017-03-31s390/cpu_mf: remove register variable in __ecctr()Hendrik Brueckner
Using a register variable for r4 is not necessary. Let the compiler decide the register to be used. Reported-by: Heiko Carstens <heiko.carstens@de.ibm.com> Signed-off-by: Hendrik Brueckner <brueckner@linux.vnet.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
2017-03-31s390/cpum_cf: correct variable naming (cleanup)Hendrik Brueckner
Make clear that the event definitions relate to the counter facility (cf) and not to the sampling facility (sf). Signed-off-by: Hendrik Brueckner <brueckner@linux.vnet.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
2017-03-31s390/cpum_cf: add IBM z13 counter event namesHendrik Brueckner
Add the event names for the IBM z13/z13s specific CPU-MF counters. Also improve the merging of the generic and model specific events so that their sysfs attribute definitions completely reside in memory. Hence, flagging the generic event attribute definitions as initdata too. Signed-off-by: Hendrik Brueckner <brueckner@linux.vnet.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
2017-03-31s390/cpum_cf: add support for the MT-diagnostic counter set (z13)Hendrik Brueckner
Complete the IBM z13 support and support counters from the MT-diagnostic counter set. Note that this counter set is available only if SMT is enabled. Signed-off-by: Hendrik Brueckner <brueckner@linux.vnet.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
2017-03-31s390/cpum_cf: cleanup event/counter validationHendrik Brueckner
The validate_event() function just checked for reserved counters in particular CPU-MF counter sets. Because the number of counters in counter sets vary among different hardware models, remove the explicit check to tolerate new models. Reserved counters are not accounted and, thus, will return zero. Signed-off-by: Hendrik Brueckner <brueckner@linux.vnet.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
2017-03-31s390/cpum_cf: update counter numbers to ecctr limitsHendrik Brueckner
Use the highest counter number that can be specified for the ecctr (extract CPU counter) instruction for perf. Signed-off-by: Hendrik Brueckner <brueckner@linux.vnet.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
2017-03-31powerpc/powernv: Handle OPAL_WRONG_STATE in opal_get_sensor_data()Vipin K Parashar
OPAL returns OPAL_WRONG_STATE upon failing to provide sensor data due to core sleeping/offline. Add a check in opal_get_sensor_data() for sensor read failure with OPAL_WRONG_STATE return code and return -EIO. Signed-off-by: Vipin K Parashar <vipin@linux.vnet.ibm.com> Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
2017-03-30ARC: fix build warnings with !CONFIG_KPROBESVineet Gupta
| CC lib/nmi_backtrace.o | In file included from ../include/linux/kprobes.h:43:0, | from ../lib/nmi_backtrace.c:17: | ../arch/arc/include/asm/kprobes.h:57:13: warning: 'trap_is_kprobe' defined but not used [-Wunused-function] | static void trap_is_kprobe(unsigned long address, struct pt_regs *regs) | ^~~~~~~~~~~~~~ The warning started with 7d134b2ce6 ("kprobes: move kprobe declarations to asm-generic/kprobes.h") which started including <asm/kprobes.h> unconditionally into <linux/kprobes.h> exposing a stub function for !CONFIG_KPROBES to rest of world. Fix that by making the stub a macro Signed-off-by: Vineet Gupta <vgupta@synopsys.com>
2017-03-30ARCv2: SLC: Make sure busy bit is set properly on SLC flushingAlexey Brodkin
As reported in STAR 9001165532, an SLC control reg read (for checking busy state) right after SLC invalidate command may incorrectly return NOT busy causing software to NOT spin-wait while operation is underway. (and for some reason this only happens if L1 cache is also disabled - as required by IOC programming model) Suggested workaround is to do an additional Control Reg read, which ensures the 2nd read gets the right status. Cc: stable@vger.kernel.org #4.10 Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com> [vgupta: reworte changelog a bit] Signed-off-by: Vineet Gupta <vgupta@synopsys.com>
2017-03-31Merge tag 'samsung-dt-hdmi-cec-4.12' into next/dtKrzysztof Kozlowski
Add to hdmi-cec node a phandle to hdmi node for new hdmi-cec notifier.
2017-03-31ARM: dts: exynos: add HDMI controller phandle to exynos4.dtsiHans Verkuil
Add the new hdmi phandle to exynos4.dtsi. This phandle is needed by the s5p-cec driver to initialize the CEC notifier framework. Tested with my Odroid U3. Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Tested-by: Marek Szyprowski <m.szyprowski@samsung.com> Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>
2017-03-30xtensa: make __pa work with uncached KSEG addressesMax Filippov
When __pa is applied to virtual address in uncached KSEG region the result is incorrect. Fix it by checking if the original address is in the uncached KSEG and adjusting the result. It looks better than masking off bits because pfn_valid would correctly work with new __pa results and it may be made working in noMMU case, once we get definition for uncached memory view. This is required for the dma_common_mmap and DMA debug code to work correctly: they both indirectly use __pa with coherent DMA addresses. In case of DMA debug the visible effect is false reports that an address mapped for DMA is accessed by CPU. Cc: stable@vger.kernel.org Tested-by: Boris Brezillon <boris.brezillon@free-electrons.com> Reviewed-by: Boris Brezillon <boris.brezillon@free-electrons.com> Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
2017-03-30ARM: 8663/1: wire up HWCAP/HWCAP2 feature bits to the CPU modaliasArd Biesheuvel
Wire up the generic support for exposing CPU feature bits via the modalias in /sys/device/system/cpu. This allows udev to automatically load modules for things like crypto algorithms that are implemented using optional instructions. Since it is non-trivial to transparantly support both HWCAP and HWCAP2 capabilities in the cpu_feature() macro (which allows a module's hwcap dependency and init routine to be declared using a single invocation of module_cpu_feature_match()), support only HWCAP2 for now, which covers the capabilities that are most likely to be useful in this manner. Module dependencies on HWCAP will need to be declared explicitly via a MODULE_DEVICE_TABLE(cpu, ...) declaration. Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org> Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
2017-03-30arm64: drop non-existing vdso-offsets.h from .gitignoreMasahiro Yamada
Since commit a66649dab350 ("arm64: fix vdso-offsets.h dependency"), include/generated/vdso-offsets.h is directly generated without arch/arm64/kernel/vdso/vdso-offsets.h. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> Signed-off-by: Will Deacon <will.deacon@arm.com>
2017-03-30arm64: remove redundant header file in current.hShaokun Zhang
Commint 9d84fb27fa1 ("arm64: restore get_current() optimisation") has removed read_sysreg() and asm/sysreg.h is redundant. This patch removes asm/sysreg.h header file. Acked-by: Mark Rutland <mark.rutland@arm.com> Signed-off-by: Shaokun Zhang <zhangshaokun@hisilicon.com> Signed-off-by: Will Deacon <will.deacon@arm.com>
2017-03-30Merge tag 'asoc-fix-v4.11-rc4' of ↵Takashi Iwai
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus ASoC: Fixes for v4.11 A relatively large pile of fixes for mainline, the first since the merge window. The biggest block of changes here by volume is the sun8i-codec set, the driver was newly added in the merge window but it was realized that renaming some of the user visible controls was required so these are being pushed for v4.11 to avoid the original code appearing in a release. Otherwise it's all fairly standard bugfix stuff.
2017-03-30arm64: fix NULL dereference in have_cpu_die()Mark Salter
Commit 5c492c3f5255 ("arm64: smp: Add function to determine if cpus are stuck in the kernel") added a helper function to determine if die() is supported in cpu_ops. This function assumes a cpu will have a valid cpu_ops entry, but that may not be the case for cpu0 is spin-table or parking protocol is used to boot secondary cpus. In that case, there is a NULL dereference if have_cpu_die() is called by cpu0. So add a check for a valid cpu_ops before dereferencing it. Fixes: 5c492c3f5255 ("arm64: smp: Add function to determine if cpus are stuck in the kernel") Signed-off-by: Mark Salter <msalter@redhat.com> Signed-off-by: Will Deacon <will.deacon@arm.com>
2017-03-30Merge tag 'mvebu-defconfig64-4.12-1' of git://git.infradead.org/linux-mvebu ↵Arnd Bergmann
into next/arm64 Pull "mvebu defconfig64 for 4.12 (part 1)" from Gregory CLEMENT: Update arm64 defconfig by adding MVPP2 for Marvell Armada 7K/8K and MVNETA and I2C_PXA for Armada 37xx. * tag 'mvebu-defconfig64-4.12-1' of git://git.infradead.org/linux-mvebu: arm64: defconfig: enable MVPP2 arm64: defconfig: enable I2C_PXA arm64: defconfig: enable MVNETA
2017-03-30Merge tag 'amlogic-defconfig' of ↵Arnd Bergmann
git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic into next/arm64 Pull "Amlogic: defconfig changes for v4.12" from Kevin Hilman: - enable PWM LEDs and LEDs default-on trigger * tag 'amlogic-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic: ARM64: defconfig: enable the leds-pwm driver and default-on trigger
2017-03-30Merge tag 'davinci-for-v4.12/defconfig' of ↵Arnd Bergmann
git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci into next/defconfig Pull "DaVinci defconfig updates for v4.12" from Sekhar Nori: DaVinci defconfig updates for enabling Video capture and display on DA850 and an ADC driver thats used by Lego EV3. * tag 'davinci-for-v4.12/defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci: ARM: davinci_all_defconfig: Enable TI ADS7950 ARM: davinci_all_defconfig: enable IRQ support for pca953x ARM: davinci_all_defconfig: enable VPIF display modules
2017-03-30ARM: mmp: let clk_disable() return immediately if clk is NULLMasahiro Yamada
In many of clk_disable() implementations, it is a no-op for a NULL pointer input, but this is one of the exceptions. Making it treewide consistent will allow clock consumers to call clk_disable() without NULL pointer check. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2017-03-30ARM: w90x900: let clk_disable() return immediately if clk is NULLMasahiro Yamada
In many of clk_disable() implementations, it is a no-op for a NULL pointer input, but this is one of the exceptions. Making it treewide consistent will allow clock consumers to call clk_disable() without NULL pointer check. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> Acked-by: Wan Zongshun <mcuos.com@gmail.com> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2017-03-30ARM: configs: stm32: Set CPU_V7M_NUM_IRQ to max valueAlexandre TORGUE
stm32_defconfig is used for several STM32 MCU: STM32F429, STM32F469, STM32F746 and now STM32H743. Each of MCU listed have different interrupts number mapped on NVIC. STM32F429: 81, STM32F469: 92, STM32F746: 97 and STM32H743: 149. I could set CPU_V7M_NUM_IRQ to 149 but in order to avoid forgetting to update this value for next STM32 MCU I prefer to set it to max value: 240. Signed-off-by: Alexandre TORGUE <alexandre.torgue@st.com> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2017-03-30ARM: dts: clearfog: keep dts alphabetically orderedRussell King
Keep the clearfog DTS file ordered alphabetically - Florian placed the MDIO entry after pinctrl, which mis-orders the file. Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk> Reviewed-by: Andrew Lunn <andrew@lunn.ch> Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
2017-03-30ARM: orion5x: only call into phylib when availableArnd Bergmann
Board code cannot call mdiobus_register_board_info() when phylib or mdio_device is a loadable module: arch/arm/plat-orion/common.o: In function `orion_ge00_switch_init': :(.init.text+0x474): undefined reference to `mdiobus_register_board_info' I had a number of ideas for how this could be solved, but after the MDIO code got split out from PHYLIB it has gotten too hard, so I'm basically giving up, and only call the mdiobus_register_board_info() function if the MDIO layer is built-in to avoid the link error. This is similar to how we handle PHY registration on other ARM platforms. Fixes: 90eff9096c01 ("net: phy: Allow splitting MDIO bus/device support from PHYs") Fixes: 648ea0134069 ("net: phy: Allow pre-declaration of MDIO devices") Signed-off-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
2017-03-30Merge tag 'gemini-multiplat-2' of ↵Arnd Bergmann
git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik into next/soc Pull "Gemini multiplatform updates" from Linus Walleij: - Select the poweroff driver so the system can properly shut down. This driver is merged in the power tree. - Select the right Faraday GPIO block (we renamed it). - Do not select SERIAL_OF_PLATFORM that just create Kconfig warnings on us. We'll put that into the defconfig instead. * tag 'gemini-multiplat-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik: ARM: gemini: don't select SERIAL_OF_PLATFORM ARM: gemini: select the right GPIO block ARM: gemini: select gemini poweroff
2017-03-30Merge tag 'omap-for-v4.12/soc-v2-signed' of ↵Arnd Bergmann
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/soc Pull "SoC changes for omaps for v4.12 merge window" from Tony Lindgren: - Drop PM_SUSPEND_STANDBY - Clean up hwmod code in preparation to eventually dynamically allocating hwmod data based on device tree data - Implement hwmod workaround for dra7 DCAN1 and OTG module to prevent clockdomain from entering HW_AUTO - Configure clockdomain and hwmod for dm81xx SATA - Mark omap_init_rng as __init * tag 'omap-for-v4.12/soc-v2-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: ARM: OMAP2+: mark omap_init_rng as __init ARM: OMAP2+: dm81xx: Add clkdm and hwmod for SATA ARM: DRA7: hwmod_data: Prevent wait_target_disable error for usb_otg_ss ARM: DRA7: hwmod: Fix DCAN1 stuck in transition ARM: OMAP2+ hwmod: Allow modules to disable HW_AUTO ARM: OMAP2+: omap_hwmod: provide space for more hwmod flags ARM: OMAP2+: Make hwmod clkdm_name const ARM: OMAP2+: Remove unused CLOCKACT_TEST_ICLK ARM: OMAP2+: Use list_for_each_entry for hwmod slave_ports ARM: OMAP2+: Remove mostly unused hwmod linkspace ARM: OMAP: PM: Drop useless checks for PM_SUSPEND_STANDBY
2017-03-30Merge tag 'davinci-for-v4.12/soc' of ↵Arnd Bergmann
git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci into next/soc Pull "DaVinci SoC updates for v4.12" from Sekhar Nori: v4.12 SoC updates for DaVinci include necessary pdata-quirks to make video capture and display work on da850. VPIF driver which supports video capture and display on da850 is a legacy driver. It does not have DT equavalents for all things that are used on platform data. Attempts were made to pass data via DT[1], but linux-media does not yet have a good way of describing subdevices in device tree. This is work in progress. As soon as bindings are defined and implementation is available, we can shift to using that. For now we are stuck with using pdata. The pull request also has some clean-up for PM, and a fix for pdata quirks mechanism. [1] https://marc.info/?l=devicetree&m=147982998517384 * tag 'davinci-for-v4.12/soc' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci: ARM: davinci: add pdata-quirks for da850-evm vpif display ARM: da850-evm: add a fixed regulator for the UI board IO expander ARM: davinci: da8xx: add pdata-quirks for VPIF capture ARM: davinci: da8xx: add OF_DEV_AUXDATA() for vpif ARM: davinci: board-da850-evm: add I2C ID for VPIF ARM: davinci: allow having multiple pdata-quirks ARM: davinci: PM: Drop useless check for PM_SUSPEND_STANDBY
2017-03-30Merge tag 'oxnas-arm-soc-for-4.12' of https://github.com/OXNAS/linux into ↵Arnd Bergmann
next/fixes-non-critical Pull "ARM: OXNAS SoC update for 4.12" from Neil Armstrong: - Fix OX820 Kconfig * tag 'oxnas-arm-soc-for-4.12' of https://github.com/OXNAS/linux: ARM: oxnas: remove redundant select CPU_V6K
2017-03-30s390: get rid of zeroing, switch to RAW_COPY_USERAl Viro
[folded a fix from Martin] Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
2017-03-30Merge tag 'tee-drv-for-4.12' of ↵Arnd Bergmann
git://git.linaro.org:/people/jens.wiklander/linux-tee into next/tee Pull "generic TEE subsystem for v4.12" Introduce generic TEE subsystem: - the TEE subsystem itself - an OP-TEE driver using the subsystem - optee bindings - optee node for hi6220-hikey.dts * tag 'tee-drv-for-4.12' of git://git.linaro.org:/people/jens.wiklander/linux-tee: arm64: dt: hikey: Add optee node Documentation: tee subsystem and op-tee driver tee: add OP-TEE driver tee: generic TEE subsystem dt/bindings: add bindings for optee
2017-03-30ARM: imx_v6_v7_defconfig: Select SMSC_PHYLeonard Crestez
The imx6sl-evk board has a LAN8720A ethernet phy supported by SMSC_PHY. Add this driver to the default imx config since the device is present on one of the evaluation boards. This used to work mostly fine with the generic phy driver until commit 0878fff1f42c ("net: phy: Do not perform software reset for Generic PHY"). The fact that soft reset is no longer performed apparently causes RX to sometimes failes which can cause netboot to timeout on DHCP. This is eventually retried and it works after link up/down but can takes 90 seconds to reach the login prompt. This was generated with "make savedefconfig" and it includes a few additional minor cleanups. Signed-off-by: Leonard Crestez <leonard.crestez@nxp.com> Reviewed-by: Fabio Estevam <fabio.estevam@nxp.com> Acked-by: Florian Fainelli <f.fainelli@gmail.com> Acked-by: Fugang Duan <fugang.duan@nxp.com> Signed-off-by: Shawn Guo <shawnguo@kernel.org>
2017-03-30ARM: dts: da850: move spi0_cs3_pin pinconf nodeDavid Lechner
This moves the spi0_cs3_pin pinconf node from the LEGO EV3 file to the common DA850 include file. This node is applicable to any board, and therefore belongs in the common file. Signed-off-by: David Lechner <david@lechnology.com> Signed-off-by: Sekhar Nori <nsekhar@ti.com>
2017-03-30ARM: davinci_all_defconfig: convert to use libata PATASekhar Nori
IDE subsystem has been deprecated since 2009 and the majority (if not all) of Linux distributions have switched to use libata for ATA support exclusively. However there are still some users (mostly old or/and embedded non-x86 systems) that have not converted from using IDE subsystem to libata PATA drivers. This doesn't seem to be good thing in the long-term for Linux as while there is less and less PATA systems left in use: * testing efforts are divided between two subsystems * having duplicate drivers for same hardware confuses users This patch converts davinci_all_defconfig to use libata PATA drivers. Signed-off-by: Sekhar Nori <nsekhar@ti.com> [b.zolnierkie: split from bigger patch + added patch description] Signed-off-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
2017-03-30ARM: davinci: add pata_bk3710 libata driver supportSekhar Nori
Signed-off-by: Sekhar Nori <nsekhar@ti.com> [b.zolnierkie: split from bigger patch + preserved old driver support] Signed-off-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
2017-03-30powerpc/vfio_spapr_tce: Add reference counting to iommu_tableAlexey Kardashevskiy
So far iommu_table obejcts were only used in virtual mode and had a single owner. We are going to change this by implementing in-kernel acceleration of DMA mapping requests. The proposed acceleration will handle requests in real mode and KVM will keep references to tables. This adds a kref to iommu_table and defines new helpers to update it. This replaces iommu_free_table() with iommu_tce_table_put() and makes iommu_free_table() static. iommu_tce_table_get() is not used in this patch but it will be in the following patch. Since this touches prototypes, this also removes @node_name parameter as it has never been really useful on powernv and carrying it for the pseries platform code to iommu_free_table() seems to be quite useless as well. This should cause no behavioral change. Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru> Reviewed-by: David Gibson <david@gibson.dropbear.id.au> Acked-by: Alex Williamson <alex.williamson@redhat.com> Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
2017-03-30powerpc/iommu/vfio_spapr_tce: Cleanup iommu_table disposalAlexey Kardashevskiy
At the moment iommu_table can be disposed by either calling iommu_table_free() directly or it_ops::free(); the only implementation of free() is in IODA2 - pnv_ioda2_table_free() - and it calls iommu_table_free() anyway. As we are going to have reference counting on tables, we need an unified way of disposing tables. This moves it_ops::free() call into iommu_free_table() and makes use of the latter. The free() callback now handles only platform-specific data. As from now on the iommu_free_table() calls it_ops->free(), we need to have it_ops initialized before calling iommu_free_table() so this moves this initialization in pnv_pci_ioda2_create_table(). This should cause no behavioral change. Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru> Reviewed-by: David Gibson <david@gibson.dropbear.id.au> Acked-by: Alex Williamson <alex.williamson@redhat.com> Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>