Skip to content

Commit

Permalink
arm64: dts: marvell: use new binding for the system controller on cp110
Browse files Browse the repository at this point in the history 
The new binding for the system controller on cp110 moved the clock
controller into a subnode. This preliminary step will allow to add gpio
and pinctrl subnodes.

Reviewed-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
  • Loading branch information
Gregory CLEMENT committed Jun 20, 2017
1 parent 8dcd4ab commit db7bc1b
Show file tree
Hide file tree
Showing 2 changed files with 45 additions and 39 deletions.
43 changes: 23 additions & 20 deletions arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
cpm_ethernet: ethernet@0 {
compatible = "marvell,armada-7k-pp22";
reg = <0x0 0x100000>, <0x129000 0xb000>;
clocks = <&cpm_syscon0 1 3>, <&cpm_syscon0 1 9>, <&cpm_syscon0 1 5>;
clocks = <&cpm_clk 1 3>, <&cpm_clk 1 9>, <&cpm_clk 1 5>;
clock-names = "pp_clk", "gop_clk", "mg_clk";
status = "disabled";
dma-coherent;
Expand Down Expand Up @@ -94,7 +94,7 @@
#size-cells = <0>;
compatible = "marvell,orion-mdio";
reg = <0x12a200 0x10>;
clocks = <&cpm_syscon0 1 9>, <&cpm_syscon0 1 5>;
clocks = <&cpm_clk 1 9>, <&cpm_clk 1 5>;
status = "disabled";
};

Expand All @@ -107,10 +107,13 @@
};

cpm_syscon0: system-controller@440000 {
compatible = "marvell,cp110-system-controller0",
"syscon";
compatible = "syscon", "simple-mfd";
reg = <0x440000 0x1000>;
#clock-cells = <2>;

cpm_clk: clock {
compatible = "marvell,cp110-clock";
#clock-cells = <2>;
};
};

cpm_rtc: rtc@284000 {
Expand All @@ -125,7 +128,7 @@
"generic-ahci";
reg = <0x540000 0x30000>;
interrupts = <GIC_SPI 63 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&cpm_syscon0 1 15>;
clocks = <&cpm_clk 1 15>;
status = "disabled";
};

Expand All @@ -135,7 +138,7 @@
reg = <0x500000 0x4000>;
dma-coherent;
interrupts = <GIC_SPI 62 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&cpm_syscon0 1 22>;
clocks = <&cpm_clk 1 22>;
status = "disabled";
};

Expand All @@ -145,7 +148,7 @@
reg = <0x510000 0x4000>;
dma-coherent;
interrupts = <GIC_SPI 61 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&cpm_syscon0 1 23>;
clocks = <&cpm_clk 1 23>;
status = "disabled";
};

Expand All @@ -155,7 +158,7 @@
<0x6b0000 0x1000>;
dma-coherent;
msi-parent = <&gic_v2m0>;
clocks = <&cpm_syscon0 1 8>;
clocks = <&cpm_clk 1 8>;
};

cpm_xor1: xor@6c0000 {
Expand All @@ -164,7 +167,7 @@
<0x6d0000 0x1000>;
dma-coherent;
msi-parent = <&gic_v2m0>;
clocks = <&cpm_syscon0 1 7>;
clocks = <&cpm_clk 1 7>;
};

cpm_spi0: spi@700600 {
Expand All @@ -173,7 +176,7 @@
#address-cells = <0x1>;
#size-cells = <0x0>;
cell-index = <1>;
clocks = <&cpm_syscon0 1 21>;
clocks = <&cpm_clk 1 21>;
status = "disabled";
};

Expand All @@ -183,7 +186,7 @@
#address-cells = <1>;
#size-cells = <0>;
cell-index = <2>;
clocks = <&cpm_syscon0 1 21>;
clocks = <&cpm_clk 1 21>;
status = "disabled";
};

Expand All @@ -193,7 +196,7 @@
#address-cells = <1>;
#size-cells = <0>;
interrupts = <GIC_SPI 86 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&cpm_syscon0 1 21>;
clocks = <&cpm_clk 1 21>;
status = "disabled";
};

