Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
linux
Commits
7fc54fd3
Commit
7fc54fd3
authored
Oct 26, 2012
by
Tony Lindgren
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'omap-for-v3.8/cleanup-headers' into omap-for-v3.8/cleanup-prcm
parents
8634155e
a0212796
Changes
7
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
30 additions
and
17 deletions
+30
-17
arch/arm/mach-omap1/fpga.c
arch/arm/mach-omap1/fpga.c
+1
-0
arch/arm/mach-omap1/pm_bus.c
arch/arm/mach-omap1/pm_bus.c
+2
-0
arch/arm/mach-omap2/board-h4.c
arch/arm/mach-omap2/board-h4.c
+1
-1
arch/arm/mach-omap2/board-n8x0.c
arch/arm/mach-omap2/board-n8x0.c
+1
-1
drivers/mfd/menelaus.c
drivers/mfd/menelaus.c
+1
-1
drivers/mtd/onenand/omap2.c
drivers/mtd/onenand/omap2.c
+24
-12
include/linux/mfd/menelaus.h
include/linux/mfd/menelaus.h
+0
-2
No files found.
arch/arm/mach-omap1/fpga.c
View file @
7fc54fd3
...
...
@@ -32,6 +32,7 @@
#include <mach/hardware.h>
#include "iomap.h"
#include "common.h"
static
void
fpga_mask_irq
(
struct
irq_data
*
d
)
{
...
...
arch/arm/mach-omap1/pm_bus.c
View file @
7fc54fd3
...
...
@@ -19,6 +19,8 @@
#include <linux/clk.h>
#include <linux/err.h>
#include "soc.h"
#ifdef CONFIG_PM_RUNTIME
static
int
omap1_pm_runtime_suspend
(
struct
device
*
dev
)
{
...
...
arch/arm/mach-omap2/board-h4.c
View file @
7fc54fd3
...
...
@@ -26,12 +26,12 @@
#include <linux/clk.h>
#include <linux/io.h>
#include <linux/input/matrix_keypad.h>
#include <linux/mfd/menelaus.h>
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
#include <asm/mach/map.h>
#include <plat/menelaus.h>
#include <plat-omap/dma-omap.h>
#include "debug-devices.h"
...
...
arch/arm/mach-omap2/board-n8x0.c
View file @
7fc54fd3
...
...
@@ -22,13 +22,13 @@
#include <linux/usb/musb.h>
#include <linux/platform_data/spi-omap2-mcspi.h>
#include <linux/platform_data/mtd-onenand-omap2.h>
#include <linux/mfd/menelaus.h>
#include <sound/tlv320aic3x.h>
#include <asm/mach/arch.h>
#include <asm/mach-types.h>
#include "common.h"
#include <plat/menelaus.h>
#include "mmc.h"
#include "mux.h"
...
...
drivers/mfd/menelaus.c
View file @
7fc54fd3
...
...
@@ -41,11 +41,11 @@
#include <linux/rtc.h>
#include <linux/bcd.h>
#include <linux/slab.h>
#include <linux/mfd/menelaus.h>
#include <asm/mach/irq.h>
#include <asm/gpio.h>
#include <plat/menelaus.h>
#define DRIVER_NAME "menelaus"
...
...
drivers/mtd/onenand/omap2.c
View file @
7fc54fd3
...
...
@@ -445,13 +445,19 @@ static int omap3_onenand_write_bufferram(struct mtd_info *mtd, int area,
#else
int
omap3_onenand_read_bufferram
(
struct
mtd_info
*
mtd
,
int
area
,
static
int
omap3_onenand_read_bufferram
(
struct
mtd_info
*
mtd
,
int
area
,
unsigned
char
*
buffer
,
int
offset
,
size_t
count
);
size_t
count
)
{
return
-
ENOSYS
;
}
int
omap3_onenand_write_bufferram
(
struct
mtd_info
*
mtd
,
int
area
,
static
int
omap3_onenand_write_bufferram
(
struct
mtd_info
*
mtd
,
int
area
,
const
unsigned
char
*
buffer
,
int
offset
,
size_t
count
);
int
offset
,
size_t
count
)
{
return
-
ENOSYS
;
}
#endif
...
...
@@ -549,13 +555,19 @@ static int omap2_onenand_write_bufferram(struct mtd_info *mtd, int area,
#else
int
omap2_onenand_read_bufferram
(
struct
mtd_info
*
mtd
,
int
area
,
static
int
omap2_onenand_read_bufferram
(
struct
mtd_info
*
mtd
,
int
area
,
unsigned
char
*
buffer
,
int
offset
,
size_t
count
);
size_t
count
)
{
return
-
ENOSYS
;
}
int
omap2_onenand_write_bufferram
(
struct
mtd_info
*
mtd
,
int
area
,
static
int
omap2_onenand_write_bufferram
(
struct
mtd_info
*
mtd
,
int
area
,
const
unsigned
char
*
buffer
,
int
offset
,
size_t
count
);
int
offset
,
size_t
count
)
{
return
-
ENOSYS
;
}
#endif
...
...
arch/arm/plat-omap/include/plat
/menelaus.h
→
include/linux/mfd
/menelaus.h
View file @
7fc54fd3
/*
* arch/arm/plat-omap/include/mach/menelaus.h
*
* Functions to access Menelaus power management chip
*/
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment