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

adbc128f · Linus Torvalds <[email protected]> · 2018-02-01 16:17:40 -08:00

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()
  ...

Commit: adbc128fa8b4e9ecfdd11d5dd0a7d9845c6ea510
Parents: 537433b6 · 0ca14cde

Merge commit. Changes below are compared with the first parent: 537433b6.

Changes

307 files changed · +1947 −2989

File	Status	Add	Del	Content
MAINTAINERS	modified	+36	−38	View file
arch/arm/configs/davinci_all_defconfig	modified	+1	−0	View file
arch/arm/configs/exynos_defconfig	modified	+7	−0	View file
arch/arm/configs/imx_v6_v7_defconfig	modified	+8	−0	View file
arch/arm/configs/keystone_defconfig	modified	+7	−0	View file
arch/arm/configs/multi_v7_defconfig	modified	+12	−0	View file
arch/arm/configs/omap2plus_defconfig	modified	+19	−0	View file
arch/arm/configs/qcom_defconfig	modified	+3	−0	View file
arch/arm/configs/shmobile_defconfig	modified	+2	−0	View file
arch/arm/mach-davinci/board-da850-evm.c	modified	+2	−2	View file
arch/arm/mach-davinci/board-neuros-osd2.c	modified	+1	−1	View file
arch/arm/mach-davinci/common.c	modified	+1	−1	View file
arch/arm/mach-davinci/da830.c	modified	+1	−1	View file
arch/arm/mach-davinci/da850.c	modified	+1	−1	View file
arch/arm/mach-davinci/devices-da8xx.c	modified	+2	−2	View file
arch/arm/mach-davinci/dm355.c	modified	+1	−1	View file
arch/arm/mach-davinci/dm365.c	modified	+1	−1	View file
arch/arm/mach-davinci/dm644x.c	modified	+1	−1	View file
arch/arm/mach-davinci/dm646x.c	modified	+2	−2	View file
arch/arm/mach-davinci/include/mach/common.h	modified	+1	−1	View file
arch/arm/mach-ep93xx/Kconfig	modified	+7	−0	View file
arch/arm/mach-ep93xx/ts72xx.c	modified	+153	−12	View file
arch/arm/mach-ep93xx/ts72xx.h	modified	+9	−0	View file
arch/arm/mach-exynos/Kconfig	modified	+1	−3	View file
arch/arm/mach-exynos/Makefile	modified	+1	−3	View file
arch/arm/mach-exynos/common.h	modified	+1	−4	View file
arch/arm/mach-exynos/exynos-smc.S	modified	+1	−4	View file
arch/arm/mach-exynos/exynos.c	modified	+6	−10	View file
arch/arm/mach-exynos/firmware.c	modified	+5	−9	View file
arch/arm/mach-exynos/headsmp.S	modified	+1	−5	View file
arch/arm/mach-exynos/include/mach/map.h	modified	+2	−5	View file
arch/arm/mach-exynos/mcpm-exynos.c	modified	+5	−12	View file
arch/arm/mach-exynos/platsmp.c	modified	+8	−13	View file
arch/arm/mach-exynos/pm.c	modified	+10	−14	View file
arch/arm/mach-exynos/sleep.S	modified	+1	−10	View file
arch/arm/mach-exynos/smc.h	modified	+1	−4	View file
arch/arm/mach-exynos/suspend.c	modified	+10	−14	View file
arch/arm/mach-imx/common.h	modified	+0	−9	View file
arch/arm/mach-imx/mmdc.c	modified	+0	−11	View file
arch/arm/mach-mediatek/Kconfig	modified	+1	−1	View file
arch/arm/mach-mmp/mmp2.h	modified	+1	−1	View file
arch/arm/mach-mmp/pxa168.h	modified	+1	−1	View file
arch/arm/mach-mmp/pxa910.h	modified	+1	−1	View file
arch/arm/mach-omap2/cm-regbits-24xx.h	modified	+0	−81	View file
arch/arm/mach-omap2/cm-regbits-34xx.h	modified	+0	−162	View file
arch/arm/mach-omap2/id.c	modified	+15	−2	View file
arch/arm/mach-omap2/omap_hwmod.c	modified	+2	−2	View file
arch/arm/mach-omap2/omap_hwmod.h	modified	+0	−6	View file
arch/arm/mach-omap2/omap_hwmod_2420_data.c	modified	+0	−14	View file
arch/arm/mach-omap2/omap_hwmod_2430_data.c	modified	+0	−28	View file
arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c	modified	+0	−64	View file
arch/arm/mach-omap2/omap_hwmod_3xxx_data.c	modified	+0	−131	View file
arch/arm/mach-omap2/omap_hwmod_7xx_data.c	modified	+19	−8	View file
arch/arm/mach-omap2/soc.h	modified	+16	−0	View file
arch/arm/mach-pxa/Kconfig	modified	+1	−0	View file
arch/arm/mach-pxa/balloon3.c	modified	+1	−1	View file
arch/arm/mach-pxa/cm-x300.c	modified	+1	−1	View file
arch/arm/mach-pxa/colibri-evalboard.c	modified	+1	−1	View file
arch/arm/mach-pxa/colibri-pxa270-income.c	modified	+1	−1	View file
arch/arm/mach-pxa/corgi.c	modified	+9	−24	View file
arch/arm/mach-pxa/csb726.c	modified	+1	−1	View file
arch/arm/mach-pxa/devices.c	modified	+1	−1	View file
arch/arm/mach-pxa/devices.h	modified	+9	−0	View file
arch/arm/mach-pxa/em-x270.c	modified	+1	−1	View file
arch/arm/mach-pxa/ezx.c	modified	+1	−1	View file
arch/arm/mach-pxa/hx4700.c	modified	+1	−1	View file
arch/arm/mach-pxa/littleton.c	modified	+2	−1	View file
arch/arm/mach-pxa/lubbock.c	modified	+16	−8	View file
arch/arm/mach-pxa/magician.c	modified	+1	−1	View file
arch/arm/mach-pxa/mainstone.c	modified	+1	−1	View file
arch/arm/mach-pxa/mioa701.c	modified	+1	−1	View file
arch/arm/mach-pxa/mxm8x10.c	modified	+1	−1	View file
arch/arm/mach-pxa/palm27x.c	modified	+1	−1	View file
arch/arm/mach-pxa/pcm990-baseboard.c	modified	+1	−1	View file
arch/arm/mach-pxa/poodle.c	modified	+9	−21	View file
arch/arm/mach-pxa/pxa27x.c	modified	+1	−1	View file
arch/arm/mach-pxa/pxa3xx.c	modified	+1	−1	View file
arch/arm/mach-pxa/raumfeld.c	modified	+1	−1	View file
arch/arm/mach-pxa/saar.c	modified	+1	−1	View file
arch/arm/mach-pxa/spitz.c	modified	+10	−26	View file
arch/arm/mach-pxa/stargate2.c	modified	+1	−1	View file
arch/arm/mach-pxa/tosa-bt.c	modified	+4	−0	View file
arch/arm/mach-pxa/tosa.c	modified	+9	−21	View file
arch/arm/mach-pxa/trizeps4.c	modified	+1	−1	View file
arch/arm/mach-pxa/viper.c	modified	+1	−1	View file
arch/arm/mach-pxa/vpac270.c	modified	+1	−1	View file
arch/arm/mach-pxa/xcep.c	modified	+2	−1	View file
arch/arm/mach-pxa/z2.c	modified	+1	−1	View file
arch/arm/mach-pxa/zeus.c	modified	+2	−1	View file
arch/arm/mach-pxa/zylonite_pxa300.c	modified	+2	−1	View file
arch/arm/mach-s3c24xx/Kconfig	modified	+1	−3	View file
arch/arm/mach-s3c24xx/Makefile	modified	+1	−3	View file
arch/arm/mach-s3c24xx/Makefile.boot	modified	+2	−0	View file
arch/arm/mach-s3c24xx/anubis.h	modified	+2	−5	View file
arch/arm/mach-s3c24xx/bast-ide.c	modified	+6	−11	View file
arch/arm/mach-s3c24xx/bast-irq.c	modified	+6	−22	View file
arch/arm/mach-s3c24xx/bast.h	modified	+2	−5	View file
arch/arm/mach-s3c24xx/common-smdk.c	modified	+8	−13	View file
arch/arm/mach-s3c24xx/common-smdk.h	modified	+2	−5	View file
arch/arm/mach-s3c24xx/common.c	modified	+7	−22	View file
arch/arm/mach-s3c24xx/common.h	modified	+1	−4	View file
arch/arm/mach-s3c24xx/cpufreq-utils.c	modified	+7	−11	View file
arch/arm/mach-s3c24xx/fb-core.h	modified	+1	−4	View file
arch/arm/mach-s3c24xx/gta02.h	modified	+2	−5	View file
arch/arm/mach-s3c24xx/h1940-bluetooth.c	modified	+5	−11	View file
arch/arm/mach-s3c24xx/h1940.h	modified	+2	−5	View file
arch/arm/mach-s3c24xx/include/mach/dma.h	modified	+3	−7	View file
arch/arm/mach-s3c24xx/include/mach/fb.h	modified	+1	−0	View file
arch/arm/mach-s3c24xx/include/mach/gpio-samsung.h	modified	+2	−5	View file
arch/arm/mach-s3c24xx/include/mach/hardware.h	modified	+2	−5	View file
arch/arm/mach-s3c24xx/include/mach/irqs.h	modified	+3	−7	View file
arch/arm/mach-s3c24xx/include/mach/map.h	modified	+3	−7	View file
arch/arm/mach-s3c24xx/include/mach/pm-core.h	modified	+3	−6	View file
arch/arm/mach-s3c24xx/include/mach/regs-clock.h	modified	+3	−7	View file
arch/arm/mach-s3c24xx/include/mach/regs-gpio.h	modified	+3	−7	View file
arch/arm/mach-s3c24xx/include/mach/regs-irq.h	modified	+3	−7	View file
arch/arm/mach-s3c24xx/include/mach/regs-lcd.h	modified	+3	−8	View file
arch/arm/mach-s3c24xx/include/mach/regs-s3c2443-clock.h	modified	+3	−7	View file
arch/arm/mach-s3c24xx/include/mach/rtc-core.h	modified	+2	−5	View file
arch/arm/mach-s3c24xx/include/mach/s3c2412.h	modified	+1	−4	View file
arch/arm/mach-s3c24xx/iotiming-s3c2410.c	modified	+7	−11	View file
arch/arm/mach-s3c24xx/iotiming-s3c2412.c	modified	+7	−11	View file
arch/arm/mach-s3c24xx/irq-pm.c	modified	+7	−12	View file
arch/arm/mach-s3c24xx/mach-amlm5900.c	modified	+8	−27	View file
arch/arm/mach-s3c24xx/mach-anubis.c	modified	+5	−10	View file
arch/arm/mach-s3c24xx/mach-at2440evb.c	modified	+8	−13	View file
arch/arm/mach-s3c24xx/mach-bast.c	modified	+6	−11	View file
arch/arm/mach-s3c24xx/mach-gta02.c	modified	+9	−24	View file
arch/arm/mach-s3c24xx/mach-h1940.c	modified	+6	−11	View file
arch/arm/mach-s3c24xx/mach-jive.c	modified	+6	−11	View file
arch/arm/mach-s3c24xx/mach-mini2440.c	modified	+9	−14	View file
arch/arm/mach-s3c24xx/mach-n30.c	modified	+12	−15	View file
arch/arm/mach-s3c24xx/mach-nexcoder.c	modified	+9	−13	View file
arch/arm/mach-s3c24xx/mach-osiris-dvs.c	modified	+7	−12	View file
arch/arm/mach-s3c24xx/mach-osiris.c	modified	+5	−9	View file
arch/arm/mach-s3c24xx/mach-otom.c	modified	+4	−9	View file
arch/arm/mach-s3c24xx/mach-qt2410.c	modified	+5	−22	View file
arch/arm/mach-s3c24xx/mach-rx1950.c	modified	+6	−11	View file
arch/arm/mach-s3c24xx/mach-rx3715.c	modified	+6	−12	View file
arch/arm/mach-s3c24xx/mach-s3c2416-dt.c	modified	+12	−16	View file
arch/arm/mach-s3c24xx/mach-smdk2410.c	modified	+10	−29	View file
arch/arm/mach-s3c24xx/mach-smdk2413.c	modified	+7	−12	View file
arch/arm/mach-s3c24xx/mach-smdk2416.c	modified	+6	−12	View file
arch/arm/mach-s3c24xx/mach-smdk2440.c	modified	+9	−14	View file
arch/arm/mach-s3c24xx/mach-smdk2443.c	modified	+8	−14	View file
arch/arm/mach-s3c24xx/mach-tct_hammer.c	modified	+8	−25	View file
arch/arm/mach-s3c24xx/mach-vr1000.c	modified	+7	−12	View file
arch/arm/mach-s3c24xx/mach-vstms.c	modified	+5	−10	View file
arch/arm/mach-s3c24xx/nand-core.h	modified	+2	−5	View file
arch/arm/mach-s3c24xx/osiris.h	modified	+2	−5	View file
arch/arm/mach-s3c24xx/otom.h	modified	+2	−5	View file
arch/arm/mach-s3c24xx/pll-s3c2410.c	modified	+8	−22	View file
arch/arm/mach-s3c24xx/pll-s3c2440-12000000.c	modified	+8	−12	View file
arch/arm/mach-s3c24xx/pll-s3c2440-16934400.c	modified	+8	−12	View file
arch/arm/mach-s3c24xx/pm-h1940.S	modified	+3	−16	View file
arch/arm/mach-s3c24xx/pm-s3c2410.c	modified	+6	−21	View file
arch/arm/mach-s3c24xx/pm-s3c2412.c	modified	+6	−11	View file
arch/arm/mach-s3c24xx/pm-s3c2416.c	modified	+6	−11	View file
arch/arm/mach-s3c24xx/pm.c	modified	+12	−27	View file
arch/arm/mach-s3c24xx/regs-dsc.h	modified	+2	−5	View file
arch/arm/mach-s3c24xx/regs-mem.h	modified	+1	−4	View file
arch/arm/mach-s3c24xx/s3c2410.c	modified	+6	−11	View file
arch/arm/mach-s3c24xx/s3c2412-power.h	modified	+1	−4	View file
arch/arm/mach-s3c24xx/s3c2412.c	modified	+6	−10	View file
arch/arm/mach-s3c24xx/s3c2416.c	modified	+8	−23	View file
arch/arm/mach-s3c24xx/s3c2440.c	modified	+6	−11	View file
arch/arm/mach-s3c24xx/s3c2442.c	modified	+7	−22	View file
arch/arm/mach-s3c24xx/s3c2443.c	modified	+6	−11	View file
arch/arm/mach-s3c24xx/s3c244x.c	modified	+6	−11	View file
arch/arm/mach-s3c24xx/setup-camif.c	modified	+5	−9	View file
arch/arm/mach-s3c24xx/setup-i2c.c	modified	+6	−11	View file
arch/arm/mach-s3c24xx/setup-sdhci-gpio.c	modified	+8	−13	View file
arch/arm/mach-s3c24xx/setup-spi.c	modified	+6	−10	View file
arch/arm/mach-s3c24xx/setup-ts.c	modified	+6	−11	View file
arch/arm/mach-s3c24xx/simtec-audio.c	modified	+7	−12	View file
arch/arm/mach-s3c24xx/simtec-nor.c	modified	+7	−12	View file
arch/arm/mach-s3c24xx/simtec-pm.c	modified	+8	−13	View file
arch/arm/mach-s3c24xx/simtec-usb.c	modified	+8	−13	View file
arch/arm/mach-s3c24xx/simtec.h	modified	+3	−7	View file
arch/arm/mach-s3c24xx/sleep-s3c2410.S	modified	+3	−17	View file
arch/arm/mach-s3c24xx/sleep-s3c2412.S	modified	+3	−17	View file
arch/arm/mach-s3c24xx/sleep.S	modified	+3	−17	View file
arch/arm/mach-s3c24xx/spi-core.h	modified	+1	−4	View file
arch/arm/mach-s3c24xx/vr1000.h	modified	+3	−8	View file
arch/arm/mach-s3c64xx/Kconfig	modified	+3	−2	View file
arch/arm/mach-s3c64xx/Makefile	modified	+1	−3	View file
arch/arm/mach-s3c64xx/ata-core.h	modified	+2	−5	View file
arch/arm/mach-s3c64xx/backlight.h	modified	+1	−4	View file
arch/arm/mach-s3c64xx/common.c	modified	+11	−15	View file
arch/arm/mach-s3c64xx/common.h	modified	+1	−4	View file
arch/arm/mach-s3c64xx/cpuidle.c	modified	+5	−10	View file
arch/arm/mach-s3c64xx/crag6410.h	modified	+1	−4	View file
arch/arm/mach-s3c64xx/dev-audio.c	modified	+4	−9	View file
arch/arm/mach-s3c64xx/dev-backlight.c	modified	+6	−10	View file
arch/arm/mach-s3c64xx/dev-uart.c	modified	+8	−14	View file
arch/arm/mach-s3c64xx/include/mach/gpio-samsung.h	modified	+2	−5	View file
arch/arm/mach-s3c64xx/include/mach/hardware.h	modified	+1	−0	View file
arch/arm/mach-s3c64xx/include/mach/map.h	modified	+3	−7	View file
arch/arm/mach-s3c64xx/include/mach/pm-core.h	modified	+2	−6	View file
arch/arm/mach-s3c64xx/include/mach/regs-clock.h	modified	+3	−7	View file
arch/arm/mach-s3c64xx/include/mach/regs-irq.h	modified	+3	−7	View file
arch/arm/mach-s3c64xx/irq-pm.c	modified	+8	−13	View file
arch/arm/mach-s3c64xx/irq-uart.h	modified	+2	−5	View file
arch/arm/mach-s3c64xx/mach-anw6410.c	modified	+8	−14	View file
arch/arm/mach-s3c64xx/mach-crag6410-module.c	modified	+6	−9	View file
arch/arm/mach-s3c64xx/mach-crag6410.c	modified	+7	−12	View file
arch/arm/mach-s3c64xx/mach-hmt.c	modified	+5	−9	View file
arch/arm/mach-s3c64xx/mach-mini6410.c	modified	+7	−13	View file
arch/arm/mach-s3c64xx/mach-ncp.c	modified	+3	−10	View file
arch/arm/mach-s3c64xx/mach-real6410.c	modified	+7	−13	View file
arch/arm/mach-s3c64xx/mach-s3c64xx-dt.c	modified	+5	−9	View file
arch/arm/mach-s3c64xx/mach-smartq.c	modified	+3	−10	View file
arch/arm/mach-s3c64xx/mach-smartq.h	modified	+1	−5	View file
arch/arm/mach-s3c64xx/mach-smartq5.c	modified	+3	−10	View file
arch/arm/mach-s3c64xx/mach-smartq7.c	modified	+3	−10	View file
arch/arm/mach-s3c64xx/mach-smdk6400.c	modified	+5	−10	View file
arch/arm/mach-s3c64xx/mach-smdk6410.c	modified	+6	−12	View file
arch/arm/mach-s3c64xx/onenand-core.h	modified	+2	−5	View file
arch/arm/mach-s3c64xx/pl080.c	modified	+5	−9	View file
arch/arm/mach-s3c64xx/pm.c	modified	+8	−13	View file
arch/arm/mach-s3c64xx/regs-modem.h	modified	+2	−5	View file
arch/arm/mach-s3c64xx/regs-srom.h	modified	+2	−5	View file
arch/arm/mach-s3c64xx/s3c6400.c	modified	+5	−10	View file
arch/arm/mach-s3c64xx/s3c6410.c	modified	+6	−11	View file
arch/arm/mach-s3c64xx/setup-fb-24bpp.c	modified	+8	−13	View file
arch/arm/mach-s3c64xx/setup-i2c0.c	modified	+8	−13	View file
arch/arm/mach-s3c64xx/setup-i2c1.c	modified	+8	−13	View file
arch/arm/mach-s3c64xx/setup-ide.c	modified	+6	−11	View file
arch/arm/mach-s3c64xx/setup-keypad.c	modified	+6	−11	View file
arch/arm/mach-s3c64xx/setup-sdhci-gpio.c	modified	+7	−12	View file
arch/arm/mach-s3c64xx/setup-spi.c	modified	+4	−9	View file
arch/arm/mach-s3c64xx/setup-usb-phy.c	modified	+4	−10	View file
arch/arm/mach-s3c64xx/sleep.S	modified	+2	−5	View file
arch/arm/mach-s3c64xx/watchdog-reset.h	modified	+2	−5	View file
arch/arm/mach-s5pv210/Kconfig	modified	+1	−3	View file
arch/arm/mach-s5pv210/Makefile	modified	+1	−3	View file
arch/arm/mach-s5pv210/common.h	modified	+1	−4	View file
arch/arm/mach-s5pv210/pm.c	modified	+10	−15	View file
arch/arm/mach-s5pv210/regs-clock.h	modified	+2	−5	View file
arch/arm/mach-s5pv210/s5pv210.c	modified	+7	−11	View file
arch/arm/mach-s5pv210/sleep.S	modified	+1	−5	View file
arch/arm/plat-samsung/Kconfig	modified	+1	−3	View file
arch/arm/plat-samsung/Makefile	modified	+1	−3	View file
arch/arm/plat-samsung/adc.c	modified	+7	−12	View file
arch/arm/plat-samsung/cpu.c	modified	+6	−11	View file
arch/arm/plat-samsung/dev-uart.c	modified	+8	−13	View file
arch/arm/plat-samsung/devs.c	modified	+6	−11	View file
arch/arm/plat-samsung/gpio-samsung.c	modified	+11	−15	View file
arch/arm/plat-samsung/include/plat/adc-core.h	modified	+3	−7	View file
arch/arm/plat-samsung/include/plat/adc.h	modified	+3	−7	View file
arch/arm/plat-samsung/include/plat/cpu-freq-core.h	modified	+3	−7	View file
arch/arm/plat-samsung/include/plat/cpu-freq.h	modified	+3	−7	View file
arch/arm/plat-samsung/include/plat/cpu.h	modified	+3	−7	View file
arch/arm/plat-samsung/include/plat/devs.h	modified	+3	−7	View file
arch/arm/plat-samsung/include/plat/fb-s3c2410.h	modified	+2	−6	View file
arch/arm/plat-samsung/include/plat/fb.h	modified	+3	−7	View file
arch/arm/plat-samsung/include/plat/gpio-cfg-helpers.h	modified	+3	−7	View file
arch/arm/plat-samsung/include/plat/gpio-cfg.h	modified	+3	−7	View file
arch/arm/plat-samsung/include/plat/gpio-core.h	modified	+3	−7	View file
arch/arm/plat-samsung/include/plat/iic-core.h	modified	+3	−7	View file
arch/arm/plat-samsung/include/plat/keypad.h	modified	+1	−5	View file
arch/arm/plat-samsung/include/plat/map-base.h	modified	+3	−7	View file
arch/arm/plat-samsung/include/plat/map-s3c.h	modified	+3	−7	View file
arch/arm/plat-samsung/include/plat/map-s5p.h	modified	+3	−7	View file
arch/arm/plat-samsung/include/plat/pm-common.h	modified	+2	−5	View file
arch/arm/plat-samsung/include/plat/pm.h	modified	+3	−7	View file
arch/arm/plat-samsung/include/plat/pwm-core.h	modified	+1	−4	View file
arch/arm/plat-samsung/include/plat/regs-adc.h	modified	+3	−7	View file
arch/arm/plat-samsung/include/plat/regs-irqtype.h	modified	+2	−6	View file
arch/arm/plat-samsung/include/plat/regs-spi.h	modified	+3	−7	View file
arch/arm/plat-samsung/include/plat/regs-udc.h	modified	+3	−8	View file
arch/arm/plat-samsung/include/plat/samsung-time.h	modified	+3	−7	View file
arch/arm/plat-samsung/include/plat/sdhci.h	modified	+3	−7	View file
arch/arm/plat-samsung/include/plat/usb-phy.h	modified	+1	−5	View file
arch/arm/plat-samsung/include/plat/wakeup-mask.h	modified	+3	−8	View file
arch/arm/plat-samsung/init.c	modified	+7	−12	View file
arch/arm/plat-samsung/platformdata.c	modified	+5	−10	View file
arch/arm/plat-samsung/pm-check.c	modified	+9	−13	View file
arch/arm/plat-samsung/pm-common.c	modified	+10	−14	View file
arch/arm/plat-samsung/pm-debug.c	modified	+10	−14	View file
arch/arm/plat-samsung/pm-gpio.c	modified	+8	−14	View file
arch/arm/plat-samsung/pm.c	modified	+8	−13	View file
arch/arm/plat-samsung/wakeup-mask.c	modified	+5	−10	View file
arch/arm/plat-samsung/watchdog-reset.c	modified	+8	−13	View file
arch/arm/tools/mach-types	modified	+1	−0	View file
arch/arm64/configs/defconfig	modified	+10	−3	View file
drivers/i2c/busses/i2c-pxa-pci.c	modified	+1	−1	View file
drivers/i2c/busses/i2c-pxa.c	modified	+1	−1	View file
drivers/soc/Makefile	modified	+1	−0	View file
drivers/soc/gemini/Makefile	added	+2	−0	View file
drivers/soc/gemini/soc-gemini.c	added	+71	−0	View file
drivers/soc/mediatek/mtk-infracfg.c	modified	+22	−4	View file
drivers/soc/mediatek/mtk-scpsys.c	modified	+125	−15	View file
drivers/soc/renesas/rcar-sysc.c	modified	+1	−1	View file
drivers/soc/renesas/renesas-soc.c	modified	+3	−0	View file
drivers/soc/tegra/Kconfig	modified	+1	−4	View file
drivers/soc/tegra/Makefile	modified	+0	−1	View file
drivers/soc/tegra/fuse/fuse-tegra.c	modified	+4	−0	View file
drivers/soc/tegra/fuse/fuse-tegra20.c	modified	+11	−2	View file
drivers/soc/tegra/fuse/fuse-tegra30.c	modified	+22	−2	View file
drivers/soc/tegra/fuse/fuse.h	modified	+4	−0	View file
drivers/soc/tegra/fuse/tegra-apbmisc.c	modified	+6	−5	View file
drivers/soc/tegra/pmc-tegra186.c	deleted	+0	−169	View before deletion
drivers/soc/tegra/pmc.c	modified	+250	−54	View file
include/linux/i2c/pxa-i2c.h → include/linux/platform_data/i2c-pxa.h	renamed	+0	−11	View file
include/linux/soc/mediatek/infracfg.h	modified	+4	−3	View file
include/soc/tegra/pmc.h	modified	+12	−0	View file

