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 ...
78 lines
3.1 KiB
Makefile
78 lines
3.1 KiB
Makefile
# common clock types
|
|
obj-$(CONFIG_HAVE_CLK) += clk-devres.o
|
|
obj-$(CONFIG_CLKDEV_LOOKUP) += clkdev.o
|
|
obj-$(CONFIG_COMMON_CLK) += clk.o
|
|
obj-$(CONFIG_COMMON_CLK) += clk-divider.o
|
|
obj-$(CONFIG_COMMON_CLK) += clk-fixed-factor.o
|
|
obj-$(CONFIG_COMMON_CLK) += clk-fixed-rate.o
|
|
obj-$(CONFIG_COMMON_CLK) += clk-gate.o
|
|
obj-$(CONFIG_COMMON_CLK) += clk-mux.o
|
|
obj-$(CONFIG_COMMON_CLK) += clk-composite.o
|
|
obj-$(CONFIG_COMMON_CLK) += clk-fractional-divider.o
|
|
obj-$(CONFIG_COMMON_CLK) += clk-gpio-gate.o
|
|
ifeq ($(CONFIG_OF), y)
|
|
obj-$(CONFIG_COMMON_CLK) += clk-conf.o
|
|
endif
|
|
|
|
# hardware specific clock types
|
|
# please keep this section sorted lexicographically by file/directory path name
|
|
obj-$(CONFIG_MACH_ASM9260) += clk-asm9260.o
|
|
obj-$(CONFIG_COMMON_CLK_AXI_CLKGEN) += clk-axi-clkgen.o
|
|
obj-$(CONFIG_ARCH_AXXIA) += clk-axm5516.o
|
|
obj-$(CONFIG_ARCH_BCM2835) += clk-bcm2835.o
|
|
obj-$(CONFIG_COMMON_CLK_CDCE706) += clk-cdce706.o
|
|
obj-$(CONFIG_ARCH_CLPS711X) += clk-clps711x.o
|
|
obj-$(CONFIG_ARCH_EFM32) += clk-efm32gg.o
|
|
obj-$(CONFIG_ARCH_HIGHBANK) += clk-highbank.o
|
|
obj-$(CONFIG_MACH_LOONGSON1) += clk-ls1x.o
|
|
obj-$(CONFIG_COMMON_CLK_MAX_GEN) += clk-max-gen.o
|
|
obj-$(CONFIG_COMMON_CLK_MAX77686) += clk-max77686.o
|
|
obj-$(CONFIG_COMMON_CLK_MAX77802) += clk-max77802.o
|
|
obj-$(CONFIG_ARCH_MB86S7X) += clk-mb86s7x.o
|
|
obj-$(CONFIG_ARCH_MOXART) += clk-moxart.o
|
|
obj-$(CONFIG_ARCH_NOMADIK) += clk-nomadik.o
|
|
obj-$(CONFIG_ARCH_NSPIRE) += clk-nspire.o
|
|
obj-$(CONFIG_COMMON_CLK_PALMAS) += clk-palmas.o
|
|
obj-$(CONFIG_CLK_QORIQ) += clk-qoriq.o
|
|
obj-$(CONFIG_COMMON_CLK_RK808) += clk-rk808.o
|
|
obj-$(CONFIG_COMMON_CLK_S2MPS11) += clk-s2mps11.o
|
|
obj-$(CONFIG_COMMON_CLK_SI5351) += clk-si5351.o
|
|
obj-$(CONFIG_COMMON_CLK_SI570) += clk-si570.o
|
|
obj-$(CONFIG_CLK_TWL6040) += clk-twl6040.o
|
|
obj-$(CONFIG_ARCH_U300) += clk-u300.o
|
|
obj-$(CONFIG_ARCH_VT8500) += clk-vt8500.o
|
|
obj-$(CONFIG_COMMON_CLK_WM831X) += clk-wm831x.o
|
|
obj-$(CONFIG_COMMON_CLK_XGENE) += clk-xgene.o
|
|
obj-$(CONFIG_COMMON_CLK_PWM) += clk-pwm.o
|
|
obj-$(CONFIG_COMMON_CLK_AT91) += at91/
|
|
obj-$(CONFIG_ARCH_BCM_MOBILE) += bcm/
|
|
obj-$(CONFIG_ARCH_BERLIN) += berlin/
|
|
obj-$(CONFIG_ARCH_HI3xxx) += hisilicon/
|
|
obj-$(CONFIG_ARCH_HIP04) += hisilicon/
|
|
obj-$(CONFIG_ARCH_HIX5HD2) += hisilicon/
|
|
obj-$(CONFIG_ARCH_MXC) += imx/
|
|
obj-$(CONFIG_COMMON_CLK_KEYSTONE) += keystone/
|
|
ifeq ($(CONFIG_COMMON_CLK), y)
|
|
obj-$(CONFIG_ARCH_MMP) += mmp/
|
|
endif
|
|
obj-$(CONFIG_PLAT_ORION) += mvebu/
|
|
obj-$(CONFIG_ARCH_MXS) += mxs/
|
|
obj-$(CONFIG_MACH_PISTACHIO) += pistachio/
|
|
obj-$(CONFIG_COMMON_CLK_PXA) += pxa/
|
|
obj-$(CONFIG_COMMON_CLK_QCOM) += qcom/
|
|
obj-$(CONFIG_ARCH_ROCKCHIP) += rockchip/
|
|
obj-$(CONFIG_COMMON_CLK_SAMSUNG) += samsung/
|
|
obj-$(CONFIG_ARCH_SHMOBILE_MULTI) += shmobile/
|
|
obj-$(CONFIG_ARCH_SIRF) += sirf/
|
|
obj-$(CONFIG_ARCH_SOCFPGA) += socfpga/
|
|
obj-$(CONFIG_PLAT_SPEAR) += spear/
|
|
obj-$(CONFIG_ARCH_STI) += st/
|
|
obj-$(CONFIG_ARCH_SUNXI) += sunxi/
|
|
obj-$(CONFIG_ARCH_TEGRA) += tegra/
|
|
obj-$(CONFIG_ARCH_OMAP2PLUS) += ti/
|
|
obj-$(CONFIG_ARCH_U8500) += ux500/
|
|
obj-$(CONFIG_COMMON_CLK_VERSATILE) += versatile/
|
|
obj-$(CONFIG_X86) += x86/
|
|
obj-$(CONFIG_ARCH_ZX) += zte/
|
|
obj-$(CONFIG_ARCH_ZYNQ) += zynq/
|
|
obj-$(CONFIG_H8300) += h8300/
|