Merge branch 'next' of git://git.denx.de/linux-denx-agust into next
MPC5xxx updates from Anatolij: "Highlights include a driver for MPC512x LocalPlus Bus FIFO with its device tree binding documentation, mpc512x device tree updates and some minor fixes."
This commit is contained in:
@@ -77,7 +77,6 @@
|
||||
#address-cells = <2>;
|
||||
#size-cells = <1>;
|
||||
reg = <0x80000020 0x40>;
|
||||
interrupts = <7 0x8>;
|
||||
ranges = <0x0 0x0 0xfc000000 0x04000000>;
|
||||
};
|
||||
|
||||
@@ -329,7 +328,15 @@
|
||||
/* LocalPlus controller */
|
||||
lpc@10000 {
|
||||
compatible = "fsl,mpc5121-lpc";
|
||||
reg = <0x10000 0x200>;
|
||||
reg = <0x10000 0x100>;
|
||||
};
|
||||
|
||||
sclpc@10100 {
|
||||
compatible = "fsl,mpc512x-lpbfifo";
|
||||
reg = <0x10100 0x50>;
|
||||
interrupts = <7 0x8>;
|
||||
dmas = <&dma0 26>;
|
||||
dma-names = "rx-tx";
|
||||
};
|
||||
|
||||
pata@10200 {
|
||||
|
@@ -246,6 +246,14 @@
|
||||
status = "disabled";
|
||||
};
|
||||
|
||||
sclpc@10100 {
|
||||
compatible = "fsl,mpc512x-lpbfifo";
|
||||
reg = <0x10100 0x50>;
|
||||
interrupts = <7 0x8>;
|
||||
dmas = <&dma0 26>;
|
||||
dma-names = "rx-tx";
|
||||
};
|
||||
|
||||
// 5125 PSCs are not 52xx or 5121 PSC compatible
|
||||
// PSC1 uart0 aka ttyPSC0
|
||||
serial@11100 {
|
||||
@@ -279,10 +287,11 @@
|
||||
clock-names = "ipg";
|
||||
};
|
||||
|
||||
dma@14000 {
|
||||
dma0: dma@14000 {
|
||||
compatible = "fsl,mpc5121-dma"; // BSP name: "mpc512x-dma2"
|
||||
reg = <0x14000 0x1800>;
|
||||
interrupts = <65 0x8>;
|
||||
#dma-cells = <1>;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
Reference in New Issue
Block a user