summaryrefslogtreecommitdiff
path: root/arch
AgeCommit message (Collapse)Author
2017-10-20Merge tag 'davinci-for-v4.15/dt' of ↵Arnd Bergmann
git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci into next/soc Pull "DaVinci DT updates for v4.15" from Sekhar Nori: Add support for accessing DSP on DA850 SoC when using device-tree. * tag 'davinci-for-v4.15/dt' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci: ARM: davinci: da8xx-dt: Add OF_DEV_AUXDATA entry for DSP clock matching ARM: dts: da850-lcdk: Add and enable CMA reserved pool for DSP ARM: dts: da850: Add DSP node
2017-10-20Merge tag 'hisi-arm64-dt-for-4.15' of git://github.com/hisilicon/linux-hisi ↵Arnd Bergmann
into next/soc ARM64: DT: Hisilicon SoC DT updates for 4.15 - Add CoreSight related nodes for hi6220 - Add GPIO line names for hikey960 - Rectify the GPIO line names of the Poplar board to keep consistency - Add thermal sensor binding doc and dt nodes for hi3660 * tag 'hisi-arm64-dt-for-4.15' of git://github.com/hisilicon/linux-hisi: arm64: dts: Register Hi3660's thermal sensor dt-bindings: Document the hi3660 thermal sensor binding arm64: dts: hisilicon: Standardize Poplar GPIO line names arm64: dts: hikey960: Update HiKey960 with GPIO line names arm64: dts: hi6220: add coresight dt nodes
2017-10-20ARM: dts: Add TVE200 to the Gemini SoC DTSILinus Walleij
The Faraday TVE200 is present in the Gemini SoC, sometimes under the name "TVC". Add it to the SoC DTSI file along with its resources. Signed-off-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2017-10-20Merge tag 'juno-updates-4.15' of ↵Arnd Bergmann
git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into next/soc Pull "ARMv8 Vexpress/Juno DT update for v4.15" from Sudeep Holla: Just single update to enable PSCI support on Foundation models * tag 'juno-updates-4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux: arm64: dts: foundation-v8: Enable PSCI mode
2017-10-20Merge tag 'aspeed-4.15-devicetree' of ↵Arnd Bergmann
git://git.kernel.org/pub/scm/linux/kernel/git/joel/aspeed into next/soc Pull "ASPEED devicetree updates for 4.15" from Joel Stanley: - Cleanups of the ASPEED device trees - Enable the i2c bus on all platforms - Turn VUART on for BMC platforms - Bind watchdog two for compatilbiy with shipping u-boot * tag 'aspeed-4.15-devicetree' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/aspeed: ARM: dts: aspeed-romulus: Enable VUART ARM: dts: aspeed-palmetto: Enable VUART ARM: dts: aspeed: Enable watchdog two ARM: dts: aspeed: Remove undocumented wdt properties ARM: dts: aspeed: Clean up UART nodes ARM: dts: aspeed: Correctly order UART nodes ARM: dts: aspeed: Add aliases for UARTs ARM: dts: aspeed-ast2500: Add I2C devices ARM: dts: aspeed-palmetto: Add I2C devices ARM: dts: aspeed-romulus: Add I2C devices ARM: dts: aspeed: Add I2C buses ARM: dts: aspeed: Reorder ADC node ARM: dts: aspeed: Move pinctrl subnodes to improve readability
2017-10-20Merge tag 'socfpga_dts_for_v4.15_part1' of ↵Arnd Bergmann
git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux into next/soc Pull "SoCFPGA DTS updates for v4.15" from Dinh Nguyen: - Stratix10 platform updates - Fix up gic register entry - Enable ethernet/SDMMC - Update reset manager properties * tag 'socfpga_dts_for_v4.15_part1' of git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux: arm64: dts: stratix10: add reset property for various peripherals arm64: dts: stratix10: add the 'altr,modrst-off' property arm64: dts: stratix10: include the reset manager bindings arm64: dts: stratix10: add ethernet/sdmmc support to the S10 devkit arm64: dts: stratix10: fix up the gic register for the Stratix10 platform
2017-10-20Merge tag 'renesas-dt-for-v4.15' of ↵Arnd Bergmann
https://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/soc Pull "Renesas ARM Based SoC DT Updates for v4.15" from Simon Horman: * r7s72100 (RZ/A1) Peach board - Add pin groups for SCIF2 serial debug interface and Ethernet This avoids relying on bootloader settings - Support control of LED1 using gpio-leds * r8a7743 (RZ/G1M) and r8a7745 (RZ/G1E) SoCs - Add MSIOF[012] support and define aliases for spi[0123] * r8a7743 (RZ/G1M) SoC - Add I2C and IIC core nodes * r8a7743 (RZ/G1M) iW-RainboW-G20D-Qseven development platform - Enable SDHI1 SD controller supporting high-speed and SDR50 transfers - Add chosen node to allow correct selection of serial console and the kernel command line - Enable RTC support - Enable USB2.0 host support This includes enabling USB PHY and internal PCI * r8a7743 (RZ/G1M) iW-RainboW-G20M-Qseven and r8a7745 (RZ/G1E) iW-RainboW-G22M-SM SoMs - Enable Add SPI NOR support This devices is used to boot up the system to the SoM DT * r8a7743 (RZ/G1M) iW-RainboW-G20M-Qseven SoM - Enable SDHI0 SD controller supporting high-speed transfers * r8a7745 (RZ/G1E) iW-RainboW-G22D development platform - Add pnctl support for scif4 This avoids reling on boot loader settings - Add EtherAVB support * r8a7745 (RZ/G1E) iW-RainboW-G22M-SM SoM - Add basic SoM support - Enable MMCIF eMMC support - Enable RTC support - Enable SDHI1 SD controller supporting high-speed transfers * r8a779[0-4] R-Car Gen2 SoCs - Add reset control properties Geert Uytterhoeven says: This patch series describes the reset topology on all R-Car Gen2 Socs, like was done before for R-Car Gen3 and RZ/G1. Resets usually match the corresponding module clocks. Exceptions are: - The audio module has resets for the Serial Sound Interfaces only, - The display module has only a single reset for all DU channels, but adding reset properties for the display is postponed upon request from Laurent. - Convert to new CPG/MSSR bindings Geert Uytterhoven says: Currently Renesas R-Car Gen2 SoCs use the common clk-rcar-gen2, clk-mstp, and clk-div6 drivers, which depend on most clocks being described in DT. Especially the module (MSTP) clocks are cumbersome and error prone, due to 3 arrays (clocks, clock-indices, and clock-output-names) to be kept in sync. In addition, the clk-mstp driver cannot be extended easily to also support module resets, which are provided by the same hardware module. Hence when developing support for R-Car Gen3 SoCs, another approach was chosen, which led to the CPG/MSSR driver core, and SoC-specific subdrivers (initially for R-Car Gen3, but later also for RZ/G1). This series converts the various R-Car Gen2 DTSes to migrate to the new CPG/MSSR drivers that were added in v4.13-rc1. * r8a779[0,1,3,4] R-Car Gen2 SoCs - Stop grouping clocks under a "clocks" subnode Geert Uytterhoeven says: The current practice is to not group clocks under a "clocks" subnode, but just put them together with the other on-SoC devices. Hence this patch series implements this for the various R-Car Gen2 DTSes that still need this (r8a7792.dtsi is OK). * r8a7794 (E2) Alt board - Correct inverted sense of SD wip pins * tag 'renesas-dt-for-v4.15' of https://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: (48 commits) ARM: dts: r8a7743: Add MSIOF[012] support ARM: dts: r8a7745: Add MSIOF[012] support ARM: dts: iwg22d: Enable SDHI0 controller ARM: dts: iwg22m: Add SPI NOR support ARM: dts: r8a7745: Add QSPI support ARM: dts: iwg20m: Add SPI NOR support ARM: dts: r8a7743: Add QSPI support ARM: dts: iwg22m: Enable SDHI1 controller ARM: dts: r8a7745: Add SDHI controllers ARM: dts: r8a7794: Add reset control properties ARM: dts: r8a7793: Add reset control properties ARM: dts: r8a7792: Add reset control properties ARM: dts: r8a7791: Add reset control properties ARM: dts: r8a7790: Add reset control properties ARM: dts: r8a7743: Add IIC cores to dtsi ARM: dts: alt: use correct logic for SD WP pins ARM: dts: iwg20d-q7: Enable USB PHY ARM: dts: iwg20d-q7: Enable internal PCI ARM: dts: r8a7743: Link PCI USB devices to USB PHY ARM: dts: r8a7743: Add USB PHY DT support ...
2017-10-20Merge tag 'renesas-arm64-dt-for-v4.15' of ↵Arnd Bergmann
https://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/soc Pull "Renesas ARM64 Based SoC DT Updates for v4.15" from Simon Horman: * r8a7795 (H3) - Use r8a7795-cpg-mssr and r8a7795-sysc bindings Hardcoded indicies are replaced with symbols now that they are available - Drop bogus HDMI node name suffixes Laurent Pinchart says: Node names should not use numerical suffixes if the nodes can be distinguished by unit-address - Update PFC node name to pin-controller Shimoda-san says the PFC node name is changed "from e6060000.pfc and pfc@e6060000 to e6060000.pin-controller and pin-controller@e6060000 like other Renesas SoCs." * r8a7795 (H3) ES1.0 - Drop extra zero from XHCI unit address This corrects a typo were ee0400000 rather than ee040000 was used as the unit address. * r8a7796 (M3-W) - Add FDP1 instance Laurent Pinchart says: The r8a7796 has a single FDP1 instance. * r8a7795 (H3) and r8a7796 (M3-W) SoCs - Add USB3.0 peripheral device nodes Shimoda-san says that this is not enabled on the Salvator-X/XS boards for now as: + we need a special cable (USB type-A to A cross cable). + we can swap the role by renesas_usb3 driver even if we use a normal cable and after usb3.0 host is running, but I think it's a special use case. * r8a7795 (H3) and r8a7796 (M3-W) ULCB boards - Enable display output Laurent Pinchart says: The DU is already wired up to the HDMI encoder, all we need to do is enable it. * r8a77995 (D3) Draak board - Enable EthernetAVB and , USB2.0 Host and PHY - Add serial console pins. This is safe to do now that r8a77995 PFC driver support is present * r8a77970 (V3M) - Add basic support for SoC and EtherAVB, [H]SCIF and SYS-DMAC nodes This is a step towards enabling EtherAVB and [H]SCIF with SYS-DMAC in the Eagle board support for which is under review * tag 'renesas-arm64-dt-for-v4.15' of https://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: (22 commits) arm64: dts: renesas: r8a7796: add USB3.0 peripheral device node arm64: dts: renesas: r8a7795: add USB3.0 peripheral device node arm64: dts: renesas: r8a77995: draak: enable EthernetAVB arm64: dts: renesas: r8a77995: draak: enable USB2.0 Host (EHCI/OHCI) arm64: dts: renesas: r8a77995: draak: enable USB2.0 PHY arm64: dts: renesas: r8a77995: add USB2.0 Host (EHCI/OHCI) device node arm64: dts: renesas: r8a77995: Add USB2.0 PHY device node arm64: dts: draak: Add serial console pins arm64: dts: renesas: r8a77970: add EtherAVB support arm64: dts: renesas: r8a77970: add [H]SCIF support arm64: dts: renesas: r8a77970: add SYS-DMAC support arm64: dts: renesas: initial R8A77970 SoC device tree arm64: dts: renesas: r8a77995: Add EthernetAVB device node arm64: dts: renesas: r8a77995: add GPIO device nodes arm64: dts: renesas: r8a77995: Use r8a7795-cpg-mssr binding definitions arm64: dts: renesas: r8a77995: Use r8a7795-sysc binding definitions arm64: renesas: Add Renesas R8A77970 Kconfig support arm64: dts: renesas: r8a7795: Drop bogus HDMI node names suffixes arm64: dts: renesas: ulcb: Enable display output arm64: dts: renesas: r8a77995: update PFC node name to pin-controller ...
2017-10-20Merge tag 'integrator-pciv3-dts' of ↵Arnd Bergmann
git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator into next/soc Pull "DTS updates for the Integrator PCIv3 driver" from Linus Walleij: These are the DTS file changes required to fix bugs and satisfy requirements for the new PCIv3 driver in the PCI subsystem. The binding changes have been merged to the PCI tree. [arnd] Note: this is an incompatible DT binding change, so things will break during bisection or when using an old dtb file. Since integrator has no real users, we can make an exception for that. * tag 'integrator-pciv3-dts' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator: ARM: dts: Update Integrator/AP PCI v3 compatible ARM: dts: integratorap: Fix PCI windows ARM: dts: add the PCI clock to the device tree
2017-10-20arm64: dts: fix unit-address leading 0sRob Herring
Fix dtc warnings for 'simple_bus_reg' due to leading 0s. Converted using the following command: perl -p -i -e 's/\@0+([0-9a-f])/\@$1/g' `find arch/arm64/boot/dts -type -f -name '*.dts*' Signed-off-by: Rob Herring <robh@kernel.org> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2017-10-20arm: dts: fix unit-address leading 0sRob Herring
Fix dtc warnings for 'simple_bus_reg' due to leading 0s. Converted using the following command: perl -p -i -e 's/\@0+([0-9a-f])/\@$1/g' `find arch/arm/boot/dts -type -f -name '*.dts*' Dropped changes to ARM, Ltd. boards LED nodes and manually fixed up some occurrences of uppercase hex. Signed-off-by: Rob Herring <robh@kernel.org> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2017-10-20arm: boot: dts: artpec6: Remove unnecessary interrupt-parent property from ↵Surender Polsani
sub-nodes "interrupt-parent" property is declared in root node, so it is global to all nodes. This property is re-declared in few sub-nodes. To avoid duplication this property is removed from following sub-nodes: pmu, amba@0, amba@0/ethernet. Signed-off-by: Surender Polsani <surenderp@techveda.org> Acked-by: Niklas Cassel <niklas.cassel@axis.com> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2017-10-19Merge tag 'stm32-defconfig-for-v4.15-1' of ↵Arnd Bergmann
git://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32 into next/soc Pull "STM32 defconfig updates for v4.15, round 1" from Alexandre Torgue: Highlights: ---------- -Regenerate default configuration -Add DMAMUX support -Add I2C F7 support -Add MDMA support * tag 'stm32-defconfig-for-v4.15-1' of git://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32: ARM: configs: stm32: Add MDMA support in STM32 defconfig ARM: configs: stm32: Add I2C F7 support in STM32 defconfig ARM: configs: stm32: Add DMAMUX support in STM32 defconfig ARM: configs: stm32: Update default configuration for v4.14-rc1
2017-10-19ARM: defconfig: select the right SX150X driverLinus Walleij
The SX150X GPIO expander has been moved to pin control and its Kconfig symbol has been renamed. We used to have a paper-over thing in Kconfig but it was causing circular dependencies so I have had to kill it off. Select the right driver instead. Signed-off-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2017-10-19Merge tag 'qcom-defconfig-for-4.15' of ↵Arnd Bergmann
git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux into next/soc Pull "Qualcomm ARM Based defconfig Updates for v4.15" from Andy Gross: * Enable Sony Z2 tablet options * Enable USB on APQ8064/MSM8974 * Fixup/catchup config to support newer options * tag 'qcom-defconfig-for-4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux: ARM: qcom_defconfig: Enable Z2 Tablet related options ARM: qcom_defconfig: Disable DEBUG_GPIO ARM: qcom_defconfig: Enable configs for USB on apq8064/msm8974 ARM: qcom_defconfig: Resync with new Kconfig options
2017-10-19Merge tag 'qcom-arm64-defconfig-for-4.15' of ↵Arnd Bergmann
git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux into next/soc Pull "Qualcomm ARM64 Based defconfig Updates for v4.15" from Andy Gross: * Enable QCOM IOMMU * Enable Qualcomm USB options * tag 'qcom-arm64-defconfig-for-4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux: arm64: defconfig: re-enable Qualcomm DB410c USB arm64: defconfig: Enable QCOM_IOMMU
2017-10-19Merge tag 'samsung-soc-4.15' of ↵Arnd Bergmann
git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into next/soc Pull "Samsung mach/soc changes for v4.15" from Krzysztof Kozłowski: 1. Cleanups for s3c24xx and s3c64xx (memory allocation printks, code style). 2. Remove of Exynos4212 related dead code (no more support for this SoC). * tag 'samsung-soc-4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux: ARM: EXYNOS: Remove Exynos4212 related dead code ARM: SAMSUNG: Simplify size used for kzalloc ARM: SAMSUNG: Remove printk for failed memory allocation ARM: s3c64xx: Delete an unnecessary return statement in samsung_bl_set ARM: s3c64xx: Remove printk for failed memory allocation in samsung_bl_set ARM: s3c2410: Fix typos in a comments ARM: s3c24xx: Simplify size used for kzalloc in iotiming get ARM: s3c24xx: Remove printk for failed memory allocation in iotiming get
2017-10-19Merge tag 'samsung-defconfig-4.15' of ↵Arnd Bergmann
git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into next/soc Pull "Samsung defconfig changes for v4.15" from Krzysztof Kozłowski: 1. Enable USB3503 on multi_v7 for Odroid U3. 2. Enable USB Attached SCSI for Odroid HC1. * tag 'samsung-defconfig-4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux: ARM: multi_v7_defconfig: Enable UAS support for Odroid HC1 board ARM: exynos_defconfig: Enable UAS support for Odroid HC1 board ARM: multi_v7_defconfig: Enable USB3503 driver
2017-10-19Merge tag 'omap-for-v4.15/soc-signed' of ↵Arnd Bergmann
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/soc Pull "OMAP soc changes for omaps for v4.15 merge window" from Tony Lindgren: SoC changes for omaps for v4.15 merge window that are mostly non-urgent fixes and clean-up in preparation for dropping more platform data later on: - Fix am33xx/am437x MMC address space offsets - Fix overwriting clkctrl and modulemode values when dts data is used - Drop unused platform init code for omap_init_hdq - Drop unused struct omap_hwmod_mux_info - Remove duplicate define for dra722 es1.0 silicon revision - Add support for dra71x es2.1 - Make omap_dma_dev_info __initdata - A series of fixes for Coccinelle found issues * tag 'omap-for-v4.15/soc-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: ARM: OMAP: Fix typos in two comment lines in _omap_dm_timer_request() ARM: OMAP: Use kcalloc() in omap_system_dma_probe() ARM: OMAP: Improve a size determination in two functions ARM: OMAP: Delete an error message for a failed memory allocation in two functions ARM: OMAP2+: make omap_dma_dev_info __initdata ARM: DRA722: Add support for DRA71x Silicon Rev 2.1 ARM: DRA722: remove redundant definition of 1.0 device ARM: OMAP2+: Drop unused omap_hwmod_mux_info ARM: OMAP2+: Drop unused omap_init_hdq ARM: OMAP2+: Fix overwriting of clkctrl and modulemode values ARM: OMAP2+: Fix MMC address space mismatch for am33xx and am43xx
2017-10-19Merge tag 'davinci-for-v4.15/defconfig' of ↵Arnd Bergmann
git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci into next/soc Pull "DaVinci defconfig updates for v4.15" from Sekhar Nori: Enable CMA and MTD command line partitioning support. * tag 'davinci-for-v4.15/defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci: ARM: davinci_all_defconfig: enable CMA options ARM: davinci_all_defconfig: enable MTD_CMDLINE_PARTS
2017-10-19Merge tag 'hisi-defconfig-for-4.15' of git://github.com/hisilicon/linux-hisi ↵Arnd Bergmann
into next/soc Pull "ARM64: hisilicon: defconfig updates for 4.15" from Wei Xu: - Enable DRM_HISI_HIBMC for the D03/D05 board * tag 'hisi-defconfig-for-4.15' of git://github.com/hisilicon/linux-hisi: arm64: defconfig: Enable hisilicon hibmc drm driver
2017-10-19arm64: defconfig: Enable QCOM_IOMMUNicolas Dechesne
Enable QCOM IOMMU driver for 'B' family devices, such as APQ8016 found on the Dragonboard 410c. With this change, graphics console and GPU are working fine (using mesa/freedreno for GPU driver). Signed-off-by: Nicolas Dechesne <nicolas.dechesne@linaro.org> Acked-by: Bjorn Andersson <bjorn.andersson@linaro.org> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2017-10-19arm64: Add ThunderX drivers to defconfigRobin Murphy
ThunderX needs its PCI host drivers to do anything useful, and it's probably helpful to have networking by default too. Signed-off-by: Robin Murphy <robin.murphy@arm.com> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2017-10-19Merge tag 'renesas-soc2-for-v4.15' of ↵Arnd Bergmann
https://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/soc Pull "Second Round of Renesas ARM Based SoC Updates for v4.15" from Simon Horman: Fix to allow UP build of shmobile. Arnd Bergmann says: A bugfix for the SMP case broke the build for the UP case: arch/arm/mach-shmobile/headsmp-apmu.o: In function `shmobile_boot_apmu': (.text+0x34): undefined reference to `secondary_startup' The assembler file mixes code that is used for SMP with code that we also need on a single-CPU build, so I'm leaving it always enabled in the Makefile, but enclose the SMP code in an #ifdef. * tag 'renesas-soc2-for-v4.15' of https://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: ARM: shmobile: rcar-gen2: fix non-SMP build
2017-10-19Merge tag 'vexpress-updates-4.15' of ↵Arnd Bergmann
git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into next/soc Pull "ARMv7 Vexpress update/cleanup for v4.15" from Sudeep Holla: Cosmetic cleanup dropping extra debug messages for memory allocation failures * tag 'vexpress-updates-4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux: ARM: vexpress/spc: Delete an error message for a failed memory allocation
2017-10-19arm64: Fix the feature type for ID register fieldsSuzuki K Poulose
Now that the ARM ARM clearly specifies the rules for inferring the values of the ID register fields, fix the types of the feature bits we have in the kernel. As per ARM ARM DDI0487B.b, section D10.1.4 "Principles of the ID scheme for fields in ID registers" lists the registers to which the scheme applies along with the exceptions. This patch changes the relevant feature bits from FTR_EXACT to FTR_LOWER_SAFE to select the safer value. This will enable an older kernel running on a new CPU detect the safer option rather than completely disabling the feature. Cc: Catalin Marinas <catalin.marinas@arm.com> Cc: Dave Martin <dave.martin@arm.com> Cc: Mark Rutland <mark.rutland@arm.com> Cc: Will Deacon <will.deacon@arm.com> Signed-off-by: Suzuki K Poulose <suzuki.poulose@arm.com> Signed-off-by: Will Deacon <will.deacon@arm.com>
2017-10-19arm: dts: mediatek: update audio node for mt2701 and mt7623Ryder Lee
This patch adds interrupt-names property in audio node so that binding can be agnostic of the IRQ order. Signed-off-by: Ryder Lee <ryder.lee@mediatek.com> Signed-off-by: Matthias Brugger <matthias.bgg@gmail.com>
2017-10-19arm: dts: mt2701: enable display pwm backlightWeiqing Kong
This patch adds board related config for MT2701 pwm backlight. Signed-off-by: Weiqing Kong <weiqing.kong@mediatek.com> Signed-off-by: Erin Lo <erin.lo@mediatek.com> Signed-off-by: Ryder Lee <ryder.lee@mediatek.com> Signed-off-by: Matthias Brugger <matthias.bgg@gmail.com>
2017-10-19arm: dts: mt2701: add pwm backlight device nodeWeiqing Kong
This patch adds the device node for MT2701 pwm backlight. Signed-off-by: Weiqing Kong <weiqing.kong@mediatek.com> Signed-off-by: Erin Lo <erin.lo@mediatek.com> Signed-off-by: Ryder Lee <ryder.lee@mediatek.com> Signed-off-by: Matthias Brugger <matthias.bgg@gmail.com>
2017-10-19Merge tag 'renesas-arm64-defconfig-for-v4.15' of ↵Arnd Bergmann
https://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/soc Pull "Renesas ARM64 Based SoC Defconfig Updates for v4.15" from Simon Horman: * Enable the following to allow further test coverage - r8a77970 (V3M) and r8a77995 (D3) R-Car Gen3 SoCs - R-Car Gen3 thermal driver. This is used on a range of R-Car Gen3 SoCs * tag 'renesas-arm64-defconfig-for-v4.15' of https://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: arm64: defconfig: enable R8A77970 SoC arm64: defconfig: enable thermal driver for Renesas R-Car Gen3 arm64: defconfig: Enable Renesas R8A77995 SoC
2017-10-19Merge tag 'integrator-pciv3-delete' of ↵Arnd Bergmann
git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator into next/soc Pull "Delete old PCIv3 driver" from Linus Walleij: This deletes the old PCIv3 driver in the Integrator machine. It has been superceded by a modernized driver in the PCI subsystem host/ directory. * tag 'integrator-pciv3-delete' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator: ARM: integrator: Delete the V3 PCI driver
2017-10-19Merge tag 'arm-soc/for-4.15/soc' of http://github.com/Broadcom/stblinux into ↵Arnd Bergmann
next/soc Pull "Broadcom soc changes for 4.15 (part 1)" from Florian Fainelli: This pull request contains Broadcom ARM-based SoC/Kconfig changes for 4.15 please pull the following: - Danilo removes the clock provider driver stubs which are no longer needed now that we have a proper CPRMAN clock provider driver - Stefan moves the SMP startup code for BCM2836 from the interrupt controller driver down to where it belongs in the architecture code, this was requested by Marc Zyngier before comitting any fixes to that code - Phil provides a fix for a future Raspberry Pi firmware which will make the secondary cores wait for an event and therefore requires the CPU onlining other cores to send such event (along with the appropriate barrier) - Florian fixes the BRCMSTB UART debug stub to work correctly when using an ARM BE8 kernel since there were some missing register read swapping needed * tag 'arm-soc/for-4.15/soc' of http://github.com/Broadcom/stblinux: ARM: brcmstb: Add appropriate ARM_BE8() macros for swapping ARM: bcm2836: Send event when onlining other cores irqchip: bcm2836: Move SMP startup code to arch/arm (v2) clk: bcm2835: remove remains from stub clk driver
2017-10-19Merge tag 'renesas-soc-for-v4.15' of ↵Arnd Bergmann
https://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/soc Pull "Renesas ARM Based SoC Updates for v4.15" from Simon Horman: * Prepare to enable SMP on R-Car E2 (r8a7794). Geert Uytterhoeven says: "The main hurdle here is that R-Car Gen2 boot loaders do not initialize the arch_timer CNTVOFF register, which thus needs workarounds on Linux. - The first patch adds a definition for MON_MODE, as suggested by Marc Zyngier, - The second patch makes sure CNTVOFF is initialized for boot and secondary Cortex-A15 and Cortex-A7 CPU cores, like is already done for the boot Cortex-A7 CPU core. Without this, the ARM arch timer does not work on secondary CPU cores." A follow-up patch to enable SMP in DT on R-Car E2 (r8a7794) is currently deferred unto v4.16 as it depends on the above. * Enable low-level debugging support for RZ/G1E (r8a7745). Fabrizio Castro says, "RZ/G1E uses SCIF4 for the debug console." * tag 'renesas-soc-for-v4.15' of https://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: ARM: shmobile: rcar-gen2: Make sure CNTVOFF is initialized on CA7/15 ARM: Add definition for monitor mode ARM: debug-ll: Add support for r8a7745
2017-10-19Merge tag 'renesas-fixes-for-v4.14' of ↵Arnd Bergmann
https://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into fixes Pull "Renesas ARM Based SoC Fixes for v4.14" from Simon Horman: Add 12V regulator to backlight allowing the power supply for the backlight to be found. * tag 'renesas-fixes-for-v4.14' of https://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: arm64: dts: salvator-common: add 12V regulator to backlight
2017-10-19Merge tag 'renesas-defconfig-for-v4.15' of ↵Arnd Bergmann
https://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/soc Pull "Renesas ARM Based SoC Defconfig Updates for v4.15" from Simon Horman: Enable BQ32000 RTC driver in multi_v7_defconfig. Biju Das says, "The iWave RZ/G1M Q7 SOM supports RTC (TI BQ32000). To increase hardware support enable the driver in the multi_v7_defconfig multiplatform configuration." * tag 'renesas-defconfig-for-v4.15' of https://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: ARM: multi_v7_defconfig: Enable BQ32000 RTC driver
2017-10-19Merge tag 'ep93xx-for-arm-soc-1' of ↵Arnd Bergmann
git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator into next/soc Pull "EP93xx improvements for v4.15" EP93xx patches that have been floating for a while, converting the platform to sparsemem, using SPI-MMC and a bit more. * tag 'ep93xx-for-arm-soc-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator: ARM: ep93xx: Add lm70 HWMON sensor to TS-72xx boards ARM: ep93xx: tidy up TS-72xx Watchdog resources ARM: ep93xx: simone: let the mmc_spi driver handle the card detect ARM: ep93xx: switch to SPARSEMEM
2017-10-19ARM: ux500: Fix regression while init PM domainsUlf Hansson
The commit afece3ab9a36 ("PM / Domains: Add time accounting to various genpd states") causes a boot regression for ux500. The problem occurs when the ux500 machine code calls pm_genpd_init(), which since the above change triggers a call to ktime_get(). More precisely, because ux500 initializes PM domains in the init_IRQ() phase of the boot, timekeeping has not yet been initialized. Fix the problem by moving the initialization of the PM domains to after timekeeping has been initialized. Fixes: afece3ab9a36 ("PM / Domains: Add time accounting to various genpd..") Cc: Thara Gopinath <thara.gopinath@linaro.org> Cc: "Rafael J. Wysocki" <rjw@rjwysocki.net> Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org> Reviewed-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2017-10-19ARM: dts: fix PCLK name on Gemini and MOXA ARTLinus Walleij
These platforms provide a clock to their watchdog, in each case this is the peripheral clock (PCLK), so explicitly name the clock in the device tree. Take this opportunity to add the "faraday,ftwdt010" compatible as fallback to the watchdog IP blocks. Cc: Jonas Jensen <jonas.jensen@gmail.com> Signed-off-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2017-10-19Merge tag 'v4.14-rockchip-dts64fixes-2' of ↵Arnd Bergmann
git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into fixes Pull "Rockchip dts64 Fixes for 4.14 part 2" from Heiko Stübner: The vqmmc voltages on rk3399 pose a risk for the chip if they exceed 3.0V, so they got fixed to not be at 3.3V And Arnd found a typo in the recently added iommu nodes. * tag 'v4.14-rockchip-dts64fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip: arm64: dts: rockchip: fix typo in iommu nodes arm64: dts: rockchip: correct vqmmc voltage for rk3399 platforms
2017-10-19Merge tag 'imx-fixes-4.14' of ↵Arnd Bergmann
git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into fixes Pull "i.MX fixes for 4.14" from Shawn Guo: - Fix the legacy PCI interrupt numbers for i.MX7. The numbers were wrongly coded in an inverted order than what Reference Manual tells. It causes problem for PCI devices using legacy interrupt. * tag 'imx-fixes-4.14' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: ARM: dts: imx7d: Invert legacy PCI irq mapping
2017-10-19Merge tag 'mvebu-fixes-4.14-2' of git://git.infradead.org/linux-mvebu into fixesArnd Bergmann
Pull "mvebu fixes for 4.14 (part 2)" from Gregory CLEMENT Two device tree related fixes: - One on Armada 38x using a other compatible string for I2C in order to cover an errata. - One for Armada 7K/8K fixing a typo on interrupt-map property for PCIe leading to fail PME and AER root port service initialization And the last one for the mbus fixing the window size calculation when it exceed 32bits * tag 'mvebu-fixes-4.14-2' of git://git.infradead.org/linux-mvebu: bus: mbus: fix window size calculation for 4GB windows ARM: dts: Fix I2C repeated start issue on Armada-38x arm64: dts: marvell: fix interrupt-map property for Armada CP110 PCIe controller
2017-10-19Merge tag 'at91-fixes2' of ↵Arnd Bergmann
git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91 into fixes Fixes: second batch for 4.14: - one DT phy address fix for the new sama5d27 som1 ek - two DT ADC patches that were forgotten while moving to hardware triggers for sama5d2 (iio changes already applied) * tag 'at91-fixes2' of git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91: ARM: dts: at91: sama5d2: add ADC hw trigger edge type ARM: dts: at91: sama5d2_xplained: enable ADTRG pin ARM: dts: at91: at91-sama5d27_som1: fix PHY ID
2017-10-19Merge tag 'arm-soc/for-4.14/devicetree-fixes' of ↵Arnd Bergmann
http://github.com/Broadcom/stblinux into fixes Pull "Broadcom devicetree fixes for 4.14" from Florian Fainelli: This pull request contains Broadcom ARM-based SoC Device Tree fixes for 4.14, please pull the following: - Loic fixes the console path on the Raspberry Pi 3 which was not correctly set and would cause all sorts of confusion between the Bluetooth controller and the kernel console * tag 'arm-soc/for-4.14/devicetree-fixes' of http://github.com/Broadcom/stblinux: ARM: dts: bcm283x: Fix console path on RPi3
2017-10-19s390/nmi: do register validation as early as possibleMartin Schwidefsky
The validation of the CPU registers in the machine check handler is currently split into two parts. The first part is done at the start of the low level mcck_int_handler function, this includes the CPU timer register and the general purpose registers. The second part is done a bit later in s390_do_machine_check for all the other registers, including the control registers, floating pointer control, vector or floating pointer registers, the access registers, the guarded storage registers, the TOD programmable registers and the clock comparator. This is working fine to far but in theory a future extensions could cause the C code to use registers that are not validated yet. A better approach is to validate all CPU registers in "safe" assembler code before any C function is called. Reviewed-by: Heiko Carstens <heiko.carstens@de.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
2017-10-19s390/nmi: allocation of the extended save areaMartin Schwidefsky
The machine check extended save area is needed to store the vector registers and the guarded storage control block when a CPU is interrupted by a machine check. Move the slab cache allocation of the full save area to nmi.c, for early boot use a static __initdata block. Reviewed-by: Heiko Carstens <heiko.carstens@de.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
2017-10-19s390/ctl_reg: move control register definitions to ctl_reg.hMartin Schwidefsky
The nmi.h header has some constant defines for control register bits. These definitions should really be located in ctl_reg.h. Move and rename the defines. Reviewed-by: Heiko Carstens <heiko.carstens@de.ibm.com> Reviewed-by: Hendrik Brueckner <brueckner@linux.vnet.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
2017-10-19s390/ctl_reg: use decoding unions in update_cr_regsMartin Schwidefsky
Add a decoding union for the bits in control registers 2 and use 'union ctlreg0' and 'union ctlreg2' in update_cr_regs to improve readability. Reviewed-by: Heiko Carstens <heiko.carstens@de.ibm.com> Reviewed-by: Hendrik Brueckner <brueckner@linux.vnet.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
2017-10-19s390/nmi: use smp_emergency_stop instead of smp_send_stopMartin Schwidefsky
The smp_send_stop() function can be called from s390_handle_damage while DAT is off. This happens if a machine check indicates that kernel gprs or control registers can not be restored. The function smp_send_stop reenables DAT via __load_psw_mask. That should work for the case of lost kernel gprs and the system will do the expected stop of all CPUs. But if control registers are lost, in particular CR13 with the home space ASCE, interesting secondary crashes may occur. Make smp_emergency_stop callable from nmi.c and remove the cpumask argument. Replace the smp_send_stop call with smp_emergency_stop in the s390_handle_damage function. In addition add notrace and NOKPROBE_SYMBOL annotations for all functions required for the emergency shutdown. Reviewed-by: Heiko Carstens <heiko.carstens@de.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
2017-10-19dma-mapping: turn dma_cache_sync into a dma_map_ops methodChristoph Hellwig
After we removed all the dead wood it turns out only two architectures actually implement dma_cache_sync as a real op: mips and parisc. Add a cache_sync method to struct dma_map_ops and implement it for the mips defualt DMA ops, and the parisc pa11 ops. Note that arm, arc and openrisc support DMA_ATTR_NON_CONSISTENT, but never provided a functional dma_cache_sync implementations, which seems somewhat odd. Signed-off-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Robin Murphy <robin.murphy@arm.com>
2017-10-19sh: make dma_cache_sync a no-opChristoph Hellwig
sh does not implement DMA_ATTR_NON_CONSISTENT allocations, so it doesn't make any sense to do any work in dma_cache_sync given that it must be a no-op when dma_alloc_attrs returns coherent memory. On the other hand sh uses dma_cache_sync internally in the dma_ops implementation and for the maple bus that does not use the DMA API, so a the old functionality for dma_cache_sync is still provided under the name sh_sync_dma_for_device, and without the redundant dev argument. While at it two of the syncing dma_ops also go the proper _for_device postfix. Signed-off-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Robin Murphy <robin.murphy@arm.com>