We are currently using the cell-index DT property to assign SPI bus
numbers. This property is specific to the spi-orion driver, and
requires each SPI controller to have a unique ID defined in the Device
Tree.
As we are about to merge armada-cp110-master.dtsi and
armada-cp110-slave.dtsi into a single file, those cell-index
properties that differ between the master CP110 and the slave CP110
are a difference that would have to be handled.
In order to avoid this, we switch to using the "aliases" DT node to
assign a unique number to each SPI controller. This is more generic,
and directly handled by the SPI core.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
aliases {
gpio1 = &cpm_gpio1;
gpio2 = &cpm_gpio2;
+ spi1 = &cpm_spi0;
+ spi2 = &cpm_spi1;
};
};
aliases {
gpio1 = &cps_gpio1;
gpio2 = &cpm_gpio2;
+ spi1 = &cpm_spi0;
+ spi2 = &cpm_spi1;
+ spi3 = &cps_spi0;
+ spi4 = &cps_spi1;
};
};
serial0 = &uart0;
serial1 = &uart1;
gpio0 = &ap_gpio;
+ spi0 = &spi0;
};
psci {
reg = <0x510600 0x50>;
#address-cells = <1>;
#size-cells = <0>;
- cell-index = <0>;
interrupts = <GIC_SPI 21 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&ap_clk 3>;
status = "disabled";
reg = <0x700600 0x50>;
#address-cells = <0x1>;
#size-cells = <0x0>;
- cell-index = <1>;
clocks = <&cpm_clk 1 21>;
status = "disabled";
};
reg = <0x700680 0x50>;
#address-cells = <1>;
#size-cells = <0>;
- cell-index = <2>;
clocks = <&cpm_clk 1 21>;
status = "disabled";
};
reg = <0x700600 0x50>;
#address-cells = <0x1>;
#size-cells = <0x0>;
- cell-index = <3>;
clocks = <&cps_clk 1 21>;
status = "disabled";
};
reg = <0x700680 0x50>;
#address-cells = <1>;
#size-cells = <0>;
- cell-index = <4>;
clocks = <&cps_clk 1 21>;
status = "disabled";
};