brcm63xx: update development kernel to linux 3.14
authorJonas Gorski <jogo@openwrt.org>
Fri, 4 Apr 2014 10:17:08 +0000 (10:17 +0000)
committerJonas Gorski <jogo@openwrt.org>
Fri, 4 Apr 2014 10:17:08 +0000 (10:17 +0000)
Now that 3.13 will be EOL soon, switch to 3.14.

Known issues:
 * 74x164 is not available because upstream dropped non-DT support
 * jffs2 breaks with SMP

Unknown issues:
 * probably plenty

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

291 files changed:
target/linux/brcm63xx/config-3.13 [deleted file]
target/linux/brcm63xx/config-3.14 [new file with mode: 0644]
target/linux/brcm63xx/patches-3.13/001-spi-add-bcm63xx-HSSPI-driver.patch [deleted file]
target/linux/brcm63xx/patches-3.13/002-MIPS-BCM63XX-expose-the-HSSPI-clock.patch [deleted file]
target/linux/brcm63xx/patches-3.13/003-MIPS-BCM63XX-setup-the-HSSPI-clock-rate.patch [deleted file]
target/linux/brcm63xx/patches-3.13/004-MIPS-BCM63XX-add-HSSPI-IRQ-and-register-offsets.patch [deleted file]
target/linux/brcm63xx/patches-3.13/005-MIPS-BCM63XX-add-HSSPI-platform-device-and-register-.patch [deleted file]
target/linux/brcm63xx/patches-3.13/006-spi-bcm63xx-don-t-reject-reads-256-bytes.patch [deleted file]
target/linux/brcm63xx/patches-3.13/007-MIPS-BCM63XX-disable-SMP-also-on-BCM3368.patch [deleted file]
target/linux/brcm63xx/patches-3.13/008-MIPS-allow-asm-cpu.h-to-be-included-from-assembly.patch [deleted file]
target/linux/brcm63xx/patches-3.13/009-MIPS-BMIPS-change-compile-time-checks-to-runtime-che.patch [deleted file]
target/linux/brcm63xx/patches-3.13/010-MIPS-BMIPS-merge-CPU-options-into-one-option.patch [deleted file]
target/linux/brcm63xx/patches-3.13/011-MIPS-BMIPS-select-CPU_SUPPORTS_HIGHMEM.patch [deleted file]
target/linux/brcm63xx/patches-3.13/012-MIPS-BMIPS-select-CPU_HAS_PREFETCH.patch [deleted file]
target/linux/brcm63xx/patches-3.13/013-MIPS-BMIPS-extend-BMIPS3300-to-include-BMIPS32.patch [deleted file]
target/linux/brcm63xx/patches-3.13/014-MIPS-BMIPS-add-a-smp-ops-registration-helper.patch [deleted file]
target/linux/brcm63xx/patches-3.13/015-MIPS-BCM63XX-always-register-bmips-smp-ops.patch [deleted file]
target/linux/brcm63xx/patches-3.13/016-MIPS-BCM63XX-let-the-individual-SoCs-select-the-appr.patch [deleted file]
target/linux/brcm63xx/patches-3.13/017-MIPS-cpu-type-guard-BMIPS-variants-with-SYS_HAS_CPU_.patch [deleted file]
target/linux/brcm63xx/patches-3.13/018-MIPS-BCM63XX-drop-SYS_HAS_CPU_MIPS32R1.patch [deleted file]
target/linux/brcm63xx/patches-3.13/100-MIPS-BCM63XX-add-USB-host-clock-enable-delay.patch [deleted file]
target/linux/brcm63xx/patches-3.13/101-MIPS-BCM63XX-add-USB-device-clock-enable-delay-to-cl.patch [deleted file]
target/linux/brcm63xx/patches-3.13/102-MIPS-BCM63XX-move-code-touching-the-USB-private-regi.patch [deleted file]
target/linux/brcm63xx/patches-3.13/103-MIPS-BCM63XX-add-OHCI-EHCI-configuration-bits-to-com.patch [deleted file]
target/linux/brcm63xx/patches-3.13/104-MIPS-BCM63XX-introduce-BCM63XX_OHCI-configuration-sy.patch [deleted file]
target/linux/brcm63xx/patches-3.13/105-MIPS-BCM63XX-add-support-for-the-on-chip-OHCI-contro.patch [deleted file]
target/linux/brcm63xx/patches-3.13/106-MIPS-BCM63XX-register-OHCI-controller-if-board-enabl.patch [deleted file]
target/linux/brcm63xx/patches-3.13/107-MIPS-BCM63XX-introduce-BCM63XX_EHCI-configuration-sy.patch [deleted file]
target/linux/brcm63xx/patches-3.13/108-MIPS-BCM63XX-add-support-for-the-on-chip-EHCI-contro.patch [deleted file]
target/linux/brcm63xx/patches-3.13/109-MIPS-BCM63XX-register-EHCI-controller-if-board-enabl.patch [deleted file]
target/linux/brcm63xx/patches-3.13/110-MIPS-BCM63XX-EHCI-controller-does-not-support-overcu.patch [deleted file]
target/linux/brcm63xx/patches-3.13/201-SPI-Allow-specifying-the-parsers-for-SPI-flash.patch [deleted file]
target/linux/brcm63xx/patches-3.13/202-MTD-DEVICES-m25p80-use-parsers-if-provided-in-flash-.patch [deleted file]
target/linux/brcm63xx/patches-3.13/203-MTD-DEVICES-m25p80-add-support-for-limiting-reads.patch [deleted file]
target/linux/brcm63xx/patches-3.13/204-USB-OHCI-allow-other-arches-to-use-the-BE-frame-numb.patch [deleted file]
target/linux/brcm63xx/patches-3.13/205-USB-fix-bcm63xx_udc.patch [deleted file]
target/linux/brcm63xx/patches-3.13/206-USB-EHCI-allow-limiting-ports-for-ehci-platform.patch [deleted file]
target/linux/brcm63xx/patches-3.13/300-reset_buttons.patch [deleted file]
target/linux/brcm63xx/patches-3.13/301-led_count.patch [deleted file]
target/linux/brcm63xx/patches-3.13/302-extended-platform-devices.patch [deleted file]
target/linux/brcm63xx/patches-3.13/303-spi-board-info.patch [deleted file]
target/linux/brcm63xx/patches-3.13/304-boardid_fixup.patch [deleted file]
target/linux/brcm63xx/patches-3.13/308-board_leds_naming.patch [deleted file]
target/linux/brcm63xx/patches-3.13/309-cfe_version_mod.patch [deleted file]
target/linux/brcm63xx/patches-3.13/310-MIPS-BCM63XX-remove-RUNTIME_DETECT-code-from-registe.patch [deleted file]
target/linux/brcm63xx/patches-3.13/311-MIPS-BCM63XX-remove-RUNTIME_DETECT-from-irq-setup-co.patch [deleted file]
target/linux/brcm63xx/patches-3.13/312-MIPS-BCM63XX-remove-RUNTIME_DETECT-from-reset-code.patch [deleted file]
target/linux/brcm63xx/patches-3.13/313-MIPS-BCM63XX-remove-RUNTIME_DETECT-code-from-gpio.patch [deleted file]
target/linux/brcm63xx/patches-3.13/314-MIPS-BCM63XX-remove-RUNTIME_DETECT-from-spi-code.patch [deleted file]
target/linux/brcm63xx/patches-3.13/315-MIPS-BCM63XX-remove-RUNTIME_DETECT-usage-from-enet-c.patch [deleted file]
target/linux/brcm63xx/patches-3.13/316-MIPS-BCM63XX-remove-RUNTIME_DETECT-in-cpu-feature-ov.patch [deleted file]
target/linux/brcm63xx/patches-3.13/317-MIPS-BCM63XX-remove-RUNTIME_DETECT-code-for-bcmcpu_g.patch [deleted file]
target/linux/brcm63xx/patches-3.13/318-MIPS-BCM63XX-rename-__dispatch_internal-to-__dispatc.patch [deleted file]
target/linux/brcm63xx/patches-3.13/319-MIPS-BCM63XX-move-bcm63xx_init_irq-down.patch [deleted file]
target/linux/brcm63xx/patches-3.13/320-MIPS-BCM63XX-replace-irq-dispatch-code-with-a-generi.patch [deleted file]
target/linux/brcm63xx/patches-3.13/321-MIPS-BCM63XX-append-irq-line-number-to-irq_-stat-mas.patch [deleted file]
target/linux/brcm63xx/patches-3.13/322-MIPS-BCM63XX-populate-irq_-stat-mask-_addr-for-secon.patch [deleted file]
target/linux/brcm63xx/patches-3.13/323-MIPS-BCM63XX-add-pin-argument-to-dispatch-internal.patch [deleted file]
target/linux/brcm63xx/patches-3.13/324-MIPS-BCM63XX-protect-irq-register-accesses.patch [deleted file]
target/linux/brcm63xx/patches-3.13/325-MIPS-BCM63XX-wire-up-the-second-cpu-s-irq-line.patch [deleted file]
target/linux/brcm63xx/patches-3.13/326-MIPS-BCM63XX-use-irq_desc-as-argument-for-un-mask.patch [deleted file]
target/linux/brcm63xx/patches-3.13/327-MIPS-BCM63XX-allow-setting-affinity-for-IPIC.patch [deleted file]
target/linux/brcm63xx/patches-3.13/328-cfe_simplify_detection.patch [deleted file]
target/linux/brcm63xx/patches-3.13/329-bcm63xxpart_use_cfedetection.patch [deleted file]
target/linux/brcm63xx/patches-3.13/330-MIPS-BCM63XX-add-a-new-cpu-variant-helper.patch [deleted file]
target/linux/brcm63xx/patches-3.13/331-MIPS-BCM63XX-define-variant-id-field.patch [deleted file]
target/linux/brcm63xx/patches-3.13/332-MIPS-BCM63XX-detect-bcm6328-variants.patch [deleted file]
target/linux/brcm63xx/patches-3.13/333-MIPS-BCM63XX-detect-BCM6362-variants.patch [deleted file]
target/linux/brcm63xx/patches-3.13/334-MIPS-BCM63XX-add-support-for-BCM6368-variants.patch [deleted file]
target/linux/brcm63xx/patches-3.13/335-MIPS-BCM63XX-fix-PCIe-memory-window-size.patch [deleted file]
target/linux/brcm63xx/patches-3.13/336-MIPS-BCM63XX-dynamically-set-the-pcie-memory-windows.patch [deleted file]
target/linux/brcm63xx/patches-3.13/337-MIPS-BCM63XX-widen-cpuid-field.patch [deleted file]
target/linux/brcm63xx/patches-3.13/338-MIPS-BCM63XX-increase-number-of-IRQs.patch [deleted file]
target/linux/brcm63xx/patches-3.13/339-MIPS-BCM63XX-add-support-for-BCM63268.patch [deleted file]
target/linux/brcm63xx/patches-3.13/340-MIPS-BCM63XX-add-pcie-support-for-BCM63268.patch [deleted file]
target/linux/brcm63xx/patches-3.13/341-MIPS-BCM63XX-add-support-for-BCM6318.patch [deleted file]
target/linux/brcm63xx/patches-3.13/342-MIPS-BCM63XX-split-PCIe-reset-signals.patch [deleted file]
target/linux/brcm63xx/patches-3.13/343-MIPS-BCM63XX-add-PCIe-support-for-BCM6318.patch [deleted file]
target/linux/brcm63xx/patches-3.13/344-MIPS-BCM63XX-detect-flash-type-early-and-store-the-r.patch [deleted file]
target/linux/brcm63xx/patches-3.13/345-MIPS-BCM63XX-fixup-mapped-SPI-flash-access-on-boot.patch [deleted file]
target/linux/brcm63xx/patches-3.13/346-MIPS-BCM63XX-USB-ENETSW-6318-clocks.patch [deleted file]
target/linux/brcm63xx/patches-3.13/347-MIPS-BCM6318-USB-support.patch [deleted file]
target/linux/brcm63xx/patches-3.13/348-MIPS-BCM63XX-fix-BCM63268-USB-clock.patch [deleted file]
target/linux/brcm63xx/patches-3.13/349-MIPS-BCM63XX-add-BCM63268-USB-support.patch [deleted file]
target/linux/brcm63xx/patches-3.13/350-MIPS-BCM63XX-support-settings-num-usbh-ports.patch [deleted file]
target/linux/brcm63xx/patches-3.13/351-set-board-usbh-ports.patch [deleted file]
target/linux/brcm63xx/patches-3.13/400-bcm963xx_flashmap.patch [deleted file]
target/linux/brcm63xx/patches-3.13/401-bcm963xx_real_rootfs_length.patch [deleted file]
target/linux/brcm63xx/patches-3.13/402_bcm63xx_enet_vlan_incoming_fixed.patch [deleted file]
target/linux/brcm63xx/patches-3.13/403-6358-enet1-external-mii-clk.patch [deleted file]
target/linux/brcm63xx/patches-3.13/404-NET-bcm63xx_enet-move-phy_-dis-connect-into-probe-re.patch [deleted file]
target/linux/brcm63xx/patches-3.13/408-bcm63xx_enet-enable-rgmii-clock-on-external-ports.patch [deleted file]
target/linux/brcm63xx/patches-3.13/411-MIPS-BCM63XX-Register-SPI-flash-if-present.patch [deleted file]
target/linux/brcm63xx/patches-3.13/412-MTD-physmap-allow-passing-pp_data.patch [deleted file]
target/linux/brcm63xx/patches-3.13/413-BCM63XX-allow-providing-fixup-data-in-board-data.patch [deleted file]
target/linux/brcm63xx/patches-3.13/414-MTD-m25p80-allow-passing-pp_data.patch [deleted file]
target/linux/brcm63xx/patches-3.13/415-MIPS-BCM63XX-export-the-attached-flash-type.patch [deleted file]
target/linux/brcm63xx/patches-3.13/416-BCM63XX-add-a-fixup-for-ath9k-devices.patch [deleted file]
target/linux/brcm63xx/patches-3.13/417-MTD-bcm63xxpart-allow-passing-a-caldata-offset.patch [deleted file]
target/linux/brcm63xx/patches-3.13/418-MIPS-BCM63XX-pass-caldata-info-to-flash.patch [deleted file]
target/linux/brcm63xx/patches-3.13/420-BCM63XX-add-endian-check-for-ath9k.patch [deleted file]
target/linux/brcm63xx/patches-3.13/421-BCM63XX-add-led-pin-for-ath9k.patch [deleted file]
target/linux/brcm63xx/patches-3.13/422-BCM63XX-add-a-fixup-for-rt2x00-devices.patch [deleted file]
target/linux/brcm63xx/patches-3.13/423-bcm63xx_enet_add_b53_support.patch [deleted file]
target/linux/brcm63xx/patches-3.13/424-bcm63xx_enet_no_request_mem_region.patch [deleted file]
target/linux/brcm63xx/patches-3.13/500-board-D4PW.patch [deleted file]
target/linux/brcm63xx/patches-3.13/501-board-NB4.patch [deleted file]
target/linux/brcm63xx/patches-3.13/502-board-96338W2_E7T.patch [deleted file]
target/linux/brcm63xx/patches-3.13/503-board-CPVA642.patch [deleted file]
target/linux/brcm63xx/patches-3.13/504-board_dsl_274xb_rev_c.patch [deleted file]
target/linux/brcm63xx/patches-3.13/505-board_spw500v.patch [deleted file]
target/linux/brcm63xx/patches-3.13/506-board_gw6200_gw6000.patch [deleted file]
target/linux/brcm63xx/patches-3.13/507-board-MAGIC.patch [deleted file]
target/linux/brcm63xx/patches-3.13/508-board_hw553.patch [deleted file]
target/linux/brcm63xx/patches-3.13/509-board_rta1320_16m.patch [deleted file]
target/linux/brcm63xx/patches-3.13/510-board_spw303v.patch [deleted file]
target/linux/brcm63xx/patches-3.13/511-board_V2500V.patch [deleted file]
target/linux/brcm63xx/patches-3.13/512-board_BTV2110.patch [deleted file]
target/linux/brcm63xx/patches-3.13/513-board_livebox.patch [deleted file]
target/linux/brcm63xx/patches-3.13/514-board_ct536_ct5621.patch [deleted file]
target/linux/brcm63xx/patches-3.13/515-board_DWV-S0_fixes.patch [deleted file]
target/linux/brcm63xx/patches-3.13/516-board_96348A-122.patch [deleted file]
target/linux/brcm63xx/patches-3.13/517-RTA1205W_16_uart_fixes.patch [deleted file]
target/linux/brcm63xx/patches-3.13/519_board_CPVA502plus.patch [deleted file]
target/linux/brcm63xx/patches-3.13/520-bcm63xx-add-support-for-96368MVWG-board.patch [deleted file]
target/linux/brcm63xx/patches-3.13/521-bcm63xx-add-support-for-96368MVNgr-board.patch [deleted file]
target/linux/brcm63xx/patches-3.13/522-MIPS-BCM63XX-add-96328avng-reference-board.patch [deleted file]
target/linux/brcm63xx/patches-3.13/523-MIPS-BCM63XX-add-963281TAN-reference-board.patch [deleted file]
target/linux/brcm63xx/patches-3.13/524-board_dsl_274xb_rev_f.patch [deleted file]
target/linux/brcm63xx/patches-3.13/525-board_96348w3.patch [deleted file]
target/linux/brcm63xx/patches-3.13/526-board_CT6373-1.patch [deleted file]
target/linux/brcm63xx/patches-3.13/527-board_dva-g3810bn-tl-1.patch [deleted file]
target/linux/brcm63xx/patches-3.13/528-board_nb6.patch [deleted file]
target/linux/brcm63xx/patches-3.13/529-board_fast2604.patch [deleted file]
target/linux/brcm63xx/patches-3.13/530-board_963281T_TEF.patch [deleted file]
target/linux/brcm63xx/patches-3.13/531-board_96328A-1441N1.patch [deleted file]
target/linux/brcm63xx/patches-3.13/532-board_96328a-1241N.patch [deleted file]
target/linux/brcm63xx/patches-3.13/533-board_rta770bw.patch [deleted file]
target/linux/brcm63xx/patches-3.13/534-board_hw556.patch [deleted file]
target/linux/brcm63xx/patches-3.13/535-board_rta770w.patch [deleted file]
target/linux/brcm63xx/patches-3.13/536-board_fast2704.patch [deleted file]
target/linux/brcm63xx/patches-3.13/537-board_fast2504n.patch [deleted file]
target/linux/brcm63xx/patches-3.13/550-alice_gate2_leds.patch [deleted file]
target/linux/brcm63xx/patches-3.13/551-96348gw_a_leds.patch [deleted file]
target/linux/brcm63xx/patches-3.13/552-board_96348gw-10_reset_button.patch [deleted file]
target/linux/brcm63xx/patches-3.13/553-boards_probe_switch.patch [deleted file]
target/linux/brcm63xx/patches-3.13/554-board_DWVS0_leds_buttons.patch [deleted file]
target/linux/brcm63xx/patches-3.13/555-board_96318ref.patch [deleted file]
target/linux/brcm63xx/patches-3.13/556-board_96318ref_p300.patch [deleted file]
target/linux/brcm63xx/patches-3.13/557-board_bcm963269bhr.patch [deleted file]
target/linux/brcm63xx/patches-3.13/558-board_AR1004G.patch [deleted file]
target/linux/brcm63xx/patches-3.13/559-board_vw6339gu.patch [deleted file]
target/linux/brcm63xx/patches-3.13/560-board_963268gu_p300.patch [deleted file]
target/linux/brcm63xx/patches-3.13/800-wl_exports.patch [deleted file]
target/linux/brcm63xx/patches-3.13/801-ssb_export_fallback_sprom.patch [deleted file]
target/linux/brcm63xx/patches-3.13/802-rtl8367r_fix_RGMII_support.patch [deleted file]
target/linux/brcm63xx/patches-3.14/100-MIPS-BCM63XX-add-USB-host-clock-enable-delay.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.14/101-MIPS-BCM63XX-add-USB-device-clock-enable-delay-to-cl.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.14/102-MIPS-BCM63XX-move-code-touching-the-USB-private-regi.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.14/103-MIPS-BCM63XX-add-OHCI-EHCI-configuration-bits-to-com.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.14/104-MIPS-BCM63XX-introduce-BCM63XX_OHCI-configuration-sy.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.14/105-MIPS-BCM63XX-add-support-for-the-on-chip-OHCI-contro.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.14/106-MIPS-BCM63XX-register-OHCI-controller-if-board-enabl.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.14/107-MIPS-BCM63XX-introduce-BCM63XX_EHCI-configuration-sy.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.14/108-MIPS-BCM63XX-add-support-for-the-on-chip-EHCI-contro.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.14/109-MIPS-BCM63XX-register-EHCI-controller-if-board-enabl.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.14/110-MIPS-BCM63XX-EHCI-controller-does-not-support-overcu.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.14/201-SPI-Allow-specifying-the-parsers-for-SPI-flash.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.14/202-MTD-DEVICES-m25p80-use-parsers-if-provided-in-flash-.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.14/203-MTD-DEVICES-m25p80-add-support-for-limiting-reads.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.14/204-USB-OHCI-allow-other-arches-to-use-the-BE-frame-numb.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.14/206-USB-EHCI-allow-limiting-ports-for-ehci-platform.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.14/300-reset_buttons.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.14/301-led_count.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.14/302-extended-platform-devices.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.14/303-spi-board-info.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.14/304-boardid_fixup.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.14/308-board_leds_naming.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.14/309-cfe_version_mod.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.14/310-MIPS-BCM63XX-remove-RUNTIME_DETECT-code-from-registe.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.14/311-MIPS-BCM63XX-remove-RUNTIME_DETECT-from-irq-setup-co.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.14/312-MIPS-BCM63XX-remove-RUNTIME_DETECT-from-reset-code.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.14/313-MIPS-BCM63XX-remove-RUNTIME_DETECT-code-from-gpio.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.14/314-MIPS-BCM63XX-remove-RUNTIME_DETECT-from-spi-code.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.14/315-MIPS-BCM63XX-remove-RUNTIME_DETECT-usage-from-enet-c.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.14/316-MIPS-BCM63XX-remove-RUNTIME_DETECT-in-cpu-feature-ov.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.14/317-MIPS-BCM63XX-remove-RUNTIME_DETECT-code-for-bcmcpu_g.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.14/318-MIPS-BCM63XX-rename-__dispatch_internal-to-__dispatc.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.14/319-MIPS-BCM63XX-move-bcm63xx_init_irq-down.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.14/320-MIPS-BCM63XX-replace-irq-dispatch-code-with-a-generi.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.14/321-MIPS-BCM63XX-append-irq-line-number-to-irq_-stat-mas.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.14/322-MIPS-BCM63XX-populate-irq_-stat-mask-_addr-for-secon.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.14/323-MIPS-BCM63XX-add-pin-argument-to-dispatch-internal.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.14/324-MIPS-BCM63XX-protect-irq-register-accesses.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.14/325-MIPS-BCM63XX-wire-up-the-second-cpu-s-irq-line.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.14/326-MIPS-BCM63XX-use-irq_desc-as-argument-for-un-mask.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.14/327-MIPS-BCM63XX-allow-setting-affinity-for-IPIC.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.14/328-cfe_simplify_detection.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.14/329-bcm63xxpart_use_cfedetection.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.14/330-MIPS-BCM63XX-add-a-new-cpu-variant-helper.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.14/331-MIPS-BCM63XX-define-variant-id-field.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.14/332-MIPS-BCM63XX-detect-bcm6328-variants.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.14/333-MIPS-BCM63XX-detect-BCM6362-variants.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.14/334-MIPS-BCM63XX-add-support-for-BCM6368-variants.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.14/335-MIPS-BCM63XX-fix-PCIe-memory-window-size.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.14/336-MIPS-BCM63XX-dynamically-set-the-pcie-memory-windows.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.14/337-MIPS-BCM63XX-widen-cpuid-field.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.14/338-MIPS-BCM63XX-increase-number-of-IRQs.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.14/339-MIPS-BCM63XX-add-support-for-BCM63268.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.14/340-MIPS-BCM63XX-add-pcie-support-for-BCM63268.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.14/341-MIPS-BCM63XX-add-support-for-BCM6318.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.14/342-MIPS-BCM63XX-split-PCIe-reset-signals.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.14/343-MIPS-BCM63XX-add-PCIe-support-for-BCM6318.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.14/344-MIPS-BCM63XX-detect-flash-type-early-and-store-the-r.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.14/345-MIPS-BCM63XX-fixup-mapped-SPI-flash-access-on-boot.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.14/346-MIPS-BCM63XX-USB-ENETSW-6318-clocks.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.14/347-MIPS-BCM6318-USB-support.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.14/348-MIPS-BCM63XX-fix-BCM63268-USB-clock.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.14/349-MIPS-BCM63XX-add-BCM63268-USB-support.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.14/350-MIPS-BCM63XX-support-settings-num-usbh-ports.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.14/351-set-board-usbh-ports.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.14/400-bcm963xx_flashmap.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.14/401-bcm963xx_real_rootfs_length.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.14/402_bcm63xx_enet_vlan_incoming_fixed.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.14/403-6358-enet1-external-mii-clk.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.14/404-NET-bcm63xx_enet-move-phy_-dis-connect-into-probe-re.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.14/408-bcm63xx_enet-enable-rgmii-clock-on-external-ports.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.14/411-MIPS-BCM63XX-Register-SPI-flash-if-present.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.14/412-MTD-physmap-allow-passing-pp_data.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.14/413-BCM63XX-allow-providing-fixup-data-in-board-data.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.14/414-MTD-m25p80-allow-passing-pp_data.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.14/415-MIPS-BCM63XX-export-the-attached-flash-type.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.14/416-BCM63XX-add-a-fixup-for-ath9k-devices.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.14/417-MTD-bcm63xxpart-allow-passing-a-caldata-offset.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.14/418-MIPS-BCM63XX-pass-caldata-info-to-flash.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.14/420-BCM63XX-add-endian-check-for-ath9k.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.14/421-BCM63XX-add-led-pin-for-ath9k.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.14/422-BCM63XX-add-a-fixup-for-rt2x00-devices.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.14/423-bcm63xx_enet_add_b53_support.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.14/424-bcm63xx_enet_no_request_mem_region.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.14/500-board-D4PW.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.14/501-board-NB4.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.14/502-board-96338W2_E7T.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.14/503-board-CPVA642.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.14/504-board_dsl_274xb_rev_c.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.14/505-board_spw500v.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.14/506-board_gw6200_gw6000.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.14/507-board-MAGIC.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.14/508-board_hw553.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.14/509-board_rta1320_16m.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.14/510-board_spw303v.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.14/511-board_V2500V.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.14/512-board_BTV2110.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.14/513-board_livebox.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.14/514-board_ct536_ct5621.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.14/515-board_DWV-S0_fixes.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.14/516-board_96348A-122.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.14/517-RTA1205W_16_uart_fixes.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.14/519_board_CPVA502plus.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.14/520-bcm63xx-add-support-for-96368MVWG-board.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.14/521-bcm63xx-add-support-for-96368MVNgr-board.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.14/522-MIPS-BCM63XX-add-96328avng-reference-board.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.14/523-MIPS-BCM63XX-add-963281TAN-reference-board.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.14/524-board_dsl_274xb_rev_f.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.14/525-board_96348w3.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.14/526-board_CT6373-1.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.14/527-board_dva-g3810bn-tl-1.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.14/528-board_nb6.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.14/529-board_fast2604.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.14/530-board_963281T_TEF.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.14/531-board_96328A-1441N1.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.14/532-board_96328a-1241N.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.14/533-board_rta770bw.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.14/534-board_hw556.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.14/535-board_rta770w.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.14/536-board_fast2704.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.14/537-board_fast2504n.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.14/550-alice_gate2_leds.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.14/551-96348gw_a_leds.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.14/552-board_96348gw-10_reset_button.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.14/553-boards_probe_switch.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.14/554-board_DWVS0_leds_buttons.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.14/555-board_96318ref.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.14/556-board_96318ref_p300.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.14/557-board_bcm963269bhr.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.14/558-board_AR1004G.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.14/559-board_vw6339gu.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.14/560-board_963268gu_p300.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.14/800-wl_exports.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.14/801-ssb_export_fallback_sprom.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.14/802-rtl8367r_fix_RGMII_support.patch [new file with mode: 0644]

