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

Commit cff9f37a authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge branch 'omap/cleanup-prcm-part2' into next/dt 



This resolves a nontrivial conflict where the omap_prcm_restart
is removed in one branch but another use is added in another
branch.

Conflicts:
	arch/arm/mach-omap2/cm33xx.c
	arch/arm/mach-omap2/io.c
	arch/arm/mach-omap2/prm_common.c

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents b599dc07 cc4b1e24

arch/arm/mach-omap1/common.h

+2 −0
Original line number Diff line number Diff line
@@ -93,4 +93,6 @@ extern int ocpi_enable(void); 
static inline int ocpi_enable(void) { return 0; }

#endif



extern u32 omap1_get_reset_sources(void);



#endif /* __ARCH_ARM_MACH_OMAP1_COMMON_H */

arch/arm/mach-omap1/devices.c

+18 −3
Original line number Diff line number Diff line
@@ -17,6 +17,8 @@ 
#include <linux/platform_device.h>

#include <linux/spi/spi.h>



#include <linux/platform_data/omap-wd-timer.h>



#include <asm/mach/map.h>



#include <mach/tc.h>
@@ -455,10 +457,23 @@ static struct platform_device omap_wdt_device = { 


static int __init omap_init_wdt(void)

{

	struct omap_wd_timer_platform_data pdata;

	int ret;



	if (!cpu_is_omap16xx())

		return -ENODEV;



	return platform_device_register(&omap_wdt_device);

	pdata.read_reset_sources = omap1_get_reset_sources;



	ret = platform_device_register(&omap_wdt_device);

	if (!ret) {

		ret = platform_device_add_data(&omap_wdt_device, &pdata,

					       sizeof(pdata));

		if (ret)

			platform_device_del(&omap_wdt_device);

	}



	return ret;

}

subsys_initcall(omap_init_wdt);

#endif

arch/arm/mach-omap1/reset.c

+39 −2
Original line number Diff line number Diff line
@@ -4,12 +4,24 @@ 
#include <linux/kernel.h>

#include <linux/io.h>



#include <plat/prcm.h>



#include <mach/hardware.h>



#include "iomap.h"

#include "common.h"



/* ARM_SYSST bit shifts related to SoC reset sources */

#define ARM_SYSST_POR_SHIFT				5

#define ARM_SYSST_EXT_RST_SHIFT				4

#define ARM_SYSST_ARM_WDRST_SHIFT			2

#define ARM_SYSST_GLOB_SWRST_SHIFT			1



/* Standardized reset source bits (across all OMAP SoCs) */

#define OMAP_GLOBAL_COLD_RST_SRC_ID_SHIFT		0

#define OMAP_GLOBAL_WARM_RST_SRC_ID_SHIFT		1

#define OMAP_MPU_WD_RST_SRC_ID_SHIFT			3

#define OMAP_EXTWARM_RST_SRC_ID_SHIFT			5





void omap1_restart(char mode, const char *cmd)

{

	/*
@@ -23,3 +35,28 @@ void omap1_restart(char mode, const char *cmd) 


	omap_writew(1, ARM_RSTCT1);

}



/**

 * omap1_get_reset_sources - return the source of the SoC's last reset

 *

 * Returns bits that represent the last reset source for the SoC.  The

 * format is standardized across OMAPs for use by the OMAP watchdog.

 */

u32 omap1_get_reset_sources(void)

{

	u32 ret = 0;

	u16 rs;



	rs = __raw_readw(OMAP1_IO_ADDRESS(ARM_SYSST));



	if (rs & (1 << ARM_SYSST_POR_SHIFT))

		ret |= 1 << OMAP_GLOBAL_COLD_RST_SRC_ID_SHIFT;

	if (rs & (1 << ARM_SYSST_EXT_RST_SHIFT))

		ret |= 1 << OMAP_EXTWARM_RST_SRC_ID_SHIFT;

	if (rs & (1 << ARM_SYSST_ARM_WDRST_SHIFT))

		ret |= 1 << OMAP_MPU_WD_RST_SRC_ID_SHIFT;

	if (rs & (1 << ARM_SYSST_GLOB_SWRST_SHIFT))

		ret |= 1 << OMAP_GLOBAL_WARM_RST_SRC_ID_SHIFT;



	return ret;

}

arch/arm/mach-omap2/Makefile

+65 −50
Original line number Diff line number Diff line
@@ -7,28 +7,34 @@ obj-y := id.o io.o control.o mux.o devices.o serial.o gpmc.o timer.o pm.o \ 
	 common.o gpio.o dma.o wd_timer.o display.o i2c.o hdq1w.o omap_hwmod.o \

	 omap_device.o sram.o



# INTCPS IP block support - XXX should be moved to drivers/

obj-$(CONFIG_ARCH_OMAP2)		+= irq.o

obj-$(CONFIG_ARCH_OMAP3)		+= irq.o

obj-$(CONFIG_SOC_AM33XX)		+= irq.o

omap-2-3-common				= irq.o

hwmod-common				= omap_hwmod.o \

					  omap_hwmod_common_data.o

clock-common				= clock.o clock_common_data.o \

					  clkt_dpll.o clkt_clksel.o

secure-common				= omap-smc.o omap-secure.o



# Secure monitor API support

obj-$(CONFIG_ARCH_OMAP3)		+= omap-smc.o omap-secure.o

obj-$(CONFIG_ARCH_OMAP4)		+= omap-smc.o omap-secure.o

obj-$(CONFIG_SOC_OMAP5)			+= 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) += prm44xx.o $(hwmod-common) $(secure-common)

obj-$(CONFIG_SOC_AM33XX) += irq.o $(hwmod-common)

obj-$(CONFIG_SOC_OMAP5)	 += prm44xx.o $(hwmod-common) $(secure-common)



ifneq ($(CONFIG_SND_OMAP_SOC_MCBSP),)

obj-y += mcbsp.o

endif



obj-$(CONFIG_TWL4030_CORE) += omap_twl.o

obj-$(CONFIG_SOC_HAS_OMAP2_SDRC)	+= sdrc.o



# SMP support ONLY available for OMAP4



obj-$(CONFIG_SMP)			+= omap-smp.o omap-headsmp.o

obj-$(CONFIG_HOTPLUG_CPU)		+= omap-hotplug.o

obj-$(CONFIG_ARCH_OMAP4)		+= omap4-common.o omap-wakeupgen.o

obj-$(CONFIG_SOC_OMAP5)			+= omap4-common.o omap-wakeupgen.o

omap-4-5-common				=  omap4-common.o omap-wakeupgen.o \

					   sleep44xx.o

obj-$(CONFIG_ARCH_OMAP4)		+= $(omap-4-5-common)

obj-$(CONFIG_SOC_OMAP5)			+= $(omap-4-5-common)



plus_sec := $(call as-instr,.arch_extension sec,+sec)

AFLAGS_omap-headsmp.o			:=-Wa,-march=armv7-a$(plus_sec)
@@ -44,6 +50,11 @@ AFLAGS_sram242x.o :=-Wa,-march=armv6 
AFLAGS_sram243x.o			:=-Wa,-march=armv6

AFLAGS_sram34xx.o			:=-Wa,-march=armv7-a



# 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_ARCH_OMAP3)		+= omap3-restart.o



# Pin multiplexing

obj-$(CONFIG_SOC_OMAP2420)		+= mux2420.o

obj-$(CONFIG_SOC_OMAP2430)		+= mux2430.o
@@ -53,7 +64,6 @@ obj-$(CONFIG_ARCH_OMAP4) += mux44xx.o 
# SMS/SDRC

obj-$(CONFIG_ARCH_OMAP2)		+= sdrc2xxx.o

# obj-$(CONFIG_ARCH_OMAP3)		+= sdrc3xxx.o

obj-$(CONFIG_SOC_HAS_OMAP2_SDRC)	+= sdrc.o



# OPP table initialization

ifeq ($(CONFIG_PM_OPP),y)
@@ -64,11 +74,11 @@ endif 


# Power Management

ifeq ($(CONFIG_PM),y)

obj-$(CONFIG_ARCH_OMAP2)		+= pm24xx.o sleep24xx.o

obj-$(CONFIG_ARCH_OMAP2)		+= pm24xx.o

obj-$(CONFIG_ARCH_OMAP2)		+= sleep24xx.o

obj-$(CONFIG_ARCH_OMAP3)		+= pm34xx.o sleep34xx.o

obj-$(CONFIG_ARCH_OMAP4)		+= pm44xx.o omap-mpuss-lowpower.o

obj-$(CONFIG_ARCH_OMAP4)		+= sleep44xx.o

obj-$(CONFIG_SOC_OMAP5)			+= omap-mpuss-lowpower.o sleep44xx.o

obj-$(CONFIG_SOC_OMAP5)			+= omap-mpuss-lowpower.o

obj-$(CONFIG_PM_DEBUG)			+= pm-debug.o

obj-$(CONFIG_OMAP_PM_NOOP)		+= omap-pm-noop.o
@@ -90,71 +100,77 @@ obj-$(CONFIG_ARCH_OMAP4) += cpuidle44xx.o 
endif



# PRCM

obj-y					+= prcm.o prm_common.o

obj-$(CONFIG_ARCH_OMAP2)		+= cm2xxx_3xxx.o prm2xxx_3xxx.o

obj-$(CONFIG_ARCH_OMAP3)		+= cm2xxx_3xxx.o prm2xxx_3xxx.o

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

obj-$(CONFIG_SOC_AM33XX)		+= prm33xx.o cm33xx.o

omap-prcm-4-5-common			=  cminst44xx.o cm44xx.o prm44xx.o \

					   prcm_mpu44xx.o prminst44xx.o \

					   vc44xx_data.o vp44xx_data.o \

					   prm44xx.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)



