git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'fix/asoc' into for-linus
[pandora-kernel.git]
/
arch
/
arm
/
mach-pxa
/
lubbock.c
diff --git
a/arch/arm/mach-pxa/lubbock.c
b/arch/arm/mach-pxa/lubbock.c
index
e0c264a
..
f04c833
100644
(file)
--- a/
arch/arm/mach-pxa/lubbock.c
+++ b/
arch/arm/mach-pxa/lubbock.c
@@
-42,12
+42,14
@@
#include <asm/hardware/sa1111.h>
#include <mach/pxa25x.h>
#include <asm/hardware/sa1111.h>
#include <mach/pxa25x.h>
+#include <mach/gpio.h>
#include <mach/audio.h>
#include <mach/lubbock.h>
#include <mach/udc.h>
#include <mach/irda.h>
#include <mach/pxafb.h>
#include <mach/mmc.h>
#include <mach/audio.h>
#include <mach/lubbock.h>
#include <mach/udc.h>
#include <mach/irda.h>
#include <mach/pxafb.h>
#include <mach/mmc.h>
+#include <mach/pm.h>
#include "generic.h"
#include "clock.h"
#include "generic.h"
#include "clock.h"
@@
-111,8
+113,14
@@
static unsigned long lubbock_pin_config[] __initdata = {
GPIO1_GPIO | WAKEUP_ON_EDGE_RISE,
};
GPIO1_GPIO | WAKEUP_ON_EDGE_RISE,
};
+#define LUB_HEXLED __LUB_REG(LUBBOCK_FPGA_PHYS + 0x010)
#define LUB_MISC_WR __LUB_REG(LUBBOCK_FPGA_PHYS + 0x080)
#define LUB_MISC_WR __LUB_REG(LUBBOCK_FPGA_PHYS + 0x080)
+void lubbock_set_hexled(uint32_t value)
+{
+ LUB_HEXLED = value;
+}
+
void lubbock_set_misc_wr(unsigned int mask, unsigned int set)
{
unsigned long flags;
void lubbock_set_misc_wr(unsigned int mask, unsigned int set)
{
unsigned long flags;