Date:2011-03-03 17:10:17 (9 years 3 months ago)
Author:Peter Zotov
Commit:fad288aff22be8618aeb6baa5c980f721226a5e1
Message:MIPS: JZ47xx: Fix a few naming issues.

Files: arch/mips/include/asm/mach-jz47xx/soc.h (1 diff)
arch/mips/jz47xx/Kconfig (2 diffs)
arch/mips/jz47xx/Platform (1 diff)
arch/mips/jz47xx/jz4740/board-id800wt.c (1 diff)
arch/mips/jz47xx/jz4740/board-n516.c (1 diff)
arch/mips/jz47xx/jz4740/board-n526.c (1 diff)
arch/mips/jz47xx/jz4740/board-qi_lb60.c (1 diff)
arch/mips/jz47xx/jz4740/clock.c (1 diff)
arch/mips/jz47xx/jz4740/platform.c (1 diff)
arch/mips/jz47xx/setup.c (1 diff)

Change Details

arch/mips/include/asm/mach-jz47xx/soc.h
33
44static inline bool soc_is_jz4740(void)
55{
6#ifdef MACH_JZ4740
6#ifdef CONFIG_MACH_JZ4740
77    return true;
88#else
99    return false;
arch/mips/jz47xx/Kconfig
66
77config MACH_JZ4740
88    bool "JZ4740"
9    select JZ4740_TIMER_CSRC
10    select JZ4740_GPIOV2
9    select JZ47XX_TIMER_CSRC
10    select JZ47XX_GPIOV2
1111
1212
1313endchoice
...... 
1717config HAVE_PWM
1818    bool
1919
20config JZ4740_TIMER_CSRC
20config JZ47XX_TIMER_CSRC
2121    bool
2222
23config JZ4740_GPIOV2
23config JZ47XX_GPIOV2
2424    bool
arch/mips/jz47xx/Platform
1platform-$(CONFIG_MACH_JZ4740) += jz47xx/jz4740/
2cflags-$(CONFIG_MACH_JZ4740) += -I$(srctree)/arch/mips/include/asm/mach-jz4740
3
14platform-$(CONFIG_MACH_JZ47XX) += jz47xx/
2cflags-$(CONFIG_MACH_JZ47XX) += -I$(srctree)/arch/mips/include/asm/mach-jz4740
35load-$(CONFIG_MACH_JZ47XX) += 0xffffffff80010000
arch/mips/jz47xx/jz4740/board-id800wt.c
1616#include <linux/power_supply.h>
1717#include <linux/pwm_backlight.h>
1818
19#include "clock.h"
19#include "../clock.h"
2020
2121#include <asm/mach-jz4740/jz4740_fb.h>
2222#include <asm/mach-jz4740/jz4740_nand.h>
arch/mips/jz47xx/jz4740/board-n516.c
3333#include <asm/mach-jz4740/board-n516.h>
3434#include <asm/mach-jz4740/platform.h>
3535
36#include "clock.h"
36#include "../clock.h"
3737
3838static long n516_panic_blink(int state)
3939{
arch/mips/jz47xx/jz4740/board-n526.c
2828
2929#include <linux/i2c.h>
3030
31#include "clock.h"
31#include "../clock.h"
3232
3333#include <asm/mach-jz4740/jz4740_mmc.h>
3434#include <asm/mach-jz4740/jz4740_nand.h>
arch/mips/jz47xx/jz4740/board-qi_lb60.c
3636
3737#include <asm/mach-jz4740/platform.h>
3838
39#include "clock.h"
39#include "../clock.h"
4040
4141static bool is_avt2;
4242
arch/mips/jz47xx/jz4740/clock.c
2525#include <asm/mach-jz4740/clock.h>
2626#include <asm/mach-jz4740/base.h>
2727
28#include "clock.h"
28#include "../clock.h"
2929
3030#define JZ_REG_CLOCK_CTRL 0x00
3131#define JZ_REG_CLOCK_LOW_POWER 0x04
arch/mips/jz47xx/jz4740/platform.c
2828#include <linux/serial_core.h>
2929#include <linux/serial_8250.h>
3030
31#include "serial.h"
32#include "clock.h"
31#include "../serial.h"
32#include "../clock.h"
3333
3434/* OHCI controller */
3535static struct resource jz4740_usb_ohci_resources[] = {
arch/mips/jz47xx/setup.c
2525
2626const char *get_system_type(void)
2727{
28#ifdef CONFIG_MACH_JZ4740
2829    return "JZ4740";
30#endif
2931}

Archive Download the corresponding diff file



interactive