summaryrefslogtreecommitdiff
path: root/arch
AgeCommit message (Collapse)Author
2017-06-19arm64: renesas: salvator-common: sound clock-frequency needs descending orderKuninori Morimoto
It will be used ADG clock initial settings, and will be sound codec's initial system clock which needs maximum clock frequency. Thus, descending order is required Fixes: d37d2b3c0ec2708a ("arm64: dts: salvator-x: add 12288000 for sound ADG") Fixes: 0b03c32db03d63de ("arm64: dts: r8a7795: salvator-x: Add support for R-Car H3 ES2.0") Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2017-06-19Merge tag 'armsoc-fixes' of ↵Linus Torvalds
git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc Pull ARM SoC fixes from Olof Johansson: "Stream of fixes has slowed down, only a few this week: - Some DT fixes for Allwinner platforms, and addition of a clock to the R_CCU clock controller that had been missed. - A couple of small DT fixes for am335x-sl50" * tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: arm64: allwinner: a64: Add PLL_PERIPH0 clock to the R_CCU ARM: sunxi: h3-h5: Add PLL_PERIPH0 clock to the R_CCU ARM: dts: am335x-sl50: Fix cannot claim requested pins for spi0 ARM: dts: am335x-sl50: Fix card detect pin for mmc1 arm64: allwinner: h5: Remove syslink to shared DTSI ARM: sunxi: h3/h5: fix the compatible of R_CCU
2017-06-18Merge tag 'at91-4.12-fixes' of ↵Olof Johansson
git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux into next/soc Bring in the fixes branch to avoid a merge conflict between new SoC options and the build fix adding CONFIG_AMR_CPU_SUSPEND. Fixes for 4.12: Fix two compilation issues * tag 'at91-4.12-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux: ARM: at91: select CONFIG_ARM_CPU_SUSPEND memory: atmel-ebi: mark PM ops as __maybe_unused Signed-off-by: Olof Johansson <olof@lixom.net>
2017-06-19crypto: glue_helper - Delete some dead codeDan Carpenter
We checked (nbytes < bsize) inside the loops so it's not possible to hit the "goto done;" here. This code is cut and paste from other slightly different loops where we don't have the check inside the loop. Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
2017-06-18Merge tag 'imx-defconfig-4.13' of ↵Olof Johansson
git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into next/defconfig The i.MX defconfig updates for 4.13: - Enable i.MX7 ADC driver support. - Enable THERMAL_WRITABLE_TRIPS, so that i.MX thermal driver can set trip points for testing. - CONFIG_DEBUG_FS gets lost by accident because of a change around CONFIG_RCU_TRACE. Re-enable it explicitly. - Enable MXS LRADC driver and CONFIG_CGROUPS for mxs_defconfig. - Enable more common cpufreq governors to help test cpufreq driver. * tag 'imx-defconfig-4.13' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: ARM: imx_v6_v7_defconfig: Select CONFIG_IMX7D_ADC ARM: imx_v6_v7_defconfig: Set THERMAL_WRITABLE_TRIPS=y for testing ARM: imx_v6_v7_defconfig: Explicitly restore CONFIG_DEBUG_FS ARM: mxs_defconfig: Re-enable MXS LRADC ARM: mxs_defconfig: Enable CONFIG_CGROUPS ARM: imx_v6_v7_defconfig: Enable cpufreq governors Signed-off-by: Olof Johansson <olof@lixom.net>
2017-06-18Merge tag 'imx-dt64-4.13' of ↵Olof Johansson
git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into next/dt64 The Freescale arm64 device tree updates for 4.13: - A series from NXP employee Li Yang that updates the copyright claims to comply with company policy. - A patch-set from Madalin Bucur that adds Data Path Acceleration Architecture (DPAA) QBMan and FMan. Quite a few .dtsi files are created for SoCs with different DPAA configuration to include the devices as needed. - Enable UHS-I SD and eMMC support for LS1046A and LS208xA RDB/QDS boards. - Enable TMU device for thermal management support on LS1088A. - Update SATA device node for LS1088A with correct compatible and ECC register bit. - A few small random device tree updates. * tag 'imx-dt64-4.13' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: (22 commits) arm64: dts: ls1088a: update sata node dt-bindings: ahci-fsl-qoriq: add ls1088a chip name to the list arm64: dts: ls1012a: Add coreclk arm64: dts: ls1046a: Add dis_rxdet_inp3_quirk property to USB3 node arm64: dts: ls208xa: disable SD UHS-I modes by default on RDB arm64: dts: ls1043a: Add generic compatible string for I2C EEPROM arm64: dts: add LS1046A DPAA FMan nodes arm64: dts: add LS1043A DPAA FMan support arm64: dts: add DPAA FMan nodes arm64: dts: add LS1046A DPAA QBMan nodes arm64: dts: add LS1043A DPAA QBMan nodes arm64: dts: add DPAA QBMan portals arm64: dts: ls1088a: Add TMU device tree support arm64: dts: ls1088a: update the sata node arm64: dts: Add flash node for ls1088a qds and rdb arm64: dts: ls1088a: add esdhc node arm64: dts: ls1012a: add eSDHC nodes arm64: dts: ls208xa: support SD UHS-I on RDB and eMMC HS200 on QDS arm64: dts: ls1046a: support SD UHS-I and eMMC HS200 on RDB mmc: dt: add compatible into eSDHC required properties ... Signed-off-by: Olof Johansson <olof@lixom.net>
2017-06-18Merge tag 'imx-dt-4.13' of ↵Olof Johansson
git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into next/dt The i.MX device tree updates for 4.13: - New board support: Gateworks Ventana GW5600, Technexion Pico i.MX7D Board. - A series from Alexandre Belloni to correct the vendor prefix for rv4162 compatible. - A patch-set from Andrey Smirnov ot enable PCIe support for i.MX7 and imx7d-sdb board. - Increase the SGTL5000 LRCLK pad strength to fix a random audio channel swapping seen on imx6qdl-wandboard and imx6qdl-colibri boards. - Clean up non-existing property 'enable-active-low' from fixed regulator device nodes. - Correct GPIO polarity for Ethernet PHY and PCI reset lines, even though device drivers do not use the polarity for now. - Add Wifi and Bluetooth support for imx7d-sdb board. - Adopt the i.MX6Q/DL DT to the new and more flexible GPC binding. - Update zii-rdu2 device tree source to use #include "..." for local inclusion. - A series from Philipp Zabel and Steve Longerbeam to enable video capture support for imx6qdl platforms. - A number of small random updates on various board support. * tag 'imx-dt-4.13' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: (47 commits) ARM: dts: imx6q-cm-fx6: add sdio wifi/bt nodes ARM: dts: ls1021a: update the clockgen node ARM: dts: imx6-sabreauto: add the ADV7180 video decoder ARM: dts: imx6-sabreauto: add pinctrl for gpt input capture ARM: dts: imx6-sabreauto: add reset-gpios property for max7310_b ARM: dts: imx6-sabreauto: create i2cmux for i2c3 ARM: dts: imx6-sabresd: add OV5642 and OV5640 camera sensors ARM: dts: imx6-sabrelite: add OV5642 and OV5640 camera sensors ARM: dts: imx6qdl-sabrelite: remove erratum ERR006687 workaround ARM: dts: imx6qdl: add capture-subsystem device ARM: dts: imx6qdl: Add video multiplexers, mipi_csi, and their connections ARM: dts: imx6qdl: Add compatible, clocks, irqs to MIPI CSI-2 node ARM: dts: imx6qdl: add multiplexer controls ARM: dts: imx6: Fix PCI GPIO reset polarity ARM: dts: imx7d-sdb: Add Bluetooth support ARM: dts: imx7d-sdb: Add Wifi support ARM: dts: imx7d-sdb: Adjust the regulator nodes ARM: dts: imx: Fix Ethernet PHY reset polarity ARM: dts: imx7: Fix typo in watchdog pin name ARM: dts: vf610-zii: Add switch eeprom-length properties ... Signed-off-by: Olof Johansson <olof@lixom.net>
2017-06-18Merge tag 'imx-soc-4.13' of ↵Olof Johansson
git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into next/soc The i.MX SoC updates for 4.13: - Select GPCv2 for i.MX7 SoCs to get imx-gpcv2 irqchip driver built for i.MX7 platforms by default. - A couple of patches from Leonard to add IMX6ULL cpu check and get suspend/resume work on IMX6ULL. * tag 'imx-soc-4.13' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: ARM: imx6ull: Make suspend/resume work like on 6ul ARM: imx: Add MXC_CPU_IMX6ULL and cpu_is_imx6ull ARM: imx: Select GPCv2 for i.MX7 Signed-off-by: Olof Johansson <olof@lixom.net>
2017-06-18Merge tag 'mvebu-dt64-4.13-1' of git://git.infradead.org/linux-mvebu into ↵Olof Johansson
next/dt64 mvebu dt64 for 4.13 (part 1) - Improve the mcbin support (Armada 8040 based board): add sdhci and the second 1G port - Improve crypro nodes description on Aramda 7K/8K - Use new binding for ap806 clocks - Improve mdio nodes and add xmdio on Aramda 7K/8K - Add second SGCI node on Armada 37xx - Improve the description of the Armada 3720 DB board * tag 'mvebu-dt64-4.13-1' of git://git.infradead.org/linux-mvebu: arm64: dts: marvell: add xmdio nodes for 7k/8k arm64: dts: marvell: add a comment on the cp110 slave node status arm64: dts: marvell: remove cpm crypto nodes from dts files arm64: dts: marvell: cp110: enable the crypto engine at the SoC level arm64: dts: marvell: armada-3720-db: Add vqmmc regulator for SD slot arm64: dts: marvell: Enable second SDHCI controller in Armada 37xx arm64: dts: marvell: armada-37xx: Use angle bracket for each register set arm64: dts: marvell: armada-37xx: Align the compatible string arm64: dts: marvell: armada-3720-db: Add information about the V2 board arm64: dts: marvell: armada-3720-db: Sort the dts node alphabetically arm64: dts: marvell: disable the mdio nodes by default arm64: dts: marvell: explicitly enable the mdio nodes for 7k/8k DB arm64: dts: marvell: add dma-mask in crypto nodes for 7k/8k arm64: dts: marvell: 8040-mcbin: Enable 1GB Ethernet arm64: dts: marvell: cp110: add required clocks for mdio interface arm64: dts: marvell: use new binding for the system controller on ap806 arm64: dts: marvell: remove clock-output-names on ap806 arm64: dts: marvell: add second 1G port on the Armada 8040 DB arm64: dts: marvell: mcbin: add sdhci arm64: dts: marvell: add clocks for Armada AP806 XOR engines Signed-off-by: Olof Johansson <olof@lixom.net>
2017-06-18Merge tag 'mvebu-dt-4.13-1' of git://git.infradead.org/linux-mvebu into next/dtOlof Johansson
mvebu dt for 4.13 (part 1) - Add Linksys WRT3200ACM (Rango) support - Add PWM properties for gpio on Aramda XP and 38x - A couple of minor updates for the 98dx3236 and 98dx4251 * tag 'mvebu-dt-4.13-1' of git://git.infradead.org/linux-mvebu: ARM: dts: turris-omnia: Add generic compatible string for I2C EEPROM ARM: dts: mvebu: add support for Linksys WRT3200ACM (Rango) ARM: dts: armada-385-linksys: fixup button node names ARM: dts: armada-385-linksys: group pins in pinctrl ARM: dts: armada-385-linksys: partition layout is board specific ARM: dts: armada-385-linksys: use binary unit prefixes ARM: dts: armada-385-linksys: drop legacy DSA bindings ARM: dts: armada-385-linksys: usb3 label cleanup ARM: dts: armada-385-linksys: bm pools by label order ARM: dts: armada-385-linksys: drop redundant properties in dependants ARM: dts: armada-385-linksys: flatten dependants ARM: dts: armada-385-linksys: label nodes ARM: dts: armada-385-linksys: flatten dtsi ARM: dts: mvebu: disable the rtc on 98dx3236 SoC ARM: dts: mvebu: add missing interrupt to 98dx4251 switch ARM: dts: armada-xp: Use pwm-fan rather than gpio-fan ARM: dts: mvebu: Add PWM properties for armada-38x ARM: dts: mvebu: Add PWM properties to .dtsi files Signed-off-by: Olof Johansson <olof@lixom.net>
2017-06-18Merge tag 'mvebu-defconfig-4.13-1' of git://git.infradead.org/linux-mvebu ↵Olof Johansson
into next/defconfig mvebu defconfig for 4.13 Enable the SENSORS_PWM_FAN in mvebu_v7_defconfig support by gpio driver since the previous release * tag 'mvebu-defconfig-4.13-1' of git://git.infradead.org/linux-mvebu: ARM: mvebu: Enable SENSORS_PWM_FAN in defconfig Signed-off-by: Olof Johansson <olof@lixom.net>
2017-06-18Merge tag 'at91-ab-4.13-dt' of ↵Olof Johansson
git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux into next/dt DT for 4.13 - Switch to the new NAND binding - A few non urgent fixes * tag 'at91-ab-4.13-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux: ARM: dts: at91: sama5d2_xplained: remove wrong memory node ARM: dts: at91: sama5d2_xplained: add pwm controller ARM: dts: at91: Add the NOR flash available on sama5d3 dev kits ARM: dts: at91: Switch to the new NAND bindings ARM: dts: at91: Declare EBI/NAND controllers dt-bindings: mtd: atmel-nand: Document the nfc-io bindings ARM: dts: at91-sama5d4: use IRQ_TYPE_* to specify irq flags dts: gpio_atmel: adapt binding doc to reality ARM: dts: at91: sama5d2: add m_can nodes ARM: dts: at91: Add generic compatible string for I2C EEPROM Signed-off-by: Olof Johansson <olof@lixom.net>
2017-06-18Merge tag 'at91-ab-4.13-soc' of ↵Olof Johansson
git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux into next/soc SoC for 4.13: - New suspend/resume mode for sama5d2 - Initial support for armv7m based SoCs * tag 'at91-ab-4.13-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux: ARM: at91: remove atmel_nand_data ARM: at91: fix at91_suspend_entering_slow_clock link error ARM: at91: debug: add samv7x support ARM: at91: add armv7m SoC detection ARM: at91: handle CONFIG_PM for armv7m configurations ARM: at91: Add armv7m support ARM: at91: Document armv7m compatibles ARM: at91: Documentation: add armv7m families ARM: at91: pm: fallback to slowclock when backup mode fails ARM: at91: pm: allow selecting standby and suspend modes ARM: at91: pm: Add sama5d2 backup mode Signed-off-by: Olof Johansson <olof@lixom.net>
2017-06-18Merge tag 'renesas-soc-for-v4.13' of ↵Olof Johansson
https://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/soc Renesas ARM Based SoC Updates for v4.13 * Use GENPD_FLAG_ALWAYS_ON in pm-rmobile * tag 'renesas-soc-for-v4.13' of https://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: ARM: shmobile: pm-rmobile: Use GENPD_FLAG_ALWAYS_ON Signed-off-by: Olof Johansson <olof@lixom.net>
2017-06-18Merge tag 'renesas-dt2-for-v4.13' of ↵Olof Johansson
https://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/dt Second Round of Renesas ARM Based SoC DT Updates for v4.13 Cleanup: * Correct PCI bus dtc warnings for r8a779x SoCs Enhancements: * Add support for iWave G20D-Q7 board based on RZ/G1M SoC * Add support for GR-Peach board based on r7s72100 SoC * Add composite video and HDMI input to gose board * tag 'renesas-dt2-for-v4.13' of https://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: ARM: dts: r8a779x: Fix PCI bus dtc warnings ARM: dts: iwg20d-q7: Add support for iWave G20D-Q7 board based on RZ/G1M ARM: dts: iwg20m: Add iWave RZG1M Qseven SOM ARM: dts: gose: add composite video input ARM: dts: r7s72100: Add support for GR-Peach ARM: dts: gose: add HDMI input Signed-off-by: Olof Johansson <olof@lixom.net>
2017-06-18Merge tag 'renesas-arm64-dt2-for-v4.13' of ↵Olof Johansson
https://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/dt64 Second Round of Renesas ARM64 Based SoC DT Updates for v4.13 * Add reset control properties for audio to r9a779[56] SoCs * Add add DMA for IIC_DVFS to r9a779[56] SoCs * Add support for Salvator-XS and H3ULCB with R-Car H3 (r8a7795) ES2 * Add missing index to PWM pinctrl subnode name to Salvator-X board * Add 12288000 for sound ADG to Salvator-X and ULCB boards * tag 'renesas-arm64-dt2-for-v4.13' of https://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: arm64: dts: r8a7796: Add reset control properties for audio arm64: dts: r8a7795: Add reset control properties for audio arm64: dts: renesas: Add support for Salvator-XS with R-Car H3 ES2.0 arm64: dts: renesas: Add common Salvator-XS board support arm64: dts: renesas: Extract common Salvator-X/XS board support arm64: dts: salvator-x: Add missing index to PWM pinctrl subnode name arm64: dts: r8a7795: h3ulcb: Add support for R-Car H3 ES2.0 arm64: dts: r8a7796: add DMA for IIC_DVFS arm64: dts: r8a7795: add DMA for IIC_DVFS arm64: dts: ulcb: add 12288000 for sound ADG arm64: dts: salvator-x: add 12288000 for sound ADG Signed-off-by: Olof Johansson <olof@lixom.net>
2017-06-18Merge tag 'renesas-arm64-defconfig-for-v4.13' of ↵Olof Johansson
https://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/arm64 Renesas ARM64 Based SoC Defconfig Updates for v4.13 * Enable Simple Sound Card support * tag 'renesas-arm64-defconfig-for-v4.13' of https://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: arm64: defconfig: enable Simple Sound Card support Signed-off-by: Olof Johansson <olof@lixom.net>
2017-06-18Merge tag 'at91-ab-4.13-defconfig' of ↵Olof Johansson
git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux into next/defconfig defconfig for 4.13: - Switch sama5 to be tickless in idle and enable hrtimer - Add MCAN * tag 'at91-ab-4.13-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux: ARM: configs: at91: add MCAN driver to sama5_defconfig ARM: configs: at91: enable HIGH_RES_TIMERS ARM: configs: at91: make system tickless when idle Signed-off-by: Olof Johansson <olof@lixom.net>
2017-06-18Merge tag 'qcom-soc-for-4.13' of ↵Olof Johansson
git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux into next/soc Qualcomm ARM Based SoC Updates for v4.13 * Add debug UART addresses for IPQ4019 * tag 'qcom-soc-for-4.13' of git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux: ARM: debug: qcom: add UART addresses to Kconfig help for IPQ4019 Signed-off-by: Olof Johansson <olof@lixom.net>
2017-06-18Merge tag 'qcom-dts-for-4.13' of ↵Olof Johansson
git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux into next/dt Qualcomm Device Tree Changes for v4.13 * Fix IPQ4019 i2c0 node * Add GSBI7 on IPQ8064 * Add misc APQ8060 devices * Fixup USB related devices on APQ8064 and MSM8974 * tag 'qcom-dts-for-4.13' of git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux: ARM: dts: add core I2C devices to the APQ8060 Dragonboard ARM: dts: add GSBI8 defines to the MSM8660 family ARM: dts: Qualcomm APQ8060 DragonBoard ALS sensor ARM: dts: add XOADC and IIO HWMON to MSM8660/APQ8060 ARM: dts: qcom: ipq4019: fix i2c_0 node ARM: dts: qcom: add gsbi7 serial to ipq8064 SoC device tree ARM: dts: qcom-apq8064: Collapse usb support into one node ARM: dts: qcom-msm8974: Add HS usb node and OTG detection mechanisms ARM: dts: qcom: add charger otg regulator ARM: dts: qcom: Remove s4/5vs1,2 from RPM pm8941 control Signed-off-by: Olof Johansson <olof@lixom.net>
2017-06-18Merge tag 'qcom-defconfig-for-4.13' of ↵Olof Johansson
git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux into next/defconfig Qualcomm ARM Based defconfig Updates for v4.13 * Enable IPQ4019 clock and pinctrl * tag 'qcom-defconfig-for-4.13' of git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux: ARM: qcom_defconfig: Enable IPQ4019 clock and pinctrl Signed-off-by: Olof Johansson <olof@lixom.net>
2017-06-18Merge tag 'qcom-arm64-for-4.13' of ↵Olof Johansson
git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux into next/dt64 Qualcomm ARM64 Updates for v4.13 * Fix APQ8016 SBC WLAN LED * Add MSM8996 CPU node * Add MSM8992 SMEM and fixed regulator * Fixup MSM8916 USB support * tag 'qcom-arm64-for-4.13' of git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux: arm64: dts: apq8016-sbc: Correct WLAN LED default-trigger arm64: dts: msm8996: Add CPU clock controller node arm64: dts: smem enablement for msm8992 arm64: dts: msm8992 add fixed regulator arm64: dts: qcom: Collapse usb support into one node Signed-off-by: Olof Johansson <olof@lixom.net>
2017-06-19KVM: PPC: Book3S HV: Virtualize doorbell facility on POWER9Paul Mackerras
On POWER9, we no longer have the restriction that we had on POWER8 where all threads in a core have to be in the same partition, so the CPU threads are now independent. However, we still want to be able to run guests with a virtual SMT topology, if only to allow migration of guests from POWER8 systems to POWER9. A guest that has a virtual SMT mode greater than 1 will expect to be able to use the doorbell facility; it will expect the msgsndp and msgclrp instructions to work appropriately and to be able to read sensible values from the TIR (thread identification register) and DPDES (directed privileged doorbell exception status) special-purpose registers. However, since each CPU thread is a separate sub-processor in POWER9, these instructions and registers can only be used within a single CPU thread. In order for these instructions to appear to act correctly according to the guest's virtual SMT mode, we have to trap and emulate them. We cause them to trap by clearing the HFSCR_MSGP bit in the HFSCR register. The emulation is triggered by the hypervisor facility unavailable interrupt that occurs when the guest uses them. To cause a doorbell interrupt to occur within the guest, we set the DPDES register to 1. If the guest has interrupts enabled, the CPU will generate a doorbell interrupt and clear the DPDES register in hardware. The DPDES hardware register for the guest is saved in the vcpu->arch.vcore->dpdes field. Since this gets written by the guest exit code, other VCPUs wishing to cause a doorbell interrupt don't write that field directly, but instead set a vcpu->arch.doorbell_request flag. This is consumed and set to 0 by the guest entry code, which then sets DPDES to 1. Emulating reads of the DPDES register is somewhat involved, because it requires reading the doorbell pending interrupt status of all of the VCPU threads in the virtual core, and if any of those VCPUs are running, their doorbell status is only up-to-date in the hardware DPDES registers of the CPUs where they are running. In order to get a reasonable approximation of the current doorbell status, we send those CPUs an IPI, causing an exit from the guest which will update the vcpu->arch.vcore->dpdes field. We then use that value in constructing the emulated DPDES register value. Signed-off-by: Paul Mackerras <paulus@ozlabs.org>
2017-06-19KVM: PPC: Book3S HV: Allow userspace to set the desired SMT modePaul Mackerras
This allows userspace to set the desired virtual SMT (simultaneous multithreading) mode for a VM, that is, the number of VCPUs that get assigned to each virtual core. Previously, the virtual SMT mode was fixed to the number of threads per subcore, and if userspace wanted to have fewer vcpus per vcore, then it would achieve that by using a sparse CPU numbering. This had the disadvantage that the vcpu numbers can get quite large, particularly for SMT1 guests on a POWER8 with 8 threads per core. With this patch, userspace can set its desired virtual SMT mode and then use contiguous vcpu numbering. On POWER8, where the threading mode is "strict", the virtual SMT mode must be less than or equal to the number of threads per subcore. On POWER9, which implements a "loose" threading mode, the virtual SMT mode can be any power of 2 between 1 and 8, even though there is effectively one thread per subcore, since the threads are independent and can all be in different partitions. Signed-off-by: Paul Mackerras <paulus@ozlabs.org>
2017-06-19KVM: PPC: Book3S HV: Context-switch HFSCR between host and guest on POWER9Paul Mackerras
This adds code to allow us to use a different value for the HFSCR (Hypervisor Facilities Status and Control Register) when running the guest from that which applies in the host. The reason for doing this is to allow us to trap the msgsndp instruction and related operations in future so that they can be virtualized. We also save the value of HFSCR when a hypervisor facility unavailable interrupt occurs, because the high byte of HFSCR indicates which facility the guest attempted to access. We save and restore the host value on guest entry/exit because some bits of it affect host userspace execution. We only do all this on POWER9, not on POWER8, because we are not intending to virtualize any of the facilities controlled by HFSCR on POWER8. In particular, the HFSCR bit that controls execution of msgsndp and related operations does not exist on POWER8. The HFSCR doesn't exist at all on POWER7. Signed-off-by: Paul Mackerras <paulus@ozlabs.org>
2017-06-19KVM: PPC: Book3S HV: Don't let VCPU sleep if it has a doorbell pendingPaul Mackerras
It is possible, through a narrow race condition, for a VCPU to exit the guest with a H_CEDE hypercall while it has a doorbell interrupt pending. In this case, the H_CEDE should return immediately, but in fact it puts the VCPU to sleep until some other interrupt becomes pending or a prod is received (via another VCPU doing H_PROD). This fixes it by checking the DPDES (Directed Privileged Doorbell Exception Status) bit for the thread along with the other interrupt pending bits. Signed-off-by: Paul Mackerras <paulus@ozlabs.org>
2017-06-18Merge tag 'davinci-for-v4.13/defconfig-2' of ↵Olof Johansson
git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci into next/defconfig Enable mtdtests and USB NCM gadget in DaVinci kernel (as modules). * tag 'davinci-for-v4.13/defconfig-2' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci: ARM: davinci_all_defconfig: enable USB CDC NCM gadget ARM: davinci_all_defconfig: enable mtdtests Signed-off-by: Olof Johansson <olof@lixom.net>
2017-06-18Merge tag 'davinci-for-v4.13/soc-2' of ↵Olof Johansson
git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci into next/soc A patch to fix warnings resulting from DT conversion of VPIF driver. * tag 'davinci-for-v4.13/soc-2' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci: ARM: davinci: fix const warnings Signed-off-by: Olof Johansson <olof@lixom.net>
2017-06-18Merge tag 'tegra-for-4.13-arm64-dt' of ↵Olof Johansson
git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into next/dt64 arm64: tegra: Device tree changes for v4.13-rc1 This adds the CCPLEX cluster on Tegra186, which is used to initiate CPU frequency and voltage transitions. Also included is a bit of cleanup for PCI related device tree content, in preparation for a future DTC release that has additional checks for the PCI bus. * tag 'tegra-for-4.13-arm64-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux: arm64: dts: nvidia: fix PCI bus dtc warnings arm64: tegra: Add CCPLEX_CLUSTER area in Tegra186 Signed-off-by: Olof Johansson <olof@lixom.net>
2017-06-19KVM: PPC: Book3S HV: Enable guests to use large decrementer mode on POWER9Paul Mackerras
This allows userspace (e.g. QEMU) to enable large decrementer mode for the guest when running on a POWER9 host, by setting the LPCR_LD bit in the guest LPCR value. With this, the guest exit code saves 64 bits of the guest DEC value on exit. Other places that use the guest DEC value check the LPCR_LD bit in the guest LPCR value, and if it is set, omit the 32-bit sign extension that would otherwise be done. This doesn't change the DEC emulation used by PR KVM because PR KVM is not supported on POWER9 yet. This is partly based on an earlier patch by Oliver O'Halloran. Signed-off-by: Paul Mackerras <paulus@ozlabs.org>
2017-06-18Merge tag 'tegra-for-4.13-arm-dt' of ↵Olof Johansson
git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into next/dt ARM: tegra: Device tree changes for v4.13-rc1 This removes support for the Whistler board, which only a handful of people ever had access to and which doesn't provide any features over other Tegra20 devices that we support. Also this cleans up some PCI related device tree content in preparation for a future DTC release that has additional checks for the PCI bus. * tag 'tegra-for-4.13-arm-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux: ARM: dts: tegra: fix PCI bus dtc warnings ARM: tegra: remove Whistler support Signed-off-by: Olof Johansson <olof@lixom.net>
2017-06-18Merge tag 'hisi-arm64-dt-for-4.13-v2' of ↵Olof Johansson
git://github.com/hisilicon/linux-hisi into next/dt64 ARM64: DT: Hisilicon SoC DT updates for 4.13 - Add and update Hi3660-Hikey960 board, Hi3660 PCIe RC, Hi6421v530 MFD and Hi3660 MMC binding - Add and refine devices support for Hi3660-Hikey 960 including clock, reset, I2C, GPIO, UART, Bluetooth, RTC, Power Key, LED, SPI, timer, PMIC, regulator, sd/sdio and WiFi - Add k3-dma and i2s/hdmi audio support based on audio-card-graph method for Hikey board * tag 'hisi-arm64-dt-for-4.13-v2' of git://github.com/hisilicon/linux-hisi: (21 commits) arm64: dts: hi6220: Add k3-dma and i2s/hdmi audio support arm64: dts: hi3660-hikey960: add nodes for WiFi arm64: dts: hi3660: add sd/sdio device nodes dt-bindings: mmc: dw_mmc-k3: add document of hi3660 mmc arm64: dts: hikey960: add device node for pmic and regulators dt-bindings: mfd: hi6421: Add hi6421v530 compatible string arm64: dts: hisi: add kirin pcie node dt-bindings: PCI: hisi: Add document for PCIe of Kirin SoCs arm64: dts: hi3660: add sp804 timer node arm64: dts: hi3660: add spi device nodes arm64: dts: hikey960: add LED nodes arm64: dts: hi3660: add power key dts node arm64: dts: hi3660: Add pl031 rtc node arm64: dts: hikey960: add WL1837 Bluetooth device node arm64: dts: hi3660: Add uarts nodes arm64: dts: hi3660: add gpio dtsi file for Hisilicon Hi3660 SOC arm64: dts: Add I2C nodes for Hi3660 arm64: dts: hi3660: add resources for clock and reset arm64: dts: hikey960: pinctrl: add more pinmux and pinconfig arm64: dts: hisilicon: update compatible string for hikey960 ... Signed-off-by: Olof Johansson <olof@lixom.net>
2017-06-18Merge tag 'juno-updates-4.13' of ↵Olof Johansson
git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into next/dt64 ARMv8 Vexpress/Juno DT updates for v4.13 1. Adds support for Coresight CPU debug MMIO interface on all Juno variants. 2. Enables support for few SMMUs on Juno which were previously disabled waiting for IOMMU-backed DMA API support to be stabilised. * tag 'juno-updates-4.13' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux: arm64: dts: juno: enable some SMMUs arm64: dts: juno: add coresight CPU debug nodes Signed-off-by: Olof Johansson <olof@lixom.net>
2017-06-18Merge tag 'pxa-for-4.13' of https://github.com/rjarzmik/linux into next/socOlof Johansson
This is the pxa changes for v4.13 cycle. This cycle is a minor fixes one, with : - Coccinelle found improvements - magician getting touchscreen driver support. * tag 'pxa-for-4.13' of https://github.com/rjarzmik/linux: ARM: pxa: Delete an error message for a failed memory allocation in pxa3xx_u2d_probe() ARM: pxa: Improve a size determination in pxa3xx_u2d_probe() ARM: pxa: Delete an error message for a failed memory allocation in pxa_pm_init() ARM: pxa: magician: Add support for ADS7846 touchscreen Signed-off-by: Olof Johansson <olof@lixom.net>
2017-06-18Merge tag 'omap-for-v4.13/soc-v4-signed' of ↵Olof Johansson
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/soc SoC changes for omap variants for v4.13 merge window: - PM clean-up in preparation of adding am335x/am437x PM support - Fixes for issues found by Coccinelle - Legacy code removal now that everything boots in device tree only mode - Interconnect changes in preparation of moving clkctrl clocks to be managed by clkctrl clock driver - Interconnect changes to add omap4 crypto acceclerator support * tag 'omap-for-v4.13/soc-v4-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: (27 commits) ARM: OMAP4: hwmod_data: add SHAM crypto accelerator ARM: OMAP4: hwmod data: add des ARM: OMAP4: hwmod data: add aes2 ARM: OMAP4: hwmod data: add aes1 ARM: OMAP2+: Remove unused legacy code for n8x0 ARM: OMAP2+: Remove unused legacy code for watchdog ARM: OMAP2+: Remove unused legacy code for interconnects ARM: OMAP2+: Remove unused legacy code for PRM ARM: OMAP2+: Remove unused legacy code for io.c ARM: OMAP2+: Remove unused legacy code for McBSP ARM: OMAP2+: SmartReflex: Delete an error message for a failed memory allocation in two functions ARM: OMAP2+: Use kcalloc() in sr_set_nvalues() ARM: OMAP2+: Improve a size determination in sr_dev_init() ARM: OMAP2+: Delete an error message for a failed memory allocation in two functions ARM: OMAP2+: Remove unused legacy code for device init ARM: OMAP2+: Remove unused legacy code for PMU ARM: OMAP2+: Remove unused legacy code for opp ARM: OMAP2+: hwmod: populate clkctrl clocks for hwmods if available ARM: OMAP4: cminst: add support for clkdm_xlate_address ARM: omap2+: clockdomain: add clkdm_xlate_address ... Signed-off-by: Olof Johansson <olof@lixom.net>
2017-06-18Merge tag 'omap-for-v4.13/dt-part2-signed' of ↵Olof Johansson
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/dt Second set of device tree changes for omaps for v4.13 merge window: - Updates for droid 4 proximity sensor, WLAN and battery - Configure clocks for remoteproc devices for omap5 and dra7 - Configure omap4 crypto accelerators * tag 'omap-for-v4.13/dt-part2-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: ARM: dts: omap4: add SHAM node ARM: dts: omap4: add aes2 instance ARM: dts: omap4.dtsi: remove aes[12]_fck ARM: dts: omap4: Fix aes entry ARM: dts: omap4-droid4: Configure CPCAP battery driver ARM: dts: dra7xx-clocks: Use DPLL_GPU for GPU clocks ARM: dts: dra7xx-clocks: Set IVA DPLL and its output clock rates ARM: dts: dra7xx-clocks: Set DSP DPLL and its output clock rates ARM: dts: dra7xx-clocks: Source IPU1 functional clock from CORE DPLL ARM: dts: omap54xx-clocks: Set IVA DPLL and its output clock rates ARM: dts: omap44xx-clocks: Set IVA DPLL and its output clock rates ARM: dts: omap4-droid4: Fix WLAN compatible ARM: dts: omap4-droid4: Add isl29030 ALS/proximity sensor Signed-off-by: Olof Johansson <olof@lixom.net>
2017-06-18Merge tag 'sunxi-dt-h5-for-4.13' of ↵Olof Johansson
https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux into next/dt64 Allwinner H5 DT changes for 4.13 Just like the H3, this is mostly about enabling the EMAC on the H5, and also has a new board, the Orange Pi Zero Plus 2 * tag 'sunxi-dt-h5-for-4.13' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux: arm64: allwinner: h5: Add initial Orangepi Zero Plus 2 support arm64: allwinner: h5: enable dwmac-sun8i for Nano Pi NEO2 arm64: allwinner: h5: enable dwmac-sun8i for Orange Pi Prime arm64: allwinner: h5: sort the device nodes in / part for some boards arm64: allwinner: h5: add support for NanoPi NEO2 board arm64: allwinner: h5: add support for Orange Pi Prime board arm64: allwinner: orangepi-pc2: Enable dwmac-sun8i arm: sun8i: sunxi-h3-h5: add dwmac-sun8i ethernet driver arm: sun8i: sunxi-h3-h5: Add dt node for the syscon control module ARM: sunxi: h3-h5: Convert R_CCU raw numbers to macros Signed-off-by: Olof Johansson <olof@lixom.net>
2017-06-18Merge tag 'sunxi-dt-h3-for-4.13' of ↵Olof Johansson
https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux into next/dt Allwinner H3 changes for 4.13 This tag is about bringing the EMAC support to the H3 boards. * tag 'sunxi-dt-h3-for-4.13' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux: ARM: sun8i: h3: Enable EMAC with external PHY on Orange Pi Plus 2E arm: sun8i: orangepi-zero: Enable dwmac-sun8i ARM: sun8i: bananapi-m2-plus: Enable dwmac-sun8i ARM: sun8i: orangepi-plus: Enable dwmac-sun8i arm: sun8i: nanopi-neo: Enable dwmac-sun8i arm: sun8i: orangepi-pc-plus: Set EMAC activity LEDs to active high arm: sun8i: orangepi-2: Enable dwmac-sun8i arm: sun8i: orangepi-one: Enable dwmac-sun8i arm: sun8i: orangepi-pc: Enable dwmac-sun8i arm: sun8i: sunxi-h3-h5: add dwmac-sun8i ethernet driver arm: sun8i: sunxi-h3-h5: Add dt node for the syscon control module ARM: sunxi: h3-h5: Convert R_CCU raw numbers to macros Signed-off-by: Olof Johansson <olof@lixom.net>
2017-06-18Merge tag 'sunxi-fixes-for-4.12' of ↵Olof Johansson
https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux into fixes Allwinner fixes for 4.12 A few fixes around the PRCM support that got in 4.12 with a wrong compatible, and a missing clock in the binding. * tag 'sunxi-fixes-for-4.12' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux: arm64: allwinner: a64: Add PLL_PERIPH0 clock to the R_CCU ARM: sunxi: h3-h5: Add PLL_PERIPH0 clock to the R_CCU arm64: allwinner: h5: Remove syslink to shared DTSI ARM: sunxi: h3/h5: fix the compatible of R_CCU Signed-off-by: Olof Johansson <olof@lixom.net>
2017-06-18Merge tag 'sunxi-dt64-for-4.13' of ↵Olof Johansson
https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux into next/dt64 Allwinner arm64 DT changes for 4.13 Our usual arm64 changes. The most notable things are the EMAC support and USB support enhancements. There's also support for the SoPine SoM, and the OrangePi Win. * tag 'sunxi-dt64-for-4.13' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux: arm64: allwinner: a64: Add initial Orangepi Win/WinPlus support arm64: allwinner: a64: add device tree for SoPine with baseboard arm64: allwinner: bananapi-m64: Enable dwmac-sun8i arm64: allwinner: pine64-plus: Enable dwmac-sun8i arm64: allwinner: pine64: Enable dwmac-sun8i arm64: allwinner: sun50i-a64: add dwmac-sun8i Ethernet driver arm64: allwinner: sun50i-a64: Add dt node for the syscon control module arm64: allwinner: a64: add DTSI file for SoPine SoM arm64: allwinner: a64: Convert CCU raw number references to macros arm64: dts: allwinner: pine64: Prepare optional UART nodes with pinctrl arm64: allwinner: a64: enable RSB on A64 arm64: dts: allwinner: pine64: Add remaining UART aliases arm64: dts: allwinner: a64: Add UART2 pin nodes arm64: allwinner: a64: enable EHCI0/OHCI0 for Pine64 arm64: allwinner: a64: add EHCI0/OHCI0 nodes to A64 DTSI Signed-off-by: Olof Johansson <olof@lixom.net>
2017-06-18Merge tag 'sunxi-dt-for-4.13' of ↵Olof Johansson
https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux into next/dt Allwinner DT changes for 4.13 The usual chunk of patches. The most notable improvements are the power supplies improvements (battery and AC-IN), crypto support for the sun5i family, HDMI support for the A10s, plus a lot of new things for the V3S and the A83T. * tag 'sunxi-dt-for-4.13' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux: (47 commits) ARM: sun6i: a31s: primo81: Enable battery power supply ARM: sun6i: a31s: primo81: Change USB OTG to OTG mode ARM: sun8i: a83t: Add dt node for the syscon control module ARM: sun8i: a83t: Add device node for R_PIO ARM: sun8i: v3s: add device nodes for DE2 display pipeline ARM: dts: sunxi: add SoC specific compatibles for the crypto nodes ARM: sun5i: add a cryptographic engine node ARM: sun8i: a83t: Add device node for PRCM ARM: dts: sun8i: h3: Add initial NanoPi M1 Plus support ARM: dts: orange-pi-zero: add node for SPI NOR ARM: sun7i: a20: cubietruck: Tie AXP209's USB power supply to USB PHY ARM: sun6i: a31: hummingbird: Enable AXP221's ACIN power supply ARM: sun4i: a10: cubieboard: Enable AXP209's ACIN power supply ARM: sun7i: a20: bananapi-m1-plus: Enable AXP209's ACIN power supply ARM: sun7i: a20: cubieboard2: Enable AXP209's ACIN power supply ARM: sun7i: a20: cubieboard2: Move usb_otg node for alphabetical ordering ARM: sun8i: a83t: cubietruck-plus: Enable SPDIF output ARM: sun8i: a83t: cubietruck-plus: Add LED device nodes ARM: sun8i: a83t: Add device node for SPDIF transmitter ARM: sun8i: a83t: Add device node for DMA controller ... Signed-off-by: Olof Johansson <olof@lixom.net>
2017-06-18Merge tag 'amlogic-dt64' of ↵Olof Johansson
git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic into next/dt64 Amlogic 64-bit DT changes for v4.13 - cleanup/reorganize alphabetically to better avoid conflicts - add HDMI and CVBS nodes for multiple boards - new pinctrl pins: SPI, HDMI CEC - SCPI: fix thermal sensor reporting New board support - NanoPi K2 (GXBB) - R-Box Pro (GXM) * tag 'amlogic-dt64' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic: (36 commits) ARM64: dts: meson-gxl-s905x-p212: Add HDMI and CVBS nodes ARM64: dts: meson-gxl-s905x-khadas-vim: Add HDMI nodes ARM64: dts: meson-gxl-s905d-p230: Add HDMI nodes ARM64: dts: meson-gxbb-wetek-play2: Add HDMI and CVBS Nodes ARM64: dts: meson-gx: Fix sensors reporting from SCP ARM64: dts: meson-gxl: Add SPI pinctrl nodes ARM64: dts: meson-gxbb: Add SPI pinctrl nodes ARM64: dts: meson-gxl: Add Ethernet PHY LEDS pins nodes ARM64: dts: meson-gxl: Add CEC pins nodes ARM64: dts: meson-gxbb: Add CEC pins nodes ARM64: dts: Fix GXBB periphs pinctrl pull-enable register base ARM64: dts: Fix GXL periphs pinctrl pull-enable register base ARM64: dts: meson-gxl: Fix pinctrl periphs gpio-ranges arm64: dts: amlogic: Add NanoPi K2 dt-bindings: arm: amlogic: Add NanoPi K2 arm64: dts: meson-gxm: Add R-Box Pro dt-bindings: arm: amlogic: Add R-Box Pro dt-bindings: Add Kingnovel vendor prefix arm64: dts: meson-gx-p23x-q20x: Fix node order arm64: dts: meson-gxm-nexbox-a1: Fix node order ... Signed-off-by: Olof Johansson <olof@lixom.net>
2017-06-18Merge tag 'amlogic-dt' of ↵Olof Johansson
git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic into next/dt Amlogic 32-bit DT changes for v4.13: - minor reorganization to support different busses - add/use real clock controller * tag 'amlogic-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic: ARM: dts: meson8: add and use the real clock controller ARM: dts: meson: Extend L2 cache controller node for Meson8 and Meson8b ARM: dts: meson8b: inherit meson.dtsi from meson8b.dtsi ARM: dts: meson: organize devices in their corresponding busses Signed-off-by: Olof Johansson <olof@lixom.net>
2017-06-18Merge tag 'amlogic-defconfig' of ↵Olof Johansson
git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic into next/arm64 Amlogic arm64 defconfig changes for v4.13 - enable meson SPICC as module - enable IR core, decoders and Meson IR device * tag 'amlogic-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic: ARM64: defconfig: enable meson SPICC as module ARM64: defconfig: enable IR core, decoders and Meson IR device Signed-off-by: Olof Johansson <olof@lixom.net>
2017-06-18Merge tag 'amlogic-soc' of ↵Olof Johansson
git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic into next/soc Amlogic SoC updates for v4.13 - enable the clock controller for 32-bit Meson8 * tag 'amlogic-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic: arm: meson: select the clock controller for Meson8 Signed-off-by: Olof Johansson <olof@lixom.net>
2017-06-18Merge tag 'omap-for-v4.13/omap1-signed' of ↵Olof Johansson
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/soc A series of omap1 changes for issues found by Coccinelle. * tag 'omap-for-v4.13/omap1-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: ARM: OMAP1: Fix a typo in a comment line ARM: OMAP1: Delete an error message for a failed memory allocation in omap1_dm_timer_init() ARM: OMAP1: DMA: Delete an unnecessary return statement in omap1_show_dma_caps() ARM: OMAP1: DMA: Delete an error message for a failed memory allocation in omap1_system_dma_init() ARM: OMAP1: DMA: Improve a size determination in omap1_system_dma_init() Signed-off-by: Olof Johansson <olof@lixom.net>
2017-06-18Merge tag 'gemini-v4.13-dts-2' of ↵Olof Johansson
git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik into next/dt Gemini DTS patches for v4.13, take 2: - Add DMA controller - Add PATA controller and SATA bridge * tag 'gemini-v4.13-dts-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik: ARM: dts: add Gemini PATA/SATA support ARM: dts: Add Gemini DMA controller Signed-off-by: Olof Johansson <olof@lixom.net>
2017-06-18Merge tag 'arm-soc/for-4.13/defconfig' of ↵Olof Johansson
http://github.com/Broadcom/stblinux into next/defconfig This pull request contains Broadcom ARM-based SoCs defconfig updates for 4.13, please pull the following: - Stefan updates the bcm2835_defconfig to include serial, Ethernet and USB gadget support which is needed for the Raspberry Pi Zero OTG changes * tag 'arm-soc/for-4.13/defconfig' of http://github.com/Broadcom/stblinux: ARM: bcm2835_defconfig: Enable serial & ethernet USB gadget support Signed-off-by: Olof Johansson <olof@lixom.net>
2017-06-18Merge tag 'arm-soc/for-4.13/defconfig-arm64' of ↵Olof Johansson
http://github.com/Broadcom/stblinux into next/arm64 This pull request contains ARM64 defconfig changes for 4.13, please pull the following: - Florian enables ARCH_BRCMSTB in the arm64 defconfig to get more build coverage * tag 'arm-soc/for-4.13/defconfig-arm64' of http://github.com/Broadcom/stblinux: arm64: defconfig: Enable ARCH_BRCMSTB Signed-off-by: Olof Johansson <olof@lixom.net>
2017-06-18Merge tag 'arm-soc/for-4.13/devicetree-arm64' of ↵Olof Johansson
http://github.com/Broadcom/stblinux into next/dt64 This pull request contains Broadcom ARM64-based SoCs Device Tree changes for 4.13. Please note the following from Eric: I've based this summary on the bcm2835-dt-next tag, to clarify what's in this patch series, but it does require being careful since it involves a cross-merge between branches. - Anup documents the Broadcom Stingray binding, common clocks, adds initial support for the Stingray DTSI and DTS files and adds support for the PL022, PL330 and SP805 - Sandeep adds the clock nodes to the Stingray Device Tree nodes - Pramod adds support for the NAND, pinctrl, GPIO to the Stingray Device Tree nodes - Oza adds I2C Device Tree nodes to the Stingray DTSes - Srinath adds PWM and SDHCI Device Tree nodes for the Stingray SoC - Ravijeta adds support for the USB Dual Role PHY on Northstar 2 - Gerd starts adding references to the sdhost and sdhci controllers, and then switches the sdcard to to use the SDHOST (faster than SDHCI) - Stefan defines the BCM2837 thermal coefficients in order for the Raspberry Pi thermal driver to work correctly * tag 'arm-soc/for-4.13/devicetree-arm64' of http://github.com/Broadcom/stblinux: arm64: dts: NS2: Add USB DRD PHY device tree node ARM64: dts: bcm2837: Define CPU thermal coefficients arm64: dts: Add PWM and SDHCI DT nodes for Stingray SOC arm64: dts: Add PL022, PL330 and SP805 DT nodes for Stingray arm64: dts: Add I2C DT nodes for Stingray SoC arm64: dts: Add GPIO DT nodes for Stingray SOC arm64: dts: Add pinctrl DT nodes for Stingray SOC arm64: dts: Add NAND DT nodes for Stingray SOC arm64: dts: Add clock DT nodes for Stingray SOC arm64: dts: Initial DTS files for Broadcom Stingray SOC dt-bindings: clk: Extend binding doc for Stingray SOC dt-bindings: bcm: Add Broadcom Stingray bindings document ARM: dts: bcm283x: switch from &sdhci to &sdhost arm64: dts: bcm2837: add &sdhci and &sdhost ARM: dts: bcm283x: Add CPU thermal zone with 1 trip point ARM: dts: Add devicetree for the Raspberry Pi 3, for arm32 (v6) Signed-off-by: Olof Johansson <olof@lixom.net>