Enable sound SoC on aarch64, Update some ARM patches to latest upstream, small cleanups

1 files changed, 18 insertions, 36 deletions

diff --git a/bcm2837-initial-support.patch b/bcm2837-initial-support.patch
index d18446d2c..0fdd11b96 100644
--- a/bcm2837-initial-support.patch
+++ b/bcm2837-initial-support.patch
@@ -1,19 +1,19 @@
-From patchwork Wed Feb  8 22:40:24 2017
+From patchwork Tue Apr 25 16:45:08 2017
 Content-Type: text/plain; charset="utf-8"
 MIME-Version: 1.0
 Content-Transfer-Encoding: 7bit
-Subject: ARM: dts: Add devicetree for the Raspberry Pi 3, for arm32 (v3)
+Subject: ARM: dts: Add devicetree for the Raspberry Pi 3, for arm32 (v6)
 From: Eric Anholt <eric@anholt.net>
-X-Patchwork-Id: 9563699
-Message-Id: <20170208224024.30415-1-eric@anholt.net>
-To: Florian Fainelli <f.fainelli@gmail.com>, Rob Herring <robh+dt@kernel.org>, 
+X-Patchwork-Id: 9698781
+Message-Id: <20170425164508.32242-1-eric@anholt.net>
+To: Lee Jones <lee@kernel.org>, Florian Fainelli <f.fainelli@gmail.com>,
+ Olof Johansson <olof@lixom.net>, Rob Herring <robh+dt@kernel.org>,
  Mark Rutland <mark.rutland@arm.com>, devicetree@vger.kernel.org
-Cc: Stephen Warren <swarren@wwwdotorg.org>, Lee Jones <lee@kernel.org>,
- linux-kernel@vger.kernel.org, Eric Anholt <eric@anholt.net>,
- bcm-kernel-feedback-list@broadcom.com,
- linux-rpi-kernel@lists.infradead.org, 
- linux-arm-kernel@lists.infradead.org, Gerd Hoffmann <kraxel@redhat.com>
-Date: Wed,  8 Feb 2017 14:40:24 -0800
+Cc: Stefan Wahren <stefan.wahren@i2se.com>, linux-kernel@vger.kernel.org,
+ Eric Anholt <eric@anholt.net>, bcm-kernel-feedback-list@broadcom.com, 
+ Gerd Hoffmann <kraxel@redhat.com>, linux-arm-kernel@lists.infradead.org, 
+ linux-rpi-kernel@lists.infradead.org
+Date: Tue, 25 Apr 2017 09:45:08 -0700
 
 Raspbian and Fedora have decided to support the Pi3 in 32-bit mode for
 now, so it's useful to be able to test that mode on an upstream
@@ -22,25 +22,16 @@ and 64-bit development.
 
 Signed-off-by: Eric Anholt <eric@anholt.net>
 ---
-
-v1: Gerd's patch that put the ../../../arm64/... link in the Makefile
-v2: Michael's patch that #included from ../../../arm64/... in a new
-    bcm2837-rpi-3-b.dts.
-v3: Mine, using symlinks to make sure that we don't break the split DT
-    tree.
-
  arch/arm/boot/dts/Makefile            | 1 +
  arch/arm/boot/dts/bcm2837-rpi-3-b.dts | 1 +
- arch/arm/boot/dts/bcm2837.dtsi        | 1 +
- 3 files changed, 3 insertions(+)
- create mode 120000 arch/arm/boot/dts/bcm2837-rpi-3-b.dts
- create mode 120000 arch/arm/boot/dts/bcm2837.dtsi
+ 2 files changed, 2 insertions(+)
+ create mode 100644 arch/arm/boot/dts/bcm2837-rpi-3-b.dts
 
 diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
-index 6576e3f000c9..416fdcedf5a1 100644
+index 011808490fed..eded842d9978 100644
 --- a/arch/arm/boot/dts/Makefile
 +++ b/arch/arm/boot/dts/Makefile
-@@ -70,6 +70,7 @@ dtb-$(CONFIG_ARCH_BCM2835) += \
+@@ -72,6 +72,7 @@ dtb-$(CONFIG_ARCH_BCM2835) += \
  	bcm2835-rpi-b-plus.dtb \
  	bcm2835-rpi-a-plus.dtb \
  	bcm2836-rpi-2-b.dtb \
@@ -49,18 +40,9 @@ index 6576e3f000c9..416fdcedf5a1 100644
  dtb-$(CONFIG_ARCH_BCM_5301X) += \
  	bcm4708-asus-rt-ac56u.dtb \
 diff --git a/arch/arm/boot/dts/bcm2837-rpi-3-b.dts b/arch/arm/boot/dts/bcm2837-rpi-3-b.dts
-new file mode 120000
-index 000000000000..ceebc0e163fb
+new file mode 100644
+index 000000000000..c72a27d908b6
 --- /dev/null
 +++ b/arch/arm/boot/dts/bcm2837-rpi-3-b.dts
 @@ -0,0 +1 @@
-+../../../arm64/boot/dts/broadcom/bcm2837-rpi-3-b.dts
-\ No newline at end of file
-diff --git a/arch/arm/boot/dts/bcm2837.dtsi b/arch/arm/boot/dts/bcm2837.dtsi
-new file mode 120000
-index 000000000000..53f1cd2bba47
---- /dev/null
-+++ b/arch/arm/boot/dts/bcm2837.dtsi
-@@ -0,0 +1 @@
-+../../../arm64/boot/dts/broadcom/bcm2837.dtsi
-\ No newline at end of file
++#include "arm64/broadcom/bcm2837-rpi-3-b.dts"