aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2014-05-23[media] media: davinci: vpif_display: drop numbuffers field from common_objLad, Prabhakar
This patch drops numbuffers member from struct common_obj as this was not required. Signed-off-by: Lad, Prabhakar <prabhakar.csengg@gmail.com> Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
2014-05-23[media] media: davinci: vpif_display: drop unnecessary field memoryLad, Prabhakar
The common->memory field is set but not used anywhere. Drop it. Signed-off-by: Lad, Prabhakar <prabhakar.csengg@gmail.com> Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
2014-05-24Merge tag 'qcom-defconfig-for-3.16' of ↵Arnd Bergmann
git://git.kernel.org/pub/scm/linux/kernel/git/galak/linux-qcom into next/defconfig Merge "Qualcomm ARM Based defconfig Updates for v3.16" from Kumar Gala: * Add a new qcom_defconfig for mach-qcom * Update msm_defconfig for handling building the old mach-msm * tag 'qcom-defconfig-for-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/galak/linux-qcom: ARM: config: Update msm_defconfig ARM: config: Add qcom_defconfig Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-05-23[media] media: davinci: vpif_display: drop reserving memory for deviceLad, Prabhakar
this patch drops reserving contigiuos memory for the device, as now with CMA support there is no need of this. This patch also prepares to removal of config_params. Signed-off-by: Lad, Prabhakar <prabhakar.csengg@gmail.com> Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
2014-05-24MIPS: MT: Remove SMTC supportRalf Baechle
Nobody is maintaining SMTC anymore and there also seems to be no userbase. Which is a pity - the SMTC technology primarily developed by Kevin D. Kissell <kevink@paralogos.com> is an ingenious demonstration for the MT ASE's power and elegance. Based on Markos Chandras <Markos.Chandras@imgtec.com> patch https://patchwork.linux-mips.org/patch/6719/ which while very similar did no longer apply cleanly when I tried to merge it plus some additional post-SMTC cleanup - SMTC was a feature as tricky to remove as it was to merge once upon a time. Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
2014-05-24Merge tag 'sunxi-defconfig-for-3.16-2' of https://github.com/mripard/linux ↵Arnd Bergmann
into next/defconfig Merge "Allwinner defconfig changes, take 2" from Maxime Ripard: Add the A31 reset driver to the sunxi-related defconfigs * tag 'sunxi-defconfig-for-3.16-2' of https://github.com/mripard/linux: ARM: multi_v7: Add Allwinner reset drivers to multi_v7_defconfig ARM: sunxi: Add A31 reset driver to sunxi_defconfig ARM: sunxi: drop CONFIG_COMMON_CLK_DEBUG Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-05-23[media] media: davinci: vpif_display: drop unused member fbuffersLad, Prabhakar
As fbuffers is not used anymore, remove it. No functional changes. Signed-off-by: Lad, Prabhakar <prabhakar.csengg@gmail.com> Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
2014-05-23[media] media: davinci: vpif_display: use vb2_ioctl_* helpersLad, Prabhakar
Signed-off-by: Lad, Prabhakar <prabhakar.csengg@gmail.com> Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
2014-05-23[media] media: davinci: vpif_display: use v4l2_fh_open and vb2_fop_releaseLad, Prabhakar
this patch adds support to use v4l2_fh_open() and vb2_fop_release, which allows to drop driver specific struct vpif_fh, as this is handeled by core. This patch also drops vpif_g/s_priority as this handeled by core. Signed-off-by: Lad, Prabhakar <prabhakar.csengg@gmail.com> Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
2014-05-23[media] media: davinci: vpif_display: use vb2_fop_mmap/pollLad, Prabhakar
No need to reinvent the wheel. Just use the already existing functions for that. Signed-off-by: Lad, Prabhakar <prabhakar.csengg@gmail.com> Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
2014-05-24Merge tag 'mvebu-defconfig-3.16-2' of git://git.infradead.org/linux-mvebu ↵Arnd Bergmann
into next/defconfig Merge "mvebu defconfig changes for v3.16 (incremental #2)" from Jason Cooper: - mvebu - enable MSI and XHCI in mvebu_v7_defconfig * tag 'mvebu-defconfig-3.16-2' of git://git.infradead.org/linux-mvebu: ARM: mvebu: enable MSI support in mvebu_v7_defconfig ARM: configs: enable XHCI mvebu support in mvebu_v7_defconfig ARM: multi_v5_defconfig: Enable sound modules needed for t5325 ARM: mvebu_v5_defconfig: Enable sound modules needed for t5325 ARM: mvebu: defconfig: add MTD_SPI_NOR (new dependency for M25P80) ARM: configs: add ahci_mvebu to mvebu_v7_defconfig ARM: configs: add CONFIG_MMC_SDHCI_PXAV3 to the mvebu_v7_defconfig ARM: mvebu: enable fhandle in the defconfigs ARM: mvebu: Enable nfsroot in the defconfig Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-05-23[media] media: davinci: vpif_display: improve start/stop_streaming callbacksLad, Prabhakar
this patch drops unnecessary check from start_streaming() callback as this is already done in try/s_fmt and some minor code cleanups, drops check for vb2_is_streaming() as this check is done by vb2 itself before calling this callback. Signed-off-by: Lad, Prabhakar <prabhakar.csengg@gmail.com> Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
2014-05-23[media] media: davinci: vpif_display: improve vpif_buffer_queue_setup() functionLad, Prabhakar
this patch sets the sizes[0] of plane according to the fmt passed or which is being set in the channel, in both MMAP and USERPTR buffer type. This patch also move the calculation of offests(vpif_calculate_offsets()) to queue_setup() callback as after queue_setup() callback the application is no longer allowed to change format, and prepares to removal of config_params. Signed-off-by: Lad, Prabhakar <prabhakar.csengg@gmail.com> Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
2014-05-23[media] media: davinci: vpif_display: improve vpif_buffer_prepare() callbackLad, Prabhakar
this patch improve vpif_buffer_prepare() callback, as buf_prepare() callback is never called with invalid state and check for vb2_plane_vaddr(vb, 0) is dropped as payload check should be done unconditionally. Signed-off-by: Lad, Prabhakar <prabhakar.csengg@gmail.com> Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
2014-05-23[media] media: davinci: vpif_display: drop buf_cleanup() callbackLad, Prabhakar
this patch drops buf_cleanup() callback as this callback is never called with buffer state active. Signed-off-by: Lad, Prabhakar <prabhakar.csengg@gmail.com> Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
2014-05-23[media] media: davinci: vpif_display: release buffers in case ↵Lad, Prabhakar
start_streaming() call back fails this patch adds support to release the buffer by calling vb2_buffer_done(), with state marked as VB2_BUF_STATE_QUEUED if start_streaming() call back fails. Signed-off-by: Lad, Prabhakar <prabhakar.csengg@gmail.com> Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
2014-05-23[media] media: davinci: vpif_display: use vb2_ops_wait_prepare/finish helper ↵Lad, Prabhakar
functions this patch makes use of vb2_ops_wait_prepare/finish helper functions. Signed-off-by: Lad, Prabhakar <prabhakar.csengg@gmail.com> Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
2014-05-23[media] media: davinci: vpif_display: drop buf_init() callbackLad, Prabhakar
this patch drops the buf_init() callback as init of buf list is not required. Signed-off-by: Lad, Prabhakar <prabhakar.csengg@gmail.com> Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
2014-05-23[media] media: davinci: vpif_display: initialize vb2 queue and DMA context ↵Lad, Prabhakar
during probe this patch moves the initalization of vb2 queue and the DMA context to probe() and clean up in remove() callback respectively. Signed-off-by: Lad, Prabhakar <prabhakar.csengg@gmail.com> Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
2014-05-23Merge tag 'samsung-fixes-2nd-tag' of ↵Arnd Bergmann
git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into fixes Samsung-fixes-2 for 3.15 - keep LD04 always on for exynos5250-arndale - fix spi interrupt numbers for exynos5420 - fix ak8975 compatible for exynos4412-trats2 * tag 'samsung-fixes-2nd-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung: ARM: dts: Keep LDO4 always ON for exynos5250-arndale board ARM: dts: Fix SPI interrupt numbers for exynos5420 ARM: dts: fix incorrect ak8975 compatible for exynos4412-trats2 board Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-05-23Merge tag 'mvebu-dt-3.16-2' of git://git.infradead.org/linux-mvebu into next/dtArnd Bergmann
Merge "mvebu DT changes for v3.16 (incremental #2)" from Jason Cooper: - kirkwood - add OpenRD boards - make keymile boards bootable with latest kernels - mvebu - add ehci/xhci to Armada 375/38x boards * tag 'mvebu-dt-3.16-2' of git://git.infradead.org/linux-mvebu: ARM: dts: kirkwood: add kirkwood-km_fixedeth DTS file ARM: dts: kirkwood: add kirkwood-km_common DTSI files ARM: dts: kirkwood: resynch 98dx4122 dtsi ARM: mvebu: add Device Tree description for the EHCI controllers on Armada 375 ARM: mvebu: add Device Tree description of the xHCI controller on Armada 375 ARM: mvebu: add Device Tree description of the EHCI controller on Armada 38x ARM: mvebu: add Device Tree description of xHCI controllers on Armada 38x ARM: Kirkwood: DT versions of OpenRD boards Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-05-23[media] exynos4-is: Remove support for non-dt platformsSylwester Nawrocki
All platforms supported by this driver are going to get device tree support in this kernel release so remove code that would have been actually not used any more. Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com> Acked-by: Kyungmin Park <kyungmin.park@samsung.com> Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
2014-05-23[media] ARM: S5PV210: Remove camera support from mach-goni.cSylwester Nawrocki
S5PV210 is going to get DT support, so we can remove the camera bits from the only board using camera on S5PV210. This allows to clean the exynos4-is driver by dropping code for non-dt platforms. This patch can be dropped if a patch removing the whole board file is applied first. Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com> Acked-by: Kyungmin Park <kyungmin.park@samsung.com> Acked-by: Kukjin Kim <kgene.kim@samsung.com> Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
2014-05-23Merge tag 'sunxi-dt-for-3.16-2' of https://github.com/mripard/linux into ↵Arnd Bergmann
for-next Merge "Allwinner DT changes for 3.16, take 2" from Maxime Ripard: - Introduction of a new board, the i12-tvbox - Enable the MMC and USB controllers on the Colombus - Add the enable-method to the A31 cpus - a few fixes * tag 'sunxi-dt-for-3.16-2' of https://github.com/mripard/linux: ARM: dts: sun7i: Add new i12-tvbox board ARM: dts: sun7i: cubietruck: set mmc3 bus-width property ARM: sun6i: Add MMC0 controller to the Colombus board ARM: sun6i: Fix OHCI2 node name ARM: sun6i: Enable USB Host support on the Colombus board ARM: sunxi: Add fixed 3V regulator ARM: sun6i: Define the A31 CPUs enable-method ARM: sunxi: dt: build DTs according to new MACH_SUNxI Kconfig symbols Signed-off-by: Arnd Bergmann <arnd@arndb.de> Conflicts: arch/arm/boot/dts/Makefile
2014-05-23Merge tag 'for-3.16/bcm-dt' of git://github.com/broadcom/mach-bcm into for-nextArnd Bergmann
Merge "mach-bcm dt updates for 3.16" from Matt Porter: * Add PWM support to bcm281xx and bcm28155 ap board * Add gpldo and vbus regulators to bcm590xx * tag 'for-3.16/bcm-dt' of git://github.com/broadcom/mach-bcm: ARM: dts: bcm590xx: add support for GPLDO and VBUS regulators ARM: dts: Enable the PWM for bcm28155 AP board ARM: dts: Declare the PWM for bcm11351 (bcm281xx) Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-05-23Merge tag 'qcom-dt-for-3.16' of ↵Arnd Bergmann
git://git.kernel.org/pub/scm/linux/kernel/git/galak/linux-qcom into for-next Merge "Qualcomm ARM Based Device Tree Updates for v3.16" from Kumar Gala: * Added device tree nodes for pinctrl and SDHC for msm8974 SoC/DB8074 board * Added binding spec for GSBI configuration node * tag 'qcom-dt-for-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/galak/linux-qcom: soc: qcom: Add device tree binding for GSBI ARM: dts: msm: Add SDHC controller nodes for MSM8974 and DB8074 board ARM: dts: MSM8974: Add pinctrl node Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-05-23Merge branch 'clk-fixes' into clk-nextMike Turquette
2014-05-23Merge remote-tracking branch 'linaro/clk-next' into clk-nextMike Turquette
2014-05-23clk: divider: Fix table round up functionMaxime COQUELIN
Commit 1d9fe6b97 ("clk: divider: Fix best div calculation for power-of-two and table dividers") introduces a regression in its _table_round_up function. When the divider passed to this function is greater than the max divider available in the table, this function returns table's max divider. Problem is that it causes an infinite loop in clk_divider_bestdiv() because _next_div() will never return a value greater than maxdiv. Instead of returning table's max divider, this patch returns INT_MAX. Reported-by: Fabio Estevam <festevam@gmail.com> Reported-by: Shawn Guo <shawn.guo@freescale.com> Tested-by: Fabio Estevam <festevam@gmail.com> Tested-by: Shawn Guo <shawn.guo@freescale.com> Signed-off-by: Maxime Coquelin <maxime.coquelin@st.com> Signed-off-by: Mike Turquette <mturquette@linaro.org>
2014-05-24slab_common: fix the check for duplicate slab namesMikulas Patocka
The patch 3e374919b314f20e2a04f641ebc1093d758f66a4 is supposed to fix the problem where kmem_cache_create incorrectly reports duplicate cache name and fails. The problem is described in the header of that patch. However, the patch doesn't really fix the problem because of these reasons: * the logic to test for debugging is reversed. It was intended to perform the check only if slub debugging is enabled (which implies that caches with the same parameters are not merged). Therefore, there should be #if !defined(CONFIG_SLUB) || defined(CONFIG_SLUB_DEBUG_ON) The current code has the condition reversed and performs the test if debugging is disabled. * slub debugging may be enabled or disabled based on kernel command line, CONFIG_SLUB_DEBUG_ON is just the default settings. Therefore the test based on definition of CONFIG_SLUB_DEBUG_ON is unreliable. This patch fixes the problem by removing the test "!defined(CONFIG_SLUB_DEBUG_ON)". Therefore, duplicate names are never checked if the SLUB allocator is used. Note to stable kernel maintainers: when backporint this patch, please backport also the patch 3e374919b314f20e2a04f641ebc1093d758f66a4. Acked-by: David Rientjes <rientjes@google.com> Acked-by: Christoph Lameter <cl@linux.com> Signed-off-by: Mikulas Patocka <mpatocka@redhat.com> Cc: stable@vger.kernel.org # 3.6+ Signed-off-by: Pekka Enberg <penberg@kernel.org>
2014-05-23clk: Neaten clk_summary outputGeert Uytterhoeven
- Limit ruler to 80 characters (was: 81), - Widen rate column by 1 for nicer spacing, - Right-align numbers and their column headers, - Move a newline to reduce the number of seq_printf() calls, - Use set_puts() for fixed strings. Before: clock enable_cnt prepare_cnt rate accuracy --------------------------------------------------------------------------------- extal 2 2 20000000 0 thermal 1 1 20000000 0 cp 0 0 10000000 0 tpu0 0 0 10000000 0 tmu0 0 0 10000000 0 main 1 1 20000000 0 pll3 0 0 1600000000 0 ddr 0 0 200000000 0 zb3d2 0 0 200000000 0 zb3 0 0 400000000 0 pll1 4 4 1560000000 0 oscclk 0 0 126953 0 rclk 1 1 31738 0 cmt1 0 0 31738 0 cmt0 1 1 31738 0 imp 0 0 390000000 0 After: clock enable_cnt prepare_cnt rate accuracy -------------------------------------------------------------------------------- extal 2 2 20000000 0 thermal 1 1 20000000 0 cp 0 0 10000000 0 tpu0 0 0 10000000 0 tmu0 0 0 10000000 0 main 1 1 20000000 0 pll3 0 0 1600000000 0 ddr 0 0 200000000 0 zb3d2 0 0 200000000 0 zb3 0 0 400000000 0 pll1 4 4 1560000000 0 oscclk 0 0 126953 0 rclk 1 1 31738 0 cmt1 0 0 31738 0 cmt0 1 1 31738 0 imp 0 0 390000000 0 Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> Signed-off-by: Mike Turquette <mturquette@linaro.org>
2014-05-23Merge tag 'at91-dt3' of git://github.com/at91linux/linux-at91 into next/dtArnd Bergmann
3.16 third DT series: - move of both at91sam9n12 and at91sam9x5 to CCF * tag 'at91-dt3' of git://github.com/at91linux/linux-at91: ARM: at91: move sam9n12 SoC to the CCF ARM: at91/dt: define sam9n12ek crystal frequencies ARM: at91/dt: define sam9n12 clocks ARM: at91: prepare common clk transition for sam9n12 SoC ARM: at91: move sam9x5 SoCs to the CCF ARM: at91/dt: define sam9x5ek's crystal frequencies ARM: at91/dt: define sam9x5 clocks ARM: at91: prepare common clk transition for sam9x5 SoCs dt-bindings: clock: Move at91.h to dt-bindigs/clock ARM: at91: fix spi cs on sama5d3 Xplained board Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-05-23Merge branch 'at91/cleanup' into next/dtArnd Bergmann
Conflicts: arch/arm/boot/dts/at91sam9rl.dtsi Needed as a dependency for the at91/dt2 branch Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-05-23Merge branch 'filter-next'David S. Miller
Daniel Borkmann says: ==================== BPF updates These were still in my queue. Please see individual patches for details. I have rebased these on top of current net-next with Andrew's gcc union fixup [1] applied to avoid dealing with an unnecessary merge conflict. [1] http://patchwork.ozlabs.org/patch/351577/ ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
2014-05-23net: filter: add test case for jump with holes and ret x variantsDaniel Borkmann
This patch adds three more test cases: 1) long jumps with holes of unreachable code 2) ret x 3) ldx + ret x All three tests are for classical BPF and to make sure that any changes will not break some exotic behaviour that exists probably since decades. The last two tests are expected to fail by the BPF checker already, as in classic BPF only K or A are allowed to be returned. Thus, there are now 52 test cases for BPF. Signed-off-by: Daniel Borkmann <dborkman@redhat.com> Acked-by: Alexei Starovoitov <ast@plumgrid.com> Signed-off-by: David S. Miller <davem@davemloft.net>
2014-05-23net: filter: improve test case frameworkDaniel Borkmann
This patch simplifies and refactors the test case code a bit and also adds a summary of all test that passed or failed in the kernel log, so that it's easier to spot if something has failed. Future work could further extend the test framework to also support different input 'stimuli' i.e. related structures to seccomp. Signed-off-by: Daniel Borkmann <dborkman@redhat.com> Acked-by: Alexei Starovoitov <ast@plumgrid.com> Signed-off-by: David S. Miller <davem@davemloft.net>
2014-05-23net: filter: doc: add section for BPF test suiteDaniel Borkmann
Mention the recently added test suite in the documentation file. Signed-off-by: Daniel Borkmann <dborkman@redhat.com> Acked-by: Alexei Starovoitov <ast@plumgrid.com> Signed-off-by: David S. Miller <davem@davemloft.net>
2014-05-23net: filter: let unattached filters use sock_fprog_kernDaniel Borkmann
The sk_unattached_filter_create() API is used by BPF filters that are not directly attached or related to sockets, and are used in team, ptp, xt_bpf, cls_bpf, etc. As such all users do their own internal managment of obtaining filter blocks and thus already have them in kernel memory and set up before calling into sk_unattached_filter_create(). As a result, due to __user annotation in sock_fprog, sparse triggers false positives (incorrect type in assignment [different address space]) when filters are set up before passing them to sk_unattached_filter_create(). Therefore, let sk_unattached_filter_create() API use sock_fprog_kern to overcome this issue. Signed-off-by: Daniel Borkmann <dborkman@redhat.com> Acked-by: Alexei Starovoitov <ast@plumgrid.com> Signed-off-by: David S. Miller <davem@davemloft.net>
2014-05-23net: filter: remove DL macroDaniel Borkmann
Lets get rid of this macro. After commit 5bcfedf06f7f ("net: filter: simplify label names from jump-table"), labels have become more readable due to omission of BPF_ prefix but at the same time more generic, so that things like `git grep -n` would not find them. As a middle path, lets get rid of the DL macro as it's not strictly needed and would otherwise just hide the full name. Signed-off-by: Daniel Borkmann <dborkman@redhat.com> Acked-by: Alexei Starovoitov <ast@plumgrid.com> Signed-off-by: David S. Miller <davem@davemloft.net>
2014-05-23clk: divider: add CLK_DIVIDER_READ_ONLY flagHeiko Stuebner
From: Heiko Stuebner <heiko@sntech.de> Similar to muxes which already have a read-only flag there sometimes exist dividers which should not be changed by the clock framework but whose value still should be readable. Therefore add a READ_ONLY flag similar to the mux-one to clk-divider Signed-off-by: Heiko Stuebner <heiko@sntech.de> [changed flag bit to BIT(5) as suggested by Tomasz Figa] Signed-off-by: Thomas Abraham <thomas.ab@samsung.com> Acked-by: Tomasz Figa <t.figa@samsung.com> Acked-by: Max Schwarz <max.schwarz@online.de> Tested-by: Max Schwarz <max.schwarz@online.de> Signed-off-by: Mike Turquette <mturquette@linaro.org>
2014-05-23clk: shmobile: Add R8A7740-specific clock supportUlrich Hecht
Driver for the R8A7740's clocks that are too specific to be supported by a generic driver. Signed-off-by: Ulrich Hecht <ulrich.hecht+renesas@gmail.com> Acked-by: Geert Uytterhoeven <geert@linux-m68k.org> Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Signed-off-by: Mike Turquette <mturquette@linaro.org>
2014-05-23Merge tag 'sti-dt-for-v3.16-1' of ↵Arnd Bergmann
git://git.stlinux.com/devel/kernel/linux-sti into next/dt Merge "ARM: STi: DT changes for v3.16, v3" from Maxime Coquelin: Please consider these STi DT updates for v3.16. This 3rd version takes into account Olof's comments on the v2: - Fix upper-cases in labels and node names - Sort compatibles order from specific to generic - Sort dts entries in Makefile It also adds support for the B2020 revision E board for STiH416 SoC. Note that two reset patches are part of this pull request, in order to avoid compilation breakage. Adding these two patches in this pull request has been accepted by Philipp Zabel. * tag 'sti-dt-for-v3.16-1' of git://git.stlinux.com/devel/kernel/linux-sti: (23 commits) ARM: sti: stih41x: Provide a proper header for this DTSI file ARM: sti: stih416: Enable board LED support for B2020 RevE ARM: sti: stih416: Add support for B2020 RevE ARM: STi: DT: STiH41x Add clk_ignore_unused to bootargs ARM: STi: DT: STiH415: 415 DT Entry for clockgen A9 ARM: STi: DT: STiH415: Remove unused CLK_S_GMAC0_PHY & CLK_S_ETH1_PHY fixed clocks ARM: STi: DT: STiH415: Remove unused CLK_S_ICN_REG_0 fixed clock ARM: STi: DT: STiH415: 415 DT Entry for clockgen A0/1/10/11/12 ARM: STi: DT: STiH416: 416 DT Entry for clockgen A9/DDR/GPU ARM: STi: DT: STiH416: 416 DT Entry for clockgen B/C/D/E/F ARM: STi: DT: STiH416: Remove unused CLK_S_GMAC0_PHY & CLK_S_ETH1_PHY fixed clocks ARM: STi: DT: STiH416: Remove unused CLK_S_ICN_REG_0 fixed clock ARM: STi: DT: STiH416: 416 DT Entry for clockgen A0/1/10/11/12 ARM: STi: DT: STiH41x: Rename CLK_SYSIN into clk_sysin ARM: STi: DT: add keyscan for stih41x-b2000 ARM: STi: DT: add keyscan for stih416 ARM: STi: DT: add keyscan for stih415 driver: reset: sti: add keyscan for stih416 driver: reset: sti: add keyscan for stih415 ARM: dts: STiH407: Add B2120 board support ... Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-05-23Merge branch 'inet_csums_part3'David S. Miller
Tom Herbert says: ==================== net: Checksum offload changes - Part III I am working on overhauling RX checksum offload. Goals of this effort are: - Specify what exactly it means when driver returns CHECKSUM_UNNECESSARY - Preserve CHECKSUM_COMPLETE through encapsulation layers - Don't do skb_checksum more than once per packet - Unify GRO and non-GRO csum verification as much as possible - Unify the checksum functions (checksum_init) - Simply code What is in this third patch set: - Remove sk_no_check from sunrpc (doesn't seem to have any effect) - Eliminate no_check from protosw. All protocols are using default of zero for this - Split sk_no_check into sk_no_check_tx and sk_no_check_rx - Make enabling of UDP6 more restrictive and explicit - Support zero UDP6 checksums in l2tp V2: Took out vxlan changes to set zero csums in IPv6, this will be in a later patch set. V3: Fixed bug in restricting UDP6 checksums. Please review carefully and test if possible, mucking with basic checksum functions is always a little precarious :-) ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
2014-05-23l2tp: Add support for zero IPv6 checksumsTom Herbert
Added new L2TP configuration options to allow TX and RX of zero checksums in IPv6. Default is not to use them. Signed-off-by: Tom Herbert <therbert@google.com> Signed-off-by: David S. Miller <davem@davemloft.net>
2014-05-23net: Make enabling of zero UDP6 csums more restrictiveTom Herbert
RFC 6935 permits zero checksums to be used in IPv6 however this is recommended only for certain tunnel protocols, it does not make checksums completely optional like they are in IPv4. This patch restricts the use of IPv6 zero checksums that was previously intoduced. no_check6_tx and no_check6_rx have been added to control the use of checksums in UDP6 RX and TX path. The normal sk_no_check_{rx,tx} settings are not used (this avoids ambiguity when dealing with a dual stack socket). A helper function has been added (udp_set_no_check6) which can be called by tunnel impelmentations to all zero checksums (send on the socket, and accept them as valid). Signed-off-by: Tom Herbert <therbert@google.com> Signed-off-by: David S. Miller <davem@davemloft.net>
2014-05-23net: Split sk_no_check into sk_no_check_{rx,tx}Tom Herbert
Define separate fields in the sock structure for configuring disabling checksums in both TX and RX-- sk_no_check_tx and sk_no_check_rx. The SO_NO_CHECK socket option only affects sk_no_check_tx. Also, removed UDP_CSUM_* defines since they are no longer necessary. Signed-off-by: Tom Herbert <therbert@google.com> Signed-off-by: David S. Miller <davem@davemloft.net>
2014-05-23net: Eliminate no_check from protoswTom Herbert
It doesn't seem like an protocols are setting anything other than the default, and allowing to arbitrarily disable checksums for a whole protocol seems dangerous. This can be done on a per socket basis. Signed-off-by: Tom Herbert <therbert@google.com> Signed-off-by: David S. Miller <davem@davemloft.net>
2014-05-23sunrpc: Remove sk_no_check settingTom Herbert
Setting sk_no_check to UDP_CSUM_NORCV seems to have no effect. Signed-off-by: Tom Herbert <therbert@google.com> Signed-off-by: David S. Miller <davem@davemloft.net>
2014-05-23Merge branch 'master' of ↵David S. Miller
git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next Jeff Kirsher says: ==================== Intel Wired LAN Driver Updates This series contains updates to igb, igbvf, ixgbe, i40e and i40evf. Jacob provides eight patches to cleanup the ixgbe driver to resolve various checkpatch.pl warnings/errors as well as minor coding style issues. Stephen Hemminger and I provide simple cleanups of void functions which had useless return statements at the end of the function which are not needed. v2: Dropped Emil's patch "ixgbe: fix the detection of SFP+ capable interfaces" while I wait for his updated patch to be validated. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
2014-05-23blk-mq: allow setting of per-request timeoutsJens Axboe
Currently blk-mq uses the queue timeout for all requests. But for some commands, drivers may want to set a specific timeout for special requests. Allow this to be passed in through request->timeout, and use it if set. Signed-off-by: Jens Axboe <axboe@fb.com>