summaryrefslogtreecommitdiffstats
path: root/arch/arm64/boot/dts/marvell/armada-70x0.dtsi
diff options
context:
space:
mode:
authorThomas Petazzoni <thomas.petazzoni@free-electrons.com>2018-01-02 15:55:56 +0100
committerGregory CLEMENT <gregory.clement@free-electrons.com>2018-01-05 17:02:40 +0100
commite2a393c699816de2e44cb5988895c1aeb84944cf (patch)
tree7937f583ca67058af8e0fd55a89fcdf7e4f955d8 /arch/arm64/boot/dts/marvell/armada-70x0.dtsi
parentaf9ad5bcd9bd3c2858c722650762b20e41d081b7 (diff)
downloadlinux-e2a393c699816de2e44cb5988895c1aeb84944cf.tar.bz2
arm64: dts: marvell: use aliases for SPI busses on Armada 7K/8K
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>
Diffstat (limited to 'arch/arm64/boot/dts/marvell/armada-70x0.dtsi')
-rw-r--r--arch/arm64/boot/dts/marvell/armada-70x0.dtsi2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm64/boot/dts/marvell/armada-70x0.dtsi b/arch/arm64/boot/dts/marvell/armada-70x0.dtsi
index 0e1a1e5be399..815e64b3a874 100644
--- a/arch/arm64/boot/dts/marvell/armada-70x0.dtsi
+++ b/arch/arm64/boot/dts/marvell/armada-70x0.dtsi
@@ -50,6 +50,8 @@
aliases {
gpio1 = &cpm_gpio1;
gpio2 = &cpm_gpio2;
+ spi1 = &cpm_spi0;
+ spi2 = &cpm_spi1;
};
};