GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-03-18 13:11:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'rmobile' of git://git.denx.de/u-boot-sh

Browse source
This commit is contained in:
Tom Rini 2017-09-04 22:17:59 -04:00
commit a0e80c97c9
3 changed files with 48 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
arch/arm/mach-rmobile/pfc-r8a7795.c
View file

@ -2185,6 +2185,27 @@ enum {
FSO_TOEx_MARK,
TPU0TO1_MARK,
/* IPSR18 */
USB3_PWEN_IMARK,
AUDIO_CLKOUT2_B_MARK,
SSI_SCK9_B_MARK,
TS_SDEN0_E_MARK,
STP_ISEN_0_E_MARK,
RIF2_D0_B_MARK,
TPU0TO2_MARK,
FMCLK_C_MARK,
FMCLK_D_MARK,
USB3_OVC_IMARK,
AUDIO_CLKOUT3_B_MARK,
SSI_WS9_B_MARK,
TS_SPSYNC0_E_MARK,
STP_ISSYNC_0_E_MARK,
RIF2_D1_B_MARK,
TPU0TO3_MARK,
FMIN_C_MARK,
FMIN_D_MARK,
PINMUX_MARK_END,
};
@ -3288,6 +3309,27 @@ static struct pinmux_gpio pinmux_gpios[] = {
GPIO_FN(RIF3_D1_B),
GPIO_FN(FSO_TOEx),
GPIO_FN(TPU0TO1),
/* IPSR18 */
GPIO_IFN(USB3_PWEN),
GPIO_FN(AUDIO_CLKOUT2_B),
GPIO_FN(SSI_SCK9_B),
GPIO_FN(TS_SDEN0_E),
GPIO_FN(STP_ISEN_0_E),
GPIO_FN(RIF2_D0_B),
GPIO_FN(TPU0TO2),
GPIO_FN(FMCLK_C),
GPIO_FN(FMCLK_D),
GPIO_IFN(USB3_OVC),
GPIO_FN(AUDIO_CLKOUT3_B),
GPIO_FN(SSI_WS9_B),
GPIO_FN(TS_SPSYNC0_E),
GPIO_FN(STP_ISSYNC_0_E),
GPIO_FN(RIF2_D1_B),
GPIO_FN(TPU0TO3),
GPIO_FN(FMIN_C),
GPIO_FN(FMIN_D),
};
static struct pinmux_cfg_reg pinmux_config_regs[] = {

11
board/renesas/salvator-x/salvator-x.c
View file

@ -116,7 +116,7 @@ int board_init(void)
/* USB1 pull-up */
setbits_le32(PFC_PUEN6, PUEN_USB1_OVC | PUEN_USB1_PWEN);
#ifdef CONFIG_RAVB
#ifdef CONFIG_RENESAS_RAVB
/* EtherAVB Enable */
/* GPSR2 */
gpio_request(GPIO_GFN_AVB_AVTP_CAPTURE_A, NULL);
@ -158,12 +158,7 @@ int board_init(void)
udelay(1);
#endif
return 0;
}
#ifdef CONFIG_SH_SDHI
int board_mmc_init(bd_t *bis)
{
#ifdef CONFIG_MMC
/* SDHI0 */
gpio_request(GPIO_GFN_SD0_DAT0, NULL);
gpio_request(GPIO_GFN_SD0_DAT1, NULL);
@ -227,10 +222,10 @@ int board_mmc_init(bd_t *bis)
gpio_request(GPIO_GP_3_14, NULL);
gpio_direction_output(GPIO_GP_3_15, 1); /* power on */
gpio_direction_output(GPIO_GP_3_14, 1); /* 1: 3.3V, 0: 1.8V */
#endif
return 0;
}
#endif
int dram_init(void)
{

11
board/renesas/ulcb/ulcb.c
View file

@ -105,7 +105,7 @@ int board_init(void)
/* USB1 pull-up */
setbits_le32(PFC_PUEN6, PUEN_USB1_OVC | PUEN_USB1_PWEN);
#ifdef CONFIG_RAVB
#ifdef CONFIG_RENESAS_RAVB
/* EtherAVB Enable */
/* GPSR2 */
gpio_request(GPIO_GFN_AVB_AVTP_CAPTURE_A, NULL);
@ -137,12 +137,7 @@ int board_init(void)
udelay(1);
#endif
return 0;
}
#ifdef CONFIG_SH_SDHI
int board_mmc_init(bd_t *bis)
{
#ifdef CONFIG_MMC
/* SDHI0 */
gpio_request(GPIO_GFN_SD0_DAT0, NULL);
gpio_request(GPIO_GFN_SD0_DAT1, NULL);
@ -179,10 +174,10 @@ int board_mmc_init(bd_t *bis)
gpio_request(GPIO_GP_5_9, NULL);
gpio_direction_output(GPIO_GP_5_3, 0); /* 1: 3.3V, 0: 1.8V */
gpio_direction_output(GPIO_GP_5_9, 0); /* 1: 3.3V, 0: 1.8V */
#endif
return 0;
}
#endif
int dram_init(void)
{