* [PATCH] pinctrl: berlin: fix BG2CD field widths
@ 2015-09-27 1:03 Thomas Hebb
2015-10-01 19:30 ` Sebastian Hesselbarth
0 siblings, 1 reply; 5+ messages in thread
From: Thomas Hebb @ 2015-09-27 1:03 UTC (permalink / raw)
To: linux-kernel, linux-gpio
Cc: Linus Walleij, Antoine Tenart, Sebastian Hesselbarth,
Wolfram Sang
The previous register layout was incorrect, many of the fields having
fewer bits than were needed to represent all their modes. The new layout
is taken from the bootloader source of a BG2CD device.
Signed-off-by: Thomas Hebb <tommyhebb@gmail.com>
---
drivers/pinctrl/berlin/berlin-bg2cd.c | 62
++++++++++++++++++-----------------
1 file changed, 32 insertions(+), 30 deletions(-)
diff --git a/drivers/pinctrl/berlin/berlin-bg2cd.c
b/drivers/pinctrl/berlin/berlin-bg2cd.c
index 0cb793a..af5e465 100644
--- a/drivers/pinctrl/berlin/berlin-bg2cd.c
+++ b/drivers/pinctrl/berlin/berlin-bg2cd.c
@@ -19,24 +19,24 @@
static const struct berlin_desc_group berlin2cd_soc_pinctrl_groups[] = {
/* G */
- BERLIN_PINCTRL_GROUP("G0", 0x00, 0x1, 0x00,
+ BERLIN_PINCTRL_GROUP("G0", 0x00, 0x3, 0x00,
BERLIN_PINCTRL_FUNCTION(0x0, "jtag"),
BERLIN_PINCTRL_FUNCTION(0x1, "gpio"),
BERLIN_PINCTRL_FUNCTION(0x2, "led"),
BERLIN_PINCTRL_FUNCTION(0x3, "pwm")),
- BERLIN_PINCTRL_GROUP("G1", 0x00, 0x2, 0x01,
+ BERLIN_PINCTRL_GROUP("G1", 0x00, 0x3, 0x03,
BERLIN_PINCTRL_FUNCTION(0x0, "gpio"),
BERLIN_PINCTRL_FUNCTION(0x1, "sd0"),
BERLIN_PINCTRL_FUNCTION(0x6, "usb0_dbg"),
BERLIN_PINCTRL_FUNCTION(0x7, "usb1_dbg")),
- BERLIN_PINCTRL_GROUP("G2", 0x00, 0x2, 0x02,
+ BERLIN_PINCTRL_GROUP("G2", 0x00, 0x3, 0x06,
BERLIN_PINCTRL_FUNCTION(0x0, "gpio"),
BERLIN_PINCTRL_FUNCTION(0x1, "sd0"),
BERLIN_PINCTRL_FUNCTION(0x2, "fe"),
BERLIN_PINCTRL_FUNCTION(0x3, "pll"),
BERLIN_PINCTRL_FUNCTION(0x6, "usb0_dbg"),
BERLIN_PINCTRL_FUNCTION(0x7, "usb1_dbg")),
- BERLIN_PINCTRL_GROUP("G3", 0x00, 0x2, 0x04,
+ BERLIN_PINCTRL_GROUP("G3", 0x00, 0x3, 0x09,
BERLIN_PINCTRL_FUNCTION(0x0, "gpio"),
BERLIN_PINCTRL_FUNCTION(0x1, "sd0"),
BERLIN_PINCTRL_FUNCTION(0x2, "twsi2"),
@@ -44,7 +44,7 @@ static const struct berlin_desc_group
berlin2cd_soc_pinctrl_groups[] = {
BERLIN_PINCTRL_FUNCTION(0x4, "fe"),
BERLIN_PINCTRL_FUNCTION(0x6, "usb0_dbg"),
BERLIN_PINCTRL_FUNCTION(0x7, "usb1_dbg")),
- BERLIN_PINCTRL_GROUP("G4", 0x00, 0x2, 0x06,
+ BERLIN_PINCTRL_GROUP("G4", 0x00, 0x3, 0x0c,
BERLIN_PINCTRL_FUNCTION(0x0, "gpio"),
BERLIN_PINCTRL_FUNCTION(0x1, "sd0"),
BERLIN_PINCTRL_FUNCTION(0x2, "twsi3"),
@@ -52,7 +52,7 @@ static const struct berlin_desc_group
berlin2cd_soc_pinctrl_groups[] = {
BERLIN_PINCTRL_FUNCTION(0x4, "pwm"),
BERLIN_PINCTRL_FUNCTION(0x6, "usb0_dbg"),
BERLIN_PINCTRL_FUNCTION(0x7, "usb1_dbg")),
- BERLIN_PINCTRL_GROUP("G5", 0x00, 0x3, 0x08,
+ BERLIN_PINCTRL_GROUP("G5", 0x00, 0x3, 0x0f,
BERLIN_PINCTRL_FUNCTION(0x0, "gpio"),
BERLIN_PINCTRL_FUNCTION(0x1, "sd0"),
BERLIN_PINCTRL_FUNCTION(0x2, "twsi3"),
@@ -60,64 +60,66 @@ static const struct berlin_desc_group
berlin2cd_soc_pinctrl_groups[] = {
BERLIN_PINCTRL_FUNCTION(0x4, "pwm"),
BERLIN_PINCTRL_FUNCTION(0x6, "usb0_dbg"),
BERLIN_PINCTRL_FUNCTION(0x7, "usb1_dbg")),
- BERLIN_PINCTRL_GROUP("G6", 0x00, 0x2, 0x0b,
+ BERLIN_PINCTRL_GROUP("G6", 0x00, 0x3, 0x12,
BERLIN_PINCTRL_FUNCTION(0x0, "uart0"), /* RX/TX */
BERLIN_PINCTRL_FUNCTION(0x1, "gpio")),
- BERLIN_PINCTRL_GROUP("G7", 0x00, 0x3, 0x0d,
+ BERLIN_PINCTRL_GROUP("G7", 0x00, 0x3, 0x15,
BERLIN_PINCTRL_FUNCTION(0x0, "eddc"),
BERLIN_PINCTRL_FUNCTION(0x1, "twsi1"),
BERLIN_PINCTRL_FUNCTION(0x2, "gpio")),
- BERLIN_PINCTRL_GROUP("G8", 0x00, 0x3, 0x10,
+ BERLIN_PINCTRL_GROUP("G8", 0x00, 0x3, 0x18,
BERLIN_PINCTRL_FUNCTION(0x0, "spi1"), /* SS0n */
BERLIN_PINCTRL_FUNCTION(0x1, "gpio")),
- BERLIN_PINCTRL_GROUP("G9", 0x00, 0x3, 0x13,
+ BERLIN_PINCTRL_GROUP("G9", 0x00, 0x3, 0x1b,
BERLIN_PINCTRL_FUNCTION(0x0, "gpio"),
BERLIN_PINCTRL_FUNCTION(0x1, "spi1"), /* SS1n/SS2n */
- BERLIN_PINCTRL_FUNCTION(0x2, "twsi0")),
- BERLIN_PINCTRL_GROUP("G10", 0x00, 0x2, 0x16,
+ BERLIN_PINCTRL_FUNCTION(0x3, "twsi0")),
+ BERLIN_PINCTRL_GROUP("G10", 0x00, 0x2, 0x1e,
BERLIN_PINCTRL_FUNCTION(0x0, "spi1"), /* CLK */
BERLIN_PINCTRL_FUNCTION(0x1, "gpio")),
- BERLIN_PINCTRL_GROUP("G11", 0x00, 0x2, 0x18,
+ BERLIN_PINCTRL_GROUP("G11", 0x04, 0x2, 0x00,
BERLIN_PINCTRL_FUNCTION(0x0, "spi1"), /* SDI/SDO */
BERLIN_PINCTRL_FUNCTION(0x1, "gpio")),
- BERLIN_PINCTRL_GROUP("G12", 0x00, 0x3, 0x1a,
+ BERLIN_PINCTRL_GROUP("G12", 0x04, 0x3, 0x02,
BERLIN_PINCTRL_FUNCTION(0x0, "usb1"),
BERLIN_PINCTRL_FUNCTION(0x1, "gpio")),
- BERLIN_PINCTRL_GROUP("G13", 0x04, 0x3, 0x00,
+ BERLIN_PINCTRL_GROUP("G13", 0x04, 0x3, 0x05,
BERLIN_PINCTRL_FUNCTION(0x0, "nand"),
BERLIN_PINCTRL_FUNCTION(0x1, "usb0_dbg"),
BERLIN_PINCTRL_FUNCTION(0x2, "usb1_dbg")),
- BERLIN_PINCTRL_GROUP("G14", 0x04, 0x1, 0x03,
+ BERLIN_PINCTRL_GROUP("G14", 0x04, 0x1, 0x08,
BERLIN_PINCTRL_FUNCTION(0x0, "nand"),
BERLIN_PINCTRL_FUNCTION(0x1, "gpio")),
- BERLIN_PINCTRL_GROUP("G15", 0x04, 0x2, 0x04,
+ BERLIN_PINCTRL_GROUP("G15", 0x04, 0x3, 0x09,
BERLIN_PINCTRL_FUNCTION(0x0, "jtag"),
BERLIN_PINCTRL_FUNCTION(0x1, "gpio")),
- BERLIN_PINCTRL_GROUP("G16", 0x04, 0x3, 0x06,
+ BERLIN_PINCTRL_GROUP("G16", 0x04, 0x3, 0x0c,
BERLIN_PINCTRL_FUNCTION_UNKNOWN),
- BERLIN_PINCTRL_GROUP("G17", 0x04, 0x3, 0x09,
+ BERLIN_PINCTRL_GROUP("G17", 0x04, 0x3, 0x0f,
BERLIN_PINCTRL_FUNCTION_UNKNOWN),
- BERLIN_PINCTRL_GROUP("G18", 0x04, 0x1, 0x0c,
+ BERLIN_PINCTRL_GROUP("G18", 0x04, 0x2, 0x12,
BERLIN_PINCTRL_FUNCTION_UNKNOWN),
- BERLIN_PINCTRL_GROUP("G19", 0x04, 0x1, 0x0d,
+ BERLIN_PINCTRL_GROUP("G19", 0x04, 0x2, 0x14,
BERLIN_PINCTRL_FUNCTION_UNKNOWN),
- BERLIN_PINCTRL_GROUP("G20", 0x04, 0x1, 0x0e,
+ BERLIN_PINCTRL_GROUP("G20", 0x04, 0x2, 0x16,
BERLIN_PINCTRL_FUNCTION_UNKNOWN),
- BERLIN_PINCTRL_GROUP("G21", 0x04, 0x3, 0x0f,
+ BERLIN_PINCTRL_GROUP("G21", 0x04, 0x3, 0x18,
BERLIN_PINCTRL_FUNCTION_UNKNOWN),
- BERLIN_PINCTRL_GROUP("G22", 0x04, 0x3, 0x12,
+ BERLIN_PINCTRL_GROUP("G22", 0x04, 0x3, 0x1b,
BERLIN_PINCTRL_FUNCTION_UNKNOWN),
- BERLIN_PINCTRL_GROUP("G23", 0x04, 0x3, 0x15,
+ BERLIN_PINCTRL_GROUP("G23", 0x08, 0x3, 0x00,
BERLIN_PINCTRL_FUNCTION_UNKNOWN),
- BERLIN_PINCTRL_GROUP("G24", 0x04, 0x2, 0x18,
+ BERLIN_PINCTRL_GROUP("G24", 0x08, 0x2, 0x03,
BERLIN_PINCTRL_FUNCTION_UNKNOWN),
- BERLIN_PINCTRL_GROUP("G25", 0x04, 0x2, 0x1a,
+ BERLIN_PINCTRL_GROUP("G25", 0x08, 0x2, 0x05,
BERLIN_PINCTRL_FUNCTION_UNKNOWN),
- BERLIN_PINCTRL_GROUP("G26", 0x04, 0x1, 0x1c,
+ BERLIN_PINCTRL_GROUP("G26", 0x08, 0x1, 0x07,
BERLIN_PINCTRL_FUNCTION_UNKNOWN),
- BERLIN_PINCTRL_GROUP("G27", 0x04, 0x1, 0x1d,
+ BERLIN_PINCTRL_GROUP("G27", 0x08, 0x2, 0x08,
BERLIN_PINCTRL_FUNCTION_UNKNOWN),
- BERLIN_PINCTRL_GROUP("G28", 0x04, 0x2, 0x1e,
+ BERLIN_PINCTRL_GROUP("G28", 0x08, 0x3, 0x0a,
+ BERLIN_PINCTRL_FUNCTION_UNKNOWN),
+ BERLIN_PINCTRL_GROUP("G29", 0x08, 0x3, 0x0d,
BERLIN_PINCTRL_FUNCTION_UNKNOWN),
};
-- 2.5.3
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH] pinctrl: berlin: fix BG2CD field widths
2015-09-27 1:03 [PATCH] pinctrl: berlin: fix BG2CD field widths Thomas Hebb
@ 2015-10-01 19:30 ` Sebastian Hesselbarth
2015-10-05 7:24 ` Linus Walleij
0 siblings, 1 reply; 5+ messages in thread
From: Sebastian Hesselbarth @ 2015-10-01 19:30 UTC (permalink / raw)
To: Thomas Hebb, linux-kernel, linux-gpio
Cc: Linus Walleij, Antoine Tenart, Wolfram Sang
On 27.09.2015 03:03, Thomas Hebb wrote:
> The previous register layout was incorrect, many of the fields having
> fewer bits than were needed to represent all their modes. The new layout
> is taken from the bootloader source of a BG2CD device.
>
> Signed-off-by: Thomas Hebb <tommyhebb@gmail.com>
> ---
> drivers/pinctrl/berlin/berlin-bg2cd.c | 62
> ++++++++++++++++++-----------------
> 1 file changed, 32 insertions(+), 30 deletions(-)
Applied to berlin/fixes.
There seems to be something wrong with the patch.
Please base your patches on the recent -rc1 kernel
and use git send-email. I fixed this patch manually.
Sebastian
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] pinctrl: berlin: fix BG2CD field widths
2015-10-01 19:30 ` Sebastian Hesselbarth
@ 2015-10-05 7:24 ` Linus Walleij
2015-10-05 18:07 ` Sebastian Hesselbarth
0 siblings, 1 reply; 5+ messages in thread
From: Linus Walleij @ 2015-10-05 7:24 UTC (permalink / raw)
To: Sebastian Hesselbarth
Cc: Thomas Hebb, linux-kernel@vger.kernel.org,
linux-gpio@vger.kernel.org, Antoine Tenart, Wolfram Sang
On Thu, Oct 1, 2015 at 9:30 PM, Sebastian Hesselbarth
<sebastian.hesselbarth@gmail.com> wrote:
> On 27.09.2015 03:03, Thomas Hebb wrote:
>>
>> The previous register layout was incorrect, many of the fields having
>> fewer bits than were needed to represent all their modes. The new layout
>> is taken from the bootloader source of a BG2CD device.
>>
>> Signed-off-by: Thomas Hebb <tommyhebb@gmail.com>
>> ---
>> drivers/pinctrl/berlin/berlin-bg2cd.c | 62
>> ++++++++++++++++++-----------------
>> 1 file changed, 32 insertions(+), 30 deletions(-)
>
>
> Applied to berlin/fixes.
>
> There seems to be something wrong with the patch.
> Please base your patches on the recent -rc1 kernel
> and use git send-email. I fixed this patch manually.
I don't understand. Is this for the upstream kernel or not?
I should take it into the pinctrl tree if you ACK it I think?
Yours,
Linus Walleij
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] pinctrl: berlin: fix BG2CD field widths
2015-10-05 7:24 ` Linus Walleij
@ 2015-10-05 18:07 ` Sebastian Hesselbarth
2015-10-06 7:28 ` Linus Walleij
0 siblings, 1 reply; 5+ messages in thread
From: Sebastian Hesselbarth @ 2015-10-05 18:07 UTC (permalink / raw)
To: Linus Walleij
Cc: Thomas Hebb, linux-kernel@vger.kernel.org,
linux-gpio@vger.kernel.org, Antoine Tenart, Wolfram Sang
On 05.10.2015 09:24, Linus Walleij wrote:
> On Thu, Oct 1, 2015 at 9:30 PM, Sebastian Hesselbarth
> <sebastian.hesselbarth@gmail.com> wrote:
>> On 27.09.2015 03:03, Thomas Hebb wrote:
>>>
>>> The previous register layout was incorrect, many of the fields having
>>> fewer bits than were needed to represent all their modes. The new layout
>>> is taken from the bootloader source of a BG2CD device.
>>>
>>> Signed-off-by: Thomas Hebb <tommyhebb@gmail.com>
>>> ---
>>> drivers/pinctrl/berlin/berlin-bg2cd.c | 62
>>> ++++++++++++++++++-----------------
>>> 1 file changed, 32 insertions(+), 30 deletions(-)
>>
>>
>> Applied to berlin/fixes.
>>
>> There seems to be something wrong with the patch.
>> Please base your patches on the recent -rc1 kernel
>> and use git send-email. I fixed this patch manually.
>
> I don't understand. Is this for the upstream kernel or not?
>
> I should take it into the pinctrl tree if you ACK it I think?
Linus,
sorry, of course it is up to you to take it. I haven't sent a
PR for the branch I precipitately applied this patch to.
As the patch has issues with latest -rc1 I can provide you
a -rc1 compatible version of it. You can also pull it from
my branch if you prefer.
Please let me know you want the patch and sorry again for
the confusion.
Sebastian
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2015-10-06 7:28 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-09-27 1:03 [PATCH] pinctrl: berlin: fix BG2CD field widths Thomas Hebb
2015-10-01 19:30 ` Sebastian Hesselbarth
2015-10-05 7:24 ` Linus Walleij
2015-10-05 18:07 ` Sebastian Hesselbarth
2015-10-06 7:28 ` 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).