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

Commit 256ae6a7 authored by Josh Boyer's avatar Josh Boyer
Browse files

Merge branch 'virtex-for-2.6.25' of git://git.secretlab.ca/git/linux-2.6-virtex into for-2.6.25

parents e8318d98 ef66a9d2

Documentation/powerpc/booting-without-of.txt

+14 −0
Original line number Diff line number Diff line
@@ -2578,6 +2578,20 @@ platforms are moved over to use the flattened-device-tree model. 
      Requred properties:

       - current-speed : Baud rate of uartlite



      v) Xilinx hwicap



		Xilinx hwicap devices provide access to the configuration logic

		of the FPGA through the Internal Configuration Access Port

		(ICAP).  The ICAP enables partial reconfiguration of the FPGA,

		readback of the configuration information, and some control over

		'warm boots' of the FPGA fabric.



		Required properties:

		- xlnx,family : The family of the FPGA, necessary since the

                      capabilities of the underlying ICAP hardware

                      differ between different families.  May be

                      'virtex2p', 'virtex4', or 'virtex5'.



    p) Freescale Synchronous Serial Interface



       The SSI is a serial device that communicates with audio codecs.  It can

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

+4 −2
Original line number Diff line number Diff line
@@ -1202,8 +1202,10 @@ static int __devexit ace_of_remove(struct of_device *op) 
}



/* Match table for of_platform binding */

static struct of_device_id __devinit ace_of_match[] = {

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

static struct of_device_id ace_of_match[] __devinitdata = {

	{ .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/char/Kconfig

+10 −0
Original line number Diff line number Diff line
@@ -841,6 +841,16 @@ config DTLK 
	  To compile this driver as a module, choose M here: the

	  module will be called dtlk.



config XILINX_HWICAP

	tristate "Xilinx HWICAP Support"

	depends on XILINX_VIRTEX

	help

	  This option enables support for Xilinx Internal Configuration

	  Access Port (ICAP) driver.  The ICAP is used on Xilinx Virtex

	  FPGA platforms to partially reconfigure the FPGA at runtime.



	  If unsure, say N.



config R3964

	tristate "Siemens R3964 line discipline"

	---help---

drivers/char/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -77,6 +77,7 @@ obj-$(CONFIG_EFI_RTC) += efirtc.o 
obj-$(CONFIG_SGI_DS1286)	+= ds1286.o

obj-$(CONFIG_SGI_IP27_RTC)	+= ip27-rtc.o

obj-$(CONFIG_DS1302)		+= ds1302.o

obj-$(CONFIG_XILINX_HWICAP)	+= xilinx_hwicap/

ifeq ($(CONFIG_GENERIC_NVRAM),y)

  obj-$(CONFIG_NVRAM)	+= generic_nvram.o

else