* [GIT PULL 0/9] ARM: SoC changes for v4.1
@ 2015-04-22 6:11 Olof Johansson
2015-04-22 6:11 ` [GIT PULL 1/9] ARM: SoC fixes " Olof Johansson
` (8 more replies)
0 siblings, 9 replies; 10+ messages in thread
From: Olof Johansson @ 2015-04-22 6:11 UTC (permalink / raw)
To: torvalds; +Cc: arm, linux-arm-kernel, linux-kernel, Olof Johansson
Hi Linus,
Again, we seem to be submitting quite late this window as well. Hopefully
it's not a continuing trend.
It's again a smallish merge window for us. The cleanup branch has a nice
negative delta of 16k lines, and as usual lately most of the new additions are
in DT contents for various platforms. The rest is spread out a bit, with
more descriptions in each pull request.
No major conflicts this time, the few ones that show up are covered in each
pull request.
Please merge.
Thanks,
-Olof
^ permalink raw reply [flat|nested] 10+ messages in thread
* [GIT PULL 1/9] ARM: SoC fixes for v4.1
2015-04-22 6:11 [GIT PULL 0/9] ARM: SoC changes for v4.1 Olof Johansson
@ 2015-04-22 6:11 ` Olof Johansson
2015-04-22 6:11 ` [GIT PULL 2/9] ARM: SoC cleanups " Olof Johansson
` (7 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: Olof Johansson @ 2015-04-22 6:11 UTC (permalink / raw)
To: torvalds; +Cc: arm, linux-arm-kernel, linux-kernel, Olof Johansson
Here's the usual "low-priority fixes that didn't make it into the last
few -rcs, with a twist: We had a fixes pull request that I didn't send
in time to get into 4.0, so we'll send some of them to Greg for -stable as
well.
Contents here is as usual not all that controversial:
- A handful of randconfig fixes from Arnd, in particular for older Samsung
platforms
- Exynos fixes, !SMP building, DTS updates for MMC and lid switch
- Kbuild fix to create output subdirectory for DTB files
- Misc minor fixes for OMAP
Conflicts: None
----------------------------------------------------------------
The following changes since commit f614c8178b0696d070b23f36a2a27b5128f6c372:
Merge branch 'parisc-4.1-1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git tags/armsoc-fixes
for you to fetch changes up to cdaa8cf34863028dab238e1498555bf12d693244:
Merge branch 'fixes' into next/fixes-non-critical
----------------------------------------------------------------
Andreas Faerber (2):
ARM: dts: fix mmc node updates for exynos5250-spring
ARM: dts: fix lid and power pin-functions for exynos5250-spring
Arnd Bergmann (7):
ARM: S3C64XX: add I2C dependencies where needed
ARM: S3C64XX: fix building without CONFIG_PM_SLEEP
ARM: S3C64XX: fix __initdata section mismatch
ARM: S3C24XX: use SAMSUNG_WAKEMASK for s3c2416
ARM: S3C24XX: fix building without PM_SLEEP
ARM: S3C24XX: fix header file inclusions
ARM: S3C24XX: avoid a Kconfig warning
Bartlomiej Zolnierkiewicz (1):
ARM: EXYNOS: Fix build breakage cpuidle on !SMP
Felipe Balbi (1):
MAINTAINERS: add OMAP defconfigs under OMAP SUPPORT
Gregory CLEMENT (1):
ARM: mvebu: Disable CPU Idle on Armada 38x
Julia Lawall (1):
ARM: cns3xxx: don't export static symbol
Keerthy (1):
ARM: dts: DRA7: Add bandgap and related thermal nodes
Kishon Vijay Abraham I (2):
ARM: dts: am4372: Add "ti,am437x-ocp2scp" as compatible string for OCP2SCP
bus: ocp2scp: SYNC2 value should be changed to 0x6
Nathan Rossi (1):
kbuild: Create directory for target DTB
Nicolas Ferre (1):
ARM: at91/dt: sama5d3 xplained: add phy address for macb1
Nishanth Menon (1):
ARM: dts: am57xx-beagle-x15: Add thermal map to include fan and tmp102
Olof Johansson (5):
Merge tag 'omap-for-v4.1/fixes-0' of git://git.kernel.org/.../tmlind/linux-omap into next/fixes-non-critical
Merge tag 'mvebu-fixes-4.0' of git://git.infradead.org/linux-mvebu into fixes
Merge tag 'samsung-fixes-2' of git://git.kernel.org/.../kgene/linux-samsung into fixes
Merge tag 'samsung-fixes-v4.1' of git://git.kernel.org/.../kgene/linux-samsung into next/fixes-non-critical
Merge branch 'fixes' into next/fixes-non-critical
Paul Walmsley (1):
ARM: OMAP1: PM: fix some build warnings on 1510-only Kconfigs
Praneeth Bajjuri (1):
ARM: DRA7: Enable Cortex A15 errata 798181
Stefan Agner (1):
ARM: OMAP2+: remove superfluous NULL pointer check
Stefan Hengelein (1):
ARM: OMAP4: remove dead kconfig option OMAP4_ERRATA_I688
Tony Lindgren (1):
Merge branch 'omap-for-v4.1/ocp2scp' into omap-for-v4.1/fixes-not-urgent
.../devicetree/bindings/bus/omap-ocp2scp.txt | 3 +-
MAINTAINERS | 2 +
arch/arm/boot/dts/am4372.dtsi | 4 +-
arch/arm/boot/dts/am57xx-beagle-x15.dts | 49 ++++++++++++++
arch/arm/boot/dts/at91-sama5d3_xplained.dts | 6 ++
arch/arm/boot/dts/dra7.dtsi | 23 +++++++
arch/arm/boot/dts/dra72x.dtsi | 5 ++
arch/arm/boot/dts/dra74x.dtsi | 5 ++
arch/arm/boot/dts/exynos5250-spring.dts | 20 ++----
arch/arm/boot/dts/omap4-cpu-thermal.dtsi | 4 +-
arch/arm/mach-cns3xxx/pm.c | 1 -
arch/arm/mach-exynos/exynos.c | 2 +-
arch/arm/mach-exynos/pm.c | 2 +
arch/arm/mach-mvebu/pmsu.c | 16 ++++-
arch/arm/mach-omap1/pm.c | 51 +++++++--------
arch/arm/mach-omap2/Kconfig | 22 +------
arch/arm/mach-omap2/common.c | 1 -
arch/arm/mach-omap2/common.h | 3 -
arch/arm/mach-omap2/io.c | 2 -
arch/arm/mach-omap2/mux.c | 2 +-
arch/arm/mach-omap2/omap-secure.h | 7 --
arch/arm/mach-omap2/omap4-common.c | 69 --------------------
arch/arm/mach-omap2/sleep44xx.S | 2 -
arch/arm/mach-s3c24xx/Kconfig | 19 +++---
arch/arm/mach-s3c24xx/Makefile | 3 +-
arch/arm/mach-s3c24xx/include/mach/pm-core.h | 24 ++++++-
arch/arm/mach-s3c24xx/pm-s3c2416.c | 3 +-
arch/arm/mach-s3c24xx/pm.c | 6 +-
arch/arm/mach-s3c24xx/s3c2410.c | 2 +-
arch/arm/mach-s3c24xx/s3c2412.c | 2 +-
arch/arm/mach-s3c24xx/s3c2416.c | 2 +-
arch/arm/mach-s3c24xx/s3c2440.c | 4 +-
arch/arm/mach-s3c24xx/s3c2442.c | 4 +-
arch/arm/mach-s3c24xx/s3c244x.c | 7 +-
arch/arm/mach-s3c64xx/Kconfig | 4 +-
arch/arm/mach-s3c64xx/Makefile | 3 +-
arch/arm/mach-s3c64xx/mach-smdk6410.c | 2 +-
arch/arm/mach-s3c64xx/pm.c | 2 +
arch/arm/plat-samsung/include/plat/pm.h | 14 +++-
arch/arm/plat-samsung/pm-debug.c | 1 +
arch/arm/plat-samsung/pm.c | 20 ------
drivers/bus/omap-ocp2scp.c | 34 ++++++++++
drivers/cpuidle/cpuidle-exynos.c | 3 +-
scripts/Makefile.lib | 3 +-
44 files changed, 254 insertions(+), 209 deletions(-)
^ permalink raw reply [flat|nested] 10+ messages in thread
* [GIT PULL 2/9] ARM: SoC cleanups for v4.1
2015-04-22 6:11 [GIT PULL 0/9] ARM: SoC changes for v4.1 Olof Johansson
2015-04-22 6:11 ` [GIT PULL 1/9] ARM: SoC fixes " Olof Johansson
@ 2015-04-22 6:11 ` Olof Johansson
2015-04-22 6:11 ` [GIT PULL 3/9] ARM: SoC platform updates " Olof Johansson
` (6 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: Olof Johansson @ 2015-04-22 6:11 UTC (permalink / raw)
To: torvalds; +Cc: arm, linux-arm-kernel, linux-kernel, Olof Johansson
We've got a fairly large cleanup branch this time. The bulk of this is removal
of non-DT platforms of several flavors:
- Atmel at91 platforms go full-DT, with removal of remaining board-file based
support
- OMAP removes legacy board files for three more platforms
- Removal of non-DT mach-msm, newer Qualcomm platforms now live in mach-qcom
- Freescale i.MX25 also removes non-DT platform support
Most of the rest of the changes here are fallout from the above, i.e. for
example removal of drivers that now lack platforms, etc.
Conflicts: None
----------------------------------------------------------------
The following changes since commit 94125d56aa2549dae3bd3ac5fd7b6b8993a76a06:
Merge tag 'armsoc-fixes' into testmerge
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git tags/armsoc-cleanup
for you to fetch changes up to c4c14f393fe4991a423c21516511ff1011140143:
Merge tag 'imx-cleanup-4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into next/cleanup
----------------------------------------------------------------
Alexandre Belloni (8):
ARM: at91: remove unused at91_ioremap_matrix and header
ARM: at91: remove unused _matrix.h headers
ARM: at91/dt: introduce atmel,<chip>-dbgu
ARM: at91: at91rm9200 use SoC detection infrastructure
ARM: at91: at91sam9: use SoC detection infrastructure
ARM: at91: sama5 use SoC detection infrastructure
ARM: at91: sama5d4: remove useless map_io
ARM: at91: remove old setup
Arnd Bergmann (4):
Merge tag 'mvebu-cleanup-4.1' of git://git.infradead.org/linux-mvebu into next/cleanup
ARM: at91: remove NEED_MACH_IO_H
Merge tag 'at91-cleanup2' of git://git.kernel.org/.../nferre/linux-at91 into next/cleanup
Merge tag 'renesas-soc-cleanup2-for-v4.1' of git://git.kernel.org/.../horms/renesas into next/cleanup
Boris BREZILLON (1):
ARM: at91: add soc detection infrastructure
Boris Brezillon (1):
ARM: at91: remove ksz8081 phy fixup registration for sama5d4ek board
Daniel Lezcano (1):
ARM: shmobile: cpuidle: Remove the pointless default driver
Fabio Estevam (11):
ARM: imx: Kconfig: Fix grammar in help text
ARM: mx25: Remove mach-mx25_3ds board file
ARM: imx25: Remove eukrea mx25 board files
ARM: mx25: Convert to a dt-only platform
ARM: mx25: Remove platform code support files
ARM: mx25: Remove mx25_clocks_init()
ARM: mx25: Retrieve IIM base from dt
ARM: mx25: Remove static memory mapping
ARM: mx25: Remove "mx25.h" header file
ARM: mx25: Remove imxdi_rtc platform code
ARM: imx_v4_v5_defconfig: Remove CONFIG_MACH_MX25_3DS
Gaku Inami (1):
ARM: shmobile: Consolidate the pm code for R-Car Gen2
Geert Uytterhoeven (3):
ARM: shmobile: Remove stray closing parenthesis in debug description
ARM: shmobile: R-Car Gen2: CONFIG_COMMON_CLK is always set
ARM: shmobile: r8a7740: Remove restart callback
Nicolas Ferre (3):
Merge tag 'at91-fixes' into at91-4.1-cleanup
Merge tag 'at91-fixes2' into at91-4.1-cleanup
Merge tag 'at91-fixes3' into at91-4.1-cleanup
Olof Johansson (6):
Merge tag 'davinci-for-v4.1/mcasp' of git://git.kernel.org/.../nsekhar/linux-davinci into next/cleanup
Merge tag 'v4.1-legacy' of git://git.kernel.org/.../tmlind/linux-omap into next/cleanup
Merge tag 'renesas-pm-for-v4.1' of git://git.kernel.org/.../horms/renesas into next/cleanup
Merge tag 'renesas-soc-cleanup3-for-v4.1' of git://git.kernel.org/.../horms/renesas into next/cleanup
Merge tag 'qcom-cleanup-for-4.1' of git://git.kernel.org/.../galak/linux-qcom into next/cleanup
Merge tag 'imx-cleanup-4.1' of git://git.kernel.org/.../shawnguo/linux into next/cleanup
Peter Ujfalusi (7):
ARM: davinci: devices-da8xx: Add resource name for the McASP DMA request
ARM: davinci: devices-da8xx: Add interrupt resource to McASP structs
ARM: davinci: devices-da8xx: Clean up and correct the McASP device creation
ARM: davinci: devices-da8xx: Add support for McASP2 on da830
ARM: davinci: dm646x: Clean up the McASP DMA resources
ARM: davinci: irqs: Correct McASP1 TX interrupt definition for DM646x
ARM: davinci: dm646x: Add interrupt resource for McASPs
Simon Horman (2):
ARM: shmobile: r8a7790: Correct SYSCIER value
ARM: shmobile: r8a7791: Correct SYSCIER value
Stephen Boyd (3):
ARM: Remove mach-msm and associated ARM architecture code
gpio: Remove gpio-msm-v1 driver
mmc: Remove msm_sdcc driver
Sylvain Rochet (1):
ARM: at91/pm_slowclock: remove clocks which are already stopped when entering slow clock mode
Thomas Petazzoni (1):
ARM: mvebu: add __initconst specifiers on DT_MACHINE_START dt_compat tables
Tony Lindgren (3):
ARM: OMAP3: Remove legacy support for EMA-Tech Stalker board
ARM: OMAP3: Remove legacy support for devkit8000
ARM: OMAP2+: Remove legacy support for omap3 TouchBook
Uwe Kleine-König (1):
ARM: imx/iomux-v3: allow pad_list to be const
Wenyou Yang (12):
ARM: at91: pm: change at91_pm_set_standby() to static
ARM: at91/pm_slowclock: remove the unused code related with SLOWDOWN_MASTER_CLOCK
ARM: at91: move "select SRAM" under SOC_AT91SAM9 and SOC_SAMA5
ARM: at91/pm: remove CONFIG_AT91_SLOW_CLOCK config option
ARM: at91/pm_slowclock: create the procedure to handle the sdram self-refresh
ARM: at91/pm: move the copying the sram function to the sram initialization phase
ARM: at91/pm: standby mode uses same sram function as suspend to memory mode
ARM: at91/pm: rename file name: pm_slowclock.S --> pm_suspend.S
ARM: at91/pm: rename function name: at91_slow_clock() --> at91_pm_suspend_sram_fn()
ARM: at91/pm: remove unused void (*at91_pm_standby)(void)
ARM: at91/pm_suspend: add the WFI instruction support for ARMv7
ARM: at91/pm: flush data cache and clean, invalidate and disable the L2 cache
Yannick Guerrini (1):
ARM: imx: Fix trivial typo in comments
Documentation/arm/00-INDEX | 2 -
Documentation/arm/msm/gpiomux.txt | 176 ---
.../devicetree/bindings/serial/atmel-usart.txt | 3 +-
MAINTAINERS | 20 +-
arch/arm/Kconfig | 16 +-
arch/arm/Kconfig.debug | 31 +-
arch/arm/Makefile | 2 -
arch/arm/boot/dts/at91rm9200.dtsi | 2 +-
arch/arm/boot/dts/at91sam9260.dtsi | 2 +-
arch/arm/boot/dts/at91sam9261.dtsi | 2 +-
arch/arm/boot/dts/at91sam9263.dtsi | 2 +-
arch/arm/boot/dts/at91sam9g45.dtsi | 2 +-
arch/arm/boot/dts/at91sam9n12.dtsi | 2 +-
arch/arm/boot/dts/at91sam9rl.dtsi | 2 +-
arch/arm/boot/dts/at91sam9x5.dtsi | 2 +-
arch/arm/boot/dts/sama5d3.dtsi | 2 +-
arch/arm/boot/dts/sama5d4.dtsi | 2 +-
arch/arm/configs/imx_v4_v5_defconfig | 3 +-
arch/arm/configs/msm_defconfig | 121 --
arch/arm/configs/multi_v5_defconfig | 2 +-
arch/arm/include/debug/msm.S | 14 -
arch/arm/mach-at91/Kconfig | 19 +-
arch/arm/mach-at91/Makefile | 4 +-
arch/arm/mach-at91/at91rm9200.c | 29 +-
arch/arm/mach-at91/at91sam9.c | 76 +-
arch/arm/mach-at91/generic.h | 4 -
arch/arm/mach-at91/include/mach/at91_matrix.h | 23 -
.../mach-at91/include/mach/at91sam9260_matrix.h | 80 -
.../mach-at91/include/mach/at91sam9261_matrix.h | 64 -
.../mach-at91/include/mach/at91sam9263_matrix.h | 129 --
.../mach-at91/include/mach/at91sam9g45_matrix.h | 153 --
.../mach-at91/include/mach/at91sam9n12_matrix.h | 53 -
.../mach-at91/include/mach/at91sam9rl_matrix.h | 96 --
.../mach-at91/include/mach/at91sam9x5_matrix.h | 53 -
arch/arm/mach-at91/include/mach/io.h | 27 -
arch/arm/mach-at91/pm.c | 139 +-
arch/arm/mach-at91/pm.h | 14 +-
arch/arm/mach-at91/pm_slowclock.S | 335 ----
arch/arm/mach-at91/pm_suspend.S | 338 ++++
arch/arm/mach-at91/sama5.c | 97 +-
arch/arm/mach-at91/setup.c | 330 ----
arch/arm/mach-at91/soc.c | 97 ++
arch/arm/mach-at91/soc.h | 78 +
arch/arm/mach-davinci/asp.h | 7 +
arch/arm/mach-davinci/devices-da8xx.c | 80 +-
arch/arm/mach-davinci/dm646x.c | 24 +-
arch/arm/mach-davinci/include/mach/irqs.h | 2 +-
arch/arm/mach-imx/Kconfig | 81 +-
arch/arm/mach-imx/Makefile | 8 +-
arch/arm/mach-imx/clk-imx25.c | 75 -
arch/arm/mach-imx/common.h | 5 -
arch/arm/mach-imx/cpu-imx25.c | 11 +-
arch/arm/mach-imx/devices-imx25.h | 85 -
arch/arm/mach-imx/devices/Kconfig | 3 -
arch/arm/mach-imx/devices/Makefile | 1 -
arch/arm/mach-imx/devices/platform-fec.c | 5 -
.../mach-imx/devices/platform-fsl-usb2-udc.c | 5 -
arch/arm/mach-imx/devices/platform-imx-fb.c | 5 -
arch/arm/mach-imx/devices/platform-imx-i2c.c | 10 -
arch/arm/mach-imx/devices/platform-imx-keypad.c | 5 -
arch/arm/mach-imx/devices/platform-imx-ssi.c | 9 -
arch/arm/mach-imx/devices/platform-imx-uart.c | 12 -
arch/arm/mach-imx/devices/platform-imx2-wdt.c | 5 -
arch/arm/mach-imx/devices/platform-imxdi_rtc.c | 42 -
arch/arm/mach-imx/devices/platform-mx2-camera.c | 5 -
arch/arm/mach-imx/devices/platform-mxc-ehci.c | 7 -
arch/arm/mach-imx/devices/platform-mxc_nand.c | 5 -
arch/arm/mach-imx/devices/platform-spi_imx.c | 11 -
arch/arm/mach-imx/ehci-imx25.c | 99 --
arch/arm/mach-imx/eukrea_mbimxsd25-baseboard.c | 310 ----
arch/arm/mach-imx/eukrea_mbimxsd35-baseboard.c | 2 +-
arch/arm/mach-imx/hardware.h | 1 -
arch/arm/mach-imx/iomux-mx25.h | 524 -------
arch/arm/mach-imx/iomux-mx3.h | 2 +-
arch/arm/mach-imx/iomux-v3.c | 5 +-
arch/arm/mach-imx/iomux-v3.h | 5 +-
arch/arm/mach-imx/mach-cpuimx35.c | 2 +-
arch/arm/mach-imx/mach-eukrea_cpuimx25.c | 172 --
arch/arm/mach-imx/{imx25-dt.c => mach-imx25.c} | 20 +-
arch/arm/mach-imx/mach-mx25_3ds.c | 270 ----
arch/arm/mach-imx/mach-mx35_3ds.c | 2 +-
arch/arm/mach-imx/mach-pcm043.c | 2 +-
arch/arm/mach-imx/mach-vpr200.c | 2 +-
arch/arm/mach-imx/mm-imx25.c | 89 --
arch/arm/mach-imx/mx25.h | 117 --
arch/arm/mach-msm/Kconfig | 109 --
arch/arm/mach-msm/Makefile | 23 -
arch/arm/mach-msm/Makefile.boot | 3 -
arch/arm/mach-msm/board-halibut.c | 110 --
arch/arm/mach-msm/board-msm7x30.c | 191 ---
arch/arm/mach-msm/board-qsd8x50.c | 254 ---
arch/arm/mach-msm/board-sapphire.c | 114 --
arch/arm/mach-msm/board-trout-gpio.c | 233 ---
arch/arm/mach-msm/board-trout-mmc.c | 185 ---
arch/arm/mach-msm/board-trout-panel.c | 292 ----
arch/arm/mach-msm/board-trout.c | 111 --
arch/arm/mach-msm/board-trout.h | 162 --
arch/arm/mach-msm/clock-pcom.c | 176 ---
arch/arm/mach-msm/clock-pcom.h | 145 --
arch/arm/mach-msm/clock.c | 28 -
arch/arm/mach-msm/clock.h | 43 -
arch/arm/mach-msm/common.h | 41 -
arch/arm/mach-msm/devices-msm7x00.c | 480 ------
arch/arm/mach-msm/devices-msm7x30.c | 246 ---
arch/arm/mach-msm/devices-qsd8x50.c | 388 -----
arch/arm/mach-msm/devices.h | 53 -
arch/arm/mach-msm/dma.c | 298 ----
arch/arm/mach-msm/gpiomux-8x50.c | 51 -
arch/arm/mach-msm/gpiomux-v1.h | 67 -
arch/arm/mach-msm/gpiomux.c | 111 --
arch/arm/mach-msm/gpiomux.h | 84 -
arch/arm/mach-msm/include/mach/clk.h | 31 -
arch/arm/mach-msm/include/mach/dma.h | 151 --
arch/arm/mach-msm/include/mach/entry-macro.S | 36 -
arch/arm/mach-msm/include/mach/hardware.h | 18 -
arch/arm/mach-msm/include/mach/irqs-7x00.h | 75 -
arch/arm/mach-msm/include/mach/irqs-7x30.h | 153 --
arch/arm/mach-msm/include/mach/irqs-8x50.h | 88 --
arch/arm/mach-msm/include/mach/irqs.h | 37 -
arch/arm/mach-msm/include/mach/msm_gpiomux.h | 38 -
arch/arm/mach-msm/include/mach/msm_iomap-7x00.h | 108 --
arch/arm/mach-msm/include/mach/msm_iomap-7x30.h | 103 --
arch/arm/mach-msm/include/mach/msm_iomap-8x50.h | 125 --
arch/arm/mach-msm/include/mach/msm_iomap.h | 53 -
arch/arm/mach-msm/include/mach/msm_smd.h | 109 --
arch/arm/mach-msm/include/mach/sirc.h | 98 --
arch/arm/mach-msm/include/mach/vreg.h | 29 -
arch/arm/mach-msm/io.c | 161 --
arch/arm/mach-msm/irq-vic.c | 363 -----
arch/arm/mach-msm/irq.c | 151 --
arch/arm/mach-msm/last_radio_log.c | 71 -
arch/arm/mach-msm/proc_comm.c | 129 --
arch/arm/mach-msm/proc_comm.h | 258 ---
arch/arm/mach-msm/sirc.c | 172 --
arch/arm/mach-msm/smd.c | 1034 ------------
arch/arm/mach-msm/smd_debug.c | 311 ----
arch/arm/mach-msm/smd_private.h | 403 -----
arch/arm/mach-msm/vreg.c | 220 ---
arch/arm/mach-mvebu/board-v7.c | 6 +-
arch/arm/mach-mvebu/dove.c | 2 +-
arch/arm/mach-mvebu/kirkwood.c | 2 +-
arch/arm/mach-omap2/Kconfig | 18 -
arch/arm/mach-omap2/Makefile | 4 -
arch/arm/mach-omap2/board-devkit8000.c | 654 --------
arch/arm/mach-omap2/board-omap3stalker.c | 433 -----
arch/arm/mach-omap2/board-omap3touchbook.c | 395 -----
arch/arm/mach-shmobile/Makefile | 6 +-
arch/arm/mach-shmobile/common.h | 9 -
arch/arm/mach-shmobile/cpuidle.c | 37 -
arch/arm/mach-shmobile/pm-r8a7790.c | 82 -
arch/arm/mach-shmobile/pm-r8a7791.c | 73 -
arch/arm/mach-shmobile/pm-rcar-gen2.c | 115 ++
arch/arm/mach-shmobile/pm-sh7372.c | 2 +-
arch/arm/mach-shmobile/r8a7790.h | 1 -
arch/arm/mach-shmobile/r8a7791.h | 1 -
arch/arm/mach-shmobile/rcar-gen2.h | 1 +
arch/arm/mach-shmobile/setup-r8a7740.c | 8 -
arch/arm/mach-shmobile/setup-rcar-gen2.c | 4 -
arch/arm/mach-shmobile/smp-r8a7790.c | 3 +-
arch/arm/mach-shmobile/smp-r8a7791.c | 2 +-
drivers/gpio/Kconfig | 8 -
drivers/gpio/Makefile | 1 -
drivers/gpio/gpio-msm-v1.c | 714 ---------
drivers/mmc/host/Kconfig | 8 -
drivers/mmc/host/Makefile | 1 -
drivers/mmc/host/msm_sdcc.c | 1474 ------------------
drivers/mmc/host/msm_sdcc.h | 256 ---
drivers/pcmcia/Kconfig | 1 +
drivers/pcmcia/at91_cf.c | 13 +-
include/linux/platform_data/mmc-msm_sdcc.h | 27 -
170 files changed, 1011 insertions(+), 16653 deletions(-)
delete mode 100644 Documentation/arm/msm/gpiomux.txt
delete mode 100644 arch/arm/configs/msm_defconfig
delete mode 100644 arch/arm/mach-at91/include/mach/at91_matrix.h
delete mode 100644 arch/arm/mach-at91/include/mach/at91sam9260_matrix.h
delete mode 100644 arch/arm/mach-at91/include/mach/at91sam9261_matrix.h
delete mode 100644 arch/arm/mach-at91/include/mach/at91sam9263_matrix.h
delete mode 100644 arch/arm/mach-at91/include/mach/at91sam9g45_matrix.h
delete mode 100644 arch/arm/mach-at91/include/mach/at91sam9n12_matrix.h
delete mode 100644 arch/arm/mach-at91/include/mach/at91sam9rl_matrix.h
delete mode 100644 arch/arm/mach-at91/include/mach/at91sam9x5_matrix.h
delete mode 100644 arch/arm/mach-at91/include/mach/io.h
delete mode 100644 arch/arm/mach-at91/pm_slowclock.S
create mode 100644 arch/arm/mach-at91/pm_suspend.S
delete mode 100644 arch/arm/mach-at91/setup.c
create mode 100644 arch/arm/mach-at91/soc.c
create mode 100644 arch/arm/mach-at91/soc.h
delete mode 100644 arch/arm/mach-imx/devices-imx25.h
delete mode 100644 arch/arm/mach-imx/devices/platform-imxdi_rtc.c
delete mode 100644 arch/arm/mach-imx/ehci-imx25.c
delete mode 100644 arch/arm/mach-imx/eukrea_mbimxsd25-baseboard.c
delete mode 100644 arch/arm/mach-imx/iomux-mx25.h
delete mode 100644 arch/arm/mach-imx/mach-eukrea_cpuimx25.c
rename arch/arm/mach-imx/{imx25-dt.c => mach-imx25.c} (68%)
delete mode 100644 arch/arm/mach-imx/mach-mx25_3ds.c
delete mode 100644 arch/arm/mach-imx/mm-imx25.c
delete mode 100644 arch/arm/mach-imx/mx25.h
delete mode 100644 arch/arm/mach-msm/Kconfig
delete mode 100644 arch/arm/mach-msm/Makefile
delete mode 100644 arch/arm/mach-msm/Makefile.boot
delete mode 100644 arch/arm/mach-msm/board-halibut.c
delete mode 100644 arch/arm/mach-msm/board-msm7x30.c
delete mode 100644 arch/arm/mach-msm/board-qsd8x50.c
delete mode 100644 arch/arm/mach-msm/board-sapphire.c
delete mode 100644 arch/arm/mach-msm/board-trout-gpio.c
delete mode 100644 arch/arm/mach-msm/board-trout-mmc.c
delete mode 100644 arch/arm/mach-msm/board-trout-panel.c
delete mode 100644 arch/arm/mach-msm/board-trout.c
delete mode 100644 arch/arm/mach-msm/board-trout.h
delete mode 100644 arch/arm/mach-msm/clock-pcom.c
delete mode 100644 arch/arm/mach-msm/clock-pcom.h
delete mode 100644 arch/arm/mach-msm/clock.c
delete mode 100644 arch/arm/mach-msm/clock.h
delete mode 100644 arch/arm/mach-msm/common.h
delete mode 100644 arch/arm/mach-msm/devices-msm7x00.c
delete mode 100644 arch/arm/mach-msm/devices-msm7x30.c
delete mode 100644 arch/arm/mach-msm/devices-qsd8x50.c
delete mode 100644 arch/arm/mach-msm/devices.h
delete mode 100644 arch/arm/mach-msm/dma.c
delete mode 100644 arch/arm/mach-msm/gpiomux-8x50.c
delete mode 100644 arch/arm/mach-msm/gpiomux-v1.h
delete mode 100644 arch/arm/mach-msm/gpiomux.c
delete mode 100644 arch/arm/mach-msm/gpiomux.h
delete mode 100644 arch/arm/mach-msm/include/mach/clk.h
delete mode 100644 arch/arm/mach-msm/include/mach/dma.h
delete mode 100644 arch/arm/mach-msm/include/mach/entry-macro.S
delete mode 100644 arch/arm/mach-msm/include/mach/hardware.h
delete mode 100644 arch/arm/mach-msm/include/mach/irqs-7x00.h
delete mode 100644 arch/arm/mach-msm/include/mach/irqs-7x30.h
delete mode 100644 arch/arm/mach-msm/include/mach/irqs-8x50.h
delete mode 100644 arch/arm/mach-msm/include/mach/irqs.h
delete mode 100644 arch/arm/mach-msm/include/mach/msm_gpiomux.h
delete mode 100644 arch/arm/mach-msm/include/mach/msm_iomap-7x00.h
delete mode 100644 arch/arm/mach-msm/include/mach/msm_iomap-7x30.h
delete mode 100644 arch/arm/mach-msm/include/mach/msm_iomap-8x50.h
delete mode 100644 arch/arm/mach-msm/include/mach/msm_iomap.h
delete mode 100644 arch/arm/mach-msm/include/mach/msm_smd.h
delete mode 100644 arch/arm/mach-msm/include/mach/sirc.h
delete mode 100644 arch/arm/mach-msm/include/mach/vreg.h
delete mode 100644 arch/arm/mach-msm/io.c
delete mode 100644 arch/arm/mach-msm/irq-vic.c
delete mode 100644 arch/arm/mach-msm/irq.c
delete mode 100644 arch/arm/mach-msm/last_radio_log.c
delete mode 100644 arch/arm/mach-msm/proc_comm.c
delete mode 100644 arch/arm/mach-msm/proc_comm.h
delete mode 100644 arch/arm/mach-msm/sirc.c
delete mode 100644 arch/arm/mach-msm/smd.c
delete mode 100644 arch/arm/mach-msm/smd_debug.c
delete mode 100644 arch/arm/mach-msm/smd_private.h
delete mode 100644 arch/arm/mach-msm/vreg.c
delete mode 100644 arch/arm/mach-omap2/board-devkit8000.c
delete mode 100644 arch/arm/mach-omap2/board-omap3stalker.c
delete mode 100644 arch/arm/mach-omap2/board-omap3touchbook.c
delete mode 100644 arch/arm/mach-shmobile/cpuidle.c
delete mode 100644 arch/arm/mach-shmobile/pm-r8a7790.c
delete mode 100644 arch/arm/mach-shmobile/pm-r8a7791.c
create mode 100644 arch/arm/mach-shmobile/pm-rcar-gen2.c
delete mode 100644 drivers/gpio/gpio-msm-v1.c
delete mode 100644 drivers/mmc/host/msm_sdcc.c
delete mode 100644 drivers/mmc/host/msm_sdcc.h
delete mode 100644 include/linux/platform_data/mmc-msm_sdcc.h
^ permalink raw reply [flat|nested] 10+ messages in thread
* [GIT PULL 3/9] ARM: SoC platform updates for v4.1
2015-04-22 6:11 [GIT PULL 0/9] ARM: SoC changes for v4.1 Olof Johansson
2015-04-22 6:11 ` [GIT PULL 1/9] ARM: SoC fixes " Olof Johansson
2015-04-22 6:11 ` [GIT PULL 2/9] ARM: SoC cleanups " Olof Johansson
@ 2015-04-22 6:11 ` Olof Johansson
2015-04-22 6:11 ` [GIT PULL 4/9] ARM: DT " Olof Johansson
` (5 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: Olof Johansson @ 2015-04-22 6:11 UTC (permalink / raw)
To: torvalds; +Cc: arm, linux-arm-kernel, linux-kernel, Olof Johansson
Our SoC branch usually contains expanded support for new SoCs and other core
platform code. In this case, that includes:
- Support for the new Annapurna Labs "Alpine" platform
- A rework greatly simplifying adding new platform support to the MCPM
subsystem (Multi-cluster power management)
- Cpuidle and PM improvements for Exynos3250
- Misc updates for Renesas, OMAP, Meson, i.MX. Some of these could have
gone in other branches but ended up here for various reasons.
Conflicts:
arch/arm/mach-exynos/platsmp.c: Conflict with a fix for 4.0. Keep
the core_conf variable, but go with the soc_is_*() version if the if
statement.
arch/arm/mach-exynos/suspend.c:
Keep the const version, but move it down to the lower position
----------------------------------------------------------------
The following changes since commit 05999d25d26bb99ed09ed2d08aa33e3f116bdd88:
Merge tag 'armsoc-cleanup' into testmerge
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git tags/armsoc-soc
for you to fetch changes up to a018bb2ff95868ea592212b6735b35836fda268b:
ARM: alpine: add support for generic pci
----------------------------------------------------------------
Alison Chaiken (1):
bus: imx-weim: improve error handling upon child probe-failure
Andrzej Hajda (1):
ARM: EXYNOS: add support for async-bridge clocks for pm_domains
Arnd Bergmann (5):
Merge tag 'renesas-soc-for-v4.1' of git://git.kernel.org/.../horms/renesas into next/soc
Merge tag 'for-v4.0-rc/meson-soc' of https://github.com/carlocaione/linux-meson into next/soc
Merge tag 'mvebu-soc-4.1' of git://git.infradead.org/linux-mvebu into next/soc
Merge tag 'renesas-da9063-da9210-quirk-for-v4.1' of git://git.kernel.org/.../horms/renesas into next/soc
Merge tag 'arm-soc/for-4.1/soc' of http://github.com/broadcom/stblinux into next/soc
Bartlomiej Zolnierkiewicz (4):
ARM: EXYNOS: fix CPU1 hotplug on Exynos3250
ARM: EXYNOS: add code for setting/clearing boot flag
ARM: EXYNOS: add AFTR mode support for Exynos3250
ARM: EXYNOS: allow cpuidle driver usage on Exynos3250 SoC
Beniamino Galvani (3):
ARM: meson: select PINCTRL_MESON and ARCH_REQUIRE_GPIOLIB
of: Add vendor prefix for MINIX
of: Define board compatible for MINIX NEO-X8
Charles Keepax (1):
ARM: S3C64XX: Use fixed IRQ bases to avoid conflicts on Cragganmore
Chris Zhong (2):
ARM: rockchip: decrease the wait time for resume
ARM: rockchip: disable watchdog during suspend
Geert Uytterhoeven (5):
ARM: shmobile: R-Car Gen2: Add da9063/da9210 regulator quirk
ARM: shmobile: koelsch dts: Add da9210 regulator interrupt
ARM: shmobile: koelsch: Add da9063 PMIC device node for system restart
ARM: shmobile: lager dts: Add da9210 regulator interrupt
ARM: shmobile: lager: Add da9063 PMIC device node for system restart
Grygorii Strashko (1):
ARM: omap-device: add missed callback for suspend-to-disk
Krzysztof Kozlowski (5):
ARM: rockchip: Constify struct regmap_config and staticize local function
ARM: EXYNOS: Use platform device name as power domain name
ARM: EXYNOS: use static in suspend.c
ARM: EXYNOS: Constify exynos_pm_data array
ARM: EXYNOS: Remove left over 'extra_save'
Liu Ying (6):
ARM: imx6q: Add GPR3 MIPI muxing control register field shift bits definition
ARM: imx6q: clk: Add the video_27m clock
ARM: imx6q: clk: Change hdmi_isfr clock's parent to be video_27m clock
ARM: imx6q: clk: Change hsi_tx clock to be a shared clock gate
ARM: imx6q: clk: Add support for mipi_core_cfg clock as a shared clock gate
ARM: imx6q: clk: Add support for mipi_ipg clock as a shared clock gate
Magnus Damm (1):
ARM: shmobile: No R-Car Gen2 CMA reservation when HIGHMEM=n
Nicolas Pitre (5):
ARM: MCPM: move the algorithmic complexity to the core code
ARM: vexpress: migrate TC2 to the new MCPM backend abstraction
ARM: vexpress: DCSCB: tighten CPU validity assertion
ARM: vexpress: migrate DCSCB to the new MCPM backend abstraction
ARM: Exynos: migrate DCSCB to the new MCPM backend abstraction
Olof Johansson (4):
Merge tag 'v4.1-rockchip-soc1' of git://git.kernel.org/.../mmind/linux-rockchip into next/soc
Merge tag 'v4.1-soc' of git://git.kernel.org/.../tmlind/linux-omap into next/soc
Merge tag 'imx-soc-4.1' of git://git.kernel.org/.../shawnguo/linux into next/soc
Merge tag 'samsung-updates' of git://git.kernel.org/.../kgene/linux-samsung into next/soc
Philipp Zabel (2):
Documentation: Add device tree bindings for Freescale i.MX GPC
ARM: imx6: gpc: Add PU power domain for GPU/VPU
Sourav Poddar (1):
ARM: OMAP2: hwmod: AM43XX: Add hwmod support for HDQ-1W
Stefan Agner (3):
ARM: vf610: use SMP_ON_UP for Vybrid SoC
ARM: imx: depend MXC debug board on 3DS machines
ARM: cygnus: fix const declaration bcm_cygnus_dt_compat
Suman Anna (2):
ARM: DRA7: hwmod: Add data for GPTimers 13 through 16
ARM: DRA7: hwmod: Fix the hwmod class for GPTimer4
Thomas Petazzoni (4):
devicetree: bindings: add DT binding for the Marvell Armada 39x SoC family
devicetree: bindings: add new SMP enable method for Marvell Armada 39x
ARM: mvebu: add core support for Armada 39x
Documentation: arm: update supported Marvell EBU processors
Tony Lindgren (1):
Merge tag 'for-v4.1/omap-hwmod-a' of git://git.kernel.org/.../pjw/omap-pending into omap-for-v4.1/soc
Tsahee Zidenberg (6):
ARM: Alpine: Initial support for Alpine platform
ARM: Alpine: early-debug print support
ARM: Alpine: smp support
ARM: dts: Alpine platform binding documentation
MAINTAINERS: add maintainer for Alpine Arm machine
ARM: alpine: add support for generic pci
Documentation/arm/Marvell/README | 5 +
.../devicetree/bindings/arm/al,alpine.txt | 88 ++++++
.../devicetree/bindings/arm/amlogic.txt | 4 +
.../devicetree/bindings/arm/armada-39x.txt | 20 ++
.../arm/cpu-enable-method/al,alpine-smp | 52 ++++
Documentation/devicetree/bindings/arm/cpus.txt | 1 +
.../devicetree/bindings/arm/geniatech.txt | 5 -
.../devicetree/bindings/power/fsl,imx-gpc.txt | 59 ++++
.../devicetree/bindings/vendor-prefixes.txt | 2 +
MAINTAINERS | 5 +
arch/arm/Kconfig | 2 +
arch/arm/Kconfig.debug | 12 +-
arch/arm/Makefile | 1 +
arch/arm/boot/dts/r8a7790-lager.dts | 18 ++
arch/arm/boot/dts/r8a7791-koelsch.dts | 18 ++
arch/arm/common/mcpm_entry.c | 202 +++++++++++--
arch/arm/include/asm/mcpm.h | 65 ++++-
arch/arm/mach-alpine/Kconfig | 12 +
arch/arm/mach-alpine/Makefile | 2 +
arch/arm/mach-alpine/alpine_cpu_pm.c | 70 +++++
arch/arm/mach-alpine/alpine_cpu_pm.h | 26 ++
arch/arm/mach-alpine/alpine_cpu_resume.h | 38 +++
arch/arm/mach-alpine/alpine_machine.c | 28 ++
arch/arm/mach-alpine/platsmp.c | 49 ++++
arch/arm/mach-bcm/bcm_cygnus.c | 2 +-
arch/arm/mach-exynos/common.h | 6 +
arch/arm/mach-exynos/exynos.c | 1 +
arch/arm/mach-exynos/firmware.c | 33 ++-
arch/arm/mach-exynos/mcpm-exynos.c | 247 ++++------------
arch/arm/mach-exynos/platsmp.c | 23 +-
arch/arm/mach-exynos/pm.c | 12 +-
arch/arm/mach-exynos/pm_domains.c | 29 +-
arch/arm/mach-exynos/regs-pmu.h | 3 +
arch/arm/mach-exynos/smc.h | 9 +
arch/arm/mach-exynos/suspend.c | 22 +-
arch/arm/mach-imx/Kconfig | 3 +
arch/arm/mach-imx/clk-imx6q.c | 8 +-
arch/arm/mach-imx/gpc.c | 213 ++++++++++++++
arch/arm/mach-meson/Kconfig | 3 +
arch/arm/mach-mvebu/Kconfig | 14 +
arch/arm/mach-mvebu/board-v7.c | 14 +
arch/arm/mach-mvebu/platsmp-a9.c | 2 +
arch/arm/mach-omap2/omap_device.c | 3 +
arch/arm/mach-omap2/omap_hwmod_43xx_data.c | 36 +++
arch/arm/mach-omap2/omap_hwmod_7xx_data.c | 113 ++++++-
arch/arm/mach-omap2/prcm43xx.h | 1 +
arch/arm/mach-rockchip/platsmp.c | 4 +-
arch/arm/mach-rockchip/pm.c | 14 +-
arch/arm/mach-rockchip/pm.h | 6 +
arch/arm/mach-s3c64xx/crag6410.h | 1 +
arch/arm/mach-s3c64xx/mach-crag6410.c | 1 +
arch/arm/mach-shmobile/Kconfig | 2 +
arch/arm/mach-shmobile/Makefile | 2 +
.../mach-shmobile/regulator-quirk-rcar-gen2.c | 147 ++++++++++
arch/arm/mach-shmobile/setup-rcar-gen2.c | 3 +-
arch/arm/mach-vexpress/dcscb.c | 197 +++++--------
arch/arm/mach-vexpress/tc2_pm.c | 291 ++++++-------------
drivers/bus/imx-weim.c | 13 +-
include/dt-bindings/clock/imx6qdl-clock.h | 5 +-
include/linux/mfd/syscon/imx6q-iomuxc-gpr.h | 1 +
60 files changed, 1638 insertions(+), 630 deletions(-)
create mode 100644 Documentation/devicetree/bindings/arm/al,alpine.txt
create mode 100644 Documentation/devicetree/bindings/arm/armada-39x.txt
create mode 100644 Documentation/devicetree/bindings/arm/cpu-enable-method/al,alpine-smp
delete mode 100644 Documentation/devicetree/bindings/arm/geniatech.txt
create mode 100644 Documentation/devicetree/bindings/power/fsl,imx-gpc.txt
create mode 100644 arch/arm/mach-alpine/Kconfig
create mode 100644 arch/arm/mach-alpine/Makefile
create mode 100644 arch/arm/mach-alpine/alpine_cpu_pm.c
create mode 100644 arch/arm/mach-alpine/alpine_cpu_pm.h
create mode 100644 arch/arm/mach-alpine/alpine_cpu_resume.h
create mode 100644 arch/arm/mach-alpine/alpine_machine.c
create mode 100644 arch/arm/mach-alpine/platsmp.c
create mode 100644 arch/arm/mach-shmobile/regulator-quirk-rcar-gen2.c
^ permalink raw reply [flat|nested] 10+ messages in thread
* [GIT PULL 4/9] ARM: DT updates for v4.1
2015-04-22 6:11 [GIT PULL 0/9] ARM: SoC changes for v4.1 Olof Johansson
` (2 preceding siblings ...)
2015-04-22 6:11 ` [GIT PULL 3/9] ARM: SoC platform updates " Olof Johansson
@ 2015-04-22 6:11 ` Olof Johansson
2015-04-22 6:11 ` [GIT PULL 5/9] ARM: SoC driver " Olof Johansson
` (4 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: Olof Johansson @ 2015-04-22 6:11 UTC (permalink / raw)
To: torvalds; +Cc: arm, linux-arm-kernel, linux-kernel, Olof Johansson
As always, this tends to be one of our bigger branches. There are lots of
updates this release, but not that many jumps out as something that needs
more detailed coverage. Some of the highlights are:
- DTs for the new Annapurna Labs Alpine platform
- More graphics DT pieces falling into place on Exynos, bridges, clocks.
- Plenty of DT updates for Qualcomm platforms for various IP blocks
- Some churn on Tegra due to switch-over to tool-generated pinctrl data
- Misc fixes and updates for Atmel at91 platforms
- Various DT updates to add IP block support on Broadcom's Cygnus platforms
- More updates for Renesas platforms as DT support is added for various IP
blocks (IPMMU, display, audio, etc).
Conflicts: None
----------------------------------------------------------------
The following changes since commit 3a6d5929b0978d35e4a6421c5cf9965a5376fcbf:
Merge tag 'armsoc-soc' into testmerge
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git tags/armsoc-dt
for you to fetch changes up to 8b036556d68175caa9bea3fb98768f733fde33c6:
ARM: dts: alpine: add internal pci
----------------------------------------------------------------
Ajay Kumar (2):
ARM: dts: represent bridge and panel connection for exynos5250-snow
ARM: dts: represent bridge and panel connection for exynos5420-peach-pit
Alexander Stein (1):
DT: video: atmel_lcdc: Add example of fixed framebuffer memory
Anand Moon (1):
ARM: dts: Fixed typo interrupt-cells for exynos5420 and exynos5250
Andrew Lunn (1):
ARM: ARMADA XP: WRT1900AC: Add support for the Ethernet switch
Andrzej Hajda (3):
dt-bindings: add asynchronous bridge clock for exynos
ARM: dts: add async-bridge clocks to disp1 power domain for exynos5420
ARM: dts: add async-bridge clocks to gsc power domain for exynos5420
Andy Gross (5):
mfd: qcom,tcsr: Add device tree binding for TCSR
arm: dts: qcom: Add TCSR support for APQ8064
arm: dts: qcom: Add TCSR support for IPQ8064
arm: dts: qcom: Add TCSR support for MSM8660
arm: dts: qcom: Add TCSR support for MSM8960
Andy Yan (2):
dt-bindings: add root compatible property for PopMetal board
ARM: dts: add rk3288 PopMetal board
Arnd Bergmann (9):
Merge tag 'renesas-dt-for-v4.1' of git://git.kernel.org/.../horms/renesas into next/dt
Merge tag 'for-v4.0-rc/meson-dts' of https://github.com/carlocaione/linux-meson into next/dt
Merge tag 'at91-dt' of git://git.kernel.org/.../nferre/linux-at91 into next/dt
Merge tag 'arm-soc/for-4.1/devicetree' of http://github.com/broadcom/stblinux into next/dt
Merge tag 'mvebu-dt-4.1' of git://git.infradead.org/linux-mvebu into next/dt
Merge tag 'renesas-dt2-for-v4.1' of git://git.kernel.org/.../horms/renesas into next/dt
Merge tag 'arm-soc/for-4.1/devicetree-part-2' of http://github.com/broadcom/stblinux into next/dt
Revert "ARM: dts: mt8135: Add pinctrl/GPIO/EINT node for mt8135."
Merge tag 'mvebu-fixes-4.0-2' of git://git.infradead.org/linux-mvebu into next/dt
Beata Michalska (1):
ARM: dts: Add assigned clock parents to CMU node for exynos3250
Beniamino Galvani (4):
ARM: dts: meson: add node for SPIFC
ARM: dts: meson: enable Ethernet controller
ARM: dts: meson8: add pinctrl node
ARM: dts: meson: add DTS file for MINIX NEO-X8
Bo Shen (7):
ARM: at91/dt: at91sam9n12: add udp device node
ARM: at91/dt: at91sam9n12ek: enable udp
ARM: at91: dt: sama5d4: add ssc nodes
ARM: at91: dt: sama5d4ek: enable ssc0
ARM: at91: dt: sama5d4ek: add and enable wm8904
ARM: at91: dt: sama5d4ek: enable audio
ARM: at91/dt: sama5d4: add pwm0 device node
Boris Brezillon (5):
ARM: at91/dt: split sama5d3 lcd pin definitions to match RGB mode configs
ARM: at91/dt: add alternative pin muxing for sama5d3 lcd pins
ARM: at91/dt: define the HLCDC node available on sama5d3 SoCs
ARM: at91/dt: sama5d4: add lcdc pin definitions
ARM: at91/dt: sama5d4: add hlcdc node
Brian Norris (2):
ARM: dts: brcmstb: un-hexify clock frequency
ARM: dts: brcmstb: add IRQ0 controller
Daniel Tang (1):
devicetree: Add TI-NSPIRE USB OTG support to device tree
Eliad Peller (4):
dt: bindings: add TI's wilink wireless device
wlcore: add device-tree support
ARM: dts: add wl12xx/wl18xx bindings
wlcore: remove wl12xx_platform_data
Ezequiel Garcia (2):
ARM: mvebu: Enable Performance Monitor Unit on Armada 375 SoC
ARM: mvebu: Enable Performance Monitor Unit on Armada 380/385 SoC
Felipe Balbi (1):
ARM: dts: am437x-idk: enable i2c2
Geert Uytterhoeven (10):
ARM: shmobile: kzm9g-reference dts: Sort i2c0 children by unit address
ARM: shmobile: kzm9g-reference dts: Add ak8975 magnetometer node
ARM: shmobile: kzm9g-reference dts: Add adxl345 accelerometer node
ARM: shmobile: kzm9g-reference dts: Add r2025sd rtc node
ARM: shmobile: sh73a0 dtsi: Add missing INTCA0 clock for irqpin module
ARM: shmobile: kzm9g dts: Declare the full 512 MiB of RAM
ARM: shmobile: kzm9g-reference dts: Declare the full 512 MiB of RAM
ARM: shmobile: ape6evm dts: Fix polarity of LEDs
ARM: shmobile: ape6evm dts: Enable pull-up for GPIO switches
ARM: shmobile: ape6evm dts: Configure the custom switch as wake-up source
Georgi Djakov (1):
dt-bindings: Add #defines for MSM8916 clocks and resets
Gregory CLEMENT (4):
ARM: mvebu: Use macros for interrupt flags on Armada 38x sdhci node
ARM: mvebu: Update the SDHCI node on Armada 38x
ARM: mvebu: Add Device Tree description of SDHCI for Armada 388 RD
ARM: mvebu: Conform L2CC node with ePAPR specification by adding cache-level
H. Nikolaus Schaller (3):
ARM: dts: omap3-pandora: add common device tree
ARM: dts: omap3-pandora: add OMAP3530 600 MHz version
ARM: dts: omap3-pandora: add DM3730 1 GHz version
Heiko Stuebner (4):
ARM: dts: rockchip: enable usbphy on rk3288-firefly
ARM: dts: rockchip: enable gmac on rk3288-firefly
ARM: dts: rockchip: add input supplies for the act8846 on Radxa Rock
ARM: dts: rockchip: complete rk3288-evb pmic supplies
Hongzhou Yang (1):
ARM: dts: mt8135: Add pinctrl/GPIO/EINT node for mt8135.
Imre Kaloz (1):
ARM: mvebu: add Linksys WRT1900AC (Mamba) support
Ivan T. Ivanov (3):
arm: dts: qcom: Add SPMI PMIC Arbiter nodes for APQ8084 and MSM8974
arm: dts: qcom: Add 8x74 chipset SPMI PMIC's nodes
arm: dts: qcom: Add APQ8084 chipset SPMI PMIC's nodes
Javier Martinez Canillas (7):
ARM: dts: Enable wifi power-on for exynos5250-snow
ARM: dts: Add cap-sdio-irq to wifi mmc node for exynos5250-snow
ARM: dts: Mux XMMCnDATA[0] pad correctly for Exynos5420 boards
ARM: dts: Add WiFi module support for Peach boards
ARM: dts: Define stdout-path property for Peach boards
ARM: dts: Define stdout-path property for exynos5250-snow
ARM: dts: Define stdout-path property for exynos5250-spring
Jonathan Richardson (1):
ARM: dts: Enable Broadcom Cygnus BCM958305K
Josh Wu (7):
ARM: at91: at91sam9x5/dts: add ISI dt support, include isi node, pinctrls
ARM: at91: at91sam9x5ek/dts: add ov2640 support
ARM: at91: at91sam9g25ek/dts: enable ISI and ov2640
ARM: at91/dt: sama5d4ek: add leds in DT node
ARM: at91/dt: sama5d4: add #{address, size}_cells properties for macb0
ARM: at91/dt: sama5d4: add dts for sama5d4 xplained board
ARM: at91/dt: sama5d4: add ISI dt support
Kazuya Mizuguchi (2):
ARM: shmobile: r8a7790: Fix HSUSB clock to hp_clk from mp_clk
ARM: shmobile: r8a7791: Fix HSUSB clock to hp_clk from mp_clk
Kenneth Westfield (1):
arm: dts: qcom: Add LPASS Audio HW to IPQ8064 device tree
Kumar Gala (2):
arm: qcom: dts: gic: add compatible string for Qualcomm MSM GICs
arm: dts: qcom: Add LCC nodes
Kuninori Morimoto (8):
ARM: shmobile: r8a7790: tidyup SDHI register size on DTSI
ARM: shmobile: r8a7791: tidyup SDHI register size on DTSI
ARM: shmobile: r8a7790: add reg-names for sound
ARM: shmobile: r8a7791: add reg-names for sound
ARM: shmobile: r8a7790: enable Audio DMAC peri peri via sound driver
ARM: shmobile: r8a7791: enable Audio DMAC peri peri via sound driver
ARM: shmobile: r8a7790: sound enables Audio DMAC entry on DTSI
ARM: shmobile: r8a7791: sound enables Audio DMAC entry on DTSI
Laurent Pinchart (16):
ARM: shmobile: sh73a0 dtsi: Set control-parent for all irqpin nodes
ARM: shmobile: kzm9g-reference dts: Add st1232 touchscreen node
ARM: shmobile: r8a7794: Add DMAC devices to DT
ARM: shmobile: r8a7790: Add IPMMU DT nodes
ARM: shmobile: r8a7791: Add IPMMU DT nodes
ARM: shmobile: r8a7794: Add IPMMU DT nodes
ARM: shmobile: r8a7794: Add ethernet controller to device tree
ARM: shmobile: r8a7794: alt: Enable ethernet controller
ARM: shmobile: koelsch: Add DU HDMI output support
ARM: shmobile: r8a7790: Reference DMA channels in SDHI DT nodes
ARM: shmobile: r8a7791: Reference DMA channels in SDHI DT nodes
ARM: shmobile: lager: Add DU HDMI output support
ARM: shmobile: marzen: Add DU external pixel clock to DT
ARM: shmobile: koelsch: Add DU external pixel clocks to DT
ARM: shmobile: lager: Add DU external pixel clocks to DT
ARM: shmobile: r8a7794: alt: Fix ethernet controller PHY IRQ line
Leilei Zhao (1):
ARM: at91/dt: sama5d4: add aes, sha and tdes nodes
Lina Iyer (8):
devicetree: bindings: Update qcom,saw2 node bindings
devicetree: bindings: Document qcom,idle-states
ARM: dts: qcom: Add power-controller device node for 8074 Krait CPUs
ARM: dts: qcom: Add power-controller device node for 8084 Krait CPUs
ARM: dts: qcom: Update power-controller device node for 8064 Krait CPUs
ARM: dts: qcom: Add idle states device nodes for 8974/8074
ARM: dts: qcom: Add idle states device nodes for 8084
ARM: dts: qcom: Add idle state device nodes for 8064
Lucas Stach (1):
ARM: tegra: Use generated pinmux for Beaver board
Luciano Coelho (2):
wlcore: set irq_trigger in board files instead of hiding behind a quirk
wl12xx: use frequency instead of enumerations for pdata clocks
Marek Belisko (2):
ARM: dts: omap3: Remove all references to ti,codec property
Documentation: omap-twl4030: Move ti,codec property to optional
Marek Szyprowski (2):
ARM: dts: add eMMC reset line for exynos4412-odroid-common
ARM: dts: add eMMC reset line for exynos5422-odroidxu3
Mark Jackson (1):
ARM: dts: Update Nanobone dts file
Matt Porter (1):
Documentation: DT: omap_serial: document missing properties and add an example
Matthias Brugger (1):
ARM: DTS: Add watchdog to mt6589
Maxime Ripard (4):
ARM: mvebu: Fix MPIC unit address
ARM: mvebu: a385-db-ap: Enable the NAND
ARM: mvebu: Enable Performance Monitor Unit on Armada XP/370 SoCs
ARM: mvebu: armada-385-ap: Enable USB3 port
Mikko Perttunen (2):
ARM: tegra: Add EMC to Tegra124 device tree
ARM: tegra: Add EMC timings to Jetson TK1 device tree
Nadav Haklai (1):
ARM: mvebu: clk: remove cpuclk resources overlapping coredivclk registers on Armada XP
Nicolas Ferre (10):
Merge tag 'at91-fixes' into at91-4.1-dt
ARM: at91/dt/trivial: correct file headers for SAMA5D3 SoC peripherals
ARM: at91/dt: gpio-keys: address-cells and size-cells properties are not needed
ARM: at91/dt: sama5d4 xplained: add i2c0
ARM: at91/dt: at91sam9x5cm: enable RTC
ARM: at91/dt: at91sam9n12ek: enable RTC
ARM: at91/dt: sama5d3: add uart0
ARM: at91/dt: sama5d3: add uart1 pinctrl definition
ARM: at91/dt: sama5d4: fix LCD pins for RGB666 format
ARM: at91/dt: sama5d4: add rgb777 LCD line configuration
Niklas Söderlund (2):
ARM: shmobile: emev2 dtsi: Add PFC information
ARM: shmobile: emev2-kzm9d dts: Add PFC information for uart1
Olof Johansson (13):
ARM: dts: fix typo in makefile for alpine-db
Merge tag 'v4.1-rockchip-dts1' of git://git.kernel.org/.../mmind/linux-rockchip into next/dt
Merge tag 'renesas-dt3-for-v4.1' of git://git.kernel.org/.../horms/renesas into next/dt
Merge tag 'v4.1-dt' of git://git.kernel.org/.../tmlind/linux-omap into next/dt
Merge tag 'mvebu-dt-4.1-2' of git://git.infradead.org/linux-mvebu into next/dt
Merge tag 'at91-dt2' of git://git.kernel.org/.../nferre/linux-at91 into next/dt
Merge tag 'arm-soc/for-4.1/devicetree-part-3' of http://github.com/broadcom/stblinux into next/dt
ARM: dts: fix typo in bcm7445.dtsi
Merge tag 'omap-for-v4.1/wl12xx-dt' of git://git.kernel.org/.../tmlind/linux-omap into next/dt
Merge tag 'tegra-for-4.1-dt' of git://git.kernel.org/.../tegra/linux into next/dt
Merge tag 'v4.0-next-dts' of https://github.com/mbgg/linux-mediatek into next/dt
Merge tag 'mvebu-dt-4.1-3' of git://git.infradead.org/linux-mvebu into next/dt
Merge tag 'samsung-dt' of git://git.kernel.org/.../kgene/linux-samsung into next/dt
Pali Rohár (4):
ARM: dts: n9/n950: Enable omap crypto support
ARM: dts: n900: Enable omap sham and include directly omap34xx.dtsi
ARM: dts: omap3-tao3530: Include directly omap34xx.dtsi
ARM: dts: Remove files omap34xx-hs.dtsi and omap36xx-hs.dtsi
Peter Ujfalusi (2):
ARM: dts: dra7xx-clocks: Add gate clock for CLKOUT2
ARM: dts: am57xx-beagle-x15: Do not include the atl header
Philip Attfield (1):
ARM: at91/dt: add i2c1 declaration to sama5d4
Rafał Miłecki (2):
ARM: BCM5301X: Add DT for Netgear R8000
ARM: BCM5301X: Fix default state of power LEDs on Netgear R6250
Ray Jui (4):
ARM: dts: enable IOMUX for Broadcom Cygnus
ARM: dts: enable GPIO for Broadcom Cygnus
ARM: dts: cygnus: enable GPIO based hook detection
ARM: dts: enable PCIe support for Cygnus
Roger Quadros (2):
ARM: dts: omap3-beagle: Add NAND device
ARM: dts: dra7x-evm: beagle-x15: Fix USB Peripheral
Rostislav Lisovy (3):
ARM: dts: Add vendor prefix for Grinn
ARM: dts: am335x: Add DTS for ChiliSOM module
ARM: dts: am335x: Add Chiliboard DTS
Ryo Kataoka (1):
ARM: shmobile: r8a7791: Fix IPMMU-GP clock to device tree
Sakari Ailus (3):
Documentation: DT: Add bindings for omap3isp
ARM: dts: omap3: Add DT entries for OMAP 3 ISP
ARM: dts: n950, n9: Add primary camera support
Sascha Hauer (1):
dt-bindings: ARM: Mediatek: document binding for the PMIC wrapper
Sebastian Hesselbarth (4):
ARM: dts: dove: Fix uart[23] reg property
ARM: dts: dove: Always include gpio and interrupt-controller headers
ARM: dts: dove: Add node labels for PCIe ports 0 and 1
ARM: dts: dove: Add some more common pinctrl settings
Sergei Shtylyov (8):
ARM: shmobile: r8a7790: add CAN clocks
ARM: shmobile: r8a7790: add CAN DT support
ARM: shmobile: r8a7791: add CAN clocks
ARM: shmobile: r8a7791: add CAN DT support
ARM: shmobile: henninger: add CAN0 DT support
ARM: shmobile: r8a7791: add ADSP clocks
ARM: shmobile: r8a7790: add ADSP clocks
ARM: shmobile: r8a7794: add SDHI DT support
Seungwon Jeon (1):
ARM: dts: Add HS400 support for exynos5420 and exynos5800
Simon Guinot (2):
ARM: Kirkwood: enable GPIO fan alarm support for 2Big Network v2
ARM: Kirkwood: add DT description for nas2big
Simon Horman (2):
ARM: shmobile: r8a7794: Correct SDHI clock base address, labels and output-names
ARM: shmobile: r8a7791: Correct SDHI clock labels and output-names
Stephen Warren (1):
ARM: tegra: Import latest Jetson TK1 pinmux
Suman Anna (1):
ARM: dts: DRA7: Remove ti,timer-dsp and ti,timer-pwm properties
Thomas Petazzoni (9):
ARM: mvebu: fix usb@ unit address on Armada 38x to match register address
ARM: mvebu: add missing UART labels on Armada 38x
ARM: mvebu: add UART labels to Armada 375
ARM: mvebu: remove aliases for Ethernet devices on Armada 370/375/38x/XP
ARM: mvebu: add serial port aliases on Armada 370/375/38x/XP
ARM: mvebu: use stdout-path in all armada-*.dts
ARM: mvebu: fix unit address of MPIC nodes
ARM: mvebu: add Device Tree files for Armada 39x SoC and board
ARM: mvebu: use 0xf1000000 as internal registers on Armada 370 DB
Tomeu Vizoso (13):
ARM: tegra: Change model of sound card in Nyan Big
ARM: tegra: Move generic parts out of the nyan-big DT
ARM: tegra: Add DTS for the nyan-blaze board
ARM: tegra: Add node for trackpad in Nyan boards
ARM: tegra: Use pwrseq-simple for the wifi in Nyan
ARM: tegra: Use generated pinmux data for Nyan Big
ARM: tegra: nyan: Set maximum frequency for SPI flash
ARM: tegra: nyan: Add gpio-restart node
ARM: tegra: nyan: The WiFi card is kept powered during suspend
of: Add binding for NVIDIA Tegra ACTMON node
ARM: tegra: Add Tegra124 ACTMON support
ARM: tegra: Add EMC timings to Nyan Big device tree
ARM: tegra: Add EMC timings to Nyan Blaze device tree
Tony Lindgren (3):
ARM: dts: Fix typo for dm816x usb0_pins
ARM: dts: Add cppi41 support for dm816x MUSB
ARM: dts: Remove PIN_INPUT for dm816x McSPI
Tsahee Zidenberg (2):
ARM: dts: Alpine platform devicetree
ARM: dts: alpine: add internal pci
Tushar Behera (1):
ARM: dts: Add mclk entry for Peach boards
Ulrich Hecht (2):
ARM: shmobile: r8a7740 dtsi: add remaining DIV6 clocks
ARM: shmobile: sh73a0 dtsi: Add selectable sources to DIV6 clocks
Vignesh R (1):
ARM: dts: AM4372: update hdq compatible property
Wenyou Yang (1):
ARM: at91/dt: at91-sama5d3_xplained: add gpio-key pinctrl property
Wolfram Sang (2):
ARM: shmobile: r8a7790: smp: remap whole apmu region
ARM: shmobile: r8a7791: smp: remap whole apmu region
Yunzhi Li (2):
ARM: dts: rockchip: add rk3288 usb PHY
ARM: dts: rockchip: Enable usb PHY on rk3288-evb board
.../bindings/arm/exynos/power_domain.txt | 3 +
Documentation/devicetree/bindings/arm/gic.txt | 2 +
.../bindings/arm/marvell,kirkwood.txt | 1 +
.../bindings/arm/msm/qcom,idle-state.txt | 84 +
.../devicetree/bindings/arm/msm/qcom,saw2.txt | 40 +-
.../devicetree/bindings/arm/rockchip.txt | 4 +
.../arm/tegra/nvidia,tegra30-actmon.txt | 32 +
.../devicetree/bindings/media/ti,omap3isp.txt | 71 +
.../devicetree/bindings/mfd/qcom,tcsr.txt | 22 +
.../bindings/net/wireless/ti,wlcore.txt | 47 +
.../devicetree/bindings/serial/omap_serial.txt | 20 +
.../devicetree/bindings/soc/mediatek/pwrap.txt | 58 +
.../devicetree/bindings/sound/omap-twl4030.txt | 3 +-
.../devicetree/bindings/vendor-prefixes.txt | 1 +
.../devicetree/bindings/video/atmel,lcdc.txt | 12 +-
MAINTAINERS | 1 +
arch/arm/boot/dts/Makefile | 21 +-
arch/arm/boot/dts/alpine-db.dts | 35 +
arch/arm/boot/dts/alpine.dtsi | 160 ++
arch/arm/boot/dts/am335x-chiliboard.dts | 112 +
arch/arm/boot/dts/am335x-chilisom.dtsi | 239 ++
arch/arm/boot/dts/am335x-evmsk.dts | 11 +
arch/arm/boot/dts/am335x-nano.dts | 18 +-
arch/arm/boot/dts/am4372.dtsi | 2 +-
arch/arm/boot/dts/am437x-idk-evm.dts | 22 +
arch/arm/boot/dts/am57xx-beagle-x15.dts | 9 +-
arch/arm/boot/dts/armada-370-db.dts | 13 +-
arch/arm/boot/dts/armada-370-mirabox.dts | 2 +-
arch/arm/boot/dts/armada-370-netgear-rn102.dts | 2 +-
arch/arm/boot/dts/armada-370-netgear-rn104.dts | 2 +-
arch/arm/boot/dts/armada-370-rd.dts | 2 +-
.../arm/boot/dts/armada-370-synology-ds213j.dts | 3 +-
arch/arm/boot/dts/armada-370-xp.dtsi | 11 +-
arch/arm/boot/dts/armada-370.dtsi | 3 +-
arch/arm/boot/dts/armada-375-db.dts | 2 +-
arch/arm/boot/dts/armada-375.dtsi | 15 +-
arch/arm/boot/dts/armada-385-db-ap.dts | 44 +-
arch/arm/boot/dts/armada-388-db.dts | 4 +-
arch/arm/boot/dts/armada-388-gp.dts | 5 +-
arch/arm/boot/dts/armada-388-rd.dts | 12 +-
arch/arm/boot/dts/armada-38x.dtsi | 23 +-
arch/arm/boot/dts/armada-390.dtsi | 57 +
arch/arm/boot/dts/armada-398-db.dts | 153 ++
arch/arm/boot/dts/armada-398.dtsi | 60 +
arch/arm/boot/dts/armada-39x.dtsi | 508 ++++
arch/arm/boot/dts/armada-xp-axpwifiap.dts | 2 +-
arch/arm/boot/dts/armada-xp-db.dts | 2 +-
arch/arm/boot/dts/armada-xp-gp.dts | 2 +-
arch/arm/boot/dts/armada-xp-lenovo-ix4-300d.dts | 3 +-
arch/arm/boot/dts/armada-xp-linksys-mamba.dts | 393 +++
arch/arm/boot/dts/armada-xp-matrix.dts | 2 +-
arch/arm/boot/dts/armada-xp-mv78260.dtsi | 1 -
arch/arm/boot/dts/armada-xp-mv78460.dtsi | 1 -
arch/arm/boot/dts/armada-xp-netgear-rn2120.dts | 2 +-
.../arm/boot/dts/armada-xp-openblocks-ax3-4.dts | 2 +-
arch/arm/boot/dts/armada-xp-synology-ds414.dts | 3 +-
arch/arm/boot/dts/armada-xp.dtsi | 8 +-
arch/arm/boot/dts/at91-sama5d3_xplained.dts | 8 +
arch/arm/boot/dts/at91-sama5d4_xplained.dts | 241 ++
arch/arm/boot/dts/at91-sama5d4ek.dts | 55 +-
arch/arm/boot/dts/at91sam9g25.dtsi | 1 +
arch/arm/boot/dts/at91sam9g25ek.dts | 18 +
arch/arm/boot/dts/at91sam9n12.dtsi | 9 +
arch/arm/boot/dts/at91sam9n12ek.dts | 18 +
arch/arm/boot/dts/at91sam9x5_isi.dtsi | 46 +
arch/arm/boot/dts/at91sam9x5cm.dtsi | 4 +
arch/arm/boot/dts/at91sam9x5ek.dtsi | 48 +
arch/arm/boot/dts/bcm-cygnus.dtsi | 78 +
arch/arm/boot/dts/bcm4708-netgear-r6250.dts | 4 +-
arch/arm/boot/dts/bcm4709-netgear-r8000.dts | 77 +
arch/arm/boot/dts/bcm7445.dtsi | 14 +-
arch/arm/boot/dts/bcm911360_entphn.dts | 13 +
arch/arm/boot/dts/bcm958300k.dts | 8 +
arch/arm/boot/dts/bcm958305k.dts | 53 +
arch/arm/boot/dts/dm8168-evm.dts | 14 +-
arch/arm/boot/dts/dm816x.dtsi | 60 +
arch/arm/boot/dts/dove.dtsi | 63 +-
arch/arm/boot/dts/dra7-evm.dts | 8 +
arch/arm/boot/dts/dra7.dtsi | 7 -
arch/arm/boot/dts/dra72-evm.dts | 8 +
arch/arm/boot/dts/dra7xx-clocks.dtsi | 8 +
arch/arm/boot/dts/emev2-kzm9d.dts | 13 +
arch/arm/boot/dts/emev2.dtsi | 10 +
arch/arm/boot/dts/exynos3250.dtsi | 4 +
arch/arm/boot/dts/exynos4412-odroid-common.dtsi | 14 +
arch/arm/boot/dts/exynos5250-snow.dts | 57 +-
arch/arm/boot/dts/exynos5250-spring.dts | 1 +
arch/arm/boot/dts/exynos5250.dtsi | 2 +-
arch/arm/boot/dts/exynos5420-arndale-octa.dts | 4 +-
arch/arm/boot/dts/exynos5420-peach-pit.dts | 99 +-
arch/arm/boot/dts/exynos5420-pinctrl.dtsi | 7 +
arch/arm/boot/dts/exynos5420-smdk5420.dts | 7 +-
arch/arm/boot/dts/exynos5420.dtsi | 10 +-
arch/arm/boot/dts/exynos5422-odroidxu3.dts | 21 +-
arch/arm/boot/dts/exynos5800-peach-pi.dts | 71 +-
arch/arm/boot/dts/kirkwood-nas2big.dts | 143 ++
arch/arm/boot/dts/kirkwood-net2big.dts | 5 +
arch/arm/boot/dts/meson.dtsi | 20 +
arch/arm/boot/dts/meson6-atv1200.dts | 4 +
arch/arm/boot/dts/meson8-minix-neo-x8.dts | 128 +
arch/arm/boot/dts/meson8.dtsi | 68 +
arch/arm/boot/dts/mt6589.dtsi | 5 +
arch/arm/boot/dts/nspire-classic.dtsi | 5 +
arch/arm/boot/dts/nspire-cx.dts | 4 +
arch/arm/boot/dts/nspire.dtsi | 21 +
arch/arm/boot/dts/omap3-beagle-xm.dts | 1 -
arch/arm/boot/dts/omap3-beagle.dts | 53 +-
arch/arm/boot/dts/omap3-cm-t3517.dts | 10 +
arch/arm/boot/dts/omap3-cm-t3730.dts | 10 +
arch/arm/boot/dts/omap3-cm-t3x30.dtsi | 1 -
arch/arm/boot/dts/omap3-devkit8000.dts | 1 -
arch/arm/boot/dts/omap3-evm-common.dtsi | 10 +
arch/arm/boot/dts/omap3-gta04.dtsi | 1 -
arch/arm/boot/dts/omap3-igep.dtsi | 1 -
arch/arm/boot/dts/omap3-igep0020-rev-f.dts | 9 +
arch/arm/boot/dts/omap3-igep0030-rev-g.dts | 9 +
arch/arm/boot/dts/omap3-lilly-a83x.dtsi | 1 -
arch/arm/boot/dts/omap3-n9.dts | 37 +
arch/arm/boot/dts/omap3-n900.dts | 16 +-
arch/arm/boot/dts/omap3-n950-n9.dtsi | 2 +-
arch/arm/boot/dts/omap3-n950.dts | 37 +
arch/arm/boot/dts/omap3-overo-base.dtsi | 1 -
arch/arm/boot/dts/omap3-pandora-1ghz.dts | 70 +
arch/arm/boot/dts/omap3-pandora-600mhz.dts | 65 +
arch/arm/boot/dts/omap3-pandora-common.dtsi | 640 +++++
arch/arm/boot/dts/omap3-tao3530.dtsi | 12 +-
arch/arm/boot/dts/omap3-zoom3.dts | 10 +
arch/arm/boot/dts/omap34xx-hs.dtsi | 16 -
arch/arm/boot/dts/omap34xx.dtsi | 17 +
arch/arm/boot/dts/omap36xx-hs.dtsi | 16 -
arch/arm/boot/dts/omap36xx.dtsi | 17 +
arch/arm/boot/dts/omap4-panda-common.dtsi | 10 +
arch/arm/boot/dts/omap4-sdp.dts | 11 +
arch/arm/boot/dts/omap4-var-som-om44-wlan.dtsi | 10 +
arch/arm/boot/dts/qcom-apq8064.dtsi | 51 +-
arch/arm/boot/dts/qcom-apq8074-dragonboard.dts | 2 +
arch/arm/boot/dts/qcom-apq8084-ifc6540.dts | 1 +
arch/arm/boot/dts/qcom-apq8084-mtp.dts | 1 +
arch/arm/boot/dts/qcom-apq8084.dtsi | 56 +-
arch/arm/boot/dts/qcom-ipq8064.dtsi | 38 +
arch/arm/boot/dts/qcom-msm8660.dtsi | 8 +
arch/arm/boot/dts/qcom-msm8960.dtsi | 15 +
.../dts/qcom-msm8974-sony-xperia-honami.dts | 2 +
arch/arm/boot/dts/qcom-msm8974.dtsi | 56 +-
arch/arm/boot/dts/qcom-pm8841.dtsi | 18 +
arch/arm/boot/dts/qcom-pm8941.dtsi | 18 +
arch/arm/boot/dts/qcom-pma8084.dtsi | 18 +
arch/arm/boot/dts/r8a73a4-ape6evm.dts | 22 +-
arch/arm/boot/dts/r8a7740.dtsi | 79 +-
arch/arm/boot/dts/r8a7779-marzen.dts | 9 +
arch/arm/boot/dts/r8a7790-lager.dts | 69 +
arch/arm/boot/dts/r8a7790.dtsi | 259 +-
arch/arm/boot/dts/r8a7791-henninger.dts | 11 +
arch/arm/boot/dts/r8a7791-koelsch.dts | 69 +-
arch/arm/boot/dts/r8a7791.dtsi | 278 +-
arch/arm/boot/dts/r8a7794-alt.dts | 13 +
arch/arm/boot/dts/r8a7794.dtsi | 157 +-
arch/arm/boot/dts/rk3188-radxarock.dts | 16 +
arch/arm/boot/dts/rk3288-evb-act8846.dts | 10 +
arch/arm/boot/dts/rk3288-evb-rk808.dts | 7 +
arch/arm/boot/dts/rk3288-evb.dtsi | 13 +
arch/arm/boot/dts/rk3288-firefly.dtsi | 20 +
arch/arm/boot/dts/rk3288-popmetal.dts | 447 ++++
arch/arm/boot/dts/rk3288.dtsi | 35 +
arch/arm/boot/dts/sama5d3.dtsi | 34 +
arch/arm/boot/dts/sama5d35ek.dts | 2 -
arch/arm/boot/dts/sama5d3_can.dtsi | 2 +-
arch/arm/boot/dts/sama5d3_emac.dtsi | 2 +-
arch/arm/boot/dts/sama5d3_gmac.dtsi | 2 +-
arch/arm/boot/dts/sama5d3_lcd.dtsi | 207 +-
arch/arm/boot/dts/sama5d3_mci2.dtsi | 2 +-
arch/arm/boot/dts/sama5d3_tcb1.dtsi | 2 +-
arch/arm/boot/dts/sama5d3_uart.dtsi | 2 +-
arch/arm/boot/dts/sama5d4.dtsi | 342 +++
arch/arm/boot/dts/sh73a0-kzm9g-reference.dts | 42 +-
arch/arm/boot/dts/sh73a0-kzm9g.dts | 2 +-
arch/arm/boot/dts/sh73a0.dtsi | 82 +-
arch/arm/boot/dts/tegra124-jetson-tk1-emc.dtsi | 2421 ++++++++++++++++++
arch/arm/boot/dts/tegra124-jetson-tk1.dts | 559 ++--
arch/arm/boot/dts/tegra124-nyan-big-emc.dtsi | 2023 +++++++++++++++
arch/arm/boot/dts/tegra124-nyan-big.dts | 2121 ++++++++-------
arch/arm/boot/dts/tegra124-nyan-blaze-emc.dtsi | 2049 +++++++++++++++
arch/arm/boot/dts/tegra124-nyan-blaze.dts | 1334 ++++++++++
arch/arm/boot/dts/tegra124-nyan.dtsi | 695 +++++
arch/arm/boot/dts/tegra124.dtsi | 19 +
arch/arm/boot/dts/tegra30-beaver.dts | 1653 +++++++++++-
arch/arm/mach-davinci/Kconfig | 11 -
arch/arm/mach-davinci/board-da850-evm.c | 112 -
arch/arm/mach-omap2/pdata-quirks.c | 74 -
arch/arm/mach-shmobile/smp-r8a7790.c | 4 +-
arch/arm/mach-shmobile/smp-r8a7791.c | 2 +-
drivers/net/wireless/ti/wilink_platform_data.c | 25 -
drivers/net/wireless/ti/wl12xx/main.c | 63 +-
drivers/net/wireless/ti/wl12xx/wl12xx.h | 28 +
drivers/net/wireless/ti/wlcore/boot.c | 1 -
drivers/net/wireless/ti/wlcore/debugfs.c | 2 +-
drivers/net/wireless/ti/wlcore/main.c | 31 +-
drivers/net/wireless/ti/wlcore/sdio.c | 63 +-
drivers/net/wireless/ti/wlcore/spi.c | 6 +-
drivers/net/wireless/ti/wlcore/wlcore.h | 5 +-
drivers/net/wireless/ti/wlcore/wlcore_i.h | 6 +-
include/dt-bindings/clock/r8a7790-clock.h | 3 +
include/dt-bindings/clock/r8a7791-clock.h | 3 +
include/dt-bindings/clock/sh73a0-clock.h | 3 +
include/dt-bindings/media/omap3-isp.h | 22 +
include/linux/wl12xx.h | 49 -
206 files changed, 19014 insertions(+), 1946 deletions(-)
create mode 100644 Documentation/devicetree/bindings/arm/msm/qcom,idle-state.txt
create mode 100644 Documentation/devicetree/bindings/arm/tegra/nvidia,tegra30-actmon.txt
create mode 100644 Documentation/devicetree/bindings/media/ti,omap3isp.txt
create mode 100644 Documentation/devicetree/bindings/mfd/qcom,tcsr.txt
create mode 100644 Documentation/devicetree/bindings/net/wireless/ti,wlcore.txt
create mode 100644 Documentation/devicetree/bindings/soc/mediatek/pwrap.txt
create mode 100644 arch/arm/boot/dts/alpine-db.dts
create mode 100644 arch/arm/boot/dts/alpine.dtsi
create mode 100644 arch/arm/boot/dts/am335x-chiliboard.dts
create mode 100644 arch/arm/boot/dts/am335x-chilisom.dtsi
create mode 100644 arch/arm/boot/dts/armada-390.dtsi
create mode 100644 arch/arm/boot/dts/armada-398-db.dts
create mode 100644 arch/arm/boot/dts/armada-398.dtsi
create mode 100644 arch/arm/boot/dts/armada-39x.dtsi
create mode 100644 arch/arm/boot/dts/armada-xp-linksys-mamba.dts
create mode 100644 arch/arm/boot/dts/at91-sama5d4_xplained.dts
create mode 100644 arch/arm/boot/dts/bcm4709-netgear-r8000.dts
create mode 100644 arch/arm/boot/dts/bcm958305k.dts
create mode 100644 arch/arm/boot/dts/kirkwood-nas2big.dts
create mode 100644 arch/arm/boot/dts/meson8-minix-neo-x8.dts
create mode 100644 arch/arm/boot/dts/omap3-pandora-1ghz.dts
create mode 100644 arch/arm/boot/dts/omap3-pandora-600mhz.dts
create mode 100644 arch/arm/boot/dts/omap3-pandora-common.dtsi
delete mode 100644 arch/arm/boot/dts/omap34xx-hs.dtsi
delete mode 100644 arch/arm/boot/dts/omap36xx-hs.dtsi
create mode 100644 arch/arm/boot/dts/qcom-pm8841.dtsi
create mode 100644 arch/arm/boot/dts/qcom-pm8941.dtsi
create mode 100644 arch/arm/boot/dts/qcom-pma8084.dtsi
create mode 100644 arch/arm/boot/dts/rk3288-popmetal.dts
create mode 100644 arch/arm/boot/dts/tegra124-jetson-tk1-emc.dtsi
create mode 100644 arch/arm/boot/dts/tegra124-nyan-big-emc.dtsi
create mode 100644 arch/arm/boot/dts/tegra124-nyan-blaze-emc.dtsi
create mode 100644 arch/arm/boot/dts/tegra124-nyan-blaze.dts
create mode 100644 arch/arm/boot/dts/tegra124-nyan.dtsi
create mode 100644 include/dt-bindings/media/omap3-isp.h
^ permalink raw reply [flat|nested] 10+ messages in thread
* [GIT PULL 5/9] ARM: SoC driver updates for v4.1
2015-04-22 6:11 [GIT PULL 0/9] ARM: SoC changes for v4.1 Olof Johansson
` (3 preceding siblings ...)
2015-04-22 6:11 ` [GIT PULL 4/9] ARM: DT " Olof Johansson
@ 2015-04-22 6:11 ` Olof Johansson
2015-04-22 6:11 ` [GIT PULL 6/9] ARM: SoC multiplatform code changes " Olof Johansson
` (3 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: Olof Johansson @ 2015-04-22 6:11 UTC (permalink / raw)
To: torvalds; +Cc: arm, linux-arm-kernel, linux-kernel, Olof Johansson
Driver updates for v4.1. Some of these are for drivers/soc, where we find more
and more SoC-specific drivers these days. Some are for other driver subsystems
where we have received acks from the appropriate maintainers.
The larger parts of this branch are:
- MediaTek support for their PMIC wrapper interface, a high-level interface
for talking to the system PMIC over a dedicated I2C interface.
- Qualcomm SCM driver has been moved to drivers/firmware. It's used for CPU
up/down and needs to be in a shared location for arm/arm64 common code.
- Cleanup of ARM-CCI PMU code.
- Anoter set of cleanusp to the OMAP GPMC code.
Conflicts:
MAINTAINERS:
Add/add, keep both sides.
drivers/bus/Makefile:
Add vs whitespace/sort fixup. Keep superset, realign indentation and sort.
----------------------------------------------------------------
The following changes since commit 64ad494ec5d7fa1639a884e91e326648015d4bd0:
Merge tag 'armsoc-dt' into testmerge
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git tags/armsoc-drivers
for you to fetch changes up to 7415d97ee2b809119270fc3a365968ff8d4f544b:
Merge tag 'at91-clocksource-driver2' of git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91 into next/drivers
----------------------------------------------------------------
Alexandre Belloni (11):
ARM: at91/dt: declare atmel,at91rm9200-st as a syscon
mfd: syscon: Add atmel system timer registers definition
watchdog: at91rm9200: use the system timer syscon
watchdog: at91rm9200: implement restart handler
ARM: at91: at91rm9200: remove deprecated arm_pm_restart
ARM: at91: properly initialize timer
ARM: at91: time: move the system timer driver to drivers/clocksource
clocksource: atmel-st: use syscon/regmap
clocksource: atmel-st: remove mach/hardware dependency
ARM: at91: remove useless include
clocksource: atmel-st: select MFD_SYSCON
Andy Gross (1):
soc: qcom: gsbi: Add support for ADM CRCI muxing
Arnd Bergmann (3):
Merge tag 'renesas-simple-pm-bus-for-v4.1' of git://git.kernel.org/.../horms/renesas into next/drivers
Merge tag 'v4.0-next-soc-fix' of https://github.com/mbgg/linux-mediatek into next/drivers
Merge tag 'at91-clocksource-driver2' of git://git.kernel.org/.../nferre/linux-at91 into next/drivers
Flora Fu (1):
soc: mediatek: Add PMIC wrapper for MT8135 and MT8173 SoCs
Geert Uytterhoeven (5):
drivers: bus: Sort Kconfig entries alphabetically
drivers: bus: Sort Makefile entries alphabetically
drivers: bus: Add Simple Power-Managed Bus DT Bindings
drivers: bus: Add Renesas Bus State Controller (BSC) DT Bindings
drivers: bus: Add Simple Power-Managed Bus Driver
Kumar Gala (4):
ARM: qcom: Merge scm and scm boot code together
ARM: qcom: Cleanup scm interface to only export what is needed
ARM: qcom: Prep scm code for move to drivers/firmware
firmware: qcom: scm: Move the scm driver to drivers/firmware
Lina Iyer (3):
firmware: qcom: scm: Clean cold boot entry to export only the API
firmware: qcom: scm: Add qcom_scm_set_warm_boot_addr function
firmware: qcom: scm: Support cpu power down through SCM
Matthias Brugger (1):
ARM: mediatek: enable the pin controller
Olof Johansson (5):
Merge tag 'qcom-soc-for-4.1' of git://git.kernel.org/.../galak/linux-qcom into next/drivers
Merge tag 'at91-cleanup3' of git://git.kernel.org/.../nferre/linux-at91 into next/drivers
Merge tag 'gpmc-omap-for-v4.1' of git://github.com/rogerq/linux into next/drivers
Merge tag 'arm-perf-4.1' of git://git.kernel.org/.../will/linux into next/drivers
Merge tag 'v4.0-next-soc' of https://github.com/mbgg/linux-mediatek into next/drivers
Robert ABEL (8):
ARM OMAP2+ GPMC: don't undef DEBUG
ARM OMAP2+ GPMC: add bus children
ARM OMAP2+ GPMC: fix debug output alignment
ARM OMAP2+ GPMC: change get_gpmc_timing_reg output for DTS
ARM OMAP2+ GPMC: always program GPMCFCLKDIVIDER
ARM OMAP2+ GPMC: calculate GPMCFCLKDIVIDER based on WAITMONITORINGTIME
ARM OMAP2+ GPMC: fix WAITMONITORINGTIME divider bug
ARM OMAP2+ GPMC: fix programming/showing reserved timing parameters
Semen Protsenko (2):
ARM: OMAP2+: gpmc: Fix writing in gpmc_cs_set_memconf
ARM: OMAP2+: gpmc: make gpmc_cs_get_name() static
Suzuki K. Poulose (6):
drivers: cci: reject groups spanning multiple HW PMUs
arm-cci: Rearrange code for splitting PMU vs driver code
arm-cci: Abstract the CCI400 PMU specific definitions
arm-cci: Get rid of secure transactions for PMU driver
arm-cci: Split the code for PMU vs driver support
arm-cci: Fix CCI PMU event validation
Thierry Reding (1):
soc/mediatek: Remove unused variables
.../devicetree/bindings/arm/atmel-at91.txt | 4 +-
Documentation/devicetree/bindings/arm/cci.txt | 7 +-
.../devicetree/bindings/bus/renesas,bsc.txt | 46 +
.../devicetree/bindings/bus/simple-pm-bus.txt | 44 +
.../devicetree/bindings/soc/qcom/qcom,gsbi.txt | 30 +-
MAINTAINERS | 1 +
arch/arm/Kconfig | 2 +
arch/arm/boot/dts/at91rm9200.dtsi | 6 +-
arch/arm/include/asm/arm-cci.h | 42 +
arch/arm/mach-at91/Kconfig | 1 +
arch/arm/mach-at91/Makefile | 2 +-
arch/arm/mach-at91/at91rm9200.c | 19 -
arch/arm/mach-at91/generic.h | 3 -
arch/arm/mach-at91/include/mach/at91_st.h | 61 --
arch/arm/mach-exynos/Kconfig | 2 +-
arch/arm/mach-mediatek/Kconfig | 1 +
arch/arm/mach-omap2/gpmc-nand.c | 18 +-
arch/arm/mach-omap2/gpmc-onenand.c | 4 +-
arch/arm/mach-omap2/usb-tusb6010.c | 4 +-
arch/arm/mach-qcom/Kconfig | 3 -
arch/arm/mach-qcom/Makefile | 3 -
arch/arm/mach-qcom/platsmp.c | 23 +-
arch/arm/mach-qcom/scm-boot.c | 39 -
arch/arm/mach-qcom/scm-boot.h | 26 -
arch/arm/mach-qcom/scm.c | 326 -------
arch/arm/mach-qcom/scm.h | 25 -
arch/arm/mach-vexpress/Kconfig | 4 +-
arch/arm64/include/asm/arm-cci.h | 27 +
drivers/bus/Kconfig | 73 +-
drivers/bus/Makefile | 16 +-
drivers/bus/arm-cci.c | 517 +++++-----
drivers/bus/simple-pm-bus.c | 58 ++
drivers/clocksource/Kconfig | 5 +
drivers/clocksource/Makefile | 1 +
.../clocksource/timer-atmel-st.c | 117 +--
drivers/firmware/Kconfig | 4 +
drivers/firmware/Makefile | 2 +
drivers/firmware/qcom_scm.c | 494 ++++++++++
drivers/memory/omap-gpmc.c | 358 +++++--
drivers/soc/Kconfig | 1 +
drivers/soc/Makefile | 1 +
drivers/soc/mediatek/Kconfig | 11 +
drivers/soc/mediatek/Makefile | 1 +
drivers/soc/mediatek/mtk-pmic-wrap.c | 975 +++++++++++++++++++
drivers/soc/qcom/Kconfig | 1 +
drivers/soc/qcom/qcom_gsbi.c | 152 +++
drivers/watchdog/Kconfig | 2 +-
drivers/watchdog/at91rm9200_wdt.c | 61 +-
include/linux/arm-cci.h | 9 +-
include/linux/mfd/syscon/atmel-st.h | 49 +
include/linux/omap-gpmc.h | 3 +-
include/linux/qcom_scm.h | 28 +
52 files changed, 2753 insertions(+), 959 deletions(-)
create mode 100644 Documentation/devicetree/bindings/bus/renesas,bsc.txt
create mode 100644 Documentation/devicetree/bindings/bus/simple-pm-bus.txt
create mode 100644 arch/arm/include/asm/arm-cci.h
delete mode 100644 arch/arm/mach-at91/include/mach/at91_st.h
delete mode 100644 arch/arm/mach-qcom/scm-boot.c
delete mode 100644 arch/arm/mach-qcom/scm-boot.h
delete mode 100644 arch/arm/mach-qcom/scm.c
delete mode 100644 arch/arm/mach-qcom/scm.h
create mode 100644 arch/arm64/include/asm/arm-cci.h
create mode 100644 drivers/bus/simple-pm-bus.c
rename arch/arm/mach-at91/at91rm9200_time.c => drivers/clocksource/timer-atmel-st.c (73%)
create mode 100644 drivers/firmware/qcom_scm.c
create mode 100644 drivers/soc/mediatek/Kconfig
create mode 100644 drivers/soc/mediatek/Makefile
create mode 100644 drivers/soc/mediatek/mtk-pmic-wrap.c
create mode 100644 include/linux/mfd/syscon/atmel-st.h
create mode 100644 include/linux/qcom_scm.h
^ permalink raw reply [flat|nested] 10+ messages in thread
* [GIT PULL 6/9] ARM: SoC multiplatform code changes for v4.1
2015-04-22 6:11 [GIT PULL 0/9] ARM: SoC changes for v4.1 Olof Johansson
` (4 preceding siblings ...)
2015-04-22 6:11 ` [GIT PULL 5/9] ARM: SoC driver " Olof Johansson
@ 2015-04-22 6:11 ` Olof Johansson
2015-04-22 6:11 ` [GIT PULL 7/9] ARM: SoC defconfig updates " Olof Johansson
` (2 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: Olof Johansson @ 2015-04-22 6:11 UTC (permalink / raw)
To: torvalds; +Cc: arm, linux-arm-kernel, linux-kernel, Olof Johansson
The changes here belong to two main platforms:
- Atmel At91 is flipping the bit and going multiplatform. This includes some
cleanups and removal of code, and the final flip of config dependencies
- Shmobile has several platforms that are going multiplatform, but this
branch also contains a bunch of cleanups that they weren't able to keep
separate in a good way. THere's also a removal of one of their SoCs and the
corresponding boards (sh7372 and mackerel).
Conflicts:
arch/arm/mach-shmobile/pm-sh7372.c:
Had a fix in 4.0, removed here. Remove the file.
----------------------------------------------------------------
The following changes since commit 736e98059cd3d0069042edfe594834ce48273072:
Merge tag 'armsoc-drivers' into testmerge
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git tags/armsoc-multiplatform
for you to fetch changes up to 89522f0f8bd5056dec21bb7de073cbd5886e435c:
Merge tag 'at91-cleanup4_bis' of git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91 into next/multiplatform
----------------------------------------------------------------
Alexandre Belloni (10):
ARM: at91: switch to multiplatform
ARM: at91: switch at91_dt_defconfig to multiplatform
ARM: at91: remove unused headers
ARM: at91: remove useless mach/cpu.h
ARM: at91: remove SoC headers
ARM: at91: remove hardware.h
ARM: at91: drop AT91_TIMER_HZ
ARM: at91: fix pm_suspend.S compilation when ARMv6 is selected
ARM: at91/pm: move the standby functions to pm.c
ARM: at91/pm: move AT91_MEMCTRL_* to pm.h
Arnd Bergmann (4):
Merge tag 'renesas-soc-cleanup-for-v4.1' of git://git.kernel.org/.../horms/renesas into next/multiplatform
Merge tag 'renesas-sh7372-soc-removal-for-v4.1' of git://git.kernel.org/.../horms/renesas into next/multiplatform
Merge tag 'renesas-r8a7778-ccf-and-multiplatform-for-v4.1' of git://git.kernel.org/.../horms/renesas into next/multiplatform
Merge tag 'at91-cleanup4_bis' of git://git.kernel.org/.../nferre/linux-at91 into next/multiplatform
Geert Uytterhoeven (12):
ARM: shmobile: r8a73a4 dtsi: Add Bus State Controller node
ARM: shmobile: ape6evm dts: Move Ethernet node to BSC
ARM: shmobile: r8a73a4: Move pfc node to work around probe ordering bug
ARM: shmobile: ape6evm dts: Drop console= bootargs parameter
PM / Domains: R-Mobile SYSC: Document R-Mobile APE6 (r8a73a4) binding
ARM: shmobile: sh73a0 dtsi: Add Bus State Controller node
ARM: shmobile: kzm9g dts: Move Ethernet node to BSC
ARM: shmobile: sh73a0 dtsi: Add Cortex-A9 TWD node
ARM: shmobile: sh73a0: Remove unused sh73a0_add_standard_devices_dt()
ARM: shmobile: sh73a0 dtsi: Add PM domain support
ARM: shmobile: sh73a0: Remove restart callback
ARM: shmobile: r8a73a4 dtsi: Add PM domain support
Laurent Pinchart (1):
ARM: shmobile: r8a73a4: Remove legacy code
Magnus Damm (19):
ARM: shmobile: mackerel: Remove ZBOOT code
ARM: shmobile: mackerel: Remove Legacy C board code
ARM: shmobile: mackerel dts: Remove Legacy DTS file
ARM: shmobile: mackerel: Remove DT binding documentation
ARM: shmobile: mackerel: Remove mach-type entry
ARM: shmobile: mackerel: Remove defconfig
ARM: shmobile: mackerel: Remove from MAINTAINERS
ARM: shmobile: sh7372: Remove ZBOOT MMC/SDHI support
ARM: shmobile: sh7372: Remove Legacy C SoC code
ARM: shmobile: sh7372: Remove DT binding documentation
ARM: shmobile: sh7372 dtsi: Remove Legacy DTSI file
Documentation: Remove ZBOOT MMC/SDHI utility and docs
ARM: shmobile: Remove mach/system.h
ARM: shmobile: Remove mach/clkdev.h
ARM: shmobile: Remove mach/uncompress.h
ARM: shmobile: sh73a0: Introduce generic setup callback
ARM: shmobile: sh73a0: Add Multiplatform support
ARM: shmobile: kzm9g dts: Sync with kzm9g-reference dts
ARM: shmobile: kzm9g: Build DTS for Multiplatform
Nicolas Ferre (7):
Merge tag 'at91-fixes' into at91-4.1-multiplatform
Merge tag 'at91-fixes2' into at91-4.1-multiplatform
Merge tag 'at91-fixes3' into at91-4.1-multiplatform
Merge tag 'at91-cleanup' into at91-4.1-multiplatform
Merge tag 'at91-cleanup2' into at91-4.1-multiplatform
Merge tag 'at91-cleanup3' into at91-4.1-multiplatform
ARM: at91: add a Kconfig dependency on multi-platform
Olof Johansson (3):
Merge tag 'renesas-r8a73a4-ccf-and-multiplatform-for-v4.1' of git://git.kernel.org/.../horms/renesas into next/multiplatform
Merge tag 'renesas-sh73a0-multiplatform-for-v4.1' of git://git.kernel.org/.../horms/renesas into next/multiplatform
Merge tag 'at91-multiplatform' of git://git.kernel.org/.../nferre/linux-at91 into next/multiplatform
Simon Horman (3):
ARM: shmobile: r8a73a4: ape6evm: Remove legacy platform
Merge branch 'heads/dt-for-v4.1' into sh73a0-multiplatform-for-v4.1.base
ARM: shmobile: kzm9g-reference: Remove board C code and DT file
Stephen Boyd (1):
ARM: shmobile: r8a7779: Remove redundant cpu_disable implementation
Ulrich Hecht (21):
ARM: shmobile: r8a73a4: Add CPG register bits header
ARM: shmobile: r8a73a4: Common clock framework DT description
ARM: shmobile: ape6evm: Disable legacy clock initialization
ARM: shmobile: r8a73a4: Add MSTP clock assignments to DT
ARM: shmobile: ape6evm-reference: Remove board C code and DT file
ARM: shmobile: r8a7778: synchronize dts with reference platform
ARM: shmobile: r8a7778: add CPG register bits header
ARM: shmobile: r8a7778: Common clock framework DT description
ARM: shmobile: r8a7778: implement SoC and board CCF support
ARM: shmobile: r8a7778: add MSTP clock assignments to DT
ARM: shmobile: r8a7778: add internal ethernet controller to DT
ARM: shmobile: bockw: add USB, VIN pin descriptions to DT
ARM: shmobile: r8a7778 dtsi: Add Bus State Controller node
ARM: shmobile: bockw dts: Move Ethernet node to BSC
ARM: shmobile: bockw dts: set extal clock frequency
ARM: shmobile: r8a7778: common clock framework CPG driver
DT: i2c: add trivial binding for OKI ML86V7667 video decoder
ARM: shmobile: bockw: add devices hooked up to i2c0 to DT
ARM: shmobile: r8a7778: add sound to DT
ARM: shmobile: bockw: add sound to DT
ARM: shmobile: r8a7778: enable multiplatform target
Documentation/Makefile | 2 +-
Documentation/arm/Makefile | 1 -
Documentation/arm/SH-Mobile/Makefile | 7 -
Documentation/arm/SH-Mobile/vrl4.c | 170 --
Documentation/arm/SH-Mobile/zboot-rom-mmcif.txt | 29 -
Documentation/arm/SH-Mobile/zboot-rom-sdhi.txt | 42 -
.../devicetree/bindings/arm/shmobile.txt | 8 -
.../clock/renesas,r8a7778-cpg-clocks.txt | 25 +
.../devicetree/bindings/i2c/trivial-devices.txt | 1 +
.../bindings/power/renesas,sysc-rmobile.txt | 1 +
MAINTAINERS | 2 -
arch/arm/Kconfig | 45 +-
arch/arm/Kconfig.debug | 10 +-
arch/arm/boot/compressed/Makefile | 15 -
arch/arm/boot/compressed/head-shmobile.S | 30 -
arch/arm/boot/compressed/mmcif-sh7372.c | 88 -
arch/arm/boot/compressed/sdhi-sh7372.c | 95 --
arch/arm/boot/compressed/sdhi-shmobile.c | 449 ------
arch/arm/boot/compressed/sdhi-shmobile.h | 11 -
arch/arm/boot/dts/Makefile | 10 +-
arch/arm/boot/dts/r8a73a4-ape6evm-reference.dts | 156 --
arch/arm/boot/dts/r8a73a4-ape6evm.dts | 37 +-
arch/arm/boot/dts/r8a73a4.dtsi | 557 ++++++-
arch/arm/boot/dts/r8a7778-bockw.dts | 174 ++
arch/arm/boot/dts/r8a7778.dtsi | 293 ++++
arch/arm/boot/dts/sh7372-mackerel.dts | 26 -
arch/arm/boot/dts/sh7372.dtsi | 35 -
arch/arm/boot/dts/sh73a0-kzm9g-reference.dts | 398 -----
arch/arm/boot/dts/sh73a0-kzm9g.dts | 376 ++++-
arch/arm/boot/dts/sh73a0.dtsi | 163 +-
arch/arm/configs/ape6evm_defconfig | 109 --
arch/arm/configs/at91_dt_defconfig | 5 +-
arch/arm/configs/mackerel_defconfig | 157 --
arch/arm/mach-at91/Kconfig | 118 +-
arch/arm/mach-at91/Makefile | 5 +
arch/arm/mach-at91/include/mach/at91_dbgu.h | 63 -
arch/arm/mach-at91/include/mach/at91_ramc.h | 4 -
arch/arm/mach-at91/include/mach/at91rm9200.h | 103 --
arch/arm/mach-at91/include/mach/at91sam9260.h | 129 --
arch/arm/mach-at91/include/mach/at91sam9261.h | 99 --
arch/arm/mach-at91/include/mach/at91sam9263.h | 117 --
arch/arm/mach-at91/include/mach/at91sam9_smc.h | 2 -
arch/arm/mach-at91/include/mach/at91sam9g45.h | 143 --
arch/arm/mach-at91/include/mach/at91sam9n12.h | 65 -
arch/arm/mach-at91/include/mach/at91sam9rl.h | 105 --
arch/arm/mach-at91/include/mach/at91sam9x5.h | 71 -
arch/arm/mach-at91/include/mach/cpu.h | 216 ---
arch/arm/mach-at91/include/mach/hardware.h | 134 --
arch/arm/mach-at91/include/mach/sama5d3.h | 86 -
arch/arm/mach-at91/include/mach/sama5d4.h | 33 -
arch/arm/mach-at91/include/mach/uncompress.h | 218 ---
arch/arm/mach-at91/pm.c | 101 +-
arch/arm/mach-at91/pm.h | 96 +-
arch/arm/mach-at91/pm_suspend.S | 1 -
arch/arm/mach-at91/sama5.c | 2 -
arch/arm/mach-shmobile/Kconfig | 64 +-
arch/arm/mach-shmobile/Makefile | 14 +-
arch/arm/mach-shmobile/Makefile.boot | 4 -
.../arm/mach-shmobile/board-ape6evm-reference.c | 60 -
arch/arm/mach-shmobile/board-ape6evm.c | 306 ----
arch/arm/mach-shmobile/board-bockw-reference.c | 2 +
arch/arm/mach-shmobile/board-kzm9g-reference.c | 62 -
arch/arm/mach-shmobile/board-mackerel.c | 1522 ------------------
arch/arm/mach-shmobile/clock-r8a73a4.c | 659 --------
arch/arm/mach-shmobile/clock-sh7372.c | 620 -------
arch/arm/mach-shmobile/clock.c | 11 -
arch/arm/mach-shmobile/common.h | 1 -
arch/arm/mach-shmobile/entry-intc.S | 54 -
arch/arm/mach-shmobile/include/mach/clkdev.h | 7 -
.../include/mach/head-mackerel.txt | 93 --
.../mach-shmobile/include/mach/mmc-mackerel.h | 38 -
arch/arm/mach-shmobile/include/mach/mmc.h | 16 -
.../mach-shmobile/include/mach/sdhi-sh7372.h | 21 -
arch/arm/mach-shmobile/include/mach/sdhi.h | 16 -
arch/arm/mach-shmobile/include/mach/system.h | 11 -
.../arm/mach-shmobile/include/mach/uncompress.h | 19 -
arch/arm/mach-shmobile/include/mach/zboot.h | 5 +-
arch/arm/mach-shmobile/intc-sh7372.c | 672 --------
arch/arm/mach-shmobile/pm-sh7372.c | 549 -------
arch/arm/mach-shmobile/r8a73a4.h | 17 -
arch/arm/mach-shmobile/setup-r8a73a4.c | 273 +---
arch/arm/mach-shmobile/setup-r8a7778.c | 19 +
arch/arm/mach-shmobile/setup-sh7372.c | 1016 ------------
arch/arm/mach-shmobile/setup-sh73a0.c | 19 +-
arch/arm/mach-shmobile/sh7372.h | 84 -
arch/arm/mach-shmobile/sh73a0.h | 1 -
arch/arm/mach-shmobile/sleep-sh7372.S | 98 --
arch/arm/mach-shmobile/smp-r8a7779.c | 7 -
arch/arm/mach-shmobile/smp-sh73a0.c | 2 +-
arch/arm/tools/mach-types | 1 -
drivers/clk/shmobile/Makefile | 1 +
drivers/clk/shmobile/clk-r8a7778.c | 143 ++
include/dt-bindings/clock/r8a73a4-clock.h | 62 +
include/dt-bindings/clock/r8a7778-clock.h | 71 +
include/linux/clk/shmobile.h | 1 +
95 files changed, 2064 insertions(+), 10015 deletions(-)
delete mode 100644 Documentation/arm/Makefile
delete mode 100644 Documentation/arm/SH-Mobile/Makefile
delete mode 100644 Documentation/arm/SH-Mobile/vrl4.c
delete mode 100644 Documentation/arm/SH-Mobile/zboot-rom-mmcif.txt
delete mode 100644 Documentation/arm/SH-Mobile/zboot-rom-sdhi.txt
create mode 100644 Documentation/devicetree/bindings/clock/renesas,r8a7778-cpg-clocks.txt
delete mode 100644 arch/arm/boot/compressed/mmcif-sh7372.c
delete mode 100644 arch/arm/boot/compressed/sdhi-sh7372.c
delete mode 100644 arch/arm/boot/compressed/sdhi-shmobile.c
delete mode 100644 arch/arm/boot/compressed/sdhi-shmobile.h
delete mode 100644 arch/arm/boot/dts/r8a73a4-ape6evm-reference.dts
delete mode 100644 arch/arm/boot/dts/sh7372-mackerel.dts
delete mode 100644 arch/arm/boot/dts/sh7372.dtsi
delete mode 100644 arch/arm/boot/dts/sh73a0-kzm9g-reference.dts
delete mode 100644 arch/arm/configs/ape6evm_defconfig
delete mode 100644 arch/arm/configs/mackerel_defconfig
delete mode 100644 arch/arm/mach-at91/include/mach/at91_dbgu.h
delete mode 100644 arch/arm/mach-at91/include/mach/at91rm9200.h
delete mode 100644 arch/arm/mach-at91/include/mach/at91sam9260.h
delete mode 100644 arch/arm/mach-at91/include/mach/at91sam9261.h
delete mode 100644 arch/arm/mach-at91/include/mach/at91sam9263.h
delete mode 100644 arch/arm/mach-at91/include/mach/at91sam9g45.h
delete mode 100644 arch/arm/mach-at91/include/mach/at91sam9n12.h
delete mode 100644 arch/arm/mach-at91/include/mach/at91sam9rl.h
delete mode 100644 arch/arm/mach-at91/include/mach/at91sam9x5.h
delete mode 100644 arch/arm/mach-at91/include/mach/cpu.h
delete mode 100644 arch/arm/mach-at91/include/mach/hardware.h
delete mode 100644 arch/arm/mach-at91/include/mach/sama5d3.h
delete mode 100644 arch/arm/mach-at91/include/mach/sama5d4.h
delete mode 100644 arch/arm/mach-at91/include/mach/uncompress.h
delete mode 100644 arch/arm/mach-shmobile/board-ape6evm-reference.c
delete mode 100644 arch/arm/mach-shmobile/board-ape6evm.c
delete mode 100644 arch/arm/mach-shmobile/board-kzm9g-reference.c
delete mode 100644 arch/arm/mach-shmobile/board-mackerel.c
delete mode 100644 arch/arm/mach-shmobile/clock-r8a73a4.c
delete mode 100644 arch/arm/mach-shmobile/clock-sh7372.c
delete mode 100644 arch/arm/mach-shmobile/entry-intc.S
delete mode 100644 arch/arm/mach-shmobile/include/mach/clkdev.h
delete mode 100644 arch/arm/mach-shmobile/include/mach/head-mackerel.txt
delete mode 100644 arch/arm/mach-shmobile/include/mach/mmc-mackerel.h
delete mode 100644 arch/arm/mach-shmobile/include/mach/mmc.h
delete mode 100644 arch/arm/mach-shmobile/include/mach/sdhi-sh7372.h
delete mode 100644 arch/arm/mach-shmobile/include/mach/sdhi.h
delete mode 100644 arch/arm/mach-shmobile/include/mach/system.h
delete mode 100644 arch/arm/mach-shmobile/include/mach/uncompress.h
delete mode 100644 arch/arm/mach-shmobile/intc-sh7372.c
delete mode 100644 arch/arm/mach-shmobile/pm-sh7372.c
delete mode 100644 arch/arm/mach-shmobile/r8a73a4.h
delete mode 100644 arch/arm/mach-shmobile/setup-sh7372.c
delete mode 100644 arch/arm/mach-shmobile/sh7372.h
delete mode 100644 arch/arm/mach-shmobile/sleep-sh7372.S
create mode 100644 drivers/clk/shmobile/clk-r8a7778.c
create mode 100644 include/dt-bindings/clock/r8a73a4-clock.h
create mode 100644 include/dt-bindings/clock/r8a7778-clock.h
^ permalink raw reply [flat|nested] 10+ messages in thread
* [GIT PULL 7/9] ARM: SoC defconfig updates for v4.1
2015-04-22 6:11 [GIT PULL 0/9] ARM: SoC changes for v4.1 Olof Johansson
` (5 preceding siblings ...)
2015-04-22 6:11 ` [GIT PULL 6/9] ARM: SoC multiplatform code changes " Olof Johansson
@ 2015-04-22 6:11 ` Olof Johansson
2015-04-22 6:11 ` [GIT PULL 8/9] ARM: SoC 64-bit changes " Olof Johansson
2015-04-22 6:11 ` [GIT PULL 9/9] ARM: SoC late " Olof Johansson
8 siblings, 0 replies; 10+ messages in thread
From: Olof Johansson @ 2015-04-22 6:11 UTC (permalink / raw)
To: torvalds; +Cc: arm, linux-arm-kernel, linux-kernel, Olof Johansson
We keep collecting defconfig updates in a separate branch mostly to encourage
people to handle them separately and avoid conflicts between different topics.
Most of these are enablement of new drivers that have come in, or minor config
refreshes due to reorderings in Kconfig files, etc. I.e. mostly minor churn
of various kinds.
We might start folding this branch into something else for upstream merge
since it's so small, but keep it independent in our own tree for the above
reasons.
Conflicts: None
----------------------------------------------------------------
The following changes since commit c972226d171f288dda4d99d8eeda95a195e98a60:
Merge tag 'armsoc-multiplatform' into testmerge
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git tags/armsoc-defconfig
for you to fetch changes up to b50c9c2de553102d42842db842f57c6cad676494:
ARM: multi_v7_defconfig: enable alpine platform
----------------------------------------------------------------
Arnd Bergmann (1):
Merge tag 'mvebu-defconfig-4.1' of git://git.infradead.org/linux-mvebu into next/defconfig
Chen-Yu Tsai (2):
ARM: sunxi_defconfig: Enable CONFIG_PHY_SUN9I_USB
ARM: multi_v7_defconfig: Enable CONFIG_PHY_SUN9I_USB
Ezequiel Garcia (1):
ARM: mvebu: Enable perf support in mvebu_v7_defconfig
Fabio Estevam (3):
ARM: mxs_defconfig: Add VFAT support
ARM: imx_v4_v5_defconfig: Add VFAT support
ARM: imx_v6_v7_defconfig: Enable Bluetooth support
Felipe Balbi (1):
arm: config: omap2plus_defconfig: switch over to LZMA compression
Geert Uytterhoeven (4):
ARM: shmobile: Enable ape6evm board in multiplatform defconfig
ARM: shmobile: Enable R-Mobile reset driver in multiplatform defconfig
ARM: shmobile: defconfig: Drop useless SERIAL_8250_EXTENDED=y
ARM: shmobile: Enable bockw board in multiplatform defconfig
Georgi Djakov (1):
ARM: qcom: Increase MMC_BLOCK_MINORS in defconfig
Javier Martinez Canillas (5):
ARM: exynos_defconfig: Disable IOMMU support
ARM: exynos_defconfig: Enable Marvell WiFi-Ex support
ARM: exynos_defconfig: Enable ChromeOS EC chardev driver
ARM: exynos_defconfig: Enable options to mount a rootfs via NFS
ARM: exynos_defconfig: Enable HDMI support
Krzysztof Kozlowski (1):
ARM: exynos_defconfig: Enable CPU idle
Kuninori Morimoto (1):
ARM: configs: remove all CONFIG_RCAR_AUDMAC_PP from ARM defconfigs
Lukasz Majewski (3):
ARM: exynos_defconfig: Remove CONFIG_EXYNOS_THERMAL_CORE define
ARM: exynos_defconfig: Enable thermal emulation for Exynos TMU
ARM: exynos_defconfig: Enable support for cpufreq on Exynos SoCs
Olof Johansson (8):
Merge tag 'qcom-defconfig-for-4.1' of git://git.kernel.org/.../galak/linux-qcom into next/defconfig
Merge tag 'v4.1-defconfig' of git://git.kernel.org/.../tmlind/linux-omap into next/defconfig
Merge tag 'renesas-defconfig-for-v4.1' of git://git.kernel.org/.../horms/renesas into next/defconfig
Merge tag 'mvebu-defconfig-4.1-2' of git://git.infradead.org/linux-mvebu into next/defconfig
Merge tag 'sunxi-defconfig-for-4.1' of https://git.kernel.org/.../mripard/linux into next/defconfig
Merge tag 'qcom-defconfig-for-4.1-1' of git://git.kernel.org/.../galak/linux-qcom into next/defconfig
Merge tag 'imx-defconfig-4.1' of git://git.kernel.org/.../shawnguo/linux into next/defconfig
Merge tag 'samsung-defconfig' of git://git.kernel.org/.../kgene/linux-samsung into next/defconfig
Paul Walmsley (1):
ARM: omap1_defconfig: drop obsolete Kconfig symbols
Peter Chen (1):
ARM: imx_v6_v7_defconfig: Add CONFIG_GPIO_PCA953X
Rajendra Nayak (1):
arm: qcom: Enable lpass clock driver in defconfig
Roger Quadros (1):
ARM: omap2plus_defconfig: Enable EXTCON_GPIO_USB
Stephen Boyd (1):
arm: qcom: Update defconfig
Thomas Petazzoni (2):
ARM: mvebu: enable Armada 39x in mvebu_v7_defconfig
ARM: configs: enable Marvell Armada 39x in multi_v7_defconfig
Tomeu Vizoso (4):
ARM: multi_v7_defconfig: Enable Tegra ACTMON support
ARM: multi_v7_defconfig: Enable support for ELAN i2c trackpads
ARM: multi_v7_defconfig: Build the Marvell WiFi-Ex driver as a module
ARM: multi_v7_defconfig: Add gpio-restart driver
Tony Lindgren (3):
ARM: omap2plus_defconfig: Enable leds-pwm
ARM: omap2plus_defconfig: Update bluetooth options
ARM: omap2plus_defconfig: Enable n900 modem as loadable modules
Tsahee Zidenberg (1):
ARM: multi_v7_defconfig: enable alpine platform
Tyler Baker (1):
ARM: sunxi_defconfig: increase the number of maximum number of CPUs to 8
arch/arm/configs/exynos_defconfig | 20 ++++++++++++++++++--
arch/arm/configs/imx_v4_v5_defconfig | 1 +
arch/arm/configs/imx_v6_v7_defconfig | 4 ++++
arch/arm/configs/multi_v7_defconfig | 14 +++++++++++++-
arch/arm/configs/mvebu_v7_defconfig | 2 ++
arch/arm/configs/mxs_defconfig | 1 +
arch/arm/configs/omap1_defconfig | 16 ----------------
arch/arm/configs/omap2plus_defconfig | 27 +++++++++++++++++++++++++++
arch/arm/configs/qcom_defconfig | 9 +++++----
arch/arm/configs/shmobile_defconfig | 9 ++++++++-
arch/arm/configs/sunxi_defconfig | 1 +
11 files changed, 80 insertions(+), 24 deletions(-)
^ permalink raw reply [flat|nested] 10+ messages in thread
* [GIT PULL 8/9] ARM: SoC 64-bit changes for v4.1
2015-04-22 6:11 [GIT PULL 0/9] ARM: SoC changes for v4.1 Olof Johansson
` (6 preceding siblings ...)
2015-04-22 6:11 ` [GIT PULL 7/9] ARM: SoC defconfig updates " Olof Johansson
@ 2015-04-22 6:11 ` Olof Johansson
2015-04-22 6:11 ` [GIT PULL 9/9] ARM: SoC late " Olof Johansson
8 siblings, 0 replies; 10+ messages in thread
From: Olof Johansson @ 2015-04-22 6:11 UTC (permalink / raw)
To: torvalds; +Cc: arm, linux-arm-kernel, linux-kernel, Olof Johansson
Mostly DT updates for arm64, but also a couple of Kconfig additions.
Main contents:
- Qualcomm MSM8916/APQ8016
- Spreadtrum SC9836
- Xilinx ZynqMP
- Pincontrol entries for MediaTek MT8173
Conflicts: None
----------------------------------------------------------------
The following changes since commit 22f0bdca41c3643afae8368a594e05a3402fd8eb:
Merge tag 'armsoc-defconfig' into testmerge
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git tags/armsoc-arm64
for you to fetch changes up to bb1518f39bec1b3061425ad378793cf9c4bdb3d2:
Merge tag 'v4.0-next-arm64' of https://github.com/mbgg/linux-mediatek into next/arm64
----------------------------------------------------------------
Abhimanyu Kapur (1):
arm64: qcom: Add support for Qualcomm MSM8916 SoC
Chunyan Zhang (1):
arm64: dts: sprd: adding coresight entries to Spreadtrum SC9836
Hongzhou Yang (1):
arm64: dts: mt8173: Add pinctrl/GPIO/EINT node for mt8173.
Kumar Gala (2):
arm64: dts: Add Qualcomm MSM8916 SoC and evaluation board dts
arm64: dts: Add Qualcomm APQ8016 SBC evaluation board dts
Michal Simek (1):
ARM64: Add new Xilinx ZynqMP SoC
Olof Johansson (2):
Merge tag 'qcom-arm64-for-4.1' of git://git.kernel.org/.../galak/linux-qcom into next/arm64
Merge tag 'v4.0-next-arm64' of https://github.com/mbgg/linux-mediatek into next/arm64
Will Deacon (1):
arm64: dts: add interrupt-affinity property to pmu node for juno
Yingjoe Chen (1):
arm64: mediatek: Select PINCTRL for Mediatek platform
Zhizhou Zhang (2):
arm64: dts: Add support for Spreadtrum SC9836 SoC in dts and Makefile
arm64: Add support for Spreadtrum's Sharkl64 Platform in Kconfig and defconfig
arch/arm64/Kconfig | 17 +
arch/arm64/boot/dts/Makefile | 3 +
arch/arm64/boot/dts/arm/juno.dts | 14 +-
arch/arm64/boot/dts/mediatek/mt8173-pinfunc.h | 682 +++++++++++++++++++++
arch/arm64/boot/dts/mediatek/mt8173.dtsi | 20 +
arch/arm64/boot/dts/qcom/Makefile | 5 +
arch/arm64/boot/dts/qcom/apq8016-sbc.dts | 21 +
arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi | 33 +
arch/arm64/boot/dts/qcom/msm8916-mtp.dts | 22 +
arch/arm64/boot/dts/qcom/msm8916-mtp.dtsi | 33 +
arch/arm64/boot/dts/qcom/msm8916.dtsi | 196 ++++++
arch/arm64/boot/dts/sprd/Makefile | 5 +
arch/arm64/boot/dts/sprd/sc9836-openphone.dts | 49 ++
arch/arm64/boot/dts/sprd/sc9836.dtsi | 129 ++++
arch/arm64/boot/dts/sprd/sharkl64.dtsi | 65 ++
arch/arm64/boot/dts/xilinx/Makefile | 5 +
arch/arm64/boot/dts/xilinx/zynqmp-ep108.dts | 47 ++
arch/arm64/boot/dts/xilinx/zynqmp.dtsi | 305 +++++++++
arch/arm64/configs/defconfig | 10 +
19 files changed, 1657 insertions(+), 4 deletions(-)
create mode 100644 arch/arm64/boot/dts/mediatek/mt8173-pinfunc.h
create mode 100644 arch/arm64/boot/dts/qcom/Makefile
create mode 100644 arch/arm64/boot/dts/qcom/apq8016-sbc.dts
create mode 100644 arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi
create mode 100644 arch/arm64/boot/dts/qcom/msm8916-mtp.dts
create mode 100644 arch/arm64/boot/dts/qcom/msm8916-mtp.dtsi
create mode 100644 arch/arm64/boot/dts/qcom/msm8916.dtsi
create mode 100644 arch/arm64/boot/dts/sprd/Makefile
create mode 100644 arch/arm64/boot/dts/sprd/sc9836-openphone.dts
create mode 100644 arch/arm64/boot/dts/sprd/sc9836.dtsi
create mode 100644 arch/arm64/boot/dts/sprd/sharkl64.dtsi
create mode 100644 arch/arm64/boot/dts/xilinx/Makefile
create mode 100644 arch/arm64/boot/dts/xilinx/zynqmp-ep108.dts
create mode 100644 arch/arm64/boot/dts/xilinx/zynqmp.dtsi
^ permalink raw reply [flat|nested] 10+ messages in thread
* [GIT PULL 9/9] ARM: SoC late changes for v4.1
2015-04-22 6:11 [GIT PULL 0/9] ARM: SoC changes for v4.1 Olof Johansson
` (7 preceding siblings ...)
2015-04-22 6:11 ` [GIT PULL 8/9] ARM: SoC 64-bit changes " Olof Johansson
@ 2015-04-22 6:11 ` Olof Johansson
8 siblings, 0 replies; 10+ messages in thread
From: Olof Johansson @ 2015-04-22 6:11 UTC (permalink / raw)
To: torvalds; +Cc: arm, linux-arm-kernel, linux-kernel, Olof Johansson
We were expecting to sit on this branch through most of the merge window since
the contents was merged into our tree late, but we ended up sitting on all of
our contents so it can go in with the rest.
The contents here is:
- A large branch of cleanups of the CM/PRM blocks on OMAP.
- A couple of patches plumbing up CM/PRM on OMAP5 and DRA7.
- A branch with DT updates for Freescale i.MX. including some shuffling from
.dts to .dtsi (include) files that causes a little churn.
Conflicts: None
----------------------------------------------------------------
The following changes since commit bf1fba966c00c89af9a34cad7a546e58350d2d93:
Merge tag 'armsoc-arm64' into testmerge
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git tags/armsoc-late
for you to fetch changes up to 48c1078509b47b38802329028ccfd77783bcff99:
Merge tag 'omap-for-v4.1/prcm-dts-mfd-syscon-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/late
----------------------------------------------------------------
Arnd Bergmann (3):
Merge tag 'omap-for-v4.1/prcm-dts' of git://git.kernel.org/.../tmlind/linux-omap into next/late
Merge tag 'imx-dt-4.1' of git://git.kernel.org/.../shawnguo/linux into next/late
Merge branch 'omap/dt' into next/late
Bhuvanchandra DV (2):
ARM: vf610: add second DSPI instance
ARM: vf-colibri: add SPI support and enable MCP2515 CAN
Fabio Estevam (5):
ARM: dts: imx25-pdk: Add LCD support
ARM: dts: imx6sl-warp: Pass 'bus-width' property
ARM: dts: imx6sl-warp: Add BCM4330 support
ARM: dts: imx6sl: Add label snvs_rtc
ARM: dts: imx6sx: Add label snvs_rtc
George Joseph (1):
ARM: dts: cubox: Map gpio-keys to gpio3 8
Gwenhael Goavec-Merou (7):
ARM: dts: imx28-apf28dev: Add pinctrl for USB OTG ID pin
ARM: dts: imx28-apf28: fix mac0 gpio polarity
ARM: dts: imx28-apf28dev: fix mac1 gpio location and polarity
ARM: dts: imx28-apf28dev: add support for can0
ARM: dts: imx28-apf28dev: add support for auart0
ARM: dts: imx28-apf28dev: fix user button polarity
ARM: dts: imx28-apf28dev: add wakeup function to user button
Liu Ying (1):
ARM: dts: imx6qdl: Move existing MIPI DSI ports into a new 'ports' node
Marc Zyngier (3):
ARM: imx6: convert GPC to stacked domains
ARM: imx6: Allow GPC interrupts affinity to be changed
ARM: imx6: Warn when an old DT is detected
Markus Pargmann (3):
ARM: dts: imx6qdl: Add label snvs_rtc
ARM: dts: imx25-pinfunc: remove input values for pinfuncs without input register
ARM: dts: imx25-pinfunc: Add several pinfunctions
Matt Porter (1):
ARM: dts: imx: Add dr_mode host setting to all host-only usb instances
Olof Johansson (1):
Merge tag 'omap-for-v4.1/prcm-dts-mfd-syscon-fix' of git://git.kernel.org/.../tmlind/linux-omap into next/late
Otavio Salvador (1):
ARM: dts: warp: Add initial WaRP Board support
Peter Chen (3):
ARM: imx6sx-sdb: change default board as reva board
ARM: imx6sx-sdb: add revb board and make it default
ARM: imx6qdl-sabreauto.dtsi: add max7310 support
Philipp Zabel (6):
ARM: dts: imx6qdl: Add power-domain information to gpc node
ARM: dts: imx6sl: Add power-domain information to gpc node
ARM: dts: imx6qdl: Allow disabling the PU regulator, add a enable ramp delay
ARM: dts: imx6dl-aristainetos: enable backlight PWM explicitly
ARM: dts: hummingboard/cubox-i: enable front LED PWM explicitly
ARM: dts: imx6qdl: disable PWMs by default
Rabeeh Khoury (1):
ARM: dts: hummingboard: Setup pwm lines
Russell King (3):
ARM: dts: Re-license SolidRun iMX6 platform DT GPL v2/X11
ARM: dts: hummingboard: enable PCF8523 RTC support
ARM: dts: hummingboard: add sgtl5000 support for Hummingboard Pro
Shawn Guo (2):
Merge branch 'imx/soc' into imx/dt
Merge remote-tracking branch 'jcooper/irqchip/vybrid' into imx/dt
Stefan Agner (3):
ARM: dts: vf610: remove unused gpio-range-cells property
ARM: dts: vf610: add Miscellaneous System Control Module (MSCM)
ARM: dts: vf610: fix missing irqs
Tero Kristo (34):
ARM: OMAP2+: PRCM: rename of_prcm_init to omap_prcm_init
ARM: OMAP3: PRM: invert the wkst_mask for the prm_clear_mod_irqs
ARM: OMAP2+: PRM: add generic API for clear_mod_irqs
ARM: OMAP3+: PRM: add common APIs for prm_vp_check/clear_txdone
ARM: OMAP4+: PRM: move omap_prm_base_init under OMAP4 PRM driver
ARM: OMAP4+: CM: move omap_cm_base_init under OMAP4 CM driver
ARM: OMAP4: PRM: move omap4xxx_prm_init earlier in init order
Documentation: DT: document PRCM compatible strings for dm81x SoCs
ARM: OMAP2+: PRCM: add support for static clock memmap indices
ARM: OMAP2+: clock: move clock provider infrastructure to clock driver
ARM: OMAP2+: PRCM: split PRCM module init to their own driver files
ARM: OMAP2+: CM: determine CM base address from device tree
ARM: OMAP2+: PRM: determine PRM base address from device tree
ARM: OMAP2+: control: determine control module base address from DT
ARM: OMAP2+: PRM: move SoC specific init calls within a generic API
ARM: OMAP4+: PRM: determine prm_device_inst based on DT compatibility
ARM: OMAP2+: CM: move SoC specific init calls within a generic API
ARM: OMAP4+: PRM: setup prm_features from the PRM init time flags
ARM: OMAP4+: PRM: get rid of cpu_is_omap44xx calls from interrupt init
ARM: OMAP2+: clock: add low-level support for regmap
ARM: OMAP2+: control: remove API for getting control module base address
ARM: OMAP2+: id: cache omap_type value
ARM: OMAP2+: control: add syscon support for register accesses
ARM: dts: omap24xx: add minimal l4 bus layout with control module support
ARM: dts: omap3: add minimal l4 bus layout with control module support
ARM: dts: am33xx: add minimal l4 bus layout with control module support
ARM: dts: am43xx-epos-evm: fix pinmux node layout
ARM: dts: am4372: add minimal l4 bus layout with control module support
ARM: dts: omap4: add minimal l4 bus layout with control module support
ARM: OMAP4: display: convert display to use syscon for dsi muxing
ARM: OMAP4+: control: remove support for legacy pad read/write
ARM: dts: omap5: add minimal l4 bus layout with control module support
ARM: dts: dra7: add minimal l4 bus layout with control module support
ARM: OMAP4+: control: add support for initializing control module via DT
Tony Lindgren (2):
Merge branch '4.0-rc1-prcm-cleanup-v6' of https://github.com/t-kristo/linux-pm into omap-for-v4.1/prcm-cleanup
ARM: OMAP2+: Fix booting with configs that don't have MFD_SYSCON
Uwe Kleine-König (3):
ARM: imx25: fix some wrong iomux definitions
ARM: dts: imx25-pinfunc: more defines
ARM: dts: imx28: add alternative pinmuxing for spi3
.../devicetree/bindings/arm/omap/ctrl.txt | 79 +++
.../devicetree/bindings/arm/omap/l4.txt | 26 +
.../devicetree/bindings/arm/omap/prcm.txt | 6 +-
arch/arm/boot/dts/Makefile | 4 +-
arch/arm/boot/dts/am33xx-clocks.dtsi | 2 +-
arch/arm/boot/dts/am33xx.dtsi | 87 +--
arch/arm/boot/dts/am3517.dtsi | 2 +-
arch/arm/boot/dts/am35xx-clocks.dtsi | 2 +-
arch/arm/boot/dts/am4372.dtsi | 85 +--
arch/arm/boot/dts/am43x-epos-evm.dts | 84 +--
arch/arm/boot/dts/am43xx-clocks.dtsi | 2 +-
arch/arm/boot/dts/dra7.dtsi | 156 +++--
arch/arm/boot/dts/imx25-pdk.dts | 58 ++
arch/arm/boot/dts/imx25-pinfunc.h | 86 ++-
arch/arm/boot/dts/imx27.dtsi | 2 +
arch/arm/boot/dts/imx28-apf28.dts | 2 +-
arch/arm/boot/dts/imx28-apf28dev.dts | 30 +-
arch/arm/boot/dts/imx28.dtsi | 14 +
arch/arm/boot/dts/imx35.dtsi | 1 +
arch/arm/boot/dts/imx50.dtsi | 3 +
arch/arm/boot/dts/imx51.dtsi | 3 +
arch/arm/boot/dts/imx53.dtsi | 3 +
arch/arm/boot/dts/imx6dl-aristainetos_4.dts | 4 +
arch/arm/boot/dts/imx6dl-aristainetos_7.dts | 4 +
arch/arm/boot/dts/imx6dl-cubox-i.dts | 38 ++
arch/arm/boot/dts/imx6dl-hummingboard.dts | 38 ++
arch/arm/boot/dts/imx6q-cubox-i.dts | 38 ++
arch/arm/boot/dts/imx6q-hummingboard.dts | 38 ++
arch/arm/boot/dts/imx6q.dtsi | 20 +-
arch/arm/boot/dts/imx6qdl-cubox-i.dtsi | 62 ++
arch/arm/boot/dts/imx6qdl-hummingboard.dtsi | 101 +++-
arch/arm/boot/dts/imx6qdl-microsom-ar8035.dtsi | 38 ++
arch/arm/boot/dts/imx6qdl-microsom.dtsi | 38 ++
arch/arm/boot/dts/imx6qdl-sabreauto.dtsi | 35 ++
arch/arm/boot/dts/imx6qdl.dtsi | 49 +-
arch/arm/boot/dts/imx6sl-warp.dts | 262 ++++++++
arch/arm/boot/dts/imx6sl.dtsi | 13 +-
arch/arm/boot/dts/imx6sx-sdb-reva.dts | 143 +++++
arch/arm/boot/dts/imx6sx-sdb.dts | 603 +------------------
arch/arm/boot/dts/imx6sx-sdb.dtsi | 562 +++++++++++++++++
arch/arm/boot/dts/imx6sx.dtsi | 9 +-
arch/arm/boot/dts/omap2420.dtsi | 80 ++-
arch/arm/boot/dts/omap2430-clocks.dtsi | 8 +-
arch/arm/boot/dts/omap2430.dtsi | 107 ++--
arch/arm/boot/dts/omap24xx-clocks.dtsi | 6 +-
arch/arm/boot/dts/omap3.dtsi | 96 +--
arch/arm/boot/dts/omap34xx.dtsi | 2 +-
arch/arm/boot/dts/omap36xx.dtsi | 2 +-
arch/arm/boot/dts/omap3xxx-clocks.dtsi | 13 +-
arch/arm/boot/dts/omap4.dtsi | 200 +++---
arch/arm/boot/dts/omap5.dtsi | 182 +++---
arch/arm/boot/dts/vf-colibri-eval-v3.dtsi | 31 +
arch/arm/boot/dts/vf-colibri.dtsi | 15 +
arch/arm/boot/dts/vf500.dtsi | 137 +----
arch/arm/boot/dts/vfxxx.dtsi | 64 +-
arch/arm/mach-imx/common.h | 2 +-
arch/arm/mach-imx/gpc.c | 140 ++++-
arch/arm/mach-imx/mach-imx6q.c | 2 +-
arch/arm/mach-imx/mach-imx6sl.c | 2 +-
arch/arm/mach-imx/mach-imx6sx.c | 2 +-
arch/arm/mach-imx/pm-imx6.c | 6 +-
arch/arm/mach-omap2/Kconfig | 1 +
arch/arm/mach-omap2/clock.c | 111 +++-
arch/arm/mach-omap2/clock.h | 8 +-
arch/arm/mach-omap2/cm.h | 2 +
arch/arm/mach-omap2/cm2xxx.c | 2 +-
arch/arm/mach-omap2/cm2xxx.h | 2 +-
arch/arm/mach-omap2/cm33xx.c | 2 +-
arch/arm/mach-omap2/cm33xx.h | 3 +-
arch/arm/mach-omap2/cm3xxx.c | 3 +-
arch/arm/mach-omap2/cm3xxx.h | 2 +-
arch/arm/mach-omap2/cm44xx.h | 3 +-
arch/arm/mach-omap2/cm_common.c | 156 +++++
arch/arm/mach-omap2/cminst44xx.c | 6 +-
arch/arm/mach-omap2/control.c | 201 ++++++-
arch/arm/mach-omap2/control.h | 10 +-
arch/arm/mach-omap2/display.c | 15 +-
arch/arm/mach-omap2/id.c | 5 +-
arch/arm/mach-omap2/io.c | 112 ++--
arch/arm/mach-omap2/pm24xx.c | 24 +-
arch/arm/mach-omap2/pm34xx.c | 18 +-
arch/arm/mach-omap2/prcm-common.h | 20 +
arch/arm/mach-omap2/prm.h | 27 +-
arch/arm/mach-omap2/prm2xxx.c | 6 +-
arch/arm/mach-omap2/prm2xxx.h | 4 +-
arch/arm/mach-omap2/prm33xx.c | 2 +-
arch/arm/mach-omap2/prm33xx.h | 2 +-
arch/arm/mach-omap2/prm3xxx.c | 20 +-
arch/arm/mach-omap2/prm3xxx.h | 7 +-
arch/arm/mach-omap2/prm44xx.c | 70 +--
arch/arm/mach-omap2/prm44xx.h | 1 -
arch/arm/mach-omap2/prm44xx_54xx.h | 8 +-
arch/arm/mach-omap2/prm54xx.h | 1 -
arch/arm/mach-omap2/prm7xx.h | 2 +-
arch/arm/mach-omap2/prm_common.c | 258 ++++++--
arch/arm/mach-omap2/prminst44xx.c | 18 +-
arch/arm/mach-omap2/prminst44xx.h | 1 +
arch/arm/mach-omap2/vp.h | 9 -
arch/arm/mach-omap2/vp3xxx_data.c | 4 +-
arch/arm/mach-omap2/vp44xx_data.c | 4 +-
include/linux/clk/ti.h | 6 +-
101 files changed, 3510 insertions(+), 1575 deletions(-)
create mode 100644 Documentation/devicetree/bindings/arm/omap/ctrl.txt
create mode 100644 Documentation/devicetree/bindings/arm/omap/l4.txt
create mode 100644 arch/arm/boot/dts/imx6sl-warp.dts
create mode 100644 arch/arm/boot/dts/imx6sx-sdb-reva.dts
create mode 100644 arch/arm/boot/dts/imx6sx-sdb.dtsi
^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2015-04-22 6:13 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-04-22 6:11 [GIT PULL 0/9] ARM: SoC changes for v4.1 Olof Johansson
2015-04-22 6:11 ` [GIT PULL 1/9] ARM: SoC fixes " Olof Johansson
2015-04-22 6:11 ` [GIT PULL 2/9] ARM: SoC cleanups " Olof Johansson
2015-04-22 6:11 ` [GIT PULL 3/9] ARM: SoC platform updates " Olof Johansson
2015-04-22 6:11 ` [GIT PULL 4/9] ARM: DT " Olof Johansson
2015-04-22 6:11 ` [GIT PULL 5/9] ARM: SoC driver " Olof Johansson
2015-04-22 6:11 ` [GIT PULL 6/9] ARM: SoC multiplatform code changes " Olof Johansson
2015-04-22 6:11 ` [GIT PULL 7/9] ARM: SoC defconfig updates " Olof Johansson
2015-04-22 6:11 ` [GIT PULL 8/9] ARM: SoC 64-bit changes " Olof Johansson
2015-04-22 6:11 ` [GIT PULL 9/9] ARM: SoC late " Olof Johansson
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).