brcm63xx: drop linux 3.9 support
authorJonas Gorski <jogo@openwrt.org>
Fri, 6 Sep 2013 19:01:17 +0000 (19:01 +0000)
committerJonas Gorski <jogo@openwrt.org>
Fri, 6 Sep 2013 19:01:17 +0000 (19:01 +0000)
It is EOL since quite a while, so no need to keep it around.

Signed-off-by: Jonas Gorski <jogo@openwrt.org>
SVN-Revision: 37911

151 files changed:
target/linux/brcm63xx/config-3.9 [deleted file]
target/linux/brcm63xx/patches-3.9/005-spi-bcm63xx-properly-prepare-clocks-before-enabling-.patch [deleted file]
target/linux/brcm63xx/patches-3.9/006-spi-bcm63xx-remove-duplicated-mode-bits-check.patch [deleted file]
target/linux/brcm63xx/patches-3.9/007-spi-bcm63xx-remove-unneeded-debug-message.patch [deleted file]
target/linux/brcm63xx/patches-3.9/008-spi-bcm63xx-remove-unused-variable-bs-from-bcm63xx_s.patch [deleted file]
target/linux/brcm63xx/patches-3.9/009-spi-bcm63xx-check-spi-bits_per_word-in-spi_setup.patch [deleted file]
target/linux/brcm63xx/patches-3.9/010-spi-bcm63xx-simplify-bcm63xx_spi_check_transfer.patch [deleted file]
target/linux/brcm63xx/patches-3.9/011-spi-bcm63xx-remove-spi-chip-select-validity-check.patch [deleted file]
target/linux/brcm63xx/patches-3.9/012-spi-bcm63xx-inline-bcm63xx_spi_check_transfer.patch [deleted file]
target/linux/brcm63xx/patches-3.9/013-spi-bcm63xx-inline-hz-usage-in-bcm63xx_spi_setup_tra.patch [deleted file]
target/linux/brcm63xx/patches-3.9/014-spi-bcm63xx-use-devm_ioremap_resource.patch [deleted file]
target/linux/brcm63xx/patches-3.9/015-spi-bcm63xx-remove-unused-speed_hz-member-variable.patch [deleted file]
target/linux/brcm63xx/patches-3.9/018-MIPS-BCM63XX-merge-bcm63xx_clk.h-into-bcm63xx-clk.c.patch [deleted file]
target/linux/brcm63xx/patches-3.9/019-bcm63xx_enet-use-managed-io-memory-allocations.patch [deleted file]
target/linux/brcm63xx/patches-3.9/020-bcm63xx_enet-use-managed-memory-allocations.patch [deleted file]
target/linux/brcm63xx/patches-3.9/021-bcm63xx_enet-properly-prepare-unprepare-clocks-befor.patch [deleted file]
target/linux/brcm63xx/patches-3.9/022-MIPS-BCM63XX-remove-duplicate-spi-register-definitio.patch [deleted file]
target/linux/brcm63xx/patches-3.9/023-MIPS-BCM63XX-fix-revision-ID-width.patch [deleted file]
target/linux/brcm63xx/patches-3.9/024-MIPS-BCM63XX-rework-chip-detection.patch [deleted file]
target/linux/brcm63xx/patches-3.9/025-MIPS-BCM63XX-add-basic-BCM6362-support.patch [deleted file]
target/linux/brcm63xx/patches-3.9/026-MIPS-BCM63XX-enable-SPI-controller-for-BCM6362.patch [deleted file]
target/linux/brcm63xx/patches-3.9/027-MIPS-BCM63XX-enable-pcie-for-BCM6362.patch [deleted file]
target/linux/brcm63xx/patches-3.9/028-MIPS-BCM63XX-add-flash-detection-for-BCM6362.patch [deleted file]
target/linux/brcm63xx/patches-3.9/029-MIPS-BCM63XX-add-missing-clocks-for-BCM6328-and-BCM6.patch [deleted file]
target/linux/brcm63xx/patches-3.9/030-MTD-bcm63xxpart-use-size-macro-for-CFE-block-size.patch [deleted file]
target/linux/brcm63xx/patches-3.9/031-MIPS-BCM63XX-export-PSI-size-from-nvram.patch [deleted file]
target/linux/brcm63xx/patches-3.9/032-MTD-bcm63xxpart-use-nvram-for-PSI-size.patch [deleted file]
target/linux/brcm63xx/patches-3.9/033-MIPS-BCM63XX-Handle-SW-IRQs-0-1.patch [deleted file]
target/linux/brcm63xx/patches-3.9/034-MIPS-BCM63XX-select-BMIPS4350-and-default-to-2-CPUs-.patch [deleted file]
target/linux/brcm63xx/patches-3.9/035-MIPS-BCM63XX-select-BOOT_RAW.patch [deleted file]
target/linux/brcm63xx/patches-3.9/036-MIPS-BCM63XX-add-support-for-BCM3368-Cable-Modem.patch [deleted file]
target/linux/brcm63xx/patches-3.9/037-MIPS-BCM63XX-recognize-Cable-Modem-firmware-format.patch [deleted file]
target/linux/brcm63xx/patches-3.9/038-MIPS-BCM63XX-provide-a-MAC-address-for-BCM3368-chips.patch [deleted file]
target/linux/brcm63xx/patches-3.9/039-MIPS-BCM63XX-let-board-specify-an-external-GPIO-to-r.patch [deleted file]
target/linux/brcm63xx/patches-3.9/040-MIPS-BCM63XX-add-support-for-the-Netgear-CVG834G.patch [deleted file]
target/linux/brcm63xx/patches-3.9/041-MIPS-BCM63XX-remove-bogus-Kconfig-selects.patch [deleted file]
target/linux/brcm63xx/patches-3.9/042-MIPS-BMIPS-support-booting-from-physical-CPU-other-t.patch [deleted file]
target/linux/brcm63xx/patches-3.9/043-MIPS-BCM63XX-Add-SMP-support-to-prom.c.patch [deleted file]
target/linux/brcm63xx/patches-3.9/044-MIPS-BCM63XX-Enable-second-core-SMP-on-BCM6328-if-av.patch [deleted file]
target/linux/brcm63xx/patches-3.9/045-bcm63xx_enet-implement-reset-autoneg-ethtool-callbac.patch [deleted file]
target/linux/brcm63xx/patches-3.9/046-bcm63xx_enet-split-DMA-channel-register-accesses.patch [deleted file]
target/linux/brcm63xx/patches-3.9/047-bcm63xx_enet-add-support-for-Broadcom-BCM63xx-integr.patch [deleted file]
target/linux/brcm63xx/patches-3.9/048-bcm63xx_enet-add-support-Broadcom-BCM6345-Ethernet.patch [deleted file]
target/linux/brcm63xx/patches-3.9/100-MIPS-bmips-fix-compilation-for-BMIPS5000.patch [deleted file]
target/linux/brcm63xx/patches-3.9/101-MIPS-allow-asm-cpu.h-to-be-included-from-assembly.patch [deleted file]
target/linux/brcm63xx/patches-3.9/102-MIPS-bmips-add-macros-for-testing-the-current-bmips-.patch [deleted file]
target/linux/brcm63xx/patches-3.9/103-MIPS-bmips-change-compile-time-checks-to-runtime-che.patch [deleted file]
target/linux/brcm63xx/patches-3.9/104-MIPS-bmips-merge-CPU-options-into-one-option.patch [deleted file]
target/linux/brcm63xx/patches-3.9/105-MIPS-BCM63XX-let-the-individual-SoCs-select-the-appr.patch [deleted file]
target/linux/brcm63xx/patches-3.9/106-MIPS-bmips-add-a-helper-function-for-registering-smp.patch [deleted file]
target/linux/brcm63xx/patches-3.9/107-MIPS-BCM63XX-always-register-bmips-smp-ops.patch [deleted file]
target/linux/brcm63xx/patches-3.9/108-MIPS-BCM63XX-change-the-guard-to-a-BMIPS4350-check.patch [deleted file]
target/linux/brcm63xx/patches-3.9/109-MIPS-BCM63XX-disable-SMP-also-on-BCM3368.patch [deleted file]
target/linux/brcm63xx/patches-3.9/110-MIPS-BCM63XX-add-USB-host-clock-enable-delay.patch [deleted file]
target/linux/brcm63xx/patches-3.9/111-MIPS-BCM63XX-add-USB-device-clock-enable-delay-to-cl.patch [deleted file]
target/linux/brcm63xx/patches-3.9/112-MIPS-BCM63XX-move-code-touching-the-USB-private-regi.patch [deleted file]
target/linux/brcm63xx/patches-3.9/113-MIPS-BCM63XX-add-OHCI-EHCI-configuration-bits-to-com.patch [deleted file]
target/linux/brcm63xx/patches-3.9/114-MIPS-BCM63XX-introduce-BCM63XX_OHCI-configuration-sy.patch [deleted file]
target/linux/brcm63xx/patches-3.9/115-MIPS-BCM63XX-add-support-for-the-on-chip-OHCI-contro.patch [deleted file]
target/linux/brcm63xx/patches-3.9/116-MIPS-BCM63XX-register-OHCI-controller-if-board-enabl.patch [deleted file]
target/linux/brcm63xx/patches-3.9/117-MIPS-BCM63XX-introduce-BCM63XX_EHCI-configuration-sy.patch [deleted file]
target/linux/brcm63xx/patches-3.9/118-MIPS-BCM63XX-add-support-for-the-on-chip-EHCI-contro.patch [deleted file]
target/linux/brcm63xx/patches-3.9/119-MIPS-BCM63XX-register-EHCI-controller-if-board-enabl.patch [deleted file]
target/linux/brcm63xx/patches-3.9/120-MIPS-BCM63XX-EHCI-controller-does-not-support-overcu.patch [deleted file]
target/linux/brcm63xx/patches-3.9/201-SPI-Allow-specifying-the-parsers-for-SPI-flash.patch [deleted file]
target/linux/brcm63xx/patches-3.9/202-MTD-DEVICES-m25p80-use-parsers-if-provided-in-flash-.patch [deleted file]
target/linux/brcm63xx/patches-3.9/203-MTD-DEVICES-m25p80-add-support-for-limiting-reads.patch [deleted file]
target/linux/brcm63xx/patches-3.9/300-reset_buttons.patch [deleted file]
target/linux/brcm63xx/patches-3.9/301-led_count.patch [deleted file]
target/linux/brcm63xx/patches-3.9/302-extended-platform-devices.patch [deleted file]
target/linux/brcm63xx/patches-3.9/303-spi-board-info.patch [deleted file]
target/linux/brcm63xx/patches-3.9/304-boardid_fixup.patch [deleted file]
target/linux/brcm63xx/patches-3.9/306-MIPS-BCM63XX-expose-the-HS-SPI-clock.patch [deleted file]
target/linux/brcm63xx/patches-3.9/307-MIPS-BCM63XX-add-HSSPI-register-definitions.patch [deleted file]
target/linux/brcm63xx/patches-3.9/308-board_leds_naming.patch [deleted file]
target/linux/brcm63xx/patches-3.9/309-cfe_version_mod.patch [deleted file]
target/linux/brcm63xx/patches-3.9/313-MIPS-BCM63XX-rename-__dispatch_internal-to-__dispatc.patch [deleted file]
target/linux/brcm63xx/patches-3.9/314-MIPS-BCM63XX-replace-irq-dispatch-code-with-a-generi.patch [deleted file]
target/linux/brcm63xx/patches-3.9/315-MIPS-BCM63XX-append-cpu-number-to-irq_-stat-mask.patch [deleted file]
target/linux/brcm63xx/patches-3.9/316-MIPS-BCM63XX-populate-irq_-stat-mask-_addr-for-secon.patch [deleted file]
target/linux/brcm63xx/patches-3.9/317-MIPS-BCM63XX-use-a-helper-for-getting-the-right-regi.patch [deleted file]
target/linux/brcm63xx/patches-3.9/318-MIPS-BCM63XX-add-cpu-argument-to-dispatch-internal.patch [deleted file]
target/linux/brcm63xx/patches-3.9/319-MIPS-BCM63XX-protect-irq-register-accesses.patch [deleted file]
target/linux/brcm63xx/patches-3.9/320-MIPS-BCM63XX-wire-up-the-second-CPU-s-irq-line.patch [deleted file]
target/linux/brcm63xx/patches-3.9/321-MIPS-BCM63XX-use-irq_desc-as-argument-for-un-mask.patch [deleted file]
target/linux/brcm63xx/patches-3.9/322-MIPS-BCM63XX-allow-setting-affinity-for-IPIC.patch [deleted file]
target/linux/brcm63xx/patches-3.9/323-cfe_simplify_detection.patch [deleted file]
target/linux/brcm63xx/patches-3.9/324-bcm63xxpart_use_cfedetection.patch [deleted file]
target/linux/brcm63xx/patches-3.9/400-bcm963xx_flashmap.patch [deleted file]
target/linux/brcm63xx/patches-3.9/401-bcm963xx_real_rootfs_length.patch [deleted file]
target/linux/brcm63xx/patches-3.9/402_bcm63xx_enet_vlan_incoming_fixed.patch [deleted file]
target/linux/brcm63xx/patches-3.9/403-6358-enet1-external-mii-clk.patch [deleted file]
target/linux/brcm63xx/patches-3.9/404-NET-bcm63xx_enet-move-phy_-dis-connect-into-probe-re.patch [deleted file]
target/linux/brcm63xx/patches-3.9/408-bcm63xx_enet-enable-rgmii-clock-on-external-ports.patch [deleted file]
target/linux/brcm63xx/patches-3.9/409-MIPS-BCM63XX-add-HS-SPI-platform-device-and-register.patch [deleted file]
target/linux/brcm63xx/patches-3.9/410-SPI-MIPS-BCM63XX-Add-HS-SPI-driver.patch [deleted file]
target/linux/brcm63xx/patches-3.9/411-MIPS-BCM63XX-Register-SPI-flash-if-present.patch [deleted file]
target/linux/brcm63xx/patches-3.9/412-MTD-physmap-allow-passing-pp_data.patch [deleted file]
target/linux/brcm63xx/patches-3.9/413-BCM63XX-allow-providing-fixup-data-in-board-data.patch [deleted file]
target/linux/brcm63xx/patches-3.9/414-MTD-m25p80-allow-passing-pp_data.patch [deleted file]
target/linux/brcm63xx/patches-3.9/415-MIPS-BCM63XX-store-the-flash-type-in-global-variable.patch [deleted file]
target/linux/brcm63xx/patches-3.9/416-BCM63XX-add-a-fixup-for-ath9k-devices.patch [deleted file]
target/linux/brcm63xx/patches-3.9/417-MTD-bcm63xxpart-allow-passing-a-caldata-offset.patch [deleted file]
target/linux/brcm63xx/patches-3.9/418-MIPS-BCM63XX-pass-caldata-info-to-flash.patch [deleted file]
target/linux/brcm63xx/patches-3.9/420-BCM63XX-add-endian-check-for-ath9k.patch [deleted file]
target/linux/brcm63xx/patches-3.9/421-BCM63XX-add-led-pin-for-ath9k.patch [deleted file]
target/linux/brcm63xx/patches-3.9/422-BCM63XX-add-a-fixup-for-rt2x00-devices.patch [deleted file]
target/linux/brcm63xx/patches-3.9/423-bcm63xx_enet_add_b53_support.patch [deleted file]
target/linux/brcm63xx/patches-3.9/500-board-D4PW.patch [deleted file]
target/linux/brcm63xx/patches-3.9/501-board-NB4.patch [deleted file]
target/linux/brcm63xx/patches-3.9/502-board-96338W2_E7T.patch [deleted file]
target/linux/brcm63xx/patches-3.9/503-board-CPVA642.patch [deleted file]
target/linux/brcm63xx/patches-3.9/504-board_dsl_274xb_rev_c.patch [deleted file]
target/linux/brcm63xx/patches-3.9/505-board_spw500v.patch [deleted file]
target/linux/brcm63xx/patches-3.9/506-board_gw6200_gw6000.patch [deleted file]
target/linux/brcm63xx/patches-3.9/507-board-MAGIC.patch [deleted file]
target/linux/brcm63xx/patches-3.9/508-board_hw553.patch [deleted file]
target/linux/brcm63xx/patches-3.9/509-board_rta1320_16m.patch [deleted file]
target/linux/brcm63xx/patches-3.9/510-board_spw303v.patch [deleted file]
target/linux/brcm63xx/patches-3.9/511-board_V2500V.patch [deleted file]
target/linux/brcm63xx/patches-3.9/512-board_BTV2110.patch [deleted file]
target/linux/brcm63xx/patches-3.9/513-board_livebox.patch [deleted file]
target/linux/brcm63xx/patches-3.9/514-board_ct536_ct5621.patch [deleted file]
target/linux/brcm63xx/patches-3.9/515-board_DWV-S0_fixes.patch [deleted file]
target/linux/brcm63xx/patches-3.9/516-board_96348A-122.patch [deleted file]
target/linux/brcm63xx/patches-3.9/517-RTA1205W_16_uart_fixes.patch [deleted file]
target/linux/brcm63xx/patches-3.9/519_board_CPVA502plus.patch [deleted file]
target/linux/brcm63xx/patches-3.9/520-bcm63xx-add-support-for-96368MVWG-board.patch [deleted file]
target/linux/brcm63xx/patches-3.9/521-bcm63xx-add-support-for-96368MVNgr-board.patch [deleted file]
target/linux/brcm63xx/patches-3.9/522-MIPS-BCM63XX-add-96328avng-reference-board.patch [deleted file]
target/linux/brcm63xx/patches-3.9/523-MIPS-BCM63XX-add-963281TAN-reference-board.patch [deleted file]
target/linux/brcm63xx/patches-3.9/524-board_dsl_274xb_rev_f.patch [deleted file]
target/linux/brcm63xx/patches-3.9/525-board_96348w3.patch [deleted file]
target/linux/brcm63xx/patches-3.9/526-board_CT6373-1.patch [deleted file]
target/linux/brcm63xx/patches-3.9/527-board_dva-g3810bn-tl-1.patch [deleted file]
target/linux/brcm63xx/patches-3.9/528-board_nb6.patch [deleted file]
target/linux/brcm63xx/patches-3.9/529-board_fast2604.patch [deleted file]
target/linux/brcm63xx/patches-3.9/530-board_963281T_TEF.patch [deleted file]
target/linux/brcm63xx/patches-3.9/531-board_96328A-1441N1.patch [deleted file]
target/linux/brcm63xx/patches-3.9/532-board_96328a-1241N.patch [deleted file]
target/linux/brcm63xx/patches-3.9/533-board_rta770bw.patch [deleted file]
target/linux/brcm63xx/patches-3.9/534-board_hw556.patch [deleted file]
target/linux/brcm63xx/patches-3.9/535-board_rta770w.patch [deleted file]
target/linux/brcm63xx/patches-3.9/550-alice_gate2_leds.patch [deleted file]
target/linux/brcm63xx/patches-3.9/551-96348gw_a_leds.patch [deleted file]
target/linux/brcm63xx/patches-3.9/552-board_96348gw-10_reset_button.patch [deleted file]
target/linux/brcm63xx/patches-3.9/553-boards_probe_switch.patch [deleted file]
target/linux/brcm63xx/patches-3.9/554-board_DWVS0_leds_buttons.patch [deleted file]
target/linux/brcm63xx/patches-3.9/800-wl_exports.patch [deleted file]
target/linux/brcm63xx/patches-3.9/801-ssb_export_fallback_sprom.patch [deleted file]
target/linux/brcm63xx/patches-3.9/802-rtl8367r_fix_RGMII_support.patch [deleted file]

