projects
/
linux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
60636a5
ca41e24
)
Merge branch 'dts-fixes' into omap-for-v4.15/fixes-dt
author
Tony Lindgren
<tony@atomide.com>
Tue, 28 Nov 2017 16:12:32 +0000
(08:12 -0800)
committer
Tony Lindgren
<tony@atomide.com>
Tue, 28 Nov 2017 16:12:32 +0000
(08:12 -0800)
1
2
Documentation/devicetree/bindings/usb/am33xx-usb.txt
patch
|
diff1
|
diff2
|
blob
|
history
arch/arm/boot/dts/am33xx.dtsi
patch
|
diff1
|
diff2
|
blob
|
history
arch/arm/boot/dts/logicpd-som-lv.dtsi
patch
|
diff1
|
diff2
|
blob
|
history
arch/arm/boot/dts/omap3-cm-t3x.dtsi
patch
|
diff1
|
diff2
|
blob
|
history
arch/arm/boot/dts/omap3-evm-common.dtsi
patch
|
diff1
|
diff2
|
blob
|
history
arch/arm/boot/dts/omap3-lilly-a83x.dtsi
patch
|
diff1
|
diff2
|
blob
|
history
arch/arm/boot/dts/omap4-panda-common.dtsi
patch
|
diff1
|
diff2
|
blob
|
history
arch/arm/boot/dts/omap4.dtsi
patch
|
diff1
|
diff2
|
blob
|
history
arch/arm/boot/dts/omap5-board-common.dtsi
patch
|
diff1
|
diff2
|
blob
|
history
arch/arm/boot/dts/omap5-cm-t54.dts
patch
|
diff1
|
diff2
|
blob
|
history
arch/arm/boot/dts/omap5.dtsi
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
Documentation/devicetree/bindings/usb/am33xx-usb.txt
Simple merge
diff --cc
arch/arm/boot/dts/am33xx.dtsi
Simple merge
diff --cc
arch/arm/boot/dts/logicpd-som-lv.dtsi
Simple merge
diff --cc
arch/arm/boot/dts/omap3-cm-t3x.dtsi
Simple merge
diff --cc
arch/arm/boot/dts/omap3-evm-common.dtsi
Simple merge
diff --cc
arch/arm/boot/dts/omap3-lilly-a83x.dtsi
Simple merge
diff --cc
arch/arm/boot/dts/omap4-panda-common.dtsi
Simple merge
diff --cc
arch/arm/boot/dts/omap4.dtsi
index 27454b1c2fdfbe4164f559b66b6558c1b9b646c1,d24291ed9f6ab9cf685e13ff0c8dc4b9f552dc23..3bba7128b8f3e74c8292e09b6469afa534c56dcd
---
1
/
arch/arm/boot/dts/omap4.dtsi
---
2
/
arch/arm/boot/dts/omap4.dtsi
+++ b/
arch/arm/boot/dts/omap4.dtsi
@@@
-1081,9
-1081,7
+1081,8
@@@
usbhsohci: ohci@4a064800 {
compatible = "ti,ohci-omap3";
reg = <0x4a064800 0x400>;
- interrupt-parent = <&gic>;
interrupts = <GIC_SPI 76 IRQ_TYPE_LEVEL_HIGH>;
+ remote-wakeup-connected;
};
usbhsehci: ehci@4a064c00 {
diff --cc
arch/arm/boot/dts/omap5-board-common.dtsi
Simple merge
diff --cc
arch/arm/boot/dts/omap5-cm-t54.dts
Simple merge
diff --cc
arch/arm/boot/dts/omap5.dtsi
Simple merge