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

Commit 8871e73f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 

* master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
  [SPARC]: Add iomap interfaces.
  [OPENPROM]: Rewrite driver to use in-kernel device tree.
  [OPENPROMFS]: Rewrite using in-kernel device tree and seq_file.
  [SPARC]: Add unique device_node IDs and a ".node" property.
  [SPARC]: Add of_set_property() interface.
  [SPARC64]: Export auxio_register to modules.
  [SPARC64]: Add missing interfaces to dma-mapping.h
  [SPARC64]: Export _PAGE_IE to modules.
  [SPARC64]: Allow floppy driver to build modular.
  [SPARC]: Export x_bus_type to modules.
  [RIOWATCHDOG]: Fix the build.
  [CPWATCHDOG]: Fix the build.
  [PARPORT] sunbpp: Fix typo.
  [MTD] sun_uflash: Port to new EBUS device layer.
parents 61a46dc9 749805dc

arch/sparc/kernel/of_device.c

+2 −0
Original line number Diff line number Diff line
@@ -138,6 +138,7 @@ struct bus_type ebus_bus_type = { 
       .suspend	= of_device_suspend,

       .resume	= of_device_resume,

};

EXPORT_SYMBOL(ebus_bus_type);

#endif



#ifdef CONFIG_SBUS
@@ -149,6 +150,7 @@ struct bus_type sbus_bus_type = { 
       .suspend	= of_device_suspend,

       .resume	= of_device_resume,

};

EXPORT_SYMBOL(sbus_bus_type);

#endif



static int __init of_bus_driver_init(void)

arch/sparc/kernel/prom.c

+88 −18
Original line number Diff line number Diff line
@@ -27,6 +27,11 @@ 


static struct device_node *allnodes;



/* use when traversing tree through the allnext, child, sibling,

 * or parent members of struct device_node.

 */

static DEFINE_RWLOCK(devtree_lock);



int of_device_is_compatible(struct device_node *device, const char *compat)

{

	const char* cp;
@@ -185,6 +190,54 @@ int of_getintprop_default(struct device_node *np, const char *name, int def) 
}

EXPORT_SYMBOL(of_getintprop_default);



int of_set_property(struct device_node *dp, const char *name, void *val, int len)

{

	struct property **prevp;

	void *new_val;

	int err;



	new_val = kmalloc(len, GFP_KERNEL);

	if (!new_val)

		return -ENOMEM;



	memcpy(new_val, val, len);



	err = -ENODEV;



	write_lock(&devtree_lock);

	prevp = &dp->properties;

	while (*prevp) {

		struct property *prop = *prevp;



		if (!strcmp(prop->name, name)) {

			void *old_val = prop->value;

			int ret;



			ret = prom_setprop(dp->node, name, val, len);

			err = -EINVAL;

			if (ret >= 0) {

				prop->value = new_val;

				prop->length = len;



				if (OF_IS_DYNAMIC(prop))

					kfree(old_val);



				OF_MARK_DYNAMIC(prop);



				err = 0;

			}

			break;

		}

		prevp = &(*prevp)->next;

	}

	write_unlock(&devtree_lock);



	/* XXX Upate procfs if necessary... */



	return err;

}

EXPORT_SYMBOL(of_set_property);



static unsigned int prom_early_allocated;



static void * __init prom_early_alloc(unsigned long size)
@@ -354,7 +407,9 @@ static char * __init build_full_name(struct device_node *dp) 
	return n;

}



static struct property * __init build_one_prop(phandle node, char *prev)

static unsigned int unique_id;



static struct property * __init build_one_prop(phandle node, char *prev, char *special_name, void *special_val, int special_len)

{

	static struct property *tmp = NULL;

	struct property *p;
@@ -364,10 +419,17 @@ static struct property * __init build_one_prop(phandle node, char *prev) 
		p = tmp;

		memset(p, 0, sizeof(*p) + 32);

