Linus Torvalds 4aa705b18b 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 -----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' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc Pull ARM SoC platform support updates from Kevin Hilman: "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" * tag 'armsoc-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (134 commits) ARM: zx: Add basic defconfig support for ZX296702 ARM: dts: zx: add an initial zx296702 dts and doc clk: zx: add clock support to zx296702 dt-bindings: Add #defines for ZTE ZX296702 clocks ARM: socfpga: fix build error due to secondary_startup MAINTAINERS: ARM64: EXYNOS: Extend entry for ARM64 DTS ARM: ep93xx: simone: support for SPI-based MMC/SD cards MAINTAINERS: update Shawn's email to use kernel.org one ARM: socfpga: support suspend to ram ARM: socfpga: add CPU_METHOD_OF_DECLARE for Arria 10 ARM: socfpga: use CPU_METHOD_OF_DECLARE for socfpga_cyclone5 ARM: EXYNOS: register power domain driver from core_initcall ARM: EXYNOS: use PS_HOLD based poweroff for all supported SoCs ARM: SAMSUNG: Constify platform_device_id ARM: EXYNOS: Constify irq_domain_ops ARM: EXYNOS: add coupled cpuidle support for Exynos3250 ARM: EXYNOS: add exynos_get_boot_addr() helper ARM: EXYNOS: add exynos_set_boot_addr() helper ARM: EXYNOS: make exynos_core_restart() less verbose ARM: EXYNOS: fix exynos_boot_secondary() return value on timeout ...		2015-06-26 11:34:35 -07:00
..
at91	Merge branch 'ccf/atmel-fixes-for-4.1' of https://github.com/bbrezillon/linux-at91 into clk-fixes	2015-06-19 07:37:14 -07:00
bcm	clk: bcm/kona: use DIV_ROUND_CLOSEST_ULL()	2015-04-17 09:03:55 -04:00
berlin	clk: berlin: bg2q: remove non-exist "smemc" gate clock	2015-01-13 10:58:43 -08:00
h8300	clk: h8300: fix error handling in h8s2678_pll_clk_setup()	2015-06-23 13:35:58 +09:00
hisilicon	clk: don't use __initconst for non-const arrays	2015-04-12 17:18:27 -07:00
imx	ARM: SoC: platform support for v4.2	2015-06-26 11:34:35 -07:00
keystone
mmp	clk: Add rate constraints to clocks	2015-02-02 14:23:42 -08:00
mvebu	clk: mvebu: add Marvell Armada 39x driver	2015-03-04 15:18:53 +01:00
mxs	clk: don't use __initconst for non-const arrays	2015-04-12 17:18:27 -07:00
pistachio	CLK: Pistachio: Register external clock gates	2015-03-31 11:59:31 +02:00
pxa	clk: pxa: add missing pxa27x clocks for Irda and sa1100-rtc	2015-05-12 23:26:39 +02:00
qcom	clk: qcom: Add support for NSS/GMAC clocks and resets	2015-05-30 17:04:36 -07:00
rockchip	clk: don't use __initconst for non-const arrays	2015-04-12 17:18:27 -07:00
samsung	clk: exynos5420: Restore GATE_BUS_TOP on suspend	2015-05-05 10:51:04 +02:00
shmobile	ARM: shmobile: r8a7778: common clock framework CPG driver	2015-02-27 09:49:25 +09:00
sirf
socfpga
spear
st	clk: constify of_device_id array	2015-04-01 10:59:27 -07:00
sunxi	clk: sunxi: Add pll6 / 4 clock output to sun4i-a10-pll6	2015-03-25 11:46:41 -07:00
tegra	clk: tegra: Use the proper parent for plld_dsi	2015-04-10 16:04:22 +02:00
ti	CLK: TI: always enable DESHDCP clock	2015-06-04 09:00:52 +03:00
ux500	clk: ux500: Drop use of clk-private.h	2015-01-27 11:56:33 -08:00
versatile	clk: versatile: test returned value	2015-04-09 08:19:31 -07:00
x86	clk: x86: drop owner assignment from platform_drivers	2014-10-20 16:20:23 +02:00
zte	clk: zx: add clock support to zx296702	2015-06-11 16:18:08 -07:00
zynq	clk: don't use __initconst for non-const arrays	2015-04-12 17:18:27 -07:00
clk-asm9260.c	ARM: clk: add clk-asm9260 driver	2015-01-20 10:10:51 -08:00
clk-axi-clkgen.c	clk: Remove .owner field for driver	2014-09-25 17:43:31 -07:00
clk-axm5516.c	clk: drop owner assignment from platform_drivers	2014-10-20 16:20:22 +02:00
clk-bcm2835.c
clk-cdce706.c	clk: cdce706: Constify struct regmap_config	2015-03-27 00:23:27 -07:00
clk-clps711x.c
clk-composite.c	clk: Replace explicit clk assignment with __clk_hw_set_clk	2015-02-18 09:40:11 -08:00
clk-conf.c	clk: Replace of_clk_get_by_clkspec() with of_clk_get_from_provider()	2015-03-12 12:20:34 -07:00
clk-devres.c
clk-divider.c	clk: divider: fix calculation of initial best divider when rounding to closest	2015-03-09 14:20:17 -07:00
clk-efm32gg.c
clk-fixed-factor.c
clk-fixed-rate.c
clk-fractional-divider.c	clk: fractional-divider: support for divider bypassing	2015-03-12 12:18:47 -07:00
clk-gate.c	clk-gate: fix bit # check in clk_register_gate()	2015-01-20 10:09:05 -08:00
clk-gpio-gate.c	clk: clk-gpio-gate: Fix active low	2015-04-10 17:45:30 -07:00
clk-highbank.c
clk-ls1x.c	clk: ls1x: Update relationship among all clocks	2014-11-24 07:45:09 +01:00
clk-max-gen.c
clk-max-gen.h
clk-max77686.c	clk: Remove .owner field for driver	2014-09-25 17:43:31 -07:00
clk-max77802.c	clk: Remove .owner field for driver	2014-09-25 17:43:31 -07:00
clk-mb86s7x.c	clk: Add clock driver for mb86s7x	2015-04-10 13:51:55 -07:00
clk-moxart.c
clk-mux.c	clk: Add clk_unregister_{divider, gate, mux} to close memory leak	2015-01-17 13:52:41 -08:00
clk-nomadik.c
clk-nspire.c
clk-palmas.c	clk: constify of_device_id array	2015-04-01 10:59:27 -07:00
clk-pwm.c	clk: Add PWM clock driver	2015-04-10 14:44:43 -07:00
clk-qoriq.c	clk: qoriq: Add support for the platform PLL	2015-02-18 09:56:43 -08:00
clk-rk808.c	clk: RK808: add clkout driver for RK808	2014-10-14 02:18:18 +02:00
clk-s2mps11.c	clk: s2mps11: use clkdev_create()	2015-05-06 11:58:59 +01:00
clk-si570.c	clk: si570: Constify struct regmap_config	2015-03-27 00:22:49 -07:00
clk-si5351.c	clk: si5351: Do not pass struct clk in platform_data	2015-05-08 11:22:30 -07:00
clk-si5351.h
clk-twl6040.c	clk: Remove .owner field for driver	2014-09-25 17:43:31 -07:00
clk-u300.c
clk-vt8500.c
clk-wm831x.c	clk: Remove .owner field for driver	2014-09-25 17:43:31 -07:00
clk-xgene.c
clk.c	clk: add missing lock when call clk_core_enable in clk_set_parent	2015-05-06 16:58:53 -07:00
clk.h	clk: Replace of_clk_get_by_clkspec() with of_clk_get_from_provider()	2015-03-12 12:20:34 -07:00
clkdev.c	clkdev: add clkdev_create() helper	2015-05-06 11:58:57 +01:00
Kconfig	clk: Add PWM clock driver	2015-04-10 14:44:43 -07:00
Makefile	ARM: SoC: platform support for v4.2	2015-06-26 11:34:35 -07:00