[OpenWrt-Devel] [PATCH 8/8] ramips: update dtsi files to support second spi device
Mingyu Li
igvtee at gmail.com
Sun Nov 22 20:41:34 EST 2015
Dear Sir.
you need to modify kernel file at "arch/mips/ralink/rt305x.c"
add the code below.
ralink_clk_add("10000b00.spi", sys_rate);
+ ralink_clk_add("10000b40.spi", sys_rate);
ralink_clk_add("10000100.timer", wdt_rate);
please let me know if the second spi works. if works
i will commit a patch about the second spi clock include
all other targets.
thanks.
Best Regards.
2015-11-23 3:08 GMT+08:00 John Crispin <blogic at openwrt.org>:
>
>
> On 22/11/2015 16:15, Álvaro Fernández Rojas wrote:
> > Hello guys,
> >
> > I've just tested this patch on my VoCore after it was applied on r47580.
> > I had to make the following changes:
> >
> https://github.com/openwrt-es/openwrt/commit/e040cf00441e973978a6c168b346b13e33f37853
> >
> >
> > However, I'm getting the following error: "spi-rt2880 10000b40.spi:
> > unable to get SYS clock"
> > https://gist.github.com/Noltari/7629d3384fe421517336
> >
> > Did anyone actually test this with both spi nodes enabled?
> >
> > Regards,
> > Álvaro.
>
> i only compile tested it.
>
> John
>
> >
> > El 08/10/2015 a las 16:16, Michael Lee escribió:
> >> Signed-off-by: Michael Lee <igvtee at gmail.com>
> >> ---
> >> target/linux/ramips/dts/mt7620a.dtsi | 32 +-
> >> target/linux/ramips/dts/mt7620n.dtsi | 32 +-
> >> target/linux/ramips/dts/rt3050.dtsi | 6 +-
> >> target/linux/ramips/dts/rt3352.dtsi | 31 +-
> >> target/linux/ramips/dts/rt3883.dtsi | 25 +-
> >> target/linux/ramips/dts/rt5350.dtsi | 29 +-
> >> .../0051-rt5350-spi-second-device.patch | 368
> >> ---------------------
> >> 7 files changed, 143 insertions(+), 380 deletions(-)
> >> delete mode 100644
> >> target/linux/ramips/patches-3.18/0051-rt5350-spi-second-device.patch
> >>
> >> diff --git a/target/linux/ramips/dts/mt7620a.dtsi
> >> b/target/linux/ramips/dts/mt7620a.dtsi
> >> index 026e745..448df75 100644
> >> --- a/target/linux/ramips/dts/mt7620a.dtsi
> >> +++ b/target/linux/ramips/dts/mt7620a.dtsi
> >> @@ -20,6 +20,11 @@
> >> compatible = "mti,cpu-interrupt-controller";
> >> };
> >> + aliases {
> >> + spi0 = &spi0;
> >> + spi1 = &spi1;
> >> + };
> >> +
> >> palmbus at 10000000 {
> >> compatible = "palmbus";
> >> reg = <0x10000000 0x200000>;
> >> @@ -202,9 +207,9 @@
> >> status = "disabled";
> >> };
> >> - spi at b00 {
> >> + spi0: spi at b00 {
> >> compatible = "ralink,mt7620a-spi", "ralink,rt2880-spi";
> >> - reg = <0xb00 0x100>;
> >> + reg = <0xb00 0x40>;
> >> resets = <&rstctrl 18>;
> >> reset-names = "spi";
> >> @@ -218,6 +223,22 @@
> >> pinctrl-0 = <&spi_pins>;
> >> };
> >> + spi1: spi at b40 {
> >> + compatible = "ralink,rt2880-spi";
> >> + reg = <0xb40 0x60>;
> >> +
> >> + resets = <&rstctrl 18>;
> >> + reset-names = "spi";
> >> +
> >> + #address-cells = <1>;
> >> + #size-cells = <1>;
> >> +
> >> + status = "disabled";
> >> +
> >> + pinctrl-names = "default";
> >> + pinctrl-0 = <&spi_cs1>;
> >> + };
> >> +
> >> uartlite at c00 {
> >> compatible = "ralink,mt7620a-uart",
> >> "ralink,rt2880-uart", "ns16550a";
> >> reg = <0xc00 0x100>;
> >> @@ -305,6 +326,13 @@
> >> };
> >> };
> >> + spi_cs1: spi1 {
> >> + spi1 {
> >> + ralink,group = "spi_cs1";
> >> + ralink,function = "spi_cs1";
> >> + };
> >> + };
> >> +
> >> i2c_pins: i2c {
> >> i2c {
> >> ralink,group = "i2c";
> >> diff --git a/target/linux/ramips/dts/mt7620n.dtsi
> >> b/target/linux/ramips/dts/mt7620n.dtsi
> >> index b1586ec..a3132b8 100644
> >> --- a/target/linux/ramips/dts/mt7620n.dtsi
> >> +++ b/target/linux/ramips/dts/mt7620n.dtsi
> >> @@ -20,6 +20,11 @@
> >> compatible = "mti,cpu-interrupt-controller";
> >> };
> >> + aliases {
> >> + spi0 = &spi0;
> >> + spi1 = &spi1;
> >> + };
> >> +
> >> palmbus at 10000000 {
> >> compatible = "palmbus";
> >> reg = <0x10000000 0x200000>;
> >> @@ -154,9 +159,9 @@
> >> status = "disabled";
> >> };
> >> - spi at b00 {
> >> + spi0: spi at b00 {
> >> compatible = "ralink,mt7620a-spi", "ralink,rt2880-spi";
> >> - reg = <0xb00 0x100>;
> >> + reg = <0xb00 0x40>;
> >> resets = <&rstctrl 18>;
> >> reset-names = "spi";
> >> @@ -170,6 +175,22 @@
> >> pinctrl-0 = <&spi_pins>;
> >> };
> >> + spi1: spi at b40 {
> >> + compatible = "ralink,rt2880-spi";
> >> + reg = <0xb40 0x60>;
> >> +
> >> + resets = <&rstctrl 18>;
> >> + reset-names = "spi";
> >> +
> >> + #address-cells = <1>;
> >> + #size-cells = <1>;
> >> +
> >> + status = "disabled";
> >> +
> >> + pinctrl-names = "default";
> >> + pinctrl-0 = <&spi_cs1>;
> >> + };
> >> +
> >> uartlite at c00 {
> >> compatible = "ralink,mt7620a-uart",
> >> "ralink,rt2880-uart", "ns16550a";
> >> reg = <0xc00 0x100>;
> >> @@ -213,6 +234,13 @@
> >> };
> >> };
> >> + spi_cs1: spi1 {
> >> + spi1 {
> >> + ralink,group = "spi_cs1";
> >> + ralink,function = "spi_cs1";
> >> + };
> >> + };
> >> +
> >> uartlite_pins: uartlite {
> >> uart {
> >> ralink,group = "uartlite";
> >> diff --git a/target/linux/ramips/dts/rt3050.dtsi
> >> b/target/linux/ramips/dts/rt3050.dtsi
> >> index 27e4179..7f0fb4a 100644
> >> --- a/target/linux/ramips/dts/rt3050.dtsi
> >> +++ b/target/linux/ramips/dts/rt3050.dtsi
> >> @@ -13,6 +13,10 @@
> >> bootargs = "console=ttyS0,57600";
> >> };
> >> + aliases {
> >> + spi0 = &spi0;
> >> + };
> >> +
> >> cpuintc: cpuintc at 0 {
> >> #address-cells = <0>;
> >> #interrupt-cells = <1>;
> >> @@ -144,7 +148,7 @@
> >> status = "disabled";
> >> };
> >> - spi at b00 {
> >> + spi0: spi at b00 {
> >> compatible = "ralink,rt3050-spi", "ralink,rt2880-spi";
> >> reg = <0xb00 0x100>;
> >> diff --git a/target/linux/ramips/dts/rt3352.dtsi
> >> b/target/linux/ramips/dts/rt3352.dtsi
> >> index b04845c..ffb9336 100644
> >> --- a/target/linux/ramips/dts/rt3352.dtsi
> >> +++ b/target/linux/ramips/dts/rt3352.dtsi
> >> @@ -20,6 +20,11 @@
> >> compatible = "mti,cpu-interrupt-controller";
> >> };
> >> + aliases {
> >> + spi0 = &spi0;
> >> + spi1 = &spi1;
> >> + };
> >> +
> >> palmbus at 10000000 {
> >> compatible = "palmbus";
> >> reg = <0x10000000 0x200000>;
> >> @@ -140,9 +145,9 @@
> >> status = "disabled";
> >> };
> >> - spi at b00 {
> >> + spi0: spi at b00 {
> >> compatible = "ralink,rt3352-spi", "ralink,rt2880-spi";
> >> - reg = <0xb00 0x100>;
> >> + reg = <0xb00 0x40>;
> >> #address-cells = <1>;
> >> #size-cells = <0>;
> >> @@ -155,6 +160,21 @@
> >> status = "disabled";
> >> };
> >> + spi1: spi at b40 {
> >> + compatible = "ralink,rt3352-spi", "ralink,rt2880-spi";
> >> + reg = <0xb40 0x60>;
> >> + #address-cells = <1>;
> >> + #size-cells = <1>;
> >> +
> >> + resets = <&rstctrl 18>;
> >> + reset-names = "spi";
> >> +
> >> + pinctrl-names = "default";
> >> + pinctrl-0 = <&spi_cs1>;
> >> +
> >> + status = "disabled";
> >> + };
> >> +
> >> uartlite at c00 {
> >> compatible = "ralink,rt3352-uart", "ralink,rt2880-uart",
> >> "ns16550a";
> >> reg = <0xc00 0x100>;
> >> @@ -188,6 +208,13 @@
> >> };
> >> };
> >> + spi_cs1: spi1 {
> >> + spi1 {
> >> + ralink,group = "spi_cs1";
> >> + ralink,function = "spi_cs1";
> >> + };
> >> + };
> >> +
> >> uartlite_pins: uartlite {
> >> uart {
> >> ralink,group = "uartlite";
> >> diff --git a/target/linux/ramips/dts/rt3883.dtsi
> >> b/target/linux/ramips/dts/rt3883.dtsi
> >> index dc26782..6592b3b 100644
> >> --- a/target/linux/ramips/dts/rt3883.dtsi
> >> +++ b/target/linux/ramips/dts/rt3883.dtsi
> >> @@ -15,6 +15,7 @@
> >> aliases {
> >> spi0 = &spi0;
> >> + spi1 = &spi1;
> >> };
> >> cpuintc: cpuintc at 0 {
> >> @@ -166,7 +167,7 @@
> >> spi0: spi at b00 {
> >> compatible = "ralink,rt3883-spi", "ralink,rt2880-spi";
> >> - reg = <0xb00 0x100>;
> >> + reg = <0xb00 0x40>;
> >> #address-cells = <1>;
> >> #size-cells = <0>;
> >> @@ -179,6 +180,21 @@
> >> status = "disabled";
> >> };
> >> + spi1: spi at b40 {
> >> + compatible = "ralink,rt3883-spi", "ralink,rt2880-spi";
> >> + reg = <0xb40 0x60>;
> >> + #address-cells = <1>;
> >> + #size-cells = <0>;
> >> +
> >> + resets = <&rstctrl 18>;
> >> + reset-names = "spi";
> >> +
> >> + pinctrl-names = "default";
> >> + pinctrl-0 = <&spi_cs1>;
> >> +
> >> + status = "disabled";
> >> + };
> >> +
> >> uartlite at c00 {
> >> compatible = "ralink,rt3883-uart", "ralink,rt2880-uart",
> >> "ns16550a";
> >> reg = <0xc00 0x100>;
> >> @@ -212,6 +228,13 @@
> >> };
> >> };
> >> + spi_cs1: spi1 {
> >> + spi1 {
> >> + ralink,group = "spi_cs1";
> >> + ralink,function = "spi_cs1";
> >> + };
> >> + };
> >> +
> >> uartlite_pins: uartlite {
> >> uart {
> >> ralink,group = "uartlite";
> >> diff --git a/target/linux/ramips/dts/rt5350.dtsi
> >> b/target/linux/ramips/dts/rt5350.dtsi
> >> index 8dd06c8..66775c2 100644
> >> --- a/target/linux/ramips/dts/rt5350.dtsi
> >> +++ b/target/linux/ramips/dts/rt5350.dtsi
> >> @@ -20,6 +20,11 @@
> >> compatible = "mti,cpu-interrupt-controller";
> >> };
> >> + aliases {
> >> + spi0 = &spi0;
> >> + spi1 = &spi1;
> >> + };
> >> +
> >> palmbus at 10000000 {
> >> compatible = "palmbus";
> >> reg = <0x10000000 0x200000>;
> >> @@ -150,9 +155,25 @@
> >> status = "disabled";
> >> };
> >> - spi at b00 {
> >> - compatible = "ralink,rt5350-spi";
> >> - reg = <0xb00 0x100>;
> >> + spi0: spi at b00 {
> >> + compatible = "ralink,rt5350-spi", "ralink,rt2880-spi";
> >> + reg = <0xb00 0x40>;
> >> +
> >> + resets = <&rstctrl 18>;
> >> + reset-names = "spi";
> >> +
> >> + #address-cells = <1>;
> >> + #size-cells = <1>;
> >> +
> >> + pinctrl-names = "default";
> >> + pinctrl-0 = <&spi_pins>;
> >> +
> >> + status = "disabled";
> >> + };
> >> +
> >> + spi1: spi at b40 {
> >> + compatible = "ralink,rt5350-spi", "ralink,rt2880-spi";
> >> + reg = <0xb40 0x60>;
> >> resets = <&rstctrl 18>;
> >> reset-names = "spi";
> >> @@ -161,7 +182,7 @@
> >> #size-cells = <0>;
> >> pinctrl-names = "default";
> >> - pinctrl-0 = <&spi_pins &spi_cs1>;
> >> + pinctrl-0 = <&spi_cs1>;
> >> status = "disabled";
> >> };
> >> diff --git
> >> a/target/linux/ramips/patches-3.18/0051-rt5350-spi-second-device.patch
> >> b/target/linux/ramips/patches-3.18/0051-rt5350-spi-second-device.patch
> >> deleted file mode 100644
> >> index 2da8151..0000000
> >> ---
> >> a/target/linux/ramips/patches-3.18/0051-rt5350-spi-second-device.patch
> >> +++ /dev/null
> >> @@ -1,368 +0,0 @@
> >> -From 27b11d4f1888e1a3d6d75b46d4d5a4d86fc03891 Mon Sep 17 00:00:00 2001
> >> -From: John Crispin <blogic at openwrt.org>
> >> -Date: Wed, 6 Aug 2014 10:53:40 +0200
> >> -Subject: [PATCH 51/57] SPI: MIPS: ralink: add rt5350 dual SPI support
> >> -
> >> -Signed-off-by: John Crispin <blogic at openwrt.org>
> >> -Signed-off-by: Felix Fietkau <nbd at openwrt.org>
> >> ----
> >> - drivers/spi/spi-rt2880.c | 218
> >> +++++++++++++++++++++++++++++++++++++++++++---
> >> - 1 file changed, 205 insertions(+), 13 deletions(-)
> >> -
> >> ---- a/drivers/spi/spi-rt2880.c
> >> -+++ b/drivers/spi/spi-rt2880.c
> >> -@@ -21,19 +21,25 @@
> >> - #include <linux/io.h>
> >> - #include <linux/reset.h>
> >> - #include <linux/spi/spi.h>
> >> -+#include <linux/of_device.h>
> >> - #include <linux/platform_device.h>
> >> -
> >> -+#include <ralink_regs.h>
> >> -+
> >> -+#define SPI_BPW_MASK(bits) BIT((bits) - 1)
> >> -+
> >> - #define DRIVER_NAME "spi-rt2880"
> >> --/* only one slave is supported*/
> >> --#define RALINK_NUM_CHIPSELECTS 1
> >> - /* in usec */
> >> - #define RALINK_SPI_WAIT_MAX_LOOP 2000
> >> -
> >> --#define RAMIPS_SPI_STAT 0x00
> >> --#define RAMIPS_SPI_CFG 0x10
> >> --#define RAMIPS_SPI_CTL 0x14
> >> --#define RAMIPS_SPI_DATA 0x20
> >> --#define RAMIPS_SPI_FIFO_STAT 0x38
> >> -+#define RAMIPS_SPI_DEV_OFFSET 0x40
> >> -+
> >> -+#define RAMIPS_SPI_STAT(cs) (0x00 + (cs *
> >> RAMIPS_SPI_DEV_OFFSET))
> >> -+#define RAMIPS_SPI_CFG(cs) (0x10 + (cs *
> RAMIPS_SPI_DEV_OFFSET))
> >> -+#define RAMIPS_SPI_CTL(cs) (0x14 + (cs *
> RAMIPS_SPI_DEV_OFFSET))
> >> -+#define RAMIPS_SPI_DATA(cs) (0x20 + (cs *
> >> RAMIPS_SPI_DEV_OFFSET))
> >> -+#define RAMIPS_SPI_FIFO_STAT(cs) (0x38 + (cs *
> >> RAMIPS_SPI_DEV_OFFSET))
> >> -+#define RAMIPS_SPI_ARBITER 0xF0
> >> -
> >> - /* SPISTAT register bit field */
> >> - #define SPISTAT_BUSY BIT(0)
> >> -@@ -63,6 +69,19 @@
> >> - /* SPIFIFOSTAT register bit field */
> >> - #define SPIFIFOSTAT_TXFULL BIT(17)
> >> -
> >> -+#define SPICTL_ARB_EN BIT(31)
> >> -+#define SPI1_POR BIT(1)
> >> -+#define SPI0_POR BIT(0)
> >> -+
> >> -+#define RT2880_SPI_MODE_BITS (SPI_CPOL | SPI_CPHA | SPI_LSB_FIRST
> >> | SPI_CS_HIGH)
> >> -+
> >> -+struct rt2880_spi;
> >> -+
> >> -+struct rt2880_spi_ops {
> >> -+ void (*init_hw)(struct rt2880_spi *rs);
> >> -+ int num_cs;
> >> -+};
> >> -+
> >> - struct rt2880_spi {
> >> - struct spi_master *master;
> >> - void __iomem *base;
> >> -@@ -70,6 +89,8 @@ struct rt2880_spi {
> >> - unsigned int speed;
> >> - struct clk *clk;
> >> - spinlock_t lock;
> >> -+
> >> -+ struct rt2880_spi_ops *ops;
> >> - };
> >> -
> >> - static inline struct rt2880_spi *spidev_to_rt2880_spi(struct
> >> spi_device *spi)
> >> -@@ -115,6 +136,7 @@ static inline void rt2880_spi_clrbits(st
> >> -
> >> - static int rt2880_spi_baudrate_set(struct spi_device *spi, unsigned
> >> int speed)
> >> - {
> >> -+ int cs = spi->chip_select;
> >> - struct rt2880_spi *rs = spidev_to_rt2880_spi(spi);
> >> - u32 rate;
> >> - u32 prescale;
> >> -@@ -142,9 +164,9 @@ static int rt2880_spi_baudrate_set(struc
> >> - prescale = ilog2(rate / 2);
> >> - dev_dbg(&spi->dev, "prescale:%u\n", prescale);
> >> -
> >> -- reg = rt2880_spi_read(rs, RAMIPS_SPI_CFG);
> >> -+ reg = rt2880_spi_read(rs, RAMIPS_SPI_CFG(cs));
> >> - reg = ((reg & ~SPICFG_SPICLK_PRESCALE_MASK) | prescale);
> >> -- rt2880_spi_write(rs, RAMIPS_SPI_CFG, reg);
> >> -+ rt2880_spi_write(rs, RAMIPS_SPI_CFG(cs), reg);
> >> - rs->speed = speed;
> >> - return 0;
> >> - }
> >> -@@ -157,7 +179,8 @@ rt2880_spi_setup_transfer(struct spi_dev
> >> - {
> >> - struct rt2880_spi *rs = spidev_to_rt2880_spi(spi);
> >> - unsigned int speed = spi->max_speed_hz;
> >> -- int rc;
> >> -+ int rc, cs = spi->chip_select;
> >> -+ u32 reg;
> >> -
> >> - if ((t != NULL) && t->speed_hz)
> >> - speed = t->speed_hz;
> >> -@@ -169,25 +192,68 @@ rt2880_spi_setup_transfer(struct spi_dev
> >> - return rc;
> >> - }
> >> -
> >> -+ reg = rt2880_spi_read(rs, RAMIPS_SPI_CFG(cs));
> >> -+
> >> -+ reg = (reg & ~SPICFG_MSBFIRST);
> >> -+ if (!(spi->mode & SPI_LSB_FIRST))
> >> -+ reg |= SPICFG_MSBFIRST;
> >> -+
> >> -+ reg = (reg & ~(SPICFG_SPICLKPOL | SPICFG_RXCLKEDGE_FALLING
> >> |SPICFG_TXCLKEDGE_FALLING));
> >> -+ switch(spi->mode & (SPI_CPOL | SPI_CPHA)) {
> >> -+ case SPI_MODE_0:
> >> -+ reg |= SPICFG_SPICLKPOL | SPICFG_TXCLKEDGE_FALLING;
> >> -+ break;
> >> -+ case SPI_MODE_1:
> >> -+ reg |= SPICFG_SPICLKPOL | SPICFG_RXCLKEDGE_FALLING;
> >> -+ break;
> >> -+ case SPI_MODE_2:
> >> -+ reg |= SPICFG_RXCLKEDGE_FALLING;
> >> -+ break;
> >> -+ case SPI_MODE_3:
> >> -+ reg |= SPICFG_TXCLKEDGE_FALLING;
> >> -+ break;
> >> -+ }
> >> -+
> >> -+ rt2880_spi_write(rs, RAMIPS_SPI_CFG(cs), reg);
> >> -+
> >> -+ reg = SPICTL_ARB_EN;
> >> -+ if (spi->mode & SPI_CS_HIGH) {
> >> -+ switch(cs) {
> >> -+ case 0:
> >> -+ reg |= SPI0_POR;
> >> -+ break;
> >> -+ case 1:
> >> -+ reg |= SPI1_POR;
> >> -+ break;
> >> -+ }
> >> -+ }
> >> -+
> >> -+ rt2880_spi_write(rs, RAMIPS_SPI_ARBITER, reg);
> >> -+
> >> - return 0;
> >> - }
> >> -
> >> --static void rt2880_spi_set_cs(struct rt2880_spi *rs, int enable)
> >> -+static void rt2880_spi_set_cs(struct spi_device *spi, int enable)
> >> - {
> >> -+ struct rt2880_spi *rs = spidev_to_rt2880_spi(spi);
> >> -+ int cs = spi->chip_select;
> >> -+
> >> - if (enable)
> >> -- rt2880_spi_clrbits(rs, RAMIPS_SPI_CTL, SPICTL_SPIENA);
> >> -+ rt2880_spi_clrbits(rs, RAMIPS_SPI_CTL(cs), SPICTL_SPIENA);
> >> - else
> >> -- rt2880_spi_setbits(rs, RAMIPS_SPI_CTL, SPICTL_SPIENA);
> >> -+ rt2880_spi_setbits(rs, RAMIPS_SPI_CTL(cs), SPICTL_SPIENA);
> >> - }
> >> -
> >> --static inline int rt2880_spi_wait_till_ready(struct rt2880_spi *rs)
> >> -+static inline int rt2880_spi_wait_till_ready(struct spi_device *spi)
> >> - {
> >> -+ struct rt2880_spi *rs = spidev_to_rt2880_spi(spi);
> >> -+ int cs = spi->chip_select;
> >> - int i;
> >> -
> >> - for (i = 0; i < RALINK_SPI_WAIT_MAX_LOOP; i++) {
> >> - u32 status;
> >> -
> >> -- status = rt2880_spi_read(rs, RAMIPS_SPI_STAT);
> >> -+ status = rt2880_spi_read(rs, RAMIPS_SPI_STAT(cs));
> >> - if ((status & SPISTAT_BUSY) == 0)
> >> - return 0;
> >> -
> >> -@@ -199,9 +265,10 @@ static inline int rt2880_spi_wait_till_r
> >> - }
> >> -
> >> - static unsigned int
> >> --rt2880_spi_write_read(struct spi_device *spi, struct spi_transfer
> >> *xfer)
> >> -+rt2880_spi_write_read(struct spi_device *spi, struct list_head
> >> *list, struct spi_transfer *xfer)
> >> - {
> >> - struct rt2880_spi *rs = spidev_to_rt2880_spi(spi);
> >> -+ int cs = spi->chip_select;
> >> - unsigned count = 0;
> >> - u8 *rx = xfer->rx_buf;
> >> - const u8 *tx = xfer->tx_buf;
> >> -@@ -213,9 +280,9 @@ rt2880_spi_write_read(struct spi_device
> >> -
> >> - if (tx) {
> >> - for (count = 0; count < xfer->len; count++) {
> >> -- rt2880_spi_write(rs, RAMIPS_SPI_DATA, tx[count]);
> >> -- rt2880_spi_setbits(rs, RAMIPS_SPI_CTL, SPICTL_STARTWR);
> >> -- err = rt2880_spi_wait_till_ready(rs);
> >> -+ rt2880_spi_write(rs, RAMIPS_SPI_DATA(cs), tx[count]);
> >> -+ rt2880_spi_setbits(rs, RAMIPS_SPI_CTL(cs),
> SPICTL_STARTWR);
> >> -+ err = rt2880_spi_wait_till_ready(spi);
> >> - if (err) {
> >> - dev_err(&spi->dev, "TX failed, err=%d\n", err);
> >> - goto out;
> >> -@@ -225,13 +292,13 @@ rt2880_spi_write_read(struct spi_device
> >> -
> >> - if (rx) {
> >> - for (count = 0; count < xfer->len; count++) {
> >> -- rt2880_spi_setbits(rs, RAMIPS_SPI_CTL, SPICTL_STARTRD);
> >> -- err = rt2880_spi_wait_till_ready(rs);
> >> -+ rt2880_spi_setbits(rs, RAMIPS_SPI_CTL(cs),
> SPICTL_STARTRD);
> >> -+ err = rt2880_spi_wait_till_ready(spi);
> >> - if (err) {
> >> - dev_err(&spi->dev, "RX failed, err=%d\n", err);
> >> - goto out;
> >> - }
> >> -- rx[count] = (u8) rt2880_spi_read(rs, RAMIPS_SPI_DATA);
> >> -+ rx[count] = (u8) rt2880_spi_read(rs, RAMIPS_SPI_DATA(cs));
> >> - }
> >> - }
> >> -
> >> -@@ -280,25 +347,25 @@ static int rt2880_spi_transfer_one_messa
> >> - }
> >> -
> >> - if (!cs_active) {
> >> -- rt2880_spi_set_cs(rs, 1);
> >> -+ rt2880_spi_set_cs(spi, 1);
> >> - cs_active = 1;
> >> - }
> >> -
> >> - if (t->len)
> >> -- m->actual_length += rt2880_spi_write_read(spi, t);
> >> -+ m->actual_length += rt2880_spi_write_read(spi,
> >> &m->transfers, t);
> >> -
> >> - if (t->delay_usecs)
> >> - udelay(t->delay_usecs);
> >> -
> >> - if (t->cs_change) {
> >> -- rt2880_spi_set_cs(rs, 0);
> >> -+ rt2880_spi_set_cs(spi, 0);
> >> - cs_active = 0;
> >> - }
> >> - }
> >> -
> >> - msg_done:
> >> - if (cs_active)
> >> -- rt2880_spi_set_cs(rs, 0);
> >> -+ rt2880_spi_set_cs(spi, 0);
> >> -
> >> - m->status = status;
> >> - spi_finalize_current_message(master);
> >> -@@ -311,7 +378,7 @@ static int rt2880_spi_setup(struct spi_d
> >> - struct rt2880_spi *rs = spidev_to_rt2880_spi(spi);
> >> -
> >> - if ((spi->max_speed_hz == 0) ||
> >> -- (spi->max_speed_hz > (rs->sys_freq / 2)))
> >> -+ (spi->max_speed_hz > (rs->sys_freq / 2)))
> >> - spi->max_speed_hz = (rs->sys_freq / 2);
> >> -
> >> - if (spi->max_speed_hz < (rs->sys_freq / 128)) {
> >> -@@ -328,14 +395,47 @@ static int rt2880_spi_setup(struct spi_d
> >> -
> >> - static void rt2880_spi_reset(struct rt2880_spi *rs)
> >> - {
> >> -- rt2880_spi_write(rs, RAMIPS_SPI_CFG,
> >> -+ rt2880_spi_write(rs, RAMIPS_SPI_CFG(0),
> >> - SPICFG_MSBFIRST | SPICFG_TXCLKEDGE_FALLING |
> >> - SPICFG_SPICLK_DIV16 | SPICFG_SPICLKPOL);
> >> -- rt2880_spi_write(rs, RAMIPS_SPI_CTL, SPICTL_HIZSDO |
> >> SPICTL_SPIENA);
> >> -+ rt2880_spi_write(rs, RAMIPS_SPI_CTL(0), SPICTL_HIZSDO |
> >> SPICTL_SPIENA);
> >> - }
> >> -
> >> -+static void rt5350_spi_reset(struct rt2880_spi *rs)
> >> -+{
> >> -+ int cs;
> >> -+
> >> -+ rt2880_spi_write(rs, RAMIPS_SPI_ARBITER,
> >> -+ SPICTL_ARB_EN);
> >> -+
> >> -+ for (cs = 0; cs < rs->ops->num_cs; cs++) {
> >> -+ rt2880_spi_write(rs, RAMIPS_SPI_CFG(cs),
> >> -+ SPICFG_MSBFIRST | SPICFG_TXCLKEDGE_FALLING |
> >> -+ SPICFG_SPICLK_DIV16 | SPICFG_SPICLKPOL);
> >> -+ rt2880_spi_write(rs, RAMIPS_SPI_CTL(cs), SPICTL_HIZSDO |
> >> SPICTL_SPIENA);
> >> -+ }
> >> -+}
> >> -+
> >> -+static struct rt2880_spi_ops spi_ops[] = {
> >> -+ {
> >> -+ .init_hw = rt2880_spi_reset,
> >> -+ .num_cs = 1,
> >> -+ }, {
> >> -+ .init_hw = rt5350_spi_reset,
> >> -+ .num_cs = 2,
> >> -+ },
> >> -+};
> >> -+
> >> -+static const struct of_device_id rt2880_spi_match[] = {
> >> -+ { .compatible = "ralink,rt2880-spi", .data = &spi_ops[0]},
> >> -+ { .compatible = "ralink,rt5350-spi", .data = &spi_ops[1]},
> >> -+ {},
> >> -+};
> >> -+MODULE_DEVICE_TABLE(of, rt2880_spi_match);
> >> -+
> >> - static int rt2880_spi_probe(struct platform_device *pdev)
> >> - {
> >> -+ const struct of_device_id *match;
> >> - struct spi_master *master;
> >> - struct rt2880_spi *rs;
> >> - unsigned long flags;
> >> -@@ -343,6 +443,12 @@ static int rt2880_spi_probe(struct platf
> >> - struct resource *r;
> >> - int status = 0;
> >> - struct clk *clk;
> >> -+ struct rt2880_spi_ops *ops;
> >> -+
> >> -+ match = of_match_device(rt2880_spi_match, &pdev->dev);
> >> -+ if (!match)
> >> -+ return -EINVAL;
> >> -+ ops = (struct rt2880_spi_ops *)match->data;
> >> -
> >> - r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
> >> - base = devm_ioremap_resource(&pdev->dev, r);
> >> -@@ -366,14 +472,13 @@ static int rt2880_spi_probe(struct platf
> >> - return -ENOMEM;
> >> - }
> >> -
> >> -- /* we support only mode 0, and no options */
> >> -- master->mode_bits = 0;
> >> -+ master->mode_bits = RT2880_SPI_MODE_BITS;
> >> -
> >> - master->setup = rt2880_spi_setup;
> >> - master->transfer_one_message = rt2880_spi_transfer_one_message;
> >> -- master->num_chipselect = RALINK_NUM_CHIPSELECTS;
> >> - master->bits_per_word_mask = SPI_BPW_MASK(8);
> >> - master->dev.of_node = pdev->dev.of_node;
> >> -+ master->num_chipselect = ops->num_cs;
> >> -
> >> - dev_set_drvdata(&pdev->dev, master);
> >> -
> >> -@@ -382,12 +487,13 @@ static int rt2880_spi_probe(struct platf
> >> - rs->clk = clk;
> >> - rs->master = master;
> >> - rs->sys_freq = clk_get_rate(rs->clk);
> >> -+ rs->ops = ops;
> >> - dev_dbg(&pdev->dev, "sys_freq: %u\n", rs->sys_freq);
> >> - spin_lock_irqsave(&rs->lock, flags);
> >> -
> >> - device_reset(&pdev->dev);
> >> -
> >> -- rt2880_spi_reset(rs);
> >> -+ rs->ops->init_hw(rs);
> >> -
> >> - return spi_register_master(master);
> >> - }
> >> -@@ -408,12 +514,6 @@ static int rt2880_spi_remove(struct plat
> >> -
> >> - MODULE_ALIAS("platform:" DRIVER_NAME);
> >> -
> >> --static const struct of_device_id rt2880_spi_match[] = {
> >> -- { .compatible = "ralink,rt2880-spi" },
> >> -- {},
> >> --};
> >> --MODULE_DEVICE_TABLE(of, rt2880_spi_match);
> >> --
> >> - static struct platform_driver rt2880_spi_driver = {
> >> - .driver = {
> >> - .name = DRIVER_NAME,
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.infradead.org/pipermail/openwrt-devel/attachments/20151123/194fc1fd/attachment.htm>
-------------- next part --------------
_______________________________________________
openwrt-devel mailing list
openwrt-devel at lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
More information about the openwrt-devel
mailing list