Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit adbc128f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'armsoc-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc 

Pull ARM SoC platform updates from Arnd Bergmann:
 "These are mostly minor bugfixes, cleanup and many defconfig updates to
  support added drivers. In particular OMAP and PXA keep cleaning up the
  legacy code base, as usual.

  Nvidia adds some more SoC support code for Tegra 186.

  For the first time on years, we are actually adding a non-DT platform
  for the EP93xx based Liebherr controller BK3.1. It's a minor variation
  of the EP93xx reference design and in active use, while EP93xx
  apparently doesn't have enough new development to have any device tree
  support"

* tag 'armsoc-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (73 commits)
  ARM: omap: hwmod: fix section mismatch warnings
  ARM: pxa/tosa-bt: add MODULE_LICENSE tag
  arm64: defconfig: enable CONFIG_ACPI_APEI_EINJ
  arm64: defconfig: enable EDAC GHES option
  arm64: defconfig: enable CONFIG_ACPI_APEI_MEMORY_FAILURE
  ARM: imx_v6_v7_defconfig: enable CONFIG_CPU_FREQ_STAT
  Wind down ARM/TANGO port
  ARM: davinci: constify gpio_led
  ARM: davinci: drop unneeded newline
  soc: Add SoC driver for Gemini
  ARM: SAMSUNG: Add SPDX license identifiers
  ARM: S5PV210: Add SPDX license identifiers
  ARM: S3C64XX: Add SPDX license identifiers
  ARM: S3C24XX: Add SPDX license identifiers
  ARM: EXYNOS: Add SPDX license identifiers
  ARM: imx: remove unused imx3 pm definitions
  ARM: imx: don't abort MMDC probe if power saving status doesn't match
  ARM: imx_v6_v7_defconfig: enable RTC_DRV_MXC_V2
  ARM: imx_v6_v7_defconfig: Add missing config for DART-MX6 SoM
  ARM: davinci: Use PTR_ERR_OR_ZERO()
  ...
parents 537433b6 0ca14cde

MAINTAINERS

+36 −38
Original line number Diff line number Diff line
@@ -1278,6 +1278,12 @@ L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) 
S:	Supported

F:	drivers/net/ethernet/cavium/thunder/



ARM/CIRRUS LOGIC BK3 MACHINE SUPPORT

M:	Lukasz Majewski <lukma@denx.de>

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

S:	Maintained

F:	arch/arm/mach-ep93xx/ts72xx.c



ARM/CIRRUS LOGIC CLPS711X ARM ARCHITECTURE

M:	Alexander Shiyan <shc_work@mail.ru>

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@ -1662,14 +1668,38 @@ ARM/NEC MOBILEPRO 900/c MACHINE SUPPORT 
M:	Michael Petchkovsky <mkpetch@internode.on.net>

S:	Maintained



ARM/NOMADIK ARCHITECTURE

M:	Alessandro Rubini <rubini@unipv.it>

ARM/NOMADIK/U300/Ux500 ARCHITECTURES

M:	Linus Walleij <linus.walleij@linaro.org>

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

S:	Maintained

F:	arch/arm/mach-nomadik/

F:	drivers/pinctrl/nomadik/

F:	arch/arm/mach-u300/

F:	arch/arm/mach-ux500/

F:	arch/arm/boot/dts/ste-*

F:	drivers/clk/clk-nomadik.c

F:	drivers/clk/clk-u300.c

F:	drivers/clocksource/clksrc-dbx500-prcmu.c

F:	drivers/clocksource/timer-u300.c

F:	drivers/dma/coh901318*

F:	drivers/dma/ste_dma40*

F:	drivers/hwspinlock/u8500_hsem.c

F:	drivers/i2c/busses/i2c-nomadik.c

F:	drivers/i2c/busses/i2c-stu300.c

F:	drivers/mfd/ab3100*

F:	drivers/mfd/ab8500*

F:	drivers/mfd/abx500*

F:	drivers/mfd/dbx500*

F:	drivers/mfd/db8500*

F:	drivers/pinctrl/nomadik/

F:	drivers/pinctrl/pinctrl-coh901*

F:	drivers/pinctrl/pinctrl-u300.c

F:	drivers/rtc/rtc-ab3100.c

F:	drivers/rtc/rtc-ab8500.c

F:	drivers/rtc/rtc-coh901331.c

F:	drivers/rtc/rtc-pl031.c

F:	drivers/watchdog/coh901327_wdt.c

F:	Documentation/devicetree/bindings/arm/ste-*

F:	Documentation/devicetree/bindings/arm/ux500/

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik.git



ARM/NUVOTON W90X900 ARM ARCHITECTURE
@@ -1983,9 +2013,10 @@ N: stm32 
F:	drivers/clocksource/armv7m_systick.c



ARM/TANGO ARCHITECTURE

M:	Marc Gonzalez <marc_gonzalez@sigmadesigns.com>

M:	Marc Gonzalez <marc.w.gonzalez@free.fr>