diff --git a/target/linux/brcm63xx/config-3.9 b/target/linux/brcm63xx/config-3.9
deleted file mode 100644 (file)
index 6d87c18..0000000
+++ /dev/null
@@ -1,189 +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_3368=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_EHCI=y
-CONFIG_BCM63XX_ENET=y
-CONFIG_BCM63XX_OHCI=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_CLONE_BACKWARDS=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_BMIPS is not set
-CONFIG_CPU_GENERIC_DUMP_TLB=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_R4K_CACHE_TLB=y
-CONFIG_CPU_R4K_FPU=y
-CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y
-CONFIG_CPU_SUPPORTS_HIGHMEM=y
-CONFIG_CSRC_R4K=y
-CONFIG_DECOMPRESS_LZMA=y
-CONFIG_DMA_NONCOHERENT=y
-CONFIG_EARLY_PRINTK=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_DEVRES=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_64BIT_ALIGNED_ACCESS is not set
-CONFIG_HAVE_ARCH_JUMP_LABEL=y
-CONFIG_HAVE_ARCH_KGDB=y
-# CONFIG_HAVE_BOOTMEM_INFO_NODE is not set
-CONFIG_HAVE_CLK=y
-CONFIG_HAVE_C_RECORDMCOUNT=y
-CONFIG_HAVE_DEBUG_KMEMLEAK=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_MEMBLOCK=y
-CONFIG_HAVE_MEMBLOCK_NODE_MAP=y
-CONFIG_HAVE_MOD_ARCH_SPECIFIC=y
-CONFIG_HAVE_NET_DSA=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_IRQ_WORK=y
-CONFIG_KEXEC=y
-CONFIG_LEDS_GPIO=y
-CONFIG_M25PXX_USE_FAST_READ=y
-CONFIG_MDIO_BOARDINFO=y
-CONFIG_MIPS=y
-# CONFIG_MIPS_HUGE_TLB_SUPPORT is not set
-CONFIG_MIPS_L1_CACHE_SHIFT=5
-# CONFIG_MIPS_MACHINE is not set
-CONFIG_MIPS_MT_DISABLED=y
-CONFIG_MODULES_USE_ELF_REL=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_NR_CPUS_DEFAULT_2=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_RCU_STALL_COMMON 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_BMIPS=y
-CONFIG_SYS_HAS_CPU_BMIPS3300=y
-CONFIG_SYS_HAS_CPU_BMIPS4350=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_TICK_CPU_ACCOUNTING=y
-CONFIG_UIDGID_CONVERTED=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.9/005-spi-bcm63xx-properly-prepare-clocks-before-enabling-.patch b/target/linux/brcm63xx/patches-3.9/005-spi-bcm63xx-properly-prepare-clocks-before-enabling-.patch
deleted file mode 100644 (file)
index b75a57c..0000000
+++ /dev/null
@@ -1,61 +0,0 @@
-From e504d3ed9b35f43e61cf239b103667d87cd7bf3c Mon Sep 17 00:00:00 2001
-From: Jonas Gorski <jogo@openwrt.org>
-Date: Mon, 10 Sep 2012 01:26:55 +0200
-Subject: [PATCH 03/12] spi/bcm63xx: properly prepare clocks before enabling
- them
-
-Use proper clk_prepare/unprepare calls in preparation for switching
-to the generic clock framework.
-
-Signed-off-by: Jonas Gorski <jogo@openwrt.org>
----
- drivers/spi/spi-bcm63xx.c |   10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
---- a/drivers/spi/spi-bcm63xx.c
-+++ b/drivers/spi/spi-bcm63xx.c
-@@ -493,7 +493,7 @@ static int bcm63xx_spi_probe(struct plat
-       }
-       /* Initialize hardware */
--      clk_enable(bs->clk);
-+      clk_prepare_enable(bs->clk);
-       bcm_spi_writeb(bs, SPI_INTR_CLEAR_ALL, SPI_INT_STATUS);
-       /* register and we are done */
-@@ -509,7 +509,7 @@ static int bcm63xx_spi_probe(struct plat
-       return 0;
- out_clk_disable:
--      clk_disable(clk);
-+      clk_disable_unprepare(clk);
- out_err:
-       platform_set_drvdata(pdev, NULL);
-       spi_master_put(master);
-@@ -530,7 +530,7 @@ static int bcm63xx_spi_remove(struct pla
-       bcm_spi_writeb(bs, 0, SPI_INT_MASK);
-       /* HW shutdown */
--      clk_disable(bs->clk);
-+      clk_disable_unprepare(bs->clk);
-       clk_put(bs->clk);
-       platform_set_drvdata(pdev, 0);
-@@ -549,7 +549,7 @@ static int bcm63xx_spi_suspend(struct de
-       spi_master_suspend(master);
--      clk_disable(bs->clk);
-+      clk_disable_unprepare(bs->clk);
-       return 0;
- }
-@@ -560,7 +560,7 @@ static int bcm63xx_spi_resume(struct dev
-                       platform_get_drvdata(to_platform_device(dev));
-       struct bcm63xx_spi *bs = spi_master_get_devdata(master);
--      clk_enable(bs->clk);
-+      clk_prepare_enable(bs->clk);
-       spi_master_resume(master);
diff --git a/target/linux/brcm63xx/patches-3.9/006-spi-bcm63xx-remove-duplicated-mode-bits-check.patch b/target/linux/brcm63xx/patches-3.9/006-spi-bcm63xx-remove-duplicated-mode-bits-check.patch
deleted file mode 100644 (file)
index d387300..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
-From 3abf34d4e0460bb098fabe3cc8207108bae1905a Mon Sep 17 00:00:00 2001
-From: Jonas Gorski <jogo@openwrt.org>
-Date: Mon, 11 Mar 2013 13:40:26 +0100
-Subject: [PATCH 04/12] spi/bcm63xx: remove duplicated mode bits check
-
-The spi subsystem already checks the mode bits before calling setup.
-
-Signed-off-by: Jonas Gorski <jogo@openwrt.org>
----
- drivers/spi/spi-bcm63xx.c |    6 ------
- 1 file changed, 6 deletions(-)
-
---- a/drivers/spi/spi-bcm63xx.c
-+++ b/drivers/spi/spi-bcm63xx.c
-@@ -158,12 +158,6 @@ static int bcm63xx_spi_setup(struct spi_
-       if (!spi->bits_per_word)
-               spi->bits_per_word = 8;
--      if (spi->mode & ~MODEBITS) {
--              dev_err(&spi->dev, "%s, unsupported mode bits %x\n",
--                      __func__, spi->mode & ~MODEBITS);
--              return -EINVAL;
--      }
--
-       dev_dbg(&spi->dev, "%s, mode %d, %u bits/w, %u nsec/bit\n",
-               __func__, spi->mode & MODEBITS, spi->bits_per_word, 0);
diff --git a/target/linux/brcm63xx/patches-3.9/007-spi-bcm63xx-remove-unneeded-debug-message.patch b/target/linux/brcm63xx/patches-3.9/007-spi-bcm63xx-remove-unneeded-debug-message.patch
deleted file mode 100644 (file)
index a7fae94..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-From ee18b0ac561afb9dd7d87a4217e80151a7e29dfc Mon Sep 17 00:00:00 2001
-From: Jonas Gorski <jogo@openwrt.org>
-Date: Mon, 11 Mar 2013 13:42:22 +0100
-Subject: [PATCH 05/12] spi/bcm63xx: remove unneeded debug message
-
-The spi subsystem already provides this info in a more extensive
-debug print except for the nsecs/bit - which wasn't calculated anyway
-and fixed to 0.
-
-Signed-off-by: Jonas Gorski <jogo@openwrt.org>
----
- drivers/spi/spi-bcm63xx.c |    3 ---
- 1 file changed, 3 deletions(-)
-
---- a/drivers/spi/spi-bcm63xx.c
-+++ b/drivers/spi/spi-bcm63xx.c
-@@ -158,9 +158,6 @@ static int bcm63xx_spi_setup(struct spi_
-       if (!spi->bits_per_word)
-               spi->bits_per_word = 8;
--      dev_dbg(&spi->dev, "%s, mode %d, %u bits/w, %u nsec/bit\n",
--              __func__, spi->mode & MODEBITS, spi->bits_per_word, 0);
--
-       return 0;
- }
diff --git a/target/linux/brcm63xx/patches-3.9/008-spi-bcm63xx-remove-unused-variable-bs-from-bcm63xx_s.patch b/target/linux/brcm63xx/patches-3.9/008-spi-bcm63xx-remove-unused-variable-bs-from-bcm63xx_s.patch
deleted file mode 100644 (file)
index 81ea919..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-From 30151fe21befa84d9cd27d63f1bf3973988c811e Mon Sep 17 00:00:00 2001
-From: Jonas Gorski <jogo@openwrt.org>
-Date: Mon, 11 Mar 2013 13:47:19 +0100
-Subject: [PATCH 06/12] spi/bcm63xx: remove unused variable bs from
- bcm63xx_spi_setup
-
-It is only written, but never read.
-
-Signed-off-by: Jonas Gorski <jogo@openwrt.org>
----
- drivers/spi/spi-bcm63xx.c |    4 ----
- 1 file changed, 4 deletions(-)
-
---- a/drivers/spi/spi-bcm63xx.c
-+++ b/drivers/spi/spi-bcm63xx.c
-@@ -151,10 +151,6 @@ static void bcm63xx_spi_setup_transfer(s
- static int bcm63xx_spi_setup(struct spi_device *spi)
- {
--      struct bcm63xx_spi *bs;
--
--      bs = spi_master_get_devdata(spi->master);
--
-       if (!spi->bits_per_word)
-               spi->bits_per_word = 8;
diff --git a/target/linux/brcm63xx/patches-3.9/009-spi-bcm63xx-check-spi-bits_per_word-in-spi_setup.patch b/target/linux/brcm63xx/patches-3.9/009-spi-bcm63xx-check-spi-bits_per_word-in-spi_setup.patch
deleted file mode 100644 (file)
index 49a7ac2..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-From 13a364be644ed9b4666d452756556bb98afdcc56 Mon Sep 17 00:00:00 2001
-From: Jonas Gorski <jogo@openwrt.org>
-Date: Mon, 11 Mar 2013 13:48:27 +0100
-Subject: [PATCH 07/12] spi/bcm63xx: check spi bits_per_word in spi_setup
-
-Instead of fixing up the bits_per_word (which the spi subsystem already
-does for us), check it for supported values.
-
-Signed-off-by: Jonas Gorski <jogo@openwrt.org>
----
- drivers/spi/spi-bcm63xx.c |    7 +++++--
- 1 file changed, 5 insertions(+), 2 deletions(-)
-
---- a/drivers/spi/spi-bcm63xx.c
-+++ b/drivers/spi/spi-bcm63xx.c
-@@ -151,8 +151,11 @@ static void bcm63xx_spi_setup_transfer(s
- static int bcm63xx_spi_setup(struct spi_device *spi)
- {
--      if (!spi->bits_per_word)
--              spi->bits_per_word = 8;
-+      if (spi->bits_per_word != 8) {
-+              dev_err(&spi->dev, "%s, unsupported bits_per_word=%d\n",
-+                      __func__, spi->bits_per_word);
-+              return -EINVAL;
-+      }
-       return 0;
- }
diff --git a/target/linux/brcm63xx/patches-3.9/010-spi-bcm63xx-simplify-bcm63xx_spi_check_transfer.patch b/target/linux/brcm63xx/patches-3.9/010-spi-bcm63xx-simplify-bcm63xx_spi_check_transfer.patch
deleted file mode 100644 (file)
index 57c1e46..0000000
+++ /dev/null
@@ -1,30 +0,0 @@
-From d69ac73da38f0d16cc6b4524cd734b907db6eab8 Mon Sep 17 00:00:00 2001
-From: Jonas Gorski <jogo@openwrt.org>
-Date: Mon, 11 Mar 2013 13:51:10 +0100
-Subject: [PATCH 08/12] spi/bcm63xx: simplify bcm63xx_spi_check_transfer
-
-bcm63xx_spi_check_transfer is only called from one place that has
-t always set, so directly check the transfer's bits_per_word.
-
-Signed-off-by: Jonas Gorski <jogo@openwrt.org>
----
- drivers/spi/spi-bcm63xx.c |    7 ++-----
- 1 file changed, 2 insertions(+), 5 deletions(-)
-
---- a/drivers/spi/spi-bcm63xx.c
-+++ b/drivers/spi/spi-bcm63xx.c
-@@ -96,12 +96,9 @@ static const unsigned bcm63xx_spi_freq_t
- static int bcm63xx_spi_check_transfer(struct spi_device *spi,
-                                       struct spi_transfer *t)
- {
--      u8 bits_per_word;
--
--      bits_per_word = (t) ? t->bits_per_word : spi->bits_per_word;
--      if (bits_per_word != 8) {
-+      if (t->bits_per_word != 8) {
-               dev_err(&spi->dev, "%s, unsupported bits_per_word=%d\n",
--                      __func__, bits_per_word);
-+                      __func__, t->bits_per_word);
-               return -EINVAL;
-       }
diff --git a/target/linux/brcm63xx/patches-3.9/011-spi-bcm63xx-remove-spi-chip-select-validity-check.patch b/target/linux/brcm63xx/patches-3.9/011-spi-bcm63xx-remove-spi-chip-select-validity-check.patch
deleted file mode 100644 (file)
index 4f1a1cc..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-From 9c5a988562468823a5e2973f04134a8bd97e7718 Mon Sep 17 00:00:00 2001
-From: Jonas Gorski <jogo@openwrt.org>
-Date: Mon, 11 Mar 2013 13:53:16 +0100
-Subject: [PATCH 09/12] spi/bcm63xx: remove spi chip select validity check
-
-The check would belong in bcm63xx_spi_setup if the spi subsystem
-weren't already doing the check for us, so just drop it.
-
-Signed-off-by: Jonas Gorski <jogo@openwrt.org>
----
- drivers/spi/spi-bcm63xx.c |    6 ------
- 1 file changed, 6 deletions(-)
-
---- a/drivers/spi/spi-bcm63xx.c
-+++ b/drivers/spi/spi-bcm63xx.c
-@@ -102,12 +102,6 @@ static int bcm63xx_spi_check_transfer(st
-               return -EINVAL;
-       }
--      if (spi->chip_select > spi->master->num_chipselect) {
--              dev_err(&spi->dev, "%s, unsupported slave %d\n",
--                      __func__, spi->chip_select);
--              return -EINVAL;
--      }
--
-       return 0;
- }
diff --git a/target/linux/brcm63xx/patches-3.9/012-spi-bcm63xx-inline-bcm63xx_spi_check_transfer.patch b/target/linux/brcm63xx/patches-3.9/012-spi-bcm63xx-inline-bcm63xx_spi_check_transfer.patch
deleted file mode 100644 (file)
index f684d83..0000000
+++ /dev/null
@@ -1,48 +0,0 @@
-From 3fffc5f76c830c375692a67948734168ee4c516a Mon Sep 17 00:00:00 2001
-From: Jonas Gorski <jogo@openwrt.org>
-Date: Mon, 11 Mar 2013 13:59:30 +0100
-Subject: [PATCH 10/12] spi/bcm63xx: inline bcm63xx_spi_check_transfer
-
-It only does one check, so just do the check directly in the caller.
-
-Signed-off-by: Jonas Gorski <jogo@openwrt.org>
----
- drivers/spi/spi-bcm63xx.c |   19 +++++--------------
- 1 file changed, 5 insertions(+), 14 deletions(-)
-
---- a/drivers/spi/spi-bcm63xx.c
-+++ b/drivers/spi/spi-bcm63xx.c
-@@ -93,18 +93,6 @@ static const unsigned bcm63xx_spi_freq_t
-       {   391000, SPI_CLK_0_391MHZ }
- };
--static int bcm63xx_spi_check_transfer(struct spi_device *spi,
--                                      struct spi_transfer *t)
--{
--      if (t->bits_per_word != 8) {
--              dev_err(&spi->dev, "%s, unsupported bits_per_word=%d\n",
--                      __func__, t->bits_per_word);
--              return -EINVAL;
--      }
--
--      return 0;
--}
--
- static void bcm63xx_spi_setup_transfer(struct spi_device *spi,
-                                     struct spi_transfer *t)
- {
-@@ -293,9 +281,12 @@ static int bcm63xx_spi_transfer_one(stru
-        * full-duplex transfers.
-        */
-       list_for_each_entry(t, &m->transfers, transfer_list) {
--              status = bcm63xx_spi_check_transfer(spi, t);
--              if (status < 0)
-+              if (t->bits_per_word != 8) {
-+                      dev_err(&spi->dev, "%s, unsupported bits_per_word=%d\n",
-+                              __func__, t->bits_per_word);
-+                      status = -EINVAL;
-                       goto exit;
-+              }
-               if (!first)
-                       first = t;
diff --git a/target/linux/brcm63xx/patches-3.9/013-spi-bcm63xx-inline-hz-usage-in-bcm63xx_spi_setup_tra.patch b/target/linux/brcm63xx/patches-3.9/013-spi-bcm63xx-inline-hz-usage-in-bcm63xx_spi_setup_tra.patch
deleted file mode 100644 (file)
index fba37d5..0000000
+++ /dev/null
@@ -1,43 +0,0 @@
-From 2646be877afc663d1688a2add8386b027c9d7e31 Mon Sep 17 00:00:00 2001
-From: Jonas Gorski <jogo@openwrt.org>
-Date: Mon, 11 Mar 2013 14:08:06 +0100
-Subject: [PATCH 11/12] spi/bcm63xx: inline hz usage in
- bcm63xx_spi_setup_transfer
-
-bcm63xx_spi_setup_transfer is called from only one place, and that has
-t always set, to hz will always be t->speed_hz - just use it directly in
-the two places instead of moving it in a local variable.
-
-Signed-off-by: Jonas Gorski <jogo@openwrt.org>
----
- drivers/spi/spi-bcm63xx.c |    7 ++-----
- 1 file changed, 2 insertions(+), 5 deletions(-)
-
---- a/drivers/spi/spi-bcm63xx.c
-+++ b/drivers/spi/spi-bcm63xx.c
-@@ -97,15 +97,12 @@ static void bcm63xx_spi_setup_transfer(s
-                                     struct spi_transfer *t)
- {
-       struct bcm63xx_spi *bs = spi_master_get_devdata(spi->master);
--      u32 hz;
-       u8 clk_cfg, reg;
-       int i;
--      hz = (t) ? t->speed_hz : spi->max_speed_hz;
--
-       /* Find the closest clock configuration */
-       for (i = 0; i < SPI_CLK_MASK; i++) {
--              if (hz >= bcm63xx_spi_freq_table[i][0]) {
-+              if (t->speed_hz >= bcm63xx_spi_freq_table[i][0]) {
-                       clk_cfg = bcm63xx_spi_freq_table[i][1];
-                       break;
-               }
-@@ -122,7 +119,7 @@ static void bcm63xx_spi_setup_transfer(s
-       bcm_spi_writeb(bs, reg, SPI_CLK_CFG);
-       dev_dbg(&spi->dev, "Setting clock register to %02x (hz %d)\n",
--              clk_cfg, hz);
-+              clk_cfg, t->speed_hz);
- }
- /* the spi->mode bits understood by this driver: */
diff --git a/target/linux/brcm63xx/patches-3.9/014-spi-bcm63xx-use-devm_ioremap_resource.patch b/target/linux/brcm63xx/patches-3.9/014-spi-bcm63xx-use-devm_ioremap_resource.patch
deleted file mode 100644 (file)
index 82fbe6c..0000000
+++ /dev/null
@@ -1,36 +0,0 @@
-From 95af2d7751d31ea07b7a0d8ec7030f6c62df0ae2 Mon Sep 17 00:00:00 2001
-From: Jonas Gorski <jogo@openwrt.org>
-Date: Mon, 11 Mar 2013 14:20:33 +0100
-Subject: [PATCH 12/12] spi/bcm63xx: use devm_ioremap_resource()
-
-Use devm_ioremap_resource() which provides its own error messages.
-
-Signed-off-by: Jonas Gorski <jogo@openwrt.org>
----
- drivers/spi/spi-bcm63xx.c |   15 +++------------
- 1 file changed, 3 insertions(+), 12 deletions(-)
-
---- a/drivers/spi/spi-bcm63xx.c
-+++ b/drivers/spi/spi-bcm63xx.c
-@@ -412,18 +412,9 @@ static int bcm63xx_spi_probe(struct plat
-       platform_set_drvdata(pdev, master);
-       bs->pdev = pdev;
--      if (!devm_request_mem_region(&pdev->dev, r->start,
--                                      resource_size(r), PFX)) {
--              dev_err(dev, "iomem request failed\n");
--              ret = -ENXIO;
--              goto out_err;
--      }
--
--      bs->regs = devm_ioremap_nocache(&pdev->dev, r->start,
--                                                      resource_size(r));
--      if (!bs->regs) {
--              dev_err(dev, "unable to ioremap regs\n");
--              ret = -ENOMEM;
-+      bs->regs = devm_ioremap_resource(&pdev->dev, r);
-+      if (IS_ERR(bs->regs)) {
-+              ret = PTR_ERR(bs->regs);
-               goto out_err;
-       }
diff --git a/target/linux/brcm63xx/patches-3.9/015-spi-bcm63xx-remove-unused-speed_hz-member-variable.patch b/target/linux/brcm63xx/patches-3.9/015-spi-bcm63xx-remove-unused-speed_hz-member-variable.patch
deleted file mode 100644 (file)
index d7b9327..0000000
+++ /dev/null
@@ -1,67 +0,0 @@
-From 5ff6b05a18295fa7e03de0fdf32d681a90b69df5 Mon Sep 17 00:00:00 2001
-From: Jonas Gorski <jogo@openwrt.org>
-Date: Sat, 30 Mar 2013 10:26:55 +0100
-Subject: [PATCH] spi/bcm63xx: remove unused speed_hz member variable
-
-speed_hz is a write only member, so we can safely remove it and its
-generation. Also fixes the missing clk_put after getting the periph
-clock.
-
-Signed-off-by: Jonas Gorski <jogo@openwrt.org>
----
- arch/mips/bcm63xx/dev-spi.c                          |   11 -----------
- arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_spi.h |    1 -
- drivers/spi/spi-bcm63xx.c                            |    2 --
- 3 files changed, 14 deletions(-)
-
---- a/arch/mips/bcm63xx/dev-spi.c
-+++ b/arch/mips/bcm63xx/dev-spi.c
-@@ -85,20 +85,9 @@ static struct platform_device bcm63xx_sp
- int __init bcm63xx_spi_register(void)
- {
--      struct clk *periph_clk;
--
-       if (BCMCPU_IS_6328() || BCMCPU_IS_6345())
-               return -ENODEV;
--      periph_clk = clk_get(NULL, "periph");
--      if (IS_ERR(periph_clk)) {
--              pr_err("unable to get periph clock\n");
--              return -ENODEV;
--      }
--
--      /* Set bus frequency */
--      spi_pdata.speed_hz = clk_get_rate(periph_clk);
--
-       spi_resources[0].start = bcm63xx_regset_address(RSET_SPI);
-       spi_resources[0].end = spi_resources[0].start;
-       spi_resources[1].start = bcm63xx_get_irq_number(IRQ_SPI);
---- a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_spi.h
-+++ b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_spi.h
-@@ -13,7 +13,6 @@ struct bcm63xx_spi_pdata {
-       unsigned int    msg_ctl_width;
-       int             bus_num;
-       int             num_chipselect;
--      u32             speed_hz;
- };
- enum bcm63xx_regs_spi {
---- a/drivers/spi/spi-bcm63xx.c
-+++ b/drivers/spi/spi-bcm63xx.c
-@@ -46,7 +46,6 @@ struct bcm63xx_spi {
-       int                     irq;
-       /* Platform data */
--      u32                     speed_hz;
-       unsigned                fifo_size;
-       unsigned int            msg_type_shift;
-       unsigned int            msg_ctl_width;
-@@ -436,7 +435,6 @@ static int bcm63xx_spi_probe(struct plat
-       master->unprepare_transfer_hardware = bcm63xx_spi_unprepare_transfer;
-       master->transfer_one_message = bcm63xx_spi_transfer_one;
-       master->mode_bits = MODEBITS;
--      bs->speed_hz = pdata->speed_hz;
-       bs->msg_type_shift = pdata->msg_type_shift;
-       bs->msg_ctl_width = pdata->msg_ctl_width;
-       bs->tx_io = (u8 *)(bs->regs + bcm63xx_spireg(SPI_MSG_DATA));
diff --git a/target/linux/brcm63xx/patches-3.9/018-MIPS-BCM63XX-merge-bcm63xx_clk.h-into-bcm63xx-clk.c.patch b/target/linux/brcm63xx/patches-3.9/018-MIPS-BCM63XX-merge-bcm63xx_clk.h-into-bcm63xx-clk.c.patch
deleted file mode 100644 (file)
index c3dedb4..0000000
+++ /dev/null
@@ -1,57 +0,0 @@
-From 715d03e5409fac9cbe76fd802db49ca15158378f Mon Sep 17 00:00:00 2001
-From: Jonas Gorski <jogo@openwrt.org>
-Date: Sat, 30 Mar 2013 20:31:48 +0100
-Subject: [PATCH] MIPS: BCM63XX: merge bcm63xx_clk.h into bcm63xx/clk.c
-
-All the header file does is provide the internal structure of clk,
-which shouldn't be used by anyone except clk.c itself anyway.
-
-Signed-off-by: Jonas Gorski <jogo@openwrt.org>
----
- arch/mips/bcm63xx/clk.c                          |    8 +++++++-
- arch/mips/include/asm/mach-bcm63xx/bcm63xx_clk.h |   11 -----------
- drivers/tty/serial/bcm63xx_uart.c                |    1 -
- 3 files changed, 7 insertions(+), 13 deletions(-)
- delete mode 100644 arch/mips/include/asm/mach-bcm63xx/bcm63xx_clk.h
-
---- a/arch/mips/bcm63xx/clk.c
-+++ b/arch/mips/bcm63xx/clk.c
-@@ -15,7 +15,13 @@
- #include <bcm63xx_io.h>
- #include <bcm63xx_regs.h>
- #include <bcm63xx_reset.h>
--#include <bcm63xx_clk.h>
-+
-+struct clk {
-+      void            (*set)(struct clk *, int);
-+      unsigned int    rate;
-+      unsigned int    usage;
-+      int             id;
-+};
- static DEFINE_MUTEX(clocks_mutex);
---- a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_clk.h
-+++ /dev/null
-@@ -1,11 +0,0 @@
--#ifndef BCM63XX_CLK_H_
--#define BCM63XX_CLK_H_
--
--struct clk {
--      void            (*set)(struct clk *, int);
--      unsigned int    rate;
--      unsigned int    usage;
--      int             id;
--};
--
--#endif /* ! BCM63XX_CLK_H_ */
---- a/drivers/tty/serial/bcm63xx_uart.c
-+++ b/drivers/tty/serial/bcm63xx_uart.c
-@@ -30,7 +30,6 @@
- #include <linux/serial.h>
- #include <linux/serial_core.h>
--#include <bcm63xx_clk.h>
- #include <bcm63xx_irq.h>
- #include <bcm63xx_regs.h>
- #include <bcm63xx_io.h>
diff --git a/target/linux/brcm63xx/patches-3.9/019-bcm63xx_enet-use-managed-io-memory-allocations.patch b/target/linux/brcm63xx/patches-3.9/019-bcm63xx_enet-use-managed-io-memory-allocations.patch
deleted file mode 100644 (file)
index 5d0fb8e..0000000
+++ /dev/null
@@ -1,118 +0,0 @@
-From 80b0356aea30e9fc9e075d31c2bf37e7cbfea8c9 Mon Sep 17 00:00:00 2001
-From: Jonas Gorski <jogo@openwrt.org>
-Date: Sun, 10 Mar 2013 13:59:55 +0100
-Subject: [PATCH 1/3] bcm63xx_enet: use managed io memory allocations
-
-Signed-off-by: Jonas Gorski <jogo@openwrt.org>
----
- drivers/net/ethernet/broadcom/bcm63xx_enet.c |   43 +++++---------------------
- 1 file changed, 7 insertions(+), 36 deletions(-)
-
---- a/drivers/net/ethernet/broadcom/bcm63xx_enet.c
-+++ b/drivers/net/ethernet/broadcom/bcm63xx_enet.c
-@@ -1619,7 +1619,6 @@ static int bcm_enet_probe(struct platfor
-       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
-@@ -1644,17 +1643,12 @@ static int bcm_enet_probe(struct platfor
-       if (ret)
-               goto out;
--      iomem_size = resource_size(res_mem);
--      if (!request_mem_region(res_mem->start, iomem_size, "bcm63xx_enet")) {
--              ret = -EBUSY;
--              goto out;
--      }
--
--      priv->base = ioremap(res_mem->start, iomem_size);
-+      priv->base = devm_request_and_ioremap(&pdev->dev, res_mem);
-       if (priv->base == NULL) {
-               ret = -ENOMEM;
--              goto out_release_mem;
-+              goto out;
-       }
-+
-       dev->irq = priv->irq = res_irq->start;
-       priv->irq_rx = res_irq_rx->start;
-       priv->irq_tx = res_irq_tx->start;
-@@ -1674,7 +1668,7 @@ static int bcm_enet_probe(struct platfor
-       priv->mac_clk = clk_get(&pdev->dev, clk_name);
-       if (IS_ERR(priv->mac_clk)) {
-               ret = PTR_ERR(priv->mac_clk);
--              goto out_unmap;
-+              goto out;
-       }
-       clk_enable(priv->mac_clk);
-@@ -1814,12 +1808,6 @@ out_uninit_hw:
- out_put_clk_mac:
-       clk_disable(priv->mac_clk);
-       clk_put(priv->mac_clk);
--
--out_unmap:
--      iounmap(priv->base);
--
--out_release_mem:
--      release_mem_region(res_mem->start, iomem_size);
- out:
-       free_netdev(dev);
-       return ret;
-@@ -1833,7 +1821,6 @@ static int bcm_enet_remove(struct platfo
- {
-       struct bcm_enet_priv *priv;
-       struct net_device *dev;
--      struct resource *res;
-       /* stop netdevice */
-       dev = platform_get_drvdata(pdev);
-@@ -1856,11 +1843,6 @@ static int bcm_enet_remove(struct platfo
-                                      bcm_enet_mdio_write_mii);
-       }
--      /* release device resources */
--      iounmap(priv->base);
--      res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
--      release_mem_region(res->start, resource_size(res));
--
-       /* disable hw block clocks */
-       if (priv->phy_clk) {
-               clk_disable(priv->phy_clk);
-@@ -1889,31 +1871,20 @@ struct platform_driver bcm63xx_enet_driv
- static int 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"))
--              return -EBUSY;
--
--      bcm_enet_shared_base = ioremap(res->start, iomem_size);
--      if (!bcm_enet_shared_base) {
--              release_mem_region(res->start, iomem_size);
-+      bcm_enet_shared_base = devm_request_and_ioremap(&pdev->dev, res);
-+      if (!bcm_enet_shared_base)
-               return -ENOMEM;
--      }
-+
-       return 0;
- }
- static int bcm_enet_shared_remove(struct platform_device *pdev)
- {
--      struct resource *res;
--
--      iounmap(bcm_enet_shared_base);
--      res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
--      release_mem_region(res->start, resource_size(res));
-       return 0;
- }
diff --git a/target/linux/brcm63xx/patches-3.9/020-bcm63xx_enet-use-managed-memory-allocations.patch b/target/linux/brcm63xx/patches-3.9/020-bcm63xx_enet-use-managed-memory-allocations.patch
deleted file mode 100644 (file)
index d121fce..0000000
+++ /dev/null
@@ -1,42 +0,0 @@
-From 451a609ca472f80838df056689359c5486d832c1 Mon Sep 17 00:00:00 2001
-From: Jonas Gorski <jogo@openwrt.org>
-Date: Sun, 10 Mar 2013 14:05:01 +0100
-Subject: [PATCH 2/3] bcm63xx_enet: use managed memory allocations
-
-Signed-off-by: Jonas Gorski <jogo@openwrt.org>
----
- drivers/net/ethernet/broadcom/bcm63xx_enet.c |    8 +++-----
- 1 file changed, 3 insertions(+), 5 deletions(-)
-
---- a/drivers/net/ethernet/broadcom/bcm63xx_enet.c
-+++ b/drivers/net/ethernet/broadcom/bcm63xx_enet.c
-@@ -1727,7 +1727,8 @@ static int bcm_enet_probe(struct platfor
-                * if a slave is not present on hw */
-               bus->phy_mask = ~(1 << priv->phy_id);
--              bus->irq = kmalloc(sizeof(int) * PHY_MAX_ADDR, GFP_KERNEL);
-+              bus->irq = devm_kzalloc(&pdev->dev, sizeof(int) * PHY_MAX_ADDR,
-+                                      GFP_KERNEL);
-               if (!bus->irq) {
-                       ret = -ENOMEM;
-                       goto out_free_mdio;
-@@ -1788,10 +1789,8 @@ static int bcm_enet_probe(struct platfor
-       return 0;
- out_unregister_mdio:
--      if (priv->mii_bus) {
-+      if (priv->mii_bus)
-               mdiobus_unregister(priv->mii_bus);
--              kfree(priv->mii_bus->irq);
--      }
- out_free_mdio:
-       if (priv->mii_bus)
-@@ -1832,7 +1831,6 @@ static int bcm_enet_remove(struct platfo
-       if (priv->has_phy) {
-               mdiobus_unregister(priv->mii_bus);
--              kfree(priv->mii_bus->irq);
-               mdiobus_free(priv->mii_bus);
-       } else {
-               struct bcm63xx_enet_platform_data *pd;
diff --git a/target/linux/brcm63xx/patches-3.9/021-bcm63xx_enet-properly-prepare-unprepare-clocks-befor.patch b/target/linux/brcm63xx/patches-3.9/021-bcm63xx_enet-properly-prepare-unprepare-clocks-befor.patch
deleted file mode 100644 (file)
index 5f05685..0000000
+++ /dev/null
@@ -1,62 +0,0 @@
-From 8d6b746129f11efe4ba69aeb2c982359d33c6ec3 Mon Sep 17 00:00:00 2001
-From: Jonas Gorski <jogo@openwrt.org>
-Date: Mon, 10 Sep 2012 01:28:47 +0200
-Subject: [PATCH 3/3] bcm63xx_enet: properly prepare/unprepare clocks
- before/after usage
-
-Use clk_prepare_enable/disable_unprepare calls in preparation for
-switching to the generic clock framework.
-
-Signed-off-by: Jonas Gorski <jogo@openwrt.org>
----
- drivers/net/ethernet/broadcom/bcm63xx_enet.c |   12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
-
---- a/drivers/net/ethernet/broadcom/bcm63xx_enet.c
-+++ b/drivers/net/ethernet/broadcom/bcm63xx_enet.c
-@@ -1670,7 +1670,7 @@ static int bcm_enet_probe(struct platfor
-               ret = PTR_ERR(priv->mac_clk);
-               goto out;
-       }
--      clk_enable(priv->mac_clk);
-+      clk_prepare_enable(priv->mac_clk);
-       /* initialize default and fetch platform data */
-       priv->rx_ring_size = BCMENET_DEF_RX_DESC;
-@@ -1699,7 +1699,7 @@ static int bcm_enet_probe(struct platfor
-                       priv->phy_clk = NULL;
-                       goto out_put_clk_mac;
-               }
--              clk_enable(priv->phy_clk);
-+              clk_prepare_enable(priv->phy_clk);
-       }
-       /* do minimal hardware init to be able to probe mii bus */
-@@ -1800,12 +1800,12 @@ out_uninit_hw:
-       /* turn off mdc clock */
-       enet_writel(priv, 0, ENET_MIISC_REG);
-       if (priv->phy_clk) {
--              clk_disable(priv->phy_clk);
-+              clk_disable_unprepare(priv->phy_clk);
-               clk_put(priv->phy_clk);
-       }
- out_put_clk_mac:
--      clk_disable(priv->mac_clk);
-+      clk_disable_unprepare(priv->mac_clk);
-       clk_put(priv->mac_clk);
- out:
-       free_netdev(dev);
-@@ -1843,10 +1843,10 @@ static int bcm_enet_remove(struct platfo
-       /* disable hw block clocks */
-       if (priv->phy_clk) {
--              clk_disable(priv->phy_clk);
-+              clk_disable_unprepare(priv->phy_clk);
-               clk_put(priv->phy_clk);
-       }
--      clk_disable(priv->mac_clk);
-+      clk_disable_unprepare(priv->mac_clk);
-       clk_put(priv->mac_clk);
-       platform_set_drvdata(pdev, NULL);
diff --git a/target/linux/brcm63xx/patches-3.9/022-MIPS-BCM63XX-remove-duplicate-spi-register-definitio.patch b/target/linux/brcm63xx/patches-3.9/022-MIPS-BCM63XX-remove-duplicate-spi-register-definitio.patch
deleted file mode 100644 (file)
index 50bbb93..0000000
+++ /dev/null
@@ -1,166 +0,0 @@
-From e1a3ace7260fad338a76595b116a6bf5b5627aa2 Mon Sep 17 00:00:00 2001
-From: Jonas Gorski <jogo@openwrt.org>
-Date: Thu, 7 Mar 2013 12:20:10 +0100
-Subject: [PATCH 1/7] MIPS: BCM63XX: remove duplicate spi register definitions
-
-BCM6338 and BCM6348, and BCM6358 and everything after that share the
-same register layout. To not have to redefine them for each new chip
-and keep the code size small, only use the definitions for the first
-chip with the certain layout.
-
-Signed-off-by: Jonas Gorski <jogo@openwrt.org>
----
- arch/mips/bcm63xx/dev-spi.c                        |   24 +++---------
- .../include/asm/mach-bcm63xx/bcm63xx_dev_spi.h     |   10 +----
- arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h  |   40 +-------------------
- 3 files changed, 10 insertions(+), 64 deletions(-)
-
---- a/arch/mips/bcm63xx/dev-spi.c
-+++ b/arch/mips/bcm63xx/dev-spi.c
-@@ -22,10 +22,6 @@
- /*
-  * register offsets
-  */
--static const unsigned long bcm6338_regs_spi[] = {
--      __GEN_SPI_REGS_TABLE(6338)
--};
--
- static const unsigned long bcm6348_regs_spi[] = {
-       __GEN_SPI_REGS_TABLE(6348)
- };
-@@ -34,23 +30,15 @@ static const unsigned long bcm6358_regs_
-       __GEN_SPI_REGS_TABLE(6358)
- };
--static const unsigned long bcm6368_regs_spi[] = {
--      __GEN_SPI_REGS_TABLE(6368)
--};
--
- const unsigned long *bcm63xx_regs_spi;
- EXPORT_SYMBOL(bcm63xx_regs_spi);
- static __init void bcm63xx_spi_regs_init(void)
- {
--      if (BCMCPU_IS_6338())
--              bcm63xx_regs_spi = bcm6338_regs_spi;
--      if (BCMCPU_IS_6348())
-+      if (BCMCPU_IS_6338() || BCMCPU_IS_6348())
-               bcm63xx_regs_spi = bcm6348_regs_spi;
--      if (BCMCPU_IS_6358())
-+      if (BCMCPU_IS_6358() || BCMCPU_IS_6368())
-               bcm63xx_regs_spi = bcm6358_regs_spi;
--      if (BCMCPU_IS_6368())
--              bcm63xx_regs_spi = bcm6368_regs_spi;
- }
- #else
- static __init void bcm63xx_spi_regs_init(void) { }
-@@ -93,10 +81,10 @@ int __init bcm63xx_spi_register(void)
-       spi_resources[1].start = bcm63xx_get_irq_number(IRQ_SPI);
-       if (BCMCPU_IS_6338() || BCMCPU_IS_6348()) {
--              spi_resources[0].end += BCM_6338_RSET_SPI_SIZE - 1;
--              spi_pdata.fifo_size = SPI_6338_MSG_DATA_SIZE;
--              spi_pdata.msg_type_shift = SPI_6338_MSG_TYPE_SHIFT;
--              spi_pdata.msg_ctl_width = SPI_6338_MSG_CTL_WIDTH;
-+              spi_resources[0].end += BCM_6348_RSET_SPI_SIZE - 1;
-+              spi_pdata.fifo_size = SPI_6348_MSG_DATA_SIZE;
-+              spi_pdata.msg_type_shift = SPI_6348_MSG_TYPE_SHIFT;
-+              spi_pdata.msg_ctl_width = SPI_6348_MSG_CTL_WIDTH;
-       }
-       if (BCMCPU_IS_6358() || BCMCPU_IS_6368()) {
---- a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_spi.h
-+++ b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_spi.h
-@@ -71,18 +71,12 @@ static inline unsigned long bcm63xx_spir
-       return bcm63xx_regs_spi[reg];
- #else
--#ifdef CONFIG_BCM63XX_CPU_6338
--      __GEN_SPI_RSET(6338)
--#endif
--#ifdef CONFIG_BCM63XX_CPU_6348
-+#if defined(CONFIG_BCM63XX_CPU_6338) || defined(CONFIG_BCM63XX_CPU_6348)
-       __GEN_SPI_RSET(6348)
- #endif
--#ifdef CONFIG_BCM63XX_CPU_6358
-+#if defined(CONFIG_BCM63XX_CPU_6358) || defined(CONFIG_BCM63XX_CPU_6368)
-       __GEN_SPI_RSET(6358)
- #endif
--#ifdef CONFIG_BCM63XX_CPU_6368
--      __GEN_SPI_RSET(6368)
--#endif
- #endif
-       return 0;
- }
---- a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h
-+++ b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h
-@@ -1223,24 +1223,7 @@
-  * _REG relative to RSET_SPI
-  *************************************************************************/
--/* BCM 6338 SPI core */
--#define SPI_6338_CMD                  0x00    /* 16-bits register */
--#define SPI_6338_INT_STATUS           0x02
--#define SPI_6338_INT_MASK_ST          0x03
--#define SPI_6338_INT_MASK             0x04
--#define SPI_6338_ST                   0x05
--#define SPI_6338_CLK_CFG              0x06
--#define SPI_6338_FILL_BYTE            0x07
--#define SPI_6338_MSG_TAIL             0x09
--#define SPI_6338_RX_TAIL              0x0b
--#define SPI_6338_MSG_CTL              0x40    /* 8-bits register */
--#define SPI_6338_MSG_CTL_WIDTH                8
--#define SPI_6338_MSG_DATA             0x41
--#define SPI_6338_MSG_DATA_SIZE                0x3f
--#define SPI_6338_RX_DATA              0x80
--#define SPI_6338_RX_DATA_SIZE         0x3f
--
--/* BCM 6348 SPI core */
-+/* BCM 6338/6348 SPI core */
- #define SPI_6348_CMD                  0x00    /* 16-bits register */
- #define SPI_6348_INT_STATUS           0x02
- #define SPI_6348_INT_MASK_ST          0x03
-@@ -1257,7 +1240,7 @@
- #define SPI_6348_RX_DATA              0x80
- #define SPI_6348_RX_DATA_SIZE         0x3f
--/* BCM 6358 SPI core */
-+/* BCM 6358/6368 SPI core */
- #define SPI_6358_MSG_CTL              0x00    /* 16-bits register */
- #define SPI_6358_MSG_CTL_WIDTH                16
- #define SPI_6358_MSG_DATA             0x02
-@@ -1274,23 +1257,6 @@
- #define SPI_6358_MSG_TAIL             0x709
- #define SPI_6358_RX_TAIL              0x70B
--/* BCM 6358 SPI core */
--#define SPI_6368_MSG_CTL              0x00    /* 16-bits register */
--#define SPI_6368_MSG_CTL_WIDTH                16
--#define SPI_6368_MSG_DATA             0x02
--#define SPI_6368_MSG_DATA_SIZE                0x21e
--#define SPI_6368_RX_DATA              0x400
--#define SPI_6368_RX_DATA_SIZE         0x220
--#define SPI_6368_CMD                  0x700   /* 16-bits register */
--#define SPI_6368_INT_STATUS           0x702
--#define SPI_6368_INT_MASK_ST          0x703
--#define SPI_6368_INT_MASK             0x704
--#define SPI_6368_ST                   0x705
--#define SPI_6368_CLK_CFG              0x706
--#define SPI_6368_FILL_BYTE            0x707
--#define SPI_6368_MSG_TAIL             0x709
--#define SPI_6368_RX_TAIL              0x70B
--
- /* Shared SPI definitions */
- /* Message configuration */
-@@ -1298,10 +1264,8 @@
- #define SPI_HD_W                      0x01
- #define SPI_HD_R                      0x02
- #define SPI_BYTE_CNT_SHIFT            0
--#define SPI_6338_MSG_TYPE_SHIFT               6
- #define SPI_6348_MSG_TYPE_SHIFT               6
- #define SPI_6358_MSG_TYPE_SHIFT               14
--#define SPI_6368_MSG_TYPE_SHIFT               14
- /* Command */
- #define SPI_CMD_NOOP                  0x00
diff --git a/target/linux/brcm63xx/patches-3.9/023-MIPS-BCM63XX-fix-revision-ID-width.patch b/target/linux/brcm63xx/patches-3.9/023-MIPS-BCM63XX-fix-revision-ID-width.patch
deleted file mode 100644 (file)
index 0ee88e1..0000000
+++ /dev/null
@@ -1,68 +0,0 @@
-From 609c69339a24bd034f5359dad14087276ce5a83f Mon Sep 17 00:00:00 2001
-From: Jonas Gorski <jogo@openwrt.org>
-Date: Sun, 15 Jan 2012 14:41:22 +0100
-Subject: [PATCH 2/7] MIPS: BCM63XX: fix revision ID width
-
-The REVID is only 8 bit wide.
-
-Signed-off-by: Jonas Gorski <jogo@openwrt.org>
----
- arch/mips/bcm63xx/cpu.c                           |    4 ++--
- arch/mips/bcm63xx/setup.c                         |    2 +-
- arch/mips/include/asm/mach-bcm63xx/bcm63xx_cpu.h  |    2 +-
- arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h |    2 +-
- 4 files changed, 5 insertions(+), 5 deletions(-)
-
---- a/arch/mips/bcm63xx/cpu.c
-+++ b/arch/mips/bcm63xx/cpu.c
-@@ -25,7 +25,7 @@ const int *bcm63xx_irqs;
- EXPORT_SYMBOL(bcm63xx_irqs);
- static u16 bcm63xx_cpu_id;
--static u16 bcm63xx_cpu_rev;
-+static u8 bcm63xx_cpu_rev;
- static unsigned int bcm63xx_cpu_freq;
- static unsigned int bcm63xx_memory_size;
-@@ -87,7 +87,7 @@ u16 __bcm63xx_get_cpu_id(void)
- EXPORT_SYMBOL(__bcm63xx_get_cpu_id);
--u16 bcm63xx_get_cpu_rev(void)
-+u8 bcm63xx_get_cpu_rev(void)
- {
-       return bcm63xx_cpu_rev;
- }
---- a/arch/mips/bcm63xx/setup.c
-+++ b/arch/mips/bcm63xx/setup.c
-@@ -126,7 +126,7 @@ static void __bcm63xx_machine_reboot(cha
- const char *get_system_type(void)
- {
-       static char buf[128];
--      snprintf(buf, sizeof(buf), "bcm63xx/%s (0x%04x/0x%04X)",
-+      snprintf(buf, sizeof(buf), "bcm63xx/%s (0x%04x/0x%02X)",
-                board_get_name(),
-                bcm63xx_get_cpu_id(), bcm63xx_get_cpu_rev());
-       return buf;
---- a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_cpu.h
-+++ b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_cpu.h
-@@ -18,7 +18,7 @@
- void __init bcm63xx_cpu_init(void);
- u16 __bcm63xx_get_cpu_id(void);
--u16 bcm63xx_get_cpu_rev(void);
-+u8 bcm63xx_get_cpu_rev(void);
- unsigned int bcm63xx_get_cpu_freq(void);
- #ifdef CONFIG_BCM63XX_CPU_6328
---- a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h
-+++ b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h
-@@ -10,7 +10,7 @@
- #define REV_CHIPID_SHIFT              16
- #define REV_CHIPID_MASK                       (0xffff << REV_CHIPID_SHIFT)
- #define REV_REVID_SHIFT                       0
--#define REV_REVID_MASK                        (0xffff << REV_REVID_SHIFT)
-+#define REV_REVID_MASK                        (0xff << REV_REVID_SHIFT)
- /* Clock Control register */
- #define PERF_CKCTL_REG                        0x4
diff --git a/target/linux/brcm63xx/patches-3.9/024-MIPS-BCM63XX-rework-chip-detection.patch b/target/linux/brcm63xx/patches-3.9/024-MIPS-BCM63XX-rework-chip-detection.patch
deleted file mode 100644 (file)
index 0ff9edf..0000000
+++ /dev/null
@@ -1,133 +0,0 @@
-From 3f4570c9794fcae1cf62fbf3266a2e23edac67a5 Mon Sep 17 00:00:00 2001
-From: Jonas Gorski <jogo@openwrt.org>
-Date: Wed, 27 Jun 2012 15:01:09 +0200
-Subject: [PATCH 3/7] MIPS: BCM63XX: rework chip detection
-
-Instead of trying to use a correlation of cpu prid and chip id and
-hoping they will always be unique, use the cpu prid to determine the
-chip id register location and just read out the chip id.
-
-Signed-off-by: Jonas Gorski <jogo@openwrt.org>
----
- arch/mips/bcm63xx/cpu.c |   87 +++++++++++++++++++++++------------------------
- 1 file changed, 42 insertions(+), 45 deletions(-)
-
---- a/arch/mips/bcm63xx/cpu.c
-+++ b/arch/mips/bcm63xx/cpu.c
-@@ -240,53 +240,27 @@ static unsigned int detect_memory_size(v
- void __init bcm63xx_cpu_init(void)
- {
--      unsigned int tmp, expected_cpu_id;
-+      unsigned int tmp;
-       struct cpuinfo_mips *c = &current_cpu_data;
-       unsigned int cpu = smp_processor_id();
-+      u32 chipid_reg;
-       /* soc registers location depends on cpu type */
--      expected_cpu_id = 0;
-+      chipid_reg = 0;
-       switch (c->cputype) {
-       case CPU_BMIPS3300:
--              if ((read_c0_prid() & 0xff00) == PRID_IMP_BMIPS3300_ALT) {
--                      expected_cpu_id = BCM6348_CPU_ID;
--                      bcm63xx_regs_base = bcm6348_regs_base;
--                      bcm63xx_irqs = bcm6348_irqs;
--              } else {
-+              if ((read_c0_prid() & 0xff00) != PRID_IMP_BMIPS3300_ALT)
-                       __cpu_name[cpu] = "Broadcom BCM6338";
--                      expected_cpu_id = BCM6338_CPU_ID;
--                      bcm63xx_regs_base = bcm6338_regs_base;
--                      bcm63xx_irqs = bcm6338_irqs;
--              }
--              break;
-+              /* fall-through */
-       case CPU_BMIPS32:
--              expected_cpu_id = BCM6345_CPU_ID;
--              bcm63xx_regs_base = bcm6345_regs_base;
--              bcm63xx_irqs = bcm6345_irqs;
-+              chipid_reg = BCM_6345_PERF_BASE;
-               break;
-       case CPU_BMIPS4350:
--              if ((read_c0_prid() & 0xf0) == 0x10) {
--                      expected_cpu_id = BCM6358_CPU_ID;
--                      bcm63xx_regs_base = bcm6358_regs_base;
--                      bcm63xx_irqs = bcm6358_irqs;
--              } else {
--                      /* all newer chips have the same chip id location */
--                      u16 chip_id = bcm_readw(BCM_6368_PERF_BASE);
--
--                      switch (chip_id) {
--                      case BCM6328_CPU_ID:
--                              expected_cpu_id = BCM6328_CPU_ID;
--                              bcm63xx_regs_base = bcm6328_regs_base;
--                              bcm63xx_irqs = bcm6328_irqs;
--                              break;
--                      case BCM6368_CPU_ID:
--                              expected_cpu_id = BCM6368_CPU_ID;
--                              bcm63xx_regs_base = bcm6368_regs_base;
--                              bcm63xx_irqs = bcm6368_irqs;
--                              break;
--                      }
--              }
-+              if ((read_c0_prid() & 0xf0) == 0x10)
-+                      chipid_reg = BCM_6345_PERF_BASE;
-+              else
-+                      chipid_reg = BCM_6368_PERF_BASE;
-               break;
-       }
-@@ -294,20 +268,43 @@ void __init bcm63xx_cpu_init(void)
-        * really early to panic, but delaying panic would not help since we
-        * will never get any working console
-        */
--      if (!expected_cpu_id)
-+      if (!chipid_reg)
-               panic("unsupported Broadcom CPU");
--      /*
--       * bcm63xx_regs_base is set, we can access soc registers
--       */
--
--      /* double check CPU type */
--      tmp = bcm_perf_readl(PERF_REV_REG);
-+      /* read out CPU type */
-+      tmp = bcm_readl(chipid_reg);
-       bcm63xx_cpu_id = (tmp & REV_CHIPID_MASK) >> REV_CHIPID_SHIFT;
-       bcm63xx_cpu_rev = (tmp & REV_REVID_MASK) >> REV_REVID_SHIFT;
--      if (bcm63xx_cpu_id != expected_cpu_id)
--              panic("bcm63xx CPU id mismatch");
-+      switch (bcm63xx_cpu_id) {
-+      case BCM6328_CPU_ID:
-+              bcm63xx_regs_base = bcm6328_regs_base;
-+              bcm63xx_irqs = bcm6328_irqs;
-+              break;
-+      case BCM6338_CPU_ID:
-+              bcm63xx_regs_base = bcm6338_regs_base;
-+              bcm63xx_irqs = bcm6338_irqs;
-+              break;
-+      case BCM6345_CPU_ID:
-+              bcm63xx_regs_base = bcm6345_regs_base;
-+              bcm63xx_irqs = bcm6345_irqs;
-+              break;
-+      case BCM6348_CPU_ID:
-+              bcm63xx_regs_base = bcm6348_regs_base;
-+              bcm63xx_irqs = bcm6348_irqs;
-+              break;
-+      case BCM6358_CPU_ID:
-+              bcm63xx_regs_base = bcm6358_regs_base;
-+              bcm63xx_irqs = bcm6358_irqs;
-+              break;
-+      case BCM6368_CPU_ID:
-+              bcm63xx_regs_base = bcm6368_regs_base;
-+              bcm63xx_irqs = bcm6368_irqs;
-+              break;
-+      default:
-+              panic("unsupported broadcom CPU %x", bcm63xx_cpu_id);
-+              break;
-+      }
-       bcm63xx_cpu_freq = detect_cpu_clock();
-       bcm63xx_memory_size = detect_memory_size();
diff --git a/target/linux/brcm63xx/patches-3.9/025-MIPS-BCM63XX-add-basic-BCM6362-support.patch b/target/linux/brcm63xx/patches-3.9/025-MIPS-BCM63XX-add-basic-BCM6362-support.patch
deleted file mode 100644 (file)
index 53a6497..0000000
+++ /dev/null
@@ -1,575 +0,0 @@
-From 1071a9c9527d68eca4605e2eb1686609bfecf287 Mon Sep 17 00:00:00 2001
-From: Jonas Gorski <jogo@openwrt.org>
-Date: Mon, 21 Nov 2011 00:48:52 +0100
-Subject: [PATCH 4/7] MIPS: BCM63XX: add basic BCM6362 support
-
-Add basic support for detecting and booting the BCM6362.
-
-Signed-off-by: Jonas Gorski <jogo@openwrt.org>
----
- arch/mips/bcm63xx/Kconfig                         |    4 +
- arch/mips/bcm63xx/boards/board_bcm963xx.c         |    6 +-
- arch/mips/bcm63xx/cpu.c                           |   51 +++++++-
- arch/mips/bcm63xx/irq.c                           |   22 ++++
- arch/mips/bcm63xx/prom.c                          |    2 +
- arch/mips/bcm63xx/reset.c                         |   28 +++++
- 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 |   61 ++++++++-
- arch/mips/include/asm/mach-bcm63xx/ioremap.h      |    1 +
- 11 files changed, 314 insertions(+), 5 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
-@@ -726,11 +726,11 @@ void __init board_prom_init(void)
-       u32 val;
-       /* read base address of boot chip select (0)
--       * 6328 does not have MPI but boots from a fixed address
-+       * 6328/6362 do not have MPI but boot from a fixed address
-        */
--      if (BCMCPU_IS_6328())
-+      if (BCMCPU_IS_6328() || BCMCPU_IS_6362()) {
-               val = 0x18000000;
--      else {
-+      } else {
-               val = bcm_mpi_readl(MPI_CSBASE_REG(0));
-               val &= MPI_CSBASE_BASE_MASK;
-       }
---- 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()) {
-@@ -297,6 +342,10 @@ void __init bcm63xx_cpu_init(void)
-               bcm63xx_regs_base = bcm6358_regs_base;
-               bcm63xx_irqs = bcm6358_irqs;
-               break;
-+      case BCM6362_CPU_ID:
-+              bcm63xx_regs_base = bcm6362_regs_base;
-+              bcm63xx_irqs = bcm6362_irqs;
-+              break;
-       case BCM6368_CPU_ID:
-               bcm63xx_regs_base = bcm6368_regs_base;
-               bcm63xx_irqs = bcm6368_irqs;
---- a/arch/mips/bcm63xx/irq.c
-+++ b/arch/mips/bcm63xx/irq.c
-@@ -82,6 +82,17 @@ 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)
-+#define ext_irq_count         4
-+#define ext_irq_cfg_reg1      PERF_EXTIRQ_CFG_REG_6362
-+#define ext_irq_cfg_reg2      0
-+#endif
- #ifdef CONFIG_BCM63XX_CPU_6368
- #define irq_stat_reg          PERF_IRQSTAT_6368_REG
- #define irq_mask_reg          PERF_IRQMASK_6368_REG
-@@ -170,6 +181,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;
-@@ -458,6 +479,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/reset.c
-+++ b/arch/mips/bcm63xx/reset.c
-@@ -85,6 +85,20 @@
- #define BCM6358_RESET_PCIE    0
- #define BCM6358_RESET_PCIE_EXT        0
-+#define BCM6362_RESET_SPI     SOFTRESET_6362_SPI_MASK
-+#define BCM6362_RESET_ENET    0
-+#define BCM6362_RESET_USBH    SOFTRESET_6362_USBH_MASK
-+#define BCM6362_RESET_USBD    SOFTRESET_6362_USBS_MASK
-+#define BCM6362_RESET_DSL     0
-+#define BCM6362_RESET_SAR     SOFTRESET_6362_SAR_MASK
-+#define BCM6362_RESET_EPHY    SOFTRESET_6362_EPHY_MASK
-+#define BCM6362_RESET_ENETSW  SOFTRESET_6362_ENETSW_MASK
-+#define BCM6362_RESET_PCM     SOFTRESET_6362_PCM_MASK
-+#define BCM6362_RESET_MPI     0
-+#define BCM6362_RESET_PCIE      (SOFTRESET_6362_PCIE_MASK | \
-+                               SOFTRESET_6362_PCIE_CORE_MASK)
-+#define BCM6362_RESET_PCIE_EXT        SOFTRESET_6362_PCIE_EXT_MASK
-+
- #define BCM6368_RESET_SPI     SOFTRESET_6368_SPI_MASK
- #define BCM6368_RESET_ENET    0
- #define BCM6368_RESET_USBH    SOFTRESET_6368_USBH_MASK
-@@ -119,6 +133,10 @@ static const u32 bcm6358_reset_bits[] =
-       __GEN_RESET_BITS_TABLE(6358)
- };
-+static const u32 bcm6362_reset_bits[] = {
-+      __GEN_RESET_BITS_TABLE(6362)
-+};
-+
- static const u32 bcm6368_reset_bits[] = {
-       __GEN_RESET_BITS_TABLE(6368)
- };
-@@ -140,6 +158,9 @@ static int __init bcm63xx_reset_bits_ini
-       } else if (BCMCPU_IS_6358()) {
-               reset_reg = PERF_SOFTRESET_6358_REG;
-               bcm63xx_reset_bits = bcm6358_reset_bits;
-+      } else if (BCMCPU_IS_6362()) {
-+              reset_reg = PERF_SOFTRESET_6362_REG;
-+              bcm63xx_reset_bits = bcm6362_reset_bits;
-       } else if (BCMCPU_IS_6368()) {
-               reset_reg = PERF_SOFTRESET_6368_REG;
-               bcm63xx_reset_bits = bcm6368_reset_bits;
-@@ -182,6 +203,13 @@ static const u32 bcm63xx_reset_bits[] =
- #define reset_reg PERF_SOFTRESET_6358_REG
- #endif
-+#ifdef CONFIG_BCM63XX_CPU_6362
-+static const u32 bcm63xx_reset_bits[] = {
-+      __GEN_RESET_BITS_TABLE(6362)
-+};
-+#define reset_reg PERF_SOFTRESET_6362_REG
-+#endif
-+
- #ifdef CONFIG_BCM63XX_CPU_6368
- static const u32 bcm63xx_reset_bits[] = {
-       __GEN_RESET_BITS_TABLE(6368)
---- 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
-@@ -406,6 +421,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)
-@@ -564,6 +635,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
-@@ -820,6 +894,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
-@@ -112,6 +112,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)
-@@ -153,6 +186,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 */
-@@ -161,6 +195,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 */
-@@ -169,6 +204,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
-@@ -197,6 +233,7 @@
- #define PERF_SOFTRESET_REG            0x28
- #define PERF_SOFTRESET_6328_REG               0x10
- #define PERF_SOFTRESET_6358_REG               0x34
-+#define PERF_SOFTRESET_6362_REG               0x10
- #define PERF_SOFTRESET_6368_REG               0x10
- #define SOFTRESET_6328_SPI_MASK               (1 << 0)
-@@ -259,6 +296,22 @@
- #define SOFTRESET_6358_PCM_MASK               (1 << 13)
- #define SOFTRESET_6358_ADSL_MASK      (1 << 14)
-+#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)
-@@ -1240,7 +1293,7 @@
- #define SPI_6348_RX_DATA              0x80
- #define SPI_6348_RX_DATA_SIZE         0x3f
--/* BCM 6358/6368 SPI core */
-+/* BCM 6358/6262/6368 SPI core */
- #define SPI_6358_MSG_CTL              0x00    /* 16-bits register */
- #define SPI_6358_MSG_CTL_WIDTH                16
- #define SPI_6358_MSG_DATA             0x02
-@@ -1316,6 +1369,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.9/026-MIPS-BCM63XX-enable-SPI-controller-for-BCM6362.patch b/target/linux/brcm63xx/patches-3.9/026-MIPS-BCM63XX-enable-SPI-controller-for-BCM6362.patch
deleted file mode 100644 (file)
index 27a411d..0000000
+++ /dev/null
@@ -1,57 +0,0 @@
-From 5da349ee614f61a2e6edb403098f40c6d40f2553 Mon Sep 17 00:00:00 2001
-From: Jonas Gorski <jogo@openwrt.org>
-Date: Thu, 5 Jul 2012 21:19:20 +0200
-Subject: [PATCH 5/7] MIPS: BCM63XX: enable SPI controller for BCM6362
-
-The SPI controller shares the same register layout as the 6358 one.
-
-Signed-off-by: Jonas Gorski <jogo@openwrt.org>
----
- arch/mips/bcm63xx/clk.c                              |    2 ++
- arch/mips/bcm63xx/dev-spi.c                          |    4 ++--
- arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_spi.h |    3 ++-
- 3 files changed, 6 insertions(+), 3 deletions(-)
-
---- a/arch/mips/bcm63xx/clk.c
-+++ b/arch/mips/bcm63xx/clk.c
-@@ -202,6 +202,8 @@ static void spi_set(struct clk *clk, int
-               mask = CKCTL_6348_SPI_EN;
-       else if (BCMCPU_IS_6358())
-               mask = CKCTL_6358_SPI_EN;
-+      else if (BCMCPU_IS_6362())
-+              mask = CKCTL_6362_SPI_EN;
-       else
-               /* BCMCPU_IS_6368 */
-               mask = CKCTL_6368_SPI_EN;
---- a/arch/mips/bcm63xx/dev-spi.c
-+++ b/arch/mips/bcm63xx/dev-spi.c
-@@ -37,7 +37,7 @@ static __init void bcm63xx_spi_regs_init
- {
-       if (BCMCPU_IS_6338() || BCMCPU_IS_6348())
-               bcm63xx_regs_spi = bcm6348_regs_spi;
--      if (BCMCPU_IS_6358() || BCMCPU_IS_6368())
-+      if (BCMCPU_IS_6358() || BCMCPU_IS_6362() || BCMCPU_IS_6368())
-               bcm63xx_regs_spi = bcm6358_regs_spi;
- }
- #else
-@@ -87,7 +87,7 @@ int __init bcm63xx_spi_register(void)
-               spi_pdata.msg_ctl_width = SPI_6348_MSG_CTL_WIDTH;
-       }
--      if (BCMCPU_IS_6358() || BCMCPU_IS_6368()) {
-+      if (BCMCPU_IS_6358() || BCMCPU_IS_6362() || BCMCPU_IS_6368()) {
-               spi_resources[0].end += BCM_6358_RSET_SPI_SIZE - 1;
-               spi_pdata.fifo_size = SPI_6358_MSG_DATA_SIZE;
-               spi_pdata.msg_type_shift = SPI_6358_MSG_TYPE_SHIFT;
---- a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_spi.h
-+++ b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_spi.h
-@@ -74,7 +74,8 @@ static inline unsigned long bcm63xx_spir
- #if defined(CONFIG_BCM63XX_CPU_6338) || defined(CONFIG_BCM63XX_CPU_6348)
-       __GEN_SPI_RSET(6348)
- #endif
--#if defined(CONFIG_BCM63XX_CPU_6358) || defined(CONFIG_BCM63XX_CPU_6368)
-+#if defined(CONFIG_BCM63XX_CPU_6358) || defined(CONFIG_BCM63XX_CPU_6362) || \
-+      defined(CONFIG_BCM63XX_CPU_6368)
-       __GEN_SPI_RSET(6358)
- #endif
- #endif
diff --git a/target/linux/brcm63xx/patches-3.9/027-MIPS-BCM63XX-enable-pcie-for-BCM6362.patch b/target/linux/brcm63xx/patches-3.9/027-MIPS-BCM63XX-enable-pcie-for-BCM6362.patch
deleted file mode 100644 (file)
index 3c5b119..0000000
+++ /dev/null
@@ -1,56 +0,0 @@
-From ec6f1e53b22d01e628b79b99f7a33960034e97e7 Mon Sep 17 00:00:00 2001
-From: Jonas Gorski <jogo@openwrt.org>
-Date: Mon, 21 Nov 2011 00:53:26 +0100
-Subject: [PATCH 6/7] MIPS: BCM63XX: enable pcie for BCM6362
-
-The PCIe controller is almost the same as the BCM6328 one, with only
-the SERDES register being at a different location.
-
-Signed-off-by: Jonas Gorski <jogo@openwrt.org>
----
- arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h |    3 ++-
- arch/mips/pci/pci-bcm63xx.c                       |   11 +++++++++--
- 2 files changed, 11 insertions(+), 3 deletions(-)
-
---- a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h
-+++ b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h
-@@ -1365,7 +1365,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
-@@ -121,11 +121,17 @@ void __iomem *pci_iospace_start;
- static void __init bcm63xx_reset_pcie(void)
- {
-       u32 val;
-+      u32 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 */
-       bcm63xx_core_set_reset(BCM63XX_RESET_PCIE, 1);
-@@ -330,6 +336,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.9/028-MIPS-BCM63XX-add-flash-detection-for-BCM6362.patch b/target/linux/brcm63xx/patches-3.9/028-MIPS-BCM63XX-add-flash-detection-for-BCM6362.patch
deleted file mode 100644 (file)
index 38125a5..0000000
+++ /dev/null
@@ -1,38 +0,0 @@
-From 01034e48e72783ced82a050e862f82ee3dfdb783 Mon Sep 17 00:00:00 2001
-From: Jonas Gorski <jogo@openwrt.org>
-Date: Mon, 21 Nov 2011 00:48:52 +0100
-Subject: [PATCH 7/7] MIPS: BCM63XX: add flash detection for BCM6362
-
-BCM6362 support booting from SPI flash and NAND.
-
-Signed-off-by: Jonas Gorski <jogo@openwrt.org>
----
- arch/mips/bcm63xx/dev-flash.c                     |    6 ++++++
- arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h |    1 +
- 2 files changed, 7 insertions(+)
-
---- a/arch/mips/bcm63xx/dev-flash.c
-+++ b/arch/mips/bcm63xx/dev-flash.c
-@@ -77,6 +77,12 @@ 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_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);
-               switch (val & STRAPBUS_6368_BOOT_SEL_MASK) {
---- a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h
-+++ b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h
-@@ -1372,6 +1372,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.9/029-MIPS-BCM63XX-add-missing-clocks-for-BCM6328-and-BCM6.patch b/target/linux/brcm63xx/patches-3.9/029-MIPS-BCM63XX-add-missing-clocks-for-BCM6328-and-BCM6.patch
deleted file mode 100644 (file)
index bc72a00..0000000
+++ /dev/null
@@ -1,91 +0,0 @@
-From d31454bc822e1957e758e75d4367bcd12af89743 Mon Sep 17 00:00:00 2001
-From: Jonas Gorski <jogo@openwrt.org>
-Date: Thu, 18 Apr 2013 21:23:11 +0200
-Subject: [PATCH] MIPS: BCM63XX: add missing clocks for BCM6328 and BCM6362
-
-Add currently unused missing clocks for BCM6328 and BCM6362.
-
-Signed-off-by: Jonas Gorski <jogo@openwrt.org>
----
- arch/mips/bcm63xx/clk.c |   33 +++++++++++++++++++++++++--------
- 1 file changed, 25 insertions(+), 8 deletions(-)
-
---- a/arch/mips/bcm63xx/clk.c
-+++ b/arch/mips/bcm63xx/clk.c
-@@ -125,11 +125,18 @@ static struct clk clk_ephy = {
-  */
- static void enetsw_set(struct clk *clk, int enable)
- {
--      if (!BCMCPU_IS_6368())
-+      if (BCMCPU_IS_6328())
-+              bcm_hwclock_set(CKCTL_6328_ROBOSW_EN, enable);
-+      else if (BCMCPU_IS_6362())
-+              bcm_hwclock_set(CKCTL_6362_ROBOSW_EN, enable);
-+      else if (BCMCPU_IS_6368())
-+              bcm_hwclock_set(CKCTL_6368_ROBOSW_EN |
-+                              CKCTL_6368_SWPKT_USB_EN |
-+                              CKCTL_6368_SWPKT_SAR_EN,
-+                              enable);
-+      else
-               return;
--      bcm_hwclock_set(CKCTL_6368_ROBOSW_EN |
--                      CKCTL_6368_SWPKT_USB_EN |
--                      CKCTL_6368_SWPKT_SAR_EN, enable);
-+
-       if (enable) {
-               /* reset switch core afer clock change */
-               bcm63xx_core_set_reset(BCM63XX_RESET_ENETSW, 1);
-@@ -166,6 +173,8 @@ static void usbh_set(struct clk *clk, in
-               bcm_hwclock_set(CKCTL_6328_USBH_EN, enable);
-       else if (BCMCPU_IS_6348())
-               bcm_hwclock_set(CKCTL_6348_USBH_EN, enable);
-+      else if (BCMCPU_IS_6362())
-+              bcm_hwclock_set(CKCTL_6362_USBH_EN, enable);
-       else if (BCMCPU_IS_6368())
-               bcm_hwclock_set(CKCTL_6368_USBH_EN, enable);
- }
-@@ -181,6 +190,8 @@ static void usbd_set(struct clk *clk, in
- {
-       if (BCMCPU_IS_6328())
-               bcm_hwclock_set(CKCTL_6328_USBD_EN, enable);
-+      else if (BCMCPU_IS_6362())
-+              bcm_hwclock_set(CKCTL_6362_USBD_EN, enable);
-       else if (BCMCPU_IS_6368())
-               bcm_hwclock_set(CKCTL_6368_USBD_EN, enable);
- }
-@@ -244,7 +255,10 @@ static struct clk clk_xtm = {
-  */
- static void ipsec_set(struct clk *clk, int enable)
- {
--      bcm_hwclock_set(CKCTL_6368_IPSEC_EN, enable);
-+      if (BCMCPU_IS_6362())
-+              bcm_hwclock_set(CKCTL_6362_IPSEC_EN, enable);
-+      else if (BCMCPU_IS_6368())
-+              bcm_hwclock_set(CKCTL_6368_IPSEC_EN, enable);
- }
- static struct clk clk_ipsec = {
-@@ -257,7 +271,10 @@ static struct clk clk_ipsec = {
- static void pcie_set(struct clk *clk, int enable)
- {
--      bcm_hwclock_set(CKCTL_6328_PCIE_EN, enable);
-+      if (BCMCPU_IS_6328())
-+              bcm_hwclock_set(CKCTL_6328_PCIE_EN, enable);
-+      else if (BCMCPU_IS_6362())
-+              bcm_hwclock_set(CKCTL_6362_PCIE_EN, enable);
- }
- static struct clk clk_pcie = {
-@@ -323,9 +340,9 @@ struct clk *clk_get(struct device *dev,
-               return &clk_periph;
-       if (BCMCPU_IS_6358() && !strcmp(id, "pcm"))
-               return &clk_pcm;
--      if (BCMCPU_IS_6368() && !strcmp(id, "ipsec"))
-+      if ((BCMCPU_IS_6362() || BCMCPU_IS_6368()) && !strcmp(id, "ipsec"))
-               return &clk_ipsec;
--      if (BCMCPU_IS_6328() && !strcmp(id, "pcie"))
-+      if ((BCMCPU_IS_6328() || BCMCPU_IS_6362()) && !strcmp(id, "pcie"))
-               return &clk_pcie;
-       return ERR_PTR(-ENOENT);
- }
diff --git a/target/linux/brcm63xx/patches-3.9/030-MTD-bcm63xxpart-use-size-macro-for-CFE-block-size.patch b/target/linux/brcm63xx/patches-3.9/030-MTD-bcm63xxpart-use-size-macro-for-CFE-block-size.patch
deleted file mode 100644 (file)
index a7f7822..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-From e2092cf1b164ede62b740c7c95905171fb6232ff Mon Sep 17 00:00:00 2001
-From: Jonas Gorski <jogo@openwrt.org>
-Date: Sat, 23 Mar 2013 12:32:56 +0100
-Subject: [PATCH v2 1/3] MTD: bcm63xxpart: use size macro for CFE block size
-
-Signed-off-by: Jonas Gorski <jogo@openwrt.org>
----
- drivers/mtd/bcm63xxpart.c |    3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
---- a/drivers/mtd/bcm63xxpart.c
-+++ b/drivers/mtd/bcm63xxpart.c
-@@ -27,6 +27,7 @@
- #include <linux/crc32.h>
- #include <linux/module.h>
- #include <linux/kernel.h>
-+#include <linux/sizes.h>
- #include <linux/slab.h>
- #include <linux/vmalloc.h>
- #include <linux/mtd/mtd.h>
-@@ -37,7 +38,7 @@
- #define BCM63XX_EXTENDED_SIZE 0xBFC00000      /* Extended flash address */
--#define BCM63XX_CFE_BLOCK_SIZE        0x10000         /* always at least 64KiB */
-+#define BCM63XX_CFE_BLOCK_SIZE        SZ_64K          /* always at least 64KiB */
- #define BCM63XX_CFE_MAGIC_OFFSET 0x4e0
diff --git a/target/linux/brcm63xx/patches-3.9/031-MIPS-BCM63XX-export-PSI-size-from-nvram.patch b/target/linux/brcm63xx/patches-3.9/031-MIPS-BCM63XX-export-PSI-size-from-nvram.patch
deleted file mode 100644 (file)
index 8ff9659..0000000
+++ /dev/null
@@ -1,58 +0,0 @@
-From bda508f975d1372568a4fc9862be501a6176fd46 Mon Sep 17 00:00:00 2001
-From: Jonas Gorski <jogo@openwrt.org>
-Date: Sat, 12 May 2012 23:04:17 +0200
-Subject: [PATCH v2 2/3] MIPS: BCM63XX: export PSI size from nvram
-
-Signed-off-by: Jonas Gorski <jogo@openwrt.org>
----
- arch/mips/bcm63xx/nvram.c                          |   13 +++++++++++++
- arch/mips/include/asm/mach-bcm63xx/bcm63xx_nvram.h |    7 +++++++
- 2 files changed, 20 insertions(+)
-
---- a/arch/mips/bcm63xx/nvram.c
-+++ b/arch/mips/bcm63xx/nvram.c
-@@ -15,6 +15,7 @@
- #include <linux/export.h>
- #include <linux/kernel.h>
- #include <linux/if_ether.h>
-+#include <linux/sizes.h>
- #include <bcm63xx_nvram.h>
-@@ -35,6 +36,8 @@ struct bcm963xx_nvram {
-       u32     checksum_high;
- };
-+#define BCM63XX_DEFAULT_PSI_SIZE      SZ_64K
-+
- static struct bcm963xx_nvram nvram;
- static int mac_addr_used;
-@@ -104,3 +107,13 @@ int bcm63xx_nvram_get_mac_address(u8 *ma
-       return 0;
- }
- EXPORT_SYMBOL(bcm63xx_nvram_get_mac_address);
-+
-+unsigned int bcm63xx_nvram_get_psi_size(void)
-+{
-+      /* max is 64k, but some vendors use higher values */
-+      if (nvram.psi_size > 0 && nvram.psi_size <= 512)
-+              return nvram.psi_size * SZ_1K;
-+
-+      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
-@@ -30,4 +30,11 @@ u8 *bcm63xx_nvram_get_name(void);
-  */
- int bcm63xx_nvram_get_mac_address(u8 *mac);
-+/**
-+ * bcm63xx_nvram_get_psi_size() - returns the size of the PSI area
-+ *
-+ * Returns the size of the Persitent Storage Information area in bytes.
-+ */
-+unsigned int bcm63xx_nvram_get_psi_size(void);
-+
- #endif /* BCM63XX_NVRAM_H */
diff --git a/target/linux/brcm63xx/patches-3.9/032-MTD-bcm63xxpart-use-nvram-for-PSI-size.patch b/target/linux/brcm63xx/patches-3.9/032-MTD-bcm63xxpart-use-nvram-for-PSI-size.patch
deleted file mode 100644 (file)
index f1c1a0f..0000000
+++ /dev/null
@@ -1,42 +0,0 @@
-From f6eefaa4a08ec27c69485c2fc4db23247b84f8c9 Mon Sep 17 00:00:00 2001
-From: Jonas Gorski <jogo@openwrt.org>
-Date: Tue, 1 May 2012 14:10:39 +0200
-Subject: [PATCH v2 3/3] MTD: bcm63xxpart: use nvram for PSI size
-
-Read out the SPI size from nvram instead of defaulting to 64K - some
-vendors actually use values larger than the "max" value of 64.
-
-Signed-off-by: Jonas Gorski <jogo@openwrt.org>
----
- drivers/mtd/bcm63xxpart.c |    6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
---- a/drivers/mtd/bcm63xxpart.c
-+++ b/drivers/mtd/bcm63xxpart.c
-@@ -4,7 +4,7 @@
-  * Copyright © 2006-2008  Florian Fainelli <florian@openwrt.org>
-  *                      Mike Albon <malbon@openwrt.org>
-  * Copyright © 2009-2010  Daniel Dickinson <openwrt@cshore.neomailbox.net>
-- * Copyright © 2011-2012  Jonas Gorski <jonas.gorski@gmail.com>
-+ * Copyright © 2011-2013  Jonas Gorski <jonas.gorski@gmail.com>
-  *
-  * This program is free software; you can redistribute it and/or modify
-  * it under the terms of the GNU General Public License as published by
-@@ -34,6 +34,7 @@
- #include <linux/mtd/partitions.h>
- #include <linux/bcm963xx_tag.h>
-+#include <asm/mach-bcm63xx/bcm63xx_nvram.h>
- #include <asm/mach-bcm63xx/board_bcm963xx.h>
- #define BCM63XX_EXTENDED_SIZE 0xBFC00000      /* Extended flash address */
-@@ -91,7 +92,8 @@ static int bcm63xx_parse_cfe_partitions(
-                             BCM63XX_CFE_BLOCK_SIZE);
-       cfelen = cfe_erasesize;
--      nvramlen = cfe_erasesize;
-+      nvramlen = bcm63xx_nvram_get_psi_size();
-+      nvramlen = roundup(nvramlen, cfe_erasesize);
-       /* Allocate memory for buffer */
-       buf = vmalloc(sizeof(struct bcm_tag));
diff --git a/target/linux/brcm63xx/patches-3.9/033-MIPS-BCM63XX-Handle-SW-IRQs-0-1.patch b/target/linux/brcm63xx/patches-3.9/033-MIPS-BCM63XX-Handle-SW-IRQs-0-1.patch
deleted file mode 100644 (file)
index 38fd2d8..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-From 1a66581c94ad3966a823f2efaf8a5cc514895318 Mon Sep 17 00:00:00 2001
-From: Kevin Cernekee <cernekee@gmail.com>
-Date: Mon, 31 Oct 2011 11:52:10 -0700
-Subject: [PATCH 2/3] MIPS: BCM63XX: Handle SW IRQs 0-1
-
-MIPS software IRQs 0 and 1 are used for interprocessor signaling (IPI)
-on BMIPS SMP.  Make the board support code aware of them.
-
-Signed-off-by: Kevin Cernekee <cernekee@gmail.com>
-[jogo@openwrt.org: move sw irqs behind timer irq]
-Signed-off-by: Jonas Gorski <jogo@openwrt.org>
----
- arch/mips/bcm63xx/irq.c |    4 ++++
- 1 file changed, 4 insertions(+)
-
---- a/arch/mips/bcm63xx/irq.c
-+++ b/arch/mips/bcm63xx/irq.c
-@@ -294,6 +294,10 @@ asmlinkage void plat_irq_dispatch(void)
-               if (cause & CAUSEF_IP7)
-                       do_IRQ(7);
-+              if (cause & CAUSEF_IP0)
-+                      do_IRQ(0);
-+              if (cause & CAUSEF_IP1)
-+                      do_IRQ(1);
-               if (cause & CAUSEF_IP2)
-                       dispatch_internal();
-               if (!is_ext_irq_cascaded) {
diff --git a/target/linux/brcm63xx/patches-3.9/034-MIPS-BCM63XX-select-BMIPS4350-and-default-to-2-CPUs-.patch b/target/linux/brcm63xx/patches-3.9/034-MIPS-BCM63XX-select-BMIPS4350-and-default-to-2-CPUs-.patch
deleted file mode 100644 (file)
index 920bc39..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
-From 158a11f25e070a6ed99cf8faa985da1f2669230f Mon Sep 17 00:00:00 2001
-From: Jonas Gorski <jogo@openwrt.org>
-Date: Sun, 21 Apr 2013 14:44:00 +0200
-Subject: [PATCH 3/3] MIPS: BCM63XX: select BMIPS4350 and default to 2 CPUs
- for supported SoCs
-
-All BCM63XX SoCs starting with BCM6358 have a BMIPS4350 instead of a
-BMIPS3300, so select it unless support for any of the older SoCs is
-selected.
-All BMIPS4350 have only two CPUs, so select the appropriate default.
-
-Signed-off-by: Jonas Gorski <jogo@openwrt.org>
----
- arch/mips/Kconfig |    2 ++
- 1 file changed, 2 insertions(+)
-
---- a/arch/mips/Kconfig
-+++ b/arch/mips/Kconfig
-@@ -129,6 +129,8 @@ config BCM63XX
-       select DMA_NONCOHERENT
-       select IRQ_CPU
-       select SYS_HAS_CPU_MIPS32_R1
-+      select SYS_HAS_CPU_BMIPS4350 if !BCM63XX_CPU_6338 && !BCM63XX_CPU_6345 && !BCM63XX_CPU_6348
-+      select NR_CPUS_DEFAULT_2
-       select SYS_SUPPORTS_32BIT_KERNEL
-       select SYS_SUPPORTS_BIG_ENDIAN
-       select SYS_HAS_EARLY_PRINTK
diff --git a/target/linux/brcm63xx/patches-3.9/035-MIPS-BCM63XX-select-BOOT_RAW.patch b/target/linux/brcm63xx/patches-3.9/035-MIPS-BCM63XX-select-BOOT_RAW.patch
deleted file mode 100644 (file)
index c540536..0000000
+++ /dev/null
@@ -1,30 +0,0 @@
-From 373eb1a286bf31b41f966d5d3826cfe63e826c92 Mon Sep 17 00:00:00 2001
-From: Florian Fainelli <florian@openwrt.org>
-Date: Tue, 18 Jun 2013 16:55:39 +0000
-Subject: [PATCH 1/6] MIPS: BCM63XX: select BOOT_RAW
-
-Enabling BOOT_RAW is mandatory to get a binary image (objcopy from ELF
-to binary) to work. This does not affect the ELF kernels which are used
-by CFE on BCM63XX DSL platforms, but is going to be necessary to support
-BCM63XX on Cable Modem chips such as BCM3368.
-
-Signed-off-by: Florian Fainelli <florian@openwrt.org>
-Cc: linux-mips@linux-mips.org
-Cc: cernekee@gmail.com
-Cc: jogo@openwrt.org
-Patchwork: https://patchwork.linux-mips.org/patch/5500/
-Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
----
- arch/mips/Kconfig |    1 +
- 1 file changed, 1 insertion(+)
-
---- a/arch/mips/Kconfig
-+++ b/arch/mips/Kconfig
-@@ -124,6 +124,7 @@ config BCM47XX
- config BCM63XX
-       bool "Broadcom BCM63XX based boards"
-+      select BOOT_RAW
-       select CEVT_R4K
-       select CSRC_R4K
-       select DMA_NONCOHERENT
diff --git a/target/linux/brcm63xx/patches-3.9/036-MIPS-BCM63XX-add-support-for-BCM3368-Cable-Modem.patch b/target/linux/brcm63xx/patches-3.9/036-MIPS-BCM63XX-add-support-for-BCM3368-Cable-Modem.patch
deleted file mode 100644 (file)
index c337763..0000000
+++ /dev/null
@@ -1,629 +0,0 @@
-From 31c761c9c1fa91bf4ed83d75dcbc4e426ea2b670 Mon Sep 17 00:00:00 2001
-From: Florian Fainelli <florian@openwrt.org>
-Date: Tue, 18 Jun 2013 16:55:40 +0000
-Subject: [PATCH 2/6] MIPS: BCM63XX: add support for BCM3368 Cable Modem
-
-The Broadcom BCM3368 Cable Modem SoC is extremely similar to the
-existing BCM63xx DSL SoCs, in particular BCM6358, therefore little effort
-in the existing code base is required to get it supported. This patch adds
-support for the following on-chip peripherals:
-
-- two UARTS
-- GPIO
-- Ethernet
-- SPI
-- PCI
-- NOR Flash
-
-The most noticeable difference with 3368 is that it has its peripheral
-register at 0xfff8_0000 we check that separately in ioremap.h. Since
-3368 is identical to 6358 for its clock and reset bits, we use them
-verbatim.
-
-Signed-off-by: Florian Fainelli <florian@openwrt.org>
-Cc: linux-mips@linux-mips.org
-Cc: cernekee@gmail.com
-Cc: jogo@openwrt.org
-Patchwork: https://patchwork.linux-mips.org/patch/5499/
-Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
----
- arch/mips/bcm63xx/Kconfig                         |    4 +
- arch/mips/bcm63xx/clk.c                           |   18 ++--
- arch/mips/bcm63xx/cpu.c                           |   28 +++++-
- arch/mips/bcm63xx/dev-flash.c                     |    1 +
- arch/mips/bcm63xx/dev-spi.c                       |    6 +-
- arch/mips/bcm63xx/dev-uart.c                      |    3 +-
- arch/mips/bcm63xx/irq.c                           |   19 ++++
- arch/mips/bcm63xx/prom.c                          |    4 +-
- arch/mips/bcm63xx/reset.c                         |   29 +++++-
- arch/mips/bcm63xx/setup.c                         |    3 +
- arch/mips/include/asm/mach-bcm63xx/bcm63xx_cpu.h  |  110 +++++++++++++++++++++
- arch/mips/include/asm/mach-bcm63xx/bcm63xx_gpio.h |    1 +
- arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h |   45 ++++++++-
- arch/mips/include/asm/mach-bcm63xx/ioremap.h      |    4 +
- arch/mips/pci/pci-bcm63xx.c                       |    3 +-
- 15 files changed, 259 insertions(+), 19 deletions(-)
-
---- a/arch/mips/bcm63xx/Kconfig
-+++ b/arch/mips/bcm63xx/Kconfig
-@@ -1,6 +1,10 @@
- menu "CPU support"
-       depends on BCM63XX
-+config BCM63XX_CPU_3368
-+      bool "support 3368 CPU"
-+      select HW_HAS_PCI
-+
- config BCM63XX_CPU_6328
-       bool "support 6328 CPU"
-       select HW_HAS_PCI
---- a/arch/mips/bcm63xx/clk.c
-+++ b/arch/mips/bcm63xx/clk.c
-@@ -84,7 +84,7 @@ static void enetx_set(struct clk *clk, i
-       else
-               clk_disable_unlocked(&clk_enet_misc);
--      if (BCMCPU_IS_6358()) {
-+      if (BCMCPU_IS_3368() || BCMCPU_IS_6358()) {
-               u32 mask;
-               if (clk->id == 0)
-@@ -110,9 +110,8 @@ static struct clk clk_enet1 = {
-  */
- static void ephy_set(struct clk *clk, int enable)
- {
--      if (!BCMCPU_IS_6358())
--              return;
--      bcm_hwclock_set(CKCTL_6358_EPHY_EN, enable);
-+      if (BCMCPU_IS_3368() || BCMCPU_IS_6358())
-+              bcm_hwclock_set(CKCTL_6358_EPHY_EN, enable);
- }
-@@ -155,9 +154,10 @@ static struct clk clk_enetsw = {
-  */
- static void pcm_set(struct clk *clk, int enable)
- {
--      if (!BCMCPU_IS_6358())
--              return;
--      bcm_hwclock_set(CKCTL_6358_PCM_EN, enable);
-+      if (BCMCPU_IS_3368())
-+              bcm_hwclock_set(CKCTL_3368_PCM_EN, enable);
-+      if (BCMCPU_IS_6358())
-+              bcm_hwclock_set(CKCTL_6358_PCM_EN, enable);
- }
- static struct clk clk_pcm = {
-@@ -211,7 +211,7 @@ static void spi_set(struct clk *clk, int
-               mask = CKCTL_6338_SPI_EN;
-       else if (BCMCPU_IS_6348())
-               mask = CKCTL_6348_SPI_EN;
--      else if (BCMCPU_IS_6358())
-+      else if (BCMCPU_IS_3368() || BCMCPU_IS_6358())
-               mask = CKCTL_6358_SPI_EN;
-       else if (BCMCPU_IS_6362())
-               mask = CKCTL_6362_SPI_EN;
-@@ -338,7 +338,7 @@ struct clk *clk_get(struct device *dev,
-               return &clk_xtm;
-       if (!strcmp(id, "periph"))
-               return &clk_periph;
--      if (BCMCPU_IS_6358() && !strcmp(id, "pcm"))
-+      if ((BCMCPU_IS_3368() || BCMCPU_IS_6358()) && !strcmp(id, "pcm"))
-               return &clk_pcm;
-       if ((BCMCPU_IS_6362() || BCMCPU_IS_6368()) && !strcmp(id, "ipsec"))
-               return &clk_ipsec;
---- a/arch/mips/bcm63xx/cpu.c
-+++ b/arch/mips/bcm63xx/cpu.c
-@@ -29,6 +29,14 @@ static u8 bcm63xx_cpu_rev;
- static unsigned int bcm63xx_cpu_freq;
- static unsigned int bcm63xx_memory_size;
-+static const unsigned long bcm3368_regs_base[] = {
-+      __GEN_CPU_REGS_TABLE(3368)
-+};
-+
-+static const int bcm3368_irqs[] = {
-+      __GEN_CPU_IRQ_TABLE(3368)
-+};
-+
- static const unsigned long bcm6328_regs_base[] = {
-       __GEN_CPU_REGS_TABLE(6328)
- };
-@@ -116,6 +124,9 @@ unsigned int bcm63xx_get_memory_size(voi
- static unsigned int detect_cpu_clock(void)
- {
-       switch (bcm63xx_get_cpu_id()) {
-+      case BCM3368_CPU_ID:
-+              return 300000000;
-+
-       case BCM6328_CPU_ID:
-       {
-               unsigned int tmp, mips_pll_fcvo;
-@@ -266,7 +277,7 @@ static unsigned int detect_memory_size(v
-               banks = (val & SDRAM_CFG_BANK_MASK) ? 2 : 1;
-       }
--      if (BCMCPU_IS_6358() || BCMCPU_IS_6368()) {
-+      if (BCMCPU_IS_3368() || BCMCPU_IS_6358() || BCMCPU_IS_6368()) {
-               val = bcm_memc_readl(MEMC_CFG_REG);
-               rows = (val & MEMC_CFG_ROW_MASK) >> MEMC_CFG_ROW_SHIFT;
-               cols = (val & MEMC_CFG_COL_MASK) >> MEMC_CFG_COL_SHIFT;
-@@ -302,10 +313,17 @@ void __init bcm63xx_cpu_init(void)
-               chipid_reg = BCM_6345_PERF_BASE;
-               break;
-       case CPU_BMIPS4350:
--              if ((read_c0_prid() & 0xf0) == 0x10)
-+              switch ((read_c0_prid() & 0xff)) {
-+              case 0x04:
-+                      chipid_reg = BCM_3368_PERF_BASE;
-+                      break;
-+              case 0x10:
-                       chipid_reg = BCM_6345_PERF_BASE;
--              else
-+                      break;
-+              default:
-                       chipid_reg = BCM_6368_PERF_BASE;
-+                      break;
-+              }
-               break;
-       }
-@@ -322,6 +340,10 @@ void __init bcm63xx_cpu_init(void)
-       bcm63xx_cpu_rev = (tmp & REV_REVID_MASK) >> REV_REVID_SHIFT;
-       switch (bcm63xx_cpu_id) {
-+      case BCM3368_CPU_ID:
-+              bcm63xx_regs_base = bcm3368_regs_base;
-+              bcm63xx_irqs = bcm3368_irqs;
-+              break;
-       case BCM6328_CPU_ID:
-               bcm63xx_regs_base = bcm6328_regs_base;
-               bcm63xx_irqs = bcm6328_irqs;
---- a/arch/mips/bcm63xx/dev-flash.c
-+++ b/arch/mips/bcm63xx/dev-flash.c
-@@ -71,6 +71,7 @@ static int __init bcm63xx_detect_flash_t
-       case BCM6348_CPU_ID:
-               /* no way to auto detect so assume parallel */
-               return BCM63XX_FLASH_TYPE_PARALLEL;
-+      case BCM3368_CPU_ID:
-       case BCM6358_CPU_ID:
-               val = bcm_gpio_readl(GPIO_STRAPBUS_REG);
-               if (val & STRAPBUS_6358_BOOT_SEL_PARALLEL)
---- a/arch/mips/bcm63xx/dev-spi.c
-+++ b/arch/mips/bcm63xx/dev-spi.c
-@@ -37,7 +37,8 @@ static __init void bcm63xx_spi_regs_init
- {
-       if (BCMCPU_IS_6338() || BCMCPU_IS_6348())
-               bcm63xx_regs_spi = bcm6348_regs_spi;
--      if (BCMCPU_IS_6358() || BCMCPU_IS_6362() || BCMCPU_IS_6368())
-+      if (BCMCPU_IS_3368() || BCMCPU_IS_6358() ||
-+              BCMCPU_IS_6362() || BCMCPU_IS_6368())
-               bcm63xx_regs_spi = bcm6358_regs_spi;
- }
- #else
-@@ -87,7 +88,8 @@ int __init bcm63xx_spi_register(void)
-               spi_pdata.msg_ctl_width = SPI_6348_MSG_CTL_WIDTH;
-       }
--      if (BCMCPU_IS_6358() || BCMCPU_IS_6362() || BCMCPU_IS_6368()) {
-+      if (BCMCPU_IS_3368() || BCMCPU_IS_6358() || BCMCPU_IS_6362() ||
-+              BCMCPU_IS_6368()) {
-               spi_resources[0].end += BCM_6358_RSET_SPI_SIZE - 1;
-               spi_pdata.fifo_size = SPI_6358_MSG_DATA_SIZE;
-               spi_pdata.msg_type_shift = SPI_6358_MSG_TYPE_SHIFT;
---- a/arch/mips/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_3368() && !BCMCPU_IS_6358() &&
-+              !BCMCPU_IS_6368()))
-               return -ENODEV;
-       if (id == 0) {
---- a/arch/mips/bcm63xx/irq.c
-+++ b/arch/mips/bcm63xx/irq.c
-@@ -27,6 +27,17 @@ static void __internal_irq_unmask_32(uns
- static void __internal_irq_unmask_64(unsigned int irq) __maybe_unused;
- #ifndef BCMCPU_RUNTIME_DETECT
-+#ifdef CONFIG_BCM63XX_CPU_3368
-+#define irq_stat_reg          PERF_IRQSTAT_3368_REG
-+#define irq_mask_reg          PERF_IRQMASK_3368_REG
-+#define irq_bits              32
-+#define is_ext_irq_cascaded   0
-+#define ext_irq_start         0
-+#define ext_irq_end           0
-+#define ext_irq_count         4
-+#define ext_irq_cfg_reg1      PERF_EXTIRQ_CFG_REG_3368
-+#define ext_irq_cfg_reg2      0
-+#endif
- #ifdef CONFIG_BCM63XX_CPU_6328
- #define irq_stat_reg          PERF_IRQSTAT_6328_REG
- #define irq_mask_reg          PERF_IRQMASK_6328_REG
-@@ -140,6 +151,13 @@ static void bcm63xx_init_irq(void)
-       irq_mask_addr = bcm63xx_regset_address(RSET_PERF);
-       switch (bcm63xx_get_cpu_id()) {
-+      case BCM3368_CPU_ID:
-+              irq_stat_addr += PERF_IRQSTAT_3368_REG;
-+              irq_mask_addr += PERF_IRQMASK_3368_REG;
-+              irq_bits = 32;
-+              ext_irq_count = 4;
-+              ext_irq_cfg_reg1 = PERF_EXTIRQ_CFG_REG_3368;
-+              break;
-       case BCM6328_CPU_ID:
-               irq_stat_addr += PERF_IRQSTAT_6328_REG;
-               irq_mask_addr += PERF_IRQMASK_6328_REG;
-@@ -479,6 +497,7 @@ static int bcm63xx_external_irq_set_type
-                       reg &= ~EXTIRQ_CFG_BOTHEDGE_6348(irq);
-               break;
-+      case BCM3368_CPU_ID:
-       case BCM6328_CPU_ID:
-       case BCM6338_CPU_ID:
-       case BCM6345_CPU_ID:
---- a/arch/mips/bcm63xx/prom.c
-+++ b/arch/mips/bcm63xx/prom.c
-@@ -26,7 +26,9 @@ void __init prom_init(void)
-       bcm_wdt_writel(WDT_STOP_2, WDT_CTL_REG);
-       /* disable all hardware blocks clock for now */
--      if (BCMCPU_IS_6328())
-+      if (BCMCPU_IS_3368())
-+              mask = CKCTL_3368_ALL_SAFE_EN;
-+      else if (BCMCPU_IS_6328())
-               mask = CKCTL_6328_ALL_SAFE_EN;
-       else if (BCMCPU_IS_6338())
-               mask = CKCTL_6338_ALL_SAFE_EN;
---- a/arch/mips/bcm63xx/reset.c
-+++ b/arch/mips/bcm63xx/reset.c
-@@ -30,6 +30,19 @@
-       [BCM63XX_RESET_PCIE]            = BCM## __cpu ##_RESET_PCIE,    \
-       [BCM63XX_RESET_PCIE_EXT]        = BCM## __cpu ##_RESET_PCIE_EXT,
-+#define BCM3368_RESET_SPI     SOFTRESET_3368_SPI_MASK
-+#define BCM3368_RESET_ENET    SOFTRESET_3368_ENET_MASK
-+#define BCM3368_RESET_USBH    0
-+#define BCM3368_RESET_USBD    SOFTRESET_3368_USBS_MASK
-+#define BCM3368_RESET_DSL     0
-+#define BCM3368_RESET_SAR     0
-+#define BCM3368_RESET_EPHY    SOFTRESET_3368_EPHY_MASK
-+#define BCM3368_RESET_ENETSW  0
-+#define BCM3368_RESET_PCM     SOFTRESET_3368_PCM_MASK
-+#define BCM3368_RESET_MPI     SOFTRESET_3368_MPI_MASK
-+#define BCM3368_RESET_PCIE    0
-+#define BCM3368_RESET_PCIE_EXT        0
-+
- #define BCM6328_RESET_SPI     SOFTRESET_6328_SPI_MASK
- #define BCM6328_RESET_ENET    0
- #define BCM6328_RESET_USBH    SOFTRESET_6328_USBH_MASK
-@@ -117,6 +130,10 @@
- /*
-  * core reset bits
-  */
-+static const u32 bcm3368_reset_bits[] = {
-+      __GEN_RESET_BITS_TABLE(3368)
-+};
-+
- static const u32 bcm6328_reset_bits[] = {
-       __GEN_RESET_BITS_TABLE(6328)
- };
-@@ -146,7 +163,10 @@ static int reset_reg;
- static int __init bcm63xx_reset_bits_init(void)
- {
--      if (BCMCPU_IS_6328()) {
-+      if (BCMCPU_IS_3368()) {
-+              reset_reg = PERF_SOFTRESET_6358_REG;
-+              bcm63xx_reset_bits = bcm3368_reset_bits;
-+      } else if (BCMCPU_IS_6328()) {
-               reset_reg = PERF_SOFTRESET_6328_REG;
-               bcm63xx_reset_bits = bcm6328_reset_bits;
-       } else if (BCMCPU_IS_6338()) {
-@@ -170,6 +190,13 @@ static int __init bcm63xx_reset_bits_ini
- }
- #else
-+#ifdef CONFIG_BCM63XX_CPU_3368
-+static const u32 bcm63xx_reset_bits[] = {
-+      __GEN_RESET_BITS_TABLE(3368)
-+};
-+#define reset_reg PERF_SOFTRESET_6358_REG
-+#endif
-+
- #ifdef CONFIG_BCM63XX_CPU_6328
- static const u32 bcm63xx_reset_bits[] = {
-       __GEN_RESET_BITS_TABLE(6328)
---- a/arch/mips/bcm63xx/setup.c
-+++ b/arch/mips/bcm63xx/setup.c
-@@ -68,6 +68,9 @@ void bcm63xx_machine_reboot(void)
-       /* mask and clear all external irq */
-       switch (bcm63xx_get_cpu_id()) {
-+      case BCM3368_CPU_ID:
-+              perf_regs[0] = PERF_EXTIRQ_CFG_REG_3368;
-+              break;
-       case BCM6328_CPU_ID:
-               perf_regs[0] = PERF_EXTIRQ_CFG_REG_6328;
-               break;
---- a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_cpu.h
-+++ b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_cpu.h
-@@ -9,6 +9,7 @@
-  * compile time if only one CPU support is enabled (idea stolen from
-  * arm mach-types)
-  */
-+#define BCM3368_CPU_ID                0x3368
- #define BCM6328_CPU_ID                0x6328
- #define BCM6338_CPU_ID                0x6338
- #define BCM6345_CPU_ID                0x6345
-@@ -22,6 +23,19 @@ u16 __bcm63xx_get_cpu_id(void);
- u8 bcm63xx_get_cpu_rev(void);
- unsigned int bcm63xx_get_cpu_freq(void);
-+#ifdef CONFIG_BCM63XX_CPU_3368
-+# 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()        BCM3368_CPU_ID
-+# endif
-+# define BCMCPU_IS_3368()     (bcm63xx_get_cpu_id() == BCM3368_CPU_ID)
-+#else
-+# define BCMCPU_IS_3368()     (0)
-+#endif
-+
- #ifdef CONFIG_BCM63XX_CPU_6328
- # ifdef bcm63xx_get_cpu_id
- #  undef bcm63xx_get_cpu_id
-@@ -191,6 +205,53 @@ enum bcm63xx_regs_set {
- #define RSET_RNG_SIZE                 20
- /*
-+ * 3368 register sets base address
-+ */
-+#define BCM_3368_DSL_LMEM_BASE                (0xdeadbeef)
-+#define BCM_3368_PERF_BASE            (0xfff8c000)
-+#define BCM_3368_TIMER_BASE           (0xfff8c040)
-+#define BCM_3368_WDT_BASE             (0xfff8c080)
-+#define BCM_3368_UART0_BASE           (0xfff8c100)
-+#define BCM_3368_UART1_BASE           (0xfff8c120)
-+#define BCM_3368_GPIO_BASE            (0xfff8c080)
-+#define BCM_3368_SPI_BASE             (0xfff8c800)
-+#define BCM_3368_HSSPI_BASE           (0xdeadbeef)
-+#define BCM_3368_UDC0_BASE            (0xdeadbeef)
-+#define BCM_3368_USBDMA_BASE          (0xdeadbeef)
-+#define BCM_3368_OHCI0_BASE           (0xdeadbeef)
-+#define BCM_3368_OHCI_PRIV_BASE               (0xdeadbeef)
-+#define BCM_3368_USBH_PRIV_BASE               (0xdeadbeef)
-+#define BCM_3368_USBD_BASE            (0xdeadbeef)
-+#define BCM_3368_MPI_BASE             (0xfff80000)
-+#define BCM_3368_PCMCIA_BASE          (0xfff80054)
-+#define BCM_3368_PCIE_BASE            (0xdeadbeef)
-+#define BCM_3368_SDRAM_REGS_BASE      (0xdeadbeef)
-+#define BCM_3368_DSL_BASE             (0xdeadbeef)
-+#define BCM_3368_UBUS_BASE            (0xdeadbeef)
-+#define BCM_3368_ENET0_BASE           (0xfff98000)
-+#define BCM_3368_ENET1_BASE           (0xfff98800)
-+#define BCM_3368_ENETDMA_BASE         (0xfff99800)
-+#define BCM_3368_ENETDMAC_BASE                (0xfff99900)
-+#define BCM_3368_ENETDMAS_BASE                (0xfff99a00)
-+#define BCM_3368_ENETSW_BASE          (0xdeadbeef)
-+#define BCM_3368_EHCI0_BASE           (0xdeadbeef)
-+#define BCM_3368_SDRAM_BASE           (0xdeadbeef)
-+#define BCM_3368_MEMC_BASE            (0xfff84000)
-+#define BCM_3368_DDR_BASE             (0xdeadbeef)
-+#define BCM_3368_M2M_BASE             (0xdeadbeef)
-+#define BCM_3368_ATM_BASE             (0xdeadbeef)
-+#define BCM_3368_XTM_BASE             (0xdeadbeef)
-+#define BCM_3368_XTMDMA_BASE          (0xdeadbeef)
-+#define BCM_3368_XTMDMAC_BASE         (0xdeadbeef)
-+#define BCM_3368_XTMDMAS_BASE         (0xdeadbeef)
-+#define BCM_3368_PCM_BASE             (0xfff9c200)
-+#define BCM_3368_PCMDMA_BASE          (0xdeadbeef)
-+#define BCM_3368_PCMDMAC_BASE         (0xdeadbeef)
-+#define BCM_3368_PCMDMAS_BASE         (0xdeadbeef)
-+#define BCM_3368_RNG_BASE             (0xdeadbeef)
-+#define BCM_3368_MISC_BASE            (0xdeadbeef)
-+
-+/*
-  * 6328 register sets base address
-  */
- #define BCM_6328_DSL_LMEM_BASE                (0xdeadbeef)
-@@ -620,6 +681,9 @@ static inline unsigned long bcm63xx_regs
- #ifdef BCMCPU_RUNTIME_DETECT
-       return bcm63xx_regs_base[set];
- #else
-+#ifdef CONFIG_BCM63XX_CPU_3368
-+      __GEN_RSET(3368)
-+#endif
- #ifdef CONFIG_BCM63XX_CPU_6328
-       __GEN_RSET(6328)
- #endif
-@@ -687,6 +751,52 @@ enum bcm63xx_irq {
- };
- /*
-+ * 3368 irqs
-+ */
-+#define BCM_3368_TIMER_IRQ            (IRQ_INTERNAL_BASE + 0)
-+#define BCM_3368_SPI_IRQ              (IRQ_INTERNAL_BASE + 1)
-+#define BCM_3368_UART0_IRQ            (IRQ_INTERNAL_BASE + 2)
-+#define BCM_3368_UART1_IRQ            (IRQ_INTERNAL_BASE + 3)
-+#define BCM_3368_DSL_IRQ              0
-+#define BCM_3368_UDC0_IRQ             0
-+#define BCM_3368_OHCI0_IRQ            0
-+#define BCM_3368_ENET0_IRQ            (IRQ_INTERNAL_BASE + 8)
-+#define BCM_3368_ENET1_IRQ            (IRQ_INTERNAL_BASE + 6)
-+#define BCM_3368_ENET_PHY_IRQ         (IRQ_INTERNAL_BASE + 9)
-+#define BCM_3368_ENET0_RXDMA_IRQ      (IRQ_INTERNAL_BASE + 15)
-+#define BCM_3368_ENET0_TXDMA_IRQ      (IRQ_INTERNAL_BASE + 16)
-+#define BCM_3368_HSSPI_IRQ            0
-+#define BCM_3368_EHCI0_IRQ            0
-+#define BCM_3368_USBD_IRQ             0
-+#define BCM_3368_USBD_RXDMA0_IRQ      0
-+#define BCM_3368_USBD_TXDMA0_IRQ      0
-+#define BCM_3368_USBD_RXDMA1_IRQ      0
-+#define BCM_3368_USBD_TXDMA1_IRQ      0
-+#define BCM_3368_USBD_RXDMA2_IRQ      0
-+#define BCM_3368_USBD_TXDMA2_IRQ      0
-+#define BCM_3368_ENET1_RXDMA_IRQ        (IRQ_INTERNAL_BASE + 17)
-+#define BCM_3368_ENET1_TXDMA_IRQ        (IRQ_INTERNAL_BASE + 18)
-+#define BCM_3368_PCI_IRQ              (IRQ_INTERNAL_BASE + 31)
-+#define BCM_3368_PCMCIA_IRQ           0
-+#define BCM_3368_ATM_IRQ              0
-+#define BCM_3368_ENETSW_RXDMA0_IRQ    0
-+#define BCM_3368_ENETSW_RXDMA1_IRQ    0
-+#define BCM_3368_ENETSW_RXDMA2_IRQ    0
-+#define BCM_3368_ENETSW_RXDMA3_IRQ    0
-+#define BCM_3368_ENETSW_TXDMA0_IRQ    0
-+#define BCM_3368_ENETSW_TXDMA1_IRQ    0
-+#define BCM_3368_ENETSW_TXDMA2_IRQ    0
-+#define BCM_3368_ENETSW_TXDMA3_IRQ    0
-+#define BCM_3368_XTM_IRQ              0
-+#define BCM_3368_XTM_DMA0_IRQ         0
-+
-+#define BCM_3368_EXT_IRQ0             (IRQ_INTERNAL_BASE + 25)
-+#define BCM_3368_EXT_IRQ1             (IRQ_INTERNAL_BASE + 26)
-+#define BCM_3368_EXT_IRQ2             (IRQ_INTERNAL_BASE + 27)
-+#define BCM_3368_EXT_IRQ3             (IRQ_INTERNAL_BASE + 28)
-+
-+
-+/*
-  * 6328 irqs
-  */
- #define BCM_6328_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
-@@ -11,6 +11,7 @@ static inline unsigned long bcm63xx_gpio
-       switch (bcm63xx_get_cpu_id()) {
-       case BCM6328_CPU_ID:
-               return 32;
-+      case BCM3368_CPU_ID:
-       case BCM6358_CPU_ID:
-               return 40;
-       case BCM6338_CPU_ID:
---- a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h
-+++ b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h
-@@ -15,6 +15,39 @@
- /* Clock Control register */
- #define PERF_CKCTL_REG                        0x4
-+#define CKCTL_3368_MAC_EN             (1 << 3)
-+#define CKCTL_3368_TC_EN              (1 << 5)
-+#define CKCTL_3368_US_TOP_EN          (1 << 6)
-+#define CKCTL_3368_DS_TOP_EN          (1 << 7)
-+#define CKCTL_3368_APM_EN             (1 << 8)
-+#define CKCTL_3368_SPI_EN             (1 << 9)
-+#define CKCTL_3368_USBS_EN            (1 << 10)
-+#define CKCTL_3368_BMU_EN             (1 << 11)
-+#define CKCTL_3368_PCM_EN             (1 << 12)
-+#define CKCTL_3368_NTP_EN             (1 << 13)
-+#define CKCTL_3368_ACP_B_EN           (1 << 14)
-+#define CKCTL_3368_ACP_A_EN           (1 << 15)
-+#define CKCTL_3368_EMUSB_EN           (1 << 17)
-+#define CKCTL_3368_ENET0_EN           (1 << 18)
-+#define CKCTL_3368_ENET1_EN           (1 << 19)
-+#define CKCTL_3368_USBU_EN            (1 << 20)
-+#define CKCTL_3368_EPHY_EN            (1 << 21)
-+
-+#define CKCTL_3368_ALL_SAFE_EN                (CKCTL_3368_MAC_EN | \
-+                                       CKCTL_3368_TC_EN | \
-+                                       CKCTL_3368_US_TOP_EN | \
-+                                       CKCTL_3368_DS_TOP_EN | \
-+                                       CKCTL_3368_APM_EN | \
-+                                       CKCTL_3368_SPI_EN | \
-+                                       CKCTL_3368_USBS_EN | \
-+                                       CKCTL_3368_BMU_EN | \
-+                                       CKCTL_3368_PCM_EN | \
-+                                       CKCTL_3368_NTP_EN | \
-+                                       CKCTL_3368_ACP_B_EN | \
-+                                       CKCTL_3368_ACP_A_EN | \
-+                                       CKCTL_3368_EMUSB_EN | \
-+                                       CKCTL_3368_USBU_EN)
-+
- #define CKCTL_6328_PHYMIPS_EN         (1 << 0)
- #define CKCTL_6328_ADSL_QPROC_EN      (1 << 1)
- #define CKCTL_6328_ADSL_AFE_EN                (1 << 2)
-@@ -181,6 +214,7 @@
- #define SYS_PLL_SOFT_RESET            0x1
- /* Interrupt Mask register */
-+#define PERF_IRQMASK_3368_REG         0xc
- #define PERF_IRQMASK_6328_REG         0x20
- #define PERF_IRQMASK_6338_REG         0xc
- #define PERF_IRQMASK_6345_REG         0xc
-@@ -190,6 +224,7 @@
- #define PERF_IRQMASK_6368_REG         0x20
- /* Interrupt Status register */
-+#define PERF_IRQSTAT_3368_REG         0x10
- #define PERF_IRQSTAT_6328_REG         0x28
- #define PERF_IRQSTAT_6338_REG         0x10
- #define PERF_IRQSTAT_6345_REG         0x10
-@@ -199,6 +234,7 @@
- #define PERF_IRQSTAT_6368_REG         0x28
- /* External Interrupt Configuration register */
-+#define PERF_EXTIRQ_CFG_REG_3368      0x14
- #define PERF_EXTIRQ_CFG_REG_6328      0x18
- #define PERF_EXTIRQ_CFG_REG_6338      0x14
- #define PERF_EXTIRQ_CFG_REG_6345      0x14
-@@ -236,6 +272,13 @@
- #define PERF_SOFTRESET_6362_REG               0x10
- #define PERF_SOFTRESET_6368_REG               0x10
-+#define SOFTRESET_3368_SPI_MASK               (1 << 0)
-+#define SOFTRESET_3368_ENET_MASK      (1 << 2)
-+#define SOFTRESET_3368_MPI_MASK               (1 << 3)
-+#define SOFTRESET_3368_EPHY_MASK      (1 << 6)
-+#define SOFTRESET_3368_USBS_MASK      (1 << 11)
-+#define SOFTRESET_3368_PCM_MASK               (1 << 13)
-+
- #define SOFTRESET_6328_SPI_MASK               (1 << 0)
- #define SOFTRESET_6328_EPHY_MASK      (1 << 1)
- #define SOFTRESET_6328_SAR_MASK               (1 << 2)
-@@ -1293,7 +1336,7 @@
- #define SPI_6348_RX_DATA              0x80
- #define SPI_6348_RX_DATA_SIZE         0x3f
--/* BCM 6358/6262/6368 SPI core */
-+/* BCM 3368/6358/6262/6368 SPI core */
- #define SPI_6358_MSG_CTL              0x00    /* 16-bits register */
- #define SPI_6358_MSG_CTL_WIDTH                16
- #define SPI_6358_MSG_DATA             0x02
---- a/arch/mips/include/asm/mach-bcm63xx/ioremap.h
-+++ b/arch/mips/include/asm/mach-bcm63xx/ioremap.h
-@@ -11,6 +11,10 @@ static inline phys_t fixup_bigphys_addr(
- static inline int is_bcm63xx_internal_registers(phys_t offset)
- {
-       switch (bcm63xx_get_cpu_id()) {
-+      case BCM3368_CPU_ID:
-+              if (offset >= 0xfff80000)
-+                      return 1;
-+              break;
-       case BCM6338_CPU_ID:
-       case BCM6345_CPU_ID:
-       case BCM6348_CPU_ID:
---- a/arch/mips/pci/pci-bcm63xx.c
-+++ b/arch/mips/pci/pci-bcm63xx.c
-@@ -266,7 +266,7 @@ static int __init bcm63xx_register_pci(v
-       /* setup PCI to local bus access, used by PCI device to target
-        * local RAM while bus mastering */
-       bcm63xx_int_cfg_writel(0, PCI_BASE_ADDRESS_3);
--      if (BCMCPU_IS_6358() || BCMCPU_IS_6368())
-+      if (BCMCPU_IS_3368() || BCMCPU_IS_6358() || BCMCPU_IS_6368())
-               val = MPI_SP0_REMAP_ENABLE_MASK;
-       else
-               val = 0;
-@@ -338,6 +338,7 @@ static int __init bcm63xx_pci_init(void)
-       case BCM6328_CPU_ID:
-       case BCM6362_CPU_ID:
-               return bcm63xx_register_pcie();
-+      case BCM3368_CPU_ID:
-       case BCM6348_CPU_ID:
-       case BCM6358_CPU_ID:
-       case BCM6368_CPU_ID:
diff --git a/target/linux/brcm63xx/patches-3.9/037-MIPS-BCM63XX-recognize-Cable-Modem-firmware-format.patch b/target/linux/brcm63xx/patches-3.9/037-MIPS-BCM63XX-recognize-Cable-Modem-firmware-format.patch
deleted file mode 100644 (file)
index 83e8b92..0000000
+++ /dev/null
@@ -1,101 +0,0 @@
-From f3b3faafe7b5a1c07b12d18e96c36bc8a0eecaed Mon Sep 17 00:00:00 2001
-From: Florian Fainelli <florian@openwrt.org>
-Date: Tue, 18 Jun 2013 16:55:41 +0000
-Subject: [PATCH 3/6] MIPS: BCM63XX: recognize Cable Modem firmware format
-
-Add the firmware header format which is used by Broadcom Cable Modem
-SoCs such as the BCM3368 SoC. We export the bcm_hcs firmware format
-structure because it is used by user-land tools to create firmware
-images for these SoCs and will later be used by a corresponding MTD
-parser.
-
-Signed-off-by: Florian Fainelli <florian@openwrt.org>
-Cc: linux-mips@linux-mips.org
-Cc: cernekee@gmail.com
-Cc: jogo@openwrt.org
-Patchwork: https://patchwork.linux-mips.org/patch/5496/
-Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
----
- arch/mips/bcm63xx/boards/board_bcm963xx.c |   14 ++++++++++++--
- include/uapi/linux/Kbuild                 |    1 +
- include/uapi/linux/bcm933xx_hcs.h         |   24 ++++++++++++++++++++++++
- 3 files changed, 37 insertions(+), 2 deletions(-)
- create mode 100644 include/uapi/linux/bcm933xx_hcs.h
-
---- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
-+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -28,8 +28,12 @@
- #include <bcm63xx_dev_usb_usbd.h>
- #include <board_bcm963xx.h>
-+#include <uapi/linux/bcm933xx_hcs.h>
-+
- #define PFX   "board_bcm963xx: "
-+#define HCS_OFFSET_128K                       0x20000
-+
- static struct board_info board;
- /*
-@@ -722,8 +726,9 @@ void __init board_prom_init(void)
-       unsigned int i;
-       u8 *boot_addr, *cfe;
-       char cfe_version[32];
--      char *board_name;
-+      char *board_name = NULL;
-       u32 val;
-+      struct bcm_hcs *hcs;
-       /* read base address of boot chip select (0)
-        * 6328/6362 do not have MPI but boot from a fixed address
-@@ -747,7 +752,12 @@ void __init board_prom_init(void)
-       bcm63xx_nvram_init(boot_addr + BCM963XX_NVRAM_OFFSET);
--      board_name = bcm63xx_nvram_get_name();
-+      if (BCMCPU_IS_3368()) {
-+              hcs = (struct bcm_hcs *)boot_addr;
-+              board_name = hcs->filename;
-+      } else {
-+              board_name = bcm63xx_nvram_get_name();
-+      }
-       /* find board by name */
-       for (i = 0; i < ARRAY_SIZE(bcm963xx_boards); i++) {
-               if (strncmp(board_name, bcm963xx_boards[i]->name, 16))
---- a/include/uapi/linux/Kbuild
-+++ b/include/uapi/linux/Kbuild
-@@ -62,6 +62,7 @@ header-y += auxvec.h
- header-y += ax25.h
- header-y += b1lli.h
- header-y += baycom.h
-+header-y += bcm933xx_hcs.h
- header-y += bfs_fs.h
- header-y += binfmts.h
- header-y += blkpg.h
---- /dev/null
-+++ b/include/uapi/linux/bcm933xx_hcs.h
-@@ -0,0 +1,24 @@
-+/*
-+ * Broadcom Cable Modem firmware format
-+ */
-+
-+#ifndef __BCM933XX_HCS_H
-+#define __BCM933XX_HCS_H
-+
-+#include <linux/types.h>
-+
-+struct bcm_hcs {
-+      __u16 magic;
-+      __u16 control;
-+      __u16 rev_maj;
-+      __u16 rev_min;
-+      __u32 build_date;
-+      __u32 filelen;
-+      __u32 ldaddress;
-+      char filename[64];
-+      __u16 hcs;
-+      __u16 her_znaet_chto;
-+      __u32 crc;
-+};
-+
-+#endif /* __BCM933XX_HCS */
diff --git a/target/linux/brcm63xx/patches-3.9/038-MIPS-BCM63XX-provide-a-MAC-address-for-BCM3368-chips.patch b/target/linux/brcm63xx/patches-3.9/038-MIPS-BCM63XX-provide-a-MAC-address-for-BCM3368-chips.patch
deleted file mode 100644 (file)
index ad32ac1..0000000
+++ /dev/null
@@ -1,46 +0,0 @@
-From 404fdc457082772ff52e22988e09e82c0d6e8780 Mon Sep 17 00:00:00 2001
-From: Florian Fainelli <florian@openwrt.org>
-Date: Tue, 18 Jun 2013 16:55:42 +0000
-Subject: [PATCH 4/6] MIPS: BCM63XX: provide a MAC address for BCM3368 chips
-
-The BCM3368 SoC uses a NVRAM format which is not compatible with the one
-used by CFE, provide a default MAC address which is suitable for use and
-which is the default one also being used by the bootloader on these
-chips.
-
-Signed-off-by: Florian Fainelli <florian@openwrt.org>
-Cc: linux-mips@linux-mips.org
-Cc: cernekee@gmail.com
-Cc: jogo@openwrt.org
-Patchwork: https://patchwork.linux-mips.org/patch/5498/
-Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
----
- arch/mips/bcm63xx/nvram.c |   10 ++++++++++
- 1 file changed, 10 insertions(+)
-
---- a/arch/mips/bcm63xx/nvram.c
-+++ b/arch/mips/bcm63xx/nvram.c
-@@ -45,6 +45,7 @@ void __init bcm63xx_nvram_init(void *add
- {
-       unsigned int check_len;
-       u32 crc, expected_crc;
-+      u8 hcs_mac_addr[ETH_ALEN] = { 0x00, 0x10, 0x18, 0xff, 0xff, 0xff };
-       /* extract nvram data */
-       memcpy(&nvram, addr, sizeof(nvram));
-@@ -65,6 +66,15 @@ void __init bcm63xx_nvram_init(void *add
-       if (crc != expected_crc)
-               pr_warn("nvram checksum failed, contents may be invalid (expected %08x, got %08x)\n",
-                       expected_crc, crc);
-+
-+      /* Cable modems have a different NVRAM which is embedded in the eCos
-+       * firmware and not easily extractible, give at least a MAC address
-+       * pool.
-+       */
-+      if (BCMCPU_IS_3368()) {
-+              memcpy(nvram.mac_addr_base, hcs_mac_addr, ETH_ALEN);
-+              nvram.mac_addr_count = 2;
-+      }
- }
- u8 *bcm63xx_nvram_get_name(void)
diff --git a/target/linux/brcm63xx/patches-3.9/039-MIPS-BCM63XX-let-board-specify-an-external-GPIO-to-r.patch b/target/linux/brcm63xx/patches-3.9/039-MIPS-BCM63XX-let-board-specify-an-external-GPIO-to-r.patch
deleted file mode 100644 (file)
index 122d915..0000000
+++ /dev/null
@@ -1,49 +0,0 @@
-From 0a97aafe7fe50ed183e7fa0121fa7838e2e20306 Mon Sep 17 00:00:00 2001
-From: Florian Fainelli <florian@openwrt.org>
-Date: Tue, 18 Jun 2013 16:55:43 +0000
-Subject: [PATCH 5/6] MIPS: BCM63XX: let board specify an external GPIO to
- reset PHY
-
-Some boards may need to reset their external PHY or switch they are
-attached to, add a hook for doing this along with providing custom
-linux/gpio.h flags for doing this.
-
-Signed-off-by: Florian Fainelli <florian@openwrt.org>
-Cc: linux-mips@linux-mips.org
-Cc: cernekee@gmail.com
-Cc: jogo@openwrt.org
-Cc: Florian Fainelli <florian@openwrt.org>
-Patchwork: https://patchwork.linux-mips.org/patch/5501/
-Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
----
- arch/mips/bcm63xx/boards/board_bcm963xx.c           |    4 ++++
- arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h |    6 ++++++
- 2 files changed, 10 insertions(+)
-
---- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
-+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -883,5 +883,9 @@ int __init board_register_devices(void)
-       platform_device_register(&bcm63xx_gpio_leds);
-+      if (board.ephy_reset_gpio && board.ephy_reset_gpio_flags)
-+              gpio_request_one(board.ephy_reset_gpio,
-+                              board.ephy_reset_gpio_flags, "ephy-reset");
-+
-       return 0;
- }
---- a/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h
-+++ b/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h
-@@ -45,6 +45,12 @@ struct board_info {
-       /* GPIO LEDs */
-       struct gpio_led leds[5];
-+
-+      /* External PHY reset GPIO */
-+      unsigned int ephy_reset_gpio;
-+
-+      /* External PHY reset GPIO flags from gpio.h */
-+      unsigned long ephy_reset_gpio_flags;
- };
- #endif /* ! BOARD_BCM963XX_H_ */
diff --git a/target/linux/brcm63xx/patches-3.9/040-MIPS-BCM63XX-add-support-for-the-Netgear-CVG834G.patch b/target/linux/brcm63xx/patches-3.9/040-MIPS-BCM63XX-add-support-for-the-Netgear-CVG834G.patch
deleted file mode 100644 (file)
index 2a589ec..0000000
+++ /dev/null
@@ -1,70 +0,0 @@
-From 04760855f0d99a1cdc67ae0152d95bcc4525cff5 Mon Sep 17 00:00:00 2001
-From: Florian Fainelli <florian@openwrt.org>
-Date: Tue, 18 Jun 2013 16:55:44 +0000
-Subject: [PATCH 6/6] MIPS: BCM63XX: add support for the Netgear CVG834G
-
-Add support for the Netgear CVG834G and enable the two UARTs, Ethernet
-on the first MAC, PCI and the two leds.
-
-Signed-off-by: Florian Fainelli <florian@openwrt.org>
-Cc: linux-mips@linux-mips.org
-Cc: cernekee@gmail.com
-Cc: jogo@openwrt.org
-Cc: Florian Fainelli <florian@openwrt.org>
-Patchwork: https://patchwork.linux-mips.org/patch/5502/
-Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
----
- arch/mips/bcm63xx/boards/board_bcm963xx.c |   35 +++++++++++++++++++++++++++++
- 1 file changed, 35 insertions(+)
-
---- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
-+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -37,6 +37,38 @@
- static struct board_info board;
- /*
-+ * known 3368 boards
-+ */
-+#ifdef CONFIG_BCM63XX_CPU_3368
-+static struct board_info __initdata board_cvg834g = {
-+      .name                           = "CVG834G_E15R3921",
-+      .expected_cpu_id                = 0x3368,
-+
-+      .has_uart0                      = 1,
-+      .has_uart1                      = 1,
-+
-+      .has_enet0                      = 1,
-+      .has_pci                        = 1,
-+
-+      .enet0 = {
-+              .has_phy                = 1,
-+              .use_internal_phy       = 1,
-+      },
-+
-+      .leds = {
-+              {
-+                      .name           = "CVG834G:green:power",
-+                      .gpio           = 37,
-+                      .default_trigger= "default-on",
-+              },
-+      },
-+
-+      .ephy_reset_gpio                = 36,
-+      .ephy_reset_gpio_flags          = GPIOF_INIT_HIGH,
-+};
-+#endif
-+
-+/*
-  * known 6328 boards
-  */
- #ifdef CONFIG_BCM63XX_CPU_6328
-@@ -643,6 +675,9 @@ static struct board_info __initdata boar
-  * all boards
-  */
- static const struct board_info __initconst *bcm963xx_boards[] = {
-+#ifdef CONFIG_BCM63XX_CPU_3368
-+      &board_cvg834g,
-+#endif
- #ifdef CONFIG_BCM63XX_CPU_6328
-       &board_96328avng,
- #endif
diff --git a/target/linux/brcm63xx/patches-3.9/041-MIPS-BCM63XX-remove-bogus-Kconfig-selects.patch b/target/linux/brcm63xx/patches-3.9/041-MIPS-BCM63XX-remove-bogus-Kconfig-selects.patch
deleted file mode 100644 (file)
index 029e8f1..0000000
+++ /dev/null
@@ -1,47 +0,0 @@
-From 318883517ebc56e1f9068597e9875f578016e225 Mon Sep 17 00:00:00 2001
-From: Florian Fainelli <florian@openwrt.org>
-Date: Tue, 18 Jun 2013 16:55:38 +0000
-Subject: [PATCH] MIPS: BCM63XX: remove bogus Kconfig selects
-
-Remove the bogus selects on USB-related symbols for 6345 and 6338, not
-only we do not yet support USB on BCM63XX, but they also cause the
-following warnings:
-
-warning: (BCM63XX_CPU_6338 && BCM63XX_CPU_6345) selects
-USB_OHCI_BIG_ENDIAN_MMIO which has unmet direct dependencies
-(USB_SUPPORT && USB && USB_OHCI_HCD)
-warning: (BCM63XX_CPU_6338 && BCM63XX_CPU_6345) selects
-USB_OHCI_BIG_ENDIAN_DESC which has unmet direct dependencies
-(USB_SUPPORT && USB && USB_OHCI_HCD)
-make[4]: Leaving directory `/home/florian/dev/linux'
-
-Just get rid of these bogus Kconfig selects because neither 6345 nor
-6338 actually have built-in USB host controllers.
-
-Signed-off-by: Florian Fainelli <florian@openwrt.org>
-Cc: linux-mips@linux-mips.org
-Cc: cernekee@gmail.com
-Cc: jogo@openwrt.org
-Patchwork: http://patchwork.linux-mips.org/patch/5497/
-Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
----
- arch/mips/bcm63xx/Kconfig |    5 -----
- 1 file changed, 5 deletions(-)
-
---- a/arch/mips/bcm63xx/Kconfig
-+++ b/arch/mips/bcm63xx/Kconfig
-@@ -12,14 +12,9 @@ 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
- 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"
diff --git a/target/linux/brcm63xx/patches-3.9/042-MIPS-BMIPS-support-booting-from-physical-CPU-other-t.patch b/target/linux/brcm63xx/patches-3.9/042-MIPS-BMIPS-support-booting-from-physical-CPU-other-t.patch
deleted file mode 100644 (file)
index 7d0506f..0000000
+++ /dev/null
@@ -1,89 +0,0 @@
-From 672d6bea85c7c9c63c086a9423e6d4e5fc286152 Mon Sep 17 00:00:00 2001
-From: Florian Fainelli <florian@openwrt.org>
-Date: Wed, 26 Jun 2013 18:11:56 +0000
-Subject: [PATCH] MIPS: BMIPS: support booting from physical CPU other than 0
-
-BMIPS43xx CPUs have two hardware threads, and on some SoCs such as 3368,
-the bootloader has configured the system to boot from TP1 instead of the
-more usual TP0. Create the physical to logical CPU mapping to cope with
-that, do not remap the software interrupts to be cross CPUs such that we
-do not have to do use the logical CPU mapping further down the code, and
-finally, reset the slave TP1 only if booted from TP0.
-
-Signed-off-by: Jonas Gorski <jogo@openwrt.org>
-Signed-off-by: Florian Fainelli <florian@openwrt.org>
-Cc: linux-mips@linux-mips.org
-Cc: blogic@openwrt.org
-Cc: cernekee@gmail.com
-Patchwork: https://patchwork.linux-mips.org/patch/5553/
-Patchwork: https://patchwork.linux-mips.org/patch/5556/
-Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
----
- arch/mips/kernel/smp-bmips.c |   29 +++++++++++++++++++++++------
- 1 file changed, 23 insertions(+), 6 deletions(-)
-
---- a/arch/mips/kernel/smp-bmips.c
-+++ b/arch/mips/kernel/smp-bmips.c
-@@ -63,7 +63,7 @@ static irqreturn_t bmips_ipi_interrupt(i
- static void __init bmips_smp_setup(void)
- {
--      int i;
-+      int i, cpu = 1, boot_cpu = 0;
- #if defined(CONFIG_CPU_BMIPS4350) || defined(CONFIG_CPU_BMIPS4380)
-       /* arbitration priority */
-@@ -72,13 +72,22 @@ static void __init bmips_smp_setup(void)
-       /* NBK and weak order flags */
-       set_c0_brcm_config_0(0x30000);
-+      /* Find out if we are running on TP0 or TP1 */
-+      boot_cpu = !!(read_c0_brcm_cmt_local() & (1 << 31));
-+
-       /*
-        * MIPS interrupts 0,1 (SW INT 0,1) cross over to the other thread
-        * MIPS interrupt 2 (HW INT 0) is the CPU0 L1 controller output
-        * MIPS interrupt 3 (HW INT 1) is the CPU1 L1 controller output
-+       *
-+       * If booting from TP1, leave the existing CMT interrupt routing
-+       * such that TP0 responds to SW1 and TP1 responds to SW0.
-        */
--      change_c0_brcm_cmt_intr(0xf8018000,
--              (0x02 << 27) | (0x03 << 15));
-+      if (boot_cpu == 0)
-+              change_c0_brcm_cmt_intr(0xf8018000,
-+                                      (0x02 << 27) | (0x03 << 15));
-+      else
-+              change_c0_brcm_cmt_intr(0xf8018000, (0x1d << 27));
-       /* single core, 2 threads (2 pipelines) */
-       max_cpus = 2;
-@@ -106,9 +115,15 @@ static void __init bmips_smp_setup(void)
-       if (!board_ebase_setup)
-               board_ebase_setup = &bmips_ebase_setup;
-+      __cpu_number_map[boot_cpu] = 0;
-+      __cpu_logical_map[0] = boot_cpu;
-+
-       for (i = 0; i < max_cpus; i++) {
--              __cpu_number_map[i] = 1;
--              __cpu_logical_map[i] = 1;
-+              if (i != boot_cpu) {
-+                      __cpu_number_map[i] = cpu;
-+                      __cpu_logical_map[cpu] = i;
-+                      cpu++;
-+              }
-               set_cpu_possible(i, 1);
-               set_cpu_present(i, 1);
-       }
-@@ -157,7 +172,9 @@ static void bmips_boot_secondary(int cpu
-               bmips_send_ipi_single(cpu, 0);
-       else {
- #if defined(CONFIG_CPU_BMIPS4350) || defined(CONFIG_CPU_BMIPS4380)
--              set_c0_brcm_cmt_ctrl(0x01);
-+              /* Reset slave TP1 if booting from TP0 */
-+              if (cpu_logical_map(cpu) == 0)
-+                      set_c0_brcm_cmt_ctrl(0x01);
- #elif defined(CONFIG_CPU_BMIPS5000)
-               if (cpu & 0x01)
-                       write_c0_brcm_action(ACTION_BOOT_THREAD(cpu));
diff --git a/target/linux/brcm63xx/patches-3.9/043-MIPS-BCM63XX-Add-SMP-support-to-prom.c.patch b/target/linux/brcm63xx/patches-3.9/043-MIPS-BCM63XX-Add-SMP-support-to-prom.c.patch
deleted file mode 100644 (file)
index 23f6d85..0000000
+++ /dev/null
@@ -1,82 +0,0 @@
-From 7c44eabf20cba12049bf9eebfa192afcc2053b2d Mon Sep 17 00:00:00 2001
-From: Kevin Cernekee <cernekee@gmail.com>
-Date: Sat, 9 Jul 2011 12:15:06 -0700
-Subject: [PATCH V2 1/2] MIPS: BCM63XX: Add SMP support to prom.c
-
-This involves two changes to the BSP code:
-
-1) register_smp_ops() for BMIPS SMP
-
-2) The CPU1 boot vector on some of the BCM63xx platforms conflicts with
-the special interrupt vector (IV).  Move it to 0x8000_0380 at boot time,
-to resolve the conflict.
-
-Signed-off-by: Kevin Cernekee <cernekee@gmail.com>
-[jogo@openwrt.org: moved SMP ops registration into ifdef guard,
- changed ifdef guards to if (IS_ENABLED())]
-Signed-off-by: Jonas Gorski <jogo@openwrt.org>
----
-V1 -> V2:
- * changed ifdef guards to if (IS_ENABLED())
-
- arch/mips/bcm63xx/prom.c |   41 +++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 41 insertions(+)
-
---- a/arch/mips/bcm63xx/prom.c
-+++ b/arch/mips/bcm63xx/prom.c
-@@ -8,7 +8,11 @@
- #include <linux/init.h>
- #include <linux/bootmem.h>
-+#include <linux/smp.h>
- #include <asm/bootinfo.h>
-+#include <asm/bmips.h>
-+#include <asm/smp-ops.h>
-+#include <asm/mipsregs.h>
- #include <bcm63xx_board.h>
- #include <bcm63xx_cpu.h>
- #include <bcm63xx_io.h>
-@@ -54,6 +58,43 @@ void __init prom_init(void)
-       /* do low level board init */
-       board_prom_init();
-+
-+      if (IS_ENABLED(CONFIG_CPU_BMIPS4350) && IS_ENABLED(CONFIG_SMP)) {
-+              /* set up SMP */
-+              register_smp_ops(&bmips_smp_ops);
-+
-+              /*
-+               * BCM6328 might not have its second CPU enabled, while BCM6358
-+               * needs special handling for its shared TLB, so disable SMP
-+               * for now.
-+               */
-+              if (BCMCPU_IS_6328()) {
-+                      bmips_smp_enabled = 0;
-+              } else if (BCMCPU_IS_6358()) {
-+                      bmips_smp_enabled = 0;
-+              }
-+
-+              if (!bmips_smp_enabled)
-+                      return;
-+
-+              /*
-+               * The bootloader has set up the CPU1 reset vector at
-+               * 0xa000_0200.
-+               * This conflicts with the special interrupt vector (IV).
-+               * The bootloader has also set up CPU1 to respond to the wrong
-+               * IPI interrupt.
-+               * Here we will start up CPU1 in the background and ask it to
-+               * reconfigure itself then go back to sleep.
-+               */
-+              memcpy((void *)0xa0000200, &bmips_smp_movevec, 0x20);
-+              __sync();
-+              set_c0_cause(C_SW0);
-+              cpumask_set_cpu(1, &bmips_booted_mask);
-+
-+              /*
-+               * FIXME: we really should have some sort of hazard barrier here
-+               */
-+      }
- }
- void __init prom_free_prom_memory(void)
diff --git a/target/linux/brcm63xx/patches-3.9/044-MIPS-BCM63XX-Enable-second-core-SMP-on-BCM6328-if-av.patch b/target/linux/brcm63xx/patches-3.9/044-MIPS-BCM63XX-Enable-second-core-SMP-on-BCM6328-if-av.patch
deleted file mode 100644 (file)
index 45a82f5..0000000
+++ /dev/null
@@ -1,55 +0,0 @@
-From 41fa6dec9df9b4e55ac522c899270a72e51a9b4b Mon Sep 17 00:00:00 2001
-From: Jonas Gorski <jogo@openwrt.org>
-Date: Sat, 9 Jul 2011 12:15:06 -0700
-Subject: [PATCH V2 2/2] MIPS: BCM63XX: Enable second core SMP on BCM6328 if
- available
-
-BCM6328 has a OTP which tells us if the second core is available.
-
-Signed-off-by: Jonas Gorski <jogo@openwrt.org>
----
- arch/mips/bcm63xx/prom.c                          |    6 +++++-
- arch/mips/include/asm/mach-bcm63xx/bcm63xx_cpu.h  |    2 ++
- arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h |    7 +++++++
- 3 files changed, 14 insertions(+), 1 deletion(-)
-
---- a/arch/mips/bcm63xx/prom.c
-+++ b/arch/mips/bcm63xx/prom.c
-@@ -69,7 +69,11 @@ void __init prom_init(void)
-                * for now.
-                */
-               if (BCMCPU_IS_6328()) {
--                      bmips_smp_enabled = 0;
-+                      reg = bcm_readl(BCM_6328_OTP_BASE +
-+                                      OTP_USER_BITS_6328_REG(3));
-+
-+                      if (reg & OTP_6328_REG3_TP1_DISABLED)
-+                              bmips_smp_enabled = 0;
-               } else if (BCMCPU_IS_6358()) {
-                       bmips_smp_enabled = 0;
-               }
---- a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_cpu.h
-+++ b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_cpu.h
-@@ -296,6 +296,8 @@ enum bcm63xx_regs_set {
- #define BCM_6328_PCMDMAS_BASE         (0xdeadbeef)
- #define BCM_6328_RNG_BASE             (0xdeadbeef)
- #define BCM_6328_MISC_BASE            (0xb0001800)
-+#define BCM_6328_OTP_BASE             (0xb0000600)
-+
- /*
-  * 6338 register sets base address
-  */
---- a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h
-+++ b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h
-@@ -1477,4 +1477,11 @@
- #define PCIE_DEVICE_OFFSET            0x8000
-+/*************************************************************************
-+ * _REG relative to RSET_OTP
-+ *************************************************************************/
-+
-+#define OTP_USER_BITS_6328_REG(i)     (0x20 + (i) * 4)
-+#define   OTP_6328_REG3_TP1_DISABLED  BIT(9)
-+
- #endif /* BCM63XX_REGS_H_ */
diff --git a/target/linux/brcm63xx/patches-3.9/045-bcm63xx_enet-implement-reset-autoneg-ethtool-callbac.patch b/target/linux/brcm63xx/patches-3.9/045-bcm63xx_enet-implement-reset-autoneg-ethtool-callbac.patch
deleted file mode 100644 (file)
index 7c80845..0000000
+++ /dev/null
@@ -1,44 +0,0 @@
-From a15c33450df64f183c8ab5de8ef113091081679d Mon Sep 17 00:00:00 2001
-From: Maxime Bizon <mbizon@freebox.fr>
-Date: Tue, 4 Jun 2013 20:53:33 +0000
-Subject: [PATCH 1/3] bcm63xx_enet: implement reset autoneg ethtool callback
-
-Implement the rset_nway ethtool callback which uses libphy generic
-autonegotiation restart function.
-
-Signed-off-by: Maxime Bizon <mbizon@freebox.fr>
----
- drivers/net/ethernet/broadcom/bcm63xx_enet.c |   15 +++++++++++++++
- 1 file changed, 15 insertions(+)
-
---- a/drivers/net/ethernet/broadcom/bcm63xx_enet.c
-+++ b/drivers/net/ethernet/broadcom/bcm63xx_enet.c
-@@ -1330,6 +1330,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)
- {
-@@ -1472,6 +1486,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.9/046-bcm63xx_enet-split-DMA-channel-register-accesses.patch b/target/linux/brcm63xx/patches-3.9/046-bcm63xx_enet-split-DMA-channel-register-accesses.patch
deleted file mode 100644 (file)
index 9d0c9aa..0000000
+++ /dev/null
@@ -1,346 +0,0 @@
-From 33cab1696444a8e333cf0490bfe04c32d583fd51 Mon Sep 17 00:00:00 2001
-From: Maxime Bizon <mbizon@freebox.fr>
-Date: Tue, 4 Jun 2013 20:53:34 +0000
-Subject: [PATCH 2/3] bcm63xx_enet: split DMA channel register accesses
-
-The current bcm63xx_enet driver always uses bcmenet_shared_base whenever
-it needs to access DMA channel configuration space or access the DMA
-channel state RAM. Split these register in 3 parts to be more accurate:
-
-- global DMA configuration
-- per DMA channel configuration space
-- per DMA channel state RAM space
-
-This is preliminary to support new chips where the global DMA
-configuration remains the same, but there is a varying number of DMA
-channels located at a different memory offset.
-
-Signed-off-by: Maxime Bizon <mbizon@freebox.fr>
-Signed-off-by: Jonas Gorski <jogo@openwrt.org>
----
- arch/mips/bcm63xx/dev-enet.c                     |   23 +++-
- arch/mips/include/asm/mach-bcm63xx/bcm63xx_cpu.h |    4 +-
- drivers/net/ethernet/broadcom/bcm63xx_enet.c     |  139 +++++++++++++---------
- 3 files changed, 105 insertions(+), 61 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
-@@ -187,7 +187,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_UDC_SIZE                 256
---- 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)
-@@ -833,8 +855,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)
-@@ -921,28 +943,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);
-@@ -960,26 +982,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);
-@@ -1059,14 +1081,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--);
-@@ -1092,8 +1114,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);
-@@ -1638,7 +1660,7 @@ static int bcm_enet_probe(struct platfor
-       /* 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);
-@@ -1884,14 +1906,19 @@ struct platform_driver bcm63xx_enet_driv
- static int bcm_enet_shared_probe(struct platform_device *pdev)
- {
-       struct resource *res;
-+      void __iomem *p[3];
-+      unsigned int i;
--      res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
--      if (!res)
--              return -ENODEV;
-+      memset(bcm_enet_shared_base, 0, sizeof(bcm_enet_shared_base));
--      bcm_enet_shared_base = devm_request_and_ioremap(&pdev->dev, res);
--      if (!bcm_enet_shared_base)
--              return -ENOMEM;
-+      for (i = 0; i < 3; i++) {
-+              res = platform_get_resource(pdev, IORESOURCE_MEM, i);
-+              p[i] = devm_ioremap_resource(&pdev->dev, res);
-+              if (!p[i])
-+                      return -ENOMEM;
-+      }
-+
-+      memcpy(bcm_enet_shared_base, p, sizeof(bcm_enet_shared_base));
-       return 0;
- }
diff --git a/target/linux/brcm63xx/patches-3.9/047-bcm63xx_enet-add-support-for-Broadcom-BCM63xx-integr.patch b/target/linux/brcm63xx/patches-3.9/047-bcm63xx_enet-add-support-for-Broadcom-BCM63xx-integr.patch
deleted file mode 100644 (file)
index 089acbe..0000000
+++ /dev/null
@@ -1,1505 +0,0 @@
-From 85b2e40acd7b33409a0d889cd3d0b964c9df4b13 Mon Sep 17 00:00:00 2001
-From: Maxime Bizon <mbizon@freebox.fr>
-Date: Tue, 4 Jun 2013 20:53:35 +0000
-Subject: [PATCH 3/3] bcm63xx_enet: add support for Broadcom BCM63xx
- integrated gigabit switch
-
-Newer Broadcom BCM63xx SoCs: 6328, 6362 and 6368 have an integrated switch
-which needs to be driven slightly differently from the traditional
-external switches. This patch introduces changes in arch/mips/bcm63xx in order
-to:
-
-- register a bcm63xx_enetsw driver instead of bcm63xx_enet driver
-- update DMA channels configuration & state RAM base addresses
-- add a new platform data configuration knob to define the number of
-  ports per switch/device and force link on some ports
-- define the required switch registers
-
-On the driver side, the following changes are required:
-
-- the switch ports need to be polled to ensure the link is up and
-  running and RX/TX can properly work
-- basic switch configuration needs to be performed for the switch to
-  forward packets to the CPU
-- update the MIB counters since the integrated
-
-Signed-off-by: Maxime Bizon <mbizon@freebox.fr>
-Signed-off-by: Jonas Gorski <jogo@openwrt.org>
----
- arch/mips/bcm63xx/boards/board_bcm963xx.c          |    4 +
- arch/mips/bcm63xx/dev-enet.c                       |  113 ++-
- .../include/asm/mach-bcm63xx/bcm63xx_dev_enet.h    |   28 +
- arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h  |   50 +
- .../mips/include/asm/mach-bcm63xx/board_bcm963xx.h |    2 +
- drivers/net/ethernet/broadcom/bcm63xx_enet.c       |  995 +++++++++++++++++++-
- drivers/net/ethernet/broadcom/bcm63xx_enet.h       |   71 ++
- 7 files changed, 1205 insertions(+), 58 deletions(-)
-
---- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
-+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -890,6 +890,10 @@ int __init board_register_devices(void)
-           !bcm63xx_nvram_get_mac_address(board.enet1.mac_addr))
-               bcm63xx_enet_register(1, &board.enet1);
-+      if (board.has_enetsw &&
-+          !bcm63xx_nvram_get_mac_address(board.enetsw.mac_addr))
-+              bcm63xx_enetsw_register(&board.enetsw);
-+
-       if (board.has_usbd)
-               bcm63xx_usbd_register(&board.usbd);
---- 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_6328() || BCMCPU_IS_6362() || 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,37 @@ 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_6328() && !BCMCPU_IS_6362() && !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);
-+      if (!enetsw_res[2].start)
-+              enetsw_res[2].start = -1;
-+
-+      memcpy(bcm63xx_enetsw_device.dev.platform_data, pd, sizeof(*pd));
-+
-+      if (BCMCPU_IS_6328())
-+              enetsw_pd.num_ports = ENETSW_PORTS_6328;
-+      else if (BCMCPU_IS_6362() || BCMCPU_IS_6368())
-+              enetsw_pd.num_ports = ENETSW_PORTS_6368;
-+
-+      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,35 @@ struct bcm63xx_enet_platform_data {
-                                           int phy_id, int reg, int val));
- };
-+/*
-+ * on board ethernet switch platform data
-+ */
-+#define ENETSW_MAX_PORT       8
-+#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
-+
-+struct bcm63xx_enetsw_port {
-+      int             used;
-+      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];
-+      int num_ports;
-+      struct bcm63xx_enetsw_port used_ports[ENETSW_MAX_PORT];
-+};
-+
- int __init bcm63xx_enet_register(int unit,
-                                const struct bcm63xx_enet_platform_data *pd);
-+int 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
-@@ -873,10 +873,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/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h
-+++ b/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h
-@@ -24,6 +24,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;
-@@ -36,6 +37,7 @@ struct board_info {
-       /* ethernet config */
-       struct bcm63xx_enet_platform_data enet0;
-       struct bcm63xx_enet_platform_data enet1;
-+      struct bcm63xx_enetsw_platform_data enetsw;
-       /* USB config */
-       struct bcm63xx_usbd_platform_data usbd;
---- a/drivers/net/ethernet/broadcom/bcm63xx_enet.c
-+++ b/drivers/net/ethernet/broadcom/bcm63xx_enet.c
-@@ -59,8 +59,43 @@ static inline void enet_writel(struct bc
- }
- /*
-- * io helpers to access shared registers
-+ * io helpers to access switch registers
-  */
-+static inline u32 enetsw_readl(struct bcm_enet_priv *priv, u32 off)
-+{
-+      return bcm_readl(priv->base + off);
-+}
-+
-+static inline void enetsw_writel(struct bcm_enet_priv *priv,
-+                               u32 val, u32 off)
-+{
-+      bcm_writel(val, priv->base + off);
-+}
-+
-+static inline u16 enetsw_readw(struct bcm_enet_priv *priv, u32 off)
-+{
-+      return bcm_readw(priv->base + off);
-+}
-+
-+static inline void enetsw_writew(struct bcm_enet_priv *priv,
-+                               u16 val, u32 off)
-+{
-+      bcm_writew(val, priv->base + off);
-+}
-+
-+static inline u8 enetsw_readb(struct bcm_enet_priv *priv, u32 off)
-+{
-+      return bcm_readb(priv->base + off);
-+}
-+
-+static inline void enetsw_writeb(struct bcm_enet_priv *priv,
-+                               u8 val, u32 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)
- {
-       return bcm_readl(bcm_enet_shared_base[0] + off);
-@@ -218,7 +253,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);
-@@ -321,7 +355,8 @@ static int bcm_enet_receive_queue(struct
-               }
-               /* recycle packet if it's marked as bad */
--              if (unlikely(len_stat & DMADESC_ERR_MASK)) {
-+              if (!priv->enet_is_sw &&
-+                  unlikely(len_stat & DMADESC_ERR_MASK)) {
-                       dev->stats.rx_errors++;
-                       if (len_stat & DMADESC_OVSIZE_MASK)
-@@ -552,6 +587,26 @@ static int bcm_enet_start_xmit(struct sk
-               goto out_unlock;
-       }
-+      /* pad small packets sent on a switch device */
-+      if (priv->enet_is_sw && 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;
-@@ -961,9 +1016,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 */
-@@ -1569,7 +1624,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;
- }
-@@ -1676,6 +1731,9 @@ static int bcm_enet_probe(struct platfor
-               return -ENOMEM;
-       priv = netdev_priv(dev);
-+      priv->enet_is_sw = false;
-+      priv->dma_maxburst = BCMENET_DMA_MAXBURST;
-+
-       ret = compute_hw_mtu(priv, dev->mtu);
-       if (ret)
-               goto out;
-@@ -1901,60 +1959,916 @@ struct platform_driver bcm63xx_enet_driv
- };
- /*
-- * reserve & remap memory space shared between all macs
-+ * switch mii access callbacks
-  */
--static int 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;
--      void __iomem *p[3];
--      unsigned int i;
-+      u32 reg;
-+      int ret;
--      memset(bcm_enet_shared_base, 0, sizeof(bcm_enet_shared_base));
-+      spin_lock_bh(&priv->enetsw_mdio_lock);
-+      enetsw_writel(priv, 0, ENETSW_MDIOC_REG);
--      for (i = 0; i < 3; i++) {
--              res = platform_get_resource(pdev, IORESOURCE_MEM, i);
--              p[i] = devm_ioremap_resource(&pdev->dev, res);
--              if (!p[i])
--                      return -ENOMEM;
--      }
-+      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;
-+}
--      memcpy(bcm_enet_shared_base, p, sizeof(bcm_enet_shared_base));
-+static void bcmenet_sw_mdio_write(struct bcm_enet_priv *priv,
-+                               int ext, int phy_id, int location,
-+                               uint16_t data)
-+{
-+      u32 reg;
--      return 0;
-+      spin_lock_bh(&priv->enetsw_mdio_lock);
-+      enetsw_writel(priv, 0, ENETSW_MDIOC_REG);
-+
-+      reg = ENETSW_MDIOC_WR_MASK |
-+              (phy_id << ENETSW_MDIOC_PHYID_SHIFT) |
-+              (location << ENETSW_MDIOC_REG_SHIFT);
-+
-+      if (ext)
-+              reg |= ENETSW_MDIOC_EXT_MASK;
-+
-+      reg |= data;
-+
-+      enetsw_writel(priv, reg, ENETSW_MDIOC_REG);
-+      udelay(50);
-+      spin_unlock_bh(&priv->enetsw_mdio_lock);
- }
--static int bcm_enet_shared_remove(struct platform_device *pdev)
-+static inline int bcm_enet_port_is_rgmii(int portid)
- {
--      return 0;
-+      return portid >= ENETSW_RGMII_PORT0;
- }
- /*
-- * this "shared" driver is needed because both macs share a single
-- * address space
-+ * enet sw PHY polling
-  */
--struct platform_driver bcm63xx_enet_shared_driver = {
--      .probe  = bcm_enet_shared_probe,
--      .remove = bcm_enet_shared_remove,
--      .driver = {
--              .name   = "bcm63xx_enet_shared",
--              .owner  = THIS_MODULE,
--      },
--};
-+static void swphy_poll_timer(unsigned long data)
-+{
-+      struct bcm_enet_priv *priv = (struct bcm_enet_priv *)data;
-+      unsigned int i;
-+
-+      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];
-+              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, 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, external_phy,
-+                                               port->phy_id, MII_ADVERTISE);
-+
-+              lpa = bcmenet_sw_mdio_read(priv, external_phy, port->phy_id,
-+                                         MII_LPA);
-+
-+              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);
-+              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));
-+      }
-+
-+      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);
--      if (ret)
--              return ret;
-+      priv = netdev_priv(dev);
-+      kdev = &priv->pdev->dev;
--      ret = platform_driver_register(&bcm63xx_enet_driver);
-+      /* 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)
--              platform_driver_unregister(&bcm63xx_enet_shared_driver);
-+              goto out_freeirq;
-+
-+      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);
-+      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 < priv->num_ports; 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));
-+
-+              priv->sw_port_link[i] = 0;
-+      }
-+
-+      /* 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, priv->dma_maxburst,
-+                       ENETDMAC_MAXBURST_REG(priv->rx_chan));
-+      enet_dmac_writel(priv, priv->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 < priv->num_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:
-+                      pr_warn("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:
-+      if (priv->irq_tx != -1)
-+              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);
-+      if (priv->irq_tx != -1)
-+              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 < priv->num_ports; ++i) {
-+              if (!priv->used_ports[i].used)
-+                      continue;
-+              if (priv->used_ports[i].phy_id == phy_id)
-+                      return bcm_enet_port_is_rgmii(i);
-+      }
-+
-+      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 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)
-+              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->enet_is_sw = true;
-+      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;
-+      priv->dma_maxburst = BCMENETSW_DMA_MAXBURST;
-+
-+      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));
-+              priv->num_ports = pd->num_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 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 = bcm_enetsw_remove,
-+      .driver = {
-+              .name   = "bcm63xx_enetsw",
-+              .owner  = THIS_MODULE,
-+      },
-+};
-+
-+/* reserve & remap memory space shared between all macs */
-+static int bcm_enet_shared_probe(struct platform_device *pdev)
-+{
-+      struct resource *res;
-+      void __iomem *p[3];
-+      unsigned int i;
-+
-+      memset(bcm_enet_shared_base, 0, sizeof(bcm_enet_shared_base));
-+
-+      for (i = 0; i < 3; i++) {
-+              res = platform_get_resource(pdev, IORESOURCE_MEM, i);
-+              p[i] = devm_ioremap_resource(&pdev->dev, res);
-+              if (!p[i])
-+                      return -ENOMEM;
-+      }
-+
-+      memcpy(bcm_enet_shared_base, p, sizeof(bcm_enet_shared_base));
-+
-+      return 0;
-+}
-+
-+static int bcm_enet_shared_remove(struct platform_device *pdev)
-+{
-+      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 = 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;
- }
-@@ -1962,6 +2876,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
-@@ -18,6 +18,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
-@@ -84,11 +85,60 @@
- #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;
-@@ -97,7 +147,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;
-@@ -114,6 +169,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;
-@@ -197,6 +253,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;
-@@ -269,6 +328,18 @@ 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];
-+      int sw_port_link[ENETSW_MAX_PORT];
-+
-+      /* used to poll switch port state */
-+      struct timer_list swphy_poll;
-+      spinlock_t enetsw_mdio_lock;
- };
-+
- #endif /* ! BCM63XX_ENET_H_ */
diff --git a/target/linux/brcm63xx/patches-3.9/048-bcm63xx_enet-add-support-Broadcom-BCM6345-Ethernet.patch b/target/linux/brcm63xx/patches-3.9/048-bcm63xx_enet-add-support-Broadcom-BCM6345-Ethernet.patch
deleted file mode 100644 (file)
index f0b20e9..0000000
+++ /dev/null
@@ -1,838 +0,0 @@
-From fb7e08ec47f7168b8f4f72d8e3b5bcf625e1089e Mon Sep 17 00:00:00 2001
-From: Florian Fainelli <florian@openwrt.org>
-Date: Wed, 12 Jun 2013 18:53:05 +0000
-Subject: [PATCH] bcm63xx_enet: add support Broadcom BCM6345 Ethernet
-
-This patch adds support for the Broadcom BCM6345 SoC Ethernet. BCM6345
-has a slightly different and older DMA engine which requires the
-following modifications:
-
-- the width of the DMA channels on BCM6345 is 64 bytes vs 16 bytes,
-  which means that the helpers enet_dma{c,s} need to account for this
-  channel width and we can no longer use macros
-
-- BCM6345 DMA engine does not have any internal SRAM for transfering
-  buffers
-
-- BCM6345 buffer allocation and flow control is not per-channel but
-  global (done in RSET_ENETDMA)
-
-- the DMA engine bits are right-shifted by 3 compared to other DMA
-  generations
-
-- the DMA enable/interrupt masks are a little different (we need to
-  enabled more bits for 6345)
-
-- some register have the same meaning but are offsetted in the ENET_DMAC
-  space so a lookup table is required to return the proper offset
-
-The MAC itself is identical and requires no modifications to work.
-
-Signed-off-by: Florian Fainelli <florian@openwrt.org>
-Acked-by: Ralf Baechle <ralf@linux-mips.org>
----
- arch/mips/bcm63xx/dev-enet.c                       |   65 ++++++-
- arch/mips/include/asm/mach-bcm63xx/bcm63xx_cpu.h   |    3 +-
- .../include/asm/mach-bcm63xx/bcm63xx_dev_enet.h    |   94 +++++++++
- arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h  |   43 ++++-
- drivers/net/ethernet/broadcom/bcm63xx_enet.c       |  200 ++++++++++++--------
- drivers/net/ethernet/broadcom/bcm63xx_enet.h       |   15 ++
- 6 files changed, 329 insertions(+), 91 deletions(-)
-
---- a/arch/mips/bcm63xx/dev-enet.c
-+++ b/arch/mips/bcm63xx/dev-enet.c
-@@ -9,10 +9,44 @@
- #include <linux/init.h>
- #include <linux/kernel.h>
- #include <linux/platform_device.h>
-+#include <linux/export.h>
- #include <bcm63xx_dev_enet.h>
- #include <bcm63xx_io.h>
- #include <bcm63xx_regs.h>
-+#ifdef BCMCPU_RUNTIME_DETECT
-+static const unsigned long bcm6348_regs_enetdmac[] = {
-+      [ENETDMAC_CHANCFG]      = ENETDMAC_CHANCFG_REG,
-+      [ENETDMAC_IR]           = ENETDMAC_IR_REG,
-+      [ENETDMAC_IRMASK]       = ENETDMAC_IRMASK_REG,
-+      [ENETDMAC_MAXBURST]     = ENETDMAC_MAXBURST_REG,
-+};
-+
-+static const unsigned long bcm6345_regs_enetdmac[] = {
-+      [ENETDMAC_CHANCFG]      = ENETDMA_6345_CHANCFG_REG,
-+      [ENETDMAC_IR]           = ENETDMA_6345_IR_REG,
-+      [ENETDMAC_IRMASK]       = ENETDMA_6345_IRMASK_REG,
-+      [ENETDMAC_MAXBURST]     = ENETDMA_6345_MAXBURST_REG,
-+      [ENETDMAC_BUFALLOC]     = ENETDMA_6345_BUFALLOC_REG,
-+      [ENETDMAC_RSTART]       = ENETDMA_6345_RSTART_REG,
-+      [ENETDMAC_FC]           = ENETDMA_6345_FC_REG,
-+      [ENETDMAC_LEN]          = ENETDMA_6345_LEN_REG,
-+};
-+
-+const unsigned long *bcm63xx_regs_enetdmac;
-+EXPORT_SYMBOL(bcm63xx_regs_enetdmac);
-+
-+static __init void bcm63xx_enetdmac_regs_init(void)
-+{
-+      if (BCMCPU_IS_6345())
-+              bcm63xx_regs_enetdmac = bcm6345_regs_enetdmac;
-+      else
-+              bcm63xx_regs_enetdmac = bcm6348_regs_enetdmac;
-+}
-+#else
-+static __init void bcm63xx_enetdmac_regs_init(void) { }
-+#endif
-+
- static struct resource shared_res[] = {
-       {
-               .start          = -1, /* filled at runtime */
-@@ -137,12 +171,19 @@ static int __init register_shared(void)
-       if (shared_device_registered)
-               return 0;
-+      bcm63xx_enetdmac_regs_init();
-+
-       shared_res[0].start = bcm63xx_regset_address(RSET_ENETDMA);
-       shared_res[0].end = shared_res[0].start;
--      shared_res[0].end += (RSET_ENETDMA_SIZE)  - 1;
-+      if (BCMCPU_IS_6345())
-+              shared_res[0].end += (RSET_6345_ENETDMA_SIZE) - 1;
-+      else
-+              shared_res[0].end += (RSET_ENETDMA_SIZE)  - 1;
-       if (BCMCPU_IS_6328() || BCMCPU_IS_6362() || BCMCPU_IS_6368())
-               chan_count = 32;
-+      else if (BCMCPU_IS_6345())
-+              chan_count = 8;
-       else
-               chan_count = 16;
-@@ -172,7 +213,7 @@ int __init bcm63xx_enet_register(int uni
-       if (unit > 1)
-               return -ENODEV;
--      if (unit == 1 && BCMCPU_IS_6338())
-+      if (unit == 1 && (BCMCPU_IS_6338() || BCMCPU_IS_6345()))
-               return -ENODEV;
-       ret = register_shared();
-@@ -213,6 +254,21 @@ int __init bcm63xx_enet_register(int uni
-               dpd->phy_interrupt = bcm63xx_get_irq_number(IRQ_ENET_PHY);
-       }
-+      dpd->dma_chan_en_mask = ENETDMAC_CHANCFG_EN_MASK;
-+      dpd->dma_chan_int_mask = ENETDMAC_IR_PKTDONE_MASK;
-+      if (BCMCPU_IS_6345()) {
-+              dpd->dma_chan_en_mask |= ENETDMAC_CHANCFG_CHAINING_MASK;
-+              dpd->dma_chan_en_mask |= ENETDMAC_CHANCFG_WRAP_EN_MASK;
-+              dpd->dma_chan_en_mask |= ENETDMAC_CHANCFG_FLOWC_EN_MASK;
-+              dpd->dma_chan_int_mask |= ENETDMA_IR_BUFDONE_MASK;
-+              dpd->dma_chan_int_mask |= ENETDMA_IR_NOTOWNER_MASK;
-+              dpd->dma_chan_width = ENETDMA_6345_CHAN_WIDTH;
-+              dpd->dma_desc_shift = ENETDMA_6345_DESC_SHIFT;
-+      } else {
-+              dpd->dma_has_sram = true;
-+              dpd->dma_chan_width = ENETDMA_CHAN_WIDTH;
-+      }
-+
-       ret = platform_device_register(pdev);
-       if (ret)
-               return ret;
-@@ -246,6 +302,11 @@ bcm63xx_enetsw_register(const struct bcm
-       else if (BCMCPU_IS_6362() || BCMCPU_IS_6368())
-               enetsw_pd.num_ports = ENETSW_PORTS_6368;
-+      enetsw_pd.dma_has_sram = true;
-+      enetsw_pd.dma_chan_width = ENETDMA_CHAN_WIDTH;
-+      enetsw_pd.dma_chan_en_mask = ENETDMAC_CHANCFG_EN_MASK;
-+      enetsw_pd.dma_chan_int_mask = ENETDMAC_IR_PKTDONE_MASK;
-+
-       ret = platform_device_register(&bcm63xx_enetsw_device);
-       if (ret)
-               return ret;
---- a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_cpu.h
-+++ b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_cpu.h
-@@ -188,6 +188,7 @@ enum bcm63xx_regs_set {
- #define BCM_6368_RSET_SPI_SIZE                1804
- #define RSET_ENET_SIZE                        2048
- #define RSET_ENETDMA_SIZE             256
-+#define RSET_6345_ENETDMA_SIZE                64
- #define RSET_ENETDMAC_SIZE(chans)     (16 * (chans))
- #define RSET_ENETDMAS_SIZE(chans)     (16 * (chans))
- #define RSET_ENETSW_SIZE              65536
-@@ -363,7 +364,7 @@ enum bcm63xx_regs_set {
- #define BCM_6345_USBDMA_BASE          (0xfffe2800)
- #define BCM_6345_ENET0_BASE           (0xfffe1800)
- #define BCM_6345_ENETDMA_BASE         (0xfffe2800)
--#define BCM_6345_ENETDMAC_BASE                (0xfffe2900)
-+#define BCM_6345_ENETDMAC_BASE                (0xfffe2840)
- #define BCM_6345_ENETDMAS_BASE                (0xfffe2a00)
- #define BCM_6345_ENETSW_BASE          (0xdeadbeef)
- #define BCM_6345_PCMCIA_BASE          (0xfffe2028)
---- a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_enet.h
-+++ b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_enet.h
-@@ -4,6 +4,8 @@
- #include <linux/if_ether.h>
- #include <linux/init.h>
-+#include <bcm63xx_regs.h>
-+
- /*
-  * on board ethernet platform data
-  */
-@@ -37,6 +39,21 @@ struct bcm63xx_enet_platform_data {
-                                         int phy_id, int reg),
-                         void (*mii_write)(struct net_device *dev,
-                                           int phy_id, int reg, int val));
-+
-+      /* DMA channel enable mask */
-+      u32 dma_chan_en_mask;
-+
-+      /* DMA channel interrupt mask */
-+      u32 dma_chan_int_mask;
-+
-+      /* DMA engine has internal SRAM */
-+      bool dma_has_sram;
-+
-+      /* DMA channel register width */
-+      unsigned int dma_chan_width;
-+
-+      /* DMA descriptor shift */
-+      unsigned int dma_desc_shift;
- };
- /*
-@@ -63,6 +80,18 @@ struct bcm63xx_enetsw_platform_data {
-       char mac_addr[ETH_ALEN];
-       int num_ports;
-       struct bcm63xx_enetsw_port used_ports[ENETSW_MAX_PORT];
-+
-+      /* DMA channel enable mask */
-+      u32 dma_chan_en_mask;
-+
-+      /* DMA channel interrupt mask */
-+      u32 dma_chan_int_mask;
-+
-+      /* DMA channel register width */
-+      unsigned int dma_chan_width;
-+
-+      /* DMA engine has internal SRAM */
-+      bool dma_has_sram;
- };
- int __init bcm63xx_enet_register(int unit,
-@@ -70,4 +99,69 @@ int __init bcm63xx_enet_register(int uni
- int bcm63xx_enetsw_register(const struct bcm63xx_enetsw_platform_data *pd);
-+enum bcm63xx_regs_enetdmac {
-+      ENETDMAC_CHANCFG,
-+      ENETDMAC_IR,
-+      ENETDMAC_IRMASK,
-+      ENETDMAC_MAXBURST,
-+      ENETDMAC_BUFALLOC,
-+      ENETDMAC_RSTART,
-+      ENETDMAC_FC,
-+      ENETDMAC_LEN,
-+};
-+
-+static inline unsigned long bcm63xx_enetdmacreg(enum bcm63xx_regs_enetdmac reg)
-+{
-+#ifdef BCMCPU_RUNTIME_DETECT
-+      extern const unsigned long *bcm63xx_regs_enetdmac;
-+
-+      return bcm63xx_regs_enetdmac[reg];
-+#else
-+#ifdef CONFIG_BCM63XX_CPU_6345
-+      switch (reg) {
-+      case ENETDMAC_CHANCFG:
-+              return ENETDMA_6345_CHANCFG_REG;
-+      case ENETDMAC_IR:
-+              return ENETDMA_6345_IR_REG;
-+      case ENETDMAC_IRMASK:
-+              return ENETDMA_6345_IRMASK_REG;
-+      case ENETDMAC_MAXBURST:
-+              return ENETDMA_6345_MAXBURST_REG;
-+      case ENETDMAC_BUFALLOC:
-+              return ENETDMA_6345_BUFALLOC_REG;
-+      case ENETDMAC_RSTART:
-+              return ENETDMA_6345_RSTART_REG;
-+      case ENETDMAC_FC:
-+              return ENETDMA_6345_FC_REG;
-+      case ENETDMAC_LEN:
-+              return ENETDMA_6345_LEN_REG;
-+      }
-+#endif
-+#if defined(CONFIG_BCM63XX_CPU_6328) || \
-+      defined(CONFIG_BCM63XX_CPU_6338) || \
-+      defined(CONFIG_BCM63XX_CPU_6348) || \
-+      defined(CONFIG_BCM63XX_CPU_6358) || \
-+      defined(CONFIG_BCM63XX_CPU_6362) || \
-+      defined(CONFIG_BCM63XX_CPU_6368)
-+      switch (reg) {
-+      case ENETDMAC_CHANCFG:
-+              return ENETDMAC_CHANCFG_REG;
-+      case ENETDMAC_IR:
-+              return ENETDMAC_IR_REG;
-+      case ENETDMAC_IRMASK:
-+              return ENETDMAC_IRMASK_REG;
-+      case ENETDMAC_MAXBURST:
-+              return ENETDMAC_MAXBURST_REG;
-+      case ENETDMAC_BUFALLOC:
-+      case ENETDMAC_RSTART:
-+      case ENETDMAC_FC:
-+      case ENETDMAC_LEN:
-+              return 0;
-+      }
-+#endif
-+#endif
-+      return 0;
-+}
-+
-+
- #endif /* ! BCM63XX_DEV_ENET_H_ */
---- a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h
-+++ b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h
-@@ -770,6 +770,8 @@
- /*************************************************************************
-  * _REG relative to RSET_ENETDMA
-  *************************************************************************/
-+#define ENETDMA_CHAN_WIDTH            0x10
-+#define ENETDMA_6345_CHAN_WIDTH               0x40
- /* Controller Configuration Register */
- #define ENETDMA_CFG_REG                       (0x0)
-@@ -825,31 +827,56 @@
- /* State Ram Word 4 */
- #define ENETDMA_SRAM4_REG(x)          (0x20c + (x) * 0x10)
-+/* Broadcom 6345 ENET DMA definitions */
-+#define ENETDMA_6345_CHANCFG_REG      (0x00)
-+
-+#define ENETDMA_6345_MAXBURST_REG     (0x40)
-+
-+#define ENETDMA_6345_RSTART_REG               (0x08)
-+
-+#define ENETDMA_6345_LEN_REG          (0x0C)
-+
-+#define ENETDMA_6345_IR_REG           (0x14)
-+
-+#define ENETDMA_6345_IRMASK_REG               (0x18)
-+
-+#define ENETDMA_6345_FC_REG           (0x1C)
-+
-+#define ENETDMA_6345_BUFALLOC_REG     (0x20)
-+
-+/* Shift down for EOP, SOP and WRAP bits */
-+#define ENETDMA_6345_DESC_SHIFT               (3)
- /*************************************************************************
-  * _REG relative to RSET_ENETDMAC
-  *************************************************************************/
- /* Channel Configuration register */
--#define ENETDMAC_CHANCFG_REG(x)               ((x) * 0x10)
-+#define ENETDMAC_CHANCFG_REG          (0x0)
- #define ENETDMAC_CHANCFG_EN_SHIFT     0
- #define ENETDMAC_CHANCFG_EN_MASK      (1 << ENETDMAC_CHANCFG_EN_SHIFT)
- #define ENETDMAC_CHANCFG_PKTHALT_SHIFT        1
- #define ENETDMAC_CHANCFG_PKTHALT_MASK (1 << ENETDMAC_CHANCFG_PKTHALT_SHIFT)
- #define ENETDMAC_CHANCFG_BUFHALT_SHIFT        2
- #define ENETDMAC_CHANCFG_BUFHALT_MASK (1 << ENETDMAC_CHANCFG_BUFHALT_SHIFT)
-+#define ENETDMAC_CHANCFG_CHAINING_SHIFT       2
-+#define ENETDMAC_CHANCFG_CHAINING_MASK        (1 << ENETDMAC_CHANCFG_CHAINING_SHIFT)
-+#define ENETDMAC_CHANCFG_WRAP_EN_SHIFT        3
-+#define ENETDMAC_CHANCFG_WRAP_EN_MASK (1 << ENETDMAC_CHANCFG_WRAP_EN_SHIFT)
-+#define ENETDMAC_CHANCFG_FLOWC_EN_SHIFT       4
-+#define ENETDMAC_CHANCFG_FLOWC_EN_MASK        (1 << ENETDMAC_CHANCFG_FLOWC_EN_SHIFT)
- /* Interrupt Control/Status register */
--#define ENETDMAC_IR_REG(x)            (0x4 + (x) * 0x10)
-+#define ENETDMAC_IR_REG                       (0x4)
- #define ENETDMAC_IR_BUFDONE_MASK      (1 << 0)
- #define ENETDMAC_IR_PKTDONE_MASK      (1 << 1)
- #define ENETDMAC_IR_NOTOWNER_MASK     (1 << 2)
- /* Interrupt Mask register */
--#define ENETDMAC_IRMASK_REG(x)                (0x8 + (x) * 0x10)
-+#define ENETDMAC_IRMASK_REG           (0x8)
- /* Maximum Burst Length */
--#define ENETDMAC_MAXBURST_REG(x)      (0xc + (x) * 0x10)
-+#define ENETDMAC_MAXBURST_REG         (0xc)
- /*************************************************************************
-@@ -857,16 +884,16 @@
-  *************************************************************************/
- /* Ring Start Address register */
--#define ENETDMAS_RSTART_REG(x)                ((x) * 0x10)
-+#define ENETDMAS_RSTART_REG           (0x0)
- /* State Ram Word 2 */
--#define ENETDMAS_SRAM2_REG(x)         (0x4 + (x) * 0x10)
-+#define ENETDMAS_SRAM2_REG            (0x4)
- /* State Ram Word 3 */
--#define ENETDMAS_SRAM3_REG(x)         (0x8 + (x) * 0x10)
-+#define ENETDMAS_SRAM3_REG            (0x8)
- /* State Ram Word 4 */
--#define ENETDMAS_SRAM4_REG(x)         (0xc + (x) * 0x10)
-+#define ENETDMAS_SRAM4_REG            (0xc)
- /*************************************************************************
---- a/drivers/net/ethernet/broadcom/bcm63xx_enet.c
-+++ b/drivers/net/ethernet/broadcom/bcm63xx_enet.c
-@@ -107,26 +107,28 @@ static inline void enet_dma_writel(struc
-       bcm_writel(val, bcm_enet_shared_base[0] + off);
- }
--static inline u32 enet_dmac_readl(struct bcm_enet_priv *priv, u32 off)
-+static inline u32 enet_dmac_readl(struct bcm_enet_priv *priv, u32 off, int chan)
- {
--      return bcm_readl(bcm_enet_shared_base[1] + off);
-+      return bcm_readl(bcm_enet_shared_base[1] +
-+              bcm63xx_enetdmacreg(off) + chan * priv->dma_chan_width);
- }
- static inline void enet_dmac_writel(struct bcm_enet_priv *priv,
--                                     u32 val, u32 off)
-+                                     u32 val, u32 off, int chan)
- {
--      bcm_writel(val, bcm_enet_shared_base[1] + off);
-+      bcm_writel(val, bcm_enet_shared_base[1] +
-+              bcm63xx_enetdmacreg(off) + chan * priv->dma_chan_width);
- }
--static inline u32 enet_dmas_readl(struct bcm_enet_priv *priv, u32 off)
-+static inline u32 enet_dmas_readl(struct bcm_enet_priv *priv, u32 off, int chan)
- {
--      return bcm_readl(bcm_enet_shared_base[2] + off);
-+      return bcm_readl(bcm_enet_shared_base[2] + off + chan * priv->dma_chan_width);
- }
- static inline void enet_dmas_writel(struct bcm_enet_priv *priv,
--                                     u32 val, u32 off)
-+                                     u32 val, u32 off, int chan)
- {
--      bcm_writel(val, bcm_enet_shared_base[2] + off);
-+      bcm_writel(val, bcm_enet_shared_base[2] + off + chan * priv->dma_chan_width);
- }
- /*
-@@ -262,7 +264,7 @@ static int bcm_enet_refill_rx(struct net
-               len_stat = priv->rx_skb_size << DMADESC_LENGTH_SHIFT;
-               len_stat |= DMADESC_OWNER_MASK;
-               if (priv->rx_dirty_desc == priv->rx_ring_size - 1) {
--                      len_stat |= DMADESC_WRAP_MASK;
-+                      len_stat |= (DMADESC_WRAP_MASK >> priv->dma_desc_shift);
-                       priv->rx_dirty_desc = 0;
-               } else {
-                       priv->rx_dirty_desc++;
-@@ -273,7 +275,10 @@ static int bcm_enet_refill_rx(struct net
-               priv->rx_desc_count++;
-               /* tell dma engine we allocated one buffer */
--              enet_dma_writel(priv, 1, ENETDMA_BUFALLOC_REG(priv->rx_chan));
-+              if (priv->dma_has_sram)
-+                      enet_dma_writel(priv, 1, ENETDMA_BUFALLOC_REG(priv->rx_chan));
-+              else
-+                      enet_dmac_writel(priv, 1, ENETDMAC_BUFALLOC, priv->rx_chan);
-       }
-       /* If rx ring is still empty, set a timer to try allocating
-@@ -349,7 +354,8 @@ static int bcm_enet_receive_queue(struct
-               /* if the packet does not have start of packet _and_
-                * end of packet flag set, then just recycle it */
--              if ((len_stat & DMADESC_ESOP_MASK) != DMADESC_ESOP_MASK) {
-+              if ((len_stat & (DMADESC_ESOP_MASK >> priv->dma_desc_shift)) !=
-+                      (DMADESC_ESOP_MASK >> priv->dma_desc_shift)) {
-                       dev->stats.rx_dropped++;
-                       continue;
-               }
-@@ -410,8 +416,8 @@ static int bcm_enet_receive_queue(struct
-               bcm_enet_refill_rx(dev);
-               /* kick rx dma */
--              enet_dmac_writel(priv, ENETDMAC_CHANCFG_EN_MASK,
--                               ENETDMAC_CHANCFG_REG(priv->rx_chan));
-+              enet_dmac_writel(priv, priv->dma_chan_en_mask,
-+                                       ENETDMAC_CHANCFG, priv->rx_chan);
-       }
-       return processed;
-@@ -486,10 +492,10 @@ static int bcm_enet_poll(struct napi_str
-       dev = priv->net_dev;
-       /* ack interrupts */
--      enet_dmac_writel(priv, ENETDMAC_IR_PKTDONE_MASK,
--                       ENETDMAC_IR_REG(priv->rx_chan));
--      enet_dmac_writel(priv, ENETDMAC_IR_PKTDONE_MASK,
--                       ENETDMAC_IR_REG(priv->tx_chan));
-+      enet_dmac_writel(priv, priv->dma_chan_int_mask,
-+                       ENETDMAC_IR, priv->rx_chan);
-+      enet_dmac_writel(priv, priv->dma_chan_int_mask,
-+                       ENETDMAC_IR, priv->tx_chan);
-       /* reclaim sent skb */
-       tx_work_done = bcm_enet_tx_reclaim(dev, 0);
-@@ -508,10 +514,10 @@ static int bcm_enet_poll(struct napi_str
-       napi_complete(napi);
-       /* restore rx/tx interrupt */
--      enet_dmac_writel(priv, ENETDMAC_IR_PKTDONE_MASK,
--                       ENETDMAC_IRMASK_REG(priv->rx_chan));
--      enet_dmac_writel(priv, ENETDMAC_IR_PKTDONE_MASK,
--                       ENETDMAC_IRMASK_REG(priv->tx_chan));
-+      enet_dmac_writel(priv, priv->dma_chan_int_mask,
-+                       ENETDMAC_IRMASK, priv->rx_chan);
-+      enet_dmac_writel(priv, priv->dma_chan_int_mask,
-+                       ENETDMAC_IRMASK, priv->tx_chan);
-       return rx_work_done;
- }
-@@ -554,8 +560,8 @@ static irqreturn_t bcm_enet_isr_dma(int
-       priv = netdev_priv(dev);
-       /* mask rx/tx interrupts */
--      enet_dmac_writel(priv, 0, ENETDMAC_IRMASK_REG(priv->rx_chan));
--      enet_dmac_writel(priv, 0, ENETDMAC_IRMASK_REG(priv->tx_chan));
-+      enet_dmac_writel(priv, 0, ENETDMAC_IRMASK, priv->rx_chan);
-+      enet_dmac_writel(priv, 0, ENETDMAC_IRMASK, priv->tx_chan);
-       napi_schedule(&priv->napi);
-@@ -616,14 +622,14 @@ static int bcm_enet_start_xmit(struct sk
-                                      DMA_TO_DEVICE);
-       len_stat = (skb->len << DMADESC_LENGTH_SHIFT) & DMADESC_LENGTH_MASK;
--      len_stat |= DMADESC_ESOP_MASK |
-+      len_stat |= (DMADESC_ESOP_MASK >> priv->dma_desc_shift) |
-               DMADESC_APPEND_CRC |
-               DMADESC_OWNER_MASK;
-       priv->tx_curr_desc++;
-       if (priv->tx_curr_desc == priv->tx_ring_size) {
-               priv->tx_curr_desc = 0;
--              len_stat |= DMADESC_WRAP_MASK;
-+              len_stat |= (DMADESC_WRAP_MASK >> priv->dma_desc_shift);
-       }
-       priv->tx_desc_count--;
-@@ -634,8 +640,8 @@ static int bcm_enet_start_xmit(struct sk
-       wmb();
-       /* kick tx dma */
--      enet_dmac_writel(priv, ENETDMAC_CHANCFG_EN_MASK,
--                       ENETDMAC_CHANCFG_REG(priv->tx_chan));
-+      enet_dmac_writel(priv, priv->dma_chan_en_mask,
-+                               ENETDMAC_CHANCFG, priv->tx_chan);
-       /* stop queue if no more desc available */
-       if (!priv->tx_desc_count)
-@@ -763,6 +769,9 @@ static void bcm_enet_set_flow(struct bcm
-               val &= ~ENET_RXCFG_ENFLOW_MASK;
-       enet_writel(priv, val, ENET_RXCFG_REG);
-+      if (!priv->dma_has_sram)
-+              return;
-+
-       /* tx flow control (pause frame generation) */
-       val = enet_dma_readl(priv, ENETDMA_CFG_REG);
-       if (tx_en)
-@@ -910,8 +919,8 @@ static int bcm_enet_open(struct net_devi
-       /* mask all interrupts and request them */
-       enet_writel(priv, 0, ENET_IRMASK_REG);
--      enet_dmac_writel(priv, 0, ENETDMAC_IRMASK_REG(priv->rx_chan));
--      enet_dmac_writel(priv, 0, ENETDMAC_IRMASK_REG(priv->tx_chan));
-+      enet_dmac_writel(priv, 0, ENETDMAC_IRMASK, priv->rx_chan);
-+      enet_dmac_writel(priv, 0, ENETDMAC_IRMASK, priv->tx_chan);
-       ret = request_irq(dev->irq, bcm_enet_isr_mac, 0, dev->name, dev);
-       if (ret)
-@@ -988,8 +997,12 @@ static int bcm_enet_open(struct net_devi
-       priv->rx_curr_desc = 0;
-       /* initialize flow control buffer allocation */
--      enet_dma_writel(priv, ENETDMA_BUFALLOC_FORCE_MASK | 0,
--                      ENETDMA_BUFALLOC_REG(priv->rx_chan));
-+      if (priv->dma_has_sram)
-+              enet_dma_writel(priv, ENETDMA_BUFALLOC_FORCE_MASK | 0,
-+                              ENETDMA_BUFALLOC_REG(priv->rx_chan));
-+      else
-+              enet_dmac_writel(priv, ENETDMA_BUFALLOC_FORCE_MASK | 0,
-+                              ENETDMAC_BUFALLOC, priv->rx_chan);
-       if (bcm_enet_refill_rx(dev)) {
-               dev_err(kdev, "cannot allocate rx skb queue\n");
-@@ -998,18 +1011,30 @@ static int bcm_enet_open(struct net_devi
-       }
-       /* write rx & tx ring addresses */
--      enet_dmas_writel(priv, priv->rx_desc_dma,
--                       ENETDMAS_RSTART_REG(priv->rx_chan));
--      enet_dmas_writel(priv, priv->tx_desc_dma,
--                       ENETDMAS_RSTART_REG(priv->tx_chan));
-+      if (priv->dma_has_sram) {
-+              enet_dmas_writel(priv, priv->rx_desc_dma,
-+                               ENETDMAS_RSTART_REG, priv->rx_chan);
-+              enet_dmas_writel(priv, priv->tx_desc_dma,
-+                       ENETDMAS_RSTART_REG, priv->tx_chan);
-+      } else {
-+              enet_dmac_writel(priv, priv->rx_desc_dma,
-+                              ENETDMAC_RSTART, priv->rx_chan);
-+              enet_dmac_writel(priv, priv->tx_desc_dma,
-+                              ENETDMAC_RSTART, priv->tx_chan);
-+      }
-       /* clear remaining state ram for rx & tx channel */
--      enet_dmas_writel(priv, 0, ENETDMAS_SRAM2_REG(priv->rx_chan));
--      enet_dmas_writel(priv, 0, ENETDMAS_SRAM2_REG(priv->tx_chan));
--      enet_dmas_writel(priv, 0, ENETDMAS_SRAM3_REG(priv->rx_chan));
--      enet_dmas_writel(priv, 0, ENETDMAS_SRAM3_REG(priv->tx_chan));
--      enet_dmas_writel(priv, 0, ENETDMAS_SRAM4_REG(priv->rx_chan));
--      enet_dmas_writel(priv, 0, ENETDMAS_SRAM4_REG(priv->tx_chan));
-+      if (priv->dma_has_sram) {
-+              enet_dmas_writel(priv, 0, ENETDMAS_SRAM2_REG, priv->rx_chan);
-+              enet_dmas_writel(priv, 0, ENETDMAS_SRAM2_REG, priv->tx_chan);
-+              enet_dmas_writel(priv, 0, ENETDMAS_SRAM3_REG, priv->rx_chan);
-+              enet_dmas_writel(priv, 0, ENETDMAS_SRAM3_REG, priv->tx_chan);
-+              enet_dmas_writel(priv, 0, ENETDMAS_SRAM4_REG, priv->rx_chan);
-+              enet_dmas_writel(priv, 0, ENETDMAS_SRAM4_REG, priv->tx_chan);
-+      } else {
-+              enet_dmac_writel(priv, 0, ENETDMAC_FC, priv->rx_chan);
-+              enet_dmac_writel(priv, 0, ENETDMAC_FC, priv->tx_chan);
-+      }
-       /* set max rx/tx length */
-       enet_writel(priv, priv->hw_mtu, ENET_RXMAXLEN_REG);
-@@ -1017,18 +1042,24 @@ static int bcm_enet_open(struct net_devi
-       /* set dma maximum burst len */
-       enet_dmac_writel(priv, priv->dma_maxburst,
--                       ENETDMAC_MAXBURST_REG(priv->rx_chan));
-+                       ENETDMAC_MAXBURST, priv->rx_chan);
-       enet_dmac_writel(priv, priv->dma_maxburst,
--                       ENETDMAC_MAXBURST_REG(priv->tx_chan));
-+                       ENETDMAC_MAXBURST, priv->tx_chan);
-       /* set correct transmit fifo watermark */
-       enet_writel(priv, BCMENET_TX_FIFO_TRESH, ENET_TXWMARK_REG);
-       /* set flow control low/high threshold to 1/3 / 2/3 */
--      val = priv->rx_ring_size / 3;
--      enet_dma_writel(priv, val, ENETDMA_FLOWCL_REG(priv->rx_chan));
--      val = (priv->rx_ring_size * 2) / 3;
--      enet_dma_writel(priv, val, ENETDMA_FLOWCH_REG(priv->rx_chan));
-+      if (priv->dma_has_sram) {
-+              val = priv->rx_ring_size / 3;
-+              enet_dma_writel(priv, val, ENETDMA_FLOWCL_REG(priv->rx_chan));
-+              val = (priv->rx_ring_size * 2) / 3;
-+              enet_dma_writel(priv, val, ENETDMA_FLOWCH_REG(priv->rx_chan));
-+      } else {
-+              enet_dmac_writel(priv, 5, ENETDMAC_FC, priv->rx_chan);
-+              enet_dmac_writel(priv, priv->rx_ring_size, ENETDMAC_LEN, priv->rx_chan);
-+              enet_dmac_writel(priv, priv->tx_ring_size, ENETDMAC_LEN, priv->tx_chan);
-+      }
-       /* all set, enable mac and interrupts, start dma engine and
-        * kick rx dma channel */
-@@ -1037,26 +1068,26 @@ static int bcm_enet_open(struct net_devi
-       val |= ENET_CTL_ENABLE_MASK;
-       enet_writel(priv, val, ENET_CTL_REG);
-       enet_dma_writel(priv, ENETDMA_CFG_EN_MASK, ENETDMA_CFG_REG);
--      enet_dmac_writel(priv, ENETDMAC_CHANCFG_EN_MASK,
--                       ENETDMAC_CHANCFG_REG(priv->rx_chan));
-+      enet_dmac_writel(priv, priv->dma_chan_en_mask,
-+                       ENETDMAC_CHANCFG, priv->rx_chan);
-       /* watch "mib counters about to overflow" interrupt */
-       enet_writel(priv, ENET_IR_MIB, ENET_IR_REG);
-       enet_writel(priv, ENET_IR_MIB, ENET_IRMASK_REG);
-       /* watch "packet transferred" interrupt in rx and tx */
--      enet_dmac_writel(priv, ENETDMAC_IR_PKTDONE_MASK,
--                       ENETDMAC_IR_REG(priv->rx_chan));
--      enet_dmac_writel(priv, ENETDMAC_IR_PKTDONE_MASK,
--                       ENETDMAC_IR_REG(priv->tx_chan));
-+      enet_dmac_writel(priv, priv->dma_chan_int_mask,
-+                       ENETDMAC_IR, priv->rx_chan);
-+      enet_dmac_writel(priv, priv->dma_chan_int_mask,
-+                       ENETDMAC_IR, priv->tx_chan);
-       /* make sure we enable napi before rx interrupt  */
-       napi_enable(&priv->napi);
--      enet_dmac_writel(priv, ENETDMAC_IR_PKTDONE_MASK,
--                       ENETDMAC_IRMASK_REG(priv->rx_chan));
--      enet_dmac_writel(priv, ENETDMAC_IR_PKTDONE_MASK,
--                       ENETDMAC_IRMASK_REG(priv->tx_chan));
-+      enet_dmac_writel(priv, priv->dma_chan_int_mask,
-+                       ENETDMAC_IRMASK, priv->rx_chan);
-+      enet_dmac_writel(priv, priv->dma_chan_int_mask,
-+                       ENETDMAC_IRMASK, priv->tx_chan);
-       if (priv->has_phy)
-               phy_start(priv->phydev);
-@@ -1136,13 +1167,13 @@ static void bcm_enet_disable_dma(struct
- {
-       int limit;
--      enet_dmac_writel(priv, 0, ENETDMAC_CHANCFG_REG(chan));
-+      enet_dmac_writel(priv, 0, ENETDMAC_CHANCFG, chan);
-       limit = 1000;
-       do {
-               u32 val;
--              val = enet_dmac_readl(priv, ENETDMAC_CHANCFG_REG(chan));
-+              val = enet_dmac_readl(priv, ENETDMAC_CHANCFG, chan);
-               if (!(val & ENETDMAC_CHANCFG_EN_MASK))
-                       break;
-               udelay(1);
-@@ -1169,8 +1200,8 @@ static int bcm_enet_stop(struct net_devi
-       /* mask all interrupts */
-       enet_writel(priv, 0, ENET_IRMASK_REG);
--      enet_dmac_writel(priv, 0, ENETDMAC_IRMASK_REG(priv->rx_chan));
--      enet_dmac_writel(priv, 0, ENETDMAC_IRMASK_REG(priv->tx_chan));
-+      enet_dmac_writel(priv, 0, ENETDMAC_IRMASK, priv->rx_chan);
-+      enet_dmac_writel(priv, 0, ENETDMAC_IRMASK, priv->tx_chan);
-       /* make sure no mib update is scheduled */
-       cancel_work_sync(&priv->mib_update_task);
-@@ -1784,6 +1815,11 @@ static int bcm_enet_probe(struct platfor
-               priv->pause_tx = pd->pause_tx;
-               priv->force_duplex_full = pd->force_duplex_full;
-               priv->force_speed_100 = pd->force_speed_100;
-+              priv->dma_chan_en_mask = pd->dma_chan_en_mask;
-+              priv->dma_chan_int_mask = pd->dma_chan_int_mask;
-+              priv->dma_chan_width = pd->dma_chan_width;
-+              priv->dma_has_sram = pd->dma_has_sram;
-+              priv->dma_desc_shift = pd->dma_desc_shift;
-       }
-       if (priv->mac_id == 0 && priv->has_phy && !priv->use_external_mii) {
-@@ -2121,8 +2157,8 @@ static int bcm_enetsw_open(struct net_de
-       kdev = &priv->pdev->dev;
-       /* mask all interrupts and request them */
--      enet_dmac_writel(priv, 0, ENETDMAC_IRMASK_REG(priv->rx_chan));
--      enet_dmac_writel(priv, 0, ENETDMAC_IRMASK_REG(priv->tx_chan));
-+      enet_dmac_writel(priv, 0, ENETDMAC_IRMASK, priv->rx_chan);
-+      enet_dmac_writel(priv, 0, ENETDMAC_IRMASK, priv->tx_chan);
-       ret = request_irq(priv->irq_rx, bcm_enet_isr_dma,
-                         IRQF_DISABLED, dev->name, dev);
-@@ -2234,23 +2270,23 @@ static int bcm_enetsw_open(struct net_de
-       /* write rx & tx ring addresses */
-       enet_dmas_writel(priv, priv->rx_desc_dma,
--                       ENETDMAS_RSTART_REG(priv->rx_chan));
-+                       ENETDMAS_RSTART_REG, priv->rx_chan);
-       enet_dmas_writel(priv, priv->tx_desc_dma,
--                       ENETDMAS_RSTART_REG(priv->tx_chan));
-+                       ENETDMAS_RSTART_REG, priv->tx_chan);
-       /* clear remaining state ram for rx & tx channel */
--      enet_dmas_writel(priv, 0, ENETDMAS_SRAM2_REG(priv->rx_chan));
--      enet_dmas_writel(priv, 0, ENETDMAS_SRAM2_REG(priv->tx_chan));
--      enet_dmas_writel(priv, 0, ENETDMAS_SRAM3_REG(priv->rx_chan));
--      enet_dmas_writel(priv, 0, ENETDMAS_SRAM3_REG(priv->tx_chan));
--      enet_dmas_writel(priv, 0, ENETDMAS_SRAM4_REG(priv->rx_chan));
--      enet_dmas_writel(priv, 0, ENETDMAS_SRAM4_REG(priv->tx_chan));
-+      enet_dmas_writel(priv, 0, ENETDMAS_SRAM2_REG, priv->rx_chan);
-+      enet_dmas_writel(priv, 0, ENETDMAS_SRAM2_REG, priv->tx_chan);
-+      enet_dmas_writel(priv, 0, ENETDMAS_SRAM3_REG, priv->rx_chan);
-+      enet_dmas_writel(priv, 0, ENETDMAS_SRAM3_REG, priv->tx_chan);
-+      enet_dmas_writel(priv, 0, ENETDMAS_SRAM4_REG, priv->rx_chan);
-+      enet_dmas_writel(priv, 0, ENETDMAS_SRAM4_REG, priv->tx_chan);
-       /* set dma maximum burst len */
-       enet_dmac_writel(priv, priv->dma_maxburst,
--                       ENETDMAC_MAXBURST_REG(priv->rx_chan));
-+                       ENETDMAC_MAXBURST, priv->rx_chan);
-       enet_dmac_writel(priv, priv->dma_maxburst,
--                       ENETDMAC_MAXBURST_REG(priv->tx_chan));
-+                       ENETDMAC_MAXBURST, priv->tx_chan);
-       /* set flow control low/high threshold to 1/3 / 2/3 */
-       val = priv->rx_ring_size / 3;
-@@ -2264,21 +2300,21 @@ static int bcm_enetsw_open(struct net_de
-       wmb();
-       enet_dma_writel(priv, ENETDMA_CFG_EN_MASK, ENETDMA_CFG_REG);
-       enet_dmac_writel(priv, ENETDMAC_CHANCFG_EN_MASK,
--                       ENETDMAC_CHANCFG_REG(priv->rx_chan));
-+                       ENETDMAC_CHANCFG, priv->rx_chan);
-       /* watch "packet transferred" interrupt in rx and tx */
-       enet_dmac_writel(priv, ENETDMAC_IR_PKTDONE_MASK,
--                       ENETDMAC_IR_REG(priv->rx_chan));
-+                       ENETDMAC_IR, priv->rx_chan);
-       enet_dmac_writel(priv, ENETDMAC_IR_PKTDONE_MASK,
--                       ENETDMAC_IR_REG(priv->tx_chan));
-+                       ENETDMAC_IR, priv->tx_chan);
-       /* make sure we enable napi before rx interrupt  */
-       napi_enable(&priv->napi);
-       enet_dmac_writel(priv, ENETDMAC_IR_PKTDONE_MASK,
--                       ENETDMAC_IRMASK_REG(priv->rx_chan));
-+                       ENETDMAC_IRMASK, priv->rx_chan);
-       enet_dmac_writel(priv, ENETDMAC_IR_PKTDONE_MASK,
--                       ENETDMAC_IRMASK_REG(priv->tx_chan));
-+                       ENETDMAC_IRMASK, priv->tx_chan);
-       netif_carrier_on(dev);
-       netif_start_queue(dev);
-@@ -2380,8 +2416,8 @@ static int bcm_enetsw_stop(struct net_de
-       del_timer_sync(&priv->rx_timeout);
-       /* mask all interrupts */
--      enet_dmac_writel(priv, 0, ENETDMAC_IRMASK_REG(priv->rx_chan));
--      enet_dmac_writel(priv, 0, ENETDMAC_IRMASK_REG(priv->tx_chan));
-+      enet_dmac_writel(priv, 0, ENETDMAC_IRMASK, priv->rx_chan);
-+      enet_dmac_writel(priv, 0, ENETDMAC_IRMASK, priv->tx_chan);
-       /* disable dma & mac */
-       bcm_enet_disable_dma(priv, priv->tx_chan);
-@@ -2715,6 +2751,10 @@ static int bcm_enetsw_probe(struct platf
-               memcpy(priv->used_ports, pd->used_ports,
-                      sizeof(pd->used_ports));
-               priv->num_ports = pd->num_ports;
-+              priv->dma_has_sram = pd->dma_has_sram;
-+              priv->dma_chan_en_mask = pd->dma_chan_en_mask;
-+              priv->dma_chan_int_mask = pd->dma_chan_int_mask;
-+              priv->dma_chan_width = pd->dma_chan_width;
-       }
-       ret = compute_hw_mtu(priv, dev->mtu);
---- a/drivers/net/ethernet/broadcom/bcm63xx_enet.h
-+++ b/drivers/net/ethernet/broadcom/bcm63xx_enet.h
-@@ -339,6 +339,21 @@ struct bcm_enet_priv {
-       /* used to poll switch port state */
-       struct timer_list swphy_poll;
-       spinlock_t enetsw_mdio_lock;
-+
-+      /* dma channel enable mask */
-+      u32 dma_chan_en_mask;
-+
-+      /* dma channel interrupt mask */
-+      u32 dma_chan_int_mask;
-+
-+      /* DMA engine has internal SRAM */
-+      bool dma_has_sram;
-+
-+      /* dma channel width */
-+      unsigned int dma_chan_width;
-+
-+      /* dma descriptor shift value */
-+      unsigned int dma_desc_shift;
- };
diff --git a/target/linux/brcm63xx/patches-3.9/100-MIPS-bmips-fix-compilation-for-BMIPS5000.patch b/target/linux/brcm63xx/patches-3.9/100-MIPS-bmips-fix-compilation-for-BMIPS5000.patch
deleted file mode 100644 (file)
index 6f47634..0000000
+++ /dev/null
@@ -1,67 +0,0 @@
-From d55975b74389b2cf1a38732062ff89303940f6e1 Mon Sep 17 00:00:00 2001
-From: Jonas Gorski <jogo@openwrt.org>
-Date: Sat, 29 Jun 2013 11:46:56 +0200
-Subject: [PATCH 01/10] MIPS: bmips: fix compilation for BMIPS5000
-
-Replace the macro names in strings with actual macro invocation.
-
-Fixes the following build error:
-
-  CC      arch/mips/kernel/smp-bmips.o
-{standard input}: Assembler messages:
-{standard input}:951: Error: Unrecognized opcode `_ssnop'
-{standard input}:952: Error: Unrecognized opcode `_ssnop'
-(...)
-make[6]: *** [arch/mips/kernel/smp-bmips.o] Error 1
-
-Signed-off-by: Jonas Gorski <jogo@openwrt.org>
----
- arch/mips/include/asm/bmips.h |   28 ++++++++++++++--------------
- 1 file changed, 14 insertions(+), 14 deletions(-)
-
---- a/arch/mips/include/asm/bmips.h
-+++ b/arch/mips/include/asm/bmips.h
-@@ -70,15 +70,15 @@ static inline unsigned long bmips_read_z
-               ".set noreorder\n"
-               "cache %1, 0(%2)\n"
-               "sync\n"
--              "_ssnop\n"
--              "_ssnop\n"
--              "_ssnop\n"
--              "_ssnop\n"
--              "_ssnop\n"
--              "_ssnop\n"
--              "_ssnop\n"
-+              __stringify(___ssnop) "\n"
-+              __stringify(___ssnop) "\n"
-+              __stringify(___ssnop) "\n"
-+              __stringify(___ssnop) "\n"
-+              __stringify(___ssnop) "\n"
-+              __stringify(___ssnop) "\n"
-+              __stringify(___ssnop) "\n"
-               "mfc0 %0, $28, 3\n"
--              "_ssnop\n"
-+              __stringify(___ssnop) "\n"
-               ".set pop\n"
-               : "=&r" (ret)
-               : "i" (Index_Load_Tag_S), "r" (ZSCM_REG_BASE + offset)
-@@ -92,13 +92,13 @@ static inline void bmips_write_zscm_reg(
-               ".set push\n"
-               ".set noreorder\n"
-               "mtc0 %0, $28, 3\n"
--              "_ssnop\n"
--              "_ssnop\n"
--              "_ssnop\n"
-+              __stringify(___ssnop) "\n"
-+              __stringify(___ssnop) "\n"
-+              __stringify(___ssnop) "\n"
-               "cache %1, 0(%2)\n"
--              "_ssnop\n"
--              "_ssnop\n"
--              "_ssnop\n"
-+              __stringify(___ssnop) "\n"
-+              __stringify(___ssnop) "\n"
-+              __stringify(___ssnop) "\n"
-               : /* no outputs */
-               : "r" (data),
-                 "i" (Index_Store_Tag_S), "r" (ZSCM_REG_BASE + offset)
diff --git a/target/linux/brcm63xx/patches-3.9/101-MIPS-allow-asm-cpu.h-to-be-included-from-assembly.patch b/target/linux/brcm63xx/patches-3.9/101-MIPS-allow-asm-cpu.h-to-be-included-from-assembly.patch
deleted file mode 100644 (file)
index 27c3b9e..0000000
+++ /dev/null
@@ -1,31 +0,0 @@
-From 520f4bf75026cc60ba47946331966fb670b39cb0 Mon Sep 17 00:00:00 2001
-From: Jonas Gorski <jogo@openwrt.org>
-Date: Thu, 27 Jun 2013 21:32:41 +0200
-Subject: [PATCH 02/10] MIPS: allow asm/cpu.h to be included from assembly
-
-Add guards around the enum to allow including cpu.h from assembly.
-
-Signed-off-by: Jonas Gorski <jogo@openwrt.org>
----
- arch/mips/include/asm/cpu.h |    3 +++
- 1 file changed, 3 insertions(+)
-
---- a/arch/mips/include/asm/cpu.h
-+++ b/arch/mips/include/asm/cpu.h
-@@ -225,6 +225,8 @@
- #define FPIR_IMP_NONE         0x0000
-+#if !defined(__ASSEMBLY__)
-+
- enum cpu_type_enum {
-       CPU_UNKNOWN,
-@@ -277,6 +279,7 @@ enum cpu_type_enum {
-       CPU_LAST
- };
-+#endif /* !__ASSEMBLY */
- /*
-  * ISA Level encodings
diff --git a/target/linux/brcm63xx/patches-3.9/102-MIPS-bmips-add-macros-for-testing-the-current-bmips-.patch b/target/linux/brcm63xx/patches-3.9/102-MIPS-bmips-add-macros-for-testing-the-current-bmips-.patch
deleted file mode 100644 (file)
index af38b35..0000000
+++ /dev/null
@@ -1,36 +0,0 @@
-From 971b8b3d5101b3bb868e63f3eb96fe69b7110c61 Mon Sep 17 00:00:00 2001
-From: Jonas Gorski <jogo@openwrt.org>
-Date: Thu, 27 Jun 2013 12:40:15 +0200
-Subject: [PATCH 03/10] MIPS: bmips: add macros for testing the current bmips
- CPU
-
-Makes it easy to make code conditionally compiled for supported CPUs
-without directly relying on #ifdefs.
-
-Signed-off-by: Jonas Gorski <jogo@openwrt.org>
----
- arch/mips/include/asm/bmips.h |   11 +++++++++++
- 1 file changed, 11 insertions(+)
-
---- a/arch/mips/include/asm/bmips.h
-+++ b/arch/mips/include/asm/bmips.h
-@@ -45,8 +45,19 @@
- #if !defined(__ASSEMBLY__)
- #include <linux/cpumask.h>
-+#include <asm/cpu-features.h>
- #include <asm/r4kcache.h>
-+#define cpu_is_bmips32()      (current_cpu_type() == CPU_BMIPS32)
-+#define cpu_is_bmips3300()    (IS_ENABLED(CONFIG_CPU_BMIPS3300) && \
-+                               current_cpu_type() == CPU_BMIPS3300)
-+#define cpu_is_bmips4350()    (IS_ENABLED(CONFIG_CPU_BMIPS4350) && \
-+                               current_cpu_type() == CPU_BMIPS4350)
-+#define cpu_is_bmips4380()    (IS_ENABLED(CONFIG_CPU_BMIPS4380) && \
-+                               current_cpu_type() == CPU_BMIPS4380)
-+#define cpu_is_bmips5000()    (IS_ENABLED(CONFIG_CPU_BMIPS5000) && \
-+                               current_cpu_type() == CPU_BMIPS5000)
-+
- extern struct plat_smp_ops bmips_smp_ops;
- extern char bmips_reset_nmi_vec;
- extern char bmips_reset_nmi_vec_end;
diff --git a/target/linux/brcm63xx/patches-3.9/103-MIPS-bmips-change-compile-time-checks-to-runtime-che.patch b/target/linux/brcm63xx/patches-3.9/103-MIPS-bmips-change-compile-time-checks-to-runtime-che.patch
deleted file mode 100644 (file)
index d551895..0000000
+++ /dev/null
@@ -1,482 +0,0 @@
-From 12594762fcbec024cb424c9b77efb28402651667 Mon Sep 17 00:00:00 2001
-From: Jonas Gorski <jogo@openwrt.org>
-Date: Thu, 27 Jun 2013 21:33:56 +0200
-Subject: [PATCH 04/10] MIPS: bmips: change compile time checks to runtime
- checks
-
-Allow building for all bmips cpus at the same time by changing ifdefs
-to checks for the cpu type, or adding appropriate checks to the
-assembly.
-
-Signed-off-by: Jonas Gorski <jogo@openwrt.org>
----
- arch/mips/kernel/bmips_vec.S |   55 +++++++---
- arch/mips/kernel/smp-bmips.c |  241 ++++++++++++++++++++++--------------------
- 2 files changed, 172 insertions(+), 124 deletions(-)
-
---- a/arch/mips/kernel/bmips_vec.S
-+++ b/arch/mips/kernel/bmips_vec.S
-@@ -13,6 +13,7 @@
- #include <asm/asm.h>
- #include <asm/asmmacro.h>
- #include <asm/cacheops.h>
-+#include <asm/cpu.h>
- #include <asm/regdef.h>
- #include <asm/mipsregs.h>
- #include <asm/stackframe.h>
-@@ -89,12 +90,18 @@ NESTED(bmips_reset_nmi_vec, PT_SIZE, sp)
-       beqz    k0, bmips_smp_entry
- #if defined(CONFIG_CPU_BMIPS5000)
-+      mfc0    k0, CP0_PRID
-+      li      k1, PRID_IMP_BMIPS5000
-+      andi    k0, 0xff00
-+      bne     k0, k1, 1f
-+
-       /* if we're not on core 0, this must be the SMP boot signal */
-       li      k1, (3 << 25)
-       mfc0    k0, $22
-       and     k0, k1
-       bnez    k0, bmips_smp_entry
--#endif
-+1:
-+#endif /* CONFIG_CPU_BMIPS5000 */
- #endif /* CONFIG_SMP */
-       /* nope, it's just a regular NMI */
-@@ -137,7 +144,12 @@ bmips_smp_entry:
-       xori    k0, 0x04
-       mtc0    k0, CP0_CONFIG
-+      mfc0    k0, CP0_PRID
-+      andi    k0, 0xff00
- #if defined(CONFIG_CPU_BMIPS4350) || defined(CONFIG_CPU_BMIPS4380)
-+      li      k1, PRID_IMP_BMIPS43XX
-+      bne     k0, k1, 2f
-+
-       /* initialize CPU1's local I-cache */
-       li      k0, 0x80000000
-       li      k1, 0x80010000
-@@ -148,14 +160,21 @@ bmips_smp_entry:
- 1:    cache   Index_Store_Tag_I, 0(k0)
-       addiu   k0, 16
-       bne     k0, k1, 1b
--#elif defined(CONFIG_CPU_BMIPS5000)
-+
-+      b       3f
-+2:
-+#endif /* CONFIG_CPU_BMIPS4350 || CONFIG_CPU_BMIPS4380 */
-+#if defined(CONFIG_CPU_BMIPS5000)
-       /* set exception vector base */
-+      li      k1, PRID_IMP_BMIPS5000
-+      bne     k0, k1, 3f
-+
-       la      k0, ebase
-       lw      k0, 0(k0)
-       mtc0    k0, $15, 1
-       BARRIER
--#endif
--
-+#endif /* CONFIG_CPU_BMIPS5000 */
-+3:
-       /* jump back to kseg0 in case we need to remap the kseg1 area */
-       la      k0, 1f
-       jr      k0
-@@ -221,8 +240,18 @@ END(bmips_smp_int_vec)
- LEAF(bmips_enable_xks01)
- #if defined(CONFIG_XKS01)
--
-+      mfc0    t0, CP0_PRID
-+      andi    t2, t0, 0xff00
- #if defined(CONFIG_CPU_BMIPS4380)
-+      li      t1, PRID_IMP_BMIPS43XX
-+      bne     t2, t1, 1f
-+
-+      andi    t0, 0xff
-+      addiu   t1, t0, -PRID_REV_BMIPS4380_HI
-+      bgtz    t1, 2f
-+      addiu   t0, -PRID_REV_BMIPS4380_LO
-+      bltz    t0, 2f
-+
-       mfc0    t0, $22, 3
-       li      t1, 0x1ff0
-       li      t2, (1 << 12) | (1 << 9)
-@@ -231,7 +260,13 @@ LEAF(bmips_enable_xks01)
-       or      t0, t2
-       mtc0    t0, $22, 3
-       BARRIER
--#elif defined(CONFIG_CPU_BMIPS5000)
-+      b       2f
-+1:
-+#endif /* CONFIG_CPU_BMIPS4380 */
-+#if defined(CONFIG_CPU_BMIPS5000)
-+      li      t1, PRID_IMP_BMIPS5000
-+      bne     t2, t1, 2f
-+
-       mfc0    t0, $22, 5
-       li      t1, 0x01ff
-       li      t2, (1 << 8) | (1 << 5)
-@@ -240,12 +275,8 @@ LEAF(bmips_enable_xks01)
-       or      t0, t2
-       mtc0    t0, $22, 5
-       BARRIER
--#else
--
--#error Missing XKS01 setup
--
--#endif
--
-+#endif /* CONFIG_CPU_BMIPS5000 */
-+2:
- #endif /* defined(CONFIG_XKS01) */
-       jr      ra
---- a/arch/mips/kernel/smp-bmips.c
-+++ b/arch/mips/kernel/smp-bmips.c
-@@ -49,8 +49,11 @@ cpumask_t bmips_booted_mask;
- unsigned long bmips_smp_boot_sp;
- unsigned long bmips_smp_boot_gp;
-+static void bmips43xx_send_ipi_single(int cpu, unsigned int action);
-+static void bmips5000_send_ipi_single(int cpu, unsigned int action);
- static void bmips_send_ipi_single(int cpu, unsigned int action);
--static irqreturn_t bmips_ipi_interrupt(int irq, void *dev_id);
-+static irqreturn_t bmips43xx_ipi_interrupt(int irq, void *dev_id);
-+static irqreturn_t bmips5000_ipi_interrupt(int irq, void *dev_id);
- /* SW interrupts 0,1 are used for interprocessor signaling */
- #define IPI0_IRQ                      (MIPS_CPU_IRQ_BASE + 0)
-@@ -65,48 +68,49 @@ static void __init bmips_smp_setup(void)
- {
-       int i, cpu = 1, boot_cpu = 0;
--#if defined(CONFIG_CPU_BMIPS4350) || defined(CONFIG_CPU_BMIPS4380)
--      /* arbitration priority */
--      clear_c0_brcm_cmt_ctrl(0x30);
--
--      /* NBK and weak order flags */
--      set_c0_brcm_config_0(0x30000);
--
--      /* Find out if we are running on TP0 or TP1 */
--      boot_cpu = !!(read_c0_brcm_cmt_local() & (1 << 31));
--
--      /*
--       * MIPS interrupts 0,1 (SW INT 0,1) cross over to the other thread
--       * MIPS interrupt 2 (HW INT 0) is the CPU0 L1 controller output
--       * MIPS interrupt 3 (HW INT 1) is the CPU1 L1 controller output
--       *
--       * If booting from TP1, leave the existing CMT interrupt routing
--       * such that TP0 responds to SW1 and TP1 responds to SW0.
--       */
--      if (boot_cpu == 0)
--              change_c0_brcm_cmt_intr(0xf8018000,
-+      if (cpu_is_bmips4350() || cpu_is_bmips4380()) {
-+              /* arbitration priority */
-+              clear_c0_brcm_cmt_ctrl(0x30);
-+
-+              /* NBK and weak order flags */
-+              set_c0_brcm_config_0(0x30000);
-+
-+              /* Find out if we are running on TP0 or TP1 */
-+              boot_cpu = !!(read_c0_brcm_cmt_local() & (1 << 31));
-+
-+              /*
-+               * MIPS interrupts 0,1 (SW INT 0,1) cross over to the other
-+               * thread
-+               * MIPS interrupt 2 (HW INT 0) is the CPU0 L1 controller output
-+               * MIPS interrupt 3 (HW INT 1) is the CPU1 L1 controller output
-+               *
-+               * If booting from TP1, leave the existing CMT interrupt routing
-+               * such that TP0 responds to SW1 and TP1 responds to SW0.
-+               */
-+              if (boot_cpu == 0)
-+                      change_c0_brcm_cmt_intr(0xf8018000,
-                                       (0x02 << 27) | (0x03 << 15));
--      else
--              change_c0_brcm_cmt_intr(0xf8018000, (0x1d << 27));
--
--      /* single core, 2 threads (2 pipelines) */
--      max_cpus = 2;
--#elif defined(CONFIG_CPU_BMIPS5000)
--      /* enable raceless SW interrupts */
--      set_c0_brcm_config(0x03 << 22);
--
--      /* route HW interrupt 0 to CPU0, HW interrupt 1 to CPU1 */
--      change_c0_brcm_mode(0x1f << 27, 0x02 << 27);
-+              else
-+                      change_c0_brcm_cmt_intr(0xf8018000, (0x1d << 27));
--      /* N cores, 2 threads per core */
--      max_cpus = (((read_c0_brcm_config() >> 6) & 0x03) + 1) << 1;
--
--      /* clear any pending SW interrupts */
--      for (i = 0; i < max_cpus; i++) {
--              write_c0_brcm_action(ACTION_CLR_IPI(i, 0));
--              write_c0_brcm_action(ACTION_CLR_IPI(i, 1));
-+              /* single core, 2 threads (2 pipelines) */
-+              max_cpus = 2;
-+      } else if (cpu_is_bmips5000()) {
-+              /* enable raceless SW interrupts */
-+              set_c0_brcm_config(0x03 << 22);
-+
-+              /* route HW interrupt 0 to CPU0, HW interrupt 1 to CPU1 */
-+              change_c0_brcm_mode(0x1f << 27, 0x02 << 27);
-+
-+              /* N cores, 2 threads per core */
-+              max_cpus = (((read_c0_brcm_config() >> 6) & 0x03) + 1) << 1;
-+
-+              /* clear any pending SW interrupts */
-+              for (i = 0; i < max_cpus; i++) {
-+                      write_c0_brcm_action(ACTION_CLR_IPI(i, 0));
-+                      write_c0_brcm_action(ACTION_CLR_IPI(i, 1));
-+              }
-       }
--#endif
-       if (!bmips_smp_enabled)
-               max_cpus = 1;
-@@ -134,6 +138,15 @@ static void __init bmips_smp_setup(void)
-  */
- static void bmips_prepare_cpus(unsigned int max_cpus)
- {
-+      irqreturn_t (*bmips_ipi_interrupt)(int irq, void *dev_id);
-+
-+      if (cpu_is_bmips4350() || cpu_is_bmips4380())
-+              bmips_ipi_interrupt = bmips43xx_ipi_interrupt;
-+      else if (cpu_is_bmips5000())
-+              bmips_ipi_interrupt = bmips5000_ipi_interrupt;
-+      else
-+              return;
-+
-       if (request_irq(IPI0_IRQ, bmips_ipi_interrupt, IRQF_PERCPU,
-                       "smp_ipi0", NULL))
-               panic("Can't request IPI0 interrupt\n");
-@@ -168,26 +181,26 @@ static void bmips_boot_secondary(int cpu
-       pr_info("SMP: Booting CPU%d...\n", cpu);
--      if (cpumask_test_cpu(cpu, &bmips_booted_mask))
-+      if (cpumask_test_cpu(cpu, &bmips_booted_mask)) {
-               bmips_send_ipi_single(cpu, 0);
--      else {
--#if defined(CONFIG_CPU_BMIPS4350) || defined(CONFIG_CPU_BMIPS4380)
--              /* Reset slave TP1 if booting from TP0 */
--              if (cpu_logical_map(cpu) == 0)
--                      set_c0_brcm_cmt_ctrl(0x01);
--#elif defined(CONFIG_CPU_BMIPS5000)
--              if (cpu & 0x01)
--                      write_c0_brcm_action(ACTION_BOOT_THREAD(cpu));
--              else {
--                      /*
--                       * core N thread 0 was already booted; just
--                       * pulse the NMI line
--                       */
--                      bmips_write_zscm_reg(0x210, 0xc0000000);
--                      udelay(10);
--                      bmips_write_zscm_reg(0x210, 0x00);
-+      } else {
-+              if (cpu_is_bmips4350() || cpu_is_bmips4380()) {
-+                      /* Reset slave TP1 if booting from TP0 */
-+                      if (cpu_logical_map(cpu) == 0)
-+                              set_c0_brcm_cmt_ctrl(0x01);
-+              } else if (cpu_is_bmips5000()) {
-+                      if (cpu & 0x01)
-+                              write_c0_brcm_action(ACTION_BOOT_THREAD(cpu));
-+                      else {
-+                              /*
-+                               * core N thread 0 was already booted; just
-+                               * pulse the NMI line
-+                               */
-+                              bmips_write_zscm_reg(0x210, 0xc0000000);
-+                              udelay(10);
-+                              bmips_write_zscm_reg(0x210, 0x00);
-+                      }
-               }
--#endif
-               cpumask_set_cpu(cpu, &bmips_booted_mask);
-       }
- }
-@@ -199,20 +212,21 @@ static void bmips_init_secondary(void)
- {
-       /* move NMI vector to kseg0, in case XKS01 is enabled */
--#if defined(CONFIG_CPU_BMIPS4350) || defined(CONFIG_CPU_BMIPS4380)
--      void __iomem *cbr = BMIPS_GET_CBR();
--      unsigned long old_vec;
--
--      old_vec = __raw_readl(cbr + BMIPS_RELO_VECTOR_CONTROL_1);
--      __raw_writel(old_vec & ~0x20000000, cbr + BMIPS_RELO_VECTOR_CONTROL_1);
--
--      clear_c0_cause(smp_processor_id() ? C_SW1 : C_SW0);
--#elif defined(CONFIG_CPU_BMIPS5000)
--      write_c0_brcm_bootvec(read_c0_brcm_bootvec() &
--              (smp_processor_id() & 0x01 ? ~0x20000000 : ~0x2000));
-+      if (cpu_is_bmips4350() || cpu_is_bmips4380()) {
-+              void __iomem *cbr = BMIPS_GET_CBR();
-+              unsigned long old_vec;
-+
-+              old_vec = __raw_readl(cbr + BMIPS_RELO_VECTOR_CONTROL_1);
-+              __raw_writel(old_vec & ~0x20000000,
-+                      cbr + BMIPS_RELO_VECTOR_CONTROL_1);
-+
-+              clear_c0_cause(smp_processor_id() ? C_SW1 : C_SW0);
-+      } else if (cpu_is_bmips5000()) {
-+              write_c0_brcm_bootvec(read_c0_brcm_bootvec() &
-+                      (smp_processor_id() & 0x01 ? ~0x20000000 : ~0x2000));
--      write_c0_brcm_action(ACTION_CLR_IPI(smp_processor_id(), 0));
--#endif
-+              write_c0_brcm_action(ACTION_CLR_IPI(smp_processor_id(), 0));
-+      }
- }
- /*
-@@ -237,8 +251,6 @@ static void bmips_cpus_done(void)
- {
- }
--#if defined(CONFIG_CPU_BMIPS5000)
--
- /*
-  * BMIPS5000 raceless IPIs
-  *
-@@ -247,12 +259,12 @@ static void bmips_cpus_done(void)
-  * IPI1 is used for SMP_CALL_FUNCTION
-  */
--static void bmips_send_ipi_single(int cpu, unsigned int action)
-+static void bmips5000_send_ipi_single(int cpu, unsigned int action)
- {
-       write_c0_brcm_action(ACTION_SET_IPI(cpu, action == SMP_CALL_FUNCTION));
- }
--static irqreturn_t bmips_ipi_interrupt(int irq, void *dev_id)
-+static irqreturn_t bmips5000_ipi_interrupt(int irq, void *dev_id)
- {
-       int action = irq - IPI0_IRQ;
-@@ -266,8 +278,6 @@ static irqreturn_t bmips_ipi_interrupt(i
-       return IRQ_HANDLED;
- }
--#else
--
- /*
-  * BMIPS43xx racey IPIs
-  *
-@@ -281,7 +291,7 @@ static irqreturn_t bmips_ipi_interrupt(i
- static DEFINE_SPINLOCK(ipi_lock);
- static DEFINE_PER_CPU(int, ipi_action_mask);
--static void bmips_send_ipi_single(int cpu, unsigned int action)
-+static void bmips43xx_send_ipi_single(int cpu, unsigned int action)
- {
-       unsigned long flags;
-@@ -292,7 +302,7 @@ static void bmips_send_ipi_single(int cp
-       spin_unlock_irqrestore(&ipi_lock, flags);
- }
--static irqreturn_t bmips_ipi_interrupt(int irq, void *dev_id)
-+static irqreturn_t bmips43xx_ipi_interrupt(int irq, void *dev_id)
- {
-       unsigned long flags;
-       int action, cpu = irq - IPI0_IRQ;
-@@ -311,7 +321,13 @@ static irqreturn_t bmips_ipi_interrupt(i
-       return IRQ_HANDLED;
- }
--#endif /* BMIPS type */
-+static void bmips_send_ipi_single(int cpu, unsigned int action)
-+{
-+      if (cpu_is_bmips4350() || cpu_is_bmips4380())
-+              bmips43xx_send_ipi_single(cpu, action);
-+      else if (cpu_is_bmips5000())
-+              bmips5000_send_ipi_single(cpu, action);
-+}
- static void bmips_send_ipi_mask(const struct cpumask *mask,
-       unsigned int action)
-@@ -421,43 +437,44 @@ void __cpuinit bmips_ebase_setup(void)
-       BUG_ON(ebase != CKSEG0);
--#if defined(CONFIG_CPU_BMIPS4350)
--      /*
--       * BMIPS4350 cannot relocate the normal vectors, but it
--       * can relocate the BEV=1 vectors.  So CPU1 starts up at
--       * the relocated BEV=1, IV=0 general exception vector @
--       * 0xa000_0380.
--       *
--       * set_uncached_handler() is used here because:
--       *  - CPU1 will run this from uncached space
--       *  - None of the cacheflush functions are set up yet
--       */
--      set_uncached_handler(BMIPS_WARM_RESTART_VEC - CKSEG0,
--              &bmips_smp_int_vec, 0x80);
--      __sync();
--      return;
--#elif defined(CONFIG_CPU_BMIPS4380)
--      /*
--       * 0x8000_0000: reset/NMI (initially in kseg1)
--       * 0x8000_0400: normal vectors
--       */
--      new_ebase = 0x80000400;
--      cbr = BMIPS_GET_CBR();
--      __raw_writel(0x80080800, cbr + BMIPS_RELO_VECTOR_CONTROL_0);
--      __raw_writel(0xa0080800, cbr + BMIPS_RELO_VECTOR_CONTROL_1);
--#elif defined(CONFIG_CPU_BMIPS5000)
--      /*
--       * 0x8000_0000: reset/NMI (initially in kseg1)
--       * 0x8000_1000: normal vectors
--       */
--      new_ebase = 0x80001000;
--      write_c0_brcm_bootvec(0xa0088008);
--      write_c0_ebase(new_ebase);
--      if (max_cpus > 2)
--              bmips_write_zscm_reg(0xa0, 0xa008a008);
--#else
--      return;
--#endif
-+      if (cpu_is_bmips4350()) {
-+              /*
-+               * BMIPS4350 cannot relocate the normal vectors, but it
-+               * can relocate the BEV=1 vectors.  So CPU1 starts up at
-+               * the relocated BEV=1, IV=0 general exception vector @
-+               * 0xa000_0380.
-+               *
-+               * set_uncached_handler() is used here because:
-+               *  - CPU1 will run this from uncached space
-+               *  - None of the cacheflush functions are set up yet
-+               */
-+              set_uncached_handler(BMIPS_WARM_RESTART_VEC - CKSEG0,
-+                      &bmips_smp_int_vec, 0x80);
-+              __sync();
-+              return;
-+      } else if (cpu_is_bmips4380()) {
-+              /*
-+               * 0x8000_0000: reset/NMI (initially in kseg1)
-+               * 0x8000_0400: normal vectors
-+               */
-+              new_ebase = 0x80000400;
-+              cbr = BMIPS_GET_CBR();
-+              __raw_writel(0x80080800, cbr + BMIPS_RELO_VECTOR_CONTROL_0);
-+              __raw_writel(0xa0080800, cbr + BMIPS_RELO_VECTOR_CONTROL_1);
-+      } else if (cpu_is_bmips5000()) {
-+              /*
-+               * 0x8000_0000: reset/NMI (initially in kseg1)
-+               * 0x8000_1000: normal vectors
-+               */
-+              new_ebase = 0x80001000;
-+              write_c0_brcm_bootvec(0xa0088008);
-+              write_c0_ebase(new_ebase);
-+              if (max_cpus > 2)
-+                      bmips_write_zscm_reg(0xa0, 0xa008a008);
-+      } else {
-+              return;
-+      }
-+
-       board_nmi_handler_setup = &bmips_nmi_handler_setup;
-       ebase = new_ebase;
- }
diff --git a/target/linux/brcm63xx/patches-3.9/104-MIPS-bmips-merge-CPU-options-into-one-option.patch b/target/linux/brcm63xx/patches-3.9/104-MIPS-bmips-merge-CPU-options-into-one-option.patch
deleted file mode 100644 (file)
index 386c63c..0000000
+++ /dev/null
@@ -1,126 +0,0 @@
-From 1ecac776e6c652e3059d4f4d9dd8369e89ebef81 Mon Sep 17 00:00:00 2001
-From: Jonas Gorski <jogo@openwrt.org>
-Date: Thu, 27 Jun 2013 23:57:20 +0200
-Subject: [PATCH 05/10] MIPS: bmips: merge CPU options into one option
-
-Instead of treating each flavour as an exclusive CPU to select, make
-BMIPS the only option and let SYS_HAS_CPU_BMIPS* decide for which
-flavours to include support.
-
-Run tested on BMIPS3300 and BMIPS4350, only build tested for BMIPS4380
-and BMISP5000.
-
-Signed-off-by: Jonas Gorski <jogo@openwrt.org>
----
- arch/mips/Kconfig |   77 +++++++++++++++++++++++++----------------------------
- 1 file changed, 36 insertions(+), 41 deletions(-)
-
---- a/arch/mips/Kconfig
-+++ b/arch/mips/Kconfig
-@@ -130,6 +130,7 @@ config BCM63XX
-       select DMA_NONCOHERENT
-       select IRQ_CPU
-       select SYS_HAS_CPU_MIPS32_R1
-+      select SYS_HAS_CPU_BMIPS
-       select SYS_HAS_CPU_BMIPS4350 if !BCM63XX_CPU_6338 && !BCM63XX_CPU_6345 && !BCM63XX_CPU_6348
-       select NR_CPUS_DEFAULT_2
-       select SYS_SUPPORTS_32BIT_KERNEL
-@@ -1454,41 +1455,21 @@ config CPU_CAVIUM_OCTEON
-         can have up to 16 Mips64v2 cores and 8 integrated gigabit ethernets.
-         Full details can be found at http://www.caviumnetworks.com.
--config CPU_BMIPS3300
--      bool "BMIPS3300"
--      depends on SYS_HAS_CPU_BMIPS3300
--      select CPU_BMIPS
--      help
--        Broadcom BMIPS3300 processors.
--
--config CPU_BMIPS4350
--      bool "BMIPS4350"
--      depends on SYS_HAS_CPU_BMIPS4350
--      select CPU_BMIPS
--      select SYS_SUPPORTS_SMP
--      select SYS_SUPPORTS_HOTPLUG_CPU
--      help
--        Broadcom BMIPS4350 ("VIPER") processors.
--
--config CPU_BMIPS4380
--      bool "BMIPS4380"
--      depends on SYS_HAS_CPU_BMIPS4380
--      select CPU_BMIPS
--      select SYS_SUPPORTS_SMP
--      select SYS_SUPPORTS_HOTPLUG_CPU
--      help
--        Broadcom BMIPS4380 processors.
--
--config CPU_BMIPS5000
--      bool "BMIPS5000"
--      depends on SYS_HAS_CPU_BMIPS5000
--      select CPU_BMIPS
--      select CPU_SUPPORTS_HIGHMEM
--      select MIPS_CPU_SCACHE
--      select SYS_SUPPORTS_SMP
--      select SYS_SUPPORTS_HOTPLUG_CPU
-+config CPU_BMIPS
-+      bool "Broadcom BMIPS"
-+      depends on SYS_HAS_CPU_BMIPS
-+      select CPU_MIPS32
-+      select CPU_BMIPS3300 if SYS_HAS_CPU_BMIPS3300
-+      select CPU_BMIPS4350 if SYS_HAS_CPU_BMIPS4350
-+      select CPU_BMIPS4350 if SYS_HAS_CPU_BMIPS4380
-+      select CPU_BMIPS5000 if SYS_HAS_CPU_BMIPS5000
-+      select CPU_SUPPORTS_32BIT_KERNEL
-+      select DMA_NONCOHERENT
-+      select IRQ_CPU
-+      select SWAP_IO_SPACE
-+      select WEAK_ORDERING
-       help
--        Broadcom BMIPS5000 processors.
-+        Support for BMIPS3300/4350/4380 and BMIPS5000 processors.
- config CPU_XLR
-       bool "Netlogic XLR SoC"
-@@ -1569,14 +1550,25 @@ config CPU_LOONGSON1
-       select CPU_SUPPORTS_32BIT_KERNEL
-       select CPU_SUPPORTS_HIGHMEM
--config CPU_BMIPS
-+config CPU_BMIPS3300
-       bool
--      select CPU_MIPS32
--      select CPU_SUPPORTS_32BIT_KERNEL
--      select DMA_NONCOHERENT
--      select IRQ_CPU
--      select SWAP_IO_SPACE
--      select WEAK_ORDERING
-+
-+config CPU_BMIPS4350
-+      bool
-+      select SYS_SUPPORTS_SMP
-+      select SYS_SUPPORTS_HOTPLUG_CPU
-+
-+config CPU_BMIPS4380
-+      bool
-+      select SYS_SUPPORTS_SMP
-+      select SYS_SUPPORTS_HOTPLUG_CPU
-+
-+config CPU_BMIPS5000
-+      bool
-+      select CPU_SUPPORTS_HIGHMEM
-+      select MIPS_CPU_SCACHE
-+      select SYS_SUPPORTS_SMP
-+      select SYS_SUPPORTS_HOTPLUG_CPU
- config SYS_HAS_CPU_LOONGSON2E
-       bool
-@@ -1650,6 +1642,9 @@ config SYS_HAS_CPU_SB1
- config SYS_HAS_CPU_CAVIUM_OCTEON
-       bool
-+config SYS_HAS_CPU_BMIPS
-+      bool
-+
- config SYS_HAS_CPU_BMIPS3300
-       bool
diff --git a/target/linux/brcm63xx/patches-3.9/105-MIPS-BCM63XX-let-the-individual-SoCs-select-the-appr.patch b/target/linux/brcm63xx/patches-3.9/105-MIPS-BCM63XX-let-the-individual-SoCs-select-the-appr.patch
deleted file mode 100644 (file)
index cb09abc..0000000
+++ /dev/null
@@ -1,72 +0,0 @@
-From 9d1e9d7abd2f2d067169fb0c62e34cf080bbd7a1 Mon Sep 17 00:00:00 2001
-From: Jonas Gorski <jogo@openwrt.org>
-Date: Sun, 23 Jun 2013 12:25:49 +0200
-Subject: [PATCH 06/10] MIPS: BCM63XX: let the individual SoCs select the
- appropriate CPUs
-
-Let each supported chip select the appropirate SYS_HAS_CPU_BMIPS*
-option for its embedded processor, so support will be conditionally
-included.
-
-Signed-off-by: Jonas Gorski <jogo@openwrt.org>
-
-fix bmips selection
----
- arch/mips/Kconfig         |    1 -
- arch/mips/bcm63xx/Kconfig |    8 ++++++++
- 2 files changed, 8 insertions(+), 1 deletion(-)
-
---- a/arch/mips/Kconfig
-+++ b/arch/mips/Kconfig
-@@ -131,7 +131,6 @@ config BCM63XX
-       select IRQ_CPU
-       select SYS_HAS_CPU_MIPS32_R1
-       select SYS_HAS_CPU_BMIPS
--      select SYS_HAS_CPU_BMIPS4350 if !BCM63XX_CPU_6338 && !BCM63XX_CPU_6345 && !BCM63XX_CPU_6348
-       select NR_CPUS_DEFAULT_2
-       select SYS_SUPPORTS_32BIT_KERNEL
-       select SYS_SUPPORTS_BIG_ENDIAN
---- a/arch/mips/bcm63xx/Kconfig
-+++ b/arch/mips/bcm63xx/Kconfig
-@@ -3,33 +3,41 @@ menu "CPU support"
- config BCM63XX_CPU_3368
-       bool "support 3368 CPU"
-+      select SYS_HAS_CPU_BMIPS4350
-       select HW_HAS_PCI
- config BCM63XX_CPU_6328
-       bool "support 6328 CPU"
-+      select SYS_HAS_CPU_BMIPS4350
-       select HW_HAS_PCI
- config BCM63XX_CPU_6338
-       bool "support 6338 CPU"
-+      select SYS_HAS_CPU_BMIPS3300
-       select HW_HAS_PCI
- config BCM63XX_CPU_6345
-       bool "support 6345 CPU"
-+      select SYS_HAS_CPU_BMIPS3300
- config BCM63XX_CPU_6348
-       bool "support 6348 CPU"
-+      select SYS_HAS_CPU_BMIPS3300
-       select HW_HAS_PCI
- config BCM63XX_CPU_6358
-       bool "support 6358 CPU"
-+      select SYS_HAS_CPU_BMIPS4350
-       select HW_HAS_PCI
- config BCM63XX_CPU_6362
-       bool "support 6362 CPU"
-+      select SYS_HAS_CPU_BMIPS4350
-       select HW_HAS_PCI
- config BCM63XX_CPU_6368
-       bool "support 6368 CPU"
-+      select SYS_HAS_CPU_BMIPS4350
-       select HW_HAS_PCI
- endmenu
diff --git a/target/linux/brcm63xx/patches-3.9/106-MIPS-bmips-add-a-helper-function-for-registering-smp.patch b/target/linux/brcm63xx/patches-3.9/106-MIPS-bmips-add-a-helper-function-for-registering-smp.patch
deleted file mode 100644 (file)
index ad357b6..0000000
+++ /dev/null
@@ -1,42 +0,0 @@
-From aa15ac91faccc3bf01a29670b1f9ae1945cea056 Mon Sep 17 00:00:00 2001
-From: Jonas Gorski <jogo@openwrt.org>
-Date: Sun, 23 Jun 2013 14:04:51 +0200
-Subject: [PATCH 07/10] MIPS: bmips: add a helper function for registering smp
- ops
-
-Add a helper similar to the generic register_XXX_smp_ops() for bmips.
-
-Signed-off-by: Jonas Gorski <jogo@openwrt.org>
----
- arch/mips/include/asm/bmips.h |   13 +++++++++++++
- 1 file changed, 13 insertions(+)
-
---- a/arch/mips/include/asm/bmips.h
-+++ b/arch/mips/include/asm/bmips.h
-@@ -47,6 +47,7 @@
- #include <linux/cpumask.h>
- #include <asm/cpu-features.h>
- #include <asm/r4kcache.h>
-+#include <asm/smp-ops.h>
- #define cpu_is_bmips32()      (current_cpu_type() == CPU_BMIPS32)
- #define cpu_is_bmips3300()    (IS_ENABLED(CONFIG_CPU_BMIPS3300) && \
-@@ -59,6 +60,18 @@
-                                current_cpu_type() == CPU_BMIPS5000)
- extern struct plat_smp_ops bmips_smp_ops;
-+
-+static inline int register_bmips_smp_ops(void)
-+{
-+#ifdef CONFIG_CPU_BMIPS
-+      register_smp_ops(&bmips_smp_ops);
-+
-+      return 0;
-+#else
-+      return -ENODEV;
-+#endif
-+}
-+
- extern char bmips_reset_nmi_vec;
- extern char bmips_reset_nmi_vec_end;
- extern char bmips_smp_movevec;
diff --git a/target/linux/brcm63xx/patches-3.9/107-MIPS-BCM63XX-always-register-bmips-smp-ops.patch b/target/linux/brcm63xx/patches-3.9/107-MIPS-BCM63XX-always-register-bmips-smp-ops.patch
deleted file mode 100644 (file)
index 1ea52c4..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-From c489eace9492d1b8bedb314bdef169e719161bff Mon Sep 17 00:00:00 2001
-From: Jonas Gorski <jogo@openwrt.org>
-Date: Fri, 28 Jun 2013 00:08:16 +0200
-Subject: [PATCH 08/10] MIPS: BCM63XX: always register bmips smp ops
-
-Signed-off-by: Jonas Gorski <jogo@openwrt.org>
----
- arch/mips/bcm63xx/prom.c |    6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
---- a/arch/mips/bcm63xx/prom.c
-+++ b/arch/mips/bcm63xx/prom.c
-@@ -59,10 +59,10 @@ void __init prom_init(void)
-       /* do low level board init */
-       board_prom_init();
--      if (IS_ENABLED(CONFIG_CPU_BMIPS4350) && IS_ENABLED(CONFIG_SMP)) {
--              /* set up SMP */
--              register_smp_ops(&bmips_smp_ops);
-+      /* set up SMP */
-+      register_bmips_smp_ops();
-+      if (IS_ENABLED(CONFIG_CPU_BMIPS4350) && IS_ENABLED(CONFIG_SMP)) {
-               /*
-                * BCM6328 might not have its second CPU enabled, while BCM6358
-                * needs special handling for its shared TLB, so disable SMP
diff --git a/target/linux/brcm63xx/patches-3.9/108-MIPS-BCM63XX-change-the-guard-to-a-BMIPS4350-check.patch b/target/linux/brcm63xx/patches-3.9/108-MIPS-BCM63XX-change-the-guard-to-a-BMIPS4350-check.patch
deleted file mode 100644 (file)
index 7572985..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-From 3a862fd3cc4f477ad2232370abfceca1ec2145ae Mon Sep 17 00:00:00 2001
-From: Jonas Gorski <jogo@openwrt.org>
-Date: Fri, 28 Jun 2013 00:10:07 +0200
-Subject: [PATCH 09/10] MIPS: BCM63XX: change the guard to a BMIPS4350 check
-
-Signed-off-by: Jonas Gorski <jogo@openwrt.org>
----
- arch/mips/bcm63xx/prom.c |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/arch/mips/bcm63xx/prom.c
-+++ b/arch/mips/bcm63xx/prom.c
-@@ -62,7 +62,7 @@ void __init prom_init(void)
-       /* set up SMP */
-       register_bmips_smp_ops();
--      if (IS_ENABLED(CONFIG_CPU_BMIPS4350) && IS_ENABLED(CONFIG_SMP)) {
-+      if (cpu_is_bmips4350()) {
-               /*
-                * BCM6328 might not have its second CPU enabled, while BCM6358
-                * needs special handling for its shared TLB, so disable SMP
diff --git a/target/linux/brcm63xx/patches-3.9/109-MIPS-BCM63XX-disable-SMP-also-on-BCM3368.patch b/target/linux/brcm63xx/patches-3.9/109-MIPS-BCM63XX-disable-SMP-also-on-BCM3368.patch
deleted file mode 100644 (file)
index dbb2ae4..0000000
+++ /dev/null
@@ -1,36 +0,0 @@
-From 32d4b03c0aedb96022e86a67a560f6eaf488200a Mon Sep 17 00:00:00 2001
-From: Jonas Gorski <jogo@openwrt.org>
-Date: Fri, 28 Jun 2013 00:25:13 +0200
-Subject: [PATCH 10/10] MIPS: BCM63XX: disable SMP also on BCM3368
-
-BCM3368 has the same shared TLB as BCM6358.
-
-Signed-off-by: Jonas Gorski <jogo@openwrt.org>
----
- arch/mips/bcm63xx/prom.c |    8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
---- a/arch/mips/bcm63xx/prom.c
-+++ b/arch/mips/bcm63xx/prom.c
-@@ -64,9 +64,9 @@ void __init prom_init(void)
-       if (cpu_is_bmips4350()) {
-               /*
--               * BCM6328 might not have its second CPU enabled, while BCM6358
--               * needs special handling for its shared TLB, so disable SMP
--               * for now.
-+               * BCM6328 might not have its second CPU enabled, while BCM3368
-+               * and BCM6358 need special handling for their shared TLB, so
-+               * disable SMP for now.
-                */
-               if (BCMCPU_IS_6328()) {
-                       reg = bcm_readl(BCM_6328_OTP_BASE +
-@@ -74,7 +74,7 @@ void __init prom_init(void)
-                       if (reg & OTP_6328_REG3_TP1_DISABLED)
-                               bmips_smp_enabled = 0;
--              } else if (BCMCPU_IS_6358()) {
-+              } else if (BCMCPU_IS_3368() || BCMCPU_IS_6358()) {
-                       bmips_smp_enabled = 0;
-               }
diff --git a/target/linux/brcm63xx/patches-3.9/110-MIPS-BCM63XX-add-USB-host-clock-enable-delay.patch b/target/linux/brcm63xx/patches-3.9/110-MIPS-BCM63XX-add-USB-host-clock-enable-delay.patch
deleted file mode 100644 (file)
index 63d385b..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-From 80a2f983e9f44dbc3e01ae31c62d877846a7f791 Mon Sep 17 00:00:00 2001
-From: Florian Fainelli <florian@openwrt.org>
-Date: Mon, 28 Jan 2013 20:06:19 +0100
-Subject: [PATCH 01/11] MIPS: BCM63XX: add USB host clock enable delay
-
-Knowledge of the clock setup delay should remain at the clock level (so
-it can be clock specific and CPU specific). Add the 100 milliseconds
-required clock delay for the USB host clock when it gets enabled.
-
-Signed-off-by: Florian Fainelli <florian@openwrt.org>
----
- arch/mips/bcm63xx/clk.c |    5 +++++
- 1 file changed, 5 insertions(+)
-
---- a/arch/mips/bcm63xx/clk.c
-+++ b/arch/mips/bcm63xx/clk.c
-@@ -177,6 +177,11 @@ static void usbh_set(struct clk *clk, in
-               bcm_hwclock_set(CKCTL_6362_USBH_EN, enable);
-       else if (BCMCPU_IS_6368())
-               bcm_hwclock_set(CKCTL_6368_USBH_EN, enable);
-+      else
-+              return;
-+
-+      if (enable)
-+              msleep(100);
- }
- static struct clk clk_usbh = {
diff --git a/target/linux/brcm63xx/patches-3.9/111-MIPS-BCM63XX-add-USB-device-clock-enable-delay-to-cl.patch b/target/linux/brcm63xx/patches-3.9/111-MIPS-BCM63XX-add-USB-device-clock-enable-delay-to-cl.patch
deleted file mode 100644 (file)
index eaf7503..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
-From 8e9bf528a122741f0171b89c297b63041116d704 Mon Sep 17 00:00:00 2001
-From: Florian Fainelli <florian@openwrt.org>
-Date: Mon, 28 Jan 2013 20:06:20 +0100
-Subject: [PATCH 02/11] MIPS: BCM63XX: add USB device clock enable delay to
- clock code
-
-This patch adds the required 10 micro seconds delay to the USB device
-clock enable operation. Put this where the correct clock knowledege is,
-which is in the clock code, and remove this delay from the bcm63xx_udc
-gadget driver where it was before.
-
-Signed-off-by: Florian Fainelli <florian@openwrt.org>
----
- arch/mips/bcm63xx/clk.c          |    5 +++++
- drivers/usb/gadget/bcm63xx_udc.c |    1 -
- 2 files changed, 5 insertions(+), 1 deletion(-)
-
---- a/arch/mips/bcm63xx/clk.c
-+++ b/arch/mips/bcm63xx/clk.c
-@@ -199,6 +199,11 @@ static void usbd_set(struct clk *clk, in
-               bcm_hwclock_set(CKCTL_6362_USBD_EN, enable);
-       else if (BCMCPU_IS_6368())
-               bcm_hwclock_set(CKCTL_6368_USBD_EN, enable);
-+      else
-+              return;
-+
-+      if (enable)
-+              udelay(10);
- }
- static struct clk clk_usbd = {
---- a/drivers/usb/gadget/bcm63xx_udc.c
-+++ b/drivers/usb/gadget/bcm63xx_udc.c
-@@ -386,7 +386,6 @@ static inline void set_clocks(struct bcm
-       if (is_enabled) {
-               clk_enable(udc->usbh_clk);
-               clk_enable(udc->usbd_clk);
--              udelay(10);
-       } else {
-               clk_disable(udc->usbd_clk);
-               clk_disable(udc->usbh_clk);
diff --git a/target/linux/brcm63xx/patches-3.9/112-MIPS-BCM63XX-move-code-touching-the-USB-private-regi.patch b/target/linux/brcm63xx/patches-3.9/112-MIPS-BCM63XX-move-code-touching-the-USB-private-regi.patch
deleted file mode 100644 (file)
index 4d00f0e..0000000
+++ /dev/null
@@ -1,151 +0,0 @@
-From ac9b0b574d54be28b300bf99ffe092a2c589484f Mon Sep 17 00:00:00 2001
-From: Florian Fainelli <florian@openwrt.org>
-Date: Mon, 28 Jan 2013 20:06:21 +0100
-Subject: [PATCH 03/11] MIPS: BCM63XX: move code touching the USB private
- register
-
-This patch moves the code touching the USB private register in the
-bcm63xx USB gadget driver to arch/mips/bcm63xx/usb-common.c in
-preparation for adding support for OHCI and EHCI host controllers which
-will also touch the USB private register.
-
-Signed-off-by: Florian Fainelli <florian@openwrt.org>
----
- arch/mips/bcm63xx/Makefile                         |    2 +-
- arch/mips/bcm63xx/usb-common.c                     |   53 ++++++++++++++++++++
- .../include/asm/mach-bcm63xx/bcm63xx_usb_priv.h    |    9 ++++
- drivers/usb/gadget/bcm63xx_udc.c                   |   27 ++--------
- 4 files changed, 67 insertions(+), 24 deletions(-)
- create mode 100644 arch/mips/bcm63xx/usb-common.c
- create mode 100644 arch/mips/include/asm/mach-bcm63xx/bcm63xx_usb_priv.h
-
---- a/arch/mips/bcm63xx/Makefile
-+++ b/arch/mips/bcm63xx/Makefile
-@@ -1,7 +1,7 @@
- obj-y         += clk.o cpu.o cs.o gpio.o irq.o nvram.o prom.o reset.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-usb-usbd.o
-+                 dev-usb-usbd.o usb-common.o
- obj-$(CONFIG_EARLY_PRINTK)    += early_printk.o
- obj-y         += boards/
---- /dev/null
-+++ b/arch/mips/bcm63xx/usb-common.c
-@@ -0,0 +1,53 @@
-+/*
-+ * Broadcom BCM63xx common USB device configuration code
-+ *
-+ * 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 Kevin Cernekee <cernekee@gmail.com>
-+ * Copyright (C) 2012 Broadcom Corporation
-+ *
-+ */
-+#include <linux/export.h>
-+
-+#include <bcm63xx_cpu.h>
-+#include <bcm63xx_regs.h>
-+#include <bcm63xx_io.h>
-+#include <bcm63xx_usb_priv.h>
-+
-+void bcm63xx_usb_priv_select_phy_mode(u32 portmask, bool is_device)
-+{
-+      u32 val;
-+
-+      val = bcm_rset_readl(RSET_USBH_PRIV, USBH_PRIV_UTMI_CTL_6368_REG);
-+      if (is_device) {
-+              val |= (portmask << USBH_PRIV_UTMI_CTL_HOSTB_SHIFT);
-+              val |= (portmask << USBH_PRIV_UTMI_CTL_NODRIV_SHIFT);
-+      } else {
-+              val &= ~(portmask << USBH_PRIV_UTMI_CTL_HOSTB_SHIFT);
-+              val &= ~(portmask << USBH_PRIV_UTMI_CTL_NODRIV_SHIFT);
-+      }
-+      bcm_rset_writel(RSET_USBH_PRIV, val, USBH_PRIV_UTMI_CTL_6368_REG);
-+
-+      val = bcm_rset_readl(RSET_USBH_PRIV, USBH_PRIV_SWAP_6368_REG);
-+      if (is_device)
-+              val |= USBH_PRIV_SWAP_USBD_MASK;
-+      else
-+              val &= ~USBH_PRIV_SWAP_USBD_MASK;
-+      bcm_rset_writel(RSET_USBH_PRIV, val, USBH_PRIV_SWAP_6368_REG);
-+}
-+EXPORT_SYMBOL(bcm63xx_usb_priv_select_phy_mode);
-+
-+void bcm63xx_usb_priv_select_pullup(u32 portmask, bool is_on)
-+{
-+      u32 val;
-+
-+      val = bcm_rset_readl(RSET_USBH_PRIV, USBH_PRIV_UTMI_CTL_6368_REG);
-+      if (is_on)
-+              val &= ~(portmask << USBH_PRIV_UTMI_CTL_NODRIV_SHIFT);
-+      else
-+              val |= (portmask << USBH_PRIV_UTMI_CTL_NODRIV_SHIFT);
-+      bcm_rset_writel(RSET_USBH_PRIV, val, USBH_PRIV_UTMI_CTL_6368_REG);
-+}
-+EXPORT_SYMBOL(bcm63xx_usb_priv_select_pullup);
---- /dev/null
-+++ b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_usb_priv.h
-@@ -0,0 +1,9 @@
-+#ifndef BCM63XX_USB_PRIV_H_
-+#define BCM63XX_USB_PRIV_H_
-+
-+#include <linux/types.h>
-+
-+void bcm63xx_usb_priv_select_phy_mode(u32 portmask, bool is_device);
-+void bcm63xx_usb_priv_select_pullup(u32 portmask, bool is_on);
-+
-+#endif /* BCM63XX_USB_PRIV_H_ */
---- a/drivers/usb/gadget/bcm63xx_udc.c
-+++ b/drivers/usb/gadget/bcm63xx_udc.c
-@@ -41,6 +41,7 @@
- #include <bcm63xx_dev_usb_usbd.h>
- #include <bcm63xx_io.h>
- #include <bcm63xx_regs.h>
-+#include <bcm63xx_usb_priv.h>
- #define DRV_MODULE_NAME               "bcm63xx_udc"
-@@ -863,22 +864,7 @@ static void bcm63xx_select_phy_mode(stru
-               bcm_gpio_writel(val, GPIO_PINMUX_OTHR_REG);
-       }
--      val = bcm_rset_readl(RSET_USBH_PRIV, USBH_PRIV_UTMI_CTL_6368_REG);
--      if (is_device) {
--              val |= (portmask << USBH_PRIV_UTMI_CTL_HOSTB_SHIFT);
--              val |= (portmask << USBH_PRIV_UTMI_CTL_NODRIV_SHIFT);
--      } else {
--              val &= ~(portmask << USBH_PRIV_UTMI_CTL_HOSTB_SHIFT);
--              val &= ~(portmask << USBH_PRIV_UTMI_CTL_NODRIV_SHIFT);
--      }
--      bcm_rset_writel(RSET_USBH_PRIV, val, USBH_PRIV_UTMI_CTL_6368_REG);
--
--      val = bcm_rset_readl(RSET_USBH_PRIV, USBH_PRIV_SWAP_6368_REG);
--      if (is_device)
--              val |= USBH_PRIV_SWAP_USBD_MASK;
--      else
--              val &= ~USBH_PRIV_SWAP_USBD_MASK;
--      bcm_rset_writel(RSET_USBH_PRIV, val, USBH_PRIV_SWAP_6368_REG);
-+      bcm63xx_usb_priv_select_phy_mode(portmask, is_device);
- }
- /**
-@@ -892,14 +878,9 @@ static void bcm63xx_select_phy_mode(stru
-  */
- static void bcm63xx_select_pullup(struct bcm63xx_udc *udc, bool is_on)
- {
--      u32 val, portmask = BIT(udc->pd->port_no);
-+      u32 portmask = BIT(udc->pd->port_no);
--      val = bcm_rset_readl(RSET_USBH_PRIV, USBH_PRIV_UTMI_CTL_6368_REG);
--      if (is_on)
--              val &= ~(portmask << USBH_PRIV_UTMI_CTL_NODRIV_SHIFT);
--      else
--              val |= (portmask << USBH_PRIV_UTMI_CTL_NODRIV_SHIFT);
--      bcm_rset_writel(RSET_USBH_PRIV, val, USBH_PRIV_UTMI_CTL_6368_REG);
-+      bcm63xx_usb_priv_select_pullup(portmask, is_on);
- }
- /**
diff --git a/target/linux/brcm63xx/patches-3.9/113-MIPS-BCM63XX-add-OHCI-EHCI-configuration-bits-to-com.patch b/target/linux/brcm63xx/patches-3.9/113-MIPS-BCM63XX-add-OHCI-EHCI-configuration-bits-to-com.patch
deleted file mode 100644 (file)
index 40bbe08..0000000
+++ /dev/null
@@ -1,169 +0,0 @@
-From 28758a9da77954ed323f86123ef448c6a563c037 Mon Sep 17 00:00:00 2001
-From: Florian Fainelli <florian@openwrt.org>
-Date: Mon, 28 Jan 2013 20:06:22 +0100
-Subject: [PATCH 04/11] MIPS: BCM63XX: add OHCI/EHCI configuration bits to
- common USB code
-
-This patch updates the common USB code touching the USB private
-registers with the specific bits to properly enable OHCI and EHCI
-controllers on BCM63xx SoCs. As a result we now need to protect access
-to Read Modify Write sequences using a spinlock because we cannot
-guarantee that any of the exposed helper will not be called
-concurrently.
-
-Signed-off-by: Maxime Bizon <mbizon@freebox.fr>
-Signed-off-by: Florian Fainelli <florian@openwrt.org>
----
- arch/mips/bcm63xx/usb-common.c                     |   97 ++++++++++++++++++++
- .../include/asm/mach-bcm63xx/bcm63xx_usb_priv.h    |    2 +
- 2 files changed, 99 insertions(+)
-
---- a/arch/mips/bcm63xx/usb-common.c
-+++ b/arch/mips/bcm63xx/usb-common.c
-@@ -5,10 +5,12 @@
-  * License.  See the file "COPYING" in the main directory of this archive
-  * for more details.
-  *
-+ * Copyright (C) 2008 Maxime Bizon <mbizon@freebox.fr>
-  * Copyright (C) 2012 Kevin Cernekee <cernekee@gmail.com>
-  * Copyright (C) 2012 Broadcom Corporation
-  *
-  */
-+#include <linux/spinlock.h>
- #include <linux/export.h>
- #include <bcm63xx_cpu.h>
-@@ -16,9 +18,14 @@
- #include <bcm63xx_io.h>
- #include <bcm63xx_usb_priv.h>
-+static DEFINE_SPINLOCK(usb_priv_reg_lock);
-+
- void bcm63xx_usb_priv_select_phy_mode(u32 portmask, bool is_device)
- {
-       u32 val;
-+      unsigned long flags;
-+
-+