blackfin: bf609: add softswitch config command
authorBob Liu <lliubbo@gmail.com>
Tue, 5 Feb 2013 11:05:41 +0000 (19:05 +0800)
committerSonic Zhang <sonic.zhang@analog.com>
Mon, 13 May 2013 08:26:12 +0000 (16:26 +0800)
Add softswitch_output command for bf609-ezkit to enable softswitches.

Signed-off-by: Bob Liu <lliubbo@gmail.com>
Signed-off-by: Sonic Zhang <sonic.zhang@analog.com>
README
arch/blackfin/include/asm/soft_switch.h [new file with mode: 0644]
board/bf609-ezkit/soft_switch.c
board/bf609-ezkit/soft_switch.h
common/Makefile
common/cmd_softswitch.c [new file with mode: 0644]
include/configs/bf609-ezkit.h

diff --git a/README b/README
index 0d37d561d9f929a3de64664d9da0e63ca8cfd444..defdedbef1e90f6783957e8980dfcebba40be9ee 100644 (file)
--- a/README
+++ b/README
@@ -898,6 +898,7 @@ The following options need to be configured:
                CONFIG_CMD_SF           * Read/write/erase SPI NOR flash
                CONFIG_CMD_SHA1SUM        print sha1 memory digest
                                          (requires CONFIG_CMD_MEMORY)
+               CONFIG_CMD_SOFTSWITCH   * Soft switch setting command for BF60x
                CONFIG_CMD_SOURCE         "source" command Support
                CONFIG_CMD_SPI          * SPI serial bus support
                CONFIG_CMD_TFTPSRV      * TFTP transfer in server mode
diff --git a/arch/blackfin/include/asm/soft_switch.h b/arch/blackfin/include/asm/soft_switch.h
new file mode 100644 (file)
index 0000000..ff8e44d
--- /dev/null
@@ -0,0 +1,18 @@
+/*
+ * U-boot - main board file
+ *
+ * Copyright (c) 2008-2012 Analog Devices Inc.
+ *
+ * Licensed under the GPL-2 or later.
+ */
+
+#ifndef __SOFT_SWITCH_H__
+#define __SOFT_SWITCH_H__
+
+#define IO_PORT_A              0
+#define IO_PORT_B              1
+#define IO_PORT_INPUT          0
+#define IO_PORT_OUTPUT         1
+
+int config_switch_bit(int num, int port, int bit, int dir, uchar value);
+#endif
index 2e1404fa09ae8ef0f399cf57779961de54ebebd5..e0c8d93fe777b128068e54760f4a8700a36709cb 100644 (file)
 #include <i2c.h>
 #include "soft_switch.h"
 
-#define SWITCH_ADDR     0x21
-
-#define NUM_SWITCH      3
-#define IODIRA          0x0
-#define IODIRB          0x1
-#define OLATA           0x14
-#define OLATB           0x15
-
 struct switch_config {
        uchar dir0; /* IODIRA */
        uchar dir1; /* IODIRB */
@@ -126,9 +118,8 @@ static int setup_soft_switch(int addr, struct switch_config *config)
        return i2c_write(addr, IODIRB, 1, &config->dir1, 1);
 }
 
