Merge branch 'linus' into x86/urgent (5aaca7a7) · Commits · e / devices / android_kernel_teracube_emerald

arch/mips/au1000/common/Makefile

+3 −4

Original line number	Diff line number	Diff line
		#
		# Copyright 2000 MontaVista Software Inc.
		# Author: MontaVista Software, Inc.
		# ppopov@mvista.com or source@mvista.com
		# Copyright 2000, 2008 MontaVista Software Inc.
		# Author: MontaVista Software, Inc. <source@mvista.com>
		#
		# Makefile for the Alchemy Au1000 CPU, generic files.
		# Makefile for the Alchemy Au1xx0 CPUs, generic files.
		#

		obj-y += prom.o irq.o puts.o time.o reset.o \

arch/mips/au1000/common/au1xxx_irqmap.c

+72 −73

Original line number	Diff line number	Diff line
		@@ -203,4 +203,3 @@ struct au1xxx_irqmap __initdata au1xxx_ic0_map[] = {
		};

		int __initdata au1xxx_ic0_nr_irqs = ARRAY_SIZE(au1xxx_ic0_map);

arch/mips/au1000/common/clocks.c

+10 −14

Original line number	Diff line number	Diff line
		/*
		* BRIEF MODULE DESCRIPTION
		* Simple Au1000 clocks routines.
		* Simple Au1xx0 clocks routines.
		*
		* Copyright 2001 MontaVista Software Inc.
		* Author: MontaVista Software, Inc.
		* ppopov@mvista.com or source@mvista.com
		* Copyright 2001, 2008 MontaVista Software Inc.
		* Author: MontaVista Software, Inc. <source@mvista.com>
		*
		* This program is free software; you can redistribute it and/or modify it
		* under the terms of the GNU General Public License as published by the
		@@ -30,8 +29,8 @@
		#include <linux/module.h>
		#include <asm/mach-au1x00/au1000.h>

		static unsigned int au1x00_clock; // Hz
		static unsigned int lcd_clock; // KHz
		static unsigned int au1x00_clock; /* Hz */
		static unsigned int lcd_clock; /* KHz */
		static unsigned long uart_baud_base;

		/*
		@@ -47,8 +46,6 @@ unsigned int get_au1x00_speed(void)
		return au1x00_clock;
		}



		/*
		* The UART baud base is not known at compile time ... if
		* we want to be able to use the same code on different
		@@ -73,8 +70,7 @@ void set_au1x00_uart_baud_base(unsigned long new_baud_base)
		void set_au1x00_lcd_clock(void)
		{
		unsigned int static_cfg0;
		unsigned int sys_busclk =
		(get_au1x00_speed()/1000) /
		unsigned int sys_busclk = (get_au1x00_speed() / 1000) /
		((int)(au_readl(SYS_POWERCTRL) & 0x03) + 2);

		static_cfg0 = au_readl(MEM_STCFG0);
		@@ -85,12 +81,12 @@ void set_au1x00_lcd_clock(void)
		lcd_clock = sys_busclk / 4;

		if (lcd_clock > 50000) /* Epson MAX */
		printk("warning: LCD clock too high (%d KHz)\n", lcd_clock);
		printk(KERN_WARNING "warning: LCD clock too high (%u KHz)\n",
		lcd_clock);
		}

		unsigned int get_au1x00_lcd_clock(void)
		{
		return lcd_clock;
		}

		EXPORT_SYMBOL(get_au1x00_lcd_clock);

arch/mips/au1000/common/cputable.c

+2 −3

Original line number	Diff line number	Diff line
		@@ -39,8 +39,7 @@ struct cpu_spec cpu_specs[] = {
		{ 0x00000000, 0x00000000, "Unknown Au1xxx", 1, 0, 0 }
		};

		void
		set_cpuspec(void)
		void set_cpuspec(void)
		{
		struct cpu_spec *sp;
		u32 prid;

arch/mips/au1000/common/dbdma.c

+184 −205

File changed.

Preview size limit exceeded, changes collapsed.