kernel/linux
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ synced 2026-09-28 19:20:30 +00:00
Code Issues Releases Packages Activity

ARM: SoC: platform support for v4.2

Browse source 
Our SoC branch usually contains expanded support for new SoCs and
 other core platform code. Some highlights from this round:
 
 - sunxi: SMP support for A23 SoC
 - socpga: big-endian support
 - pxa: conversion to common clock framework
 - bcm: SMP support for BCM63138
 - imx: support new I.MX7D SoC
 - zte: basic support for ZX296702 SoC
 
  Conflicts:
 	arch/arm/mach-socfpga/core.h
 
 Trivial remove/remove conflict with our cleanup branch.
 Resolution: remove both sides
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJVi4RMAAoJEFk3GJrT+8Zl6/kP/1Rv9O++1Kxua6R54Og6AF1J
 0miFr2fnUrUWUYg/NVbseRH5bBe6N6ir3SQMfde8W2/QibEjOoEwSwrle+mC/eiq
 CE0x0gtyRvXMrMU/FWkOvbmmw9uv5oz1z3IHZV6AiecNuSMLUBPfamryikQ8C+d1
 O/QZtX543tJQJDOBihO5cuhoVVM37UX0unNmqGsyswlyqTPF8FxcIJAYVNtnxjmj
 AFaOB0nDJKLKFTiX2Ype2wOxxJX1lrLatNo4W4T+YaaK+i1uCOhgTdSN+n49K7YA
 KNDFEgZFQqT8VMJyG+eJVeYF+cI7yWQ7lBzIftPUjPk/7+dIHBjWPz2QdjVz3U38
 kxncf4S9xGAF5G2rcKe4mFrfT3Y8QLWQpA/jFs06yLwW1O3Hlfq3DzMdGNcF7hth
 17LOP8namn9+NepZEp/vAlFzRRypxWWtbkPNBIItkImC6zn0IiGjBy50DE1io27W
 hmQcnMb7d+0wWl2Y8OmR2lZSB97JiRZkRYMCVHVt+0zGJzp4prLvl9wbjh1VXkPv
 ERCDJ9nCmZsl7ZVmIXMI7KNXYuPNp7R/QAzCvuSUueswF0qxTAQ0VSSBwRMqvQsQ
 UUNC6p63VnjUeMUdn2EBsUQZ0Uqw3t2U5TtvooHNt9FkiGsSpwjWrvVD+LItaPoJ
 GPeeJrJaYQsDvTrO8wjU
 =ZtPK
 -----END PGP SIGNATURE-----

Merge tag 'armsoc-soc' into test-merge

ARM: SoC: platform support for v4.2

Our SoC branch usually contains expanded support for new SoCs and
other core platform code. Some highlights from this round:

- sunxi: SMP support for A23 SoC
- socpga: big-endian support
- pxa: conversion to common clock framework
- bcm: SMP support for BCM63138
- imx: support new I.MX7D SoC
- zte: basic support for ZX296702 SoC

 Conflicts:
	arch/arm/mach-socfpga/core.h

Trivial remove/remove conflict with our cleanup branch.
Resolution: remove both sides

# gpg: Signature made Wed Jun 24 21:32:12 2015 PDT using RSA key ID D3FBC665
# gpg: Good signature from "Kevin Hilman <khilman@deeprootsystems.com>"
# gpg:                 aka "Kevin Hilman <khilman@linaro.org>"
# gpg:                 aka "Kevin Hilman <khilman@kernel.org>"

# Conflicts:
#	arch/arm/mach-socfpga/core.h
This commit is contained in:
Kevin Hilman 2015-06-24 21:32:13 -07:00
commit 03fa626774
248 changed files with 12316 additions and 7716 deletions
Download patch file Download diff file Expand all files Collapse all files

32
Documentation/arm/stm32/overview.txt
View file

22
Documentation/arm/stm32/stm32f429-overview.txt
View file

1
Documentation/devicetree/bindings/arm/cpus.txt
View file

7
Documentation/devicetree/bindings/arm/exynos/power_domain.txt
View file

3
Documentation/devicetree/bindings/arm/fsl.txt
View file

15
Documentation/devicetree/bindings/arm/zte.txt
View file

35
Documentation/devicetree/bindings/clock/zx296702-clk.txt
View file

2
Documentation/devicetree/bindings/serial/pl011.txt
View file

1
Documentation/devicetree/bindings/vendor-prefixes.txt
View file

38
MAINTAINERS
View file

72
arch/arm/Kconfig
View file

66
arch/arm/Kconfig.debug
View file

4
arch/arm/Makefile
View file

1
arch/arm/boot/dts/Makefile
View file

48
arch/arm/boot/dts/zx296702-ad1.dts
View file

139
arch/arm/boot/dts/zx296702.dtsi
View file

1
arch/arm/configs/efm32_defconfig
View file

129
arch/arm/configs/zx_defconfig
View file

4
arch/arm/include/asm/firmware.h
View file

9
arch/arm/include/asm/vfp.h
View file

3
arch/arm/include/debug/8250.S
View file

2
arch/arm/include/debug/efm32.S
View file

