mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-11-01 00:48:50 +00:00
38206c24ab
Most of these are for MMP (seeing a bunch of cleanups and refactorings
for the first time in a while), and for OMAP (a bunch of cleanups and
added support for voltage controller on OMAP4430).
-----BEGIN PGP SIGNATURE-----
iQJCBAABCAAtFiEElf+HevZ4QCAJmMQ+jBrnPN6EHHcFAl3ohBEPHG9sb2ZAbGl4
b20ubmV0AAoJEIwa5zzehBx3NVAP917d1YAyrRPZWo28DVRuy8fg41yD6m8zq+P1
/Nki4QRVssWYR515zf1fJ8dyVmrvnb4iTxVoeRkneVmQKdcrJh/oMn8F0P7k/mXU
HwYiFxwTCZt5nIjz0NxUInznJcIeYUvBGDKS7a6Tqw3J+KcZSIpU3rr3Y8PaZRqZ
aKKUwNxXHJkD2J1MXsempPvZ+IYtx59ptFz99kLxBeTT+XfFz1sgAD32IoqwMhw2
prNCE9/QD8M5e5UrFhgrKLXGg1GgG5jvQelfctTdmF1Y5HUavmeWfp+1sT8QJSmw
arMjzYoX8efXDDhIyL6ECxxOkqG34BDcKoGMsq4pIiUaWJ1jrwfsrH1utH0jHU/H
vcsiGxzGKPCyVFMn6y8ppY8IO4HvLQxFZk1gStJ2Hezt4ay4g+LhUCK1hpNJuT82
ToxyMmPeNwVeZp+NKuxDuGfIpPqvGEsKNlPFQRP3IQIRf6BIYNbq4T2aHPjsTomK
nJ8xk3uL6R2FPKmx+wkWEqKiJvDhSbuZipHBHHhYiTPznAFL+i1kIwhK3Zdez42w
gR3yNMY3KTQFgZGcvjOYAj+90pmlR09DAJK/6+DTNUKbsyxUBIxIoMSYOuhkmb8P
YjZNeztjv545gLVJ7z2vPefTrbd+RqQxv6HiNzdIrrhA6OHzMQBf+V6JzAtY0ZD9
rxPsRJo=
=Tga8
-----END PGP SIGNATURE-----
Merge tag 'armsoc-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc
Pull ARM SoC platform updates from Olof Johansson:
"Most of these are for MMP (seeing a bunch of cleanups and refactorings
for the first time in a while), and for OMAP (a bunch of cleanups and
added support for voltage controller on OMAP4430)"
* tag 'armsoc-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (51 commits)
ARM: OMAP2+: Add missing put_device() call in omapdss_init_of()
OMAP2: fixup doc comments in omap_device
ARM: OMAP1: drop duplicated dependency on ARCH_OMAP1
ARM: ASPEED: update default ARCH_NR_GPIO for ARCH_ASPEED
ARM: imx: use generic function to exit coherency
ARM: tegra: Use WFE for power-gating on Tegra30
ARM: tegra: Fix FLOW_CTLR_HALT register clobbering by tegra_resume()
ARM: exynos: Enable exynos-asv driver for ARCH_EXYNOS
ARM: s3c: Rename s5p_usb_phy functions
ARM: s3c: Rename s3c64xx_spi_setname() function
ARM: imx: Add serial number support for i.MX6/7 SoCs
ARM: imx: Drop imx_anatop_usb_chrg_detect_disable()
arm64: Introduce config for S32
ARM: hisi: drop useless depend on ARCH_MULTI_V7
arm64: realtek: Select reset controller
ARM: shmobile: rcar-gen2: Drop legacy DT clock support
ARM: OMAP2+: Remove duplicated include from pmic-cpcap.c
ARM: OMAP1: ams-delta FIQ: Fix a typo ("Initiaize")
MAINTAINERS: Add logicpd-som-lv and logicpd-torpedo to OMAP TREE
ARM: OMAP2+: pdata-quirks: drop TI_ST/KIM support
...
236 lines
9.2 KiB
Makefile
236 lines
9.2 KiB
Makefile
# SPDX-License-Identifier: GPL-2.0
|
|
#
|
|
# Makefile for the linux kernel.
|
|
#
|
|
|
|
ccflags-y := -I$(srctree)/$(src)/include \
|
|
-I$(srctree)/arch/arm/plat-omap/include
|
|
|
|
# Common support
|
|
obj-y := id.o io.o control.o devices.o fb.o timer.o pm.o \
|
|
common.o dma.o wd_timer.o display.o i2c.o hdq1w.o omap_hwmod.o \
|
|
omap_device.o omap-headsmp.o sram.o
|
|
|
|
hwmod-common = omap_hwmod.o omap_hwmod_reset.o \
|
|
omap_hwmod_common_data.o
|
|
clock-common = clock.o
|
|
secure-common = omap-smc.o omap-secure.o
|
|
|
|
obj-$(CONFIG_ARCH_OMAP2) += $(omap-2-3-common) $(hwmod-common)
|
|
obj-$(CONFIG_ARCH_OMAP3) += $(omap-2-3-common) $(hwmod-common) $(secure-common)
|
|
obj-$(CONFIG_ARCH_OMAP4) += $(hwmod-common) $(secure-common)
|
|
obj-$(CONFIG_SOC_AM33XX) += $(hwmod-common)
|
|
obj-$(CONFIG_SOC_OMAP5) += $(hwmod-common) $(secure-common)
|
|
obj-$(CONFIG_SOC_AM43XX) += $(hwmod-common) $(secure-common)
|
|
obj-$(CONFIG_SOC_DRA7XX) += $(hwmod-common) $(secure-common)
|
|
|
|
ifneq ($(CONFIG_SND_SOC_OMAP_MCBSP),)
|
|
obj-y += mcbsp.o
|
|
endif
|
|
|
|
obj-$(CONFIG_TWL4030_CORE) += omap_twl.o
|
|
|
|
ifneq ($(CONFIG_MFD_CPCAP),)
|
|
obj-y += pmic-cpcap.o
|
|
endif
|
|
|
|
obj-$(CONFIG_SOC_HAS_OMAP2_SDRC) += sdrc.o
|
|
|
|
# SMP support ONLY available for OMAP4
|
|
|
|
smp-$(CONFIG_SMP) += omap-smp.o
|
|
smp-$(CONFIG_HOTPLUG_CPU) += omap-hotplug.o
|
|
omap-4-5-common = omap4-common.o omap-wakeupgen.o
|
|
obj-$(CONFIG_ARCH_OMAP4) += $(omap-4-5-common) $(smp-y) sleep44xx.o
|
|
obj-$(CONFIG_SOC_OMAP5) += $(omap-4-5-common) $(smp-y) sleep44xx.o
|
|
obj-$(CONFIG_SOC_AM43XX) += $(omap-4-5-common)
|
|
obj-$(CONFIG_SOC_DRA7XX) += $(omap-4-5-common) $(smp-y) sleep44xx.o
|
|
|
|
# Functions loaded to SRAM
|
|
obj-$(CONFIG_SOC_OMAP2420) += sram242x.o
|
|
obj-$(CONFIG_SOC_OMAP2430) += sram243x.o
|
|
|
|
# Restart code (OMAP4/5 currently in omap4-common.c)
|
|
obj-$(CONFIG_SOC_OMAP2420) += omap2-restart.o
|
|
obj-$(CONFIG_SOC_OMAP2430) += omap2-restart.o
|
|
obj-$(CONFIG_SOC_TI81XX) += ti81xx-restart.o
|
|
obj-$(CONFIG_SOC_AM33XX) += am33xx-restart.o
|
|
obj-$(CONFIG_SOC_AM43XX) += omap4-restart.o
|
|
obj-$(CONFIG_ARCH_OMAP3) += omap3-restart.o
|
|
obj-$(CONFIG_ARCH_OMAP4) += omap4-restart.o
|
|
obj-$(CONFIG_SOC_OMAP5) += omap4-restart.o
|
|
obj-$(CONFIG_SOC_DRA7XX) += omap4-restart.o
|
|
|
|
# SMS/SDRC
|
|
obj-$(CONFIG_ARCH_OMAP2) += sdrc2xxx.o
|
|
# obj-$(CONFIG_ARCH_OMAP3) += sdrc3xxx.o
|
|
|
|
# OPP table initialization
|
|
ifeq ($(CONFIG_PM_OPP),y)
|
|
obj-$(CONFIG_ARCH_OMAP3) += opp3xxx_data.o
|
|
obj-$(CONFIG_ARCH_OMAP4) += opp4xxx_data.o
|
|
endif
|
|
|
|
# Power Management
|
|
omap-4-5-pm-common = omap-mpuss-lowpower.o
|
|
obj-$(CONFIG_ARCH_OMAP4) += $(omap-4-5-pm-common)
|
|
obj-$(CONFIG_SOC_OMAP5) += $(omap-4-5-pm-common)
|
|
|
|
ifeq ($(CONFIG_PM),y)
|
|
obj-$(CONFIG_ARCH_OMAP2) += pm24xx.o
|
|
obj-$(CONFIG_ARCH_OMAP2) += sleep24xx.o
|
|
obj-$(CONFIG_ARCH_OMAP3) += pm34xx.o sleep34xx.o
|
|
omap-4-5-pm-common += pm44xx.o
|
|
obj-$(CONFIG_ARCH_OMAP4) += $(omap-4-5-pm-common)
|
|
obj-$(CONFIG_SOC_OMAP5) += $(omap-4-5-pm-common)
|
|
obj-$(CONFIG_SOC_DRA7XX) += $(omap-4-5-pm-common)
|
|
obj-$(CONFIG_SOC_AM33XX) += pm33xx-core.o sleep33xx.o
|
|
obj-$(CONFIG_SOC_AM43XX) += pm33xx-core.o sleep43xx.o
|
|
obj-$(CONFIG_PM_DEBUG) += pm-debug.o
|
|
|
|
obj-$(CONFIG_POWER_AVS_OMAP) += sr_device.o
|
|
obj-$(CONFIG_POWER_AVS_OMAP_CLASS3) += smartreflex-class3.o
|
|
|
|
endif
|
|
|
|
ifeq ($(CONFIG_CPU_IDLE),y)
|
|
obj-$(CONFIG_ARCH_OMAP3) += cpuidle34xx.o
|
|
omap-4-5-idle-common = cpuidle44xx.o
|
|
obj-$(CONFIG_ARCH_OMAP4) += $(omap-4-5-idle-common)
|
|
obj-$(CONFIG_SOC_OMAP5) += $(omap-4-5-idle-common)
|
|
obj-$(CONFIG_SOC_DRA7XX) += $(omap-4-5-idle-common)
|
|
endif
|
|
|
|
# PRCM
|
|
obj-y += prm_common.o cm_common.o
|
|
obj-$(CONFIG_ARCH_OMAP2) += prm2xxx_3xxx.o prm2xxx.o cm2xxx.o
|
|
obj-$(CONFIG_ARCH_OMAP3) += prm2xxx_3xxx.o prm3xxx.o cm3xxx.o
|
|
obj-$(CONFIG_ARCH_OMAP3) += vc3xxx_data.o vp3xxx_data.o
|
|
omap-prcm-4-5-common = cminst44xx.o prm44xx.o \
|
|
prcm_mpu44xx.o prminst44xx.o \
|
|
vc44xx_data.o vp44xx_data.o
|
|
obj-$(CONFIG_ARCH_OMAP4) += $(omap-prcm-4-5-common)
|
|
obj-$(CONFIG_SOC_OMAP5) += $(omap-prcm-4-5-common)
|
|
obj-$(CONFIG_SOC_DRA7XX) += $(omap-prcm-4-5-common)
|
|
am33xx-43xx-prcm-common += prm33xx.o cm33xx.o
|
|
obj-$(CONFIG_SOC_TI81XX) += $(am33xx-43xx-prcm-common)
|
|
obj-$(CONFIG_SOC_AM33XX) += $(am33xx-43xx-prcm-common)
|
|
obj-$(CONFIG_SOC_AM43XX) += $(omap-prcm-4-5-common) \
|
|
$(am33xx-43xx-prcm-common)
|
|
|
|
# OMAP voltage domains
|
|
voltagedomain-common := voltage.o vc.o vp.o
|
|
obj-$(CONFIG_ARCH_OMAP2) += $(voltagedomain-common)
|
|
obj-$(CONFIG_ARCH_OMAP2) += voltagedomains2xxx_data.o
|
|
obj-$(CONFIG_ARCH_OMAP3) += $(voltagedomain-common)
|
|
obj-$(CONFIG_ARCH_OMAP3) += voltagedomains3xxx_data.o
|
|
obj-$(CONFIG_ARCH_OMAP4) += $(voltagedomain-common)
|
|
obj-$(CONFIG_ARCH_OMAP4) += voltagedomains44xx_data.o
|
|
obj-$(CONFIG_SOC_AM33XX) += $(voltagedomain-common)
|
|
obj-$(CONFIG_SOC_AM43XX) += $(voltagedomain-common)
|
|
obj-$(CONFIG_SOC_OMAP5) += $(voltagedomain-common)
|
|
obj-$(CONFIG_SOC_OMAP5) += voltagedomains54xx_data.o
|
|
obj-$(CONFIG_SOC_DRA7XX) += $(voltagedomain-common)
|
|
|
|
# OMAP powerdomain framework
|
|
powerdomain-common += powerdomain.o powerdomain-common.o
|
|
obj-$(CONFIG_ARCH_OMAP2) += $(powerdomain-common)
|
|
obj-$(CONFIG_ARCH_OMAP2) += powerdomains2xxx_data.o
|
|
obj-$(CONFIG_ARCH_OMAP2) += powerdomains2xxx_3xxx_data.o
|
|
obj-$(CONFIG_ARCH_OMAP3) += $(powerdomain-common)
|
|
obj-$(CONFIG_ARCH_OMAP3) += powerdomains3xxx_data.o
|
|
obj-$(CONFIG_ARCH_OMAP3) += powerdomains2xxx_3xxx_data.o
|
|
obj-$(CONFIG_ARCH_OMAP4) += $(powerdomain-common)
|
|
obj-$(CONFIG_ARCH_OMAP4) += powerdomains44xx_data.o
|
|
obj-$(CONFIG_SOC_AM33XX) += $(powerdomain-common)
|
|
obj-$(CONFIG_SOC_AM33XX) += powerdomains33xx_data.o
|
|
obj-$(CONFIG_SOC_AM43XX) += $(powerdomain-common)
|
|
obj-$(CONFIG_SOC_AM43XX) += powerdomains43xx_data.o
|
|
obj-$(CONFIG_SOC_OMAP5) += $(powerdomain-common)
|
|
obj-$(CONFIG_SOC_OMAP5) += powerdomains54xx_data.o
|
|
obj-$(CONFIG_SOC_DRA7XX) += $(powerdomain-common)
|
|
obj-$(CONFIG_SOC_DRA7XX) += powerdomains7xx_data.o
|
|
|
|
# PRCM clockdomain control
|
|
clockdomain-common += clockdomain.o
|
|
obj-$(CONFIG_ARCH_OMAP2) += $(clockdomain-common)
|
|
obj-$(CONFIG_ARCH_OMAP2) += clockdomains2xxx_3xxx_data.o
|
|
obj-$(CONFIG_SOC_OMAP2420) += clockdomains2420_data.o
|
|
obj-$(CONFIG_SOC_OMAP2430) += clockdomains2430_data.o
|
|
obj-$(CONFIG_ARCH_OMAP3) += $(clockdomain-common)
|
|
obj-$(CONFIG_ARCH_OMAP3) += clockdomains2xxx_3xxx_data.o
|
|
obj-$(CONFIG_ARCH_OMAP3) += clockdomains3xxx_data.o
|
|
obj-$(CONFIG_ARCH_OMAP4) += $(clockdomain-common)
|
|
obj-$(CONFIG_ARCH_OMAP4) += clockdomains44xx_data.o
|
|
obj-$(CONFIG_SOC_AM33XX) += $(clockdomain-common)
|
|
obj-$(CONFIG_SOC_AM33XX) += clockdomains33xx_data.o
|
|
obj-$(CONFIG_SOC_TI81XX) += $(clockdomain-common)
|
|
obj-$(CONFIG_SOC_TI81XX) += clockdomains81xx_data.o
|
|
obj-$(CONFIG_SOC_AM43XX) += $(clockdomain-common)
|
|
obj-$(CONFIG_SOC_AM43XX) += clockdomains43xx_data.o
|
|
obj-$(CONFIG_SOC_OMAP5) += $(clockdomain-common)
|
|
obj-$(CONFIG_SOC_OMAP5) += clockdomains54xx_data.o
|
|
obj-$(CONFIG_SOC_DRA7XX) += $(clockdomain-common)
|
|
obj-$(CONFIG_SOC_DRA7XX) += clockdomains7xx_data.o
|
|
|
|
# Clock framework
|
|
obj-$(CONFIG_ARCH_OMAP2) += $(clock-common)
|
|
obj-$(CONFIG_ARCH_OMAP2) += clkt2xxx_dpllcore.o
|
|
obj-$(CONFIG_ARCH_OMAP2) += clkt2xxx_virt_prcm_set.o
|
|
obj-$(CONFIG_ARCH_OMAP2) += clkt2xxx_dpll.o
|
|
obj-$(CONFIG_ARCH_OMAP3) += $(clock-common)
|
|
obj-$(CONFIG_ARCH_OMAP4) += $(clock-common)
|
|
obj-$(CONFIG_SOC_AM33XX) += $(clock-common)
|
|
obj-$(CONFIG_SOC_OMAP5) += $(clock-common)
|
|
obj-$(CONFIG_SOC_DRA7XX) += $(clock-common)
|
|
obj-$(CONFIG_SOC_AM43XX) += $(clock-common)
|
|
|
|
# OMAP2 clock rate set data (old "OPP" data)
|
|
obj-$(CONFIG_SOC_OMAP2420) += opp2420_data.o
|
|
obj-$(CONFIG_SOC_OMAP2430) += opp2430_data.o
|
|
|
|
# hwmod data
|
|
obj-y += omap_hwmod_common_ipblock_data.o
|
|
obj-$(CONFIG_SOC_OMAP2420) += omap_hwmod_2xxx_ipblock_data.o
|
|
obj-$(CONFIG_SOC_OMAP2420) += omap_hwmod_2xxx_3xxx_ipblock_data.o
|
|
obj-$(CONFIG_SOC_OMAP2420) += omap_hwmod_2xxx_interconnect_data.o
|
|
obj-$(CONFIG_SOC_OMAP2420) += omap_hwmod_2420_data.o
|
|
obj-$(CONFIG_SOC_OMAP2430) += omap_hwmod_2xxx_ipblock_data.o
|
|
obj-$(CONFIG_SOC_OMAP2430) += omap_hwmod_2xxx_3xxx_ipblock_data.o
|
|
obj-$(CONFIG_SOC_OMAP2430) += omap_hwmod_2xxx_interconnect_data.o
|
|
obj-$(CONFIG_SOC_OMAP2430) += omap_hwmod_2430_data.o
|
|
obj-$(CONFIG_ARCH_OMAP3) += omap_hwmod_2xxx_3xxx_ipblock_data.o
|
|
obj-$(CONFIG_ARCH_OMAP3) += omap_hwmod_3xxx_data.o
|
|
obj-$(CONFIG_SOC_AM33XX) += omap_hwmod_33xx_data.o
|
|
obj-$(CONFIG_SOC_AM33XX) += omap_hwmod_33xx_43xx_interconnect_data.o
|
|
obj-$(CONFIG_SOC_AM33XX) += omap_hwmod_33xx_43xx_ipblock_data.o
|
|
obj-$(CONFIG_SOC_AM43XX) += omap_hwmod_43xx_data.o
|
|
obj-$(CONFIG_SOC_AM43XX) += omap_hwmod_33xx_43xx_interconnect_data.o
|
|
obj-$(CONFIG_SOC_AM43XX) += omap_hwmod_33xx_43xx_ipblock_data.o
|
|
obj-$(CONFIG_SOC_TI81XX) += omap_hwmod_81xx_data.o
|
|
obj-$(CONFIG_ARCH_OMAP4) += omap_hwmod_44xx_data.o
|
|
obj-$(CONFIG_SOC_OMAP5) += omap_hwmod_54xx_data.o
|
|
obj-$(CONFIG_SOC_DRA7XX) += omap_hwmod_7xx_data.o
|
|
|
|
# OMAP2420 MSDI controller integration support ("MMC")
|
|
obj-$(CONFIG_SOC_OMAP2420) += msdi.o
|
|
|
|
# Specific board support
|
|
obj-$(CONFIG_MACH_OMAP_GENERIC) += board-generic.o pdata-quirks.o
|
|
obj-$(CONFIG_MACH_NOKIA_N8X0) += board-n8x0.o
|
|
|
|
# Platform specific device init code
|
|
|
|
obj-y += omap_phy_internal.o
|
|
|
|
obj-$(CONFIG_MACH_OMAP2_TUSB6010) += usb-tusb6010.o
|
|
|
|
$(obj)/pm-asm-offsets.h: $(obj)/pm-asm-offsets.s FORCE
|
|
$(call filechk,offsets,__TI_PM_ASM_OFFSETS_H__)
|
|
|
|
$(obj)/sleep33xx.o $(obj)/sleep43xx.o: $(obj)/pm-asm-offsets.h
|
|
|
|
targets += pm-asm-offsets.s
|
|
clean-files += pm-asm-offsets.h
|
|
|
|
obj-$(CONFIG_OMAP_IOMMU) += omap-iommu.o
|