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
Merge tag 'asoc-fix-v4.4-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/brooni...
[firefly-linux-kernel-4.4.55.git]
/
arch
/
arm
/
boot
/
dts
/
am335x-evm.dts
diff --git
a/arch/arm/boot/dts/am335x-evm.dts
b/arch/arm/boot/dts/am335x-evm.dts
index 507980672c32245abaf20e3c927bdc5c84c1bc42..d9d00ab863a21735312ff2d53a6830c48ad425ff 100644
(file)
--- a/
arch/arm/boot/dts/am335x-evm.dts
+++ b/
arch/arm/boot/dts/am335x-evm.dts
@@
-737,14
+737,14
@@
bus-width = <4>;
pinctrl-names = "default";
pinctrl-0 = <&mmc1_pins>;
bus-width = <4>;
pinctrl-names = "default";
pinctrl-0 = <&mmc1_pins>;
- cd-gpios = <&gpio0 6 GPIO_ACTIVE_
HIGH
>;
+ cd-gpios = <&gpio0 6 GPIO_ACTIVE_
LOW
>;
};
&mmc3 {
/* these are on the crossbar and are outlined in the
xbar-event-map element */
};
&mmc3 {
/* these are on the crossbar and are outlined in the
xbar-event-map element */
- dmas = <&edma
_xbar 12 0 1
- &edma
_xbar 13 0 2
>;
+ dmas = <&edma
12
+ &edma
13
>;
dma-names = "tx", "rx";
status = "okay";
vmmc-supply = <&wlan_en_reg>;
dma-names = "tx", "rx";
status = "okay";
vmmc-supply = <&wlan_en_reg>;
@@
-766,6
+766,11
@@
};
};
};
};
+&edma {
+ ti,edma-xbar-event-map = /bits/ 16 <1 12
+ 2 13>;
+};
+
&sham {
status = "okay";
};
&sham {
status = "okay";
};