# OMAP voltage domains

obj-y					+= voltage.o vc.o vp.o

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_AM33XX)                += voltagedomains33xx_data.o

obj-$(CONFIG_SOC_OMAP5)			+= $(voltagedomain-common)



# OMAP powerdomain framework

obj-y					+= powerdomain.o powerdomain-common.o

powerdomain-common			+= powerdomain.o powerdomain-common.o

obj-$(CONFIG_ARCH_OMAP2)		+= $(powerdomain-common)

obj-$(CONFIG_ARCH_OMAP2)		+= powerdomains2xxx_data.o

obj-$(CONFIG_ARCH_OMAP2)		+= powerdomain2xxx_3xxx.o

obj-$(CONFIG_ARCH_OMAP2)		+= powerdomains2xxx_3xxx_data.o

obj-$(CONFIG_ARCH_OMAP3)		+= powerdomain2xxx_3xxx.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)		+= powerdomain44xx.o

obj-$(CONFIG_ARCH_OMAP4)		+= $(powerdomain-common)

obj-$(CONFIG_ARCH_OMAP4)		+= powerdomains44xx_data.o

obj-$(CONFIG_SOC_AM33XX)		+= powerdomain33xx.o

obj-$(CONFIG_SOC_AM33XX)		+= $(powerdomain-common)

