Commit b32de9dd authored by Alexandre Belloni's avatar Alexandre Belloni
Browse files

ARM: at91: move SoC detection to its own driver 



To simplify machine init and as the soc_device struct is not used as the
parent for on-chip devices anymore, move SoC detection to its own driver.

Change in dmesg:
 - before:
DMA: preallocated 256 KiB pool for atomic coherent allocations
AT91: Detected SoC family: sama5d2
AT91: Detected SoC: sama5d27, revision 0
No ATAGs?
clocksource: tcb_clksrc: mask: 0xffffffff max_cycles: 0xffffffff, max_idle_ns: 184217874325 ns
at_xdmac f0010000.dma-controller: 16 channels, mapped at 0xe085b000
SCSI subsystem initialized

 - after:
DMA: preallocated 256 KiB pool for atomic coherent allocations
No ATAGs?
clocksource: tcb_clksrc: mask: 0xffffffff max_cycles: 0xffffffff, max_idle_ns: 184217874325 ns
at_xdmac f0010000.dma-controller: 16 channels, mapped at 0xe0859000
AT91: Detected SoC family: sama5d2
AT91: Detected SoC: sama5d27, revision 0
SCSI subsystem initialized

Suggested-by: default avatarArnd Bergmann <arnd@arndb.de>
Acked-by: default avatarNicolas Ferre <nicolas.ferre@microchip.com>
Signed-off-by: default avatarAlexandre Belloni <alexandre.belloni@free-electrons.com>
parent 8c9290ae

arch/arm/mach-at91/Makefile

+0 −1
Original line number Diff line number Diff line 
#

# Makefile for the linux kernel.

#

obj-y		:= soc.o



# CPU-specific support

obj-$(CONFIG_SOC_AT91RM9200)	+= at91rm9200.o

arch/arm/mach-at91/at91rm9200.c

+1 −14
Original line number Diff line number Diff line
@@ -14,23 +14,10 @@ 
#include <asm/mach/arch.h>



#include "generic.h"

#include "soc.h"



static const struct at91_soc rm9200_socs[] = {

	AT91_SOC(AT91RM9200_CIDR_MATCH, 0, "at91rm9200 BGA", "at91rm9200"),

	{ /* sentinel */ },

};



static void __init at91rm9200_dt_device_init(void)

{

	struct soc_device *soc;

	struct device *soc_dev = NULL;



	soc = at91_soc_init(rm9200_socs);

	if (soc != NULL)

		soc_dev = soc_device_to_device(soc);



	of_platform_default_populate(NULL, NULL, soc_dev);

	of_platform_default_populate(NULL, NULL, NULL);



	at91rm9200_pm_init();

}

arch/arm/mach-at91/at91sam9.c

+1 −45
Original line number Diff line number Diff line
@@ -14,54 +14,10 @@ 
#include <asm/system_misc.h>



#include "generic.h"

#include "soc.h"



static const struct at91_soc at91sam9_socs[] = {

	AT91_SOC(AT91SAM9260_CIDR_MATCH, 0, "at91sam9260", NULL),

	AT91_SOC(AT91SAM9261_CIDR_MATCH, 0, "at91sam9261", NULL),

	AT91_SOC(AT91SAM9263_CIDR_MATCH, 0, "at91sam9263", NULL),

	AT91_SOC(AT91SAM9G20_CIDR_MATCH, 0, "at91sam9g20", NULL),

	AT91_SOC(AT91SAM9RL64_CIDR_MATCH, 0, "at91sam9rl64", NULL),

	AT91_SOC(AT91SAM9G45_CIDR_MATCH, AT91SAM9M11_EXID_MATCH,

		 "at91sam9m11", "at91sam9g45"),

	AT91_SOC(AT91SAM9G45_CIDR_MATCH, AT91SAM9M10_EXID_MATCH,

		 "at91sam9m10", "at91sam9g45"),

	AT91_SOC(AT91SAM9G45_CIDR_MATCH, AT91SAM9G46_EXID_MATCH,

		 "at91sam9g46", "at91sam9g45"),

	AT91_SOC(AT91SAM9G45_CIDR_MATCH, AT91SAM9G45_EXID_MATCH,

		 "at91sam9g45", "at91sam9g45"),

	AT91_SOC(AT91SAM9X5_CIDR_MATCH, AT91SAM9G15_EXID_MATCH,

		 "at91sam9g15", "at91sam9x5"),

	AT91_SOC(AT91SAM9X5_CIDR_MATCH, AT91SAM9G35_EXID_MATCH,

		 "at91sam9g35", "at91sam9x5"),

	AT91_SOC(AT91SAM9X5_CIDR_MATCH, AT91SAM9X35_EXID_MATCH,

		 "at91sam9x35", "at91sam9x5"),

	AT91_SOC(AT91SAM9X5_CIDR_MATCH, AT91SAM9G25_EXID_MATCH,

		 "at91sam9g25", "at91sam9x5"),

	AT91_SOC(AT91SAM9X5_CIDR_MATCH, AT91SAM9X25_EXID_MATCH,

		 "at91sam9x25", "at91sam9x5"),

	AT91_SOC(AT91SAM9N12_CIDR_MATCH, AT91SAM9CN12_EXID_MATCH,

		 "at91sam9cn12", "at91sam9n12"),

	AT91_SOC(AT91SAM9N12_CIDR_MATCH, AT91SAM9N12_EXID_MATCH,

		 "at91sam9n12", "at91sam9n12"),

	AT91_SOC(AT91SAM9N12_CIDR_MATCH, AT91SAM9CN11_EXID_MATCH,

		 "at91sam9cn11", "at91sam9n12"),

	AT91_SOC(AT91SAM9XE128_CIDR_MATCH, 0, "at91sam9xe128", "at91sam9xe128"),

	AT91_SOC(AT91SAM9XE256_CIDR_MATCH, 0, "at91sam9xe256", "at91sam9xe256"),

	AT91_SOC(AT91SAM9XE512_CIDR_MATCH, 0, "at91sam9xe512", "at91sam9xe512"),

	{ /* sentinel */ },

};



