| Message ID | 20190416135102.26667-3-david.wu@rock-chips.com |
|---|---|
| State | Accepted |
| Delegated to: | Kever Yang |
| Headers | show |
| Series | pinctrl: Split the common mux/drive/pull/schmitt func into per Soc | expand |
On 04/16/2019 09:50 PM, David Wu wrote: > Some files have the redundant spaces, remove them. > > Signed-off-by: David Wu <david.wu@rock-chips.com> Reviewed-by: Kever Yang <kever.yang@rock-chips.com> Thanks, - Kever > --- > > Change in v3: > - None > > drivers/pinctrl/rockchip/pinctrl-rk3036.c | 12 ++++++------ > drivers/pinctrl/rockchip/pinctrl-rk3188.c | 12 ++++++------ > drivers/pinctrl/rockchip/pinctrl-rk322x.c | 18 ++++++++--------- > drivers/pinctrl/rockchip/pinctrl-rk3288.c | 20 +++++++++---------- > drivers/pinctrl/rockchip/pinctrl-rk3328.c | 24 +++++++++++------------ > drivers/pinctrl/rockchip/pinctrl-rk3368.c | 16 +++++++-------- > drivers/pinctrl/rockchip/pinctrl-rk3399.c | 24 +++++++++++------------ > 7 files changed, 63 insertions(+), 63 deletions(-) > > diff --git a/drivers/pinctrl/rockchip/pinctrl-rk3036.c b/drivers/pinctrl/rockchip/pinctrl-rk3036.c > index 2729b03443..2a651cd9b8 100644 > --- a/drivers/pinctrl/rockchip/pinctrl-rk3036.c > +++ b/drivers/pinctrl/rockchip/pinctrl-rk3036.c > @@ -36,12 +36,12 @@ static struct rockchip_pin_bank rk3036_pin_banks[] = { > }; > > static struct rockchip_pin_ctrl rk3036_pin_ctrl = { > - .pin_banks = rk3036_pin_banks, > - .nr_banks = ARRAY_SIZE(rk3036_pin_banks), > - .label = "RK3036-GPIO", > - .type = RK3036, > - .grf_mux_offset = 0xa8, > - .pull_calc_reg = rk3036_calc_pull_reg_and_bit, > + .pin_banks = rk3036_pin_banks, > + .nr_banks = ARRAY_SIZE(rk3036_pin_banks), > + .label = "RK3036-GPIO", > + .type = RK3036, > + .grf_mux_offset = 0xa8, > + .pull_calc_reg = rk3036_calc_pull_reg_and_bit, > }; > > static const struct udevice_id rk3036_pinctrl_ids[] = { > diff --git a/drivers/pinctrl/rockchip/pinctrl-rk3188.c b/drivers/pinctrl/rockchip/pinctrl-rk3188.c > index 5ed9aec938..7cc52c0075 100644 > --- a/drivers/pinctrl/rockchip/pinctrl-rk3188.c > +++ b/drivers/pinctrl/rockchip/pinctrl-rk3188.c > @@ -55,12 +55,12 @@ static struct rockchip_pin_bank rk3188_pin_banks[] = { > }; > > static struct rockchip_pin_ctrl rk3188_pin_ctrl = { > - .pin_banks = rk3188_pin_banks, > - .nr_banks = ARRAY_SIZE(rk3188_pin_banks), > - .label = "RK3188-GPIO", > - .type = RK3188, > - .grf_mux_offset = 0x60, > - .pull_calc_reg = rk3188_calc_pull_reg_and_bit, > + .pin_banks = rk3188_pin_banks, > + .nr_banks = ARRAY_SIZE(rk3188_pin_banks), > + .label = "RK3188-GPIO", > + .type = RK3188, > + .grf_mux_offset = 0x60, > + .pull_calc_reg = rk3188_calc_pull_reg_and_bit, > }; > > static const struct udevice_id rk3188_pinctrl_ids[] = { > diff --git a/drivers/pinctrl/rockchip/pinctrl-rk322x.c b/drivers/pinctrl/rockchip/pinctrl-rk322x.c > index d2a6cd7055..d67b48a06a 100644 > --- a/drivers/pinctrl/rockchip/pinctrl-rk322x.c > +++ b/drivers/pinctrl/rockchip/pinctrl-rk322x.c > @@ -183,15 +183,15 @@ static struct rockchip_pin_bank rk3228_pin_banks[] = { > }; > > static struct rockchip_pin_ctrl rk3228_pin_ctrl = { > - .pin_banks = rk3228_pin_banks, > - .nr_banks = ARRAY_SIZE(rk3228_pin_banks), > - .label = "RK3228-GPIO", > - .type = RK3288, > - .grf_mux_offset = 0x0, > - .iomux_routes = rk3228_mux_route_data, > - .niomux_routes = ARRAY_SIZE(rk3228_mux_route_data), > - .pull_calc_reg = rk3228_calc_pull_reg_and_bit, > - .drv_calc_reg = rk3228_calc_drv_reg_and_bit, > + .pin_banks = rk3228_pin_banks, > + .nr_banks = ARRAY_SIZE(rk3228_pin_banks), > + .label = "RK3228-GPIO", > + .type = RK3288, > + .grf_mux_offset = 0x0, > + .iomux_routes = rk3228_mux_route_data, > + .niomux_routes = ARRAY_SIZE(rk3228_mux_route_data), > + .pull_calc_reg = rk3228_calc_pull_reg_and_bit, > + .drv_calc_reg = rk3228_calc_drv_reg_and_bit, > }; > > static const struct udevice_id rk3228_pinctrl_ids[] = { > diff --git a/drivers/pinctrl/rockchip/pinctrl-rk3288.c b/drivers/pinctrl/rockchip/pinctrl-rk3288.c > index 60585f3208..3648f37207 100644 > --- a/drivers/pinctrl/rockchip/pinctrl-rk3288.c > +++ b/drivers/pinctrl/rockchip/pinctrl-rk3288.c > @@ -124,16 +124,16 @@ static struct rockchip_pin_bank rk3288_pin_banks[] = { > }; > > static struct rockchip_pin_ctrl rk3288_pin_ctrl = { > - .pin_banks = rk3288_pin_banks, > - .nr_banks = ARRAY_SIZE(rk3288_pin_banks), > - .label = "RK3288-GPIO", > - .type = RK3288, > - .grf_mux_offset = 0x0, > - .pmu_mux_offset = 0x84, > - .iomux_routes = rk3288_mux_route_data, > - .niomux_routes = ARRAY_SIZE(rk3288_mux_route_data), > - .pull_calc_reg = rk3288_calc_pull_reg_and_bit, > - .drv_calc_reg = rk3288_calc_drv_reg_and_bit, > + .pin_banks = rk3288_pin_banks, > + .nr_banks = ARRAY_SIZE(rk3288_pin_banks), > + .label = "RK3288-GPIO", > + .type = RK3288, > + .grf_mux_offset = 0x0, > + .pmu_mux_offset = 0x84, > + .iomux_routes = rk3288_mux_route_data, > + .niomux_routes = ARRAY_SIZE(rk3288_mux_route_data), > + .pull_calc_reg = rk3288_calc_pull_reg_and_bit, > + .drv_calc_reg = rk3288_calc_drv_reg_and_bit, > }; > > static const struct udevice_id rk3288_pinctrl_ids[] = { > diff --git a/drivers/pinctrl/rockchip/pinctrl-rk3328.c b/drivers/pinctrl/rockchip/pinctrl-rk3328.c > index f1b3d10dbe..ab634c1123 100644 > --- a/drivers/pinctrl/rockchip/pinctrl-rk3328.c > +++ b/drivers/pinctrl/rockchip/pinctrl-rk3328.c > @@ -192,18 +192,18 @@ static struct rockchip_pin_bank rk3328_pin_banks[] = { > }; > > static struct rockchip_pin_ctrl rk3328_pin_ctrl = { > - .pin_banks = rk3328_pin_banks, > - .nr_banks = ARRAY_SIZE(rk3328_pin_banks), > - .label = "RK3328-GPIO", > - .type = RK3288, > - .grf_mux_offset = 0x0, > - .iomux_recalced = rk3328_mux_recalced_data, > - .niomux_recalced = ARRAY_SIZE(rk3328_mux_recalced_data), > - .iomux_routes = rk3328_mux_route_data, > - .niomux_routes = ARRAY_SIZE(rk3328_mux_route_data), > - .pull_calc_reg = rk3328_calc_pull_reg_and_bit, > - .drv_calc_reg = rk3328_calc_drv_reg_and_bit, > - .schmitt_calc_reg = rk3328_calc_schmitt_reg_and_bit, > + .pin_banks = rk3328_pin_banks, > + .nr_banks = ARRAY_SIZE(rk3328_pin_banks), > + .label = "RK3328-GPIO", > + .type = RK3288, > + .grf_mux_offset = 0x0, > + .iomux_recalced = rk3328_mux_recalced_data, > + .niomux_recalced = ARRAY_SIZE(rk3328_mux_recalced_data), > + .iomux_routes = rk3328_mux_route_data, > + .niomux_routes = ARRAY_SIZE(rk3328_mux_route_data), > + .pull_calc_reg = rk3328_calc_pull_reg_and_bit, > + .drv_calc_reg = rk3328_calc_drv_reg_and_bit, > + .schmitt_calc_reg = rk3328_calc_schmitt_reg_and_bit, > }; > > static const struct udevice_id rk3328_pinctrl_ids[] = { > diff --git a/drivers/pinctrl/rockchip/pinctrl-rk3368.c b/drivers/pinctrl/rockchip/pinctrl-rk3368.c > index f5cd6ff24e..8bdaf5e4d2 100644 > --- a/drivers/pinctrl/rockchip/pinctrl-rk3368.c > +++ b/drivers/pinctrl/rockchip/pinctrl-rk3368.c > @@ -85,14 +85,14 @@ static struct rockchip_pin_bank rk3368_pin_banks[] = { > }; > > static struct rockchip_pin_ctrl rk3368_pin_ctrl = { > - .pin_banks = rk3368_pin_banks, > - .nr_banks = ARRAY_SIZE(rk3368_pin_banks), > - .label = "RK3368-GPIO", > - .type = RK3368, > - .grf_mux_offset = 0x0, > - .pmu_mux_offset = 0x0, > - .pull_calc_reg = rk3368_calc_pull_reg_and_bit, > - .drv_calc_reg = rk3368_calc_drv_reg_and_bit, > + .pin_banks = rk3368_pin_banks, > + .nr_banks = ARRAY_SIZE(rk3368_pin_banks), > + .label = "RK3368-GPIO", > + .type = RK3368, > + .grf_mux_offset = 0x0, > + .pmu_mux_offset = 0x0, > + .pull_calc_reg = rk3368_calc_pull_reg_and_bit, > + .drv_calc_reg = rk3368_calc_drv_reg_and_bit, > }; > > static const struct udevice_id rk3368_pinctrl_ids[] = { > diff --git a/drivers/pinctrl/rockchip/pinctrl-rk3399.c b/drivers/pinctrl/rockchip/pinctrl-rk3399.c > index c5aab647a5..06276b14ef 100644 > --- a/drivers/pinctrl/rockchip/pinctrl-rk3399.c > +++ b/drivers/pinctrl/rockchip/pinctrl-rk3399.c > @@ -158,18 +158,18 @@ static struct rockchip_pin_bank rk3399_pin_banks[] = { > }; > > static struct rockchip_pin_ctrl rk3399_pin_ctrl = { > - .pin_banks = rk3399_pin_banks, > - .nr_banks = ARRAY_SIZE(rk3399_pin_banks), > - .label = "RK3399-GPIO", > - .type = RK3399, > - .grf_mux_offset = 0xe000, > - .pmu_mux_offset = 0x0, > - .grf_drv_offset = 0xe100, > - .pmu_drv_offset = 0x80, > - .iomux_routes = rk3399_mux_route_data, > - .niomux_routes = ARRAY_SIZE(rk3399_mux_route_data), > - .pull_calc_reg = rk3399_calc_pull_reg_and_bit, > - .drv_calc_reg = rk3399_calc_drv_reg_and_bit, > + .pin_banks = rk3399_pin_banks, > + .nr_banks = ARRAY_SIZE(rk3399_pin_banks), > + .label = "RK3399-GPIO", > + .type = RK3399, > + .grf_mux_offset = 0xe000, > + .pmu_mux_offset = 0x0, > + .grf_drv_offset = 0xe100, > + .pmu_drv_offset = 0x80, > + .iomux_routes = rk3399_mux_route_data, > + .niomux_routes = ARRAY_SIZE(rk3399_mux_route_data), > + .pull_calc_reg = rk3399_calc_pull_reg_and_bit, > + .drv_calc_reg = rk3399_calc_drv_reg_and_bit, > }; > > static const struct udevice_id rk3399_pinctrl_ids[] = {
On 05/07/2019 11:42 AM, Kever Yang wrote: > > On 04/16/2019 09:50 PM, David Wu wrote: >> Some files have the redundant spaces, remove them. >> >> Signed-off-by: David Wu <david.wu@rock-chips.com> > Reviewed-by: Kever Yang <kever.yang@rock-chips.com> Applied to u-boot-rockchip, thanks! > > Thanks, > - Kever >> --- >> >> Change in v3: >> - None >> >> drivers/pinctrl/rockchip/pinctrl-rk3036.c | 12 ++++++------ >> drivers/pinctrl/rockchip/pinctrl-rk3188.c | 12 ++++++------ >> drivers/pinctrl/rockchip/pinctrl-rk322x.c | 18 ++++++++--------- >> drivers/pinctrl/rockchip/pinctrl-rk3288.c | 20 +++++++++---------- >> drivers/pinctrl/rockchip/pinctrl-rk3328.c | 24 +++++++++++------------ >> drivers/pinctrl/rockchip/pinctrl-rk3368.c | 16 +++++++-------- >> drivers/pinctrl/rockchip/pinctrl-rk3399.c | 24 +++++++++++------------ >> 7 files changed, 63 insertions(+), 63 deletions(-) >> >> diff --git a/drivers/pinctrl/rockchip/pinctrl-rk3036.c b/drivers/pinctrl/rockchip/pinctrl-rk3036.c >> index 2729b03443..2a651cd9b8 100644 >> --- a/drivers/pinctrl/rockchip/pinctrl-rk3036.c >> +++ b/drivers/pinctrl/rockchip/pinctrl-rk3036.c >> @@ -36,12 +36,12 @@ static struct rockchip_pin_bank rk3036_pin_banks[] = { >> }; >> >> static struct rockchip_pin_ctrl rk3036_pin_ctrl = { >> - .pin_banks = rk3036_pin_banks, >> - .nr_banks = ARRAY_SIZE(rk3036_pin_banks), >> - .label = "RK3036-GPIO", >> - .type = RK3036, >> - .grf_mux_offset = 0xa8, >> - .pull_calc_reg = rk3036_calc_pull_reg_and_bit, >> + .pin_banks = rk3036_pin_banks, >> + .nr_banks = ARRAY_SIZE(rk3036_pin_banks), >> + .label = "RK3036-GPIO", >> + .type = RK3036, >> + .grf_mux_offset = 0xa8, >> + .pull_calc_reg = rk3036_calc_pull_reg_and_bit, >> }; >> >> static const struct udevice_id rk3036_pinctrl_ids[] = { >> diff --git a/drivers/pinctrl/rockchip/pinctrl-rk3188.c b/drivers/pinctrl/rockchip/pinctrl-rk3188.c >> index 5ed9aec938..7cc52c0075 100644 >> --- a/drivers/pinctrl/rockchip/pinctrl-rk3188.c >> +++ b/drivers/pinctrl/rockchip/pinctrl-rk3188.c >> @@ -55,12 +55,12 @@ static struct rockchip_pin_bank rk3188_pin_banks[] = { >> }; >> >> static struct rockchip_pin_ctrl rk3188_pin_ctrl = { >> - .pin_banks = rk3188_pin_banks, >> - .nr_banks = ARRAY_SIZE(rk3188_pin_banks), >> - .label = "RK3188-GPIO", >> - .type = RK3188, >> - .grf_mux_offset = 0x60, >> - .pull_calc_reg = rk3188_calc_pull_reg_and_bit, >> + .pin_banks = rk3188_pin_banks, >> + .nr_banks = ARRAY_SIZE(rk3188_pin_banks), >> + .label = "RK3188-GPIO", >> + .type = RK3188, >> + .grf_mux_offset = 0x60, >> + .pull_calc_reg = rk3188_calc_pull_reg_and_bit, >> }; >> >> static const struct udevice_id rk3188_pinctrl_ids[] = { >> diff --git a/drivers/pinctrl/rockchip/pinctrl-rk322x.c b/drivers/pinctrl/rockchip/pinctrl-rk322x.c >> index d2a6cd7055..d67b48a06a 100644 >> --- a/drivers/pinctrl/rockchip/pinctrl-rk322x.c >> +++ b/drivers/pinctrl/rockchip/pinctrl-rk322x.c >> @@ -183,15 +183,15 @@ static struct rockchip_pin_bank rk3228_pin_banks[] = { >> }; >> >> static struct rockchip_pin_ctrl rk3228_pin_ctrl = { >> - .pin_banks = rk3228_pin_banks, >> - .nr_banks = ARRAY_SIZE(rk3228_pin_banks), >> - .label = "RK3228-GPIO", >> - .type = RK3288, >> - .grf_mux_offset = 0x0, >> - .iomux_routes = rk3228_mux_route_data, >> - .niomux_routes = ARRAY_SIZE(rk3228_mux_route_data), >> - .pull_calc_reg = rk3228_calc_pull_reg_and_bit, >> - .drv_calc_reg = rk3228_calc_drv_reg_and_bit, >> + .pin_banks = rk3228_pin_banks, >> + .nr_banks = ARRAY_SIZE(rk3228_pin_banks), >> + .label = "RK3228-GPIO", >> + .type = RK3288, >> + .grf_mux_offset = 0x0, >> + .iomux_routes = rk3228_mux_route_data, >> + .niomux_routes = ARRAY_SIZE(rk3228_mux_route_data), >> + .pull_calc_reg = rk3228_calc_pull_reg_and_bit, >> + .drv_calc_reg = rk3228_calc_drv_reg_and_bit, >> }; >> >> static const struct udevice_id rk3228_pinctrl_ids[] = { >> diff --git a/drivers/pinctrl/rockchip/pinctrl-rk3288.c b/drivers/pinctrl/rockchip/pinctrl-rk3288.c >> index 60585f3208..3648f37207 100644 >> --- a/drivers/pinctrl/rockchip/pinctrl-rk3288.c >> +++ b/drivers/pinctrl/rockchip/pinctrl-rk3288.c >> @@ -124,16 +124,16 @@ static struct rockchip_pin_bank rk3288_pin_banks[] = { >> }; >> >> static struct rockchip_pin_ctrl rk3288_pin_ctrl = { >> - .pin_banks = rk3288_pin_banks, >> - .nr_banks = ARRAY_SIZE(rk3288_pin_banks), >> - .label = "RK3288-GPIO", >> - .type = RK3288, >> - .grf_mux_offset = 0x0, >> - .pmu_mux_offset = 0x84, >> - .iomux_routes = rk3288_mux_route_data, >> - .niomux_routes = ARRAY_SIZE(rk3288_mux_route_data), >> - .pull_calc_reg = rk3288_calc_pull_reg_and_bit, >> - .drv_calc_reg = rk3288_calc_drv_reg_and_bit, >> + .pin_banks = rk3288_pin_banks, >> + .nr_banks = ARRAY_SIZE(rk3288_pin_banks), >> + .label = "RK3288-GPIO", >> + .type = RK3288, >> + .grf_mux_offset = 0x0, >> + .pmu_mux_offset = 0x84, >> + .iomux_routes = rk3288_mux_route_data, >> + .niomux_routes = ARRAY_SIZE(rk3288_mux_route_data), >> + .pull_calc_reg = rk3288_calc_pull_reg_and_bit, >> + .drv_calc_reg = rk3288_calc_drv_reg_and_bit, >> }; >> >> static const struct udevice_id rk3288_pinctrl_ids[] = { >> diff --git a/drivers/pinctrl/rockchip/pinctrl-rk3328.c b/drivers/pinctrl/rockchip/pinctrl-rk3328.c >> index f1b3d10dbe..ab634c1123 100644 >> --- a/drivers/pinctrl/rockchip/pinctrl-rk3328.c >> +++ b/drivers/pinctrl/rockchip/pinctrl-rk3328.c >> @@ -192,18 +192,18 @@ static struct rockchip_pin_bank rk3328_pin_banks[] = { >> }; >> >> static struct rockchip_pin_ctrl rk3328_pin_ctrl = { >> - .pin_banks = rk3328_pin_banks, >> - .nr_banks = ARRAY_SIZE(rk3328_pin_banks), >> - .label = "RK3328-GPIO", >> - .type = RK3288, >> - .grf_mux_offset = 0x0, >> - .iomux_recalced = rk3328_mux_recalced_data, >> - .niomux_recalced = ARRAY_SIZE(rk3328_mux_recalced_data), >> - .iomux_routes = rk3328_mux_route_data, >> - .niomux_routes = ARRAY_SIZE(rk3328_mux_route_data), >> - .pull_calc_reg = rk3328_calc_pull_reg_and_bit, >> - .drv_calc_reg = rk3328_calc_drv_reg_and_bit, >> - .schmitt_calc_reg = rk3328_calc_schmitt_reg_and_bit, >> + .pin_banks = rk3328_pin_banks, >> + .nr_banks = ARRAY_SIZE(rk3328_pin_banks), >> + .label = "RK3328-GPIO", >> + .type = RK3288, >> + .grf_mux_offset = 0x0, >> + .iomux_recalced = rk3328_mux_recalced_data, >> + .niomux_recalced = ARRAY_SIZE(rk3328_mux_recalced_data), >> + .iomux_routes = rk3328_mux_route_data, >> + .niomux_routes = ARRAY_SIZE(rk3328_mux_route_data), >> + .pull_calc_reg = rk3328_calc_pull_reg_and_bit, >> + .drv_calc_reg = rk3328_calc_drv_reg_and_bit, >> + .schmitt_calc_reg = rk3328_calc_schmitt_reg_and_bit, >> }; >> >> static const struct udevice_id rk3328_pinctrl_ids[] = { >> diff --git a/drivers/pinctrl/rockchip/pinctrl-rk3368.c b/drivers/pinctrl/rockchip/pinctrl-rk3368.c >> index f5cd6ff24e..8bdaf5e4d2 100644 >> --- a/drivers/pinctrl/rockchip/pinctrl-rk3368.c >> +++ b/drivers/pinctrl/rockchip/pinctrl-rk3368.c >> @@ -85,14 +85,14 @@ static struct rockchip_pin_bank rk3368_pin_banks[] = { >> }; >> >> static struct rockchip_pin_ctrl rk3368_pin_ctrl = { >> - .pin_banks = rk3368_pin_banks, >> - .nr_banks = ARRAY_SIZE(rk3368_pin_banks), >> - .label = "RK3368-GPIO", >> - .type = RK3368, >> - .grf_mux_offset = 0x0, >> - .pmu_mux_offset = 0x0, >> - .pull_calc_reg = rk3368_calc_pull_reg_and_bit, >> - .drv_calc_reg = rk3368_calc_drv_reg_and_bit, >> + .pin_banks = rk3368_pin_banks, >> + .nr_banks = ARRAY_SIZE(rk3368_pin_banks), >> + .label = "RK3368-GPIO", >> + .type = RK3368, >> + .grf_mux_offset = 0x0, >> + .pmu_mux_offset = 0x0, >> + .pull_calc_reg = rk3368_calc_pull_reg_and_bit, >> + .drv_calc_reg = rk3368_calc_drv_reg_and_bit, >> }; >> >> static const struct udevice_id rk3368_pinctrl_ids[] = { >> diff --git a/drivers/pinctrl/rockchip/pinctrl-rk3399.c b/drivers/pinctrl/rockchip/pinctrl-rk3399.c >> index c5aab647a5..06276b14ef 100644 >> --- a/drivers/pinctrl/rockchip/pinctrl-rk3399.c >> +++ b/drivers/pinctrl/rockchip/pinctrl-rk3399.c >> @@ -158,18 +158,18 @@ static struct rockchip_pin_bank rk3399_pin_banks[] = { >> }; >> >> static struct rockchip_pin_ctrl rk3399_pin_ctrl = { >> - .pin_banks = rk3399_pin_banks, >> - .nr_banks = ARRAY_SIZE(rk3399_pin_banks), >> - .label = "RK3399-GPIO", >> - .type = RK3399, >> - .grf_mux_offset = 0xe000, >> - .pmu_mux_offset = 0x0, >> - .grf_drv_offset = 0xe100, >> - .pmu_drv_offset = 0x80, >> - .iomux_routes = rk3399_mux_route_data, >> - .niomux_routes = ARRAY_SIZE(rk3399_mux_route_data), >> - .pull_calc_reg = rk3399_calc_pull_reg_and_bit, >> - .drv_calc_reg = rk3399_calc_drv_reg_and_bit, >> + .pin_banks = rk3399_pin_banks, >> + .nr_banks = ARRAY_SIZE(rk3399_pin_banks), >> + .label = "RK3399-GPIO", >> + .type = RK3399, >> + .grf_mux_offset = 0xe000, >> + .pmu_mux_offset = 0x0, >> + .grf_drv_offset = 0xe100, >> + .pmu_drv_offset = 0x80, >> + .iomux_routes = rk3399_mux_route_data, >> + .niomux_routes = ARRAY_SIZE(rk3399_mux_route_data), >> + .pull_calc_reg = rk3399_calc_pull_reg_and_bit, >> + .drv_calc_reg = rk3399_calc_drv_reg_and_bit, >> }; >> >> static const struct udevice_id rk3399_pinctrl_ids[] = { > > > _______________________________________________ > U-Boot mailing list > U-Boot@lists.denx.de > https://lists.denx.de/listinfo/u-boot
diff --git a/drivers/pinctrl/rockchip/pinctrl-rk3036.c b/drivers/pinctrl/rockchip/pinctrl-rk3036.c index 2729b03443..2a651cd9b8 100644 --- a/drivers/pinctrl/rockchip/pinctrl-rk3036.c +++ b/drivers/pinctrl/rockchip/pinctrl-rk3036.c @@ -36,12 +36,12 @@ static struct rockchip_pin_bank rk3036_pin_banks[] = { }; static struct rockchip_pin_ctrl rk3036_pin_ctrl = { - .pin_banks = rk3036_pin_banks, - .nr_banks = ARRAY_SIZE(rk3036_pin_banks), - .label = "RK3036-GPIO", - .type = RK3036, - .grf_mux_offset = 0xa8, - .pull_calc_reg = rk3036_calc_pull_reg_and_bit, + .pin_banks = rk3036_pin_banks, + .nr_banks = ARRAY_SIZE(rk3036_pin_banks), + .label = "RK3036-GPIO", + .type = RK3036, + .grf_mux_offset = 0xa8, + .pull_calc_reg = rk3036_calc_pull_reg_and_bit, }; static const struct udevice_id rk3036_pinctrl_ids[] = { diff --git a/drivers/pinctrl/rockchip/pinctrl-rk3188.c b/drivers/pinctrl/rockchip/pinctrl-rk3188.c index 5ed9aec938..7cc52c0075 100644 --- a/drivers/pinctrl/rockchip/pinctrl-rk3188.c +++ b/drivers/pinctrl/rockchip/pinctrl-rk3188.c @@ -55,12 +55,12 @@ static struct rockchip_pin_bank rk3188_pin_banks[] = { }; static struct rockchip_pin_ctrl rk3188_pin_ctrl = { - .pin_banks = rk3188_pin_banks, - .nr_banks = ARRAY_SIZE(rk3188_pin_banks), - .label = "RK3188-GPIO", - .type = RK3188, - .grf_mux_offset = 0x60, - .pull_calc_reg = rk3188_calc_pull_reg_and_bit, + .pin_banks = rk3188_pin_banks, + .nr_banks = ARRAY_SIZE(rk3188_pin_banks), + .label = "RK3188-GPIO", + .type = RK3188, + .grf_mux_offset = 0x60, + .pull_calc_reg = rk3188_calc_pull_reg_and_bit, }; static const struct udevice_id rk3188_pinctrl_ids[] = { diff --git a/drivers/pinctrl/rockchip/pinctrl-rk322x.c b/drivers/pinctrl/rockchip/pinctrl-rk322x.c index d2a6cd7055..d67b48a06a 100644 --- a/drivers/pinctrl/rockchip/pinctrl-rk322x.c +++ b/drivers/pinctrl/rockchip/pinctrl-rk322x.c @@ -183,15 +183,15 @@ static struct rockchip_pin_bank rk3228_pin_banks[] = { }; static struct rockchip_pin_ctrl rk3228_pin_ctrl = { - .pin_banks = rk3228_pin_banks, - .nr_banks = ARRAY_SIZE(rk3228_pin_banks), - .label = "RK3228-GPIO", - .type = RK3288, - .grf_mux_offset = 0x0, - .iomux_routes = rk3228_mux_route_data, - .niomux_routes = ARRAY_SIZE(rk3228_mux_route_data), - .pull_calc_reg = rk3228_calc_pull_reg_and_bit, - .drv_calc_reg = rk3228_calc_drv_reg_and_bit, + .pin_banks = rk3228_pin_banks, + .nr_banks = ARRAY_SIZE(rk3228_pin_banks), + .label = "RK3228-GPIO", + .type = RK3288, + .grf_mux_offset = 0x0, + .iomux_routes = rk3228_mux_route_data, + .niomux_routes = ARRAY_SIZE(rk3228_mux_route_data), + .pull_calc_reg = rk3228_calc_pull_reg_and_bit, + .drv_calc_reg = rk3228_calc_drv_reg_and_bit, }; static const struct udevice_id rk3228_pinctrl_ids[] = { diff --git a/drivers/pinctrl/rockchip/pinctrl-rk3288.c b/drivers/pinctrl/rockchip/pinctrl-rk3288.c index 60585f3208..3648f37207 100644 --- a/drivers/pinctrl/rockchip/pinctrl-rk3288.c +++ b/drivers/pinctrl/rockchip/pinctrl-rk3288.c @@ -124,16 +124,16 @@ static struct rockchip_pin_bank rk3288_pin_banks[] = { }; static struct rockchip_pin_ctrl rk3288_pin_ctrl = { - .pin_banks = rk3288_pin_banks, - .nr_banks = ARRAY_SIZE(rk3288_pin_banks), - .label = "RK3288-GPIO", - .type = RK3288, - .grf_mux_offset = 0x0, - .pmu_mux_offset = 0x84, - .iomux_routes = rk3288_mux_route_data, - .niomux_routes = ARRAY_SIZE(rk3288_mux_route_data), - .pull_calc_reg = rk3288_calc_pull_reg_and_bit, - .drv_calc_reg = rk3288_calc_drv_reg_and_bit, + .pin_banks = rk3288_pin_banks, + .nr_banks = ARRAY_SIZE(rk3288_pin_banks), + .label = "RK3288-GPIO", + .type = RK3288, + .grf_mux_offset = 0x0, + .pmu_mux_offset = 0x84, + .iomux_routes = rk3288_mux_route_data, + .niomux_routes = ARRAY_SIZE(rk3288_mux_route_data), + .pull_calc_reg = rk3288_calc_pull_reg_and_bit, + .drv_calc_reg = rk3288_calc_drv_reg_and_bit, }; static const struct udevice_id rk3288_pinctrl_ids[] = { diff --git a/drivers/pinctrl/rockchip/pinctrl-rk3328.c b/drivers/pinctrl/rockchip/pinctrl-rk3328.c index f1b3d10dbe..ab634c1123 100644 --- a/drivers/pinctrl/rockchip/pinctrl-rk3328.c +++ b/drivers/pinctrl/rockchip/pinctrl-rk3328.c @@ -192,18 +192,18 @@ static struct rockchip_pin_bank rk3328_pin_banks[] = { }; static struct rockchip_pin_ctrl rk3328_pin_ctrl = { - .pin_banks = rk3328_pin_banks, - .nr_banks = ARRAY_SIZE(rk3328_pin_banks), - .label = "RK3328-GPIO", - .type = RK3288, - .grf_mux_offset = 0x0, - .iomux_recalced = rk3328_mux_recalced_data, - .niomux_recalced = ARRAY_SIZE(rk3328_mux_recalced_data), - .iomux_routes = rk3328_mux_route_data, - .niomux_routes = ARRAY_SIZE(rk3328_mux_route_data), - .pull_calc_reg = rk3328_calc_pull_reg_and_bit, - .drv_calc_reg = rk3328_calc_drv_reg_and_bit, - .schmitt_calc_reg = rk3328_calc_schmitt_reg_and_bit, + .pin_banks = rk3328_pin_banks, + .nr_banks = ARRAY_SIZE(rk3328_pin_banks), + .label = "RK3328-GPIO", + .type = RK3288, + .grf_mux_offset = 0x0, + .iomux_recalced = rk3328_mux_recalced_data, + .niomux_recalced = ARRAY_SIZE(rk3328_mux_recalced_data), + .iomux_routes = rk3328_mux_route_data, + .niomux_routes = ARRAY_SIZE(rk3328_mux_route_data), + .pull_calc_reg = rk3328_calc_pull_reg_and_bit, + .drv_calc_reg = rk3328_calc_drv_reg_and_bit, + .schmitt_calc_reg = rk3328_calc_schmitt_reg_and_bit, }; static const struct udevice_id rk3328_pinctrl_ids[] = { diff --git a/drivers/pinctrl/rockchip/pinctrl-rk3368.c b/drivers/pinctrl/rockchip/pinctrl-rk3368.c index f5cd6ff24e..8bdaf5e4d2 100644 --- a/drivers/pinctrl/rockchip/pinctrl-rk3368.c +++ b/drivers/pinctrl/rockchip/pinctrl-rk3368.c @@ -85,14 +85,14 @@ static struct rockchip_pin_bank rk3368_pin_banks[] = { }; static struct rockchip_pin_ctrl rk3368_pin_ctrl = { - .pin_banks = rk3368_pin_banks, - .nr_banks = ARRAY_SIZE(rk3368_pin_banks), - .label = "RK3368-GPIO", - .type = RK3368, - .grf_mux_offset = 0x0, - .pmu_mux_offset = 0x0, - .pull_calc_reg = rk3368_calc_pull_reg_and_bit, - .drv_calc_reg = rk3368_calc_drv_reg_and_bit, + .pin_banks = rk3368_pin_banks, + .nr_banks = ARRAY_SIZE(rk3368_pin_banks), + .label = "RK3368-GPIO", + .type = RK3368, + .grf_mux_offset = 0x0, + .pmu_mux_offset = 0x0, + .pull_calc_reg = rk3368_calc_pull_reg_and_bit, + .drv_calc_reg = rk3368_calc_drv_reg_and_bit, }; static const struct udevice_id rk3368_pinctrl_ids[] = { diff --git a/drivers/pinctrl/rockchip/pinctrl-rk3399.c b/drivers/pinctrl/rockchip/pinctrl-rk3399.c index c5aab647a5..06276b14ef 100644 --- a/drivers/pinctrl/rockchip/pinctrl-rk3399.c +++ b/drivers/pinctrl/rockchip/pinctrl-rk3399.c @@ -158,18 +158,18 @@ static struct rockchip_pin_bank rk3399_pin_banks[] = { }; static struct rockchip_pin_ctrl rk3399_pin_ctrl = { - .pin_banks = rk3399_pin_banks, - .nr_banks = ARRAY_SIZE(rk3399_pin_banks), - .label = "RK3399-GPIO", - .type = RK3399, - .grf_mux_offset = 0xe000, - .pmu_mux_offset = 0x0, - .grf_drv_offset = 0xe100, - .pmu_drv_offset = 0x80, - .iomux_routes = rk3399_mux_route_data, - .niomux_routes = ARRAY_SIZE(rk3399_mux_route_data), - .pull_calc_reg = rk3399_calc_pull_reg_and_bit, - .drv_calc_reg = rk3399_calc_drv_reg_and_bit, + .pin_banks = rk3399_pin_banks, + .nr_banks = ARRAY_SIZE(rk3399_pin_banks), + .label = "RK3399-GPIO", + .type = RK3399, + .grf_mux_offset = 0xe000, + .pmu_mux_offset = 0x0, + .grf_drv_offset = 0xe100, + .pmu_drv_offset = 0x80, + .iomux_routes = rk3399_mux_route_data, + .niomux_routes = ARRAY_SIZE(rk3399_mux_route_data), + .pull_calc_reg = rk3399_calc_pull_reg_and_bit, + .drv_calc_reg = rk3399_calc_drv_reg_and_bit, }; static const struct udevice_id rk3399_pinctrl_ids[] = {
Some files have the redundant spaces, remove them. Signed-off-by: David Wu <david.wu@rock-chips.com> --- Change in v3: - None drivers/pinctrl/rockchip/pinctrl-rk3036.c | 12 ++++++------ drivers/pinctrl/rockchip/pinctrl-rk3188.c | 12 ++++++------ drivers/pinctrl/rockchip/pinctrl-rk322x.c | 18 ++++++++--------- drivers/pinctrl/rockchip/pinctrl-rk3288.c | 20 +++++++++---------- drivers/pinctrl/rockchip/pinctrl-rk3328.c | 24 +++++++++++------------ drivers/pinctrl/rockchip/pinctrl-rk3368.c | 16 +++++++-------- drivers/pinctrl/rockchip/pinctrl-rk3399.c | 24 +++++++++++------------ 7 files changed, 63 insertions(+), 63 deletions(-)