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

Commit 6f3c1af2 authored by Paul Walmsley's avatar Paul Walmsley
Browse files

ARM: OMAP1: OCPI: move to mach-omap1/ 



Move the OMAP1 OCPI "bus" code to arch/arm/mach-omap1, since it is
only used on OMAP1 devices.  In the long term, it probably makes sense
to move the OCPI bus code to somewhere under drivers/.

Signed-off-by: default avatarPaul Walmsley <paul@pwsan.com>
Cc: Tony Lindgren <tony@atomide.com>
parent e2ed89fc

arch/arm/mach-omap1/Makefile

+3 −0
Original line number Diff line number Diff line
@@ -12,6 +12,9 @@ endif 


obj-$(CONFIG_OMAP_32K_TIMER)	+= timer32k.o



# OCPI interconnect support for 1710, 1610 and 5912

obj-$(CONFIG_ARCH_OMAP16XX) += ocpi.o



# Power Management

obj-$(CONFIG_PM) += pm.o sleep.o

arch/arm/mach-omap1/common.h

+2 −0
Original line number Diff line number Diff line
@@ -63,4 +63,6 @@ extern bool omap_32k_timer_init(void); 


extern u32 omap_irq_flags;



extern int ocpi_enable(void);



#endif /* __ARCH_ARM_MACH_OMAP1_COMMON_H */

arch/arm/plat-omap/ocpi.c→arch/arm/mach-omap1/ocpi.c

+5 −2
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ 
 * Minimal OCP bus support for omap16xx

 *

 * Copyright (C) 2003 - 2005 Nokia Corporation

 * Copyright (C) 2012 Texas Instruments, Inc.

 * Written by Tony Lindgren <tony@atomide.com>

 *

 * Modified for clock framework by Paul Mundt <paul.mundt@nokia.com>.
@@ -35,6 +36,8 @@ 


#include <mach/hardware.h>



#include "common.h"



#define OCPI_BASE		0xfffec320

#define OCPI_FAULT		(OCPI_BASE + 0x00)

#define OCPI_CMD_FAULT		(OCPI_BASE + 0x04)
@@ -64,7 +67,7 @@ int ocpi_enable(void) 
	/* Enable access for OHCI in OCPI */

	val = omap_readl(OCPI_PROT);

	val &= ~0xff;

	//val &= (1 << 0);	/* Allow access only to EMIFS */

	/* val &= (1 << 0);	 Allow access only to EMIFS */

	omap_writel(val, OCPI_PROT);



	val = omap_readl(OCPI_SEC);
@@ -86,7 +89,7 @@ static int __init omap_ocpi_init(void) 


	clk_enable(ocpi_ck);

	ocpi_enable();

	printk("OMAP OCPI interconnect driver loaded\n");

	pr_info("OMAP OCPI interconnect driver loaded\n");



	return 0;

}

arch/arm/plat-omap/Makefile

+0 −3
Original line number Diff line number Diff line
@@ -9,9 +9,6 @@ obj-m := 
obj-n :=

obj-  :=



# OCPI interconnect support for 1710, 1610 and 5912

obj-$(CONFIG_ARCH_OMAP16XX) += ocpi.o



# omap_device support (OMAP2+ only at the moment)

obj-$(CONFIG_ARCH_OMAP2) += omap_device.o

obj-$(CONFIG_ARCH_OMAP3) += omap_device.o