static void __init at91sam9_init(void)

{

	struct soc_device *soc;

	struct device *soc_dev = NULL;



	soc = at91_soc_init(at91sam9_socs);

	if (soc != NULL)

		soc_dev = soc_device_to_device(soc);



	of_platform_default_populate(NULL, NULL, soc_dev);

	of_platform_default_populate(NULL, NULL, NULL);



	at91sam9_pm_init();

}

arch/arm/mach-at91/sama5.c

+1 −51
Original line number Diff line number Diff line
@@ -15,60 +15,10 @@ 
#include <asm/system_misc.h>



#include "generic.h"

#include "soc.h"



static const struct at91_soc sama5_socs[] = {

	AT91_SOC(SAMA5D2_CIDR_MATCH, SAMA5D21CU_EXID_MATCH,

		 "sama5d21", "sama5d2"),

	AT91_SOC(SAMA5D2_CIDR_MATCH, SAMA5D22CU_EXID_MATCH,

		 "sama5d22", "sama5d2"),

	AT91_SOC(SAMA5D2_CIDR_MATCH, SAMA5D23CU_EXID_MATCH,

		 "sama5d23", "sama5d2"),

	AT91_SOC(SAMA5D2_CIDR_MATCH, SAMA5D24CX_EXID_MATCH,

		 "sama5d24", "sama5d2"),

	AT91_SOC(SAMA5D2_CIDR_MATCH, SAMA5D24CU_EXID_MATCH,

		 "sama5d24", "sama5d2"),

	AT91_SOC(SAMA5D2_CIDR_MATCH, SAMA5D26CU_EXID_MATCH,

		 "sama5d26", "sama5d2"),

	AT91_SOC(SAMA5D2_CIDR_MATCH, SAMA5D27CU_EXID_MATCH,

		 "sama5d27", "sama5d2"),

	AT91_SOC(SAMA5D2_CIDR_MATCH, SAMA5D27CN_EXID_MATCH,

		 "sama5d27", "sama5d2"),

	AT91_SOC(SAMA5D2_CIDR_MATCH, SAMA5D28CU_EXID_MATCH,

		 "sama5d28", "sama5d2"),

	AT91_SOC(SAMA5D2_CIDR_MATCH, SAMA5D28CN_EXID_MATCH,

		 "sama5d28", "sama5d2"),

	AT91_SOC(SAMA5D3_CIDR_MATCH, SAMA5D31_EXID_MATCH,

		 "sama5d31", "sama5d3"),

	AT91_SOC(SAMA5D3_CIDR_MATCH, SAMA5D33_EXID_MATCH,

		 "sama5d33", "sama5d3"),

	AT91_SOC(SAMA5D3_CIDR_MATCH, SAMA5D34_EXID_MATCH,

		 "sama5d34", "sama5d3"),

	AT91_SOC(SAMA5D3_CIDR_MATCH, SAMA5D35_EXID_MATCH,

		 "sama5d35", "sama5d3"),

	AT91_SOC(SAMA5D3_CIDR_MATCH, SAMA5D36_EXID_MATCH,

		 "sama5d36", "sama5d3"),

	AT91_SOC(SAMA5D4_CIDR_MATCH, SAMA5D41_EXID_MATCH,

		 "sama5d41", "sama5d4"),

	AT91_SOC(SAMA5D4_CIDR_MATCH, SAMA5D42_EXID_MATCH,

		 "sama5d42", "sama5d4"),

	AT91_SOC(SAMA5D4_CIDR_MATCH, SAMA5D43_EXID_MATCH,

		 "sama5d43", "sama5d4"),

	AT91_SOC(SAMA5D4_CIDR_MATCH, SAMA5D44_EXID_MATCH,

		 "sama5d44", "sama5d4"),

	{ /* sentinel */ },

};



static void __init sama5_dt_device_init(void)

{

	struct soc_device *soc;

	struct device *soc_dev = NULL;



	soc = at91_soc_init(sama5_socs);

	if (soc != NULL)

		soc_dev = soc_device_to_device(soc);



	of_platform_default_populate(NULL, NULL, soc_dev);

	of_platform_default_populate(NULL, NULL, NULL);

	sama5_pm_init();

}

drivers/soc/Kconfig

+1 −0
Original line number Diff line number Diff line 
menu "SOC (System On Chip) specific Drivers"



source "drivers/soc/atmel/Kconfig"

source "drivers/soc/bcm/Kconfig"

source "drivers/soc/fsl/Kconfig"

source "drivers/soc/mediatek/Kconfig"

CRA Git | Maintained and supported by SUSTech CRA and CCSE