* [GIT PULL 0/7] ARM: SoC changes for v4.3
@ 2015-09-01 0:07 Olof Johansson
2015-09-01 0:07 ` [GIT PULL 1/7] ARM: SoC non-urgent fixes for 4.3 Olof Johansson
` (7 more replies)
0 siblings, 8 replies; 9+ messages in thread
From: Olof Johansson @ 2015-09-01 0:07 UTC (permalink / raw)
To: linux-arm-kernel
Hi Linus,
Here's the main batch of changes from arm-soc for 4.3. Besides this we
also have a branch of changes that looked to be late-arriving (right
before -rc7), and we'll leave those to a separate pull request a little
later.
Nothing in here should be controversial at this point. We have more
external dependencies than we've had for a while, mostly with the clk
tree. We also picked up some other misc drivers with appropriate acks
(rtc, pci, etc) through the platform maintainers the drivers are for.
We've been able to keep conflicts down this cycle, only a few and none
are hairy. I've described them in the affected pull requests.
There's a branch "armsoc-resolved" available with my version of the
resolutions.
Please merge!
Thanks,
-Olof
^ permalink raw reply [flat|nested] 9+ messages in thread
* [GIT PULL 1/7] ARM: SoC non-urgent fixes for 4.3
2015-09-01 0:07 [GIT PULL 0/7] ARM: SoC changes for v4.3 Olof Johansson
@ 2015-09-01 0:07 ` Olof Johansson
2015-09-01 0:07 ` [GIT PULL 2/7] ARM: SoC cleanups for v4.3 Olof Johansson
` (6 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: Olof Johansson @ 2015-09-01 0:07 UTC (permalink / raw)
To: linux-arm-kernel
We normally collect non-urgent fixes during the release cycle and queue them for the merge window.
This time around the list is short (in part because some have gone in other
branches).
- Maintainers addition for bcm2835
- IRQ number fix for orion5x (been present since 3.18)
- DT fix for display on exynos3250
- Exynos fix to use of IOMEM_ERR_PTR properly
----------------------------------------------------------------
The following changes since commit 64291f7db5bd8150a74ad2036f1037e6a0428df2:
Linux 4.2
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git tags/armsoc-fixes-nc
for you to fetch changes up to 330349fae46f8400e86ef98ee05af4ba13466f49:
Merge tag 'mvebu-fixes-4.2-1' of git://git.infradead.org/linux-mvebu into next/fixes-non-critical
----------------------------------------------------------------
Benjamin Cama (1):
ARM: orion5x: fix legacy orion5x IRQ numbers
Eric Anholt (2):
MAINTAINERS: Add myself as a bcm2835 co-maintainer.
MAINTAINERS: Explicitly add linux-arm-kernel for bcm2835
Hyungwon Hwang (1):
ARM: dts: fix clock-frequency of display timing0 for exynos3250-rinato
Krzysztof Kozlowski (1):
ARM: EXYNOS: Use IOMEM_ERR_PTR when function returns iomem
Olof Johansson (3):
Merge tag 'samsung-non-critical-1' of git://git.kernel.org/.../kgene/linux-samsung into next/fixes-non-critical
Merge tag 'arm-soc/for-4.3/maintainers' of http://github.com/broadcom/stblinux into next/fixes-non-critical
Merge tag 'mvebu-fixes-4.2-1' of git://git.infradead.org/linux-mvebu into next/fixes-non-critical
MAINTAINERS | 2 +
arch/arm/Kconfig | 1 +
arch/arm/boot/dts/exynos3250-rinato.dts | 2 +-
arch/arm/mach-exynos/platsmp.c | 2 +-
arch/arm/mach-orion5x/include/mach/irqs.h | 64 +++++++++++++-------------
arch/arm/mach-orion5x/irq.c | 4 +-
6 files changed, 39 insertions(+), 36 deletions(-)
^ permalink raw reply [flat|nested] 9+ messages in thread
* [GIT PULL 2/7] ARM: SoC cleanups for v4.3
2015-09-01 0:07 [GIT PULL 0/7] ARM: SoC changes for v4.3 Olof Johansson
2015-09-01 0:07 ` [GIT PULL 1/7] ARM: SoC non-urgent fixes for 4.3 Olof Johansson
@ 2015-09-01 0:07 ` Olof Johansson
2015-09-01 0:07 ` [GIT PULL 3/7] ARM: SoC platform updates " Olof Johansson
` (5 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: Olof Johansson @ 2015-09-01 0:07 UTC (permalink / raw)
To: linux-arm-kernel
A large cleanup branch this release, with a healthy 10k negative line delta.
Most of this is removal of legacy (non-DT) support of shmobile
platforms. There is also removal of two non-DT platforms on OMAP,
and the plat-samsung directory is cleaned out by moving most of the
previously shared-location-but-not-actually-shared files from there to
the appropriate mach directories instead.
There are other sets of changes in here as well:
- Rob Herring removed use of set_irq_flags under all platforms and
moved to genirq alternatives
- A series of timer API conversions to set-state interface
- ep93xx, nomadik and ux500 cleanups from Linus Walleij
- __init annotation fixes from Nicolas Pitre
+ a bunch of other changes that all add up to a nice set of cleanups
----------------------------------------------------------------
The following changes since commit 8f844fac5c5b97534cff57310b1d660e8210ee00:
Merge branch 'next/fixes-non-critical' into HEAD
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 97a2482d9891f0ad6a3710e0b6ae9949c140c7f1:
Merge tag 'tegra-for-4.3-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into next/cleanup
----------------------------------------------------------------
Florian Fainelli (1):
ARM: BCM63xx: Remove custom secondary_startup function
Geert Uytterhoeven (24):
ARM: shmobile: R-Mobile: Move to_rmobile_pd from header to source file
ARM: shmobile: R-Mobile: Use BIT() macro instead of open coding
ARM: shmobile: r8a7779: Remove GENPD_FLAG_PM_CLK flag
ARM: shmobile: Remove legacy board code for KZM-A9-GT
ARM: shmobile: Remove legacy kzm9g_defconfig
ARM: shmobile: Drop sh73a0-kzm9g.dtb for legacy builds
ARM: shmobile: Remove legacy SoC code for SH-Mobile AG5
ARM: shmobile: Remove legacy board code for Armadillo-800 EVA
ARM: shmobile: Remove legacy armadillo800eva_defconfig
ARM: shmobile: Drop r8a7740-armadillo800eva.dtb for legacy builds
ARM: shmobile: Remove legacy SoC code for R-Mobile A1
ARM: shmobile: Remove unused dma-register.h
ARM: shmobile: R-Mobile: Remove legacy PM Domain code
ARM: shmobile: Remove obsolete zboot support
ARM: shmobile: R-Car Gen2: CONFIG_ARCH_SHMOBILE_MULTI is always set
ARM: shmobile: timer: r8a73a4 and r8a7790 are multi-platform only
ARM: shmobile: R-Car: Improve documentation
ARM: shmobile: R-Car: Shrink rcar_sysc_ch size
ARM: shmobile: R-Car: Break infinite loop
ARM: shmobile: R-Car: Make struct rcar_sysc_ch * parameters const
ARM: shmobile: R-Car: Use BIT() macro instead of open coding
ARM: shmobile: R-Car: Get rid of on_off_fn() function pointer
ARM: shmobile: r8a7779: Make struct rcar_sysc_ch const
ARM: shmobile: r8a7790: Make struct rcar_sysc_ch const
H Hartley Sweeten (3):
ARM: ep93xx: remove memory configuration options
ARM: ep93xx: vision_ep9307: enable DMA for SPI
ARM: ep93xx: vision_ep9307: add audio support
Hans Ulli Kroll (3):
ARM: gemini: Add missing register definitions for gemini timer
ARM: gemini: Use timer1 for clockevent
ARM: gemini: Setup timer3 as free running timer
Jiang Liu (2):
ARM/irq: Use access helper irq_data_get_affinity_mask()
ARM, irq: Use irq_desc_get_xxx() to avoid redundant lookup of irq_desc
Joe Perches (1):
ARM: orion5x: Use vsprintf %pM extension
Krzysztof Kozlowski (3):
ARM: EXYNOS: Make local function static
ARM: EXYNOS: Remove duplicated define of SLEEP_MAGIC
ARM: EXYNOS: Drop owner assignment in pmu.c
Kukjin Kim (14):
ARM: SAMSUNG: make local setup-camif in mach-s3c24xx
ARM: SAMSUNG: make local dev-backlight in mach-s3c64xx
ARM: SAMSUNG: make local s5p-dev-mfc in mach-exynos
ARM: SAMSUNG: local regs-srom header in mach-exynos
ARM: SAMSUNG: local fb-core header in mach-s3c24xx
ARM: SAMSUNG: local nand-core header in mach-s3c24xx
ARM: SAMSUNG: local spi-core header in mach-s3c24xx
ARM: SAMSUNG: local regs-usb-hsotg-phy header in mach-s3c64xx
ARM: SAMSUNG: local ata-core header in mach-s3c64xx
ARM: SAMSUNG: local backlight header in mach-s3c64xx
ARM: SAMSUNG: local irq-uart header in mach-s3c64xx
ARM: SAMSUNG: local onenand-core header in mach-s3c64xx
ARM: SAMSUNG: local watchdog-reset header in mach-s3c64xx
ARM: SAMSUNG: remove keypad-core header in plat-samsung
Linus Walleij (13):
ARM: ep93xx: move timer to its own file
ARM: ep93xx: switch to GENERIC_CLOCKEVENTS
ARM: ep93xx: use non-raw accessors for timer
ARM: ep93xx: switch clockevent to timer 3
ARM: ep93xx: update comment on timer usage
ARM: ep93xx: toss the device ID into the entropy pool
ARM: ep93xx: simone: enable DMA on the SPI host
ARM: ux500: simplify secondary CPU boot
ARM: nomadik: move hog code to use DT hogs
ARM: nomadik: selectively enable UART0 on boards
ARM: nomadik: move l2x0 setup to device tree
ARM: nomadik: push accelerometer down to boards
ARM/fb: ep93xx: switch framebuffer to use modedb only
Magnus Damm (6):
ARM: shmobile: r8a7779: Generic CCF and timer support
ARM: shmobile: r8a7779: Generic SMP ops
ARM: shmobile: marzen-reference: Remove C board code
ARM: shmobile: r8a7779: Cleanup header file
ARM: shmobile: marzen: Remove legacy board code
ARM: shmobile: r8a7779: Remove legacy SoC code
Marcel Ziswiler (1):
ALSA: hda/tegra - Fix hda2codec_2x clock and reset names
Nicolas Pitre (1):
ARM: appropriate __init annotation for const data
Olof Johansson (14):
Merge tag 'renesas-cleanup-for-v4.3' of git://git.kernel.org/.../horms/renesas into next/cleanup
Merge tag 'renesas-pm-domain-for-v4.3' of git://git.kernel.org/.../horms/renesas into next/cleanup
Merge branch 'ARM/clkevt/set-state-4.3' of git://git.kernel.org/.../vireshk/linux into next/cleanup
Merge tag 'mvebu-cleanup-4.3-1' of git://git.infradead.org/linux-mvebu into next/cleanup
Merge tag 'arm-soc/for-4.3/soc' of http://github.com/broadcom/stblinux into next/cleanup
Merge tag 'ep93xx-cleanup' of git://git.kernel.org/.../linusw/linux-integrator into next/cleanup
Merge tag 'omap-for-v4.3/legacy-v2-signed' of git://git.kernel.org/.../tmlind/linux-omap into next/cleanup
Merge tag 'renesas-cleanup2-for-v4.3' of git://git.kernel.org/.../horms/renesas into next/cleanup
Merge branch 'queue/irq/arm' of git://git.kernel.org/.../tip/tip into next/cleanup
Merge tag 'renesas-marzen-board-removal-for-v4.3' of git://git.kernel.org/.../horms/renesas into next/cleanup
Merge branch 'fixes' into next/cleanup
ARM: shmobile: Fix mismerges
Merge tag 'samsung-cleanup' of git://git.kernel.org/.../kgene/linux-samsung into next/cleanup
Merge tag 'tegra-for-4.3-cleanup' of git://git.kernel.org/.../tegra/linux into next/cleanup
Rob Herring (1):
ARM: kill off set_irq_flags usage
Sudeep Holla (1):
ARM: BCM63xx: fix parameter to of_get_cpu_node in bcm63138_smp_boot_secondary
Thierry Reding (1):
ALSA: hda/tegra: Order clock and reset names consistently
Thomas Gleixner (9):
ARM/orion: Consolidate chained IRQ handler install/remove
ARM/locomo: Consolidate chained IRQ handler install/remove
ARM/LPC32xx: Use irq_set_handler_locked()
ARM/locomo: Prepare locomo_handler for irq argument removal
ARM/sa1111: Prepare sa1111_irq_handler for irq argument removal
ARM/dove: Prepare pmu_irq_handler for irq argument removal
ARM/pxa: Prepare *_irq_handler for irq argument removal
ARM/pxa: Prepare balloon3_irq_handler for irq argument removal
ARM/orion/gpio: Prepare gpio_irq_handler for irq argument removal
Thomas Petazzoni (1):
ARM: mvebu: add missing newline at end of messages
Tony Lindgren (2):
ARM: OMAP2+: Remove legacy booting support for LogicPD Torpedo
ARM: OMAP2+: Remove legacy booting support for Pandora
Viresh Kumar (19):
ARM/smp_twd: Migrate to new 'set-state' interface
ARM/cns3xxx/timer: Migrate to new 'set-state' interface
ARM/davinci/time: Migrate to new 'set-state' interface
ARM/dc21285-timer: Migrate to new 'set-state' interface
ARM/gemini/time: Migrate to new 'set-state' interface
ARM/imx/epit: Migrate to new 'set-state' interface
ARM/ixp4xx/timer: Migrate to new 'set-state' interface
ARM/ks8695/time: Migrate to new 'set-state' interface
ARM/lpc32xx/timer: Migrate to new 'set-state' interface
ARM/mmp/time: Migrate to new 'set-state' interface
ARM/netx/time: Migrate to new 'set-state' interface
ARM/omap1/time: Migrate to new 'set-state' interface
ARM/omap1/timer32: Migrate to new 'set-state' interface
ARM/omap2/timer: Migrate to new 'set-state' interface
ARM/SPEAr/time: Migrate to new 'set-state' interface
ARM/w90x900/time: Migrate to new 'set-state' interface
ARM/iop/time: Migrate to new 'set-state' interface
ARM/orion/time: Migrate to new 'set-state' interface
ARM: ep93xx/timer: Migrate to new 'set-state' interface
Wolfram Sang (1):
ARM: shmobile: apmu: silence build warnings
.../bindings/sound/nvidia,tegra30-hda.txt | 8 +-
MAINTAINERS | 2 -
arch/arm/Kconfig | 11 +-
arch/arm/boot/compressed/Makefile | 4 -
arch/arm/boot/compressed/head-shmobile.S | 71 -
arch/arm/boot/dts/Makefile | 5 +-
arch/arm/boot/dts/ste-nomadik-nhk15.dts | 39 +-
arch/arm/boot/dts/ste-nomadik-s8815.dts | 44 +-
arch/arm/boot/dts/ste-nomadik-stn8815.dtsi | 22 +-
arch/arm/common/it8152.c | 2 +-
arch/arm/common/locomo.c | 11 +-
arch/arm/common/sa1111.c | 9 +-
arch/arm/configs/armadillo800eva_defconfig | 162 ---
arch/arm/configs/kzm9g_defconfig | 154 --
arch/arm/kernel/irq.c | 4 +-
arch/arm/kernel/psci.c | 2 +-
arch/arm/kernel/smp_twd.c | 48 +-
arch/arm/mach-at91/at91rm9200.c | 2 +-
arch/arm/mach-at91/at91sam9.c | 6 +-
arch/arm/mach-at91/pm.c | 2 +-
arch/arm/mach-at91/sama5.c | 4 +-
arch/arm/mach-bcm/Makefile | 4 +-
arch/arm/mach-bcm/bcm63xx_headsmp.S | 23 -
arch/arm/mach-bcm/bcm63xx_smp.c | 4 +-
arch/arm/mach-bcm/bcm63xx_smp.h | 1 -
arch/arm/mach-bcm/bcm_5301x.c | 2 +-
arch/arm/mach-bcm/bcm_kona_smc.c | 2 +-
arch/arm/mach-clps711x/board-autcpu12.c | 2 +-
arch/arm/mach-cns3xxx/core.c | 59 +-
arch/arm/mach-davinci/cp_intc.c | 2 +-
arch/arm/mach-davinci/da850.c | 4 +-
arch/arm/mach-davinci/da8xx-dt.c | 4 +-
arch/arm/mach-davinci/time.c | 54 +-
arch/arm/mach-digicolor/digicolor.c | 2 +-
arch/arm/mach-dove/irq.c | 5 +-
arch/arm/mach-ebsa110/core.c | 2 +-
arch/arm/mach-ep93xx/Kconfig | 54 -
arch/arm/mach-ep93xx/Makefile | 2 +-
arch/arm/mach-ep93xx/Makefile.boot | 15 +-
arch/arm/mach-ep93xx/core.c | 116 +-
arch/arm/mach-ep93xx/edb93xx.c | 2 -
arch/arm/mach-ep93xx/simone.c | 3 +-
arch/arm/mach-ep93xx/snappercl15.c | 2 -
arch/arm/mach-ep93xx/timer-ep93xx.c | 143 ++
arch/arm/mach-ep93xx/vision_ep9307.c | 63 +-
arch/arm/mach-exynos/Kconfig | 5 +
arch/arm/mach-exynos/Makefile | 2 +
arch/arm/mach-exynos/common.h | 6 +
arch/arm/mach-exynos/firmware.c | 2 -
arch/arm/mach-exynos/pmu.c | 3 +-
.../include/plat => mach-exynos}/regs-srom.h | 3 +-
.../{plat-samsung => mach-exynos}/s5p-dev-mfc.c | 0
arch/arm/mach-exynos/suspend.c | 8 +-
arch/arm/mach-footbridge/common.c | 2 +-
arch/arm/mach-footbridge/dc21285-timer.c | 48 +-
arch/arm/mach-footbridge/isa-irq.c | 8 +-
arch/arm/mach-gemini/gpio.c | 2 +-
arch/arm/mach-gemini/include/mach/hardware.h | 3 -
arch/arm/mach-gemini/irq.c | 2 +-
arch/arm/mach-gemini/time.c | 219 ++-
arch/arm/mach-imx/3ds_debugboard.c | 2 +-
arch/arm/mach-imx/epit.c | 67 +-
arch/arm/mach-imx/mach-imx7d.c | 2 +-
arch/arm/mach-imx/mach-mx31ads.c | 2 +-
arch/arm/mach-iop13xx/irq.c | 2 +-
arch/arm/mach-iop32x/irq.c | 2 +-
arch/arm/mach-iop33x/irq.c | 2 +-
arch/arm/mach-ixp4xx/common.c | 70 +-
arch/arm/mach-ks8695/irq.c | 2 +-
arch/arm/mach-ks8695/time.c | 43 +-
arch/arm/mach-lpc32xx/irq.c | 10 +-
arch/arm/mach-lpc32xx/phy3250.c | 4 +-
arch/arm/mach-lpc32xx/timer.c | 40 +-
arch/arm/mach-mmp/mmp-dt.c | 4 +-
arch/arm/mach-mmp/mmp2-dt.c | 2 +-
arch/arm/mach-mmp/time.c | 29 +-
arch/arm/mach-mvebu/pmsu.c | 4 +-
arch/arm/mach-mxs/mach-mxs.c | 4 +-
arch/arm/mach-netx/generic.c | 2 +-
arch/arm/mach-netx/time.c | 61 +-
arch/arm/mach-nomadik/cpu-8815.c | 41 +-
arch/arm/mach-omap1/fpga.c | 2 +-
arch/arm/mach-omap1/irq.c | 2 +-
arch/arm/mach-omap1/time.c | 35 +-
arch/arm/mach-omap1/timer32k.c | 33 +-
arch/arm/mach-omap2/Kconfig | 20 -
arch/arm/mach-omap2/Makefile | 3 -
arch/arm/mach-omap2/board-omap3logic.c | 249 ----
arch/arm/mach-omap2/board-omap3pandora.c | 633 --------
arch/arm/mach-omap2/prm_common.c | 2 +-
arch/arm/mach-omap2/timer.c | 48 +-
arch/arm/mach-omap2/vc.c | 2 +-
arch/arm/mach-omap2/voltagedomains3xxx_data.c | 2 +-
arch/arm/mach-omap2/voltagedomains44xx_data.c | 2 +-
arch/arm/mach-omap2/voltagedomains54xx_data.c | 2 +-
arch/arm/mach-orion5x/dns323-setup.c | 4 +-
arch/arm/mach-orion5x/tsx09-common.c | 4 +-
arch/arm/mach-pxa/balloon3.c | 16 +-
arch/arm/mach-pxa/cm-x2xx-pci.c | 3 +-
arch/arm/mach-pxa/irq.c | 1 -
arch/arm/mach-pxa/lpd270.c | 5 +-
arch/arm/mach-pxa/pcm990-baseboard.c | 5 +-
arch/arm/mach-pxa/pxa-dt.c | 4 +-
arch/arm/mach-pxa/pxa3xx.c | 2 +-
arch/arm/mach-pxa/viper.c | 5 +-
arch/arm/mach-pxa/zeus.c | 5 +-
arch/arm/mach-realview/realview-dt.c | 2 +-
arch/arm/mach-rpc/ecard.c | 2 +-
arch/arm/mach-rpc/irq.c | 16 +-
arch/arm/mach-s3c24xx/Kconfig | 5 +
arch/arm/mach-s3c24xx/Makefile | 1 +
arch/arm/mach-s3c24xx/bast-irq.c | 2 +-
.../include/plat => mach-s3c24xx}/fb-core.h | 2 -
arch/arm/mach-s3c24xx/mach-s3c2416-dt.c | 2 +-
.../include/plat => mach-s3c24xx}/nand-core.h | 3 +-
arch/arm/mach-s3c24xx/s3c2412.c | 2 +-
arch/arm/mach-s3c24xx/s3c2416.c | 6 +-
arch/arm/mach-s3c24xx/s3c2443.c | 7 +-
arch/arm/mach-s3c24xx/s3c244x.c | 2 +-
.../setup-camif.c | 0
.../include/plat => mach-s3c24xx}/spi-core.h | 0
arch/arm/mach-s3c64xx/Kconfig | 6 +
arch/arm/mach-s3c64xx/Makefile | 2 +
.../include/plat => mach-s3c64xx}/ata-core.h | 3 +-
.../include/plat => mach-s3c64xx}/backlight.h | 3 +-
arch/arm/mach-s3c64xx/common.c | 6 +-
.../dev-backlight.c | 6 +-
.../include/plat => mach-s3c64xx}/irq-uart.h | 3 +-
arch/arm/mach-s3c64xx/mach-s3c64xx-dt.c | 5 +-
arch/arm/mach-s3c64xx/mach-smdk6410.c | 2 +-
.../plat => mach-s3c64xx}/onenand-core.h | 2 -
.../plat => mach-s3c64xx}/regs-usb-hsotg-phy.h | 3 +-
arch/arm/mach-s3c64xx/s3c6400.c | 2 +-
arch/arm/mach-s3c64xx/s3c6410.c | 4 +-
arch/arm/mach-s3c64xx/setup-usb-phy.c | 2 +-
.../plat => mach-s3c64xx}/watchdog-reset.h | 3 +-
arch/arm/mach-sa1100/neponset.c | 4 +-
arch/arm/mach-shmobile/Kconfig | 47 -
arch/arm/mach-shmobile/Makefile | 14 +-
arch/arm/mach-shmobile/Makefile.boot | 3 -
arch/arm/mach-shmobile/board-armadillo800eva.c | 1365 ------------------
arch/arm/mach-shmobile/board-bockw-reference.c | 2 +-
arch/arm/mach-shmobile/board-bockw.c | 2 +-
arch/arm/mach-shmobile/board-kzm9g.c | 916 ------------
arch/arm/mach-shmobile/board-marzen-reference.c | 56 -
arch/arm/mach-shmobile/board-marzen.c | 347 -----
arch/arm/mach-shmobile/clock-r8a7740.c | 675 ---------
arch/arm/mach-shmobile/clock-r8a7779.c | 271 ----
arch/arm/mach-shmobile/clock-sh73a0.c | 752 ----------
arch/arm/mach-shmobile/dma-register.h | 84 --
.../mach-shmobile/include/mach/head-kzm9g.txt | 410 ------
arch/arm/mach-shmobile/include/mach/zboot.h | 19 -
.../mach-shmobile/include/mach/zboot_macros.h | 108 --
arch/arm/mach-shmobile/intc-sh73a0.c | 337 -----
arch/arm/mach-shmobile/platsmp-apmu.c | 4 +-
arch/arm/mach-shmobile/pm-r8a7740.c | 129 --
arch/arm/mach-shmobile/pm-r8a7779.c | 4 +-
arch/arm/mach-shmobile/pm-rcar.c | 105 +-
arch/arm/mach-shmobile/pm-rcar.h | 12 +-
arch/arm/mach-shmobile/pm-rmobile.c | 49 +-
arch/arm/mach-shmobile/pm-rmobile.h | 30 -
arch/arm/mach-shmobile/pm-sh73a0.c | 32 -
arch/arm/mach-shmobile/r8a7740.h | 58 -
arch/arm/mach-shmobile/r8a7779.h | 19 -
arch/arm/mach-shmobile/setup-r7s72100.c | 2 +-
arch/arm/mach-shmobile/setup-r8a73a4.c | 2 +-
arch/arm/mach-shmobile/setup-r8a7740.c | 680 +--------
arch/arm/mach-shmobile/setup-r8a7778.c | 2 +-
arch/arm/mach-shmobile/setup-r8a7779.c | 683 +--------
arch/arm/mach-shmobile/setup-r8a7791.c | 2 +-
arch/arm/mach-shmobile/setup-rcar-gen2.c | 2 -
arch/arm/mach-shmobile/setup-sh73a0.c | 741 +---------
arch/arm/mach-shmobile/sh73a0.h | 83 --
arch/arm/mach-shmobile/smp-r8a7779.c | 21 +-
arch/arm/mach-shmobile/smp-r8a7790.c | 4 +-
arch/arm/mach-shmobile/smp-sh73a0.c | 8 -
arch/arm/mach-shmobile/timer.c | 12 -
arch/arm/mach-spear/time.c | 91 +-
arch/arm/mach-sti/board-dt.c | 2 +-
arch/arm/mach-ux500/Makefile | 2 +-
arch/arm/mach-ux500/cpu-db8500.c | 1 -
arch/arm/mach-ux500/headsmp.S | 37 -
arch/arm/mach-ux500/platsmp.c | 132 +-
arch/arm/mach-ux500/setup.h | 1 -
arch/arm/mach-w90x900/irq.c | 2 +-
arch/arm/mach-w90x900/time.c | 51 +-
arch/arm/mach-zx/zx296702.c | 2 +-
arch/arm/plat-iop/time.c | 70 +-
arch/arm/plat-orion/gpio.c | 9 +-
arch/arm/plat-orion/time.c | 93 +-
arch/arm/plat-samsung/Kconfig | 17 -
arch/arm/plat-samsung/Makefile | 5 -
.../arm/plat-samsung/include/plat/keypad-core.h | 31 -
drivers/irqchip/irq-sa11x0.c | 1 -
drivers/video/fbdev/ep93xx-fb.c | 30 +-
include/linux/platform_data/video-ep93xx.h | 8 -
196 files changed, 1281 insertions(+), 10483 deletions(-)
delete mode 100644 arch/arm/boot/compressed/head-shmobile.S
delete mode 100644 arch/arm/configs/armadillo800eva_defconfig
delete mode 100644 arch/arm/configs/kzm9g_defconfig
delete mode 100644 arch/arm/mach-bcm/bcm63xx_headsmp.S
create mode 100644 arch/arm/mach-ep93xx/timer-ep93xx.c
rename arch/arm/{plat-samsung/include/plat => mach-exynos}/regs-srom.h (96%)
rename arch/arm/{plat-samsung => mach-exynos}/s5p-dev-mfc.c (100%)
delete mode 100644 arch/arm/mach-omap2/board-omap3logic.c
delete mode 100644 arch/arm/mach-omap2/board-omap3pandora.c
rename arch/arm/{plat-samsung/include/plat => mach-s3c24xx}/fb-core.h (93%)
rename arch/arm/{plat-samsung/include/plat => mach-s3c24xx}/nand-core.h (93%)
rename arch/arm/{plat-samsung => mach-s3c24xx}/setup-camif.c (100%)
rename arch/arm/{plat-samsung/include/plat => mach-s3c24xx}/spi-core.h (100%)
rename arch/arm/{plat-samsung/include/plat => mach-s3c64xx}/ata-core.h (92%)
rename arch/arm/{plat-samsung/include/plat => mach-s3c64xx}/backlight.h (92%)
rename arch/arm/{plat-samsung => mach-s3c64xx}/dev-backlight.c (98%)
rename arch/arm/{plat-samsung/include/plat => mach-s3c64xx}/irq-uart.h (90%)
rename arch/arm/{plat-samsung/include/plat => mach-s3c64xx}/onenand-core.h (95%)
rename arch/arm/{plat-samsung/include/plat => mach-s3c64xx}/regs-usb-hsotg-phy.h (96%)
rename arch/arm/{plat-samsung/include/plat => mach-s3c64xx}/watchdog-reset.h (91%)
delete mode 100644 arch/arm/mach-shmobile/board-armadillo800eva.c
delete mode 100644 arch/arm/mach-shmobile/board-kzm9g.c
delete mode 100644 arch/arm/mach-shmobile/board-marzen-reference.c
delete mode 100644 arch/arm/mach-shmobile/board-marzen.c
delete mode 100644 arch/arm/mach-shmobile/clock-r8a7740.c
delete mode 100644 arch/arm/mach-shmobile/clock-r8a7779.c
delete mode 100644 arch/arm/mach-shmobile/clock-sh73a0.c
delete mode 100644 arch/arm/mach-shmobile/dma-register.h
delete mode 100644 arch/arm/mach-shmobile/include/mach/head-kzm9g.txt
delete mode 100644 arch/arm/mach-shmobile/include/mach/zboot.h
delete mode 100644 arch/arm/mach-shmobile/include/mach/zboot_macros.h
delete mode 100644 arch/arm/mach-shmobile/intc-sh73a0.c
delete mode 100644 arch/arm/mach-shmobile/pm-r8a7740.c
delete mode 100644 arch/arm/mach-shmobile/pm-sh73a0.c
delete mode 100644 arch/arm/mach-shmobile/r8a7740.h
delete mode 100644 arch/arm/mach-ux500/headsmp.S
delete mode 100644 arch/arm/plat-samsung/include/plat/keypad-core.h
^ permalink raw reply [flat|nested] 9+ messages in thread
* [GIT PULL 3/7] ARM: SoC platform updates for v4.3
2015-09-01 0:07 [GIT PULL 0/7] ARM: SoC changes for v4.3 Olof Johansson
2015-09-01 0:07 ` [GIT PULL 1/7] ARM: SoC non-urgent fixes for 4.3 Olof Johansson
2015-09-01 0:07 ` [GIT PULL 2/7] ARM: SoC cleanups for v4.3 Olof Johansson
@ 2015-09-01 0:07 ` Olof Johansson
2015-09-01 0:07 ` [GIT PULL 4/7] ARM: SoC driver " Olof Johansson
` (4 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: Olof Johansson @ 2015-09-01 0:07 UTC (permalink / raw)
To: linux-arm-kernel
New or improved SoC support:
- Addition of support for Atmel's SAMA5D2 SoC
- Addition of Freescale i.MX6UL
- Improved support of TI's DM814x platform
- Misc fixes and improvements for RockChip platforms
- Marvell MVEBU suspend/resume support
A few driver changes that ideally would belong in the drivers branch are
also here (acked by appropriate maintainers):
- Power key input driver for Freescale platforms (svns)
- RTC driver updates for Freescale platforms (svns/mxc)
- Clk fixes for TI DM814/816X
+ a bunch of other changes for various platforms
Conflicts:
arch/arm/mach-at91/sama5.c:
Change/add with cleanup branch. Keep array declaration from HEAD, add
sama5d2 entry from branch.
----------------------------------------------------------------
The following changes since commit 597e2b048c61a26437706c85e0ad4323b6df8c41:
Merge branch 'next/cleanup' into HEAD
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 1ec6f701707e4e97e451ff8b662360f1262a6c59:
Merge tag 'v4.3-rockchip32-soc3' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into next/soc
----------------------------------------------------------------
Anson Huang (1):
ARM: imx: add low-level debug support for i.mx6ul
Arun Chandran (1):
ARM: zynq: Fix earlyprintk in big endian mode
Caesar Wang (4):
ARM: rockchip: fix the CPU soft reset
ARM: rockchip: ensure CPU to enter WFI/WFE state
ARM: rockchip: fix the SMP code style
ARM: rockchip: fix broken build
Chris Zhong (2):
ARM: rockchip: add support holding 24Mhz osc during suspend
ARM: rockchip: remove some useless macro in pm.h
Dinh Nguyen (1):
ARM: socfpga: add reset for the Arria 10 platform
Doug Anderson (1):
ARM: rockchip: restore dapswjdp after suspend
Fabio Estevam (2):
ARM: imx: mach-imx6ul: Fix allmodconfig build
ARM: rockchip: pm: Fix PTR_ERR() argument
Frank Li (4):
ARM: imx: add i.mx6ul msl support
rtc: snvs: use syscon to access register
Document: dt: fsl: snvs: change support syscon
Document: devicetree: input: imx: i.mx snvs power device tree bindings
Fugang Duan (2):
ARM: imx6ul: add fec bits to GPR syscon definition
ARM: imx6ul: add fec MAC refrence clock and phy fixup init
Gregory CLEMENT (3):
ARM: mvebu: Use __init for the PM initialization functions
ARM: mvebu: Add standby support
ARM: mvebu: Warn about the wake-up sources not taken into account in suspend
Gregory Fong (2):
ARM: BCM: Enable ARM erratum 798181 for BRCMSTB
ARM: brcmstb: select ARCH_DMA_ADDR_T_64BIT for LPAE
Heiko Stuebner (3):
ARM: rockchip: rename osc_switch_to_32k variable
ARM: rockchip: set correct stabilization thresholds in suspend
ARM: rockchip: enable PMU_GPIOINT_WAKEUP_EN when entering shallow suspend
Hiraku Toyooka (1):
ARM: socfpga: add smp_ops.cpu_kill to make kexec/kdump available
Jun Nie (1):
ARM: zx: Add power domains for ZX296702
Keerthy (6):
ARM: OMAP4: PRM: Remove hardcoding of PRM_IO_PMCTRL_OFFSET register
ARM: AM43xx: Add the PRM IRQ register offsets
ARM: dts: AM4372: Add PRCM IRQ entry
ARM: OMAP: PRM: Remove hardcoding of IRQENABLE_MPU_2 and IRQSTATUS_MPU_2 register offsets
ARM: OMAP4+: PRM: Add AM437x specific data
ARM: PRM: AM437x: Enable IO wakeup feature
Krzysztof Kozlowski (1):
soc: mediatek: Drop owner assignment from platform_driver
Lokesh Vutla (1):
ARM: OMAP2+: hwmod: add support for lock and unlock hooks
Markus Elfring (1):
ARM: OMAP2: Delete an unnecessary check
Masahiro Yamada (3):
MAINTAINERS: add entries for UniPhier device trees and drivers
clk: zynq: remove redundant $(CONFIG_ARCH_ZYNQ) in Makefile
ARM: uniphier: drop v7_invalidate_l1 call at secondary entry
Matthias Brugger (2):
ARM: mediatek: Add regmap to mediatek Kconfig
soc: mediatek: Fix SCPSYS compilation
Nadav Haklai (1):
ARM: mvebu: prepare set_cpu_coherent() for future extension
Nathan Lynch (1):
ARM: zynq: reserve space for jump target in secondary trampoline
Nicolas Ferre (1):
ARM: at91/soc: add basic support for new sama5d2 SoC
Nishanth Menon (1):
ARM: DRA7: Provide proper IO map table
Olof Johansson (13):
Merge tag 'v4.3-rockchip32-soc1' of git://git.kernel.org/.../mmind/linux-rockchip into next/soc
Merge tag 'sti-soc-for-v4.3-1' of https://git.kernel.org/.../mcoquelin/sti into next/soc
Merge tag 'renesas-soc-for-v4.3' of git://git.kernel.org/.../horms/renesas into next/soc
Merge tag 'omap-for-v4.3/soc-signed' of git://git.kernel.org/.../tmlind/linux-omap into next/soc
Merge tag 'pxa-for-4.3-v2' of https://github.com/rjarzmik/linux into next/soc
Merge tag 'v4.2-next-soc' of https://github.com/mbgg/linux-mediatek into next/soc
Merge tag 'socfpga_updates_for_v4.3' of git://git.kernel.org/.../dinguyen/linux into next/soc
Merge tag 'zynq-soc-for-4.3' of https://github.com/Xilinx/linux-xlnx into next/soc
Merge tag 'mvebu-soc-4.3-1' of git://git.infradead.org/linux-mvebu into next/soc
Merge tag 'v4.3-rockchip32-soc2' of git://git.kernel.org/.../mmind/linux-rockchip into next/soc
Merge tag 'imx-soc-4.3' of git://git.kernel.org/.../shawnguo/linux into next/soc
Merge tag 'omap-for-v4.3/soc-pt2' of git://git.kernel.org/.../tmlind/linux-omap into next/soc
Merge tag 'v4.3-rockchip32-soc3' of git://git.kernel.org/.../mmind/linux-rockchip into next/soc
Paul Walmsley (1):
Merge branch 'prcm-a-for-v4.3' into hwmod-prcm-for-v4.3
Peter Griffin (2):
ARM: STi: Add code to release secondary cores from holding pen.
ARM: STi: Remove platform call to trace_hardirqs_off()
Philippe Reynes (3):
rtc: mxc: use a second rtc clock
dt-binding: document the binding for mxc rtc
rtc: mxc: add support of device tree
Rob Herring (1):
memory: kill off set_irq_flags usage
Robert Jarzmik (1):
ARM: pxa: transition to dmaengine phase 1
Robin Gong (1):
input: keyboard: imx: add snvs power key driver
Sascha Hauer (3):
soc: mediatek: Add infracfg misc driver support
dt-bindings: soc: Add documentation for the MediaTek SCPSYS unit
soc: Mediatek: Add SCPSYS power domain driver
Sekhar Nori (2):
ARM: OMAP2+: sparse: add missing static declaration
ARM: OMAP2+: sparse: add missing function declarations
Shawn Guo (2):
input: snvs_pwrkey: use "wakeup-source" as deivce tree property name
rtc: snvs: select option REGMAP_MMIO
Soren Brinkmann (1):
MAINTAINERS: Update Zynq git tree location
Stephen Rothwell (1):
clk: ti: fix for definition movement
Sudeep Holla (1):
ARM: davinci: cp_intc: use IRQCHIP_SKIP_SET_WAKE instead of irq_set_wake callback
Suman Anna (1):
ARM: OMAP2+: Remove module references from IOMMU machine layer
Thomas Betker (1):
ARM: zynq: Set bit 22 in PL310 AuxCtrl register (6395/1)
Thomas Petazzoni (3):
ARM: mvebu: do not check machine in mvebu_pm_init()
ARM: mvebu: prepare mvebu_pm_store_bootinfo() to support multiple SoCs
ARM: mvebu: prepare pm-board.c for the introduction of Armada 38x support
Tony Lindgren (11):
ARM: OMAP2+: Clean up omap4_local_timer_init
ARM: OMAP2+: Fix dm814x DT_MACHINE_START
ARM: OMAP2+: Fix scm compatible for dm814x
ARM: OMAP2+: Add minimal clockdomains for dm814x
ARM: OMAP2+: Add custom prwdm_operations for 81xx to support dm814x
ARM: OMAP2+: Add support for initializing dm814x clocks
Merge tag 'for-v4.3/omap-hwmod-prcm-a' of git://git.kernel.org/.../pjw/omap-pending into omap-for-v4.3/soc
ARM: OMAP2+: Prepare dm81xx hwmod code for adding minimal dm814x support
ARM: OMAP2: Add minimal dm814x hwmod support
Merge branch 'dm814x-soc' into omap-for-v4.3/soc
ARM: OMAP2+: Fix power domain operations regression caused by 81xx
Ulrich Hecht (2):
ARM: shmobile: Basic r8a7793 SoC support
ARM: shmobile: gose: enable R-Car Gen2 regulator quirk
Vaishali Thakkar (2):
ARM: pxa: Use module_platform_driver
ARM: pxa: Use setup_timer
Vignesh R (1):
ARM: OMAP2+: DRA7: clockdomain: change l4per2_7xx_clkdm to SW_WKUP
Documentation/arm/Atmel/README | 5 +
.../devicetree/bindings/arm/atmel-at91.txt | 2 +
.../devicetree/bindings/crypto/fsl-sec4.txt | 91 ++-
.../devicetree/bindings/input/snvs-pwrkey.txt | 1 +
.../devicetree/bindings/rtc/rtc-mxc.txt | 26 +
.../devicetree/bindings/soc/mediatek/scpsys.txt | 41 ++
MAINTAINERS | 5 +-
arch/arm/Kconfig.debug | 15 +
arch/arm/boot/dts/am4372.dtsi | 1 +
arch/arm/include/debug/at91.S | 5 +-
arch/arm/include/debug/imx-uart.h | 13 +
arch/arm/include/debug/zynq.S | 2 +-
arch/arm/mach-at91/Kconfig | 12 +
arch/arm/mach-at91/sama5.c | 3 +
arch/arm/mach-at91/soc.h | 3 +
arch/arm/mach-bcm/Kconfig | 2 +
arch/arm/mach-davinci/cp_intc.c | 12 +-
arch/arm/mach-imx/Kconfig | 8 +
arch/arm/mach-imx/Makefile | 1 +
arch/arm/mach-imx/cpu.c | 3 +
arch/arm/mach-imx/mach-imx6ul.c | 88 +++
arch/arm/mach-imx/mxc.h | 6 +
arch/arm/mach-mediatek/Kconfig | 1 +
arch/arm/mach-mvebu/coherency.c | 29 +-
arch/arm/mach-mvebu/common.h | 4 +-
arch/arm/mach-mvebu/pm-board.c | 30 +-
arch/arm/mach-mvebu/pm.c | 79 ++-
arch/arm/mach-omap2/Makefile | 3 +-
arch/arm/mach-omap2/board-generic.c | 6 +-
arch/arm/mach-omap2/clockdomain.h | 3 +-
arch/arm/mach-omap2/clockdomains7xx_data.c | 2 +-
arch/arm/mach-omap2/clockdomains81xx_data.c | 23 +-
arch/arm/mach-omap2/common.h | 1 +
arch/arm/mach-omap2/control.c | 1 +
arch/arm/mach-omap2/io.c | 70 ++-
arch/arm/mach-omap2/iomap.h | 63 ++
arch/arm/mach-omap2/omap-iommu.c | 13 +-
arch/arm/mach-omap2/omap-mpuss-lowpower.c | 2 +-
arch/arm/mach-omap2/omap3-restart.c | 1 +
arch/arm/mach-omap2/omap4-restart.c | 1 +
arch/arm/mach-omap2/omap54xx.h | 8 +
arch/arm/mach-omap2/omap_hwmod.c | 16 +-
arch/arm/mach-omap2/omap_hwmod.h | 7 +-
.../mach-omap2/omap_hwmod_2xxx_ipblock_data.c | 2 +-
arch/arm/mach-omap2/omap_hwmod_43xx_data.c | 2 +-
arch/arm/mach-omap2/omap_hwmod_81xx_data.c | 571 ++++++++++++-------
arch/arm/mach-omap2/pdata-quirks.c | 6 +-
arch/arm/mach-omap2/powerdomains3xxx_data.c | 126 +++-
arch/arm/mach-omap2/prcm-common.h | 8 +
arch/arm/mach-omap2/prcm43xx.h | 7 +
arch/arm/mach-omap2/prm44xx.c | 61 +-
arch/arm/mach-omap2/prm_common.c | 1 +
arch/arm/mach-omap2/timer.c | 18 +-
arch/arm/mach-pxa/devices.c | 37 ++
arch/arm/mach-pxa/pxa25x.c | 1 +
arch/arm/mach-pxa/pxa27x.c | 1 +
arch/arm/mach-pxa/pxa3xx.c | 1 +
arch/arm/mach-pxa/sharpsl_pm.c | 6 +-
arch/arm/mach-pxa/tosa-bt.c | 15 +-
arch/arm/mach-rockchip/platsmp.c | 56 +-
arch/arm/mach-rockchip/pm.c | 78 ++-
arch/arm/mach-rockchip/pm.h | 12 +-
arch/arm/mach-shmobile/Kconfig | 5 +
arch/arm/mach-shmobile/Makefile | 2 +
.../mach-shmobile/regulator-quirk-rcar-gen2.c | 3 +-
arch/arm/mach-shmobile/setup-r8a7793.c | 33 ++
arch/arm/mach-socfpga/core.h | 1 +
arch/arm/mach-socfpga/platsmp.c | 13 +
arch/arm/mach-socfpga/socfpga.c | 26 +
arch/arm/mach-sti/headsmp.S | 1 +
arch/arm/mach-sti/platsmp.c | 57 +-
arch/arm/mach-sti/smp.h | 2 +
arch/arm/mach-uniphier/platsmp.c | 8 +-
arch/arm/mach-zx/Kconfig | 1 +
arch/arm/mach-zx/Makefile | 2 +-
arch/arm/mach-zx/zx296702-pm-domain.c | 202 +++++++
arch/arm/mach-zynq/common.c | 4 +-
arch/arm/mach-zynq/headsmp.S | 2 +-
arch/arm/plat-pxa/dma.c | 22 +-
arch/arm/plat-pxa/include/plat/dma.h | 15 +
drivers/clk/ti/Makefile | 2 +-
drivers/clk/ti/clk-814x.c | 33 ++
drivers/clk/ti/clk-816x.c | 2 +-
drivers/clk/zynq/Makefile | 2 +-
drivers/input/keyboard/Kconfig | 11 +
drivers/input/keyboard/Makefile | 1 +
drivers/input/keyboard/snvs_pwrkey.c | 227 ++++++++
drivers/memory/omap-gpmc.c | 5 +-
drivers/rtc/Kconfig | 1 +
drivers/rtc/rtc-mxc.c | 60 +-
drivers/rtc/rtc-snvs.c | 132 ++---
drivers/soc/mediatek/Kconfig | 19 +
drivers/soc/mediatek/Makefile | 2 +
drivers/soc/mediatek/mtk-infracfg.c | 91 +++
drivers/soc/mediatek/mtk-pmic-wrap.c | 1 -
drivers/soc/mediatek/mtk-scpsys.c | 488 ++++++++++++++++
include/dt-bindings/power/mt8173-power.h | 15 +
include/linux/clk/ti.h | 3 +-
include/linux/mfd/syscon/imx6q-iomuxc-gpr.h | 8 +
include/linux/soc/mediatek/infracfg.h | 26 +
100 files changed, 2728 insertions(+), 517 deletions(-)
create mode 100644 Documentation/devicetree/bindings/input/snvs-pwrkey.txt
create mode 100644 Documentation/devicetree/bindings/rtc/rtc-mxc.txt
create mode 100644 Documentation/devicetree/bindings/soc/mediatek/scpsys.txt
create mode 100644 arch/arm/mach-imx/mach-imx6ul.c
create mode 100644 arch/arm/mach-shmobile/setup-r8a7793.c
create mode 100644 arch/arm/mach-zx/zx296702-pm-domain.c
create mode 100644 drivers/clk/ti/clk-814x.c
create mode 100644 drivers/input/keyboard/snvs_pwrkey.c
create mode 100644 drivers/soc/mediatek/mtk-infracfg.c
create mode 100644 drivers/soc/mediatek/mtk-scpsys.c
create mode 100644 include/dt-bindings/power/mt8173-power.h
create mode 100644 include/linux/soc/mediatek/infracfg.h
^ permalink raw reply [flat|nested] 9+ messages in thread
* [GIT PULL 4/7] ARM: SoC driver updates for v4.3
2015-09-01 0:07 [GIT PULL 0/7] ARM: SoC changes for v4.3 Olof Johansson
` (2 preceding siblings ...)
2015-09-01 0:07 ` [GIT PULL 3/7] ARM: SoC platform updates " Olof Johansson
@ 2015-09-01 0:07 ` Olof Johansson
2015-09-01 0:07 ` [GIT PULL 5/7] ARM: DT " Olof Johansson
` (3 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: Olof Johansson @ 2015-09-01 0:07 UTC (permalink / raw)
To: linux-arm-kernel
Some releases this branch is nearly empty, others we have more stuff. It
tends to gather drivers that need SoC modification or dependencies such
that they have to (also) go in through our tree.
For this release, we have merged in part of the reset controller tree
(with handshake that the parts we have merged in will remain stable),
as well as dependencies on a few clock branches.
In general, new items here are:
- Qualcomm driver for SMM/SMD, which is how they communicate with the
coprocessors on (some) of their platforms
- Memory controller work for ARM's PL172 memory controller
- Reset drivers for various platforms
- PMU power domain support for Marvell platforms
- Tegra support for T132/T210 SoCs: PMC, fuse, memory controller per-SoC support
----------------------------------------------------------------
The following changes since commit 995140c8ab9423d63f23f106815550801c93e599:
Merge branch 'next/soc' into HEAD
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 21815b9a24c6e6d3488703609561bd2892d3d9f3:
Merge tag 'tegra-for-4.3-memory' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into next/drivers
----------------------------------------------------------------
Alban Bedel (3):
devicetree: Add bindings for the ATH79 reset controller
reset: Add a driver for the reset controller on the AR71XX/AR9XXX
MIPS: ath79: Add the reset controller to the AR9132 dtsi
Bjorn Andersson (5):
soc: qcom: Add Shared Memory Manager driver
soc: qcom: Add device tree binding for Shared Memory Device
soc: qcom: Add Shared Memory Driver
soc: qcom: Driver for the Qualcomm RPM over SMD
devicetree: soc: Add Qualcomm SMD based RPM DT binding
Dinh Nguyen (1):
reset: socfpga: Update reset-socfpga to read the altr,modrst-offset property
Fabian Frederick (1):
reset: sti: constify of_device_id array
Geert Uytterhoeven (5):
clk: shmobile: Add CPG/MSTP Clock Domain support
clk: shmobile: r8a7778: Add CPG/MSTP Clock Domain support
clk: shmobile: r8a7779: Add CPG/MSTP Clock Domain support
clk: shmobile: rcar-gen2: Add CPG/MSTP Clock Domain support
clk: shmobile: rz: Add CPG/MSTP Clock Domain support
Joachim Eastwood (5):
memory: add ARM PL172 MultiPort Memory Controller driver
doc: dt: add documentation for pl172 memory bindings
memory: pl172: fix modular build
reset: add driver for lpc18xx rgu
doc: dt: add documentation for lpc1850-rgu reset driver
Lina Iyer (1):
drivers: qcom: Select QCOM_SCM unconditionally for QCOM_PM
Masahiro Yamada (1):
soc: tegra: Remove redundant $(CONFIG_ARCH_TEGRA) in Makefile
Moritz Fischer (2):
docs: dts: Added documentation for Xilinx Zynq Reset Controller bindings.
reset: reset-zynq: Adding support for Xilinx Zynq reset controller.
Olof Johansson (7):
Merge tag 'mvebu-soc-4.3-2' of git://git.infradead.org/linux-mvebu into next/drivers
Merge tag 'qcom-soc-for-4.3' of git://codeaurora.org/quic/kernel/agross-msm into next/drivers
Merge tag 'renesas-clk-for-v4.3' of git://git.kernel.org/.../horms/renesas into next/drivers
Merge tag 'reset-for-4.3' of git://git.pengutronix.de/git/pza/linux into next/drivers
Merge tag 'tegra-for-4.3-soc' of git://git.kernel.org/.../tegra/linux into next/drivers
Merge tag 'tegra-for-4.3-cpufreq' of git://git.kernel.org/.../tegra/linux into next/drivers
Merge tag 'tegra-for-4.3-memory' of git://git.kernel.org/.../tegra/linux into next/drivers
Paul Walmsley (1):
memory: tegra: Add support for a variable-size client ID bitfield
Philipp Zabel (3):
MAINTAINERS: add include/dt-bindings/reset path to reset controller entry
ARM: STi: DT: Move reset controller constants into common location
Merge branch 'reset/ath79' into reset/next
Russell King (1):
ARM: dove: create a proper PMU driver for power domains, PMU IRQs and resets
Thierry Reding (17):
soc/tegra: Add Tegra132 support
soc/tegra: Add Tegra210 support
memory: tegra: Expose supported rates via debugfs
soc/tegra: pmc: Avoid usage of uninitialized variable
soc/tegra: pmc: Restrict legacy code to 32-bit ARM
soc/tegra: pmc: Add Tegra210 support
soc/tegra: fuse: Restrict legacy code to 32-bit ARM
soc/tegra: fuse: Unify Tegra20 and Tegra30 drivers
soc/tegra: fuse: Add Tegra210 support
soc/tegra: fuse: Rename core_* to soc_*
soc/tegra: fuse: Add spare bit offset for Tegra114
soc/tegra: fuse: Add spare bit offset for Tegra124
soc/tegra: fuse: Add spare bit offset for Tegra210
memory: tegra: Add Tegra210 support
soc/tegra: pmc: Remove unnecessary return statement
soc/tegra: pmc: Use existing pclk reference
ARM: tegra: Disable cpuidle if PSCI is available
Tomeu Vizoso (1):
ARM: tegra: cpuidle: implement cpuidle_state.enter_freeze()
Tuomas Tynkkynen (3):
cpufreq: tegra124: Add device tree bindings
cpufreq: tegra: Rename tegra-cpufreq to tegra20-cpufreq
cpufreq: Add cpufreq driver for Tegra124
.../clock/renesas,r8a7778-cpg-clocks.txt | 29 +-
.../clock/renesas,r8a7779-cpg-clocks.txt | 30 +-
.../clock/renesas,rcar-gen2-cpg-clocks.txt | 26 +-
.../bindings/clock/renesas,rz-cpg-clocks.txt | 29 +-
.../bindings/cpufreq/tegra124-cpufreq.txt | 44 +
.../bindings/memory-controllers/arm,pl172.txt | 125 ++
.../devicetree/bindings/reset/ath79-reset.txt | 20 +
.../bindings/reset/nxp,lpc1850-rgu.txt | 84 ++
.../bindings/reset/st,sti-picophyreset.txt | 2 +-
.../bindings/reset/st,sti-powerdown.txt | 4 +-
.../bindings/reset/st,sti-softreset.txt | 4 +-
.../devicetree/bindings/reset/zynq-reset.txt | 68 +
.../devicetree/bindings/soc/qcom,smd-rpm.txt | 117 ++
.../devicetree/bindings/soc/qcom/qcom,smd.txt | 79 ++
MAINTAINERS | 1 +
arch/arm/boot/dts/stih407-family.dtsi | 2 +-
arch/arm/boot/dts/stih415.dtsi | 2 +-
arch/arm/boot/dts/stih416.dtsi | 2 +-
arch/arm/mach-mvebu/Kconfig | 1 +
arch/arm/mach-mvebu/dove.c | 2 +
arch/arm/mach-shmobile/Kconfig | 2 +
arch/arm/mach-tegra/cpuidle-tegra114.c | 19 +-
arch/arm/mach-tegra/iomap.h | 3 -
arch/mips/Kconfig | 1 +
arch/mips/boot/dts/qca/ar9132.dtsi | 8 +
drivers/clk/shmobile/clk-mstp.c | 87 ++
drivers/clk/shmobile/clk-r8a7778.c | 2 +
drivers/clk/shmobile/clk-r8a7779.c | 2 +
drivers/clk/shmobile/clk-rcar-gen2.c | 2 +
drivers/clk/shmobile/clk-rz.c | 3 +
drivers/cpufreq/Kconfig.arm | 13 +-
drivers/cpufreq/Makefile | 3 +-
drivers/cpufreq/tegra124-cpufreq.c | 214 +++
.../{tegra-cpufreq.c => tegra20-cpufreq.c} | 0
drivers/iommu/Kconfig | 2 +-
drivers/memory/Kconfig | 8 +
drivers/memory/Makefile | 1 +
drivers/memory/pl172.c | 301 ++++
drivers/memory/tegra/Makefile | 1 +
drivers/memory/tegra/mc.c | 8 +-
drivers/memory/tegra/mc.h | 4 +
drivers/memory/tegra/tegra114.c | 1 +
drivers/memory/tegra/tegra124-emc.c | 42 +-
drivers/memory/tegra/tegra124.c | 2 +
drivers/memory/tegra/tegra210.c | 1080 ++++++++++++++
drivers/memory/tegra/tegra30.c | 1 +
drivers/reset/Makefile | 3 +
drivers/reset/reset-ath79.c | 128 ++
drivers/reset/reset-lpc18xx.c | 258 ++++
drivers/reset/reset-socfpga.c | 19 +-
drivers/reset/reset-zynq.c | 155 ++
drivers/reset/sti/reset-stih407.c | 4 +-
drivers/reset/sti/reset-stih415.c | 4 +-
drivers/reset/sti/reset-stih416.c | 4 +-
drivers/soc/Makefile | 1 +
drivers/soc/dove/Makefile | 1 +
drivers/soc/dove/pmu.c | 412 ++++++
drivers/soc/qcom/Kconfig | 31 +
drivers/soc/qcom/Makefile | 3 +
drivers/soc/qcom/smd-rpm.c | 244 ++++
drivers/soc/qcom/smd.c | 1319 ++++++++++++++++++
drivers/soc/qcom/smem.c | 775 ++++++++++
drivers/soc/tegra/Makefile | 6 +-
drivers/soc/tegra/common.c | 2 +
drivers/soc/tegra/fuse/Makefile | 2 +
drivers/soc/tegra/fuse/fuse-tegra.c | 257 +++-
drivers/soc/tegra/fuse/fuse-tegra20.c | 175 +--
drivers/soc/tegra/fuse/fuse-tegra30.c | 232 ++-
drivers/soc/tegra/fuse/fuse.h | 95 +-
drivers/soc/tegra/fuse/speedo-tegra114.c | 22 +-
drivers/soc/tegra/fuse/speedo-tegra124.c | 26 +-
drivers/soc/tegra/fuse/speedo-tegra20.c | 28 +-
drivers/soc/tegra/fuse/speedo-tegra210.c | 184 +++
drivers/soc/tegra/fuse/speedo-tegra30.c | 48 +-
drivers/soc/tegra/fuse/tegra-apbmisc.c | 76 +-
drivers/soc/tegra/pmc.c | 125 +-
include/dt-bindings/memory/tegra210-mc.h | 36 +
.../stih407-resets.h | 0
.../stih415-resets.h | 0
.../stih416-resets.h | 0
include/linux/clk/shmobile.h | 12 +
include/linux/soc/dove/pmu.h | 6 +
include/linux/soc/qcom/smd-rpm.h | 35 +
include/linux/soc/qcom/smd.h | 46 +
include/linux/soc/qcom/smem.h | 11 +
include/soc/tegra/fuse.h | 6 +-
include/soc/tegra/mc.h | 2 +
include/soc/tegra/pmc.h | 5 +
88 files changed, 6781 insertions(+), 498 deletions(-)
create mode 100644 Documentation/devicetree/bindings/cpufreq/tegra124-cpufreq.txt
create mode 100644 Documentation/devicetree/bindings/memory-controllers/arm,pl172.txt
create mode 100644 Documentation/devicetree/bindings/reset/ath79-reset.txt
create mode 100644 Documentation/devicetree/bindings/reset/nxp,lpc1850-rgu.txt
create mode 100644 Documentation/devicetree/bindings/reset/zynq-reset.txt
create mode 100644 Documentation/devicetree/bindings/soc/qcom,smd-rpm.txt
create mode 100644 Documentation/devicetree/bindings/soc/qcom/qcom,smd.txt
create mode 100644 drivers/cpufreq/tegra124-cpufreq.c
rename drivers/cpufreq/{tegra-cpufreq.c => tegra20-cpufreq.c} (100%)
create mode 100644 drivers/memory/pl172.c
create mode 100644 drivers/memory/tegra/tegra210.c
create mode 100644 drivers/reset/reset-ath79.c
create mode 100644 drivers/reset/reset-lpc18xx.c
create mode 100644 drivers/reset/reset-zynq.c
create mode 100644 drivers/soc/dove/Makefile
create mode 100644 drivers/soc/dove/pmu.c
create mode 100644 drivers/soc/qcom/smd-rpm.c
create mode 100644 drivers/soc/qcom/smd.c
create mode 100644 drivers/soc/qcom/smem.c
create mode 100644 drivers/soc/tegra/fuse/speedo-tegra210.c
create mode 100644 include/dt-bindings/memory/tegra210-mc.h
rename include/dt-bindings/{reset-controller => reset}/stih407-resets.h (100%)
rename include/dt-bindings/{reset-controller => reset}/stih415-resets.h (100%)
rename include/dt-bindings/{reset-controller => reset}/stih416-resets.h (100%)
create mode 100644 include/linux/soc/dove/pmu.h
create mode 100644 include/linux/soc/qcom/smd-rpm.h
create mode 100644 include/linux/soc/qcom/smd.h
create mode 100644 include/linux/soc/qcom/smem.h
^ permalink raw reply [flat|nested] 9+ messages in thread
* [GIT PULL 5/7] ARM: DT updates for v4.3
2015-09-01 0:07 [GIT PULL 0/7] ARM: SoC changes for v4.3 Olof Johansson
` (3 preceding siblings ...)
2015-09-01 0:07 ` [GIT PULL 4/7] ARM: SoC driver " Olof Johansson
@ 2015-09-01 0:07 ` Olof Johansson
2015-09-01 0:07 ` [GIT PULL 6/7] ARM: SoC defconfig " Olof Johansson
` (2 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: Olof Johansson @ 2015-09-01 0:07 UTC (permalink / raw)
To: linux-arm-kernel
Ladies and gentlemen, we proudly announce to you the latest branch of ARM
device tree contents for the mainline kernel. Come and see, come and see!
No less than twentythree thousand lines of additions! Just imagine the
joy you will have of using your mainline kernel on newly supported
hardware such as Rockchip Chromebooks, Freescale i.MX6UL boards or
UniPhier hardware!
For those of you feeling less adventurous, added hardware support on
platforms such as TI DM814x and Gumstix Overo platforms might be more
of your liking.
We've got something for everyone here!
Ahem. Cough. So, anyway...
This is the usual large batch of DT updates. Lots and lots of smaller
changes, some of the larger ones to point out are:
- Rockchip veyron (Chromebook) support, as well as several other new boards
- DRM support on Atmel AT91SAM9N12EK
- USB additions on some Allwinner platforms
- Freescale i.MX6UL support
- Cleanups for Renesas shmobile platforms
- Lots of added devices on LPC18xx
- Lots of added devices and boards on UniPhier
There's also some dependent code added here, in particular some branches
that are primarily merged through the clock tree.
Conflicts:
arch/arm/boot/dts/imx6qdl-gw5*xx.dtsi:
Change/add conflict with DT fix merged through MMC tree.
Keep the GPIO piece from HEAD, pinctrl pieces from branch.
----------------------------------------------------------------
The following changes since commit df782b553c2914d98f86b1a54eb51fcb7c208a4d:
Merge branch 'next/drivers' into HEAD
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 4c80a00388dd7b9d9e7ebf31e62b96c7b74178b8:
Merge tag 'v4.3-rockchip32-dts3' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into next/dt
----------------------------------------------------------------
Adam YH Lee (2):
ARM: dts: overo: Enable McBSP2 for all Overo COMs
ARM: dts: overo: Add device tree for Palo35 board
Alex Wilson (1):
ARM: zynq: DT: Add missing interrupt for L2 pl310
Alexandre Belloni (17):
ARM: at91/dt: sama5d4: fix external trigger property
ARM: at91/dt: sama5d4: move ADC pinctrl to board device trees
Documentation: dt: atmel-at91: add clocks to system timer, rstc and shdwc
Documentation: watchdog: at91sam9_wdt: add clocks property
Documentation: dt: rtc: at91rm9200: add clocks property
ARM: at91/dt: at91rm9200: use slow clock where necessary
ARM: at91/dt: at91sam9260: use slow clock where necessary
ARM: at91/dt: at91sam9261: use slow clock where necessary
ARM: at91/dt: at91sam9263: use slow clock where necessary
ARM: at91/dt: at91sam9g45: use slow clock where necessary
ARM: at91/dt: at91sam9n12: use slow clock where necessary
ARM: at91/dt: at91sam9rl: use slow clock where necessary
ARM: at91/dt: at91sam9x5: use slow clock where necessary
ARM: at91/dt: sama5d3: use slow clock where necessary
ARM: at91/dt: sama5d4: use slow clock where necessary
ARM: at91/dt: at91sam9x5dm: add support for the touschscreen
ARM: at91/dt: sama5d2: use slow clock where necessary
Alexandre Courbot (2):
ARM: tegra: Add IOMMU node to GK20A
ARM: tegra: jetson-tk1: Add GK20A GPU DT node
Alexandru M Stan (3):
ARM: dts: rockchip: add shared rk3288-veyron files
ARM: dts: rockchip: add veyron-jerry board
ARM: dts: rockchip: add veyron-minnie board
Alison Wang (1):
ARM: dts: ls1021a: Add dts nodes for audio on LS1021A
Anand Moon (5):
ARM: dts: Enable USB3 regulators for exynos5422-odroidxu3
ARM: dts: Add pwm-fan node for exynos5422-odroidxu3
ARM: dts: Enable TMU for exynos5422-odroidxu3
ARM: dts: Define default thermal-zones for exynos5422
ARM: dts: Enable thermal-zones for exynos5422-odroidxu3
Andreas Faerber (1):
ARM: dts: Clean up indentation for exynos5410-smdk5410
Andy Sun (1):
ARM: dts: atlas7: add a GPIO key for rearview button
Anson Huang (4):
ARM: dts: imx6sx: correct property name for wakeup source
ARM: dts: imx6ul: enable GPC as extended interrupt controller
ARM: dts: imx6ul: add RTC support
ARM: dts: imx6ul: add snvs power key support
Anthoine Bourgeois (7):
ARM: dts: omap3-devkit8000: Add user button support
ARM: dts: omap3-devkit8000: Add PMU stat support
ARM: dts: omap3-devkit8000: Add keymap support
ARM: dts: omap3-devkit8000: Add S-video output support
ARM: dts: omap3-devkit8000: Add DSS' DVI support
ARM: dts: omap3-devkit8000: add LCD panels
ARM: dts: omap3-devkit8000: Add ADS7846 Touchscreen support
Aparna Balasubramanian (1):
ARM: dts: omap5-uevm: Add Palmas power button support
Ariel D'Alessandro (2):
ARM: dts: lpc4350-hitex-eval: add pinctrl and uart0 muxing
ARM: dts: lpc4350-hitex-eval: add ethernet
Ash Charles (2):
ARM: dts: Add DTS for Gumstix TobiDuo expansion board
ARM: dts: overo: Support PoP NAND
Balaji T K (1):
ARM: dts: dra7-evm: add evm_3v3_sd regulator
Baruch Siach (2):
ARM: digicolor: enable watchdog device
ARM: digicolor: dts: use stdout-path for console configuration
Benjamin Cama (1):
ARM: dts: Convert Linkstation Mini to Device Tree
Bjorn Andersson (3):
ARM: dts: qcom: Replace gpio node with pinctrl node
ARM: dts: msm8974: Add tcsr mutex node
ARM: dts: msm8974: Add smem reservation and node
Bo Shen (1):
ARM: at91/dt: add drm support for at91sam9n12ek
Boris Brezillon (5):
Documentation: dt: atmel-at91: add slow clock to tcb
ARM: at91/dt: define hlcdc node in at91sam9x5_lcd.dtsi
ARM: at91/dt: include lcd dtsi in at91sam9x5 dtsis
ARM: at91/dt: add at91sam9x5-ek Display Module dtsi
ARM: at91/dt: enable lcd support for at91sam9x5 SoCs
Brian Norris (2):
ARM: dts: rockchip: correct regulator PM properties
ARM: dts: rockchip: correct regulator power states for suspend
Chen-Yu Tsai (4):
ARM: dts: sun8i: Add support for USB controllers on A23/A33
ARM: dts: sun8i: sina33: Enable USB hosts
ARM: dts: sun5i: hsg-h702: Enable side volume buttons with LRADC
ARM: dts: sun5i: hsg-h702: Enable USB OTG controller
Chris Zhong (1):
ARM: dts: Add sbs-battery dts fragment used by chromebooks
Claudiu Manoil (2):
ARM: dts: ls1021a: Add the eTSEC controller nodes
ARM: dts: ls1021a: Enable the eTSEC ports on QDS and TWR
Cory Tusar (4):
ARM: dts: vf610: Extend I2C support to all available buses.
ARM: dts: vf610: Add missing QuadSPI register mapping and names.
ARM: dts: vfxxx: Include support for qspi1 functionality.
ARM: dts: vfxxx: Include support for esdhc0 functionality.
Dalon Westergreen (1):
ARM: dts: socfpga: Add support of Terasic DE0 Atlas board
Daniel Thompson (1):
ARM: dts: stm32f429: Adopt STM32F4 clock driver
Dave Gerlach (3):
ARM: OMAP2+: Use pdata-quirks for wkup_m3 reset management
ARM: dts: am43xx: Introduce MUX_MODE9 for pinctrl
ARM: dts: am437x-gp-evm: Add regulator-always-on and regulator-boot-on for RTC DCDCs
Dinh Nguyen (8):
ARM: dts: socfpga: enable the data and instruction prefetch for the l2 cache
ARM: dts: socfpga: use stdout-path for chosen node
ARM: socfpga: dts: Correct the parent clock for l3_sp_clk and dbg_clk
ARM: socfpga: dts: Fix gpio dts entry for the correct clock
ARM: socfpga: dts: add osc1 as a possible parent for dbg_base_clk
dt-bindings: Add reset manager offsets for Arria10
ARM: socfpga: dts: add "altr,modrst-offset" property
ARM: socfpga: dts: Add resets for EMACs on Arria10
Dongli Li (1):
ARM: dts: atlas7: add lost G2D node
Eric Anholt (2):
ARM: bcm2835: Add the firmware driver information to the RPi DT
dt/bindings: Add binding for the Raspberry Pi firmware driver
Ezequiel Garcia (2):
of: add vendor prefix for CIAA project
ARM: dts: add DT for CIAA LPC4337 industrial computer
Ezra Savard (1):
ARM: zynq: DT: Add zc702 pushbuttons to DT as gpio-keys
Fabien Dessenne (1):
ARM: DT: STiH410: Add bdisp dt nodes
Fabio Estevam (8):
clk: imx: clk-imx6q: Provide initial IPU clock settings for mx6dl
ARM: dts: imx6sl-warp: Add the SD2_RESET pin
ARM: dts: imx6qdl-sabreauto: Add HDMI support
ARM: dts: imx6qdl-sabresd: Allow HDMI and LVDS to work simultaneously
ARM: dts: imx6sl-warp: Add changes for rev1.12
ARM: dts: imx6qdl-sabrelite: Allow HDMI and LVDS to work simultaneously
ARM: dts: imx6qdl-nitrogen6x: Allow HDMI and LVDS to work simultaneously
ARM: dts: imx6qdl-sabreauto: Allow HDMI and LVDS to work simultaneously
Felipe Balbi (2):
ARM: dts: am4372: Add named interrupt property for dwc3
arm: boot: dts: am4372: add ARM timers and SCU nodes
Felix Fietkau (1):
ARM: BCM5301X: Add profiling support
Frank Li (12):
clk: imx: add imx6ul clk tree support
ARM: dts: imx7d: add watch dog support
ARM: dts: imx6sx: enable snvs power key
ARM: dts: imx7d: add cortex-a7 coresight component
Document: dt: binding: imx: update document for imx6ul support
ARM: dts: add i.mx6ul pin function include file
ARM: dts: imx: add imx6ul and imx6ul evk board support
ARM: dts: imx: update snvs to use syscon access register
ARM: dts: imx6ul: add usb host and function support
ARM: dts: imx6ul: fix low case define in imx6ul-pinfunc.h
ARM: dts: imx6ul: add qspi support
ARM: dts: imx7d: enable snvs rtc, onoffkey and power off
Fugang Duan (3):
ARM: dts: omap3: correct the format of u16 values for tsc2046 node
ARM: dts: imx: add fec1 and fec2 nodes for SOC i.MX6UL
ARM: dts: imx6ul-14x14-evk: add fec1 and fec2 support
Gabriel Fernandez (1):
ARM: STi: DT: Rename st_pll3200c32_407_c0_x into st_pll3200c32_cx_x
Geert Uytterhoeven (16):
ARM: shmobile: armadillo800eva dts: Add pinctrl and gpio-hog for lcdc0
ARM: shmobile: r8a73a4 dtsi: Use "arm,gic-400" for GIC
ARM: shmobile: r8a7790 dtsi: Use "arm,gic-400" for GIC
ARM: shmobile: r8a7791 dtsi: Use "arm,gic-400" for GIC
ARM: shmobile: r8a7793 dtsi: Use "arm,gic-400" for GIC
ARM: shmobile: r8a7794 dtsi: Use "arm,gic-400" for GIC
ARM: shmobile: r8a73a4 dtsi: Add missing "gpio-ranges" to gpio node
ARM: shmobile: r8a7740 dtsi: Add missing "gpio-ranges" to gpio node
ARM: shmobile: sh73a0 dtsi: Add missing "gpio-ranges" to gpio node
ARM: shmobile: r7s72100 dtsi: Add CPG/MSTP Clock Domain
ARM: shmobile: r8a7778 dtsi: Add CPG/MSTP Clock Domain
ARM: shmobile: r8a7779 dtsi: Add CPG/MSTP Clock Domain
ARM: shmobile: r8a7790 dtsi: Add CPG/MSTP Clock Domain
ARM: shmobile: r8a7791 dtsi: Add CPG/MSTP Clock Domain
ARM: shmobile: r8a7793 dtsi: Add CPG/MSTP Clock Domain
ARM: shmobile: r8a7794 dtsi: Add CPG/MSTP Clock Domain
Grazvydas Ignotas (4):
ARM: dts: omap3-pandora: miscellaneous corrections
ARM: dts: omap3-pandora: add support for usb host and 32k buffer
ARM: OMAP2+: omap3-pandora: add backlight support
ARM: OMAP2+: omap3-pandora: add wifi support
Gregory Fong (1):
ARM: dts: brcmstb: add BCM7445 GPIO nodes
Guo Zeng (1):
ARM: dts: atlas7: add lost PWM node
Haikun Wang (1):
ARM: dts: ls1021a: Update 'dspi' device node compatible string
Hans de Goede (22):
ARM: dts: sun4i: Add USB Dual Role Controller
ARM: dts: sun5i: Add USB Dual Role Controller
ARM: dts: sun6i: Add USB Dual Role Controller
ARM: dts: sun8i: Add A23 usb-phy and otg nodes
ARM: dts: sun8i: Add A33 usb-phy and otg nodes
ARM: dts: sun4i: Enable USB DRC on Chuwi V7 CW0825
ARM: dts: sun4i: Enable USB DRC on the Cubieboard
ARM: dts: sun5i: Enable USB DRC on UTOO P66
ARM: dts: sun6i: Enable USB DRC on the Mele A1000G quad
ARM: dts: sun7i: Enable USB DRC on A20-OLinuxIno-Lime
ARM: dts: sun7i: Enable USB DRC on A20-OLinuxIno-Micro
ARM: dts: sun8i: Enable USB DRC on Ippo Q8H-A23 tablets
ARM: dts: sun8i: Enable USB DRC on GA10H-A33 tablets
ARM: dts: sun8i: Enable USB host on GA10H-A33 tablets
ARM: sun8i: dts: Add Ippo-q8h v1.2 with A33
ARM: dts: sunxi: Add regulator-boot-on to usb host port regulator nodes
ARM: dts: sun4i: Enable otg controller on the ba10-tvbox
ARM: dts: sun4i: Enable otg controller on the mini-x
ARM: dts: sun6i: Enable otg controller on the cs908
ARM: dts: sun5i: Enable USB DRC on A10s OLinuxIno Micro
ARM: dts: sun8i: Enable USB DRC on Ippo Q8H-A33 tablet
ARM: dts: sun7i: Change cubietruck wifi enable pin to use mmc-pwrseq
Hauke Mehrtens (1):
ARM: BCM5301X: activate some additional options in pl310 cache controller
Heiko Stuebner (11):
ARM: dts: rockchip: fix rk3288 watchdog irq
dt-bindings: add vendor prefix for Netxeon Technology
ARM: dts: rockchip: add Netxeon R89 board
ARM: dts: rockchip: add veyron-pinky board
ARM: dts: rockchip: add missing device_type = "memory" to boards
dt-bindings: document rk3368 R88 board from Rockchip
ARM: dts: rockchip: add rk3288 arm-pmu irq affinity
ARM: dts: rockchip: set correct dwc2 params for cortex-a9 socs
ARM: dts: rockchip: add usb phys to Cortex-A9 socs
ARM: dts: rockchip: enable usb controller on marsboard
ARM: dts: rockchip: reserve unusable memory region on rk3288
Huayi Li (1):
ARM: dts: atlas7: put pinctl property to get pinmux for NAND
James Liao (1):
ARM: dts: mediatek: Enable clock support for Mediatek MT8135.
Javier Martinez Canillas (4):
ARM: dts: Include exynos5250-pinctrl after the nodes were defined for exynos5250
ARM: dts: Extend exynos5250-pinctrl nodes using labels instead of paths
ARM: dts: Include exynos5420-pinctrl after the nodes were defined for exynos5420
ARM: dts: Extend exynos5420-pinctrl nodes using labels instead of paths
Joachim Eastwood (22):
ARM: dts: lpc18xx: add cgu and ccu clock-controller nodes
ARM: dts: lpc18xx: add uart new compat string and clk names
ARM: dts: lpc18xx: add pinctrl node
ARM: dts: lpc18xx: add gpio node
ARM: dts: lpc18xx: add ssp nodes
ARM: dts: lpc18xx: add can nodes
ARM: dts: lpc18xx: add mmcsd node
ARM: dts: lpc18xx: add creg (syscon) node
ARM: dts: lpc18xx: add ethernet node
ARM: dts: lpc18xx: add usb nodes
ARM: dts: lpc4357-ea4357: add pinctrl and uart0 muxing
ARM: dts: lpc4357-ea4357: add mmcsd
ARM: dts: lpc4357-ea4357: add gpio joystick
ARM: dts: lpc4357-ea4357: add ethernet
ARM: dts: lpc4357-ea4357: add uart3
ARM: dts: lpc18xx: add usb otg phy node
ARM: dts: lpc18xx: add pl111 lcd controller node
ARM: dts: lpc18xx: add pl172 memory-controller node
ARM: dts: lpc4357-ea4357: add usb0
ARM: dts: lpc4357-ea4357: add emc pins and static memory devices
ARM: dts: lpc4357-ea4357: add mmio-gpio leds
ARM: dts: lpc4350-hitex-eval: add emc pins and static memory devices
Josef Gajdusek (1):
ARM: dts: sun4i: Add Iteaduino Plus A10
Josh Wu (2):
ARM: at91/dt: add isi & ov2640 dt nodes for at91sam9m10g45ek board
ARM: at91/dt: sama5: update rstc to correct compatible string
Jyri Sarha (1):
ARM: dts: am335x-boneblack: Use new binding for HDMI
Karsten Merker (1):
devicetree: Add msi to the vendor-prefix list
Keerthy (4):
ARM: dts: AM437X: add dpll_clksel_mac_clk node
ARM: dts: am4372: Set the default clock rate for dpll_clksel_mac_clk clock
ARM: dts: AM4372: Reorder the rtc compatible string
ARM: dts: AM4372: Add the am4372-rtc compatible string
Kishon Vijay Abraham I (5):
ARM: dts: dra72-evm: add evm_3v3_sd regulator
ARM: dts: dra72-evm: Set max clock frequency of MMC1 and MMC2
ARM: dts: am57xx-beagle-x15: mmc1: remove redundant pbias-supply property
ARM: dts: dra7-evm: Fix spurious card insert/removal interrupt
ARM: dts: dra72-evm: Fix spurious card insert/removal interrupt
Krzysztof Kozlowski (2):
ARM: dts: Set max17047 over heat and voltage thresholds for exynos4412-trats2
ARM: dts: Use labels for overriding nodes for exynos4210-universal_c210
Kuninori Morimoto (6):
ARM: shmobile: lager: add sound label on DTS
ARM: shmobile: koelsch: add sound label on DTS
ARM: shmobile: r8a7790: Add Audio CTU support on DTSI
ARM: shmobile: r8a7790: Add Audio MIX support on DTSI
ARM: shmobile: r8a7791: Add Audio CTU support on DTSI
ARM: shmobile: r8a7791: Add Audio MIX support on DTSI
Kyle Huey (1):
ARM: tegra: Add Tegra124 PMU support
Laurent Pinchart (1):
ARM: shmobile: lager: Fix adv7511 IRQ sensing
Lee Jones (2):
ARM: STi: STiH407: Move PWM nodes STiH407 => STiH407-family
ARM: STi: STiH407: Add PWM Regulator node
Lily.Li (1):
ARM: dts: atlas7: add lost jpeg node
Lucas Stach (1):
ARM: dts: imx53-qsb: select open-drain mode for i2c1 pads
Ludovic Desroches (1):
ARM: at91/dt: add basic dtsi for sama5d2 SoC
Magnus Damm (1):
ARM: shmobile: r8a7779: Configure IRLM mode via DT
Mark Janssen (1):
ARM: dts: sun5i: Enable USB DRC on A13 OLinuxIno
Mars Cheng (2):
Document: DT: Add bindings for mediatek MT6580 SoC Platform
ARM: dts: mediatek: add mt6580 basic support
Masahiro Yamada (9):
ARM: dts: UniPhier: add on-chip UART device nodes
ARM: dts: UniPhier: add USB EHCI device nodes
ARM: dts: UniPhier: add pinctrl device nodes
ARM: dts: UniPhier: add UART and USB pinmux nodes
ARM: dts: uniphier: add I2C controller device nodes
ARM: dts: uniphier: add PH1-Pro5 SoC support
ARM: dts: uniphier: add ProXstream2 and PH1-LD6b SoC/board support
ARM: dts: UniPhier: add reference daughter board
ARM: dts: UniPhier: fix PPI interrupt CPU mask of timer nodes
Matthew Gerlach (1):
ARM: socfpga: dts: add missing clock gates to socfpga.dtsi
Maxime Coquelin (2):
ARM: dts: Add STM32429i-EVAL board support
ARM: dts: Use stdout-path in STM32F429 Discovery board
Maxime Ripard (1):
ARM: sunxi: dt: Convert users to the PIO interrupts binding
Michal Simek (1):
ARM: dts: zynq: Add OCM node
Michal Suchanek (2):
ARM: dts: axp152: Add a dtsi file for the axp152 pmic
ARM: dts: A10s-OLinuxIno: Add a node for axp152 pmic
Mikhail Ulyanov (2):
ARM: shmobile: r8a7790: Add JPU device node.
ARM: shmobile: r8a7791: Add JPU device node.
Mikko Perttunen (2):
clk: tegra: Introduce ability for SoC-specific reset control callbacks
ARM: tegra: Add CPU regulator to the Jetson TK1 device tree
Moritz Fischer (1):
ARM: dts: zynq: Add devicetree entry for Xilinx Zynq reset controller.
Nicolas Chauvet (1):
ARM: tegra: Fix AHB base address on Tegra20, Tegra30 and Tegra114
Nicolas Ferre (2):
ARM: at91/dt: add minimal sama5d2 Xplained board
ARM: at91/dt: at91sam9x5dm: add QT1070 touch button controller
Nishanth Menon (2):
pinctrl: dra: dt-bindings: Add virtual mode configuration option
ARM: dts: dra7-evm: Add MMCSD card removal GPIO
Olof Johansson (33):
Merge tag 'renesas-dt-for-v4.3' of git://git.kernel.org/.../horms/renesas into next/dt
Merge tag 'omap-for-v4.3/dt-pt1' of git://git.kernel.org/.../tmlind/linux-omap into next/dt
Merge branch 'lpc18xx_43xx_dts_4.3' of https://github.com/manabian/linux-lpc into next/dt
Merge tag 'mvebu-dt-4.3-1' of git://git.infradead.org/linux-mvebu into next/dt
Merge tag 'arm-soc/for-4.3/dts' of http://github.com/broadcom/stblinux into next/dt
Merge tag 'v4.3-rockchip32-dts1' of git://git.kernel.org/.../mmind/linux-rockchip into next/dt
Merge tag 'tags/pxa-dt-4.3' of https://github.com/rjarzmik/linux into next/dt
Merge tag 'omap-for-v4.3/dt-pt2' of git://git.kernel.org/.../tmlind/linux-omap into next/dt
Merge tag 'sti-dt-for-v4.3-1' of https://git.kernel.org/.../mcoquelin/sti into next/dt
Merge tag 'stm32-dt-for-v4.3-1b' of https://git.kernel.org/.../mcoquelin/stm32 into next/dt
Merge tag 'renesas-dt2-for-v4.3' of git://git.kernel.org/.../horms/renesas into next/dt
Merge tag 'omap-for-v4.3/dt-dm814x' of git://git.kernel.org/.../tmlind/linux-omap into next/dt
Merge tag 'v4.2-next-dts' of https://github.com/mbgg/linux-mediatek into next/dt
Merge tag 'socfpga_dts_for_v4.3' of git://git.kernel.org/.../dinguyen/linux into next/dt
Merge tag 'at91-dt' of git://git.kernel.org/.../nferre/linux-at91 into next/dt
Merge tag 'qcom-dt-for-4.3' of git://codeaurora.org/quic/kernel/agross-msm into next/dt
Merge tag 'zynq-dt-for-4.3' of https://github.com/Xilinx/linux-xlnx into next/dt
Merge tag 'mvebu-dt-4.3-2' of git://git.infradead.org/linux-mvebu into next/dt
Merge tag 'sunxi-dt-for-4.3' of https://git.kernel.org/.../mripard/linux into next/dt
Merge tag 'samsung-dt-1' of git://git.kernel.org/.../kgene/linux-samsung into next/dt
Merge tag 'sirf-dts-for-4.3' of git://git.kernel.org/.../baohua/linux into next/dt
Merge tag 'omap-for-v4.3/dt-pt3' of git://git.kernel.org/.../tmlind/linux-omap into next/dt
Merge tag 'renesas-dt3-for-v4.3' of git://git.kernel.org/.../horms/renesas into next/dt
Merge tag 'at91-ab-dt2' of git://git.kernel.org/.../abelloni/linux into next/dt
Merge tag 'mvebu-dt-4.3-3' of git://git.infradead.org/linux-mvebu into next/dt
Merge tag 'v4.3-rockchip32-dts2' of git://git.kernel.org/.../mmind/linux-rockchip into next/dt
Merge tag 'socfpga_dts_for_v4.3_part_2' of git://git.kernel.org/.../dinguyen/linux into next/dt
Merge tag 'rpi-dt-for-armsoc-4.3' of git://git.kernel.org/.../rpi/linux-rpi into next/dt
Merge tag 'imx-dt-4.3' of git://git.kernel.org/.../shawnguo/linux into next/dt
Merge tag 'renesas-dt4-for-v4.3' of git://git.kernel.org/.../horms/renesas into next/dt
Merge tag 'omap-for-v4.3/dt-pt4-v2' of git://git.kernel.org/.../tmlind/linux-omap into next/dt
Merge tag 'tegra-for-4.3-dt' of git://git.kernel.org/.../tegra/linux into next/dt
Merge tag 'v4.3-rockchip32-dts3' of git://git.kernel.org/.../mmind/linux-rockchip into next/dt
Paul Walmsley (1):
clk: tegra: Add DFLL DVCO reset control for Tegra124
Peter Chen (1):
ARM: imx6qdl-sabreauto.dtsi: enable USB support
Peter Griffin (11):
ARM: STi: DT: Add STiH407 family tsin0 pinctrl configuration
ARM: STi: DT: Add STiH407 family tsin1 pinctrl configuration
ARM: STi: DT: Add STiH407 family tsin2 pinctrl configuration
ARM: STi: DT: Add STiH407 family tsin3 pinctrl configuration
ARM: STi: DT: Add STiH407 family tsin4 pinctrl configuration
ARM: STi: DT: Add STiH407 family tsin5 pinctrl configuration
ARM: STi: DT: Add STiH407 family tsout0 pinctrl configuration
ARM: STi: DT: Add STiH407 family tsout1 pinctrl configuration
ARM: STi: DT: Add STiH407 family mtsin0 pinctrl configuration
ARM: STi: DT: STiH407: Add cpu-release-addr dt property.
ARM: STi: DT: STiH418: Add cpu-release-addr dt property.
Peter Seiderer (2):
ARM: dts: nitrogen6x: add CAN support
ARM: dts: sabrelite: add CAN support
Peter Ujfalusi (21):
ARM: dts: dra7x: Integrate sDMA crossbar
ARM: omap2plus_defconfig: Enable audio related config options
ARM: dts: am437x-sk-evm: Add sleep pin settings for mcasp1
ARM: dts: am437x-sk-evm: Switch using simple-audio-card for audio support
ARM: dts: am43xx-epos-evm: Add gpio-hog for configuring the display/audio mux
ARM: dts: am43xx-epos-evm: Add regulator for VBAT and DCDC4 of tps65218
ARM: dts: am43xx-epos-evm: McASP1 node for audio support
ARM: dts: am43xx-epos-evm: Add node for tlv320aic3111 audio codec
ARM: dts: am43xx-epos-evm: Enable analog audio via simple-card
ARM: dts: am437x-gp-evm: Add gpio-hog for configuring the display/audio mux
ARM: dts: am437x-gp-evm: Rename fixed regulator vmmcsd_fixed to evm_v3_3d
ARM: dts: am437x-gp-evm: Add node for tlv320aic3106 audio codec
ARM: dts: am437x-gp-evm: McASP1 node for audio support
ARM: dts: am437x-gp-evm: Enable analog audio via simple-card
ARM: dts: am335x-evmsk: Fix mcasp1 node's indentation
ARM: dts: am335x-evmsk: Add sleep pin settings for mcasp1
ARM: dts: am335x-evmsk: Switch using simple-audio-card for audio support
ARM: dts: am335x-evm: Fix mcasp1 node's indentation
ARM: dts: am335x-evm: Rename pinctrl section for McASP1
ARM: dts: am335x-evm: Add sleep pin settings for mcasp1
ARM: dts: am335x-evm: Switch using simple-audio-card for audio support
Philippe Reynes (1):
ARM: dts: imx27: add support of internal rtc
Pramod Gurav (1):
ARM: dts: apq8064: Add DT support for GSBI6 and for UART pin mux
Punnaiah Choudary Kalluri (1):
Documentation: devicetree: Add ECC information to synopsys ddr controller
Qipan Li (1):
ARM: dts: atlas7: add alias name for spi device
Rafa? Mi?ecki (1):
ARM: BCM5301X: Enable UART0 on tested devices
Ray Jui (1):
ARM: dts: enable clock support for Broadcom Cygnus
Remy van Elst (1):
ARM: dts: sun4i: Enable USB DRC on A10 OLinuxIno Lime
Robert Jarzmik (6):
ARM: dts: pxa: add dma controller
ARM: dts: pxa: add dma engine node to pxa3xx-nand
ARM: dts: pxa: add dma pxamci nodes to pxa3xx
ARM: dts: pxa: add embedded pxa camera capture interface
ARM: dts: pxa: add the usb host controller
ARM: dts: pxa: fix power i2c definition
Roger Quadros (7):
ARM: dts: omap5: Add named interrupt property for dwc3
ARM: dts: dra7: Add named interrupt property for dwc3
ARM: dts: dra7: Remove ctrl_core and ctrl_general nodes
ARM: dts: dra7: fix pinmux at 1400 resource length
ARM: dts: dra7: Add scm_conf at 1c04 node
ARM: dts: am437x-gp-evm: Add gpio-hog for configuring eMMC/NAND driver
ARM: dts: am437x-gp-evm: Add eMMC support
Roger Shimizu (3):
ARM: dts: add buffalo linkstation ls-wxl/wsxl
ARM: dts: add buffalo linkstation ls-wvl/vl
ARM: dts: orion5x: add buffalo linkstation ls-wtgl
Romain Perier (4):
ARM: dts: rockchip: Add STMMAC reset signal in GMAC interface for rk3288
ARM: dts: rockchip: Add ramp delay for vdd_cpu in firefly board dts
ARM: dts: rockchip: Use correct dts properties for tsadc node on veyron
ARM: dts: rockchip: Add veyron-speedy board
Roman Byshko (2):
ARM: dts: sun7i: Add USB Dual Role Controller
ARM: dts: sun7i: Enable USB DRC on Cubietruck
Russell King (4):
ARM: dt: Add PMU node, making PMU child devices childs of this node
ARM: dt: dove: wire up RTC interrupt
ARM: dt: dove: add video decoder power domain description
ARM: dt: dove: add GPU power domain description
Sanchayan Maity (1):
ARM: dts: vfxxx: Add io-channel-cells property for ADC node
Sascha Hauer (3):
ARM: dts: mt8135: Add pmic wrapper nodes
ARM: dts: mt8135-evbp1: Add PMIC support
ARM: dts: mediatek mt8135: Use real UART clocks
Sekhar Nori (1):
ARM: dts: am437x: add aliases for all UART instances
Sergei Shtylyov (7):
ARM: shmobile: r8a7790: add EtherAVB clocks
ARM: shmobile: r8a7790: add EtherAVB DT support
ARM: shmobile: r8a7794: add PFC DT support
ARM: shmobile: silk: initial device tree
ARM: shmobile: silk: add Ether DT support
ARM: shmobile: r8a7794: add MMCIF DT support
ARM: shmobile: silk: add eMMC DT support
Shengjiu Wang (1):
ARM: dts: imx6qdl-sabreauto: Add audio support
Simon Horman (1):
Merge branch 'clk-for-v4.3' into dt-for-v4.3
Srinivas Kandagatla (6):
ARM: dts: apq8064: Add pm8921 mfd and its gpio node
ARM: dts: apq8064: add pm8921 mpp support
ARM: dts: apq8064: fix missing gsbi cell-index
ARM: dts: apq8064: remove temporary fixed regulator for mmc
ARM: dts: ifc6410: add real regulators for sdcc nodes.
ARM: dts: qs600: Add real regulators to sdcc
Stefan Agner (2):
ARM: dts: vf-colibri: define stdout-path property
ARM: dts: add property for maximum ADC clock frequencies
Stephen Boyd (5):
ARM: dts: qcom: Replace gpio node with pinctrl node
ARM: dts: qcom: Add MSM8960 RPM and RPM regulator nodes
ARM: dts: qcom: Add MSM8960 CDP RPM regulators
ARM: dts: qcom: Add ks8851 node for wired ethernet
ARM: dts: vexpress: Use assigned-clock-parents for sp810
Suman Anna (4):
ARM: dts: AM33xx: Update and move wkup_m3 node to l4 node
ARM: dts: AM4372: Add the wkupm3 rproc node
ARM: dts: AM33xx: Add the wkup_m3_ipc node
ARM: dts: AM4372: Add the wkup_m3_ipc node
Teresa Remmet (2):
ARM: dts: Add support for phyCORE-AM335x SoM
ARM: dts: Add phyBOARD-WEGA-AM335x rdk
Thierry Reding (3):
Merge branch 'for-4.3/pinctrl' into for-4.3/dt
Merge branch 'for-4.3/clk' into for-4.3/dt
ARM: tegra: venice2: Add GK20A GPU DT node
Thomas Petazzoni (4):
ARM: mvebu: use armada-380-xor on Armada 38x and 39x
ARM: mvebu: use DT properties to fine-tune the L2 configuration
ARM: mvebu: fix description of pwr-sata0 regulator on Armada 388 GP
ARM: mvebu: update EEPROM description of Armada 388 GP
Tim Harvey (1):
ARM: dts: ventana: add UHS-I support for Ventana boards
Tomeu Vizoso (2):
pinctrl: tegra: Only set the gpio range if needed
ARM: tegra: Add gpio-ranges property
Tony Lindgren (7):
ARM: dts: Remove L3 compatible value for dm816x
ARM: dts: Add minimal dm814x support
ARM: dts: Add minimal clocks for dm814x
ARM: dts: Add minimal dts support for dm8148-evm
ARM: dts: Add minimal support for HP T410
ARM: OMAP2+: Add custom abort handler for t410
Merge branch 'for-4.3/ti-clk-dt' of https://github.com/t-kristo/linux-pm into omap-for-v4.3/dt-v2
Tuomas Tynkkynen (10):
clk: tegra: Add binding for the Tegra124 DFLL clocksource
clk: tegra: Add library for the DFLL clock source (open-loop mode)
clk: tegra: Add closed loop support for the DFLL
clk: tegra: Add functions for parsing CVB tables
clk: tegra: Add Tegra124 DFLL clocksource platform driver
clk: tegra: Save/restore CCLKG_BURST_POLICY on suspend
clk: tegra: Add the DFLL as a possible parent of the cclk_g clock
ARM: tegra: Add the DFLL to Tegra124 device tree
ARM: tegra: Enable the DFLL on the Jetson TK1
ARM: tegra: Add entries for cpufreq on Tegra124
Ulrich Hecht (2):
ARM: shmobile: add r8a7793 minimal SoC device tree
ARM: shmobile: r8a7793: add minimal Gose board device tree
Vignesh R (1):
ARM: dts: DRA72: switch to cpsw slave0 for ethernet
Wolfram Sang (2):
ARM: shmobile: emev2: add IIC cores to dtsi
ARM: shmobile: emev2: kzm9d: enable IIC busses
Xiaofeng Fei (1):
ARM: dts: atlas7: add multimedia codec node
Ye He (2):
ARM: dts: atlas7: add performance monitor unit node
ARM: dts: atlas7: add lost gmac node
Yonghui Zhang (1):
ARM: dts: atlas7: add software digital radio nodes and its DMA channels
.../devicetree/bindings/arm/atmel-at91.txt | 13 +-
.../arm/bcm/raspberrypi,bcm2835-firmware.txt | 14 +
.../bindings/arm/marvell,kirkwood.txt | 2 +
.../devicetree/bindings/arm/mediatek.txt | 4 +
.../bindings/arm/mediatek/mediatek,sysirq.txt | 1 +
.../devicetree/bindings/arm/omap/omap.txt | 3 +
.../devicetree/bindings/arm/rockchip.txt | 35 +
.../devicetree/bindings/clock/imx6ul-clock.txt | 13 +
.../bindings/clock/nvidia,tegra124-dfll.txt | 79 +
.../bindings/clock/st/st,clkgen-pll.txt | 4 +-
.../bindings/memory-controllers/synopsys.txt | 4 +
.../bindings/pinctrl/fsl,imx6ul-pinctrl.txt | 36 +
.../devicetree/bindings/reset/socfpga-reset.txt | 2 +
.../bindings/rtc/atmel,at91rm9200-rtc.txt | 2 +
.../devicetree/bindings/rtc/rtc-omap.txt | 1 +
.../devicetree/bindings/serial/mtk-uart.txt | 3 +-
.../bindings/timer/mediatek,mtk-timer.txt | 6 +-
.../devicetree/bindings/vendor-prefixes.txt | 3 +
.../devicetree/bindings/watchdog/atmel-wdt.txt | 2 +
arch/arm/boot/dts/Makefile | 41 +-
arch/arm/boot/dts/am335x-boneblack.dts | 20 +-
arch/arm/boot/dts/am335x-evm.dts | 69 +-
arch/arm/boot/dts/am335x-evmsk.dts | 62 +-
arch/arm/boot/dts/am335x-phycore-som.dtsi | 368 ++++
arch/arm/boot/dts/am335x-wega-rdk.dts | 22 +
arch/arm/boot/dts/am335x-wega.dtsi | 151 ++
arch/arm/boot/dts/am33xx.dtsi | 25 +-
arch/arm/boot/dts/am4372.dtsi | 67 +-
arch/arm/boot/dts/am437x-gp-evm.dts | 185 +-
arch/arm/boot/dts/am437x-sk-evm.dts | 45 +-
arch/arm/boot/dts/am43x-epos-evm.dts | 130 +-
arch/arm/boot/dts/am43xx-clocks.dtsi | 9 +
arch/arm/boot/dts/am57xx-beagle-x15.dts | 1 -
arch/arm/boot/dts/armada-375.dtsi | 4 +
arch/arm/boot/dts/armada-388-gp.dts | 12 +-
arch/arm/boot/dts/armada-38x.dtsi | 8 +-
arch/arm/boot/dts/armada-39x.dtsi | 8 +-
arch/arm/boot/dts/at91-sama5d2_xplained.dts | 134 ++
arch/arm/boot/dts/at91-sama5d4_xplained.dts | 9 +
arch/arm/boot/dts/at91-sama5d4ek.dts | 9 +
arch/arm/boot/dts/at91rm9200.dtsi | 10 +-
arch/arm/boot/dts/at91sam9260.dtsi | 11 +-
arch/arm/boot/dts/at91sam9261.dtsi | 7 +-
arch/arm/boot/dts/at91sam9263.dtsi | 7 +-
arch/arm/boot/dts/at91sam9g15.dtsi | 1 +
arch/arm/boot/dts/at91sam9g15ek.dts | 25 +
arch/arm/boot/dts/at91sam9g35.dtsi | 1 +
arch/arm/boot/dts/at91sam9g35ek.dts | 21 +
arch/arm/boot/dts/at91sam9g45.dtsi | 60 +-
arch/arm/boot/dts/at91sam9m10g45ek.dts | 47 +
arch/arm/boot/dts/at91sam9n12.dtsi | 83 +-
arch/arm/boot/dts/at91sam9n12ek.dts | 61 +
arch/arm/boot/dts/at91sam9rl.dtsi | 8 +-
arch/arm/boot/dts/at91sam9x35.dtsi | 1 +
arch/arm/boot/dts/at91sam9x35ek.dts | 20 +
arch/arm/boot/dts/at91sam9x5.dtsi | 12 +-
arch/arm/boot/dts/at91sam9x5_lcd.dtsi | 139 ++
arch/arm/boot/dts/at91sam9x5dm.dtsi | 101 +
arch/arm/boot/dts/atlas7-evb.dts | 18 +
arch/arm/boot/dts/atlas7.dtsi | 97 +-
arch/arm/boot/dts/axp152.dtsi | 49 +
arch/arm/boot/dts/bcm-cygnus-clock.dtsi | 89 +-
arch/arm/boot/dts/bcm2835-rpi.dtsi | 7 +
.../boot/dts/bcm4708-buffalo-wzr-1750dhp.dts | 4 +
arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts | 4 +
arch/arm/boot/dts/bcm4708-netgear-r6250.dts | 14 +-
arch/arm/boot/dts/bcm4708-smartrg-sr400ac.dts | 4 +
.../boot/dts/bcm47081-buffalo-wzr-600dhp2.dts | 4 +
arch/arm/boot/dts/bcm5301x.dtsi | 10 +
arch/arm/boot/dts/bcm7445.dtsi | 50 +
arch/arm/boot/dts/cros-ec-sbs.dtsi | 52 +
arch/arm/boot/dts/cx92755.dtsi | 7 +
arch/arm/boot/dts/cx92755_equinox.dts | 3 +-
arch/arm/boot/dts/dm8148-evm.dts | 28 +
arch/arm/boot/dts/dm8148-t410.dts | 28 +
arch/arm/boot/dts/dm814x-clocks.dtsi | 109 ++
arch/arm/boot/dts/dm814x.dtsi | 333 ++++
arch/arm/boot/dts/dm816x.dtsi | 2 +-
arch/arm/boot/dts/dove.dtsi | 604 +++---
arch/arm/boot/dts/dra7-evm.dts | 18 +-
arch/arm/boot/dts/dra7.dtsi | 95 +-
arch/arm/boot/dts/dra72-evm.dts | 26 +-
arch/arm/boot/dts/dra74x.dtsi | 7 +-
arch/arm/boot/dts/emev2-kzm9d.dts | 8 +
arch/arm/boot/dts/emev2.dtsi | 48 +
arch/arm/boot/dts/exynos4210-universal_c210.dts | 620 +++----
arch/arm/boot/dts/exynos4412-trats2.dts | 3 +
arch/arm/boot/dts/exynos5250-pinctrl.dtsi | 1600 ++++++++--------
arch/arm/boot/dts/exynos5250.dtsi | 3 +-
arch/arm/boot/dts/exynos5410-smdk5410.dts | 6 +-
arch/arm/boot/dts/exynos5420-pinctrl.dtsi | 1411 +++++++-------
arch/arm/boot/dts/exynos5420.dtsi | 3 +-
arch/arm/boot/dts/exynos5422-cpu-thermal.dtsi | 59 +
.../boot/dts/exynos5422-odroidxu3-common.dtsi | 46 +
arch/arm/boot/dts/imx27.dtsi | 9 +
arch/arm/boot/dts/imx53-qsb-common.dtsi | 5 +-
arch/arm/boot/dts/imx53-qsrb.dts | 14 +-
arch/arm/boot/dts/imx6qdl-gw51xx.dtsi | 1 -
arch/arm/boot/dts/imx6qdl-gw52xx.dtsi | 35 +-
arch/arm/boot/dts/imx6qdl-gw53xx.dtsi | 35 +-
arch/arm/boot/dts/imx6qdl-gw54xx.dtsi | 34 +-
arch/arm/boot/dts/imx6qdl-gw551x.dtsi | 1 -
arch/arm/boot/dts/imx6qdl-gw552x.dtsi | 1 -
arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi | 39 +
arch/arm/boot/dts/imx6qdl-sabreauto.dtsi | 137 ++
arch/arm/boot/dts/imx6qdl-sabrelite.dtsi | 39 +
arch/arm/boot/dts/imx6qdl-sabresd.dtsi | 7 +
arch/arm/boot/dts/imx6qdl.dtsi | 52 +-
arch/arm/boot/dts/imx6sl-warp.dts | 32 +-
arch/arm/boot/dts/imx6sl.dtsi | 21 +-
arch/arm/boot/dts/imx6sx.dtsi | 28 +-
arch/arm/boot/dts/imx6ul-14x14-evk.dts | 343 ++++
arch/arm/boot/dts/imx6ul-pinfunc.h | 938 ++++++++++
arch/arm/boot/dts/imx6ul.dtsi | 707 +++++++
arch/arm/boot/dts/imx7d.dtsi | 260 ++-
arch/arm/boot/dts/kirkwood-lswvl.dts | 301 +++
arch/arm/boot/dts/kirkwood-lswxl.dts | 301 +++
arch/arm/boot/dts/lpc18xx.dtsi | 267 ++-
arch/arm/boot/dts/lpc4337-ciaa.dts | 187 ++
arch/arm/boot/dts/lpc4350-hitex-eval.dts | 244 ++-
arch/arm/boot/dts/lpc4357-ea4357-devkit.dts | 467 +++++
arch/arm/boot/dts/ls1021a-qds.dts | 89 +
arch/arm/boot/dts/ls1021a-twr.dts | 81 +
arch/arm/boot/dts/ls1021a.dtsi | 106 +-
arch/arm/boot/dts/mt6580-evbp1.dts | 38 +
arch/arm/boot/dts/mt6580.dtsi | 116 ++
arch/arm/boot/dts/mt8135-evbp1.dts | 193 ++
arch/arm/boot/dts/mt8135.dtsi | 58 +-
arch/arm/boot/dts/omap3-devkit8000-common.dtsi | 369 ++++
.../boot/dts/omap3-devkit8000-lcd-common.dtsi | 73 +
arch/arm/boot/dts/omap3-devkit8000-lcd43.dts | 37 +
arch/arm/boot/dts/omap3-devkit8000-lcd70.dts | 37 +
arch/arm/boot/dts/omap3-devkit8000.dts | 191 +-
arch/arm/boot/dts/omap3-lilly-a83x.dtsi | 12 +-
arch/arm/boot/dts/omap3-overo-base.dtsi | 55 +
arch/arm/boot/dts/omap3-overo-common-lcd35.dtsi | 3 +-
.../arm/boot/dts/omap3-overo-palo35-common.dtsi | 53 +
arch/arm/boot/dts/omap3-overo-palo35.dts | 37 +
arch/arm/boot/dts/omap3-overo-storm-palo35.dts | 37 +
arch/arm/boot/dts/omap3-overo-storm-tobiduo.dts | 21 +
.../boot/dts/omap3-overo-tobiduo-common.dtsi | 65 +
arch/arm/boot/dts/omap3-overo-tobiduo.dts | 21 +
arch/arm/boot/dts/omap3-overo.dtsi | 4 -
arch/arm/boot/dts/omap3-pandora-1ghz.dts | 2 +-
arch/arm/boot/dts/omap3-pandora-600mhz.dts | 2 +-
arch/arm/boot/dts/omap3-pandora-common.dtsi | 54 +-
arch/arm/boot/dts/omap5-uevm.dts | 7 +
arch/arm/boot/dts/omap5.dtsi | 7 +-
.../arm/boot/dts/orion5x-linkstation-lswtgl.dts | 273 +++
arch/arm/boot/dts/orion5x-lswsgl.dts | 276 +++
arch/arm/boot/dts/pxa27x.dtsi | 36 +
arch/arm/boot/dts/pxa2xx.dtsi | 4 +
arch/arm/boot/dts/pxa3xx.dtsi | 52 +
arch/arm/boot/dts/qcom-apq8064-cm-qs600.dts | 20 +
arch/arm/boot/dts/qcom-apq8064-ifc6410.dts | 40 +
arch/arm/boot/dts/qcom-apq8064.dtsi | 91 +-
arch/arm/boot/dts/qcom-msm8660.dtsi | 11 +-
arch/arm/boot/dts/qcom-msm8960-cdp.dts | 302 +++
arch/arm/boot/dts/qcom-msm8960.dtsi | 49 +-
arch/arm/boot/dts/qcom-msm8974.dtsi | 32 +
arch/arm/boot/dts/r7s72100.dtsi | 19 +
arch/arm/boot/dts/r8a73a4.dtsi | 9 +-
arch/arm/boot/dts/r8a7740-armadillo800eva.dts | 13 +
arch/arm/boot/dts/r8a7740.dtsi | 1 +
arch/arm/boot/dts/r8a7778.dtsi | 22 +
arch/arm/boot/dts/r8a7779.dtsi | 28 +-
arch/arm/boot/dts/r8a7790-lager.dts | 4 +-
arch/arm/boot/dts/r8a7790.dtsi | 138 +-
arch/arm/boot/dts/r8a7791-koelsch.dts | 2 +-
arch/arm/boot/dts/r8a7791.dtsi | 120 +-
arch/arm/boot/dts/r8a7793-gose.dts | 63 +
arch/arm/boot/dts/r8a7793.dtsi | 374 ++++
arch/arm/boot/dts/r8a7794-silk.dts | 102 +
arch/arm/boot/dts/r8a7794.dtsi | 48 +-
arch/arm/boot/dts/rk3066a-bqcurie2.dts | 1 +
arch/arm/boot/dts/rk3066a-marsboard.dts | 13 +
arch/arm/boot/dts/rk3066a-rayeager.dts | 5 +
arch/arm/boot/dts/rk3066a.dtsi | 22 +
arch/arm/boot/dts/rk3188-radxarock.dts | 5 +
arch/arm/boot/dts/rk3188.dtsi | 22 +
arch/arm/boot/dts/rk3288-evb.dtsi | 1 +
arch/arm/boot/dts/rk3288-firefly.dtsi | 3 +
arch/arm/boot/dts/rk3288-popmetal.dts | 1 +
arch/arm/boot/dts/rk3288-r89.dts | 413 +++++
arch/arm/boot/dts/rk3288-veyron-chromebook.dtsi | 232 +++
arch/arm/boot/dts/rk3288-veyron-jerry.dts | 197 ++
arch/arm/boot/dts/rk3288-veyron-minnie.dts | 230 +++
arch/arm/boot/dts/rk3288-veyron-pinky.dts | 128 ++
arch/arm/boot/dts/rk3288-veyron-sdmmc.dtsi | 122 ++
arch/arm/boot/dts/rk3288-veyron-speedy.dts | 155 ++
arch/arm/boot/dts/rk3288-veyron.dtsi | 563 ++++++
arch/arm/boot/dts/rk3288.dtsi | 31 +-
arch/arm/boot/dts/rk3xxx.dtsi | 10 +
arch/arm/boot/dts/sama5d2.dtsi | 926 +++++++++
arch/arm/boot/dts/sama5d3.dtsi | 10 +-
arch/arm/boot/dts/sama5d3_tcb1.dtsi | 4 +-
arch/arm/boot/dts/sama5d4.dtsi | 25 +-
arch/arm/boot/dts/sh73a0.dtsi | 3 +
arch/arm/boot/dts/socfpga.dtsi | 46 +-
arch/arm/boot/dts/socfpga_arria10.dtsi | 11 +
arch/arm/boot/dts/socfpga_arria10_socdk.dtsi | 3 +-
arch/arm/boot/dts/socfpga_arria5_socdk.dts | 3 +-
.../boot/dts/socfpga_cyclone5_de0_sockit.dts | 111 ++
arch/arm/boot/dts/socfpga_cyclone5_socdk.dts | 3 +-
arch/arm/boot/dts/socfpga_cyclone5_sockit.dts | 3 +-
arch/arm/boot/dts/stih407-clock.dtsi | 4 +-
arch/arm/boot/dts/stih407-family.dtsi | 45 +
arch/arm/boot/dts/stih407-pinctrl.dtsi | 200 ++
arch/arm/boot/dts/stih407.dtsi | 28 -
arch/arm/boot/dts/stih410-clock.dtsi | 4 +-
arch/arm/boot/dts/stih410.dtsi | 12 +
arch/arm/boot/dts/stih418-clock.dtsi | 4 +-
arch/arm/boot/dts/stih418.dtsi | 4 +
arch/arm/boot/dts/stm32429i-eval.dts | 75 +
arch/arm/boot/dts/stm32f429-disco.dts | 8 +-
arch/arm/boot/dts/stm32f429.dtsi | 79 +-
arch/arm/boot/dts/sun4i-a10-ba10-tvbox.dts | 15 +
arch/arm/boot/dts/sun4i-a10-chuwi-v7-cw0825.dts | 34 +
arch/arm/boot/dts/sun4i-a10-cubieboard.dts | 19 +
.../boot/dts/sun4i-a10-itead-iteaduino-plus.dts | 202 ++
arch/arm/boot/dts/sun4i-a10-mini-xplus.dts | 15 +
arch/arm/boot/dts/sun4i-a10-olinuxino-lime.dts | 32 +
arch/arm/boot/dts/sun4i-a10.dtsi | 16 +-
.../arm/boot/dts/sun5i-a10s-olinuxino-micro.dts | 37 +-
arch/arm/boot/dts/sun5i-a13-hsg-h702.dts | 58 +
arch/arm/boot/dts/sun5i-a13-olinuxino.dts | 37 +
arch/arm/boot/dts/sun5i-a13-utoo-p66.dts | 29 +-
arch/arm/boot/dts/sun5i.dtsi | 16 +-
.../arm/boot/dts/sun6i-a31-mele-a1000g-quad.dts | 5 +
arch/arm/boot/dts/sun6i-a31.dtsi | 16 +-
arch/arm/boot/dts/sun6i-a31s-cs908.dts | 5 +
arch/arm/boot/dts/sun7i-a20-cubietruck.dts | 56 +-
arch/arm/boot/dts/sun7i-a20-i12-tvbox.dts | 2 +-
arch/arm/boot/dts/sun7i-a20-olinuxino-lime.dts | 32 +
arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts | 32 +
arch/arm/boot/dts/sun7i-a20.dtsi | 16 +-
arch/arm/boot/dts/sun8i-a23-a33.dtsi | 25 +-
arch/arm/boot/dts/sun8i-a23-ippo-q8h-v5.dts | 9 +
arch/arm/boot/dts/sun8i-a23.dtsi | 33 +
arch/arm/boot/dts/sun8i-a33-ga10h-v1.1.dts | 17 +
arch/arm/boot/dts/sun8i-a33-ippo-q8h-v1.2.dts | 133 ++
arch/arm/boot/dts/sun8i-a33-sinlinx-sina33.dts | 13 +
arch/arm/boot/dts/sun8i-a33.dtsi | 33 +
arch/arm/boot/dts/sunxi-common-regulators.dtsi | 2 +
arch/arm/boot/dts/tegra114.dtsi | 5 +-
arch/arm/boot/dts/tegra124-jetson-tk1.dts | 25 +-
arch/arm/boot/dts/tegra124-venice2.dts | 10 +-
arch/arm/boot/dts/tegra124.dtsi | 50 +
arch/arm/boot/dts/tegra20.dtsi | 5 +-
arch/arm/boot/dts/tegra30.dtsi | 5 +-
arch/arm/boot/dts/uniphier-ph1-ld4-ref.dts | 38 +-
arch/arm/boot/dts/uniphier-ph1-ld4.dtsi | 143 ++
arch/arm/boot/dts/uniphier-ph1-ld6b-ref.dts | 105 ++
arch/arm/boot/dts/uniphier-ph1-ld6b.dtsi | 67 +
arch/arm/boot/dts/uniphier-ph1-pro4-ref.dts | 40 +-
arch/arm/boot/dts/uniphier-ph1-pro4.dtsi | 158 ++
arch/arm/boot/dts/uniphier-ph1-pro5.dtsi | 252 +++
arch/arm/boot/dts/uniphier-ph1-sld3-ref.dts | 46 +-
arch/arm/boot/dts/uniphier-ph1-sld3.dtsi | 122 ++
arch/arm/boot/dts/uniphier-ph1-sld8-ref.dts | 42 +-
arch/arm/boot/dts/uniphier-ph1-sld8.dtsi | 143 ++
arch/arm/boot/dts/uniphier-pinctrl.dtsi | 105 ++
arch/arm/boot/dts/uniphier-proxstream2.dtsi | 273 +++
arch/arm/boot/dts/uniphier-ref-daughter.dtsi | 50 +
arch/arm/boot/dts/vexpress-v2m-rs1.dtsi | 2 +
arch/arm/boot/dts/vexpress-v2m.dtsi | 2 +
arch/arm/boot/dts/vf-colibri-eval-v3.dtsi | 2 +-
arch/arm/boot/dts/vfxxx.dtsi | 85 +-
arch/arm/boot/dts/zynq-7000.dtsi | 10 +-
arch/arm/boot/dts/zynq-zc702.dts | 28 +
arch/arm/configs/omap2plus_defconfig | 3 +
arch/arm/mach-omap2/pdata-quirks.c | 157 ++
arch/arm/mach-orion5x/Kconfig | 6 +-
arch/arm/mach-orion5x/Makefile | 1 -
arch/arm/mach-orion5x/lsmini-setup.c | 280 ---
arch/arm/mach-tegra/Kconfig | 1 +
drivers/clk/imx/Makefile | 1 +
drivers/clk/imx/clk-imx6q.c | 4 +
drivers/clk/imx/clk-imx6ul.c | 432 +++++
drivers/clk/tegra/Makefile | 3 +
drivers/clk/tegra/clk-dfll.c | 1755 ++++++++++++++++++
drivers/clk/tegra/clk-dfll.h | 54 +
drivers/clk/tegra/clk-tegra-super-gen4.c | 4 +-
drivers/clk/tegra/clk-tegra124-dfll-fcpu.c | 166 ++
drivers/clk/tegra/clk-tegra124.c | 82 +
drivers/clk/tegra/clk.c | 39 +-
drivers/clk/tegra/clk.h | 3 +
drivers/clk/tegra/cvb.c | 140 ++
drivers/clk/tegra/cvb.h | 67 +
drivers/clk/ti/clk-43xx.c | 1 +
drivers/pinctrl/pinctrl-tegra.c | 19 +-
include/dt-bindings/clock/imx6ul-clock.h | 240 +++
include/dt-bindings/clock/r8a7790-clock.h | 3 +
include/dt-bindings/clock/r8a7791-clock.h | 2 +
include/dt-bindings/clock/r8a7793-clock.h | 164 ++
include/dt-bindings/pinctrl/am43xx.h | 1 +
include/dt-bindings/pinctrl/dra.h | 20 +
include/dt-bindings/reset/altr,rst-mgr-a10.h | 110 ++
include/dt-bindings/reset/tegra124-car.h | 12 +
299 files changed, 23173 insertions(+), 3206 deletions(-)
create mode 100644 Documentation/devicetree/bindings/arm/bcm/raspberrypi,bcm2835-firmware.txt
create mode 100644 Documentation/devicetree/bindings/clock/imx6ul-clock.txt
create mode 100644 Documentation/devicetree/bindings/clock/nvidia,tegra124-dfll.txt
create mode 100644 Documentation/devicetree/bindings/pinctrl/fsl,imx6ul-pinctrl.txt
create mode 100644 arch/arm/boot/dts/am335x-phycore-som.dtsi
create mode 100644 arch/arm/boot/dts/am335x-wega-rdk.dts
create mode 100644 arch/arm/boot/dts/am335x-wega.dtsi
create mode 100644 arch/arm/boot/dts/at91-sama5d2_xplained.dts
create mode 100644 arch/arm/boot/dts/at91sam9x5dm.dtsi
create mode 100644 arch/arm/boot/dts/axp152.dtsi
create mode 100644 arch/arm/boot/dts/cros-ec-sbs.dtsi
create mode 100644 arch/arm/boot/dts/dm8148-evm.dts
create mode 100644 arch/arm/boot/dts/dm8148-t410.dts
create mode 100644 arch/arm/boot/dts/dm814x-clocks.dtsi
create mode 100644 arch/arm/boot/dts/dm814x.dtsi
create mode 100644 arch/arm/boot/dts/exynos5422-cpu-thermal.dtsi
create mode 100644 arch/arm/boot/dts/imx6ul-14x14-evk.dts
create mode 100644 arch/arm/boot/dts/imx6ul-pinfunc.h
create mode 100644 arch/arm/boot/dts/imx6ul.dtsi
create mode 100644 arch/arm/boot/dts/kirkwood-lswvl.dts
create mode 100644 arch/arm/boot/dts/kirkwood-lswxl.dts
create mode 100644 arch/arm/boot/dts/lpc4337-ciaa.dts
create mode 100644 arch/arm/boot/dts/mt6580-evbp1.dts
create mode 100644 arch/arm/boot/dts/mt6580.dtsi
create mode 100644 arch/arm/boot/dts/omap3-devkit8000-common.dtsi
create mode 100644 arch/arm/boot/dts/omap3-devkit8000-lcd-common.dtsi
create mode 100644 arch/arm/boot/dts/omap3-devkit8000-lcd43.dts
create mode 100644 arch/arm/boot/dts/omap3-devkit8000-lcd70.dts
create mode 100644 arch/arm/boot/dts/omap3-overo-palo35-common.dtsi
create mode 100644 arch/arm/boot/dts/omap3-overo-palo35.dts
create mode 100644 arch/arm/boot/dts/omap3-overo-storm-palo35.dts
create mode 100644 arch/arm/boot/dts/omap3-overo-storm-tobiduo.dts
create mode 100644 arch/arm/boot/dts/omap3-overo-tobiduo-common.dtsi
create mode 100644 arch/arm/boot/dts/omap3-overo-tobiduo.dts
create mode 100644 arch/arm/boot/dts/orion5x-linkstation-lswtgl.dts
create mode 100644 arch/arm/boot/dts/orion5x-lswsgl.dts
create mode 100644 arch/arm/boot/dts/r8a7793-gose.dts
create mode 100644 arch/arm/boot/dts/r8a7793.dtsi
create mode 100644 arch/arm/boot/dts/r8a7794-silk.dts
create mode 100644 arch/arm/boot/dts/rk3288-r89.dts
create mode 100644 arch/arm/boot/dts/rk3288-veyron-chromebook.dtsi
create mode 100644 arch/arm/boot/dts/rk3288-veyron-jerry.dts
create mode 100644 arch/arm/boot/dts/rk3288-veyron-minnie.dts
create mode 100644 arch/arm/boot/dts/rk3288-veyron-pinky.dts
create mode 100644 arch/arm/boot/dts/rk3288-veyron-sdmmc.dtsi
create mode 100644 arch/arm/boot/dts/rk3288-veyron-speedy.dts
create mode 100644 arch/arm/boot/dts/rk3288-veyron.dtsi
create mode 100644 arch/arm/boot/dts/sama5d2.dtsi
create mode 100644 arch/arm/boot/dts/socfpga_cyclone5_de0_sockit.dts
create mode 100644 arch/arm/boot/dts/stm32429i-eval.dts
create mode 100644 arch/arm/boot/dts/sun4i-a10-itead-iteaduino-plus.dts
create mode 100644 arch/arm/boot/dts/sun8i-a33-ippo-q8h-v1.2.dts
create mode 100644 arch/arm/boot/dts/uniphier-ph1-ld6b-ref.dts
create mode 100644 arch/arm/boot/dts/uniphier-ph1-ld6b.dtsi
create mode 100644 arch/arm/boot/dts/uniphier-ph1-pro5.dtsi
create mode 100644 arch/arm/boot/dts/uniphier-pinctrl.dtsi
create mode 100644 arch/arm/boot/dts/uniphier-proxstream2.dtsi
create mode 100644 arch/arm/boot/dts/uniphier-ref-daughter.dtsi
delete mode 100644 arch/arm/mach-orion5x/lsmini-setup.c
create mode 100644 drivers/clk/imx/clk-imx6ul.c
create mode 100644 drivers/clk/tegra/clk-dfll.c
create mode 100644 drivers/clk/tegra/clk-dfll.h
create mode 100644 drivers/clk/tegra/clk-tegra124-dfll-fcpu.c
create mode 100644 drivers/clk/tegra/cvb.c
create mode 100644 drivers/clk/tegra/cvb.h
create mode 100644 include/dt-bindings/clock/imx6ul-clock.h
create mode 100644 include/dt-bindings/clock/r8a7793-clock.h
create mode 100644 include/dt-bindings/reset/altr,rst-mgr-a10.h
create mode 100644 include/dt-bindings/reset/tegra124-car.h
^ permalink raw reply [flat|nested] 9+ messages in thread
* [GIT PULL 6/7] ARM: SoC defconfig updates for v4.3
2015-09-01 0:07 [GIT PULL 0/7] ARM: SoC changes for v4.3 Olof Johansson
` (4 preceding siblings ...)
2015-09-01 0:07 ` [GIT PULL 5/7] ARM: DT " Olof Johansson
@ 2015-09-01 0:07 ` Olof Johansson
2015-09-01 0:07 ` [GIT PULL 7/7] ARM: SoC 64-bit changes " Olof Johansson
2015-09-01 0:48 ` [GIT PULL 0/7] ARM: SoC " Olof Johansson
7 siblings, 0 replies; 9+ messages in thread
From: Olof Johansson @ 2015-09-01 0:07 UTC (permalink / raw)
To: linux-arm-kernel
We mostly keep defconfigs updates on a separate branch due to their tendency
to conflict between platforms and this encourages more careful separation of
code changes and config changes.
Most updates here are minor tweaks, enabling new drivers for various platforms,
and so on. Renesas also removed one defconfig (marzen_defconfig).
----------------------------------------------------------------
The following changes since commit 64e21c2bcc7dcc916c5cdcd9e612fc23891f8e23:
Merge branch 'next/dt' into HEAD
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 ba5d183bced6cb60b2838a0bf04665c1c1e4bff1:
Merge tag 'tegra-for-4.3-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into next/defconfig
----------------------------------------------------------------
Alexandre Belloni (1):
ARM: at91/defconfig: at91_dt: remove ARM_AT91_ETHER
Barry Song (5):
ARM: prima2_defconfig: fix the outdated defconfig
ARM: prima2_defconfig: enable build for SiRFSoC SDHC host
ARM: prima2_defconfig: enable build for misc input
ARM: prima2_defconfig: enable build for RTC
ARM: prima2_defconfig: enable build for hwspinlock
Baruch Siach (1):
ARM: multi_v7_defconfig: enable Conexant Digicolor watchdog
Chen-Yu Tsai (2):
ARM: sunxi_defconfig: Enable DMA_SUN6I, P2WI, PWM, cryptodev, EXTCON, FHANDLE
ARM: multi_v7_defconfig: Enable Allwinner P2WI, PWM, DMA_SUN6I, cryptodev
Fabio Estevam (4):
ARM: imx_v6_v7_defconfig: Enable kexec support
ARM: imx_v6_v7_defconfig: Select HCIUART_H4
ARM: imx_v6_v7_defconfig: Select CONFIG_IKCONFIG_PROC
ARM: multi_v7_defconfig: Select MX6UL and MX7D
Frank Li (2):
ARM: imx_v6_v7_defconfig: enable powerkey and syscon power off
ARM: imx: imx_v6_v7_defconfig enable imx6ul support
Josh Wu (2):
ARM: at91: at91_dt_defconfig: enable ISI and ov2640 support
ARM: at91/defconfig: at91_dt: enable DRM hlcdc support
Kuninori Morimoto (2):
ARM: shmobile: defconfig: add Renesas DPCM Sound Card
ARM: multi_v7_defconfig: add Renesas DPCM Sound Card
Lee Jones (2):
ARM: multi_v7_defconfig: Enable ST's PWM driver
ARM: multi_v7_defconfig: Enable support for PWM Regulators
Linus Walleij (7):
ARM: ep93xx: activate NO_HZ and high-res timers
ARM: ep93xx: enable all boards in the EP93xx defconfig
ARM: ep93xx: enable SIM.ONE MMC/SD hardware
ARM: ep93xx: add LEDs and triggers to defconfig
ARM: ep93xx: add GPIO I2C to defconfig
ARM: ep93xx: add DMA engine to the defconfig
ARM: ep93xx: add framebuffer to the defconfig
Magnus Damm (1):
ARM: shmobile: Remove marzen_defconfig
Masahiro Yamada (1):
ARM: multi_v7_defconfig: enable UniPhier UART driver
Nicolas Pitre (1):
ARM: add TC2 PM support to multi_v7_defconfig
Olof Johansson (12):
Merge tag 'mvebu-config-4.3-1' of git://git.infradead.org/linux-mvebu into next/defconfig
Merge tag 'ep93xx-defconfig' of git://git.kernel.org/.../linusw/linux-integrator into next/defconfig
Merge tag 'omap-for-v4.3/defconfig-signed' of git://git.kernel.org/.../tmlind/linux-omap into next/defconfig
Merge tag 'sti-defconfig-for-v4.3-1' of https://git.kernel.org/.../mcoquelin/sti into next/defconfig
Merge tag 'renesas-defconfig-for-v4.3' of git://git.kernel.org/.../horms/renesas into next/defconfig
Merge tag 'prima2-defconfig-for-4.2' of git://git.kernel.org/.../baohua/linux into next/defconfig
Merge tag 'renesas-defconfig2-for-v4.3' of git://git.kernel.org/.../horms/renesas into next/defconfig
Merge tag 'qcom-defconfig-for-4.3' of git://codeaurora.org/quic/kernel/agross-msm into next/defconfig
Merge tag 'mvebu-config-4.3-2' of git://git.infradead.org/linux-mvebu into next/defconfig
Merge tag 'sunxi-defconfig-for-4.3' of https://git.kernel.org/.../mripard/linux into next/defconfig
Merge tag 'imx-defconfig-4.3' of git://git.kernel.org/.../shawnguo/linux into next/defconfig
Merge tag 'tegra-for-4.3-defconfig' of git://git.kernel.org/.../tegra/linux into next/defconfig
Roger Shimizu (1):
ARM: defconfig: orion5x: add DT support
Sekhar Nori (4):
ARM: omap2plus_defconfig: enable support for TI ADC
ARM: omap2plus_defconfig: enable support for TI touchscreen
ARM: omap2plus_defconfig: enable support for TI CPTS
ARM: omap2plus_defconfig: enable support for M25P80 SPI NOR
Shengjiu Wang (1):
ARM: imx_v6_v7_defconfig: build in audio driver
Simon Horman (3):
ARM: shmobile: Enable gose board in multiplatform defconfig
ARM: multi_v7_defconfig: Enable shmobile r8a7793/gose platform
ARM: shmobile: Enable fixed voltage regulator in shmobile_defconfig
Stephen Boyd (1):
ARM: qcom_defconfig: Enable options for KS8851 ethernet
Thierry Reding (1):
ARM: tegra: Update multi_v7_defconfig
Thomas Petazzoni (1):
ARM: mvebu: update mvebu_v7_defconfig with features needed for Armada 388 GP
Tuomas Tynkkynen (1):
ARM: tegra: Update default configuration
arch/arm/configs/at91_dt_defconfig | 13 +++-
arch/arm/configs/ep93xx_defconfig | 29 ++++++-
arch/arm/configs/imx_v6_v7_defconfig | 31 ++++----
arch/arm/configs/marzen_defconfig | 124 ------------------------------
arch/arm/configs/multi_v7_defconfig | 23 ++++++
arch/arm/configs/mvebu_v7_defconfig | 4 +
arch/arm/configs/omap2plus_defconfig | 7 ++
arch/arm/configs/orion5x_defconfig | 3 +
arch/arm/configs/prima2_defconfig | 12 +--
arch/arm/configs/qcom_defconfig | 3 +
arch/arm/configs/shmobile_defconfig | 3 +
arch/arm/configs/sunxi_defconfig | 10 ++-
arch/arm/configs/tegra_defconfig | 9 +--
13 files changed, 118 insertions(+), 153 deletions(-)
delete mode 100644 arch/arm/configs/marzen_defconfig
^ permalink raw reply [flat|nested] 9+ messages in thread
* [GIT PULL 7/7] ARM: SoC 64-bit changes for v4.3
2015-09-01 0:07 [GIT PULL 0/7] ARM: SoC changes for v4.3 Olof Johansson
` (5 preceding siblings ...)
2015-09-01 0:07 ` [GIT PULL 6/7] ARM: SoC defconfig " Olof Johansson
@ 2015-09-01 0:07 ` Olof Johansson
2015-09-01 0:48 ` [GIT PULL 0/7] ARM: SoC " Olof Johansson
7 siblings, 0 replies; 9+ messages in thread
From: Olof Johansson @ 2015-09-01 0:07 UTC (permalink / raw)
To: linux-arm-kernel
Here's our branch of ARM64 contents for this merge window.
Most of this is DT contents for new SoCs (or those who have seen new
device support added). Maybe we should stop separating out the arm64
contents here to avoid the kind of internal conflicts as we got this
time around, where 32- and 64-bit contents conflicted.
Anyhow, on the actual contents:
New SoCs:
- Broadcom North Star 2 (ns2)
- Marvell Berlin4CT
- Mediatek MT6795
- Rockchip RK3368
In addition, there are enhancements for the following platforms:
- Mediatek MT8173: cpuidle-dt updates, misc other additions
- ZyncMP: A bunch of devices added to the existing DTSI
- Qualcomm MSM8916 and APQ8016 updates for USB, etc.
+ A handful of other updates for various platforms
Conflicts:
Documentation/devicetree/bindings/serial/mtk-uart.txt:
Add/add conflict with 32-bit DT additions of MT6795 and 64-bit addition
of MT8173.
Keep both sides, which means rewrapping the last line. Entries are
sorted in decreasing order, which is a bit unusual.
----------------------------------------------------------------
The following changes since commit c055798226422b953ee59e68ba33f4a9bfc894bb:
Merge branch 'next/defconfig' into HEAD
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 341a670abd1c086d44e09901f0ebee3dd86a60ba:
ARM64: dts: vexpress: Use assigned-clock-parents for sp810
----------------------------------------------------------------
Chunyan Zhang (1):
arm64: dts: sprd: adding ETM entries to Spreadtrum SC9836
Eddie Huang (4):
arm64: dts: mt8173: Add watchdog device node
arm64: dts: mt8173: Add I2C device node
arm64: dts: mt8173-evb: Add PMIC support
arm64: dts: mediatek: Add MT8173 MMC dts
Heiko Stuebner (11):
clk: rockchip: rk3288: add CLK_SET_RATE_PARENT to sclk_mac
clk: rockchip: fix faulty vip parent name on rk3288
clk: rockchip: protect register macros against multipart values
clk: rockchip: add COMPOSITE_NOGATE_DIVTBL variant
clk: rockchip: add support for phase inverters
clk: rockchip: fix issues in the mmc-phase clock
clk: rockchip: define the inverters of rk3066/rk3188 and rk3288
dt-bindings: add documentation of rk3668 clock controller
clk: rockchip: add dt-binding header for rk3368
clk: rockchip: add missing include guards
clk: rockchip: add rk3368 clock controller
Heiko St?bner (3):
arm64: add Rockchip architecture entry
arm64: defconfig: enable ARCH_ROCKCHIP
arm64: dts: add Rockchip rk3368 core dtsi and board dts for the r88 board
Henry Chen (1):
dts: mt8173-evb: Add da9211 to i2c1
Howard Chen (1):
ARM: dts: mt8173: support arm64 cpuidle-dt
Ivan T. Ivanov (6):
arm64: dts: qcom: Extend msm8916 pinctrl device coverage
arm64: dts: qcom: Add msm8916 BLSP device nodes
arm64: dts: qcom: Add msm8916 USB configuration nodes
arm64: dts: qcom: apq8016-sbc: Don't hog client driver pins
arm64: dts: qcom: Fix apq8016-sbc board USB related pin definitions
arm64: dts: qcom: Add apq8016-sbc board LED's related device nodes
Jisheng Zhang (3):
arm64: dts: Add dts files for Marvell Berlin4CT SoC
arm64: Enable Marvell Berlin SoC family in Kconfig
arm64: Enable Marvell Berlin SoC family in defconfig
Koro Chen (1):
arm64: dts: mt8173: Add afe device node
Mars Cheng (2):
Document: DT: Add bindings for mediatek MT6795 SoC Platform
arm64: dts: mediatek: add mt6795 support
Michal Simek (10):
ARM64: zynqmp: Use zynqmp specific compatible string for gpio
ARM64: zynqmp: Add CANs node for platform
ARM64: zynqmp: Add SMMU support
ARM64: zynqmp: Add DWC3 usb support
ARM64: zynqmp: Enable watchdog on ep108
ARM64: zynqmp: Enable sdhci on ep108
ARM64: zynqmp: Add eeprom memories on i2c bus
ARM64: zynqmp: Enable spi flashes on ep108
ARM64: zynqmp: Move uart and ttcs to the right location
ARM64: zynqmp: Move SPI nodes to the right location
Olof Johansson (8):
arm64: Split out platform options to separate Kconfig
Merge branch 'depends/clk-rk3368' into next/arm64
arm64: fix Kconfig include path
Merge tag 'v4.2-next-arm64' of https://github.com/mbgg/linux-mediatek into next/arm64
Merge tag 'qcom-arm64-for-4.3' of git://codeaurora.org/quic/kernel/agross-msm into next/arm64
Merge tag 'zynqmp-dt-for-4.3' of https://github.com/Xilinx/linux-xlnx into next/arm64
Merge tag 'v4.2-next-arm64-2' of https://github.com/mbgg/linux-mediatek into next/arm64
Merge tag 'berlin64-for-v4.3-1' of git://git.infradead.org/users/hesselba/linux-berlin into next/arm64
Ray Jui (5):
PCI: iproc: enable arm64 support for iProc PCIe
PCI: iproc: Fix ARM64 dependency in Kconfig
arm64: Add Broadcom iProc family support
arm64: dts: Add Broadcom North Star 2 support
PCI: iproc: Fix BCMA dependency in Kconfig
Sascha Hauer (4):
arm64: dts: mt8173: Add clock controller device nodes
arm64: dts: mt8173: Use real clock for UARTs
arm64: dts: mt8173: Add PMIC wrapper device node
ARM64: MediaTek MT8173: Add SCPSYS device node
Scott Shu (1):
ARM64: dts: mt6795: enable basic SMP bringup for MT6795
Srinivas Kandagatla (1):
arm64: dts: qcom: Add msm8916 sdhci configuration nodes
Stephen Boyd (1):
ARM64: dts: vexpress: Use assigned-clock-parents for sp810
Suneel Garapati (1):
devicetree: xilinx: zynqmp: add sata node
.../devicetree/bindings/arm/bcm/ns2.txt | 9 +
.../devicetree/bindings/arm/mediatek.txt | 9 +-
.../bindings/arm/mediatek/mediatek,sysirq.txt | 3 +-
.../bindings/clock/rockchip,rk3368-cru.txt | 61 ++
.../devicetree/bindings/serial/mtk-uart.txt | 5 +-
arch/arm64/Kconfig | 105 +--
arch/arm64/Kconfig.platforms | 125 +++
arch/arm64/boot/dts/Makefile | 3 +
arch/arm64/boot/dts/arm/juno-motherboard.dtsi | 2 +
.../arm64/boot/dts/arm/rtsm_ve-motherboard.dtsi | 2 +
arch/arm64/boot/dts/broadcom/Makefile | 5 +
arch/arm64/boot/dts/broadcom/ns2-svk.dts | 59 ++
arch/arm64/boot/dts/broadcom/ns2.dtsi | 118 +++
arch/arm64/boot/dts/marvell/Makefile | 5 +
arch/arm64/boot/dts/marvell/berlin4ct-dmp.dts | 66 ++
arch/arm64/boot/dts/marvell/berlin4ct.dtsi | 164 ++++
arch/arm64/boot/dts/mediatek/Makefile | 1 +
arch/arm64/boot/dts/mediatek/mt6795-evb.dts | 41 +
arch/arm64/boot/dts/mediatek/mt6795.dtsi | 175 ++++
arch/arm64/boot/dts/mediatek/mt8173-evb.dts | 353 ++++++++
arch/arm64/boot/dts/mediatek/mt8173.dtsi | 327 ++++++-
.../boot/dts/qcom/apq8016-sbc-pmic-pins.dtsi | 34 +-
.../boot/dts/qcom/apq8016-sbc-soc-pins.dtsi | 14 +-
arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi | 51 ++
arch/arm64/boot/dts/qcom/msm8916-pins.dtsi | 430 +++++++++
arch/arm64/boot/dts/qcom/msm8916.dtsi | 227 ++++-
arch/arm64/boot/dts/rockchip/Makefile | 5 +
arch/arm64/boot/dts/rockchip/rk3368-r88.dts | 354 ++++++++
arch/arm64/boot/dts/rockchip/rk3368.dtsi | 900 +++++++++++++++++++
arch/arm64/boot/dts/sprd/sc9836.dtsi | 99 +-
arch/arm64/boot/dts/xilinx/zynqmp-ep108.dts | 89 ++
arch/arm64/boot/dts/xilinx/zynqmp.dtsi | 233 +++--
arch/arm64/configs/defconfig | 4 +
drivers/clk/rockchip/Makefile | 2 +
drivers/clk/rockchip/clk-inverter.c | 116 +++
drivers/clk/rockchip/clk-mmc-phase.c | 6 +-
drivers/clk/rockchip/clk-rk3188.c | 9 +-
drivers/clk/rockchip/clk-rk3288.c | 13 +-
drivers/clk/rockchip/clk-rk3368.c | 881 ++++++++++++++++++
drivers/clk/rockchip/clk.c | 7 +
drivers/clk/rockchip/clk.h | 72 +-
drivers/pci/host/Kconfig | 4 +-
drivers/pci/host/pcie-iproc.c | 27 +-
drivers/pci/host/pcie-iproc.h | 4 +-
include/dt-bindings/clock/rk3066a-cru.h | 5 +
include/dt-bindings/clock/rk3188-cru-common.h | 5 +
include/dt-bindings/clock/rk3188-cru.h | 5 +
include/dt-bindings/clock/rk3288-cru.h | 5 +
include/dt-bindings/clock/rk3368-cru.h | 384 ++++++++
49 files changed, 5341 insertions(+), 282 deletions(-)
create mode 100644 Documentation/devicetree/bindings/arm/bcm/ns2.txt
create mode 100644 Documentation/devicetree/bindings/clock/rockchip,rk3368-cru.txt
create mode 100644 arch/arm64/Kconfig.platforms
create mode 100644 arch/arm64/boot/dts/broadcom/Makefile
create mode 100644 arch/arm64/boot/dts/broadcom/ns2-svk.dts
create mode 100644 arch/arm64/boot/dts/broadcom/ns2.dtsi
create mode 100644 arch/arm64/boot/dts/marvell/Makefile
create mode 100644 arch/arm64/boot/dts/marvell/berlin4ct-dmp.dts
create mode 100644 arch/arm64/boot/dts/marvell/berlin4ct.dtsi
create mode 100644 arch/arm64/boot/dts/mediatek/mt6795-evb.dts
create mode 100644 arch/arm64/boot/dts/mediatek/mt6795.dtsi
create mode 100644 arch/arm64/boot/dts/qcom/msm8916-pins.dtsi
create mode 100644 arch/arm64/boot/dts/rockchip/Makefile
create mode 100644 arch/arm64/boot/dts/rockchip/rk3368-r88.dts
create mode 100644 arch/arm64/boot/dts/rockchip/rk3368.dtsi
create mode 100644 drivers/clk/rockchip/clk-inverter.c
create mode 100644 drivers/clk/rockchip/clk-rk3368.c
create mode 100644 include/dt-bindings/clock/rk3368-cru.h
^ permalink raw reply [flat|nested] 9+ messages in thread
* [GIT PULL 0/7] ARM: SoC changes for v4.3
2015-09-01 0:07 [GIT PULL 0/7] ARM: SoC changes for v4.3 Olof Johansson
` (6 preceding siblings ...)
2015-09-01 0:07 ` [GIT PULL 7/7] ARM: SoC 64-bit changes " Olof Johansson
@ 2015-09-01 0:48 ` Olof Johansson
7 siblings, 0 replies; 9+ messages in thread
From: Olof Johansson @ 2015-09-01 0:48 UTC (permalink / raw)
To: linux-arm-kernel
On Mon, Aug 31, 2015 at 5:07 PM, Olof Johansson <olof@lixom.net> wrote:
> We've been able to keep conflicts down this cycle, only a few and none
> are hairy. I've described them in the affected pull requests.
Grmbl, I just fetched your tree and looked for new conflicts, and it
looks like a few more have crept in and diffstats are likely off from
the ones in my pull requests. Sorry about that.
New conflicts:
drivers/clk/ti/Makefike: Looks like an add/remove conflict on nearby
lines due to our addition of clk-814x.
drivers/pci/host/Kconfig: Bjorn and I picked up different versions of
the same fix for a problem that surfaced through the new arm64
dependencies. Go with Bjorn's.
drivers/pci/host/pci-iproc.c: Looks like whitespace delta on nearby changes.
-Olof
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2015-09-01 0:48 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-09-01 0:07 [GIT PULL 0/7] ARM: SoC changes for v4.3 Olof Johansson
2015-09-01 0:07 ` [GIT PULL 1/7] ARM: SoC non-urgent fixes for 4.3 Olof Johansson
2015-09-01 0:07 ` [GIT PULL 2/7] ARM: SoC cleanups for v4.3 Olof Johansson
2015-09-01 0:07 ` [GIT PULL 3/7] ARM: SoC platform updates " Olof Johansson
2015-09-01 0:07 ` [GIT PULL 4/7] ARM: SoC driver " Olof Johansson
2015-09-01 0:07 ` [GIT PULL 5/7] ARM: DT " Olof Johansson
2015-09-01 0:07 ` [GIT PULL 6/7] ARM: SoC defconfig " Olof Johansson
2015-09-01 0:07 ` [GIT PULL 7/7] ARM: SoC 64-bit changes " Olof Johansson
2015-09-01 0:48 ` [GIT PULL 0/7] ARM: SoC " 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).