Merge branch 'master' of ../work into next

[platform/kernel/u-boot.git] / board / davinci / common / misc.c

diff --git a/board/davinci/common/misc.c b/board/davinci/common/misc.c
index be709bf..9fab76f 100644 (file)
--- a/board/davinci/common/misc.c
+++ b/board/davinci/common/misc.c
@@ -1,6 +1,7 @@
 /*
  * Miscelaneous DaVinci functions.
  *
+ * Copyright (C) 2009 Nick Thompson, GE Fanuc Ltd, <nick.thompson@gefanuc.com>
  * Copyright (C) 2007 Sergey Kubushyn <ksi@koi8.net>
  * Copyright (C) 2008 Lyrtech <www.lyrtech.com>
  * Copyright (C) 2004 Texas Instruments.
@@ -25,7 +26,10 @@
 
 #include <common.h>
 #include <i2c.h>
+#include <net.h>
 #include <asm/arch/hardware.h>
+#include <asm/io.h>
+#include "misc.h"
 
 DECLARE_GLOBAL_DATA_PTR;
 
@@ -37,17 +41,7 @@ int dram_init(void)
        return(0);
 }
 
-static int dv_get_pllm_output(uint32_t pllm)
-{
-       return (pllm + 1) * (CONFIG_SYS_HZ_CLOCK / 1000000);
-}
-
-void dv_display_clk_infos(void)
-{
-       printf("ARM Clock: %dMHz\n", dv_get_pllm_output(REG(PLL1_PLLM)) / 2);
-       printf("DDR Clock: %dMHz\n", dv_get_pllm_output(REG(PLL2_PLLM)) /
-              ((REG(PLL2_DIV2) & 0x1f) + 1) / 2);
-}
+#ifdef CONFIG_DRIVER_TI_EMAC
 
 /* Read ethernet MAC address from EEPROM for DVEVM compatible boards.
  * Returns 1 if found, 0 otherwise.
@@ -60,8 +54,8 @@ int dvevm_read_mac_address(uint8_t *buf)
                     (uint8_t *) &buf[0], 6))
                goto i2cerr;
 
-       /* Check that MAC address is not null. */
-       if (memcmp(buf, "\0\0\0\0\0\0", 6) == 0)
+       /* Check that MAC address is valid. */
+       if (!is_valid_ether_addr(buf))
                goto err;
 
        return 1; /* Found */
@@ -75,11 +69,11 @@ err:
 }
 
 /* If there is a MAC address in the environment, and if it is not identical to
- * the MAC address in the ROM, then a warning is printed and the MAC address
+ * the MAC address in the EEPROM, then a warning is printed and the MAC address
  * from the environment is used.
  *
  * If there is no MAC address in the environment, then it will be initialized
- * (silently) from the value in the ROM.
+ * (silently) from the value in the EEPROM.
  */
 void dv_configure_mac_address(uint8_t *rom_enetaddr)
 {
@@ -96,31 +90,68 @@ void dv_configure_mac_address(uint8_t *rom_enetaddr)
                        tmp = (*end) ? end+1 : end;
        }
 
-       /* Check if ROM and U-Boot environment MAC addresses match. */
+       /* Check if EEPROM and U-Boot environment MAC addresses match. */
        if (memcmp(env_enetaddr, "\0\0\0\0\0\0", 6) != 0 &&
            memcmp(env_enetaddr, rom_enetaddr, 6) != 0) {
                printf("Warning: MAC addresses don't match:\n");
-               printf("  ROM MAC address: %02X:%02X:%02X:%02X:%02X:%02X\n",
-                      rom_enetaddr[0], rom_enetaddr[1],
-                      rom_enetaddr[2], rom_enetaddr[3],
-                      rom_enetaddr[4], rom_enetaddr[5]);
-               printf("  \"ethaddr\" value: %02X:%02X:%02X:%02X:%02X:%02X\n",
-                      env_enetaddr[0], env_enetaddr[1],
-                      env_enetaddr[2], env_enetaddr[3],
-                      env_enetaddr[4], env_enetaddr[5]) ;
+               printf("  EEPROM MAC address: %pM\n", rom_enetaddr);
+               printf("     \"ethaddr\" value: %pM\n", env_enetaddr) ;
                debug("### Using MAC address from environment\n");
        }
        if (!tmp) {
                char ethaddr[20];
 
                /* There is no MAC address in the environment, so we initialize
-                * it from the value in the ROM. */
-               sprintf(ethaddr, "%02X:%02X:%02X:%02X:%02X:%02X",
-                       rom_enetaddr[0], rom_enetaddr[1],
-                       rom_enetaddr[2], rom_enetaddr[3],
-                       rom_enetaddr[4], rom_enetaddr[5]) ;
-               debug("### Setting environment from ROM MAC address = \"%s\"\n",
+                * it from the value in the EEPROM. */
+               sprintf(ethaddr, "%pM", rom_enetaddr) ;
+               debug("### Setting environment from EEPROM MAC address = \"%s\"\n",
                      ethaddr);
                setenv("ethaddr", ethaddr);
        }
 }
+
+#endif /* DAVINCI_EMAC */
+
+/*
+ * Change the setting of a pin multiplexer field.
+ *
+ * Takes an array of pinmux settings similar to:
+ *
+ * struct pinmux_config uart_pins[] = {
+ *     { &davinci_syscfg_regs->pinmux[8], 2, 7 },
+ *     { &davinci_syscfg_regs->pinmux[9], 2, 0 }
+ * };
+ *
+ * Stepping through the array, each pinmux[n] register has the given value
+ * set in the pin mux field specified.
+ *
+ * The number of pins in the array must be passed (ARRAY_SIZE can provide
+ * this value conveniently).
+ *
+ * Returns 0 if all field numbers and values are in the correct range,
+ * else returns -1.
+ */
+int davinci_configure_pin_mux(const struct pinmux_config *pins,
+                             const int n_pins)
+{
+       int i;
+
+       /* check for invalid pinmux values */
+       for (i = 0; i < n_pins; i++) {
+               if (pins[i].field >= PIN_MUX_NUM_FIELDS ||
+                   (pins[i].value & ~PIN_MUX_FIELD_MASK) != 0)
+                       return -1;
+       }
+
+       /* configure the pinmuxes */
+       for (i = 0; i < n_pins; i++) {
+               const int offset = pins[i].field * PIN_MUX_FIELD_SIZE;
+               const unsigned int value = pins[i].value << offset;
+               const unsigned int mask = PIN_MUX_FIELD_MASK << offset;
+               const dv_reg *mux = pins[i].mux;
+
+               writel(value | (readl(mux) & (~mask)), mux);
+       }
+
+       return 0;
+}