M:	Mans Rullgard <mans@mansr.com>

L:	linux-arm-kernel@lists.infradead.org

S:	Maintained

S:	Odd Fixes

N:	tango



ARM/TECHNOLOGIC SYSTEMS TS7250 MACHINE SUPPORT
@@ -2049,21 +2080,6 @@ M: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> 
M:	Dirk Opfer <dirk@opfer-online.de>

S:	Maintained



ARM/U300 MACHINE SUPPORT

M:	Linus Walleij <linus.walleij@linaro.org>

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

S:	Supported

F:	arch/arm/mach-u300/

F:	drivers/clocksource/timer-u300.c

F:	drivers/i2c/busses/i2c-stu300.c

F:	drivers/rtc/rtc-coh901331.c

F:	drivers/watchdog/coh901327_wdt.c

F:	drivers/dma/coh901318*

F:	drivers/mfd/ab3100*

F:	drivers/rtc/rtc-ab3100.c

F:	drivers/rtc/rtc-coh901331.c

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson.git



ARM/UNIPHIER ARCHITECTURE

M:	Masahiro Yamada <yamada.masahiro@socionext.com>

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@ -2085,24 +2101,6 @@ F: drivers/reset/reset-uniphier.c 
F:	drivers/tty/serial/8250/8250_uniphier.c

N:	uniphier



ARM/Ux500 ARM ARCHITECTURE

M:	Linus Walleij <linus.walleij@linaro.org>

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

S:	Maintained

F:	arch/arm/mach-ux500/

F:	drivers/clocksource/clksrc-dbx500-prcmu.c

F:	drivers/dma/ste_dma40*

F:	drivers/hwspinlock/u8500_hsem.c

F:	drivers/mfd/abx500*

F:	drivers/mfd/ab8500*

F:	drivers/mfd/dbx500*

F:	drivers/mfd/db8500*

F:	drivers/pinctrl/nomadik/pinctrl-ab*

F:	drivers/pinctrl/nomadik/pinctrl-nomadik*

F:	drivers/rtc/rtc-ab8500.c

F:	drivers/rtc/rtc-pl031.c

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson.git



ARM/Ux500 CLOCK FRAMEWORK SUPPORT

M:	Ulf Hansson <ulf.hansson@linaro.org>

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

arch/arm/configs/davinci_all_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -94,6 +94,7 @@ CONFIG_PPP=m 
CONFIG_PPP_DEFLATE=m

CONFIG_PPP_ASYNC=m

CONFIG_PPP_SYNC_TTY=m

CONFIG_USB_USBNET=m

CONFIG_INPUT_EVDEV=m

CONFIG_INPUT_EVBUG=m

CONFIG_KEYBOARD_ATKBD=m

arch/arm/configs/exynos_defconfig

+7 −0
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ CONFIG_NO_HZ=y 
CONFIG_HIGH_RES_TIMERS=y

CONFIG_CGROUPS=y

CONFIG_BLK_DEV_INITRD=y

CONFIG_PERF_EVENTS=y

CONFIG_MODULES=y

CONFIG_MODULE_UNLOAD=y

CONFIG_PARTITION_ADVANCED=y
@@ -179,6 +180,7 @@ CONFIG_REGULATOR_TPS65090=y 
CONFIG_REGULATOR_WM8994=y

CONFIG_MEDIA_SUPPORT=m

CONFIG_MEDIA_CAMERA_SUPPORT=y

CONFIG_MEDIA_CEC_SUPPORT=y

CONFIG_MEDIA_CONTROLLER=y

CONFIG_VIDEO_V4L2_SUBDEV_API=y

CONFIG_MEDIA_USB_SUPPORT=y
@@ -195,6 +197,8 @@ CONFIG_VIDEO_SAMSUNG_S5P_MFC=m 
CONFIG_VIDEO_SAMSUNG_EXYNOS_GSC=m

CONFIG_V4L_TEST_DRIVERS=y

CONFIG_VIDEO_VIVID=m

CONFIG_CEC_PLATFORM_DRIVERS=y

CONFIG_VIDEO_SAMSUNG_S5P_CEC=m

CONFIG_DRM=y

CONFIG_DRM_EXYNOS=y

CONFIG_DRM_EXYNOS_FIMD=y
@@ -207,6 +211,7 @@ CONFIG_DRM_PANEL_SAMSUNG_LD9040=y 
CONFIG_DRM_PANEL_SAMSUNG_S6E8AA0=y

CONFIG_DRM_NXP_PTN3460=y

CONFIG_DRM_PARADE_PS8622=y

CONFIG_DRM_SII9234=y

CONFIG_LCD_CLASS_DEVICE=y

CONFIG_LCD_PLATFORM=y

CONFIG_BACKLIGHT_PWM=y
@@ -218,6 +223,7 @@ CONFIG_SND_SOC_SAMSUNG=y 
CONFIG_SND_SOC_SAMSUNG_SMDK_WM8994=y

