git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'armsoc-late' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
boot
/
dts
/
vfxxx.dtsi
diff --git
a/arch/arm/boot/dts/vfxxx.dtsi
b/arch/arm/boot/dts/vfxxx.dtsi
index d7d002d0cc5fc3bdbc61845b196482ab3b5da3ef..2c13ec696ac541f96d781c5a94c251bad36e481a 100644
(file)
--- a/
arch/arm/boot/dts/vfxxx.dtsi
+++ b/
arch/arm/boot/dts/vfxxx.dtsi
@@
-95,6
+95,7
@@
compatible = "fsl,aips-bus", "simple-bus";
#address-cells = <1>;
#size-cells = <1>;
compatible = "fsl,aips-bus", "simple-bus";
#address-cells = <1>;
#size-cells = <1>;
+ reg = <0x40000000 0x00070000>;
ranges;
mscm_cpucfg: cpucfg@40001000 {
ranges;
mscm_cpucfg: cpucfg@40001000 {
@@
-500,6
+501,7
@@
compatible = "fsl,aips-bus", "simple-bus";
#address-cells = <1>;
#size-cells = <1>;
compatible = "fsl,aips-bus", "simple-bus";
#address-cells = <1>;
#size-cells = <1>;
+ reg = <0x40080000 0x0007f000>;
ranges;
edma1: dma-controller@40098000 {
ranges;
edma1: dma-controller@40098000 {