Expand All @@ -203,15 +206,15 @@
#address-cells = <1>;
#size-cells = <0>;
interrupts = <GIC_SPI 87 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&cpm_syscon0 1 21>;
clocks = <&cpm_clk 1 21>;
status = "disabled";
};

cpm_trng: trng@760000 {
compatible = "marvell,armada-8k-rng", "inside-secure,safexcel-eip76";
reg = <0x760000 0x7d>;
interrupts = <GIC_SPI 59 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&cpm_syscon0 1 25>;
clocks = <&cpm_clk 1 25>;
status = "okay";
};

Expand All @@ -220,7 +223,7 @@
reg = <0x780000 0x300>;
interrupts = <GIC_SPI 69 IRQ_TYPE_LEVEL_HIGH>;
clock-names = "core";
clocks = <&cpm_syscon0 1 4>;
clocks = <&cpm_clk 1 4>;
dma-coherent;
status = "disabled";
};
Expand All @@ -237,7 +240,7 @@
<GIC_SPI 58 IRQ_TYPE_LEVEL_HIGH>;
interrupt-names = "mem", "ring0", "ring1",
"ring2", "ring3", "eip";
clocks = <&cpm_syscon0 1 26>;
clocks = <&cpm_clk 1 26>;
dma-mask = <0xff 0xffffffff>;
};
};
Expand All @@ -264,7 +267,7 @@
interrupt-map = <0 0 0 0 &gic 0 GIC_SPI 32 IRQ_TYPE_LEVEL_HIGH>;
interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_HIGH>;
num-lanes = <1>;
clocks = <&cpm_syscon0 1 13>;
clocks = <&cpm_clk 1 13>;
status = "disabled";
};

Expand All @@ -291,7 +294,7 @@
interrupts = <GIC_SPI 34 IRQ_TYPE_LEVEL_HIGH>;

num-lanes = <1>;
clocks = <&cpm_syscon0 1 11>;
clocks = <&cpm_clk 1 11>;
status = "disabled";
};

Expand All @@ -318,7 +321,7 @@
interrupts = <GIC_SPI 33 IRQ_TYPE_LEVEL_HIGH>;

num-lanes = <1>;
clocks = <&cpm_syscon0 1 12>;
clocks = <&cpm_clk 1 12>;
status = "disabled";
};
};
Expand Down
41 changes: 22 additions & 19 deletions arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
cps_ethernet: ethernet@0 {
compatible = "marvell,armada-7k-pp22";
reg = <0x0 0x100000>, <0x129000 0xb000>;
clocks = <&cps_syscon0 1 3>, <&cps_syscon0 1 9>, <&cps_syscon0 1 5>;
clocks = <&cps_clk 1 3>, <&cps_clk 1 9>, <&cps_clk 1 5>;
clock-names = "pp_clk", "gop_clk", "mg_clk";
status = "disabled";
dma-coherent;
Expand Down Expand Up @@ -101,7 +101,7 @@
#size-cells = <0>;
compatible = "marvell,orion-mdio";
reg = <0x12a200 0x10>;
clocks = <&cps_syscon0 1 9>, <&cps_syscon0 1 5>;
clocks = <&cps_clk 1 9>, <&cps_clk 1 5>;
status = "disabled";
};

Expand All @@ -114,18 +114,21 @@
};

cps_syscon0: system-controller@440000 {
compatible = "marvell,cp110-system-controller0",
"syscon";
compatible = "syscon", "simple-mfd";
reg = <0x440000 0x1000>;
#clock-cells = <2>;

cps_clk: clock {
compatible = "marvell,cp110-clock";
#clock-cells = <2>;
};
};

cps_sata0: sata@540000 {
compatible = "marvell,armada-8k-ahci",
"generic-ahci";
reg = <0x540000 0x30000>;
interrupts = <GIC_SPI 287 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&cps_syscon0 1 15>;
clocks = <&cps_clk 1 15>;
status = "disabled";
};

