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

Commit d296ebe0 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'omap-for-v3.12/dra7xx-prcm' of... 

Merge tag 'omap-for-v3.12/dra7xx-prcm' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into late/all

From Tony Lindgren:
Add basic support for devices on dra7xx by adding the PRCM and hwmod
parts the same way as for other omaps. This is still needed in
addition to device tree support for things like power management.

Via Paul Walmsley <paul@pwsan.com>:

This series adds basic TI DRA7xx PRCM and hwmod support.

Basic test logs are available here:

http://www.pwsan.com/omap/testlogs/dra7xx_prcm_devel_v3.12/20130823050445/

Note that DRA7xx could not be tested locally, since I don't have a board.

* tag 'omap-for-v3.12/dra7xx-prcm' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap

:
  ARM: OMAP: DRA7: Enable PM framework initializations
  ARM: OMAP: DRA7: hwmod: Create initial DRA7XX SoC data
  ARM: OMAP: DRA7: Reuse the omap44xx_restart and fix the device instance
  ARM: OMAP: DRA7: powerdomain: Handle missing vc/vp
  ARM: OMAP: DRA7: powerdomain: Add DRA7XX data and update header
  ARM: OMAP: DRA7: clockdomain: Add DRA7XX data and update header
  ARM: OMAP: DRA7: PRCM: Add DRA7XX local MPU PRCM regsiters
  ARM: OMAP: DRA7: CM: Add minimal regbit shifts
  ARM: OMAP: DRA7: CM: Add DRA7XX register defines
  ARM: OMAP: DRA7: PRM: Add DRA7XX register definitions
  ARM: DRA7: Add the build support in omap2plus
  ARM: DRA7: hwmod: Reuse the soc_ops used for OMAP4/5
  ARM: DRA7: id: Add cpu detection support for DRA7xx based SoCs'
  ARM: DRA7: Kconfig: Make ARCH_NR_GPIO default to 512
  ARM: DRA7: board-generic: Add basic DT support
  ARM: DRA7: Resue the clocksource, clockevent support
  ARM: DRA7: Reuse io tables and add a new .init_early
  ARM: DRA7: Reuse all of PRCM and MPUSS SMP infra

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 65cb771f e3e1970f

Documentation/devicetree/bindings/arm/omap/omap.txt

+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"

arch/arm/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -1601,7 +1601,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

arch/arm/configs/omap2plus_defconfig

+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

arch/arm/mach-omap1/include/mach/soc.h

+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

arch/arm/mach-omap2/Kconfig

+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