22 Feb, 2013
1 commit
-
…linux into mips-for-linux-next
Conflicts:
include/linux/ssb/ssb_driver_gige.hAlso resolves a logical merge conflict in drivers/net/ethernet/broadcom/-
bgmac.c due to change of an API.
16 Feb, 2013
1 commit
-
The nvram functions are exported and used by some normal drivers. To
prevent name clashes with ofter parts of the kernel code add a bcm47xx_
prefix in front of the function names and the header file name.Signed-off-by: Hauke Mehrtens
Patchwork: http://patchwork.linux-mips.org/patch/4744/
Signed-off-by: John Crispin
09 Feb, 2013
2 commits
-
Synchronize with 'net' in order to sort out some l2tp, wireless, and
ipv6 GRE fixes that will be built on top of in 'net-next'.Signed-off-by: David S. Miller
-
…wireless-next into for-davem
07 Feb, 2013
1 commit
-
…wireless into for-davem
05 Feb, 2013
1 commit
-
This patch unregisters the gpio chip before ssb gets unloaded.
Signed-off-by: Hauke Mehrtens
Signed-off-by: John W. Linville
31 Jan, 2013
3 commits
-
The old bcm47xx gpio code had support for gpio_to_irq, but the new
code did not provide this function, but returned -ENXIO all the time.
This patch adds the missing function.arch/mips/bcm47xx/wgt634u.c calls gpio_to_irq() and got the correct irq
number with the old gpio handling code. With this patch the code in
wgt634u.c should work again. I do not have a wgt634u to test this.Signed-off-by: Hauke Mehrtens
Signed-off-by: John W. Linville -
Signed-off-by: Rafał Miłecki
Signed-off-by: John W. Linville -
Signed-off-by: Rafał Miłecki
Signed-off-by: John W. Linville
29 Jan, 2013
2 commits
-
…wireless-next into for-davem
-
Conflicts:
drivers/net/wireless/ath/ath9k/main.c
drivers/net/wireless/iwlwifi/dvm/tx.c
12 Jan, 2013
1 commit
-
Signed-off-by: Rafał Miłecki
Signed-off-by: John W. Linville
10 Jan, 2013
1 commit
-
Signed-off-by: Rafał Miłecki
Signed-off-by: John W. Linville
08 Jan, 2013
1 commit
-
Pull networking fixes from David Miller:
1) New sysctl ndisc_notify needs some documentation, from Hanns
Frederic Sowa.2) Netfilter REJECT target doesn't set transport header of SKB
correctly, from Mukund Jampala.3) Forcedeth driver needs to check for DMA mapping failures, from Larry
Finger.4) brcmsmac driver can't use usleep_range while holding locks, use
udelay instead. From Niels Ole Salscheider.5) Fix unregister of netlink bridge multicast database handlers, from
Vlad Yasevich and Rami Rosen.6) Fix checksum calculations in netfilter's ipv6 network prefix
translation module.7) Fix high order page allocation failures in netfilter xt_recent, from
Eric Dumazet.8) mac802154 needs to use netif_rx_ni() instead of netif_rx() because
mac802154_process_data() can execute in process rather than
interrupt context. From Alexander Aring.9) Fix splice handling of MSG_SENDPAGE_NOTLAST, otherwise we elide one
tcp_push() too many. From Eric Dumazet and Willy Tarreau.10) Fix skb->truesize tracking in XEN netfront driver, from Ian
Campbell.* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (46 commits)
xen/netfront: improve truesize tracking
ipv4: fix NULL checking in devinet_ioctl()
tcp: fix MSG_SENDPAGE_NOTLAST logic
net/ipv4/ipconfig: really display the BOOTP/DHCP server's address.
ip-sysctl: fix spelling errors
mac802154: fix NOHZ local_softirq_pending 08 warning
ipv6: document ndisc_notify in networking/ip-sysctl.txt
ath9k: Fix Kconfig for ATH9K_HTC
netfilter: xt_recent: avoid high order page allocations
netfilter: fix missing dependencies for the NOTRACK target
netfilter: ip6t_NPT: fix IPv6 NTP checksum calculation
bridge: add empty br_mdb_init() and br_mdb_uninit() definitions.
vxlan: allow live mac address change
bridge: Correctly unregister MDB rtnetlink handlers
brcmfmac: fix parsing rsn ie for ap mode.
brcmsmac: add copyright information for Canonical
rtlwifi: rtl8723ae: Fix warning for unchecked pci_map_single() call
rtlwifi: rtl8192se: Fix warning for unchecked pci_map_single() call
rtlwifi: rtl8192de: Fix warning for unchecked pci_map_single() call
rtlwifi: rtl8192ce: Fix warning for unchecked pci_map_single() call
...
04 Jan, 2013
1 commit
-
CONFIG_HOTPLUG is going away as an option. As a result, the __dev*
markings need to be removed.This change removes the use of __devinit, and __devexit from these
drivers.Based on patches originally written by Bill Pemberton, but redone by me
in order to handle some of the coding style issues better, by hand.Cc: Bill Pemberton
Cc: Michael Buesch
Signed-off-by: Greg Kroah-Hartman
03 Jan, 2013
1 commit
-
Commit ec43b08b5733494ad88aa618ecdf534320dd8207 ("ssb: add GPIO driver")
added SSB_DRIVER_GPIO, which unconditionally selects GPIOLIB, causing
a Kconfig warning:warning: (ARCH_REQUIRE_GPIOLIB && SSB_DRIVER_GPIO && BCMA_DRIVER_GPIO && MFD_TC6393XB && FB_VIA) selects GPIOLIB which has unmet direct dependencies (ARCH_WANT_OPTIONAL_GPIOLIB || ARCH_REQUIRE_GPIOLIB)
and build failure for m68k/allmodconfig:
In file included from drivers/ssb/ssb_private.h:5,
from drivers/ssb/main.c:12:
include/linux/ssb/ssb.h:440: error: field ‘gpio’ has incomplete type
make[4]: *** [drivers/ssb/main.o] Error 1
make[3]: *** [drivers/ssb/] Error 2Turn the select into a dependency to fix this.
Signed-off-by: Geert Uytterhoeven
Signed-off-by: John W. Linville
15 Dec, 2012
1 commit
-
Pull MIPS updates from Ralf Baechle:
"The MIPS bits for 3.8. This also includes a bunch fixes that were
sitting in the linux-mips.org git tree for a long time. This pull
request contains updates to several OCTEON drivers and the board
support code for BCM47XX, BCM63XX, XLP, XLR, XLS, lantiq, Loongson1B,
updates to the SSB bus support, MIPS kexec code and adds support for
kdump.When pulling this, there are two expected merge conflicts in
include/linux/bcma/bcma_driver_chipcommon.h which are trivial to
resolve, just remove the conflict markers and keep both alternatives."* 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus: (90 commits)
MIPS: PMC-Sierra Yosemite: Remove support.
VIDEO: Newport Fix console crashes
MIPS: wrppmc: Fix build of PCI code.
MIPS: IP22/IP28: Fix build of EISA code.
MIPS: RB532: Fix build of prom code.
MIPS: PowerTV: Fix build.
MIPS: IP27: Correct fucked grammar in ops-bridge.c
MIPS: Highmem: Fix build error if CONFIG_DEBUG_HIGHMEM is disabled
MIPS: Fix potencial corruption
MIPS: Fix for warning from FPU emulation code
MIPS: Handle COP3 Unusable exception as COP1X for FP emulation
MIPS: Fix poweroff failure when HOTPLUG_CPU configured.
MIPS: MT: Fix build with CONFIG_UIDGID_STRICT_TYPE_CHECKS=y
MIPS: Remove unused smvp.h
MIPS/EDAC: Improve OCTEON EDAC support.
MIPS: OCTEON: Add definitions for OCTEON memory contoller registers.
MIPS: OCTEON: Add OCTEON family definitions to octeon-model.h
ata: pata_octeon_cf: Use correct byte order for DMA in when built little-endian.
MIPS/OCTEON/ata: Convert pata_octeon_cf.c to use device tree.
MIPS: Remove usage of CEVT_R4K_LIB config option.
...
11 Dec, 2012
1 commit
-
Use WARN rather than printk followed by WARN_ON(1), for conciseness.
Signed-off-by: Cong Ding
Signed-off-by: John W. Linville
07 Dec, 2012
6 commits
-
Register the watchdog driver to the system if it is a SoC. Using the
watchdog on a non SoC device, like a PCI card, will make the PCI
card die when the timeout expired, but starting it again is not
supported by ssb.Signed-off-by: Hauke Mehrtens
Signed-off-by: John W. Linville -
The watchdog driver wants to set the watchdog timeout in ms and not in
ticks, add a method converting ms to ticks before setting the watchdog
register. Return the ticks or millisecond the timer was set to in case
the provided value was bigger than the max allowed value.Signed-off-by: Hauke Mehrtens
Signed-off-by: John W. Linville -
Prevent the watchdog register on the extif core to be set to a too
high value.Signed-off-by: Hauke Mehrtens
Signed-off-by: John W. Linville -
The watchdog driver wants to set the watchdog timeout in ms and not in
ticks, which is depending on the SoC type and the clock.
Calculate the number of ticks per millisecond and provide two functions
for the watchdog driver. Also return the ticks or millisecond the timer
was set to in case the provided value was bigger than the max allowed
value.Signed-off-by: Hauke Mehrtens
Signed-off-by: John W. Linville -
Some ssb based devices have a PMU and the PMU watchdog register should
be used instead of the register in the chip common part, if the device
has a PMU. This patch also calculates the maximal number the watchdog
could be set to.Signed-off-by: Hauke Mehrtens
Signed-off-by: John W. Linville -
If there is a PMU in the device, get the alp clock from that part and
do not assume 20000000.Signed-off-by: Hauke Mehrtens
Signed-off-by: John W. Linville
01 Dec, 2012
1 commit
-
If CONFIG_SSB_EMBEDDED or CONFIG_SSB_DRIVER_MIPS is set and
CONFIG_SSB_DRIVER_EXTIF is not set, it will cause compile problems
because of missing functions. This patch fixes these problems.The mips driver now also uses ssb_chipco_available() instead of
checking bus->chipco.dev manually.Signed-off-by: Hauke Mehrtens
Signed-off-by: John W. Linville
22 Nov, 2012
3 commits
-
Register a GPIO driver to access the GPIOs provided by the chip.
The GPIOs of the SoC should always start at 0 and the other GPIOs could
start at a random position. There is just one SoC in a system and when
they start at 0 the number is predictable.Signed-off-by: Hauke Mehrtens
Patchwork: http://patchwork.linux-mips.org/patch/4591
Acked-by: Florian Fainelli -
The GPIOs are access through some registers in the chip common core or
over extif. We need locking around these GPIO accesses, all GPIOs are
accessed through the same registers and parallel writes will cause
problems.Signed-off-by: Hauke Mehrtens
Patchwork: http://patchwork.linux-mips.org/patch/4590
Acked-by: Florian Fainelli -
Add functions to access the GPIO registers for pullup and pulldown.
These are needed for handling gpio registration.Signed-off-by: Hauke Mehrtens
Patchwork: http://patchwork.linux-mips.org/patch/4589
Acked-by: Florian Fainelli
30 Oct, 2012
2 commits
-
The BCM43222 with the chipid 43222 or 0xa8d6 in hex do not need any
special handling in the pmu code. This prevents some error messages
being shown.Signed-off-by: Hauke Mehrtens
Signed-off-by: John W. Linville -
14e4:4350 is found on a Broadcom BCM43222.
Signed-off-by: Hauke Mehrtens
Signed-off-by: John W. Linville
20 Oct, 2012
2 commits
-
Signed-off-by: Hauke Mehrtens
Signed-off-by: John W. Linville -
This is a preparing step for adding serial flash support.
Signed-off-by: Hauke Mehrtens
Signed-off-by: John W. Linville
11 Aug, 2012
1 commit
-
We can not assume parallel flash is always present, there are boards
with *serial* flash and probably some without flash at all.
Define some bits by the way.Signed-off-by: Rafał Miłecki
Reviewed-by: Hauke Mehrtens
Signed-off-by: John W. Linville
12 Jun, 2012
1 commit
-
14e4:432c is found on some bcm63xx devices. The device is working fine
with b43.Reported-by: Álvaro Fernández Rojas
Signed-off-by: Jonas Gorski
Signed-off-by: John W. Linville
07 Jun, 2012
1 commit
-
I found this core on a BCM4322, a PCI card in the Linksys WRT610N V1.
This core is not used by the driver, this patch just makes ssb show the
correct name.Signed-off-by: Hauke Mehrtens
Signed-off-by: John W. Linville
17 May, 2012
5 commits
-
The 0x4322 ID is found on the BCM4322 used on some SoCs like the
Linksys WRT610N V1 connected to a BCM4705. The 43222 (0xa8d6) ID
is found on the BCM43222 used on some other SoCs like the D-Link
DSL-2760U connected to a BCM63xx.Signed-off-by: Hauke Mehrtens
Signed-off-by: John W. Linville -
These newly added attributes are used by brcmsmac. Now bcma should
parse all attributes used by brcmsmac out of the sprom.Signed-off-by: Hauke Mehrtens
Tested-by: Arend van Spriel
Signed-off-by: John W. Linville -
This attribute is now used in b43 driver and should be filled for all
sprom versions.Signed-off-by: Hauke Mehrtens
Signed-off-by: John W. Linville -
The attribute country_code and alpha2 are two different attributes in
the sprom. country_code contains some code in an 8 bit coding and
alpha2 contains two chars with the country code. The attributes where
read out wrongly in the past and country_code is only available on
sprom version 1.Signed-off-by: Hauke Mehrtens
Tested-by: Arend van Spriel
Signed-off-by: John W. Linville -
Previously the rev contained the revision read from the pci config
space and was used as board_rev in the wireless drivers. This is wrong
the board_rev is only fetched from the sprom accordingly to the open
source part of the Broadcom SDK and brcmsmac. This patch removes the
rev from the boardinfo structure and uses the board_rev attribute from
sprom instead. This attribute is filled by PCI, PCMCIA, SDIO and SoC
code.Signed-off-by: Hauke Mehrtens
Tested-by: Arend van Spriel
Signed-off-by: John W. Linville