From: Laurent Pinchart <laurent.pinchart@ideasonboard.com> To: Ben Hutchings <ben.hutchings@codethink.co.uk> Cc: Ian Molton <ian@mnementh.co.uk>, linux-mmc@vger.kernel.org, linux-sh@vger.kernel.org, linux-gpio@vger.kernel.org, linux-kernel@lists.codethink.co.uk, Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>, Simon Horman <horms@verge.net.au>, Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>, Linus Walleij <linus.walleij@linaro.org> Subject: Re: [PATCH v2 3/6] pinctrl: sh-pfc: r8a7790: Add separate functions for SDHI 1.8V operation Date: Fri, 12 Jun 2015 07:18:08 +0000 [thread overview] Message-ID: <2554026.6LTcTIWBdF@avalon> (raw) In-Reply-To: <1433892211.12074.52.camel@codethink.co.uk> Hi Ben, (CC'ing Linus Walleij) Thank you for the patch. On Wednesday 10 June 2015 00:23:31 Ben Hutchings wrote: > All the SHDIs can operate with either 3.3V or 1.8V signals, depending > on negotiation with the card. > > Add separate functions for the 1.8V mode, and implement the set_mux > operation on all SDHI functions to configure the voltage for each > group of pins. I don't think duplicating all functions for 1.8V and 3.3V is the right way to go. Can't we use the pinconf API instead, and in particular the PIN_CONFIG_POWER_SOURCE configuration ? > Signed-off-by: Ben Hutchings <ben.hutchings@codethink.co.uk> > --- > drivers/pinctrl/sh-pfc/core.c | 2 +- > drivers/pinctrl/sh-pfc/core.h | 1 + > drivers/pinctrl/sh-pfc/pfc-r8a7790.c | 70 ++++++++++++++++++++++++++++++--- > 3 files changed, 68 insertions(+), 5 deletions(-) > > diff --git a/drivers/pinctrl/sh-pfc/core.c b/drivers/pinctrl/sh-pfc/core.c > index 7b2c9495c383..7d51f96afc9a 100644 > --- a/drivers/pinctrl/sh-pfc/core.c > +++ b/drivers/pinctrl/sh-pfc/core.c > @@ -92,7 +92,7 @@ static int sh_pfc_map_resources(struct sh_pfc *pfc, > return 0; > } > > -static void __iomem *sh_pfc_phys_to_virt(struct sh_pfc *pfc, u32 reg) > +void __iomem *sh_pfc_phys_to_virt(struct sh_pfc *pfc, u32 reg) > { > struct sh_pfc_window *window; > phys_addr_t address = reg; > diff --git a/drivers/pinctrl/sh-pfc/core.h b/drivers/pinctrl/sh-pfc/core.h > index 6dc8a6fc2746..af355629c5d2 100644 > --- a/drivers/pinctrl/sh-pfc/core.h > +++ b/drivers/pinctrl/sh-pfc/core.h > @@ -57,6 +57,7 @@ int sh_pfc_unregister_gpiochip(struct sh_pfc *pfc); > int sh_pfc_register_pinctrl(struct sh_pfc *pfc); > int sh_pfc_unregister_pinctrl(struct sh_pfc *pfc); > > +void __iomem *sh_pfc_phys_to_virt(struct sh_pfc *pfc, u32 address); > u32 sh_pfc_read_raw_reg(void __iomem *mapped_reg, unsigned int reg_width); > void sh_pfc_write_raw_reg(void __iomem *mapped_reg, unsigned int reg_width, > u32 data); > diff --git a/drivers/pinctrl/sh-pfc/pfc-r8a7790.c > b/drivers/pinctrl/sh-pfc/pfc-r8a7790.c index 22a5470889f5..baba3151687f > 100644 > --- a/drivers/pinctrl/sh-pfc/pfc-r8a7790.c > +++ b/drivers/pinctrl/sh-pfc/pfc-r8a7790.c > @@ -4472,6 +4472,8 @@ static const char * const sdhi0_groups[] = { > "sdhi0_wp", > }; > > +#define sdhi0_1v8_groups sdhi0_groups > + > static const char * const sdhi1_groups[] = { > "sdhi1_data1", > "sdhi1_data4", > @@ -4480,6 +4482,8 @@ static const char * const sdhi1_groups[] = { > "sdhi1_wp", > }; > > +#define sdhi1_1v8_groups sdhi1_groups > + > static const char * const sdhi2_groups[] = { > "sdhi2_data1", > "sdhi2_data4", > @@ -4488,6 +4492,8 @@ static const char * const sdhi2_groups[] = { > "sdhi2_wp", > }; > > +#define sdhi2_1v8_groups sdhi2_groups > + > static const char * const sdhi3_groups[] = { > "sdhi3_data1", > "sdhi3_data4", > @@ -4496,6 +4502,8 @@ static const char * const sdhi3_groups[] = { > "sdhi3_wp", > }; > > +#define sdhi3_1v8_groups sdhi3_groups > + > static const char * const ssi_groups[] = { > "ssi0_data", > "ssi0129_ctrl", > @@ -4595,6 +4603,56 @@ static const char * const vin3_groups[] = { > "vin3_clk", > }; > > +static void sdhi_set_voltage(struct sh_pfc *pfc, > + const struct sh_pfc_function *func, > + const struct sh_pfc_pin_group *grp) > +{ > + void __iomem *mapped_reg; > + u32 data, mask; > + int index; > + > + if (WARN_ON(strncmp(func->name, "sdhi", 4))) > + return; > + if (WARN_ON(strncmp(func->name, grp->name, 5))) > + return; > + > + /* Calculate mask in IOCTRL6 based on the group */ > + index = func->name[4] - '0'; > + if (WARN_ON(index < 0 || index > 3)) > + return; > + if (!strcmp(grp->name + 5, "_data1")) > + mask = 0x20; > + else if (!strcmp(grp->name + 5, "_data4")) > + mask = 0x3c; > + else if (!strcmp(grp->name + 5, "_ctrl")) > + mask = 0xc0; > + else if (!strcmp(grp->name + 5, "_cd")) > + mask = 0x02; > + else if (!strcmp(grp->name + 5, "_wp")) > + mask = 0x01; > + else { > + WARN_ON(1); > + return; > + } > + mask <<= 8 * (3 - index); > + > + /* Map IOCTRL6 */ > + mapped_reg = sh_pfc_phys_to_virt(pfc, 0xe606008c); > + > + data = sh_pfc_read_raw_reg(mapped_reg, 32); > + > + /* Set for 3.3V (high) or 1.8V (low) depending on the function name */ > + if (strcmp(func->name + 5, "_1v8")) > + data |= mask; > + else > + data &= ~mask; > + > + sh_pfc_write_raw_reg( > + sh_pfc_phys_to_virt(pfc, pfc->info->unlock_reg), 32, > + ~data); > + sh_pfc_write_raw_reg(mapped_reg, 32, data); > +} > + > static const struct sh_pfc_function pinmux_functions[] = { > SH_PFC_FUNCTION(audio_clk), > SH_PFC_FUNCTION(avb), > @@ -4631,10 +4689,14 @@ static const struct sh_pfc_function > pinmux_functions[] = { SH_PFC_FUNCTION(scifb0), > SH_PFC_FUNCTION(scifb1), > SH_PFC_FUNCTION(scifb2), > - SH_PFC_FUNCTION(sdhi0), > - SH_PFC_FUNCTION(sdhi1), > - SH_PFC_FUNCTION(sdhi2), > - SH_PFC_FUNCTION(sdhi3), > + SH_PFC_FUNCTION_SPECIAL(sdhi0, sdhi_set_voltage), > + SH_PFC_FUNCTION_SPECIAL(sdhi0_1v8, sdhi_set_voltage), > + SH_PFC_FUNCTION_SPECIAL(sdhi1, sdhi_set_voltage), > + SH_PFC_FUNCTION_SPECIAL(sdhi1_1v8, sdhi_set_voltage), > + SH_PFC_FUNCTION_SPECIAL(sdhi2, sdhi_set_voltage), > + SH_PFC_FUNCTION_SPECIAL(sdhi2_1v8, sdhi_set_voltage), > + SH_PFC_FUNCTION_SPECIAL(sdhi3, sdhi_set_voltage), > + SH_PFC_FUNCTION_SPECIAL(sdhi3_1v8, sdhi_set_voltage), > SH_PFC_FUNCTION(ssi), > SH_PFC_FUNCTION(tpu0), > SH_PFC_FUNCTION(usb0), -- Regards, Laurent Pinchart
WARNING: multiple messages have this Message-ID (diff)
From: Laurent Pinchart <laurent.pinchart@ideasonboard.com> To: Ben Hutchings <ben.hutchings@codethink.co.uk> Cc: Ian Molton <ian@mnementh.co.uk>, linux-mmc@vger.kernel.org, linux-sh@vger.kernel.org, linux-gpio@vger.kernel.org, linux-kernel@lists.codethink.co.uk, Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>, Simon Horman <horms@verge.net.au>, Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>, Linus Walleij <linus.walleij@linaro.org> Subject: Re: [PATCH v2 3/6] pinctrl: sh-pfc: r8a7790: Add separate functions for SDHI 1.8V operation Date: Fri, 12 Jun 2015 10:18:08 +0300 [thread overview] Message-ID: <2554026.6LTcTIWBdF@avalon> (raw) In-Reply-To: <1433892211.12074.52.camel@codethink.co.uk> Hi Ben, (CC'ing Linus Walleij) Thank you for the patch. On Wednesday 10 June 2015 00:23:31 Ben Hutchings wrote: > All the SHDIs can operate with either 3.3V or 1.8V signals, depending > on negotiation with the card. > > Add separate functions for the 1.8V mode, and implement the set_mux > operation on all SDHI functions to configure the voltage for each > group of pins. I don't think duplicating all functions for 1.8V and 3.3V is the right way to go. Can't we use the pinconf API instead, and in particular the PIN_CONFIG_POWER_SOURCE configuration ? > Signed-off-by: Ben Hutchings <ben.hutchings@codethink.co.uk> > --- > drivers/pinctrl/sh-pfc/core.c | 2 +- > drivers/pinctrl/sh-pfc/core.h | 1 + > drivers/pinctrl/sh-pfc/pfc-r8a7790.c | 70 ++++++++++++++++++++++++++++++--- > 3 files changed, 68 insertions(+), 5 deletions(-) > > diff --git a/drivers/pinctrl/sh-pfc/core.c b/drivers/pinctrl/sh-pfc/core.c > index 7b2c9495c383..7d51f96afc9a 100644 > --- a/drivers/pinctrl/sh-pfc/core.c > +++ b/drivers/pinctrl/sh-pfc/core.c > @@ -92,7 +92,7 @@ static int sh_pfc_map_resources(struct sh_pfc *pfc, > return 0; > } > > -static void __iomem *sh_pfc_phys_to_virt(struct sh_pfc *pfc, u32 reg) > +void __iomem *sh_pfc_phys_to_virt(struct sh_pfc *pfc, u32 reg) > { > struct sh_pfc_window *window; > phys_addr_t address = reg; > diff --git a/drivers/pinctrl/sh-pfc/core.h b/drivers/pinctrl/sh-pfc/core.h > index 6dc8a6fc2746..af355629c5d2 100644 > --- a/drivers/pinctrl/sh-pfc/core.h > +++ b/drivers/pinctrl/sh-pfc/core.h > @@ -57,6 +57,7 @@ int sh_pfc_unregister_gpiochip(struct sh_pfc *pfc); > int sh_pfc_register_pinctrl(struct sh_pfc *pfc); > int sh_pfc_unregister_pinctrl(struct sh_pfc *pfc); > > +void __iomem *sh_pfc_phys_to_virt(struct sh_pfc *pfc, u32 address); > u32 sh_pfc_read_raw_reg(void __iomem *mapped_reg, unsigned int reg_width); > void sh_pfc_write_raw_reg(void __iomem *mapped_reg, unsigned int reg_width, > u32 data); > diff --git a/drivers/pinctrl/sh-pfc/pfc-r8a7790.c > b/drivers/pinctrl/sh-pfc/pfc-r8a7790.c index 22a5470889f5..baba3151687f > 100644 > --- a/drivers/pinctrl/sh-pfc/pfc-r8a7790.c > +++ b/drivers/pinctrl/sh-pfc/pfc-r8a7790.c > @@ -4472,6 +4472,8 @@ static const char * const sdhi0_groups[] = { > "sdhi0_wp", > }; > > +#define sdhi0_1v8_groups sdhi0_groups > + > static const char * const sdhi1_groups[] = { > "sdhi1_data1", > "sdhi1_data4", > @@ -4480,6 +4482,8 @@ static const char * const sdhi1_groups[] = { > "sdhi1_wp", > }; > > +#define sdhi1_1v8_groups sdhi1_groups > + > static const char * const sdhi2_groups[] = { > "sdhi2_data1", > "sdhi2_data4", > @@ -4488,6 +4492,8 @@ static const char * const sdhi2_groups[] = { > "sdhi2_wp", > }; > > +#define sdhi2_1v8_groups sdhi2_groups > + > static const char * const sdhi3_groups[] = { > "sdhi3_data1", > "sdhi3_data4", > @@ -4496,6 +4502,8 @@ static const char * const sdhi3_groups[] = { > "sdhi3_wp", > }; > > +#define sdhi3_1v8_groups sdhi3_groups > + > static const char * const ssi_groups[] = { > "ssi0_data", > "ssi0129_ctrl", > @@ -4595,6 +4603,56 @@ static const char * const vin3_groups[] = { > "vin3_clk", > }; > > +static void sdhi_set_voltage(struct sh_pfc *pfc, > + const struct sh_pfc_function *func, > + const struct sh_pfc_pin_group *grp) > +{ > + void __iomem *mapped_reg; > + u32 data, mask; > + int index; > + > + if (WARN_ON(strncmp(func->name, "sdhi", 4))) > + return; > + if (WARN_ON(strncmp(func->name, grp->name, 5))) > + return; > + > + /* Calculate mask in IOCTRL6 based on the group */ > + index = func->name[4] - '0'; > + if (WARN_ON(index < 0 || index > 3)) > + return; > + if (!strcmp(grp->name + 5, "_data1")) > + mask = 0x20; > + else if (!strcmp(grp->name + 5, "_data4")) > + mask = 0x3c; > + else if (!strcmp(grp->name + 5, "_ctrl")) > + mask = 0xc0; > + else if (!strcmp(grp->name + 5, "_cd")) > + mask = 0x02; > + else if (!strcmp(grp->name + 5, "_wp")) > + mask = 0x01; > + else { > + WARN_ON(1); > + return; > + } > + mask <<= 8 * (3 - index); > + > + /* Map IOCTRL6 */ > + mapped_reg = sh_pfc_phys_to_virt(pfc, 0xe606008c); > + > + data = sh_pfc_read_raw_reg(mapped_reg, 32); > + > + /* Set for 3.3V (high) or 1.8V (low) depending on the function name */ > + if (strcmp(func->name + 5, "_1v8")) > + data |= mask; > + else > + data &= ~mask; > + > + sh_pfc_write_raw_reg( > + sh_pfc_phys_to_virt(pfc, pfc->info->unlock_reg), 32, > + ~data); > + sh_pfc_write_raw_reg(mapped_reg, 32, data); > +} > + > static const struct sh_pfc_function pinmux_functions[] = { > SH_PFC_FUNCTION(audio_clk), > SH_PFC_FUNCTION(avb), > @@ -4631,10 +4689,14 @@ static const struct sh_pfc_function > pinmux_functions[] = { SH_PFC_FUNCTION(scifb0), > SH_PFC_FUNCTION(scifb1), > SH_PFC_FUNCTION(scifb2), > - SH_PFC_FUNCTION(sdhi0), > - SH_PFC_FUNCTION(sdhi1), > - SH_PFC_FUNCTION(sdhi2), > - SH_PFC_FUNCTION(sdhi3), > + SH_PFC_FUNCTION_SPECIAL(sdhi0, sdhi_set_voltage), > + SH_PFC_FUNCTION_SPECIAL(sdhi0_1v8, sdhi_set_voltage), > + SH_PFC_FUNCTION_SPECIAL(sdhi1, sdhi_set_voltage), > + SH_PFC_FUNCTION_SPECIAL(sdhi1_1v8, sdhi_set_voltage), > + SH_PFC_FUNCTION_SPECIAL(sdhi2, sdhi_set_voltage), > + SH_PFC_FUNCTION_SPECIAL(sdhi2_1v8, sdhi_set_voltage), > + SH_PFC_FUNCTION_SPECIAL(sdhi3, sdhi_set_voltage), > + SH_PFC_FUNCTION_SPECIAL(sdhi3_1v8, sdhi_set_voltage), > SH_PFC_FUNCTION(ssi), > SH_PFC_FUNCTION(tpu0), > SH_PFC_FUNCTION(usb0), -- Regards, Laurent Pinchart
next prev parent reply other threads:[~2015-06-12 7:18 UTC|newest] Thread overview: 45+ messages / expand[flat|nested] mbox.gz Atom feed top 2015-06-09 23:21 [PATCH v2 0/6] UHS-I support for sh_mobile_sdhi Ben Hutchings 2015-06-09 23:21 ` Ben Hutchings 2015-06-09 23:22 ` [PATCH v2 1/6] mmc: tmio: Add UHS-I mode support Ben Hutchings 2015-06-09 23:22 ` Ben Hutchings 2015-06-09 23:23 ` [PATCH v2 2/6] pinctrl: sh-pfc: Add set_mux operation to struct sh_pfc_function Ben Hutchings 2015-06-09 23:23 ` Ben Hutchings 2015-06-09 23:23 ` [PATCH v2 3/6] pinctrl: sh-pfc: r8a7790: Add separate functions for SDHI 1.8V operation Ben Hutchings 2015-06-09 23:23 ` Ben Hutchings 2015-06-12 7:18 ` Laurent Pinchart [this message] 2015-06-12 7:18 ` Laurent Pinchart 2015-06-12 13:23 ` Ben Hutchings 2015-06-12 13:23 ` Ben Hutchings 2015-06-12 19:07 ` Laurent Pinchart 2015-06-12 19:07 ` Laurent Pinchart 2015-06-15 0:40 ` Ben Hutchings 2015-06-15 0:40 ` Ben Hutchings 2015-06-15 2:02 ` Laurent Pinchart 2015-06-15 2:02 ` Laurent Pinchart 2015-06-30 6:05 ` Linus Walleij 2015-06-30 6:05 ` Linus Walleij 2015-06-30 8:30 ` Laurent Pinchart 2015-06-30 8:30 ` Laurent Pinchart 2015-06-09 23:23 ` [PATCH v2 4/6] mmc: sh_mobile_sdhi: Add UHS-I mode support Ben Hutchings 2015-06-09 23:23 ` Ben Hutchings 2015-06-09 23:24 ` [PATCH v2 5/6] ARM: shmobile: lager: Set clock rates for SDHI Ben Hutchings 2015-06-09 23:24 ` Ben Hutchings 2015-06-11 1:20 ` Kuninori Morimoto 2015-06-11 1:47 ` Ben Hutchings 2015-06-11 1:47 ` Ben Hutchings 2015-06-09 23:24 ` [PATCH v2 6/6] ARM: shmobile: lager: Enable UHS-I SDR-50 Ben Hutchings 2015-06-09 23:24 ` Ben Hutchings 2015-06-10 9:16 ` [PATCH v2 0/6] UHS-I support for sh_mobile_sdhi Ulf Hansson 2015-06-10 9:16 ` Ulf Hansson 2015-06-10 23:57 ` Ben Hutchings 2015-06-10 23:57 ` Ben Hutchings 2015-06-11 2:49 ` Simon Horman 2015-06-11 2:49 ` Simon Horman 2015-06-11 15:02 ` Ben Hutchings 2015-06-11 15:02 ` Ben Hutchings 2015-06-14 7:36 ` Geert Uytterhoeven 2015-06-14 7:36 ` Geert Uytterhoeven 2015-06-15 0:30 ` Ben Hutchings 2015-06-15 0:30 ` Ben Hutchings 2015-06-15 0:30 ` Ben Hutchings 2015-06-15 0:30 ` Ben Hutchings
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=2554026.6LTcTIWBdF@avalon \ --to=laurent.pinchart@ideasonboard.com \ --cc=ben.hutchings@codethink.co.uk \ --cc=horms@verge.net.au \ --cc=ian@mnementh.co.uk \ --cc=kuninori.morimoto.gx@renesas.com \ --cc=linus.walleij@linaro.org \ --cc=linux-gpio@vger.kernel.org \ --cc=linux-kernel@lists.codethink.co.uk \ --cc=linux-mmc@vger.kernel.org \ --cc=linux-sh@vger.kernel.org \ --cc=sergei.shtylyov@cogentembedded.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.