summaryrefslogtreecommitdiff
path: root/board/davinci
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2010-01-12 23:47:03 +0100
committerWolfgang Denk <wd@denx.de>2010-01-12 23:47:03 +0100
commit2ff6922280025c1315c53fa2eb4ab33f0c9591de (patch)
tree8061843b797eac0669f51b3b14d361bdae1dbe3b /board/davinci
parentf8b365ceb64e0b86bea243d783ff94687302cba9 (diff)
parent06f95959bc5421e516a9a25012e303dea8833385 (diff)
downloadu-boot-imx-2ff6922280025c1315c53fa2eb4ab33f0c9591de.zip
u-boot-imx-2ff6922280025c1315c53fa2eb4ab33f0c9591de.tar.gz
u-boot-imx-2ff6922280025c1315c53fa2eb4ab33f0c9591de.tar.bz2
Merge branch 'master' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'board/davinci')
-rw-r--r--board/davinci/common/misc.c31
-rw-r--r--board/davinci/common/misc.h13
2 files changed, 44 insertions, 0 deletions
diff --git a/board/davinci/common/misc.c b/board/davinci/common/misc.c
index 9fab76f..25ca326 100644
--- a/board/davinci/common/misc.c
+++ b/board/davinci/common/misc.c
@@ -155,3 +155,34 @@ int davinci_configure_pin_mux(const struct pinmux_config *pins,
return 0;
}
+
+/*
+ * Configure multiple pinmux resources.
+ *
+ * Takes an pinmux_resource array of pinmux_config and pin counts:
+ *
+ * const struct pinmux_resource pinmuxes[] = {
+ * PINMUX_ITEM(uart_pins),
+ * PINMUX_ITEM(i2c_pins),
+ * };
+ *
+ * The number of items in the array must be passed (ARRAY_SIZE can provide
+ * this value conveniently).
+ *
+ * Each item entry is configured in the defined order. If configuration
+ * of any item fails, -1 is returned and none of the following items are
+ * configured. On success, 0 is returned.
+ */
+int davinci_configure_pin_mux_items(const struct pinmux_resource *item,
+ const int n_items)
+{
+ int i;
+
+ for (i = 0; i < n_items; i++) {
+ if (davinci_configure_pin_mux(item[i].pins,
+ item[i].n_pins) != 0)
+ return -1;
+ }
+
+ return 0;
+}
diff --git a/board/davinci/common/misc.h b/board/davinci/common/misc.h
index f6d8b1b..329c369 100644
--- a/board/davinci/common/misc.h
+++ b/board/davinci/common/misc.h
@@ -34,8 +34,21 @@ struct pinmux_config {
unsigned char field; /* field number */
};
+/* pin table definition */
+struct pinmux_resource {
+ const struct pinmux_config *pins;
+ const int n_pins;
+};
+
+#define PINMUX_ITEM(item) { \
+ .pins = item, \
+ .n_pins = ARRAY_SIZE(item) \
+ }
+
int dvevm_read_mac_address(uint8_t *buf);
void dv_configure_mac_address(uint8_t *rom_enetaddr);
int davinci_configure_pin_mux(const struct pinmux_config *pins, int n_pins);
+int davinci_configure_pin_mux_items(const struct pinmux_resource *item,
+ int n_items);
#endif /* __MISC_H */