kernel: backport bcma patches queued for 3.20
[openwrt/svn-archive/archive.git] / target / linux / ipq806x / patches / 0034-pinctrl-msm-Add-SPI8-pin-definitions.patch
1 From 77e4b572fcc4015e235f22fd93b8df35e452baf0 Mon Sep 17 00:00:00 2001
2 From: "Ivan T. Ivanov" <iivanov@mm-sol.com>
3 Date: Thu, 6 Feb 2014 17:28:48 +0200
4 Subject: [PATCH 034/182] pinctrl-msm: Add SPI8 pin definitions
5
6 Add pin, group and function definitions for SPI#8
7 controller.
8
9 Signed-off-by: Ivan T. Ivanov <iivanov@mm-sol.com>
10 Acked-by: Bjorn Andersson <bjorn.andersson@sonymobile.com>
11 Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
12 ---
13 drivers/pinctrl/pinctrl-msm8x74.c | 13 +++++++++----
14 1 file changed, 9 insertions(+), 4 deletions(-)
15
16 --- a/drivers/pinctrl/pinctrl-msm8x74.c
17 +++ b/drivers/pinctrl/pinctrl-msm8x74.c
18 @@ -405,6 +405,7 @@ enum msm8x74_functions {
19 MSM_MUX_blsp_i2c6,
20 MSM_MUX_blsp_i2c11,
21 MSM_MUX_blsp_spi1,
22 + MSM_MUX_blsp_spi8,
23 MSM_MUX_blsp_uart2,
24 MSM_MUX_blsp_uart8,
25 MSM_MUX_slimbus,
26 @@ -415,6 +416,9 @@ static const char * const blsp_i2c2_grou
27 static const char * const blsp_i2c6_groups[] = { "gpio29", "gpio30" };
28 static const char * const blsp_i2c11_groups[] = { "gpio83", "gpio84" };
29 static const char * const blsp_spi1_groups[] = { "gpio0", "gpio1", "gpio2", "gpio3" };
30 +static const char * const blsp_spi8_groups[] = {
31 + "gpio45", "gpio46", "gpio47", "gpio48"
32 +};
33 static const char * const blsp_uart2_groups[] = { "gpio4", "gpio5" };
34 static const char * const blsp_uart8_groups[] = { "gpio45", "gpio46" };
35 static const char * const slimbus_groups[] = { "gpio70", "gpio71" };
36 @@ -424,6 +428,7 @@ static const struct msm_function msm8x74
37 FUNCTION(blsp_i2c6),
38 FUNCTION(blsp_i2c11),
39 FUNCTION(blsp_spi1),
40 + FUNCTION(blsp_spi8),
41 FUNCTION(blsp_uart2),
42 FUNCTION(blsp_uart8),
43 FUNCTION(slimbus),
44 @@ -475,10 +480,10 @@ static const struct msm_pingroup msm8x74
45 PINGROUP(42, NA, NA, NA, NA, NA, NA, NA),
46 PINGROUP(43, NA, NA, NA, NA, NA, NA, NA),
47 PINGROUP(44, NA, NA, NA, NA, NA, NA, NA),
48 - PINGROUP(45, NA, blsp_uart8, NA, NA, NA, NA, NA),
49 - PINGROUP(46, NA, blsp_uart8, NA, NA, NA, NA, NA),
50 - PINGROUP(47, NA, NA, NA, NA, NA, NA, NA),
51 - PINGROUP(48, NA, NA, NA, NA, NA, NA, NA),
52 + PINGROUP(45, blsp_spi8, blsp_uart8, NA, NA, NA, NA, NA),
53 + PINGROUP(46, blsp_spi8, blsp_uart8, NA, NA, NA, NA, NA),
54 + PINGROUP(47, blsp_spi8, NA, NA, NA, NA, NA, NA),
55 + PINGROUP(48, blsp_spi8, NA, NA, NA, NA, NA, NA),
56 PINGROUP(49, NA, NA, NA, NA, NA, NA, NA),
57 PINGROUP(50, NA, NA, NA, NA, NA, NA, NA),
58 PINGROUP(51, NA, NA, NA, NA, NA, NA, NA),