mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-11-10 23:24:38 +00:00
ARM: uniphier: consolidate System Bus pin-mux settings for LD11/LD20
Use the pin-mux data in the pinctrl drivers by directly calling pinctrl_generic_set_state(). Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
This commit is contained in:
parent
6bf12eaea4
commit
68557ec37e
6 changed files with 5 additions and 44 deletions
|
@ -4,7 +4,7 @@
|
|||
|
||||
ifdef CONFIG_SPL_BUILD
|
||||
|
||||
obj-y += init/ bcu/ memconf/ pll/ early-clk/ early-pinctrl/
|
||||
obj-y += init/ bcu/ memconf/ pll/ early-clk/
|
||||
obj-$(CONFIG_MICRO_SUPPORT_CARD) += sbc/
|
||||
|
||||
else
|
||||
|
|
|
@ -1,6 +0,0 @@
|
|||
#
|
||||
# SPDX-License-Identifier: GPL-2.0+
|
||||
#
|
||||
|
||||
obj-$(CONFIG_ARCH_UNIPHIER_LD11) += early-pinctrl-ld20.o
|
||||
obj-$(CONFIG_ARCH_UNIPHIER_LD20) += early-pinctrl-ld20.o
|
|
@ -1,32 +0,0 @@
|
|||
/*
|
||||
* Copyright (C) 2016 Masahiro Yamada <yamada.masahiro@socionext.com>
|
||||
*
|
||||
* SPDX-License-Identifier: GPL-2.0+
|
||||
*/
|
||||
|
||||
#include "../init.h"
|
||||
#include "../sg-regs.h"
|
||||
|
||||
int uniphier_ld20_early_pin_init(const struct uniphier_board_data *bd)
|
||||
{
|
||||
/* Comment format: PAD Name -> Function Name */
|
||||
sg_set_pinsel(0, 0, 8, 4); /* XECS1 -> XECS1 */
|
||||
sg_set_pinsel(1, 0, 8, 4); /* ERXW -> ERXW */
|
||||
sg_set_pinsel(2, 0, 8, 4); /* XERWE1 -> XERWE1 */
|
||||
sg_set_pinsel(6, 2, 8, 4); /* XNFRE -> XERWE0 */
|
||||
sg_set_pinsel(7, 2, 8, 4); /* XNFWE -> ES0 */
|
||||
sg_set_pinsel(8, 2, 8, 4); /* NFALE -> ES1 */
|
||||
sg_set_pinsel(9, 2, 8, 4); /* NFCLE -> ES2 */
|
||||
sg_set_pinsel(10, 2, 8, 4); /* NFD0 -> ED0 */
|
||||
sg_set_pinsel(11, 2, 8, 4); /* NFD1 -> ED1 */
|
||||
sg_set_pinsel(12, 2, 8, 4); /* NFD2 -> ED2 */
|
||||
sg_set_pinsel(13, 2, 8, 4); /* NFD3 -> ED3 */
|
||||
sg_set_pinsel(14, 2, 8, 4); /* NFD4 -> ED4 */
|
||||
sg_set_pinsel(15, 2, 8, 4); /* NFD5 -> ED5 */
|
||||
sg_set_pinsel(16, 2, 8, 4); /* NFD6 -> ED6 */
|
||||
sg_set_pinsel(17, 2, 8, 4); /* NFD7 -> ED7 */
|
||||
sg_set_iectrl_range(0, 2);
|
||||
sg_set_iectrl_range(6, 17);
|
||||
|
||||
return 0;
|
||||
}
|
|
@ -94,8 +94,6 @@ int uniphier_pxs2_early_clk_init(const struct uniphier_board_data *bd);
|
|||
int uniphier_ld11_early_clk_init(const struct uniphier_board_data *bd);
|
||||
int uniphier_ld20_early_clk_init(const struct uniphier_board_data *bd);
|
||||
|
||||
int uniphier_ld20_early_pin_init(const struct uniphier_board_data *bd);
|
||||
|
||||
int uniphier_ld4_umc_init(const struct uniphier_board_data *bd);
|
||||
int uniphier_pro4_umc_init(const struct uniphier_board_data *bd);
|
||||
int uniphier_sld8_umc_init(const struct uniphier_board_data *bd);
|
||||
|
|
|
@ -15,7 +15,7 @@ int uniphier_ld11_init(const struct uniphier_board_data *bd)
|
|||
{
|
||||
uniphier_sbc_init_savepin(bd);
|
||||
uniphier_pxs2_sbc_init(bd);
|
||||
uniphier_ld20_early_pin_init(bd);
|
||||
uniphier_pin_init("system_bus_grp");
|
||||
|
||||
support_card_reset();
|
||||
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
/*
|
||||
* Copyright (C) 2016 Masahiro Yamada <yamada.masahiro@socionext.com>
|
||||
* Copyright (C) 2016 Socionext Inc.
|
||||
* Author: Masahiro Yamada <yamada.masahiro@socionext.com>
|
||||
*
|
||||
* SPDX-License-Identifier: GPL-2.0+
|
||||
*/
|
||||
|
@ -14,7 +15,7 @@ int uniphier_ld20_init(const struct uniphier_board_data *bd)
|
|||
{
|
||||
uniphier_sbc_init_savepin(bd);
|
||||
uniphier_pxs2_sbc_init(bd);
|
||||
uniphier_ld20_early_pin_init(bd);
|
||||
uniphier_pin_init("system_bus_grp");
|
||||
|
||||
support_card_reset();
|
||||
|
||||
|
|
Loading…
Reference in a new issue