mirror of
https://github.com/torvalds/linux.git
synced 2024-12-25 12:21:37 +00:00
4aa705b18b
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 ... |
||
|---|---|---|
| .. | ||
| include/mach | ||
| ams-delta-fiq-handler.S | ||
| ams-delta-fiq.c | ||
| board-ams-delta.c | ||
| board-fsample.c | ||
| board-generic.c | ||
| board-h2-mmc.c | ||
| board-h2.c | ||
| board-h2.h | ||
| board-h3-mmc.c | ||
| board-h3.c | ||
| board-h3.h | ||
| board-htcherald.c | ||
| board-innovator.c | ||
| board-nand.c | ||
| board-nokia770.c | ||
| board-osk.c | ||
| board-palmte.c | ||
| board-palmtt.c | ||
| board-palmz71.c | ||
| board-perseus2.c | ||
| board-sx1-mmc.c | ||
| board-sx1.c | ||
| board-voiceblue.c | ||
| clock_data.c | ||
| clock.c | ||
| clock.h | ||
| common.h | ||
| devices.c | ||
| dma.c | ||
| fb.c | ||
| flash.c | ||
| fpga.c | ||
| fpga.h | ||
| gpio7xx.c | ||
| gpio15xx.c | ||
| gpio16xx.c | ||
| i2c.c | ||
| id.c | ||
| io.c | ||
| iomap.h | ||
| irq.c | ||
| Kconfig | ||
| lcd_dma.c | ||
| Makefile | ||
| Makefile.boot | ||
| mcbsp.c | ||
| mmc.h | ||
| mux.c | ||
| ocpi.c | ||
| opp_data.c | ||
| opp.h | ||
| pm_bus.c | ||
| pm.c | ||
| pm.h | ||
| reset.c | ||
| serial.c | ||
| sleep.S | ||
| soc.h | ||
| sram-init.c | ||
| sram.h | ||
| sram.S | ||
| time.c | ||
| timer32k.c | ||
| timer.c | ||
| usb.c | ||