diff for duplicates of <a0a372bcfd4255cbc5c6c68c3cca428d13c112ef.camel@codeconstruct.com.au> diff --git a/a/1.txt b/N1/1.txt index 80ea42c..c943a1b 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -12,9 +12,9 @@ On Wed, 2024-10-09 at 02:28 +0000, Billy Tsai wrote: > > > > > > Signed-off-by: Billy Tsai <billy_tsai@aspeedtech.com> > > > --- -> > > ?drivers/gpio/gpio-aspeed.c | 147 +> > > drivers/gpio/gpio-aspeed.c | 147 > > > +++++++++++++++++++++++++++++++++++++ -> > > ?1 file changed, 147 insertions(+) +> > > 1 file changed, 147 insertions(+) > > > > > > diff --git a/drivers/gpio/gpio-aspeed.c b/drivers/gpio/gpio- > > > aspeed.c @@ -22,8 +22,8 @@ On Wed, 2024-10-09 at 02:28 +0000, Billy Tsai wrote: > > > --- a/drivers/gpio/gpio-aspeed.c > > > +++ b/drivers/gpio/gpio-aspeed.c > > > @@ -30,6 +30,27 @@ -> > > ?#include <linux/gpio/consumer.h> -> > > ?#include "gpiolib.h" +> > > #include <linux/gpio/consumer.h> +> > > #include "gpiolib.h" > > > > > > +/* Non-constant mask variant of FIELD_GET() and FIELD_PREP() */ > > > +#define field_get(_mask, _reg) (((_reg) & (_mask)) >> @@ -50,27 +50,27 @@ On Wed, 2024-10-09 at 02:28 +0000, Billy Tsai wrote: > > > +#define GPIO_G7_CTRL_IRQ_STS BIT(12) > > > +#define GPIO_G7_CTRL_IN_DATA BIT(13) > > > + -> > > ?struct aspeed_bank_props { -> > > ??????unsigned int bank; -> > > ??????u32 input; +> > > struct aspeed_bank_props { +> > > unsigned int bank; +> > > u32 input; > > > @@ -95,6 +116,22 @@ struct aspeed_gpio_bank { -> > > ??*/ +> > > */ > > > -> > > ?static const int debounce_timers[4] = { 0x00, 0x50, 0x54, 0x58 +> > > static const int debounce_timers[4] = { 0x00, 0x50, 0x54, 0x58 > > > }; > > > +static const int g7_debounce_timers[4] = { 0x00, 0x00, 0x04, > > > 0x08 }; > > > + > > > +/* > > > + * The debounce timers array is used to configure the debounce -> > > timer settings.Here?s how it works: +> > > timer settings.Here’s how it works: > > > + * Array Value: Indicates the offset for configuring the > > > debounce timer. > > > + * Array Index: Corresponds to the debounce setting register. > > > + * The debounce timers array follows this pattern for > > > configuring the debounce setting registers: > > > + * Array Index 0: No debounce timer is set; -> > > + * Array Value is irrelevant (don?t care). +> > > + * Array Value is irrelevant (don’t care). > > > + * Array Index 1: Debounce setting #2 is set to 1, and debounce > > > setting #1 is set to 0. > > > + * Array Value: offset for configuring debounce @@ -85,12 +85,12 @@ On Wed, 2024-10-09 at 02:28 +0000, Billy Tsai wrote: > > > timer 2 (g4: 0x58, g7: 0x8) > > > + */ > > > -> > > ?static const struct aspeed_gpio_copro_ops *copro_ops; -> > > ?static void *copro_data; +> > > static const struct aspeed_gpio_copro_ops *copro_ops; +> > > static void *copro_data; > > > @@ -250,6 +287,39 @@ static void __iomem > > > *aspeed_gpio_g4_bank_reg(struct aspeed_gpio *gpio, -> > > ??????BUG(); -> > > ?} +> > > BUG(); +> > > } > > > > > > +static u32 aspeed_gpio_g7_reg_mask(const enum aspeed_gpio_reg > > > reg) diff --git a/a/content_digest b/N1/content_digest index 081e1ce..da33977 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -3,9 +3,23 @@ "ref\066e619a9085a2ecb62e3945cd024822de5317f92.camel@codeconstruct.com.au\0" "ref\0OSQPR06MB72526C8FE71BF336D8AF50758B7F2@OSQPR06MB7252.apcprd06.prod.outlook.com\0" "From\0Andrew Jeffery <andrew@codeconstruct.com.au>\0" - "Subject\0[PATCH v7 7/7] gpio: aspeed: Support G7 Aspeed gpio controller\0" + "Subject\0Re: [PATCH v7 7/7] gpio: aspeed: Support G7 Aspeed gpio controller\0" "Date\0Wed, 09 Oct 2024 17:17:26 +1030\0" - "To\0linux-aspeed@lists.ozlabs.org\0" + "To\0Billy Tsai <billy_tsai@aspeedtech.com>" + linus.walleij@linaro.org <linus.walleij@linaro.org> + brgl@bgdev.pl <brgl@bgdev.pl> + robh@kernel.org <robh@kernel.org> + krzk+dt@kernel.org <krzk+dt@kernel.org> + conor+dt@kernel.org <conor+dt@kernel.org> + joel@jms.id.au <joel@jms.id.au> + linux-gpio@vger.kernel.org <linux-gpio@vger.kernel.org> + devicetree@vger.kernel.org <devicetree@vger.kernel.org> + linux-arm-kernel@lists.infradead.org <linux-arm-kernel@lists.infradead.org> + linux-aspeed@lists.ozlabs.org <linux-aspeed@lists.ozlabs.org> + linux-kernel@vger.kernel.org <linux-kernel@vger.kernel.org> + BMC-SW <BMC-SW@aspeedtech.com> + Peter.Yin@quantatw.com <Peter.Yin@quantatw.com> + " Jay_Zhang@wiwynn.com <Jay_Zhang@wiwynn.com>\0" "\00:1\0" "b\0" "On Wed, 2024-10-09 at 02:28 +0000, Billy Tsai wrote:\n" @@ -22,9 +36,9 @@ "> > > \n" "> > > Signed-off-by: Billy Tsai <billy_tsai@aspeedtech.com>\n" "> > > ---\n" - "> > > ?drivers/gpio/gpio-aspeed.c | 147\n" + "> > > \302\240drivers/gpio/gpio-aspeed.c | 147\n" "> > > +++++++++++++++++++++++++++++++++++++\n" - "> > > ?1 file changed, 147 insertions(+)\n" + "> > > \302\2401 file changed, 147 insertions(+)\n" "> > > \n" "> > > diff --git a/drivers/gpio/gpio-aspeed.c b/drivers/gpio/gpio-\n" "> > > aspeed.c\n" @@ -32,8 +46,8 @@ "> > > --- a/drivers/gpio/gpio-aspeed.c\n" "> > > +++ b/drivers/gpio/gpio-aspeed.c\n" "> > > @@ -30,6 +30,27 @@\n" - "> > > ?#include <linux/gpio/consumer.h>\n" - "> > > ?#include \"gpiolib.h\"\n" + "> > > \302\240#include <linux/gpio/consumer.h>\n" + "> > > \302\240#include \"gpiolib.h\"\n" "> > > \n" "> > > +/* Non-constant mask variant of FIELD_GET() and FIELD_PREP() */\n" "> > > +#define field_get(_mask, _reg) (((_reg) & (_mask)) >>\n" @@ -60,27 +74,27 @@ "> > > +#define GPIO_G7_CTRL_IRQ_STS BIT(12)\n" "> > > +#define GPIO_G7_CTRL_IN_DATA BIT(13)\n" "> > > +\n" - "> > > ?struct aspeed_bank_props {\n" - "> > > ??????unsigned int bank;\n" - "> > > ??????u32 input;\n" + "> > > \302\240struct aspeed_bank_props {\n" + "> > > \302\240\302\240\302\240\302\240\302\240\302\240unsigned int bank;\n" + "> > > \302\240\302\240\302\240\302\240\302\240\302\240u32 input;\n" "> > > @@ -95,6 +116,22 @@ struct aspeed_gpio_bank {\n" - "> > > ??*/\n" + "> > > \302\240\302\240*/\n" "> > > \n" - "> > > ?static const int debounce_timers[4] = { 0x00, 0x50, 0x54, 0x58\n" + "> > > \302\240static const int debounce_timers[4] = { 0x00, 0x50, 0x54, 0x58\n" "> > > };\n" "> > > +static const int g7_debounce_timers[4] = { 0x00, 0x00, 0x04,\n" "> > > 0x08 };\n" "> > > +\n" "> > > +/*\n" "> > > + * The debounce timers array is used to configure the debounce\n" - "> > > timer settings.Here?s how it works:\n" + "> > > timer settings.Here\342\200\231s how it works:\n" "> > > + * Array Value: Indicates the offset for configuring the\n" "> > > debounce timer.\n" "> > > + * Array Index: Corresponds to the debounce setting register.\n" "> > > + * The debounce timers array follows this pattern for\n" "> > > configuring the debounce setting registers:\n" "> > > + * Array Index 0: No debounce timer is set;\n" - "> > > + * Array Value is irrelevant (don?t care).\n" + "> > > + * Array Value is irrelevant (don\342\200\231t care).\n" "> > > + * Array Index 1: Debounce setting #2 is set to 1, and debounce\n" "> > > setting #1 is set to 0.\n" "> > > + * Array Value: offset for configuring debounce\n" @@ -95,12 +109,12 @@ "> > > timer 2 (g4: 0x58, g7: 0x8)\n" "> > > + */\n" "> > > \n" - "> > > ?static const struct aspeed_gpio_copro_ops *copro_ops;\n" - "> > > ?static void *copro_data;\n" + "> > > \302\240static const struct aspeed_gpio_copro_ops *copro_ops;\n" + "> > > \302\240static void *copro_data;\n" "> > > @@ -250,6 +287,39 @@ static void __iomem\n" "> > > *aspeed_gpio_g4_bank_reg(struct aspeed_gpio *gpio,\n" - "> > > ??????BUG();\n" - "> > > ?}\n" + "> > > \302\240\302\240\302\240\302\240\302\240\302\240BUG();\n" + "> > > \302\240}\n" "> > > \n" "> > > +static u32 aspeed_gpio_g7_reg_mask(const enum aspeed_gpio_reg\n" "> > > reg)\n" @@ -138,4 +152,4 @@ "\n" Reviewed-by: Andrew Jeffery <andrew@codeconstruct.com.au> -e1d0c30432f94c9dfff057df4723c4066f54520eb9587e4e3f6a401c6e86ca4c +6d014d06a54f2b736c7ec4ac71e23426a66fe513ab613f362a67cc9bc5a1c24c
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.