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

Commit 40a6c00f authored by Linus Walleij's avatar Linus Walleij
Browse files

ARM: ux500: Drop U8540/9540 support 



The U8540 was an evolved version of the U8500, but it was never
mass produced or put into products, only reference designs exist.
The upstream support was never completed and it is unlikely that
this will happen so drop the support for now to simplify
maintenance of the U8500.

Cc: Loic Pallardy <loic.pallardy@st.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 60cc43fc

arch/arm/mach-ux500/Kconfig

+0 −3
Original line number Diff line number Diff line
@@ -26,11 +26,8 @@ config UX500_SOC_DB8500 
	bool

	select MFD_DB8500_PRCMU

	select PINCTRL_DB8500

	select PINCTRL_DB8540

	select PINCTRL_AB8500

	select PINCTRL_AB8505

	select PINCTRL_AB9540

	select PINCTRL_AB8540

	select REGULATOR

	select REGULATOR_DB8500_PRCMU

	select CLKSRC_DBX500_PRCMU

arch/arm/mach-ux500/cpu-db8500.c

+2 −14
Original line number Diff line number Diff line
@@ -111,11 +111,6 @@ static void ux500_restart(enum reboot_mode mode, const char *cmd) 
	prcmu_system_reset(0);

}



static struct of_dev_auxdata u8540_auxdata_lookup[] __initdata = {

	OF_DEV_AUXDATA("stericsson,db8500-prcmu", 0x80157000, "db8500-prcmu", NULL),

	{},

};



static const struct of_device_id u8500_local_bus_nodes[] = {

	/* only create devices below soc node */

	{ .compatible = "stericsson,db8500", },
@@ -129,20 +124,13 @@ static void __init u8500_init_machine(void) 
	/* Initialize ux500 power domains */

	ux500_pm_domains_init();



	/* automatically probe child nodes of dbx5x0 devices */

	if (of_machine_is_compatible("st-ericsson,u8540"))

		of_platform_populate(NULL, u8500_local_bus_nodes,

				     u8540_auxdata_lookup, NULL);

	else

	of_platform_populate(NULL, u8500_local_bus_nodes,

			     NULL, NULL);

}



static const char * stericsson_dt_platform_compat[] = {

	"st-ericsson,u8500",

	"st-ericsson,u8540",

	"st-ericsson,u9500",

	"st-ericsson,u9540",

	NULL,

};

arch/arm/mach-ux500/db8500-regs.h

+0 −4
Original line number Diff line number Diff line
@@ -41,10 +41,6 @@ 
/* ASIC ID is at 0xbf4 offset within this region */

#define U8500_ASIC_ID_BASE	0x9001D000



#define U9540_BOOT_ROM_BASE	0xFFFE0000

/* ASIC ID is at 0xbf4 offset within this region */

#define U9540_ASIC_ID_BASE	0xFFFFD000



#define U8500_PER6_BASE		0xa03c0000

#define U8500_PER7_BASE		0xa03d0000

#define U8500_PER5_BASE		0xa03e0000