Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 342346
b: refs/heads/master
c: 82bb2da
h: refs/heads/master
v: v3
  • Loading branch information
Andrew Lunn authored and Jason Cooper committed Nov 24, 2012
1 parent abc9170 commit 4990a72
Show file tree
Hide file tree
Showing 3 changed files with 75 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: f9e7592230b72acb703e6c29691d587341b6c710
refs/heads/master: 82bb2da1787a1ec797626dcbb49ae9f171109c9b
39 changes: 39 additions & 0 deletions trunk/arch/arm/boot/dts/kirkwood-6281.dtsi
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
/ {
ocp@f1000000 {
pinctrl: pinctrl@10000 {
compatible = "marvell,88f6281-pinctrl";
reg = <0x10000 0x20>;

pmx_nand: pmx-nand {
marvell,pins = "mpp0", "mpp1", "mpp2", "mpp3",
"mpp4", "mpp5", "mpp18",
"mpp19";
marvell,function = "nand";
};
pmx_sata0: pmx-sata0 {
marvell,pins = "mpp5", "mpp21", "mpp23";
marvell,function = "sata0";
};
pmx_sata1: pmx-sata1 {
marvell,pins = "mpp4", "mpp20", "mpp22";
marvell,function = "sata1";
};
pmx_spi: pmx-spi {
marvell,pins = "mpp0", "mpp1", "mpp2", "mpp3";
marvell,function = "spi";
};
pmx_twsi0: pmx-twsi0 {
marvell,pins = "mpp8", "mpp9";
marvell,function = "twsi0";
};
pmx_uart0: pmx-uart0 {
marvell,pins = "mpp10", "mpp11";
marvell,function = "uart0";
};
pmx_uart1: pmx-uart1 {
marvell,pins = "mpp13", "mpp14";
marvell,function = "uart1";
};
};
};
};
35 changes: 35 additions & 0 deletions trunk/arch/arm/boot/dts/kirkwood-6282.dtsi
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
/ {
ocp@f1000000 {

pinctrl: pinctrl@10000 {
compatible = "marvell,88f6282-pinctrl";
reg = <0x10000 0x20>;

pmx_sata0: pmx-sata0 {
marvell,pins = "mpp5", "mpp21", "mpp23";
marvell,function = "sata0";
};
pmx_sata1: pmx-sata1 {
marvell,pins = "mpp4", "mpp20", "mpp22";
marvell,function = "sata1";
};
pmx_spi: pmx-spi {
marvell,pins = "mpp0", "mpp1", "mpp2", "mpp3";
marvell,function = "spi";
};
pmx_twsi0: pmx-twsi0 {
marvell,pins = "mpp8", "mpp9";
marvell,function = "twsi0";
};
pmx_uart0: pmx-uart0 {
marvell,pins = "mpp10", "mpp11";
marvell,function = "uart0";
};

pmx_uart1: pmx-uart1 {
marvell,pins = "mpp13", "mpp14";
marvell,function = "uart1";
};
};
};
};

0 comments on commit 4990a72

Please sign in to comment.