Commit 92901201 authored by Sebastian Hesselbarth's avatar Sebastian Hesselbarth Committed by Jason Cooper

ARM: dts: kirkwood: set default pinctrl for SPI0

Most Kirkwood boards use the default SPI0 pinctrl setting anyway. Add a
default pinctrl setting to the toplevel SoC SPI0 node and put a note
in front of the corresponding pinctrl node to overwrite the setting
on board level.

Currently, only T5325 is using a different setting and already
overwrites the corresponding pinctrl node.
Signed-off-by: default avatarSebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Acked-by: default avatarAndrew Lunn <andrew@lunn.ch>
Link: https://lkml.kernel.org/r/1398862602-29595-11-git-send-email-sebastian.hesselbarth@gmail.comSigned-off-by: default avatarJason Cooper <jason@lakedaemon.net>
parent 9f2339a6
...@@ -70,8 +70,6 @@ pmx_beeper: pmx-beeper { ...@@ -70,8 +70,6 @@ pmx_beeper: pmx-beeper {
spi@10600 { spi@10600 {
status = "okay"; status = "okay";
pinctrl-0 = <&pmx_spi>;
pinctrl-names = "default";
m25p16@0 { m25p16@0 {
#address-cells = <1>; #address-cells = <1>;
......
...@@ -37,8 +37,6 @@ sata@80000 { ...@@ -37,8 +37,6 @@ sata@80000 {
}; };
spi@10600 { spi@10600 {
pinctrl-0 = <&pmx_spi>;
pinctrl-names = "default";
status = "okay"; status = "okay";
flash@0 { flash@0 {
......
...@@ -38,8 +38,6 @@ serial@12000 { ...@@ -38,8 +38,6 @@ serial@12000 {
spi@10600 { spi@10600 {
status = "okay"; status = "okay";
pinctrl-0 = <&pmx_spi>;
pinctrl-names = "default";
m25p40@0 { m25p40@0 {
#address-cells = <1>; #address-cells = <1>;
......
...@@ -50,8 +50,6 @@ pmx_keys: pmx-keys { ...@@ -50,8 +50,6 @@ pmx_keys: pmx-keys {
}; };
spi@10600 { spi@10600 {
pinctrl-0 = <&pmx_spi>;
pinctrl-names = "default";
status = "okay"; status = "okay";
flash@0 { flash@0 {
......
...@@ -24,8 +24,6 @@ serial@12000 { ...@@ -24,8 +24,6 @@ serial@12000 {
}; };
spi@10600 { spi@10600 {
pinctrl-0 = <&pmx_spi>;
pinctrl-names = "default";
status = "okay"; status = "okay";
flash@0 { flash@0 {
......
...@@ -57,8 +57,6 @@ serial@12000 { ...@@ -57,8 +57,6 @@ serial@12000 {
spi@10600 { spi@10600 {
status = "okay"; status = "okay";
pinctrl-0 = <&pmx_spi>;
pinctrl-names = "default";
m25p128@0 { m25p128@0 {
#address-cells = <1>; #address-cells = <1>;
......
...@@ -213,8 +213,6 @@ rtc@10300 { ...@@ -213,8 +213,6 @@ rtc@10300 {
spi@10600 { spi@10600 {
status = "okay"; status = "okay";
pinctrl-0 = <&pmx_spi>;
pinctrl-names = "default";
m25p80@0 { m25p80@0 {
#address-cells = <1>; #address-cells = <1>;
......
...@@ -65,10 +65,6 @@ pmx_usb_sata_power_enable: pmx-usb-sata-power-enable { ...@@ -65,10 +65,6 @@ pmx_usb_sata_power_enable: pmx-usb-sata-power-enable {
marvell,function = "gpio"; marvell,function = "gpio";
}; };
/*
* Redefined from kirkwood-6281.dtsi, because
* we don't use SPI CS on MPP0, but on MPP7.
*/
pmx_spi: pmx-spi { pmx_spi: pmx-spi {
marvell,pins = "mpp1", "mpp2", "mpp3", "mpp7"; marvell,pins = "mpp1", "mpp2", "mpp3", "mpp7";
marvell,function = "spi"; marvell,function = "spi";
...@@ -87,8 +83,6 @@ pmx_i2s: pmx-i2s { ...@@ -87,8 +83,6 @@ pmx_i2s: pmx-i2s {
}; };
spi@10600 { spi@10600 {
pinctrl-0 = <&pmx_spi>;
pinctrl-names = "default";
status = "okay"; status = "okay";
flash@0 { flash@0 {
......
...@@ -47,8 +47,6 @@ poweroff@12100 { ...@@ -47,8 +47,6 @@ poweroff@12100 {
}; };
spi@10600 { spi@10600 {
status = "okay"; status = "okay";
pinctrl-0 = <&pmx_spi>;
pinctrl-names = "default";
m25p128@0 { m25p128@0 {
#address-cells = <1>; #address-cells = <1>;
......
...@@ -88,6 +88,10 @@ pmx_nand: pmx-nand { ...@@ -88,6 +88,10 @@ pmx_nand: pmx-nand {
marvell,function = "nand"; marvell,function = "nand";
}; };
/*
* Default SPI0 pinctrl setting with CSn on mpp0,
* overwrite marvell,pins on board level if required.
*/
pmx_spi: pmx-spi { pmx_spi: pmx-spi {
marvell,pins = "mpp0", "mpp1", "mpp2", "mpp3"; marvell,pins = "mpp0", "mpp1", "mpp2", "mpp3";
marvell,function = "spi"; marvell,function = "spi";
...@@ -127,6 +131,8 @@ spi0: spi@10600 { ...@@ -127,6 +131,8 @@ spi0: spi@10600 {
interrupts = <23>; interrupts = <23>;
reg = <0x10600 0x28>; reg = <0x10600 0x28>;
clocks = <&gate_clk 7>; clocks = <&gate_clk 7>;
pinctrl-0 = <&pmx_spi>;
pinctrl-names = "default";
status = "disabled"; status = "disabled";
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment