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 'imx-fixes-4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo...
[cascardo/linux.git]
/
arch
/
arm64
/
boot
/
dts
/
freescale
/
fsl-ls1043a.dtsi
diff --git
a/arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi
b/arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi
index
58635f7
..
97d331e
100644
(file)
--- a/
arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi
+++ b/
arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi
@@
-123,6
+123,7
@@
<1 14 0xf08>, /* Physical Non-Secure PPI */
<1 11 0xf08>, /* Virtual PPI */
<1 10 0xf08>; /* Hypervisor PPI */
<1 14 0xf08>, /* Physical Non-Secure PPI */
<1 11 0xf08>, /* Virtual PPI */
<1 10 0xf08>; /* Hypervisor PPI */
+ fsl,erratum-a008585;
};
pmu {
};
pmu {
@@
-502,10
+503,11
@@
};
sata: sata@3200000 {
};
sata: sata@3200000 {
- compatible = "fsl,ls1043a-ahci"
, "fsl,ls1021a-ahci"
;
+ compatible = "fsl,ls1043a-ahci";
reg = <0x0 0x3200000 0x0 0x10000>;
interrupts = <0 69 0x4>;
clocks = <&clockgen 4 0>;
reg = <0x0 0x3200000 0x0 0x10000>;
interrupts = <0 69 0x4>;
clocks = <&clockgen 4 0>;
+ dma-coherent;
};
msi1: msi-controller1@1571000 {
};
msi1: msi-controller1@1571000 {