* [PATCH 1/5] pinctrl: sirf: fix the pin number and mux bit for usp0
@ 2013-07-04 7:55 Barry Song
2013-07-04 7:55 ` [PATCH 2/5] pinctrl: sirf: add usp0_uart_nostreamctrl pin group for usp-uart without flowctrl Barry Song
` (3 more replies)
0 siblings, 4 replies; 8+ messages in thread
From: Barry Song @ 2013-07-04 7:55 UTC (permalink / raw)
To: linux-arm-kernel
From: Qipan Li <Qipan.Li@csr.com>
we missed a pin and related mux bit for usp pin group, this
patch fixes it.
Signed-off-by: Qipan Li <Qipan.Li@csr.com>
Signed-off-by: Barry Song <Baohua.Song@csr.com>
---
drivers/pinctrl/sirf/pinctrl-atlas6.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/pinctrl/sirf/pinctrl-atlas6.c b/drivers/pinctrl/sirf/pinctrl-atlas6.c
index 1fa39a4..c641be9 100644
--- a/drivers/pinctrl/sirf/pinctrl-atlas6.c
+++ b/drivers/pinctrl/sirf/pinctrl-atlas6.c
@@ -496,7 +496,7 @@ static const unsigned sdmmc5_pins[] = { 24, 25, 26 };
static const struct sirfsoc_muxmask usp0_muxmask[] = {
{
.group = 1,
- .mask = BIT(19) | BIT(20) | BIT(21) | BIT(22),
+ .mask = BIT(19) | BIT(20) | BIT(21) | BIT(22) | BIT(23),
},
};
@@ -507,7 +507,7 @@ static const struct sirfsoc_padmux usp0_padmux = {
.funcval = 0,
};
-static const unsigned usp0_pins[] = { 51, 52, 53, 54 };
+static const unsigned usp0_pins[] = { 51, 52, 53, 54, 55 };
static const struct sirfsoc_muxmask usp1_muxmask[] = {
{
--
1.8.2.3
Member of the CSR plc group of companies. CSR plc registered in England and Wales, registered number 4187346, registered office Churchill House, Cambridge Business Park, Cowley Road, Cambridge, CB4 0WZ, United Kingdom
More information can be found at www.csr.com. Follow CSR on Twitter at http://twitter.com/CSR_PLC and read our blog at www.csr.com/blog
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH 2/5] pinctrl: sirf: add usp0_uart_nostreamctrl pin group for usp-uart without flowctrl
2013-07-04 7:55 [PATCH 1/5] pinctrl: sirf: fix the pin number and mux bit for usp0 Barry Song
@ 2013-07-04 7:55 ` Barry Song
2013-07-21 22:52 ` Linus Walleij
2013-07-04 7:55 ` [PATCH 3/5] arm/dts: sirf: fix the pingroup name mismatch between drivers and dts Barry Song
` (2 subsequent siblings)
3 siblings, 1 reply; 8+ messages in thread
From: Barry Song @ 2013-07-04 7:55 UTC (permalink / raw)
To: linux-arm-kernel
From: Qipan Li <Qipan.Li@csr.com>
this patch adds the lost pin group which supports to let USP0 to simulate
a UART without hardware flow control.
Signed-off-by: Qipan Li <Qipan.Li@csr.com>
Signed-off-by: Barry Song <Baohua.Song@csr.com>
---
arch/arm/boot/dts/atlas6.dtsi | 6 ++++++
drivers/pinctrl/sirf/pinctrl-atlas6.c | 20 ++++++++++++++++++++
2 files changed, 26 insertions(+)
diff --git a/arch/arm/boot/dts/atlas6.dtsi b/arch/arm/boot/dts/atlas6.dtsi
index 7d1a279..6e24ecf 100644
--- a/arch/arm/boot/dts/atlas6.dtsi
+++ b/arch/arm/boot/dts/atlas6.dtsi
@@ -485,6 +485,12 @@
sirf,function = "usp0";
};
};
+ usp0_uart_nostreamctrl_pins_a: usp0 at 1 {
+ usp0 {
+ sirf,pins = "usp0_uart_nostreamctrl_grp";
+ sirf,function = "usp0_uart_nostreamctrl";
+ };
+ };
usp1_pins_a: usp1 at 0 {
usp1 {
sirf,pins = "usp1grp";
diff --git a/drivers/pinctrl/sirf/pinctrl-atlas6.c b/drivers/pinctrl/sirf/pinctrl-atlas6.c
index c641be9..867c968 100644
--- a/drivers/pinctrl/sirf/pinctrl-atlas6.c
+++ b/drivers/pinctrl/sirf/pinctrl-atlas6.c
@@ -509,6 +509,19 @@ static const struct sirfsoc_padmux usp0_padmux = {
static const unsigned usp0_pins[] = { 51, 52, 53, 54, 55 };
+static const struct sirfsoc_muxmask usp0_uart_nostreamctrl_muxmask[] = {
+ {
+ .group = 1,
+ .mask = BIT(20) | BIT(21),
+ },
+};
+
+static const struct sirfsoc_padmux usp0_uart_nostreamctrl_padmux = {
+ .muxmask_counts = ARRAY_SIZE(usp0_uart_nostreamctrl_muxmask),
+ .muxmask = usp0_uart_nostreamctrl_muxmask,
+};
+
+static const unsigned usp0_uart_nostreamctrl_pins[] = { 52, 53 };
static const struct sirfsoc_muxmask usp1_muxmask[] = {
{
.group = 0,
@@ -822,6 +835,8 @@ static const struct sirfsoc_pin_group sirfsoc_pin_groups[] = {
SIRFSOC_PIN_GROUP("uart2grp", uart2_pins),
SIRFSOC_PIN_GROUP("uart2_nostreamctrlgrp", uart2_nostreamctrl_pins),
SIRFSOC_PIN_GROUP("usp0grp", usp0_pins),
+ SIRFSOC_PIN_GROUP("usp0_uart_nostreamctrl_grp",
+ usp0_uart_nostreamctrl_pins),
SIRFSOC_PIN_GROUP("usp1grp", usp1_pins),
SIRFSOC_PIN_GROUP("i2c0grp", i2c0_pins),
SIRFSOC_PIN_GROUP("i2c1grp", i2c1_pins),
@@ -862,6 +877,8 @@ static const char * const uart0grp[] = { "uart0grp" };
static const char * const uart1grp[] = { "uart1grp" };
static const char * const uart2grp[] = { "uart2grp" };
static const char * const uart2_nostreamctrlgrp[] = { "uart2_nostreamctrlgrp" };
+static const char * const usp0_uart_nostreamctrl_grp[] = {
+ "usp0_uart_nostreamctrl_grp" };
static const char * const usp0grp[] = { "usp0grp" };
static const char * const usp1grp[] = { "usp1grp" };
static const char * const i2c0grp[] = { "i2c0grp" };
@@ -904,6 +921,9 @@ static const struct sirfsoc_pmx_func sirfsoc_pmx_functions[] = {
SIRFSOC_PMX_FUNCTION("uart2", uart2grp, uart2_padmux),
SIRFSOC_PMX_FUNCTION("uart2_nostreamctrl", uart2_nostreamctrlgrp, uart2_nostreamctrl_padmux),
SIRFSOC_PMX_FUNCTION("usp0", usp0grp, usp0_padmux),
+ SIRFSOC_PMX_FUNCTION("usp0_uart_nostreamctrl",
+ usp0_uart_nostreamctrl_grp,
+ usp0_uart_nostreamctrl_padmux),
SIRFSOC_PMX_FUNCTION("usp1", usp1grp, usp1_padmux),
SIRFSOC_PMX_FUNCTION("i2c0", i2c0grp, i2c0_padmux),
SIRFSOC_PMX_FUNCTION("i2c1", i2c1grp, i2c1_padmux),
--
1.8.2.3
Member of the CSR plc group of companies. CSR plc registered in England and Wales, registered number 4187346, registered office Churchill House, Cambridge Business Park, Cowley Road, Cambridge, CB4 0WZ, United Kingdom
More information can be found at www.csr.com. Follow CSR on Twitter at http://twitter.com/CSR_PLC and read our blog at www.csr.com/blog
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH 3/5] arm/dts: sirf: fix the pingroup name mismatch between drivers and dts
2013-07-04 7:55 [PATCH 1/5] pinctrl: sirf: fix the pin number and mux bit for usp0 Barry Song
2013-07-04 7:55 ` [PATCH 2/5] pinctrl: sirf: add usp0_uart_nostreamctrl pin group for usp-uart without flowctrl Barry Song
@ 2013-07-04 7:55 ` Barry Song
2013-07-21 22:53 ` Linus Walleij
2013-07-04 7:55 ` [PATCH 4/5] pinctrl: sirf: fix the checkpatch issue about indentation Barry Song
2013-07-21 22:50 ` [PATCH 1/5] pinctrl: sirf: fix the pin number and mux bit for usp0 Linus Walleij
3 siblings, 1 reply; 8+ messages in thread
From: Barry Song @ 2013-07-04 7:55 UTC (permalink / raw)
To: linux-arm-kernel
in drivers/pinctrl/sirf, pingroup name is cko0 and cko1, but in dts, they
are cko0 and cko1_rst. this patch fixes the error in dts.
Signed-off-by: Barry Song <Baohua.Song@csr.com>
---
arch/arm/boot/dts/atlas6.dtsi | 16 ++++++++--------
arch/arm/boot/dts/prima2.dtsi | 16 ++++++++--------
2 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/arch/arm/boot/dts/atlas6.dtsi b/arch/arm/boot/dts/atlas6.dtsi
index 6e24ecf..ab1183b 100644
--- a/arch/arm/boot/dts/atlas6.dtsi
+++ b/arch/arm/boot/dts/atlas6.dtsi
@@ -521,16 +521,16 @@
sirf,function = "pulse_count";
};
};
- cko0_rst_pins_a: cko0_rst at 0 {
- cko0_rst {
- sirf,pins = "cko0_rstgrp";
- sirf,function = "cko0_rst";
+ cko0_pins_a: cko0 at 0 {
+ cko0 {
+ sirf,pins = "cko0grp";
+ sirf,function = "cko0";
};
};
- cko1_rst_pins_a: cko1_rst at 0 {
- cko1_rst {
- sirf,pins = "cko1_rstgrp";
- sirf,function = "cko1_rst";
+ cko1_pins_a: cko1 at 0 {
+ cko1 {
+ sirf,pins = "cko1grp";
+ sirf,function = "cko1";
};
};
};
diff --git a/arch/arm/boot/dts/prima2.dtsi b/arch/arm/boot/dts/prima2.dtsi
index 3329719..ce0266c 100644
--- a/arch/arm/boot/dts/prima2.dtsi
+++ b/arch/arm/boot/dts/prima2.dtsi
@@ -513,16 +513,16 @@
sirf,function = "pulse_count";
};
};
- cko0_rst_pins_a: cko0_rst at 0 {
- cko0_rst {
- sirf,pins = "cko0_rstgrp";
- sirf,function = "cko0_rst";
+ cko0_pins_a: cko0 at 0 {
+ cko0 {
+ sirf,pins = "cko0grp";
+ sirf,function = "cko0";
};
};
- cko1_rst_pins_a: cko1_rst at 0 {
- cko1_rst {
- sirf,pins = "cko1_rstgrp";
- sirf,function = "cko1_rst";
+ cko1_pins_a: cko1 at 0 {
+ cko1 {
+ sirf,pins = "cko1grp";
+ sirf,function = "cko1";
};
};
};
--
1.8.2.3
Member of the CSR plc group of companies. CSR plc registered in England and Wales, registered number 4187346, registered office Churchill House, Cambridge Business Park, Cowley Road, Cambridge, CB4 0WZ, United Kingdom
More information can be found at www.csr.com. Follow CSR on Twitter at http://twitter.com/CSR_PLC and read our blog at www.csr.com/blog
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH 4/5] pinctrl: sirf: fix the checkpatch issue about indentation
2013-07-04 7:55 [PATCH 1/5] pinctrl: sirf: fix the pin number and mux bit for usp0 Barry Song
2013-07-04 7:55 ` [PATCH 2/5] pinctrl: sirf: add usp0_uart_nostreamctrl pin group for usp-uart without flowctrl Barry Song
2013-07-04 7:55 ` [PATCH 3/5] arm/dts: sirf: fix the pingroup name mismatch between drivers and dts Barry Song
@ 2013-07-04 7:55 ` Barry Song
2013-07-21 22:54 ` Linus Walleij
2013-07-21 22:50 ` [PATCH 1/5] pinctrl: sirf: fix the pin number and mux bit for usp0 Linus Walleij
3 siblings, 1 reply; 8+ messages in thread
From: Barry Song @ 2013-07-04 7:55 UTC (permalink / raw)
To: linux-arm-kernel
From: Rongjun Ying <Rongjun.Ying@csr.com>
Signed-off-by: Rongjun Ying <Rongjun.Ying@csr.com>
Signed-off-by: Barry Song <Baohua.Song@csr.com>
---
drivers/pinctrl/sirf/pinctrl-sirf.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/pinctrl/sirf/pinctrl-sirf.c b/drivers/pinctrl/sirf/pinctrl-sirf.c
index 0677e19..7186b46 100644
--- a/drivers/pinctrl/sirf/pinctrl-sirf.c
+++ b/drivers/pinctrl/sirf/pinctrl-sirf.c
@@ -306,13 +306,13 @@ static int sirfsoc_gpio_of_xlate(struct gpio_chip *gc,
u32 *flags)
{
if (gpiospec->args[0] > SIRFSOC_GPIO_NO_OF_BANKS * SIRFSOC_GPIO_BANK_SIZE)
- return -EINVAL;
+ return -EINVAL;
if (gc != &sgpio_bank[gpiospec->args[0] / SIRFSOC_GPIO_BANK_SIZE].chip.gc)
- return -EINVAL;
+ return -EINVAL;
if (flags)
- *flags = gpiospec->args[1];
+ *flags = gpiospec->args[1];
return gpiospec->args[0] % SIRFSOC_GPIO_BANK_SIZE;
}
--
1.8.2.3
Member of the CSR plc group of companies. CSR plc registered in England and Wales, registered number 4187346, registered office Churchill House, Cambridge Business Park, Cowley Road, Cambridge, CB4 0WZ, United Kingdom
More information can be found at www.csr.com. Follow CSR on Twitter at http://twitter.com/CSR_PLC and read our blog at www.csr.com/blog
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH 1/5] pinctrl: sirf: fix the pin number and mux bit for usp0
2013-07-04 7:55 [PATCH 1/5] pinctrl: sirf: fix the pin number and mux bit for usp0 Barry Song
` (2 preceding siblings ...)
2013-07-04 7:55 ` [PATCH 4/5] pinctrl: sirf: fix the checkpatch issue about indentation Barry Song
@ 2013-07-21 22:50 ` Linus Walleij
3 siblings, 0 replies; 8+ messages in thread
From: Linus Walleij @ 2013-07-21 22:50 UTC (permalink / raw)
To: linux-arm-kernel
On Thu, Jul 4, 2013 at 9:55 AM, Barry Song <Baohua.Song@csr.com> wrote:
> From: Qipan Li <Qipan.Li@csr.com>
>
> we missed a pin and related mux bit for usp pin group, this
> patch fixes it.
>
> Signed-off-by: Qipan Li <Qipan.Li@csr.com>
> Signed-off-by: Barry Song <Baohua.Song@csr.com>
Applied.
Yours,
Linus Walleij
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH 2/5] pinctrl: sirf: add usp0_uart_nostreamctrl pin group for usp-uart without flowctrl
2013-07-04 7:55 ` [PATCH 2/5] pinctrl: sirf: add usp0_uart_nostreamctrl pin group for usp-uart without flowctrl Barry Song
@ 2013-07-21 22:52 ` Linus Walleij
0 siblings, 0 replies; 8+ messages in thread
From: Linus Walleij @ 2013-07-21 22:52 UTC (permalink / raw)
To: linux-arm-kernel
On Thu, Jul 4, 2013 at 9:55 AM, Barry Song <Baohua.Song@csr.com> wrote:
> From: Qipan Li <Qipan.Li@csr.com>
>
> this patch adds the lost pin group which supports to let USP0 to simulate
> a UART without hardware flow control.
>
> Signed-off-by: Qipan Li <Qipan.Li@csr.com>
> Signed-off-by: Barry Song <Baohua.Song@csr.com>
Applied.
Yours,
Linus Walleij
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH 3/5] arm/dts: sirf: fix the pingroup name mismatch between drivers and dts
2013-07-04 7:55 ` [PATCH 3/5] arm/dts: sirf: fix the pingroup name mismatch between drivers and dts Barry Song
@ 2013-07-21 22:53 ` Linus Walleij
0 siblings, 0 replies; 8+ messages in thread
From: Linus Walleij @ 2013-07-21 22:53 UTC (permalink / raw)
To: linux-arm-kernel
On Thu, Jul 4, 2013 at 9:55 AM, Barry Song <Baohua.Song@csr.com> wrote:
> in drivers/pinctrl/sirf, pingroup name is cko0 and cko1, but in dts, they
> are cko0 and cko1_rst. this patch fixes the error in dts.
>
> Signed-off-by: Barry Song <Baohua.Song@csr.com>
Applied.
Yours,
Linus Walleij
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH 4/5] pinctrl: sirf: fix the checkpatch issue about indentation
2013-07-04 7:55 ` [PATCH 4/5] pinctrl: sirf: fix the checkpatch issue about indentation Barry Song
@ 2013-07-21 22:54 ` Linus Walleij
0 siblings, 0 replies; 8+ messages in thread
From: Linus Walleij @ 2013-07-21 22:54 UTC (permalink / raw)
To: linux-arm-kernel
On Thu, Jul 4, 2013 at 9:55 AM, Barry Song <Baohua.Song@csr.com> wrote:
> From: Rongjun Ying <Rongjun.Ying@csr.com>
>
> Signed-off-by: Rongjun Ying <Rongjun.Ying@csr.com>
> Signed-off-by: Barry Song <Baohua.Song@csr.com>
Applied.
Yours,
Linus Walleij
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2013-07-21 22:54 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-07-04 7:55 [PATCH 1/5] pinctrl: sirf: fix the pin number and mux bit for usp0 Barry Song
2013-07-04 7:55 ` [PATCH 2/5] pinctrl: sirf: add usp0_uart_nostreamctrl pin group for usp-uart without flowctrl Barry Song
2013-07-21 22:52 ` Linus Walleij
2013-07-04 7:55 ` [PATCH 3/5] arm/dts: sirf: fix the pingroup name mismatch between drivers and dts Barry Song
2013-07-21 22:53 ` Linus Walleij
2013-07-04 7:55 ` [PATCH 4/5] pinctrl: sirf: fix the checkpatch issue about indentation Barry Song
2013-07-21 22:54 ` Linus Walleij
2013-07-21 22:50 ` [PATCH 1/5] pinctrl: sirf: fix the pin number and mux bit for usp0 Linus Walleij
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.