Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cf470a1b authored by Tony Lindgren's avatar Tony Lindgren
Browse files

Merge tag 'dra7-core-support-minus-dt' of git://github.com/rrnayak/linux into omap-for-v3.12/soc

DRA7xx based SoC core support
parents d4e4ab86 8dd21c93
Loading
Loading
Loading
Loading
+3 −0
Original line number Diff line number Diff line
@@ -59,3 +59,6 @@ Boards:

- AM43x EPOS EVM
  compatible = "ti,am43x-epos-evm", "ti,am4372", "ti,am43"

- DRA7 EVM:  Software Developement Board for DRA7XX
  compatible = "ti,dra7-evm", "ti,dra7"
+1 −1
Original line number Diff line number Diff line
@@ -1600,7 +1600,7 @@ config LOCAL_TIMERS
config ARCH_NR_GPIO
	int
	default 1024 if ARCH_SHMOBILE || ARCH_TEGRA
	default 512 if ARCH_EXYNOS || ARCH_KEYSTONE || SOC_OMAP5
	default 512 if ARCH_EXYNOS || ARCH_KEYSTONE || SOC_OMAP5 || SOC_DRA7XX
	default 392 if ARCH_U8500
	default 352 if ARCH_VT8500
	default 288 if ARCH_SUNXI
+1 −0
Original line number Diff line number Diff line
@@ -306,3 +306,4 @@ CONFIG_TI_DAVINCI_MDIO=y
CONFIG_TI_DAVINCI_CPDMA=y
CONFIG_TI_CPSW=y
CONFIG_AT803X_PHY=y
CONFIG_SOC_DRA7XX=y
+1 −0
Original line number Diff line number Diff line
@@ -195,6 +195,7 @@ IS_OMAP_TYPE(1710, 0x1710)
#define cpu_is_omap34xx()		0
#define cpu_is_omap44xx()		0
#define soc_is_omap54xx()		0
#define soc_is_dra7xx()			0
#define soc_is_am33xx()			0
#define cpu_class_is_omap1()		1
#define cpu_class_is_omap2()		0
+10 −2
Original line number Diff line number Diff line
@@ -118,7 +118,7 @@ config ARCH_OMAP2PLUS_TYPICAL
	select I2C
	select I2C_OMAP
	select MENELAUS if ARCH_OMAP2
	select NEON if ARCH_OMAP3 || ARCH_OMAP4 || SOC_OMAP5
	select NEON if CPU_V7
	select PM_RUNTIME
	select REGULATOR
	select TWL4030_CORE if ARCH_OMAP3 || ARCH_OMAP4
@@ -132,9 +132,17 @@ config SOC_HAS_OMAP2_SDRC

config SOC_HAS_REALTIME_COUNTER
	bool "Real time free running counter"
	depends on SOC_OMAP5
	depends on SOC_OMAP5 || SOC_DRA7XX
	default y

config SOC_DRA7XX
	bool "TI DRA7XX"
	select ARM_ARCH_TIMER
	select CPU_V7
	select ARM_GIC
	select HAVE_SMP
	select COMMON_CLK

comment "OMAP Core Type"
	depends on ARCH_OMAP2

Loading