| Message ID | 20190102130155.26304-1-david.wu@rock-chips.com |
|---|---|
| State | Accepted |
| Delegated to: | Philipp Tomsich |
| Headers | show |
| Series | Add common pinctrl driver support for rockchip | expand |
On 01/02/2019 09:01 PM, David Wu wrote: > If we used the pinctrl-rockchip driver, these config is not needed, > so remove them. > > Signed-off-by: David Wu <david.wu@rock-chips.com> Reviewed-by: Kever Yang <kever.yang@rock-chips.com> Thanks, - Kever > --- > > Changes in v2: None > > configs/chromebit_mickey_defconfig | 2 -- > configs/chromebook_jerry_defconfig | 2 -- > configs/chromebook_minnie_defconfig | 2 -- > configs/evb-px5_defconfig | 1 - > configs/evb-rk3128_defconfig | 1 - > configs/evb-rk3229_defconfig | 1 - > configs/evb-rk3288_defconfig | 2 -- > configs/evb-rk3399_defconfig | 1 - > configs/evb-rv1108_defconfig | 1 - > configs/fennec-rk3288_defconfig | 2 -- > configs/firefly-rk3288_defconfig | 2 -- > configs/firefly-rk3399_defconfig | 1 - > configs/geekbox_defconfig | 1 - > configs/kylin-rk3036_defconfig | 1 - > configs/lion-rk3368_defconfig | 1 - > configs/miqi-rk3288_defconfig | 2 -- > configs/phycore-rk3288_defconfig | 2 -- > configs/popmetal-rk3288_defconfig | 2 -- > configs/puma-rk3399_defconfig | 1 - > configs/rock2_defconfig | 2 -- > configs/rock_defconfig | 1 - > configs/sandbox_defconfig | 2 -- > configs/sandbox_flattree_defconfig | 2 -- > configs/sandbox_noblk_defconfig | 2 -- > configs/sheep-rk3368_defconfig | 1 - > configs/tinker-rk3288_defconfig | 2 -- > configs/vyasa-rk3288_defconfig | 2 -- > 27 files changed, 42 deletions(-) > > diff --git a/configs/chromebit_mickey_defconfig b/configs/chromebit_mickey_defconfig > index 5fbb5a4ebc..2b3e7b409a 100644 > --- a/configs/chromebit_mickey_defconfig > +++ b/configs/chromebit_mickey_defconfig > @@ -61,8 +61,6 @@ CONFIG_MMC_DW=y > CONFIG_MMC_DW_ROCKCHIP=y > CONFIG_PINCTRL=y > CONFIG_SPL_PINCTRL=y > -# CONFIG_SPL_PINCTRL_FULL is not set > -CONFIG_PINCTRL_ROCKCHIP_RK3288=y > CONFIG_DM_PMIC=y > # CONFIG_SPL_PMIC_CHILDREN is not set > CONFIG_PMIC_RK8XX=y > diff --git a/configs/chromebook_jerry_defconfig b/configs/chromebook_jerry_defconfig > index f6f0697050..d8db223e90 100644 > --- a/configs/chromebook_jerry_defconfig > +++ b/configs/chromebook_jerry_defconfig > @@ -63,8 +63,6 @@ CONFIG_MMC_DW=y > CONFIG_MMC_DW_ROCKCHIP=y > CONFIG_PINCTRL=y > CONFIG_SPL_PINCTRL=y > -# CONFIG_SPL_PINCTRL_FULL is not set > -CONFIG_PINCTRL_ROCKCHIP_RK3288=y > CONFIG_DM_PMIC=y > # CONFIG_SPL_PMIC_CHILDREN is not set > CONFIG_PMIC_RK8XX=y > diff --git a/configs/chromebook_minnie_defconfig b/configs/chromebook_minnie_defconfig > index 705a3cd0e5..ee92a22e18 100644 > --- a/configs/chromebook_minnie_defconfig > +++ b/configs/chromebook_minnie_defconfig > @@ -62,8 +62,6 @@ CONFIG_MMC_DW=y > CONFIG_MMC_DW_ROCKCHIP=y > CONFIG_PINCTRL=y > CONFIG_SPL_PINCTRL=y > -# CONFIG_SPL_PINCTRL_FULL is not set > -CONFIG_PINCTRL_ROCKCHIP_RK3288=y > CONFIG_DM_PMIC=y > # CONFIG_SPL_PMIC_CHILDREN is not set > CONFIG_PMIC_RK8XX=y > diff --git a/configs/evb-px5_defconfig b/configs/evb-px5_defconfig > index c3bda3bf3b..1d428e7ac8 100644 > --- a/configs/evb-px5_defconfig > +++ b/configs/evb-px5_defconfig > @@ -22,7 +22,6 @@ CONFIG_CLK=y > CONFIG_MMC_DW=y > CONFIG_MMC_DW_ROCKCHIP=y > CONFIG_PINCTRL=y > -CONFIG_PINCTRL_ROCKCHIP_RK3368=y > CONFIG_RAM=y > CONFIG_DEBUG_UART_SHIFT=2 > CONFIG_DEBUG_UART_ANNOUNCE=y > diff --git a/configs/evb-rk3128_defconfig b/configs/evb-rk3128_defconfig > index 044e60735a..17ad6ae58d 100644 > --- a/configs/evb-rk3128_defconfig > +++ b/configs/evb-rk3128_defconfig > @@ -31,7 +31,6 @@ CONFIG_MMC_DW=y > CONFIG_MMC_DW_ROCKCHIP=y > CONFIG_PHY=y > CONFIG_PINCTRL=y > -CONFIG_PINCTRL_ROCKCHIP_RK3128=y > CONFIG_REGULATOR_PWM=y > CONFIG_DM_REGULATOR_FIXED=y > CONFIG_RAM=y > diff --git a/configs/evb-rk3229_defconfig b/configs/evb-rk3229_defconfig > index 0cc92a3314..14ff54af20 100644 > --- a/configs/evb-rk3229_defconfig > +++ b/configs/evb-rk3229_defconfig > @@ -44,7 +44,6 @@ CONFIG_ETH_DESIGNWARE=y > CONFIG_GMAC_ROCKCHIP=y > CONFIG_PHY=y > CONFIG_PINCTRL=y > -CONFIG_PINCTRL_ROCKCHIP_RK322X=y > CONFIG_RAM=y > CONFIG_SPL_RAM=y > CONFIG_BAUDRATE=1500000 > diff --git a/configs/evb-rk3288_defconfig b/configs/evb-rk3288_defconfig > index 1485844aa6..4bf548790c 100644 > --- a/configs/evb-rk3288_defconfig > +++ b/configs/evb-rk3288_defconfig > @@ -57,8 +57,6 @@ CONFIG_ETH_DESIGNWARE=y > CONFIG_GMAC_ROCKCHIP=y > CONFIG_PINCTRL=y > CONFIG_SPL_PINCTRL=y > -# CONFIG_SPL_PINCTRL_FULL is not set > -CONFIG_PINCTRL_ROCKCHIP_RK3288=y > CONFIG_DM_PMIC=y > CONFIG_PMIC_ACT8846=y > CONFIG_REGULATOR_ACT8846=y > diff --git a/configs/evb-rk3399_defconfig b/configs/evb-rk3399_defconfig > index 27cf8304be..9746755f1e 100644 > --- a/configs/evb-rk3399_defconfig > +++ b/configs/evb-rk3399_defconfig > @@ -49,7 +49,6 @@ CONFIG_ETH_DESIGNWARE=y > CONFIG_GMAC_ROCKCHIP=y > CONFIG_PINCTRL=y > CONFIG_SPL_PINCTRL=y > -CONFIG_PINCTRL_ROCKCHIP_RK3399=y > CONFIG_DM_PMIC=y > CONFIG_PMIC_RK8XX=y > CONFIG_REGULATOR_PWM=y > diff --git a/configs/evb-rv1108_defconfig b/configs/evb-rv1108_defconfig > index 2ef041f2c5..7836a772e2 100644 > --- a/configs/evb-rv1108_defconfig > +++ b/configs/evb-rv1108_defconfig > @@ -37,7 +37,6 @@ CONFIG_DM_ETH=y > CONFIG_ETH_DESIGNWARE=y > CONFIG_GMAC_ROCKCHIP=y > CONFIG_PINCTRL=y > -CONFIG_PINCTRL_ROCKCHIP_RV1108=y > CONFIG_DM_REGULATOR_FIXED=y > CONFIG_BAUDRATE=1500000 > # CONFIG_SPL_SERIAL_PRESENT is not set > diff --git a/configs/fennec-rk3288_defconfig b/configs/fennec-rk3288_defconfig > index 8860edfd2f..be8bb086cf 100644 > --- a/configs/fennec-rk3288_defconfig > +++ b/configs/fennec-rk3288_defconfig > @@ -56,8 +56,6 @@ CONFIG_ETH_DESIGNWARE=y > CONFIG_GMAC_ROCKCHIP=y > CONFIG_PINCTRL=y > CONFIG_SPL_PINCTRL=y > -# CONFIG_SPL_PINCTRL_FULL is not set > -CONFIG_PINCTRL_ROCKCHIP_RK3288=y > CONFIG_DM_PMIC=y > CONFIG_PMIC_RK8XX=y > CONFIG_DM_REGULATOR_FIXED=y > diff --git a/configs/firefly-rk3288_defconfig b/configs/firefly-rk3288_defconfig > index b0db15ddc9..38bd54b5b8 100644 > --- a/configs/firefly-rk3288_defconfig > +++ b/configs/firefly-rk3288_defconfig > @@ -59,8 +59,6 @@ CONFIG_ETH_DESIGNWARE=y > CONFIG_GMAC_ROCKCHIP=y > CONFIG_PINCTRL=y > CONFIG_SPL_PINCTRL=y > -# CONFIG_SPL_PINCTRL_FULL is not set > -CONFIG_PINCTRL_ROCKCHIP_RK3288=y > CONFIG_DM_PMIC=y > # CONFIG_SPL_PMIC_CHILDREN is not set > CONFIG_PMIC_ACT8846=y > diff --git a/configs/firefly-rk3399_defconfig b/configs/firefly-rk3399_defconfig > index 7ac4064a8b..a5a7d81ee3 100644 > --- a/configs/firefly-rk3399_defconfig > +++ b/configs/firefly-rk3399_defconfig > @@ -49,7 +49,6 @@ CONFIG_ETH_DESIGNWARE=y > CONFIG_GMAC_ROCKCHIP=y > CONFIG_PINCTRL=y > CONFIG_SPL_PINCTRL=y > -CONFIG_PINCTRL_ROCKCHIP_RK3399=y > CONFIG_DM_PMIC=y > CONFIG_PMIC_RK8XX=y > CONFIG_REGULATOR_PWM=y > diff --git a/configs/geekbox_defconfig b/configs/geekbox_defconfig > index bbf7b004ce..d42a451083 100644 > --- a/configs/geekbox_defconfig > +++ b/configs/geekbox_defconfig > @@ -16,7 +16,6 @@ CONFIG_REGMAP=y > CONFIG_SYSCON=y > CONFIG_CLK=y > CONFIG_PINCTRL=y > -CONFIG_PINCTRL_ROCKCHIP_RK3368=y > CONFIG_RAM=y > CONFIG_DEBUG_UART_SHIFT=2 > CONFIG_DEBUG_UART_ANNOUNCE=y > diff --git a/configs/kylin-rk3036_defconfig b/configs/kylin-rk3036_defconfig > index 765003095c..30a570f1be 100644 > --- a/configs/kylin-rk3036_defconfig > +++ b/configs/kylin-rk3036_defconfig > @@ -41,7 +41,6 @@ CONFIG_LED=y > CONFIG_MMC_DW=y > CONFIG_MMC_DW_ROCKCHIP=y > CONFIG_PINCTRL=y > -CONFIG_PINCTRL_ROCKCHIP_RK3036=y > CONFIG_DM_REGULATOR_FIXED=y > # CONFIG_SPL_DM_SERIAL is not set > CONFIG_SYSRESET=y > diff --git a/configs/lion-rk3368_defconfig b/configs/lion-rk3368_defconfig > index 2b61922ff5..d6dd0e5106 100644 > --- a/configs/lion-rk3368_defconfig > +++ b/configs/lion-rk3368_defconfig > @@ -79,7 +79,6 @@ CONFIG_RGMII=y > CONFIG_GMAC_ROCKCHIP=y > CONFIG_PINCTRL=y > CONFIG_SPL_PINCTRL=y > -CONFIG_PINCTRL_ROCKCHIP_RK3368=y > CONFIG_DM_PMIC=y > CONFIG_PMIC_RK8XX=y > CONFIG_DM_REGULATOR_FIXED=y > diff --git a/configs/miqi-rk3288_defconfig b/configs/miqi-rk3288_defconfig > index f650a720c7..970e672493 100644 > --- a/configs/miqi-rk3288_defconfig > +++ b/configs/miqi-rk3288_defconfig > @@ -56,8 +56,6 @@ CONFIG_ETH_DESIGNWARE=y > CONFIG_GMAC_ROCKCHIP=y > CONFIG_PINCTRL=y > CONFIG_SPL_PINCTRL=y > -# CONFIG_SPL_PINCTRL_FULL is not set > -CONFIG_PINCTRL_ROCKCHIP_RK3288=y > CONFIG_DM_PMIC=y > CONFIG_PMIC_ACT8846=y > CONFIG_REGULATOR_ACT8846=y > diff --git a/configs/phycore-rk3288_defconfig b/configs/phycore-rk3288_defconfig > index ef7abddbf1..71205f4c7b 100644 > --- a/configs/phycore-rk3288_defconfig > +++ b/configs/phycore-rk3288_defconfig > @@ -60,8 +60,6 @@ CONFIG_ETH_DESIGNWARE=y > CONFIG_GMAC_ROCKCHIP=y > CONFIG_PINCTRL=y > CONFIG_SPL_PINCTRL=y > -# CONFIG_SPL_PINCTRL_FULL is not set > -CONFIG_PINCTRL_ROCKCHIP_RK3288=y > CONFIG_DM_PMIC=y > CONFIG_PMIC_RK8XX=y > CONFIG_DM_REGULATOR_FIXED=y > diff --git a/configs/popmetal-rk3288_defconfig b/configs/popmetal-rk3288_defconfig > index 0e10d1a225..bee7f719a3 100644 > --- a/configs/popmetal-rk3288_defconfig > +++ b/configs/popmetal-rk3288_defconfig > @@ -56,8 +56,6 @@ CONFIG_ETH_DESIGNWARE=y > CONFIG_GMAC_ROCKCHIP=y > CONFIG_PINCTRL=y > CONFIG_SPL_PINCTRL=y > -# CONFIG_SPL_PINCTRL_FULL is not set > -CONFIG_PINCTRL_ROCKCHIP_RK3288=y > CONFIG_DM_PMIC=y > CONFIG_PMIC_RK8XX=y > CONFIG_DM_REGULATOR_FIXED=y > diff --git a/configs/puma-rk3399_defconfig b/configs/puma-rk3399_defconfig > index a45a34be31..9f1a1f1483 100644 > --- a/configs/puma-rk3399_defconfig > +++ b/configs/puma-rk3399_defconfig > @@ -74,7 +74,6 @@ CONFIG_ETH_DESIGNWARE=y > CONFIG_GMAC_ROCKCHIP=y > CONFIG_PINCTRL=y > CONFIG_SPL_PINCTRL=y > -CONFIG_PINCTRL_ROCKCHIP_RK3399=y > CONFIG_DM_PMIC=y > CONFIG_DM_PMIC_FAN53555=y > CONFIG_PMIC_RK8XX=y > diff --git a/configs/rock2_defconfig b/configs/rock2_defconfig > index 6289506bdd..d0099748b2 100644 > --- a/configs/rock2_defconfig > +++ b/configs/rock2_defconfig > @@ -56,8 +56,6 @@ CONFIG_ETH_DESIGNWARE=y > CONFIG_GMAC_ROCKCHIP=y > CONFIG_PINCTRL=y > CONFIG_SPL_PINCTRL=y > -# CONFIG_SPL_PINCTRL_FULL is not set > -CONFIG_PINCTRL_ROCKCHIP_RK3288=y > CONFIG_DM_PMIC=y > # CONFIG_SPL_PMIC_CHILDREN is not set > CONFIG_PMIC_ACT8846=y > diff --git a/configs/rock_defconfig b/configs/rock_defconfig > index 0c41ac9f20..36e35eb65d 100644 > --- a/configs/rock_defconfig > +++ b/configs/rock_defconfig > @@ -41,7 +41,6 @@ CONFIG_LED=y > CONFIG_MMC_DW=y > CONFIG_MMC_DW_ROCKCHIP=y > CONFIG_PINCTRL=y > -CONFIG_PINCTRL_ROCKCHIP_RK3188=y > CONFIG_DM_PMIC=y > # CONFIG_SPL_PMIC_CHILDREN is not set > CONFIG_PMIC_ACT8846=y > diff --git a/configs/sandbox_defconfig b/configs/sandbox_defconfig > index 1e7d41d19e..e0101cb681 100644 > --- a/configs/sandbox_defconfig > +++ b/configs/sandbox_defconfig > @@ -142,8 +142,6 @@ CONFIG_PHY=y > CONFIG_PHY_SANDBOX=y > CONFIG_PINCTRL=y > CONFIG_PINCONF=y > -CONFIG_PINCTRL_ROCKCHIP_RK3036=y > -CONFIG_PINCTRL_ROCKCHIP_RK3288=y > CONFIG_PINCTRL_SANDBOX=y > CONFIG_POWER_DOMAIN=y > CONFIG_SANDBOX_POWER_DOMAIN=y > diff --git a/configs/sandbox_flattree_defconfig b/configs/sandbox_flattree_defconfig > index 4f3757c8bc..18209708a4 100644 > --- a/configs/sandbox_flattree_defconfig > +++ b/configs/sandbox_flattree_defconfig > @@ -119,8 +119,6 @@ CONFIG_PHY=y > CONFIG_PHY_SANDBOX=y > CONFIG_PINCTRL=y > CONFIG_PINCONF=y > -CONFIG_PINCTRL_ROCKCHIP_RK3036=y > -CONFIG_PINCTRL_ROCKCHIP_RK3288=y > CONFIG_PINCTRL_SANDBOX=y > CONFIG_POWER_DOMAIN=y > CONFIG_SANDBOX_POWER_DOMAIN=y > diff --git a/configs/sandbox_noblk_defconfig b/configs/sandbox_noblk_defconfig > index 6c7d08e42e..21c49769d8 100644 > --- a/configs/sandbox_noblk_defconfig > +++ b/configs/sandbox_noblk_defconfig > @@ -121,8 +121,6 @@ CONFIG_PHY=y > CONFIG_PHY_SANDBOX=y > CONFIG_PINCTRL=y > CONFIG_PINCONF=y > -CONFIG_PINCTRL_ROCKCHIP_RK3036=y > -CONFIG_PINCTRL_ROCKCHIP_RK3288=y > CONFIG_PINCTRL_SANDBOX=y > CONFIG_DM_PMIC=y > CONFIG_PMIC_ACT8846=y > diff --git a/configs/sheep-rk3368_defconfig b/configs/sheep-rk3368_defconfig > index 23e653d660..aac2243208 100644 > --- a/configs/sheep-rk3368_defconfig > +++ b/configs/sheep-rk3368_defconfig > @@ -20,7 +20,6 @@ CONFIG_CLK=y > CONFIG_MMC_DW=y > CONFIG_MMC_DW_ROCKCHIP=y > CONFIG_PINCTRL=y > -CONFIG_PINCTRL_ROCKCHIP_RK3368=y > CONFIG_RAM=y > CONFIG_DEBUG_UART_SHIFT=2 > CONFIG_DEBUG_UART_ANNOUNCE=y > diff --git a/configs/tinker-rk3288_defconfig b/configs/tinker-rk3288_defconfig > index 5a69a68384..ee5bf9baab 100644 > --- a/configs/tinker-rk3288_defconfig > +++ b/configs/tinker-rk3288_defconfig > @@ -59,8 +59,6 @@ CONFIG_ETH_DESIGNWARE=y > CONFIG_GMAC_ROCKCHIP=y > CONFIG_PINCTRL=y > CONFIG_SPL_PINCTRL=y > -# CONFIG_SPL_PINCTRL_FULL is not set > -CONFIG_PINCTRL_ROCKCHIP_RK3288=y > CONFIG_DM_PMIC=y > CONFIG_PMIC_RK8XX=y > CONFIG_DM_REGULATOR_FIXED=y > diff --git a/configs/vyasa-rk3288_defconfig b/configs/vyasa-rk3288_defconfig > index b23cd6a236..358e8354dd 100644 > --- a/configs/vyasa-rk3288_defconfig > +++ b/configs/vyasa-rk3288_defconfig > @@ -54,8 +54,6 @@ CONFIG_ETH_DESIGNWARE=y > CONFIG_GMAC_ROCKCHIP=y > CONFIG_PINCTRL=y > CONFIG_SPL_PINCTRL=y > -# CONFIG_SPL_PINCTRL_FULL is not set > -CONFIG_PINCTRL_ROCKCHIP_RK3288=y > CONFIG_DM_PMIC=y > # CONFIG_SPL_PMIC_CHILDREN is not set > CONFIG_PMIC_RK8XX=y
> If we used the pinctrl-rockchip driver, these config is not needed, > so remove them. > > Signed-off-by: David Wu <david.wu@rock-chips.com> > Reviewed-by: Kever Yang <kever.yang@rock-chips.com> > --- > > Changes in v2: None > > configs/chromebit_mickey_defconfig | 2 -- > configs/chromebook_jerry_defconfig | 2 -- > configs/chromebook_minnie_defconfig | 2 -- > configs/evb-px5_defconfig | 1 - > configs/evb-rk3128_defconfig | 1 - > configs/evb-rk3229_defconfig | 1 - > configs/evb-rk3288_defconfig | 2 -- > configs/evb-rk3399_defconfig | 1 - > configs/evb-rv1108_defconfig | 1 - > configs/fennec-rk3288_defconfig | 2 -- > configs/firefly-rk3288_defconfig | 2 -- > configs/firefly-rk3399_defconfig | 1 - > configs/geekbox_defconfig | 1 - > configs/kylin-rk3036_defconfig | 1 - > configs/lion-rk3368_defconfig | 1 - > configs/miqi-rk3288_defconfig | 2 -- > configs/phycore-rk3288_defconfig | 2 -- > configs/popmetal-rk3288_defconfig | 2 -- > configs/puma-rk3399_defconfig | 1 - > configs/rock2_defconfig | 2 -- > configs/rock_defconfig | 1 - > configs/sandbox_defconfig | 2 -- > configs/sandbox_flattree_defconfig | 2 -- > configs/sandbox_noblk_defconfig | 2 -- > configs/sheep-rk3368_defconfig | 1 - > configs/tinker-rk3288_defconfig | 2 -- > configs/vyasa-rk3288_defconfig | 2 -- > 27 files changed, 42 deletions(-) > Reviewed-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
> If we used the pinctrl-rockchip driver, these config is not needed, > so remove them. > > Signed-off-by: David Wu <david.wu@rock-chips.com> > Reviewed-by: Kever Yang <kever.yang@rock-chips.com> > --- > > Changes in v2: None > > configs/chromebit_mickey_defconfig | 2 -- > configs/chromebook_jerry_defconfig | 2 -- > configs/chromebook_minnie_defconfig | 2 -- > configs/evb-px5_defconfig | 1 - > configs/evb-rk3128_defconfig | 1 - > configs/evb-rk3229_defconfig | 1 - > configs/evb-rk3288_defconfig | 2 -- > configs/evb-rk3399_defconfig | 1 - > configs/evb-rv1108_defconfig | 1 - > configs/fennec-rk3288_defconfig | 2 -- > configs/firefly-rk3288_defconfig | 2 -- > configs/firefly-rk3399_defconfig | 1 - > configs/geekbox_defconfig | 1 - > configs/kylin-rk3036_defconfig | 1 - > configs/lion-rk3368_defconfig | 1 - > configs/miqi-rk3288_defconfig | 2 -- > configs/phycore-rk3288_defconfig | 2 -- > configs/popmetal-rk3288_defconfig | 2 -- > configs/puma-rk3399_defconfig | 1 - > configs/rock2_defconfig | 2 -- > configs/rock_defconfig | 1 - > configs/sandbox_defconfig | 2 -- > configs/sandbox_flattree_defconfig | 2 -- > configs/sandbox_noblk_defconfig | 2 -- > configs/sheep-rk3368_defconfig | 1 - > configs/tinker-rk3288_defconfig | 2 -- > configs/vyasa-rk3288_defconfig | 2 -- > 27 files changed, 42 deletions(-) > Applied to u-boot-rockchip, thanks!
Hi Philipp, On Thu, 31 Jan 2019 22:12:36 +0100 Philipp Tomsich <philipp.tomsich@theobroma-systems.com> wrote: > > If we used the pinctrl-rockchip driver, these config is not needed, > > so remove them. > > > > Signed-off-by: David Wu <david.wu@rock-chips.com> > > Reviewed-by: Kever Yang <kever.yang@rock-chips.com> > > --- > > > > Changes in v2: None > > > > configs/chromebit_mickey_defconfig | 2 -- > > configs/chromebook_jerry_defconfig | 2 -- > > configs/chromebook_minnie_defconfig | 2 -- > > configs/evb-px5_defconfig | 1 - > > configs/evb-rk3128_defconfig | 1 - > > configs/evb-rk3229_defconfig | 1 - > > configs/evb-rk3288_defconfig | 2 -- > > configs/evb-rk3399_defconfig | 1 - > > configs/evb-rv1108_defconfig | 1 - > > configs/fennec-rk3288_defconfig | 2 -- > > configs/firefly-rk3288_defconfig | 2 -- > > configs/firefly-rk3399_defconfig | 1 - > > configs/geekbox_defconfig | 1 - > > configs/kylin-rk3036_defconfig | 1 - > > configs/lion-rk3368_defconfig | 1 - > > configs/miqi-rk3288_defconfig | 2 -- > > configs/phycore-rk3288_defconfig | 2 -- > > configs/popmetal-rk3288_defconfig | 2 -- > > configs/puma-rk3399_defconfig | 1 - > > configs/rock2_defconfig | 2 -- > > configs/rock_defconfig | 1 - > > configs/sandbox_defconfig | 2 -- > > configs/sandbox_flattree_defconfig | 2 -- > > configs/sandbox_noblk_defconfig | 2 -- > > configs/sheep-rk3368_defconfig | 1 - > > configs/tinker-rk3288_defconfig | 2 -- > > configs/vyasa-rk3288_defconfig | 2 -- > > 27 files changed, 42 deletions(-) > > > > Applied to u-boot-rockchip, thanks! Looks like you also added some .rej files (see [1]). This cause some problem each time we run make clean as it delete the files etc ... [1] : http://git.denx.de/?p=u-boot.git;a=commit;h=2ec3d25f8faab51c2334174a582a96ad28d96344
Emmanuel, Thanks for the heads-up. The follow-on PR is already on the list (+ an additional patch to include these in .gitignore). Thanks, Phil. > On 05.02.2019, at 11:49, Emmanuel Vadot <manu@bidouilliste.com> wrote: > > > Hi Philipp, > > On Thu, 31 Jan 2019 22:12:36 +0100 > Philipp Tomsich <philipp.tomsich@theobroma-systems.com> wrote: > >>> If we used the pinctrl-rockchip driver, these config is not needed, >>> so remove them. >>> >>> Signed-off-by: David Wu <david.wu@rock-chips.com> >>> Reviewed-by: Kever Yang <kever.yang@rock-chips.com> >>> --- >>> >>> Changes in v2: None >>> >>> configs/chromebit_mickey_defconfig | 2 -- >>> configs/chromebook_jerry_defconfig | 2 -- >>> configs/chromebook_minnie_defconfig | 2 -- >>> configs/evb-px5_defconfig | 1 - >>> configs/evb-rk3128_defconfig | 1 - >>> configs/evb-rk3229_defconfig | 1 - >>> configs/evb-rk3288_defconfig | 2 -- >>> configs/evb-rk3399_defconfig | 1 - >>> configs/evb-rv1108_defconfig | 1 - >>> configs/fennec-rk3288_defconfig | 2 -- >>> configs/firefly-rk3288_defconfig | 2 -- >>> configs/firefly-rk3399_defconfig | 1 - >>> configs/geekbox_defconfig | 1 - >>> configs/kylin-rk3036_defconfig | 1 - >>> configs/lion-rk3368_defconfig | 1 - >>> configs/miqi-rk3288_defconfig | 2 -- >>> configs/phycore-rk3288_defconfig | 2 -- >>> configs/popmetal-rk3288_defconfig | 2 -- >>> configs/puma-rk3399_defconfig | 1 - >>> configs/rock2_defconfig | 2 -- >>> configs/rock_defconfig | 1 - >>> configs/sandbox_defconfig | 2 -- >>> configs/sandbox_flattree_defconfig | 2 -- >>> configs/sandbox_noblk_defconfig | 2 -- >>> configs/sheep-rk3368_defconfig | 1 - >>> configs/tinker-rk3288_defconfig | 2 -- >>> configs/vyasa-rk3288_defconfig | 2 -- >>> 27 files changed, 42 deletions(-) >>> >> >> Applied to u-boot-rockchip, thanks! > > Looks like you also added some .rej files (see [1]). > > This cause some problem each time we run make clean as it delete the > files etc ... > > [1] : > http://git.denx.de/?p=u-boot.git;a=commit;h=2ec3d25f8faab51c2334174a582a96ad28d96344 > > > -- > Emmanuel Vadot <manu@bidouilliste.com> <manu@freebsd.org>
diff --git a/configs/chromebit_mickey_defconfig b/configs/chromebit_mickey_defconfig index 5fbb5a4ebc..2b3e7b409a 100644 --- a/configs/chromebit_mickey_defconfig +++ b/configs/chromebit_mickey_defconfig @@ -61,8 +61,6 @@ CONFIG_MMC_DW=y CONFIG_MMC_DW_ROCKCHIP=y CONFIG_PINCTRL=y CONFIG_SPL_PINCTRL=y -# CONFIG_SPL_PINCTRL_FULL is not set -CONFIG_PINCTRL_ROCKCHIP_RK3288=y CONFIG_DM_PMIC=y # CONFIG_SPL_PMIC_CHILDREN is not set CONFIG_PMIC_RK8XX=y diff --git a/configs/chromebook_jerry_defconfig b/configs/chromebook_jerry_defconfig index f6f0697050..d8db223e90 100644 --- a/configs/chromebook_jerry_defconfig +++ b/configs/chromebook_jerry_defconfig @@ -63,8 +63,6 @@ CONFIG_MMC_DW=y CONFIG_MMC_DW_ROCKCHIP=y CONFIG_PINCTRL=y CONFIG_SPL_PINCTRL=y -# CONFIG_SPL_PINCTRL_FULL is not set -CONFIG_PINCTRL_ROCKCHIP_RK3288=y CONFIG_DM_PMIC=y # CONFIG_SPL_PMIC_CHILDREN is not set CONFIG_PMIC_RK8XX=y diff --git a/configs/chromebook_minnie_defconfig b/configs/chromebook_minnie_defconfig index 705a3cd0e5..ee92a22e18 100644 --- a/configs/chromebook_minnie_defconfig +++ b/configs/chromebook_minnie_defconfig @@ -62,8 +62,6 @@ CONFIG_MMC_DW=y CONFIG_MMC_DW_ROCKCHIP=y CONFIG_PINCTRL=y CONFIG_SPL_PINCTRL=y -# CONFIG_SPL_PINCTRL_FULL is not set -CONFIG_PINCTRL_ROCKCHIP_RK3288=y CONFIG_DM_PMIC=y # CONFIG_SPL_PMIC_CHILDREN is not set CONFIG_PMIC_RK8XX=y diff --git a/configs/evb-px5_defconfig b/configs/evb-px5_defconfig index c3bda3bf3b..1d428e7ac8 100644 --- a/configs/evb-px5_defconfig +++ b/configs/evb-px5_defconfig @@ -22,7 +22,6 @@ CONFIG_CLK=y CONFIG_MMC_DW=y CONFIG_MMC_DW_ROCKCHIP=y CONFIG_PINCTRL=y -CONFIG_PINCTRL_ROCKCHIP_RK3368=y CONFIG_RAM=y CONFIG_DEBUG_UART_SHIFT=2 CONFIG_DEBUG_UART_ANNOUNCE=y diff --git a/configs/evb-rk3128_defconfig b/configs/evb-rk3128_defconfig index 044e60735a..17ad6ae58d 100644 --- a/configs/evb-rk3128_defconfig +++ b/configs/evb-rk3128_defconfig @@ -31,7 +31,6 @@ CONFIG_MMC_DW=y CONFIG_MMC_DW_ROCKCHIP=y CONFIG_PHY=y CONFIG_PINCTRL=y -CONFIG_PINCTRL_ROCKCHIP_RK3128=y CONFIG_REGULATOR_PWM=y CONFIG_DM_REGULATOR_FIXED=y CONFIG_RAM=y diff --git a/configs/evb-rk3229_defconfig b/configs/evb-rk3229_defconfig index 0cc92a3314..14ff54af20 100644 --- a/configs/evb-rk3229_defconfig +++ b/configs/evb-rk3229_defconfig @@ -44,7 +44,6 @@ CONFIG_ETH_DESIGNWARE=y CONFIG_GMAC_ROCKCHIP=y CONFIG_PHY=y CONFIG_PINCTRL=y -CONFIG_PINCTRL_ROCKCHIP_RK322X=y CONFIG_RAM=y CONFIG_SPL_RAM=y CONFIG_BAUDRATE=1500000 diff --git a/configs/evb-rk3288_defconfig b/configs/evb-rk3288_defconfig index 1485844aa6..4bf548790c 100644 --- a/configs/evb-rk3288_defconfig +++ b/configs/evb-rk3288_defconfig @@ -57,8 +57,6 @@ CONFIG_ETH_DESIGNWARE=y CONFIG_GMAC_ROCKCHIP=y CONFIG_PINCTRL=y CONFIG_SPL_PINCTRL=y -# CONFIG_SPL_PINCTRL_FULL is not set -CONFIG_PINCTRL_ROCKCHIP_RK3288=y CONFIG_DM_PMIC=y CONFIG_PMIC_ACT8846=y CONFIG_REGULATOR_ACT8846=y diff --git a/configs/evb-rk3399_defconfig b/configs/evb-rk3399_defconfig index 27cf8304be..9746755f1e 100644 --- a/configs/evb-rk3399_defconfig +++ b/configs/evb-rk3399_defconfig @@ -49,7 +49,6 @@ CONFIG_ETH_DESIGNWARE=y CONFIG_GMAC_ROCKCHIP=y CONFIG_PINCTRL=y CONFIG_SPL_PINCTRL=y -CONFIG_PINCTRL_ROCKCHIP_RK3399=y CONFIG_DM_PMIC=y CONFIG_PMIC_RK8XX=y CONFIG_REGULATOR_PWM=y diff --git a/configs/evb-rv1108_defconfig b/configs/evb-rv1108_defconfig index 2ef041f2c5..7836a772e2 100644 --- a/configs/evb-rv1108_defconfig +++ b/configs/evb-rv1108_defconfig @@ -37,7 +37,6 @@ CONFIG_DM_ETH=y CONFIG_ETH_DESIGNWARE=y CONFIG_GMAC_ROCKCHIP=y CONFIG_PINCTRL=y -CONFIG_PINCTRL_ROCKCHIP_RV1108=y CONFIG_DM_REGULATOR_FIXED=y CONFIG_BAUDRATE=1500000 # CONFIG_SPL_SERIAL_PRESENT is not set diff --git a/configs/fennec-rk3288_defconfig b/configs/fennec-rk3288_defconfig index 8860edfd2f..be8bb086cf 100644 --- a/configs/fennec-rk3288_defconfig +++ b/configs/fennec-rk3288_defconfig @@ -56,8 +56,6 @@ CONFIG_ETH_DESIGNWARE=y CONFIG_GMAC_ROCKCHIP=y CONFIG_PINCTRL=y CONFIG_SPL_PINCTRL=y -# CONFIG_SPL_PINCTRL_FULL is not set -CONFIG_PINCTRL_ROCKCHIP_RK3288=y CONFIG_DM_PMIC=y CONFIG_PMIC_RK8XX=y CONFIG_DM_REGULATOR_FIXED=y diff --git a/configs/firefly-rk3288_defconfig b/configs/firefly-rk3288_defconfig index b0db15ddc9..38bd54b5b8 100644 --- a/configs/firefly-rk3288_defconfig +++ b/configs/firefly-rk3288_defconfig @@ -59,8 +59,6 @@ CONFIG_ETH_DESIGNWARE=y CONFIG_GMAC_ROCKCHIP=y CONFIG_PINCTRL=y CONFIG_SPL_PINCTRL=y -# CONFIG_SPL_PINCTRL_FULL is not set -CONFIG_PINCTRL_ROCKCHIP_RK3288=y CONFIG_DM_PMIC=y # CONFIG_SPL_PMIC_CHILDREN is not set CONFIG_PMIC_ACT8846=y diff --git a/configs/firefly-rk3399_defconfig b/configs/firefly-rk3399_defconfig index 7ac4064a8b..a5a7d81ee3 100644 --- a/configs/firefly-rk3399_defconfig +++ b/configs/firefly-rk3399_defconfig @@ -49,7 +49,6 @@ CONFIG_ETH_DESIGNWARE=y CONFIG_GMAC_ROCKCHIP=y CONFIG_PINCTRL=y CONFIG_SPL_PINCTRL=y -CONFIG_PINCTRL_ROCKCHIP_RK3399=y CONFIG_DM_PMIC=y CONFIG_PMIC_RK8XX=y CONFIG_REGULATOR_PWM=y diff --git a/configs/geekbox_defconfig b/configs/geekbox_defconfig index bbf7b004ce..d42a451083 100644 --- a/configs/geekbox_defconfig +++ b/configs/geekbox_defconfig @@ -16,7 +16,6 @@ CONFIG_REGMAP=y CONFIG_SYSCON=y CONFIG_CLK=y CONFIG_PINCTRL=y -CONFIG_PINCTRL_ROCKCHIP_RK3368=y CONFIG_RAM=y CONFIG_DEBUG_UART_SHIFT=2 CONFIG_DEBUG_UART_ANNOUNCE=y diff --git a/configs/kylin-rk3036_defconfig b/configs/kylin-rk3036_defconfig index 765003095c..30a570f1be 100644 --- a/configs/kylin-rk3036_defconfig +++ b/configs/kylin-rk3036_defconfig @@ -41,7 +41,6 @@ CONFIG_LED=y CONFIG_MMC_DW=y CONFIG_MMC_DW_ROCKCHIP=y CONFIG_PINCTRL=y -CONFIG_PINCTRL_ROCKCHIP_RK3036=y CONFIG_DM_REGULATOR_FIXED=y # CONFIG_SPL_DM_SERIAL is not set CONFIG_SYSRESET=y diff --git a/configs/lion-rk3368_defconfig b/configs/lion-rk3368_defconfig index 2b61922ff5..d6dd0e5106 100644 --- a/configs/lion-rk3368_defconfig +++ b/configs/lion-rk3368_defconfig @@ -79,7 +79,6 @@ CONFIG_RGMII=y CONFIG_GMAC_ROCKCHIP=y CONFIG_PINCTRL=y CONFIG_SPL_PINCTRL=y -CONFIG_PINCTRL_ROCKCHIP_RK3368=y CONFIG_DM_PMIC=y CONFIG_PMIC_RK8XX=y CONFIG_DM_REGULATOR_FIXED=y diff --git a/configs/miqi-rk3288_defconfig b/configs/miqi-rk3288_defconfig index f650a720c7..970e672493 100644 --- a/configs/miqi-rk3288_defconfig +++ b/configs/miqi-rk3288_defconfig @@ -56,8 +56,6 @@ CONFIG_ETH_DESIGNWARE=y CONFIG_GMAC_ROCKCHIP=y CONFIG_PINCTRL=y CONFIG_SPL_PINCTRL=y -# CONFIG_SPL_PINCTRL_FULL is not set -CONFIG_PINCTRL_ROCKCHIP_RK3288=y CONFIG_DM_PMIC=y CONFIG_PMIC_ACT8846=y CONFIG_REGULATOR_ACT8846=y diff --git a/configs/phycore-rk3288_defconfig b/configs/phycore-rk3288_defconfig index ef7abddbf1..71205f4c7b 100644 --- a/configs/phycore-rk3288_defconfig +++ b/configs/phycore-rk3288_defconfig @@ -60,8 +60,6 @@ CONFIG_ETH_DESIGNWARE=y CONFIG_GMAC_ROCKCHIP=y CONFIG_PINCTRL=y CONFIG_SPL_PINCTRL=y -# CONFIG_SPL_PINCTRL_FULL is not set -CONFIG_PINCTRL_ROCKCHIP_RK3288=y CONFIG_DM_PMIC=y CONFIG_PMIC_RK8XX=y CONFIG_DM_REGULATOR_FIXED=y diff --git a/configs/popmetal-rk3288_defconfig b/configs/popmetal-rk3288_defconfig index 0e10d1a225..bee7f719a3 100644 --- a/configs/popmetal-rk3288_defconfig +++ b/configs/popmetal-rk3288_defconfig @@ -56,8 +56,6 @@ CONFIG_ETH_DESIGNWARE=y CONFIG_GMAC_ROCKCHIP=y CONFIG_PINCTRL=y CONFIG_SPL_PINCTRL=y -# CONFIG_SPL_PINCTRL_FULL is not set -CONFIG_PINCTRL_ROCKCHIP_RK3288=y CONFIG_DM_PMIC=y CONFIG_PMIC_RK8XX=y CONFIG_DM_REGULATOR_FIXED=y diff --git a/configs/puma-rk3399_defconfig b/configs/puma-rk3399_defconfig index a45a34be31..9f1a1f1483 100644 --- a/configs/puma-rk3399_defconfig +++ b/configs/puma-rk3399_defconfig @@ -74,7 +74,6 @@ CONFIG_ETH_DESIGNWARE=y CONFIG_GMAC_ROCKCHIP=y CONFIG_PINCTRL=y CONFIG_SPL_PINCTRL=y -CONFIG_PINCTRL_ROCKCHIP_RK3399=y CONFIG_DM_PMIC=y CONFIG_DM_PMIC_FAN53555=y CONFIG_PMIC_RK8XX=y diff --git a/configs/rock2_defconfig b/configs/rock2_defconfig index 6289506bdd..d0099748b2 100644 --- a/configs/rock2_defconfig +++ b/configs/rock2_defconfig @@ -56,8 +56,6 @@ CONFIG_ETH_DESIGNWARE=y CONFIG_GMAC_ROCKCHIP=y CONFIG_PINCTRL=y CONFIG_SPL_PINCTRL=y -# CONFIG_SPL_PINCTRL_FULL is not set -CONFIG_PINCTRL_ROCKCHIP_RK3288=y CONFIG_DM_PMIC=y # CONFIG_SPL_PMIC_CHILDREN is not set CONFIG_PMIC_ACT8846=y diff --git a/configs/rock_defconfig b/configs/rock_defconfig index 0c41ac9f20..36e35eb65d 100644 --- a/configs/rock_defconfig +++ b/configs/rock_defconfig @@ -41,7 +41,6 @@ CONFIG_LED=y CONFIG_MMC_DW=y CONFIG_MMC_DW_ROCKCHIP=y CONFIG_PINCTRL=y -CONFIG_PINCTRL_ROCKCHIP_RK3188=y CONFIG_DM_PMIC=y # CONFIG_SPL_PMIC_CHILDREN is not set CONFIG_PMIC_ACT8846=y diff --git a/configs/sandbox_defconfig b/configs/sandbox_defconfig index 1e7d41d19e..e0101cb681 100644 --- a/configs/sandbox_defconfig +++ b/configs/sandbox_defconfig @@ -142,8 +142,6 @@ CONFIG_PHY=y CONFIG_PHY_SANDBOX=y CONFIG_PINCTRL=y CONFIG_PINCONF=y -CONFIG_PINCTRL_ROCKCHIP_RK3036=y -CONFIG_PINCTRL_ROCKCHIP_RK3288=y CONFIG_PINCTRL_SANDBOX=y CONFIG_POWER_DOMAIN=y CONFIG_SANDBOX_POWER_DOMAIN=y diff --git a/configs/sandbox_flattree_defconfig b/configs/sandbox_flattree_defconfig index 4f3757c8bc..18209708a4 100644 --- a/configs/sandbox_flattree_defconfig +++ b/configs/sandbox_flattree_defconfig @@ -119,8 +119,6 @@ CONFIG_PHY=y CONFIG_PHY_SANDBOX=y CONFIG_PINCTRL=y CONFIG_PINCONF=y -CONFIG_PINCTRL_ROCKCHIP_RK3036=y -CONFIG_PINCTRL_ROCKCHIP_RK3288=y CONFIG_PINCTRL_SANDBOX=y CONFIG_POWER_DOMAIN=y CONFIG_SANDBOX_POWER_DOMAIN=y diff --git a/configs/sandbox_noblk_defconfig b/configs/sandbox_noblk_defconfig index 6c7d08e42e..21c49769d8 100644 --- a/configs/sandbox_noblk_defconfig +++ b/configs/sandbox_noblk_defconfig @@ -121,8 +121,6 @@ CONFIG_PHY=y CONFIG_PHY_SANDBOX=y CONFIG_PINCTRL=y CONFIG_PINCONF=y -CONFIG_PINCTRL_ROCKCHIP_RK3036=y -CONFIG_PINCTRL_ROCKCHIP_RK3288=y CONFIG_PINCTRL_SANDBOX=y CONFIG_DM_PMIC=y CONFIG_PMIC_ACT8846=y diff --git a/configs/sheep-rk3368_defconfig b/configs/sheep-rk3368_defconfig index 23e653d660..aac2243208 100644 --- a/configs/sheep-rk3368_defconfig +++ b/configs/sheep-rk3368_defconfig @@ -20,7 +20,6 @@ CONFIG_CLK=y CONFIG_MMC_DW=y CONFIG_MMC_DW_ROCKCHIP=y CONFIG_PINCTRL=y -CONFIG_PINCTRL_ROCKCHIP_RK3368=y CONFIG_RAM=y CONFIG_DEBUG_UART_SHIFT=2 CONFIG_DEBUG_UART_ANNOUNCE=y diff --git a/configs/tinker-rk3288_defconfig b/configs/tinker-rk3288_defconfig index 5a69a68384..ee5bf9baab 100644 --- a/configs/tinker-rk3288_defconfig +++ b/configs/tinker-rk3288_defconfig @@ -59,8 +59,6 @@ CONFIG_ETH_DESIGNWARE=y CONFIG_GMAC_ROCKCHIP=y CONFIG_PINCTRL=y CONFIG_SPL_PINCTRL=y -# CONFIG_SPL_PINCTRL_FULL is not set -CONFIG_PINCTRL_ROCKCHIP_RK3288=y CONFIG_DM_PMIC=y CONFIG_PMIC_RK8XX=y CONFIG_DM_REGULATOR_FIXED=y diff --git a/configs/vyasa-rk3288_defconfig b/configs/vyasa-rk3288_defconfig index b23cd6a236..358e8354dd 100644 --- a/configs/vyasa-rk3288_defconfig +++ b/configs/vyasa-rk3288_defconfig @@ -54,8 +54,6 @@ CONFIG_ETH_DESIGNWARE=y CONFIG_GMAC_ROCKCHIP=y CONFIG_PINCTRL=y CONFIG_SPL_PINCTRL=y -# CONFIG_SPL_PINCTRL_FULL is not set -CONFIG_PINCTRL_ROCKCHIP_RK3288=y CONFIG_DM_PMIC=y # CONFIG_SPL_PMIC_CHILDREN is not set CONFIG_PMIC_RK8XX=y
If we used the pinctrl-rockchip driver, these config is not needed, so remove them. Signed-off-by: David Wu <david.wu@rock-chips.com> --- Changes in v2: None configs/chromebit_mickey_defconfig | 2 -- configs/chromebook_jerry_defconfig | 2 -- configs/chromebook_minnie_defconfig | 2 -- configs/evb-px5_defconfig | 1 - configs/evb-rk3128_defconfig | 1 - configs/evb-rk3229_defconfig | 1 - configs/evb-rk3288_defconfig | 2 -- configs/evb-rk3399_defconfig | 1 - configs/evb-rv1108_defconfig | 1 - configs/fennec-rk3288_defconfig | 2 -- configs/firefly-rk3288_defconfig | 2 -- configs/firefly-rk3399_defconfig | 1 - configs/geekbox_defconfig | 1 - configs/kylin-rk3036_defconfig | 1 - configs/lion-rk3368_defconfig | 1 - configs/miqi-rk3288_defconfig | 2 -- configs/phycore-rk3288_defconfig | 2 -- configs/popmetal-rk3288_defconfig | 2 -- configs/puma-rk3399_defconfig | 1 - configs/rock2_defconfig | 2 -- configs/rock_defconfig | 1 - configs/sandbox_defconfig | 2 -- configs/sandbox_flattree_defconfig | 2 -- configs/sandbox_noblk_defconfig | 2 -- configs/sheep-rk3368_defconfig | 1 - configs/tinker-rk3288_defconfig | 2 -- configs/vyasa-rk3288_defconfig | 2 -- 27 files changed, 42 deletions(-)