leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ARM: dts: kirkwood: set default pinctrl for SPI0

Browse Source 
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: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Acked-by: Andrew Lunn <andrew@lunn.ch>
Link: https://lkml.kernel.org/r/1398862602-29595-11-git-send-email-sebastian.hesselbarth@gmail.com
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
This commit is contained in:
Sebastian Hesselbarth 2014-04-30 14:56:37 +02:00 committed by Jason Cooper
parent 9f2339a697
commit 929012010a
10 changed files with 6 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/boot/dts/kirkwood-b3.dts
View File

@ -70,8 +70,6 @@
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>;

2
arch/arm/boot/dts/kirkwood-cloudbox.dts
View File

@ -37,8 +37,6 @@
}; };
spi@10600 { spi@10600 {
pinctrl-0 = <&pmx_spi>;
pinctrl-names = "default";
status = "okay"; status = "okay";
flash@0 { flash@0 {

2
arch/arm/boot/dts/kirkwood-dreamplug.dts
View File

@ -38,8 +38,6 @@
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>;

2
arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts
View File

@ -50,8 +50,6 @@
}; };
spi@10600 { spi@10600 {
pinctrl-0 = <&pmx_spi>;
pinctrl-names = "default";
status = "okay"; status = "okay";
flash@0 { flash@0 {

2
arch/arm/boot/dts/kirkwood-ns2-common.dtsi
View File

@ -24,8 +24,6 @@
}; };
spi@10600 { spi@10600 {
pinctrl-0 = <&pmx_spi>;
pinctrl-names = "default";
status = "okay"; status = "okay";
flash@0 { flash@0 {

2
arch/arm/boot/dts/kirkwood-rd88f6192.dts
View File

@ -57,8 +57,6 @@
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>;

2
arch/arm/boot/dts/kirkwood-synology.dtsi
View File

@ -213,8 +213,6 @@
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>;

6
arch/arm/boot/dts/kirkwood-t5325.dts
View File

@ -65,10 +65,6 @@
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 @@
}; };
spi@10600 { spi@10600 {
pinctrl-0 = <&pmx_spi>;
pinctrl-names = "default";
status = "okay"; status = "okay";
flash@0 { flash@0 {

2
arch/arm/boot/dts/kirkwood-ts219.dtsi
View File

@ -47,8 +47,6 @@
}; };
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>;

6
arch/arm/boot/dts/kirkwood.dtsi
View File

@ -88,6 +88,10 @@
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 @@
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";
}; };