nios2: add gpio based status led driver

This patch adds a gpio based status led driver. The led mask is used to specify the gpio pin.

Signed-off-by Thomas Chou <[email protected]>

---
 board/altera/common/gpioled.c |   30 ++++++++++++++++++++++++++++++
 1 files changed, 30 insertions(+), 0 deletions(-)
 create mode 100644 board/altera/common/gpioled.c

board/altera/common/gpioled.c new file +9 -0

new file mode 100644
index 0000000..9a51fae
@@ -0,0 +1,30 @@
+/*
+ * Status LED driver based on gpio
+ *
+ * Copyright (C) 2010 Thomas Chou <[email protected]>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */

board/altera/common/gpioled.c line 19

Quoted 3 lines

board/altera/common/gpioled.c new file +3 -0

+void __led_init(led_id_t mask, int state)
+{
+    gpio_direction_output(mask, (state == STATUS_LED_ON) ? 0 : 1);

The direction register only exists when the PIO core hardware is configured in bidirectional mode.

If the PIO core hardware is configured in output-only mode, reading from data returns an undefined value.

As I recall, the older designs configured the LED PIO ports as output only ... which is why board/altera/common/epled.c was coded in such a manner.

Quoted 8 lines · Scott McNutt

board/altera/common/gpioled.c line 19

Quoted 3 lines

board/altera/common/gpioled.c new file +3 -0

+void __led_init(led_id_t mask, int state)
+{
+    gpio_direction_output(mask, (state == STATUS_LED_ON) ? 0 : 1);

The direction register only exists when the PIO core hardware is configured in bidirectional mode.

Quoted 7 lines

If the PIO core hardware is configured in output-only mode, reading from data returns an undefined value.

As I recall, the older designs configured the LED PIO ports as output only ... which is why board/altera/common/epled.c was coded in such a manner.

Hi Scott,

This is not for Altera PIO interface. I followed the gpio interface of Linux, linux-2.6/Documentation/gpio.txt, and created a trivial bit addressing gpio core,

I don't think the Altera board tree is an appropriate place for code that supports custom logic blocks. If an Altera distribution provided a design that included this custom block in one of their board designs then it would probably be fine.

I'm not sure where this should go ... maybe in the driver tree?

This patch adds a status led driver followed the GPIO access conventions of Linux. The led mask is used to specify the gpio pin.

Signed-off-by Thomas Chou <[email protected]>

---
Moved to drivers/misc.

Dear Thomas Chou,

Quoted 7 lines · In message<[email protected]> you wrote:

This patch adds a status led driver followed the GPIO access conventions of Linux. The led mask is used to specify the gpio pin.

Signed-off-by Thomas Chou<[email protected]>

---
Moved to drivers/misc.

Which boards are the users of this code?

Best regards,

Wolfgang Denk

Quoted 9 lines

Quoted 8 lines

This patch adds a status led driver followed the GPIO access conventions of Linux. The led mask is used to specify the gpio pin.

Signed-off-by Thomas Chou<[email protected]>

---
Moved to drivers/misc.

Which boards are the users of this code?

It is used in the example designs of Altera NEEK and DE2 boards, which I provided for nios2 linux/uclinux on nios wiki. They are used by many nios2 users.

It may be used by other boards which support the GPIO access conventions of Linux. Though the GPIO access is not unified in u-boot currently, I think it should be the right direction to follow the conventions of Linux.

I mean, which board in U-Boot uses this code? I didn't find any.

The convention is not to add unused code. If there are no real users for this, the patch should be delayed until a board gets added that actually uses it.

Quoted 2 lines · Wolfgang Denk

I mean, which board in U-Boot uses this code? I didn't find any.

Quoted 4 lines

The convention is not to add unused code. If there are no real users for this, the patch should be delayed until a board gets added that actually uses it.

These nios2 boards are now supported with the nios2-generic board approach, like that of microblaze-generic, instead of adding every nios2 board to u-boot mainline. The nios2-generic board patch was applied to Scott's next branch.

Quoted 2 lines

Quoted 2 lines

I mean, which board in U-Boot uses this code? I didn't find any.

I think the most accurate answer is both "all" and "none" ... and I'm not trying to be funny or disrespectful in any way. It's just so very easy to replace peripherals with these FPGA based systems.

However, the nios2 linux folks are very likely to use it (as a replacement). And, when they build u-boot, it will probably be configured using the nios2-generic board. So this isn't a rabbit in the hat ... the code will used. It's just not directly tied to a particular PCB from a traditional point of view.

Quoted 4 lines

The convention is not to add unused code. If there are no real users for this, the patch should be delayed until a board gets added that actually uses it.

These nios2 boards are now supported with the nios2-generic board approach, like that of microblaze-generic, instead of adding every nios2 board to u-boot mainline. The nios2-generic board patch was applied to Scott's next branch.

The gpio led can be enabled with the following added to the board config file.

As long as no board actually uses this code we should put that patch on hold. Please resubmit it as part of the patch series that adds the first board that uses this code. Thanks.

I sent a patch to enable some peripherals on the nios2-generic board.

04/28 [PATCH v2] nios2: add epcs, gpio led and mmc_spi to nios2-generic

This patch should be applied after the other outstanding patches. Please let me know if this is all right?

Dear Thomas Chou,

Quoted 5 lines · In message <[email protected]> you wrote:

I sent a patch to enable some peripherals on the nios2-generic board.

04/28 [PATCH v2] nios2: add epcs, gpio led and mmc_spi to nios2-generic

This patch should be applied after the other outstanding patches. Please let me know if this is all right?

I don't understand how this is supposed to work? How can you enable a feature that has not been added yet? Will this not cause build errors?

I guess to make sure the code remains bisectable both should be done in a single step?

Dear Thomas Chou,

Quoted 6 lines · In message<[email protected]> you wrote:

I sent a patch to enable some peripherals on the nios2-generic board.

04/28 [PATCH v2] nios2: add epcs, gpio led and mmc_spi to nios2-generic

This patch should be applied after the other outstanding patches. Please let me know if this is all right?

I don't understand how this is supposed to work? How can you enable a feature that has not been added yet? Will this not cause build errors?

I guess to make sure the code remains bisectable both should be done in a single step?

Best regards,

Wolfgang Denk

This patch adds driver for a trivial gpio core, which is described in http://nioswiki.com/GPIO. It is used for gpio led and nand flash interface in u-boot.

When CONFIG_SYS_GPIO_BASE is not defined, board may provide its own driver.

Signed-off-by Thomas Chou <[email protected]>

This patch adds driver for a trivial gpio core, which is described in http://nioswiki.com/GPIO. It is used for gpio led and nand flash interface in u-boot.

When CONFIG_SYS_GPIO_BASE is not defined, board may provide its own driver.

Signed-off-by Thomas Chou <[email protected]>

---
v4: remove () from gpio when it is not in a macro.
v3: arch dir reorganized.

 arch/nios2/include/asm/gpio.h |   52 +++++++++++++++++++++++++++++++++++++++++
 1 files changed, 52 insertions(+), 0 deletions(-)
 create mode 100644 arch/nios2/include/asm/gpio.h

arch/nios2/include/asm/gpio.h new file +52 -0

new file mode 100644
index 0000000..76c425e
@@ -0,0 +1,52 @@
+/*
+ * nios2 gpio driver
+ *
+ * This gpio core is described in http://nioswiki.com/GPIO
+ * bit[0] data
+ * bit[1] output enable
+ *
+ * when CONFIG_SYS_GPIO_BASE is not defined, board may provide
+ * its own driver.
+ *
+ * Copyright (C) 2010 Thomas Chou <[email protected]>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#ifndef _ASM_NIOS2_GPIO_H_
+#define _ASM_NIOS2_GPIO_H_
+
+#ifdef CONFIG_SYS_GPIO_BASE
+#include <asm/io.h>
+
+static inline int gpio_direction_input(unsigned gpio)
+{
+	writel(1, CONFIG_SYS_GPIO_BASE + (gpio << 2));
+	return 0;
+}
+
+static inline int gpio_direction_output(unsigned gpio, int value)
+{
+	writel(value ? 3 : 2, CONFIG_SYS_GPIO_BASE + (gpio << 2));
+	return 0;
+}
+
+static inline int gpio_get_value(unsigned gpio)
+{
+	return readl(CONFIG_SYS_GPIO_BASE + (gpio << 2));
+}
+
+static inline void gpio_set_value(unsigned gpio, int value)
+{
+	writel(value ? 3 : 2, CONFIG_SYS_GPIO_BASE + (gpio << 2));
+}
+#else
+extern int gpio_direction_input(unsigned gpio);
+extern int gpio_direction_output(unsigned gpio, int value);
+extern int gpio_get_value(unsigned gpio);
+extern void gpio_set_value(unsigned gpio, int value);
+#endif /* CONFIG_SYS_GPIO_BASE */
+
+#endif /* _ASM_NIOS2_GPIO_H_ */

This patch adds a status led driver followed the GPIO access conventions of Linux. The led mask is used to specify the gpio pin.

Signed-off-by Thomas Chou <[email protected]>

This patch adds a status led driver followed the GPIO access conventions of Linux. The led mask is used to specify the gpio pin.

Signed-off-by Thomas Chou <[email protected]>

---
v2: moved to drivers/misc.

 drivers/misc/Makefile   |    1 +
 drivers/misc/gpio_led.c |   30 ++++++++++++++++++++++++++++++
 2 files changed, 31 insertions(+), 0 deletions(-)
 create mode 100644 drivers/misc/gpio_led.c

drivers/misc/Makefile +1 -0

index f6df60f..55ff17f 100644
@@ -28,6 +28,7 @@ LIB	:= $(obj)libmisc.a
 COBJS-$(CONFIG_ALI152X) += ali512x.o
 COBJS-$(CONFIG_DS4510)  += ds4510.o
 COBJS-$(CONFIG_FSL_LAW) += fsl_law.o
+COBJS-$(CONFIG_GPIO_LED) += gpio_led.o
 COBJS-$(CONFIG_NS87308) += ns87308.o
 COBJS-$(CONFIG_STATUS_LED) += status_led.o
 COBJS-$(CONFIG_TWL4030_LED) += twl4030_led.o

drivers/misc/gpio_led.c new file +30 -0

new file mode 100644
index 0000000..acd6a90
@@ -0,0 +1,30 @@
+/*
+ * Status LED driver based on GPIO access conventions of Linux
+ *
+ * Copyright (C) 2010 Thomas Chou <[email protected]>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#include <common.h>
+#include <status_led.h>
+#include <asm/gpio.h>
+
+/* assume led is active low */
+
+void __led_init(led_id_t mask, int state)
+{
+	gpio_direction_output(mask, (state == STATUS_LED_ON) ? 0 : 1);
+}
+
+void __led_set(led_id_t mask, int state)
+{
+	gpio_set_value(mask, (state == STATUS_LED_ON) ? 0 : 1);
+}
+
+void __led_toggle(led_id_t mask)
+{
+	gpio_set_value(mask, !gpio_get_value(mask));
+}

This patch adds gpio support of Altera PIO component to the nios2-generic board. Though it drives only gpio_led at the moment, it supports bidirectional port to control bit-banging I2C, NAND flash busy status or button switches, etc.

Signed-off-by Thomas Chou <[email protected]>

---
v3: split patches for gpio and spi, based gpio on altera pio core.
v2: remove mmc_spi_init()

 board/altera/nios2-generic/Makefile |    1 +
 board/altera/nios2-generic/gpio.c   |   55 +++++++++++++++++++++++++++++++++++
 include/configs/nios2-generic.h     |    6 ++--
 3 files changed, 59 insertions(+), 3 deletions(-)
 create mode 100644 board/altera/nios2-generic/gpio.c

board/altera/nios2-generic/Makefile +0 -0

index 6780872..d1fca70 100644

Quoted 17 lines · Thomas Chou

This patch adds gpio support of Altera PIO component to the nios2-generic board. Though it drives only gpio_led at the moment, it supports bidirectional port to control bit-banging I2C, NAND flash busy status or button switches, etc.

Signed-off-by Thomas Chou <[email protected]>

---
v3: split patches for gpio and spi, based gpio on altera pio core.
v2: remove mmc_spi_init()

 board/altera/nios2-generic/Makefile |    1 +
 board/altera/nios2-generic/gpio.c   |   55 
+++++++++++++++++++++++++++++++++++
 include/configs/nios2-generic.h     |    6 ++--
 3 files changed, 59 insertions(+), 3 deletions(-)
 create mode 100644 board/altera/nios2-generic/gpio.c

board/altera/nios2-generic/Makefile LIB = $(obj)lib$(BOARD).a · line 36

Quoted 11 lines

board/altera/nios2-generic/Makefile +1 -0

index 6780872..d1fca70 100644
@@ -32,6 +32,7 @@ LIB    = $(obj)lib$(BOARD).a
 COBJS-y    := $(BOARD).o
 COBJS-$(CONFIG_CMD_IDE) += ../common/cfide.o
 COBJS-$(CONFIG_EPLED) += ../common/epled.o
+COBJS-$(CONFIG_GPIO) += gpio.o
 COBJS-$(CONFIG_SEVENSEG) += ../common/sevenseg.o

This will build a u-boot image that will not work with any of the standard configurations ... correct? ... since the GPIO component is custom (not supplied by the vendor)?

Quoted 18 lines · Scott McNutt

Quoted 17 lines · Thomas Chou

This patch adds gpio support of Altera PIO component to the nios2-generic board. Though it drives only gpio_led at the moment, it supports bidirectional port to control bit-banging I2C, NAND flash busy status or button switches, etc.

Signed-off-by Thomas Chou <[email protected]>

---
v3: split patches for gpio and spi, based gpio on altera pio core.
v2: remove mmc_spi_init()

 board/altera/nios2-generic/Makefile |    1 +
 board/altera/nios2-generic/gpio.c   |   55 
+++++++++++++++++++++++++++++++++++
 include/configs/nios2-generic.h     |    6 ++--
 3 files changed, 59 insertions(+), 3 deletions(-)
 create mode 100644 board/altera/nios2-generic/gpio.c

Quoted 16 lines

board/altera/nios2-generic/Makefile LIB = $(obj)lib$(BOARD).a · line 36

Quoted 11 lines

board/altera/nios2-generic/Makefile +1 -0

index 6780872..d1fca70 100644
@@ -32,6 +32,7 @@ LIB    = $(obj)lib$(BOARD).a
 COBJS-y    := $(BOARD).o
 COBJS-$(CONFIG_CMD_IDE) += ../common/cfide.o
 COBJS-$(CONFIG_EPLED) += ../common/epled.o
+COBJS-$(CONFIG_GPIO) += gpio.o
 COBJS-$(CONFIG_SEVENSEG) += ../common/sevenseg.o

This will build a u-boot image that will not work with any of the standard configurations ... correct? ... since the GPIO component is custom (not supplied by the vendor)?

Hi Scott,

The board gpio.c driver works on Altera PIO component. It will behave exactly the same as the epled driver. I have tested it on EP1C20 an EP2C35 board with standard configuration. I believe it will work with the standard configuration on EP1S10 and EP1S40. I don't want to break anything.

This patch adds gpio support of Altera PIO component to the nios2-generic board. Though it drives only gpio_led at the moment, it supports bidirectional port to control bit-banging I2C, NAND flash busy status or button switches, etc.

Signed-off-by Thomas Chou <[email protected]>

This patch adds gpio support of Altera PIO component to the nios2-generic board. Though it drives only gpio_led at the moment, it supports bidirectional port to control bit-banging I2C, NAND flash busy status or button switches, etc.

Signed-off-by Thomas Chou <[email protected]>

---
v3: split patches for gpio and spi, based gpio on altera pio core.
v2: remove mmc_spi_init()

 board/altera/nios2-generic/Makefile |    1 +
 board/altera/nios2-generic/gpio.c   |   55 +++++++++++++++++++++++++++++++++++
 include/configs/nios2-generic.h     |    6 ++--
 3 files changed, 59 insertions(+), 3 deletions(-)
 create mode 100644 board/altera/nios2-generic/gpio.c

board/altera/nios2-generic/Makefile +1 -0

index 6780872..d1fca70 100644
@@ -32,6 +32,7 @@ LIB	= $(obj)lib$(BOARD).a
 COBJS-y	:= $(BOARD).o
 COBJS-$(CONFIG_CMD_IDE) += ../common/cfide.o
 COBJS-$(CONFIG_EPLED) += ../common/epled.o
+COBJS-$(CONFIG_GPIO) += gpio.o
 COBJS-$(CONFIG_SEVENSEG) += ../common/sevenseg.o
 
 SOBJS-y	:= text_base.o

board/altera/nios2-generic/gpio.c new file +55 -0

new file mode 100644
index 0000000..6c9c6c2
@@ -0,0 +1,55 @@
+/*
+ * board gpio driver
+ *
+ * Copyright (C) 2010 Thomas Chou <[email protected]>
+ * Licensed under the GPL-2 or later.
+ */
+#include <common.h>
+#include <asm/io.h>
+
+#ifndef CONFIG_SYS_GPIO_BASE
+
+#define ALTERA_PIO_BASE LED_PIO_BASE
+#define ALTERA_PIO_DATA (ALTERA_PIO_BASE + 0)
+#define ALTERA_PIO_DIR (ALTERA_PIO_BASE + 4)
+static u32 pio_data_reg;
+static u32 pio_dir_reg;
+
+int gpio_direction_input(unsigned gpio)
+{
+	u32 mask = 1 << gpio;
+	writel(pio_dir_reg &= ~mask, ALTERA_PIO_DIR);
+	return 0;
+}
+
+int gpio_direction_output(unsigned gpio, int value)
+{
+	u32 mask = 1 << gpio;
+	if (value)
+		pio_data_reg |= mask;
+	else
+		pio_data_reg &= ~mask;
+	writel(pio_data_reg, ALTERA_PIO_DATA);
+	writel(pio_dir_reg |= mask, ALTERA_PIO_DIR);
+	return 0;
+}
+
+int gpio_get_value(unsigned gpio)
+{
+	u32 mask = 1 << gpio;
+	if (pio_dir_reg & mask)
+		return (pio_data_reg & mask) ? 1 : 0;
+	else
+		return (readl(ALTERA_PIO_DATA) & mask) ? 1 : 0;
+}
+
+void gpio_set_value(unsigned gpio, int value)
+{
+	u32 mask = 1 << gpio;
+	if (value)
+		pio_data_reg |= mask;
+	else
+		pio_data_reg &= ~mask;
+	writel(pio_data_reg, ALTERA_PIO_DATA);
+}
+#endif

include/configs/nios2-generic.h +3 -3

index e83e1e3..e4bf57b 100644
@@ -63,10 +63,10 @@
  * STATUS LED
  */
 #define CONFIG_STATUS_LED		/* Enable status driver */
-#define CONFIG_EPLED			/* Enable LED PIO driver */
-#define CONFIG_SYS_LEDPIO_ADDR		LED_PIO_BASE
+#define CONFIG_GPIO_LED		/* Enable GPIO LED driver */
+#define CONFIG_GPIO			/* Enable GPIO driver */
 
-#define STATUS_LED_BIT			1	/* Bit-0 on PIO */
+#define STATUS_LED_BIT			0	/* Bit-0 on GPIO */
 #define STATUS_LED_STATE		1	/* Blinking */
 #define STATUS_LED_PERIOD	(500 / CONFIG_SYS_NIOS_TMRMS) /* 500 msec */
 

This patch adds the driver of altera spi controller, which is used as epcs/spi flash controller. It also works with mmc_spi driver.

This driver support more than one spi bus, with base list declared #define CONFIG_SYS_ALTERA_SPI_LIST { BASE_0,BASE_1,... }

Signed-off-by Thomas Chou <[email protected]>

This patch adds the driver of altera spi controller, which is used as epcs/spi flash controller. It also works with mmc_spi driver.

This driver support more than one spi bus, with base list declared #define CONFIG_SYS_ALTERA_SPI_LIST { BASE_0,BASE_1,... }

Signed-off-by Thomas Chou <[email protected]>

---
v10 remove bus check in setup slave, as spi_cs_is_valid() did it. v9 check bus in spi_cs_is_valid().
v8 fix cs activate timing.
v7 add cs activate deactive to work with legacy spi_mmc driver. v6 wrong patch, same as v5.
v5 tabify.

 drivers/spi/Makefile     |    1 +
 drivers/spi/altera_spi.c |  165 ++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 166 insertions(+), 0 deletions(-)
 create mode 100644 drivers/spi/altera_spi.c

drivers/spi/Makefile +1 -0

index f112ed0..dfcbb8b 100644
@@ -25,6 +25,7 @@ include $(TOPDIR)/config.mk
 
 LIB	:= $(obj)libspi.a
 
+COBJS-$(CONFIG_ALTERA_SPI) += altera_spi.o
 COBJS-$(CONFIG_ATMEL_DATAFLASH_SPI) += atmel_dataflash_spi.o
 COBJS-$(CONFIG_ATMEL_SPI) += atmel_spi.o
 COBJS-$(CONFIG_BFIN_SPI) += bfin_spi.o

drivers/spi/altera_spi.c new file +165 -0

new file mode 100644
index 0000000..918b223
@@ -0,0 +1,165 @@
+/*
+ * Altera SPI driver
+ *
+ * based on bfin_spi.c
+ * Copyright (c) 2005-2008 Analog Devices Inc.
+ * Copyright (C) 2010 Thomas Chou <[email protected]>
+ *
+ * Licensed under the GPL-2 or later.
+ */
+#include <common.h>
+#include <asm/io.h>
+#include <malloc.h>
+#include <spi.h>
+
+#define ALTERA_SPI_RXDATA	0
+#define ALTERA_SPI_TXDATA	4
+#define ALTERA_SPI_STATUS	8
+#define ALTERA_SPI_CONTROL	12
+#define ALTERA_SPI_SLAVE_SEL	20
+
+#define ALTERA_SPI_STATUS_ROE_MSK	(0x8)
+#define ALTERA_SPI_STATUS_TOE_MSK	(0x10)
+#define ALTERA_SPI_STATUS_TMT_MSK	(0x20)
+#define ALTERA_SPI_STATUS_TRDY_MSK	(0x40)
+#define ALTERA_SPI_STATUS_RRDY_MSK	(0x80)
+#define ALTERA_SPI_STATUS_E_MSK	(0x100)
+
+#define ALTERA_SPI_CONTROL_IROE_MSK	(0x8)
+#define ALTERA_SPI_CONTROL_ITOE_MSK	(0x10)
+#define ALTERA_SPI_CONTROL_ITRDY_MSK	(0x40)
+#define ALTERA_SPI_CONTROL_IRRDY_MSK	(0x80)
+#define ALTERA_SPI_CONTROL_IE_MSK	(0x100)
+#define ALTERA_SPI_CONTROL_SSO_MSK	(0x400)
+
+#ifndef CONFIG_SYS_ALTERA_SPI_LIST
+#define CONFIG_SYS_ALTERA_SPI_LIST { CONFIG_SYS_SPI_BASE }
+#endif
+
+static ulong altera_spi_base_list[] = CONFIG_SYS_ALTERA_SPI_LIST;
+
+struct altera_spi_slave {
+	struct spi_slave slave;
+	ulong base;
+};
+#define to_altera_spi_slave(s) container_of(s, struct altera_spi_slave, slave)
+
+__attribute__((weak))
+int spi_cs_is_valid(unsigned int bus, unsigned int cs)
+{
+	return bus < ARRAY_SIZE(altera_spi_base_list) && cs < 32;
+}
+
+__attribute__((weak))
+void spi_cs_activate(struct spi_slave *slave)
+{
+	struct altera_spi_slave *altspi = to_altera_spi_slave(slave);
+	writel(1 << slave->cs, altspi->base + ALTERA_SPI_SLAVE_SEL);
+	writel(ALTERA_SPI_CONTROL_SSO_MSK, altspi->base + ALTERA_SPI_CONTROL);
+}
+
+__attribute__((weak))
+void spi_cs_deactivate(struct spi_slave *slave)
+{
+	struct altera_spi_slave *altspi = to_altera_spi_slave(slave);
+	writel(0, altspi->base + ALTERA_SPI_CONTROL);
+	writel(0, altspi->base + ALTERA_SPI_SLAVE_SEL);
+}
+
+void spi_init(void)
+{
+}
+
+struct spi_slave *spi_setup_slave(unsigned int bus, unsigned int cs,
+				  unsigned int max_hz, unsigned int mode)
+{
+	struct altera_spi_slave *altspi;
+
+	if (!spi_cs_is_valid(bus, cs))
+		return NULL;
+
+	altspi = malloc(sizeof(*altspi));
+	if (!altspi)
+		return NULL;
+
+	altspi->slave.bus = bus;
+	altspi->slave.cs = cs;
+	altspi->base = altera_spi_base_list[bus];
+	debug("%s: bus:%i cs:%i base:%lx\n", __func__,
+		bus, cs, altspi->base);
+
+	return &altspi->slave;
+}
+
+void spi_free_slave(struct spi_slave *slave)
+{
+	struct altera_spi_slave *altspi = to_altera_spi_slave(slave);
+	free(altspi);
+}
+
+int spi_claim_bus(struct spi_slave *slave)
+{
+	struct altera_spi_slave *altspi = to_altera_spi_slave(slave);
+
+	debug("%s: bus:%i cs:%i\n", __func__, slave->bus, slave->cs);
+	writel(0, altspi->base + ALTERA_SPI_CONTROL);
+	writel(0, altspi->base + ALTERA_SPI_SLAVE_SEL);
+	return 0;
+}
+
+void spi_release_bus(struct spi_slave *slave)
+{
+	struct altera_spi_slave *altspi = to_altera_spi_slave(slave);
+
+	debug("%s: bus:%i cs:%i\n", __func__, slave->bus, slave->cs);
+	writel(0, altspi->base + ALTERA_SPI_SLAVE_SEL);
+}
+
+#ifndef CONFIG_ALTERA_SPI_IDLE_VAL
+# define CONFIG_ALTERA_SPI_IDLE_VAL 0xff
+#endif
+
+int spi_xfer(struct spi_slave *slave, unsigned int bitlen, const void *dout,
+	     void *din, unsigned long flags)
+{
+	struct altera_spi_slave *altspi = to_altera_spi_slave(slave);
+	/* assume spi core configured to do 8 bit transfers */
+	uint bytes = bitlen / 8;
+	const uchar *txp = dout;
+	uchar *rxp = din;
+
+	debug("%s: bus:%i cs:%i bitlen:%i bytes:%i flags:%lx\n", __func__,
+		slave->bus, slave->cs, bitlen, bytes, flags);
+	if (bitlen == 0)
+		goto done;
+
+	if (bitlen % 8) {
+		flags |= SPI_XFER_END;
+		goto done;
+	}
+
+	/* empty read buffer */
+	if (readl(altspi->base + ALTERA_SPI_STATUS) &
+	    ALTERA_SPI_STATUS_RRDY_MSK)
+		readl(altspi->base + ALTERA_SPI_RXDATA);
+	if (flags & SPI_XFER_BEGIN)
+		spi_cs_activate(slave);
+
+	while (bytes--) {
+		uchar d = txp ? *txp++ : CONFIG_ALTERA_SPI_IDLE_VAL;
+		debug("%s: tx:%x ", __func__, d);
+		writel(d, altspi->base + ALTERA_SPI_TXDATA);
+		while (!(readl(altspi->base + ALTERA_SPI_STATUS) &
+			 ALTERA_SPI_STATUS_RRDY_MSK))
+			;
+		d = readl(altspi->base + ALTERA_SPI_RXDATA);
+		if (rxp)
+			*rxp++ = d;
+		debug("rx:%x\n", d);
+	}
+ done:
+	if (flags & SPI_XFER_END)
+		spi_cs_deactivate(slave);
+
+	return 0;
+}

drivers/mtd/spi/spi_flash.c struct spi_flash *spi_flash_probe(unsigned int bus, unsigned int cs, · line 153

Quoted 11 lines · On Thursday 29 April 2010 23:34:17 Thomas Chou wrote:

drivers/mtd/spi/spi_flash.c +0 -0

@@ -147,6 +147,7 @@ struct spi_flash *spi_flash_probe(unsigned int bus,

unsigned int cs, #endif
#ifdef CONFIG_SPI_FLASH_STMICRO
case 0x20:

drivers/mtd/spi/spi_flash.c +1 -0

+	case 0xff:
  		flash = spi_flash_probe_stmicro(spi, idcode);
  		break;
  #endif

hrm, this kind of sucks, but i guess for now it's fine. stick a comment in there about why we're sending the normal error byte to the stmicro function.

	/* Let the stmicro func handle non-JEDEC ids */

-mike

Some old STMicro parts do not support JEDEC ID (0x9f). This patch uses RES (0xab) to get Electronic ID and translates it to JEDEC ID.

Signed-off-by Thomas Chou <[email protected]>

ive merged this into my sf branch and will push out next merge window if Wolfgang doesnt pick it up before that
-mike

ive merged this into my sf branch and will push out next merge window if Wolfgang doesnt pick it up before that

Quoted 2 lines · Mike Frysinger

ive merged this into my sf branch and will push out next merge window if Wolfgang doesnt pick it up before that

Just let me know what you (and Thomas) prefer

and what exactly (which patch[es] from this series) the "it" is that should be picked up (or not).

Dear Mike Frysinger,

Quoted 3 lines · In message<[email protected]> you wrote:

ive merged this into my sf branch and will push out next merge window if Wolfgang doesnt pick it up before that

Just let me know what you (and Thomas) prefer, and what exactly (which patch[es] from this series) the "it" is that should be picked up (or not).

This patch enables the altera_spi and spi_flash drivers for the nios2-generic board. It allows access to the EPCS/SPI flash on the Altera EP1C20 board.

Signed-off-by Thomas Chou <[email protected]>

This patch enables the altera_spi and spi_flash drivers for the nios2-generic board. It allows access to the EPCS/SPI flash on the Altera EP1C20 board.

Signed-off-by Thomas Chou <[email protected]>

---
v3: split patches for gpio and spi.
v2: remove mmc_spi_init()

 board/altera/nios2-generic/custom_fpga.h |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)

board/altera/nios2-generic/custom_fpga.h +10 -0

index 761f605..a11add5 100644
@@ -35,6 +35,16 @@
 #define CONFIG_SMC91111
 #define CONFIG_SMC_USE_32_BIT
 
+/* epcs_controller.epcs_control_port is a altera_avalon_epcs_flash_controller */
+#define EPCS_CONTROLLER_REG_BASE 0x82100200
+#define CONFIG_SYS_ALTERA_SPI_LIST { EPCS_CONTROLLER_REG_BASE }
+#define CONFIG_ALTERA_SPI
+#define CONFIG_CMD_SPI
+#define CONFIG_CMD_SF
+#define CONFIG_SF_DEFAULT_SPEED 30000000
+#define CONFIG_SPI_FLASH
+#define CONFIG_SPI_FLASH_STMICRO
+
 /* jtag_uart.avalon_jtag_slave is a altera_avalon_jtag_uart */
 #define CONFIG_SYS_JTAG_UART_BASE 0x821208b0