Message ID | 1441115432-12810-13-git-send-email-yamada.masahiro@socionext.com |
---|---|
State | Superseded |
Delegated to: | Masahiro Yamada |
Headers | show |
+Stephen FYI On 1 September 2015 at 07:50, Masahiro Yamada <yamada.masahiro@socionext.com> wrote: > As the UniPhier serial driver had already switched to Drive Model > and the pinctrl drivers are now enabled, these pin-muxing settings > are handled by the pinctrl drivers. > > Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> > --- > > arch/arm/mach-uniphier/ph1-ld4/Makefile | 2 +- > arch/arm/mach-uniphier/ph1-ld4/early_pinctrl.c | 27 ------------------------- > arch/arm/mach-uniphier/ph1-pro4/Makefile | 2 +- > arch/arm/mach-uniphier/ph1-pro4/early_pinctrl.c | 26 ------------------------ > arch/arm/mach-uniphier/ph1-sld8/early_pinctrl.c | 27 ------------------------- > arch/arm/mach-uniphier/spl.c | 5 +++++ > 6 files changed, 7 insertions(+), 82 deletions(-) > delete mode 100644 arch/arm/mach-uniphier/ph1-ld4/early_pinctrl.c > delete mode 100644 arch/arm/mach-uniphier/ph1-pro4/early_pinctrl.c > delete mode 100644 arch/arm/mach-uniphier/ph1-sld8/early_pinctrl.c Reviewed-by: Simon Glass <sjg@chromium.org> > > diff --git a/arch/arm/mach-uniphier/ph1-ld4/Makefile b/arch/arm/mach-uniphier/ph1-ld4/Makefile > index 1410b12..789820e 100644 > --- a/arch/arm/mach-uniphier/ph1-ld4/Makefile > +++ b/arch/arm/mach-uniphier/ph1-ld4/Makefile > @@ -5,7 +5,7 @@ > ifdef CONFIG_SPL_BUILD > obj-$(CONFIG_DEBUG_LL) += lowlevel_debug.o > obj-y += bcu_init.o sg_init.o pll_init.o early_clkrst_init.o \ > - early_pinctrl.o pll_spectrum.o umc_init.o ddrphy_init.o > + pll_spectrum.o umc_init.o ddrphy_init.o > obj-$(CONFIG_PFC_MICRO_SUPPORT_CARD) += sbc_init.o > obj-$(CONFIG_DCC_MICRO_SUPPORT_CARD) += sbc_init_3cs.o > else > diff --git a/arch/arm/mach-uniphier/ph1-ld4/early_pinctrl.c b/arch/arm/mach-uniphier/ph1-ld4/early_pinctrl.c > deleted file mode 100644 > index e5e86bb..0000000 > diff --git a/arch/arm/mach-uniphier/ph1-pro4/Makefile b/arch/arm/mach-uniphier/ph1-pro4/Makefile > index 229f443..7fdb36a 100644 > --- a/arch/arm/mach-uniphier/ph1-pro4/Makefile > +++ b/arch/arm/mach-uniphier/ph1-pro4/Makefile > @@ -5,7 +5,7 @@ > ifdef CONFIG_SPL_BUILD > obj-$(CONFIG_DEBUG_LL) += lowlevel_debug.o > obj-y += sg_init.o pll_init.o early_clkrst_init.o \ > - early_pinctrl.o pll_spectrum.o umc_init.o ddrphy_init.o > + pll_spectrum.o umc_init.o ddrphy_init.o > obj-$(CONFIG_PFC_MICRO_SUPPORT_CARD) += sbc_init.o > obj-$(CONFIG_DCC_MICRO_SUPPORT_CARD) += sbc_init_3cs.o > else > diff --git a/arch/arm/mach-uniphier/ph1-pro4/early_pinctrl.c b/arch/arm/mach-uniphier/ph1-pro4/early_pinctrl.c > deleted file mode 100644 > index e78d6ab..0000000 > diff --git a/arch/arm/mach-uniphier/ph1-sld8/early_pinctrl.c b/arch/arm/mach-uniphier/ph1-sld8/early_pinctrl.c > deleted file mode 100644 > index 28cc429..0000000 > diff --git a/arch/arm/mach-uniphier/spl.c b/arch/arm/mach-uniphier/spl.c > index a34d3a1..86764bc 100644 > --- a/arch/arm/mach-uniphier/spl.c > +++ b/arch/arm/mach-uniphier/spl.c > @@ -15,6 +15,11 @@ > void __weak bcu_init(void) > { > }; > + > +void __weak early_pin_init(void) > +{ > +}; > + > void sbc_init(void); > void sg_init(void); > void pll_init(void); > -- > 1.9.1 >
diff --git a/arch/arm/mach-uniphier/ph1-ld4/Makefile b/arch/arm/mach-uniphier/ph1-ld4/Makefile index 1410b12..789820e 100644 --- a/arch/arm/mach-uniphier/ph1-ld4/Makefile +++ b/arch/arm/mach-uniphier/ph1-ld4/Makefile @@ -5,7 +5,7 @@ ifdef CONFIG_SPL_BUILD obj-$(CONFIG_DEBUG_LL) += lowlevel_debug.o obj-y += bcu_init.o sg_init.o pll_init.o early_clkrst_init.o \ - early_pinctrl.o pll_spectrum.o umc_init.o ddrphy_init.o + pll_spectrum.o umc_init.o ddrphy_init.o obj-$(CONFIG_PFC_MICRO_SUPPORT_CARD) += sbc_init.o obj-$(CONFIG_DCC_MICRO_SUPPORT_CARD) += sbc_init_3cs.o else diff --git a/arch/arm/mach-uniphier/ph1-ld4/early_pinctrl.c b/arch/arm/mach-uniphier/ph1-ld4/early_pinctrl.c deleted file mode 100644 index e5e86bb..0000000 diff --git a/arch/arm/mach-uniphier/ph1-pro4/Makefile b/arch/arm/mach-uniphier/ph1-pro4/Makefile index 229f443..7fdb36a 100644 --- a/arch/arm/mach-uniphier/ph1-pro4/Makefile +++ b/arch/arm/mach-uniphier/ph1-pro4/Makefile @@ -5,7 +5,7 @@ ifdef CONFIG_SPL_BUILD obj-$(CONFIG_DEBUG_LL) += lowlevel_debug.o obj-y += sg_init.o pll_init.o early_clkrst_init.o \ - early_pinctrl.o pll_spectrum.o umc_init.o ddrphy_init.o + pll_spectrum.o umc_init.o ddrphy_init.o obj-$(CONFIG_PFC_MICRO_SUPPORT_CARD) += sbc_init.o obj-$(CONFIG_DCC_MICRO_SUPPORT_CARD) += sbc_init_3cs.o else diff --git a/arch/arm/mach-uniphier/ph1-pro4/early_pinctrl.c b/arch/arm/mach-uniphier/ph1-pro4/early_pinctrl.c deleted file mode 100644 index e78d6ab..0000000 diff --git a/arch/arm/mach-uniphier/ph1-sld8/early_pinctrl.c b/arch/arm/mach-uniphier/ph1-sld8/early_pinctrl.c deleted file mode 100644 index 28cc429..0000000 diff --git a/arch/arm/mach-uniphier/spl.c b/arch/arm/mach-uniphier/spl.c index a34d3a1..86764bc 100644 --- a/arch/arm/mach-uniphier/spl.c +++ b/arch/arm/mach-uniphier/spl.c @@ -15,6 +15,11 @@ void __weak bcu_init(void) { }; + +void __weak early_pin_init(void) +{ +}; + void sbc_init(void); void sg_init(void); void pll_init(void);
As the UniPhier serial driver had already switched to Drive Model and the pinctrl drivers are now enabled, these pin-muxing settings are handled by the pinctrl drivers. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> --- arch/arm/mach-uniphier/ph1-ld4/Makefile | 2 +- arch/arm/mach-uniphier/ph1-ld4/early_pinctrl.c | 27 ------------------------- arch/arm/mach-uniphier/ph1-pro4/Makefile | 2 +- arch/arm/mach-uniphier/ph1-pro4/early_pinctrl.c | 26 ------------------------ arch/arm/mach-uniphier/ph1-sld8/early_pinctrl.c | 27 ------------------------- arch/arm/mach-uniphier/spl.c | 5 +++++ 6 files changed, 7 insertions(+), 82 deletions(-) delete mode 100644 arch/arm/mach-uniphier/ph1-ld4/early_pinctrl.c delete mode 100644 arch/arm/mach-uniphier/ph1-pro4/early_pinctrl.c delete mode 100644 arch/arm/mach-uniphier/ph1-sld8/early_pinctrl.c