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

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

Merge tag 'omap-cleanup-b2-for-3.8' of... 

Merge tag 'omap-cleanup-b2-for-3.8' of git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending into omap-for-v3.8/cleanup-prcm

Second set of OMAP PRCM cleanups for 3.8.

These patches remove the use of omap_prcm_get_reset_sources() from the
OMAP watchdog driver, and remove mach-omap2/prcm.c and
plat-omap/include/plat/prcm.h.

Basic test logs for this branch on top of Tony's cleanup-prcm branch
at commit 7fc54fd3 are here:

    http://www.pwsan.com/omap/testlogs/prcm_cleanup_b_3.8/20121108151646/

However, cleanup-prcm at 7fc54fd3 does not include some fixes
that are needed for a successful test.  With several reverts,
fixes, and workarounds applied, the following test logs were
obtained:

    http://www.pwsan.com/omap/testlogs/TEST_prcm_cleanup_b_3.8/20121108151930/

 which indicate that the series tests cleanly.

This second pull request updates one of the patches which broke
with rmk's allnoconfigs, and also updates the tag description to
indicate that 7fc54fd3 is building cleanly here.
parents 7fc54fd3 b99db36c

arch/arm/mach-omap1/common.h

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

#endif



extern int omap1_get_reset_sources(void);

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>
@@ -456,10 +458,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

+4 −5
Original line number Diff line number Diff line
@@ -4,10 +4,9 @@ 
#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 */
@@ -43,12 +42,12 @@ void omap1_restart(char mode, const char *cmd) 
 * Returns bits that represent the last reset source for the SoC.  The

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

 */

int omap1_get_reset_sources(void)

u32 omap1_get_reset_sources(void)

{

	int ret = 0;

	u32 ret = 0;

	u16 rs;



	rs = __raw_readw(ARM_SYSST);

	rs = __raw_readw(OMAP1_IO_ADDRESS(ARM_SYSST));



	if (rs & (1 << ARM_SYSST_POR_SHIFT))

		ret |= 1 << OMAP_GLOBAL_COLD_RST_SRC_ID_SHIFT;

arch/arm/mach-omap2/Makefile

+6 −1
Original line number Diff line number Diff line
@@ -50,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
@@ -94,7 +99,7 @@ obj-$(CONFIG_ARCH_OMAP4) += cpuidle44xx.o 
endif



# PRCM

obj-y					+= prcm.o prm_common.o cm_common.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

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 */