common: qixis: make the qixis compatible with new soc
PATCH v2 1/1 common: qixis: make the qixis compatible with new soc
This driver needs modification to work with new soc, like ls1028, since bitmap of RCFG is changed to RESV[7:5] LIVE[4] WDEN[3] RESV[2:1] GO[0]
000 1 0 00 0
Also the RCW location is moved to only dutcfg0. RESV[7:4] RCWSRC[3:0]
1111 configurable
Following commands are functional nowqixis_resetqixis_reset sdqixis_reset qspiqixis_reset emmc
---
v2:
- refine the description
board/freescale/common/qixis.c | 45 +++++++++++++++++++++++++--------- 1 file changed, 33 insertions(+), 12 deletions(-)
board/freescale/common/qixis.c +33 -12
@@ -21,6 +21,13 @@#define QIXIS_LBMAP_BRDCFG_REG 0x00#endif +#ifndef QIXIS_RCFG_CTL_RECONFIG_IDLE +#define QIXIS_RCFG_CTL_RECONFIG_IDLE 0x20 +#endif +#ifndef QIXIS_RCFG_CTL_RECONFIG_START +#define QIXIS_RCFG_CTL_RECONFIG_START 0x21 +#endif +#ifdef CONFIG_SYS_I2C_FPGA_ADDR u8 qixis_read_i2c (unsigned int reg) {
@@ -159,11 +166,13 @@ static void qixis_reset(void)QIXIS_WRITE (rst_ctl,QIXIS_RST_CTL_RESET ); } +#ifdef QIXIS_LBMAP_ALTBANK static void qixis_bank_reset (void ) {QIXIS_WRITE (rcfg_ctl,QIXIS_RCFG_CTL_RECONFIG_IDLE );QIXIS_WRITE (rcfg_ctl,QIXIS_RCFG_CTL_RECONFIG_START ); } +#endif static void __maybe_unused set_lbmap (int lbmap) {
@@ -176,12 +185,16 @@ static void __maybe_unused set_lbmap(int lbmap)static void __maybe_unused set_rcw_src (int rcw_src) { +#ifdef CONFIG_NXP_LSCH3_2 +QIXIS_WRITE (dutcfg[0 ], (rcw_src &0xff )); +#else u8 reg; reg =QIXIS_READ (dutcfg[1 ]); reg = (reg & ~1 ) | (rcw_src &1 );QIXIS_WRITE (dutcfg[1 ], reg);QIXIS_WRITE (dutcfg[0 ], (rcw_src >>1 ) &0xff ); +#endif }static void qixis_dump_regs (void )
@@ -227,16 +240,20 @@ static int qixis_reset_cmd(cmd_tbl_t *cmdtp, int flag, int argc, char * const arset_lbmap (QIXIS_LBMAP_DFLTBANK );qixis_reset (); }else if (strcmp (argv[1 ],"altbank" ) ==0 ) { +#ifdef QIXIS_LBMAP_ALTBANK set_lbmap (QIXIS_LBMAP_ALTBANK );qixis_bank_reset (); +#else +printf ("No Altbank!\n" ); +#endif }else if (strcmp (argv[1 ],"nand" ) ==0 ) {#ifdef QIXIS_LBMAP_NAND QIXIS_WRITE (rst_ctl,0x30 );QIXIS_WRITE (rcfg_ctl,0 );set_lbmap (QIXIS_LBMAP_NAND );set_rcw_src (QIXIS_RCW_SRC_NAND ); -QIXIS_WRITE (rcfg_ctl,0x20 ); -QIXIS_WRITE (rcfg_ctl,0x21 ); +QIXIS_WRITE (rcfg_ctl,QIXIS_RCFG_CTL_RECONFIG_IDLE ); +QIXIS_WRITE (rcfg_ctl,QIXIS_RCFG_CTL_RECONFIG_START );#else printf ("Not implemented\n" );#endif
@@ -250,8 +267,8 @@ static int qixis_reset_cmd(cmd_tbl_t *cmdtp, int flag, int argc, char * const arset_lbmap (QIXIS_LBMAP_SD );set_rcw_src (QIXIS_RCW_SRC_SD );#endif -QIXIS_WRITE (rcfg_ctl,0x20 ); -QIXIS_WRITE (rcfg_ctl,0x21 ); +QIXIS_WRITE (rcfg_ctl,QIXIS_RCFG_CTL_RECONFIG_IDLE ); +QIXIS_WRITE (rcfg_ctl,QIXIS_RCFG_CTL_RECONFIG_START );#else printf ("Not implemented\n" );#endif
@@ -261,8 +278,8 @@ static int qixis_reset_cmd(cmd_tbl_t *cmdtp, int flag, int argc, char * const arQIXIS_WRITE (rcfg_ctl,0 );set_lbmap (QIXIS_LBMAP_IFC );set_rcw_src (QIXIS_RCW_SRC_IFC ); -QIXIS_WRITE (rcfg_ctl,0x20 ); -QIXIS_WRITE (rcfg_ctl,0x21 ); +QIXIS_WRITE (rcfg_ctl,QIXIS_RCFG_CTL_RECONFIG_IDLE ); +QIXIS_WRITE (rcfg_ctl,QIXIS_RCFG_CTL_RECONFIG_START );#else printf ("Not implemented\n" );#endif
@@ -272,8 +289,8 @@ static int qixis_reset_cmd(cmd_tbl_t *cmdtp, int flag, int argc, char * const arQIXIS_WRITE (rcfg_ctl,0 );set_lbmap (QIXIS_LBMAP_EMMC );set_rcw_src (QIXIS_RCW_SRC_EMMC ); -QIXIS_WRITE (rcfg_ctl,0x20 ); -QIXIS_WRITE (rcfg_ctl,0x21 ); +QIXIS_WRITE (rcfg_ctl,QIXIS_RCFG_CTL_RECONFIG_IDLE ); +QIXIS_WRITE (rcfg_ctl,QIXIS_RCFG_CTL_RECONFIG_START );#else printf ("Not implemented\n" );#endif
@@ -283,8 +300,10 @@ static int qixis_reset_cmd(cmd_tbl_t *cmdtp, int flag, int argc, char * const arQIXIS_WRITE (rcfg_ctl,0 );set_lbmap (QIXIS_LBMAP_SD_QSPI );set_rcw_src (QIXIS_RCW_SRC_SD ); -qixis_write_i2c (offsetof(struct qixis , rcfg_ctl),0x20 ); -qixis_write_i2c (offsetof(struct qixis , rcfg_ctl),0x21 ); +qixis_write_i2c (offsetof(struct qixis , rcfg_ctl), +QIXIS_RCFG_CTL_RECONFIG_IDLE ); +qixis_write_i2c (offsetof(struct qixis , rcfg_ctl), +QIXIS_RCFG_CTL_RECONFIG_START );#else printf ("Not implemented\n" );#endif
@@ -294,8 +313,10 @@ static int qixis_reset_cmd(cmd_tbl_t *cmdtp, int flag, int argc, char * const arQIXIS_WRITE (rcfg_ctl,0 );set_lbmap (QIXIS_LBMAP_QSPI );set_rcw_src (QIXIS_RCW_SRC_QSPI ); -qixis_write_i2c (offsetof(struct qixis , rcfg_ctl),0x20 ); -qixis_write_i2c (offsetof(struct qixis , rcfg_ctl),0x21 ); +qixis_write_i2c (offsetof(struct qixis , rcfg_ctl), +QIXIS_RCFG_CTL_RECONFIG_IDLE ); +qixis_write_i2c (offsetof(struct qixis , rcfg_ctl), +QIXIS_RCFG_CTL_RECONFIG_START );#else printf ("Not implemented\n" );#endif
Signature · 1 line
2.17.1
PATCH v2 1/1 common: qixis: make the qixis compatible with new soc
Quoted 23 lines
-----Original Message-----
From: Yuantian Tang <[email protected]>
Sent: Wednesday, June 19, 2019 12:09 PM
To: Prabhakar Kushwaha <[email protected]>
Cc: u-boot at lists.denx.de; Andy Tang <[email protected]>; Ashish Kumar <[email protected]>
Subject: [PATCH v2] common: qixis: make the qixis compatible with new socThis driver needs modification to work with new soc, like ls1028, since bitmap of RCFG is changed to RESV[7:5] LIVE[4] WDEN[3] RESV[2:1] GO[0]
000 1 0 00 0Also the RCW location is moved to only dutcfg0.
RESV[7:4] RCWSRC[3:0]
1111 configurableFollowing commands are functional now
qixis_resetqixis_resetsdqixis_resetqspiqixis_resetemmc
Quoted 3 lines
Signed-off-by Ashish Kumar <[email protected]>Signed-off-by Yuantian Tang <[email protected]>---
This patch has been applied to fsl-qoriq master, awaiting upstream.
--pk