-int config_switch_bit(int num, int port, int bit, int dir, uchar value)
+int config_switch_bit(int addr, int port, int bit, int dir, uchar value)
 {
-       int addr = SWITCH_ADDR + num;
        int ret, data_reg, dir_reg;
        uchar tmp;
 
index 8da0e44ddf07e8a8884796dec7c7bf33206c16c5..d147fe1378c10f8e239af96aed7dc978a5f6840f 100644 (file)
@@ -6,8 +6,10 @@
  * Licensed under the GPL-2 or later.
  */
 
-#ifndef __SOFT_SWITCH_H__
-#define __SOFT_SWITCH_H__
+#ifndef __BOARD_SOFT_SWITCH_H__
+#define __BOARD_SOFT_SWITCH_H__
+
+#include <asm/soft_switch.h>
 
 /* switch 0 port A */
 #define CAN_EN                 0x1
 #define PD3_SPI0MOSI_EN        0x1
 #define PD4_SPI0CK_EN          0x2
 
-#define IO_PORT_A              0
-#define IO_PORT_B              1
-#define IO_PORT_INPUT          0
-#define IO_PORT_OUTPUT         1
+#ifdef CONFIG_BFIN_BOARD_VERSION_1_0
+#define SWITCH_ADDR     0x21
+#else
+#define SWITCH_ADDR     0x20
+#endif
+
+#define NUM_SWITCH      3
+#define IODIRA          0x0
+#define IODIRB          0x1
+#define OLATA           0x14
+#define OLATB           0x15
 
-int config_switch_bit(int num, int port, int bit, int dir, uchar value);
 int setup_board_switches(void);
-#endif
+
+#endif /* __BOARD_SOFT_SWITCH_H__ */
index 0e0fff1ffa30a44d2ce27d91d31956916006b3e3..0429a3c51c39af715691a33b73b402bcdfef68ff 100644 (file)
@@ -164,6 +164,7 @@ COBJS-$(CONFIG_CMD_SF) += cmd_sf.o
 COBJS-$(CONFIG_CMD_SCSI) += cmd_scsi.o
 COBJS-$(CONFIG_CMD_SHA1SUM) += cmd_sha1sum.o
 COBJS-$(CONFIG_CMD_SETEXPR) += cmd_setexpr.o
+COBJS-$(CONFIG_CMD_SOFTSWITCH) += cmd_softswitch.o
 COBJS-$(CONFIG_CMD_SPI) += cmd_spi.o
 COBJS-$(CONFIG_CMD_SPIBOOTLDR) += cmd_spibootldr.o
 COBJS-$(CONFIG_CMD_STRINGS) += cmd_strings.o
diff --git a/common/cmd_softswitch.c b/common/cmd_softswitch.c
new file mode 100644 (file)
index 0000000..f75d926
--- /dev/null
@@ -0,0 +1,41 @@
+/*
+ * cmd_softswitch.c - set the softswitch for bf60x
+ *
+ * Copyright (c) 2012 Analog Devices Inc.
+ *
+ * Licensed under the GPL-2 or later.
+ */
+
+#include <common.h>
+#include <command.h>
+#include <asm/blackfin.h>
+#include <asm/soft_switch.h>
+
+int do_softswitch(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
+{
+       int switchaddr, value, pin, port;
+
+       if (argc != 5)
+               return CMD_RET_USAGE;
+
+       if (strcmp(argv[2], "GPA") == 0)
+               port = IO_PORT_A;
+       else if (strcmp(argv[2], "GPB") == 0)
+               port = IO_PORT_B;
+       else
+               return CMD_RET_USAGE;
+
+       switchaddr = simple_strtoul(argv[1], NULL, 16);
+       pin = simple_strtoul(argv[3], NULL, 16);
+       value = simple_strtoul(argv[4], NULL, 16);
+
+       config_switch_bit(switchaddr, port, (1 << pin), IO_PORT_OUTPUT, value);
+
+       return 0;
+}
+
+U_BOOT_CMD(
+       softswitch_output, 5, 1, do_softswitch,
+       "switchaddr GPA/GPB pin_offset value",
+       ""
+);
index 8b90129f29eeacf193faac1fed3bb4e91de7e87e..f0ac86b8ab90e33d1950a645bd7c38af75bbc8e8 100644 (file)
 #define CONFIG_UART_CONSOLE    0
 
 #define CONFIG_CMD_MEMORY
+#define CONFIG_CMD_SOFTSWITCH
 
 #define CONFIG_SYS_MEMTEST_END (CONFIG_STACKBASE - 20*1024*1024 + 4)
 #define CONFIG_BFIN_SOFT_SWITCH