summaryrefslogtreecommitdiff
path: root/arch/arm
AgeCommit message (Collapse)AuthorFilesLines
2018-03-27ARM: multi_v7_defconfig: enable thermal driver for i.MX devicesStefan Agner1-0/+1
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>
2018-03-27ARM: multi_v7_defconfig: add RN5T618 PMIC family supportStefan Agner1-0/+3
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>
2018-03-27ARM: multi_v7_defconfig: add NXP graphics driversStefan Agner1-0/+3
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>
2018-03-27ARM: multi_v7_defconfig: add GPMI NAND controller supportStefan Agner1-0/+1
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>
2018-03-27ARM: multi_v7_defconfig: add OCOTP driver for NXP SoCsStefan Agner1-0/+2
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>
2018-03-27ARM: multi_v7_defconfig: configure I2C driver built-inStefan Agner1-1/+1
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>
2018-03-27Merge tag 'omap-for-v4.17/defconfig-pt2-signed' of ↵Arnd Bergmann2-0/+14
ssh://gitolite.kernel.org/pub/scm/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
2018-03-27Merge tag 'armsoc-versatile-drm-defconfig' of ↵Arnd Bergmann2-18/+21
ssh://gitolite.kernel.org/pub/scm/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
2018-03-27Merge tag 'omap-for-v4.17/defconfig-signed' of ↵Arnd Bergmann2-39/+91
ssh://gitolite.kernel.org/pub/scm/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>
2018-03-27Merge tag 'renesas-defconfig-for-v4.17' of ↵Arnd Bergmann1-7/+2
ssh://gitolite.kernel.org/pub/scm/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
2018-03-27Merge tag 'imx-defconfig-4.17' of ↵Arnd Bergmann3-29/+22
ssh://gitolite.kernel.org/pub/scm/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
2018-03-27ARM: imx: fix imx6sll-only buildArnd Bergmann1-0/+1
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>
2018-03-27ARM: imx: select ARM_CPU_SUSPEND for CPU_IDLE as wellArnd Bergmann1-1/+1
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>
2018-03-26ARM: mxs_defconfig: Re-sync defconfigFabio Estevam1-10/+4
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>
2018-03-26ARM: imx_v4_v5_defconfig: Use the generic fsl-asoc-card driverFabio Estevam1-1/+2
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>
2018-03-26ARM: imx_v4_v5_defconfig: Re-sync defconfigFabio Estevam1-5/+1
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>
2018-03-20ARM: multi_v7_defconfig: Enable CPCAP related options mostly as loadable modulesTony Lindgren1-0/+9
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>
2018-03-20ARM: omap2plus_defconfig: Add UINPUTTony Lindgren1-0/+1
This can be used for keyboard fn keys with funkeymonkey. Signed-off-by: Tony Lindgren <tony@atomide.com>
2018-03-20ARM: omap2plus_defconfig: Enable MDM6600 USB PHYTony Lindgren1-0/+1
This allows droid 4 USB modem to work. Signed-off-by: Tony Lindgren <tony@atomide.com>
2018-03-20ARM: omap2plus_defconfig: Add AUDIO_GRAPH_CARDTony Lindgren1-0/+2
This is needed for audio on droid 4. Signed-off-by: Tony Lindgren <tony@atomide.com>
2018-03-20ARM: omap2plus_defconfig: Enable PWM_VIBRATony Lindgren1-0/+1
We can use PWM_VIBRA on many phones like droid 4. Signed-off-by: Tony Lindgren <tony@atomide.com>
2018-03-20ARM: defconfig: Configure Versatile boards to use PL111 DRMLinus Walleij1-4/+9
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>
2018-03-20ARM: defconfig: Update Versatile defconfigLinus Walleij1-3/+2
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>
2018-03-20ARM: defconfig: Switch RealView boards to use P111 DRMLinus Walleij1-3/+7
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>
2018-03-20ARM: defconfig: Update RealView defconfigLinus Walleij1-8/+3
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>
2018-03-15Merge tag 'imx-soc-4.17' of ↵Arnd Bergmann11-288/+89
ssh://gitolite.kernel.org/pub/scm/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
2018-03-15ARM: configs: add OXNAS v6 defconfigNeil Armstrong1-0/+93
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>
2018-03-14Merge tag 'arm-soc/for-4.17/defconfig' of ↵Arnd Bergmann2-0/+8
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
2018-03-12Merge tag 'pxa-for-4.17' of https://github.com/rjarzmik/linux into next/socArnd Bergmann15-60/+42
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
2018-03-12Merge tag 'at91-ab-4.17-soc' of ↵Arnd Bergmann1-7/+7
ssh://gitolite.kernel.org/pub/scm/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
2018-03-09ARM: imx: Add basic msl support for imx6sllBai Ping6-4/+30
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>
2018-03-08ARM: imx_v6_v7_defconfig: Select CONFIG_SND_SOC_WM8962 explicitlyFabio Estevam1-0/+1
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>
2018-03-07Merge tag 'samsung-soc-4.17' of ↵Arnd Bergmann3-13/+7
ssh://gitolite.kernel.org/pub/scm/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
2018-03-07Merge tag 'omap-for-v4.17/ti-sysc-signed' of ↵Arnd Bergmann6-15/+500
ssh://gitolite.kernel.org/pub/scm/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
2018-03-07Merge tag 'omap-for-v4.17/am-pm-signed' of ↵Arnd Bergmann9-0/+850
ssh://gitolite.kernel.org/pub/scm/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
2018-03-07Merge tag 'omap-for-v4.17/timer-signed' of ↵Arnd Bergmann9-1459/+4
ssh://gitolite.kernel.org/pub/scm/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
2018-03-07Merge tag 'omap-for-v4.17/soc-signed' of ↵Arnd Bergmann23-494/+13
ssh://gitolite.kernel.org/pub/scm/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
2018-03-07Merge tag 'stm32-defconfig-for-v4.17-1' of ↵Arnd Bergmann2-0/+6
ssh://gitolite.kernel.org/pub/scm/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
2018-03-07Merge tag 'stm32-soc-for-v4.17-1' of ↵Arnd Bergmann2-14/+43
ssh://gitolite.kernel.org/pub/scm/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
2018-03-07ARM: socfpga: PM: Drop useless check for PM_SUSPEND_STANDBYGeert Uytterhoeven1-1/+0
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>
2018-03-07ARM: nspire: Remove unneeded nspire_map_io()Geert Uytterhoeven1-6/+0
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>
2018-03-07ARM: reorder mach-*/Kconfig inclusionsAlexandre Belloni1-26/+26
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>
2018-03-07Merge tag 'davinci-for-v4.17/defconfig' of ↵Arnd Bergmann1-1/+2
ssh://gitolite.kernel.org/pub/scm/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
2018-03-07Merge tag 'davinci-for-v4.17/soc' of ↵Arnd Bergmann26-191/+123
ssh://gitolite.kernel.org/pub/scm/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
2018-03-07Merge tag 'nand/pxa3xx-removal' of git://git.infradead.org/linux-mtd into ↵Robert Jarzmik14-51/+33
pxa/for-next Remove the pxa3xx_nand driver (replaced by marvell_nand).
2018-03-07ARM: pxa/raumfeld: use PROPERTY_ENTRY_U32() directlyAndy Shevchenko1-3/+3
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>
2018-03-07ARM: pxa: ulpi: fix ulpi timeout and slowpath warnIgor Grinberg2-4/+4
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>
2018-03-07ARM: pxa: cm-x300: remove inline directiveIgor Grinberg1-1/+1
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>
2018-03-07ARM: pxa: fix static checker warning in pxa3xx-ulpiIgor Grinberg1-1/+1
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>
2018-03-06ARM: multi_v7_defconfig: Enable USB gadget configfs as loadable moduleTony Lindgren1-0/+19
With USB OTG now enabled, it makes sense to allow configuring the USB gadgets via configfs. Signed-off-by: Tony Lindgren <tony@atomide.com>
generated by cgit v1.2.3 (git 2.39.0) at 2025-01-24 08:14:57 +0300