Merge remote-tracking branch 'stable/linux-4.4.y' into rpi-4.4.y

Merge remote-tracking branch 'stable/linux-4.4.y' into rpi-4.4.y

Merge remote-tracking branch 'stable/linux-4.4.y' into rpi-4.4.y

Merge pull request raspberrypi#1524 from DigitalDreamtimeLtd/rpi-4.4.…

…y-dma

Pull upstream dma backport into rpi 4.4.y

config: Add NF_MATCH_RPFILTER

Revert "config: Add CONFIG_DRM_LOAD_EDID_FIRMWARE"

This reverts commit 417aed4.

bcm2835-sdhost: Workaround for "slow" sectors

Some cards have been seen to cause timeouts after certain sectors are
read. This workaround enforces a minimum delay between the stop after
reading one of those sectors and a subsequent data command.

Using CMD23 (SET_BLOCK_COUNT) avoids this problem, so good cards will
not be penalised by this workaround.

Signed-off-by: Phil Elwell <phil@raspberrypi.org>

serial: Take care starting a hung-up tty's port

tty_port_hangup sets a port's tty field to NULL (holding the port lock),
but uart_tx_stopped, called from __uart_start (with the port lock),
uses the tty field without checking for NULL.

Change uart_tx_stopped to treat a NULL tty field as another stopped
indication.

Signed-off-by: Phil Elwell <phil@raspberrypi.org>

pinctrl-bcm2835: Fix cut-and-paste error in "pull" parsing

The DT bindings for pinctrl-bcm2835 allow both the function and pull
to contain either one entry or one per pin. However, an error in the
DT parsing can cause failures if the number of pulls differs from the
number of functions.

Merge remote-tracking branch 'stable/linux-4.1.y' into rpi-4.1.y