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

[POWERPC] Xilinx: Update compatible to use values generated by BSP generator.

Mainly, this involves two changes:
1) xilinx->xlnx (recognized standard is to use the stock ticker)
2) In order to have the device tree focus on describing what the
hardware is as exactly as possible, the compatible strings contain the
full IP name and IP version.

Signed-off-by: Stephen Neuendorffer <stephen.neuendorffer@xilinx.com>
Acked-by: Peter Korsgaard <jacmet@sunsite.dk>
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>

authored by

Stephen Neuendorffer and committed by
Grant Likely
0e349b0e 911a3175

+20 -11
+1 -1
arch/powerpc/platforms/40x/virtex.c
··· 37 37 { 38 38 unsigned long root = of_get_flat_dt_root(); 39 39 40 - if (!of_flat_dt_is_compatible(root, "xilinx,virtex")) 40 + if (!of_flat_dt_is_compatible(root, "xlnx,virtex")) 41 41 return 0; 42 42 43 43 return 1;
+3 -1
drivers/block/xsysace.c
··· 1203 1203 1204 1204 /* Match table for of_platform binding */ 1205 1205 static struct of_device_id ace_of_match[] __devinitdata = { 1206 - { .compatible = "xilinx,xsysace", }, 1206 + { .compatible = "xlnx,opb-sysace-1.00.b", }, 1207 + { .compatible = "xlnx,opb-sysace-1.00.c", }, 1208 + { .compatible = "xlnx,xps-sysace-1.00.a", }, 1207 1209 {}, 1208 1210 }; 1209 1211 MODULE_DEVICE_TABLE(of, ace_of_match);
+15 -8
drivers/serial/uartlite.c
··· 17 17 #include <linux/tty.h> 18 18 #include <linux/delay.h> 19 19 #include <linux/interrupt.h> 20 + #include <linux/init.h> 20 21 #include <asm/io.h> 21 22 #if defined(CONFIG_OF) 23 + #include <linux/of.h> 22 24 #include <linux/of_device.h> 23 25 #include <linux/of_platform.h> 26 + 27 + /* Match table for of_platform binding */ 28 + static struct of_device_id ulite_of_match[] __devinitdata = { 29 + { .compatible = "xlnx,opb-uartlite-1.00.b", }, 30 + { .compatible = "xlnx,xps-uartlite-1.00.a", }, 31 + {} 32 + }; 33 + MODULE_DEVICE_TABLE(of, ulite_of_match); 34 + 24 35 #endif 25 36 26 37 #define ULITE_NAME "ttyUL" ··· 286 275 287 276 static int ulite_request_port(struct uart_port *port) 288 277 { 278 + pr_debug("ulite console: port=%p; port->mapbase=%x\n", 279 + port, port->mapbase); 280 + 289 281 if (!request_mem_region(port->mapbase, ULITE_REGION, "uartlite")) { 290 282 dev_err(port->dev, "Memory region busy\n"); 291 283 return -EBUSY; ··· 397 383 const unsigned int *of_id; 398 384 int rc; 399 385 400 - for_each_compatible_node(np, NULL, "xilinx,uartlite") { 386 + for_each_matching_node(np, ulite_of_match) { 401 387 of_id = of_get_property(np, "port-number", NULL); 402 388 if ((!of_id) || (*of_id != id)) 403 389 continue; ··· 630 616 { 631 617 return ulite_release(&op->dev); 632 618 } 633 - 634 - /* Match table for of_platform binding */ 635 - static struct of_device_id ulite_of_match[] __devinitdata = { 636 - { .type = "serial", .compatible = "xilinx,uartlite", }, 637 - {}, 638 - }; 639 - MODULE_DEVICE_TABLE(of, ulite_of_match); 640 619 641 620 static struct of_platform_driver ulite_of_driver = { 642 621 .owner = THIS_MODULE,
+1 -1
drivers/video/xilinxfb.c
··· 460 460 461 461 /* Match table for of_platform binding */ 462 462 static struct of_device_id xilinxfb_of_match[] __devinitdata = { 463 - { .compatible = "xilinx,ml300-fb", }, 463 + { .compatible = "xlnx,plb-tft-cntlr-ref-1.00.a", }, 464 464 {}, 465 465 }; 466 466 MODULE_DEVICE_TABLE(of, xilinxfb_of_match);