a7y18lte-ubports/android_kernel_samsung_universal7885
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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: Paul Walmsley <paul@pwsan.com>
Cc: Tony Lindgren <tony@atomide.com>
This commit is contained in:
Paul Walmsley 2012-04-13 06:34:27 -06:00
parent e2ed89fc4e
commit 6f3c1af265
4 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
arch/arm/mach-omap1/Makefile
View File

@ -12,6 +12,9 @@ endif
obj-$(CONFIG_OMAP_32K_TIMER) += timer32k.o obj-$(CONFIG_OMAP_32K_TIMER) += timer32k.o
# OCPI interconnect support for 1710, 1610 and 5912
obj-$(CONFIG_ARCH_OMAP16XX) += ocpi.o
# Power Management # Power Management
obj-$(CONFIG_PM) += pm.o sleep.o obj-$(CONFIG_PM) += pm.o sleep.o

2
arch/arm/mach-omap1/common.h
View File

@ -63,4 +63,6 @@ extern bool omap_32k_timer_init(void);
extern u32 omap_irq_flags; extern u32 omap_irq_flags;
extern int ocpi_enable(void);
#endif /* __ARCH_ARM_MACH_OMAP1_COMMON_H */ #endif /* __ARCH_ARM_MACH_OMAP1_COMMON_H */

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

@ -4,6 +4,7 @@
* Minimal OCP bus support for omap16xx * Minimal OCP bus support for omap16xx
* *
* Copyright (C) 2003 - 2005 Nokia Corporation * Copyright (C) 2003 - 2005 Nokia Corporation
* Copyright (C) 2012 Texas Instruments, Inc.
* Written by Tony Lindgren <tony@atomide.com> * Written by Tony Lindgren <tony@atomide.com>
* *
* Modified for clock framework by Paul Mundt <paul.mundt@nokia.com>. * Modified for clock framework by Paul Mundt <paul.mundt@nokia.com>.
@ -35,6 +36,8 @@
#include <mach/hardware.h> #include <mach/hardware.h>
#include "common.h"
#define OCPI_BASE 0xfffec320 #define OCPI_BASE 0xfffec320
#define OCPI_FAULT (OCPI_BASE + 0x00) #define OCPI_FAULT (OCPI_BASE + 0x00)
#define OCPI_CMD_FAULT (OCPI_BASE + 0x04) #define OCPI_CMD_FAULT (OCPI_BASE + 0x04)
@ -64,7 +67,7 @@ int ocpi_enable(void)
/* Enable access for OHCI in OCPI */ /* Enable access for OHCI in OCPI */
val = omap_readl(OCPI_PROT); val = omap_readl(OCPI_PROT);
val &= ~0xff; val &= ~0xff;
//val &= (1 << 0); /* Allow access only to EMIFS */ /* val &= (1 << 0); Allow access only to EMIFS */
omap_writel(val, OCPI_PROT); omap_writel(val, OCPI_PROT);
val = omap_readl(OCPI_SEC); val = omap_readl(OCPI_SEC);
@ -86,7 +89,7 @@ static int __init omap_ocpi_init(void)
clk_enable(ocpi_ck); clk_enable(ocpi_ck);
ocpi_enable(); ocpi_enable();
printk("OMAP OCPI interconnect driver loaded\n"); pr_info("OMAP OCPI interconnect driver loaded\n");
return 0; return 0;
} }

3
arch/arm/plat-omap/Makefile
View File

@ -9,9 +9,6 @@ obj-m :=
obj-n := obj-n :=
obj- := obj- :=
# OCPI interconnect support for 1710, 1610 and 5912
obj-$(CONFIG_ARCH_OMAP16XX) += ocpi.o
# omap_device support (OMAP2+ only at the moment) # omap_device support (OMAP2+ only at the moment)
obj-$(CONFIG_ARCH_OMAP2) += omap_device.o obj-$(CONFIG_ARCH_OMAP2) += omap_device.o
obj-$(CONFIG_ARCH_OMAP3) += omap_device.o obj-$(CONFIG_ARCH_OMAP3) += omap_device.o