		tmp = NULL;

	} else

	} else {

		p = prom_early_alloc(sizeof(struct property) + 32);

		p->unique_id = unique_id++;

	}



	p->name = (char *) (p + 1);

	if (special_name) {

		p->length = special_len;

		p->value = prom_early_alloc(special_len);

		memcpy(p->value, special_val, special_len);

	} else {

		if (prev == NULL) {

			prom_firstprop(node, p->name);

		} else {
@@ -381,8 +443,10 @@ static struct property * __init build_one_prop(phandle node, char *prev) 
		if (p->length <= 0) {

			p->length = 0;

		} else {

		p->value = prom_early_alloc(p->length);

		len = prom_getproperty(node, p->name, p->value, p->length);

			p->value = prom_early_alloc(p->length + 1);

			prom_getproperty(node, p->name, p->value, p->length);

			((unsigned char *)p->value)[p->length] = '\0';

		}

	}

	return p;

}
@@ -391,9 +455,14 @@ static struct property * __init build_prop_list(phandle node) 
{

	struct property *head, *tail;



	head = tail = build_one_prop(node, NULL);

	head = tail = build_one_prop(node, NULL,

				     ".node", &node, sizeof(node));



	tail->next = build_one_prop(node, NULL, NULL, NULL, 0);

	tail = tail->next;

	while(tail) {

		tail->next = build_one_prop(node, tail->name);

		tail->next = build_one_prop(node, tail->name,

					    NULL, NULL, 0);

		tail = tail->next;

	}
@@ -422,6 +491,7 @@ static struct device_node * __init create_node(phandle node) 
		return NULL;



	dp = prom_early_alloc(sizeof(*dp));

	dp->unique_id = unique_id++;



	kref_init(&dp->kref);

arch/sparc/lib/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -9,3 +9,5 @@ lib-y := mul.o rem.o sdiv.o udiv.o umul.o urem.o ashrdi3.o memcpy.o memset.o \ 
	 strncpy_from_user.o divdi3.o udivdi3.o strlen_user.o \

	 copy_user.o locks.o atomic.o atomic32.o bitops.o \

	 lshrdi3.o ashldi3.o rwsem.o muldi3.o bitext.o



obj-y += iomap.o

arch/sparc/lib/iomap.c

0 → 100644
+48 −0
Original line number Diff line number Diff line 
/*

 * Implement the sparc iomap interfaces

 */

#include <linux/pci.h>

#include <linux/module.h>

#include <asm/io.h>



/* Create a virtual mapping cookie for an IO port range */

void __iomem *ioport_map(unsigned long port, unsigned int nr)

{

	return (void __iomem *) (unsigned long) port;

}



void ioport_unmap(void __iomem *addr)

{

	/* Nothing to do */

}

EXPORT_SYMBOL(ioport_map);

EXPORT_SYMBOL(ioport_unmap);



/* Create a virtual mapping cookie for a PCI BAR (memory or IO) */

void __iomem *pci_iomap(struct pci_dev *dev, int bar, unsigned long maxlen)

{

	unsigned long start = pci_resource_start(dev, bar);

	unsigned long len = pci_resource_len(dev, bar);

	unsigned long flags = pci_resource_flags(dev, bar);



	if (!len || !start)

		return NULL;

	if (maxlen && len > maxlen)

		len = maxlen;

	if (flags & IORESOURCE_IO)

		return ioport_map(start, len);

	if (flags & IORESOURCE_MEM) {

		if (flags & IORESOURCE_CACHEABLE)

			return ioremap(start, len);

		return ioremap_nocache(start, len);

	}

	/* What? */

	return NULL;

}



void pci_iounmap(struct pci_dev *dev, void __iomem * addr)

{

	/* nothing to do */

}

EXPORT_SYMBOL(pci_iomap);

EXPORT_SYMBOL(pci_iounmap);

arch/sparc64/kernel/auxio.c

+2 −1
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ 
 */



#include <linux/config.h>

#include <linux/module.h>

#include <linux/kernel.h>

#include <linux/init.h>

#include <linux/ioport.h>
@@ -16,8 +17,8 @@ 
#include <asm/ebus.h>

#include <asm/auxio.h>



/* This cannot be static, as it is referenced in irq.c */

void __iomem *auxio_register = NULL;

EXPORT_SYMBOL(auxio_register);



enum auxio_type {

	AUXIO_TYPE_NODEV,