QE IO: Add initial data to pin configuration + read/write functions
PATCH v2 1/1 QE IO: Add initial data to pin configuration + read/write functions
On the MPC83xx & MPC85xx architectures that have QE, add initial data to the pin configuration table (qe_iop_conf_tab). QE initialization tables in all relevant boards were also replaced.
In addition, add IO pin read & write functions.
include/ioports.h +1 -0
@@ -60,6 +60,7 @@ typedef struct {int dir;int open_drain;int assign; +int data; } qe_iop_conf_t;#define QE_IOP_TAB_END (-1)
cpu/mpc85xx/cpu_init.c +4 -3
@@ -37,14 +37,14 @@ DECLARE_GLOBAL_DATA_PTR;#ifdef CONFIG_QE extern qe_iop_conf_t qe_iop_conf_tab[];extern void qe_config_iopin (u8 port,u8 pin,int dir, -int open_drain,int assign); +int open_drain,int assign,int data);extern void qe_init (uint qe_base);extern void qe_reset (void );static void config_qe_ioports (void ) {u8 port, pin; -int dir, open_drain, assign; +int dir, open_drain, assign, data;int i;for (i =0 ; qe_iop_conf_tab[i].assign !=QE_IOP_TAB_END ; i++) {
@@ -53,7 +53,8 @@ static void config_qe_ioports(void) dir = qe_iop_conf_tab[i].dir; open_drain = qe_iop_conf_tab[i].open_drain; assign = qe_iop_conf_tab[i].assign; -qe_config_iopin (port, pin, dir, open_drain, assign); + data = qe_iop_conf_tab[i].data; + qe_config_iopin(port, pin, dir, open_drain, assign,
data);
}
}
#endif
cpu/mpc85xx/qe_io.c +0 -1
@@ -27,7 +27,7 @@#if defined(CONFIG_QE )#define NUM_OF_PINS 32 -void qe_config_iopin(u8 port, u8 pin, int dir, int open_drain, int
assign)
+void qe_config_iopin(u8 port, u8 pin, int dir, int open_drain, int assign, int data)
{
u32 pin_2bit_mask;
u32 pin_2bit_dir;
@@ -38,6 +38,16 @@ void qe_config_iopin(u8 port, u8 pin, in
volatile par_io_t *par_io = (volatile par_io_t *)
&(gur->qe_par_io);
+ /* Calculate pin location for 1bit mask */
+ pin_1bit_mask = (u32)(1 << (NUM_OF_PINS - (pin+1)));
+
+ /* Setup the data */
+ tmp_val = in_be32(&par_io[port].cpdat);
+ if (data)
+ out_be32(&par_io[port].cpdat, pin_1bit_mask | tmp_val);
+ else
+ out_be32(&par_io[port].cpdat, ~pin_1bit_mask & tmp_val);
+
/* Caculate pin location and 2bit mask and dir */ pin_2bit_mask = (u32)(0x3 <<
(NUM_OF_PINS-(pin%(NUM_OF_PINS/2)+1)*2));
pin_2bit_dir = (u32)(dir <<
(NUM_OF_PINS-(pin%(NUM_OF_PINS/2)+1)*2));
@@ -55,9 +65,6 @@ void qe_config_iopin(u8 port, u8 pin, in
out_be32(&par_io[port].cpdir1, pin_2bit_dir | tmp_val);
}
- /* Calculate pin location for 1bit mask */
- pin_1bit_mask = (u32)(1 << (NUM_OF_PINS - (pin+1)));
-
/* Setup the open drain */
tmp_val = in_be32(&par_io[port].cpodr);
if (open_drain)
@@ -82,4 +89,39 @@ void qe_config_iopin(u8 port, u8 pin, in
}
}
+void qe_read_iopin(u8 port, u8 pin, int *data)
+{
+ u32 pin_1bit_mask;
+ u32 tmp_val;
+ volatile ccsr_gur_t *gur = (void *)(CFG_MPC85xx_GUTS_ADDR);
+ volatile par_io_t *par_io = (volatile par_io_t *)
+ &(gur->qe_par_io);
+
+ /* Calculate pin location for 1bit mask */
+ pin_1bit_mask = (u32)(1 << (NUM_OF_PINS - (pin+1)));
+
+ /* Read the data */
+ tmp_val = in_be32(&par_io[port].cpdat);
+ *data = (tmp_val >> (NUM_OF_PINS - (pin+1))) & 0x1;
+}
+
+void qe_write_iopin(u8 port, u8 pin, int data)
+{
+ u32 pin_1bit_mask;
+ u32 tmp_val;
+ volatile ccsr_gur_t *gur = (void *)(CFG_MPC85xx_GUTS_ADDR);
+ volatile par_io_t *par_io = (volatile par_io_t *)
+ &(gur->qe_par_io);
+
+ /* Calculate pin location for 1bit mask */
+ pin_1bit_mask = (u32)(1 << (NUM_OF_PINS - (pin+1)));
+
+ /* Write the data */
+ tmp_val = in_be32(&par_io[port].cpdat);
+ if (data)
+ out_be32(&par_io[port].cpdat, pin_1bit_mask | tmp_val);
+ else
+ out_be32(&par_io[port].cpdat, ~pin_1bit_mask & tmp_val);
+}
+
#endif /* CONFIG_QE */
cpu/mpc83xx/cpu_init.c +4 -3
@@ -29,14 +29,14 @@ DECLARE_GLOBAL_DATA_PTR;#ifdef CONFIG_QE extern qe_iop_conf_t qe_iop_conf_tab[];extern void qe_config_iopin (u8 port,u8 pin,int dir, -int open_drain,int assign); +int open_drain,int assign,int data);extern void qe_init (uint qe_base);extern void qe_reset (void );static void config_qe_ioports (void ) {u8 port, pin; -int dir, open_drain, assign; +int dir, open_drain, assign, data;int i;for (i =0 ; qe_iop_conf_tab[i].assign !=QE_IOP_TAB_END ; i++) {
@@ -45,7 +45,8 @@ static void config_qe_ioports(void) dir = qe_iop_conf_tab[i].dir; open_drain = qe_iop_conf_tab[i].open_drain; assign = qe_iop_conf_tab[i].assign; -qe_config_iopin (port, pin, dir, open_drain, assign); + data = qe_iop_conf_tab[i].data; + qe_config_iopin(port, pin, dir, open_drain, assign,
data);
}
}
#endif
cpu/mpc83xx/qe_io.c +0 -1
@@ -27,7 +27,7 @@#if defined(CONFIG_QE )#define NUM_OF_PINS 32 -void qe_config_iopin(u8 port, u8 pin, int dir, int open_drain, int
assign)
+void qe_config_iopin(u8 port, u8 pin, int dir, int open_drain, int assign, int data)
{
u32 pin_2bit_mask;
u32 pin_2bit_dir;
@@ -37,6 +37,17 @@ void qe_config_iopin(u8 port, u8 pin, in
volatile immap_t *im = (volatile immap_t *)CFG_IMMR;
volatile qepio83xx_t *par_io = (volatile qepio83xx_t
*)&im->qepio;
+ /* Calculate pin location for 1bit mask */
+ pin_1bit_mask = (u32)(1 << (NUM_OF_PINS - (pin+1)));
+
+ /* Setup the data */
+ tmp_val = in_be32(&par_io->ioport[port].pdat);
+ if (data) {
+ out_be32(&par_io->ioport[port].pdat, pin_1bit_mask |tmp_val);
+ } else {
+ out_be32(&par_io->ioport[port].pdat, ~pin_1bit_mask &tmp_val);
+ }
+
/* Caculate pin location and 2bit mask and dir */ pin_2bit_mask = (u32)(0x3 <<
(NUM_OF_PINS-(pin%(NUM_OF_PINS/2)+1)*2));
pin_2bit_dir = (u32)(dir <<
(NUM_OF_PINS-(pin%(NUM_OF_PINS/2)+1)*2));
@@ -54,9 +65,6 @@ void qe_config_iopin(u8 port, u8 pin, in
out_be32(&par_io->ioport[port].dir1, pin_2bit_dir |tmp_val);
}
- /* Calculate pin location for 1bit mask */
- pin_1bit_mask = (u32)(1 << (NUM_OF_PINS - (pin+1)));
-
/* Setup the open drain */
tmp_val = in_be32(&par_io->ioport[port].podr); if (open_drain) {
@@ -82,4 +90,38 @@ void qe_config_iopin(u8 port, u8 pin, in
}
}
+void qe_read_iopin(u8 port, u8 pin, int *data)
+{
+ u32 pin_1bit_mask;
+ u32 tmp_val;
+ volatile immap_t *im = (volatile immap_t *)CFG_IMMR;
+ volatile qepio83xx_t *par_io = (volatile qepio83xx_t
*)&im->qepio;
+
+ /* Calculate pin location for 1bit mask */
+ pin_1bit_mask = (u32)(1 << (NUM_OF_PINS - (pin+1)));
+
+ /* Read the data */
+ tmp_val = in_be32(&par_io->ioport[port].pdat);
+ *data = (tmp_val >> (NUM_OF_PINS - (pin+1))) & 0x1;
+}
+
+void qe_write_iopin(u8 port, u8 pin, int data)
+{
+ u32 pin_1bit_mask;
+ u32 tmp_val;
+ volatile immap_t *im = (volatile immap_t *)CFG_IMMR;
+ volatile qepio83xx_t *par_io = (volatile qepio83xx_t
*)&im->qepio;
+
+ /* Calculate pin location for 1bit mask */
+ pin_1bit_mask = (u32)(1 << (NUM_OF_PINS - (pin+1)));
+
+ /* Setup the data */
+ tmp_val = in_be32(&par_io->ioport[port].pdat);
+ if (data) {
+ out_be32(&par_io->ioport[port].pdat, pin_1bit_mask |tmp_val);
+ } else {
+ out_be32(&par_io->ioport[port].pdat, ~pin_1bit_mask &tmp_val);
+ }
+}
+
#endif /* CONFIG_QE */
diff -purN a/board/freescale/mpc8360emds/mpc8360emds.c b/board/freescale/mpc8360emds/mpc8360emds.c
--- a/board/freescale/mpc8360emds/mpc8360emds.c 2008-01-16
23:06:51.000000000 +0200
+++ b/board/freescale/mpc8360emds/mpc8360emds.c 2008-01-17
16:03:27.428958000 +0200
@@ -34,63 +34,63 @@
const qe_iop_conf_t qe_iop_conf_tab[] = {
/* GETH1 */
- {0, 3, 1, 0, 1}, /* TxD0 */
- {0, 4, 1, 0, 1}, /* TxD1 */
- {0, 5, 1, 0, 1}, /* TxD2 */
- {0, 6, 1, 0, 1}, /* TxD3 */
- {1, 6, 1, 0, 3}, /* TxD4 */
- {1, 7, 1, 0, 1}, /* TxD5 */
- {1, 9, 1, 0, 2}, /* TxD6 */- {1, 10, 1, 0, 2}, /* TxD7 */
- {0, 9, 2, 0, 1}, /* RxD0 */
- {0, 10, 2, 0, 1}, /* RxD1 */
- {0, 11, 2, 0, 1}, /* RxD2 */
- {0, 12, 2, 0, 1}, /* RxD3 */
- {0, 13, 2, 0, 1}, /* RxD4 */
- {1, 1, 2, 0, 2}, /* RxD5 */
- {1, 0, 2, 0, 2}, /* RxD6 */
- {1, 4, 2, 0, 2}, /* RxD7 */
- {0, 7, 1, 0, 1}, /* TX_EN */
- {0, 8, 1, 0, 1}, /* TX_ER */
- {0, 15, 2, 0, 1}, /* RX_DV */
- {0, 16, 2, 0, 1}, /* RX_ER */
- {0, 0, 2, 0, 1}, /* RX_CLK */
- {2, 9, 1, 0, 3}, /* GTX_CLK - CLK10 */
- {2, 8, 2, 0, 1}, /* GTX125 - CLK9 */
+ {0, 3, 1, 0, 1, 0}, /* TxD0 */
+ {0, 4, 1, 0, 1, 0}, /* TxD1 */
+ {0, 5, 1, 0, 1, 0}, /* TxD2 */
+ {0, 6, 1, 0, 1, 0}, /* TxD3 */
+ {1, 6, 1, 0, 3, 0}, /* TxD4 */
+ {1, 7, 1, 0, 1, 0}, /* TxD5 */
+ {1, 9, 1, 0, 2, 0}, /* TxD6 */+ {1, 10, 1, 0, 2, 0}, /* TxD7 */
+ {0, 9, 2, 0, 1, 0}, /* RxD0 */
+ {0, 10, 2, 0, 1, 0}, /* RxD1 */
+ {0, 11, 2, 0, 1, 0}, /* RxD2 */
+ {0, 12, 2, 0, 1, 0}, /* RxD3 */
+ {0, 13, 2, 0, 1, 0}, /* RxD4 */
+ {1, 1, 2, 0, 2, 0}, /* RxD5 */
+ {1, 0, 2, 0, 2, 0}, /* RxD6 */
+ {1, 4, 2, 0, 2, 0}, /* RxD7 */
+ {0, 7, 1, 0, 1, 0}, /* TX_EN */
+ {0, 8, 1, 0, 1, 0}, /* TX_ER */
+ {0, 15, 2, 0, 1, 0}, /* RX_DV */
+ {0, 16, 2, 0, 1, 0}, /* RX_ER */
+ {0, 0, 2, 0, 1, 0}, /* RX_CLK */
+ {2, 9, 1, 0, 3, 0}, /* GTX_CLK - CLK10 */
+ {2, 8, 2, 0, 1, 0}, /* GTX125 - CLK9 */ /* GETH2 */
- {0, 17, 1, 0, 1}, /* TxD0 */
- {0, 18, 1, 0, 1}, /* TxD1 */
- {0, 19, 1, 0, 1}, /* TxD2 */
- {0, 20, 1, 0, 1}, /* TxD3 */
- {1, 2, 1, 0, 1}, /* TxD4 */
- {1, 3, 1, 0, 2}, /* TxD5 */
- {1, 5, 1, 0, 3}, /* TxD6 */
- {1, 8, 1, 0, 3}, /* TxD7 */- {0, 23, 2, 0, 1}, /* RxD0 */
- {0, 24, 2, 0, 1}, /* RxD1 */
- {0, 25, 2, 0, 1}, /* RxD2 */
- {0, 26, 2, 0, 1}, /* RxD3 */
- {0, 27, 2, 0, 1}, /* RxD4 */
- {1, 12, 2, 0, 2}, /* RxD5 */
- {1, 13, 2, 0, 3}, /* RxD6 */
- {1, 11, 2, 0, 2}, /* RxD7 */
- {0, 21, 1, 0, 1}, /* TX_EN */
- {0, 22, 1, 0, 1}, /* TX_ER */
- {0, 29, 2, 0, 1}, /* RX_DV */
- {0, 30, 2, 0, 1}, /* RX_ER */
- {0, 31, 2, 0, 1}, /* RX_CLK */
- {2, 2, 1, 0, 2}, /* GTX_CLK = CLK10 */
- {2, 3, 2, 0, 1}, /* GTX125 - CLK4 */
-
- {0, 1, 3, 0, 2}, /* MDIO */
- {0, 2, 1, 0, 1}, /* MDC */
-
- {5, 0, 1, 0, 2}, /* UART2_SOUT */
- {5, 1, 2, 0, 3}, /* UART2_CTS */
- {5, 2, 1, 0, 1}, /* UART2_RTS */
- {5, 3, 2, 0, 2}, /* UART2_SIN */+ {0, 17, 1, 0, 1, 0}, /* TxD0 */
+ {0, 18, 1, 0, 1, 0}, /* TxD1 */
+ {0, 19, 1, 0, 1, 0}, /* TxD2 */
+ {0, 20, 1, 0, 1, 0}, /* TxD3 */
+ {1, 2, 1, 0, 1, 0}, /* TxD4 */
+ {1, 3, 1, 0, 2, 0}, /* TxD5 */
+ {1, 5, 1, 0, 3, 0}, /* TxD6 */
+ {1, 8, 1, 0, 3, 0}, /* TxD7 */+ {0, 23, 2, 0, 1, 0}, /* RxD0 */
+ {0, 24, 2, 0, 1, 0}, /* RxD1 */
+ {0, 25, 2, 0, 1, 0}, /* RxD2 */
+ {0, 26, 2, 0, 1, 0}, /* RxD3 */
+ {0, 27, 2, 0, 1, 0}, /* RxD4 */
+ {1, 12, 2, 0, 2, 0}, /* RxD5 */
+ {1, 13, 2, 0, 3, 0}, /* RxD6 */
+ {1, 11, 2, 0, 2, 0}, /* RxD7 */
+ {0, 21, 1, 0, 1, 0}, /* TX_EN */
+ {0, 22, 1, 0, 1, 0}, /* TX_ER */
+ {0, 29, 2, 0, 1, 0}, /* RX_DV */
+ {0, 30, 2, 0, 1, 0}, /* RX_ER */
+ {0, 31, 2, 0, 1, 0}, /* RX_CLK */
+ {2, 2, 1, 0, 2, 0}, /* GTX_CLK = CLK10 */
+ {2, 3, 2, 0, 1, 0}, /* GTX125 - CLK4 */
+
+ {0, 1, 3, 0, 2, 0}, /* MDIO */
+ {0, 2, 1, 0, 1, 0}, /* MDC */
+
+ {5, 0, 1, 0, 2, 0}, /* UART2_SOUT */
+ {5, 1, 2, 0, 3, 0}, /* UART2_CTS */
+ {5, 2, 1, 0, 1, 0}, /* UART2_RTS */
+ {5, 3, 2, 0, 2, 0}, /* UART2_SIN */- {0, 0, 0, 0, QE_IOP_TAB_END}, /* END of table */
+ {0, 0, 0, 0, QE_IOP_TAB_END, 0}, /* END of table */
};
int board_early_init_f(void)
diff -purN a/board/freescale/mpc8360erdk/mpc8360erdk.c b/board/freescale/mpc8360erdk/mpc8360erdk.c
--- a/board/freescale/mpc8360erdk/mpc8360erdk.c 2008-01-16
23:06:52.000000000 +0200
+++ b/board/freescale/mpc8360erdk/mpc8360erdk.c 2008-01-17
16:07:14.451836000 +0200
@@ -27,168 +27,168 @@
const qe_iop_conf_t qe_iop_conf_tab[] = {
/* MDIO */
- {0, 1, 3, 0, 2}, /* MDIO */
- {0, 2, 1, 0, 1}, /* MDC */
+ {0, 1, 3, 0, 2, 0}, /* MDIO */
+ {0, 2, 1, 0, 1, 0}, /* MDC *//* UCC1 - UEC (Gigabit) */
- {0, 3, 1, 0, 1}, /* TxD0 */
- {0, 4, 1, 0, 1}, /* TxD1 */
- {0, 5, 1, 0, 1}, /* TxD2 */
- {0, 6, 1, 0, 1}, /* TxD3 */
- {0, 9, 2, 0, 1}, /* RxD0 */- {0, 10, 2, 0, 1}, /* RxD1 */
- {0, 11, 2, 0, 1}, /* RxD2 */
- {0, 12, 2, 0, 1}, /* RxD3 */
- {0, 7, 1, 0, 1}, /* TX_EN */
- {0, 8, 1, 0, 1}, /* TX_ER */
- {0, 15, 2, 0, 1}, /* RX_DV */
- {0, 0, 2, 0, 1}, /* RX_CLK */
- {2, 9, 1, 0, 3}, /* GTX_CLK - CLK10 */
- {2, 8, 2, 0, 1}, /* GTX125 - CLK9 */
+ {0, 3, 1, 0, 1, 0}, /* TxD0 */
+ {0, 4, 1, 0, 1, 0}, /* TxD1 */
+ {0, 5, 1, 0, 1, 0}, /* TxD2 */
+ {0, 6, 1, 0, 1, 0}, /* TxD3 */
+ {0, 9, 2, 0, 1, 0}, /* RxD0 */+ {0, 10, 2, 0, 1, 0}, /* RxD1 */
+ {0, 11, 2, 0, 1, 0}, /* RxD2 */
+ {0, 12, 2, 0, 1, 0}, /* RxD3 */
+ {0, 7, 1, 0, 1, 0}, /* TX_EN */
+ {0, 8, 1, 0, 1, 0}, /* TX_ER */
+ {0, 15, 2, 0, 1, 0}, /* RX_DV */
+ {0, 0, 2, 0, 1, 0}, /* RX_CLK */
+ {2, 9, 1, 0, 3, 0}, /* GTX_CLK - CLK10 */
+ {2, 8, 2, 0, 1, 0}, /* GTX125 - CLK9 */ /* UCC2 - UEC (Gigabit) */
- {0, 17, 1, 0, 1}, /* TxD0 */
- {0, 18, 1, 0, 1}, /* TxD1 */
- {0, 19, 1, 0, 1}, /* TxD2 */
- {0, 20, 1, 0, 1}, /* TxD3 */
- {0, 23, 2, 0, 1}, /* RxD0 */
- {0, 24, 2, 0, 1}, /* RxD1 */
- {0, 25, 2, 0, 1}, /* RxD2 */
- {0, 26, 2, 0, 1}, /* RxD3 */
- {0, 21, 1, 0, 1}, /* TX_EN */
- {0, 22, 1, 0, 1}, /* TX_ER */
- {0, 29, 2, 0, 1}, /* RX_DV */
- {0, 31, 2, 0, 1}, /* RX_CLK */
- {2, 2, 1, 0, 2}, /* GTX_CLK - CLK10 */
- {2, 3, 2, 0, 1}, /* GTX125 - CLK4 */
+ {0, 17, 1, 0, 1, 0}, /* TxD0 */
+ {0, 18, 1, 0, 1, 0}, /* TxD1 */
+ {0, 19, 1, 0, 1, 0}, /* TxD2 */
+ {0, 20, 1, 0, 1, 0}, /* TxD3 */
+ {0, 23, 2, 0, 1, 0}, /* RxD0 */
+ {0, 24, 2, 0, 1, 0}, /* RxD1 */
+ {0, 25, 2, 0, 1, 0}, /* RxD2 */
+ {0, 26, 2, 0, 1, 0}, /* RxD3 */
+ {0, 21, 1, 0, 1, 0}, /* TX_EN */
+ {0, 22, 1, 0, 1, 0}, /* TX_ER */
+ {0, 29, 2, 0, 1, 0}, /* RX_DV */
+ {0, 31, 2, 0, 1, 0}, /* RX_CLK */
+ {2, 2, 1, 0, 2, 0}, /* GTX_CLK - CLK10 */
+ {2, 3, 2, 0, 1, 0}, /* GTX125 - CLK4 */
/* UCC7 - UEC */
- {4, 0, 1, 0, 1}, /* TxD0 */
- {4, 1, 1, 0, 1}, /* TxD1 */
- {4, 2, 1, 0, 1}, /* TxD2 */
- {4, 3, 1, 0, 1}, /* TxD3 */
- {4, 6, 2, 0, 1}, /* RxD0 */
- {4, 7, 2, 0, 1}, /* RxD1 */
- {4, 8, 2, 0, 1}, /* RxD2 */
- {4, 9, 2, 0, 1}, /* RxD3 */
- {4, 4, 1, 0, 1}, /* TX_EN */
- {4, 5, 1, 0, 1}, /* TX_ER */- {4, 12, 2, 0, 1}, /* RX_DV */
- {4, 13, 2, 0, 1}, /* RX_ER */
- {4, 10, 2, 0, 1}, /* COL */
- {4, 11, 2, 0, 1}, /* CRS */
- {2, 18, 2, 0, 1}, /* TX_CLK - CLK19 */
- {2, 19, 2, 0, 1}, /* RX_CLK - CLK20 */
+ {4, 0, 1, 0, 1, 0}, /* TxD0 */
+ {4, 1, 1, 0, 1, 0}, /* TxD1 */
+ {4, 2, 1, 0, 1, 0}, /* TxD2 */
+ {4, 3, 1, 0, 1, 0}, /* TxD3 */
+ {4, 6, 2, 0, 1, 0}, /* RxD0 */
+ {4, 7, 2, 0, 1, 0}, /* RxD1 */
+ {4, 8, 2, 0, 1, 0}, /* RxD2 */
+ {4, 9, 2, 0, 1, 0}, /* RxD3 */
+ {4, 4, 1, 0, 1, 0}, /* TX_EN */
+ {4, 5, 1, 0, 1, 0}, /* TX_ER */+ {4, 12, 2, 0, 1, 0}, /* RX_DV */
+ {4, 13, 2, 0, 1, 0}, /* RX_ER */
+ {4, 10, 2, 0, 1, 0}, /* COL */
+ {4, 11, 2, 0, 1, 0}, /* CRS */
+ {2, 18, 2, 0, 1, 0}, /* TX_CLK - CLK19 */
+ {2, 19, 2, 0, 1, 0}, /* RX_CLK - CLK20 */
/* UCC4 - UEC */
- {1, 14, 1, 0, 1}, /* TxD0 */
- {1, 15, 1, 0, 1}, /* TxD1 */
- {1, 16, 1, 0, 1}, /* TxD2 */
- {1, 17, 1, 0, 1}, /* TxD3 */
- {1, 20, 2, 0, 1}, /* RxD0 */
- {1, 21, 2, 0, 1}, /* RxD1 */
- {1, 22, 2, 0, 1}, /* RxD2 */
- {1, 23, 2, 0, 1}, /* RxD3 */
- {1, 18, 1, 0, 1}, /* TX_EN */
- {1, 19, 1, 0, 2}, /* TX_ER */
- {1, 26, 2, 0, 1}, /* RX_DV */
- {1, 27, 2, 0, 1}, /* RX_ER */
- {1, 24, 2, 0, 1}, /* COL */
- {1, 25, 2, 0, 1}, /* CRS */
- {2, 6, 2, 0, 1}, /* TX_CLK - CLK7 */
- {2, 7, 2, 0, 1}, /* RX_CLK - CLK8 */
+ {1, 14, 1, 0, 1, 0}, /* TxD0 */
+ {1, 15, 1, 0, 1, 0}, /* TxD1 */
+ {1, 16, 1, 0, 1, 0}, /* TxD2 */
+ {1, 17, 1, 0, 1, 0}, /* TxD3 */
+ {1, 20, 2, 0, 1, 0}, /* RxD0 */
+ {1, 21, 2, 0, 1, 0}, /* RxD1 */
+ {1, 22, 2, 0, 1, 0}, /* RxD2 */
+ {1, 23, 2, 0, 1, 0}, /* RxD3 */
+ {1, 18, 1, 0, 1, 0}, /* TX_EN */
+ {1, 19, 1, 0, 2, 0}, /* TX_ER */
+ {1, 26, 2, 0, 1, 0}, /* RX_DV */
+ {1, 27, 2, 0, 1, 0}, /* RX_ER */
+ {1, 24, 2, 0, 1, 0}, /* COL */
+ {1, 25, 2, 0, 1, 0}, /* CRS */
+ {2, 6, 2, 0, 1, 0}, /* TX_CLK - CLK7 */
+ {2, 7, 2, 0, 1, 0}, /* RX_CLK - CLK8 */
/* PCI1 */
- {5, 4, 2, 0, 3}, /* PCI_M66EN */
- {5, 5, 1, 0, 3}, /* PCI_INTA */
- {5, 6, 1, 0, 3}, /* PCI_RSTO */
- {5, 7, 3, 0, 3}, /* PCI_C_BE0 */
- {5, 8, 3, 0, 3}, /* PCI_C_BE1 */
- {5, 9, 3, 0, 3}, /* PCI_C_BE2 */- {5, 10, 3, 0, 3}, /* PCI_C_BE3 */
- {5, 11, 3, 0, 3}, /* PCI_PAR */
- {5, 12, 3, 0, 3}, /* PCI_FRAME */
- {5, 13, 3, 0, 3}, /* PCI_TRDY */
- {5, 14, 3, 0, 3}, /* PCI_IRDY */
- {5, 15, 3, 0, 3}, /* PCI_STOP */
- {5, 16, 3, 0, 3}, /* PCI_DEVSEL */
- {5, 17, 0, 0, 0}, /* PCI_IDSEL */
- {5, 18, 3, 0, 3}, /* PCI_SERR */
- {5, 19, 3, 0, 3}, /* PCI_PERR */
- {5, 20, 3, 0, 3}, /* PCI_REQ0 */
- {5, 21, 2, 0, 3}, /* PCI_REQ1 */
- {5, 22, 2, 0, 3}, /* PCI_GNT2 */
- {5, 23, 3, 0, 3}, /* PCI_GNT0 */
- {5, 24, 1, 0, 3}, /* PCI_GNT1 */
- {5, 25, 1, 0, 3}, /* PCI_GNT2 */
- {5, 26, 0, 0, 0}, /* PCI_CLK0 */
- {5, 27, 0, 0, 0}, /* PCI_CLK1 */
- {5, 28, 0, 0, 0}, /* PCI_CLK2 */
- {5, 29, 0, 0, 3}, /* PCI_SYNC_OUT */
- {6, 0, 3, 0, 3}, /* PCI_AD0 */
- {6, 1, 3, 0, 3}, /* PCI_AD1 */
- {6, 2, 3, 0, 3}, /* PCI_AD2 */
- {6, 3, 3, 0, 3}, /* PCI_AD3 */
- {6, 4, 3, 0, 3}, /* PCI_AD4 */
- {6, 5, 3, 0, 3}, /* PCI_AD5 */
- {6, 6, 3, 0, 3}, /* PCI_AD6 */
- {6, 7, 3, 0, 3}, /* PCI_AD7 */
- {6, 8, 3, 0, 3}, /* PCI_AD8 */
- {6, 9, 3, 0, 3}, /* PCI_AD9 */- {6, 10, 3, 0, 3}, /* PCI_AD10 */
- {6, 11, 3, 0, 3}, /* PCI_AD11 */
- {6, 12, 3, 0, 3}, /* PCI_AD12 */
- {6, 13, 3, 0, 3}, /* PCI_AD13 */
- {6, 14, 3, 0, 3}, /* PCI_AD14 */
- {6, 15, 3, 0, 3}, /* PCI_AD15 */
- {6, 16, 3, 0, 3}, /* PCI_AD16 */
- {6, 17, 3, 0, 3}, /* PCI_AD17 */
- {6, 18, 3, 0, 3}, /* PCI_AD18 */
- {6, 19, 3, 0, 3}, /* PCI_AD19 */
- {6, 20, 3, 0, 3}, /* PCI_AD20 */
- {6, 21, 3, 0, 3}, /* PCI_AD21 */
- {6, 22, 3, 0, 3}, /* PCI_AD22 */
- {6, 23, 3, 0, 3}, /* PCI_AD23 */
- {6, 24, 3, 0, 3}, /* PCI_AD24 */
- {6, 25, 3, 0, 3}, /* PCI_AD25 */
- {6, 26, 3, 0, 3}, /* PCI_AD26 */
- {6, 27, 3, 0, 3}, /* PCI_AD27 */
- {6, 28, 3, 0, 3}, /* PCI_AD28 */
- {6, 29, 3, 0, 3}, /* PCI_AD29 */
- {6, 30, 3, 0, 3}, /* PCI_AD30 */
- {6, 31, 3, 0, 3}, /* PCI_AD31 */
+ {5, 4, 2, 0, 3, 0}, /* PCI_M66EN */
+ {5, 5, 1, 0, 3, 0}, /* PCI_INTA */
+ {5, 6, 1, 0, 3, 0}, /* PCI_RSTO */
+ {5, 7, 3, 0, 3, 0}, /* PCI_C_BE0 */
+ {5, 8, 3, 0, 3, 0}, /* PCI_C_BE1 */
+ {5, 9, 3, 0, 3, 0}, /* PCI_C_BE2 */+ {5, 10, 3, 0, 3, 0}, /* PCI_C_BE3 */
+ {5, 11, 3, 0, 3, 0}, /* PCI_PAR */
+ {5, 12, 3, 0, 3, 0}, /* PCI_FRAME */
+ {5, 13, 3, 0, 3, 0}, /* PCI_TRDY */
+ {5, 14, 3, 0, 3, 0}, /* PCI_IRDY */
+ {5, 15, 3, 0, 3, 0}, /* PCI_STOP */
+ {5, 16, 3, 0, 3, 0}, /* PCI_DEVSEL */
+ {5, 17, 0, 0, 0, 0}, /* PCI_IDSEL */
+ {5, 18, 3, 0, 3, 0}, /* PCI_SERR */
+ {5, 19, 3, 0, 3, 0}, /* PCI_PERR */
+ {5, 20, 3, 0, 3, 0}, /* PCI_REQ0 */
+ {5, 21, 2, 0, 3, 0}, /* PCI_REQ1 */
+ {5, 22, 2, 0, 3, 0}, /* PCI_GNT2 */
+ {5, 23, 3, 0, 3, 0}, /* PCI_GNT0 */
+ {5, 24, 1, 0, 3, 0}, /* PCI_GNT1 */
+ {5, 25, 1, 0, 3, 0}, /* PCI_GNT2 */
+ {5, 26, 0, 0, 0, 0}, /* PCI_CLK0 */
+ {5, 27, 0, 0, 0, 0}, /* PCI_CLK1 */
+ {5, 28, 0, 0, 0, 0}, /* PCI_CLK2 */
+ {5, 29, 0, 0, 3, 0}, /* PCI_SYNC_OUT */
+ {6, 0, 3, 0, 3, 0}, /* PCI_AD0 */
+ {6, 1, 3, 0, 3, 0}, /* PCI_AD1 */
+ {6, 2, 3, 0, 3, 0}, /* PCI_AD2 */
+ {6, 3, 3, 0, 3, 0}, /* PCI_AD3 */
+ {6, 4, 3, 0, 3, 0}, /* PCI_AD4 */
+ {6, 5, 3, 0, 3, 0}, /* PCI_AD5 */
+ {6, 6, 3, 0, 3, 0}, /* PCI_AD6 */
+ {6, 7, 3, 0, 3, 0}, /* PCI_AD7 */
+ {6, 8, 3, 0, 3, 0}, /* PCI_AD8 */
+ {6, 9, 3, 0, 3, 0}, /* PCI_AD9 */+ {6, 10, 3, 0, 3, 0}, /* PCI_AD10 */
+ {6, 11, 3, 0, 3, 0}, /* PCI_AD11 */
+ {6, 12, 3, 0, 3, 0}, /* PCI_AD12 */
+ {6, 13, 3, 0, 3, 0}, /* PCI_AD13 */
+ {6, 14, 3, 0, 3, 0}, /* PCI_AD14 */
+ {6, 15, 3, 0, 3, 0}, /* PCI_AD15 */
+ {6, 16, 3, 0, 3, 0}, /* PCI_AD16 */
+ {6, 17, 3, 0, 3, 0}, /* PCI_AD17 */
+ {6, 18, 3, 0, 3, 0}, /* PCI_AD18 */
+ {6, 19, 3, 0, 3, 0}, /* PCI_AD19 */
+ {6, 20, 3, 0, 3, 0}, /* PCI_AD20 */
+ {6, 21, 3, 0, 3, 0}, /* PCI_AD21 */
+ {6, 22, 3, 0, 3, 0}, /* PCI_AD22 */
+ {6, 23, 3, 0, 3, 0}, /* PCI_AD23 */
+ {6, 24, 3, 0, 3, 0}, /* PCI_AD24 */
+ {6, 25, 3, 0, 3, 0}, /* PCI_AD25 */
+ {6, 26, 3, 0, 3, 0}, /* PCI_AD26 */
+ {6, 27, 3, 0, 3, 0}, /* PCI_AD27 */
+ {6, 28, 3, 0, 3, 0}, /* PCI_AD28 */
+ {6, 29, 3, 0, 3, 0}, /* PCI_AD29 */
+ {6, 30, 3, 0, 3, 0}, /* PCI_AD30 */
+ {6, 31, 3, 0, 3, 0}, /* PCI_AD31 */
/* NAND */
- {4, 18, 2, 0, 0}, /* NAND_RYnBY */
+ {4, 18, 2, 0, 0, 0}, /* NAND_RYnBY */
/* DUART - UART2 */
- {5, 0, 1, 0, 2}, /* UART2_SOUT */
- {5, 2, 1, 0, 1}, /* UART2_RTS */
- {5, 3, 2, 0, 2}, /* UART2_SIN */
- {5, 1, 2, 0, 3}, /* UART2_CTS */
+ {5, 0, 1, 0, 2, 0}, /* UART2_SOUT */
+ {5, 2, 1, 0, 1, 0}, /* UART2_RTS */
+ {5, 3, 2, 0, 2, 0}, /* UART2_SIN */
+ {5, 1, 2, 0, 3, 0}, /* UART2_CTS *//* UCC5 - UART3 */
- {3, 0, 1, 0, 1}, /* UART3_TX */
- {3, 4, 1, 0, 1}, /* UART3_RTS */
- {3, 6, 2, 0, 1}, /* UART3_RX */
- {3, 12, 2, 0, 0}, /* UART3_CTS */
- {3, 13, 2, 0, 0}, /* UCC5_CD */
+ {3, 0, 1, 0, 1, 0}, /* UART3_TX */
+ {3, 4, 1, 0, 1, 0}, /* UART3_RTS */
+ {3, 6, 2, 0, 1, 0}, /* UART3_RX */+ {3, 12, 2, 0, 0, 0}, /* UART3_CTS */
+ {3, 13, 2, 0, 0, 0}, /* UCC5_CD */
/* UCC6 - UART4 */
- {3, 14, 1, 0, 1}, /* UART4_TX */
- {3, 18, 1, 0, 1}, /* UART4_RTS */
- {3, 20, 2, 0, 1}, /* UART4_RX */
- {3, 26, 2, 0, 0}, /* UART4_CTS */
- {3, 27, 2, 0, 0}, /* UCC6_CD */
+ {3, 14, 1, 0, 1, 0}, /* UART4_TX */
+ {3, 18, 1, 0, 1, 0}, /* UART4_RTS */
+ {3, 20, 2, 0, 1, 0}, /* UART4_RX */
+ {3, 26, 2, 0, 0, 0}, /* UART4_CTS */
+ {3, 27, 2, 0, 0, 0}, /* UCC6_CD */
/* Fujitsu MB86277 (MINT) graphics controller */
- {0, 30, 1, 0, 0}, /* nSRESET_GRAPHICS */
- {1, 5, 1, 0, 0}, /* nXRST_GRAPHICS */
- {1, 7, 1, 0, 0}, /* LVDS_BKLT_CTR */
- {2, 16, 1, 0, 0}, /* LVDS_BKLT_EN */
+ {0, 30, 1, 0, 0, 0}, /* nSRESET_GRAPHICS */
+ {1, 5, 1, 0, 0, 0}, /* nXRST_GRAPHICS */
+ {1, 7, 1, 0, 0, 0}, /* LVDS_BKLT_CTR */
+ {2, 16, 1, 0, 0, 0}, /* LVDS_BKLT_EN */
/* END of table */
- {0, 0, 0, 0, QE_IOP_TAB_END},
+ {0, 0, 0, 0, QE_IOP_TAB_END, 0},
};
int board_early_init_f(void)
diff -purN a/board/freescale/mpc8568mds/mpc8568mds.c b/board/freescale/mpc8568mds/mpc8568mds.c
--- a/board/freescale/mpc8568mds/mpc8568mds.c 2008-01-16
23:06:52.000000000 +0200
+++ b/board/freescale/mpc8568mds/mpc8568mds.c 2008-01-17
16:03:46.708593000 +0200
@@ -37,64 +37,64 @@
const qe_iop_conf_t qe_iop_conf_tab[] = {
/* GETH1 */
- {4, 10, 1, 0, 2}, /* TxD0 */
- {4, 9, 1, 0, 2}, /* TxD1 */
- {4, 8, 1, 0, 2}, /* TxD2 */
- {4, 7, 1, 0, 2}, /* TxD3 */- {4, 23, 1, 0, 2}, /* TxD4 */
- {4, 22, 1, 0, 2}, /* TxD5 */
- {4, 21, 1, 0, 2}, /* TxD6 */
- {4, 20, 1, 0, 2}, /* TxD7 */
- {4, 15, 2, 0, 2}, /* RxD0 */
- {4, 14, 2, 0, 2}, /* RxD1 */
- {4, 13, 2, 0, 2}, /* RxD2 */
- {4, 12, 2, 0, 2}, /* RxD3 */
- {4, 29, 2, 0, 2}, /* RxD4 */
- {4, 28, 2, 0, 2}, /* RxD5 */
- {4, 27, 2, 0, 2}, /* RxD6 */
- {4, 26, 2, 0, 2}, /* RxD7 */
- {4, 11, 1, 0, 2}, /* TX_EN */
- {4, 24, 1, 0, 2}, /* TX_ER */
- {4, 16, 2, 0, 2}, /* RX_DV */
- {4, 30, 2, 0, 2}, /* RX_ER */
- {4, 17, 2, 0, 2}, /* RX_CLK */
- {4, 19, 1, 0, 2}, /* GTX_CLK */
- {1, 31, 2, 0, 3}, /* GTX125 */
+ {4, 10, 1, 0, 2, 0}, /* TxD0 */
+ {4, 9, 1, 0, 2, 0}, /* TxD1 */
+ {4, 8, 1, 0, 2, 0}, /* TxD2 */
+ {4, 7, 1, 0, 2, 0}, /* TxD3 */+ {4, 23, 1, 0, 2, 0}, /* TxD4 */
+ {4, 22, 1, 0, 2, 0}, /* TxD5 */
+ {4, 21, 1, 0, 2, 0}, /* TxD6 */
+ {4, 20, 1, 0, 2, 0}, /* TxD7 */
+ {4, 15, 2, 0, 2, 0}, /* RxD0 */
+ {4, 14, 2, 0, 2, 0}, /* RxD1 */
+ {4, 13, 2, 0, 2, 0}, /* RxD2 */
+ {4, 12, 2, 0, 2, 0}, /* RxD3 */
+ {4, 29, 2, 0, 2, 0}, /* RxD4 */
+ {4, 28, 2, 0, 2, 0}, /* RxD5 */
+ {4, 27, 2, 0, 2, 0}, /* RxD6 */
+ {4, 26, 2, 0, 2, 0}, /* RxD7 */
+ {4, 11, 1, 0, 2, 0}, /* TX_EN */
+ {4, 24, 1, 0, 2, 0}, /* TX_ER */
+ {4, 16, 2, 0, 2, 0}, /* RX_DV */
+ {4, 30, 2, 0, 2, 0}, /* RX_ER */
+ {4, 17, 2, 0, 2, 0}, /* RX_CLK */
+ {4, 19, 1, 0, 2, 0}, /* GTX_CLK */
+ {1, 31, 2, 0, 3, 0}, /* GTX125 */
/* GETH2 */
- {5, 10, 1, 0, 2}, /* TxD0 */
- {5, 9, 1, 0, 2}, /* TxD1 */
- {5, 8, 1, 0, 2}, /* TxD2 */
- {5, 7, 1, 0, 2}, /* TxD3 */- {5, 23, 1, 0, 2}, /* TxD4 */
- {5, 22, 1, 0, 2}, /* TxD5 */
- {5, 21, 1, 0, 2}, /* TxD6 */
- {5, 20, 1, 0, 2}, /* TxD7 */
- {5, 15, 2, 0, 2}, /* RxD0 */
- {5, 14, 2, 0, 2}, /* RxD1 */
- {5, 13, 2, 0, 2}, /* RxD2 */
- {5, 12, 2, 0, 2}, /* RxD3 */
- {5, 29, 2, 0, 2}, /* RxD4 */
- {5, 28, 2, 0, 2}, /* RxD5 */
- {5, 27, 2, 0, 3}, /* RxD6 */
- {5, 26, 2, 0, 2}, /* RxD7 */
- {5, 11, 1, 0, 2}, /* TX_EN */
- {5, 24, 1, 0, 2}, /* TX_ER */
- {5, 16, 2, 0, 2}, /* RX_DV */
- {5, 30, 2, 0, 2}, /* RX_ER */
- {5, 17, 2, 0, 2}, /* RX_CLK */
- {5, 19, 1, 0, 2}, /* GTX_CLK */
- {1, 31, 2, 0, 3}, /* GTX125 */
- {4, 6, 3, 0, 2}, /* MDIO */
- {4, 5, 1, 0, 2}, /* MDC */
+ {5, 10, 1, 0, 2, 0}, /* TxD0 */
+ {5, 9, 1, 0, 2, 0}, /* TxD1 */
+ {5, 8, 1, 0, 2, 0}, /* TxD2 */
+ {5, 7, 1, 0, 2, 0}, /* TxD3 */+ {5, 23, 1, 0, 2, 0}, /* TxD4 */
+ {5, 22, 1, 0, 2, 0}, /* TxD5 */
+ {5, 21, 1, 0, 2, 0}, /* TxD6 */
+ {5, 20, 1, 0, 2, 0}, /* TxD7 */
+ {5, 15, 2, 0, 2, 0}, /* RxD0 */
+ {5, 14, 2, 0, 2, 0}, /* RxD1 */
+ {5, 13, 2, 0, 2, 0}, /* RxD2 */
+ {5, 12, 2, 0, 2, 0}, /* RxD3 */
+ {5, 29, 2, 0, 2, 0}, /* RxD4 */
+ {5, 28, 2, 0, 2, 0}, /* RxD5 */
+ {5, 27, 2, 0, 3, 0}, /* RxD6 */
+ {5, 26, 2, 0, 2, 0}, /* RxD7 */
+ {5, 11, 1, 0, 2, 0}, /* TX_EN */
+ {5, 24, 1, 0, 2, 0}, /* TX_ER */
+ {5, 16, 2, 0, 2, 0}, /* RX_DV */
+ {5, 30, 2, 0, 2, 0}, /* RX_ER */
+ {5, 17, 2, 0, 2, 0}, /* RX_CLK */
+ {5, 19, 1, 0, 2, 0}, /* GTX_CLK */
+ {1, 31, 2, 0, 3, 0}, /* GTX125 */
+ {4, 6, 3, 0, 2, 0}, /* MDIO */
+ {4, 5, 1, 0, 2, 0}, /* MDC */
/* UART1 */
- {2, 0, 1, 0, 2}, /* UART_SOUT1 */
- {2, 1, 1, 0, 2}, /* UART_RTS1 */
- {2, 2, 2, 0, 2}, /* UART_CTS1 */
- {2, 3, 2, 0, 2}, /* UART_SIN1 */
+ {2, 0, 1, 0, 2, 0}, /* UART_SOUT1 */
+ {2, 1, 1, 0, 2, 0}, /* UART_RTS1 */
+ {2, 2, 2, 0, 2, 0}, /* UART_CTS1 */
+ {2, 3, 2, 0, 2, 0}, /* UART_SIN1 */
- {0, 0, 0, 0, QE_IOP_TAB_END}, /* END of table */
+ {0, 0, 0, 0, QE_IOP_TAB_END, 0}, /* END of table */
};
diff -purN a/board/freescale/mpc8323erdb/mpc8323erdb.c b/board/freescale/mpc8323erdb/mpc8323erdb.c
--- a/board/freescale/mpc8323erdb/mpc8323erdb.c 2008-01-16
23:06:52.000000000 +0200
+++ b/board/freescale/mpc8323erdb/mpc8323erdb.c 2008-01-17
16:09:44.661841000 +0200
@@ -28,47 +28,47 @@
const qe_iop_conf_t qe_iop_conf_tab[] = {
/* UCC3 */
- {1, 0, 1, 0, 1}, /* TxD0 */
- {1, 1, 1, 0, 1}, /* TxD1 */
- {1, 2, 1, 0, 1}, /* TxD2 */
- {1, 3, 1, 0, 1}, /* TxD3 */
- {1, 9, 1, 0, 1}, /* TxER */
- {1, 12, 1, 0, 1}, /* TxEN */
- {3, 24, 2, 0, 1}, /* TxCLK->CLK10 */
-
- {1, 4, 2, 0, 1}, /* RxD0 */
- {1, 5, 2, 0, 1}, /* RxD1 */
- {1, 6, 2, 0, 1}, /* RxD2 */
- {1, 7, 2, 0, 1}, /* RxD3 */
- {1, 8, 2, 0, 1}, /* RxER */- {1, 10, 2, 0, 1}, /* RxDV */
- {0, 13, 2, 0, 1}, /* RxCLK->CLK9 */
- {1, 11, 2, 0, 1}, /* COL */
- {1, 13, 2, 0, 1}, /* CRS */
+ {1, 0, 1, 0, 1, 0}, /* TxD0 */
+ {1, 1, 1, 0, 1, 0}, /* TxD1 */
+ {1, 2, 1, 0, 1, 0}, /* TxD2 */
+ {1, 3, 1, 0, 1, 0}, /* TxD3 */
+ {1, 9, 1, 0, 1, 0}, /* TxER */
+ {1, 12, 1, 0, 1, 0}, /* TxEN */
+ {3, 24, 2, 0, 1, 0}, /* TxCLK->CLK10 */
+
+ {1, 4, 2, 0, 1, 0}, /* RxD0 */
+ {1, 5, 2, 0, 1, 0}, /* RxD1 */
+ {1, 6, 2, 0, 1, 0}, /* RxD2 */
+ {1, 7, 2, 0, 1, 0}, /* RxD3 */
+ {1, 8, 2, 0, 1, 0}, /* RxER */+ {1, 10, 2, 0, 1, 0}, /* RxDV */
+ {0, 13, 2, 0, 1, 0}, /* RxCLK->CLK9 */
+ {1, 11, 2, 0, 1, 0}, /* COL */
+ {1, 13, 2, 0, 1, 0}, /* CRS */
/* UCC2 */
- {0, 18, 1, 0, 1}, /* TxD0 */
- {0, 19, 1, 0, 1}, /* TxD1 */
- {0, 20, 1, 0, 1}, /* TxD2 */
- {0, 21, 1, 0, 1}, /* TxD3 */
- {0, 27, 1, 0, 1}, /* TxER */
- {0, 30, 1, 0, 1}, /* TxEN */
- {3, 23, 2, 0, 1}, /* TxCLK->CLK3 */
-
- {0, 22, 2, 0, 1}, /* RxD0 */
- {0, 23, 2, 0, 1}, /* RxD1 */
- {0, 24, 2, 0, 1}, /* RxD2 */
- {0, 25, 2, 0, 1}, /* RxD3 */
- {0, 26, 1, 0, 1}, /* RxER */
- {0, 28, 2, 0, 1}, /* Rx_DV */
- {3, 21, 2, 0, 1}, /* RxCLK->CLK16 */
- {0, 29, 2, 0, 1}, /* COL */
- {0, 31, 2, 0, 1}, /* CRS */
+ {0, 18, 1, 0, 1, 0}, /* TxD0 */
+ {0, 19, 1, 0, 1, 0}, /* TxD1 */
+ {0, 20, 1, 0, 1, 0}, /* TxD2 */
+ {0, 21, 1, 0, 1, 0}, /* TxD3 */
+ {0, 27, 1, 0, 1, 0}, /* TxER */
+ {0, 30, 1, 0, 1, 0}, /* TxEN */
+ {3, 23, 2, 0, 1, 0}, /* TxCLK->CLK3 */
+
+ {0, 22, 2, 0, 1, 0}, /* RxD0 */
+ {0, 23, 2, 0, 1, 0}, /* RxD1 */
+ {0, 24, 2, 0, 1, 0}, /* RxD2 */
+ {0, 25, 2, 0, 1, 0}, /* RxD3 */
+ {0, 26, 1, 0, 1, 0}, /* RxER */
+ {0, 28, 2, 0, 1, 0}, /* Rx_DV */
+ {3, 21, 2, 0, 1, 0}, /* RxCLK->CLK16 */
+ {0, 29, 2, 0, 1, 0}, /* COL */
+ {0, 31, 2, 0, 1, 0}, /* CRS */
- {3, 4, 3, 0, 2}, /* MDIO */
- {3, 5, 1, 0, 2}, /* MDC */
+ {3, 4, 3, 0, 2, 0}, /* MDIO */
+ {3, 5, 1, 0, 2, 0}, /* MDC */- {0, 0, 0, 0, QE_IOP_TAB_END}, /* END of table */
+ {0, 0, 0, 0, QE_IOP_TAB_END, 0}, /* END of table */
};
int board_early_init_f(void)
diff -purN a/board/freescale/mpc832xemds/mpc832xemds.c b/board/freescale/mpc832xemds/mpc832xemds.c
--- a/board/freescale/mpc832xemds/mpc832xemds.c 2008-01-16
23:06:52.000000000 +0200
+++ b/board/freescale/mpc832xemds/mpc832xemds.c 2008-01-17
16:10:52.724934000 +0200
@@ -36,47 +36,47 @@
const qe_iop_conf_t qe_iop_conf_tab[] = {
/* ETH3 */
- {1, 0, 1, 0, 1}, /* TxD0 */
- {1, 1, 1, 0, 1}, /* TxD1 */
- {1, 2, 1, 0, 1}, /* TxD2 */
- {1, 3, 1, 0, 1}, /* TxD3 */
- {1, 9, 1, 0, 1}, /* TxER */
- {1, 12, 1, 0, 1}, /* TxEN */
- {3, 24, 2, 0, 1}, /* TxCLK->CLK10 */
-
- {1, 4, 2, 0, 1}, /* RxD0 */
- {1, 5, 2, 0, 1}, /* RxD1 */
- {1, 6, 2, 0, 1}, /* RxD2 */
- {1, 7, 2, 0, 1}, /* RxD3 */
- {1, 8, 2, 0, 1}, /* RxER */- {1, 10, 2, 0, 1}, /* RxDV */
- {0, 13, 2, 0, 1}, /* RxCLK->CLK9 */
- {1, 11, 2, 0, 1}, /* COL */
- {1, 13, 2, 0, 1}, /* CRS */
+ {1, 0, 1, 0, 1, 0}, /* TxD0 */
+ {1, 1, 1, 0, 1, 0}, /* TxD1 */
+ {1, 2, 1, 0, 1, 0}, /* TxD2 */
+ {1, 3, 1, 0, 1, 0}, /* TxD3 */
+ {1, 9, 1, 0, 1, 0}, /* TxER */
+ {1, 12, 1, 0, 1, 0}, /* TxEN */
+ {3, 24, 2, 0, 1, 0}, /* TxCLK->CLK10 */
+
+ {1, 4, 2, 0, 1, 0}, /* RxD0 */
+ {1, 5, 2, 0, 1, 0}, /* RxD1 */
+ {1, 6, 2, 0, 1, 0}, /* RxD2 */
+ {1, 7, 2, 0, 1, 0}, /* RxD3 */
+ {1, 8, 2, 0, 1, 0}, /* RxER */+ {1, 10, 2, 0, 1, 0}, /* RxDV */
+ {0, 13, 2, 0, 1, 0}, /* RxCLK->CLK9 */
+ {1, 11, 2, 0, 1, 0}, /* COL */
+ {1, 13, 2, 0, 1, 0}, /* CRS */
/* ETH4 */
- {1, 18, 1, 0, 1}, /* TxD0 */
- {1, 19, 1, 0, 1}, /* TxD1 */
- {1, 20, 1, 0, 1}, /* TxD2 */
- {1, 21, 1, 0, 1}, /* TxD3 */
- {1, 27, 1, 0, 1}, /* TxER */
- {1, 30, 1, 0, 1}, /* TxEN */
- {3, 6, 2, 0, 1}, /* TxCLK->CLK8 */
-
- {1, 22, 2, 0, 1}, /* RxD0 */
- {1, 23, 2, 0, 1}, /* RxD1 */
- {1, 24, 2, 0, 1}, /* RxD2 */
- {1, 25, 2, 0, 1}, /* RxD3 */
- {1, 26, 1, 0, 1}, /* RxER */
- {1, 28, 2, 0, 1}, /* Rx_DV */
- {3, 31, 2, 0, 1}, /* RxCLK->CLK7 */
- {1, 29, 2, 0, 1}, /* COL */
- {1, 31, 2, 0, 1}, /* CRS */
+ {1, 18, 1, 0, 1, 0}, /* TxD0 */
+ {1, 19, 1, 0, 1, 0}, /* TxD1 */
+ {1, 20, 1, 0, 1, 0}, /* TxD2 */
+ {1, 21, 1, 0, 1, 0}, /* TxD3 */
+ {1, 27, 1, 0, 1, 0}, /* TxER */
+ {1, 30, 1, 0, 1, 0}, /* TxEN */
+ {3, 6, 2, 0, 1, 0}, /* TxCLK->CLK8 */
+
+ {1, 22, 2, 0, 1, 0}, /* RxD0 */
+ {1, 23, 2, 0, 1, 0}, /* RxD1 */
+ {1, 24, 2, 0, 1, 0}, /* RxD2 */
+ {1, 25, 2, 0, 1, 0}, /* RxD3 */
+ {1, 26, 1, 0, 1, 0}, /* RxER */
+ {1, 28, 2, 0, 1, 0}, /* Rx_DV */
+ {3, 31, 2, 0, 1, 0}, /* RxCLK->CLK7 */
+ {1, 29, 2, 0, 1, 0}, /* COL */
+ {1, 31, 2, 0, 1, 0}, /* CRS */
- {3, 4, 3, 0, 2}, /* MDIO */
- {3, 5, 1, 0, 2}, /* MDC */
+ {3, 4, 3, 0, 2, 0}, /* MDIO */
+ {3, 5, 1, 0, 2, 0}, /* MDC */- {0, 0, 0, 0, QE_IOP_TAB_END}, /* END of table */
+ {0, 0, 0, 0, QE_IOP_TAB_END, 0}, /* END of table */
};
int board_early_init_f(void)
PATCH v2 1/1 QE IO: Add initial data to pin configuration + read/write functions
Quoted 6 lines · David Saada
On the MPC83xx & MPC85xx architectures that have QE, add initial data to the pin configuration table (
qe_iop_conf_tab). QE initialization tables in all relevant boards were also replaced.
In addition, add IO pin read & write functions.Signed-off-by David Saada <[email protected]>
Looks okay at first glance, but I couldn't apply the patch:
$ git-am "/home/b04825/.mozilla/default/2ir4ayuy.slt/Mail/Local Folders/patches"
Applying QE IO: Add initial data to pin configuration + read/write functions
fatal: corrupt patch at line 40
Patch failed at 0001.
Looks like you have a line wrapping problem in your emailer. Try using git-send-email.
Signature · 2 lines
Timur Tabi Linux kernel developer at Freescale
PATCH v2 1/1 QE IO: Add initial data to pin configuration + read/write functions
In reply to David SaadaQuoted 4 lines · David Saada
(quoted diff) +0
-0@@ -38,6 +38,16 @@ void qe_config_iopin(u8 port, u8 pin, in volatile par_io_t *par_io = (volatile par_io_t *) &(gur->qe_par_io);
Review void qe_config_iopin(u8 port, u8 pin, in · line 50
Quoted 10 lines
(quoted diff) +10
-0+ /* Calculate pin location for 1bit mask */ + pin_1bit_mask = (u32)(1 << (NUM_OF_PINS - (pin+1))); + + /* Setup the data */ + tmp_val = in_be32(&par_io[port].cpdat); + if (data) + out_be32(&par_io[port].cpdat, pin_1bit_mask | tmp_val); + else + out_be32(&par_io[port].cpdat, ~pin_1bit_mask & tmp_val); +
I see that qe_config_iopin() will always write a 0 or 1 now, ignoring the current value. Are you sure this is a good idea? What if I don't want U-Boot to change the current pin value?
Plus, doesn't this assume that the pin is set to output? Shouldn't you check to see if the pin is output or input/output, and only write cpdat if it is? Also, I believe that cpdat is used only if the pin is configured as a GPIO. If so, I don't see you check for that, either.
Signature · 2 lines
Timur Tabi Linux kernel developer at Freescale
PATCH v2 1/1 QE IO: Add initial data to pin configuration + read/write functions
Quoted 3 lines
I see that
qe_config_iopin()will always write a 0 or 1 now, ignoring the current value.? Are you sure this is a good idea?? What if I don't want U-Boot to change the current pin value?
Well, not sure how important this is, as this function is typically used for?port initialization. This was also the case in the CPM2 initialization tables. Anyway, I can add a value of 2 which would stand for don't care.
Quoted 4 lines
Plus, doesn't this assume that the pin is set to output?? Shouldn't you check to see if the pin is output or input/output, and only write cpdat if it is?? Also, I believe that cpdat is used only if the pin is configured as a GPIO.? If so, I don't see you check for that, either.
Good points. Will add these checks and repost the patch. Will also try to post in a different mailer to overcome the line wrapping problem. ?
David.
PATCH v3 1/1 QE IO: Add initial data to pin configuration + read/write functions
In reply to Timur TabiOn the MPC83xx & MPC85xx architectures that have QE, add initial data to the pin configuration table (qe_iop_conf_tab). This is relevant for GPIO pins defined as output. One can setup a value of 2 to leave the value unchanged.
QE initialization tables in all relevant boards were also replaced. In addition, add IO pin read & write functions.
include/ioports.h +1 -0
@@ -60,6 +60,7 @@ typedef struct {int dir;int open_drain;int assign; +int data; } qe_iop_conf_t;#define QE_IOP_TAB_END (-1)
cpu/mpc85xx/cpu_init.c +4 -3
@@ -37,14 +37,14 @@ DECLARE_GLOBAL_DATA_PTR;#ifdef CONFIG_QE extern qe_iop_conf_t qe_iop_conf_tab[];extern void qe_config_iopin (u8 port,u8 pin,int dir, -int open_drain,int assign); +int open_drain,int assign,int data);extern void qe_init (uint qe_base);extern void qe_reset (void );static void config_qe_ioports (void ) {u8 port, pin; -int dir, open_drain, assign; +int dir, open_drain, assign, data;int i;for (i =0 ; qe_iop_conf_tab[i].assign !=QE_IOP_TAB_END ; i++) {
@@ -53,7 +53,8 @@ static void config_qe_ioports(void) dir = qe_iop_conf_tab[i].dir; open_drain = qe_iop_conf_tab[i].open_drain; assign = qe_iop_conf_tab[i].assign; -qe_config_iopin (port, pin, dir, open_drain, assign); + data = qe_iop_conf_tab[i].data; + qe_config_iopin(port, pin, dir, open_drain, assign,
data);
}
}
#endif
cpu/mpc85xx/qe_io.c +0 -1
@@ -27,7 +27,8 @@#if defined(CONFIG_QE )#define NUM_OF_PINS 32 -void qe_config_iopin(u8 port, u8 pin, int dir, int open_drain, int
assign)
+void qe_config_iopin(u8 port, u8 pin, int dir, int open_drain, int assign,
+ int data)
{
u32 pin_2bit_mask;
u32 pin_2bit_dir;
@@ -38,6 +39,20 @@ void qe_config_iopin(u8 port, u8 pin, in
volatile par_io_t *par_io = (volatile par_io_t *)
&(gur->qe_par_io);
+ /* Calculate pin location for 1bit mask */
+ pin_1bit_mask = (u32)(1 << (NUM_OF_PINS - (pin+1)));
+
+ /* Setup the data */
+ if ((data != 2) && /* Don't leave unchanged */
+ (assign == 0) && /* GPIO */
+ (dir & 1)) { /* Has output */
+ tmp_val = in_be32(&par_io[port].cpdat);
+ if (data)
+ out_be32(&par_io[port].cpdat, pin_1bit_mask |tmp_val);
+ else
+ out_be32(&par_io[port].cpdat, ~pin_1bit_mask &tmp_val);
+ }
+
/* Caculate pin location and 2bit mask and dir */ pin_2bit_mask = (u32)(0x3 <<
(NUM_OF_PINS-(pin%(NUM_OF_PINS/2)+1)*2));
pin_2bit_dir = (u32)(dir <<
(NUM_OF_PINS-(pin%(NUM_OF_PINS/2)+1)*2));
@@ -55,9 +70,6 @@ void qe_config_iopin(u8 port, u8 pin, in
out_be32(&par_io[port].cpdir1, pin_2bit_dir | tmp_val);
}
- /* Calculate pin location for 1bit mask */
- pin_1bit_mask = (u32)(1 << (NUM_OF_PINS - (pin+1)));
-
/* Setup the open drain */
tmp_val = in_be32(&par_io[port].cpodr);
if (open_drain)
@@ -82,4 +94,39 @@ void qe_config_iopin(u8 port, u8 pin, in
}
}
+void qe_read_iopin(u8 port, u8 pin, int *data)
+{
+ u32 pin_1bit_mask;
+ u32 tmp_val;
+ volatile ccsr_gur_t *gur = (void *)(CFG_MPC85xx_GUTS_ADDR);
+ volatile par_io_t *par_io = (volatile par_io_t *)
+ &(gur->qe_par_io);
+
+ /* Calculate pin location for 1bit mask */
+ pin_1bit_mask = (u32)(1 << (NUM_OF_PINS - (pin+1)));
+
+ /* Read the data */
+ tmp_val = in_be32(&par_io[port].cpdat);
+ *data = (tmp_val >> (NUM_OF_PINS - (pin+1))) & 0x1;
+}
+
+void qe_write_iopin(u8 port, u8 pin, int data)
+{
+ u32 pin_1bit_mask;
+ u32 tmp_val;
+ volatile ccsr_gur_t *gur = (void *)(CFG_MPC85xx_GUTS_ADDR);
+ volatile par_io_t *par_io = (volatile par_io_t *)
+ &(gur->qe_par_io);
+
+ /* Calculate pin location for 1bit mask */
+ pin_1bit_mask = (u32)(1 << (NUM_OF_PINS - (pin+1)));
+
+ /* Write the data */
+ tmp_val = in_be32(&par_io[port].cpdat);
+ if (data)
+ out_be32(&par_io[port].cpdat, pin_1bit_mask | tmp_val);
+ else
+ out_be32(&par_io[port].cpdat, ~pin_1bit_mask & tmp_val);
+}
+
#endif /* CONFIG_QE */
cpu/mpc83xx/cpu_init.c +4 -3
@@ -29,14 +29,14 @@ DECLARE_GLOBAL_DATA_PTR;#ifdef CONFIG_QE extern qe_iop_conf_t qe_iop_conf_tab[];extern void qe_config_iopin (u8 port,u8 pin,int dir, -int open_drain,int assign); +int open_drain,int assign,int data);extern void qe_init (uint qe_base);extern void qe_reset (void );static void config_qe_ioports (void ) {u8 port, pin; -int dir, open_drain, assign; +int dir, open_drain, assign, data;int i;for (i =0 ; qe_iop_conf_tab[i].assign !=QE_IOP_TAB_END ; i++) {
@@ -45,7 +45,8 @@ static void config_qe_ioports(void) dir = qe_iop_conf_tab[i].dir; open_drain = qe_iop_conf_tab[i].open_drain; assign = qe_iop_conf_tab[i].assign; -qe_config_iopin (port, pin, dir, open_drain, assign); + data = qe_iop_conf_tab[i].data; + qe_config_iopin(port, pin, dir, open_drain, assign,
data);
}
}
#endif
cpu/mpc83xx/qe_io.c +0 -1
@@ -27,7 +27,8 @@#if defined(CONFIG_QE )#define NUM_OF_PINS 32 -void qe_config_iopin(u8 port, u8 pin, int dir, int open_drain, int
assign)
+void qe_config_iopin(u8 port, u8 pin, int dir, int open_drain, int assign,
+ int data)
{
u32 pin_2bit_mask;
u32 pin_2bit_dir;
@@ -37,6 +38,20 @@ void qe_config_iopin(u8 port, u8 pin, in
volatile immap_t *im = (volatile immap_t *)CFG_IMMR;
volatile qepio83xx_t *par_io = (volatile qepio83xx_t
*)&im->qepio;
+ /* Calculate pin location for 1bit mask */
+ pin_1bit_mask = (u32)(1 << (NUM_OF_PINS - (pin+1)));
+
+ /* Setup the data */
+ if ((data != 2) && /* Don't leave unchanged */
+ (assign == 0) && /* GPIO */
+ (dir & 1)) { /* Has output */
+ tmp_val = in_be32(&par_io->ioport[port].pdat);
+ if (data)
+ out_be32(&par_io->ioport[port].pdat,pin_1bit_mask | tmp_val);
+ else
+ out_be32(&par_io->ioport[port].pdat,
~pin_1bit_mask & tmp_val);
+ }
+
/* Caculate pin location and 2bit mask and dir */ pin_2bit_mask = (u32)(0x3 <<
(NUM_OF_PINS-(pin%(NUM_OF_PINS/2)+1)*2));
pin_2bit_dir = (u32)(dir <<
(NUM_OF_PINS-(pin%(NUM_OF_PINS/2)+1)*2));
@@ -54,9 +69,6 @@ void qe_config_iopin(u8 port, u8 pin, in
out_be32(&par_io->ioport[port].dir1, pin_2bit_dir |tmp_val);
}
- /* Calculate pin location for 1bit mask */
- pin_1bit_mask = (u32)(1 << (NUM_OF_PINS - (pin+1)));
-
/* Setup the open drain */
tmp_val = in_be32(&par_io->ioport[port].podr); if (open_drain) {
@@ -82,4 +94,38 @@ void qe_config_iopin(u8 port, u8 pin, in
}
}
+void qe_read_iopin(u8 port, u8 pin, int *data)
+{
+ u32 pin_1bit_mask;
+ u32 tmp_val;
+ volatile immap_t *im = (volatile immap_t *)CFG_IMMR;
+ volatile qepio83xx_t *par_io = (volatile qepio83xx_t
*)&im->qepio;
+
+ /* Calculate pin location for 1bit mask */
+ pin_1bit_mask = (u32)(1 << (NUM_OF_PINS - (pin+1)));
+
+ /* Read the data */
+ tmp_val = in_be32(&par_io->ioport[port].pdat);
+ *data = (tmp_val >> (NUM_OF_PINS - (pin+1))) & 0x1;
+}
+
+void qe_write_iopin(u8 port, u8 pin, int data)
+{
+ u32 pin_1bit_mask;
+ u32 tmp_val;
+ volatile immap_t *im = (volatile immap_t *)CFG_IMMR;
+ volatile qepio83xx_t *par_io = (volatile qepio83xx_t
*)&im->qepio;
+
+ /* Calculate pin location for 1bit mask */
+ pin_1bit_mask = (u32)(1 << (NUM_OF_PINS - (pin+1)));
+
+ /* Setup the data */
+ tmp_val = in_be32(&par_io->ioport[port].pdat);
+ if (data) {
+ out_be32(&par_io->ioport[port].pdat, pin_1bit_mask |tmp_val);
+ } else {
+ out_be32(&par_io->ioport[port].pdat, ~pin_1bit_mask &tmp_val);
+ }
+}
+
#endif /* CONFIG_QE */
diff -purN a/board/freescale/mpc8360emds/mpc8360emds.c b/board/freescale/mpc8360emds/mpc8360emds.c
--- a/board/freescale/mpc8360emds/mpc8360emds.c 2008-01-16
23:06:51.000000000 +0200
+++ b/board/freescale/mpc8360emds/mpc8360emds.c 2008-01-17
16:03:27.428958000 +0200
@@ -34,63 +34,63 @@
const qe_iop_conf_t qe_iop_conf_tab[] = {
/* GETH1 */
- {0, 3, 1, 0, 1}, /* TxD0 */
- {0, 4, 1, 0, 1}, /* TxD1 */
- {0, 5, 1, 0, 1}, /* TxD2 */
- {0, 6, 1, 0, 1}, /* TxD3 */
- {1, 6, 1, 0, 3}, /* TxD4 */
- {1, 7, 1, 0, 1}, /* TxD5 */
- {1, 9, 1, 0, 2}, /* TxD6 */- {1, 10, 1, 0, 2}, /* TxD7 */
- {0, 9, 2, 0, 1}, /* RxD0 */
- {0, 10, 2, 0, 1}, /* RxD1 */
- {0, 11, 2, 0, 1}, /* RxD2 */
- {0, 12, 2, 0, 1}, /* RxD3 */
- {0, 13, 2, 0, 1}, /* RxD4 */
- {1, 1, 2, 0, 2}, /* RxD5 */
- {1, 0, 2, 0, 2}, /* RxD6 */
- {1, 4, 2, 0, 2}, /* RxD7 */
- {0, 7, 1, 0, 1}, /* TX_EN */
- {0, 8, 1, 0, 1}, /* TX_ER */
- {0, 15, 2, 0, 1}, /* RX_DV */
- {0, 16, 2, 0, 1}, /* RX_ER */
- {0, 0, 2, 0, 1}, /* RX_CLK */
- {2, 9, 1, 0, 3}, /* GTX_CLK - CLK10 */
- {2, 8, 2, 0, 1}, /* GTX125 - CLK9 */
+ {0, 3, 1, 0, 1, 2}, /* TxD0 */
+ {0, 4, 1, 0, 1, 2}, /* TxD1 */
+ {0, 5, 1, 0, 1, 2}, /* TxD2 */
+ {0, 6, 1, 0, 1, 2}, /* TxD3 */
+ {1, 6, 1, 0, 3, 2}, /* TxD4 */
+ {1, 7, 1, 0, 1, 2}, /* TxD5 */
+ {1, 9, 1, 0, 2, 2}, /* TxD6 */+ {1, 10, 1, 0, 2, 2}, /* TxD7 */
+ {0, 9, 2, 0, 1, 2}, /* RxD0 */
+ {0, 10, 2, 0, 1, 2}, /* RxD1 */
+ {0, 11, 2, 0, 1, 2}, /* RxD2 */
+ {0, 12, 2, 0, 1, 2}, /* RxD3 */
+ {0, 13, 2, 0, 1, 2}, /* RxD4 */
+ {1, 1, 2, 0, 2, 2}, /* RxD5 */
+ {1, 0, 2, 0, 2, 2}, /* RxD6 */
+ {1, 4, 2, 0, 2, 2}, /* RxD7 */
+ {0, 7, 1, 0, 1, 2}, /* TX_EN */
+ {0, 8, 1, 0, 1, 2}, /* TX_ER */
+ {0, 15, 2, 0, 1, 2}, /* RX_DV */
+ {0, 16, 2, 0, 1, 2}, /* RX_ER */
+ {0, 0, 2, 0, 1, 2}, /* RX_CLK */
+ {2, 9, 1, 0, 3, 2}, /* GTX_CLK - CLK10 */
+ {2, 8, 2, 0, 1, 2}, /* GTX125 - CLK9 */ /* GETH2 */
- {0, 17, 1, 0, 1}, /* TxD0 */
- {0, 18, 1, 0, 1}, /* TxD1 */
- {0, 19, 1, 0, 1}, /* TxD2 */
- {0, 20, 1, 0, 1}, /* TxD3 */
- {1, 2, 1, 0, 1}, /* TxD4 */
- {1, 3, 1, 0, 2}, /* TxD5 */
- {1, 5, 1, 0, 3}, /* TxD6 */
- {1, 8, 1, 0, 3}, /* TxD7 */- {0, 23, 2, 0, 1}, /* RxD0 */
- {0, 24, 2, 0, 1}, /* RxD1 */
- {0, 25, 2, 0, 1}, /* RxD2 */
- {0, 26, 2, 0, 1}, /* RxD3 */
- {0, 27, 2, 0, 1}, /* RxD4 */
- {1, 12, 2, 0, 2}, /* RxD5 */
- {1, 13, 2, 0, 3}, /* RxD6 */
- {1, 11, 2, 0, 2}, /* RxD7 */
- {0, 21, 1, 0, 1}, /* TX_EN */
- {0, 22, 1, 0, 1}, /* TX_ER */
- {0, 29, 2, 0, 1}, /* RX_DV */
- {0, 30, 2, 0, 1}, /* RX_ER */
- {0, 31, 2, 0, 1}, /* RX_CLK */
- {2, 2, 1, 0, 2}, /* GTX_CLK = CLK10 */
- {2, 3, 2, 0, 1}, /* GTX125 - CLK4 */
-
- {0, 1, 3, 0, 2}, /* MDIO */
- {0, 2, 1, 0, 1}, /* MDC */
-
- {5, 0, 1, 0, 2}, /* UART2_SOUT */
- {5, 1, 2, 0, 3}, /* UART2_CTS */
- {5, 2, 1, 0, 1}, /* UART2_RTS */
- {5, 3, 2, 0, 2}, /* UART2_SIN */+ {0, 17, 1, 0, 1, 2}, /* TxD0 */
+ {0, 18, 1, 0, 1, 2}, /* TxD1 */
+ {0, 19, 1, 0, 1, 2}, /* TxD2 */
+ {0, 20, 1, 0, 1, 2}, /* TxD3 */
+ {1, 2, 1, 0, 1, 2}, /* TxD4 */
+ {1, 3, 1, 0, 2, 2}, /* TxD5 */
+ {1, 5, 1, 0, 3, 2}, /* TxD6 */
+ {1, 8, 1, 0, 3, 2}, /* TxD7 */+ {0, 23, 2, 0, 1, 2}, /* RxD0 */
+ {0, 24, 2, 0, 1, 2}, /* RxD1 */
+ {0, 25, 2, 0, 1, 2}, /* RxD2 */
+ {0, 26, 2, 0, 1, 2}, /* RxD3 */
+ {0, 27, 2, 0, 1, 2}, /* RxD4 */
+ {1, 12, 2, 0, 2, 2}, /* RxD5 */
+ {1, 13, 2, 0, 3, 2}, /* RxD6 */
+ {1, 11, 2, 0, 2, 2}, /* RxD7 */
+ {0, 21, 1, 0, 1, 2}, /* TX_EN */
+ {0, 22, 1, 0, 1, 2}, /* TX_ER */
+ {0, 29, 2, 0, 1, 2}, /* RX_DV */
+ {0, 30, 2, 0, 1, 2}, /* RX_ER */
+ {0, 31, 2, 0, 1, 2}, /* RX_CLK */
+ {2, 2, 1, 0, 2, 2}, /* GTX_CLK = CLK10 */
+ {2, 3, 2, 0, 1, 2}, /* GTX125 - CLK4 */
+
+ {0, 1, 3, 0, 2, 2}, /* MDIO */
+ {0, 2, 1, 0, 1, 2}, /* MDC */
+
+ {5, 0, 1, 0, 2, 2}, /* UART2_SOUT */
+ {5, 1, 2, 0, 3, 2}, /* UART2_CTS */
+ {5, 2, 1, 0, 1, 2}, /* UART2_RTS */
+ {5, 3, 2, 0, 2, 2}, /* UART2_SIN */- {0, 0, 0, 0, QE_IOP_TAB_END}, /* END of table */
+ {0, 0, 0, 0, QE_IOP_TAB_END, 2}, /* END of table */
};
int board_early_init_f(void)
diff -purN a/board/freescale/mpc8360erdk/mpc8360erdk.c b/board/freescale/mpc8360erdk/mpc8360erdk.c
--- a/board/freescale/mpc8360erdk/mpc8360erdk.c 2008-01-16
23:06:52.000000000 +0200
+++ b/board/freescale/mpc8360erdk/mpc8360erdk.c 2008-01-17
16:07:14.451836000 +0200
@@ -27,168 +27,168 @@
const qe_iop_conf_t qe_iop_conf_tab[] = {
/* MDIO */
- {0, 1, 3, 0, 2}, /* MDIO */
- {0, 2, 1, 0, 1}, /* MDC */
+ {0, 1, 3, 0, 2, 2}, /* MDIO */
+ {0, 2, 1, 0, 1, 2}, /* MDC *//* UCC1 - UEC (Gigabit) */
- {0, 3, 1, 0, 1}, /* TxD0 */
- {0, 4, 1, 0, 1}, /* TxD1 */
- {0, 5, 1, 0, 1}, /* TxD2 */
- {0, 6, 1, 0, 1}, /* TxD3 */
- {0, 9, 2, 0, 1}, /* RxD0 */- {0, 10, 2, 0, 1}, /* RxD1 */
- {0, 11, 2, 0, 1}, /* RxD2 */
- {0, 12, 2, 0, 1}, /* RxD3 */
- {0, 7, 1, 0, 1}, /* TX_EN */
- {0, 8, 1, 0, 1}, /* TX_ER */
- {0, 15, 2, 0, 1}, /* RX_DV */
- {0, 0, 2, 0, 1}, /* RX_CLK */
- {2, 9, 1, 0, 3}, /* GTX_CLK - CLK10 */
- {2, 8, 2, 0, 1}, /* GTX125 - CLK9 */
+ {0, 3, 1, 0, 1, 2}, /* TxD0 */
+ {0, 4, 1, 0, 1, 2}, /* TxD1 */
+ {0, 5, 1, 0, 1, 2}, /* TxD2 */
+ {0, 6, 1, 0, 1, 2}, /* TxD3 */
+ {0, 9, 2, 0, 1, 2}, /* RxD0 */+ {0, 10, 2, 0, 1, 2}, /* RxD1 */
+ {0, 11, 2, 0, 1, 2}, /* RxD2 */
+ {0, 12, 2, 0, 1, 2}, /* RxD3 */
+ {0, 7, 1, 0, 1, 2}, /* TX_EN */
+ {0, 8, 1, 0, 1, 2}, /* TX_ER */
+ {0, 15, 2, 0, 1, 2}, /* RX_DV */
+ {0, 0, 2, 0, 1, 2}, /* RX_CLK */
+ {2, 9, 1, 0, 3, 2}, /* GTX_CLK - CLK10 */
+ {2, 8, 2, 0, 1, 2}, /* GTX125 - CLK9 */ /* UCC2 - UEC (Gigabit) */
- {0, 17, 1, 0, 1}, /* TxD0 */
- {0, 18, 1, 0, 1}, /* TxD1 */
- {0, 19, 1, 0, 1}, /* TxD2 */
- {0, 20, 1, 0, 1}, /* TxD3 */
- {0, 23, 2, 0, 1}, /* RxD0 */
- {0, 24, 2, 0, 1}, /* RxD1 */
- {0, 25, 2, 0, 1}, /* RxD2 */
- {0, 26, 2, 0, 1}, /* RxD3 */
- {0, 21, 1, 0, 1}, /* TX_EN */
- {0, 22, 1, 0, 1}, /* TX_ER */
- {0, 29, 2, 0, 1}, /* RX_DV */
- {0, 31, 2, 0, 1}, /* RX_CLK */
- {2, 2, 1, 0, 2}, /* GTX_CLK - CLK10 */
- {2, 3, 2, 0, 1}, /* GTX125 - CLK4 */
+ {0, 17, 1, 0, 1, 2}, /* TxD0 */
+ {0, 18, 1, 0, 1, 2}, /* TxD1 */
+ {0, 19, 1, 0, 1, 2}, /* TxD2 */
+ {0, 20, 1, 0, 1, 2}, /* TxD3 */
+ {0, 23, 2, 0, 1, 2}, /* RxD0 */
+ {0, 24, 2, 0, 1, 2}, /* RxD1 */
+ {0, 25, 2, 0, 1, 2}, /* RxD2 */
+ {0, 26, 2, 0, 1, 2}, /* RxD3 */
+ {0, 21, 1, 0, 1, 2}, /* TX_EN */
+ {0, 22, 1, 0, 1, 2}, /* TX_ER */
+ {0, 29, 2, 0, 1, 2}, /* RX_DV */
+ {0, 31, 2, 0, 1, 2}, /* RX_CLK */
+ {2, 2, 1, 0, 2, 2}, /* GTX_CLK - CLK10 */
+ {2, 3, 2, 0, 1, 2}, /* GTX125 - CLK4 */
/* UCC7 - UEC */
- {4, 0, 1, 0, 1}, /* TxD0 */
- {4, 1, 1, 0, 1}, /* TxD1 */
- {4, 2, 1, 0, 1}, /* TxD2 */
- {4, 3, 1, 0, 1}, /* TxD3 */
- {4, 6, 2, 0, 1}, /* RxD0 */
- {4, 7, 2, 0, 1}, /* RxD1 */
- {4, 8, 2, 0, 1}, /* RxD2 */
- {4, 9, 2, 0, 1}, /* RxD3 */
- {4, 4, 1, 0, 1}, /* TX_EN */
- {4, 5, 1, 0, 1}, /* TX_ER */- {4, 12, 2, 0, 1}, /* RX_DV */
- {4, 13, 2, 0, 1}, /* RX_ER */
- {4, 10, 2, 0, 1}, /* COL */
- {4, 11, 2, 0, 1}, /* CRS */
- {2, 18, 2, 0, 1}, /* TX_CLK - CLK19 */
- {2, 19, 2, 0, 1}, /* RX_CLK - CLK20 */
+ {4, 0, 1, 0, 1, 2}, /* TxD0 */
+ {4, 1, 1, 0, 1, 2}, /* TxD1 */
+ {4, 2, 1, 0, 1, 2}, /* TxD2 */
+ {4, 3, 1, 0, 1, 2}, /* TxD3 */
+ {4, 6, 2, 0, 1, 2}, /* RxD0 */
+ {4, 7, 2, 0, 1, 2}, /* RxD1 */
+ {4, 8, 2, 0, 1, 2}, /* RxD2 */
+ {4, 9, 2, 0, 1, 2}, /* RxD3 */
+ {4, 4, 1, 0, 1, 2}, /* TX_EN */
+ {4, 5, 1, 0, 1, 2}, /* TX_ER */+ {4, 12, 2, 0, 1, 2}, /* RX_DV */
+ {4, 13, 2, 0, 1, 2}, /* RX_ER */
+ {4, 10, 2, 0, 1, 2}, /* COL */
+ {4, 11, 2, 0, 1, 2}, /* CRS */
+ {2, 18, 2, 0, 1, 2}, /* TX_CLK - CLK19 */
+ {2, 19, 2, 0, 1, 2}, /* RX_CLK - CLK20 */
/* UCC4 - UEC */
- {1, 14, 1, 0, 1}, /* TxD0 */
- {1, 15, 1, 0, 1}, /* TxD1 */
- {1, 16, 1, 0, 1}, /* TxD2 */
- {1, 17, 1, 0, 1}, /* TxD3 */
- {1, 20, 2, 0, 1}, /* RxD0 */
- {1, 21, 2, 0, 1}, /* RxD1 */
- {1, 22, 2, 0, 1}, /* RxD2 */
- {1, 23, 2, 0, 1}, /* RxD3 */
- {1, 18, 1, 0, 1}, /* TX_EN */
- {1, 19, 1, 0, 2}, /* TX_ER */
- {1, 26, 2, 0, 1}, /* RX_DV */
- {1, 27, 2, 0, 1}, /* RX_ER */
- {1, 24, 2, 0, 1}, /* COL */
- {1, 25, 2, 0, 1}, /* CRS */
- {2, 6, 2, 0, 1}, /* TX_CLK - CLK7 */
- {2, 7, 2, 0, 1}, /* RX_CLK - CLK8 */
+ {1, 14, 1, 0, 1, 2}, /* TxD0 */
+ {1, 15, 1, 0, 1, 2}, /* TxD1 */
+ {1, 16, 1, 0, 1, 2}, /* TxD2 */
+ {1, 17, 1, 0, 1, 2}, /* TxD3 */
+ {1, 20, 2, 0, 1, 2}, /* RxD0 */
+ {1, 21, 2, 0, 1, 2}, /* RxD1 */
+ {1, 22, 2, 0, 1, 2}, /* RxD2 */
+ {1, 23, 2, 0, 1, 2}, /* RxD3 */
+ {1, 18, 1, 0, 1, 2}, /* TX_EN */
+ {1, 19, 1, 0, 2, 2}, /* TX_ER */
+ {1, 26, 2, 0, 1, 2}, /* RX_DV */
+ {1, 27, 2, 0, 1, 2}, /* RX_ER */
+ {1, 24, 2, 0, 1, 2}, /* COL */
+ {1, 25, 2, 0, 1, 2}, /* CRS */
+ {2, 6, 2, 0, 1, 2}, /* TX_CLK - CLK7 */
+ {2, 7, 2, 0, 1, 2}, /* RX_CLK - CLK8 */
/* PCI1 */
- {5, 4, 2, 0, 3}, /* PCI_M66EN */
- {5, 5, 1, 0, 3}, /* PCI_INTA */
- {5, 6, 1, 0, 3}, /* PCI_RSTO */
- {5, 7, 3, 0, 3}, /* PCI_C_BE0 */
- {5, 8, 3, 0, 3}, /* PCI_C_BE1 */
- {5, 9, 3, 0, 3}, /* PCI_C_BE2 */- {5, 10, 3, 0, 3}, /* PCI_C_BE3 */
- {5, 11, 3, 0, 3}, /* PCI_PAR */
- {5, 12, 3, 0, 3}, /* PCI_FRAME */
- {5, 13, 3, 0, 3}, /* PCI_TRDY */
- {5, 14, 3, 0, 3}, /* PCI_IRDY */
- {5, 15, 3, 0, 3}, /* PCI_STOP */
- {5, 16, 3, 0, 3}, /* PCI_DEVSEL */
- {5, 17, 0, 0, 0}, /* PCI_IDSEL */
- {5, 18, 3, 0, 3}, /* PCI_SERR */
- {5, 19, 3, 0, 3}, /* PCI_PERR */
- {5, 20, 3, 0, 3}, /* PCI_REQ0 */
- {5, 21, 2, 0, 3}, /* PCI_REQ1 */
- {5, 22, 2, 0, 3}, /* PCI_GNT2 */
- {5, 23, 3, 0, 3}, /* PCI_GNT0 */
- {5, 24, 1, 0, 3}, /* PCI_GNT1 */
- {5, 25, 1, 0, 3}, /* PCI_GNT2 */
- {5, 26, 0, 0, 0}, /* PCI_CLK0 */
- {5, 27, 0, 0, 0}, /* PCI_CLK1 */
- {5, 28, 0, 0, 0}, /* PCI_CLK2 */
- {5, 29, 0, 0, 3}, /* PCI_SYNC_OUT */
- {6, 0, 3, 0, 3}, /* PCI_AD0 */
- {6, 1, 3, 0, 3}, /* PCI_AD1 */
- {6, 2, 3, 0, 3}, /* PCI_AD2 */
- {6, 3, 3, 0, 3}, /* PCI_AD3 */
- {6, 4, 3, 0, 3}, /* PCI_AD4 */
- {6, 5, 3, 0, 3}, /* PCI_AD5 */
- {6, 6, 3, 0, 3}, /* PCI_AD6 */
- {6, 7, 3, 0, 3}, /* PCI_AD7 */
- {6, 8, 3, 0, 3}, /* PCI_AD8 */
- {6, 9, 3, 0, 3}, /* PCI_AD9 */- {6, 10, 3, 0, 3}, /* PCI_AD10 */
- {6, 11, 3, 0, 3}, /* PCI_AD11 */
- {6, 12, 3, 0, 3}, /* PCI_AD12 */
- {6, 13, 3, 0, 3}, /* PCI_AD13 */
- {6, 14, 3, 0, 3}, /* PCI_AD14 */
- {6, 15, 3, 0, 3}, /* PCI_AD15 */
- {6, 16, 3, 0, 3}, /* PCI_AD16 */
- {6, 17, 3, 0, 3}, /* PCI_AD17 */
- {6, 18, 3, 0, 3}, /* PCI_AD18 */
- {6, 19, 3, 0, 3}, /* PCI_AD19 */
- {6, 20, 3, 0, 3}, /* PCI_AD20 */
- {6, 21, 3, 0, 3}, /* PCI_AD21 */
- {6, 22, 3, 0, 3}, /* PCI_AD22 */
- {6, 23, 3, 0, 3}, /* PCI_AD23 */
- {6, 24, 3, 0, 3}, /* PCI_AD24 */
- {6, 25, 3, 0, 3}, /* PCI_AD25 */
- {6, 26, 3, 0, 3}, /* PCI_AD26 */
- {6, 27, 3, 0, 3}, /* PCI_AD27 */
- {6, 28, 3, 0, 3}, /* PCI_AD28 */
- {6, 29, 3, 0, 3}, /* PCI_AD29 */
- {6, 30, 3, 0, 3}, /* PCI_AD30 */
- {6, 31, 3, 0, 3}, /* PCI_AD31 */
+ {5, 4, 2, 0, 3, 2}, /* PCI_M66EN */
+ {5, 5, 1, 0, 3, 2}, /* PCI_INTA */
+ {5, 6, 1, 0, 3, 2}, /* PCI_RSTO */
+ {5, 7, 3, 0, 3, 2}, /* PCI_C_BE0 */
+ {5, 8, 3, 0, 3, 2}, /* PCI_C_BE1 */
+ {5, 9, 3, 0, 3, 2}, /* PCI_C_BE2 */+ {5, 10, 3, 0, 3, 2}, /* PCI_C_BE3 */
+ {5, 11, 3, 0, 3, 2}, /* PCI_PAR */
+ {5, 12, 3, 0, 3, 2}, /* PCI_FRAME */
+ {5, 13, 3, 0, 3, 2}, /* PCI_TRDY */
+ {5, 14, 3, 0, 3, 2}, /* PCI_IRDY */
+ {5, 15, 3, 0, 3, 2}, /* PCI_STOP */
+ {5, 16, 3, 0, 3, 2}, /* PCI_DEVSEL */
+ {5, 17, 0, 0, 0, 2}, /* PCI_IDSEL */
+ {5, 18, 3, 0, 3, 2}, /* PCI_SERR */
+ {5, 19, 3, 0, 3, 2}, /* PCI_PERR */
+ {5, 20, 3, 0, 3, 2}, /* PCI_REQ0 */
+ {5, 21, 2, 0, 3, 2}, /* PCI_REQ1 */
+ {5, 22, 2, 0, 3, 2}, /* PCI_GNT2 */
+ {5, 23, 3, 0, 3, 2}, /* PCI_GNT0 */
+ {5, 24, 1, 0, 3, 2}, /* PCI_GNT1 */
+ {5, 25, 1, 0, 3, 2}, /* PCI_GNT2 */
+ {5, 26, 0, 0, 0, 2}, /* PCI_CLK0 */
+ {5, 27, 0, 0, 0, 2}, /* PCI_CLK1 */
+ {5, 28, 0, 0, 0, 2}, /* PCI_CLK2 */
+ {5, 29, 0, 0, 3, 2}, /* PCI_SYNC_OUT */
+ {6, 0, 3, 0, 3, 2}, /* PCI_AD0 */
+ {6, 1, 3, 0, 3, 2}, /* PCI_AD1 */
+ {6, 2, 3, 0, 3, 2}, /* PCI_AD2 */
+ {6, 3, 3, 0, 3, 2}, /* PCI_AD3 */
+ {6, 4, 3, 0, 3, 2}, /* PCI_AD4 */
+ {6, 5, 3, 0, 3, 2}, /* PCI_AD5 */
+ {6, 6, 3, 0, 3, 2}, /* PCI_AD6 */
+ {6, 7, 3, 0, 3, 2}, /* PCI_AD7 */
+ {6, 8, 3, 0, 3, 2}, /* PCI_AD8 */
+ {6, 9, 3, 0, 3, 2}, /* PCI_AD9 */+ {6, 10, 3, 0, 3, 2}, /* PCI_AD10 */
+ {6, 11, 3, 0, 3, 2}, /* PCI_AD11 */
+ {6, 12, 3, 0, 3, 2}, /* PCI_AD12 */
+ {6, 13, 3, 0, 3, 2}, /* PCI_AD13 */
+ {6, 14, 3, 0, 3, 2}, /* PCI_AD14 */
+ {6, 15, 3, 0, 3, 2}, /* PCI_AD15 */
+ {6, 16, 3, 0, 3, 2}, /* PCI_AD16 */
+ {6, 17, 3, 0, 3, 2}, /* PCI_AD17 */
+ {6, 18, 3, 0, 3, 2}, /* PCI_AD18 */
+ {6, 19, 3, 0, 3, 2}, /* PCI_AD19 */
+ {6, 20, 3, 0, 3, 2}, /* PCI_AD20 */
+ {6, 21, 3, 0, 3, 2}, /* PCI_AD21 */
+ {6, 22, 3, 0, 3, 2}, /* PCI_AD22 */
+ {6, 23, 3, 0, 3, 2}, /* PCI_AD23 */
+ {6, 24, 3, 0, 3, 2}, /* PCI_AD24 */
+ {6, 25, 3, 0, 3, 2}, /* PCI_AD25 */
+ {6, 26, 3, 0, 3, 2}, /* PCI_AD26 */
+ {6, 27, 3, 0, 3, 2}, /* PCI_AD27 */
+ {6, 28, 3, 0, 3, 2}, /* PCI_AD28 */
+ {6, 29, 3, 0, 3, 2}, /* PCI_AD29 */
+ {6, 30, 3, 0, 3, 2}, /* PCI_AD30 */
+ {6, 31, 3, 0, 3, 2}, /* PCI_AD31 */
/* NAND */
- {4, 18, 2, 0, 0}, /* NAND_RYnBY */
+ {4, 18, 2, 0, 0, 2}, /* NAND_RYnBY */
/* DUART - UART2 */
- {5, 0, 1, 0, 2}, /* UART2_SOUT */
- {5, 2, 1, 0, 1}, /* UART2_RTS */
- {5, 3, 2, 0, 2}, /* UART2_SIN */
- {5, 1, 2, 0, 3}, /* UART2_CTS */
+ {5, 0, 1, 0, 2, 2}, /* UART2_SOUT */
+ {5, 2, 1, 0, 1, 2}, /* UART2_RTS */
+ {5, 3, 2, 0, 2, 2}, /* UART2_SIN */
+ {5, 1, 2, 0, 3, 2}, /* UART2_CTS *//* UCC5 - UART3 */
- {3, 0, 1, 0, 1}, /* UART3_TX */
- {3, 4, 1, 0, 1}, /* UART3_RTS */
- {3, 6, 2, 0, 1}, /* UART3_RX */
- {3, 12, 2, 0, 0}, /* UART3_CTS */
- {3, 13, 2, 0, 0}, /* UCC5_CD */
+ {3, 0, 1, 0, 1, 2}, /* UART3_TX */
+ {3, 4, 1, 0, 1, 2}, /* UART3_RTS */
+ {3, 6, 2, 0, 1, 2}, /* UART3_RX */+ {3, 12, 2, 0, 0, 2}, /* UART3_CTS */
+ {3, 13, 2, 0, 0, 2}, /* UCC5_CD */
/* UCC6 - UART4 */
- {3, 14, 1, 0, 1}, /* UART4_TX */
- {3, 18, 1, 0, 1}, /* UART4_RTS */
- {3, 20, 2, 0, 1}, /* UART4_RX */
- {3, 26, 2, 0, 0}, /* UART4_CTS */
- {3, 27, 2, 0, 0}, /* UCC6_CD */
+ {3, 14, 1, 0, 1, 2}, /* UART4_TX */
+ {3, 18, 1, 0, 1, 2}, /* UART4_RTS */
+ {3, 20, 2, 0, 1, 2}, /* UART4_RX */
+ {3, 26, 2, 0, 0, 2}, /* UART4_CTS */
+ {3, 27, 2, 0, 0, 2}, /* UCC6_CD */
/* Fujitsu MB86277 (MINT) graphics controller */
- {0, 30, 1, 0, 0}, /* nSRESET_GRAPHICS */
- {1, 5, 1, 0, 0}, /* nXRST_GRAPHICS */
- {1, 7, 1, 0, 0}, /* LVDS_BKLT_CTR */
- {2, 16, 1, 0, 0}, /* LVDS_BKLT_EN */
+ {0, 30, 1, 0, 0, 2}, /* nSRESET_GRAPHICS */
+ {1, 5, 1, 0, 0, 2}, /* nXRST_GRAPHICS */
+ {1, 7, 1, 0, 0, 2}, /* LVDS_BKLT_CTR */
+ {2, 16, 1, 0, 0, 2}, /* LVDS_BKLT_EN */
/* END of table */
- {0, 0, 0, 0, QE_IOP_TAB_END},
+ {0, 0, 0, 0, QE_IOP_TAB_END, 2},
};
int board_early_init_f(void)
diff -purN a/board/freescale/mpc8568mds/mpc8568mds.c b/board/freescale/mpc8568mds/mpc8568mds.c
--- a/board/freescale/mpc8568mds/mpc8568mds.c 2008-01-16
23:06:52.000000000 +0200
+++ b/board/freescale/mpc8568mds/mpc8568mds.c 2008-01-17
16:03:46.708593000 +0200
@@ -37,64 +37,64 @@
const qe_iop_conf_t qe_iop_conf_tab[] = {
/* GETH1 */
- {4, 10, 1, 0, 2}, /* TxD0 */
- {4, 9, 1, 0, 2}, /* TxD1 */
- {4, 8, 1, 0, 2}, /* TxD2 */
- {4, 7, 1, 0, 2}, /* TxD3 */- {4, 23, 1, 0, 2}, /* TxD4 */
- {4, 22, 1, 0, 2}, /* TxD5 */
- {4, 21, 1, 0, 2}, /* TxD6 */
- {4, 20, 1, 0, 2}, /* TxD7 */
- {4, 15, 2, 0, 2}, /* RxD0 */
- {4, 14, 2, 0, 2}, /* RxD1 */
- {4, 13, 2, 0, 2}, /* RxD2 */
- {4, 12, 2, 0, 2}, /* RxD3 */
- {4, 29, 2, 0, 2}, /* RxD4 */
- {4, 28, 2, 0, 2}, /* RxD5 */
- {4, 27, 2, 0, 2}, /* RxD6 */
- {4, 26, 2, 0, 2}, /* RxD7 */
- {4, 11, 1, 0, 2}, /* TX_EN */
- {4, 24, 1, 0, 2}, /* TX_ER */
- {4, 16, 2, 0, 2}, /* RX_DV */
- {4, 30, 2, 0, 2}, /* RX_ER */
- {4, 17, 2, 0, 2}, /* RX_CLK */
- {4, 19, 1, 0, 2}, /* GTX_CLK */
- {1, 31, 2, 0, 3}, /* GTX125 */
+ {4, 10, 1, 0, 2, 2}, /* TxD0 */
+ {4, 9, 1, 0, 2, 2}, /* TxD1 */
+ {4, 8, 1, 0, 2, 2}, /* TxD2 */
+ {4, 7, 1, 0, 2, 2}, /* TxD3 */+ {4, 23, 1, 0, 2, 2}, /* TxD4 */
+ {4, 22, 1, 0, 2, 2}, /* TxD5 */
+ {4, 21, 1, 0, 2, 2}, /* TxD6 */
+ {4, 20, 1, 0, 2, 2}, /* TxD7 */
+ {4, 15, 2, 0, 2, 2}, /* RxD0 */
+ {4, 14, 2, 0, 2, 2}, /* RxD1 */
+ {4, 13, 2, 0, 2, 2}, /* RxD2 */
+ {4, 12, 2, 0, 2, 2}, /* RxD3 */
+ {4, 29, 2, 0, 2, 2}, /* RxD4 */
+ {4, 28, 2, 0, 2, 2}, /* RxD5 */
+ {4, 27, 2, 0, 2, 2}, /* RxD6 */
+ {4, 26, 2, 0, 2, 2}, /* RxD7 */
+ {4, 11, 1, 0, 2, 2}, /* TX_EN */
+ {4, 24, 1, 0, 2, 2}, /* TX_ER */
+ {4, 16, 2, 0, 2, 2}, /* RX_DV */
+ {4, 30, 2, 0, 2, 2}, /* RX_ER */
+ {4, 17, 2, 0, 2, 2}, /* RX_CLK */
+ {4, 19, 1, 0, 2, 2}, /* GTX_CLK */
+ {1, 31, 2, 0, 3, 2}, /* GTX125 */
/* GETH2 */
- {5, 10, 1, 0, 2}, /* TxD0 */
- {5, 9, 1, 0, 2}, /* TxD1 */
- {5, 8, 1, 0, 2}, /* TxD2 */
- {5, 7, 1, 0, 2}, /* TxD3 */- {5, 23, 1, 0, 2}, /* TxD4 */
- {5, 22, 1, 0, 2}, /* TxD5 */
- {5, 21, 1, 0, 2}, /* TxD6 */
- {5, 20, 1, 0, 2}, /* TxD7 */
- {5, 15, 2, 0, 2}, /* RxD0 */
- {5, 14, 2, 0, 2}, /* RxD1 */
- {5, 13, 2, 0, 2}, /* RxD2 */
- {5, 12, 2, 0, 2}, /* RxD3 */
- {5, 29, 2, 0, 2}, /* RxD4 */
- {5, 28, 2, 0, 2}, /* RxD5 */
- {5, 27, 2, 0, 3}, /* RxD6 */
- {5, 26, 2, 0, 2}, /* RxD7 */
- {5, 11, 1, 0, 2}, /* TX_EN */
- {5, 24, 1, 0, 2}, /* TX_ER */
- {5, 16, 2, 0, 2}, /* RX_DV */
- {5, 30, 2, 0, 2}, /* RX_ER */
- {5, 17, 2, 0, 2}, /* RX_CLK */
- {5, 19, 1, 0, 2}, /* GTX_CLK */
- {1, 31, 2, 0, 3}, /* GTX125 */
- {4, 6, 3, 0, 2}, /* MDIO */
- {4, 5, 1, 0, 2}, /* MDC */
+ {5, 10, 1, 0, 2, 2}, /* TxD0 */
+ {5, 9, 1, 0, 2, 2}, /* TxD1 */
+ {5, 8, 1, 0, 2, 2}, /* TxD2 */
+ {5, 7, 1, 0, 2, 2}, /* TxD3 */+ {5, 23, 1, 0, 2, 2}, /* TxD4 */
+ {5, 22, 1, 0, 2, 2}, /* TxD5 */
+ {5, 21, 1, 0, 2, 2}, /* TxD6 */
+ {5, 20, 1, 0, 2, 2}, /* TxD7 */
+ {5, 15, 2, 0, 2, 2}, /* RxD0 */
+ {5, 14, 2, 0, 2, 2}, /* RxD1 */
+ {5, 13, 2, 0, 2, 2}, /* RxD2 */
+ {5, 12, 2, 0, 2, 2}, /* RxD3 */
+ {5, 29, 2, 0, 2, 2}, /* RxD4 */
+ {5, 28, 2, 0, 2, 2}, /* RxD5 */
+ {5, 27, 2, 0, 3, 2}, /* RxD6 */
+ {5, 26, 2, 0, 2, 2}, /* RxD7 */
+ {5, 11, 1, 0, 2, 2}, /* TX_EN */
+ {5, 24, 1, 0, 2, 2}, /* TX_ER */
+ {5, 16, 2, 0, 2, 2}, /* RX_DV */
+ {5, 30, 2, 0, 2, 2}, /* RX_ER */
+ {5, 17, 2, 0, 2, 2}, /* RX_CLK */
+ {5, 19, 1, 0, 2, 2}, /* GTX_CLK */
+ {1, 31, 2, 0, 3, 2}, /* GTX125 */
+ {4, 6, 3, 0, 2, 2}, /* MDIO */
+ {4, 5, 1, 0, 2, 2}, /* MDC */
/* UART1 */
- {2, 0, 1, 0, 2}, /* UART_SOUT1 */
- {2, 1, 1, 0, 2}, /* UART_RTS1 */
- {2, 2, 2, 0, 2}, /* UART_CTS1 */
- {2, 3, 2, 0, 2}, /* UART_SIN1 */
+ {2, 0, 1, 0, 2, 2}, /* UART_SOUT1 */
+ {2, 1, 1, 0, 2, 2}, /* UART_RTS1 */
+ {2, 2, 2, 0, 2, 2}, /* UART_CTS1 */
+ {2, 3, 2, 0, 2, 2}, /* UART_SIN1 */
- {0, 0, 0, 0, QE_IOP_TAB_END}, /* END of table */
+ {0, 0, 0, 0, QE_IOP_TAB_END, 2}, /* END of table */
};
diff -purN a/board/freescale/mpc8323erdb/mpc8323erdb.c b/board/freescale/mpc8323erdb/mpc8323erdb.c
--- a/board/freescale/mpc8323erdb/mpc8323erdb.c 2008-01-16
23:06:52.000000000 +0200
+++ b/board/freescale/mpc8323erdb/mpc8323erdb.c 2008-01-17
16:09:44.661841000 +0200
@@ -28,47 +28,47 @@
const qe_iop_conf_t qe_iop_conf_tab[] = {
/* UCC3 */
- {1, 0, 1, 0, 1}, /* TxD0 */
- {1, 1, 1, 0, 1}, /* TxD1 */
- {1, 2, 1, 0, 1}, /* TxD2 */
- {1, 3, 1, 0, 1}, /* TxD3 */
- {1, 9, 1, 0, 1}, /* TxER */
- {1, 12, 1, 0, 1}, /* TxEN */
- {3, 24, 2, 0, 1}, /* TxCLK->CLK10 */
-
- {1, 4, 2, 0, 1}, /* RxD0 */
- {1, 5, 2, 0, 1}, /* RxD1 */
- {1, 6, 2, 0, 1}, /* RxD2 */
- {1, 7, 2, 0, 1}, /* RxD3 */
- {1, 8, 2, 0, 1}, /* RxER */- {1, 10, 2, 0, 1}, /* RxDV */
- {0, 13, 2, 0, 1}, /* RxCLK->CLK9 */
- {1, 11, 2, 0, 1}, /* COL */
- {1, 13, 2, 0, 1}, /* CRS */
+ {1, 0, 1, 0, 1, 2}, /* TxD0 */
+ {1, 1, 1, 0, 1, 2}, /* TxD1 */
+ {1, 2, 1, 0, 1, 2}, /* TxD2 */
+ {1, 3, 1, 0, 1, 2}, /* TxD3 */
+ {1, 9, 1, 0, 1, 2}, /* TxER */
+ {1, 12, 1, 0, 1, 2}, /* TxEN */
+ {3, 24, 2, 0, 1, 2}, /* TxCLK->CLK10 */
+
+ {1, 4, 2, 0, 1, 2}, /* RxD0 */
+ {1, 5, 2, 0, 1, 2}, /* RxD1 */
+ {1, 6, 2, 0, 1, 2}, /* RxD2 */
+ {1, 7, 2, 0, 1, 2}, /* RxD3 */
+ {1, 8, 2, 0, 1, 2}, /* RxER */+ {1, 10, 2, 0, 1, 2}, /* RxDV */
+ {0, 13, 2, 0, 1, 2}, /* RxCLK->CLK9 */
+ {1, 11, 2, 0, 1, 2}, /* COL */
+ {1, 13, 2, 0, 1, 2}, /* CRS */
/* UCC2 */
- {0, 18, 1, 0, 1}, /* TxD0 */
- {0, 19, 1, 0, 1}, /* TxD1 */
- {0, 20, 1, 0, 1}, /* TxD2 */
- {0, 21, 1, 0, 1}, /* TxD3 */
- {0, 27, 1, 0, 1}, /* TxER */
- {0, 30, 1, 0, 1}, /* TxEN */
- {3, 23, 2, 0, 1}, /* TxCLK->CLK3 */
-
- {0, 22, 2, 0, 1}, /* RxD0 */
- {0, 23, 2, 0, 1}, /* RxD1 */
- {0, 24, 2, 0, 1}, /* RxD2 */
- {0, 25, 2, 0, 1}, /* RxD3 */
- {0, 26, 1, 0, 1}, /* RxER */
- {0, 28, 2, 0, 1}, /* Rx_DV */
- {3, 21, 2, 0, 1}, /* RxCLK->CLK16 */
- {0, 29, 2, 0, 1}, /* COL */
- {0, 31, 2, 0, 1}, /* CRS */
+ {0, 18, 1, 0, 1, 2}, /* TxD0 */
+ {0, 19, 1, 0, 1, 2}, /* TxD1 */
+ {0, 20, 1, 0, 1, 2}, /* TxD2 */
+ {0, 21, 1, 0, 1, 2}, /* TxD3 */
+ {0, 27, 1, 0, 1, 2}, /* TxER */
+ {0, 30, 1, 0, 1, 2}, /* TxEN */
+ {3, 23, 2, 0, 1, 2}, /* TxCLK->CLK3 */
+
+ {0, 22, 2, 0, 1, 2}, /* RxD0 */
+ {0, 23, 2, 0, 1, 2}, /* RxD1 */
+ {0, 24, 2, 0, 1, 2}, /* RxD2 */
+ {0, 25, 2, 0, 1, 2}, /* RxD3 */
+ {0, 26, 1, 0, 1, 2}, /* RxER */
+ {0, 28, 2, 0, 1, 2}, /* Rx_DV */
+ {3, 21, 2, 0, 1, 2}, /* RxCLK->CLK16 */
+ {0, 29, 2, 0, 1, 2}, /* COL */
+ {0, 31, 2, 0, 1, 2}, /* CRS */
- {3, 4, 3, 0, 2}, /* MDIO */
- {3, 5, 1, 0, 2}, /* MDC */
+ {3, 4, 3, 0, 2, 2}, /* MDIO */
+ {3, 5, 1, 0, 2, 2}, /* MDC */- {0, 0, 0, 0, QE_IOP_TAB_END}, /* END of table */
+ {0, 0, 0, 0, QE_IOP_TAB_END, 2}, /* END of table */
};
int board_early_init_f(void)
diff -purN a/board/freescale/mpc832xemds/mpc832xemds.c b/board/freescale/mpc832xemds/mpc832xemds.c
--- a/board/freescale/mpc832xemds/mpc832xemds.c 2008-01-16
23:06:52.000000000 +0200
+++ b/board/freescale/mpc832xemds/mpc832xemds.c 2008-01-17
16:10:52.724934000 +0200
@@ -36,47 +36,47 @@
const qe_iop_conf_t qe_iop_conf_tab[] = {
/* ETH3 */
- {1, 0, 1, 0, 1}, /* TxD0 */
- {1, 1, 1, 0, 1}, /* TxD1 */
- {1, 2, 1, 0, 1}, /* TxD2 */
- {1, 3, 1, 0, 1}, /* TxD3 */
- {1, 9, 1, 0, 1}, /* TxER */
- {1, 12, 1, 0, 1}, /* TxEN */
- {3, 24, 2, 0, 1}, /* TxCLK->CLK10 */
-
- {1, 4, 2, 0, 1}, /* RxD0 */
- {1, 5, 2, 0, 1}, /* RxD1 */
- {1, 6, 2, 0, 1}, /* RxD2 */
- {1, 7, 2, 0, 1}, /* RxD3 */
- {1, 8, 2, 0, 1}, /* RxER */- {1, 10, 2, 0, 1}, /* RxDV */
- {0, 13, 2, 0, 1}, /* RxCLK->CLK9 */
- {1, 11, 2, 0, 1}, /* COL */
- {1, 13, 2, 0, 1}, /* CRS */
+ {1, 0, 1, 0, 1, 2}, /* TxD0 */
+ {1, 1, 1, 0, 1, 2}, /* TxD1 */
+ {1, 2, 1, 0, 1, 2}, /* TxD2 */
+ {1, 3, 1, 0, 1, 2}, /* TxD3 */
+ {1, 9, 1, 0, 1, 2}, /* TxER */
+ {1, 12, 1, 0, 1, 2}, /* TxEN */
+ {3, 24, 2, 0, 1, 2}, /* TxCLK->CLK10 */
+
+ {1, 4, 2, 0, 1, 2}, /* RxD0 */
+ {1, 5, 2, 0, 1, 2}, /* RxD1 */
+ {1, 6, 2, 0, 1, 2}, /* RxD2 */
+ {1, 7, 2, 0, 1, 2}, /* RxD3 */
+ {1, 8, 2, 0, 1, 2}, /* RxER */+ {1, 10, 2, 0, 1, 2}, /* RxDV */
+ {0, 13, 2, 0, 1, 2}, /* RxCLK->CLK9 */
+ {1, 11, 2, 0, 1, 2}, /* COL */
+ {1, 13, 2, 0, 1, 2}, /* CRS */
/* ETH4 */
- {1, 18, 1, 0, 1}, /* TxD0 */
- {1, 19, 1, 0, 1}, /* TxD1 */
- {1, 20, 1, 0, 1}, /* TxD2 */
- {1, 21, 1, 0, 1}, /* TxD3 */
- {1, 27, 1, 0, 1}, /* TxER */
- {1, 30, 1, 0, 1}, /* TxEN */
- {3, 6, 2, 0, 1}, /* TxCLK->CLK8 */
-
- {1, 22, 2, 0, 1}, /* RxD0 */
- {1, 23, 2, 0, 1}, /* RxD1 */
- {1, 24, 2, 0, 1}, /* RxD2 */
- {1, 25, 2, 0, 1}, /* RxD3 */
- {1, 26, 1, 0, 1}, /* RxER */
- {1, 28, 2, 0, 1}, /* Rx_DV */
- {3, 31, 2, 0, 1}, /* RxCLK->CLK7 */
- {1, 29, 2, 0, 1}, /* COL */
- {1, 31, 2, 0, 1}, /* CRS */
+ {1, 18, 1, 0, 1, 2}, /* TxD0 */
+ {1, 19, 1, 0, 1, 2}, /* TxD1 */
+ {1, 20, 1, 0, 1, 2}, /* TxD2 */
+ {1, 21, 1, 0, 1, 2}, /* TxD3 */
+ {1, 27, 1, 0, 1, 2}, /* TxER */
+ {1, 30, 1, 0, 1, 2}, /* TxEN */
+ {3, 6, 2, 0, 1, 2}, /* TxCLK->CLK8 */
+
+ {1, 22, 2, 0, 1, 2}, /* RxD0 */
+ {1, 23, 2, 0, 1, 2}, /* RxD1 */
+ {1, 24, 2, 0, 1, 2}, /* RxD2 */
+ {1, 25, 2, 0, 1, 2}, /* RxD3 */
+ {1, 26, 1, 0, 1, 2}, /* RxER */
+ {1, 28, 2, 0, 1, 2}, /* Rx_DV */
+ {3, 31, 2, 0, 1, 2}, /* RxCLK->CLK7 */
+ {1, 29, 2, 0, 1, 2}, /* COL */
+ {1, 31, 2, 0, 1, 2}, /* CRS */
- {3, 4, 3, 0, 2}, /* MDIO */
- {3, 5, 1, 0, 2}, /* MDC */
+ {3, 4, 3, 0, 2, 2}, /* MDIO */
+ {3, 5, 1, 0, 2, 2}, /* MDC */- {0, 0, 0, 0, QE_IOP_TAB_END}, /* END of table */
+ {0, 0, 0, 0, QE_IOP_TAB_END, 2}, /* END of table */
};
int board_early_init_f(void)
PATCH v3 1/1 QE IO: Add initial data to pin configuration + read/write functions
In reply to Timur TabiAny feedback on this patch? Timur?
Regards,
David.
Quoted 9 lines
-----Original Message-----
From: David Saada
Sent: Sunday, January 20, 2008 11:37 AM
To: u-boot-users at lists.sourceforge.net
Cc: 'Timur Tabi'
Subject: [PATCH v3] QE IO: Add initial data to pin configuration + read/write functionsOn the MPC83xx & MPC85xx architectures that have QE, add initial data
to
Quoted 1 line
the pin configuration table (
qe_iop_conf_tab). This is relevant for
GPIO
Quoted 40 lines
pins defined as output. One can setup a value of 2 to leave the value unchanged.
QE initialization tables in all relevant boards were also replaced. In addition, add IO pin read & write functions.Signed-off-by David Saada <[email protected]>diff -purN
a/include/ioports.hb/include/ioports.hinclude/ioports.h +1
-0@@ -60,6 +60,7 @@ typedef struct {int dir;int open_drain;int assign; +int data; } qe_iop_conf_t;#define QE_IOP_TAB_END (-1)diff -purN
a/cpu/mpc85xx/cpu_init.cb/cpu/mpc85xx/cpu_init.ccpu/mpc85xx/cpu_init.c +2
-2@@ -37,14 +37,14 @@ DECLARE_GLOBAL_DATA_PTR;#ifdef CONFIG_QE extern qe_iop_conf_t qe_iop_conf_tab[];extern void qe_config_iopin (u8 port,u8 pin,int dir, -int open_drain,int assign); +int open_drain,int assign,int data);extern void qe_init (uint qe_base);extern void qe_reset (void );static void config_qe_ioports (void ) {u8 port, pin; -int dir, open_drain, assign; +int dir, open_drain, assign, data;int i;for (i =0 ; qe_iop_conf_tab[i].assign !=QE_IOP_TAB_END ; i++) {
cpu/mpc85xx/cpu_init.c static void config_qe_ioports(void) · line 57
Quoted 6 lines
cpu/mpc85xx/cpu_init.c +2
-1@@ -53,7 +53,8 @@ static void config_qe_ioports(void) dir = qe_iop_conf_tab[i].dir; open_drain = qe_iop_conf_tab[i].open_drain; assign = qe_iop_conf_tab[i].assign; -qe_config_iopin (port, pin, dir, open_drain, assign); + data = qe_iop_conf_tab[i].data; + qe_config_iopin(port, pin, dir, open_drain, assign,
data);
Quoted 23 lines
cpu/mpc85xx/cpu_init.c +0
-0} }#endif diff -purN
a/cpu/mpc85xx/qe_io.cb/cpu/mpc85xx/qe_io.ccpu/mpc85xx/qe_io.c +2
-1@@ -27,7 +27,8 @@#if defined(CONFIG_QE )#define NUM_OF_PINS 32 -void qe_config_iopin (u8 port,u8 pin,int dir,int open_drain,int assign) +void qe_config_iopin (u8 port,u8 pin,int dir,int open_drain,int assign, +int data) {cpu/mpc85xx/qe_io.c +0
-0u32 pin_2bit_mask;u32 pin_2bit_dir;@@ -38,6 +39,20 @@ void qe_config_iopin(u8 port, u8 pin, involatile par_io_t *par_io = (volatile par_io_t *) &(gur->qe_par_io);
cpu/mpc85xx/qe_io.c void qe_config_iopin(u8 port, u8 pin, in · line 51
Quoted 10 lines
cpu/mpc85xx/qe_io.c +10
-0+/* Calculate pin location for 1bit mask */ + pin_1bit_mask = (u32)(1 << (NUM_OF_PINS - (pin+1 ))); + +/* Setup the data */ +if ((data !=2 ) &&/* Don't leave unchanged */ + (assign ==0 ) &&/* GPIO */ + (dir &1 )) {/* Has output */ + tmp_val =in_be32 (&par_io[port].cpdat); +if (data) + out_be32(&par_io[port].cpdat, pin_1bit_mask |
tmp_val);
cpu/mpc85xx/qe_io.c void qe_config_iopin(u8 port, u8 pin, in · line 53
Quoted 2 lines
cpu/mpc85xx/qe_io.c +2
-0+else + out_be32(&par_io[port].cpdat, ~pin_1bit_mask &
tmp_val);
Quoted 79 lines
cpu/mpc85xx/qe_io.c +2
-0+ } +/* Caculate pin location and 2bit mask and dir */ pin_2bit_mask = (u32)(0x3 << (NUM_OF_PINS - (pin%(NUM_OF_PINS /2 )+1 )*2 ));
pin_2bit_dir= (u32)(dir << (NUM_OF_PINS-
(pin%(NUM_OF_PINS/2)+1)*2));cpu/mpc85xx/qe_io.c +35
-3@@ -55,9 +70,6 @@ void qe_config_iopin(u8 port, u8 pin, inout_be32 (&par_io[port].cpdir1, pin_2bit_dir | tmp_val); } -/* Calculate pin location for 1bit mask */ - pin_1bit_mask = (u32)(1 << (NUM_OF_PINS - (pin+1 ))); -/* Setup the open drain */ tmp_val =in_be32 (&par_io[port].cpodr);if (open_drain)@@ -82,4 +94,39 @@ void qe_config_iopin(u8 port, u8 pin, in } } +void qe_read_iopin (u8 port,u8 pin,int *data) +{ +u32 pin_1bit_mask; +u32 tmp_val; +volatile ccsr_gur_t *gur = (void *)(CFG_MPC85xx_GUTS_ADDR); +volatile par_io_t *par_io = (volatile par_io_t *) + &(gur->qe_par_io); + +/* Calculate pin location for 1bit mask */ + pin_1bit_mask = (u32)(1 << (NUM_OF_PINS - (pin+1 ))); + +/* Read the data */ + tmp_val =in_be32 (&par_io[port].cpdat); + *data = (tmp_val >> (NUM_OF_PINS - (pin+1 ))) &0x1 ; +} + +void qe_write_iopin (u8 port,u8 pin,int data) +{ +u32 pin_1bit_mask; +u32 tmp_val; +volatile ccsr_gur_t *gur = (void *)(CFG_MPC85xx_GUTS_ADDR); +volatile par_io_t *par_io = (volatile par_io_t *) + &(gur->qe_par_io); + +/* Calculate pin location for 1bit mask */ + pin_1bit_mask = (u32)(1 << (NUM_OF_PINS - (pin+1 ))); + +/* Write the data */ + tmp_val =in_be32 (&par_io[port].cpdat); +if (data) +out_be32 (&par_io[port].cpdat, pin_1bit_mask | tmp_val); +else +out_be32 (&par_io[port].cpdat, ~pin_1bit_mask & tmp_val); +} +#endif /* CONFIG_QE */ diff -purN
a/cpu/mpc83xx/cpu_init.cb/cpu/mpc83xx/cpu_init.ccpu/mpc83xx/cpu_init.c +2
-2@@ -29,14 +29,14 @@ DECLARE_GLOBAL_DATA_PTR;#ifdef CONFIG_QE extern qe_iop_conf_t qe_iop_conf_tab[];extern void qe_config_iopin (u8 port,u8 pin,int dir, -int open_drain,int assign); +int open_drain,int assign,int data);extern void qe_init (uint qe_base);extern void qe_reset (void );static void config_qe_ioports (void ) {u8 port, pin; -int dir, open_drain, assign; +int dir, open_drain, assign, data;int i;for (i =0 ; qe_iop_conf_tab[i].assign !=QE_IOP_TAB_END ; i++) {
cpu/mpc83xx/cpu_init.c static void config_qe_ioports(void) · line 49
Quoted 6 lines
cpu/mpc83xx/cpu_init.c +2
-1@@ -45,7 +45,8 @@ static void config_qe_ioports(void) dir = qe_iop_conf_tab[i].dir; open_drain = qe_iop_conf_tab[i].open_drain; assign = qe_iop_conf_tab[i].assign; -qe_config_iopin (port, pin, dir, open_drain, assign); + data = qe_iop_conf_tab[i].data; + qe_config_iopin(port, pin, dir, open_drain, assign,
data);
Quoted 24 lines
cpu/mpc83xx/cpu_init.c +0
-0} }#endif diff -purN
a/cpu/mpc83xx/qe_io.cb/cpu/mpc83xx/qe_io.ccpu/mpc83xx/qe_io.c +2
-1@@ -27,7 +27,8 @@#if defined(CONFIG_QE )#define NUM_OF_PINS 32 -void qe_config_iopin (u8 port,u8 pin,int dir,int open_drain,int assign) +void qe_config_iopin (u8 port,u8 pin,int dir,int open_drain,int assign, +int data) {cpu/mpc83xx/qe_io.c +0
-0u32 pin_2bit_mask;u32 pin_2bit_dir;@@ -37,6 +38,20 @@ void qe_config_iopin(u8 port, u8 pin, involatile immap_t *im = (volatile immap_t *)CFG_IMMR ;volatile qepio83xx_t *par_io = (volatile qepio83xx_t *)&im- >qepio;
cpu/mpc83xx/qe_io.c void qe_config_iopin(u8 port, u8 pin, in · line 51
Quoted 10 lines
cpu/mpc83xx/qe_io.c +10
-0+/* Calculate pin location for 1bit mask */ + pin_1bit_mask = (u32)(1 << (NUM_OF_PINS - (pin+1 ))); + +/* Setup the data */ +if ((data !=2 ) &&/* Don't leave unchanged */ + (assign ==0 ) &&/* GPIO */ + (dir &1 )) {/* Has output */ + tmp_val =in_be32 (&par_io->ioport[port].pdat); +if (data) + out_be32(&par_io->ioport[port].pdat,
pin_1bit_mask |
cpu/mpc83xx/qe_io.c void qe_config_iopin(u8 port, u8 pin, in · line 54
Quoted 3 lines
cpu/mpc83xx/qe_io.c +2
-0tmp_val); + else + out_be32(&par_io->ioport[port].pdat,
~pin_1bit_mask &
cpu/mpc83xx/qe_io.c void qe_config_iopin(u8 port, u8 pin, in · line 69
Quoted 10 lines
cpu/mpc83xx/qe_io.c +2
-0tmp_val); + } +cpu/mpc83xx/qe_io.c +0
-0/* Caculate pin location and 2bit mask and dir */ pin_2bit_mask = (u32)(0x3 << (NUM_OF_PINS-(pin%(NUM_OF_PINS/2)+1)*2));
pin_2bit_dir= (u32)(dir << (NUM_OF_PINS-
(pin%(NUM_OF_PINS/2)+1)*2));cpu/mpc83xx/qe_io.c +0
-0@@ -54,9 +69,6 @@ void qe_config_iopin(u8 port, u8 pin, in out_be32(&par_io->ioport[port].dir1, pin_2bit_dir |
tmp_val);
Quoted 35 lines
cpu/mpc83xx/qe_io.c +21
-3} -/* Calculate pin location for 1bit mask */ - pin_1bit_mask = (u32)(1 << (NUM_OF_PINS - (pin+1 ))); -/* Setup the open drain */ tmp_val =in_be32 (&par_io->ioport[port].podr);if (open_drain) {@@ -82,4 +94,38 @@ void qe_config_iopin(u8 port, u8 pin, in } } +void qe_read_iopin (u8 port,u8 pin,int *data) +{ +u32 pin_1bit_mask; +u32 tmp_val; +volatile immap_t *im = (volatile immap_t *)CFG_IMMR ; +volatile qepio83xx_t *par_io = (volatile qepio83xx_t *)&im- >qepio; + +/* Calculate pin location for 1bit mask */ + pin_1bit_mask = (u32)(1 << (NUM_OF_PINS - (pin+1 ))); + +/* Read the data */ + tmp_val =in_be32 (&par_io->ioport[port].pdat); + *data = (tmp_val >> (NUM_OF_PINS - (pin+1 ))) &0x1 ; +} + +void qe_write_iopin (u8 port,u8 pin,int data) +{ +u32 pin_1bit_mask; +u32 tmp_val; +volatile immap_t *im = (volatile immap_t *)CFG_IMMR ; + volatile qepio83xx_t *par_io = (volatile qepio83xx_t *)&im-Quoted 1 line
qepio;
cpu/mpc83xx/qe_io.c
Quoted 8 lines
cpu/mpc83xx/qe_io.c +8
-0+ +/* Calculate pin location for 1bit mask */ + pin_1bit_mask = (u32)(1 << (NUM_OF_PINS - (pin+1 ))); + +/* Setup the data */ + tmp_val =in_be32 (&par_io->ioport[port].pdat); +if (data) { + out_be32(&par_io->ioport[port].pdat, pin_1bit_mask |
tmp_val);
Quoted 756 lines
cpu/mpc83xx/qe_io.c +2
-0+ }else { + out_be32(&par_io->ioport[port].pdat, ~pin_1bit_mask &
tmp_val);cpu/mpc83xx/qe_io.c +3
-0+ } +} +#endif /* CONFIG_QE */ diff -purN
a/board/freescale/mpc8360emds/mpc8360emds.cb/board/freescale/mpc8360emds/mpc8360emds.c
---a/board/freescale/mpc8360emds/mpc8360emds.c2008-01-16
23:06:51.000000000 +0200
+++b/board/freescale/mpc8360emds/mpc8360emds.c2008-01-17
16:03:27.428958000 +0200cpu/mpc83xx/qe_io.c +55
-55@@ -34,63 +34,63 @@const qe_iop_conf_t qe_iop_conf_tab[] = {/* GETH1 */ - {0 ,3 ,1 ,0 ,1 },/* TxD0 */ - {0 ,4 ,1 ,0 ,1 },/* TxD1 */ - {0 ,5 ,1 ,0 ,1 },/* TxD2 */ - {0 ,6 ,1 ,0 ,1 },/* TxD3 */ - {1 ,6 ,1 ,0 ,3 },/* TxD4 */ - {1 ,7 ,1 ,0 ,1 },/* TxD5 */ - {1 ,9 ,1 ,0 ,2 },/* TxD6 */ - {1 ,10 ,1 ,0 ,2 },/* TxD7 */ - {0 ,9 ,2 ,0 ,1 },/* RxD0 */ - {0 ,10 ,2 ,0 ,1 },/* RxD1 */ - {0 ,11 ,2 ,0 ,1 },/* RxD2 */ - {0 ,12 ,2 ,0 ,1 },/* RxD3 */ - {0 ,13 ,2 ,0 ,1 },/* RxD4 */ - {1 ,1 ,2 ,0 ,2 },/* RxD5 */ - {1 ,0 ,2 ,0 ,2 },/* RxD6 */ - {1 ,4 ,2 ,0 ,2 },/* RxD7 */ - {0 ,7 ,1 ,0 ,1 },/* TX_EN */ - {0 ,8 ,1 ,0 ,1 },/* TX_ER */ - {0 ,15 ,2 ,0 ,1 },/* RX_DV */ - {0 ,16 ,2 ,0 ,1 },/* RX_ER */ - {0 ,0 ,2 ,0 ,1 },/* RX_CLK */ - {2 ,9 ,1 ,0 ,3 },/* GTX_CLK - CLK10 */ - {2 ,8 ,2 ,0 ,1 },/* GTX125 - CLK9 */ + {0 ,3 ,1 ,0 ,1 ,2 },/* TxD0 */ + {0 ,4 ,1 ,0 ,1 ,2 },/* TxD1 */ + {0 ,5 ,1 ,0 ,1 ,2 },/* TxD2 */ + {0 ,6 ,1 ,0 ,1 ,2 },/* TxD3 */ + {1 ,6 ,1 ,0 ,3 ,2 },/* TxD4 */ + {1 ,7 ,1 ,0 ,1 ,2 },/* TxD5 */ + {1 ,9 ,1 ,0 ,2 ,2 },/* TxD6 */ + {1 ,10 ,1 ,0 ,2 ,2 },/* TxD7 */ + {0 ,9 ,2 ,0 ,1 ,2 },/* RxD0 */ + {0 ,10 ,2 ,0 ,1 ,2 },/* RxD1 */ + {0 ,11 ,2 ,0 ,1 ,2 },/* RxD2 */ + {0 ,12 ,2 ,0 ,1 ,2 },/* RxD3 */ + {0 ,13 ,2 ,0 ,1 ,2 },/* RxD4 */ + {1 ,1 ,2 ,0 ,2 ,2 },/* RxD5 */ + {1 ,0 ,2 ,0 ,2 ,2 },/* RxD6 */ + {1 ,4 ,2 ,0 ,2 ,2 },/* RxD7 */ + {0 ,7 ,1 ,0 ,1 ,2 },/* TX_EN */ + {0 ,8 ,1 ,0 ,1 ,2 },/* TX_ER */ + {0 ,15 ,2 ,0 ,1 ,2 },/* RX_DV */ + {0 ,16 ,2 ,0 ,1 ,2 },/* RX_ER */ + {0 ,0 ,2 ,0 ,1 ,2 },/* RX_CLK */ + {2 ,9 ,1 ,0 ,3 ,2 },/* GTX_CLK - CLK10 */ + {2 ,8 ,2 ,0 ,1 ,2 },/* GTX125 - CLK9 */ /* GETH2 */ - {0 ,17 ,1 ,0 ,1 },/* TxD0 */ - {0 ,18 ,1 ,0 ,1 },/* TxD1 */ - {0 ,19 ,1 ,0 ,1 },/* TxD2 */ - {0 ,20 ,1 ,0 ,1 },/* TxD3 */ - {1 ,2 ,1 ,0 ,1 },/* TxD4 */ - {1 ,3 ,1 ,0 ,2 },/* TxD5 */ - {1 ,5 ,1 ,0 ,3 },/* TxD6 */ - {1 ,8 ,1 ,0 ,3 },/* TxD7 */ - {0 ,23 ,2 ,0 ,1 },/* RxD0 */ - {0 ,24 ,2 ,0 ,1 },/* RxD1 */ - {0 ,25 ,2 ,0 ,1 },/* RxD2 */ - {0 ,26 ,2 ,0 ,1 },/* RxD3 */ - {0 ,27 ,2 ,0 ,1 },/* RxD4 */ - {1 ,12 ,2 ,0 ,2 },/* RxD5 */ - {1 ,13 ,2 ,0 ,3 },/* RxD6 */ - {1 ,11 ,2 ,0 ,2 },/* RxD7 */ - {0 ,21 ,1 ,0 ,1 },/* TX_EN */ - {0 ,22 ,1 ,0 ,1 },/* TX_ER */ - {0 ,29 ,2 ,0 ,1 },/* RX_DV */ - {0 ,30 ,2 ,0 ,1 },/* RX_ER */ - {0 ,31 ,2 ,0 ,1 },/* RX_CLK */ - {2 ,2 ,1 ,0 ,2 },/* GTX_CLK = CLK10 */ - {2 ,3 ,2 ,0 ,1 },/* GTX125 - CLK4 */ - - {0 ,1 ,3 ,0 ,2 },/* MDIO */ - {0 ,2 ,1 ,0 ,1 },/* MDC */ - - {5 ,0 ,1 ,0 ,2 },/* UART2_SOUT */ - {5 ,1 ,2 ,0 ,3 },/* UART2_CTS */ - {5 ,2 ,1 ,0 ,1 },/* UART2_RTS */ - {5 ,3 ,2 ,0 ,2 },/* UART2_SIN */ + {0 ,17 ,1 ,0 ,1 ,2 },/* TxD0 */ + {0 ,18 ,1 ,0 ,1 ,2 },/* TxD1 */ + {0 ,19 ,1 ,0 ,1 ,2 },/* TxD2 */ + {0 ,20 ,1 ,0 ,1 ,2 },/* TxD3 */ + {1 ,2 ,1 ,0 ,1 ,2 },/* TxD4 */ + {1 ,3 ,1 ,0 ,2 ,2 },/* TxD5 */ + {1 ,5 ,1 ,0 ,3 ,2 },/* TxD6 */ + {1 ,8 ,1 ,0 ,3 ,2 },/* TxD7 */ + {0 ,23 ,2 ,0 ,1 ,2 },/* RxD0 */ + {0 ,24 ,2 ,0 ,1 ,2 },/* RxD1 */ + {0 ,25 ,2 ,0 ,1 ,2 },/* RxD2 */ + {0 ,26 ,2 ,0 ,1 ,2 },/* RxD3 */ + {0 ,27 ,2 ,0 ,1 ,2 },/* RxD4 */ + {1 ,12 ,2 ,0 ,2 ,2 },/* RxD5 */ + {1 ,13 ,2 ,0 ,3 ,2 },/* RxD6 */ + {1 ,11 ,2 ,0 ,2 ,2 },/* RxD7 */ + {0 ,21 ,1 ,0 ,1 ,2 },/* TX_EN */ + {0 ,22 ,1 ,0 ,1 ,2 },/* TX_ER */ + {0 ,29 ,2 ,0 ,1 ,2 },/* RX_DV */ + {0 ,30 ,2 ,0 ,1 ,2 },/* RX_ER */ + {0 ,31 ,2 ,0 ,1 ,2 },/* RX_CLK */ + {2 ,2 ,1 ,0 ,2 ,2 },/* GTX_CLK = CLK10 */ + {2 ,3 ,2 ,0 ,1 ,2 },/* GTX125 - CLK4 */ + + {0 ,1 ,3 ,0 ,2 ,2 },/* MDIO */ + {0 ,2 ,1 ,0 ,1 ,2 },/* MDC */ + + {5 ,0 ,1 ,0 ,2 ,2 },/* UART2_SOUT */ + {5 ,1 ,2 ,0 ,3 ,2 },/* UART2_CTS */ + {5 ,2 ,1 ,0 ,1 ,2 },/* UART2_RTS */ + {5 ,3 ,2 ,0 ,2 ,2 },/* UART2_SIN */ - {0 ,0 ,0 ,0 ,QE_IOP_TAB_END },/* END of table */ + {0 ,0 ,0 ,0 ,QE_IOP_TAB_END ,2 },/* END of table */ };int board_early_init_f (void )diff -purN
a/board/freescale/mpc8360erdk/mpc8360erdk.cb/board/freescale/mpc8360erdk/mpc8360erdk.c
---a/board/freescale/mpc8360erdk/mpc8360erdk.c2008-01-16
23:06:52.000000000 +0200
+++b/board/freescale/mpc8360erdk/mpc8360erdk.c2008-01-17
16:07:14.451836000 +0200cpu/mpc83xx/qe_io.c +140
-140@@ -27,168 +27,168 @@const qe_iop_conf_t qe_iop_conf_tab[] = {/* MDIO */ - {0 ,1 ,3 ,0 ,2 },/* MDIO */ - {0 ,2 ,1 ,0 ,1 },/* MDC */ + {0 ,1 ,3 ,0 ,2 ,2 },/* MDIO */ + {0 ,2 ,1 ,0 ,1 ,2 },/* MDC */ /* UCC1 - UEC (Gigabit) */ - {0 ,3 ,1 ,0 ,1 },/* TxD0 */ - {0 ,4 ,1 ,0 ,1 },/* TxD1 */ - {0 ,5 ,1 ,0 ,1 },/* TxD2 */ - {0 ,6 ,1 ,0 ,1 },/* TxD3 */ - {0 ,9 ,2 ,0 ,1 },/* RxD0 */ - {0 ,10 ,2 ,0 ,1 },/* RxD1 */ - {0 ,11 ,2 ,0 ,1 },/* RxD2 */ - {0 ,12 ,2 ,0 ,1 },/* RxD3 */ - {0 ,7 ,1 ,0 ,1 },/* TX_EN */ - {0 ,8 ,1 ,0 ,1 },/* TX_ER */ - {0 ,15 ,2 ,0 ,1 },/* RX_DV */ - {0 ,0 ,2 ,0 ,1 },/* RX_CLK */ - {2 ,9 ,1 ,0 ,3 },/* GTX_CLK - CLK10 */ - {2 ,8 ,2 ,0 ,1 },/* GTX125 - CLK9 */ + {0 ,3 ,1 ,0 ,1 ,2 },/* TxD0 */ + {0 ,4 ,1 ,0 ,1 ,2 },/* TxD1 */ + {0 ,5 ,1 ,0 ,1 ,2 },/* TxD2 */ + {0 ,6 ,1 ,0 ,1 ,2 },/* TxD3 */ + {0 ,9 ,2 ,0 ,1 ,2 },/* RxD0 */ + {0 ,10 ,2 ,0 ,1 ,2 },/* RxD1 */ + {0 ,11 ,2 ,0 ,1 ,2 },/* RxD2 */ + {0 ,12 ,2 ,0 ,1 ,2 },/* RxD3 */ + {0 ,7 ,1 ,0 ,1 ,2 },/* TX_EN */ + {0 ,8 ,1 ,0 ,1 ,2 },/* TX_ER */ + {0 ,15 ,2 ,0 ,1 ,2 },/* RX_DV */ + {0 ,0 ,2 ,0 ,1 ,2 },/* RX_CLK */ + {2 ,9 ,1 ,0 ,3 ,2 },/* GTX_CLK - CLK10 */ + {2 ,8 ,2 ,0 ,1 ,2 },/* GTX125 - CLK9 */ /* UCC2 - UEC (Gigabit) */ - {0 ,17 ,1 ,0 ,1 },/* TxD0 */ - {0 ,18 ,1 ,0 ,1 },/* TxD1 */ - {0 ,19 ,1 ,0 ,1 },/* TxD2 */ - {0 ,20 ,1 ,0 ,1 },/* TxD3 */ - {0 ,23 ,2 ,0 ,1 },/* RxD0 */ - {0 ,24 ,2 ,0 ,1 },/* RxD1 */ - {0 ,25 ,2 ,0 ,1 },/* RxD2 */ - {0 ,26 ,2 ,0 ,1 },/* RxD3 */ - {0 ,21 ,1 ,0 ,1 },/* TX_EN */ - {0 ,22 ,1 ,0 ,1 },/* TX_ER */ - {0 ,29 ,2 ,0 ,1 },/* RX_DV */ - {0 ,31 ,2 ,0 ,1 },/* RX_CLK */ - {2 ,2 ,1 ,0 ,2 },/* GTX_CLK - CLK10 */ - {2 ,3 ,2 ,0 ,1 },/* GTX125 - CLK4 */ + {0 ,17 ,1 ,0 ,1 ,2 },/* TxD0 */ + {0 ,18 ,1 ,0 ,1 ,2 },/* TxD1 */ + {0 ,19 ,1 ,0 ,1 ,2 },/* TxD2 */ + {0 ,20 ,1 ,0 ,1 ,2 },/* TxD3 */ + {0 ,23 ,2 ,0 ,1 ,2 },/* RxD0 */ + {0 ,24 ,2 ,0 ,1 ,2 },/* RxD1 */ + {0 ,25 ,2 ,0 ,1 ,2 },/* RxD2 */ + {0 ,26 ,2 ,0 ,1 ,2 },/* RxD3 */ + {0 ,21 ,1 ,0 ,1 ,2 },/* TX_EN */ + {0 ,22 ,1 ,0 ,1 ,2 },/* TX_ER */ + {0 ,29 ,2 ,0 ,1 ,2 },/* RX_DV */ + {0 ,31 ,2 ,0 ,1 ,2 },/* RX_CLK */ + {2 ,2 ,1 ,0 ,2 ,2 },/* GTX_CLK - CLK10 */ + {2 ,3 ,2 ,0 ,1 ,2 },/* GTX125 - CLK4 */ /* UCC7 - UEC */ - {4 ,0 ,1 ,0 ,1 },/* TxD0 */ - {4 ,1 ,1 ,0 ,1 },/* TxD1 */ - {4 ,2 ,1 ,0 ,1 },/* TxD2 */ - {4 ,3 ,1 ,0 ,1 },/* TxD3 */ - {4 ,6 ,2 ,0 ,1 },/* RxD0 */ - {4 ,7 ,2 ,0 ,1 },/* RxD1 */ - {4 ,8 ,2 ,0 ,1 },/* RxD2 */ - {4 ,9 ,2 ,0 ,1 },/* RxD3 */ - {4 ,4 ,1 ,0 ,1 },/* TX_EN */ - {4 ,5 ,1 ,0 ,1 },/* TX_ER */ - {4 ,12 ,2 ,0 ,1 },/* RX_DV */ - {4 ,13 ,2 ,0 ,1 },/* RX_ER */ - {4 ,10 ,2 ,0 ,1 },/* COL */ - {4 ,11 ,2 ,0 ,1 },/* CRS */ - {2 ,18 ,2 ,0 ,1 },/* TX_CLK - CLK19 */ - {2 ,19 ,2 ,0 ,1 },/* RX_CLK - CLK20 */ + {4 ,0 ,1 ,0 ,1 ,2 },/* TxD0 */ + {4 ,1 ,1 ,0 ,1 ,2 },/* TxD1 */ + {4 ,2 ,1 ,0 ,1 ,2 },/* TxD2 */ + {4 ,3 ,1 ,0 ,1 ,2 },/* TxD3 */ + {4 ,6 ,2 ,0 ,1 ,2 },/* RxD0 */ + {4 ,7 ,2 ,0 ,1 ,2 },/* RxD1 */ + {4 ,8 ,2 ,0 ,1 ,2 },/* RxD2 */ + {4 ,9 ,2 ,0 ,1 ,2 },/* RxD3 */ + {4 ,4 ,1 ,0 ,1 ,2 },/* TX_EN */ + {4 ,5 ,1 ,0 ,1 ,2 },/* TX_ER */ + {4 ,12 ,2 ,0 ,1 ,2 },/* RX_DV */ + {4 ,13 ,2 ,0 ,1 ,2 },/* RX_ER */ + {4 ,10 ,2 ,0 ,1 ,2 },/* COL */ + {4 ,11 ,2 ,0 ,1 ,2 },/* CRS */ + {2 ,18 ,2 ,0 ,1 ,2 },/* TX_CLK - CLK19 */ + {2 ,19 ,2 ,0 ,1 ,2 },/* RX_CLK - CLK20 */ /* UCC4 - UEC */ - {1 ,14 ,1 ,0 ,1 },/* TxD0 */ - {1 ,15 ,1 ,0 ,1 },/* TxD1 */ - {1 ,16 ,1 ,0 ,1 },/* TxD2 */ - {1 ,17 ,1 ,0 ,1 },/* TxD3 */ - {1 ,20 ,2 ,0 ,1 },/* RxD0 */ - {1 ,21 ,2 ,0 ,1 },/* RxD1 */ - {1 ,22 ,2 ,0 ,1 },/* RxD2 */ - {1 ,23 ,2 ,0 ,1 },/* RxD3 */ - {1 ,18 ,1 ,0 ,1 },/* TX_EN */ - {1 ,19 ,1 ,0 ,2 },/* TX_ER */ - {1 ,26 ,2 ,0 ,1 },/* RX_DV */ - {1 ,27 ,2 ,0 ,1 },/* RX_ER */ - {1 ,24 ,2 ,0 ,1 },/* COL */ - {1 ,25 ,2 ,0 ,1 },/* CRS */ - {2 ,6 ,2 ,0 ,1 },/* TX_CLK - CLK7 */ - {2 ,7 ,2 ,0 ,1 },/* RX_CLK - CLK8 */ + {1 ,14 ,1 ,0 ,1 ,2 },/* TxD0 */ + {1 ,15 ,1 ,0 ,1 ,2 },/* TxD1 */ + {1 ,16 ,1 ,0 ,1 ,2 },/* TxD2 */ + {1 ,17 ,1 ,0 ,1 ,2 },/* TxD3 */ + {1 ,20 ,2 ,0 ,1 ,2 },/* RxD0 */ + {1 ,21 ,2 ,0 ,1 ,2 },/* RxD1 */ + {1 ,22 ,2 ,0 ,1 ,2 },/* RxD2 */ + {1 ,23 ,2 ,0 ,1 ,2 },/* RxD3 */ + {1 ,18 ,1 ,0 ,1 ,2 },/* TX_EN */ + {1 ,19 ,1 ,0 ,2 ,2 },/* TX_ER */ + {1 ,26 ,2 ,0 ,1 ,2 },/* RX_DV */ + {1 ,27 ,2 ,0 ,1 ,2 },/* RX_ER */ + {1 ,24 ,2 ,0 ,1 ,2 },/* COL */ + {1 ,25 ,2 ,0 ,1 ,2 },/* CRS */ + {2 ,6 ,2 ,0 ,1 ,2 },/* TX_CLK - CLK7 */ + {2 ,7 ,2 ,0 ,1 ,2 },/* RX_CLK - CLK8 */ /* PCI1 */ - {5 ,4 ,2 ,0 ,3 },/* PCI_M66EN */ - {5 ,5 ,1 ,0 ,3 },/* PCI_INTA */ - {5 ,6 ,1 ,0 ,3 },/* PCI_RSTO */ - {5 ,7 ,3 ,0 ,3 },/* PCI_C_BE0 */ - {5 ,8 ,3 ,0 ,3 },/* PCI_C_BE1 */ - {5 ,9 ,3 ,0 ,3 },/* PCI_C_BE2 */ - {5 ,10 ,3 ,0 ,3 },/* PCI_C_BE3 */ - {5 ,11 ,3 ,0 ,3 },/* PCI_PAR */ - {5 ,12 ,3 ,0 ,3 },/* PCI_FRAME */ - {5 ,13 ,3 ,0 ,3 },/* PCI_TRDY */ - {5 ,14 ,3 ,0 ,3 },/* PCI_IRDY */ - {5 ,15 ,3 ,0 ,3 },/* PCI_STOP */ - {5 ,16 ,3 ,0 ,3 },/* PCI_DEVSEL */ - {5 ,17 ,0 ,0 ,0 },/* PCI_IDSEL */ - {5 ,18 ,3 ,0 ,3 },/* PCI_SERR */ - {5 ,19 ,3 ,0 ,3 },/* PCI_PERR */ - {5 ,20 ,3 ,0 ,3 },/* PCI_REQ0 */ - {5 ,21 ,2 ,0 ,3 },/* PCI_REQ1 */ - {5 ,22 ,2 ,0 ,3 },/* PCI_GNT2 */ - {5 ,23 ,3 ,0 ,3 },/* PCI_GNT0 */ - {5 ,24 ,1 ,0 ,3 },/* PCI_GNT1 */ - {5 ,25 ,1 ,0 ,3 },/* PCI_GNT2 */ - {5 ,26 ,0 ,0 ,0 },/* PCI_CLK0 */ - {5 ,27 ,0 ,0 ,0 },/* PCI_CLK1 */ - {5 ,28 ,0 ,0 ,0 },/* PCI_CLK2 */ - {5 ,29 ,0 ,0 ,3 },/* PCI_SYNC_OUT */ - {6 ,0 ,3 ,0 ,3 },/* PCI_AD0 */ - {6 ,1 ,3 ,0 ,3 },/* PCI_AD1 */ - {6 ,2 ,3 ,0 ,3 },/* PCI_AD2 */ - {6 ,3 ,3 ,0 ,3 },/* PCI_AD3 */ - {6 ,4 ,3 ,0 ,3 },/* PCI_AD4 */ - {6 ,5 ,3 ,0 ,3 },/* PCI_AD5 */ - {6 ,6 ,3 ,0 ,3 },/* PCI_AD6 */ - {6 ,7 ,3 ,0 ,3 },/* PCI_AD7 */ - {6 ,8 ,3 ,0 ,3 },/* PCI_AD8 */ - {6 ,9 ,3 ,0 ,3 },/* PCI_AD9 */ - {6 ,10 ,3 ,0 ,3 },/* PCI_AD10 */ - {6 ,11 ,3 ,0 ,3 },/* PCI_AD11 */ - {6 ,12 ,3 ,0 ,3 },/* PCI_AD12 */ - {6 ,13 ,3 ,0 ,3 },/* PCI_AD13 */ - {6 ,14 ,3 ,0 ,3 },/* PCI_AD14 */ - {6 ,15 ,3 ,0 ,3 },/* PCI_AD15 */ - {6 ,16 ,3 ,0 ,3 },/* PCI_AD16 */ - {6 ,17 ,3 ,0 ,3 },/* PCI_AD17 */ - {6 ,18 ,3 ,0 ,3 },/* PCI_AD18 */ - {6 ,19 ,3 ,0 ,3 },/* PCI_AD19 */ - {6 ,20 ,3 ,0 ,3 },/* PCI_AD20 */ - {6 ,21 ,3 ,0 ,3 },/* PCI_AD21 */ - {6 ,22 ,3 ,0 ,3 },/* PCI_AD22 */ - {6 ,23 ,3 ,0 ,3 },/* PCI_AD23 */ - {6 ,24 ,3 ,0 ,3 },/* PCI_AD24 */ - {6 ,25 ,3 ,0 ,3 },/* PCI_AD25 */ - {6 ,26 ,3 ,0 ,3 },/* PCI_AD26 */ - {6 ,27 ,3 ,0 ,3 },/* PCI_AD27 */ - {6 ,28 ,3 ,0 ,3 },/* PCI_AD28 */ - {6 ,29 ,3 ,0 ,3 },/* PCI_AD29 */ - {6 ,30 ,3 ,0 ,3 },/* PCI_AD30 */ - {6 ,31 ,3 ,0 ,3 },/* PCI_AD31 */ + {5 ,4 ,2 ,0 ,3 ,2 },/* PCI_M66EN */ + {5 ,5 ,1 ,0 ,3 ,2 },/* PCI_INTA */ + {5 ,6 ,1 ,0 ,3 ,2 },/* PCI_RSTO */ + {5 ,7 ,3 ,0 ,3 ,2 },/* PCI_C_BE0 */ + {5 ,8 ,3 ,0 ,3 ,2 },/* PCI_C_BE1 */ + {5 ,9 ,3 ,0 ,3 ,2 },/* PCI_C_BE2 */ + {5 ,10 ,3 ,0 ,3 ,2 },/* PCI_C_BE3 */ + {5 ,11 ,3 ,0 ,3 ,2 },/* PCI_PAR */ + {5 ,12 ,3 ,0 ,3 ,2 },/* PCI_FRAME */ + {5 ,13 ,3 ,0 ,3 ,2 },/* PCI_TRDY */ + {5 ,14 ,3 ,0 ,3 ,2 },/* PCI_IRDY */ + {5 ,15 ,3 ,0 ,3 ,2 },/* PCI_STOP */ + {5 ,16 ,3 ,0 ,3 ,2 },/* PCI_DEVSEL */ + {5 ,17 ,0 ,0 ,0 ,2 },/* PCI_IDSEL */ + {5 ,18 ,3 ,0 ,3 ,2 },/* PCI_SERR */ + {5 ,19 ,3 ,0 ,3 ,2 },/* PCI_PERR */ + {5 ,20 ,3 ,0 ,3 ,2 },/* PCI_REQ0 */ + {5 ,21 ,2 ,0 ,3 ,2 },/* PCI_REQ1 */ + {5 ,22 ,2 ,0 ,3 ,2 },/* PCI_GNT2 */ + {5 ,23 ,3 ,0 ,3 ,2 },/* PCI_GNT0 */ + {5 ,24 ,1 ,0 ,3 ,2 },/* PCI_GNT1 */ + {5 ,25 ,1 ,0 ,3 ,2 },/* PCI_GNT2 */ + {5 ,26 ,0 ,0 ,0 ,2 },/* PCI_CLK0 */ + {5 ,27 ,0 ,0 ,0 ,2 },/* PCI_CLK1 */ + {5 ,28 ,0 ,0 ,0 ,2 },/* PCI_CLK2 */ + {5 ,29 ,0 ,0 ,3 ,2 },/* PCI_SYNC_OUT */ + {6 ,0 ,3 ,0 ,3 ,2 },/* PCI_AD0 */ + {6 ,1 ,3 ,0 ,3 ,2 },/* PCI_AD1 */ + {6 ,2 ,3 ,0 ,3 ,2 },/* PCI_AD2 */ + {6 ,3 ,3 ,0 ,3 ,2 },/* PCI_AD3 */ + {6 ,4 ,3 ,0 ,3 ,2 },/* PCI_AD4 */ + {6 ,5 ,3 ,0 ,3 ,2 },/* PCI_AD5 */ + {6 ,6 ,3 ,0 ,3 ,2 },/* PCI_AD6 */ + {6 ,7 ,3 ,0 ,3 ,2 },/* PCI_AD7 */ + {6 ,8 ,3 ,0 ,3 ,2 },/* PCI_AD8 */ + {6 ,9 ,3 ,0 ,3 ,2 },/* PCI_AD9 */ + {6 ,10 ,3 ,0 ,3 ,2 },/* PCI_AD10 */ + {6 ,11 ,3 ,0 ,3 ,2 },/* PCI_AD11 */ + {6 ,12 ,3 ,0 ,3 ,2 },/* PCI_AD12 */ + {6 ,13 ,3 ,0 ,3 ,2 },/* PCI_AD13 */ + {6 ,14 ,3 ,0 ,3 ,2 },/* PCI_AD14 */ + {6 ,15 ,3 ,0 ,3 ,2 },/* PCI_AD15 */ + {6 ,16 ,3 ,0 ,3 ,2 },/* PCI_AD16 */ + {6 ,17 ,3 ,0 ,3 ,2 },/* PCI_AD17 */ + {6 ,18 ,3 ,0 ,3 ,2 },/* PCI_AD18 */ + {6 ,19 ,3 ,0 ,3 ,2 },/* PCI_AD19 */ + {6 ,20 ,3 ,0 ,3 ,2 },/* PCI_AD20 */ + {6 ,21 ,3 ,0 ,3 ,2 },/* PCI_AD21 */ + {6 ,22 ,3 ,0 ,3 ,2 },/* PCI_AD22 */ + {6 ,23 ,3 ,0 ,3 ,2 },/* PCI_AD23 */ + {6 ,24 ,3 ,0 ,3 ,2 },/* PCI_AD24 */ + {6 ,25 ,3 ,0 ,3 ,2 },/* PCI_AD25 */ + {6 ,26 ,3 ,0 ,3 ,2 },/* PCI_AD26 */ + {6 ,27 ,3 ,0 ,3 ,2 },/* PCI_AD27 */ + {6 ,28 ,3 ,0 ,3 ,2 },/* PCI_AD28 */ + {6 ,29 ,3 ,0 ,3 ,2 },/* PCI_AD29 */ + {6 ,30 ,3 ,0 ,3 ,2 },/* PCI_AD30 */ + {6 ,31 ,3 ,0 ,3 ,2 },/* PCI_AD31 */ /* NAND */ - {4 ,18 ,2 ,0 ,0 },/* NAND_RYnBY */ + {4 ,18 ,2 ,0 ,0 ,2 },/* NAND_RYnBY */ /* DUART - UART2 */ - {5 ,0 ,1 ,0 ,2 },/* UART2_SOUT */ - {5 ,2 ,1 ,0 ,1 },/* UART2_RTS */ - {5 ,3 ,2 ,0 ,2 },/* UART2_SIN */ - {5 ,1 ,2 ,0 ,3 },/* UART2_CTS */ + {5 ,0 ,1 ,0 ,2 ,2 },/* UART2_SOUT */ + {5 ,2 ,1 ,0 ,1 ,2 },/* UART2_RTS */ + {5 ,3 ,2 ,0 ,2 ,2 },/* UART2_SIN */ + {5 ,1 ,2 ,0 ,3 ,2 },/* UART2_CTS */ /* UCC5 - UART3 */ - {3 ,0 ,1 ,0 ,1 },/* UART3_TX */ - {3 ,4 ,1 ,0 ,1 },/* UART3_RTS */ - {3 ,6 ,2 ,0 ,1 },/* UART3_RX */ - {3 ,12 ,2 ,0 ,0 },/* UART3_CTS */ - {3 ,13 ,2 ,0 ,0 },/* UCC5_CD */ + {3 ,0 ,1 ,0 ,1 ,2 },/* UART3_TX */ + {3 ,4 ,1 ,0 ,1 ,2 },/* UART3_RTS */ + {3 ,6 ,2 ,0 ,1 ,2 },/* UART3_RX */ + {3 ,12 ,2 ,0 ,0 ,2 },/* UART3_CTS */ + {3 ,13 ,2 ,0 ,0 ,2 },/* UCC5_CD */ /* UCC6 - UART4 */ - {3 ,14 ,1 ,0 ,1 },/* UART4_TX */ - {3 ,18 ,1 ,0 ,1 },/* UART4_RTS */ - {3 ,20 ,2 ,0 ,1 },/* UART4_RX */ - {3 ,26 ,2 ,0 ,0 },/* UART4_CTS */ - {3 ,27 ,2 ,0 ,0 },/* UCC6_CD */ + {3 ,14 ,1 ,0 ,1 ,2 },/* UART4_TX */ + {3 ,18 ,1 ,0 ,1 ,2 },/* UART4_RTS */ + {3 ,20 ,2 ,0 ,1 ,2 },/* UART4_RX */ + {3 ,26 ,2 ,0 ,0 ,2 },/* UART4_CTS */ + {3 ,27 ,2 ,0 ,0 ,2 },/* UCC6_CD */ /* Fujitsu MB86277 (MINT) graphics controller */ - {0 ,30 ,1 ,0 ,0 },/* nSRESET_GRAPHICS */ - {1 ,5 ,1 ,0 ,0 },/* nXRST_GRAPHICS */ - {1 ,7 ,1 ,0 ,0 },/* LVDS_BKLT_CTR */ - {2 ,16 ,1 ,0 ,0 },/* LVDS_BKLT_EN */ + {0 ,30 ,1 ,0 ,0 ,2 },/* nSRESET_GRAPHICS */ + {1 ,5 ,1 ,0 ,0 ,2 },/* nXRST_GRAPHICS */ + {1 ,7 ,1 ,0 ,0 ,2 },/* LVDS_BKLT_CTR */ + {2 ,16 ,1 ,0 ,0 ,2 },/* LVDS_BKLT_EN */ /* END of table */ - {0 ,0 ,0 ,0 ,QE_IOP_TAB_END }, + {0 ,0 ,0 ,0 ,QE_IOP_TAB_END ,2 }, };int board_early_init_f (void )diff -purN
a/board/freescale/mpc8568mds/mpc8568mds.cb/board/freescale/mpc8568mds/mpc8568mds.c
---a/board/freescale/mpc8568mds/mpc8568mds.c2008-01-16
23:06:52.000000000 +0200
+++b/board/freescale/mpc8568mds/mpc8568mds.c2008-01-17
16:03:46.708593000 +0200cpu/mpc83xx/qe_io.c +53
-53@@ -37,64 +37,64 @@const qe_iop_conf_t qe_iop_conf_tab[] = {/* GETH1 */ - {4 ,10 ,1 ,0 ,2 },/* TxD0 */ - {4 ,9 ,1 ,0 ,2 },/* TxD1 */ - {4 ,8 ,1 ,0 ,2 },/* TxD2 */ - {4 ,7 ,1 ,0 ,2 },/* TxD3 */ - {4 ,23 ,1 ,0 ,2 },/* TxD4 */ - {4 ,22 ,1 ,0 ,2 },/* TxD5 */ - {4 ,21 ,1 ,0 ,2 },/* TxD6 */ - {4 ,20 ,1 ,0 ,2 },/* TxD7 */ - {4 ,15 ,2 ,0 ,2 },/* RxD0 */ - {4 ,14 ,2 ,0 ,2 },/* RxD1 */ - {4 ,13 ,2 ,0 ,2 },/* RxD2 */ - {4 ,12 ,2 ,0 ,2 },/* RxD3 */ - {4 ,29 ,2 ,0 ,2 },/* RxD4 */ - {4 ,28 ,2 ,0 ,2 },/* RxD5 */ - {4 ,27 ,2 ,0 ,2 },/* RxD6 */ - {4 ,26 ,2 ,0 ,2 },/* RxD7 */ - {4 ,11 ,1 ,0 ,2 },/* TX_EN */ - {4 ,24 ,1 ,0 ,2 },/* TX_ER */ - {4 ,16 ,2 ,0 ,2 },/* RX_DV */ - {4 ,30 ,2 ,0 ,2 },/* RX_ER */ - {4 ,17 ,2 ,0 ,2 },/* RX_CLK */ - {4 ,19 ,1 ,0 ,2 },/* GTX_CLK */ - {1 ,31 ,2 ,0 ,3 },/* GTX125 */ + {4 ,10 ,1 ,0 ,2 ,2 },/* TxD0 */ + {4 ,9 ,1 ,0 ,2 ,2 },/* TxD1 */ + {4 ,8 ,1 ,0 ,2 ,2 },/* TxD2 */ + {4 ,7 ,1 ,0 ,2 ,2 },/* TxD3 */ + {4 ,23 ,1 ,0 ,2 ,2 },/* TxD4 */ + {4 ,22 ,1 ,0 ,2 ,2 },/* TxD5 */ + {4 ,21 ,1 ,0 ,2 ,2 },/* TxD6 */ + {4 ,20 ,1 ,0 ,2 ,2 },/* TxD7 */ + {4 ,15 ,2 ,0 ,2 ,2 },/* RxD0 */ + {4 ,14 ,2 ,0 ,2 ,2 },/* RxD1 */ + {4 ,13 ,2 ,0 ,2 ,2 },/* RxD2 */ + {4 ,12 ,2 ,0 ,2 ,2 },/* RxD3 */ + {4 ,29 ,2 ,0 ,2 ,2 },/* RxD4 */ + {4 ,28 ,2 ,0 ,2 ,2 },/* RxD5 */ + {4 ,27 ,2 ,0 ,2 ,2 },/* RxD6 */ + {4 ,26 ,2 ,0 ,2 ,2 },/* RxD7 */ + {4 ,11 ,1 ,0 ,2 ,2 },/* TX_EN */ + {4 ,24 ,1 ,0 ,2 ,2 },/* TX_ER */ + {4 ,16 ,2 ,0 ,2 ,2 },/* RX_DV */ + {4 ,30 ,2 ,0 ,2 ,2 },/* RX_ER */ + {4 ,17 ,2 ,0 ,2 ,2 },/* RX_CLK */ + {4 ,19 ,1 ,0 ,2 ,2 },/* GTX_CLK */ + {1 ,31 ,2 ,0 ,3 ,2 },/* GTX125 */ /* GETH2 */ - {5 ,10 ,1 ,0 ,2 },/* TxD0 */ - {5 ,9 ,1 ,0 ,2 },/* TxD1 */ - {5 ,8 ,1 ,0 ,2 },/* TxD2 */ - {5 ,7 ,1 ,0 ,2 },/* TxD3 */ - {5 ,23 ,1 ,0 ,2 },/* TxD4 */ - {5 ,22 ,1 ,0 ,2 },/* TxD5 */ - {5 ,21 ,1 ,0 ,2 },/* TxD6 */ - {5 ,20 ,1 ,0 ,2 },/* TxD7 */ - {5 ,15 ,2 ,0 ,2 },/* RxD0 */ - {5 ,14 ,2 ,0 ,2 },/* RxD1 */ - {5 ,13 ,2 ,0 ,2 },/* RxD2 */ - {5 ,12 ,2 ,0 ,2 },/* RxD3 */ - {5 ,29 ,2 ,0 ,2 },/* RxD4 */ - {5 ,28 ,2 ,0 ,2 },/* RxD5 */ - {5 ,27 ,2 ,0 ,3 },/* RxD6 */ - {5 ,26 ,2 ,0 ,2 },/* RxD7 */ - {5 ,11 ,1 ,0 ,2 },/* TX_EN */ - {5 ,24 ,1 ,0 ,2 },/* TX_ER */ - {5 ,16 ,2 ,0 ,2 },/* RX_DV */ - {5 ,30 ,2 ,0 ,2 },/* RX_ER */ - {5 ,17 ,2 ,0 ,2 },/* RX_CLK */ - {5 ,19 ,1 ,0 ,2 },/* GTX_CLK */ - {1 ,31 ,2 ,0 ,3 },/* GTX125 */ - {4 ,6 ,3 ,0 ,2 },/* MDIO */ - {4 ,5 ,1 ,0 ,2 },/* MDC */ + {5 ,10 ,1 ,0 ,2 ,2 },/* TxD0 */ + {5 ,9 ,1 ,0 ,2 ,2 },/* TxD1 */ + {5 ,8 ,1 ,0 ,2 ,2 },/* TxD2 */ + {5 ,7 ,1 ,0 ,2 ,2 },/* TxD3 */ + {5 ,23 ,1 ,0 ,2 ,2 },/* TxD4 */ + {5 ,22 ,1 ,0 ,2 ,2 },/* TxD5 */ + {5 ,21 ,1 ,0 ,2 ,2 },/* TxD6 */ + {5 ,20 ,1 ,0 ,2 ,2 },/* TxD7 */ + {5 ,15 ,2 ,0 ,2 ,2 },/* RxD0 */ + {5 ,14 ,2 ,0 ,2 ,2 },/* RxD1 */ + {5 ,13 ,2 ,0 ,2 ,2 },/* RxD2 */ + {5 ,12 ,2 ,0 ,2 ,2 },/* RxD3 */ + {5 ,29 ,2 ,0 ,2 ,2 },/* RxD4 */ + {5 ,28 ,2 ,0 ,2 ,2 },/* RxD5 */ + {5 ,27 ,2 ,0 ,3 ,2 },/* RxD6 */ + {5 ,26 ,2 ,0 ,2 ,2 },/* RxD7 */ + {5 ,11 ,1 ,0 ,2 ,2 },/* TX_EN */ + {5 ,24 ,1 ,0 ,2 ,2 },/* TX_ER */ + {5 ,16 ,2 ,0 ,2 ,2 },/* RX_DV */ + {5 ,30 ,2 ,0 ,2 ,2 },/* RX_ER */ + {5 ,17 ,2 ,0 ,2 ,2 },/* RX_CLK */ + {5 ,19 ,1 ,0 ,2 ,2 },/* GTX_CLK */ + {1 ,31 ,2 ,0 ,3 ,2 },/* GTX125 */ + {4 ,6 ,3 ,0 ,2 ,2 },/* MDIO */ + {4 ,5 ,1 ,0 ,2 ,2 },/* MDC */ /* UART1 */ - {2 ,0 ,1 ,0 ,2 },/* UART_SOUT1 */ - {2 ,1 ,1 ,0 ,2 },/* UART_RTS1 */ - {2 ,2 ,2 ,0 ,2 },/* UART_CTS1 */ - {2 ,3 ,2 ,0 ,2 },/* UART_SIN1 */ + {2 ,0 ,1 ,0 ,2 ,2 },/* UART_SOUT1 */ + {2 ,1 ,1 ,0 ,2 ,2 },/* UART_RTS1 */ + {2 ,2 ,2 ,0 ,2 ,2 },/* UART_CTS1 */ + {2 ,3 ,2 ,0 ,2 ,2 },/* UART_SIN1 */ - {0 ,0 ,0 ,0 ,QE_IOP_TAB_END },/* END of table */ + {0 ,0 ,0 ,0 ,QE_IOP_TAB_END ,2 },/* END of table */ };diff -purN
a/board/freescale/mpc8323erdb/mpc8323erdb.cb/board/freescale/mpc8323erdb/mpc8323erdb.c
---a/board/freescale/mpc8323erdb/mpc8323erdb.c2008-01-16
23:06:52.000000000 +0200
+++b/board/freescale/mpc8323erdb/mpc8323erdb.c2008-01-17
16:09:44.661841000 +0200cpu/mpc83xx/qe_io.c +37
-37@@ -28,47 +28,47 @@const qe_iop_conf_t qe_iop_conf_tab[] = {/* UCC3 */ - {1 ,0 ,1 ,0 ,1 },/* TxD0 */ - {1 ,1 ,1 ,0 ,1 },/* TxD1 */ - {1 ,2 ,1 ,0 ,1 },/* TxD2 */ - {1 ,3 ,1 ,0 ,1 },/* TxD3 */ - {1 ,9 ,1 ,0 ,1 },/* TxER */ - {1 ,12 ,1 ,0 ,1 },/* TxEN */ - {3 ,24 ,2 ,0 ,1 },/* TxCLK->CLK10 */ - - {1 ,4 ,2 ,0 ,1 },/* RxD0 */ - {1 ,5 ,2 ,0 ,1 },/* RxD1 */ - {1 ,6 ,2 ,0 ,1 },/* RxD2 */ - {1 ,7 ,2 ,0 ,1 },/* RxD3 */ - {1 ,8 ,2 ,0 ,1 },/* RxER */ - {1 ,10 ,2 ,0 ,1 },/* RxDV */ - {0 ,13 ,2 ,0 ,1 },/* RxCLK->CLK9 */ - {1 ,11 ,2 ,0 ,1 },/* COL */ - {1 ,13 ,2 ,0 ,1 },/* CRS */ + {1 ,0 ,1 ,0 ,1 ,2 },/* TxD0 */ + {1 ,1 ,1 ,0 ,1 ,2 },/* TxD1 */ + {1 ,2 ,1 ,0 ,1 ,2 },/* TxD2 */ + {1 ,3 ,1 ,0 ,1 ,2 },/* TxD3 */ + {1 ,9 ,1 ,0 ,1 ,2 },/* TxER */ + {1 ,12 ,1 ,0 ,1 ,2 },/* TxEN */ + {3 ,24 ,2 ,0 ,1 ,2 },/* TxCLK->CLK10 */ + + {1 ,4 ,2 ,0 ,1 ,2 },/* RxD0 */ + {1 ,5 ,2 ,0 ,1 ,2 },/* RxD1 */ + {1 ,6 ,2 ,0 ,1 ,2 },/* RxD2 */ + {1 ,7 ,2 ,0 ,1 ,2 },/* RxD3 */ + {1 ,8 ,2 ,0 ,1 ,2 },/* RxER */ + {1 ,10 ,2 ,0 ,1 ,2 },/* RxDV */ + {0 ,13 ,2 ,0 ,1 ,2 },/* RxCLK->CLK9 */ + {1 ,11 ,2 ,0 ,1 ,2 },/* COL */ + {1 ,13 ,2 ,0 ,1 ,2 },/* CRS */ /* UCC2 */ - {0 ,18 ,1 ,0 ,1 },/* TxD0 */ - {0 ,19 ,1 ,0 ,1 },/* TxD1 */ - {0 ,20 ,1 ,0 ,1 },/* TxD2 */ - {0 ,21 ,1 ,0 ,1 },/* TxD3 */ - {0 ,27 ,1 ,0 ,1 },/* TxER */ - {0 ,30 ,1 ,0 ,1 },/* TxEN */ - {3 ,23 ,2 ,0 ,1 },/* TxCLK->CLK3 */ - - {0 ,22 ,2 ,0 ,1 },/* RxD0 */ - {0 ,23 ,2 ,0 ,1 },/* RxD1 */ - {0 ,24 ,2 ,0 ,1 },/* RxD2 */ - {0 ,25 ,2 ,0 ,1 },/* RxD3 */ - {0 ,26 ,1 ,0 ,1 },/* RxER */ - {0 ,28 ,2 ,0 ,1 },/* Rx_DV */ - {3 ,21 ,2 ,0 ,1 },/* RxCLK->CLK16 */ - {0 ,29 ,2 ,0 ,1 },/* COL */ - {0 ,31 ,2 ,0 ,1 },/* CRS */ + {0 ,18 ,1 ,0 ,1 ,2 },/* TxD0 */ + {0 ,19 ,1 ,0 ,1 ,2 },/* TxD1 */ + {0 ,20 ,1 ,0 ,1 ,2 },/* TxD2 */ + {0 ,21 ,1 ,0 ,1 ,2 },/* TxD3 */ + {0 ,27 ,1 ,0 ,1 ,2 },/* TxER */ + {0 ,30 ,1 ,0 ,1 ,2 },/* TxEN */ + {3 ,23 ,2 ,0 ,1 ,2 },/* TxCLK->CLK3 */ + + {0 ,22 ,2 ,0 ,1 ,2 },/* RxD0 */ + {0 ,23 ,2 ,0 ,1 ,2 },/* RxD1 */ + {0 ,24 ,2 ,0 ,1 ,2 },/* RxD2 */ + {0 ,25 ,2 ,0 ,1 ,2 },/* RxD3 */ + {0 ,26 ,1 ,0 ,1 ,2 },/* RxER */ + {0 ,28 ,2 ,0 ,1 ,2 },/* Rx_DV */ + {3 ,21 ,2 ,0 ,1 ,2 },/* RxCLK->CLK16 */ + {0 ,29 ,2 ,0 ,1 ,2 },/* COL */ + {0 ,31 ,2 ,0 ,1 ,2 },/* CRS */ - {3 ,4 ,3 ,0 ,2 },/* MDIO */ - {3 ,5 ,1 ,0 ,2 },/* MDC */ + {3 ,4 ,3 ,0 ,2 ,2 },/* MDIO */ + {3 ,5 ,1 ,0 ,2 ,2 },/* MDC */ - {0 ,0 ,0 ,0 ,QE_IOP_TAB_END },/* END of table */ + {0 ,0 ,0 ,0 ,QE_IOP_TAB_END ,2 },/* END of table */ };int board_early_init_f (void )diff -purN
a/board/freescale/mpc832xemds/mpc832xemds.cb/board/freescale/mpc832xemds/mpc832xemds.c
---a/board/freescale/mpc832xemds/mpc832xemds.c2008-01-16
23:06:52.000000000 +0200
+++b/board/freescale/mpc832xemds/mpc832xemds.c2008-01-17
16:10:52.724934000 +0200cpu/mpc83xx/qe_io.c +37
-37@@ -36,47 +36,47 @@const qe_iop_conf_t qe_iop_conf_tab[] = {/* ETH3 */ - {1 ,0 ,1 ,0 ,1 },/* TxD0 */ - {1 ,1 ,1 ,0 ,1 },/* TxD1 */ - {1 ,2 ,1 ,0 ,1 },/* TxD2 */ - {1 ,3 ,1 ,0 ,1 },/* TxD3 */ - {1 ,9 ,1 ,0 ,1 },/* TxER */ - {1 ,12 ,1 ,0 ,1 },/* TxEN */ - {3 ,24 ,2 ,0 ,1 },/* TxCLK->CLK10 */ - - {1 ,4 ,2 ,0 ,1 },/* RxD0 */ - {1 ,5 ,2 ,0 ,1 },/* RxD1 */ - {1 ,6 ,2 ,0 ,1 },/* RxD2 */ - {1 ,7 ,2 ,0 ,1 },/* RxD3 */ - {1 ,8 ,2 ,0 ,1 },/* RxER */ - {1 ,10 ,2 ,0 ,1 },/* RxDV */ - {0 ,13 ,2 ,0 ,1 },/* RxCLK->CLK9 */ - {1 ,11 ,2 ,0 ,1 },/* COL */ - {1 ,13 ,2 ,0 ,1 },/* CRS */ + {1 ,0 ,1 ,0 ,1 ,2 },/* TxD0 */ + {1 ,1 ,1 ,0 ,1 ,2 },/* TxD1 */ + {1 ,2 ,1 ,0 ,1 ,2 },/* TxD2 */ + {1 ,3 ,1 ,0 ,1 ,2 },/* TxD3 */ + {1 ,9 ,1 ,0 ,1 ,2 },/* TxER */ + {1 ,12 ,1 ,0 ,1 ,2 },/* TxEN */ + {3 ,24 ,2 ,0 ,1 ,2 },/* TxCLK->CLK10 */ + + {1 ,4 ,2 ,0 ,1 ,2 },/* RxD0 */ + {1 ,5 ,2 ,0 ,1 ,2 },/* RxD1 */ + {1 ,6 ,2 ,0 ,1 ,2 },/* RxD2 */ + {1 ,7 ,2 ,0 ,1 ,2 },/* RxD3 */ + {1 ,8 ,2 ,0 ,1 ,2 },/* RxER */ + {1 ,10 ,2 ,0 ,1 ,2 },/* RxDV */ + {0 ,13 ,2 ,0 ,1 ,2 },/* RxCLK->CLK9 */ + {1 ,11 ,2 ,0 ,1 ,2 },/* COL */ + {1 ,13 ,2 ,0 ,1 ,2 },/* CRS */ /* ETH4 */ - {1 ,18 ,1 ,0 ,1 },/* TxD0 */ - {1 ,19 ,1 ,0 ,1 },/* TxD1 */ - {1 ,20 ,1 ,0 ,1 },/* TxD2 */ - {1 ,21 ,1 ,0 ,1 },/* TxD3 */ - {1 ,27 ,1 ,0 ,1 },/* TxER */ - {1 ,30 ,1 ,0 ,1 },/* TxEN */ - {3 ,6 ,2 ,0 ,1 },/* TxCLK->CLK8 */ - - {1 ,22 ,2 ,0 ,1 },/* RxD0 */ - {1 ,23 ,2 ,0 ,1 },/* RxD1 */ - {1 ,24 ,2 ,0 ,1 },/* RxD2 */ - {1 ,25 ,2 ,0 ,1 },/* RxD3 */ - {1 ,26 ,1 ,0 ,1 },/* RxER */ - {1 ,28 ,2 ,0 ,1 },/* Rx_DV */ - {3 ,31 ,2 ,0 ,1 },/* RxCLK->CLK7 */ - {1 ,29 ,2 ,0 ,1 },/* COL */ - {1 ,31 ,2 ,0 ,1 },/* CRS */ + {1 ,18 ,1 ,0 ,1 ,2 },/* TxD0 */ + {1 ,19 ,1 ,0 ,1 ,2 },/* TxD1 */ + {1 ,20 ,1 ,0 ,1 ,2 },/* TxD2 */ + {1 ,21 ,1 ,0 ,1 ,2 },/* TxD3 */ + {1 ,27 ,1 ,0 ,1 ,2 },/* TxER */ + {1 ,30 ,1 ,0 ,1 ,2 },/* TxEN */ + {3 ,6 ,2 ,0 ,1 ,2 },/* TxCLK->CLK8 */ + + {1 ,22 ,2 ,0 ,1 ,2 },/* RxD0 */ + {1 ,23 ,2 ,0 ,1 ,2 },/* RxD1 */ + {1 ,24 ,2 ,0 ,1 ,2 },/* RxD2 */ + {1 ,25 ,2 ,0 ,1 ,2 },/* RxD3 */ + {1 ,26 ,1 ,0 ,1 ,2 },/* RxER */ + {1 ,28 ,2 ,0 ,1 ,2 },/* Rx_DV */ + {3 ,31 ,2 ,0 ,1 ,2 },/* RxCLK->CLK7 */ + {1 ,29 ,2 ,0 ,1 ,2 },/* COL */ + {1 ,31 ,2 ,0 ,1 ,2 },/* CRS */ - {3 ,4 ,3 ,0 ,2 },/* MDIO */ - {3 ,5 ,1 ,0 ,2 },/* MDC */ + {3 ,4 ,3 ,0 ,2 ,2 },/* MDIO */ + {3 ,5 ,1 ,0 ,2 ,2 },/* MDC */ - {0 ,0 ,0 ,0 ,QE_IOP_TAB_END },/* END of table */ + {0 ,0 ,0 ,0 ,QE_IOP_TAB_END ,2 },/* END of table */ };int board_early_init_f (void )
PATCH v3 1/1 QE IO: Add initial data to pin configuration + read/write functions
Quoted 1 line · David Saada
Any feedback on this patch? Timur?
It looks okay, but I haven't had a chance to review it thoroughly.
I don't like the value of "2" for "ignore". Since that type is an 'int', how about using "-1" instead?
Signature · 2 lines
Timur Tabi Linux kernel developer at Freescale
PATCH v3 1/1 QE IO: Add initial data to pin configuration + read/write functions
Quoted 5 lines
It looks okay, but I haven't had a chance to review it thoroughly.
I don't like the value of "2" for "ignore". Since that type is an
'int',
Quoted 2 lines
how
about using "-1" instead?
No problem. If there's nothing else, I'll repost the patch with this change (hopefully the last time).
I also implemented commands for reading and writing parallel I/O (pario read/write), but I'll post this as a separate patch.
David.
PATCH v3 1/1 QE IO: Add initial data to pin configuration + read/write functions
Quoted 5 lines · David Saada
No problem. If there's nothing else, I'll repost the patch with this change (hopefully the last time).
I also implemented commands for reading and writing parallel I/O (pario read/write), but I'll post this as a separate patch.
David.
I still can't apply the patch:
$ git-am "/home/b04825/.mozilla/default/2ir4ayuy.slt/Mail/Local Folders/patches"
Applying QE IO: Add initial data to pin configuration + read/write functions
fatal: corrupt patch at line 40
Patch failed at 0001.
When you have resolved this problem run "git-am --resolved". If you would prefer to skip this patch, instead run "git-am --skip".
I see these in the message body:
+ int data;
} qe_iop_conf_t;
=20
#define QE_IOP_TAB_END (-1)
The "=20" is the problem. Have you tried using git-send-email?
Signature · 2 lines
Timur Tabi Linux kernel developer at Freescale
PATCH v3 1/1 QE IO: Add initial data to pin configuration + read/write functions
In reply to David SaadaQuoted 2 lines · David Saada
No problem. If there's nothing else, I'll repost the patch with this change (hopefully the last time).
No, I think that's the only issue I have. Well, that and the fact that I can never apply your patches because git-am doesn't like them.
Signature · 2 lines
Timur Tabi Linux kernel developer at Freescale
PATCH v3 1/1 QE IO: Add initial data to pin configuration + read/write functions
Quoted 5 lines
Quoted 3 lines
No problem. If there's nothing else, I'll repost the patch with this change (hopefully the last time).
No, I think that's the only issue I have. Well, that and the fact
that I
Quoted 2 lines
can
never apply your patches because git-am doesn't like them.
Yes, sorry about that. Wasn't too well in the last couple of days, so didn't have the time to handle it. Will try to rediff and repost. Don't think it's a mail problem though (as the problematic line is quite short).
David.
PATCH v3 1/1 QE IO: Add initial data to pin configuration + read/write functions
Quoted 5 lines · David Saada
Quoted 5 lines
Quoted 3 lines
No problem. If there's nothing else, I'll repost the patch with this change (hopefully the last time).
No, I think that's the only issue I have. Well, that and the fact
Quoted 8 lines
that I
Quoted 2 lines
can
never apply your patches because git-am doesn't like them.Yes, sorry about that. Wasn't too well in the last couple of days, so didn't have the time to handle it. Will try to rediff and repost. Don't think it's a mail problem though (as the problematic line is quite short).
David, any word on this? I'm trying to aggressively stay on top of patches for 1.3.3
Andy
PATCH v3 1/1 QE IO: Add initial data to pin configuration + read/write functions
Quoted 5 lines
David, any word on this? I'm trying to aggressively stay on top of patches for 1.3.3
Andy
Sorry - had loads of work here, will try to squeeze it in today. David.
PATCH v4 1/1 QE IO: Add initial data to pin configuration + read/write functions
In reply to Andy FlemingOn the MPC83xx & MPC85xx architectures that have QE, add initial data to the pin configuration table (qe_iop_conf_tab). This is relevant for GPIO pins defined as output. One can setup a value of -1 to leave the value unchanged.
QE initialization tables in all relevant boards were also replaced. In addition, add IO pin read & write functions.
This patch also includes commands for reading and writing parallel I/O ports (pario command).
include/ioports.h +1 -0
@@ -60,6 +60,7 @@ typedef struct {int dir;int open_drain;int assign; +int data; } qe_iop_conf_t;#define QE_IOP_TAB_END (-1)
cpu/mpc85xx/cpu_init.c +4 -3
@@ -39,14 +39,14 @@ DECLARE_GLOBAL_DATA_PTR;#ifdef CONFIG_QE extern qe_iop_conf_t qe_iop_conf_tab[];extern void qe_config_iopin (u8 port,u8 pin,int dir, -int open_drain,int assign); +int open_drain,int assign,int data);extern void qe_init (uint qe_base);extern void qe_reset (void );static void config_qe_ioports (void ) {u8 port, pin; -int dir, open_drain, assign; +int dir, open_drain, assign, data;int i;for (i =0 ; qe_iop_conf_tab[i].assign !=QE_IOP_TAB_END ; i++) {
@@ -55,7 +55,8 @@ static void config_qe_ioports(void) dir = qe_iop_conf_tab[i].dir; open_drain = qe_iop_conf_tab[i].open_drain; assign = qe_iop_conf_tab[i].assign; -qe_config_iopin (port, pin, dir, open_drain, assign); + data = qe_iop_conf_tab[i].data; + qe_config_iopin(port, pin, dir, open_drain, assign,
data);
}
}
#endif
cpu/mpc85xx/qe_io.c +0 -1
@@ -27,7 +27,8 @@#if defined(CONFIG_QE )#define NUM_OF_PINS 32 -void qe_config_iopin(u8 port, u8 pin, int dir, int open_drain, int
assign)
+void qe_config_iopin(u8 port, u8 pin, int dir, int open_drain, int assign,
+ int data)
{
u32 pin_2bit_mask;
u32 pin_2bit_dir;
@@ -38,6 +39,20 @@ void qe_config_iopin(u8 port, u8 pin, in
volatile par_io_t *par_io = (volatile par_io_t *)
&(gur->qe_par_io);
+ /* Calculate pin location for 1bit mask */
+ pin_1bit_mask = (u32)(1 << (NUM_OF_PINS - (pin+1)));
+
+ /* Setup the data */
+ if ((data != -1) && /* Don't leave unchanged */
+ (assign == 0) && /* GPIO */
+ (dir & 1)) { /* Has output */
+ tmp_val = in_be32(&par_io[port].cpdat);
+ if (data)
+ out_be32(&par_io[port].cpdat, pin_1bit_mask |tmp_val);
+ else
+ out_be32(&par_io[port].cpdat, ~pin_1bit_mask &tmp_val);
+ }
+
/* Caculate pin location and 2bit mask and dir */ pin_2bit_mask = (u32)(0x3 <<
(NUM_OF_PINS-(pin%(NUM_OF_PINS/2)+1)*2));
pin_2bit_dir = (u32)(dir <<
(NUM_OF_PINS-(pin%(NUM_OF_PINS/2)+1)*2));
@@ -55,9 +70,6 @@ void qe_config_iopin(u8 port, u8 pin, in
out_be32(&par_io[port].cpdir1, pin_2bit_dir | tmp_val);
}
- /* Calculate pin location for 1bit mask */
- pin_1bit_mask = (u32)(1 << (NUM_OF_PINS - (pin+1)));
-
/* Setup the open drain */
tmp_val = in_be32(&par_io[port].cpodr);
if (open_drain)
@@ -82,4 +94,39 @@ void qe_config_iopin(u8 port, u8 pin, in
}
}
+void qe_read_iopin(u8 port, u8 pin, int *data)
+{
+ u32 pin_1bit_mask;
+ u32 tmp_val;
+ volatile ccsr_gur_t *gur = (void *)(CFG_MPC85xx_GUTS_ADDR);
+ volatile par_io_t *par_io = (volatile par_io_t *)
+ &(gur->qe_par_io);
+
+ /* Calculate pin location for 1bit mask */
+ pin_1bit_mask = (u32)(1 << (NUM_OF_PINS - (pin+1)));
+
+ /* Read the data */
+ tmp_val = in_be32(&par_io[port].cpdat);
+ *data = (tmp_val >> (NUM_OF_PINS - (pin+1))) & 0x1;
+}
+
+void qe_write_iopin(u8 port, u8 pin, int data)
+{
+ u32 pin_1bit_mask;
+ u32 tmp_val;
+ volatile ccsr_gur_t *gur = (void *)(CFG_MPC85xx_GUTS_ADDR);
+ volatile par_io_t *par_io = (volatile par_io_t *)
+ &(gur->qe_par_io);
+
+ /* Calculate pin location for 1bit mask */
+ pin_1bit_mask = (u32)(1 << (NUM_OF_PINS - (pin+1)));
+
+ /* Write the data */
+ tmp_val = in_be32(&par_io[port].cpdat);
+ if (data)
+ out_be32(&par_io[port].cpdat, pin_1bit_mask | tmp_val);
+ else
+ out_be32(&par_io[port].cpdat, ~pin_1bit_mask & tmp_val);
+}
+
#endif /* CONFIG_QE */
cpu/mpc83xx/cpu_init.c +4 -3
@@ -29,14 +29,14 @@ DECLARE_GLOBAL_DATA_PTR;#ifdef CONFIG_QE extern qe_iop_conf_t qe_iop_conf_tab[];extern void qe_config_iopin (u8 port,u8 pin,int dir, -int open_drain,int assign); +int open_drain,int assign,int data);extern void qe_init (uint qe_base);extern void qe_reset (void );static void config_qe_ioports (void ) {u8 port, pin; -int dir, open_drain, assign; +int dir, open_drain, assign, data;int i;for (i =0 ; qe_iop_conf_tab[i].assign !=QE_IOP_TAB_END ; i++) {
@@ -45,7 +45,8 @@ static void config_qe_ioports(void) dir = qe_iop_conf_tab[i].dir; open_drain = qe_iop_conf_tab[i].open_drain; assign = qe_iop_conf_tab[i].assign; -qe_config_iopin (port, pin, dir, open_drain, assign); + data = qe_iop_conf_tab[i].data; + qe_config_iopin(port, pin, dir, open_drain, assign,
data);
}
}
#endif
cpu/mpc83xx/qe_io.c +0 -1
@@ -27,7 +27,8 @@#if defined(CONFIG_QE )#define NUM_OF_PINS 32 -void qe_config_iopin(u8 port, u8 pin, int dir, int open_drain, int
assign)
+void qe_config_iopin(u8 port, u8 pin, int dir, int open_drain, int assign,
+ int data)
{
u32 pin_2bit_mask;
u32 pin_2bit_dir;
@@ -37,6 +38,20 @@ void qe_config_iopin(u8 port, u8 pin, in
volatile immap_t *im = (volatile immap_t *)CFG_IMMR;
volatile qepio83xx_t *par_io = (volatile qepio83xx_t
*)&im->qepio;
+ /* Calculate pin location for 1bit mask */
+ pin_1bit_mask = (u32)(1 << (NUM_OF_PINS - (pin+1)));
+
+ /* Setup the data */
+ if ((data != -1) && /* Don't leave unchanged */
+ (assign == 0) && /* GPIO */
+ (dir & 1)) { /* Has output */
+ tmp_val = in_be32(&par_io->ioport[port].pdat);
+ if (data)
+ out_be32(&par_io->ioport[port].pdat,pin_1bit_mask | tmp_val);
+ else
+ out_be32(&par_io->ioport[port].pdat,
~pin_1bit_mask & tmp_val);
+ }
+
/* Caculate pin location and 2bit mask and dir */ pin_2bit_mask = (u32)(0x3 <<
(NUM_OF_PINS-(pin%(NUM_OF_PINS/2)+1)*2));
pin_2bit_dir = (u32)(dir <<
(NUM_OF_PINS-(pin%(NUM_OF_PINS/2)+1)*2));
@@ -54,9 +69,6 @@ void qe_config_iopin(u8 port, u8 pin, in
out_be32(&par_io->ioport[port].dir1, pin_2bit_dir |tmp_val);
}
- /* Calculate pin location for 1bit mask */
- pin_1bit_mask = (u32)(1 << (NUM_OF_PINS - (pin+1)));
-
/* Setup the open drain */
tmp_val = in_be32(&par_io->ioport[port].podr); if (open_drain) {
@@ -82,4 +94,38 @@ void qe_config_iopin(u8 port, u8 pin, in
}
}
+void qe_read_iopin(u8 port, u8 pin, int *data)
+{
+ u32 pin_1bit_mask;
+ u32 tmp_val;
+ volatile immap_t *im = (volatile immap_t *)CFG_IMMR;
+ volatile qepio83xx_t *par_io = (volatile qepio83xx_t
*)&im->qepio;
+
+ /* Calculate pin location for 1bit mask */
+ pin_1bit_mask = (u32)(1 << (NUM_OF_PINS - (pin+1)));
+
+ /* Read the data */
+ tmp_val = in_be32(&par_io->ioport[port].pdat);
+ *data = (tmp_val >> (NUM_OF_PINS - (pin+1))) & 0x1;
+}
+
+void qe_write_iopin(u8 port, u8 pin, int data)
+{
+ u32 pin_1bit_mask;
+ u32 tmp_val;
+ volatile immap_t *im = (volatile immap_t *)CFG_IMMR;
+ volatile qepio83xx_t *par_io = (volatile qepio83xx_t
*)&im->qepio;
+
+ /* Calculate pin location for 1bit mask */
+ pin_1bit_mask = (u32)(1 << (NUM_OF_PINS - (pin+1)));
+
+ /* Setup the data */
+ tmp_val = in_be32(&par_io->ioport[port].pdat);
+ if (data) {
+ out_be32(&par_io->ioport[port].pdat, pin_1bit_mask |tmp_val);
+ } else {
+ out_be32(&par_io->ioport[port].pdat, ~pin_1bit_mask &tmp_val);
+ }
+}
+
#endif /* CONFIG_QE */
--- a/board/freescale/mpc8323erdb/mpc8323erdb.c 2008-01-23
15:41:38.000000000 +0200
+++ b/board/freescale/mpc8323erdb/mpc8323erdb.c 2008-02-06
18:36:28.335683000 +0200
@@ -28,47 +28,47 @@
const qe_iop_conf_t qe_iop_conf_tab[] = {
/* UCC3 */
- {1, 0, 1, 0, 1}, /* TxD0 */
- {1, 1, 1, 0, 1}, /* TxD1 */
- {1, 2, 1, 0, 1}, /* TxD2 */
- {1, 3, 1, 0, 1}, /* TxD3 */
- {1, 9, 1, 0, 1}, /* TxER */
- {1, 12, 1, 0, 1}, /* TxEN */
- {3, 24, 2, 0, 1}, /* TxCLK->CLK10 */
-
- {1, 4, 2, 0, 1}, /* RxD0 */
- {1, 5, 2, 0, 1}, /* RxD1 */
- {1, 6, 2, 0, 1}, /* RxD2 */
- {1, 7, 2, 0, 1}, /* RxD3 */
- {1, 8, 2, 0, 1}, /* RxER */- {1, 10, 2, 0, 1}, /* RxDV */
- {0, 13, 2, 0, 1}, /* RxCLK->CLK9 */
- {1, 11, 2, 0, 1}, /* COL */
- {1, 13, 2, 0, 1}, /* CRS */
+ {1, 0, 1, 0, 1, -1}, /* TxD0 */
+ {1, 1, 1, 0, 1, -1}, /* TxD1 */
+ {1, 2, 1, 0, 1, -1}, /* TxD2 */
+ {1, 3, 1, 0, 1, -1}, /* TxD3 */
+ {1, 9, 1, 0, 1, -1}, /* TxER */
+ {1, 12, 1, 0, 1, -1}, /* TxEN */
+ {3, 24, 2, 0, 1, -1}, /* TxCLK->CLK10 */
+
+ {1, 4, 2, 0, 1, -1}, /* RxD0 */
+ {1, 5, 2, 0, 1, -1}, /* RxD1 */
+ {1, 6, 2, 0, 1, -1}, /* RxD2 */
+ {1, 7, 2, 0, 1, -1}, /* RxD3 */
+ {1, 8, 2, 0, 1, -1}, /* RxER */+ {1, 10, 2, 0, 1, -1}, /* RxDV */
+ {0, 13, 2, 0, 1, -1}, /* RxCLK->CLK9 */
+ {1, 11, 2, 0, 1, -1}, /* COL */
+ {1, 13, 2, 0, 1, -1}, /* CRS */
/* UCC2 */
- {0, 18, 1, 0, 1}, /* TxD0 */
- {0, 19, 1, 0, 1}, /* TxD1 */
- {0, 20, 1, 0, 1}, /* TxD2 */
- {0, 21, 1, 0, 1}, /* TxD3 */
- {0, 27, 1, 0, 1}, /* TxER */
- {0, 30, 1, 0, 1}, /* TxEN */
- {3, 23, 2, 0, 1}, /* TxCLK->CLK3 */
-
- {0, 22, 2, 0, 1}, /* RxD0 */
- {0, 23, 2, 0, 1}, /* RxD1 */
- {0, 24, 2, 0, 1}, /* RxD2 */
- {0, 25, 2, 0, 1}, /* RxD3 */
- {0, 26, 1, 0, 1}, /* RxER */
- {0, 28, 2, 0, 1}, /* Rx_DV */
- {3, 21, 2, 0, 1}, /* RxCLK->CLK16 */
- {0, 29, 2, 0, 1}, /* COL */
- {0, 31, 2, 0, 1}, /* CRS */
+ {0, 18, 1, 0, 1, -1}, /* TxD0 */
+ {0, 19, 1, 0, 1, -1}, /* TxD1 */
+ {0, 20, 1, 0, 1, -1}, /* TxD2 */
+ {0, 21, 1, 0, 1, -1}, /* TxD3 */
+ {0, 27, 1, 0, 1, -1}, /* TxER */
+ {0, 30, 1, 0, 1, -1}, /* TxEN */
+ {3, 23, 2, 0, 1, -1}, /* TxCLK->CLK3 */
+
+ {0, 22, 2, 0, 1, -1}, /* RxD0 */
+ {0, 23, 2, 0, 1, -1}, /* RxD1 */
+ {0, 24, 2, 0, 1, -1}, /* RxD2 */
+ {0, 25, 2, 0, 1, -1}, /* RxD3 */
+ {0, 26, 1, 0, 1, -1}, /* RxER */
+ {0, 28, 2, 0, 1, -1}, /* Rx_DV */
+ {3, 21, 2, 0, 1, -1}, /* RxCLK->CLK16 */
+ {0, 29, 2, 0, 1, -1}, /* COL */
+ {0, 31, 2, 0, 1, -1}, /* CRS */
- {3, 4, 3, 0, 2}, /* MDIO */
- {3, 5, 1, 0, 2}, /* MDC */
+ {3, 4, 3, 0, 2, -1}, /* MDIO */
+ {3, 5, 1, 0, 2, -1}, /* MDC */- {0, 0, 0, 0, QE_IOP_TAB_END}, /* END of table */
+ {0, 0, 0, 0, QE_IOP_TAB_END, -1}, /* END of table */
};
int board_early_init_f(void)
--- a/board/freescale/mpc832xemds/mpc832xemds.c 2008-01-23
15:41:38.000000000 +0200
+++ b/board/freescale/mpc832xemds/mpc832xemds.c 2008-02-06
18:37:24.166091000 +0200
@@ -36,47 +36,47 @@
const qe_iop_conf_t qe_iop_conf_tab[] = {
/* ETH3 */
- {1, 0, 1, 0, 1}, /* TxD0 */
- {1, 1, 1, 0, 1}, /* TxD1 */
- {1, 2, 1, 0, 1}, /* TxD2 */
- {1, 3, 1, 0, 1}, /* TxD3 */
- {1, 9, 1, 0, 1}, /* TxER */
- {1, 12, 1, 0, 1}, /* TxEN */
- {3, 24, 2, 0, 1}, /* TxCLK->CLK10 */
-
- {1, 4, 2, 0, 1}, /* RxD0 */
- {1, 5, 2, 0, 1}, /* RxD1 */
- {1, 6, 2, 0, 1}, /* RxD2 */
- {1, 7, 2, 0, 1}, /* RxD3 */
- {1, 8, 2, 0, 1}, /* RxER */- {1, 10, 2, 0, 1}, /* RxDV */
- {0, 13, 2, 0, 1}, /* RxCLK->CLK9 */
- {1, 11, 2, 0, 1}, /* COL */
- {1, 13, 2, 0, 1}, /* CRS */
+ {1, 0, 1, 0, 1, -1}, /* TxD0 */
+ {1, 1, 1, 0, 1, -1}, /* TxD1 */
+ {1, 2, 1, 0, 1, -1}, /* TxD2 */
+ {1, 3, 1, 0, 1, -1}, /* TxD3 */
+ {1, 9, 1, 0, 1, -1}, /* TxER */
+ {1, 12, 1, 0, 1, -1}, /* TxEN */
+ {3, 24, 2, 0, 1, -1}, /* TxCLK->CLK10 */
+
+ {1, 4, 2, 0, 1, -1}, /* RxD0 */
+ {1, 5, 2, 0, 1, -1}, /* RxD1 */
+ {1, 6, 2, 0, 1, -1}, /* RxD2 */
+ {1, 7, 2, 0, 1, -1}, /* RxD3 */
+ {1, 8, 2, 0, 1, -1}, /* RxER */+ {1, 10, 2, 0, 1, -1}, /* RxDV */
+ {0, 13, 2, 0, 1, -1}, /* RxCLK->CLK9 */
+ {1, 11, 2, 0, 1, -1}, /* COL */
+ {1, 13, 2, 0, 1, -1}, /* CRS */
/* ETH4 */
- {1, 18, 1, 0, 1}, /* TxD0 */
- {1, 19, 1, 0, 1}, /* TxD1 */
- {1, 20, 1, 0, 1}, /* TxD2 */
- {1, 21, 1, 0, 1}, /* TxD3 */
- {1, 27, 1, 0, 1}, /* TxER */
- {1, 30, 1, 0, 1}, /* TxEN */
- {3, 6, 2, 0, 1}, /* TxCLK->CLK8 */
-
- {1, 22, 2, 0, 1}, /* RxD0 */
- {1, 23, 2, 0, 1}, /* RxD1 */
- {1, 24, 2, 0, 1}, /* RxD2 */
- {1, 25, 2, 0, 1}, /* RxD3 */
- {1, 26, 1, 0, 1}, /* RxER */
- {1, 28, 2, 0, 1}, /* Rx_DV */
- {3, 31, 2, 0, 1}, /* RxCLK->CLK7 */
- {1, 29, 2, 0, 1}, /* COL */
- {1, 31, 2, 0, 1}, /* CRS */
+ {1, 18, 1, 0, 1, -1}, /* TxD0 */
+ {1, 19, 1, 0, 1, -1}, /* TxD1 */
+ {1, 20, 1, 0, 1, -1}, /* TxD2 */
+ {1, 21, 1, 0, 1, -1}, /* TxD3 */
+ {1, 27, 1, 0, 1, -1}, /* TxER */
+ {1, 30, 1, 0, 1, -1}, /* TxEN */
+ {3, 6, 2, 0, 1, -1}, /* TxCLK->CLK8 */
+
+ {1, 22, 2, 0, 1, -1}, /* RxD0 */
+ {1, 23, 2, 0, 1, -1}, /* RxD1 */
+ {1, 24, 2, 0, 1, -1}, /* RxD2 */
+ {1, 25, 2, 0, 1, -1}, /* RxD3 */
+ {1, 26, 1, 0, 1, -1}, /* RxER */
+ {1, 28, 2, 0, 1, -1}, /* Rx_DV */
+ {3, 31, 2, 0, 1, -1}, /* RxCLK->CLK7 */
+ {1, 29, 2, 0, 1, -1}, /* COL */
+ {1, 31, 2, 0, 1, -1}, /* CRS */
- {3, 4, 3, 0, 2}, /* MDIO */
- {3, 5, 1, 0, 2}, /* MDC */
+ {3, 4, 3, 0, 2, -1}, /* MDIO */
+ {3, 5, 1, 0, 2, -1}, /* MDC */- {0, 0, 0, 0, QE_IOP_TAB_END}, /* END of table */
+ {0, 0, 0, 0, QE_IOP_TAB_END, -1}, /* END of table */
};
int board_early_init_f(void)
--- a/board/freescale/mpc8360emds/mpc8360emds.c 2008-01-23
15:41:38.000000000 +0200
+++ b/board/freescale/mpc8360emds/mpc8360emds.c 2008-02-06
18:37:49.149044000 +0200
@@ -34,63 +34,63 @@
const qe_iop_conf_t qe_iop_conf_tab[] = {
/* GETH1 */
- {0, 3, 1, 0, 1}, /* TxD0 */
- {0, 4, 1, 0, 1}, /* TxD1 */
- {0, 5, 1, 0, 1}, /* TxD2 */
- {0, 6, 1, 0, 1}, /* TxD3 */
- {1, 6, 1, 0, 3}, /* TxD4 */
- {1, 7, 1, 0, 1}, /* TxD5 */
- {1, 9, 1, 0, 2}, /* TxD6 */- {1, 10, 1, 0, 2}, /* TxD7 */
- {0, 9, 2, 0, 1}, /* RxD0 */
- {0, 10, 2, 0, 1}, /* RxD1 */
- {0, 11, 2, 0, 1}, /* RxD2 */
- {0, 12, 2, 0, 1}, /* RxD3 */
- {0, 13, 2, 0, 1}, /* RxD4 */
- {1, 1, 2, 0, 2}, /* RxD5 */
- {1, 0, 2, 0, 2}, /* RxD6 */
- {1, 4, 2, 0, 2}, /* RxD7 */
- {0, 7, 1, 0, 1}, /* TX_EN */
- {0, 8, 1, 0, 1}, /* TX_ER */
- {0, 15, 2, 0, 1}, /* RX_DV */
- {0, 16, 2, 0, 1}, /* RX_ER */
- {0, 0, 2, 0, 1}, /* RX_CLK */
- {2, 9, 1, 0, 3}, /* GTX_CLK - CLK10 */
- {2, 8, 2, 0, 1}, /* GTX125 - CLK9 */
+ {0, 3, 1, 0, 1, -1}, /* TxD0 */
+ {0, 4, 1, 0, 1, -1}, /* TxD1 */
+ {0, 5, 1, 0, 1, -1}, /* TxD2 */
+ {0, 6, 1, 0, 1, -1}, /* TxD3 */
+ {1, 6, 1, 0, 3, -1}, /* TxD4 */
+ {1, 7, 1, 0, 1, -1}, /* TxD5 */
+ {1, 9, 1, 0, 2, -1}, /* TxD6 */+ {1, 10, 1, 0, 2, -1}, /* TxD7 */
+ {0, 9, 2, 0, 1, -1}, /* RxD0 */
+ {0, 10, 2, 0, 1, -1}, /* RxD1 */
+ {0, 11, 2, 0, 1, -1}, /* RxD2 */
+ {0, 12, 2, 0, 1, -1}, /* RxD3 */
+ {0, 13, 2, 0, 1, -1}, /* RxD4 */
+ {1, 1, 2, 0, 2, -1}, /* RxD5 */
+ {1, 0, 2, 0, 2, -1}, /* RxD6 */
+ {1, 4, 2, 0, 2, -1}, /* RxD7 */
+ {0, 7, 1, 0, 1, -1}, /* TX_EN */
+ {0, 8, 1, 0, 1, -1}, /* TX_ER */
+ {0, 15, 2, 0, 1, -1}, /* RX_DV */
+ {0, 16, 2, 0, 1, -1}, /* RX_ER */
+ {0, 0, 2, 0, 1, -1}, /* RX_CLK */
+ {2, 9, 1, 0, 3, -1}, /* GTX_CLK - CLK10 */
+ {2, 8, 2, 0, 1, -1}, /* GTX125 - CLK9 */ /* GETH2 */
- {0, 17, 1, 0, 1}, /* TxD0 */
- {0, 18, 1, 0, 1}, /* TxD1 */
- {0, 19, 1, 0, 1}, /* TxD2 */
- {0, 20, 1, 0, 1}, /* TxD3 */
- {1, 2, 1, 0, 1}, /* TxD4 */
- {1, 3, 1, 0, 2}, /* TxD5 */
- {1, 5, 1, 0, 3}, /* TxD6 */
- {1, 8, 1, 0, 3}, /* TxD7 */- {0, 23, 2, 0, 1}, /* RxD0 */
- {0, 24, 2, 0, 1}, /* RxD1 */
- {0, 25, 2, 0, 1}, /* RxD2 */
- {0, 26, 2, 0, 1}, /* RxD3 */
- {0, 27, 2, 0, 1}, /* RxD4 */
- {1, 12, 2, 0, 2}, /* RxD5 */
- {1, 13, 2, 0, 3}, /* RxD6 */
- {1, 11, 2, 0, 2}, /* RxD7 */
- {0, 21, 1, 0, 1}, /* TX_EN */
- {0, 22, 1, 0, 1}, /* TX_ER */
- {0, 29, 2, 0, 1}, /* RX_DV */
- {0, 30, 2, 0, 1}, /* RX_ER */
- {0, 31, 2, 0, 1}, /* RX_CLK */
- {2, 2, 1, 0, 2}, /* GTX_CLK = CLK10 */
- {2, 3, 2, 0, 1}, /* GTX125 - CLK4 */
-
- {0, 1, 3, 0, 2}, /* MDIO */
- {0, 2, 1, 0, 1}, /* MDC */
-
- {5, 0, 1, 0, 2}, /* UART2_SOUT */
- {5, 1, 2, 0, 3}, /* UART2_CTS */
- {5, 2, 1, 0, 1}, /* UART2_RTS */
- {5, 3, 2, 0, 2}, /* UART2_SIN */+ {0, 17, 1, 0, 1, -1}, /* TxD0 */
+ {0, 18, 1, 0, 1, -1}, /* TxD1 */
+ {0, 19, 1, 0, 1, -1}, /* TxD2 */
+ {0, 20, 1, 0, 1, -1}, /* TxD3 */
+ {1, 2, 1, 0, 1, -1}, /* TxD4 */
+ {1, 3, 1, 0, 2, -1}, /* TxD5 */
+ {1, 5, 1, 0, 3, -1}, /* TxD6 */
+ {1, 8, 1, 0, 3, -1}, /* TxD7 */+ {0, 23, 2, 0, 1, -1}, /* RxD0 */
+ {0, 24, 2, 0, 1, -1}, /* RxD1 */
+ {0, 25, 2, 0, 1, -1}, /* RxD2 */
+ {0, 26, 2, 0, 1, -1}, /* RxD3 */
+ {0, 27, 2, 0, 1, -1}, /* RxD4 */
+ {1, 12, 2, 0, 2, -1}, /* RxD5 */
+ {1, 13, 2, 0, 3, -1}, /* RxD6 */
+ {1, 11, 2, 0, 2, -1}, /* RxD7 */
+ {0, 21, 1, 0, 1, -1}, /* TX_EN */
+ {0, 22, 1, 0, 1, -1}, /* TX_ER */
+ {0, 29, 2, 0, 1, -1}, /* RX_DV */
+ {0, 30, 2, 0, 1, -1}, /* RX_ER */
+ {0, 31, 2, 0, 1, -1}, /* RX_CLK */
+ {2, 2, 1, 0, 2, -1}, /* GTX_CLK = CLK10 */
+ {2, 3, 2, 0, 1, -1}, /* GTX125 - CLK4 */
+
+ {0, 1, 3, 0, 2, -1}, /* MDIO */
+ {0, 2, 1, 0, 1, -1}, /* MDC */
+
+ {5, 0, 1, 0, 2, -1}, /* UART2_SOUT */
+ {5, 1, 2, 0, 3, -1}, /* UART2_CTS */
+ {5, 2, 1, 0, 1, -1}, /* UART2_RTS */
+ {5, 3, 2, 0, 2, -1}, /* UART2_SIN */- {0, 0, 0, 0, QE_IOP_TAB_END}, /* END of table */
+ {0, 0, 0, 0, QE_IOP_TAB_END, -1}, /* END of table */
};
int board_early_init_f(void)
--- a/board/freescale/mpc8360erdk/mpc8360erdk.c 2008-01-23
15:41:38.000000000 +0200
+++ b/board/freescale/mpc8360erdk/mpc8360erdk.c 2008-02-06
18:38:21.396417000 +0200
@@ -27,168 +27,168 @@
const qe_iop_conf_t qe_iop_conf_tab[] = {
/* MDIO */
- {0, 1, 3, 0, 2}, /* MDIO */
- {0, 2, 1, 0, 1}, /* MDC */
+ {0, 1, 3, 0, 2, -1}, /* MDIO */
+ {0, 2, 1, 0, 1, -1}, /* MDC *//* UCC1 - UEC (Gigabit) */
- {0, 3, 1, 0, 1}, /* TxD0 */
- {0, 4, 1, 0, 1}, /* TxD1 */
- {0, 5, 1, 0, 1}, /* TxD2 */
- {0, 6, 1, 0, 1}, /* TxD3 */
- {0, 9, 2, 0, 1}, /* RxD0 */- {0, 10, 2, 0, 1}, /* RxD1 */
- {0, 11, 2, 0, 1}, /* RxD2 */
- {0, 12, 2, 0, 1}, /* RxD3 */
- {0, 7, 1, 0, 1}, /* TX_EN */
- {0, 8, 1, 0, 1}, /* TX_ER */
- {0, 15, 2, 0, 1}, /* RX_DV */
- {0, 0, 2, 0, 1}, /* RX_CLK */
- {2, 9, 1, 0, 3}, /* GTX_CLK - CLK10 */
- {2, 8, 2, 0, 1}, /* GTX125 - CLK9 */
+ {0, 3, 1, 0, 1, -1}, /* TxD0 */
+ {0, 4, 1, 0, 1, -1}, /* TxD1 */
+ {0, 5, 1, 0, 1, -1}, /* TxD2 */
+ {0, 6, 1, 0, 1, -1}, /* TxD3 */
+ {0, 9, 2, 0, 1, -1}, /* RxD0 */+ {0, 10, 2, 0, 1, -1}, /* RxD1 */
+ {0, 11, 2, 0, 1, -1}, /* RxD2 */
+ {0, 12, 2, 0, 1, -1}, /* RxD3 */
+ {0, 7, 1, 0, 1, -1}, /* TX_EN */
+ {0, 8, 1, 0, 1, -1}, /* TX_ER */
+ {0, 15, 2, 0, 1, -1}, /* RX_DV */
+ {0, 0, 2, 0, 1, -1}, /* RX_CLK */
+ {2, 9, 1, 0, 3, -1}, /* GTX_CLK - CLK10 */
+ {2, 8, 2, 0, 1, -1}, /* GTX125 - CLK9 */ /* UCC2 - UEC (Gigabit) */
- {0, 17, 1, 0, 1}, /* TxD0 */
- {0, 18, 1, 0, 1}, /* TxD1 */
- {0, 19, 1, 0, 1}, /* TxD2 */
- {0, 20, 1, 0, 1}, /* TxD3 */
- {0, 23, 2, 0, 1}, /* RxD0 */
- {0, 24, 2, 0, 1}, /* RxD1 */
- {0, 25, 2, 0, 1}, /* RxD2 */
- {0, 26, 2, 0, 1}, /* RxD3 */
- {0, 21, 1, 0, 1}, /* TX_EN */
- {0, 22, 1, 0, 1}, /* TX_ER */
- {0, 29, 2, 0, 1}, /* RX_DV */
- {0, 31, 2, 0, 1}, /* RX_CLK */
- {2, 2, 1, 0, 2}, /* GTX_CLK - CLK10 */
- {2, 3, 2, 0, 1}, /* GTX125 - CLK4 */
+ {0, 17, 1, 0, 1, -1}, /* TxD0 */
+ {0, 18, 1, 0, 1, -1}, /* TxD1 */
+ {0, 19, 1, 0, 1, -1}, /* TxD2 */
+ {0, 20, 1, 0, 1, -1}, /* TxD3 */
+ {0, 23, 2, 0, 1, -1}, /* RxD0 */
+ {0, 24, 2, 0, 1, -1}, /* RxD1 */
+ {0, 25, 2, 0, 1, -1}, /* RxD2 */
+ {0, 26, 2, 0, 1, -1}, /* RxD3 */
+ {0, 21, 1, 0, 1, -1}, /* TX_EN */
+ {0, 22, 1, 0, 1, -1}, /* TX_ER */
+ {0, 29, 2, 0, 1, -1}, /* RX_DV */
+ {0, 31, 2, 0, 1, -1}, /* RX_CLK */
+ {2, 2, 1, 0, 2, -1}, /* GTX_CLK - CLK10 */
+ {2, 3, 2, 0, 1, -1}, /* GTX125 - CLK4 */
/* UCC7 - UEC */
- {4, 0, 1, 0, 1}, /* TxD0 */
- {4, 1, 1, 0, 1}, /* TxD1 */
- {4, 2, 1, 0, 1}, /* TxD2 */
- {4, 3, 1, 0, 1}, /* TxD3 */
- {4, 6, 2, 0, 1}, /* RxD0 */
- {4, 7, 2, 0, 1}, /* RxD1 */
- {4, 8, 2, 0, 1}, /* RxD2 */
- {4, 9, 2, 0, 1}, /* RxD3 */
- {4, 4, 1, 0, 1}, /* TX_EN */
- {4, 5, 1, 0, 1}, /* TX_ER */- {4, 12, 2, 0, 1}, /* RX_DV */
- {4, 13, 2, 0, 1}, /* RX_ER */
- {4, 10, 2, 0, 1}, /* COL */
- {4, 11, 2, 0, 1}, /* CRS */
- {2, 18, 2, 0, 1}, /* TX_CLK - CLK19 */
- {2, 19, 2, 0, 1}, /* RX_CLK - CLK20 */
+ {4, 0, 1, 0, 1, -1}, /* TxD0 */
+ {4, 1, 1, 0, 1, -1}, /* TxD1 */
+ {4, 2, 1, 0, 1, -1}, /* TxD2 */
+ {4, 3, 1, 0, 1, -1}, /* TxD3 */
+ {4, 6, 2, 0, 1, -1}, /* RxD0 */
+ {4, 7, 2, 0, 1, -1}, /* RxD1 */
+ {4, 8, 2, 0, 1, -1}, /* RxD2 */
+ {4, 9, 2, 0, 1, -1}, /* RxD3 */
+ {4, 4, 1, 0, 1, -1}, /* TX_EN */
+ {4, 5, 1, 0, 1, -1}, /* TX_ER */+ {4, 12, 2, 0, 1, -1}, /* RX_DV */
+ {4, 13, 2, 0, 1, -1}, /* RX_ER */
+ {4, 10, 2, 0, 1, -1}, /* COL */
+ {4, 11, 2, 0, 1, -1}, /* CRS */
+ {2, 18, 2, 0, 1, -1}, /* TX_CLK - CLK19 */
+ {2, 19, 2, 0, 1, -1}, /* RX_CLK - CLK20 */
/* UCC4 - UEC */
- {1, 14, 1, 0, 1}, /* TxD0 */
- {1, 15, 1, 0, 1}, /* TxD1 */
- {1, 16, 1, 0, 1}, /* TxD2 */
- {1, 17, 1, 0, 1}, /* TxD3 */
- {1, 20, 2, 0, 1}, /* RxD0 */
- {1, 21, 2, 0, 1}, /* RxD1 */
- {1, 22, 2, 0, 1}, /* RxD2 */
- {1, 23, 2, 0, 1}, /* RxD3 */
- {1, 18, 1, 0, 1}, /* TX_EN */
- {1, 19, 1, 0, 2}, /* TX_ER */
- {1, 26, 2, 0, 1}, /* RX_DV */
- {1, 27, 2, 0, 1}, /* RX_ER */
- {1, 24, 2, 0, 1}, /* COL */
- {1, 25, 2, 0, 1}, /* CRS */
- {2, 6, 2, 0, 1}, /* TX_CLK - CLK7 */
- {2, 7, 2, 0, 1}, /* RX_CLK - CLK8 */
+ {1, 14, 1, 0, 1, -1}, /* TxD0 */
+ {1, 15, 1, 0, 1, -1}, /* TxD1 */
+ {1, 16, 1, 0, 1, -1}, /* TxD2 */
+ {1, 17, 1, 0, 1, -1}, /* TxD3 */
+ {1, 20, 2, 0, 1, -1}, /* RxD0 */
+ {1, 21, 2, 0, 1, -1}, /* RxD1 */
+ {1, 22, 2, 0, 1, -1}, /* RxD2 */
+ {1, 23, 2, 0, 1, -1}, /* RxD3 */
+ {1, 18, 1, 0, 1, -1}, /* TX_EN */
+ {1, 19, 1, 0, 2, -1}, /* TX_ER */
+ {1, 26, 2, 0, 1, -1}, /* RX_DV */
+ {1, 27, 2, 0, 1, -1}, /* RX_ER */
+ {1, 24, 2, 0, 1, -1}, /* COL */
+ {1, 25, 2, 0, 1, -1}, /* CRS */
+ {2, 6, 2, 0, 1, -1}, /* TX_CLK - CLK7 */
+ {2, 7, 2, 0, 1, -1}, /* RX_CLK - CLK8 */
/* PCI1 */
- {5, 4, 2, 0, 3}, /* PCI_M66EN */
- {5, 5, 1, 0, 3}, /* PCI_INTA */
- {5, 6, 1, 0, 3}, /* PCI_RSTO */
- {5, 7, 3, 0, 3}, /* PCI_C_BE0 */
- {5, 8, 3, 0, 3}, /* PCI_C_BE1 */
- {5, 9, 3, 0, 3}, /* PCI_C_BE2 */- {5, 10, 3, 0, 3}, /* PCI_C_BE3 */
- {5, 11, 3, 0, 3}, /* PCI_PAR */
- {5, 12, 3, 0, 3}, /* PCI_FRAME */
- {5, 13, 3, 0, 3}, /* PCI_TRDY */
- {5, 14, 3, 0, 3}, /* PCI_IRDY */
- {5, 15, 3, 0, 3}, /* PCI_STOP */
- {5, 16, 3, 0, 3}, /* PCI_DEVSEL */
- {5, 17, 0, 0, 0}, /* PCI_IDSEL */
- {5, 18, 3, 0, 3}, /* PCI_SERR */
- {5, 19, 3, 0, 3}, /* PCI_PERR */
- {5, 20, 3, 0, 3}, /* PCI_REQ0 */
- {5, 21, 2, 0, 3}, /* PCI_REQ1 */
- {5, 22, 2, 0, 3}, /* PCI_GNT2 */
- {5, 23, 3, 0, 3}, /* PCI_GNT0 */
- {5, 24, 1, 0, 3}, /* PCI_GNT1 */
- {5, 25, 1, 0, 3}, /* PCI_GNT2 */
- {5, 26, 0, 0, 0}, /* PCI_CLK0 */
- {5, 27, 0, 0, 0}, /* PCI_CLK1 */
- {5, 28, 0, 0, 0}, /* PCI_CLK2 */
- {5, 29, 0, 0, 3}, /* PCI_SYNC_OUT */
- {6, 0, 3, 0, 3}, /* PCI_AD0 */
- {6, 1, 3, 0, 3}, /* PCI_AD1 */
- {6, 2, 3, 0, 3}, /* PCI_AD2 */
- {6, 3, 3, 0, 3}, /* PCI_AD3 */
- {6, 4, 3, 0, 3}, /* PCI_AD4 */
- {6, 5, 3, 0, 3}, /* PCI_AD5 */
- {6, 6, 3, 0, 3}, /* PCI_AD6 */
- {6, 7, 3, 0, 3}, /* PCI_AD7 */
- {6, 8, 3, 0, 3}, /* PCI_AD8 */
- {6, 9, 3, 0, 3}, /* PCI_AD9 */- {6, 10, 3, 0, 3}, /* PCI_AD10 */
- {6, 11, 3, 0, 3}, /* PCI_AD11 */
- {6, 12, 3, 0, 3}, /* PCI_AD12 */
- {6, 13, 3, 0, 3}, /* PCI_AD13 */
- {6, 14, 3, 0, 3}, /* PCI_AD14 */
- {6, 15, 3, 0, 3}, /* PCI_AD15 */
- {6, 16, 3, 0, 3}, /* PCI_AD16 */
- {6, 17, 3, 0, 3}, /* PCI_AD17 */
- {6, 18, 3, 0, 3}, /* PCI_AD18 */
- {6, 19, 3, 0, 3}, /* PCI_AD19 */
- {6, 20, 3, 0, 3}, /* PCI_AD20 */
- {6, 21, 3, 0, 3}, /* PCI_AD21 */
- {6, 22, 3, 0, 3}, /* PCI_AD22 */
- {6, 23, 3, 0, 3}, /* PCI_AD23 */
- {6, 24, 3, 0, 3}, /* PCI_AD24 */
- {6, 25, 3, 0, 3}, /* PCI_AD25 */
- {6, 26, 3, 0, 3}, /* PCI_AD26 */
- {6, 27, 3, 0, 3}, /* PCI_AD27 */
- {6, 28, 3, 0, 3}, /* PCI_AD28 */
- {6, 29, 3, 0, 3}, /* PCI_AD29 */
- {6, 30, 3, 0, 3}, /* PCI_AD30 */
- {6, 31, 3, 0, 3}, /* PCI_AD31 */
+ {5, 4, 2, 0, 3, -1}, /* PCI_M66EN */
+ {5, 5, 1, 0, 3, -1}, /* PCI_INTA */
+ {5, 6, 1, 0, 3, -1}, /* PCI_RSTO */
+ {5, 7, 3, 0, 3, -1}, /* PCI_C_BE0 */
+ {5, 8, 3, 0, 3, -1}, /* PCI_C_BE1 */
+ {5, 9, 3, 0, 3, -1}, /* PCI_C_BE2 */+ {5, 10, 3, 0, 3, -1}, /* PCI_C_BE3 */
+ {5, 11, 3, 0, 3, -1}, /* PCI_PAR */
+ {5, 12, 3, 0, 3, -1}, /* PCI_FRAME */
+ {5, 13, 3, 0, 3, -1}, /* PCI_TRDY */
+ {5, 14, 3, 0, 3, -1}, /* PCI_IRDY */
+ {5, 15, 3, 0, 3, -1}, /* PCI_STOP */
+ {5, 16, 3, 0, 3, -1}, /* PCI_DEVSEL */
+ {5, 17, 0, 0, 0, -1}, /* PCI_IDSEL */
+ {5, 18, 3, 0, 3, -1}, /* PCI_SERR */
+ {5, 19, 3, 0, 3, -1}, /* PCI_PERR */
+ {5, 20, 3, 0, 3, -1}, /* PCI_REQ0 */
+ {5, 21, 2, 0, 3, -1}, /* PCI_REQ1 */
+ {5, 22, 2, 0, 3, -1}, /* PCI_GNT2 */
+ {5, 23, 3, 0, 3, -1}, /* PCI_GNT0 */
+ {5, 24, 1, 0, 3, -1}, /* PCI_GNT1 */
+ {5, 25, 1, 0, 3, -1}, /* PCI_GNT2 */
+ {5, 26, 0, 0, 0, -1}, /* PCI_CLK0 */
+ {5, 27, 0, 0, 0, -1}, /* PCI_CLK1 */
+ {5, 28, 0, 0, 0, -1}, /* PCI_CLK2 */
+ {5, 29, 0, 0, 3, -1}, /* PCI_SYNC_OUT */
+ {6, 0, 3, 0, 3, -1}, /* PCI_AD0 */
+ {6, 1, 3, 0, 3, -1}, /* PCI_AD1 */
+ {6, 2, 3, 0, 3, -1}, /* PCI_AD2 */
+ {6, 3, 3, 0, 3, -1}, /* PCI_AD3 */
+ {6, 4, 3, 0, 3, -1}, /* PCI_AD4 */
+ {6, 5, 3, 0, 3, -1}, /* PCI_AD5 */
+ {6, 6, 3, 0, 3, -1}, /* PCI_AD6 */
+ {6, 7, 3, 0, 3, -1}, /* PCI_AD7 */
+ {6, 8, 3, 0, 3, -1}, /* PCI_AD8 */
+ {6, 9, 3, 0, 3, -1}, /* PCI_AD9 */+ {6, 10, 3, 0, 3, -1}, /* PCI_AD10 */
+ {6, 11, 3, 0, 3, -1}, /* PCI_AD11 */
+ {6, 12, 3, 0, 3, -1}, /* PCI_AD12 */
+ {6, 13, 3, 0, 3, -1}, /* PCI_AD13 */
+ {6, 14, 3, 0, 3, -1}, /* PCI_AD14 */
+ {6, 15, 3, 0, 3, -1}, /* PCI_AD15 */
+ {6, 16, 3, 0, 3, -1}, /* PCI_AD16 */
+ {6, 17, 3, 0, 3, -1}, /* PCI_AD17 */
+ {6, 18, 3, 0, 3, -1}, /* PCI_AD18 */
+ {6, 19, 3, 0, 3, -1}, /* PCI_AD19 */
+ {6, 20, 3, 0, 3, -1}, /* PCI_AD20 */
+ {6, 21, 3, 0, 3, -1}, /* PCI_AD21 */
+ {6, 22, 3, 0, 3, -1}, /* PCI_AD22 */
+ {6, 23, 3, 0, 3, -1}, /* PCI_AD23 */
+ {6, 24, 3, 0, 3, -1}, /* PCI_AD24 */
+ {6, 25, 3, 0, 3, -1}, /* PCI_AD25 */
+ {6, 26, 3, 0, 3, -1}, /* PCI_AD26 */
+ {6, 27, 3, 0, 3, -1}, /* PCI_AD27 */
+ {6, 28, 3, 0, 3, -1}, /* PCI_AD28 */
+ {6, 29, 3, 0, 3, -1}, /* PCI_AD29 */
+ {6, 30, 3, 0, 3, -1}, /* PCI_AD30 */
+ {6, 31, 3, 0, 3, -1}, /* PCI_AD31 */
/* NAND */
- {4, 18, 2, 0, 0}, /* NAND_RYnBY */
+ {4, 18, 2, 0, 0, -1}, /* NAND_RYnBY */
/* DUART - UART2 */
- {5, 0, 1, 0, 2}, /* UART2_SOUT */
- {5, 2, 1, 0, 1}, /* UART2_RTS */
- {5, 3, 2, 0, 2}, /* UART2_SIN */
- {5, 1, 2, 0, 3}, /* UART2_CTS */
+ {5, 0, 1, 0, 2, -1}, /* UART2_SOUT */
+ {5, 2, 1, 0, 1, -1}, /* UART2_RTS */
+ {5, 3, 2, 0, 2, -1}, /* UART2_SIN */
+ {5, 1, 2, 0, 3, -1}, /* UART2_CTS *//* UCC5 - UART3 */
- {3, 0, 1, 0, 1}, /* UART3_TX */
- {3, 4, 1, 0, 1}, /* UART3_RTS */
- {3, 6, 2, 0, 1}, /* UART3_RX */
- {3, 12, 2, 0, 0}, /* UART3_CTS */
- {3, 13, 2, 0, 0}, /* UCC5_CD */
+ {3, 0, 1, 0, 1, -1}, /* UART3_TX */
+ {3, 4, 1, 0, 1, -1}, /* UART3_RTS */
+ {3, 6, 2, 0, 1, -1}, /* UART3_RX */+ {3, 12, 2, 0, 0, -1}, /* UART3_CTS */
+ {3, 13, 2, 0, 0, -1}, /* UCC5_CD */
/* UCC6 - UART4 */
- {3, 14, 1, 0, 1}, /* UART4_TX */
- {3, 18, 1, 0, 1}, /* UART4_RTS */
- {3, 20, 2, 0, 1}, /* UART4_RX */
- {3, 26, 2, 0, 0}, /* UART4_CTS */
- {3, 27, 2, 0, 0}, /* UCC6_CD */
+ {3, 14, 1, 0, 1, -1}, /* UART4_TX */
+ {3, 18, 1, 0, 1, -1}, /* UART4_RTS */
+ {3, 20, 2, 0, 1, -1}, /* UART4_RX */
+ {3, 26, 2, 0, 0, -1}, /* UART4_CTS */
+ {3, 27, 2, 0, 0, -1}, /* UCC6_CD */
/* Fujitsu MB86277 (MINT) graphics controller */
- {0, 30, 1, 0, 0}, /* nSRESET_GRAPHICS */
- {1, 5, 1, 0, 0}, /* nXRST_GRAPHICS */
- {1, 7, 1, 0, 0}, /* LVDS_BKLT_CTR */
- {2, 16, 1, 0, 0}, /* LVDS_BKLT_EN */
+ {0, 30, 1, 0, 0, -1}, /* nSRESET_GRAPHICS */
+ {1, 5, 1, 0, 0, -1}, /* nXRST_GRAPHICS */
+ {1, 7, 1, 0, 0, -1}, /* LVDS_BKLT_CTR */
+ {2, 16, 1, 0, 0, -1}, /* LVDS_BKLT_EN */
/* END of table */
- {0, 0, 0, 0, QE_IOP_TAB_END},
+ {0, 0, 0, 0, QE_IOP_TAB_END, -1},
};
int board_early_init_f(void)
--- a/board/freescale/mpc8568mds/mpc8568mds.c 2008-01-23
15:41:38.000000000 +0200
+++ b/board/freescale/mpc8568mds/mpc8568mds.c 2008-02-06
18:38:51.399967000 +0200
@@ -37,64 +37,64 @@
const qe_iop_conf_t qe_iop_conf_tab[] = {
/* GETH1 */
- {4, 10, 1, 0, 2}, /* TxD0 */
- {4, 9, 1, 0, 2}, /* TxD1 */
- {4, 8, 1, 0, 2}, /* TxD2 */
- {4, 7, 1, 0, 2}, /* TxD3 */- {4, 23, 1, 0, 2}, /* TxD4 */
- {4, 22, 1, 0, 2}, /* TxD5 */
- {4, 21, 1, 0, 2}, /* TxD6 */
- {4, 20, 1, 0, 2}, /* TxD7 */
- {4, 15, 2, 0, 2}, /* RxD0 */
- {4, 14, 2, 0, 2}, /* RxD1 */
- {4, 13, 2, 0, 2}, /* RxD2 */
- {4, 12, 2, 0, 2}, /* RxD3 */
- {4, 29, 2, 0, 2}, /* RxD4 */
- {4, 28, 2, 0, 2}, /* RxD5 */
- {4, 27, 2, 0, 2}, /* RxD6 */
- {4, 26, 2, 0, 2}, /* RxD7 */
- {4, 11, 1, 0, 2}, /* TX_EN */
- {4, 24, 1, 0, 2}, /* TX_ER */
- {4, 16, 2, 0, 2}, /* RX_DV */
- {4, 30, 2, 0, 2}, /* RX_ER */
- {4, 17, 2, 0, 2}, /* RX_CLK */
- {4, 19, 1, 0, 2}, /* GTX_CLK */
- {1, 31, 2, 0, 3}, /* GTX125 */
+ {4, 10, 1, 0, 2, -1}, /* TxD0 */
+ {4, 9, 1, 0, 2, -1}, /* TxD1 */
+ {4, 8, 1, 0, 2, -1}, /* TxD2 */
+ {4, 7, 1, 0, 2, -1}, /* TxD3 */+ {4, 23, 1, 0, 2, -1}, /* TxD4 */
+ {4, 22, 1, 0, 2, -1}, /* TxD5 */
+ {4, 21, 1, 0, 2, -1}, /* TxD6 */
+ {4, 20, 1, 0, 2, -1}, /* TxD7 */
+ {4, 15, 2, 0, 2, -1}, /* RxD0 */
+ {4, 14, 2, 0, 2, -1}, /* RxD1 */
+ {4, 13, 2, 0, 2, -1}, /* RxD2 */
+ {4, 12, 2, 0, 2, -1}, /* RxD3 */
+ {4, 29, 2, 0, 2, -1}, /* RxD4 */
+ {4, 28, 2, 0, 2, -1}, /* RxD5 */
+ {4, 27, 2, 0, 2, -1}, /* RxD6 */
+ {4, 26, 2, 0, 2, -1}, /* RxD7 */
+ {4, 11, 1, 0, 2, -1}, /* TX_EN */
+ {4, 24, 1, 0, 2, -1}, /* TX_ER */
+ {4, 16, 2, 0, 2, -1}, /* RX_DV */
+ {4, 30, 2, 0, 2, -1}, /* RX_ER */
+ {4, 17, 2, 0, 2, -1}, /* RX_CLK */
+ {4, 19, 1, 0, 2, -1}, /* GTX_CLK */
+ {1, 31, 2, 0, 3, -1}, /* GTX125 */
/* GETH2 */
- {5, 10, 1, 0, 2}, /* TxD0 */
- {5, 9, 1, 0, 2}, /* TxD1 */
- {5, 8, 1, 0, 2}, /* TxD2 */
- {5, 7, 1, 0, 2}, /* TxD3 */- {5, 23, 1, 0, 2}, /* TxD4 */
- {5, 22, 1, 0, 2}, /* TxD5 */
- {5, 21, 1, 0, 2}, /* TxD6 */
- {5, 20, 1, 0, 2}, /* TxD7 */
- {5, 15, 2, 0, 2}, /* RxD0 */
- {5, 14, 2, 0, 2}, /* RxD1 */
- {5, 13, 2, 0, 2}, /* RxD2 */
- {5, 12, 2, 0, 2}, /* RxD3 */
- {5, 29, 2, 0, 2}, /* RxD4 */
- {5, 28, 2, 0, 2}, /* RxD5 */
- {5, 27, 2, 0, 3}, /* RxD6 */
- {5, 26, 2, 0, 2}, /* RxD7 */
- {5, 11, 1, 0, 2}, /* TX_EN */
- {5, 24, 1, 0, 2}, /* TX_ER */
- {5, 16, 2, 0, 2}, /* RX_DV */
- {5, 30, 2, 0, 2}, /* RX_ER */
- {5, 17, 2, 0, 2}, /* RX_CLK */
- {5, 19, 1, 0, 2}, /* GTX_CLK */
- {1, 31, 2, 0, 3}, /* GTX125 */
- {4, 6, 3, 0, 2}, /* MDIO */
- {4, 5, 1, 0, 2}, /* MDC */
+ {5, 10, 1, 0, 2, -1}, /* TxD0 */
+ {5, 9, 1, 0, 2, -1}, /* TxD1 */
+ {5, 8, 1, 0, 2, -1}, /* TxD2 */
+ {5, 7, 1, 0, 2, -1}, /* TxD3 */+ {5, 23, 1, 0, 2, -1}, /* TxD4 */
+ {5, 22, 1, 0, 2, -1}, /* TxD5 */
+ {5, 21, 1, 0, 2, -1}, /* TxD6 */
+ {5, 20, 1, 0, 2, -1}, /* TxD7 */
+ {5, 15, 2, 0, 2, -1}, /* RxD0 */
+ {5, 14, 2, 0, 2, -1}, /* RxD1 */
+ {5, 13, 2, 0, 2, -1}, /* RxD2 */
+ {5, 12, 2, 0, 2, -1}, /* RxD3 */
+ {5, 29, 2, 0, 2, -1}, /* RxD4 */
+ {5, 28, 2, 0, 2, -1}, /* RxD5 */
+ {5, 27, 2, 0, 3, -1}, /* RxD6 */
+ {5, 26, 2, 0, 2, -1}, /* RxD7 */
+ {5, 11, 1, 0, 2, -1}, /* TX_EN */
+ {5, 24, 1, 0, 2, -1}, /* TX_ER */
+ {5, 16, 2, 0, 2, -1}, /* RX_DV */
+ {5, 30, 2, 0, 2, -1}, /* RX_ER */
+ {5, 17, 2, 0, 2, -1}, /* RX_CLK */
+ {5, 19, 1, 0, 2, -1}, /* GTX_CLK */
+ {1, 31, 2, 0, 3, -1}, /* GTX125 */
+ {4, 6, 3, 0, 2, -1}, /* MDIO */
+ {4, 5, 1, 0, 2, -1}, /* MDC */
/* UART1 */
- {2, 0, 1, 0, 2}, /* UART_SOUT1 */
- {2, 1, 1, 0, 2}, /* UART_RTS1 */
- {2, 2, 2, 0, 2}, /* UART_CTS1 */
- {2, 3, 2, 0, 2}, /* UART_SIN1 */
+ {2, 0, 1, 0, 2, -1}, /* UART_SOUT1 */
+ {2, 1, 1, 0, 2, -1}, /* UART_RTS1 */
+ {2, 2, 2, 0, 2, -1}, /* UART_CTS1 */
+ {2, 3, 2, 0, 2, -1}, /* UART_SIN1 */
- {0, 0, 0, 0, QE_IOP_TAB_END}, /* END of table */
+ {0, 0, 0, 0, QE_IOP_TAB_END, -1}, /* END of table */
};
common/Makefile +1 -0
@@ -76,6 +76,7 @@ COBJS-y += cmd_nand.o COBJS-$(CONFIG_CMD_NET) += cmd_net.o COBJS-y += cmd_nvedit.o COBJS-y += cmd_onenand.o +COBJS-$(CONFIG_CMD_PARIO) += cmd_pario.o ifdef CONFIG_PCI COBJS-$(CONFIG_CMD_PCI) += cmd_pci.o endif
common/cmd_pario.c new file +87 -0
88 lines not on this page · raw message
PATCH v4 1/1 QE IO: Add initial data to pin configuration + read/write functions
Review
Quoted 6 lines · David Saada
(quoted diff) +6
-0+void qe_read_iopin(u8 port, u8 pin, int *data) +{ + u32 pin_1bit_mask; + u32 tmp_val; + volatile immap_t *im = (volatile immap_t *)CFG_IMMR; + volatile qepio83xx_t *par_io = (volatile qepio83xx_t
Don't use volatile. Use the accessor functions: in_be32 and out_be32.
Quoted 13 lines
common/Makefile +1
-0@@ -76,6 +76,7 @@ COBJS-y += cmd_nand.o COBJS-$(CONFIG_CMD_NET) += cmd_net.o COBJS-y += cmd_nvedit.o COBJS-y += cmd_onenand.o +COBJS-$(CONFIG_CMD_PARIO) += cmd_pario.o ifdef CONFIG_PCI COBJS-$(CONFIG_CMD_PCI) += cmd_pci.o endif
common/cmd_pario.c line 2
Quoted 2 lines
common/cmd_pario.c new file +2
-0@@ -0,0 +1,87 @@ +/* +* Copyright 2007 ECI Telecommunication.
Did you mean 2008?
common/cmd_pario.c line 4
Quoted 2 lines
common/cmd_pario.c new file +2
-0+* +* (C) Copyright 2002 David Saada <[email protected]>
And here
Quoted 15 lines
common/cmd_pario.c new file +15
-0+* +* See file CREDITS for list of people who contributed to this +* project. +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public License as +* published by the Free Software Foundation; either version 2 of +* the License, or (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License
common/cmd_pario.c line 29
Quoted 10 lines
common/cmd_pario.c new file +10
-0+* along with this program; if not, write to the Free Software +* Foundation, Inc., 59 Temple Place, Suite 330, Boston, +* MA 02111-1307 USA +*/ + +#include <common.h> +#include <command.h> + +void qe_read_iopin (u8 port,u8 pin,int *data); +void qe_write_iopin (u8 port,u8 pin,int data);
Put these in a header file.
Signature · 2 lines
Timur Tabi Linux kernel developer at Freescale
PATCH v4 1/1 QE IO: Add initial data to pin configuration + read/write functions
Quoted 8 lines
Review
Quoted 6 lines
(quoted diff) +6
-0+void qe_read_iopin(u8 port, u8 pin, int *data) +{ + u32 pin_1bit_mask; + u32 tmp_val; + volatile immap_t *im = (volatile immap_t *)CFG_IMMR; + volatile qepio83xx_t *par_io = (volatile qepio83xx_tDon't use volatile. Use the accessor functions:
in_be32andout_be32.
This was copied from the qe_config_iopin function, which still used the volatile directive. I can fix it there as well, but I see that it's used everywhere. Maybe this needs a thorough change, but I'm not sure it should be in my humble patch.
Quoted 1 line
Did you mean 2008?
...
Quoted 1 line
And here
Hehe - will change.
Quoted 4 lines
common/cmd_pario.c line 29
Quoted 2 lines
common/cmd_pario.c new file +2
-0+void qe_read_iopin (u8 port,u8 pin,int *data); +void qe_write_iopin (u8 port,u8 pin,int data);Put these in a header file.
Will change as well. I think ioports.h is good enough for this purpose. So far, qe_config_iopin wasn't there as well, so it will also be moved there.
David.
PATCH v4 1/1 QE IO: Add initial data to pin configuration + read/write functions
Quoted 4 lines · David Saada
Quoted 1 line
Don't use volatile. Use the accessor functions:
in_be32andout_be32.This was copied from the
qe_config_iopinfunction, which still used the volatile directive. I can fix it there as well, but I see that it's used everywhere.
Yeah, and it's wrong everywhere, too.
Quoted 2 lines
Maybe this needs a thorough change, but I'm not sure it should be in my humble patch.
Well, we may not have the time to fix all the wrong usages, but we shouldn't make it worse. All new code should use the accessors.
Quoted 4 lines
Quoted 1 line
Put these in a header file.
Will change as well. I think
ioports.his good enough for this purpose. So far,qe_config_iopinwasn't there as well, so it will also be moved there.
I'm okay with that.
Signature · 2 lines
Timur Tabi Linux kernel developer at Freescale