remove support for 3.6 kernel
authorFlorian Fainelli <florian@openwrt.org>
Tue, 5 Feb 2013 22:36:54 +0000 (22:36 +0000)
committerFlorian Fainelli <florian@openwrt.org>
Tue, 5 Feb 2013 22:36:54 +0000 (22:36 +0000)
Signed-off-by: Florian Fainelli <florian@openwrt.org>
SVN-Revision: 35506

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

diff --git a/target/linux/brcm63xx/config-3.6 b/target/linux/brcm63xx/config-3.6
deleted file mode 100644 (file)
index bccf2ae..0000000
+++ /dev/null
@@ -1,170 +0,0 @@
-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_B53=y
-CONFIG_B53_MMAP_DRIVER=y
-CONFIG_B53_PHY_DRIVER=y
-CONFIG_B53_PHY_FIXUP=y
-CONFIG_B53_SPI_DRIVER=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_BOARD_BCM963XX=y
-# CONFIG_BOARD_LIVEBOX is not set
-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_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_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=y
-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_ZONE_DMA_FLAG=0
diff --git a/target/linux/brcm63xx/patches-3.6/030-MIPS-BCM63XX-Fix-BCM6345-clock-bits.patch b/target/linux/brcm63xx/patches-3.6/030-MIPS-BCM63XX-Fix-BCM6345-clock-bits.patch
deleted file mode 100644 (file)
index b33a845..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-[PATCH] MIPS: BCM63XX: fix BCM6345 clock bits shifting
-
-BCM6345 has an intermediate 16-bits wide test control register between the
-peripheral identifier function, and its clock control register is only 16-bits
-wide contrary to other platforms where it is 32-bits wide. By shifting all
-clocks bits by 16-bits to the left we ensure they get written to the proper
-clock control register, without adding specific BCM6345 handling in the clock
-code.
-
-Signed-off-by: Florian Fainelli <florian@openwrt.org>
----
---- a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h
-+++ b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h
-@@ -53,13 +53,13 @@
-                                       CKCTL_6338_SAR_EN |             \
-                                       CKCTL_6338_SPI_EN)
--#define CKCTL_6345_CPU_EN             (1 << 0)
--#define CKCTL_6345_BUS_EN             (1 << 1)
--#define CKCTL_6345_EBI_EN             (1 << 2)
--#define CKCTL_6345_UART_EN            (1 << 3)
--#define CKCTL_6345_ADSLPHY_EN         (1 << 4)
--#define CKCTL_6345_ENET_EN            (1 << 7)
--#define CKCTL_6345_USBH_EN            (1 << 8)
-+#define CKCTL_6345_CPU_EN             (1 << 16)
-+#define CKCTL_6345_BUS_EN             (1 << 17)
-+#define CKCTL_6345_EBI_EN             (1 << 18)
-+#define CKCTL_6345_UART_EN            (1 << 19)
-+#define CKCTL_6345_ADSLPHY_EN         (1 << 20)
-+#define CKCTL_6345_ENET_EN            (1 << 23)
-+#define CKCTL_6345_USBH_EN            (1 << 24)
- #define CKCTL_6345_ALL_SAFE_EN                (CKCTL_6345_ENET_EN |   \
-                                       CKCTL_6345_USBH_EN |    \
diff --git a/target/linux/brcm63xx/patches-3.6/040-MIPS-BCM63XX-Fix-USB-IRQ-definitions-for-6328.patch b/target/linux/brcm63xx/patches-3.6/040-MIPS-BCM63XX-Fix-USB-IRQ-definitions-for-6328.patch
deleted file mode 100644 (file)
index c9d0421..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-From 960e1ef3c5b2d69a4a5a6984b6408d65221dd86c Mon Sep 17 00:00:00 2001
-From: Kevin Cernekee <cernekee@gmail.com>
-Date: Sat, 23 Jun 2012 04:14:55 +0000
-Subject: [PATCH 06/81] MIPS: BCM63XX: Fix USB IRQ definitions for 6328
-
-OHCI/EHCI are in the high (second) word.  Not currently used by any
-driver.
-
-Signed-off-by: Kevin Cernekee <cernekee@gmail.com>
----
- arch/mips/include/asm/mach-bcm63xx/bcm63xx_cpu.h |    4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
---- a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_cpu.h
-+++ b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_cpu.h
-@@ -602,8 +602,8 @@ 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_OHCI0_IRQ            (IRQ_INTERNAL_BASE + 9)
--#define BCM_6328_EHCI0_IRQ            (IRQ_INTERNAL_BASE + 10)
-+#define BCM_6328_OHCI0_IRQ            (BCM_6328_HIGH_IRQ_BASE + 9)
-+#define BCM_6328_EHCI0_IRQ            (BCM_6328_HIGH_IRQ_BASE + 10)
- #define BCM_6328_PCMCIA_IRQ           0
- #define BCM_6328_ENET0_RXDMA_IRQ      0
- #define BCM_6328_ENET0_TXDMA_IRQ      0
diff --git a/target/linux/brcm63xx/patches-3.6/041-BCM63XX-Add-register-definitions-for-USBD-depen.patch b/target/linux/brcm63xx/patches-3.6/041-BCM63XX-Add-register-definitions-for-USBD-depen.patch
deleted file mode 100644 (file)
index c2130a5..0000000
+++ /dev/null
@@ -1,62 +0,0 @@
-From 21bb8141c205ae48d331787debb6b272add90ac7 Mon Sep 17 00:00:00 2001
-From: Kevin Cernekee <cernekee@gmail.com>
-Date: Sat, 23 Jun 2012 04:14:54 +0000
-Subject: [PATCH 05/81] MIPS: BCM63XX: Add register definitions for USBD
- dependencies
-
-The USB 2.0 device depends on some functionality in other blocks, such
-as GPIO and USBH.  Add those register definitions here.
-
-Signed-off-by: Kevin Cernekee <cernekee@gmail.com>
----
- arch/mips/include/asm/mach-bcm63xx/bcm63xx_cpu.h  |    6 +++---
- arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h |    8 ++++++++
- 2 files changed, 11 insertions(+), 3 deletions(-)
-
---- a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_cpu.h
-+++ b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_cpu.h
-@@ -184,9 +184,9 @@ enum bcm63xx_regs_set {
- #define BCM_6328_SPI_BASE             (0xdeadbeef)
- #define BCM_6328_UDC0_BASE            (0xdeadbeef)
- #define BCM_6328_USBDMA_BASE          (0xdeadbeef)
--#define BCM_6328_OHCI0_BASE           (0xdeadbeef)
-+#define BCM_6328_OHCI0_BASE           (0xb0002600)
- #define BCM_6328_OHCI_PRIV_BASE               (0xdeadbeef)
--#define BCM_6328_USBH_PRIV_BASE               (0xdeadbeef)
-+#define BCM_6328_USBH_PRIV_BASE               (0xb0002700)
- #define BCM_6328_MPI_BASE             (0xdeadbeef)
- #define BCM_6328_PCMCIA_BASE          (0xdeadbeef)
- #define BCM_6328_PCIE_BASE            (0xb0e40000)
-@@ -199,7 +199,7 @@ enum bcm63xx_regs_set {
- #define BCM_6328_ENETDMAC_BASE                (0xb000da00)
- #define BCM_6328_ENETDMAS_BASE                (0xb000dc00)
- #define BCM_6328_ENETSW_BASE          (0xb0e00000)
--#define BCM_6328_EHCI0_BASE           (0x10002500)
-+#define BCM_6328_EHCI0_BASE           (0xb0002500)
- #define BCM_6328_SDRAM_BASE           (0xdeadbeef)
- #define BCM_6328_MEMC_BASE            (0xdeadbeef)
- #define BCM_6328_DDR_BASE             (0xb0003000)
---- a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h
-+++ b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h
-@@ -543,6 +543,12 @@
- #define GPIO_MODE_6368_SPI_SSN5               (1 << 31)
-+#define GPIO_PINMUX_OTHR_REG          0x24
-+#define GPIO_PINMUX_OTHR_6328_USB_SHIFT       12
-+#define GPIO_PINMUX_OTHR_6328_USB_MASK        (3 << GPIO_PINMUX_OTHR_6328_USB_SHIFT)
-+#define GPIO_PINMUX_OTHR_6328_USB_HOST        (1 << GPIO_PINMUX_OTHR_6328_USB_SHIFT)
-+#define GPIO_PINMUX_OTHR_6328_USB_DEV (2 << GPIO_PINMUX_OTHR_6328_USB_SHIFT)
-+
- #define GPIO_BASEMODE_6368_REG                0x38
- #define GPIO_BASEMODE_6368_UART2      0x1
- #define GPIO_BASEMODE_6368_GPIO               0x0
-@@ -770,6 +776,8 @@
- #define USBH_PRIV_SWAP_6358_REG               0x0
- #define USBH_PRIV_SWAP_6368_REG               0x1c
-+#define USBH_PRIV_SWAP_USBD_SHIFT     6
-+#define USBH_PRIV_SWAP_USBD_MASK      (1 << USBH_PRIV_SWAP_USBD_SHIFT)
- #define USBH_PRIV_SWAP_EHCI_ENDN_SHIFT        4
- #define USBH_PRIV_SWAP_EHCI_ENDN_MASK (1 << USBH_PRIV_SWAP_EHCI_ENDN_SHIFT)
- #define USBH_PRIV_SWAP_EHCI_DATA_SHIFT        3
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
deleted file mode 100644 (file)
index 470f966..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
-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
deleted file mode 100644 (file)
index da24b1b..0000000
+++ /dev/null
@@ -1,33 +0,0 @@
-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
deleted file mode 100644 (file)
index ca0cddd..0000000
+++ /dev/null
@@ -1,49 +0,0 @@
-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
deleted file mode 100644 (file)
index 8e05803..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-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
deleted file mode 100644 (file)
index 60396ab..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
-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/106-bcm63xx-fix-transfer-bits_per_words-check.patch b/target/linux/brcm63xx/patches-3.6/106-bcm63xx-fix-transfer-bits_per_words-check.patch
deleted file mode 100644 (file)
index 37d9d49..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-From fbef4dff80be6254e36ab5b9c655d248a3991ded Mon Sep 17 00:00:00 2001
-From: Jonas Gorski <jonas.gorski@gmail.com>
-Date: Sat, 24 Nov 2012 12:08:22 +0100
-Subject: [PATCH 3.7] spi/bcm63xx: fix transfer bits_per_words check
-
-Transfers often do not have bits_per_words set, so use the spi device's
-bits_per_words in this case.
-
-This fixes the driver rejecting valid transfers e.g. generated by
-spi_write() or spi_read().
-
-Cc: stable@vger.kernel.org
-Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
----
- drivers/spi/spi-bcm63xx.c |    3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
---- a/drivers/spi/spi-bcm63xx.c
-+++ b/drivers/spi/spi-bcm63xx.c
-@@ -103,7 +103,8 @@ static int bcm63xx_spi_check_transfer(st
- {
-       u8 bits_per_word;
--      bits_per_word = (t) ? t->bits_per_word : spi->bits_per_word;
-+      bits_per_word = (t && t->bits_per_word) ?
-+                      t->bits_per_word : spi->bits_per_word;
-       if (bits_per_word != 8) {
-               dev_err(&spi->dev, "%s, unsupported bits_per_word=%d\n",
-                       __func__, bits_per_word);
diff --git a/target/linux/brcm63xx/patches-3.6/107-spi-bcm63xx-fix-multi-transfer-messages.patch b/target/linux/brcm63xx/patches-3.6/107-spi-bcm63xx-fix-multi-transfer-messages.patch
deleted file mode 100644 (file)
index 2da5044..0000000
+++ /dev/null
@@ -1,279 +0,0 @@
-From 0f2ae1e1282ff64f74a5e36f7da874f94911225e Mon Sep 17 00:00:00 2001
-From: Jonas Gorski <jonas.gorski@gmail.com>
-Date: Wed, 14 Nov 2012 22:22:33 +0100
-Subject: [PATCH] spi/bcm63xx: fix multi transfer messages
-
-The BCM63XX SPI controller does not support keeping CS asserted after
-sending its buffer. This breaks common usages like spi_write_then_read,
-where it is expected to be kept active during the whole transfers.
-
-Work around this by combining the transfers into one if the buffer
-allows. For spi_write_then_read, use the prepend byte feature to write
-to "prepend" the write if it is less than 15 bytes, allowing the whole
-fifo size for the read.
-
-Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
----
-Tested on a SPI conntected switch which required keeping CS active between
-the register read command and reading the register contents.
-
-Based on Mark's spi/next.
-
-Not sure if this is stable material, as it's quite invasive.
-
- drivers/spi/spi-bcm63xx.c |  172 ++++++++++++++++++++++++++++++---------------
- 1 file changed, 117 insertions(+), 55 deletions(-)
-
---- a/drivers/spi/spi-bcm63xx.c
-+++ b/drivers/spi/spi-bcm63xx.c
-@@ -38,6 +38,8 @@
- #define PFX           KBUILD_MODNAME
- #define DRV_VER               "0.1.2"
-+#define BCM63XX_SPI_MAX_PREPEND               15
-+
- struct bcm63xx_spi {
-       struct completion       done;
-@@ -50,16 +52,10 @@ struct bcm63xx_spi {
-       unsigned int            msg_type_shift;
-       unsigned int            msg_ctl_width;
--      /* Data buffers */
--      const unsigned char     *tx_ptr;
--      unsigned char           *rx_ptr;
--
-       /* data iomem */
-       u8 __iomem              *tx_io;
-       const u8 __iomem        *rx_io;
--      int                     remaining_bytes;
--
-       struct clk              *clk;
-       struct platform_device  *pdev;
- };
-@@ -184,50 +180,60 @@ static int bcm63xx_spi_setup(struct spi_
-       return 0;
- }
--/* Fill the TX FIFO with as many bytes as possible */
--static void bcm63xx_spi_fill_tx_fifo(struct bcm63xx_spi *bs)
--{
--      u8 size;
--
--      /* Fill the Tx FIFO with as many bytes as possible */
--      size = bs->remaining_bytes < bs->fifo_size ? bs->remaining_bytes :
--              bs->fifo_size;
--      memcpy_toio(bs->tx_io, bs->tx_ptr, size);
--      bs->remaining_bytes -= size;
--}
--
- static unsigned int bcm63xx_txrx_bufs(struct spi_device *spi,
--                                      struct spi_transfer *t)
-+                                      struct spi_transfer *first,
-+                                      unsigned int n_transfers)
- {
-       struct bcm63xx_spi *bs = spi_master_get_devdata(spi->master);
-       u16 msg_ctl;
-       u16 cmd;
-+      unsigned int i, timeout, total_len = 0, prepend_len = 0, len = 0;
-+      struct spi_transfer *t = first;
-+      u8 rx_tail;
-+      bool do_rx = false;
-+      bool do_tx = false;
-       /* Disable the CMD_DONE interrupt */
-       bcm_spi_writeb(bs, 0, SPI_INT_MASK);
--      dev_dbg(&spi->dev, "txrx: tx %p, rx %p, len %d\n",
--              t->tx_buf, t->rx_buf, t->len);
-+      if (n_transfers > 1 && t->tx_buf && t->len <= BCM63XX_SPI_MAX_PREPEND)
-+              prepend_len = t->len;
-+
-+      /* prepare the buffer */
-+      for (i = 0; i < n_transfers; i++) {
-+              if (t->tx_buf) {
-+                      do_tx = true;
-+                      memcpy_toio(bs->tx_io + total_len, t->tx_buf, t->len);
-+
-+                      /* don't prepend more than one tx */
-+                      if (t != first)
-+                              prepend_len = 0;
-+              }
-+
-+              if (t->rx_buf) {
-+                      do_rx = true;
-+                      if (t == first)
-+                              prepend_len = 0;
-+              }
--      /* Transmitter is inhibited */
--      bs->tx_ptr = t->tx_buf;
--      bs->rx_ptr = t->rx_buf;
--
--      if (t->tx_buf) {
--              bs->remaining_bytes = t->len;
--              bcm63xx_spi_fill_tx_fifo(bs);
-+              total_len += t->len;
-+
-+              t = list_entry(t->transfer_list.next, struct spi_transfer,
-+                             transfer_list);
-       }
-+      len = total_len - prepend_len;
-+
-       init_completion(&bs->done);
-       /* Fill in the Message control register */
--      msg_ctl = (t->len << SPI_BYTE_CNT_SHIFT);
-+      msg_ctl = (len << SPI_BYTE_CNT_SHIFT);
--      if (t->rx_buf && t->tx_buf)
-+      if (do_rx && do_tx && prepend_len == 0)
-               msg_ctl |= (SPI_FD_RW << bs->msg_type_shift);
--      else if (t->rx_buf)
-+      else if (do_rx)
-               msg_ctl |= (SPI_HD_R << bs->msg_type_shift);
--      else if (t->tx_buf)
-+      else if (do_tx)
-               msg_ctl |= (SPI_HD_W << bs->msg_type_shift);
-       switch (bs->msg_ctl_width) {
-@@ -241,14 +247,41 @@ static unsigned int bcm63xx_txrx_bufs(st
-       /* Issue the transfer */
-       cmd = SPI_CMD_START_IMMEDIATE;
--      cmd |= (0 << SPI_CMD_PREPEND_BYTE_CNT_SHIFT);
-+      cmd |= (prepend_len << SPI_CMD_PREPEND_BYTE_CNT_SHIFT);
-       cmd |= (spi->chip_select << SPI_CMD_DEVICE_ID_SHIFT);
-       bcm_spi_writew(bs, cmd, SPI_CMD);
-       /* Enable the CMD_DONE interrupt */
-       bcm_spi_writeb(bs, SPI_INTR_CMD_DONE, SPI_INT_MASK);
--      return t->len - bs->remaining_bytes;
-+      timeout = wait_for_completion_timeout(&bs->done, HZ);
-+      if (!timeout)
-+              return -ETIMEDOUT;
-+
-+      /* read out all data */
-+      rx_tail = bcm_spi_readb(bs, SPI_RX_TAIL);
-+
-+      if (do_rx && rx_tail != len)
-+              return -EINVAL;
-+
-+      if (!rx_tail)
-+              return total_len;
-+
-+      len = 0;
-+      t = first;
-+      /* Read out all the data */
-+      for (i = 0; i < n_transfers; i++) {
-+              if (t->rx_buf)
-+                      memcpy_fromio(t->rx_buf, bs->rx_io + len, t->len);
-+
-+              if (t != first || prepend_len == 0)
-+                      len += t->len;
-+
-+              t = list_entry(t->transfer_list.next, struct spi_transfer,
-+                             transfer_list);
-+      }
-+
-+      return total_len;
- }
- static int bcm63xx_spi_prepare_transfer(struct spi_master *master)
-@@ -273,42 +306,71 @@ static int bcm63xx_spi_transfer_one(stru
-                                       struct spi_message *m)
- {
-       struct bcm63xx_spi *bs = spi_master_get_devdata(master);
--      struct spi_transfer *t;
-+      struct spi_transfer *t, *first = NULL;
-       struct spi_device *spi = m->spi;
-       int status = 0;
--      unsigned int timeout = 0;
-+      unsigned int n_transfers = 0, total_len = 0;
-+      bool can_use_prepend = false;
-+      /*
-+       * This SPI controller does not support keeping CS active after a
-+       * transfer, so we need to combine the transfers into one until we may
-+       * deassert CS.
-+       */
-       list_for_each_entry(t, &m->transfers, transfer_list) {
--              unsigned int len = t->len;
--              u8 rx_tail;
--
-               status = bcm63xx_spi_check_transfer(spi, t);
-               if (status < 0)
-                       goto exit;
--              /* configure adapter for a new transfer */
--              bcm63xx_spi_setup_transfer(spi, t);
-+              if (!first)
-+                      first = t;
--              while (len) {
--                      /* send the data */
--                      len -= bcm63xx_txrx_bufs(spi, t);
--
--                      timeout = wait_for_completion_timeout(&bs->done, HZ);
--                      if (!timeout) {
--                              status = -ETIMEDOUT;
--                              goto exit;
--                      }
-+              n_transfers++;
-+              total_len += t->len;
-+
-+              if (n_transfers == 2 && !first->rx_buf && !t->tx_buf &&
-+                  first->len <= BCM63XX_SPI_MAX_PREPEND)
-+                      can_use_prepend = true;
-+              else if (can_use_prepend && t->tx_buf)
-+                      can_use_prepend = false;
-+
-+              if ((can_use_prepend &&
-+                   total_len > (bs->fifo_size + BCM63XX_SPI_MAX_PREPEND)) ||
-+                  (!can_use_prepend && total_len > bs->fifo_size)) {
-+                      status = -EINVAL;
-+                      goto exit;
-+              }
--                      /* read out all data */
--                      rx_tail = bcm_spi_readb(bs, SPI_RX_TAIL);
-+              /* all transfers have to be made at the same speed */
-+              if (t->speed_hz != first->speed_hz) {
-+                      status = -EINVAL;
-+                      goto exit;
-+              }
--                      /* Read out all the data */
--                      if (rx_tail)
--                              memcpy_fromio(bs->rx_ptr, bs->rx_io, rx_tail);
-+              /* CS will be deasserted directly after the transfer */
-+              if (t->delay_usecs) {
-+                      status = -EINVAL;
-+                      goto exit;
-               }
--              m->actual_length += t->len;
-+              if (t->cs_change ||
-+                  list_is_last(&t->transfer_list, &m->transfers)) {
-+                      /* configure adapter for a new transfer */
-+                      bcm63xx_spi_setup_transfer(spi, first);
-+
-+                      status = bcm63xx_txrx_bufs(spi, first, n_transfers);
-+                      if (status < 0)
-+                              goto exit;
-+
-+                      m->actual_length += status;
-+                      first = NULL;
-+                      status = 0;
-+                      n_transfers = 0;
-+                      total_len = 0;
-+                      can_use_prepend = false;
-+              }
-       }
-+
- exit:
-       m->status = status;
-       spi_finalize_current_message(master);
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
deleted file mode 100644 (file)
index 00dc9c9..0000000
+++ /dev/null
@@ -1,38 +0,0 @@
-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
deleted file mode 100644 (file)
index d616ac2..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
-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
deleted file mode 100644 (file)
index 47eebba..0000000
+++ /dev/null
@@ -1,92 +0,0 @@
-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
deleted file mode 100644 (file)
index 4161dc2..0000000
+++ /dev/null
@@ -1,116 +0,0 @@
---- 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
deleted file mode 100644 (file)
index 0111bd6..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
---- 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
deleted file mode 100644 (file)
index df9be10..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
---- 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
deleted file mode 100644 (file)
index b4d5388..0000000
+++ /dev/null
@@ -1,33 +0,0 @@
---- 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
deleted file mode 100644 (file)
index a463fe7..0000000
+++ /dev/null
@@ -1,61 +0,0 @@
---- 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 <linux/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
deleted file mode 100644 (file)
index 703f4b5..0000000
+++ /dev/null
@@ -1,96 +0,0 @@
---- 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
deleted file mode 100644 (file)
index aa7ef8b..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
-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
deleted file mode 100644 (file)
index 1418d65..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-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
deleted file mode 100644 (file)
index 8a11f82..0000000
+++ /dev/null
@@ -1,48 +0,0 @@
-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
deleted file mode 100644 (file)
index 5e2cd96..0000000
+++ /dev/null
@@ -1,211 +0,0 @@
-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           (0xb0002600)
-@@ -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            (BCM_6328_HIGH_IRQ_BASE + 9)
- #define BCM_6328_EHCI0_IRQ            (BCM_6328_HIGH_IRQ_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
-@@ -1239,4 +1239,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
deleted file mode 100644 (file)
index 8b307a2..0000000
+++ /dev/null
@@ -1,267 +0,0 @@
---- 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
deleted file mode 100644 (file)
index 835b85f..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
---- 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
deleted file mode 100644 (file)
index 9d2e101..0000000
+++ /dev/null
@@ -1,497 +0,0 @@
-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)
-@@ -1182,6 +1235,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
deleted file mode 100644 (file)
index 36024d1..0000000
+++ /dev/null
@@ -1,110 +0,0 @@
-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
-@@ -1231,7 +1231,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
deleted file mode 100644 (file)
index 572419c..0000000
+++ /dev/null
@@ -1,235 +0,0 @@
-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,176 @@
-+/*
-+ * 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) {
-+              dev_err(hcd->self.controller, "can't start %s\n",
-+                      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 OHCI_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
deleted file mode 100644 (file)
index 28a7e2f..0000000
+++ /dev/null
@@ -1,143 +0,0 @@
-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 <linux/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
deleted file mode 100644 (file)
index 207e981..0000000
+++ /dev/null
@@ -1,242 +0,0 @@
-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 EHCI_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) && !defined(EHCI_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
deleted file mode 100644 (file)
index eb27ed9..0000000
+++ /dev/null
@@ -1,125 +0,0 @@
-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 <linux/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
deleted file mode 100644 (file)
index 1aadfff..0000000
+++ /dev/null
@@ -1,65 +0,0 @@
-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
-@@ -72,6 +72,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
-@@ -176,6 +177,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;
-@@ -196,10 +207,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
deleted file mode 100644 (file)
index f0e6c4c..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
---- a/include/linux/bcm963xx_tag.h
-+++ b/include/linux/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
deleted file mode 100644 (file)
index 7d9f4a9..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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
deleted file mode 100644 (file)
index 9ce7737..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
---- 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
deleted file mode 100644 (file)
index 2102db3..0000000
+++ /dev/null
@@ -1,169 +0,0 @@
-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
deleted file mode 100644 (file)
index d143b47..0000000
+++ /dev/null
@@ -1,40 +0,0 @@
-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
deleted file mode 100644 (file)
index 11d035d..0000000
+++ /dev/null
@@ -1,69 +0,0 @@
-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
deleted file mode 100644 (file)
index a98bea9..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-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
deleted file mode 100644 (file)
index 90999fa..0000000
+++ /dev/null
@@ -1,381 +0,0 @@
-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
deleted file mode 100644 (file)
index 5c1cf05..0000000
+++ /dev/null
@@ -1,1490 +0,0 @@
-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
-@@ -809,10 +809,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
deleted file mode 100644 (file)
index 6d8e5a7..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-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
deleted file mode 100644 (file)
index 407c816..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-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
deleted file mode 100644 (file)
index 232668b..0000000
+++ /dev/null
@@ -1,98 +0,0 @@
-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
deleted file mode 100644 (file)
index 6f73477..0000000
+++ /dev/null
@@ -1,73 +0,0 @@
-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
deleted file mode 100644 (file)
index 6396b62..0000000
+++ /dev/null
@@ -1,69 +0,0 @@
-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
deleted file mode 100644 (file)
index da7013d..0000000
+++ /dev/null
@@ -1,87 +0,0 @@
-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
deleted file mode 100644 (file)
index 7d1f3f3..0000000
+++ /dev/null
@@ -1,53 +0,0 @@
-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
-@@ -838,6 +838,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
deleted file mode 100644 (file)
index 4306ce7..0000000
+++ /dev/null
@@ -1,93 +0,0 @@
-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
deleted file mode 100644 (file)
index e665249..0000000
+++ /dev/null
@@ -1,103 +0,0 @@
-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
deleted file mode 100644 (file)
index 51301d3..0000000
+++ /dev/null
@@ -1,128 +0,0 @@
-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
deleted file mode 100644 (file)
index 2b21396..0000000
+++ /dev/null
@@ -1,481 +0,0 @@
-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
deleted file mode 100644 (file)
index 14776af..0000000
+++ /dev/null
@@ -1,102 +0,0 @@
-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
-@@ -614,6 +614,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
-@@ -1308,6 +1309,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
deleted file mode 100644 (file)
index 98a229b..0000000
+++ /dev/null
@@ -1,50 +0,0 @@
-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
-@@ -1304,6 +1304,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
deleted file mode 100644 (file)
index f7f4e90..0000000
+++ /dev/null
@@ -1,351 +0,0 @@
-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
deleted file mode 100644 (file)
index 34966b2..0000000
+++ /dev/null
@@ -1,44 +0,0 @@
-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
deleted file mode 100644 (file)
index fd1bfc4..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-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 <linux/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
deleted file mode 100644 (file)
index de2216a..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
-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
deleted file mode 100644 (file)
index 5d35cbf..0000000
+++ /dev/null
@@ -1,81 +0,0 @@
-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 <linux/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