4e4985663023913598f453c347842bd7518f7915
[openwrt/staging/linusw.git] /
1 From 9731e002f651c0b386137105c8d91d198b73b721 Mon Sep 17 00:00:00 2001
2 From: Michael Zoran <mzoran@crowfest.net>
3 Date: Wed, 24 Aug 2016 03:35:56 -0700
4 Subject: [PATCH] Add arm64 configuration and device tree differences.
5 Disable MMC_BCM2835_SDHOST and MMC_BCM2835 since these drivers are crashing
6 at the moment.
7
8 ARM64: Modify default config to get raspbian to boot (#1686)
9
10 1. Enable emulation of deprecated instructions.
11 2. Enable ARM 8.1 and 8.2 features which are not detected at runtime.
12 3. Switch the default governer to powersave.
13 4. Include the watchdog timer driver in the kernel image rather then a module.
14
15 Tested with raspbian-jessie 2016-09-23.
16
17 ARM64: Make it work again on 4.9 (#1790)
18
19 * Invoke the dtc compiler with the same options used in arm mode.
20 * ARM64 now uses the bcm2835 platform just like ARM32.
21 * ARM64: Update bcmrpi3_defconfig
22
23 Signed-off-by: Michael Zoran <mzoran@crowfest.net>
24
25 Update arm64 Makefile to compile bcm2710 dtb file
26
27 The line 'dtb-$(CONFIG_ARCH_BCM2835) += bcm2710-rpi-3-b.dtb' has been copied from previous rpi-4.14.y version into rpi-4.15.y arch/arm64/boot/dts/broadcom/Makefile to restore compilation of bcm2710-rpi-3-b.dtb device tree blob under 'make ARCH=arm64 dtbs' command.
28
29 arm64: enable thermal / enable mmc (#2425)
30
31 This commit adds support for RP3-B-Plus in in arch arm64 (#2464)
32
33 Enable AES, AES bit slice, and AES NEON engines on arm64
34
35 Enable bbr module for arm64
36 ---
37 arch/arm64/Kconfig.platforms | 6 -
38 arch/arm64/boot/dts/Makefile | 2 +
39 arch/arm64/boot/dts/broadcom/Makefile | 3 +
40 .../dts/broadcom/bcm2710-rpi-3-b-plus.dts | 3 +
41 .../boot/dts/broadcom/bcm2710-rpi-3-b.dts | 3 +
42 .../dts/broadcom/bcm283x-rpi-lan7515.dtsi | 1 +
43 arch/arm64/boot/dts/overlays | 1 +
44 8 files changed, 1302 insertions(+), 6 deletions(-)
45 create mode 100644 arch/arm64/boot/dts/broadcom/bcm2710-rpi-3-b-plus.dts
46 create mode 100644 arch/arm64/boot/dts/broadcom/bcm2710-rpi-3-b.dts
47 create mode 120000 arch/arm64/boot/dts/broadcom/bcm283x-rpi-lan7515.dtsi
48 create mode 120000 arch/arm64/boot/dts/overlays
49
50 diff --git a/arch/arm64/Kconfig.platforms b/arch/arm64/Kconfig.platforms
51 index 393d2b524284..e9bdec0ead72 100644
52 --- a/arch/arm64/Kconfig.platforms
53 +++ b/arch/arm64/Kconfig.platforms
54 @@ -1,11 +1,5 @@
55 menu "Platform selection"
56
57 -config ARCH_ACTIONS
58 - bool "Actions Semi Platforms"
59 - select OWL_TIMER
60 - help
61 - This enables support for the Actions Semiconductor S900 SoC family.
62 -
63 config ARCH_SUNXI
64 bool "Allwinner sunxi 64-bit SoC Family"
65 select ARCH_HAS_RESET_CONTROLLER
66 diff --git a/arch/arm64/boot/dts/Makefile b/arch/arm64/boot/dts/Makefile
67 index 4690364d584b..cd9c79566ebe 100644
68 --- a/arch/arm64/boot/dts/Makefile
69 +++ b/arch/arm64/boot/dts/Makefile
70 @@ -26,3 +26,5 @@ subdir-y += synaptics
71 subdir-y += ti
72 subdir-y += xilinx
73 subdir-y += zte
74 +
75 +subdir-y += overlays
76 diff --git a/arch/arm64/boot/dts/broadcom/Makefile b/arch/arm64/boot/dts/broadcom/Makefile
77 index 1193a9e34bbb..78d23305bc31 100644
78 --- a/arch/arm64/boot/dts/broadcom/Makefile
79 +++ b/arch/arm64/boot/dts/broadcom/Makefile
80 @@ -1,6 +1,9 @@
81 # SPDX-License-Identifier: GPL-2.0
82 dtb-$(CONFIG_ARCH_BCM2835) += bcm2837-rpi-3-b.dtb \
83 bcm2837-rpi-3-b-plus.dtb
84 +dtb-$(CONFIG_ARCH_BCM2709) += bcm2710-rpi-3-b.dtb
85 +dtb-$(CONFIG_ARCH_BCM2835) += bcm2710-rpi-3-b.dtb
86 +dtb-$(CONFIG_ARCH_BCM2835) += bcm2710-rpi-3-b-plus.dtb
87
88 subdir-y += northstar2
89 subdir-y += stingray
90 diff --git a/arch/arm64/boot/dts/broadcom/bcm2710-rpi-3-b-plus.dts b/arch/arm64/boot/dts/broadcom/bcm2710-rpi-3-b-plus.dts
91 new file mode 100644
92 index 000000000000..d9242ff77079
93 --- /dev/null
94 +++ b/arch/arm64/boot/dts/broadcom/bcm2710-rpi-3-b-plus.dts
95 @@ -0,0 +1,3 @@
96 +#define RPI364
97 +
98 +#include "../../../../arm/boot/dts/bcm2710-rpi-3-b-plus.dts"
99 diff --git a/arch/arm64/boot/dts/broadcom/bcm2710-rpi-3-b.dts b/arch/arm64/boot/dts/broadcom/bcm2710-rpi-3-b.dts
100 new file mode 100644
101 index 000000000000..deb33441da95
102 --- /dev/null
103 +++ b/arch/arm64/boot/dts/broadcom/bcm2710-rpi-3-b.dts
104 @@ -0,0 +1,3 @@
105 +#define RPI364
106 +
107 +#include "../../../../arm/boot/dts/bcm2710-rpi-3-b.dts"
108 diff --git a/arch/arm64/boot/dts/broadcom/bcm283x-rpi-lan7515.dtsi b/arch/arm64/boot/dts/broadcom/bcm283x-rpi-lan7515.dtsi
109 new file mode 120000
110 index 000000000000..fc4c05bbe7fd
111 --- /dev/null
112 +++ b/arch/arm64/boot/dts/broadcom/bcm283x-rpi-lan7515.dtsi
113 @@ -0,0 +1 @@
114 +../../../../arm/boot/dts/bcm283x-rpi-lan7515.dtsi
115 \ No newline at end of file
116 diff --git a/arch/arm64/boot/dts/overlays b/arch/arm64/boot/dts/overlays
117 new file mode 120000
118 index 000000000000..ded08646b6f6
119 --- /dev/null
120 +++ b/arch/arm64/boot/dts/overlays
121 @@ -0,0 +1 @@
122 +../../../arm/boot/dts/overlays
123 \ No newline at end of file
124 --
125 2.20.1