* [PATCH] pinctrl: msm: Add missing sdc1 and sdc3 groups for apq8064 @ 2014-05-24 0:32 Bjorn Andersson 2014-05-27 13:22 ` Linus Walleij 0 siblings, 1 reply; 4+ messages in thread From: Bjorn Andersson @ 2014-05-24 0:32 UTC (permalink / raw) To: Linus Walleij, Andy Gross; +Cc: linux-arm-msm, linux-kernel Signed-off-by: Bjorn Andersson <bjorn.andersson@sonymobile.com> --- drivers/pinctrl/pinctrl-apq8064.c | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/drivers/pinctrl/pinctrl-apq8064.c b/drivers/pinctrl/pinctrl-apq8064.c index 23c4c21..3adf9fd 100644 --- a/drivers/pinctrl/pinctrl-apq8064.c +++ b/drivers/pinctrl/pinctrl-apq8064.c @@ -110,6 +110,13 @@ static const struct pinctrl_pin_desc apq8064_pins[] = { PINCTRL_PIN(87, "GPIO_87"), PINCTRL_PIN(88, "GPIO_88"), PINCTRL_PIN(89, "GPIO_89"), + + PINCTRL_PIN(90, "SDC1_CLK"), + PINCTRL_PIN(91, "SDC1_CMD"), + PINCTRL_PIN(92, "SDC1_DATA"), + PINCTRL_PIN(93, "SDC3_CLK"), + PINCTRL_PIN(94, "SDC3_CMD"), + PINCTRL_PIN(95, "SDC3_DATA"), }; #define DECLARE_APQ_GPIO_PINS(pin) static const unsigned int gpio##pin##_pins[] = { pin } @@ -207,9 +214,9 @@ DECLARE_APQ_GPIO_PINS(89); static const unsigned int sdc1_clk_pins[] = { 90 }; static const unsigned int sdc1_cmd_pins[] = { 91 }; static const unsigned int sdc1_data_pins[] = { 92 }; -static const unsigned int sdc2_clk_pins[] = { 93 }; -static const unsigned int sdc2_cmd_pins[] = { 94 }; -static const unsigned int sdc2_data_pins[] = { 95 }; +static const unsigned int sdc3_clk_pins[] = { 93 }; +static const unsigned int sdc3_cmd_pins[] = { 94 }; +static const unsigned int sdc3_data_pins[] = { 95 }; #define FUNCTION(fname) \ [APQ_MUX_##fname] = { \ @@ -550,6 +557,14 @@ static const struct msm_pingroup apq8064_groups[] = { PINGROUP(87, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA), PINGROUP(88, usb2_hsic, NA, NA, NA, NA, NA, NA, NA, NA, NA), PINGROUP(89, usb2_hsic, NA, NA, NA, NA, NA, NA, NA, NA, NA), + + SDC_PINGROUP(sdc1_clk, 0x20a0, 13, 6), + SDC_PINGROUP(sdc1_cmd, 0x20a0, 11, 3), + SDC_PINGROUP(sdc1_data, 0x20a0, 9, 0), + + SDC_PINGROUP(sdc3_clk, 0x20a4, 14, 6), + SDC_PINGROUP(sdc3_cmd, 0x20a4, 11, 3), + SDC_PINGROUP(sdc3_data, 0x20a4, 9, 0), }; #define NUM_GPIO_PINGROUPS 90 -- 1.8.2.2 ^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] pinctrl: msm: Add missing sdc1 and sdc3 groups for apq8064 2014-05-24 0:32 [PATCH] pinctrl: msm: Add missing sdc1 and sdc3 groups for apq8064 Bjorn Andersson @ 2014-05-27 13:22 ` Linus Walleij 2014-05-27 20:47 ` [PATCH v2] pinctrl: msm: Add missing sdc1 and sdc3 groups Bjorn Andersson 0 siblings, 1 reply; 4+ messages in thread From: Linus Walleij @ 2014-05-27 13:22 UTC (permalink / raw) To: Bjorn Andersson; +Cc: Andy Gross, linux-arm-msm, linux-kernel On Sat, May 24, 2014 at 2:32 AM, Bjorn Andersson <bjorn.andersson@sonymobile.com> wrote: > Signed-off-by: Bjorn Andersson <bjorn.andersson@sonymobile.com> Looks good but can't apply it! Can you rebase this onto my devel branch and resend? Yours, Linus Walleij ^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH v2] pinctrl: msm: Add missing sdc1 and sdc3 groups 2014-05-27 13:22 ` Linus Walleij @ 2014-05-27 20:47 ` Bjorn Andersson 2014-05-28 9:03 ` Linus Walleij 0 siblings, 1 reply; 4+ messages in thread From: Bjorn Andersson @ 2014-05-27 20:47 UTC (permalink / raw) To: Linus Walleij; +Cc: Andy Gross, linux-arm-msm, linux-kernel Signed-off-by: Bjorn Andersson <bjorn.andersson@sonymobile.com> --- Thought I already sent you parts of this previously, sorry about that. This should apply on your devel branch. drivers/pinctrl/pinctrl-apq8064.c | 47 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/drivers/pinctrl/pinctrl-apq8064.c b/drivers/pinctrl/pinctrl-apq8064.c index 7c2a8ba..519f788 100644 --- a/drivers/pinctrl/pinctrl-apq8064.c +++ b/drivers/pinctrl/pinctrl-apq8064.c @@ -109,6 +109,13 @@ static const struct pinctrl_pin_desc apq8064_pins[] = { PINCTRL_PIN(87, "GPIO_87"), PINCTRL_PIN(88, "GPIO_88"), PINCTRL_PIN(89, "GPIO_89"), + + PINCTRL_PIN(90, "SDC1_CLK"), + PINCTRL_PIN(91, "SDC1_CMD"), + PINCTRL_PIN(92, "SDC1_DATA"), + PINCTRL_PIN(93, "SDC3_CLK"), + PINCTRL_PIN(94, "SDC3_CMD"), + PINCTRL_PIN(95, "SDC3_DATA"), }; #define DECLARE_APQ_GPIO_PINS(pin) static const unsigned int gpio##pin##_pins[] = { pin } @@ -203,6 +210,13 @@ DECLARE_APQ_GPIO_PINS(87); DECLARE_APQ_GPIO_PINS(88); DECLARE_APQ_GPIO_PINS(89); +static const unsigned int sdc1_clk_pins[] = { 90 }; +static const unsigned int sdc1_cmd_pins[] = { 91 }; +static const unsigned int sdc1_data_pins[] = { 92 }; +static const unsigned int sdc3_clk_pins[] = { 93 }; +static const unsigned int sdc3_cmd_pins[] = { 94 }; +static const unsigned int sdc3_data_pins[] = { 95 }; + #define FUNCTION(fname) \ [APQ_MUX_##fname] = { \ .name = #fname, \ @@ -250,6 +264,31 @@ DECLARE_APQ_GPIO_PINS(89); .intr_detection_width = 1, \ } +#define SDC_PINGROUP(pg_name, ctl, pull, drv) \ + { \ + .name = #pg_name, \ + .pins = pg_name##_pins, \ + .npins = ARRAY_SIZE(pg_name##_pins), \ + .ctl_reg = ctl, \ + .io_reg = 0, \ + .intr_cfg_reg = 0, \ + .intr_status_reg = 0, \ + .intr_target_reg = 0, \ + .mux_bit = -1, \ + .pull_bit = pull, \ + .drv_bit = drv, \ + .oe_bit = -1, \ + .in_bit = -1, \ + .out_bit = -1, \ + .intr_enable_bit = -1, \ + .intr_status_bit = -1, \ + .intr_target_bit = -1, \ + .intr_raw_status_bit = -1, \ + .intr_polarity_bit = -1, \ + .intr_detection_bit = -1, \ + .intr_detection_width = -1, \ + } + enum apq8064_functions { APQ_MUX_cam_mclk, APQ_MUX_codec_mic_i2s, @@ -514,6 +553,14 @@ static const struct msm_pingroup apq8064_groups[] = { PINGROUP(87, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA), PINGROUP(88, usb2_hsic, NA, NA, NA, NA, NA, NA, NA, NA, NA), PINGROUP(89, usb2_hsic, NA, NA, NA, NA, NA, NA, NA, NA, NA), + + SDC_PINGROUP(sdc1_clk, 0x20a0, 13, 6), + SDC_PINGROUP(sdc1_cmd, 0x20a0, 11, 3), + SDC_PINGROUP(sdc1_data, 0x20a0, 9, 0), + + SDC_PINGROUP(sdc3_clk, 0x20a4, 14, 6), + SDC_PINGROUP(sdc3_cmd, 0x20a4, 11, 3), + SDC_PINGROUP(sdc3_data, 0x20a4, 9, 0), }; #define NUM_GPIO_PINGROUPS 90 -- 1.8.2.2 ^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH v2] pinctrl: msm: Add missing sdc1 and sdc3 groups 2014-05-27 20:47 ` [PATCH v2] pinctrl: msm: Add missing sdc1 and sdc3 groups Bjorn Andersson @ 2014-05-28 9:03 ` Linus Walleij 0 siblings, 0 replies; 4+ messages in thread From: Linus Walleij @ 2014-05-28 9:03 UTC (permalink / raw) To: Bjorn Andersson; +Cc: Andy Gross, linux-arm-msm, linux-kernel On Tue, May 27, 2014 at 10:47 PM, Bjorn Andersson <bjorn.andersson@sonymobile.com> wrote: > Signed-off-by: Bjorn Andersson <bjorn.andersson@sonymobile.com> > --- > > Thought I already sent you parts of this previously, sorry about that. > This should apply on your devel branch. OK thanks, patch applied. The APQ8060 that I have in my Dragon is very similar, right? Yours, Linus Walleij ^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2014-05-28 9:03 UTC | newest] Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2014-05-24 0:32 [PATCH] pinctrl: msm: Add missing sdc1 and sdc3 groups for apq8064 Bjorn Andersson 2014-05-27 13:22 ` Linus Walleij 2014-05-27 20:47 ` [PATCH v2] pinctrl: msm: Add missing sdc1 and sdc3 groups Bjorn Andersson 2014-05-28 9:03 ` Linus Walleij
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®