Skip to content
  1. Nov 07, 2017
  2. Nov 02, 2017
    • Arnd Bergmann's avatar
      Merge tag 'omap-for-v4.15/coccinelle-signed' of... · da18392f
      Arnd Bergmann authored
      Merge tag 'omap-for-v4.15/coccinelle-signed' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/soc
      
      Pull "omap coccinelle warning fixes for v4.15 merge window" from Tony Lindgren:
      
      Few coccinelle robot clean-up patches for careless human coding
      issues for v4.15 merge window sent by their human operatorrrrrs.
      
      * tag 'omap-for-v4.15/coccinelle-signed' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
        ARM: OMAP3: Delete an unnecessary variable initialisation in omap3xxx_hwmod_init()
        ARM: OMAP3: Use common error handling code in omap3xxx_hwmod_init()
        ARM: omap1: add const and initconst to omap_lcd_config
      da18392f
  3. Oct 30, 2017
    • Masahiro Yamada's avatar
      ARM: multi_v7_defconfig: enable CONFIG_GPIO_UNIPHIER · 707ad7ef
      Masahiro Yamada authored
      
      
      Enable the GPIO controller driver used for UniPhier SoC family.
      
      Signed-off-by: default avatarMasahiro Yamada <yamada.masahiro@socionext.com>
      Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      707ad7ef
    • Masahiro Yamada's avatar
      arm64: defconfig: enable CONFIG_GPIO_UNIPHIER · d0e470e0
      Masahiro Yamada authored
      
      
      Enable the GPIO controller driver used for UniPhier SoC family.
      
      Signed-off-by: default avatarMasahiro Yamada <yamada.masahiro@socionext.com>
      Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      d0e470e0
    • Arnd Bergmann's avatar
      Merge tag 'amlogic-soc' of... · 682e3efa
      Arnd Bergmann authored
      Merge tag 'amlogic-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic into next/soc
      
      Pull "Amlogic SoC updates for v4.15" from Kevin Hilman:
      
      - add SMP support to Meson8/8b
      
      * tag 'amlogic-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic:
        ARM: meson: enable MESON_IRQ_GPIO in Kconfig for meson8b
        ARM: meson: Add SMP bringup code for Meson8 and Meson8b
        ARM: smp_scu: allow the platform code to read the SCU CPU status
        ARM: smp_scu: add a helper for powering on a specific CPU
        dt-bindings: Amlogic: Add Meson8 and Meson8b SMP related documentation
      682e3efa
    • Arnd Bergmann's avatar
      Merge tag 'imx-soc-4.15' of... · 16511ee2
      Arnd Bergmann authored
      Merge tag 'imx-soc-4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into next/soc
      
      Pull "i.MX SoC changes for 4.15" from Shawn Guo:
      
       - A series from Marco Franchi from to clean up build warnings see with
         W=1 in arch/arm/mach-imx/.
       - Move i.MX6 speed grading check from i.MX platform code to cpufreq
         driver.  The patch is suggested by cpufreq folks to go through
         arm-soc tree.
       - Enable cpuidle support on i.MX6DL starting from IMX_CHIP_REVISION_1_1.
       - Constify platform_suspend_ops for MXS platform.
      
      * tag 'imx-soc-4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
        cpufreq: imx6q: Move speed grading check to cpufreq driver
        ARM: imx: Enable cpuidle for i.MX6DL starting at 1.1
        ARM: imx: mach-mx31lite: Make mx31lite_map_io static
        ARM: imx: cpuidle-imx5: Include "cpuidle.h" header file
        ARM: imx: 3ds-debugboard: Include "3ds_debugboard.h" header file
        ARM: imx: imx31moboard: Include "board-mx31moboard.h" header file
        ARM: mxs: constify platform_suspend_ops
      16511ee2
    • Arnd Bergmann's avatar
      Merge tag 'arm-soc/for-4.15/maintainers' of http://github.com/Broadcom/stblinux into next/soc · 457e3b10
      Arnd Bergmann authored
      Pull "Broadcom maintainers changes for 4.15" from Florian Fainelli:
      
      This pull request contains Broadcom ARM-based SoCs MAINTAINERS file update for
      4.15, please pull the following:
      
      - Florian updates the MAINTAINERS entry for Broadcom SoCs with the Hurricane 2 regexp
        to match new files being added
      457e3b10
    • Arnd Bergmann's avatar
      Merge tag 'arm-soc/for-4.15/soc-part2' of http://github.com/Broadcom/stblinux into next/soc · 141f70ea
      Arnd Bergmann authored
      Pull "Broadcom soc changes for 4.15 (part 2)" from Florian Fainelli:
      
      This pull request contains Broadcom ARM-based SoC changes for 4.15 (second
      part), please pull the following:
      
      - Florian adds support for the Broadcom Hurricane 2 SoC machine entry point
        and defines the debug UART address for use with earlyprintk/DEBUG_LL
      
      * tag 'arm-soc/for-4.15/soc-part2' of http://github.com/Broadcom/stblinux:
        ARM: debug: Add Hurricane 2 UART2 debug addresses
        ARM: bcm: Add support for Broadcom Hurricane 2 SoC
      141f70ea
    • Arnd Bergmann's avatar
      Merge tag 'arm-soc/for-4.15/defconfig' of http://github.com/Broadcom/stblinux into next/soc · 688de98f
      Arnd Bergmann authored
      Pull "Broadcom defconfig changes for 4.15" from Florian Fainelli:
      
      This pull request contains Broadcom ARM-based SoCs multi_v7_defconfig file
      updates for 4.15, please pull the following:
      
      - Florian enables the Broadcom Hurricane 2 SoC in multi_v7_defconfig
        (CONFIG_ARCH_BCM_HR2)
      
      * tag 'arm-soc/for-4.15/defconfig' of http://github.com/Broadcom/stblinux:
        ARM: multi_v7_defconfig: Enable CONFIG_ARCH_BCM_HR2
      688de98f
    • Arnd Bergmann's avatar
      Merge tag 'keystone_config_4.15' of... · 4ba845da
      Arnd Bergmann authored
      Merge tag 'keystone_config_4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone into next/soc
      
      Pull "ARM: Keystone config update for 4.15" from Santosh Shilimkar:
      
      ARM: Enable PWM driver config
      
      * tag 'keystone_config_4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone:
        ARM: configs: keystone: Enable TIECAP PWM driver
      4ba845da
    • Arnd Bergmann's avatar
      Merge tag 'amlogic-defconfig' of... · 0a02a258
      Arnd Bergmann authored
      Merge tag 'amlogic-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic into next/soc
      
      Pull "Amlogic: defconfig updates for v4.15" from Kevin Hilman:
      - enable SDIO/MMC controller
      
      * tag 'amlogic-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic:
        ARM: multi_v7_defconfig: enable the Meson MX SDIO/MMC controller
      0a02a258
    • Arnd Bergmann's avatar
      Merge tag 'imx-defconfig-4.15' of... · 2a10276c
      Arnd Bergmann authored
      Merge tag 'imx-defconfig-4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into next/soc
      
      Pull "i.MX defconfig updates for 4.15" from Shawn Guo:
       - Turn on DRM_DW_HDMI_CEC option to get HDMI CEC support.
       - Enable MUX_MMIO to get ADV7180 probe on Gateworks GW51xx boards.
      
      * tag 'imx-defconfig-4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
        ARM: imx_v6_v7_defconfig: Select the CEC driver
        ARM: imx_v6_v7_defconfig: Select CONFIG_MUX_MMIO
      2a10276c
    • Arnd Bergmann's avatar
      Merge tag 'mvebu-arm64-4.15-1' of git://git.infradead.org/linux-mvebu into next/soc · 5068d871
      Arnd Bergmann authored
      Pull "mvebu arm64 for 4.15 (part 1)" from Gregory CLEMENT:
      
      For Armada 7K/8K, enable NAND, RTC, comphy and 10G PHY in the
      defconfig
      
      * tag 'mvebu-arm64-4.15-1' of git://git.infradead.org/linux-mvebu:
        arm64: defconfig: enable RTC on Armada 7K/8K SoCs
        arm64: defconfig: enable NAND on Armada 7K/8K SoCs
        arm64: defconfig: enable Marvell CP110 comphy
        arm64: defconfig: enable the Marvell 10G PHY as a module
      5068d871
    • Arnd Bergmann's avatar
      Merge tag 'tegra-for-4.15-arm64-defconfig' of... · 17a8045b
      Arnd Bergmann authored
      Merge tag 'tegra-for-4.15-arm64-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into next/soc
      
      Pull "arm64: tegra: Default configuration updates for v4.15-rc1" from Thierry Reding:
      
      This enables the PCI host controller on 64-bit ARM. It is supported and
      enabled via device tree on Tegra210 and Tegra186.
      
      * tag 'tegra-for-4.15-arm64-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux:
        arm64: defconfig: Enable Tegra PCI controller
      17a8045b
    • Arnd Bergmann's avatar
      Merge tag 'sunxi-core-for-4.15' of... · 84d711ca
      Arnd Bergmann authored
      Merge tag 'sunxi-core-for-4.15' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux into next/soc
      
      Pull "Allwinner core changes for 4.15" from Maxime Ripard:
      
      A bunch of patches for the sunxi documentation and mach-sunxi. The most
      notable feature is the introduction of the R40 support.
      
      * tag 'sunxi-core-for-4.15' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux:
        ARM: sunxi: add support for R40 SoC
        ARM: sunxi: fix the core number of V3s in sunxi README
        dt-bindings: add compatible string for Allwinner V3s SoC
      84d711ca
  4. Oct 29, 2017
  5. Oct 26, 2017
  6. Oct 20, 2017
    • Arnd Bergmann's avatar
      Merge tag 'omap-for-v4.15/ti-sysc-signed' of... · ab63d1ef
      Arnd Bergmann authored
      Merge tag 'omap-for-v4.15/ti-sysc-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/soc
      
      Pull "more soc changes for omaps for v4.15 merge window" from Tony Lindgren:
      
      Drop omap legacy platform data for IRQ, DMA and IO resources. With the
      dts files fixed up to contain the necessary data for basic resources, we
      can drop the related platform data.
      
      Note that this branch depends on the "omap-for-v4.15/fixes-dt-signed"
      branch and the patches with dependencies are based on a merge with that
      branch.
      
      These patches first ensure things keep working for the legacy "ti,hwmods"
      property when we start making it optional, then adds a minimal TI sysc
      interconnect target device driver to handle the new generic "ti,sysc"
      compatible property. And then we can finally drop the legacy platform
      data for IRQ, DMA and IO resources as seen in the diffstats.
      
      * tag 'omap-for-v4.15/ti-sysc-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: (25 commits)
        bus: ti-sysc: Fix unbalanced pm_runtime_enable by adding remove
        bus: ti-sysc: mark PM functions as __maybe_unused
        ARM: OMAP2+: omap_device: fix error return code in omap_device_copy_resources()
        ARM: OMAP2+: Drop legacy struct omap_hwmod_addr_space
        ARM: OMAP2+: Drop omap_hwmod_dma_info
        ARM: OMAP2+: Drop omap_hwmod_irq_info
        ARM: OMAP4: Remove legacy IRQ for PRM
        ARM: OMAP3: Remove legacy IRQ for PRM
        bus: ti-sysc: Add minimal TI sysc interconnect target driver
        ARM: OMAP2+: Populate legacy resources for dma and smartreflex
        ARM: OMAP2+: Parse module IO range from dts for legacy "ti,hwmods" support
        ARM: dts: Configure SmartReflex only to idle the interconnect target module
        ARM: dts: Add nodes for missing omap4 interconnect target modules
        dt-bindings: bus: Minimal TI sysc interconnect target module binding
        ARM: dts: Add missing hwmod related properties for dra7
        ARM: dts: Add missing hwmod related nodes for am33xx
        ARM: dts: Add missing dma hwmod property for omap5
        ARM: dts: Add missing wdt3 node for omap4
        ARM: dts: Add missing hsi node for omap4
        ARM: dts: Add missing onewire node for omap4
        ...
      ab63d1ef
    • Arnd Bergmann's avatar
      Merge tag 'stm32-defconfig-for-v4.15-1' of... · e4191c53
      Arnd Bergmann authored
      Merge tag 'stm32-defconfig-for-v4.15-1' of 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
      e4191c53
    • Linus Walleij's avatar
      ARM: defconfig: select the right SX150X driver · f14100b2
      Linus Walleij authored
      
      
      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: default avatarLinus Walleij <linus.walleij@linaro.org>
      Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      f14100b2
    • Arnd Bergmann's avatar
      Merge tag 'qcom-defconfig-for-4.15' of... · 0e130634
      Arnd Bergmann authored
      Merge tag 'qcom-defconfig-for-4.15' of 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
      0e130634
    • Arnd Bergmann's avatar
      Merge tag 'qcom-arm64-defconfig-for-4.15' of... · f4b5c3bd
      Arnd Bergmann authored
      Merge tag 'qcom-arm64-defconfig-for-4.15' of 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
      f4b5c3bd
    • Arnd Bergmann's avatar
      Merge tag 'zynq-soc-for-4.15' of https://github.com/Xilinx/linux-xlnx into next/soc · 29ce2f34
      Arnd Bergmann authored
      Pull "arm: Xilinx Zynq patches for v4.15" from Michal Simek:
      
      - Remove Soren from reviewer list
      
      * tag 'zynq-soc-for-4.15' of https://github.com/Xilinx/linux-xlnx:
        MAINTAINERS: Remove myself as reviewer
      29ce2f34
    • Arnd Bergmann's avatar
      Merge tag 'samsung-soc-4.15' of... · 818f62ab
      Arnd Bergmann authored
      Merge tag 'samsung-soc-4.15' of 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
      818f62ab
    • Arnd Bergmann's avatar
      Merge tag 'samsung-defconfig-4.15' of... · 977478f9
      Arnd Bergmann authored
      Merge tag 'samsung-defconfig-4.15' of 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
      977478f9
    • Arnd Bergmann's avatar
      Merge tag 'omap-for-v4.15/soc-signed' of... · a1bc4e7c
      Arnd Bergmann authored
      Merge tag 'omap-for-v4.15/soc-signed' of 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
      a1bc4e7c
    • Arnd Bergmann's avatar
      Merge tag 'davinci-for-v4.15/defconfig' of... · 82e3c83e
      Arnd Bergmann authored
      Merge tag 'davinci-for-v4.15/defconfig' of 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
      82e3c83e
    • Arnd Bergmann's avatar
      Merge tag 'hisi-defconfig-for-4.15' of git://github.com/hisilicon/linux-hisi into next/soc · 06743cbf
      Arnd Bergmann authored
      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
      06743cbf
    • Nicolas Dechesne's avatar
      arm64: defconfig: Enable QCOM_IOMMU · 52ba30eb
      Nicolas Dechesne authored
      
      
      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: default avatarNicolas Dechesne <nicolas.dechesne@linaro.org>
      Acked-by: default avatarBjorn Andersson <bjorn.andersson@linaro.org>
      Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      52ba30eb
    • Robin Murphy's avatar
      arm64: Add ThunderX drivers to defconfig · 0454c921
      Robin Murphy authored
      
      
      ThunderX needs its PCI host drivers to do anything useful, and
      it's probably helpful to have networking by default too.
      
      Signed-off-by: default avatarRobin Murphy <robin.murphy@arm.com>
      Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      0454c921
    • Arnd Bergmann's avatar
      Merge tag 'renesas-soc2-for-v4.15' of... · e514130c
      Arnd Bergmann authored
      Merge tag 'renesas-soc2-for-v4.15' of 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
      e514130c
    • Arnd Bergmann's avatar
      Merge tag 'vexpress-updates-4.15' of... · 877cd7ae
      Arnd Bergmann authored
      Merge tag 'vexpress-updates-4.15' of 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
      877cd7ae
    • Arnd Bergmann's avatar
      Merge tag 'renesas-arm64-defconfig-for-v4.15' of... · 6dc3265c
      Arnd Bergmann authored
      Merge tag 'renesas-arm64-defconfig-for-v4.15' of 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
      6dc3265c
    • Arnd Bergmann's avatar
      Merge tag 'integrator-pciv3-delete' of... · c20f5c59
      Arnd Bergmann authored
      Merge tag 'integrator-pciv3-delete' of 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
      c20f5c59