diff --git a/target/linux/brcm63xx/config-3.13 b/target/linux/brcm63xx/config-3.13
deleted file mode 100644 (file)
index 9cf4d60..0000000
+++ /dev/null
@@ -1,195 +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_MIGHT_HAVE_PC_PARPORT=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_B53_SRAB_DRIVER is not set
-CONFIG_BCM63XX=y
-CONFIG_BCM63XX_CPU_3368=y
-CONFIG_BCM63XX_CPU_6318=y
-CONFIG_BCM63XX_CPU_63268=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=y
-CONFIG_CPU_BMIPS32_3300=y
-CONFIG_CPU_BMIPS4350=y
-CONFIG_CPU_GENERIC_DUMP_TLB=y
-CONFIG_CPU_HAS_PREFETCH=y
-CONFIG_CPU_HAS_SYNC=y
-CONFIG_CPU_MIPS32=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_DMA_NONCOHERENT=y
-CONFIG_EARLY_PRINTK=y
-# CONFIG_EARLY_PRINTK_8250 is not set
-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_IO=y
-CONFIG_GENERIC_IRQ_SHOW=y
-CONFIG_GENERIC_NET_UTILS=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_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_ARCH_TRACEHOOK=y
-# CONFIG_HAVE_BOOTMEM_INFO_NODE is not set
-CONFIG_HAVE_CLK=y
-CONFIG_HAVE_CONTEXT_TRACKING=y
-CONFIG_HAVE_C_RECORDMCOUNT=y
-CONFIG_HAVE_DEBUG_KMEMLEAK=y
-CONFIG_HAVE_DEBUG_STACKOVERFLOW=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_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_HAVE_SYSCALL_TRACEPOINTS=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_HZ_PERIODIC=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_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_NET_RX_BUSY_POLL=y
-CONFIG_NO_GENERIC_PCI_IOPORT_MAP=y
-CONFIG_PAGEFLAGS_EXTENDED=y
-CONFIG_PCI=y
-# CONFIG_PCIEAER is not set
-CONFIG_PCIEPORTBUS=y
-CONFIG_PCI_DOMAINS=y
-CONFIG_PERF_USE_VMALLOC=y
-CONFIG_PHYLIB=y
-CONFIG_POSIX_MQUEUE=y
-CONFIG_POSIX_MQUEUE_SYSCTL=y
-# CONFIG_PREEMPT_RCU is not set
-# CONFIG_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_BMIPS32_3300=y
-CONFIG_SYS_HAS_CPU_BMIPS4350=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_SYS_SUPPORTS_HOTPLUG_CPU=y
-CONFIG_SYS_SUPPORTS_SMP=y
-CONFIG_TICK_CPU_ACCOUNTING=y
-CONFIG_USB_SUPPORT=y
-CONFIG_VM_EVENT_COUNTERS=y
-CONFIG_WATCHDOG_NOWAYOUT=y
-CONFIG_WEAK_ORDERING=y
-# CONFIG_ZBUD is not set
-CONFIG_ZONE_DMA_FLAG=0
diff --git a/target/linux/brcm63xx/config-3.14 b/target/linux/brcm63xx/config-3.14
new file mode 100644 (file)
index 0000000..2ab663e
--- /dev/null
@@ -0,0 +1,199 @@
+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_MIGHT_HAVE_PC_PARPORT=y
+CONFIG_ARCH_MIGHT_HAVE_PC_SERIO=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_B53_SRAB_DRIVER is not set
+CONFIG_BCM63XX=y
+CONFIG_BCM63XX_CPU_3368=y
+CONFIG_BCM63XX_CPU_6318=y
+CONFIG_BCM63XX_CPU_63268=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=y
+CONFIG_CPU_BMIPS32_3300=y
+CONFIG_CPU_BMIPS4350=y
+CONFIG_CPU_GENERIC_DUMP_TLB=y
+CONFIG_CPU_HAS_PREFETCH=y
+CONFIG_CPU_HAS_SYNC=y
+CONFIG_CPU_MIPS32=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_DMA_NONCOHERENT=y
+CONFIG_EARLY_PRINTK=y
+# CONFIG_EARLY_PRINTK_8250 is not set
+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_IO=y
+CONFIG_GENERIC_IRQ_SHOW=y
+CONFIG_GENERIC_NET_UTILS=y
+CONFIG_GENERIC_PCI_IOMAP=y
+CONFIG_GENERIC_SMP_IDLE_THREAD=y
+CONFIG_GPIOLIB=y
+CONFIG_GPIO_DEVRES=y
+CONFIG_GPIO_SYSFS=y
+# CONFIG_HAMRADIO is not set
+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_ARCH_TRACEHOOK=y
+# CONFIG_HAVE_BOOTMEM_INFO_NODE is not set
+CONFIG_HAVE_CC_STACKPROTECTOR=y
+CONFIG_HAVE_CLK=y
+CONFIG_HAVE_CONTEXT_TRACKING=y
+CONFIG_HAVE_C_RECORDMCOUNT=y
+CONFIG_HAVE_DEBUG_KMEMLEAK=y
+CONFIG_HAVE_DEBUG_STACKOVERFLOW=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_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_HAVE_SYSCALL_TRACEPOINTS=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_HZ_PERIODIC=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_MDIO_BOARDINFO=y
+CONFIG_MIPS=y
+# CONFIG_MIPS_HUGE_TLB_SUPPORT is not set
+CONFIG_MIPS_L1_CACHE_SHIFT=4
+CONFIG_MIPS_L1_CACHE_SHIFT_4=y
+# CONFIG_MIPS_MACHINE is not set
+CONFIG_MIPS_MT_DISABLED=y
+CONFIG_MIPS_O32_FP64_SUPPORT=y
+# CONFIG_MLX5_CORE is not set
+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_NET_RX_BUSY_POLL=y
+CONFIG_NO_GENERIC_PCI_IOPORT_MAP=y
+CONFIG_PAGEFLAGS_EXTENDED=y
+CONFIG_PCI=y
+# CONFIG_PCIEAER is not set
+CONFIG_PCIEPORTBUS=y
+CONFIG_PCI_DOMAINS=y
+CONFIG_PERF_USE_VMALLOC=y
+CONFIG_PHYLIB=y
+CONFIG_POSIX_MQUEUE=y
+CONFIG_POSIX_MQUEUE_SYSCTL=y
+# CONFIG_PREEMPT_RCU is not set
+# CONFIG_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_BMIPS32_3300=y
+CONFIG_SYS_HAS_CPU_BMIPS4350=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_SYS_SUPPORTS_HOTPLUG_CPU=y
+CONFIG_SYS_SUPPORTS_SMP=y
+CONFIG_TICK_CPU_ACCOUNTING=y
+CONFIG_USB_SUPPORT=y
+CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_WATCHDOG_NOWAYOUT=y
+CONFIG_WEAK_ORDERING=y
+# CONFIG_ZBUD is not set
+CONFIG_ZONE_DMA_FLAG=0
diff --git a/target/linux/brcm63xx/patches-3.13/001-spi-add-bcm63xx-HSSPI-driver.patch b/target/linux/brcm63xx/patches-3.13/001-spi-add-bcm63xx-HSSPI-driver.patch
deleted file mode 100644 (file)
index 0cd7982..0000000
+++ /dev/null
@@ -1,531 +0,0 @@
-From 8e051b79ae3f66dbad96312fe2976401c28d2148 Mon Sep 17 00:00:00 2001
-From: Jonas Gorski <jogo@openwrt.org>
-Date: Sat, 12 Nov 2011 12:19:55 +0100
-Subject: [PATCH 5/5] spi: add bcm63xx HSSPI driver
-
-Add a driver for the High Speed SPI controller found on newer BCM63XX SoCs.
-
-It does feature some new modes like 3-wire or dual spi, but neither of it
-is currently implemented.
-
-Signed-off-by: Jonas Gorski <jogo@openwrt.org>
----
- drivers/spi/Kconfig             |   7 +
- drivers/spi/Makefile            |   1 +
- drivers/spi/spi-bcm63xx-hsspi.c | 484 ++++++++++++++++++++++++++++++++++++++++
- 3 files changed, 492 insertions(+)
- create mode 100644 drivers/spi/spi-bcm63xx-hsspi.c
-
---- a/drivers/spi/Kconfig
-+++ b/drivers/spi/Kconfig
-@@ -118,6 +118,13 @@ config SPI_BCM63XX
-       help
-           Enable support for the SPI controller on the Broadcom BCM63xx SoCs.
-+config SPI_BCM63XX_HSSPI
-+      tristate "Broadcom BCM63XX HS SPI controller driver"
-+      depends on BCM63XX || COMPILE_TEST
-+      help
-+        This enables support for the High Speed SPI controller present on
-+        newer Broadcom BCM63XX SoCs.
-+
- config SPI_BITBANG
-       tristate "Utilities for Bitbanging SPI masters"
-       help
---- a/drivers/spi/Makefile
-+++ b/drivers/spi/Makefile
-@@ -16,6 +16,7 @@ obj-$(CONFIG_SPI_ATH79)                      += spi-ath79.o
- obj-$(CONFIG_SPI_AU1550)              += spi-au1550.o
- obj-$(CONFIG_SPI_BCM2835)             += spi-bcm2835.o
- obj-$(CONFIG_SPI_BCM63XX)             += spi-bcm63xx.o
-+obj-$(CONFIG_SPI_BCM63XX_HSSPI)               += spi-bcm63xx-hsspi.o
- obj-$(CONFIG_SPI_BFIN5XX)             += spi-bfin5xx.o
- obj-$(CONFIG_SPI_BFIN_V3)               += spi-bfin-v3.o
- obj-$(CONFIG_SPI_BFIN_SPORT)          += spi-bfin-sport.o
---- /dev/null
-+++ b/drivers/spi/spi-bcm63xx-hsspi.c
-@@ -0,0 +1,484 @@
-+/*
-+ * Broadcom BCM63XX High Speed SPI Controller driver
-+ *
-+ * Copyright 2000-2010 Broadcom Corporation
-+ * Copyright 2012-2013 Jonas Gorski <jogo@openwrt.org>
-+ *
-+ * Licensed under the GNU/GPL. See COPYING for details.
-+ */
-+
-+#include <linux/kernel.h>
-+#include <linux/init.h>
-+#include <linux/io.h>
-+#include <linux/clk.h>
-+#include <linux/module.h>
-+#include <linux/platform_device.h>
-+#include <linux/delay.h>
-+#include <linux/dma-mapping.h>
-+#include <linux/err.h>
-+#include <linux/interrupt.h>
-+#include <linux/spi/spi.h>
-+#include <linux/workqueue.h>
-+#include <linux/mutex.h>
-+
-+#define HSSPI_GLOBAL_CTRL_REG                 0x0
-+#define GLOBAL_CTRL_CS_POLARITY_SHIFT         0
-+#define GLOBAL_CTRL_CS_POLARITY_MASK          0x000000ff
-+#define GLOBAL_CTRL_PLL_CLK_CTRL_SHIFT                8
-+#define GLOBAL_CTRL_PLL_CLK_CTRL_MASK         0x0000ff00
-+#define GLOBAL_CTRL_CLK_GATE_SSOFF            BIT(16)
-+#define GLOBAL_CTRL_CLK_POLARITY              BIT(17)
-+#define GLOBAL_CTRL_MOSI_IDLE                 BIT(18)
-+
-+#define HSSPI_GLOBAL_EXT_TRIGGER_REG          0x4
-+
-+#define HSSPI_INT_STATUS_REG                  0x8
-+#define HSSPI_INT_STATUS_MASKED_REG           0xc
-+#define HSSPI_INT_MASK_REG                    0x10
-+
-+#define HSSPI_PINGx_CMD_DONE(i)                       BIT((i * 8) + 0)
-+#define HSSPI_PINGx_RX_OVER(i)                        BIT((i * 8) + 1)
-+#define HSSPI_PINGx_TX_UNDER(i)                       BIT((i * 8) + 2)
-+#define HSSPI_PINGx_POLL_TIMEOUT(i)           BIT((i * 8) + 3)
-+#define HSSPI_PINGx_CTRL_INVAL(i)             BIT((i * 8) + 4)
-+
-+#define HSSPI_INT_CLEAR_ALL                   0xff001f1f
-+
-+#define HSSPI_PINGPONG_COMMAND_REG(x)         (0x80 + (x) * 0x40)
-+#define PINGPONG_CMD_COMMAND_MASK             0xf
-+#define PINGPONG_COMMAND_NOOP                 0
-+#define PINGPONG_COMMAND_START_NOW            1
-+#define PINGPONG_COMMAND_START_TRIGGER                2
-+#define PINGPONG_COMMAND_HALT                 3
-+#define PINGPONG_COMMAND_FLUSH                        4
-+#define PINGPONG_CMD_PROFILE_SHIFT            8
-+#define PINGPONG_CMD_SS_SHIFT                 12
-+
-+#define HSSPI_PINGPONG_STATUS_REG(x)          (0x84 + (x) * 0x40)
-+
-+#define HSSPI_PROFILE_CLK_CTRL_REG(x)         (0x100 + (x) * 0x20)
-+#define CLK_CTRL_FREQ_CTRL_MASK                       0x0000ffff
-+#define CLK_CTRL_SPI_CLK_2X_SEL                       BIT(14)
-+#define CLK_CTRL_ACCUM_RST_ON_LOOP            BIT(15)
-+
-+#define HSSPI_PROFILE_SIGNAL_CTRL_REG(x)      (0x104 + (x) * 0x20)
-+#define SIGNAL_CTRL_LATCH_RISING              BIT(12)
-+#define SIGNAL_CTRL_LAUNCH_RISING             BIT(13)
-+#define SIGNAL_CTRL_ASYNC_INPUT_PATH          BIT(16)
-+
-+#define HSSPI_PROFILE_MODE_CTRL_REG(x)                (0x108 + (x) * 0x20)
-+#define MODE_CTRL_MULTIDATA_RD_STRT_SHIFT     8
-+#define MODE_CTRL_MULTIDATA_WR_STRT_SHIFT     12
-+#define MODE_CTRL_MULTIDATA_RD_SIZE_SHIFT     16
-+#define MODE_CTRL_MULTIDATA_WR_SIZE_SHIFT     18
-+#define MODE_CTRL_MODE_3WIRE                  BIT(20)
-+#define MODE_CTRL_PREPENDBYTE_CNT_SHIFT               24
-+
-+#define HSSPI_FIFO_REG(x)                     (0x200 + (x) * 0x200)
-+
-+
-+#define HSSPI_OP_CODE_SHIFT                   13
-+#define HSSPI_OP_SLEEP                                (0 << HSSPI_OP_CODE_SHIFT)
-+#define HSSPI_OP_READ_WRITE                   (1 << HSSPI_OP_CODE_SHIFT)
-+#define HSSPI_OP_WRITE                                (2 << HSSPI_OP_CODE_SHIFT)
-+#define HSSPI_OP_READ                         (3 << HSSPI_OP_CODE_SHIFT)
-+#define HSSPI_OP_SETIRQ                               (4 << HSSPI_OP_CODE_SHIFT)
-+
-+#define HSSPI_BUFFER_LEN                      512
-+#define HSSPI_OPCODE_LEN                      2
-+
-+#define HSSPI_MAX_PREPEND_LEN                 15
-+
-+#define HSSPI_MAX_SYNC_CLOCK                  30000000
-+
-+#define HSSPI_BUS_NUM                         1 /* 0 is legacy SPI */
-+
-+struct bcm63xx_hsspi {
-+      struct completion done;
-+      struct mutex bus_mutex;
-+
-+      struct platform_device *pdev;
-+      struct clk *clk;
-+      void __iomem *regs;
-+      u8 __iomem *fifo;
-+
-+      u32 speed_hz;
-+      u8 cs_polarity;
-+};
-+
-+static void bcm63xx_hsspi_set_cs(struct bcm63xx_hsspi *bs, unsigned cs,
-+                               bool active)
-+{
-+      u32 reg;
-+
-+      mutex_lock(&bs->bus_mutex);
-+      reg = __raw_readl(bs->regs + HSSPI_GLOBAL_CTRL_REG);
-+
-+      reg &= ~BIT(cs);
-+      if (active == !(bs->cs_polarity & BIT(cs)))
-+              reg |= BIT(cs);
-+
-+      __raw_writel(reg, bs->regs + HSSPI_GLOBAL_CTRL_REG);
-+      mutex_unlock(&bs->bus_mutex);
-+}
-+
-+static void bcm63xx_hsspi_set_clk(struct bcm63xx_hsspi *bs,
-+                                struct spi_device *spi, int hz)
-+{
-+      unsigned profile = spi->chip_select;
-+      u32 reg;
-+
-+      reg = DIV_ROUND_UP(2048, DIV_ROUND_UP(bs->speed_hz, hz));
-+      __raw_writel(CLK_CTRL_ACCUM_RST_ON_LOOP | reg,
-+                   bs->regs + HSSPI_PROFILE_CLK_CTRL_REG(profile));
-+
-+      reg = __raw_readl(bs->regs + HSSPI_PROFILE_SIGNAL_CTRL_REG(profile));
-+      if (hz > HSSPI_MAX_SYNC_CLOCK)
-+              reg |= SIGNAL_CTRL_ASYNC_INPUT_PATH;
-+      else
-+              reg &= ~SIGNAL_CTRL_ASYNC_INPUT_PATH;
-+      __raw_writel(reg, bs->regs + HSSPI_PROFILE_SIGNAL_CTRL_REG(profile));
-+
-+      mutex_lock(&bs->bus_mutex);
-+      /* setup clock polarity */
-+      reg = __raw_readl(bs->regs + HSSPI_GLOBAL_CTRL_REG);
-+      reg &= ~GLOBAL_CTRL_CLK_POLARITY;
-+      if (spi->mode & SPI_CPOL)
-+              reg |= GLOBAL_CTRL_CLK_POLARITY;
-+      __raw_writel(reg, bs->regs + HSSPI_GLOBAL_CTRL_REG);
-+      mutex_unlock(&bs->bus_mutex);
-+}
-+
-+static int bcm63xx_hsspi_do_txrx(struct spi_device *spi, struct spi_transfer *t)
-+{
-+      struct bcm63xx_hsspi *bs = spi_master_get_devdata(spi->master);
-+      unsigned chip_select = spi->chip_select;
-+      u16 opcode = 0;
-+      int pending = t->len;
-+      int step_size = HSSPI_BUFFER_LEN;
-+      const u8 *tx = t->tx_buf;
-+      u8 *rx = t->rx_buf;
-+
-+      bcm63xx_hsspi_set_clk(bs, spi, t->speed_hz);
-+      bcm63xx_hsspi_set_cs(bs, spi->chip_select, true);
-+
-+      if (tx && rx)
-+              opcode = HSSPI_OP_READ_WRITE;
-+      else if (tx)
-+              opcode = HSSPI_OP_WRITE;
-+      else if (rx)
-+              opcode = HSSPI_OP_READ;
-+
-+      if (opcode != HSSPI_OP_READ)
-+              step_size -= HSSPI_OPCODE_LEN;
-+
-+      __raw_writel(0 << MODE_CTRL_PREPENDBYTE_CNT_SHIFT |
-+                   2 << MODE_CTRL_MULTIDATA_WR_STRT_SHIFT |
-+                   2 << MODE_CTRL_MULTIDATA_RD_STRT_SHIFT | 0xff,
-+                   bs->regs + HSSPI_PROFILE_MODE_CTRL_REG(chip_select));
-+
-+      while (pending > 0) {
-+              int curr_step = min_t(int, step_size, pending);
-+
-+              init_completion(&bs->done);
-+              if (tx) {
-+                      memcpy_toio(bs->fifo + HSSPI_OPCODE_LEN, tx, curr_step);
-+                      tx += curr_step;
-+              }
-+
-+              __raw_writew(opcode | curr_step, bs->fifo);
-+
-+              /* enable interrupt */
-+              __raw_writel(HSSPI_PINGx_CMD_DONE(0),
-+                           bs->regs + HSSPI_INT_MASK_REG);
-+
-+              /* start the transfer */
-+              __raw_writel(!chip_select << PINGPONG_CMD_SS_SHIFT |
-+                           chip_select << PINGPONG_CMD_PROFILE_SHIFT |
-+                           PINGPONG_COMMAND_START_NOW,
-+                           bs->regs + HSSPI_PINGPONG_COMMAND_REG(0));
-+
-+              if (wait_for_completion_timeout(&bs->done, HZ) == 0) {
-+                      dev_err(&bs->pdev->dev, "transfer timed out!\n");
-+                      return -ETIMEDOUT;
-+              }
-+
-+              if (rx) {
-+                      memcpy_fromio(rx, bs->fifo, curr_step);
-+                      rx += curr_step;
-+              }
-+
-+              pending -= curr_step;
-+      }
-+
-+      return 0;
-+}
-+
-+static int bcm63xx_hsspi_setup(struct spi_device *spi)
-+{
-+      struct bcm63xx_hsspi *bs = spi_master_get_devdata(spi->master);
-+      u32 reg;
-+
-+      reg = __raw_readl(bs->regs +
-+                        HSSPI_PROFILE_SIGNAL_CTRL_REG(spi->chip_select));
-+      reg &= ~(SIGNAL_CTRL_LAUNCH_RISING | SIGNAL_CTRL_LATCH_RISING);
-+      if (spi->mode & SPI_CPHA)
-+              reg |= SIGNAL_CTRL_LAUNCH_RISING;
-+      else
-+              reg |= SIGNAL_CTRL_LATCH_RISING;
-+      __raw_writel(reg, bs->regs +
-+                   HSSPI_PROFILE_SIGNAL_CTRL_REG(spi->chip_select));
-+
-+      mutex_lock(&bs->bus_mutex);
-+      reg = __raw_readl(bs->regs + HSSPI_GLOBAL_CTRL_REG);
-+
-+      /* only change actual polarities if there is no transfer */
-+      if ((reg & GLOBAL_CTRL_CS_POLARITY_MASK) == bs->cs_polarity) {
-+              if (spi->mode & SPI_CS_HIGH)
-+                      reg |= BIT(spi->chip_select);
-+              else
-+                      reg &= ~BIT(spi->chip_select);
-+              __raw_writel(reg, bs->regs + HSSPI_GLOBAL_CTRL_REG);
-+      }
-+
-+      if (spi->mode & SPI_CS_HIGH)
-+              bs->cs_polarity |= BIT(spi->chip_select);
-+      else
-+              bs->cs_polarity &= ~BIT(spi->chip_select);
-+
-+      mutex_unlock(&bs->bus_mutex);
-+
-+      return 0;
-+}
-+
-+static int bcm63xx_hsspi_transfer_one(struct spi_master *master,
-+                                    struct spi_message *msg)
-+{
-+      struct bcm63xx_hsspi *bs = spi_master_get_devdata(master);
-+      struct spi_transfer *t;
-+      struct spi_device *spi = msg->spi;
-+      int status = -EINVAL;
-+      int dummy_cs;
-+      u32 reg;
-+
-+      /* This controller does not support keeping CS active during idle.
-+       * To work around this, we use the following ugly hack:
-+       *
-+       * a. Invert the target chip select's polarity so it will be active.
-+       * b. Select a "dummy" chip select to use as the hardware target.
-+       * c. Invert the dummy chip select's polarity so it will be inactive
-+       *    during the actual transfers.
-+       * d. Tell the hardware to send to the dummy chip select. Thanks to
-+       *    the multiplexed nature of SPI the actual target will receive
-+       *    the transfer and we see its response.
-+       *
-+       * e. At the end restore the polarities again to their default values.
-+       */
-+
-+      dummy_cs = !spi->chip_select;
-+      bcm63xx_hsspi_set_cs(bs, dummy_cs, true);
-+
-+      list_for_each_entry(t, &msg->transfers, transfer_list) {
-+              status = bcm63xx_hsspi_do_txrx(spi, t);
-+              if (status)
-+                      break;
-+
-+              msg->actual_length += t->len;
-+
-+              if (t->delay_usecs)
-+                      udelay(t->delay_usecs);
-+
-+              if (t->cs_change)
-+                      bcm63xx_hsspi_set_cs(bs, spi->chip_select, false);
-+      }
-+
-+      mutex_lock(&bs->bus_mutex);
-+      reg = __raw_readl(bs->regs + HSSPI_GLOBAL_CTRL_REG);
-+      reg &= ~GLOBAL_CTRL_CS_POLARITY_MASK;
-+      reg |= bs->cs_polarity;
-+      __raw_writel(reg, bs->regs + HSSPI_GLOBAL_CTRL_REG);
-+      mutex_unlock(&bs->bus_mutex);
-+
-+      msg->status = status;
-+      spi_finalize_current_message(master);
-+
-+      return 0;
-+}
-+
-+static irqreturn_t bcm63xx_hsspi_interrupt(int irq, void *dev_id)
-+{
-+      struct bcm63xx_hsspi *bs = (struct bcm63xx_hsspi *)dev_id;
-+
-+      if (__raw_readl(bs->regs + HSSPI_INT_STATUS_MASKED_REG) == 0)
-+              return IRQ_NONE;
-+
-+      __raw_writel(HSSPI_INT_CLEAR_ALL, bs->regs + HSSPI_INT_STATUS_REG);
-+      __raw_writel(0, bs->regs + HSSPI_INT_MASK_REG);
-+
-+      complete(&bs->done);
-+
-+      return IRQ_HANDLED;
-+}
-+
-+static int bcm63xx_hsspi_probe(struct platform_device *pdev)
-+{
-+      struct spi_master *master;
-+      struct bcm63xx_hsspi *bs;
-+      struct resource *res_mem;
-+      void __iomem *regs;
-+      struct device *dev = &pdev->dev;
-+      struct clk *clk;
-+      int irq, ret;
-+      u32 reg, rate;
-+
-+      irq = platform_get_irq(pdev, 0);
-+      if (irq < 0) {
-+              dev_err(dev, "no irq\n");
-+              return -ENXIO;
-+      }
-+
-+      res_mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-+      regs = devm_request_and_ioremap(dev, res_mem);
-+      if (IS_ERR(regs))
-+              return PTR_ERR(regs);
-+
-+      clk = clk_get(dev, "hsspi");
-+
-+      if (IS_ERR(clk))
-+              return PTR_ERR(clk);
-+
-+      rate = clk_get_rate(clk);
-+      if (!rate) {
-+              ret = -EINVAL;
-+              goto out_put_clk;
-+      }
-+
-+      clk_prepare_enable(clk);
-+
-+      master = spi_alloc_master(&pdev->dev, sizeof(*bs));
-+      if (!master) {
-+              ret = -ENOMEM;
-+              goto out_disable_clk;
-+      }
-+
-+      bs = spi_master_get_devdata(master);
-+      bs->pdev = pdev;
-+      bs->clk = clk;
-+      bs->regs = regs;
-+      bs->speed_hz = rate;
-+      bs->fifo = (u8 __iomem *)(bs->regs + HSSPI_FIFO_REG(0));
-+
-+      mutex_init(&bs->bus_mutex);
-+
-+      master->bus_num = HSSPI_BUS_NUM;
-+      master->num_chipselect = 8;
-+      master->setup = bcm63xx_hsspi_setup;
-+      master->transfer_one_message = bcm63xx_hsspi_transfer_one;
-+      master->mode_bits = SPI_CPOL | SPI_CPHA | SPI_CS_HIGH;
-+      master->bits_per_word_mask = SPI_BPW_MASK(8);
-+      master->auto_runtime_pm = true;
-+
-+      platform_set_drvdata(pdev, master);
-+
-+      /* Initialize the hardware */
-+      __raw_writel(0, bs->regs + HSSPI_INT_MASK_REG);
-+
-+      /* clean up any pending interrupts */
-+      __raw_writel(HSSPI_INT_CLEAR_ALL, bs->regs + HSSPI_INT_STATUS_REG);
-+
-+      /* read out default CS polarities */
-+      reg = __raw_readl(bs->regs + HSSPI_GLOBAL_CTRL_REG);
-+      bs->cs_polarity = reg & GLOBAL_CTRL_CS_POLARITY_MASK;
-+      __raw_writel(reg | GLOBAL_CTRL_CLK_GATE_SSOFF,
-+                   bs->regs + HSSPI_GLOBAL_CTRL_REG);
-+
-+      ret = devm_request_irq(dev, irq, bcm63xx_hsspi_interrupt, IRQF_SHARED,
-+                             pdev->name, bs);
-+
-+      if (ret)
-+              goto out_put_master;
-+
-+      /* register and we are done */
-+      ret = spi_register_master(master);
-+      if (ret)
-+              goto out_put_master;
-+
-+      return 0;
-+
-+out_put_master:
-+      spi_master_put(master);
-+out_disable_clk:
-+      clk_disable_unprepare(clk);
-+out_put_clk:
-+      clk_put(clk);
-+
-+      return ret;
-+}
-+
-+
-+static int bcm63xx_hsspi_remove(struct platform_device *pdev)
-+{
-+      struct spi_master *master = platform_get_drvdata(pdev);
-+      struct bcm63xx_hsspi *bs = spi_master_get_devdata(master);
-+
-+      spi_unregister_master(master);
-+
-+      /* reset the hardware and block queue progress */
-+      __raw_writel(0, bs->regs + HSSPI_INT_MASK_REG);
-+      clk_disable_unprepare(bs->clk);
-+      clk_put(bs->clk);
-+
-+      return 0;
-+}
-+
-+#ifdef CONFIG_PM
-+static int bcm63xx_hsspi_suspend(struct device *dev)
-+{
-+      struct spi_master *master = dev_get_drvdata(dev);
-+      struct bcm63xx_hsspi *bs = spi_master_get_devdata(master);
-+
-+      spi_master_suspend(master);
-+      clk_disable(bs->clk);
-+
-+      return 0;
-+}
-+
-+static int bcm63xx_hsspi_resume(struct device *dev)
-+{
-+      struct spi_master *master = dev_get_drvdata(dev);
-+      struct bcm63xx_hsspi *bs = spi_master_get_devdata(master);
-+
-+      clk_enable(bs->clk);
-+      spi_master_resume(master);
-+
-+      return 0;
-+}
-+
-+static const struct dev_pm_ops bcm63xx_hsspi_pm_ops = {
-+      .suspend        = bcm63xx_hsspi_suspend,
-+      .resume         = bcm63xx_hsspi_resume,
-+};
-+
-+#define BCM63XX_HSSPI_PM_OPS  (&bcm63xx_hsspi_pm_ops)
-+#else
-+#define BCM63XX_HSSPI_PM_OPS  NULL
-+#endif
-+
-+
-+
-+static struct platform_driver bcm63xx_hsspi_driver = {
-+      .driver = {
-+              .name   = "bcm63xx-hsspi",
-+              .owner  = THIS_MODULE,
-+              .pm     = BCM63XX_HSSPI_PM_OPS,
-+      },
-+      .probe          = bcm63xx_hsspi_probe,
-+      .remove         = bcm63xx_hsspi_remove,
-+};
-+
-+module_platform_driver(bcm63xx_hsspi_driver);
-+
-+MODULE_ALIAS("platform:bcm63xx_hsspi");
-+MODULE_DESCRIPTION("Broadcom BCM63xx High Speed SPI Controller driver");
-+MODULE_AUTHOR("Jonas Gorski <jogo@openwrt.org>");
-+MODULE_LICENSE("GPL");
diff --git a/target/linux/brcm63xx/patches-3.13/002-MIPS-BCM63XX-expose-the-HSSPI-clock.patch b/target/linux/brcm63xx/patches-3.13/002-MIPS-BCM63XX-expose-the-HSSPI-clock.patch
deleted file mode 100644 (file)
index 38aa69a..0000000
+++ /dev/null
@@ -1,50 +0,0 @@
-From f0df10fb498c21bbb201bc81dd209ea646b5a311 Mon Sep 17 00:00:00 2001
-From: Jonas Gorski <jogo@openwrt.org>
-Date: Sat, 12 Nov 2011 12:19:09 +0100
-Subject: [PATCH 1/5] MIPS: BCM63XX: expose the HSSPI clock
-
-Signed-off-by: Jonas Gorski <jogo@openwrt.org>
----
- arch/mips/bcm63xx/clk.c | 24 ++++++++++++++++++++++++
- 1 file changed, 24 insertions(+)
-
---- a/arch/mips/bcm63xx/clk.c
-+++ b/arch/mips/bcm63xx/clk.c
-@@ -226,6 +226,28 @@ static struct clk clk_spi = {
- };
- /*
-+ * HSSPI clock
-+ */
-+static void hsspi_set(struct clk *clk, int enable)
-+{
-+      u32 mask;
-+
-+      if (BCMCPU_IS_6328())
-+              mask = CKCTL_6328_HSSPI_EN;
-+      else if (BCMCPU_IS_6362())
-+              mask = CKCTL_6362_HSSPI_EN;
-+      else
-+              return;
-+
-+      bcm_hwclock_set(mask, enable);
-+}
-+
-+static struct clk clk_hsspi = {
-+      .set    = hsspi_set,
-+};
-+
-+
-+/*
-  * XTM clock
-  */
- static void xtm_set(struct clk *clk, int enable)
-@@ -346,6 +368,8 @@ struct clk *clk_get(struct device *dev,
-               return &clk_usbd;
-       if (!strcmp(id, "spi"))
-               return &clk_spi;
-+      if (!strcmp(id, "hsspi"))
-+              return &clk_hsspi;
-       if (!strcmp(id, "xtm"))
-               return &clk_xtm;
-       if (!strcmp(id, "periph"))
diff --git a/target/linux/brcm63xx/patches-3.13/003-MIPS-BCM63XX-setup-the-HSSPI-clock-rate.patch b/target/linux/brcm63xx/patches-3.13/003-MIPS-BCM63XX-setup-the-HSSPI-clock-rate.patch
deleted file mode 100644 (file)
index c08bf00..0000000
+++ /dev/null
@@ -1,36 +0,0 @@
-From c8b7d2630d907025ce30989bddd01f4f0f13c103 Mon Sep 17 00:00:00 2001
-From: Jonas Gorski <jogo@openwrt.org>
-Date: Wed, 20 Nov 2013 17:22:40 +0100
-Subject: [PATCH 2/5] MIPS: BCM63XX: setup the HSSPI clock rate
-
-Properly set up the HSSPI clock rate depending on the SoC's PLL rate.
-
-Signed-off-by: Jonas Gorski <jogo@openwrt.org>
----
- arch/mips/bcm63xx/clk.c | 18 ++++++++++++++++++
- 1 file changed, 18 insertions(+)
-
---- a/arch/mips/bcm63xx/clk.c
-+++ b/arch/mips/bcm63xx/clk.c
-@@ -390,3 +390,21 @@ void clk_put(struct clk *clk)
- }
- EXPORT_SYMBOL(clk_put);
-+
-+#define HSSPI_PLL_HZ_6328     133333333
-+#define HSSPI_PLL_HZ_6362     400000000
-+
-+static int __init bcm63xx_clk_init(void)
-+{
-+      switch (bcm63xx_get_cpu_id()) {
-+      case BCM6328_CPU_ID:
-+              clk_hsspi.rate = HSSPI_PLL_HZ_6328;
-+              break;
-+      case BCM6362_CPU_ID:
-+              clk_hsspi.rate = HSSPI_PLL_HZ_6362;
-+              break;
-+      }
-+
-+      return 0;
-+}
-+arch_initcall(bcm63xx_clk_init);
diff --git a/target/linux/brcm63xx/patches-3.13/004-MIPS-BCM63XX-add-HSSPI-IRQ-and-register-offsets.patch b/target/linux/brcm63xx/patches-3.13/004-MIPS-BCM63XX-add-HSSPI-IRQ-and-register-offsets.patch
deleted file mode 100644 (file)
index 7bd98c1..0000000
+++ /dev/null
@@ -1,156 +0,0 @@
-From 33a6acbe47636adcd9062a0e0af7985c0df9faa5 Mon Sep 17 00:00:00 2001
-From: Jonas Gorski <jogo@openwrt.org>
-Date: Sat, 12 Nov 2011 12:19:55 +0100
-Subject: [PATCH 3/5] MIPS: BCM63XX: add HSSPI IRQ and register offsets
-
-Signed-off-by: Jonas Gorski <jogo@openwrt.org>
----
- arch/mips/include/asm/mach-bcm63xx/bcm63xx_cpu.h | 18 ++++++++++++++++++
- 1 file changed, 18 insertions(+)
-
---- a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_cpu.h
-+++ b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_cpu.h
-@@ -145,6 +145,7 @@ enum bcm63xx_regs_set {
-       RSET_UART1,
-       RSET_GPIO,
-       RSET_SPI,
-+      RSET_HSSPI,
-       RSET_UDC0,
-       RSET_OHCI0,
-       RSET_OHCI_PRIV,
-@@ -193,6 +194,7 @@ enum bcm63xx_regs_set {
- #define RSET_ENETDMAS_SIZE(chans)     (16 * (chans))
- #define RSET_ENETSW_SIZE              65536
- #define RSET_UART_SIZE                        24
-+#define RSET_HSSPI_SIZE                       1536
- #define RSET_UDC_SIZE                 256
- #define RSET_OHCI_SIZE                        256
- #define RSET_EHCI_SIZE                        256
-@@ -265,6 +267,7 @@ enum bcm63xx_regs_set {
- #define BCM_6328_UART1_BASE           (0xb0000120)
- #define BCM_6328_GPIO_BASE            (0xb0000080)
- #define BCM_6328_SPI_BASE             (0xdeadbeef)
-+#define BCM_6328_HSSPI_BASE           (0xb0001000)
- #define BCM_6328_UDC0_BASE            (0xdeadbeef)
- #define BCM_6328_USBDMA_BASE          (0xb000c000)
- #define BCM_6328_OHCI0_BASE           (0xb0002600)
-@@ -313,6 +316,7 @@ enum bcm63xx_regs_set {
- #define BCM_6338_UART1_BASE           (0xdeadbeef)
- #define BCM_6338_GPIO_BASE            (0xfffe0400)
- #define BCM_6338_SPI_BASE             (0xfffe0c00)
-+#define BCM_6338_HSSPI_BASE           (0xdeadbeef)
- #define BCM_6338_UDC0_BASE            (0xdeadbeef)
- #define BCM_6338_USBDMA_BASE          (0xfffe2400)
- #define BCM_6338_OHCI0_BASE           (0xdeadbeef)
-@@ -360,6 +364,7 @@ enum bcm63xx_regs_set {
- #define BCM_6345_UART1_BASE           (0xdeadbeef)
- #define BCM_6345_GPIO_BASE            (0xfffe0400)
- #define BCM_6345_SPI_BASE             (0xdeadbeef)
-+#define BCM_6345_HSSPI_BASE           (0xdeadbeef)
- #define BCM_6345_UDC0_BASE            (0xdeadbeef)
- #define BCM_6345_USBDMA_BASE          (0xfffe2800)
- #define BCM_6345_ENET0_BASE           (0xfffe1800)
-@@ -406,6 +411,7 @@ enum bcm63xx_regs_set {
- #define BCM_6348_UART1_BASE           (0xdeadbeef)
- #define BCM_6348_GPIO_BASE            (0xfffe0400)
- #define BCM_6348_SPI_BASE             (0xfffe0c00)
-+#define BCM_6348_HSSPI_BASE           (0xdeadbeef)
- #define BCM_6348_UDC0_BASE            (0xfffe1000)
- #define BCM_6348_USBDMA_BASE          (0xdeadbeef)
- #define BCM_6348_OHCI0_BASE           (0xfffe1b00)
-@@ -451,6 +457,7 @@ enum bcm63xx_regs_set {
- #define BCM_6358_UART1_BASE           (0xfffe0120)
- #define BCM_6358_GPIO_BASE            (0xfffe0080)
- #define BCM_6358_SPI_BASE             (0xfffe0800)
-+#define BCM_6358_HSSPI_BASE           (0xdeadbeef)
- #define BCM_6358_UDC0_BASE            (0xfffe0800)
- #define BCM_6358_USBDMA_BASE          (0xdeadbeef)
- #define BCM_6358_OHCI0_BASE           (0xfffe1400)
-@@ -553,6 +560,7 @@ enum bcm63xx_regs_set {
- #define BCM_6368_UART1_BASE           (0xb0000120)
- #define BCM_6368_GPIO_BASE            (0xb0000080)
- #define BCM_6368_SPI_BASE             (0xb0000800)
-+#define BCM_6368_HSSPI_BASE           (0xdeadbeef)
- #define BCM_6368_UDC0_BASE            (0xdeadbeef)
- #define BCM_6368_USBDMA_BASE          (0xb0004800)
- #define BCM_6368_OHCI0_BASE           (0xb0001600)
-@@ -604,6 +612,7 @@ extern const unsigned long *bcm63xx_regs
-       __GEN_RSET_BASE(__cpu, UART1)                                   \
-       __GEN_RSET_BASE(__cpu, GPIO)                                    \
-       __GEN_RSET_BASE(__cpu, SPI)                                     \
-+      __GEN_RSET_BASE(__cpu, HSSPI)                                   \
-       __GEN_RSET_BASE(__cpu, UDC0)                                    \
-       __GEN_RSET_BASE(__cpu, OHCI0)                                   \
-       __GEN_RSET_BASE(__cpu, OHCI_PRIV)                               \
-@@ -647,6 +656,7 @@ extern const unsigned long *bcm63xx_regs
-       [RSET_UART1]            = BCM_## __cpu ##_UART1_BASE,           \
-       [RSET_GPIO]             = BCM_## __cpu ##_GPIO_BASE,            \
-       [RSET_SPI]              = BCM_## __cpu ##_SPI_BASE,             \
-+      [RSET_HSSPI]            = BCM_## __cpu ##_HSSPI_BASE,           \
-       [RSET_UDC0]             = BCM_## __cpu ##_UDC0_BASE,            \
-       [RSET_OHCI0]            = BCM_## __cpu ##_OHCI0_BASE,           \
-       [RSET_OHCI_PRIV]        = BCM_## __cpu ##_OHCI_PRIV_BASE,       \
-@@ -727,6 +737,7 @@ enum bcm63xx_irq {
-       IRQ_ENET0,
-       IRQ_ENET1,
-       IRQ_ENET_PHY,
-+      IRQ_HSSPI,
-       IRQ_OHCI0,
-       IRQ_EHCI0,
-       IRQ_USBD,
-@@ -815,6 +826,7 @@ enum bcm63xx_irq {
- #define BCM_6328_ENET0_IRQ            0
- #define BCM_6328_ENET1_IRQ            0
- #define BCM_6328_ENET_PHY_IRQ         (IRQ_INTERNAL_BASE + 12)
-+#define BCM_6328_HSSPI_IRQ            (IRQ_INTERNAL_BASE + 29)
- #define BCM_6328_OHCI0_IRQ            (BCM_6328_HIGH_IRQ_BASE + 9)
- #define BCM_6328_EHCI0_IRQ            (BCM_6328_HIGH_IRQ_BASE + 10)
- #define BCM_6328_USBD_IRQ             (IRQ_INTERNAL_BASE + 4)
-@@ -860,6 +872,7 @@ enum bcm63xx_irq {
- #define BCM_6338_ENET0_IRQ            (IRQ_INTERNAL_BASE + 8)
- #define BCM_6338_ENET1_IRQ            0
- #define BCM_6338_ENET_PHY_IRQ         (IRQ_INTERNAL_BASE + 9)
-+#define BCM_6338_HSSPI_IRQ            0
- #define BCM_6338_OHCI0_IRQ            0
- #define BCM_6338_EHCI0_IRQ            0
- #define BCM_6338_USBD_IRQ             0
-@@ -898,6 +911,7 @@ enum bcm63xx_irq {
- #define BCM_6345_ENET0_IRQ            (IRQ_INTERNAL_BASE + 8)
- #define BCM_6345_ENET1_IRQ            0
- #define BCM_6345_ENET_PHY_IRQ         (IRQ_INTERNAL_BASE + 12)
-+#define BCM_6345_HSSPI_IRQ            0
- #define BCM_6345_OHCI0_IRQ            0
- #define BCM_6345_EHCI0_IRQ            0
- #define BCM_6345_USBD_IRQ             0
-@@ -936,6 +950,7 @@ enum bcm63xx_irq {
- #define BCM_6348_ENET0_IRQ            (IRQ_INTERNAL_BASE + 8)
- #define BCM_6348_ENET1_IRQ            (IRQ_INTERNAL_BASE + 7)
- #define BCM_6348_ENET_PHY_IRQ         (IRQ_INTERNAL_BASE + 9)
-+#define BCM_6348_HSSPI_IRQ            0
- #define BCM_6348_OHCI0_IRQ            (IRQ_INTERNAL_BASE + 12)
- #define BCM_6348_EHCI0_IRQ            0
- #define BCM_6348_USBD_IRQ             0
-@@ -974,6 +989,7 @@ enum bcm63xx_irq {
- #define BCM_6358_ENET0_IRQ            (IRQ_INTERNAL_BASE + 8)
- #define BCM_6358_ENET1_IRQ            (IRQ_INTERNAL_BASE + 6)
- #define BCM_6358_ENET_PHY_IRQ         (IRQ_INTERNAL_BASE + 9)
-+#define BCM_6358_HSSPI_IRQ            0
- #define BCM_6358_OHCI0_IRQ            (IRQ_INTERNAL_BASE + 5)
- #define BCM_6358_EHCI0_IRQ            (IRQ_INTERNAL_BASE + 10)
- #define BCM_6358_USBD_IRQ             0
-@@ -1086,6 +1102,7 @@ enum bcm63xx_irq {
- #define BCM_6368_ENET0_IRQ            0
- #define BCM_6368_ENET1_IRQ            0
- #define BCM_6368_ENET_PHY_IRQ         (IRQ_INTERNAL_BASE + 15)
-+#define BCM_6368_HSSPI_IRQ            0
- #define BCM_6368_OHCI0_IRQ            (IRQ_INTERNAL_BASE + 5)
- #define BCM_6368_EHCI0_IRQ            (IRQ_INTERNAL_BASE + 7)
- #define BCM_6368_USBD_IRQ             (IRQ_INTERNAL_BASE + 8)
-@@ -1133,6 +1150,7 @@ extern const int *bcm63xx_irqs;
-       [IRQ_ENET0]             = BCM_## __cpu ##_ENET0_IRQ,            \
-       [IRQ_ENET1]             = BCM_## __cpu ##_ENET1_IRQ,            \
-       [IRQ_ENET_PHY]          = BCM_## __cpu ##_ENET_PHY_IRQ,         \
-+      [IRQ_HSSPI]             = BCM_## __cpu ##_HSSPI_IRQ,            \
-       [IRQ_OHCI0]             = BCM_## __cpu ##_OHCI0_IRQ,            \
-       [IRQ_EHCI0]             = BCM_## __cpu ##_EHCI0_IRQ,            \
-       [IRQ_USBD]              = BCM_## __cpu ##_USBD_IRQ,             \
diff --git a/target/linux/brcm63xx/patches-3.13/005-MIPS-BCM63XX-add-HSSPI-platform-device-and-register-.patch b/target/linux/brcm63xx/patches-3.13/005-MIPS-BCM63XX-add-HSSPI-platform-device-and-register-.patch
deleted file mode 100644 (file)
index b20cf2c..0000000
+++ /dev/null
@@ -1,107 +0,0 @@
-From ad04c99347cf9e583457f7258e97f0be22fad2ec Mon Sep 17 00:00:00 2001
-From: Jonas Gorski <jogo@openwrt.org>
-Date: Sat, 12 Nov 2011 12:18:26 +0100
-Subject: [PATCH 4/5] MIPS: BCM63XX: add HSSPI platform device and register it
-
-Signed-off-by: Jonas Gorski <jogo@openwrt.org>
----
- arch/mips/bcm63xx/Makefile                         |  4 +-
- arch/mips/bcm63xx/boards/board_bcm963xx.c          |  3 ++
- arch/mips/bcm63xx/dev-hsspi.c                      | 47 ++++++++++++++++++++++
- .../include/asm/mach-bcm63xx/bcm63xx_dev_hsspi.h   |  8 ++++
- 4 files changed, 60 insertions(+), 2 deletions(-)
- create mode 100644 arch/mips/bcm63xx/dev-hsspi.c
- create mode 100644 arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_hsspi.h
-
---- a/arch/mips/bcm63xx/Makefile
-+++ b/arch/mips/bcm63xx/Makefile
-@@ -1,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-pcmcia.o dev-rng.o dev-spi.o dev-hsspi.o dev-uart.o \
-+                 dev-wdt.o dev-usb-usbd.o
- obj-$(CONFIG_EARLY_PRINTK)    += early_printk.o
- obj-y         += boards/
---- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
-+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -23,6 +23,7 @@
- #include <bcm63xx_dev_enet.h>
- #include <bcm63xx_dev_dsp.h>
- #include <bcm63xx_dev_flash.h>
-+#include <bcm63xx_dev_hsspi.h>
- #include <bcm63xx_dev_pcmcia.h>
- #include <bcm63xx_dev_spi.h>
- #include <bcm63xx_dev_usb_usbd.h>
-@@ -915,6 +916,8 @@ int __init board_register_devices(void)
-       bcm63xx_spi_register();
-+      bcm63xx_hsspi_register();
-+
-       bcm63xx_flash_register();
-       bcm63xx_led_data.num_leds = ARRAY_SIZE(board.leds);
---- /dev/null
-+++ b/arch/mips/bcm63xx/dev-hsspi.c
-@@ -0,0 +1,47 @@
-+/*
-+ * This file is subject to the terms and conditions of the GNU General Public
-+ * License.  See the file "COPYING" in the main directory of this archive
-+ * for more details.
-+ *
-+ * Copyright (C) 2012 Jonas Gorski <jonas.gorski@gmail.com>
-+ */
-+
-+#include <linux/init.h>
-+#include <linux/kernel.h>
-+#include <linux/platform_device.h>
-+
-+#include <bcm63xx_cpu.h>
-+#include <bcm63xx_dev_hsspi.h>
-+#include <bcm63xx_regs.h>
-+
-+static struct resource spi_resources[] = {
-+      {
-+              .start          = -1, /* filled at runtime */
-+              .end            = -1, /* filled at runtime */
-+              .flags          = IORESOURCE_MEM,
-+      },
-+      {
-+              .start          = -1, /* filled at runtime */
-+              .flags          = IORESOURCE_IRQ,
-+      },
-+};
-+
-+static struct platform_device bcm63xx_hsspi_device = {
-+      .name           = "bcm63xx-hsspi",
-+      .id             = 0,
-+      .num_resources  = ARRAY_SIZE(spi_resources),
-+      .resource       = spi_resources,
-+};
-+
-+int __init bcm63xx_hsspi_register(void)
-+{
-+      if (!BCMCPU_IS_6328() && !BCMCPU_IS_6362())
-+              return -ENODEV;
-+
-+      spi_resources[0].start = bcm63xx_regset_address(RSET_HSSPI);
-+      spi_resources[0].end = spi_resources[0].start;
-+      spi_resources[0].end += RSET_HSSPI_SIZE - 1;
-+      spi_resources[1].start = bcm63xx_get_irq_number(IRQ_HSSPI);
-+
-+      return platform_device_register(&bcm63xx_hsspi_device);
-+}
---- /dev/null
-+++ b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_hsspi.h
-@@ -0,0 +1,8 @@
-+#ifndef BCM63XX_DEV_HSSPI_H
-+#define BCM63XX_DEV_HSSPI_H
-+
-+#include <linux/types.h>
-+
-+int bcm63xx_hsspi_register(void);
-+
-+#endif /* BCM63XX_DEV_HSSPI_H */
diff --git a/target/linux/brcm63xx/patches-3.13/006-spi-bcm63xx-don-t-reject-reads-256-bytes.patch b/target/linux/brcm63xx/patches-3.13/006-spi-bcm63xx-don-t-reject-reads-256-bytes.patch
deleted file mode 100644 (file)
index 60abbda..0000000
+++ /dev/null
@@ -1,31 +0,0 @@
-From 4d8fa9d3d1fe1d70fe7d59537acf49797f6010a1 Mon Sep 17 00:00:00 2001
-From: Jonas Gorski <jogo@openwrt.org>
-Date: Sun, 1 Dec 2013 16:19:46 +0100
-Subject: [PATCH 2/2] spi/bcm63xx: don't reject reads >= 256 bytes
-
-The rx_tail register is only 8 bit wide, so it will wrap around
-after 256 read bytes. This makes it rather meaningless, so drop any
-usage of it to not treat reads over 256 as failed.
-
-Signed-off-by: Jonas Gorski <jogo@openwrt.org>
----
- drivers/spi/spi-bcm63xx.c | 8 +-------
- 1 file changed, 1 insertion(+), 7 deletions(-)
-
---- a/drivers/spi/spi-bcm63xx.c
-+++ b/drivers/spi/spi-bcm63xx.c
-@@ -205,13 +205,7 @@ static int bcm63xx_txrx_bufs(struct spi_
-       if (!timeout)
-               return -ETIMEDOUT;
--      /* read out all data */
--      rx_tail = bcm_spi_readb(bs, SPI_RX_TAIL);
--
--      if (do_rx && rx_tail != len)
--              return -EIO;
--
--      if (!rx_tail)
-+      if (!do_rx)
-               return 0;
-       len = 0;
diff --git a/target/linux/brcm63xx/patches-3.13/007-MIPS-BCM63XX-disable-SMP-also-on-BCM3368.patch b/target/linux/brcm63xx/patches-3.13/007-MIPS-BCM63XX-disable-SMP-also-on-BCM3368.patch
deleted file mode 100644 (file)
index b50f0b8..0000000
+++ /dev/null
@@ -1,36 +0,0 @@
-From 8bd8f46cbc709974b26396aa440133db4484015e Mon Sep 17 00:00:00 2001
-From: Jonas Gorski <jogo@openwrt.org>
-Date: Fri, 28 Jun 2013 00:25:13 +0200
-Subject: [PATCH V2 01/13] 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)
-               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.
-+               * 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.13/008-MIPS-allow-asm-cpu.h-to-be-included-from-assembly.patch b/target/linux/brcm63xx/patches-3.13/008-MIPS-allow-asm-cpu.h-to-be-included-from-assembly.patch
deleted file mode 100644 (file)
index 92b7f98..0000000
+++ /dev/null
@@ -1,31 +0,0 @@
-From 72a1c3ad0392d7b42bf50e6ecade63a775166c73 Mon Sep 17 00:00:00 2001
-From: Jonas Gorski <jogo@openwrt.org>
-Date: Thu, 27 Jun 2013 21:32:41 +0200
-Subject: [PATCH V2 02/13] 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
-@@ -249,6 +249,8 @@
- #define FPIR_IMP_NONE         0x0000
-+#if !defined(__ASSEMBLY__)
-+
- enum cpu_type_enum {
-       CPU_UNKNOWN,
-@@ -301,6 +303,7 @@ enum cpu_type_enum {
-       CPU_LAST
- };
-+#endif /* !__ASSEMBLY */
- /*
-  * ISA Level encodings
diff --git a/target/linux/brcm63xx/patches-3.13/009-MIPS-BMIPS-change-compile-time-checks-to-runtime-che.patch b/target/linux/brcm63xx/patches-3.13/009-MIPS-BMIPS-change-compile-time-checks-to-runtime-che.patch
deleted file mode 100644 (file)
index 2f56f15..0000000
+++ /dev/null
@@ -1,602 +0,0 @@
-From 7d790bd6cab314462a29ba194e243b8b1d529524 Mon Sep 17 00:00:00 2001
-From: Jonas Gorski <jogo@openwrt.org>
-Date: Thu, 27 Jun 2013 21:33:56 +0200
-Subject: [PATCH V2 03/13] 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.
-
-Since BMIPS43XX and BMIPS5000 require different IPI implementations,
-split the SMP ops into one for each, so the runtime overhead is only
-at registration time for them.
-
-Signed-off-by: Jonas Gorski <jogo@openwrt.org>
----
-V1 -> V2:
-  * use switch (cpu_type()) instead of if () else if () ...
-  * split the smp ops into bmips43xx and bmips5000
-
- arch/mips/bcm63xx/prom.c      |   2 +-
- arch/mips/include/asm/bmips.h |   3 +-
- arch/mips/kernel/bmips_vec.S  |  55 ++++++--
- arch/mips/kernel/smp-bmips.c  | 312 +++++++++++++++++++++++++-----------------
- 4 files changed, 235 insertions(+), 137 deletions(-)
-
---- a/arch/mips/bcm63xx/prom.c
-+++ b/arch/mips/bcm63xx/prom.c
-@@ -61,7 +61,7 @@ void __init prom_init(void)
-       if (IS_ENABLED(CONFIG_CPU_BMIPS4350) && IS_ENABLED(CONFIG_SMP)) {
-               /* set up SMP */
--              register_smp_ops(&bmips_smp_ops);
-+              register_smp_ops(&bmips43xx_smp_ops);
-               /*
-                * BCM6328 might not have its second CPU enabled, while BCM3368
---- a/arch/mips/include/asm/bmips.h
-+++ b/arch/mips/include/asm/bmips.h
-@@ -47,7 +47,8 @@
- #include <linux/cpumask.h>
- #include <asm/r4kcache.h>
--extern struct plat_smp_ops bmips_smp_ops;
-+extern struct plat_smp_ops bmips43xx_smp_ops;
-+extern struct plat_smp_ops bmips5000_smp_ops;
- extern char bmips_reset_nmi_vec;
- extern char bmips_reset_nmi_vec_end;
- extern char bmips_smp_movevec;
---- 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>
-@@ -91,12 +92,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 */
-@@ -139,7 +146,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
-@@ -150,14 +162,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,10 @@ cpumask_t bmips_booted_mask;
- unsigned long bmips_smp_boot_sp;
- unsigned long bmips_smp_boot_gp;
--static void bmips_send_ipi_single(int cpu, unsigned int action);
--static irqreturn_t bmips_ipi_interrupt(int irq, void *dev_id);
-+static void bmips43xx_send_ipi_single(int cpu, unsigned int action);
-+static void bmips5000_send_ipi_single(int cpu, unsigned int action);
-+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)
-@@ -64,49 +66,58 @@ static irqreturn_t bmips_ipi_interrupt(i
- static void __init bmips_smp_setup(void)
- {
-       int i, cpu = 1, boot_cpu = 0;
--
--#if defined(CONFIG_CPU_BMIPS4350) || defined(CONFIG_CPU_BMIPS4380)
-       int cpu_hw_intr;
--      /* 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 (boot_cpu == 0)
--              cpu_hw_intr = 0x02;
--      else
--              cpu_hw_intr = 0x1d;
--
--      change_c0_brcm_cmt_intr(0xf8018000, (cpu_hw_intr << 27) | (0x03 << 15));
--
--      /* 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);
--
--      /* N cores, 2 threads per core */
--      max_cpus = (((read_c0_brcm_config() >> 6) & 0x03) + 1) << 1;
-+      switch (current_cpu_type()) {
-+      case CPU_BMIPS4350:
-+      case 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 (boot_cpu == 0)
-+                      cpu_hw_intr = 0x02;
-+              else
-+                      cpu_hw_intr = 0x1d;
-+
-+              change_c0_brcm_cmt_intr(0xf8018000,
-+                                      (cpu_hw_intr << 27) | (0x03 << 15));
-+
-+              /* single core, 2 threads (2 pipelines) */
-+              max_cpus = 2;
-+
-+              break;
-+      case 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);
-+
-+              /* 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));
-+              }
--      /* 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));
-+              break;
-+      default:
-+              max_cpus = 1;
-       }
--#endif
-       if (!bmips_smp_enabled)
-               max_cpus = 1;
-@@ -134,6 +145,20 @@ 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);
-+
-+      switch (current_cpu_type()) {
-+      case CPU_BMIPS4350:
-+      case CPU_BMIPS4380:
-+              bmips_ipi_interrupt = bmips43xx_ipi_interrupt;
-+              break;
-+      case CPU_BMIPS5000:
-+              bmips_ipi_interrupt = bmips5000_ipi_interrupt;
-+              break;
-+      default:
-+              return;
-+      }
-+
-       if (request_irq(IPI0_IRQ, bmips_ipi_interrupt, IRQF_PERCPU,
-                       "smp_ipi0", NULL))
-               panic("Can't request IPI0 interrupt");
-@@ -168,26 +193,39 @@ static void bmips_boot_secondary(int cpu
-       pr_info("SMP: Booting CPU%d...\n", cpu);
--      if (cpumask_test_cpu(cpu, &bmips_booted_mask))
--              bmips_send_ipi_single(cpu, 0);
-+      if (cpumask_test_cpu(cpu, &bmips_booted_mask)) {
-+              switch (current_cpu_type()) {
-+              case CPU_BMIPS4350:
-+              case CPU_BMIPS4380:
-+                      bmips43xx_send_ipi_single(cpu, 0);
-+                      break;
-+              case CPU_BMIPS5000:
-+                      bmips5000_send_ipi_single(cpu, 0);
-+                      break;
-+              }
-+      }
-       else {
--#if defined(CONFIG_CPU_BMIPS4350) || defined(CONFIG_CPU_BMIPS4380)
--              /* Reset slave TP1 if booting from TP0 */
--              if (cpu_logical_map(cpu) == 1)
--                      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);
-+              switch (current_cpu_type()) {
-+              case CPU_BMIPS4350:
-+              case CPU_BMIPS4380:
-+                      /* Reset slave TP1 if booting from TP0 */
-+                      if (cpu_logical_map(cpu) == 1)
-+                              set_c0_brcm_cmt_ctrl(0x01);
-+                      break;
-+              case 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);
-+                      }
-+                      break;
-               }
--#endif
-               cpumask_set_cpu(cpu, &bmips_booted_mask);
-       }
- }
-@@ -199,26 +237,32 @@ 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();
-+      void __iomem *cbr;
-       unsigned long old_vec;
-       unsigned long relo_vector;
-       int boot_cpu;
--      boot_cpu = !!(read_c0_brcm_cmt_local() & (1 << 31));
--      relo_vector = boot_cpu ? BMIPS_RELO_VECTOR_CONTROL_0 :
--                        BMIPS_RELO_VECTOR_CONTROL_1;
--
--      old_vec = __raw_readl(cbr + relo_vector);
--      __raw_writel(old_vec & ~0x20000000, cbr + relo_vector);
--
--      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));
-+      switch (current_cpu_type()) {
-+      case CPU_BMIPS4350:
-+      case CPU_BMIPS4380:
-+              cbr = BMIPS_GET_CBR();
-+
-+              boot_cpu = !!(read_c0_brcm_cmt_local() & (1 << 31));
-+              relo_vector = boot_cpu ? BMIPS_RELO_VECTOR_CONTROL_0 :
-+                                BMIPS_RELO_VECTOR_CONTROL_1;
-+
-+              old_vec = __raw_readl(cbr + relo_vector);
-+              __raw_writel(old_vec & ~0x20000000, cbr + relo_vector);
-+
-+              clear_c0_cause(smp_processor_id() ? C_SW1 : C_SW0);
-+              break;
-+      case CPU_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));
-+              break;
-+      }
- }
- /*
-@@ -243,8 +287,6 @@ static void bmips_cpus_done(void)
- {
- }
--#if defined(CONFIG_CPU_BMIPS5000)
--
- /*
-  * BMIPS5000 raceless IPIs
-  *
-@@ -253,12 +295,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;
-@@ -272,7 +314,14 @@ static irqreturn_t bmips_ipi_interrupt(i
-       return IRQ_HANDLED;
- }
--#else
-+static void bmips5000_send_ipi_mask(const struct cpumask *mask,
-+      unsigned int action)
-+{
-+      unsigned int i;
-+
-+      for_each_cpu(i, mask)
-+              bmips5000_send_ipi_single(i, action);
-+}
- /*
-  * BMIPS43xx racey IPIs
-@@ -287,7 +336,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;
-@@ -298,7 +347,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;
-@@ -317,15 +366,13 @@ static irqreturn_t bmips_ipi_interrupt(i
-       return IRQ_HANDLED;
- }
--#endif /* BMIPS type */
--
--static void bmips_send_ipi_mask(const struct cpumask *mask,
-+static void bmips43xx_send_ipi_mask(const struct cpumask *mask,
-       unsigned int action)
- {
-       unsigned int i;
-       for_each_cpu(i, mask)
--              bmips_send_ipi_single(i, action);
-+              bmips43xx_send_ipi_single(i, action);
- }
- #ifdef CONFIG_HOTPLUG_CPU
-@@ -381,15 +428,30 @@ void __ref play_dead(void)
- #endif /* CONFIG_HOTPLUG_CPU */
--struct plat_smp_ops bmips_smp_ops = {
-+struct plat_smp_ops bmips43xx_smp_ops = {
-+      .smp_setup              = bmips_smp_setup,
-+      .prepare_cpus           = bmips_prepare_cpus,
-+      .boot_secondary         = bmips_boot_secondary,
-+      .smp_finish             = bmips_smp_finish,
-+      .init_secondary         = bmips_init_secondary,
-+      .cpus_done              = bmips_cpus_done,
-+      .send_ipi_single        = bmips43xx_send_ipi_single,
-+      .send_ipi_mask          = bmips43xx_send_ipi_mask,
-+#ifdef CONFIG_HOTPLUG_CPU
-+      .cpu_disable            = bmips_cpu_disable,
-+      .cpu_die                = bmips_cpu_die,
-+#endif
-+};
-+
-+struct plat_smp_ops bmips5000_smp_ops = {
-       .smp_setup              = bmips_smp_setup,
-       .prepare_cpus           = bmips_prepare_cpus,
-       .boot_secondary         = bmips_boot_secondary,
-       .smp_finish             = bmips_smp_finish,
-       .init_secondary         = bmips_init_secondary,
-       .cpus_done              = bmips_cpus_done,
--      .send_ipi_single        = bmips_send_ipi_single,
--      .send_ipi_mask          = bmips_send_ipi_mask,
-+      .send_ipi_single        = bmips5000_send_ipi_single,
-+      .send_ipi_mask          = bmips5000_send_ipi_mask,
- #ifdef CONFIG_HOTPLUG_CPU
-       .cpu_disable            = bmips_cpu_disable,
-       .cpu_die                = bmips_cpu_die,
-@@ -427,43 +489,47 @@ void 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
-+      switch (current_cpu_type()) {
-+      case 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;
-+      case 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);
-+              break;
-+      case 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);
-+              break;
-+      default:
-+              return;
-+      }
-+
-       board_nmi_handler_setup = &bmips_nmi_handler_setup;
-       ebase = new_ebase;
- }
diff --git a/target/linux/brcm63xx/patches-3.13/010-MIPS-BMIPS-merge-CPU-options-into-one-option.patch b/target/linux/brcm63xx/patches-3.13/010-MIPS-BMIPS-merge-CPU-options-into-one-option.patch
deleted file mode 100644 (file)
index 0bf6db8..0000000
+++ /dev/null
@@ -1,137 +0,0 @@
-From 81d6f5e024884ce904b7bd36fec60291d751df48 Mon Sep 17 00:00:00 2001
-From: Jonas Gorski <jogo@openwrt.org>
-Date: Thu, 27 Jun 2013 23:57:20 +0200
-Subject: [PATCH V2 04/13] 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 BMIPS5000.
-
-Signed-off-by: Jonas Gorski <jogo@openwrt.org>
----
-V1 -> V2:
- * Let the SYS_HAS_CPU_BMIPS* symbols select SYS_HAS_CPU_BMIPS instead of
-   requiring users to select it
-
- arch/mips/Kconfig | 80 +++++++++++++++++++++++++++----------------------------
- 1 file changed, 39 insertions(+), 41 deletions(-)
-
---- a/arch/mips/Kconfig
-+++ b/arch/mips/Kconfig
-@@ -1396,41 +1396,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_BMIPS4380 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"
-@@ -1513,14 +1493,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
-@@ -1594,17 +1585,24 @@ config SYS_HAS_CPU_SB1
- config SYS_HAS_CPU_CAVIUM_OCTEON
-       bool
-+config SYS_HAS_CPU_BMIPS
-+      bool
-+
- config SYS_HAS_CPU_BMIPS3300
-       bool
-+      select SYS_HAS_CPU_BMIPS
- config SYS_HAS_CPU_BMIPS4350
-       bool
-+      select SYS_HAS_CPU_BMIPS
- config SYS_HAS_CPU_BMIPS4380
-       bool
-+      select SYS_HAS_CPU_BMIPS
- config SYS_HAS_CPU_BMIPS5000
-       bool
-+      select SYS_HAS_CPU_BMIPS
- config SYS_HAS_CPU_XLR
-       bool
diff --git a/target/linux/brcm63xx/patches-3.13/011-MIPS-BMIPS-select-CPU_SUPPORTS_HIGHMEM.patch b/target/linux/brcm63xx/patches-3.13/011-MIPS-BMIPS-select-CPU_SUPPORTS_HIGHMEM.patch
deleted file mode 100644 (file)
index 2c66d56..0000000
+++ /dev/null
@@ -1,30 +0,0 @@
-From 89d4a38dde99a6b141e90860fca594a9ac66336b Mon Sep 17 00:00:00 2001
-From: Jonas Gorski <jogo@openwrt.org>
-Date: Tue, 16 Jul 2013 14:02:57 +0200
-Subject: [PATCH V2 05/13] MIPS: BMIPS: select CPU_SUPPORTS_HIGHMEM
-
-All BMIPS CPUs support HIGHMEM, so it should be selected by CPU_BMIPS.
-
-Signed-off-by: Jonas Gorski <jogo@openwrt.org>
----
- arch/mips/Kconfig | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/arch/mips/Kconfig
-+++ b/arch/mips/Kconfig
-@@ -1409,6 +1409,7 @@ config CPU_BMIPS
-       select IRQ_CPU
-       select SWAP_IO_SPACE
-       select WEAK_ORDERING
-+      select CPU_SUPPORTS_HIGHMEM
-       help
-         Support for BMIPS3300/4350/4380 and BMIPS5000 processors.
-@@ -1508,7 +1509,6 @@ config CPU_BMIPS4380
- config CPU_BMIPS5000
-       bool
--      select CPU_SUPPORTS_HIGHMEM
-       select MIPS_CPU_SCACHE
-       select SYS_SUPPORTS_SMP
-       select SYS_SUPPORTS_HOTPLUG_CPU
diff --git a/target/linux/brcm63xx/patches-3.13/012-MIPS-BMIPS-select-CPU_HAS_PREFETCH.patch b/target/linux/brcm63xx/patches-3.13/012-MIPS-BMIPS-select-CPU_HAS_PREFETCH.patch
deleted file mode 100644 (file)
index 733dc04..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-From 58827e709eb7a2e0899260893a5c9c58eb0c5db1 Mon Sep 17 00:00:00 2001
-From: Jonas Gorski <jogo@openwrt.org>
-Date: Tue, 16 Jul 2013 14:04:40 +0200
-Subject: [PATCH V2 06/13] MIPS: BMIPS: select CPU_HAS_PREFETCH
-
-As they are MIPS32 CPUs they do support the prefetch opcode.
-
-Signed-off-by: Jonas Gorski <jogo@openwrt.org>
----
- arch/mips/Kconfig | 1 +
- 1 file changed, 1 insertion(+)
-
---- a/arch/mips/Kconfig
-+++ b/arch/mips/Kconfig
-@@ -1410,6 +1410,7 @@ config CPU_BMIPS
-       select SWAP_IO_SPACE
-       select WEAK_ORDERING
-       select CPU_SUPPORTS_HIGHMEM
-+      select CPU_HAS_PREFETCH
-       help
-         Support for BMIPS3300/4350/4380 and BMIPS5000 processors.
diff --git a/target/linux/brcm63xx/patches-3.13/013-MIPS-BMIPS-extend-BMIPS3300-to-include-BMIPS32.patch b/target/linux/brcm63xx/patches-3.13/013-MIPS-BMIPS-extend-BMIPS3300-to-include-BMIPS32.patch
deleted file mode 100644 (file)
index a5667ad..0000000
+++ /dev/null
@@ -1,52 +0,0 @@
-From e742d5b77ec18926293ec5d101470522f67ee159 Mon Sep 17 00:00:00 2001
-From: Jonas Gorski <jogo@openwrt.org>
-Date: Thu, 15 Aug 2013 12:10:11 +0200
-Subject: [PATCH V2 07/13] MIPS: BMIPS: extend BMIPS3300 to include BMIPS32
-
-Codewise there is no difference between these two, so it does not make
-sense to treat them differently. Also chip families having one of these
-tend to have the other.
-
-Signed-off-by: Jonas Gorski <jogo@openwrt.org>
----
- arch/mips/Kconfig | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
---- a/arch/mips/Kconfig
-+++ b/arch/mips/Kconfig
-@@ -1400,7 +1400,7 @@ 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_BMIPS32_3300 if SYS_HAS_CPU_BMIPS32_3300
-       select CPU_BMIPS4350 if SYS_HAS_CPU_BMIPS4350
-       select CPU_BMIPS4380 if SYS_HAS_CPU_BMIPS4380
-       select CPU_BMIPS5000 if SYS_HAS_CPU_BMIPS5000
-@@ -1412,7 +1412,7 @@ config CPU_BMIPS
-       select CPU_SUPPORTS_HIGHMEM
-       select CPU_HAS_PREFETCH
-       help
--        Support for BMIPS3300/4350/4380 and BMIPS5000 processors.
-+        Support for BMIPS32/3300/4350/4380 and BMIPS5000 processors.
- config CPU_XLR
-       bool "Netlogic XLR SoC"
-@@ -1495,7 +1495,7 @@ config CPU_LOONGSON1
-       select CPU_SUPPORTS_32BIT_KERNEL
-       select CPU_SUPPORTS_HIGHMEM
--config CPU_BMIPS3300
-+config CPU_BMIPS32_3300
-       bool
- config CPU_BMIPS4350
-@@ -1589,7 +1589,7 @@ config SYS_HAS_CPU_CAVIUM_OCTEON
- config SYS_HAS_CPU_BMIPS
-       bool
--config SYS_HAS_CPU_BMIPS3300
-+config SYS_HAS_CPU_BMIPS32_3300
-       bool
-       select SYS_HAS_CPU_BMIPS
diff --git a/target/linux/brcm63xx/patches-3.13/014-MIPS-BMIPS-add-a-smp-ops-registration-helper.patch b/target/linux/brcm63xx/patches-3.13/014-MIPS-BMIPS-add-a-smp-ops-registration-helper.patch
deleted file mode 100644 (file)
index c236075..0000000
+++ /dev/null
@@ -1,77 +0,0 @@
-From 0b135a3e8f344061ed0aa66e2514627dd7aa946f Mon Sep 17 00:00:00 2001
-From: Jonas Gorski <jogo@openwrt.org>
-Date: Sun, 23 Jun 2013 14:04:51 +0200
-Subject: [PATCH V2 08/13] MIPS: BMIPS: add a smp ops registration helper
-
-Add a helper similar to the generic register_XXX_smp_ops() for bmips.
-Register SMP UP ops in case of BMIPS32/3300.
-
-Signed-off-by: Jonas Gorski <jogo@openwrt.org>
----
-V1 -> V2:
- * use SMP_UP (ops) in case of BMIPS32_3300
-
- arch/mips/Kconfig             |  1 +
- arch/mips/bcm63xx/prom.c      |  2 +-
- arch/mips/include/asm/bmips.h | 26 ++++++++++++++++++++++++++
- 3 files changed, 28 insertions(+), 1 deletion(-)
-
---- a/arch/mips/Kconfig
-+++ b/arch/mips/Kconfig
-@@ -1496,6 +1496,7 @@ config CPU_LOONGSON1
-       select CPU_SUPPORTS_HIGHMEM
- config CPU_BMIPS32_3300
-+      select SMP_UP if SMP
-       bool
- config CPU_BMIPS4350
---- a/arch/mips/bcm63xx/prom.c
-+++ b/arch/mips/bcm63xx/prom.c
-@@ -61,7 +61,7 @@ void __init prom_init(void)
-       if (IS_ENABLED(CONFIG_CPU_BMIPS4350) && IS_ENABLED(CONFIG_SMP)) {
-               /* set up SMP */
--              register_smp_ops(&bmips43xx_smp_ops);
-+              register_bmips_smp_ops();
-               /*
-                * BCM6328 might not have its second CPU enabled, while BCM3368
---- a/arch/mips/include/asm/bmips.h
-+++ b/arch/mips/include/asm/bmips.h
-@@ -46,9 +46,35 @@
- #include <linux/cpumask.h>
- #include <asm/r4kcache.h>
-+#include <asm/smp-ops.h>
- extern struct plat_smp_ops bmips43xx_smp_ops;
- extern struct plat_smp_ops bmips5000_smp_ops;
-+
-+static inline int register_bmips_smp_ops(void)
-+{
-+#if IS_ENABLED(CONFIG_CPU_BMIPS) && IS_ENABLED(CONFIG_SMP)
-+      switch (current_cpu_type()) {
-+      case CPU_BMIPS32:
-+      case CPU_BMIPS3300:
-+              return register_up_smp_ops();
-+      case CPU_BMIPS4350:
-+      case CPU_BMIPS4380:
-+              register_smp_ops(&bmips43xx_smp_ops);
-+              break;
-+      case CPU_BMIPS5000:
-+              register_smp_ops(&bmips5000_smp_ops);
-+              break;
-+      default:
-+              return -ENODEV;
-+      }
-+
-+      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.13/015-MIPS-BCM63XX-always-register-bmips-smp-ops.patch b/target/linux/brcm63xx/patches-3.13/015-MIPS-BCM63XX-always-register-bmips-smp-ops.patch
deleted file mode 100644 (file)
index 6590185..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
-From 08181bee8ee375225129d086656c567022becf41 Mon Sep 17 00:00:00 2001
-From: Jonas Gorski <jogo@openwrt.org>
-Date: Fri, 28 Jun 2013 00:08:16 +0200
-Subject: [PATCH V2 09/13] MIPS: BCM63XX: always register bmips smp ops
-
-Use the return value for guarding further SMP setup.
-
-Signed-off-by: Jonas Gorski <jogo@openwrt.org>
----
- arch/mips/bcm63xx/prom.c | 6 ++----
- 1 file changed, 2 insertions(+), 4 deletions(-)
-
---- a/arch/mips/bcm63xx/prom.c
-+++ b/arch/mips/bcm63xx/prom.c
-@@ -59,10 +59,8 @@ 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_bmips_smp_ops();
--
-+      /* set up SMP */
-+      if (!register_bmips_smp_ops()) {
-               /*
-                * BCM6328 might not have its second CPU enabled, while BCM3368
-                * and BCM6358 need special handling for their shared TLB, so
diff --git a/target/linux/brcm63xx/patches-3.13/016-MIPS-BCM63XX-let-the-individual-SoCs-select-the-appr.patch b/target/linux/brcm63xx/patches-3.13/016-MIPS-BCM63XX-let-the-individual-SoCs-select-the-appr.patch
deleted file mode 100644 (file)
index 9c17a7b..0000000
+++ /dev/null
@@ -1,70 +0,0 @@
-From 949b88531a779af4f6456ff43d3de2d4f74e44ee Mon Sep 17 00:00:00 2001
-From: Jonas Gorski <jogo@openwrt.org>
-Date: Sun, 23 Jun 2013 12:25:49 +0200
-Subject: [PATCH V2 10/13] 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>
----
- arch/mips/Kconfig         | 1 -
- arch/mips/bcm63xx/Kconfig | 8 ++++++++
- 2 files changed, 8 insertions(+), 1 deletion(-)
-
---- a/arch/mips/Kconfig
-+++ b/arch/mips/Kconfig
-@@ -133,7 +133,6 @@ 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 SYS_SUPPORTS_32BIT_KERNEL
-       select SYS_SUPPORTS_BIG_ENDIAN
-       select SYS_HAS_EARLY_PRINTK
---- 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_BMIPS32_3300
-       select HW_HAS_PCI
- config BCM63XX_CPU_6345
-       bool "support 6345 CPU"
-+      select SYS_HAS_CPU_BMIPS32_3300
- config BCM63XX_CPU_6348
-       bool "support 6348 CPU"
-+      select SYS_HAS_CPU_BMIPS32_3300
-       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.13/017-MIPS-cpu-type-guard-BMIPS-variants-with-SYS_HAS_CPU_.patch b/target/linux/brcm63xx/patches-3.13/017-MIPS-cpu-type-guard-BMIPS-variants-with-SYS_HAS_CPU_.patch
deleted file mode 100644 (file)
index 96e6dfb..0000000
+++ /dev/null
@@ -1,44 +0,0 @@
-From c515f21d7680015bc94e0c081b73aba5a3d74680 Mon Sep 17 00:00:00 2001
-From: Jonas Gorski <jogo@openwrt.org>
-Date: Thu, 17 Oct 2013 13:14:48 +0200
-Subject: [PATCH V2 12/13] MIPS: cpu-type: guard BMIPS variants with
- SYS_HAS_CPU_BMIPS*
-
-BMIPS32 and  BMIPS3300 also need to be available for MIPS32R1, as
-bcm47xx might not select BMIPS.
-
-Signed-off-by: Jonas Gorski <jogo@openwrt.org>
----
- arch/mips/include/asm/cpu-type.h | 13 ++++++++++---
- 1 file changed, 10 insertions(+), 3 deletions(-)
-
---- a/arch/mips/include/asm/cpu-type.h
-+++ b/arch/mips/include/asm/cpu-type.h
-@@ -27,10 +27,7 @@ static inline int __pure __get_cpu_type(
- #ifdef CONFIG_SYS_HAS_CPU_MIPS32_R1
-       case CPU_4KC:
-       case CPU_ALCHEMY:
--      case CPU_BMIPS3300:
--      case CPU_BMIPS4350:
-       case CPU_PR4450:
--      case CPU_BMIPS32:
-       case CPU_JZRISC:
- #endif
-@@ -163,6 +160,16 @@ static inline int __pure __get_cpu_type(
-       case CPU_CAVIUM_OCTEON2:
- #endif
-+#if defined(CONFIG_SYS_HAS_CPU_BMIPS32_3300) || \
-+      defined (CONFIG_SYS_HAS_CPU_MIPS32_R1)
-+      case CPU_BMIPS32:
-+      case CPU_BMIPS3300:
-+#endif
-+
-+#ifdef CONFIG_SYS_HAS_CPU_BMIPS4350
-+      case CPU_BMIPS4350:
-+#endif
-+
- #ifdef CONFIG_SYS_HAS_CPU_BMIPS4380
-       case CPU_BMIPS4380:
- #endif
diff --git a/target/linux/brcm63xx/patches-3.13/018-MIPS-BCM63XX-drop-SYS_HAS_CPU_MIPS32R1.patch b/target/linux/brcm63xx/patches-3.13/018-MIPS-BCM63XX-drop-SYS_HAS_CPU_MIPS32R1.patch
deleted file mode 100644 (file)
index 0337697..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
-From c6c4897703d825c9efea6d9a708aaa080c8c3177 Mon Sep 17 00:00:00 2001
-From: Jonas Gorski <jogo@openwrt.org>
-Date: Thu, 17 Oct 2013 13:16:08 +0200
-Subject: [PATCH V2 13/13] MIPS: BCM63XX: drop SYS_HAS_CPU_MIPS32R1
-
-All MIPS cores on BCM63XX identify as Broadcom, not MIPS, so no need
-to support non-broadcom MIPS CPUs. This also ensures that CPU_BMIPS
-is always selected.
-
-Signed-off-by: Jonas Gorski <jogo@openwrt.org>
----
- arch/mips/Kconfig | 1 -
- 1 file changed, 1 deletion(-)
-
---- a/arch/mips/Kconfig
-+++ b/arch/mips/Kconfig
-@@ -132,7 +132,6 @@ config BCM63XX
-       select CSRC_R4K
-       select DMA_NONCOHERENT
-       select IRQ_CPU
--      select SYS_HAS_CPU_MIPS32_R1
-       select SYS_SUPPORTS_32BIT_KERNEL
-       select SYS_SUPPORTS_BIG_ENDIAN
-       select SYS_HAS_EARLY_PRINTK
diff --git a/target/linux/brcm63xx/patches-3.13/100-MIPS-BCM63XX-add-USB-host-clock-enable-delay.patch b/target/linux/brcm63xx/patches-3.13/100-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.13/101-MIPS-BCM63XX-add-USB-device-clock-enable-delay-to-cl.patch b/target/linux/brcm63xx/patches-3.13/101-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.13/102-MIPS-BCM63XX-move-code-touching-the-USB-private-regi.patch b/target/linux/brcm63xx/patches-3.13/102-MIPS-BCM63XX-move-code-touching-the-USB-private-regi.patch
deleted file mode 100644 (file)
index 88217bd..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-hsspi.o dev-uart.o \
--                 dev-wdt.o dev-usb-usbd.o
-+                 dev-wdt.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.13/103-MIPS-BCM63XX-add-OHCI-EHCI-configuration-bits-to-com.patch b/target/linux/brcm63xx/patches-3.13/103-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;
-+
-+      spin_lock_irqsave(&usb_priv_reg_lock, flags);
-       val = bcm_rset_readl(RSET_USBH_PRIV, USBH_PRIV_UTMI_CTL_6368_REG);
-       if (is_device) {
-@@ -36,12 +43,17 @@ void bcm63xx_usb_priv_select_phy_mode(u3
-       else
-               val &= ~USBH_PRIV_SWAP_USBD_MASK;
-       bcm_rset_writel(RSET_USBH_PRIV, val, USBH_PRIV_SWAP_6368_REG);
-+
-+      spin_unlock_irqrestore(&usb_priv_reg_lock, flags);
- }
- EXPORT_SYMBOL(bcm63xx_usb_priv_select_phy_mode);
- void bcm63xx_usb_priv_select_pullup(u32 portmask, bool is_on)
- {
-       u32 val;
-+      unsigned long flags;
-+
-+      spin_lock_irqsave(&usb_priv_reg_lock, flags);
-       val = bcm_rset_readl(RSET_USBH_PRIV, USBH_PRIV_UTMI_CTL_6368_REG);
-       if (is_on)
-@@ -49,5 +61,90 @@ void bcm63xx_usb_priv_select_pullup(u32
-       else
-               val |= (portmask << USBH_PRIV_UTMI_CTL_NODRIV_SHIFT);
-       bcm_rset_writel(RSET_USBH_PRIV, val, USBH_PRIV_UTMI_CTL_6368_REG);
-+
-+      spin_unlock_irqrestore(&usb_priv_reg_lock, flags);
- }
- EXPORT_SYMBOL(bcm63xx_usb_priv_select_pullup);
-+
-+/* The following array represents the meaning of the DESC/DATA
-+ * endian swapping with respect to the CPU configured endianness
-+ *
-+ * DATA       ENDN    mmio    descriptor
-+ * 0  0       BE      invalid
-+ * 0  1       BE      LE
-+ * 1  0       BE      BE
-+ * 1  1       BE      invalid
-+ *
-+ * Since BCM63XX SoCs are configured to be in big-endian mode
-+ * we want configuration at line 3.
-+ */
-+void bcm63xx_usb_priv_ohci_cfg_set(void)
-+{
-+      u32 reg;
-+      unsigned long flags;
-+
-+      spin_lock_irqsave(&usb_priv_reg_lock, flags);
-+
-+      if (BCMCPU_IS_6348())
-+              bcm_rset_writel(RSET_OHCI_PRIV, 0, OHCI_PRIV_REG);
-+      else if (BCMCPU_IS_6358()) {
-+              reg = bcm_rset_readl(RSET_USBH_PRIV, USBH_PRIV_SWAP_6358_REG);
-+              reg &= ~USBH_PRIV_SWAP_OHCI_ENDN_MASK;
-+              reg |= USBH_PRIV_SWAP_OHCI_DATA_MASK;
-+              bcm_rset_writel(RSET_USBH_PRIV, reg, USBH_PRIV_SWAP_6358_REG);
-+              /*
-+               * The magic value comes for the original vendor BSP
-+               * and is needed for USB to work. Datasheet does not
-+               * help, so the magic value is used as-is.
-+               */
-+              bcm_rset_writel(RSET_USBH_PRIV, 0x1c0020,
-+                              USBH_PRIV_TEST_6358_REG);
-+
-+      } else if (BCMCPU_IS_6328() || BCMCPU_IS_6362() || BCMCPU_IS_6368()) {
-+              reg = bcm_rset_readl(RSET_USBH_PRIV, USBH_PRIV_SWAP_6368_REG);
-+              reg &= ~USBH_PRIV_SWAP_OHCI_ENDN_MASK;
-+              reg |= USBH_PRIV_SWAP_OHCI_DATA_MASK;
-+              bcm_rset_writel(RSET_USBH_PRIV, reg, USBH_PRIV_SWAP_6368_REG);
-+
-+              reg = bcm_rset_readl(RSET_USBH_PRIV, USBH_PRIV_SETUP_6368_REG);
-+              reg |= USBH_PRIV_SETUP_IOC_MASK;
-+              bcm_rset_writel(RSET_USBH_PRIV, reg, USBH_PRIV_SETUP_6368_REG);
-+      }
-+
-+      spin_unlock_irqrestore(&usb_priv_reg_lock, flags);
-+}
-+
-+void bcm63xx_usb_priv_ehci_cfg_set(void)
-+{
-+      u32 reg;
-+      unsigned long flags;
-+
-+      spin_lock_irqsave(&usb_priv_reg_lock, flags);
-+
-+      if (BCMCPU_IS_6358()) {
-+              reg = bcm_rset_readl(RSET_USBH_PRIV, USBH_PRIV_SWAP_6358_REG);
-+              reg &= ~USBH_PRIV_SWAP_EHCI_ENDN_MASK;
-+              reg |= USBH_PRIV_SWAP_EHCI_DATA_MASK;
-+              bcm_rset_writel(RSET_USBH_PRIV, reg, USBH_PRIV_SWAP_6358_REG);
-+
-+              /*
-+               * The magic value comes for the original vendor BSP
-+               * and is needed for USB to work. Datasheet does not
-+               * help, so the magic value is used as-is.
-+               */
-+              bcm_rset_writel(RSET_USBH_PRIV, 0x1c0020,
-+                              USBH_PRIV_TEST_6358_REG);
-+
-+      } else if (BCMCPU_IS_6328() || BCMCPU_IS_6362() || BCMCPU_IS_6368()) {
-+              reg = bcm_rset_readl(RSET_USBH_PRIV, USBH_PRIV_SWAP_6368_REG);
-+              reg &= ~USBH_PRIV_SWAP_EHCI_ENDN_MASK;
-+              reg |= USBH_PRIV_SWAP_EHCI_DATA_MASK;
-+              bcm_rset_writel(RSET_USBH_PRIV, reg, USBH_PRIV_SWAP_6368_REG);
-+
-+              reg = bcm_rset_readl(RSET_USBH_PRIV, USBH_PRIV_SETUP_6368_REG);
-+              reg |= USBH_PRIV_SETUP_IOC_MASK;
-+              bcm_rset_writel(RSET_USBH_PRIV, reg, USBH_PRIV_SETUP_6368_REG);
-+      }
-+
-+      spin_unlock_irqrestore(&usb_priv_reg_lock, flags);
-+}
---- a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_usb_priv.h
-+++ b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_usb_priv.h
-@@ -5,5 +5,7 @@
- void bcm63xx_usb_priv_select_phy_mode(u32 portmask, bool is_device);
- void bcm63xx_usb_priv_select_pullup(u32 portmask, bool is_on);
-+void bcm63xx_usb_priv_ohci_cfg_set(void);
-+void bcm63xx_usb_priv_ehci_cfg_set(void);
- #endif /* BCM63XX_USB_PRIV_H_ */
diff --git a/target/linux/brcm63xx/patches-3.13/104-MIPS-BCM63XX-introduce-BCM63XX_OHCI-configuration-sy.patch b/target/linux/brcm63xx/patches-3.13/104-MIPS-BCM63XX-introduce-BCM63XX_OHCI-configuration-sy.patch
deleted file mode 100644 (file)
index 768dcca..0000000
+++ /dev/null
@@ -1,62 +0,0 @@
-From 94ec618bd1a6b07fafbbfc9bcc54e7f9360ff9a0 Mon Sep 17 00:00:00 2001
-From: Florian Fainelli <florian@openwrt.org>
-Date: Mon, 28 Jan 2013 20:06:23 +0100
-Subject: [PATCH 05/11] MIPS: BCM63XX: introduce BCM63XX_OHCI configuration
- symbol
-
-This configuration symbol can be used by CPUs supporting the on-chip
-OHCI controller, and ensures that all relevant OHCI-related
-configuration options are correctly selected. So far, OHCI support is
-available for the 6328, 6348, 6358 and 6358 SoCs.
-
-Signed-off-by: Florian Fainelli <florian@openwrt.org>
----
- arch/mips/bcm63xx/Kconfig |   15 ++++++++++-----
- 1 file changed, 10 insertions(+), 5 deletions(-)
-
---- a/arch/mips/bcm63xx/Kconfig
-+++ b/arch/mips/bcm63xx/Kconfig
-@@ -6,10 +6,17 @@ config BCM63XX_CPU_3368
-       select SYS_HAS_CPU_BMIPS4350
-       select HW_HAS_PCI
-+config BCM63XX_OHCI
-+      bool
-+      select USB_ARCH_HAS_OHCI
-+      select USB_OHCI_BIG_ENDIAN_DESC if USB_OHCI_HCD
-+      select USB_OHCI_BIG_ENDIAN_MMIO if USB_OHCI_HCD
-+
- config BCM63XX_CPU_6328
-       bool "support 6328 CPU"
-       select SYS_HAS_CPU_BMIPS4350
-       select HW_HAS_PCI
-+      select BCM63XX_OHCI
- config BCM63XX_CPU_6338
-       bool "support 6338 CPU"
-@@ -24,21 +31,25 @@ config BCM63XX_CPU_6348
-       bool "support 6348 CPU"
-       select SYS_HAS_CPU_BMIPS32_3300
-       select HW_HAS_PCI
-+      select BCM63XX_OHCI
- config BCM63XX_CPU_6358
-       bool "support 6358 CPU"
-       select SYS_HAS_CPU_BMIPS4350
-       select HW_HAS_PCI
-+      select BCM63XX_OHCI
- config BCM63XX_CPU_6362
-       bool "support 6362 CPU"
-       select SYS_HAS_CPU_BMIPS4350
-       select HW_HAS_PCI
-+      select BCM63XX_OHCI
- config BCM63XX_CPU_6368
-       bool "support 6368 CPU"
-       select SYS_HAS_CPU_BMIPS4350
-       select HW_HAS_PCI
-+      select BCM63XX_OHCI
- endmenu
- source "arch/mips/bcm63xx/boards/Kconfig"
diff --git a/target/linux/brcm63xx/patches-3.13/105-MIPS-BCM63XX-add-support-for-the-on-chip-OHCI-contro.patch b/target/linux/brcm63xx/patches-3.13/105-MIPS-BCM63XX-add-support-for-the-on-chip-OHCI-contro.patch
deleted file mode 100644 (file)
index 111d481..0000000
+++ /dev/null
@@ -1,138 +0,0 @@
-From 30d22baef255c99a12c4858ce4ab0d45f0d8c9ae Mon Sep 17 00:00:00 2001
-From: Florian Fainelli <florian@openwrt.org>
-Date: Mon, 28 Jan 2013 20:06:24 +0100
-Subject: [PATCH 06/11] MIPS: BCM63XX: add support for the on-chip OHCI
- controller
-
-Broadcom BCM63XX SoCs include an on-chip OHCI controller which can be
-driven by the ohci-platform generic driver by using specific power
-on/off/suspend callback to manage clocks and hardware specific
-configuration.
-
-Signed-off-by: Maxime Bizon <mbizon@freebox.fr>
-Signed-off-by: Florian Fainelli <florian@openwrt.org>
----
- arch/mips/bcm63xx/Makefile                         |    2 +-
- arch/mips/bcm63xx/dev-usb-ohci.c                   |   94 ++++++++++++++++++++
- .../asm/mach-bcm63xx/bcm63xx_dev_usb_ohci.h        |    6 ++
- 3 files changed, 101 insertions(+), 1 deletion(-)
- create mode 100644 arch/mips/bcm63xx/dev-usb-ohci.c
- create mode 100644 arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_usb_ohci.h
-
---- a/arch/mips/bcm63xx/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-hsspi.o dev-uart.o \
--                 dev-wdt.o dev-usb-usbd.o usb-common.o
-+                 dev-wdt.o dev-usb-ohci.o dev-usb-usbd.o usb-common.o
- obj-$(CONFIG_EARLY_PRINTK)    += early_printk.o
- obj-y         += boards/
---- /dev/null
-+++ b/arch/mips/bcm63xx/dev-usb-ohci.c
-@@ -0,0 +1,94 @@
-+/*
-+ * This file is subject to the terms and conditions of the GNU General Public
-+ * License.  See the file "COPYING" in the main directory of this archive
-+ * for more details.
-+ *
-+ * Copyright (C) 2008 Maxime Bizon <mbizon@freebox.fr>
-+ * Copyright (C) 2013 Florian Fainelli <florian@openwrt.org>
-+ */
-+
-+#include <linux/init.h>
-+#include <linux/kernel.h>
-+#include <linux/platform_device.h>
-+#include <linux/usb/ohci_pdriver.h>
-+#include <linux/dma-mapping.h>
-+#include <linux/clk.h>
-+#include <linux/delay.h>
-+
-+#include <bcm63xx_cpu.h>
-+#include <bcm63xx_regs.h>
-+#include <bcm63xx_io.h>
-+#include <bcm63xx_usb_priv.h>
-+#include <bcm63xx_dev_usb_ohci.h>
-+
-+static struct resource ohci_resources[] = {
-+      {
-+              .start          = -1, /* filled at runtime */
-+              .end            = -1, /* filled at runtime */
-+              .flags          = IORESOURCE_MEM,
-+      },
-+      {
-+              .start          = -1, /* filled at runtime */
-+              .flags          = IORESOURCE_IRQ,
-+      },
-+};
-+
-+static u64 ohci_dmamask = DMA_BIT_MASK(32);
-+
-+static struct clk *usb_host_clock;
-+
-+static int bcm63xx_ohci_power_on(struct platform_device *pdev)
-+{
-+      usb_host_clock = clk_get(&pdev->dev, "usbh");
-+      if (IS_ERR_OR_NULL(usb_host_clock))
-+              return -ENODEV;
-+
-+      clk_prepare_enable(usb_host_clock);
-+
-+      bcm63xx_usb_priv_ohci_cfg_set();
-+
-+      return 0;
-+}
-+
-+static void bcm63xx_ohci_power_off(struct platform_device *pdev)
-+{
-+      if (!IS_ERR_OR_NULL(usb_host_clock)) {
-+              clk_disable_unprepare(usb_host_clock);
-+              clk_put(usb_host_clock);
-+      }
-+}
-+
-+static struct usb_ohci_pdata bcm63xx_ohci_pdata = {
-+      .big_endian_desc        = 1,
-+      .big_endian_mmio        = 1,
-+      .no_big_frame_no        = 1,
-+      .num_ports              = 1,
-+      .power_on               = bcm63xx_ohci_power_on,
-+      .power_off              = bcm63xx_ohci_power_off,
-+      .power_suspend          = bcm63xx_ohci_power_off,
-+};
-+
-+static struct platform_device bcm63xx_ohci_device = {
-+      .name           = "ohci-platform",
-+      .id             = -1,
-+      .num_resources  = ARRAY_SIZE(ohci_resources),
-+      .resource       = ohci_resources,
-+      .dev            = {
-+              .platform_data          = &bcm63xx_ohci_pdata,
-+              .dma_mask               = &ohci_dmamask,
-+              .coherent_dma_mask      = DMA_BIT_MASK(32),
-+      },
-+};
-+
-+int __init bcm63xx_ohci_register(void)
-+{
-+      if (BCMCPU_IS_6345() || BCMCPU_IS_6338())
-+              return -ENODEV;
-+
-+      ohci_resources[0].start = bcm63xx_regset_address(RSET_OHCI0);
-+      ohci_resources[0].end = ohci_resources[0].start;
-+      ohci_resources[0].end += RSET_OHCI_SIZE - 1;
-+      ohci_resources[1].start = bcm63xx_get_irq_number(IRQ_OHCI0);
-+
-+      return platform_device_register(&bcm63xx_ohci_device);
-+}
---- /dev/null
-+++ b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_usb_ohci.h
-@@ -0,0 +1,6 @@
-+#ifndef BCM63XX_DEV_USB_OHCI_H_
-+#define BCM63XX_DEV_USB_OHCI_H_
-+
-+int bcm63xx_ohci_register(void);
-+
-+#endif /* BCM63XX_DEV_USB_OHCI_H_ */
diff --git a/target/linux/brcm63xx/patches-3.13/106-MIPS-BCM63XX-register-OHCI-controller-if-board-enabl.patch b/target/linux/brcm63xx/patches-3.13/106-MIPS-BCM63XX-register-OHCI-controller-if-board-enabl.patch
deleted file mode 100644 (file)
index 2c26482..0000000
+++ /dev/null
@@ -1,36 +0,0 @@
-From 33ef960aed15f9a98a2c51d8d794cd72418e0be4 Mon Sep 17 00:00:00 2001
-From: Florian Fainelli <florian@openwrt.org>
-Date: Mon, 28 Jan 2013 20:06:25 +0100
-Subject: [PATCH 07/11] MIPS: BCM63XX: register OHCI controller if board
- enables it
-
-BCM63XX-based boards can control the registration of the OHCI controller
-by setting their has_ohci0 flag to 1. Handle this in the generic
-code dealing with board registration and call the actual helper to
-register the OHCI controller.
-
-Signed-off-by: Florian Fainelli <florian@openwrt.org>
----
- arch/mips/bcm63xx/boards/board_bcm963xx.c |    4 ++++
- 1 file changed, 4 insertions(+)
-
---- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
-+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -26,6 +26,7 @@
- #include <bcm63xx_dev_hsspi.h>
- #include <bcm63xx_dev_pcmcia.h>
- #include <bcm63xx_dev_spi.h>
-+#include <bcm63xx_dev_usb_ohci.h>
- #include <bcm63xx_dev_usb_usbd.h>
- #include <board_bcm963xx.h>
-@@ -898,6 +899,9 @@ int __init board_register_devices(void)
-       if (board.has_usbd)
-               bcm63xx_usbd_register(&board.usbd);
-+      if (board.has_ohci0)
-+              bcm63xx_ohci_register();
-+
-       if (board.has_dsp)
-               bcm63xx_dsp_register(&board.dsp);
diff --git a/target/linux/brcm63xx/patches-3.13/107-MIPS-BCM63XX-introduce-BCM63XX_EHCI-configuration-sy.patch b/target/linux/brcm63xx/patches-3.13/107-MIPS-BCM63XX-introduce-BCM63XX_EHCI-configuration-sy.patch
deleted file mode 100644 (file)
index bce91e3..0000000
+++ /dev/null
@@ -1,62 +0,0 @@
-From 00da1683364e58c6430a4577123d01037f8faddc Mon Sep 17 00:00:00 2001
-From: Florian Fainelli <florian@openwrt.org>
-Date: Mon, 28 Jan 2013 20:06:26 +0100
-Subject: [PATCH 08/11] MIPS: BCM63XX: introduce BCM63XX_EHCI configuration
- symbol
-
-This configuration symbol can be used by CPUs supporting the on-chip
-EHCI controller, and ensures that all relevant EHCI-related
-configuration options are selected. So far BCM6328, BCM6358 and BCM6368
-have an EHCI controller and do select this symbol. Update
-drivers/usb/host/Kconfig with BCM63XX to update direct unmet
-dependencies.
-
-Signed-off-by: Florian Fainelli <florian@openwrt.org>
----
- arch/mips/bcm63xx/Kconfig |    9 +++++++++
- drivers/usb/host/Kconfig  |    5 +++--
- 2 files changed, 12 insertions(+), 2 deletions(-)
-
---- a/arch/mips/bcm63xx/Kconfig
-+++ b/arch/mips/bcm63xx/Kconfig
-@@ -12,11 +12,18 @@ config BCM63XX_OHCI
-       select USB_OHCI_BIG_ENDIAN_DESC if USB_OHCI_HCD
-       select USB_OHCI_BIG_ENDIAN_MMIO if USB_OHCI_HCD
-+config BCM63XX_EHCI
-+      bool
-+      select USB_ARCH_HAS_EHCI
-+      select USB_EHCI_BIG_ENDIAN_DESC if USB_EHCI_HCD
-+      select USB_EHCI_BIG_ENDIAN_MMIO if USB_EHCI_HCD
-+
- config BCM63XX_CPU_6328
-       bool "support 6328 CPU"
-       select SYS_HAS_CPU_BMIPS4350
-       select HW_HAS_PCI
-       select BCM63XX_OHCI
-+      select BCM63XX_EHCI
- config BCM63XX_CPU_6338
-       bool "support 6338 CPU"
-@@ -38,18 +45,21 @@ config BCM63XX_CPU_6358
-       select SYS_HAS_CPU_BMIPS4350
-       select HW_HAS_PCI
-       select BCM63XX_OHCI
-+      select BCM63XX_EHCI
- config BCM63XX_CPU_6362
-       bool "support 6362 CPU"
-       select SYS_HAS_CPU_BMIPS4350
-       select HW_HAS_PCI
-       select BCM63XX_OHCI
-+      select BCM63XX_EHCI
- config BCM63XX_CPU_6368
-       bool "support 6368 CPU"
-       select SYS_HAS_CPU_BMIPS4350
-       select HW_HAS_PCI
-       select BCM63XX_OHCI
-+      select BCM63XX_EHCI
- endmenu
- source "arch/mips/bcm63xx/boards/Kconfig"
diff --git a/target/linux/brcm63xx/patches-3.13/108-MIPS-BCM63XX-add-support-for-the-on-chip-EHCI-contro.patch b/target/linux/brcm63xx/patches-3.13/108-MIPS-BCM63XX-add-support-for-the-on-chip-EHCI-contro.patch
deleted file mode 100644 (file)
index 8b1f8d2..0000000
+++ /dev/null
@@ -1,137 +0,0 @@
-From e38f13bd6408769c0b565bb1079024f496eee121 Mon Sep 17 00:00:00 2001
-From: Florian Fainelli <florian@openwrt.org>
-Date: Mon, 28 Jan 2013 20:06:27 +0100
-Subject: [PATCH 09/11] MIPS: BCM63XX: add support for the on-chip EHCI
- controller
-
-Broadcom BCM63XX SoCs include an on-chip EHCI controller which can be
-driven by the generic ehci-platform driver by using specific power
-on/off/suspend callbacks to manage clocks and hardware specific
-configuration.
-
-Signed-off-by: Maxime Bizon <mbizon@freebox.fr>
-Signed-off-by: Florian Fainelli <florian@openwrt.org>
----
- arch/mips/bcm63xx/Makefile                         |    2 +-
- arch/mips/bcm63xx/dev-usb-ehci.c                   |   92 ++++++++++++++++++++
- .../asm/mach-bcm63xx/bcm63xx_dev_usb_ehci.h        |    6 ++
- 3 files changed, 99 insertions(+), 1 deletion(-)
- create mode 100644 arch/mips/bcm63xx/dev-usb-ehci.c
- create mode 100644 arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_usb_ehci.h
-
---- a/arch/mips/bcm63xx/Makefile
-+++ b/arch/mips/bcm63xx/Makefile
-@@ -1,7 +1,8 @@
- 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-hsspi.o dev-uart.o \
--                 dev-wdt.o dev-usb-ohci.o dev-usb-usbd.o usb-common.o
-+                 dev-wdt.o dev-usb-ehci.o dev-usb-ohci.o dev-usb-usbd.o \
-+                 usb-common.o
- obj-$(CONFIG_EARLY_PRINTK)    += early_printk.o
- obj-y         += boards/
---- /dev/null
-+++ b/arch/mips/bcm63xx/dev-usb-ehci.c
-@@ -0,0 +1,92 @@
-+/*
-+ * This file is subject to the terms and conditions of the GNU General Public
-+ * License.  See the file "COPYING" in the main directory of this archive
-+ * for more details.
-+ *
-+ * Copyright (C) 2008 Maxime Bizon <mbizon@freebox.fr>
-+ * Copyright (C) 2013 Florian Fainelli <florian@openwrt.org>
-+ */
-+
-+#include <linux/init.h>
-+#include <linux/kernel.h>
-+#include <linux/platform_device.h>
-+#include <linux/clk.h>
-+#include <linux/delay.h>
-+#include <linux/usb/ehci_pdriver.h>
-+#include <linux/dma-mapping.h>
-+
-+#include <bcm63xx_cpu.h>
-+#include <bcm63xx_regs.h>
-+#include <bcm63xx_io.h>
-+#include <bcm63xx_usb_priv.h>
-+#include <bcm63xx_dev_usb_ehci.h>
-+
-+static struct resource ehci_resources[] = {
-+      {
-+              .start          = -1, /* filled at runtime */
-+              .end            = -1, /* filled at runtime */
-+              .flags          = IORESOURCE_MEM,
-+      },
-+      {
-+              .start          = -1, /* filled at runtime */
-+              .flags          = IORESOURCE_IRQ,
-+      },
-+};
-+
-+static u64 ehci_dmamask = DMA_BIT_MASK(32);
-+
-+static struct clk *usb_host_clock;
-+
-+static int bcm63xx_ehci_power_on(struct platform_device *pdev)
-+{
-+      usb_host_clock = clk_get(&pdev->dev, "usbh");
-+      if (IS_ERR_OR_NULL(usb_host_clock))
-+              return -ENODEV;
-+
-+      clk_prepare_enable(usb_host_clock);
-+
-+      bcm63xx_usb_priv_ehci_cfg_set();
-+
-+      return 0;
-+}
-+
-+static void bcm63xx_ehci_power_off(struct platform_device *pdev)
-+{
-+      if (!IS_ERR_OR_NULL(usb_host_clock)) {
-+              clk_disable_unprepare(usb_host_clock);
-+              clk_put(usb_host_clock);
-+      }
-+}
-+
-+static struct usb_ehci_pdata bcm63xx_ehci_pdata = {
-+      .big_endian_desc        = 1,
-+      .big_endian_mmio        = 1,
-+      .power_on               = bcm63xx_ehci_power_on,
-+      .power_off              = bcm63xx_ehci_power_off,
-+      .power_suspend          = bcm63xx_ehci_power_off,
-+};
-+
-+static struct platform_device bcm63xx_ehci_device = {
-+      .name           = "ehci-platform",
-+      .id             = -1,
-+      .num_resources  = ARRAY_SIZE(ehci_resources),
-+      .resource       = ehci_resources,
-+      .dev            = {
-+              .platform_data          = &bcm63xx_ehci_pdata,
-+              .dma_mask               = &ehci_dmamask,
-+              .coherent_dma_mask      = DMA_BIT_MASK(32),
-+      },
-+};
-+
-+int __init bcm63xx_ehci_register(void)
-+{
-+      if (!BCMCPU_IS_6328() && !BCMCPU_IS_6358() && !BCMCPU_IS_6362() && !BCMCPU_IS_6368())
-+              return 0;
-+
-+      ehci_resources[0].start = bcm63xx_regset_address(RSET_EHCI0);
-+      ehci_resources[0].end = ehci_resources[0].start;
-+      ehci_resources[0].end += RSET_EHCI_SIZE - 1;
-+      ehci_resources[1].start = bcm63xx_get_irq_number(IRQ_EHCI0);
-+
-+      return platform_device_register(&bcm63xx_ehci_device);
-+}
---- /dev/null
-+++ b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_usb_ehci.h
-@@ -0,0 +1,6 @@
-+#ifndef BCM63XX_DEV_USB_EHCI_H_
-+#define BCM63XX_DEV_USB_EHCI_H_
-+
-+int bcm63xx_ehci_register(void);
-+
-+#endif /* BCM63XX_DEV_USB_EHCI_H_ */
diff --git a/target/linux/brcm63xx/patches-3.13/109-MIPS-BCM63XX-register-EHCI-controller-if-board-enabl.patch b/target/linux/brcm63xx/patches-3.13/109-MIPS-BCM63XX-register-EHCI-controller-if-board-enabl.patch
deleted file mode 100644 (file)
index 641a57c..0000000
+++ /dev/null
@@ -1,36 +0,0 @@
-From 709ef2034f5ba06da35f89856ad7baf2b7a41287 Mon Sep 17 00:00:00 2001
-From: Florian Fainelli <florian@openwrt.org>
-Date: Mon, 28 Jan 2013 20:06:28 +0100
-Subject: [PATCH 10/11] MIPS: BCM63XX: register EHCI controller if board
- enables it
-
-BCM63XX-based board can control the registration of the EHCI controller
-by setting their has_ehci0 flag to 1. Handle this in the generic
-code dealing with board registration and call the actual helper to register
-the EHCI controller.
-
-Signed-off-by: Florian Fainelli <florian@openwrt.org>
----
- arch/mips/bcm63xx/boards/board_bcm963xx.c |    4 ++++
- 1 file changed, 4 insertions(+)
-
---- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
-+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -26,6 +26,7 @@
- #include <bcm63xx_dev_hsspi.h>
- #include <bcm63xx_dev_pcmcia.h>
- #include <bcm63xx_dev_spi.h>
-+#include <bcm63xx_dev_usb_ehci.h>
- #include <bcm63xx_dev_usb_ohci.h>
- #include <bcm63xx_dev_usb_usbd.h>
- #include <board_bcm963xx.h>
-@@ -899,6 +900,9 @@ int __init board_register_devices(void)
-       if (board.has_usbd)
-               bcm63xx_usbd_register(&board.usbd);
-+      if (board.has_ehci0)
-+              bcm63xx_ehci_register();
-+
-       if (board.has_ohci0)
-               bcm63xx_ohci_register();
diff --git a/target/linux/brcm63xx/patches-3.13/110-MIPS-BCM63XX-EHCI-controller-does-not-support-overcu.patch b/target/linux/brcm63xx/patches-3.13/110-MIPS-BCM63XX-EHCI-controller-does-not-support-overcu.patch
deleted file mode 100644 (file)
index 6d91129..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
-From 111bbd770441ab34f9da5bb1d85767a9b75227b4 Mon Sep 17 00:00:00 2001
-From: Florian Fainelli <florian@openwrt.org>
-Date: Mon, 28 Jan 2013 20:06:30 +0100
-Subject: [PATCH 12/12] MIPS: BCM63XX: EHCI controller does not support
- overcurrent
-
-This patch sets the ignore_oc flag for the BCM63XX EHCI controller as it
-does not support proper overcurrent reporting.
-
-Signed-off-by: Florian Fainelli <florian@openwrt.org>
----
- arch/mips/bcm63xx/dev-usb-ehci.c |    1 +
- 1 file changed, 1 insertion(+)
-
---- a/arch/mips/bcm63xx/dev-usb-ehci.c
-+++ b/arch/mips/bcm63xx/dev-usb-ehci.c
-@@ -61,6 +61,7 @@ static void bcm63xx_ehci_power_off(struc
- static struct usb_ehci_pdata bcm63xx_ehci_pdata = {
-       .big_endian_desc        = 1,
-       .big_endian_mmio        = 1,
-+      .ignore_oc              = 1,
-       .power_on               = bcm63xx_ehci_power_on,
-       .power_off              = bcm63xx_ehci_power_off,
-       .power_suspend          = bcm63xx_ehci_power_off,
diff --git a/target/linux/brcm63xx/patches-3.13/201-SPI-Allow-specifying-the-parsers-for-SPI-flash.patch b/target/linux/brcm63xx/patches-3.13/201-SPI-Allow-specifying-the-parsers-for-SPI-flash.patch
deleted file mode 100644 (file)
index 00dc9c9..0000000
+++ /dev/null
@@ -1,38 +0,0 @@
-From 3f650fc30aa0badf9d02842ce396cea3eef2eeaa Mon Sep 17 00:00:00 2001
-From: Jonas Gorski <jonas.gorski@gmail.com>
-Date: Fri, 1 Jul 2011 23:16:47 +0200
-Subject: [PATCH 49/79] SPI: Allow specifying the parsers for SPI flash
-
-Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
----
- include/linux/spi/flash.h |    5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
---- a/include/linux/spi/flash.h
-+++ b/include/linux/spi/flash.h
-@@ -2,7 +2,7 @@
- #define LINUX_SPI_FLASH_H
- struct mtd_partition;
--
-+struct mtd_part_parser_data;
- /**
-  * struct flash_platform_data: board-specific flash data
-  * @name: optional flash device name (eg, as used with mtdparts=)
-@@ -10,6 +10,8 @@ struct mtd_partition;
-  * @nr_parts: number of mtd_partitions for static partitoning
-  * @type: optional flash device type (e.g. m25p80 vs m25p64), for use
-  *    with chips that can't be queried for JEDEC or other IDs
-+ * @part_probe_types: optional list of MTD parser names to use for
-+ *    partitioning
-  *
-  * Board init code (in arch/.../mach-xxx/board-yyy.c files) can
-  * provide information about SPI flash parts (such as DataFlash) to
-@@ -25,6 +27,7 @@ struct flash_platform_data {
-       char            *type;
-+      const char      **part_probe_types;
-       /* we'll likely add more ... use JEDEC IDs, etc */
- };
diff --git a/target/linux/brcm63xx/patches-3.13/202-MTD-DEVICES-m25p80-use-parsers-if-provided-in-flash-.patch b/target/linux/brcm63xx/patches-3.13/202-MTD-DEVICES-m25p80-use-parsers-if-provided-in-flash-.patch
deleted file mode 100644 (file)
index 2396aeb..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
-From c7c3c338cb25d7f55ddb3f6bfbf3572758ca3896 Mon Sep 17 00:00:00 2001
-From: Jonas Gorski <jonas.gorski@gmail.com>
-Date: Thu, 10 Nov 2011 16:53:08 +0100
-Subject: [PATCH 50/79] MTD: DEVICES: m25p80: use parsers if provided in flash
- platform data
-
-Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
----
- drivers/mtd/devices/m25p80.c |    3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
---- a/drivers/mtd/devices/m25p80.c
-+++ b/drivers/mtd/devices/m25p80.c
-@@ -1124,7 +1124,8 @@ static int m25p_probe(struct spi_device
-       /* partitions should match sector boundaries; and it may be good to
-        * use readonly partitions for writeprotected sectors (BP2..BP0).
-        */
--      return mtd_device_parse_register(&flash->mtd, NULL, &ppdata,
-+      return mtd_device_parse_register(&flash->mtd,
-+                      data ? data->part_probe_types : NULL, &ppdata,
-                       data ? data->parts : NULL,
-                       data ? data->nr_parts : 0);
- }
diff --git a/target/linux/brcm63xx/patches-3.13/203-MTD-DEVICES-m25p80-add-support-for-limiting-reads.patch b/target/linux/brcm63xx/patches-3.13/203-MTD-DEVICES-m25p80-add-support-for-limiting-reads.patch
deleted file mode 100644 (file)
index c2842c1..0000000
+++ /dev/null
@@ -1,92 +0,0 @@
-From 5fb4e8d7287ac8fcb33aae8b1e9e22c5a3c392bd Mon Sep 17 00:00:00 2001
-From: Jonas Gorski <jonas.gorski@gmail.com>
-Date: Thu, 10 Nov 2011 17:33:40 +0100
-Subject: [PATCH 51/79] MTD: DEVICES: m25p80: add support for limiting reads
-
-Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
----
- drivers/mtd/devices/m25p80.c |   29 +++++++++++++++++++++++++++--
- include/linux/spi/flash.h    |    4 ++++
- 2 files changed, 31 insertions(+), 2 deletions(-)
-
---- a/drivers/mtd/devices/m25p80.c
-+++ b/drivers/mtd/devices/m25p80.c
-@@ -101,6 +101,7 @@ struct m25p {
-       u8                      program_opcode;
-       u8                      *command;
-       bool                    fast_read;
-+      int                     max_transfer_len;
- };
- static inline struct m25p *mtd_to_m25p(struct mtd_info *mtd)
-@@ -359,10 +360,9 @@ static int m25p80_erase(struct mtd_info
-  * Read an address range from the flash chip.  The address range
-  * may be any size provided it is within the physical boundaries.
-  */
--static int m25p80_read(struct mtd_info *mtd, loff_t from, size_t len,
-+static int __m25p80_read(struct m25p *flash, loff_t from, size_t len,
-       size_t *retlen, u_char *buf)
- {
--      struct m25p *flash = mtd_to_m25p(mtd);
-       struct spi_transfer t[2];
-       struct spi_message m;
-       uint8_t opcode;
-@@ -405,6 +405,28 @@ static int m25p80_read(struct mtd_info *
-       return 0;
- }
-+static int m25p80_read(struct mtd_info *mtd, loff_t from, size_t len,
-+      size_t *retlen, u_char *buf)
-+{
-+      struct m25p *flash = mtd_to_m25p(mtd);
-+      size_t off;
-+      size_t read_len = flash->max_transfer_len;
-+      size_t part_len;
-+      int ret = 0;
-+
-+      if (!read_len)
-+              return __m25p80_read(flash, from, len, retlen, buf);
-+
-+      *retlen = 0;
-+
-+      for (off = 0; off < len && !ret; off += read_len) {
-+              ret = __m25p80_read(flash, from + off, min(len - off, read_len),
-+                                  &part_len, buf + off);
-+                      *retlen += part_len;
-+      }
-+
-+      return ret;
-+}
- /*
-  * Write an address range to the flash chip.  Data must be written in
-  * FLASH_PAGESIZE chunks.  The address range may be any size provided
-@@ -1001,6 +1023,9 @@ static int m25p_probe(struct spi_device
-       if (!flash->command)
-               return -ENOMEM;
-+      if (data)
-+              flash->max_transfer_len = data->max_transfer_len;
-+
-       flash->spi = spi;
-       mutex_init(&flash->lock);
-       spi_set_drvdata(spi, flash);
---- a/include/linux/spi/flash.h
-+++ b/include/linux/spi/flash.h
-@@ -13,6 +13,8 @@ struct mtd_part_parser_data;
-  * @part_probe_types: optional list of MTD parser names to use for
-  *    partitioning
-  *
-+ * @max_transfer_len: option maximum read/write length limitation for
-+ *    SPI controllers not able to transfer any length commands.
-  * Board init code (in arch/.../mach-xxx/board-yyy.c files) can
-  * provide information about SPI flash parts (such as DataFlash) to
-  * help set up the device and its appropriate default partitioning.
-@@ -28,6 +30,8 @@ struct flash_platform_data {
-       char            *type;
-       const char      **part_probe_types;
-+
-+      unsigned int    max_transfer_len;
-       /* we'll likely add more ... use JEDEC IDs, etc */
- };
diff --git a/target/linux/brcm63xx/patches-3.13/204-USB-OHCI-allow-other-arches-to-use-the-BE-frame-numb.patch b/target/linux/brcm63xx/patches-3.13/204-USB-OHCI-allow-other-arches-to-use-the-BE-frame-numb.patch
deleted file mode 100644 (file)
index 1f175f4..0000000
+++ /dev/null
@@ -1,31 +0,0 @@
-From b2f399dcd674a692a64bb3b300b77b78ae57b530 Mon Sep 17 00:00:00 2001
-From: Jonas Gorski <jogo@openwrt.org>
-Date: Sun, 12 Jan 2014 16:47:35 +0100
-Subject: [PATCH] USB: OHCI: allow other arches to use the BE frame number
- quirk
-
-Intead of guarding it with a certain PPC SoC and expanding the list
-for each SoC requiring it, just guard it with USB_OHCI_BIG_ENDIAN_DESC.
-
-This makes it less suprising that passing no_big_frame_no = 1 for the
-platform data does not do what expected (or
-
-Checking it for all big endian descriptor setups should not impact
-performance much as USB1.1 is rather slow anyway.
-
-Signed-off-by: Jonas Gorski <jogo@openwrt.org>
----
- drivers/usb/host/ohci.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/drivers/usb/host/ohci.h
-+++ b/drivers/usb/host/ohci.h
-@@ -650,7 +650,7 @@ static inline u32 hc32_to_cpup (const st
-  * some big-endian SOC implementations.  Same thing happens with PSW access.
-  */
--#ifdef CONFIG_PPC_MPC52xx
-+#ifdef CONFIG_USB_OHCI_BIG_ENDIAN_DESC
- #define big_endian_frame_no_quirk(ohci)       (ohci->flags & OHCI_QUIRK_FRAME_NO)
- #else
- #define big_endian_frame_no_quirk(ohci)       0
diff --git a/target/linux/brcm63xx/patches-3.13/205-USB-fix-bcm63xx_udc.patch b/target/linux/brcm63xx/patches-3.13/205-USB-fix-bcm63xx_udc.patch
deleted file mode 100644 (file)
index f13a13d..0000000
+++ /dev/null
@@ -1,168 +0,0 @@
-From a864a5b3efe9dce1647172d105559a1b850cf4c9 Mon Sep 17 00:00:00 2001
-From: Florian Fainelli <florian@openwrt.org>
-Date: Tue, 14 Jan 2014 15:29:25 -0800
-Subject: [PATCH] usb: gadget: bcm63xx_udc: fix build failure on DMA channel
- code
-
-Commit 3dc6475 ("bcm63xx_enet: add support Broadcom BCM6345 Ethernet")
-changed the ENETDMA[CS] macros such that they are no longer macros, but
-actual register offset definitions. The bcm63xx_udc driver was not
-updated, and as a result, causes the following build error to pop up:
-
- CC      drivers/usb/gadget/u_ether.o
-drivers/usb/gadget/bcm63xx_udc.c: In function 'iudma_write':
-drivers/usb/gadget/bcm63xx_udc.c:642:24: error: called object '0' is not
-a function
-drivers/usb/gadget/bcm63xx_udc.c: In function 'iudma_reset_channel':
-drivers/usb/gadget/bcm63xx_udc.c:698:46: error: called object '0' is not
-a function
-drivers/usb/gadget/bcm63xx_udc.c:700:49: error: called object '0' is not
-a function
-
-Fix this by updating usb_dmac_{read,write}l and usb_dmas_{read,write}l to
-take an extra channel argument, and use the channel width
-(ENETDMA_CHAN_WIDTH) to offset the register we want to access, hence
-doing again what the macro implicitely did for us.
-
-CC: Kevin Cernekee <cernekee@gmail.com>
-CC: Jonas Gorski <jogo@openwrt.org>
-CC: stable@vger.kernel.org
-Signed-off-by: Florian Fainelli <florian@openwrt.org>
----
-Felipe,
-
-This is against your branch as balbi/usb.git, and this fix should be applied to
-stable 3.11 onwards.
-
-Thanks!
-
- drivers/usb/gadget/bcm63xx_udc.c | 58 ++++++++++++++++++++++------------------
- 1 file changed, 32 insertions(+), 26 deletions(-)
-
---- a/drivers/usb/gadget/bcm63xx_udc.c
-+++ b/drivers/usb/gadget/bcm63xx_udc.c
-@@ -362,24 +362,30 @@ static inline void usb_dma_writel(struct
-       bcm_writel(val, udc->iudma_regs + off);
- }
--static inline u32 usb_dmac_readl(struct bcm63xx_udc *udc, u32 off)
-+static inline u32 usb_dmac_readl(struct bcm63xx_udc *udc, u32 off, int chan)
- {
--      return bcm_readl(udc->iudma_regs + IUDMA_DMAC_OFFSET + off);
-+      return bcm_readl(udc->iudma_regs + IUDMA_DMAC_OFFSET + off +
-+                      (ENETDMA_CHAN_WIDTH * chan));
- }
--static inline void usb_dmac_writel(struct bcm63xx_udc *udc, u32 val, u32 off)
-+static inline void usb_dmac_writel(struct bcm63xx_udc *udc, u32 val, u32 off,
-+                                      int chan)
- {
--      bcm_writel(val, udc->iudma_regs + IUDMA_DMAC_OFFSET + off);
-+      bcm_writel(val, udc->iudma_regs + IUDMA_DMAC_OFFSET + off +
-+                      (ENETDMA_CHAN_WIDTH * chan));
- }
--static inline u32 usb_dmas_readl(struct bcm63xx_udc *udc, u32 off)
-+static inline u32 usb_dmas_readl(struct bcm63xx_udc *udc, u32 off, int chan)
- {
--      return bcm_readl(udc->iudma_regs + IUDMA_DMAS_OFFSET + off);
-+      return bcm_readl(udc->iudma_regs + IUDMA_DMAS_OFFSET + off +
-+                      (ENETDMA_CHAN_WIDTH * chan));
- }
--static inline void usb_dmas_writel(struct bcm63xx_udc *udc, u32 val, u32 off)
-+static inline void usb_dmas_writel(struct bcm63xx_udc *udc, u32 val, u32 off,
-+                                      int chan)
- {
--      bcm_writel(val, udc->iudma_regs + IUDMA_DMAS_OFFSET + off);
-+      bcm_writel(val, udc->iudma_regs + IUDMA_DMAS_OFFSET + off +
-+                      (ENETDMA_CHAN_WIDTH * chan));
- }
- static inline void set_clocks(struct bcm63xx_udc *udc, bool is_enabled)
-@@ -639,7 +645,7 @@ static void iudma_write(struct bcm63xx_u
-       } while (!last_bd);
-       usb_dmac_writel(udc, ENETDMAC_CHANCFG_EN_MASK,
--                      ENETDMAC_CHANCFG_REG(iudma->ch_idx));
-+                      ENETDMAC_CHANCFG_REG, iudma->ch_idx);
- }
- /**
-@@ -695,9 +701,9 @@ static void iudma_reset_channel(struct b
-               bcm63xx_fifo_reset_ep(udc, max(0, iudma->ep_num));
-       /* stop DMA, then wait for the hardware to wrap up */
--      usb_dmac_writel(udc, 0, ENETDMAC_CHANCFG_REG(ch_idx));
-+      usb_dmac_writel(udc, 0, ENETDMAC_CHANCFG_REG, ch_idx);
--      while (usb_dmac_readl(udc, ENETDMAC_CHANCFG_REG(ch_idx)) &
-+      while (usb_dmac_readl(udc, ENETDMAC_CHANCFG_REG, ch_idx) &
-                                  ENETDMAC_CHANCFG_EN_MASK) {
-               udelay(1);
-@@ -714,10 +720,10 @@ static void iudma_reset_channel(struct b
-                       dev_warn(udc->dev, "forcibly halting IUDMA channel %d\n",
-                                ch_idx);
-                       usb_dmac_writel(udc, ENETDMAC_CHANCFG_BUFHALT_MASK,
--                                      ENETDMAC_CHANCFG_REG(ch_idx));
-+                                      ENETDMAC_CHANCFG_REG, ch_idx);
-               }
-       }
--      usb_dmac_writel(udc, ~0, ENETDMAC_IR_REG(ch_idx));
-+      usb_dmac_writel(udc, ~0, ENETDMAC_IR_REG, ch_idx);
-       /* don't leave "live" HW-owned entries for the next guy to step on */
-       for (d = iudma->bd_ring; d <= iudma->end_bd; d++)
-@@ -729,11 +735,11 @@ static void iudma_reset_channel(struct b
-       /* set up IRQs, UBUS burst size, and BD base for this channel */
-       usb_dmac_writel(udc, ENETDMAC_IR_BUFDONE_MASK,
--                      ENETDMAC_IRMASK_REG(ch_idx));
--      usb_dmac_writel(udc, 8, ENETDMAC_MAXBURST_REG(ch_idx));
-+                      ENETDMAC_IRMASK_REG, ch_idx);
-+      usb_dmac_writel(udc, 8, ENETDMAC_MAXBURST_REG, ch_idx);
--      usb_dmas_writel(udc, iudma->bd_ring_dma, ENETDMAS_RSTART_REG(ch_idx));
--      usb_dmas_writel(udc, 0, ENETDMAS_SRAM2_REG(ch_idx));
-+      usb_dmas_writel(udc, iudma->bd_ring_dma, ENETDMAS_RSTART_REG, ch_idx);
-+      usb_dmas_writel(udc, 0, ENETDMAS_SRAM2_REG, ch_idx);
- }
- /**
-@@ -2016,7 +2022,7 @@ static irqreturn_t bcm63xx_udc_data_isr(
-       spin_lock(&udc->lock);
-       usb_dmac_writel(udc, ENETDMAC_IR_BUFDONE_MASK,
--                      ENETDMAC_IR_REG(iudma->ch_idx));
-+                      ENETDMAC_IR_REG, iudma->ch_idx);
-       bep = iudma->bep;
-       rc = iudma_read(udc, iudma);
-@@ -2156,18 +2162,18 @@ static int bcm63xx_iudma_dbg_show(struct
-               seq_printf(s, " [ep%d]:\n",
-                          max_t(int, iudma_defaults[ch_idx].ep_num, 0));
-               seq_printf(s, "  cfg: %08x; irqstat: %08x; irqmask: %08x; maxburst: %08x\n",
--                         usb_dmac_readl(udc, ENETDMAC_CHANCFG_REG(ch_idx)),
--                         usb_dmac_readl(udc, ENETDMAC_IR_REG(ch_idx)),
--                         usb_dmac_readl(udc, ENETDMAC_IRMASK_REG(ch_idx)),
--                         usb_dmac_readl(udc, ENETDMAC_MAXBURST_REG(ch_idx)));
-+                         usb_dmac_readl(udc, ENETDMAC_CHANCFG_REG, ch_idx),
-+                         usb_dmac_readl(udc, ENETDMAC_IR_REG, ch_idx),
-+                         usb_dmac_readl(udc, ENETDMAC_IRMASK_REG, ch_idx),
-+                         usb_dmac_readl(udc, ENETDMAC_MAXBURST_REG, ch_idx));
--              sram2 = usb_dmas_readl(udc, ENETDMAS_SRAM2_REG(ch_idx));
--              sram3 = usb_dmas_readl(udc, ENETDMAS_SRAM3_REG(ch_idx));
-+              sram2 = usb_dmas_readl(udc, ENETDMAS_SRAM2_REG, ch_idx);
-+              sram3 = usb_dmas_readl(udc, ENETDMAS_SRAM3_REG, ch_idx);
-               seq_printf(s, "  base: %08x; index: %04x_%04x; desc: %04x_%04x %08x\n",
--                         usb_dmas_readl(udc, ENETDMAS_RSTART_REG(ch_idx)),
-+                         usb_dmas_readl(udc, ENETDMAS_RSTART_REG, ch_idx),
-                          sram2 >> 16, sram2 & 0xffff,
-                          sram3 >> 16, sram3 & 0xffff,
--                         usb_dmas_readl(udc, ENETDMAS_SRAM4_REG(ch_idx)));
-+                         usb_dmas_readl(udc, ENETDMAS_SRAM4_REG, ch_idx));
-               seq_printf(s, "  desc: %d/%d used", iudma->n_bds_used,
-                          iudma->n_bds);
diff --git a/target/linux/brcm63xx/patches-3.13/206-USB-EHCI-allow-limiting-ports-for-ehci-platform.patch b/target/linux/brcm63xx/patches-3.13/206-USB-EHCI-allow-limiting-ports-for-ehci-platform.patch
deleted file mode 100644 (file)
index 7375acb..0000000
+++ /dev/null
@@ -1,65 +0,0 @@
-From 6ac09efa8f0e189ffe7dd7b0889289de56ee44cc Mon Sep 17 00:00:00 2001
-From: Jonas Gorski <jogo@openwrt.org>
-Date: Sun, 19 Jan 2014 12:18:03 +0100
-Subject: [PATCH] USB: EHCI: allow limiting ports for ehci-platform
-
-In the same way as the ohci platform driver allows limiting ports,
-enable the same for ehci. This prevents a mismatch in the available
-ports between ehci/ohci on USB 2.0 controllers.
-
-This is needed if the USB host controller always reports the maximum
-number of ports regardless of the number of available ports (because
-one might be set to be usb device).
-
-Signed-off-by: Jonas Gorski <jogo@openwrt.org>
----
- drivers/usb/host/ehci-hcd.c      | 4 ++++
- drivers/usb/host/ehci-platform.c | 2 ++
- drivers/usb/host/ehci.h          | 1 +
- include/linux/usb/ehci_pdriver.h | 1 +
- 4 files changed, 8 insertions(+)
-
---- a/drivers/usb/host/ehci-hcd.c
-+++ b/drivers/usb/host/ehci-hcd.c
-@@ -661,6 +661,10 @@ int ehci_setup(struct usb_hcd *hcd)
-       /* cache this readonly data; minimize chip reads */
-       ehci->hcs_params = ehci_readl(ehci, &ehci->caps->hcs_params);
-+      if (ehci->num_ports) {
-+              ehci->hcs_params &= ~0xf; /* bits 3:0, ports on HC */
-+              ehci->hcs_params |= ehci->num_ports;
-+      }
-       ehci->sbrn = HCD_USB2;
---- a/drivers/usb/host/ehci-platform.c
-+++ b/drivers/usb/host/ehci-platform.c
-@@ -48,6 +48,8 @@ static int ehci_platform_reset(struct us
-       ehci->big_endian_desc = pdata->big_endian_desc;
-       ehci->big_endian_mmio = pdata->big_endian_mmio;
-       ehci->ignore_oc = pdata->ignore_oc;
-+      if (pdata->num_ports && pdata->num_ports <= 15)
-+              ehci->num_ports = pdata->num_ports;
-       if (pdata->pre_setup) {
-               retval = pdata->pre_setup(hcd);
---- a/drivers/usb/host/ehci.h
-+++ b/drivers/usb/host/ehci.h
-@@ -213,6 +213,7 @@ struct ehci_hcd {                  /* one per controlle
-       u32                     command;
-       /* SILICON QUIRKS */
-+      unsigned int            num_ports;
-       unsigned                no_selective_suspend:1;
-       unsigned                has_fsl_port_bug:1; /* FreeScale */
-       unsigned                big_endian_mmio:1;
---- a/include/linux/usb/ehci_pdriver.h
-+++ b/include/linux/usb/ehci_pdriver.h
-@@ -40,6 +40,7 @@ struct usb_hcd;
-  */
- struct usb_ehci_pdata {
-       int             caps_offset;
-+      unsigned int    num_ports;
-       unsigned        has_tt:1;
-       unsigned        has_synopsys_hc_bug:1;
-       unsigned        big_endian_desc:1;
diff --git a/target/linux/brcm63xx/patches-3.13/300-reset_buttons.patch b/target/linux/brcm63xx/patches-3.13/300-reset_buttons.patch
deleted file mode 100644 (file)
index 0886f6c..0000000
+++ /dev/null
@@ -1,116 +0,0 @@
---- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
-+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -12,6 +12,8 @@
- #include <linux/string.h>
- #include <linux/platform_device.h>
- #include <linux/ssb/ssb.h>
-+#include <linux/gpio_keys.h>
-+#include <linux/input.h>
- #include <asm/addrspace.h>
- #include <bcm63xx_board.h>
- #include <bcm63xx_cpu.h>
-@@ -37,6 +39,9 @@
- #define HCS_OFFSET_128K                       0x20000
-+#define BCM963XX_KEYS_POLL_INTERVAL   20
-+#define BCM963XX_KEYS_DEBOUNCE_INTERVAL       (BCM963XX_KEYS_POLL_INTERVAL * 3)
-+
- static struct board_info board;
- /*
-@@ -380,6 +385,16 @@ static struct board_info __initdata boar
-                       .active_low     = 1,
-               },
-       },
-+      .buttons = {
-+              {
-+                      .desc           = "reset",
-+                      .gpio           = 33,
-+                      .active_low     = 1,
-+                      .type           = EV_KEY,
-+                      .code           = KEY_RESTART,
-+                      .debounce_interval = BCM963XX_KEYS_DEBOUNCE_INTERVAL,
-+              },
-+      },
- };
- static struct board_info __initdata board_96348gw = {
-@@ -438,6 +453,16 @@ static struct board_info __initdata boar
-                       .active_low     = 1,
-               },
-       },
-+      .buttons = {
-+              {
-+                      .desc           = "reset",
-+                      .gpio           = 36,
-+                      .active_low     = 1,
-+                      .type           = EV_KEY,
-+                      .code           = KEY_RESTART,
-+                      .debounce_interval = BCM963XX_KEYS_DEBOUNCE_INTERVAL,
-+              },
-+      },
- };
- static struct board_info __initdata board_FAST2404 = {
-@@ -871,11 +896,23 @@ static struct platform_device bcm63xx_gp
-       .dev.platform_data      = &bcm63xx_led_data,
- };
-+static struct gpio_keys_platform_data bcm63xx_gpio_keys_data = {
-+      .poll_interval  = BCM963XX_KEYS_POLL_INTERVAL,
-+};
-+
-+static struct platform_device bcm63xx_gpio_keys_device = {
-+      .name           = "gpio-keys-polled",
-+      .id             = 0,
-+      .dev.platform_data = &bcm63xx_gpio_keys_data,
-+};
-+
- /*
-  * third stage init callback, register all board devices.
-  */
- int __init board_register_devices(void)
- {
-+      int button_count = 0;
-+
-       if (board.has_uart0)
-               bcm63xx_uart_register(0);
-@@ -937,5 +974,16 @@ int __init board_register_devices(void)
-               gpio_request_one(board.ephy_reset_gpio,
-                               board.ephy_reset_gpio_flags, "ephy-reset");
-+      /* count number of BUTTONs defined by this device */
-+      while (button_count < ARRAY_SIZE(board.buttons) && board.buttons[button_count].desc)
-+              button_count++;
-+
-+      if (button_count) {
-+              bcm63xx_gpio_keys_data.nbuttons = button_count;
-+              bcm63xx_gpio_keys_data.buttons = board.buttons;
-+
-+              platform_device_register(&bcm63xx_gpio_keys_device);
-+      }
-+
-       return 0;
- }
---- a/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h
-+++ b/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h
-@@ -3,6 +3,7 @@
- #include <linux/types.h>
- #include <linux/gpio.h>
-+#include <linux/gpio_keys.h>
- #include <linux/leds.h>
- #include <bcm63xx_dev_enet.h>
- #include <bcm63xx_dev_usb_usbd.h>
-@@ -48,6 +49,9 @@ struct board_info {
-       /* GPIO LEDs */
-       struct gpio_led leds[5];
-+      /* Buttons */
-+      struct gpio_keys_button buttons[4];
-+
-       /* External PHY reset GPIO */
-       unsigned int ephy_reset_gpio;
diff --git a/target/linux/brcm63xx/patches-3.13/301-led_count.patch b/target/linux/brcm63xx/patches-3.13/301-led_count.patch
deleted file mode 100644 (file)
index 5b9a12e..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
---- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
-+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -912,6 +912,7 @@ static struct platform_device bcm63xx_gp
- int __init board_register_devices(void)
- {
-       int button_count = 0;
-+      int led_count = 0;
-       if (board.has_uart0)
-               bcm63xx_uart_register(0);
-@@ -965,10 +966,16 @@ int __init board_register_devices(void)
-       bcm63xx_flash_register();
--      bcm63xx_led_data.num_leds = ARRAY_SIZE(board.leds);
--      bcm63xx_led_data.leds = board.leds;
-+      /* count number of LEDs defined by this device */
-+      while (led_count < ARRAY_SIZE(board.leds) && board.leds[led_count].name)
-+              led_count++;
-+
-+      if (led_count) {
-+              bcm63xx_led_data.num_leds = led_count;
-+              bcm63xx_led_data.leds = board.leds;
--      platform_device_register(&bcm63xx_gpio_leds);
-+              platform_device_register(&bcm63xx_gpio_leds);
-+      }
-       if (board.ephy_reset_gpio && board.ephy_reset_gpio_flags)
-               gpio_request_one(board.ephy_reset_gpio,
---- a/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h
-+++ b/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h
-@@ -47,7 +47,7 @@ struct board_info {
-       struct bcm63xx_dsp_platform_data dsp;
-       /* GPIO LEDs */
--      struct gpio_led leds[5];
-+      struct gpio_led leds[14];
-       /* Buttons */
-       struct gpio_keys_button buttons[4];
diff --git a/target/linux/brcm63xx/patches-3.13/302-extended-platform-devices.patch b/target/linux/brcm63xx/patches-3.13/302-extended-platform-devices.patch
deleted file mode 100644 (file)
index 2810b6f..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
---- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
-+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -964,6 +964,9 @@ int __init board_register_devices(void)
-       bcm63xx_hsspi_register();
-+      if (board.num_devs)
-+              platform_add_devices(board.devs, board.num_devs);
-+
-       bcm63xx_flash_register();
-       /* count number of LEDs defined by this device */
---- a/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h
-+++ b/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h
-@@ -57,6 +57,10 @@ struct board_info {
-       /* External PHY reset GPIO flags from gpio.h */
-       unsigned long ephy_reset_gpio_flags;
-+
-+      /* Additional platform devices */
-+      struct platform_device **devs;
-+      unsigned int    num_devs;
- };
- #endif /* ! BOARD_BCM963XX_H_ */
diff --git a/target/linux/brcm63xx/patches-3.13/303-spi-board-info.patch b/target/linux/brcm63xx/patches-3.13/303-spi-board-info.patch
deleted file mode 100644 (file)
index 0258710..0000000
+++ /dev/null
@@ -1,33 +0,0 @@
---- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
-+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -14,6 +14,7 @@
- #include <linux/ssb/ssb.h>
- #include <linux/gpio_keys.h>
- #include <linux/input.h>
-+#include <linux/spi/spi.h>
- #include <asm/addrspace.h>
- #include <bcm63xx_board.h>
- #include <bcm63xx_cpu.h>
-@@ -967,6 +968,9 @@ int __init board_register_devices(void)
-       if (board.num_devs)
-               platform_add_devices(board.devs, board.num_devs);
-+      if (board.num_spis)
-+              spi_register_board_info(board.spis, board.num_spis);
-+
-       bcm63xx_flash_register();
-       /* count number of LEDs defined by this device */
---- a/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h
-+++ b/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h
-@@ -61,6 +61,10 @@ struct board_info {
-       /* Additional platform devices */
-       struct platform_device **devs;
-       unsigned int    num_devs;
-+
-+      /* Additional platform devices */
-+      struct spi_board_info *spis;
-+      unsigned int    num_spis;
- };
- #endif /* ! BOARD_BCM963XX_H_ */
diff --git a/target/linux/brcm63xx/patches-3.13/304-boardid_fixup.patch b/target/linux/brcm63xx/patches-3.13/304-boardid_fixup.patch
deleted file mode 100644 (file)
index 937b9d6..0000000
+++ /dev/null
@@ -1,62 +0,0 @@
---- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
-+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -35,6 +35,7 @@
- #include <board_bcm963xx.h>
- #include <uapi/linux/bcm933xx_hcs.h>
-+#include <uapi/linux/bcm963xx_tag.h>
- #define PFX   "board_bcm963xx: "
-@@ -43,6 +44,9 @@
- #define BCM963XX_KEYS_POLL_INTERVAL   20
- #define BCM963XX_KEYS_DEBOUNCE_INTERVAL       (BCM963XX_KEYS_POLL_INTERVAL * 3)
-+#define CFE_OFFSET_64K                        0x10000
-+#define CFE_OFFSET_128K                       0x20000
-+
- static struct board_info board;
- /*
-@@ -782,6 +786,30 @@ const char *board_get_name(void)
-       return board.name;
- }
-+static void __init boardid_fixup(u8 *boot_addr)
-+{
-+      struct bcm_tag *tag = (struct bcm_tag *)(boot_addr + CFE_OFFSET_64K);
-+      char *board_name = (char *)bcm63xx_nvram_get_name();
-+
-+      /* check if bcm_tag is at 64k offset */
-+      if (strncmp(board_name, tag->board_id, BOARDID_LEN) != 0) {
-+              /* else try 128k */
-+              tag = (struct bcm_tag *)(boot_addr + CFE_OFFSET_128K);
-+              if (strncmp(board_name, tag->board_id, BOARDID_LEN) != 0) {
-+                      /* No tag found */
-+                      printk(KERN_DEBUG "No bcm_tag found!\n");
-+                      return;
-+              }
-+      }
-+      /* check if we should override the boardid */
-+      if (tag->information1[0] != '+')
-+              return;
-+
-+      strncpy(board_name, &tag->information1[1], BOARDID_LEN);
-+
-+      printk(KERN_INFO "Overriding boardid with '%s'\n", board_name);
-+}
-+
- /*
-  * early init callback, read nvram data from flash and checksum it
-  */
-@@ -820,6 +848,10 @@ void __init board_prom_init(void)
-               hcs = (struct bcm_hcs *)boot_addr;
-               board_name = hcs->filename;
-       } else {
-+              if (strcmp(cfe_version, "unknown") != 0) {
-+                      /* cfe present */
-+                      boardid_fixup(boot_addr);
-+              }
-               board_name = bcm63xx_nvram_get_name();
-       }
-       /* find board by name */
diff --git a/target/linux/brcm63xx/patches-3.13/308-board_leds_naming.patch b/target/linux/brcm63xx/patches-3.13/308-board_leds_naming.patch
deleted file mode 100644 (file)
index 0064066..0000000
+++ /dev/null
@@ -1,267 +0,0 @@
---- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
-+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -148,28 +148,28 @@ static struct board_info __initdata boar
-       .leds = {
-               {
--                      .name           = "adsl",
-+                      .name           = "96338GW:green:adsl",
-                       .gpio           = 3,
-                       .active_low     = 1,
-               },
-               {
--                      .name           = "ses",
-+                      .name           = "96338GW:green:ses",
-                       .gpio           = 5,
-                       .active_low     = 1,
-               },
-               {
--                      .name           = "ppp-fail",
-+                      .name           = "96338GW:green:ppp-fail",
-                       .gpio           = 4,
-                       .active_low     = 1,
-               },
-               {
--                      .name           = "power",
-+                      .name           = "96338GW:green:power",
-                       .gpio           = 0,
-                       .active_low     = 1,
-                       .default_trigger = "default-on",
-               },
-               {
--                      .name           = "stop",
-+                      .name           = "96338GW:green:stop",
-                       .gpio           = 1,
-                       .active_low     = 1,
-               }
-@@ -189,28 +189,28 @@ static struct board_info __initdata boar
-       .leds = {
-               {
--                      .name           = "adsl",
-+                      .name           = "96338W:green:adsl",
-                       .gpio           = 3,
-                       .active_low     = 1,
-               },
-               {
--                      .name           = "ses",
-+                      .name           = "96338W:green:ses",
-                       .gpio           = 5,
-                       .active_low     = 1,
-               },
-               {
--                      .name           = "ppp-fail",
-+                      .name           = "96338W:green:ppp-fail",
-                       .gpio           = 4,
-                       .active_low     = 1,
-               },
-               {
--                      .name           = "power",
-+                      .name           = "96338W:green:power",
-                       .gpio           = 0,
-                       .active_low     = 1,
-                       .default_trigger = "default-on",
-               },
-               {
--                      .name           = "stop",
-+                      .name           = "96338W:green:stop",
-                       .gpio           = 1,
-                       .active_low     = 1,
-               },
-@@ -249,29 +249,29 @@ static struct board_info __initdata boar
-       .leds = {
-               {
--                      .name           = "adsl-fail",
-+                      .name           = "96348R:green:adsl-fail",
-                       .gpio           = 2,
-                       .active_low     = 1,
-               },
-               {
--                      .name           = "ppp",
-+                      .name           = "96348R:green:ppp",
-                       .gpio           = 3,
-                       .active_low     = 1,
-               },
-               {
--                      .name           = "ppp-fail",
-+                      .name           = "96348R:green:ppp-fail",
-                       .gpio           = 4,
-                       .active_low     = 1,
-               },
-               {
--                      .name           = "power",
-+                      .name           = "96348R:green:power",
-                       .gpio           = 0,
-                       .active_low     = 1,
-                       .default_trigger = "default-on",
-               },
-               {
--                      .name           = "stop",
-+                      .name           = "96348R:green:stop",
-                       .gpio           = 1,
-                       .active_low     = 1,
-               },
-@@ -310,28 +310,28 @@ static struct board_info __initdata boar
-       .leds = {
-               {
--                      .name           = "adsl-fail",
-+                      .name           = "96348GW-10:green:adsl-fail",
-                       .gpio           = 2,
-                       .active_low     = 1,
-               },
-               {
--                      .name           = "ppp",
-+                      .name           = "96348GW-10:green:ppp",
-                       .gpio           = 3,
-                       .active_low     = 1,
-               },
-               {
--                      .name           = "ppp-fail",
-+                      .name           = "96348GW-10:green:ppp-fail",
-                       .gpio           = 4,
-                       .active_low     = 1,
-               },
-               {
--                      .name           = "power",
-+                      .name           = "96348GW-10:green:power",
-                       .gpio           = 0,
-                       .active_low     = 1,
-                       .default_trigger = "default-on",
-               },
-               {
--                      .name           = "stop",
-+                      .name           = "96348GW-10:green:stop",
-                       .gpio           = 1,
-                       .active_low     = 1,
-               },
-@@ -364,28 +364,28 @@ static struct board_info __initdata boar
-       .leds = {
-               {
--                      .name           = "adsl-fail",
-+                      .name           = "96348GW-11:green:adsl-fail",
-                       .gpio           = 2,
-                       .active_low     = 1,
-               },
-               {
--                      .name           = "ppp",
-+                      .name           = "96348GW-11:green:ppp",
-                       .gpio           = 3,
-                       .active_low     = 1,
-               },
-               {
--                      .name           = "ppp-fail",
-+                      .name           = "96348GW-11:green:ppp-fail",
-                       .gpio           = 4,
-                       .active_low     = 1,
-               },
-               {
--                      .name           = "power",
-+                      .name           = "96348GW-11:green:power",
-                       .gpio           = 0,
-                       .active_low     = 1,
-                       .default_trigger = "default-on",
-               },
-               {
--                      .name           = "stop",
-+                      .name           = "96348GW-11:green:stop",
-                       .gpio           = 1,
-                       .active_low     = 1,
-               },
-@@ -432,28 +432,28 @@ static struct board_info __initdata boar
-       .leds = {
-               {
--                      .name           = "adsl-fail",
-+                      .name           = "96348GW:green:adsl-fail",
-                       .gpio           = 2,
-                       .active_low     = 1,
-               },
-               {
--                      .name           = "ppp",
-+                      .name           = "96348GW:green:ppp",
-                       .gpio           = 3,
-                       .active_low     = 1,
-               },
-               {
--                      .name           = "ppp-fail",
-+                      .name           = "96348GW:green:ppp-fail",
-                       .gpio           = 4,
-                       .active_low     = 1,
-               },
-               {
--                      .name           = "power",
-+                      .name           = "96348GW:green:power",
-                       .gpio           = 0,
-                       .active_low     = 1,
-                       .default_trigger = "default-on",
-               },
-               {
--                      .name           = "stop",
-+                      .name           = "96348GW:green:stop",
-                       .gpio           = 1,
-                       .active_low     = 1,
-               },
-@@ -585,27 +585,27 @@ static struct board_info __initdata boar
-       .leds = {
-               {
--                      .name           = "adsl-fail",
-+                      .name           = "96358VW:green:adsl-fail",
-                       .gpio           = 15,
-                       .active_low     = 1,
-               },
-               {
--                      .name           = "ppp",
-+                      .name           = "96358VW:green:ppp",
-                       .gpio           = 22,
-                       .active_low     = 1,
-               },
-               {
--                      .name           = "ppp-fail",
-+                      .name           = "96358VW:green:ppp-fail",
-                       .gpio           = 23,
-                       .active_low     = 1,
-               },
-               {
--                      .name           = "power",
-+                      .name           = "96358VW:green:power",
-                       .gpio           = 4,
-                       .default_trigger = "default-on",
-               },
-               {
--                      .name           = "stop",
-+                      .name           = "96358VW:green:stop",
-                       .gpio           = 5,
-               },
-       },
-@@ -637,22 +637,22 @@ static struct board_info __initdata boar
-       .leds = {
-               {
--                      .name           = "adsl",
-+                      .name           = "96358VW2:green:adsl",
-                       .gpio           = 22,
-                       .active_low     = 1,
-               },
-               {
--                      .name           = "ppp-fail",
-+                      .name           = "96358VW2:green:ppp-fail",
-                       .gpio           = 23,
-               },
-               {
--                      .name           = "power",
-+                      .name           = "96358VW2:green:power",
-                       .gpio           = 5,
-                       .active_low     = 1,
-                       .default_trigger = "default-on",
-               },
-               {
--                      .name           = "stop",
-+                      .name           = "96358VW2:green:stop",
-                       .gpio           = 4,
-                       .active_low     = 1,
-               },
diff --git a/target/linux/brcm63xx/patches-3.13/309-cfe_version_mod.patch b/target/linux/brcm63xx/patches-3.13/309-cfe_version_mod.patch
deleted file mode 100644 (file)
index dfc3384..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
---- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
-+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -835,10 +835,20 @@ void __init board_prom_init(void)
-       /* dump cfe version */
-       cfe = boot_addr + BCM963XX_CFE_VERSION_OFFSET;
--      if (!memcmp(cfe, "cfe-v", 5))
--              snprintf(cfe_version, sizeof(cfe_version), "%u.%u.%u-%u.%u",
--                       cfe[5], cfe[6], cfe[7], cfe[8], cfe[9]);
--      else
-+      if (strstarts(cfe, "cfe-")) {
-+              if(cfe[4] == 'v') {
-+                      if(cfe[5] == 'd')
-+                              snprintf(cfe_version, 11, "%s", (char *) &cfe[5]);
-+                      else if (cfe[10] > 0)
-+                              snprintf(cfe_version, sizeof(cfe_version), "%u.%u.%u-%u.%u-%u",
-+                                       cfe[5], cfe[6], cfe[7], cfe[8], cfe[9], cfe[10]);
-+                      else
-+                              snprintf(cfe_version, sizeof(cfe_version), "%u.%u.%u-%u.%u",
-+                                       cfe[5], cfe[6], cfe[7], cfe[8], cfe[9]);
-+              } else {
-+                      snprintf(cfe_version, 12, "%s", (char *) &cfe[4]);
-+              }
-+      } else
-               strcpy(cfe_version, "unknown");
-       printk(KERN_INFO PFX "CFE version: %s\n", cfe_version);
diff --git a/target/linux/brcm63xx/patches-3.13/310-MIPS-BCM63XX-remove-RUNTIME_DETECT-code-from-registe.patch b/target/linux/brcm63xx/patches-3.13/310-MIPS-BCM63XX-remove-RUNTIME_DETECT-code-from-registe.patch
deleted file mode 100644 (file)
index 04b3426..0000000
+++ /dev/null
@@ -1,61 +0,0 @@
-From 082a49f0490008b999db80e3ccf1521c7dd21cec Mon Sep 17 00:00:00 2001
-From: Jonas Gorski <jogo@openwrt.org>
-Date: Mon, 2 Dec 2013 12:32:44 +0100
-Subject: [PATCH 1/8] MIPS: BCM63XX: remove !RUNTIME_DETECT code from register
- sets
-
-Signed-off-by: Jonas Gorski <jogo@openwrt.org>
----
- arch/mips/include/asm/mach-bcm63xx/bcm63xx_cpu.h | 33 ------------------------
- 1 file changed, 33 deletions(-)
-
---- a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_cpu.h
-+++ b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_cpu.h
-@@ -598,10 +598,6 @@ enum bcm63xx_regs_set {
- extern const unsigned long *bcm63xx_regs_base;
--#define __GEN_RSET_BASE(__cpu, __rset)                                        \
--      case RSET_## __rset :                                           \
--              return BCM_## __cpu ##_## __rset ##_BASE;
--
- #define __GEN_RSET(__cpu)                                             \
-       switch (set) {                                                  \
-       __GEN_RSET_BASE(__cpu, DSL_LMEM)                                \
-@@ -693,36 +689,7 @@ extern const unsigned long *bcm63xx_regs
- static inline unsigned long bcm63xx_regset_address(enum bcm63xx_regs_set set)
- {
--#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
--#ifdef CONFIG_BCM63XX_CPU_6338
--      __GEN_RSET(6338)
--#endif
--#ifdef CONFIG_BCM63XX_CPU_6345
--      __GEN_RSET(6345)
--#endif
--#ifdef CONFIG_BCM63XX_CPU_6348
--      __GEN_RSET(6348)
--#endif
--#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
--#endif
--      /* unreached */
--      return 0;
- }
- /*
diff --git a/target/linux/brcm63xx/patches-3.13/311-MIPS-BCM63XX-remove-RUNTIME_DETECT-from-irq-setup-co.patch b/target/linux/brcm63xx/patches-3.13/311-MIPS-BCM63XX-remove-RUNTIME_DETECT-from-irq-setup-co.patch
deleted file mode 100644 (file)
index 9226530..0000000
+++ /dev/null
@@ -1,135 +0,0 @@
-From 07d0224576cbb2e6ac680b4ade4bba7a49bd0a07 Mon Sep 17 00:00:00 2001
-From: Jonas Gorski <jogo@openwrt.org>
-Date: Mon, 2 Dec 2013 12:34:11 +0100
-Subject: [PATCH 2/8] MIPS: BCM63XX: remove !RUNTIME_DETECT from irq setup code
-
-Signed-off-by: Jonas Gorski <jogo@openwrt.org>
----
- arch/mips/bcm63xx/irq.c | 109 ------------------------------------------------
- 1 file changed, 109 deletions(-)
-
---- a/arch/mips/bcm63xx/irq.c
-+++ b/arch/mips/bcm63xx/irq.c
-@@ -26,114 +26,6 @@ static void __internal_irq_mask_64(unsig
- static void __internal_irq_unmask_32(unsigned int irq) __maybe_unused;
- 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
--#define irq_bits              64
--#define is_ext_irq_cascaded   1
--#define ext_irq_start         (BCM_6328_EXT_IRQ0 - IRQ_INTERNAL_BASE)
--#define ext_irq_end           (BCM_6328_EXT_IRQ3 - IRQ_INTERNAL_BASE)
--#define ext_irq_count         4
--#define ext_irq_cfg_reg1      PERF_EXTIRQ_CFG_REG_6328
--#define ext_irq_cfg_reg2      0
--#endif
--#ifdef CONFIG_BCM63XX_CPU_6338
--#define irq_stat_reg          PERF_IRQSTAT_6338_REG
--#define irq_mask_reg          PERF_IRQMASK_6338_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_6338
--#define ext_irq_cfg_reg2      0
--#endif
--#ifdef CONFIG_BCM63XX_CPU_6345
--#define irq_stat_reg          PERF_IRQSTAT_6345_REG
--#define irq_mask_reg          PERF_IRQMASK_6345_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_6345
--#define ext_irq_cfg_reg2      0
--#endif
--#ifdef CONFIG_BCM63XX_CPU_6348
--#define irq_stat_reg          PERF_IRQSTAT_6348_REG
--#define irq_mask_reg          PERF_IRQMASK_6348_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_6348
--#define ext_irq_cfg_reg2      0
--#endif
--#ifdef CONFIG_BCM63XX_CPU_6358
--#define irq_stat_reg          PERF_IRQSTAT_6358_REG
--#define irq_mask_reg          PERF_IRQMASK_6358_REG
--#define irq_bits              32
--#define is_ext_irq_cascaded   1
--#define ext_irq_start         (BCM_6358_EXT_IRQ0 - IRQ_INTERNAL_BASE)
--#define ext_irq_end           (BCM_6358_EXT_IRQ3 - IRQ_INTERNAL_BASE)
--#define ext_irq_count         4
--#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
--#define irq_bits              64
--#define is_ext_irq_cascaded   1
--#define ext_irq_start         (BCM_6368_EXT_IRQ0 - IRQ_INTERNAL_BASE)
--#define ext_irq_end           (BCM_6368_EXT_IRQ5 - IRQ_INTERNAL_BASE)
--#define ext_irq_count         6
--#define ext_irq_cfg_reg1      PERF_EXTIRQ_CFG_REG_6368
--#define ext_irq_cfg_reg2      PERF_EXTIRQ_CFG_REG2_6368
--#endif
--
--#if irq_bits == 32
--#define dispatch_internal                     __dispatch_internal
--#define internal_irq_mask                     __internal_irq_mask_32
--#define internal_irq_unmask                   __internal_irq_unmask_32
--#else
--#define dispatch_internal                     __dispatch_internal_64
--#define internal_irq_mask                     __internal_irq_mask_64
--#define internal_irq_unmask                   __internal_irq_unmask_64
--#endif
--
--#define irq_stat_addr (bcm63xx_regset_address(RSET_PERF) + irq_stat_reg)
--#define irq_mask_addr (bcm63xx_regset_address(RSET_PERF) + irq_mask_reg)
--
--static inline void bcm63xx_init_irq(void)
--{
--}
--#else /* ! BCMCPU_RUNTIME_DETECT */
--
- static u32 irq_stat_addr, irq_mask_addr;
- static void (*dispatch_internal)(void);
- static int is_ext_irq_cascaded;
-@@ -234,7 +126,6 @@ static void bcm63xx_init_irq(void)
-               internal_irq_unmask = __internal_irq_unmask_64;
-       }
- }
--#endif /* ! BCMCPU_RUNTIME_DETECT */
- static inline u32 get_ext_irq_perf_reg(int irq)
- {
diff --git a/target/linux/brcm63xx/patches-3.13/312-MIPS-BCM63XX-remove-RUNTIME_DETECT-from-reset-code.patch b/target/linux/brcm63xx/patches-3.13/312-MIPS-BCM63XX-remove-RUNTIME_DETECT-from-reset-code.patch
deleted file mode 100644 (file)
index f26624e..0000000
+++ /dev/null
@@ -1,85 +0,0 @@
-From 72578a46543821c5b9544842e45fcbed0c1b7eb8 Mon Sep 17 00:00:00 2001
-From: Jonas Gorski <jogo@openwrt.org>
-Date: Tue, 3 Dec 2013 13:35:12 +0100
-Subject: [PATCH 3/8] MIPS: BCM63XX: remove !RUNTIME_DETECT from reset code
-
----
- arch/mips/bcm63xx/reset.c | 60 -----------------------------------------------
- 1 file changed, 60 deletions(-)
-
---- a/arch/mips/bcm63xx/reset.c
-+++ b/arch/mips/bcm63xx/reset.c
-@@ -125,8 +125,6 @@
- #define BCM6368_RESET_PCIE    0
- #define BCM6368_RESET_PCIE_EXT        0
--#ifdef BCMCPU_RUNTIME_DETECT
--
- /*
-  * core reset bits
-  */
-@@ -188,64 +186,6 @@ static int __init bcm63xx_reset_bits_ini
-       return 0;
- }
--#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)
--};
--#define reset_reg PERF_SOFTRESET_6328_REG
--#endif
--
--#ifdef CONFIG_BCM63XX_CPU_6338
--static const u32 bcm63xx_reset_bits[] = {
--      __GEN_RESET_BITS_TABLE(6338)
--};
--#define reset_reg PERF_SOFTRESET_REG
--#endif
--
--#ifdef CONFIG_BCM63XX_CPU_6345
--static const u32 bcm63xx_reset_bits[] = { };
--#define reset_reg 0
--#endif
--
--#ifdef CONFIG_BCM63XX_CPU_6348
--static const u32 bcm63xx_reset_bits[] = {
--      __GEN_RESET_BITS_TABLE(6348)
--};
--#define reset_reg PERF_SOFTRESET_REG
--#endif
--
--#ifdef CONFIG_BCM63XX_CPU_6358
--static const u32 bcm63xx_reset_bits[] = {
--      __GEN_RESET_BITS_TABLE(6358)
--};
--#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)
--};
--#define reset_reg PERF_SOFTRESET_6368_REG
--#endif
--
--static int __init bcm63xx_reset_bits_init(void) { return 0; }
--#endif
- static DEFINE_SPINLOCK(reset_mutex);
diff --git a/target/linux/brcm63xx/patches-3.13/313-MIPS-BCM63XX-remove-RUNTIME_DETECT-code-from-gpio.patch b/target/linux/brcm63xx/patches-3.13/313-MIPS-BCM63XX-remove-RUNTIME_DETECT-code-from-gpio.patch
deleted file mode 100644 (file)
index 49a3475..0000000
+++ /dev/null
@@ -1,39 +0,0 @@
-From 1aab93c5c97c55fef130726a6f58c9a1fd5b6240 Mon Sep 17 00:00:00 2001
-From: Jonas Gorski <jogo@openwrt.org>
-Date: Tue, 3 Dec 2013 13:36:45 +0100
-Subject: [PATCH 4/8] MIPS: BCM63XX: remove !RUNTIME_DETECT code from gpio
-
----
- arch/mips/bcm63xx/gpio.c | 14 --------------
- 1 file changed, 14 deletions(-)
-
---- a/arch/mips/bcm63xx/gpio.c
-+++ b/arch/mips/bcm63xx/gpio.c
-@@ -18,19 +18,6 @@
- #include <bcm63xx_io.h>
- #include <bcm63xx_regs.h>
--#ifndef BCMCPU_RUNTIME_DETECT
--#define gpio_out_low_reg      GPIO_DATA_LO_REG
--#ifdef CONFIG_BCM63XX_CPU_6345
--#ifdef gpio_out_low_reg
--#undef gpio_out_low_reg
--#define gpio_out_low_reg      GPIO_DATA_LO_REG_6345
--#endif /* gpio_out_low_reg */
--#endif /* CONFIG_BCM63XX_CPU_6345 */
--
--static inline void bcm63xx_gpio_out_low_reg_init(void)
--{
--}
--#else /* ! BCMCPU_RUNTIME_DETECT */
- static u32 gpio_out_low_reg;
- static void bcm63xx_gpio_out_low_reg_init(void)
-@@ -44,7 +31,6 @@ static void bcm63xx_gpio_out_low_reg_ini
-               break;
-       }
- }
--#endif /* ! BCMCPU_RUNTIME_DETECT */
- static DEFINE_SPINLOCK(bcm63xx_gpio_lock);
- static u32 gpio_out_low, gpio_out_high;
diff --git a/target/linux/brcm63xx/patches-3.13/314-MIPS-BCM63XX-remove-RUNTIME_DETECT-from-spi-code.patch b/target/linux/brcm63xx/patches-3.13/314-MIPS-BCM63XX-remove-RUNTIME_DETECT-from-spi-code.patch
deleted file mode 100644 (file)
index afde39b..0000000
+++ /dev/null
@@ -1,80 +0,0 @@
-From 94f819bc230bb61a9ff21da6c860a40ca68c2805 Mon Sep 17 00:00:00 2001
-From: Jonas Gorski <jogo@openwrt.org>
-Date: Tue, 3 Dec 2013 13:43:35 +0100
-Subject: [PATCH 5/8] MIPS: BCM63XX: remove !RUNTIME_DETECT from spi code
-
----
- arch/mips/bcm63xx/dev-spi.c                        |  4 ---
- .../include/asm/mach-bcm63xx/bcm63xx_dev_spi.h     | 31 ----------------------
- 2 files changed, 35 deletions(-)
-
---- a/arch/mips/bcm63xx/dev-spi.c
-+++ b/arch/mips/bcm63xx/dev-spi.c
-@@ -18,7 +18,6 @@
- #include <bcm63xx_dev_spi.h>
- #include <bcm63xx_regs.h>
--#ifdef BCMCPU_RUNTIME_DETECT
- /*
-  * register offsets
-  */
-@@ -41,9 +40,6 @@ static __init void bcm63xx_spi_regs_init
-               BCMCPU_IS_6362() || BCMCPU_IS_6368())
-               bcm63xx_regs_spi = bcm6358_regs_spi;
- }
--#else
--static __init void bcm63xx_spi_regs_init(void) { }
--#endif
- static struct resource spi_resources[] = {
-       {
---- a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_spi.h
-+++ b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_spi.h
-@@ -30,26 +30,6 @@ enum bcm63xx_regs_spi {
-       SPI_RX_DATA,
- };
--#define __GEN_SPI_RSET_BASE(__cpu, __rset)                            \
--      case SPI_## __rset:                                             \
--              return SPI_## __cpu ##_## __rset;
--
--#define __GEN_SPI_RSET(__cpu)                                         \
--      switch (reg) {                                                  \
--      __GEN_SPI_RSET_BASE(__cpu, CMD)                                 \
--      __GEN_SPI_RSET_BASE(__cpu, INT_STATUS)                          \
--      __GEN_SPI_RSET_BASE(__cpu, INT_MASK_ST)                         \
--      __GEN_SPI_RSET_BASE(__cpu, INT_MASK)                            \
--      __GEN_SPI_RSET_BASE(__cpu, ST)                                  \
--      __GEN_SPI_RSET_BASE(__cpu, CLK_CFG)                             \
--      __GEN_SPI_RSET_BASE(__cpu, FILL_BYTE)                           \
--      __GEN_SPI_RSET_BASE(__cpu, MSG_TAIL)                            \
--      __GEN_SPI_RSET_BASE(__cpu, RX_TAIL)                             \
--      __GEN_SPI_RSET_BASE(__cpu, MSG_CTL)                             \
--      __GEN_SPI_RSET_BASE(__cpu, MSG_DATA)                            \
--      __GEN_SPI_RSET_BASE(__cpu, RX_DATA)                             \
--      }
--
- #define __GEN_SPI_REGS_TABLE(__cpu)                                   \
-       [SPI_CMD]               = SPI_## __cpu ##_CMD,                  \
-       [SPI_INT_STATUS]        = SPI_## __cpu ##_INT_STATUS,           \
-@@ -66,20 +46,9 @@ enum bcm63xx_regs_spi {
- static inline unsigned long bcm63xx_spireg(enum bcm63xx_regs_spi reg)
- {
--#ifdef BCMCPU_RUNTIME_DETECT
-       extern const unsigned long *bcm63xx_regs_spi;
-       return bcm63xx_regs_spi[reg];
--#else
--#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_6362) || \
--      defined(CONFIG_BCM63XX_CPU_6368)
--      __GEN_SPI_RSET(6358)
--#endif
--#endif
--      return 0;
- }
- #endif /* BCM63XX_DEV_SPI_H */
diff --git a/target/linux/brcm63xx/patches-3.13/315-MIPS-BCM63XX-remove-RUNTIME_DETECT-usage-from-enet-c.patch b/target/linux/brcm63xx/patches-3.13/315-MIPS-BCM63XX-remove-RUNTIME_DETECT-usage-from-enet-c.patch
deleted file mode 100644 (file)
index 0dba2e2..0000000
+++ /dev/null
@@ -1,89 +0,0 @@
-From ed6c71de07ad042691ec02e9eb97375ddc91ed01 Mon Sep 17 00:00:00 2001
-From: Jonas Gorski <jogo@openwrt.org>
-Date: Tue, 3 Dec 2013 13:45:22 +0100
-Subject: [PATCH 6/8] MIPS: BCM63XX: remove !RUNTIME_DETECT usage from enet
- code
-
----
- arch/mips/bcm63xx/dev-enet.c                       |  4 --
- .../include/asm/mach-bcm63xx/bcm63xx_dev_enet.h    | 46 ----------------------
- 2 files changed, 50 deletions(-)
-
---- a/arch/mips/bcm63xx/dev-enet.c
-+++ b/arch/mips/bcm63xx/dev-enet.c
-@@ -14,7 +14,6 @@
- #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,
-@@ -43,9 +42,6 @@ static __init void bcm63xx_enetdmac_regs
-       else
-               bcm63xx_regs_enetdmac = bcm6348_regs_enetdmac;
- }
--#else
--static __init void bcm63xx_enetdmac_regs_init(void) { }
--#endif
- static struct resource shared_res[] = {
-       {
---- a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_enet.h
-+++ b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_enet.h
-@@ -112,55 +112,9 @@ enum bcm63xx_regs_enetdmac {
- 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;
- }
diff --git a/target/linux/brcm63xx/patches-3.13/316-MIPS-BCM63XX-remove-RUNTIME_DETECT-in-cpu-feature-ov.patch b/target/linux/brcm63xx/patches-3.13/316-MIPS-BCM63XX-remove-RUNTIME_DETECT-in-cpu-feature-ov.patch
deleted file mode 100644 (file)
index 6316b8d..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
-From 12c6957004d6770f4b34d59d8a3cafd5d8bfce15 Mon Sep 17 00:00:00 2001
-From: Jonas Gorski <jogo@openwrt.org>
-Date: Tue, 3 Dec 2013 14:06:12 +0100
-Subject: [PATCH 7/8] MIPS: BCM63XX: remove !RUNTIME_DETECT in
- cpu-feature-overrides
-
-All three SoCs have in common they have a BMIPS32/BMIPS3300 CPU, so
-we can replace this as no SoC with BMIPS4350 support enabled.
----
- arch/mips/include/asm/mach-bcm63xx/cpu-feature-overrides.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/arch/mips/include/asm/mach-bcm63xx/cpu-feature-overrides.h
-+++ b/arch/mips/include/asm/mach-bcm63xx/cpu-feature-overrides.h
-@@ -24,7 +24,7 @@
- #define cpu_has_smartmips             0
- #define cpu_has_vtag_icache           0
--#if !defined(BCMCPU_RUNTIME_DETECT) && (defined(CONFIG_BCM63XX_CPU_6348) || defined(CONFIG_BCM63XX_CPU_6345) || defined(CONFIG_BCM63XX_CPU_6338))
-+#if !defined(CONFIG_SYS_HAS_CPU_BMIPS4350)
- #define cpu_has_dc_aliases            0
- #endif
diff --git a/target/linux/brcm63xx/patches-3.13/317-MIPS-BCM63XX-remove-RUNTIME_DETECT-code-for-bcmcpu_g.patch b/target/linux/brcm63xx/patches-3.13/317-MIPS-BCM63XX-remove-RUNTIME_DETECT-code-for-bcmcpu_g.patch
deleted file mode 100644 (file)
index e40cfa0..0000000
+++ /dev/null
@@ -1,199 +0,0 @@
-From 78c3d2e796a28ad55f6c2310a11ab22e91bb52fc Mon Sep 17 00:00:00 2001
-From: Jonas Gorski <jogo@openwrt.org>
-Date: Mon, 2 Dec 2013 12:30:44 +0100
-Subject: [PATCH 8/8] MIPS: BCM63XX: remove !RUNTIME_DETECT code for
- bcmcpu_get_id
-
-Use the same pattern as with get_*_cpu_type() to allow the compiler
-to remove code for non enabled devices.
-
-Signed-off-by: Jonas Gorski <jogo@openwrt.org>
----
- arch/mips/bcm63xx/cpu.c                          |  11 +--
- arch/mips/include/asm/mach-bcm63xx/bcm63xx_cpu.h | 120 +++++++----------------
- 2 files changed, 38 insertions(+), 93 deletions(-)
-
---- a/arch/mips/bcm63xx/cpu.c
-+++ b/arch/mips/bcm63xx/cpu.c
-@@ -24,7 +24,9 @@ EXPORT_SYMBOL(bcm63xx_regs_base);
- const int *bcm63xx_irqs;
- EXPORT_SYMBOL(bcm63xx_irqs);
--static u16 bcm63xx_cpu_id;
-+u16 bcm63xx_cpu_id __read_mostly;
-+EXPORT_SYMBOL(bcm63xx_cpu_id);
-+
- static u8 bcm63xx_cpu_rev;
- static unsigned int bcm63xx_cpu_freq;
- static unsigned int bcm63xx_memory_size;
-@@ -97,13 +99,6 @@ static const int bcm6368_irqs[] = {
- };
--u16 __bcm63xx_get_cpu_id(void)
--{
--      return bcm63xx_cpu_id;
--}
--
--EXPORT_SYMBOL(__bcm63xx_get_cpu_id);
--
- u8 bcm63xx_get_cpu_rev(void)
- {
-       return bcm63xx_cpu_rev;
---- a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_cpu.h
-+++ b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_cpu.h
-@@ -19,118 +19,68 @@
- #define BCM6368_CPU_ID                0x6368
- void __init bcm63xx_cpu_init(void);
--u16 __bcm63xx_get_cpu_id(void);
- u8 bcm63xx_get_cpu_rev(void);
- unsigned int bcm63xx_get_cpu_freq(void);
-+static inline u16 __pure __bcm63xx_get_cpu_id(const u16 cpu_id)
-+{
-+      switch (cpu_id) {
- #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)
-+              case BCM3368_CPU_ID:
- #endif
- #ifdef CONFIG_BCM63XX_CPU_6328
--# 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()        BCM6328_CPU_ID
--# endif
--# define BCMCPU_IS_6328()     (bcm63xx_get_cpu_id() == BCM6328_CPU_ID)
--#else
--# define BCMCPU_IS_6328()     (0)
-+              case BCM6328_CPU_ID:
- #endif
- #ifdef CONFIG_BCM63XX_CPU_6338
--# 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()        BCM6338_CPU_ID
--# endif
--# define BCMCPU_IS_6338()     (bcm63xx_get_cpu_id() == BCM6338_CPU_ID)
--#else
--# define BCMCPU_IS_6338()     (0)
-+              case BCM6338_CPU_ID:
- #endif
- #ifdef CONFIG_BCM63XX_CPU_6345
--# 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()        BCM6345_CPU_ID
--# endif
--# define BCMCPU_IS_6345()     (bcm63xx_get_cpu_id() == BCM6345_CPU_ID)
--#else
--# define BCMCPU_IS_6345()     (0)
-+              case BCM6345_CPU_ID:
- #endif
- #ifdef CONFIG_BCM63XX_CPU_6348
--# 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()        BCM6348_CPU_ID
--# endif
--# define BCMCPU_IS_6348()     (bcm63xx_get_cpu_id() == BCM6348_CPU_ID)
--#else
--# define BCMCPU_IS_6348()     (0)
-+              case BCM6348_CPU_ID:
- #endif
- #ifdef CONFIG_BCM63XX_CPU_6358
--# 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()        BCM6358_CPU_ID
--# endif
--# define BCMCPU_IS_6358()     (bcm63xx_get_cpu_id() == BCM6358_CPU_ID)
--#else
--# define BCMCPU_IS_6358()     (0)
-+              case BCM6358_CPU_ID:
- #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)
-+              case BCM6362_CPU_ID:
- #endif
--
- #ifdef CONFIG_BCM63XX_CPU_6368
--# 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()        BCM6368_CPU_ID
--# endif
--# define BCMCPU_IS_6368()     (bcm63xx_get_cpu_id() == BCM6368_CPU_ID)
--#else
--# define BCMCPU_IS_6368()     (0)
--#endif
--
--#ifndef bcm63xx_get_cpu_id
--#error "No CPU support configured"
-+              case BCM6368_CPU_ID:
- #endif
-+              break;
-+      default:
-+              unreachable();
-+      }
-+
-+      return cpu_id;
-+}
-+
-+extern u16 bcm63xx_cpu_id;
-+
-+static inline u16 __pure bcm63xx_get_cpu_id(void)
-+{
-+      const u16 cpu_id = bcm63xx_cpu_id;
-+
-+      return __bcm63xx_get_cpu_id(cpu_id);
-+}
-+
-+#define BCMCPU_IS_3368()      (bcm63xx_get_cpu_id() == BCM3368_CPU_ID)
-+#define BCMCPU_IS_6328()      (bcm63xx_get_cpu_id() == BCM6328_CPU_ID)
-+#define BCMCPU_IS_6338()      (bcm63xx_get_cpu_id() == BCM6338_CPU_ID)
-+#define BCMCPU_IS_6345()      (bcm63xx_get_cpu_id() == BCM6345_CPU_ID)
-+#define BCMCPU_IS_6348()      (bcm63xx_get_cpu_id() == BCM6348_CPU_ID)
-+#define BCMCPU_IS_6358()      (bcm63xx_get_cpu_id() == BCM6358_CPU_ID)
-+#define BCMCPU_IS_6362()      (bcm63xx_get_cpu_id() == BCM6362_CPU_ID)
-+#define BCMCPU_IS_6368()      (bcm63xx_get_cpu_id() == BCM6368_CPU_ID)
- /*
-  * While registers sets are (mostly) the same across 63xx CPU, base
diff --git a/target/linux/brcm63xx/patches-3.13/318-MIPS-BCM63XX-rename-__dispatch_internal-to-__dispatc.patch b/target/linux/brcm63xx/patches-3.13/318-MIPS-BCM63XX-rename-__dispatch_internal-to-__dispatc.patch
deleted file mode 100644 (file)
index f4d98c3..0000000
+++ /dev/null
@@ -1,42 +0,0 @@
-From 653dcc09407a695efb203337c6f72515d4c4ee43 Mon Sep 17 00:00:00 2001
-From: Jonas Gorski <jogo@openwrt.org>
-Date: Thu, 21 Mar 2013 17:05:15 +0100
-Subject: [PATCH 29/53] MIPS: BCM63XX: rename __dispatch_internal to
- __dispatch_internal_32
-
-Make it follow the same naming convention as the other functions.
-
-Signed-off-by: Jonas Gorski <jogo@openwrt.org>
----
- arch/mips/bcm63xx/irq.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
---- a/arch/mips/bcm63xx/irq.c
-+++ b/arch/mips/bcm63xx/irq.c
-@@ -19,7 +19,7 @@
- #include <bcm63xx_io.h>
- #include <bcm63xx_irq.h>
--static void __dispatch_internal(void) __maybe_unused;
-+static void __dispatch_internal_32(void) __maybe_unused;
- static void __dispatch_internal_64(void) __maybe_unused;
- static void __internal_irq_mask_32(unsigned int irq) __maybe_unused;
- static void __internal_irq_mask_64(unsigned int irq) __maybe_unused;
-@@ -117,7 +117,7 @@ static void bcm63xx_init_irq(void)
-       }
-       if (irq_bits == 32) {
--              dispatch_internal = __dispatch_internal;
-+              dispatch_internal = __dispatch_internal_32;
-               internal_irq_mask = __internal_irq_mask_32;
-               internal_irq_unmask = __internal_irq_unmask_32;
-       } else {
-@@ -149,7 +149,7 @@ static inline void handle_internal(int i
-  * will resume the loop where it ended the last time we left this
-  * function.
-  */
--static void __dispatch_internal(void)
-+static void __dispatch_internal_32(void)
- {
-       u32 pending;
-       static int i;
diff --git a/target/linux/brcm63xx/patches-3.13/319-MIPS-BCM63XX-move-bcm63xx_init_irq-down.patch b/target/linux/brcm63xx/patches-3.13/319-MIPS-BCM63XX-move-bcm63xx_init_irq-down.patch
deleted file mode 100644 (file)
index fb57939..0000000
+++ /dev/null
@@ -1,223 +0,0 @@
-From c28c639b031385ecf965eecf3bfb532e88044c89 Mon Sep 17 00:00:00 2001
-From: Jonas Gorski <jogo@openwrt.org>
-Date: Sun, 15 Dec 2013 20:52:53 +0100
-Subject: [PATCH 30/53] MIPS: BCM63XX: move bcm63xx_init_irq down
-
-Allows up to drop the prototypes from the top.
----
- arch/mips/bcm63xx/irq.c | 190 +++++++++++++++++++++++-------------------------
- 1 file changed, 92 insertions(+), 98 deletions(-)
-
---- a/arch/mips/bcm63xx/irq.c
-+++ b/arch/mips/bcm63xx/irq.c
-@@ -19,13 +19,6 @@
- #include <bcm63xx_io.h>
- #include <bcm63xx_irq.h>
--static void __dispatch_internal_32(void) __maybe_unused;
--static void __dispatch_internal_64(void) __maybe_unused;
--static void __internal_irq_mask_32(unsigned int irq) __maybe_unused;
--static void __internal_irq_mask_64(unsigned int irq) __maybe_unused;
--static void __internal_irq_unmask_32(unsigned int irq) __maybe_unused;
--static void __internal_irq_unmask_64(unsigned int irq) __maybe_unused;
--
- static u32 irq_stat_addr, irq_mask_addr;
- static void (*dispatch_internal)(void);
- static int is_ext_irq_cascaded;
-@@ -35,97 +28,6 @@ static unsigned int ext_irq_cfg_reg1, ex
- static void (*internal_irq_mask)(unsigned int irq);
- static void (*internal_irq_unmask)(unsigned int irq);
--static void bcm63xx_init_irq(void)
--{
--      int irq_bits;
--
--      irq_stat_addr = bcm63xx_regset_address(RSET_PERF);
--      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;
--              irq_bits = 64;
--              ext_irq_count = 4;
--              is_ext_irq_cascaded = 1;
--              ext_irq_start = BCM_6328_EXT_IRQ0 - IRQ_INTERNAL_BASE;
--              ext_irq_end = BCM_6328_EXT_IRQ3 - IRQ_INTERNAL_BASE;
--              ext_irq_cfg_reg1 = PERF_EXTIRQ_CFG_REG_6328;
--              break;
--      case BCM6338_CPU_ID:
--              irq_stat_addr += PERF_IRQSTAT_6338_REG;
--              irq_mask_addr += PERF_IRQMASK_6338_REG;
--              irq_bits = 32;
--              ext_irq_count = 4;
--              ext_irq_cfg_reg1 = PERF_EXTIRQ_CFG_REG_6338;
--              break;
--      case BCM6345_CPU_ID:
--              irq_stat_addr += PERF_IRQSTAT_6345_REG;
--              irq_mask_addr += PERF_IRQMASK_6345_REG;
--              irq_bits = 32;
--              ext_irq_count = 4;
--              ext_irq_cfg_reg1 = PERF_EXTIRQ_CFG_REG_6345;
--              break;
--      case BCM6348_CPU_ID:
--              irq_stat_addr += PERF_IRQSTAT_6348_REG;
--              irq_mask_addr += PERF_IRQMASK_6348_REG;
--              irq_bits = 32;
--              ext_irq_count = 4;
--              ext_irq_cfg_reg1 = PERF_EXTIRQ_CFG_REG_6348;
--              break;
--      case BCM6358_CPU_ID:
--              irq_stat_addr += PERF_IRQSTAT_6358_REG;
--              irq_mask_addr += PERF_IRQMASK_6358_REG;
--              irq_bits = 32;
--              ext_irq_count = 4;
--              is_ext_irq_cascaded = 1;
--              ext_irq_start = BCM_6358_EXT_IRQ0 - IRQ_INTERNAL_BASE;
--              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;
--              irq_bits = 64;
--              ext_irq_count = 6;
--              is_ext_irq_cascaded = 1;
--              ext_irq_start = BCM_6368_EXT_IRQ0 - IRQ_INTERNAL_BASE;
--              ext_irq_end = BCM_6368_EXT_IRQ5 - IRQ_INTERNAL_BASE;
--              ext_irq_cfg_reg1 = PERF_EXTIRQ_CFG_REG_6368;
--              ext_irq_cfg_reg2 = PERF_EXTIRQ_CFG_REG2_6368;
--              break;
--      default:
--              BUG();
--      }
--
--      if (irq_bits == 32) {
--              dispatch_internal = __dispatch_internal_32;
--              internal_irq_mask = __internal_irq_mask_32;
--              internal_irq_unmask = __internal_irq_unmask_32;
--      } else {
--              dispatch_internal = __dispatch_internal_64;
--              internal_irq_mask = __internal_irq_mask_64;
--              internal_irq_unmask = __internal_irq_unmask_64;
--      }
--}
- static inline u32 get_ext_irq_perf_reg(int irq)
- {
-@@ -451,6 +353,98 @@ static struct irqaction cpu_ext_cascade_
-       .flags          = IRQF_NO_THREAD,
- };
-+static void bcm63xx_init_irq(void)
-+{
-+      int irq_bits;
-+
-+      irq_stat_addr = bcm63xx_regset_address(RSET_PERF);
-+      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;
-+              irq_bits = 64;
-+              ext_irq_count = 4;
-+              is_ext_irq_cascaded = 1;
-+              ext_irq_start = BCM_6328_EXT_IRQ0 - IRQ_INTERNAL_BASE;
-+              ext_irq_end = BCM_6328_EXT_IRQ3 - IRQ_INTERNAL_BASE;
-+              ext_irq_cfg_reg1 = PERF_EXTIRQ_CFG_REG_6328;
-+              break;
-+      case BCM6338_CPU_ID:
-+              irq_stat_addr += PERF_IRQSTAT_6338_REG;
-+              irq_mask_addr += PERF_IRQMASK_6338_REG;
-+              irq_bits = 32;
-+              ext_irq_count = 4;
-+              ext_irq_cfg_reg1 = PERF_EXTIRQ_CFG_REG_6338;
-+              break;
-+      case BCM6345_CPU_ID:
-+              irq_stat_addr += PERF_IRQSTAT_6345_REG;
-+              irq_mask_addr += PERF_IRQMASK_6345_REG;
-+              irq_bits = 32;
-+              ext_irq_count = 4;
-+              ext_irq_cfg_reg1 = PERF_EXTIRQ_CFG_REG_6345;
-+              break;
-+      case BCM6348_CPU_ID:
-+              irq_stat_addr += PERF_IRQSTAT_6348_REG;
-+              irq_mask_addr += PERF_IRQMASK_6348_REG;
-+              irq_bits = 32;
-+              ext_irq_count = 4;
-+              ext_irq_cfg_reg1 = PERF_EXTIRQ_CFG_REG_6348;
-+              break;
-+      case BCM6358_CPU_ID:
-+              irq_stat_addr += PERF_IRQSTAT_6358_REG;
-+              irq_mask_addr += PERF_IRQMASK_6358_REG;
-+              irq_bits = 32;
-+              ext_irq_count = 4;
-+              is_ext_irq_cascaded = 1;
-+              ext_irq_start = BCM_6358_EXT_IRQ0 - IRQ_INTERNAL_BASE;
-+              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;
-+              irq_bits = 64;
-+              ext_irq_count = 6;
-+              is_ext_irq_cascaded = 1;
-+              ext_irq_start = BCM_6368_EXT_IRQ0 - IRQ_INTERNAL_BASE;
-+              ext_irq_end = BCM_6368_EXT_IRQ5 - IRQ_INTERNAL_BASE;
-+              ext_irq_cfg_reg1 = PERF_EXTIRQ_CFG_REG_6368;
-+              ext_irq_cfg_reg2 = PERF_EXTIRQ_CFG_REG2_6368;
-+              break;
-+      default:
-+              BUG();
-+      }
-+
-+      if (irq_bits == 32) {
-+              dispatch_internal = __dispatch_internal_32;
-+              internal_irq_mask = __internal_irq_mask_32;
-+              internal_irq_unmask = __internal_irq_unmask_32;
-+      } else {
-+              dispatch_internal = __dispatch_internal_64;
-+              internal_irq_mask = __internal_irq_mask_64;
-+              internal_irq_unmask = __internal_irq_unmask_64;
-+      }
-+}
-+
- void __init arch_init_irq(void)
- {
-       int i;
diff --git a/target/linux/brcm63xx/patches-3.13/320-MIPS-BCM63XX-replace-irq-dispatch-code-with-a-generi.patch b/target/linux/brcm63xx/patches-3.13/320-MIPS-BCM63XX-replace-irq-dispatch-code-with-a-generi.patch
deleted file mode 100644 (file)
index f0311ce..0000000
+++ /dev/null
@@ -1,167 +0,0 @@
-From 01bf26c51b427e24ac69f604d33f7d9360a9e470 Mon Sep 17 00:00:00 2001
-From: Jonas Gorski <jogo@openwrt.org>
-Date: Thu, 18 Apr 2013 21:14:49 +0200
-Subject: [PATCH 31/53] MIPS: BCM63XX: replace irq dispatch code with a generic
- version
-
-The generic version uses a variable length of u32 registers of u32/u64.
-This allows easier support for longer registers without having to rewrite
-verything.
-
-This "generic" version is not slower than the old version in the best case
-(= i == next set bit), and twice as fast in the worst case in 64 bits.
-
-Signed-off-by: Jonas Gorski <jogo@openwrt.org>
----
- arch/mips/bcm63xx/irq.c | 130 +++++++++++++++++++++---------------------------
- 1 file changed, 56 insertions(+), 74 deletions(-)
-
---- a/arch/mips/bcm63xx/irq.c
-+++ b/arch/mips/bcm63xx/irq.c
-@@ -51,47 +51,65 @@ static inline void handle_internal(int i
-  * will resume the loop where it ended the last time we left this
-  * function.
-  */
--static void __dispatch_internal_32(void)
--{
--      u32 pending;
--      static int i;
--
--      pending = bcm_readl(irq_stat_addr) & bcm_readl(irq_mask_addr);
--
--      if (!pending)
--              return ;
--
--      while (1) {
--              int to_call = i;
--              i = (i + 1) & 0x1f;
--              if (pending & (1 << to_call)) {
--                      handle_internal(to_call);
--                      break;
--              }
--      }
-+#define BUILD_IPIC_INTERNAL(width)                                    \
-+void __dispatch_internal_##width(void)                                        \
-+{                                                                     \
-+      u32 pending[width / 32];                                        \
-+      unsigned int src, tgt;                                          \
-+      bool irqs_pending = false;                                      \
-+      static int i;                                                   \
-+                                                                      \
-+      /* read registers in reverse order */                           \
-+      for (src = 0, tgt = (width / 32); src < (width / 32); src++) {  \
-+              u32 val;                                                \
-+                                                                      \
-+              val = bcm_readl(irq_stat_addr + src * sizeof(u32));     \
-+              val &= bcm_readl(irq_mask_addr + src * sizeof(u32));    \
-+              pending[--tgt] = val;                                   \
-+                                                                      \
-+              if (val)                                                \
-+                      irqs_pending = true;                            \
-+      }                                                               \
-+                                                                      \
-+      if (!irqs_pending)                                              \
-+              return;                                                 \
-+                                                                      \
-+      while (1) {                                                     \
-+              int to_call = i;                                        \
-+                                                                      \
-+              i = (i + 1) & (width - 1);                              \
-+              if (pending[to_call / 32] & (1 << (to_call & 0x1f))) {  \
-+                      handle_internal(to_call);                       \
-+                      break;                                          \
-+              }                                                       \
-+      }                                                               \
-+}                                                                     \
-+                                                                      \
-+static void __internal_irq_mask_##width(unsigned int irq)             \
-+{                                                                     \
-+      u32 val;                                                        \
-+      unsigned reg = (irq / 32) ^ (width/32 - 1);                     \
-+      unsigned bit = irq & 0x1f;                                      \
-+                                                                      \
-+      val = bcm_readl(irq_mask_addr + reg * sizeof(u32));             \
-+      val &= ~(1 << bit);                                             \
-+      bcm_writel(val, irq_mask_addr + reg * sizeof(u32));             \
-+}                                                                     \
-+                                                                      \
-+static void __internal_irq_unmask_##width(unsigned int irq)           \
-+{                                                                     \
-+      u32 val;                                                        \
-+      unsigned reg = (irq / 32) ^ (width/32 - 1);                     \
-+      unsigned bit = irq & 0x1f;                                      \
-+                                                                      \
-+      val = bcm_readl(irq_mask_addr + reg * sizeof(u32));             \
-+      val |= (1 << bit);                                              \
-+      bcm_writel(val, irq_mask_addr + reg * sizeof(u32));             \
- }
--static void __dispatch_internal_64(void)
--{
--      u64 pending;
--      static int i;
--
--      pending = bcm_readq(irq_stat_addr) & bcm_readq(irq_mask_addr);
--
--      if (!pending)
--              return ;
--
--      while (1) {
--              int to_call = i;
--
--              i = (i + 1) & 0x3f;
--              if (pending & (1ull << to_call)) {
--                      handle_internal(to_call);
--                      break;
--              }
--      }
--}
-+BUILD_IPIC_INTERNAL(32);
-+BUILD_IPIC_INTERNAL(64);
- asmlinkage void plat_irq_dispatch(void)
- {
-@@ -128,42 +146,6 @@ asmlinkage void plat_irq_dispatch(void)
-  * internal IRQs operations: only mask/unmask on PERF irq mask
-  * register.
-  */
--static void __internal_irq_mask_32(unsigned int irq)
--{
--      u32 mask;
--
--      mask = bcm_readl(irq_mask_addr);
--      mask &= ~(1 << irq);
--      bcm_writel(mask, irq_mask_addr);
--}
--
--static void __internal_irq_mask_64(unsigned int irq)
--{
--      u64 mask;
--
--      mask = bcm_readq(irq_mask_addr);
--      mask &= ~(1ull << irq);
--      bcm_writeq(mask, irq_mask_addr);
--}
--
--static void __internal_irq_unmask_32(unsigned int irq)
--{
--      u32 mask;
--
--      mask = bcm_readl(irq_mask_addr);
--      mask |= (1 << irq);
--      bcm_writel(mask, irq_mask_addr);
--}
--
--static void __internal_irq_unmask_64(unsigned int irq)
--{
--      u64 mask;
--
--      mask = bcm_readq(irq_mask_addr);
--      mask |= (1ull << irq);
--      bcm_writeq(mask, irq_mask_addr);
--}
--
- static void bcm63xx_internal_irq_mask(struct irq_data *d)
- {
-       internal_irq_mask(d->irq - IRQ_INTERNAL_BASE);
diff --git a/target/linux/brcm63xx/patches-3.13/321-MIPS-BCM63XX-append-irq-line-number-to-irq_-stat-mas.patch b/target/linux/brcm63xx/patches-3.13/321-MIPS-BCM63XX-append-irq-line-number-to-irq_-stat-mas.patch
deleted file mode 100644 (file)
index e53f230..0000000
+++ /dev/null
@@ -1,183 +0,0 @@
-From 1003fb4a5ee9fcff518f20eefdee1a9bf500af7e Mon Sep 17 00:00:00 2001
-From: Jonas Gorski <jogo@openwrt.org>
-Date: Thu, 25 Apr 2013 00:24:06 +0200
-Subject: [PATCH 32/53] MIPS: BCM63XX: append irq line number to
- irq_{stat,mask}*
-
-The SMP capable irq controllers have two interupt output pins which are
-controlled through separate registers, so make the variables arrays.
-
-Signed-off-by: Jonas Gorski <jogo@openwrt.org>
----
- arch/mips/bcm63xx/irq.c                           | 51 ++++++++++++-----------
- arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h | 16 +++----
- 2 files changed, 34 insertions(+), 33 deletions(-)
-
---- a/arch/mips/bcm63xx/irq.c
-+++ b/arch/mips/bcm63xx/irq.c
-@@ -19,7 +19,8 @@
- #include <bcm63xx_io.h>
- #include <bcm63xx_irq.h>
--static u32 irq_stat_addr, irq_mask_addr;
-+static u32 irq_stat_addr[2];
-+static u32 irq_mask_addr[2];
- static void (*dispatch_internal)(void);
- static int is_ext_irq_cascaded;
- static unsigned int ext_irq_count;
-@@ -64,8 +65,8 @@ void __dispatch_internal_##width(void)
-       for (src = 0, tgt = (width / 32); src < (width / 32); src++) {  \
-               u32 val;                                                \
-                                                                       \
--              val = bcm_readl(irq_stat_addr + src * sizeof(u32));     \
--              val &= bcm_readl(irq_mask_addr + src * sizeof(u32));    \
-+              val = bcm_readl(irq_stat_addr[0] + src * sizeof(u32));  \
-+              val &= bcm_readl(irq_mask_addr[0] + src * sizeof(u32)); \
-               pending[--tgt] = val;                                   \
-                                                                       \
-               if (val)                                                \
-@@ -92,9 +93,9 @@ static void __internal_irq_mask_##width(
-       unsigned reg = (irq / 32) ^ (width/32 - 1);                     \
-       unsigned bit = irq & 0x1f;                                      \
-                                                                       \
--      val = bcm_readl(irq_mask_addr + reg * sizeof(u32));             \
-+      val = bcm_readl(irq_mask_addr[0] + reg * sizeof(u32));          \
-       val &= ~(1 << bit);                                             \
--      bcm_writel(val, irq_mask_addr + reg * sizeof(u32));             \
-+      bcm_writel(val, irq_mask_addr[0] + reg * sizeof(u32));          \
- }                                                                     \
-                                                                       \
- static void __internal_irq_unmask_##width(unsigned int irq)           \
-@@ -103,9 +104,9 @@ static void __internal_irq_unmask_##widt
-       unsigned reg = (irq / 32) ^ (width/32 - 1);                     \
-       unsigned bit = irq & 0x1f;                                      \
-                                                                       \
--      val = bcm_readl(irq_mask_addr + reg * sizeof(u32));             \
-+      val = bcm_readl(irq_mask_addr[0] + reg * sizeof(u32));          \
-       val |= (1 << bit);                                              \
--      bcm_writel(val, irq_mask_addr + reg * sizeof(u32));             \
-+      bcm_writel(val, irq_mask_addr[0] + reg * sizeof(u32));          \
- }
- BUILD_IPIC_INTERNAL(32);
-@@ -339,20 +340,20 @@ static void bcm63xx_init_irq(void)
- {
-       int irq_bits;
--      irq_stat_addr = bcm63xx_regset_address(RSET_PERF);
--      irq_mask_addr = bcm63xx_regset_address(RSET_PERF);
-+      irq_stat_addr[0] = bcm63xx_regset_address(RSET_PERF);
-+      irq_mask_addr[0] = 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_stat_addr[0] += PERF_IRQSTAT_3368_REG;
-+              irq_mask_addr[0] += 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;
-+              irq_stat_addr[0] += PERF_IRQSTAT_6328_REG(0);
-+              irq_mask_addr[0] += PERF_IRQMASK_6328_REG(0);
-               irq_bits = 64;
-               ext_irq_count = 4;
-               is_ext_irq_cascaded = 1;
-@@ -361,29 +362,29 @@ static void bcm63xx_init_irq(void)
-               ext_irq_cfg_reg1 = PERF_EXTIRQ_CFG_REG_6328;
-               break;
-       case BCM6338_CPU_ID:
--              irq_stat_addr += PERF_IRQSTAT_6338_REG;
--              irq_mask_addr += PERF_IRQMASK_6338_REG;
-+              irq_stat_addr[0] += PERF_IRQSTAT_6338_REG;
-+              irq_mask_addr[0] += PERF_IRQMASK_6338_REG;
-               irq_bits = 32;
-               ext_irq_count = 4;
-               ext_irq_cfg_reg1 = PERF_EXTIRQ_CFG_REG_6338;
-               break;
-       case BCM6345_CPU_ID:
--              irq_stat_addr += PERF_IRQSTAT_6345_REG;
--              irq_mask_addr += PERF_IRQMASK_6345_REG;
-+              irq_stat_addr[0] += PERF_IRQSTAT_6345_REG;
-+              irq_mask_addr[0] += PERF_IRQMASK_6345_REG;
-               irq_bits = 32;
-               ext_irq_count = 4;
-               ext_irq_cfg_reg1 = PERF_EXTIRQ_CFG_REG_6345;
-               break;
-       case BCM6348_CPU_ID:
--              irq_stat_addr += PERF_IRQSTAT_6348_REG;
--              irq_mask_addr += PERF_IRQMASK_6348_REG;
-+              irq_stat_addr[0] += PERF_IRQSTAT_6348_REG;
-+              irq_mask_addr[0] += PERF_IRQMASK_6348_REG;
-               irq_bits = 32;
-               ext_irq_count = 4;
-               ext_irq_cfg_reg1 = PERF_EXTIRQ_CFG_REG_6348;
-               break;
-       case BCM6358_CPU_ID:
--              irq_stat_addr += PERF_IRQSTAT_6358_REG;
--              irq_mask_addr += PERF_IRQMASK_6358_REG;
-+              irq_stat_addr[0] += PERF_IRQSTAT_6358_REG(0);
-+              irq_mask_addr[0] += PERF_IRQMASK_6358_REG(0);
-               irq_bits = 32;
-               ext_irq_count = 4;
-               is_ext_irq_cascaded = 1;
-@@ -392,8 +393,8 @@ static void bcm63xx_init_irq(void)
-               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_stat_addr[0] += PERF_IRQSTAT_6362_REG(0);
-+              irq_mask_addr[0] += PERF_IRQMASK_6362_REG(0);
-               irq_bits = 64;
-               ext_irq_count = 4;
-               is_ext_irq_cascaded = 1;
-@@ -402,8 +403,8 @@ static void bcm63xx_init_irq(void)
-               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;
-+              irq_stat_addr[0] += PERF_IRQSTAT_6368_REG(0);
-+              irq_mask_addr[0] += PERF_IRQMASK_6368_REG(0);
-               irq_bits = 64;
-               ext_irq_count = 6;
-               is_ext_irq_cascaded = 1;
---- a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h
-+++ b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h
-@@ -215,23 +215,23 @@
- /* Interrupt Mask register */
- #define PERF_IRQMASK_3368_REG         0xc
--#define PERF_IRQMASK_6328_REG         0x20
-+#define PERF_IRQMASK_6328_REG(x)      (0x20 + (x) * 0x10)
- #define PERF_IRQMASK_6338_REG         0xc
- #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
-+#define PERF_IRQMASK_6358_REG(x)      (0xc + (x) * 0x2c)
-+#define PERF_IRQMASK_6362_REG(x)      (0x20 + (x) * 0x10)
-+#define PERF_IRQMASK_6368_REG(x)      (0x20 + (x) * 0x10)
- /* Interrupt Status register */
- #define PERF_IRQSTAT_3368_REG         0x10
--#define PERF_IRQSTAT_6328_REG         0x28
-+#define PERF_IRQSTAT_6328_REG(x)      (0x28 + (x) * 0x10)
- #define PERF_IRQSTAT_6338_REG         0x10
- #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
-+#define PERF_IRQSTAT_6358_REG(x)      (0x10 + (x) * 0x2c)
-+#define PERF_IRQSTAT_6362_REG(x)      (0x28 + (x) * 0x10)
-+#define PERF_IRQSTAT_6368_REG(x)      (0x28 + (x) * 0x10)
- /* External Interrupt Configuration register */
- #define PERF_EXTIRQ_CFG_REG_3368      0x14
diff --git a/target/linux/brcm63xx/patches-3.13/322-MIPS-BCM63XX-populate-irq_-stat-mask-_addr-for-secon.patch b/target/linux/brcm63xx/patches-3.13/322-MIPS-BCM63XX-populate-irq_-stat-mask-_addr-for-secon.patch
deleted file mode 100644 (file)
index a21137f..0000000
+++ /dev/null
@@ -1,92 +0,0 @@
-From 842f213228e6fc9fd6cca01ab5128623112aa7a9 Mon Sep 17 00:00:00 2001
-From: Jonas Gorski <jogo@openwrt.org>
-Date: Thu, 25 Apr 2013 00:31:29 +0200
-Subject: [PATCH 33/53] MIPS: BCM63XX: populate irq_{stat,mask}_addr for second
- pin
-
-Signed-off-by: Jonas Gorski <jogo@openwrt.org>
----
- arch/mips/bcm63xx/irq.c | 18 ++++++++++++++++++
- 1 file changed, 18 insertions(+)
-
---- a/arch/mips/bcm63xx/irq.c
-+++ b/arch/mips/bcm63xx/irq.c
-@@ -342,11 +342,15 @@ static void bcm63xx_init_irq(void)
-       irq_stat_addr[0] = bcm63xx_regset_address(RSET_PERF);
-       irq_mask_addr[0] = bcm63xx_regset_address(RSET_PERF);
-+      irq_stat_addr[1] = bcm63xx_regset_address(RSET_PERF);
-+      irq_mask_addr[1] = bcm63xx_regset_address(RSET_PERF);
-       switch (bcm63xx_get_cpu_id()) {
-       case BCM3368_CPU_ID:
-               irq_stat_addr[0] += PERF_IRQSTAT_3368_REG;
-               irq_mask_addr[0] += PERF_IRQMASK_3368_REG;
-+              irq_stat_addr[1] = 0;
-+              irq_stat_addr[1] = 0;
-               irq_bits = 32;
-               ext_irq_count = 4;
-               ext_irq_cfg_reg1 = PERF_EXTIRQ_CFG_REG_3368;
-@@ -354,6 +358,8 @@ static void bcm63xx_init_irq(void)
-       case BCM6328_CPU_ID:
-               irq_stat_addr[0] += PERF_IRQSTAT_6328_REG(0);
-               irq_mask_addr[0] += PERF_IRQMASK_6328_REG(0);
-+              irq_stat_addr[1] += PERF_IRQSTAT_6328_REG(1);
-+              irq_stat_addr[1] += PERF_IRQMASK_6328_REG(1);
-               irq_bits = 64;
-               ext_irq_count = 4;
-               is_ext_irq_cascaded = 1;
-@@ -364,6 +370,8 @@ static void bcm63xx_init_irq(void)
-       case BCM6338_CPU_ID:
-               irq_stat_addr[0] += PERF_IRQSTAT_6338_REG;
-               irq_mask_addr[0] += PERF_IRQMASK_6338_REG;
-+              irq_stat_addr[1] = 0;
-+              irq_mask_addr[1] = 0;
-               irq_bits = 32;
-               ext_irq_count = 4;
-               ext_irq_cfg_reg1 = PERF_EXTIRQ_CFG_REG_6338;
-@@ -371,6 +379,8 @@ static void bcm63xx_init_irq(void)
-       case BCM6345_CPU_ID:
-               irq_stat_addr[0] += PERF_IRQSTAT_6345_REG;
-               irq_mask_addr[0] += PERF_IRQMASK_6345_REG;
-+              irq_stat_addr[1] = 0;
-+              irq_mask_addr[1] = 0;
-               irq_bits = 32;
-               ext_irq_count = 4;
-               ext_irq_cfg_reg1 = PERF_EXTIRQ_CFG_REG_6345;
-@@ -378,6 +388,8 @@ static void bcm63xx_init_irq(void)
-       case BCM6348_CPU_ID:
-               irq_stat_addr[0] += PERF_IRQSTAT_6348_REG;
-               irq_mask_addr[0] += PERF_IRQMASK_6348_REG;
-+              irq_stat_addr[1] = 0;
-+              irq_mask_addr[1] = 0;
-               irq_bits = 32;
-               ext_irq_count = 4;
-               ext_irq_cfg_reg1 = PERF_EXTIRQ_CFG_REG_6348;
-@@ -385,6 +397,8 @@ static void bcm63xx_init_irq(void)
-       case BCM6358_CPU_ID:
-               irq_stat_addr[0] += PERF_IRQSTAT_6358_REG(0);
-               irq_mask_addr[0] += PERF_IRQMASK_6358_REG(0);
-+              irq_stat_addr[1] += PERF_IRQSTAT_6358_REG(1);
-+              irq_mask_addr[1] += PERF_IRQMASK_6358_REG(1);
-               irq_bits = 32;
-               ext_irq_count = 4;
-               is_ext_irq_cascaded = 1;
-@@ -395,6 +409,8 @@ static void bcm63xx_init_irq(void)
-       case BCM6362_CPU_ID:
-               irq_stat_addr[0] += PERF_IRQSTAT_6362_REG(0);
-               irq_mask_addr[0] += PERF_IRQMASK_6362_REG(0);
-+              irq_stat_addr[1] += PERF_IRQSTAT_6362_REG(1);
-+              irq_mask_addr[1] += PERF_IRQMASK_6362_REG(1);
-               irq_bits = 64;
-               ext_irq_count = 4;
-               is_ext_irq_cascaded = 1;
-@@ -405,6 +421,8 @@ static void bcm63xx_init_irq(void)
-       case BCM6368_CPU_ID:
-               irq_stat_addr[0] += PERF_IRQSTAT_6368_REG(0);
-               irq_mask_addr[0] += PERF_IRQMASK_6368_REG(0);
-+              irq_stat_addr[1] += PERF_IRQSTAT_6368_REG(1);
-+              irq_mask_addr[1] += PERF_IRQMASK_6368_REG(1);
-               irq_bits = 64;
-               ext_irq_count = 6;
-               is_ext_irq_cascaded = 1;
diff --git a/target/linux/brcm63xx/patches-3.13/323-MIPS-BCM63XX-add-pin-argument-to-dispatch-internal.patch b/target/linux/brcm63xx/patches-3.13/323-MIPS-BCM63XX-add-pin-argument-to-dispatch-internal.patch
deleted file mode 100644 (file)
index 1b8921c..0000000
+++ /dev/null
@@ -1,70 +0,0 @@
-From a33bb660c712447ba8b561109cda6734954a6efa Mon Sep 17 00:00:00 2001
-From: Jonas Gorski <jogo@openwrt.org>
-Date: Fri, 26 Apr 2013 11:21:16 +0200
-Subject: [PATCH 34/53] MIPS: BCM63XX: add pin argument to dispatch internal
-
-Signed-off-by: Jonas Gorski <jogo@openwrt.org>
----
- arch/mips/bcm63xx/irq.c | 18 ++++++++++--------
- 1 file changed, 10 insertions(+), 8 deletions(-)
-
---- a/arch/mips/bcm63xx/irq.c
-+++ b/arch/mips/bcm63xx/irq.c
-@@ -19,9 +19,10 @@
- #include <bcm63xx_io.h>
- #include <bcm63xx_irq.h>
-+
- static u32 irq_stat_addr[2];
- static u32 irq_mask_addr[2];
--static void (*dispatch_internal)(void);
-+static void (*dispatch_internal)(int pin);
- static int is_ext_irq_cascaded;
- static unsigned int ext_irq_count;
- static unsigned int ext_irq_start, ext_irq_end;
-@@ -54,19 +55,20 @@ static inline void handle_internal(int i
-  */
- #define BUILD_IPIC_INTERNAL(width)                                    \
--void __dispatch_internal_##width(void)                                        \
-+void __dispatch_internal_##width(int pin)                             \
- {                                                                     \
-       u32 pending[width / 32];                                        \
-       unsigned int src, tgt;                                          \
-       bool irqs_pending = false;                                      \
--      static int i;                                                   \
-+      static int i[2];                                                \
-+      int *next = &i[pin];                                            \
-                                                                       \
-       /* read registers in reverse order */                           \
-       for (src = 0, tgt = (width / 32); src < (width / 32); src++) {  \
-               u32 val;                                                \
-                                                                       \
--              val = bcm_readl(irq_stat_addr[0] + src * sizeof(u32));  \
--              val &= bcm_readl(irq_mask_addr[0] + src * sizeof(u32)); \
-+              val = bcm_readl(irq_stat_addr[pin] + src * sizeof(u32)); \
-+              val &= bcm_readl(irq_mask_addr[pin] + src * sizeof(u32)); \
-               pending[--tgt] = val;                                   \
-                                                                       \
-               if (val)                                                \
-@@ -77,9 +79,9 @@ void __dispatch_internal_##width(void)
-               return;                                                 \
-                                                                       \
-       while (1) {                                                     \
--              int to_call = i;                                        \
-+              int to_call = *next;                                    \
-                                                                       \
--              i = (i + 1) & (width - 1);                              \
-+              *next = (*next + 1) & (width - 1);                      \
-               if (pending[to_call / 32] & (1 << (to_call & 0x1f))) {  \
-                       handle_internal(to_call);                       \
-                       break;                                          \
-@@ -129,7 +131,7 @@ asmlinkage void plat_irq_dispatch(void)
-               if (cause & CAUSEF_IP1)
-                       do_IRQ(1);
-               if (cause & CAUSEF_IP2)
--                      dispatch_internal();
-+                      dispatch_internal(0);
-               if (!is_ext_irq_cascaded) {
-                       if (cause & CAUSEF_IP3)
-                               do_IRQ(IRQ_EXT_0);
diff --git a/target/linux/brcm63xx/patches-3.13/324-MIPS-BCM63XX-protect-irq-register-accesses.patch b/target/linux/brcm63xx/patches-3.13/324-MIPS-BCM63XX-protect-irq-register-accesses.patch
deleted file mode 100644 (file)
index c38137d..0000000
+++ /dev/null
@@ -1,158 +0,0 @@
-From 85257b702e1d4c6dcc839c737833c42ca53bae93 Mon Sep 17 00:00:00 2001
-From: Jonas Gorski <jogo@openwrt.org>
-Date: Sun, 21 Apr 2013 15:38:56 +0200
-Subject: [PATCH 35/53] MIPS: BCM63XX: protect irq register accesses
-
----
- arch/mips/bcm63xx/irq.c | 26 ++++++++++++++++++++++++++
- 1 file changed, 26 insertions(+)
-
---- a/arch/mips/bcm63xx/irq.c
-+++ b/arch/mips/bcm63xx/irq.c
-@@ -12,6 +12,7 @@
- #include <linux/interrupt.h>
- #include <linux/module.h>
- #include <linux/irq.h>
-+#include <linux/spinlock.h>
- #include <asm/irq_cpu.h>
- #include <asm/mipsregs.h>
- #include <bcm63xx_cpu.h>
-@@ -20,6 +21,9 @@
- #include <bcm63xx_irq.h>
-+static DEFINE_SPINLOCK(ipic_lock);
-+static DEFINE_SPINLOCK(epic_lock);
-+
- static u32 irq_stat_addr[2];
- static u32 irq_mask_addr[2];
- static void (*dispatch_internal)(int pin);
-@@ -62,8 +66,10 @@ void __dispatch_internal_##width(int pin
-       bool irqs_pending = false;                                      \
-       static int i[2];                                                \
-       int *next = &i[pin];                                            \
-+      unsigned long flags;                                            \
-                                                                       \
-       /* read registers in reverse order */                           \
-+      spin_lock_irqsave(&ipic_lock, flags);                           \
-       for (src = 0, tgt = (width / 32); src < (width / 32); src++) {  \
-               u32 val;                                                \
-                                                                       \
-@@ -74,6 +80,7 @@ void __dispatch_internal_##width(int pin
-               if (val)                                                \
-                       irqs_pending = true;                            \
-       }                                                               \
-+      spin_unlock_irqrestore(&ipic_lock, flags);                      \
-                                                                       \
-       if (!irqs_pending)                                              \
-               return;                                                 \
-@@ -94,10 +101,13 @@ static void __internal_irq_mask_##width(
-       u32 val;                                                        \
-       unsigned reg = (irq / 32) ^ (width/32 - 1);                     \
-       unsigned bit = irq & 0x1f;                                      \
-+      unsigned long flags;                                            \
-                                                                       \
-+      spin_lock_irqsave(&ipic_lock, flags);                           \
-       val = bcm_readl(irq_mask_addr[0] + reg * sizeof(u32));          \
-       val &= ~(1 << bit);                                             \
-       bcm_writel(val, irq_mask_addr[0] + reg * sizeof(u32));          \
-+      spin_unlock_irqrestore(&ipic_lock, flags);                      \
- }                                                                     \
-                                                                       \
- static void __internal_irq_unmask_##width(unsigned int irq)           \
-@@ -105,10 +115,13 @@ static void __internal_irq_unmask_##widt
-       u32 val;                                                        \
-       unsigned reg = (irq / 32) ^ (width/32 - 1);                     \
-       unsigned bit = irq & 0x1f;                                      \
-+      unsigned long flags;                                            \
-                                                                       \
-+      spin_lock_irqsave(&ipic_lock, flags);                           \
-       val = bcm_readl(irq_mask_addr[0] + reg * sizeof(u32));          \
-       val |= (1 << bit);                                              \
-       bcm_writel(val, irq_mask_addr[0] + reg * sizeof(u32));          \
-+      spin_unlock_irqrestore(&ipic_lock, flags);                      \
- }
- BUILD_IPIC_INTERNAL(32);
-@@ -167,8 +180,10 @@ static void bcm63xx_external_irq_mask(st
- {
-       unsigned int irq = d->irq - IRQ_EXTERNAL_BASE;
-       u32 reg, regaddr;
-+      unsigned long flags;
-       regaddr = get_ext_irq_perf_reg(irq);
-+      spin_lock_irqsave(&epic_lock, flags);
-       reg = bcm_perf_readl(regaddr);
-       if (BCMCPU_IS_6348())
-@@ -177,6 +192,8 @@ static void bcm63xx_external_irq_mask(st
-               reg &= ~EXTIRQ_CFG_MASK(irq % 4);
-       bcm_perf_writel(reg, regaddr);
-+      spin_unlock_irqrestore(&epic_lock, flags);
-+
-       if (is_ext_irq_cascaded)
-               internal_irq_mask(irq + ext_irq_start);
- }
-@@ -185,8 +202,10 @@ static void bcm63xx_external_irq_unmask(
- {
-       unsigned int irq = d->irq - IRQ_EXTERNAL_BASE;
-       u32 reg, regaddr;
-+      unsigned long flags;
-       regaddr = get_ext_irq_perf_reg(irq);
-+      spin_lock_irqsave(&epic_lock, flags);
-       reg = bcm_perf_readl(regaddr);
-       if (BCMCPU_IS_6348())
-@@ -195,6 +214,7 @@ static void bcm63xx_external_irq_unmask(
-               reg |= EXTIRQ_CFG_MASK(irq % 4);
-       bcm_perf_writel(reg, regaddr);
-+      spin_unlock_irqrestore(&epic_lock, flags);
-       if (is_ext_irq_cascaded)
-               internal_irq_unmask(irq + ext_irq_start);
-@@ -204,8 +224,10 @@ static void bcm63xx_external_irq_clear(s
- {
-       unsigned int irq = d->irq - IRQ_EXTERNAL_BASE;
-       u32 reg, regaddr;
-+      unsigned long flags;
-       regaddr = get_ext_irq_perf_reg(irq);
-+      spin_lock_irqsave(&epic_lock, flags);
-       reg = bcm_perf_readl(regaddr);
-       if (BCMCPU_IS_6348())
-@@ -214,6 +236,7 @@ static void bcm63xx_external_irq_clear(s
-               reg |= EXTIRQ_CFG_CLEAR(irq % 4);
-       bcm_perf_writel(reg, regaddr);
-+      spin_unlock_irqrestore(&epic_lock, flags);
- }
- static int bcm63xx_external_irq_set_type(struct irq_data *d,
-@@ -222,6 +245,7 @@ static int bcm63xx_external_irq_set_type
-       unsigned int irq = d->irq - IRQ_EXTERNAL_BASE;
-       u32 reg, regaddr;
-       int levelsense, sense, bothedge;
-+      unsigned long flags;
-       flow_type &= IRQ_TYPE_SENSE_MASK;
-@@ -256,6 +280,7 @@ static int bcm63xx_external_irq_set_type
-       }
-       regaddr = get_ext_irq_perf_reg(irq);
-+      spin_lock_irqsave(&epic_lock, flags);
-       reg = bcm_perf_readl(regaddr);
-       irq %= 4;
-@@ -300,6 +325,7 @@ static int bcm63xx_external_irq_set_type
-       }
-       bcm_perf_writel(reg, regaddr);
-+      spin_unlock_irqrestore(&epic_lock, flags);
-       irqd_set_trigger_type(d, flow_type);
-       if (flow_type & (IRQ_TYPE_LEVEL_LOW | IRQ_TYPE_LEVEL_HIGH))
diff --git a/target/linux/brcm63xx/patches-3.13/325-MIPS-BCM63XX-wire-up-the-second-cpu-s-irq-line.patch b/target/linux/brcm63xx/patches-3.13/325-MIPS-BCM63XX-wire-up-the-second-cpu-s-irq-line.patch
deleted file mode 100644 (file)
index 189965a..0000000
+++ /dev/null
@@ -1,92 +0,0 @@
-From df6661d1b5c001eb91ce07f364fd5b6468fd6f99 Mon Sep 17 00:00:00 2001
-From: Jonas Gorski <jogo@openwrt.org>
-Date: Fri, 26 Apr 2013 12:03:15 +0200
-Subject: [PATCH 36/53] MIPS: BCM63XX: wire up the second cpu's irq line
-
----
- arch/mips/bcm63xx/irq.c | 44 +++++++++++++++++++++++++++++++++++++-------
- 1 file changed, 37 insertions(+), 7 deletions(-)
-
---- a/arch/mips/bcm63xx/irq.c
-+++ b/arch/mips/bcm63xx/irq.c
-@@ -102,11 +102,17 @@ static void __internal_irq_mask_##width(
-       unsigned reg = (irq / 32) ^ (width/32 - 1);                     \
-       unsigned bit = irq & 0x1f;                                      \
-       unsigned long flags;                                            \
-+      int cpu;                                                        \
-                                                                       \
-       spin_lock_irqsave(&ipic_lock, flags);                           \
--      val = bcm_readl(irq_mask_addr[0] + reg * sizeof(u32));          \
--      val &= ~(1 << bit);                                             \
--      bcm_writel(val, irq_mask_addr[0] + reg * sizeof(u32));          \
-+      for_each_present_cpu(cpu) {