Only the first 600 diff lines are shown. Download the complete patch.

MAINTAINERS

View file

diff --git a/MAINTAINERS b/MAINTAINERS
index 1719600..2bd08be 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1278,6 +1278,12 @@ L:	[email protected] (moderated for non-subscribers)
 S:	Supported
 F:	drivers/net/ethernet/cavium/thunder/
 
+ARM/CIRRUS LOGIC BK3 MACHINE SUPPORT
+M:	Lukasz Majewski <[email protected]>
+L:	[email protected] (moderated for non-subscribers)
+S:	Maintained
+F:	arch/arm/mach-ep93xx/ts72xx.c
+
 ARM/CIRRUS LOGIC CLPS711X ARM ARCHITECTURE
 M:	Alexander Shiyan <[email protected]>
 L:	[email protected] (moderated for non-subscribers)
@@ -1662,14 +1668,38 @@ ARM/NEC MOBILEPRO 900/c MACHINE SUPPORT
 M:	Michael Petchkovsky <[email protected]>
 S:	Maintained
 
-ARM/NOMADIK ARCHITECTURE
-M:	Alessandro Rubini <[email protected]>
+ARM/NOMADIK/U300/Ux500 ARCHITECTURES
 M:	Linus Walleij <[email protected]>
 L:	[email protected] (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 <[email protected]>
+M:	Marc Gonzalez <[email protected]>
+M:	Mans Rullgard <[email protected]>
 L:	[email protected]
-S:	Maintained
+S:	Odd Fixes
 N:	tango
 
 ARM/TECHNOLOGIC SYSTEMS TS7250 MACHINE SUPPORT
@@ -2049,21 +2080,6 @@ M:	Dmitry Eremin-Solenikov <[email protected]>
 M:	Dirk Opfer <[email protected]>
 S:	Maintained
 
-ARM/U300 MACHINE SUPPORT
-M:	Linus Walleij <[email protected]>
-L:	[email protected] (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 <[email protected]>
 L:	[email protected] (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 <[email protected]>
-L:	[email protected] (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 <[email protected]>
 L:	[email protected] (moderated for non-subscribers)

arch/arm/configs/davinci_all_defconfig

View file

diff --git a/arch/arm/configs/davinci_all_defconfig b/arch/arm/configs/davinci_all_defconfig
index bd0cf22..026154c 100644
--- a/arch/arm/configs/davinci_all_defconfig
+++ b/arch/arm/configs/davinci_all_defconfig
@@ -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

View file

diff --git a/arch/arm/configs/exynos_defconfig b/arch/arm/configs/exynos_defconfig
index f1d7834..629189c 100644
--- a/arch/arm/configs/exynos_defconfig
+++ b/arch/arm/configs/exynos_defconfig
@@ -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

View file

diff --git a/arch/arm/configs/imx_v6_v7_defconfig b/arch/arm/configs/imx_v6_v7_defconfig
index 0d44949..4cb9829 100644
--- a/arch/arm/configs/imx_v6_v7_defconfig
+++ b/arch/arm/configs/imx_v6_v7_defconfig
@@ -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

View file

diff --git a/arch/arm/configs/keystone_defconfig b/arch/arm/configs/keystone_defconfig
index f710c19..2536c23 100644
--- a/arch/arm/configs/keystone_defconfig
+++ b/arch/arm/configs/keystone_defconfig
@@ -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

arch/arm/configs/multi_v7_defconfig

View file

diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig
index b659244..da73876 100644
--- a/arch/arm/configs/multi_v7_defconfig
+++ b/arch/arm/configs/multi_v7_defconfig
@@ -115,6 +115,8 @@ CONFIG_ARCH_ZYNQ=y
 CONFIG_TRUSTED_FOUNDATIONS=y
 CONFIG_PCI=y
 CONFIG_PCI_HOST_GENERIC=y
+CONFIG_PCI_DRA7XX=y
+CONFIG_PCI_DRA7XX_EP=y
 CONFIG_PCI_KEYSTONE=y
 CONFIG_PCI_MSI=y
 CONFIG_PCI_MVEBU=y
@@ -122,6 +124,9 @@ CONFIG_PCI_TEGRA=y
 CONFIG_PCI_RCAR_GEN2=y
 CONFIG_PCIE_RCAR=y
 CONFIG_PCIEPORTBUS=y
+CONFIG_PCI_ENDPOINT=y
+CONFIG_PCI_ENDPOINT_CONFIGFS=y
+CONFIG_PCI_EPF_TEST=m
 CONFIG_SMP=y
 CONFIG_NR_CPUS=16
 CONFIG_HIGHPTE=y
@@ -221,6 +226,7 @@ CONFIG_ATMEL_SSC=m
 CONFIG_QCOM_COINCELL=m
 CONFIG_APDS9802ALS=y
 CONFIG_ISL29003=y
+CONFIG_PCI_ENDPOINT_TEST=m
 CONFIG_EEPROM_AT24=y
 CONFIG_BLK_DEV_SD=y
 CONFIG_BLK_DEV_SR=y
@@ -556,6 +562,7 @@ CONFIG_REGULATOR_VEXPRESS=y
 CONFIG_REGULATOR_WM8994=m
 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
@@ -581,6 +588,8 @@ CONFIG_VIDEO_STI_DELTA=m
 CONFIG_VIDEO_RENESAS_JPU=m
 CONFIG_VIDEO_RENESAS_VSP1=m
 CONFIG_V4L_TEST_DRIVERS=y
+CONFIG_CEC_PLATFORM_DRIVERS=y
+CONFIG_VIDEO_SAMSUNG_S5P_CEC=m
 # CONFIG_MEDIA_SUBDRV_AUTOSELECT is not set
 CONFIG_VIDEO_ADV7180=m
 CONFIG_VIDEO_ML86V7667=m
@@ -612,6 +621,7 @@ CONFIG_DRM_TEGRA=y
 CONFIG_DRM_PANEL_SAMSUNG_LD9040=m
 CONFIG_DRM_PANEL_SAMSUNG_S6E8AA0=m
 CONFIG_DRM_PANEL_SIMPLE=y
+CONFIG_DRM_SII9234=m
 CONFIG_DRM_STI=m
 CONFIG_DRM_VC4=y
 CONFIG_FB_ARMCLCD=y
@@ -650,6 +660,7 @@ CONFIG_SND_SOC_SAMSUNG=m
 CONFIG_SND_SOC_SAMSUNG_SMDK_WM8994=m
 CONFIG_SND_SOC_SMDK_WM8994_PCM=m
 CONFIG_SND_SOC_SNOW=m
+CONFIG_SND_SOC_ODROID=m
 CONFIG_SND_SOC_SH4_FSI=m
 CONFIG_SND_SOC_RCAR=m
 CONFIG_SND_SIMPLE_SCU_CARD=m
@@ -878,6 +889,7 @@ CONFIG_PWM_ATMEL=m
 CONFIG_PWM_ATMEL_HLCDC_PWM=m
 CONFIG_PWM_ATMEL_TCB=m
 CONFIG_PWM_FSL_FTM=m
+CONFIG_PWM_RCAR=m
 CONFIG_PWM_RENESAS_TPU=y
 CONFIG_PWM_ROCKCHIP=m
 CONFIG_PWM_SAMSUNG=m

arch/arm/configs/omap2plus_defconfig

View file

diff --git a/arch/arm/configs/omap2plus_defconfig b/arch/arm/configs/omap2plus_defconfig
index 7b97200..2f145c4 100644
--- a/arch/arm/configs/omap2plus_defconfig
+++ b/arch/arm/configs/omap2plus_defconfig
@@ -48,6 +48,13 @@ CONFIG_SOC_AM43XX=y
 CONFIG_SOC_DRA7XX=y
 CONFIG_ARM_THUMBEE=y
 CONFIG_ARM_ERRATA_411920=y
+CONFIG_PCI=y
+CONFIG_PCI_MSI=y
+CONFIG_PCI_DRA7XX=y
+CONFIG_PCI_DRA7XX_EP=y
+CONFIG_PCI_ENDPOINT=y
+CONFIG_PCI_ENDPOINT_CONFIGFS=y
+CONFIG_PCI_EPF_TEST=m
 CONFIG_SMP=y
 CONFIG_NR_CPUS=2
 CONFIG_CMA=y
@@ -137,6 +144,7 @@ CONFIG_BLK_DEV_RAM=y
 CONFIG_BLK_DEV_RAM_SIZE=16384
 CONFIG_SENSORS_TSL2550=m
 CONFIG_SRAM=y
+CONFIG_PCI_ENDPOINT_TEST=m
 CONFIG_EEPROM_AT24=m
 CONFIG_BLK_DEV_SD=y
 CONFIG_SCSI_SCAN_ASYNC=y
@@ -468,6 +476,7 @@ CONFIG_PWM_TIECAP=m
 CONFIG_PWM_TIEHRPWM=m
 CONFIG_PWM_TWL=m
 CONFIG_PWM_TWL_LED=m
+CONFIG_PHY_CPCAP_USB=m
 CONFIG_PHY_DM816X_USB=m
 CONFIG_OMAP_USB2=m
 CONFIG_TI_PIPE3=y
@@ -516,3 +525,13 @@ CONFIG_LIBCRC32C=y
 CONFIG_FONTS=y
 CONFIG_FONT_8x8=y
 CONFIG_FONT_8x16=y
+CONFIG_KERNEL_MODE_NEON=y
+CONFIG_ARM_CRYPTO=y
+CONFIG_CRYPTO_SHA1_ARM=m
+CONFIG_CRYPTO_SHA1_ARM_NEON=m
+CONFIG_CRYPTO_SHA256_ARM=m
+CONFIG_CRYPTO_SHA512_ARM=m
+CONFIG_CRYPTO_AES_ARM=m
+CONFIG_CRYPTO_AES_ARM_BS=m
+CONFIG_CRYPTO_CHACHA20_NEON=m
+CONFIG_CRYPTO_GHASH_ARM_CE=m

arch/arm/configs/qcom_defconfig

View file

diff --git a/arch/arm/configs/qcom_defconfig b/arch/arm/configs/qcom_defconfig
index c784d04..dd2a089 100644
--- a/arch/arm/configs/qcom_defconfig
+++ b/arch/arm/configs/qcom_defconfig
@@ -136,7 +136,9 @@ CONFIG_REGULATOR_QCOM_RPM=y
 CONFIG_REGULATOR_QCOM_SMD_RPM=y
 CONFIG_REGULATOR_QCOM_SPMI=y
 CONFIG_MEDIA_SUPPORT=y
+CONFIG_DRM=y
 CONFIG_FB=y
+CONFIG_FRAMEBUFFER_CONSOLE=y
 CONFIG_BACKLIGHT_LCD_SUPPORT=y
 # CONFIG_LCD_CLASS_DEVICE is not set
 CONFIG_BACKLIGHT_CLASS_DEVICE=y
@@ -200,6 +202,7 @@ CONFIG_MSM_LCC_8960=y
 CONFIG_MDM_LCC_9615=y
 CONFIG_MSM_MMCC_8960=y
 CONFIG_MSM_MMCC_8974=y
+CONFIG_MSM_IOMMU=y
 CONFIG_HWSPINLOCK=y
 CONFIG_HWSPINLOCK_QCOM=y
 CONFIG_REMOTEPROC=y

arch/arm/configs/shmobile_defconfig

View file

diff --git a/arch/arm/configs/shmobile_defconfig b/arch/arm/configs/shmobile_defconfig
index 7b4fc01..578434c 100644
--- a/arch/arm/configs/shmobile_defconfig
+++ b/arch/arm/configs/shmobile_defconfig
@@ -173,6 +173,7 @@ CONFIG_SND_SOC=y
 CONFIG_SND_SOC_SH4_FSI=y
 CONFIG_SND_SOC_RCAR=y
 CONFIG_SND_SOC_AK4642=y
+CONFIG_SND_SOC_SGTL5000=y
 CONFIG_SND_SOC_WM8978=y
 CONFIG_SND_SIMPLE_SCU_CARD=y
 CONFIG_USB=y
@@ -207,6 +208,7 @@ CONFIG_STAGING_BOARD=y
 CONFIG_IIO=y
 CONFIG_AK8975=y
 CONFIG_PWM=y
+CONFIG_PWM_RCAR=y
 CONFIG_PWM_RENESAS_TPU=y
 CONFIG_GENERIC_PHY=y
 CONFIG_PHY_RCAR_GEN2=y

arch/arm/mach-davinci/board-da850-evm.c

View file

diff --git a/arch/arm/mach-davinci/board-da850-evm.c b/arch/arm/mach-davinci/board-da850-evm.c
index cbde003..d898a94 100644
--- a/arch/arm/mach-davinci/board-da850-evm.c
+++ b/arch/arm/mach-davinci/board-da850-evm.c
@@ -798,11 +798,11 @@ static int da850_lcd_hw_init(void)
 {
 	int status;
 
-	status = gpio_request(DA850_LCD_BL_PIN, "lcd bl\n");
+	status = gpio_request(DA850_LCD_BL_PIN, "lcd bl");
 	if (status < 0)
 		return status;
 
-	status = gpio_request(DA850_LCD_PWR_PIN, "lcd pwr\n");
+	status = gpio_request(DA850_LCD_PWR_PIN, "lcd pwr");
 	if (status < 0) {
 		gpio_free(DA850_LCD_BL_PIN);
 		return status;

arch/arm/mach-davinci/board-neuros-osd2.c

View file

diff --git a/arch/arm/mach-davinci/board-neuros-osd2.c b/arch/arm/mach-davinci/board-neuros-osd2.c
index 0c02aaa..4da210a 100644
--- a/arch/arm/mach-davinci/board-neuros-osd2.c
+++ b/arch/arm/mach-davinci/board-neuros-osd2.c
@@ -128,7 +128,7 @@ static struct platform_device davinci_fb_device = {
 	.num_resources = 0,
 };
 
-static struct gpio_led ntosd2_leds[] = {
+static const struct gpio_led ntosd2_leds[] = {
 	{ .name = "led1_green", .gpio = GPIO(10), },
 	{ .name = "led1_red",   .gpio = GPIO(11), },
 	{ .name = "led2_green", .gpio = GPIO(12), },

arch/arm/mach-davinci/common.c

View file

diff --git a/arch/arm/mach-davinci/common.c b/arch/arm/mach-davinci/common.c
index 9f9fbfa..bcb6a7b 100644
--- a/arch/arm/mach-davinci/common.c
+++ b/arch/arm/mach-davinci/common.c
@@ -77,7 +77,7 @@ static int __init davinci_init_id(struct davinci_soc_info *soc_info)
 	return -EINVAL;
 }
 
-void __init davinci_common_init(struct davinci_soc_info *soc_info)
+void __init davinci_common_init(const struct davinci_soc_info *soc_info)
 {
 	int ret;
 

arch/arm/mach-davinci/da830.c

View file

diff --git a/arch/arm/mach-davinci/da830.c b/arch/arm/mach-davinci/da830.c
index 7fcbdc8..57ab18c 100644
--- a/arch/arm/mach-davinci/da830.c
+++ b/arch/arm/mach-davinci/da830.c
@@ -1194,7 +1194,7 @@ static struct davinci_timer_info da830_timer_info = {
 	.clocksource_id	= T0_BOT,
 };
 
-static struct davinci_soc_info davinci_soc_info_da830 = {
+static const struct davinci_soc_info davinci_soc_info_da830 = {
 	.io_desc		= da830_io_desc,
 	.io_desc_num		= ARRAY_SIZE(da830_io_desc),
 	.jtag_id_reg		= DA8XX_SYSCFG0_BASE + DA8XX_JTAG_ID_REG,

arch/arm/mach-davinci/da850.c

View file

diff --git a/arch/arm/mach-davinci/da850.c b/arch/arm/mach-davinci/da850.c
index d37b546..aa37cbd 100644
--- a/arch/arm/mach-davinci/da850.c
+++ b/arch/arm/mach-davinci/da850.c
@@ -1347,7 +1347,7 @@ int __init da850_register_gpio(void)
 	return da8xx_register_gpio(&da850_gpio_platform_data);
 }
 
-static struct davinci_soc_info davinci_soc_info_da850 = {
+static const struct davinci_soc_info davinci_soc_info_da850 = {
 	.io_desc		= da850_io_desc,
 	.io_desc_num		= ARRAY_SIZE(da850_io_desc),
 	.jtag_id_reg		= DA8XX_SYSCFG0_BASE + DA8XX_JTAG_ID_REG,

arch/arm/mach-davinci/devices-da8xx.c

View file

diff --git a/arch/arm/mach-davinci/devices-da8xx.c b/arch/arm/mach-davinci/devices-da8xx.c
index 22440c0..e1c40e7 100644
--- a/arch/arm/mach-davinci/devices-da8xx.c
+++ b/arch/arm/mach-davinci/devices-da8xx.c
@@ -252,7 +252,7 @@ int __init da830_register_edma(struct edma_rsv_info *rsv)
 	da8xx_edma0_pdata.slavecnt = ARRAY_SIZE(da830_edma_map);
 
 	edma_pdev = platform_device_register_full(&da8xx_edma0_device);
-	return IS_ERR(edma_pdev) ? PTR_ERR(edma_pdev) : 0;
+	return PTR_ERR_OR_ZERO(edma_pdev);
 }
 
 static const struct dma_slave_map da850_edma0_map[] = {
@@ -297,7 +297,7 @@ int __init da850_register_edma(struct edma_rsv_info *rsv[2])
 	da850_edma1_pdata.slavecnt = ARRAY_SIZE(da850_edma1_map);
 
 	edma_pdev = platform_device_register_full(&da850_edma1_device);
-	return IS_ERR(edma_pdev) ? PTR_ERR(edma_pdev) : 0;
+	return PTR_ERR_OR_ZERO(edma_pdev);
 }
 
 static struct resource da8xx_i2c_resources0[] = {

arch/arm/mach-davinci/dm355.c

View file

diff --git a/arch/arm/mach-davinci/dm355.c b/arch/arm/mach-davinci/dm355.c
index bd50367..938747f 100644
--- a/arch/arm/mach-davinci/dm355.c
+++ b/arch/arm/mach-davinci/dm355.c
@@ -1006,7 +1006,7 @@ struct platform_device dm355_serial_device[] = {
 	}
 };
 
-static struct davinci_soc_info davinci_soc_info_dm355 = {
+static const struct davinci_soc_info davinci_soc_info_dm355 = {
 	.io_desc		= dm355_io_desc,
 	.io_desc_num		= ARRAY_SIZE(dm355_io_desc),
 	.jtag_id_reg		= 0x01c40028,

arch/arm/mach-davinci/dm365.c

View file

diff --git a/arch/arm/mach-davinci/dm365.c b/arch/arm/mach-davinci/dm365.c
index 5ace938..5d9f96d 100644
--- a/arch/arm/mach-davinci/dm365.c
+++ b/arch/arm/mach-davinci/dm365.c
@@ -1110,7 +1110,7 @@ struct platform_device dm365_serial_device[] = {
 	}
 };
 
-static struct davinci_soc_info davinci_soc_info_dm365 = {
+static const struct davinci_soc_info davinci_soc_info_dm365 = {
 	.io_desc		= dm365_io_desc,
 	.io_desc_num		= ARRAY_SIZE(dm365_io_desc),
 	.jtag_id_reg		= 0x01c40028,

arch/arm/mach-davinci/dm644x.c

View file

diff --git a/arch/arm/mach-davinci/dm644x.c b/arch/arm/mach-davinci/dm644x.c
index b437c37..6b41e1c 100644
--- a/arch/arm/mach-davinci/dm644x.c
+++ b/arch/arm/mach-davinci/dm644x.c
@@ -899,7 +899,7 @@ struct platform_device dm644x_serial_device[] = {
 	}
 };
 
-static struct davinci_soc_info davinci_soc_info_dm644x = {
+static const struct davinci_soc_info davinci_soc_info_dm644x = {
 	.io_desc		= dm644x_io_desc,
 	.io_desc_num		= ARRAY_SIZE(dm644x_io_desc),
 	.jtag_id_reg		= 0x01c40028,

arch/arm/mach-davinci/dm646x.c

View file

diff --git a/arch/arm/mach-davinci/dm646x.c b/arch/arm/mach-davinci/dm646x.c
index da21353..6fc06a6 100644
--- a/arch/arm/mach-davinci/dm646x.c
+++ b/arch/arm/mach-davinci/dm646x.c
@@ -882,7 +882,7 @@ struct platform_device dm646x_serial_device[] = {
 	}
 };
 
-static struct davinci_soc_info davinci_soc_info_dm646x = {
+static const struct davinci_soc_info davinci_soc_info_dm646x = {
 	.io_desc		= dm646x_io_desc,
 	.io_desc_num		= ARRAY_SIZE(dm646x_io_desc),
 	.jtag_id_reg		= 0x01c40028,
@@ -949,7 +949,7 @@ int __init dm646x_init_edma(struct edma_rsv_info *rsv)
 	dm646x_edma_pdata.rsv = rsv;
 
 	edma_pdev = platform_device_register_full(&dm646x_edma_device);
-	return IS_ERR(edma_pdev) ? PTR_ERR(edma_pdev) : 0;
+	return PTR_ERR_OR_ZERO(edma_pdev);
 }
 
 void __init dm646x_init(void)

arch/arm/mach-davinci/include/mach/common.h

View file

diff --git a/arch/arm/mach-davinci/include/mach/common.h b/arch/arm/mach-davinci/include/mach/common.h
index 037aa66..433a008 100644
--- a/arch/arm/mach-davinci/include/mach/common.h
+++ b/arch/arm/mach-davinci/include/mach/common.h
@@ -79,7 +79,7 @@ struct davinci_soc_info {
 
 extern struct davinci_soc_info davinci_soc_info;
 
-extern void davinci_common_init(struct davinci_soc_info *soc_info);
+extern void davinci_common_init(const struct davinci_soc_info *soc_info);
 extern void davinci_init_ide(void);
 void davinci_restart(enum reboot_mode mode, const char *cmd);
 void davinci_init_late(void);

arch/arm/mach-ep93xx/Kconfig

View file

diff --git a/arch/arm/mach-ep93xx/Kconfig b/arch/arm/mach-ep93xx/Kconfig
index 61a75ca..c095236 100644
--- a/arch/arm/mach-ep93xx/Kconfig
+++ b/arch/arm/mach-ep93xx/Kconfig
@@ -21,6 +21,13 @@ config MACH_ADSSPHERE
 	  Say 'Y' here if you want your kernel to support the ADS
 	  Sphere board.
 
+config MACH_BK3
+	bool "Support Liebherr BK3.1"
+	select MACH_TS72XX
+	help

This diff is incomplete. Download the complete patch.