projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
xfs: add missing bmap cancel calls in error paths
[firefly-linux-kernel-4.4.55.git]
/
arch
/
arm
/
mach-davinci
/
board-omapl138-hawk.c
diff --git
a/arch/arm/mach-davinci/board-omapl138-hawk.c
b/arch/arm/mach-davinci/board-omapl138-hawk.c
index ab98c75cabb48b7ed2cee6518fddca615f58f6e3..2aac51d0e85325361d9406e2d5abd6b8f8b9383b 100644
(file)
--- a/
arch/arm/mach-davinci/board-omapl138-hawk.c
+++ b/
arch/arm/mach-davinci/board-omapl138-hawk.c
@@
-13,10
+13,12
@@
#include <linux/init.h>
#include <linux/console.h>
#include <linux/gpio.h>
#include <linux/init.h>
#include <linux/console.h>
#include <linux/gpio.h>
+#include <linux/platform_data/gpio-davinci.h>
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
+#include <mach/common.h>
#include <mach/cp_intc.h>
#include <mach/da8xx.h>
#include <mach/mux.h>
#include <mach/cp_intc.h>
#include <mach/da8xx.h>
#include <mach/mux.h>
@@
-211,7
+213,7
@@
static int hawk_usb_ocic_notify(da8xx_ocic_handler_t handler)
hawk_usb_ocic_handler = handler;
error = request_irq(irq, omapl138_hawk_usb_ocic_irq,
hawk_usb_ocic_handler = handler;
error = request_irq(irq, omapl138_hawk_usb_ocic_irq,
- IRQF_
DISABLED | IRQF_
TRIGGER_RISING |
+ IRQF_TRIGGER_RISING |
IRQF_TRIGGER_FALLING,
"OHCI over-current indicator", NULL);
if (error)
IRQF_TRIGGER_FALLING,
"OHCI over-current indicator", NULL);
if (error)
@@
-290,6
+292,10
@@
static __init void omapl138_hawk_init(void)
{
int ret;
{
int ret;
+ ret = da850_register_gpio();
+ if (ret)
+ pr_warn("%s: GPIO init failed: %d\n", __func__, ret);
+
davinci_serial_init(da8xx_serial_device);
omapl138_hawk_config_emac();
davinci_serial_init(da8xx_serial_device);
omapl138_hawk_config_emac();