Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

2016 r1 #131

Closed
wants to merge 19 commits into from
Closed

2016 r1 #131

wants to merge 19 commits into from

Conversation

bel-ramprasad
Copy link

No description provided.

larsclausen and others added 19 commits April 19, 2016 16:53
wake_up_interruptible_poll() will only wakeup the polling thread if it is
waiting for the passed poll flags. The dma-buffer always passed POLLIN |
POLLRDNORM, this means if the buffer is a output buffer and the thread is
waiting for POLLOUT events it wont get woken up. To fix this pass the flags
according to the buffer direction.

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
# Conflicts:
#	drivers/iio/adc/ad9361.c
On Zynq, we haven't been reserving the correct amount of DMA-incapable
RAM to keep DMA away from it (per the Zynq TRM Section 4.1, it should be
the first 512k). In older kernels, this was masked by the
memblock_reserve call in arm_memblock_init(). Now, reserve the correct
amount excplicitly rather than relying on swapper_pg_dir, which is an
address and not a size anyway.

Fixes: 46f5b96 ("ARM: zynq: Reserve not DMAable space in front of the
kernel")

Signed-off-by: Kyle Roeschley <kyle.roeschley@ni.com>
Tested-by: Nathan Rossi <nathan@nathanrossi.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
…value

PHY needs the fixup if (fixup->phy_uid == phydev->phy_id) or (fixup->phy_uid == PHY_ANY_UID).
Make sure unused weighted multipliers are set to 0.
Use Default RSSI Meas Mode, for small power of twos.

Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
@commodo
Copy link
Contributor

commodo commented Jun 27, 2018

hey;
thanks for the PR :)

but we will not want to merge 2016 R1 into master ;
master should be up-to-date with 2016 R1;
but if you know of any patches that are in 2016 R1 and not in master, please cherry-pick them and submit a PR only with those changes and we will review them

i will close this PR shortly

thanks
Alex

@commodo commodo closed this Jun 27, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants