TQM85xx: Fix CPM port pin configuration

Do not configure port pins PD30/PD31 as SCC1 TxD/RxD except for the TQM8560
board. On the other TQM85xx boards (TQM8541 and TQM8555) SCC1 is not used
as serial interface anyway. Worse, on some board variants configuring the
pins for SCC1 leads to short circuits (for example on the TQM8541-BG).

Signed-off-by: Martin Krause <martin.krause@tqs.de>

diff --git a/board/tqc/tqm85xx/tqm85xx.c b/board/tqc/tqm85xx/tqm85xx.c
index 31364d3fcf6fdae72e089f8ce0b958deee3d9137..af8c170b3614b43bb3c15028cbfd2d0482d340e1 100644 (file)
--- a/board/tqc/tqm85xx/tqm85xx.c
+++ b/board/tqc/tqm85xx/tqm85xx.c
@@ -165,9 +165,15 @@ const iop_conf_t iop_conf_tab[4][32] = {
 
        /* Port D: conf, ppar, psor, pdir, podr, pdat */
        {
+#ifdef CONFIG_TQM8560
         {1, 1, 0, 0, 0, 0},    /* PD31: SCC1 EN RxD */
         {1, 1, 1, 1, 0, 0},    /* PD30: SCC1 EN TxD */
         {1, 1, 0, 1, 0, 0},    /* PD29: SCC1 EN TENA */
+#else /* !CONFIG_TQM8560 */
+        {0, 0, 0, 0, 0, 0},    /* PD31: PD31 */
+        {0, 0, 0, 0, 0, 0},    /* PD30: PD30 */
+        {0, 0, 0, 0, 0, 0},    /* PD29: PD29 */
+#endif /* CONFIG_TQM8560 */
         {1, 1, 0, 0, 0, 0},    /* PD28: PD28 */
         {1, 1, 0, 1, 0, 0},    /* PD27: PD27 */
         {1, 1, 0, 1, 0, 0},    /* PD26: PD26 */