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

microblaze: Remove additional compatible properties

Device-tree BSP generates longer compatible properties
that's why we can remove extra/old one.

Signed-off-by: Michal Simek <monstr@monstr.eu>

-9
-1
arch/microblaze/kernel/heartbeat.c
··· 49 49 int j; 50 50 const char * const gpio_list[] = { 51 51 "xlnx,xps-gpio-1.00.a", 52 - "xlnx,opb-gpio-1.00.a", 53 52 NULL 54 53 }; 55 54
-3
arch/microblaze/kernel/intc.c
··· 128 128 #endif 129 129 const char * const intc_list[] = { 130 130 "xlnx,xps-intc-1.00.a", 131 - "xlnx,opb-intc-1.00.c", 132 - "xlnx,opb-intc-1.00.b", 133 - "xlnx,opb-intc-1.00.a", 134 131 NULL 135 132 }; 136 133
-2
arch/microblaze/kernel/timer.c
··· 260 260 #endif 261 261 const char * const timer_list[] = { 262 262 "xlnx,xps-timer-1.00.a", 263 - "xlnx,opb-timer-1.00.b", 264 - "xlnx,opb-timer-1.00.a", 265 263 NULL 266 264 }; 267 265
-3
arch/microblaze/platform/platform.c
··· 17 17 18 18 static struct of_device_id xilinx_of_bus_ids[] __initdata = { 19 19 { .compatible = "simple-bus", }, 20 - { .compatible = "xlnx,plb-v46-1.00.a", }, 21 - { .compatible = "xlnx,opb-v20-1.10.c", }, 22 - { .compatible = "xlnx,opb-v20-1.10.b", }, 23 20 { .compatible = "xlnx,compound", }, 24 21 {} 25 22 };