Remove unused definition IOMUX_SION

[karo-tx-uboot.git] / board / karo / tx53 / tx53.c

diff --git a/board/karo/tx53/tx53.c b/board/karo/tx53/tx53.c
index 8e19707b3196a94fa9be1cefe6025d4b19230946..aeb02cf40d1c1beba8bc114e472bd7ae021aa14b 100644 (file)
--- a/board/karo/tx53/tx53.c
+++ b/board/karo/tx53/tx53.c
@@ -55,8 +55,6 @@
 
 DECLARE_GLOBAL_DATA_PTR;
 
-#define IOMUX_SION             IOMUX_PAD(0, 0, IOMUX_CONFIG_SION, 0, 0, 0)
-
 #define MX53_GPIO_PAD_CTRL     (PAD_CTL_PKE | PAD_CTL_PUE |            \
                                PAD_CTL_DSE_HIGH | PAD_CTL_PUS_22K_UP)
 
@@ -799,27 +797,20 @@ static void stk5v5_board_init(void)
 
 static void tx53_move_fdt(void)
 {
-       unsigned long fdt_addr = getenv_ulong("fdtcontroladdr", 16, 0);
-       void *fdt = NULL;
-
-       if (!fdt_addr)
-               return;
+       const void *fdt = gd->fdt_blob;
+       unsigned long fdt_addr = getenv_ulong("fdtaddr", 16, 0);
 
-#ifdef CONFIG_OF_EMBED
-       fdt = _binary_dt_dtb_start;
-#elif defined CONFIG_OF_SEPARATE
-       fdt = (void *)(_end_ofs + _TEXT_BASE);
-#endif
-       if (!fdt)
+       if (!fdt || !fdt_addr) {
+               printf("fdt=%p fdt_addr=%08lx\n", fdt, fdt_addr);
                return;
+       }
 
        if (fdt_check_header(fdt)) {
                printf("ERROR: No valid FDT found at %p\n", fdt);
                return;
        }
-       size_t fdt_len = fdt_totalsize(fdt);
 
-       memmove((void *)fdt_addr, fdt, fdt_len);
+       memmove((void *)fdt_addr, fdt, fdt_totalsize(fdt));
        set_working_fdt_addr((void *)fdt_addr);
 }
 
@@ -828,6 +819,9 @@ static void tx53_set_cpu_clock(void)
        unsigned long cpu_clk = getenv_ulong("cpu_clk", 10, 0);
        int ret;
 
+       if (tstc() || (wrsr & WRSR_TOUT))
+               return;
+
        if (cpu_clk == 0 || cpu_clk == mxc_get_clock(MXC_ARM_CLK) / 1000000)
                return;
 
@@ -985,6 +979,53 @@ static void tx53_fixup_usb_otg(void *blob)
        }
 }
 
+static void tx53_fdt_del_prop(void *blob, const char *compat, phys_addr_t offs,
+                       const char *prop)
+{
+       int ret;
+       int offset;
+       const uint32_t *phandle;
+       uint32_t ph = 0;
+
+       offset = fdt_node_offset_by_compat_reg(blob, compat, offs);
+       if (offset <= 0)
+               return;
+
+       phandle = fdt_getprop(blob, offset, "transceiver-switch", NULL);
+       if (phandle) {
+               ph = be32_to_cpu(*phandle);
+               printf("phandle=%08x\n", ph);
+       }
+
+       debug("Removing property '%s' from node %s@%08lx\n", prop, compat, offs);
+       ret = fdt_delprop(blob, offset, prop);
+       if (ret)
+               printf("Failed to remove property '%s' from node %s@%08lx\n",
+                       prop, compat, offs);
+
+       if (!ph)
+               return;
+
+       offset = fdt_node_offset_by_phandle(blob, ph);
+       printf("Node offset[%x]=%08x\n", ph, offset);
+       if (offset <= 0)
+               return;
+
+       debug("Removing node @ %08x\n", offset);
+       fdt_del_node(blob, offset);
+}
+
+static void tx53_fixup_flexcan(void *blob)
+{
+       const char *baseboard = getenv("baseboard");
+
+       if (baseboard && strcmp(baseboard, "stk5-v5") == 0)
+               return;
+
+       tx53_fdt_del_prop(blob, "fsl,p1010-flexcan", 0x53fc8000, "transceiver-switch");
+       tx53_fdt_del_prop(blob, "fsl,p1010-flexcan", 0x53fcc000, "transceiver-switch");
+}
+
 void ft_board_setup(void *blob, bd_t *bd)
 {
        fdt_fixup_mtdparts(blob, nodes, ARRAY_SIZE(nodes));
@@ -992,5 +1033,6 @@ void ft_board_setup(void *blob, bd_t *bd)
 
        tx53_fixup_touchpanel(blob);
        tx53_fixup_usb_otg(blob);
+       tx53_fixup_flexcan(blob);
 }
 #endif