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

Commit 23bcbf1b authored by David S. Miller's avatar David S. Miller
Browse files

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

parents 6313e3c2 595a251c

arch/sparc/include/asm/openprom.h

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ struct linux_dev_v2_funcs { 
	int (*v2_dev_open)(char *devpath);

	void (*v2_dev_close)(int d);

	int (*v2_dev_read)(int d, char *buf, int nbytes);

	int (*v2_dev_write)(int d, char *buf, int nbytes);

	int (*v2_dev_write)(int d, const char *buf, int nbytes);

	int (*v2_dev_seek)(int d, int hi, int lo);



	/* Never issued (multistage load support) */

arch/sparc/include/asm/oplib_32.h

+2 −33
Original line number Diff line number Diff line
@@ -60,25 +60,6 @@ extern char *prom_getbootargs(void); 
extern char *prom_mapio(char *virt_hint, int io_space, unsigned int phys_addr, unsigned int num_bytes);

extern void prom_unmapio(char *virt_addr, unsigned int num_bytes);



/* Device operations. */



/* Open the device described by the passed string.  Note, that the format

 * of the string is different on V0 vs. V2->higher proms.  The caller must

 * know what he/she is doing!  Returns the device descriptor, an int.

 */

extern int prom_devopen(char *device_string);



/* Close a previously opened device described by the passed integer

 * descriptor.

 */

extern int prom_devclose(int device_handle);



/* Do a seek operation on the device described by the passed integer

 * descriptor.

 */

extern void prom_seek(int device_handle, unsigned int seek_hival,

		      unsigned int seek_lowval);



/* Miscellaneous routines, don't really fit in any category per se. */



/* Reboot the machine with the command line passed. */
@@ -121,19 +102,8 @@ extern int prom_getrev(void); 
/* Get the prom firmware revision. */

extern int prom_getprev(void);



/* Character operations to/from the console.... */



/* Non-blocking get character from console. */

extern int prom_nbgetchar(void);



/* Non-blocking put character to console. */

extern int prom_nbputchar(char character);



/* Blocking get character from console. */

extern char prom_getchar(void);



/* Blocking put character to console. */

extern void prom_putchar(char character);

/* Write a buffer of characters to the console. */

extern void prom_console_write_buf(const char *buf, int len);



/* Prom's internal routines, don't use in kernel/boot code. */

extern void prom_printf(const char *fmt, ...);
@@ -238,7 +208,6 @@ extern int prom_node_has_property(phandle node, char *property); 
extern int prom_setprop(phandle node, const char *prop_name, char *prop_value,

			int value_size);



extern phandle prom_pathtoinode(char *path);

extern phandle prom_inst2pkg(int);



/* Dorking with Bus ranges... */

arch/sparc/include/asm/oplib_64.h

+2 −44
Original line number Diff line number Diff line
@@ -67,27 +67,6 @@ extern void prom_init(void *cif_handler, void *cif_stack); 
/* Boot argument acquisition, returns the boot command line string. */

extern char *prom_getbootargs(void);



/* Device utilities. */



/* Device operations. */



/* Open the device described by the passed string.  Note, that the format

 * of the string is different on V0 vs. V2->higher proms.  The caller must

 * know what he/she is doing!  Returns the device descriptor, an int.

 */

extern int prom_devopen(const char *device_string);



/* Close a previously opened device described by the passed integer

 * descriptor.

 */

extern int prom_devclose(int device_handle);



/* Do a seek operation on the device described by the passed integer

 * descriptor.

 */

extern void prom_seek(int device_handle, unsigned int seek_hival,

		      unsigned int seek_lowval);



/* Miscellaneous routines, don't really fit in any category per se. */



/* Reboot the machine with the command line passed. */
@@ -109,33 +88,14 @@ extern void prom_halt(void) __attribute__ ((noreturn)); 
/* Halt and power-off the machine. */

extern void prom_halt_power_off(void) __attribute__ ((noreturn));



/* Set the PROM 'sync' callback function to the passed function pointer.

 * When the user gives the 'sync' command at the prom prompt while the

 * kernel is still active, the prom will call this routine.

 *

 */

typedef int (*callback_func_t)(long *cmd);

extern void prom_setcallback(callback_func_t func_ptr);



/* Acquire the IDPROM of the root node in the prom device tree.  This

 * gets passed a buffer where you would like it stuffed.  The return value

 * is the format type of this idprom or 0xff on error.

 */

extern unsigned char prom_get_idprom(char *idp_buffer, int idpbuf_size);



/* Character operations to/from the console.... */



/* Non-blocking get character from console. */

extern int prom_nbgetchar(void);



/* Non-blocking put character to console. */

extern int prom_nbputchar(char character);



/* Blocking get character from console. */

extern char prom_getchar(void);



/* Blocking put character to console. */

extern void prom_putchar(char character);

/* Write a buffer of characters to the console. */

extern void prom_console_write_buf(const char *buf, int len);



/* Prom's internal routines, don't use in kernel/boot code. */

extern void prom_printf(const char *fmt, ...);
@@ -279,9 +239,7 @@ extern phandle prom_finddevice(const char *name); 
extern int prom_setprop(phandle node, const char *prop_name, char *prop_value,

			int value_size);



extern phandle prom_pathtoinode(const char *path);

extern phandle prom_inst2pkg(int);

extern int prom_service_exists(const char *service_name);

extern void prom_sun4v_guest_soft_state(void);



extern int prom_ihandle2path(int handle, char *buffer, int bufsize);

arch/sparc/kernel/leon_kernel.c

+2 −2
Original line number Diff line number Diff line
@@ -114,7 +114,7 @@ void __init leon_init_timers(irq_handler_t counter_fn) 
	if (leon3_gptimer_regs && leon3_irqctrl_regs) {

		LEON3_BYPASS_STORE_PA(&leon3_gptimer_regs->e[0].val, 0);

		LEON3_BYPASS_STORE_PA(&leon3_gptimer_regs->e[0].rld,

				      (((1000000 / 100) - 1)));

				      (((1000000 / HZ) - 1)));

		LEON3_BYPASS_STORE_PA(&leon3_gptimer_regs->e[0].ctrl, 0);



#ifdef CONFIG_SMP
@@ -128,7 +128,7 @@ void __init leon_init_timers(irq_handler_t counter_fn) 
		}



		LEON3_BYPASS_STORE_PA(&leon3_gptimer_regs->e[1].val, 0);

		LEON3_BYPASS_STORE_PA(&leon3_gptimer_regs->e[1].rld, (((1000000/100) - 1)));

		LEON3_BYPASS_STORE_PA(&leon3_gptimer_regs->e[1].rld, (((1000000/HZ) - 1)));

		LEON3_BYPASS_STORE_PA(&leon3_gptimer_regs->e[1].ctrl, 0);

# endif

arch/sparc/prom/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -6,7 +6,6 @@ ccflags := -Werror 


lib-y                 := bootstr_$(BITS).o

lib-$(CONFIG_SPARC32) += devmap.o

lib-y                 += devops_$(BITS).o

lib-y                 += init_$(BITS).o

lib-$(CONFIG_SPARC32) += memory.o

lib-y                 += misc_$(BITS).o