Commit graph

560,906 commits

Author SHA1 Message Date
Alex Deucher
8ddef5a5e5 drm/amdgpu/dce11: Re-show the cursor after a modeset (v2)
Setting a mode seems to clear the cursor registers, so we need to
re-program them to make sure the cursor is visible.

Port of radeon commit:
6d3759fac6

v2: change radeon reference in error output

Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
2015-10-14 16:16:29 -04:00
Alex Deucher
d8ee89c639 drm/amdgpu/dce11: Use cursor_set2 hook for enabling / disabling the HW cursor
The cursor_set2 hook provides the cursor hotspot position within the
cursor image. When the hotspot position changes, we can adjust the cursor
position such that the hotspot doesn't move on the screen. This prevents
the cursor from appearing to intermittently jump around on the screen
when the position of the hotspot within the cursor image changes.

Port of radeon commits:
78b1a6010b
3feba08d79

Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
2015-10-14 16:16:28 -04:00
Alex Deucher
3c681718b4 drm/amdgpu/dce10: Fold set_cursor() into show_cursor()
Port of radeon commit:
8991668ab4

Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
2015-10-14 16:16:28 -04:00
Alex Deucher
f9242d1baf drm/amdgpu/dce10: Clean up reference counting and pinning of the cursor BOs
Take a GEM reference for and pin the new cursor BO, unpin and drop the
GEM reference for the old cursor BO in dce10 crtc_cursor_set2, and use
amdgpu_crtc->cursor_addr in dce10 set_cursor.

This fixes dce10 cursor_reset accidentally incrementing the cursor BO
pin count, and cleans up the code a little.

Port of radeon commit:
cd404af0c9

Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
2015-10-14 16:16:27 -04:00
Alex Deucher
ef67e38cfe drm/amdgpu/dce10: Move hotspot handling out of set_cursor
It's only needed in dce10 crtc_cursor_set2.

Port of radeon commit:
2e007e611b

Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
2015-10-14 16:16:26 -04:00
Alex Deucher
dd0b5d2f88 drm/amdgpu/dce10: Re-show the cursor after a modeset (v2)
Setting a mode seems to clear the cursor registers, so we need to
re-program them to make sure the cursor is visible.

Port of radeon commit:
6d3759fac6

v2: change radeon reference in error message

Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
2015-10-14 16:16:26 -04:00
Alex Deucher
29275a9b09 drm/amdgpu/dce10: Use cursor_set2 hook for enabling / disabling the HW cursor
The cursor_set2 hook provides the cursor hotspot position within the
cursor image. When the hotspot position changes, we can adjust the cursor
position such that the hotspot doesn't move on the screen. This prevents
the cursor from appearing to intermittently jump around on the screen
when the position of the hotspot within the cursor image changes.

Port of radeon commits:
78b1a6010b
3feba08d79

Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
2015-10-14 16:16:25 -04:00
Alex Deucher
c2fe16aa36 drm/amdgpu/atom: add support for new div32 opcodes (v3)
Better precision than the regular div opcode.

v2: drop 64 bit divide
v3: fix op handling.  This actually is a 64 bit divide.

Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
2015-10-14 16:16:24 -04:00
Alex Deucher
c9c145021f drm/amdgpu/atom: add support for new mul32 opcodes (v2)
Better precision than the regular mul opcode.

v2: handle big endian properly.

Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
2015-10-14 16:16:24 -04:00
Alex Deucher
554384198c drm/amdgpu/atom: add support for process ds opcode
Just skips a data section.

Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
2015-10-14 16:16:23 -04:00
Alex Deucher
f76097c099 drm/amdgpu/atom: implement debug opcode
Basically a nop.

Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
2015-10-14 16:16:22 -04:00
Carlo Caione
f9e5ca86ee ARM: meson6: DTS: Fix wrong reg mapping and IRQ numbers
The DTS erronously uses the wrong reg mapping and IRQ numbers for some
UART, WDT and timer nodes. Fix this.

Reported-by: John Wehle <john@feith.com>
Signed-off-by: Carlo Caione <carlo@endlessm.com>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2015-10-14 22:13:07 +02:00
Stephen Boyd
d0bfd7c9b1 soc: qcom: smem: Move RPM message ram out of smem DT node
SMEM is a software construct built on top of a DDR reserved region
and sometimes a device memory region called RPM message ram. Having
the RPM message ram in the smem DT node's reg property leads to the
smem node being located in different places depending on if the
message ram is being used or not. Let's add a qcom specific
property, qcom,rpm-msg-ram, and point to the device memory from
the SMEM node via a phandle.  As SMEM is a software construct, it
really needs to reside at the root of the DT regardless of whether
it's using the message ram or not.

Cc: Bjorn Andersson <bjorn.andersson@sonymobile.com>
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
Signed-off-by: Andy Gross <agross@codeaurora.org>
2015-10-14 14:51:40 -05:00
Bjorn Andersson
a8ddd1b998 soc: qcom: smd-rpm: Correct the active vs sleep state flagging
The BIT() was incorrectly inherited from family A and should not be used
on family B where the state is denoted by an enum.

Reported-by: Georgi Djakov <georgi.djakov@linaro.org>
Signed-off-by: Bjorn Andersson <bjorn.andersson@sonymobile.com>
Tested-by: Georgi Djakov <georgi.djakov@linaro.org>
Signed-off-by: Andy Gross <agross@codeaurora.org>
2015-10-14 14:51:22 -05:00
Julia Lawall
6083096d96 soc: qcom: smd: delete unneeded of_node_put
Device node iterators perform an of_node_put on each iteration, so putting
an of_node_put before a continue results in a double put.

