AT91 ramc and reset/poweroff related DT patches
This branch gathers a few devicetree patches needed for the reworks found in the later patches to be sent. More precisely, it holds: - The addition of ddrck for the sama5d3 and the sam9 SoCs - The addition of the shutdown controller node in the sama5d3 DTSI - The slight rework of the ramc bindings for the SoCs that have several RAM controllers -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAABAgAGBQJTx3pVAAoJEBx+YmzsjxAgMZgP/28I2pynhWU5hK86DOsiggTN 8AgBMkg6Bhg0jASsAPZXUR+sSOnBLhprKwQNTFRzHnRJPktvLzyh4f8s1tXQFxV+ 7yVWuPP4X0SI6W88HUX0gEdG1jV6bZUIM4PhOfpkFIU4LDukNsKRb4u80v4UoirZ V5X0P2GJs3j6iC3zLO17/e2U0l4l0mRnZRr3aRHLMmFm/a2zfsiNIkhLiGDEwcdF i/N6RMPuZkTLWluowBzMyJGCRNNmO4v9aNGNyWgAKqdqQMvs95pXId6lVqP5OcTV VrLCRnHqdphmxargv8iL+O+BhwfhDTHVZgB8bmp5TGlh7GDtpULcmJWavxtkRua/ iro9DEzQAsLnek++VkB+VMG5Y/VxZPQIVvebatK2w/s+5KD3rLHHRYwZsDk2b6t9 LIHg296COy2ngT3xyag7VUtKlciKS3wMbYvyRtFHvIGL11fXfObYpkeBI1lVji8M osxSUYMtiVMnS7/nlmbCscEMyozqo2bnTkFz+3Kt7PZG3sf2QBo+XG+47d7EH5MU DZ0mc3J6TvBw6+LzuSkV91BuGSUxe5TzHXZIobr09853ziqgR4/oBNPsa9iNriIw w1MCym5q916iwf5ZphLOd0mK6KcC9rHGPCA/r2xKgoW18hWLKNEuRq4DYeTYOXFm B9oEa81eX0lpvNHOwke0 =4QeK -----END PGP SIGNATURE----- Merge tag 'at91-dt-for-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux Pull AT91 ramc and reset/poweroff related DT patches from Maxim Ripard: "This branch gathers a few devicetree patches needed for the reworks found in the later patches to be sent. More precisely, it holds: - The addition of ddrck for the sama5d3 and the sam9 SoCs - The addition of the shutdown controller node in the sama5d3 DTSI - The slight rework of the ramc bindings for the SoCs that have several RAM controllers" Conflicts: arch/arm/boot/dts/at91sam9g45.dtsi
This commit is contained in:
commit
464d6e1863
|
@ -345,10 +345,14 @@
|
|||
};
|
||||
};
|
||||
|
||||
ramc: ramc@ffffe200 {
|
||||
ramc0: ramc@ffffe200 {
|
||||
compatible = "atmel,at91sam9260-sdramc";
|
||||
reg = <0xffffe200 0x200
|
||||
0xffffe800 0x200>;
|
||||
reg = <0xffffe200 0x200>;
|
||||
};
|
||||
|
||||
ramc1: ramc@ffffe800 {
|
||||
compatible = "atmel,at91sam9260-sdramc";
|
||||
reg = <0xffffe800 0x200>;
|
||||
};
|
||||
|
||||
pit: timer@fffffd30 {
|
||||
|
|
|
@ -96,8 +96,14 @@
|
|||
|
||||
ramc0: ramc@ffffe400 {
|
||||
compatible = "atmel,at91sam9g45-ddramc";
|
||||
reg = <0xffffe400 0x200
|
||||
0xffffe600 0x200>;
|
||||
reg = <0xffffe400 0x200>;
|
||||
clocks = <&ddrck>;
|
||||
clock-names = "ddrck";
|
||||
};
|
||||
|
||||
ramc1: ramc@ffffe600 {
|
||||
compatible = "atmel,at91sam9g45-ddramc";
|
||||
reg = <0xffffe600 0x200>;
|
||||
clocks = <&ddrck>;
|
||||
clock-names = "ddrck";
|
||||
};
|
||||
|
|
|
@ -87,6 +87,8 @@
|
|||
ramc0: ramc@ffffe800 {
|
||||
compatible = "atmel,at91sam9g45-ddramc";
|
||||
reg = <0xffffe800 0x200>;
|
||||
clocks = <&ddrck>;
|
||||
clock-names = "ddrck";
|
||||
};
|
||||
|
||||
pmc: pmc@fffffc00 {
|
||||
|
|
|
@ -95,6 +95,8 @@
|
|||
ramc0: ramc@ffffe800 {
|
||||
compatible = "atmel,at91sam9g45-ddramc";
|
||||
reg = <0xffffe800 0x200>;
|
||||
clocks = <&ddrck>;
|
||||
clock-names = "ddrck";
|
||||
};
|
||||
|
||||
pmc: pmc@fffffc00 {
|
||||
|
|
|
@ -402,8 +402,10 @@
|
|||
};
|
||||
|
||||
ramc0: ramc@ffffea00 {
|
||||
compatible = "atmel,at91sam9g45-ddramc";
|
||||
compatible = "atmel,sama5d3-ddramc";
|
||||
reg = <0xffffea00 0x200>;
|
||||
clocks = <&ddrck>, <&mpddr_clk>;
|
||||
clock-names = "ddrck", "mpddr";
|
||||
};
|
||||
|
||||
dbgu: serial@ffffee00 {
|
||||
|
@ -1170,6 +1172,11 @@
|
|||
#clock-cells = <0>;
|
||||
reg = <48>;
|
||||
};
|
||||
|
||||
mpddr_clk: mpddr_clk {
|
||||
#clock-cells = <0>;
|
||||
reg = <49>;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
|
@ -1178,6 +1185,11 @@
|
|||
reg = <0xfffffe00 0x10>;
|
||||
};
|
||||
|
||||
shutdown-controller@fffffe10 {
|
||||
compatible = "atmel,at91sam9x5-shdwc";
|
||||
reg = <0xfffffe10 0x10>;
|
||||
};
|
||||
|
||||
pit: timer@fffffe30 {
|
||||
compatible = "atmel,at91sam9260-pit";
|
||||
reg = <0xfffffe30 0xf>;
|
||||
|
|
Loading…
Reference in New Issue