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

Commit 7258ea8a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh64-2.6 

* master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh64-2.6:
  sh64: Add a sane pm_power_off implementation.
  sh64: Use generic BUG_ON()/WARN_ON().
  sh64: Trivial build fixes.
  sh64: Drop deprecated ISA tuning for legacy toolchains.
parents af84b99f 1bb99a64

arch/sh64/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ LDFLAGS += -EB -mshelf32_linux 
endif



# No requirements for endianess support from AFLAGS, 'as' always run through gcc

AFLAGS		+= -m5 -isa=sh64 -traditional

CFLAGS		+= $(cpu-y)



LDFLAGS_vmlinux	+= --defsym phys_stext=_stext-$(CONFIG_CACHED_MEMORY_OFFSET) \

arch/sh64/kernel/process.c

+3 −0
Original line number Diff line number Diff line
@@ -355,6 +355,9 @@ void machine_power_off(void) 
	enter_deep_standby();

}



void (*pm_power_off)(void) = machine_power_off;

EXPORT_SYMBOL(pm_power_off);



void show_regs(struct pt_regs * regs)

{

	unsigned long long ah, al, bh, bl, ch, cl;

arch/sh64/mach-cayman/setup.c

+4 −2
Original line number Diff line number Diff line
@@ -112,8 +112,10 @@ struct resource io_resources[] = { 
};



struct resource kram_resources[] = {

	{ "Kernel code", 0, 0 },	/* These must be last in the array */

	{ "Kernel data", 0, 0 }		/* These must be last in the array */

	/* These must be last in the array */

	{ .name = "Kernel code", .start = 0, .end = 0 },

	/* These must be last in the array */

	{ .name = "Kernel data", .start = 0, .end = 0 }

};



struct resource xram_resources[] = {

arch/sh64/mm/ioremap.c

+3 −1
Original line number Diff line number Diff line
@@ -449,7 +449,9 @@ ioremap_proc_info(char *buf, char **start, off_t fpos, int length, int *eof, 
		if (p + 32 >= e)        /* Better than nothing */

			break;

		if ((nm = r->name) == 0) nm = "???";

		p += sprintf(p, "%08lx-%08lx: %s\n", r->start, r->end, nm);

		p += sprintf(p, "%08lx-%08lx: %s\n",

			     (unsigned long)r->start,

			     (unsigned long)r->end, nm);

	}



	return p-buf;

drivers/serial/sh-sci.c

+2 −2
Original line number Diff line number Diff line
@@ -1579,7 +1579,7 @@ static int __init serial_console_setup(struct console *co, char *options) 
	h8300_sci_enable(port, sci_enable);

#endif

#elif defined(CONFIG_SUPERH64)

	port->uartclk = current_cpu_info.module_clock * 16;

	port->uartclk = current_cpu_data.module_clock * 16;

#else

	{

		struct clk *clk = clk_get("module_clk");
@@ -1720,7 +1720,7 @@ static int __init sci_init(void) 
#if defined(__H8300H__) || defined(__H8300S__)

			sciport->port.uartclk = CONFIG_CPU_CLOCK;

#elif defined(CONFIG_SUPERH64)

			sciport->port.uartclk = current_cpu_info.module_clock * 16;

			sciport->port.uartclk = current_cpu_data.module_clock * 16;

#else

			struct clk *clk = clk_get("module_clk");

			sciport->port.uartclk = clk_get_rate(clk) * 16;