Merge tag 'armsoc-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 2 Feb 2018 00:17:40 +0000 (16:17 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 2 Feb 2018 00:17:40 +0000 (16:17 -0800)
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()
  ...

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

index 17196003fe59eb9857b07c7948b918d8f69c6d5f..2bd08becdd16706bd4cdc573ad8a4baefdd45bbd 100644 (file)
@@ -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)
index bd0cf22f9cebdc26b5075c84f8e5db9c3679a935..026154c1d55acad139500cb036564602f6bf5e68 100644 (file)
@@ -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
index f1d7834990ece60f33a2d6e18b794208d3ec73cc..629189c62fd160b9bd85ac82c15ea62aeb291e12 100644 (file)
@@ -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
index 0d4494922561b80c407b98c44f321021320cd168..4cb9829fccd15af8edb7f1c381dc6b3c694f21cb 100644 (file)
@@ -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
index f710c192b33a2f2af800623f6515c0f80ffebbcd..2536c231eea10ac0a48b75908d4e8f9c23c5c303 100644 (file)
@@ -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
index b659244902cd5e297985ff243d9e2b74b567d361..da7387689b88fbabf2e5dc0df5c7fc22d6bf74ac 100644 (file)
@@ -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
index 7b97200c1d64cee6937fe60d51fce8cbddd30ddc..2f145c4af93a0fb387d86fea028d0c82d0041be8 100644 (file)
@@ -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
index c784d04e2ab7fca3f787cc91e2dc9e5faa6af571..dd2a089f939fc68a46d0194d7ad6079d94b621eb 100644 (file)
@@ -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
index 7b4fc01431483f217a97e69a93987e86ecc67c4f..578434cfd1a0aaef8dc13cd2b20457a2f94705a3 100644 (file)
@@ -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
index cbde0030c092fe1213c4cddb6ffe19383d200e3c..d898a94f6eaed8766e38103f3c3b113ae1eed3f0 100644 (file)
@@ -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;
index 0c02aaad0539b025fbf81135e7977c92cfaa9b45..4da210a1a1106d6f26813d4ce30812f5aaacabe0 100644 (file)
@@ -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), },
index 9f9fbfa6da0d970f0126c2711c4d5b5cf2532ddc..bcb6a7ba84e9ee4640d1b31e51f734354dff2378 100644 (file)
@@ -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;
 
index 7fcbdc800f6850f7bcf46e323e08eab74dbb58b8..57ab18cf2a89796f5a0c4f828d95c41f579b13c7 100644 (file)
@@ -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,
index d37b5463cd8f3b5290db737294adac672d8b6646..aa37cbdf7d4d41bcd6987ccaa8fcdc48123efa23 100644 (file)
@@ -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,
index 22440c05d66ace5e6992ed30a3d412eaa1f25eed..e1c40e73d30abca32e53f7cf92650b322a936141 100644 (file)
@@ -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[] = {
index bd50367f654e890c34d518b86359def9546b7082..938747f20c226c66f1d6dcc6a92258c557129a23 100644 (file)
@@ -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,
index 5ace9380626a0cc34f074e71a2981c8c42e87c50..5d9f96df08e965d721f08f9427b00dd35416441e 100644 (file)
@@ -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,
index b437c3730f6540d0dc07fc1299deb71b2dfffc9d..6b41e1ca511e3128f96a24bdcb9274df75d90e11 100644 (file)
@@ -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,
index da21353cac450d2f8dddaa75a7291670220ba17c..6fc06a6ad4f8683824b5d2e9230654c59f61c419 100644 (file)
@@ -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)
index 037aa66bcac1687d3cc0ffe17494a9df01a66125..433a008ff796c43c07cae0c4e5ca8920526e7199 100644 (file)
@@ -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);
index 61a75ca3684efaa296500d123e50b91d3208b863..c095236d7ff89a3cd8adbc4ce86bed2193bc3e3c 100644 (file)
@@ -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
+         Say 'Y' here if you want your kernel to support the
+         Liebherr controller BK3.1.
+
 config MACH_EDB93XX
        bool
 
index f386ebae0163cbbe00cf34776db7517a43ea2ac1..c089a2a4fe307150a3b4066b9bc7447aae8788bd 100644 (file)
 #include <linux/mtd/rawnand.h>
 #include <linux/mtd/partitions.h>
 #include <linux/spi/spi.h>
+#include <linux/spi/flash.h>
+#include <linux/spi/mmc_spi.h>
+#include <linux/mmc/host.h>
 #include <linux/platform_data/spi-ep93xx.h>
 
 #include <mach/gpio-ep93xx.h>
 #include <mach/hardware.h>
+#include <mach/irqs.h>
+#include <mach/gpio-ep93xx.h>
 
 #include <asm/mach-types.h>
 #include <asm/mach/map.h>
@@ -31,6 +36,9 @@
 #include "soc.h"
 #include "ts72xx.h"
 
+/*************************************************************************
+ * IO map
+ *************************************************************************/
 static struct map_desc ts72xx_io_desc[] __initdata = {
        {
                .virtual        = (unsigned long)TS72XX_MODEL_VIRT_BASE,
@@ -47,6 +55,11 @@ static struct map_desc ts72xx_io_desc[] __initdata = {
                .pfn            = __phys_to_pfn(TS72XX_OPTIONS2_PHYS_BASE),
                .length         = TS72XX_OPTIONS2_SIZE,
                .type           = MT_DEVICE,
+       }, {
+               .virtual        = (unsigned long)TS72XX_CPLDVER_VIRT_BASE,
+               .pfn            = __phys_to_pfn(TS72XX_CPLDVER_PHYS_BASE),
+               .length         = TS72XX_CPLDVER_SIZE,
+               .type           = MT_DEVICE,
        }
 };
 
@@ -123,8 +136,6 @@ static struct platform_nand_data ts72xx_nand_data = {
                .nr_chips       = 1,
                .chip_offset    = 0,
                .chip_delay     = 15,
-               .partitions     = ts72xx_nand_parts,
-               .nr_partitions  = ARRAY_SIZE(ts72xx_nand_parts),
        },
        .ctrl = {
                .cmd_ctrl       = ts72xx_nand_hwcontrol,
@@ -148,8 +159,8 @@ static struct platform_device ts72xx_nand_flash = {
        .num_resources          = ARRAY_SIZE(ts72xx_nand_resource),
 };
 
-
-static void __init ts72xx_register_flash(void)
+void __init ts72xx_register_flash(struct mtd_partition *parts, int n,
+                                 resource_size_t start)
 {
        /*
         * TS7200 has NOR flash all other TS72xx board have NAND flash.
@@ -157,16 +168,12 @@ static void __init ts72xx_register_flash(void)
        if (board_is_ts7200()) {
                ep93xx_register_flash(2, EP93XX_CS6_PHYS_BASE, SZ_16M);
        } else {
-               resource_size_t start;
-
-               if (is_ts9420_installed())
-                       start = EP93XX_CS7_PHYS_BASE;
-               else
-                       start = EP93XX_CS6_PHYS_BASE;
-
                ts72xx_nand_resource[0].start = start;
                ts72xx_nand_resource[0].end = start + SZ_16M - 1;
 
+               ts72xx_nand_data.chip.partitions = parts;
+               ts72xx_nand_data.chip.nr_partitions = n;
+
                platform_device_register(&ts72xx_nand_flash);
        }
 }
@@ -207,10 +214,79 @@ static struct platform_device ts72xx_wdt_device = {
        .num_resources  = ARRAY_SIZE(ts72xx_wdt_resources),
 };
 
+/*************************************************************************
+ * ETH
+ *************************************************************************/
 static struct ep93xx_eth_data __initdata ts72xx_eth_data = {
        .phy_id         = 1,
 };
 
+/*************************************************************************
+ * SPI SD/MMC host
+ *************************************************************************/
+#define BK3_EN_SDCARD_PHYS_BASE         0x12400000
+#define BK3_EN_SDCARD_PWR 0x0
+#define BK3_DIS_SDCARD_PWR 0x0C
+static void bk3_mmc_spi_setpower(struct device *dev, unsigned int vdd)
+{
+       void __iomem *pwr_sd = ioremap(BK3_EN_SDCARD_PHYS_BASE, SZ_4K);
+
+       if (!pwr_sd) {
+               pr_err("Failed to enable SD card power!");
+               return;
+       }
+
+       pr_debug("%s: SD card pwr %s VDD:0x%x\n", __func__,
+                !!vdd ? "ON" : "OFF", vdd);
+
+       if (!!vdd)
+               __raw_writeb(BK3_EN_SDCARD_PWR, pwr_sd);
+       else
+               __raw_writeb(BK3_DIS_SDCARD_PWR, pwr_sd);
+
+       iounmap(pwr_sd);
+}
+
+static struct mmc_spi_platform_data bk3_spi_mmc_data = {
+       .detect_delay   = 500,
+       .powerup_msecs  = 100,
+       .ocr_mask       = MMC_VDD_32_33 | MMC_VDD_33_34,
+       .caps           = MMC_CAP_NONREMOVABLE,
+       .setpower       = bk3_mmc_spi_setpower,
+};
+
+/*************************************************************************
+ * SPI Bus - SD card access
+ *************************************************************************/
+static struct spi_board_info bk3_spi_board_info[] __initdata = {
+       {
+               .modalias               = "mmc_spi",
+               .platform_data          = &bk3_spi_mmc_data,
+               .max_speed_hz           = 7.4E6,
+               .bus_num                = 0,
+               .chip_select            = 0,
+               .mode                   = SPI_MODE_0,
+       },
+};
+
+/*
+ * This is a stub -> the FGPIO[3] pin is not connected on the schematic
+ * The all work is performed automatically by !SPI_FRAME (SFRM1) and
+ * goes through CPLD
+ */
+static int bk3_spi_chipselects[] __initdata = {
+       EP93XX_GPIO_LINE_F(3),
+};
+
+static struct ep93xx_spi_info bk3_spi_master __initdata = {
+       .chipselect     = bk3_spi_chipselects,
+       .num_chipselect = ARRAY_SIZE(bk3_spi_chipselects),
+       .use_dma        = 1,
+};
+
+/*************************************************************************
+ * TS72XX support code
+ *************************************************************************/
 #if IS_ENABLED(CONFIG_FPGA_MGR_TS73XX)
 
 /* Relative to EP93XX_CS1_PHYS_BASE */
@@ -257,7 +333,9 @@ static struct ep93xx_spi_info ts72xx_spi_info __initdata = {
 static void __init ts72xx_init_machine(void)
 {
        ep93xx_init_devices();
-       ts72xx_register_flash();
+       ts72xx_register_flash(ts72xx_nand_parts, ARRAY_SIZE(ts72xx_nand_parts),
+                             is_ts9420_installed() ?
+                             EP93XX_CS7_PHYS_BASE : EP93XX_CS6_PHYS_BASE);
        platform_device_register(&ts72xx_rtc_device);
        platform_device_register(&ts72xx_wdt_device);
 
@@ -280,3 +358,66 @@ MACHINE_START(TS72XX, "Technologic Systems TS-72xx SBC")
        .init_late      = ep93xx_init_late,
        .restart        = ep93xx_restart,
 MACHINE_END
+
+/*************************************************************************
+ * EP93xx I2S audio peripheral handling
+ *************************************************************************/
+static struct resource ep93xx_i2s_resource[] = {
+       DEFINE_RES_MEM(EP93XX_I2S_PHYS_BASE, 0x100),
+       DEFINE_RES_IRQ_NAMED(IRQ_EP93XX_SAI, "spilink i2s slave"),
+};
+
+static struct platform_device ep93xx_i2s_device = {
+       .name           = "ep93xx-spilink-i2s",
+       .id             = -1,
+       .num_resources  = ARRAY_SIZE(ep93xx_i2s_resource),
+       .resource       = ep93xx_i2s_resource,
+};
+
+/*************************************************************************
+ * BK3 support code
+ *************************************************************************/
+static struct mtd_partition bk3_nand_parts[] = {
+       {
+               .name           = "System",
+               .offset = 0x00000000,
+               .size           = 0x01e00000,
+       }, {
+               .name           = "Data",
+               .offset = 0x01e00000,
+               .size           = 0x05f20000
+       }, {
+               .name           = "RedBoot",
+               .offset = 0x07d20000,
+               .size           = 0x002e0000,
+               .mask_flags     = MTD_WRITEABLE,        /* force RO */
+       },
+};
+
+static void __init bk3_init_machine(void)
+{
+       ep93xx_init_devices();
+
+       ts72xx_register_flash(bk3_nand_parts, ARRAY_SIZE(bk3_nand_parts),
+                             EP93XX_CS6_PHYS_BASE);
+
+       ep93xx_register_eth(&ts72xx_eth_data, 1);
+
+       ep93xx_register_spi(&bk3_spi_master, bk3_spi_board_info,
+                           ARRAY_SIZE(bk3_spi_board_info));
+
+       /* Configure ep93xx's I2S to use AC97 pins */
+       ep93xx_devcfg_set_bits(EP93XX_SYSCON_DEVCFG_I2SONAC97);
+       platform_device_register(&ep93xx_i2s_device);
+}
+
+MACHINE_START(BK3, "Liebherr controller BK3.1")
+       /* Maintainer: Lukasz Majewski <lukma@denx.de> */
+       .atag_offset    = 0x100,
+       .map_io         = ts72xx_map_io,
+       .init_irq       = ep93xx_init_irq,
+       .init_time      = ep93xx_timer_init,
+       .init_machine   = bk3_init_machine,
+       .init_late      = ep93xx_init_late,
+       .restart        = ep93xx_restart,
+MACHINE_END
index 8a3206a54b39de86223bf1a16e378ae7166f367f..00b4941d29c95000bd851f0e3100455bce9611c1 100644 (file)
  * febff000    22000000        4K      model number register (bits 0-2)
  * febfe000    22400000        4K      options register
  * febfd000    22800000        4K      options register #2
+ * febfc000     23400000        4K      CPLD version register
  */
 
+#ifndef __TS72XX_H_
+#define __TS72XX_H_
+
 #define TS72XX_MODEL_PHYS_BASE         0x22000000
 #define TS72XX_MODEL_VIRT_BASE         IOMEM(0xfebff000)
 #define TS72XX_MODEL_SIZE              0x00001000
 #define TS72XX_OPTIONS2_TS9420         0x04
 #define TS72XX_OPTIONS2_TS9420_BOOT    0x02
 
+#define TS72XX_CPLDVER_PHYS_BASE       0x23400000
+#define TS72XX_CPLDVER_VIRT_BASE       IOMEM(0xfebfc000)
+#define TS72XX_CPLDVER_SIZE            0x00001000
+
 #ifndef __ASSEMBLY__
 
 static inline int ts72xx_model(void)
@@ -83,3 +91,4 @@ static inline int is_ts9420_installed(void)
                                        TS72XX_OPTIONS2_TS9420);
 }
 #endif
+#endif /* __TS72XX_H_ */
index 44fa753bd79cfdd2bd2729c638baf1ac8f96d220..647c319f9f5f00fb9bd419c9a7f9414cf75cd1a4 100644 (file)
@@ -1,9 +1,7 @@
-# arch/arm/mach-exynos/Kconfig
+# SPDX-License-Identifier: GPL-2.0
 #
 # Copyright (c) 2010-2011 Samsung Electronics Co., Ltd.
 #              http://www.samsung.com/
-#
-# Licensed under GPLv2
 
 # Configuration options for the EXYNOS
 
index 9ea6c54645ad0d613fcf0b88559f7f7ee37891c4..cd00c82a1add02ff0cc9e314dde5ad345c190aea 100644 (file)
@@ -1,9 +1,7 @@
-# arch/arm/mach-exynos/Makefile
+# SPDX-License-Identifier: GPL-2.0
 #
 # Copyright (c) 2010-2011 Samsung Electronics Co., Ltd.
 #              http://www.samsung.com/
-#
-# Licensed under GPLv2
 
 ccflags-$(CONFIG_ARCH_MULTIPLATFORM) += -I$(srctree)/$(src)/include -I$(srctree)/arch/arm/plat-samsung/include
 
index 3f715524c9d6e05a29b9ae15c9a99dcac56807a0..098f84a149a3cb2d7344fd277b725599c2759812 100644 (file)
@@ -1,12 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Copyright (c) 2011 Samsung Electronics Co., Ltd.
  *             http://www.samsung.com
  *
  * Common Header for EXYNOS machines
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
  */
 
 #ifndef __ARCH_ARM_MACH_EXYNOS_COMMON_H
index 2e27aa3813fdcbb1b29c05d6800df4c2ba9f3c95..d259532ba937ef94df22a586f3fd79e937d2df24 100644 (file)
@@ -1,11 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Copyright (C) 2012 Samsung Electronics.
  *
  * Copied from omap-smc.S Copyright (C) 2010 Texas Instruments, Inc.
- *
- * This program is free software,you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
  */
 
 #include <linux/linkage.h>
index 9a9caac1125a25e4cae07c27cb1f807e2f594a61..fbd108ce8745742d4dab008adbdc634883cf76d2 100644 (file)
@@ -1,13 +1,9 @@
-/*
- * SAMSUNG EXYNOS Flattened Device Tree enabled machine
- *
- * Copyright (c) 2010-2014 Samsung Electronics Co., Ltd.
- *             http://www.samsung.com
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
+// SPDX-License-Identifier: GPL-2.0
+//
+// SAMSUNG EXYNOS Flattened Device Tree enabled machine
+//
+// Copyright (c) 2010-2014 Samsung Electronics Co., Ltd.
+//             http://www.samsung.com
 
 #include <linux/init.h>
 #include <linux/io.h>
index 2a51e4603a6f425d5d00f3364ad4a7e14f40f8c9..be1f20fe28f448bee2b03c35dcd30d726ec34a69 100644 (file)
@@ -1,12 +1,8 @@
-/*
- * Copyright (C) 2012 Samsung Electronics.
- * Kyungmin Park <kyungmin.park@samsung.com>
- * Tomasz Figa <t.figa@samsung.com>
- *
- * This program is free software,you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
+// SPDX-License-Identifier: GPL-2.0
+//
+// Copyright (C) 2012 Samsung Electronics.
+// Kyungmin Park <kyungmin.park@samsung.com>
+// Tomasz Figa <t.figa@samsung.com>
 
 #include <linux/kernel.h>
 #include <linux/io.h>
index d3d24ab351ae9d44fb00081ec285ddd7ce7c5101..005695c9bf4006130719acc36e0ee2f4b7ae7797 100644 (file)
@@ -1,13 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
- *
  *  Cloned from linux/arch/arm/mach-realview/headsmp.S
  *
  *  Copyright (c) 2003 ARM Limited
  *  All Rights Reserved
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
  */
 #include <linux/linkage.h>
 #include <linux/init.h>
index 5fb0040cc6d3651e57972d9393b47f3667de16d5..37a5ea5e2602a3c7ac81fc18276bb5e6c2b48229 100644 (file)
@@ -1,13 +1,10 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Copyright (c) 2010-2011 Samsung Electronics Co., Ltd.
  *             http://www.samsung.com/
  *
  * EXYNOS - Memory map definitions
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
-*/
+ */
 
 #ifndef __ASM_ARCH_MAP_H
 #define __ASM_ARCH_MAP_H __FILE__
index b42622562ea79871b5c0ccaa960011cd6eef8c6d..72bc035bedbe2702b08a866f1bfc5973a48e9879 100644 (file)
@@ -1,15 +1,8 @@
-/*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
- *             http://www.samsung.com
- *
- * arch/arm/mach-exynos/mcpm-exynos.c
- *
- * Based on arch/arm/mach-vexpress/dcscb.c
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
+// SPDX-License-Identifier: GPL-2.0
+// Copyright (c) 2014 Samsung Electronics Co., Ltd.
+//             http://www.samsung.com
+//
+// Based on arch/arm/mach-vexpress/dcscb.c
 
 #include <linux/arm-cci.h>
 #include <linux/delay.h>
index 5a03bffe7226030fe528eaf9c4c683b92822b4fd..5156fe70e030579cf2b707fd755f70133a63926d 100644 (file)
@@ -1,16 +1,11 @@
- /*
- * Copyright (c) 2010-2011 Samsung Electronics Co., Ltd.
- *             http://www.samsung.com
- *
- * Cloned from linux/arch/arm/mach-vexpress/platsmp.c
- *
- *  Copyright (C) 2002 ARM Ltd.
- *  All Rights Reserved
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
-*/
+// SPDX-License-Identifier: GPL-2.0
+// Copyright (c) 2010-2011 Samsung Electronics Co., Ltd.
+//             http://www.samsung.com
+//
+// Cloned from linux/arch/arm/mach-vexpress/platsmp.c
+//
+//  Copyright (C) 2002 ARM Ltd.
+//  All Rights Reserved
 
 #include <linux/init.h>
 #include <linux/errno.h>
index c9740d96db9e1c37e754ff912f88372baaee97ce..dc4346ecf16d33e2402921a7efb8fce629de1a4c 100644 (file)
@@ -1,17 +1,13 @@
-/*
- * Copyright (c) 2011-2014 Samsung Electronics Co., Ltd.
- *             http://www.samsung.com
- *
- * EXYNOS - Power Management support
- *
- * Based on arch/arm/mach-s3c2410/pm.c
- * Copyright (c) 2006 Simtec Electronics
- *     Ben Dooks <ben@simtec.co.uk>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
-*/
+// SPDX-License-Identifier: GPL-2.0
+//
+// Copyright (c) 2011-2014 Samsung Electronics Co., Ltd.
+//             http://www.samsung.com
+//
+// EXYNOS - Power Management support
+//
+// Based on arch/arm/mach-s3c2410/pm.c
+// Copyright (c) 2006 Simtec Electronics
+//     Ben Dooks <ben@simtec.co.uk>
 
 #include <linux/init.h>
 #include <linux/suspend.h>
index 4292cae43f3c3ce564dcd1d4a6a8a74cd8239a6e..2783c3a0c06ac679959bb2ddd3af5c708052374c 100644 (file)
@@ -1,18 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * Copyright (c) 2013 Samsung Electronics Co., Ltd.
  *             http://www.samsung.com
  *
  * Exynos low-level resume code
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
  */
 
 #include <linux/linkage.h>
index c2845717bc8fd9860d62ee14191556854a484d7d..f355185d4239b9fa6df3fb6048602744ad23e901 100644 (file)
@@ -1,11 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *  Copyright (c) 2012 Samsung Electronics.
  *
  * EXYNOS - SMC Call
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
  */
 
 #ifndef __ASM_ARCH_EXYNOS_SMC_H
index 370d37ded7e7a12c1dc0e39d414c2778788d2bbc..c2ed997fedefacc2052e950664ffa272d71cf334 100644 (file)
@@ -1,17 +1,13 @@
-/*
- * Copyright (c) 2011-2014 Samsung Electronics Co., Ltd.
- *             http://www.samsung.com
- *
- * EXYNOS - Suspend support
- *
- * Based on arch/arm/mach-s3c2410/pm.c
- * Copyright (c) 2006 Simtec Electronics
- *     Ben Dooks <ben@simtec.co.uk>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
+// SPDX-License-Identifier: GPL-2.0
+//
+// Copyright (c) 2011-2014 Samsung Electronics Co., Ltd.
+//             http://www.samsung.com
+//
+// EXYNOS - Suspend support
+//
+// Based on arch/arm/mach-s3c2410/pm.c
+// Copyright (c) 2006 Simtec Electronics
+//     Ben Dooks <ben@simtec.co.uk>
 
 #include <linux/init.h>
 #include <linux/suspend.h>
index b09a2ec192671f6e496d47178210d2ac706026c1..c8d68e918b2ff60741e33df67da243b4ceb64ea8 100644 (file)
@@ -71,15 +71,6 @@ enum mxc_cpu_pwr_mode {
        STOP_POWER_OFF,         /* STOP + SRPG */
 };
 
-enum mx3_cpu_pwr_mode {
-       MX3_RUN,
-       MX3_WAIT,
-       MX3_DOZE,
-       MX3_SLEEP,
-};
-
-void mx3_cpu_lp_set(enum mx3_cpu_pwr_mode mode);
-
 void imx_enable_cpu(int cpu, bool enable);
 void imx_set_cpu_jump(int cpu, void *jump_addr);
 u32 imx_get_cpu_arg(int cpu);
index 78262899a59031f8e5af1bc097fc71495cde294f..5fb1d2254b5e2be241858c8709a3e533a594ddd6 100644 (file)
@@ -547,7 +547,6 @@ static int imx_mmdc_probe(struct platform_device *pdev)
        struct device_node *np = pdev->dev.of_node;
        void __iomem *mmdc_base, *reg;
        u32 val;
-       int timeout = 0x400;
 
        mmdc_base = of_iomap(np, 0);
        WARN_ON(!mmdc_base);
@@ -565,16 +564,6 @@ static int imx_mmdc_probe(struct platform_device *pdev)
        val &= ~(1 << BP_MMDC_MAPSR_PSD);
        writel_relaxed(val, reg);
 
-       /* Ensure it's successfully enabled */
-       while (!(readl_relaxed(reg) & 1 << BP_MMDC_MAPSR_PSS) && --timeout)
-               cpu_relax();
-
-       if (unlikely(!timeout)) {
-               pr_warn("%s: failed to enable automatic power saving\n",
-                       __func__);
-               return -EBUSY;
-       }
-
        return imx_mmdc_perf_init(pdev, mmdc_base);
 }
 
index 70e49d54434e635bde677625d0c8d62051d56a87..91cc461f7b04c7ea86cf4ae5e877a3fdf9b022bd 100644 (file)
@@ -1,5 +1,5 @@
 menuconfig ARCH_MEDIATEK
-       bool "Mediatek MT65xx & MT81xx SoC"
+       bool "MediaTek SoC Support"
        depends on ARCH_MULTI_V7
        select ARM_GIC
        select PINCTRL
index a4b82f719de154c425ca4157008be8f84ff1e731..adafc4fba8f4ba5aba608b1c4f64f916ede97b5e 100644 (file)
@@ -10,7 +10,7 @@ extern void __init mmp2_init_irq(void);
 extern void mmp2_clear_pmic_int(void);
 
 #include <linux/i2c.h>
-#include <linux/i2c/pxa-i2c.h>
+#include <linux/platform_data/i2c-pxa.h>
 #include <linux/platform_data/dma-mmp_tdma.h>
 
 #include "devices.h"
index b39bff37ff11e0c28cc419e3ce05515d50df5d91..0331c58b07a26a9c8415496c8da068f8b899d43a 100644 (file)
@@ -11,7 +11,7 @@ extern void pxa168_restart(enum reboot_mode, const char *);
 extern void pxa168_clear_keypad_wakeup(void);
 
 #include <linux/i2c.h>
-#include <linux/i2c/pxa-i2c.h>
+#include <linux/platform_data/i2c-pxa.h>
 #include <linux/platform_data/mtd-nand-pxa3xx.h>
 #include <video/pxa168fb.h>
 #include <linux/platform_data/keypad-pxa27x.h>
index cb3923dcf580d9bab069e8925e879bf6c72c408e..42009c349eae8733a88b24b1bb0935e790dc3b77 100644 (file)
@@ -7,7 +7,7 @@ extern void __init icu_init_irq(void);
 extern void __init pxa910_init_irq(void);
 
 #include <linux/i2c.h>
-#include <linux/i2c/pxa-i2c.h>
+#include <linux/platform_data/i2c-pxa.h>
 #include <linux/platform_data/mtd-nand-pxa3xx.h>
 #include <video/mmp_disp.h>
 
index d7a5d11cbcbfa1df1086fd84bbb5a855d6a0cd76..9ff0fc70f1528dc60acc854a8d4eccbfff40e2ca 100644 (file)
  * published by the Free Software Foundation.
  */
 
-#define OMAP24XX_EN_CAM_SHIFT                          31
-#define OMAP24XX_EN_WDT4_SHIFT                         29
-#define OMAP2420_EN_WDT3_SHIFT                         28
-#define OMAP24XX_EN_MSPRO_SHIFT                                27
-#define OMAP24XX_EN_FAC_SHIFT                          25
-#define OMAP2420_EN_EAC_SHIFT                          24
-#define OMAP24XX_EN_HDQ_SHIFT                          23
-#define OMAP2420_EN_I2C2_SHIFT                         20
-#define OMAP2420_EN_I2C1_SHIFT                         19
-#define OMAP2430_EN_MCBSP5_SHIFT                       5
-#define OMAP2430_EN_MCBSP4_SHIFT                       4
-#define OMAP2430_EN_MCBSP3_SHIFT                       3
-#define OMAP24XX_EN_SSI_SHIFT                          1
-#define OMAP24XX_EN_MPU_WDT_SHIFT                      3
-#define OMAP24XX_CLKSEL_MPU_SHIFT                      0
-#define OMAP24XX_CLKSEL_MPU_WIDTH                      5
 #define OMAP24XX_AUTOSTATE_MPU_MASK                    (1 << 0)
-#define OMAP24XX_EN_TV_SHIFT                           2
-#define OMAP24XX_EN_DSS2_SHIFT                         1
-#define OMAP24XX_EN_DSS1_SHIFT                         0
 #define OMAP24XX_EN_DSS1_MASK                          (1 << 0)
-#define OMAP2430_EN_I2CHS2_SHIFT                       20
-#define OMAP2430_EN_I2CHS1_SHIFT                       19
-#define OMAP2430_EN_MMCHSDB2_SHIFT                     17
-#define OMAP2430_EN_MMCHSDB1_SHIFT                     16
-#define OMAP24XX_EN_MAILBOXES_SHIFT                    30
-#define OMAP2430_EN_SDRC_SHIFT                         2
-#define OMAP24XX_EN_PKA_SHIFT                          4
-#define OMAP24XX_EN_AES_SHIFT                          3
-#define OMAP24XX_EN_RNG_SHIFT                          2
-#define OMAP24XX_EN_SHA_SHIFT                          1
-#define OMAP24XX_EN_DES_SHIFT                          0
 #define OMAP24XX_ST_MAILBOXES_SHIFT                    30
 #define OMAP24XX_ST_HDQ_SHIFT                          23
 #define OMAP2420_ST_I2C2_SHIFT                         20
 #define OMAP2430_ST_I2CHS2_SHIFT                       20
 #define OMAP24XX_ST_MCBSP2_SHIFT                       16
 #define OMAP24XX_ST_MCBSP1_SHIFT                       15
-#define OMAP24XX_ST_DSS_SHIFT                          0
 #define OMAP2430_ST_MCBSP5_SHIFT                       5
 #define OMAP2430_ST_MCBSP4_SHIFT                       4
 #define OMAP2430_ST_MCBSP3_SHIFT                       3
 #define OMAP24XX_ST_AES_SHIFT                          3
 #define OMAP24XX_ST_RNG_SHIFT                          2
 #define OMAP24XX_ST_SHA_SHIFT                          1
-#define OMAP24XX_AUTO_SDRC_SHIFT                       2
-#define OMAP24XX_AUTO_GPMC_SHIFT                       1
-#define OMAP24XX_AUTO_SDMA_SHIFT                       0
-#define OMAP24XX_CLKSEL_USB_MASK                       (0x7 << 25)
-#define OMAP24XX_CLKSEL_SSI_MASK                       (0x1f << 20)
-#define OMAP2420_CLKSEL_VLYNQ_MASK                     (0x1f << 15)
 #define OMAP24XX_CLKSEL_DSS2_MASK                      (0x1 << 13)
-#define OMAP24XX_CLKSEL_DSS1_MASK                      (0x1f << 8)
-#define OMAP24XX_CLKSEL_L4_SHIFT                       5
-#define OMAP24XX_CLKSEL_L4_WIDTH                       2
-#define OMAP24XX_CLKSEL_L3_SHIFT                       0
-#define OMAP24XX_CLKSEL_L3_WIDTH                       5
-#define OMAP24XX_CLKSEL_GPT12_MASK                     (0x3 << 22)
-#define OMAP24XX_CLKSEL_GPT11_MASK                     (0x3 << 20)
-#define OMAP24XX_CLKSEL_GPT10_MASK                     (0x3 << 18)
-#define OMAP24XX_CLKSEL_GPT9_MASK                      (0x3 << 16)
-#define OMAP24XX_CLKSEL_GPT8_MASK                      (0x3 << 14)
-#define OMAP24XX_CLKSEL_GPT7_MASK                      (0x3 << 12)
-#define OMAP24XX_CLKSEL_GPT6_MASK                      (0x3 << 10)
-#define OMAP24XX_CLKSEL_GPT5_MASK                      (0x3 << 8)
-#define OMAP24XX_CLKSEL_GPT4_MASK                      (0x3 << 6)
-#define OMAP24XX_CLKSEL_GPT3_MASK                      (0x3 << 4)
-#define OMAP24XX_CLKSEL_GPT2_MASK                      (0x3 << 2)
 #define OMAP24XX_AUTOSTATE_DSS_MASK                    (1 << 2)
 #define OMAP24XX_AUTOSTATE_L4_MASK                     (1 << 1)
 #define OMAP24XX_AUTOSTATE_L3_MASK                     (1 << 0)
-#define OMAP24XX_EN_3D_SHIFT                           2
-#define OMAP24XX_EN_2D_SHIFT                           1
 #define OMAP24XX_AUTOSTATE_GFX_MASK                    (1 << 0)
-#define OMAP2430_EN_ICR_SHIFT                          6
-#define OMAP24XX_EN_OMAPCTRL_SHIFT                     5
-#define OMAP24XX_EN_WDT1_SHIFT                         4
-#define OMAP24XX_EN_32KSYNC_SHIFT                      1
 #define OMAP24XX_ST_MPU_WDT_SHIFT                      3
 #define OMAP24XX_ST_32KSYNC_SHIFT                      1
-#define OMAP24XX_CLKSEL_GPT1_MASK                      (0x3 << 0)
 #define OMAP24XX_EN_54M_PLL_SHIFT                      6
 #define OMAP24XX_EN_96M_PLL_SHIFT                      2
-#define OMAP24XX_EN_DPLL_MASK                          (0x3 << 0)
 #define OMAP24XX_ST_54M_APLL_SHIFT                     9
 #define OMAP24XX_ST_96M_APLL_SHIFT                     8
 #define OMAP24XX_AUTO_54M_MASK                         (0x3 << 6)
 #define OMAP24XX_AUTO_96M_MASK                         (0x3 << 2)
 #define OMAP24XX_AUTO_DPLL_SHIFT                       0
 #define OMAP24XX_AUTO_DPLL_MASK                                (0x3 << 0)
-#define OMAP24XX_APLLS_CLKIN_SHIFT                     23
-#define OMAP24XX_APLLS_CLKIN_WIDTH                     3
-#define OMAP24XX_APLLS_CLKIN_MASK                      (0x7 << 23)
-#define OMAP24XX_DPLL_MULT_MASK                                (0x3ff << 12)
-#define OMAP24XX_DPLL_DIV_MASK                         (0xf << 8)
-#define OMAP24XX_54M_SOURCE_SHIFT                      5
-#define OMAP24XX_54M_SOURCE_WIDTH                      1
-#define OMAP2430_96M_SOURCE_SHIFT                      4
-#define OMAP2430_96M_SOURCE_WIDTH                      1
-#define OMAP24XX_48M_SOURCE_MASK                       (1 << 3)
 #define OMAP24XX_CORE_CLK_SRC_MASK                     (0x3 << 0)
-#define OMAP2420_EN_IVA_COP_SHIFT                      10
-#define OMAP2420_EN_IVA_MPU_SHIFT                      8
-#define OMAP24XX_CM_FCLKEN_DSP_EN_DSP_SHIFT            0
-#define OMAP2420_EN_DSP_IPI_SHIFT                      1
-#define OMAP2420_CLKSEL_IVA_MASK                       (0x1f << 8)
-#define OMAP24XX_CLKSEL_DSP_IF_MASK                    (0x3 << 5)
-#define OMAP24XX_CLKSEL_DSP_MASK                       (0x1f << 0)
 #define OMAP2420_AUTOSTATE_IVA_MASK                    (1 << 8)
 #define OMAP24XX_AUTOSTATE_DSP_MASK                    (1 << 0)
-#define OMAP2430_EN_OSC_SHIFT                          1
-#define OMAP2430_CM_ICLKEN_MDM_EN_MDM_SHIFT            0
-#define OMAP2430_CLKSEL_MDM_MASK                       (0xf << 0)
 #define OMAP2430_AUTOSTATE_MDM_MASK                    (1 << 0)
 #define OMAP24XX_CLKSTCTRL_DISABLE_AUTO                0x0
 #define OMAP24XX_CLKSTCTRL_ENABLE_AUTO         0x1
index ee6c784cd6b73dd6632ea8a08c99dd9a03988890..38656ce2432c9408597769e12141ed068faba406 100644 (file)
  * published by the Free Software Foundation.
  */
 
-#define OMAP3430ES2_EN_MMC3_SHIFT                      30
-#define OMAP3430_EN_MSPRO_SHIFT                                23
-#define OMAP3430_EN_HDQ_SHIFT                          22
-#define OMAP3430ES1_EN_FSHOSTUSB_SHIFT                 5
-#define OMAP3430ES1_EN_D2D_SHIFT                       3
-#define OMAP3430_EN_SSI_SHIFT                          0
-#define OMAP3430ES2_EN_USBTLL_SHIFT                    2
-#define OMAP3430_EN_WDT2_SHIFT                         5
-#define OMAP3430_EN_CAM_SHIFT                          0
-#define OMAP3430_EN_WDT3_SHIFT                         12
 #define OMAP3430_CM_FCLKEN_IVA2_EN_IVA2_MASK           (1 << 0)
-#define OMAP3430_CM_FCLKEN_IVA2_EN_IVA2_SHIFT          0
-#define OMAP3430_IVA2_DPLL_FREQSEL_SHIFT               4
-#define OMAP3430_IVA2_DPLL_FREQSEL_MASK                        (0xf << 4)
-#define OMAP3430_EN_IVA2_DPLL_DRIFTGUARD_SHIFT         3
-#define OMAP3430_EN_IVA2_DPLL_SHIFT                    0
-#define OMAP3430_EN_IVA2_DPLL_MASK                     (0x7 << 0)
 #define OMAP3430_ST_IVA2_SHIFT                         0
-#define OMAP3430_ST_IVA2_CLK_MASK                      (1 << 0)
-#define OMAP3430_AUTO_IVA2_DPLL_SHIFT                  0
-#define OMAP3430_AUTO_IVA2_DPLL_MASK                   (0x7 << 0)
-#define OMAP3430_IVA2_CLK_SRC_SHIFT                    19
-#define OMAP3430_IVA2_CLK_SRC_WIDTH                    3
-#define OMAP3430_IVA2_DPLL_MULT_MASK                   (0x7ff << 8)
-#define OMAP3430_IVA2_DPLL_DIV_MASK                    (0x7f << 0)
-#define OMAP3430_IVA2_DPLL_CLKOUT_DIV_SHIFT            0
-#define OMAP3430_IVA2_DPLL_CLKOUT_DIV_WIDTH            5
 #define OMAP3430_CLKTRCTRL_IVA2_MASK                   (0x3 << 0)
 #define OMAP3430_CLKACTIVITY_IVA2_MASK                 (1 << 0)
-#define OMAP3430_MPU_DPLL_FREQSEL_MASK                 (0xf << 4)
-#define OMAP3430_EN_MPU_DPLL_DRIFTGUARD_SHIFT          3
-#define OMAP3430_EN_MPU_DPLL_MASK                      (0x7 << 0)
-#define OMAP3430_ST_MPU_CLK_SHIFT                      0
-#define OMAP3430_ST_MPU_CLK_MASK                       (1 << 0)
-#define OMAP3430_ST_MPU_CLK_WIDTH                      1
-#define OMAP3430_AUTO_MPU_DPLL_MASK                    (0x7 << 0)
-#define OMAP3430_MPU_CLK_SRC_SHIFT                     19
-#define OMAP3430_MPU_CLK_SRC_WIDTH                     3
-#define OMAP3430_MPU_DPLL_MULT_MASK                    (0x7ff << 8)
-#define OMAP3430_MPU_DPLL_DIV_MASK                     (0x7f << 0)
-#define OMAP3430_MPU_DPLL_CLKOUT_DIV_SHIFT             0
-#define OMAP3430_MPU_DPLL_CLKOUT_DIV_WIDTH             5
 #define OMAP3430_CLKTRCTRL_MPU_MASK                    (0x3 << 0)
-#define OMAP3430_EN_MODEM_SHIFT                                31
-#define OMAP3430_EN_ICR_SHIFT                          29
-#define OMAP3430_EN_AES2_SHIFT                         28
-#define OMAP3430_EN_SHA12_SHIFT                                27
-#define OMAP3430_EN_DES2_SHIFT                         26
-#define OMAP3430ES1_EN_FAC_SHIFT                       8
-#define OMAP3430_EN_MAILBOXES_SHIFT                    7
-#define OMAP3430_EN_OMAPCTRL_SHIFT                     6
-#define OMAP3430_EN_SAD2D_SHIFT                                3
-#define OMAP3430_EN_SDRC_SHIFT                         1
-#define AM35XX_EN_IPSS_SHIFT                           4
-#define OMAP3430_EN_PKA_SHIFT                          4
-#define OMAP3430_EN_AES1_SHIFT                         3
-#define OMAP3430_EN_RNG_SHIFT                          2
-#define OMAP3430_EN_SHA11_SHIFT                                1
-#define OMAP3430_EN_DES1_SHIFT                         0
-#define OMAP3430_EN_MAD2D_SHIFT                                3
-#define OMAP3430ES2_EN_TS_SHIFT                                1
-#define OMAP3430ES2_EN_CPEFUSE_SHIFT                   0
 #define OMAP3430_ST_AES2_SHIFT                         28
 #define OMAP3430_ST_SHA12_SHIFT                                27
 #define AM35XX_ST_UART4_SHIFT                          23
 #define OMAP3430_ST_MAILBOXES_SHIFT                    7
 #define OMAP3430_ST_SAD2D_SHIFT                                3
 #define OMAP3430_ST_SDMA_SHIFT                         2
-#define AM35XX_ST_IPSS_SHIFT                           5
 #define OMAP3430ES2_ST_USBTLL_SHIFT                    2
-#define OMAP3430_CLKSEL_SSI_MASK                       (0xf << 8)
-#define OMAP3430_CLKSEL_GPT11_MASK                     (1 << 7)
-#define OMAP3430_CLKSEL_GPT10_MASK                     (1 << 6)
-#define OMAP3430ES1_CLKSEL_FSHOSTUSB_MASK              (0x3 << 4)
-#define OMAP3430_CLKSEL_L4_SHIFT                       2
-#define OMAP3430_CLKSEL_L4_WIDTH                       2
-#define OMAP3430_CLKSEL_L3_SHIFT                       0
-#define OMAP3430_CLKSEL_L3_WIDTH                       2
-#define OMAP3630_CLKSEL_96M_MASK                       (0x3 << 12)
 #define OMAP3430ES1_CLKTRCTRL_D2D_MASK                 (0x3 << 4)
 #define OMAP3430_CLKTRCTRL_L4_MASK                     (0x3 << 2)
 #define OMAP3430_CLKTRCTRL_L3_MASK                     (0x3 << 0)
-#define OMAP3430ES1_EN_3D_SHIFT                                2
-#define OMAP3430ES1_EN_2D_SHIFT                                1
 #define OMAP3430ES1_CLKTRCTRL_GFX_MASK                 (0x3 << 0)
-#define OMAP3430ES2_CM_FCLKEN_SGX_EN_SGX_SHIFT         1
-#define OMAP3430ES2_CM_ICLKEN_SGX_EN_SGX_SHIFT         0
-#define OMAP3430ES2_CLKSEL_SGX_MASK                    (0x7 << 0)
 #define OMAP3430ES2_CLKTRCTRL_SGX_MASK                 (0x3 << 0)
-#define OMAP3430ES2_EN_USIMOCP_SHIFT                   9
-#define OMAP3430_EN_WDT1_SHIFT                         4
-#define OMAP3430_EN_32KSYNC_SHIFT                      2
 #define OMAP3430_ST_WDT2_SHIFT                         5
 #define OMAP3430_ST_32KSYNC_SHIFT                      2
-#define OMAP3430ES2_CLKSEL_USIMOCP_MASK                        (0xf << 3)
-#define OMAP3430_CLKSEL_RM_SHIFT                       1
-#define OMAP3430_CLKSEL_RM_WIDTH                       2
-#define OMAP3430_CLKSEL_GPT1_MASK                      (1 << 0)
-#define OMAP3430_PWRDN_EMU_PERIPH_SHIFT                        31
-#define OMAP3430_PWRDN_CAM_SHIFT                       30
-#define OMAP3430_PWRDN_DSS1_SHIFT                      29
-#define OMAP3430_PWRDN_TV_SHIFT                                28
-#define OMAP3430_PWRDN_96M_SHIFT                       27
-#define OMAP3430_PERIPH_DPLL_FREQSEL_MASK              (0xf << 20)
-#define OMAP3430_EN_PERIPH_DPLL_DRIFTGUARD_SHIFT       19
-#define OMAP3430_EN_PERIPH_DPLL_MASK                   (0x7 << 16)
-#define OMAP3430_PWRDN_EMU_CORE_SHIFT                  12
-#define OMAP3430_CORE_DPLL_FREQSEL_MASK                        (0xf << 4)
-#define OMAP3430_EN_CORE_DPLL_DRIFTGUARD_SHIFT         3
-#define OMAP3430_EN_CORE_DPLL_MASK                     (0x7 << 0)
-#define OMAP3430ES2_PERIPH2_DPLL_FREQSEL_MASK          (0xf << 4)
-#define OMAP3430ES2_EN_PERIPH2_DPLL_DRIFTGUARD_SHIFT   3
-#define OMAP3430ES2_EN_PERIPH2_DPLL_MASK               (0x7 << 0)
-#define OMAP3430_ST_PERIPH_CLK_MASK                    (1 << 1)
-#define OMAP3430_ST_CORE_CLK_MASK                      (1 << 0)
-#define OMAP3430ES2_ST_PERIPH2_CLK_MASK                        (1 << 0)
 #define OMAP3430_AUTO_PERIPH_DPLL_MASK                 (0x7 << 3)
-#define OMAP3430_AUTO_CORE_DPLL_MASK                   (0x7 << 0)
-#define OMAP3430ES2_AUTO_PERIPH2_DPLL_MASK             (0x7 << 0)
-#define OMAP3430_CORE_DPLL_CLKOUT_DIV_SHIFT            27
-#define OMAP3430_CORE_DPLL_CLKOUT_DIV_WIDTH            5
-#define OMAP3430_CORE_DPLL_MULT_MASK                   (0x7ff << 16)
-#define OMAP3430_CORE_DPLL_DIV_MASK                    (0x7f << 8)
-#define OMAP3430_SOURCE_96M_SHIFT                      6
-#define OMAP3430_SOURCE_96M_WIDTH                      1
-#define OMAP3430_SOURCE_54M_SHIFT                      5
-#define OMAP3430_SOURCE_54M_WIDTH                      1
-#define OMAP3430_SOURCE_48M_MASK                       (1 << 3)
-#define OMAP3430_PERIPH_DPLL_MULT_MASK                 (0x7ff << 8)
-#define OMAP3630_PERIPH_DPLL_MULT_MASK                 (0xfff << 8)
-#define OMAP3430_PERIPH_DPLL_DIV_MASK                  (0x7f << 0)
-#define OMAP3630_PERIPH_DPLL_DCO_SEL_MASK              (0x7 << 21)
-#define OMAP3630_PERIPH_DPLL_SD_DIV_MASK               (0xff << 24)
-#define OMAP3430_DIV_96M_SHIFT                         0
-#define OMAP3630_DIV_96M_WIDTH                         6
-#define OMAP3430ES2_PERIPH2_DPLL_MULT_MASK             (0x7ff << 8)
-#define OMAP3430ES2_PERIPH2_DPLL_DIV_MASK              (0x7f << 0)
-#define OMAP3430ES2_DIV_120M_SHIFT                     0
-#define OMAP3430ES2_DIV_120M_WIDTH                     5
-#define OMAP3430_CLKOUT2_EN_SHIFT                      7
-#define OMAP3430_CLKOUT2_DIV_SHIFT                     3
-#define OMAP3430_CLKOUT2_DIV_WIDTH                     3
-#define OMAP3430_CLKOUT2SOURCE_MASK                    (0x3 << 0)
-#define OMAP3430_EN_TV_SHIFT                           2
-#define OMAP3430_EN_DSS2_SHIFT                         1
-#define OMAP3430_EN_DSS1_SHIFT                         0
-#define OMAP3430_CM_ICLKEN_DSS_EN_DSS_SHIFT            0
 #define OMAP3430ES2_ST_DSS_IDLE_SHIFT                  1
-#define OMAP3430ES2_ST_DSS_STDBY_SHIFT                 0
-#define OMAP3430ES1_ST_DSS_SHIFT                       0
-#define OMAP3430_CLKSEL_TV_SHIFT                       8
-#define OMAP3630_CLKSEL_TV_WIDTH                       6
-#define OMAP3430_CLKSEL_DSS1_SHIFT                     0
-#define OMAP3630_CLKSEL_DSS1_WIDTH                     6
 #define OMAP3430_CLKTRCTRL_DSS_MASK                    (0x3 << 0)
-#define OMAP3430_EN_CSI2_SHIFT                         1
-#define OMAP3430_CLKSEL_CAM_SHIFT                      0
-#define OMAP3630_CLKSEL_CAM_WIDTH                      6
 #define OMAP3430_CLKTRCTRL_CAM_MASK                    (0x3 << 0)
 #define OMAP3430_ST_MCBSP4_SHIFT                       2
 #define OMAP3430_ST_MCBSP3_SHIFT                       1
 #define OMAP3430_ST_MCBSP2_SHIFT                       0
-#define OMAP3430_CLKSEL_GPT9_MASK                      (1 << 7)
-#define OMAP3430_CLKSEL_GPT8_MASK                      (1 << 6)
-#define OMAP3430_CLKSEL_GPT7_MASK                      (1 << 5)
-#define OMAP3430_CLKSEL_GPT6_MASK                      (1 << 4)
-#define OMAP3430_CLKSEL_GPT5_MASK                      (1 << 3)
-#define OMAP3430_CLKSEL_GPT4_MASK                      (1 << 2)
-#define OMAP3430_CLKSEL_GPT3_MASK                      (1 << 1)
-#define OMAP3430_CLKSEL_GPT2_MASK                      (1 << 0)
 #define OMAP3430_CLKTRCTRL_PER_MASK                    (0x3 << 0)
-#define OMAP3430_DIV_DPLL4_SHIFT                       24
-#define OMAP3630_DIV_DPLL4_WIDTH                       6
-#define OMAP3430_DIV_DPLL3_SHIFT                       16
-#define OMAP3430_DIV_DPLL3_WIDTH                       5
-#define OMAP3430_CLKSEL_TRACECLK_SHIFT                 11
-#define OMAP3430_CLKSEL_TRACECLK_WIDTH                 3
-#define OMAP3430_CLKSEL_PCLK_SHIFT                     8
-#define OMAP3430_CLKSEL_PCLK_WIDTH                     3
-#define OMAP3430_CLKSEL_PCLKX2_SHIFT                   6
-#define OMAP3430_CLKSEL_PCLKX2_WIDTH                   2
-#define OMAP3430_CLKSEL_ATCLK_SHIFT                    4
-#define OMAP3430_CLKSEL_ATCLK_WIDTH                    2
-#define OMAP3430_TRACE_MUX_CTRL_SHIFT                  2
-#define OMAP3430_TRACE_MUX_CTRL_WIDTH                  2
-#define OMAP3430_MUX_CTRL_MASK                         (0x3 << 0)
 #define OMAP3430_CLKTRCTRL_EMU_MASK                    (0x3 << 0)
 #define OMAP3430_CLKTRCTRL_NEON_MASK                   (0x3 << 0)
 #define OMAP3430ES2_EN_USBHOST2_SHIFT                  1
-#define OMAP3430ES2_EN_USBHOST1_SHIFT                  0
-#define OMAP3430ES2_EN_USBHOST_SHIFT                   0
 #define OMAP3430ES2_ST_USBHOST_IDLE_SHIFT              1
-#define OMAP3430ES2_ST_USBHOST_STDBY_SHIFT             0
 #define OMAP3430ES2_CLKTRCTRL_USBHOST_MASK             (3 << 0)
 #define OMAP34XX_CLKSTCTRL_DISABLE_AUTO                0x0
 #define OMAP34XX_CLKSTCTRL_FORCE_SLEEP         0x1
index df2c29edbbcd50444b11add3575d30220643c01d..68ba5f472f6badd30ccc1408361ce5ff20c54a3a 100644 (file)
@@ -657,8 +657,11 @@ void __init dra7xxx_check_revision(void)
 {
        u32 idcode;
        u16 hawkeye;
-       u8 rev;
+       u8 rev, package;
+       struct omap_die_id odi;
 
+       omap_get_die_id(&odi);
+       package = (odi.id_2 >> 16) & 0x3;
        idcode = read_tap_reg(OMAP_TAP_IDCODE);
        hawkeye = (idcode >> 12) & 0xffff;
        rev = (idcode >> 28) & 0xff;
@@ -667,7 +670,17 @@ void __init dra7xxx_check_revision(void)
                switch (rev) {
                case 0:
                default:
-                       omap_revision = DRA762_REV_ES1_0;
+                       switch (package) {
+                       case 0x2:
+                               omap_revision = DRA762_ABZ_REV_ES1_0;
+                               break;
+                       case 0x3:
+                               omap_revision = DRA762_ACD_REV_ES1_0;
+                               break;
+                       default:
+                               omap_revision = DRA762_REV_ES1_0;
+                               break;
+                       }
                        break;
                }
                break;
index 5eff27e4f24bbcd6059b6f5241283fae16f09040..1cfe9aff4ac7ed5b50e454ad546a9bcc32686f91 100644 (file)
@@ -715,7 +715,7 @@ static const struct of_device_id ti_clkctrl_match_table[] __initconst = {
        { }
 };
 
-static int _setup_clkctrl_provider(struct device_node *np)
+static int __init _setup_clkctrl_provider(struct device_node *np)
 {
        const __be32 *addrp;
        struct clkctrl_provider *provider;
@@ -743,7 +743,7 @@ static int _setup_clkctrl_provider(struct device_node *np)
        return 0;
 }
 
-static int _init_clkctrl_providers(void)
+static int __init _init_clkctrl_providers(void)
 {
        struct device_node *np;
        int ret = 0;
index df2239a585558f1e2a08c66d2086018d5877439b..903685252240b95d56f3736c15574c633fe01628 100644 (file)
@@ -343,11 +343,8 @@ struct omap_hwmod_class_sysconfig {
 /**
  * struct omap_hwmod_omap2_prcm - OMAP2/3-specific PRCM data
  * @module_offs: PRCM submodule offset from the start of the PRM/CM
- * @prcm_reg_id: PRCM register ID (e.g., 3 for CM_AUTOIDLE3)
- * @module_bit: register bit shift for AUTOIDLE, WKST, WKEN, GRPSEL regs
  * @idlest_reg_id: IDLEST register ID (e.g., 3 for CM_IDLEST3)
  * @idlest_idle_bit: register bit shift for CM_IDLEST slave idle bit
- * @idlest_stdby_bit: register bit shift for CM_IDLEST master standby bit
  *
  * @prcm_reg_id and @module_bit are specific to the AUTOIDLE, WKST,
  * WKEN, GRPSEL registers.  In an ideal world, no extra information
@@ -357,11 +354,8 @@ struct omap_hwmod_class_sysconfig {
  */
 struct omap_hwmod_omap2_prcm {
        s16 module_offs;
-       u8 prcm_reg_id;
-       u8 module_bit;
        u8 idlest_reg_id;
        u8 idlest_idle_bit;
-       u8 idlest_stdby_bit;
 };
 
 /*
index 1a15a347945a57697bee29f68146cf483e75aaca..0afb014b211f41bd4c4e9835d99a83144cb2029d 100644 (file)
@@ -111,8 +111,6 @@ static struct omap_hwmod omap2420_i2c1_hwmod = {
        .prcm           = {
                .omap2 = {
                        .module_offs = CORE_MOD,
-                       .prcm_reg_id = 1,
-                       .module_bit = OMAP2420_EN_I2C1_SHIFT,
                        .idlest_reg_id = 1,
                        .idlest_idle_bit = OMAP2420_ST_I2C1_SHIFT,
                },
@@ -134,8 +132,6 @@ static struct omap_hwmod omap2420_i2c2_hwmod = {
        .prcm           = {
                .omap2 = {
                        .module_offs = CORE_MOD,
-                       .prcm_reg_id = 1,
-                       .module_bit = OMAP2420_EN_I2C2_SHIFT,
                        .idlest_reg_id = 1,
                        .idlest_idle_bit = OMAP2420_ST_I2C2_SHIFT,
                },
@@ -167,8 +163,6 @@ static struct omap_hwmod omap2420_mailbox_hwmod = {
        .main_clk       = "mailboxes_ick",
        .prcm           = {
                .omap2 = {
-                       .prcm_reg_id = 1,
-                       .module_bit = OMAP24XX_EN_MAILBOXES_SHIFT,
                        .module_offs = CORE_MOD,
                        .idlest_reg_id = 1,
                        .idlest_idle_bit = OMAP24XX_ST_MAILBOXES_SHIFT,
@@ -197,8 +191,6 @@ static struct omap_hwmod omap2420_mcbsp1_hwmod = {
        .main_clk       = "mcbsp1_fck",
        .prcm           = {
                .omap2 = {
-                       .prcm_reg_id = 1,
-                       .module_bit = OMAP24XX_EN_MCBSP1_SHIFT,
                        .module_offs = CORE_MOD,
                        .idlest_reg_id = 1,
                        .idlest_idle_bit = OMAP24XX_ST_MCBSP1_SHIFT,
@@ -215,8 +207,6 @@ static struct omap_hwmod omap2420_mcbsp2_hwmod = {
        .main_clk       = "mcbsp2_fck",
        .prcm           = {
                .omap2 = {
-                       .prcm_reg_id = 1,
-                       .module_bit = OMAP24XX_EN_MCBSP2_SHIFT,
                        .module_offs = CORE_MOD,
                        .idlest_reg_id = 1,
                        .idlest_idle_bit = OMAP24XX_ST_MCBSP2_SHIFT,
@@ -247,8 +237,6 @@ static struct omap_hwmod omap2420_msdi1_hwmod = {
        .main_clk       = "mmc_fck",
        .prcm           = {
                .omap2 = {
-                       .prcm_reg_id = 1,
-                       .module_bit = OMAP2420_EN_MMC_SHIFT,
                        .module_offs = CORE_MOD,
                        .idlest_reg_id = 1,
                        .idlest_idle_bit = OMAP2420_ST_MMC_SHIFT,
@@ -264,8 +252,6 @@ static struct omap_hwmod omap2420_hdq1w_hwmod = {
        .prcm           = {
                .omap2 = {
                        .module_offs = CORE_MOD,
-                       .prcm_reg_id = 1,
-                       .module_bit = OMAP24XX_EN_HDQ_SHIFT,
                        .idlest_reg_id = 1,
                        .idlest_idle_bit = OMAP24XX_ST_HDQ_SHIFT,
                },
index 3801850bccecb070dd231d735c19115687337148..013b26b305d2fd4265d337c5c791abcdc3d9cd38 100644 (file)
@@ -97,8 +97,6 @@ static struct omap_hwmod omap2430_i2c1_hwmod = {
                         * to hwmod framework.
                         */
                        .module_offs = CORE_MOD,
-                       .prcm_reg_id = 1,
-                       .module_bit = OMAP2430_EN_I2CHS1_SHIFT,
                        .idlest_reg_id = 1,
                        .idlest_idle_bit = OMAP2430_ST_I2CHS1_SHIFT,
                },
@@ -115,8 +113,6 @@ static struct omap_hwmod omap2430_i2c2_hwmod = {
        .prcm           = {
                .omap2 = {
                        .module_offs = CORE_MOD,
-                       .prcm_reg_id = 1,
-                       .module_bit = OMAP2430_EN_I2CHS2_SHIFT,
                        .idlest_reg_id = 1,
                        .idlest_idle_bit = OMAP2430_ST_I2CHS2_SHIFT,
                },
@@ -132,8 +128,6 @@ static struct omap_hwmod omap2430_gpio5_hwmod = {
        .main_clk       = "gpio5_fck",
        .prcm           = {
                .omap2 = {
-                       .prcm_reg_id = 2,
-                       .module_bit = OMAP2430_EN_GPIO5_SHIFT,
                        .module_offs = CORE_MOD,
                        .idlest_reg_id = 2,
                        .idlest_idle_bit = OMAP2430_ST_GPIO5_SHIFT,
@@ -165,8 +159,6 @@ static struct omap_hwmod omap2430_mailbox_hwmod = {
        .main_clk       = "mailboxes_ick",
        .prcm           = {
                .omap2 = {
-                       .prcm_reg_id = 1,
-                       .module_bit = OMAP24XX_EN_MAILBOXES_SHIFT,
                        .module_offs = CORE_MOD,
                        .idlest_reg_id = 1,
                        .idlest_idle_bit = OMAP24XX_ST_MAILBOXES_SHIFT,
@@ -185,8 +177,6 @@ static struct omap_hwmod omap2430_mcspi3_hwmod = {
        .prcm           = {
                .omap2 = {
                        .module_offs = CORE_MOD,
-                       .prcm_reg_id = 2,
-                       .module_bit = OMAP2430_EN_MCSPI3_SHIFT,
                        .idlest_reg_id = 2,
                        .idlest_idle_bit = OMAP2430_ST_MCSPI3_SHIFT,
                },
@@ -219,8 +209,6 @@ static struct omap_hwmod omap2430_usbhsotg_hwmod = {
        .main_clk       = "usbhs_ick",
        .prcm           = {
                .omap2 = {
-                       .prcm_reg_id = 1,
-                       .module_bit = OMAP2430_EN_USBHS_MASK,
                        .module_offs = CORE_MOD,
                        .idlest_reg_id = 1,
                        .idlest_idle_bit = OMAP2430_ST_USBHS_SHIFT,
@@ -266,8 +254,6 @@ static struct omap_hwmod omap2430_mcbsp1_hwmod = {
        .main_clk       = "mcbsp1_fck",
        .prcm           = {
                .omap2 = {
-                       .prcm_reg_id = 1,
-                       .module_bit = OMAP24XX_EN_MCBSP1_SHIFT,
                        .module_offs = CORE_MOD,
                        .idlest_reg_id = 1,
                        .idlest_idle_bit = OMAP24XX_ST_MCBSP1_SHIFT,
@@ -284,8 +270,6 @@ static struct omap_hwmod omap2430_mcbsp2_hwmod = {
        .main_clk       = "mcbsp2_fck",
        .prcm           = {
                .omap2 = {
-                       .prcm_reg_id = 1,
-                       .module_bit = OMAP24XX_EN_MCBSP2_SHIFT,
                        .module_offs = CORE_MOD,
                        .idlest_reg_id = 1,
                        .idlest_idle_bit = OMAP24XX_ST_MCBSP2_SHIFT,
@@ -302,8 +286,6 @@ static struct omap_hwmod omap2430_mcbsp3_hwmod = {
        .main_clk       = "mcbsp3_fck",
        .prcm           = {
                .omap2 = {
-                       .prcm_reg_id = 1,
-                       .module_bit = OMAP2430_EN_MCBSP3_SHIFT,
                        .module_offs = CORE_MOD,
                        .idlest_reg_id = 2,
                        .idlest_idle_bit = OMAP2430_ST_MCBSP3_SHIFT,
@@ -320,8 +302,6 @@ static struct omap_hwmod omap2430_mcbsp4_hwmod = {
        .main_clk       = "mcbsp4_fck",
        .prcm           = {
                .omap2 = {
-                       .prcm_reg_id = 1,
-                       .module_bit = OMAP2430_EN_MCBSP4_SHIFT,
                        .module_offs = CORE_MOD,
                        .idlest_reg_id = 2,
                        .idlest_idle_bit = OMAP2430_ST_MCBSP4_SHIFT,
@@ -338,8 +318,6 @@ static struct omap_hwmod omap2430_mcbsp5_hwmod = {
        .main_clk       = "mcbsp5_fck",
        .prcm           = {
                .omap2 = {
-                       .prcm_reg_id = 1,
-                       .module_bit = OMAP2430_EN_MCBSP5_SHIFT,
                        .module_offs = CORE_MOD,
                        .idlest_reg_id = 2,
                        .idlest_idle_bit = OMAP2430_ST_MCBSP5_SHIFT,
@@ -384,8 +362,6 @@ static struct omap_hwmod omap2430_mmc1_hwmod = {
        .prcm           = {
                .omap2 = {
                        .module_offs = CORE_MOD,
-                       .prcm_reg_id = 2,
-                       .module_bit  = OMAP2430_EN_MMCHS1_SHIFT,
                        .idlest_reg_id = 2,
                        .idlest_idle_bit = OMAP2430_ST_MMCHS1_SHIFT,
                },
@@ -408,8 +384,6 @@ static struct omap_hwmod omap2430_mmc2_hwmod = {
        .prcm           = {
                .omap2 = {
                        .module_offs = CORE_MOD,
-                       .prcm_reg_id = 2,
-                       .module_bit  = OMAP2430_EN_MMCHS2_SHIFT,
                        .idlest_reg_id = 2,
                        .idlest_idle_bit = OMAP2430_ST_MMCHS2_SHIFT,
                },
@@ -424,8 +398,6 @@ static struct omap_hwmod omap2430_hdq1w_hwmod = {
        .prcm           = {
                .omap2 = {
                        .module_offs = CORE_MOD,
-                       .prcm_reg_id = 1,
-                       .module_bit = OMAP24XX_EN_HDQ_SHIFT,
                        .idlest_reg_id = 1,
                        .idlest_idle_bit = OMAP24XX_ST_HDQ_SHIFT,
                },
index beec4cd617b139a4360028a2c7fa6f1f51f637cd..4b094cb384cb28b5c39af9274ce2af0d6b4dbe87 100644 (file)
@@ -242,8 +242,6 @@ struct omap_hwmod omap2xxx_timer1_hwmod = {
        .main_clk       = "gpt1_fck",
        .prcm           = {
                .omap2 = {
-                       .prcm_reg_id = 1,
-                       .module_bit = OMAP24XX_EN_GPT1_SHIFT,
                        .module_offs = WKUP_MOD,
                        .idlest_reg_id = 1,
                        .idlest_idle_bit = OMAP24XX_ST_GPT1_SHIFT,
@@ -261,8 +259,6 @@ struct omap_hwmod omap2xxx_timer2_hwmod = {
        .main_clk       = "gpt2_fck",
        .prcm           = {
                .omap2 = {
-                       .prcm_reg_id = 1,
-                       .module_bit = OMAP24XX_EN_GPT2_SHIFT,
                        .module_offs = CORE_MOD,
                        .idlest_reg_id = 1,
                        .idlest_idle_bit = OMAP24XX_ST_GPT2_SHIFT,
@@ -279,8 +275,6 @@ struct omap_hwmod omap2xxx_timer3_hwmod = {
        .main_clk       = "gpt3_fck",
        .prcm           = {
                .omap2 = {
-                       .prcm_reg_id = 1,
-                       .module_bit = OMAP24XX_EN_GPT3_SHIFT,
                        .module_offs = CORE_MOD,
                        .idlest_reg_id = 1,
                        .idlest_idle_bit = OMAP24XX_ST_GPT3_SHIFT,
@@ -297,8 +291,6 @@ struct omap_hwmod omap2xxx_timer4_hwmod = {
        .main_clk       = "gpt4_fck",
        .prcm           = {
                .omap2 = {
-                       .prcm_reg_id = 1,
-                       .module_bit = OMAP24XX_EN_GPT4_SHIFT,
                        .module_offs = CORE_MOD,
                        .idlest_reg_id = 1,
                        .idlest_idle_bit = OMAP24XX_ST_GPT4_SHIFT,
@@ -315,8 +307,6 @@ struct omap_hwmod omap2xxx_timer5_hwmod = {
        .main_clk       = "gpt5_fck",
        .prcm           = {
                .omap2 = {
-                       .prcm_reg_id = 1,
-                       .module_bit = OMAP24XX_EN_GPT5_SHIFT,
                        .module_offs = CORE_MOD,
                        .idlest_reg_id = 1,
                        .idlest_idle_bit = OMAP24XX_ST_GPT5_SHIFT,
@@ -334,8 +324,6 @@ struct omap_hwmod omap2xxx_timer6_hwmod = {
        .main_clk       = "gpt6_fck",
        .prcm           = {
                .omap2 = {
-                       .prcm_reg_id = 1,
-                       .module_bit = OMAP24XX_EN_GPT6_SHIFT,
                        .module_offs = CORE_MOD,
                        .idlest_reg_id = 1,
                        .idlest_idle_bit = OMAP24XX_ST_GPT6_SHIFT,
@@ -353,8 +341,6 @@ struct omap_hwmod omap2xxx_timer7_hwmod = {
        .main_clk       = "gpt7_fck",
        .prcm           = {
                .omap2 = {
-                       .prcm_reg_id = 1,
-                       .module_bit = OMAP24XX_EN_GPT7_SHIFT,
                        .module_offs = CORE_MOD,
                        .idlest_reg_id = 1,
                        .idlest_idle_bit = OMAP24XX_ST_GPT7_SHIFT,
@@ -372,8 +358,6 @@ struct omap_hwmod omap2xxx_timer8_hwmod = {
        .main_clk       = "gpt8_fck",
        .prcm           = {
                .omap2 = {
-                       .prcm_reg_id = 1,
-                       .module_bit = OMAP24XX_EN_GPT8_SHIFT,
                        .module_offs = CORE_MOD,
                        .idlest_reg_id = 1,
                        .idlest_idle_bit = OMAP24XX_ST_GPT8_SHIFT,
@@ -391,8 +375,6 @@ struct omap_hwmod omap2xxx_timer9_hwmod = {
        .main_clk       = "gpt9_fck",
        .prcm           = {
                .omap2 = {
-                       .prcm_reg_id = 1,
-                       .module_bit = OMAP24XX_EN_GPT9_SHIFT,
                        .module_offs = CORE_MOD,
                        .idlest_reg_id = 1,
                        .idlest_idle_bit = OMAP24XX_ST_GPT9_SHIFT,
@@ -410,8 +392,6 @@ struct omap_hwmod omap2xxx_timer10_hwmod = {
        .main_clk       = "gpt10_fck",
        .prcm           = {
                .omap2 = {
-                       .prcm_reg_id = 1,
-                       .module_bit = OMAP24XX_EN_GPT10_SHIFT,
                        .module_offs = CORE_MOD,
                        .idlest_reg_id = 1,
                        .idlest_idle_bit = OMAP24XX_ST_GPT10_SHIFT,
@@ -429,8 +409,6 @@ struct omap_hwmod omap2xxx_timer11_hwmod = {
        .main_clk       = "gpt11_fck",
        .prcm           = {
                .omap2 = {
-                       .prcm_reg_id = 1,
-                       .module_bit = OMAP24XX_EN_GPT11_SHIFT,
                        .module_offs = CORE_MOD,
                        .idlest_reg_id = 1,
                        .idlest_idle_bit = OMAP24XX_ST_GPT11_SHIFT,
@@ -448,8 +426,6 @@ struct omap_hwmod omap2xxx_timer12_hwmod = {
        .main_clk       = "gpt12_fck",
        .prcm           = {
                .omap2 = {
-                       .prcm_reg_id = 1,
-                       .module_bit = OMAP24XX_EN_GPT12_SHIFT,
                        .module_offs = CORE_MOD,
                        .idlest_reg_id = 1,
                        .idlest_idle_bit = OMAP24XX_ST_GPT12_SHIFT,
@@ -467,8 +443,6 @@ struct omap_hwmod omap2xxx_wd_timer2_hwmod = {
        .main_clk       = "mpu_wdt_fck",
        .prcm           = {
                .omap2 = {
-                       .prcm_reg_id = 1,
-                       .module_bit = OMAP24XX_EN_MPU_WDT_SHIFT,
                        .module_offs = WKUP_MOD,
                        .idlest_reg_id = 1,
                        .idlest_idle_bit = OMAP24XX_ST_MPU_WDT_SHIFT,
@@ -485,8 +459,6 @@ struct omap_hwmod omap2xxx_uart1_hwmod = {
        .prcm           = {
                .omap2 = {
                        .module_offs = CORE_MOD,
-                       .prcm_reg_id = 1,
-                       .module_bit = OMAP24XX_EN_UART1_SHIFT,
                        .idlest_reg_id = 1,
                        .idlest_idle_bit = OMAP24XX_EN_UART1_SHIFT,
                },
@@ -503,8 +475,6 @@ struct omap_hwmod omap2xxx_uart2_hwmod = {
        .prcm           = {
                .omap2 = {
                        .module_offs = CORE_MOD,
-                       .prcm_reg_id = 1,
-                       .module_bit = OMAP24XX_EN_UART2_SHIFT,
                        .idlest_reg_id = 1,
                        .idlest_idle_bit = OMAP24XX_EN_UART2_SHIFT,
                },
@@ -521,8 +491,6 @@ struct omap_hwmod omap2xxx_uart3_hwmod = {
        .prcm           = {
                .omap2 = {
                        .module_offs = CORE_MOD,
-                       .prcm_reg_id = 2,
-                       .module_bit = OMAP24XX_EN_UART3_SHIFT,
                        .idlest_reg_id = 2,
                        .idlest_idle_bit = OMAP24XX_EN_UART3_SHIFT,
                },
@@ -547,11 +515,8 @@ struct omap_hwmod omap2xxx_dss_core_hwmod = {
        .main_clk       = "dss1_fck", /* instead of dss_fck */
        .prcm           = {
                .omap2 = {
-                       .prcm_reg_id = 1,
-                       .module_bit = OMAP24XX_EN_DSS1_SHIFT,
                        .module_offs = CORE_MOD,
                        .idlest_reg_id = 1,
-                       .idlest_stdby_bit = OMAP24XX_ST_DSS_SHIFT,
                },
        },
        .opt_clks       = dss_opt_clks,
@@ -565,11 +530,8 @@ struct omap_hwmod omap2xxx_dss_dispc_hwmod = {
        .main_clk       = "dss1_fck",
        .prcm           = {
                .omap2 = {
-                       .prcm_reg_id = 1,
-                       .module_bit = OMAP24XX_EN_DSS1_SHIFT,
                        .module_offs = CORE_MOD,
                        .idlest_reg_id = 1,
-                       .idlest_stdby_bit = OMAP24XX_ST_DSS_SHIFT,
                },
        },
        .flags          = HWMOD_NO_IDLEST,
@@ -586,8 +548,6 @@ struct omap_hwmod omap2xxx_dss_rfbi_hwmod = {
        .main_clk       = "dss1_fck",
        .prcm           = {
                .omap2 = {
-                       .prcm_reg_id = 1,
-                       .module_bit = OMAP24XX_EN_DSS1_SHIFT,
                        .module_offs = CORE_MOD,
                },
        },
@@ -602,8 +562,6 @@ struct omap_hwmod omap2xxx_dss_venc_hwmod = {
        .main_clk       = "dss_54m_fck",
        .prcm           = {
                .omap2 = {
-                       .prcm_reg_id = 1,
-                       .module_bit = OMAP24XX_EN_DSS1_SHIFT,
                        .module_offs = CORE_MOD,
                },
        },
@@ -623,8 +581,6 @@ struct omap_hwmod omap2xxx_gpio1_hwmod = {
        .main_clk       = "gpios_fck",
        .prcm           = {
                .omap2 = {
-                       .prcm_reg_id = 1,
-                       .module_bit = OMAP24XX_EN_GPIOS_SHIFT,
                        .module_offs = WKUP_MOD,
                        .idlest_reg_id = 1,
                        .idlest_idle_bit = OMAP24XX_ST_GPIOS_SHIFT,
@@ -641,8 +597,6 @@ struct omap_hwmod omap2xxx_gpio2_hwmod = {
        .main_clk       = "gpios_fck",
        .prcm           = {
                .omap2 = {
-                       .prcm_reg_id = 1,
-                       .module_bit = OMAP24XX_EN_GPIOS_SHIFT,
                        .module_offs = WKUP_MOD,
                        .idlest_reg_id = 1,
                        .idlest_idle_bit = OMAP24XX_ST_GPIOS_SHIFT,
@@ -659,8 +613,6 @@ struct omap_hwmod omap2xxx_gpio3_hwmod = {
        .main_clk       = "gpios_fck",
        .prcm           = {
                .omap2 = {
-                       .prcm_reg_id = 1,
-                       .module_bit = OMAP24XX_EN_GPIOS_SHIFT,
                        .module_offs = WKUP_MOD,
                        .idlest_reg_id = 1,
                        .idlest_idle_bit = OMAP24XX_ST_GPIOS_SHIFT,
@@ -677,8 +629,6 @@ struct omap_hwmod omap2xxx_gpio4_hwmod = {
        .main_clk       = "gpios_fck",
        .prcm           = {
                .omap2 = {
-                       .prcm_reg_id = 1,
-                       .module_bit = OMAP24XX_EN_GPIOS_SHIFT,
                        .module_offs = WKUP_MOD,
                        .idlest_reg_id = 1,
                        .idlest_idle_bit = OMAP24XX_ST_GPIOS_SHIFT,
@@ -699,8 +649,6 @@ struct omap_hwmod omap2xxx_mcspi1_hwmod = {
        .prcm           = {
                .omap2 = {
                        .module_offs = CORE_MOD,
-                       .prcm_reg_id = 1,
-                       .module_bit = OMAP24XX_EN_MCSPI1_SHIFT,
                        .idlest_reg_id = 1,
                        .idlest_idle_bit = OMAP24XX_ST_MCSPI1_SHIFT,
                },
@@ -720,8 +668,6 @@ struct omap_hwmod omap2xxx_mcspi2_hwmod = {
        .prcm           = {
                .omap2 = {
                        .module_offs = CORE_MOD,
-                       .prcm_reg_id = 1,
-                       .module_bit = OMAP24XX_EN_MCSPI2_SHIFT,
                        .idlest_reg_id = 1,
                        .idlest_idle_bit = OMAP24XX_ST_MCSPI2_SHIFT,
                },
@@ -740,8 +686,6 @@ struct omap_hwmod omap2xxx_counter_32k_hwmod = {
        .prcm           = {
                .omap2  = {
                        .module_offs = WKUP_MOD,
-                       .prcm_reg_id = 1,
-                       .module_bit = OMAP24XX_ST_32KSYNC_SHIFT,
                        .idlest_reg_id = 1,
                        .idlest_idle_bit = OMAP24XX_ST_32KSYNC_SHIFT,
                },
@@ -758,8 +702,6 @@ struct omap_hwmod omap2xxx_gpmc_hwmod = {
        .flags          = HWMOD_NO_IDLEST | DEBUG_OMAP_GPMC_HWMOD_FLAGS,
        .prcm           = {
                .omap2  = {
-                       .prcm_reg_id = 3,
-                       .module_bit = OMAP24XX_EN_GPMC_MASK,
                        .module_offs = CORE_MOD,
                },
        },
@@ -787,8 +729,6 @@ struct omap_hwmod omap2xxx_rng_hwmod = {
        .prcm           = {
                .omap2 = {
                        .module_offs = CORE_MOD,
-                       .prcm_reg_id = 4,
-                       .module_bit = OMAP24XX_EN_RNG_SHIFT,
                        .idlest_reg_id = 4,
                        .idlest_idle_bit = OMAP24XX_ST_RNG_SHIFT,
                },
@@ -825,8 +765,6 @@ struct omap_hwmod omap2xxx_sham_hwmod = {
        .prcm           = {
                .omap2 = {
                        .module_offs = CORE_MOD,
-                       .prcm_reg_id = 4,
-                       .module_bit = OMAP24XX_EN_SHA_SHIFT,
                        .idlest_reg_id = 4,
                        .idlest_idle_bit = OMAP24XX_ST_SHA_SHIFT,
                },
@@ -856,8 +794,6 @@ struct omap_hwmod omap2xxx_aes_hwmod = {
        .prcm           = {
                .omap2 = {
                        .module_offs = CORE_MOD,
-                       .prcm_reg_id = 4,
-                       .module_bit = OMAP24XX_EN_AES_SHIFT,
                        .idlest_reg_id = 4,
                        .idlest_idle_bit = OMAP24XX_ST_AES_SHIFT,
                },
index 52c9d585b44d2607f4d0a4c5d0b1b1d01cb4bac3..c8baa57da0621e13227ddd01373010d1a105d183 100644 (file)
@@ -113,8 +113,6 @@ static struct omap_hwmod omap3xxx_iva_hwmod = {
        .prcm = {
                .omap2 = {
                        .module_offs = OMAP3430_IVA2_MOD,
-                       .prcm_reg_id = 1,
-                       .module_bit = OMAP3430_CM_FCLKEN_IVA2_EN_IVA2_SHIFT,
                        .idlest_reg_id = 1,
                        .idlest_idle_bit = OMAP3430_ST_IVA2_SHIFT,
                },
@@ -188,8 +186,6 @@ static struct omap_hwmod omap3xxx_timer1_hwmod = {
        .main_clk       = "gpt1_fck",
        .prcm           = {
                .omap2 = {
-                       .prcm_reg_id = 1,
-                       .module_bit = OMAP3430_EN_GPT1_SHIFT,
                        .module_offs = WKUP_MOD,
                        .idlest_reg_id = 1,
                        .idlest_idle_bit = OMAP3430_ST_GPT1_SHIFT,
@@ -206,8 +202,6 @@ static struct omap_hwmod omap3xxx_timer2_hwmod = {
        .main_clk       = "gpt2_fck",
        .prcm           = {
                .omap2 = {
-                       .prcm_reg_id = 1,
-                       .module_bit = OMAP3430_EN_GPT2_SHIFT,
                        .module_offs = OMAP3430_PER_MOD,
                        .idlest_reg_id = 1,
                        .idlest_idle_bit = OMAP3430_ST_GPT2_SHIFT,
@@ -223,8 +217,6 @@ static struct omap_hwmod omap3xxx_timer3_hwmod = {
        .main_clk       = "gpt3_fck",
        .prcm           = {
                .omap2 = {
-                       .prcm_reg_id = 1,
-                       .module_bit = OMAP3430_EN_GPT3_SHIFT,
                        .module_offs = OMAP3430_PER_MOD,
                        .idlest_reg_id = 1,
                        .idlest_idle_bit = OMAP3430_ST_GPT3_SHIFT,
@@ -240,8 +232,6 @@ static struct omap_hwmod omap3xxx_timer4_hwmod = {
        .main_clk       = "gpt4_fck",
        .prcm           = {
                .omap2 = {
-                       .prcm_reg_id = 1,
-                       .module_bit = OMAP3430_EN_GPT4_SHIFT,
                        .module_offs = OMAP3430_PER_MOD,
                        .idlest_reg_id = 1,
                        .idlest_idle_bit = OMAP3430_ST_GPT4_SHIFT,
@@ -257,8 +247,6 @@ static struct omap_hwmod omap3xxx_timer5_hwmod = {
        .main_clk       = "gpt5_fck",
        .prcm           = {
                .omap2 = {
-                       .prcm_reg_id = 1,
-                       .module_bit = OMAP3430_EN_GPT5_SHIFT,
                        .module_offs = OMAP3430_PER_MOD,
                        .idlest_reg_id = 1,
                        .idlest_idle_bit = OMAP3430_ST_GPT5_SHIFT,
@@ -275,8 +263,6 @@ static struct omap_hwmod omap3xxx_timer6_hwmod = {
        .main_clk       = "gpt6_fck",
        .prcm           = {
                .omap2 = {
-                       .prcm_reg_id = 1,
-                       .module_bit = OMAP3430_EN_GPT6_SHIFT,
                        .module_offs = OMAP3430_PER_MOD,
                        .idlest_reg_id = 1,
                        .idlest_idle_bit = OMAP3430_ST_GPT6_SHIFT,
@@ -293,8 +279,6 @@ static struct omap_hwmod omap3xxx_timer7_hwmod = {
        .main_clk       = "gpt7_fck",
        .prcm           = {
                .omap2 = {
-                       .prcm_reg_id = 1,
-                       .module_bit = OMAP3430_EN_GPT7_SHIFT,
                        .module_offs = OMAP3430_PER_MOD,
                        .idlest_reg_id = 1,
                        .idlest_idle_bit = OMAP3430_ST_GPT7_SHIFT,
@@ -311,8 +295,6 @@ static struct omap_hwmod omap3xxx_timer8_hwmod = {
        .main_clk       = "gpt8_fck",
        .prcm           = {
                .omap2 = {
-                       .prcm_reg_id = 1,
-                       .module_bit = OMAP3430_EN_GPT8_SHIFT,
                        .module_offs = OMAP3430_PER_MOD,
                        .idlest_reg_id = 1,
                        .idlest_idle_bit = OMAP3430_ST_GPT8_SHIFT,
@@ -329,8 +311,6 @@ static struct omap_hwmod omap3xxx_timer9_hwmod = {
        .main_clk       = "gpt9_fck",
        .prcm           = {
                .omap2 = {
-                       .prcm_reg_id = 1,
-                       .module_bit = OMAP3430_EN_GPT9_SHIFT,
                        .module_offs = OMAP3430_PER_MOD,
                        .idlest_reg_id = 1,
                        .idlest_idle_bit = OMAP3430_ST_GPT9_SHIFT,
@@ -347,8 +327,6 @@ static struct omap_hwmod omap3xxx_timer10_hwmod = {
        .main_clk       = "gpt10_fck",
        .prcm           = {
                .omap2 = {
-                       .prcm_reg_id = 1,
-                       .module_bit = OMAP3430_EN_GPT10_SHIFT,
                        .module_offs = CORE_MOD,
                        .idlest_reg_id = 1,
                        .idlest_idle_bit = OMAP3430_ST_GPT10_SHIFT,
@@ -365,8 +343,6 @@ static struct omap_hwmod omap3xxx_timer11_hwmod = {
        .main_clk       = "gpt11_fck",
        .prcm           = {
                .omap2 = {
-                       .prcm_reg_id = 1,
-                       .module_bit = OMAP3430_EN_GPT11_SHIFT,
                        .module_offs = CORE_MOD,
                        .idlest_reg_id = 1,
                        .idlest_idle_bit = OMAP3430_ST_GPT11_SHIFT,
@@ -384,8 +360,6 @@ static struct omap_hwmod omap3xxx_timer12_hwmod = {
        .main_clk       = "gpt12_fck",
        .prcm           = {
                .omap2 = {
-                       .prcm_reg_id = 1,
-                       .module_bit = OMAP3430_EN_GPT12_SHIFT,
                        .module_offs = WKUP_MOD,
                        .idlest_reg_id = 1,
                        .idlest_idle_bit = OMAP3430_ST_GPT12_SHIFT,
@@ -439,8 +413,6 @@ static struct omap_hwmod omap3xxx_wd_timer2_hwmod = {
        .main_clk       = "wdt2_fck",
        .prcm           = {
                .omap2 = {
-                       .prcm_reg_id = 1,
-                       .module_bit = OMAP3430_EN_WDT2_SHIFT,
                        .module_offs = WKUP_MOD,
                        .idlest_reg_id = 1,
                        .idlest_idle_bit = OMAP3430_ST_WDT2_SHIFT,
@@ -461,8 +433,6 @@ static struct omap_hwmod omap3xxx_uart1_hwmod = {
        .prcm           = {
                .omap2 = {
                        .module_offs = CORE_MOD,
-                       .prcm_reg_id = 1,
-                       .module_bit = OMAP3430_EN_UART1_SHIFT,
                        .idlest_reg_id = 1,
                        .idlest_idle_bit = OMAP3430_EN_UART1_SHIFT,
                },
@@ -478,8 +448,6 @@ static struct omap_hwmod omap3xxx_uart2_hwmod = {
        .prcm           = {
                .omap2 = {
                        .module_offs = CORE_MOD,
-                       .prcm_reg_id = 1,
-                       .module_bit = OMAP3430_EN_UART2_SHIFT,
                        .idlest_reg_id = 1,
                        .idlest_idle_bit = OMAP3430_EN_UART2_SHIFT,
                },
@@ -496,8 +464,6 @@ static struct omap_hwmod omap3xxx_uart3_hwmod = {
        .prcm           = {
                .omap2 = {
                        .module_offs = OMAP3430_PER_MOD,
-                       .prcm_reg_id = 1,
-                       .module_bit = OMAP3430_EN_UART3_SHIFT,
                        .idlest_reg_id = 1,
                        .idlest_idle_bit = OMAP3430_EN_UART3_SHIFT,
                },
@@ -515,8 +481,6 @@ static struct omap_hwmod omap36xx_uart4_hwmod = {
        .prcm           = {
                .omap2 = {
                        .module_offs = OMAP3430_PER_MOD,
-                       .prcm_reg_id = 1,
-                       .module_bit = OMAP3630_EN_UART4_SHIFT,
                        .idlest_reg_id = 1,
                        .idlest_idle_bit = OMAP3630_EN_UART4_SHIFT,
                },
@@ -546,8 +510,6 @@ static struct omap_hwmod am35xx_uart4_hwmod = {
        .prcm           = {
                .omap2 = {
                        .module_offs = CORE_MOD,
-                       .prcm_reg_id = 1,
-                       .module_bit = AM35XX_EN_UART4_SHIFT,
                        .idlest_reg_id = 1,
                        .idlest_idle_bit = AM35XX_ST_UART4_SHIFT,
                },
@@ -583,11 +545,8 @@ static struct omap_hwmod omap3430es1_dss_core_hwmod = {
        .main_clk       = "dss1_alwon_fck", /* instead of dss_fck */
        .prcm           = {
                .omap2 = {
-                       .prcm_reg_id = 1,
-                       .module_bit = OMAP3430_EN_DSS1_SHIFT,
                        .module_offs = OMAP3430_DSS_MOD,
                        .idlest_reg_id = 1,
-                       .idlest_stdby_bit = OMAP3430ES1_ST_DSS_SHIFT,
                },
        },
        .opt_clks       = dss_opt_clks,
@@ -602,12 +561,9 @@ static struct omap_hwmod omap3xxx_dss_core_hwmod = {
        .main_clk       = "dss1_alwon_fck", /* instead of dss_fck */
        .prcm           = {
                .omap2 = {
-                       .prcm_reg_id = 1,
-                       .module_bit = OMAP3430_EN_DSS1_SHIFT,
                        .module_offs = OMAP3430_DSS_MOD,
                        .idlest_reg_id = 1,
                        .idlest_idle_bit = OMAP3430ES2_ST_DSS_IDLE_SHIFT,
-                       .idlest_stdby_bit = OMAP3430ES2_ST_DSS_STDBY_SHIFT,
                },
        },
        .opt_clks       = dss_opt_clks,
@@ -642,8 +598,6 @@ static struct omap_hwmod omap3xxx_dss_dispc_hwmod = {
        .main_clk       = "dss1_alwon_fck",
        .prcm           = {
                .omap2 = {
-                       .prcm_reg_id = 1,
-                       .module_bit = OMAP3430_EN_DSS1_SHIFT,
                        .module_offs = OMAP3430_DSS_MOD,
                },
        },
@@ -683,8 +637,6 @@ static struct omap_hwmod omap3xxx_dss_dsi1_hwmod = {
        .main_clk       = "dss1_alwon_fck",
        .prcm           = {
                .omap2 = {
-                       .prcm_reg_id = 1,
-                       .module_bit = OMAP3430_EN_DSS1_SHIFT,
                        .module_offs = OMAP3430_DSS_MOD,
                },
        },
@@ -703,8 +655,6 @@ static struct omap_hwmod omap3xxx_dss_rfbi_hwmod = {
        .main_clk       = "dss1_alwon_fck",
        .prcm           = {
                .omap2 = {
-                       .prcm_reg_id = 1,
-                       .module_bit = OMAP3430_EN_DSS1_SHIFT,
                        .module_offs = OMAP3430_DSS_MOD,
                },
        },
@@ -724,8 +674,6 @@ static struct omap_hwmod omap3xxx_dss_venc_hwmod = {
        .main_clk       = "dss_tv_fck",
        .prcm           = {
                .omap2 = {
-                       .prcm_reg_id = 1,
-                       .module_bit = OMAP3430_EN_DSS1_SHIFT,
                        .module_offs = OMAP3430_DSS_MOD,
                },
        },
@@ -747,8 +695,6 @@ static struct omap_hwmod omap3xxx_i2c1_hwmod = {
        .prcm           = {
                .omap2 = {
                        .module_offs = CORE_MOD,
-                       .prcm_reg_id = 1,
-                       .module_bit = OMAP3430_EN_I2C1_SHIFT,
                        .idlest_reg_id = 1,
                        .idlest_idle_bit = OMAP3430_ST_I2C1_SHIFT,
                },
@@ -770,8 +716,6 @@ static struct omap_hwmod omap3xxx_i2c2_hwmod = {
        .prcm           = {
                .omap2 = {
                        .module_offs = CORE_MOD,
-                       .prcm_reg_id = 1,
-                       .module_bit = OMAP3430_EN_I2C2_SHIFT,
                        .idlest_reg_id = 1,
                        .idlest_idle_bit = OMAP3430_ST_I2C2_SHIFT,
                },
@@ -795,8 +739,6 @@ static struct omap_hwmod omap3xxx_i2c3_hwmod = {
        .prcm           = {
                .omap2 = {
                        .module_offs = CORE_MOD,
-                       .prcm_reg_id = 1,
-                       .module_bit = OMAP3430_EN_I2C3_SHIFT,
                        .idlest_reg_id = 1,
                        .idlest_idle_bit = OMAP3430_ST_I2C3_SHIFT,
                },
@@ -846,8 +788,6 @@ static struct omap_hwmod omap3xxx_gpio1_hwmod = {
        .opt_clks_cnt   = ARRAY_SIZE(gpio1_opt_clks),
        .prcm           = {
                .omap2 = {
-                       .prcm_reg_id = 1,
-                       .module_bit = OMAP3430_EN_GPIO1_SHIFT,
                        .module_offs = WKUP_MOD,
                        .idlest_reg_id = 1,
                        .idlest_idle_bit = OMAP3430_ST_GPIO1_SHIFT,
@@ -870,8 +810,6 @@ static struct omap_hwmod omap3xxx_gpio2_hwmod = {
        .opt_clks_cnt   = ARRAY_SIZE(gpio2_opt_clks),
        .prcm           = {
                .omap2 = {
-                       .prcm_reg_id = 1,
-                       .module_bit = OMAP3430_EN_GPIO2_SHIFT,
                        .module_offs = OMAP3430_PER_MOD,
                        .idlest_reg_id = 1,
                        .idlest_idle_bit = OMAP3430_ST_GPIO2_SHIFT,
@@ -894,8 +832,6 @@ static struct omap_hwmod omap3xxx_gpio3_hwmod = {
        .opt_clks_cnt   = ARRAY_SIZE(gpio3_opt_clks),
        .prcm           = {
                .omap2 = {
-                       .prcm_reg_id = 1,
-                       .module_bit = OMAP3430_EN_GPIO3_SHIFT,
                        .module_offs = OMAP3430_PER_MOD,
                        .idlest_reg_id = 1,
                        .idlest_idle_bit = OMAP3430_ST_GPIO3_SHIFT,
@@ -918,8 +854,6 @@ static struct omap_hwmod omap3xxx_gpio4_hwmod = {
        .opt_clks_cnt   = ARRAY_SIZE(gpio4_opt_clks),
        .prcm           = {
                .omap2 = {
-                       .prcm_reg_id = 1,
-                       .module_bit = OMAP3430_EN_GPIO4_SHIFT,
                        .module_offs = OMAP3430_PER_MOD,
                        .idlest_reg_id = 1,
                        .idlest_idle_bit = OMAP3430_ST_GPIO4_SHIFT,
@@ -943,8 +877,6 @@ static struct omap_hwmod omap3xxx_gpio5_hwmod = {
        .opt_clks_cnt   = ARRAY_SIZE(gpio5_opt_clks),
        .prcm           = {
                .omap2 = {
-                       .prcm_reg_id = 1,
-                       .module_bit = OMAP3430_EN_GPIO5_SHIFT,
                        .module_offs = OMAP3430_PER_MOD,
                        .idlest_reg_id = 1,
                        .idlest_idle_bit = OMAP3430_ST_GPIO5_SHIFT,
@@ -968,8 +900,6 @@ static struct omap_hwmod omap3xxx_gpio6_hwmod = {
        .opt_clks_cnt   = ARRAY_SIZE(gpio6_opt_clks),
        .prcm           = {
                .omap2 = {
-                       .prcm_reg_id = 1,
-                       .module_bit = OMAP3430_EN_GPIO6_SHIFT,
                        .module_offs = OMAP3430_PER_MOD,
                        .idlest_reg_id = 1,
                        .idlest_idle_bit = OMAP3430_ST_GPIO6_SHIFT,
@@ -1012,8 +942,6 @@ static struct omap_hwmod omap3xxx_dma_system_hwmod = {
        .prcm = {
                .omap2 = {
                        .module_offs            = CORE_MOD,
-                       .prcm_reg_id            = 1,
-                       .module_bit             = OMAP3430_ST_SDMA_SHIFT,
                        .idlest_reg_id          = 1,
                        .idlest_idle_bit        = OMAP3430_ST_SDMA_SHIFT,
                },
@@ -1060,8 +988,6 @@ static struct omap_hwmod omap3xxx_mcbsp1_hwmod = {
        .main_clk       = "mcbsp1_fck",
        .prcm           = {
                .omap2 = {
-                       .prcm_reg_id = 1,
-                       .module_bit = OMAP3430_EN_MCBSP1_SHIFT,
                        .module_offs = CORE_MOD,
                        .idlest_reg_id = 1,
                        .idlest_idle_bit = OMAP3430_ST_MCBSP1_SHIFT,
@@ -1083,8 +1009,6 @@ static struct omap_hwmod omap3xxx_mcbsp2_hwmod = {
        .main_clk       = "mcbsp2_fck",
        .prcm           = {
                .omap2 = {
-                       .prcm_reg_id = 1,
-                       .module_bit = OMAP3430_EN_MCBSP2_SHIFT,
                        .module_offs = OMAP3430_PER_MOD,
                        .idlest_reg_id = 1,
                        .idlest_idle_bit = OMAP3430_ST_MCBSP2_SHIFT,
@@ -1107,8 +1031,6 @@ static struct omap_hwmod omap3xxx_mcbsp3_hwmod = {
        .main_clk       = "mcbsp3_fck",
        .prcm           = {
                .omap2 = {
-                       .prcm_reg_id = 1,
-                       .module_bit = OMAP3430_EN_MCBSP3_SHIFT,
                        .module_offs = OMAP3430_PER_MOD,
                        .idlest_reg_id = 1,
                        .idlest_idle_bit = OMAP3430_ST_MCBSP3_SHIFT,
@@ -1128,8 +1050,6 @@ static struct omap_hwmod omap3xxx_mcbsp4_hwmod = {
        .main_clk       = "mcbsp4_fck",
        .prcm           = {
                .omap2 = {
-                       .prcm_reg_id = 1,
-                       .module_bit = OMAP3430_EN_MCBSP4_SHIFT,
                        .module_offs = OMAP3430_PER_MOD,
                        .idlest_reg_id = 1,
                        .idlest_idle_bit = OMAP3430_ST_MCBSP4_SHIFT,
@@ -1148,8 +1068,6 @@ static struct omap_hwmod omap3xxx_mcbsp5_hwmod = {
        .main_clk       = "mcbsp5_fck",
        .prcm           = {
                .omap2 = {
-                       .prcm_reg_id = 1,
-                       .module_bit = OMAP3430_EN_MCBSP5_SHIFT,
                        .module_offs = CORE_MOD,
                        .idlest_reg_id = 1,
                        .idlest_idle_bit = OMAP3430_ST_MCBSP5_SHIFT,
@@ -1237,8 +1155,6 @@ static struct omap_hwmod omap34xx_sr1_hwmod = {
        .main_clk       = "sr1_fck",
        .prcm           = {
                .omap2 = {
-                       .prcm_reg_id = 1,
-                       .module_bit = OMAP3430_EN_SR1_SHIFT,
                        .module_offs = WKUP_MOD,
                        .idlest_reg_id = 1,
                        .idlest_idle_bit = OMAP3430_EN_SR1_SHIFT,
@@ -1254,8 +1170,6 @@ static struct omap_hwmod omap36xx_sr1_hwmod = {
        .main_clk       = "sr1_fck",
        .prcm           = {
                .omap2 = {
-                       .prcm_reg_id = 1,
-                       .module_bit = OMAP3430_EN_SR1_SHIFT,
                        .module_offs = WKUP_MOD,
                        .idlest_reg_id = 1,
                        .idlest_idle_bit = OMAP3430_EN_SR1_SHIFT,
@@ -1276,8 +1190,6 @@ static struct omap_hwmod omap34xx_sr2_hwmod = {
        .main_clk       = "sr2_fck",
        .prcm           = {
                .omap2 = {
-                       .prcm_reg_id = 1,
-                       .module_bit = OMAP3430_EN_SR2_SHIFT,
                        .module_offs = WKUP_MOD,
                        .idlest_reg_id = 1,
                        .idlest_idle_bit = OMAP3430_EN_SR2_SHIFT,
@@ -1293,8 +1205,6 @@ static struct omap_hwmod omap36xx_sr2_hwmod = {
        .main_clk       = "sr2_fck",
        .prcm           = {
                .omap2 = {
-                       .prcm_reg_id = 1,
-                       .module_bit = OMAP3430_EN_SR2_SHIFT,
                        .module_offs = WKUP_MOD,
                        .idlest_reg_id = 1,
                        .idlest_idle_bit = OMAP3430_EN_SR2_SHIFT,
@@ -1330,8 +1240,6 @@ static struct omap_hwmod omap3xxx_mailbox_hwmod = {
        .main_clk       = "mailboxes_ick",
        .prcm           = {
                .omap2 = {
-                       .prcm_reg_id = 1,
-                       .module_bit = OMAP3430_EN_MAILBOXES_SHIFT,
                        .module_offs = CORE_MOD,
                        .idlest_reg_id = 1,
                        .idlest_idle_bit = OMAP3430_ST_MAILBOXES_SHIFT,
@@ -1373,8 +1281,6 @@ static struct omap_hwmod omap34xx_mcspi1 = {
        .prcm           = {
                .omap2 = {
                        .module_offs = CORE_MOD,
-                       .prcm_reg_id = 1,
-                       .module_bit = OMAP3430_EN_MCSPI1_SHIFT,
                        .idlest_reg_id = 1,
                        .idlest_idle_bit = OMAP3430_ST_MCSPI1_SHIFT,
                },
@@ -1394,8 +1300,6 @@ static struct omap_hwmod omap34xx_mcspi2 = {
        .prcm           = {
                .omap2 = {
                        .module_offs = CORE_MOD,
-                       .prcm_reg_id = 1,
-                       .module_bit = OMAP3430_EN_MCSPI2_SHIFT,
                        .idlest_reg_id = 1,
                        .idlest_idle_bit = OMAP3430_ST_MCSPI2_SHIFT,
                },
@@ -1417,8 +1321,6 @@ static struct omap_hwmod omap34xx_mcspi3 = {
        .prcm           = {
                .omap2 = {
                        .module_offs = CORE_MOD,
-                       .prcm_reg_id = 1,
-                       .module_bit = OMAP3430_EN_MCSPI3_SHIFT,
                        .idlest_reg_id = 1,
                        .idlest_idle_bit = OMAP3430_ST_MCSPI3_SHIFT,
                },
@@ -1440,8 +1342,6 @@ static struct omap_hwmod omap34xx_mcspi4 = {
        .prcm           = {
                .omap2 = {
                        .module_offs = CORE_MOD,
-                       .prcm_reg_id = 1,
-                       .module_bit = OMAP3430_EN_MCSPI4_SHIFT,
                        .idlest_reg_id = 1,
                        .idlest_idle_bit = OMAP3430_ST_MCSPI4_SHIFT,
                },
@@ -1475,12 +1375,9 @@ static struct omap_hwmod omap3xxx_usbhsotg_hwmod = {
        .main_clk       = "hsotgusb_ick",
        .prcm           = {
                .omap2 = {
-                       .prcm_reg_id = 1,
-                       .module_bit = OMAP3430_EN_HSOTGUSB_SHIFT,
                        .module_offs = CORE_MOD,
                        .idlest_reg_id = 1,
                        .idlest_idle_bit = OMAP3430ES2_ST_HSOTGUSB_IDLE_SHIFT,
-                       .idlest_stdby_bit = OMAP3430ES2_ST_HSOTGUSB_STDBY_SHIFT,
                },
        },
        .class          = &usbotg_class,
@@ -1555,8 +1452,6 @@ static struct omap_hwmod omap3xxx_pre_es3_mmc1_hwmod = {
        .prcm           = {
                .omap2 = {
                        .module_offs = CORE_MOD,
-                       .prcm_reg_id = 1,
-                       .module_bit = OMAP3430_EN_MMC1_SHIFT,
                        .idlest_reg_id = 1,
                        .idlest_idle_bit = OMAP3430_ST_MMC1_SHIFT,
                },
@@ -1573,8 +1468,6 @@ static struct omap_hwmod omap3xxx_es3plus_mmc1_hwmod = {
        .prcm           = {
                .omap2 = {
                        .module_offs = CORE_MOD,
-                       .prcm_reg_id = 1,
-                       .module_bit = OMAP3430_EN_MMC1_SHIFT,
                        .idlest_reg_id = 1,
                        .idlest_idle_bit = OMAP3430_ST_MMC1_SHIFT,
                },
@@ -1604,8 +1497,6 @@ static struct omap_hwmod omap3xxx_pre_es3_mmc2_hwmod = {
        .prcm           = {
                .omap2 = {
                        .module_offs = CORE_MOD,
-                       .prcm_reg_id = 1,
-                       .module_bit = OMAP3430_EN_MMC2_SHIFT,
                        .idlest_reg_id = 1,
                        .idlest_idle_bit = OMAP3430_ST_MMC2_SHIFT,
                },
@@ -1622,8 +1513,6 @@ static struct omap_hwmod omap3xxx_es3plus_mmc2_hwmod = {
        .prcm           = {
                .omap2 = {
                        .module_offs = CORE_MOD,
-                       .prcm_reg_id = 1,
-                       .module_bit = OMAP3430_EN_MMC2_SHIFT,
                        .idlest_reg_id = 1,
                        .idlest_idle_bit = OMAP3430_ST_MMC2_SHIFT,
                },
@@ -1647,8 +1536,6 @@ static struct omap_hwmod omap3xxx_mmc3_hwmod = {
        .prcm           = {
                .omap2 = {
                        .module_offs = CORE_MOD,
-                       .prcm_reg_id = 1,
-                       .module_bit = OMAP3430_EN_MMC3_SHIFT,
                        .idlest_reg_id = 1,
                        .idlest_idle_bit = OMAP3430_ST_MMC3_SHIFT,
                },
@@ -1688,11 +1575,8 @@ static struct omap_hwmod omap3xxx_usb_host_hs_hwmod = {
        .prcm = {
                .omap2 = {
                        .module_offs = OMAP3430ES2_USBHOST_MOD,
-                       .prcm_reg_id = 1,
-                       .module_bit = OMAP3430ES2_EN_USBHOST1_SHIFT,
                        .idlest_reg_id = 1,
                        .idlest_idle_bit = OMAP3430ES2_ST_USBHOST_IDLE_SHIFT,
-                       .idlest_stdby_bit = OMAP3430ES2_ST_USBHOST_STDBY_SHIFT,
                },
        },
 
@@ -1766,8 +1650,6 @@ static struct omap_hwmod omap3xxx_usb_tll_hs_hwmod = {
        .prcm = {
                .omap2 = {
                        .module_offs = CORE_MOD,
-                       .prcm_reg_id = 3,
-                       .module_bit = OMAP3430ES2_EN_USBTLL_SHIFT,
                        .idlest_reg_id = 3,
                        .idlest_idle_bit = OMAP3430ES2_ST_USBTLL_SHIFT,
                },
@@ -1780,8 +1662,6 @@ static struct omap_hwmod omap3xxx_hdq1w_hwmod = {
        .prcm           = {
                .omap2 = {
                        .module_offs = CORE_MOD,
-                       .prcm_reg_id = 1,
-                       .module_bit = OMAP3430_EN_HDQ_SHIFT,
                        .idlest_reg_id = 1,
                        .idlest_idle_bit = OMAP3430_ST_HDQ_SHIFT,
                },
@@ -1807,8 +1687,6 @@ static struct omap_hwmod omap3xxx_sad2d_hwmod = {
        .prcm           = {
                .omap2 = {
                        .module_offs = CORE_MOD,
-                       .prcm_reg_id = 1,
-                       .module_bit = OMAP3430_EN_SAD2D_SHIFT,
                        .idlest_reg_id = 1,
                        .idlest_idle_bit = OMAP3430_ST_SAD2D_SHIFT,
                },
@@ -1842,8 +1720,6 @@ static struct omap_hwmod omap3xxx_counter_32k_hwmod = {
        .prcm           = {
                .omap2  = {
                        .module_offs = WKUP_MOD,
-                       .prcm_reg_id = 1,
-                       .module_bit = OMAP3430_ST_32KSYNC_SHIFT,
                        .idlest_reg_id = 1,
                        .idlest_idle_bit = OMAP3430_ST_32KSYNC_SHIFT,
                },
@@ -2454,7 +2330,6 @@ static struct omap_hwmod omap3xxx_mmu_iva_hwmod = {
        .prcm = {
                .omap2 = {
                        .module_offs = OMAP3430_IVA2_MOD,
-                       .module_bit = OMAP3430_CM_FCLKEN_IVA2_EN_IVA2_SHIFT,
                        .idlest_reg_id = 1,
                        .idlest_idle_bit = OMAP3430_ST_IVA2_SHIFT,
                },
@@ -2760,8 +2635,6 @@ static struct omap_hwmod omap3xxx_sham_hwmod = {
        .prcm           = {
                .omap2 = {
                        .module_offs = CORE_MOD,
-                       .prcm_reg_id = 1,
-                       .module_bit = OMAP3430_EN_SHA12_SHIFT,
                        .idlest_reg_id = 1,
                        .idlest_idle_bit = OMAP3430_ST_SHA12_SHIFT,
                },
@@ -2806,8 +2679,6 @@ static struct omap_hwmod omap3xxx_aes_hwmod = {
        .prcm           = {
                .omap2 = {
                        .module_offs = CORE_MOD,
-                       .prcm_reg_id = 1,
-                       .module_bit = OMAP3430_EN_AES2_SHIFT,
                        .idlest_reg_id = 1,
                        .idlest_idle_bit = OMAP3430_ST_AES2_SHIFT,
                },
@@ -2850,8 +2721,6 @@ static struct omap_hwmod omap3xxx_ssi_hwmod = {
        .main_clk       = "ssi_ssr_fck",
        .prcm           = {
                .omap2 = {
-                       .prcm_reg_id            = 1,
-                       .module_bit             = OMAP3430_EN_SSI_SHIFT,
                        .module_offs            = CORE_MOD,
                        .idlest_reg_id          = 1,
                        .idlest_idle_bit        = OMAP3430ES2_ST_SSI_IDLE_SHIFT,
index d05e553d63463f7d34d306816610708eb0b889a1..f33afcaec77e18a3262d69557f42782c72576353 100644 (file)
@@ -4019,6 +4019,10 @@ static struct omap_hwmod_ocp_if *dra76x_hwmod_ocp_ifs[] __initdata = {
        NULL,
 };
 
+static struct omap_hwmod_ocp_if *acd_76x_hwmod_ocp_ifs[] __initdata = {
+       NULL,
+};
+
 static struct omap_hwmod_ocp_if *dra74x_hwmod_ocp_ifs[] __initdata = {
        &dra7xx_l4_per3__usb_otg_ss4,
        NULL,
@@ -4028,7 +4032,7 @@ static struct omap_hwmod_ocp_if *dra72x_hwmod_ocp_ifs[] __initdata = {
        NULL,
 };
 
-static struct omap_hwmod_ocp_if *dra74x_dra72x_hwmod_ocp_ifs[] __initdata = {
+static struct omap_hwmod_ocp_if *rtc_hwmod_ocp_ifs[] __initdata = {
        &dra7xx_l4_per3__rtcss,
        NULL,
 };
@@ -4040,19 +4044,26 @@ int __init dra7xx_hwmod_init(void)
        omap_hwmod_init();
        ret = omap_hwmod_register_links(dra7xx_hwmod_ocp_ifs);
 
-       if (!ret && soc_is_dra74x())
+       if (!ret && soc_is_dra74x()) {
                ret = omap_hwmod_register_links(dra74x_hwmod_ocp_ifs);
-       else if (!ret && soc_is_dra72x())
+               if (!ret)
+                       ret = omap_hwmod_register_links(rtc_hwmod_ocp_ifs);
+       } else if (!ret && soc_is_dra72x()) {
                ret = omap_hwmod_register_links(dra72x_hwmod_ocp_ifs);
-       else if (!ret && soc_is_dra76x())
+               if (!ret && !of_machine_is_compatible("ti,dra718"))
+                       ret = omap_hwmod_register_links(rtc_hwmod_ocp_ifs);
+       } else if (!ret && soc_is_dra76x()) {
                ret = omap_hwmod_register_links(dra76x_hwmod_ocp_ifs);
 
+               if (!ret && soc_is_dra76x_acd()) {
+                       ret = omap_hwmod_register_links(acd_76x_hwmod_ocp_ifs);
+               } else if (!ret && soc_is_dra76x_abz()) {
+                       ret = omap_hwmod_register_links(rtc_hwmod_ocp_ifs);
+               }
+       }
+
        if (!ret && omap_type() == OMAP2_DEVICE_TYPE_GP)
                ret = omap_hwmod_register_links(dra7xx_gp_hwmod_ocp_ifs);
 
-       /* now for the IPs available only in dra74 and dra72 */
-       if (!ret && !of_machine_is_compatible("ti,dra718") && !soc_is_dra76x())
-               ret = omap_hwmod_register_links(dra74x_dra72x_hwmod_ocp_ifs);
-
        return ret;
 }
index 28fa1f8d8363194c8b453904c90eb7b9595f47a3..050891e055a4141171aa5c112310863485e8c381 100644 (file)
@@ -143,6 +143,14 @@ static inline int is_dra ##subclass (void)         \
        return (GET_OMAP_SUBCLASS == (id)) ? 1 : 0;     \
 }
 
+#define GET_DRA_PACKAGE                (omap_rev() & 0xff)
+
+#define IS_DRA_SUBCLASS_PACKAGE(subclass, package, id)                 \
+static inline int is_dra ##subclass ##_ ##package (void)               \
+{                                                                      \
+       return (is_dra ##subclass () && GET_DRA_PACKAGE == id) ? 1 : 0; \
+}
+
 IS_OMAP_CLASS(24xx, 0x24)
 IS_OMAP_CLASS(34xx, 0x34)
 IS_OMAP_CLASS(44xx, 0x44)
@@ -168,6 +176,8 @@ IS_TI_SUBCLASS(814x, 0x814)
 IS_AM_SUBCLASS(335x, 0x335)
 IS_AM_SUBCLASS(437x, 0x437)
 IS_DRA_SUBCLASS(76x, 0x76)
+IS_DRA_SUBCLASS_PACKAGE(76x, abz, 2)
+IS_DRA_SUBCLASS_PACKAGE(76x, acd, 3)
 IS_DRA_SUBCLASS(75x, 0x75)
 IS_DRA_SUBCLASS(72x, 0x72)
 
@@ -317,10 +327,14 @@ IS_OMAP_TYPE(3430, 0x3430)
 #if defined(CONFIG_SOC_DRA7XX)
 #undef soc_is_dra7xx
 #undef soc_is_dra76x
+#undef soc_is_dra76x_abz
+#undef soc_is_dra76x_acd
 #undef soc_is_dra74x
 #undef soc_is_dra72x
 #define soc_is_dra7xx()        is_dra7xx()
 #define soc_is_dra76x()        is_dra76x()
+#define soc_is_dra76x_abz()    is_dra76x_abz()
+#define soc_is_dra76x_acd()    is_dra76x_acd()
 #define soc_is_dra74x()        is_dra75x()
 #define soc_is_dra72x()        is_dra72x()
 #endif
@@ -391,6 +405,8 @@ IS_OMAP_TYPE(3430, 0x3430)
 
 #define DRA7XX_CLASS           0x07000000
 #define DRA762_REV_ES1_0       (DRA7XX_CLASS | (0x62 << 16) | (0x10 << 8))
+#define DRA762_ABZ_REV_ES1_0   (DRA762_REV_ES1_0 | (2 << 0))
+#define DRA762_ACD_REV_ES1_0   (DRA762_REV_ES1_0 | (3 << 0))
 #define DRA752_REV_ES1_0       (DRA7XX_CLASS | (0x52 << 16) | (0x10 << 8))
 #define DRA752_REV_ES1_1       (DRA7XX_CLASS | (0x52 << 16) | (0x11 << 8))
 #define DRA752_REV_ES2_0       (DRA7XX_CLASS | (0x52 << 16) | (0x20 << 8))
index ce7d97babb0f9428803df53cae836e437ed08118..a68b341831070873977e1be0fdce6bc981bb31ac 100644 (file)
@@ -40,6 +40,7 @@ config MACH_PXA3XX_DT
 
 config ARCH_LUBBOCK
        bool "Intel DBPXA250 Development Platform (aka Lubbock)"
+       select GPIO_REG
        select PXA25x
        select SA1111
 
index d6d92f388f1455e5e556333ee033b1bc7389b2a4..f4f8f23bda8cc84c4f482ee760a11ed06ec4e14f 100644 (file)
@@ -28,7 +28,7 @@
 #include <linux/mtd/partitions.h>
 #include <linux/types.h>
 #include <linux/platform_data/pcf857x.h>
-#include <linux/i2c/pxa-i2c.h>
+#include <linux/platform_data/i2c-pxa.h>
 #include <linux/mtd/rawnand.h>
 #include <linux/mtd/physmap.h>
 #include <linux/regulator/max1586.h>
index 868448d2cd8251620af75775dabfe8eb26e60c5d..c487401b6fdb5dbeffa0752ad90a8065921a6762 100644 (file)
@@ -31,7 +31,7 @@
 
 #include <linux/i2c.h>
 #include <linux/platform_data/pca953x.h>
-#include <linux/i2c/pxa-i2c.h>
+#include <linux/platform_data/i2c-pxa.h>
 
 #include <linux/mfd/da903x.h>
 #include <linux/regulator/machine.h>
index dc44fbbe50731765d634f7e11e7f77f846225ec5..10e2278b7a28874d1acf17972075abfd898186b7 100644 (file)
@@ -19,7 +19,7 @@
 #include <mach/hardware.h>
 #include <asm/mach/arch.h>
 #include <linux/i2c.h>
-#include <linux/i2c/pxa-i2c.h>
+#include <linux/platform_data/i2c-pxa.h>
 #include <asm/io.h>
 
 #include "pxa27x.h"
index d7cf47d0361882dfe810ce325d5d433718ea0682..3ccf2a95569bcceeec3afffd262abf7679ae6a4e 100644 (file)
@@ -23,7 +23,7 @@
 #include <linux/platform_device.h>
 #include <linux/pwm.h>
 #include <linux/pwm_backlight.h>
-#include <linux/i2c/pxa-i2c.h>
+#include <linux/platform_data/i2c-pxa.h>
 
 #include <asm/irq.h>
 #include <asm/mach-types.h>
index 7270f0db343216f33cec1189c5fba9f87e0cf472..9a5a35e907690ae708537a7eba93aa3dbfce4cb9 100644 (file)
@@ -26,7 +26,7 @@
 #include <linux/gpio.h>
 #include <linux/backlight.h>
 #include <linux/i2c.h>
-#include <linux/i2c/pxa-i2c.h>
+#include <linux/platform_data/i2c-pxa.h>
 #include <linux/io.h>
 #include <linux/regulator/machine.h>
 #include <linux/spi/spi.h>
@@ -606,24 +606,6 @@ static void __init corgi_init_spi(void)
 static inline void corgi_init_spi(void) {}
 #endif
 
-static struct mtd_partition sharpsl_nand_partitions[] = {
-       {
-               .name = "System Area",
-               .offset = 0,
-               .size = 7 * 1024 * 1024,
-       },
-       {
-               .name = "Root Filesystem",
-               .offset = 7 * 1024 * 1024,
-               .size = 25 * 1024 * 1024,
-       },
-       {
-               .name = "Home Filesystem",
-               .offset = MTDPART_OFS_APPEND,
-               .size = MTDPART_SIZ_FULL,
-       },
-};
-
 static uint8_t scan_ff_pattern[] = { 0xff, 0xff };
 
 static struct nand_bbt_descr sharpsl_bbt = {
@@ -633,10 +615,16 @@ static struct nand_bbt_descr sharpsl_bbt = {
        .pattern = scan_ff_pattern
 };
 
+static const char * const probes[] = {
+       "cmdlinepart",
+       "ofpart",
+       "sharpslpart",
+       NULL,
+};
+
 static struct sharpsl_nand_platform_data sharpsl_nand_platform_data = {
        .badblock_pattern       = &sharpsl_bbt,
-       .partitions             = sharpsl_nand_partitions,
-       .nr_partitions          = ARRAY_SIZE(sharpsl_nand_partitions),
+       .part_parsers           = probes,
 };
 
 static struct resource sharpsl_nand_resources[] = {
@@ -750,9 +738,6 @@ static void __init corgi_init(void)
 
        platform_scoop_config = &corgi_pcmcia_config;
 
-       if (machine_is_husky())
-               sharpsl_nand_partitions[1].size = 53 * 1024 * 1024;
-
        platform_add_devices(devices, ARRAY_SIZE(devices));
 
        regulator_has_full_constraints();
index bf19b8426d2c4308d2e6f917043737f808ff29bc..271aedae754209511f5ea96dea482a4a31c648e5 100644 (file)
@@ -17,7 +17,7 @@
 #include <linux/mtd/partitions.h>
 #include <linux/sm501.h>
 #include <linux/smsc911x.h>
-#include <linux/i2c/pxa-i2c.h>
+#include <linux/platform_data/i2c-pxa.h>
 
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
index 5a72456a19ce248bbcc75622619a653dba67d071..d7c9a8476d5717950f893f2d1e419083e8b7da18 100644 (file)
@@ -5,7 +5,7 @@
 #include <linux/platform_device.h>
 #include <linux/dma-mapping.h>
 #include <linux/spi/pxa2xx_spi.h>
-#include <linux/i2c/pxa-i2c.h>
+#include <linux/platform_data/i2c-pxa.h>
 
 #include "udc.h"
 #include <linux/platform_data/usb-pxa3xx-ulpi.h>
index 905628dfbbbb3178fbf40fe921dc098e020928b2..11263f7c455bae2bbcd192dfcb3e3c444c632c1b 100644 (file)
@@ -56,3 +56,12 @@ extern struct platform_device pxa93x_device_gpio;
 
 void __init pxa_register_device(struct platform_device *dev, void *data);
 void __init pxa2xx_set_dmac_info(int nb_channels, int nb_requestors);
+
+struct i2c_pxa_platform_data;
+extern void pxa_set_i2c_info(struct i2c_pxa_platform_data *info);
+#ifdef CONFIG_PXA27x
+extern void pxa27x_set_i2c_power_info(struct i2c_pxa_platform_data *info);
+#endif
+#ifdef CONFIG_PXA3xx
+extern void pxa3xx_set_i2c_power_info(struct i2c_pxa_platform_data *info);
+#endif
index 6d28035ebba57d060b8f950b778e6c194da87055..49022ad338e911c228962e5ed18af0e378fd4c6e 100644 (file)
@@ -32,7 +32,7 @@
 #include <linux/apm-emulation.h>
 #include <linux/i2c.h>
 #include <linux/platform_data/pca953x.h>
-#include <linux/i2c/pxa-i2c.h>
+#include <linux/platform_data/i2c-pxa.h>
 #include <linux/regulator/userspace-consumer.h>
 
 #include <asm/mach-types.h>
index a057cf9c0e7b32223a589ab0c4a3d90541e2c977..2c90b58f347d9efe9ffcec1c677aecedd75b450a 100644 (file)
@@ -23,7 +23,7 @@
 #include <linux/gpio.h>
 #include <linux/gpio_keys.h>
 #include <linux/leds-lp3944.h>
-#include <linux/i2c/pxa-i2c.h>
+#include <linux/platform_data/i2c-pxa.h>
 
 #include <asm/setup.h>
 #include <asm/mach-types.h>
index 66184f5cbe402c47d26ff5370b6b22967231c6d9..e2e7f247a6456746f6fb3773c4798c512d3b27e4 100644 (file)
@@ -38,7 +38,7 @@
 #include <linux/spi/spi.h>
 #include <linux/spi/pxa2xx_spi.h>
 #include <linux/usb/gpio_vbus.h>
-#include <linux/i2c/pxa-i2c.h>
+#include <linux/platform_data/i2c-pxa.h>
 
 #include <mach/hardware.h>
 #include <asm/mach-types.h>
index fae38fdc8d8e5672caf4298d51b4db6866e95ce1..4105614cc38e40407b075273fb0d6f40e072ef36 100644 (file)
@@ -28,7 +28,7 @@
 #include <linux/leds.h>
 #include <linux/mfd/da903x.h>
 #include <linux/platform_data/max732x.h>
-#include <linux/i2c/pxa-i2c.h>
+#include <linux/platform_data/i2c-pxa.h>
 
 #include <asm/types.h>
 #include <asm/setup.h>
@@ -42,6 +42,7 @@
 #include <asm/mach/irq.h>
 
 #include "pxa300.h"
+#include "devices.h"
 #include <linux/platform_data/video-pxafb.h>
 #include <linux/platform_data/mmc-pxamci.h>
 #include <linux/platform_data/keypad-pxa27x.h>
index df45682e99a54e0b44d4c34cd2632e7b7f78c358..fe2ef9b78602043efd124b9de80cd96e36754daf 100644 (file)
@@ -13,6 +13,7 @@
  */
 #include <linux/clkdev.h>
 #include <linux/gpio.h>
+#include <linux/gpio/gpio-reg.h>
 #include <linux/gpio/machine.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
@@ -110,20 +111,18 @@ static unsigned long lubbock_pin_config[] __initdata = {
 };
 
 #define LUB_HEXLED             __LUB_REG(LUBBOCK_FPGA_PHYS + 0x010)
-#define LUB_MISC_WR            __LUB_REG(LUBBOCK_FPGA_PHYS + 0x080)
 
 void lubbock_set_hexled(uint32_t value)
 {
        LUB_HEXLED = value;
 }
 
+static struct gpio_chip *lubbock_misc_wr_gc;
+
 void lubbock_set_misc_wr(unsigned int mask, unsigned int set)
 {
-       unsigned long flags;
-
-       local_irq_save(flags);
-       LUB_MISC_WR = (LUB_MISC_WR & ~mask) | (set & mask);
-       local_irq_restore(flags);
+       unsigned long m = mask, v = set;
+       lubbock_misc_wr_gc->set_multiple(lubbock_misc_wr_gc, &m, &v);
 }
 EXPORT_SYMBOL(lubbock_set_misc_wr);
 
@@ -452,9 +451,9 @@ static void lubbock_irda_transceiver_mode(struct device *dev, int mode)
 
        local_irq_save(flags);
        if (mode & IR_SIRMODE) {
-               LUB_MISC_WR &= ~(1 << 4);
+               lubbock_set_misc_wr(BIT(4), 0);
        } else if (mode & IR_FIRMODE) {
-               LUB_MISC_WR |= 1 << 4;
+               lubbock_set_misc_wr(BIT(4), BIT(4));
        }
        pxa2xx_transceiver_mode(dev, mode);
        local_irq_restore(flags);
@@ -472,6 +471,15 @@ static void __init lubbock_init(void)
 
        pxa2xx_mfp_config(ARRAY_AND_SIZE(lubbock_pin_config));
 
+       lubbock_misc_wr_gc = gpio_reg_init(NULL, (void *)&LUB_MISC_WR,
+                                          -1, 16, "lubbock", 0, LUB_MISC_WR,
+                                          NULL, NULL, NULL);
+       if (IS_ERR(lubbock_misc_wr_gc)) {
+               pr_err("Lubbock: unable to register lubbock GPIOs: %ld\n",
+                      PTR_ERR(lubbock_misc_wr_gc));
+               lubbock_misc_wr_gc = NULL;
+       }
+
        pxa_set_ffuart_info(NULL);
        pxa_set_btuart_info(NULL);
        pxa_set_stuart_info(NULL);
index 7f3566c9373346557d9dfd8a57be13cec2cbeb22..c5325d1ae77b5015832eb8ff3783061f8246af81 100644 (file)
@@ -31,7 +31,7 @@
 #include <linux/regulator/gpio-regulator.h>
 #include <linux/regulator/machine.h>
 #include <linux/usb/gpio_vbus.h>
-#include <linux/i2c/pxa-i2c.h>
+#include <linux/platform_data/i2c-pxa.h>
 
 #include <mach/hardware.h>
 #include <asm/mach-types.h>
index a2d851a3a546c592fa7191365914b6b08a33de56..afd62a94fdbf2d65d1a009782e9fe267132626ab 100644 (file)
@@ -29,7 +29,7 @@
 #include <linux/pwm.h>
 #include <linux/pwm_backlight.h>
 #include <linux/smc91x.h>
-#include <linux/i2c/pxa-i2c.h>
+#include <linux/platform_data/i2c-pxa.h>
 #include <linux/slab.h>
 #include <linux/leds.h>
 
index 8a5d0491e73c3758b49d507d5f05a28c4b0953e8..9b6c7ea45a4010555f97b83cfa2655a60cd7c672 100644 (file)
@@ -42,7 +42,7 @@
 #include <linux/regulator/fixed.h>
 #include <linux/regulator/max1586.h>
 #include <linux/slab.h>
-#include <linux/i2c/pxa-i2c.h>
+#include <linux/platform_data/i2c-pxa.h>
 
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
index 9a22ae0ad8c9e0f5823714003583bb70a2ef7e62..f9e3d41a4609a19aa9052af8db5ef0bd2d68b9f9 100644 (file)
@@ -22,7 +22,7 @@
 #include <linux/serial_8250.h>
 #include <linux/dm9000.h>
 #include <linux/gpio.h>
-#include <linux/i2c/pxa-i2c.h>
+#include <linux/platform_data/i2c-pxa.h>
 
 #include <linux/platform_data/mtd-nand-pxa3xx.h>
 
index e5ae99db1de4c0c712531b08a5b501735547b621..1efe9bcf07faa1cdc98373468cb201414b584b05 100644 (file)
@@ -22,7 +22,7 @@
 #include <linux/power_supply.h>
 #include <linux/usb/gpio_vbus.h>
 #include <linux/regulator/max1586.h>
-#include <linux/i2c/pxa-i2c.h>
+#include <linux/platform_data/i2c-pxa.h>
 
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
index 0bd5959ef7d55bddc64d18c998dbdac11f7d4303..973568d4b9ec2d70788083750862df16e2a9e230 100644 (file)
@@ -23,7 +23,7 @@
 #include <linux/irq.h>
 #include <linux/platform_device.h>
 #include <linux/i2c.h>
-#include <linux/i2c/pxa-i2c.h>
+#include <linux/platform_data/i2c-pxa.h>
 #include <linux/pwm.h>
 #include <linux/pwm_backlight.h>
 
index 62a119137be7d38ccecc03fcb88325bbf3a31533..1adde1251e2b5bd4b91e8585ff7d8fd2a101ff41 100644 (file)
@@ -24,7 +24,7 @@
 #include <linux/mtd/physmap.h>
 #include <linux/gpio.h>
 #include <linux/i2c.h>
-#include <linux/i2c/pxa-i2c.h>
+#include <linux/platform_data/i2c-pxa.h>
 #include <linux/regulator/machine.h>
 #include <linux/spi/spi.h>
 #include <linux/spi/ads7846.h>
@@ -333,24 +333,6 @@ static struct pxafb_mach_info poodle_fb_info = {
        .lcd_conn       = LCD_COLOR_TFT_16BPP,
 };
 
-static struct mtd_partition sharpsl_nand_partitions[] = {
-       {
-               .name = "System Area",
-               .offset = 0,
-               .size = 7 * 1024 * 1024,
-       },
-       {
-               .name = "Root Filesystem",
-               .offset = 7 * 1024 * 1024,
-               .size = 22 * 1024 * 1024,
-       },
-       {
-               .name = "Home Filesystem",
-               .offset = MTDPART_OFS_APPEND,
-               .size = MTDPART_SIZ_FULL,
-       },
-};
-
 static uint8_t scan_ff_pattern[] = { 0xff, 0xff };
 
 static struct nand_bbt_descr sharpsl_bbt = {
@@ -360,10 +342,16 @@ static struct nand_bbt_descr sharpsl_bbt = {
        .pattern = scan_ff_pattern
 };
 
+static const char * const probes[] = {
+       "cmdlinepart",
+       "ofpart",
+       "sharpslpart",
+       NULL,
+};
+
 static struct sharpsl_nand_platform_data sharpsl_nand_platform_data = {
        .badblock_pattern       = &sharpsl_bbt,
-       .partitions             = sharpsl_nand_partitions,
-       .nr_partitions          = ARRAY_SIZE(sharpsl_nand_partitions),
+       .part_parsers           = probes,
 };
 
 static struct resource sharpsl_nand_resources[] = {
index 9b69be4e9fe33156837fb7d520476d47cd1e23d1..0c06f383ad52afa0ac977b48944cedd9c996c942 100644 (file)
@@ -22,7 +22,7 @@
 #include <linux/syscore_ops.h>
 #include <linux/io.h>
 #include <linux/irq.h>
-#include <linux/i2c/pxa-i2c.h>
+#include <linux/platform_data/i2c-pxa.h>
 
 #include <asm/mach/map.h>
 #include <mach/hardware.h>
index 0cc9f124c9ac3769c73d52973a34c959eb56ad0a..4b8a0df8ea5785bcbe59d02ba3583c50faf0b137 100644 (file)
@@ -23,7 +23,7 @@
 #include <linux/io.h>
 #include <linux/of.h>
 #include <linux/syscore_ops.h>
-#include <linux/i2c/pxa-i2c.h>
+#include <linux/platform_data/i2c-pxa.h>
 
 #include <asm/mach/map.h>
 #include <asm/suspend.h>
index feddca7f3540e4b41e9075425dd2cfe5f0e335f3..4d5d05cf87d69b513b337632ed6c3127a5ead6cf 100644 (file)
@@ -32,7 +32,7 @@
 #include <linux/pwm.h>
 #include <linux/pwm_backlight.h>
 #include <linux/i2c.h>
-#include <linux/i2c/pxa-i2c.h>
+#include <linux/platform_data/i2c-pxa.h>
 #include <linux/spi/spi.h>
 #include <linux/spi/spi_gpio.h>
 #include <linux/lis3lv02d.h>
index 1414b5f291149c3e25c2d8821291313709112017..834991034f3039ea22294e19a4cd801ab14be193 100644 (file)
@@ -20,7 +20,7 @@
 #include <linux/delay.h>
 #include <linux/fb.h>
 #include <linux/i2c.h>
-#include <linux/i2c/pxa-i2c.h>
+#include <linux/platform_data/i2c-pxa.h>
 #include <linux/smc91x.h>
 #include <linux/mfd/da903x.h>
 #include <linux/mtd/mtd.h>
index 67d66c70257452804ba520ab1a9de46f46bb291e..5d50025492b7f2a435f1fc3cc60e88a4e015f49f 100644 (file)
@@ -20,7 +20,7 @@
 #include <linux/gpio.h>
 #include <linux/leds.h>
 #include <linux/i2c.h>
-#include <linux/i2c/pxa-i2c.h>
+#include <linux/platform_data/i2c-pxa.h>
 #include <linux/platform_data/pca953x.h>
 #include <linux/spi/spi.h>
 #include <linux/spi/ads7846.h>
@@ -739,21 +739,6 @@ static inline void spitz_lcd_init(void) {}
  * NAND Flash
  ******************************************************************************/
 #if defined(CONFIG_MTD_NAND_SHARPSL) || defined(CONFIG_MTD_NAND_SHARPSL_MODULE)
-static struct mtd_partition spitz_nand_partitions[] = {
-       {
-               .name = "System Area",
-               .offset = 0,
-               .size = 7 * 1024 * 1024,
-       }, {
-               .name = "Root Filesystem",
-               .offset = 7 * 1024 * 1024,
-       }, {
-               .name = "Home Filesystem",
-               .offset = MTDPART_OFS_APPEND,
-               .size = MTDPART_SIZ_FULL,
-       },
-};
-
 static uint8_t scan_ff_pattern[] = { 0xff, 0xff };
 
 static struct nand_bbt_descr spitz_nand_bbt = {
@@ -808,10 +793,16 @@ static const struct mtd_ooblayout_ops akita_ooblayout_ops = {
        .free = akita_ooblayout_free,
 };
 
+static const char * const probes[] = {
+       "cmdlinepart",
+       "ofpart",
+       "sharpslpart",
+       NULL,
+};
+
 static struct sharpsl_nand_platform_data spitz_nand_pdata = {
        .badblock_pattern       = &spitz_nand_bbt,
-       .partitions             = spitz_nand_partitions,
-       .nr_partitions          = ARRAY_SIZE(spitz_nand_partitions),
+       .part_parsers           = probes,
 };
 
 static struct resource spitz_nand_resources[] = {
@@ -834,14 +825,7 @@ static struct platform_device spitz_nand_device = {
 
 static void __init spitz_nand_init(void)
 {
-       if (machine_is_spitz()) {
-               spitz_nand_partitions[1].size = 5 * 1024 * 1024;
-       } else if (machine_is_akita()) {
-               spitz_nand_partitions[1].size = 58 * 1024 * 1024;
-               spitz_nand_bbt.len = 1;
-               spitz_nand_pdata.ecc_layout = &akita_ooblayout_ops;
-       } else if (machine_is_borzoi()) {
-               spitz_nand_partitions[1].size = 32 * 1024 * 1024;
+       if (machine_is_akita() || machine_is_borzoi()) {
                spitz_nand_bbt.len = 1;
                spitz_nand_pdata.ecc_layout = &akita_ooblayout_ops;
        }
index 6b7df6fd2448676e4814d7a93aeda8caa7301fbe..df62bb23dbeead237320cc4cbf54093d1a25205d 100644 (file)
@@ -25,7 +25,7 @@
 #include <linux/mtd/plat-ram.h>
 #include <linux/mtd/partitions.h>
 
-#include <linux/i2c/pxa-i2c.h>
+#include <linux/platform_data/i2c-pxa.h>
 #include <linux/platform_data/pcf857x.h>
 #include <linux/platform_data/at24.h>
 #include <linux/smc91x.h>
index 107f37210fb9de3de9bf37e6618f979195e5bce9..83606087edc7152e43ca743f205c25404c01544d 100644 (file)
@@ -132,3 +132,7 @@ static struct platform_driver tosa_bt_driver = {
        },
 };
 module_platform_driver(tosa_bt_driver);
+
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Dmitry Baryshkov");
+MODULE_DESCRIPTION("Bluetooth built-in chip control");
index 6a386fd6363ea7e03b83216443dd1dcb40554df0..cb5cd8e78c9400ced4b775e5fbb3b4fa81966315 100644 (file)
@@ -35,7 +35,7 @@
 #include <linux/spi/spi.h>
 #include <linux/spi/pxa2xx_spi.h>
 #include <linux/input/matrix_keypad.h>
-#include <linux/i2c/pxa-i2c.h>
+#include <linux/platform_data/i2c-pxa.h>
 #include <linux/usb/gpio_vbus.h>
 #include <linux/reboot.h>
 #include <linux/memblock.h>
@@ -673,24 +673,6 @@ static int tosa_tc6393xb_suspend(struct platform_device *dev)
        return 0;
 }
 
-static struct mtd_partition tosa_nand_partition[] = {
-       {
-               .name   = "smf",
-               .offset = 0,
-               .size   = 7 * 1024 * 1024,
-       },
-       {
-               .name   = "root",
-               .offset = MTDPART_OFS_APPEND,
-               .size   = 28 * 1024 * 1024,
-       },
-       {
-               .name   = "home",
-               .offset = MTDPART_OFS_APPEND,
-               .size   = MTDPART_SIZ_FULL,
-       },
-};
-
 static uint8_t scan_ff_pattern[] = { 0xff, 0xff };
 
 static struct nand_bbt_descr tosa_tc6393xb_nand_bbt = {
@@ -700,10 +682,16 @@ static struct nand_bbt_descr tosa_tc6393xb_nand_bbt = {
        .pattern        = scan_ff_pattern
 };
 
+static const char * const probes[] = {
+       "cmdlinepart",
+       "ofpart",
+       "sharpslpart",
+       NULL,
+};
+
 static struct tmio_nand_data tosa_tc6393xb_nand_config = {
-       .num_partitions = ARRAY_SIZE(tosa_nand_partition),
-       .partition      = tosa_nand_partition,
        .badblock_pattern = &tosa_tc6393xb_nand_bbt,
+       .part_parsers = probes,
 };
 
 static int tosa_tc6393xb_setup(struct platform_device *dev)
index 3dd13b44c311534dfae7338fbff5ee6f037d374a..55b8c501b6fc09567771842dd3f01d2c66b08588 100644 (file)
@@ -28,7 +28,7 @@
 #include <linux/mtd/physmap.h>
 #include <linux/mtd/partitions.h>
 #include <linux/regulator/machine.h>
-#include <linux/i2c/pxa-i2c.h>
+#include <linux/platform_data/i2c-pxa.h>
 
 #include <asm/types.h>
 #include <asm/setup.h>
index 4185e7ff073fd478d8fdd123d7f9519522db9ab8..90d0f277de55a6606fda445e66744085bd93ec16 100644 (file)
@@ -37,7 +37,7 @@
 #include <linux/jiffies.h>
 #include <linux/i2c-gpio.h>
 #include <linux/gpio/machine.h>
-#include <linux/i2c/pxa-i2c.h>
+#include <linux/platform_data/i2c-pxa.h>
 #include <linux/serial_8250.h>
 #include <linux/smc91x.h>
 #include <linux/pwm.h>
index 70ab3ad282379026b58943ca8d903d5ab949ee5a..f65dfb6e20e2d0f3e9c1e50f49c6fe2b36a61805 100644 (file)
@@ -27,7 +27,7 @@
 #include <linux/ata_platform.h>
 #include <linux/regulator/machine.h>
 #include <linux/regulator/max1586.h>
-#include <linux/i2c/pxa-i2c.h>
+#include <linux/platform_data/i2c-pxa.h>
 
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
index 056369ef250e8a4447b592efbd0775b0b7b3710f..c368c98584c008407a4447e3a0f9cbede33883fe 100644 (file)
@@ -16,7 +16,7 @@
 
 #include <linux/platform_device.h>
 #include <linux/i2c.h>
-#include <linux/i2c/pxa-i2c.h>
+#include <linux/platform_data/i2c-pxa.h>
 #include <linux/smc91x.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/partitions.h>
@@ -32,6 +32,7 @@
 #include <mach/smemc.h>
 
 #include "generic.h"
+#include "devices.h"
 
 #define XCEP_ETH_PHYS          (PXA_CS3_PHYS + 0x00000300)
 #define XCEP_ETH_PHYS_END      (PXA_CS3_PHYS + 0x000fffff)
index 510e533871f3ca242c2251803f03d1a80a6ee74b..6fffcfc4621e1ac7c78f42640ca735ae7a9d196d 100644 (file)
@@ -30,7 +30,7 @@
 #include <linux/gpio_keys.h>
 #include <linux/delay.h>
 #include <linux/regulator/machine.h>
-#include <linux/i2c/pxa-i2c.h>
+#include <linux/platform_data/i2c-pxa.h>
 
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
index ecbcaee5a2d5f8980c6946853cd638da78fd6838..e3851795d6d7d5127679093f8f318f39ee976234 100644 (file)
@@ -26,7 +26,7 @@
 #include <linux/mtd/partitions.h>
 #include <linux/mtd/physmap.h>
 #include <linux/i2c.h>
-#include <linux/i2c/pxa-i2c.h>
+#include <linux/platform_data/i2c-pxa.h>
 #include <linux/platform_data/pca953x.h>
 #include <linux/apm-emulation.h>
 #include <linux/can/platform/mcp251x.h>
@@ -40,6 +40,7 @@
 #include <asm/mach/map.h>
 
 #include "pxa27x.h"
+#include "devices.h"
 #include <mach/regs-uart.h>
 #include <linux/platform_data/usb-ohci-pxa27x.h>
 #include <linux/platform_data/mmc-pxamci.h>
index e247acf1400a9059eb68ebf4e67778ca453acccb..0ff4e218080f18f13582193f5e03a811260194eb 100644 (file)
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/i2c.h>
-#include <linux/i2c/pxa-i2c.h>
+#include <linux/platform_data/i2c-pxa.h>
 #include <linux/platform_data/pca953x.h>
 #include <linux/gpio.h>
 
 #include "pxa300.h"
+#include "devices.h"
 #include "zylonite.h"
 
 #include "generic.h"
index b198be7d32b67595805f4ec832eac98bef8377a7..686f0bbde99886a651ee4ce3bc730e3112726af1 100644 (file)
@@ -1,11 +1,9 @@
-# arch/arm/mach-s3c24xx/Kconfig
+# SPDX-License-Identifier: GPL-2.0
 #
 # Copyright (c) 2012 Samsung Electronics Co., Ltd.
 #              http://www.samsung.com/
 #
 # Copyright 2007 Simtec Electronics
-#
-# Licensed under GPLv2
 
 if ARCH_S3C24XX
 
index 8ac2f58a3480db0886562c73e0af0958dbb6644e..6692f2de71b20b6c326a72352285dafd0e59e78f 100644 (file)
@@ -1,11 +1,9 @@
-# arch/arm/mach-s3c24xx/Makefile
+# SPDX-License-Identifier: GPL-2.0
 #
 # Copyright (c) 2012 Samsung Electronics Co., Ltd.
 #              http://www.samsung.com/
 #
 # Copyright 2007 Simtec Electronics
-#
-# Licensed under GPLv2
 
 # core
 
index 4457605ba04a1dbbe0aeedbd90ba6499f0945f1c..7f19e226035e7da6f46d746a03b47c429835ae22 100644 (file)
@@ -1,3 +1,5 @@
+# SPDX-License-Identifier: GPL-2.0
+
 ifeq ($(CONFIG_PM_H1940),y)
        zreladdr-y      += 0x30108000
        params_phys-y   := 0x30100100
index 2691665f27d949b22ef02f68a61d2ccff412f3b5..13847292e6c7ae7f05a595c8ec0c1f8ba55e07d0 100644 (file)
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Copyright (c) 2005 Simtec Electronics
  *     http://www.simtec.co.uk/products/
@@ -6,11 +7,7 @@
  * ANUBIS - CPLD control constants
  * ANUBIS - IRQ Number definitions
  * ANUBIS - Memory map definitions
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
-*/
+ */
 
 #ifndef __MACH_S3C24XX_ANUBIS_H
 #define __MACH_S3C24XX_ANUBIS_H __FILE__
index 3f0288f2f5421e701094e48820a4894ed28029b4..067944398f4616cc0a503de2d053e935936aefe3 100644 (file)
@@ -1,14 +1,9 @@
-/* linux/arch/arm/mach-s3c2410/bast-ide.c
- *
- * Copyright 2007 Simtec Electronics
- *     http://www.simtec.co.uk/products/EB2410ITX/
- *     http://armlinux.simtec.co.uk/
- *     Ben Dooks <ben@simtec.co.uk>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
-*/
+// SPDX-License-Identifier: GPL-2.0
+//
+// Copyright 2007 Simtec Electronics
+//     http://www.simtec.co.uk/products/EB2410ITX/
+//     http://armlinux.simtec.co.uk/
+//     Ben Dooks <ben@simtec.co.uk>
 
 #include <linux/kernel.h>
 #include <linux/types.h>
index ad8f4cd7c3279273f1d4eac333859540a7caeffc..03728058d58ded7e04a011121e553d4fd88345d8 100644 (file)
@@ -1,25 +1,9 @@
-/* linux/arch/arm/mach-s3c2410/bast-irq.c
- *
- * Copyright 2003-2005 Simtec Electronics
- *   Ben Dooks <ben@simtec.co.uk>
- *
- * http://www.simtec.co.uk/products/EB2410ITX/
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-*/
-
+// SPDX-License-Identifier: GPL-2.0+
+//
+// Copyright 2003-2005 Simtec Electronics
+//   Ben Dooks <ben@simtec.co.uk>
+//
+// http://www.simtec.co.uk/products/EB2410ITX/
 
 #include <linux/init.h>
 #include <linux/module.h>
index 5c7534bae92d3a4f362d82ba3f9fc6b73773fe3c..a7726f93f5eb8762393a5d493adcc146f2641dc2 100644 (file)
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Copyright (c) 2003-2004 Simtec Electronics
  *     Ben Dooks <ben@simtec.co.uk>
@@ -5,11 +6,7 @@
  * BAST - CPLD control constants
  * BAST - IRQ Number definitions
  * BAST - Memory map definitions
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
-*/
+ */
 
 #ifndef __MACH_S3C24XX_BAST_H
 #define __MACH_S3C24XX_BAST_H __FILE__
index 0e116c92bf01db304645015a68ffb58b494a5535..58e30cad386c0717b765ea044fecf43ed3401f23 100644 (file)
@@ -1,16 +1,11 @@
-/* linux/arch/arm/plat-s3c24xx/common-smdk.c
- *
- * Copyright (c) 2006 Simtec Electronics
- *     Ben Dooks <ben@simtec.co.uk>
- *
- * Common code for SMDK2410 and SMDK2440 boards
- *
- * http://www.fluff.org/ben/smdk2440/
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
-*/
+// SPDX-License-Identifier: GPL-2.0
+//
+// Copyright (c) 2006 Simtec Electronics
+//     Ben Dooks <ben@simtec.co.uk>
+//
+// Common code for SMDK2410 and SMDK2440 boards
+//
+// http://www.fluff.org/ben/smdk2440/
 
 #include <linux/kernel.h>
 #include <linux/types.h>
index 98f733e1cb42f78ca697f83aeb389f132ab60b73..c0352b06e435493d3bca52b6babf7a9e6e301549 100644 (file)
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Copyright (c) 2006 Simtec Electronics
  *     Ben Dooks <ben@simtec.co.uk>
@@ -5,10 +6,6 @@
  * Common code for SMDK2410 and SMDK2440 boards
  *
  * http://www.fluff.org/ben/smdk2440/
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
-*/
+ */
 
 extern void smdk_machine_init(void);
index 5b6b94ef41e28418a843562138fafce4b792879b..3dc029c2d2cbfed2cee339424a77bf4818691b71 100644 (file)
@@ -1,25 +1,10 @@
-/* linux/arch/arm/plat-s3c24xx/cpu.c
- *
- * Copyright (c) 2004-2005 Simtec Electronics
- *     http://www.simtec.co.uk/products/SWLINUX/
- *     Ben Dooks <ben@simtec.co.uk>
- *
- * Common code for S3C24XX machines
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-*/
+// SPDX-License-Identifier: GPL-2.0+
+//
+// Copyright (c) 2004-2005 Simtec Electronics
+//     http://www.simtec.co.uk/products/SWLINUX/
+//     Ben Dooks <ben@simtec.co.uk>
+//
+// Common code for S3C24XX machines
 
 #include <linux/dma-mapping.h>
 #include <linux/init.h>
index c7ac7e61a22e55c3fd8c1fb7272562e209e7dab5..d087b20e8857432b32f88711e375a2be838ddcad 100644 (file)
@@ -1,12 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Copyright (c) 2012 Samsung Electronics Co., Ltd.
  *             http://www.samsung.com
  *
  * Common Header for S3C24XX SoCs
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
  */
 
 #ifndef __ARCH_ARM_MACH_S3C24XX_COMMON_H
index d4d9514335f497b8a6b845e2aa2048caddb9e2a0..1a7f38d085dd922db61e6a689fbb35c2872ecc8f 100644 (file)
@@ -1,14 +1,10 @@
-/*
- * Copyright (c) 2009 Simtec Electronics
- *     http://armlinux.simtec.co.uk/
- *     Ben Dooks <ben@simtec.co.uk>
- *
- * S3C24XX CPU Frequency scaling - utils for S3C2410/S3C2440/S3C2442
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
-*/
+// SPDX-License-Identifier: GPL-2.0
+//
+// Copyright (c) 2009 Simtec Electronics
+//     http://armlinux.simtec.co.uk/
+//     Ben Dooks <ben@simtec.co.uk>
+//
+// S3C24XX CPU Frequency scaling - utils for S3C2410/S3C2440/S3C2442
 
 #include <linux/kernel.h>
 #include <linux/errno.h>
index 103bdbaddd556f98adc6d46794bc79a0a12f24c7..1821e820262c655f10a53f8b21b0ca00afaa0bc0 100644 (file)
@@ -1,12 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Copyright 2010 Samsung Electronics Co., Ltd.
  *     Pawel Osciak <p.osciak@samsung.com>
  *
  * Samsung framebuffer driver core functions
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
  */
 #ifndef __ASM_PLAT_FB_CORE_H
 #define __ASM_PLAT_FB_CORE_H __FILE__
index 9430a71e918479a5adc2610316ba1ccbb26f9e08..d5610ba829a47883092aa0556a25c18fbeb84875 100644 (file)
@@ -1,10 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * GTA02 header
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
-*/
+ */
 
 #ifndef __MACH_S3C24XX_GTA02_H
 #define __MACH_S3C24XX_GTA02_H __FILE__
index 9c8b1279a4baef85fc06a929340d35310d45542e..46ad20ea87d1e761c8b68ab0fb3c5fc42172ce30 100644 (file)
@@ -1,14 +1,8 @@
-/*
- * arch/arm/mach-s3c2410/h1940-bluetooth.c
- * Copyright (c) Arnaud Patard <arnaud.patard@rtp-net.org>
- *
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file COPYING in the main directory of this archive for
- * more details.
- *
- *         S3C2410 bluetooth "driver"
- *
- */
+// SPDX-License-Identifier: GPL-1.0
+//
+// Copyright (c) Arnaud Patard <arnaud.patard@rtp-net.org>
+//
+//         S3C2410 bluetooth "driver"
 
 #include <linux/module.h>
 #include <linux/platform_device.h>
index 596d9f64c5b67e080d137004c9d85c70d31f5414..5dfe9d10cd15d308e30bba1c583fe7c5cc8aa422 100644 (file)
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Copyright 2006 Ben Dooks <ben-linux@fluff.org>
  *
@@ -6,11 +7,7 @@
  *     Ben Dooks <ben@simtec.co.uk>
  *
  * iPAQ H1940 series definitions
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
-*/
+ */
 
 #ifndef __MACH_S3C24XX_H1940_H
 #define __MACH_S3C24XX_H1940_H __FILE__
index 9e8117198e0c8a710bb9d3695266f03dc51ffe08..25fc9c258fc1111bfa9567607a496cc9ba533d3b 100644 (file)
@@ -1,14 +1,10 @@
-/* arch/arm/mach-s3c2410/include/mach/dma.h
- *
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
  * Copyright (C) 2003-2006 Simtec Electronics
  *     Ben Dooks <ben@simtec.co.uk>
  *
  * Samsung S3C24XX DMA support
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
-*/
+ */
 
 #ifndef __ASM_ARCH_DMA_H
 #define __ASM_ARCH_DMA_H __FILE__
index a957bc8ed44f3f60121414e38fd62c1bf76fe72a..4e539cb8b88470d35c0bf0027937d034f7b2495f 100644 (file)
@@ -1 +1,2 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #include <plat/fb-s3c2410.h>
index 528fcdc4f63e77c32eeadedd94e682f7c35abe84..2ad22b2d459bc1b09dcc065ba2fda8a65f188cf3 100644 (file)
@@ -1,14 +1,11 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Copyright (c) 2008 Simtec Electronics
  *     http://armlinux.simtec.co.uk/
  *     Ben Dooks <ben@simtec.co.uk>
  *
  * S3C2410 - GPIO lib support
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
-*/
+ */
 
 /* some boards require extra gpio capacity to support external
  * devices that need GPIO.
index dedd3837c19353cb79bba4f49c364c4b60f16ae8..1b2975708e3ffe48326c2a0628a26141e7f2d8ac 100644 (file)
@@ -1,13 +1,10 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Copyright (c) 2003 Simtec Electronics
  *     Ben Dooks <ben@simtec.co.uk>
  *
  * S3C2410 - hardware
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
-*/
+ */
 
 #ifndef __ASM_ARCH_HARDWARE_H
 #define __ASM_ARCH_HARDWARE_H
index b6dd4cb5a2eceea29a2eb2e7194e741b133d4f95..aaf3bae08b52884691366b4e4a38d3b4a6c4e19a 100644 (file)
@@ -1,12 +1,8 @@
-/* arch/arm/mach-s3c2410/include/mach/irqs.h
- *
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
  * Copyright (c) 2003-2005 Simtec Electronics
  *   Ben Dooks <ben@simtec.co.uk>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
-*/
+ */
 
 
 #ifndef __ASM_ARCH_IRQS_H
index adc39043aa218f1ddcff4496c0775a22033cabdf..bca93112f57d6601886dd1c01276647dd053d717 100644 (file)
@@ -1,14 +1,10 @@
-/* arch/arm/mach-s3c2410/include/mach/map.h
- *
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
  * Copyright (c) 2003 Simtec Electronics
  *     Ben Dooks <ben@simtec.co.uk>
  *
  * S3C2410 - Memory map definitions
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
-*/
+ */
 
 #ifndef __ASM_ARCH_MAP_H
 #define __ASM_ARCH_MAP_H
index 712333fec589214e710992b25cde14600e9c705d..5e4ce89d01582d719a68a0e4d998bca4b45ed212 100644 (file)
@@ -1,15 +1,12 @@
-/* linux/arch/arm/mach-s3c2410/include/pm-core.h
- *
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
  * Copyright 2008 Simtec Electronics
  *      Ben Dooks <ben@simtec.co.uk>
  *      http://armlinux.simtec.co.uk/
  *
  * S3C24xx - PM core support for arch/arm/plat-s3c/pm.c
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
  */
+
 #include <linux/delay.h>
 #include <linux/io.h>
 
index ae4a3e0f3ba20bd8d0437fdd0122b6b00f22a186..7ca3dd4f13c0130ba1c4cfba211d03389069fbbd 100644 (file)
@@ -1,14 +1,10 @@
-/* arch/arm/mach-s3c2410/include/mach/regs-clock.h
- *
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
  * Copyright (c) 2003-2006 Simtec Electronics <linux@simtec.co.uk>
  *     http://armlinux.simtec.co.uk/
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
  * S3C2410 clock register definitions
-*/
+ */
 
 #ifndef __ASM_ARM_REGS_CLOCK
 #define __ASM_ARM_REGS_CLOCK
index 0d622f3b57a5710ce36c4e689dc1e83416d642e4..594e967c0673851f5e23bd135f99d4440d6ad352 100644 (file)
@@ -1,14 +1,10 @@
-/* arch/arm/mach-s3c2410/include/mach/regs-gpio.h
- *
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
  * Copyright (c) 2003-2004 Simtec Electronics <linux@simtec.co.uk>
  *     http://www.simtec.co.uk/products/SWLINUX/
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
  * S3C2410 GPIO register definitions
-*/
+ */
 
 
 #ifndef __ASM_ARCH_REGS_GPIO_H
index 0f07ba30b1fb2a2ee1a7e659f21257a27d66d244..8d8e669e3903591112dec0297444a47ff5fcb199 100644 (file)
@@ -1,12 +1,8 @@
-/* arch/arm/mach-s3c2410/include/mach/regs-irq.h
- *
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
  * Copyright (c) 2003 Simtec Electronics <linux@simtec.co.uk>
  *                   http://www.simtec.co.uk/products/SWLINUX/
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
-*/
+ */
 
 
 #ifndef ___ASM_ARCH_REGS_IRQ_H
index ee8f040aff5fa5e769872c5d457f68844bccb525..4c3434f261bb344ab91dba64facdcafcf38a1847 100644 (file)
@@ -1,13 +1,8 @@
-/* arch/arm/mach-s3c2410/include/mach/regs-lcd.h
- *
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
  * Copyright (c) 2003 Simtec Electronics <linux@simtec.co.uk>
  *                   http://www.simtec.co.uk/products/SWLINUX/
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
-*/
-
+ */
 
 #ifndef ___ASM_ARCH_REGS_LCD_H
 #define ___ASM_ARCH_REGS_LCD_H
index ffe37bdb9f59370e3fd8256ec2df27e8fb4502a2..6bf924612b06885c9774ac92746a1beacfb8010d 100644 (file)
@@ -1,15 +1,11 @@
-/* arch/arm/mach-s3c2410/include/mach/regs-s3c2443-clock.h
- *
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
  * Copyright (c) 2007 Simtec Electronics
  *     Ben Dooks <ben@simtec.co.uk>
  *     http://armlinux.simtec.co.uk/
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
  * S3C2443 clock register definitions
-*/
+ */
 
 #ifndef __ASM_ARM_REGS_S3C2443_CLOCK
 #define __ASM_ARM_REGS_S3C2443_CLOCK
index 4d5f5768f700bdb44283aebe16f3454c20f72845..88510333b96b470ef95f00a5278b69abd9f1b312 100644 (file)
@@ -1,12 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Copyright (c) 2011 Heiko Stuebner <heiko@sntech.de>
  *
  * Samsung RTC Controller core functions
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
-*/
+ */
 
 #ifndef __RTC_CORE_H
 #define __RTC_CORE_H __FILE__
index 548ced42cbb77b2a9551f9f121faacf1955bf195..b6b32724ace8c34b91660613d0fa1e94093f2de7 100644 (file)
@@ -1,11 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Copyright (c) 2008 Simtec Electronics
  *     Ben Dooks <ben@simtec.co.uk>
  *     http://armlinux.simtec.co.uk/
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
  */
 
 #ifndef __ARCH_ARM_MACH_S3C24XX_S3C2412_H
index d5f1f06e481157ffca5383552660a15f1f82fb40..9f90aaf70bf3b64f6b779f2fbc61f7602930379a 100644 (file)
@@ -1,14 +1,10 @@
-/*
- * Copyright (c) 2006-2009 Simtec Electronics
- *     http://armlinux.simtec.co.uk/
- *     Ben Dooks <ben@simtec.co.uk>
- *
- * S3C24XX CPU Frequency scaling - IO timing for S3C2410/S3C2440/S3C2442
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
-*/
+// SPDX-License-Identifier: GPL-2.0
+//
+// Copyright (c) 2006-2009 Simtec Electronics
+//     http://armlinux.simtec.co.uk/
+//     Ben Dooks <ben@simtec.co.uk>
+//
+// S3C24XX CPU Frequency scaling - IO timing for S3C2410/S3C2440/S3C2442
 
 #include <linux/init.h>
 #include <linux/kernel.h>
index c5b12f6b02b53d4f5cc2a3b315efa7dc0b49ff43..59356d10fbcf2163443a9fbcf2c0ef3eb0950fc5 100644 (file)
@@ -1,14 +1,10 @@
-/*
- * Copyright (c) 2006-2008 Simtec Electronics
- *     http://armlinux.simtec.co.uk/
- *     Ben Dooks <ben@simtec.co.uk>
- *
- * S3C2412/S3C2443 (PL093 based) IO timing support
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
-*/
+// SPDX-License-Identifier: GPL-2.0
+//
+// Copyright (c) 2006-2008 Simtec Electronics
+//     http://armlinux.simtec.co.uk/
+//     Ben Dooks <ben@simtec.co.uk>
+//
+// S3C2412/S3C2443 (PL093 based) IO timing support
 
 #include <linux/init.h>
 #include <linux/module.h>
index 417b7a20c2d12374a97945db93bd41dc1ca1ce91..e0131b16a4af4ad4e1c4312711cee3acfff5085d 100644 (file)
@@ -1,15 +1,10 @@
-/* linux/arch/arm/plat-s3c24xx/irq-om.c
- *
- * Copyright (c) 2003-2004 Simtec Electronics
- *     Ben Dooks <ben@simtec.co.uk>
- *     http://armlinux.simtec.co.uk/
- *
- * S3C24XX - IRQ PM code
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
+// SPDX-License-Identifier: GPL-2.0
+//
+// Copyright (c) 2003-2004 Simtec Electronics
+//     Ben Dooks <ben@simtec.co.uk>
+//     http://armlinux.simtec.co.uk/
+//
+// S3C24XX - IRQ PM code
 
 #include <linux/init.h>
 #include <linux/module.h>
index 3e63777a109f7cee820a8837440a6210217de6ad..9a9daf526d0c3c420c628b758b35d92d32341d72 100644 (file)
@@ -1,30 +1,11 @@
-/* linux/arch/arm/mach-s3c2410/mach-amlm5900.c
- *
- * linux/arch/arm/mach-s3c2410/mach-amlm5900.c
- *
- * Copyright (c) 2006 American Microsystems Limited
- *     David Anders <danders@amltd.com>
-
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
- *
- * @History:
- * derived from linux/arch/arm/mach-s3c2410/mach-bast.c, written by
- * Ben Dooks <ben@simtec.co.uk>
- *
- ***********************************************************************/
+// SPDX-License-Identifier: GPL-2.0+
+//
+// Copyright (c) 2006 American Microsystems Limited
+//     David Anders <danders@amltd.com>
+//
+// @History:
+// derived from linux/arch/arm/mach-s3c2410/mach-bast.c, written by
+// Ben Dooks <ben@simtec.co.uk>
 
 #include <linux/kernel.h>
 #include <linux/types.h>
index c14cab36192264e78189abed5a9f77288905503d..072966dcad788336d7e80c37940c118ae3600f90 100644 (file)
@@ -1,13 +1,8 @@
-/* linux/arch/arm/mach-s3c2440/mach-anubis.c
- *
- * Copyright 2003-2009 Simtec Electronics
- *     http://armlinux.simtec.co.uk/
- *     Ben Dooks <ben@simtec.co.uk>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
-*/
+// SPDX-License-Identifier: GPL-2.0
+//
+// Copyright 2003-2009 Simtec Electronics
+//     http://armlinux.simtec.co.uk/
+//     Ben Dooks <ben@simtec.co.uk>
 
 #include <linux/kernel.h>
 #include <linux/types.h>
index ebdbafb9382a6840c67bdd079d135603fbcb8e53..68a4fa94257a221aa2e733395e343bb21f8d7c4e 100644 (file)
@@ -1,16 +1,11 @@
-/* linux/arch/arm/mach-s3c2440/mach-at2440evb.c
- *
- * Copyright (c) 2008 Ramax Lo <ramaxlo@gmail.com>
- *      Based on mach-anubis.c by Ben Dooks <ben@simtec.co.uk>
- *      and modifications by SBZ <sbz@spgui.org> and
- *      Weibing <http://weibing.blogbus.com>
- *
- * For product information, visit http://www.arm.com/
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
-*/
+// SPDX-License-Identifier: GPL-2.0
+//
+// Copyright (c) 2008 Ramax Lo <ramaxlo@gmail.com>
+//      Based on mach-anubis.c by Ben Dooks <ben@simtec.co.uk>
+//      and modifications by SBZ <sbz@spgui.org> and
+//      Weibing <http://weibing.blogbus.com>
+//
+// For product information, visit http://www.arm.com/
 
 #include <linux/kernel.h>
 #include <linux/types.h>
index 704dc84b34808204d77f2969038b0bd6ace5080c..a7c3955ae8f6454c5aafd8a775e7b1b21fb2aeb9 100644 (file)
@@ -1,14 +1,9 @@
-/* linux/arch/arm/mach-s3c2410/mach-bast.c
- *
- * Copyright 2003-2008 Simtec Electronics
- *   Ben Dooks <ben@simtec.co.uk>
- *
- * http://www.simtec.co.uk/products/EB2410ITX/
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
-*/
+// SPDX-License-Identifier: GPL-2.0
+//
+// Copyright 2003-2008 Simtec Electronics
+//   Ben Dooks <ben@simtec.co.uk>
+//
+// http://www.simtec.co.uk/products/EB2410ITX/
 
 #include <linux/kernel.h>
 #include <linux/types.h>
index afe18baf0c84c74e5a859dc342d2709884e5d1c4..9d5595c4ad99f813b4c861344ad87b28f20872f1 100644 (file)
@@ -1,27 +1,12 @@
-/*
- * S3C2442 Machine Support for Openmoko GTA02 / FreeRunner.
- *
- * Copyright (C) 2006-2009 by Openmoko, Inc.
- * Authors: Harald Welte <laforge@openmoko.org>
- *          Andy Green <andy@openmoko.org>
- *          Werner Almesberger <werner@openmoko.org>
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
- */
+// SPDX-License-Identifier: GPL-2.0+
+//
+// S3C2442 Machine Support for Openmoko GTA02 / FreeRunner.
+//
+// Copyright (C) 2006-2009 by Openmoko, Inc.
+// Authors: Harald Welte <laforge@openmoko.org>
+//          Andy Green <andy@openmoko.org>
+//          Werner Almesberger <werner@openmoko.org>
+// All rights reserved.
 
 #include <linux/kernel.h>
 #include <linux/types.h>
index 7ed78619217c6adeb6c6ceeed7469be9e526cecd..e064c73a57d3a7be05e5575568fd7ce8849ad38e 100644 (file)
@@ -1,14 +1,9 @@
-/*
- * Copyright (c) 2003-2005 Simtec Electronics
- *   Ben Dooks <ben@simtec.co.uk>
- *
- * http://www.handhelds.org/projects/h1940.html
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
-*/
+// SPDX-License-Identifier: GPL-2.0
+//
+// Copyright (c) 2003-2005 Simtec Electronics
+//   Ben Dooks <ben@simtec.co.uk>
+//
+// http://www.handhelds.org/projects/h1940.html
 
 #include <linux/kernel.h>
 #include <linux/types.h>
index 17821976f769bbb4d7479b50bc185bb3d2ef98b8..a3ddbbbd6d927a0785a7fcf75fef763d3ea40253 100644 (file)
@@ -1,14 +1,9 @@
-/* linux/arch/arm/mach-s3c2410/mach-jive.c
- *
- * Copyright 2007 Simtec Electronics
- *     Ben Dooks <ben@simtec.co.uk>
- *
- * http://armlinux.simtec.co.uk/
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
-*/
+// SPDX-License-Identifier: GPL-2.0
+//
+// Copyright 2007 Simtec Electronics
+//     Ben Dooks <ben@simtec.co.uk>
+//
+// http://armlinux.simtec.co.uk/
 
 #include <linux/kernel.h>
 #include <linux/types.h>
index 04c9f488c4981b044e3fe91f087fb00f2e63f942..95753e0bc0730708eb16eb30cdc6daf870e78464 100644 (file)
@@ -1,17 +1,12 @@
-/* linux/arch/arm/mach-s3c2440/mach-mini2440.c
- *
- * Copyright (c) 2008 Ramax Lo <ramaxlo@gmail.com>
- *      Based on mach-anubis.c by Ben Dooks <ben@simtec.co.uk>
- *      and modifications by SBZ <sbz@spgui.org> and
- *      Weibing <http://weibing.blogbus.com> and
- *      Michel Pollet <buserror@gmail.com>
- *
- * For product information, visit http://code.google.com/p/mini2440/
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
-*/
+// SPDX-License-Identifier: GPL-2.0
+//
+// Copyright (c) 2008 Ramax Lo <ramaxlo@gmail.com>
+//      Based on mach-anubis.c by Ben Dooks <ben@simtec.co.uk>
+//      and modifications by SBZ <sbz@spgui.org> and
+//      Weibing <http://weibing.blogbus.com> and
+//      Michel Pollet <buserror@gmail.com>
+//
+// For product information, visit http://code.google.com/p/mini2440/
 
 #include <linux/kernel.h>
 #include <linux/types.h>
index 070a0d0714a5e169d59e75487970f809122ddc2b..eec51fadb14a3429e012dd19649162ce52ad78e2 100644 (file)
@@ -1,18 +1,15 @@
-/* Machine specific code for the Acer n30, Acer N35, Navman PiN 570,
- * Yakumo AlphaX and Airis NC05 PDAs.
- *
- * Copyright (c) 2003-2005 Simtec Electronics
- *     Ben Dooks <ben@simtec.co.uk>
- *
- * Copyright (c) 2005-2008 Christer Weinigel <christer@weinigel.se>
- *
- * There is a wiki with more information about the n30 port at
- * http://handhelds.org/moin/moin.cgi/AcerN30Documentation .
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
+// SPDX-License-Identifier: GPL-2.0
+//
+// Machine specific code for the Acer n30, Acer N35, Navman PiN 570,
+// Yakumo AlphaX and Airis NC05 PDAs.
+//
+// Copyright (c) 2003-2005 Simtec Electronics
+//     Ben Dooks <ben@simtec.co.uk>
+//
+// Copyright (c) 2005-2008 Christer Weinigel <christer@weinigel.se>
+//
+// There is a wiki with more information about the n30 port at
+// http://handhelds.org/moin/moin.cgi/AcerN30Documentation .
 
 #include <linux/kernel.h>
 #include <linux/types.h>
index 2a61d13dcd6cdbd6101d819bc801a9d5e75ac064..c2f34758ccb640cf40cf5bcdec7fc08b0d970918 100644 (file)
@@ -1,16 +1,12 @@
-/* linux/arch/arm/mach-s3c2440/mach-nexcoder.c
- *
- * Copyright (c) 2004 Nex Vision
- *   Guillaume GOURAT <guillaume.gourat@nexvision.tv>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
- * Modifications:
- *     15-10-2004 GG  Created initial version
- *     12-03-2005 BJD Updated for release
- */
+// SPDX-License-Identifier: GPL-2.0
+// linux/arch/arm/mach-s3c2440/mach-nexcoder.c
+//
+// Copyright (c) 2004 Nex Vision
+//   Guillaume GOURAT <guillaume.gourat@nexvision.tv>
+//
+// Modifications:
+//     15-10-2004 GG  Created initial version
+//     12-03-2005 BJD Updated for release
 
 #include <linux/kernel.h>
 #include <linux/types.h>
index 6cac7da15e2b0d369f7a8fa4c3a0c214ede421df..058ce73137e80bb92926e430ae794129392cdbb7 100644 (file)
@@ -1,15 +1,10 @@
-/* linux/arch/arm/mach-s3c2440/mach-osiris-dvs.c
- *
- * Copyright (c) 2009 Simtec Electronics
- *     http://armlinux.simtec.co.uk/
- *     Ben Dooks <ben@simtec.co.uk>
- *
- * Simtec Osiris Dynamic Voltage Scaling support.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
-*/
+// SPDX-License-Identifier: GPL-2.0
+//
+// Copyright (c) 2009 Simtec Electronics
+//     http://armlinux.simtec.co.uk/
+//     Ben Dooks <ben@simtec.co.uk>
+//
+// Simtec Osiris Dynamic Voltage Scaling support.
 
 #include <linux/kernel.h>
 #include <linux/module.h>
index ed3b22ceef06c75cbca69a8f2e5cef72183a3a47..ee3630cb236a45efe7f39c3bee708dde7f7bf823 100644 (file)
@@ -1,12 +1,8 @@
-/*
- * Copyright (c) 2005-2008 Simtec Electronics
- *     http://armlinux.simtec.co.uk/
- *     Ben Dooks <ben@simtec.co.uk>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
-*/
+// SPDX-License-Identifier: GPL-2.0
+//
+// Copyright (c) 2005-2008 Simtec Electronics
+//     http://armlinux.simtec.co.uk/
+//     Ben Dooks <ben@simtec.co.uk>
 
 #include <linux/kernel.h>
 #include <linux/types.h>
index 345a484b93cc5be58553ee4af6e570bdb3cbec11..4e24d89e870bc368106aec20fede5a512db22f9f 100644 (file)
@@ -1,12 +1,7 @@
-/*
- *
- * Copyright (c) 2004 Nex Vision
- *   Guillaume GOURAT <guillaume.gourat@nexvision.fr>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
+// SPDX-License-Identifier: GPL-2.0
+//
+// Copyright (c) 2004 Nex Vision
+//   Guillaume GOURAT <guillaume.gourat@nexvision.fr>
 
 #include <linux/kernel.h>
 #include <linux/types.h>
index 84e3a9c53184a479ea1ac31303c62685e5e5bd5a..9c8373b8d9c35c01141791e24cf0425006182ea6 100644 (file)
@@ -1,25 +1,8 @@
-/* linux/arch/arm/mach-s3c2410/mach-qt2410.c
- *
- * Copyright (C) 2006 by OpenMoko, Inc.
- * Author: Harald Welte <laforge@openmoko.org>
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
- *
- */
+// SPDX-License-Identifier: GPL-2.0+
+//
+// Copyright (C) 2006 by OpenMoko, Inc.
+// Author: Harald Welte <laforge@openmoko.org>
+// All rights reserved.
 
 #include <linux/kernel.h>
 #include <linux/types.h>
index e86ad6a68a0b8f3f7c22e5ae6a5a595a611bec0e..7f5a18fa305b9bb60a659234f2b5a210492cf589 100644 (file)
@@ -1,14 +1,9 @@
-/*
- * Copyright (c) 2006-2009 Victor Chukhantsev, Denis Grigoriev,
- * Copyright (c) 2007-2010 Vasily Khoruzhick
- *
- * based on smdk2440 written by Ben Dooks
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
-*/
+// SPDX-License-Identifier: GPL-2.0
+//
+// Copyright (c) 2006-2009 Victor Chukhantsev, Denis Grigoriev,
+// Copyright (c) 2007-2010 Vasily Khoruzhick
+//
+// based on smdk2440 written by Ben Dooks
 
 #include <linux/kernel.h>
 #include <linux/types.h>
index b5ba615cf9ddf3406145be77109214736b2234ef..529c6faf862f5848c99f3062cce737131b9baee6 100644 (file)
@@ -1,15 +1,9 @@
-/* linux/arch/arm/mach-s3c2440/mach-rx3715.c
- *
- * Copyright (c) 2003-2004 Simtec Electronics
- *     Ben Dooks <ben@simtec.co.uk>
- *
- * http://www.handhelds.org/projects/rx3715.html
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
-*/
+// SPDX-License-Identifier: GPL-2.0
+//
+// Copyright (c) 2003-2004 Simtec Electronics
+//     Ben Dooks <ben@simtec.co.uk>
+//
+// http://www.handhelds.org/projects/rx3715.html
 
 #include <linux/kernel.h>
 #include <linux/types.h>
index c83c076578dd73b430c9b338faf9ce685d8f39a0..aa7102713b37a4c0ba046e31fa7d49c4e6b3d026 100644 (file)
@@ -1,19 +1,15 @@
-/*
- * Samsung's S3C2416 flattened device tree enabled machine
- *
- * Copyright (c) 2012 Heiko Stuebner <heiko@sntech.de>
- *
- * based on mach-exynos/mach-exynos4-dt.c
- *
- * Copyright (c) 2010-2011 Samsung Electronics Co., Ltd.
- *             http://www.samsung.com
- * Copyright (c) 2010-2011 Linaro Ltd.
- *             www.linaro.org
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
-*/
+// SPDX-License-Identifier: GPL-2.0
+//
+// Samsung's S3C2416 flattened device tree enabled machine
+//
+// Copyright (c) 2012 Heiko Stuebner <heiko@sntech.de>
+//
+// based on mach-exynos/mach-exynos4-dt.c
+//
+// Copyright (c) 2010-2011 Samsung Electronics Co., Ltd.
+//             http://www.samsung.com
+// Copyright (c) 2010-2011 Linaro Ltd.
+//             www.linaro.org
 
 #include <linux/clocksource.h>
 #include <linux/irqchip.h>
index 27dd6605e395d42a95989885ec2db906fd4b1084..18dfef52c8bf0ca6fcc6b4f062afb0a76bbffa8f 100644 (file)
@@ -1,32 +1,13 @@
-/* linux/arch/arm/mach-s3c2410/mach-smdk2410.c
- *
- * linux/arch/arm/mach-s3c2410/mach-smdk2410.c
- *
- * Copyright (C) 2004 by FS Forth-Systeme GmbH
- * All rights reserved.
- *
- * @Author: Jonas Dietsche
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
- *
- * @History:
- * derived from linux/arch/arm/mach-s3c2410/mach-bast.c, written by
- * Ben Dooks <ben@simtec.co.uk>
- *
- ***********************************************************************/
+// SPDX-License-Identifier: GPL-2.0+
+//
+// Copyright (C) 2004 by FS Forth-Systeme GmbH
+// All rights reserved.
+//
+// @Author: Jonas Dietsche
+//
+// @History:
+// derived from linux/arch/arm/mach-s3c2410/mach-bast.c, written by
+// Ben Dooks <ben@simtec.co.uk>
 
 #include <linux/kernel.h>
 #include <linux/types.h>
index 586e4a3b8d5d106387c451b8cfb6f64432d45013..ca80167f268d464a84abce6493045aafe59ed04e 100644 (file)
@@ -1,15 +1,10 @@
-/* linux/arch/arm/mach-s3c2412/mach-smdk2413.c
- *
- * Copyright (c) 2006 Simtec Electronics
- *     Ben Dooks <ben@simtec.co.uk>
- *
- * Thanks to Dimity Andric (TomTom) and Steven Ryu (Samsung) for the
- * loans of SMDK2413 to work with.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
-*/
+// SPDX-License-Identifier: GPL-2.0
+//
+// Copyright (c) 2006 Simtec Electronics
+//     Ben Dooks <ben@simtec.co.uk>
+//
+// Thanks to Dimity Andric (TomTom) and Steven Ryu (Samsung) for the
+// loans of SMDK2413 to work with.
 
 #include <linux/kernel.h>
 #include <linux/types.h>
index 86394f72d29ef22770437e70248b50668840ca21..61c3e45898d3ad22409503510f7e784f58995dc3 100644 (file)
@@ -1,15 +1,9 @@
-/* linux/arch/arm/mach-s3c2416/mach-hanlin_v3c.c
- *
- * Copyright (c) 2009 Yauhen Kharuzhy <jekhor@gmail.com>,
- *     as part of OpenInkpot project
- * Copyright (c) 2009 Promwad Innovation Company
- *     Yauhen Kharuzhy <yauhen.kharuzhy@promwad.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
-*/
+// SPDX-License-Identifier: GPL-2.0
+//
+// Copyright (c) 2009 Yauhen Kharuzhy <jekhor@gmail.com>,
+//     as part of OpenInkpot project
+// Copyright (c) 2009 Promwad Innovation Company
+//     Yauhen Kharuzhy <yauhen.kharuzhy@promwad.com>
 
 #include <linux/kernel.h>
 #include <linux/types.h>
index 9bb96bfbb420185a510d938d348684c98c5f5188..7bafcd8ea104cfed18071f3127bac2c71cf4e49d 100644 (file)
@@ -1,17 +1,12 @@
-/* linux/arch/arm/mach-s3c2440/mach-smdk2440.c
- *
- * Copyright (c) 2004-2005 Simtec Electronics
- *     Ben Dooks <ben@simtec.co.uk>
- *
- * http://www.fluff.org/ben/smdk2440/
- *
- * Thanks to Dimity Andric and TomTom for the loan of an SMDK2440.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
-*/
+// SPDX-License-Identifier: GPL-2.0
+// linux/arch/arm/mach-s3c2440/mach-smdk2440.c
+//
+// Copyright (c) 2004-2005 Simtec Electronics
+//     Ben Dooks <ben@simtec.co.uk>
+//
+// http://www.fluff.org/ben/smdk2440/
+//
+// Thanks to Dimity Andric and TomTom for the loan of an SMDK2440.
 
 #include <linux/kernel.h>
 #include <linux/types.h>
index 474cd81aa8ad58bd261e1fc0371ea8a19bf30369..2358ed5ed7be23c66f9f47a8171102b20ce6dbdd 100644 (file)
@@ -1,17 +1,11 @@
-/* linux/arch/arm/mach-s3c2443/mach-smdk2443.c
- *
- * Copyright (c) 2007 Simtec Electronics
- *     Ben Dooks <ben@simtec.co.uk>
- *
- * http://www.fluff.org/ben/smdk2443/
- *
- * Thanks to Samsung for the loan of an SMDK2443
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
-*/
+// SPDX-License-Identifier: GPL-2.0
+//
+// Copyright (c) 2007 Simtec Electronics
+//     Ben Dooks <ben@simtec.co.uk>
+//
+// http://www.fluff.org/ben/smdk2443/
+//
+// Thanks to Samsung for the loan of an SMDK2443
 
 #include <linux/kernel.h>
 #include <linux/types.h>
index 2deb62f92fb2c30408477fc614bbb02602852f70..8d8ddd6ea3057211cb845d245e23d9288a48e87e 100644 (file)
@@ -1,28 +1,11 @@
-/* linux/arch/arm/mach-s3c2410/mach-tct_hammer.c
- *
- * Copyright (c) 2007 TinCanTools
- *     David Anders <danders@amltd.com>
-
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
- *
- * @History:
- * derived from linux/arch/arm/mach-s3c2410/mach-bast.c, written by
- * Ben Dooks <ben@simtec.co.uk>
- *
- ***********************************************************************/
+// SPDX-License-Identifier: GPL-2.0+
+//
+// Copyright (c) 2007 TinCanTools
+//     David Anders <danders@amltd.com>
+//
+// @History:
+// derived from linux/arch/arm/mach-s3c2410/mach-bast.c, written by
+// Ben Dooks <ben@simtec.co.uk>
 
 #include <linux/kernel.h>
 #include <linux/types.h>
index 89f32bd3f01b53e442cd963037bf18613f652e5b..853e74f9b8b5751c4f244b6ab43e2700362c4a36 100644 (file)
@@ -1,15 +1,10 @@
-/*
- * Copyright (c) 2003-2008 Simtec Electronics
- *   Ben Dooks <ben@simtec.co.uk>
- *
- * Machine support for Thorcom VR1000 board. Designed for Thorcom by
- * Simtec Electronics, http://www.simtec.co.uk/
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
-*/
+// SPDX-License-Identifier: GPL-2.0
+//
+// Copyright (c) 2003-2008 Simtec Electronics
+//   Ben Dooks <ben@simtec.co.uk>
+//
+// Machine support for Thorcom VR1000 board. Designed for Thorcom by
+// Simtec Electronics, http://www.simtec.co.uk/
 
 #include <linux/kernel.h>
 #include <linux/types.h>
index 1adc957edf0f9b8a004e552b86cc9ea84539dcfd..d76b28b65e653e7ac5b5d35888f2e4869625a820 100644 (file)
@@ -1,13 +1,8 @@
-/* linux/arch/arm/mach-s3c2412/mach-vstms.c
- *
- * (C) 2006 Thomas Gleixner <tglx@linutronix.de>
- *
- * Derived from mach-smdk2413.c - (C) 2006 Simtec Electronics
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
+// SPDX-License-Identifier: GPL-2.0
+//
+// (C) 2006 Thomas Gleixner <tglx@linutronix.de>
+//
+// Derived from mach-smdk2413.c - (C) 2006 Simtec Electronics
 
 #include <linux/kernel.h>
 #include <linux/types.h>
index 7e811fe1cf4155bea1feaa729d024881f9d005e0..8de633d416aec425a091de1537af78e7f32ee42e 100644 (file)
@@ -1,13 +1,10 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Copyright (c) 2010 Samsung Electronics Co., Ltd.
  *             http://www.samsung.com/
  *
  * S3C -  Nand Controller core functions
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
-*/
+ */
 
 #ifndef __ASM_ARCH_NAND_CORE_H
 #define __ASM_ARCH_NAND_CORE_H __FILE__
index b8d56074abacdbded331f798fa701e514958bc02..b6c9c5ed2ba70114236f2a3734dec5eade8155e7 100644 (file)
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Copyright 2005 Simtec Electronics
  *     http://www.simtec.co.uk/products/
@@ -5,11 +6,7 @@
  *
  * OSIRIS - CPLD control constants
  * OSIRIS - Memory map definitions
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
-*/
+ */
 
 #ifndef __MACH_S3C24XX_OSIRIS_H
 #define __MACH_S3C24XX_OSIRIS_H __FILE__
index 321b7be1c0f76490c1978fa54e2ccd577371391b..c800f67d03d43e84d3d981235ab25d4ef3ee294a 100644 (file)
@@ -1,13 +1,10 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * (c) 2005 Guillaume GOURAT / NexVision
  *          guillaume.gourat@nexvision.fr
  *
  * NexVision OTOM board memory map definitions
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
-*/
+ */
 
 /*
  * ok, we've used up to 0x01300000, now we need to find space for the
index 7ee4924a543d7ad977fe040a716652cef8c6f357..0561f79ddce83e205feeaee6281e2955c20eb398 100644 (file)
@@ -1,25 +1,11 @@
-/*
- * Copyright (c) 2006-2007 Simtec Electronics
- *     http://armlinux.simtec.co.uk/
- *     Ben Dooks <ben@simtec.co.uk>
- *     Vincent Sanders <vince@arm.linux.org.uk>
- *
- * S3C2410 CPU PLL tables
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-*/
+// SPDX-License-Identifier: GPL-2.0+
+//
+// Copyright (c) 2006-2007 Simtec Electronics
+//     http://armlinux.simtec.co.uk/
+//     Ben Dooks <ben@simtec.co.uk>
+//     Vincent Sanders <vince@arm.linux.org.uk>
+//
+// S3C2410 CPU PLL tables
 
 #include <linux/types.h>
 #include <linux/kernel.h>
index a3fbfed75e28be1a2d7858482ee12ff38791fef5..2ec3a2f9a6a5e4ecbed20e74a45e50251bcfd6e1 100644 (file)
@@ -1,15 +1,11 @@
-/*
- * Copyright (c) 2006-2007 Simtec Electronics
- *     http://armlinux.simtec.co.uk/
- *     Ben Dooks <ben@simtec.co.uk>
- *     Vincent Sanders <vince@arm.linux.org.uk>
- *
- * S3C2440/S3C2442 CPU PLL tables (12MHz Crystal)
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
-*/
+// SPDX-License-Identifier: GPL-2.0
+//
+// Copyright (c) 2006-2007 Simtec Electronics
+//     http://armlinux.simtec.co.uk/
+//     Ben Dooks <ben@simtec.co.uk>
+//     Vincent Sanders <vince@arm.linux.org.uk>
+//
+// S3C2440/S3C2442 CPU PLL tables (12MHz Crystal)
 
 #include <linux/types.h>
 #include <linux/kernel.h>
index bcff89fd98715511b013ddc7a5bcc838ecc95621..4b3d9e36c6bbbe52b74336449d2300562e72727b 100644 (file)
@@ -1,15 +1,11 @@
-/*
- * Copyright (c) 2006-2008 Simtec Electronics
- *     http://armlinux.simtec.co.uk/
- *     Ben Dooks <ben@simtec.co.uk>
- *     Vincent Sanders <vince@arm.linux.org.uk>
- *
- * S3C2440/S3C2442 CPU PLL tables (16.93444MHz Crystal)
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
-*/
+// SPDX-License-Identifier: GPL-2.0
+//
+// Copyright (c) 2006-2008 Simtec Electronics
+//     http://armlinux.simtec.co.uk/
+//     Ben Dooks <ben@simtec.co.uk>
+//     Vincent Sanders <vince@arm.linux.org.uk>
+//
+// S3C2440/S3C2442 CPU PLL tables (16.93444MHz Crystal)
 
 #include <linux/types.h>
 #include <linux/kernel.h>
index 6183a688012b2a5fdac22b6ce24ebfced4d73c1f..a7bbe336ac6b6d28760434e05c6f9b57039dcd43 100644 (file)
@@ -1,22 +1,9 @@
-/* linux/arch/arm/mach-s3c2410/pm-h1940.S
- *
+/* SPDX-License-Identifier: GPL-2.0+ */
+/*
  * Copyright (c) 2006 Ben Dooks <ben-linux@fluff.org>
  *
  * H1940 Suspend to RAM
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-*/
+ */
 
 #include <linux/linkage.h>
 #include <asm/assembler.h>
index a4588daeddb0f6ab94b85f837c2ccdb0791c5816..2d8ea701380af301ec747ae46a07d67286d42ff1 100644 (file)
@@ -1,24 +1,9 @@
-/* linux/arch/arm/mach-s3c2410/pm.c
- *
- * Copyright (c) 2006 Simtec Electronics
- *     Ben Dooks <ben@simtec.co.uk>
- *
- * S3C2410 (and compatible) Power Manager (Suspend-To-RAM) support
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-*/
+// SPDX-License-Identifier: GPL-2.0+
+//
+// Copyright (c) 2006 Simtec Electronics
+//     Ben Dooks <ben@simtec.co.uk>
+//
+// S3C2410 (and compatible) Power Manager (Suspend-To-RAM) support
 
 #include <linux/init.h>
 #include <linux/suspend.h>
index 0ae4d47a4663a82781aa10c288c8f25c49a2ebff..2dfdaab0aa1ff80371ed6c178a397986f758beba 100644 (file)
@@ -1,14 +1,9 @@
-/* linux/arch/arm/mach-s3c2412/pm.c
- *
- * Copyright (c) 2006 Simtec Electronics
- *     Ben Dooks <ben@simtec.co.uk>
- *
- * http://armlinux.simtec.co.uk/.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
-*/
+// SPDX-License-Identifier: GPL-2.0
+//
+// Copyright (c) 2006 Simtec Electronics
+//     Ben Dooks <ben@simtec.co.uk>
+//
+// http://armlinux.simtec.co.uk/.
 
 #include <linux/kernel.h>
 #include <linux/types.h>
index b5bbf0d5985c818947e9b7a44c2a966e0c6c995b..9a2f05e279d4803fa333c0ef8afd2ee141028bbc 100644 (file)
@@ -1,14 +1,9 @@
-/* linux/arch/arm/mach-s3c2416/pm.c
- *
- * Copyright (c) 2010 Samsung Electronics Co., Ltd.
- *             http://www.samsung.com
- *
- * S3C2416 - PM support (Based on Ben Dooks' S3C2412 PM support)
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
-*/
+// SPDX-License-Identifier: GPL-2.0
+//
+// Copyright (c) 2010 Samsung Electronics Co., Ltd.
+//             http://www.samsung.com
+//
+// S3C2416 - PM support (Based on Ben Dooks' S3C2412 PM support)
 
 #include <linux/device.h>
 #include <linux/syscore_ops.h>
index 5d510bca0844005ae5f38c717319da1fa3948168..adcb906454603c522cf322b70046307747336ce4 100644 (file)
@@ -1,30 +1,15 @@
-/* linux/arch/arm/plat-s3c24xx/pm.c
- *
- * Copyright (c) 2004-2006 Simtec Electronics
- *     Ben Dooks <ben@simtec.co.uk>
- *
- * S3C24XX Power Manager (Suspend-To-RAM) support
- *
- * See Documentation/arm/Samsung-S3C24XX/Suspend.txt for more information
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- * Parts based on arch/arm/mach-pxa/pm.c
- *
- * Thanks to Dimitry Andric for debugging
-*/
+// SPDX-License-Identifier: GPL-2.0+
+//
+// Copyright (c) 2004-2006 Simtec Electronics
+//     Ben Dooks <ben@simtec.co.uk>
+//
+// S3C24XX Power Manager (Suspend-To-RAM) support
+//
+// See Documentation/arm/Samsung-S3C24XX/Suspend.txt for more information
+//
+// Parts based on arch/arm/mach-pxa/pm.c
+//
+// Thanks to Dimitry Andric for debugging
 
 #include <linux/init.h>
 #include <linux/suspend.h>
index 61b3d1387d760b389fd7842d8b02f9ff110436d8..b500636276f2edb126fe6ed1451a4f72ab94d425 100644 (file)
@@ -1,13 +1,10 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Copyright (c) 2004 Simtec Electronics <linux@simtec.co.uk>
  *                   http://www.simtec.co.uk/products/SWLINUX/
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
  * S3C2440/S3C2412 Signal Drive Strength Control
-*/
+ */
 
 
 #ifndef __ASM_ARCH_REGS_DSC_H
index 86b1258368c2e61f1a28e45c11c13410de39eb71..2f3bc48b589019e9609f5029d5bf13f7e35f6eea 100644 (file)
@@ -1,11 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Copyright (c) 2004 Simtec Electronics <linux@simtec.co.uk>
  *             http://www.simtec.co.uk/products/SWLINUX/
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
  * S3C2410 Memory Control register definitions
  */
 
index 5061d66ca10cb47809ae9b33c62da0be52b1bc9e..21fd5404bc98834971d0448de6e17914ff8072ab 100644 (file)
@@ -1,14 +1,9 @@
-/* linux/arch/arm/mach-s3c2410/s3c2410.c
- *
- * Copyright (c) 2003-2005 Simtec Electronics
- *     Ben Dooks <ben@simtec.co.uk>
- *
- * http://www.simtec.co.uk/products/EB2410ITX/
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
-*/
+// SPDX-License-Identifier: GPL-2.0
+//
+// Copyright (c) 2003-2005 Simtec Electronics
+//     Ben Dooks <ben@simtec.co.uk>
+//
+// http://www.simtec.co.uk/products/EB2410ITX/
 
 #include <linux/kernel.h>
 #include <linux/types.h>
index 1b02c5ddb31beaad25f1d7b73c96cce70177e3b4..0031cfaa1d765741a22f8eaacd945d19c195c708 100644 (file)
@@ -1,10 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Copyright (c) 2003-2006 Simtec Electronics <linux@simtec.co.uk>
  *     http://armlinux.simtec.co.uk/
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
  */
 
 #ifndef __ARCH_ARM_MACH_S3C24XX_S3C2412_POWER_H
index fb5ee8d389136dc4d5bfc5a52b86509211472569..8fe4d4670dcba268945b66e65ec0c72f6d5a4838 100644 (file)
@@ -1,13 +1,9 @@
-/*
- * Copyright (c) 2006 Simtec Electronics
- *     Ben Dooks <ben@simtec.co.uk>
- *
- * http://armlinux.simtec.co.uk/.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
-*/
+// SPDX-License-Identifier: GPL-2.0
+//
+// Copyright (c) 2006 Simtec Electronics
+//     Ben Dooks <ben@simtec.co.uk>
+//
+// http://armlinux.simtec.co.uk/.
 
 #include <linux/kernel.h>
 #include <linux/types.h>
index 621b8648a7efffd108064cfd781a4a68cdf86ceb..1cdb7bd3e713686bdf9069369e7af5cf15f88176 100644 (file)
@@ -1,26 +1,11 @@
-/* linux/arch/arm/mach-s3c2416/s3c2416.c
- *
- * Copyright (c) 2009 Yauhen Kharuzhy <jekhor@gmail.com>,
- *     as part of OpenInkpot project
- * Copyright (c) 2009 Promwad Innovation Company
- *     Yauhen Kharuzhy <yauhen.kharuzhy@promwad.com>
- *
- * Samsung S3C2416 Mobile CPU support
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-*/
+// SPDX-License-Identifier: GPL-2.0+
+//
+// Copyright (c) 2009 Yauhen Kharuzhy <jekhor@gmail.com>,
+//     as part of OpenInkpot project
+// Copyright (c) 2009 Promwad Innovation Company
+//     Yauhen Kharuzhy <yauhen.kharuzhy@promwad.com>
+//
+// Samsung S3C2416 Mobile CPU support
 
 #include <linux/kernel.h>
 #include <linux/types.h>
index eb733555fab52d495be89fa14fba0407412ce13e..451d9851b0a70b3b4118755a9e65fc832ca744b5 100644 (file)
@@ -1,14 +1,9 @@
-/* linux/arch/arm/mach-s3c2440/s3c2440.c
- *
- * Copyright (c) 2004-2006 Simtec Electronics
- *   Ben Dooks <ben@simtec.co.uk>
- *
- * Samsung S3C2440 Mobile CPU support
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
-*/
+// SPDX-License-Identifier: GPL-2.0
+//
+// Copyright (c) 2004-2006 Simtec Electronics
+//   Ben Dooks <ben@simtec.co.uk>
+//
+// Samsung S3C2440 Mobile CPU support
 
 #include <linux/kernel.h>
 #include <linux/types.h>
index 893998ede0223baf4a7709da0aa53029deaeed08..432d68325c9df373e98d7c462e9103ec7d67c8f5 100644 (file)
@@ -1,25 +1,10 @@
-/* linux/arch/arm/mach-s3c2442/s3c2442.c
- *
- * Copyright (c) 2004-2005 Simtec Electronics
- *     http://armlinux.simtec.co.uk/
- *     Ben Dooks <ben@simtec.co.uk>
- *
- * S3C2442 core and lock support
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-*/
+// SPDX-License-Identifier: GPL-2.0+
+//
+// Copyright (c) 2004-2005 Simtec Electronics
+//     http://armlinux.simtec.co.uk/
+//     Ben Dooks <ben@simtec.co.uk>
+//
+// S3C2442 core and lock support
 
 #include <linux/init.h>
 #include <linux/module.h>
index b559d378cf4325eef7e120b4b626bf06275d3e74..313e369c3ddd0e355a71c03f3b7edf768d143b45 100644 (file)
@@ -1,14 +1,9 @@
-/* linux/arch/arm/mach-s3c2443/s3c2443.c
- *
- * Copyright (c) 2007 Simtec Electronics
- *   Ben Dooks <ben@simtec.co.uk>
- *
- * Samsung S3C2443 Mobile CPU support
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
-*/
+// SPDX-License-Identifier: GPL-2.0
+//
+// Copyright (c) 2007 Simtec Electronics
+//   Ben Dooks <ben@simtec.co.uk>
+//
+// Samsung S3C2443 Mobile CPU support
 
 #include <linux/kernel.h>
 #include <linux/types.h>
index 31fd273269c2d944ba9e69146093b79247bee803..a75f588b9d4565cd8aeb9cd3022d5418eabae1fb 100644 (file)
@@ -1,14 +1,9 @@
-/* linux/arch/arm/plat-s3c24xx/s3c244x.c
- *
- * Copyright (c) 2004-2006 Simtec Electronics
- *   Ben Dooks <ben@simtec.co.uk>
- *
- * Samsung S3C2440 and S3C2442 Mobile CPU support (not S3C2443)
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
-*/
+// SPDX-License-Identifier: GPL-2.0
+//
+// Copyright (c) 2004-2006 Simtec Electronics
+//   Ben Dooks <ben@simtec.co.uk>
+//
+// Samsung S3C2440 and S3C2442 Mobile CPU support (not S3C2443)
 
 #include <linux/kernel.h>
 #include <linux/types.h>
index 72d8edb8927a417c97aa49d346f5d58804667be9..2b262fae3f61f18160cbd239c5f49e95b8e55dc0 100644 (file)
@@ -1,12 +1,8 @@
-/*
- * Copyright (C) 2012 Sylwester Nawrocki <sylvester.nawrocki@gmail.com>
- *
- * Helper functions for S3C24XX/S3C64XX SoC series CAMIF driver
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
+// SPDX-License-Identifier: GPL-2.0
+//
+// Copyright (C) 2012 Sylwester Nawrocki <sylvester.nawrocki@gmail.com>
+//
+// Helper functions for S3C24XX/S3C64XX SoC series CAMIF driver
 
 #include <linux/gpio.h>
 #include <plat/gpio-cfg.h>
index 1852696ca16e6347b854f2a6c245ad61aa59ded7..1a01d44b59105e72718d3a97188adb9e7bbabc4a 100644 (file)
@@ -1,14 +1,9 @@
-/* linux/arch/arm/plat-s3c24xx/setup-i2c.c
- *
- * Copyright 2008 Simtec Electronics
- *     Ben Dooks <ben@simtec.co.uk>
- *
- * S3C24XX Base setup for i2c device
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
-*/
+// SPDX-License-Identifier: GPL-2.0
+//
+// Copyright 2008 Simtec Electronics
+//     Ben Dooks <ben@simtec.co.uk>
+//
+// S3C24XX Base setup for i2c device
 
 #include <linux/kernel.h>
 #include <linux/gpio.h>
index c99b0f664db7af97075e44bf9e87ce1581eac892..218346a36d1e75589c0b5f36fb4053863a9edf64 100644 (file)
@@ -1,16 +1,11 @@
-/* linux/arch/arm/plat-s3c2416/setup-sdhci-gpio.c
- *
- * Copyright 2010 Promwad Innovation Company
- *     Yauhen Kharuzhy <yauhen.kharuzhy@promwad.com>
- *
- * S3C2416 - Helper functions for setting up SDHCI device(s) GPIO (HSMMC)
- *
- * Based on mach-s3c64xx/setup-sdhci-gpio.c
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
-*/
+// SPDX-License-Identifier: GPL-2.0
+//
+// Copyright 2010 Promwad Innovation Company
+//     Yauhen Kharuzhy <yauhen.kharuzhy@promwad.com>
+//
+// S3C2416 - Helper functions for setting up SDHCI device(s) GPIO (HSMMC)
+//
+// Based on mach-s3c64xx/setup-sdhci-gpio.c
 
 #include <linux/kernel.h>
 #include <linux/types.h>
index 3d47e023ce942a6de1147e4dcf7f381443a08a63..6c2b96a82da5279e3c023b2c6c158097d557494c 100644 (file)
@@ -1,13 +1,9 @@
-/*
- * HS-SPI device setup for S3C2443/S3C2416
- *
- * Copyright (C) 2011 Samsung Electronics Ltd.
- *             http://www.samsung.com/
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
+// SPDX-License-Identifier: GPL-2.0
+//
+// HS-SPI device setup for S3C2443/S3C2416
+//
+// Copyright (C) 2011 Samsung Electronics Ltd.
+//             http://www.samsung.com/
 
 #include <linux/gpio.h>
 #include <linux/platform_device.h>
index 46466d20257e3fcaa23017d9b103aa71a04b21a5..53a14d4f48520d80334876f1453a0f5825cea090 100644 (file)
@@ -1,14 +1,9 @@
-/* linux/arch/arm/plat-s3c24xx/setup-ts.c
- *
- * Copyright (c) 2010 Samsung Electronics Co., Ltd.
- *                     http://www.samsung.com/
- *
- * Based on S3C24XX setup for i2c device
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
+// SPDX-License-Identifier: GPL-2.0
+//
+// Copyright (c) 2010 Samsung Electronics Co., Ltd.
+//                     http://www.samsung.com/
+//
+// Based on S3C24XX setup for i2c device
 
 #include <linux/kernel.h>
 #include <linux/gpio.h>
index 67cb5120dfeb5dc5cc4d7a70d44571eebcce9ab6..12e17f82dae3e32ce567d4e6fba56f33e69c9aac 100644 (file)
@@ -1,15 +1,10 @@
-/* linux/arch/arm/plat-s3c24xx/simtec-audio.c
- *
- * Copyright (c) 2009 Simtec Electronics
- *     http://armlinux.simtec.co.uk/
- *     Ben Dooks <ben@simtec.co.uk>
- *
- * Audio setup for various Simtec S3C24XX implementations
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
-*/
+// SPDX-License-Identifier: GPL-2.0
+//
+// Copyright (c) 2009 Simtec Electronics
+//     http://armlinux.simtec.co.uk/
+//     Ben Dooks <ben@simtec.co.uk>
+//
+// Audio setup for various Simtec S3C24XX implementations
 
 #include <linux/kernel.h>
 #include <linux/interrupt.h>
index 8884bffa619a6785c63c0d137a93cb003b679f2e..26b18497e9595f543b3c69cb7d535d425787b409 100644 (file)
@@ -1,15 +1,10 @@
-/* linux/arch/arm/mach-s3c2410/nor-simtec.c
- *
- * Copyright (c) 2008 Simtec Electronics
- *     http://armlinux.simtec.co.uk/
- *     Ben Dooks <ben@simtec.co.uk>
- *
- * Simtec NOR mapping
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
-*/
+// SPDX-License-Identifier: GPL-2.0
+//
+// Copyright (c) 2008 Simtec Electronics
+//     http://armlinux.simtec.co.uk/
+//     Ben Dooks <ben@simtec.co.uk>
+//
+// Simtec NOR mapping
 
 #include <linux/module.h>
 #include <linux/types.h>
index 38a2f1fdebab1c8ae9d1d295003bcecfa633f4f4..c19074d81389dae53d2a5788ecc9d30542a79822 100644 (file)
@@ -1,16 +1,11 @@
-/* linux/arch/arm/plat-s3c24xx/pm-simtec.c
- *
- * Copyright 2004 Simtec Electronics
- *     Ben Dooks <ben@simtec.co.uk>
- *
- * http://armlinux.simtec.co.uk/
- *
- * Power Management helpers for Simtec S3C24XX implementations
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
-*/
+// SPDX-License-Identifier: GPL-2.0
+//
+// Copyright 2004 Simtec Electronics
+//     Ben Dooks <ben@simtec.co.uk>
+//
+// http://armlinux.simtec.co.uk/
+//
+// Power Management helpers for Simtec S3C24XX implementations
 
 #include <linux/kernel.h>
 #include <linux/types.h>
index b70aa66efebea9246159155ffbcf5ea2782c30af..dc1016ffed94e713417d46a56a63c70995ab07c0 100644 (file)
@@ -1,16 +1,11 @@
-/* linux/arch/arm/mach-s3c2410/usb-simtec.c
- *
- * Copyright 2004-2005 Simtec Electronics
- *   Ben Dooks <ben@simtec.co.uk>
- *
- * http://www.simtec.co.uk/products/EB2410ITX/
- *
- * Simtec BAST and Thorcom VR1000 USB port support functions
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
-*/
+// SPDX-License-Identifier: GPL-2.0
+//
+// Copyright 2004-2005 Simtec Electronics
+//   Ben Dooks <ben@simtec.co.uk>
+//
+// http://www.simtec.co.uk/products/EB2410ITX/
+//
+// Simtec BAST and Thorcom VR1000 USB port support functions
 
 #define DEBUG
 
index ae8f4f9ad2ee2f7d17d4aef34c010b9cab6b238e..d96bd60872b88c546c7776a72991d5de0bf1c71c 100644 (file)
@@ -1,15 +1,11 @@
-/* linux/arch/arm/mach-s3c2410/nor-simtec.h
- *
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
  * Copyright (c) 2008 Simtec Electronics
  *     http://armlinux.simtec.co.uk/
  *     Ben Dooks <ben@simtec.co.uk>
  *
  * Simtec common functions
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
-*/
+ */
 
 struct s3c24xx_audio_simtec_pdata;
 
index 875ba8911127f56c98b2805323d7d62211ec6096..659f9eff9de2d808ea6557d00a64eee53cec2415 100644 (file)
@@ -1,5 +1,5 @@
-/* linux/arch/arm/mach-s3c2410/sleep.S
- *
+/* SPDX-License-Identifier: GPL-2.0+ */
+/*
  * Copyright (c) 2004 Simtec Electronics
  *     Ben Dooks <ben@simtec.co.uk>
  *
@@ -8,21 +8,7 @@
  * Based on PXA/SA1100 sleep code by:
  *     Nicolas Pitre, (c) 2002 Monta Vista Software Inc
  *     Cliff Brake, (c) 2001
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-*/
+ */
 
 #include <linux/linkage.h>
 #include <linux/serial_s3c.h>
index 6bf5b4d8743c05ef52bef07d467b8bfa7062115d..c373f1ca862bca608b72e4bbce8b7624603e8cd7 100644 (file)
@@ -1,24 +1,10 @@
-/* linux/arch/arm/mach-s3c2412/sleep.S
- *
+/* SPDX-License-Identifier: GPL-2.0+ */
+/*
  * Copyright (c) 2007 Simtec Electronics
  *     Ben Dooks <ben@simtec.co.uk>
  *
  * S3C2412 Power Manager low-level sleep support
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-*/
+ */
 
 #include <linux/linkage.h>
 #include <asm/assembler.h>
index b859268fa8da1f1bb692167a5ba7c209206a4c5e..f0f11ad60c52c4bc262ebb7194a0ab46f597bf39 100644 (file)
@@ -1,5 +1,5 @@
-/* linux/arch/arm/plat-s3c24xx/sleep.S
- *
+/* SPDX-License-Identifier: GPL-2.0+ */
+/*
  * Copyright (c) 2004 Simtec Electronics
  *     Ben Dooks <ben@simtec.co.uk>
  *
@@ -8,21 +8,7 @@
  * Based on PXA/SA1100 sleep code by:
  *     Nicolas Pitre, (c) 2002 Monta Vista Software Inc
  *     Cliff Brake, (c) 2001
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-*/
+ */
 
 #include <linux/linkage.h>
 #include <linux/serial_s3c.h>
index 0b9428ab3fc3d0abb74412ee3df892778b2f1804..bb555ccbe057215614d1300cb19ff62013dc643f 100644 (file)
@@ -1,9 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Copyright (C) 2012 Heiko Stuebner <heiko@sntech.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
  */
 
 #ifndef __PLAT_S3C_SPI_CORE_H
index 7fcd2c2f183ccfcd07864b54429208a3b352318c..3cfa296bec2acffaeef4f07f92666e03c6f291d9 100644 (file)
@@ -1,17 +1,12 @@
-
-/* arch/arm/mach-s3c2410/include/mach/vr1000-cpld.h
- *
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
  * Copyright (c) 2003 Simtec Electronics
  *     Ben Dooks <ben@simtec.co.uk>
  *
  * VR1000 - CPLD control constants
  * Machine VR1000 - IRQ Number definitions
  * Machine VR1000 - Memory map definitions
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
-*/
+ */
 
 #ifndef __MACH_S3C24XX_VR1000_H
 #define __MACH_S3C24XX_VR1000_H __FILE__
index afd1f20be49ed6d309b924e69b3e5870dce35c25..5700822e3c74b8e4902bcfc4e5c44d966ce5e957 100644 (file)
@@ -1,7 +1,8 @@
+# SPDX-License-Identifier: GPL-2.0
+#
 # Copyright 2008 Openmoko, Inc.
 #      Simtec Electronics, Ben Dooks <ben@simtec.co.uk>
-#
-# Licensed under GPLv2
+
 menuconfig ARCH_S3C64XX
        bool "Samsung S3C64XX"
        depends on ARCH_MULTI_V6
index 256cd5b40c60aaf73d6397639124220990ca770c..8caeb4ad17e92c61630e6ae7c83d7d97275fcda3 100644 (file)
@@ -1,9 +1,7 @@
-# arch/arm/mach-s3c64xx/Makefile
+# SPDX-License-Identifier: GPL-2.0
 #
 # Copyright 2008 Openmoko, Inc.
 # Copyright 2008 Simtec Electronics
-#
-# Licensed under GPLv2
 
 ccflags-$(CONFIG_ARCH_MULTIPLATFORM) := -I$(srctree)/$(src)/include -I$(srctree)/arch/arm/plat-samsung/include
 asflags-$(CONFIG_ARCH_MULTIPLATFORM) := -I$(srctree)/$(src)/include -I$(srctree)/arch/arm/plat-samsung/include
index 5951f24a9ec848541365d084e3b878c7ee5d6792..6d9a81f759e60c20172a2d52c85d81ca85006aac 100644 (file)
@@ -1,13 +1,10 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Copyright (c) 2010 Samsung Electronics Co., Ltd.
  *             http://www.samsung.com
  *
  * Samsung CF-ATA Controller core functions
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
-*/
+ */
 
 #ifndef __ASM_PLAT_ATA_CORE_H
 #define __ASM_PLAT_ATA_CORE_H __FILE__
index 8dcacac523a2d47a4b49d278e4d5921e5606a3cc..028663f1cacc0175f1123eb9c2877f532568d70b 100644 (file)
@@ -1,10 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Copyright (c) 2011 Samsung Electronics Co., Ltd.
  *              http://www.samsung.com
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
  */
 
 #ifndef __ASM_PLAT_BACKLIGHT_H
index 9843eb4dd04ee05a4377fc8727d0836b35245d65..13e91074308aeaf51fa3b69ec498655c19f1e5c2 100644 (file)
@@ -1,18 +1,14 @@
-/*
- * Copyright (c) 2011 Samsung Electronics Co., Ltd.
- *             http://www.samsung.com
- *
- * Copyright 2008 Openmoko, Inc.
- * Copyright 2008 Simtec Electronics
- *     Ben Dooks <ben@simtec.co.uk>
- *     http://armlinux.simtec.co.uk/
- *
- * Common Codes for S3C64XX machines
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
+// SPDX-License-Identifier: GPL-2.0
+//
+// Copyright (c) 2011 Samsung Electronics Co., Ltd.
+//             http://www.samsung.com
+//
+// Copyright 2008 Openmoko, Inc.
+// Copyright 2008 Simtec Electronics
+//     Ben Dooks <ben@simtec.co.uk>
+//     http://armlinux.simtec.co.uk/
+//
+// Common Codes for S3C64XX machines
 
 /*
  * NOTE: Code in this file is not used when booting with Device Tree support.
index 4f204668f00e073a5007c8572b3d34d3b1b98ff0..03670887a764f7fa51a4e9304320bf55b46cb6bf 100644 (file)
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Copyright (c) 2011 Samsung Electronics Co., Ltd.
  *             http://www.samsung.com
@@ -8,10 +9,6 @@
  *     http://armlinux.simtec.co.uk/
  *
  * Common Header for S3C64XX machines
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
  */
 
 #ifndef __ARCH_ARM_MACH_S3C64XX_COMMON_H
index 5322db51150e8830e81d49791b51836156383d42..0bac6f6413b0ed707b3d0a8cd28dbb24639c1344 100644 (file)
@@ -1,13 +1,8 @@
-/* linux/arch/arm/mach-s3c64xx/cpuidle.c
- *
- * Copyright (c) 2011 Wolfson Microelectronics, plc
- * Copyright (c) 2011 Samsung Electronics Co., Ltd.
- *             http://www.samsung.com
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
-*/
+// SPDX-License-Identifier: GPL-2.0
+//
+// Copyright (c) 2011 Wolfson Microelectronics, plc
+// Copyright (c) 2011 Samsung Electronics Co., Ltd.
+//             http://www.samsung.com
 
 #include <linux/kernel.h>
 #include <linux/init.h>
index dcbe17f5e5f8054ee7fd1e796197eb88d78e97a8..00d9aa114aa7b43e14f6fc6326c48f427c30c447 100644 (file)
@@ -1,11 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* Cragganmore 6410 shared definitions
  *
  * Copyright 2011 Wolfson Microelectronics plc
  *     Mark Brown <broonie@opensource.wolfsonmicro.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
  */
 
 #ifndef MACH_CRAG6410_H
index cb953e238b2a61b8f80155d7b9d66549de12535e..e3c49b5d1355b93e585356b5e347e558e53600f5 100644 (file)
@@ -1,12 +1,7 @@
-/* linux/arch/arm/plat-s3c/dev-audio.c
- *
- * Copyright 2009 Wolfson Microelectronics
- *      Mark Brown <broonie@opensource.wolfsonmicro.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
+// SPDX-License-Identifier: GPL-2.0
+//
+// Copyright 2009 Wolfson Microelectronics
+//      Mark Brown <broonie@opensource.wolfsonmicro.com>
 
 #include <linux/kernel.h>
 #include <linux/string.h>
index 7ef8b901934400c3b9849b2197041a361d11fbf3..799cfdf0606b300ca11cb493bcc511d7ccd81bff 100644 (file)
@@ -1,13 +1,9 @@
-/*
- * Copyright (c) 2011 Samsung Electronics Co., Ltd.
- *              http://www.samsung.com
- *
- * Common infrastructure for PWM Backlight for Samsung boards
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
+// SPDX-License-Identifier: GPL-2.0
+//
+// Copyright (c) 2011 Samsung Electronics Co., Ltd.
+//              http://www.samsung.com
+//
+// Common infrastructure for PWM Backlight for Samsung boards
 
 #include <linux/gpio.h>
 #include <linux/platform_device.h>
index a0b4f0329811ee78984575b76b00ce9c9c87a14a..5fb59ad30008996015522a0b3e5f588c606e58b1 100644 (file)
@@ -1,17 +1,11 @@
-/* linux/arch/arm/plat-s3c64xx/dev-uart.c
- *
- * Copyright 2008 Openmoko, Inc.
- * Copyright 2008 Simtec Electronics
- *     Ben Dooks <ben@simtec.co.uk>
- *     http://armlinux.simtec.co.uk/
- *
- * Base S3C64XX UART resource and device definitions
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
-*/
+// SPDX-License-Identifier: GPL-2.0
+//
+// Copyright 2008 Openmoko, Inc.
+// Copyright 2008 Simtec Electronics
+//     Ben Dooks <ben@simtec.co.uk>
+//     http://armlinux.simtec.co.uk/
+//
+// Base S3C64XX UART resource and device definitions
 
 #include <linux/kernel.h>
 #include <linux/types.h>
index 1d3636512e330d6f2e7645a5816025df0cf01f43..8ed144a0d47477565c8f716a9373298e170221c7 100644 (file)
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Copyright 2008 Openmoko, Inc.
  * Copyright 2008 Simtec Electronics
@@ -5,11 +6,7 @@
  *     Ben Dooks <ben@simtec.co.uk>
  *
  * S3C6400 - GPIO lib support
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
-*/
+ */
 
 #ifndef GPIO_SAMSUNG_S3C64XX_H
 #define GPIO_SAMSUNG_S3C64XX_H
index 862d033e57a4fd5554e7005ea93cb1d5881a568b..c4ed359474deef00fd74ef30bba730dc6e329329 100644 (file)
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* linux/arch/arm/mach-s3c6400/include/mach/hardware.h
  *
  * Copyright 2008 Openmoko, Inc.
index d51873e8f63f87f4a20ec316078eaab3185fae5d..9372a535b7ba8b646aca6792f2317679d253a6b4 100644 (file)
@@ -1,16 +1,12 @@
-/* linux/arch/arm/mach-s3c6400/include/mach/map.h
- *
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
  * Copyright 2008 Openmoko, Inc.
  * Copyright 2008 Simtec Electronics
  *     http://armlinux.simtec.co.uk/
  *     Ben Dooks <ben@simtec.co.uk>
  *
  * S3C64XX - Memory map definitions
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
-*/
+ */
 
 #ifndef __ASM_ARCH_MAP_H
 #define __ASM_ARCH_MAP_H __FILE__
index 4a285e97afff3dbaeecdcec9fa725e3c329c79b1..bbf79ed285838b916b33b61476b43b7808c19cca 100644 (file)
@@ -1,15 +1,11 @@
-/* linux/arch/arm/mach-s3c64xx/include/mach/pm-core.h
- *
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
  * Copyright 2008 Openmoko, Inc.
  * Copyright 2008 Simtec Electronics
  *      Ben Dooks <ben@simtec.co.uk>
  *      http://armlinux.simtec.co.uk/
  *
  * S3C64XX - PM core support for arch/arm/plat-s3c/pm.c
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
  */
 
 #ifndef __MACH_S3C64XX_PM_CORE_H
index 4f44aac770924134e735bf5e8b41eb6fe25c5920..35a68767b318af28263f8a905d4f6ecb48ff1203 100644 (file)
@@ -1,16 +1,12 @@
-/* arch/arm/plat-s3c64xx/include/plat/regs-clock.h
- *
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
  * Copyright 2008 Openmoko, Inc.
  * Copyright 2008 Simtec Electronics
  *     Ben Dooks <ben@simtec.co.uk>
  *     http://armlinux.simtec.co.uk/
  *
  * S3C64XX clock register definitions
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
-*/
+ */
 
 #ifndef __PLAT_REGS_CLOCK_H
 #define __PLAT_REGS_CLOCK_H __FILE__
index 6a1127891c877b2334c4e46a423acb683e269c1a..b18c7bcb61c59aa0ca6bf3c9d419a3ba514c4c9f 100644 (file)
@@ -1,16 +1,12 @@
-/* linux/arch/arm/mach-s3c6400/include/mach/regs-irq.h
- *
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
  * Copyright 2008 Openmoko, Inc.
  * Copyright 2008 Simtec Electronics
  *     http://armlinux.simtec.co.uk/
  *     Ben Dooks <ben@simtec.co.uk>
  *
  * S3C64XX - IRQ register definitions
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
-*/
+ */
 
 #ifndef __ASM_ARCH_REGS_IRQ_H
 #define __ASM_ARCH_REGS_IRQ_H __FILE__
index 0bbf1faaee4218d5bd4fbee81852954e9f5e1490..31b221190479eebeeacaedf81abb5ad1aa5096bc 100644 (file)
@@ -1,16 +1,11 @@
-/* arch/arm/plat-s3c64xx/irq-pm.c
- *
- * Copyright 2008 Openmoko, Inc.
- * Copyright 2008 Simtec Electronics
- *      Ben Dooks <ben@simtec.co.uk>
- *      http://armlinux.simtec.co.uk/
- *
- * S3C64XX - Interrupt handling Power Management
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
+// SPDX-License-Identifier: GPL-2.0
+//
+// Copyright 2008 Openmoko, Inc.
+// Copyright 2008 Simtec Electronics
+//      Ben Dooks <ben@simtec.co.uk>
+//      http://armlinux.simtec.co.uk/
+//
+// S3C64XX - Interrupt handling Power Management
 
 /*
  * NOTE: Code in this file is not used when booting with Device Tree support.
index 4b296132962f9a4268695bef0aeb01ec0ed7ec78..78eccdce95a7191ef5411bdbbf740c653d5fd771 100644 (file)
@@ -1,13 +1,10 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Copyright (c) 2010 Simtec Electronics
  *     Ben Dooks <ben@simtec.co.uk>
  *
  * Header file for Samsung SoC UART IRQ demux for S3C64XX and later
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
-*/
+ */
 
 struct s3c_uart_irq {
        void __iomem    *regs;
index 347ce6009a8c1cfec32a2e798cdca69bad47780c..0d3d5befb80615ec1dc0471703326eb67e416dab 100644 (file)
@@ -1,17 +1,11 @@
-/* linux/arch/arm/mach-s3c64xx/mach-anw6410.c
- *
- * Copyright 2008 Openmoko, Inc.
- * Copyright 2008 Simtec Electronics
- *     Ben Dooks <ben@simtec.co.uk>
- *     http://armlinux.simtec.co.uk/
- * Copyright 2009 Kwangwoo Lee
- *     Kwangwoo Lee <kwangwoo.lee@gmail.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
-*/
+// SPDX-License-Identifier: GPL-2.0
+//
+// Copyright 2008 Openmoko, Inc.
+// Copyright 2008 Simtec Electronics
+//     Ben Dooks <ben@simtec.co.uk>
+//     http://armlinux.simtec.co.uk/
+// Copyright 2009 Kwangwoo Lee
+//     Kwangwoo Lee <kwangwoo.lee@gmail.com>
 
 #include <linux/kernel.h>
 #include <linux/types.h>
index ea5f2169c850af9acf2657f77af7e43e1dab31fe..f00988705408d00083d6b2c5fe592922cb89f66d 100644 (file)
@@ -1,12 +1,9 @@
-/* Speyside modules for Cragganmore - board data probing
- *
- * Copyright 2011 Wolfson Microelectronics plc
- *     Mark Brown <broonie@opensource.wolfsonmicro.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
+// SPDX-License-Identifier: GPL-2.0
+//
+// Speyside modules for Cragganmore - board data probing
+//
+// Copyright 2011 Wolfson Microelectronics plc
+//     Mark Brown <broonie@opensource.wolfsonmicro.com>
 
 #include <linux/export.h>
 #include <linux/interrupt.h>
index d9d0440aed78d04f674038f26f28fce6a03dccb4..f0465029748726ab53691daf3de8686e663c3dfa 100644 (file)
@@ -1,15 +1,10 @@
-/* linux/arch/arm/mach-s3c64xx/mach-crag6410.c
- *
- * Copyright 2011 Wolfson Microelectronics plc
- *     Mark Brown <broonie@opensource.wolfsonmicro.com>
- *
- * Copyright 2011 Simtec Electronics
- *     Ben Dooks <ben@simtec.co.uk>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
+// SPDX-License-Identifier: GPL-2.0
+//
+// Copyright 2011 Wolfson Microelectronics plc
+//     Mark Brown <broonie@opensource.wolfsonmicro.com>
+//
+// Copyright 2011 Simtec Electronics
+//     Ben Dooks <ben@simtec.co.uk>
 
 #include <linux/kernel.h>
 #include <linux/list.h>
index 59b5531f198743363eed55b3a316744eaae6d491..bfe9881d12cc7daf73a57706d198bcb7039e0ca1 100644 (file)
@@ -1,12 +1,8 @@
-/* mach-hmt.c - Platform code for Airgoo HMT
- *
- * Copyright 2009 Peter Korsgaard <jacmet@sunsite.dk>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
-*/
+// SPDX-License-Identifier: GPL-2.0
+//
+// mach-hmt.c - Platform code for Airgoo HMT
+//
+// Copyright 2009 Peter Korsgaard <jacmet@sunsite.dk>
 
 #include <linux/kernel.h>
 #include <linux/init.h>
index a3e3e25728b41f10e9c8e92908f60bda3c6b47fc..0dd36ae49e6a56aac537042ddae357faa2f6ae08 100644 (file)
@@ -1,16 +1,10 @@
-/* linux/arch/arm/mach-s3c64xx/mach-mini6410.c
- *
- * Copyright 2010 Darius Augulis <augulis.darius@gmail.com>
- * Copyright 2008 Openmoko, Inc.
- * Copyright 2008 Simtec Electronics
- *     Ben Dooks <ben@simtec.co.uk>
- *     http://armlinux.simtec.co.uk/
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
-*/
+// SPDX-License-Identifier: GPL-2.0
+//
+// Copyright 2010 Darius Augulis <augulis.darius@gmail.com>
+// Copyright 2008 Openmoko, Inc.
+// Copyright 2008 Simtec Electronics
+//     Ben Dooks <ben@simtec.co.uk>
+//     http://armlinux.simtec.co.uk/
 
 #include <linux/init.h>
 #include <linux/interrupt.h>
index 23baaa04318c42662e86df8ec34af3e45d228f8a..13fea5c86ca3acc60d20af2a9e05f532fe8275a7 100644 (file)
@@ -1,13 +1,6 @@
-/*
- * linux/arch/arm/mach-s3c64xx/mach-ncp.c
- *
- * Copyright (C) 2008-2009 Samsung Electronics
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
- */
+// SPDX-License-Identifier: GPL-2.0
+//
+// Copyright (C) 2008-2009 Samsung Electronics
 
 #include <linux/kernel.h>
 #include <linux/types.h>
index d6b3ffd7704bdf7c18d48a42b6f67969dc755a8f..0ff88b6859c4364327d70327e57fd2b8b2b9c445 100644 (file)
@@ -1,16 +1,10 @@
-/* linux/arch/arm/mach-s3c64xx/mach-real6410.c
- *
- * Copyright 2010 Darius Augulis <augulis.darius@gmail.com>
- * Copyright 2008 Openmoko, Inc.
- * Copyright 2008 Simtec Electronics
- *     Ben Dooks <ben@simtec.co.uk>
- *     http://armlinux.simtec.co.uk/
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
-*/
+// SPDX-License-Identifier: GPL-2.0
+//
+// Copyright 2010 Darius Augulis <augulis.darius@gmail.com>
+// Copyright 2008 Openmoko, Inc.
+// Copyright 2008 Simtec Electronics
+//     Ben Dooks <ben@simtec.co.uk>
+//     http://armlinux.simtec.co.uk/
 
 #include <linux/init.h>
 #include <linux/interrupt.h>
index 5bf9afae752d655d224346ec6eb86715a2232a9a..1724f5ea5c462f3def8d22d81aa497bf3ce51ecd 100644 (file)
@@ -1,12 +1,8 @@
-/*
- * Samsung's S3C64XX flattened device tree enabled machine
- *
- * Copyright (c) 2013 Tomasz Figa <tomasz.figa@gmail.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
-*/
+// SPDX-License-Identifier: GPL-2.0
+//
+// Samsung's S3C64XX flattened device tree enabled machine
+//
+// Copyright (c) 2013 Tomasz Figa <tomasz.figa@gmail.com>
 
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
index e0e1a729ef98b4b7db05eb95b57e66c752f5912d..5655fe968b1f03ebc1dd9723e3d1657c170fc339 100644 (file)
@@ -1,13 +1,6 @@
-/*
- * linux/arch/arm/mach-s3c64xx/mach-smartq.c
- *
- * Copyright (C) 2010 Maurus Cuelenaere
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
- */
+// SPDX-License-Identifier: GPL-2.0
+//
+// Copyright (C) 2010 Maurus Cuelenaere
 
 #include <linux/delay.h>
 #include <linux/fb.h>
index 8e8b693db3af3f8f063706d863124c5d7b99ba77..f98132f4f430e3f5c12ea6fd9e8c6b2efb611d26 100644 (file)
@@ -1,12 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * linux/arch/arm/mach-s3c64xx/mach-smartq.h
  *
  * Copyright (C) 2010 Maurus Cuelenaere
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
  */
 
 #ifndef __MACH_SMARTQ_H
index 0972b6ce0ef66b6f402b0657c55c0b72e8e31425..44e9edb144fa5283507dd86441d4a47dbcf3a9bc 100644 (file)
@@ -1,13 +1,6 @@
-/*
- * linux/arch/arm/mach-s3c64xx/mach-smartq5.c
- *
- * Copyright (C) 2010 Maurus Cuelenaere
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
- */
+// SPDX-License-Identifier: GPL-2.0
+//
+// Copyright (C) 2010 Maurus Cuelenaere
 
 #include <linux/fb.h>
 #include <linux/gpio.h>
index 51ac1c6c654a8378ad913d9e8dfdbfdad2f19121..815ee7d0b5e31ba37b9c658f655ea3c82346ad57 100644 (file)
@@ -1,13 +1,6 @@
-/*
- * linux/arch/arm/mach-s3c64xx/mach-smartq7.c
- *
- * Copyright (C) 2010 Maurus Cuelenaere
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
- */
+// SPDX-License-Identifier: GPL-2.0
+//
+// Copyright (C) 2010 Maurus Cuelenaere
 
 #include <linux/fb.h>
 #include <linux/gpio.h>
index 7d8a74fd8915a7636501276cb7993a8081cb3b01..cbd16843c7d14a3fb325372d4beaae3321efe4cb 100644 (file)
@@ -1,13 +1,8 @@
-/* linux/arch/arm/mach-s3c64xx/mach-smdk6400.c
- *
- * Copyright 2008 Simtec Electronics
- *     Ben Dooks <ben@simtec.co.uk>
- *     http://armlinux.simtec.co.uk/
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
-*/
+// SPDX-License-Identifier: GPL-2.0
+//
+// Copyright 2008 Simtec Electronics
+//     Ben Dooks <ben@simtec.co.uk>
+//     http://armlinux.simtec.co.uk/
 
 #include <linux/kernel.h>
 #include <linux/types.h>
index 92ec8c3b42b9b2eb00705fbc8005b7403f64a2ec..c46fa5dfd2e00420aca1c35398556c0da47fc634 100644 (file)
@@ -1,15 +1,9 @@
-/* linux/arch/arm/mach-s3c64xx/mach-smdk6410.c
- *
- * Copyright 2008 Openmoko, Inc.
- * Copyright 2008 Simtec Electronics
- *     Ben Dooks <ben@simtec.co.uk>
- *     http://armlinux.simtec.co.uk/
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
-*/
+// SPDX-License-Identifier: GPL-2.0
+//
+// Copyright 2008 Openmoko, Inc.
+// Copyright 2008 Simtec Electronics
+//     Ben Dooks <ben@simtec.co.uk>
+//     http://armlinux.simtec.co.uk/
 
 #include <linux/kernel.h>
 #include <linux/types.h>
index 925eb13bbb60752ce25a4d10f0606c372db9b837..0cf6b5e76b2474c97b7276419ee4ac0319fed413 100644 (file)
@@ -1,14 +1,11 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *  Copyright (c) 2010 Samsung Electronics
  *  Kyungmin Park <kyungmin.park@samsung.com>
  *  Marek Szyprowski <m.szyprowski@samsung.com>
  *
  * Samsung OneNAD Controller core functions
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
-*/
+ */
 
 #ifndef __ASM_ARCH_ONENAND_CORE_H
 #define __ASM_ARCH_ONENAND_CORE_H __FILE__
index 66fc774b70ec238548c0f3a99fd749baf4062787..152edbeea0c7e0276ecc1ccd5cdfeb131ff6ae91 100644 (file)
@@ -1,12 +1,8 @@
-/*
- * Samsung's S3C64XX generic DMA support using amba-pl08x driver.
- *
- * Copyright (c) 2013 Tomasz Figa <tomasz.figa@gmail.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
+// SPDX-License-Identifier: GPL-2.0
+//
+// Samsung's S3C64XX generic DMA support using amba-pl08x driver.
+//
+// Copyright (c) 2013 Tomasz Figa <tomasz.figa@gmail.com>
 
 #include <linux/kernel.h>
 #include <linux/amba/bus.h>
index 2f579be8fe677adc72032ca91a647ac046f02a4a..fd6dbb263ed57f7472f32e61d262d3d7a225ce81 100644 (file)
@@ -1,16 +1,11 @@
-/* linux/arch/arm/plat-s3c64xx/pm.c
- *
- * Copyright 2008 Openmoko, Inc.
- * Copyright 2008 Simtec Electronics
- *     Ben Dooks <ben@simtec.co.uk>
- *     http://armlinux.simtec.co.uk/
- *
- * S3C64XX CPU PM support.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
-*/
+// SPDX-License-Identifier: GPL-2.0
+//
+// Copyright 2008 Openmoko, Inc.
+// Copyright 2008 Simtec Electronics
+//     Ben Dooks <ben@simtec.co.uk>
+//     http://armlinux.simtec.co.uk/
+//
+// S3C64XX CPU PM support.
 
 #include <linux/init.h>
 #include <linux/suspend.h>
index 073cdd3a03be0e41530510d576a235d556f98067..136ad44291bf5550d90cf6207e880f942a23afa9 100644 (file)
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Copyright 2008 Openmoko, Inc.
  * Copyright 2008 Simtec Electronics
@@ -5,11 +6,7 @@
  *      Ben Dooks <ben@simtec.co.uk>
  *
  * S3C64XX - modem block registers
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
-*/
+ */
 
 #ifndef __MACH_S3C64XX_REGS_MODEM_H
 #define __MACH_S3C64XX_REGS_MODEM_H __FILE__
index d56f3386eb0032e83aeb837b8f996abdb03e6bc9..2b37988bdf94300f0898f1ad097c8545805c8945 100644 (file)
@@ -1,12 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Copyright 2009 Andy Green <andy@warmcat.com>
  *
  * S3C64XX SROM definitions
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
-*/
+ */
 
 #ifndef __MACH_S3C64XX_REGS_SROM_H
 #define __MACH_S3C64XX_REGS_SROM_H __FILE__
index 5ea82accc773ba822a5458c5310b94eb08d6ec27..545eea716db8cf70118333114aec498f7224cb58 100644 (file)
@@ -1,13 +1,8 @@
-/* linux/arch/arm/mach-s3c64xx/cpu.c
- *
- * Copyright 2009 Simtec Electronics
- *     Ben Dooks <ben@simtec.co.uk>
- *     http://armlinux.simtec.co.uk/
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
-*/
+// SPDX-License-Identifier: GPL-2.0
+//
+// Copyright 2009 Simtec Electronics
+//     Ben Dooks <ben@simtec.co.uk>
+//     http://armlinux.simtec.co.uk/
 
 /*
  * NOTE: Code in this file is not used when booting with Device Tree support.
index 92bb927c4478c3301a358e3da63470881388ec62..47e04e01962491e61c2a2f41b822d763f107db58 100644 (file)
@@ -1,14 +1,9 @@
-/* linux/arch/arm/mach-s3c64xx/s3c6410.c
- *
- * Copyright 2008 Simtec Electronics
- * Copyright 2008 Simtec Electronics
- *     Ben Dooks <ben@simtec.co.uk>
- *     http://armlinux.simtec.co.uk/
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
-*/
+// SPDX-License-Identifier: GPL-2.0
+//
+// Copyright 2008 Simtec Electronics
+// Copyright 2008 Simtec Electronics
+//     Ben Dooks <ben@simtec.co.uk>
+//     http://armlinux.simtec.co.uk/
 
 /*
  * NOTE: Code in this file is not used when booting with Device Tree support.
index 9d17bff12d4df6bd650309e16f7c99ebbc015f75..2c7178b26ebb52c9e1d50d8d7debca8908f513c6 100644 (file)
@@ -1,16 +1,11 @@
-/* linux/arch/arm/plat-s3c64xx/setup-fb-24bpp.c
- *
- * Copyright 2008 Openmoko, Inc.
- * Copyright 2008 Simtec Electronics
- *     Ben Dooks <ben@simtec.co.uk>
- *     http://armlinux.simtec.co.uk/
- *
- * Base S3C64XX setup information for 24bpp LCD framebuffer
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
-*/
+// SPDX-License-Identifier: GPL-2.0
+//
+// Copyright 2008 Openmoko, Inc.
+// Copyright 2008 Simtec Electronics
+//     Ben Dooks <ben@simtec.co.uk>
+//     http://armlinux.simtec.co.uk/
+//
+// Base S3C64XX setup information for 24bpp LCD framebuffer
 
 #include <linux/kernel.h>
 #include <linux/types.h>
index 4b8c1cfdd1fc96fc478584b0c02014a272ade7d5..552eb50da38c4250dff8b9d879a5d1251ea17b09 100644 (file)
@@ -1,16 +1,11 @@
-/* linux/arch/arm/plat-s3c64xx/setup-i2c0.c
- *
- * Copyright 2008 Openmoko, Inc.
- * Copyright 2008 Simtec Electronics
- *     Ben Dooks <ben@simtec.co.uk>
- *     http://armlinux.simtec.co.uk/
- *
- * Base S3C64XX I2C bus 0 gpio configuration
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
-*/
+// SPDX-License-Identifier: GPL-2.0
+//
+// Copyright 2008 Openmoko, Inc.
+// Copyright 2008 Simtec Electronics
+//     Ben Dooks <ben@simtec.co.uk>
+//     http://armlinux.simtec.co.uk/
+//
+// Base S3C64XX I2C bus 0 gpio configuration
 
 #include <linux/kernel.h>
 #include <linux/types.h>
index cd1df71ee13bfd069fe45ecac967812104e62d55..d231f0fc508df2b674cdd8a83034296446e7168b 100644 (file)
@@ -1,16 +1,11 @@
-/* linux/arch/arm/plat-s3c64xx/setup-i2c1.c
- *
- * Copyright 2008 Openmoko, Inc.
- * Copyright 2008 Simtec Electronics
- *     Ben Dooks <ben@simtec.co.uk>
- *     http://armlinux.simtec.co.uk/
- *
- * Base S3C64XX I2C bus 1 gpio configuration
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
-*/
+// SPDX-License-Identifier: GPL-2.0
+//
+// Copyright 2008 Openmoko, Inc.
+// Copyright 2008 Simtec Electronics
+//     Ben Dooks <ben@simtec.co.uk>
+//     http://armlinux.simtec.co.uk/
+//
+// Base S3C64XX I2C bus 1 gpio configuration
 
 #include <linux/kernel.h>
 #include <linux/types.h>
index 689fb72e715cc9b8689d401deae52b8294701d4d..810139a807ce58239d71b10462e44595eb45ff06 100644 (file)
@@ -1,14 +1,9 @@
-/* linux/arch/arm/mach-s3c64xx/setup-ide.c
- *
- * Copyright (c) 2010 Samsung Electronics Co., Ltd.
- *             http://www.samsung.com/
- *
- * S3C64XX setup information for IDE
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
-*/
+// SPDX-License-Identifier: GPL-2.0
+//
+// Copyright (c) 2010 Samsung Electronics Co., Ltd.
+//             http://www.samsung.com/
+//
+// S3C64XX setup information for IDE
 
 #include <linux/kernel.h>
 #include <linux/gpio.h>
index 6ad9a89dfddfe08fa1516b74580883658330b445..3519610252739f7d2ff06747277d4d6ae9358790 100644 (file)
@@ -1,14 +1,9 @@
-/* linux/arch/arm/mach-s3c64xx/setup-keypad.c
- *
- * Copyright (c) 2010 Samsung Electronics Co., Ltd.
- *             http://www.samsung.com/
- *
- * GPIO configuration for S3C64XX KeyPad device
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
-*/
+// SPDX-License-Identifier: GPL-2.0
+//
+// Copyright (c) 2010 Samsung Electronics Co., Ltd.
+//             http://www.samsung.com/
+//
+// GPIO configuration for S3C64XX KeyPad device
 
 #include <linux/gpio.h>
 #include <plat/gpio-cfg.h>
index f426b7a16c1654bd758ec34e7e879d938b30eafc..138455af4937b8a29b7d400cff3e27dc831fee31 100644 (file)
@@ -1,15 +1,10 @@
-/* linux/arch/arm/plat-s3c64xx/setup-sdhci-gpio.c
- *
- * Copyright 2008 Simtec Electronics
- *     Ben Dooks <ben@simtec.co.uk>
- *     http://armlinux.simtec.co.uk/
- *
- * S3C64XX - Helper functions for setting up SDHCI device(s) GPIO (HSMMC)
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
-*/
+// SPDX-License-Identifier: GPL-2.0
+//
+// Copyright 2008 Simtec Electronics
+//     Ben Dooks <ben@simtec.co.uk>
+//     http://armlinux.simtec.co.uk/
+//
+// S3C64XX - Helper functions for setting up SDHCI device(s) GPIO (HSMMC)
 
 #include <linux/kernel.h>
 #include <linux/types.h>
index 5fd1a315c901a8d3229b24ce908b4b445cdd8417..39dfae1f46e7f91f6b943c6d43c19654bcbd3fe6 100644 (file)
@@ -1,12 +1,7 @@
-/* linux/arch/arm/mach-s3c64xx/setup-spi.c
- *
- * Copyright (C) 2011 Samsung Electronics Ltd.
- *             http://www.samsung.com/
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
+// SPDX-License-Identifier: GPL-2.0
+//
+// Copyright (C) 2011 Samsung Electronics Ltd.
+//             http://www.samsung.com/
 
 #include <linux/gpio.h>
 #include <plat/gpio-cfg.h>
index 2b17b7f5152f3f5677d82bb3f5466e2b332a413e..46a9e955607fd422e271ed054a7f46e7af2ec336 100644 (file)
@@ -1,13 +1,7 @@
-/*
- * Copyright (C) 2011 Samsung Electronics Co.Ltd
- * Author: Joonyoung Shim <jy0922.shim@samsung.com>
- *
- *  This program is free software; you can redistribute  it and/or modify it
- *  under  the terms of  the GNU General  Public License as published by the
- *  Free Software Foundation;  either version 2 of the  License, or (at your
- *  option) any later version.
- *
- */
+// SPDX-License-Identifier: GPL-2.0+
+//
+// Copyright (C) 2011 Samsung Electronics Co.Ltd
+// Author: Joonyoung Shim <jy0922.shim@samsung.com>
 
 #include <linux/clk.h>
 #include <linux/delay.h>
index 34313f9c8792888fd12ac329e932e9d91337f358..39e16a07a5e4b43daac12d8d386b650cb9f98d0b 100644 (file)
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* linux/arch/arm/plat-s3c64xx/sleep.S
  *
  * Copyright 2008 Openmoko, Inc.
@@ -6,11 +7,7 @@
  *     http://armlinux.simtec.co.uk/
  *
  * S3C64XX CPU sleep code
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
-*/
+ */
 
 #include <linux/linkage.h>
 #include <asm/assembler.h>
index 42707dfbda9c341a7879d396c6a2361756786382..1042d6c463dc3944e46595709346267b804c0f80 100644 (file)
@@ -1,13 +1,10 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Copyright (c) 2008 Simtec Electronics
  *     Ben Dooks <ben@simtec.co.uk>
  *
  * S3C2410 - System define for arch_reset() function
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
-*/
+ */
 
 #ifndef __PLAT_SAMSUNG_WATCHDOG_RESET_H
 #define __PLAT_SAMSUNG_WATCHDOG_RESET_H
index 4cec11cf5e6f079faba8ffe89fe7a4eeb0917481..03984a791879115e29fdae2b7595cced965ef94d 100644 (file)
@@ -1,9 +1,7 @@
-# arch/arm/mach-s5pv210/Kconfig
+# SPDX-License-Identifier: GPL-2.0
 #
 # Copyright (c) 2010 Samsung Electronics Co., Ltd.
 #              http://www.samsung.com/
-#
-# Licensed under GPLv2
 
 # Configuration options for the S5PV210/S5PC110
 
index fa7fb716e388a7ef4f4da1b89f58090e60805245..e7b551e18e5c37c3c09a0c0e8723e62f3661b95c 100644 (file)
@@ -1,9 +1,7 @@
-# arch/arm/mach-s5pv210/Makefile
+# SPDX-License-Identifier: GPL-2.0
 #
 # Copyright (c) 2010 Samsung Electronics Co., Ltd.
 #              http://www.samsung.com/
-#
-# Licensed under GPLv2
 
 ccflags-$(CONFIG_ARCH_MULTIPLATFORM) += -I$(srctree)/arch/arm/plat-samsung/include
 
index 2ad387c1ecf0498f6ebdacbab69d8810199e1cd6..0a188134deaed9c5f420f24b2d34223216ef906e 100644 (file)
@@ -1,12 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Copyright (c) 2011 Samsung Electronics Co., Ltd.
  *             http://www.samsung.com
  *
  * Common Header for S5PV210 machines
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
  */
 
 #ifndef __ARCH_ARM_MACH_S5PV210_COMMON_H
index 07cee14a363b05eb1ca99418eb8d3c0074d0b04d..f491249ab65857660b444d004cb2664623e16770 100644 (file)
@@ -1,18 +1,13 @@
-/* linux/arch/arm/mach-s5pv210/pm.c
- *
- * Copyright (c) 2010-2014 Samsung Electronics Co., Ltd.
- *             http://www.samsung.com
- *
- * S5PV210 - Power Management support
- *
- * Based on arch/arm/mach-s3c2410/pm.c
- * Copyright (c) 2006 Simtec Electronics
- *     Ben Dooks <ben@simtec.co.uk>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
-*/
+// SPDX-License-Identifier: GPL-2.0
+//
+// Copyright (c) 2010-2014 Samsung Electronics Co., Ltd.
+//             http://www.samsung.com
+//
+// S5PV210 - Power Management support
+//
+// Based on arch/arm/mach-s3c2410/pm.c
+// Copyright (c) 2006 Simtec Electronics
+//     Ben Dooks <ben@simtec.co.uk>
 
 #include <linux/init.h>
 #include <linux/suspend.h>
index fb3eb77412dbdf2d6321bfe278c81970631aab72..2a35c831a9b065d9b4907bcb63572a68fd283c90 100644 (file)
@@ -1,13 +1,10 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Copyright (c) 2010 Samsung Electronics Co., Ltd.
  *             http://www.samsung.com/
  *
  * S5PV210 - Clock register definitions
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
-*/
+ */
 
 #ifndef __ASM_ARCH_REGS_CLOCK_H
 #define __ASM_ARCH_REGS_CLOCK_H __FILE__
index 83e656ea95ae13f1ed23003d6872479370e43abc..868f9c20419dba3fa72d18f6eaa0f0cf503c817a 100644 (file)
@@ -1,14 +1,10 @@
-/*
- * Samsung's S5PC110/S5PV210 flattened device tree enabled machine.
- *
- * Copyright (c) 2013-2014 Samsung Electronics Co., Ltd.
- * Mateusz Krawczuk <m.krawczuk@partner.samsung.com>
- * Tomasz Figa <t.figa@samsung.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
+// SPDX-License-Identifier: GPL-2.0
+//
+// Samsung's S5PC110/S5PV210 flattened device tree enabled machine.
+//
+// Copyright (c) 2013-2014 Samsung Electronics Co., Ltd.
+// Mateusz Krawczuk <m.krawczuk@partner.samsung.com>
+// Tomasz Figa <t.figa@samsung.com>
 
 #include <linux/of_fdt.h>
 #include <linux/of_platform.h>
index dfbfc0f7f8b82c140c6f82a673b6f638c377f4d1..81568767f30a83bc3a40bccac0dfbe89eed5534f 100644 (file)
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * Copyright (c) 2011-2014 Samsung Electronics Co., Ltd.
  *             http://www.samsung.com
@@ -5,11 +6,6 @@
  * S5PV210 Sleep Code
  * Based on S3C64XX sleep code by:
  *     Ben Dooks, (c) 2008 Simtec Electronics
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
  */
 
 #include <linux/linkage.h>
index 8d4a64cc644c534c56dfc017cbcd2765ce7cb7b5..b600e38364eb64ccd99ce165e4d4a13825408937 100644 (file)
@@ -1,8 +1,6 @@
-# arch/arm/plat-samsung/Kconfig
+# SPDX-License-Identifier: GPL-2.0
 #
 # Copyright 2009 Simtec Electronics
-#
-# Licensed under GPLv2
 
 config PLAT_SAMSUNG
        bool
index be172efec15c5594033cddfb6623a0df75d7b863..3db9d2c3825890037ab8e10fe85c173a28b5e28d 100644 (file)
@@ -1,8 +1,6 @@
-# arch/arm/plat-samsung/Makefile
+# SPDX-License-Identifier: GPL-2.0
 #
 # Copyright 2009 Simtec Electronics
-#
-# Licensed under GPLv2
 
 ccflags-$(CONFIG_ARCH_S3C64XX) := -I$(srctree)/arch/arm/mach-s3c64xx/include
 ccflags-$(CONFIG_ARCH_MULTIPLATFORM) += -I$(srctree)/$(src)/include
index e9de9e92ce01878b142d1decd0384a39f11c759d..42bac8d5ab5d9166fb3567f8574fd7bc7d2bb6bf 100644 (file)
@@ -1,15 +1,10 @@
-/* arch/arm/plat-samsung/adc.c
- *
- * Copyright (c) 2008 Simtec Electronics
- *     http://armlinux.simtec.co.uk/
- *     Ben Dooks <ben@simtec.co.uk>, <ben-linux@fluff.org>
- *
- * Samsung ADC device core
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License.
-*/
+// SPDX-License-Identifier: GPL-1.0+
+//
+// Copyright (c) 2008 Simtec Electronics
+//     http://armlinux.simtec.co.uk/
+//     Ben Dooks <ben@simtec.co.uk>, <ben-linux@fluff.org>
+//
+// Samsung ADC device core
 
 #include <linux/module.h>
 #include <linux/kernel.h>
index a107b3a0b095dc58877b33ce2a8851c65414fdbf..e1ba88ba31d89e2c43a61f72df2f3c58cfb86fd8 100644 (file)
@@ -1,14 +1,9 @@
-/* linux/arch/arm/plat-samsung/cpu.c
- *
- * Copyright (c) 2009-2011 Samsung Electronics Co., Ltd.
- *             http://www.samsung.com
- *
- * Samsung CPU Support
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
-*/
+// SPDX-License-Identifier: GPL-2.0
+//
+// Copyright (c) 2009-2011 Samsung Electronics Co., Ltd.
+//             http://www.samsung.com
+//
+// Samsung CPU Support
 
 #include <linux/module.h>
 #include <linux/kernel.h>
index 5928105490fac41e3705abeed4567579f724e7a8..7476a5dbae77945e74d8a46f935c3dc48f0e2bd6 100644 (file)
@@ -1,16 +1,11 @@
-/* linux/arch/arm/plat-samsung/dev-uart.c
- *     originally from arch/arm/plat-s3c24xx/devs.c
- *x
- * Copyright (c) 2004 Simtec Electronics
- *     Ben Dooks <ben@simtec.co.uk>
- *
- * Base S3C24XX platform device definitions
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
-*/
+// SPDX-License-Identifier: GPL-2.0
+//
+//     originally from arch/arm/plat-s3c24xx/devs.c
+//
+// Copyright (c) 2004 Simtec Electronics
+//     Ben Dooks <ben@simtec.co.uk>
+//
+// Base S3C24XX platform device definitions
 
 #include <linux/kernel.h>
 #include <linux/platform_device.h>
index 5668e4eb03df1aa6d74e90902d936ceb5bec9252..1d1fa068d2280d790c3637d67b039eb9ab1940c9 100644 (file)
@@ -1,14 +1,9 @@
-/* linux/arch/arm/plat-samsung/devs.c
- *
- * Copyright (c) 2011 Samsung Electronics Co., Ltd.
- *             http://www.samsung.com
- *
- * Base SAMSUNG platform device definitions
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
-*/
+// SPDX-License-Identifier: GPL-2.0
+//
+// Copyright (c) 2011 Samsung Electronics Co., Ltd.
+//             http://www.samsung.com
+//
+// Base SAMSUNG platform device definitions
 
 #include <linux/kernel.h>
 #include <linux/types.h>
index 7861488f7ca07d96a2f7ebd8ab2f0c9528f26ab7..f66c820cd82bc506ba17aa98a3b845489535262c 100644 (file)
@@ -1,18 +1,14 @@
-/*
- * Copyright (c) 2009-2011 Samsung Electronics Co., Ltd.
- *             http://www.samsung.com/
- *
- * Copyright 2008 Openmoko, Inc.
- * Copyright 2008 Simtec Electronics
- *      Ben Dooks <ben@simtec.co.uk>
- *      http://armlinux.simtec.co.uk/
- *
- * SAMSUNG - GPIOlib support
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
+// SPDX-License-Identifier: GPL-2.0
+//
+// Copyright (c) 2009-2011 Samsung Electronics Co., Ltd.
+//             http://www.samsung.com/
+//
+// Copyright 2008 Openmoko, Inc.
+// Copyright 2008 Simtec Electronics
+//      Ben Dooks <ben@simtec.co.uk>
+//      http://armlinux.simtec.co.uk/
+//
+// SAMSUNG - GPIOlib support
 
 #include <linux/kernel.h>
 #include <linux/irq.h>
index a927bee553593ca874da782f9fca0627a89dcf4c..039f6862b6a7f68f03956dc5e81156516937b867 100644 (file)
@@ -1,14 +1,10 @@
-/* linux/arch/arm/plat-samsung/include/plat/adc-core.h
- *
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
  * Copyright (c) 2010 Samsung Electronics Co., Ltd.
  *             http://www.samsung.com/
  *
  * Samsung ADC Controller core functions
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
-*/
+ */
 
 #ifndef __ASM_PLAT_ADC_CORE_H
 #define __ASM_PLAT_ADC_CORE_H __FILE__
index 2fc89315553f78cd4a05f32678a05f7f89a4ed90..74d1a46408c1ca07ff01bf13e99ee505040bb604 100644 (file)
@@ -1,15 +1,11 @@
-/* arch/arm/plat-samsung/include/plat/adc.h
- *
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
  * Copyright (c) 2008 Simtec Electronics
  *     http://armlinux.simtec.co.uk/   
  *     Ben Dooks <ben@simtec.co.uk>
  *
  * S3C ADC driver information
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
-*/
+ */
 
 #ifndef __ASM_PLAT_ADC_H
 #define __ASM_PLAT_ADC_H __FILE__
index 37cf20e04aff23e633688d10379fd7381ffde4d4..2c7cf2665634a69bb49a2ff1bf5c3738a2286ff1 100644 (file)
@@ -1,15 +1,11 @@
-/* arch/arm/plat-samsung/include/plat/cpu-freq-core.h
- *
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
  * Copyright (c) 2006-2009 Simtec Electronics
  *     http://armlinux.simtec.co.uk/
  *     Ben Dooks <ben@simtec.co.uk>
  *
  * S3C CPU frequency scaling support - core support
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
-*/
+ */
 
 #include <plat/cpu-freq.h>
 
index 85517ab962ae5dc8ca74b85bd02dc93636051eb6..558892bcf9b677afa35906b37929e935bf90d449 100644 (file)
@@ -1,15 +1,11 @@
-/* arch/arm/plat-samsung/include/plat/cpu-freq.h
- *
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
  * Copyright (c) 2006-2007 Simtec Electronics
  *     http://armlinux.simtec.co.uk/
  *     Ben Dooks <ben@simtec.co.uk>
  *
  * S3C CPU frequency scaling support - driver and board
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
-*/
+ */
 
 #include <linux/cpufreq.h>
 
index b7b702a72cac63ed0207364e43d6ad9677c362d1..fadcddbea0643094301b69a0e07f9b143d4491c6 100644 (file)
@@ -1,5 +1,5 @@
-/* linux/arch/arm/plat-samsung/include/plat/cpu.h
- *
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
  * Copyright (c) 2011 Samsung Electronics Co., Ltd.
  *             http://www.samsung.com/
  *
@@ -7,11 +7,7 @@
  *     Ben Dooks <ben@simtec.co.uk>
  *
  * Header file for Samsung CPU support
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
-*/
+ */
 
 /* todo - fix when rmk changes iodescs to use `void __iomem *` */
 
index e23fed311e5f95246f2d0a04c91a8af32ab039e4..02b0c5750572936ef17152a605cc6cdaaebbc258 100644 (file)
@@ -1,5 +1,5 @@
-/* arch/arm/plat-samsung/include/plat/devs.h
- *
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
  * Copyright (c) 2011 Samsung Electronics Co., Ltd.
  *             http://www.samsung.com
  *
@@ -7,11 +7,7 @@
  * Ben Dooks <ben@simtec.co.uk>
  *
  * Header file for s3c2410 standard platform devices
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
-*/
+ */
 
 #ifndef __PLAT_DEVS_H
 #define __PLAT_DEVS_H __FILE__
index 1f2972a74e9fce64c4064bbf134855cd490c8aa7..614240d768b470c90e4195e381b8f34889b264c0 100644 (file)
@@ -1,12 +1,8 @@
-/* arch/arm/plat-samsung/include/plat/fb-s3c2410.h
- *
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
  * Copyright (c) 2004 Arnaud Patard <arnaud.patard@rtp-net.org>
  *
  * Inspired by pxafb.h
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
 */
 
 #ifndef __ASM_PLAT_FB_S3C2410_H
index b89f8f2085157d3fb55dc23874b43c4ee74c4c64..615d381ae32e39e878ebd8dd750f1ff9273e9124 100644 (file)
@@ -1,16 +1,12 @@
-/* arch/arm/plat-samsung/include/plat/fb.h
- *
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
  * Copyright 2008 Openmoko, Inc.
  * Copyright 2008 Simtec Electronics
  *     http://armlinux.simtec.co.uk/
  *     Ben Dooks <ben@simtec.co.uk>
  *
  * S3C - FB platform data definitions
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
-*/
+ */
 
 #ifndef __PLAT_S3C_FB_H
 #define __PLAT_S3C_FB_H __FILE__
index a181d7ce81cff4f1bb560d919da8da31141864f3..db0c56f5ca157f07535af389478e050eb1848607 100644 (file)
@@ -1,16 +1,12 @@
-/* linux/arch/arm/plat-samsung/include/plat/gpio-cfg-helper.h
- *
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
  * Copyright 2008 Openmoko, Inc.
  * Copyright 2008 Simtec Electronics
  *     http://armlinux.simtec.co.uk/
  *     Ben Dooks <ben@simtec.co.uk>
  *
  * Samsung Platform - GPIO pin configuration helper definitions
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
-*/
+ */
 
 /* This is meant for core cpu support, machine or other driver files
  * should not be including this header.
index e55d1f597db8af85c2aaa6a6836a568030f9593c..469c220e092b86a919fbaddddd49359f5996be16 100644 (file)
@@ -1,16 +1,12 @@
-/* linux/arch/arm/plat-s3c/include/plat/gpio-cfg.h
- *
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
  * Copyright 2008 Openmoko, Inc.
  * Copyright 2008 Simtec Electronics
  *     http://armlinux.simtec.co.uk/
  *     Ben Dooks <ben@simtec.co.uk>
  *
  * S3C Platform - GPIO pin configuration
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
-*/
+ */
 
 /* This file contains the necessary definitions to get the basic gpio
  * pin configuration done such as setting a pin to input or output or
index 6ce11bfdc37e36bf15d06794363ca3395bec81e7..51e721f5e4915ac82d27bc070ec5079bb595fa53 100644 (file)
@@ -1,15 +1,11 @@
-/* linux/arch/arm/plat-s3c/include/plat/gpio-core.h
- *
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
  * Copyright 2008 Simtec Electronics
  *     http://armlinux.simtec.co.uk/
  *     Ben Dooks <ben@simtec.co.uk>
  *
  * S3C Platform - GPIO core
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
-*/
+ */
 
 #ifndef __PLAT_SAMSUNG_GPIO_CORE_H
 #define __PLAT_SAMSUNG_GPIO_CORE_H
index f182669b8e8eec1f478e0b3e9649fb2c8629e2ae..c5cfd5af3874a0e5282e250fef38c76a9f1a8ae4 100644 (file)
@@ -1,15 +1,11 @@
-/* arch/arm/mach-s3c2410/include/mach/iic-core.h
- *
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
  * Copyright 2008 Openmoko, Inc.
  * Copyright 2008 Simtec Electronics
  *     Ben Dooks <ben@simtec.co.uk>
  *
  * S3C - I2C Controller core functions
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
-*/
+ */
 
 #ifndef __ASM_ARCH_IIC_CORE_H
 #define __ASM_ARCH_IIC_CORE_H __FILE__
index c81ace332a1ea102721e50a3ba2162381193c9ef..9754b9a2994533e1217bb0932a003cf99ac7b88d 100644 (file)
@@ -1,13 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * Samsung Platform - Keypad platform data definitions
  *
  * Copyright (C) 2010 Samsung Electronics Co.Ltd
  * Author: Joonyoung Shim <jy0922.shim@samsung.com>
- *
- * This program is free software; you can redistribute  it and/or modify it
- * under  the terms of  the GNU General  Public License as published by the
- * Free Software Foundation;  either version 2 of the  License, or (at your
- * option) any later version.
  */
 
 #ifndef __PLAT_SAMSUNG_KEYPAD_H
index 3ffac4d2e4f07be86e014418bd0b4e3f9aa0d46e..34b39ded0e2e650c197e40b2d698ee60221bafbf 100644 (file)
@@ -1,15 +1,11 @@
-/* linux/include/asm-arm/plat-s3c/map.h
- *
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
  * Copyright 2003, 2007 Simtec Electronics
  *     http://armlinux.simtec.co.uk/
  *     Ben Dooks <ben@simtec.co.uk>
  *
  * S3C - Memory map definitions (virtual addresses)
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
-*/
+ */
 
 #ifndef __ASM_PLAT_MAP_H
 #define __ASM_PLAT_MAP_H __FILE__
index 33104911862e39d6c585beb1d252bc379607e659..4244acbf4b658698bc3d7872ea73a50d65ae3734 100644 (file)
@@ -1,14 +1,10 @@
-/* linux/arch/arm/plat-samsung/include/plat/map-s3c.h
- *
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
  * Copyright (c) 2008 Simtec Electronics
  *     Ben Dooks <ben@simtec.co.uk>
  *
  * S3C24XX - Memory map definitions
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
-*/
+ */
 
 #ifndef __ASM_PLAT_MAP_S3C_H
 #define __ASM_PLAT_MAP_S3C_H __FILE__
index 0fe2828f93547fa63a0abf3636b21d95a90f307d..f5769e93544a95805e5f87bfc727c3407ed244c1 100644 (file)
@@ -1,14 +1,10 @@
-/* linux/arch/arm/plat-samsung/include/plat/map-s5p.h
- *
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
  * Copyright (c) 2010 Samsung Electronics Co., Ltd.
  *             http://www.samsung.com/
  *
  * S5P - Memory map definitions
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
-*/
+ */
 
 #ifndef __ASM_PLAT_MAP_S5P_H
 #define __ASM_PLAT_MAP_S5P_H __FILE__
index 8705f9e0e2886497d9130577e16be6bdefe026ab..1268bae04234b648a3edd87baf588fe4c09f190e 100644 (file)
@@ -1,14 +1,11 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Copyright (C) 2013 Samsung Electronics Co., Ltd.
  *     Tomasz Figa <t.figa@samsung.com>
  * Copyright (c) 2004 Simtec Electronics
  *     http://armlinux.simtec.co.uk/
  *     Written by Ben Dooks, <ben@simtec.co.uk>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
-*/
+ */
 
 #ifndef __PLAT_SAMSUNG_PM_COMMON_H
 #define __PLAT_SAMSUNG_PM_COMMON_H __FILE__
index 9dd562ab084124d51eb7fdfa13e87cfe763d7dd0..2746137f97944484f7ad0c814b4e3ae63e4dec30 100644 (file)
@@ -1,13 +1,9 @@
-/* arch/arm/plat-samsung/include/plat/pm.h
- *
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
  * Copyright (c) 2004 Simtec Electronics
  *     http://armlinux.simtec.co.uk/
  *     Written by Ben Dooks, <ben@simtec.co.uk>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
-*/
+ */
 
 /* s3c_pm_init
  *
index 5bff1facb672b512d3ed63f831aae926fe7c2375..05e3448642a109fa244d74b7ef685298eb5ad3c4 100644 (file)
@@ -1,11 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Copyright 2013 Tomasz Figa <tomasz.figa@gmail.com>
  *
  * Samsung PWM controller platform data helpers.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
  */
 
 #ifndef __ASM_ARCH_PWM_CORE_H
index 70612100120fb0b0694dbd872f983d9bad55d492..58953c7381dd0691150fd75b0a5890a6c350f04a 100644 (file)
@@ -1,13 +1,9 @@
-/* arch/arm/mach-s3c2410/include/mach/regs-adc.h
- *
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
  * Copyright (c) 2004 Shannon Holland <holland@loser.net>
  *
- * This program is free software; yosu can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
  * S3C2410 ADC registers
-*/
+ */
 
 #ifndef __ASM_ARCH_REGS_ADC_H
 #define __ASM_ARCH_REGS_ADC_H "regs-adc.h"
index c63cd3fc5ad3c42d8d3cfc1eb0491a3db0b3211c..ec5c4c5fdd8f5604bdd2ce243543ea770ad39a53 100644 (file)
@@ -1,14 +1,10 @@
-/* arch/arm/plat-s3c/include/plat/regs-irqtype.h
- *
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
  * Copyright 2008 Simtec Electronics
  *      Ben Dooks <ben@simtec.co.uk>
  *      http://armlinux.simtec.co.uk/
  *
  * S3C - IRQ detection types.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
  */
 
 /* values for S3C2410_EXTINT0/1/2 and other cpus in the series, including
index 552fe7cfe281f7bd22cd69b672b7a25cc622f71f..607844311566011a46e9ab3573b57931410911aa 100644 (file)
@@ -1,13 +1,9 @@
-/* arch/arm/plat-samsung/include/plat/regs-spi.h
- *
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
  * Copyright (c) 2004 Fetron GmbH
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
  * S3C2410 SPI register definition
-*/
+ */
 
 #ifndef __ASM_ARCH_REGS_SPI_H
 #define __ASM_ARCH_REGS_SPI_H
index 4003d3dab4e7164334bde0742dbe1859e78ca0fc..d8d2eeaca088422555141c202e4ec6a24c1bf643 100644 (file)
@@ -1,12 +1,7 @@
-/* arch/arm/plat-samsung/include/plat/regs-udc.h
- *
+/* SPDX-License-Identifier: GPL-2.0+ */
+/*
  * Copyright (C) 2004 Herbert Poetzl <herbert@13thfloor.at>
- *
- * This include file is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
-*/
+ */
 
 #ifndef __ASM_ARCH_REGS_UDC_H
 #define __ASM_ARCH_REGS_UDC_H
index 209464adef97c38818ab59ff90b24f43441b922d..d16eefe9ae78ff2c05f72df8be9955d4336076fa 100644 (file)
@@ -1,14 +1,10 @@
-/* linux/arch/arm/plat-samsung/include/plat/samsung-time.h
- *
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
  * Copyright 2011 Samsung Electronics Co., Ltd.
  *             http://www.samsung.com/
  *
  * Header file for samsung s3c and s5p time support
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
-*/
+ */
 
 #ifndef __ASM_PLAT_SAMSUNG_TIME_H
 #define __ASM_PLAT_SAMSUNG_TIME_H __FILE__
index 2787553c3ae2656cda4ec74db512970ce945d296..5731e42ea208802cc25d2a17d0558e5c9f4a5dc4 100644 (file)
@@ -1,5 +1,5 @@
-/* linux/arch/arm/plat-samsung/include/plat/sdhci.h
- *
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
  * Copyright (c) 2011 Samsung Electronics Co., Ltd.
  *             http://www.samsung.com
  *
@@ -9,11 +9,7 @@
  *     Ben Dooks <ben@simtec.co.uk>
  *
  * S3C Platform - SDHCI (HSMMC) platform data definitions
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
-*/
+ */
 
 #ifndef __PLAT_S3C_SDHCI_H
 #define __PLAT_S3C_SDHCI_H __FILE__
index ab34dfadb7f97373604b66d7ebd68772a668c198..6d0c788beb9dffa123c7e6c46b68d00e7d26bc66 100644 (file)
@@ -1,11 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * Copyright (C) 2011 Samsung Electronics Co.Ltd
  * Author: Joonyoung Shim <jy0922.shim@samsung.com>
- *
- * This program is free software; you can redistribute  it and/or modify it
- * under  the terms of  the GNU General  Public License as published by the
- * Free Software Foundation;  either version 2 of the  License, or (at your
- * option) any later version.
  */
 
 #ifndef __PLAT_SAMSUNG_USB_PHY_H
index bbfa84b0505a0171b6767a5ea0df5557b490a76b..630909e6630b388abb4e06548ffe1506334682f7 100644 (file)
@@ -1,14 +1,9 @@
-/* arch/arm/plat-samsung/include/plat/wakeup-mask.h
- *
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
  * Copyright 2010 Ben Dooks <ben-linux@fluff.org>
  *
  * Support for wakeup mask interrupts on newer SoCs
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
-*/
+ */
 
 #ifndef __PLAT_WAKEUP_MASK_H
 #define __PLAT_WAKEUP_MASK_H __file__
index 3776f7e752f006a61f6b42769a11d9c4f22d0573..e9acf02ef3c38ae92ba40d829123b54969e82ac6 100644 (file)
@@ -1,15 +1,10 @@
-/* linux/arch/arm/plat-s3c/init.c
- *
- * Copyright (c) 2008 Simtec Electronics
- *     Ben Dooks <ben@simtec.co.uk>
- *     http://armlinux.simtec.co.uk/
- *
- * S3C series CPU initialisation
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
-*/
+// SPDX-License-Identifier: GPL-2.0
+//
+// Copyright (c) 2008 Simtec Electronics
+//     Ben Dooks <ben@simtec.co.uk>
+//     http://armlinux.simtec.co.uk/
+//
+// S3C series CPU initialisation
 
 /*
  * NOTE: Code in this file is not used on S3C64xx when booting with
index 6cf52ee7eeecea013ee6388961a26f5cae551bb8..cbc3b4b45c74dec2df3c753676ee0d144b069d52 100644 (file)
@@ -1,13 +1,8 @@
-/* linux/arch/arm/plat-samsung/platformdata.c
- *
- * Copyright 2010 Ben Dooks <ben-linux <at> fluff.org>
- *
- * Helper for platform data setting
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
-*/
+// SPDX-License-Identifier: GPL-2.0
+//
+// Copyright 2010 Ben Dooks <ben-linux <at> fluff.org>
+//
+// Helper for platform data setting
 
 #include <linux/kernel.h>
 #include <linux/slab.h>
index d63516374f7cfe184ddbffca0e651182ac497fd1..cd2c02c68bc3aa1ace7a584b2591886bedc81c1d 100644 (file)
@@ -1,16 +1,12 @@
-/* linux/arch/arm/plat-s3c/pm-check.c
- *  originally in linux/arch/arm/plat-s3c24xx/pm.c
- *
- * Copyright (c) 2004-2008 Simtec Electronics
- *     http://armlinux.simtec.co.uk
- *     Ben Dooks <ben@simtec.co.uk>
- *
- * S3C Power Mangament - suspend/resume memory corruption check.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
-*/
+// SPDX-License-Identifier: GPL-2.0
+//
+// originally in linux/arch/arm/plat-s3c24xx/pm.c
+//
+// Copyright (c) 2004-2008 Simtec Electronics
+//     http://armlinux.simtec.co.uk
+//     Ben Dooks <ben@simtec.co.uk>
+//
+// S3C Power Mangament - suspend/resume memory corruption check.
 
 #include <linux/kernel.h>
 #include <linux/suspend.h>
index 6534c3ff9fe29b99cb7c50b3eb76ba63b483c8cd..59a10c6dcba1f4ad70ebcd029903a177ab250426 100644 (file)
@@ -1,17 +1,13 @@
-/*
- * Copyright (C) 2013 Samsung Electronics Co., Ltd.
- *     Tomasz Figa <t.figa@samsung.com>
- * Copyright (C) 2008 Openmoko, Inc.
- * Copyright (C) 2004-2008 Simtec Electronics
- *     Ben Dooks <ben@simtec.co.uk>
- *     http://armlinux.simtec.co.uk/
- *
- * Samsung common power management helper functions.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
-*/
+// SPDX-License-Identifier: GPL-2.0
+//
+// Copyright (C) 2013 Samsung Electronics Co., Ltd.
+//     Tomasz Figa <t.figa@samsung.com>
+// Copyright (C) 2008 Openmoko, Inc.
+// Copyright (C) 2004-2008 Simtec Electronics
+//     Ben Dooks <ben@simtec.co.uk>
+//     http://armlinux.simtec.co.uk/
+//
+// Samsung common power management helper functions.
 
 #include <linux/io.h>
 #include <linux/kernel.h>
index 64e15da33b4258f332aa58261e7595802ebe47ae..b76b1e9ba4ae76619868f4483371d10b1ff4551a 100644 (file)
@@ -1,17 +1,13 @@
-/*
- * Copyright (C) 2013 Samsung Electronics Co., Ltd.
- *     Tomasz Figa <t.figa@samsung.com>
- * Copyright (C) 2008 Openmoko, Inc.
- * Copyright (C) 2004-2008 Simtec Electronics
- *     Ben Dooks <ben@simtec.co.uk>
- *     http://armlinux.simtec.co.uk/
- *
- * Samsung common power management (suspend to RAM) debug support
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
+// SPDX-License-Identifier: GPL-2.0
+//
+// Copyright (C) 2013 Samsung Electronics Co., Ltd.
+//     Tomasz Figa <t.figa@samsung.com>
+// Copyright (C) 2008 Openmoko, Inc.
+// Copyright (C) 2004-2008 Simtec Electronics
+//     Ben Dooks <ben@simtec.co.uk>
+//     http://armlinux.simtec.co.uk/
+//
+// Samsung common power management (suspend to RAM) debug support
 
 #include <linux/serial_core.h>
 #include <linux/serial_s3c.h>
index f9a09262f2faabb7d721722df9e9f1e0107ddc1b..cb2e3bc79336854df7fe2f78276207cfead9dbd2 100644 (file)
@@ -1,17 +1,11 @@
-
-/* linux/arch/arm/plat-s3c/pm-gpio.c
- *
- * Copyright 2008 Openmoko, Inc.
- * Copyright 2008 Simtec Electronics
- *     Ben Dooks <ben@simtec.co.uk>
- *     http://armlinux.simtec.co.uk/
- *
- * S3C series GPIO PM code
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
-*/
+// SPDX-License-Identifier: GPL-2.0+
+//
+// Copyright 2008 Openmoko, Inc.
+// Copyright 2008 Simtec Electronics
+//     Ben Dooks <ben@simtec.co.uk>
+//     http://armlinux.simtec.co.uk/
+//
+// S3C series GPIO PM code
 
 #include <linux/kernel.h>
 #include <linux/device.h>
index d7803b43473243c4ca8222a761bb87aad508641b..d6bfd66592b04f094742eeb177077f6b17ccc8bf 100644 (file)
@@ -1,16 +1,11 @@
-/* linux/arch/arm/plat-s3c/pm.c
- *
- * Copyright 2008 Openmoko, Inc.
- * Copyright 2004-2008 Simtec Electronics
- *     Ben Dooks <ben@simtec.co.uk>
- *     http://armlinux.simtec.co.uk/
- *
- * S3C common power management (suspend to ram) support.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
-*/
+// SPDX-License-Identifier: GPL-2.0
+//
+// Copyright 2008 Openmoko, Inc.
+// Copyright 2004-2008 Simtec Electronics
+//     Ben Dooks <ben@simtec.co.uk>
+//     http://armlinux.simtec.co.uk/
+//
+// S3C common power management (suspend to ram) support.
 
 #include <linux/init.h>
 #include <linux/suspend.h>
index b9de6b5433306bb88fce74f2b6efcfd977e4680c..24f96fb80738b50bf44d190ee7f1dbb5176ea0f1 100644 (file)
@@ -1,13 +1,8 @@
-/* arch/arm/plat-samsung/wakeup-mask.c
- *
- * Copyright 2010 Ben Dooks <ben-linux@fluff.org>
- *
- * Support for wakeup mask interrupts on newer SoCs
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
-*/
+// SPDX-License-Identifier: GPL-2.0
+//
+// Copyright 2010 Ben Dooks <ben-linux@fluff.org>
+//
+// Support for wakeup mask interrupts on newer SoCs
 
 #include <linux/kernel.h>
 #include <linux/spinlock.h>
index 307d8ad96a78fb22d92721ae8bc3031133cad301..ce42cc640a61a32b66ad84fdb8e2f82af976f4ef 100644 (file)
@@ -1,16 +1,11 @@
-/* arch/arm/plat-samsung/watchdog-reset.c
- *
- * Copyright (c) 2008 Simtec Electronics
- *     Ben Dooks <ben@simtec.co.uk>
- *
- * Copyright (c) 2013 Tomasz Figa <tomasz.figa@gmail.com>
- *
- * Watchdog reset support for Samsung SoCs.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
-*/
+// SPDX-License-Identifier: GPL-2.0
+//
+// Copyright (c) 2008 Simtec Electronics
+//     Ben Dooks <ben@simtec.co.uk>
+//
+// Copyright (c) 2013 Tomasz Figa <tomasz.figa@gmail.com>
+//
+// Watchdog reset support for Samsung SoCs.
 
 #include <linux/clk.h>
 #include <linux/err.h>
index a9313b66f770ccd39af49810122238ee2251637a..4eac94c1eb6fc42474ebe890484dba67c997aefd 100644 (file)
@@ -345,6 +345,7 @@ mxlads                      MACH_MXLADS             MXLADS                  1851
 linkstation_mini       MACH_LINKSTATION_MINI   LINKSTATION_MINI        1858
 afeb9260               MACH_AFEB9260           AFEB9260                1859
 imx27ipcam             MACH_IMX27IPCAM         IMX27IPCAM              1871
+bk3                    MACH_BK3                BK3                     1880
 rd88f6183ap_ge         MACH_RD88F6183AP_GE     RD88F6183AP_GE          1894
 realview_pba8          MACH_REALVIEW_PBA8      REALVIEW_PBA8           1897
 realview_pbx           MACH_REALVIEW_PBX       REALVIEW_PBX            1901
index b20fa9b31efe6f173a1be44adb9f11ac5f880e5a..634b373785c4de409806c67c81585b5774e29562 100644 (file)
@@ -86,6 +86,7 @@ CONFIG_SCHED_MC=y
 CONFIG_NUMA=y
 CONFIG_PREEMPT=y
 CONFIG_KSM=y
+CONFIG_MEMORY_FAILURE=y
 CONFIG_TRANSPARENT_HUGEPAGE=y
 CONFIG_CMA=y
 CONFIG_SECCOMP=y
@@ -99,6 +100,7 @@ CONFIG_WQ_POWER_EFFICIENT_DEFAULT=y
 CONFIG_ARM_CPUIDLE=y
 CONFIG_CPU_FREQ=y
 CONFIG_CPUFREQ_DT=y
+CONFIG_ARM_ARMADA_37XX_CPUFREQ=y
 CONFIG_ARM_BIG_LITTLE_CPUFREQ=y
 CONFIG_ARM_SCPI_CPUFREQ=y
 CONFIG_ACPI_CPPC_CPUFREQ=m
@@ -421,7 +423,6 @@ CONFIG_USB_OTG=y
 CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_TEGRA=y
 CONFIG_USB_EHCI_HCD=y
-CONFIG_USB_EHCI_MSM=y
 CONFIG_USB_EHCI_EXYNOS=y
 CONFIG_USB_EHCI_HCD_PLATFORM=y
 CONFIG_USB_OHCI_HCD=y
@@ -429,6 +430,8 @@ CONFIG_USB_OHCI_EXYNOS=y
 CONFIG_USB_OHCI_HCD_PLATFORM=y
 CONFIG_USB_RENESAS_USBHS=m
 CONFIG_USB_STORAGE=y
+CONFIG_USB_MUSB_HDRC=y
+CONFIG_USB_MUSB_SUNXI=y
 CONFIG_USB_DWC3=y
 CONFIG_USB_DWC2=y
 CONFIG_USB_CHIPIDEA=y
@@ -438,8 +441,6 @@ CONFIG_USB_CHIPIDEA_ULPI=y
 CONFIG_USB_ISP1760=y
 CONFIG_USB_HSIC_USB3503=y
 CONFIG_NOP_USB_XCEIV=y
-CONFIG_USB_MSM_OTG=y
-CONFIG_USB_QCOM_8X16_PHY=y
 CONFIG_USB_ULPI=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_RENESAS_USBHS_UDC=m
@@ -473,7 +474,10 @@ CONFIG_LEDS_SYSCON=y
 CONFIG_LEDS_TRIGGER_HEARTBEAT=y
 CONFIG_LEDS_TRIGGER_CPU=y
 CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
+CONFIG_LEDS_TRIGGER_PANIC=y
+CONFIG_LEDS_TRIGGER_DISK=y
 CONFIG_EDAC=y
+CONFIG_EDAC_GHES=y
 CONFIG_RTC_CLASS=y
 CONFIG_RTC_DRV_MAX77686=y
 CONFIG_RTC_DRV_RK808=m
@@ -558,6 +562,7 @@ CONFIG_PHY_XGENE=y
 CONFIG_PHY_TEGRA_XUSB=y
 CONFIG_QCOM_L2_PMU=y
 CONFIG_QCOM_L3_PMU=y
+CONFIG_UNIPHIER_EFUSE=y
 CONFIG_TEE=y
 CONFIG_OPTEE=y
 CONFIG_ARM_SCPI_PROTOCOL=y
@@ -567,6 +572,8 @@ CONFIG_ACPI=y
 CONFIG_ACPI_APEI=y
 CONFIG_ACPI_APEI_GHES=y
 CONFIG_ACPI_APEI_PCIEAER=y
+CONFIG_ACPI_APEI_MEMORY_FAILURE=y
+CONFIG_ACPI_APEI_EINJ=y
 CONFIG_EXT2_FS=y
 CONFIG_EXT3_FS=y
 CONFIG_EXT4_FS_POSIX_ACL=y
index 004deb96afe35e3a02368dfb3e00b69850002a33..72ea8f4c61aa4f6ff203ece5290c8c4e6059abc0 100644 (file)
@@ -10,7 +10,7 @@
 #include <linux/init.h>
 #include <linux/pci.h>
 #include <linux/platform_device.h>
-#include <linux/i2c/pxa-i2c.h>
+#include <linux/platform_data/i2c-pxa.h>
 #include <linux/of.h>
 #include <linux/of_device.h>
 #include <linux/of_address.h>
index 600d264e080c5f05031cbeb7c8f6ac2907f25ba4..fbf91d383b40938fa248db3e34b30a864112cde0 100644 (file)
@@ -36,7 +36,7 @@
 #include <linux/clk.h>
 #include <linux/slab.h>
 #include <linux/io.h>
-#include <linux/i2c/pxa-i2c.h>
+#include <linux/platform_data/i2c-pxa.h>
 
 #include <asm/irq.h>
 
index deecb16e7256d08eadb6f697afcbc1465ab65716..342768df3530254e1c99484247453de826e9b5dc 100644 (file)
@@ -9,6 +9,7 @@ obj-y                           += bcm/
 obj-$(CONFIG_ARCH_DOVE)                += dove/
 obj-$(CONFIG_MACH_DOVE)                += dove/
 obj-y                          += fsl/
+obj-$(CONFIG_ARCH_GEMINI)      += gemini/
 obj-$(CONFIG_ARCH_MXC)         += imx/
 obj-$(CONFIG_SOC_XWAY)         += lantiq/
 obj-y                          += mediatek/
diff --git a/drivers/soc/gemini/Makefile b/drivers/soc/gemini/Makefile
new file mode 100644 (file)
index 0000000..8cbd1e4
--- /dev/null
@@ -0,0 +1,2 @@
+# SPDX-License-Identifier: GPL-2.0
+obj-y  += soc-gemini.o
diff --git a/drivers/soc/gemini/soc-gemini.c b/drivers/soc/gemini/soc-gemini.c
new file mode 100644 (file)
index 0000000..642b96c
--- /dev/null
@@ -0,0 +1,71 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Copyright (C) 2017 Linaro Ltd.
+ *
+ * Author: Linus Walleij <linus.walleij@linaro.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2, as
+ * published by the Free Software Foundation.
+ *
+ */
+#include <linux/init.h>
+#include <linux/kernel.h>
+#include <linux/mfd/syscon.h>
+#include <linux/regmap.h>
+#include <linux/of.h>
+
+#define GLOBAL_WORD_ID                         0x00
+#define GEMINI_GLOBAL_ARB1_CTRL                        0x2c
+#define GEMINI_ARB1_BURST_MASK                 GENMASK(21, 16)
+#define GEMINI_ARB1_BURST_SHIFT                        16
+/* These all define the priority on the BUS2 backplane */
+#define GEMINI_ARB1_PRIO_MASK                  GENMASK(9, 0)
+#define GEMINI_ARB1_DMAC_HIGH_PRIO             BIT(0)
+#define GEMINI_ARB1_IDE_HIGH_PRIO              BIT(1)
+#define GEMINI_ARB1_RAID_HIGH_PRIO             BIT(2)
+#define GEMINI_ARB1_SECURITY_HIGH_PRIO         BIT(3)
+#define GEMINI_ARB1_GMAC0_HIGH_PRIO            BIT(4)
+#define GEMINI_ARB1_GMAC1_HIGH_PRIO            BIT(5)
+#define GEMINI_ARB1_USB0_HIGH_PRIO             BIT(6)
+#define GEMINI_ARB1_USB1_HIGH_PRIO             BIT(7)
+#define GEMINI_ARB1_PCI_HIGH_PRIO              BIT(8)
+#define GEMINI_ARB1_TVE_HIGH_PRIO              BIT(9)
+
+#define GEMINI_DEFAULT_BURST_SIZE              0x20
+#define GEMINI_DEFAULT_PRIO                    (GEMINI_ARB1_GMAC0_HIGH_PRIO | \
+                                                GEMINI_ARB1_GMAC1_HIGH_PRIO)
+
+static int __init gemini_soc_init(void)
+{
+       struct regmap *map;
+       u32 rev;
+       u32 val;
+       int ret;
+
+       /* Multiplatform guard, only proceed on Gemini */
+       if (!of_machine_is_compatible("cortina,gemini"))
+               return 0;
+
+       map = syscon_regmap_lookup_by_compatible("cortina,gemini-syscon");
+       if (IS_ERR(map))
+               return PTR_ERR(map);
+       ret = regmap_read(map, GLOBAL_WORD_ID, &rev);
+       if (ret)
+               return ret;
+
+       val = (GEMINI_DEFAULT_BURST_SIZE << GEMINI_ARB1_BURST_SHIFT) |
+               GEMINI_DEFAULT_PRIO;
+
+       /* Set up system arbitration */
+       regmap_update_bits(map,
+                          GEMINI_GLOBAL_ARB1_CTRL,
+                          GEMINI_ARB1_BURST_MASK | GEMINI_ARB1_PRIO_MASK,
+                          val);
+
+       pr_info("Gemini SoC %04x revision %02x, set arbitration %08x\n",
+               rev >> 8, rev & 0xff, val);
+
+       return 0;
+}
+subsys_initcall(gemini_soc_init);
index dba3055a949310843f34eceafd8cf5e9662eaf8c..8c310de01e93744d182055fee11b38ba63953605 100644 (file)
 
 #define INFRA_TOPAXI_PROTECTEN         0x0220
 #define INFRA_TOPAXI_PROTECTSTA1       0x0228
+#define INFRA_TOPAXI_PROTECTEN_SET     0x0260
+#define INFRA_TOPAXI_PROTECTEN_CLR     0x0264
 
 /**
  * mtk_infracfg_set_bus_protection - enable bus protection
  * @regmap: The infracfg regmap
  * @mask: The mask containing the protection bits to be enabled.
+ * @reg_update: The boolean flag determines to set the protection bits
+ *              by regmap_update_bits with enable register(PROTECTEN) or
+ *              by regmap_write with set register(PROTECTEN_SET).
  *
  * This function enables the bus protection bits for disabled power
  * domains so that the system does not hang when some unit accesses the
  * bus while in power down.
  */
-int mtk_infracfg_set_bus_protection(struct regmap *infracfg, u32 mask)
+int mtk_infracfg_set_bus_protection(struct regmap *infracfg, u32 mask,
+               bool reg_update)
 {
        unsigned long expired;
        u32 val;
        int ret;
 
-       regmap_update_bits(infracfg, INFRA_TOPAXI_PROTECTEN, mask, mask);
+       if (reg_update)
+               regmap_update_bits(infracfg, INFRA_TOPAXI_PROTECTEN, mask,
+                               mask);
+       else
+               regmap_write(infracfg, INFRA_TOPAXI_PROTECTEN_SET, mask);
 
        expired = jiffies + HZ;
 
@@ -59,16 +69,24 @@ int mtk_infracfg_set_bus_protection(struct regmap *infracfg, u32 mask)
  * mtk_infracfg_clear_bus_protection - disable bus protection
  * @regmap: The infracfg regmap
  * @mask: The mask containing the protection bits to be disabled.
+ * @reg_update: The boolean flag determines to clear the protection bits
+ *              by regmap_update_bits with enable register(PROTECTEN) or
+ *              by regmap_write with clear register(PROTECTEN_CLR).
  *
  * This function disables the bus protection bits previously enabled with
  * mtk_infracfg_set_bus_protection.
  */
-int mtk_infracfg_clear_bus_protection(struct regmap *infracfg, u32 mask)
+
+int mtk_infracfg_clear_bus_protection(struct regmap *infracfg, u32 mask,
+               bool reg_update)
 {
        unsigned long expired;
        int ret;
 
-       regmap_update_bits(infracfg, INFRA_TOPAXI_PROTECTEN, mask, 0);
+       if (reg_update)
+               regmap_update_bits(infracfg, INFRA_TOPAXI_PROTECTEN, mask, 0);
+       else
+               regmap_write(infracfg, INFRA_TOPAXI_PROTECTEN_CLR, mask);
 
        expired = jiffies + HZ;
 
index e570b6af2e6ffbddccf1fe76075375d4e39e3e0c..435ce5ec648a08cd7a937171181fbebc1b249a9f 100644 (file)
@@ -21,6 +21,7 @@
 #include <linux/soc/mediatek/infracfg.h>
 
 #include <dt-bindings/power/mt2701-power.h>
+#include <dt-bindings/power/mt2712-power.h>
 #include <dt-bindings/power/mt6797-power.h>
 #include <dt-bindings/power/mt7622-power.h>
 #include <dt-bindings/power/mt8173-power.h>
@@ -32,7 +33,7 @@
 #define SPM_DIS_PWR_CON                        0x023c
 #define SPM_CONN_PWR_CON               0x0280
 #define SPM_VEN2_PWR_CON               0x0298
-#define SPM_AUDIO_PWR_CON              0x029c  /* MT8173 */
+#define SPM_AUDIO_PWR_CON              0x029c  /* MT8173, MT2712 */
 #define SPM_BDP_PWR_CON                        0x029c  /* MT2701 */
 #define SPM_ETH_PWR_CON                        0x02a0
 #define SPM_HIF_PWR_CON                        0x02a4
 #define SPM_MFG_2D_PWR_CON             0x02c0
 #define SPM_MFG_ASYNC_PWR_CON          0x02c4
 #define SPM_USB_PWR_CON                        0x02cc
+#define SPM_USB2_PWR_CON               0x02d4  /* MT2712 */
 #define SPM_ETHSYS_PWR_CON             0x02e0  /* MT7622 */
 #define SPM_HIF0_PWR_CON               0x02e4  /* MT7622 */
 #define SPM_HIF1_PWR_CON               0x02e8  /* MT7622 */
 #define SPM_WB_PWR_CON                 0x02ec  /* MT7622 */
 
-
 #define SPM_PWR_STATUS                 0x060c
 #define SPM_PWR_STATUS_2ND             0x0610
 
 #define PWR_STATUS_ETH                 BIT(15)
 #define PWR_STATUS_HIF                 BIT(16)
 #define PWR_STATUS_IFR_MSC             BIT(17)
+#define PWR_STATUS_USB2                        BIT(19) /* MT2712 */
 #define PWR_STATUS_VENC_LT             BIT(20)
 #define PWR_STATUS_VENC                        BIT(21)
-#define PWR_STATUS_MFG_2D              BIT(22)
-#define PWR_STATUS_MFG_ASYNC           BIT(23)
-#define PWR_STATUS_AUDIO               BIT(24)
-#define PWR_STATUS_USB                 BIT(25)
+#define PWR_STATUS_MFG_2D              BIT(22) /* MT8173 */
+#define PWR_STATUS_MFG_ASYNC           BIT(23) /* MT8173 */
+#define PWR_STATUS_AUDIO               BIT(24) /* MT8173, MT2712 */
+#define PWR_STATUS_USB                 BIT(25) /* MT8173, MT2712 */
 #define PWR_STATUS_ETHSYS              BIT(24) /* MT7622 */
 #define PWR_STATUS_HIF0                        BIT(25) /* MT7622 */
 #define PWR_STATUS_HIF1                        BIT(26) /* MT7622 */
@@ -84,6 +86,8 @@ enum clk_id {
        CLK_ETHIF,
        CLK_VDEC,
        CLK_HIFSEL,
+       CLK_JPGDEC,
+       CLK_AUDIO,
        CLK_MAX,
 };
 
@@ -96,10 +100,12 @@ static const char * const clk_names[] = {
        "ethif",
        "vdec",
        "hif_sel",
+       "jpgdec",
+       "audio",
        NULL,
 };
 
-#define MAX_CLKS       2
+#define MAX_CLKS       3
 
 struct scp_domain_data {
        const char *name;
@@ -134,6 +140,7 @@ struct scp {
        void __iomem *base;
        struct regmap *infracfg;
        struct scp_ctrl_reg ctrl_reg;
+       bool bus_prot_reg_update;
 };
 
 struct scp_subdomain {
@@ -147,6 +154,7 @@ struct scp_soc_data {
        const struct scp_subdomain *subdomains;
        int num_subdomains;
        const struct scp_ctrl_reg regs;
+       bool bus_prot_reg_update;
 };
 
 static int scpsys_domain_is_on(struct scp_domain *scpd)
@@ -254,7 +262,8 @@ static int scpsys_power_on(struct generic_pm_domain *genpd)
 
        if (scpd->data->bus_prot_mask) {
                ret = mtk_infracfg_clear_bus_protection(scp->infracfg,
-                               scpd->data->bus_prot_mask);
+                               scpd->data->bus_prot_mask,
+                               scp->bus_prot_reg_update);
                if (ret)
                        goto err_pwr_ack;
        }
@@ -289,7 +298,8 @@ static int scpsys_power_off(struct generic_pm_domain *genpd)
 
        if (scpd->data->bus_prot_mask) {
                ret = mtk_infracfg_set_bus_protection(scp->infracfg,
-                               scpd->data->bus_prot_mask);
+                               scpd->data->bus_prot_mask,
+                               scp->bus_prot_reg_update);
                if (ret)
                        goto out;
        }
@@ -371,7 +381,8 @@ static void init_clks(struct platform_device *pdev, struct clk **clk)
 
 static struct scp *init_scp(struct platform_device *pdev,
                        const struct scp_domain_data *scp_domain_data, int num,
-                       const struct scp_ctrl_reg *scp_ctrl_reg)
+                       const struct scp_ctrl_reg *scp_ctrl_reg,
+                       bool bus_prot_reg_update)
 {
        struct genpd_onecell_data *pd_data;
        struct resource *res;
@@ -386,6 +397,8 @@ static struct scp *init_scp(struct platform_device *pdev,
        scp->ctrl_reg.pwr_sta_offs = scp_ctrl_reg->pwr_sta_offs;
        scp->ctrl_reg.pwr_sta2nd_offs = scp_ctrl_reg->pwr_sta2nd_offs;
 
+       scp->bus_prot_reg_update = bus_prot_reg_update;
+
        scp->dev = &pdev->dev;
 
        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
@@ -580,6 +593,85 @@ static const struct scp_domain_data scp_domain_data_mt2701[] = {
        },
 };
 
+/*
+ * MT2712 power domain support
+ */
+static const struct scp_domain_data scp_domain_data_mt2712[] = {
+       [MT2712_POWER_DOMAIN_MM] = {
+               .name = "mm",
+               .sta_mask = PWR_STATUS_DISP,
+               .ctl_offs = SPM_DIS_PWR_CON,
+               .sram_pdn_bits = GENMASK(8, 8),
+               .sram_pdn_ack_bits = GENMASK(12, 12),
+               .clk_id = {CLK_MM},
+               .active_wakeup = true,
+       },
+       [MT2712_POWER_DOMAIN_VDEC] = {
+               .name = "vdec",
+               .sta_mask = PWR_STATUS_VDEC,
+               .ctl_offs = SPM_VDE_PWR_CON,
+               .sram_pdn_bits = GENMASK(8, 8),
+               .sram_pdn_ack_bits = GENMASK(12, 12),
+               .clk_id = {CLK_MM, CLK_VDEC},
+               .active_wakeup = true,
+       },
+       [MT2712_POWER_DOMAIN_VENC] = {
+               .name = "venc",
+               .sta_mask = PWR_STATUS_VENC,
+               .ctl_offs = SPM_VEN_PWR_CON,
+               .sram_pdn_bits = GENMASK(11, 8),
+               .sram_pdn_ack_bits = GENMASK(15, 12),
+               .clk_id = {CLK_MM, CLK_VENC, CLK_JPGDEC},
+               .active_wakeup = true,
+       },
+       [MT2712_POWER_DOMAIN_ISP] = {
+               .name = "isp",
+               .sta_mask = PWR_STATUS_ISP,
+               .ctl_offs = SPM_ISP_PWR_CON,
+               .sram_pdn_bits = GENMASK(11, 8),
+               .sram_pdn_ack_bits = GENMASK(13, 12),
+               .clk_id = {CLK_MM},
+               .active_wakeup = true,
+       },
+       [MT2712_POWER_DOMAIN_AUDIO] = {
+               .name = "audio",
+               .sta_mask = PWR_STATUS_AUDIO,
+               .ctl_offs = SPM_AUDIO_PWR_CON,
+               .sram_pdn_bits = GENMASK(11, 8),
+               .sram_pdn_ack_bits = GENMASK(15, 12),
+               .clk_id = {CLK_AUDIO},
+               .active_wakeup = true,
+       },
+       [MT2712_POWER_DOMAIN_USB] = {
+               .name = "usb",
+               .sta_mask = PWR_STATUS_USB,
+               .ctl_offs = SPM_USB_PWR_CON,
+               .sram_pdn_bits = GENMASK(10, 8),
+               .sram_pdn_ack_bits = GENMASK(14, 12),
+               .clk_id = {CLK_NONE},
+               .active_wakeup = true,
+       },
+       [MT2712_POWER_DOMAIN_USB2] = {
+               .name = "usb2",
+               .sta_mask = PWR_STATUS_USB2,
+               .ctl_offs = SPM_USB2_PWR_CON,
+               .sram_pdn_bits = GENMASK(10, 8),
+               .sram_pdn_ack_bits = GENMASK(14, 12),
+               .clk_id = {CLK_NONE},
+               .active_wakeup = true,
+       },
+       [MT2712_POWER_DOMAIN_MFG] = {
+               .name = "mfg",
+               .sta_mask = PWR_STATUS_MFG,
+               .ctl_offs = SPM_MFG_PWR_CON,
+               .sram_pdn_bits = GENMASK(11, 8),
+               .sram_pdn_ack_bits = GENMASK(19, 16),
+               .clk_id = {CLK_MFG},
+               .bus_prot_mask = BIT(14) | BIT(21) | BIT(23),
+               .active_wakeup = true,
+       },
+};
+
 /*
  * MT6797 power domain support
  */
@@ -806,7 +898,18 @@ static const struct scp_soc_data mt2701_data = {
        .regs = {
                .pwr_sta_offs = SPM_PWR_STATUS,
                .pwr_sta2nd_offs = SPM_PWR_STATUS_2ND
-       }
+       },
+       .bus_prot_reg_update = true,
+};
+
+static const struct scp_soc_data mt2712_data = {
+       .domains = scp_domain_data_mt2712,
+       .num_domains = ARRAY_SIZE(scp_domain_data_mt2712),
+       .regs = {
+               .pwr_sta_offs = SPM_PWR_STATUS,
+               .pwr_sta2nd_offs = SPM_PWR_STATUS_2ND
+       },
+       .bus_prot_reg_update = false,
 };
 
 static const struct scp_soc_data mt6797_data = {
@@ -817,7 +920,8 @@ static const struct scp_soc_data mt6797_data = {
        .regs = {
                .pwr_sta_offs = SPM_PWR_STATUS_MT6797,
                .pwr_sta2nd_offs = SPM_PWR_STATUS_2ND_MT6797
-       }
+       },
+       .bus_prot_reg_update = true,
 };
 
 static const struct scp_soc_data mt7622_data = {
@@ -826,7 +930,8 @@ static const struct scp_soc_data mt7622_data = {
        .regs = {
                .pwr_sta_offs = SPM_PWR_STATUS,
                .pwr_sta2nd_offs = SPM_PWR_STATUS_2ND
-       }
+       },
+       .bus_prot_reg_update = true,
 };
 
 static const struct scp_soc_data mt8173_data = {
@@ -837,7 +942,8 @@ static const struct scp_soc_data mt8173_data = {
        .regs = {
                .pwr_sta_offs = SPM_PWR_STATUS,
                .pwr_sta2nd_offs = SPM_PWR_STATUS_2ND
-       }
+       },
+       .bus_prot_reg_update = true,
 };
 
 /*
@@ -848,6 +954,9 @@ static const struct of_device_id of_scpsys_match_tbl[] = {
        {
                .compatible = "mediatek,mt2701-scpsys",
                .data = &mt2701_data,
+       }, {
+               .compatible = "mediatek,mt2712-scpsys",
+               .data = &mt2712_data,
        }, {
                .compatible = "mediatek,mt6797-scpsys",
                .data = &mt6797_data,
@@ -874,7 +983,8 @@ static int scpsys_probe(struct platform_device *pdev)
        match = of_match_device(of_scpsys_match_tbl, &pdev->dev);
        soc = (const struct scp_soc_data *)match->data;
 
-       scp = init_scp(pdev, soc->domains, soc->num_domains, &soc->regs);
+       scp = init_scp(pdev, soc->domains, soc->num_domains, &soc->regs,
+                       soc->bus_prot_reg_update);
        if (IS_ERR(scp))
                return PTR_ERR(scp);
 
index 55a47e509e491aaea0b861ea92e8d438c338338b..52c25a5e2646c8392d2b7c3e3bb0fa1b71c2d27f 100644 (file)
@@ -224,7 +224,7 @@ static void __init rcar_sysc_pd_setup(struct rcar_sysc_pd *pd)
 
        if (!(pd->flags & (PD_CPU | PD_SCU))) {
                /* Enable Clock Domain for I/O devices */
-               genpd->flags |= GENPD_FLAG_PM_CLK;
+               genpd->flags |= GENPD_FLAG_PM_CLK | GENPD_FLAG_ACTIVE_WAKEUP;
                if (has_cpg_mstp) {
                        genpd->attach_dev = cpg_mstp_attach_dev;
                        genpd->detach_dev = cpg_mstp_detach_dev;
index 9f4ee2567c72c6714cd0d7a258b47cff25fdfd96..926b7fd6db2d08c4ff1b762c2b1ff2e1e05fb324 100644 (file)
@@ -250,6 +250,9 @@ static int __init renesas_soc_init(void)
        if (chipid) {
                product = readl(chipid);
                iounmap(chipid);
+               /* R-Car M3-W ES1.1 incorrectly identifies as ES2.0 */
+               if ((product & 0x7fff) == 0x5210)
+                       product ^= 0x11;
                if (soc->id && ((product >> 8) & 0xff) != soc->id) {
                        pr_warn("SoC mismatch (product = 0x%x)\n", product);
                        return -ENODEV;
index e9e277178c940042b0f086006cfb8d82da0d8620..89ebe22a3e27d9b780a3f349d1a6eb4f7707a34c 100644 (file)
@@ -95,7 +95,7 @@ config ARCH_TEGRA_186_SOC
        select TEGRA_BPMP
        select TEGRA_HSP_MBOX
        select TEGRA_IVC
-       select SOC_TEGRA_PMC_TEGRA186
+       select SOC_TEGRA_PMC
        help
          Enable support for the NVIDIA Tegar186 SoC. The Tegra186 features a
          combination of Denver and Cortex-A57 CPU cores and a GPU based on
@@ -118,9 +118,6 @@ config SOC_TEGRA_FLOWCTRL
 config SOC_TEGRA_PMC
        bool
 
-config SOC_TEGRA_PMC_TEGRA186
-       bool
-
 config SOC_TEGRA_POWERGATE_BPMP
        def_bool y
        depends on PM_GENERIC_DOMAINS
index 482e108d28aaad0d8cf3b3545bfb8ee6ea96588a..902759fe5f4da5050980115c7f5c2c0d6bb4c5f1 100644 (file)
@@ -4,5 +4,4 @@ obj-y += fuse/
 obj-y += common.o
 obj-$(CONFIG_SOC_TEGRA_FLOWCTRL) += flowctrl.o
 obj-$(CONFIG_SOC_TEGRA_PMC) += pmc.o
-obj-$(CONFIG_SOC_TEGRA_PMC_TEGRA186) += pmc-tegra186.o
 obj-$(CONFIG_SOC_TEGRA_POWERGATE_BPMP) += powergate-bpmp.o
index b7c552e3133ca2bde10d6699e235151f2b60db31..a33ee8ef8b6b99cc6f4b6e450f3dfbb59c850d36 100644 (file)
@@ -103,6 +103,9 @@ static struct tegra_fuse *fuse = &(struct tegra_fuse) {
 };
 
 static const struct of_device_id tegra_fuse_match[] = {
+#ifdef CONFIG_ARCH_TEGRA_186_SOC
+       { .compatible = "nvidia,tegra186-efuse", .data = &tegra186_fuse_soc },
+#endif
 #ifdef CONFIG_ARCH_TEGRA_210_SOC
        { .compatible = "nvidia,tegra210-efuse", .data = &tegra210_fuse_soc },
 #endif
@@ -132,6 +135,7 @@ static int tegra_fuse_probe(struct platform_device *pdev)
 
        /* take over the memory region from the early initialization */
        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+       fuse->phys = res->start;
        fuse->base = devm_ioremap_resource(&pdev->dev, res);
        if (IS_ERR(fuse->base))
                return PTR_ERR(fuse->base);
index 294413a969a07be5f065a331a87c45e3fcabaefe..49ff017f3ded9e8a264861e190057d4d9e5c4f8b 100644 (file)
@@ -59,7 +59,7 @@ static u32 tegra20_fuse_read(struct tegra_fuse *fuse, unsigned int offset)
 
        mutex_lock(&fuse->apbdma.lock);
 
-       fuse->apbdma.config.src_addr = fuse->apbdma.phys + FUSE_BEGIN + offset;
+       fuse->apbdma.config.src_addr = fuse->phys + FUSE_BEGIN + offset;
 
        err = dmaengine_slave_config(fuse->apbdma.chan, &fuse->apbdma.config);
        if (err)
@@ -96,6 +96,13 @@ out:
        return value;
 }
 
+static bool dma_filter(struct dma_chan *chan, void *filter_param)
+{
+       struct device_node *np = chan->device->dev->of_node;
+
+       return of_device_is_compatible(np, "nvidia,tegra20-apbdma");
+}
+
 static int tegra20_fuse_probe(struct tegra_fuse *fuse)
 {
        dma_cap_mask_t mask;
@@ -103,7 +110,7 @@ static int tegra20_fuse_probe(struct tegra_fuse *fuse)
        dma_cap_zero(mask);
        dma_cap_set(DMA_SLAVE, mask);
 
-       fuse->apbdma.chan = dma_request_channel(mask, NULL, NULL);
+       fuse->apbdma.chan = __dma_request_channel(&mask, dma_filter, NULL);
        if (!fuse->apbdma.chan)
                return -EPROBE_DEFER;
 
@@ -119,6 +126,8 @@ static int tegra20_fuse_probe(struct tegra_fuse *fuse)
        fuse->apbdma.config.dst_addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES;
        fuse->apbdma.config.src_maxburst = 1;
        fuse->apbdma.config.dst_maxburst = 1;
+       fuse->apbdma.config.direction = DMA_DEV_TO_MEM;
+       fuse->apbdma.config.device_fc = false;
 
        init_completion(&fuse->apbdma.wait);
        mutex_init(&fuse->apbdma.lock);
index 882607bcaa6c1e667fa603bea322c9d1d62a5e72..257e254c6137f806e6cf77112184ce4796bf0257 100644 (file)
     defined(CONFIG_ARCH_TEGRA_114_SOC) || \
     defined(CONFIG_ARCH_TEGRA_124_SOC) || \
     defined(CONFIG_ARCH_TEGRA_132_SOC) || \
-    defined(CONFIG_ARCH_TEGRA_210_SOC)
+    defined(CONFIG_ARCH_TEGRA_210_SOC) || \
+    defined(CONFIG_ARCH_TEGRA_186_SOC)
 static u32 tegra30_fuse_read_early(struct tegra_fuse *fuse, unsigned int offset)
 {
+       if (WARN_ON(!fuse->base))
+               return 0;
+
        return readl_relaxed(fuse->base + FUSE_BEGIN + offset);
 }
 
@@ -98,7 +102,10 @@ static void __init tegra30_fuse_init(struct tegra_fuse *fuse)
        fuse->read = tegra30_fuse_read;
 
        tegra_init_revision();
-       fuse->soc->speedo_init(&tegra_sku_info);
+
+       if (fuse->soc->speedo_init)
+               fuse->soc->speedo_init(&tegra_sku_info);
+
        tegra30_fuse_add_randomness();
 }
 #endif
@@ -158,3 +165,16 @@ const struct tegra_fuse_soc tegra210_fuse_soc = {
        .info = &tegra210_fuse_info,
 };
 #endif
+
+#if defined(CONFIG_ARCH_TEGRA_186_SOC)
+static const struct tegra_fuse_info tegra186_fuse_info = {
+       .read = tegra30_fuse_read,
+       .size = 0x300,
+       .spare = 0x280,
+};
+
+const struct tegra_fuse_soc tegra186_fuse_soc = {
+       .init = tegra30_fuse_init,
+       .info = &tegra186_fuse_info,
+};
+#endif
index 10c2076d5089aa347c1200ac66c03e0a5a2fe926..f355b9d549151e3e9d7ed8fcd1b429e09da35d8e 100644 (file)
@@ -105,4 +105,8 @@ extern const struct tegra_fuse_soc tegra124_fuse_soc;
 extern const struct tegra_fuse_soc tegra210_fuse_soc;
 #endif
 
+#ifdef CONFIG_ARCH_TEGRA_186_SOC
+extern const struct tegra_fuse_soc tegra186_fuse_soc;
+#endif
+
 #endif
index 5b18f6ffa45c798a9c8d138a4f0fb647551b4932..e5a4d8f98b10e5df1dc1ed292d7bef5d866ec1eb 100644 (file)
@@ -38,17 +38,17 @@ static void __iomem *strapping_base;
 static bool long_ram_code;
 
 u32 tegra_read_chipid(void)
-{
-       return readl_relaxed(apbmisc_base + 4);
-}
-
-u8 tegra_get_chip_id(void)
 {
        if (!apbmisc_base) {
                WARN(1, "Tegra Chip ID not yet available\n");
                return 0;
        }
 
+       return readl_relaxed(apbmisc_base + 4);
+}
+
+u8 tegra_get_chip_id(void)
+{
        return (tegra_read_chipid() >> 8) & 0xff;
 }
 
@@ -74,6 +74,7 @@ u32 tegra_read_ram_code(void)
 
 static const struct of_device_id apbmisc_match[] __initconst = {
        { .compatible = "nvidia,tegra20-apbmisc", },
+       { .compatible = "nvidia,tegra186-misc", },
        {},
 };
 
diff --git a/drivers/soc/tegra/pmc-tegra186.c b/drivers/soc/tegra/pmc-tegra186.c
deleted file mode 100644 (file)
index 6f5c6f9..0000000
+++ /dev/null
@@ -1,169 +0,0 @@
-/*
- * Copyright (c) 2016, NVIDIA CORPORATION. All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU General Public License,
- * version 2, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- */
-
-#define pr_fmt(fmt) "tegra-pmc: " fmt
-
-#include <linux/io.h>
-#include <linux/module.h>
-#include <linux/of.h>
-#include <linux/platform_device.h>
-#include <linux/reboot.h>
-
-#include <asm/system_misc.h>
-
-#define PMC_CNTRL 0x000
-#define  PMC_CNTRL_MAIN_RST BIT(4)
-
-#define PMC_RST_STATUS 0x070
-
-#define WAKE_AOWAKE_CTRL 0x4f4
-#define  WAKE_AOWAKE_CTRL_INTR_POLARITY BIT(0)
-
-#define SCRATCH_SCRATCH0 0x2000
-#define  SCRATCH_SCRATCH0_MODE_RECOVERY BIT(31)
-#define  SCRATCH_SCRATCH0_MODE_BOOTLOADER BIT(30)
-#define  SCRATCH_SCRATCH0_MODE_RCM BIT(1)
-#define  SCRATCH_SCRATCH0_MODE_MASK (SCRATCH_SCRATCH0_MODE_RECOVERY | \
-                                    SCRATCH_SCRATCH0_MODE_BOOTLOADER | \
-                                    SCRATCH_SCRATCH0_MODE_RCM)
-
-struct tegra_pmc {
-       struct device *dev;
-       void __iomem *regs;
-       void __iomem *wake;
-       void __iomem *aotag;
-       void __iomem *scratch;
-
-       void (*system_restart)(enum reboot_mode mode, const char *cmd);
-       struct notifier_block restart;
-};
-
-static int tegra186_pmc_restart_notify(struct notifier_block *nb,
-                                      unsigned long action,
-                                      void *data)
-{
-       struct tegra_pmc *pmc = container_of(nb, struct tegra_pmc, restart);
-       const char *cmd = data;
-       u32 value;
-
-       value = readl(pmc->scratch + SCRATCH_SCRATCH0);
-       value &= ~SCRATCH_SCRATCH0_MODE_MASK;
-
-       if (cmd) {
-               if (strcmp(cmd, "recovery") == 0)
-                       value |= SCRATCH_SCRATCH0_MODE_RECOVERY;
-
-               if (strcmp(cmd, "bootloader") == 0)
-                       value |= SCRATCH_SCRATCH0_MODE_BOOTLOADER;
-
-               if (strcmp(cmd, "forced-recovery") == 0)
-                       value |= SCRATCH_SCRATCH0_MODE_RCM;
-       }
-
-       writel(value, pmc->scratch + SCRATCH_SCRATCH0);
-
-       /*
-        * If available, call the system restart implementation that was
-        * registered earlier (typically PSCI).
-        */
-       if (pmc->system_restart) {
-               pmc->system_restart(reboot_mode, cmd);
-               return NOTIFY_DONE;
-       }
-
-       /* reset everything but SCRATCH0_SCRATCH0 and PMC_RST_STATUS */
-       value = readl(pmc->regs + PMC_CNTRL);
-       value |= PMC_CNTRL_MAIN_RST;
-       writel(value, pmc->regs + PMC_CNTRL);
-
-       return NOTIFY_DONE;
-}
-
-static int tegra186_pmc_setup(struct tegra_pmc *pmc)
-{
-       struct device_node *np = pmc->dev->of_node;
-       bool invert;
-       u32 value;
-
-       invert = of_property_read_bool(np, "nvidia,invert-interrupt");
-
-       value = readl(pmc->wake + WAKE_AOWAKE_CTRL);
-
-       if (invert)
-               value |= WAKE_AOWAKE_CTRL_INTR_POLARITY;
-       else
-               value &= ~WAKE_AOWAKE_CTRL_INTR_POLARITY;
-
-       writel(value, pmc->wake + WAKE_AOWAKE_CTRL);
-
-       /*
-        * We need to hook any system restart implementation registered
-        * previously so we can write SCRATCH_SCRATCH0 before reset.
-        */
-       pmc->system_restart = arm_pm_restart;
-       arm_pm_restart = NULL;
-
-       pmc->restart.notifier_call = tegra186_pmc_restart_notify;
-       pmc->restart.priority = 128;
-
-       return register_restart_handler(&pmc->restart);
-}
-
-static int tegra186_pmc_probe(struct platform_device *pdev)
-{
-       struct tegra_pmc *pmc;
-       struct resource *res;
-
-       pmc = devm_kzalloc(&pdev->dev, sizeof(*pmc), GFP_KERNEL);
-       if (!pmc)
-               return -ENOMEM;
-
-       pmc->dev = &pdev->dev;
-
-       res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "pmc");
-       pmc->regs = devm_ioremap_resource(&pdev->dev, res);
-       if (IS_ERR(pmc->regs))
-               return PTR_ERR(pmc->regs);
-
-       res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "wake");
-       pmc->wake = devm_ioremap_resource(&pdev->dev, res);
-       if (IS_ERR(pmc->wake))
-               return PTR_ERR(pmc->wake);
-
-       res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "aotag");
-       pmc->aotag = devm_ioremap_resource(&pdev->dev, res);
-       if (IS_ERR(pmc->aotag))
-               return PTR_ERR(pmc->aotag);
-
-       res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "scratch");
-       pmc->scratch = devm_ioremap_resource(&pdev->dev, res);
-       if (IS_ERR(pmc->scratch))
-               return PTR_ERR(pmc->scratch);
-
-       return tegra186_pmc_setup(pmc);
-}
-
-static const struct of_device_id tegra186_pmc_of_match[] = {
-       { .compatible = "nvidia,tegra186-pmc" },
-       { /* sentinel */ }
-};
-MODULE_DEVICE_TABLE(of, tegra186_pmc_of_match);
-
-static struct platform_driver tegra186_pmc_driver = {
-       .driver = {
-               .name = "tegra186-pmc",
-               .of_match_table = tegra186_pmc_of_match,
-       },
-       .probe = tegra186_pmc_probe,
-};
-builtin_platform_driver(tegra186_pmc_driver);
index 0453ff6839a7eb68c8cede521d5004daaed0e6b2..ce62a47a6647a81795ee6b25196253c06447853b 100644 (file)
 
 #define PMC_PWR_DET                    0x48
 
-#define PMC_SCRATCH0                   0x50
-#define  PMC_SCRATCH0_MODE_RECOVERY    BIT(31)
-#define  PMC_SCRATCH0_MODE_BOOTLOADER  BIT(30)
-#define  PMC_SCRATCH0_MODE_RCM         BIT(1)
-#define  PMC_SCRATCH0_MODE_MASK                (PMC_SCRATCH0_MODE_RECOVERY | \
+#define PMC_SCRATCH0_MODE_RECOVERY     BIT(31)
+#define PMC_SCRATCH0_MODE_BOOTLOADER   BIT(30)
+#define PMC_SCRATCH0_MODE_RCM          BIT(1)
+#define PMC_SCRATCH0_MODE_MASK         (PMC_SCRATCH0_MODE_RECOVERY | \
                                         PMC_SCRATCH0_MODE_BOOTLOADER | \
                                         PMC_SCRATCH0_MODE_RCM)
 
 
 #define GPU_RG_CNTRL                   0x2d4
 
+/* Tegra186 and later */
+#define WAKE_AOWAKE_CTRL 0x4f4
+#define  WAKE_AOWAKE_CTRL_INTR_POLARITY BIT(0)
+
 struct tegra_powergate {
        struct generic_pm_domain genpd;
        struct tegra_pmc *pmc;
@@ -134,6 +137,14 @@ struct tegra_io_pad_soc {
        unsigned int voltage;
 };
 
+struct tegra_pmc_regs {
+       unsigned int scratch0;
+       unsigned int dpd_req;
+       unsigned int dpd_status;
+       unsigned int dpd2_req;
+       unsigned int dpd2_status;
+};
+
 struct tegra_pmc_soc {
        unsigned int num_powergates;
        const char *const *powergates;
@@ -145,6 +156,12 @@ struct tegra_pmc_soc {
 
        const struct tegra_io_pad_soc *io_pads;
        unsigned int num_io_pads;
+
+       const struct tegra_pmc_regs *regs;
+       void (*init)(struct tegra_pmc *pmc);
+       void (*setup_irq_polarity)(struct tegra_pmc *pmc,
+                                  struct device_node *np,
+                                  bool invert);
 };
 
 /**
@@ -173,6 +190,9 @@ struct tegra_pmc_soc {
 struct tegra_pmc {
        struct device *dev;
        void __iomem *base;
+       void __iomem *wake;
+       void __iomem *aotag;
+       void __iomem *scratch;
        struct clk *clk;
        struct dentry *debugfs;
 
@@ -645,7 +665,7 @@ static int tegra_pmc_restart_notify(struct notifier_block *this,
        const char *cmd = data;
        u32 value;
 
-       value = tegra_pmc_readl(PMC_SCRATCH0);
+       value = readl(pmc->scratch + pmc->soc->regs->scratch0);
        value &= ~PMC_SCRATCH0_MODE_MASK;
 
        if (cmd) {
@@ -659,7 +679,7 @@ static int tegra_pmc_restart_notify(struct notifier_block *this,
                        value |= PMC_SCRATCH0_MODE_RCM;
        }
 
-       tegra_pmc_writel(value, PMC_SCRATCH0);
+       writel(value, pmc->scratch + pmc->soc->regs->scratch0);
 
        /* reset everything but PMC_SCRATCH0 and PMC_RST_STATUS */
        value = tegra_pmc_readl(PMC_CNTRL);
@@ -954,25 +974,27 @@ static int tegra_io_pad_prepare(enum tegra_io_pad id, unsigned long *request,
        *mask = BIT(pad->dpd % 32);
 
        if (pad->dpd < 32) {
-               *status = IO_DPD_STATUS;
-               *request = IO_DPD_REQ;
+               *status = pmc->soc->regs->dpd_status;
+               *request = pmc->soc->regs->dpd_req;
        } else {
-               *status = IO_DPD2_STATUS;
-               *request = IO_DPD2_REQ;
+               *status = pmc->soc->regs->dpd2_status;
+               *request = pmc->soc->regs->dpd2_req;
        }
 
-       rate = clk_get_rate(pmc->clk);
-       if (!rate) {
-               pr_err("failed to get clock rate\n");
-               return -ENODEV;
-       }
+       if (pmc->clk) {
+               rate = clk_get_rate(pmc->clk);
+               if (!rate) {
+                       pr_err("failed to get clock rate\n");
+                       return -ENODEV;
+               }
 
-       tegra_pmc_writel(DPD_SAMPLE_ENABLE, DPD_SAMPLE);
+               tegra_pmc_writel(DPD_SAMPLE_ENABLE, DPD_SAMPLE);
 
-       /* must be at least 200 ns, in APB (PCLK) clock cycles */
-       value = DIV_ROUND_UP(1000000000, rate);
-       value = DIV_ROUND_UP(200, value);
-       tegra_pmc_writel(value, SEL_DPD_TIM);
+               /* must be at least 200 ns, in APB (PCLK) clock cycles */
+               value = DIV_ROUND_UP(1000000000, rate);
+               value = DIV_ROUND_UP(200, value);
+               tegra_pmc_writel(value, SEL_DPD_TIM);
+       }
 
        return 0;
 }
@@ -997,7 +1019,8 @@ static int tegra_io_pad_poll(unsigned long offset, u32 mask,
 
 static void tegra_io_pad_unprepare(void)
 {
-       tegra_pmc_writel(DPD_SAMPLE_DISABLE, DPD_SAMPLE);
+       if (pmc->clk)
+               tegra_pmc_writel(DPD_SAMPLE_DISABLE, DPD_SAMPLE);
 }
 
 /**
@@ -1287,27 +1310,8 @@ static int tegra_pmc_parse_dt(struct tegra_pmc *pmc, struct device_node *np)
 
 static void tegra_pmc_init(struct tegra_pmc *pmc)
 {
-       u32 value;
-
-       /* Always enable CPU power request */
-       value = tegra_pmc_readl(PMC_CNTRL);
-       value |= PMC_CNTRL_CPU_PWRREQ_OE;
-       tegra_pmc_writel(value, PMC_CNTRL);
-
-       value = tegra_pmc_readl(PMC_CNTRL);
-
-       if (pmc->sysclkreq_high)
-               value &= ~PMC_CNTRL_SYSCLK_POLARITY;
-       else
-               value |= PMC_CNTRL_SYSCLK_POLARITY;
-
-       /* configure the output polarity while the request is tristated */
-       tegra_pmc_writel(value, PMC_CNTRL);
-
-       /* now enable the request */
-       value = tegra_pmc_readl(PMC_CNTRL);
-       value |= PMC_CNTRL_SYSCLK_OE;
-       tegra_pmc_writel(value, PMC_CNTRL);
+       if (pmc->soc->init)
+               pmc->soc->init(pmc);
 }
 
 static void tegra_pmc_init_tsense_reset(struct tegra_pmc *pmc)
@@ -1410,11 +1414,43 @@ static int tegra_pmc_probe(struct platform_device *pdev)
        if (IS_ERR(base))
                return PTR_ERR(base);
 
+       res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "wake");
+       if (res) {
+               pmc->wake = devm_ioremap_resource(&pdev->dev, res);
+               if (IS_ERR(pmc->wake))
+                       return PTR_ERR(pmc->wake);
+       } else {
+               pmc->wake = base;
+       }
+
+       res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "aotag");
+       if (res) {
+               pmc->aotag = devm_ioremap_resource(&pdev->dev, res);
+               if (IS_ERR(pmc->aotag))
+                       return PTR_ERR(pmc->aotag);
+       } else {
+               pmc->aotag = base;
+       }
+
+       res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "scratch");
+       if (res) {
+               pmc->scratch = devm_ioremap_resource(&pdev->dev, res);
+               if (IS_ERR(pmc->scratch))
+                       return PTR_ERR(pmc->scratch);
+       } else {
+               pmc->scratch = base;
+       }
+
        pmc->clk = devm_clk_get(&pdev->dev, "pclk");
        if (IS_ERR(pmc->clk)) {
                err = PTR_ERR(pmc->clk);
-               dev_err(&pdev->dev, "failed to get pclk: %d\n", err);
-               return err;
+
+               if (err != -ENOENT) {
+                       dev_err(&pdev->dev, "failed to get pclk: %d\n", err);
+                       return err;
+               }
+
+               pmc->clk = NULL;
        }
 
        pmc->dev = &pdev->dev;
@@ -1474,6 +1510,55 @@ static const char * const tegra20_powergates[] = {
        [TEGRA_POWERGATE_MPE] = "mpe",
 };
 
+static const struct tegra_pmc_regs tegra20_pmc_regs = {
+       .scratch0 = 0x50,
+       .dpd_req = 0x1b8,
+       .dpd_status = 0x1bc,
+       .dpd2_req = 0x1c0,
+       .dpd2_status = 0x1c4,
+};
+
+static void tegra20_pmc_init(struct tegra_pmc *pmc)
+{
+       u32 value;
+
+       /* Always enable CPU power request */
+       value = tegra_pmc_readl(PMC_CNTRL);
+       value |= PMC_CNTRL_CPU_PWRREQ_OE;
+       tegra_pmc_writel(value, PMC_CNTRL);
+
+       value = tegra_pmc_readl(PMC_CNTRL);
+
+       if (pmc->sysclkreq_high)
+               value &= ~PMC_CNTRL_SYSCLK_POLARITY;
+       else
+               value |= PMC_CNTRL_SYSCLK_POLARITY;
+
+       /* configure the output polarity while the request is tristated */
+       tegra_pmc_writel(value, PMC_CNTRL);
+
+       /* now enable the request */
+       value = tegra_pmc_readl(PMC_CNTRL);
+       value |= PMC_CNTRL_SYSCLK_OE;
+       tegra_pmc_writel(value, PMC_CNTRL);
+}
+
+static void tegra20_pmc_setup_irq_polarity(struct tegra_pmc *pmc,
+                                          struct device_node *np,
+                                          bool invert)
+{
+       u32 value;
+
+       value = tegra_pmc_readl(PMC_CNTRL);
+
+       if (invert)
+               value |= PMC_CNTRL_INTR_POLARITY;
+       else
+               value &= ~PMC_CNTRL_INTR_POLARITY;
+
+       tegra_pmc_writel(value, PMC_CNTRL);
+}
+
 static const struct tegra_pmc_soc tegra20_pmc_soc = {
        .num_powergates = ARRAY_SIZE(tegra20_powergates),
        .powergates = tegra20_powergates,
@@ -1481,6 +1566,11 @@ static const struct tegra_pmc_soc tegra20_pmc_soc = {
        .cpu_powergates = NULL,
        .has_tsense_reset = false,
        .has_gpu_clamps = false,
+       .num_io_pads = 0,
+       .io_pads = NULL,
+       .regs = &tegra20_pmc_regs,
+       .init = tegra20_pmc_init,
+       .setup_irq_polarity = tegra20_pmc_setup_irq_polarity,
 };
 
 static const char * const tegra30_powergates[] = {
@@ -1514,6 +1604,11 @@ static const struct tegra_pmc_soc tegra30_pmc_soc = {
        .cpu_powergates = tegra30_cpu_powergates,
        .has_tsense_reset = true,
        .has_gpu_clamps = false,
+       .num_io_pads = 0,
+       .io_pads = NULL,
+       .regs = &tegra20_pmc_regs,
+       .init = tegra20_pmc_init,
+       .setup_irq_polarity = tegra20_pmc_setup_irq_polarity,
 };
 
 static const char * const tegra114_powergates[] = {
@@ -1551,6 +1646,11 @@ static const struct tegra_pmc_soc tegra114_pmc_soc = {
        .cpu_powergates = tegra114_cpu_powergates,
        .has_tsense_reset = true,
        .has_gpu_clamps = false,
+       .num_io_pads = 0,
+       .io_pads = NULL,
+       .regs = &tegra20_pmc_regs,
+       .init = tegra20_pmc_init,
+       .setup_irq_polarity = tegra20_pmc_setup_irq_polarity,
 };
 
 static const char * const tegra124_powergates[] = {
@@ -1628,6 +1728,9 @@ static const struct tegra_pmc_soc tegra124_pmc_soc = {
        .has_gpu_clamps = true,
        .num_io_pads = ARRAY_SIZE(tegra124_io_pads),
        .io_pads = tegra124_io_pads,
+       .regs = &tegra20_pmc_regs,
+       .init = tegra20_pmc_init,
+       .setup_irq_polarity = tegra20_pmc_setup_irq_polarity,
 };
 
 static const char * const tegra210_powergates[] = {
@@ -1714,9 +1817,110 @@ static const struct tegra_pmc_soc tegra210_pmc_soc = {
        .has_gpu_clamps = true,
        .num_io_pads = ARRAY_SIZE(tegra210_io_pads),
        .io_pads = tegra210_io_pads,
+       .regs = &tegra20_pmc_regs,
+       .init = tegra20_pmc_init,
+       .setup_irq_polarity = tegra20_pmc_setup_irq_polarity,
+};
+
+static const struct tegra_io_pad_soc tegra186_io_pads[] = {
+       { .id = TEGRA_IO_PAD_CSIA, .dpd = 0, .voltage = UINT_MAX },
+       { .id = TEGRA_IO_PAD_CSIB, .dpd = 1, .voltage = UINT_MAX },
+       { .id = TEGRA_IO_PAD_DSI, .dpd = 2, .voltage = UINT_MAX },
+       { .id = TEGRA_IO_PAD_MIPI_BIAS, .dpd = 3, .voltage = UINT_MAX },
+       { .id = TEGRA_IO_PAD_PEX_CLK_BIAS, .dpd = 4, .voltage = UINT_MAX },
+       { .id = TEGRA_IO_PAD_PEX_CLK3, .dpd = 5, .voltage = UINT_MAX },
+       { .id = TEGRA_IO_PAD_PEX_CLK2, .dpd = 6, .voltage = UINT_MAX },
+       { .id = TEGRA_IO_PAD_PEX_CLK1, .dpd = 7, .voltage = UINT_MAX },
+       { .id = TEGRA_IO_PAD_USB0, .dpd = 9, .voltage = UINT_MAX },
+       { .id = TEGRA_IO_PAD_USB1, .dpd = 10, .voltage = UINT_MAX },
+       { .id = TEGRA_IO_PAD_USB2, .dpd = 11, .voltage = UINT_MAX },
+       { .id = TEGRA_IO_PAD_USB_BIAS, .dpd = 12, .voltage = UINT_MAX },
+       { .id = TEGRA_IO_PAD_UART, .dpd = 14, .voltage = UINT_MAX },
+       { .id = TEGRA_IO_PAD_AUDIO, .dpd = 17, .voltage = UINT_MAX },
+       { .id = TEGRA_IO_PAD_HSIC, .dpd = 19, .voltage = UINT_MAX },
+       { .id = TEGRA_IO_PAD_DBG, .dpd = 25, .voltage = UINT_MAX },
+       { .id = TEGRA_IO_PAD_HDMI_DP0, .dpd = 28, .voltage = UINT_MAX },
+       { .id = TEGRA_IO_PAD_HDMI_DP1, .dpd = 29, .voltage = UINT_MAX },
+       { .id = TEGRA_IO_PAD_PEX_CNTRL, .dpd = 32, .voltage = UINT_MAX },
+       { .id = TEGRA_IO_PAD_SDMMC2_HV, .dpd = 34, .voltage = UINT_MAX },
+       { .id = TEGRA_IO_PAD_SDMMC4, .dpd = 36, .voltage = UINT_MAX },
+       { .id = TEGRA_IO_PAD_CAM, .dpd = 38, .voltage = UINT_MAX },
+       { .id = TEGRA_IO_PAD_DSIB, .dpd = 40, .voltage = UINT_MAX },
+       { .id = TEGRA_IO_PAD_DSIC, .dpd = 41, .voltage = UINT_MAX },
+       { .id = TEGRA_IO_PAD_DSID, .dpd = 42, .voltage = UINT_MAX },
+       { .id = TEGRA_IO_PAD_CSIC, .dpd = 43, .voltage = UINT_MAX },
+       { .id = TEGRA_IO_PAD_CSID, .dpd = 44, .voltage = UINT_MAX },
+       { .id = TEGRA_IO_PAD_CSIE, .dpd = 45, .voltage = UINT_MAX },
+       { .id = TEGRA_IO_PAD_CSIF, .dpd = 46, .voltage = UINT_MAX },
+       { .id = TEGRA_IO_PAD_SPI, .dpd = 47, .voltage = UINT_MAX },
+       { .id = TEGRA_IO_PAD_UFS, .dpd = 49, .voltage = UINT_MAX },
+       { .id = TEGRA_IO_PAD_DMIC_HV, .dpd = 52, .voltage = UINT_MAX },
+       { .id = TEGRA_IO_PAD_EDP, .dpd = 53, .voltage = UINT_MAX },
+       { .id = TEGRA_IO_PAD_SDMMC1_HV, .dpd = 55, .voltage = UINT_MAX },
+       { .id = TEGRA_IO_PAD_SDMMC3_HV, .dpd = 56, .voltage = UINT_MAX },
+       { .id = TEGRA_IO_PAD_CONN, .dpd = 60, .voltage = UINT_MAX },
+       { .id = TEGRA_IO_PAD_AUDIO_HV, .dpd = 61, .voltage = UINT_MAX },
+};
+
+static const struct tegra_pmc_regs tegra186_pmc_regs = {
+       .scratch0 = 0x2000,
+       .dpd_req = 0x74,
+       .dpd_status = 0x78,
+       .dpd2_req = 0x7c,
+       .dpd2_status = 0x80,
+};
+
+static void tegra186_pmc_setup_irq_polarity(struct tegra_pmc *pmc,
+                                           struct device_node *np,
+                                           bool invert)
+{
+       struct resource regs;
+       void __iomem *wake;
+       u32 value;
+       int index;
+
+       index = of_property_match_string(np, "reg-names", "wake");
+       if (index < 0) {
+               pr_err("failed to find PMC wake registers\n");
+               return;
+       }
+
+       of_address_to_resource(np, index, &regs);
+
+       wake = ioremap_nocache(regs.start, resource_size(&regs));
+       if (!wake) {
+               pr_err("failed to map PMC wake registers\n");
+               return;
+       }
+
+       value = readl(wake + WAKE_AOWAKE_CTRL);
+
+       if (invert)
+               value |= WAKE_AOWAKE_CTRL_INTR_POLARITY;
+       else
+               value &= ~WAKE_AOWAKE_CTRL_INTR_POLARITY;
+
+       writel(value, wake + WAKE_AOWAKE_CTRL);
+
+       iounmap(wake);
+}
+
+static const struct tegra_pmc_soc tegra186_pmc_soc = {
+       .num_powergates = 0,
+       .powergates = NULL,
+       .num_cpu_powergates = 0,
+       .cpu_powergates = NULL,
+       .has_tsense_reset = false,
+       .has_gpu_clamps = false,
+       .num_io_pads = ARRAY_SIZE(tegra186_io_pads),
+       .io_pads = tegra186_io_pads,
+       .regs = &tegra186_pmc_regs,
+       .init = NULL,
+       .setup_irq_polarity = tegra186_pmc_setup_irq_polarity,
 };
 
 static const struct of_device_id tegra_pmc_match[] = {
+       { .compatible = "nvidia,tegra186-pmc", .data = &tegra186_pmc_soc },
        { .compatible = "nvidia,tegra210-pmc", .data = &tegra210_pmc_soc },
        { .compatible = "nvidia,tegra132-pmc", .data = &tegra124_pmc_soc },
        { .compatible = "nvidia,tegra124-pmc", .data = &tegra124_pmc_soc },
@@ -1749,7 +1953,6 @@ static int __init tegra_pmc_early_init(void)
        struct device_node *np;
        struct resource regs;
        bool invert;
-       u32 value;
 
        mutex_init(&pmc->powergates_lock);
 
@@ -1810,14 +2013,7 @@ static int __init tegra_pmc_early_init(void)
                 */
                invert = of_property_read_bool(np, "nvidia,invert-interrupt");
 
-               value = tegra_pmc_readl(PMC_CNTRL);
-
-               if (invert)
-                       value |= PMC_CNTRL_INTR_POLARITY;
-               else
-                       value &= ~PMC_CNTRL_INTR_POLARITY;
-
-               tegra_pmc_writel(value, PMC_CNTRL);
+               pmc->soc->setup_irq_polarity(pmc, np, invert);
 
                of_node_put(np);
        }
diff --git a/include/linux/i2c/pxa-i2c.h b/include/linux/i2c/pxa-i2c.h
deleted file mode 100644 (file)
index 53aab24..0000000
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- *  i2c_pxa.h
- *
- *  Copyright (C) 2002 Intrinsyc Software Inc.
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License version 2 as
- *  published by the Free Software Foundation.
- *
- */
-#ifndef _I2C_PXA_H_
-#define _I2C_PXA_H_
-
-#if 0
-#define DEF_TIMEOUT             3
-#else
-/* need a longer timeout if we're dealing with the fact we may well be
- * looking at a multi-master environment
-*/
-#define DEF_TIMEOUT             32
-#endif
-
-#define BUS_ERROR               (-EREMOTEIO)
-#define XFER_NAKED              (-ECONNREFUSED)
-#define I2C_RETRY               (-2000) /* an error has occurred retry transmit */
-
-/* ICR initialize bit values
-*
-*  15. FM       0 (100 Khz operation)
-*  14. UR       0 (No unit reset)
-*  13. SADIE    0 (Disables the unit from interrupting on slave addresses
-*                                       matching its slave address)
-*  12. ALDIE    0 (Disables the unit from interrupt when it loses arbitration
-*                                       in master mode)
-*  11. SSDIE    0 (Disables interrupts from a slave stop detected, in slave mode)
-*  10. BEIE     1 (Enable interrupts from detected bus errors, no ACK sent)
-*  9.  IRFIE    1 (Enable interrupts from full buffer received)
-*  8.  ITEIE    1 (Enables the I2C unit to interrupt when transmit buffer empty)
-*  7.  GCD      1 (Disables i2c unit response to general call messages as a slave)
-*  6.  IUE      0 (Disable unit until we change settings)
-*  5.  SCLE     1 (Enables the i2c clock output for master mode (drives SCL)
-*  4.  MA       0 (Only send stop with the ICR stop bit)
-*  3.  TB       0 (We are not transmitting a byte initially)
-*  2.  ACKNAK   0 (Send an ACK after the unit receives a byte)
-*  1.  STOP     0 (Do not send a STOP)
-*  0.  START    0 (Do not send a START)
-*
-*/
-#define I2C_ICR_INIT   (ICR_BEIE | ICR_IRFIE | ICR_ITEIE | ICR_GCD | ICR_SCLE)
-
-/* I2C status register init values
- *
- * 10. BED      1 (Clear bus error detected)
- * 9.  SAD      1 (Clear slave address detected)
- * 7.  IRF      1 (Clear IDBR Receive Full)
- * 6.  ITE      1 (Clear IDBR Transmit Empty)
- * 5.  ALD      1 (Clear Arbitration Loss Detected)
- * 4.  SSD      1 (Clear Slave Stop Detected)
- */
-#define I2C_ISR_INIT   0x7FF  /* status register init */
-
-struct i2c_slave_client;
-
-struct i2c_pxa_platform_data {
-       unsigned int            slave_addr;
-       struct i2c_slave_client *slave;
-       unsigned int            class;
-       unsigned int            use_pio :1;
-       unsigned int            fast_mode :1;
-       unsigned int            high_mode:1;
-       unsigned char           master_code;
-       unsigned long           rate;
-};
-
-extern void pxa_set_i2c_info(struct i2c_pxa_platform_data *info);
-
-#ifdef CONFIG_PXA27x
-extern void pxa27x_set_i2c_power_info(struct i2c_pxa_platform_data *info);
-#endif
-
-#ifdef CONFIG_PXA3xx
-extern void pxa3xx_set_i2c_power_info(struct i2c_pxa_platform_data *info);
-#endif
-
-#endif
diff --git a/include/linux/platform_data/i2c-pxa.h b/include/linux/platform_data/i2c-pxa.h
new file mode 100644 (file)
index 0000000..5236f21
--- /dev/null
@@ -0,0 +1,74 @@
+/*
+ *  i2c_pxa.h
+ *
+ *  Copyright (C) 2002 Intrinsyc Software Inc.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License version 2 as
+ *  published by the Free Software Foundation.
+ *
+ */
+#ifndef _I2C_PXA_H_
+#define _I2C_PXA_H_
+
+#if 0
+#define DEF_TIMEOUT             3
+#else
+/* need a longer timeout if we're dealing with the fact we may well be
+ * looking at a multi-master environment
+*/
+#define DEF_TIMEOUT             32
+#endif
+
+#define BUS_ERROR               (-EREMOTEIO)
+#define XFER_NAKED              (-ECONNREFUSED)
+#define I2C_RETRY               (-2000) /* an error has occurred retry transmit */
+
+/* ICR initialize bit values
+*
+*  15. FM       0 (100 Khz operation)
+*  14. UR       0 (No unit reset)
+*  13. SADIE    0 (Disables the unit from interrupting on slave addresses
+*                                       matching its slave address)
+*  12. ALDIE    0 (Disables the unit from interrupt when it loses arbitration
+*                                       in master mode)
+*  11. SSDIE    0 (Disables interrupts from a slave stop detected, in slave mode)
+*  10. BEIE     1 (Enable interrupts from detected bus errors, no ACK sent)
+*  9.  IRFIE    1 (Enable interrupts from full buffer received)
+*  8.  ITEIE    1 (Enables the I2C unit to interrupt when transmit buffer empty)
+*  7.  GCD      1 (Disables i2c unit response to general call messages as a slave)
+*  6.  IUE      0 (Disable unit until we change settings)
+*  5.  SCLE     1 (Enables the i2c clock output for master mode (drives SCL)
+*  4.  MA       0 (Only send stop with the ICR stop bit)
+*  3.  TB       0 (We are not transmitting a byte initially)
+*  2.  ACKNAK   0 (Send an ACK after the unit receives a byte)
+*  1.  STOP     0 (Do not send a STOP)
+*  0.  START    0 (Do not send a START)
+*
+*/
+#define I2C_ICR_INIT   (ICR_BEIE | ICR_IRFIE | ICR_ITEIE | ICR_GCD | ICR_SCLE)
+
+/* I2C status register init values
+ *
+ * 10. BED      1 (Clear bus error detected)
+ * 9.  SAD      1 (Clear slave address detected)
+ * 7.  IRF      1 (Clear IDBR Receive Full)
+ * 6.  ITE      1 (Clear IDBR Transmit Empty)
+ * 5.  ALD      1 (Clear Arbitration Loss Detected)
+ * 4.  SSD      1 (Clear Slave Stop Detected)
+ */
+#define I2C_ISR_INIT   0x7FF  /* status register init */
+
+struct i2c_slave_client;
+
+struct i2c_pxa_platform_data {
+       unsigned int            slave_addr;
+       struct i2c_slave_client *slave;
+       unsigned int            class;
+       unsigned int            use_pio :1;
+       unsigned int            fast_mode :1;
+       unsigned int            high_mode:1;
+       unsigned char           master_code;
+       unsigned long           rate;
+};
+#endif
index e8d9f0d52933193740404601be224aee6b10b0da..b0a507d356ef04465a2c390a30f58ddb0853756d 100644 (file)
@@ -28,7 +28,8 @@
 #define MT7622_TOP_AXI_PROT_EN_WB              (BIT(2) | BIT(6) | \
                                                 BIT(7) | BIT(8))
 
-int mtk_infracfg_set_bus_protection(struct regmap *infracfg, u32 mask);
-int mtk_infracfg_clear_bus_protection(struct regmap *infracfg, u32 mask);
-
+int mtk_infracfg_set_bus_protection(struct regmap *infracfg, u32 mask,
+               bool reg_update);
+int mtk_infracfg_clear_bus_protection(struct regmap *infracfg, u32 mask,
+               bool reg_update);
 #endif /* __SOC_MEDIATEK_INFRACFG_H */
index 1c3982bc558fb1d98ec3c90f6663c1a8189dca8e..c32bf91c23e6f81422434057901db1aa8ee25808 100644 (file)
@@ -83,6 +83,7 @@ enum tegra_io_pad {
        TEGRA_IO_PAD_BB,
        TEGRA_IO_PAD_CAM,
        TEGRA_IO_PAD_COMP,
+       TEGRA_IO_PAD_CONN,
        TEGRA_IO_PAD_CSIA,
        TEGRA_IO_PAD_CSIB,
        TEGRA_IO_PAD_CSIC,
@@ -92,31 +93,42 @@ enum tegra_io_pad {
        TEGRA_IO_PAD_DBG,
        TEGRA_IO_PAD_DEBUG_NONAO,
        TEGRA_IO_PAD_DMIC,
+       TEGRA_IO_PAD_DMIC_HV,
        TEGRA_IO_PAD_DP,
        TEGRA_IO_PAD_DSI,
        TEGRA_IO_PAD_DSIB,
        TEGRA_IO_PAD_DSIC,
        TEGRA_IO_PAD_DSID,
+       TEGRA_IO_PAD_EDP,
        TEGRA_IO_PAD_EMMC,
        TEGRA_IO_PAD_EMMC2,
        TEGRA_IO_PAD_GPIO,
        TEGRA_IO_PAD_HDMI,
+       TEGRA_IO_PAD_HDMI_DP0,
+       TEGRA_IO_PAD_HDMI_DP1,
        TEGRA_IO_PAD_HSIC,
        TEGRA_IO_PAD_HV,
        TEGRA_IO_PAD_LVDS,
        TEGRA_IO_PAD_MIPI_BIAS,
        TEGRA_IO_PAD_NAND,
        TEGRA_IO_PAD_PEX_BIAS,
+       TEGRA_IO_PAD_PEX_CLK_BIAS,
        TEGRA_IO_PAD_PEX_CLK1,
        TEGRA_IO_PAD_PEX_CLK2,
+       TEGRA_IO_PAD_PEX_CLK3,
        TEGRA_IO_PAD_PEX_CNTRL,
        TEGRA_IO_PAD_SDMMC1,
+       TEGRA_IO_PAD_SDMMC1_HV,
+       TEGRA_IO_PAD_SDMMC2,
+       TEGRA_IO_PAD_SDMMC2_HV,
        TEGRA_IO_PAD_SDMMC3,
+       TEGRA_IO_PAD_SDMMC3_HV,
        TEGRA_IO_PAD_SDMMC4,
        TEGRA_IO_PAD_SPI,
        TEGRA_IO_PAD_SPI_HV,
        TEGRA_IO_PAD_SYS_DDC,
        TEGRA_IO_PAD_UART,
+       TEGRA_IO_PAD_UFS,
        TEGRA_IO_PAD_USB0,
        TEGRA_IO_PAD_USB1,
        TEGRA_IO_PAD_USB2,