Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bcm270x: Convert to ARCH_MULTIPLATFORM #1699

Merged
merged 10 commits into from
Oct 28, 2016
Merged

bcm270x: Convert to ARCH_MULTIPLATFORM #1699

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
ed9cd08
bcm270x: Remove bcm2708_reboot_mode parameter
notro Oct 19, 2016
f63a922
bcm270x: Remove NEED_MACH_IO_H
notro Oct 19, 2016
8a0e2e5
dwc_otg: Pass struct device to dma_alloc*()
notro Oct 19, 2016
210b709
mmc: bcm2835-sdhost: Pass struct device to dma_alloc*()
notro Oct 19, 2016
6282051
bcm270x: Drop NEED_MACH_MEMORY_H and use DT dma-ranges
notro Oct 19, 2016
153cfa5
dts: Remove bcm2835-rpi-cm.dts
notro Oct 25, 2016
3cd6950
bcm2708: Convert to ARCH_MULTIPLATFORM
notro Oct 25, 2016
73d6a39
bcm2709: Convert to ARCH_MULTIPLATFORM
notro Oct 25, 2016
920ff44
kconfig: Just use ARCH_BCM2835 for depends on
notro Oct 25, 2016
e95a591
bcm270x: Use dma-ranges unconditionally on bcm2710
pelwell Oct 28, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 0 additions & 21 deletions arch/arm/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -326,26 +326,6 @@ choice
default ARM_SINGLE_ARMV7M if !MMU
default ARCH_MULTIPLATFORM if MMU

config ARCH_BCM2708
bool "Broadcom BCM2708 family"
select CPU_V6
select ARM_AMBA
select CLKSRC_MMIO
select CLKSRC_OF if OF
select HAVE_SCHED_CLOCK
select NEED_MACH_GPIO_H
select COMMON_CLK
select ARCH_HAS_CPUFREQ
select GENERIC_CLOCKEVENTS
select ARM_ERRATA_411920
select MACH_BCM2708
select MULTI_IRQ_HANDLER
select SPARSE_IRQ
select VC4
select FIQ
help
This enables support for Broadcom BCM2708 boards.

config ARCH_BCM2709
bool "Broadcom BCM2709 family"
select CPU_V7
Expand Down Expand Up @@ -754,7 +734,6 @@ config ARCH_VIRT
# Kconfigs may be included either alphabetically (according to the
# plat- suffix) or along side the corresponding mach-* source.
#
source "arch/arm/mach-bcm2708/Kconfig"
source "arch/arm/mach-bcm2709/Kconfig"

source "arch/arm/mach-mvebu/Kconfig"
Expand Down
1 change: 0 additions & 1 deletion arch/arm/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,6 @@ textofs-$(CONFIG_ARCH_AXXIA) := 0x00308000

# Machine directory name. This list is sorted alphanumerically
# by CONFIG_* macro name.
machine-$(CONFIG_ARCH_BCM2708) += bcm2708
machine-$(CONFIG_ARCH_BCM2709) += bcm2709
machine-$(CONFIG_ARCH_ALPINE) += alpine
machine-$(CONFIG_ARCH_ARTPEC) += artpec
Expand Down
6 changes: 4 additions & 2 deletions arch/arm/configs/bcmrpi_defconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
# CONFIG_ARM_PATCH_PHYS_VIRT is not set
CONFIG_PHYS_OFFSET=0
# CONFIG_LOCALVERSION_AUTO is not set
CONFIG_SYSVIPC=y
CONFIG_POSIX_MQUEUE=y
Expand Down Expand Up @@ -38,7 +36,11 @@ CONFIG_BLK_DEV_THROTTLING=y
CONFIG_PARTITION_ADVANCED=y
CONFIG_MAC_PARTITION=y
CONFIG_CFQ_GROUP_IOSCHED=y
CONFIG_ARCH_MULTI_V6=y
# CONFIG_ARCH_MULTI_V7 is not set
CONFIG_ARCH_BCM=y
CONFIG_ARCH_BCM2708=y
# CONFIG_CACHE_L2X0 is not set
CONFIG_PREEMPT_VOLUNTARY=y
CONFIG_AEABI=y
CONFIG_OABI_COMPAT=y
Expand Down
14 changes: 14 additions & 0 deletions arch/arm/mach-bcm/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,20 @@ config ARCH_BCM2835
This enables support for the Broadcom BCM2835 and BCM2836 SoCs.
This SoC is used in the Raspberry Pi and Roku 2 devices.

config MACH_BCM2708
bool "Enable optimized __copy_to_user and __copy_from_user"
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This text doesn't seem to match the config name. A c/p error?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I was tired and didn't know what to call it, so I just kept the name.
The only place CONFIG_MACH_BCM2708 is used is in the optimization code: 5fb515e

depends on ARCH_BCM2708
default y
help
Optimized versions of __copy_to_user and __copy_from_user for Pi1.

config ARCH_BCM2708
bool "Broadcom BCM2708 family"
depends on ARCH_MULTI_V6
select ARCH_BCM2835
help
This enables support for Broadcom BCM2708 boards.

