| From bf40c5d96c111060c7318c90ab481c8f3044c519 Mon Sep 17 00:00:00 2001 |
| From: =?UTF-8?q?Andreas=20F=C3=A4rber?= <afaerber@suse.de> |
| Date: Mon, 24 Oct 2016 17:09:50 +0200 |
| Subject: [PATCH] ARM64: dts: bcm2835: Fix bcm2837 compatible string |
| MIME-Version: 1.0 |
| Content-Type: text/plain; charset=UTF-8 |
| Content-Transfer-Encoding: 8bit |
| |
| commit 4f24450c6e580ac8591942c8bf65355a06b44635 upstream. |
| |
| bcm2837-rpi-3-b.dts, its only in-tree user, was overriding it as |
| "brcm,bcm2837" already. |
| |
| Fixes: 9d56c22a7861 ("ARM: bcm2835: Add devicetree for the Raspberry Pi 3.") |
| Cc: Stephen Warren <swarren@wwwdotorg.org> |
| Signed-off-by: Andreas Fรคrber <afaerber@suse.de> |
| Signed-off-by: Eric Anholt <eric@anholt.net> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/arch/arm64/boot/dts/broadcom/bcm2837.dtsi b/arch/arm64/boot/dts/broadcom/bcm2837.dtsi |
| index 8216bbb29fe0..c1f719b7097a 100644 |
| --- a/arch/arm64/boot/dts/broadcom/bcm2837.dtsi |
| +++ b/arch/arm64/boot/dts/broadcom/bcm2837.dtsi |
| @@ -1,7 +1,7 @@ |
| #include "bcm283x.dtsi" |
| |
| / { |
| - compatible = "brcm,bcm2836"; |
| + compatible = "brcm,bcm2837"; |
| |
| soc { |
| ranges = <0x7e000000 0x3f000000 0x1000000>, |
| -- |
| 2.10.1 |
| |