Skip to content

Commit

Permalink
ARM: at91: remove at91_boot_soc
Browse files Browse the repository at this point in the history
at91_boot_soc and at91_init_soc structures are not used by any SoC, remove
their use. Also remove all the now empty SoC files.

Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
[nicolas.ferre@atmel.com: different organization of the patches]
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
  • Loading branch information
Alexandre Belloni authored and Nicolas Ferre committed Feb 2, 2015
1 parent 6bd3e3f commit edd9422
Show file tree
Hide file tree
Showing 6 changed files with 1 addition and 142 deletions.
4 changes: 1 addition & 3 deletions arch/arm/mach-at91/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,7 @@ obj-y := setup.o
obj-$(CONFIG_SOC_AT91SAM9) += sam9_smc.o

# CPU-specific support
obj-$(CONFIG_SOC_AT91RM9200) += at91rm9200.o at91rm9200_time.o
obj-$(CONFIG_SOC_SAMA5D3) += sama5d3.o
obj-$(CONFIG_SOC_SAMA5D4) += sama5d4.o
obj-$(CONFIG_SOC_AT91RM9200) += at91rm9200_time.o

# AT91SAM board with device-tree
obj-$(CONFIG_SOC_AT91RM9200) += board-dt-rm9200.o
Expand Down
32 changes: 0 additions & 32 deletions arch/arm/mach-at91/at91rm9200.c

This file was deleted.

29 changes: 0 additions & 29 deletions arch/arm/mach-at91/sama5d3.c

This file was deleted.

30 changes: 0 additions & 30 deletions arch/arm/mach-at91/sama5d4.c

This file was deleted.

7 changes: 0 additions & 7 deletions arch/arm/mach-at91/setup.c
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,9 @@
#include <mach/cpu.h>
#include <mach/at91_dbgu.h>

#include "soc.h"
#include "generic.h"
#include "pm.h"

struct at91_init_soc __initdata at91_boot_soc;

struct at91_socinfo at91_soc_initdata;
EXPORT_SYMBOL(at91_soc_initdata);

Expand Down Expand Up @@ -60,7 +57,6 @@ static void __init soc_detect(u32 dbgu_base)
at91_soc_initdata.type = AT91_SOC_RM9200;
if (at91_soc_initdata.subtype == AT91_SOC_SUBTYPE_UNKNOWN)
at91_soc_initdata.subtype = AT91_SOC_RM9200_BGA;
at91_boot_soc = at91rm9200_soc;
break;

case ARCH_ID_AT91SAM9260:
Expand Down Expand Up @@ -106,7 +102,6 @@ static void __init soc_detect(u32 dbgu_base)
at91_soc_initdata.exid = __raw_readl(AT91_IO_P2V(dbgu_base) + AT91_DBGU_EXID);
if (at91_soc_initdata.exid & ARCH_EXID_SAMA5D3) {
at91_soc_initdata.type = AT91_SOC_SAMA5D3;
at91_boot_soc = sama5d3_soc;
}
break;
}
Expand Down Expand Up @@ -199,10 +194,8 @@ static void __init alt_soc_detect(u32 dbgu_base)
at91_soc_initdata.exid = __raw_readl(AT91_ALT_IO_P2V(dbgu_base) + AT91_DBGU_EXID);
if (at91_soc_initdata.exid & ARCH_EXID_SAMA5D3) {
at91_soc_initdata.type = AT91_SOC_SAMA5D3;
at91_boot_soc = sama5d3_soc;
} else if (at91_soc_initdata.exid & ARCH_EXID_SAMA5D4) {
at91_soc_initdata.type = AT91_SOC_SAMA5D4;
at91_boot_soc = sama5d4_soc;
}
break;
}
Expand Down
41 changes: 0 additions & 41 deletions arch/arm/mach-at91/soc.h

This file was deleted.

0 comments on commit edd9422

Please sign in to comment.