mirror of
https://github.com/brain-hackers/u-boot-brain
synced 2024-10-01 00:50:43 +09:00
ARM: uniphier: move pin-mux code into pin_init function
The code in uniphier_sld3_sbc_init() is pin-muxing, so it would be a better fit in uniphier_sld3_early_pin_init(). Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
This commit is contained in:
parent
5eb4150e84
commit
bef4b024e9
@ -22,5 +22,7 @@ int uniphier_sld3_early_pin_init(const struct uniphier_board_data *bd)
|
|||||||
sg_set_pinsel(102, 2, 4, 4); /* TXD2 */
|
sg_set_pinsel(102, 2, 4, 4); /* TXD2 */
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
sg_set_pinsel(99, 1, 4, 4); /* GPIO26 -> EA24 */
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
@ -37,7 +37,6 @@ int uniphier_ld20_init(const struct uniphier_board_data *bd);
|
|||||||
#if defined(CONFIG_MICRO_SUPPORT_CARD)
|
#if defined(CONFIG_MICRO_SUPPORT_CARD)
|
||||||
int uniphier_sbc_init_admulti(const struct uniphier_board_data *bd);
|
int uniphier_sbc_init_admulti(const struct uniphier_board_data *bd);
|
||||||
int uniphier_sbc_init_savepin(const struct uniphier_board_data *bd);
|
int uniphier_sbc_init_savepin(const struct uniphier_board_data *bd);
|
||||||
int uniphier_sld3_sbc_init(const struct uniphier_board_data *bd);
|
|
||||||
int uniphier_ld4_sbc_init(const struct uniphier_board_data *bd);
|
int uniphier_ld4_sbc_init(const struct uniphier_board_data *bd);
|
||||||
int uniphier_pxs2_sbc_init(const struct uniphier_board_data *bd);
|
int uniphier_pxs2_sbc_init(const struct uniphier_board_data *bd);
|
||||||
#else
|
#else
|
||||||
@ -53,11 +52,6 @@ static inline int uniphier_sbc_init_savepin(
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static inline int uniphier_sld3_sbc_init(const struct uniphier_board_data *bd)
|
|
||||||
{
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
static inline int uniphier_ld4_sbc_init(const struct uniphier_board_data *bd)
|
static inline int uniphier_ld4_sbc_init(const struct uniphier_board_data *bd)
|
||||||
{
|
{
|
||||||
return 0;
|
return 0;
|
||||||
|
@ -15,7 +15,8 @@ int uniphier_sld3_init(const struct uniphier_board_data *bd)
|
|||||||
uniphier_sld3_bcu_init(bd);
|
uniphier_sld3_bcu_init(bd);
|
||||||
|
|
||||||
uniphier_sbc_init_admulti(bd);
|
uniphier_sbc_init_admulti(bd);
|
||||||
uniphier_sld3_sbc_init(bd);
|
|
||||||
|
uniphier_sld3_early_pin_init(bd);
|
||||||
|
|
||||||
support_card_reset();
|
support_card_reset();
|
||||||
|
|
||||||
@ -34,8 +35,6 @@ int uniphier_sld3_init(const struct uniphier_board_data *bd)
|
|||||||
|
|
||||||
led_puts("L2");
|
led_puts("L2");
|
||||||
|
|
||||||
uniphier_sld3_early_pin_init(bd);
|
|
||||||
|
|
||||||
led_puts("L3");
|
led_puts("L3");
|
||||||
|
|
||||||
#ifdef CONFIG_SPL_SERIAL_SUPPORT
|
#ifdef CONFIG_SPL_SERIAL_SUPPORT
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
# SPDX-License-Identifier: GPL-2.0+
|
# SPDX-License-Identifier: GPL-2.0+
|
||||||
#
|
#
|
||||||
|
|
||||||
obj-$(CONFIG_ARCH_UNIPHIER_SLD3) += sbc-admulti.o sbc-sld3.o
|
obj-$(CONFIG_ARCH_UNIPHIER_SLD3) += sbc-admulti.o
|
||||||
obj-$(CONFIG_ARCH_UNIPHIER_LD4) += sbc-savepin.o sbc-ld4.o
|
obj-$(CONFIG_ARCH_UNIPHIER_LD4) += sbc-savepin.o sbc-ld4.o
|
||||||
obj-$(CONFIG_ARCH_UNIPHIER_PRO4) += sbc-savepin.o
|
obj-$(CONFIG_ARCH_UNIPHIER_PRO4) += sbc-savepin.o
|
||||||
obj-$(CONFIG_ARCH_UNIPHIER_SLD8) += sbc-savepin.o sbc-ld4.o
|
obj-$(CONFIG_ARCH_UNIPHIER_SLD8) += sbc-savepin.o sbc-ld4.o
|
||||||
|
@ -1,17 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright (C) 2011-2015 Masahiro Yamada <yamada.masahiro@socionext.com>
|
|
||||||
*
|
|
||||||
* SPDX-License-Identifier: GPL-2.0+
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include <linux/io.h>
|
|
||||||
|
|
||||||
#include "../init.h"
|
|
||||||
#include "../sg-regs.h"
|
|
||||||
|
|
||||||
int uniphier_sld3_sbc_init(const struct uniphier_board_data *bd)
|
|
||||||
{
|
|
||||||
sg_set_pinsel(99, 1, 4, 4); /* GPIO26 -> EA24 */
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
}
|
|
Loading…
Reference in New Issue
Block a user