Skip to content

Commit 9fce336

Browse files
popcornmixpopcornmix
authored
Merge pull request #1717 from notro/bcm270x-rip-1
Drop ARCH_BCM2708 and ARCH_BCM2709
2 parents 875e8ce + 657f3ed commit 9fce336

16 files changed

+110
-185
lines changed

‎arch/arm/boot/dts/Makefile

Lines changed: 8 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,14 @@
11
ifeq ($(CONFIG_OF),y)
22

3-
dtb-$(CONFIG_ARCH_BCM2708) += bcm2708-rpi-b.dtb
4-
dtb-$(CONFIG_ARCH_BCM2708) += bcm2708-rpi-b-plus.dtb
5-
dtb-$(CONFIG_ARCH_BCM2708) += bcm2708-rpi-cm.dtb
6-
dtb-$(CONFIG_ARCH_BCM2709) += bcm2709-rpi-2-b.dtb
7-
dtb-$(CONFIG_ARCH_BCM2709) += bcm2710-rpi-3-b.dtb
8-
dtb-$(CONFIG_ARCH_BCM2709) += bcm2710-rpi-cm3.dtb
3+
dtb-$(CONFIG_ARCH_BCM2835) += \
4+
bcm2708-rpi-b.dtb \
5+
bcm2708-rpi-b-plus.dtb \
6+
bcm2708-rpi-cm.dtb \
7+
bcm2709-rpi-2-b.dtb \
8+
bcm2710-rpi-3-b.dtb \
9+
bcm2710-rpi-cm3.dtb
910

10-
# Raspberry Pi
11-
ifeq ($(CONFIG_ARCH_BCM2708),y)
12-
RPI_DT_OVERLAYS=y
13-
endif
14-
ifeq ($(CONFIG_ARCH_BCM2709),y)
15-
RPI_DT_OVERLAYS=y
16-
endif
1711
ifeq ($(CONFIG_ARCH_BCM2835),y)
18-
RPI_DT_OVERLAYS=y
19-
endif
20-
ifeq ($(RPI_DT_OVERLAYS),y)
2112
dts-dirs += overlays
2213
endif
2314

@@ -954,6 +945,6 @@ subdir-y := $(dts-dirs)
954945
clean-files := *.dtb
955946

956947
# Enable fixups to support overlays on BCM2708 platforms
957-
ifeq ($(RPI_DT_OVERLAYS),y)
948+
ifeq ($(CONFIG_ARCH_BCM2835),y)
958949
DTC_FLAGS ?= -@ -H epapr
959950
endif

‎arch/arm/boot/dts/bcm2708-rpi-b-plus.dts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
#include "bcm2708.dtsi"
44

55
/ {
6-
compatible = "brcm,bcm2708";
76
model = "Raspberry Pi Model B+";
87
};
98

‎arch/arm/boot/dts/bcm2708-rpi-b.dts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
#include "bcm2708.dtsi"
44

55
/ {
6-
compatible = "brcm,bcm2708";
76
model = "Raspberry Pi Model B";
87
};
98

‎arch/arm/boot/dts/bcm2708.dtsi

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,6 @@
33
#include "bcm2708-rpi.dtsi"
44

