andrius
/
arm-trusted-firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #1081 from masahir0y/uniphier 

uniphier: fix-up for PXs3 SoC
This commit is contained in:
davidcunado-arm 2017-09-04 09:35:13 +01:00 committed by GitHub
parent 085bac2b75 9bdccff462
commit 827cd9f13d
2 changed files with 27 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plat/socionext/uniphier/uniphier_nand.c
View File

@ -108,7 +108,7 @@ static int uniphier_nand_block_isbad(struct uniphier_nand *nand, int block)
/* if possible, save the result for future re-use */
if (block < ARRAY_SIZE(nand->bbt))
nand->bbt[block] = is_bad;
nand->bbt[block] = is_bad;
if (is_bad)
WARN("found bad block at %d. skip.\n", block);

30
plat/socionext/uniphier/uniphier_usb.c
View File

@ -16,6 +16,7 @@
#define UNIPHIER_LD11_USB_DESC_BASE 0x30010000
#define UNIPHIER_LD20_USB_DESC_BASE 0x30014000
#define UNIPHIER_PXS3_USB_DESC_BASE 0x30014000
#define UNIPHIER_SRB_OCM_CONT 0x61200000
@ -41,6 +42,13 @@ struct uniphier_ld20_op {
void *dev_desc;
};
struct uniphier_pxs3_op {
uint8_t __pad[184];
struct uniphier_ld20_trans_op *trans_op;
void *__pad2;
void *dev_desc;
};
static int (*__uniphier_usb_read)(int lba, uintptr_t buf, size_t size);
static void uniphier_ld11_usb_init(void)
@ -91,14 +99,27 @@ static int uniphier_ld20_usb_read(int lba, uintptr_t buf, size_t size)
return ret ? 0 : -1;
}
static void uniphier_pxs3_usb_init(void)
{
struct uniphier_pxs3_op *op = (void *)UNIPHIER_PXS3_USB_DESC_BASE;
op->trans_op = (void *)(op + 1);
op->dev_desc = op->trans_op + 1;
}
static int uniphier_pxs3_usb_read(int lba, uintptr_t buf, size_t size)
{
static int (*rom_usb_read)(unsigned int lba, unsigned int size,
uintptr_t buf);
static int (*rom_usb_read)(uintptr_t desc, unsigned int lba,
unsigned int size, uintptr_t buf);
int ret;
rom_usb_read = (__typeof(rom_usb_read))0x100c;
rom_usb_read = (__typeof(rom_usb_read))0x39e8;
return rom_usb_read(lba, size, buf);
/* ROM-API - return 1 on success, 0 on error */
ret = rom_usb_read(UNIPHIER_PXS3_USB_DESC_BASE, lba, size, buf);
return ret ? 0 : -1;
}
struct uniphier_usb_rom_param {
@ -116,6 +137,7 @@ static const struct uniphier_usb_rom_param uniphier_usb_rom_params[] = {
.read = uniphier_ld20_usb_read,
},
[UNIPHIER_SOC_PXS3] = {
.init = uniphier_pxs3_usb_init,
.read = uniphier_pxs3_usb_read,
},
};