* [PATCH 0/2] pinctrl support for ab8500-usb
@ 2013-03-28 16:21 Fabio Baltieri
2013-03-28 16:21 ` [PATCH 1/2] ARM: ux500: remove redundant DB8500_PIN_SLEEP definition Fabio Baltieri
2013-03-28 16:21 ` [PATCH 2/2] ARM: ux500: 8500: add ab8500-musb pinctrl support Fabio Baltieri
0 siblings, 2 replies; 6+ messages in thread
From: Fabio Baltieri @ 2013-03-28 16:21 UTC (permalink / raw)
To: linux-arm-kernel
Hi Linus,
this contains the required definitions for ab8500-usb pinctrl sleep and
default modes, and a non-related patch to drop a macro redefinition.
Thanks,
Fabio
Fabio Baltieri (1):
ARM: ux500: remove redundant DB8500_PIN_SLEEP definition
Patrice Chotard (1):
ARM: ux500: 8500: add ab8500-musb pinctrl support
arch/arm/mach-ux500/board-mop500-pins.c | 26 +++++++++++++++++++++-----
1 file changed, 21 insertions(+), 5 deletions(-)
--
1.8.1.3
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 1/2] ARM: ux500: remove redundant DB8500_PIN_SLEEP definition
2013-03-28 16:21 [PATCH 0/2] pinctrl support for ab8500-usb Fabio Baltieri
@ 2013-03-28 16:21 ` Fabio Baltieri
2013-04-03 20:49 ` Linus Walleij
2013-03-28 16:21 ` [PATCH 2/2] ARM: ux500: 8500: add ab8500-musb pinctrl support Fabio Baltieri
1 sibling, 1 reply; 6+ messages in thread
From: Fabio Baltieri @ 2013-03-28 16:21 UTC (permalink / raw)
To: linux-arm-kernel
DB8500_PIN_SLEEP was defined twice, drop one of the two.
Signed-off-by: Fabio Baltieri <fabio.baltieri@linaro.org>
---
arch/arm/mach-ux500/board-mop500-pins.c | 3 ---
1 file changed, 3 deletions(-)
diff --git a/arch/arm/mach-ux500/board-mop500-pins.c b/arch/arm/mach-ux500/board-mop500-pins.c
index 0a3f30d..625880f 100644
--- a/arch/arm/mach-ux500/board-mop500-pins.c
+++ b/arch/arm/mach-ux500/board-mop500-pins.c
@@ -78,9 +78,6 @@ BIAS(out_wkup_pdis, PIN_SLPM_DIR_OUTPUT|PIN_SLPM_WAKEUP_ENABLE|
PIN_MAP_MUX_GROUP_HOG_DEFAULT("pinctrl-db8500", group, func)
#define DB8500_PIN_HOG(pin,conf) \
PIN_MAP_CONFIGS_PIN_HOG_DEFAULT("pinctrl-db8500", pin, conf)
-#define DB8500_PIN_SLEEP(pin, conf, dev) \
- PIN_MAP_CONFIGS_PIN(dev, PINCTRL_STATE_SLEEP, "pinctrl-db8500", \
- pin, conf)
/* These are default states associated with device and changed runtime */
#define DB8500_MUX(group,func,dev) \
--
1.8.1.3
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 2/2] ARM: ux500: 8500: add ab8500-musb pinctrl support
2013-03-28 16:21 [PATCH 0/2] pinctrl support for ab8500-usb Fabio Baltieri
2013-03-28 16:21 ` [PATCH 1/2] ARM: ux500: remove redundant DB8500_PIN_SLEEP definition Fabio Baltieri
@ 2013-03-28 16:21 ` Fabio Baltieri
2013-03-29 12:29 ` [PATCH v2 " Fabio Baltieri
1 sibling, 1 reply; 6+ messages in thread
From: Fabio Baltieri @ 2013-03-28 16:21 UTC (permalink / raw)
To: linux-arm-kernel
From: Patrice Chotard <patrice.chotard@stericsson.com>
Add necessary definitions to support ab8500-musb pinctrl default and
sleep states.
Signed-off-by: Patrice Chotard <patrice.chotard@stericsson.com>
Signed-off-by: Fabio Baltieri <fabio.baltieri@linaro.org>
---
arch/arm/mach-ux500/board-mop500-pins.c | 23 +++++++++++++++++++++--
1 file changed, 21 insertions(+), 2 deletions(-)
diff --git a/arch/arm/mach-ux500/board-mop500-pins.c b/arch/arm/mach-ux500/board-mop500-pins.c
index 625880f..ca0649e 100644
--- a/arch/arm/mach-ux500/board-mop500-pins.c
+++ b/arch/arm/mach-ux500/board-mop500-pins.c
@@ -48,8 +48,12 @@ BIAS(slpm_in_nopull_wkup, PIN_SLEEPMODE_ENABLED|
PIN_SLPM_DIR_INPUT|PIN_SLPM_PULL_NONE|PIN_SLPM_WAKEUP_ENABLE);
BIAS(slpm_in_wkup_pdis, PIN_SLEEPMODE_ENABLED|
PIN_SLPM_DIR_INPUT|PIN_SLPM_WAKEUP_ENABLE|PIN_SLPM_PDIS_DISABLED);
+BIAS(slpm_in_wkup_pdis_en, PIN_SLEEPMODE_ENABLED|
+ PIN_SLPM_DIR_INPUT|PIN_SLPM_WAKEUP_ENABLE|PIN_SLPM_PDIS_ENABLED);
BIAS(slpm_wkup_pdis, PIN_SLEEPMODE_ENABLED|
PIN_SLPM_WAKEUP_ENABLE|PIN_SLPM_PDIS_DISABLED);
+BIAS(slpm_wkup_pdis_en, PIN_SLEEPMODE_ENABLED|
+ PIN_SLPM_WAKEUP_ENABLE|PIN_SLPM_PDIS_ENABLED);
BIAS(slpm_out_lo_pdis, PIN_SLEEPMODE_ENABLED|
PIN_SLPM_OUTPUT_LOW|PIN_SLPM_WAKEUP_DISABLE|PIN_SLPM_PDIS_DISABLED);
BIAS(slpm_out_lo_wkup, PIN_SLEEPMODE_ENABLED|
@@ -306,8 +310,23 @@ static struct pinctrl_map __initdata mop500_family_pinmap[] = {
DB8500_PIN_SLEEP("GPIO207_AJ23", slpm_in_wkup_pdis, "sdi4"), /* DAT4 */
/* Mux in USB pins, drive STP high */
- DB8500_MUX("usb_a_1", "usb", "musb-ux500.0"),
- DB8500_PIN("GPIO257_AE29", out_hi, "musb-ux500.0"), /* STP */
+ /* USB default state */
+ DB8500_MUX("usb_a_1", "usb", "ab8500-usb.0"),
+ DB8500_PIN("GPIO257_AE29", out_hi, "musbux500.0"), /* STP */
+ /* USB sleep state */
+ DB8500_PIN_SLEEP("GPIO256_AF28", slpm_wkup_pdis_en, "ab8500-usb.0"), /* NXT */
+ DB8500_PIN_SLEEP("GPIO257_AE29", slpm_out_hi_wkup_pdis, "ab8500-usb.0"), /* STP */
+ DB8500_PIN_SLEEP("GPIO258_AD29", slpm_wkup_pdis_en, "ab8500-usb.0"), /* XCLK */
+ DB8500_PIN_SLEEP("GPIO259_AC29", slpm_wkup_pdis_en, "ab8500-usb.0"), /* DIR */
+ DB8500_PIN_SLEEP("GPIO260_AD28", slpm_in_wkup_pdis_en, "ab8500-usb.0"), /* DAT7 */
+ DB8500_PIN_SLEEP("GPIO261_AD26", slpm_in_wkup_pdis_en, "ab8500-usb.0"), /* DAT6 */
+ DB8500_PIN_SLEEP("GPIO262_AE26", slpm_in_wkup_pdis_en, "ab8500-usb.0"), /* DAT5 */
+ DB8500_PIN_SLEEP("GPIO263_AG29", slpm_in_wkup_pdis_en, "ab8500-usb.0"), /* DAT4 */
+ DB8500_PIN_SLEEP("GPIO264_AE27", slpm_in_wkup_pdis_en, "ab8500-usb.0"), /* DAT3 */
+ DB8500_PIN_SLEEP("GPIO265_AD27", slpm_in_wkup_pdis_en, "ab8500-usb.0"), /* DAT2 */
+ DB8500_PIN_SLEEP("GPIO266_AC28", slpm_in_wkup_pdis_en, "ab8500-usb.0"), /* DAT1 */
+ DB8500_PIN_SLEEP("GPIO267_AC27", slpm_in_wkup_pdis_en, "ab8500-usb.0"), /* DAT0 */
+
/* Mux in SPI2 pins on the "other C1" altfunction */
DB8500_MUX("spi2_oc1_2", "spi2", "spi2"),
DB8500_PIN("GPIO216_AG12", gpio_out_hi, "spi2"), /* FRM */
--
1.8.1.3
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH v2 2/2] ARM: ux500: 8500: add ab8500-musb pinctrl support
2013-03-28 16:21 ` [PATCH 2/2] ARM: ux500: 8500: add ab8500-musb pinctrl support Fabio Baltieri
@ 2013-03-29 12:29 ` Fabio Baltieri
2013-04-03 20:52 ` Linus Walleij
0 siblings, 1 reply; 6+ messages in thread
From: Fabio Baltieri @ 2013-03-29 12:29 UTC (permalink / raw)
To: linux-arm-kernel
From: Patrice Chotard <patrice.chotard@stericsson.com>
Add necessary definitions to support ab8500-musb pinctrl default and
sleep states.
Signed-off-by: Patrice Chotard <patrice.chotard@stericsson.com>
Signed-off-by: Fabio Baltieri <fabio.baltieri@linaro.org>
---
Hi Linus,
I'm sending a v2 on this one as I mis-replaced a device id (manually
applied patch, sorry about that).
Changes from v1:
- fix typo in GPIO257_AE29 device name
Thanks,
Fabio
arch/arm/mach-ux500/board-mop500-pins.c | 23 +++++++++++++++++++++--
1 file changed, 21 insertions(+), 2 deletions(-)
diff --git a/arch/arm/mach-ux500/board-mop500-pins.c b/arch/arm/mach-ux500/board-mop500-pins.c
index 625880f..fee7fda 100644
--- a/arch/arm/mach-ux500/board-mop500-pins.c
+++ b/arch/arm/mach-ux500/board-mop500-pins.c
@@ -48,8 +48,12 @@ BIAS(slpm_in_nopull_wkup, PIN_SLEEPMODE_ENABLED|
PIN_SLPM_DIR_INPUT|PIN_SLPM_PULL_NONE|PIN_SLPM_WAKEUP_ENABLE);
BIAS(slpm_in_wkup_pdis, PIN_SLEEPMODE_ENABLED|
PIN_SLPM_DIR_INPUT|PIN_SLPM_WAKEUP_ENABLE|PIN_SLPM_PDIS_DISABLED);
+BIAS(slpm_in_wkup_pdis_en, PIN_SLEEPMODE_ENABLED|
+ PIN_SLPM_DIR_INPUT|PIN_SLPM_WAKEUP_ENABLE|PIN_SLPM_PDIS_ENABLED);
BIAS(slpm_wkup_pdis, PIN_SLEEPMODE_ENABLED|
PIN_SLPM_WAKEUP_ENABLE|PIN_SLPM_PDIS_DISABLED);
+BIAS(slpm_wkup_pdis_en, PIN_SLEEPMODE_ENABLED|
+ PIN_SLPM_WAKEUP_ENABLE|PIN_SLPM_PDIS_ENABLED);
BIAS(slpm_out_lo_pdis, PIN_SLEEPMODE_ENABLED|
PIN_SLPM_OUTPUT_LOW|PIN_SLPM_WAKEUP_DISABLE|PIN_SLPM_PDIS_DISABLED);
BIAS(slpm_out_lo_wkup, PIN_SLEEPMODE_ENABLED|
@@ -306,8 +310,23 @@ static struct pinctrl_map __initdata mop500_family_pinmap[] = {
DB8500_PIN_SLEEP("GPIO207_AJ23", slpm_in_wkup_pdis, "sdi4"), /* DAT4 */
/* Mux in USB pins, drive STP high */
- DB8500_MUX("usb_a_1", "usb", "musb-ux500.0"),
- DB8500_PIN("GPIO257_AE29", out_hi, "musb-ux500.0"), /* STP */
+ /* USB default state */
+ DB8500_MUX("usb_a_1", "usb", "ab8500-usb.0"),
+ DB8500_PIN("GPIO257_AE29", out_hi, "ab8500-usb.0"), /* STP */
+ /* USB sleep state */
+ DB8500_PIN_SLEEP("GPIO256_AF28", slpm_wkup_pdis_en, "ab8500-usb.0"), /* NXT */
+ DB8500_PIN_SLEEP("GPIO257_AE29", slpm_out_hi_wkup_pdis, "ab8500-usb.0"), /* STP */
+ DB8500_PIN_SLEEP("GPIO258_AD29", slpm_wkup_pdis_en, "ab8500-usb.0"), /* XCLK */
+ DB8500_PIN_SLEEP("GPIO259_AC29", slpm_wkup_pdis_en, "ab8500-usb.0"), /* DIR */
+ DB8500_PIN_SLEEP("GPIO260_AD28", slpm_in_wkup_pdis_en, "ab8500-usb.0"), /* DAT7 */
+ DB8500_PIN_SLEEP("GPIO261_AD26", slpm_in_wkup_pdis_en, "ab8500-usb.0"), /* DAT6 */
+ DB8500_PIN_SLEEP("GPIO262_AE26", slpm_in_wkup_pdis_en, "ab8500-usb.0"), /* DAT5 */
+ DB8500_PIN_SLEEP("GPIO263_AG29", slpm_in_wkup_pdis_en, "ab8500-usb.0"), /* DAT4 */
+ DB8500_PIN_SLEEP("GPIO264_AE27", slpm_in_wkup_pdis_en, "ab8500-usb.0"), /* DAT3 */
+ DB8500_PIN_SLEEP("GPIO265_AD27", slpm_in_wkup_pdis_en, "ab8500-usb.0"), /* DAT2 */
+ DB8500_PIN_SLEEP("GPIO266_AC28", slpm_in_wkup_pdis_en, "ab8500-usb.0"), /* DAT1 */
+ DB8500_PIN_SLEEP("GPIO267_AC27", slpm_in_wkup_pdis_en, "ab8500-usb.0"), /* DAT0 */
+
/* Mux in SPI2 pins on the "other C1" altfunction */
DB8500_MUX("spi2_oc1_2", "spi2", "spi2"),
DB8500_PIN("GPIO216_AG12", gpio_out_hi, "spi2"), /* FRM */
--
1.8.1.3
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 1/2] ARM: ux500: remove redundant DB8500_PIN_SLEEP definition
2013-03-28 16:21 ` [PATCH 1/2] ARM: ux500: remove redundant DB8500_PIN_SLEEP definition Fabio Baltieri
@ 2013-04-03 20:49 ` Linus Walleij
0 siblings, 0 replies; 6+ messages in thread
From: Linus Walleij @ 2013-04-03 20:49 UTC (permalink / raw)
To: linux-arm-kernel
On Thu, Mar 28, 2013 at 5:21 PM, Fabio Baltieri
<fabio.baltieri@linaro.org> wrote:
> DB8500_PIN_SLEEP was defined twice, drop one of the two.
>
> Signed-off-by: Fabio Baltieri <fabio.baltieri@linaro.org>
Patch applied.
Yours,
Linus Walleij
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH v2 2/2] ARM: ux500: 8500: add ab8500-musb pinctrl support
2013-03-29 12:29 ` [PATCH v2 " Fabio Baltieri
@ 2013-04-03 20:52 ` Linus Walleij
0 siblings, 0 replies; 6+ messages in thread
From: Linus Walleij @ 2013-04-03 20:52 UTC (permalink / raw)
To: linux-arm-kernel
On Fri, Mar 29, 2013 at 1:29 PM, Fabio Baltieri
<fabio.baltieri@linaro.org> wrote:
> From: Patrice Chotard <patrice.chotard@stericsson.com>
>
> Add necessary definitions to support ab8500-musb pinctrl default and
> sleep states.
>
> Signed-off-by: Patrice Chotard <patrice.chotard@stericsson.com>
> Signed-off-by: Fabio Baltieri <fabio.baltieri@linaro.org>
> ---
>
> Hi Linus,
>
> I'm sending a v2 on this one as I mis-replaced a device id (manually
> applied patch, sorry about that).
>
> Changes from v1:
> - fix typo in GPIO257_AE29 device name
Thanks, patch applied!
Yours,
Linus Walleij
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2013-04-03 20:52 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-03-28 16:21 [PATCH 0/2] pinctrl support for ab8500-usb Fabio Baltieri
2013-03-28 16:21 ` [PATCH 1/2] ARM: ux500: remove redundant DB8500_PIN_SLEEP definition Fabio Baltieri
2013-04-03 20:49 ` Linus Walleij
2013-03-28 16:21 ` [PATCH 2/2] ARM: ux500: 8500: add ab8500-musb pinctrl support Fabio Baltieri
2013-03-29 12:29 ` [PATCH v2 " Fabio Baltieri
2013-04-03 20:52 ` Linus Walleij
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).