Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-25 06:00:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

ARM: uniphier: move XIRQ pin-mux settings of LD11/LD20

Browse source 
This is the last code in the mach-uniphier/pinctrl/ directory.
Push the remaining code out to delete the directory entirely.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
This commit is contained in:
Masahiro Yamada 2016-09-17 03:33:07 +09:00
parent 68557ec37e
commit b78ffc53c5
5 changed files with 10 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
arch/arm/mach-uniphier/Makefile
View file

@ -15,7 +15,7 @@ obj-y += board_init.o
obj-$(CONFIG_BOARD_LATE_INIT) += board_late_init.o obj-$(CONFIG_BOARD_LATE_INIT) += board_late_init.o
obj-y += reset.o obj-y += reset.o
obj-y += pinctrl/ clk/ obj-y += clk/
endif endif

11
arch/arm/mach-uniphier/board_init.c
View file

@ -12,6 +12,7 @@
#include "init.h" #include "init.h"
#include "micro-support-card.h" #include "micro-support-card.h"
#include "sg-regs.h"
#include "soc-info.h" #include "soc-info.h"
DECLARE_GLOBAL_DATA_PTR; DECLARE_GLOBAL_DATA_PTR;
@ -112,7 +113,10 @@ int board_init(void)
#if defined(CONFIG_ARCH_UNIPHIER_LD11) #if defined(CONFIG_ARCH_UNIPHIER_LD11)
case SOC_UNIPHIER_LD11: case SOC_UNIPHIER_LD11:
uniphier_nand_pin_init(false); uniphier_nand_pin_init(false);
uniphier_ld20_pin_init(); sg_set_pinsel(149, 14, 8, 4); /* XIRQ0 -> XIRQ0 */
sg_set_iectrl(149);
sg_set_pinsel(153, 14, 8, 4); /* XIRQ4 -> XIRQ4 */
sg_set_iectrl(153);
led_puts("U1"); led_puts("U1");
uniphier_ld11_clk_init(); uniphier_ld11_clk_init();
break; break;
@ -120,7 +124,10 @@ int board_init(void)
#if defined(CONFIG_ARCH_UNIPHIER_LD20) #if defined(CONFIG_ARCH_UNIPHIER_LD20)
case SOC_UNIPHIER_LD20: case SOC_UNIPHIER_LD20:
uniphier_nand_pin_init(false); uniphier_nand_pin_init(false);
uniphier_ld20_pin_init(); sg_set_pinsel(149, 14, 8, 4); /* XIRQ0 -> XIRQ0 */
sg_set_iectrl(149);
sg_set_pinsel(153, 14, 8, 4); /* XIRQ4 -> XIRQ4 */
sg_set_iectrl(153);
led_puts("U1"); led_puts("U1");
uniphier_ld20_clk_init(); uniphier_ld20_clk_init();
cci500_init(2); cci500_init(2);

2
arch/arm/mach-uniphier/init.h
View file

@ -101,8 +101,6 @@ int uniphier_pxs2_umc_init(const struct uniphier_board_data *bd);
int uniphier_ld20_umc_init(const struct uniphier_board_data *bd); int uniphier_ld20_umc_init(const struct uniphier_board_data *bd);
int uniphier_ld11_umc_init(const struct uniphier_board_data *bd); int uniphier_ld11_umc_init(const struct uniphier_board_data *bd);
void uniphier_ld20_pin_init(void);
void uniphier_ld4_clk_init(void); void uniphier_ld4_clk_init(void);
void uniphier_pro4_clk_init(void); void uniphier_pro4_clk_init(void);
void uniphier_pro5_clk_init(void); void uniphier_pro5_clk_init(void);

6
arch/arm/mach-uniphier/pinctrl/Makefile
View file

@ -1,6 +0,0 @@
#
# SPDX-License-Identifier: GPL-2.0+
#
obj-$(CONFIG_ARCH_UNIPHIER_LD11) += pinctrl-ld20.o
obj-$(CONFIG_ARCH_UNIPHIER_LD20) += pinctrl-ld20.o

20
arch/arm/mach-uniphier/pinctrl/pinctrl-ld20.c
View file

@ -1,20 +0,0 @@
/*
* Copyright (C) 2016 Masahiro Yamada <yamada.masahiro@socionext.com>
*
* SPDX-License-Identifier: GPL-2.0+
*/
#include <linux/io.h>
#include "../init.h"
#include "../sg-regs.h"
void uniphier_ld20_pin_init(void)
{
/* Comment format: PAD Name -> Function Name */
sg_set_pinsel(149, 14, 8, 4); /* XIRQ0 -> XIRQ0 */
sg_set_iectrl(149);
sg_set_pinsel(153, 14, 8, 4); /* XIRQ4 -> XIRQ4 */
sg_set_iectrl(153);
}