obj-$(CONFIG_SOC_AM33XX)		+= powerdomains33xx_data.o

obj-$(CONFIG_SOC_OMAP5)			+= powerdomain44xx.o

obj-$(CONFIG_SOC_OMAP5)			+= $(powerdomain-common)



# PRCM clockdomain control

obj-y					+= clockdomain.o

obj-$(CONFIG_ARCH_OMAP2)		+= clockdomain2xxx_3xxx.o

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)		+= clockdomain2xxx_3xxx.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)		+= clockdomain44xx.o

obj-$(CONFIG_ARCH_OMAP4)		+= $(clockdomain-common)

obj-$(CONFIG_ARCH_OMAP4)		+= clockdomains44xx_data.o

obj-$(CONFIG_SOC_AM33XX)		+= clockdomain33xx.o

obj-$(CONFIG_SOC_AM33XX)		+= $(clockdomain-common)

obj-$(CONFIG_SOC_AM33XX)		+= clockdomains33xx_data.o

obj-$(CONFIG_SOC_OMAP5)			+= clockdomain44xx.o

obj-$(CONFIG_SOC_OMAP5)			+= $(clockdomain-common)



# Clock framework

obj-y					+= clock.o clock_common_data.o \

					   clkt_dpll.o clkt_clksel.o

