kernel: update linux 3.8 to 3.8.2
[openwrt.git] / target / linux / mvebu / patches-3.8 / 012-arm_mvebu_add_pin_mux_options_axp.patch
1 The SDIO interface is only available on pins MPP30/31/32/33/34/35 on
2 the various Armada XP variants, so we provide a pin muxing option for
3 this in the Armada XP .dtsi files.
4
5 Even though those muxing options are the same for MV78230, MV78260 and
6 MV78460, we keep them in each .dtsi file, because the number of pins,
7 and therefore the declaration of the pinctrl node, is different for
8 each SoC variant.
9
10 Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
11 ---
12  arch/arm/boot/dts/armada-xp-mv78230.dtsi |    6 ++++++
13  arch/arm/boot/dts/armada-xp-mv78260.dtsi |    6 ++++++
14  arch/arm/boot/dts/armada-xp-mv78460.dtsi |    6 ++++++
15  3 files changed, 18 insertions(+)
16
17 --- a/arch/arm/boot/dts/armada-xp-mv78230.dtsi
18 +++ b/arch/arm/boot/dts/armada-xp-mv78230.dtsi
19 @@ -47,6 +47,12 @@
20                 pinctrl {
21                         compatible = "marvell,mv78230-pinctrl";
22                         reg = <0xd0018000 0x38>;
23 +
24 +                       sdio_pins: sdio-pins {
25 +                               marvell,pins = "mpp30", "mpp31", "mpp32",
26 +                                              "mpp33", "mpp34", "mpp35";
27 +                               marvell,function = "sd0";
28 +                       };
29                 };
30  
31                 gpio0: gpio@d0018100 {
32 --- a/arch/arm/boot/dts/armada-xp-mv78260.dtsi
33 +++ b/arch/arm/boot/dts/armada-xp-mv78260.dtsi
34 @@ -48,6 +48,12 @@
35                 pinctrl {
36                         compatible = "marvell,mv78260-pinctrl";
37                         reg = <0xd0018000 0x38>;
38 +
39 +                       sdio_pins: sdio-pins {
40 +                               marvell,pins = "mpp30", "mpp31", "mpp32",
41 +                                              "mpp33", "mpp34", "mpp35";
42 +                               marvell,function = "sd0";
43 +                       };
44                 };
45  
46                 gpio0: gpio@d0018100 {
47 --- a/arch/arm/boot/dts/armada-xp-mv78460.dtsi
48 +++ b/arch/arm/boot/dts/armada-xp-mv78460.dtsi
49 @@ -63,6 +63,12 @@
50                 pinctrl {
51                         compatible = "marvell,mv78460-pinctrl";
52                         reg = <0xd0018000 0x38>;
53 +
54 +                       sdio_pins: sdio-pins {
55 +                               marvell,pins = "mpp30", "mpp31", "mpp32",
56 +                                              "mpp33", "mpp34", "mpp35";
57 +                               marvell,function = "sd0";
58 +                       };
59                 };
60  
61                 gpio0: gpio@d0018100 {