pflash = &pflash;
gpio0 = &gpio0;
gpio1 = &gpio1;
+ spi0 = &lsspi;
};
cpus {
#size-cells = <1>;
ranges;
compatible = "simple-bus";
+ interrupt-parent = <&periph_intc>;
periph_intc: interrupt-controller@fff8c00c {
compatible = "brcm,bcm6345-l1-intc";
interrupt-controller;
#interrupt-cells = <2>;
- interrupt-parent = <&periph_intc>;
interrupts = <25>, <26>, <27>, <28>;
};
gpio-controller;
#gpio-cells = <2>;
};
+
+ lsspi: spi@fff8c800 {
+ #address-cells = <1>;
+ #size-cells = <0>;
+ compatible = "brcm,bcm6358-spi";
+ reg = <0xfff8c800 0x70c>;
+ interrupts = <1>;
+ /* clocks = <&clkctl 9>; */
+ };
};
};
aliases {
gpio0 = &gpio0;
gpio1 = &gpio1;
+ spi1 = &hsspi;
};
cpus {
#size-cells = <1>;
ranges;
compatible = "simple-bus";
+ interrupt-parent = <&periph_intc>;
ext_intc: interrupt-controller@10000018 {
compatible = "brcm,bcm6318-ext-intc";
interrupt-controller;
#interrupt-cells = <2>;
- interrupt-parent = <&periph_intc>;
interrupts = <24>, <25>, <26>, <27>;
};
gpio-controller;
#gpio-cells = <2>;
};
+
+ hsspi: spi@10003000 {
+ #address-cells = <1>;
+ #size-cells = <0>;
+ compatible = "brcm,bcm6328-hsspi";
+ reg = <0x10003000 0x600>;
+ interrupts = <29>;
+ /* clocks = <&clkctl 25>; */
+ };
};
};
aliases {
gpio0 = &gpio0;
gpio1 = &gpio1;
+ spi0 = &lsspi;
+ spi1 = &hsspi;
};
cpus {
#size-cells = <1>;
ranges;
compatible = "simple-bus";
+ interrupt-parent = <&periph_intc>;
ext_intc: interrupt-controller@10000018 {
compatible = "brcm,bcm6345-ext-intc";
interrupt-controller;
#interrupt-cells = <2>;
- interrupt-parent = <&periph_intc>;
interrupts = <44>, <45>, <46>, <47>;
};
gpio-controller;
#gpio-cells = <2>;
};
+
+ lsspi: spi@10000800 {
+ #address-cells = <1>;
+ #size-cells = <0>;
+ compatible = "brcm,bcm6358-spi";
+ reg = <0x10000800 0x70c>;
+ interrupts = <80>;
+ /* clocks = <&clkctl 15>; */
+ };
+
+ hsspi: spi@10001000 {
+ #address-cells = <1>;
+ #size-cells = <0>;
+ compatible = "brcm,bcm6328-hsspi";
+ reg = <0x10001000 0x600>;
+ interrupts = <6>;
+ /* clocks = <&clkctl 16>; */
+ };
};
};
aliases {
gpio0 = &gpio0;
+ spi1 = &hsspi;
};
cpus {
#size-cells = <1>;
ranges;
compatible = "simple-bus";
+ interrupt-parent = <&periph_intc>;
ext_intc: interrupt-controller@10000018 {
compatible = "brcm,bcm6345-ext-intc";
interrupt-controller;
#interrupt-cells = <2>;
- interrupt-parent = <&periph_intc>;
interrupts = <24>, <25>, <26>, <27>;
};
interrupt-names = "gpio12", "gpio15",
"gpio23", "gpio24";
};
+
+ hsspi: spi@10001000 {
+ #address-cells = <1>;
+ #size-cells = <0>;
+ compatible = "brcm,bcm6328-hsspi";
+ reg = <0x10001000 0x600>;
+ interrupts = <29>;
+ /* clocks = <&clkctl 9>; */
+ };
};
};
aliases {
pflash = &pflash;
gpio0 = &gpio0;
+ spi0 = &lsspi;
};
cpus {
#size-cells = <1>;
ranges;
compatible = "simple-bus";
+ interrupt-parent = <&periph_intc>;
periph_intc: interrupt-controller@fffe000c {
compatible = "brcm,bcm6345-l1-intc";
ngpios = <8>;
};
+
+ lsspi: spi@fffe0c00 {
+ #address-cells = <1>;
+ #size-cells = <0>;
+ compatible = "brcm,bcm6348-spi";
+ reg = <0xfffe0c00 0x40>;
+ interrupts = <1>;
+ /* clocks = <&clkctl 9>; */
+ };
};
};
pflash = &pflash;
gpio0 = &gpio0;
gpio1 = &gpio1;
+ spi0 = &lsspi;
};
cpus {
#size-cells = <1>;
ranges;
compatible = "simple-bus";
+ interrupt-parent = <&periph_intc>;
periph_intc: interrupt-controller@fffe000c {
compatible = "brcm,bcm6345-l1-intc";
gpio-controller;
#gpio-cells = <2>;
};
+
+ lsspi: spi@fffe0c00 {
+ #address-cells = <1>;
+ #size-cells = <0>;
+ compatible = "brcm,bcm6348-spi";
+ reg = <0xfffe0c00 0x40>;
+ interrupts = <1>;
+ /* clocks = <&clkctl 9>; */
+
+ };
};
};
pflash = &pflash;
gpio0 = &gpio0;
gpio1 = &gpio1;
+ spi0 = &lsspi;
};
cpus {
#size-cells = <1>;
ranges;
compatible = "simple-bus";
+ interrupt-parent = <&periph_intc>;
periph_intc: interrupt-controller@fffe000c {
compatible = "brcm,bcm6345-l1-intc";
interrupt-controller;
#interrupt-cells = <2>;
- interrupt-parent = <&periph_intc>;
interrupts = <25>, <26>, <27>, <28>;
};
interrupt-controller;
#interrupt-cells = <2>;
- interrupt-parent = <&periph_intc>;
interrupts = <20>, <21>;
};
gpio-controller;
#gpio-cells = <2>;
};
+
+ lsspi: spi@fffe0800 {
+ #address-cells = <1>;
+ #size-cells = <0>;
+ compatible = "brcm,bcm6358-spi";
+ reg = <0xfffe0800 0x70c>;
+ interrupts = <1>;
+ /* clocks = <&clkctl 9>; */
+ };
};
};
aliases {
gpio0 = &gpio0;
gpio1 = &gpio1;
+ spi0 = &lsspi;
+ spi1 = &hsspi;
};
cpus {
#size-cells = <1>;
ranges;
compatible = "simple-bus";
+ interrupt-parent = <&periph_intc>;
ext_intc: interrupt-controller@10000018 {
compatible = "brcm,bcm6345-ext-intc";
interrupt-controller;
#interrupt-cells = <2>;
- interrupt-parent = <&periph_intc>;
interrupts = <40>, <41>, <42>, <43>;
};
interrupt-names = "gpio24", "gpio25",
"gpio26", "gpio27";
};
+
+ lsspi: spi@10000800 {
+ #address-cells = <1>;
+ #size-cells = <0>;
+ compatible = "brcm,bcm6358-spi";
+ reg = <0x10000800 0x70c>;
+ interrupts = <2>;
+ /* clocks = <&clkctl 15>; */
+ };
+
+ hsspi: spi@10001000 {
+ #address-cells = <1>;
+ #size-cells = <0>;
+ compatible = "brcm,bcm6328-hsspi";
+ reg = <0x10001000 0x600>;
+ interrupts = <5>;
+ /* clocks = <&clkctl 16>; */
+ };
};
};
pflash = &pflash;
gpio0 = &gpio0;
gpio1 = &gpio1;
+ spi0 = &lsspi;
};
cpus {
#size-cells = <1>;
ranges;
compatible = "simple-bus";
+ interrupt-parent = <&periph_intc>;
ext_intc0: interrupt-controller@10000018 {
compatible = "brcm,bcm6345-ext-intc";
interrupt-controller;
#interrupt-cells = <2>;
- interrupt-parent = <&periph_intc>;
interrupts = <20>, <21>, <22>, <23>;
};
interrupt-controller;
#interrupt-cells = <2>;
- interrupt-parent = <&periph_intc>;
interrupts = <24>, <25>;
};
gpio-controller;
#gpio-cells = <2>;
};
+
+ lsspi: spi@10000800 {
+ #address-cells = <1>;
+ #size-cells = <0>;
+ compatible = "brcm,bcm6358-spi";
+ reg = <0x10000800 0x70c>;
+ interrupts = <1>;
+ /* clocks = <&clkctl 9>; */
+ };
};
pflash: nor@18000000 {
--- /dev/null
+From 0a0c39044332a75eaf4a3c5654079df953b0d839 Mon Sep 17 00:00:00 2001
+From: Jonas Gorski <jogo@openwrt.org>
+Date: Mon, 7 Sep 2015 21:00:38 +0200
+Subject: [PATCH 3/8] spi/bcm63xx: document device tree bindings
+
+Add documentation for the bindings of the low speed SPI controller found
+on most bcm63xx SoCs.
+
+Signed-off-by: Jonas Gorski <jogo@openwrt.org>
+---
+ .../devicetree/bindings/spi/spi-bcm63xx.txt | 33 ++++++++++++++++++++++
+ 1 file changed, 33 insertions(+)
+ create mode 100644 Documentation/devicetree/bindings/spi/spi-bcm63xx.txt
+
+--- /dev/null
++++ b/Documentation/devicetree/bindings/spi/spi-bcm63xx.txt
+@@ -0,0 +1,33 @@
++Binding for Broadcom BCM6348/BCM6358 SPI controller
++
++Required properties:
++- compatible: must contain one of "brcm,bcm6348-spi", "brcm,bcm6358-spi".
++- reg: Base address and size of the controllers memory area.
++- interrupts: Interrupt for the SPI block.
++- clocks: phandle of the SPI clock.
++- clock-names: has to be "spi".
++- #address-cells: <1>, as required by generic SPI binding.
++- #size-cells: <0>, also as required by generic SPI binding.
++
++Optional properties:
++- num-cs: some controllers have less than 8 cs signals. Defaults to 8
++ if absent.
++
++Child nodes as per the generic SPI binding.
++
++Example:
++
++ spi@10000800 {
++ compatible = "brcm,bcm6368-spi", "brcm,bcm6358-spi";
++ reg = <0x10000800 0x70c>;
++
++ interrupts = <1>;
++
++ clocks = <&clkctl 9>;
++ clock-names = "spi";
++
++ num-cs = <5>;
++
++ #address-cells = <1>;
++ #size-cells = <0>;
++ };
--- /dev/null
+From 3353228a04a004ec67073871f40cf58dc4e209aa Mon Sep 17 00:00:00 2001
+From: Jonas Gorski <jonas.gorski@gmail.com>
+Date: Mon, 7 Sep 2015 21:01:38 +0200
+Subject: [PATCH 4/8] spi/bcm63xx: add support for probing through devicetree
+
+Add required binding support to probe through device tree.
+
+Use the compatible instead of the resource size for identifiying the
+block type, and allow reducing the number of cs lines through OF.
+
+Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
+---
+ drivers/spi/spi-bcm63xx.c | 42 ++++++++++++++++++++++++++++++++++++------
+ 1 file changed, 36 insertions(+), 6 deletions(-)
+
+--- a/drivers/spi/spi-bcm63xx.c
++++ b/drivers/spi/spi-bcm63xx.c
+@@ -26,6 +26,7 @@
+ #include <linux/completion.h>
+ #include <linux/err.h>
+ #include <linux/pm_runtime.h>
++#include <linux/of.h>
+
+ /* BCM 6338/6348 SPI core */
+ #define SPI_6348_RSET_SIZE 64
+@@ -485,21 +486,48 @@ static const struct platform_device_id b
+ },
+ };
+
++static const struct of_device_id bcm63xx_spi_of_match[] = {
++ { .compatible = "brcm,bcm6348-spi", .data = &bcm6348_spi_reg_offsets },
++ { .compatible = "brcm,bcm6358-spi", .data = &bcm6358_spi_reg_offsets },
++ { },
++};
++
+ static int bcm63xx_spi_probe(struct platform_device *pdev)
+ {
+ struct resource *r;
+ const unsigned long *bcm63xx_spireg;
+ struct device *dev = &pdev->dev;
+- int irq;
++ int irq, bus_num;
+ struct spi_master *master;
+ struct clk *clk;
+ struct bcm63xx_spi *bs;
+ int ret;
++ u32 num_cs = BCM63XX_SPI_MAX_CS;
+
+- if (!pdev->id_entry->driver_data)
+- return -EINVAL;
++ if (dev->of_node) {
++ const struct of_device_id *match;
+
+- bcm63xx_spireg = (const unsigned long *)pdev->id_entry->driver_data;
++ match = of_match_node(bcm63xx_spi_of_match, dev->of_node);
++ if (!match)
++ return -EINVAL;
++ bcm63xx_spireg = match->data;
++
++ of_property_read_u32(dev->of_node, "num-cs", &num_cs);
++ if (num_cs > BCM63XX_SPI_MAX_CS) {
++ dev_warn(dev, "unsupported number of cs (%i), reducing to 8\n",
++ num_cs);
++ num_cs = BCM63XX_SPI_MAX_CS;
++ }
++
++ bus_num = -1;
++ } else if (pdev->id_entry->driver_data) {
++ const struct platform_device_id *match = pdev->id_entry;
++
++ bcm63xx_spireg = (const unsigned long *)match->driver_data;
++ bus_num = BCM63XX_SPI_BUS_NUM;
++ } else {
++ return -EINVAL;
++ }
+
+ irq = platform_get_irq(pdev, 0);
+ if (irq < 0) {
+@@ -544,8 +572,9 @@ static int bcm63xx_spi_probe(struct plat
+ goto out_err;
+ }
+
+- master->bus_num = BCM63XX_SPI_BUS_NUM;
+- master->num_chipselect = BCM63XX_SPI_MAX_CS;
++ master->dev.of_node = dev->of_node;
++ master->bus_num = bus_num;
++ master->num_chipselect = num_cs;
+ master->transfer_one_message = bcm63xx_spi_transfer_one;
+ master->mode_bits = MODEBITS;
+ master->bits_per_word_mask = SPI_BPW_MASK(8);
+@@ -634,6 +663,7 @@ static struct platform_driver bcm63xx_sp
+ .driver = {
+ .name = "bcm63xx-spi",
+ .pm = &bcm63xx_spi_pm_ops,
++ .of_match_table = bcm63xx_spi_of_match,
+ },
+ .id_table = bcm63xx_spi_dev_match,
+ .probe = bcm63xx_spi_probe,
--- /dev/null
+From 04a7ff202429476b165122c3e30b4eb65cfee540 Mon Sep 17 00:00:00 2001
+From: Jonas Gorski <jogo@openwrt.org>
+Date: Thu, 10 Sep 2015 14:52:32 +0200
+Subject: [PATCH 5/8] spi/bcm63xx-hsspi: document device tree bindings
+
+Add documentation for the bindings of the high speed SPI controller found
+on newer bcm63xx SoCs.
+
+Signed-off-by: Jonas Gorski <jogo@openwrt.org>
+---
+ .../devicetree/bindings/spi/spi-bcm63xx-hsspi.txt | 33 ++++++++++++++++++++++
+ 1 file changed, 33 insertions(+)
+ create mode 100644 Documentation/devicetree/bindings/spi/spi-bcm63xx-hsspi.txt
+
+--- /dev/null
++++ b/Documentation/devicetree/bindings/spi/spi-bcm63xx-hsspi.txt
+@@ -0,0 +1,33 @@
++Binding for Broadcom BCM6328 SPI controller
++
++Required properties:
++- compatible: must contain of "brcm,bcm6328-hsspi".
++- reg: Base address and size of the controllers memory area.
++- interrupts: Interrupt for the SPI block.
++- clocks: phandle of the SPI clock.
++- clock-names: has to be "hsspi".
++- #address-cells: <1>, as required by generic SPI binding.
++- #size-cells: <0>, also as required by generic SPI binding.
++
++Optional properties:
++- num-cs: some controllers have less than 8 cs signals. Defaults to 8
++ if absent.
++
++Child nodes as per the generic SPI binding.
++
++Example:
++
++ spi@10001000 {
++ compatible = "brcm,bcm6328-spi";
++ reg = <0x10001000 0x600>;
++
++ interrupts = <29>;
++
++ clocks = <&clkctl 9>;
++ clock-names = "hsspi";
++
++ num-cs = <2>;
++
++ #address-cells = <1>;
++ #size-cells = <0>;
++ };
--- /dev/null
+From ddc0e9cbe861920f143aac57f3b4c9e38e45fc99 Mon Sep 17 00:00:00 2001
+From: Jonas Gorski <jogo@openwrt.org>
+Date: Thu, 10 Sep 2015 14:53:53 +0200
+Subject: [PATCH 6/8] spi/bcm63xx-hsspi: add support for probing through
+ devicetree
+
+Add required binding support to probe through device tree.
+
+Signed-off-by: Jonas Gorski <jogo@openwrt.org>
+---
+ drivers/spi/spi-bcm63xx-hsspi.c | 26 +++++++++++++++++++++++---
+ 1 file changed, 23 insertions(+), 3 deletions(-)
+
+--- a/drivers/spi/spi-bcm63xx-hsspi.c
++++ b/drivers/spi/spi-bcm63xx-hsspi.c
+@@ -19,6 +19,7 @@
+ #include <linux/interrupt.h>
+ #include <linux/spi/spi.h>
+ #include <linux/mutex.h>
++#include <linux/of.h>
+
+ #define HSSPI_GLOBAL_CTRL_REG 0x0
+ #define GLOBAL_CTRL_CS_POLARITY_SHIFT 0
+@@ -91,6 +92,7 @@
+
+ #define HSSPI_MAX_SYNC_CLOCK 30000000
+
++#define HSSPI_SPI_MAX_CS 8
+ #define HSSPI_BUS_NUM 1 /* 0 is legacy SPI */
+
+ struct bcm63xx_hsspi {
+@@ -332,7 +334,7 @@ static int bcm63xx_hsspi_probe(struct pl
+ struct device *dev = &pdev->dev;
+ struct clk *clk;
+ int irq, ret;
+- u32 reg, rate;
++ u32 reg, rate, num_cs = HSSPI_SPI_MAX_CS;
+
+ irq = platform_get_irq(pdev, 0);
+ if (irq < 0) {
+@@ -374,8 +376,20 @@ static int bcm63xx_hsspi_probe(struct pl
+ mutex_init(&bs->bus_mutex);
+ init_completion(&bs->done);
+
+- master->bus_num = HSSPI_BUS_NUM;
+- master->num_chipselect = 8;
++ if (dev->of_node) {
++ master->dev.of_node = dev->of_node;
++
++ of_property_read_u32(dev->of_node, "num-cs", &num_cs);
++ if (num_cs > 8) {
++ dev_warn(dev, "unsupported number of cs (%i), reducing to 8\n",
++ num_cs);
++ num_cs = HSSPI_SPI_MAX_CS;
++ }
++ } else {
++ master->bus_num = HSSPI_BUS_NUM;
++ }
++
++ master->num_chipselect = num_cs;
+ master->setup = bcm63xx_hsspi_setup;
+ master->transfer_one_message = bcm63xx_hsspi_transfer_one;
+ master->mode_bits = SPI_CPOL | SPI_CPHA | SPI_CS_HIGH |
+@@ -461,10 +475,16 @@ static int bcm63xx_hsspi_resume(struct d
+ static SIMPLE_DEV_PM_OPS(bcm63xx_hsspi_pm_ops, bcm63xx_hsspi_suspend,
+ bcm63xx_hsspi_resume);
+
++static const struct of_device_id bcm63xx_hsspi_of_match[] = {
++ { .compatible = "brcm,bcm6328-hsspi", },
++ { },
++};
++
+ static struct platform_driver bcm63xx_hsspi_driver = {
+ .driver = {
+ .name = "bcm63xx-hsspi",
+ .pm = &bcm63xx_hsspi_pm_ops,
++ .of_match_table = bcm63xx_hsspi_of_match,
+ },
+ .probe = bcm63xx_hsspi_probe,
+ .remove = bcm63xx_hsspi_remove,
--- /dev/null
+From 39d2882058345b5994680b8731848a0343878019 Mon Sep 17 00:00:00 2001
+From: Jonas Gorski <jonas.gorski@gmail.com>
+Date: Sat, 4 Feb 2017 12:58:50 +0100
+Subject: [PATCH 7/8] MIPS: BCM63XX: do not register SPI controllers
+
+We now register them through DT, so no need to keep them here.
+
+Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
+---
+ arch/mips/bcm63xx/boards/board_bcm963xx.c | 7 -------
+ 1 file changed, 7 deletions(-)
+
+--- a/arch/mips/bcm63xx/boards/board_common.c
++++ b/arch/mips/bcm63xx/boards/board_common.c
+@@ -29,9 +29,7 @@
+ #include <bcm63xx_dev_enet.h>
+ #include <bcm63xx_dev_dsp.h>
+ #include <bcm63xx_dev_flash.h>
+-#include <bcm63xx_dev_hsspi.h>
+ #include <bcm63xx_dev_pcmcia.h>
+-#include <bcm63xx_dev_spi.h>
+ #include <bcm63xx_dev_usb_ehci.h>
+ #include <bcm63xx_dev_usb_ohci.h>
+ #include <bcm63xx_dev_usb_usbd.h>
+@@ -250,10 +248,6 @@ int __init board_register_devices(void)
+ bcm63xx_register_fallback_sprom(&board.fallback_sprom)))
+ pr_err(PFX "failed to register fallback SPROM\n");
+
+- bcm63xx_spi_register();
+-
+- bcm63xx_hsspi_register();
+-
+ if (board.num_spis)
+ spi_register_board_info(board.spis, board.num_spis);
+
--- a/arch/mips/bcm63xx/boards/board_common.c
+++ b/arch/mips/bcm63xx/boards/board_common.c
-@@ -102,6 +102,8 @@ void __init board_early_setup(const stru
+@@ -100,6 +100,8 @@ void __init board_early_setup(const stru
if (BCMCPU_IS_6348())
val |= GPIO_MODE_6348_G3_EXT_MII |
GPIO_MODE_6348_G0_EXT_MII;
--- a/arch/mips/bcm63xx/dev-flash.c
+++ b/arch/mips/bcm63xx/dev-flash.c
-@@ -17,9 +17,12 @@
+@@ -17,9 +17,13 @@
#include <linux/mtd/partitions.h>
#include <linux/mtd/physmap.h>
#include <linux/mtd/spi-nor.h>
++#include <linux/of.h>
+#include <linux/spi/spi.h>
+#include <linux/spi/flash.h>
#include <bcm63xx_regs.h>
#include <bcm63xx_io.h>
-@@ -66,6 +69,21 @@ void __init bcm63xx_flash_force_phys_bas
+@@ -66,6 +70,46 @@ void __init bcm63xx_flash_force_phys_bas
mtd_resources[0].end = end;
}
+ .platform_data = &bcm63xx_flash_data,
+ },
+};
++
++static void bcm63xx_of_update_spi_flash_speed(struct device_node *np,
++ unsigned int new_hz)
++{
++ struct property *max_hz;
++ __be32 *hz;
++
++ max_hz = kzalloc(sizeof(*max_hz) + sizeof(*hz), GFP_KERNEL);
++ if (!max_hz)
++ return;
++
++ max_hz->name = kstrdup("spi-max-frequency", GFP_KERNEL);
++ if (!max_hz->name) {
++ kfree(max_hz);
++ return;
++ }
++
++ max_hz->value = max_hz + 1;
++ max_hz->length = sizeof(*hz);
++
++ hz = max_hz->value;
++ *hz = cpu_to_be32(new_hz);
++
++ of_update_property(np, max_hz);
++}
+
static int __init bcm63xx_detect_flash_type(void)
{
u32 val;
-@@ -73,9 +91,15 @@ static int __init bcm63xx_detect_flash_t
+@@ -73,9 +117,15 @@ static int __init bcm63xx_detect_flash_t
switch (bcm63xx_get_cpu_id()) {
case BCM6318_CPU_ID:
/* only support serial flash */
if (val & STRAPBUS_6328_BOOT_SEL_SERIAL)
return BCM63XX_FLASH_TYPE_SERIAL;
else
-@@ -94,12 +118,20 @@ static int __init bcm63xx_detect_flash_t
+@@ -94,12 +144,20 @@ static int __init bcm63xx_detect_flash_t
return BCM63XX_FLASH_TYPE_SERIAL;
case BCM6362_CPU_ID:
val = bcm_misc_readl(MISC_STRAPBUS_6362_REG);
switch (val & STRAPBUS_6368_BOOT_SEL_MASK) {
case STRAPBUS_6368_BOOT_SEL_NAND:
return BCM63XX_FLASH_TYPE_NAND;
-@@ -110,6 +142,11 @@ static int __init bcm63xx_detect_flash_t
+@@ -110,6 +168,11 @@ static int __init bcm63xx_detect_flash_t
}
case BCM63268_CPU_ID:
val = bcm_misc_readl(MISC_STRAPBUS_63268_REG);
if (val & STRAPBUS_63268_BOOT_SEL_SERIAL)
return BCM63XX_FLASH_TYPE_SERIAL;
else
-@@ -195,8 +232,14 @@ int __init bcm63xx_flash_register(void)
+@@ -176,6 +239,7 @@ void __init bcm63xx_flash_detect(void)
+
+ int __init bcm63xx_flash_register(void)
+ {
++ struct device_node *np;
+ u32 val;
+
+ switch (flash_type) {
+@@ -195,8 +259,21 @@ int __init bcm63xx_flash_register(void)
return platform_device_register(&mtd_dev);
case BCM63XX_FLASH_TYPE_SERIAL:
- pr_warn("unsupported serial flash detected\n");
- return -ENODEV;
-+ if (BCMCPU_IS_6318() || BCMCPU_IS_6328() || BCMCPU_IS_6362() ||
-+ BCMCPU_IS_63268()) {
-+ bcm63xx_spi_flash_info[0].bus_num = 1;
-+ bcm63xx_spi_flash_info[0].mode = SPI_RX_DUAL;
-+ }
++ np = of_find_compatible_node(NULL, NULL, "jedec,spi-nor");
++ if (np) {
++ bcm63xx_of_update_spi_flash_speed(np, bcm63xx_spi_flash_info[0].max_speed_hz);
++ of_node_put(np);
++ return 0;
++ } else {
++ if (BCMCPU_IS_6318() || BCMCPU_IS_6328() ||
++ BCMCPU_IS_6362() || BCMCPU_IS_63268()) {
++ bcm63xx_spi_flash_info[0].bus_num = 1;
++ bcm63xx_spi_flash_info[0].mode = SPI_RX_DUAL;
++ }
+
-+ return spi_register_board_info(bcm63xx_spi_flash_info,
-+ ARRAY_SIZE(bcm63xx_spi_flash_info));
++ return spi_register_board_info(bcm63xx_spi_flash_info,
++ ARRAY_SIZE(bcm63xx_spi_flash_info));
++ }
case BCM63XX_FLASH_TYPE_NAND:
pr_warn("unsupported NAND flash detected\n");
return -ENODEV;
--- a/arch/mips/bcm63xx/boards/board_common.c
+++ b/arch/mips/bcm63xx/boards/board_common.c
-@@ -36,6 +36,7 @@
+@@ -34,6 +34,7 @@
#include <bcm63xx_dev_usb_ohci.h>
#include <bcm63xx_dev_usb_usbd.h>
#include <board_bcm963xx.h>
#include "board_common.h"
-@@ -191,6 +192,7 @@ static struct of_device_id of_ids[] = {
+@@ -189,6 +190,7 @@ static struct of_device_id of_ids[] = {
int __init board_register_devices(void)
{
int usbh_ports = 0;
#if CONFIG_OF
if (of_have_populated_dt()) {
-@@ -271,6 +273,10 @@ int __init board_register_devices(void)
+@@ -265,6 +267,10 @@ int __init board_register_devices(void)
board.ephy_reset_gpio_flags);
}
--- a/arch/mips/bcm63xx/dev-flash.c
+++ b/arch/mips/bcm63xx/dev-flash.c
-@@ -249,3 +249,8 @@ int __init bcm63xx_flash_register(void)
+@@ -283,3 +283,8 @@ int __init bcm63xx_flash_register(void)
return -ENODEV;
}
}
--- a/arch/mips/bcm63xx/boards/board_common.c
+++ b/arch/mips/bcm63xx/boards/board_common.c
-@@ -261,7 +261,7 @@ int __init board_register_devices(void)
+@@ -255,7 +255,7 @@ int __init board_register_devices(void)
if (board.num_spis)
spi_register_board_info(board.spis, board.num_spis);
bcm63xx_led_data.leds = board.leds;
--- a/arch/mips/bcm63xx/dev-flash.c
+++ b/arch/mips/bcm63xx/dev-flash.c
-@@ -38,12 +38,15 @@ static struct mtd_partition mtd_partitio
+@@ -39,12 +39,15 @@ static struct mtd_partition mtd_partitio
}
};
};
static struct resource mtd_resources[] = {
-@@ -71,6 +74,7 @@ void __init bcm63xx_flash_force_phys_bas
+@@ -72,6 +75,7 @@ void __init bcm63xx_flash_force_phys_bas
static struct flash_platform_data bcm63xx_flash_data = {
.part_probe_types = bcm63xx_part_types,
};
static struct spi_board_info bcm63xx_spi_flash_info[] = {
-@@ -211,9 +215,13 @@ void __init bcm63xx_flash_detect(void)
+@@ -237,10 +241,14 @@ void __init bcm63xx_flash_detect(void)
}
}
-int __init bcm63xx_flash_register(void)
+int __init bcm63xx_flash_register(int num_caldata, struct ath9k_caldata *caldata)
{
+ struct device_node *np;
u32 val;
+ unsigned int i;
+
return;
--- a/arch/mips/bcm63xx/boards/board_common.c
+++ b/arch/mips/bcm63xx/boards/board_common.c
-@@ -275,7 +275,8 @@ int __init board_register_devices(void)
+@@ -269,7 +269,8 @@ int __init board_register_devices(void)
/* register any fixups */
for (i = 0; i < board.has_caldata; i++)
--- a/arch/mips/bcm63xx/boards/board_common.c
+++ b/arch/mips/bcm63xx/boards/board_common.c
-@@ -276,7 +276,7 @@ int __init board_register_devices(void)
+@@ -270,7 +270,7 @@ int __init board_register_devices(void)
/* register any fixups */
for (i = 0; i < board.has_caldata; i++)
pci_enable_ath9k_fixup(board.caldata[i].slot, board.caldata[i].caldata_offset,
obj-y += boards/
--- a/arch/mips/bcm63xx/boards/board_common.c
+++ b/arch/mips/bcm63xx/boards/board_common.c
-@@ -37,6 +37,7 @@
+@@ -35,6 +35,7 @@
#include <bcm63xx_dev_usb_usbd.h>
#include <board_bcm963xx.h>
#include <pci_ath9k_fixup.h>
#include "board_common.h"
-@@ -274,9 +275,19 @@ int __init board_register_devices(void)
+@@ -268,9 +269,19 @@ int __init board_register_devices(void)
}
/* register any fixups */
}
--- a/arch/mips/bcm63xx/dev-flash.c
+++ b/arch/mips/bcm63xx/dev-flash.c
-@@ -215,7 +215,7 @@ void __init bcm63xx_flash_detect(void)
+@@ -241,7 +241,7 @@ void __init bcm63xx_flash_detect(void)
}
}
-int __init bcm63xx_flash_register(int num_caldata, struct ath9k_caldata *caldata)
+int __init bcm63xx_flash_register(int num_caldata, struct bcm63xx_caldata *caldata)
{
+ struct device_node *np;
u32 val;
- unsigned int i;
--- /dev/null
+++ b/arch/mips/bcm63xx/pci-rt2x00-fixup.c
@@ -0,0 +1,72 @@
cfe = boot_addr + BCM963XX_CFE_VERSION_OFFSET;
--- a/arch/mips/bcm63xx/dev-flash.c
+++ b/arch/mips/bcm63xx/dev-flash.c
-@@ -20,6 +20,7 @@
+@@ -21,6 +21,7 @@
#include <linux/spi/spi.h>
#include <linux/spi/flash.h>
#include <bcm63xx_cpu.h>
#include <bcm63xx_dev_flash.h>
#include <bcm63xx_dev_hsspi.h>
-@@ -234,6 +235,13 @@ int __init bcm63xx_flash_register(int nu
+@@ -261,6 +262,13 @@ int __init bcm63xx_flash_register(int nu
val = bcm_mpi_readl(MPI_CSBASE_REG(0));
val &= MPI_CSBASE_BASE_MASK;
+obj-$(CONFIG_BOARD_LIVEBOX) += board_livebox.o
--- a/arch/mips/bcm63xx/boards/board_common.c
+++ b/arch/mips/bcm63xx/boards/board_common.c
-@@ -59,7 +59,7 @@ void __init board_prom_init(void)
+@@ -57,7 +57,7 @@ void __init board_prom_init(void)
if (fw_arg3 == CFE_EPTSEAL)
board_bcm963xx_init();
else
#endif
--- a/arch/mips/bcm63xx/boards/board_common.c
+++ b/arch/mips/bcm63xx/boards/board_common.c
-@@ -86,12 +86,25 @@ void __init board_early_setup(const stru
+@@ -84,12 +84,25 @@ void __init board_early_setup(const stru
bcm63xx_pci_enabled = 1;
if (BCMCPU_IS_6348())
val |= GPIO_MODE_6348_G2_PCI;
projects / openwrt / staging / noltari.git / commitdiff