obj-$(CONFIG_ARCH_OMAP2)		+= clock2xxx.o

obj-$(CONFIG_ARCH_OMAP2)		+= clkt2xxx_dpllcore.o clkt2xxx_sys.o

obj-$(CONFIG_ARCH_OMAP2)		+= $(clock-common) clock2xxx.o

obj-$(CONFIG_ARCH_OMAP2)		+= clkt2xxx_sys.o

obj-$(CONFIG_ARCH_OMAP2)		+= clkt2xxx_dpllcore.o

obj-$(CONFIG_ARCH_OMAP2)		+= clkt2xxx_virt_prcm_set.o

obj-$(CONFIG_ARCH_OMAP2)		+= clkt2xxx_apll.o clkt2xxx_osc.o

obj-$(CONFIG_ARCH_OMAP2)		+= clkt2xxx_dpll.o clkt_iclk.o

obj-$(CONFIG_SOC_OMAP2420)		+= clock2420_data.o

obj-$(CONFIG_SOC_OMAP2430)		+= clock2430.o clock2430_data.o

obj-$(CONFIG_ARCH_OMAP3)		+= clock3xxx.o

obj-$(CONFIG_ARCH_OMAP3)		+= $(clock-common) clock3xxx.o

obj-$(CONFIG_ARCH_OMAP3)		+= clock34xx.o clkt34xx_dpll3m2.o

obj-$(CONFIG_ARCH_OMAP3)		+= clock3517.o clock36xx.o clkt_iclk.o

obj-$(CONFIG_ARCH_OMAP3)		+= clock3517.o clock36xx.o

obj-$(CONFIG_ARCH_OMAP3)		+= dpll3xxx.o clock3xxx_data.o

obj-$(CONFIG_ARCH_OMAP4)		+= clock44xx_data.o

obj-$(CONFIG_ARCH_OMAP3)		+= clkt_iclk.o

obj-$(CONFIG_ARCH_OMAP4)		+= $(clock-common) clock44xx_data.o

obj-$(CONFIG_ARCH_OMAP4)		+= dpll3xxx.o dpll44xx.o

obj-$(CONFIG_SOC_AM33XX)		+= dpll3xxx.o clock33xx_data.o

obj-$(CONFIG_SOC_AM33XX)		+= $(clock-common) dpll3xxx.o

obj-$(CONFIG_SOC_AM33XX)		+= clock33xx_data.o

obj-$(CONFIG_SOC_OMAP5)			+= $(clock-common)

obj-$(CONFIG_SOC_OMAP5)			+= dpll3xxx.o dpll44xx.o



# OMAP2 clock rate set data (old "OPP" data)
@@ -162,7 +178,6 @@ obj-$(CONFIG_SOC_OMAP2420) += opp2420_data.o 
obj-$(CONFIG_SOC_OMAP2430)		+= opp2430_data.o



# hwmod data

obj-y					+= omap_hwmod_common_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

arch/arm/mach-omap2/am33xx.h

+1 −0
Original line number Diff line number Diff line
@@ -21,5 +21,6 @@ 
#define AM33XX_SCM_BASE		0x44E10000

#define AM33XX_CTRL_BASE	AM33XX_SCM_BASE

#define AM33XX_PRCM_BASE	0x44E00000

#define AM33XX_TAP_BASE		(AM33XX_CTRL_BASE + 0x3FC)



#endif /* __ASM_ARCH_AM33XX_H */