OSDN Git Service
Jisheng Zhang [Fri, 30 Mar 2018 03:02:11 +0000 (11:02 +0800)]
MAINTAINERS: update entry for ARM/berlin
Synaptics has acquired the Multimedia Solutions Business of Marvell[1].
So change the berlin entry name and move it to its alphabetical
location. We move to ARM/Synaptics instead of ARM/Marvell.
This patch also updates my email address from marvell to synaptics.
[1] https://www.synaptics.com/company/news/conexant-marvell
Signed-off-by: Jisheng Zhang <Jisheng.Zhang@synaptics.com>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Arnd Bergmann [Wed, 4 Apr 2018 10:25:36 +0000 (12:25 +0200)]
ARM: omap2: fix am43xx build without L2X0
When CONFIG_CACHE_L2X0 is disabled, the am43xx specific suspend
implemnentation fails to link:
arch/arm/mach-omap2/sleep43xx.o: In function `get_l2cache_base':
(.text+0x180): undefined reference to `omap4_get_l2cache_base'
This adds an #ifdef protection around the code, like we do for am44xx.
Fixes:
41d37e61372f ("ARM: OMAP2+: Introduce low-level suspend code for AM43XX")
Acked-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Arnd Bergmann [Wed, 28 Mar 2018 15:14:29 +0000 (17:14 +0200)]
Merge tag 'v4.17-rockchip-soc32-1' of ssh://gitolite./linux/kernel/git/mmind/linux-rockchip into next/soc
Pull "Rockchip soc32 changes for 4.17" from Heiko Stübner:
Fix for the legacy pmu-regmap in the smp-code to have a real name
and therefore not create a dummy* entry in debugfs.
* tag 'v4.17-rockchip-soc32-1' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
ARM: rockchip: Set name of pmu regmap_config in smp code
Arnd Bergmann [Tue, 27 Mar 2018 13:48:52 +0000 (15:48 +0200)]
Merge tag 'omap-for-v4.17/soc-pt2-signed' of ssh://gitolite./linux/kernel/git/tmlind/linux-omap into next/soc
Pull "Two omap5 specific aux control module patches for v4.17" from Tony Lindgren:
On omap5 there is an aux control module that we are not handling
currently for clocks, so let's add support for it.
* tag 'omap-for-v4.17/soc-pt2-signed' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
ARM: OMAP5: control: add support for control module wkup pad config
ARM: omap2+: control: add support for auxiliary control module instances
Arnd Bergmann [Tue, 27 Mar 2018 13:47:58 +0000 (15:47 +0200)]
Merge tag 'samsung-soc-4.17-2' of ssh://gitolite./linux/kernel/git/krzk/linux into next/soc
Pull "Samsung mach/soc changes for v4.17, part two" from Krzysztof Kozłowski:
1. Fix coupled CPU idle freeze on Exynos4210.
2. Simplify hot-path in coupled CPU idle.
* tag 'samsung-soc-4.17-2' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/krzk/linux:
ARM: EXYNOS: Simplify code in coupled CPU idle hot path
ARM: EXYNOS: Fix coupled CPU idle freeze on Exynos4210
Arnd Bergmann [Tue, 27 Mar 2018 13:45:03 +0000 (15:45 +0200)]
Merge tag 'renesas-soc-for-v4.17' of ssh://gitolite./linux/kernel/git/horms/renesas into next/soc
Pull "Renesas ARM Based SoC Updates for v4.17" from Simon Horman:
01d675f159e0 ARM: shmobile: rcar-gen2: Add watchdog support
58adf1ba0d22 ARM: shmobile: Add watchdog support
* SoC
- Identify R-Car V3H (r8a77980) and M3N (r8a77965)
- Enable R-Car Gen2 regulator quirk for Stout board with H3 (r8a7790) SoC
Marek Vaust says "Regulator setup is suboptimal on H2 Stout too. The
Stout newly has two DA9210 regulators, so the quirk is extended to
handle another DA9210 at i2c address 0x70."
- Add watchdog support
This is the SoC portion of the following solution. It is not yet
enabled in DT as it is not functional without clock dependencies
in place.
Fabrizio Castro says "this series has been around for some time as RFC,
and it has collected useful comments from the community along the way.
The solution proposed by this patch set works for most R-Car Gen2 and
RZ/G1 devices, but not all of them. We now know that for some R-Car
Gen2 early revisions there is no proper software fix. Anyway, no
product has been built around early revisions, but development boards
mounting early revisions (basically prototypes) are still out there.
As a result, this series isn't enabling the internal watchdog on R-Car
Gen2 boards, developers may enable it in board specific device trees if
needed. This series has been tested by me on the iwg20d, iwg22d,
Lager, Alt, and Koelsch boards.
The problem
===========
To deal with SMP on R-Car Gen2 and RZ/G1, we install a reset vector to
ICRAM1 and we program the [S]BAR registers so that when we turn ON the
non-boot CPUs they are redirected to the reset vector installed by Linux
in ICRAM1, and eventually they continue the execution to RAM, where the
SMP bring-up code will take care of the rest. The content of the [S]BAR
registers survives a watchdog triggered reset, and as such after the
watchdog fires the boot core will try and execute the SMP bring-up code
instead of jumping to the bootrom code.
The fix
=======
The main strategy for the solution is to let the reset vector decide if
it needs to jump to shmobile_boot_fn or to the bootrom code. In a
watchdog triggered reset scenario, since the [S]BAR registers keep their
values, the boot CPU will jump into the newly designed reset vector, the
assembly routine will eventually test WOVF (a bit in register RWTCSRA
that indicates if the watchdog counter has overflown, the value of this
bit gets retained in this scenario), and jump to the bootrom code which
will in turn load up the bootloader, etc. When bringing up SMP or using
CPU hotplug, the reset vector will jump to shmobile_boot_fn instead."
* R-Car Rst
- Add support for R-Car V3H (r8a77980) and V3H (r8a77980)
* R-Car SYSC
- Mark rcar_sysc_matches[] __initconst
Geert Uytterhoeven says "This frees another 1764 bytes
(arm32/shmobile_defconfig) or 1000 bytes (arm64/renesas_defconfig) of
memory after kernel init."
- Fix power area parents
Sergei Shtylyov says "According to the figure 9.2(b) of the R-Car
Series, 3rd Generation User’s Manual: Hardware Rev. 0.80 the A2IRn and
A2SCn power areas in R8A77970 have the A3IR area as a parent, thus the
SYSC driver has those parents wrong.."
- Add support for R-Car V3H (r8a77980) and V3H (r8a77980)
* tag 'renesas-soc-for-v4.17' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
ARM: shmobile: rcar-gen2: Add watchdog support
ARM: shmobile: Add watchdog support
ARM: shmobile: rcar-gen2: Fix error check in regulator quirk
soc: renesas: rcar-rst: Add support for R-Car M3-N
ARM: shmobile: stout: enable R-Car Gen2 regulator quirk
soc: renesas: rcar-sysc: Add R-Car M3-N support
soc: renesas: Identify R-Car M3-N
soc: renesas: rcar-sysc: add R8A77980 support
dt-bindings: power: add R8A77980 SYSC power domain definitions
soc: renesas: r8a77970-sysc: fix power area parents
soc: renesas: rcar-rst: Enable watchdog as reset trigger for Gen2
soc: renesas: rcar-rst: add R8A77980 support
soc: renesas: identify R-Car V3H
soc: renesas: rcar-sysc: Mark rcar_sysc_matches[] __initconst
Arnd Bergmann [Tue, 27 Mar 2018 13:42:18 +0000 (15:42 +0200)]
Merge tag 'sunxi-core-for-4.17' of ssh://gitolite./linux/kernel/git/sunxi/linux into next/soc
Pull "Allwinner core changes for 4.17" from Maxime Ripard:
Here is our bunch of changes for mach-sunxi for this release cycle. This is
basically only about bringing the SMP support to the A80, which has a bug
in hardware and cannot use PSCI like the other SoCs we have.
* tag 'sunxi-core-for-4.17' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/sunxi/linux:
ARM: sunxi: mc-smp: Split out SoC-specific device node lookup sequence
ARM: sunxi: mc-smp: Use DT enable-method for sun9i A80 SMP
ARM: sunxi: mc-smp: Fix "lookback" typo
ARM: sun9i: smp: Support cpu0 hotplug
dt-bindings: ARM: sunxi: Document A80 SoC secure SRAM usage by SMP hotplug
ARM: sun9i: smp: Support CPU/cluster power down and hotplugging for cpu1~7
ARM: sun9i: Support SMP bring-up on A80
Stefan Agner [Sun, 18 Mar 2018 20:34:41 +0000 (21:34 +0100)]
ARM: multi_v7_defconfig: add NXP FlexCAN IP support
Enable FlexCAN support as module by default. FlexCAN can be found
on various NXP designs such as the i.MX and Vybrid SoC family.
Signed-off-by: Stefan Agner <stefan@agner.ch>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Stefan Agner [Sun, 18 Mar 2018 20:34:37 +0000 (21:34 +0100)]
ARM: multi_v7_defconfig: enable thermal driver for i.MX devices
Enable the i.MX thermal driver required for i.MX SoC family.
Signed-off-by: Stefan Agner <stefan@agner.ch>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Stefan Agner [Sun, 18 Mar 2018 20:34:39 +0000 (21:34 +0100)]
ARM: multi_v7_defconfig: add RN5T618 PMIC family support
This allows to successfully boot Colibri iMX7 which is using
the Ricoh RN5T567 PMIC.
Signed-off-by: Stefan Agner <stefan@agner.ch>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Stefan Agner [Sun, 18 Mar 2018 20:34:42 +0000 (21:34 +0100)]
ARM: multi_v7_defconfig: add NXP graphics drivers
Enable drivers to support NXP graphics IPs such as:
- Etnaviv (e.g. i.MX6)
- DCU (e.g. Vybrid LS1021A)
- mxsfb (e.g. i.MX6UL/ULL/7)
Signed-off-by: Stefan Agner <stefan@agner.ch>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Stefan Agner [Sun, 18 Mar 2018 20:34:40 +0000 (21:34 +0100)]
ARM: multi_v7_defconfig: add GPMI NAND controller support
Add GPMI NAND controller support as required by some NXP i.MX6/7
based boards.
Signed-off-by: Stefan Agner <stefan@agner.ch>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Stefan Agner [Sun, 18 Mar 2018 20:34:36 +0000 (21:34 +0100)]
ARM: multi_v7_defconfig: add OCOTP driver for NXP SoCs
Enable on-chip OTP NVMEM support for NXP i.MX and VF610 SoCs.
Since OTP values might be required by drivers required during
boot, make sure the driver is built-in (e.g. i.MX thermal
driver).
Signed-off-by: Stefan Agner <stefan@agner.ch>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Stefan Agner [Sun, 18 Mar 2018 20:34:38 +0000 (21:34 +0100)]
ARM: multi_v7_defconfig: configure I2C driver built-in
PMIC often require the I2C bus, and the PMIC regulators might be
necessary to power on eMMC/SD-card or other supplies required
for successful boot. Make sure I2C driver for i.MX devices is
built-in.
Signed-off-by: Stefan Agner <stefan@agner.ch>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Kunihiko Hayashi [Tue, 27 Mar 2018 12:23:27 +0000 (21:23 +0900)]
arm64: defconfig: add CONFIG_UNIPHIER_THERMAL and CONFIG_SNI_AVE
Enable the thermal monitor driver and the AVE ethernet driver
implemented on UniPhier SoCs.
Signed-off-by: Kunihiko Hayashi <hayashi.kunihiko@socionext.com>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Arnd Bergmann [Tue, 27 Mar 2018 13:29:06 +0000 (15:29 +0200)]
Merge tag 'stratix10_defconfig_for_v4.17' of ssh://gitolite./linux/kernel/git/dinguyen/linux into next/soc
Pull "ARM64: stratix10: defconfig updates for 4.17" from Dinh Nguyen:
-enables STMMAC_ETH controller that is present on Stratix10
* tag 'stratix10_defconfig_for_v4.17' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux:
arm64: defconfig: enable stmmac ethernet to defconfig
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Arnd Bergmann [Tue, 27 Mar 2018 13:27:23 +0000 (15:27 +0200)]
Merge tag 'omap-for-v4.17/defconfig-pt2-signed' of ssh://gitolite./linux/kernel/git/tmlind/linux-omap into next/soc
Pull "Second set of defconfig changes for omap variants for v4.17" from Tony Lindgren:
This series enables more devices working on droid4 to make it easier
for people and distros to use out of the box.
* tag 'omap-for-v4.17/defconfig-pt2-signed' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
ARM: multi_v7_defconfig: Enable CPCAP related options mostly as loadable modules
ARM: omap2plus_defconfig: Add UINPUT
ARM: omap2plus_defconfig: Enable MDM6600 USB PHY
ARM: omap2plus_defconfig: Add AUDIO_GRAPH_CARD
ARM: omap2plus_defconfig: Enable PWM_VIBRA
Arnd Bergmann [Tue, 27 Mar 2018 13:26:32 +0000 (15:26 +0200)]
Merge tag 'qcom-arm64-defconfig-for-4.17' of ssh://gitolite./linux/kernel/git/agross/linux into next/soc
Pull "Qualcomm ARM64 Based defconfig Updates for v4.17" from Andy Gross:
* Enable cpufreq governors, QCOM TSENS, and QCOM APCS driver
* tag 'qcom-arm64-defconfig-for-4.17' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/agross/linux:
arm64: defconfig: enable more cpufreq governors
arm64: defconfig: enable thermal sensor on QCOM platforms
arm64: defconfig: Enable the APCS IPC driver on Qualcomm platforms
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Arnd Bergmann [Tue, 27 Mar 2018 13:24:47 +0000 (15:24 +0200)]
Merge tag 'armsoc-versatile-drm-defconfig' of ssh://gitolite./linux/kernel/git/linusw/linux-integrator into next/soc
Pull "defconfig changes for Versatile DRM" from Linus Walleij:
This augments the RealView and Versatile defconfig to use the PL111
DRM driver rather than the old fbdev driver.
* tag 'armsoc-versatile-drm-defconfig' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator:
ARM: defconfig: Configure Versatile boards to use PL111 DRM
ARM: defconfig: Update Versatile defconfig
ARM: defconfig: Switch RealView boards to use P111 DRM
ARM: defconfig: Update RealView defconfig
Arnd Bergmann [Tue, 27 Mar 2018 13:22:43 +0000 (15:22 +0200)]
Merge tag 'amlogic-defconfig' of ssh://gitolite./linux/kernel/git/khilman/linux-amlogic into next/soc
Pull "Amlogic defconfig fixes for v4.17" from Kevin Hilman
* tag 'amlogic-defconfig' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic:
arm64: defconfig: enable MESON EFUSE
Arnd Bergmann [Tue, 27 Mar 2018 13:17:53 +0000 (15:17 +0200)]
Merge tag 'omap-for-v4.17/defconfig-signed' of ssh://gitolite./linux/kernel/git/tmlind/linux-omap into next/soc
Pull "Defconfig updates for omap variants for v4.17 merge window"
from Tony Lindgren:
We need to enable MMC_SDHCI option in both omap2plus_defconfig and
multi_v7_defconfig so systems are able to mount root when the dts files
get updated for sdhci.
Then let's update omap2plus_defconfig so we can patch it easier. And as
Arnd noticed earlier, just running make savedefconfig will accidentally
drop few Kconfig options. This is happening because some options are no
longer available as loadable modules like LIRC. Or new dependencies have
been added such as SND_OSSEMUL for selecting SOUND_OSS_CORE.
So we first move the unchanged options around to their make savedefconfig
suggested place, then update the options to prevent make savedefconfig
dropping some options accidentally, and then finally drop the unused
options.
And after that we enable options DRM_OMAP and 8250_OMAP. These both have
been around for years now. And we do have 8250_OMAP warn about console
being redirected with SERIAL_8250_OMAP_TTYO_FIXUP option that is enabled
by default. Some users may need to update their inittab to use ttyS*
instead of ttyO* though. If this turns out to be a problem, we may want
to introduce a separate compatible for 8250-omap. But I think we're good
to go with the SERIAL_8250_OMAP_TTYO_FIXUP warning now. Let's not update
multi_v7_defconfig yet though and first see how 8250_OMAP change plays
out.
We also enable few new options for PM on am335x and am437x, and CEC in
omap2plus_defconfig. Naturally similar options can be later on added to
multi_v7_defconfig, but in this series we only enable OTG, MUSB and the
related PHYs in multi_v7_defconfig to make it more usable for distros.
* tag 'omap-for-v4.17/defconfig-signed' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
ARM: multi_v7_defconfig: Enable USB gadget configfs as loadable module
ARM: multi_v7_defconfig: Enable various USB PHYs found on omap variants
ARM: multi_v7_defconfig: Enable OTG and MUSB as loadable modules
ARM: omap2plus_defconfig: Enable 8250_OMAP
ARM: omap2plus_defconfig: Switch to use omapdrm by default
ARM: omap2plus_defconfig: Enable CEC
ARM: omap2plus_defconfig: Enable am335x and am437x PM options
ARM: omap2plus_defconfig: Drop unneeded options
ARM: omap2plus_defconfig: Add SND_OSSEMUL
ARM: omap2plus_defconfig: Update LIRC options
ARM: omap2plus_defconfig: Select MFD_TI_LMU
ARM: omap2plus_defconfig: Add SERIAL_DEV for bluetooth
ARM: omap2plus_defconfig: Update for moved options
ARM: omap2plus_defconfig: Enable CONFIG_MMC_SDHCI_OMAP
ARM: multi_v7_defconfig: Enable CONFIG_MMC_SDHCI_OMAP
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Arnd Bergmann [Tue, 27 Mar 2018 13:13:50 +0000 (15:13 +0200)]
Merge tag 'renesas-defconfig-for-v4.17' of ssh://gitolite./linux/kernel/git/horms/renesas into next/soc
Pull "Renesas ARM Based SoC Defconfig Updates for v4.17" from Simon Horman:
Updates to shmobile defconfig:
* Redresh defconfig to ease future maintenence overhead
* Disable CONFIG_EMBEDDED
Geert Uytterhoeven says "CONFIG_EXPERT exposes too many config options
that do not matter for development. E.g. it prohibits using the default
values for the various SH_SCI options. However, CONFIG_EMBEDDED selects
CONFIG_EXPERT, so it cannot be disabled.
Hence disable CONFIG_EMBEDDED, and compensate for the loss of
CONFIG_DEBUG_KERNEL by enabling the latter.
Actual impact, all harmless:
- CONFIG_NAMESPACES=y (plus a few related CONFIG_*_NS options),
- CONFIG_SYSCTL_SYSCALL=n,
- CONFIG_SERIAL_SH_SCI_NR_UARTS changed from 20 to 18,
- Some HID support became enabled,
- CONFIG_DEBUG_MEMORY_INIT=y,"
* Enable RZA1 pin controller
This allows the Genmai board with RZ/A1 (r7s72100) SoC to once
again boot using the shmobile defconfig.
* tag 'renesas-defconfig-for-v4.17' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
ARM: shmobile: defconfig: Disable CONFIG_EMBEDDED
ARM: shmobile: defconfig: Refresh
ARM: shmobile: Enable RZA1 pin controller
Arnd Bergmann [Tue, 27 Mar 2018 13:12:54 +0000 (15:12 +0200)]
Merge tag 'renesas-arm64-defconfig-for-v4.17' of ssh://gitolite./linux/kernel/git/horms/renesas into next/soc
Pull "Renesas ARM64 Based SoC Defconfig Updates for v4.17" from Simon Horman:
Enable the following to allow them to be more widely exercised:
* Newly added R8A77965 and R8A77980 SoCs
* PWM and USB as used on R-Car Gen3 SoCs
* tag 'renesas-arm64-defconfig-for-v4.17' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
arm64: defconfig: enable R8A77965 SoC
arm64: defconfig: Enable PWM and USB for R-Car
arm64: defconfig: enable R8A77980 SoC
Arnd Bergmann [Tue, 27 Mar 2018 13:11:46 +0000 (15:11 +0200)]
Merge tag 'tegra-for-4.17-arm64-defconfig' of ssh://gitolite./linux/kernel/git/tegra/linux into next/soc
Pull "arm64: Default configuration updates for v4.17-rc1" from Thierry Reding:
Enable the BPMP thermal and CPU frequency drivers as well as make sure
that the Tegra SMMU is enabled by default because there's no fun without
it. Also enable initial Tegra194 support.
* tag 'tegra-for-4.17-arm64-defconfig' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/tegra/linux:
arm64: defconfig: Enable the Tegra SMMU by default
arm64: defconfig: Enable CONFIG_TEGRA_BPMP_THERMAL
arm64: defconfig: Enable CONFIG_ARM_TEGRA186_CPUFREQ
arm64: defconfig: Enable NVIDIA Tegra194 support
Arnd Bergmann [Tue, 27 Mar 2018 13:10:12 +0000 (15:10 +0200)]
Merge tag 'imx-defconfig-4.17' of ssh://gitolite./linux/kernel/git/shawnguo/linux into next/soc
Pull "i.MX defconfig updates for 4.17" from Shawn Guo:
- Re-sync defconfig files by running savedefconfig.
- Enable generic fsl-asoc-card driver for imx_v4_v5_defconfig.
- Enable MAG3110 magnetometer sensor driver, AC97 and WM8962 codec
driver, DA9062/63 PMIC, RTC and Watchdog support for
imx_v6_v7_defconfig.
* tag 'imx-defconfig-4.17' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
ARM: mxs_defconfig: Re-sync defconfig
ARM: imx_v4_v5_defconfig: Use the generic fsl-asoc-card driver
ARM: imx_v4_v5_defconfig: Re-sync defconfig
ARM: imx_v6_v7_defconfig: Select CONFIG_SND_SOC_WM8962 explicitly
ARM: imx_v6_v7_defconfig: Re-sync defconfig
ARM: imx_v6_v7_defconfig: Enable Dialog Semiconductor DA9062 driver
ARM: imx_v6_v7_defconfig: Enable AC97 codec support
ARM: imx: Update imx_v6_v7_defconfig for mag3110 support
ARM: imx_v6_v7_defconfig: enable OP-TEE
ARM: imx_v6_v7_defconfig: select the CONFIG_CPUFREQ_DT
Arnd Bergmann [Thu, 15 Mar 2018 09:36:33 +0000 (10:36 +0100)]
ARM: imx: fix imx6sll-only build
When selecting SOC_IMX6SLL but not SOC_IMX6SL, we get a link error:
arch/arm/mach-imx/mach-imx6sl.o: In function `imx6sl_init_late':
mach-imx6sl.c:(.init.text+0x14): undefined reference to `imx6sl_cpuidle_init'
This adds the missing line to the Makefile to also build the cpuidle
support that we need here.
Fixes:
dee5dee2a5b2 ("ARM: imx: Add basic msl support for imx6sll")
Acked-by: Shawn Guo <shawnguo@kernel.org>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Arnd Bergmann [Mon, 5 Feb 2018 22:06:43 +0000 (23:06 +0100)]
ARM: imx: select ARM_CPU_SUSPEND for CPU_IDLE as well
The cpuidle support calls cpu_suspend(), which is compiled conditionally,
and fails to link unless something selects CONFIG_ARM_CPU_SUSPEND.
arch/arm/mach-imx/cpuidle-imx6sx.o: In function `imx6sx_enter_wait':
cpuidle-imx6sx.c:(.text+0x6c): undefined reference to `cpu_suspend'
This adds an explicit select statement here.
Acked-by: Shawn Guo <shawnguo@kernel.org>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Fabio Estevam [Fri, 16 Mar 2018 17:10:09 +0000 (14:10 -0300)]
ARM: mxs_defconfig: Re-sync defconfig
Re-sync the defconfig by doing:
make savedefconfig
cp defconfig arch/arm/configs/mxs_defconfig
So keep it in sync to help further changes in defconfig.
The explanation for removing the Kconfig symbols:
CONFIG_FHANDLE=y: verified that it is still selected
selected
CONFIG_DEVPTS_MULTIPLE_INSTANCES=y: does not exist anymore
CONFIG_NVMEM=y: verified that it is still selected
CONFIG_LOCKUP_DETECTOR=y: need to select CONFIG_SOFTLOCKUP_DETECTOR now
CONFIG_TIMER_STATS=y: does not exist anymore
Boot tested on a imx28evk.
Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
Fabio Estevam [Sat, 3 Mar 2018 20:05:48 +0000 (17:05 -0300)]
ARM: imx_v4_v5_defconfig: Use the generic fsl-asoc-card driver
fsl-asoc-card machine driver also supports sgtl5000, so use it favor
of the imx-sgtl5000 machine driver, which will be probably be removed
in the future.
Tested on a imx25-pdk board.
Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
Fabio Estevam [Sat, 3 Mar 2018 20:05:47 +0000 (17:05 -0300)]
ARM: imx_v4_v5_defconfig: Re-sync defconfig
Re-sync the defconfig by doing:
make savedefconfig
cp defconfig arch/arm/configs/imx_v4_v5_defconfig
So keep it in sync to help further changes in defconfig.
Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
Dinh Nguyen [Fri, 23 Feb 2018 23:24:59 +0000 (17:24 -0600)]
arm64: defconfig: enable stmmac ethernet to defconfig
This patch enables the CONFIG_STMMAC_ETH to the default arm64 defconfig:
-CONFIG_STMMAC_ETH=m
+CONFIG_STMMAC_ETH=y
+CONFIG_DWMAC_IPQ806X=m
+CONFIG_DWMAC_MESON=m
+CONFIG_DWMAC_ROCKCHIP=m
+CONFIG_DWMAC_SUNXI=m
+CONFIG_DWMAC_SUN8I=m
The STMMAC ethernet controller is on the Stratix10 platform, and thus needs
driver to be in the kernel image for NFS to work.
Signed-off-by: Dinh Nguyen <dinguyen@kernel.org>
Marek Szyprowski [Wed, 21 Mar 2018 09:46:39 +0000 (10:46 +0100)]
ARM: EXYNOS: Simplify code in coupled CPU idle hot path
exynos_enter_aftr() is called by coupled CPU idle code every time CPU
enters idle state, what can be considered as a hot path. Replace
of_machine_is_compatible() call with a simple SoC revision check.
of_machine_is_compatible() function performs a dozen of string comparisons
during the full device tree walk, while soc_is_exynos4412() is a simple
integer check on SoC revision variable.
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Acked-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>
Marek Szyprowski [Wed, 21 Mar 2018 09:45:05 +0000 (10:45 +0100)]
ARM: EXYNOS: Fix coupled CPU idle freeze on Exynos4210
Since commit
04c8b0f82c7d ("irqchip/gic: Make locking a BL_SWITCHER only
feature") coupled CPU idle freezes from time to time on Exynos4210. Later
commit
313c8c16ee62 ("PM / CPU: replace raw_notifier with atomic_notifier")
changed the context in which the CPU idle code is executed, what results
in fully reproducible freeze all the time. However, almost the same coupled
CPU idle code works fine on Exynos3250 regardless of the changes made in
the mentioned commits.
It turned out that the IPI call used on Exynos4210 is conflicting with the
change done in the first mentioned commit in GIC. Fix this by using the
same code path as for Exynos3250, instead of the IPI call for
synchronization with second CPU core, call dsb_sev() directly.
Tested on Exynos4210-based Trats and Origen boards.
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
CC: <stable@vger.kernel.org> # v4.13+
Acked-by: Marc Zyngier <marc.zyngier@arm.com>
Acked-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>
Tero Kristo [Wed, 14 Mar 2018 13:53:13 +0000 (15:53 +0200)]
ARM: OMAP5: control: add support for control module wkup pad config
Match the new compatible string in the control module driver. The base
infra maps the required syscon ranges and clock registers if available.
Signed-off-by: Tero Kristo <t-kristo@ti.com>
Tested-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Tero Kristo [Wed, 14 Mar 2018 13:53:10 +0000 (15:53 +0200)]
ARM: omap2+: control: add support for auxiliary control module instances
Control module can have multiple instances in a system, each with separate
address space and features. Add base support for these auxiliary instances,
with support for syscon and clock mappings under them.
Signed-off-by: Tero Kristo <t-kristo@ti.com>
Tested-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Tony Lindgren [Tue, 20 Mar 2018 14:10:24 +0000 (07:10 -0700)]
ARM: multi_v7_defconfig: Enable CPCAP related options mostly as loadable modules
We need the CPCAP MFD and regulator built-in for UART console to work,
the rest can be loadable modules. Note that users probably want to also
enable serial 8250_OMAP that is not yet enabled by default.
Signed-off-by: Tony Lindgren <tony@atomide.com>
Tony Lindgren [Tue, 20 Mar 2018 14:10:15 +0000 (07:10 -0700)]
ARM: omap2plus_defconfig: Add UINPUT
This can be used for keyboard fn keys with funkeymonkey.
Signed-off-by: Tony Lindgren <tony@atomide.com>
Tony Lindgren [Tue, 20 Mar 2018 14:10:07 +0000 (07:10 -0700)]
ARM: omap2plus_defconfig: Enable MDM6600 USB PHY
This allows droid 4 USB modem to work.
Signed-off-by: Tony Lindgren <tony@atomide.com>
Tony Lindgren [Tue, 20 Mar 2018 14:09:55 +0000 (07:09 -0700)]
ARM: omap2plus_defconfig: Add AUDIO_GRAPH_CARD
This is needed for audio on droid 4.
Signed-off-by: Tony Lindgren <tony@atomide.com>
Tony Lindgren [Tue, 20 Mar 2018 14:09:46 +0000 (07:09 -0700)]
ARM: omap2plus_defconfig: Enable PWM_VIBRA
We can use PWM_VIBRA on many phones like droid 4.
Signed-off-by: Tony Lindgren <tony@atomide.com>
Linus Walleij [Fri, 9 Mar 2018 13:32:21 +0000 (14:32 +0100)]
ARM: defconfig: Configure Versatile boards to use PL111 DRM
The DRM driver is now finalized for the Versatile board family,
so switch the defconfig to use this driver instead of the old
fbdev driver.
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Linus Walleij [Fri, 9 Mar 2018 13:28:07 +0000 (14:28 +0100)]
ARM: defconfig: Update Versatile defconfig
This updates the Versatile defconfig to the latest savedefconfig
results reflecting changes in Kconfig. We add in the Flash memory
support that has been available upstream for a while now.
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Linus Walleij [Fri, 9 Mar 2018 13:23:19 +0000 (14:23 +0100)]
ARM: defconfig: Switch RealView boards to use P111 DRM
The DRM driver is now finalized for the RealView board family,
so switch the defconfig to use this driver instead of the old
fbdev driver.
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Linus Walleij [Fri, 9 Mar 2018 13:21:55 +0000 (14:21 +0100)]
ARM: defconfig: Update RealView defconfig
Just update with some new results from savedefconfig so we are
in sync with what has happened in Kconfig upstream.
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Arnd Bergmann [Thu, 15 Mar 2018 15:10:32 +0000 (16:10 +0100)]
Merge tag 'imx-soc-4.17' of ssh://gitolite./linux/kernel/git/shawnguo/linux into next/soc
Pull "i.MX SoC changes for 4.17" from Shawn Guo:
- Add i.MX 6SoloLiteLite (i.MX6SLL) SoC support on top of the existing
i.MX6SL platform code.
- Improve the SoC revision mapping by utilizing the MAJOR field of
ANATOP DIGPROG register.
- Add CPUIDLE_FLAG_TIMER_STOP flag for cpuidle ARM power off state,
so that we can use ARM generic timer for some i.MX6 SoC.
- Set low-power interrupt mask for i.MX25 to support STOP mode.
- Drop EPIT driver as there is no user of it.
- Simplify the error path of imx6_pm_get_base() a bit.
* tag 'imx-soc-4.17' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
ARM: imx: Add basic msl support for imx6sll
ARM: imx: pm-imx6: Return the error directly
ARM: imx: avic: set low-power interrupt mask for imx25
ARM: imx: Improve the soc revision calculation flow
ARM: imx: add timer stop flag to ARM power off state
ARM: imx: Remove epit support
Neil Armstrong [Wed, 14 Mar 2018 08:35:44 +0000 (09:35 +0100)]
ARM: configs: add OXNAS v6 defconfig
This patchs adds the minimal defconfig for the OXNAS ARMv6 SoCs
including the OX820 SoC and needed minimal configurations.
Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Thierry Reding [Wed, 14 Mar 2018 11:10:14 +0000 (12:10 +0100)]
arm64: defconfig: Enable the Tegra SMMU by default
Display and graphics can't work together without an SMMU, so it is
effectively always getting enabled anyway.
Signed-off-by: Thierry Reding <treding@nvidia.com>
Arnd Bergmann [Tue, 13 Mar 2018 21:39:35 +0000 (22:39 +0100)]
Merge tag 'arm-soc/for-4.17/defconfig' of https://github.com/Broadcom/stblinux into next/soc
Pull "Broadcom defconfig changes for 4.17" from Florian Fainelli:
This pull request contains multi_v7_defconfig changes for Broadcom
ARM-based SoC for 4.17, please pull the following:
- Tuomas enables the BCM2835 AUX driver which is necessary to provide
console on the Raspberry Pi 3
- Stefan turns on support for the BCM43438 Bluetooth adapter connected
via UART on the Raspberry Pi Zero Wireless and he also turns on
support for the thermal driver on the Pi 2 and 3.
* tag 'arm-soc/for-4.17/defconfig' of https://github.com/Broadcom/stblinux:
ARM: multi_v7_defconfig: Enable thermal driver for RPi 2/3
ARM: bcm2385_defconfig: Enable BT support for BCM43438
ARM: multi_v7_defconfig: Enable serial console on RPi 3
Fabrizio Castro [Mon, 12 Feb 2018 17:44:19 +0000 (17:44 +0000)]
ARM: shmobile: rcar-gen2: Add watchdog support
This patch adds watchdog support by installing shmobile_boot_vector_gen2
to ICRAM1 when enough memory is available, in which case we also keep a
copy of MPIDR to complete the reset vector logic.
Signed-off-by: Fabrizio Castro <fabrizio.castro@bp.renesas.com>
Signed-off-by: Ramesh Shanmugasundaram <ramesh.shanmugasundaram@bp.renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Fabrizio Castro [Wed, 28 Feb 2018 17:40:22 +0000 (17:40 +0000)]
ARM: shmobile: Add watchdog support
On R-Car Gen2 and RZ/G1 platforms, we use the SBAR registers to make non
boot CPUs run a routine designed to bring up SMP and deal with hot plug.
The value contained in the SBAR registers is not initialized by a WDT
triggered reset, which means that after a WDT triggered reset we jump
to the SMP bring up routine, preventing the system from executing the
bootrom code.
The purpose of this patch is to jump to the bootrom code in case of a
WDT triggered reset, and keep the SMP functionality untouched.
In order to tell if the code had been called due to the WDT overflowing
we are testing WOVF from register RWTCSRA.
The new function shmobile_boot_vector_gen2 isn't replacing
shmobile_boot_vector for backward compatibility reasons. The kernel
will install the best option (either shmobile_boot_vector or
shmobile_boot_vector_gen2) to ICRAM1 after parsing the device tree,
according to the amount of memory available.
Since shmobile_boot_vector has become bigger, "reg" property of nodes
compatible with "renesas,smp-sram" now need to be set to a value
greater or equal to "<0 0x60>".
Signed-off-by: Fabrizio Castro <fabrizio.castro@bp.renesas.com>
Signed-off-by: Ramesh Shanmugasundaram <ramesh.shanmugasundaram@bp.renesas.com>
Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
[simon: dropped #ifdef from common.h]
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Arnd Bergmann [Mon, 12 Mar 2018 14:27:14 +0000 (15:27 +0100)]
Merge tag 'pxa-for-4.17' of https://github.com/rjarzmik/linux into next/soc
Pull "This is the pxa changes for v4.17 cycle" from Robert Jarzmik:
- minor changes for property API
- clock API fix for ULPI driver warning
It exceptionally contains a merge from the mtd tree from Boris
to prevent any merge conflicts in the PXA tree.
* tag 'pxa-for-4.17' of https://github.com/rjarzmik/linux:
ARM: pxa/raumfeld: use PROPERTY_ENTRY_U32() directly
ARM: pxa: ulpi: fix ulpi timeout and slowpath warn
ARM: pxa: cm-x300: remove inline directive
ARM: pxa: fix static checker warning in pxa3xx-ulpi
MAINTAINERS: remove entry for deleted pxa3xx_nand driver
arm: dts: pxa: use reworked NAND controller driver
dt-bindings: mtd: remove pxa3xx NAND controller documentation
mtd: nand: remove useless fields from pxa3xx NAND platform data
mtd: nand: remove deprecated pxa3xx_nand driver
mtd: nand: use Marvell reworked NAND controller driver with all platforms
Arnd Bergmann [Mon, 12 Mar 2018 14:18:53 +0000 (15:18 +0100)]
Merge tag 'at91-ab-4.17-soc' of ssh://gitolite./linux/kernel/git/abelloni/linux into next/soc
Pull "AT91 SoC for 4.17: from Alexandre Belloni:
- Rename Atmel to Microhip in MAINTAINERS, Documentation and Kconfig
* tag 'at91-ab-4.17-soc' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/abelloni/linux:
ARM: at91: Kconfig: Update company to Microchip
Documentation: at91: Update Microchip SoC documentation
MAINTAINERS: ARM: at91: update entry for ARM/Microchip
Arnd Bergmann [Mon, 12 Mar 2018 14:17:57 +0000 (15:17 +0100)]
Merge tag 'hisi-defconfig-for-4.17' of git://github.com/hisilicon/linux-hisi into next/soc
Pull "ARM64: hisilicon: defconfig updates for 4.17" from Wei Xu:
- Enable deadline IO scheduler to improve the performnace for some
usecaese without changing the default IO scheduler
* tag 'hisi-defconfig-for-4.17' of git://github.com/hisilicon/linux-hisi:
arm64: defconfig: enable IOSCHED_DEADLINE
Jeffy Chen [Mon, 12 Mar 2018 09:51:42 +0000 (17:51 +0800)]
ARM: rockchip: Set name of pmu regmap_config in smp code
We are now allowing to register debugfs without a valid device, and not
having a valid name will end up using "dummy*" to create debugfs dir.
Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com>
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
Chen-Yu Tsai [Thu, 8 Mar 2018 15:00:12 +0000 (23:00 +0800)]
ARM: sunxi: mc-smp: Split out SoC-specific device node lookup sequence
The multi-cluster SMP code maps the address spaces of several hardware
control blocks. The device nodes for them are SoC-specific. To help with
supporting other SoCs to re-use this code, these bits should be split
out to a separate function tied to the enable-method string.
This patch splits out and groups the device node lookup sequence, and
adds new data structures to have the newly created function tied to
the enable method string. This structure can also be used to encode
other differences between the SoCs.
Acked-by: Maxime Ripard <maxime.ripard@bootlin.com>
Signed-off-by: Chen-Yu Tsai <wens@csie.org>
Chen-Yu Tsai [Thu, 8 Mar 2018 15:00:10 +0000 (23:00 +0800)]
ARM: sunxi: mc-smp: Use DT enable-method for sun9i A80 SMP
Instead of having an early init function check the machine compatible
and installing multi-cluster SMP support for the A80 if it matches,
use a new cpu enable-method string. This makes the platform support
future proof in case anyone manages to add PSCI support.
The original init code for the SMP support is changed into the
.prepare_cpus callback in the smp_operations structure. Instead of
panicing when resources are missing like on some platforms, our code
merely guards against engaging SMP or CPU hotplug and returns an error.
Acked-by: Maxime Ripard <maxime.ripard@bootlin.com>
Reviewed-by: Rob Herring <robh@kernel.org>
Signed-off-by: Chen-Yu Tsai <wens@csie.org>
Chen-Yu Tsai [Thu, 8 Mar 2018 15:00:09 +0000 (23:00 +0800)]
ARM: sunxi: mc-smp: Fix "lookback" typo
The sunxi_mc_smp_lookback function is modeled after the mcpm_loopback
function in the MCPM framework. "lookback" was a typo introduced when
the new function was added.
Acked-by: Maxime Ripard <maxime.ripard@bootlin.com>
Signed-off-by: Chen-Yu Tsai <wens@csie.org>
Mikko Perttunen [Thu, 16 Nov 2017 11:46:52 +0000 (13:46 +0200)]
arm64: defconfig: Enable CONFIG_TEGRA_BPMP_THERMAL
Enable Tegra BPMP thermal sensor support by default, built as a module.
Signed-off-by: Mikko Perttunen <mperttunen@nvidia.com>
Signed-off-by: Thierry Reding <treding@nvidia.com>
Mikko Perttunen [Thu, 16 Nov 2017 11:46:51 +0000 (13:46 +0200)]
arm64: defconfig: Enable CONFIG_ARM_TEGRA186_CPUFREQ
Enable Tegra186 CPU frequency scaling support by default.
Signed-off-by: Mikko Perttunen <mperttunen@nvidia.com>
Signed-off-by: Thierry Reding <treding@nvidia.com>
Bai Ping [Thu, 8 Mar 2018 09:34:55 +0000 (17:34 +0800)]
ARM: imx: Add basic msl support for imx6sll
Add basic MSL support for i.MX6SLL.
The i.MX 6SoloLiteLite application processors are NXP's latest
additions to a growing family of multimedia-focused products
offering high-performance processing optimized for lowest power
consumption. The i.MX 6SoloLiteLite processors feature NXP's advanced
implementation of the ARM Cortex-A9 core, which can be interfaced
with LPDDR3 and LPDDR2 DRAM memory devices.
Signed-off-by: Bai Ping <ping.bai@nxp.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
Amit Kucheria [Tue, 6 Mar 2018 13:05:03 +0000 (18:35 +0530)]
arm64: defconfig: enable more cpufreq governors
Enable the various CPUFREQ governors and statistics to ease development.
Don't change the default governor - performance governor.
Signed-off-by: Amit Kucheria <amit.kucheria@linaro.org>
Signed-off-by: Andy Gross <andy.gross@linaro.org>
Amit Kucheria [Tue, 6 Mar 2018 13:05:02 +0000 (18:35 +0530)]
arm64: defconfig: enable thermal sensor on QCOM platforms
Enable the driver for the TSENS IP that is present across several QCOM
SoCs.
Signed-off-by: Amit Kucheria <amit.kucheria@linaro.org>
Signed-off-by: Andy Gross <andy.gross@linaro.org>
Amit Kucheria [Mon, 12 Feb 2018 11:03:32 +0000 (16:33 +0530)]
arm64: defconfig: Enable the APCS IPC driver on Qualcomm platforms
The APCS block is present on several Qualcomm SoCs e.g. 8916, 8996. On the
8916 it is needed to enable the clock controller that in turn enables
cpufreq on the platform while on the 8996 it is needed for communication
with RPM.
Signed-off-by: Amit Kucheria <amit.kucheria@linaro.org>
Acked-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Signed-off-by: Andy Gross <andy.gross@linaro.org>
Mikko Perttunen [Tue, 20 Feb 2018 11:58:07 +0000 (13:58 +0200)]
arm64: defconfig: Enable NVIDIA Tegra194 support
Enable NVIDIA Tegra194 support in the default 64-bit ARM configuration.
Signed-off-by: Mikko Perttunen <mperttunen@nvidia.com>
Signed-off-by: Thierry Reding <treding@nvidia.com>
Fabio Estevam [Thu, 1 Mar 2018 19:08:56 +0000 (16:08 -0300)]
ARM: imx_v6_v7_defconfig: Select CONFIG_SND_SOC_WM8962 explicitly
Currently CONFIG_SND_SOC_WM8962 is selected via SND_SOC_IMX_WM8962
machine driver option.
SND_SOC_IMX_WM8962 will be removed in the next kernel cycle, so
select the codec driver directly so that it can still be used
by default via the generic fsl-asoc-card machine driver.
Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com>
Acked-by: Nicolin Chen <nicoleotsuka@gmail.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
Arnd Bergmann [Wed, 7 Mar 2018 15:30:18 +0000 (16:30 +0100)]
Merge tag 'samsung-soc-4.17' of ssh://gitolite./linux/kernel/git/krzk/linux into next/soc
Pull "Samsung mach/soc changes for v4.17" from Krzysztof Kozłowski:
1. Add few remaining SPDX license identifiers.
2. Add cpuidle support to all Midas-based boards (including new
GT-I9300/GT-I9305/GT-N7100/GT-N7105).
* tag 'samsung-soc-4.17' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/krzk/linux:
ARM: EXYNOS: Extend cpuidle support to Midas boards
ARM: EXYNOS: Add SPDX license identifiers
Arnd Bergmann [Wed, 7 Mar 2018 15:26:43 +0000 (16:26 +0100)]
Merge tag 'omap-for-v4.17/ti-sysc-signed' of ssh://gitolite./linux/kernel/git/tmlind/linux-omap into next/soc
Pull "Driver changes for ti-sysc for v4.17" from Tony Lindgren:
This series of changes enables the use device tree based sysconfig
data for ti-sysc driver. As we already have SmartReflex data configured,
we use that as the first driver to enable. To do that in a way where
SmartReflex is not probed twice, we need to prepare the SmartReflex
driver before flipping dts data on for it in the last patch of the
series.
To avoid regressions, we are checking the passed dts data against
existing platform data since we still have it available. Then after the
dts files are converted, we can simply drop the related platform data
at some point in the future.
* tag 'omap-for-v4.17/ti-sysc-signed' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
ARM: OMAP2+: Enable ti-sysc to use device tree data for smartreflex
PM / AVS: SmartReflex: Prepare to use device tree based probing
ARM: OMAP2+: Try to parse earlycon from parent too
ARM: OMAP2+: Add checks for device tree based sysconfig data
ARM: OMAP2+: Add functions to allocate module data from device tree
bus: ti-sysc: Handle some devices in omap_device compatible way
bus: ti-sysc: Add support for platform data callbacks
bus: ti-sysc: Remove unnecessary debugging statements
bus: ti-sysc: Improve handling for no-reset-on-init and no-idle-on-init
bus: ti-sysc: Handle stdout-path for debug console
bus: ti-sysc: Add suspend and resume handling
bus: ti-sysc: Add fck clock alias for children with notifier_block
ARM: OMAP2+: Prepare to pass auxdata for smartreflex
Arnd Bergmann [Wed, 7 Mar 2018 15:21:59 +0000 (16:21 +0100)]
Merge tag 'omap-for-v4.17/am-pm-signed' of ssh://gitolite./linux/kernel/git/tmlind/linux-omap into next/soc
Pull "Add am335x and am437x PM code for v4.17" from Tony Lindgren:
This series of changes from Dave Gerlach adds the PM related
code to allow low-power suspend states. The code consists of
the SoC specific assembly code and a related PM driver.
* tag 'omap-for-v4.17/am-pm-signed' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
soc: ti: Add pm33xx driver for basic suspend support
ARM: OMAP2+: pm33xx-core: Add platform code needed for PM
ARM: OMAP2+: Introduce low-level suspend code for AM43XX
ARM: OMAP2+: Introduce low-level suspend code for AM33XX
Arnd Bergmann [Wed, 7 Mar 2018 15:16:07 +0000 (16:16 +0100)]
Merge tag 'omap-for-v4.17/timer-signed' of ssh://gitolite./linux/kernel/git/tmlind/linux-omap into next/soc
Pull "Move omap timer to drivers for 4.17" from Tony Lindgren:
This series from Keerthy and Ladislav Michl move omap dmtimer code
to drivers. As we don't want to export custom timer functions to
random drivers, we also need to update the related PWM driver to
pass the timer specific functions in platform data.
Note that this series is based on a merge of omap1 specific timer
fix and omap2+ platform data clean-up to keep things working and
make the move a bit simpler.
* tag 'omap-for-v4.17/timer-signed' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
clocksource: timer-ti-dm: Check prescaler value
clocksource: timer-ti-dm: Consolidate set source
clocksource: timer-ti-dm: Make unexported functions static
ARM: OMAP: pdata-quirks: Remove unused timer pdata
pwm: pwm-omap-dmtimer: Adapt driver to utilize dmtimer pdata ops
clocksource: timer-ti-dm: Hook device platform data if not already assigned
clocksource: timer-ti-dm: Populate the timer ops to the pdata
clocksource: timer-ti-dm: Add timer ops to the platform data structure
ARM: OMAP: Move dmtimer driver out of plat-omap to drivers under clocksource
clocksource: timer-ti-dm: Replace architecture
ARM: OMAP: Move dmtimer.h out of plat-omap
ARM: OMAP: timer: Wrap the inline functions under OMAP2PLUS define
ARM: OMAP: dmtimer: Remove all the exports
ARM: OMAP: Fix dmtimer init for omap1
Arnd Bergmann [Wed, 7 Mar 2018 15:14:15 +0000 (16:14 +0100)]
Merge tag 'omap-for-v4.17/soc-signed' of ssh://gitolite./linux/kernel/git/tmlind/linux-omap into next/soc
Pull "SoC changes for omaps for v4.17" from Tony Lindgren:
This series is mostly a series from Suman Anna to remove now unused
platform data that is now coming from device tree. This also make it
a bit simpler to move the timer code to live under drivers in a
separate series of patches. There are also few minor clean-ups for
omap4 PM code.
* tag 'omap-for-v4.17/soc-signed' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
ARM: OMAP2+: Fix typo for wakeup_ns_pa_addr
ARM: OMAP2+: Use v7_invalidate_l1 in omap4_finish_suspend
ARM: OMAP2+: Remove unused gpio header file references
ARM: OMAP: Move plat/i2c.h into mach-omap1 folder
ARM: OMAP2+: Cleanup omap_mcbsp_dev_attr and other legacy data
ARM: OMAP2+: Cleanup omap2_spi_dev_attr and other legacy data
ARM: OMAP2+: Cleanup omap_timer_capability_dev_attr usage
ARM: OMAP2+: Cleanup omap_i2c_dev_attr usage
ARM: OMAP2+: Cleanup omap_gpio_dev_attr usage
ARM: OMAP2+: Include types.h directly for hwmod data
Arnd Bergmann [Wed, 7 Mar 2018 15:13:01 +0000 (16:13 +0100)]
Merge tag 'stm32-defconfig-for-v4.17-1' of ssh://gitolite./linux/kernel/git/atorgue/stm32 into next/soc
Pull "STM32 defconfig updates for v4.17, round 1" from Alexandre Torgue:
Highlights:
----------
-Add STM32 support (for MPU) to multi-v7-defconfig
-Enable MMCI and EXT3_FS support
Arnd Bergmann [Wed, 7 Mar 2018 15:10:02 +0000 (16:10 +0100)]
Merge tag 'stm32-soc-for-v4.17-1' of ssh://gitolite./linux/kernel/git/atorgue/stm32 into next/soc
Pull "STM32 SOC updates for v4.17, round 1." from Alexandre Torgue:
Highlights:
----------
-Add STM32F769 MCU support
-Add STM32MP157 MPU support
-Add AMBA PL180 MMCI support for F4 and F7 MCUs
-Move STM32 documentation to rst format
* tag 'stm32-soc-for-v4.17-1' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32:
ARM: stm32: restore reboot capabilities
ARM: stm32: Add AMBA support for STM32F4 and STM32F7 SoCs
ARM: stm32: add initial support for STM32MP157
ARM: stm32: prepare stm32 family to welcome armv7 architecture
Documentation: arm: stm32: move to rst format
ARM: stm32: Fix copyright
ARM: stm32: add new STM32F769 MCU
ARM: stm32: Kconfig: introduce MACH_STM32F769 flag
Chunyan Zhang [Thu, 1 Mar 2018 08:09:15 +0000 (16:09 +0800)]
MAINTAINERS: Add Spreadtrum SoC entry
Add Spreadtrum's maintainer entry and Orson, Baolin and me
as maintainers.
Cc: Orson Zhai <orsonzhai@gmail.com>
Cc: Baolin Wang <baolin.wang@linaro.org>
Signed-off-by: Chunyan Zhang <zhang.lyra@gmail.com>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Geert Uytterhoeven [Fri, 2 Mar 2018 14:04:47 +0000 (15:04 +0100)]
ARM: socfpga: PM: Drop useless check for PM_SUSPEND_STANDBY
As SoCFPGA uses the standard suspend_valid_only_mem() for its
platform_suspend_ops.valid() callback, its platform_suspend_ops.enter()
callback will never be called with state equal to PM_SUSPEND_STANDBY.
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Acked-by: Tony Lindgren <tony@atomide.com>
Acked-by: Dinh Nguyen <dinguyen@kernel.org>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Geert Uytterhoeven [Fri, 2 Mar 2018 13:38:05 +0000 (14:38 +0100)]
ARM: nspire: Remove unneeded nspire_map_io()
nspire_map_io() just calls debug_ll_io_init().
If machine_desc.map_io is not set, devicemaps_init() in the
common ARM code will call debug_ll_io_init(), so nspire_map_io() and the
initialization of .map_io can be removed.
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Reviewed-by: Vladimir Murzin <vladimir.murzin@arm.com>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Alexandre Belloni [Tue, 27 Feb 2018 13:37:47 +0000 (14:37 +0100)]
ARM: reorder mach-*/Kconfig inclusions
Reorder the mach-* inclusions so the comment about them being ordered
alphabetically ends up being true.
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Arnd Bergmann [Wed, 7 Mar 2018 15:03:13 +0000 (16:03 +0100)]
Merge tag 'davinci-for-v4.17/defconfig' of ssh://gitolite./linux/kernel/git/nsekhar/linux-davinci into next/soc
Pull "DaVinci defconfig updates for v4.17" from Sekhar Nori:
Enable SYSCON_REBOOT_MODE needed for Lego EV3 and build the DaVinci
watchdog driver in so reboot works even when modules are not loaded.
* tag 'davinci-for-v4.17/defconfig' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci:
ARM: davinci_all_defconfig: set CONFIG_DAVINCI_WATCHDOG=y
ARM: davinci_all_defconfig: enable SYSCON_REBOOT_MODE
Arnd Bergmann [Wed, 7 Mar 2018 15:01:34 +0000 (16:01 +0100)]
Merge tag 'davinci-for-v4.17/soc' of ssh://gitolite./linux/kernel/git/nsekhar/linux-davinci into next/soc
Pull "Miscellaneous DaVinci SoC support improvements for v4.17" from Sekhar Nori:
* rationalization of con_id names for phy clocks to make DT conversion easy
* A patch to move away from syscon as platform device. This is needed for
common clock framework conversion as well as helps get rid of
syscon_regmap_lookup_by_pdevname() by removing the last known user.
* convert mach-davinci to use reset support available in watchdog driver
* a non-critical warning fix. It has been around since beginning so not sending
as a standalone fix for -rc cycle.
* moving mach-davinci clock init to .init_time() for legacy boot. This is
again in preparation for CCF conversion.
* tag 'davinci-for-v4.17/soc' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci:
ARM: davinci: move davinci_clk_init() to init_time
ARM: davinci: board-da830-evm: fix unused const variable warning
ARM: davinci: remove watchdog reset
ARM: da8xx: use platform data for CFGCHIP syscon regmap
phy: da8xx-usb: rename clock con_ids
Robert Jarzmik [Wed, 7 Mar 2018 13:22:29 +0000 (14:22 +0100)]
Merge tag 'nand/pxa3xx-removal' of git://git.infradead.org/linux-mtd into pxa/for-next
Remove the pxa3xx_nand driver (replaced by marvell_nand).
Andy Shevchenko [Mon, 29 Jan 2018 17:37:08 +0000 (19:37 +0200)]
ARM: pxa/raumfeld: use PROPERTY_ENTRY_U32() directly
Instead of using PROPERTY_ENTRY_INTEGER() with explicitly supplied type,
use PROPERTY_ENTRY_U32() dedicated macro.
It will help modify internals of built-in device properties API.
No functional change intended.
Acked-by: Robert Jarzmik <robert.jarzmik@free.fr>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Robert Jarzmik <robert.jarzmik@free.fr>
Igor Grinberg [Tue, 26 Dec 2017 13:32:53 +0000 (15:32 +0200)]
ARM: pxa: ulpi: fix ulpi timeout and slowpath warn
Both cm-x300 and pxa3xx-ulpi use the plain clk_{en,dis}able() API.
With the new clocking framework this results in warnings of type:
------------[ cut here ]------------
WARNING: CPU: 0 PID: 1 at drivers/clk/clk.c:714 clk_core_enable+0x90/0x9c
Modules linked in:
CPU: 0 PID: 1 Comm: swapper Not tainted 4.15.0-rc5-cm-x300+ #15
Hardware name: CM-X300 module
[<
c001007c>] (unwind_backtrace) from [<
c000df94>] (show_stack+0x10/0x14)
[<
c000df94>] (show_stack) from [<
c00199a8>] (__warn+0xd8/0x100)
[<
c00199a8>] (__warn) from [<
c0019a0c>] (warn_slowpath_null+0x3c/0x48)
[<
c0019a0c>] (warn_slowpath_null) from [<
c024e8c0>] (clk_core_enable+0x90/0x9c)
[<
c024e8c0>] (clk_core_enable) from [<
c024ea54>] (clk_core_enable_lock+0x18/0x2c)
[<
c024ea54>] (clk_core_enable_lock) from [<
c0016994>] (cm_x300_u2d_init+0x4c/0xe8)
[<
c0016994>] (cm_x300_u2d_init) from [<
c00163e0>] (pxa3xx_u2d_probe+0xe0/0x244)
[<
c00163e0>] (pxa3xx_u2d_probe) from [<
c0283de0>] (platform_drv_probe+0x38/0x88)
...
------------[ cut here ]------------
and alike...
And finally, it results in:
------------[ cut here ]------------
pxa310_ulpi_poll: ULPI access timed out!
OTG transceiver init failed
------------[ cut here ]------------
It might be that disabling the warning in kernel config would also do
the job, but IMO a better solution would be to switch to
clk_prepare_enable() and clk_disable_unprepare() APIs.
Signed-off-by: Igor Grinberg <grinberg@compulab.co.il>
Signed-off-by: Robert Jarzmik <robert.jarzmik@free.fr>
Igor Grinberg [Tue, 26 Dec 2017 12:45:36 +0000 (14:45 +0200)]
ARM: pxa: cm-x300: remove inline directive
cm_x300_u2d_init() function is only used through its function pointer
that is passed through platform_data structure to the driver.
Therefore it can never be inlined.
Remove the inline directive.
Signed-off-by: Igor Grinberg <grinberg@compulab.co.il>
Signed-off-by: Robert Jarzmik <robert.jarzmik@free.fr>
Igor Grinberg [Tue, 26 Dec 2017 12:33:51 +0000 (14:33 +0200)]
ARM: pxa: fix static checker warning in pxa3xx-ulpi
Static checker reports the following warning:
arch/arm/mach-pxa/pxa3xx-ulpi.c:336 pxa3xx_u2d_probe()
warn: did you mean to pass the address of 'u2d'
Fix it by passing the correct pointer.
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Igor Grinberg <grinberg@compulab.co.il>
Signed-off-by: Robert Jarzmik <robert.jarzmik@free.fr>
Tony Lindgren [Thu, 1 Mar 2018 23:06:19 +0000 (15:06 -0800)]
ARM: multi_v7_defconfig: Enable USB gadget configfs as loadable module
With USB OTG now enabled, it makes sense to allow configuring the
USB gadgets via configfs.
Signed-off-by: Tony Lindgren <tony@atomide.com>
Tony Lindgren [Fri, 2 Mar 2018 16:39:09 +0000 (08:39 -0800)]
ARM: multi_v7_defconfig: Enable various USB PHYs found on omap variants
With MUSB USB OTG controller enabled, let's now enable the USB PHYs
found on omap varian SoCs.
Signed-off-by: Tony Lindgren <tony@atomide.com>
Tony Lindgren [Thu, 1 Mar 2018 22:59:57 +0000 (14:59 -0800)]
ARM: multi_v7_defconfig: Enable OTG and MUSB as loadable modules
We can support USB OTG with MUSB driver on many ARM SoCs. Let's
enable all the SoCs with MUSB as loadable modules. And let's enable
their related DMA hardware.
And as MUSB is an USB OTG controller, let's enable OTG support too.
Signed-off-by: Tony Lindgren <tony@atomide.com>
Tony Lindgren [Thu, 1 Mar 2018 20:41:49 +0000 (12:41 -0800)]
ARM: omap2plus_defconfig: Enable 8250_OMAP
We've had 8250_OMAP working for few years now, so let's start enabling
it by default. We provide users an option to warn by default with
SERIAL_8250_OMAP_TTYO_FIXUP by default. That option updates the serial
console to point to 8250 driver and warns about it.
Users with ttyO[0123] in their /etc/inittab should update inittab
to use ttyS[0123] instead.
Signed-off-by: Tony Lindgren <tony@atomide.com>
Tony Lindgren [Thu, 1 Mar 2018 21:08:59 +0000 (13:08 -0800)]
ARM: omap2plus_defconfig: Switch to use omapdrm by default
We've had omapdrm working for few years now so let's use it by
default.
Signed-off-by: Tony Lindgren <tony@atomide.com>
Tony Lindgren [Thu, 1 Mar 2018 21:02:10 +0000 (13:02 -0800)]
ARM: omap2plus_defconfig: Enable CEC
We have CEC support available and working so let's enable it.
Signed-off-by: Tony Lindgren <tony@atomide.com>
Tony Lindgren [Thu, 1 Mar 2018 20:47:48 +0000 (12:47 -0800)]
ARM: omap2plus_defconfig: Enable am335x and am437x PM options
These are needed to enable low-power suspend mode as described
by Dave.
Note that these depend on the am335x-pm-firmware.elf.
Cc: Dave Gerlach <d-gerlach@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Tony Lindgren [Thu, 1 Mar 2018 18:34:41 +0000 (10:34 -0800)]
ARM: omap2plus_defconfig: Drop unneeded options
These are no longer needed because:
- PCI_DRA7XX_HOST selects PCI_DRA7XX
- USB_NET_QMI_WWAN selects USB_WDM
- USB_PHY selects EXTCON
- IIO_CONFIGFS selects CONFIGFS_FS
- TIMER_STATS option no longer exists
- CRYPTO_SHA1_ARM_NEON selects CRYPTO_SHA1_ARM
Signed-off-by: Tony Lindgren <tony@atomide.com>
Tony Lindgren [Thu, 1 Mar 2018 20:34:17 +0000 (12:34 -0800)]
ARM: omap2plus_defconfig: Add SND_OSSEMUL
We have SND_MIXER_OSS and SND_PCM_OSS but they now
depend on SND_OSSEMUL selecting SOUND_OSS_CORE.
Signed-off-by: Tony Lindgren <tony@atomide.com>
Tony Lindgren [Thu, 1 Mar 2018 19:01:27 +0000 (11:01 -0800)]
ARM: omap2plus_defconfig: Update LIRC options
We have LIRC selected as a loadable module but it must now be
built-in. Let's update that and add few interesting new options
for blinking IR LEDs.
Signed-off-by: Tony Lindgren <tony@atomide.com>
Tony Lindgren [Thu, 1 Mar 2018 18:54:52 +0000 (10:54 -0800)]
ARM: omap2plus_defconfig: Select MFD_TI_LMU
We have REGULATOR_LM363X selected but not MFD_TI_LMU and
REGULATOR_LM363X depends on MFD_TI_LMU.
Signed-off-by: Tony Lindgren <tony@atomide.com>
Brendan Higgins [Wed, 16 Aug 2017 19:18:39 +0000 (12:18 -0700)]
arm: npcm: add basic support for Nuvoton BMCs
Adds basic support for the Nuvoton NPCM750 BMC.
Signed-off-by: Brendan Higgins <brendanhiggins@google.com>
Reviewed-by: Tomer Maimon <tmaimon77@gmail.com>
Reviewed-by: Avi Fishman <avifishman70@gmail.com>
Tested-by: Tomer Maimon <tmaimon77@gmail.com>
Tested-by: Avi Fishman <avifishman70@gmail.com>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Brendan Higgins [Thu, 17 Aug 2017 16:44:32 +0000 (09:44 -0700)]
MAINTAINERS: Add entry for the Nuvoton NPCM architecture
Add maintainers and reviewers for the Nuvoton NPCM architecture.
Signed-off-by: Brendan Higgins <brendanhiggins@google.com>
Reviewed-by: Tomer Maimon <tmaimon77@gmail.com>
Reviewed-by: Avi Fishman <avifishman70@gmail.com>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Ard Biesheuvel [Wed, 14 Feb 2018 09:26:37 +0000 (09:26 +0000)]
arm64: defconfig: add support for Socionext SynQuacer based platforms
Enable support in arm64's defconfig for Socionext SynQuacer based
platforms, by enabling the arch Kconfig symbol, and enabling builtin
support for the ethernet, GPIO and SDHCI controllers
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Ard Biesheuvel [Wed, 14 Feb 2018 09:26:36 +0000 (09:26 +0000)]
arm64: defconfig: add newly added accelerated crypto modules
New crypto drivers have been introduced in v4.16 that implement the
SHA-512, SHA3 and SM3 secure hash algorithms using ARMv8.2 optional
instructions. Add these drivers to arm64's defconfig as modules.
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Benjamin Gaignard [Tue, 27 Feb 2018 14:36:00 +0000 (15:36 +0100)]
ARM: stm32: restore reboot capabilities
To be able to reboot the platform we need to use armv7m_restart for STM32
SoCs using ARMv7 cores.
Fixes:
e0644101bd2f ("ARM: mach-stm32: prepare stm32 family to welcome armv7 architecture)
Signed-off-by: Benjamin Gaignard <benjamin.gaignard@st.com>
Signed-off-by: Alexandre Torgue <alexandre.torgue@st.com>
Patrice Chotard [Thu, 18 Jan 2018 14:34:00 +0000 (15:34 +0100)]
ARM: stm32: Add AMBA support for STM32F4 and STM32F7 SoCs
As both STM32F4 and STM32F7 SoCs embeds an AMBA PL180 mmci IP,
we need to enable AMBA support in mach-stm32.
Signed-off-by: Patrice Chotard <patrice.chotard@st.com>
Signed-off-by: Alexandre Torgue <alexandre.torgue@st.com>