| Message ID | 20180829082413.2512005-2-sravanhome@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Add Actions Semi S700 pinctrl support | expand |
Hi Saravanan, On Wed, Aug 29, 2018 at 10:24:09AM +0200, Saravanan Sekar wrote: > Move generic defines common to the Owl family out of S900 driver. > > Signed-off-by: Parthiban Nallathambi <pn@denx.de> > Signed-off-by: Saravanan Sekar <sravanhome@gmail.com> > --- > drivers/pinctrl/actions/pinctrl-owl.h | 131 +++++++++++++++++++++++++++++++ > drivers/pinctrl/actions/pinctrl-s900.c | 139 ++------------------------------- > 2 files changed, 137 insertions(+), 133 deletions(-) > > diff --git a/drivers/pinctrl/actions/pinctrl-owl.h b/drivers/pinctrl/actions/pinctrl-owl.h > index a724d1d406d4..31cc33d7c4a5 100644 > --- a/drivers/pinctrl/actions/pinctrl-owl.h > +++ b/drivers/pinctrl/actions/pinctrl-owl.h > @@ -15,6 +15,136 @@ > #define OWL_PINCONF_SLEW_SLOW 0 > #define OWL_PINCONF_SLEW_FAST 1 > > +#define MUX_PG(group_name, reg, shift, width) \ > + { \ > + .name = #group_name, \ > + .pads = group_name##_pads, \ > + .npads = ARRAY_SIZE(group_name##_pads), \ > + .funcs = group_name##_funcs, \ > + .nfuncs = ARRAY_SIZE(group_name##_funcs), \ > + .mfpctl_reg = MFCTL##reg, \ > + .mfpctl_shift = shift, \ > + .mfpctl_width = width, \ > + .drv_reg = -1, \ > + .drv_shift = -1, \ > + .drv_width = -1, \ > + .sr_reg = -1, \ > + .sr_shift = -1, \ > + .sr_width = -1, \ > + } > + > +#define DRV_PG(group_name, reg, shift, width) \ > + { \ > + .name = #group_name, \ > + .pads = group_name##_pads, \ > + .npads = ARRAY_SIZE(group_name##_pads), \ > + .mfpctl_reg = -1, \ > + .mfpctl_shift = -1, \ > + .mfpctl_width = -1, \ > + .drv_reg = PAD_DRV##reg, \ > + .drv_shift = shift, \ > + .drv_width = width, \ > + .sr_reg = -1, \ > + .sr_shift = -1, \ > + .sr_width = -1, \ > + } > + > +#define SR_PG(group_name, reg, shift, width) \ > + { \ > + .name = #group_name, \ > + .pads = group_name##_pads, \ > + .npads = ARRAY_SIZE(group_name##_pads), \ > + .mfpctl_reg = -1, \ > + .mfpctl_shift = -1, \ > + .mfpctl_width = -1, \ > + .drv_reg = -1, \ > + .drv_shift = -1, \ > + .drv_width = -1, \ > + .sr_reg = PAD_SR##reg, \ > + .sr_shift = shift, \ > + .sr_width = width, \ > + } > + > +#define FUNCTION(fname) \ > + { \ > + .name = #fname, \ > + .groups = fname##_groups, \ > + .ngroups = ARRAY_SIZE(fname##_groups), \ > + } > + > +/* PAD PULL UP/DOWN CONFIGURES */ > +#define PULLCTL_CONF(pull_reg, pull_sft, pull_wdt) \ > + { \ > + .reg = PAD_PULLCTL##pull_reg, \ > + .shift = pull_sft, \ > + .width = pull_wdt, \ > + } > + > +#define PAD_PULLCTL_CONF(pad_name, pull_reg, pull_sft, pull_wdt) \ > + struct owl_pullctl pad_name##_pullctl_conf \ > + = PULLCTL_CONF(pull_reg, pull_sft, pull_wdt) > + > +#define ST_CONF(st_reg, st_sft, st_wdt) \ > + { \ > + .reg = PAD_ST##st_reg, \ > + .shift = st_sft, \ > + .width = st_wdt, \ > + } > + > +#define PAD_ST_CONF(pad_name, st_reg, st_sft, st_wdt) \ > + struct owl_st pad_name##_st_conf \ > + = ST_CONF(st_reg, st_sft, st_wdt) > + > +#define PAD_INFO(name) \ > + { \ > + .pad = name, \ > + .pullctl = NULL, \ > + .st = NULL, \ > + } > + > +#define PAD_INFO_ST(name) \ > + { \ > + .pad = name, \ > + .pullctl = NULL, \ > + .st = &name##_st_conf, \ > + } > + > +#define PAD_INFO_PULLCTL(name) \ > + { \ > + .pad = name, \ > + .pullctl = &name##_pullctl_conf, \ > + .st = NULL, \ > + } > + > +#define PAD_INFO_PULLCTL_ST(name) \ > + { \ > + .pad = name, \ > + .pullctl = &name##_pullctl_conf, \ > + .st = &name##_st_conf, \ > + } > + > +#define OWL_GPIO_PORT_A 0 > +#define OWL_GPIO_PORT_B 1 > +#define OWL_GPIO_PORT_C 2 > +#define OWL_GPIO_PORT_D 3 > +#define OWL_GPIO_PORT_E 4 > +#define OWL_GPIO_PORT_F 5 > + > +#define OWL_GPIO_PORT(port, base, count, _outen, _inen, _dat, _intc_ctl,\ > + _intc_pd, _intc_msk, _intc_type, _share) \ > + [OWL_GPIO_PORT_##port] = { \ > + .offset = base, \ > + .pins = count, \ > + .outen = _outen, \ > + .inen = _inen, \ > + .dat = _dat, \ > + .intc_ctl = _intc_ctl, \ > + .intc_pd = _intc_pd, \ > + .intc_msk = _intc_msk, \ > + .intc_type = _intc_type, \ > + .shared_ctl_offset = _share, \ Above member addition is not related to this patch. What is the purpose of this? Either move this to a separate commit if it is needed by S700 or justify in this patch itself. Btw, this patch is not applying cleanly. > + } > + > enum owl_pinconf_pull { > OWL_PINCONF_PULL_HIZ, > OWL_PINCONF_PULL_DOWN, > @@ -148,6 +278,7 @@ struct owl_gpio_port { > unsigned int intc_pd; > unsigned int intc_msk; > unsigned int intc_type; > + u8 shared_ctl_offset; Same as above. Regards, Mani > }; > > /** > diff --git a/drivers/pinctrl/actions/pinctrl-s900.c b/drivers/pinctrl/actions/pinctrl-s900.c > index ea67b14ef93b..0597009d8369 100644 > --- a/drivers/pinctrl/actions/pinctrl-s900.c > +++ b/drivers/pinctrl/actions/pinctrl-s900.c > @@ -33,13 +33,6 @@ > #define PAD_SR1 (0x0274) > #define PAD_SR2 (0x0278) > > -#define OWL_GPIO_PORT_A 0 > -#define OWL_GPIO_PORT_B 1 > -#define OWL_GPIO_PORT_C 2 > -#define OWL_GPIO_PORT_D 3 > -#define OWL_GPIO_PORT_E 4 > -#define OWL_GPIO_PORT_F 5 > - > #define _GPIOA(offset) (offset) > #define _GPIOB(offset) (32 + (offset)) > #define _GPIOC(offset) (64 + (offset)) > @@ -892,55 +885,6 @@ static unsigned int i2c2_sr_pads[] = { I2C2_SCLK, I2C2_SDATA }; > static unsigned int sensor0_sr_pads[] = { SENSOR0_PCLK, > SENSOR0_CKOUT }; > > -#define MUX_PG(group_name, reg, shift, width) \ > - { \ > - .name = #group_name, \ > - .pads = group_name##_pads, \ > - .npads = ARRAY_SIZE(group_name##_pads), \ > - .funcs = group_name##_funcs, \ > - .nfuncs = ARRAY_SIZE(group_name##_funcs), \ > - .mfpctl_reg = MFCTL##reg, \ > - .mfpctl_shift = shift, \ > - .mfpctl_width = width, \ > - .drv_reg = -1, \ > - .drv_shift = -1, \ > - .drv_width = -1, \ > - .sr_reg = -1, \ > - .sr_shift = -1, \ > - .sr_width = -1, \ > - } > - > -#define DRV_PG(group_name, reg, shift, width) \ > - { \ > - .name = #group_name, \ > - .pads = group_name##_pads, \ > - .npads = ARRAY_SIZE(group_name##_pads), \ > - .mfpctl_reg = -1, \ > - .mfpctl_shift = -1, \ > - .mfpctl_width = -1, \ > - .drv_reg = PAD_DRV##reg, \ > - .drv_shift = shift, \ > - .drv_width = width, \ > - .sr_reg = -1, \ > - .sr_shift = -1, \ > - .sr_width = -1, \ > - } > - > -#define SR_PG(group_name, reg, shift, width) \ > - { \ > - .name = #group_name, \ > - .pads = group_name##_pads, \ > - .npads = ARRAY_SIZE(group_name##_pads), \ > - .mfpctl_reg = -1, \ > - .mfpctl_shift = -1, \ > - .mfpctl_width = -1, \ > - .drv_reg = -1, \ > - .drv_shift = -1, \ > - .drv_width = -1, \ > - .sr_reg = PAD_SR##reg, \ > - .sr_shift = shift, \ > - .sr_width = width, \ > - } > > /* Pinctrl groups */ > static const struct owl_pingroup s900_groups[] = { > @@ -1442,13 +1386,6 @@ static const char * const sirq2_groups[] = { > "sirq2_dummy", > }; > > -#define FUNCTION(fname) \ > - { \ > - .name = #fname, \ > - .groups = fname##_groups, \ > - .ngroups = ARRAY_SIZE(fname##_groups), \ > - } > - > static const struct owl_pinmux_func s900_functions[] = { > [S900_MUX_ERAM] = FUNCTION(eram), > [S900_MUX_ETH_RMII] = FUNCTION(eth_rmii), > @@ -1500,28 +1437,6 @@ static const struct owl_pinmux_func s900_functions[] = { > [S900_MUX_SIRQ1] = FUNCTION(sirq1), > [S900_MUX_SIRQ2] = FUNCTION(sirq2) > }; > -/* PAD PULL UP/DOWN CONFIGURES */ > -#define PULLCTL_CONF(pull_reg, pull_sft, pull_wdt) \ > - { \ > - .reg = PAD_PULLCTL##pull_reg, \ > - .shift = pull_sft, \ > - .width = pull_wdt, \ > - } > - > -#define PAD_PULLCTL_CONF(pad_name, pull_reg, pull_sft, pull_wdt) \ > - struct owl_pullctl pad_name##_pullctl_conf \ > - = PULLCTL_CONF(pull_reg, pull_sft, pull_wdt) > - > -#define ST_CONF(st_reg, st_sft, st_wdt) \ > - { \ > - .reg = PAD_ST##st_reg, \ > - .shift = st_sft, \ > - .width = st_wdt, \ > - } > - > -#define PAD_ST_CONF(pad_name, st_reg, st_sft, st_wdt) \ > - struct owl_st pad_name##_st_conf \ > - = ST_CONF(st_reg, st_sft, st_wdt) > > /* PAD_PULLCTL0 */ > static PAD_PULLCTL_CONF(ETH_RXER, 0, 18, 2); > @@ -1639,34 +1554,6 @@ static PAD_ST_CONF(SPI0_SS, 1, 2, 1); > static PAD_ST_CONF(I2S_BCLK0, 1, 1, 1); > static PAD_ST_CONF(I2S_MCLK0, 1, 0, 1); > > -#define PAD_INFO(name) \ > - { \ > - .pad = name, \ > - .pullctl = NULL, \ > - .st = NULL, \ > - } > - > -#define PAD_INFO_ST(name) \ > - { \ > - .pad = name, \ > - .pullctl = NULL, \ > - .st = &name##_st_conf, \ > - } > - > -#define PAD_INFO_PULLCTL(name) \ > - { \ > - .pad = name, \ > - .pullctl = &name##_pullctl_conf, \ > - .st = NULL, \ > - } > - > -#define PAD_INFO_PULLCTL_ST(name) \ > - { \ > - .pad = name, \ > - .pullctl = &name##_pullctl_conf, \ > - .st = &name##_st_conf, \ > - } > - > /* Pad info table */ > static struct owl_padinfo s900_padinfo[NUM_PADS] = { > [ETH_TXD0] = PAD_INFO_ST(ETH_TXD0), > @@ -1821,27 +1708,13 @@ static struct owl_padinfo s900_padinfo[NUM_PADS] = { > [SGPIO3] = PAD_INFO_PULLCTL_ST(SGPIO3) > }; > > -#define OWL_GPIO_PORT(port, base, count, _outen, _inen, _dat, \ > - _intc_ctl, _intc_pd, _intc_msk, _intc_type) \ > - [OWL_GPIO_PORT_##port] = { \ > - .offset = base, \ > - .pins = count, \ > - .outen = _outen, \ > - .inen = _inen, \ > - .dat = _dat, \ > - .intc_ctl = _intc_ctl, \ > - .intc_pd = _intc_pd, \ > - .intc_msk = _intc_msk, \ > - .intc_type = _intc_type, \ > - } > - > static const struct owl_gpio_port s900_gpio_ports[] = { > - OWL_GPIO_PORT(A, 0x0000, 32, 0x0, 0x4, 0x8, 0x204, 0x208, 0x20C, 0x240), > - OWL_GPIO_PORT(B, 0x000C, 32, 0x0, 0x4, 0x8, 0x534, 0x204, 0x208, 0x23C), > - OWL_GPIO_PORT(C, 0x0018, 12, 0x0, 0x4, 0x8, 0x52C, 0x200, 0x204, 0x238), > - OWL_GPIO_PORT(D, 0x0024, 30, 0x0, 0x4, 0x8, 0x524, 0x1FC, 0x200, 0x234), > - OWL_GPIO_PORT(E, 0x0030, 32, 0x0, 0x4, 0x8, 0x51C, 0x1F8, 0x1FC, 0x230), > - OWL_GPIO_PORT(F, 0x00F0, 8, 0x0, 0x4, 0x8, 0x460, 0x140, 0x144, 0x178) > + OWL_GPIO_PORT(A, 0x0000, 32, 0x0, 0x4, 0x8, 0x204, 0x208, 0x20C, 0x240, 0), > + OWL_GPIO_PORT(B, 0x000C, 32, 0x0, 0x4, 0x8, 0x534, 0x204, 0x208, 0x23C, 0), > + OWL_GPIO_PORT(C, 0x0018, 12, 0x0, 0x4, 0x8, 0x52C, 0x200, 0x204, 0x238, 0), > + OWL_GPIO_PORT(D, 0x0024, 30, 0x0, 0x4, 0x8, 0x524, 0x1FC, 0x200, 0x234, 0), > + OWL_GPIO_PORT(E, 0x0030, 32, 0x0, 0x4, 0x8, 0x51C, 0x1F8, 0x1FC, 0x230, 0), > + OWL_GPIO_PORT(F, 0x00F0, 8, 0x0, 0x4, 0x8, 0x460, 0x140, 0x144, 0x178, 0) > }; > > static struct owl_pinctrl_soc_data s900_pinctrl_data = { > -- > 2.14.4 >
On 08/29/18 17:20, Manivannan Sadhasivam wrote: > Hi Saravanan, > > On Wed, Aug 29, 2018 at 10:24:09AM +0200, Saravanan Sekar wrote: >> Move generic defines common to the Owl family out of S900 driver. >> >> Signed-off-by: Parthiban Nallathambi <pn@denx.de> >> Signed-off-by: Saravanan Sekar <sravanhome@gmail.com> >> --- >> drivers/pinctrl/actions/pinctrl-owl.h | 131 +++++++++++++++++++++++++++++++ >> drivers/pinctrl/actions/pinctrl-s900.c | 139 ++------------------------------- >> 2 files changed, 137 insertions(+), 133 deletions(-) >> >> diff --git a/drivers/pinctrl/actions/pinctrl-owl.h b/drivers/pinctrl/actions/pinctrl-owl.h >> index a724d1d406d4..31cc33d7c4a5 100644 >> --- a/drivers/pinctrl/actions/pinctrl-owl.h >> +++ b/drivers/pinctrl/actions/pinctrl-owl.h >> @@ -15,6 +15,136 @@ >> #define OWL_PINCONF_SLEW_SLOW 0 >> #define OWL_PINCONF_SLEW_FAST 1 >> >> +#define MUX_PG(group_name, reg, shift, width) \ >> + { \ >> + .name = #group_name, \ >> + .pads = group_name##_pads, \ >> + .npads = ARRAY_SIZE(group_name##_pads), \ >> + .funcs = group_name##_funcs, \ >> + .nfuncs = ARRAY_SIZE(group_name##_funcs), \ >> + .mfpctl_reg = MFCTL##reg, \ >> + .mfpctl_shift = shift, \ >> + .mfpctl_width = width, \ >> + .drv_reg = -1, \ >> + .drv_shift = -1, \ >> + .drv_width = -1, \ >> + .sr_reg = -1, \ >> + .sr_shift = -1, \ >> + .sr_width = -1, \ >> + } >> + >> +#define DRV_PG(group_name, reg, shift, width) \ >> + { \ >> + .name = #group_name, \ >> + .pads = group_name##_pads, \ >> + .npads = ARRAY_SIZE(group_name##_pads), \ >> + .mfpctl_reg = -1, \ >> + .mfpctl_shift = -1, \ >> + .mfpctl_width = -1, \ >> + .drv_reg = PAD_DRV##reg, \ >> + .drv_shift = shift, \ >> + .drv_width = width, \ >> + .sr_reg = -1, \ >> + .sr_shift = -1, \ >> + .sr_width = -1, \ >> + } >> + >> +#define SR_PG(group_name, reg, shift, width) \ >> + { \ >> + .name = #group_name, \ >> + .pads = group_name##_pads, \ >> + .npads = ARRAY_SIZE(group_name##_pads), \ >> + .mfpctl_reg = -1, \ >> + .mfpctl_shift = -1, \ >> + .mfpctl_width = -1, \ >> + .drv_reg = -1, \ >> + .drv_shift = -1, \ >> + .drv_width = -1, \ >> + .sr_reg = PAD_SR##reg, \ >> + .sr_shift = shift, \ >> + .sr_width = width, \ >> + } >> + >> +#define FUNCTION(fname) \ >> + { \ >> + .name = #fname, \ >> + .groups = fname##_groups, \ >> + .ngroups = ARRAY_SIZE(fname##_groups), \ >> + } >> + >> +/* PAD PULL UP/DOWN CONFIGURES */ >> +#define PULLCTL_CONF(pull_reg, pull_sft, pull_wdt) \ >> + { \ >> + .reg = PAD_PULLCTL##pull_reg, \ >> + .shift = pull_sft, \ >> + .width = pull_wdt, \ >> + } >> + >> +#define PAD_PULLCTL_CONF(pad_name, pull_reg, pull_sft, pull_wdt) \ >> + struct owl_pullctl pad_name##_pullctl_conf \ >> + = PULLCTL_CONF(pull_reg, pull_sft, pull_wdt) >> + >> +#define ST_CONF(st_reg, st_sft, st_wdt) \ >> + { \ >> + .reg = PAD_ST##st_reg, \ >> + .shift = st_sft, \ >> + .width = st_wdt, \ >> + } >> + >> +#define PAD_ST_CONF(pad_name, st_reg, st_sft, st_wdt) \ >> + struct owl_st pad_name##_st_conf \ >> + = ST_CONF(st_reg, st_sft, st_wdt) >> + >> +#define PAD_INFO(name) \ >> + { \ >> + .pad = name, \ >> + .pullctl = NULL, \ >> + .st = NULL, \ >> + } >> + >> +#define PAD_INFO_ST(name) \ >> + { \ >> + .pad = name, \ >> + .pullctl = NULL, \ >> + .st = &name##_st_conf, \ >> + } >> + >> +#define PAD_INFO_PULLCTL(name) \ >> + { \ >> + .pad = name, \ >> + .pullctl = &name##_pullctl_conf, \ >> + .st = NULL, \ >> + } >> + >> +#define PAD_INFO_PULLCTL_ST(name) \ >> + { \ >> + .pad = name, \ >> + .pullctl = &name##_pullctl_conf, \ >> + .st = &name##_st_conf, \ >> + } >> + >> +#define OWL_GPIO_PORT_A 0 >> +#define OWL_GPIO_PORT_B 1 >> +#define OWL_GPIO_PORT_C 2 >> +#define OWL_GPIO_PORT_D 3 >> +#define OWL_GPIO_PORT_E 4 >> +#define OWL_GPIO_PORT_F 5 >> + >> +#define OWL_GPIO_PORT(port, base, count, _outen, _inen, _dat, _intc_ctl,\ >> + _intc_pd, _intc_msk, _intc_type, _share) \ >> + [OWL_GPIO_PORT_##port] = { \ >> + .offset = base, \ >> + .pins = count, \ >> + .outen = _outen, \ >> + .inen = _inen, \ >> + .dat = _dat, \ >> + .intc_ctl = _intc_ctl, \ >> + .intc_pd = _intc_pd, \ >> + .intc_msk = _intc_msk, \ >> + .intc_type = _intc_type, \ >> + .shared_ctl_offset = _share, \ > > Above member addition is not related to this patch. What is the purpose > of this? Either move this to a separate commit if it is needed by S700 > or justify in this patch itself. > This is introduced for S700 as registers are shared, it is not case in S900. There is impact on S900 also, which needs another seperate patch which is unlikely as we cleaning S700 related stuffs here > Btw, this patch is not applying cleanly. > >> + } >> + >> enum owl_pinconf_pull { >> OWL_PINCONF_PULL_HIZ, >> OWL_PINCONF_PULL_DOWN, >> @@ -148,6 +278,7 @@ struct owl_gpio_port { >> unsigned int intc_pd; >> unsigned int intc_msk; >> unsigned int intc_type; >> + u8 shared_ctl_offset; > > Same as above. > > Regards, > Mani > >> }; >> >> /** >> diff --git a/drivers/pinctrl/actions/pinctrl-s900.c b/drivers/pinctrl/actions/pinctrl-s900.c >> index ea67b14ef93b..0597009d8369 100644 >> --- a/drivers/pinctrl/actions/pinctrl-s900.c >> +++ b/drivers/pinctrl/actions/pinctrl-s900.c >> @@ -33,13 +33,6 @@ >> #define PAD_SR1 (0x0274) >> #define PAD_SR2 (0x0278) >> >> -#define OWL_GPIO_PORT_A 0 >> -#define OWL_GPIO_PORT_B 1 >> -#define OWL_GPIO_PORT_C 2 >> -#define OWL_GPIO_PORT_D 3 >> -#define OWL_GPIO_PORT_E 4 >> -#define OWL_GPIO_PORT_F 5 >> - >> #define _GPIOA(offset) (offset) >> #define _GPIOB(offset) (32 + (offset)) >> #define _GPIOC(offset) (64 + (offset)) >> @@ -892,55 +885,6 @@ static unsigned int i2c2_sr_pads[] = { I2C2_SCLK, I2C2_SDATA }; >> static unsigned int sensor0_sr_pads[] = { SENSOR0_PCLK, >> SENSOR0_CKOUT }; >> >> -#define MUX_PG(group_name, reg, shift, width) \ >> - { \ >> - .name = #group_name, \ >> - .pads = group_name##_pads, \ >> - .npads = ARRAY_SIZE(group_name##_pads), \ >> - .funcs = group_name##_funcs, \ >> - .nfuncs = ARRAY_SIZE(group_name##_funcs), \ >> - .mfpctl_reg = MFCTL##reg, \ >> - .mfpctl_shift = shift, \ >> - .mfpctl_width = width, \ >> - .drv_reg = -1, \ >> - .drv_shift = -1, \ >> - .drv_width = -1, \ >> - .sr_reg = -1, \ >> - .sr_shift = -1, \ >> - .sr_width = -1, \ >> - } >> - >> -#define DRV_PG(group_name, reg, shift, width) \ >> - { \ >> - .name = #group_name, \ >> - .pads = group_name##_pads, \ >> - .npads = ARRAY_SIZE(group_name##_pads), \ >> - .mfpctl_reg = -1, \ >> - .mfpctl_shift = -1, \ >> - .mfpctl_width = -1, \ >> - .drv_reg = PAD_DRV##reg, \ >> - .drv_shift = shift, \ >> - .drv_width = width, \ >> - .sr_reg = -1, \ >> - .sr_shift = -1, \ >> - .sr_width = -1, \ >> - } >> - >> -#define SR_PG(group_name, reg, shift, width) \ >> - { \ >> - .name = #group_name, \ >> - .pads = group_name##_pads, \ >> - .npads = ARRAY_SIZE(group_name##_pads), \ >> - .mfpctl_reg = -1, \ >> - .mfpctl_shift = -1, \ >> - .mfpctl_width = -1, \ >> - .drv_reg = -1, \ >> - .drv_shift = -1, \ >> - .drv_width = -1, \ >> - .sr_reg = PAD_SR##reg, \ >> - .sr_shift = shift, \ >> - .sr_width = width, \ >> - } >> >> /* Pinctrl groups */ >> static const struct owl_pingroup s900_groups[] = { >> @@ -1442,13 +1386,6 @@ static const char * const sirq2_groups[] = { >> "sirq2_dummy", >> }; >> >> -#define FUNCTION(fname) \ >> - { \ >> - .name = #fname, \ >> - .groups = fname##_groups, \ >> - .ngroups = ARRAY_SIZE(fname##_groups), \ >> - } >> - >> static const struct owl_pinmux_func s900_functions[] = { >> [S900_MUX_ERAM] = FUNCTION(eram), >> [S900_MUX_ETH_RMII] = FUNCTION(eth_rmii), >> @@ -1500,28 +1437,6 @@ static const struct owl_pinmux_func s900_functions[] = { >> [S900_MUX_SIRQ1] = FUNCTION(sirq1), >> [S900_MUX_SIRQ2] = FUNCTION(sirq2) >> }; >> -/* PAD PULL UP/DOWN CONFIGURES */ >> -#define PULLCTL_CONF(pull_reg, pull_sft, pull_wdt) \ >> - { \ >> - .reg = PAD_PULLCTL##pull_reg, \ >> - .shift = pull_sft, \ >> - .width = pull_wdt, \ >> - } >> - >> -#define PAD_PULLCTL_CONF(pad_name, pull_reg, pull_sft, pull_wdt) \ >> - struct owl_pullctl pad_name##_pullctl_conf \ >> - = PULLCTL_CONF(pull_reg, pull_sft, pull_wdt) >> - >> -#define ST_CONF(st_reg, st_sft, st_wdt) \ >> - { \ >> - .reg = PAD_ST##st_reg, \ >> - .shift = st_sft, \ >> - .width = st_wdt, \ >> - } >> - >> -#define PAD_ST_CONF(pad_name, st_reg, st_sft, st_wdt) \ >> - struct owl_st pad_name##_st_conf \ >> - = ST_CONF(st_reg, st_sft, st_wdt) >> >> /* PAD_PULLCTL0 */ >> static PAD_PULLCTL_CONF(ETH_RXER, 0, 18, 2); >> @@ -1639,34 +1554,6 @@ static PAD_ST_CONF(SPI0_SS, 1, 2, 1); >> static PAD_ST_CONF(I2S_BCLK0, 1, 1, 1); >> static PAD_ST_CONF(I2S_MCLK0, 1, 0, 1); >> >> -#define PAD_INFO(name) \ >> - { \ >> - .pad = name, \ >> - .pullctl = NULL, \ >> - .st = NULL, \ >> - } >> - >> -#define PAD_INFO_ST(name) \ >> - { \ >> - .pad = name, \ >> - .pullctl = NULL, \ >> - .st = &name##_st_conf, \ >> - } >> - >> -#define PAD_INFO_PULLCTL(name) \ >> - { \ >> - .pad = name, \ >> - .pullctl = &name##_pullctl_conf, \ >> - .st = NULL, \ >> - } >> - >> -#define PAD_INFO_PULLCTL_ST(name) \ >> - { \ >> - .pad = name, \ >> - .pullctl = &name##_pullctl_conf, \ >> - .st = &name##_st_conf, \ >> - } >> - >> /* Pad info table */ >> static struct owl_padinfo s900_padinfo[NUM_PADS] = { >> [ETH_TXD0] = PAD_INFO_ST(ETH_TXD0), >> @@ -1821,27 +1708,13 @@ static struct owl_padinfo s900_padinfo[NUM_PADS] = { >> [SGPIO3] = PAD_INFO_PULLCTL_ST(SGPIO3) >> }; >> >> -#define OWL_GPIO_PORT(port, base, count, _outen, _inen, _dat, \ >> - _intc_ctl, _intc_pd, _intc_msk, _intc_type) \ >> - [OWL_GPIO_PORT_##port] = { \ >> - .offset = base, \ >> - .pins = count, \ >> - .outen = _outen, \ >> - .inen = _inen, \ >> - .dat = _dat, \ >> - .intc_ctl = _intc_ctl, \ >> - .intc_pd = _intc_pd, \ >> - .intc_msk = _intc_msk, \ >> - .intc_type = _intc_type, \ >> - } >> - >> static const struct owl_gpio_port s900_gpio_ports[] = { >> - OWL_GPIO_PORT(A, 0x0000, 32, 0x0, 0x4, 0x8, 0x204, 0x208, 0x20C, 0x240), >> - OWL_GPIO_PORT(B, 0x000C, 32, 0x0, 0x4, 0x8, 0x534, 0x204, 0x208, 0x23C), >> - OWL_GPIO_PORT(C, 0x0018, 12, 0x0, 0x4, 0x8, 0x52C, 0x200, 0x204, 0x238), >> - OWL_GPIO_PORT(D, 0x0024, 30, 0x0, 0x4, 0x8, 0x524, 0x1FC, 0x200, 0x234), >> - OWL_GPIO_PORT(E, 0x0030, 32, 0x0, 0x4, 0x8, 0x51C, 0x1F8, 0x1FC, 0x230), >> - OWL_GPIO_PORT(F, 0x00F0, 8, 0x0, 0x4, 0x8, 0x460, 0x140, 0x144, 0x178) >> + OWL_GPIO_PORT(A, 0x0000, 32, 0x0, 0x4, 0x8, 0x204, 0x208, 0x20C, 0x240, 0), >> + OWL_GPIO_PORT(B, 0x000C, 32, 0x0, 0x4, 0x8, 0x534, 0x204, 0x208, 0x23C, 0), >> + OWL_GPIO_PORT(C, 0x0018, 12, 0x0, 0x4, 0x8, 0x52C, 0x200, 0x204, 0x238, 0), >> + OWL_GPIO_PORT(D, 0x0024, 30, 0x0, 0x4, 0x8, 0x524, 0x1FC, 0x200, 0x234, 0), >> + OWL_GPIO_PORT(E, 0x0030, 32, 0x0, 0x4, 0x8, 0x51C, 0x1F8, 0x1FC, 0x230, 0), >> + OWL_GPIO_PORT(F, 0x00F0, 8, 0x0, 0x4, 0x8, 0x460, 0x140, 0x144, 0x178, 0) >> }; >> >> static struct owl_pinctrl_soc_data s900_pinctrl_data = { >> -- >> 2.14.4 >>
ping on this patch series! On 9/4/18 8:41 PM, Saravanan Sekar wrote: > > > On 08/29/18 17:20, Manivannan Sadhasivam wrote: >> Hi Saravanan, >> >> On Wed, Aug 29, 2018 at 10:24:09AM +0200, Saravanan Sekar wrote: >>> Move generic defines common to the Owl family out of S900 driver. >>> >>> Signed-off-by: Parthiban Nallathambi <pn@denx.de> >>> Signed-off-by: Saravanan Sekar <sravanhome@gmail.com> >>> --- >>> drivers/pinctrl/actions/pinctrl-owl.h | 131 >>> +++++++++++++++++++++++++++++++ >>> drivers/pinctrl/actions/pinctrl-s900.c | 139 >>> ++------------------------------- >>> 2 files changed, 137 insertions(+), 133 deletions(-) >>> >>> diff --git a/drivers/pinctrl/actions/pinctrl-owl.h >>> b/drivers/pinctrl/actions/pinctrl-owl.h >>> index a724d1d406d4..31cc33d7c4a5 100644 >>> --- a/drivers/pinctrl/actions/pinctrl-owl.h >>> +++ b/drivers/pinctrl/actions/pinctrl-owl.h >>> @@ -15,6 +15,136 @@ >>> #define OWL_PINCONF_SLEW_SLOW 0 >>> #define OWL_PINCONF_SLEW_FAST 1 >>> +#define MUX_PG(group_name, reg, shift, width) \ >>> + { \ >>> + .name = #group_name, \ >>> + .pads = group_name##_pads, \ >>> + .npads = ARRAY_SIZE(group_name##_pads), \ >>> + .funcs = group_name##_funcs, \ >>> + .nfuncs = ARRAY_SIZE(group_name##_funcs), \ >>> + .mfpctl_reg = MFCTL##reg, \ >>> + .mfpctl_shift = shift, \ >>> + .mfpctl_width = width, \ >>> + .drv_reg = -1, \ >>> + .drv_shift = -1, \ >>> + .drv_width = -1, \ >>> + .sr_reg = -1, \ >>> + .sr_shift = -1, \ >>> + .sr_width = -1, \ >>> + } >>> + >>> +#define DRV_PG(group_name, reg, shift, width) \ >>> + { \ >>> + .name = #group_name, \ >>> + .pads = group_name##_pads, \ >>> + .npads = ARRAY_SIZE(group_name##_pads), \ >>> + .mfpctl_reg = -1, \ >>> + .mfpctl_shift = -1, \ >>> + .mfpctl_width = -1, \ >>> + .drv_reg = PAD_DRV##reg, \ >>> + .drv_shift = shift, \ >>> + .drv_width = width, \ >>> + .sr_reg = -1, \ >>> + .sr_shift = -1, \ >>> + .sr_width = -1, \ >>> + } >>> + >>> +#define SR_PG(group_name, reg, shift, width) \ >>> + { \ >>> + .name = #group_name, \ >>> + .pads = group_name##_pads, \ >>> + .npads = ARRAY_SIZE(group_name##_pads), \ >>> + .mfpctl_reg = -1, \ >>> + .mfpctl_shift = -1, \ >>> + .mfpctl_width = -1, \ >>> + .drv_reg = -1, \ >>> + .drv_shift = -1, \ >>> + .drv_width = -1, \ >>> + .sr_reg = PAD_SR##reg, \ >>> + .sr_shift = shift, \ >>> + .sr_width = width, \ >>> + } >>> + >>> +#define FUNCTION(fname) \ >>> + { \ >>> + .name = #fname, \ >>> + .groups = fname##_groups, \ >>> + .ngroups = ARRAY_SIZE(fname##_groups), \ >>> + } >>> + >>> +/* PAD PULL UP/DOWN CONFIGURES */ >>> +#define PULLCTL_CONF(pull_reg, pull_sft, pull_wdt) \ >>> + { \ >>> + .reg = PAD_PULLCTL##pull_reg, \ >>> + .shift = pull_sft, \ >>> + .width = pull_wdt, \ >>> + } >>> + >>> +#define PAD_PULLCTL_CONF(pad_name, pull_reg, pull_sft, pull_wdt) \ >>> + struct owl_pullctl pad_name##_pullctl_conf \ >>> + = PULLCTL_CONF(pull_reg, pull_sft, pull_wdt) >>> + >>> +#define ST_CONF(st_reg, st_sft, st_wdt) \ >>> + { \ >>> + .reg = PAD_ST##st_reg, \ >>> + .shift = st_sft, \ >>> + .width = st_wdt, \ >>> + } >>> + >>> +#define PAD_ST_CONF(pad_name, st_reg, st_sft, st_wdt) \ >>> + struct owl_st pad_name##_st_conf \ >>> + = ST_CONF(st_reg, st_sft, st_wdt) >>> + >>> +#define PAD_INFO(name) \ >>> + { \ >>> + .pad = name, \ >>> + .pullctl = NULL, \ >>> + .st = NULL, \ >>> + } >>> + >>> +#define PAD_INFO_ST(name) \ >>> + { \ >>> + .pad = name, \ >>> + .pullctl = NULL, \ >>> + .st = &name##_st_conf, \ >>> + } >>> + >>> +#define PAD_INFO_PULLCTL(name) \ >>> + { \ >>> + .pad = name, \ >>> + .pullctl = &name##_pullctl_conf, \ >>> + .st = NULL, \ >>> + } >>> + >>> +#define PAD_INFO_PULLCTL_ST(name) \ >>> + { \ >>> + .pad = name, \ >>> + .pullctl = &name##_pullctl_conf, \ >>> + .st = &name##_st_conf, \ >>> + } >>> + >>> +#define OWL_GPIO_PORT_A 0 >>> +#define OWL_GPIO_PORT_B 1 >>> +#define OWL_GPIO_PORT_C 2 >>> +#define OWL_GPIO_PORT_D 3 >>> +#define OWL_GPIO_PORT_E 4 >>> +#define OWL_GPIO_PORT_F 5 >>> + >>> +#define OWL_GPIO_PORT(port, base, count, _outen, _inen, _dat, >>> _intc_ctl,\ >>> + _intc_pd, _intc_msk, _intc_type, _share) \ >>> + [OWL_GPIO_PORT_##port] = { \ >>> + .offset = base, \ >>> + .pins = count, \ >>> + .outen = _outen, \ >>> + .inen = _inen, \ >>> + .dat = _dat, \ >>> + .intc_ctl = _intc_ctl, \ >>> + .intc_pd = _intc_pd, \ >>> + .intc_msk = _intc_msk, \ >>> + .intc_type = _intc_type, \ >>> + .shared_ctl_offset = _share, \ >> >> Above member addition is not related to this patch. What is the purpose >> of this? Either move this to a separate commit if it is needed by S700 >> or justify in this patch itself. >> > > This is introduced for S700 as registers are shared, it is not case in > S900. There is impact on S900 also, which needs another seperate patch > which is unlikely as we cleaning S700 related stuffs here > >> Btw, this patch is not applying cleanly. >> >>> + } >>> + >>> enum owl_pinconf_pull { >>> OWL_PINCONF_PULL_HIZ, >>> OWL_PINCONF_PULL_DOWN, >>> @@ -148,6 +278,7 @@ struct owl_gpio_port { >>> unsigned int intc_pd; >>> unsigned int intc_msk; >>> unsigned int intc_type; >>> + u8 shared_ctl_offset; >> >> Same as above. >> >> Regards, >> Mani >> >>> }; >>> /** >>> diff --git a/drivers/pinctrl/actions/pinctrl-s900.c >>> b/drivers/pinctrl/actions/pinctrl-s900.c >>> index ea67b14ef93b..0597009d8369 100644 >>> --- a/drivers/pinctrl/actions/pinctrl-s900.c >>> +++ b/drivers/pinctrl/actions/pinctrl-s900.c >>> @@ -33,13 +33,6 @@ >>> #define PAD_SR1 (0x0274) >>> #define PAD_SR2 (0x0278) >>> -#define OWL_GPIO_PORT_A 0 >>> -#define OWL_GPIO_PORT_B 1 >>> -#define OWL_GPIO_PORT_C 2 >>> -#define OWL_GPIO_PORT_D 3 >>> -#define OWL_GPIO_PORT_E 4 >>> -#define OWL_GPIO_PORT_F 5 >>> - >>> #define _GPIOA(offset) (offset) >>> #define _GPIOB(offset) (32 + (offset)) >>> #define _GPIOC(offset) (64 + (offset)) >>> @@ -892,55 +885,6 @@ static unsigned int i2c2_sr_pads[] = { >>> I2C2_SCLK, I2C2_SDATA }; >>> static unsigned int sensor0_sr_pads[] = { SENSOR0_PCLK, >>> SENSOR0_CKOUT }; >>> -#define MUX_PG(group_name, reg, shift, width) \ >>> - { \ >>> - .name = #group_name, \ >>> - .pads = group_name##_pads, \ >>> - .npads = ARRAY_SIZE(group_name##_pads), \ >>> - .funcs = group_name##_funcs, \ >>> - .nfuncs = ARRAY_SIZE(group_name##_funcs), \ >>> - .mfpctl_reg = MFCTL##reg, \ >>> - .mfpctl_shift = shift, \ >>> - .mfpctl_width = width, \ >>> - .drv_reg = -1, \ >>> - .drv_shift = -1, \ >>> - .drv_width = -1, \ >>> - .sr_reg = -1, \ >>> - .sr_shift = -1, \ >>> - .sr_width = -1, \ >>> - } >>> - >>> -#define DRV_PG(group_name, reg, shift, width) \ >>> - { \ >>> - .name = #group_name, \ >>> - .pads = group_name##_pads, \ >>> - .npads = ARRAY_SIZE(group_name##_pads), \ >>> - .mfpctl_reg = -1, \ >>> - .mfpctl_shift = -1, \ >>> - .mfpctl_width = -1, \ >>> - .drv_reg = PAD_DRV##reg, \ >>> - .drv_shift = shift, \ >>> - .drv_width = width, \ >>> - .sr_reg = -1, \ >>> - .sr_shift = -1, \ >>> - .sr_width = -1, \ >>> - } >>> - >>> -#define SR_PG(group_name, reg, shift, width) \ >>> - { \ >>> - .name = #group_name, \ >>> - .pads = group_name##_pads, \ >>> - .npads = ARRAY_SIZE(group_name##_pads), \ >>> - .mfpctl_reg = -1, \ >>> - .mfpctl_shift = -1, \ >>> - .mfpctl_width = -1, \ >>> - .drv_reg = -1, \ >>> - .drv_shift = -1, \ >>> - .drv_width = -1, \ >>> - .sr_reg = PAD_SR##reg, \ >>> - .sr_shift = shift, \ >>> - .sr_width = width, \ >>> - } >>> /* Pinctrl groups */ >>> static const struct owl_pingroup s900_groups[] = { >>> @@ -1442,13 +1386,6 @@ static const char * const sirq2_groups[] = { >>> "sirq2_dummy", >>> }; >>> -#define FUNCTION(fname) \ >>> - { \ >>> - .name = #fname, \ >>> - .groups = fname##_groups, \ >>> - .ngroups = ARRAY_SIZE(fname##_groups), \ >>> - } >>> - >>> static const struct owl_pinmux_func s900_functions[] = { >>> [S900_MUX_ERAM] = FUNCTION(eram), >>> [S900_MUX_ETH_RMII] = FUNCTION(eth_rmii), >>> @@ -1500,28 +1437,6 @@ static const struct owl_pinmux_func >>> s900_functions[] = { >>> [S900_MUX_SIRQ1] = FUNCTION(sirq1), >>> [S900_MUX_SIRQ2] = FUNCTION(sirq2) >>> }; >>> -/* PAD PULL UP/DOWN CONFIGURES */ >>> -#define PULLCTL_CONF(pull_reg, pull_sft, pull_wdt) \ >>> - { \ >>> - .reg = PAD_PULLCTL##pull_reg, \ >>> - .shift = pull_sft, \ >>> - .width = pull_wdt, \ >>> - } >>> - >>> -#define PAD_PULLCTL_CONF(pad_name, pull_reg, pull_sft, pull_wdt) \ >>> - struct owl_pullctl pad_name##_pullctl_conf \ >>> - = PULLCTL_CONF(pull_reg, pull_sft, pull_wdt) >>> - >>> -#define ST_CONF(st_reg, st_sft, st_wdt) \ >>> - { \ >>> - .reg = PAD_ST##st_reg, \ >>> - .shift = st_sft, \ >>> - .width = st_wdt, \ >>> - } >>> - >>> -#define PAD_ST_CONF(pad_name, st_reg, st_sft, st_wdt) \ >>> - struct owl_st pad_name##_st_conf \ >>> - = ST_CONF(st_reg, st_sft, st_wdt) >>> /* PAD_PULLCTL0 */ >>> static PAD_PULLCTL_CONF(ETH_RXER, 0, 18, 2); >>> @@ -1639,34 +1554,6 @@ static PAD_ST_CONF(SPI0_SS, 1, 2, 1); >>> static PAD_ST_CONF(I2S_BCLK0, 1, 1, 1); >>> static PAD_ST_CONF(I2S_MCLK0, 1, 0, 1); >>> -#define PAD_INFO(name) \ >>> - { \ >>> - .pad = name, \ >>> - .pullctl = NULL, \ >>> - .st = NULL, \ >>> - } >>> - >>> -#define PAD_INFO_ST(name) \ >>> - { \ >>> - .pad = name, \ >>> - .pullctl = NULL, \ >>> - .st = &name##_st_conf, \ >>> - } >>> - >>> -#define PAD_INFO_PULLCTL(name) \ >>> - { \ >>> - .pad = name, \ >>> - .pullctl = &name##_pullctl_conf, \ >>> - .st = NULL, \ >>> - } >>> - >>> -#define PAD_INFO_PULLCTL_ST(name) \ >>> - { \ >>> - .pad = name, \ >>> - .pullctl = &name##_pullctl_conf, \ >>> - .st = &name##_st_conf, \ >>> - } >>> - >>> /* Pad info table */ >>> static struct owl_padinfo s900_padinfo[NUM_PADS] = { >>> [ETH_TXD0] = PAD_INFO_ST(ETH_TXD0), >>> @@ -1821,27 +1708,13 @@ static struct owl_padinfo >>> s900_padinfo[NUM_PADS] = { >>> [SGPIO3] = PAD_INFO_PULLCTL_ST(SGPIO3) >>> }; >>> -#define OWL_GPIO_PORT(port, base, count, _outen, _inen, _dat, \ >>> - _intc_ctl, _intc_pd, _intc_msk, _intc_type) \ >>> - [OWL_GPIO_PORT_##port] = { \ >>> - .offset = base, \ >>> - .pins = count, \ >>> - .outen = _outen, \ >>> - .inen = _inen, \ >>> - .dat = _dat, \ >>> - .intc_ctl = _intc_ctl, \ >>> - .intc_pd = _intc_pd, \ >>> - .intc_msk = _intc_msk, \ >>> - .intc_type = _intc_type, \ >>> - } >>> - >>> static const struct owl_gpio_port s900_gpio_ports[] = { >>> - OWL_GPIO_PORT(A, 0x0000, 32, 0x0, 0x4, 0x8, 0x204, 0x208, 0x20C, >>> 0x240), >>> - OWL_GPIO_PORT(B, 0x000C, 32, 0x0, 0x4, 0x8, 0x534, 0x204, 0x208, >>> 0x23C), >>> - OWL_GPIO_PORT(C, 0x0018, 12, 0x0, 0x4, 0x8, 0x52C, 0x200, 0x204, >>> 0x238), >>> - OWL_GPIO_PORT(D, 0x0024, 30, 0x0, 0x4, 0x8, 0x524, 0x1FC, 0x200, >>> 0x234), >>> - OWL_GPIO_PORT(E, 0x0030, 32, 0x0, 0x4, 0x8, 0x51C, 0x1F8, 0x1FC, >>> 0x230), >>> - OWL_GPIO_PORT(F, 0x00F0, 8, 0x0, 0x4, 0x8, 0x460, 0x140, 0x144, >>> 0x178) >>> + OWL_GPIO_PORT(A, 0x0000, 32, 0x0, 0x4, 0x8, 0x204, 0x208, 0x20C, >>> 0x240, 0), >>> + OWL_GPIO_PORT(B, 0x000C, 32, 0x0, 0x4, 0x8, 0x534, 0x204, 0x208, >>> 0x23C, 0), >>> + OWL_GPIO_PORT(C, 0x0018, 12, 0x0, 0x4, 0x8, 0x52C, 0x200, 0x204, >>> 0x238, 0), >>> + OWL_GPIO_PORT(D, 0x0024, 30, 0x0, 0x4, 0x8, 0x524, 0x1FC, 0x200, >>> 0x234, 0), >>> + OWL_GPIO_PORT(E, 0x0030, 32, 0x0, 0x4, 0x8, 0x51C, 0x1F8, 0x1FC, >>> 0x230, 0), >>> + OWL_GPIO_PORT(F, 0x00F0, 8, 0x0, 0x4, 0x8, 0x460, 0x140, 0x144, >>> 0x178, 0) >>> }; >>> static struct owl_pinctrl_soc_data s900_pinctrl_data = { >>> -- >>> 2.14.4 >>> >
On Tue, Nov 6, 2018 at 5:43 PM Parthiban Nallathambi <pn@denx.de> wrote:
> ping on this patch series!
AFAICT there is some feedback with issues that need to be fixed,
also the patch should probably need to be rebased on top of
v4.20-rc1.
Yours,
Linus Walleij
Hi Mani, On 11/6/18 5:43 PM, Parthiban Nallathambi wrote: > ping on this patch series! > > On 9/4/18 8:41 PM, Saravanan Sekar wrote: >> >> >> On 08/29/18 17:20, Manivannan Sadhasivam wrote: >>> Hi Saravanan, >>> >>> On Wed, Aug 29, 2018 at 10:24:09AM +0200, Saravanan Sekar wrote: >>>> Move generic defines common to the Owl family out of S900 driver. >>>> >>>> Signed-off-by: Parthiban Nallathambi <pn@denx.de> >>>> Signed-off-by: Saravanan Sekar <sravanhome@gmail.com> >>>> --- >>>> drivers/pinctrl/actions/pinctrl-owl.h | 131 >>>> +++++++++++++++++++++++++++++++ >>>> drivers/pinctrl/actions/pinctrl-s900.c | 139 >>>> ++------------------------------- >>>> 2 files changed, 137 insertions(+), 133 deletions(-) >>>> >>>> diff --git a/drivers/pinctrl/actions/pinctrl-owl.h >>>> b/drivers/pinctrl/actions/pinctrl-owl.h >>>> index a724d1d406d4..31cc33d7c4a5 100644 >>>> --- a/drivers/pinctrl/actions/pinctrl-owl.h >>>> +++ b/drivers/pinctrl/actions/pinctrl-owl.h >>>> @@ -15,6 +15,136 @@ >>>> #define OWL_PINCONF_SLEW_SLOW 0 >>>> #define OWL_PINCONF_SLEW_FAST 1 >>>> +#define MUX_PG(group_name, reg, shift, width) \ >>>> + { \ >>>> + .name = #group_name, \ >>>> + .pads = group_name##_pads, \ >>>> + .npads = ARRAY_SIZE(group_name##_pads), \ >>>> + .funcs = group_name##_funcs, \ >>>> + .nfuncs = ARRAY_SIZE(group_name##_funcs), \ >>>> + .mfpctl_reg = MFCTL##reg, \ >>>> + .mfpctl_shift = shift, \ >>>> + .mfpctl_width = width, \ >>>> + .drv_reg = -1, \ >>>> + .drv_shift = -1, \ >>>> + .drv_width = -1, \ >>>> + .sr_reg = -1, \ >>>> + .sr_shift = -1, \ >>>> + .sr_width = -1, \ >>>> + } >>>> + >>>> +#define DRV_PG(group_name, reg, shift, width) \ >>>> + { \ >>>> + .name = #group_name, \ >>>> + .pads = group_name##_pads, \ >>>> + .npads = ARRAY_SIZE(group_name##_pads), \ >>>> + .mfpctl_reg = -1, \ >>>> + .mfpctl_shift = -1, \ >>>> + .mfpctl_width = -1, \ >>>> + .drv_reg = PAD_DRV##reg, \ >>>> + .drv_shift = shift, \ >>>> + .drv_width = width, \ >>>> + .sr_reg = -1, \ >>>> + .sr_shift = -1, \ >>>> + .sr_width = -1, \ >>>> + } >>>> + >>>> +#define SR_PG(group_name, reg, shift, width) \ >>>> + { \ >>>> + .name = #group_name, \ >>>> + .pads = group_name##_pads, \ >>>> + .npads = ARRAY_SIZE(group_name##_pads), \ >>>> + .mfpctl_reg = -1, \ >>>> + .mfpctl_shift = -1, \ >>>> + .mfpctl_width = -1, \ >>>> + .drv_reg = -1, \ >>>> + .drv_shift = -1, \ >>>> + .drv_width = -1, \ >>>> + .sr_reg = PAD_SR##reg, \ >>>> + .sr_shift = shift, \ >>>> + .sr_width = width, \ >>>> + } >>>> + >>>> +#define FUNCTION(fname) \ >>>> + { \ >>>> + .name = #fname, \ >>>> + .groups = fname##_groups, \ >>>> + .ngroups = ARRAY_SIZE(fname##_groups), \ >>>> + } >>>> + >>>> +/* PAD PULL UP/DOWN CONFIGURES */ >>>> +#define PULLCTL_CONF(pull_reg, pull_sft, pull_wdt) \ >>>> + { \ >>>> + .reg = PAD_PULLCTL##pull_reg, \ >>>> + .shift = pull_sft, \ >>>> + .width = pull_wdt, \ >>>> + } >>>> + >>>> +#define PAD_PULLCTL_CONF(pad_name, pull_reg, pull_sft, pull_wdt) \ >>>> + struct owl_pullctl pad_name##_pullctl_conf \ >>>> + = PULLCTL_CONF(pull_reg, pull_sft, pull_wdt) >>>> + >>>> +#define ST_CONF(st_reg, st_sft, st_wdt) \ >>>> + { \ >>>> + .reg = PAD_ST##st_reg, \ >>>> + .shift = st_sft, \ >>>> + .width = st_wdt, \ >>>> + } >>>> + >>>> +#define PAD_ST_CONF(pad_name, st_reg, st_sft, st_wdt) \ >>>> + struct owl_st pad_name##_st_conf \ >>>> + = ST_CONF(st_reg, st_sft, st_wdt) >>>> + >>>> +#define PAD_INFO(name) \ >>>> + { \ >>>> + .pad = name, \ >>>> + .pullctl = NULL, \ >>>> + .st = NULL, \ >>>> + } >>>> + >>>> +#define PAD_INFO_ST(name) \ >>>> + { \ >>>> + .pad = name, \ >>>> + .pullctl = NULL, \ >>>> + .st = &name##_st_conf, \ >>>> + } >>>> + >>>> +#define PAD_INFO_PULLCTL(name) \ >>>> + { \ >>>> + .pad = name, \ >>>> + .pullctl = &name##_pullctl_conf, \ >>>> + .st = NULL, \ >>>> + } >>>> + >>>> +#define PAD_INFO_PULLCTL_ST(name) \ >>>> + { \ >>>> + .pad = name, \ >>>> + .pullctl = &name##_pullctl_conf, \ >>>> + .st = &name##_st_conf, \ >>>> + } >>>> + >>>> +#define OWL_GPIO_PORT_A 0 >>>> +#define OWL_GPIO_PORT_B 1 >>>> +#define OWL_GPIO_PORT_C 2 >>>> +#define OWL_GPIO_PORT_D 3 >>>> +#define OWL_GPIO_PORT_E 4 >>>> +#define OWL_GPIO_PORT_F 5 >>>> + >>>> +#define OWL_GPIO_PORT(port, base, count, _outen, _inen, _dat, >>>> _intc_ctl,\ >>>> + _intc_pd, _intc_msk, _intc_type, _share) \ >>>> + [OWL_GPIO_PORT_##port] = { \ >>>> + .offset = base, \ >>>> + .pins = count, \ >>>> + .outen = _outen, \ >>>> + .inen = _inen, \ >>>> + .dat = _dat, \ >>>> + .intc_ctl = _intc_ctl, \ >>>> + .intc_pd = _intc_pd, \ >>>> + .intc_msk = _intc_msk, \ >>>> + .intc_type = _intc_type, \ >>>> + .shared_ctl_offset = _share, \ >>> >>> Above member addition is not related to this patch. What is the purpose >>> of this? Either move this to a separate commit if it is needed by S700 >>> or justify in this patch itself. >>> >> >> This is introduced for S700 as registers are shared, it is not case in >> S900. There is impact on S900 also, which needs another seperate patch >> which is unlikely as we cleaning S700 related stuffs here S700 shares the control register (INTC_GPIOCTL) for all the GPIO ports. Hence this is introduced only for s700 to offset into the control register for configuring (int pending/enable/clock select). So should it be separate commit still? As mentioned Saravanan above, this has the impact in s900 as well. >> >>> Btw, this patch is not applying cleanly. Will send v6 based on current mainline master! Thanks, Parthi >>> >>>> + } >>>> + >>>> enum owl_pinconf_pull { >>>> OWL_PINCONF_PULL_HIZ, >>>> OWL_PINCONF_PULL_DOWN, >>>> @@ -148,6 +278,7 @@ struct owl_gpio_port { >>>> unsigned int intc_pd; >>>> unsigned int intc_msk; >>>> unsigned int intc_type; >>>> + u8 shared_ctl_offset; >>> >>> Same as above. >>> >>> Regards, >>> Mani >>> >>>> }; >>>> /** >>>> diff --git a/drivers/pinctrl/actions/pinctrl-s900.c >>>> b/drivers/pinctrl/actions/pinctrl-s900.c >>>> index ea67b14ef93b..0597009d8369 100644 >>>> --- a/drivers/pinctrl/actions/pinctrl-s900.c >>>> +++ b/drivers/pinctrl/actions/pinctrl-s900.c >>>> @@ -33,13 +33,6 @@ >>>> #define PAD_SR1 (0x0274) >>>> #define PAD_SR2 (0x0278) >>>> -#define OWL_GPIO_PORT_A 0 >>>> -#define OWL_GPIO_PORT_B 1 >>>> -#define OWL_GPIO_PORT_C 2 >>>> -#define OWL_GPIO_PORT_D 3 >>>> -#define OWL_GPIO_PORT_E 4 >>>> -#define OWL_GPIO_PORT_F 5 >>>> - >>>> #define _GPIOA(offset) (offset) >>>> #define _GPIOB(offset) (32 + (offset)) >>>> #define _GPIOC(offset) (64 + (offset)) >>>> @@ -892,55 +885,6 @@ static unsigned int i2c2_sr_pads[] = { >>>> I2C2_SCLK, I2C2_SDATA }; >>>> static unsigned int sensor0_sr_pads[] = { SENSOR0_PCLK, >>>> SENSOR0_CKOUT }; >>>> -#define MUX_PG(group_name, reg, shift, width) \ >>>> - { \ >>>> - .name = #group_name, \ >>>> - .pads = group_name##_pads, \ >>>> - .npads = ARRAY_SIZE(group_name##_pads), \ >>>> - .funcs = group_name##_funcs, \ >>>> - .nfuncs = ARRAY_SIZE(group_name##_funcs), \ >>>> - .mfpctl_reg = MFCTL##reg, \ >>>> - .mfpctl_shift = shift, \ >>>> - .mfpctl_width = width, \ >>>> - .drv_reg = -1, \ >>>> - .drv_shift = -1, \ >>>> - .drv_width = -1, \ >>>> - .sr_reg = -1, \ >>>> - .sr_shift = -1, \ >>>> - .sr_width = -1, \ >>>> - } >>>> - >>>> -#define DRV_PG(group_name, reg, shift, width) \ >>>> - { \ >>>> - .name = #group_name, \ >>>> - .pads = group_name##_pads, \ >>>> - .npads = ARRAY_SIZE(group_name##_pads), \ >>>> - .mfpctl_reg = -1, \ >>>> - .mfpctl_shift = -1, \ >>>> - .mfpctl_width = -1, \ >>>> - .drv_reg = PAD_DRV##reg, \ >>>> - .drv_shift = shift, \ >>>> - .drv_width = width, \ >>>> - .sr_reg = -1, \ >>>> - .sr_shift = -1, \ >>>> - .sr_width = -1, \ >>>> - } >>>> - >>>> -#define SR_PG(group_name, reg, shift, width) \ >>>> - { \ >>>> - .name = #group_name, \ >>>> - .pads = group_name##_pads, \ >>>> - .npads = ARRAY_SIZE(group_name##_pads), \ >>>> - .mfpctl_reg = -1, \ >>>> - .mfpctl_shift = -1, \ >>>> - .mfpctl_width = -1, \ >>>> - .drv_reg = -1, \ >>>> - .drv_shift = -1, \ >>>> - .drv_width = -1, \ >>>> - .sr_reg = PAD_SR##reg, \ >>>> - .sr_shift = shift, \ >>>> - .sr_width = width, \ >>>> - } >>>> /* Pinctrl groups */ >>>> static const struct owl_pingroup s900_groups[] = { >>>> @@ -1442,13 +1386,6 @@ static const char * const sirq2_groups[] = { >>>> "sirq2_dummy", >>>> }; >>>> -#define FUNCTION(fname) \ >>>> - { \ >>>> - .name = #fname, \ >>>> - .groups = fname##_groups, \ >>>> - .ngroups = ARRAY_SIZE(fname##_groups), \ >>>> - } >>>> - >>>> static const struct owl_pinmux_func s900_functions[] = { >>>> [S900_MUX_ERAM] = FUNCTION(eram), >>>> [S900_MUX_ETH_RMII] = FUNCTION(eth_rmii), >>>> @@ -1500,28 +1437,6 @@ static const struct owl_pinmux_func >>>> s900_functions[] = { >>>> [S900_MUX_SIRQ1] = FUNCTION(sirq1), >>>> [S900_MUX_SIRQ2] = FUNCTION(sirq2) >>>> }; >>>> -/* PAD PULL UP/DOWN CONFIGURES */ >>>> -#define PULLCTL_CONF(pull_reg, pull_sft, pull_wdt) \ >>>> - { \ >>>> - .reg = PAD_PULLCTL##pull_reg, \ >>>> - .shift = pull_sft, \ >>>> - .width = pull_wdt, \ >>>> - } >>>> - >>>> -#define PAD_PULLCTL_CONF(pad_name, pull_reg, pull_sft, pull_wdt) \ >>>> - struct owl_pullctl pad_name##_pullctl_conf \ >>>> - = PULLCTL_CONF(pull_reg, pull_sft, pull_wdt) >>>> - >>>> -#define ST_CONF(st_reg, st_sft, st_wdt) \ >>>> - { \ >>>> - .reg = PAD_ST##st_reg, \ >>>> - .shift = st_sft, \ >>>> - .width = st_wdt, \ >>>> - } >>>> - >>>> -#define PAD_ST_CONF(pad_name, st_reg, st_sft, st_wdt) \ >>>> - struct owl_st pad_name##_st_conf \ >>>> - = ST_CONF(st_reg, st_sft, st_wdt) >>>> /* PAD_PULLCTL0 */ >>>> static PAD_PULLCTL_CONF(ETH_RXER, 0, 18, 2); >>>> @@ -1639,34 +1554,6 @@ static PAD_ST_CONF(SPI0_SS, 1, 2, 1); >>>> static PAD_ST_CONF(I2S_BCLK0, 1, 1, 1); >>>> static PAD_ST_CONF(I2S_MCLK0, 1, 0, 1); >>>> -#define PAD_INFO(name) \ >>>> - { \ >>>> - .pad = name, \ >>>> - .pullctl = NULL, \ >>>> - .st = NULL, \ >>>> - } >>>> - >>>> -#define PAD_INFO_ST(name) \ >>>> - { \ >>>> - .pad = name, \ >>>> - .pullctl = NULL, \ >>>> - .st = &name##_st_conf, \ >>>> - } >>>> - >>>> -#define PAD_INFO_PULLCTL(name) \ >>>> - { \ >>>> - .pad = name, \ >>>> - .pullctl = &name##_pullctl_conf, \ >>>> - .st = NULL, \ >>>> - } >>>> - >>>> -#define PAD_INFO_PULLCTL_ST(name) \ >>>> - { \ >>>> - .pad = name, \ >>>> - .pullctl = &name##_pullctl_conf, \ >>>> - .st = &name##_st_conf, \ >>>> - } >>>> - >>>> /* Pad info table */ >>>> static struct owl_padinfo s900_padinfo[NUM_PADS] = { >>>> [ETH_TXD0] = PAD_INFO_ST(ETH_TXD0), >>>> @@ -1821,27 +1708,13 @@ static struct owl_padinfo >>>> s900_padinfo[NUM_PADS] = { >>>> [SGPIO3] = PAD_INFO_PULLCTL_ST(SGPIO3) >>>> }; >>>> -#define OWL_GPIO_PORT(port, base, count, _outen, _inen, _dat, \ >>>> - _intc_ctl, _intc_pd, _intc_msk, _intc_type) \ >>>> - [OWL_GPIO_PORT_##port] = { \ >>>> - .offset = base, \ >>>> - .pins = count, \ >>>> - .outen = _outen, \ >>>> - .inen = _inen, \ >>>> - .dat = _dat, \ >>>> - .intc_ctl = _intc_ctl, \ >>>> - .intc_pd = _intc_pd, \ >>>> - .intc_msk = _intc_msk, \ >>>> - .intc_type = _intc_type, \ >>>> - } >>>> - >>>> static const struct owl_gpio_port s900_gpio_ports[] = { >>>> - OWL_GPIO_PORT(A, 0x0000, 32, 0x0, 0x4, 0x8, 0x204, 0x208, >>>> 0x20C, 0x240), >>>> - OWL_GPIO_PORT(B, 0x000C, 32, 0x0, 0x4, 0x8, 0x534, 0x204, >>>> 0x208, 0x23C), >>>> - OWL_GPIO_PORT(C, 0x0018, 12, 0x0, 0x4, 0x8, 0x52C, 0x200, >>>> 0x204, 0x238), >>>> - OWL_GPIO_PORT(D, 0x0024, 30, 0x0, 0x4, 0x8, 0x524, 0x1FC, >>>> 0x200, 0x234), >>>> - OWL_GPIO_PORT(E, 0x0030, 32, 0x0, 0x4, 0x8, 0x51C, 0x1F8, >>>> 0x1FC, 0x230), >>>> - OWL_GPIO_PORT(F, 0x00F0, 8, 0x0, 0x4, 0x8, 0x460, 0x140, 0x144, >>>> 0x178) >>>> + OWL_GPIO_PORT(A, 0x0000, 32, 0x0, 0x4, 0x8, 0x204, 0x208, >>>> 0x20C, 0x240, 0), >>>> + OWL_GPIO_PORT(B, 0x000C, 32, 0x0, 0x4, 0x8, 0x534, 0x204, >>>> 0x208, 0x23C, 0), >>>> + OWL_GPIO_PORT(C, 0x0018, 12, 0x0, 0x4, 0x8, 0x52C, 0x200, >>>> 0x204, 0x238, 0), >>>> + OWL_GPIO_PORT(D, 0x0024, 30, 0x0, 0x4, 0x8, 0x524, 0x1FC, >>>> 0x200, 0x234, 0), >>>> + OWL_GPIO_PORT(E, 0x0030, 32, 0x0, 0x4, 0x8, 0x51C, 0x1F8, >>>> 0x1FC, 0x230, 0), >>>> + OWL_GPIO_PORT(F, 0x00F0, 8, 0x0, 0x4, 0x8, 0x460, 0x140, 0x144, >>>> 0x178, 0) >>>> }; >>>> static struct owl_pinctrl_soc_data s900_pinctrl_data = { >>>> -- >>>> 2.14.4 >>>> >> >
diff --git a/drivers/pinctrl/actions/pinctrl-owl.h b/drivers/pinctrl/actions/pinctrl-owl.h index a724d1d406d4..31cc33d7c4a5 100644 --- a/drivers/pinctrl/actions/pinctrl-owl.h +++ b/drivers/pinctrl/actions/pinctrl-owl.h @@ -15,6 +15,136 @@ #define OWL_PINCONF_SLEW_SLOW 0 #define OWL_PINCONF_SLEW_FAST 1 +#define MUX_PG(group_name, reg, shift, width) \ + { \ + .name = #group_name, \ + .pads = group_name##_pads, \ + .npads = ARRAY_SIZE(group_name##_pads), \ + .funcs = group_name##_funcs, \ + .nfuncs = ARRAY_SIZE(group_name##_funcs), \ + .mfpctl_reg = MFCTL##reg, \ + .mfpctl_shift = shift, \ + .mfpctl_width = width, \ + .drv_reg = -1, \ + .drv_shift = -1, \ + .drv_width = -1, \ + .sr_reg = -1, \ + .sr_shift = -1, \ + .sr_width = -1, \ + } + +#define DRV_PG(group_name, reg, shift, width) \ + { \ + .name = #group_name, \ + .pads = group_name##_pads, \ + .npads = ARRAY_SIZE(group_name##_pads), \ + .mfpctl_reg = -1, \ + .mfpctl_shift = -1, \ + .mfpctl_width = -1, \ + .drv_reg = PAD_DRV##reg, \ + .drv_shift = shift, \ + .drv_width = width, \ + .sr_reg = -1, \ + .sr_shift = -1, \ + .sr_width = -1, \ + } + +#define SR_PG(group_name, reg, shift, width) \ + { \ + .name = #group_name, \ + .pads = group_name##_pads, \ + .npads = ARRAY_SIZE(group_name##_pads), \ + .mfpctl_reg = -1, \ + .mfpctl_shift = -1, \ + .mfpctl_width = -1, \ + .drv_reg = -1, \ + .drv_shift = -1, \ + .drv_width = -1, \ + .sr_reg = PAD_SR##reg, \ + .sr_shift = shift, \ + .sr_width = width, \ + } + +#define FUNCTION(fname) \ + { \ + .name = #fname, \ + .groups = fname##_groups, \ + .ngroups = ARRAY_SIZE(fname##_groups), \ + } + +/* PAD PULL UP/DOWN CONFIGURES */ +#define PULLCTL_CONF(pull_reg, pull_sft, pull_wdt) \ + { \ + .reg = PAD_PULLCTL##pull_reg, \ + .shift = pull_sft, \ + .width = pull_wdt, \ + } + +#define PAD_PULLCTL_CONF(pad_name, pull_reg, pull_sft, pull_wdt) \ + struct owl_pullctl pad_name##_pullctl_conf \ + = PULLCTL_CONF(pull_reg, pull_sft, pull_wdt) + +#define ST_CONF(st_reg, st_sft, st_wdt) \ + { \ + .reg = PAD_ST##st_reg, \ + .shift = st_sft, \ + .width = st_wdt, \ + } + +#define PAD_ST_CONF(pad_name, st_reg, st_sft, st_wdt) \ + struct owl_st pad_name##_st_conf \ + = ST_CONF(st_reg, st_sft, st_wdt) + +#define PAD_INFO(name) \ + { \ + .pad = name, \ + .pullctl = NULL, \ + .st = NULL, \ + } + +#define PAD_INFO_ST(name) \ + { \ + .pad = name, \ + .pullctl = NULL, \ + .st = &name##_st_conf, \ + } + +#define PAD_INFO_PULLCTL(name) \ + { \ + .pad = name, \ + .pullctl = &name##_pullctl_conf, \ + .st = NULL, \ + } + +#define PAD_INFO_PULLCTL_ST(name) \ + { \ + .pad = name, \ + .pullctl = &name##_pullctl_conf, \ + .st = &name##_st_conf, \ + } + +#define OWL_GPIO_PORT_A 0 +#define OWL_GPIO_PORT_B 1 +#define OWL_GPIO_PORT_C 2 +#define OWL_GPIO_PORT_D 3 +#define OWL_GPIO_PORT_E 4 +#define OWL_GPIO_PORT_F 5 + +#define OWL_GPIO_PORT(port, base, count, _outen, _inen, _dat, _intc_ctl,\ + _intc_pd, _intc_msk, _intc_type, _share) \ + [OWL_GPIO_PORT_##port] = { \ + .offset = base, \ + .pins = count, \ + .outen = _outen, \ + .inen = _inen, \ + .dat = _dat, \ + .intc_ctl = _intc_ctl, \ + .intc_pd = _intc_pd, \ + .intc_msk = _intc_msk, \ + .intc_type = _intc_type, \ + .shared_ctl_offset = _share, \ + } + enum owl_pinconf_pull { OWL_PINCONF_PULL_HIZ, OWL_PINCONF_PULL_DOWN, @@ -148,6 +278,7 @@ struct owl_gpio_port { unsigned int intc_pd; unsigned int intc_msk; unsigned int intc_type; + u8 shared_ctl_offset; }; /** diff --git a/drivers/pinctrl/actions/pinctrl-s900.c b/drivers/pinctrl/actions/pinctrl-s900.c index ea67b14ef93b..0597009d8369 100644 --- a/drivers/pinctrl/actions/pinctrl-s900.c +++ b/drivers/pinctrl/actions/pinctrl-s900.c @@ -33,13 +33,6 @@ #define PAD_SR1 (0x0274) #define PAD_SR2 (0x0278) -#define OWL_GPIO_PORT_A 0 -#define OWL_GPIO_PORT_B 1 -#define OWL_GPIO_PORT_C 2 -#define OWL_GPIO_PORT_D 3 -#define OWL_GPIO_PORT_E 4 -#define OWL_GPIO_PORT_F 5 - #define _GPIOA(offset) (offset) #define _GPIOB(offset) (32 + (offset)) #define _GPIOC(offset) (64 + (offset)) @@ -892,55 +885,6 @@ static unsigned int i2c2_sr_pads[] = { I2C2_SCLK, I2C2_SDATA }; static unsigned int sensor0_sr_pads[] = { SENSOR0_PCLK, SENSOR0_CKOUT }; -#define MUX_PG(group_name, reg, shift, width) \ - { \ - .name = #group_name, \ - .pads = group_name##_pads, \ - .npads = ARRAY_SIZE(group_name##_pads), \ - .funcs = group_name##_funcs, \ - .nfuncs = ARRAY_SIZE(group_name##_funcs), \ - .mfpctl_reg = MFCTL##reg, \ - .mfpctl_shift = shift, \ - .mfpctl_width = width, \ - .drv_reg = -1, \ - .drv_shift = -1, \ - .drv_width = -1, \ - .sr_reg = -1, \ - .sr_shift = -1, \ - .sr_width = -1, \ - } - -#define DRV_PG(group_name, reg, shift, width) \ - { \ - .name = #group_name, \ - .pads = group_name##_pads, \ - .npads = ARRAY_SIZE(group_name##_pads), \ - .mfpctl_reg = -1, \ - .mfpctl_shift = -1, \ - .mfpctl_width = -1, \ - .drv_reg = PAD_DRV##reg, \ - .drv_shift = shift, \ - .drv_width = width, \ - .sr_reg = -1, \ - .sr_shift = -1, \ - .sr_width = -1, \ - } - -#define SR_PG(group_name, reg, shift, width) \ - { \ - .name = #group_name, \ - .pads = group_name##_pads, \ - .npads = ARRAY_SIZE(group_name##_pads), \ - .mfpctl_reg = -1, \ - .mfpctl_shift = -1, \ - .mfpctl_width = -1, \ - .drv_reg = -1, \ - .drv_shift = -1, \ - .drv_width = -1, \ - .sr_reg = PAD_SR##reg, \ - .sr_shift = shift, \ - .sr_width = width, \ - } /* Pinctrl groups */ static const struct owl_pingroup s900_groups[] = { @@ -1442,13 +1386,6 @@ static const char * const sirq2_groups[] = { "sirq2_dummy", }; -#define FUNCTION(fname) \ - { \ - .name = #fname, \ - .groups = fname##_groups, \ - .ngroups = ARRAY_SIZE(fname##_groups), \ - } - static const struct owl_pinmux_func s900_functions[] = { [S900_MUX_ERAM] = FUNCTION(eram), [S900_MUX_ETH_RMII] = FUNCTION(eth_rmii), @@ -1500,28 +1437,6 @@ static const struct owl_pinmux_func s900_functions[] = { [S900_MUX_SIRQ1] = FUNCTION(sirq1), [S900_MUX_SIRQ2] = FUNCTION(sirq2) }; -/* PAD PULL UP/DOWN CONFIGURES */ -#define PULLCTL_CONF(pull_reg, pull_sft, pull_wdt) \ - { \ - .reg = PAD_PULLCTL##pull_reg, \ - .shift = pull_sft, \ - .width = pull_wdt, \ - } - -#define PAD_PULLCTL_CONF(pad_name, pull_reg, pull_sft, pull_wdt) \ - struct owl_pullctl pad_name##_pullctl_conf \ - = PULLCTL_CONF(pull_reg, pull_sft, pull_wdt) - -#define ST_CONF(st_reg, st_sft, st_wdt) \ - { \ - .reg = PAD_ST##st_reg, \ - .shift = st_sft, \ - .width = st_wdt, \ - } - -#define PAD_ST_CONF(pad_name, st_reg, st_sft, st_wdt) \ - struct owl_st pad_name##_st_conf \ - = ST_CONF(st_reg, st_sft, st_wdt) /* PAD_PULLCTL0 */ static PAD_PULLCTL_CONF(ETH_RXER, 0, 18, 2); @@ -1639,34 +1554,6 @@ static PAD_ST_CONF(SPI0_SS, 1, 2, 1); static PAD_ST_CONF(I2S_BCLK0, 1, 1, 1); static PAD_ST_CONF(I2S_MCLK0, 1, 0, 1); -#define PAD_INFO(name) \ - { \ - .pad = name, \ - .pullctl = NULL, \ - .st = NULL, \ - } - -#define PAD_INFO_ST(name) \ - { \ - .pad = name, \ - .pullctl = NULL, \ - .st = &name##_st_conf, \ - } - -#define PAD_INFO_PULLCTL(name) \ - { \ - .pad = name, \ - .pullctl = &name##_pullctl_conf, \ - .st = NULL, \ - } - -#define PAD_INFO_PULLCTL_ST(name) \ - { \ - .pad = name, \ - .pullctl = &name##_pullctl_conf, \ - .st = &name##_st_conf, \ - } - /* Pad info table */ static struct owl_padinfo s900_padinfo[NUM_PADS] = { [ETH_TXD0] = PAD_INFO_ST(ETH_TXD0), @@ -1821,27 +1708,13 @@ static struct owl_padinfo s900_padinfo[NUM_PADS] = { [SGPIO3] = PAD_INFO_PULLCTL_ST(SGPIO3) }; -#define OWL_GPIO_PORT(port, base, count, _outen, _inen, _dat, \ - _intc_ctl, _intc_pd, _intc_msk, _intc_type) \ - [OWL_GPIO_PORT_##port] = { \ - .offset = base, \ - .pins = count, \ - .outen = _outen, \ - .inen = _inen, \ - .dat = _dat, \ - .intc_ctl = _intc_ctl, \ - .intc_pd = _intc_pd, \ - .intc_msk = _intc_msk, \ - .intc_type = _intc_type, \ - } - static const struct owl_gpio_port s900_gpio_ports[] = { - OWL_GPIO_PORT(A, 0x0000, 32, 0x0, 0x4, 0x8, 0x204, 0x208, 0x20C, 0x240), - OWL_GPIO_PORT(B, 0x000C, 32, 0x0, 0x4, 0x8, 0x534, 0x204, 0x208, 0x23C), - OWL_GPIO_PORT(C, 0x0018, 12, 0x0, 0x4, 0x8, 0x52C, 0x200, 0x204, 0x238), - OWL_GPIO_PORT(D, 0x0024, 30, 0x0, 0x4, 0x8, 0x524, 0x1FC, 0x200, 0x234), - OWL_GPIO_PORT(E, 0x0030, 32, 0x0, 0x4, 0x8, 0x51C, 0x1F8, 0x1FC, 0x230), - OWL_GPIO_PORT(F, 0x00F0, 8, 0x0, 0x4, 0x8, 0x460, 0x140, 0x144, 0x178) + OWL_GPIO_PORT(A, 0x0000, 32, 0x0, 0x4, 0x8, 0x204, 0x208, 0x20C, 0x240, 0), + OWL_GPIO_PORT(B, 0x000C, 32, 0x0, 0x4, 0x8, 0x534, 0x204, 0x208, 0x23C, 0), + OWL_GPIO_PORT(C, 0x0018, 12, 0x0, 0x4, 0x8, 0x52C, 0x200, 0x204, 0x238, 0), + OWL_GPIO_PORT(D, 0x0024, 30, 0x0, 0x4, 0x8, 0x524, 0x1FC, 0x200, 0x234, 0), + OWL_GPIO_PORT(E, 0x0030, 32, 0x0, 0x4, 0x8, 0x51C, 0x1F8, 0x1FC, 0x230, 0), + OWL_GPIO_PORT(F, 0x00F0, 8, 0x0, 0x4, 0x8, 0x460, 0x140, 0x144, 0x178, 0) }; static struct owl_pinctrl_soc_data s900_pinctrl_data = {