15
arch/arm/include/debug/imx-uart.h
View file

7
arch/arm/include/debug/pl01x.S
View file

2
arch/arm/kernel/debug.S
View file

2
arch/arm/mach-bcm/Kconfig
View file

7
arch/arm/mach-bcm/Makefile
View file

23
arch/arm/mach-bcm/bcm63xx_headsmp.S
View file

221
arch/arm/mach-bcm/bcm63xx_pmb.c
View file

169
arch/arm/mach-bcm/bcm63xx_smp.c
View file

9
arch/arm/mach-bcm/bcm63xx_smp.h
View file

9
arch/arm/mach-bcm/bcm_5301x.c
View file

91
arch/arm/mach-bcm/board_bcm2835.c
View file

135
arch/arm/mach-ep93xx/simone.c
View file

4
arch/arm/mach-exynos/common.h
View file

3
arch/arm/mach-exynos/exynos.c
View file

18
arch/arm/mach-exynos/firmware.c
View file

86
arch/arm/mach-exynos/platsmp.c
View file

51
arch/arm/mach-exynos/pm.c
View file

53
arch/arm/mach-exynos/pm_domains.c
View file

6
arch/arm/mach-exynos/pmu.c
View file

2
arch/arm/mach-exynos/suspend.c
View file

49
arch/arm/mach-imx/Kconfig
View file

31
arch/arm/mach-imx/Makefile
View file

0
arch/arm/mach-imx/Makefile.boot
View file

5
arch/arm/mach-imx/anatop.c
View file

15
arch/arm/mach-imx/common.h
View file

3
arch/arm/mach-imx/cpu.c
View file

4
arch/arm/mach-imx/cpuidle-imx6q.c
View file

4
arch/arm/mach-imx/cpuidle-imx6sl.c
View file

4
arch/arm/mach-imx/cpuidle-imx6sx.c
View file

2
arch/arm/mach-imx/gpc.c
View file

1
arch/arm/mach-imx/hardware.h
View file

2
arch/arm/mach-imx/iomux-imx31.c
View file

1
arch/arm/mach-imx/mach-imx6q.c
View file

1
arch/arm/mach-imx/mach-imx6sl.c
View file

1
arch/arm/mach-imx/mach-imx6sx.c
View file

43
arch/arm/mach-imx/mach-imx7d.c
View file

1
arch/arm/mach-imx/mach-vf610.c
View file

2
arch/arm/mach-imx/mmdc.c
View file

4
arch/arm/mach-imx/mx27.h
View file

7
arch/arm/mach-imx/mx3x.h
View file

24
arch/arm/mach-imx/mxc.h
View file

205
arch/arm/mach-imx/pm-imx5.c
View file

38
arch/arm/mach-imx/pm-imx6.c
View file

139
arch/arm/mach-imx/suspend-imx53.S
View file

385
arch/arm/mach-imx/time.c
View file

1
arch/arm/mach-lpc18xx/Makefile
View file

3
arch/arm/mach-lpc18xx/Makefile.boot
View file

22
arch/arm/mach-lpc18xx/board-dt.c
View file

3
arch/arm/mach-omap1/ams-delta-fiq-handler.S
View file

1
arch/arm/mach-omap1/board-ams-delta.c
View file

1
arch/arm/mach-omap1/board-fsample.c
View file

1
arch/arm/mach-omap1/board-generic.c
View file

1
arch/arm/mach-omap1/board-h2.c
View file

1
arch/arm/mach-omap1/board-h3-mmc.c
View file

1
arch/arm/mach-omap1/board-h3.c
View file

1
arch/arm/mach-omap1/board-htcherald.c
View file

1
arch/arm/mach-omap1/board-innovator.c
View file

1
arch/arm/mach-omap1/board-nokia770.c
View file

1
arch/arm/mach-omap1/board-osk.c
View file

1
arch/arm/mach-omap1/board-palmte.c
View file

1
arch/arm/mach-omap1/board-palmtt.c
View file

1
arch/arm/mach-omap1/board-palmz71.c
View file

1
arch/arm/mach-omap1/board-perseus2.c
View file

1
arch/arm/mach-omap1/board-sx1.c
View file

1
arch/arm/mach-omap1/board-voiceblue.c
View file

7
arch/arm/mach-omap1/common.h
View file

2
arch/arm/mach-omap1/dma.c
View file

2
arch/arm/mach-omap1/gpio16xx.c
View file

2
arch/arm/mach-omap1/gpio7xx.c
View file

3
arch/arm/mach-omap1/i2c.c
View file

39
arch/arm/mach-omap1/include/mach/entry-macro.S
View file

124
arch/arm/mach-omap1/include/mach/irqs.h
View file

4
arch/arm/mach-omap1/include/mach/memory.h
View file

5
arch/arm/mach-omap1/include/mach/serial.h
View file

4
arch/arm/mach-omap1/include/mach/soc.h
View file

161
arch/arm/mach-omap1/irq.c
View file

8
arch/arm/mach-omap1/mux.c
View file

1
arch/arm/mach-omap1/pm.c
View file

Some files were not shown because too many files have changed in this diff Show more