projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'ceph-for-4.9-rc1' of git://github.com/ceph/ceph-client
[cascardo/linux.git]
/
arch
/
arm
/
boot
/
dts
/
omap4-panda-common.dtsi
diff --git
a/arch/arm/boot/dts/omap4-panda-common.dtsi
b/arch/arm/boot/dts/omap4-panda-common.dtsi
index
f8f1395
..
1673689
100644
(file)
--- a/
arch/arm/boot/dts/omap4-panda-common.dtsi
+++ b/
arch/arm/boot/dts/omap4-panda-common.dtsi
@@
-8,7
+8,7
@@
#include "elpida_ecb240abacn.dtsi"
/ {
#include "elpida_ecb240abacn.dtsi"
/ {
- memory {
+ memory
@80000000
{
device_type = "memory";
reg = <0x80000000 0x40000000>; /* 1 GB */
};
device_type = "memory";
reg = <0x80000000 0x40000000>; /* 1 GB */
};
@@
-446,6
+446,8
@@
pinctrl-names = "default";
pinctrl-0 = <&wl12xx_pins>;
vmmc-supply = <&wl12xx_vmmc>;
pinctrl-names = "default";
pinctrl-0 = <&wl12xx_pins>;
vmmc-supply = <&wl12xx_vmmc>;
+ interrupts-extended = <&wakeupgen GIC_SPI 59 IRQ_TYPE_LEVEL_HIGH
+ &omap4_pmx_core 0x10e>;
non-removable;
bus-width = <4>;
cap-power-off-card;
non-removable;
bus-width = <4>;
cap-power-off-card;