A simplified version of the semantic match that finds this problem is as
follows (http://coccinelle.lip6.fr):

// <smpl>
@@
expression root,e;
local idexpression child;
iterator i;
@@

 i(..., child, ...) {
   ... when != of_node_get(child)
*  of_node_put(child);
   ...
*  continue;
}
// </smpl>

Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>
Signed-off-by: Andy Gross <agross@codeaurora.org>
2015-10-14 14:51:22 -05:00
Arnd Bergmann
33e38b4f1c firmware: qcom-scm: build for correct architecture level
The ".arch_extension sec" directive is only available on ARMv6 or higher,
so if we enable the SCM driver while building a kernel for an older CPU,
we get a build error:

/tmp/ccUyhMOY.s:130: Error: selected processor does not support ARM mode `smc #0'
/tmp/ccUyhMOY.s:216: Error: selected processor does not support ARM mode `smc #0'
/tmp/ccUyhMOY.s:373: Error: selected processor does not support ARM mode `smc #0'
make[4]: *** [drivers/firmware/qcom_scm-32.o] Error 1

This changes the Makefile so we pass the ARMv7 architecture level both
for the check and for the actual compilation of the scm driver.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Andy Gross <agross@codeaurora.org>
2015-10-14 14:51:22 -05:00
Bjorn Andersson
ea4683e0b6 soc: qcom: smd: Correct SMEM items for upper channels
Update the SMEM items for the second set of SMD channels, as these where
incorrect.

Signed-off-by: Bjorn Andersson <bjorn.andersson@sonymobile.com>
Signed-off-by: Andy Gross <agross@codeaurora.org>
2015-10-14 14:51:22 -05:00
Rob Clark
2d3c277ca5 qcom-scm: add missing prototype for qcom_scm_is_available()
Signed-off-by: Rob Clark <robdclark@gmail.com>
Signed-off-by: Andy Gross <agross@codeaurora.org>
2015-10-14 14:51:22 -05:00
Rob Clark
c7b7c60949 qcom-scm: fix endianess issue in __qcom_scm_is_call_available
Signed-off-by: Rob Clark <robdclark@gmail.com>
Reviewed-by: Stephen Boyd <sboyd@codeaurora.org>
Signed-off-by: Andy Gross <agross@codeaurora.org>
2015-10-14 14:51:21 -05:00
Bjorn Andersson
a208ca98ff soc: qcom: smd: Reject send of too big packets
Attempting to find room for a packet that's bigger than the fifo will
never succeed and the calling process will be sleeping forever in the
loop, waiting for enough room. So fail early instead.

Reported-by: Courtney Cavin <courtney.cavin@sonymobile.com>
Signed-off-by: Bjorn Andersson <bjorn.andersson@sonymobile.com>
Reviewed-by: Andy Gross <agross@codeaurora.org>
Signed-off-by: Andy Gross <agross@codeaurora.org>
2015-10-14 14:51:21 -05:00
Stephen Boyd
24f60e3776 soc: qcom: smd: Handle big endian CPUs
The smd structures are always in little endian, but the smd
driver is not capable of being used on big endian CPUs. Annotate
the little endian data members and update the code to do the
proper byte swapping.

Cc: Bjorn Andersson <bjorn.andersson@sonymobile.com>
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
Signed-off-by: Andy Gross <agross@codeaurora.org>
2015-10-14 14:51:21 -05:00
Stephen Boyd
30b7ea5eda soc: qcom: smd_rpm: Handle big endian CPUs
The smd rpm structures are always in little endian, but this
driver is not capable of being used on big endian CPUs. Annotate
the little endian data members and update the code to do the
proper byte swapping.

Cc: Bjorn Andersson <bjorn.andersson@sonymobile.com>
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
Reviewed-by: Bjorn Andersson <bjorn.andersson@sonymobile.com>
Signed-off-by: Andy Gross <agross@codeaurora.org>
2015-10-14 14:51:21 -05:00
Stephen Boyd
50e1b29b44 soc: qcom: smd: Remove use of VLAIS
Usage of VLAIS prevents clang from compiling this file, and it
also opens us to the possibility of allocating a large structure
on the stack to the point that we blow past the limit of the
kernel stack. Remove the VLAIS and allocate a structure on the
heap with kmalloc so that we're safer and more clang friendly.

Cc: Bjorn Andersson <bjorn.andersson@sonymobile.com>
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
Reviewed-by: Bjorn Andersson <bjorn.andersson@sonymobile.com>
Signed-off-by: Andy Gross <agross@codeaurora.org>
2015-10-14 14:51:21 -05:00
Stephen Boyd
3b781e55c6 soc: qcom: smd: Use __iowrite32_copy() instead of open-coding it
We already have a function to do this and it silences some sparse
warnings along the way.

Reviewed-by: Bjorn Andersson <bjorn.andersson@sonymobile.com>
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
Signed-off-by: Andy Gross <agross@codeaurora.org>
2015-10-14 14:51:21 -05:00
Stephen Boyd
f02dc82523 soc: qcom: smd: Represent channel layout in structures
The rx and tx channel info are laid out in memory next to each
other, and there are two types of channel info structures, byte
based and word based. We have 4 pointers to these info
structures, when we really only need two to point to the
different types of structures. Encapsulate the byte based and
word based tx/rx structures in a "channel pair" structure that
describes the layout of memory and reduces the number of pointers
in the smd channel structure by two.

Reviewed-by: Bjorn Andersson <bjorn.andersson@sonymobile.com>
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
Signed-off-by: Andy Gross <agross@codeaurora.org>
2015-10-14 14:51:20 -05:00
Stephen Boyd
9806884d8c soc: qcom: smem: Handle big endian CPUs
The contents of smem are always in little endian, but the smem
driver is not capable of being used on big endian CPUs. Annotate
the little endian data members and update the code to do the
proper byte swapping.

Cc: Bjorn Andersson <bjorn.andersson@sonymobile.com>
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
Reviewed-by: Bjorn Andersson <bjorn.andersson@sonymobile.com>
Signed-off-by: Andy Gross <agross@codeaurora.org>
2015-10-14 14:51:20 -05:00
Stephen Boyd
1a03964dec soc: qcom: Make qcom_smem_get() return a pointer
Passing a void ** almost always requires a cast at the call site.
Instead of littering the code with casts every time this function
is called, have qcom_smem_get() return a void pointer to the
location of the smem item. This frees the caller from having to
cast the pointer.

Cc: Bjorn Andersson <bjorn.andersson@sonymobile.com>
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
Reviewed-by: Bjorn Andersson <bjorn.andersson@sonymobile.com>
Signed-off-by: Andy Gross <agross@codeaurora.org>
2015-10-14 14:51:20 -05:00
Stephen Boyd
7d0c8beea6 soc: qcom: Reorder SMEM/SMD configs
When I make nconfig, having the SMEM option after the SMD option
causes the configurator to get confused when I'm enabling and
disabling these options. Let's move SMEM before SMD so there's a
clear indented dependency chain.

Cc: Bjorn Andersson <bjorn.andersson@sonymobile.com>
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
Reviewed-by: Bjorn Andersson <bjorn.andersson@sonymobile.com>
Signed-off-by: Andy Gross <agross@codeaurora.org>
2015-10-14 14:51:20 -05:00
Stephen Boyd
f8c67df71b soc: qcom: smem: Avoid NULL pointer exception on remove
Don't set a pointer to NULL and then dereference it in the next
line.

Cc: Bjorn Andersson <bjorn.andersson@sonymobile.com>
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
Reviewed-by: Bjorn Andersson <bjorn.andersson@sonymobile.com>
Signed-off-by: Andy Gross <agross@codeaurora.org>
2015-10-14 14:51:20 -05:00
Bjorn Andersson
1a7caca20e soc: qcom: smd: Implement id_table driver matching
Implement a id_table based driver maching mechanism for drivers that
binds to fixed channels and doesn't need any additional configuration,
e.g. IPCRTR and DIAG.

Signed-off-by: Bjorn Andersson <bjorn.andersson@sonymobile.com>
Signed-off-by: Andy Gross <agross@codeaurora.org>
2015-10-14 14:51:20 -05:00
Tero Kristo
d42f265a5d ARM: OMAP3: clock: remove un-used core dpll re-program code
Remove the OMAP3 core DPLL re-program code, and the associated SRAM
code that does the low-level programming of the DPLL divider, idling
of the SDRAM etc.

This code was never fully implemented in the kernel; things missing
were driver side handling of core clock changes (they need to account
for their functional clock rate being changed on-the-fly), and the whole
framework required for handling this. Thus, there is not much point
to keep carrying the low-level support code either.

Signed-off-by: Tero Kristo <t-kristo@ti.com>
Cc: Paul Walmsley <paul@pwsan.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
2015-10-14 12:35:27 -07:00
Laurent Pinchart
be14641250 ARM: dts: omap3-igep: Use OMAP3_CORE1_IOPAD pinmux macro
Use the macro instead of absolute register offsets to make the code more
readable as the values now match register addresses from the datasheet.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: Javier Martinez Canillas <javier@osg.samsung.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
2015-10-14 12:28:13 -07:00
Javier Martinez Canillas
2445a9c5f0 clk: max77802: Update MODULE_AUTHOR() email address
The email address listed in MODULE_AUTHOR() no longer exist so to prevent
people to send emails to the old address, replace it with my current one.

Signed-off-by: Javier Martinez Canillas <javier@osg.samsung.com>
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
2015-10-14 11:31:55 -07:00
Stephen Boyd
e79b202c63 Partially revert "clk: mvebu: Convert to clk_hw based provider APIs"
This partially reverts commit eca61c9ff2.

Thomas reports that it causes regressions on Armada XP devices.
This is because of_clk_get_parent_name() relies on the property
'clock-output-names' to resolve the name of a clock's parent,
without trying to get the clock from the framework and call
__clk_get_name(). Given that Armada XP devices don't have the
'clock-output-names' property, of_clk_get_parent_name() returns
the name of the node which doesn't match the actual parent
clock's name at all, causing CPU clocks to never link up with
their parents.

Reported-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
2015-10-14 11:28:17 -07:00
Linus Torvalds
cfed1e3de4 Bug fixes for system management mode emulation. The first two patches
fix SMM emulation on Nehalem processors.  The others fix some cases
 that became apparent as work progressed on the firmware side.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
 iQEcBAABAgAGBQJWHms0AAoJEL/70l94x66DfQkIAIpya6c/1UAthxSTqJ1wFOf8
 ZKp3GCMjUjtm9k88kk6JGOlPiAvWz7CG9BVbptpkJGpgoDzquvr6ZKGG2BV88F17
 MnkZCid4IBW6VeKYy7R2otkKw7+Pw8DTHRQks+VI6BN/KkeaZLzh5J8+FAl4ZaWk
 YX/VulRce6SfZPYuUTRkkK8aebsopZNVG8mwWIGuBYwyH54R3KH1k/euX2joUPwm
 oopzmQLgEWW7e3RsO67T36rIRgEorJLZaiiexvj1djI+e0kEEudvhJ9nC6eB52qa
 oZ9nR0nkkmBmrBF8gldKDZBC+Y/ci1cJLAaoi7tdsp0wVCebPxubwbPOXxKwD8g=
 =ij8Q
 -----END PGP SIGNATURE-----

Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm

Pull KVM fixes from Paolo Bonzini:
 "Bug fixes for system management mode emulation.

  The first two patches fix SMM emulation on Nehalem processors.  The
  others fix some cases that became apparent as work progressed on the
  firmware side"

* tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
  KVM: x86: fix RSM into 64-bit protected mode
  KVM: x86: fix previous commit for 32-bit
  KVM: x86: fix SMI to halted VCPU
  KVM: x86: clean up kvm_arch_vcpu_runnable
  KVM: x86: map/unmap private slots in __x86_set_memory_region
  KVM: x86: build kvm_userspace_memory_region in x86_set_memory_region
2015-10-14 10:01:32 -07:00
Tan Xiaojun
30f84a891b EDAC: Use edac_debugfs_remove_recursive()
debugfs_remove() is used to remove a file or a directory from the
debugfs filesystem, but mci->debugfs might not empty.

This can be triggered by the following sequence:

1) Enable CONFIG_EDAC_DEBUG
2) insmod an EDAC module (like i3000_edac or similar)
3) rmmod this module
4) we can see files remaining under <debugfs_mountpoint>/edac/ like
   "fake_inject", for example.

Removing edac_core then, causes a NULL pointer dereference.

Reported-by: Yun Wu (Abel) <wuyun.wu@huawei.com>
Signed-off-by: Tan Xiaojun <tanxiaojun@huawei.com>
Cc: Doug Thompson <dougthompson@xmission.com>
Cc: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Cc: linux-edac <linux-edac@vger.kernel.org>
Link: http://lkml.kernel.org/r/1444787364-104353-1-git-send-email-tanxiaojun@huawei.com
Signed-off-by: Borislav Petkov <bp@suse.de>
2015-10-14 18:50:32 +02:00
Linus Torvalds
9e07f98ab7 - Bug Fixes
- Return correct error code i.e. not zero
    - Fix build error when !CONFIG_PM_SLEEP
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJWHhRlAAoJEFGvii+H/HdhWnUP/Ra+5qnYT2PT5rA7htkfmNSm
 xLF7jd4coZUBACSCC+4h7sCA3GoEaoKDMbbIPxX7jrwvaAqBYCJBSNeXUJWjBEiP
 QcG6D6dtO40Khi98ySKX3VMSTi2b8MHomrEp56J2sFMGhmdn6dyEYvGyEDhkKuS5
 UdERXeFOpLJ/PKqulhtJkg+eeGEcb3WEPTqxc1WRFEhwU8h8PPIiEjP/1r8Dd1aX
 9mnrs0hwR+1/8qiTI44bizBCLBaLCjJs6nYofmcGUiDEs/rJ44R5lV/fo0AFncVe
 +ZVpwXuDVU+8P3tcK6NUiregsi7eQhjjvCzNwZKOWEjOGiEXgxhNRrvhaX7Grzkt
 xmVpIAfs8j3cnKzjFnsHz2PyTG04xWo+q518H28pyRCa7FTXaX1m0ubuoiahS+5Z
 Fw8GGAuvyHs+DuVl4miyEbEuVwhAIP65e7hMhVXRI2wzDXPSKsODMguQ5x6CcCOh
 v+to4kO88OK80V/aCQ70XDV8CSK7K/MIIDKQLHgOc+uEP1DoDh0VjO1CeLmHL4/0
 AS9vzFone2dfCQSkEr4qQaQmi0iyTrhyRKCld2B2SrGiXEbM6/T1oecFvSmEcKdp
 a8uWX7SxGijNQqdvjDzUPYORWFBLoBnZEAtWmh+HFjJTKPzWTKwj+gIeoNc4Xu9o
 LN0rfubfoH8iXao5yuXg
 =V6bR
 -----END PGP SIGNATURE-----

Merge tag 'mfd-fixes-4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd

Pull MFD fixes from Lee Jones:
 "Bug Fixes:

   - Return correct error code i.e. not zero

   - Fix build error when !CONFIG_PM_SLEEP"

* tag 'mfd-fixes-4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd:
  mfd: max77843: Fix max77843_chg_init() return on error
  mfd: intel-lpss: Fix build error when !CONFIG_PM_SLEEP
2015-10-14 09:47:38 -07:00
Johannes Berg
6f1f5d5f4d mac80211: remove event.c
That file contains just a single function, which itself is just a
single statement to call a different function. Remove it.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
2015-10-14 18:40:26 +02:00
Johannes Berg
3beea3513f mac80211: remove cfg.h
The file contains just a single declaration that can easily
move to another file - remove it.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
2015-10-14 18:36:43 +02:00
Johannes Berg
fbd6ff5cea mac80211: move sta_set_rate_info_rx() and make it static
There's only a single caller of this function, so it can
be moved to the same file and made static.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
2015-10-14 18:31:30 +02:00
Johannes Berg
a732fa7001 mac80211: clean up ieee80211_rx_h_check_dup code
Reduce indentation a bit to make the condition more readable.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
2015-10-14 18:27:07 +02:00
Johannes Berg
4a733ef1be mac80211: remove PM-QoS listener
As this API has never really seen any use and most drivers don't
ever use the value derived from it, remove it.

Change the only driver using it (rt2x00) to simply use the DTIM
period instead of the "max sleep" time.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
2015-10-14 18:04:08 +02:00
Arnd Bergmann
b1ee27d44d Samsung DT updates for v4.4
- New board support
   : add exynos5250-snow-rev5 DT file to support Snow Rev5+ board
   : add exynos5422-odroidxu4 DT file to support Odroid XU4 board
   : split exynos5422-odroidxu3-audio DT file from odroidxu3-common
 
 - USE GPIO constants for flags cells for exynos boards
 - fix cpu compatible value to 'arm926ej-s' for s3c2416
 
 - add DMA support for serial ports for exynos4
 - add suspend opp for exynos4412
 - remove regulator-compatible usage for exynos4412-trats2
 
 - enable EC vboot context support for Peach boards
 - move display-timings node to DP for exynos5250-arndale, smdk5250 and smdk5420
 
 - for exynos4412-odroid/odroidu3
   : unify voltage regulator style and
   : remove redundant pinctrl settings
   : add pwm-fan node and use it as a colling device
 
 - for exynos5422-odroidxu3
   : fix power off method and LEDs
 
 - dt-bindings
   : grounded AC0KB pin on S2MPS11
   : entry how to use PWM FAN as a cooling device
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.11 (GNU/Linux)
 
 iQIcBAABAgAGBQJWHBBhAAoJEA0Cl+kVi2xqTYEP/jutsYKeQE2/A3g3zOMHfuYv
 p6Q9m0RB5rug7KOmT10nqAJmBpj3FZZgSTWf3AUfPCNxzei1DY9LNknHPqOIHY4S
 HfbDx0qA2U5Jta02Bo9SE3pgkODJX/p1YAmiEbVOwiKS6vuFysykX0QvidBSCYbk
 tqfqb6LRsdglIItKs2acUyLoZeldaYdDOvkL6hrHiwjz8njUGoSYLITkorfrBSIv
 jcppiOXAZqxsjgmEho86u7jbqbC66a3yH9bMgge45t98rE5vu3WIoA8082jlQXpt
 JnGtNfaTb8DECwL7T0++Ohk8hsDHood3WEmuoYAHUEq5DMotS//LZ4n2xDNWXVbN
 s//cRrETBIMWk/AUZdNYbtbNGVOKYz78xL7EiJSBYby+YdYFi3tpRJ0/+9bHEglD
 URwxOUb1320S2QlFULN+50x6VxPPbbAU1EmFH708RXDFQIJMLFUIANGfck0CuFah
 PJaAChyAMLbqV9K7y/FfqDobxZAa1y2eAYWyL4eLYfxeOhY+PhhRfMD8pWgY1ZW4
 vgHqpVADJvuZ5d7U3JgYclTQ0J6ILrDoCP5/E5C9TvYkBP5SV4KiEqvZ2Hklzxv7
 9vdsfWppnYRTH2moo0tokLNRYXewzW7svq/gKYXY0VjERjnmCfrjMRXZ76q3WQ7Y
 gy2KJDH/jxwlIdsGEDG6
 =FqOp
 -----END PGP SIGNATURE-----

Merge tag 'samsung-dt-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/dt

Merge "Samsung DT updates for v4.4" from Kukjin Kim:

- New board support
  : add exynos5250-snow-rev5 DT file to support Snow Rev5+ board
  : add exynos5422-odroidxu4 DT file to support Odroid XU4 board
  : split exynos5422-odroidxu3-audio DT file from odroidxu3-common

- USE GPIO constants for flags cells for exynos boards
- fix cpu compatible value to 'arm926ej-s' for s3c2416

- add DMA support for serial ports for exynos4
- add suspend opp for exynos4412
- remove regulator-compatible usage for exynos4412-trats2

- enable EC vboot context support for Peach boards
- move display-timings node to DP for exynos5250-arndale, smdk5250 and smdk5420

- for exynos4412-odroid/odroidu3
  : unify voltage regulator style and
  : remove redundant pinctrl settings
  : add pwm-fan node and use it as a colling device

- for exynos5422-odroidxu3
  : fix power off method and LEDs

- dt-bindings
  : grounded AC0KB pin on S2MPS11
  : entry how to use PWM FAN as a cooling device

* tag 'samsung-dt-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung: (22 commits)
  ARM: dts: Use GPIO constants for flags cells in exynos5440 boards
  ARM: dts: Use GPIO constants for flags cells in exynos5420/5422/5800 boards
  ARM: dts: Use GPIO constants for flags cells in exynos4412 boards
  ARM: dts: Use GPIO constants for flags cells in exynos4120 boards
  ARM: dts: Use GPIO constants for flags cells in exynos3250 boards
  ARM: dts: Enable EC vboot context support on Peach boards
  ARM: dts: Remove regulator-compatible usage in exynos4412-trats2
  ARM: dts: Move display-timings node from fimd to dp in exynos5250-arndale, smdk5250 and smdk5420
  ARM: dts: Add Exynos5250 Snow Rev5+ support on exynos5250-snow-rev5
  ARM: dts: Unify voltage regulator style in exynos4412-odroid
  ARM: dts: Remove redundant pinctrl settings in exynos4412-odroid
  ARM: dts: Fix cpu compatible value for s3c2416
  ARM: dts: Add support Odroid XU4 board for exynos5422-odroidxu4
  ARM: dts: Split audio configuration to separate exynos5422-odroidxu3-audio
  ARM: dts: Fix power off method for exynos5422-odroidxu3-common
  dt-bindings: Document grounded ACOKB pin on S2MPS11
  ARM: dts: use pwm-fan device as a cooling device for exynos4412-odroidu3
  ARM: dts: Add pwm-fan node for exynos4412-odroidu3
  dt-bindings: Documentation entry to explain how to use PWM FAN as a cooling device
  ARM: dts: add suspend opp to exynos4412
  ...
2015-10-14 17:57:03 +02:00
Ian Campbell
8ee57b8182 ARM64: dts: vexpress: Use a symlink to vexpress-v2m-rs1.dtsi from arch=arm
Commit 9ccd608070 "arm64: dts: add device tree for ARM SMM-A53x2 on
LogicTile Express 20MG" added a new dts file to arch/arm64 which
included "../../../../arm/boot/dts/vexpress-v2m-rs1.dtsi", i.e. a
.dtsi supplied by arch/arm.

Unfortunately this causes some issues for the split device tree
repository[0], since things get moved around there. In that context
the new .dts ends up at src/arm64/arm/vexpress-v2f-1xv7-ca53x2.dts
while the include is at src/arm/vexpress-v2m-rs1.dtsi.

The sharing of the .dtsi is legitimate since the baseboard is the same
for various vexpress systems whatever processor they use.

Previously I attempted to resolve this by creating a shared location
for such things but we have been unable to come to a consensus on
where that should be.

Instead this patch simply replaces the use of ../../ in the dts
/include/ with a symlink in arch/arm64/boot/dts/arm pointing to the
file arch/arm/boot/dts.

Since the split device tree repo will shortly be required to flatten
symlinks for other reasons this will cause the dtsi file to appear in
both src/arm and src/arm64 in the split repo, which is an improvement
on not building for arm64 now.

[0] https://git.kernel.org/cgit/linux/kernel/git/devicetree/devicetree-rebasing.git/

Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Acked-by: Mark Rutland <mark.rutland@arm.com>
Cc: Rob Herring <robh+dt@kernel.org>
Cc: Pawel Moll <pawel.moll@arm.com>
Cc: Kumar Gala <galak@codeaurora.org>
Cc: Liviu Dudau <liviu.dudau@arm.com>
Cc: Sudeep Holla <sudeep.holla@arm.com>
Cc: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Cc: Russell King <linux@arm.linux.org.uk>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Will Deacon <will.deacon@arm.com>
Cc: Kristina Martsenko <kristina.martsenko@arm.com>
Cc: Kevin Hilman <khilman@linaro.org>
Cc: Frank Rowand <frank.rowand@sonymobile.com>
Cc: Olof Johansson <olof@lixom.net>
Cc: devicetree@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Cc: linux-arm-kernel@lists.infradead.org
Cc: arm@kernel.org
Cc: linux-kbuild@vger.kernel.org
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2015-10-14 17:55:50 +02:00
Arnd Bergmann
a8939d1a2f ARM: DT: Hisilicon SoC DT updates for 4.4
- Drop console= and earlyprintk bootargs parameter in hisilicon armv7 dts
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJWG8KoAAoJEAvIV27ZiWZcUEIP/2gevoHBz7rtZEZkgQ24hmHo
 No/J6kHITwnUMxeXhYzAYhmToNZWoZhRJ+ihj/MTB9EblHYBgf+rV7adujIZZD7E
 1BnXt0hKWVl0WAebmylfmij2cBmYD7SElH237j0DtB1nMM0aEGR7mgbueVSGL85J
 n5YkT+ZcIMuTlRrZ0sGjdDYTk082SGQ20EYxO6acZJzGYUcNAxRA5np/fZlZcl+o
 EhpBBPXS4xr9xXzk4uBaZwRmRVmkTpM41jtlA01YJw51CP++NWj49XSOKJyDm+Ip
 dwTMYZzv2uEK4kbb0Wo/VhGPkyR4TF+ZaqAFHrseiclEN+688rJM1THdi3H7ncba
 uUc3QGW4kueQQUiEC/9Ii6eNVk4eLiLoojvf67dL2EwCXVTqr0wM9s8pJhvqKsDH
 uF8zHMQRmwDPrnj9R7PFe0iybXiLPh8t9r+394ua1qc7uLms0OlwMN5deXFiuSRZ
 E8whDLMQhwHvNnuwEb5rN0Ts4BgDz26yN4WFu6utghW6MwbDq6CIk+Y6FiF9AxNX
 PxS4LoGlhjH7LWbzpWhWdBVpGe76GXyWf5uMY95YHoa9qYrI1ya+TxNkURHslbum
 OIvol8bP0uOnB/nmLQ7RmRwEsc1vjX3CUdopJ30RjPlvKy+B//k8/JfObDbbszh/
 XoX5enVefXWsDC3x5MDv
 =IXMG
 -----END PGP SIGNATURE-----

Merge tag 'hisi-soc-dt-for-4.4' of git://github.com/hisilicon/linux-hisi into next/dt

Pull "ARM: DT: Hisilicon SoC DT updates for 4.4" from Wei Xu:

- Drop console= and earlyprintk bootargs parameter in hisilicon armv7 dts

* tag 'hisi-soc-dt-for-4.4' of git://github.com/hisilicon/linux-hisi:
  ARM: hisilicon: DT: Drop console= and earlyprintk bootargs parameter
2015-10-14 17:52:59 +02:00
Carlo Caione
49eb5926df ARM: meson6: DTS: Fix wrong reg mapping and IRQ numbers
The DTS erronously uses the wrong reg mapping and IRQ numbers for some
UART, WDT and timer nodes. Fix this.

Reported-by: John Wehle <john@feith.com>
Signed-off-by: Carlo Caione <carlo@endlessm.com>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2015-10-14 17:50:51 +02:00
Arnd Bergmann
e9e50f10a7 Allwinner DT changes for 4.4
DT patches for the 4.4 merge window, most notably:
   - Enable the OTG controller on more boards
   - Create new DTSI for the q8's design
   - Added RSB support to the A23 and A33 SoCs
   - New boards: Olimex A20 EVB, Yones bs1078v2
 
 Plus the usual random patches enabling and / or enhancing a few things in
 particular boards.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJWGo6+AAoJEBx+YmzsjxAgF2MP/imuN2sb41+N2J0dL8OoH0W7
 JgjXR+h5OSLDvvHp2w6b2mOzo/f0QWcZgIDDvW4hMLsiI4eYuPBgd3wqNAsFxS56
 2Xs+RgNnE3KfQBY8nFzpKGKTt3YaDcaiZDA3uA5XuYJudDM0Oim7PqMQ0eDEz/Bt
 1Pm5c8ngykRhhlUdBEQ7Vjz6+AAPx3CSeYUKWHgin3jAp4NF/MutxJvJk1TJDjGA
 bV5H5pDIhwFY+niIZJOcWxqR5HGi3TcXRnRVs9MxEj9fwdrbJR4iRLT2kxTE/m1t
 9Ph3MGg9F7q3AijK10uzaX6AxcNPfLQuY6+SGNPyAZNhfi/A/KcnJSDFD0P+iqzb
 PVfYRhPffSsUkmZCT16aTkU3+meIGx3uS268v5o9DDf9eUTfK11sgsiJhAG28KJ1
 n0WyA4saVTHkXFbRr2qecigCsPC8mnOS3b0IsTqnScLCctL/UgaUOSPo7Vp7luOt
 di4OwVVU7TWh0Ggj+q/9jMFLhJyBOy4FUVla8vnQ1TEY2c7VRi8OB26gIKxQcFwo
 MXVhK8Icko+oHq68wqYP7yrprDNRjXKUsDh62Q22pE3nYIGVkEop8qO0NcD3eBZ/
 d1swKuVFye+Uk+UrLilm3dYTdCB/P1W3c8ZsfbsW9TXAZ5FsLo8Pnn2J4DwfxhUg
 lWCj7PXmNsxLLFkEKe2k
 =Q2Q4
 -----END PGP SIGNATURE-----

Merge tag 'sunxi-dt-for-4.4' of https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux into next/dt

Pull "Allwinner DT changes for 4.4" from Maxime Ripard:

DT patches for the 4.4 merge window, most notably:
  - Enable the OTG controller on more boards
  - Create new DTSI for the q8's design
  - Added RSB support to the A23 and A33 SoCs
  - New boards: Olimex A20 EVB, Yones bs1078v2

Plus the usual random patches enabling and / or enhancing a few things in
particular boards.

* tag 'sunxi-dt-for-4.4' of https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux: (59 commits)
  ARM: dts: sun6i: hummingbird: Drop AXP221 DC1SW and DC5LDO supplies
  ARM: dts: sun8i: sinlinx-sina33: Enable Reduced Serial Bus controller
  ARM: dts: sun8i: q8-common: Enable RSB controller for A23/A33 Q8 tablets
  ARM: dts: sun8i: Add Reduced Serial Bus controller device node to A23/A33 dtsi
  ARM: dts: sun4i: Add AXP209 PMU regulators for pcDuino1/2
  ARM: sun7i: dt: Add new Olimex A20 EVB device
  ARM: dts: sun6i: hummingbird: Add aliases for rtc devices
  ARM: dts: sun7i: Add dts file for Wits Pro A20 DKT
  ARM: dts: sun7i: Enable USB DRC on Wexler TAB7200
  ARM: dts: sun7i: Enable USB DRC on the Orange pi
  ARM: dts: sun7i: Enable USB DRC on orangepi-mini
  ARM: dts: axp209: Add usb_power_supply child node to the ax209 node
  ARM: dts: sun8i: Make ippo-q8h-v1.2.dts a symlink to q8-tablet.dts
  ARM: dts: sun8i: Add sun8i-a33-q8-tablet.dts file
  ARM: dts: sun6i: Add support for Yones Toptech bs1078v2 tablets
  ARM: dts: sun4i: Enable USB DRC on the Marsboard A10
  ARM: dts: sun4i: gemei-g9: Add accelerometer (bma250) IRQ
  ARM: dts: sun8i-a33: Add security system crypto engine clock and device nodes
  ARM: dts: sun8i: Add pwm-backlight device for A23/A33 Q8 format tablets
  ARM: sun8i: A23: Add missing msgbox gate
  ...
2015-10-14 17:48:10 +02:00
Arnd Bergmann
129c29c4bb Device Tree additions for NXP LPC18xx platform
- Reset controller (RGU)
  - DMA controller and mux
  - SPI Flash (SPIFI) controller
  - I2C controller
  - Watchdog and SCT PWM from Ariel D'Alessandro
 
 And board updates for EA4357 dev kit and Hitex LPC4350 eval board
 adding I2C, SPIFI Flash and some miscellaneous stuff.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
 iQEcBAABCAAGBQJWFtRIAAoJEF5zSH4+/j/arEwH/iZU1GrQNXW8eXJ9l8GwLHaX
 tiGDaliHTGlxX4Xa54zaVFiLApYFfu65nLQt6tTFRdgfREDqwkC8VlDXiptyBKeo
 VRjXeiIzXRFJVplZP+K/m9BTNPl7JCYQLquqKJMKQB4NF9VbTjhu1uKT/n4Xjghg
 EqYRUEO1yAd/CNrYtXtbtD3S2FGJSKN5Kk0uvRv4j1vDDIn8NPGvSEFwONw2/KFg
 wmfy033FoQgfB+LcpIH8nc/2Q92wLL44xKGtiE24DuJEsIUz/VSjGpBgJTEJwipx
 pBo5LBGc29LgiOqFy/O3GRkC95Jb2wp5+W88lL8O9oGEb0ViLX7GVXVloJI7F1I=
 =MLW8
 -----END PGP SIGNATURE-----

Merge tag 'lpc18xx_dts_for_4.4' of https://github.com/manabian/linux-lpc into next/dt

Pull "Device Tree additions for NXP LPC18xx platform" from Joachim Eastwood:
 - Reset controller (RGU)
 - DMA controller and mux
 - SPI Flash (SPIFI) controller
 - I2C controller
 - Watchdog and SCT PWM from Ariel D'Alessandro

And board updates for EA4357 dev kit and Hitex LPC4350 eval board
adding I2C, SPIFI Flash and some miscellaneous stuff.

* tag 'lpc18xx_dts_for_4.4' of https://github.com/manabian/linux-lpc:
  ARM: dts: lpc4350-hitex-eval: add joystick, buttons and leds
  ARM: dts: lpc4350-hitex-eval: add i2c0 and devices
  ARM: dts: lpc4350-hitex-eval: add spifi and flash device
  ARM: dts: lpc4357-ea4357: add i2c0 and devices
  ARM: dts: lpc4357-ea4357: add ssp0
  ARM: dts: lpc4357-ea4357: add spifi and flash device
  ARM: dts: lpc18xx: add resets entry to device nodes
  ARM: dts: lpc18xx: add sct pwm node
  ARM: dts: lpc18xx: add watchdog node
  ARM: dts: lpc18xx: add i2c nodes
  ARM: dts: lpc18xx: add dma to uart0/1/2/3
  ARM: dts: lpc18xx: add dma to ssp0/1
  ARM: dts: lpc18xx: add dmamux node
  ARM: dts: lpc18xx: add dmac node
  ARM: dts: lpc18xx: add spifi node
  ARM: dts: lpc18xx: add rgu node
2015-10-14 17:46:36 +02:00
Arnd Bergmann
c52864fbc2 Marvell Berlin ARM64 DT for 4.4 take 1
- add BG4CT GPIO nodes
 - add BG4CT STB reference board
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJWDZScAAoJEN2kpao7fSL49T8QAIHC1L432XXufw8+CmYblr7F
 8VtVXHwFCO1qSSXotaUr4H7R86ALCTJWZtEKAwLfu3qhvBc+iSQHww8AEW6WOP+s
 K+2VOnrYzKVEtwKs30y8ii0pMA0cm1qvUwuNQTwGsWpb72vleu1u6pPPWQ4qCGpA
 7bZdf0AWCg7+g3QSy3SF0PvzyzM3gi7FTUdHyofLwvP5DsT9/Nvgqu8eC2R5htoO
 SS19520IZfDGdhtZ+3klJim/kWJPz0ylN5ZSGQEa2EFgvKJjBVCCYjMY0DKi4F0m
 IzlTNJMLJ9xbtIl4J6O312JCa7SOx93kyDPGe9IibVSImQGv2TDqrEveofK5ixLL
 9KtwfHM7SOZAIdVvomW1PZnIe1qg61zzpzvBnxYKzBWXKBcPrCdhnqIgHC8Jxcb6
 msm89OoPgNNxM7giEUgu9yvGNg3DAuhqjjTv51T7GIv8s+ctFQ+/OCLfdxQXYtHk
 kCxoTg2IaF1xpwCt89kAcRONAOMlsPIqC34zaJNggZTl1nyXHFd9sFHfX3gUqtm1
 7uCbW1bGZ6Jn43UWHUqj2mVaotkyF6Z7Xj9TNN+znJSxENS/nxQMl00FxpYJ5dLj
 0+4W7rWMtnbqaapiiypEoNHs9LizGYClr30SAAQO4uLeuSwZQiDvPEyTYrEf9e1B
 iSG2mOCq/xygGR5NjQ30
 =Qytq
 -----END PGP SIGNATURE-----

Merge tag 'berlin64-dt-for-4.4-1' of git://git.infradead.org/users/hesselba/linux-berlin into next/dt

Merge "Marvell Berlin ARM64 DT for 4.4 take 1" from Sebastian Hesselbarth:
- add BG4CT GPIO nodes
- add BG4CT STB reference board

* tag 'berlin64-dt-for-4.4-1' of git://git.infradead.org/users/hesselba/linux-berlin:
  arm64: dts: add dts file for Marvell Berlin4CT STB board
  arm64: dts: berlin4ct: add GPIO nodes
2015-10-14 17:45:38 +02:00
Arnd Bergmann
f8e6333aba Marvell Berlin DT for 4.4 take 1
- use serial aliases and stdout path
 - add cpufreq properties to all SoCs
 - add pwm nodes for all SoCs
 
 This depends on topic branch berlin-cpuclk-for-4.4-1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJWEr3kAAoJEN2kpao7fSL4aiMP/RZtVig0BWx9ndsht/PNye40
 2AKvH33gnQZTEbS3LVprG19MUmKyOh8g5SEgxPkAtoIdGoEwDwdWgGRXzaFQVPbb
 QGZZ2tyoBnJMWhVWMst/dQx1hpQ7wyI2yanLDLH8wbJ8v7ctC7oAQLlenuntkjjQ
 jakxbaDRwB5cJUS3RWNi+0E35sCXetdmWHRergp1LL77dWGxDgBjEr/9zoSZ6ChH
 vqPX685Cb1pTuADX3Ihm+euRDH2xjF9bMj1qVLjpFVSqq0yNF7bThAuzatQtOC5q
 M7neEcO0p3KVA5YvJBr8qBJgsrVC0KkuRfkcdppw7sJEpObOqi+fw24mXNEys/ze
 rpudmXp9U3oazGrvN6LGK7HHeYRRVMtkgVUjXEhrav/Gn+N6/zg2DZUYZ5zSSUvJ
 guv4BmdO2tbIXZw282gcWLGDxZG/R33QEMBe6GPh5UtjMs9ICpJKaEyGXrNUbnch
 fhg0ZF4Rsh2vI9zc35nCHNm/TBnRjemJ5lVABPq1HtFxclnZRHALz3h8Z5u45lPL
 4PCihtRZugvwrAfDVUJ4Mu9jm2Sc5tIL4xhKJySwJp3GYMO4Mw9aR2LxKUYZYw04
 gojxR+yeghMK5OVA3bBkRtOtzjeQxaOC64hEFwAWyxULoLukMFThuZymy2XUIOmd
 q2sZmkgF+hvHCDzTqyaH
 =3SFe
 -----END PGP SIGNATURE-----

Merge tag 'berlin-dt-for-4.4-1' of git://git.infradead.org/users/hesselba/linux-berlin into next/dt

Merge "Marvell Berlin DT for 4.4 take 1" from Sebastian Hesselbarth:
- use serial aliases and stdout path
- add cpufreq properties to all SoCs
- add pwm nodes for all SoCs

This depends on topic branch berlin-cpuclk-for-4.4-1

* tag 'berlin-dt-for-4.4-1' of git://git.infradead.org/users/hesselba/linux-berlin:
  ARM: berlin: add a PWM node on the BG2CD
  ARM: berlin: add a PWM node on the BG2
  ARM: berlin: add a PWM node on the BG2Q
  ARM: berlin: dts: add the cpufreq-dt bindings on the BG2CD
  ARM: berlin: dts: add the cpufreq-dt bindings on the BG2
  ARM: berlin: dts: add the cpufreq-dt bindings on the BG2Q
  arm: dts: berlin: use stdout-path
  arm: dts: berlin: add aliases for serial
2015-10-14 17:42:14 +02:00