Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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: Linus Walleij <linus.walleij@linaro.org>

+2 -21
-3
arch/arm/mach-ux500/Kconfig
··· 26 26 bool 27 27 select MFD_DB8500_PRCMU 28 28 select PINCTRL_DB8500 29 - select PINCTRL_DB8540 30 29 select PINCTRL_AB8500 31 30 select PINCTRL_AB8505 32 - select PINCTRL_AB9540 33 - select PINCTRL_AB8540 34 31 select REGULATOR 35 32 select REGULATOR_DB8500_PRCMU 36 33 select CLKSRC_DBX500_PRCMU
+2 -14
arch/arm/mach-ux500/cpu-db8500.c
··· 111 111 prcmu_system_reset(0); 112 112 } 113 113 114 - static struct of_dev_auxdata u8540_auxdata_lookup[] __initdata = { 115 - OF_DEV_AUXDATA("stericsson,db8500-prcmu", 0x80157000, "db8500-prcmu", NULL), 116 - {}, 117 - }; 118 - 119 114 static const struct of_device_id u8500_local_bus_nodes[] = { 120 115 /* only create devices below soc node */ 121 116 { .compatible = "stericsson,db8500", }, ··· 124 129 /* Initialize ux500 power domains */ 125 130 ux500_pm_domains_init(); 126 131 127 - /* automatically probe child nodes of dbx5x0 devices */ 128 - if (of_machine_is_compatible("st-ericsson,u8540")) 129 - of_platform_populate(NULL, u8500_local_bus_nodes, 130 - u8540_auxdata_lookup, NULL); 131 - else 132 - of_platform_populate(NULL, u8500_local_bus_nodes, 133 - NULL, NULL); 132 + of_platform_populate(NULL, u8500_local_bus_nodes, 133 + NULL, NULL); 134 134 } 135 135 136 136 static const char * stericsson_dt_platform_compat[] = { 137 137 "st-ericsson,u8500", 138 - "st-ericsson,u8540", 139 138 "st-ericsson,u9500", 140 - "st-ericsson,u9540", 141 139 NULL, 142 140 }; 143 141
-4
arch/arm/mach-ux500/db8500-regs.h
··· 41 41 /* ASIC ID is at 0xbf4 offset within this region */ 42 42 #define U8500_ASIC_ID_BASE 0x9001D000 43 43 44 - #define U9540_BOOT_ROM_BASE 0xFFFE0000 45 - /* ASIC ID is at 0xbf4 offset within this region */ 46 - #define U9540_ASIC_ID_BASE 0xFFFFD000 47 - 48 44 #define U8500_PER6_BASE 0xa03c0000 49 45 #define U8500_PER7_BASE 0xa03d0000 50 46 #define U8500_PER5_BASE 0xa03e0000