config ARCH_BCM_63XX
bool "Broadcom BCM63xx DSL SoC"
depends on ARCH_MULTI_V7
Expand Down
21 changes: 21 additions & 0 deletions arch/arm/mach-bcm/board_bcm2835.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
#include <linux/irqchip.h>
#include <linux/of_address.h>
#include <linux/clk/bcm2835.h>
#include <linux/broadcom/vc_cma.h>
#include <asm/system_info.h>

#include <asm/mach/arch.h>
Expand All @@ -27,6 +28,7 @@ static void __init bcm2835_init(void)
u32 val;
u64 val64;

vc_cma_early_init();
bcm2835_init_clocks();

if (!of_property_read_u32(np, "linux,revision", &val))
Expand All @@ -35,6 +37,11 @@ static void __init bcm2835_init(void)
system_serial_low = val64;
}

static void __init bcm2835_board_reserve(void)
{
vc_cma_reserve();
}

static const char * const bcm2835_compat[] = {
#ifdef CONFIG_ARCH_MULTI_V6
"brcm,bcm2835",
Expand All @@ -47,5 +54,19 @@ static const char * const bcm2835_compat[] = {

DT_MACHINE_START(BCM2835, "BCM2835")
.init_machine = bcm2835_init,
.reserve = bcm2835_board_reserve,
.dt_compat = bcm2835_compat
MACHINE_END

#ifdef CONFIG_ARCH_BCM2708
static const char * const bcm2708_compat[] = {
"brcm,bcm2708",
NULL
};

DT_MACHINE_START(BCM2708, "BCM2708")
.init_machine = bcm2835_init,
.reserve = bcm2835_board_reserve,
.dt_compat = bcm2708_compat,
MACHINE_END
#endif
14 changes: 0 additions & 14 deletions arch/arm/mach-bcm2708/Kconfig
View file
Open in desktop

This file was deleted.

5 changes: 0 additions & 5 deletions arch/arm/mach-bcm2708/Makefile
View file
Open in desktop

This file was deleted.

3 changes: 0 additions & 3 deletions arch/arm/mach-bcm2708/Makefile.boot
View file
Open in desktop

This file was deleted.

57 changes: 0 additions & 57 deletions arch/arm/mach-bcm2708/bcm2708.c
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions drivers/clk/bcm/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ obj-$(CONFIG_CLK_BCM_KONA) += clk-kona-setup.o
obj-$(CONFIG_CLK_BCM_KONA) += clk-bcm281xx.o
obj-$(CONFIG_CLK_BCM_KONA) += clk-bcm21664.o
obj-$(CONFIG_COMMON_CLK_IPROC) += clk-iproc-armpll.o clk-iproc-pll.o clk-iproc-asiu.o
obj-$(CONFIG_ARCH_BCM2835)$(CONFIG_ARCH_BCM2708)$(CONFIG_ARCH_BCM2709) += clk-bcm2835.o
obj-$(CONFIG_ARCH_BCM2835)$(CONFIG_ARCH_BCM2708)$(CONFIG_ARCH_BCM2709) += clk-bcm2835-aux.o
obj-$(CONFIG_ARCH_BCM2835)$(CONFIG_ARCH_BCM2709) += clk-bcm2835.o
obj-$(CONFIG_ARCH_BCM2835)$(CONFIG_ARCH_BCM2709) += clk-bcm2835-aux.o
obj-$(CONFIG_COMMON_CLK_IPROC) += clk-ns2.o
obj-$(CONFIG_ARCH_BCM_CYGNUS) += clk-cygnus.o
obj-$(CONFIG_ARCH_BCM_NSP) += clk-nsp.o
Expand Down
2 changes: 1 addition & 1 deletion drivers/clocksource/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ obj-$(CONFIG_CLKSRC_NOMADIK_MTU) += nomadik-mtu.o
obj-$(CONFIG_CLKSRC_DBX500_PRCMU) += clksrc-dbx500-prcmu.o
obj-$(CONFIG_ARMADA_370_XP_TIMER) += time-armada-370-xp.o
obj-$(CONFIG_ORION_TIMER) += time-orion.o
obj-$(CONFIG_BCM2835_TIMER)$(CONFIG_ARCH_BCM2708) += bcm2835_timer.o
obj-$(CONFIG_BCM2835_TIMER) += bcm2835_timer.o
obj-$(CONFIG_CLPS711X_TIMER) += clps711x-timer.o
obj-$(CONFIG_ATLAS7_TIMER) += timer-atlas7.o
obj-$(CONFIG_MOXART_TIMER) += moxart_timer.o
Expand Down
1 change: 0 additions & 1 deletion drivers/irqchip/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ obj-$(CONFIG_ATH79) += irq-ath79-cpu.o
obj-$(CONFIG_ATH79) += irq-ath79-misc.o
obj-$(CONFIG_ARCH_BCM2835) += irq-bcm2835.o
obj-$(CONFIG_ARCH_BCM2835) += irq-bcm2836.o
obj-$(CONFIG_ARCH_BCM2708) += irq-bcm2835.o
obj-$(CONFIG_ARCH_BCM2709) += irq-bcm2835.o
obj-$(CONFIG_ARCH_BCM2709) += irq-bcm2836.o
obj-$(CONFIG_ARCH_EXYNOS) += exynos-combiner.o
Expand Down