Masahiro Yamada [Mon, 30 Oct 2017 10:00:37 +0000 (19:00 +0900)]
ARM: multi_v7_defconfig: enable CONFIG_GPIO_UNIPHIER
Enable the GPIO controller driver used for UniPhier SoC family.
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Masahiro Yamada [Mon, 30 Oct 2017 10:00:52 +0000 (19:00 +0900)]
arm64: defconfig: enable CONFIG_GPIO_UNIPHIER
Enable the GPIO controller driver used for UniPhier SoC family.
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Arnd Bergmann [Mon, 30 Oct 2017 10:23:13 +0000 (11:23 +0100)]
Merge tag 'amlogic-soc' of git://git./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
Arnd Bergmann [Mon, 30 Oct 2017 10:21:18 +0000 (11:21 +0100)]
Merge tag 'imx-soc-4.15' of git://git./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
Arnd Bergmann [Mon, 30 Oct 2017 10:08:53 +0000 (11:08 +0100)]
Merge tag 'arm-soc/for-4.15/maintainers' of github.com/Broadcom/stblinux into next/soc
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
Arnd Bergmann [Mon, 30 Oct 2017 10:03:28 +0000 (11:03 +0100)]
Merge tag 'arm-soc/for-4.15/soc-part2' of github.com/Broadcom/stblinux into next/soc
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
Arnd Bergmann [Mon, 30 Oct 2017 10:02:01 +0000 (11:02 +0100)]
Merge tag 'arm-soc/for-4.15/defconfig' of github.com/Broadcom/stblinux into next/soc
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
Arnd Bergmann [Mon, 30 Oct 2017 10:00:01 +0000 (11:00 +0100)]
Merge tag 'keystone_config_4.15' of git://git./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
Arnd Bergmann [Mon, 30 Oct 2017 09:58:30 +0000 (10:58 +0100)]
Merge tag 'amlogic-defconfig' of git://git./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
Arnd Bergmann [Mon, 30 Oct 2017 09:43:07 +0000 (10:43 +0100)]
Merge tag 'imx-defconfig-4.15' of git://git./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
Arnd Bergmann [Mon, 30 Oct 2017 09:38:07 +0000 (10:38 +0100)]
Merge tag 'mvebu-arm64-4.15-1' of git://git.infradead.org/linux-mvebu into next/soc
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
Arnd Bergmann [Mon, 30 Oct 2017 09:36:47 +0000 (10:36 +0100)]
Merge tag 'tegra-for-4.15-arm64-defconfig' of git://git./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
Arnd Bergmann [Mon, 30 Oct 2017 09:30:17 +0000 (10:30 +0100)]
Merge tag 'sunxi-core-for-4.15' of https://git./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
Jerome Brunet [Thu, 19 Oct 2017 12:01:39 +0000 (14:01 +0200)]
ARM: meson: enable MESON_IRQ_GPIO in Kconfig for meson8b
select MESON_IRQ_GPIO in Kconfig for Amlogic's meson8b SoC
Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>
Signed-off-by: Kevin Hilman <khilman@baylibre.com>
Martin Blumenstingl [Sun, 17 Sep 2017 16:45:21 +0000 (18:45 +0200)]
ARM: meson: Add SMP bringup code for Meson8 and Meson8b
This adds the necessary SMP-operations and startup code to use the
additional cores on the Amlogic Meson8/Meson8m2 (both are using the same
sequence) and Meson8b (using a slightly difference sequence) SoCs.
Signed-off-by: Carlo Caione <carlo@endlessm.com>
[add Meson8/Meson8m2 support and allow taking CPU cores offline as well]
Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
Signed-off-by: Kevin Hilman <khilman@baylibre.com>
Martin Blumenstingl [Sun, 17 Sep 2017 16:45:20 +0000 (18:45 +0200)]
ARM: smp_scu: allow the platform code to read the SCU CPU status
On Amlogic Meson8 / Meson8m2 (both Cortex-A9) and Meson8b (Cortex-A5)
the CPU hotplug code needs to wait until the SCU status of the CPU that
is being taken offline is SCU_PM_POWEROFF.
Provide a utility function (which can be invoked for example from
.cpu_kill()) which allows reading the SCU status of a CPU.
While here, replace the magic number 0x3 with a preprocessor macro
(SCU_CPU_STATUS_MASK) so we don't have to duplicate this magic number in
the new function.
Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
Acked-by: Russell King <rmk+kernel@armlinux.org.uk>
Signed-off-by: Kevin Hilman <khilman@baylibre.com>
Martin Blumenstingl [Sun, 17 Sep 2017 16:45:19 +0000 (18:45 +0200)]
ARM: smp_scu: add a helper for powering on a specific CPU
To boot the secondary CPUs on the Amlogic Meson8/Meson8m2 (Cortex-A9)
and Meson8b (Cortex-A5) SoCs we have to enable SCU mode SCU_PM_NORMAL,
otherwise the secondary cores will not start.
This patch adds a scu_cpu_power_enable() function which can be used to
enable SCU_PM_NORMAL for a specific (logical) CPU. An internal helper
function is also created, to avoid code duplication with
scu_power_mode().
Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
Acked-by: Russell King <rmk+kernel@armlinux.org.uk>
Signed-off-by: Kevin Hilman <khilman@baylibre.com>
Carlo Caione [Sun, 17 Sep 2017 16:45:18 +0000 (18:45 +0200)]
dt-bindings: Amlogic: Add Meson8 and Meson8b SMP related documentation
With this patch we add documentation for:
* power-management-unit: the PMU is used to bring up the cores during
SMP operations
* sram: among other things the sram is used to store the first code
executed by the core when it is powered up
* cpu-enable-method: the CPU enable method used by Amlogic Meson8 and
Meson8b SoCs
Signed-off-by: Carlo Caione <carlo@endlessm.com>
[also add Meson8 to the documentation]
Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
Acked-by: Rob Herring <robh@kernel.org>
Signed-off-by: Kevin Hilman <khilman@baylibre.com>
Arnd Bergmann [Thu, 19 Oct 2017 22:43:31 +0000 (00:43 +0200)]
Merge tag 'omap-for-v4.15/ti-sysc-signed' of git://git./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
...
Arnd Bergmann [Thu, 19 Oct 2017 20:55:28 +0000 (22:55 +0200)]
Merge tag 'stm32-defconfig-for-v4.15-1' of git://git./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
Linus Walleij [Tue, 17 Oct 2017 09:32:08 +0000 (11:32 +0200)]
ARM: defconfig: select the right SX150X driver
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>
Arnd Bergmann [Thu, 19 Oct 2017 20:53:28 +0000 (22:53 +0200)]
Merge tag 'qcom-defconfig-for-4.15' of git://git./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
Arnd Bergmann [Thu, 19 Oct 2017 20:52:24 +0000 (22:52 +0200)]
Merge tag 'qcom-arm64-defconfig-for-4.15' of git://git./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
Arnd Bergmann [Thu, 19 Oct 2017 20:49:55 +0000 (22:49 +0200)]
Merge tag 'zynq-soc-for-4.15' of https://github.com/Xilinx/linux-xlnx into next/soc
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
Arnd Bergmann [Thu, 19 Oct 2017 20:47:20 +0000 (22:47 +0200)]
Merge tag 'samsung-soc-4.15' of git://git./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
Arnd Bergmann [Thu, 19 Oct 2017 20:46:29 +0000 (22:46 +0200)]
Merge tag 'samsung-defconfig-4.15' of git://git./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
Arnd Bergmann [Thu, 19 Oct 2017 20:44:20 +0000 (22:44 +0200)]
Merge tag 'omap-for-v4.15/soc-signed' of git://git./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
Arnd Bergmann [Thu, 19 Oct 2017 20:43:31 +0000 (22:43 +0200)]
Merge tag 'davinci-for-v4.15/defconfig' of git://git./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
Arnd Bergmann [Thu, 19 Oct 2017 20:41:48 +0000 (22:41 +0200)]
Merge tag 'hisi-defconfig-for-4.15' of git://github.com/hisilicon/linux-hisi 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
Nicolas Dechesne [Wed, 11 Oct 2017 15:19:25 +0000 (17:19 +0200)]
arm64: defconfig: Enable QCOM_IOMMU
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>
Robin Murphy [Wed, 11 Oct 2017 15:15:41 +0000 (16:15 +0100)]
arm64: Add ThunderX drivers to defconfig
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>
Arnd Bergmann [Thu, 19 Oct 2017 20:37:51 +0000 (22:37 +0200)]
Merge tag 'renesas-soc2-for-v4.15' of https://git./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
Arnd Bergmann [Thu, 19 Oct 2017 20:36:41 +0000 (22:36 +0200)]
Merge tag 'vexpress-updates-4.15' of git://git./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
Arnd Bergmann [Thu, 19 Oct 2017 16:10:00 +0000 (18:10 +0200)]
Merge tag 'renesas-arm64-defconfig-for-v4.15' of https://git./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
Arnd Bergmann [Thu, 19 Oct 2017 16:09:06 +0000 (18:09 +0200)]
Merge tag 'integrator-pciv3-delete' of git://git./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
Arnd Bergmann [Thu, 19 Oct 2017 16:07:09 +0000 (18:07 +0200)]
Merge tag 'arm-soc/for-4.15/soc' of github.com/Broadcom/stblinux into 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
Arnd Bergmann [Thu, 19 Oct 2017 15:59:50 +0000 (17:59 +0200)]
Merge tag 'renesas-soc-for-v4.15' of https://git./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
Arnd Bergmann [Thu, 19 Oct 2017 15:57:11 +0000 (17:57 +0200)]
Merge tag 'renesas-defconfig-for-v4.15' of https://git./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
Arnd Bergmann [Thu, 19 Oct 2017 15:53:13 +0000 (17:53 +0200)]
Merge tag 'ep93xx-for-arm-soc-1' of git://git./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
Tuomas Tynkkynen [Wed, 18 Oct 2017 14:46:20 +0000 (17:46 +0300)]
arm64: defconfig: Enable Tegra PCI controller
The driver has supported the 64-bit Tegra210 for a while now, so enable
it in the defconfig.
Signed-off-by: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Signed-off-by: Thierry Reding <treding@nvidia.com>
Fabio Estevam [Sat, 30 Sep 2017 15:16:46 +0000 (12:16 -0300)]
cpufreq: imx6q: Move speed grading check to cpufreq driver
On some i.MX6 SoCs (like i.MX6SL, i.MX6SX and i.MX6UL) that do not have
speed grading check, opp table will not be created in platform code,
so cpufreq driver prints the following error message:
cpu cpu0: dev_pm_opp_get_opp_count: OPP table not found (-19)
However, this is not really an error in this case because the
imx6q-cpufreq driver first calls dev_pm_opp_get_opp_count()
and if it fails, it means that platform code does not provide
OPP and then dev_pm_opp_of_add_table() will be called.
In order to avoid such confusing error message, move the speed grading
check from platform code to the imx6q-cpufreq driver.
This way the imx6q-cpufreq no longer has to check whether OPP table
is supplied by platform code.
Tested on a i.MX6Q and i.MX6UL based boards.
Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com>
Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
Alex Elder [Mon, 16 Oct 2017 14:22:57 +0000 (09:22 -0500)]
arm64: defconfig: re-enable Qualcomm DB410c USB
Stephen Boyd reworked some Qualcomm USB code earlier this year.
The result requires a few different config options to be enabled
in order for the USB on the DragonBoard 410c to continue working,
but these were never added to arm64 "defconfig". As a result, USB
on that board stopped working during the v4.13-rc1 merge window.
Re-enable this functionality by setting the needed config options
in the arm64 "defconfig" file.
Signed-off-by: Alex Elder <elder@linaro.org>
Signed-off-by: Andy Gross <andy.gross@linaro.org>
Pierre-Yves MORDRET [Thu, 28 Sep 2017 15:36:00 +0000 (17:36 +0200)]
ARM: configs: stm32: Add MDMA support in STM32 defconfig
This patch adds MDMA support in STM32 defconfig file
Signed-off-by: Pierre-Yves MORDRET <pierre-yves.mordret@st.com>
Signed-off-by: Alexandre Torgue <alexandre.torgue@st.com>
Leonard Crestez [Wed, 11 Oct 2017 12:08:23 +0000 (15:08 +0300)]
ARM: imx: Enable cpuidle for i.MX6DL starting at 1.1
Enable cpuidle support on i.MX6DL starting from IMX_CHIP_REVISION_1_1.
This also makes the code cleaner because 6q and 6dl actually have
different revision histories.
Signed-off-by: Bai Ping <ping.bai@nxp.com>
Signed-off-by: Leonard Crestez <leonard.crestez@nxp.com>
Reviewed-by: Lucas Stach <l.stach@pengutronix.de>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
Tony Lindgren [Fri, 13 Oct 2017 17:48:40 +0000 (10:48 -0700)]
bus: ti-sysc: Fix unbalanced pm_runtime_enable by adding remove
Looks like we're missing remove() that's needed if a driver instance
rebound. Otherwise we will get "Unbalanced pm_runtime_enable!".
Signed-off-by: Tony Lindgren <tony@atomide.com>
Arnd Bergmann [Fri, 13 Oct 2017 09:25:32 +0000 (11:25 +0200)]
bus: ti-sysc: mark PM functions as __maybe_unused
The new bus driver causes a harmless compile-time warning when
CONFIG_PM is disabled:
drivers/bus/ti-sysc.c:440:12: error: 'sysc_runtime_resume' defined but not used [-Werror=unused-function]
static int sysc_runtime_resume(struct device *dev)
^~~~~~~~~~~~~~~~~~~
drivers/bus/ti-sysc.c:421:12: error: 'sysc_runtime_suspend' defined but not used [-Werror=unused-function]
static int sysc_runtime_suspend(struct device *dev)
^~~~~~~~~~~~~~~~~~~~
This marks the two unused functions as __maybe_unused to shut up
that warning.
Fixes:
0eecc636e5a2 ("bus: ti-sysc: Add minimal TI sysc interconnect target driver")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Wei Yongjun [Fri, 13 Oct 2017 09:29:25 +0000 (09:29 +0000)]
ARM: OMAP2+: omap_device: fix error return code in omap_device_copy_resources()
Fix to return error code -EINVAL from the irq_of_parse_and_map() error
handling case instead of 0, as done elsewhere in this function.
Fixes:
d85a2d61432a ("ARM: OMAP2+: Populate legacy resources for dma
and smartreflex")
Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Marco Franchi [Mon, 25 Sep 2017 18:55:59 +0000 (15:55 -0300)]
ARM: imx: mach-mx31lite: Make mx31lite_map_io static
The following build warning is seen with W=1:
warning: no previous prototype for ‘mx31lite_map_io’
[-Wmissing-prototypes] void __init mx31lite_map_io(void)
This function is only used in this file so make it "static".
Signed-off-by: Marco Franchi <marco.franchi@nxp.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
Marco Franchi [Mon, 25 Sep 2017 18:55:58 +0000 (15:55 -0300)]
ARM: imx: cpuidle-imx5: Include "cpuidle.h" header file
The following build warning is seen with W=1:
warning: no previous prototype for ‘imx5_cpuidle_init’
[-Wmissing-prototypes] int __init imx5_cpuidle_init(void)
Fix this warning by including "cpuidle.h".
Signed-off-by: Marco Franchi <marco.franchi@nxp.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
Marco Franchi [Mon, 25 Sep 2017 18:55:57 +0000 (15:55 -0300)]
ARM: imx: 3ds-debugboard: Include "3ds_debugboard.h" header file
The following build warning is seen with W=1:
warning: no previous prototype for ‘mxc_expio_init’
[-Wmissing-prototypes] int __init mxc_expio_init(u32 base, u32 intr_gpio)
Fix this warning by including "3ds_debugboard.h".
Signed-off-by: Marco Franchi <marco.franchi@nxp.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
Marco Franchi [Mon, 25 Sep 2017 18:55:56 +0000 (15:55 -0300)]
ARM: imx: imx31moboard: Include "board-mx31moboard.h" header file
The following build warnings are seen with W=1:
warning: no previous prototype for ‘mx31moboard_devboard_init’
[-Wmissing-prototypes] void __init mx31moboard_devboard_init(void)
warning: no previous prototype for ‘mx31moboard_marxbot_init’
[-Wmissing-prototypes] void __init mx31moboard_marxbot_init(void)
Fix these warnings by including "board-mx31moboard.h".
Signed-off-by: Marco Franchi <marco.franchi@nxp.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
Fabio Estevam [Wed, 20 Sep 2017 13:56:10 +0000 (10:56 -0300)]
ARM: imx_v6_v7_defconfig: Select the CEC driver
Select CONFIG_DRM_DW_HDMI_CEC option, so that the CEC driver can be
loaded by default.
Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
Florian Fainelli [Thu, 28 Sep 2017 23:15:02 +0000 (16:15 -0700)]
ARM: multi_v7_defconfig: Enable CONFIG_ARCH_BCM_HR2
Turn on Broadcom Hurrican 2 SoC support by default to get access to its
drivers.
Acked-by: Jon Mason <jon.mason@broadcom.com>
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Florian Fainelli [Thu, 28 Sep 2017 23:14:59 +0000 (16:14 -0700)]
ARM: debug: Add Hurricane 2 UART2 debug addresses
Broadcom Hurricane 2 SoCs typically use their secondary UART for
debug/console, provide a known good location for that.
Acked-by: Jon Mason <jon.mason@broadcom.com>
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Florian Fainelli [Thu, 28 Sep 2017 23:14:55 +0000 (16:14 -0700)]
ARM: bcm: Add support for Broadcom Hurricane 2 SoC
Add a Kconfig entry point and basic machine board code for the Broadcom
Hurricane 2 SoCs used in switching products.
Acked-by: Jon Mason <jon.mason@broadcom.com>
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Florian Fainelli [Thu, 28 Sep 2017 23:14:53 +0000 (16:14 -0700)]
MAINTAINERS: Update Broadcom iProc regexp with Hurricane 2
Update the Broadcom iProc regepx with recently added Hurricane 2 SoC
support.
Acked-by: Jon Mason <jon.mason@broadcom.com>
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Gregory CLEMENT [Mon, 2 Oct 2017 15:44:16 +0000 (17:44 +0200)]
arm64: defconfig: enable RTC on Armada 7K/8K SoCs
The Armada 38x RTC driver supports also the RTC controller found on the
Armada 7K/8K SoCs, so enable it.
Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
Martin Blumenstingl [Sat, 7 Oct 2017 16:29:40 +0000 (18:29 +0200)]
ARM: multi_v7_defconfig: enable the Meson MX SDIO/MMC controller
This enables the new Amlogic Meson MX SDIO/MMC controller driver, which
typically connects to the SD card and SDIO wifi module.
The driver is enabled as built-in to allow booting from the SD card.
Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
Signed-off-by: Kevin Hilman <khilman@baylibre.com>
Nicolas Dechesne [Wed, 11 Oct 2017 15:19:25 +0000 (17:19 +0200)]
arm64: defconfig: Enable QCOM_IOMMU
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: Andy Gross <andy.gross@linaro.org>
Bjorn Andersson [Wed, 4 Oct 2017 18:58:57 +0000 (11:58 -0700)]
ARM: qcom_defconfig: Enable Z2 Tablet related options
Select the options necessary to get USB, coincell, WiFI, touchscreen and
backlight on the Z2 Tablet (and other family B devices) working. The
device specific peripherals are selected as modules.
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Signed-off-by: Andy Gross <andy.gross@linaro.org>
Bjorn Andersson [Wed, 4 Oct 2017 18:58:56 +0000 (11:58 -0700)]
ARM: qcom_defconfig: Disable DEBUG_GPIO
GPIO debug spams the kernel log quite a bit, so remove this from the
default Qualcomm defconfig.
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Signed-off-by: Andy Gross <andy.gross@linaro.org>
Stephen Boyd [Wed, 28 Jun 2017 22:33:03 +0000 (15:33 -0700)]
ARM: qcom_defconfig: Enable configs for USB on apq8064/msm8974
Enable the regulator driver, usb phy drivers, and hsic hub driver
to support USB devices on apq8064 and msm8974.
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
Signed-off-by: Andy Gross <andy.gross@linaro.org>
Bjorn Andersson [Wed, 4 Oct 2017 18:58:55 +0000 (11:58 -0700)]
ARM: qcom_defconfig: Resync with new Kconfig options
CONFIG_HWSPINLOCK must be selected explicitly for SMEM and its
dependencies to be enabled.
The update is generated by "make savedefconfig" and as such reflects
changes to the implicit state of other options, as of v4.14-rc1.
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Signed-off-by: Andy Gross <andy.gross@linaro.org>
Markus Elfring [Tue, 3 Oct 2017 19:24:00 +0000 (21:24 +0200)]
ARM: OMAP: Fix typos in two comment lines in _omap_dm_timer_request()
Adjust three words in this description.
Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Markus Elfring [Tue, 3 Oct 2017 19:07:33 +0000 (21:07 +0200)]
ARM: OMAP: Use kcalloc() in omap_system_dma_probe()
* A multiplication for the size determination of a memory allocation
indicated that an array data structure should be processed.
Thus use the corresponding function "kcalloc".
This issue was detected by using the Coccinelle software.
* Replace the specification of a data type by a pointer dereference
to make the corresponding size determination a bit safer according to
the Linux coding style convention.
Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Markus Elfring [Tue, 3 Oct 2017 18:46:48 +0000 (20:46 +0200)]
ARM: OMAP: Improve a size determination in two functions
Replace the specification of data structures by pointer dereferences
as the parameter for the operator "sizeof" to make the corresponding size
determination a bit safer according to the Linux coding style convention.
This issue was detected by using the Coccinelle software.
Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Markus Elfring [Tue, 3 Oct 2017 11:10:26 +0000 (13:10 +0200)]
ARM: OMAP: Delete an error message for a failed memory allocation in two functions
Omit extra messages for a memory allocation failure in these functions.
This issue was detected by using the Coccinelle software.
Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Arnd Bergmann [Thu, 5 Oct 2017 12:09:04 +0000 (14:09 +0200)]
ARM: shmobile: rcar-gen2: fix non-SMP build
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.
Fixes:
fd45a136ff6 ("ARM: shmobile: rcar-gen2: Make sure CNTVOFF is initialized on CA7/15")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Tony Lindgren [Tue, 10 Oct 2017 21:27:33 +0000 (14:27 -0700)]
ARM: OMAP2+: Drop legacy struct omap_hwmod_addr_space
With all of mach-omap2 booting now in device tree only mode,
we can get the module IO range from device tree and just drop
the legacy hwmod struct omap_hwmod_addr_space.
Cc: Lokesh Vutla <lokeshvutla@ti.com>
Cc: Paul Walmsley <paul@pwsan.com>
Cc: Tero Kristo <t-kristo@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Tony Lindgren [Tue, 10 Oct 2017 21:27:26 +0000 (14:27 -0700)]
ARM: OMAP2+: Drop omap_hwmod_dma_info
We have all of mach-omap2 booting in device tree only
mode now, and this data is populated from device tree.
Note that once we have removed support for the omap legacy
DMA, we can also drop struct omap_dma_dev_attr.
Cc: Lokesh Vutla <lokeshvutla@ti.com>
Cc: Paul Walmsley <paul@pwsan.com>
Cc: Tero Kristo <t-kristo@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Tony Lindgren [Tue, 10 Oct 2017 21:27:19 +0000 (14:27 -0700)]
ARM: OMAP2+: Drop omap_hwmod_irq_info
With the previous patches removing the need for legacy IRQs
now that all of mach-omap2 is booting in device tree only mode,
we can drop struct omap_hwmod_irq_info.
Note that we can now also finally drop omap4_xlate_irq.
Cc: Lokesh Vutla <lokeshvutla@ti.com>
Cc: Marc Zyngier <marc.zyngier@arm.com>
Cc: Paul Walmsley <paul@pwsan.com>
Cc: Tero Kristo <t-kristo@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Tony Lindgren [Tue, 10 Oct 2017 21:27:13 +0000 (14:27 -0700)]
ARM: OMAP4: Remove legacy IRQ for PRM
We have the PRM IRQ mapped in device tree and this legacy code
is no longer needed.
Cc: Lokesh Vutla <lokeshvutla@ti.com>
Cc: Paul Walmsley <paul@pwsan.com>
Cc: Tero Kristo <t-kristo@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Tony Lindgren [Tue, 10 Oct 2017 21:27:06 +0000 (14:27 -0700)]
ARM: OMAP3: Remove legacy IRQ for PRM
We have this coming from device tree and legacy booting is
no longer needed.
Cc: Lokesh Vutla <lokeshvutla@ti.com>
Cc: Paul Walmsley <paul@pwsan.com>
Cc: Tero Kristo <t-kristo@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Tony Lindgren [Tue, 10 Oct 2017 21:23:43 +0000 (14:23 -0700)]
bus: ti-sysc: Add minimal TI sysc interconnect target driver
We can handle the sysc interconnect target module in a generic way
for many TI SoCs. Initially let's just enable runtime PM with
autosuspend, and probe the children. This can already be used for
idling interconnect target modules that don't have any device driver
available for the child devices.
For now, the "ti,hwmods" custom binding is still required. That will
be eventually deprecated in later patches. And more features will be
added, such as parsing for sysc capabilities so we can continue
removing the legacy platform data.
Cc: Benoît Cousson <bcousson@baylibre.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Cc: Nishanth Menon <nm@ti.com>
Cc: Matthijs van Duin <matthijsvanduin@gmail.com>
Cc: Paul Walmsley <paul@pwsan.com>
Cc: Peter Ujfalusi <peter.ujfalusi@ti.com>
Cc: Sakari Ailus <sakari.ailus@iki.fi>
Cc: Tero Kristo <t-kristo@ti.com>
Cc: Tomi Valkeinen <tomi.valkeinen@ti.com>
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Tony Lindgren <tony@atomide.com>
Tony Lindgren [Tue, 10 Oct 2017 21:23:35 +0000 (14:23 -0700)]
ARM: OMAP2+: Populate legacy resources for dma and smartreflex
We can populate the legacy resources needed by dma and smartreflex
from device tree in omap_device_build().
There should be no need to do this for other devices, and eventually
these two remaining users will be gone too. The legacy dma will be
dropped when the remaining users have been converted to use the
dmaengine driver, and smartreflex can now become just a regular
device driver with a few pdata callbacks.
This is needed in order to remove remaining device dma, irq and io
resources from the interconnect code.
And while at it, let's simplify things by removing otherwise
unused omap_device_build_ss() as we will never call it for more
than one hwmod.
Cc: "Benoît Cousson" <bcousson@baylibre.com>
Cc: Lokesh Vutla <lokeshvutla@ti.com>
Cc: Nishanth Menon <nm@ti.com>
Cc: Paul Walmsley <paul@pwsan.com>
Cc: Tero Kristo <t-kristo@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Tony Lindgren [Tue, 10 Oct 2017 21:23:27 +0000 (14:23 -0700)]
ARM: OMAP2+: Parse module IO range from dts for legacy "ti,hwmods" support
When removing legacy platform data for IO ranges for the hwmod
interconnect code, we still need to support the "ti,hwmods"
property.
And as we're going to use a generic sysc device driver to handle the
interconnect target instances, we can parse the information needed
for legacy "ti,hwmods" IO range from the dts. It's always the first
range the interconnect target module provides.
Note that we want to parse the range instead of the first child
device IO regs as the child device may not always be defined.
The child IP device node may not exist in cases where there is no
driver binding for the device, or when the child IP block may not
even be functional for some SoC revisions. But the IO range of the
interconnect target module is always known.
Cc: "Benoît Cousson" <bcousson@baylibre.com>
Cc: Lokesh Vutla <lokeshvutla@ti.com>
Cc: Paul Walmsley <paul@pwsan.com>
Cc: Tero Kristo <t-kristo@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Tony Lindgren [Tue, 10 Oct 2017 21:19:47 +0000 (14:19 -0700)]
Merge branch 'omap-for-v4.15/fixes-dt' into omap-for-v4.15/ti-sysc
Tony Lindgren [Tue, 10 Oct 2017 21:15:04 +0000 (14:15 -0700)]
ARM: dts: Configure SmartReflex only to idle the interconnect target module
The TRM has marked dra7 SmartReflex as reserved and we should not
touch those registers as pointed out by Nishanth Menon <nm@ti.com>.
We do still want to idle the related interconnect target modules on
init though.
Let's do this by only configuring the generic interconnect target modules
and not add the child SmartReflex devices.
Cc: Lokesh Vutla <lokeshvutla@ti.com>
Cc: Nishanth Menon <nm@ti.com>
Cc: Paul Walmsley <paul@pwsan.com>
Cc: Rob Herring <robh+dt@kernel.org>
Cc: Tero Kristo <t-kristo@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Tony Lindgren [Tue, 10 Oct 2017 21:14:50 +0000 (14:14 -0700)]
ARM: dts: Add nodes for missing omap4 interconnect target modules
On omap4 we are missing dts nodes for several interconnect target
modules that we are idling on init. This currently works with the
legacy platform data still around.
To fix this, let's add the interconnect target modules so we can
idle the unused interconnect target module on init.
Also note that adding the interconnect target module node does not
necessarily mean that there is a driver available for the child IP
block, or that the child IP block is even functional.
In the SGX case, the PowerVR driver is closed source. And McASP on
omap4 has at least the TX path disabled and is not supported by the
davinci-mcasp driver. For AESS there is old Android 3.4 kernel
driver available.
For smarflex, we are still probing with platform data and the
driver needs more work before we can add the device ip child nodes.
And finally, we're not yet using the interconnet ranges. I will
be posting separate patches for those later on.
Cc: Benoît Cousson <bcousson@baylibre.com>
Cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Cc: Liam Girdwood <lgirdwood@gmail.com>
Cc: Mark Brown <broonie@kernel.org>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Mauro Carvalho Chehab <mchehab@kernel.org>
Cc: Nishanth Menon <nm@ti.com>
Cc: Matthijs van Duin <matthijsvanduin@gmail.com>
Cc: Paul Walmsley <paul@pwsan.com>
Cc: Peter Ujfalusi <peter.ujfalusi@ti.com>
Cc: Rob Herring <robh+dt@kernel.org>
Cc: Sakari Ailus <sakari.ailus@iki.fi>
Cc: Tero Kristo <t-kristo@ti.com>
Cc: Tomi Valkeinen <tomi.valkeinen@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Tony Lindgren [Tue, 10 Oct 2017 21:14:40 +0000 (14:14 -0700)]
dt-bindings: bus: Minimal TI sysc interconnect target module binding
With the recently introduced omap clkctrl module binding, we can start
moving omap hwmod data to device tree and drivers from arch/arm/mach-omap2.
To start doing this, let's introduce a device tree binding for TI
sysc interconnect target module hardware. The sysc manages module clocks,
idlemodes and interconnect level resets. Each interconnect target module
can have one or more child devices connected to it.
TI sysc interconnect target module hardware is independent of the
interconnect. It is used at least with TI L3 interconnect (Arteris NoC)
and TI L4 interconnect (Sonics s3220). The sysc is mostly used for
interaction between module and PRCM. It participates in the OCP Disconnect
Protocol but other than that is mostly indepenent of the interconnect.
As all the features may not be supported for a given sysc module, we
need to use device tree configuration for the revision of the interconnect
target module.
Note that the interconnect target module control registers are always
sprinked at varying locations in the unused address space of the first
child device IP block. To avoid device tree reg conflicts, the sysc device
provides ranges for it's children.
For a non-intrusive transition from static hwmod data to using device
tree defined TI interconnect target module binding, we can keep things
working with static hwmod data if device tree property "ti,hwmods" is
specified for the the interconnect target module.
Note that additional properties for sysc capabilities will be added
later on. For now, we can already use this binding for interconnect
target modules that do not have any child device drivers available.
This allows us to idle the unused interconnect target modules during
init without the need for legacy hwmod platform data for doing it.
Cc: Benoît Cousson <bcousson@baylibre.com>
Cc: Dave Gerlach <d-gerlach@ti.com>
Cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Cc: Liam Girdwood <lgirdwood@gmail.com>
Cc: Mark Brown <broonie@kernel.org>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Mauro Carvalho Chehab <mchehab@kernel.org>
Cc: Nishanth Menon <nm@ti.com>
Cc: Matthijs van Duin <matthijsvanduin@gmail.com>
Cc: Paul Walmsley <paul@pwsan.com>
Cc: Peter Ujfalusi <peter.ujfalusi@ti.com>
Cc: Sakari Ailus <sakari.ailus@iki.fi>
Cc: Suman Anna <s-anna@ti.com>
Cc: Tero Kristo <t-kristo@ti.com>
Cc: Tomi Valkeinen <tomi.valkeinen@ti.com>
Reviewed-by: Rob Herring <robh@kernel.org>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Kefeng Wang [Tue, 22 Aug 2017 13:20:56 +0000 (21:20 +0800)]
arm64: defconfig: Enable hisilicon hibmc drm driver
Enable DRM_HISI_HIBMC as module for Hisilicon D03/D05 board.
Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com>
Signed-off-by: Wei Xu <xuwei5@hisilicon.com>
Vignesh R [Mon, 9 Oct 2017 16:43:32 +0000 (09:43 -0700)]
ARM: configs: keystone: Enable TIECAP PWM driver
Enable PWM_TIECAP driver to support ECAP IP present in 66AK2G SoC.
Signed-off-by: Vignesh R <vigneshr@ti.com>
Signed-off-by: Santosh Shilimkar <ssantosh@kernel.org>
Linus Torvalds [Mon, 9 Oct 2017 03:53:29 +0000 (20:53 -0700)]
Linux 4.14-rc4
Marek Szyprowski [Wed, 4 Oct 2017 06:38:22 +0000 (08:38 +0200)]
ARM: EXYNOS: Remove Exynos4212 related dead code
Support for Exynos4212 SoCs has been removed by commit
bca9085e0ae9 ("ARM:
dts: exynos: remove Exynos4212 support (dead code)"), so there is no need
to keep remaining dead code related to this SoC version.
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>
Linus Torvalds [Sat, 7 Oct 2017 19:34:16 +0000 (12:34 -0700)]
Merge tag 'scsi-fixes' of git://git./linux/kernel/git/jejb/scsi
Pull SCSI fixes from James Bottomley:
- a couple of serious fixes: use after free and blacklist for WRITE
SAME
- one error leg fix: write_pending failure
- one user experience problem: do not override max_sectors_kb
- one minor unused function removal
* tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
scsi: ibmvscsis: Fix write_pending failure path
scsi: libiscsi: Remove iscsi_destroy_session
scsi: libiscsi: Fix use-after-free race during iscsi_session_teardown
scsi: sd: Do not override max_sectors_kb sysfs setting
scsi: sd: Implement blacklist option for WRITE SAME w/ UNMAP
Linus Torvalds [Sat, 7 Oct 2017 17:07:51 +0000 (10:07 -0700)]
Merge branch 'i2c/for-current-4.14' of git://git./linux/kernel/git/wsa/linux
Pull i2c fixes from Wolfram Sang:
"I2C has three driver fixes for the newly introduced drivers and one ID
addition for the i801 driver"
* 'i2c/for-current-4.14' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:
i2c: i2c-stm32f7: make structure stm32f7_setup static const
i2c: ensure termination of *_device_id tables
i2c: i801: Add support for Intel Cedar Fork
i2c: stm32f7: fix setup structure
Linus Torvalds [Sat, 7 Oct 2017 17:03:03 +0000 (10:03 -0700)]
Merge tag 'mmc-v4.14-rc3' of git://git./linux/kernel/git/ulfh/mmc
Pull MMC fixes from Ulf Hansson:
"MMC core:
- Fix driver strength selection when selecting hs400es
- Delete bounce buffer handling:
This change fixes a problem related to how bounce buffers are being
allocated. However, instead of trying to fix that, let's just
remove the mmc bounce buffer code altogether, as it has practically
no use.
MMC host:
- meson-gx: A couple of fixes related to clock/phase/tuning
- sdhci-xenon: Fix clock resource by adding an optional bus clock"
* tag 'mmc-v4.14-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc:
mmc: sdhci-xenon: Fix clock resource by adding an optional bus clock
mmc: meson-gx: include tx phase in the tuning process
mmc: meson-gx: fix rx phase reset
mmc: meson-gx: make sure the clock is rounded down
mmc: Delete bounce buffer handling
mmc: core: add driver strength selection when selecting hs400es
Linus Torvalds [Sat, 7 Oct 2017 00:59:32 +0000 (17:59 -0700)]
Merge tag 'hwmon-for-linus-v4.14-rc4' of git://git./linux/kernel/git/groeck/linux-staging
Pull hwmon fix from Guenter Roeck:
"Fix up error path in xgene driver"
* tag 'hwmon-for-linus-v4.14-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
hwmon: (xgene) Fix up error handling path mixup in 'xgene_hwmon_probe()'
Linus Torvalds [Fri, 6 Oct 2017 23:25:08 +0000 (16:25 -0700)]
Merge tag 'clk-fixes-for-linus' of git://git./linux/kernel/git/clk/linux
Pull clk fixes from Stephen Boyd:
- build fix to export the clk_bulk_prepare() symbol
- suspend fix for Samsung Exynos SoCs where we need to keep clks on
across suspend
- two critical clk markings for clks that shouldn't ever turn off on
Rockchip SoCs
- a fix for a copy-paste mistake on Rockchip rk3128 causing some clks
to touch the same bit and trample over one another
* tag 'clk-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux:
clk: samsung: exynos4: Enable VPLL and EPLL clocks for suspend/resume cycle
clk: Export clk_bulk_prepare()
clk: rockchip: add sclk_timer5 as critical clock on rk3128
clk: rockchip: fix up rk3128 pvtm and mipi_24m gate regs error
clk: rockchip: add pclk_pmu as critical clock on rk3128
Linus Torvalds [Fri, 6 Oct 2017 22:57:08 +0000 (15:57 -0700)]
Merge tag 'arc-4.14-rc4' of git://git./linux/kernel/git/vgupta/arc
Pull ARC udpates from Vineet Gupta:
- updates for various platforms
- boot log updates for upcoming HS48 family of cores (dual issue)
* tag 'arc-4.14-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc:
ARC: [plat-hsdk]: Add reset controller node to manage ethernet reset
ARC: [plat-hsdk]: Temporary fix to set CPU frequency to 1GHz
ARC: fix allnoconfig build warning
ARCv2: boot log: identify HS48 cores (dual issue)
ARC: boot log: decontaminate ARCv2 ISA_CONFIG register
arc: remove redundant UTS_MACHINE define in arch/arc/Makefile
ARC: [plat-eznps] Update platform maintainer as Noam left
ARC: [plat-hsdk] use actual clk driver to manage cpu clk
ARC: [*defconfig] Reenable soft lock-up detector
ARC: [plat-axs10x] sdio: Temporary fix of sdio ciu frequency
ARC: [plat-hsdk] sdio: Temporary fix of sdio ciu frequency
ARC: [plat-axs103] Add temporary quirk to reset ethernet IP
Linus Torvalds [Fri, 6 Oct 2017 22:53:36 +0000 (15:53 -0700)]
Merge tag 'xfs-4.14-fixes-4' of git://git./fs/xfs/xfs-linux
Pull xfs fixes from Darrick Wong:
- fix a race between overlapping copy on write aio
- fix cow fork swapping when we defragment reflinked files
* tag 'xfs-4.14-fixes-4' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux:
xfs: handle racy AIO in xfs_reflink_end_cow
xfs: always swap the cow forks when swapping extents
Linus Torvalds [Fri, 6 Oct 2017 19:13:50 +0000 (12:13 -0700)]
Merge branch 'for-linus' of git://git.kernel.dk/linux-block
Pull block fixes from Jens Axboe:
"A collection of fixes for this series. This contains:
- NVMe pull request from Christoph, one uuid attribute fix, and one
fix for the controller memory buffer address for remapped BARs.
- use-after-free fix for bsg, from Benjamin Block.
- bcache race/use-after-free fix for a list traversal, fixing a
regression in this merge window. From Coly Li.
- null_blk change configfs dependency change from a 'depends' to a
'select'. This is a change from this merge window as well. From me.
- nbd signal fix from Josef, fixing a regression introduced with the
status code changes.
- nbd MAINTAINERS mailing list entry update.
- blk-throttle stall fix from Joseph Qi.
- blk-mq-debugfs fix from Omar, fixing an issue where we don't
register the IO scheduler debugfs directory, if the driver is
loaded with it. Only shows up if you switch through the sysfs
interface"
* 'for-linus' of git://git.kernel.dk/linux-block:
bsg-lib: fix use-after-free under memory-pressure
nvme-pci: Use PCI bus address for data/queues in CMB
blk-mq-debugfs: fix device sched directory for default scheduler
null_blk: change configfs dependency to select
blk-throttle: fix possible io stall when upgrade to max
MAINTAINERS: update list for NBD
nbd: fix -ERESTARTSYS handling
nvme: fix visibility of "uuid" ns attribute
bcache: use llist_for_each_entry_safe() in __closure_wake_up()
Linus Torvalds [Fri, 6 Oct 2017 19:07:09 +0000 (12:07 -0700)]
Merge tag 'pci-v4.14-fixes-4' of git://git./linux/kernel/git/helgaas/pci
Pull PCI fixes from Bjorn Helgaas:
"Fix legacy IDE probe issues exposed by recent PCI core IRQ mapping
changes (Bartlomiej Zolnierkiewicz, Lorenzo Pieralisi)"
* tag 'pci-v4.14-fixes-4' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci:
ide: fix IRQ assignment for PCI bus order probing
ide: pci: free PCI BARs on initialization failure
ide: free hwif->portdev on hwif_init() failure
Linus Torvalds [Fri, 6 Oct 2017 18:31:46 +0000 (11:31 -0700)]
Merge tag 'arm64-fixes' of git://git./linux/kernel/git/arm64/linux
Pull arm64 fixes from Catalin Marinas:
- Bring initialisation of user space undefined instruction handling
early (core_initcall) since late_initcall() happens after modprobe in
initramfs is invoked. Similar fix for fpsimd initialisation
- Increase the kernel stack when KASAN is enabled
- Bring the PCI ACS enabling earlier via the
iort_init_platform_devices()
- Fix misleading data abort address printing (decimal vs hex)
* tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux:
arm64: Ensure fpsimd support is ready before userspace is active
arm64: Ensure the instruction emulation is ready for userspace
arm64: Use larger stacks when KASAN is selected
ACPI/IORT: Fix PCI ACS enablement
arm64: fix misleading data abort decoding
Linus Torvalds [Fri, 6 Oct 2017 18:28:34 +0000 (11:28 -0700)]
Merge tag 'for-linus' of git://git./virt/kvm/kvm
Pull KVM fixes from Radim Krčmář:
- fix PPC XIVE interrupt delivery
- fix x86 RCU breakage from asynchronous page faults when built without
PREEMPT_COUNT
- fix x86 build with -frecord-gcc-switches
- fix x86 build without X86_LOCAL_APIC
* tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
KVM: add X86_LOCAL_APIC dependency
x86/kvm: Move kvm_fastop_exception to .fixup section
kvm/x86: Avoid async PF preempting the kernel incorrectly
KVM: PPC: Book3S: Fix server always zero from kvmppc_xive_get_xive()
Linus Torvalds [Fri, 6 Oct 2017 18:25:55 +0000 (11:25 -0700)]
Merge tag 'for-linus' of git://git./linux/kernel/git/dledford/rdma
Pull rdma fixes from Doug Ledford:
"This is a pretty small pull request. Only 6 patches in total. There
are no outstanding -rc patches on the mailing list after this pull
request, so only if some new issues are discovered in the remainder of
the rc cycles will you hear from me again.
Summary:
- a fix for iwpm netlink usage
- a fix for error unwinding in mlx5
- two fixes to vlan handling in qedr
- a couple small i40iw fixes"
* tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma:
i40iw: Fix port number for query QP
i40iw: Add missing memory barriers
RDMA/qedr: Parse vlan priority as sl
RDMA/qedr: Parse VLAN ID correctly and ignore the value of zero
IB/mlx5: Fix label order in error path handling
RDMA/iwpm: Properly mark end of NL messages
Linus Torvalds [Fri, 6 Oct 2017 16:03:08 +0000 (09:03 -0700)]
Merge branch 'for-4.14-rc4' of git://git./linux/kernel/git/kdave/linux
Pull btrfs fixes from David Sterba:
"Two more fixes for bugs introduced in 4.13.
The sector_t problem with 32bit architecture and !LBDAF config seems
serious but the number of affected deployments is hopefully low.
The clashing status bits could lead to a confusing in-memory state of
the whole-filesystem operations if used with the quota override sysfs
knob"
* 'for-4.14-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux:
Btrfs: fix overlap of fs_info::flags values
btrfs: avoid overflow when sector_t is 32 bit
Linus Torvalds [Fri, 6 Oct 2017 16:01:45 +0000 (09:01 -0700)]
Merge tag 'ceph-for-4.14-rc4' of git://github.com/ceph/ceph-client
Pull ceph fixes from Ilya Dryomov:
"Two fixups for CephFS snapshot-handling patches in -rc1"
* tag 'ceph-for-4.14-rc4' of git://github.com/ceph/ceph-client:
ceph: fix __choose_mds() for LSSNAP request
ceph: properly queue cap snap for newly created snap realm
Eugeniy Paltsev [Fri, 22 Sep 2017 16:49:11 +0000 (19:49 +0300)]
ARC: [plat-hsdk]: Add reset controller node to manage ethernet reset
DW ethernet controller on HSDK hangs sometimes after SW reset, so
add reset node to make possible to reset DW ethernet controller HW.
Signed-off-by: Eugeniy Paltsev <Eugeniy.Paltsev@synopsys.com>
Signed-off-by: Vineet Gupta <vgupta@synopsys.com>
Linus Torvalds [Fri, 6 Oct 2017 15:52:53 +0000 (08:52 -0700)]
Merge branch 'overlayfs-linus' of git://git./linux/kernel/git/mszeredi/vfs
Pull overlayfs fixes from Miklos Szeredi:
"Fix a regression in 4.14 and one in 4.13. The latter is a case when
Docker is doing something it really shouldn't and gets away with it.
We now print a warning instead of erroring out.
There are also fixes to several error paths"
* 'overlayfs-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs:
ovl: fix regression caused by exclusive upper/work dir protection
ovl: fix missing unlock_rename() in ovl_do_copy_up()
ovl: fix dentry leak in ovl_indexdir_cleanup()
ovl: fix dput() of ERR_PTR in ovl_cleanup_index()
ovl: fix error value printed in ovl_lookup_index()
ovl: fix may_write_real() for overlayfs directories