55
/ {
6-
compatible = "brcm,bcm2708";
7-
model = "BCM2708";
8-
96
soc {
107
timer@7e003000 {
118
compatible = "brcm,bcm2835-system-timer";

‎arch/arm/boot/dts/bcm2709-rpi-2-b.dts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
#include "bcm2709.dtsi"
44

55
/ {
6-
compatible = "brcm,bcm2709";
76
model = "Raspberry Pi 2 Model B";
87
};
98

‎arch/arm/boot/dts/bcm2709.dtsi

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,6 @@
33
#include "bcm2708-rpi.dtsi"
44

55
/ {
6-
compatible = "brcm,bcm2709";
7-
model = "BCM2709";
8-
96
soc {
107
ranges = <0x7e000000 0x3f000000 0x01000000>,
118
<0x40000000 0x40000000 0x00040000>;

‎arch/arm/boot/dts/bcm2710-rpi-3-b.dts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
#include "bcm2710.dtsi"
88

99
/ {
10-
compatible = "brcm,bcm2710","brcm,bcm2709";
1110
model = "Raspberry Pi 3 Model B";
1211
};
1312

‎arch/arm/boot/dts/bcm2710-rpi-cm3.dts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
#include "bcm2710.dtsi"
44

55
/ {
6-
compatible = "brcm,bcm2710","brcm,bcm2709";
76
model = "Raspberry Pi Compute Module 3";
87
};
98

‎arch/arm/boot/dts/bcm2710.dtsi

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
#include "bcm2708-rpi.dtsi"
44

55
/ {
6-
compatible = "brcm,bcm2710","brcm,bcm2709";
7-
model = "BCM2710";
6+
compatible = "brcm,bcm2837", "brcm,bcm2836";
7+
model = "BCM2837";
88

99
soc {
1010
ranges = <0x7e000000 0x3f000000 0x01000000>,

‎arch/arm/boot/dts/overlays/Makefile

Lines changed: 93 additions & 106 deletions
Original file line numberDiff line numberDiff line change
@@ -1,114 +1,101 @@
1-
ifeq ($(CONFIG_OF),y)
2-
31
# Overlays for the Raspberry Pi platform
42

5-
ifeq ($(CONFIG_ARCH_BCM2708),y)
6-
RPI_DT_OVERLAYS=y
7-
endif
8-
ifeq ($(CONFIG_ARCH_BCM2709),y)
9-
RPI_DT_OVERLAYS=y
10-
endif
11-
ifeq ($(CONFIG_ARCH_BCM2835),y)
12-
RPI_DT_OVERLAYS=y
13-
endif
14-
15-
dtbo-$(RPI_DT_OVERLAYS) += adau1977-adc.dtbo
16-
dtbo-$(RPI_DT_OVERLAYS) += ads1015.dtbo
17-
dtbo-$(RPI_DT_OVERLAYS) += ads7846.dtbo
18-
dtbo-$(RPI_DT_OVERLAYS) += akkordion-iqdacplus.dtbo
19-
dtbo-$(RPI_DT_OVERLAYS) += allo-piano-dac-pcm512x-audio.dtbo
20-
dtbo-$(RPI_DT_OVERLAYS) += at86rf233.dtbo
21-
dtbo-$(RPI_DT_OVERLAYS) += audioinjector-wm8731-audio.dtbo
22-
dtbo-$(RPI_DT_OVERLAYS) += audremap.dtbo
23-
dtbo-$(RPI_DT_OVERLAYS) += bmp085_i2c-sensor.dtbo
24-
dtbo-$(RPI_DT_OVERLAYS) += dht11.dtbo
25-
dtbo-$(RPI_DT_OVERLAYS) += dionaudio-loco.dtbo
26-
dtbo-$(RPI_DT_OVERLAYS) += dpi18.dtbo
27-
dtbo-$(RPI_DT_OVERLAYS) += dpi24.dtbo
28-
dtbo-$(RPI_DT_OVERLAYS) += dwc-otg.dtbo
29-
dtbo-$(RPI_DT_OVERLAYS) += dwc2.dtbo
30-
dtbo-$(RPI_DT_OVERLAYS) += enc28j60.dtbo
31-
dtbo-$(RPI_DT_OVERLAYS) += gpio-ir.dtbo
32-
dtbo-$(RPI_DT_OVERLAYS) += gpio-poweroff.dtbo
33-
dtbo-$(RPI_DT_OVERLAYS) += hifiberry-amp.dtbo
34-
dtbo-$(RPI_DT_OVERLAYS) += hifiberry-dac.dtbo
35-
dtbo-$(RPI_DT_OVERLAYS) += hifiberry-dacplus.dtbo
36-
dtbo-$(RPI_DT_OVERLAYS) += hifiberry-digi.dtbo
37-
dtbo-$(RPI_DT_OVERLAYS) += hifiberry-digi-pro.dtbo
38-
dtbo-$(RPI_DT_OVERLAYS) += hy28a.dtbo
39-
dtbo-$(RPI_DT_OVERLAYS) += hy28b.dtbo
40-
dtbo-$(RPI_DT_OVERLAYS) += i2c-bcm2708.dtbo
41-
dtbo-$(RPI_DT_OVERLAYS) += i2c-gpio.dtbo
42-
dtbo-$(RPI_DT_OVERLAYS) += i2c-mux.dtbo
43-
dtbo-$(RPI_DT_OVERLAYS) += i2c-pwm-pca9685a.dtbo
44-
dtbo-$(RPI_DT_OVERLAYS) += i2c-rtc.dtbo
45-
dtbo-$(RPI_DT_OVERLAYS) += i2c0-bcm2708.dtbo
46-
dtbo-$(RPI_DT_OVERLAYS) += i2c1-bcm2708.dtbo
47-
dtbo-$(RPI_DT_OVERLAYS) += i2s-gpio28-31.dtbo
48-
dtbo-$(RPI_DT_OVERLAYS) += iqaudio-dac.dtbo
49-
dtbo-$(RPI_DT_OVERLAYS) += iqaudio-dacplus.dtbo
50-
dtbo-$(RPI_DT_OVERLAYS) += iqaudio-digi-wm8804-audio.dtbo
51-
dtbo-$(RPI_DT_OVERLAYS) += justboom-dac.dtbo
52-
dtbo-$(RPI_DT_OVERLAYS) += justboom-digi.dtbo
53-
dtbo-$(RPI_DT_OVERLAYS) += lirc-rpi.dtbo
54-
dtbo-$(RPI_DT_OVERLAYS) += mcp23017.dtbo
55-
dtbo-$(RPI_DT_OVERLAYS) += mcp23s17.dtbo
56-
dtbo-$(RPI_DT_OVERLAYS) += mcp2515-can0.dtbo
57-
dtbo-$(RPI_DT_OVERLAYS) += mcp2515-can1.dtbo
58-
dtbo-$(RPI_DT_OVERLAYS) += mmc.dtbo
59-
dtbo-$(RPI_DT_OVERLAYS) += mz61581.dtbo
60-
dtbo-$(RPI_DT_OVERLAYS) += pi3-act-led.dtbo
61-
dtbo-$(RPI_DT_OVERLAYS) += pi3-disable-bt.dtbo
62-
dtbo-$(RPI_DT_OVERLAYS) += pi3-miniuart-bt.dtbo
63-
dtbo-$(RPI_DT_OVERLAYS) += piscreen.dtbo
64-
dtbo-$(RPI_DT_OVERLAYS) += piscreen2r.dtbo
65-
dtbo-$(RPI_DT_OVERLAYS) += pisound.dtbo
66-
dtbo-$(RPI_DT_OVERLAYS) += pitft22.dtbo
67-
dtbo-$(RPI_DT_OVERLAYS) += pitft28-capacitive.dtbo
68-
dtbo-$(RPI_DT_OVERLAYS) += pitft28-resistive.dtbo
69-
dtbo-$(RPI_DT_OVERLAYS) += pitft35-resistive.dtbo
70-
dtbo-$(RPI_DT_OVERLAYS) += pps-gpio.dtbo
71-
dtbo-$(RPI_DT_OVERLAYS) += pwm.dtbo
72-
dtbo-$(RPI_DT_OVERLAYS) += pwm-2chan.dtbo
73-
dtbo-$(RPI_DT_OVERLAYS) += qca7000.dtbo
74-
dtbo-$(RPI_DT_OVERLAYS) += raspidac3.dtbo
75-
dtbo-$(RPI_DT_OVERLAYS) += rpi-backlight.dtbo
76-
dtbo-$(RPI_DT_OVERLAYS) += rpi-dac.dtbo
77-
dtbo-$(RPI_DT_OVERLAYS) += rpi-display.dtbo
78-
dtbo-$(RPI_DT_OVERLAYS) += rpi-ft5406.dtbo
79-
dtbo-$(RPI_DT_OVERLAYS) += rpi-proto.dtbo
80-
dtbo-$(RPI_DT_OVERLAYS) += rpi-sense.dtbo
81-
dtbo-$(RPI_DT_OVERLAYS) += rra-digidac1-wm8741-audio.dtbo
82-
dtbo-$(RPI_DT_OVERLAYS) += sc16is750-i2c.dtbo
83-
dtbo-$(RPI_DT_OVERLAYS) += sc16is752-spi1.dtbo
84-
dtbo-$(RPI_DT_OVERLAYS) += sdhost.dtbo
85-
dtbo-$(RPI_DT_OVERLAYS) += sdio.dtbo
86-
dtbo-$(RPI_DT_OVERLAYS) += sdio-1bit.dtbo
87-
dtbo-$(RPI_DT_OVERLAYS) += sdtweak.dtbo
88-
dtbo-$(RPI_DT_OVERLAYS) += smi.dtbo
89-
dtbo-$(RPI_DT_OVERLAYS) += smi-dev.dtbo
90-
dtbo-$(RPI_DT_OVERLAYS) += smi-nand.dtbo
91-
dtbo-$(RPI_DT_OVERLAYS) += spi-gpio35-39.dtbo
92-
dtbo-$(RPI_DT_OVERLAYS) += spi-rtc.dtbo
93-
dtbo-$(RPI_DT_OVERLAYS) += spi0-hw-cs.dtbo
94-
dtbo-$(RPI_DT_OVERLAYS) += spi1-1cs.dtbo
95-
dtbo-$(RPI_DT_OVERLAYS) += spi1-2cs.dtbo
96-
dtbo-$(RPI_DT_OVERLAYS) += spi1-3cs.dtbo
97-
dtbo-$(RPI_DT_OVERLAYS) += spi2-1cs.dtbo
98-
dtbo-$(RPI_DT_OVERLAYS) += spi2-2cs.dtbo
99-
dtbo-$(RPI_DT_OVERLAYS) += spi2-3cs.dtbo
100-
dtbo-$(RPI_DT_OVERLAYS) += tinylcd35.dtbo
101-
dtbo-$(RPI_DT_OVERLAYS) += uart1.dtbo
102-
dtbo-$(RPI_DT_OVERLAYS) += vc4-kms-v3d.dtbo
103-
dtbo-$(RPI_DT_OVERLAYS) += vga666.dtbo
104-
dtbo-$(RPI_DT_OVERLAYS) += w1-gpio.dtbo
105-
dtbo-$(RPI_DT_OVERLAYS) += w1-gpio-pullup.dtbo
106-
dtbo-$(RPI_DT_OVERLAYS) += wittypi.dtbo
3+
dtbo-$(CONFIG_ARCH_BCM2835) += \
4+
adau1977-adc.dtbo \
5+
ads1015.dtbo \
6+
ads7846.dtbo \
7+
akkordion-iqdacplus.dtbo \
8+
allo-piano-dac-pcm512x-audio.dtbo \
9+
at86rf233.dtbo \
10+
audioinjector-wm8731-audio.dtbo \
11+
audremap.dtbo \
12+
bmp085_i2c-sensor.dtbo \
13+
dht11.dtbo \
14+
dionaudio-loco.dtbo \
15+
dpi18.dtbo \
16+
dpi24.dtbo \
17+
dwc-otg.dtbo \
18+
dwc2.dtbo \
19+
enc28j60.dtbo \
20+
gpio-ir.dtbo \
21+
gpio-poweroff.dtbo \
22+
hifiberry-amp.dtbo \
23+
hifiberry-dac.dtbo \
24+
hifiberry-dacplus.dtbo \
25+
hifiberry-digi.dtbo \
26+
hifiberry-digi-pro.dtbo \
27+
hy28a.dtbo \
28+
hy28b.dtbo \
29+
i2c-bcm2708.dtbo \
30+
i2c-gpio.dtbo \
31+
i2c-mux.dtbo \
32+
i2c-pwm-pca9685a.dtbo \
33+
i2c-rtc.dtbo \
34+
i2c0-bcm2708.dtbo \
35+
i2c1-bcm2708.dtbo \
36+
i2s-gpio28-31.dtbo \
37+
iqaudio-dac.dtbo \
38+
iqaudio-dacplus.dtbo \
39+
iqaudio-digi-wm8804-audio.dtbo \
40+
justboom-dac.dtbo \
41+
justboom-digi.dtbo \
42+
lirc-rpi.dtbo \
43+
mcp23017.dtbo \
44+
mcp23s17.dtbo \
45+
mcp2515-can0.dtbo \
46+
mcp2515-can1.dtbo \
47+
mmc.dtbo \
48+
mz61581.dtbo \
49+
pi3-act-led.dtbo \
50+
pi3-disable-bt.dtbo \
51+
pi3-miniuart-bt.dtbo \
52+
piscreen.dtbo \
53+
piscreen2r.dtbo \
54+
pisound.dtbo \
55+
pitft22.dtbo \
56+
pitft28-capacitive.dtbo \
57+
pitft28-resistive.dtbo \
58+
pitft35-resistive.dtbo \
59+
pps-gpio.dtbo \
60+
pwm.dtbo \
61+
pwm-2chan.dtbo \
62+
qca7000.dtbo \
63+
raspidac3.dtbo \
64+
rpi-backlight.dtbo \
65+
rpi-dac.dtbo \
66+
rpi-display.dtbo \
67+
rpi-ft5406.dtbo \
68+
rpi-proto.dtbo \
69+
rpi-sense.dtbo \
70+
rra-digidac1-wm8741-audio.dtbo \
71+
sc16is750-i2c.dtbo \
72+
sc16is752-spi1.dtbo \
73+
sdhost.dtbo \
74+
sdio.dtbo \
75+
sdio-1bit.dtbo \
76+
sdtweak.dtbo \
77+
smi.dtbo \
78+
smi-dev.dtbo \
79+
smi-nand.dtbo \
80+
spi-gpio35-39.dtbo \
81+
spi-rtc.dtbo \
82+
spi0-hw-cs.dtbo \
83+
spi1-1cs.dtbo \
84+
spi1-2cs.dtbo \
85+
spi1-3cs.dtbo \
86+
spi2-1cs.dtbo \
87+
spi2-2cs.dtbo \
88+
spi2-3cs.dtbo \
89+
tinylcd35.dtbo \
90+
uart1.dtbo \
91+
vc4-kms-v3d.dtbo \
92+
vga666.dtbo \
93+
w1-gpio.dtbo \
94+
w1-gpio-pullup.dtbo \
95+
wittypi.dtbo
10796

10897
targets += dtbs dtbs_install
10998
targets += $(dtbo-y)
11099

111-
endif
112-
113100
always := $(dtbo-y)
114101
clean-files := *.dtbo

‎arch/arm/configs/bcm2709_defconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ CONFIG_PARTITION_ADVANCED=y
4242
CONFIG_MAC_PARTITION=y
4343
CONFIG_CFQ_GROUP_IOSCHED=y
4444
CONFIG_ARCH_BCM=y
45-
CONFIG_ARCH_BCM2709=y
45+
CONFIG_ARCH_BCM2835=y
4646
# CONFIG_CACHE_L2X0 is not set
4747
CONFIG_SMP=y
4848
CONFIG_VMSPLIT_2G=y

‎arch/arm/configs/bcmrpi_defconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ CONFIG_CFQ_GROUP_IOSCHED=y
4242
CONFIG_ARCH_MULTI_V6=y
4343
# CONFIG_ARCH_MULTI_V7 is not set
4444
CONFIG_ARCH_BCM=y
45-
CONFIG_ARCH_BCM2708=y
45+
CONFIG_ARCH_BCM2835=y
4646
# CONFIG_CACHE_L2X0 is not set
4747
CONFIG_PREEMPT_VOLUNTARY=y
4848
CONFIG_AEABI=y

‎arch/arm/mach-bcm/Kconfig

Lines changed: 2 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -156,33 +156,18 @@ config ARCH_BCM2835
156156
select FIQ
157157
select PINCTRL
158158
select PINCTRL_BCM2835
159+
select MFD_SYSCON if ARCH_MULTI_V7
159160
help
160161
This enables support for the Broadcom BCM2835 and BCM2836 SoCs.
161162
This SoC is used in the Raspberry Pi and Roku 2 devices.
162163

163164
config MACH_BCM2708
164165
bool "Enable optimized __copy_to_user and __copy_from_user"
165-
depends on ARCH_BCM2708
166+
depends on ARCH_BCM2835 && ARCH_MULTI_V6
166167
default y
167168
help
168169
Optimized versions of __copy_to_user and __copy_from_user for Pi1.
169170

170-
config ARCH_BCM2708
171-
bool "Broadcom BCM2708 family"
172-
depends on ARCH_MULTI_V6
173-
select ARCH_BCM2835
174-
help
175-
This enables support for Broadcom BCM2708 boards.
176-
177-
config ARCH_BCM2709
178-
bool "Broadcom BCM2709 family"
179-
depends on ARCH_MULTI_V7
180-
select ARCH_BCM2835
181-
select HAVE_SMP
182-
select MFD_SYSCON
183-
help
184-
This enables support for Broadcom BCM2709 boards.
185-
186171
config ARCH_BCM_63XX
187172
bool "Broadcom BCM63xx DSL SoC"
188173
depends on ARCH_MULTI_V7

0 commit comments

Comments
 (0)