Expand All @@ -135,7 +138,7 @@
reg = <0x500000 0x4000>;
dma-coherent;
interrupts = <GIC_SPI 286 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&cps_syscon0 1 22>;
clocks = <&cps_clk 1 22>;
status = "disabled";
};

Expand All @@ -145,7 +148,7 @@
reg = <0x510000 0x4000>;
dma-coherent;
interrupts = <GIC_SPI 285 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&cps_syscon0 1 23>;
clocks = <&cps_clk 1 23>;
status = "disabled";
};

Expand All @@ -155,7 +158,7 @@
<0x6b0000 0x1000>;
dma-coherent;
msi-parent = <&gic_v2m0>;
clocks = <&cps_syscon0 1 8>;
clocks = <&cps_clk 1 8>;
};

cps_xor1: xor@6c0000 {
Expand All @@ -164,7 +167,7 @@
<0x6d0000 0x1000>;
dma-coherent;
msi-parent = <&gic_v2m0>;
clocks = <&cps_syscon0 1 7>;
clocks = <&cps_clk 1 7>;
};

cps_spi0: spi@700600 {
Expand All @@ -173,7 +176,7 @@
#address-cells = <0x1>;
#size-cells = <0x0>;
cell-index = <3>;
clocks = <&cps_syscon0 1 21>;
clocks = <&cps_clk 1 21>;
status = "disabled";
};

Expand All @@ -183,7 +186,7 @@
#address-cells = <1>;
#size-cells = <0>;
cell-index = <4>;
clocks = <&cps_syscon0 1 21>;
clocks = <&cps_clk 1 21>;
status = "disabled";
};

Expand All @@ -193,7 +196,7 @@
#address-cells = <1>;
#size-cells = <0>;
interrupts = <GIC_SPI 310 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&cps_syscon0 1 21>;
clocks = <&cps_clk 1 21>;
status = "disabled";
};

Expand All @@ -203,15 +206,15 @@
#address-cells = <1>;
#size-cells = <0>;
interrupts = <GIC_SPI 311 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&cps_syscon0 1 21>;
clocks = <&cps_clk 1 21>;
status = "disabled";
};

cps_trng: trng@760000 {
compatible = "marvell,armada-8k-rng", "inside-secure,safexcel-eip76";
reg = <0x760000 0x7d>;
interrupts = <GIC_SPI 312 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&cps_syscon0 1 25>;
clocks = <&cps_clk 1 25>;
status = "okay";
};

Expand All @@ -227,7 +230,7 @@
<GIC_SPI 282 IRQ_TYPE_LEVEL_HIGH>;
interrupt-names = "mem", "ring0", "ring1",
"ring2", "ring3", "eip";
clocks = <&cps_syscon0 1 26>;
clocks = <&cps_clk 1 26>;
dma-mask = <0xff 0xffffffff>;
/*
* The cryptographic engine found on the cp110
Expand Down Expand Up @@ -262,7 +265,7 @@
interrupt-map = <0 0 0 0 &gic 0 GIC_SPI 256 IRQ_TYPE_LEVEL_HIGH>;
interrupts = <GIC_SPI 256 IRQ_TYPE_LEVEL_HIGH>;
num-lanes = <1>;
clocks = <&cps_syscon0 1 13>;
clocks = <&cps_clk 1 13>;
status = "disabled";
};

Expand All @@ -289,7 +292,7 @@
interrupts = <GIC_SPI 258 IRQ_TYPE_LEVEL_HIGH>;

num-lanes = <1>;
clocks = <&cps_syscon0 1 11>;
clocks = <&cps_clk 1 11>;
status = "disabled";
};

Expand All @@ -316,7 +319,7 @@
interrupts = <GIC_SPI 257 IRQ_TYPE_LEVEL_HIGH>;

num-lanes = <1>;
clocks = <&cps_syscon0 1 12>;
clocks = <&cps_clk 1 12>;
status = "disabled";
};
};
Expand Down

0 comments on commit db7bc1b

Please sign in to comment.