From: David S. Miller Date: Thu, 7 Jan 2016 21:26:36 +0000 (-0500) Subject: Merge branch 'macb-usrio-cap' X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=24759daa018f0fc8cccebc89d3dee0953e73785a;p=linux-beck.git 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 --- 24759daa018f0fc8cccebc89d3dee0953e73785a