add preliminary support for 3.6 kernel
authorFlorian Fainelli <florian@openwrt.org>
Thu, 25 Oct 2012 21:16:51 +0000 (21:16 +0000)
committerFlorian Fainelli <florian@openwrt.org>
Thu, 25 Oct 2012 21:16:51 +0000 (21:16 +0000)
SVN-Revision: 33936

105 files changed:
target/linux/brcm63xx/config-3.6 [new file with mode: 0644]
target/linux/brcm63xx/patches-3.6/101-MTD-bcm63xxpart-remove-unused-variable.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.6/102-MTD-bcm63xxpart-merge-sparelen-calculation.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.6/103-MTD-bcm63xxpart-make-fixed-part-length-calculation-m.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.6/104-MTD-bcm63xxpart-move-the-last-curpart-to-its-correct.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.6/105-MTD-bcm63xxpart-use-correct-printk-format-for-partit.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.6/201-SPI-Allow-specifying-the-parsers-for-SPI-flash.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.6/202-MTD-DEVICES-m25p80-use-parsers-if-provided-in-flash-.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.6/203-MTD-DEVICES-m25p80-add-support-for-limiting-reads.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.6/300-reset_buttons.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.6/301-led_count.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.6/302-extended-platform-devices.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.6/303-spi-board-info.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.6/304-boardid_fixup.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.6/305-missing_ext_irq_bits.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.6/306-Revert-MIPS-BCM63XX-Call-board_register_device-from-.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.6/307-MIPS-BCM63XX-allow-second-UART-on-BCM6328.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.6/308-MIPS-BCM63XX-expose-the-HS-SPI-clock.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.6/309-MIPS-BCM63XX-add-HSSPI-register-definitions.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.6/310-board_leds_naming.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.6/311-cfe_version_mod.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.6/312-MIPS-BCM63XX-add-basic-BCM6362-support.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.6/313-MIPS-BCM63XX-enable-pcie-for-BCM6362.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.6/400-ohci-add-driver-for-bcm63xx-integrated-controller.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.6/401-MIPS-BCM63XX-register-ohci-device.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.6/402-ehci-add-driver-for-bcm63xx-integrated-controller.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.6/403-MIPS-BCM63XX-register-ehci-device.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.6/404-bcm963xx_flashmap.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.6/405-bcm963xx_real_rootfs_length.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.6/406_bcm63xx_enet_vlan_incoming_fixed.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.6/408-6358-enet1-external-mii-clk.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.6/410-NET-bcm63xx_enet-move-phy_-dis-connect-into-probe-re.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.6/411-bcm63xx_enet-implement-reset_autoneg-ethtool.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.6/412-bcm63xx_enet-use-resource_size.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.6/413-bcm63xx_enet-disable-clock-when-uninitializing-devic.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.6/414-bcm63xx_enet-split-dma-registers-access.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.6/415-bcm63xx_enet-add-support-for-bcm6368-internal-ethern.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.6/416-bcm63xx_enet-reset-port-link-state-in-bcm_enetsw_ope.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.6/417-bcm63xx_enet-don-t-overwrite-settings-when-setting-d.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.6/418-bcm63xx_enet-store-the-number-of-ports-instead-of-ha.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.6/419-bcm63xx_enet-store-is_sw-in-a-variable-instead-of-ch.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.6/420-BCM63XX-allow-enetsw-without-tx-irq.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.6/421-BCM63XX-use-port-id-for-deciding-external-phy.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.6/422-bcm63xx_enet-enable-rgmii-clock-on-external-ports.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.6/423-bcm63xx_enet-fix-lockup-on-BCM6328.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.6/424-MIPS-BCM63XX-add-support-for-BCM6328-in-bcm_enetsw.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.6/425-MIPS-BCM63XX-add-HS-SPI-platform-device-and-register.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.6/426-SPI-MIPS-BCM63XX-Add-HS-SPI-driver.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.6/427-MIPS-BCM63XX-Register-SPI-flash-if-present.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.6/428-MIPS-BCM63XX-add-flash-detection-for-BCM6362.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.6/428-MIPS-BCM63XX-move-nvram-related-functions-into-their.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.6/429-MIPS-BCM63XX-export-PSI-size-from-nvram.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.6/430-MTD-bcm63xxpart-use-nvram-for-PSI-size.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.6/431-MTD-physmap-allow-passing-pp_data.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.6/432-BCM63XX-allow-providing-fixup-data-in-board-data.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.6/433-MTD-m25p80-allow-passing-pp_data.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.6/434-MIPS-BCM63XX-store-the-flash-type-in-global-variable.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.6/435-BCM63XX-add-a-fixup-for-ath9k-devices.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.6/436-MTD-bcm63xxpart-allow-passing-a-caldata-offset.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.6/437-MIPS-BCM63XX-pass-caldata-info-to-flash.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.6/438-MIPS-BCM63XX-enable-USB-for-BCM6328.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.6/439-MIPS-BCM63XX-wire-up-the-HS-SPI-controller-for-BCM63.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.6/440-MIPS-BCM63XX-enable-SPI-controller-for-BCM6362.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.6/441-MIPS-BCM63XX-enable-USB-for-BCM6362.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.6/442-MIPS-BCM63XX-enable-enetsw-for-BCM6362.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.6/443-MIPS-BCM63XX-enable-enet-for-BCM6345.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.6/500-board-D4PW.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.6/501-board-NB4.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.6/502-board-96338W2_E7T.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.6/503-board-CPVA642.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.6/504-board_dsl_274xb_rev_c.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.6/505-board_spw500v.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.6/506-board_gw6200_gw6000.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.6/507-board-MAGIC.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.6/508-board_hw553.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.6/509-board_rta1320_16m.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.6/510-board_spw303v.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.6/511-board_V2500V.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.6/512-board_BTV2110.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.6/513-board_livebox.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.6/514-board_ct536_ct5621.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.6/515-board_DWV-S0_fixes.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.6/516-board_96348A-122.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.6/517-RTA1205W_16_uart_fixes.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.6/519_board_CPVA502plus.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.6/520-bcm63xx-add-support-for-96368MVWG-board.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.6/521-bcm63xx-add-support-for-96368MVNgr-board.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.6/522-MIPS-BCM63XX-add-96328avng-reference-board.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.6/523-MIPS-BCM63XX-add-963281TAN-reference-board.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.6/524-board_dsl_274xb_rev_f.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.6/525-board_96348w3.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.6/526-board_CT6373-1.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.6/527-board_dva-g3810bn-tl-1.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.6/528-board_nb6.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.6/529-board_fast2604.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.6/530-board_963281T_TEF.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.6/531-board_96328A-1441N1.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.6/532-board_96328a-1241N.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.6/550-alice_gate2_leds.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.6/551-96348gw_a_leds.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.6/552-board_96348gw-10_reset_button.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.6/553-board_rta770bw.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.6/800-wl_exports.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.6/801-ssb_export_fallback_sprom.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.6/802-rtl8367r_fix_RGMII_support.patch [new file with mode: 0644]

diff --git a/target/linux/brcm63xx/config-3.6 b/target/linux/brcm63xx/config-3.6
new file mode 100644 (file)
index 0000000..bf9af1f
--- /dev/null
@@ -0,0 +1,170 @@
+CONFIG_ARCH_BINFMT_ELF_RANDOMIZE_PIE=y
+CONFIG_ARCH_DISCARD_MEMBLOCK=y
+CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE=y
+CONFIG_ARCH_HAVE_CUSTOM_GPIO_H=y
+CONFIG_ARCH_HIBERNATION_POSSIBLE=y
+CONFIG_ARCH_REQUIRE_GPIOLIB=y
+CONFIG_ARCH_SUSPEND_POSSIBLE=y
+CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y
+CONFIG_AUDIT=y
+CONFIG_AUDIT_GENERIC=y
+CONFIG_BCM63XX=y
+CONFIG_BCM63XX_CPU_6328=y
+CONFIG_BCM63XX_CPU_6338=y
+CONFIG_BCM63XX_CPU_6345=y
+CONFIG_BCM63XX_CPU_6348=y
+CONFIG_BCM63XX_CPU_6358=y
+CONFIG_BCM63XX_CPU_6362=y
+CONFIG_BCM63XX_CPU_6368=y
+CONFIG_BCM63XX_ENET=y
+CONFIG_BCM63XX_PHY=y
+CONFIG_BCM63XX_WDT=y
+CONFIG_BCMA_POSSIBLE=y
+CONFIG_BOARD_BCM963XX=y
+# CONFIG_BOARD_LIVEBOX is not set
+CONFIG_BUILDTIME_EXTABLE_SORT=y
+CONFIG_CC_OPTIMIZE_FOR_SIZE=y
+CONFIG_CEVT_R4K=y
+CONFIG_CEVT_R4K_LIB=y
+CONFIG_CMDLINE="root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200"
+CONFIG_CMDLINE_BOOL=y
+# CONFIG_CMDLINE_OVERRIDE is not set
+CONFIG_CPU_BIG_ENDIAN=y
+CONFIG_CPU_HAS_PREFETCH=y
+CONFIG_CPU_HAS_SYNC=y
+CONFIG_CPU_MIPS32=y
+CONFIG_CPU_MIPS32_R1=y
+CONFIG_CPU_MIPSR1=y
+CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y
+CONFIG_CPU_SUPPORTS_HIGHMEM=y
+CONFIG_CRAMFS=y
+CONFIG_CSRC_R4K=y
+CONFIG_CSRC_R4K_LIB=y
+CONFIG_DECOMPRESS_LZMA=y
+CONFIG_DMA_NONCOHERENT=y
+CONFIG_EARLY_PRINTK=y
+CONFIG_ELF_CORE=y
+CONFIG_FIRMWARE_IN_KERNEL=y
+CONFIG_GENERIC_ATOMIC64=y
+CONFIG_GENERIC_CLOCKEVENTS=y
+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
+CONFIG_GENERIC_CMOS_UPDATE=y
+CONFIG_GENERIC_GPIO=y
+CONFIG_GENERIC_IO=y
+CONFIG_GENERIC_IRQ_SHOW=y
+CONFIG_GENERIC_PCI_IOMAP=y
+CONFIG_GENERIC_SMP_IDLE_THREAD=y
+CONFIG_GPIOLIB=y
+CONFIG_GPIO_74X164=y
+CONFIG_GPIO_SYSFS=y
+# CONFIG_HAMRADIO is not set
+CONFIG_HARDWARE_WATCHPOINTS=y
+CONFIG_HAS_DMA=y
+CONFIG_HAS_IOMEM=y
+CONFIG_HAS_IOPORT=y
+CONFIG_HAVE_ARCH_JUMP_LABEL=y
+CONFIG_HAVE_ARCH_KGDB=y
+CONFIG_HAVE_CLK=y
+CONFIG_HAVE_C_RECORDMCOUNT=y
+CONFIG_HAVE_DMA_API_DEBUG=y
+CONFIG_HAVE_DMA_ATTRS=y
+CONFIG_HAVE_DYNAMIC_FTRACE=y
+CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
+CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
+CONFIG_HAVE_FUNCTION_TRACER=y
+CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y
+CONFIG_HAVE_GENERIC_DMA_COHERENT=y
+CONFIG_HAVE_GENERIC_HARDIRQS=y
+CONFIG_HAVE_IDE=y
+CONFIG_HAVE_IRQ_WORK=y
+CONFIG_HAVE_MEMBLOCK=y
+CONFIG_HAVE_MEMBLOCK_NODE_MAP=y
+CONFIG_HAVE_OPROFILE=y
+CONFIG_HAVE_PERF_EVENTS=y
+CONFIG_HW_HAS_PCI=y
+CONFIG_HW_RANDOM=y
+CONFIG_HW_RANDOM_BCM63XX=y
+CONFIG_HZ=250
+# CONFIG_HZ_100 is not set
+CONFIG_HZ_250=y
+CONFIG_IMAGE_CMDLINE_HACK=y
+CONFIG_INITRAMFS_SOURCE=""
+CONFIG_IP_PIMSM_V1=y
+CONFIG_IP_PIMSM_V2=y
+CONFIG_IRQ_CPU=y
+CONFIG_IRQ_FORCED_THREADING=y
+CONFIG_KEXEC=y
+CONFIG_LEDS_GPIO=y
+CONFIG_M25PXX_USE_FAST_READ=y
+# CONFIG_MACH_LOONGSON1 is not set
+CONFIG_MDIO_BOARDINFO=y
+CONFIG_MIPS=y
+CONFIG_MIPS_L1_CACHE_SHIFT=5
+# CONFIG_MIPS_MACHINE is not set
+CONFIG_MIPS_MT_DISABLED=y
+CONFIG_MODULE_FORCE_LOAD=y
+CONFIG_MODULE_FORCE_UNLOAD=y
+CONFIG_MTD_BCM63XX_PARTS=y
+CONFIG_MTD_CFI_ADV_OPTIONS=y
+CONFIG_MTD_CFI_BE_BYTE_SWAP=y
+# CONFIG_MTD_CFI_GEOMETRY is not set
+# CONFIG_MTD_CFI_NOSWAP is not set
+CONFIG_MTD_CFI_STAA=y
+CONFIG_MTD_CMDLINE_PARTS=y
+# CONFIG_MTD_COMPLEX_MAPPINGS is not set
+CONFIG_MTD_JEDECPROBE=y
+CONFIG_MTD_M25P80=y
+CONFIG_MTD_PHYSMAP=y
+CONFIG_MTD_REDBOOT_PARTS=y
+CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED=y
+CONFIG_NEED_DMA_MAP_STATE=y
+CONFIG_NEED_PER_CPU_KM=y
+CONFIG_NO_GENERIC_PCI_IOPORT_MAP=y
+CONFIG_PAGEFLAGS_EXTENDED=y
+CONFIG_PANIC_ON_OOPS_VALUE=0
+CONFIG_PCI=y
+# CONFIG_PCIEAER is not set
+CONFIG_PCIEPORTBUS=y
+CONFIG_PCI_DOMAINS=y
+CONFIG_PERF_USE_VMALLOC=y
+CONFIG_PHYLIB=y
+CONFIG_POSIX_MQUEUE=y
+CONFIG_POSIX_MQUEUE_SYSCTL=y
+# CONFIG_PREEMPT_RCU is not set
+CONFIG_RELAY=y
+CONFIG_RTL8366_SMI=y
+CONFIG_RTL8367_PHY=y
+# CONFIG_SCSI_DMA is not set
+# CONFIG_SERIAL_8250 is not set
+CONFIG_SERIAL_BCM63XX=y
+CONFIG_SERIAL_BCM63XX_CONSOLE=y
+CONFIG_SPI=y
+# CONFIG_SPI_BCM63XX is not set
+CONFIG_SPI_BCM63XX_HSSPI=y
+CONFIG_SPI_BITBANG=y
+CONFIG_SPI_GPIO=y
+CONFIG_SPI_MASTER=y
+CONFIG_SQUASHFS_EMBEDDED=y
+CONFIG_SSB=y
+CONFIG_SSB_B43_PCI_BRIDGE=y
+CONFIG_SSB_BLOCKIO=y
+# CONFIG_SSB_DRIVER_MIPS is not set
+CONFIG_SSB_DRIVER_PCICORE=y
+CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y
+CONFIG_SSB_PCIHOST=y
+CONFIG_SSB_PCIHOST_POSSIBLE=y
+CONFIG_SSB_SPROM=y
+CONFIG_SWAP_IO_SPACE=y
+CONFIG_SWCONFIG=y
+CONFIG_SYS_HAS_CPU_MIPS32_R1=y
+CONFIG_SYS_HAS_EARLY_PRINTK=y
+CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y
+CONFIG_SYS_SUPPORTS_ARBIT_HZ=y
+CONFIG_SYS_SUPPORTS_BIG_ENDIAN=y
+CONFIG_USB_ARCH_HAS_XHCI=y
+# CONFIG_USB_HCD_SSB is not set
+CONFIG_USB_SUPPORT=y
+CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_WATCHDOG_NOWAYOUT=y
+CONFIG_XZ_DEC=y
+CONFIG_ZONE_DMA_FLAG=0
diff --git a/target/linux/brcm63xx/patches-3.6/101-MTD-bcm63xxpart-remove-unused-variable.patch b/target/linux/brcm63xx/patches-3.6/101-MTD-bcm63xxpart-remove-unused-variable.patch
new file mode 100644 (file)
index 0000000..470f966
--- /dev/null
@@ -0,0 +1,41 @@
+From 2962bbe9cc807549c0705551c5b7be47e34e3fac Mon Sep 17 00:00:00 2001
+From: Jonas Gorski <jonas.gorski@gmail.com>
+Date: Mon, 30 Apr 2012 09:32:56 +0200
+Subject: [PATCH 20/79] MTD: bcm63xxpart: remove unused variable
+
+namelen is never used, so drop it.
+
+Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
+---
+ drivers/mtd/bcm63xxpart.c |   11 +++--------
+ 1 file changed, 3 insertions(+), 8 deletions(-)
+
+--- a/drivers/mtd/bcm63xxpart.c
++++ b/drivers/mtd/bcm63xxpart.c
+@@ -79,7 +79,6 @@ static int bcm63xx_parse_cfe_partitions(
+       unsigned int rootfsaddr, kerneladdr, spareaddr;
+       unsigned int rootfslen, kernellen, sparelen, totallen;
+       unsigned int cfelen, nvramlen;
+-      int namelen = 0;
+       int i;
+       u32 computed_crc;
+       bool rootfs_first = false;
+@@ -143,15 +142,11 @@ static int bcm63xx_parse_cfe_partitions(
+       }
+       /* Determine number of partitions */
+-      namelen = 8;
+-      if (rootfslen > 0) {
++      if (rootfslen > 0)
+               nrparts++;
+-              namelen += 6;
+-      }
+-      if (kernellen > 0) {
++
++      if (kernellen > 0)
+               nrparts++;
+-              namelen += 6;
+-      }
+       /* Ask kernel for more memory */
+       parts = kzalloc(sizeof(*parts) * nrparts + 10 * nrparts, GFP_KERNEL);
diff --git a/target/linux/brcm63xx/patches-3.6/102-MTD-bcm63xxpart-merge-sparelen-calculation.patch b/target/linux/brcm63xx/patches-3.6/102-MTD-bcm63xxpart-merge-sparelen-calculation.patch
new file mode 100644 (file)
index 0000000..da24b1b
--- /dev/null
@@ -0,0 +1,33 @@
+From fd2ab39f22af4176eb3d23acbc4d1218cf835065 Mon Sep 17 00:00:00 2001
+From: Jonas Gorski <jonas.gorski@gmail.com>
+Date: Tue, 8 May 2012 09:47:32 +0200
+Subject: [PATCH 21/79] MTD: bcm63xxpart: merge sparelen calculation
+
+The length of the spare part is calculated the same way in both branches
+so move to a common place.
+
+Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
+---
+ drivers/mtd/bcm63xxpart.c |    3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+--- a/drivers/mtd/bcm63xxpart.c
++++ b/drivers/mtd/bcm63xxpart.c
+@@ -120,7 +120,6 @@ static int bcm63xx_parse_cfe_partitions(
+               kerneladdr = kerneladdr - BCM63XX_EXTENDED_SIZE;
+               rootfsaddr = rootfsaddr - BCM63XX_EXTENDED_SIZE;
+               spareaddr = roundup(totallen, master->erasesize) + cfelen;
+-              sparelen = master->size - spareaddr - nvramlen;
+               if (rootfsaddr < kerneladdr) {
+                       /* default Broadcom layout */
+@@ -138,8 +137,8 @@ static int bcm63xx_parse_cfe_partitions(
+               rootfslen = 0;
+               rootfsaddr = 0;
+               spareaddr = cfelen;
+-              sparelen = master->size - cfelen - nvramlen;
+       }
++      sparelen = master->size - spareaddr - nvramlen;
+       /* Determine number of partitions */
+       if (rootfslen > 0)
diff --git a/target/linux/brcm63xx/patches-3.6/103-MTD-bcm63xxpart-make-fixed-part-length-calculation-m.patch b/target/linux/brcm63xx/patches-3.6/103-MTD-bcm63xxpart-make-fixed-part-length-calculation-m.patch
new file mode 100644 (file)
index 0000000..ca0cddd
--- /dev/null
@@ -0,0 +1,49 @@
+From 465f1b3ff24dbf3bec43dce344a7bc2640e05ffc Mon Sep 17 00:00:00 2001
+From: Jonas Gorski <jonas.gorski@gmail.com>
+Date: Tue, 8 May 2012 09:53:07 +0200
+Subject: [PATCH 22/79] MTD: bcm63xxpart: make fixed part length calculation
+ more generic
+
+The CFE does not use 4K sectors even if the flash supports it, so
+for the fixed partitions like CFE itself or NVRAM the erase block
+size is always 64k or bigger.
+
+Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
+---
+ drivers/mtd/bcm63xxpart.c |   11 +++++++----
+ 1 file changed, 7 insertions(+), 4 deletions(-)
+
+--- a/drivers/mtd/bcm63xxpart.c
++++ b/drivers/mtd/bcm63xxpart.c
+@@ -37,8 +37,7 @@
+ #define BCM63XX_EXTENDED_SIZE 0xBFC00000      /* Extended flash address */
+-#define BCM63XX_MIN_CFE_SIZE  0x10000         /* always at least 64KiB */
+-#define BCM63XX_MIN_NVRAM_SIZE        0x10000         /* always at least 64KiB */
++#define BCM63XX_CFE_BLOCK_SIZE        0x10000         /* always at least 64KiB */
+ #define BCM63XX_CFE_MAGIC_OFFSET 0x4e0
+@@ -79,6 +78,7 @@ static int bcm63xx_parse_cfe_partitions(
+       unsigned int rootfsaddr, kerneladdr, spareaddr;
+       unsigned int rootfslen, kernellen, sparelen, totallen;
+       unsigned int cfelen, nvramlen;
++      unsigned int cfe_erasesize;
+       int i;
+       u32 computed_crc;
+       bool rootfs_first = false;
+@@ -86,8 +86,11 @@ static int bcm63xx_parse_cfe_partitions(
+       if (bcm63xx_detect_cfe(master))
+               return -EINVAL;
+-      cfelen = max_t(uint32_t, master->erasesize, BCM63XX_MIN_CFE_SIZE);
+-      nvramlen = max_t(uint32_t, master->erasesize, BCM63XX_MIN_NVRAM_SIZE);
++      cfe_erasesize = max_t(uint32_t, master->erasesize,
++                            BCM63XX_CFE_BLOCK_SIZE);
++
++      cfelen = cfe_erasesize;
++      nvramlen = cfe_erasesize;
+       /* Allocate memory for buffer */
+       buf = vmalloc(sizeof(struct bcm_tag));
diff --git a/target/linux/brcm63xx/patches-3.6/104-MTD-bcm63xxpart-move-the-last-curpart-to-its-correct.patch b/target/linux/brcm63xx/patches-3.6/104-MTD-bcm63xxpart-move-the-last-curpart-to-its-correct.patch
new file mode 100644 (file)
index 0000000..8e05803
--- /dev/null
@@ -0,0 +1,26 @@
+From d5173b2c806f4039679b001f1b55a3c245afdf68 Mon Sep 17 00:00:00 2001
+From: Jonas Gorski <jonas.gorski@gmail.com>
+Date: Tue, 8 May 2012 10:02:13 +0200
+Subject: [PATCH 23/79] MTD: bcm63xxpart: move the last curpart++ to its
+ correct place
+
+The line belongs above the comment, not below it.
+
+Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
+---
+ drivers/mtd/bcm63xxpart.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/mtd/bcm63xxpart.c
++++ b/drivers/mtd/bcm63xxpart.c
+@@ -190,9 +190,9 @@ static int bcm63xx_parse_cfe_partitions(
+       parts[curpart].name = "nvram";
+       parts[curpart].offset = master->size - nvramlen;
+       parts[curpart].size = nvramlen;
++      curpart++;
+       /* Global partition "linux" to make easy firmware upgrade */
+-      curpart++;
+       parts[curpart].name = "linux";
+       parts[curpart].offset = cfelen;
+       parts[curpart].size = master->size - cfelen - nvramlen;
diff --git a/target/linux/brcm63xx/patches-3.6/105-MTD-bcm63xxpart-use-correct-printk-format-for-partit.patch b/target/linux/brcm63xx/patches-3.6/105-MTD-bcm63xxpart-use-correct-printk-format-for-partit.patch
new file mode 100644 (file)
index 0000000..60396ab
--- /dev/null
@@ -0,0 +1,27 @@
+From 55aa355612ce55dc1943f116ea49e795a098b60c Mon Sep 17 00:00:00 2001
+From: Jonas Gorski <jonas.gorski@gmail.com>
+Date: Tue, 8 May 2012 10:03:27 +0200
+Subject: [PATCH 24/79] MTD: bcm63xxpart: use correct printk format for
+ partitions
+
+Use ll to be able to remove the casts.
+
+Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
+---
+ drivers/mtd/bcm63xxpart.c |    5 ++---
+ 1 file changed, 2 insertions(+), 3 deletions(-)
+
+--- a/drivers/mtd/bcm63xxpart.c
++++ b/drivers/mtd/bcm63xxpart.c
+@@ -198,9 +198,8 @@ static int bcm63xx_parse_cfe_partitions(
+       parts[curpart].size = master->size - cfelen - nvramlen;
+       for (i = 0; i < nrparts; i++)
+-              pr_info("Partition %d is %s offset %lx and length %lx\n", i,
+-                      parts[i].name, (long unsigned int)(parts[i].offset),
+-                      (long unsigned int)(parts[i].size));
++              pr_info("Partition %d is %s offset %llx and length %llx\n", i,
++                      parts[i].name, parts[i].offset, parts[i].size);
+       pr_info("Spare partition is offset %x and length %x\n", spareaddr,
+               sparelen);
diff --git a/target/linux/brcm63xx/patches-3.6/201-SPI-Allow-specifying-the-parsers-for-SPI-flash.patch b/target/linux/brcm63xx/patches-3.6/201-SPI-Allow-specifying-the-parsers-for-SPI-flash.patch
new file mode 100644 (file)
index 0000000..00dc9c9
--- /dev/null
@@ -0,0 +1,38 @@
+From 3f650fc30aa0badf9d02842ce396cea3eef2eeaa Mon Sep 17 00:00:00 2001
+From: Jonas Gorski <jonas.gorski@gmail.com>
+Date: Fri, 1 Jul 2011 23:16:47 +0200
+Subject: [PATCH 49/79] SPI: Allow specifying the parsers for SPI flash
+
+Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
+---
+ include/linux/spi/flash.h |    5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+--- a/include/linux/spi/flash.h
++++ b/include/linux/spi/flash.h
+@@ -2,7 +2,7 @@
+ #define LINUX_SPI_FLASH_H
+ struct mtd_partition;
+-
++struct mtd_part_parser_data;
+ /**
+  * struct flash_platform_data: board-specific flash data
+  * @name: optional flash device name (eg, as used with mtdparts=)
+@@ -10,6 +10,8 @@ struct mtd_partition;
+  * @nr_parts: number of mtd_partitions for static partitoning
+  * @type: optional flash device type (e.g. m25p80 vs m25p64), for use
+  *    with chips that can't be queried for JEDEC or other IDs
++ * @part_probe_types: optional list of MTD parser names to use for
++ *    partitioning
+  *
+  * Board init code (in arch/.../mach-xxx/board-yyy.c files) can
+  * provide information about SPI flash parts (such as DataFlash) to
+@@ -25,6 +27,7 @@ struct flash_platform_data {
+       char            *type;
++      const char      **part_probe_types;
+       /* we'll likely add more ... use JEDEC IDs, etc */
+ };
diff --git a/target/linux/brcm63xx/patches-3.6/202-MTD-DEVICES-m25p80-use-parsers-if-provided-in-flash-.patch b/target/linux/brcm63xx/patches-3.6/202-MTD-DEVICES-m25p80-use-parsers-if-provided-in-flash-.patch
new file mode 100644 (file)
index 0000000..d616ac2
--- /dev/null
@@ -0,0 +1,23 @@
+From c7c3c338cb25d7f55ddb3f6bfbf3572758ca3896 Mon Sep 17 00:00:00 2001
+From: Jonas Gorski <jonas.gorski@gmail.com>
+Date: Thu, 10 Nov 2011 16:53:08 +0100
+Subject: [PATCH 50/79] MTD: DEVICES: m25p80: use parsers if provided in flash
+ platform data
+
+Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
+---
+ drivers/mtd/devices/m25p80.c |    3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+--- a/drivers/mtd/devices/m25p80.c
++++ b/drivers/mtd/devices/m25p80.c
+@@ -960,7 +960,8 @@ static int __devinit m25p_probe(struct s
+       /* partitions should match sector boundaries; and it may be good to
+        * use readonly partitions for writeprotected sectors (BP2..BP0).
+        */
+-      return mtd_device_parse_register(&flash->mtd, NULL, &ppdata,
++      return mtd_device_parse_register(&flash->mtd,
++                      data ? data->part_probe_types : NULL, &ppdata,
+                       data ? data->parts : NULL,
+                       data ? data->nr_parts : 0);
+ }
diff --git a/target/linux/brcm63xx/patches-3.6/203-MTD-DEVICES-m25p80-add-support-for-limiting-reads.patch b/target/linux/brcm63xx/patches-3.6/203-MTD-DEVICES-m25p80-add-support-for-limiting-reads.patch
new file mode 100644 (file)
index 0000000..47eebba
--- /dev/null
@@ -0,0 +1,92 @@
+From 5fb4e8d7287ac8fcb33aae8b1e9e22c5a3c392bd Mon Sep 17 00:00:00 2001
+From: Jonas Gorski <jonas.gorski@gmail.com>
+Date: Thu, 10 Nov 2011 17:33:40 +0100
+Subject: [PATCH 51/79] MTD: DEVICES: m25p80: add support for limiting reads
+
+Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
+---
+ drivers/mtd/devices/m25p80.c |   29 +++++++++++++++++++++++++++--
+ include/linux/spi/flash.h    |    4 ++++
+ 2 files changed, 31 insertions(+), 2 deletions(-)
+
+--- a/drivers/mtd/devices/m25p80.c
++++ b/drivers/mtd/devices/m25p80.c
+@@ -100,6 +100,7 @@ struct m25p {
+       u16                     addr_width;
+       u8                      erase_opcode;
+       u8                      *command;
++      int                     max_transfer_len;
+ };
+ static inline struct m25p *mtd_to_m25p(struct mtd_info *mtd)
+@@ -343,10 +344,9 @@ static int m25p80_erase(struct mtd_info
+  * Read an address range from the flash chip.  The address range
+  * may be any size provided it is within the physical boundaries.
+  */
+-static int m25p80_read(struct mtd_info *mtd, loff_t from, size_t len,
++static int __m25p80_read(struct m25p *flash, loff_t from, size_t len,
+       size_t *retlen, u_char *buf)
+ {
+-      struct m25p *flash = mtd_to_m25p(mtd);
+       struct spi_transfer t[2];
+       struct spi_message m;
+@@ -395,6 +395,28 @@ static int m25p80_read(struct mtd_info *
+       return 0;
+ }
++static int m25p80_read(struct mtd_info *mtd, loff_t from, size_t len,
++      size_t *retlen, u_char *buf)
++{
++      struct m25p *flash = mtd_to_m25p(mtd);
++      size_t off;
++      size_t read_len = flash->max_transfer_len;
++      size_t part_len;
++      int ret = 0;
++
++      if (!read_len)
++              return __m25p80_read(flash, from, len, retlen, buf);
++
++      *retlen = 0;
++
++      for (off = 0; off < len && !ret; off += read_len) {
++              ret = __m25p80_read(flash, from + off, min(len - off, read_len),
++                                  &part_len, buf + off);
++                      *retlen += part_len;
++      }
++
++      return ret;
++}
+ /*
+  * Write an address range to the flash chip.  Data must be written in
+  * FLASH_PAGESIZE chunks.  The address range may be any size provided
+@@ -871,6 +893,9 @@ static int __devinit m25p_probe(struct s
+               return -ENOMEM;
+       }
++      if (data)
++              flash->max_transfer_len = data->max_transfer_len;
++
+       flash->spi = spi;
+       mutex_init(&flash->lock);
+       dev_set_drvdata(&spi->dev, flash);
+--- a/include/linux/spi/flash.h
++++ b/include/linux/spi/flash.h
+@@ -13,6 +13,8 @@ struct mtd_part_parser_data;
+  * @part_probe_types: optional list of MTD parser names to use for
+  *    partitioning
+  *
++ * @max_transfer_len: option maximum read/write length limitation for
++ *    SPI controllers not able to transfer any length commands.
+  * Board init code (in arch/.../mach-xxx/board-yyy.c files) can
+  * provide information about SPI flash parts (such as DataFlash) to
+  * help set up the device and its appropriate default partitioning.
+@@ -28,6 +30,8 @@ struct flash_platform_data {
+       char            *type;
+       const char      **part_probe_types;
++
++      unsigned int    max_transfer_len;
+       /* we'll likely add more ... use JEDEC IDs, etc */
+ };
diff --git a/target/linux/brcm63xx/patches-3.6/300-reset_buttons.patch b/target/linux/brcm63xx/patches-3.6/300-reset_buttons.patch
new file mode 100644 (file)
index 0000000..4161dc2
--- /dev/null
@@ -0,0 +1,116 @@
+--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
++++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
+@@ -12,6 +12,8 @@
+ #include <linux/string.h>
+ #include <linux/platform_device.h>
+ #include <linux/ssb/ssb.h>
++#include <linux/gpio_keys.h>
++#include <linux/input.h>
+ #include <asm/addrspace.h>
+ #include <bcm63xx_board.h>
+ #include <bcm63xx_cpu.h>
+@@ -28,6 +30,9 @@
+ #define PFX   "board_bcm963xx: "
++#define BCM963XX_KEYS_POLL_INTERVAL           20
++#define BCM963XX_KEYS_DEBOUNCE_INTERVAL       (BCM963XX_KEYS_POLL_INTERVAL * 3)
++
+ static struct bcm963xx_nvram nvram;
+ static unsigned int mac_addr_used;
+ static struct board_info board;
+@@ -335,6 +340,16 @@ static struct board_info __initdata boar
+                       .active_low     = 1,
+               },
+       },
++      .buttons = {
++              {
++                      .desc           = "reset",
++                      .gpio           = 33,
++                      .active_low     = 1,
++                      .type           = EV_KEY,
++                      .code           = KEY_RESTART,
++                      .debounce_interval = BCM963XX_KEYS_DEBOUNCE_INTERVAL,
++              },
++      },
+ };
+ static struct board_info __initdata board_96348gw = {
+@@ -393,6 +408,16 @@ static struct board_info __initdata boar
+                       .active_low     = 1,
+               },
+       },
++      .buttons = {
++              {
++                      .desc           = "reset",
++                      .gpio           = 36,
++                      .active_low     = 1,
++                      .type           = EV_KEY,
++                      .code           = KEY_RESTART,
++                      .debounce_interval = BCM963XX_KEYS_DEBOUNCE_INTERVAL,
++              },
++      },
+ };
+ static struct board_info __initdata board_FAST2404 = {
+@@ -866,11 +891,23 @@ static struct platform_device bcm63xx_gp
+       .dev.platform_data      = &bcm63xx_led_data,
+ };
++static struct gpio_keys_platform_data bcm63xx_gpio_keys_data = {
++      .poll_interval  = BCM963XX_KEYS_POLL_INTERVAL,
++};
++
++static struct platform_device bcm63xx_gpio_keys_device = {
++      .name           = "gpio-keys-polled",
++      .id             = 0,
++      .dev.platform_data = &bcm63xx_gpio_keys_data,
++};
++
+ /*
+  * third stage init callback, register all board devices.
+  */
+ int __init board_register_devices(void)
+ {
++      int button_count = 0;
++
+       if (board.has_uart0)
+               bcm63xx_uart_register(0);
+@@ -913,5 +950,16 @@ int __init board_register_devices(void)
+       platform_device_register(&bcm63xx_gpio_leds);
++      /* count number of BUTTONs defined by this device */
++      while (button_count < ARRAY_SIZE(board.buttons) && board.buttons[button_count].desc)
++              button_count++;
++
++      if (button_count) {
++              bcm63xx_gpio_keys_data.nbuttons = button_count;
++              bcm63xx_gpio_keys_data.buttons = board.buttons;
++
++              platform_device_register(&bcm63xx_gpio_keys_device);
++      }
++
+       return 0;
+ }
+--- a/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h
++++ b/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h
+@@ -3,6 +3,7 @@
+ #include <linux/types.h>
+ #include <linux/gpio.h>
++#include <linux/gpio_keys.h>
+ #include <linux/leds.h>
+ #include <bcm63xx_dev_enet.h>
+ #include <bcm63xx_dev_dsp.h>
+@@ -57,6 +58,9 @@ struct board_info {
+       /* GPIO LEDs */
+       struct gpio_led leds[5];
++
++      /* Buttons */
++      struct gpio_keys_button buttons[4];
+ };
+ #endif /* ! BOARD_BCM963XX_H_ */
diff --git a/target/linux/brcm63xx/patches-3.6/301-led_count.patch b/target/linux/brcm63xx/patches-3.6/301-led_count.patch
new file mode 100644 (file)
index 0000000..0111bd6
--- /dev/null
@@ -0,0 +1,41 @@
+--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
++++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
+@@ -907,6 +907,7 @@ static struct platform_device bcm63xx_gp
+ int __init board_register_devices(void)
+ {
+       int button_count = 0;
++      int led_count = 0;
+       if (board.has_uart0)
+               bcm63xx_uart_register(0);
+@@ -945,10 +946,16 @@ int __init board_register_devices(void)
+       bcm63xx_flash_register();
+-      bcm63xx_led_data.num_leds = ARRAY_SIZE(board.leds);
+-      bcm63xx_led_data.leds = board.leds;
++      /* count number of LEDs defined by this device */
++      while (led_count < ARRAY_SIZE(board.leds) && board.leds[led_count].name)
++              led_count++;
++
++      if (led_count) {
++              bcm63xx_led_data.num_leds = led_count;
++              bcm63xx_led_data.leds = board.leds;
+-      platform_device_register(&bcm63xx_gpio_leds);
++              platform_device_register(&bcm63xx_gpio_leds);
++      }
+       /* count number of BUTTONs defined by this device */
+       while (button_count < ARRAY_SIZE(board.buttons) && board.buttons[button_count].desc)
+--- a/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h
++++ b/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h
+@@ -57,7 +57,7 @@ struct board_info {
+       struct bcm63xx_dsp_platform_data dsp;
+       /* GPIO LEDs */
+-      struct gpio_led leds[5];
++      struct gpio_led leds[14];
+       /* Buttons */
+       struct gpio_keys_button buttons[4];
diff --git a/target/linux/brcm63xx/patches-3.6/302-extended-platform-devices.patch b/target/linux/brcm63xx/patches-3.6/302-extended-platform-devices.patch
new file mode 100644 (file)
index 0000000..df9be10
--- /dev/null
@@ -0,0 +1,25 @@
+--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
++++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
+@@ -944,6 +944,9 @@ int __init board_register_devices(void)
+       bcm63xx_spi_register();
++      if (board.num_devs)
++              platform_add_devices(board.devs, board.num_devs);
++
+       bcm63xx_flash_register();
+       /* count number of LEDs defined by this device */
+--- a/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h
++++ b/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h
+@@ -61,6 +61,10 @@ struct board_info {
+       /* Buttons */
+       struct gpio_keys_button buttons[4];
++
++      /* Additional platform devices */
++      struct platform_device **devs;
++      unsigned int    num_devs;
+ };
+ #endif /* ! BOARD_BCM963XX_H_ */
diff --git a/target/linux/brcm63xx/patches-3.6/303-spi-board-info.patch b/target/linux/brcm63xx/patches-3.6/303-spi-board-info.patch
new file mode 100644 (file)
index 0000000..b4d5388
--- /dev/null
@@ -0,0 +1,33 @@
+--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
++++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
+@@ -14,6 +14,7 @@
+ #include <linux/ssb/ssb.h>
+ #include <linux/gpio_keys.h>
+ #include <linux/input.h>
++#include <linux/spi/spi.h>
+ #include <asm/addrspace.h>
+ #include <bcm63xx_board.h>
+ #include <bcm63xx_cpu.h>
+@@ -947,6 +948,9 @@ int __init board_register_devices(void)
+       if (board.num_devs)
+               platform_add_devices(board.devs, board.num_devs);
++      if (board.num_spis)
++              spi_register_board_info(board.spis, board.num_spis);
++
+       bcm63xx_flash_register();
+       /* count number of LEDs defined by this device */
+--- a/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h
++++ b/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h
+@@ -65,6 +65,10 @@ struct board_info {
+       /* Additional platform devices */
+       struct platform_device **devs;
+       unsigned int    num_devs;
++
++      /* Additional platform devices */
++      struct spi_board_info *spis;
++      unsigned int    num_spis;
+ };
+ #endif /* ! BOARD_BCM963XX_H_ */
diff --git a/target/linux/brcm63xx/patches-3.6/304-boardid_fixup.patch b/target/linux/brcm63xx/patches-3.6/304-boardid_fixup.patch
new file mode 100644 (file)
index 0000000..301c916
--- /dev/null
@@ -0,0 +1,61 @@
+--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
++++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
+@@ -28,12 +28,16 @@
+ #include <bcm63xx_dev_pcmcia.h>
+ #include <bcm63xx_dev_spi.h>
+ #include <board_bcm963xx.h>
++#include <bcm963xx_tag.h>
+ #define PFX   "board_bcm963xx: "
+ #define BCM963XX_KEYS_POLL_INTERVAL           20
+ #define BCM963XX_KEYS_DEBOUNCE_INTERVAL       (BCM963XX_KEYS_POLL_INTERVAL * 3)
++#define CFE_OFFSET_64K                0x10000
++#define CFE_OFFSET_128K               0x20000
++
+ static struct bcm963xx_nvram nvram;
+ static unsigned int mac_addr_used;
+ static struct board_info board;
+@@ -769,6 +773,29 @@ static int board_get_mac_address(u8 *mac
+       return 0;
+ }
++static void __init boardid_fixup(u8 *boot_addr)
++{
++      struct bcm_tag *tag = (struct bcm_tag *)(boot_addr + CFE_OFFSET_64K);
++
++      /* check if bcm_tag is at 64k offset */
++      if (strncmp(nvram.name, tag->board_id, BOARDID_LEN) != 0) {
++              /* else try 128k */
++              tag = (struct bcm_tag *)(boot_addr + CFE_OFFSET_128K);
++              if (strncmp(nvram.name, tag->board_id, BOARDID_LEN) != 0) {
++                      /* No tag found */
++                      printk(KERN_DEBUG "No bcm_tag found!\n");
++                      return;
++              }
++      }
++      /* check if we should override the boardid */
++      if (tag->information1[0] != '+')
++              return;
++
++      strncpy(nvram.name, &tag->information1[1], BOARDID_LEN);
++
++      printk(KERN_INFO "Overriding boardid with '%s'\n", nvram.name);
++}
++
+ /*
+  * early init callback, read nvram data from flash and checksum it
+  */
+@@ -816,6 +843,11 @@ void __init board_prom_init(void)
+               return;
+       }
++      if (strcmp(cfe_version, "unknown") != 0) {
++              /* cfe present */
++              boardid_fixup(boot_addr);
++      }
++
+       /* find board by name */
+       for (i = 0; i < ARRAY_SIZE(bcm963xx_boards); i++) {
+               if (strncmp(nvram.name, bcm963xx_boards[i]->name,
diff --git a/target/linux/brcm63xx/patches-3.6/305-missing_ext_irq_bits.patch b/target/linux/brcm63xx/patches-3.6/305-missing_ext_irq_bits.patch
new file mode 100644 (file)
index 0000000..703f4b5
--- /dev/null
@@ -0,0 +1,96 @@
+--- a/arch/mips/bcm63xx/irq.c
++++ b/arch/mips/bcm63xx/irq.c
+@@ -56,8 +56,8 @@ static void __internal_irq_unmask_64(uns
+ #define is_ext_irq_cascaded   0
+ #define ext_irq_start         0
+ #define ext_irq_end           0
+-#define ext_irq_count         0
+-#define ext_irq_cfg_reg1      0
++#define ext_irq_count         4
++#define ext_irq_cfg_reg1      PERF_EXTIRQ_CFG_REG_6345
+ #define ext_irq_cfg_reg2      0
+ #endif
+ #ifdef CONFIG_BCM63XX_CPU_6348
+@@ -143,11 +143,15 @@ static void bcm63xx_init_irq(void)
+               irq_stat_addr += PERF_IRQSTAT_6338_REG;
+               irq_mask_addr += PERF_IRQMASK_6338_REG;
+               irq_bits = 32;
++              ext_irq_count = 4;
++              ext_irq_cfg_reg1 = PERF_EXTIRQ_CFG_REG_6338;
+               break;
+       case BCM6345_CPU_ID:
+               irq_stat_addr += PERF_IRQSTAT_6345_REG;
+               irq_mask_addr += PERF_IRQMASK_6345_REG;
+               irq_bits = 32;
++              ext_irq_count = 4;
++              ext_irq_cfg_reg1 = PERF_EXTIRQ_CFG_REG_6345;
+               break;
+       case BCM6348_CPU_ID:
+               irq_stat_addr += PERF_IRQSTAT_6348_REG;
+@@ -434,7 +438,8 @@ static int bcm63xx_external_irq_set_type
+       reg = bcm_perf_readl(regaddr);
+       irq %= 4;
+-      if (BCMCPU_IS_6348()) {
++      switch (bcm63xx_get_cpu_id()) {
++      case BCM6348_CPU_ID:
+               if (levelsense)
+                       reg |= EXTIRQ_CFG_LEVELSENSE_6348(irq);
+               else
+@@ -447,9 +452,12 @@ static int bcm63xx_external_irq_set_type
+                       reg |= EXTIRQ_CFG_BOTHEDGE_6348(irq);
+               else
+                       reg &= ~EXTIRQ_CFG_BOTHEDGE_6348(irq);
+-      }
++              break;
+-      if (BCMCPU_IS_6338() || BCMCPU_IS_6358() || BCMCPU_IS_6368()) {
++      case BCM6338_CPU_ID:
++      case BCM6345_CPU_ID:
++      case BCM6358_CPU_ID:
++      case BCM6368_CPU_ID:
+               if (levelsense)
+                       reg |= EXTIRQ_CFG_LEVELSENSE(irq);
+               else
+@@ -462,6 +470,9 @@ static int bcm63xx_external_irq_set_type
+                       reg |= EXTIRQ_CFG_BOTHEDGE(irq);
+               else
+                       reg &= ~EXTIRQ_CFG_BOTHEDGE(irq);
++              break;
++      default:
++              BUG();
+       }
+       bcm_perf_writel(reg, regaddr);
+--- a/arch/mips/bcm63xx/setup.c
++++ b/arch/mips/bcm63xx/setup.c
+@@ -74,6 +74,9 @@ void bcm63xx_machine_reboot(void)
+       case BCM6338_CPU_ID:
+               perf_regs[0] = PERF_EXTIRQ_CFG_REG_6338;
+               break;
++      case BCM6345_CPU_ID:
++              perf_regs[0] = PERF_EXTIRQ_CFG_REG_6345;
++              break;
+       case BCM6348_CPU_ID:
+               perf_regs[0] = PERF_EXTIRQ_CFG_REG_6348;
+               break;
+@@ -83,6 +86,9 @@ void bcm63xx_machine_reboot(void)
+       }
+       for (i = 0; i < 2; i++) {
++              if (!perf_regs[i])
++                      break;
++
+               reg = bcm_perf_readl(perf_regs[i]);
+               if (BCMCPU_IS_6348()) {
+                       reg &= ~EXTIRQ_CFG_MASK_ALL_6348;
+--- a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h
++++ b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h
+@@ -161,6 +161,7 @@
+ /* External Interrupt Configuration register */
+ #define PERF_EXTIRQ_CFG_REG_6328      0x18
+ #define PERF_EXTIRQ_CFG_REG_6338      0x14
++#define PERF_EXTIRQ_CFG_REG_6345      0x14
+ #define PERF_EXTIRQ_CFG_REG_6348      0x14
+ #define PERF_EXTIRQ_CFG_REG_6358      0x14
+ #define PERF_EXTIRQ_CFG_REG_6368      0x18
diff --git a/target/linux/brcm63xx/patches-3.6/306-Revert-MIPS-BCM63XX-Call-board_register_device-from-.patch b/target/linux/brcm63xx/patches-3.6/306-Revert-MIPS-BCM63XX-Call-board_register_device-from-.patch
new file mode 100644 (file)
index 0000000..aa7ef8b
--- /dev/null
@@ -0,0 +1,23 @@
+From a7d2622b6614fdca504c074a0cd307d5a1165c30 Mon Sep 17 00:00:00 2001
+From: Jonas Gorski <jonas.gorski@gmail.com>
+Date: Tue, 8 May 2012 09:39:01 +0200
+Subject: [PATCH 04/59] Revert "MIPS: BCM63XX: Call board_register_device from device_initcall()"
+
+This commit causes a race between PCI scan and SSB fallback SPROM handler
+registration, causing the wifi to not work on slower systems. The only
+subsystem touched from board_register_device is platform device
+registration, which should be safe as an arch init call.
+
+This reverts commit d64ed7ada2f689d2c62af1892ca55e47d3653e36.
+---
+ arch/mips/bcm63xx/setup.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+--- a/arch/mips/bcm63xx/setup.c
++++ b/arch/mips/bcm63xx/setup.c
+@@ -157,4 +157,4 @@ int __init bcm63xx_register_devices(void
+       return board_register_devices();
+ }
+-device_initcall(bcm63xx_register_devices);
++arch_initcall(bcm63xx_register_devices);
diff --git a/target/linux/brcm63xx/patches-3.6/307-MIPS-BCM63XX-allow-second-UART-on-BCM6328.patch b/target/linux/brcm63xx/patches-3.6/307-MIPS-BCM63XX-allow-second-UART-on-BCM6328.patch
new file mode 100644 (file)
index 0000000..1418d65
--- /dev/null
@@ -0,0 +1,22 @@
+From c110865541e2d3782c412af9d48c016de5a64d9c Mon Sep 17 00:00:00 2001
+From: Jonas Gorski <jonas.gorski@gmail.com>
+Date: Tue, 14 Jun 2011 21:14:39 +0200
+Subject: [PATCH 42/79] MIPS: BCM63XX: allow second UART on BCM6328
+
+Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
+---
+ arch/mips/bcm63xx/dev-uart.c |    3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+--- a/arch/mips/bcm63xx/dev-uart.c
++++ b/arch/mips/bcm63xx/dev-uart.c
+@@ -54,7 +54,8 @@ int __init bcm63xx_uart_register(unsigne
+       if (id >= ARRAY_SIZE(bcm63xx_uart_devices))
+               return -ENODEV;
+-      if (id == 1 && (!BCMCPU_IS_6358() && !BCMCPU_IS_6368()))
++      if (id == 1 && !BCMCPU_IS_6328() && !BCMCPU_IS_6358() &&
++          !BCMCPU_IS_6368())
+               return -ENODEV;
+       if (id == 0) {
diff --git a/target/linux/brcm63xx/patches-3.6/308-MIPS-BCM63XX-expose-the-HS-SPI-clock.patch b/target/linux/brcm63xx/patches-3.6/308-MIPS-BCM63XX-expose-the-HS-SPI-clock.patch
new file mode 100644 (file)
index 0000000..8a11f82
--- /dev/null
@@ -0,0 +1,48 @@
+From 5aeb6273a610f8aab090b3499827177eb41311ba Mon Sep 17 00:00:00 2001
+From: Jonas Gorski <jonas.gorski@gmail.com>
+Date: Sat, 12 Nov 2011 12:19:09 +0100
+Subject: [PATCH 53/79] MIPS: BCM63XX: expose the HS SPI clock
+
+Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
+---
+ arch/mips/bcm63xx/clk.c |   22 ++++++++++++++++++++++
+ 1 file changed, 22 insertions(+)
+
+--- a/arch/mips/bcm63xx/clk.c
++++ b/arch/mips/bcm63xx/clk.c
+@@ -194,6 +194,26 @@ static struct clk clk_spi = {
+ };
+ /*
++ * SPI clock
++ */
++static void hsspi_set(struct clk *clk, int enable)
++{
++      u32 mask;
++
++      if (BCMCPU_IS_6328())
++              mask = CKCTL_6328_HSSPI_EN;
++      else
++              return;
++
++      bcm_hwclock_set(mask, enable);
++}
++
++static struct clk clk_hsspi = {
++      .set    = hsspi_set,
++};
++
++
++/*
+  * XTM clock
+  */
+ static void xtm_set(struct clk *clk, int enable)
+@@ -286,6 +306,8 @@ struct clk *clk_get(struct device *dev,
+               return &clk_usbh;
+       if (!strcmp(id, "spi"))
+               return &clk_spi;
++      if (!strcmp(id, "hsspi"))
++              return &clk_hsspi;
+       if (!strcmp(id, "xtm"))
+               return &clk_xtm;
+       if (!strcmp(id, "periph"))
diff --git a/target/linux/brcm63xx/patches-3.6/309-MIPS-BCM63XX-add-HSSPI-register-definitions.patch b/target/linux/brcm63xx/patches-3.6/309-MIPS-BCM63XX-add-HSSPI-register-definitions.patch
new file mode 100644 (file)
index 0000000..1720ed6
--- /dev/null
@@ -0,0 +1,211 @@
+From 70f970222bc1096689ae1bffeb9ed09a7c4bed07 Mon Sep 17 00:00:00 2001
+From: Jonas Gorski <jonas.gorski@gmail.com>
+Date: Sat, 12 Nov 2011 12:19:55 +0100
+Subject: [PATCH 28/60] MIPS: BCM63XX: add HSSPI register definitions
+
+Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
+---
+ arch/mips/include/asm/mach-bcm63xx/bcm63xx_cpu.h  |   18 ++++++++
+ arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h |   47 +++++++++++++++++++++
+ 2 files changed, 65 insertions(+), 0 deletions(-)
+
+--- a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_cpu.h
++++ b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_cpu.h
+@@ -116,6 +116,7 @@ enum bcm63xx_regs_set {
+       RSET_UART1,
+       RSET_GPIO,
+       RSET_SPI,
++      RSET_HSSPI,
+       RSET_UDC0,
+       RSET_OHCI0,
+       RSET_OHCI_PRIV,
+@@ -159,6 +160,7 @@ enum bcm63xx_regs_set {
+ #define RSET_ENETDMA_SIZE             2048
+ #define RSET_ENETSW_SIZE              65536
+ #define RSET_UART_SIZE                        24
++#define RSET_HSSPI_SIZE                       1536
+ #define RSET_UDC_SIZE                 256
+ #define RSET_OHCI_SIZE                        256
+ #define RSET_EHCI_SIZE                        256
+@@ -182,6 +184,7 @@ enum bcm63xx_regs_set {
+ #define BCM_6328_UART1_BASE           (0xb0000120)
+ #define BCM_6328_GPIO_BASE            (0xb0000080)
+ #define BCM_6328_SPI_BASE             (0xdeadbeef)
++#define BCM_6328_HSSPI_BASE           (0xb0001000)
+ #define BCM_6328_UDC0_BASE            (0xdeadbeef)
+ #define BCM_6328_USBDMA_BASE          (0xdeadbeef)
+ #define BCM_6328_OHCI0_BASE           (0xdeadbeef)
+@@ -227,6 +230,7 @@ enum bcm63xx_regs_set {
+ #define BCM_6338_UART1_BASE           (0xdeadbeef)
+ #define BCM_6338_GPIO_BASE            (0xfffe0400)
+ #define BCM_6338_SPI_BASE             (0xfffe0c00)
++#define BCM_6338_HSSPI_BASE           (0xdeadbeef)
+ #define BCM_6338_UDC0_BASE            (0xdeadbeef)
+ #define BCM_6338_USBDMA_BASE          (0xfffe2400)
+ #define BCM_6338_OHCI0_BASE           (0xdeadbeef)
+@@ -273,6 +277,7 @@ enum bcm63xx_regs_set {
+ #define BCM_6345_UART1_BASE           (0xdeadbeef)
+ #define BCM_6345_GPIO_BASE            (0xfffe0400)
+ #define BCM_6345_SPI_BASE             (0xdeadbeef)
++#define BCM_6345_HSSPI_BASE           (0xdeadbeef)
+ #define BCM_6345_UDC0_BASE            (0xdeadbeef)
+ #define BCM_6345_USBDMA_BASE          (0xfffe2800)
+ #define BCM_6345_ENET0_BASE           (0xfffe1800)
+@@ -318,6 +323,7 @@ enum bcm63xx_regs_set {
+ #define BCM_6348_UART1_BASE           (0xdeadbeef)
+ #define BCM_6348_GPIO_BASE            (0xfffe0400)
+ #define BCM_6348_SPI_BASE             (0xfffe0c00)
++#define BCM_6348_HSSPI_BASE           (0xdeadbeef)
+ #define BCM_6348_UDC0_BASE            (0xfffe1000)
+ #define BCM_6348_OHCI0_BASE           (0xfffe1b00)
+ #define BCM_6348_OHCI_PRIV_BASE               (0xfffe1c00)
+@@ -361,6 +367,7 @@ enum bcm63xx_regs_set {
+ #define BCM_6358_UART1_BASE           (0xfffe0120)
+ #define BCM_6358_GPIO_BASE            (0xfffe0080)
+ #define BCM_6358_SPI_BASE             (0xfffe0800)
++#define BCM_6358_HSSPI_BASE           (0xdeadbeef)
+ #define BCM_6358_UDC0_BASE            (0xfffe0800)
+ #define BCM_6358_OHCI0_BASE           (0xfffe1400)
+ #define BCM_6358_OHCI_PRIV_BASE               (0xdeadbeef)
+@@ -405,6 +412,7 @@ enum bcm63xx_regs_set {
+ #define BCM_6368_UART1_BASE           (0xb0000120)
+ #define BCM_6368_GPIO_BASE            (0xb0000080)
+ #define BCM_6368_SPI_BASE             (0xb0000800)
++#define BCM_6368_HSSPI_BASE           (0xdeadbeef)
+ #define BCM_6368_UDC0_BASE            (0xdeadbeef)
+ #define BCM_6368_OHCI0_BASE           (0xb0001600)
+ #define BCM_6368_OHCI_PRIV_BASE               (0xdeadbeef)
+@@ -454,6 +462,7 @@ extern const unsigned long *bcm63xx_regs
+       __GEN_RSET_BASE(__cpu, UART1)                                   \
+       __GEN_RSET_BASE(__cpu, GPIO)                                    \
+       __GEN_RSET_BASE(__cpu, SPI)                                     \
++      __GEN_RSET_BASE(__cpu, HSSPI)                                   \
+       __GEN_RSET_BASE(__cpu, UDC0)                                    \
+       __GEN_RSET_BASE(__cpu, OHCI0)                                   \
+       __GEN_RSET_BASE(__cpu, OHCI_PRIV)                               \
+@@ -495,6 +504,7 @@ extern const unsigned long *bcm63xx_regs
+       [RSET_UART1]            = BCM_## __cpu ##_UART1_BASE,           \
+       [RSET_GPIO]             = BCM_## __cpu ##_GPIO_BASE,            \
+       [RSET_SPI]              = BCM_## __cpu ##_SPI_BASE,             \
++      [RSET_HSSPI]            = BCM_## __cpu ##_HSSPI_BASE,           \
+       [RSET_UDC0]             = BCM_## __cpu ##_UDC0_BASE,            \
+       [RSET_OHCI0]            = BCM_## __cpu ##_OHCI0_BASE,           \
+       [RSET_OHCI_PRIV]        = BCM_## __cpu ##_OHCI_PRIV_BASE,       \
+@@ -567,6 +577,7 @@ enum bcm63xx_irq {
+       IRQ_ENET0,
+       IRQ_ENET1,
+       IRQ_ENET_PHY,
++      IRQ_HSSPI,
+       IRQ_OHCI0,
+       IRQ_EHCI0,
+       IRQ_ENET0_RXDMA,
+@@ -602,6 +613,7 @@ enum bcm63xx_irq {
+ #define BCM_6328_ENET0_IRQ            0
+ #define BCM_6328_ENET1_IRQ            0
+ #define BCM_6328_ENET_PHY_IRQ         (IRQ_INTERNAL_BASE + 12)
++#define BCM_6328_HSSPI_IRQ            (IRQ_INTERNAL_BASE + 29)
+ #define BCM_6328_OHCI0_IRQ            (IRQ_INTERNAL_BASE + 9)
+ #define BCM_6328_EHCI0_IRQ            (IRQ_INTERNAL_BASE + 10)
+ #define BCM_6328_PCMCIA_IRQ           0
+@@ -640,6 +652,7 @@ enum bcm63xx_irq {
+ #define BCM_6338_ENET0_IRQ            (IRQ_INTERNAL_BASE + 8)
+ #define BCM_6338_ENET1_IRQ            0
+ #define BCM_6338_ENET_PHY_IRQ         (IRQ_INTERNAL_BASE + 9)
++#define BCM_6338_HSSPI_IRQ            0
+ #define BCM_6338_OHCI0_IRQ            0
+ #define BCM_6338_EHCI0_IRQ            0
+ #define BCM_6338_ENET0_RXDMA_IRQ      (IRQ_INTERNAL_BASE + 15)
+@@ -671,6 +684,7 @@ enum bcm63xx_irq {
+ #define BCM_6345_ENET0_IRQ            (IRQ_INTERNAL_BASE + 8)
+ #define BCM_6345_ENET1_IRQ            0
+ #define BCM_6345_ENET_PHY_IRQ         (IRQ_INTERNAL_BASE + 12)
++#define BCM_6345_HSSPI_IRQ            0
+ #define BCM_6345_OHCI0_IRQ            0
+ #define BCM_6345_EHCI0_IRQ            0
+ #define BCM_6345_ENET0_RXDMA_IRQ      (IRQ_INTERNAL_BASE + 13 + 1)
+@@ -702,6 +716,7 @@ enum bcm63xx_irq {
+ #define BCM_6348_ENET0_IRQ            (IRQ_INTERNAL_BASE + 8)
+ #define BCM_6348_ENET1_IRQ            (IRQ_INTERNAL_BASE + 7)
+ #define BCM_6348_ENET_PHY_IRQ         (IRQ_INTERNAL_BASE + 9)
++#define BCM_6348_HSSPI_IRQ            0
+ #define BCM_6348_OHCI0_IRQ            (IRQ_INTERNAL_BASE + 12)
+ #define BCM_6348_EHCI0_IRQ            0
+ #define BCM_6348_ENET0_RXDMA_IRQ      (IRQ_INTERNAL_BASE + 20)
+@@ -733,6 +748,7 @@ enum bcm63xx_irq {
+ #define BCM_6358_ENET0_IRQ            (IRQ_INTERNAL_BASE + 8)
+ #define BCM_6358_ENET1_IRQ            (IRQ_INTERNAL_BASE + 6)
+ #define BCM_6358_ENET_PHY_IRQ         (IRQ_INTERNAL_BASE + 9)
++#define BCM_6358_HSSPI_IRQ            0
+ #define BCM_6358_OHCI0_IRQ            (IRQ_INTERNAL_BASE + 5)
+ #define BCM_6358_EHCI0_IRQ            (IRQ_INTERNAL_BASE + 10)
+ #define BCM_6358_ENET0_RXDMA_IRQ      (IRQ_INTERNAL_BASE + 15)
+@@ -773,6 +789,7 @@ enum bcm63xx_irq {
+ #define BCM_6368_ENET0_IRQ            0
+ #define BCM_6368_ENET1_IRQ            0
+ #define BCM_6368_ENET_PHY_IRQ         (IRQ_INTERNAL_BASE + 15)
++#define BCM_6368_HSSPI_IRQ            0
+ #define BCM_6368_OHCI0_IRQ            (IRQ_INTERNAL_BASE + 5)
+ #define BCM_6368_EHCI0_IRQ            (IRQ_INTERNAL_BASE + 7)
+ #define BCM_6368_PCMCIA_IRQ           0
+@@ -813,6 +830,7 @@ extern const int *bcm63xx_irqs;
+       [IRQ_ENET0]             = BCM_## __cpu ##_ENET0_IRQ,            \
+       [IRQ_ENET1]             = BCM_## __cpu ##_ENET1_IRQ,            \
+       [IRQ_ENET_PHY]          = BCM_## __cpu ##_ENET_PHY_IRQ,         \
++      [IRQ_HSSPI]             = BCM_## __cpu ##_HSSPI_IRQ,            \
+       [IRQ_OHCI0]             = BCM_## __cpu ##_OHCI0_IRQ,            \
+       [IRQ_EHCI0]             = BCM_## __cpu ##_EHCI0_IRQ,            \
+       [IRQ_ENET0_RXDMA]       = BCM_## __cpu ##_ENET0_RXDMA_IRQ,      \
+--- a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h
++++ b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h
+@@ -1231,4 +1231,51 @@
+ #define PCIE_DEVICE_OFFSET            0x8000
++/*************************************************************************
++ * _REG relative to RSET_HSSPI
++ *************************************************************************/
++
++#define HSSPI_GLOBAL_CTRL_REG                 0x0
++#define GLOBAL_CTRL_CLK_POLARITY              (1 << 17)
++#define GLOBAL_CTRL_CLK_GATE_SSOFF            (1 << 16)
++
++#define HSSPI_GLOBAL_EXT_TRIGGER_REG          0x4
++
++#define HSSPI_INT_STATUS_REG                  0x8
++#define HSSPI_INT_STATUS_MASKED_REG           0xc
++#define HSSPI_INT_MASK_REG                    0x10
++
++#define HSSPI_PING0_CMD_DONE                  (1 << 0)
++
++#define HSSPI_INT_CLEAR_ALL                   0xff001f1f
++
++#define HSSPI_PINGPONG_COMMAND_REG(x)         (0x80 + (x) * 0x40)
++#define PINGPONG_CMD_COMMAND_MASK             0xf
++#define PINGPONG_COMMAND_NOOP                 0
++#define PINGPONG_COMMAND_START_NOW            1
++#define PINGPONG_COMMAND_START_TRIGGER                2
++#define PINGPONG_COMMAND_HALT                 3
++#define PINGPONG_COMMAND_FLUSH                        4
++#define PINGPONG_CMD_PROFILE_SHIFT            8
++#define PINGPONG_CMD_SS_SHIFT                 12
++
++#define HSSPI_PINGPONG_STATUS_REG(x)          (0x84 + (x) * 0x40)
++
++#define HSSPI_PROFILE_CLK_CTRL_REG(x)         (0x100 + (x) * 0x20)
++#define CLK_CTRL_ACCUM_RST_ON_LOOP            (1 << 15)
++
++#define HSSPI_PROFILE_SIGNAL_CTRL_REG(x)      (0x104 + (x) * 0x20)
++#define SIGNAL_CTRL_LATCH_RISING              (1 << 12)
++#define SIGNAL_CTRL_LAUNCH_RISING             (1 << 13)
++#define SIGNAL_CTRL_ASYNC_INPUT_PATH          (1 << 16)
++
++#define HSSPI_PROFILE_MODE_CTRL_REG(x)                (0x108 + (x) * 0x20)
++#define MODE_CTRL_MULTIDATA_RD_STRT_SHIFT     8
++#define MODE_CTRL_MULTIDATA_WR_STRT_SHIFT     12
++#define MODE_CTRL_MULTIDATA_RD_SIZE_SHIFT     16
++#define MODE_CTRL_MULTIDATA_WR_SIZE_SHIFT     18
++#define MODE_CTRL_PREPENDBYTE_CNT_SHIFT               24
++
++#define HSSPI_FIFO_REG(x)                     (0x200 + (x) * 0x200)
++
+ #endif /* BCM63XX_REGS_H_ */
diff --git a/target/linux/brcm63xx/patches-3.6/310-board_leds_naming.patch b/target/linux/brcm63xx/patches-3.6/310-board_leds_naming.patch
new file mode 100644 (file)
index 0000000..84603b0
--- /dev/null
@@ -0,0 +1,267 @@
+--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
++++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
+@@ -103,28 +103,28 @@ static struct board_info __initdata boar
+       .leds = {
+               {
+-                      .name           = "adsl",
++                      .name           = "96338GW:green:adsl",
+                       .gpio           = 3,
+                       .active_low     = 1,
+               },
+               {
+-                      .name           = "ses",
++                      .name           = "96338GW:green:ses",
+                       .gpio           = 5,
+                       .active_low     = 1,
+               },
+               {
+-                      .name           = "ppp-fail",
++                      .name           = "96338GW:green:ppp-fail",
+                       .gpio           = 4,
+                       .active_low     = 1,
+               },
+               {
+-                      .name           = "power",
++                      .name           = "96338GW!green:power",
+                       .gpio           = 0,
+                       .active_low     = 1,
+                       .default_trigger = "default-on",
+               },
+               {
+-                      .name           = "stop",
++                      .name           = "96338GW:green:stop",
+                       .gpio           = 1,
+                       .active_low     = 1,
+               }
+@@ -144,28 +144,28 @@ static struct board_info __initdata boar
+       .leds = {
+               {
+-                      .name           = "adsl",
++                      .name           = "96338W:green:adsl",
+                       .gpio           = 3,
+                       .active_low     = 1,
+               },
+               {
+-                      .name           = "ses",
++                      .name           = "96338W:green:ses",
+                       .gpio           = 5,
+                       .active_low     = 1,
+               },
+               {
+-                      .name           = "ppp-fail",
++                      .name           = "96338W:green:ppp-fail",
+                       .gpio           = 4,
+                       .active_low     = 1,
+               },
+               {
+-                      .name           = "power",
++                      .name           = "96338W:green:power",
+                       .gpio           = 0,
+                       .active_low     = 1,
+                       .default_trigger = "default-on",
+               },
+               {
+-                      .name           = "stop",
++                      .name           = "96338W:green:stop",
+                       .gpio           = 1,
+                       .active_low     = 1,
+               },
+@@ -204,29 +204,29 @@ static struct board_info __initdata boar
+       .leds = {
+               {
+-                      .name           = "adsl-fail",
++                      .name           = "96348R:green:adsl-fail",
+                       .gpio           = 2,
+                       .active_low     = 1,
+               },
+               {
+-                      .name           = "ppp",
++                      .name           = "96348R:green:ppp",
+                       .gpio           = 3,
+                       .active_low     = 1,
+               },
+               {
+-                      .name           = "ppp-fail",
++                      .name           = "96348R:green:ppp-fail",
+                       .gpio           = 4,
+                       .active_low     = 1,
+               },
+               {
+-                      .name           = "power",
++                      .name           = "96348R:green:power",
+                       .gpio           = 0,
+                       .active_low     = 1,
+                       .default_trigger = "default-on",
+               },
+               {
+-                      .name           = "stop",
++                      .name           = "96348R:green:stop",
+                       .gpio           = 1,
+                       .active_low     = 1,
+               },
+@@ -265,28 +265,28 @@ static struct board_info __initdata boar
+       .leds = {
+               {
+-                      .name           = "adsl-fail",
++                      .name           = "96348GW-10:green:adsl-fail",
+                       .gpio           = 2,
+                       .active_low     = 1,
+               },
+               {
+-                      .name           = "ppp",
++                      .name           = "96348GW-10:green:ppp",
+                       .gpio           = 3,
+                       .active_low     = 1,
+               },
+               {
+-                      .name           = "ppp-fail",
++                      .name           = "96348GW-10:green:ppp-fail",
+                       .gpio           = 4,
+                       .active_low     = 1,
+               },
+               {
+-                      .name           = "power",
++                      .name           = "96348GW-10:green:power",
+                       .gpio           = 0,
+                       .active_low     = 1,
+                       .default_trigger = "default-on",
+               },
+               {
+-                      .name           = "stop",
++                      .name           = "96348GW-10:green:stop",
+                       .gpio           = 1,
+                       .active_low     = 1,
+               },
+@@ -319,28 +319,28 @@ static struct board_info __initdata boar
+       .leds = {
+               {
+-                      .name           = "adsl-fail",
++                      .name           = "96348GW-11:green:adsl-fail",
+                       .gpio           = 2,
+                       .active_low     = 1,
+               },
+               {
+-                      .name           = "ppp",
++                      .name           = "96348GW-11:green:ppp",
+                       .gpio           = 3,
+                       .active_low     = 1,
+               },
+               {
+-                      .name           = "ppp-fail",
++                      .name           = "96348GW-11:green:ppp-fail",
+                       .gpio           = 4,
+                       .active_low     = 1,
+               },
+               {
+-                      .name           = "power",
++                      .name           = "96348GW-11:green:power",
+                       .gpio           = 0,
+                       .active_low     = 1,
+                       .default_trigger = "default-on",
+               },
+               {
+-                      .name           = "stop",
++                      .name           = "96348GW-11:green:stop",
+                       .gpio           = 1,
+                       .active_low     = 1,
+               },
+@@ -387,28 +387,28 @@ static struct board_info __initdata boar
+       .leds = {
+               {
+-                      .name           = "adsl-fail",
++                      .name           = "96348GW:green:adsl-fail",
+                       .gpio           = 2,
+                       .active_low     = 1,
+               },
+               {
+-                      .name           = "ppp",
++                      .name           = "96348GW:green:ppp",
+                       .gpio           = 3,
+                       .active_low     = 1,
+               },
+               {
+-                      .name           = "ppp-fail",
++                      .name           = "96348GW:green:ppp-fail",
+                       .gpio           = 4,
+                       .active_low     = 1,
+               },
+               {
+-                      .name           = "power",
++                      .name           = "96348GW:green:power",
+                       .gpio           = 0,
+                       .active_low     = 1,
+                       .default_trigger = "default-on",
+               },
+               {
+-                      .name           = "stop",
++                      .name           = "96348GW:green:stop",
+                       .gpio           = 1,
+                       .active_low     = 1,
+               },
+@@ -540,27 +540,27 @@ static struct board_info __initdata boar
+       .leds = {
+               {
+-                      .name           = "adsl-fail",
++                      .name           = "96358VW:green:adsl-fail",
+                       .gpio           = 15,
+                       .active_low     = 1,
+               },
+               {
+-                      .name           = "ppp",
++                      .name           = "96358VW:green:ppp",
+                       .gpio           = 22,
+                       .active_low     = 1,
+               },
+               {
+-                      .name           = "ppp-fail",
++                      .name           = "96358VW:green:ppp-fail",
+                       .gpio           = 23,
+                       .active_low     = 1,
+               },
+               {
+-                      .name           = "power",
++                      .name           = "96358VW:green:power",
+                       .gpio           = 4,
+                       .default_trigger = "default-on",
+               },
+               {
+-                      .name           = "stop",
++                      .name           = "96358VW:green:stop",
+                       .gpio           = 5,
+               },
+       },
+@@ -592,22 +592,22 @@ static struct board_info __initdata boar
+       .leds = {
+               {
+-                      .name           = "adsl",
++                      .name           = "96358VW2:green:adsl",
+                       .gpio           = 22,
+                       .active_low     = 1,
+               },
+               {
+-                      .name           = "ppp-fail",
++                      .name           = "96358VW2:green:ppp-fail",
+                       .gpio           = 23,
+               },
+               {
+-                      .name           = "power",
++                      .name           = "96358VW2:green:power",
+                       .gpio           = 5,
+                       .active_low     = 1,
+                       .default_trigger = "default-on",
+               },
+               {
+-                      .name           = "stop",
++                      .name           = "96358VW2:green:stop",
+                       .gpio           = 4,
+                       .active_low     = 1,
+               },
diff --git a/target/linux/brcm63xx/patches-3.6/311-cfe_version_mod.patch b/target/linux/brcm63xx/patches-3.6/311-cfe_version_mod.patch
new file mode 100644 (file)
index 0000000..835b85f
--- /dev/null
@@ -0,0 +1,26 @@
+--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
++++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
+@@ -822,6 +822,8 @@ void __init board_prom_init(void)
+       if (!memcmp(cfe, "cfe-v", 5))
+               snprintf(cfe_version, sizeof(cfe_version), "%u.%u.%u-%u.%u",
+                        cfe[5], cfe[6], cfe[7], cfe[8], cfe[9]);
++      else if (!memcmp(cfe, "cfe-", 4))
++              snprintf(cfe_version, 16, "%s", (char *) &cfe[4]);
+       else
+               strcpy(cfe_version, "unknown");
+       printk(KERN_INFO PFX "CFE version: %s\n", cfe_version);
+--- a/drivers/mtd/bcm63xxpart.c
++++ b/drivers/mtd/bcm63xxpart.c
+@@ -54,10 +54,10 @@ static int bcm63xx_detect_cfe(struct mtd
+       if (ret)
+               return ret;
+-      if (strncmp("cfe-v", buf, 5) == 0)
++      if (strncmp("cfe-", buf, 4) == 0)
+               return 0;
+-      /* very old CFE's do not have the cfe-v string, so check for magic */
++      /* very old CFE's do not have the cfe- string, so check for magic */
+       ret = mtd_read(master, BCM63XX_CFE_MAGIC_OFFSET, 8, &retlen,
+                      (void *)buf);
+       buf[retlen] = 0;
diff --git a/target/linux/brcm63xx/patches-3.6/312-MIPS-BCM63XX-add-basic-BCM6362-support.patch b/target/linux/brcm63xx/patches-3.6/312-MIPS-BCM63XX-add-basic-BCM6362-support.patch
new file mode 100644 (file)
index 0000000..6ce1856
--- /dev/null
@@ -0,0 +1,497 @@
+From 27ebbb819b1f92d52309276b29b7a56e362e5c4d Mon Sep 17 00:00:00 2001
+From: Jonas Gorski <jonas.gorski@gmail.com>
+Date: Mon, 21 Nov 2011 00:48:52 +0100
+Subject: [PATCH 54/84] MIPS: BCM63XX: add basic BCM6362 support
+
+Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
+---
+ arch/mips/bcm63xx/Kconfig                         |    4 +
+ arch/mips/bcm63xx/boards/board_bcm963xx.c         |    2 +-
+ arch/mips/bcm63xx/cpu.c                           |   52 ++++++++-
+ arch/mips/bcm63xx/irq.c                           |   19 +++
+ arch/mips/bcm63xx/prom.c                          |    2 +
+ arch/mips/bcm63xx/setup.c                         |    3 +
+ arch/mips/include/asm/mach-bcm63xx/bcm63xx_cpu.h  |  139 +++++++++++++++++++++
+ arch/mips/include/asm/mach-bcm63xx/bcm63xx_gpio.h |    2 +
+ arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h |   59 +++++++++
+ arch/mips/include/asm/mach-bcm63xx/ioremap.h      |    1 +
+ 10 files changed, 281 insertions(+), 2 deletions(-)
+
+--- a/arch/mips/bcm63xx/Kconfig
++++ b/arch/mips/bcm63xx/Kconfig
+@@ -25,6 +25,10 @@ config BCM63XX_CPU_6358
+       bool "support 6358 CPU"
+       select HW_HAS_PCI
++config BCM63XX_CPU_6362
++      bool "support 6362 CPU"
++      select HW_HAS_PCI
++
+ config BCM63XX_CPU_6368
+       bool "support 6368 CPU"
+       select HW_HAS_PCI
+--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
++++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
+@@ -809,7 +809,7 @@ void __init board_prom_init(void)
+       /* read base address of boot chip select (0)
+        * 6328 does not have MPI but boots from a fixed address
+        */
+-      if (BCMCPU_IS_6328())
++      if (BCMCPU_IS_6328() || BCMCPU_IS_6362())
+               val = 0x18000000;
+       else {
+               val = bcm_mpi_readl(MPI_CSBASE_REG(0));
+--- a/arch/mips/bcm63xx/cpu.c
++++ b/arch/mips/bcm63xx/cpu.c
+@@ -71,6 +71,15 @@ static const int bcm6358_irqs[] = {
+ };
++static const unsigned long bcm6362_regs_base[] = {
++      __GEN_CPU_REGS_TABLE(6362)
++};
++
++static const int bcm6362_irqs[] = {
++      __GEN_CPU_IRQ_TABLE(6362)
++
++};
++
+ static const unsigned long bcm6368_regs_base[] = {
+       __GEN_CPU_REGS_TABLE(6368)
+ };
+@@ -169,6 +178,42 @@ static unsigned int detect_cpu_clock(voi
+               return (16 * 1000000 * n1 * n2) / m1;
+       }
++      case BCM6362_CPU_ID:
++      {
++              unsigned int tmp, mips_pll_fcvo;
++
++              tmp = bcm_misc_readl(MISC_STRAPBUS_6362_REG);
++              mips_pll_fcvo = (tmp & STRAPBUS_6362_FCVO_MASK)
++                              >> STRAPBUS_6362_FCVO_SHIFT;
++              switch (mips_pll_fcvo) {
++              case 0x03:
++              case 0x0b:
++              case 0x13:
++              case 0x1b:
++                      return 240000000;
++              case 0x04:
++              case 0x0c:
++              case 0x14:
++              case 0x1c:
++                      return 160000000;
++              case 0x05:
++              case 0x0e:
++              case 0x16:
++              case 0x1e:
++              case 0x1f:
++                      return 400000000;
++              case 0x06:
++                      return 440000000;
++              case 0x07:
++              case 0x17:
++                      return 384000000;
++              case 0x15:
++              case 0x1d:
++                      return 200000000;
++              default:
++                      return 320000000;
++              }
++      }
+       case BCM6368_CPU_ID:
+       {
+               unsigned int tmp, p1, p2, ndiv, m1;
+@@ -205,7 +250,7 @@ static unsigned int detect_memory_size(v
+       unsigned int cols = 0, rows = 0, is_32bits = 0, banks = 0;
+       u32 val;
+-      if (BCMCPU_IS_6328())
++      if (BCMCPU_IS_6328() || BCMCPU_IS_6362())
+               return bcm_ddr_readl(DDR_CSEND_REG) << 24;
+       if (BCMCPU_IS_6345()) {
+@@ -280,6 +325,11 @@ void __init bcm63xx_cpu_init(void)
+                               bcm63xx_regs_base = bcm6328_regs_base;
+                               bcm63xx_irqs = bcm6328_irqs;
+                               break;
++                      case BCM6362_CPU_ID:
++                              expected_cpu_id = BCM6362_CPU_ID;
++                              bcm63xx_regs_base = bcm6362_regs_base;
++                              bcm63xx_irqs = bcm6362_irqs;
++                              break;
+                       case BCM6368_CPU_ID:
+                               expected_cpu_id = BCM6368_CPU_ID;
+                               bcm63xx_regs_base = bcm6368_regs_base;
+--- a/arch/mips/bcm63xx/irq.c
++++ b/arch/mips/bcm63xx/irq.c
+@@ -82,6 +82,14 @@ static void __internal_irq_unmask_64(uns
+ #define ext_irq_cfg_reg1      PERF_EXTIRQ_CFG_REG_6358
+ #define ext_irq_cfg_reg2      0
+ #endif
++#ifdef CONFIG_BCM63XX_CPU_6362
++#define irq_stat_reg          PERF_IRQSTAT_6362_REG
++#define irq_mask_reg          PERF_IRQMASK_6362_REG
++#define irq_bits              64
++#define is_ext_irq_cascaded   1
++#define ext_irq_start         (BCM_6362_EXT_IRQ0 - IRQ_INTERNAL_BASE)
++#define ext_irq_end           (BCM_6362_EXT_IRQ3 - IRQ_INTERNAL_BASE)
++#endif
+ #ifdef CONFIG_BCM63XX_CPU_6368
+ #define irq_stat_reg          PERF_IRQSTAT_6368_REG
+ #define irq_mask_reg          PERF_IRQMASK_6368_REG
+@@ -170,6 +178,16 @@ static void bcm63xx_init_irq(void)
+               ext_irq_end = BCM_6358_EXT_IRQ3 - IRQ_INTERNAL_BASE;
+               ext_irq_cfg_reg1 = PERF_EXTIRQ_CFG_REG_6358;
+               break;
++      case BCM6362_CPU_ID:
++              irq_stat_addr += PERF_IRQSTAT_6362_REG;
++              irq_mask_addr += PERF_IRQMASK_6362_REG;
++              irq_bits = 64;
++              ext_irq_count = 4;
++              is_ext_irq_cascaded = 1;
++              ext_irq_start = BCM_6362_EXT_IRQ0 - IRQ_INTERNAL_BASE;
++              ext_irq_end = BCM_6362_EXT_IRQ3 - IRQ_INTERNAL_BASE;
++              ext_irq_cfg_reg1 = PERF_EXTIRQ_CFG_REG_6362;
++              break;
+       case BCM6368_CPU_ID:
+               irq_stat_addr += PERF_IRQSTAT_6368_REG;
+               irq_mask_addr += PERF_IRQMASK_6368_REG;
+@@ -457,6 +475,7 @@ static int bcm63xx_external_irq_set_type
+       case BCM6338_CPU_ID:
+       case BCM6345_CPU_ID:
+       case BCM6358_CPU_ID:
++      case BCM6362_CPU_ID:
+       case BCM6368_CPU_ID:
+               if (levelsense)
+                       reg |= EXTIRQ_CFG_LEVELSENSE(irq);
+--- a/arch/mips/bcm63xx/prom.c
++++ b/arch/mips/bcm63xx/prom.c
+@@ -36,6 +36,8 @@ void __init prom_init(void)
+               mask = CKCTL_6348_ALL_SAFE_EN;
+       else if (BCMCPU_IS_6358())
+               mask = CKCTL_6358_ALL_SAFE_EN;
++      else if (BCMCPU_IS_6362())
++              mask = CKCTL_6362_ALL_SAFE_EN;
+       else if (BCMCPU_IS_6368())
+               mask = CKCTL_6368_ALL_SAFE_EN;
+       else
+--- a/arch/mips/bcm63xx/setup.c
++++ b/arch/mips/bcm63xx/setup.c
+@@ -83,6 +83,9 @@ void bcm63xx_machine_reboot(void)
+       case BCM6358_CPU_ID:
+               perf_regs[0] = PERF_EXTIRQ_CFG_REG_6358;
+               break;
++      case BCM6362_CPU_ID:
++              perf_regs[0] = PERF_EXTIRQ_CFG_REG_6362;
++              break;
+       }
+       for (i = 0; i < 2; i++) {
+--- a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_cpu.h
++++ b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_cpu.h
+@@ -14,6 +14,7 @@
+ #define BCM6345_CPU_ID                0x6345
+ #define BCM6348_CPU_ID                0x6348
+ #define BCM6358_CPU_ID                0x6358
++#define BCM6362_CPU_ID                0x6362
+ #define BCM6368_CPU_ID                0x6368
+ void __init bcm63xx_cpu_init(void);
+@@ -86,6 +87,20 @@ unsigned int bcm63xx_get_cpu_freq(void);
+ # define BCMCPU_IS_6358()     (0)
+ #endif
++#ifdef CONFIG_BCM63XX_CPU_6362
++# ifdef bcm63xx_get_cpu_id
++#  undef bcm63xx_get_cpu_id
++#  define bcm63xx_get_cpu_id()        __bcm63xx_get_cpu_id()
++#  define BCMCPU_RUNTIME_DETECT
++# else
++#  define bcm63xx_get_cpu_id()        BCM6362_CPU_ID
++# endif
++# define BCMCPU_IS_6362()     (bcm63xx_get_cpu_id() == BCM6362_CPU_ID)
++#else
++# define BCMCPU_IS_6362()     (0)
++#endif
++
++
+ #ifdef CONFIG_BCM63XX_CPU_6368
+ # ifdef bcm63xx_get_cpu_id
+ #  undef bcm63xx_get_cpu_id
+@@ -402,6 +417,62 @@ enum bcm63xx_regs_set {
+ /*
++ * 6362 register sets base address
++ */
++#define BCM_6362_DSL_LMEM_BASE                (0xdeadbeef)
++#define BCM_6362_PERF_BASE            (0xb0000000)
++#define BCM_6362_TIMER_BASE           (0xb0000040)
++#define BCM_6362_WDT_BASE             (0xb000005c)
++#define BCM_6362_UART0_BASE             (0xb0000100)
++#define BCM_6362_UART1_BASE           (0xb0000120)
++#define BCM_6362_GPIO_BASE            (0xb0000080)
++#define BCM_6362_SPI_BASE             (0xb0000800)
++#define BCM_6362_HSSPI_BASE           (0xb0001000)
++#define BCM_6362_UDC0_BASE            (0xdeadbeef)
++#define BCM_6362_USBDMA_BASE          (0xb000c000)
++#define BCM_6362_OHCI0_BASE           (0xb0002600)
++#define BCM_6362_OHCI_PRIV_BASE               (0xdeadbeef)
++#define BCM_6362_USBH_PRIV_BASE               (0xb0002700)
++#define BCM_6362_USBD_BASE            (0xb0002400)
++#define BCM_6362_MPI_BASE             (0xdeadbeef)
++#define BCM_6362_PCMCIA_BASE          (0xdeadbeef)
++#define BCM_6362_PCIE_BASE            (0xb0e40000)
++#define BCM_6362_SDRAM_REGS_BASE      (0xdeadbeef)
++#define BCM_6362_DSL_BASE             (0xdeadbeef)
++#define BCM_6362_UBUS_BASE            (0xdeadbeef)
++#define BCM_6362_ENET0_BASE           (0xdeadbeef)
++#define BCM_6362_ENET1_BASE           (0xdeadbeef)
++#define BCM_6362_ENETDMA_BASE         (0xb000d800)
++#define BCM_6362_ENETDMAC_BASE                (0xb000da00)
++#define BCM_6362_ENETDMAS_BASE                (0xb000dc00)
++#define BCM_6362_ENETSW_BASE          (0xb0e00000)
++#define BCM_6362_EHCI0_BASE           (0xb0002500)
++#define BCM_6362_SDRAM_BASE           (0xdeadbeef)
++#define BCM_6362_MEMC_BASE            (0xdeadbeef)
++#define BCM_6362_DDR_BASE             (0xb0003000)
++#define BCM_6362_M2M_BASE             (0xdeadbeef)
++#define BCM_6362_ATM_BASE             (0xdeadbeef)
++#define BCM_6362_XTM_BASE             (0xb0007800)
++#define BCM_6362_XTMDMA_BASE          (0xb000b800)
++#define BCM_6362_XTMDMAC_BASE         (0xdeadbeef)
++#define BCM_6362_XTMDMAS_BASE         (0xdeadbeef)
++#define BCM_6362_PCM_BASE             (0xb000a800)
++#define BCM_6362_PCMDMA_BASE          (0xdeadbeef)
++#define BCM_6362_PCMDMAC_BASE         (0xdeadbeef)
++#define BCM_6362_PCMDMAS_BASE         (0xdeadbeef)
++#define BCM_6362_RNG_BASE             (0xdeadbeef)
++#define BCM_6362_MISC_BASE            (0xb0001800)
++
++#define BCM_6362_NAND_REG_BASE                (0xb0000200)
++#define BCM_6362_NAND_CACHE_BASE      (0xb0000600)
++#define BCM_6362_LED_BASE             (0xb0001900)
++#define BCM_6362_IPSEC_BASE           (0xb0002800)
++#define BCM_6362_IPSEC_DMA_BASE               (0xb000d000)
++#define BCM_6362_WLAN_CHIPCOMMON_BASE (0xb0004000)
++#define BCM_6362_WLAN_D11_BASE                (0xb0005000)
++#define BCM_6362_WLAN_SHIM_BASE               (0xb0007000)
++
++/*
+  * 6368 register sets base address
+  */
+ #define BCM_6368_DSL_LMEM_BASE                (0xdeadbeef)
+@@ -557,6 +628,9 @@ static inline unsigned long bcm63xx_regs
+ #ifdef CONFIG_BCM63XX_CPU_6358
+       __GEN_RSET(6358)
+ #endif
++#ifdef CONFIG_BCM63XX_CPU_6362
++      __GEN_RSET(6362)
++#endif
+ #ifdef CONFIG_BCM63XX_CPU_6368
+       __GEN_RSET(6368)
+ #endif
+@@ -777,6 +851,71 @@ enum bcm63xx_irq {
+ #define BCM_6358_EXT_IRQ3             (IRQ_INTERNAL_BASE + 28)
+ /*
++ * 6362 irqs
++ */
++#define BCM_6362_HIGH_IRQ_BASE                (IRQ_INTERNAL_BASE + 32)
++
++#define BCM_6362_TIMER_IRQ            (IRQ_INTERNAL_BASE + 0)
++#define BCM_6362_SPI_IRQ              (IRQ_INTERNAL_BASE + 2)
++#define BCM_6362_UART0_IRQ            (IRQ_INTERNAL_BASE + 3)
++#define BCM_6362_UART1_IRQ            (IRQ_INTERNAL_BASE + 4)
++#define BCM_6362_DSL_IRQ              (IRQ_INTERNAL_BASE + 28)
++#define BCM_6362_UDC0_IRQ             0
++#define BCM_6362_ENET0_IRQ            0
++#define BCM_6362_ENET1_IRQ            0
++#define BCM_6362_ENET_PHY_IRQ         (IRQ_INTERNAL_BASE + 14)
++#define BCM_6362_HSSPI_IRQ            (IRQ_INTERNAL_BASE + 5)
++#define BCM_6362_OHCI0_IRQ            (IRQ_INTERNAL_BASE + 9)
++#define BCM_6362_EHCI0_IRQ            (IRQ_INTERNAL_BASE + 10)
++#define BCM_6362_USBD_IRQ             (IRQ_INTERNAL_BASE + 11)
++#define BCM_6362_USBD_RXDMA0_IRQ      (IRQ_INTERNAL_BASE + 20)
++#define BCM_6362_USBD_TXDMA0_IRQ      (IRQ_INTERNAL_BASE + 21)
++#define BCM_6362_USBD_RXDMA1_IRQ      (IRQ_INTERNAL_BASE + 22)
++#define BCM_6362_USBD_TXDMA1_IRQ      (IRQ_INTERNAL_BASE + 23)
++#define BCM_6362_USBD_RXDMA2_IRQ      (IRQ_INTERNAL_BASE + 24)
++#define BCM_6362_USBD_TXDMA2_IRQ      (IRQ_INTERNAL_BASE + 25)
++#define BCM_6362_PCMCIA_IRQ           0
++#define BCM_6362_ENET0_RXDMA_IRQ      0
++#define BCM_6362_ENET0_TXDMA_IRQ      0
++#define BCM_6362_ENET1_RXDMA_IRQ      0
++#define BCM_6362_ENET1_TXDMA_IRQ      0
++#define BCM_6362_PCI_IRQ              (IRQ_INTERNAL_BASE + 30)
++#define BCM_6362_ATM_IRQ              0
++#define BCM_6362_ENETSW_RXDMA0_IRQ    (BCM_6362_HIGH_IRQ_BASE + 0)
++#define BCM_6362_ENETSW_RXDMA1_IRQ    (BCM_6362_HIGH_IRQ_BASE + 1)
++#define BCM_6362_ENETSW_RXDMA2_IRQ    (BCM_6362_HIGH_IRQ_BASE + 2)
++#define BCM_6362_ENETSW_RXDMA3_IRQ    (BCM_6362_HIGH_IRQ_BASE + 3)
++#define BCM_6362_ENETSW_TXDMA0_IRQ    0
++#define BCM_6362_ENETSW_TXDMA1_IRQ    0
++#define BCM_6362_ENETSW_TXDMA2_IRQ    0
++#define BCM_6362_ENETSW_TXDMA3_IRQ    0
++#define BCM_6362_XTM_IRQ              0
++#define BCM_6362_XTM_DMA0_IRQ         (BCM_6362_HIGH_IRQ_BASE + 12)
++
++#define BCM_6362_RING_OSC_IRQ         (IRQ_INTERNAL_BASE + 1)
++#define BCM_6362_WLAN_GPIO_IRQ                (IRQ_INTERNAL_BASE + 6)
++#define BCM_6362_WLAN_IRQ             (IRQ_INTERNAL_BASE + 7)
++#define BCM_6362_IPSEC_IRQ            (IRQ_INTERNAL_BASE + 8)
++#define BCM_6362_NAND_IRQ             (IRQ_INTERNAL_BASE + 12)
++#define BCM_6362_PCM_IRQ              (IRQ_INTERNAL_BASE + 13)
++#define BCM_6362_DG_IRQ                       (IRQ_INTERNAL_BASE + 15)
++#define BCM_6362_EPHY_ENERGY0_IRQ     (IRQ_INTERNAL_BASE + 16)
++#define BCM_6362_EPHY_ENERGY1_IRQ     (IRQ_INTERNAL_BASE + 17)
++#define BCM_6362_EPHY_ENERGY2_IRQ     (IRQ_INTERNAL_BASE + 18)
++#define BCM_6362_EPHY_ENERGY3_IRQ     (IRQ_INTERNAL_BASE + 19)
++#define BCM_6362_IPSEC_DMA0_IRQ               (IRQ_INTERNAL_BASE + 26)
++#define BCM_6362_IPSEC_DMA1_IRQ               (IRQ_INTERNAL_BASE + 27)
++#define BCM_6362_FAP0_IRQ             (IRQ_INTERNAL_BASE + 29)
++#define BCM_6362_PCM_DMA0_IRQ         (BCM_6362_HIGH_IRQ_BASE + 4)
++#define BCM_6362_PCM_DMA1_IRQ         (BCM_6362_HIGH_IRQ_BASE + 5)
++#define BCM_6362_DECT0_IRQ            (BCM_6362_HIGH_IRQ_BASE + 6)
++#define BCM_6362_DECT1_IRQ            (BCM_6362_HIGH_IRQ_BASE + 7)
++#define BCM_6362_EXT_IRQ0             (BCM_6362_HIGH_IRQ_BASE + 8)
++#define BCM_6362_EXT_IRQ1             (BCM_6362_HIGH_IRQ_BASE + 9)
++#define BCM_6362_EXT_IRQ2             (BCM_6362_HIGH_IRQ_BASE + 10)
++#define BCM_6362_EXT_IRQ3             (BCM_6362_HIGH_IRQ_BASE + 11)
++
++/*
+  * 6368 irqs
+  */
+ #define BCM_6368_HIGH_IRQ_BASE                (IRQ_INTERNAL_BASE + 32)
+--- a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_gpio.h
++++ b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_gpio.h
+@@ -17,6 +17,8 @@ static inline unsigned long bcm63xx_gpio
+               return 8;
+       case BCM6345_CPU_ID:
+               return 16;
++      case BCM6362_CPU_ID:
++              return 48;
+       case BCM6368_CPU_ID:
+               return 38;
+       case BCM6348_CPU_ID:
+--- a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h
++++ b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h
+@@ -107,6 +107,39 @@
+                                       CKCTL_6358_USBSU_EN |           \
+                                       CKCTL_6358_EPHY_EN)
++#define CKCTL_6362_ADSL_QPROC_EN      (1 << 1)
++#define CKCTL_6362_ADSL_AFE_EN                (1 << 2)
++#define CKCTL_6362_ADSL_EN            (1 << 3)
++#define CKCTL_6362_MIPS_EN            (1 << 4)
++#define CKCTL_6362_WLAN_OCP_EN                (1 << 5)
++#define CKCTL_6362_SWPKT_USB_EN               (1 << 7)
++#define CKCTL_6362_SWPKT_SAR_EN               (1 << 8)
++#define CKCTL_6362_SAR_EN             (1 << 9)
++#define CKCTL_6362_ROBOSW_EN          (1 << 10)
++#define CKCTL_6362_PCM_EN             (1 << 11)
++#define CKCTL_6362_USBD_EN            (1 << 12)
++#define CKCTL_6362_USBH_EN            (1 << 13)
++#define CKCTL_6362_IPSEC_EN           (1 << 14)
++#define CKCTL_6362_SPI_EN             (1 << 15)
++#define CKCTL_6362_HSSPI_EN           (1 << 16)
++#define CKCTL_6362_PCIE_EN            (1 << 17)
++#define CKCTL_6362_FAP_EN             (1 << 18)
++#define CKCTL_6362_PHYMIPS_EN         (1 << 19)
++#define CKCTL_6362_NAND_EN            (1 << 20)
++
++#define CKCTL_6362_ALL_SAFE_EN                (CKCTL_6362_PHYMIPS_EN |        \
++                                      CKCTL_6362_ADSL_QPROC_EN |      \
++                                      CKCTL_6362_ADSL_AFE_EN |        \
++                                      CKCTL_6362_ADSL_EN |            \
++                                      CKCTL_6362_SAR_EN  |            \
++                                      CKCTL_6362_PCM_EN  |            \
++                                      CKCTL_6362_IPSEC_EN |           \
++                                      CKCTL_6362_USBD_EN |            \
++                                      CKCTL_6362_USBH_EN |            \
++                                      CKCTL_6362_ROBOSW_EN |          \
++                                      CKCTL_6362_PCIE_EN)
++
++
+ #define CKCTL_6368_VDSL_QPROC_EN      (1 << 2)
+ #define CKCTL_6368_VDSL_AFE_EN                (1 << 3)
+ #define CKCTL_6368_VDSL_BONDING_EN    (1 << 4)
+@@ -148,6 +181,7 @@
+ #define PERF_IRQMASK_6345_REG         0xc
+ #define PERF_IRQMASK_6348_REG         0xc
+ #define PERF_IRQMASK_6358_REG         0xc
++#define PERF_IRQMASK_6362_REG         0x20
+ #define PERF_IRQMASK_6368_REG         0x20
+ /* Interrupt Status register */
+@@ -156,6 +190,7 @@
+ #define PERF_IRQSTAT_6345_REG         0x10
+ #define PERF_IRQSTAT_6348_REG         0x10
+ #define PERF_IRQSTAT_6358_REG         0x10
++#define PERF_IRQSTAT_6362_REG         0x28
+ #define PERF_IRQSTAT_6368_REG         0x28
+ /* External Interrupt Configuration register */
+@@ -164,6 +199,7 @@
+ #define PERF_EXTIRQ_CFG_REG_6345      0x14
+ #define PERF_EXTIRQ_CFG_REG_6348      0x14
+ #define PERF_EXTIRQ_CFG_REG_6358      0x14
++#define PERF_EXTIRQ_CFG_REG_6362      0x18
+ #define PERF_EXTIRQ_CFG_REG_6368      0x18
+ #define PERF_EXTIRQ_CFG_REG2_6368     0x1c
+@@ -191,6 +227,7 @@
+ /* Soft Reset register */
+ #define PERF_SOFTRESET_REG            0x28
+ #define PERF_SOFTRESET_6328_REG               0x10
++#define PERF_SOFTRESET_6362_REG               0x10
+ #define PERF_SOFTRESET_6368_REG               0x10
+ #define SOFTRESET_6328_SPI_MASK               (1 << 0)
+@@ -244,6 +281,22 @@
+                                 SOFTRESET_6348_ACLC_MASK |            \
+                                 SOFTRESET_6348_ADSLMIPSPLL_MASK)
++#define SOFTRESET_6362_SPI_MASK               (1 << 0)
++#define SOFTRESET_6362_IPSEC_MASK     (1 << 1)
++#define SOFTRESET_6362_EPHY_MASK      (1 << 2)
++#define SOFTRESET_6362_SAR_MASK               (1 << 3)
++#define SOFTRESET_6362_ENETSW_MASK    (1 << 4)
++#define SOFTRESET_6362_USBS_MASK      (1 << 5)
++#define SOFTRESET_6362_USBH_MASK      (1 << 6)
++#define SOFTRESET_6362_PCM_MASK               (1 << 7)
++#define SOFTRESET_6362_PCIE_CORE_MASK (1 << 8)
++#define SOFTRESET_6362_PCIE_MASK      (1 << 9)
++#define SOFTRESET_6362_PCIE_EXT_MASK  (1 << 10)
++#define SOFTRESET_6362_WLAN_SHIM_MASK (1 << 11)
++#define SOFTRESET_6362_DDR_PHY_MASK   (1 << 12)
++#define SOFTRESET_6362_FAP_MASK               (1 << 13)
++#define SOFTRESET_6362_WLAN_UBUS_MASK (1 << 14)
++
+ #define SOFTRESET_6368_SPI_MASK               (1 << 0)
+ #define SOFTRESET_6368_MPI_MASK               (1 << 3)
+ #define SOFTRESET_6368_EPHY_MASK      (1 << 6)
+@@ -1174,6 +1227,12 @@
+ #define SERDES_PCIE_EN                        (1 << 0)
+ #define SERDES_PCIE_EXD_EN            (1 << 15)
++#define MISC_STRAPBUS_6362_REG                0x14
++#define STRAPBUS_6362_FCVO_SHIFT      1
++#define STRAPBUS_6362_FCVO_MASK               (0x1f << STRAPBUS_6362_FCVO_SHIFT)
++#define STRAPBUS_6362_BOOT_SEL_SERIAL (1 << 15)
++#define STRAPBUS_6362_BOOT_SEL_NAND   (0 << 15)
++
+ #define MISC_STRAPBUS_6328_REG                0x240
+ #define STRAPBUS_6328_FCVO_SHIFT      7
+ #define STRAPBUS_6328_FCVO_MASK               (0x1f << STRAPBUS_6328_FCVO_SHIFT)
+--- a/arch/mips/include/asm/mach-bcm63xx/ioremap.h
++++ b/arch/mips/include/asm/mach-bcm63xx/ioremap.h
+@@ -19,6 +19,7 @@ static inline int is_bcm63xx_internal_re
+                       return 1;
+               break;
+       case BCM6328_CPU_ID:
++      case BCM6362_CPU_ID:
+       case BCM6368_CPU_ID:
+               if (offset >= 0xb0000000 && offset < 0xb1000000)
+                       return 1;
diff --git a/target/linux/brcm63xx/patches-3.6/313-MIPS-BCM63XX-enable-pcie-for-BCM6362.patch b/target/linux/brcm63xx/patches-3.6/313-MIPS-BCM63XX-enable-pcie-for-BCM6362.patch
new file mode 100644 (file)
index 0000000..1b3a0d9
--- /dev/null
@@ -0,0 +1,110 @@
+From e49546bf3f255f028d0877ceeb7ed6466fe37d8a Mon Sep 17 00:00:00 2001
+From: Jonas Gorski <jonas.gorski@gmail.com>
+Date: Mon, 21 Nov 2011 00:53:26 +0100
+Subject: [PATCH 56/84] MIPS: BCM63XX: enable pcie for BCM6362
+
+Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
+---
+ arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h |    3 +-
+ arch/mips/pci/pci-bcm63xx.c                       |   57 +++++++++++++++------
+ 2 files changed, 44 insertions(+), 16 deletions(-)
+
+--- a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h
++++ b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h
+@@ -1223,7 +1223,8 @@
+ /*************************************************************************
+  * _REG relative to RSET_MISC
+  *************************************************************************/
+-#define MISC_SERDES_CTRL_REG          0x0
++#define MISC_SERDES_CTRL_6328_REG     0x0
++#define MISC_SERDES_CTRL_6362_REG     0x4
+ #define SERDES_PCIE_EN                        (1 << 0)
+ #define SERDES_PCIE_EXD_EN            (1 << 15)
+--- a/arch/mips/pci/pci-bcm63xx.c
++++ b/arch/mips/pci/pci-bcm63xx.c
+@@ -118,35 +118,61 @@ void __iomem *pci_iospace_start;
+ static void __init bcm63xx_reset_pcie(void)
+ {
+       u32 val;
++      u32 reg;
++      u32 mask;
+       /* enable clock */
++
++      if (BCMCPU_IS_6328())
++              mask = CKCTL_6328_PCIE_EN;
++      else
++              mask = CKCTL_6362_PCIE_EN;
++
+       val = bcm_perf_readl(PERF_CKCTL_REG);
+-      val |= CKCTL_6328_PCIE_EN;
++      val |= mask;
+       bcm_perf_writel(val, PERF_CKCTL_REG);
+       /* enable SERDES */
+-      val = bcm_misc_readl(MISC_SERDES_CTRL_REG);
++
++      if (BCMCPU_IS_6328())
++              reg = MISC_SERDES_CTRL_6328_REG;
++      else
++              reg = MISC_SERDES_CTRL_6362_REG;
++
++      val = bcm_misc_readl(reg);
+       val |= SERDES_PCIE_EN | SERDES_PCIE_EXD_EN;
+-      bcm_misc_writel(val, MISC_SERDES_CTRL_REG);
++      bcm_misc_writel(val, reg);
+       /* reset the PCIe core */
+-      val = bcm_perf_readl(PERF_SOFTRESET_6328_REG);
++      if (BCMCPU_IS_6328()) {
++              reg = PERF_SOFTRESET_6328_REG;
++              mask = SOFTRESET_6328_PCIE_MASK | SOFTRESET_6328_PCIE_CORE_MASK
++                              | SOFTRESET_6328_PCIE_HARD_MASK;
++      } else {
++              reg = PERF_SOFTRESET_6362_REG;
++              mask = SOFTRESET_6362_PCIE_MASK | SOFTRESET_6362_PCIE_CORE_MASK;
++      }
++      val = bcm_perf_readl(reg);
++      val &= ~mask;
++
++      if (BCMCPU_IS_6328())
++              val &= ~SOFTRESET_6328_PCIE_EXT_MASK;
++      else
++              val &= ~SOFTRESET_6362_PCIE_EXT_MASK;
+-      val &= ~SOFTRESET_6328_PCIE_MASK;
+-      val &= ~SOFTRESET_6328_PCIE_CORE_MASK;
+-      val &= ~SOFTRESET_6328_PCIE_HARD_MASK;
+-      val &= ~SOFTRESET_6328_PCIE_EXT_MASK;
+-      bcm_perf_writel(val, PERF_SOFTRESET_6328_REG);
++      bcm_perf_writel(val, reg);
+       mdelay(10);
+-      val |= SOFTRESET_6328_PCIE_MASK;
+-      val |= SOFTRESET_6328_PCIE_CORE_MASK;
+-      val |= SOFTRESET_6328_PCIE_HARD_MASK;
+-      bcm_perf_writel(val, PERF_SOFTRESET_6328_REG);
++      val |= mask;
++      bcm_perf_writel(val, reg);
+       mdelay(10);
+-      val |= SOFTRESET_6328_PCIE_EXT_MASK;
+-      bcm_perf_writel(val, PERF_SOFTRESET_6328_REG);
++      if (BCMCPU_IS_6328())
++              val |= SOFTRESET_6328_PCIE_EXT_MASK;
++      else
++              val |= SOFTRESET_6362_PCIE_EXT_MASK;
++
++      bcm_perf_writel(val, reg);
+       mdelay(200);
+ }
+@@ -332,6 +358,7 @@ static int __init bcm63xx_pci_init(void)
+       switch (bcm63xx_get_cpu_id()) {
+       case BCM6328_CPU_ID:
++      case BCM6362_CPU_ID:
+               return bcm63xx_register_pcie();
+       case BCM6348_CPU_ID:
+       case BCM6358_CPU_ID:
diff --git a/target/linux/brcm63xx/patches-3.6/400-ohci-add-driver-for-bcm63xx-integrated-controller.patch b/target/linux/brcm63xx/patches-3.6/400-ohci-add-driver-for-bcm63xx-integrated-controller.patch
new file mode 100644 (file)
index 0000000..23f0a57
--- /dev/null
@@ -0,0 +1,234 @@
+From 7b510c5754d3c46e1287803f51e8ecb177414438 Mon Sep 17 00:00:00 2001
+From: Maxime Bizon <mbizon@freebox.fr>
+Date: Fri, 10 Jun 2011 19:14:30 +0200
+Subject: [PATCH 23/63] ohci: add driver for bcm63xx integrated controller.
+
+---
+ drivers/usb/host/Kconfig        |    9 ++
+ drivers/usb/host/ohci-bcm63xx.c |  175 +++++++++++++++++++++++++++++++++++++++
+ drivers/usb/host/ohci-hcd.c     |    5 +
+ drivers/usb/host/ohci.h         |    2 +-
+ 4 files changed, 190 insertions(+), 1 deletions(-)
+ create mode 100644 drivers/usb/host/ohci-bcm63xx.c
+
+--- a/drivers/usb/host/Kconfig
++++ b/drivers/usb/host/Kconfig
+@@ -306,6 +306,15 @@ config USB_OHCI_HCD
+         To compile this driver as a module, choose M here: the
+         module will be called ohci-hcd.
++config USB_OHCI_BCM63XX
++      bool "Support for Broadcom 63xx on-chip OHCI USB controller"
++      depends on USB_OHCI_HCD && BCM63XX
++      select USB_OHCI_BIG_ENDIAN_DESC
++      select USB_OHCI_BIG_ENDIAN_MMIO
++      ---help---
++        Enables support for the on-chip OHCI controller on
++        BCM63XX chips.
++
+ config USB_OHCI_HCD_OMAP1
+       bool "OHCI support for OMAP1/2 chips"
+       depends on USB_OHCI_HCD && ARCH_OMAP1
+--- /dev/null
++++ b/drivers/usb/host/ohci-bcm63xx.c
+@@ -0,0 +1,175 @@
++/*
++ * This file is subject to the terms and conditions of the GNU General Public
++ * License.  See the file "COPYING" in the main directory of this archive
++ * for more details.
++ *
++ * Copyright (C) 2008 Maxime Bizon <mbizon@freebox.fr>
++ */
++
++#include <linux/init.h>
++#include <linux/clk.h>
++#include <linux/platform_device.h>
++#include <bcm63xx_cpu.h>
++#include <bcm63xx_regs.h>
++#include <bcm63xx_io.h>
++
++static struct clk *usb_host_clock;
++
++static int __devinit ohci_bcm63xx_start(struct usb_hcd *hcd)
++{
++      struct ohci_hcd *ohci = hcd_to_ohci(hcd);
++      int ret;
++
++      ohci->num_ports = 1;
++
++      ret = ohci_init(ohci);
++      if (ret < 0)
++              return ret;
++
++      /* FIXME: autodetected port 2 is shared with USB slave */
++
++      ret = ohci_run(ohci);
++      if (ret < 0) {
++              err("can't start %s", hcd->self.bus_name);
++              ohci_stop(hcd);
++              return ret;
++      }
++      return 0;
++}
++
++static const struct hc_driver ohci_bcm63xx_hc_driver = {
++      .description =          hcd_name,
++      .product_desc =         "BCM63XX integrated OHCI controller",
++      .hcd_priv_size =        sizeof(struct ohci_hcd),
++
++      .irq =                  ohci_irq,
++      .flags =                HCD_USB11 | HCD_MEMORY,
++      .start =                ohci_bcm63xx_start,
++      .stop =                 ohci_stop,
++      .shutdown =             ohci_shutdown,
++      .urb_enqueue =          ohci_urb_enqueue,
++      .urb_dequeue =          ohci_urb_dequeue,
++      .endpoint_disable =     ohci_endpoint_disable,
++      .get_frame_number =     ohci_get_frame,
++      .hub_status_data =      ohci_hub_status_data,
++      .hub_control =          ohci_hub_control,
++      .start_port_reset =     ohci_start_port_reset,
++};
++
++static int __devinit ohci_hcd_bcm63xx_drv_probe(struct platform_device *pdev)
++{
++      struct resource *res_mem;
++      struct usb_hcd *hcd;
++      struct ohci_hcd *ohci;
++      struct clk *clk;
++      u32 reg;
++      int ret, irq;
++
++      res_mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
++      irq = platform_get_irq(pdev, 0);
++      if (!res_mem || irq < 0)
++              return -ENODEV;
++
++      /* enable USB host clock */
++      clk = clk_get(&pdev->dev, "usbh");
++      if (IS_ERR(clk))
++              return -ENODEV;
++
++      clk_enable(clk);
++      usb_host_clock = clk;
++      msleep(100);
++
++      if (BCMCPU_IS_6348())
++              bcm_rset_writel(RSET_OHCI_PRIV, 0, OHCI_PRIV_REG);
++      else if (BCMCPU_IS_6358()) {
++              reg = bcm_rset_readl(RSET_USBH_PRIV, USBH_PRIV_SWAP_6358_REG);
++              reg &= ~USBH_PRIV_SWAP_OHCI_ENDN_MASK;
++              reg |= USBH_PRIV_SWAP_OHCI_DATA_MASK;
++              bcm_rset_writel(RSET_USBH_PRIV, reg, USBH_PRIV_SWAP_6358_REG);
++              /*
++               * The magic value comes for the original vendor BSP
++               * and is needed for USB to work. Datasheet does not
++               * help, so the magic value is used as-is.
++               */
++              bcm_rset_writel(RSET_USBH_PRIV, 0x1c0020,
++                              USBH_PRIV_TEST_6358_REG);
++
++      } else if (BCMCPU_IS_6368()) {
++              reg = bcm_rset_readl(RSET_USBH_PRIV, USBH_PRIV_SWAP_6368_REG);
++              reg &= ~USBH_PRIV_SWAP_OHCI_ENDN_MASK;
++              reg |= USBH_PRIV_SWAP_OHCI_DATA_MASK;
++              bcm_rset_writel(RSET_USBH_PRIV, reg, USBH_PRIV_SWAP_6368_REG);
++
++              reg = bcm_rset_readl(RSET_USBH_PRIV, USBH_PRIV_SETUP_6368_REG);
++              reg |= USBH_PRIV_SETUP_IOC_MASK;
++              bcm_rset_writel(RSET_USBH_PRIV, reg, USBH_PRIV_SETUP_6368_REG);
++      }
++
++      hcd = usb_create_hcd(&ohci_bcm63xx_hc_driver, &pdev->dev, "bcm63xx");
++      if (!hcd)
++              return -ENOMEM;
++      hcd->rsrc_start = res_mem->start;
++      hcd->rsrc_len = res_mem->end - res_mem->start + 1;
++
++      if (!request_mem_region(hcd->rsrc_start, hcd->rsrc_len, hcd_name)) {
++              pr_debug("request_mem_region failed\n");
++              ret = -EBUSY;
++              goto out;
++      }
++
++      hcd->regs = ioremap(hcd->rsrc_start, hcd->rsrc_len);
++      if (!hcd->regs) {
++              pr_debug("ioremap failed\n");
++              ret = -EIO;
++              goto out1;
++      }
++
++      ohci = hcd_to_ohci(hcd);
++      ohci->flags |= OHCI_QUIRK_BE_MMIO | OHCI_QUIRK_BE_DESC |
++              OHCI_QUIRK_FRAME_NO;
++      ohci_hcd_init(ohci);
++
++      ret = usb_add_hcd(hcd, irq, IRQF_DISABLED);
++      if (ret)
++              goto out2;
++
++      platform_set_drvdata(pdev, hcd);
++      return 0;
++
++out2:
++      iounmap(hcd->regs);
++out1:
++      release_mem_region(hcd->rsrc_start, hcd->rsrc_len);
++out:
++      usb_put_hcd(hcd);
++      return ret;
++}
++
++static int __devexit ohci_hcd_bcm63xx_drv_remove(struct platform_device *pdev)
++{
++      struct usb_hcd *hcd;
++
++      hcd = platform_get_drvdata(pdev);
++      usb_remove_hcd(hcd);
++      iounmap(hcd->regs);
++      usb_put_hcd(hcd);
++      release_mem_region(hcd->rsrc_start, hcd->rsrc_len);
++      if (usb_host_clock) {
++              clk_disable(usb_host_clock);
++              clk_put(usb_host_clock);
++      }
++      platform_set_drvdata(pdev, NULL);
++      return 0;
++}
++
++static struct platform_driver ohci_hcd_bcm63xx_driver = {
++      .probe          = ohci_hcd_bcm63xx_drv_probe,
++      .remove         = __devexit_p(ohci_hcd_bcm63xx_drv_remove),
++      .shutdown       = usb_hcd_platform_shutdown,
++      .driver         = {
++              .name   = "bcm63xx_ohci",
++              .owner  = THIS_MODULE,
++      },
++};
++
++MODULE_ALIAS("platform:bcm63xx_ohci");
+--- a/drivers/usb/host/ohci-hcd.c
++++ b/drivers/usb/host/ohci-hcd.c
+@@ -1120,6 +1120,11 @@ MODULE_LICENSE ("GPL");
+ #define PLATFORM_DRIVER               ohci_platform_driver
+ #endif
++#ifdef CONFIG_USB_OHCI_BCM63XX
++#include "ohci-bcm63xx.c"
++#define PLATFORM_DRIVER               ohci_hcd_bcm63xx_driver
++#endif
++
+ #if   !defined(PCI_DRIVER) &&         \
+       !defined(PLATFORM_DRIVER) &&    \
+       !defined(OMAP1_PLATFORM_DRIVER) &&      \
+--- a/drivers/usb/host/ohci.h
++++ b/drivers/usb/host/ohci.h
+@@ -647,7 +647,7 @@ static inline u32 hc32_to_cpup (const st
+  * some big-endian SOC implementations.  Same thing happens with PSW access.
+  */
+-#ifdef CONFIG_PPC_MPC52xx
++#if defined(CONFIG_PPC_MPC52xx) || defined(CONFIG_BCM63XX)
+ #define big_endian_frame_no_quirk(ohci)       (ohci->flags & OHCI_QUIRK_FRAME_NO)
+ #else
+ #define big_endian_frame_no_quirk(ohci)       0
diff --git a/target/linux/brcm63xx/patches-3.6/401-MIPS-BCM63XX-register-ohci-device.patch b/target/linux/brcm63xx/patches-3.6/401-MIPS-BCM63XX-register-ohci-device.patch
new file mode 100644 (file)
index 0000000..a625391
--- /dev/null
@@ -0,0 +1,143 @@
+From ab96f20ca1c3c8e7e5acd82d1e50823a5d572675 Mon Sep 17 00:00:00 2001
+From: Maxime Bizon <mbizon@freebox.fr>
+Date: Tue, 24 May 2011 21:47:41 +0200
+Subject: [PATCH 24/63] MIPS: BCM63XX: register ohci device.
+
+---
+ arch/mips/bcm63xx/Kconfig                          |    9 ++--
+ arch/mips/bcm63xx/Makefile                         |    2 +-
+ arch/mips/bcm63xx/boards/board_bcm963xx.c          |    4 ++
+ arch/mips/bcm63xx/dev-usb-ohci.c                   |   50 ++++++++++++++++++++
+ .../asm/mach-bcm63xx/bcm63xx_dev_usb_ohci.h        |    6 ++
+ 5 files changed, 65 insertions(+), 6 deletions(-)
+ create mode 100644 arch/mips/bcm63xx/dev-usb-ohci.c
+ create mode 100644 arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_usb_ohci.h
+
+--- a/arch/mips/bcm63xx/Kconfig
++++ b/arch/mips/bcm63xx/Kconfig
+@@ -8,22 +8,20 @@ config BCM63XX_CPU_6328
+ config BCM63XX_CPU_6338
+       bool "support 6338 CPU"
+       select HW_HAS_PCI
+-      select USB_ARCH_HAS_OHCI
+-      select USB_OHCI_BIG_ENDIAN_DESC
+-      select USB_OHCI_BIG_ENDIAN_MMIO
++      select USB_ARCH_HAS_OHCI if USB_SUPPORT
+ config BCM63XX_CPU_6345
+       bool "support 6345 CPU"
+-      select USB_OHCI_BIG_ENDIAN_DESC
+-      select USB_OHCI_BIG_ENDIAN_MMIO
+ config BCM63XX_CPU_6348
+       bool "support 6348 CPU"
+       select HW_HAS_PCI
++      select USB_ARCH_HAS_OHCI if USB_SUPPORT
+ config BCM63XX_CPU_6358
+       bool "support 6358 CPU"
+       select HW_HAS_PCI
++      select USB_ARCH_HAS_OHCI if USB_SUPPORT
+ config BCM63XX_CPU_6362
+       bool "support 6362 CPU"
+@@ -32,6 +30,7 @@ config BCM63XX_CPU_6362
+ config BCM63XX_CPU_6368
+       bool "support 6368 CPU"
+       select HW_HAS_PCI
++      select USB_ARCH_HAS_OHCI if USB_SUPPORT
+ endmenu
+ source "arch/mips/bcm63xx/boards/Kconfig"
+--- a/arch/mips/bcm63xx/Makefile
++++ b/arch/mips/bcm63xx/Makefile
+@@ -1,6 +1,6 @@
+ obj-y         += clk.o cpu.o cs.o gpio.o irq.o prom.o setup.o timer.o \
+                  dev-dsp.o dev-enet.o dev-flash.o dev-pcmcia.o dev-rng.o \
+-                 dev-spi.o dev-uart.o dev-wdt.o
++                 dev-spi.o dev-uart.o dev-usb-ohci.o dev-wdt.o
+ obj-$(CONFIG_EARLY_PRINTK)    += early_printk.o
+ obj-y         += boards/
+--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
++++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
+@@ -27,6 +27,7 @@
+ #include <bcm63xx_dev_flash.h>
+ #include <bcm63xx_dev_pcmcia.h>
+ #include <bcm63xx_dev_spi.h>
++#include <bcm63xx_dev_usb_ohci.h>
+ #include <board_bcm963xx.h>
+ #include <bcm963xx_tag.h>
+@@ -961,6 +962,9 @@ int __init board_register_devices(void)
+           !board_get_mac_address(board.enet1.mac_addr))
+               bcm63xx_enet_register(1, &board.enet1);
++      if (board.has_ohci0)
++              bcm63xx_ohci_register();
++
+       if (board.has_dsp)
+               bcm63xx_dsp_register(&board.dsp);
+--- /dev/null
++++ b/arch/mips/bcm63xx/dev-usb-ohci.c
+@@ -0,0 +1,50 @@
++/*
++ * This file is subject to the terms and conditions of the GNU General Public
++ * License.  See the file "COPYING" in the main directory of this archive
++ * for more details.
++ *
++ * Copyright (C) 2008 Maxime Bizon <mbizon@freebox.fr>
++ */
++
++#include <linux/init.h>
++#include <linux/kernel.h>
++#include <linux/platform_device.h>
++#include <bcm63xx_cpu.h>
++#include <bcm63xx_dev_usb_ohci.h>
++
++static struct resource ohci_resources[] = {
++      {
++              .start          = -1, /* filled at runtime */
++              .end            = -1, /* filled at runtime */
++              .flags          = IORESOURCE_MEM,
++      },
++      {
++              .start          = -1, /* filled at runtime */
++              .flags          = IORESOURCE_IRQ,
++      },
++};
++
++static u64 ohci_dmamask = ~(u32)0;
++
++static struct platform_device bcm63xx_ohci_device = {
++      .name           = "bcm63xx_ohci",
++      .id             = 0,
++      .num_resources  = ARRAY_SIZE(ohci_resources),
++      .resource       = ohci_resources,
++      .dev            = {
++              .dma_mask               = &ohci_dmamask,
++              .coherent_dma_mask      = 0xffffffff,
++      },
++};
++
++int __init bcm63xx_ohci_register(void)
++{
++      if (!BCMCPU_IS_6348() && !BCMCPU_IS_6358() && !BCMCPU_IS_6368())
++              return 0;
++
++      ohci_resources[0].start = bcm63xx_regset_address(RSET_OHCI0);
++      ohci_resources[0].end = ohci_resources[0].start;
++      ohci_resources[0].end += RSET_OHCI_SIZE - 1;
++      ohci_resources[1].start = bcm63xx_get_irq_number(IRQ_OHCI0);
++      return platform_device_register(&bcm63xx_ohci_device);
++}
+--- /dev/null
++++ b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_usb_ohci.h
+@@ -0,0 +1,6 @@
++#ifndef BCM63XX_DEV_USB_OHCI_H_
++#define BCM63XX_DEV_USB_OHCI_H_
++
++int bcm63xx_ohci_register(void);
++
++#endif /* BCM63XX_DEV_USB_OHCI_H_ */
diff --git a/target/linux/brcm63xx/patches-3.6/402-ehci-add-driver-for-bcm63xx-integrated-controller.patch b/target/linux/brcm63xx/patches-3.6/402-ehci-add-driver-for-bcm63xx-integrated-controller.patch
new file mode 100644 (file)
index 0000000..9b67b5a
--- /dev/null
@@ -0,0 +1,242 @@
+From db58271d5152aa1d3894fdef13ca04379139d5d9 Mon Sep 17 00:00:00 2001
+From: Maxime Bizon <mbizon@freebox.fr>
+Date: Fri, 10 Jun 2011 19:15:47 +0200
+Subject: [PATCH 25/63] ehci: add driver for bcm63xx integrated controller.
+
+---
+ drivers/usb/host/Kconfig        |   10 ++-
+ drivers/usb/host/ehci-bcm63xx.c |  186 +++++++++++++++++++++++++++++++++++++++
+ drivers/usb/host/ehci-hcd.c     |    5 +
+ 3 files changed, 199 insertions(+), 1 deletions(-)
+ create mode 100644 drivers/usb/host/ehci-bcm63xx.c
+
+--- a/drivers/usb/host/Kconfig
++++ b/drivers/usb/host/Kconfig
+@@ -110,7 +110,8 @@ config USB_EHCI_BIG_ENDIAN_MMIO
+       depends on USB_EHCI_HCD && (PPC_CELLEB || PPC_PS3 || 440EPX || \
+                                   ARCH_IXP4XX || XPS_USB_HCD_XILINX || \
+                                   PPC_MPC512x || CPU_CAVIUM_OCTEON || \
+-                                  PMC_MSP || SPARC_LEON || MIPS_SEAD3)
++                                  PMC_MSP || SPARC_LEON || MIPS_SEAD3 || \
++                                  BCM63XX)
+       default y
+ config USB_EHCI_BIG_ENDIAN_DESC
+@@ -134,6 +135,14 @@ config XPS_USB_HCD_XILINX
+ config USB_FSL_MPH_DR_OF
+       tristate
++config USB_EHCI_BCM63XX
++      bool "Support for Broadcom 63xx on-chip EHCI USB controller"
++      depends on USB_EHCI_HCD && BCM63XX
++      select USB_EHCI_BIG_ENDIAN_MMIO
++      ---help---
++        Enables support for the on-chip EHCI controller on
++        BCM6358 and later chips.
++
+ config USB_EHCI_FSL
+       bool "Support for Freescale PPC on-chip EHCI USB controller"
+       depends on USB_EHCI_HCD && FSL_SOC
+--- /dev/null
++++ b/drivers/usb/host/ehci-bcm63xx.c
+@@ -0,0 +1,186 @@
++/*
++ * This file is subject to the terms and conditions of the GNU General Public
++ * License.  See the file "COPYING" in the main directory of this archive
++ * for more details.
++ *
++ * Copyright (C) 2008 Maxime Bizon <mbizon@freebox.fr>
++ */
++
++#include <linux/init.h>
++#include <linux/clk.h>
++#include <linux/platform_device.h>
++#include <bcm63xx_cpu.h>
++#include <bcm63xx_regs.h>
++#include <bcm63xx_io.h>
++
++static struct clk *usb_host_clock;
++
++static int ehci_bcm63xx_setup(struct usb_hcd *hcd)
++{
++      struct ehci_hcd *ehci = hcd_to_ehci(hcd);
++      int retval;
++
++      retval = ehci_halt(ehci);
++      if (retval)
++              return retval;
++
++      retval = ehci_init(hcd);
++      if (retval)
++              return retval;
++
++      ehci_reset(ehci);
++      ehci_port_power(ehci, 0);
++
++      return retval;
++}
++
++
++static const struct hc_driver ehci_bcm63xx_hc_driver = {
++      .description =          hcd_name,
++      .product_desc =         "BCM63XX integrated EHCI controller",
++      .hcd_priv_size =        sizeof(struct ehci_hcd),
++
++      .irq =                  ehci_irq,
++      .flags =                HCD_MEMORY | HCD_USB2,
++
++      .reset =                ehci_bcm63xx_setup,
++      .start =                ehci_run,
++      .stop =                 ehci_stop,
++      .shutdown =             ehci_shutdown,
++
++      .urb_enqueue =          ehci_urb_enqueue,
++      .urb_dequeue =          ehci_urb_dequeue,
++      .endpoint_disable =     ehci_endpoint_disable,
++
++      .get_frame_number =     ehci_get_frame,
++
++      .hub_status_data =      ehci_hub_status_data,
++      .hub_control =          ehci_hub_control,
++      .bus_suspend =          ehci_bus_suspend,
++      .bus_resume =           ehci_bus_resume,
++      .relinquish_port =      ehci_relinquish_port,
++      .port_handed_over =     ehci_port_handed_over,
++};
++
++static int __devinit ehci_hcd_bcm63xx_drv_probe(struct platform_device *pdev)
++{
++      struct resource *res_mem;
++      struct usb_hcd *hcd;
++      struct ehci_hcd *ehci;
++      struct clk *clk;
++      u32 reg;
++      int ret, irq;
++
++      res_mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
++      irq = platform_get_irq(pdev, 0);;
++      if (!res_mem || irq < 0)
++              return -ENODEV;
++
++      /* enable USB host clock */
++      clk = clk_get(&pdev->dev, "usbh");
++      if (IS_ERR(clk))
++              return -ENODEV;
++
++      clk_enable(clk);
++      usb_host_clock = clk;
++      msleep(100);
++
++      if (BCMCPU_IS_6358()) {
++              reg = bcm_rset_readl(RSET_USBH_PRIV, USBH_PRIV_SWAP_6358_REG);
++              reg &= ~USBH_PRIV_SWAP_EHCI_DATA_MASK;
++              reg |= USBH_PRIV_SWAP_EHCI_ENDN_MASK;
++              bcm_rset_writel(RSET_USBH_PRIV, reg, USBH_PRIV_SWAP_6358_REG);
++
++              /*
++               * The magic value comes for the original vendor BSP
++               * and is needed for USB to work. Datasheet does not
++               * help, so the magic value is used as-is.
++               */
++              bcm_rset_writel(RSET_USBH_PRIV, 0x1c0020,
++                              USBH_PRIV_TEST_6358_REG);
++
++      } else if (BCMCPU_IS_6368()) {
++
++              reg = bcm_rset_readl(RSET_USBH_PRIV, USBH_PRIV_SWAP_6368_REG);
++              reg &= ~USBH_PRIV_SWAP_EHCI_DATA_MASK;
++              reg |= USBH_PRIV_SWAP_EHCI_ENDN_MASK;
++              bcm_rset_writel(RSET_USBH_PRIV, reg, USBH_PRIV_SWAP_6368_REG);
++
++              reg = bcm_rset_readl(RSET_USBH_PRIV, USBH_PRIV_SETUP_6368_REG);
++              reg |= USBH_PRIV_SETUP_IOC_MASK;
++              bcm_rset_writel(RSET_USBH_PRIV, reg, USBH_PRIV_SETUP_6368_REG);
++      }
++
++      hcd = usb_create_hcd(&ehci_bcm63xx_hc_driver, &pdev->dev, "bcm63xx");
++      if (!hcd)
++              return -ENOMEM;
++      hcd->rsrc_start = res_mem->start;
++      hcd->rsrc_len = res_mem->end - res_mem->start + 1;
++
++      if (!request_mem_region(hcd->rsrc_start, hcd->rsrc_len, hcd_name)) {
++              pr_debug("request_mem_region failed\n");
++              ret = -EBUSY;
++              goto out;
++      }
++
++      hcd->regs = ioremap(hcd->rsrc_start, hcd->rsrc_len);
++      if (!hcd->regs) {
++              pr_debug("ioremap failed\n");
++              ret = -EIO;
++              goto out1;
++      }
++
++      ehci = hcd_to_ehci(hcd);
++      ehci->big_endian_mmio = 1;
++      ehci->big_endian_desc = 0;
++      ehci->caps = hcd->regs;
++      ehci->regs = hcd->regs +
++              HC_LENGTH(ehci, ehci_readl(ehci, &ehci->caps->hc_capbase));
++      ehci->hcs_params = ehci_readl(ehci, &ehci->caps->hcs_params);
++      ehci->sbrn = 0x20;
++      ehci->ignore_oc = 1;
++
++      ret = usb_add_hcd(hcd, irq, IRQF_DISABLED);
++      if (ret)
++              goto out2;
++
++      platform_set_drvdata(pdev, hcd);
++      return 0;
++
++out2:
++      iounmap(hcd->regs);
++out1:
++      release_mem_region(hcd->rsrc_start, hcd->rsrc_len);
++out:
++      usb_put_hcd(hcd);
++      return ret;
++}
++
++static int __devexit ehci_hcd_bcm63xx_drv_remove(struct platform_device *pdev)
++{
++      struct usb_hcd *hcd;
++
++      hcd = platform_get_drvdata(pdev);
++      usb_remove_hcd(hcd);
++      iounmap(hcd->regs);
++      usb_put_hcd(hcd);
++      release_mem_region(hcd->rsrc_start, hcd->rsrc_len);
++      if (usb_host_clock) {
++              clk_disable(usb_host_clock);
++              clk_put(usb_host_clock);
++      }
++      platform_set_drvdata(pdev, NULL);
++      return 0;
++}
++
++static struct platform_driver ehci_hcd_bcm63xx_driver = {
++      .probe          = ehci_hcd_bcm63xx_drv_probe,
++      .remove         = __devexit_p(ehci_hcd_bcm63xx_drv_remove),
++      .shutdown       = usb_hcd_platform_shutdown,
++      .driver         = {
++              .name   = "bcm63xx_ehci",
++              .owner  = THIS_MODULE,
++      },
++};
++
++MODULE_ALIAS("platform:bcm63xx_ehci");
+--- a/drivers/usb/host/ehci-hcd.c
++++ b/drivers/usb/host/ehci-hcd.c
+@@ -1339,6 +1339,11 @@ MODULE_LICENSE ("GPL");
+ #define PLATFORM_DRIVER               ehci_platform_driver
+ #endif
++#ifdef CONFIG_USB_EHCI_BCM63XX
++#include "ehci-bcm63xx.c"
++#define       PLATFORM_DRIVER         ehci_hcd_bcm63xx_driver
++#endif
++
+ #if !defined(PCI_DRIVER) && !defined(PLATFORM_DRIVER) && \
+     !defined(PS3_SYSTEM_BUS_DRIVER) && !defined(OF_PLATFORM_DRIVER) && \
+     !defined(XILINX_OF_PLATFORM_DRIVER)
diff --git a/target/linux/brcm63xx/patches-3.6/403-MIPS-BCM63XX-register-ehci-device.patch b/target/linux/brcm63xx/patches-3.6/403-MIPS-BCM63XX-register-ehci-device.patch
new file mode 100644 (file)
index 0000000..f50be14
--- /dev/null
@@ -0,0 +1,125 @@
+From a2d78246e4cb45b5978fc682aad19c0fff0cd20d Mon Sep 17 00:00:00 2001
+From: Maxime Bizon <mbizon@freebox.fr>
+Date: Tue, 24 May 2011 21:50:33 +0200
+Subject: [PATCH 26/63] MIPS: BCM63XX: register ehci device.
+
+---
+ arch/mips/bcm63xx/Kconfig                          |    2 +
+ arch/mips/bcm63xx/Makefile                         |    2 +-
+ arch/mips/bcm63xx/boards/board_bcm963xx.c          |    4 ++
+ arch/mips/bcm63xx/dev-usb-ehci.c                   |   50 ++++++++++++++++++++
+ .../asm/mach-bcm63xx/bcm63xx_dev_usb_ehci.h        |    6 ++
+ 5 files changed, 63 insertions(+), 1 deletions(-)
+ create mode 100644 arch/mips/bcm63xx/dev-usb-ehci.c
+ create mode 100644 arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_usb_ehci.h
+
+--- a/arch/mips/bcm63xx/Kconfig
++++ b/arch/mips/bcm63xx/Kconfig
+@@ -22,6 +22,7 @@ config BCM63XX_CPU_6358
+       bool "support 6358 CPU"
+       select HW_HAS_PCI
+       select USB_ARCH_HAS_OHCI if USB_SUPPORT
++      select USB_ARCH_HAS_EHCI if USB_SUPPORT
+ config BCM63XX_CPU_6362
+       bool "support 6362 CPU"
+@@ -31,6 +32,7 @@ config BCM63XX_CPU_6368
+       bool "support 6368 CPU"
+       select HW_HAS_PCI
+       select USB_ARCH_HAS_OHCI if USB_SUPPORT
++      select USB_ARCH_HAS_EHCI if USB_SUPPORT
+ endmenu
+ source "arch/mips/bcm63xx/boards/Kconfig"
+--- a/arch/mips/bcm63xx/Makefile
++++ b/arch/mips/bcm63xx/Makefile
+@@ -1,6 +1,6 @@
+ obj-y         += clk.o cpu.o cs.o gpio.o irq.o prom.o setup.o timer.o \
+                  dev-dsp.o dev-enet.o dev-flash.o dev-pcmcia.o dev-rng.o \
+-                 dev-spi.o dev-uart.o dev-usb-ohci.o dev-wdt.o
++                 dev-spi.o dev-uart.o dev-usb-ehci.o dev-usb-ohci.o dev-wdt.o
+ obj-$(CONFIG_EARLY_PRINTK)    += early_printk.o
+ obj-y         += boards/
+--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
++++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
+@@ -28,6 +28,7 @@
+ #include <bcm63xx_dev_pcmcia.h>
+ #include <bcm63xx_dev_spi.h>
+ #include <bcm63xx_dev_usb_ohci.h>
++#include <bcm63xx_dev_usb_ehci.h>
+ #include <board_bcm963xx.h>
+ #include <bcm963xx_tag.h>
+@@ -962,6 +963,9 @@ int __init board_register_devices(void)
+           !board_get_mac_address(board.enet1.mac_addr))
+               bcm63xx_enet_register(1, &board.enet1);
++      if (board.has_ehci0)
++              bcm63xx_ehci_register();
++
+       if (board.has_ohci0)
+               bcm63xx_ohci_register();
+--- /dev/null
++++ b/arch/mips/bcm63xx/dev-usb-ehci.c
+@@ -0,0 +1,50 @@
++/*
++ * This file is subject to the terms and conditions of the GNU General Public
++ * License.  See the file "COPYING" in the main directory of this archive
++ * for more details.
++ *
++ * Copyright (C) 2008 Maxime Bizon <mbizon@freebox.fr>
++ */
++
++#include <linux/init.h>
++#include <linux/kernel.h>
++#include <linux/platform_device.h>
++#include <bcm63xx_cpu.h>
++#include <bcm63xx_dev_usb_ehci.h>
++
++static struct resource ehci_resources[] = {
++      {
++              .start          = -1, /* filled at runtime */
++              .end            = -1, /* filled at runtime */
++              .flags          = IORESOURCE_MEM,
++      },
++      {
++              .start          = -1, /* filled at runtime */
++              .flags          = IORESOURCE_IRQ,
++      },
++};
++
++static u64 ehci_dmamask = ~(u32)0;
++
++static struct platform_device bcm63xx_ehci_device = {
++      .name           = "bcm63xx_ehci",
++      .id             = 0,
++      .num_resources  = ARRAY_SIZE(ehci_resources),
++      .resource       = ehci_resources,
++      .dev            = {
++              .dma_mask               = &ehci_dmamask,
++              .coherent_dma_mask      = 0xffffffff,
++      },
++};
++
++int __init bcm63xx_ehci_register(void)
++{
++      if (!BCMCPU_IS_6358() && !BCMCPU_IS_6368())
++              return 0;
++
++      ehci_resources[0].start = bcm63xx_regset_address(RSET_EHCI0);
++      ehci_resources[0].end = ehci_resources[0].start;
++      ehci_resources[0].end += RSET_EHCI_SIZE - 1;
++      ehci_resources[1].start = bcm63xx_get_irq_number(IRQ_EHCI0);
++      return platform_device_register(&bcm63xx_ehci_device);
++}
+--- /dev/null
++++ b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_usb_ehci.h
+@@ -0,0 +1,6 @@
++#ifndef BCM63XX_DEV_USB_EHCI_H_
++#define BCM63XX_DEV_USB_EHCI_H_
++
++int bcm63xx_ehci_register(void);
++
++#endif /* BCM63XX_DEV_USB_EHCI_H_ */
diff --git a/target/linux/brcm63xx/patches-3.6/404-bcm963xx_flashmap.patch b/target/linux/brcm63xx/patches-3.6/404-bcm963xx_flashmap.patch
new file mode 100644 (file)
index 0000000..3017793
--- /dev/null
@@ -0,0 +1,65 @@
+From a4d005c91d403d9f3d0272db6cc46202c06ec774 Mon Sep 17 00:00:00 2001
+From: Axel Gembe <ago@bastart.eu.org>
+Date: Mon, 12 May 2008 18:54:09 +0200
+Subject: [PATCH] bcm963xx: flashmap support
+
+Signed-off-by: Axel Gembe <ago@bastart.eu.org>
+---
+ arch/mips/bcm63xx/boards/board_bcm963xx.c |   19 +----------------
+ drivers/mtd/maps/bcm963xx-flash.c         |   32 ++++++++++++++++++++++++----
+ drivers/mtd/redboot.c                     |   13 +++++++++--
+ 3 files changed, 38 insertions(+), 26 deletions(-)
+
+--- a/arch/mips/bcm63xx/dev-flash.c
++++ b/arch/mips/bcm63xx/dev-flash.c
+@@ -30,7 +30,7 @@ static struct mtd_partition mtd_partitio
+       }
+ };
+-static const char *bcm63xx_part_types[] = { "bcm63xxpart", NULL };
++static const char *bcm63xx_part_types[] = { "bcm63xxpart", "RedBoot", NULL };
+ static struct physmap_flash_data flash_data = {
+       .width                  = 2,
+--- a/drivers/mtd/redboot.c
++++ b/drivers/mtd/redboot.c
+@@ -75,6 +75,7 @@ static int parse_redboot_partitions(stru
+       int nulllen = 0;
+       int numslots;
+       unsigned long offset;
++      unsigned long fis_origin = 0;
+ #ifdef CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED
+       static char nullstring[] = "unallocated";
+ #endif
+@@ -179,6 +180,16 @@ static int parse_redboot_partitions(stru
+               goto out;
+       }
++      if (data && data->origin) {
++              fis_origin = data->origin;
++      } else {
++              for (i = 0; i < numslots; i++) {
++                      if (!strncmp(buf[i].name, "RedBoot", 8)) {
++                              fis_origin = (buf[i].flash_base & (master->size << 1) - 1);
++                      }
++              }
++      }
++
+       for (i = 0; i < numslots; i++) {
+               struct fis_list *new_fl, **prev;
+@@ -199,10 +210,10 @@ static int parse_redboot_partitions(stru
+                       goto out;
+               }
+               new_fl->img = &buf[i];
+-              if (data && data->origin)
+-                      buf[i].flash_base -= data->origin;
+-              else
+-                      buf[i].flash_base &= master->size-1;
++              if (fis_origin)
++                      buf[i].flash_base -= fis_origin;
++
++              buf[i].flash_base &= (master->size << 1) - 1;
+               /* I'm sure the JFFS2 code has done me permanent damage.
+                * I now think the following is _normal_
diff --git a/target/linux/brcm63xx/patches-3.6/405-bcm963xx_real_rootfs_length.patch b/target/linux/brcm63xx/patches-3.6/405-bcm963xx_real_rootfs_length.patch
new file mode 100644 (file)
index 0000000..856b9e2
--- /dev/null
@@ -0,0 +1,27 @@
+--- a/arch/mips/include/asm/mach-bcm63xx/bcm963xx_tag.h
++++ b/arch/mips/include/asm/mach-bcm63xx/bcm963xx_tag.h
+@@ -85,8 +85,10 @@ struct bcm_tag {
+       __u32 rootfs_crc;
+       /* 224-227: CRC32 of kernel partition */
+       __u32 kernel_crc;
+-      /* 228-235: Unused at present */
+-      char reserved1[8];
++      /* 228-231: Image sequence number */
++      char image_sequence[4];
++      /* 222-235: Openwrt: real rootfs length */
++      __u32 real_rootfs_length;
+       /* 236-239: CRC32 of header excluding last 20 bytes */
+       __u32 header_crc;
+       /* 240-255: Unused at present */
+--- a/drivers/mtd/bcm63xxpart.c
++++ b/drivers/mtd/bcm63xxpart.c
+@@ -131,7 +131,8 @@ static int bcm63xx_parse_cfe_partitions(
+               } else {
+                       /* OpenWrt layout */
+                       rootfsaddr = kerneladdr + kernellen;
+-                      rootfslen = spareaddr - rootfsaddr;
++                      rootfslen = buf->real_rootfs_length;
++                      spareaddr = rootfsaddr + rootfslen;
+               }
+       } else {
+               pr_warn("CFE boot tag CRC invalid (expected %08x, actual %08x)\n",
diff --git a/target/linux/brcm63xx/patches-3.6/406_bcm63xx_enet_vlan_incoming_fixed.patch b/target/linux/brcm63xx/patches-3.6/406_bcm63xx_enet_vlan_incoming_fixed.patch
new file mode 100644 (file)
index 0000000..7d9f4a9
--- /dev/null
@@ -0,0 +1,11 @@
+--- a/drivers/net/ethernet/broadcom/bcm63xx_enet.c
++++ b/drivers/net/ethernet/broadcom/bcm63xx_enet.c
+@@ -1515,7 +1515,7 @@ static int compute_hw_mtu(struct bcm_ene
+       actual_mtu = mtu;
+       /* add ethernet header + vlan tag size */
+-      actual_mtu += VLAN_ETH_HLEN;
++      actual_mtu += VLAN_ETH_HLEN + VLAN_HLEN;
+       if (actual_mtu < 64 || actual_mtu > BCMENET_MAX_MTU)
+               return -EINVAL;
diff --git a/target/linux/brcm63xx/patches-3.6/408-6358-enet1-external-mii-clk.patch b/target/linux/brcm63xx/patches-3.6/408-6358-enet1-external-mii-clk.patch
new file mode 100644 (file)
index 0000000..9ce7737
--- /dev/null
@@ -0,0 +1,22 @@
+--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
++++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
+@@ -900,6 +900,8 @@ void __init board_prom_init(void)
+               if (BCMCPU_IS_6348())
+                       val |= GPIO_MODE_6348_G3_EXT_MII |
+                               GPIO_MODE_6348_G0_EXT_MII;
++              else if (BCMCPU_IS_6358())
++                      val |= GPIO_MODE_6358_ENET1_MII_CLK_INV;
+       }
+       bcm_gpio_writel(val, GPIO_MODE_REG);
+--- a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h
++++ b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h
+@@ -563,6 +563,8 @@
+ #define GPIO_MODE_6358_EXTRA_SPI_SS   (1 << 7)
+ #define GPIO_MODE_6358_SERIAL_LED     (1 << 10)
+ #define GPIO_MODE_6358_UTOPIA         (1 << 12)
++#define GPIO_MODE_6358_ENET1_MII_CLK_INV (1 << 30)
++#define GPIO_MODE_6358_ENET0_MII_CLK_INV (1 << 31)
+ #define GPIO_MODE_6368_ANALOG_AFE_0   (1 << 0)
+ #define GPIO_MODE_6368_ANALOG_AFE_1   (1 << 1)
diff --git a/target/linux/brcm63xx/patches-3.6/410-NET-bcm63xx_enet-move-phy_-dis-connect-into-probe-re.patch b/target/linux/brcm63xx/patches-3.6/410-NET-bcm63xx_enet-move-phy_-dis-connect-into-probe-re.patch
new file mode 100644 (file)
index 0000000..2102db3
--- /dev/null
@@ -0,0 +1,169 @@
+From b11218c750ab92cfab4408a0328f1b36ceec3f33 Mon Sep 17 00:00:00 2001
+From: Jonas Gorski <jonas.gorski@gmail.com>
+Date: Fri, 6 Jan 2012 12:24:18 +0100
+Subject: [PATCH 19/63] NET: bcm63xx_enet: move phy_(dis)connect into probe/remove
+
+Only connect/disconnect the phy during probe and remove, not during any
+open/close. The phy seldom changes during the runtime, and disconnecting
+the phy during close will prevent it from keeping any configuration over
+a down/up cycle.
+
+Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
+---
+ drivers/net/ethernet/broadcom/bcm63xx_enet.c |   84 +++++++++++++-------------
+ 1 files changed, 41 insertions(+), 43 deletions(-)
+
+--- a/drivers/net/ethernet/broadcom/bcm63xx_enet.c
++++ b/drivers/net/ethernet/broadcom/bcm63xx_enet.c
+@@ -784,10 +784,8 @@ static int bcm_enet_open(struct net_devi
+       struct bcm_enet_priv *priv;
+       struct sockaddr addr;
+       struct device *kdev;
+-      struct phy_device *phydev;
+       int i, ret;
+       unsigned int size;
+-      char phy_id[MII_BUS_ID_SIZE + 3];
+       void *p;
+       u32 val;
+@@ -795,40 +793,10 @@ static int bcm_enet_open(struct net_devi
+       kdev = &priv->pdev->dev;
+       if (priv->has_phy) {
+-              /* connect to PHY */
+-              snprintf(phy_id, sizeof(phy_id), PHY_ID_FMT,
+-                       priv->mii_bus->id, priv->phy_id);
+-
+-              phydev = phy_connect(dev, phy_id, bcm_enet_adjust_phy_link, 0,
+-                                   PHY_INTERFACE_MODE_MII);
+-
+-              if (IS_ERR(phydev)) {
+-                      dev_err(kdev, "could not attach to PHY\n");
+-                      return PTR_ERR(phydev);
+-              }
+-
+-              /* mask with MAC supported features */
+-              phydev->supported &= (SUPPORTED_10baseT_Half |
+-                                    SUPPORTED_10baseT_Full |
+-                                    SUPPORTED_100baseT_Half |
+-                                    SUPPORTED_100baseT_Full |
+-                                    SUPPORTED_Autoneg |
+-                                    SUPPORTED_Pause |
+-                                    SUPPORTED_MII);
+-              phydev->advertising = phydev->supported;
+-
+-              if (priv->pause_auto && priv->pause_rx && priv->pause_tx)
+-                      phydev->advertising |= SUPPORTED_Pause;
+-              else
+-                      phydev->advertising &= ~SUPPORTED_Pause;
+-
+-              dev_info(kdev, "attached PHY at address %d [%s]\n",
+-                       phydev->addr, phydev->drv->name);
+-
++              /* Reset state */
+               priv->old_link = 0;
+               priv->old_duplex = -1;
+               priv->old_pause = -1;
+-              priv->phydev = phydev;
+       }
+       /* mask all interrupts and request them */
+@@ -838,7 +806,7 @@ static int bcm_enet_open(struct net_devi
+       ret = request_irq(dev->irq, bcm_enet_isr_mac, 0, dev->name, dev);
+       if (ret)
+-              goto out_phy_disconnect;
++              return ret;
+       ret = request_irq(priv->irq_rx, bcm_enet_isr_dma, IRQF_DISABLED,
+                         dev->name, dev);
+@@ -1025,9 +993,6 @@ out_freeirq_rx:
+ out_freeirq:
+       free_irq(dev->irq, dev);
+-out_phy_disconnect:
+-      phy_disconnect(priv->phydev);
+-
+       return ret;
+ }
+@@ -1132,12 +1097,6 @@ static int bcm_enet_stop(struct net_devi
+       free_irq(priv->irq_rx, dev);
+       free_irq(dev->irq, dev);
+-      /* release phy */
+-      if (priv->has_phy) {
+-              phy_disconnect(priv->phydev);
+-              priv->phydev = NULL;
+-      }
+-
+       return 0;
+ }
+@@ -1714,6 +1673,8 @@ static int __devinit bcm_enet_probe(stru
+       /* MII bus registration */
+       if (priv->has_phy) {
++              struct phy_device *phydev;
++              char phy_id[MII_BUS_ID_SIZE + 3];
+               priv->mii_bus = mdiobus_alloc();
+               if (!priv->mii_bus) {
+@@ -1750,6 +1711,38 @@ static int __devinit bcm_enet_probe(stru
+                       dev_err(&pdev->dev, "unable to register mdio bus\n");
+                       goto out_free_mdio;
+               }
++
++              /* connect to PHY */
++              snprintf(phy_id, sizeof(phy_id), PHY_ID_FMT,
++                       priv->mii_bus->id, priv->phy_id);
++
++              phydev = phy_connect(dev, phy_id, bcm_enet_adjust_phy_link, 0,
++                                   PHY_INTERFACE_MODE_MII);
++
++              if (IS_ERR(phydev)) {
++                      dev_err(&pdev->dev, "could not attach to PHY\n");
++                      goto out_unregister_mdio;
++              }
++
++              /* mask with MAC supported features */
++              phydev->supported &= (SUPPORTED_10baseT_Half |
++                                    SUPPORTED_10baseT_Full |
++                                    SUPPORTED_100baseT_Half |
++                                    SUPPORTED_100baseT_Full |
++                                    SUPPORTED_Autoneg |
++                                    SUPPORTED_Pause |
++                                    SUPPORTED_MII);
++              phydev->advertising = phydev->supported;
++
++              if (priv->pause_auto && priv->pause_rx && priv->pause_tx)
++                      phydev->advertising |= SUPPORTED_Pause;
++              else
++                      phydev->advertising &= ~SUPPORTED_Pause;
++
++              dev_info(&pdev->dev, "attached PHY at address %d [%s]\n",
++                       phydev->addr, phydev->drv->name);
++
++              priv->phydev = phydev;
+       } else {
+               /* run platform code to initialize PHY device */
+@@ -1795,6 +1788,9 @@ static int __devinit bcm_enet_probe(stru
+       return 0;
+ out_unregister_mdio:
++      if (priv->phydev)
++              phy_disconnect(priv->phydev);
++
+       if (priv->mii_bus) {
+               mdiobus_unregister(priv->mii_bus);
+               kfree(priv->mii_bus->irq);
+@@ -1845,6 +1841,8 @@ static int __devexit bcm_enet_remove(str
+       enet_writel(priv, 0, ENET_MIISC_REG);
+       if (priv->has_phy) {
++              phy_disconnect(priv->phydev);
++              priv->phydev = NULL;
+               mdiobus_unregister(priv->mii_bus);
+               kfree(priv->mii_bus->irq);
+               mdiobus_free(priv->mii_bus);
diff --git a/target/linux/brcm63xx/patches-3.6/411-bcm63xx_enet-implement-reset_autoneg-ethtool.patch b/target/linux/brcm63xx/patches-3.6/411-bcm63xx_enet-implement-reset_autoneg-ethtool.patch
new file mode 100644 (file)
index 0000000..d143b47
--- /dev/null
@@ -0,0 +1,40 @@
+From accc558f334662c8b16c121b4819931c028e8eb0 Mon Sep 17 00:00:00 2001
+From: Maxime Bizon <mbizon@freebox.fr>
+Date: Mon, 8 Jun 2009 16:12:10 +0200
+Subject: [PATCH 27/63] bcm63xx_enet: implement reset_autoneg ethtool.
+
+---
+ drivers/net/ethernet/broadcom/bcm63xx_enet.c |   15 +++++++++++++++
+ 1 files changed, 15 insertions(+), 0 deletions(-)
+
+--- a/drivers/net/ethernet/broadcom/bcm63xx_enet.c
++++ b/drivers/net/ethernet/broadcom/bcm63xx_enet.c
+@@ -1290,6 +1290,20 @@ static void bcm_enet_get_ethtool_stats(s
+       mutex_unlock(&priv->mib_update_lock);
+ }
++static int bcm_enet_nway_reset(struct net_device *dev)
++{
++      struct bcm_enet_priv *priv;
++
++      priv = netdev_priv(dev);
++      if (priv->has_phy) {
++              if (!priv->phydev)
++                      return -ENODEV;
++              return genphy_restart_aneg(priv->phydev);
++      }
++
++      return -EOPNOTSUPP;
++}
++
+ static int bcm_enet_get_settings(struct net_device *dev,
+                                struct ethtool_cmd *cmd)
+ {
+@@ -1432,6 +1446,7 @@ static const struct ethtool_ops bcm_enet
+       .get_strings            = bcm_enet_get_strings,
+       .get_sset_count         = bcm_enet_get_sset_count,
+       .get_ethtool_stats      = bcm_enet_get_ethtool_stats,
++      .nway_reset             = bcm_enet_nway_reset,
+       .get_settings           = bcm_enet_get_settings,
+       .set_settings           = bcm_enet_set_settings,
+       .get_drvinfo            = bcm_enet_get_drvinfo,
diff --git a/target/linux/brcm63xx/patches-3.6/412-bcm63xx_enet-use-resource_size.patch b/target/linux/brcm63xx/patches-3.6/412-bcm63xx_enet-use-resource_size.patch
new file mode 100644 (file)
index 0000000..11d035d
--- /dev/null
@@ -0,0 +1,69 @@
+From dbd9b51204aa4114756b8659e180139ef3878032 Mon Sep 17 00:00:00 2001
+From: Maxime Bizon <mbizon@freebox.fr>
+Date: Thu, 21 Jan 2010 17:28:36 +0100
+Subject: [PATCH 28/63] bcm63xx_enet: use resource_size().
+
+---
+ drivers/net/ethernet/broadcom/bcm63xx_enet.c |   18 ++++++++----------
+ 1 files changed, 8 insertions(+), 10 deletions(-)
+
+--- a/drivers/net/ethernet/broadcom/bcm63xx_enet.c
++++ b/drivers/net/ethernet/broadcom/bcm63xx_enet.c
+@@ -1594,7 +1594,6 @@ static int __devinit bcm_enet_probe(stru
+       struct resource *res_mem, *res_irq, *res_irq_rx, *res_irq_tx;
+       struct mii_bus *bus;
+       const char *clk_name;
+-      unsigned int iomem_size;
+       int i, ret;
+       /* stop if shared driver failed, assume driver->probe will be
+@@ -1619,13 +1618,13 @@ static int __devinit bcm_enet_probe(stru
+       if (ret)
+               goto out;
+-      iomem_size = resource_size(res_mem);
+-      if (!request_mem_region(res_mem->start, iomem_size, "bcm63xx_enet")) {
++      if (!request_mem_region(res_mem->start, resource_size(res_mem),
++                              "bcm63xx_enet")) {
+               ret = -EBUSY;
+               goto out;
+       }
+-      priv->base = ioremap(res_mem->start, iomem_size);
++      priv->base = ioremap(res_mem->start, resource_size(res_mem));
+       if (priv->base == NULL) {
+               ret = -ENOMEM;
+               goto out_release_mem;
+@@ -1831,7 +1830,7 @@ out_unmap:
+       iounmap(priv->base);
+ out_release_mem:
+-      release_mem_region(res_mem->start, iomem_size);
++      release_mem_region(res_mem->start, resource_size(res_mem));
+ out:
+       free_netdev(dev);
+       return ret;
+@@ -1903,19 +1902,18 @@ struct platform_driver bcm63xx_enet_driv
+ static int __devinit bcm_enet_shared_probe(struct platform_device *pdev)
+ {
+       struct resource *res;
+-      unsigned int iomem_size;
+       res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+       if (!res)
+               return -ENODEV;
+-      iomem_size = resource_size(res);
+-      if (!request_mem_region(res->start, iomem_size, "bcm63xx_enet_dma"))
++      if (!request_mem_region(res->start, resource_size(res),
++                              "bcm63xx_enet_dma"))
+               return -EBUSY;
+-      bcm_enet_shared_base = ioremap(res->start, iomem_size);
++      bcm_enet_shared_base = ioremap(res->start, resource_size(res));
+       if (!bcm_enet_shared_base) {
+-              release_mem_region(res->start, iomem_size);
++              release_mem_region(res->start, resource_size(res));
+               return -ENOMEM;
+       }
+       return 0;
diff --git a/target/linux/brcm63xx/patches-3.6/413-bcm63xx_enet-disable-clock-when-uninitializing-devic.patch b/target/linux/brcm63xx/patches-3.6/413-bcm63xx_enet-disable-clock-when-uninitializing-devic.patch
new file mode 100644 (file)
index 0000000..a98bea9
--- /dev/null
@@ -0,0 +1,20 @@
+From fd15ecd10c95480be5635f8993b781fe3a1527c2 Mon Sep 17 00:00:00 2001
+From: Maxime Bizon <mbizon@freebox.fr>
+Date: Fri, 29 Apr 2011 16:54:50 +0200
+Subject: [PATCH 29/63] bcm63xx_enet: disable clock when uninitializing device.
+
+---
+ drivers/net/ethernet/broadcom/bcm63xx_enet.c |    2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+--- a/drivers/net/ethernet/broadcom/bcm63xx_enet.c
++++ b/drivers/net/ethernet/broadcom/bcm63xx_enet.c
+@@ -1870,6 +1870,8 @@ static int __devexit bcm_enet_remove(str
+       }
+       /* release device resources */
++      clk_disable(priv->mac_clk);
++      clk_put(priv->mac_clk);
+       iounmap(priv->base);
+       res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+       release_mem_region(res->start, resource_size(res));
diff --git a/target/linux/brcm63xx/patches-3.6/414-bcm63xx_enet-split-dma-registers-access.patch b/target/linux/brcm63xx/patches-3.6/414-bcm63xx_enet-split-dma-registers-access.patch
new file mode 100644 (file)
index 0000000..90999fa
--- /dev/null
@@ -0,0 +1,381 @@
+From 305579c1f946ed1aa6c125252ace21c53d47c11d Mon Sep 17 00:00:00 2001
+From: Maxime Bizon <mbizon@freebox.fr>
+Date: Thu, 21 Jan 2010 17:50:54 +0100
+Subject: [PATCH 30/63] bcm63xx_enet: split dma registers access.
+
+---
+ arch/mips/bcm63xx/dev-enet.c                     |   23 +++-
+ arch/mips/include/asm/mach-bcm63xx/bcm63xx_cpu.h |    4 +-
+ drivers/net/ethernet/broadcom/bcm63xx_enet.c     |  179 ++++++++++++++--------
+ 3 files changed, 138 insertions(+), 68 deletions(-)
+
+--- a/arch/mips/bcm63xx/dev-enet.c
++++ b/arch/mips/bcm63xx/dev-enet.c
+@@ -19,6 +19,16 @@ static struct resource shared_res[] = {
+               .end            = -1, /* filled at runtime */
+               .flags          = IORESOURCE_MEM,
+       },
++      {
++              .start          = -1, /* filled at runtime */
++              .end            = -1, /* filled at runtime */
++              .flags          = IORESOURCE_MEM,
++      },
++      {
++              .start          = -1, /* filled at runtime */
++              .end            = -1, /* filled at runtime */
++              .flags          = IORESOURCE_MEM,
++      },
+ };
+ static struct platform_device bcm63xx_enet_shared_device = {
+@@ -110,10 +120,15 @@ int __init bcm63xx_enet_register(int uni
+       if (!shared_device_registered) {
+               shared_res[0].start = bcm63xx_regset_address(RSET_ENETDMA);
+               shared_res[0].end = shared_res[0].start;
+-              if (BCMCPU_IS_6338())
+-                      shared_res[0].end += (RSET_ENETDMA_SIZE / 2)  - 1;
+-              else
+-                      shared_res[0].end += (RSET_ENETDMA_SIZE)  - 1;
++              shared_res[0].end += (RSET_ENETDMA_SIZE)  - 1;
++
++              shared_res[1].start = bcm63xx_regset_address(RSET_ENETDMAC);
++              shared_res[1].end = shared_res[1].start;
++              shared_res[1].end += RSET_ENETDMAC_SIZE(16)  - 1;
++
++              shared_res[2].start = bcm63xx_regset_address(RSET_ENETDMAS);
++              shared_res[2].end = shared_res[2].start;
++              shared_res[2].end += RSET_ENETDMAS_SIZE(16)  - 1;
+               ret = platform_device_register(&bcm63xx_enet_shared_device);
+               if (ret)
+--- a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_cpu.h
++++ b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_cpu.h
+@@ -172,7 +172,9 @@ enum bcm63xx_regs_set {
+ #define BCM_6358_RSET_SPI_SIZE                1804
+ #define BCM_6368_RSET_SPI_SIZE                1804
+ #define RSET_ENET_SIZE                        2048
+-#define RSET_ENETDMA_SIZE             2048
++#define RSET_ENETDMA_SIZE             256
++#define RSET_ENETDMAC_SIZE(chans)     (16 * (chans))
++#define RSET_ENETDMAS_SIZE(chans)     (16 * (chans))
+ #define RSET_ENETSW_SIZE              65536
+ #define RSET_UART_SIZE                        24
+ #define RSET_HSSPI_SIZE                       1536
+--- a/drivers/net/ethernet/broadcom/bcm63xx_enet.c
++++ b/drivers/net/ethernet/broadcom/bcm63xx_enet.c
+@@ -41,8 +41,8 @@ static int copybreak __read_mostly = 128
+ module_param(copybreak, int, 0);
+ MODULE_PARM_DESC(copybreak, "Receive copy threshold");
+-/* io memory shared between all devices */
+-static void __iomem *bcm_enet_shared_base;
++/* io registers memory shared between all devices */
++static void __iomem *bcm_enet_shared_base[3];
+ /*
+  * io helpers to access mac registers
+@@ -63,13 +63,35 @@ static inline void enet_writel(struct bc
+  */
+ static inline u32 enet_dma_readl(struct bcm_enet_priv *priv, u32 off)
+ {
+-      return bcm_readl(bcm_enet_shared_base + off);
++      return bcm_readl(bcm_enet_shared_base[0] + off);
+ }
+ static inline void enet_dma_writel(struct bcm_enet_priv *priv,
+                                      u32 val, u32 off)
+ {
+-      bcm_writel(val, bcm_enet_shared_base + off);
++      bcm_writel(val, bcm_enet_shared_base[0] + off);
++}
++
++static inline u32 enet_dmac_readl(struct bcm_enet_priv *priv, u32 off)
++{
++      return bcm_readl(bcm_enet_shared_base[1] + off);
++}
++
++static inline void enet_dmac_writel(struct bcm_enet_priv *priv,
++                                     u32 val, u32 off)
++{
++      bcm_writel(val, bcm_enet_shared_base[1] + off);
++}
++
++static inline u32 enet_dmas_readl(struct bcm_enet_priv *priv, u32 off)
++{
++      return bcm_readl(bcm_enet_shared_base[2] + off);
++}
++
++static inline void enet_dmas_writel(struct bcm_enet_priv *priv,
++                                     u32 val, u32 off)
++{
++      bcm_writel(val, bcm_enet_shared_base[2] + off);
+ }
+ /*
+@@ -353,8 +375,8 @@ static int bcm_enet_receive_queue(struct
+               bcm_enet_refill_rx(dev);
+               /* kick rx dma */
+-              enet_dma_writel(priv, ENETDMA_CHANCFG_EN_MASK,
+-                              ENETDMA_CHANCFG_REG(priv->rx_chan));
++              enet_dmac_writel(priv, ENETDMAC_CHANCFG_EN_MASK,
++                               ENETDMAC_CHANCFG_REG(priv->rx_chan));
+       }
+       return processed;
+@@ -429,10 +451,10 @@ static int bcm_enet_poll(struct napi_str
+       dev = priv->net_dev;
+       /* ack interrupts */
+-      enet_dma_writel(priv, ENETDMA_IR_PKTDONE_MASK,
+-                      ENETDMA_IR_REG(priv->rx_chan));
+-      enet_dma_writel(priv, ENETDMA_IR_PKTDONE_MASK,
+-                      ENETDMA_IR_REG(priv->tx_chan));
++      enet_dmac_writel(priv, ENETDMAC_IR_PKTDONE_MASK,
++                       ENETDMAC_IR_REG(priv->rx_chan));
++      enet_dmac_writel(priv, ENETDMAC_IR_PKTDONE_MASK,
++                       ENETDMAC_IR_REG(priv->tx_chan));
+       /* reclaim sent skb */
+       tx_work_done = bcm_enet_tx_reclaim(dev, 0);
+@@ -451,10 +473,10 @@ static int bcm_enet_poll(struct napi_str
+       napi_complete(napi);
+       /* restore rx/tx interrupt */
+-      enet_dma_writel(priv, ENETDMA_IR_PKTDONE_MASK,
+-                      ENETDMA_IRMASK_REG(priv->rx_chan));
+-      enet_dma_writel(priv, ENETDMA_IR_PKTDONE_MASK,
+-                      ENETDMA_IRMASK_REG(priv->tx_chan));
++      enet_dmac_writel(priv, ENETDMAC_IR_PKTDONE_MASK,
++                       ENETDMAC_IRMASK_REG(priv->rx_chan));
++      enet_dmac_writel(priv, ENETDMAC_IR_PKTDONE_MASK,
++                       ENETDMAC_IRMASK_REG(priv->tx_chan));
+       return rx_work_done;
+ }
+@@ -497,8 +519,8 @@ static irqreturn_t bcm_enet_isr_dma(int
+       priv = netdev_priv(dev);
+       /* mask rx/tx interrupts */
+-      enet_dma_writel(priv, 0, ENETDMA_IRMASK_REG(priv->rx_chan));
+-      enet_dma_writel(priv, 0, ENETDMA_IRMASK_REG(priv->tx_chan));
++      enet_dmac_writel(priv, 0, ENETDMAC_IRMASK_REG(priv->rx_chan));
++      enet_dmac_writel(priv, 0, ENETDMAC_IRMASK_REG(priv->tx_chan));
+       napi_schedule(&priv->napi);
+@@ -557,8 +579,8 @@ static int bcm_enet_start_xmit(struct sk
+       wmb();
+       /* kick tx dma */
+-      enet_dma_writel(priv, ENETDMA_CHANCFG_EN_MASK,
+-                      ENETDMA_CHANCFG_REG(priv->tx_chan));
++      enet_dmac_writel(priv, ENETDMAC_CHANCFG_EN_MASK,
++                       ENETDMAC_CHANCFG_REG(priv->tx_chan));
+       /* stop queue if no more desc available */
+       if (!priv->tx_desc_count)
+@@ -801,8 +823,8 @@ static int bcm_enet_open(struct net_devi
+       /* mask all interrupts and request them */
+       enet_writel(priv, 0, ENET_IRMASK_REG);
+-      enet_dma_writel(priv, 0, ENETDMA_IRMASK_REG(priv->rx_chan));
+-      enet_dma_writel(priv, 0, ENETDMA_IRMASK_REG(priv->tx_chan));
++      enet_dmac_writel(priv, 0, ENETDMAC_IRMASK_REG(priv->rx_chan));
++      enet_dmac_writel(priv, 0, ENETDMAC_IRMASK_REG(priv->tx_chan));
+       ret = request_irq(dev->irq, bcm_enet_isr_mac, 0, dev->name, dev);
+       if (ret)
+@@ -891,28 +913,28 @@ static int bcm_enet_open(struct net_devi
+       }
+       /* write rx & tx ring addresses */
+-      enet_dma_writel(priv, priv->rx_desc_dma,
+-                      ENETDMA_RSTART_REG(priv->rx_chan));
+-      enet_dma_writel(priv, priv->tx_desc_dma,
+-                      ENETDMA_RSTART_REG(priv->tx_chan));
++      enet_dmas_writel(priv, priv->rx_desc_dma,
++                       ENETDMAS_RSTART_REG(priv->rx_chan));
++      enet_dmas_writel(priv, priv->tx_desc_dma,
++                       ENETDMAS_RSTART_REG(priv->tx_chan));
+       /* clear remaining state ram for rx & tx channel */
+-      enet_dma_writel(priv, 0, ENETDMA_SRAM2_REG(priv->rx_chan));
+-      enet_dma_writel(priv, 0, ENETDMA_SRAM2_REG(priv->tx_chan));
+-      enet_dma_writel(priv, 0, ENETDMA_SRAM3_REG(priv->rx_chan));
+-      enet_dma_writel(priv, 0, ENETDMA_SRAM3_REG(priv->tx_chan));
+-      enet_dma_writel(priv, 0, ENETDMA_SRAM4_REG(priv->rx_chan));
+-      enet_dma_writel(priv, 0, ENETDMA_SRAM4_REG(priv->tx_chan));
++      enet_dmas_writel(priv, 0, ENETDMAS_SRAM2_REG(priv->rx_chan));
++      enet_dmas_writel(priv, 0, ENETDMAS_SRAM2_REG(priv->tx_chan));
++      enet_dmas_writel(priv, 0, ENETDMAS_SRAM3_REG(priv->rx_chan));
++      enet_dmas_writel(priv, 0, ENETDMAS_SRAM3_REG(priv->tx_chan));
++      enet_dmas_writel(priv, 0, ENETDMAS_SRAM4_REG(priv->rx_chan));
++      enet_dmas_writel(priv, 0, ENETDMAS_SRAM4_REG(priv->tx_chan));
+       /* set max rx/tx length */
+       enet_writel(priv, priv->hw_mtu, ENET_RXMAXLEN_REG);
+       enet_writel(priv, priv->hw_mtu, ENET_TXMAXLEN_REG);
+       /* set dma maximum burst len */
+-      enet_dma_writel(priv, BCMENET_DMA_MAXBURST,
+-                      ENETDMA_MAXBURST_REG(priv->rx_chan));
+-      enet_dma_writel(priv, BCMENET_DMA_MAXBURST,
+-                      ENETDMA_MAXBURST_REG(priv->tx_chan));
++      enet_dmac_writel(priv, BCMENET_DMA_MAXBURST,
++                       ENETDMAC_MAXBURST_REG(priv->rx_chan));
++      enet_dmac_writel(priv, BCMENET_DMA_MAXBURST,
++                       ENETDMAC_MAXBURST_REG(priv->tx_chan));
+       /* set correct transmit fifo watermark */
+       enet_writel(priv, BCMENET_TX_FIFO_TRESH, ENET_TXWMARK_REG);
+@@ -930,26 +952,26 @@ static int bcm_enet_open(struct net_devi
+       val |= ENET_CTL_ENABLE_MASK;
+       enet_writel(priv, val, ENET_CTL_REG);
+       enet_dma_writel(priv, ENETDMA_CFG_EN_MASK, ENETDMA_CFG_REG);
+-      enet_dma_writel(priv, ENETDMA_CHANCFG_EN_MASK,
+-                      ENETDMA_CHANCFG_REG(priv->rx_chan));
++      enet_dmac_writel(priv, ENETDMAC_CHANCFG_EN_MASK,
++                       ENETDMAC_CHANCFG_REG(priv->rx_chan));
+       /* watch "mib counters about to overflow" interrupt */
+       enet_writel(priv, ENET_IR_MIB, ENET_IR_REG);
+       enet_writel(priv, ENET_IR_MIB, ENET_IRMASK_REG);
+       /* watch "packet transferred" interrupt in rx and tx */
+-      enet_dma_writel(priv, ENETDMA_IR_PKTDONE_MASK,
+-                      ENETDMA_IR_REG(priv->rx_chan));
+-      enet_dma_writel(priv, ENETDMA_IR_PKTDONE_MASK,
+-                      ENETDMA_IR_REG(priv->tx_chan));
++      enet_dmac_writel(priv, ENETDMAC_IR_PKTDONE_MASK,
++                       ENETDMAC_IR_REG(priv->rx_chan));
++      enet_dmac_writel(priv, ENETDMAC_IR_PKTDONE_MASK,
++                       ENETDMAC_IR_REG(priv->tx_chan));
+       /* make sure we enable napi before rx interrupt  */
+       napi_enable(&priv->napi);
+-      enet_dma_writel(priv, ENETDMA_IR_PKTDONE_MASK,
+-                      ENETDMA_IRMASK_REG(priv->rx_chan));
+-      enet_dma_writel(priv, ENETDMA_IR_PKTDONE_MASK,
+-                      ENETDMA_IRMASK_REG(priv->tx_chan));
++      enet_dmac_writel(priv, ENETDMAC_IR_PKTDONE_MASK,
++                       ENETDMAC_IRMASK_REG(priv->rx_chan));
++      enet_dmac_writel(priv, ENETDMAC_IR_PKTDONE_MASK,
++                       ENETDMAC_IRMASK_REG(priv->tx_chan));
+       if (priv->has_phy)
+               phy_start(priv->phydev);
+@@ -1026,14 +1048,14 @@ static void bcm_enet_disable_dma(struct
+ {
+       int limit;
+-      enet_dma_writel(priv, 0, ENETDMA_CHANCFG_REG(chan));
++      enet_dmac_writel(priv, 0, ENETDMAC_CHANCFG_REG(chan));
+       limit = 1000;
+       do {
+               u32 val;
+-              val = enet_dma_readl(priv, ENETDMA_CHANCFG_REG(chan));
+-              if (!(val & ENETDMA_CHANCFG_EN_MASK))
++              val = enet_dmac_readl(priv, ENETDMAC_CHANCFG_REG(chan));
++              if (!(val & ENETDMAC_CHANCFG_EN_MASK))
+                       break;
+               udelay(1);
+       } while (limit--);
+@@ -1059,8 +1081,8 @@ static int bcm_enet_stop(struct net_devi
+       /* mask all interrupts */
+       enet_writel(priv, 0, ENET_IRMASK_REG);
+-      enet_dma_writel(priv, 0, ENETDMA_IRMASK_REG(priv->rx_chan));
+-      enet_dma_writel(priv, 0, ENETDMA_IRMASK_REG(priv->tx_chan));
++      enet_dmac_writel(priv, 0, ENETDMAC_IRMASK_REG(priv->rx_chan));
++      enet_dmac_writel(priv, 0, ENETDMAC_IRMASK_REG(priv->tx_chan));
+       /* make sure no mib update is scheduled */
+       cancel_work_sync(&priv->mib_update_task);
+@@ -1598,7 +1620,7 @@ static int __devinit bcm_enet_probe(stru
+       /* stop if shared driver failed, assume driver->probe will be
+        * called in the same order we register devices (correct ?) */
+-      if (!bcm_enet_shared_base)
++      if (!bcm_enet_shared_base[0])
+               return -ENODEV;
+       res_mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+@@ -1904,30 +1926,61 @@ struct platform_driver bcm63xx_enet_driv
+ static int __devinit bcm_enet_shared_probe(struct platform_device *pdev)
+ {
+       struct resource *res;
++      int ret, i, requested[3];
+-      res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+-      if (!res)
+-              return -ENODEV;
++      memset(bcm_enet_shared_base, 0, sizeof (bcm_enet_shared_base));
++      memset(requested, 0, sizeof (requested));
+-      if (!request_mem_region(res->start, resource_size(res),
+-                              "bcm63xx_enet_dma"))
+-              return -EBUSY;
++      for (i = 0; i < 3; i++) {
++              void __iomem *p;
+-      bcm_enet_shared_base = ioremap(res->start, resource_size(res));
+-      if (!bcm_enet_shared_base) {
+-              release_mem_region(res->start, resource_size(res));
+-              return -ENOMEM;
++              res = platform_get_resource(pdev, IORESOURCE_MEM, i);
++              if (!res) {
++                      ret = -EINVAL;
++                      goto fail;
++              }
++
++              if (!request_mem_region(res->start, resource_size(res),
++                                      "bcm63xx_enet_dma")) {
++                      ret = -EBUSY;
++                      goto fail;
++              }
++              requested[i] = 0;
++
++              p = ioremap(res->start, resource_size(res));
++              if (!p) {
++                      ret = -ENOMEM;
++                      goto fail;
++              }
++
++              bcm_enet_shared_base[i] = p;
+       }
++
+       return 0;
++
++fail:
++      for (i = 0; i < 3; i++) {
++              res = platform_get_resource(pdev, IORESOURCE_MEM, i);
++              if (!res)
++                      continue;
++              if (bcm_enet_shared_base[i])
++                      iounmap(bcm_enet_shared_base[i]);
++              if (requested[i])
++                      release_mem_region(res->start, resource_size(res));
++      }
++      return ret;
+ }
+ static int __devexit bcm_enet_shared_remove(struct platform_device *pdev)
+ {
+       struct resource *res;
++      int i;
+-      iounmap(bcm_enet_shared_base);
+-      res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+-      release_mem_region(res->start, resource_size(res));
++      for (i = 0; i < 3; i++) {
++              iounmap(bcm_enet_shared_base[i]);
++              res = platform_get_resource(pdev, IORESOURCE_MEM, i);
++              release_mem_region(res->start, resource_size(res));
++      }
+       return 0;
+ }
diff --git a/target/linux/brcm63xx/patches-3.6/415-bcm63xx_enet-add-support-for-bcm6368-internal-ethern.patch b/target/linux/brcm63xx/patches-3.6/415-bcm63xx_enet-add-support-for-bcm6368-internal-ethern.patch
new file mode 100644 (file)
index 0000000..381547d
--- /dev/null
@@ -0,0 +1,1490 @@
+From 1324bb5db6815d19b09c1b7bcac3cc2804412205 Mon Sep 17 00:00:00 2001
+From: Maxime Bizon <mbizon@freebox.fr>
+Date: Sat, 23 Jan 2010 03:01:02 +0100
+Subject: [PATCH 31/63] bcm63xx_enet: add support for bcm6368 internal ethernet switch.
+
+---
+ arch/mips/bcm63xx/dev-enet.c                       |  106 ++-
+ .../include/asm/mach-bcm63xx/bcm63xx_dev_enet.h    |   25 +
+ arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h  |   50 +
+ drivers/net/ethernet/broadcom/bcm63xx_enet.c       | 1054 ++++++++++++++++++--
+ drivers/net/ethernet/broadcom/bcm63xx_enet.h       |   71 ++
+ 5 files changed, 1221 insertions(+), 85 deletions(-)
+
+--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
++++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
+@@ -965,6 +965,10 @@ int __init board_register_devices(void)
+           !board_get_mac_address(board.enet1.mac_addr))
+               bcm63xx_enet_register(1, &board.enet1);
++      if (board.has_enetsw &&
++          !board_get_mac_address(board.enetsw.mac_addr))
++              bcm63xx_enetsw_register(&board.enetsw);
++
+       if (board.has_ehci0)
+               bcm63xx_ehci_register();
+--- a/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h
++++ b/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h
+@@ -41,6 +41,7 @@ struct board_info {
+       /* enabled feature/device */
+       unsigned int    has_enet0:1;
+       unsigned int    has_enet1:1;
++      unsigned int    has_enetsw:1;
+       unsigned int    has_pci:1;
+       unsigned int    has_pccard:1;
+       unsigned int    has_ohci0:1;
+@@ -52,6 +53,7 @@ struct board_info {
+       /* ethernet config */
+       struct bcm63xx_enet_platform_data enet0;
+       struct bcm63xx_enet_platform_data enet1;
++      struct bcm63xx_enetsw_platform_data enetsw;
+       /* DSP config */
+       struct bcm63xx_dsp_platform_data dsp;
+--- a/arch/mips/bcm63xx/dev-enet.c
++++ b/arch/mips/bcm63xx/dev-enet.c
+@@ -104,6 +104,64 @@ static struct platform_device bcm63xx_en
+       },
+ };
++static struct resource enetsw_res[] = {
++      {
++              /* start & end filled at runtime */
++              .flags          = IORESOURCE_MEM,
++      },
++      {
++              /* start filled at runtime */
++              .flags          = IORESOURCE_IRQ,
++      },
++      {
++              /* start filled at runtime */
++              .flags          = IORESOURCE_IRQ,
++      },
++};
++
++static struct bcm63xx_enetsw_platform_data enetsw_pd;
++
++static struct platform_device bcm63xx_enetsw_device = {
++      .name           = "bcm63xx_enetsw",
++      .num_resources  = ARRAY_SIZE(enetsw_res),
++      .resource       = enetsw_res,
++      .dev            = {
++              .platform_data = &enetsw_pd,
++      },
++};
++
++static int __init register_shared(void)
++{
++      int ret, chan_count;
++
++      if (shared_device_registered)
++              return 0;
++
++      shared_res[0].start = bcm63xx_regset_address(RSET_ENETDMA);
++      shared_res[0].end = shared_res[0].start;
++      shared_res[0].end += (RSET_ENETDMA_SIZE)  - 1;
++
++      if (BCMCPU_IS_6368())
++              chan_count = 32;
++      else
++              chan_count = 16;
++
++      shared_res[1].start = bcm63xx_regset_address(RSET_ENETDMAC);
++      shared_res[1].end = shared_res[1].start;
++      shared_res[1].end += RSET_ENETDMAC_SIZE(chan_count)  - 1;
++
++      shared_res[2].start = bcm63xx_regset_address(RSET_ENETDMAS);
++      shared_res[2].end = shared_res[2].start;
++      shared_res[2].end += RSET_ENETDMAS_SIZE(chan_count)  - 1;
++
++      ret = platform_device_register(&bcm63xx_enet_shared_device);
++      if (ret)
++              return ret;
++      shared_device_registered = 1;
++
++      return 0;
++}
++
+ int __init bcm63xx_enet_register(int unit,
+                                const struct bcm63xx_enet_platform_data *pd)
+ {
+@@ -117,24 +175,9 @@ int __init bcm63xx_enet_register(int uni
+       if (unit == 1 && BCMCPU_IS_6338())
+               return -ENODEV;
+-      if (!shared_device_registered) {
+-              shared_res[0].start = bcm63xx_regset_address(RSET_ENETDMA);
+-              shared_res[0].end = shared_res[0].start;
+-              shared_res[0].end += (RSET_ENETDMA_SIZE)  - 1;
+-
+-              shared_res[1].start = bcm63xx_regset_address(RSET_ENETDMAC);
+-              shared_res[1].end = shared_res[1].start;
+-              shared_res[1].end += RSET_ENETDMAC_SIZE(16)  - 1;
+-
+-              shared_res[2].start = bcm63xx_regset_address(RSET_ENETDMAS);
+-              shared_res[2].end = shared_res[2].start;
+-              shared_res[2].end += RSET_ENETDMAS_SIZE(16)  - 1;
+-
+-              ret = platform_device_register(&bcm63xx_enet_shared_device);
+-              if (ret)
+-                      return ret;
+-              shared_device_registered = 1;
+-      }
++      ret = register_shared();
++      if (ret)
++              return ret;
+       if (unit == 0) {
+               enet0_res[0].start = bcm63xx_regset_address(RSET_ENET0);
+@@ -175,3 +218,30 @@ int __init bcm63xx_enet_register(int uni
+               return ret;
+       return 0;
+ }
++
++int __init
++bcm63xx_enetsw_register(const struct bcm63xx_enetsw_platform_data *pd)
++{
++      int ret;
++
++      if (!BCMCPU_IS_6368())
++              return -ENODEV;
++
++      ret = register_shared();
++      if (ret)
++              return ret;
++
++      enetsw_res[0].start = bcm63xx_regset_address(RSET_ENETSW);
++      enetsw_res[0].end = enetsw_res[0].start;
++      enetsw_res[0].end += RSET_ENETSW_SIZE - 1;
++      enetsw_res[1].start = bcm63xx_get_irq_number(IRQ_ENETSW_RXDMA0);
++      enetsw_res[2].start = bcm63xx_get_irq_number(IRQ_ENETSW_TXDMA0);
++
++      memcpy(bcm63xx_enetsw_device.dev.platform_data, pd, sizeof (*pd));
++
++      ret = platform_device_register(&bcm63xx_enetsw_device);
++      if (ret)
++              return ret;
++
++      return 0;
++}
+--- a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_enet.h
++++ b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_enet.h
+@@ -39,7 +39,32 @@ struct bcm63xx_enet_platform_data {
+                                           int phy_id, int reg, int val));
+ };
++/*
++ * on board ethernet switch platform data
++ */
++#define ENETSW_MAX_PORT       6
++
++struct bcm63xx_enetsw_port {
++      int             used;
++      int             external_phy;
++      int             phy_id;
++
++      int             bypass_link;
++      int             force_speed;
++      int             force_duplex_full;
++
++      const char      *name;
++};
++
++struct bcm63xx_enetsw_platform_data {
++      char mac_addr[ETH_ALEN];
++      struct bcm63xx_enetsw_port used_ports[ENETSW_MAX_PORT];
++};
++
+ int __init bcm63xx_enet_register(int unit,
+                                const struct bcm63xx_enet_platform_data *pd);
++int __init
++bcm63xx_enetsw_register(const struct bcm63xx_enetsw_platform_data *pd);
++
+ #endif /* ! BCM63XX_DEV_ENET_H_ */
+--- a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h
++++ b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h
+@@ -803,10 +803,60 @@
+  * _REG relative to RSET_ENETSW
+  *************************************************************************/
++/* Port traffic control */
++#define ENETSW_PTCTRL_REG(x)          (0x0 + (x))
++#define ENETSW_PTCTRL_RXDIS_MASK      (1 << 0)
++#define ENETSW_PTCTRL_TXDIS_MASK      (1 << 1)
++
++/* Switch mode register */
++#define ENETSW_SWMODE_REG             (0xb)
++#define ENETSW_SWMODE_FWD_EN_MASK     (1 << 1)
++
++/* IMP override Register */
++#define ENETSW_IMPOV_REG              (0xe)
++#define ENETSW_IMPOV_FORCE_MASK               (1 << 7)
++#define ENETSW_IMPOV_TXFLOW_MASK      (1 << 5)
++#define ENETSW_IMPOV_RXFLOW_MASK      (1 << 4)
++#define ENETSW_IMPOV_1000_MASK                (1 << 3)
++#define ENETSW_IMPOV_100_MASK         (1 << 2)
++#define ENETSW_IMPOV_FDX_MASK         (1 << 1)
++#define ENETSW_IMPOV_LINKUP_MASK      (1 << 0)
++
++/* Port override Register */
++#define ENETSW_PORTOV_REG(x)          (0x58 + (x))
++#define ENETSW_PORTOV_ENABLE_MASK     (1 << 6)
++#define ENETSW_PORTOV_TXFLOW_MASK     (1 << 5)
++#define ENETSW_PORTOV_RXFLOW_MASK     (1 << 4)
++#define ENETSW_PORTOV_1000_MASK               (1 << 3)
++#define ENETSW_PORTOV_100_MASK                (1 << 2)
++#define ENETSW_PORTOV_FDX_MASK                (1 << 1)
++#define ENETSW_PORTOV_LINKUP_MASK     (1 << 0)
++
++/* MDIO control register */
++#define ENETSW_MDIOC_REG              (0xb0)
++#define ENETSW_MDIOC_EXT_MASK         (1 << 16)
++#define ENETSW_MDIOC_REG_SHIFT                20
++#define ENETSW_MDIOC_PHYID_SHIFT      25
++#define ENETSW_MDIOC_RD_MASK          (1 << 30)
++#define ENETSW_MDIOC_WR_MASK          (1 << 31)
++
++/* MDIO data register */
++#define ENETSW_MDIOD_REG              (0xb4)
++
++/* Global Management Configuration Register */
++#define ENETSW_GMCR_REG                       (0x200)
++#define ENETSW_GMCR_RST_MIB_MASK      (1 << 0)
++
+ /* MIB register */
+ #define ENETSW_MIB_REG(x)             (0x2800 + (x) * 4)
+ #define ENETSW_MIB_REG_COUNT          47
++/* Jumbo control register port mask register */
++#define ENETSW_JMBCTL_PORT_REG                (0x4004)
++
++/* Jumbo control mib good frame register */
++#define ENETSW_JMBCTL_MAXSIZE_REG     (0x4008)
++
+ /*************************************************************************
+  * _REG relative to RSET_OHCI_PRIV
+--- a/drivers/net/ethernet/broadcom/bcm63xx_enet.c
++++ b/drivers/net/ethernet/broadcom/bcm63xx_enet.c
+@@ -59,6 +59,49 @@ static inline void enet_writel(struct bc
+ }
+ /*
++ * io helpers to access switch registers
++ */
++static inline u32 enetsw_readl(struct bcm_enet_priv *priv, u32 off)
++{
++      /* printk("enetsw_readl at %p\n", priv->base + off); */
++      return bcm_readl(priv->base + off);
++}
++
++static inline void enetsw_writel(struct bcm_enet_priv *priv,
++                               u32 val, u32 off)
++{
++      /* printk("enetsw_writel %08x at %p\n", val, priv->base + off); */
++      bcm_writel(val, priv->base + off);
++}
++
++static inline u16 enetsw_readw(struct bcm_enet_priv *priv, u32 off)
++{
++      /* printk("enetsw_readw  at %p\n", priv->base + off); */
++      return bcm_readw(priv->base + off);
++}
++
++static inline void enetsw_writew(struct bcm_enet_priv *priv,
++                               u16 val, u32 off)
++{
++      /* printk("enetsw_writew %04x at %p\n", val, priv->base + off); */
++      bcm_writew(val, priv->base + off);
++}
++
++static inline u8 enetsw_readb(struct bcm_enet_priv *priv, u32 off)
++{
++      /* printk("enetsw_readb  at %p\n", priv->base + off); */
++      return bcm_readb(priv->base + off);
++}
++
++static inline void enetsw_writeb(struct bcm_enet_priv *priv,
++                               u8 val, u32 off)
++{
++      /* printk("enetsw_writeb %02x at %p\n", val, priv->base + off); */
++      bcm_writeb(val, priv->base + off);
++}
++
++
++/*
+  * io helpers to access shared registers
+  */
+ static inline u32 enet_dma_readl(struct bcm_enet_priv *priv, u32 off)
+@@ -321,7 +364,8 @@ static int bcm_enet_receive_queue(struct
+               }
+               /* recycle packet if it's marked as bad */
+-              if (unlikely(len_stat & DMADESC_ERR_MASK)) {
++              if (!bcm_enet_is_sw(priv) &&
++                  unlikely(len_stat & DMADESC_ERR_MASK)) {
+                       dev->stats.rx_errors++;
+                       if (len_stat & DMADESC_OVSIZE_MASK)
+@@ -552,6 +596,26 @@ static int bcm_enet_start_xmit(struct sk
+               goto out_unlock;
+       }
++      /* pad small packets sent on a switch device */
++      if (bcm_enet_is_sw(priv) && skb->len < 64) {
++              int needed = 64 - skb->len;
++              char *data;
++
++              if (unlikely(skb_tailroom(skb) < needed)) {
++                      struct sk_buff *nskb;
++
++                      nskb = skb_copy_expand(skb, 0, needed, GFP_ATOMIC);
++                      if (!nskb) {
++                              ret = NETDEV_TX_BUSY;
++                              goto out_unlock;
++                      }
++                      dev_kfree_skb(skb);
++                      skb = nskb;
++              }
++              data = skb_put(skb, needed);
++              memset(data, 0, needed);
++      }
++
+       /* point to the next available desc */
+       desc = &priv->tx_desc_cpu[priv->tx_curr_desc];
+       priv->tx_skb[priv->tx_curr_desc] = skb;
+@@ -1921,96 +1985,951 @@ struct platform_driver bcm63xx_enet_driv
+ };
+ /*
+- * reserve & remap memory space shared between all macs
++ * switch mii access callbacks
+  */
+-static int __devinit bcm_enet_shared_probe(struct platform_device *pdev)
++static int bcmenet_sw_mdio_read(struct bcm_enet_priv *priv,
++                              int ext, int phy_id, int location)
+ {
+-      struct resource *res;
+-      int ret, i, requested[3];
++      u32 reg;
++      int ret;
+-      memset(bcm_enet_shared_base, 0, sizeof (bcm_enet_shared_base));
+-      memset(requested, 0, sizeof (requested));
++      spin_lock_bh(&priv->enetsw_mdio_lock);
++      enetsw_writel(priv, 0, ENETSW_MDIOC_REG);
+-      for (i = 0; i < 3; i++) {
+-              void __iomem *p;
++      reg = ENETSW_MDIOC_RD_MASK |
++              (phy_id << ENETSW_MDIOC_PHYID_SHIFT) |
++              (location << ENETSW_MDIOC_REG_SHIFT);
++
++      if (ext)
++              reg |= ENETSW_MDIOC_EXT_MASK;
++
++      enetsw_writel(priv, reg, ENETSW_MDIOC_REG);
++      udelay(50);
++      ret = enetsw_readw(priv, ENETSW_MDIOD_REG);
++      spin_unlock_bh(&priv->enetsw_mdio_lock);
++      return ret;
++}
+-              res = platform_get_resource(pdev, IORESOURCE_MEM, i);
+-              if (!res) {
+-                      ret = -EINVAL;
+-                      goto fail;
+-              }
++static void bcmenet_sw_mdio_write(struct bcm_enet_priv *priv,
++                               int ext, int phy_id, int location,
++                               uint16_t data)
++{
++      u32 reg;
+-              if (!request_mem_region(res->start, resource_size(res),
+-                                      "bcm63xx_enet_dma")) {
+-                      ret = -EBUSY;
+-                      goto fail;
+-              }
+-              requested[i] = 0;
++      spin_lock_bh(&priv->enetsw_mdio_lock);
++      enetsw_writel(priv, 0, ENETSW_MDIOC_REG);
+-              p = ioremap(res->start, resource_size(res));
+-              if (!p) {
+-                      ret = -ENOMEM;
+-                      goto fail;
+-              }
++      reg = ENETSW_MDIOC_WR_MASK |
++              (phy_id << ENETSW_MDIOC_PHYID_SHIFT) |
++              (location << ENETSW_MDIOC_REG_SHIFT);
+-              bcm_enet_shared_base[i] = p;
+-      }
++      if (ext)
++              reg |= ENETSW_MDIOC_EXT_MASK;
+-      return 0;
++      reg |= data;
+-fail:
+-      for (i = 0; i < 3; i++) {
+-              res = platform_get_resource(pdev, IORESOURCE_MEM, i);
+-              if (!res)
+-                      continue;
+-              if (bcm_enet_shared_base[i])
+-                      iounmap(bcm_enet_shared_base[i]);
+-              if (requested[i])
+-                      release_mem_region(res->start, resource_size(res));
+-      }
+-      return ret;
++      enetsw_writel(priv, reg, ENETSW_MDIOC_REG);
++      udelay(50);
++      spin_unlock_bh(&priv->enetsw_mdio_lock);
+ }
+-static int __devexit bcm_enet_shared_remove(struct platform_device *pdev)
++/*
++ * enet sw PHY polling
++ */
++static void swphy_poll_timer(unsigned long data)
+ {
+-      struct resource *res;
+-      int i;
++      struct bcm_enet_priv *priv = (struct bcm_enet_priv *)data;
++      unsigned int i;
+-      for (i = 0; i < 3; i++) {
+-              iounmap(bcm_enet_shared_base[i]);
+-              res = platform_get_resource(pdev, IORESOURCE_MEM, i);
+-              release_mem_region(res->start, resource_size(res));
++      for (i = 0; i < ARRAY_SIZE(priv->used_ports); i++) {
++              struct bcm63xx_enetsw_port *port;
++              int val, j, up, advertise, lpa, lpa2, speed, duplex, media;
++              u8 override;
++
++              port = &priv->used_ports[i];
++              if (!port->used)
++                      continue;
++
++              if (port->bypass_link)
++                      continue;
++
++              /* dummy read to clear */
++              for (j = 0; j < 2; j++)
++                      val = bcmenet_sw_mdio_read(priv, port->external_phy,
++                                                 port->phy_id, MII_BMSR);
++
++              if (val == 0xffff)
++                      continue;
++
++              up = (val & BMSR_LSTATUS) ? 1 : 0;
++              if (!(up ^ priv->sw_port_link[i]))
++                      continue;
++
++              priv->sw_port_link[i] = up;
++
++              /* link changed */
++              if (!up) {
++                      dev_info(&priv->pdev->dev, "link DOWN on %s\n",
++                               port->name);
++                      enetsw_writeb(priv, ENETSW_PORTOV_ENABLE_MASK,
++                                    ENETSW_PORTOV_REG(i));
++                      enetsw_writeb(priv, ENETSW_PTCTRL_RXDIS_MASK |
++                                    ENETSW_PTCTRL_TXDIS_MASK,
++                                    ENETSW_PTCTRL_REG(i));
++                      continue;
++              }
++
++              advertise = bcmenet_sw_mdio_read(priv, port->external_phy,
++                                               port->phy_id, MII_ADVERTISE);
++
++              lpa = bcmenet_sw_mdio_read(priv, port->external_phy,
++                                         port->phy_id, MII_LPA);
++
++              lpa2 = bcmenet_sw_mdio_read(priv, port->external_phy,
++                                         port->phy_id, MII_STAT1000);
++
++              /* figure out media and duplex from advertise and LPA values */
++              media = mii_nway_result(lpa & advertise);
++              duplex = (media & ADVERTISE_FULL) ? 1 : 0;
++              if (lpa2 & LPA_1000FULL)
++                      duplex = 1;
++
++              if (lpa2 & (LPA_1000FULL | LPA_1000HALF))
++                      speed = 1000;
++              else {
++                      if (media & (ADVERTISE_100FULL | ADVERTISE_100HALF))
++                              speed = 100;
++                      else
++                              speed = 10;
++              }
++
++              dev_info(&priv->pdev->dev,
++                       "link UP on %s, %dMbps, %s-duplex\n",
++                       port->name, speed, duplex ? "full" : "half");
++
++              override = ENETSW_PORTOV_ENABLE_MASK |
++                      ENETSW_PORTOV_LINKUP_MASK;
++
++              if (speed == 1000)
++                      override |= ENETSW_IMPOV_1000_MASK;
++              else if (speed == 100)
++                      override |= ENETSW_IMPOV_100_MASK;
++              if (duplex)
++                      override |= ENETSW_IMPOV_FDX_MASK;
++
++              enetsw_writeb(priv, override, ENETSW_PORTOV_REG(i));
++              enetsw_writeb(priv, 0, ENETSW_PTCTRL_REG(i));
+       }
+-      return 0;
+-}
+-/*
+- * this "shared" driver is needed because both macs share a single
+- * address space
+- */
+-struct platform_driver bcm63xx_enet_shared_driver = {
+-      .probe  = bcm_enet_shared_probe,
+-      .remove = __devexit_p(bcm_enet_shared_remove),
+-      .driver = {
+-              .name   = "bcm63xx_enet_shared",
+-              .owner  = THIS_MODULE,
+-      },
+-};
++      priv->swphy_poll.expires = jiffies + HZ;
++      add_timer(&priv->swphy_poll);
++}
+ /*
+- * entry point
++ * open callback, allocate dma rings & buffers and start rx operation
+  */
+-static int __init bcm_enet_init(void)
++static int bcm_enetsw_open(struct net_device *dev)
+ {
+-      int ret;
++      struct bcm_enet_priv *priv;
++      struct device *kdev;
++      int i, ret;
++      unsigned int size;
++      void *p;
++      u32 val;
+-      ret = platform_driver_register(&bcm63xx_enet_shared_driver);
++      priv = netdev_priv(dev);
++      kdev = &priv->pdev->dev;
++
++      /* mask all interrupts and request them */
++      enet_dmac_writel(priv, 0, ENETDMAC_IRMASK_REG(priv->rx_chan));
++      enet_dmac_writel(priv, 0, ENETDMAC_IRMASK_REG(priv->tx_chan));
++
++      ret = request_irq(priv->irq_rx, bcm_enet_isr_dma,
++                        IRQF_DISABLED, dev->name, dev);
+       if (ret)
+-              return ret;
++              goto out_freeirq;
+-      ret = platform_driver_register(&bcm63xx_enet_driver);
++      ret = request_irq(priv->irq_tx, bcm_enet_isr_dma,
++                        IRQF_DISABLED, dev->name, dev);
+       if (ret)
+-              platform_driver_unregister(&bcm63xx_enet_shared_driver);
++              goto out_freeirq_rx;
++
++      /* allocate rx dma ring */
++      size = priv->rx_ring_size * sizeof(struct bcm_enet_desc);
++      p = dma_alloc_coherent(kdev, size, &priv->rx_desc_dma, GFP_KERNEL);
++      if (!p) {
++              dev_err(kdev, "cannot allocate rx ring %u\n", size);
++              ret = -ENOMEM;
++              goto out_freeirq_tx;
++      }
++
++      memset(p, 0, size);
++      priv->rx_desc_alloc_size = size;
++      priv->rx_desc_cpu = p;
++
++      /* allocate tx dma ring */
++      size = priv->tx_ring_size * sizeof(struct bcm_enet_desc);
++      p = dma_alloc_coherent(kdev, size, &priv->tx_desc_dma, GFP_KERNEL);
++      if (!p) {
++              dev_err(kdev, "cannot allocate tx ring\n");
++              ret = -ENOMEM;
++              goto out_free_rx_ring;
++      }
++
++      memset(p, 0, size);
++      priv->tx_desc_alloc_size = size;
++      priv->tx_desc_cpu = p;
++
++      priv->tx_skb = kzalloc(sizeof(struct sk_buff *) * priv->tx_ring_size,
++                             GFP_KERNEL);
++      if (!priv->tx_skb) {
++              dev_err(kdev, "cannot allocate rx skb queue\n");
++              ret = -ENOMEM;
++              goto out_free_tx_ring;
++      }
++
++      priv->tx_desc_count = priv->tx_ring_size;
++      priv->tx_dirty_desc = 0;
++      priv->tx_curr_desc = 0;
++      spin_lock_init(&priv->tx_lock);
++
++      /* init & fill rx ring with skbs */
++      priv->rx_skb = kzalloc(sizeof(struct sk_buff *) * priv->rx_ring_size,
++                             GFP_KERNEL);
++      if (!priv->rx_skb) {
++              dev_err(kdev, "cannot allocate rx skb queue\n");
++              ret = -ENOMEM;
++              goto out_free_tx_skb;
++      }
++
++      priv->rx_desc_count = 0;
++      priv->rx_dirty_desc = 0;
++      priv->rx_curr_desc = 0;
++
++      /* disable all ports */
++      for (i = 0; i < 6; i++) {
++              enetsw_writeb(priv, ENETSW_PORTOV_ENABLE_MASK,
++                            ENETSW_PORTOV_REG(i));
++              enetsw_writeb(priv, ENETSW_PTCTRL_RXDIS_MASK |
++                            ENETSW_PTCTRL_TXDIS_MASK,
++                            ENETSW_PTCTRL_REG(i));
++      }
++
++      /* reset mib */
++      val = enetsw_readb(priv, ENETSW_GMCR_REG);
++      val |= ENETSW_GMCR_RST_MIB_MASK;
++      enetsw_writeb(priv, val, ENETSW_GMCR_REG);
++      mdelay(1);
++      val &= ~ENETSW_GMCR_RST_MIB_MASK;
++      enetsw_writeb(priv, val, ENETSW_GMCR_REG);
++      mdelay(1);
++
++      /* force CPU port state */
++      val = enetsw_readb(priv, ENETSW_IMPOV_REG);
++      val |= ENETSW_IMPOV_FORCE_MASK | ENETSW_IMPOV_LINKUP_MASK;
++      enetsw_writeb(priv, val, ENETSW_IMPOV_REG);
++
++      /* enable switch forward engine */
++      val = enetsw_readb(priv, ENETSW_SWMODE_REG);
++      val |= ENETSW_SWMODE_FWD_EN_MASK;
++      enetsw_writeb(priv, val, ENETSW_SWMODE_REG);
++
++      /* enable jumbo on all ports */
++      enetsw_writel(priv, 0x1ff, ENETSW_JMBCTL_PORT_REG);
++      enetsw_writew(priv, 9728, ENETSW_JMBCTL_MAXSIZE_REG);
++
++      /* initialize flow control buffer allocation */
++      enet_dma_writel(priv, ENETDMA_BUFALLOC_FORCE_MASK | 0,
++                      ENETDMA_BUFALLOC_REG(priv->rx_chan));
++
++      if (bcm_enet_refill_rx(dev)) {
++              dev_err(kdev, "cannot allocate rx skb queue\n");
++              ret = -ENOMEM;
++              goto out;
++      }
++
++      /* write rx & tx ring addresses */
++      enet_dmas_writel(priv, priv->rx_desc_dma,
++                       ENETDMAS_RSTART_REG(priv->rx_chan));
++      enet_dmas_writel(priv, priv->tx_desc_dma,
++                       ENETDMAS_RSTART_REG(priv->tx_chan));
++
++      /* clear remaining state ram for rx & tx channel */
++      enet_dmas_writel(priv, 0, ENETDMAS_SRAM2_REG(priv->rx_chan));
++      enet_dmas_writel(priv, 0, ENETDMAS_SRAM2_REG(priv->tx_chan));
++      enet_dmas_writel(priv, 0, ENETDMAS_SRAM3_REG(priv->rx_chan));
++      enet_dmas_writel(priv, 0, ENETDMAS_SRAM3_REG(priv->tx_chan));
++      enet_dmas_writel(priv, 0, ENETDMAS_SRAM4_REG(priv->rx_chan));
++      enet_dmas_writel(priv, 0, ENETDMAS_SRAM4_REG(priv->tx_chan));
++
++      /* set dma maximum burst len */
++      enet_dmac_writel(priv, BCMENET_DMA_MAXBURST,
++                       ENETDMAC_MAXBURST_REG(priv->rx_chan));
++      enet_dmac_writel(priv, BCMENET_DMA_MAXBURST,
++                       ENETDMAC_MAXBURST_REG(priv->tx_chan));
++
++      /* set flow control low/high threshold to 1/3 / 2/3 */
++      val = priv->rx_ring_size / 3;
++      enet_dma_writel(priv, val, ENETDMA_FLOWCL_REG(priv->rx_chan));
++      val = (priv->rx_ring_size * 2) / 3;
++      enet_dma_writel(priv, val, ENETDMA_FLOWCH_REG(priv->rx_chan));
++
++      /* all set, enable mac and interrupts, start dma engine and
++       * kick rx dma channel */
++      wmb();
++      enet_dma_writel(priv, ENETDMA_CFG_EN_MASK, ENETDMA_CFG_REG);
++      enet_dmac_writel(priv, ENETDMAC_CHANCFG_EN_MASK,
++                       ENETDMAC_CHANCFG_REG(priv->rx_chan));
++
++      /* watch "packet transferred" interrupt in rx and tx */
++      enet_dmac_writel(priv, ENETDMAC_IR_PKTDONE_MASK,
++                       ENETDMAC_IR_REG(priv->rx_chan));
++      enet_dmac_writel(priv, ENETDMAC_IR_PKTDONE_MASK,
++                       ENETDMAC_IR_REG(priv->tx_chan));
++
++      /* make sure we enable napi before rx interrupt  */
++      napi_enable(&priv->napi);
++
++      enet_dmac_writel(priv, ENETDMAC_IR_PKTDONE_MASK,
++                       ENETDMAC_IRMASK_REG(priv->rx_chan));
++      enet_dmac_writel(priv, ENETDMAC_IR_PKTDONE_MASK,
++                       ENETDMAC_IRMASK_REG(priv->tx_chan));
++
++      netif_carrier_on(dev);
++      netif_start_queue(dev);
++
++      /*
++       * apply override config for bypass_link ports here.
++       */
++      for (i = 0; i < ARRAY_SIZE(priv->used_ports); i++) {
++              struct bcm63xx_enetsw_port *port;
++              u8 override;
++              port = &priv->used_ports[i];
++              if (!port->used)
++                      continue;
++
++              if (!port->bypass_link)
++                      continue;
++
++              override = ENETSW_PORTOV_ENABLE_MASK |
++                      ENETSW_PORTOV_LINKUP_MASK;
++
++              switch (port->force_speed) {
++              case 1000:
++                      override |= ENETSW_IMPOV_1000_MASK;
++                      break;
++              case 100:
++                      override |= ENETSW_IMPOV_100_MASK;
++                      break;
++              case 10:
++                      break;
++              default:
++                      printk(KERN_WARNING "invalid forced speed on port %s: "
++                             "assume 10\n",
++                             port->name);
++                      break;
++              }
++
++              if (port->force_duplex_full)
++                      override = ENETSW_IMPOV_FDX_MASK;
++
++
++              enetsw_writeb(priv, override, ENETSW_PORTOV_REG(i));
++              enetsw_writeb(priv, 0, ENETSW_PTCTRL_REG(i));
++      }
++
++      /* start phy polling timer */
++      init_timer(&priv->swphy_poll);
++      priv->swphy_poll.function = swphy_poll_timer;
++      priv->swphy_poll.data = (unsigned long)priv;
++      priv->swphy_poll.expires = jiffies;
++      add_timer(&priv->swphy_poll);
++      return 0;
++
++out:
++      for (i = 0; i < priv->rx_ring_size; i++) {
++              struct bcm_enet_desc *desc;
++
++              if (!priv->rx_skb[i])
++                      continue;
++
++              desc = &priv->rx_desc_cpu[i];
++              dma_unmap_single(kdev, desc->address, priv->rx_skb_size,
++                               DMA_FROM_DEVICE);
++              kfree_skb(priv->rx_skb[i]);
++      }
++      kfree(priv->rx_skb);
++
++out_free_tx_skb:
++      kfree(priv->tx_skb);
++
++out_free_tx_ring:
++      dma_free_coherent(kdev, priv->tx_desc_alloc_size,
++                        priv->tx_desc_cpu, priv->tx_desc_dma);
++
++out_free_rx_ring:
++      dma_free_coherent(kdev, priv->rx_desc_alloc_size,
++                        priv->rx_desc_cpu, priv->rx_desc_dma);
++
++out_freeirq_tx:
++      free_irq(priv->irq_tx, dev);
++
++out_freeirq_rx:
++      free_irq(priv->irq_rx, dev);
++
++out_freeirq:
++      return ret;
++}
++
++/*
++ * stop callback
++ */
++static int bcm_enetsw_stop(struct net_device *dev)
++{
++      struct bcm_enet_priv *priv;
++      struct device *kdev;
++      int i;
++
++      priv = netdev_priv(dev);
++      kdev = &priv->pdev->dev;
++
++      del_timer_sync(&priv->swphy_poll);
++      netif_stop_queue(dev);
++      napi_disable(&priv->napi);
++      del_timer_sync(&priv->rx_timeout);
++
++      /* mask all interrupts */
++      enet_dmac_writel(priv, 0, ENETDMAC_IRMASK_REG(priv->rx_chan));
++      enet_dmac_writel(priv, 0, ENETDMAC_IRMASK_REG(priv->tx_chan));
++
++      /* disable dma & mac */
++      bcm_enet_disable_dma(priv, priv->tx_chan);
++      bcm_enet_disable_dma(priv, priv->rx_chan);
++
++      /* force reclaim of all tx buffers */
++      bcm_enet_tx_reclaim(dev, 1);
++
++      /* free the rx skb ring */
++      for (i = 0; i < priv->rx_ring_size; i++) {
++              struct bcm_enet_desc *desc;
++
++              if (!priv->rx_skb[i])
++                      continue;
++
++              desc = &priv->rx_desc_cpu[i];
++              dma_unmap_single(kdev, desc->address, priv->rx_skb_size,
++                               DMA_FROM_DEVICE);
++              kfree_skb(priv->rx_skb[i]);
++      }
++
++      /* free remaining allocated memory */
++      kfree(priv->rx_skb);
++      kfree(priv->tx_skb);
++      dma_free_coherent(kdev, priv->rx_desc_alloc_size,
++                        priv->rx_desc_cpu, priv->rx_desc_dma);
++      dma_free_coherent(kdev, priv->tx_desc_alloc_size,
++                        priv->tx_desc_cpu, priv->tx_desc_dma);
++      free_irq(priv->irq_tx, dev);
++      free_irq(priv->irq_rx, dev);
++
++      return 0;
++}
++
++/*
++ * try to sort out phy external status by walking the used_port field
++ * in the bcm_enet_priv structure. in case the phy address is not
++ * assigned to any physical port on the switch, assume it is external
++ * (and yell at the user).
++ */
++static int bcm_enetsw_phy_is_external(struct bcm_enet_priv *priv, int phy_id)
++{
++      int i;
++
++      for (i = 0; i < (int)ARRAY_SIZE(priv->used_ports); ++i) {
++              if (!priv->used_ports[i].used)
++                      continue;
++              if (priv->used_ports[i].phy_id == phy_id)
++                      return priv->used_ports[i].external_phy;
++      }
++
++      printk_once(KERN_WARNING  "bcm63xx_enet: could not find a used port "
++             "with phy_id %i, assuming phy is external\n", phy_id);
++      return 1;
++}
++
++/*
++ * can't use bcmenet_sw_mdio_read directly as we need to sort out
++ * external/internal status of the given phy_id first.
++ */
++static int bcm_enetsw_mii_mdio_read(struct net_device *dev, int phy_id,
++                                  int location)
++{
++      struct bcm_enet_priv *priv;
++
++      priv = netdev_priv(dev);
++      return bcmenet_sw_mdio_read(priv,
++                                  bcm_enetsw_phy_is_external(priv, phy_id),
++                                  phy_id, location);
++}
++
++/*
++ * can't use bcmenet_sw_mdio_write directly as we need to sort out
++ * external/internal status of the given phy_id first.
++ */
++static void bcm_enetsw_mii_mdio_write(struct net_device *dev, int phy_id,
++                                    int location,
++                                    int val)
++{
++      struct bcm_enet_priv *priv;
++
++      priv = netdev_priv(dev);
++      bcmenet_sw_mdio_write(priv, bcm_enetsw_phy_is_external(priv, phy_id),
++                            phy_id, location, val);
++}
++
++static int bcm_enetsw_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
++{
++      struct mii_if_info mii;
++
++      mii.dev = dev;
++      mii.mdio_read = bcm_enetsw_mii_mdio_read;
++      mii.mdio_write = bcm_enetsw_mii_mdio_write;
++      mii.phy_id = 0;
++      mii.phy_id_mask = 0x3f;
++      mii.reg_num_mask = 0x1f;
++      return generic_mii_ioctl(&mii, if_mii(rq), cmd, NULL);
++
++}
++
++static const struct net_device_ops bcm_enetsw_ops = {
++      .ndo_open               = bcm_enetsw_open,
++      .ndo_stop               = bcm_enetsw_stop,
++      .ndo_start_xmit         = bcm_enet_start_xmit,
++      .ndo_change_mtu         = bcm_enet_change_mtu,
++      .ndo_do_ioctl           = bcm_enetsw_ioctl,
++};
++
++
++static const struct bcm_enet_stats bcm_enetsw_gstrings_stats[] = {
++      { "rx_packets", DEV_STAT(rx_packets), -1 },
++      { "tx_packets", DEV_STAT(tx_packets), -1 },
++      { "rx_bytes", DEV_STAT(rx_bytes), -1 },
++      { "tx_bytes", DEV_STAT(tx_bytes), -1 },
++      { "rx_errors", DEV_STAT(rx_errors), -1 },
++      { "tx_errors", DEV_STAT(tx_errors), -1 },
++      { "rx_dropped", DEV_STAT(rx_dropped), -1 },
++      { "tx_dropped", DEV_STAT(tx_dropped), -1 },
++
++      { "tx_good_octets", GEN_STAT(mib.tx_gd_octets), ETHSW_MIB_RX_GD_OCT },
++      { "tx_unicast", GEN_STAT(mib.tx_unicast), ETHSW_MIB_RX_BRDCAST },
++      { "tx_broadcast", GEN_STAT(mib.tx_brdcast), ETHSW_MIB_RX_BRDCAST },
++      { "tx_multicast", GEN_STAT(mib.tx_mult), ETHSW_MIB_RX_MULT },
++      { "tx_64_octets", GEN_STAT(mib.tx_64), ETHSW_MIB_RX_64 },
++      { "tx_65_127_oct", GEN_STAT(mib.tx_65_127), ETHSW_MIB_RX_65_127 },
++      { "tx_128_255_oct", GEN_STAT(mib.tx_128_255), ETHSW_MIB_RX_128_255 },
++      { "tx_256_511_oct", GEN_STAT(mib.tx_256_511), ETHSW_MIB_RX_256_511 },
++      { "tx_512_1023_oct", GEN_STAT(mib.tx_512_1023), ETHSW_MIB_RX_512_1023},
++      { "tx_1024_1522_oct", GEN_STAT(mib.tx_1024_max),
++        ETHSW_MIB_RX_1024_1522 },
++      { "tx_1523_2047_oct", GEN_STAT(mib.tx_1523_2047),
++        ETHSW_MIB_RX_1523_2047 },
++      { "tx_2048_4095_oct", GEN_STAT(mib.tx_2048_4095),
++        ETHSW_MIB_RX_2048_4095 },
++      { "tx_4096_8191_oct", GEN_STAT(mib.tx_4096_8191),
++        ETHSW_MIB_RX_4096_8191 },
++      { "tx_8192_9728_oct", GEN_STAT(mib.tx_8192_9728),
++        ETHSW_MIB_RX_8192_9728 },
++      { "tx_oversize", GEN_STAT(mib.tx_ovr), ETHSW_MIB_RX_OVR },
++      { "tx_oversize_drop", GEN_STAT(mib.tx_ovr), ETHSW_MIB_RX_OVR_DISC },
++      { "tx_dropped", GEN_STAT(mib.tx_drop), ETHSW_MIB_RX_DROP },
++      { "tx_undersize", GEN_STAT(mib.tx_underrun), ETHSW_MIB_RX_UND },
++      { "tx_pause", GEN_STAT(mib.tx_pause), ETHSW_MIB_RX_PAUSE },
++
++      { "rx_good_octets", GEN_STAT(mib.rx_gd_octets), ETHSW_MIB_TX_ALL_OCT },
++      { "rx_broadcast", GEN_STAT(mib.rx_brdcast), ETHSW_MIB_TX_BRDCAST },
++      { "rx_multicast", GEN_STAT(mib.rx_mult), ETHSW_MIB_TX_MULT },
++      { "rx_unicast", GEN_STAT(mib.rx_unicast), ETHSW_MIB_TX_MULT },
++      { "rx_pause", GEN_STAT(mib.rx_pause), ETHSW_MIB_TX_PAUSE },
++      { "rx_dropped", GEN_STAT(mib.rx_drop), ETHSW_MIB_TX_DROP_PKTS },
++
++};
++
++#define BCM_ENETSW_STATS_LEN  \
++      (sizeof(bcm_enetsw_gstrings_stats) / sizeof(struct bcm_enet_stats))
++
++static void bcm_enetsw_get_strings(struct net_device *netdev,
++                                 u32 stringset, u8 *data)
++{
++      int i;
++
++      switch (stringset) {
++      case ETH_SS_STATS:
++              for (i = 0; i < BCM_ENETSW_STATS_LEN; i++) {
++                      memcpy(data + i * ETH_GSTRING_LEN,
++                             bcm_enetsw_gstrings_stats[i].stat_string,
++                             ETH_GSTRING_LEN);
++              }
++              break;
++      }
++}
++
++static int bcm_enetsw_get_sset_count(struct net_device *netdev,
++                                   int string_set)
++{
++      switch (string_set) {
++      case ETH_SS_STATS:
++              return BCM_ENETSW_STATS_LEN;
++      default:
++              return -EINVAL;
++      }
++}
++
++static void bcm_enetsw_get_drvinfo(struct net_device *netdev,
++                                 struct ethtool_drvinfo *drvinfo)
++{
++      strncpy(drvinfo->driver, bcm_enet_driver_name, 32);
++      strncpy(drvinfo->version, bcm_enet_driver_version, 32);
++      strncpy(drvinfo->fw_version, "N/A", 32);
++      strncpy(drvinfo->bus_info, "bcm63xx", 32);
++      drvinfo->n_stats = BCM_ENETSW_STATS_LEN;
++}
++
++static void bcm_enetsw_get_ethtool_stats(struct net_device *netdev,
++                                       struct ethtool_stats *stats,
++                                       u64 *data)
++{
++      struct bcm_enet_priv *priv;
++      int i;
++
++      priv = netdev_priv(netdev);
++
++      for (i = 0; i < BCM_ENETSW_STATS_LEN; i++) {
++              const struct bcm_enet_stats *s;
++              u32 lo, hi;
++              char *p;
++              int reg;
++
++              s = &bcm_enetsw_gstrings_stats[i];
++
++              reg = s->mib_reg;
++              if (reg == -1)
++                      continue;
++
++              lo = enetsw_readl(priv, ENETSW_MIB_REG(reg));
++              p = (char *)priv + s->stat_offset;
++
++              if (s->sizeof_stat == sizeof(u64)) {
++                      hi = enetsw_readl(priv, ENETSW_MIB_REG(reg + 1));
++                      *(u64 *)p = ((u64)hi << 32 | lo);
++              } else
++                      *(u32 *)p = lo;
++      }
++
++      for (i = 0; i < BCM_ENETSW_STATS_LEN; i++) {
++              const struct bcm_enet_stats *s;
++              char *p;
++
++              s = &bcm_enetsw_gstrings_stats[i];
++
++              if (s->mib_reg == -1)
++                      p = (char *)&netdev->stats + s->stat_offset;
++              else
++                      p = (char *)priv + s->stat_offset;
++
++              data[i] = (s->sizeof_stat == sizeof(u64)) ?
++                      *(u64 *)p : *(u32 *)p;
++      }
++}
++
++static void bcm_enetsw_get_ringparam(struct net_device *dev,
++                                   struct ethtool_ringparam *ering)
++{
++      struct bcm_enet_priv *priv;
++
++      priv = netdev_priv(dev);
++
++      /* rx/tx ring is actually only limited by memory */
++      ering->rx_max_pending = 8192;
++      ering->tx_max_pending = 8192;
++      ering->rx_mini_max_pending = 0;
++      ering->rx_jumbo_max_pending = 0;
++      ering->rx_pending = priv->rx_ring_size;
++      ering->tx_pending = priv->tx_ring_size;
++}
++
++static int bcm_enetsw_set_ringparam(struct net_device *dev,
++                                  struct ethtool_ringparam *ering)
++{
++      struct bcm_enet_priv *priv;
++      int was_running;
++
++      priv = netdev_priv(dev);
++
++      was_running = 0;
++      if (netif_running(dev)) {
++              bcm_enetsw_stop(dev);
++              was_running = 1;
++      }
++
++      priv->rx_ring_size = ering->rx_pending;
++      priv->tx_ring_size = ering->tx_pending;
++
++      if (was_running) {
++              int err;
++
++              err = bcm_enetsw_open(dev);
++              if (err)
++                      dev_close(dev);
++      }
++      return 0;
++}
++
++static struct ethtool_ops bcm_enetsw_ethtool_ops = {
++      .get_strings            = bcm_enetsw_get_strings,
++      .get_sset_count         = bcm_enetsw_get_sset_count,
++      .get_ethtool_stats      = bcm_enetsw_get_ethtool_stats,
++      .get_drvinfo            = bcm_enetsw_get_drvinfo,
++      .get_ringparam          = bcm_enetsw_get_ringparam,
++      .set_ringparam          = bcm_enetsw_set_ringparam,
++};
++
++/*
++ * allocate netdevice, request register memory and register device.
++ */
++static int __devinit bcm_enetsw_probe(struct platform_device *pdev)
++{
++      struct bcm_enet_priv *priv;
++      struct net_device *dev;
++      struct bcm63xx_enetsw_platform_data *pd;
++      struct resource *res_mem;
++      int ret, irq_rx, irq_tx;
++
++      /* stop if shared driver failed, assume driver->probe will be
++       * called in the same order we register devices (correct ?) */
++      if (!bcm_enet_shared_base[0])
++              return -ENODEV;
++
++      res_mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
++      irq_rx = platform_get_irq(pdev, 0);
++      irq_tx = platform_get_irq(pdev, 1);
++      if (!res_mem || irq_rx < 0 || irq_tx < 0)
++              return -ENODEV;
++
++      ret = 0;
++      dev = alloc_etherdev(sizeof(*priv));
++      if (!dev)
++              return -ENOMEM;
++      priv = netdev_priv(dev);
++      memset(priv, 0, sizeof(*priv));
++
++      /* initialize default and fetch platform data */
++      priv->irq_rx = irq_rx;
++      priv->irq_tx = irq_tx;
++      priv->rx_ring_size = BCMENET_DEF_RX_DESC;
++      priv->tx_ring_size = BCMENET_DEF_TX_DESC;
++
++      pd = pdev->dev.platform_data;
++      if (pd) {
++              memcpy(dev->dev_addr, pd->mac_addr, ETH_ALEN);
++              memcpy(priv->used_ports, pd->used_ports,
++                     sizeof (pd->used_ports));
++      }
++
++      ret = compute_hw_mtu(priv, dev->mtu);
++      if (ret)
++              goto out;
++
++      if (!request_mem_region(res_mem->start, resource_size(res_mem),
++                              "bcm63xx_enetsw")) {
++              ret = -EBUSY;
++              goto out;
++      }
++
++      priv->base = ioremap(res_mem->start, resource_size(res_mem));
++      if (priv->base == NULL) {
++              ret = -ENOMEM;
++              goto out_release_mem;
++      }
++
++      priv->mac_clk = clk_get(&pdev->dev, "enetsw");
++      if (IS_ERR(priv->mac_clk)) {
++              ret = PTR_ERR(priv->mac_clk);
++              goto out_unmap;
++      }
++      clk_enable(priv->mac_clk);
++
++      priv->rx_chan = 0;
++      priv->tx_chan = 1;
++      spin_lock_init(&priv->rx_lock);
++
++      /* init rx timeout (used for oom) */
++      init_timer(&priv->rx_timeout);
++      priv->rx_timeout.function = bcm_enet_refill_rx_timer;
++      priv->rx_timeout.data = (unsigned long)dev;
++
++      /* register netdevice */
++      dev->netdev_ops = &bcm_enetsw_ops;
++      netif_napi_add(dev, &priv->napi, bcm_enet_poll, 16);
++      SET_ETHTOOL_OPS(dev, &bcm_enetsw_ethtool_ops);
++      SET_NETDEV_DEV(dev, &pdev->dev);
++
++      spin_lock_init(&priv->enetsw_mdio_lock);
++
++      ret = register_netdev(dev);
++      if (ret)
++              goto out_put_clk;
++
++      netif_carrier_off(dev);
++      platform_set_drvdata(pdev, dev);
++      priv->pdev = pdev;
++      priv->net_dev = dev;
++
++      return 0;
++
++out_put_clk:
++      clk_put(priv->mac_clk);
++
++out_unmap:
++      iounmap(priv->base);
++
++out_release_mem:
++      release_mem_region(res_mem->start, resource_size(res_mem));
++out:
++      free_netdev(dev);
++      return ret;
++}
++
++
++/*
++ * exit func, stops hardware and unregisters netdevice
++ */
++static int __devexit bcm_enetsw_remove(struct platform_device *pdev)
++{
++      struct bcm_enet_priv *priv;
++      struct net_device *dev;
++      struct resource *res;
++
++      /* stop netdevice */
++      dev = platform_get_drvdata(pdev);
++      priv = netdev_priv(dev);
++      unregister_netdev(dev);
++
++      /* release device resources */
++      iounmap(priv->base);
++      res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
++      release_mem_region(res->start, resource_size(res));
++
++      platform_set_drvdata(pdev, NULL);
++      free_netdev(dev);
++      return 0;
++}
++
++struct platform_driver bcm63xx_enetsw_driver = {
++      .probe  = bcm_enetsw_probe,
++      .remove = __devexit_p(bcm_enetsw_remove),
++      .driver = {
++              .name   = "bcm63xx_enetsw",
++              .owner  = THIS_MODULE,
++      },
++};
++
++/*
++ * reserve & remap memory space shared between all macs
++ */
++static int __devinit bcm_enet_shared_probe(struct platform_device *pdev)
++{
++      struct resource *res;
++      int ret, i, requested[3];
++
++      memset(bcm_enet_shared_base, 0, sizeof (bcm_enet_shared_base));
++      memset(requested, 0, sizeof (requested));
++
++      for (i = 0; i < 3; i++) {
++              void __iomem *p;
++
++              res = platform_get_resource(pdev, IORESOURCE_MEM, i);
++              if (!res) {
++                      ret = -EINVAL;
++                      goto fail;
++              }
++
++              if (!request_mem_region(res->start, resource_size(res),
++                                      "bcm63xx_enet_dma")) {
++                      ret = -EBUSY;
++                      goto fail;
++              }
++              requested[i] = 0;
++
++              p = ioremap(res->start, resource_size(res));
++              if (!p) {
++                      ret = -ENOMEM;
++                      goto fail;
++              }
++
++              bcm_enet_shared_base[i] = p;
++      }
++
++      return 0;
++
++fail:
++      for (i = 0; i < 3; i++) {
++              res = platform_get_resource(pdev, IORESOURCE_MEM, i);
++              if (!res)
++                      continue;
++              if (bcm_enet_shared_base[i])
++                      iounmap(bcm_enet_shared_base[i]);
++              if (requested[i])
++                      release_mem_region(res->start, resource_size(res));
++      }
++      return ret;
++}
++
++static int __devexit bcm_enet_shared_remove(struct platform_device *pdev)
++{
++      struct resource *res;
++      int i;
++
++      for (i = 0; i < 3; i++) {
++              iounmap(bcm_enet_shared_base[i]);
++              res = platform_get_resource(pdev, IORESOURCE_MEM, i);
++              release_mem_region(res->start, resource_size(res));
++      }
++      return 0;
++}
++
++/*
++ * this "shared" driver is needed because both macs share a single
++ * address space
++ */
++struct platform_driver bcm63xx_enet_shared_driver = {
++      .probe  = bcm_enet_shared_probe,
++      .remove = __devexit_p(bcm_enet_shared_remove),
++      .driver = {
++              .name   = "bcm63xx_enet_shared",
++              .owner  = THIS_MODULE,
++      },
++};
++
++/*
++ * entry point
++ */
++static int __init bcm_enet_init(void)
++{
++      int ret;
++
++      ret = platform_driver_register(&bcm63xx_enet_shared_driver);
++      if (ret)
++              return ret;
++
++      ret = platform_driver_register(&bcm63xx_enet_driver);
++      if (ret)
++              platform_driver_unregister(&bcm63xx_enet_shared_driver);
++
++      ret = platform_driver_register(&bcm63xx_enetsw_driver);
++      if (ret) {
++              platform_driver_unregister(&bcm63xx_enet_driver);
++              platform_driver_unregister(&bcm63xx_enet_shared_driver);
++      }
+       return ret;
+ }
+@@ -2018,6 +2937,7 @@ static int __init bcm_enet_init(void)
+ static void __exit bcm_enet_exit(void)
+ {
+       platform_driver_unregister(&bcm63xx_enet_driver);
++      platform_driver_unregister(&bcm63xx_enetsw_driver);
+       platform_driver_unregister(&bcm63xx_enet_shared_driver);
+ }
+--- a/drivers/net/ethernet/broadcom/bcm63xx_enet.h
++++ b/drivers/net/ethernet/broadcom/bcm63xx_enet.h
+@@ -112,11 +112,60 @@ struct bcm_enet_desc {
+ #define ETH_MIB_RX_CNTRL                      54
++/*
++ * SW MIB Counters register definitions
++*/
++#define ETHSW_MIB_TX_ALL_OCT                  0
++#define ETHSW_MIB_TX_DROP_PKTS                        2
++#define ETHSW_MIB_TX_QOS_PKTS                 3
++#define ETHSW_MIB_TX_BRDCAST                  4
++#define ETHSW_MIB_TX_MULT                     5
++#define ETHSW_MIB_TX_UNI                      6
++#define ETHSW_MIB_TX_COL                      7
++#define ETHSW_MIB_TX_1_COL                    8
++#define ETHSW_MIB_TX_M_COL                    9
++#define ETHSW_MIB_TX_DEF                      10
++#define ETHSW_MIB_TX_LATE                     11
++#define ETHSW_MIB_TX_EX_COL                   12
++#define ETHSW_MIB_TX_PAUSE                    14
++#define ETHSW_MIB_TX_QOS_OCT                  15
++
++#define ETHSW_MIB_RX_ALL_OCT                  17
++#define ETHSW_MIB_RX_UND                      19
++#define ETHSW_MIB_RX_PAUSE                    20
++#define ETHSW_MIB_RX_64                               21
++#define ETHSW_MIB_RX_65_127                   22
++#define ETHSW_MIB_RX_128_255                  23
++#define ETHSW_MIB_RX_256_511                  24
++#define ETHSW_MIB_RX_512_1023                 25
++#define ETHSW_MIB_RX_1024_1522                        26
++#define ETHSW_MIB_RX_OVR                      27
++#define ETHSW_MIB_RX_JAB                      28
++#define ETHSW_MIB_RX_ALIGN                    29
++#define ETHSW_MIB_RX_CRC                      30
++#define ETHSW_MIB_RX_GD_OCT                   31
++#define ETHSW_MIB_RX_DROP                     33
++#define ETHSW_MIB_RX_UNI                      34
++#define ETHSW_MIB_RX_MULT                     35
++#define ETHSW_MIB_RX_BRDCAST                  36
++#define ETHSW_MIB_RX_SA_CHANGE                        37
++#define ETHSW_MIB_RX_FRAG                     38
++#define ETHSW_MIB_RX_OVR_DISC                 39
++#define ETHSW_MIB_RX_SYM                      40
++#define ETHSW_MIB_RX_QOS_PKTS                 41
++#define ETHSW_MIB_RX_QOS_OCT                  42
++#define ETHSW_MIB_RX_1523_2047                        44
++#define ETHSW_MIB_RX_2048_4095                        45
++#define ETHSW_MIB_RX_4096_8191                        46
++#define ETHSW_MIB_RX_8192_9728                        47
++
++
+ struct bcm_enet_mib_counters {
+       u64 tx_gd_octets;
+       u32 tx_gd_pkts;
+       u32 tx_all_octets;
+       u32 tx_all_pkts;
++      u32 tx_unicast;
+       u32 tx_brdcast;
+       u32 tx_mult;
+       u32 tx_64;
+@@ -125,7 +174,12 @@ struct bcm_enet_mib_counters {
+       u32 tx_256_511;
+       u32 tx_512_1023;
+       u32 tx_1024_max;
++      u32 tx_1523_2047;
++      u32 tx_2048_4095;
++      u32 tx_4096_8191;
++      u32 tx_8192_9728;
+       u32 tx_jab;
++      u32 tx_drop;
+       u32 tx_ovr;
+       u32 tx_frag;
+       u32 tx_underrun;
+@@ -142,6 +196,7 @@ struct bcm_enet_mib_counters {
+       u32 rx_all_octets;
+       u32 rx_all_pkts;
+       u32 rx_brdcast;
++      u32 rx_unicast;
+       u32 rx_mult;
+       u32 rx_64;
+       u32 rx_65_127;
+@@ -297,6 +352,22 @@ struct bcm_enet_priv {
+       /* maximum hardware transmit/receive size */
+       unsigned int hw_mtu;
++
++      /* port mapping for switch devices */
++      struct bcm63xx_enetsw_port used_ports[ENETSW_MAX_PORT];
++      int sw_port_link[ENETSW_MAX_PORT];
++
++      /* used to poll switch port state */
++      struct timer_list swphy_poll;
++      spinlock_t enetsw_mdio_lock;
+ };
++static inline int bcm_enet_is_sw(struct bcm_enet_priv *priv)
++{
++      if (BCMCPU_IS_6368())
++              return 1;
++      else
++              return 0;
++}
++
+ #endif /* ! BCM63XX_ENET_H_ */
diff --git a/target/linux/brcm63xx/patches-3.6/416-bcm63xx_enet-reset-port-link-state-in-bcm_enetsw_ope.patch b/target/linux/brcm63xx/patches-3.6/416-bcm63xx_enet-reset-port-link-state-in-bcm_enetsw_ope.patch
new file mode 100644 (file)
index 0000000..6d8e5a7
--- /dev/null
@@ -0,0 +1,28 @@
+From 6d5c5bb13db3fd8e3dd0b82742b3957f41a4a3ac Mon Sep 17 00:00:00 2001
+From: Jonas Gorski <jonas.gorski@gmail.com>
+Date: Thu, 24 May 2012 20:38:58 +0200
+Subject: [PATCH] bcm63xx_enet: reset port link state in bcm_enetsw_open
+
+bcm_enetsw_open disables all ports, but does not reset their link state.
+This results in connected ports staying disabled after a ifdown/ifup
+cycle, since bcm_enetsw_phy_poll only enables them if their current state
+is different from the stored link state.
+
+Fix this by also resetting the port link state.
+
+Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
+---
+ drivers/net/ethernet/broadcom/bcm63xx_enet.c |    2 ++
+ 1 file changed, 2 insertions(+)
+
+--- a/drivers/net/ethernet/broadcom/bcm63xx_enet.c
++++ b/drivers/net/ethernet/broadcom/bcm63xx_enet.c
+@@ -2213,6 +2213,8 @@ static int bcm_enetsw_open(struct net_de
+               enetsw_writeb(priv, ENETSW_PTCTRL_RXDIS_MASK |
+                             ENETSW_PTCTRL_TXDIS_MASK,
+                             ENETSW_PTCTRL_REG(i));
++
++              priv->sw_port_link[i] = 0;
+       }
+       /* reset mib */
diff --git a/target/linux/brcm63xx/patches-3.6/417-bcm63xx_enet-don-t-overwrite-settings-when-setting-d.patch b/target/linux/brcm63xx/patches-3.6/417-bcm63xx_enet-don-t-overwrite-settings-when-setting-d.patch
new file mode 100644 (file)
index 0000000..407c816
--- /dev/null
@@ -0,0 +1,20 @@
+From e79bc74f76361020d820ed4611d28f70ebd845ca Mon Sep 17 00:00:00 2001
+From: Jonas Gorski <jonas.gorski@gmail.com>
+Date: Tue, 10 Jul 2012 10:44:09 +0200
+Subject: [PATCH 34/84] bcm63xx_enet: don't overwrite settings when setting duplex on force
+
+---
+ drivers/net/ethernet/broadcom/bcm63xx_enet.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+--- a/drivers/net/ethernet/broadcom/bcm63xx_enet.c
++++ b/drivers/net/ethernet/broadcom/bcm63xx_enet.c
+@@ -2333,7 +2333,7 @@ static int bcm_enetsw_open(struct net_de
+               }
+               if (port->force_duplex_full)
+-                      override = ENETSW_IMPOV_FDX_MASK;
++                      override |= ENETSW_IMPOV_FDX_MASK;
+               enetsw_writeb(priv, override, ENETSW_PORTOV_REG(i));
diff --git a/target/linux/brcm63xx/patches-3.6/418-bcm63xx_enet-store-the-number-of-ports-instead-of-ha.patch b/target/linux/brcm63xx/patches-3.6/418-bcm63xx_enet-store-the-number-of-ports-instead-of-ha.patch
new file mode 100644 (file)
index 0000000..232668b
--- /dev/null
@@ -0,0 +1,98 @@
+From efe31ec8fca92162fc21630611971345014a81a0 Mon Sep 17 00:00:00 2001
+From: Jonas Gorski <jonas.gorski@gmail.com>
+Date: Tue, 10 Jul 2012 10:39:30 +0200
+Subject: [PATCH 33/84] bcm63xx_enet: store the number of ports instead of hardcoding them
+
+This will be needed for devices with a different number of ports
+---
+ arch/mips/bcm63xx/dev-enet.c                       |    2 ++
+ .../include/asm/mach-bcm63xx/bcm63xx_dev_enet.h    |    2 ++
+ drivers/net/ethernet/broadcom/bcm63xx_enet.c       |    9 +++++----
+ drivers/net/ethernet/broadcom/bcm63xx_enet.h       |    1 +
+ 4 files changed, 10 insertions(+), 4 deletions(-)
+
+--- a/arch/mips/bcm63xx/dev-enet.c
++++ b/arch/mips/bcm63xx/dev-enet.c
+@@ -239,6 +239,8 @@ bcm63xx_enetsw_register(const struct bcm
+       memcpy(bcm63xx_enetsw_device.dev.platform_data, pd, sizeof (*pd));
++      enetsw_pd.num_ports = ENETSW_PORTS_6368;
++
+       ret = platform_device_register(&bcm63xx_enetsw_device);
+       if (ret)
+               return ret;
+--- a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_enet.h
++++ b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_enet.h
+@@ -43,6 +43,7 @@ struct bcm63xx_enet_platform_data {
+  * on board ethernet switch platform data
+  */
+ #define ENETSW_MAX_PORT       6
++#define ENETSW_PORTS_6368 6 /* 4 FE PHY + 2 RGMII */
+ struct bcm63xx_enetsw_port {
+       int             used;
+@@ -58,6 +59,7 @@ struct bcm63xx_enetsw_port {
+ struct bcm63xx_enetsw_platform_data {
+       char mac_addr[ETH_ALEN];
++      int num_ports;
+       struct bcm63xx_enetsw_port used_ports[ENETSW_MAX_PORT];
+ };
+--- a/drivers/net/ethernet/broadcom/bcm63xx_enet.c
++++ b/drivers/net/ethernet/broadcom/bcm63xx_enet.c
+@@ -2041,7 +2041,7 @@ static void swphy_poll_timer(unsigned lo
+       struct bcm_enet_priv *priv = (struct bcm_enet_priv *)data;
+       unsigned int i;
+-      for (i = 0; i < ARRAY_SIZE(priv->used_ports); i++) {
++      for (i = 0; i < priv->num_ports; i++) {
+               struct bcm63xx_enetsw_port *port;
+               int val, j, up, advertise, lpa, lpa2, speed, duplex, media;
+               u8 override;
+@@ -2207,7 +2207,7 @@ static int bcm_enetsw_open(struct net_de
+       priv->rx_curr_desc = 0;
+       /* disable all ports */
+-      for (i = 0; i < 6; i++) {
++      for (i = 0; i < priv->num_ports; i++) {
+               enetsw_writeb(priv, ENETSW_PORTOV_ENABLE_MASK,
+                             ENETSW_PORTOV_REG(i));
+               enetsw_writeb(priv, ENETSW_PTCTRL_RXDIS_MASK |
+@@ -2303,7 +2303,7 @@ static int bcm_enetsw_open(struct net_de
+       /*
+        * apply override config for bypass_link ports here.
+        */
+-      for (i = 0; i < ARRAY_SIZE(priv->used_ports); i++) {
++      for (i = 0; i < priv->num_ports; i++) {
+               struct bcm63xx_enetsw_port *port;
+               u8 override;
+               port = &priv->used_ports[i];
+@@ -2447,7 +2447,7 @@ static int bcm_enetsw_phy_is_external(st
+ {
+       int i;
+-      for (i = 0; i < (int)ARRAY_SIZE(priv->used_ports); ++i) {
++      for (i = 0; i < priv->num_ports; ++i) {
+               if (!priv->used_ports[i].used)
+                       continue;
+               if (priv->used_ports[i].phy_id == phy_id)
+@@ -2735,6 +2735,7 @@ static int __devinit bcm_enetsw_probe(st
+               memcpy(dev->dev_addr, pd->mac_addr, ETH_ALEN);
+               memcpy(priv->used_ports, pd->used_ports,
+                      sizeof (pd->used_ports));
++              priv->num_ports = pd->num_ports;
+       }
+       ret = compute_hw_mtu(priv, dev->mtu);
+--- a/drivers/net/ethernet/broadcom/bcm63xx_enet.h
++++ b/drivers/net/ethernet/broadcom/bcm63xx_enet.h
+@@ -354,6 +354,7 @@ struct bcm_enet_priv {
+       unsigned int hw_mtu;
+       /* port mapping for switch devices */
++      int num_ports;
+       struct bcm63xx_enetsw_port used_ports[ENETSW_MAX_PORT];
+       int sw_port_link[ENETSW_MAX_PORT];
diff --git a/target/linux/brcm63xx/patches-3.6/419-bcm63xx_enet-store-is_sw-in-a-variable-instead-of-ch.patch b/target/linux/brcm63xx/patches-3.6/419-bcm63xx_enet-store-is_sw-in-a-variable-instead-of-ch.patch
new file mode 100644 (file)
index 0000000..6f73477
--- /dev/null
@@ -0,0 +1,73 @@
+From ef581388c45dbc48f7bbe050e87deb1e3c63a698 Mon Sep 17 00:00:00 2001
+From: Jonas Gorski <jonas.gorski@gmail.com>
+Date: Tue, 10 Jul 2012 10:52:02 +0200
+Subject: [PATCH 35/84] bcm63xx_enet: store is_sw in a variable instead of checking the cpuid
+
+Reduces the number of changes needed for making enetsw work on new
+chips.
+---
+ drivers/net/ethernet/broadcom/bcm63xx_enet.c |    7 +++++--
+ drivers/net/ethernet/broadcom/bcm63xx_enet.h |   10 ++--------
+ 2 files changed, 7 insertions(+), 10 deletions(-)
+
+--- a/drivers/net/ethernet/broadcom/bcm63xx_enet.c
++++ b/drivers/net/ethernet/broadcom/bcm63xx_enet.c
+@@ -364,7 +364,7 @@ static int bcm_enet_receive_queue(struct
+               }
+               /* recycle packet if it's marked as bad */
+-              if (!bcm_enet_is_sw(priv) &&
++              if (!priv->enet_is_sw &&
+                   unlikely(len_stat & DMADESC_ERR_MASK)) {
+                       dev->stats.rx_errors++;
+@@ -597,7 +597,7 @@ static int bcm_enet_start_xmit(struct sk
+       }
+       /* pad small packets sent on a switch device */
+-      if (bcm_enet_is_sw(priv) && skb->len < 64) {
++      if (priv->enet_is_sw && skb->len < 64) {
+               int needed = 64 - skb->len;
+               char *data;
+@@ -1700,6 +1700,8 @@ static int __devinit bcm_enet_probe(stru
+               return -ENOMEM;
+       priv = netdev_priv(dev);
++      priv->enet_is_sw = false;
++
+       ret = compute_hw_mtu(priv, dev->mtu);
+       if (ret)
+               goto out;
+@@ -2725,6 +2727,7 @@ static int __devinit bcm_enetsw_probe(st
+       memset(priv, 0, sizeof(*priv));
+       /* initialize default and fetch platform data */
++      priv->enet_is_sw = true;
+       priv->irq_rx = irq_rx;
+       priv->irq_tx = irq_tx;
+       priv->rx_ring_size = BCMENET_DEF_RX_DESC;
+--- a/drivers/net/ethernet/broadcom/bcm63xx_enet.h
++++ b/drivers/net/ethernet/broadcom/bcm63xx_enet.h
+@@ -353,6 +353,8 @@ struct bcm_enet_priv {
+       /* maximum hardware transmit/receive size */
+       unsigned int hw_mtu;
++      bool enet_is_sw;
++
+       /* port mapping for switch devices */
+       int num_ports;
+       struct bcm63xx_enetsw_port used_ports[ENETSW_MAX_PORT];
+@@ -363,12 +365,4 @@ struct bcm_enet_priv {
+       spinlock_t enetsw_mdio_lock;
+ };
+-static inline int bcm_enet_is_sw(struct bcm_enet_priv *priv)
+-{
+-      if (BCMCPU_IS_6368())
+-              return 1;
+-      else
+-              return 0;
+-}
+-
+ #endif /* ! BCM63XX_ENET_H_ */
diff --git a/target/linux/brcm63xx/patches-3.6/420-BCM63XX-allow-enetsw-without-tx-irq.patch b/target/linux/brcm63xx/patches-3.6/420-BCM63XX-allow-enetsw-without-tx-irq.patch
new file mode 100644 (file)
index 0000000..6396b62
--- /dev/null
@@ -0,0 +1,69 @@
+From 625894c377ba266c0044675b53f05d65db6355b6 Mon Sep 17 00:00:00 2001
+From: Jonas Gorski <jonas.gorski@gmail.com>
+Date: Sun, 8 Jul 2012 13:07:52 +0200
+Subject: [PATCH 38/84] BCM63XX: allow enetsw without tx irq
+
+---
+ arch/mips/bcm63xx/dev-enet.c                 |    2 ++
+ drivers/net/ethernet/broadcom/bcm63xx_enet.c |   18 +++++++++++-------
+ 2 files changed, 13 insertions(+), 7 deletions(-)
+
+--- a/arch/mips/bcm63xx/dev-enet.c
++++ b/arch/mips/bcm63xx/dev-enet.c
+@@ -236,6 +236,8 @@ bcm63xx_enetsw_register(const struct bcm
+       enetsw_res[0].end += RSET_ENETSW_SIZE - 1;
+       enetsw_res[1].start = bcm63xx_get_irq_number(IRQ_ENETSW_RXDMA0);
+       enetsw_res[2].start = bcm63xx_get_irq_number(IRQ_ENETSW_TXDMA0);
++      if (!enetsw_res[2].start)
++              enetsw_res[2].start = -1;
+       memcpy(bcm63xx_enetsw_device.dev.platform_data, pd, sizeof (*pd));
+--- a/drivers/net/ethernet/broadcom/bcm63xx_enet.c
++++ b/drivers/net/ethernet/broadcom/bcm63xx_enet.c
+@@ -2151,10 +2151,12 @@ static int bcm_enetsw_open(struct net_de
+       if (ret)
+               goto out_freeirq;
+-      ret = request_irq(priv->irq_tx, bcm_enet_isr_dma,
+-                        IRQF_DISABLED, dev->name, dev);
+-      if (ret)
+-              goto out_freeirq_rx;
++      if (priv->irq_tx != -1) {
++              ret = request_irq(priv->irq_tx, bcm_enet_isr_dma,
++                                IRQF_DISABLED, dev->name, dev);
++              if (ret)
++                      goto out_freeirq_rx;
++      }
+       /* allocate rx dma ring */
+       size = priv->rx_ring_size * sizeof(struct bcm_enet_desc);
+@@ -2376,7 +2378,8 @@ out_free_rx_ring:
+                         priv->rx_desc_cpu, priv->rx_desc_dma);
+ out_freeirq_tx:
+-      free_irq(priv->irq_tx, dev);
++      if (priv->irq_tx != -1)
++              free_irq(priv->irq_tx, dev);
+ out_freeirq_rx:
+       free_irq(priv->irq_rx, dev);
+@@ -2433,7 +2436,8 @@ static int bcm_enetsw_stop(struct net_de
+                         priv->rx_desc_cpu, priv->rx_desc_dma);
+       dma_free_coherent(kdev, priv->tx_desc_alloc_size,
+                         priv->tx_desc_cpu, priv->tx_desc_dma);
+-      free_irq(priv->irq_tx, dev);
++      if (priv->irq_tx != -1)
++              free_irq(priv->irq_tx, dev);
+       free_irq(priv->irq_rx, dev);
+       return 0;
+@@ -2716,7 +2720,7 @@ static int __devinit bcm_enetsw_probe(st
+       res_mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+       irq_rx = platform_get_irq(pdev, 0);
+       irq_tx = platform_get_irq(pdev, 1);
+-      if (!res_mem || irq_rx < 0 || irq_tx < 0)
++      if (!res_mem || irq_rx < 0)
+               return -ENODEV;
+       ret = 0;
diff --git a/target/linux/brcm63xx/patches-3.6/421-BCM63XX-use-port-id-for-deciding-external-phy.patch b/target/linux/brcm63xx/patches-3.6/421-BCM63XX-use-port-id-for-deciding-external-phy.patch
new file mode 100644 (file)
index 0000000..da7013d
--- /dev/null
@@ -0,0 +1,87 @@
+From 85e4551e033df7cb043e93042661fc1e58799efa Mon Sep 17 00:00:00 2001
+From: Jonas Gorski <jonas.gorski@gmail.com>
+Date: Sun, 8 Jul 2012 15:36:23 +0200
+Subject: [PATCH 52/84] BCM63XX: use port id for deciding external phy
+
+Ports 0-3 always use the internal phy, while 4+ always need an external
+phy to work.
+---
+ .../include/asm/mach-bcm63xx/bcm63xx_dev_enet.h    |    3 ++-
+ drivers/net/ethernet/broadcom/bcm63xx_enet.c       |   15 ++++++++-------
+ drivers/net/ethernet/broadcom/bcm63xx_enet.h       |    5 +++++
+ 3 files changed, 15 insertions(+), 8 deletions(-)
+
+--- a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_enet.h
++++ b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_enet.h
+@@ -45,9 +45,10 @@ struct bcm63xx_enet_platform_data {
+ #define ENETSW_MAX_PORT       6
+ #define ENETSW_PORTS_6368 6 /* 4 FE PHY + 2 RGMII */
++#define ENETSW_RGMII_PORT0    4
++
+ struct bcm63xx_enetsw_port {
+       int             used;
+-      int             external_phy;
+       int             phy_id;
+       int             bypass_link;
+--- a/drivers/net/ethernet/broadcom/bcm63xx_enet.c
++++ b/drivers/net/ethernet/broadcom/bcm63xx_enet.c
+@@ -2046,6 +2046,7 @@ static void swphy_poll_timer(unsigned lo
+       for (i = 0; i < priv->num_ports; i++) {
+               struct bcm63xx_enetsw_port *port;
+               int val, j, up, advertise, lpa, lpa2, speed, duplex, media;
++              int external_phy = bcm_enet_port_is_rgmii(i);
+               u8 override;
+               port = &priv->used_ports[i];
+@@ -2057,7 +2058,7 @@ static void swphy_poll_timer(unsigned lo
+               /* dummy read to clear */
+               for (j = 0; j < 2; j++)
+-                      val = bcmenet_sw_mdio_read(priv, port->external_phy,
++                      val = bcmenet_sw_mdio_read(priv, external_phy,
+                                                  port->phy_id, MII_BMSR);
+               if (val == 0xffff)
+@@ -2081,14 +2082,14 @@ static void swphy_poll_timer(unsigned lo
+                       continue;
+               }
+-              advertise = bcmenet_sw_mdio_read(priv, port->external_phy,
++              advertise = bcmenet_sw_mdio_read(priv, external_phy,
+                                                port->phy_id, MII_ADVERTISE);
+-              lpa = bcmenet_sw_mdio_read(priv, port->external_phy,
+-                                         port->phy_id, MII_LPA);
++              lpa = bcmenet_sw_mdio_read(priv, external_phy, port->phy_id,
++                                         MII_LPA);
+-              lpa2 = bcmenet_sw_mdio_read(priv, port->external_phy,
+-                                         port->phy_id, MII_STAT1000);
++              lpa2 = bcmenet_sw_mdio_read(priv, external_phy, port->phy_id,
++                                          MII_STAT1000);
+               /* figure out media and duplex from advertise and LPA values */
+               media = mii_nway_result(lpa & advertise);
+@@ -2457,7 +2458,7 @@ static int bcm_enetsw_phy_is_external(st
+               if (!priv->used_ports[i].used)
+                       continue;
+               if (priv->used_ports[i].phy_id == phy_id)
+-                      return priv->used_ports[i].external_phy;
++                      return bcm_enet_port_is_rgmii(i);
+       }
+       printk_once(KERN_WARNING  "bcm63xx_enet: could not find a used port "
+--- a/drivers/net/ethernet/broadcom/bcm63xx_enet.h
++++ b/drivers/net/ethernet/broadcom/bcm63xx_enet.h
+@@ -365,4 +365,9 @@ struct bcm_enet_priv {
+       spinlock_t enetsw_mdio_lock;
+ };
++static inline int bcm_enet_port_is_rgmii(int portid)
++{
++      return portid >= ENETSW_RGMII_PORT0;
++}
++
+ #endif /* ! BCM63XX_ENET_H_ */
diff --git a/target/linux/brcm63xx/patches-3.6/422-bcm63xx_enet-enable-rgmii-clock-on-external-ports.patch b/target/linux/brcm63xx/patches-3.6/422-bcm63xx_enet-enable-rgmii-clock-on-external-ports.patch
new file mode 100644 (file)
index 0000000..217ddae
--- /dev/null
@@ -0,0 +1,53 @@
+From d8237d704fc25eb2fc25ef4403608b78c6a6d4be Mon Sep 17 00:00:00 2001
+From: Jonas Gorski <jonas.gorski@gmail.com>
+Date: Sun, 15 Jul 2012 20:08:57 +0200
+Subject: [PATCH 54/81] bcm63xx_enet: enable rgmii clock on external ports
+
+---
+ arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h |   13 +++++++++++++
+ drivers/net/ethernet/broadcom/bcm63xx_enet.c      |   12 ++++++++++++
+ 2 files changed, 25 insertions(+), 0 deletions(-)
+
+--- a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h
++++ b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h
+@@ -832,6 +832,19 @@
+ #define ENETSW_PORTOV_FDX_MASK                (1 << 1)
+ #define ENETSW_PORTOV_LINKUP_MASK     (1 << 0)
++/* Port RGMII control register */
++#define ENETSW_RGMII_CTRL_REG(x)      (0x60 + (x))
++#define ENETSW_RGMII_CTRL_GMII_CLK_EN (1 << 7)
++#define ENETSW_RGMII_CTRL_MII_OVERRIDE_EN (1 << 6)
++#define ENETSW_RGMII_CTRL_MII_MODE_MASK       (3 << 4)
++#define ENETSW_RGMII_CTRL_RGMII_MODE  (0 << 4)
++#define ENETSW_RGMII_CTRL_MII_MODE    (1 << 4)
++#define ENETSW_RGMII_CTRL_RVMII_MODE  (2 << 4)
++#define ENETSW_RGMII_CTRL_TIMING_SEL_EN       (1 << 0)
++
++/* Port RGMII timing register */
++#define ENETSW_RGMII_TIMING_REG(x)    (0x68 + (x))
++
+ /* MDIO control register */
+ #define ENETSW_MDIOC_REG              (0xb0)
+ #define ENETSW_MDIOC_EXT_MASK         (1 << 16)
+--- a/drivers/net/ethernet/broadcom/bcm63xx_enet.c
++++ b/drivers/net/ethernet/broadcom/bcm63xx_enet.c
+@@ -2222,6 +2222,18 @@ static int bcm_enetsw_open(struct net_de
+               priv->sw_port_link[i] = 0;
+       }
++      /* enable external ports */
++      for (i = ENETSW_RGMII_PORT0; i < priv->num_ports; i++) {
++              u8 rgmii_ctrl;
++
++              if (!priv->used_ports[i].used)
++                      continue;
++
++              rgmii_ctrl = enetsw_readb(priv, ENETSW_RGMII_CTRL_REG(i));
++              rgmii_ctrl |= ENETSW_RGMII_CTRL_GMII_CLK_EN;
++              enetsw_writeb(priv, rgmii_ctrl, ENETSW_RGMII_CTRL_REG(i));
++      }
++
+       /* reset mib */
+       val = enetsw_readb(priv, ENETSW_GMCR_REG);
+       val |= ENETSW_GMCR_RST_MIB_MASK;
diff --git a/target/linux/brcm63xx/patches-3.6/423-bcm63xx_enet-fix-lockup-on-BCM6328.patch b/target/linux/brcm63xx/patches-3.6/423-bcm63xx_enet-fix-lockup-on-BCM6328.patch
new file mode 100644 (file)
index 0000000..4306ce7
--- /dev/null
@@ -0,0 +1,93 @@
+From 382a0b0dc4cbd0e0fbfd6c2d132e972c3d1245b0 Mon Sep 17 00:00:00 2001
+From: Jonas Gorski <jonas.gorski@gmail.com>
+Date: Sun, 13 Nov 2011 14:59:37 +0100
+Subject: [PATCH 39/84] bcm63xx_enet: fix lockup on BCM6328
+
+BCM6328 locks up on a maxburst size of 16, reduce it to 8 for BCM6328 and
+BCM6368.
+
+Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
+---
+ drivers/net/ethernet/broadcom/bcm63xx_enet.c |   13 +++++++------
+ drivers/net/ethernet/broadcom/bcm63xx_enet.h |    4 ++++
+ 2 files changed, 11 insertions(+), 6 deletions(-)
+
+--- a/drivers/net/ethernet/broadcom/bcm63xx_enet.c
++++ b/drivers/net/ethernet/broadcom/bcm63xx_enet.c
+@@ -261,7 +261,6 @@ static int bcm_enet_refill_rx(struct net
+                       if (!skb)
+                               break;
+                       priv->rx_skb[desc_idx] = skb;
+-
+                       p = dma_map_single(&priv->pdev->dev, skb->data,
+                                          priv->rx_skb_size,
+                                          DMA_FROM_DEVICE);
+@@ -995,9 +994,9 @@ static int bcm_enet_open(struct net_devi
+       enet_writel(priv, priv->hw_mtu, ENET_TXMAXLEN_REG);
+       /* set dma maximum burst len */
+-      enet_dmac_writel(priv, BCMENET_DMA_MAXBURST,
++      enet_dmac_writel(priv, priv->dma_maxburst,
+                        ENETDMAC_MAXBURST_REG(priv->rx_chan));
+-      enet_dmac_writel(priv, BCMENET_DMA_MAXBURST,
++      enet_dmac_writel(priv, priv->dma_maxburst,
+                        ENETDMAC_MAXBURST_REG(priv->tx_chan));
+       /* set correct transmit fifo watermark */
+@@ -1593,7 +1592,7 @@ static int compute_hw_mtu(struct bcm_ene
+        * it's appended
+        */
+       priv->rx_skb_size = ALIGN(actual_mtu + ETH_FCS_LEN,
+-                                BCMENET_DMA_MAXBURST * 4);
++                                priv->dma_maxburst * 4);
+       return 0;
+ }
+@@ -1701,6 +1700,7 @@ static int __devinit bcm_enet_probe(stru
+       priv = netdev_priv(dev);
+       priv->enet_is_sw = false;
++      priv->dma_maxburst = BCMENET_DMA_MAXBURST;
+       ret = compute_hw_mtu(priv, dev->mtu);
+       if (ret)
+@@ -2282,9 +2282,9 @@ static int bcm_enetsw_open(struct net_de
+       enet_dmas_writel(priv, 0, ENETDMAS_SRAM4_REG(priv->tx_chan));
+       /* set dma maximum burst len */
+-      enet_dmac_writel(priv, BCMENET_DMA_MAXBURST,
++      enet_dmac_writel(priv, priv->dma_maxburst,
+                        ENETDMAC_MAXBURST_REG(priv->rx_chan));
+-      enet_dmac_writel(priv, BCMENET_DMA_MAXBURST,
++      enet_dmac_writel(priv, priv->dma_maxburst,
+                        ENETDMAC_MAXBURST_REG(priv->tx_chan));
+       /* set flow control low/high threshold to 1/3 / 2/3 */
+@@ -2749,6 +2749,7 @@ static int __devinit bcm_enetsw_probe(st
+       priv->irq_tx = irq_tx;
+       priv->rx_ring_size = BCMENET_DEF_RX_DESC;
+       priv->tx_ring_size = BCMENET_DEF_TX_DESC;
++      priv->dma_maxburst = BCMENETSW_DMA_MAXBURST;
+       pd = pdev->dev.platform_data;
+       if (pd) {
+--- a/drivers/net/ethernet/broadcom/bcm63xx_enet.h
++++ b/drivers/net/ethernet/broadcom/bcm63xx_enet.h
+@@ -17,6 +17,7 @@
+ /* maximum burst len for dma (4 bytes unit) */
+ #define BCMENET_DMA_MAXBURST  16
++#define BCMENETSW_DMA_MAXBURST        8
+ /* tx transmit threshold (4 bytes unit), fifo is 256 bytes, the value
+  * must be low enough so that a DMA transfer of above burst length can
+@@ -280,6 +281,9 @@ struct bcm_enet_priv {
+       /* number of dma desc in tx ring */
+       int tx_ring_size;
++      /* maximum dma burst size */
++      int dma_maxburst;
++
+       /* cpu view of rx dma ring */
+       struct bcm_enet_desc *tx_desc_cpu;
diff --git a/target/linux/brcm63xx/patches-3.6/424-MIPS-BCM63XX-add-support-for-BCM6328-in-bcm_enetsw.patch b/target/linux/brcm63xx/patches-3.6/424-MIPS-BCM63XX-add-support-for-BCM6328-in-bcm_enetsw.patch
new file mode 100644 (file)
index 0000000..e665249
--- /dev/null
@@ -0,0 +1,103 @@
+From f1c1bfa89cdac76a215d0e21161da9f8f8373437 Mon Sep 17 00:00:00 2001
+From: Jonas Gorski <jonas.gorski@gmail.com>
+Date: Tue, 14 Jun 2011 21:14:39 +0200
+Subject: [PATCH 40/84] MIPS: BCM63XX: add support for BCM6328 in bcm_enetsw
+
+Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
+---
+ arch/mips/bcm63xx/clk.c                            |   34 ++++++++++++++-----
+ arch/mips/bcm63xx/dev-enet.c                       |    9 +++--
+ .../include/asm/mach-bcm63xx/bcm63xx_dev_enet.h    |    1 +
+ 3 files changed, 32 insertions(+), 12 deletions(-)
+
+--- a/arch/mips/bcm63xx/clk.c
++++ b/arch/mips/bcm63xx/clk.c
+@@ -118,21 +118,37 @@ static struct clk clk_ephy = {
+  */
+ static void enetsw_set(struct clk *clk, int enable)
+ {
+-      if (!BCMCPU_IS_6368())
++      u32 mask;
++
++      if (!BCMCPU_IS_6328() && !BCMCPU_IS_6368())
+               return;
+-      bcm_hwclock_set(CKCTL_6368_ROBOSW_EN |
+-                      CKCTL_6368_SWPKT_USB_EN |
+-                      CKCTL_6368_SWPKT_SAR_EN, enable);
++
++      if (BCMCPU_IS_6328())
++              mask = CKCTL_6328_ROBOSW_EN;
++      else
++              mask = CKCTL_6368_ROBOSW_EN | CKCTL_6368_SWPKT_USB_EN |
++                     CKCTL_6368_SWPKT_SAR_EN;
++
++      bcm_hwclock_set(mask, enable);
+       if (enable) {
++              u32 reg;
+               u32 val;
++              if (BCMCPU_IS_6328()) {
++                      reg = PERF_SOFTRESET_6328_REG;
++                      mask = SOFTRESET_6328_ENETSW_MASK;
++              } else {
++                      reg = PERF_SOFTRESET_6368_REG;
++                      mask = SOFTRESET_6368_ENETSW_MASK;
++              }
++
+               /* reset switch core afer clock change */
+-              val = bcm_perf_readl(PERF_SOFTRESET_6368_REG);
+-              val &= ~SOFTRESET_6368_ENETSW_MASK;
+-              bcm_perf_writel(val, PERF_SOFTRESET_6368_REG);
++              val = bcm_perf_readl(reg);
++              val &= ~mask;
++              bcm_perf_writel(val, reg);
+               msleep(10);
+-              val |= SOFTRESET_6368_ENETSW_MASK;
+-              bcm_perf_writel(val, PERF_SOFTRESET_6368_REG);
++              val |= mask;
++              bcm_perf_writel(val, reg);
+               msleep(10);
+       }
+ }
+--- a/arch/mips/bcm63xx/dev-enet.c
++++ b/arch/mips/bcm63xx/dev-enet.c
+@@ -141,7 +141,7 @@ static int __init register_shared(void)
+       shared_res[0].end = shared_res[0].start;
+       shared_res[0].end += (RSET_ENETDMA_SIZE)  - 1;
+-      if (BCMCPU_IS_6368())
++      if (BCMCPU_IS_6328() || BCMCPU_IS_6368())
+               chan_count = 32;
+       else
+               chan_count = 16;
+@@ -224,7 +224,7 @@ bcm63xx_enetsw_register(const struct bcm
+ {
+       int ret;
+-      if (!BCMCPU_IS_6368())
++      if (!BCMCPU_IS_6328() && !BCMCPU_IS_6368())
+               return -ENODEV;
+       ret = register_shared();
+@@ -241,7 +241,10 @@ bcm63xx_enetsw_register(const struct bcm
+       memcpy(bcm63xx_enetsw_device.dev.platform_data, pd, sizeof (*pd));
+-      enetsw_pd.num_ports = ENETSW_PORTS_6368;
++      if (BCMCPU_IS_6328())
++              enetsw_pd.num_ports = ENETSW_PORTS_6328;
++      else if (BCMCPU_IS_6368())
++              enetsw_pd.num_ports = ENETSW_PORTS_6368;
+       ret = platform_device_register(&bcm63xx_enetsw_device);
+       if (ret)
+--- a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_enet.h
++++ b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_enet.h
+@@ -43,6 +43,7 @@ struct bcm63xx_enet_platform_data {
+  * on board ethernet switch platform data
+  */
+ #define ENETSW_MAX_PORT       6
++#define ENETSW_PORTS_6328 5 /* 4 FE PHY + 1 RGMII */
+ #define ENETSW_PORTS_6368 6 /* 4 FE PHY + 2 RGMII */
+ #define ENETSW_RGMII_PORT0    4
diff --git a/target/linux/brcm63xx/patches-3.6/425-MIPS-BCM63XX-add-HS-SPI-platform-device-and-register.patch b/target/linux/brcm63xx/patches-3.6/425-MIPS-BCM63XX-add-HS-SPI-platform-device-and-register.patch
new file mode 100644 (file)
index 0000000..51301d3
--- /dev/null
@@ -0,0 +1,128 @@
+From 56be5a2d7e08faa7bb306faaf352ac4e6ac52c01 Mon Sep 17 00:00:00 2001
+From: Jonas Gorski <jonas.gorski@gmail.com>
+Date: Sat, 12 Nov 2011 12:18:26 +0100
+Subject: [PATCH 26/60] MIPS: BCM63XX: add HS SPI platform device and register it
+
+Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
+---
+ arch/mips/bcm63xx/Makefile                         |    5 +-
+ arch/mips/bcm63xx/boards/board_bcm963xx.c          |    2 +
+ arch/mips/bcm63xx/dev-hsspi.c                      |   57 ++++++++++++++++++++
+ .../include/asm/mach-bcm63xx/bcm63xx_dev_hsspi.h   |   20 +++++++
+ 4 files changed, 82 insertions(+), 2 deletions(-)
+ create mode 100644 arch/mips/bcm63xx/dev-hsspi.c
+ create mode 100644 arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_hsspi.h
+
+--- a/arch/mips/bcm63xx/Makefile
++++ b/arch/mips/bcm63xx/Makefile
+@@ -1,6 +1,7 @@
+ obj-y         += clk.o cpu.o cs.o gpio.o irq.o prom.o setup.o timer.o \
+-                 dev-dsp.o dev-enet.o dev-flash.o dev-pcmcia.o dev-rng.o \
+-                 dev-spi.o dev-uart.o dev-usb-ehci.o dev-usb-ohci.o dev-wdt.o
++                 dev-dsp.o dev-enet.o dev-flash.o dev-hsspi.o dev-pcmcia.o \
++                 dev-rng.o dev-spi.o dev-uart.o dev-usb-ehci.o \
++                 dev-usb-ohci.o dev-wdt.o
+ obj-$(CONFIG_EARLY_PRINTK)    += early_printk.o
+ obj-y         += boards/
+--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
++++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
+@@ -25,6 +25,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_ohci.h>
+@@ -990,6 +991,7 @@ int __init board_register_devices(void)
+                       pr_err(PFX "failed to register fallback SPROM\n");
+       }
+ #endif
++      bcm63xx_hsspi_register();
+       bcm63xx_spi_register();
+--- /dev/null
++++ b/arch/mips/bcm63xx/dev-hsspi.c
+@@ -0,0 +1,57 @@
++/*
++ * This file is subject to the terms and conditions of the GNU General Public
++ * License.  See the file "COPYING" in the main directory of this archive
++ * for more details.
++ *
++ * Copyright (C) 2012 Jonas Gorski <jonas.gorski@gmail.com>
++ */
++
++#include <linux/init.h>
++#include <linux/kernel.h>
++#include <linux/platform_device.h>
++
++#include <bcm63xx_cpu.h>
++#include <bcm63xx_dev_hsspi.h>
++#include <bcm63xx_regs.h>
++
++static struct resource spi_resources[] = {
++      {
++              .start          = -1, /* filled at runtime */
++              .end            = -1, /* filled at runtime */
++              .flags          = IORESOURCE_MEM,
++      },
++      {
++              .start          = -1, /* filled at runtime */
++              .flags          = IORESOURCE_IRQ,
++      },
++};
++
++static struct bcm63xx_hsspi_pdata spi_pdata = {
++      .bus_num        = 0,
++};
++
++static struct platform_device bcm63xx_hsspi_device = {
++      .name           = "bcm63xx-hsspi",
++      .id             = 0,
++      .num_resources  = ARRAY_SIZE(spi_resources),
++      .resource       = spi_resources,
++      .dev            = {
++              .platform_data = &spi_pdata,
++      },
++};
++
++int __init bcm63xx_hsspi_register(void)
++{
++
++      if (!BCMCPU_IS_6328())
++              return -ENODEV;
++
++      spi_resources[0].start = bcm63xx_regset_address(RSET_HSSPI);
++      spi_resources[0].end = spi_resources[0].start;
++      spi_resources[0].end += RSET_HSSPI_SIZE - 1;
++      spi_resources[1].start = bcm63xx_get_irq_number(IRQ_HSSPI);
++
++      spi_pdata.speed_hz = HSSPI_PLL_HZ_6328;
++
++      return platform_device_register(&bcm63xx_hsspi_device);
++}
+--- /dev/null
++++ b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_hsspi.h
+@@ -0,0 +1,20 @@
++#ifndef BCM63XX_DEV_HSSPI_H
++#define BCM63XX_DEV_HSSPI_H
++
++#include <linux/types.h>
++#include <bcm63xx_io.h>
++#include <bcm63xx_regs.h>
++
++int __init bcm63xx_hsspi_register(void);
++
++struct bcm63xx_hsspi_pdata {
++      int             bus_num;
++      u32             speed_hz;
++};
++
++#define bcm_hsspi_readl(o)    bcm_rset_readl(RSET_HSSPI, (o))
++#define bcm_hsspi_writel(v, o)        bcm_rset_writel(RSET_HSSPI, (v), (o))
++
++#define HSSPI_PLL_HZ_6328     133333333
++
++#endif /* BCM63XX_DEV_HSSPI_H */
diff --git a/target/linux/brcm63xx/patches-3.6/426-SPI-MIPS-BCM63XX-Add-HS-SPI-driver.patch b/target/linux/brcm63xx/patches-3.6/426-SPI-MIPS-BCM63XX-Add-HS-SPI-driver.patch
new file mode 100644 (file)
index 0000000..2b21396
--- /dev/null
@@ -0,0 +1,481 @@
+From 4b27423676485d05bcd6fc6f3809164fb8f9d22d Mon Sep 17 00:00:00 2001
+From: Jonas Gorski <jonas.gorski@gmail.com>
+Date: Sat, 12 Nov 2011 12:19:55 +0100
+Subject: [PATCH 30/60] SPI: MIPS: BCM63XX: Add HSSPI driver
+
+Add a driver for the High Speed SPI controller found on newer BCM63XX SoCs.
+
+Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
+---
+ .../include/asm/mach-bcm63xx/bcm63xx_dev_hsspi.h   |    2 +
+ drivers/spi/Kconfig                                |    7 +
+ drivers/spi/Makefile                               |    1 +
+ drivers/spi/spi-bcm63xx-hsspi.c                    |  427 ++++++++++++++++++++
+ 4 files changed, 437 insertions(+), 0 deletions(-)
+ create mode 100644 drivers/spi/spi-bcm63xx-hsspi.c
+
+--- a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_hsspi.h
++++ b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_hsspi.h
+@@ -17,4 +17,6 @@ struct bcm63xx_hsspi_pdata {
+ #define HSSPI_PLL_HZ_6328     133333333
++#define HSSPI_BUFFER_LEN      512
++
+ #endif /* BCM63XX_DEV_HSSPI_H */
+--- a/drivers/spi/Kconfig
++++ b/drivers/spi/Kconfig
+@@ -100,6 +100,13 @@ config SPI_BCM63XX
+       help
+           Enable support for the SPI controller on the Broadcom BCM63xx SoCs.
++config SPI_BCM63XX_HSSPI
++      tristate "Broadcom BCM63XX HS SPI controller driver"
++      depends on BCM63XX
++      help
++        This enables support for the High Speed SPI controller present on
++        newer Broadcom BCM63XX SoCs.
++
+ config SPI_BITBANG
+       tristate "Utilities for Bitbanging SPI masters"
+       help
+--- a/drivers/spi/Makefile
++++ b/drivers/spi/Makefile
+@@ -15,6 +15,7 @@ obj-$(CONFIG_SPI_ATMEL)                      += spi-atmel.o
+ obj-$(CONFIG_SPI_ATH79)                       += spi-ath79.o
+ obj-$(CONFIG_SPI_AU1550)              += spi-au1550.o
+ obj-$(CONFIG_SPI_BCM63XX)             += spi-bcm63xx.o
++obj-$(CONFIG_SPI_BCM63XX_HSSPI)               += spi-bcm63xx-hsspi.o
+ obj-$(CONFIG_SPI_BFIN5XX)             += spi-bfin5xx.o
+ obj-$(CONFIG_SPI_BFIN_SPORT)          += spi-bfin-sport.o
+ obj-$(CONFIG_SPI_BITBANG)             += spi-bitbang.o
+--- /dev/null
++++ b/drivers/spi/spi-bcm63xx-hsspi.c
+@@ -0,0 +1,427 @@
++/*
++ * Broadcom BCM63XX High Speed SPI Controller driver
++ *
++ * Copyright 2000-2010 Broadcom Corporation
++ * Copyright 2012 Jonas Gorski <jonas.gorski@gmail.com>
++ *
++ * Licensed under the GNU/GPL. See COPYING for details.
++ */
++
++#include <linux/kernel.h>
++#include <linux/init.h>
++#include <linux/io.h>
++#include <linux/clk.h>
++#include <linux/module.h>
++#include <linux/platform_device.h>
++#include <linux/delay.h>
++#include <linux/dma-mapping.h>
++#include <linux/err.h>
++#include <linux/interrupt.h>
++#include <linux/spi/spi.h>
++#include <linux/workqueue.h>
++
++#include <bcm63xx_regs.h>
++#include <bcm63xx_dev_hsspi.h>
++
++#define HSSPI_OP_CODE_SHIFT   13
++#define HSSPI_OP_SLEEP                (0 << HSSPI_OP_CODE_SHIFT)
++#define HSSPI_OP_READ_WRITE   (1 << HSSPI_OP_CODE_SHIFT)
++#define HSSPI_OP_WRITE                (2 << HSSPI_OP_CODE_SHIFT)
++#define HSSPI_OP_READ         (3 << HSSPI_OP_CODE_SHIFT)
++
++#define HSSPI_MAX_PREPEND_LEN 15
++
++#define HSSPI_MAX_SYNC_CLOCK  30000000
++
++struct bcm63xx_hsspi {
++      struct completion       done;
++      struct spi_transfer     *curr_trans;
++
++      struct platform_device  *pdev;
++      struct clk              *clk;
++      void __iomem            *regs;
++      u8 __iomem              *fifo;
++
++      u32                     speed_hz;
++      int                     irq;
++};
++
++static void bcm63xx_hsspi_set_clk(struct bcm63xx_hsspi *bs, int hz,
++                                int profile)
++{
++      u32 reg;
++
++      reg = DIV_ROUND_UP(2048, DIV_ROUND_UP(bs->speed_hz, hz));
++      bcm_hsspi_writel(CLK_CTRL_ACCUM_RST_ON_LOOP | reg,
++                       HSSPI_PROFILE_CLK_CTRL_REG(profile));
++
++      reg = bcm_hsspi_readl(HSSPI_PROFILE_SIGNAL_CTRL_REG(profile));
++      if (hz > HSSPI_MAX_SYNC_CLOCK)
++              reg |= SIGNAL_CTRL_ASYNC_INPUT_PATH;
++      else
++              reg &= ~SIGNAL_CTRL_ASYNC_INPUT_PATH;
++      bcm_hsspi_writel(reg, HSSPI_PROFILE_SIGNAL_CTRL_REG(profile));
++}
++
++static int bcm63xx_hsspi_do_txrx(struct spi_device *spi,
++                               struct spi_transfer *t1,
++                               struct spi_transfer *t2)
++{
++      struct bcm63xx_hsspi *bs = spi_master_get_devdata(spi->master);
++      u8 chip_select = spi->chip_select;
++      u16 opcode = 0;
++      int len, prepend_size = 0;
++
++      init_completion(&bs->done);
++
++      bs->curr_trans = t2 ? t2 : t1;
++      bcm63xx_hsspi_set_clk(bs, bs->curr_trans->speed_hz, chip_select);
++
++      if (t2 && !t2->tx_buf)
++              prepend_size = t1->len;
++
++      bcm_hsspi_writel(prepend_size << MODE_CTRL_PREPENDBYTE_CNT_SHIFT |
++                       2 << MODE_CTRL_MULTIDATA_WR_STRT_SHIFT |
++                       2 << MODE_CTRL_MULTIDATA_RD_STRT_SHIFT | 0xff,
++                       HSSPI_PROFILE_MODE_CTRL_REG(chip_select));
++
++      if (t1->rx_buf && t1->tx_buf)
++              opcode = HSSPI_OP_READ_WRITE;
++      else if (t1->rx_buf || (t2 && t2->rx_buf))
++              opcode = HSSPI_OP_READ;
++      else if (t1->tx_buf)
++              opcode = HSSPI_OP_WRITE;
++
++      if (opcode == HSSPI_OP_READ && t2)
++              len = t2->len;
++      else
++              len = t1->len;
++
++      if (t1->tx_buf) {
++              memcpy_toio(bs->fifo + 2, t1->tx_buf, t1->len);
++              if (t2 && t2->tx_buf) {
++                      memcpy_toio(bs->fifo + 2 + t1->len,
++                                  t2->tx_buf, t2->len);
++                      len += t2->len;
++              }
++      }
++
++      opcode |= len;
++      memcpy_toio(bs->fifo, &opcode, sizeof(opcode));
++
++      /* enable interrupt */
++      bcm_hsspi_writel(HSSPI_PING0_CMD_DONE, HSSPI_INT_MASK_REG);
++
++      /* start the transfer */
++      bcm_hsspi_writel(chip_select << PINGPONG_CMD_SS_SHIFT |
++                       chip_select << PINGPONG_CMD_PROFILE_SHIFT |
++                       PINGPONG_COMMAND_START_NOW,
++                       HSSPI_PINGPONG_COMMAND_REG(0));
++
++      if (wait_for_completion_timeout(&bs->done, HZ) == 0) {
++              dev_err(&bs->pdev->dev, "transfer timed out!\n");
++              return -ETIMEDOUT;
++      }
++
++      return t1->len + (t2 ? t2->len : 0);
++}
++
++static int bcm63xx_hsspi_setup(struct spi_device *spi)
++{
++      u32 reg;
++
++      if (spi->bits_per_word != 8)
++              return -EINVAL;
++
++      if (spi->max_speed_hz == 0)
++              return -EINVAL;
++
++      reg = bcm_hsspi_readl(HSSPI_PROFILE_SIGNAL_CTRL_REG(spi->chip_select));
++      reg &= ~(SIGNAL_CTRL_LAUNCH_RISING | SIGNAL_CTRL_LATCH_RISING);
++      if (spi->mode & SPI_CPHA)
++              reg |= SIGNAL_CTRL_LAUNCH_RISING;
++      else
++              reg |= SIGNAL_CTRL_LATCH_RISING;
++      bcm_hsspi_writel(reg, HSSPI_PROFILE_SIGNAL_CTRL_REG(spi->chip_select));
++
++      return 0;
++}
++
++static int bcm63xx_hsspi_transfer_one(struct spi_master *master,
++                                    struct spi_message *msg)
++{
++      struct spi_transfer *t, *prev = NULL;
++      struct spi_device *spi = msg->spi;
++      u32 reg;
++      int ret = -EINVAL;
++      int len = 0;
++
++      /* check if we are able to make these transfers */
++      list_for_each_entry(t, &msg->transfers, transfer_list) {
++              if (!t->tx_buf && !t->rx_buf)
++                      goto out;
++
++              if (t->speed_hz == 0)
++                      t->speed_hz = spi->max_speed_hz;
++
++              if (t->speed_hz > spi->max_speed_hz)
++                      goto out;
++
++              if (t->len > HSSPI_BUFFER_LEN)
++                      goto out;
++
++              /*
++               * This controller does not support keeping the chip select
++               * active between transfers.
++               * This logic currently supports combining:
++               *  write then read with no cs_change (e.g. m25p80 RDSR)
++               *  write then write with no cs_change (e.g. m25p80 PP)
++               */
++              if (prev && prev->tx_buf && !prev->cs_change && !t->cs_change) {
++                      /*
++                       * reject if we have to combine two tx transfers and
++                       * their combined length is bigger than the buffer
++                       */
++                      if (prev->tx_buf && t->tx_buf &&
++                          (prev->len + t->len) > HSSPI_BUFFER_LEN)
++                              goto out;
++                      /*
++                       * reject if we need write more than 15 bytes in read
++                       * then write.
++                       */
++                      if (prev->tx_buf && t->rx_buf &&
++                          prev->len > HSSPI_MAX_PREPEND_LEN)
++                              goto out;
++              }
++
++      }
++
++      /* setup clock polarity */
++      reg = bcm_hsspi_readl(HSSPI_GLOBAL_CTRL_REG);
++      reg &= ~GLOBAL_CTRL_CLK_POLARITY;
++      if (spi->mode & SPI_CPOL)
++              reg |= GLOBAL_CTRL_CLK_POLARITY;
++      bcm_hsspi_writel(reg, HSSPI_GLOBAL_CTRL_REG);
++
++      list_for_each_entry(t, &msg->transfers, transfer_list) {
++              if (prev && prev->tx_buf && !prev->cs_change && !t->cs_change) {
++                      /* combine write with following transfer */
++                      ret = bcm63xx_hsspi_do_txrx(msg->spi, prev, t);
++                      if (ret < 0)
++                              goto out;
++
++                      len += ret;
++                      prev = NULL;
++                      continue;
++              }
++
++              /* write the previous pending transfer */
++              if (prev != NULL) {
++                      ret = bcm63xx_hsspi_do_txrx(msg->spi, prev, NULL);
++                      if (ret < 0)
++                              goto out;
++
++                      len += ret;
++              }
++
++              prev = t;
++      }
++
++      /* do last pending transfer */
++      if (prev != NULL) {
++              ret = bcm63xx_hsspi_do_txrx(msg->spi, prev, NULL);
++              if (ret < 0)
++                      goto out;
++              len += ret;
++      }
++
++      msg->actual_length = len;
++      ret = 0;
++out:
++      msg->status = ret;
++      spi_finalize_current_message(master);
++      return 0;
++}
++
++static irqreturn_t bcm63xx_hsspi_interrupt(int irq, void *dev_id)
++{
++      struct spi_master *master = (struct spi_master *)dev_id;
++      struct bcm63xx_hsspi *bs = spi_master_get_devdata(master);
++
++      if (bcm_hsspi_readl(HSSPI_INT_STATUS_MASKED_REG) == 0)
++              return IRQ_NONE;
++
++      bcm_hsspi_writel(HSSPI_INT_CLEAR_ALL, HSSPI_INT_STATUS_REG);
++      bcm_hsspi_writel(0, HSSPI_INT_MASK_REG);
++
++      if (bs->curr_trans && bs->curr_trans->rx_buf)
++              memcpy_fromio(bs->curr_trans->rx_buf,  bs->fifo,
++                            bs->curr_trans->len);
++      complete(&bs->done);
++
++      return IRQ_HANDLED;
++}
++
++static int __devinit bcm63xx_hsspi_probe(struct platform_device *pdev)
++{
++
++      struct spi_master *master;
++      struct bcm63xx_hsspi *bs;
++      struct resource *res_mem;
++      void __iomem *regs;
++      struct device *dev = &pdev->dev;
++      struct bcm63xx_hsspi_pdata *pdata = pdev->dev.platform_data;
++      struct clk *clk;
++      int irq;
++      int ret;
++
++      irq = platform_get_irq(pdev, 0);
++      if (irq < 0) {
++              dev_err(dev, "no irq\n");
++              return -ENXIO;
++      }
++
++      res_mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
++      regs = devm_request_and_ioremap(dev, res_mem);
++      if (!regs) {
++              dev_err(dev, "unable to ioremap regs\n");
++              return -ENXIO;
++      }
++
++      clk = clk_get(dev, "hsspi");
++
++      if (IS_ERR(clk)) {
++              ret = PTR_ERR(clk);
++              goto out_release;
++      }
++
++      clk_prepare_enable(clk);
++
++      master = spi_alloc_master(&pdev->dev, sizeof(*bs));
++      if (!master) {
++              ret = -ENOMEM;
++              goto out_disable_clk;
++      }
++
++      bs = spi_master_get_devdata(master);
++      bs->pdev = pdev;
++      bs->clk = clk;
++      bs->regs = regs;
++
++      master->bus_num = pdata->bus_num;
++      master->num_chipselect = 8;
++      master->setup = bcm63xx_hsspi_setup;
++      master->transfer_one_message = bcm63xx_hsspi_transfer_one;
++      master->mode_bits = SPI_CPOL | SPI_CPHA;
++
++      bs->speed_hz = pdata->speed_hz;
++      bs->fifo = (u8 __iomem *)(bs->regs + HSSPI_FIFO_REG(0));
++
++      platform_set_drvdata(pdev, master);
++
++      bs->curr_trans = NULL;
++
++      /* Initialize the hardware */
++      bcm_hsspi_writel(0, HSSPI_INT_MASK_REG);
++
++      /* clean up any pending interrupts */
++      bcm_hsspi_writel(HSSPI_INT_CLEAR_ALL, HSSPI_INT_STATUS_REG);
++
++      bcm_hsspi_writel(bcm_hsspi_readl(HSSPI_GLOBAL_CTRL_REG) |
++                       GLOBAL_CTRL_CLK_GATE_SSOFF,
++                       HSSPI_GLOBAL_CTRL_REG);
++
++      ret = devm_request_irq(dev, irq, bcm63xx_hsspi_interrupt, IRQF_SHARED,
++                             pdev->name, master);
++
++      if (ret)
++              goto out_put_master;
++
++      /* register and we are done */
++      ret = spi_register_master(master);
++      if (ret)
++              goto out_free_irq;
++
++      return 0;
++
++out_free_irq:
++      devm_free_irq(dev, bs->irq, master);
++out_put_master:
++      spi_master_put(master);
++out_disable_clk:
++      clk_disable_unprepare(clk);
++      clk_put(clk);
++out_release:
++      devm_ioremap_release(dev, regs);
++
++      return ret;
++}
++
++
++static int __exit bcm63xx_hsspi_remove(struct platform_device *pdev)
++{
++      struct spi_master *master = platform_get_drvdata(pdev);
++      struct bcm63xx_hsspi *bs = spi_master_get_devdata(master);
++
++      spi_unregister_master(master);
++
++      /* reset the hardware and block queue progress */
++      bcm_hsspi_writel(0, HSSPI_INT_MASK_REG);
++      clk_disable_unprepare(bs->clk);
++      clk_put(bs->clk);
++
++      return 0;
++}
++
++#ifdef CONFIG_PM
++static int bcm63xx_hsspi_suspend(struct platform_device *pdev,
++                               pm_message_t mesg)
++{
++      struct spi_master *master = platform_get_drvdata(pdev);
++      struct bcm63xx_hsspi *bs = spi_master_get_devdata(master);
++
++      spi_master_suspend(master);
++      clk_disable(bs->clk);
++
++      return 0;
++}
++
++static int bcm63xx_hsspi_resume(struct platform_device *pdev)
++{
++      struct spi_master *master = platform_get_drvdata(pdev);
++      struct bcm63xx_hsspi *bs = spi_master_get_devdata(master);
++
++      clk_enable(bs->clk);
++      spi_master_resume(master);
++
++      return 0;
++}
++
++static const struct dev_pm_ops bcm63xx_hsspi_pm_ops = {
++      .suspend        = bcm63xx_hsspi_suspend,
++      .resume         = bcm63xx_hsspi_resume,
++};
++
++#define BCM63XX_HSSPI_PM_OPS  (&bcm63xx_hsspi_pm_ops)
++#else
++#define BCM63XX_HSSPI_PM_OPS  NULL
++#endif
++
++
++
++static struct platform_driver bcm63xx_hsspi_driver = {
++      .driver = {
++              .name   = "bcm63xx-hsspi",
++              .owner  = THIS_MODULE,
++              .pm     = BCM63XX_HSSPI_PM_OPS,
++      },
++      .probe          = bcm63xx_hsspi_probe,
++      .remove         = __exit_p(bcm63xx_hsspi_remove),
++};
++
++module_platform_driver(bcm63xx_hsspi_driver);
++
++MODULE_ALIAS("platform:bcm63xx_hsspi");
++MODULE_DESCRIPTION("Broadcom BCM63xx HS SPI Controller driver");
++MODULE_AUTHOR("Jonas Gorski <jonas.gorski@gmail.com>");
++MODULE_LICENSE("GPL");
diff --git a/target/linux/brcm63xx/patches-3.6/427-MIPS-BCM63XX-Register-SPI-flash-if-present.patch b/target/linux/brcm63xx/patches-3.6/427-MIPS-BCM63XX-Register-SPI-flash-if-present.patch
new file mode 100644 (file)
index 0000000..229a585
--- /dev/null
@@ -0,0 +1,102 @@
+From d135d94b3d1fe599d13e7198d5f502912d694c13 Mon Sep 17 00:00:00 2001
+From: Jonas Gorski <jonas.gorski@gmail.com>
+Date: Sun, 3 Jul 2011 15:00:38 +0200
+Subject: [PATCH 29/60] MIPS: BCM63XX: Register SPI flash if present
+
+Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
+---
+ arch/mips/bcm63xx/dev-flash.c                     |   33 +++++++++++++++++++-
+ arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h |    2 +
+ 2 files changed, 33 insertions(+), 2 deletions(-)
+
+--- a/arch/mips/bcm63xx/dev-flash.c
++++ b/arch/mips/bcm63xx/dev-flash.c
+@@ -16,9 +16,12 @@
+ #include <linux/mtd/mtd.h>
+ #include <linux/mtd/partitions.h>
+ #include <linux/mtd/physmap.h>
++#include <linux/spi/spi.h>
++#include <linux/spi/flash.h>
+ #include <bcm63xx_cpu.h>
+ #include <bcm63xx_dev_flash.h>
++#include <bcm63xx_dev_hsspi.h>
+ #include <bcm63xx_regs.h>
+ #include <bcm63xx_io.h>
+@@ -55,6 +58,21 @@ static struct platform_device mtd_dev =
+       },
+ };
++static struct flash_platform_data bcm63xx_flash_data = {
++      .part_probe_types       = bcm63xx_part_types,
++};
++
++static struct spi_board_info bcm63xx_spi_flash_info[] = {
++      {
++              .bus_num        = 0,
++              .chip_select    = 0,
++              .mode           = 0,
++              .max_speed_hz   = 781000,
++              .modalias       = "m25p80",
++              .platform_data  = &bcm63xx_flash_data,
++      },
++};
++
+ static int __init bcm63xx_detect_flash_type(void)
+ {
+       u32 val;
+@@ -62,6 +80,11 @@ static int __init bcm63xx_detect_flash_t
+       switch (bcm63xx_get_cpu_id()) {
+       case BCM6328_CPU_ID:
+               val = bcm_misc_readl(MISC_STRAPBUS_6328_REG);
++              if (val & STRAPBUS_6328_HSSPI_CLK_FAST)
++                      bcm63xx_spi_flash_info[0].max_speed_hz = 33333334;
++              else
++                      bcm63xx_spi_flash_info[0].max_speed_hz = 16666667;
++
+               if (val & STRAPBUS_6328_BOOT_SEL_SERIAL)
+                       return BCM63XX_FLASH_TYPE_SERIAL;
+               else
+@@ -79,6 +102,9 @@ static int __init bcm63xx_detect_flash_t
+                       return BCM63XX_FLASH_TYPE_SERIAL;
+       case BCM6368_CPU_ID:
+               val = bcm_gpio_readl(GPIO_STRAPBUS_REG);
++              if (val & STRAPBUS_6368_SPI_CLK_FAST)
++                      bcm63xx_spi_flash_info[0].max_speed_hz = 20000000;
++
+               switch (val & STRAPBUS_6368_BOOT_SEL_MASK) {
+               case STRAPBUS_6368_BOOT_SEL_NAND:
+                       return BCM63XX_FLASH_TYPE_NAND;
+@@ -110,8 +136,11 @@ 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_6328())
++                      bcm63xx_flash_data.max_transfer_len = HSSPI_BUFFER_LEN;
++
++              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/include/asm/mach-bcm63xx/bcm63xx_regs.h
++++ b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h
+@@ -608,6 +608,7 @@
+ #define GPIO_STRAPBUS_REG             0x40
+ #define STRAPBUS_6358_BOOT_SEL_PARALLEL       (1 << 1)
+ #define STRAPBUS_6358_BOOT_SEL_SERIAL (0 << 1)
++#define STRAPBUS_6368_SPI_CLK_FAST    (1 << 6)
+ #define STRAPBUS_6368_BOOT_SEL_MASK   0x3
+ #define STRAPBUS_6368_BOOT_SEL_NAND   0
+ #define STRAPBUS_6368_BOOT_SEL_SERIAL 1
+@@ -1300,6 +1301,7 @@
+ #define STRAPBUS_6362_BOOT_SEL_NAND   (0 << 15)
+ #define MISC_STRAPBUS_6328_REG                0x240
++#define STRAPBUS_6328_HSSPI_CLK_FAST  (1 << 4)
+ #define STRAPBUS_6328_FCVO_SHIFT      7
+ #define STRAPBUS_6328_FCVO_MASK               (0x1f << STRAPBUS_6328_FCVO_SHIFT)
+ #define STRAPBUS_6328_BOOT_SEL_SERIAL (1 << 28)
diff --git a/target/linux/brcm63xx/patches-3.6/428-MIPS-BCM63XX-add-flash-detection-for-BCM6362.patch b/target/linux/brcm63xx/patches-3.6/428-MIPS-BCM63XX-add-flash-detection-for-BCM6362.patch
new file mode 100644 (file)
index 0000000..d913201
--- /dev/null
@@ -0,0 +1,50 @@
+From d9666553a10ea85ea64e3e8784a42167a1709ed5 Mon Sep 17 00:00:00 2001
+From: Jonas Gorski <jonas.gorski@gmail.com>
+Date: Mon, 21 Nov 2011 00:48:52 +0100
+Subject: [PATCH 55/84] MIPS: BCM63XX: add flash detection for BCM6362
+
+Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
+---
+ arch/mips/bcm63xx/dev-flash.c                     |   13 ++++++++++++-
+ arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h |    1 +
+ 2 files changed, 13 insertions(+), 1 deletions(-)
+
+--- a/arch/mips/bcm63xx/dev-flash.c
++++ b/arch/mips/bcm63xx/dev-flash.c
+@@ -100,6 +100,17 @@ static int __init bcm63xx_detect_flash_t
+                       return BCM63XX_FLASH_TYPE_PARALLEL;
+               else
+                       return BCM63XX_FLASH_TYPE_SERIAL;
++      case BCM6362_CPU_ID:
++              val = bcm_misc_readl(MISC_STRAPBUS_6362_REG);
++              if (val & STRAPBUS_6362_HSSPI_CLK_FAST)
++                      bcm63xx_spi_flash_info[0].max_speed_hz = 50000000;
++              else
++                      bcm63xx_spi_flash_info[0].max_speed_hz = 20000000;
++
++              if (val & STRAPBUS_6362_BOOT_SEL_SERIAL)
++                      return BCM63XX_FLASH_TYPE_SERIAL;
++              else
++                      return BCM63XX_FLASH_TYPE_NAND;
+       case BCM6368_CPU_ID:
+               val = bcm_gpio_readl(GPIO_STRAPBUS_REG);
+               if (val & STRAPBUS_6368_SPI_CLK_FAST)
+@@ -136,7 +147,7 @@ int __init bcm63xx_flash_register(void)
+               return platform_device_register(&mtd_dev);
+       case BCM63XX_FLASH_TYPE_SERIAL:
+-              if (BCMCPU_IS_6328())
++              if (BCMCPU_IS_6328() || BCMCPU_IS_6362())
+                       bcm63xx_flash_data.max_transfer_len = HSSPI_BUFFER_LEN;
+               return spi_register_board_info(bcm63xx_spi_flash_info,
+--- a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h
++++ b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h
+@@ -1296,6 +1296,7 @@
+ #define MISC_STRAPBUS_6362_REG                0x14
+ #define STRAPBUS_6362_FCVO_SHIFT      1
++#define STRAPBUS_6362_HSSPI_CLK_FAST  (1 << 13)
+ #define STRAPBUS_6362_FCVO_MASK               (0x1f << STRAPBUS_6362_FCVO_SHIFT)
+ #define STRAPBUS_6362_BOOT_SEL_SERIAL (1 << 15)
+ #define STRAPBUS_6362_BOOT_SEL_NAND   (0 << 15)
diff --git a/target/linux/brcm63xx/patches-3.6/428-MIPS-BCM63XX-move-nvram-related-functions-into-their.patch b/target/linux/brcm63xx/patches-3.6/428-MIPS-BCM63XX-move-nvram-related-functions-into-their.patch
new file mode 100644 (file)
index 0000000..f7f4e90
--- /dev/null
@@ -0,0 +1,351 @@
+From 5b753c1d01c6af23d7d37d37d9de30da8a971084 Mon Sep 17 00:00:00 2001
+From: Jonas Gorski <jonas.gorski@gmail.com>
+Date: Sat, 12 May 2012 22:51:08 +0200
+Subject: [PATCH 60/79] MIPS: BCM63XX: move nvram related functions into their
+ own file
+
+Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
+---
+ arch/mips/bcm63xx/Makefile                         |    6 +-
+ arch/mips/bcm63xx/boards/board_bcm963xx.c          |   74 +++--------------
+ arch/mips/bcm63xx/nvram.c                          |   84 ++++++++++++++++++++
+ arch/mips/include/asm/mach-bcm63xx/bcm63xx_nvram.h |   34 ++++++++
+ .../mips/include/asm/mach-bcm63xx/board_bcm963xx.h |   17 ----
+ 5 files changed, 134 insertions(+), 81 deletions(-)
+ create mode 100644 arch/mips/bcm63xx/nvram.c
+ create mode 100644 arch/mips/include/asm/mach-bcm63xx/bcm63xx_nvram.h
+
+--- a/arch/mips/bcm63xx/Makefile
++++ b/arch/mips/bcm63xx/Makefile
+@@ -1,6 +1,6 @@
+-obj-y         += clk.o cpu.o cs.o gpio.o irq.o prom.o setup.o timer.o \
+-                 dev-dsp.o dev-enet.o dev-flash.o dev-hsspi.o dev-pcmcia.o \
+-                 dev-rng.o dev-spi.o dev-uart.o dev-usb-ehci.o \
++obj-y         += clk.o cpu.o cs.o gpio.o irq.o nvram.o prom.o setup.o \
++                 timer.o dev-dsp.o dev-enet.o dev-flash.o dev-hsspi.o \
++                 dev-pcmcia.o dev-rng.o dev-spi.o dev-uart.o dev-usb-ehci.o \
+                  dev-usb-ohci.o dev-wdt.o
+ obj-$(CONFIG_EARLY_PRINTK)    += early_printk.o
+--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
++++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
+@@ -21,6 +21,7 @@
+ #include <bcm63xx_dev_uart.h>
+ #include <bcm63xx_regs.h>
+ #include <bcm63xx_io.h>
++#include <bcm63xx_nvram.h>
+ #include <bcm63xx_dev_pci.h>
+ #include <bcm63xx_dev_enet.h>
+ #include <bcm63xx_dev_dsp.h>
+@@ -41,8 +42,6 @@
+ #define CFE_OFFSET_64K                0x10000
+ #define CFE_OFFSET_128K               0x20000
+-static struct bcm963xx_nvram nvram;
+-static unsigned int mac_addr_used;
+ static struct board_info board;
+ /*
+@@ -741,50 +740,16 @@ const char *board_get_name(void)
+       return board.name;
+ }
+-/*
+- * register & return a new board mac address
+- */
+-static int board_get_mac_address(u8 *mac)
+-{
+-      u8 *p;
+-      int count;
+-
+-      if (mac_addr_used >= nvram.mac_addr_count) {
+-              printk(KERN_ERR PFX "not enough mac address\n");
+-              return -ENODEV;
+-      }
+-
+-      memcpy(mac, nvram.mac_addr_base, ETH_ALEN);
+-      p = mac + ETH_ALEN - 1;
+-      count = mac_addr_used;
+-
+-      while (count--) {
+-              do {
+-                      (*p)++;
+-                      if (*p != 0)
+-                              break;
+-                      p--;
+-              } while (p != mac);
+-      }
+-
+-      if (p == mac) {
+-              printk(KERN_ERR PFX "unable to fetch mac address\n");
+-              return -ENODEV;
+-      }
+-
+-      mac_addr_used++;
+-      return 0;
+-}
+-
+ static void __init boardid_fixup(u8 *boot_addr)
+ {
+       struct bcm_tag *tag = (struct bcm_tag *)(boot_addr + CFE_OFFSET_64K);
++      char *board_name = (char *)bcm63xx_nvram_get_name();
+       /* check if bcm_tag is at 64k offset */
+-      if (strncmp(nvram.name, tag->board_id, BOARDID_LEN) != 0) {
++      if (strncmp(board_name, tag->board_id, BOARDID_LEN) != 0) {
+               /* else try 128k */
+               tag = (struct bcm_tag *)(boot_addr + CFE_OFFSET_128K);
+-              if (strncmp(nvram.name, tag->board_id, BOARDID_LEN) != 0) {
++              if (strncmp(board_name, tag->board_id, BOARDID_LEN) != 0) {
+                       /* No tag found */
+                       printk(KERN_DEBUG "No bcm_tag found!\n");
+                       return;
+@@ -794,9 +759,9 @@ static void __init boardid_fixup(u8 *boo
+       if (tag->information1[0] != '+')
+               return;
+-      strncpy(nvram.name, &tag->information1[1], BOARDID_LEN);
++      strncpy(board_name, &tag->information1[1], BOARDID_LEN);
+-      printk(KERN_INFO "Overriding boardid with '%s'\n", nvram.name);
++      printk(KERN_INFO "Overriding boardid with '%s'\n", board_name);
+ }
+ /*
+@@ -804,9 +769,10 @@ static void __init boardid_fixup(u8 *boo
+  */
+ void __init board_prom_init(void)
+ {
+-      unsigned int check_len, i;
+-      u8 *boot_addr, *cfe, *p;
++      unsigned int i;
++      u8 *boot_addr, *cfe;
+       char cfe_version[32];
++      char *board_name;
+       u32 val;
+       /* read base address of boot chip select (0)
+@@ -831,32 +797,19 @@ void __init board_prom_init(void)
+               strcpy(cfe_version, "unknown");
+       printk(KERN_INFO PFX "CFE version: %s\n", cfe_version);
+-      /* extract nvram data */
+-      memcpy(&nvram, boot_addr + BCM963XX_NVRAM_OFFSET, sizeof(nvram));
+-
+-      /* check checksum before using data */
+-      if (nvram.version <= 4)
+-              check_len = offsetof(struct bcm963xx_nvram, checksum_old);
+-      else
+-              check_len = sizeof(nvram);
+-      val = 0;
+-      p = (u8 *)&nvram;
+-      while (check_len--)
+-              val += *p;
+-      if (val) {
+-              printk(KERN_ERR PFX "invalid nvram checksum\n");
++      if (bcm63xx_nvram_init(boot_addr + BCM963XX_NVRAM_OFFSET))
+               return;
+-      }
+       if (strcmp(cfe_version, "unknown") != 0) {
+               /* cfe present */
+               boardid_fixup(boot_addr);
+       }
++      board_name = bcm63xx_nvram_get_name();
+       /* find board by name */
+       for (i = 0; i < ARRAY_SIZE(bcm963xx_boards); i++) {
+-              if (strncmp(nvram.name, bcm963xx_boards[i]->name,
+-                          sizeof(nvram.name)))
++              if (strncmp(board_name, bcm963xx_boards[i]->name,
++                          BCM63XX_NVRAM_NAMELEN))
+                       continue;
+               /* copy, board desc array is marked initdata */
+               memcpy(&board, bcm963xx_boards[i], sizeof(board));
+@@ -866,7 +819,7 @@ void __init board_prom_init(void)
+       /* bail out if board is not found, will complain later */
+       if (!board.name[0]) {
+               char name[17];
+-              memcpy(name, nvram.name, 16);
++              memcpy(name, board_name, 16);
+               name[16] = 0;
+               printk(KERN_ERR PFX "unknown bcm963xx board: %s\n",
+                      name);
+@@ -959,15 +912,15 @@ int __init board_register_devices(void)
+               bcm63xx_pcmcia_register();
+       if (board.has_enet0 &&
+-          !board_get_mac_address(board.enet0.mac_addr))
++          !bcm63xx_nvram_get_mac_address(board.enet0.mac_addr))
+               bcm63xx_enet_register(0, &board.enet0);
+       if (board.has_enet1 &&
+-          !board_get_mac_address(board.enet1.mac_addr))
++          !bcm63xx_nvram_get_mac_address(board.enet1.mac_addr))
+               bcm63xx_enet_register(1, &board.enet1);
+       if (board.has_enetsw &&
+-          !board_get_mac_address(board.enetsw.mac_addr))
++          !bcm63xx_nvram_get_mac_address(board.enetsw.mac_addr))
+               bcm63xx_enetsw_register(&board.enetsw);
+       if (board.has_ehci0)
+@@ -983,7 +936,7 @@ int __init board_register_devices(void)
+        * do this after registering enet devices
+        */
+ #ifdef CONFIG_SSB_PCIHOST
+-      if (!board_get_mac_address(bcm63xx_sprom.il0mac)) {
++      if (!bcm63xx_nvram_get_mac_address(bcm63xx_sprom.il0mac)) {
+               memcpy(bcm63xx_sprom.et0mac, bcm63xx_sprom.il0mac, ETH_ALEN);
+               memcpy(bcm63xx_sprom.et1mac, bcm63xx_sprom.il0mac, ETH_ALEN);
+               if (ssb_arch_register_fallback_sprom(
+--- /dev/null
++++ b/arch/mips/bcm63xx/nvram.c
+@@ -0,0 +1,84 @@
++/*
++ * This file is subject to the terms and conditions of the GNU General Public
++ * License.  See the file "COPYING" in the main directory of this archive
++ * for more details.
++ *
++ * Copyright (C) 2012 Jonas Gorski <jonas.gorski@gmail.com>
++ */
++
++#define pr_fmt(fmt) "bcm63xx_nvram: " fmt
++
++#include <linux/init.h>
++#include <linux/export.h>
++#include <linux/kernel.h>
++
++#include <bcm63xx_nvram.h>
++
++static struct bcm963xx_nvram nvram;
++static int mac_addr_used;
++
++int __init bcm63xx_nvram_init(void *addr)
++{
++      unsigned int check_len;
++      u8 *p;
++      u32 val;
++
++      /* extract nvram data */
++      memcpy(&nvram, addr, sizeof(nvram));
++
++      /* check checksum before using data */
++      if (nvram.version <= 4)
++              check_len = offsetof(struct bcm963xx_nvram, checksum_old);
++      else
++              check_len = sizeof(nvram);
++      val = 0;
++      p = (u8 *)&nvram;
++
++      while (check_len--)
++              val += *p;
++      if (val) {
++              pr_err("invalid nvram checksum\n");
++              return -EINVAL;
++      }
++
++      return 0;
++}
++
++u8 *bcm63xx_nvram_get_name(void)
++{
++      return nvram.name;
++}
++EXPORT_SYMBOL(bcm63xx_nvram_get_name);
++
++int bcm63xx_nvram_get_mac_address(u8 *mac)
++{
++      u8 *p;
++      int count;
++
++      if (mac_addr_used >= nvram.mac_addr_count) {
++              pr_err("not enough mac address\n");
++              return -ENODEV;
++      }
++
++      memcpy(mac, nvram.mac_addr_base, ETH_ALEN);
++      p = mac + ETH_ALEN - 1;
++      count = mac_addr_used;
++
++      while (count--) {
++              do {
++                      (*p)++;
++                      if (*p != 0)
++                              break;
++                      p--;
++              } while (p != mac);
++      }
++
++      if (p == mac) {
++              pr_err("unable to fetch mac address\n");
++              return -ENODEV;
++      }
++
++      mac_addr_used++;
++      return 0;
++}
++EXPORT_SYMBOL(bcm63xx_nvram_get_mac_address);
+--- /dev/null
++++ b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_nvram.h
+@@ -0,0 +1,34 @@
++#ifndef BCM63XX_NVRAM_H
++#define BCM63XX_NVRAM_H
++
++#include <linux/if_ether.h>
++
++#define BCM63XX_NVRAM_NAMELEN         16
++
++/*
++ * nvram structure
++ */
++struct bcm963xx_nvram {
++      u32     version;
++      u8      reserved1[256];
++      u8      name[BCM63XX_NVRAM_NAMELEN];
++      u32     main_tp_number;
++      u32     psi_size;
++      u32     mac_addr_count;
++      u8      mac_addr_base[ETH_ALEN];
++      u8      reserved2[2];
++      u32     checksum_old;
++      u8      reserved3[720];
++      u32     checksum_high;
++};
++
++int __init bcm63xx_nvram_init(void *);
++
++u8 *bcm63xx_nvram_get_name(void);
++
++/*
++ * register & return a new board mac address
++ */
++int bcm63xx_nvram_get_mac_address(u8 *mac);
++
++#endif /* BCM63XX_NVRAM_H */
+--- a/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h
++++ b/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h
+@@ -15,23 +15,6 @@
+ #define BCM963XX_NVRAM_OFFSET         0x580
+ /*
+- * nvram structure
+- */
+-struct bcm963xx_nvram {
+-      u32     version;
+-      u8      reserved1[256];
+-      u8      name[16];
+-      u32     main_tp_number;
+-      u32     psi_size;
+-      u32     mac_addr_count;
+-      u8      mac_addr_base[6];
+-      u8      reserved2[2];
+-      u32     checksum_old;
+-      u8      reserved3[720];
+-      u32     checksum_high;
+-};
+-
+-/*
+  * board definition
+  */
+ struct board_info {
diff --git a/target/linux/brcm63xx/patches-3.6/429-MIPS-BCM63XX-export-PSI-size-from-nvram.patch b/target/linux/brcm63xx/patches-3.6/429-MIPS-BCM63XX-export-PSI-size-from-nvram.patch
new file mode 100644 (file)
index 0000000..34966b2
--- /dev/null
@@ -0,0 +1,44 @@
+From ffbeb183bf0e9e12fd607c5352f48420c32f588f Mon Sep 17 00:00:00 2001
+From: Jonas Gorski <jonas.gorski@gmail.com>
+Date: Sat, 12 May 2012 23:04:17 +0200
+Subject: [PATCH 61/79] MIPS: BCM63XX: export PSI size from nvram
+
+Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
+---
+ arch/mips/bcm63xx/nvram.c                          |   11 +++++++++++
+ arch/mips/include/asm/mach-bcm63xx/bcm63xx_nvram.h |    2 ++
+ 2 files changed, 13 insertions(+)
+
+--- a/arch/mips/bcm63xx/nvram.c
++++ b/arch/mips/bcm63xx/nvram.c
+@@ -14,6 +14,8 @@
+ #include <bcm63xx_nvram.h>
++#define BCM63XX_DEFAULT_PSI_SIZE      64
++
+ static struct bcm963xx_nvram nvram;
+ static int mac_addr_used;
+@@ -82,3 +84,12 @@ int bcm63xx_nvram_get_mac_address(u8 *ma
+       return 0;
+ }
+ EXPORT_SYMBOL(bcm63xx_nvram_get_mac_address);
++
++int bcm63xx_nvram_get_psi_size(void)
++{
++      if (nvram.psi_size > 0)
++              return nvram.psi_size;
++
++      return BCM63XX_DEFAULT_PSI_SIZE;
++}
++EXPORT_SYMBOL(bcm63xx_nvram_get_psi_size);
+--- a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_nvram.h
++++ b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_nvram.h
+@@ -31,4 +31,6 @@ u8 *bcm63xx_nvram_get_name(void);
+  */
+ int bcm63xx_nvram_get_mac_address(u8 *mac);
++int bcm63xx_nvram_get_psi_size(void);
++
+ #endif /* BCM63XX_NVRAM_H */
diff --git a/target/linux/brcm63xx/patches-3.6/430-MTD-bcm63xxpart-use-nvram-for-PSI-size.patch b/target/linux/brcm63xx/patches-3.6/430-MTD-bcm63xxpart-use-nvram-for-PSI-size.patch
new file mode 100644 (file)
index 0000000..5ca6f47
--- /dev/null
@@ -0,0 +1,29 @@
+From 658afad639a9456e1bb6fe5bba0032f3c0c3f699 Mon Sep 17 00:00:00 2001
+From: Jonas Gorski <jonas.gorski@gmail.com>
+Date: Tue, 1 May 2012 14:10:39 +0200
+Subject: [PATCH 62/79] MTD: bcm63xxpart: use nvram for PSI size
+
+---
+ drivers/mtd/bcm63xxpart.c |    4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+--- a/drivers/mtd/bcm63xxpart.c
++++ b/drivers/mtd/bcm63xxpart.c
+@@ -32,6 +32,7 @@
+ #include <linux/mtd/mtd.h>
+ #include <linux/mtd/partitions.h>
++#include <asm/mach-bcm63xx/bcm63xx_nvram.h>
+ #include <asm/mach-bcm63xx/bcm963xx_tag.h>
+ #include <asm/mach-bcm63xx/board_bcm963xx.h>
+@@ -90,7 +91,8 @@ static int bcm63xx_parse_cfe_partitions(
+                             BCM63XX_CFE_BLOCK_SIZE);
+       cfelen = cfe_erasesize;
+-      nvramlen = cfe_erasesize;
++      nvramlen = bcm63xx_nvram_get_psi_size() * 1024;
++      nvramlen = roundup(nvramlen, cfe_erasesize);
+       /* Allocate memory for buffer */
+       buf = vmalloc(sizeof(struct bcm_tag));
diff --git a/target/linux/brcm63xx/patches-3.6/431-MTD-physmap-allow-passing-pp_data.patch b/target/linux/brcm63xx/patches-3.6/431-MTD-physmap-allow-passing-pp_data.patch
new file mode 100644 (file)
index 0000000..de2216a
--- /dev/null
@@ -0,0 +1,41 @@
+From 266c506f4b262bd6aba0776a03d82c98e65d9906 Mon Sep 17 00:00:00 2001
+From: Jonas Gorski <jonas.gorski@gmail.com>
+Date: Tue, 1 May 2012 17:32:36 +0200
+Subject: [PATCH 63/79] MTD: physmap: allow passing pp_data
+
+---
+ drivers/mtd/maps/physmap.c  |    4 +++-
+ include/linux/mtd/physmap.h |    1 +
+ 2 files changed, 4 insertions(+), 1 deletion(-)
+
+--- a/drivers/mtd/maps/physmap.c
++++ b/drivers/mtd/maps/physmap.c
+@@ -100,6 +100,7 @@ static int physmap_flash_probe(struct pl
+ {
+       struct physmap_flash_data *physmap_data;
+       struct physmap_flash_info *info;
++      struct mtd_part_parser_data *pp_data;
+       const char **probe_type;
+       const char **part_types;
+       int err = 0;
+@@ -191,8 +192,9 @@ static int physmap_flash_probe(struct pl
+       spin_lock_init(&info->vpp_lock);
+       part_types = physmap_data->part_probe_types ? : part_probe_types;
++      pp_data = physmap_data->pp_data ? physmap_data->pp_data : NULL;
+-      mtd_device_parse_register(info->cmtd, part_types, NULL,
++      mtd_device_parse_register(info->cmtd, part_types, pp_data,
+                                 physmap_data->parts, physmap_data->nr_parts);
+       return 0;
+--- a/include/linux/mtd/physmap.h
++++ b/include/linux/mtd/physmap.h
+@@ -32,6 +32,7 @@ struct physmap_flash_data {
+       char                    *probe_type;
+       struct mtd_partition    *parts;
+       const char              **part_probe_types;
++      struct mtd_part_parser_data *pp_data;
+ };
+ #endif /* __LINUX_MTD_PHYSMAP__ */
diff --git a/target/linux/brcm63xx/patches-3.6/432-BCM63XX-allow-providing-fixup-data-in-board-data.patch b/target/linux/brcm63xx/patches-3.6/432-BCM63XX-allow-providing-fixup-data-in-board-data.patch
new file mode 100644 (file)
index 0000000..cb5374f
--- /dev/null
@@ -0,0 +1,81 @@
+From 5131195413b62df73dfd394fea272830ea8c4e1a Mon Sep 17 00:00:00 2001
+From: Jonas Gorski <jonas.gorski@gmail.com>
+Date: Thu, 3 May 2012 14:40:03 +0200
+Subject: [PATCH 67/80] BCM63XX: allow providing fixup data in board data
+
+---
+ arch/mips/bcm63xx/boards/board_bcm963xx.c           |   10 +++++++++-
+ arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h |   10 ++++++++++
+ 2 files changed, 19 insertions(+), 1 deletion(-)
+
+--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
++++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
+@@ -33,6 +33,7 @@
+ #include <bcm63xx_dev_usb_ehci.h>
+ #include <board_bcm963xx.h>
+ #include <bcm963xx_tag.h>
++#include <pci_ath9k_fixup.h>
+ #define PFX   "board_bcm963xx: "
+@@ -901,6 +902,7 @@ int __init board_register_devices(void)
+ {
+       int button_count = 0;
+       int led_count = 0;
++      int i;
+       if (board.has_uart0)
+               bcm63xx_uart_register(0);
+@@ -936,7 +938,8 @@ int __init board_register_devices(void)
+        * do this after registering enet devices
+        */
+ #ifdef CONFIG_SSB_PCIHOST
+-      if (!bcm63xx_nvram_get_mac_address(bcm63xx_sprom.il0mac)) {
++      if (!board.has_caldata &&
++          !bcm63xx_nvram_get_mac_address(bcm63xx_sprom.il0mac)) {
+               memcpy(bcm63xx_sprom.et0mac, bcm63xx_sprom.il0mac, ETH_ALEN);
+               memcpy(bcm63xx_sprom.et1mac, bcm63xx_sprom.il0mac, ETH_ALEN);
+               if (ssb_arch_register_fallback_sprom(
+@@ -978,5 +981,9 @@ int __init board_register_devices(void)
+               platform_device_register(&bcm63xx_gpio_keys_device);
+       }
++      /* register any fixups */
++      for (i = 0; i < board.has_caldata; i++)
++              pci_enable_ath9k_fixup(board.caldata[i].slot, board.caldata[i].caldata_offset);
++
+       return 0;
+ }
+--- a/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h
++++ b/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h
+@@ -7,6 +7,7 @@
+ #include <linux/leds.h>
+ #include <bcm63xx_dev_enet.h>
+ #include <bcm63xx_dev_dsp.h>
++#include <pci_ath9k_fixup.h>
+ /*
+  * flash mapping
+@@ -14,6 +15,11 @@
+ #define BCM963XX_CFE_VERSION_OFFSET   0x570
+ #define BCM963XX_NVRAM_OFFSET         0x580
++struct ath9k_caldata {
++      unsigned int    slot;
++      u32             caldata_offset;
++};
++
+ /*
+  * board definition
+  */
+@@ -32,6 +38,10 @@ struct board_info {
+       unsigned int    has_dsp:1;
+       unsigned int    has_uart0:1;
+       unsigned int    has_uart1:1;
++      unsigned int    has_caldata:2;
++
++      /* wifi calibration data config */
++      struct ath9k_caldata caldata[2];
+       /* ethernet config */
+       struct bcm63xx_enet_platform_data enet0;
diff --git a/target/linux/brcm63xx/patches-3.6/433-MTD-m25p80-allow-passing-pp_data.patch b/target/linux/brcm63xx/patches-3.6/433-MTD-m25p80-allow-passing-pp_data.patch
new file mode 100644 (file)
index 0000000..75e5889
--- /dev/null
@@ -0,0 +1,40 @@
+From 7f17dfe9009beb07a3de0e380932a725293829df Mon Sep 17 00:00:00 2001
+From: Jonas Gorski <jonas.gorski@gmail.com>
+Date: Tue, 1 May 2012 17:33:03 +0200
+Subject: [PATCH 64/79] MTD: m25p80: allow passing pp_data
+
+---
+ drivers/mtd/devices/m25p80.c |    3 +++
+ include/linux/spi/flash.h    |    2 ++
+ 2 files changed, 5 insertions(+)
+
+--- a/drivers/mtd/devices/m25p80.c
++++ b/drivers/mtd/devices/m25p80.c
+@@ -861,6 +861,9 @@ static int __devinit m25p_probe(struct s
+                       dev_warn(&spi->dev, "unrecognized id %s\n", data->type);
+       }
++      if (data && data->pp_data)
++              memcpy(&ppdata, data->pp_data, sizeof(ppdata));
++
+       info = (void *)id->driver_data;
+       if (info->jedec_id) {
+--- a/include/linux/spi/flash.h
++++ b/include/linux/spi/flash.h
+@@ -12,6 +12,7 @@ struct mtd_part_parser_data;
+  *    with chips that can't be queried for JEDEC or other IDs
+  * @part_probe_types: optional list of MTD parser names to use for
+  *    partitioning
++ * @pp_data: optional partition parser data.
+  *
+  * @max_transfer_len: option maximum read/write length limitation for
+  *    SPI controllers not able to transfer any length commands.
+@@ -30,6 +31,7 @@ struct flash_platform_data {
+       char            *type;
+       const char      **part_probe_types;
++      struct mtd_part_parser_data *pp_data;
+       unsigned int    max_transfer_len;
+       /* we'll likely add more ... use JEDEC IDs, etc */
diff --git a/target/linux/brcm63xx/patches-3.6/434-MIPS-BCM63XX-store-the-flash-type-in-global-variable.patch b/target/linux/brcm63xx/patches-3.6/434-MIPS-BCM63XX-store-the-flash-type-in-global-variable.patch
new file mode 100644 (file)
index 0000000..7035098
--- /dev/null
@@ -0,0 +1,122 @@
+From f888824d352df894ab721a5ca067b0313500efe7 Mon Sep 17 00:00:00 2001
+From: Jonas Gorski <jonas.gorski@gmail.com>
+Date: Thu, 3 May 2012 12:17:54 +0200
+Subject: [PATCH 38/59] MIPS: BCM63XX: store the flash type in global variable
+
+---
+ arch/mips/bcm63xx/dev-flash.c                      |   36 +++++++++++++------
+ .../include/asm/mach-bcm63xx/bcm63xx_dev_flash.h   |    2 +
+ 2 files changed, 26 insertions(+), 12 deletions(-)
+
+--- a/arch/mips/bcm63xx/dev-flash.c
++++ b/arch/mips/bcm63xx/dev-flash.c
+@@ -25,6 +25,8 @@
+ #include <bcm63xx_regs.h>
+ #include <bcm63xx_io.h>
++int bcm63xx_attached_flash = -1;
++
+ static struct mtd_partition mtd_partitions[] = {
+       {
+               .name           = "cfe",
+@@ -86,20 +88,23 @@ static int __init bcm63xx_detect_flash_t
+                       bcm63xx_spi_flash_info[0].max_speed_hz = 16666667;
+               if (val & STRAPBUS_6328_BOOT_SEL_SERIAL)
+-                      return BCM63XX_FLASH_TYPE_SERIAL;
++                      bcm63xx_attached_flash = BCM63XX_FLASH_TYPE_SERIAL;
+               else
+-                      return BCM63XX_FLASH_TYPE_NAND;
++                      bcm63xx_attached_flash = BCM63XX_FLASH_TYPE_NAND;
++              break;
+       case BCM6338_CPU_ID:
+       case BCM6345_CPU_ID:
+       case BCM6348_CPU_ID:
+               /* no way to auto detect so assume parallel */
+-              return BCM63XX_FLASH_TYPE_PARALLEL;
++              bcm63xx_attached_flash = BCM63XX_FLASH_TYPE_PARALLEL;
++              break;
+       case BCM6358_CPU_ID:
+               val = bcm_gpio_readl(GPIO_STRAPBUS_REG);
+               if (val & STRAPBUS_6358_BOOT_SEL_PARALLEL)
+-                      return BCM63XX_FLASH_TYPE_PARALLEL;
++                      bcm63xx_attached_flash = BCM63XX_FLASH_TYPE_PARALLEL;
+               else
+-                      return BCM63XX_FLASH_TYPE_SERIAL;
++                      bcm63xx_attached_flash = BCM63XX_FLASH_TYPE_SERIAL;
++              break;
+       case BCM6362_CPU_ID:
+               val = bcm_misc_readl(MISC_STRAPBUS_6362_REG);
+               if (val & STRAPBUS_6362_HSSPI_CLK_FAST)
+@@ -108,9 +113,10 @@ static int __init bcm63xx_detect_flash_t
+                       bcm63xx_spi_flash_info[0].max_speed_hz = 20000000;
+               if (val & STRAPBUS_6362_BOOT_SEL_SERIAL)
+-                      return BCM63XX_FLASH_TYPE_SERIAL;
++                      bcm63xx_attached_flash = BCM63XX_FLASH_TYPE_SERIAL;
+               else
+-                      return BCM63XX_FLASH_TYPE_NAND;
++                      bcm63xx_attached_flash = BCM63XX_FLASH_TYPE_NAND;
++              break;
+       case BCM6368_CPU_ID:
+               val = bcm_gpio_readl(GPIO_STRAPBUS_REG);
+               if (val & STRAPBUS_6368_SPI_CLK_FAST)
+@@ -118,25 +124,32 @@ static int __init bcm63xx_detect_flash_t
+               switch (val & STRAPBUS_6368_BOOT_SEL_MASK) {
+               case STRAPBUS_6368_BOOT_SEL_NAND:
+-                      return BCM63XX_FLASH_TYPE_NAND;
++                      bcm63xx_attached_flash = BCM63XX_FLASH_TYPE_NAND;
++                      break;
+               case STRAPBUS_6368_BOOT_SEL_SERIAL:
+-                      return BCM63XX_FLASH_TYPE_SERIAL;
++                      bcm63xx_attached_flash = BCM63XX_FLASH_TYPE_SERIAL;
++                      break;
+               case STRAPBUS_6368_BOOT_SEL_PARALLEL:
+-                      return BCM63XX_FLASH_TYPE_PARALLEL;
++                      bcm63xx_attached_flash = BCM63XX_FLASH_TYPE_PARALLEL;
++                      break;
++              default:
++                      return -EINVAL;
+               }
+       default:
+               return -EINVAL;
+       }
++
++      return 0;
+ }
+ int __init bcm63xx_flash_register(void)
+ {
+-      int flash_type;
+       u32 val;
+-      flash_type = bcm63xx_detect_flash_type();
+-      switch (flash_type) {
++      bcm63xx_detect_flash_type();
++
++      switch (bcm63xx_attached_flash) {
+       case BCM63XX_FLASH_TYPE_PARALLEL:
+               /* read base address of boot chip select (0) */
+               val = bcm_mpi_readl(MPI_CSBASE_REG(0));
+@@ -157,7 +170,7 @@ int __init bcm63xx_flash_register(void)
+               return -ENODEV;
+       default:
+               pr_err("flash detection failed for BCM%x: %d\n",
+-                     bcm63xx_get_cpu_id(), flash_type);
++                     bcm63xx_get_cpu_id(), bcm63xx_attached_flash);
+               return -ENODEV;
+       }
+ }
+--- a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_flash.h
++++ b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_flash.h
+@@ -7,6 +7,8 @@ enum {
+       BCM63XX_FLASH_TYPE_NAND,
+ };
++extern int bcm63xx_attached_flash;
++
+ int __init bcm63xx_flash_register(void);
+ #endif /* __BCM63XX_FLASH_H */
diff --git a/target/linux/brcm63xx/patches-3.6/435-BCM63XX-add-a-fixup-for-ath9k-devices.patch b/target/linux/brcm63xx/patches-3.6/435-BCM63XX-add-a-fixup-for-ath9k-devices.patch
new file mode 100644 (file)
index 0000000..a3b30e4
--- /dev/null
@@ -0,0 +1,227 @@
+From fb6f6f58db9ae9cf27ab01f5f09cfbc5c078a7b8 Mon Sep 17 00:00:00 2001
+From: Jonas Gorski <jonas.gorski@gmail.com>
+Date: Thu, 3 May 2012 14:36:11 +0200
+Subject: [PATCH 66/80] BCM63XX: add a fixup for ath9k devices
+
+---
+ arch/mips/bcm63xx/Makefile                         |    2 +-
+ arch/mips/bcm63xx/pci-ath9k-fixup.c                |  190 ++++++++++++++++++++
+ .../include/asm/mach-bcm63xx/pci_ath9k_fixup.h     |    7 +
+ 3 files changed, 198 insertions(+), 1 deletion(-)
+ create mode 100644 arch/mips/bcm63xx/pci-ath9k-fixup.c
+ create mode 100644 arch/mips/include/asm/mach-bcm63xx/pci_ath9k_fixup.h
+
+--- a/arch/mips/bcm63xx/Makefile
++++ b/arch/mips/bcm63xx/Makefile
+@@ -1,7 +1,7 @@
+ obj-y         += clk.o cpu.o cs.o gpio.o irq.o nvram.o prom.o setup.o \
+                  timer.o dev-dsp.o dev-enet.o dev-flash.o dev-hsspi.o \
+                  dev-pcmcia.o dev-rng.o dev-spi.o dev-uart.o dev-usb-ehci.o \
+-                 dev-usb-ohci.o dev-wdt.o
++                 dev-usb-ohci.o dev-wdt.o pci-ath9k-fixup.o
+ obj-$(CONFIG_EARLY_PRINTK)    += early_printk.o
+ obj-y         += boards/
+--- /dev/null
++++ b/arch/mips/bcm63xx/pci-ath9k-fixup.c
+@@ -0,0 +1,190 @@
++/*
++ *  Broadcom BCM63XX Ath9k EEPROM fixup helper.
++ *
++ *  Copytight (C) 2012 Jonas Gorski <jonas.gorski@gmail.com>
++ *
++ *  Based on
++ *
++ *  Atheros AP94 reference board PCI initialization
++ *
++ *  Copyright (C) 2009-2010 Gabor Juhos <juhosg@openwrt.org>
++ *
++ *  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 <linux/pci.h>
++#include <linux/delay.h>
++#include <linux/ath9k_platform.h>
++
++#include <bcm63xx_cpu.h>
++#include <bcm63xx_io.h>
++#include <bcm63xx_nvram.h>
++#include <bcm63xx_dev_pci.h>
++#include <bcm63xx_dev_flash.h>
++#include <bcm63xx_dev_hsspi.h>
++#include <pci_ath9k_fixup.h>
++
++struct ath9k_fixup {
++      unsigned slot;
++      u8 mac[ETH_ALEN];
++      struct ath9k_platform_data pdata;
++};
++
++static int ath9k_num_fixups;
++static struct ath9k_fixup ath9k_fixups[2] = {
++      {
++              .slot = 255,
++              .pdata = {
++                      .led_pin        = -1,
++              },
++      },
++      {
++              .slot = 255,
++              .pdata = {
++                      .led_pin        = -1,
++              },
++      },
++};
++
++static u16 *bcm63xx_read_eeprom(u16 *eeprom, u32 offset)
++{
++      u32 addr;
++
++      if (BCMCPU_IS_6328()) {
++              addr = 0x18000000;
++      } else {
++              addr = bcm_mpi_readl(MPI_CSBASE_REG(0));
++              addr &= MPI_CSBASE_BASE_MASK;
++      }
++
++      switch (bcm63xx_attached_flash) {
++      case BCM63XX_FLASH_TYPE_PARALLEL:
++              memcpy(eeprom, (void *)KSEG1ADDR(addr + offset), ATH9K_PLAT_EEP_MAX_WORDS * sizeof(u16));
++              return eeprom;
++      case BCM63XX_FLASH_TYPE_SERIAL:
++              /* the first megabyte is memory mapped */
++              if (offset < 0x100000) {
++                      memcpy(eeprom, (void *)KSEG1ADDR(addr + offset), ATH9K_PLAT_EEP_MAX_WORDS * sizeof(u16));
++                      return eeprom;
++              }
++
++              if (BCMCPU_IS_6328()) {
++                      /* we can change the memory mapped megabyte */
++                      bcm_hsspi_writel(offset & 0xf00000, 0x18);
++                      memcpy(eeprom, (void *)KSEG1ADDR(addr + (offset & 0xfffff)), ATH9K_PLAT_EEP_MAX_WORDS * sizeof(u16));
++                      bcm_hsspi_writel(0, 0x18);
++                      return eeprom;
++              }
++              /* can't do anything here without talking to the SPI controller. */
++      case BCM63XX_FLASH_TYPE_NAND:
++      default:
++              return NULL;
++      }
++}
++
++static void ath9k_pci_fixup(struct pci_dev *dev)
++{
++      void __iomem *mem;
++      struct ath9k_platform_data *pdata = NULL;
++      u16 *cal_data = NULL;
++      u16 cmd;
++      u32 bar0;
++      u32 val;
++      unsigned i;
++
++      for (i = 0; i < ath9k_num_fixups; i++) {
++              if (ath9k_fixups[i].slot != PCI_SLOT(dev->devfn))
++                      continue;
++
++              cal_data = ath9k_fixups[i].pdata.eeprom_data;
++              pdata = &ath9k_fixups[i].pdata;
++              break;
++      }
++
++      if (cal_data == NULL)
++              return;
++
++      if (*cal_data != 0xa55a) {
++              pr_err("pci %s: invalid calibration data\n", pci_name(dev));
++              return;
++      }
++
++      pr_info("pci %s: fixup device configuration\n", pci_name(dev));
++
++      switch (bcm63xx_get_cpu_id()) {
++      case BCM6328_CPU_ID:
++              val = BCM_PCIE_MEM_BASE_PA;
++              break;
++      case BCM6348_CPU_ID:
++      case BCM6358_CPU_ID:
++      case BCM6368_CPU_ID:
++              val = BCM_PCI_MEM_BASE_PA;
++              break;
++      default:
++              BUG();
++      }
++
++      mem = ioremap(val, 0x10000);
++      if (!mem) {
++              pr_err("pci %s: ioremap error\n", pci_name(dev));
++              return;
++      }
++
++      pci_read_config_dword(dev, PCI_BASE_ADDRESS_0, &bar0);
++      pci_read_config_dword(dev, PCI_BASE_ADDRESS_0, &bar0);
++      pci_write_config_dword(dev, PCI_BASE_ADDRESS_0, val);
++
++      pci_read_config_word(dev, PCI_COMMAND, &cmd);
++      cmd |= PCI_COMMAND_MASTER | PCI_COMMAND_MEMORY;
++      pci_write_config_word(dev, PCI_COMMAND, cmd);
++
++      /* set offset to first reg address */
++      cal_data += 3;
++      while(*cal_data != 0xffff) {
++              u32 reg;
++              reg = *cal_data++;
++              val = *cal_data++;
++              val |= (*cal_data++) << 16;
++
++              writel(val, mem + reg);
++              udelay(100);
++      }
++
++      pci_read_config_dword(dev, PCI_VENDOR_ID, &val);
++      dev->vendor = val & 0xffff;
++      dev->device = (val >> 16) & 0xffff;
++
++      pci_read_config_dword(dev, PCI_CLASS_REVISION, &val);
++      dev->revision = val & 0xff;
++      dev->class = val >> 8; /* upper 3 bytes */
++
++      pci_read_config_word(dev, PCI_COMMAND, &cmd);
++      cmd &= ~(PCI_COMMAND_MASTER | PCI_COMMAND_MEMORY);
++      pci_write_config_word(dev, PCI_COMMAND, cmd);
++
++      pci_write_config_dword(dev, PCI_BASE_ADDRESS_0, bar0);
++
++      iounmap(mem);
++
++      dev->dev.platform_data = pdata;
++}
++DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_ATHEROS, PCI_ANY_ID, ath9k_pci_fixup);
++
++void __init pci_enable_ath9k_fixup(unsigned slot, u32 offset)
++{
++      if (ath9k_num_fixups >= ARRAY_SIZE(ath9k_fixups))
++              return;
++
++      ath9k_fixups[ath9k_num_fixups].slot = slot;
++
++      if (!bcm63xx_read_eeprom(ath9k_fixups[ath9k_num_fixups].pdata.eeprom_data, offset))
++              return;
++
++      if (bcm63xx_nvram_get_mac_address(ath9k_fixups[ath9k_num_fixups].mac))
++              return;
++
++      ath9k_fixups[ath9k_num_fixups].pdata.macaddr = ath9k_fixups[ath9k_num_fixups].mac;
++      ath9k_num_fixups++;
++}
+--- /dev/null
++++ b/arch/mips/include/asm/mach-bcm63xx/pci_ath9k_fixup.h
+@@ -0,0 +1,7 @@
++#ifndef _PCI_ATH9K_FIXUP
++#define _PCI_ATH9K_FIXUP
++
++
++void pci_enable_ath9k_fixup(unsigned slot, u32 offset) __init;
++
++#endif /* _PCI_ATH9K_FIXUP */
diff --git a/target/linux/brcm63xx/patches-3.6/436-MTD-bcm63xxpart-allow-passing-a-caldata-offset.patch b/target/linux/brcm63xx/patches-3.6/436-MTD-bcm63xxpart-allow-passing-a-caldata-offset.patch
new file mode 100644 (file)
index 0000000..681bab2
--- /dev/null
@@ -0,0 +1,118 @@
+From 8ab86c5dc38ad4de1442e50e0adbc354d9184d71 Mon Sep 17 00:00:00 2001
+From: Jonas Gorski <jonas.gorski@gmail.com>
+Date: Tue, 1 May 2012 14:38:41 +0200
+Subject: [PATCH 68/79] MTD: bcm63xxpart: allow passing a caldata offset
+
+Allow bcm63xxpart to receive a caldata offset if calibration data is
+contained in flash.
+---
+ drivers/mtd/bcm63xxpart.c      |   47 ++++++++++++++++++++++++++++++++++++++--
+ include/linux/mtd/partitions.h |    2 ++
+ 2 files changed, 47 insertions(+), 2 deletions(-)
+
+--- a/drivers/mtd/bcm63xxpart.c
++++ b/drivers/mtd/bcm63xxpart.c
+@@ -80,6 +80,8 @@ static int bcm63xx_parse_cfe_partitions(
+       unsigned int rootfslen, kernellen, sparelen, totallen;
+       unsigned int cfelen, nvramlen;
+       unsigned int cfe_erasesize;
++      unsigned int caldatalen1 = 0, caldataaddr1 = 0;
++      unsigned int caldatalen2 = 0, caldataaddr2 = 0;
+       int i;
+       u32 computed_crc;
+       bool rootfs_first = false;
+@@ -94,6 +96,23 @@ static int bcm63xx_parse_cfe_partitions(
+       nvramlen = bcm63xx_nvram_get_psi_size() * 1024;
+       nvramlen = roundup(nvramlen, cfe_erasesize);
++      if (data) {
++              if (data->caldata[0]) {
++                      caldatalen1 = cfe_erasesize;
++                      caldataaddr1 = rounddown(data->caldata[0],
++                                               cfe_erasesize);
++              }
++              if (data->caldata[1]) {
++                      caldatalen2 = cfe_erasesize;
++                      caldataaddr2 = rounddown(data->caldata[1],
++                                               cfe_erasesize);
++              }
++              if (caldataaddr1 == caldataaddr2) {
++                      caldataaddr2 = 0;
++                      caldatalen2 = 0;
++              }
++      }
++
+       /* Allocate memory for buffer */
+       buf = vmalloc(sizeof(struct bcm_tag));
+       if (!buf)
+@@ -144,7 +163,7 @@ static int bcm63xx_parse_cfe_partitions(
+               rootfsaddr = 0;
+               spareaddr = cfelen;
+       }
+-      sparelen = master->size - spareaddr - nvramlen;
++      sparelen = master->size - spareaddr - nvramlen - caldatalen1 - caldatalen2;
+       /* Determine number of partitions */
+       if (rootfslen > 0)
+@@ -153,6 +172,12 @@ static int bcm63xx_parse_cfe_partitions(
+       if (kernellen > 0)
+               nrparts++;
++      if (caldatalen1 > 0)
++              nrparts++;
++
++      if (caldatalen2 > 0)
++              nrparts++;
++
+       /* Ask kernel for more memory */
+       parts = kzalloc(sizeof(*parts) * nrparts + 10 * nrparts, GFP_KERNEL);
+       if (!parts) {
+@@ -190,6 +215,23 @@ static int bcm63xx_parse_cfe_partitions(
+               curpart++;
+       }
++      if (caldatalen1 > 0) {
++              if (caldatalen2 > 0)
++                      parts[curpart].name = "cal_data1";
++              else
++                      parts[curpart].name = "cal_data";
++              parts[curpart].offset = caldataaddr1;
++              parts[curpart].size = caldatalen1;
++              curpart++;
++      }
++
++      if (caldatalen2 > 0) {
++              parts[curpart].name = "cal_data2";
++              parts[curpart].offset = caldataaddr2;
++              parts[curpart].size = caldatalen2;
++              curpart++;
++      }
++
+       parts[curpart].name = "nvram";
+       parts[curpart].offset = master->size - nvramlen;
+       parts[curpart].size = nvramlen;
+@@ -198,7 +240,8 @@ static int bcm63xx_parse_cfe_partitions(
+       /* Global partition "linux" to make easy firmware upgrade */
+       parts[curpart].name = "linux";
+       parts[curpart].offset = cfelen;
+-      parts[curpart].size = master->size - cfelen - nvramlen;
++      parts[curpart].size = master->size - cfelen - nvramlen
++                            - caldatalen1 - caldatalen2;
+       for (i = 0; i < nrparts; i++)
+               pr_info("Partition %d is %s offset %llx and length %llx\n", i,
+--- a/include/linux/mtd/partitions.h
++++ b/include/linux/mtd/partitions.h
+@@ -58,10 +58,12 @@ struct device_node;
+ /**
+  * struct mtd_part_parser_data - used to pass data to MTD partition parsers.
+  * @origin: for RedBoot, start address of MTD device
++ * @caldata: for CFE, start address of wifi calibration data
+  * @of_node: for OF parsers, device node containing partitioning information
+  */
+ struct mtd_part_parser_data {
+       unsigned long origin;
++      unsigned long caldata[2];
+       struct device_node *of_node;
+ };
diff --git a/target/linux/brcm63xx/patches-3.6/437-MIPS-BCM63XX-pass-caldata-info-to-flash.patch b/target/linux/brcm63xx/patches-3.6/437-MIPS-BCM63XX-pass-caldata-info-to-flash.patch
new file mode 100644 (file)
index 0000000..c896274
--- /dev/null
@@ -0,0 +1,82 @@
+From 977f8a30103b9c4992cab8f49357fe0d4274004f Mon Sep 17 00:00:00 2001
+From: Jonas Gorski <jonas.gorski@gmail.com>
+Date: Thu, 3 May 2012 14:55:26 +0200
+Subject: [PATCH 69/80] MIPS: BCM63XX: pass caldata info to flash
+
+---
+ arch/mips/bcm63xx/boards/board_bcm963xx.c              |    2 +-
+ arch/mips/bcm63xx/dev-flash.c                          |    9 ++++++++-
+ arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_flash.h |    4 +++-
+ 3 files changed, 12 insertions(+), 3 deletions(-)
+
+--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
++++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
+@@ -957,7 +957,7 @@ int __init board_register_devices(void)
+       if (board.num_spis)
+               spi_register_board_info(board.spis, board.num_spis);
+-      bcm63xx_flash_register();
++      bcm63xx_flash_register(board.has_caldata, board.caldata);
+       /* count number of LEDs defined by this device */
+       while (led_count < ARRAY_SIZE(board.leds) && board.leds[led_count].name)
+--- a/arch/mips/bcm63xx/dev-flash.c
++++ b/arch/mips/bcm63xx/dev-flash.c
+@@ -35,12 +35,15 @@ static struct mtd_partition mtd_partitio
+       }
+ };
++static struct mtd_part_parser_data bcm63xx_parser_data;
++
+ static const char *bcm63xx_part_types[] = { "bcm63xxpart", "RedBoot", NULL };
+ static struct physmap_flash_data flash_data = {
+       .width                  = 2,
+       .parts                  = mtd_partitions,
+       .part_probe_types       = bcm63xx_part_types,
++      .pp_data                = &bcm63xx_parser_data,
+ };
+ static struct resource mtd_resources[] = {
+@@ -62,6 +65,7 @@ static struct platform_device mtd_dev =
+ static struct flash_platform_data bcm63xx_flash_data = {
+       .part_probe_types       = bcm63xx_part_types,
++      .pp_data                = &bcm63xx_parser_data,
+ };
+ static struct spi_board_info bcm63xx_spi_flash_info[] = {
+@@ -142,10 +146,13 @@ static int __init bcm63xx_detect_flash_t
+       return 0;
+ }
+-int __init bcm63xx_flash_register(void)
++int __init bcm63xx_flash_register(int num_caldata, struct ath9k_caldata *caldata)
+ {
+       u32 val;
++      unsigned int i;
++      for (i = 0; i < num_caldata; i++)
++              bcm63xx_parser_data.caldata[i] = caldata[i].caldata_offset;
+       bcm63xx_detect_flash_type();
+--- a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_flash.h
++++ b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_flash.h
+@@ -1,6 +1,8 @@
+ #ifndef __BCM63XX_FLASH_H
+ #define __BCM63XX_FLASH_H
++#include <board_bcm963xx.h>
++
+ enum {
+       BCM63XX_FLASH_TYPE_PARALLEL,
+       BCM63XX_FLASH_TYPE_SERIAL,
+@@ -9,6 +11,6 @@ enum {
+ extern int bcm63xx_attached_flash;
+-int __init bcm63xx_flash_register(void);
++int __init bcm63xx_flash_register(int num_caldata, struct ath9k_caldata *caldata);
+ #endif /* __BCM63XX_FLASH_H */
diff --git a/target/linux/brcm63xx/patches-3.6/438-MIPS-BCM63XX-enable-USB-for-BCM6328.patch b/target/linux/brcm63xx/patches-3.6/438-MIPS-BCM63XX-enable-USB-for-BCM6328.patch
new file mode 100644 (file)
index 0000000..54673dc
--- /dev/null
@@ -0,0 +1,60 @@
+From 38c3f8d21da90f0833578a157e22ddabf4d576bd Mon Sep 17 00:00:00 2001
+From: Jonas Gorski <jonas.gorski@gmail.com>
+Date: Sun, 12 Feb 2012 14:28:34 +0100
+Subject: [PATCH 48/84] MIPS: BCM63XX: enable USB for BCM6328
+
+The USB controller is the same as the one on BCM6368.
+
+Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
+---
+ arch/mips/bcm63xx/dev-usb-ehci.c |    2 +-
+ arch/mips/bcm63xx/dev-usb-ohci.c |    3 ++-
+ drivers/usb/host/ehci-bcm63xx.c  |    2 +-
+ drivers/usb/host/ohci-bcm63xx.c  |    2 +-
+ 4 files changed, 5 insertions(+), 4 deletions(-)
+
+--- a/arch/mips/bcm63xx/dev-usb-ehci.c
++++ b/arch/mips/bcm63xx/dev-usb-ehci.c
+@@ -39,7 +39,7 @@ static struct platform_device bcm63xx_eh
+ int __init bcm63xx_ehci_register(void)
+ {
+-      if (!BCMCPU_IS_6358() && !BCMCPU_IS_6368())
++      if (!BCMCPU_IS_6328() && !BCMCPU_IS_6358() && !BCMCPU_IS_6368())
+               return 0;
+       ehci_resources[0].start = bcm63xx_regset_address(RSET_EHCI0);
+--- a/arch/mips/bcm63xx/dev-usb-ohci.c
++++ b/arch/mips/bcm63xx/dev-usb-ohci.c
+@@ -39,7 +39,8 @@ static struct platform_device bcm63xx_oh
+ int __init bcm63xx_ohci_register(void)
+ {
+-      if (!BCMCPU_IS_6348() && !BCMCPU_IS_6358() && !BCMCPU_IS_6368())
++      if (!BCMCPU_IS_6328() && !BCMCPU_IS_6348() && !BCMCPU_IS_6358() &&
++          !BCMCPU_IS_6368())
+               return 0;
+       ohci_resources[0].start = bcm63xx_regset_address(RSET_OHCI0);
+--- a/drivers/usb/host/ehci-bcm63xx.c
++++ b/drivers/usb/host/ehci-bcm63xx.c
+@@ -99,7 +99,7 @@ static int __devinit ehci_hcd_bcm63xx_dr
+               bcm_rset_writel(RSET_USBH_PRIV, 0x1c0020,
+                               USBH_PRIV_TEST_6358_REG);
+-      } else if (BCMCPU_IS_6368()) {
++      } else if (BCMCPU_IS_6328() || BCMCPU_IS_6368()) {
+               reg = bcm_rset_readl(RSET_USBH_PRIV, USBH_PRIV_SWAP_6368_REG);
+               reg &= ~USBH_PRIV_SWAP_EHCI_DATA_MASK;
+--- a/drivers/usb/host/ohci-bcm63xx.c
++++ b/drivers/usb/host/ohci-bcm63xx.c
+@@ -94,7 +94,7 @@ static int __devinit ohci_hcd_bcm63xx_dr
+               bcm_rset_writel(RSET_USBH_PRIV, 0x1c0020,
+                               USBH_PRIV_TEST_6358_REG);
+-      } else if (BCMCPU_IS_6368()) {
++      } else if (BCMCPU_IS_6328() || BCMCPU_IS_6368()) {
+               reg = bcm_rset_readl(RSET_USBH_PRIV, USBH_PRIV_SWAP_6368_REG);
+               reg &= ~USBH_PRIV_SWAP_OHCI_ENDN_MASK;
+               reg |= USBH_PRIV_SWAP_OHCI_DATA_MASK;
diff --git a/target/linux/brcm63xx/patches-3.6/439-MIPS-BCM63XX-wire-up-the-HS-SPI-controller-for-BCM63.patch b/target/linux/brcm63xx/patches-3.6/439-MIPS-BCM63XX-wire-up-the-HS-SPI-controller-for-BCM63.patch
new file mode 100644 (file)
index 0000000..7561569
--- /dev/null
@@ -0,0 +1,56 @@
+From ed225910f0e062d9c28d5cf216f97b3cf457a8c5 Mon Sep 17 00:00:00 2001
+From: Jonas Gorski <jonas.gorski@gmail.com>
+Date: Mon, 21 Nov 2011 00:55:49 +0100
+Subject: [PATCH 58/81] MIPS: BCM63XX: wire up the HS SPI controller for BCM6362
+
+Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
+---
+ arch/mips/bcm63xx/clk.c                            |    2 ++
+ arch/mips/bcm63xx/dev-hsspi.c                      |    7 +++++--
+ .../include/asm/mach-bcm63xx/bcm63xx_dev_hsspi.h   |    1 +
+ 3 files changed, 8 insertions(+), 2 deletions(-)
+
+--- a/arch/mips/bcm63xx/clk.c
++++ b/arch/mips/bcm63xx/clk.c
+@@ -218,6 +218,8 @@ static void hsspi_set(struct clk *clk, i
+       if (BCMCPU_IS_6328())
+               mask = CKCTL_6328_HSSPI_EN;
++      else if (BCMCPU_IS_6362())
++              mask = CKCTL_6362_HSSPI_EN;
+       else
+               return;
+--- a/arch/mips/bcm63xx/dev-hsspi.c
++++ b/arch/mips/bcm63xx/dev-hsspi.c
+@@ -43,7 +43,7 @@ static struct platform_device bcm63xx_hs
+ int __init bcm63xx_hsspi_register(void)
+ {
+-      if (!BCMCPU_IS_6328())
++      if (!BCMCPU_IS_6328() && !BCMCPU_IS_6362())
+               return -ENODEV;
+       spi_resources[0].start = bcm63xx_regset_address(RSET_HSSPI);
+@@ -51,7 +51,10 @@ int __init bcm63xx_hsspi_register(void)
+       spi_resources[0].end += RSET_HSSPI_SIZE - 1;
+       spi_resources[1].start = bcm63xx_get_irq_number(IRQ_HSSPI);
+-      spi_pdata.speed_hz = HSSPI_PLL_HZ_6328;
++      if (BCMCPU_IS_6328())
++              spi_pdata.speed_hz = HSSPI_PLL_HZ_6328;
++      else
++              spi_pdata.speed_hz = HSSPI_PLL_HZ;
+       return platform_device_register(&bcm63xx_hsspi_device);
+ }
+--- a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_hsspi.h
++++ b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_hsspi.h
+@@ -16,6 +16,7 @@ struct bcm63xx_hsspi_pdata {
+ #define bcm_hsspi_writel(v, o)        bcm_rset_writel(RSET_HSSPI, (v), (o))
+ #define HSSPI_PLL_HZ_6328     133333333
++#define HSSPI_PLL_HZ          400000000
+ #define HSSPI_BUFFER_LEN      512
diff --git a/target/linux/brcm63xx/patches-3.6/440-MIPS-BCM63XX-enable-SPI-controller-for-BCM6362.patch b/target/linux/brcm63xx/patches-3.6/440-MIPS-BCM63XX-enable-SPI-controller-for-BCM6362.patch
new file mode 100644 (file)
index 0000000..9057eba
--- /dev/null
@@ -0,0 +1,101 @@
+From eef84812bc7ffd590da6ad6b83bfeebaa43a7055 Mon Sep 17 00:00:00 2001
+From: Jonas Gorski <jonas.gorski@gmail.com>
+Date: Thu, 5 Jul 2012 21:19:20 +0200
+Subject: [PATCH 58/84] MIPS: BCM63XX: enable SPI controller for BCM6362
+
+---
+ arch/mips/bcm63xx/clk.c                            |    2 ++
+ arch/mips/bcm63xx/dev-spi.c                        |   11 ++++++++++-
+ .../include/asm/mach-bcm63xx/bcm63xx_dev_spi.h     |    3 +++
+ arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h  |   16 ++++++++++++++++
+ 4 files changed, 31 insertions(+), 1 deletions(-)
+
+--- a/arch/mips/bcm63xx/clk.c
++++ b/arch/mips/bcm63xx/clk.c
+@@ -199,6 +199,8 @@ static void spi_set(struct clk *clk, int
+               mask = CKCTL_6348_SPI_EN;
+       else if (BCMCPU_IS_6358())
+               mask = CKCTL_6358_SPI_EN;
++      else if (BCMCPU_IS_6362())
++              mask = CKCTL_6362_SPI_EN;
+       else
+               /* BCMCPU_IS_6368 */
+               mask = CKCTL_6368_SPI_EN;
+--- a/arch/mips/bcm63xx/dev-spi.c
++++ b/arch/mips/bcm63xx/dev-spi.c
+@@ -34,6 +34,10 @@ static const unsigned long bcm6358_regs_
+       __GEN_SPI_REGS_TABLE(6358)
+ };
++static const unsigned long bcm6362_regs_spi[] = {
++      __GEN_SPI_REGS_TABLE(6362)
++};
++
+ static const unsigned long bcm6368_regs_spi[] = {
+       __GEN_SPI_REGS_TABLE(6368)
+ };
+@@ -49,6 +53,8 @@ static __init void bcm63xx_spi_regs_init
+               bcm63xx_regs_spi = bcm6348_regs_spi;
+       if (BCMCPU_IS_6358())
+               bcm63xx_regs_spi = bcm6358_regs_spi;
++      if (BCMCPU_IS_6362())
++              bcm63xx_regs_spi = bcm6362_regs_spi;
+       if (BCMCPU_IS_6368())
+               bcm63xx_regs_spi = bcm6368_regs_spi;
+ }
+@@ -99,6 +105,9 @@ int __init bcm63xx_spi_register(void)
+       /* Set bus frequency */
+       spi_pdata.speed_hz = clk_get_rate(periph_clk);
++      if (BCMCPU_IS_6362())
++              spi_pdata.bus_num = 1;
++
+       spi_resources[0].start = bcm63xx_regset_address(RSET_SPI);
+       spi_resources[0].end = spi_resources[0].start;
+       spi_resources[1].start = bcm63xx_get_irq_number(IRQ_SPI);
+@@ -110,7 +119,7 @@ int __init bcm63xx_spi_register(void)
+               spi_pdata.msg_ctl_width = SPI_6338_MSG_CTL_WIDTH;
+       }
+-      if (BCMCPU_IS_6358() || BCMCPU_IS_6368()) {
++      if (BCMCPU_IS_6358() || BCMCPU_IS_6362() || BCMCPU_IS_6368()) {
+               spi_resources[0].end += BCM_6358_RSET_SPI_SIZE - 1;
+               spi_pdata.fifo_size = SPI_6358_MSG_DATA_SIZE;
+               spi_pdata.msg_type_shift = SPI_6358_MSG_TYPE_SHIFT;
+--- a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_spi.h
++++ b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_spi.h
+@@ -81,6 +81,9 @@ static inline unsigned long bcm63xx_spir
+ #ifdef CONFIG_BCM63XX_CPU_6358
+       __GEN_SPI_RSET(6358)
+ #endif
++#ifdef CONFIG_BCM63XX_CPU_6362
++      __GEN_SPI_RSET(6362)
++#endif
+ #ifdef CONFIG_BCM63XX_CPU_6368
+       __GEN_SPI_RSET(6368)
+ #endif
+--- a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h
++++ b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h
+@@ -1215,6 +1215,22 @@
+ #define SPI_6358_MSG_TAIL             0x709
+ #define SPI_6358_RX_TAIL              0x70B
++/* BCM 6362 SPI core */
++#define SPI_6362_MSG_CTL              0x00    /* 16-bits register */
++#define SPI_6362_MSG_DATA             0x02
++#define SPI_6362_MSG_DATA_SIZE                0x21e
++#define SPI_6362_RX_DATA              0x400
++#define SPI_6362_RX_DATA_SIZE         0x220
++#define SPI_6362_CMD                  0x700   /* 16-bits register */
++#define SPI_6362_INT_STATUS           0x702
++#define SPI_6362_INT_MASK_ST          0x703
++#define SPI_6362_INT_MASK             0x704
++#define SPI_6362_ST                   0x705
++#define SPI_6362_CLK_CFG              0x706
++#define SPI_6362_FILL_BYTE            0x707
++#define SPI_6362_MSG_TAIL             0x709
++#define SPI_6362_RX_TAIL              0x70B
++
+ /* BCM 6358 SPI core */
+ #define SPI_6368_MSG_CTL              0x00    /* 16-bits register */
+ #define SPI_6368_MSG_CTL_WIDTH                16
diff --git a/target/linux/brcm63xx/patches-3.6/441-MIPS-BCM63XX-enable-USB-for-BCM6362.patch b/target/linux/brcm63xx/patches-3.6/441-MIPS-BCM63XX-enable-USB-for-BCM6362.patch
new file mode 100644 (file)
index 0000000..04d540f
--- /dev/null
@@ -0,0 +1,84 @@
+From fb9e98936590637c26b66d60137a7b44b329a254 Mon Sep 17 00:00:00 2001
+From: Jonas Gorski <jonas.gorski@gmail.com>
+Date: Sun, 12 Feb 2012 14:40:56 +0100
+Subject: [PATCH 59/84] MIPS: BCM63XX: enable USB for BCM6362
+
+BCM6362 has the same USB controller as BCM6368.
+
+Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
+---
+ arch/mips/bcm63xx/Kconfig        |    2 ++
+ arch/mips/bcm63xx/clk.c          |    4 ++++
+ arch/mips/bcm63xx/dev-usb-ehci.c |    3 ++-
+ arch/mips/bcm63xx/dev-usb-ohci.c |    2 +-
+ drivers/usb/host/ehci-bcm63xx.c  |    2 +-
+ drivers/usb/host/ohci-bcm63xx.c  |    2 +-
+ 6 files changed, 11 insertions(+), 4 deletions(-)
+
+--- a/arch/mips/bcm63xx/Kconfig
++++ b/arch/mips/bcm63xx/Kconfig
+@@ -27,6 +27,8 @@ config BCM63XX_CPU_6358
+ config BCM63XX_CPU_6362
+       bool "support 6362 CPU"
+       select HW_HAS_PCI
++      select USB_ARCH_HAS_OHCI if USB_SUPPORT
++      select USB_ARCH_HAS_EHCI if USB_SUPPORT
+ config BCM63XX_CPU_6368
+       bool "support 6368 CPU"
+--- a/arch/mips/bcm63xx/clk.c
++++ b/arch/mips/bcm63xx/clk.c
+@@ -178,6 +178,8 @@ static void usbh_set(struct clk *clk, in
+ {
+       if (BCMCPU_IS_6348())
+               bcm_hwclock_set(CKCTL_6348_USBH_EN, enable);
++      else if (BCMCPU_IS_6362())
++              bcm_hwclock_set(CKCTL_6362_USBH_EN, enable);
+       else if (BCMCPU_IS_6368())
+               bcm_hwclock_set(CKCTL_6368_USBH_EN, enable);
+ }
+--- a/arch/mips/bcm63xx/dev-usb-ehci.c
++++ b/arch/mips/bcm63xx/dev-usb-ehci.c
+@@ -39,7 +39,8 @@ static struct platform_device bcm63xx_eh
+ int __init bcm63xx_ehci_register(void)
+ {
+-      if (!BCMCPU_IS_6328() && !BCMCPU_IS_6358() && !BCMCPU_IS_6368())
++      if (!BCMCPU_IS_6328() && !BCMCPU_IS_6358() && !BCMCPU_IS_6362() &&
++          !BCMCPU_IS_6368())
+               return 0;
+       ehci_resources[0].start = bcm63xx_regset_address(RSET_EHCI0);
+--- a/arch/mips/bcm63xx/dev-usb-ohci.c
++++ b/arch/mips/bcm63xx/dev-usb-ohci.c
+@@ -40,7 +40,7 @@ static struct platform_device bcm63xx_oh
+ int __init bcm63xx_ohci_register(void)
+ {
+       if (!BCMCPU_IS_6328() && !BCMCPU_IS_6348() && !BCMCPU_IS_6358() &&
+-          !BCMCPU_IS_6368())
++          !BCMCPU_IS_6362() && !BCMCPU_IS_6368())
+               return 0;
+       ohci_resources[0].start = bcm63xx_regset_address(RSET_OHCI0);
+--- a/drivers/usb/host/ehci-bcm63xx.c
++++ b/drivers/usb/host/ehci-bcm63xx.c
+@@ -99,7 +99,7 @@ static int __devinit ehci_hcd_bcm63xx_dr
+               bcm_rset_writel(RSET_USBH_PRIV, 0x1c0020,
+                               USBH_PRIV_TEST_6358_REG);
+-      } else if (BCMCPU_IS_6328() || BCMCPU_IS_6368()) {
++      } else if (BCMCPU_IS_6328() || BCMCPU_IS_6362() || BCMCPU_IS_6368()) {
+               reg = bcm_rset_readl(RSET_USBH_PRIV, USBH_PRIV_SWAP_6368_REG);
+               reg &= ~USBH_PRIV_SWAP_EHCI_DATA_MASK;
+--- a/drivers/usb/host/ohci-bcm63xx.c
++++ b/drivers/usb/host/ohci-bcm63xx.c
+@@ -94,7 +94,7 @@ static int __devinit ohci_hcd_bcm63xx_dr
+               bcm_rset_writel(RSET_USBH_PRIV, 0x1c0020,
+                               USBH_PRIV_TEST_6358_REG);
+-      } else if (BCMCPU_IS_6328() || BCMCPU_IS_6368()) {
++      } else if (BCMCPU_IS_6328() || BCMCPU_IS_6362() ||  BCMCPU_IS_6368()) {
+               reg = bcm_rset_readl(RSET_USBH_PRIV, USBH_PRIV_SWAP_6368_REG);
+               reg &= ~USBH_PRIV_SWAP_OHCI_ENDN_MASK;
+               reg |= USBH_PRIV_SWAP_OHCI_DATA_MASK;
diff --git a/target/linux/brcm63xx/patches-3.6/442-MIPS-BCM63XX-enable-enetsw-for-BCM6362.patch b/target/linux/brcm63xx/patches-3.6/442-MIPS-BCM63XX-enable-enetsw-for-BCM6362.patch
new file mode 100644 (file)
index 0000000..ae46ec4
--- /dev/null
@@ -0,0 +1,77 @@
+From bf9d506bd144b95f8bb4127350ab2db5fba9c12e Mon Sep 17 00:00:00 2001
+From: Jonas Gorski <jonas.gorski@gmail.com>
+Date: Sun, 8 Jul 2012 21:07:12 +0200
+Subject: [PATCH 60/84] MIPS: BCM63XX: enable enetsw for BCM6362
+
+---
+ arch/mips/bcm63xx/clk.c                            |    7 ++++++-
+ arch/mips/bcm63xx/dev-enet.c                       |    6 ++++--
+ .../include/asm/mach-bcm63xx/bcm63xx_dev_enet.h    |    1 +
+ 3 files changed, 11 insertions(+), 3 deletions(-)
+
+--- a/arch/mips/bcm63xx/clk.c
++++ b/arch/mips/bcm63xx/clk.c
+@@ -120,11 +120,13 @@ static void enetsw_set(struct clk *clk,
+ {
+       u32 mask;
+-      if (!BCMCPU_IS_6328() && !BCMCPU_IS_6368())
++      if (!BCMCPU_IS_6328() && !BCMCPU_IS_6362() && !BCMCPU_IS_6368())
+               return;
+       if (BCMCPU_IS_6328())
+               mask = CKCTL_6328_ROBOSW_EN;
++      else if (BCMCPU_IS_6362())
++              mask = CKCTL_6362_ROBOSW_EN;
+       else
+               mask = CKCTL_6368_ROBOSW_EN | CKCTL_6368_SWPKT_USB_EN |
+                      CKCTL_6368_SWPKT_SAR_EN;
+@@ -137,6 +139,9 @@ static void enetsw_set(struct clk *clk,
+               if (BCMCPU_IS_6328()) {
+                       reg = PERF_SOFTRESET_6328_REG;
+                       mask = SOFTRESET_6328_ENETSW_MASK;
++              } else if (BCMCPU_IS_6362()) {
++                      reg = PERF_SOFTRESET_6362_REG;
++                      mask = SOFTRESET_6362_ENETSW_MASK;
+               } else {
+                       reg = PERF_SOFTRESET_6368_REG;
+                       mask = SOFTRESET_6368_ENETSW_MASK;
+--- a/arch/mips/bcm63xx/dev-enet.c
++++ b/arch/mips/bcm63xx/dev-enet.c
+@@ -141,7 +141,7 @@ static int __init register_shared(void)
+       shared_res[0].end = shared_res[0].start;
+       shared_res[0].end += (RSET_ENETDMA_SIZE)  - 1;
+-      if (BCMCPU_IS_6328() || BCMCPU_IS_6368())
++      if (BCMCPU_IS_6328() || BCMCPU_IS_6362() || BCMCPU_IS_6368())
+               chan_count = 32;
+       else
+               chan_count = 16;
+@@ -224,7 +224,7 @@ bcm63xx_enetsw_register(const struct bcm
+ {
+       int ret;
+-      if (!BCMCPU_IS_6328() && !BCMCPU_IS_6368())
++      if (!BCMCPU_IS_6328() && !BCMCPU_IS_6362() && !BCMCPU_IS_6368())
+               return -ENODEV;
+       ret = register_shared();
+@@ -243,6 +243,8 @@ bcm63xx_enetsw_register(const struct bcm
+       if (BCMCPU_IS_6328())
+               enetsw_pd.num_ports = ENETSW_PORTS_6328;
++      else if (BCMCPU_IS_6362())
++              enetsw_pd.num_ports = ENETSW_PORTS_6362;
+       else if (BCMCPU_IS_6368())
+               enetsw_pd.num_ports = ENETSW_PORTS_6368;
+--- a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_enet.h
++++ b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_enet.h
+@@ -44,6 +44,7 @@ struct bcm63xx_enet_platform_data {
+  */
+ #define ENETSW_MAX_PORT       6
+ #define ENETSW_PORTS_6328 5 /* 4 FE PHY + 1 RGMII */
++#define ENETSW_PORTS_6362 6 /* 4 FE PHY + 2 RGMII */
+ #define ENETSW_PORTS_6368 6 /* 4 FE PHY + 2 RGMII */
+ #define ENETSW_RGMII_PORT0    4
diff --git a/target/linux/brcm63xx/patches-3.6/443-MIPS-BCM63XX-enable-enet-for-BCM6345.patch b/target/linux/brcm63xx/patches-3.6/443-MIPS-BCM63XX-enable-enet-for-BCM6345.patch
new file mode 100644 (file)
index 0000000..98ec071
--- /dev/null
@@ -0,0 +1,758 @@
+[PATCH] MIPS: BCM63XX: enable ethernet for BCM6345
+
+BCM6345 has a slightly older DMA engine which is not supported by default by
+the bcm63xx_enet driver. This patch adds the missing Ethernet DMA definitions
+as well as patches all the places in the ethernet driver were the DMA
+reading/writing is different.
+
+Signed-off-by: Florian Fainelli <florian@openwrt.org>
+---
+--- a/arch/mips/bcm63xx/dev-enet.c
++++ b/arch/mips/bcm63xx/dev-enet.c
+@@ -9,10 +9,44 @@
+ #include <linux/init.h>
+ #include <linux/kernel.h>
+ #include <linux/platform_device.h>
++#include <linux/export.h>
+ #include <bcm63xx_dev_enet.h>
+ #include <bcm63xx_io.h>
+ #include <bcm63xx_regs.h>
++#ifdef BCMCPU_RUNTIME_DETECT
++static const unsigned long bcm6xxx_regs_enetdmac[] = {
++      [ENETDMAC_CHANCFG]      = ENETDMAC_CHANCFG_REG,
++      [ENETDMAC_IR]           = ENETDMAC_IR_REG,
++      [ENETDMAC_IRMASK]       = ENETDMAC_IRMASK_REG,
++      [ENETDMAC_MAXBURST]     = ENETDMAC_MAXBURST_REG,
++};
++
++static const unsigned long bcm6345_regs_enetdmac[] = {
++      [ENETDMAC_CHANCFG]      = ENETDMA_6345_CHANCFG_REG,
++      [ENETDMAC_IR]           = ENETDMA_6345_IR_REG,
++      [ENETDMAC_IRMASK]       = ENETDMA_6345_IRMASK_REG,
++      [ENETDMAC_MAXBURST]     = ENETDMA_6345_MAXBURST_REG,
++      [ENETDMAC_BUFALLOC]     = ENETDMA_6345_BUFALLOC_REG,
++      [ENETDMAC_RSTART]       = ENETDMA_6345_RSTART_REG,
++      [ENETDMAC_FC]           = ENETDMA_6345_FC_REG,
++      [ENETDMAC_LEN]          = ENETDMA_6345_LEN_REG,
++};
++
++const unsigned long *bcm63xx_regs_enetdmac;
++EXPORT_SYMBOL(bcm63xx_regs_enetdmac);
++
++static __init void bcm63xx_enetdmac_regs_init(void)
++{
++      if (BCMCPU_IS_6345())
++              bcm63xx_regs_enetdmac = bcm6345_regs_enetdmac;
++      else
++              bcm63xx_regs_enetdmac = bcm6xxx_regs_enetdmac;
++}
++#else
++static __init void bcm63xx_enetdmac_regs_init(void) { }
++#endif
++
+ static struct resource shared_res[] = {
+       {
+               .start          = -1, /* filled at runtime */
+@@ -137,12 +171,19 @@ static int __init register_shared(void)
+       if (shared_device_registered)
+               return 0;
++      bcm63xx_enetdmac_regs_init();
++
+       shared_res[0].start = bcm63xx_regset_address(RSET_ENETDMA);
+       shared_res[0].end = shared_res[0].start;
+-      shared_res[0].end += (RSET_ENETDMA_SIZE)  - 1;
++      if (BCMCPU_IS_6345())
++              shared_res[0].end += (RSET_6345_ENETDMA_SIZE) - 1;
++      else
++              shared_res[0].end += (RSET_ENETDMA_SIZE)  - 1;
+       if (BCMCPU_IS_6328() || BCMCPU_IS_6362() || BCMCPU_IS_6368())
+               chan_count = 32;
++      else if (BCMCPU_IS_6345())
++              chan_count = 8;
+       else
+               chan_count = 16;
+@@ -172,7 +213,7 @@ int __init bcm63xx_enet_register(int uni
+       if (unit > 1)
+               return -ENODEV;
+-      if (unit == 1 && BCMCPU_IS_6338())
++      if (unit == 1 && (BCMCPU_IS_6338() || BCMCPU_IS_6345()))
+               return -ENODEV;
+       ret = register_shared();
+@@ -213,6 +254,20 @@ int __init bcm63xx_enet_register(int uni
+               dpd->phy_interrupt = bcm63xx_get_irq_number(IRQ_ENET_PHY);
+       }
++      dpd->dma_chan_en_mask = ENETDMAC_CHANCFG_EN_MASK;
++      dpd->dma_chan_int_mask = ENETDMAC_IR_PKTDONE_MASK;
++      if (BCMCPU_IS_6345()) {
++              dpd->dma_chan_en_mask |= ENETDMAC_CHANCFG_CHAINING_MASK;
++              dpd->dma_chan_en_mask |= ENETDMAC_CHANCFG_WRAP_EN_MASK;
++              dpd->dma_chan_en_mask |= ENETDMAC_CHANCFG_FLOWC_EN_MASK;
++              dpd->dma_chan_int_mask |= ENETDMA_IR_BUFDONE_MASK;
++              dpd->dma_chan_int_mask |= ENETDMA_IR_NOTOWNER_MASK;
++              dpd->dma_chan_width = ENETDMA_6345_CHAN_WIDTH;
++              dpd->dma_no_sram = 1;
++              dpd->dma_desc_shift = ENETDMA_6345_DESC_SHIFT;
++      } else
++              dpd->dma_chan_width = ENETDMA_CHAN_WIDTH;
++
+       ret = platform_device_register(pdev);
+       if (ret)
+               return ret;
+--- a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h
++++ b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h
+@@ -709,6 +709,8 @@
+ /*************************************************************************
+  * _REG relative to RSET_ENETDMA
+  *************************************************************************/
++#define ENETDMA_CHAN_WIDTH            0x10
++#define ENETDMA_6345_CHAN_WIDTH               0x40
+ /* Controller Configuration Register */
+ #define ENETDMA_CFG_REG                       (0x0)
+@@ -758,29 +760,54 @@
+ /* State Ram Word 4 */
+ #define ENETDMA_SRAM4_REG(x)          (0x20c + (x) * 0x10)
++/* Broadcom 6345 ENET DMA definitions */
++#define ENETDMA_6345_CHANCFG_REG      (0x00)
++
++#define ENETDMA_6345_MAXBURST_REG     (0x04)
++
++#define ENETDMA_6345_RSTART_REG               (0x08)
++
++#define ENETDMA_6345_LEN_REG          (0x0C)
++
++#define ENETDMA_6345_IR_REG           (0x14)
++
++#define ENETDMA_6345_IRMASK_REG               (0x18)
++
++#define ENETDMA_6345_FC_REG           (0x1C)
++
++#define ENETDMA_6345_BUFALLOC_REG     (0x20)
++
++/* Shift down for EOP, SOP and WRAP bits */
++#define ENETDMA_6345_DESC_SHIFT               (3)
+ /*************************************************************************
+  * _REG relative to RSET_ENETDMAC
+  *************************************************************************/
+ /* Channel Configuration register */
+-#define ENETDMAC_CHANCFG_REG(x)               ((x) * 0x10)
++#define ENETDMAC_CHANCFG_REG          (0x0)
+ #define ENETDMAC_CHANCFG_EN_SHIFT     0
+ #define ENETDMAC_CHANCFG_EN_MASK      (1 << ENETDMA_CHANCFG_EN_SHIFT)
+ #define ENETDMAC_CHANCFG_PKTHALT_SHIFT        1
+ #define ENETDMAC_CHANCFG_PKTHALT_MASK (1 << ENETDMA_CHANCFG_PKTHALT_SHIFT)
++#define ENETDMAC_CHANCFG_CHAINING_SHIFT       2
++#define ENETDMAC_CHANCFG_CHAINING_MASK        (1 << ENETDMAC_CHANCFG_CHAINING_SHIFT)
++#define ENETDMAC_CHANCFG_WRAP_EN_SHIFT        3
++#define ENETDMAC_CHANCFG_WRAP_EN_MASK (1 << ENETDMAC_CHANCFG_WRAP_EN_SHIFT)
++#define ENETDMAC_CHANCFG_FLOWC_EN_SHIFT       4
++#define ENETDMAC_CHANCFG_FLOWC_EN_MASK        (1 << ENETDMAC_CHANCFG_FLOWC_EN_SHIFT)
+ /* Interrupt Control/Status register */
+-#define ENETDMAC_IR_REG(x)            (0x4 + (x) * 0x10)
++#define ENETDMAC_IR_REG                       (0x4)
+ #define ENETDMAC_IR_BUFDONE_MASK      (1 << 0)
+ #define ENETDMAC_IR_PKTDONE_MASK      (1 << 1)
+ #define ENETDMAC_IR_NOTOWNER_MASK     (1 << 2)
+ /* Interrupt Mask register */
+-#define ENETDMAC_IRMASK_REG(x)                (0x8 + (x) * 0x10)
++#define ENETDMAC_IRMASK_REG           (0x8)
+ /* Maximum Burst Length */
+-#define ENETDMAC_MAXBURST_REG(x)      (0xc + (x) * 0x10)
++#define ENETDMAC_MAXBURST_REG         (0xc)
+ /*************************************************************************
+@@ -788,16 +815,16 @@
+  *************************************************************************/
+ /* Ring Start Address register */
+-#define ENETDMAS_RSTART_REG(x)                ((x) * 0x10)
++#define ENETDMAS_RSTART_REG           (0x0)
+ /* State Ram Word 2 */
+-#define ENETDMAS_SRAM2_REG(x)         (0x4 + (x) * 0x10)
++#define ENETDMAS_SRAM2_REG            (0x4)
+ /* State Ram Word 3 */
+-#define ENETDMAS_SRAM3_REG(x)         (0x8 + (x) * 0x10)
++#define ENETDMAS_SRAM3_REG            (0x8)
+ /* State Ram Word 4 */
+-#define ENETDMAS_SRAM4_REG(x)         (0xc + (x) * 0x10)
++#define ENETDMAS_SRAM4_REG            (0xc)
+ /*************************************************************************
+--- a/drivers/net/ethernet/broadcom/bcm63xx_enet.c
++++ b/drivers/net/ethernet/broadcom/bcm63xx_enet.c
+@@ -115,26 +115,28 @@ static inline void enet_dma_writel(struc
+       bcm_writel(val, bcm_enet_shared_base[0] + off);
+ }
+-static inline u32 enet_dmac_readl(struct bcm_enet_priv *priv, u32 off)
++static inline u32 enet_dmac_readl(struct bcm_enet_priv *priv, u32 off, int chan)
+ {
+-      return bcm_readl(bcm_enet_shared_base[1] + off);
++      return bcm_readl(bcm_enet_shared_base[1] +
++              (bcm63xx_enetdmacreg(off) + (chan * priv->dma_chan_width)));
+ }
+ static inline void enet_dmac_writel(struct bcm_enet_priv *priv,
+-                                     u32 val, u32 off)
++                                     u32 val, u32 off, int chan)
+ {
+-      bcm_writel(val, bcm_enet_shared_base[1] + off);
++      bcm_writel(val, bcm_enet_shared_base[1] +
++              (bcm63xx_enetdmacreg(off) + (chan * priv->dma_chan_width)));
+ }
+-static inline u32 enet_dmas_readl(struct bcm_enet_priv *priv, u32 off)
++static inline u32 enet_dmas_readl(struct bcm_enet_priv *priv, u32 off, int chan)
+ {
+-      return bcm_readl(bcm_enet_shared_base[2] + off);
++      return bcm_readl(bcm_enet_shared_base[2] + (off + (chan * priv->dma_chan_width)));
+ }
+ static inline void enet_dmas_writel(struct bcm_enet_priv *priv,
+-                                     u32 val, u32 off)
++                                     u32 val, u32 off, int chan)
+ {
+-      bcm_writel(val, bcm_enet_shared_base[2] + off);
++      bcm_writel(val, bcm_enet_shared_base[2] + (off + (chan * priv->dma_chan_width)));
+ }
+ /*
+@@ -270,7 +272,7 @@ static int bcm_enet_refill_rx(struct net
+               len_stat = priv->rx_skb_size << DMADESC_LENGTH_SHIFT;
+               len_stat |= DMADESC_OWNER_MASK;
+               if (priv->rx_dirty_desc == priv->rx_ring_size - 1) {
+-                      len_stat |= DMADESC_WRAP_MASK;
++                      len_stat |= (DMADESC_WRAP_MASK >> priv->dma_desc_shift);
+                       priv->rx_dirty_desc = 0;
+               } else {
+                       priv->rx_dirty_desc++;
+@@ -281,7 +283,10 @@ static int bcm_enet_refill_rx(struct net
+               priv->rx_desc_count++;
+               /* tell dma engine we allocated one buffer */
+-              enet_dma_writel(priv, 1, ENETDMA_BUFALLOC_REG(priv->rx_chan));
++              if (!priv->dma_no_sram)
++                      enet_dma_writel(priv, 1, ENETDMA_BUFALLOC_REG(priv->rx_chan));
++              else
++                      enet_dmac_writel(priv, 1, ENETDMAC_BUFALLOC, priv->rx_chan);
+       }
+       /* If rx ring is still empty, set a timer to try allocating
+@@ -357,7 +362,8 @@ static int bcm_enet_receive_queue(struct
+               /* if the packet does not have start of packet _and_
+                * end of packet flag set, then just recycle it */
+-              if ((len_stat & DMADESC_ESOP_MASK) != DMADESC_ESOP_MASK) {
++              if ((len_stat & (DMADESC_ESOP_MASK >> priv->dma_desc_shift)) !=
++                      (DMADESC_ESOP_MASK >> priv->dma_desc_shift)) {
+                       dev->stats.rx_dropped++;
+                       continue;
+               }
+@@ -418,8 +424,8 @@ static int bcm_enet_receive_queue(struct
+               bcm_enet_refill_rx(dev);
+               /* kick rx dma */
+-              enet_dmac_writel(priv, ENETDMAC_CHANCFG_EN_MASK,
+-                               ENETDMAC_CHANCFG_REG(priv->rx_chan));
++              enet_dmac_writel(priv, priv->dma_chan_en_mask,
++                                       ENETDMAC_CHANCFG, priv->rx_chan);
+       }
+       return processed;
+@@ -494,10 +500,10 @@ static int bcm_enet_poll(struct napi_str
+       dev = priv->net_dev;
+       /* ack interrupts */
+-      enet_dmac_writel(priv, ENETDMAC_IR_PKTDONE_MASK,
+-                       ENETDMAC_IR_REG(priv->rx_chan));
+-      enet_dmac_writel(priv, ENETDMAC_IR_PKTDONE_MASK,
+-                       ENETDMAC_IR_REG(priv->tx_chan));
++      enet_dmac_writel(priv, priv->dma_chan_int_mask,
++                       ENETDMAC_IR, priv->rx_chan);
++      enet_dmac_writel(priv, priv->dma_chan_int_mask,
++                       ENETDMAC_IR, priv->tx_chan);
+       /* reclaim sent skb */
+       tx_work_done = bcm_enet_tx_reclaim(dev, 0);
+@@ -516,10 +522,10 @@ static int bcm_enet_poll(struct napi_str
+       napi_complete(napi);
+       /* restore rx/tx interrupt */
+-      enet_dmac_writel(priv, ENETDMAC_IR_PKTDONE_MASK,
+-                       ENETDMAC_IRMASK_REG(priv->rx_chan));
+-      enet_dmac_writel(priv, ENETDMAC_IR_PKTDONE_MASK,
+-                       ENETDMAC_IRMASK_REG(priv->tx_chan));
++      enet_dmac_writel(priv, priv->dma_chan_int_mask,
++                       ENETDMAC_IRMASK, priv->rx_chan);
++      enet_dmac_writel(priv, priv->dma_chan_int_mask,
++                       ENETDMAC_IRMASK, priv->tx_chan);
+       return rx_work_done;
+ }
+@@ -562,8 +568,8 @@ static irqreturn_t bcm_enet_isr_dma(int
+       priv = netdev_priv(dev);
+       /* mask rx/tx interrupts */
+-      enet_dmac_writel(priv, 0, ENETDMAC_IRMASK_REG(priv->rx_chan));
+-      enet_dmac_writel(priv, 0, ENETDMAC_IRMASK_REG(priv->tx_chan));
++      enet_dmac_writel(priv, 0, ENETDMAC_IRMASK, priv->rx_chan);
++      enet_dmac_writel(priv, 0, ENETDMAC_IRMASK, priv->tx_chan);
+       napi_schedule(&priv->napi);
+@@ -624,14 +630,14 @@ static int bcm_enet_start_xmit(struct sk
+                                      DMA_TO_DEVICE);
+       len_stat = (skb->len << DMADESC_LENGTH_SHIFT) & DMADESC_LENGTH_MASK;
+-      len_stat |= DMADESC_ESOP_MASK |
++      len_stat |= (DMADESC_ESOP_MASK >> priv->dma_desc_shift) |
+               DMADESC_APPEND_CRC |
+               DMADESC_OWNER_MASK;
+       priv->tx_curr_desc++;
+       if (priv->tx_curr_desc == priv->tx_ring_size) {
+               priv->tx_curr_desc = 0;
+-              len_stat |= DMADESC_WRAP_MASK;
++              len_stat |= (DMADESC_WRAP_MASK >> priv->dma_desc_shift);
+       }
+       priv->tx_desc_count--;
+@@ -642,8 +648,8 @@ static int bcm_enet_start_xmit(struct sk
+       wmb();
+       /* kick tx dma */
+-      enet_dmac_writel(priv, ENETDMAC_CHANCFG_EN_MASK,
+-                       ENETDMAC_CHANCFG_REG(priv->tx_chan));
++      enet_dmac_writel(priv, priv->dma_chan_en_mask,
++                               ENETDMAC_CHANCFG, priv->tx_chan);
+       /* stop queue if no more desc available */
+       if (!priv->tx_desc_count)
+@@ -771,6 +777,9 @@ static void bcm_enet_set_flow(struct bcm
+               val &= ~ENET_RXCFG_ENFLOW_MASK;
+       enet_writel(priv, val, ENET_RXCFG_REG);
++      if (priv->dma_no_sram)
++              return;
++
+       /* tx flow control (pause frame generation) */
+       val = enet_dma_readl(priv, ENETDMA_CFG_REG);
+       if (tx_en)
+@@ -886,8 +895,8 @@ static int bcm_enet_open(struct net_devi
+       /* mask all interrupts and request them */
+       enet_writel(priv, 0, ENET_IRMASK_REG);
+-      enet_dmac_writel(priv, 0, ENETDMAC_IRMASK_REG(priv->rx_chan));
+-      enet_dmac_writel(priv, 0, ENETDMAC_IRMASK_REG(priv->tx_chan));
++      enet_dmac_writel(priv, 0, ENETDMAC_IRMASK, priv->rx_chan);
++      enet_dmac_writel(priv, 0, ENETDMAC_IRMASK, priv->tx_chan);
+       ret = request_irq(dev->irq, bcm_enet_isr_mac, 0, dev->name, dev);
+       if (ret)
+@@ -966,8 +975,12 @@ static int bcm_enet_open(struct net_devi
+       priv->rx_curr_desc = 0;
+       /* initialize flow control buffer allocation */
+-      enet_dma_writel(priv, ENETDMA_BUFALLOC_FORCE_MASK | 0,
+-                      ENETDMA_BUFALLOC_REG(priv->rx_chan));
++      if (!priv->dma_no_sram)
++              enet_dma_writel(priv, ENETDMA_BUFALLOC_FORCE_MASK | 0,
++                              ENETDMA_BUFALLOC_REG(priv->rx_chan));
++      else
++              enet_dmac_writel(priv, ENETDMA_BUFALLOC_FORCE_MASK | 0,
++                              ENETDMAC_BUFALLOC, priv->rx_chan);
+       if (bcm_enet_refill_rx(dev)) {
+               dev_err(kdev, "cannot allocate rx skb queue\n");
+@@ -976,18 +989,30 @@ static int bcm_enet_open(struct net_devi
+       }
+       /* write rx & tx ring addresses */
+-      enet_dmas_writel(priv, priv->rx_desc_dma,
+-                       ENETDMAS_RSTART_REG(priv->rx_chan));
+-      enet_dmas_writel(priv, priv->tx_desc_dma,
+-                       ENETDMAS_RSTART_REG(priv->tx_chan));
++      if (!priv->dma_no_sram) {
++              enet_dmas_writel(priv, priv->rx_desc_dma,
++                               ENETDMAS_RSTART_REG, priv->rx_chan);
++              enet_dmas_writel(priv, priv->tx_desc_dma,
++                       ENETDMAS_RSTART_REG, priv->tx_chan);
++      } else {
++              enet_dmac_writel(priv, priv->rx_desc_dma,
++                              ENETDMAC_RSTART, priv->rx_chan);
++              enet_dmac_writel(priv, priv->tx_desc_dma,
++                              ENETDMAC_RSTART, priv->tx_chan);
++      }
+       /* clear remaining state ram for rx & tx channel */
+-      enet_dmas_writel(priv, 0, ENETDMAS_SRAM2_REG(priv->rx_chan));
+-      enet_dmas_writel(priv, 0, ENETDMAS_SRAM2_REG(priv->tx_chan));
+-      enet_dmas_writel(priv, 0, ENETDMAS_SRAM3_REG(priv->rx_chan));
+-      enet_dmas_writel(priv, 0, ENETDMAS_SRAM3_REG(priv->tx_chan));
+-      enet_dmas_writel(priv, 0, ENETDMAS_SRAM4_REG(priv->rx_chan));
+-      enet_dmas_writel(priv, 0, ENETDMAS_SRAM4_REG(priv->tx_chan));
++      if (!priv->dma_no_sram) {
++              enet_dmas_writel(priv, 0, ENETDMAS_SRAM2_REG, priv->rx_chan);
++              enet_dmas_writel(priv, 0, ENETDMAS_SRAM2_REG, priv->tx_chan);
++              enet_dmas_writel(priv, 0, ENETDMAS_SRAM3_REG, priv->rx_chan);
++              enet_dmas_writel(priv, 0, ENETDMAS_SRAM3_REG, priv->tx_chan);
++              enet_dmas_writel(priv, 0, ENETDMAS_SRAM4_REG, priv->rx_chan);
++              enet_dmas_writel(priv, 0, ENETDMAS_SRAM4_REG, priv->tx_chan);
++      } else {
++              enet_dmac_writel(priv, 0, ENETDMAC_FC, priv->rx_chan);
++              enet_dmac_writel(priv, 0, ENETDMAC_FC, priv->tx_chan);
++      }
+       /* set max rx/tx length */
+       enet_writel(priv, priv->hw_mtu, ENET_RXMAXLEN_REG);
+@@ -995,18 +1020,24 @@ static int bcm_enet_open(struct net_devi
+       /* set dma maximum burst len */
+       enet_dmac_writel(priv, priv->dma_maxburst,
+-                       ENETDMAC_MAXBURST_REG(priv->rx_chan));
++                       ENETDMAC_MAXBURST, priv->rx_chan);
+       enet_dmac_writel(priv, priv->dma_maxburst,
+-                       ENETDMAC_MAXBURST_REG(priv->tx_chan));
++                       ENETDMAC_MAXBURST, priv->tx_chan);
+       /* set correct transmit fifo watermark */
+       enet_writel(priv, BCMENET_TX_FIFO_TRESH, ENET_TXWMARK_REG);
+       /* set flow control low/high threshold to 1/3 / 2/3 */
+-      val = priv->rx_ring_size / 3;
+-      enet_dma_writel(priv, val, ENETDMA_FLOWCL_REG(priv->rx_chan));
+-      val = (priv->rx_ring_size * 2) / 3;
+-      enet_dma_writel(priv, val, ENETDMA_FLOWCH_REG(priv->rx_chan));
++      if (!priv->dma_no_sram) {
++              val = priv->rx_ring_size / 3;
++              enet_dma_writel(priv, val, ENETDMA_FLOWCL_REG(priv->rx_chan));
++              val = (priv->rx_ring_size * 2) / 3;
++              enet_dma_writel(priv, val, ENETDMA_FLOWCH_REG(priv->rx_chan));
++      } else {
++              enet_dmac_writel(priv, 5, ENETDMAC_FC, priv->rx_chan);
++              enet_dmac_writel(priv, priv->rx_ring_size, ENETDMAC_LEN, priv->rx_chan);
++              enet_dmac_writel(priv, priv->tx_ring_size, ENETDMAC_LEN, priv->tx_chan);
++      }
+       /* all set, enable mac and interrupts, start dma engine and
+        * kick rx dma channel */
+@@ -1015,26 +1046,26 @@ static int bcm_enet_open(struct net_devi
+       val |= ENET_CTL_ENABLE_MASK;
+       enet_writel(priv, val, ENET_CTL_REG);
+       enet_dma_writel(priv, ENETDMA_CFG_EN_MASK, ENETDMA_CFG_REG);
+-      enet_dmac_writel(priv, ENETDMAC_CHANCFG_EN_MASK,
+-                       ENETDMAC_CHANCFG_REG(priv->rx_chan));
++      enet_dmac_writel(priv, priv->dma_chan_en_mask,
++                       ENETDMAC_CHANCFG, priv->rx_chan);
+       /* watch "mib counters about to overflow" interrupt */
+       enet_writel(priv, ENET_IR_MIB, ENET_IR_REG);
+       enet_writel(priv, ENET_IR_MIB, ENET_IRMASK_REG);
+       /* watch "packet transferred" interrupt in rx and tx */
+-      enet_dmac_writel(priv, ENETDMAC_IR_PKTDONE_MASK,
+-                       ENETDMAC_IR_REG(priv->rx_chan));
+-      enet_dmac_writel(priv, ENETDMAC_IR_PKTDONE_MASK,
+-                       ENETDMAC_IR_REG(priv->tx_chan));
++      enet_dmac_writel(priv, priv->dma_chan_int_mask,
++                       ENETDMAC_IR, priv->rx_chan);
++      enet_dmac_writel(priv, priv->dma_chan_int_mask,
++                       ENETDMAC_IR, priv->tx_chan);
+       /* make sure we enable napi before rx interrupt  */
+       napi_enable(&priv->napi);
+-      enet_dmac_writel(priv, ENETDMAC_IR_PKTDONE_MASK,
+-                       ENETDMAC_IRMASK_REG(priv->rx_chan));
+-      enet_dmac_writel(priv, ENETDMAC_IR_PKTDONE_MASK,
+-                       ENETDMAC_IRMASK_REG(priv->tx_chan));
++      enet_dmac_writel(priv, priv->dma_chan_int_mask,
++                       ENETDMAC_IRMASK, priv->rx_chan);
++      enet_dmac_writel(priv, priv->dma_chan_int_mask,
++                       ENETDMAC_IRMASK, priv->tx_chan);
+       if (priv->has_phy)
+               phy_start(priv->phydev);
+@@ -1111,13 +1142,13 @@ static void bcm_enet_disable_dma(struct
+ {
+       int limit;
+-      enet_dmac_writel(priv, 0, ENETDMAC_CHANCFG_REG(chan));
++      enet_dmac_writel(priv, 0, ENETDMAC_CHANCFG, chan);
+       limit = 1000;
+       do {
+               u32 val;
+-              val = enet_dmac_readl(priv, ENETDMAC_CHANCFG_REG(chan));
++              val = enet_dmac_readl(priv, ENETDMAC_CHANCFG, chan);
+               if (!(val & ENETDMAC_CHANCFG_EN_MASK))
+                       break;
+               udelay(1);
+@@ -1144,8 +1175,8 @@ static int bcm_enet_stop(struct net_devi
+       /* mask all interrupts */
+       enet_writel(priv, 0, ENET_IRMASK_REG);
+-      enet_dmac_writel(priv, 0, ENETDMAC_IRMASK_REG(priv->rx_chan));
+-      enet_dmac_writel(priv, 0, ENETDMAC_IRMASK_REG(priv->tx_chan));
++      enet_dmac_writel(priv, 0, ENETDMAC_IRMASK, priv->rx_chan);
++      enet_dmac_writel(priv, 0, ENETDMAC_IRMASK, priv->tx_chan);
+       /* make sure no mib update is scheduled */
+       cancel_work_sync(&priv->mib_update_task);
+@@ -1757,6 +1788,11 @@ static int __devinit bcm_enet_probe(stru
+               priv->pause_tx = pd->pause_tx;
+               priv->force_duplex_full = pd->force_duplex_full;
+               priv->force_speed_100 = pd->force_speed_100;
++              priv->dma_chan_en_mask = pd->dma_chan_en_mask;
++              priv->dma_chan_int_mask = pd->dma_chan_int_mask;
++              priv->dma_chan_width = pd->dma_chan_width;
++              priv->dma_no_sram = pd->dma_no_sram;
++              priv->dma_desc_shift = pd->dma_desc_shift;
+       }
+       if (priv->mac_id == 0 && priv->has_phy && !priv->use_external_mii) {
+@@ -2144,8 +2180,8 @@ static int bcm_enetsw_open(struct net_de
+       kdev = &priv->pdev->dev;
+       /* mask all interrupts and request them */
+-      enet_dmac_writel(priv, 0, ENETDMAC_IRMASK_REG(priv->rx_chan));
+-      enet_dmac_writel(priv, 0, ENETDMAC_IRMASK_REG(priv->tx_chan));
++      enet_dmac_writel(priv, 0, ENETDMAC_IRMASK_REG, priv->rx_chan);
++      enet_dmac_writel(priv, 0, ENETDMAC_IRMASK_REG, priv->tx_chan);
+       ret = request_irq(priv->irq_rx, bcm_enet_isr_dma,
+                         IRQF_DISABLED, dev->name, dev);
+@@ -2269,23 +2305,23 @@ static int bcm_enetsw_open(struct net_de
+       /* write rx & tx ring addresses */
+       enet_dmas_writel(priv, priv->rx_desc_dma,
+-                       ENETDMAS_RSTART_REG(priv->rx_chan));
++                       ENETDMAS_RSTART_REG, priv->rx_chan);
+       enet_dmas_writel(priv, priv->tx_desc_dma,
+-                       ENETDMAS_RSTART_REG(priv->tx_chan));
++                       ENETDMAS_RSTART_REG, priv->tx_chan);
+       /* clear remaining state ram for rx & tx channel */
+-      enet_dmas_writel(priv, 0, ENETDMAS_SRAM2_REG(priv->rx_chan));
+-      enet_dmas_writel(priv, 0, ENETDMAS_SRAM2_REG(priv->tx_chan));
+-      enet_dmas_writel(priv, 0, ENETDMAS_SRAM3_REG(priv->rx_chan));
+-      enet_dmas_writel(priv, 0, ENETDMAS_SRAM3_REG(priv->tx_chan));
+-      enet_dmas_writel(priv, 0, ENETDMAS_SRAM4_REG(priv->rx_chan));
+-      enet_dmas_writel(priv, 0, ENETDMAS_SRAM4_REG(priv->tx_chan));
++      enet_dmas_writel(priv, 0, ENETDMAS_SRAM2_REG, priv->rx_chan);
++      enet_dmas_writel(priv, 0, ENETDMAS_SRAM2_REG, priv->tx_chan);
++      enet_dmas_writel(priv, 0, ENETDMAS_SRAM3_REG, priv->rx_chan);
++      enet_dmas_writel(priv, 0, ENETDMAS_SRAM3_REG, priv->tx_chan);
++      enet_dmas_writel(priv, 0, ENETDMAS_SRAM4_REG, priv->rx_chan);
++      enet_dmas_writel(priv, 0, ENETDMAS_SRAM4_REG, priv->tx_chan);
+       /* set dma maximum burst len */
+       enet_dmac_writel(priv, priv->dma_maxburst,
+-                       ENETDMAC_MAXBURST_REG(priv->rx_chan));
++                       ENETDMAC_MAXBURST_REG, priv->rx_chan);
+       enet_dmac_writel(priv, priv->dma_maxburst,
+-                       ENETDMAC_MAXBURST_REG(priv->tx_chan));
++                       ENETDMAC_MAXBURST_REG, priv->tx_chan);
+       /* set flow control low/high threshold to 1/3 / 2/3 */
+       val = priv->rx_ring_size / 3;
+@@ -2298,21 +2334,21 @@ static int bcm_enetsw_open(struct net_de
+       wmb();
+       enet_dma_writel(priv, ENETDMA_CFG_EN_MASK, ENETDMA_CFG_REG);
+       enet_dmac_writel(priv, ENETDMAC_CHANCFG_EN_MASK,
+-                       ENETDMAC_CHANCFG_REG(priv->rx_chan));
++                       ENETDMAC_CHANCFG_REG, priv->rx_chan);
+       /* watch "packet transferred" interrupt in rx and tx */
+       enet_dmac_writel(priv, ENETDMAC_IR_PKTDONE_MASK,
+-                       ENETDMAC_IR_REG(priv->rx_chan));
++                       ENETDMAC_IR_REG, priv->rx_chan);
+       enet_dmac_writel(priv, ENETDMAC_IR_PKTDONE_MASK,
+-                       ENETDMAC_IR_REG(priv->tx_chan));
++                       ENETDMAC_IR_REG, priv->tx_chan);
+       /* make sure we enable napi before rx interrupt  */
+       napi_enable(&priv->napi);
+       enet_dmac_writel(priv, ENETDMAC_IR_PKTDONE_MASK,
+-                       ENETDMAC_IRMASK_REG(priv->rx_chan));
++                       ENETDMAC_IRMASK_REG, priv->rx_chan);
+       enet_dmac_writel(priv, ENETDMAC_IR_PKTDONE_MASK,
+-                       ENETDMAC_IRMASK_REG(priv->tx_chan));
++                       ENETDMAC_IRMASK_REG, priv->tx_chan);
+       netif_carrier_on(dev);
+       netif_start_queue(dev);
+@@ -2419,8 +2455,8 @@ static int bcm_enetsw_stop(struct net_de
+       del_timer_sync(&priv->rx_timeout);
+       /* mask all interrupts */
+-      enet_dmac_writel(priv, 0, ENETDMAC_IRMASK_REG(priv->rx_chan));
+-      enet_dmac_writel(priv, 0, ENETDMAC_IRMASK_REG(priv->tx_chan));
++      enet_dmac_writel(priv, 0, ENETDMAC_IRMASK_REG, priv->rx_chan);
++      enet_dmac_writel(priv, 0, ENETDMAC_IRMASK_REG, priv->tx_chan);
+       /* disable dma & mac */
+       bcm_enet_disable_dma(priv, priv->tx_chan);
+--- a/drivers/net/ethernet/broadcom/bcm63xx_enet.h
++++ b/drivers/net/ethernet/broadcom/bcm63xx_enet.h
+@@ -367,6 +367,21 @@ struct bcm_enet_priv {
+       /* used to poll switch port state */
+       struct timer_list swphy_poll;
+       spinlock_t enetsw_mdio_lock;
++
++      /* dma channel enable mask */
++      u32 dma_chan_en_mask;
++
++      /* dma channel interrupt mask */
++      u32 dma_chan_int_mask;
++
++      /* dma engine has *no* internal SRAM */
++      unsigned int dma_no_sram;
++
++      /* dma channel width */
++      unsigned int dma_chan_width;
++
++      /* dma descriptor shift value */
++      unsigned int dma_desc_shift;
+ };
+ static inline int bcm_enet_port_is_rgmii(int portid)
+--- a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_cpu.h
++++ b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_cpu.h
+@@ -173,6 +173,7 @@ enum bcm63xx_regs_set {
+ #define BCM_6368_RSET_SPI_SIZE                1804
+ #define RSET_ENET_SIZE                        2048
+ #define RSET_ENETDMA_SIZE             256
++#define RSET_6345_ENETDMA_SIZE                64
+ #define RSET_ENETDMAC_SIZE(chans)     (16 * (chans))
+ #define RSET_ENETDMAS_SIZE(chans)     (16 * (chans))
+ #define RSET_ENETSW_SIZE              65536
+@@ -299,7 +300,7 @@ enum bcm63xx_regs_set {
+ #define BCM_6345_USBDMA_BASE          (0xfffe2800)
+ #define BCM_6345_ENET0_BASE           (0xfffe1800)
+ #define BCM_6345_ENETDMA_BASE         (0xfffe2800)
+-#define BCM_6345_ENETDMAC_BASE                (0xfffe2900)
++#define BCM_6345_ENETDMAC_BASE                (0xfffe2840)
+ #define BCM_6345_ENETDMAS_BASE                (0xfffe2a00)
+ #define BCM_6345_ENETSW_BASE          (0xdeadbeef)
+ #define BCM_6345_PCMCIA_BASE          (0xfffe2028)
+--- a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_enet.h
++++ b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_enet.h
+@@ -4,6 +4,8 @@
+ #include <linux/if_ether.h>
+ #include <linux/init.h>
++#include <bcm63xx_regs.h>
++
+ /*
+  * on board ethernet platform data
+  */
+@@ -37,6 +39,21 @@ struct bcm63xx_enet_platform_data {
+                                         int phy_id, int reg),
+                         void (*mii_write)(struct net_device *dev,
+                                           int phy_id, int reg, int val));
++
++      /* DMA channel enable mask */
++      u32 dma_chan_en_mask;
++
++      /* DMA channel interrupt mask */
++      u32 dma_chan_int_mask;
++
++      /* Set to one if DMA engine has *no* SRAM */
++      unsigned int dma_no_sram;
++
++      /* DMA channel register width */
++      unsigned int dma_chan_width;
++
++      /* DMA descriptor shift */
++      unsigned int dma_desc_shift;
+ };
+ /*
+@@ -72,4 +89,66 @@ int __init bcm63xx_enet_register(int uni
+ int __init
+ bcm63xx_enetsw_register(const struct bcm63xx_enetsw_platform_data *pd);
++enum bcm63xx_regs_enetdmac {
++      ENETDMAC_CHANCFG,
++      ENETDMAC_IR,
++      ENETDMAC_IRMASK,
++      ENETDMAC_MAXBURST,
++      ENETDMAC_BUFALLOC,
++      ENETDMAC_RSTART,
++      ENETDMAC_FC,
++      ENETDMAC_LEN,
++};
++
++static inline unsigned long bcm63xx_enetdmacreg(enum bcm63xx_regs_enetdmac reg)
++{
++#ifdef BCMCPU_RUNTIME_DETECT
++      extern const unsigned long *bcm63xx_regs_enetdmac;
++
++      return bcm63xx_regs_enetdmac[reg];
++#else
++#ifdef CONFIG_BCM63XX_CPU_6345
++      switch (reg) {
++      case ENETDMAC_CHANCFG:
++              return ENETDMA_6345_CHANCFG_REG;
++      case ENETDMAC_IR:
++              return ENETDMA_6345_IR_REG;
++      case ENETDMAC_IRMASK:
++              return ENETDMA_6345_IRMASK_REG;
++      case ENETDMAC_MAXBURST:
++              return ENETDMA_6345_MAXBURST_REG;
++      case ENETDMAC_BUFALLOC:
++              return ENETDMA_6345_BUFALLOC_REG;
++      case ENETDMAC_RSTART:
++              return ENETDMA_6345_RSTART_REG;
++      case ENETDMAC_FC:
++              return ENETDMA_6345_FC_REG;
++      case ENETDMAC_LEN:
++              return ENETDMA_6345_LEN_REG;
++      }
++#endif
++#if defined(CONFIG_BCM6XX_CPU_6338) || defined(CONFIG_BCM63XX_CPU_6348) \
++      defined(CONFIG_BCM63XX_CPU_6358) || defined(CONFIG_BCM63XX_CPU_6362) \
++      defined(CONFIG_BCM63XX_CPU_6368)
++      switch (reg) {
++      case ENETDMAC_CHANCFG:
++              return ENETDMAC_CHANCFG_REG;
++      case ENETDMAC_IR:
++              return ENETDMAC_IR_REG;
++      case ENETDMAC_IRMASK:
++              return ENETDMAC_IRMASK_REG;
++      case ENETDMAC_MAXBURST:
++              return ENETDMAC_MAXBURST_REG;
++      case ENETDMAC_BUFALLOC:
++      case ENETDMAC_RSTART:
++      case ENETDMAC_FC:
++      case ENETDMAC_LEN:
++              return 0;
++      }
++#endif
++#endif
++      return 0;
++}
++
++
+ #endif /* ! BCM63XX_DEV_ENET_H_ */
diff --git a/target/linux/brcm63xx/patches-3.6/500-board-D4PW.patch b/target/linux/brcm63xx/patches-3.6/500-board-D4PW.patch
new file mode 100644 (file)
index 0000000..4e39933
--- /dev/null
@@ -0,0 +1,65 @@
+--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
++++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
+@@ -511,6 +511,54 @@ static struct board_info __initdata boar
+       .has_ohci0 = 1,
+ };
++
++static struct board_info __initdata board_96348_D4PW = {
++      .name                           = "D-4P-W",
++      .expected_cpu_id                = 0x6348,
++
++      .has_enet1                      = 1,
++      .has_pci                        = 1,
++      .has_uart0                      = 1,
++
++      .enet1 = {
++              .force_speed_100        = 1,
++              .force_duplex_full      = 1,
++      },
++
++      .leds = {
++              {
++                      .name           = "D-4P-W:green:power",
++                      .gpio           = 0,
++                      .active_low     = 1,
++              },
++              {
++                      .name           = "D-4P-W::status",
++                      .gpio           = 3,
++                      .active_low     = 1,
++              },
++              {
++                      .name           = "D-4P-W:green:internet",
++                      .gpio           = 4,
++                      .active_low     = 1,
++              },
++              {
++                      .name           = "D-4P-W:red:internet",
++                      .gpio           = 5,
++                      .active_low     = 1,
++              },
++      },
++
++      .buttons = {
++              {
++                      .desc           = "reset",
++                      .gpio           = 7,
++                      .active_low     = 1,
++                      .type           = EV_KEY,
++                      .code           = KEY_RESTART,
++                      .debounce_interval = BCM963XX_KEYS_DEBOUNCE_INTERVAL,
++              },
++      },
++};
+ #endif
+ /*
+@@ -685,6 +733,7 @@ static const struct board_info __initdat
+       &board_DV201AMR,
+       &board_96348gw_a,
+       &board_rta1025w_16,
++      &board_96348_D4PW,
+ #endif
+ #ifdef CONFIG_BCM63XX_CPU_6358
diff --git a/target/linux/brcm63xx/patches-3.6/501-board-NB4.patch b/target/linux/brcm63xx/patches-3.6/501-board-NB4.patch
new file mode 100644 (file)
index 0000000..e1b7f0e
--- /dev/null
@@ -0,0 +1,640 @@
+--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
++++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
+@@ -15,6 +15,8 @@
+ #include <linux/gpio_keys.h>
+ #include <linux/input.h>
+ #include <linux/spi/spi.h>
++#include <linux/spi/spi_gpio.h>
++#include <linux/spi/74x164.h>
+ #include <asm/addrspace.h>
+ #include <bcm63xx_board.h>
+ #include <bcm63xx_cpu.h>
+@@ -43,6 +45,12 @@
+ #define CFE_OFFSET_64K                0x10000
+ #define CFE_OFFSET_128K               0x20000
++#define NB4_PID_OFFSET                0xff80
++#define NB4_74X164_GPIO_BASE  64
++#define NB4_SPI_GPIO_MOSI     7
++#define NB4_SPI_GPIO_CLK      6
++#define NB4_74HC64_GPIO(X)    (NB4_74X164_GPIO_BASE + (X))
++
+ static struct board_info board;
+ /*
+@@ -708,6 +716,586 @@ static struct board_info __initdata boar
+       .has_ohci0                      = 1,
+ };
++
++struct spi_gpio_platform_data nb4_spi_gpio_data = {
++      .sck            = NB4_SPI_GPIO_CLK,
++      .mosi           = NB4_SPI_GPIO_MOSI,
++      .miso           = SPI_GPIO_NO_MISO,
++      .num_chipselect = 1,
++};
++
++
++static struct platform_device nb4_spi_gpio = {
++      .name = "spi_gpio",
++      .id   = 1,
++      .dev = {
++              .platform_data = &nb4_spi_gpio_data,
++      },
++};
++
++static struct platform_device * __initdata nb4_devices[] = {
++      &nb4_spi_gpio,
++};
++
++const struct gen_74x164_chip_platform_data nb4_74x164_platform_data = {
++      .base = NB4_74X164_GPIO_BASE
++};
++
++static struct spi_board_info nb4_spi_devices[] = {
++      {
++              .modalias = "74x164",
++              .max_speed_hz = 781000,
++              .bus_num = 1,
++              .controller_data = (void *) SPI_GPIO_NO_CHIPSELECT,
++              .mode = SPI_MODE_0,
++              .platform_data = &nb4_74x164_platform_data
++      }
++};
++
++static struct board_info __initdata board_nb4_ser_r0 = {
++      .name                           = "NB4-SER-r0",
++      .expected_cpu_id                = 0x6358,
++
++      .has_uart0                      = 1,
++      .has_enet0                      = 1,
++      .has_enet1                      = 1,
++      .has_pci                        = 1,
++
++      .enet0 = {
++              .has_phy                = 1,
++              .use_internal_phy       = 1,
++      },
++
++      .enet1 = {
++              .force_speed_100        = 1,
++              .force_duplex_full      = 1,
++      },
++
++
++      .has_ohci0 = 1,
++      .has_pccard = 1,
++      .has_ehci0 = 1,
++
++      .leds = {
++              {
++                      .name           = "NB4-SER-r0:white:adsl",
++                      .gpio           = NB4_74HC64_GPIO(4),
++                      .active_low     = 1,
++              },
++              {
++                      .name           = "NB4-SER-r0:white:traffic",
++                      .gpio           = 2,
++                      .active_low     = 1,
++              },
++              {
++                      .name           = "NB4-SER-r0:white:tel",
++                      .gpio           = NB4_74HC64_GPIO(3),
++                      .active_low     = 1,
++              },
++              {
++                      .name           = "NB4-SER-r0:white:tv",
++                      .gpio           = NB4_74HC64_GPIO(2),
++                      .active_low     = 1,
++              },
++              {
++                      .name           = "NB4-SER-r0:white:wifi",
++                      .gpio           = 15,
++                      .active_low     = 1,
++              },
++              {
++                      .name           = "NB4-SER-r0:white:alarm",
++                      .gpio           = NB4_74HC64_GPIO(0),
++                      .active_low     = 1,
++              },
++              {
++                      .name           = "NB4-SER-r0:red:service",
++                      .gpio           = 29,
++                      .active_low     = 1,
++              },
++              {
++                      .name           = "NB4-SER-r0:green:service",
++                      .gpio           = 30,
++                      .active_low     = 1,
++              },
++              {
++                      .name           = "NB4-SER-r0:blue:service",
++                      .gpio           = 4,
++                      .active_low     = 1,
++              },
++      },
++      .buttons = {
++              {
++                      .desc           = "reset",
++                      .gpio           = 34,
++                      .type           = EV_KEY,
++                      .code           = KEY_RESTART,
++                      .active_low     = 1,
++                      .debounce_interval = BCM963XX_KEYS_DEBOUNCE_INTERVAL,
++              },
++              {
++                      .desc           = "wps",
++                      .gpio           = 37,
++                      .type           = EV_KEY,
++                      .code           = KEY_WPS_BUTTON,
++                      .active_low     = 1,
++                      .debounce_interval = BCM963XX_KEYS_DEBOUNCE_INTERVAL,
++              },
++              {
++                      .desc           = "service",
++                      .gpio           = 27,
++                      .type           = EV_KEY,
++                      .code           = BTN_0,
++                      .active_low     = 1,
++                      .debounce_interval = BCM963XX_KEYS_DEBOUNCE_INTERVAL,
++              },
++              {
++                      .desc           = "clip",
++                      .gpio           = 31,
++                      .type           = EV_KEY,
++                      .code           = BTN_1,
++                      .active_low     = 1,
++                      .debounce_interval = BCM963XX_KEYS_DEBOUNCE_INTERVAL,
++              },
++      },
++      .devs = nb4_devices,
++      .num_devs = ARRAY_SIZE(nb4_devices),
++      .spis = nb4_spi_devices,
++      .num_spis = ARRAY_SIZE(nb4_spi_devices),
++};
++
++static struct board_info __initdata board_nb4_ser_r1 = {
++      .name                           = "NB4-SER-r1",
++      .expected_cpu_id                = 0x6358,
++
++      .has_uart0                      = 1,
++      .has_enet0                      = 1,
++      .has_enet1                      = 1,
++      .has_pci                        = 1,
++
++      .enet0 = {
++              .has_phy                = 1,
++              .use_internal_phy       = 1,
++      },
++
++      .enet1 = {
++              .force_speed_100        = 1,
++              .force_duplex_full      = 1,
++      },
++
++
++      .has_ohci0 = 1,
++      .has_pccard = 1,
++      .has_ehci0 = 1,
++
++      .leds = {
++              {
++                      .name           = "NB4-SER-r1:white:adsl",
++                      .gpio           = NB4_74HC64_GPIO(4),
++                      .active_low     = 1,
++              },
++              {
++                      .name           = "NB4-SER-r1:white:traffic",
++                      .gpio           = 2,
++                      .active_low     = 1,
++              },
++              {
++                      .name           = "NB4-SER-r1:white:tel",
++                      .gpio           = NB4_74HC64_GPIO(3),
++                      .active_low     = 1,
++              },
++              {
++                      .name           = "NB4-SER-r1:white:tv",
++                      .gpio           = NB4_74HC64_GPIO(2),
++                      .active_low     = 1,
++              },
++              {
++                      .name           = "NB4-SER-r1:white:wifi",
++                      .gpio           = 15,
++                      .active_low     = 1,
++              },
++              {
++                      .name           = "NB4-SER-r1:white:alarm",
++                      .gpio           = NB4_74HC64_GPIO(0),
++                      .active_low     = 1,
++              },
++              {
++                      .name           = "NB4-SER-r1:red:service",
++                      .gpio           = 29,
++                      .active_low     = 1,
++              },
++              {
++                      .name           = "NB4-SER-r1:green:service",
++                      .gpio           = 30,
++                      .active_low     = 1,
++              },
++              {
++                      .name           = "NB4-SER-r1:blue:service",
++                      .gpio           = 4,
++                      .active_low     = 1,
++              },
++      },
++      .buttons = {
++              {
++                      .desc           = "reset",
++                      .gpio           = 34,
++                      .type           = EV_KEY,
++                      .code           = KEY_RESTART,
++                      .active_low     = 1,
++                      .debounce_interval = BCM963XX_KEYS_DEBOUNCE_INTERVAL,
++              },
++              {
++                      .desc           = "wps",
++                      .gpio           = 37,
++                      .type           = EV_KEY,
++                      .code           = KEY_WPS_BUTTON,
++                      .active_low     = 1,
++                      .debounce_interval = BCM963XX_KEYS_DEBOUNCE_INTERVAL,
++              },
++              {
++                      .desc           = "service",
++                      .gpio           = 27,
++                      .type           = EV_KEY,
++                      .code           = BTN_0,
++                      .active_low     = 1,
++                      .debounce_interval = BCM963XX_KEYS_DEBOUNCE_INTERVAL,
++              },
++              {
++                      .desc           = "clip",
++                      .gpio           = 31,
++                      .type           = EV_KEY,
++                      .code           = BTN_1,
++                      .active_low     = 1,
++                      .debounce_interval = BCM963XX_KEYS_DEBOUNCE_INTERVAL,
++              },
++      },
++      .devs = nb4_devices,
++      .num_devs = ARRAY_SIZE(nb4_devices),
++      .spis = nb4_spi_devices,
++      .num_spis = ARRAY_SIZE(nb4_spi_devices),
++};
++
++static struct board_info __initdata board_nb4_ser_r2 = {
++      .name                           = "NB4-SER-r2",
++      .expected_cpu_id                = 0x6358,
++
++      .has_uart0                      = 1,
++      .has_enet0                      = 1,
++      .has_enet1                      = 1,
++      .has_pci                        = 1,
++
++      .enet0 = {
++              .has_phy                = 1,
++              .use_internal_phy       = 1,
++      },
++
++      .enet1 = {
++              .force_speed_100        = 1,
++              .force_duplex_full      = 1,
++      },
++
++
++      .has_ohci0 = 1,
++      .has_pccard = 1,
++      .has_ehci0 = 1,
++
++      .leds = {
++              {
++                      .name           = "NB4-SER-r2:white:adsl",
++                      .gpio           = NB4_74HC64_GPIO(4),
++                      .active_low     = 1,
++              },
++              {
++                      .name           = "NB4-SER-r2:white:traffic",
++                      .gpio           = 2,
++                      .active_low     = 1,
++              },
++              {
++                      .name           = "NB4-SER-r2:white:tel",
++                      .gpio           = NB4_74HC64_GPIO(3),
++                      .active_low     = 1,
++              },
++              {
++                      .name           = "NB4-SER-r2:white:tv",
++                      .gpio           = NB4_74HC64_GPIO(2),
++                      .active_low     = 1,
++              },
++              {
++                      .name           = "NB4-SER-r2:white:wifi",
++                      .gpio           = 15,
++                      .active_low     = 1,
++              },
++              {
++                      .name           = "NB4-SER-r2:white:alarm",
++                      .gpio           = NB4_74HC64_GPIO(0),
++                      .active_low     = 1,
++              },
++              {
++                      .name           = "NB4-SER-r2:red:service",
++                      .gpio           = 29,
++                      .active_low     = 1,
++              },
++              {
++                      .name           = "NB4-SER-r2:green:service",
++                      .gpio           = 30,
++                      .active_low     = 1,
++              },
++              {
++                      .name           = "NB4-SER-r2:blue:service",
++                      .gpio           = 4,
++                      .active_low     = 1,
++              },
++      },
++      .buttons = {
++              {
++                      .desc           = "reset",
++                      .gpio           = 34,
++                      .type           = EV_KEY,
++                      .code           = KEY_RESTART,
++                      .active_low     = 1,
++                      .debounce_interval = BCM963XX_KEYS_DEBOUNCE_INTERVAL,
++              },
++              {
++                      .desc           = "wps",
++                      .gpio           = 37,
++                      .type           = EV_KEY,
++                      .code           = KEY_WPS_BUTTON,
++                      .active_low     = 1,
++                      .debounce_interval = BCM963XX_KEYS_DEBOUNCE_INTERVAL,
++              },
++              {
++                      .desc           = "service",
++                      .gpio           = 27,
++                      .type           = EV_KEY,
++                      .code           = BTN_0,
++                      .active_low     = 1,
++                      .debounce_interval = BCM963XX_KEYS_DEBOUNCE_INTERVAL,
++              },
++              {
++                      .desc           = "clip",
++                      .gpio           = 31,
++                      .type           = EV_KEY,
++                      .code           = BTN_1,
++                      .active_low     = 1,
++                      .debounce_interval = BCM963XX_KEYS_DEBOUNCE_INTERVAL,
++              },
++      },
++      .devs = nb4_devices,
++      .num_devs = ARRAY_SIZE(nb4_devices),
++      .spis = nb4_spi_devices,
++      .num_spis = ARRAY_SIZE(nb4_spi_devices),
++};
++
++static struct board_info __initdata board_nb4_fxc_r1 = {
++      .name                           = "NB4-FXC-r1",
++      .expected_cpu_id                = 0x6358,
++
++      .has_uart0                      = 1,
++      .has_enet0                      = 1,
++      .has_enet1                      = 1,
++      .has_pci                        = 1,
++
++      .enet0 = {
++              .has_phy                = 1,
++              .use_internal_phy       = 1,
++      },
++
++      .enet1 = {
++              .force_speed_100        = 1,
++              .force_duplex_full      = 1,
++      },
++
++
++      .has_ohci0 = 1,
++      .has_pccard = 1,
++      .has_ehci0 = 1,
++
++      .leds = {
++              {
++                      .name           = "NB4-FXC-r1:white:adsl",
++                      .gpio           = NB4_74HC64_GPIO(4),
++                      .active_low     = 1,
++              },
++              {
++                      .name           = "NB4-FXC-r1:white:traffic",
++                      .gpio           = 2,
++              },
++              {
++                      .name           = "NB4-FXC-r1:white:tel",
++                      .gpio           = NB4_74HC64_GPIO(3),
++                      .active_low     = 1,
++              },
++              {
++                      .name           = "NB4-FXC-r1:white:tv",
++                      .gpio           = NB4_74HC64_GPIO(2),
++                      .active_low     = 1,
++              },
++              {
++                      .name           = "NB4-FXC-r1:white:wifi",
++                      .gpio           = 15,
++              },
++              {
++                      .name           = "NB4-FXC-r1:white:alarm",
++                      .gpio           = NB4_74HC64_GPIO(0),
++                      .active_low     = 1,
++              },
++              {
++                      .name           = "NB4-FXC-r1:red:service",
++                      .gpio           = 29,
++              },
++              {
++                      .name           = "NB4-FXC-r1:green:service",
++                      .gpio           = 30,
++              },
++              {
++                      .name           = "NB4-FXC-r1:blue:service",
++                      .gpio           = 4,
++              },
++      },
++      .buttons = {
++              {
++                      .desc           = "reset",
++                      .gpio           = 34,
++                      .type           = EV_KEY,
++                      .code           = KEY_RESTART,
++                      .active_low     = 1,
++                      .debounce_interval = BCM963XX_KEYS_DEBOUNCE_INTERVAL,
++              },
++              {
++                      .desc           = "wps",
++                      .gpio           = 37,
++                      .type           = EV_KEY,
++                      .code           = KEY_WPS_BUTTON,
++                      .active_low     = 1,
++                      .debounce_interval = BCM963XX_KEYS_DEBOUNCE_INTERVAL,
++              },
++              {
++                      .desc           = "service",
++                      .gpio           = 27,
++                      .type           = EV_KEY,
++                      .code           = BTN_0,
++                      .active_low     = 1,
++                      .debounce_interval = BCM963XX_KEYS_DEBOUNCE_INTERVAL,
++              },
++              {
++                      .desc           = "clip",
++                      .gpio           = 31,
++                      .type           = EV_KEY,
++                      .code           = BTN_1,
++                      .active_low     = 1,
++                      .debounce_interval = BCM963XX_KEYS_DEBOUNCE_INTERVAL,
++              },
++      },
++      .devs = nb4_devices,
++      .num_devs = ARRAY_SIZE(nb4_devices),
++      .spis = nb4_spi_devices,
++      .num_spis = ARRAY_SIZE(nb4_spi_devices),
++};
++
++static struct board_info __initdata board_nb4_fxc_r2 = {
++      .name                           = "NB4-FXC-r2",
++      .expected_cpu_id                = 0x6358,
++
++      .has_uart0                      = 1,
++      .has_enet0                      = 1,
++      .has_enet1                      = 1,
++      .has_pci                        = 1,
++
++      .enet0 = {
++              .has_phy                = 1,
++              .use_internal_phy       = 1,
++      },
++
++      .enet1 = {
++              .force_speed_100        = 1,
++              .force_duplex_full      = 1,
++      },
++
++
++      .has_ohci0 = 1,
++      .has_pccard = 1,
++      .has_ehci0 = 1,
++
++      .leds = {
++              {
++                      .name           = "NB4-FXC-r2:white:adsl",
++                      .gpio           = NB4_74HC64_GPIO(4),
++                      .active_low     = 1,
++              },
++              {
++                      .name           = "NB4-FXC-r2:white:traffic",
++                      .gpio           = 2,
++              },
++              {
++                      .name           = "NB4-FXC-r2:white:tel",
++                      .gpio           = NB4_74HC64_GPIO(3),
++                      .active_low     = 1,
++              },
++              {
++                      .name           = "NB4-FXC-r2:white:tv",
++                      .gpio           = NB4_74HC64_GPIO(2),
++                      .active_low     = 1,
++              },
++              {
++                      .name           = "NB4-FXC-r2:white:wifi",
++                      .gpio           = 15,
++              },
++              {
++                      .name           = "NB4-FXC-r2:white:alarm",
++                      .gpio           = NB4_74HC64_GPIO(0),
++                      .active_low     = 1,
++              },
++              {
++                      .name           = "NB4-FXC-r2:red:service",
++                      .gpio           = 29,
++              },
++              {
++                      .name           = "NB4-FXC-r2:green:service",
++                      .gpio           = 30,
++              },
++              {
++                      .name           = "NB4-FXC-r2:blue:service",
++                      .gpio           = 4,
++              },
++      },
++      .buttons = {
++              {
++                      .desc           = "reset",
++                      .gpio           = 34,
++                      .type           = EV_KEY,
++                      .code           = KEY_RESTART,
++                      .active_low     = 1,
++                      .debounce_interval = BCM963XX_KEYS_DEBOUNCE_INTERVAL,
++              },
++              {
++                      .desc           = "wps",
++                      .gpio           = 37,
++                      .type           = EV_KEY,
++                      .code           = KEY_WPS_BUTTON,
++                      .active_low     = 1,
++                      .debounce_interval = BCM963XX_KEYS_DEBOUNCE_INTERVAL,
++              },
++              {
++                      .desc           = "service",
++                      .gpio           = 27,
++                      .type           = EV_KEY,
++                      .code           = BTN_0,
++                      .active_low     = 1,
++                      .debounce_interval = BCM963XX_KEYS_DEBOUNCE_INTERVAL,
++              },
++              {
++                      .desc           = "clip",
++                      .gpio           = 31,
++                      .type           = EV_KEY,
++                      .code           = BTN_1,
++                      .active_low     = 1,
++                      .debounce_interval = BCM963XX_KEYS_DEBOUNCE_INTERVAL,
++              },
++      },
++      .devs = nb4_devices,
++      .num_devs = ARRAY_SIZE(nb4_devices),
++      .spis = nb4_spi_devices,
++      .num_spis = ARRAY_SIZE(nb4_spi_devices),
++};
+ #endif
+ /*
+@@ -741,6 +1329,11 @@ static const struct board_info __initdat
+       &board_96358vw2,
+       &board_AGPFS0,
+       &board_DWVS0,
++      &board_nb4_ser_r0,
++      &board_nb4_ser_r1,
++      &board_nb4_ser_r2,
++      &board_nb4_fxc_r1,
++      &board_nb4_fxc_r2,
+ #endif
+ };
+@@ -795,6 +1388,16 @@ static void __init boardid_fixup(u8 *boo
+       struct bcm_tag *tag = (struct bcm_tag *)(boot_addr + CFE_OFFSET_64K);
+       char *board_name = (char *)bcm63xx_nvram_get_name();
++      if (BCMCPU_IS_6358() && (!strcmp(board_name, "96358VW"))) {
++              u8 *p = boot_addr + NB4_PID_OFFSET;
++
++              /* Extract nb4 PID */
++              if (!memcmp(p, "NB4-", 4)) {
++                      memcpy(board_name, p, sizeof("NB4-XXX-rX"));
++                      return;
++              }
++      }
++
+       /* check if bcm_tag is at 64k offset */
+       if (strncmp(board_name, tag->board_id, BOARDID_LEN) != 0) {
+               /* else try 128k */
diff --git a/target/linux/brcm63xx/patches-3.6/502-board-96338W2_E7T.patch b/target/linux/brcm63xx/patches-3.6/502-board-96338W2_E7T.patch
new file mode 100644 (file)
index 0000000..748b195
--- /dev/null
@@ -0,0 +1,49 @@
+--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
++++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
+@@ -182,6 +182,38 @@ static struct board_info __initdata boar
+               },
+       },
+ };
++
++static struct board_info __initdata board_96338w2_e7t = {
++      .name                           = "96338W2_E7T",
++      .expected_cpu_id                = 0x6338,
++
++      .has_enet0                      = 1,
++
++      .enet0 = {
++              .force_speed_100        = 1,
++              .force_duplex_full      = 1,
++      },
++
++              .leds = {
++              {
++                      .name           = "96338W2_E7T:green:ppp",
++                      .gpio           = 4,
++                      .active_low     = 1,
++              },
++              {
++                      .name           = "96338W2_E7T:green:ppp-fail",
++                      .gpio           = 5,
++                      .active_low     = 1,
++              },
++              {
++                      .name           = "96338W2_E7T:green:power",
++                      .gpio           = 0,
++                      .active_low     = 1,
++                      .default_trigger = "default-on",
++
++              },
++      },
++};
+ #endif
+ /*
+@@ -1308,6 +1340,7 @@ static const struct board_info __initdat
+ #ifdef CONFIG_BCM63XX_CPU_6338
+       &board_96338gw,
+       &board_96338w,
++      &board_96338w2_e7t,
+ #endif
+ #ifdef CONFIG_BCM63XX_CPU_6345
+       &board_96345gw2,
diff --git a/target/linux/brcm63xx/patches-3.6/503-board-CPVA642.patch b/target/linux/brcm63xx/patches-3.6/503-board-CPVA642.patch
new file mode 100644 (file)
index 0000000..f87252b
--- /dev/null
@@ -0,0 +1,107 @@
+--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
++++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
+@@ -705,6 +705,96 @@ static struct board_info __initdata boar
+       },
+ };
++static struct board_info __initdata board_CPVA642 = {
++      .name                           = "CPVA642",
++      .expected_cpu_id                = 0x6358,
++
++      .has_uart0                      = 1,
++      .has_enet1                      = 1,
++      .has_pci                        = 1,
++
++      .enet1 = {
++              .force_speed_100        = 1,
++              .force_duplex_full      = 1,
++      },
++
++      .has_ohci0 = 1,
++      .has_ehci0 = 1,
++
++      .leds = {
++              {
++                      .name           = "CPVA642:red:power",
++                      .gpio           = 14,
++                      .active_low     = 1,
++              },
++              {
++                      .name           = "CPVA642:green:power",
++                      .gpio           = 11,
++                      .active_low     = 1,
++                      .default_trigger = "default-on",
++              },
++              {
++                      .name           = "CPVA642:red:wifi",
++                      .gpio           = 6,
++                      .active_low     = 1,
++              },
++              {
++                      .name           = "CPVA642:green:wifi",
++                      .gpio           = 28,
++                      .active_low     = 0,
++              },
++              {
++                      .name           = "CPVA642:red:link",
++                      .gpio           = 9,
++                      .active_low     = 1,
++              },
++              {
++                      .name           = "CPVA642:green:link",
++                      .gpio           = 10,
++                      .active_low     = 1,
++              },
++              {
++                      .name           = "CPVA642:green:ether",
++                      .gpio           = 1,
++                      .active_low     = 1,
++              },
++              {
++                      .name           = "CPVA642:green:phone1",
++                      .gpio           = 4,
++                      .active_low     = 1,
++              },
++              {
++                      .name           = "CPVA642:green:phone2",
++                      .gpio           = 2,
++                      .active_low     = 1,
++              },
++              {
++                      .name           = "CPVA642:green:usb",
++                      .gpio           = 3,
++                      .active_low     = 1,
++              },
++    },
++
++      .buttons = {
++              {
++                      .desc           = "reset",
++                      .gpio           = 36,
++                      .active_low     = 1,
++                      .type           = EV_KEY,
++                      .code           = KEY_RESTART,
++                      .debounce_interval = BCM963XX_KEYS_DEBOUNCE_INTERVAL,
++              },
++              {
++                      .desc           = "wps",
++                      .gpio           = 37,
++                      .type           = EV_KEY,
++                      .code           = KEY_WPS_BUTTON,
++                      .debounce_interval = BCM963XX_KEYS_DEBOUNCE_INTERVAL,
++              },
++      },
++};
++
++
+ static struct board_info __initdata board_AGPFS0 = {
+       .name                           = "AGPF-S0",
+       .expected_cpu_id                = 0x6358,
+@@ -1361,6 +1451,7 @@ static const struct board_info __initdat
+       &board_96358vw,
+       &board_96358vw2,
+       &board_AGPFS0,
++      &board_CPVA642,
+       &board_DWVS0,
+       &board_nb4_ser_r0,
+       &board_nb4_ser_r1,
diff --git a/target/linux/brcm63xx/patches-3.6/504-board_dsl_274xb_rev_c.patch b/target/linux/brcm63xx/patches-3.6/504-board_dsl_274xb_rev_c.patch
new file mode 100644 (file)
index 0000000..890847e
--- /dev/null
@@ -0,0 +1,70 @@
+--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
++++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
+@@ -839,6 +839,59 @@ static struct board_info __initdata boar
+       .has_ohci0                      = 1,
+ };
++/* D-Link DSL-274xB revison C2/C3 */
++static struct board_info __initdata board_dsl_274xb_rev_c = {
++      .name                           = "AW4139",
++      .expected_cpu_id                = 0x6358,
++
++      .has_uart0                      = 1,
++      .has_enet1                      = 1,
++      .has_pci                        = 1,
++
++      .enet1 = {
++              .force_speed_100        = 1,
++              .force_duplex_full      = 1,
++      },
++
++      .leds = {
++              {
++                      .name           = "dsl-274xb:green:power",
++                      .gpio           = 5,
++                      .active_low     = 1,
++                      .default_trigger = "default-on",
++              },
++              {
++                      .name           = "dsl-274xb:red:power",
++                      .gpio           = 4,
++                      .active_low     = 1,
++              },
++              {
++                      .name           = "dsl-274xb:green:adsl",
++                      .gpio           = 9,
++                      .active_low     = 1,
++              },
++              {
++                      .name           = "dsl-274xb:green:internet",
++                      .gpio           = 2,
++              },
++              {
++                      .name           = "dsl-274xb:red:internet",
++                      .gpio           = 10,
++              },
++      },
++
++      .buttons = {
++              {
++                      .desc           = "reset",
++                      .gpio           = 34,
++                      .active_low     = 1,
++                      .type           = EV_KEY,
++                      .code           = KEY_RESTART,
++                      .debounce_interval = BCM963XX_KEYS_DEBOUNCE_INTERVAL,
++              },
++      },
++};
++
+ struct spi_gpio_platform_data nb4_spi_gpio_data = {
+       .sck            = NB4_SPI_GPIO_CLK,
+       .mosi           = NB4_SPI_GPIO_MOSI,
+@@ -1453,6 +1506,7 @@ static const struct board_info __initdat
+       &board_AGPFS0,
+       &board_CPVA642,
+       &board_DWVS0,
++      &board_dsl_274xb_rev_c,
+       &board_nb4_ser_r0,
+       &board_nb4_ser_r1,
+       &board_nb4_ser_r2,
diff --git a/target/linux/brcm63xx/patches-3.6/505-board_spw500v.patch b/target/linux/brcm63xx/patches-3.6/505-board_spw500v.patch
new file mode 100644 (file)
index 0000000..3c9cae4
--- /dev/null
@@ -0,0 +1,78 @@
+--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
++++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
+@@ -599,6 +599,67 @@ static struct board_info __initdata boar
+               },
+       },
+ };
++
++static struct board_info __initdata board_spw500v = {
++      .name                           = "SPW500V",
++      .expected_cpu_id                = 0x6348,
++
++      .has_uart0                      = 1,
++      .has_enet0                      = 1,
++      .has_pci                        = 1,
++
++      .enet0 = {
++              .has_phy                = 1,
++              .use_internal_phy       = 1,
++      },
++
++      .has_dsp                        = 1,
++      .dsp = {
++              .gpio_rst               = 6,
++              .gpio_int               = 34,
++              .ext_irq                = 2,
++              .cs                     = 2,
++      },
++
++      .leds = {
++              {
++                      .name           = "SPW500V:red:power",
++                      .gpio           = 1,
++                      .active_low     = 1,
++              },
++              {
++                      .name           = "SPW500V:green:power",
++                      .gpio           = 0,
++                      .active_low     = 1,
++                      .default_trigger = "default-on",
++              },
++              {
++                      .name           = "SPW500V:green:ppp",
++                      .gpio           = 3,
++                      .active_low     = 1,
++              },
++              {       .name           = "SPW500V:green:pstn",
++                      .gpio           = 28,
++                      .active_low     = 1,
++              },
++              {
++                      .name           = "SPW500V:green:voip",
++                      .gpio           = 32,
++                      .active_low     = 1,
++              },
++      },
++
++      .buttons = {
++              {
++                      .desc           = "reset",
++                      .gpio           = 33,
++                      .active_low     = 1,
++                      .type           = EV_KEY,
++                      .code           = KEY_RESTART,
++                      .debounce_interval = BCM963XX_KEYS_DEBOUNCE_INTERVAL,
++              },
++      },
++};
+ #endif
+ /*
+@@ -1498,6 +1559,7 @@ static const struct board_info __initdat
+       &board_96348gw_a,
+       &board_rta1025w_16,
+       &board_96348_D4PW,
++      &board_spw500v,
+ #endif
+ #ifdef CONFIG_BCM63XX_CPU_6358
diff --git a/target/linux/brcm63xx/patches-3.6/506-board_gw6200_gw6000.patch b/target/linux/brcm63xx/patches-3.6/506-board_gw6200_gw6000.patch
new file mode 100644 (file)
index 0000000..a265249
--- /dev/null
@@ -0,0 +1,124 @@
+--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
++++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
+@@ -468,6 +468,112 @@ static struct board_info __initdata boar
+       },
+ };
++static struct board_info __initdata board_gw6200 = {
++      .name                           = "GW6200",
++      .expected_cpu_id                = 0x6348,
++
++      .has_uart0                      = 1,
++      .has_enet0                      = 1,
++      .has_enet1                      = 1,
++      .has_pci                        = 1,
++
++      .enet0 = {
++              .has_phy                = 1,
++              .use_internal_phy       = 1,
++      },
++      .enet1 = {
++              .force_speed_100        = 1,
++              .force_duplex_full      = 1,
++      },
++
++      .has_ohci0 = 1,
++
++      .has_dsp                        = 1,
++              .dsp = {
++              .gpio_rst               = 8, /* FIXME: What is real GPIO here? */
++              .gpio_int               = 34,
++              .ext_irq                = 2,
++              .cs                     = 2,
++      },
++
++      .leds = {
++              {
++                      .name           = "GW6200:green:line1",
++                      .gpio           = 4,
++                      .active_low     = 1,
++              },
++              {
++                      .name           = "GW6200:green:line2",
++                      .gpio           = 5,
++                      .active_low     = 1,
++              },
++              {
++                      .name           = "GW6200:green:line3",
++                      .gpio           = 6,
++                      .active_low     = 1,
++              },
++              {
++                      .name           = "GW6200:green:tel",
++                      .gpio           = 7,
++                      .active_low     = 1,
++              },
++      },
++      .buttons = {
++              {
++                      .desc           = "reset",
++                      .gpio           = 36,
++                      .active_low     = 1,
++                      .type           = EV_KEY,
++                      .code           = KEY_RESTART,
++                      .debounce_interval = BCM963XX_KEYS_DEBOUNCE_INTERVAL,
++              },
++      },
++};
++
++static struct board_info __initdata board_gw6000 = {
++      .name                           = "GW6000",
++      .expected_cpu_id                = 0x6348,
++
++      .has_uart0                      = 1,
++      .has_enet0                      = 1,
++      .has_enet1                      = 1,
++      .has_pci                        = 1,
++
++      .enet0 = {
++              .has_phy                = 1,
++              .use_internal_phy       = 1,
++      },
++      .enet1 = {
++              .force_speed_100        = 1,
++              .force_duplex_full      = 1,
++      },
++
++      .has_ohci0 = 1,
++
++      .has_dsp                        = 1,
++      .dsp = {
++              .gpio_rst               = 6,
++              .gpio_int               = 34,
++              .ext_irq                = 2,
++              .cs                     = 2,
++      },
++
++      /* GW6000 has no GPIO-controlled leds */
++
++      .buttons = {
++              {
++                      .desc           = "reset",
++                      .gpio           = 36,
++                      .active_low     = 1,
++                      .type           = EV_KEY,
++                      .code           = KEY_RESTART,
++                      .debounce_interval = BCM963XX_KEYS_DEBOUNCE_INTERVAL,
++              },
++      },
++};
++
++
++
+ static struct board_info __initdata board_FAST2404 = {
+       .name                           = "F@ST2404",
+       .expected_cpu_id                = 0x6348,
+@@ -1552,6 +1658,8 @@ static const struct board_info __initdat
+ #ifdef CONFIG_BCM63XX_CPU_6348
+       &board_96348r,
+       &board_96348gw,
++      &board_gw6000,
++      &board_gw6200,
+       &board_96348gw_10,
+       &board_96348gw_11,
+       &board_FAST2404,
diff --git a/target/linux/brcm63xx/patches-3.6/507-board-MAGIC.patch b/target/linux/brcm63xx/patches-3.6/507-board-MAGIC.patch
new file mode 100644 (file)
index 0000000..2fa0bfe
--- /dev/null
@@ -0,0 +1,87 @@
+--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
++++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
+@@ -766,6 +766,76 @@ static struct board_info __initdata boar
+               },
+       },
+ };
++
++static struct board_info __initdata board_96348sv = {
++      .name                           = "MAGIC",
++      .expected_cpu_id                = 0x6348,
++
++      .has_uart0                      = 1,
++      .has_enet0                      = 1,
++      .has_enet1                      = 1,
++      .has_pci                        = 1,
++
++      .enet0 = {
++              .has_phy                = 1,
++              .use_internal_phy       = 1,
++      },
++      .enet1 = {
++              /* it has BP_ENET_EXTERNAL_PHY */
++              .force_speed_100        = 1,
++              .force_duplex_full      = 1,
++      },
++
++      .has_ohci0                      = 1,
++      .has_pccard                     = 1,
++      .has_ehci0                      = 1,
++
++      .has_dsp                        = 1,
++      .dsp = {
++              .gpio_rst               = 25,
++              .gpio_int               = 34,
++              .cs                     = 2,
++              .ext_irq                = 2,
++      },
++
++      .leds = {
++              {
++                      .name           = "MAGIC:green:voip",
++                      .gpio           = 22,
++                      .active_low     = 1,
++              },
++              {
++                      .name           = "MAGIC:green:adsl",
++                      .gpio           = 5,
++                      .active_low     = 1,
++              },
++              {
++                      .name           = "MAGIC:green:wifi",
++                      .gpio           = 28,
++              },
++              {
++                      .name           = "MAGIC:green:usb",
++                      .gpio           = 35,
++                      .active_low     = 1,
++              },
++              {
++                      .name           = "MAGIC:green:hpna",
++                      .gpio           = 4,
++                      .active_low     = 1,
++              },
++              {
++                      .name           = "MAGIC:green:power",
++                      .gpio           = 0,
++                      .active_low     = 1,
++                      .default_trigger = "default-on",
++              },
++              {
++                      .name           = "MAGIC:green:stop",
++                      .gpio           = 1,
++                      .active_low     = 1,
++              },
++      },
++};
+ #endif
+ /*
+@@ -1668,6 +1738,7 @@ static const struct board_info __initdat
+       &board_rta1025w_16,
+       &board_96348_D4PW,
+       &board_spw500v,
++      &board_96348sv,
+ #endif
+ #ifdef CONFIG_BCM63XX_CPU_6358
diff --git a/target/linux/brcm63xx/patches-3.6/508-board_hw553.patch b/target/linux/brcm63xx/patches-3.6/508-board_hw553.patch
new file mode 100644 (file)
index 0000000..451cf41
--- /dev/null
@@ -0,0 +1,91 @@
+--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
++++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
+@@ -1708,6 +1708,80 @@ static struct board_info __initdata boar
+       .spis = nb4_spi_devices,
+       .num_spis = ARRAY_SIZE(nb4_spi_devices),
+ };
++
++static struct board_info __initdata board_HW553 = {
++      .name                           = "HW553",
++      .expected_cpu_id                = 0x6358,
++
++      .has_uart0                      = 1,
++
++      .has_enet0                      = 1,
++      .has_enet1                      = 1,
++      .has_pci                        = 1,
++
++      .enet0 = {
++              .has_phy                = 1,
++              .use_internal_phy       = 1,
++      },
++
++      .enet1 = {
++              .force_speed_100        = 1,
++              .force_duplex_full      = 1,
++      },
++
++      .has_ohci0 = 1,
++      .has_ehci0 = 1,
++
++      .leds = {
++              {
++                      .name           = "HW553:red:lan",
++                      .gpio           = 34,
++                      .active_low     = 1,
++              },
++              {
++                      .name           = "HW553:blue:lan",
++                      .gpio           = 35,
++                      .active_low     = 1,
++              },
++              {
++                      .name           = "HW553:red:adsl",
++                      .gpio           = 22,
++                      .active_low     = 1,
++              },
++              {
++                      .name           = "HW553:blue:adsl",
++                      .gpio           = 23,
++                      .active_low     = 1,
++              },
++              {
++                      .name           = "HW553:red:power",
++                      .gpio           = 5,
++                      .active_low     = 1,
++                      .default_trigger = "default-on",
++              },
++
++              {
++                      .name           = "HW553:blue:power",
++                      .gpio           = 4,
++                      .active_low     = 1,
++              },
++              {
++                      .name           = "HW553:red:wifi",
++                      .gpio           = 25,
++                      .active_low     = 1,
++              },
++              {
++                      .name           = "HW553:red:internetkey",
++                      .gpio           = 12,
++                      .active_low     = 1,
++              },
++              {
++                      .name           = "HW553:blue:internetkey",
++                      .gpio           = 13,
++                      .active_low     = 1,
++              },
++      },
++};
+ #endif
+ /*
+@@ -1753,6 +1827,7 @@ static const struct board_info __initdat
+       &board_nb4_ser_r2,
+       &board_nb4_fxc_r1,
+       &board_nb4_fxc_r2,
++      &board_HW553,
+ #endif
+ };
diff --git a/target/linux/brcm63xx/patches-3.6/509-board_rta1320_16m.patch b/target/linux/brcm63xx/patches-3.6/509-board_rta1320_16m.patch
new file mode 100644 (file)
index 0000000..a0a2e96
--- /dev/null
@@ -0,0 +1,54 @@
+--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
++++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
+@@ -214,6 +214,43 @@ static struct board_info __initdata boar
+               },
+       },
+ };
++
++static struct board_info __initdata board_rta1320_16m = {
++      .name                           = "RTA1320_16M",
++      .expected_cpu_id                = 0x6338,
++
++      .has_uart0                      = 1,
++      .has_enet0                      = 1,
++
++      .enet0 = {
++              .force_speed_100        = 1,
++              .force_duplex_full      = 1,
++      },
++
++              .leds = {
++              {
++                      .name           = "RTA1320_16M:green:adsl",
++                      .gpio           = 3,
++                      .active_low     = 1,
++              },
++              {
++                      .name           = "RTA1320_16M:green:ppp",
++                      .gpio           = 4,
++                      .active_low     = 1,
++              },
++              {
++                      .name           = "RTA1320_16M:green:power",
++                      .gpio           = 0,
++                      .active_low     = 1,
++                      .default_trigger = "default-on",
++              },
++              {
++                      .name           = "RTA1320_16M:green:stop",
++                      .gpio           = 1,
++                      .active_low     = 1,
++              },
++      },
++};
+ #endif
+ /*
+@@ -1795,6 +1832,7 @@ static const struct board_info __initdat
+       &board_96338gw,
+       &board_96338w,
+       &board_96338w2_e7t,
++      &board_rta1320_16m,
+ #endif
+ #ifdef CONFIG_BCM63XX_CPU_6345
+       &board_96345gw2,
diff --git a/target/linux/brcm63xx/patches-3.6/510-board_spw303v.patch b/target/linux/brcm63xx/patches-3.6/510-board_spw303v.patch
new file mode 100644 (file)
index 0000000..188444a
--- /dev/null
@@ -0,0 +1,83 @@
+--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
++++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
+@@ -1819,6 +1819,72 @@ static struct board_info __initdata boar
+               },
+       },
+ };
++
++ /* T-Home Speedport W 303V Typ B */
++static struct board_info __initdata board_spw303v = {
++      .name                   = "96358-502V",
++      .expected_cpu_id        = 0x6358,
++
++      .has_uart0              = 1,
++      .has_enet0              = 1,
++      .has_pci                = 1,
++
++      .enet0 = {
++              .has_phy                = 1,
++              .use_internal_phy       = 1,
++      },
++
++      .leds = {
++              {
++                      .name           = "spw303v:green:power+adsl",
++                      .gpio           = 22,
++                      .active_low     = 1,
++              },
++              {
++                      .name           = "spw303v:red:power+adsl",
++                      .gpio           = 2,
++                      .active_low     = 1,
++              },
++              {
++                      .name           = "spw303v:green:ppp",
++                      .gpio           = 5,
++                      .active_low     = 1,
++              },
++              {
++                      .name           = "spw303v:green:ses",
++                      .gpio           = 0,
++                      .active_low     = 1,
++              },
++              {
++                      .name           = "spw303v:green:voip",
++                      .gpio           = 27,
++                      .active_low     = 1,
++              },
++              {
++                      .name           = "spw303v:green:pots",
++                      .gpio           = 31,
++                      .active_low     = 1,
++              },
++      },
++
++      .buttons = {
++              {
++                      .desc           = "reset",
++                      .gpio           = 11,
++                      .type           = EV_KEY,
++                      .code           = KEY_RESTART,
++                      .debounce_interval = BCM963XX_KEYS_DEBOUNCE_INTERVAL,
++              },
++              {
++                      .desc           = "ses",
++                      .gpio           = 37,
++                      .active_low     = 1,
++                      .type           = EV_KEY,
++                      .code           = KEY_WPS_BUTTON,
++                      .debounce_interval = BCM963XX_KEYS_DEBOUNCE_INTERVAL,
++              },
++      }
++};
+ #endif
+ /*
+@@ -1866,6 +1932,7 @@ static const struct board_info __initdat
+       &board_nb4_fxc_r1,
+       &board_nb4_fxc_r2,
+       &board_HW553,
++      &board_spw303v,
+ #endif
+ };
diff --git a/target/linux/brcm63xx/patches-3.6/511-board_V2500V.patch b/target/linux/brcm63xx/patches-3.6/511-board_V2500V.patch
new file mode 100644 (file)
index 0000000..1bd713a
--- /dev/null
@@ -0,0 +1,122 @@
+--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
++++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
+@@ -873,6 +873,63 @@ static struct board_info __initdata boar
+               },
+       },
+ };
++
++static struct board_info __initdata board_V2500V_BB = {
++      .name                           = "V2500V_BB",
++        .expected_cpu_id                = 0x6348,
++
++        .has_uart0                      = 1,
++        .has_enet0                      = 1,
++        .has_enet1                      = 1,
++        .has_pci                        = 1,
++
++        .enet0 = {
++                .has_phy                = 1,
++                .use_internal_phy       = 1,
++        },
++        .enet1 = {
++                .force_speed_100        = 1,
++                .force_duplex_full      = 1,
++      },
++
++      .leds = {
++              {
++                      .name           = "V2500V_BB:green:power",
++                      .gpio           = 0,
++                      .active_low     = 1,
++                      .default_trigger = "default-on",
++              },
++              {
++                      .name           = "V2500V_BB:red:power",
++                      .gpio           = 1,
++                      .active_low     = 1,
++              },
++              {
++                      .name           = "V2500V_BB:green:adsl",
++                      .gpio           = 2,
++                      .active_low     = 1,
++              },
++              {       .name           = "V2500V_BB:green:ppp",
++                      .gpio           = 3,
++                      .active_low     = 1,
++              },
++              {
++                      .name           = "V2500V_BB:green:wireless",
++                      .gpio           = 6,
++                      .active_low     = 1,
++              },
++      },
++      .buttons = {
++              {
++                      .desc           = "reset",
++                      .gpio           = 31,
++                      .active_low     = 1,
++                      .type           = EV_KEY,
++                      .code           = KEY_RESTART,
++                      .debounce_interval = BCM963XX_KEYS_DEBOUNCE_INTERVAL,
++              },
++      },
++};
+ #endif
+ /*
+@@ -1917,6 +1974,7 @@ static const struct board_info __initdat
+       &board_96348_D4PW,
+       &board_spw500v,
+       &board_96348sv,
++      &board_V2500V_BB,
+ #endif
+ #ifdef CONFIG_BCM63XX_CPU_6358
+@@ -2037,6 +2095,23 @@ void __init board_prom_init(void)
+               val &= MPI_CSBASE_BASE_MASK;
+       }
+       boot_addr = (u8 *)KSEG1ADDR(val);
++      printk(KERN_INFO PFX "Boot address 0x%08x\n",(unsigned int)boot_addr);
++
++      /* BT Voyager 2500V (RTA1046VW PCB) has 8 Meg flash used as two */
++      /* banks of 4 Meg. The byte at 0xBF800000 identifies the back to use.*/
++      /* Loading firmware from the CFE Prompt always loads to Bank 0 */
++      /* Do an early check of CFE and then select bank 0 */
++
++      if (boot_addr == (u8 *)0xbf800000) {
++              unsigned char board_name[16];
++              u8 *tmp_boot_addr;
++              tmp_boot_addr = (u8 *)0xbfc00000; // Address of Bank 0
++              memcpy(board_name, tmp_boot_addr + BCM963XX_NVRAM_OFFSET + offsetof(struct bcm963xx_nvram, name), sizeof(board_name));
++              if (!strcmp(board_name, "V2500V_BB")) {
++                      printk(KERN_INFO PFX "V2500V: nvram bank 0\n");
++                      boot_addr = (u8 *)0xbfc00000; // Bank 0
++              }
++      }
+       /* dump cfe version */
+       cfe = boot_addr + BCM963XX_CFE_VERSION_OFFSET;
+--- a/arch/mips/bcm63xx/dev-flash.c
++++ b/arch/mips/bcm63xx/dev-flash.c
+@@ -19,6 +19,7 @@
+ #include <linux/spi/spi.h>
+ #include <linux/spi/flash.h>
++#include <bcm63xx_board.h>
+ #include <bcm63xx_cpu.h>
+ #include <bcm63xx_dev_flash.h>
+ #include <bcm63xx_dev_hsspi.h>
+@@ -162,6 +163,13 @@ int __init bcm63xx_flash_register(int nu
+               val = bcm_mpi_readl(MPI_CSBASE_REG(0));
+               val &= MPI_CSBASE_BASE_MASK;
++              /* BT Voyager 2500V has 8 Meg flash in two 4 Meg banks */
++              /* Loading from CFE always uses Bank 0 */
++              if (!strcmp(board_get_name(), "V2500V_BB")) {
++                      pr_info("V2500V: Start in Bank 0\n");
++                      val = val + 0x400000; // Select Bank 0 start address
++              }
++
+               mtd_resources[0].start = val;
+               mtd_resources[0].end = 0x1FFFFFFF;
diff --git a/target/linux/brcm63xx/patches-3.6/512-board_BTV2110.patch b/target/linux/brcm63xx/patches-3.6/512-board_BTV2110.patch
new file mode 100644 (file)
index 0000000..67eeb7a
--- /dev/null
@@ -0,0 +1,73 @@
+--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
++++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
+@@ -437,6 +437,62 @@ static struct board_info __initdata boar
+       },
+ };
++
++/* BT Voyager 2110 */
++static struct board_info __initdata board_V2110 = {
++      .name                           = "V2110",
++      .expected_cpu_id                = 0x6348,
++
++      .has_uart0                      = 1,
++      .has_enet1                      = 1,
++      .has_pci                        = 1,
++
++      .enet1 = {
++              .force_speed_100        = 1,
++              .force_duplex_full      = 1,
++      },
++
++      .leds = {
++              {
++                      .name           = "V2110:green:power",
++                      .gpio           = 0,
++                      .active_low     = 1,
++                      .default_trigger = "default-on",
++              },
++              {
++                      .name           = "V2110:red:power",
++                      .gpio           = 1,
++                      .active_low     = 1,
++              },
++              {
++                      .name           = "V2110:green:adsl",
++                      .gpio           = 2,
++                      .active_low     = 1,
++              },
++              {       .name           = "V2110:green:ppp",
++                      .gpio           = 3,
++                      .active_low     = 1,
++              },
++              {
++                      .name           = "V2110:green:wireless",
++                      .gpio           = 6,
++                      .active_low     = 1,
++              },
++      },
++
++      .buttons = {
++              {
++                      .desc           = "reset",
++                      .gpio           = 33,
++                      .active_low     = 1,
++                      .type           = EV_KEY,
++                      .code           = KEY_RESTART,
++                      .debounce_interval = BCM963XX_KEYS_DEBOUNCE_INTERVAL,
++              },
++      },
++};
++
++
+ static struct board_info __initdata board_96348gw = {
+       .name                           = "96348GW",
+       .expected_cpu_id                = 0x6348,
+@@ -1975,6 +2031,7 @@ static const struct board_info __initdat
+       &board_spw500v,
+       &board_96348sv,
+       &board_V2500V_BB,
++      &board_V2110,
+ #endif
+ #ifdef CONFIG_BCM63XX_CPU_6358
diff --git a/target/linux/brcm63xx/patches-3.6/513-board_livebox.patch b/target/linux/brcm63xx/patches-3.6/513-board_livebox.patch
new file mode 100644 (file)
index 0000000..8089307
--- /dev/null
@@ -0,0 +1,389 @@
+--- a/arch/mips/bcm63xx/boards/Kconfig
++++ b/arch/mips/bcm63xx/boards/Kconfig
+@@ -8,4 +8,10 @@ config BOARD_BCM963XX
+       select SSB
+        help
++config BOARD_LIVEBOX
++      bool "Inventel Livebox(es) boards"
++      select SSB
++      help
++       Inventel Livebox boards using the RedBoot bootloader.
++
+ endchoice
+--- a/arch/mips/bcm63xx/boards/Makefile
++++ b/arch/mips/bcm63xx/boards/Makefile
+@@ -1 +1,2 @@
+ obj-$(CONFIG_BOARD_BCM963XX)          += board_bcm963xx.o
++obj-$(CONFIG_BOARD_LIVEBOX)           += board_livebox.o
+--- /dev/null
++++ b/arch/mips/bcm63xx/boards/board_livebox.c
+@@ -0,0 +1,368 @@
++/*
++ * This file is subject to the terms and conditions of the GNU General Public
++ * License.  See the file "COPYING" in the main directory of this archive
++ * for more details.
++ *
++ * Copyright (C) 2008 Florian Fainelli <florian@openwrt.org>
++ */
++
++#include <linux/init.h>
++#include <linux/kernel.h>
++#include <linux/string.h>
++#include <linux/platform_device.h>
++#include <linux/mtd/mtd.h>
++#include <linux/mtd/partitions.h>
++#include <linux/mtd/physmap.h>
++#include <linux/ssb/ssb.h>
++#include <linux/gpio_keys.h>
++#include <linux/input.h>
++#include <linux/spi/spi.h>
++#include <asm/addrspace.h>
++#include <bcm63xx_board.h>
++#include <bcm63xx_cpu.h>
++#include <bcm63xx_dev_uart.h>
++#include <bcm63xx_regs.h>
++#include <bcm63xx_io.h>
++#include <bcm63xx_dev_pci.h>
++#include <bcm63xx_dev_enet.h>
++#include <bcm63xx_dev_dsp.h>
++#include <bcm63xx_dev_pcmcia.h>
++#include <bcm63xx_dev_usb_ohci.h>
++#include <bcm63xx_dev_usb_ehci.h>
++#include <bcm63xx_dev_spi.h>
++#include <board_bcm963xx.h>
++
++#define PFX   "board_livebox: "
++
++#define LIVEBOX_KEYS_POLL_INTERVAL    20
++#define LIVEBOX_KEYS_DEBOUNCE_INTERVAL        (LIVEBOX_KEYS_POLL_INTERVAL * 3)
++
++static unsigned int mac_addr_used = 0;
++static struct board_info board;
++
++/*
++ * known 6348 boards
++ */
++#ifdef CONFIG_BCM63XX_CPU_6348
++static struct board_info __initdata board_livebox_blue5g = {
++      .name                           = "Livebox-blue-5g",
++      .expected_cpu_id                = 0x6348,
++
++      .has_uart0                      = 1,
++      .has_enet0                      = 1,
++      .has_enet1                      = 1,
++      .has_pci                        = 1,
++
++      .enet0 = {
++              .has_phy                = 1,
++              .use_internal_phy       = 1,
++      },
++
++      .enet1 = {
++                .has_phy              = 1,
++                .phy_id               = 31,
++      },
++
++      .has_ohci0                      = 1,
++      .has_pccard                     = 1,
++
++      .has_dsp                        = 0, /*TODO some Liveboxes have dsp*/
++      .dsp = {
++              .gpio_rst               = 6, /*FIXME eth1 shares gpio6 with dsp?*/
++              .gpio_int               = 35,
++              .cs                     = 2,
++              .ext_irq                = 2,
++      },
++
++      .leds = {
++              {
++                      .name           = "Livebox-blue-5g::adsl-fail",
++                      .gpio           = 0,
++                      .active_low     = 0,
++                      .default_trigger = "default-on",
++              },
++              {
++                      .name           = "Livebox-blue-5g::adsl",
++                      .gpio           = 1,
++              },
++              {
++                      .name           = "Livebox-blue-5g::traffic",
++                      .gpio           = 2,
++              },
++              {
++                      .name           = "Livebox-blue-5g::phone",
++                      .gpio           = 3,
++              },
++              {
++                      .name           = "Livebox-blue-5g::wifi",
++                      .gpio           = 4,
++              },
++      },
++
++      .buttons = {
++              {
++                      .desc           = "BTN_1",
++                      .gpio           = 36,
++                      .active_low     = 1,
++                      .type           = EV_KEY,
++                      .code           = BTN_1,
++                      .debounce_interval = LIVEBOX_KEYS_DEBOUNCE_INTERVAL,
++              },
++              {
++                      .desc           = "BTN_2",
++                      .gpio           = 7,
++                      .active_low     = 1,
++                      .type           = EV_KEY,
++                      .code           = BTN_2,
++                      .debounce_interval = LIVEBOX_KEYS_DEBOUNCE_INTERVAL,
++              },
++
++      },
++};
++#endif
++
++/*
++ * all boards
++ */
++static const struct board_info __initdata *bcm963xx_boards[] = {
++#ifdef CONFIG_BCM63XX_CPU_6348
++      &board_livebox_blue5g
++#endif
++};
++/*
++ * return board name for /proc/cpuinfo
++ */
++const char *board_get_name(void)
++{
++      return board.name;
++}
++
++/*
++ * register & return a new board mac address
++ */
++static int board_get_mac_address(u8 *mac)
++{
++      u8 *p;
++      int count;
++
++      memcpy(mac, (u8 *)0xBEBFF377, ETH_ALEN);
++
++      p = mac + ETH_ALEN - 1;
++      count = mac_addr_used;
++
++      while (count--) {
++              do {
++                      (*p)++;
++                      if (*p != 0)
++                              break;
++                      p--;
++              } while (p != mac);
++      }
++
++      if (p == mac) {
++              printk(KERN_ERR PFX "unable to fetch mac address\n");
++              return -ENODEV;
++      }
++        mac_addr_used++;
++
++      return 0;
++}
++
++/*
++ * early init callback
++ */
++#define LIVEBOX_GPIO_DETECT_MASK      0x000000ff
++#define LIVEBOX_BOOT_ADDR             0x1e400000
++
++#define LIVEBOX_HW_BLUE5G_9           0x90
++
++void __init board_prom_init(void)
++{
++      u32 val;
++      u8 hw_version;
++
++      /* Get hardware version */
++      val = bcm_gpio_readl(GPIO_CTL_LO_REG);
++      val &= ~LIVEBOX_GPIO_DETECT_MASK;
++      bcm_gpio_writel(val, GPIO_CTL_LO_REG);
++
++      hw_version = bcm_gpio_readl(GPIO_DATA_LO_REG) & LIVEBOX_GPIO_DETECT_MASK;
++      switch (hw_version) {
++      case LIVEBOX_HW_BLUE5G_9:
++              printk(KERN_INFO PFX "Livebox BLUE5G.9\n");
++              memcpy(&board, bcm963xx_boards[0], sizeof(board));
++              break;
++      default:
++              printk(KERN_INFO PFX "Unknown livebox version: %02x\n", hw_version);
++              break;
++      }
++
++      /* use default livebox configuration */
++      memcpy(&board, bcm963xx_boards[0], sizeof(board));
++
++      /* setup pin multiplexing depending on board enabled device,
++       * this has to be done this early since PCI init is done
++       * inside arch_initcall */
++      val = 0;
++
++#ifdef CONFIG_PCI
++      if (board.has_pci) {
++              if (BCMCPU_IS_6348())
++                      val |= GPIO_MODE_6348_G2_PCI;
++      }
++#endif
++      if (board.has_pccard) {
++              if (BCMCPU_IS_6348())
++                      val |= GPIO_MODE_6348_G1_MII_PCCARD;
++      }
++
++      if (board.has_enet0 && !board.enet0.use_internal_phy) {
++              if (BCMCPU_IS_6348())
++                      val |= GPIO_MODE_6348_G3_EXT_MII |
++                              GPIO_MODE_6348_G0_EXT_MII;
++      }
++
++      if (board.has_enet1 && !board.enet1.use_internal_phy) {
++              if (BCMCPU_IS_6348())
++                      val |= GPIO_MODE_6348_G3_EXT_MII |
++                              GPIO_MODE_6348_G0_EXT_MII;
++                      printk(KERN_INFO PFX "resetting gpio6 for eth1...\n");
++                      gpio_request(6, "dsp_eth_rst");
++                      gpio_direction_output(6, 0);
++                      gpio_set_value(6, 1);
++      }
++
++      bcm_gpio_writel(val, GPIO_MODE_REG);
++}
++
++/*
++ * second stage init callback, good time to panic if we couldn't
++ * identify on which board we're running since early printk is working
++ */
++void __init board_setup(void)
++{
++      if (!board.name[0])
++              panic("unable to detect bcm963xx board");
++      printk(KERN_INFO PFX "board name: %s\n", board.name);
++
++      /* make sure we're running on expected cpu */
++      if (bcm63xx_get_cpu_id() != board.expected_cpu_id)
++              panic("unexpected CPU for bcm963xx board");
++}
++
++static struct physmap_flash_data flash_data = {
++      .width                  = 2,
++};
++
++static struct resource mtd_resources[] = {
++      {
++              .start          = 0,    /* filled at runtime */
++              .end            = 0,    /* filled at runtime */
++              .flags          = IORESOURCE_MEM,
++      }
++};
++
++static struct platform_device mtd_dev = {
++      .name                   = "physmap-flash",
++      .resource               = mtd_resources,
++      .num_resources          = ARRAY_SIZE(mtd_resources),
++      .dev                    = {
++              .platform_data  = &flash_data,
++      },
++};
++
++static struct gpio_led_platform_data bcm63xx_led_data;
++
++static struct platform_device bcm63xx_gpio_leds = {
++      .name                   = "leds-gpio",
++      .id                     = 0,
++      .dev.platform_data      = &bcm63xx_led_data,
++};
++
++static struct gpio_keys_platform_data bcm63xx_gpio_keys_data = {
++      .poll_interval  = LIVEBOX_KEYS_POLL_INTERVAL,
++};
++
++static struct platform_device bcm63xx_gpio_keys_device = {
++      .name           = "gpio-keys-polled",
++      .id             = 0,
++      .dev.platform_data = &bcm63xx_gpio_keys_data,
++};
++
++/*
++ * third stage init callback, register all board devices.
++ */
++int __init board_register_devices(void)
++{
++      u32 val;
++      int led_count = 0;
++      int button_count = 0;
++
++      if (board.has_uart0)
++              bcm63xx_uart_register(0);
++
++      if (board.has_uart1)
++              bcm63xx_uart_register(1);
++
++      if (board.has_pccard)
++              bcm63xx_pcmcia_register();
++
++      if (board.has_enet0 &&
++          !board_get_mac_address(board.enet0.mac_addr))
++              bcm63xx_enet_register(0, &board.enet0);
++
++      if (board.has_enet1 &&
++          !board_get_mac_address(board.enet1.mac_addr))
++              bcm63xx_enet_register(1, &board.enet1);
++
++      if (board.has_ehci0)
++              bcm63xx_ehci_register();
++
++      if (board.has_ohci0)
++              bcm63xx_ohci_register();
++
++      if (board.has_dsp)
++              bcm63xx_dsp_register(&board.dsp);
++
++      bcm63xx_spi_register();
++
++      if (board.num_devs)
++              platform_add_devices(board.devs, board.num_devs);
++
++      if (board.num_spis)
++              spi_register_board_info(board.spis, board.num_spis);
++
++
++      /* read base address of boot chip select (0) */
++      val = bcm_mpi_readl(MPI_CSBASE_REG(0));
++      val &= MPI_CSBASE_BASE_MASK;
++      if (val != LIVEBOX_BOOT_ADDR)
++              printk(KERN_NOTICE PFX "flash address is: 0x%08x, forcing to: 0x%08x\n",
++                      val, LIVEBOX_BOOT_ADDR);
++      mtd_resources[0].start = LIVEBOX_BOOT_ADDR;
++      mtd_resources[0].end = 0x1ebfffff;
++
++      platform_device_register(&mtd_dev);
++
++      /* count number of LEDs defined by this device */
++      while (led_count < ARRAY_SIZE(board.leds) && board.leds[led_count].name)
++              led_count++;
++
++      bcm63xx_led_data.num_leds = led_count;
++      bcm63xx_led_data.leds = board.leds;
++
++      platform_device_register(&bcm63xx_gpio_leds);
++
++      /* count number of BUTTONs defined by this device */
++      while (button_count < ARRAY_SIZE(board.buttons) && board.buttons[button_count].desc)
++              button_count++;
++
++      if (button_count) {
++              bcm63xx_gpio_keys_data.nbuttons = button_count;
++              bcm63xx_gpio_keys_data.buttons = board.buttons;
++
++              platform_device_register(&bcm63xx_gpio_keys_device);
++      }
++
++      return 0;
++}
diff --git a/target/linux/brcm63xx/patches-3.6/514-board_ct536_ct5621.patch b/target/linux/brcm63xx/patches-3.6/514-board_ct536_ct5621.patch
new file mode 100644 (file)
index 0000000..bee908a
--- /dev/null
@@ -0,0 +1,60 @@
+--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
++++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
+@@ -493,6 +493,49 @@ static struct board_info __initdata boar
+ };
++static struct board_info __initdata board_ct536_ct5621 = {
++      .name                           = "CT536_CT5621",
++      .expected_cpu_id                = 0x6348,
++
++      .has_uart0                      = 1,
++      .has_enet0                      = 0,
++      .has_enet1                      = 1,
++      .has_pci                        = 1,
++
++      .enet1 = {
++              .force_speed_100        = 1,
++              .force_duplex_full      = 1,
++      },
++
++      .has_ohci0 = 1,
++      .has_pccard = 1,
++      .has_ehci0 = 1,
++
++      .leds = {
++              {
++                      .name           = "CT536_CT5621:green:adsl-fail",
++                      .gpio           = 2,
++                      .active_low     = 1,
++              },
++              {
++                      .name           = "CT536_CT5621:green:power",
++                      .gpio           = 0,
++                      .active_low     = 1,
++                      .default_trigger = "default-on",
++              },
++      },
++      .buttons = {
++              {
++                      .desc           = "reset",
++                      .gpio           = 33,
++                      .active_low     = 1,
++                      .type           = EV_KEY,
++                      .code           = KEY_RESTART,
++                      .debounce_interval = BCM963XX_KEYS_DEBOUNCE_INTERVAL,
++              },
++      },
++};
++
+ static struct board_info __initdata board_96348gw = {
+       .name                           = "96348GW",
+       .expected_cpu_id                = 0x6348,
+@@ -2032,6 +2075,7 @@ static const struct board_info __initdat
+       &board_96348sv,
+       &board_V2500V_BB,
+       &board_V2110,
++      &board_ct536_ct5621,
+ #endif
+ #ifdef CONFIG_BCM63XX_CPU_6358
diff --git a/target/linux/brcm63xx/patches-3.6/515-board_DWV-S0_fixes.patch b/target/linux/brcm63xx/patches-3.6/515-board_DWV-S0_fixes.patch
new file mode 100644 (file)
index 0000000..34b8e1b
--- /dev/null
@@ -0,0 +1,19 @@
+--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
++++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
+@@ -1252,6 +1252,8 @@ static struct board_info __initdata boar
+       .name                           = "DWV-S0",
+       .expected_cpu_id                = 0x6358,
++      .has_uart0                      = 1,
++
+       .has_enet0                      = 1,
+       .has_enet1                      = 1,
+       .has_pci                        = 1,
+@@ -1267,6 +1269,7 @@ static struct board_info __initdata boar
+       },
+       .has_ohci0                      = 1,
++      .has_ehci0                      = 1,
+ };
+ /* D-Link DSL-274xB revison C2/C3 */
diff --git a/target/linux/brcm63xx/patches-3.6/516-board_96348A-122.patch b/target/linux/brcm63xx/patches-3.6/516-board_96348A-122.patch
new file mode 100644 (file)
index 0000000..b53e3a7
--- /dev/null
@@ -0,0 +1,78 @@
+--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
++++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
+@@ -536,6 +536,67 @@ static struct board_info __initdata boar
+       },
+ };
++static struct board_info __initdata board_96348A_122 = {
++      .name                           = "96348A-122",
++      .expected_cpu_id                = 0x6348,
++
++      .has_uart0                      = 1,
++      .has_enet1                      = 1,
++      .has_pci                        = 1,
++
++      .enet1 = {
++              .force_speed_100        = 1,
++              .force_duplex_full      = 1,
++      },
++
++      .has_ohci0 = 1,
++
++      .leds = {
++              {
++                      .name           = "96348A-122:green:power",
++                      .gpio           = 0,
++                      .active_low     = 1,
++                      .default_trigger = "default-on",
++              },
++              {
++                      .name           = "96348A-122:red:alarm",
++                      .gpio           = 2,
++                      .active_low     = 1,
++              },
++              {
++                      .name           = "96348A-122:green:wps",
++                      .gpio           = 6,
++                      .active_low     = 1,
++              },
++      },
++      .buttons = {
++              {
++                      .desc           = "reset",
++                      .gpio           = 33,
++                      .active_low     = 1,
++                      .type           = EV_KEY,
++                      .code           = KEY_RESTART,
++                      .debounce_interval = BCM963XX_KEYS_DEBOUNCE_INTERVAL,
++              },
++              {
++                      .desc           = "wlan",
++                      .gpio           = 34,
++                      .active_low     = 1,
++                      .type           = EV_KEY,
++                      .code           = KEY_WLAN,
++                      .debounce_interval = BCM963XX_KEYS_DEBOUNCE_INTERVAL,
++              },
++              {
++                      .desc           = "wps",
++                      .gpio           = 35,
++                      .active_low     = 1,
++                      .type           = EV_KEY,
++                      .code           = KEY_WPS_BUTTON,
++                      .debounce_interval = BCM963XX_KEYS_DEBOUNCE_INTERVAL,
++              },
++      },
++};
++
+ static struct board_info __initdata board_96348gw = {
+       .name                           = "96348GW",
+       .expected_cpu_id                = 0x6348,
+@@ -2079,6 +2140,7 @@ static const struct board_info __initdat
+       &board_V2500V_BB,
+       &board_V2110,
+       &board_ct536_ct5621,
++      &board_96348A_122,
+ #endif
+ #ifdef CONFIG_BCM63XX_CPU_6358
diff --git a/target/linux/brcm63xx/patches-3.6/517-RTA1205W_16_uart_fixes.patch b/target/linux/brcm63xx/patches-3.6/517-RTA1205W_16_uart_fixes.patch
new file mode 100644 (file)
index 0000000..b8223c7
--- /dev/null
@@ -0,0 +1,10 @@
+--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
++++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
+@@ -799,6 +799,7 @@ static struct board_info __initdata boar
+       .name                           = "RTA1025W_16",
+       .expected_cpu_id                = 0x6348,
++      .has_uart0                      = 1,
+       .has_enet0                      = 1,
+       .has_enet1                      = 1,
+       .has_pci                        = 1,
diff --git a/target/linux/brcm63xx/patches-3.6/519_board_CPVA502plus.patch b/target/linux/brcm63xx/patches-3.6/519_board_CPVA502plus.patch
new file mode 100644 (file)
index 0000000..38f4100
--- /dev/null
@@ -0,0 +1,55 @@
+--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
++++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
+@@ -1091,6 +1091,44 @@ static struct board_info __initdata boar
+               },
+       },
+ };
++
++static struct board_info __initdata board_CPVA502plus = {
++      .name                           = "CPVA502+",
++      .expected_cpu_id                = 0x6348,
++
++      .has_uart0                      = 1,
++      .has_enet0                      = 1,
++      .has_enet1                      = 1,
++      .has_pci                        = 1,
++
++      .enet0 = {
++              .has_phy                = 1,
++              .use_internal_phy       = 1,
++      },
++      .enet1 = {
++              .force_speed_100        = 1,
++              .force_duplex_full      = 1,
++      },
++
++      .leds = {
++              {
++                      .name           = "CPVA502+:green:phone",
++                      .gpio           = 0,
++                      .active_low     = 1,
++              },
++              {
++                      .name           = "CPVA502+:green:link",
++                      .gpio           = 5,
++                      .active_low     = 1,
++              },
++              {
++                      .name           = "CPVA502+:green:feth1", /* FIXME:does gpio4 enable eth1 phy? */
++                      .gpio           = 4,
++                      .active_low     = 1,
++              },
++      },
++};
++
+ #endif
+ /*
+@@ -2142,6 +2180,7 @@ static const struct board_info __initdat
+       &board_V2110,
+       &board_ct536_ct5621,
+       &board_96348A_122,
++      &board_CPVA502plus,
+ #endif
+ #ifdef CONFIG_BCM63XX_CPU_6358
diff --git a/target/linux/brcm63xx/patches-3.6/520-bcm63xx-add-support-for-96368MVWG-board.patch b/target/linux/brcm63xx/patches-3.6/520-bcm63xx-add-support-for-96368MVWG-board.patch
new file mode 100644 (file)
index 0000000..6dc5ef3
--- /dev/null
@@ -0,0 +1,128 @@
+From eeacc2529942051504bc957726aa178671344421 Mon Sep 17 00:00:00 2001
+From: Maxime Bizon <mbizon@freebox.fr>
+Date: Wed, 20 Jan 2010 16:21:30 +0100
+Subject: [PATCH 32/63] bcm63xx: add support for 96368MVWG board.
+
+---
+ arch/mips/bcm63xx/boards/board_bcm963xx.c          |   95 ++++++++++++++++++++
+ .../mips/include/asm/mach-bcm63xx/board_bcm963xx.h |    2 +
+ 2 files changed, 97 insertions(+), 0 deletions(-)
+
+--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
++++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
+@@ -2147,6 +2147,78 @@ static struct board_info __initdata boar
+ #endif
+ /*
++ * known 6368 boards
++ */
++#ifdef CONFIG_BCM63XX_CPU_6368
++static struct board_info __initdata board_96368mvwg = {
++      .name                           = "96368MVWG",
++      .expected_cpu_id                = 0x6368,
++
++      .has_uart0                      = 1,
++      .has_pci                        = 1,
++      .has_enetsw                     = 1,
++
++      .enetsw = {
++              .used_ports = {
++                      [1] = {
++                              .used   = 1,
++                              .phy_id = 2,
++                              .name   = "port1",
++                      },
++
++                      [2] = {
++                              .used   = 1,
++                              .phy_id = 3,
++                              .name   = "port2",
++                      },
++
++                      [4] = {
++                              .used   = 1,
++                              .phy_id = 0x12,
++                              .name   = "port0",
++                      },
++
++                      [5] = {
++                              .used   = 1,
++                              .phy_id = 0x11,
++                              .name   = "port3",
++                      },
++              },
++      },
++
++      .leds = {
++              {
++                      .name           = "96368MVWG:green:adsl",
++                      .gpio           = 2,
++                      .active_low     = 1,
++              },
++              {
++                      .name           = "96368MVWG:green:ppp",
++                      .gpio           = 5,
++              },
++              {
++                      .name           = "96368MVWG:green:power",
++                      .gpio           = 22,
++                      .active_low     = 1,
++                      .default_trigger = "default-on",
++              },
++              {
++                      .name           = "96368MVWG:green:wps",
++                      .gpio           = 23,
++                      .active_low     = 1,
++              },
++              {
++                      .name           = "96368MVWG:green:ppp-fail",
++                      .gpio           = 31,
++              },
++      },
++
++      .has_ohci0 = 1,
++      .has_ehci0 = 1,
++};
++#endif
++
++/*
+  * all boards
+  */
+ static const struct board_info __initdata *bcm963xx_boards[] = {
+@@ -2198,6 +2270,10 @@ static const struct board_info __initdat
+       &board_HW553,
+       &board_spw303v,
+ #endif
++
++#ifdef CONFIG_BCM63XX_CPU_6368
++      &board_96368mvwg,
++#endif
+ };
+ /*
+@@ -2369,12 +2445,25 @@ void __init board_prom_init(void)
+               bcm63xx_pci_enabled = 1;
+               if (BCMCPU_IS_6348())
+                       val |= GPIO_MODE_6348_G2_PCI;
++
++              if (BCMCPU_IS_6368())
++                      val |= GPIO_MODE_6368_PCI_REQ1 |
++                              GPIO_MODE_6368_PCI_GNT1 |
++                              GPIO_MODE_6368_PCI_INTB |
++                              GPIO_MODE_6368_PCI_REQ0 |
++                              GPIO_MODE_6368_PCI_GNT0;
+       }
+ #endif
+       if (board.has_pccard) {
+               if (BCMCPU_IS_6348())
+                       val |= GPIO_MODE_6348_G1_MII_PCCARD;
++
++              if (BCMCPU_IS_6368())
++                      val |= GPIO_MODE_6368_PCMCIA_CD1 |
++                              GPIO_MODE_6368_PCMCIA_CD2 |
++                              GPIO_MODE_6368_PCMCIA_VS1 |
++                              GPIO_MODE_6368_PCMCIA_VS2;
+       }
+       if (board.has_enet0 && !board.enet0.use_internal_phy) {
diff --git a/target/linux/brcm63xx/patches-3.6/521-bcm63xx-add-support-for-96368MVNgr-board.patch b/target/linux/brcm63xx/patches-3.6/521-bcm63xx-add-support-for-96368MVNgr-board.patch
new file mode 100644 (file)
index 0000000..4b45fdf
--- /dev/null
@@ -0,0 +1,92 @@
+From f457fc2eb9bb915b5a4d251c7c68d4694cf07b01 Mon Sep 17 00:00:00 2001
+From: Maxime Bizon <mbizon@freebox.fr>
+Date: Fri, 4 Nov 2011 12:33:48 +0100
+Subject: [PATCH 33/63] bcm63xx: add support for 96368MVNgr board.
+
+---
+ arch/mips/bcm63xx/boards/board_bcm963xx.c |   67 +++++++++++++++++++++++++++++
+ 1 files changed, 67 insertions(+), 0 deletions(-)
+
+--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
++++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
+@@ -2216,6 +2216,72 @@ static struct board_info __initdata boar
+       .has_ohci0 = 1,
+       .has_ehci0 = 1,
+ };
++
++static struct board_info __initdata board_96368mvngr = {
++      .name                           = "96368MVNgr",
++      .expected_cpu_id                = 0x6368,
++
++      .has_uart0                      = 1,
++      .has_pci                        = 1,
++      .has_enetsw                     = 1,
++
++      .enetsw = {
++              .used_ports = {
++                      [0] = {
++                              .used   = 1,
++                              .phy_id = 1,
++                              .name   = "port1",
++                      },
++
++                      [1] = {
++                              .used   = 1,
++                              .phy_id = 2,
++                              .name   = "port2",
++                      },
++
++                      [2] = {
++                              .used   = 1,
++                              .phy_id = 3,
++                              .name   = "port3",
++                      },
++
++                      [3] = {
++                              .used   = 1,
++                              .phy_id = 4,
++                              .name   = "port4",
++                      },
++              },
++      },
++
++      .leds = {
++              {
++                      .name           = "96368MVNgr:green:adsl",
++                      .gpio           = 2,
++                      .active_low     = 1,
++              },
++              {
++                      .name           = "96368MVNgr:green:inet",
++                      .gpio           = 5,
++              },
++              {
++                      .name           = "96368MVNgr:green:power",
++                      .gpio           = 22,
++                      .default_trigger = "default-on",
++              },
++              {
++                      .name           = "96368MVNgr:green:wps",
++                      .gpio           = 23,
++                      .active_low     = 1,
++              },
++              {
++                      .name           = "96368MVNgr:green:inet-fail",
++                      .gpio           = 3,
++              },
++      },
++
++      .has_ohci0 = 1,
++      .has_ehci0 = 1,
++};
+ #endif
+ /*
+@@ -2273,6 +2339,7 @@ static const struct board_info __initdat
+ #ifdef CONFIG_BCM63XX_CPU_6368
+       &board_96368mvwg,
++      &board_96368mvngr,
+ #endif
+ };
diff --git a/target/linux/brcm63xx/patches-3.6/522-MIPS-BCM63XX-add-96328avng-reference-board.patch b/target/linux/brcm63xx/patches-3.6/522-MIPS-BCM63XX-add-96328avng-reference-board.patch
new file mode 100644 (file)
index 0000000..7e04614
--- /dev/null
@@ -0,0 +1,67 @@
+From c93c2bbf0cc96da5a47d77f01daf6c983cfe4216 Mon Sep 17 00:00:00 2001
+From: Jonas Gorski <jonas.gorski@gmail.com>
+Date: Tue, 29 May 2012 10:52:25 +0200
+Subject: [PATCH] MIPS: BCM63XX: add 96328avng reference board
+
+---
+ arch/mips/bcm63xx/boards/board_bcm963xx.c |   77 +++++++++++++++++++++++++++++
+ 1 files changed, 77 insertions(+), 0 deletions(-)
+
+--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
++++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
+@@ -64,13 +64,45 @@ static struct board_info __initdata boar
+       .has_uart0                      = 1,
+       .has_pci                        = 1,
++      .has_enetsw                     = 1,
++
++      .enetsw = {
++              .used_ports = {
++                      [0] = {
++                              .used   = 1,
++                              .phy_id = 1,
++                              .name   = "Port 1",
++                      },
++                      [1] = {
++                              .used   = 1,
++                              .phy_id = 2,
++                              .name   = "Port 2",
++                      },
++                      [2] = {
++                              .used   = 1,
++                              .phy_id = 3,
++                              .name   = "Port 3",
++                      },
++                      [3] = {
++                              .used   = 1,
++                              .phy_id = 4,
++                              .name   = "Port 4",
++                      },
++              },
++      },
++
+       .leds = {
+               {
+-                      .name           = "96328avng::ppp-fail",
++                      .name           = "96328avng::internet-fail",
+                       .gpio           = 2,
+                       .active_low     = 1,
+               },
+               {
++                      .name           = "96328avng::dsl",
++                      .gpio           = 3,
++                      .active_low     = 1,
++              },
++              {
+                       .name           = "96328avng::power",
+                       .gpio           = 4,
+                       .active_low     = 1,
+@@ -87,7 +119,7 @@ static struct board_info __initdata boar
+                       .active_low     = 1,
+               },
+               {
+-                      .name           = "96328avng::ppp",
++                      .name           = "96328avng::internet",
+                       .gpio           = 11,
+                       .active_low     = 1,
+               },
diff --git a/target/linux/brcm63xx/patches-3.6/523-MIPS-BCM63XX-add-963281TAN-reference-board.patch b/target/linux/brcm63xx/patches-3.6/523-MIPS-BCM63XX-add-963281TAN-reference-board.patch
new file mode 100644 (file)
index 0000000..1b5d369
--- /dev/null
@@ -0,0 +1,96 @@
+From f0649f7b7c672cf452a1796a1422bf615e1973f8 Mon Sep 17 00:00:00 2001
+From: Jonas Gorski <jonas.gorski@gmail.com>
+Date: Tue, 29 May 2012 11:01:12 +0200
+Subject: [PATCH] MIPS: BCM63XX: add 963281TAN reference board
+
+---
+ arch/mips/bcm63xx/boards/board_bcm963xx.c |   71 +++++++++++++++++++++++++++++
+ 1 files changed, 71 insertions(+), 0 deletions(-)
+
+--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
++++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
+@@ -125,6 +125,76 @@ static struct board_info __initdata boar
+               },
+       },
+ };
++
++static struct board_info __initdata board_963281TAN = {
++      .name                           = "963281TAN",
++      .expected_cpu_id                = 0x6328,
++
++      .has_uart0                      = 1,
++      .has_pci                        = 1,
++
++      .has_enetsw                     = 1,
++
++      .enetsw = {
++              .used_ports = {
++                      [0] = {
++                              .used   = 1,
++                              .phy_id = 1,
++                              .name   = "Port 1",
++                      },
++                      [1] = {
++                              .used   = 1,
++                              .phy_id = 2,
++                              .name   = "Port 2",
++                      },
++                      [2] = {
++                              .used   = 1,
++                              .phy_id = 3,
++                              .name   = "Port 3",
++                      },
++                      [3] = {
++                              .used   = 1,
++                              .phy_id = 4,
++                              .name   = "Port 4",
++                      },
++              },
++      },
++
++      .leds = {
++              {
++                      .name           = "963281TAN::internet",
++                      .gpio           = 1,
++                      .active_low     = 1,
++              },
++              {
++                      .name           = "963281TAN::power",
++                      .gpio           = 4,
++                      .active_low     = 1,
++                      .default_trigger = "default-on",
++              },
++              {
++                      .name           = "963281TAN::internet-fail",
++                      .gpio           = 7,
++                      .active_low     = 1,
++              },
++              {
++                      .name           = "963281TAN::power-fail",
++                      .gpio           = 8,
++                      .active_low     = 1,
++              },
++              {
++                      .name           = "963281TAN::wps",
++                      .gpio           = 9,
++                      .active_low     = 1,
++              },
++              {
++                      .name           = "963281TAN::dsl",
++                      .gpio           = 11,
++                      .active_low     = 1,
++              },
++
++      },
++};
+ #endif
+ /*
+@@ -2322,6 +2392,7 @@ static struct board_info __initdata boar
+ static const struct board_info __initdata *bcm963xx_boards[] = {
+ #ifdef CONFIG_BCM63XX_CPU_6328
+       &board_96328avng,
++      &board_963281TAN,
+ #endif
+ #ifdef CONFIG_BCM63XX_CPU_6338
+       &board_96338gw,
diff --git a/target/linux/brcm63xx/patches-3.6/524-board_dsl_274xb_rev_f.patch b/target/linux/brcm63xx/patches-3.6/524-board_dsl_274xb_rev_f.patch
new file mode 100644 (file)
index 0000000..b339d74
--- /dev/null
@@ -0,0 +1,130 @@
+From 66808f706b3dcd83a9f5157997ff478a880a2906 Mon Sep 17 00:00:00 2001
+From: Jonas Gorski <jonas.gorski@gmail.com>
+Date: Mon, 30 Apr 2012 09:10:51 +0200
+Subject: [PATCH 70/79] MIPS: BCM63XX: Add board definition for D-Link
+ DSL-274xB rev F1
+
+---
+ arch/mips/bcm63xx/boards/board_bcm963xx.c |  104 +++++++++++++++++++++++++++++
+ 1 files changed, 104 insertions(+), 0 deletions(-)
+
+--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
++++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
+@@ -195,6 +195,109 @@ static struct board_info __initdata boar
+       },
+ };
++
++static struct board_info __initdata board_dsl_274xb_f1 = {
++      .name                           = "AW4339U",
++      .expected_cpu_id                = 0x6328,
++
++      .has_uart0                      = 1,
++      .has_pci                        = 1,
++
++      .has_caldata                    = 1,
++      .caldata = {
++              {
++                      .caldata_offset = 0x7d1000,
++                      .slot           = 0,
++              },
++      },
++
++      .has_enetsw                     = 1,
++
++      .enetsw = {
++              .used_ports = {
++                      [0] = {
++                              .used   = 1,
++                              .phy_id = 1,
++                              .name   = "Port 4",
++                      },
++                      [1] = {
++                              .used   = 1,
++                              .phy_id = 2,
++                              .name   = "Port 3",
++                      },
++                      [2] = {
++                              .used   = 1,
++                              .phy_id = 3,
++                              .name   = "Port 2",
++                      },
++                      [3] = {
++                              .used   = 1,
++                              .phy_id = 4,
++                              .name   = "Port 1",
++                      },
++              },
++      },
++
++      .leds = {
++              {
++                      .name           = "dsl-274xb:red:internet",
++                      .gpio           = 2,
++                      .active_low     = 1,
++              },
++              {
++                      .name           = "dsl-274xb:green:dsl",
++                      .gpio           = 3,
++                      .active_low     = 1,
++              },
++              {
++                      .name           = "dsl-274xb:green:power",
++                      .gpio           = 4,
++                      .active_low     = 1,
++                      .default_trigger = "default-on",
++              },
++              {
++                      .name           = "dsl-274xb:red:power",
++                      .gpio           = 8,
++                      .active_low     = 1,
++              },
++              {
++                      .name           = "dsl-274xb:blue:wps",
++                      .gpio           = 9,
++                      .active_low     = 1,
++              },
++              {
++                      .name           = "dsl-274xb:green:internet",
++                      .gpio           = 11,
++                      .active_low     = 1,
++              },
++      },
++
++      .buttons = {
++              {
++                      .desc           = "wifi",
++                      .gpio           = 10,
++                      .active_low     = 1,
++                      .type           = EV_KEY,
++                      .code           = BTN_0,
++                      .debounce_interval = BCM963XX_KEYS_DEBOUNCE_INTERVAL,
++              },
++              {
++                      .desc           = "reset",
++                      .gpio           = 23,
++                      .active_low     = 1,
++                      .type           = EV_KEY,
++                      .code           = KEY_RESTART,
++                      .debounce_interval = BCM963XX_KEYS_DEBOUNCE_INTERVAL,
++              },
++              {
++                      .desc           = "wps",
++                      .gpio           = 24,
++                      .active_low     = 1,
++                      .code           = KEY_WPS_BUTTON,
++                      .debounce_interval = BCM963XX_KEYS_DEBOUNCE_INTERVAL,
++              },
++      },
++};
+ #endif
+ /*
+@@ -2393,6 +2496,7 @@ static const struct board_info __initdat
+ #ifdef CONFIG_BCM63XX_CPU_6328
+       &board_96328avng,
+       &board_963281TAN,
++      &board_dsl_274xb_f1,
+ #endif
+ #ifdef CONFIG_BCM63XX_CPU_6338
+       &board_96338gw,
diff --git a/target/linux/brcm63xx/patches-3.6/525-board_96348w3.patch b/target/linux/brcm63xx/patches-3.6/525-board_96348w3.patch
new file mode 100644 (file)
index 0000000..76425cd
--- /dev/null
@@ -0,0 +1,68 @@
+--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
++++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
+@@ -1334,6 +1334,57 @@ static struct board_info __initdata boar
+       },
+ };
++/* NetGear DG834G v4 */
++static struct board_info __initdata board_96348W3 = {
++      .name                           = "96348W3",
++      .expected_cpu_id                = 0x6348,
++
++      .has_uart0                      = 1,
++      .has_enet1                      = 1,
++      .has_pci                        = 1,
++
++      .enet1 = {
++              .force_speed_100        = 1,
++              .force_duplex_full      = 1,
++      },
++
++      .has_ohci0                      = 1,
++
++      .leds = {
++              {
++                      .name           = "96348W3:green:power",
++                      .gpio           = 0,
++                      .active_low     = 1,
++                      .default_trigger = "default-on",
++              },
++              {
++                      .name           = "96348W3:red:power",
++                      .gpio           = 1,
++                      .active_low     = 1,
++              },
++              {
++                      .name           = "96348W3::adsl",
++                      .gpio           = 2,
++                      .active_low     = 1,
++              },
++              {
++                      .name           = "96348W3::internet",
++                      .gpio           = 3,
++                      .active_low     = 1,
++              },
++      },
++      .buttons = {
++                      {
++                      .desc           = "reset",
++                      .gpio           = 6,
++                      .active_low     = 1,
++                      .type           = EV_KEY,
++                      .code           = KEY_RESTART,
++                      .debounce_interval = BCM963XX_KEYS_DEBOUNCE_INTERVAL,
++                      },
++      },
++};
++
+ #endif
+ /*
+@@ -2526,6 +2577,7 @@ static const struct board_info __initdat
+       &board_ct536_ct5621,
+       &board_96348A_122,
+       &board_CPVA502plus,
++      &board_96348W3,
+ #endif
+ #ifdef CONFIG_BCM63XX_CPU_6358
diff --git a/target/linux/brcm63xx/patches-3.6/526-board_CT6373-1.patch b/target/linux/brcm63xx/patches-3.6/526-board_CT6373-1.patch
new file mode 100644 (file)
index 0000000..58b209e
--- /dev/null
@@ -0,0 +1,136 @@
+--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
++++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
+@@ -51,6 +51,13 @@
+ #define NB4_SPI_GPIO_CLK      6
+ #define NB4_74HC64_GPIO(X)    (NB4_74X164_GPIO_BASE + (X))
++#define CT6373_PID_OFFSET             0xff80
++#define CT6373_74X164_GPIO_BASE       64
++#define CT6373_SPI_GPIO_MOSI  7
++#define CT6373_SPI_GPIO_CLK           6
++#define CT6373_74HC64_GPIO(X) (CT6373_74X164_GPIO_BASE + (X))
++
++
+ static struct board_info board;
+ /*
+@@ -2261,6 +2268,111 @@ static struct board_info __initdata boar
+       .num_spis = ARRAY_SIZE(nb4_spi_devices),
+ };
++
++struct spi_gpio_platform_data ct6373_spi_gpio_data = {
++      .sck            = CT6373_SPI_GPIO_CLK,
++      .mosi           = CT6373_SPI_GPIO_MOSI,
++      .miso           = SPI_GPIO_NO_MISO,
++      .num_chipselect = 1,
++};
++
++static struct platform_device ct6373_spi_gpio = {
++      .name = "spi_gpio",
++      .id   = 1,
++      .dev = {
++              .platform_data = &ct6373_spi_gpio_data,
++      },
++};
++
++static struct platform_device * __initdata ct6373_devices[] = {
++      &ct6373_spi_gpio,
++};
++
++const struct gen_74x164_chip_platform_data ct6373_74x164_platform_data = {
++      .base = CT6373_74X164_GPIO_BASE
++};
++
++static struct spi_board_info ct6373_spi_devices[] = {
++      {
++              .modalias = "74x164",
++              .max_speed_hz = 781000,
++              .bus_num = 1,
++              .controller_data = (void *) SPI_GPIO_NO_CHIPSELECT,
++              .mode = SPI_MODE_0,
++              .platform_data = &ct6373_74x164_platform_data
++      }
++};
++
++static struct board_info __initdata board_ct6373_1 = {
++      .name                           = "CT6373-1",
++      .expected_cpu_id        = 0x6358,
++
++      .has_uart0                      = 1,
++      .has_pci                        = 1,
++      .has_ohci0                      = 1,
++      .has_ehci0                      = 1,
++
++      .has_enet1                      = 1,
++      .enet1 = {
++              .force_speed_100        = 1,
++              .force_duplex_full      = 1,
++      },
++
++      .leds = {
++              {
++                      .name           = "CT6373-1:green:power",
++                      .gpio           = 0,
++                      .default_trigger = "default-on",
++              },
++              {
++                      .name           = "CT6373-1:green:usb",
++                      .gpio           = 3,
++                      .active_low     = 1,
++              },
++              {
++                      .name           = "CT6373-1:green:wlan",
++                      .gpio           = 9,
++                      .active_low     = 1,
++              },
++              {
++                      .name           = "CT6373-1:green:adsl",
++                      .gpio           = CT6373_74HC64_GPIO(0),
++                      .active_low     = 1,
++              },
++              {
++                      .name           = "CT6373-1:green:line",
++                      .gpio           = CT6373_74HC64_GPIO(1),
++                      .active_low     = 1,
++              },
++              {
++                      .name           = "CT6373-1:green:fxs1",
++                      .gpio           = CT6373_74HC64_GPIO(2),
++                      .active_low     = 1,
++              },
++              {
++                      .name           = "CT6373-1:green:fxs2",
++                      .gpio           = CT6373_74HC64_GPIO(3),
++                      .active_low     = 1,
++              },
++      },
++
++      .buttons = {
++              {
++                      .desc           = "reset",
++                      .gpio           = 35,
++                      .active_low     = 1,
++                      .type           = EV_KEY,
++                      .code           = KEY_RESTART,
++                      .debounce_interval = BCM963XX_KEYS_DEBOUNCE_INTERVAL,
++              },
++      },
++
++      .devs = ct6373_devices,
++      .num_devs = ARRAY_SIZE(ct6373_devices),
++      .spis = ct6373_spi_devices,
++      .num_spis = ARRAY_SIZE(ct6373_spi_devices),
++};
++
+ static struct board_info __initdata board_HW553 = {
+       .name                           = "HW553",
+       .expected_cpu_id                = 0x6358,
+@@ -2592,6 +2704,7 @@ static const struct board_info __initdat
+       &board_nb4_ser_r2,
+       &board_nb4_fxc_r1,
+       &board_nb4_fxc_r2,
++      &board_ct6373_1,
+       &board_HW553,
+       &board_spw303v,
+ #endif
diff --git a/target/linux/brcm63xx/patches-3.6/527-board_dva-g3810bn-tl-1.patch b/target/linux/brcm63xx/patches-3.6/527-board_dva-g3810bn-tl-1.patch
new file mode 100644 (file)
index 0000000..fe47dc6
--- /dev/null
@@ -0,0 +1,82 @@
+--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
++++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
+@@ -2512,6 +2512,71 @@ static struct board_info __initdata boar
+               },
+       }
+ };
++
++/* D-Link DVA-G3810BN/TL */
++static struct board_info __initdata board_DVAG3810BN = {
++      .name                   = "DVAG3810BN",
++      .expected_cpu_id        = 0x6358,
++
++      .has_uart0              = 1,
++      .has_enet0              = 1,
++      .has_enet1              = 1,
++      .has_pci                = 1,
++
++      .enet0 = {
++              .has_phy                = 0,
++              .use_internal_phy       = 1,
++              .force_speed_100        = 1,
++              .force_duplex_full      = 1,
++      },
++
++      .enet1 = {
++              .force_speed_100        = 1,
++              .force_duplex_full      = 1,
++      },
++
++
++      .has_ohci0              = 1,
++      .has_pccard             = 1,
++      .has_ehci0              = 1,
++
++      .leds = {
++              {
++                      .name   = "DVAG3810BN::voip",
++                      .gpio   = 1,
++              },
++              {
++                      .name   = "DVAG3810BN::dsl",
++                      .gpio   = 22,
++                      .active_low  = 1,
++              },
++              {
++                      .name   = "DVAG3810BN::internet",
++                      .gpio   = 23,
++                      .active_low  = 1,
++              },
++              {
++                      .name   = "DVAG3810BN::power",
++                      .gpio   = 4,
++                      .default_trigger = "default-on",
++              },
++              {
++                      .name   = "DVAG3810BN::stop",
++                      .gpio   = 5,
++              },
++      },
++
++      .buttons = {
++              {
++                      .desc   = "reset",
++                      .gpio   = 34,
++                      .active_low = 1,
++                      .type   = EV_KEY,
++                      .code   = KEY_RESTART,
++                      .debounce_interval = BCM963XX_KEYS_DEBOUNCE_INTERVAL,
++              },
++      },
++};
+ #endif
+ /*
+@@ -2707,6 +2772,7 @@ static const struct board_info __initdat
+       &board_ct6373_1,
+       &board_HW553,
+       &board_spw303v,
++      &board_DVAG3810BN,
+ #endif
+ #ifdef CONFIG_BCM63XX_CPU_6368
diff --git a/target/linux/brcm63xx/patches-3.6/528-board_nb6.patch b/target/linux/brcm63xx/patches-3.6/528-board_nb6.patch
new file mode 100644 (file)
index 0000000..58bd3ef
--- /dev/null
@@ -0,0 +1,146 @@
+--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
++++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
+@@ -17,6 +17,7 @@
+ #include <linux/spi/spi.h>
+ #include <linux/spi/spi_gpio.h>
+ #include <linux/spi/74x164.h>
++#include <linux/rtl8367.h>
+ #include <asm/addrspace.h>
+ #include <bcm63xx_board.h>
+ #include <bcm63xx_cpu.h>
+@@ -50,6 +51,8 @@
+ #define NB4_SPI_GPIO_MOSI     7
+ #define NB4_SPI_GPIO_CLK      6
+ #define NB4_74HC64_GPIO(X)    (NB4_74X164_GPIO_BASE + (X))
++#define NB6_GPIO_RTL8367_SDA  18
++#define NB6_GPIO_RTL8367_SCK  20
+ #define CT6373_PID_OFFSET             0xff80
+ #define CT6373_74X164_GPIO_BASE       64
+@@ -2579,6 +2582,103 @@ static struct board_info __initdata boar
+ };
+ #endif
++#ifdef CONFIG_BCM63XX_CPU_6362
++static struct rtl8367_extif_config nb6_rtl8367_extif0_cfg = {
++      .mode = RTL8367_EXTIF_MODE_RGMII,
++      .txdelay = 1,
++      .rxdelay = 5,
++      .ability = {
++              .force_mode = 1,
++              .txpause = 1,
++              .rxpause = 1,
++              .link = 1,
++              .duplex = 1,
++              .speed = RTL8367_PORT_SPEED_1000,
++      },
++};
++
++static struct rtl8367_platform_data nb6_rtl8367_data = {
++      .gpio_sda       = NB6_GPIO_RTL8367_SDA,
++      .gpio_sck       = NB6_GPIO_RTL8367_SCK,
++      .extif0_cfg     = &nb6_rtl8367_extif0_cfg,
++};
++
++static struct platform_device nb6_rtl8367_device = {
++      .name           = RTL8367_DRIVER_NAME,
++      .id             = -1,
++      .dev = {
++              .platform_data  = &nb6_rtl8367_data,
++      }
++};
++
++static struct platform_device * __initdata nb6_devices[] = {
++      &nb6_rtl8367_device,
++};
++
++static struct board_info __initdata board_nb6 = {
++      .name                           = "NB6",
++      .expected_cpu_id                = 0x6362,
++
++      .has_uart0                      = 1,
++
++      .has_ohci0                      = 1,
++      .has_ehci0                      = 1,
++
++      .has_enetsw                     = 1,
++
++      .enetsw = {
++              .used_ports = {
++                      [4] = {
++                              .used   = 1,
++                              .phy_id = 0xff,
++                              .bypass_link = 1,
++                              .force_speed = 1000,
++                              .force_duplex_full = 1,
++                              .name   = "RGMII",
++                      },
++              },
++      },
++
++      .buttons = {
++              {
++                      .desc           = "reset",
++                      .gpio           = 24,
++                      .type           = EV_KEY,
++                      .code           = KEY_RESTART,
++                      .debounce_interval = BCM963XX_KEYS_DEBOUNCE_INTERVAL,
++                      .active_low     = 1,
++              },
++              {
++                      .desc           = "wps",
++                      .gpio           = 25,
++                      .type           = EV_KEY,
++                      .code           = KEY_WPS_BUTTON,
++                      .debounce_interval = BCM963XX_KEYS_DEBOUNCE_INTERVAL,
++                      .active_low     = 1,
++              },
++              {
++                      .desc           = "wlan",
++                      .gpio           = 12,
++                      .type           = EV_KEY,
++                      .code           = KEY_WLAN,
++                      .debounce_interval = BCM963XX_KEYS_DEBOUNCE_INTERVAL,
++                      .active_low     = 1,
++              },
++              {
++                      .desc           = "service",
++                      .gpio           = 10,
++                      .type           = EV_KEY,
++                      .code           = BTN_0,
++                      .debounce_interval = BCM963XX_KEYS_DEBOUNCE_INTERVAL,
++                      .active_low     = 1,
++              },
++      },
++
++      .devs = nb6_devices,
++      .num_devs = ARRAY_SIZE(nb6_devices),
++};
++#endif
++
+ /*
+  * known 6368 boards
+  */
+@@ -2775,6 +2875,10 @@ static const struct board_info __initdat
+       &board_DVAG3810BN,
+ #endif
++#ifdef CONFIG_BCM63XX_CPU_6362
++      &board_nb6,
++#endif
++
+ #ifdef CONFIG_BCM63XX_CPU_6368
+       &board_96368mvwg,
+       &board_96368mvngr,
+@@ -2842,6 +2946,11 @@ static void __init boardid_fixup(u8 *boo
+               }
+       }
++      if (BCMCPU_IS_6362() && (!strncmp(board_name, "NB6-", sizeof("NB6-") - 1))) {
++              board_name[sizeof("NB6") - 1] = '\0';
++              return ;
++      }
++
+       /* check if bcm_tag is at 64k offset */
+       if (strncmp(board_name, tag->board_id, BOARDID_LEN) != 0) {
+               /* else try 128k */
diff --git a/target/linux/brcm63xx/patches-3.6/529-board_fast2604.patch b/target/linux/brcm63xx/patches-3.6/529-board_fast2604.patch
new file mode 100644 (file)
index 0000000..cab0461
--- /dev/null
@@ -0,0 +1,66 @@
+--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
++++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
+@@ -1010,6 +1010,55 @@ static struct board_info __initdata boar
+       .has_ehci0                      = 1,
+ };
++static struct board_info __initdata board_FAST2604 = {
++      .name                                           = "F@ST2604",
++      .expected_cpu_id                        = 0x6348,
++
++      .has_uart0                                      = 1,
++      .has_pci                                        = 1,
++      .has_ohci0                                      = 1,
++
++      .has_enet1                                      = 1,
++      .enet1 = {
++              .force_speed_100                = 1,
++              .force_duplex_full              = 1,
++      },
++
++      .leds = {
++              {
++                      .name                           = "F@ST2604:green:power",
++                      .gpio                           = 0,
++                      .active_low                     = 1,
++                      .default_trigger        = "default-on",
++              },
++              {
++                      .name                           = "F@ST2604:red:power",
++                      .gpio                           = 1,
++                      .active_low                     = 1,
++              },
++              {
++                      .name                           = "F@ST2604:red:inet",
++                      .gpio                           = 4,
++                      .active_low                     = 1,
++              },
++              {
++                      .name                           = "F@ST2604:green:wps",
++                      .gpio                           = 5,
++                      .active_low                     = 1,
++              },
++      },
++      .buttons = {
++              {
++                      .desc                           = "reset",
++                      .gpio                           = 33,
++                      .active_low                     = 1,
++                      .type                           = EV_KEY,
++                      .code                           = KEY_RESTART,
++                      .debounce_interval      = BCM963XX_KEYS_DEBOUNCE_INTERVAL,
++              },
++      },
++};
++
+ static struct board_info __initdata board_rta1025w_16 = {
+       .name                           = "RTA1025W_16",
+       .expected_cpu_id                = 0x6348,
+@@ -2843,6 +2892,7 @@ static const struct board_info __initdat
+       &board_96348gw_10,
+       &board_96348gw_11,
+       &board_FAST2404,
++      &board_FAST2604,
+       &board_DV201AMR,
+       &board_96348gw_a,
+       &board_rta1025w_16,
diff --git a/target/linux/brcm63xx/patches-3.6/530-board_963281T_TEF.patch b/target/linux/brcm63xx/patches-3.6/530-board_963281T_TEF.patch
new file mode 100644 (file)
index 0000000..49e3c7c
--- /dev/null
@@ -0,0 +1,136 @@
+--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
++++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
+@@ -206,6 +206,125 @@ static struct board_info __initdata boar
+       },
+ };
++static struct board_info __initdata board_963281T_TEF = {
++      .name                                   = "963281T_TEF",
++      .expected_cpu_id                        = 0x6328,
++
++      .has_uart0                              = 1,
++      .has_pci                                = 1,
++      .has_ohci0                              = 1,
++      .has_ehci0                              = 1,
++      .has_enetsw                             = 1,
++
++      .enetsw = {
++              .used_ports = {
++                      [0] = {
++                              .used           = 1,
++                              .phy_id         = 1,
++                              .name           = "Port 1",
++                      },
++                      [1] = {
++                              .used           = 1,
++                              .phy_id         = 2,
++                              .name           = "Port 2",
++                      },
++                      [2] = {
++                              .used           = 1,
++                              .phy_id         = 3,
++                              .name           = "Port 3",
++                      },
++                      [3] = {
++                              .used           = 1,
++                              .phy_id         = 4,
++                              .name           = "Port 4",
++                      },
++              },
++      },
++
++      .leds = {
++              {
++                      .name                   = "963281T_TEF:green:power",
++                      .gpio                   = 4,
++                      .active_low             = 1,
++                      .default_trigger        = "default-on",
++              },
++              {
++                      .name                   = "963281T_TEF:red:power",
++                      .gpio                   = 8,
++                      .active_low             = 1,
++              },
++              {
++                      .name                   = "963281T_TEF:green:inet",
++                      .gpio                   = 11,
++                      .active_low             = 1,
++              },
++              {
++                      .name                   = "963281T_TEF:red:inet",
++                      .gpio                   = 2,
++                      .active_low             = 1,
++              },
++              {
++                      .name                   = "963281T_TEF:green:ppp",
++                      .gpio                   = 3,
++                      .active_low             = 1,
++              },
++              {
++                      .name                   = "963281T_TEF:red:ppp",
++                      .gpio                   = 5,
++                      .active_low             = 1,
++              },
++              {
++                      .name                   = "963281T_TEF:green:3g",
++                      .gpio                   = 6,
++                      .active_low             = 1,
++              },
++              {
++                      .name                   = "963281T_TEF:red:3g",
++                      .gpio                   = 7,
++                      .active_low             = 1,
++              },
++              {
++                      .name                   = "963281T_TEF:green:wlan",
++                      .gpio                   = 9,
++                      .active_low             = 1,
++              },
++              {
++                      .name                   = "963281T_TEF:red:wlan",
++                      .gpio                   = 10,
++                      .active_low             = 1,
++              },
++              {
++                      .name                   = "963281T_TEF:green:eth",
++                      .gpio                   = 31,
++                      .active_low             = 1,
++              },
++              {
++                      .name                   = "963281T_TEF:red:eth",
++                      .gpio                   = 20,
++                      .active_low             = 1,
++              },
++      },
++
++      .buttons = {
++              {
++                      .desc                   = "reset",
++                      .gpio                   = 23,
++                      .active_low             = 1,
++                      .type                   = EV_KEY,
++                      .code                   = KEY_RESTART,
++                      .debounce_interval      = BCM963XX_KEYS_DEBOUNCE_INTERVAL,
++              },
++              {
++                      .desc                   = "wlan",
++                      .gpio                   = 24,
++                      .active_low             = 1,
++                      .type                   = EV_KEY,
++                      .code                   = KEY_WLAN,
++                      .debounce_interval      = BCM963XX_KEYS_DEBOUNCE_INTERVAL,
++              },
++      },
++};
++
+ static struct board_info __initdata board_dsl_274xb_f1 = {
+       .name                           = "AW4339U",
+       .expected_cpu_id                = 0x6328,
+@@ -2873,6 +2992,7 @@ static const struct board_info __initdat
+ #ifdef CONFIG_BCM63XX_CPU_6328
+       &board_96328avng,
+       &board_963281TAN,
++      &board_963281T_TEF,
+       &board_dsl_274xb_f1,
+ #endif
+ #ifdef CONFIG_BCM63XX_CPU_6338
diff --git a/target/linux/brcm63xx/patches-3.6/531-board_96328A-1441N1.patch b/target/linux/brcm63xx/patches-3.6/531-board_96328A-1441N1.patch
new file mode 100644 (file)
index 0000000..c254040
--- /dev/null
@@ -0,0 +1,89 @@
+--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
++++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
+@@ -136,6 +136,78 @@ static struct board_info __initdata boar
+       },
+ };
++static struct board_info __initdata board_96328A_1441N1 = {
++      .name                                   = "96328A-1441N1",
++      .expected_cpu_id                        = 0x6328,
++
++      .has_uart0                              = 1,
++      .has_pci                                = 1,
++      .has_ohci0                              = 1,
++      .has_ehci0                              = 1,
++      .has_enetsw                             = 1,
++
++      .enetsw = {
++              .used_ports = {
++                      [0] = {
++                              .used           = 1,
++                              .phy_id         = 1,
++                              .name           = "Port 1",
++                      },
++                      [1] = {
++                              .used           = 1,
++                              .phy_id         = 2,
++                              .name           = "Port 2",
++                      },
++                      [2] = {
++                              .used           = 1,
++                              .phy_id         = 3,
++                              .name           = "Port 3",
++                      },
++                      [3] = {
++                              .used           = 1,
++                              .phy_id         = 4,
++                              .name           = "Port 4",
++                      },
++              },
++      },
++
++      .leds = {
++              {
++                      .name                   = "96328A-1441N1:green:power",
++                      .gpio                   = 8,
++                      .default_trigger        = "default-on",
++              },
++              {
++                      .name                   = "96328A-1441N1:red:power",
++                      .gpio                   = 4,
++              },
++              {
++                      .name                   = "96328A-1441N1:green:inet",
++                      .gpio                   = 7,
++              },
++              {
++                      .name                   = "96328A-1441N1:red:inet",
++                      .gpio                   = 1,
++              },
++              {
++                      .name                   = "96328A-1441N1:green:dsl",
++                      .gpio                   = 11,
++                      .active_low             = 1,
++              },
++      },
++
++      .buttons = {
++              {
++                      .desc                   = "reset",
++                      .gpio                   = 23,
++                      .active_low             = 1,
++                      .type                   = EV_KEY,
++                      .code                   = KEY_RESTART,
++                      .debounce_interval      = BCM963XX_KEYS_DEBOUNCE_INTERVAL,
++              },
++      },
++};
++
+ static struct board_info __initdata board_963281TAN = {
+       .name                           = "963281TAN",
+       .expected_cpu_id                = 0x6328,
+@@ -2991,6 +3063,7 @@ static struct board_info __initdata boar
+ static const struct board_info __initdata *bcm963xx_boards[] = {
+ #ifdef CONFIG_BCM63XX_CPU_6328
+       &board_96328avng,
++      &board_96328A_1441N1,
+       &board_963281TAN,
+       &board_963281T_TEF,
+       &board_dsl_274xb_f1,
diff --git a/target/linux/brcm63xx/patches-3.6/532-board_96328a-1241N.patch b/target/linux/brcm63xx/patches-3.6/532-board_96328a-1241N.patch
new file mode 100644 (file)
index 0000000..c2e2ef9
--- /dev/null
@@ -0,0 +1,83 @@
+--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
++++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
+@@ -136,6 +136,72 @@ static struct board_info __initdata boar
+       },
+ };
++static struct board_info __initdata board_96328A_1241N = {
++      .name                                   = "96328A-1241N",
++      .expected_cpu_id                        = 0x6328,
++
++      .has_uart0                              = 1,
++      .has_pci                                = 1,
++      .has_ohci0                              = 1,
++      .has_ehci0                              = 1,
++      .has_enetsw                             = 1,
++
++      .enetsw = {
++              .used_ports = {
++                      [0] = {
++                              .used           = 1,
++                              .phy_id         = 1,
++                              .name           = "Port 1",
++                      },
++                      [1] = {
++                              .used           = 1,
++                              .phy_id         = 2,
++                              .name           = "Port 2",
++                      },
++                      [2] = {
++                              .used           = 1,
++                              .phy_id         = 3,
++                              .name           = "Port 3",
++                      },
++                      [3] = {
++                              .used           = 1,
++                              .phy_id         = 4,
++                              .name           = "Port 4",
++                      },
++              },
++      },
++
++      .leds = {
++              {
++                      .name                   = "96328A-1241N:green:power",
++                      .gpio                   = 8,
++                      .active_low             = 1,
++                      .default_trigger        = "default-on",
++              },
++              {
++                      .name                   = "96328A-1241N:red:alarm",
++                      .gpio                   = 2,
++                      .active_low             = 1,
++              },
++              {
++                      .name                   = "96328A-1241N:green:inet",
++                      .gpio                   = 3,
++                      .active_low             = 1,
++              },
++      },
++
++      .buttons = {
++              {
++                      .desc                   = "reset",
++                      .gpio                   = 23,
++                      .active_low             = 1,
++                      .type                   = EV_KEY,
++                      .code                   = KEY_RESTART,
++                      .debounce_interval      = BCM963XX_KEYS_DEBOUNCE_INTERVAL,
++              },
++      },
++};
++
+ static struct board_info __initdata board_96328A_1441N1 = {
+       .name                                   = "96328A-1441N1",
+       .expected_cpu_id                        = 0x6328,
+@@ -3063,6 +3129,7 @@ static struct board_info __initdata boar
+ static const struct board_info __initdata *bcm963xx_boards[] = {
+ #ifdef CONFIG_BCM63XX_CPU_6328
+       &board_96328avng,
++      &board_96328A_1241N,
+       &board_96328A_1441N1,
+       &board_963281TAN,
+       &board_963281T_TEF,
diff --git a/target/linux/brcm63xx/patches-3.6/550-alice_gate2_leds.patch b/target/linux/brcm63xx/patches-3.6/550-alice_gate2_leds.patch
new file mode 100644 (file)
index 0000000..d151cab
--- /dev/null
@@ -0,0 +1,102 @@
+--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
++++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
+@@ -1918,6 +1918,99 @@ static struct board_info __initdata boar
+       .has_ohci0 = 1,
+       .has_ehci0 = 1,
++
++      .leds = {
++              {
++                      .name           = "AGPF-S0:red:power",
++                      .gpio           = 5,
++                      .active_low     = 1,
++              },
++              {
++                      .name           = "AGPF-S0:green:power",
++                      .gpio           = 4,
++                      .active_low     = 1,
++                      .default_trigger = "default-on",
++              },
++              {
++                      .name           = "AGPF-S0:red:service",
++                      .gpio           = 7,
++                      .active_low     = 1,
++              },
++              {
++                      .name           = "AGPF-S0:green:service",
++                      .gpio           = 6,
++                      .active_low     = 1,
++              },
++              {
++                      .name           = "AGPF-S0:green:adsl",
++                      .gpio           = 9,
++                      .active_low     = 1,
++              },
++              {
++                      .name           = "AGPF-S0:red:adsl",
++                      .gpio           = 10,
++                      .active_low     = 1,
++              },
++              {
++                      .name           = "AGPF-S0:red:wifi",
++                      .gpio           = 23,
++                      .active_low     = 1,
++              },
++              {
++                      .name           = "AGPF-S0:green:wifi",
++                      .gpio           = 22,
++                      .active_low     = 1,
++              },
++              {
++                      .name           = "AGPF-S0:green:internet",
++                      .gpio           = 25,
++                      .active_low     = 1,
++              },
++              {
++                      .name           = "AGPF-S0:red:internet",
++                      .gpio           = 24,
++                      .active_low     = 1,
++              },
++              {
++                      .name           = "AGPF-S0:red:usr1",
++                      .gpio           = 27,
++                      .active_low     = 1,
++              },
++              {
++                      .name           = "AGPF-S0:green:usr1",
++                      .gpio           = 26,
++                      .active_low     = 1,
++              },
++              {
++                      .name           = "AGPF-S0:red:usr2",
++                      .gpio           = 30,
++                      .active_low     = 1,
++              },
++              {
++                      .name           = "AGPF-S0:green:usr2",
++                      .gpio           = 29,
++                      .active_low     = 1,
++              },
++      },
++
++      .buttons = {
++              {
++                      .desc           = "reset",
++                      .gpio           = 37,
++                      .active_low     = 1,
++                      .type           = EV_KEY,
++                      .code           = KEY_RESTART,
++                      .debounce_interval = BCM963XX_KEYS_DEBOUNCE_INTERVAL,
++              },
++              {
++                      .desc           = "wps",
++                      .gpio           = 34,
++                      .active_low     = 1,
++                      .type           = EV_KEY,
++                      .code           = KEY_WPS_BUTTON,
++                      .debounce_interval = BCM963XX_KEYS_DEBOUNCE_INTERVAL,
++              },
++      },
+ };
+ static struct board_info __initdata board_DWVS0 = {
diff --git a/target/linux/brcm63xx/patches-3.6/551-96348gw_a_leds.patch b/target/linux/brcm63xx/patches-3.6/551-96348gw_a_leds.patch
new file mode 100644 (file)
index 0000000..ce263b2
--- /dev/null
@@ -0,0 +1,22 @@
+--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
++++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
+@@ -1375,6 +1375,19 @@ static struct board_info __initdata boar
+       },
+       .has_ohci0 = 1,
++
++      .leds = {
++              {
++                      .name           = "96348GW-A::adsl",
++                      .gpio           = 3,
++                      .active_low     = 1,
++              },
++              {
++                      .name           = "96348GW-A::usb",
++                      .gpio           = 0,
++                      .active_low     = 1,
++              }
++      },
+ };
+ static struct board_info __initdata board_96348_D4PW = {
diff --git a/target/linux/brcm63xx/patches-3.6/552-board_96348gw-10_reset_button.patch b/target/linux/brcm63xx/patches-3.6/552-board_96348gw-10_reset_button.patch
new file mode 100644 (file)
index 0000000..095a851
--- /dev/null
@@ -0,0 +1,20 @@
+--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
++++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
+@@ -843,6 +843,17 @@ static struct board_info __initdata boar
+                       .active_low     = 1,
+               },
+       },
++
++      .buttons = {
++              {
++                      .desc           = "reset",
++                      .gpio           = 6,
++                      .active_low     = 1,
++                      .type           = EV_KEY,
++                      .code           = KEY_RESTART,
++                      .debounce_interval = BCM963XX_KEYS_DEBOUNCE_INTERVAL,
++              },
++      },
+ };
+ static struct board_info __initdata board_96348gw_11 = {
diff --git a/target/linux/brcm63xx/patches-3.6/553-board_rta770bw.patch b/target/linux/brcm63xx/patches-3.6/553-board_rta770bw.patch
new file mode 100644 (file)
index 0000000..a1286c9
--- /dev/null
@@ -0,0 +1,64 @@
+--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
++++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
+@@ -735,6 +735,53 @@ static struct board_info __initdata boar
+       .has_uart0                      = 1,
+ };
++
++static struct board_info __initdata board_rta770bw = {
++      .name                           = "RTA770BW",
++      .expected_cpu_id                = 0x6345,
++
++      .has_uart0                      = 1,
++
++      .has_enet0                      = 1,
++
++      .enet0 = {
++              .force_speed_100        = 1,
++              .force_duplex_full      = 1,
++      },
++
++      .leds = {
++              {
++                      .name           = "RTA770BW:green:usb",
++                      .gpio           = 7,
++                      .active_low     = 1,
++              },
++              {
++                      .name           = "RTA770BW:green:adsl",
++                      .gpio           = 8,
++              },
++              {
++                      .name           = "RTA770BW:green:diag",
++                      .gpio           = 10,
++                      .active_low     = 1,
++              },
++              {
++                      .name           = "RTA770BW:green:wlan",
++                      .gpio           = 11,
++                      .active_low     = 1,
++              },
++      },
++
++      .buttons = {
++              {
++                      .desc           = "reset",
++                      .gpio           = 13,
++                      .type           = EV_KEY,
++                      .code           = KEY_RESTART,
++                      .active_low     = 1,
++                      .debounce_interval = BCM963XX_KEYS_DEBOUNCE_INTERVAL,
++              },
++      },
++};
+ #endif
+ /*
+@@ -3260,6 +3307,7 @@ static const struct board_info __initdat
+ #endif
+ #ifdef CONFIG_BCM63XX_CPU_6345
+       &board_96345gw2,
++      &board_rta770bw,
+ #endif
+ #ifdef CONFIG_BCM63XX_CPU_6348
+       &board_96348r,
diff --git a/target/linux/brcm63xx/patches-3.6/800-wl_exports.patch b/target/linux/brcm63xx/patches-3.6/800-wl_exports.patch
new file mode 100644 (file)
index 0000000..0fff4d0
--- /dev/null
@@ -0,0 +1,34 @@
+--- a/arch/mips/bcm63xx/nvram.c
++++ b/arch/mips/bcm63xx/nvram.c
+@@ -19,6 +19,13 @@
+ static struct bcm963xx_nvram nvram;
+ static int mac_addr_used;
++/*
++ * Required export for WL
++ */
++#define NVRAM_SPACE 0x8000
++char nvram_buf[NVRAM_SPACE];
++EXPORT_SYMBOL(nvram_buf);
++
+ int __init bcm63xx_nvram_init(void *addr)
+ {
+       unsigned int check_len;
+@@ -27,6 +34,7 @@ int __init bcm63xx_nvram_init(void *addr
+       /* extract nvram data */
+       memcpy(&nvram, addr, sizeof(nvram));
++      memcpy(&nvram_buf, addr, NVRAM_SPACE);
+       /* check checksum before using data */
+       if (nvram.version <= 4)
+--- a/arch/mips/mm/cache.c
++++ b/arch/mips/mm/cache.c
+@@ -58,6 +58,7 @@ void (*_dma_cache_wback)(unsigned long s
+ void (*_dma_cache_inv)(unsigned long start, unsigned long size);
+ EXPORT_SYMBOL(_dma_cache_wback_inv);
++EXPORT_SYMBOL(_dma_cache_inv);
+ #endif /* CONFIG_DMA_NONCOHERENT */
diff --git a/target/linux/brcm63xx/patches-3.6/801-ssb_export_fallback_sprom.patch b/target/linux/brcm63xx/patches-3.6/801-ssb_export_fallback_sprom.patch
new file mode 100644 (file)
index 0000000..3e380b1
--- /dev/null
@@ -0,0 +1,27 @@
+--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
++++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
+@@ -14,6 +14,7 @@
+ #include <linux/ssb/ssb.h>
+ #include <linux/gpio_keys.h>
+ #include <linux/input.h>
++#include <linux/export.h>
+ #include <linux/spi/spi.h>
+ #include <linux/spi/spi_gpio.h>
+ #include <linux/spi/74x164.h>
+@@ -3365,7 +3366,7 @@ static const struct board_info __initdat
+  * bcm4318 WLAN work
+  */
+ #ifdef CONFIG_SSB_PCIHOST
+-static struct ssb_sprom bcm63xx_sprom = {
++struct ssb_sprom bcm63xx_sprom = {
+       .revision               = 0x02,
+       .board_rev              = 0x17,
+       .country_code           = 0x0,
+@@ -3385,6 +3386,7 @@ static struct ssb_sprom bcm63xx_sprom =
+       .boardflags_lo          = 0x2848,
+       .boardflags_hi          = 0x0000,
+ };
++EXPORT_SYMBOL(bcm63xx_sprom);
+ int bcm63xx_get_fallback_sprom(struct ssb_bus *bus, struct ssb_sprom *out)
+ {
diff --git a/target/linux/brcm63xx/patches-3.6/802-rtl8367r_fix_RGMII_support.patch b/target/linux/brcm63xx/patches-3.6/802-rtl8367r_fix_RGMII_support.patch
new file mode 100644 (file)
index 0000000..285f3f7
--- /dev/null
@@ -0,0 +1,30 @@
+From e3208e6087642b95a5bab3101fc9c6e34892c861 Mon Sep 17 00:00:00 2001
+From: Miguel GAIO <miguel.gaio@efixo.com>
+Date: Fri, 6 Jul 2012 14:12:33 +0200
+Subject: [PATCH 6/8] * [rtl8367r] Fix RGMII support
+
+---
+ drivers/net/phy/rtl8367.c  |    5 +++++
+ 1 files changed, 5 insertions(+), 0 deletions(-)
+
+--- a/drivers/net/phy/rtl8367.c
++++ b/drivers/net/phy/rtl8367.c
+@@ -144,6 +144,10 @@
+ #define   RTL8367_EXT_RGMXF_TXDELAY_MASK      1
+ #define   RTL8367_EXT_RGMXF_RXDELAY_MASK      0x7
++#define RTL8367_PHY_AD_REG                    0x130f
++#define    RTL8370_PHY_AD_DUMMY_1_OFFSET      5
++#define    RTL8370_PHY_AD_DUMMY_1_MASK                0xe0
++
+ #define RTL8367_DI_FORCE_REG(_x)              (0x1310 + (_x))
+ #define   RTL8367_DI_FORCE_MODE                       BIT(12)
+ #define   RTL8367_DI_FORCE_NWAY                       BIT(7)
+@@ -892,6 +896,7 @@ static int rtl8367_extif_set_mode(struct
+       case RTL8367_EXTIF_MODE_RGMII_33V:
+               REG_WR(smi, RTL8367_CHIP_DEBUG0_REG, 0x0367);
+               REG_WR(smi, RTL8367_CHIP_DEBUG1_REG, 0x7777);
++              REG_RMW(smi, RTL8367_PHY_AD_REG, BIT(5), 0);
+               break;
+       case RTL8367_EXTIF_MODE_TMII_MAC: