Commit 0e349b0e authored by Stephen Neuendorffer's avatar Stephen Neuendorffer Committed by Grant Likely
Browse files

[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: default avatarStephen Neuendorffer <stephen.neuendorffer@xilinx.com>
Acked-by: default avatarPeter Korsgaard <jacmet@sunsite.dk>
Signed-off-by: default avatarGrant Likely <grant.likely@secretlab.ca>
parent 911a3175

arch/powerpc/platforms/40x/virtex.c

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ static int __init virtex_probe(void) 
{

	unsigned long root = of_get_flat_dt_root();



	if (!of_flat_dt_is_compatible(root, "xilinx,virtex"))

	if (!of_flat_dt_is_compatible(root, "xlnx,virtex"))

		return 0;



	return 1;

drivers/block/xsysace.c

+3 −1
Original line number Diff line number Diff line
@@ -1203,7 +1203,9 @@ static int __devexit ace_of_remove(struct of_device *op) 


/* Match table for of_platform binding */

static struct of_device_id ace_of_match[] __devinitdata = {

	{ .compatible = "xilinx,xsysace", },

	{ .compatible = "xlnx,opb-sysace-1.00.b", },

	{ .compatible = "xlnx,opb-sysace-1.00.c", },

	{ .compatible = "xlnx,xps-sysace-1.00.a", },

	{},

};

MODULE_DEVICE_TABLE(of, ace_of_match);

drivers/serial/uartlite.c

+15 −8
Original line number Diff line number Diff line
@@ -17,10 +17,21 @@ 
#include <linux/tty.h>

#include <linux/delay.h>

#include <linux/interrupt.h>

#include <linux/init.h>

#include <asm/io.h>

#if defined(CONFIG_OF)

#include <linux/of.h>

#include <linux/of_device.h>

#include <linux/of_platform.h>



/* Match table for of_platform binding */

static struct of_device_id ulite_of_match[] __devinitdata = {

	{ .compatible = "xlnx,opb-uartlite-1.00.b", },

	{ .compatible = "xlnx,xps-uartlite-1.00.a", },

	{}

};

MODULE_DEVICE_TABLE(of, ulite_of_match);



#endif



#define ULITE_NAME		"ttyUL"
@@ -275,6 +286,9 @@ static void ulite_release_port(struct uart_port *port) 


static int ulite_request_port(struct uart_port *port)

{

	pr_debug("ulite console: port=%p; port->mapbase=%x\n",

		 port, port->mapbase);



	if (!request_mem_region(port->mapbase, ULITE_REGION, "uartlite")) {

		dev_err(port->dev, "Memory region busy\n");

		return -EBUSY;
@@ -383,7 +397,7 @@ static inline void __init ulite_console_of_find_device(int id) 
	const unsigned int *of_id;

	int rc;



	for_each_compatible_node(np, NULL, "xilinx,uartlite") {

	for_each_matching_node(np, ulite_of_match) {

		of_id = of_get_property(np, "port-number", NULL);

		if ((!of_id) || (*of_id != id))

			continue;
@@ -617,13 +631,6 @@ static int __devexit ulite_of_remove(struct of_device *op) 
	return ulite_release(&op->dev);

}



/* Match table for of_platform binding */

static struct of_device_id ulite_of_match[] __devinitdata = {

	{ .type = "serial", .compatible = "xilinx,uartlite", },

	{},

};

MODULE_DEVICE_TABLE(of, ulite_of_match);



static struct of_platform_driver ulite_of_driver = {

	.owner = THIS_MODULE,

	.name = "uartlite",

drivers/video/xilinxfb.c

+1 −1
Original line number Diff line number Diff line
@@ -460,7 +460,7 @@ static int __devexit xilinxfb_of_remove(struct of_device *op) 


/* Match table for of_platform binding */

static struct of_device_id xilinxfb_of_match[] __devinitdata = {

	{ .compatible = "xilinx,ml300-fb", },

	{ .compatible = "xlnx,plb-tft-cntlr-ref-1.00.a", },

	{},

};

MODULE_DEVICE_TABLE(of, xilinxfb_of_match);

CRA Git | Maintained and supported by SUSTech CRA and CCSE