| commit | 24759daa018f0fc8cccebc89d3dee0953e73785a | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Thu Jan 07 16:26:36 2016 -0500 |
| committer | David S. Miller <davem@davemloft.net> | Thu Jan 07 16:26:36 2016 -0500 |
| tree | 5d162228c456e55bdc7c9837068175c133c24569 | |
| parent | 123581775336e91538e45cc00606692e1c410a66 [diff] | |
| parent | c505a3820f6138d6a96fe729a599e3bd062fa6e6 [diff] |
Merge branch 'macb-usrio-cap' Neil Armstrong says: ==================== Add new capability and macb DT variant The first patch introduces a new capability bit to disable usage of the USRIO register on platform not implementing it thus avoiding some external imprecise aborts on ARM based platforms. The two last patchs adds a new macb variant compatible name using the capability, the NP4 SoC uses this particular hardware configuration. v1: http://lkml.kernel.org/r/1449485914-12883-1-git-send-email-narmstrong@baylibre.com v2: http://lkml.kernel.org/r/1449582726-6148-1-git-send-email-narmstrong@baylibre.com v3: http://lkml.kernel.org/r/1451898103-21868-1-git-send-email-narmstrong@baylibre.com v4: http://lkml.kernel.org/r/1451900573-22657-1-git-send-email-narmstrong@baylibre.com v5: switch SoC name to non-generic NP4 name ==================== Signed-off-by: David S. Miller <davem@davemloft.net>