CONFIG_SND_SOC_SMDK_WM8994_PCM=y

CONFIG_SND_SOC_SNOW=y

CONFIG_SND_SOC_ODROID=y

CONFIG_SND_SIMPLE_CARD=y

CONFIG_USB=y

CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
@@ -281,6 +287,7 @@ CONFIG_DEVFREQ_GOV_POWERSAVE=y 
CONFIG_DEVFREQ_GOV_USERSPACE=y

CONFIG_ARM_EXYNOS_BUS_DEVFREQ=y

CONFIG_DEVFREQ_EVENT_EXYNOS_NOCP=y

CONFIG_EXYNOS_IOMMU=y

CONFIG_EXTCON=y

CONFIG_EXTCON_MAX14577=y

CONFIG_EXTCON_MAX77693=y

arch/arm/configs/imx_v6_v7_defconfig

+8 −0
Original line number Diff line number Diff line
@@ -55,6 +55,7 @@ CONFIG_FORCE_MAX_ZONEORDER=14 
CONFIG_CMDLINE="noinitrd console=ttymxc0,115200"

CONFIG_KEXEC=y

CONFIG_CPU_FREQ=y

CONFIG_CPU_FREQ_STAT=y

CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y

CONFIG_CPU_FREQ_GOV_POWERSAVE=y

CONFIG_CPU_FREQ_GOV_USERSPACE=y
@@ -80,6 +81,7 @@ CONFIG_CAN=y 
CONFIG_CAN_FLEXCAN=y

CONFIG_BT=y

CONFIG_BT_HCIUART=y

CONFIG_BT_HCIUART_SERDEV=y

CONFIG_BT_HCIUART_H4=y

CONFIG_BT_HCIUART_LL=y

CONFIG_CFG80211=y
@@ -155,6 +157,7 @@ CONFIG_USB_USBNET=y 
CONFIG_USB_NET_CDC_EEM=m

CONFIG_BRCMFMAC=m

CONFIG_WL12XX=m

CONFIG_WL18XX=m

CONFIG_WLCORE_SDIO=m

# CONFIG_WILINK_PLATFORM_DATA is not set

CONFIG_INPUT_EVDEV=y
@@ -185,6 +188,8 @@ CONFIG_SERIAL_IMX=y 
CONFIG_SERIAL_IMX_CONSOLE=y

CONFIG_SERIAL_FSL_LPUART=y

CONFIG_SERIAL_FSL_LPUART_CONSOLE=y

CONFIG_SERIAL_DEV_BUS=y

CONFIG_SERIAL_DEV_CTRL_TTYPORT=y

# CONFIG_I2C_COMPAT is not set

CONFIG_I2C_CHARDEV=y

CONFIG_I2C_MUX=y
@@ -248,6 +253,7 @@ CONFIG_VIDEO_OV5640=m 
CONFIG_SOC_CAMERA_OV2640=y

CONFIG_IMX_IPUV3_CORE=y

CONFIG_DRM=y

CONFIG_DRM_PANEL_LVDS=y

CONFIG_DRM_PANEL_SIMPLE=y

CONFIG_DRM_DW_HDMI_AHB_AUDIO=m

CONFIG_DRM_DW_HDMI_CEC=y
@@ -340,6 +346,7 @@ CONFIG_LEDS_TRIGGER_ONESHOT=y 
CONFIG_LEDS_TRIGGER_HEARTBEAT=y

CONFIG_LEDS_TRIGGER_BACKLIGHT=y

CONFIG_LEDS_TRIGGER_GPIO=y

CONFIG_LEDS_TRIGGER_DEFAULT_ON=y

CONFIG_RTC_CLASS=y

CONFIG_RTC_INTF_DEV_UIE_EMUL=y

CONFIG_RTC_DRV_DS1307=y
@@ -349,6 +356,7 @@ CONFIG_RTC_DRV_PCF8563=y 
CONFIG_RTC_DRV_M41T80=y

CONFIG_RTC_DRV_MC13XXX=y

CONFIG_RTC_DRV_MXC=y

CONFIG_RTC_DRV_MXC_V2=y

CONFIG_RTC_DRV_SNVS=y

CONFIG_DMADEVICES=y

CONFIG_FSL_EDMA=y

arch/arm/configs/keystone_defconfig

+7 −0
Original line number Diff line number Diff line
@@ -228,3 +228,10 @@ CONFIG_CRYPTO_DES=y 
CONFIG_CRYPTO_ANSI_CPRNG=y

CONFIG_CRYPTO_USER_API_HASH=y

CONFIG_CRYPTO_USER_API_SKCIPHER=y

CONFIG_SPI_CADENCE_QUADSPI=y

CONFIG_INPUT_MISC=y

CONFIG_INPUT_EVDEV=m

CONFIG_INPUT_GPIO_DECODER=m

CONFIG_GPIO_PCA953X=m

CONFIG_LEDS_TRIGGER_ACTIVITY=y

CONFIG_LEDS_TRIGGER_CPU=y