[U-Boot] [PATCH v3 09/10] pinctrl: rockchip: Clean the unused type and label

Kever Yang kever.yang at rock-chips.com
Tue May 7 03:44:23 UTC 2019



On 04/16/2019 09:57 PM, David Wu wrote:
> As the mux/pull/drive feature implement at own file,
> the type and label are not necessary.
>
> Signed-off-by: David Wu <david.wu at rock-chips.com>

Reviewed-by: Kever Yang <kever.yang at rock-chips.com>

Thanks,
- Kever
> ---
>
> Change in v3:
> - None
>
>  drivers/pinctrl/rockchip/pinctrl-rk3036.c   |  2 --
>  drivers/pinctrl/rockchip/pinctrl-rk3128.c   |  2 --
>  drivers/pinctrl/rockchip/pinctrl-rk3188.c   |  2 --
>  drivers/pinctrl/rockchip/pinctrl-rk322x.c   |  2 --
>  drivers/pinctrl/rockchip/pinctrl-rk3288.c   |  2 --
>  drivers/pinctrl/rockchip/pinctrl-rk3328.c   |  2 --
>  drivers/pinctrl/rockchip/pinctrl-rk3368.c   |  2 --
>  drivers/pinctrl/rockchip/pinctrl-rk3399.c   |  2 --
>  drivers/pinctrl/rockchip/pinctrl-rockchip.h | 12 ------------
>  drivers/pinctrl/rockchip/pinctrl-rv1108.c   |  2 --
>  10 files changed, 30 deletions(-)
>
> diff --git a/drivers/pinctrl/rockchip/pinctrl-rk3036.c b/drivers/pinctrl/rockchip/pinctrl-rk3036.c
> index 498b633f22..28c905129b 100644
> --- a/drivers/pinctrl/rockchip/pinctrl-rk3036.c
> +++ b/drivers/pinctrl/rockchip/pinctrl-rk3036.c
> @@ -83,8 +83,6 @@ 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,
>  	.set_mux		= rk3036_set_mux,
>  	.set_pull		= rk3036_set_pull,
> diff --git a/drivers/pinctrl/rockchip/pinctrl-rk3128.c b/drivers/pinctrl/rockchip/pinctrl-rk3128.c
> index 104b76c19e..3eb4d952bb 100644
> --- a/drivers/pinctrl/rockchip/pinctrl-rk3128.c
> +++ b/drivers/pinctrl/rockchip/pinctrl-rk3128.c
> @@ -183,8 +183,6 @@ static struct rockchip_pin_bank rk3128_pin_banks[] = {
>  static struct rockchip_pin_ctrl rk3128_pin_ctrl = {
>  	.pin_banks		= rk3128_pin_banks,
>  	.nr_banks		= ARRAY_SIZE(rk3128_pin_banks),
> -	.label			= "RK3128-GPIO",
> -	.type			= RK3128,
>  	.grf_mux_offset		= 0xa8,
>  	.iomux_recalced		= rk3128_mux_recalced_data,
>  	.niomux_recalced	= ARRAY_SIZE(rk3128_mux_recalced_data),
> diff --git a/drivers/pinctrl/rockchip/pinctrl-rk3188.c b/drivers/pinctrl/rockchip/pinctrl-rk3188.c
> index e09c799e72..043764fc92 100644
> --- a/drivers/pinctrl/rockchip/pinctrl-rk3188.c
> +++ b/drivers/pinctrl/rockchip/pinctrl-rk3188.c
> @@ -108,8 +108,6 @@ 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,
>  	.set_mux		= rk3188_set_mux,
>  	.set_pull		= rk3188_set_pull,
> diff --git a/drivers/pinctrl/rockchip/pinctrl-rk322x.c b/drivers/pinctrl/rockchip/pinctrl-rk322x.c
> index b69d9795bb..c5e4fe30a7 100644
> --- a/drivers/pinctrl/rockchip/pinctrl-rk322x.c
> +++ b/drivers/pinctrl/rockchip/pinctrl-rk322x.c
> @@ -268,8 +268,6 @@ 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),
> diff --git a/drivers/pinctrl/rockchip/pinctrl-rk3288.c b/drivers/pinctrl/rockchip/pinctrl-rk3288.c
> index 24af3597ec..7ae147f304 100644
> --- a/drivers/pinctrl/rockchip/pinctrl-rk3288.c
> +++ b/drivers/pinctrl/rockchip/pinctrl-rk3288.c
> @@ -223,8 +223,6 @@ 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,
> diff --git a/drivers/pinctrl/rockchip/pinctrl-rk3328.c b/drivers/pinctrl/rockchip/pinctrl-rk3328.c
> index 7ac5c0226e..d4d37af206 100644
> --- a/drivers/pinctrl/rockchip/pinctrl-rk3328.c
> +++ b/drivers/pinctrl/rockchip/pinctrl-rk3328.c
> @@ -281,8 +281,6 @@ 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),
> diff --git a/drivers/pinctrl/rockchip/pinctrl-rk3368.c b/drivers/pinctrl/rockchip/pinctrl-rk3368.c
> index 06de27aa30..6cb7bb45d9 100644
> --- a/drivers/pinctrl/rockchip/pinctrl-rk3368.c
> +++ b/drivers/pinctrl/rockchip/pinctrl-rk3368.c
> @@ -155,8 +155,6 @@ 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,
>  	.set_mux		= rk3368_set_mux,
> diff --git a/drivers/pinctrl/rockchip/pinctrl-rk3399.c b/drivers/pinctrl/rockchip/pinctrl-rk3399.c
> index 68bb492a6b..75634e9f4d 100644
> --- a/drivers/pinctrl/rockchip/pinctrl-rk3399.c
> +++ b/drivers/pinctrl/rockchip/pinctrl-rk3399.c
> @@ -290,8 +290,6 @@ 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,
> diff --git a/drivers/pinctrl/rockchip/pinctrl-rockchip.h b/drivers/pinctrl/rockchip/pinctrl-rockchip.h
> index c21b79602c..1c6fc2c5b2 100644
> --- a/drivers/pinctrl/rockchip/pinctrl-rockchip.h
> +++ b/drivers/pinctrl/rockchip/pinctrl-rockchip.h
> @@ -8,16 +8,6 @@
>  
>  #include <linux/types.h>
>  
> -enum rockchip_pinctrl_type {
> -	RV1108,
> -	RK3036,
> -	RK3128,
> -	RK3188,
> -	RK3288,
> -	RK3368,
> -	RK3399,
> -};
> -
>  /**
>   * Encode variants of iomux registers into a type variable
>   */
> @@ -266,8 +256,6 @@ struct rockchip_pin_ctrl {
>  	struct rockchip_pin_bank	*pin_banks;
>  	u32				nr_banks;
>  	u32				nr_pins;
> -	char				*label;
> -	enum rockchip_pinctrl_type	type;
>  	int				grf_mux_offset;
>  	int				pmu_mux_offset;
>  	int				grf_drv_offset;
> diff --git a/drivers/pinctrl/rockchip/pinctrl-rv1108.c b/drivers/pinctrl/rockchip/pinctrl-rv1108.c
> index 6456483e36..0bcf11bb41 100644
> --- a/drivers/pinctrl/rockchip/pinctrl-rv1108.c
> +++ b/drivers/pinctrl/rockchip/pinctrl-rv1108.c
> @@ -250,8 +250,6 @@ static struct rockchip_pin_bank rv1108_pin_banks[] = {
>  static struct rockchip_pin_ctrl rv1108_pin_ctrl = {
>  	.pin_banks		= rv1108_pin_banks,
>  	.nr_banks		= ARRAY_SIZE(rv1108_pin_banks),
> -	.label			= "RV1108-GPIO",
> -	.type			= RV1108,
>  	.grf_mux_offset		= 0x10,
>  	.pmu_mux_offset		= 0x0,
>  	.iomux_recalced		= rv1108_mux_recalced_data,





More information about the U-Boot mailing list