Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit edd94224 authored by Alexandre Belloni's avatar Alexandre Belloni Committed by Nicolas Ferre
Browse files

ARM: at91: remove at91_boot_soc 



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: default avatarAlexandre Belloni <alexandre.belloni@free-electrons.com>
[nicolas.ferre@atmel.com: different organization of the patches]
Signed-off-by: default avatarNicolas Ferre <nicolas.ferre@atmel.com>
parent 6bd3e3f4

arch/arm/mach-at91/Makefile

+1 −3
Original line number Diff line number Diff line
@@ -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

arch/arm/mach-at91/at91rm9200.c

deleted100644 → 0
+0 −32
Original line number Diff line number Diff line 
/*

 * arch/arm/mach-at91/at91rm9200.c

 *

 *  Copyright (C) 2005 SAN People

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License as published by

 * the Free Software Foundation; either version 2 of the License, or

 * (at your option) any later version.

 *

 */



#include <linux/module.h>

#include <linux/clk/at91_pmc.h>



#include <asm/mach/map.h>

#include <asm/system_misc.h>

#include <mach/at91_st.h>

#include <mach/hardware.h>



#include "soc.h"

#include "generic.h"







/* --------------------------------------------------------------------

 *  AT91RM9200 processor initialization

 * -------------------------------------------------------------------- */





AT91_SOC_START(at91rm9200)

AT91_SOC_END

arch/arm/mach-at91/sama5d3.c

deleted100644 → 0
+0 −29
Original line number Diff line number Diff line 
/*

 *  Chip-specific setup code for the SAMA5D3 family

 *

 *  Copyright (C) 2013 Atmel,

 *                2013 Ludovic Desroches <ludovic.desroches@atmel.com>

 *

 * Licensed under GPLv2 or later.

 */



#include <linux/module.h>

#include <linux/dma-mapping.h>

#include <linux/clk/at91_pmc.h>



#include <asm/irq.h>

#include <asm/mach/arch.h>

#include <asm/mach/map.h>

#include <mach/sama5d3.h>

#include <mach/cpu.h>



#include "soc.h"

#include "generic.h"

#include "sam9_smc.h"



/* --------------------------------------------------------------------

 *  AT91SAM9x5 processor initialization

 * -------------------------------------------------------------------- */



AT91_SOC_START(sama5d3)

AT91_SOC_END

arch/arm/mach-at91/sama5d4.c

deleted100644 → 0
+0 −30
Original line number Diff line number Diff line 
/*

 *  Chip-specific setup code for the SAMA5D4 family

 *

 *  Copyright (C) 2013 Atmel Corporation,

 *                     Nicolas Ferre <nicolas.ferre@atmel.com>

 *

 * Licensed under GPLv2 or later.

 */



#include <linux/module.h>

#include <linux/dma-mapping.h>

#include <linux/clk/at91_pmc.h>



#include <asm/irq.h>

#include <asm/mach/arch.h>

#include <asm/mach/map.h>

#include <mach/sama5d4.h>

#include <mach/cpu.h>

#include <mach/hardware.h>



#include "soc.h"

#include "generic.h"

#include "sam9_smc.h"



/* --------------------------------------------------------------------

 *  Processor initialization

 * -------------------------------------------------------------------- */



AT91_SOC_START(sama5d4)

AT91_SOC_END

arch/arm/mach-at91/setup.c

+0 −7
Original line number Diff line number Diff line
@@ -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);
@@ -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:
@@ -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;

	}
@@ -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;

	}