Date: | 2011-03-03 17:10:17 (13 years 25 days 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 | ||
---|---|---|
3 | 3 | |
4 | 4 | static inline bool soc_is_jz4740(void) |
5 | 5 | { |
6 | #ifdef MACH_JZ4740 | |
6 | #ifdef CONFIG_MACH_JZ4740 | |
7 | 7 | return true; |
8 | 8 | #else |
9 | 9 | return false; |
arch/mips/jz47xx/Kconfig | ||
---|---|---|
6 | 6 | |
7 | 7 | config MACH_JZ4740 |
8 | 8 | bool "JZ4740" |
9 | select JZ4740_TIMER_CSRC | |
10 | select JZ4740_GPIOV2 | |
9 | select JZ47XX_TIMER_CSRC | |
10 | select JZ47XX_GPIOV2 | |
11 | 11 | |
12 | 12 | |
13 | 13 | endchoice |
... | ... | |
17 | 17 | config HAVE_PWM |
18 | 18 | bool |
19 | 19 | |
20 | config JZ4740_TIMER_CSRC | |
20 | config JZ47XX_TIMER_CSRC | |
21 | 21 | bool |
22 | 22 | |
23 | config JZ4740_GPIOV2 | |
23 | config JZ47XX_GPIOV2 | |
24 | 24 | bool |
arch/mips/jz47xx/Platform | ||
---|---|---|
1 | platform-$(CONFIG_MACH_JZ4740) += jz47xx/jz4740/ | |
2 | cflags-$(CONFIG_MACH_JZ4740) += -I$(srctree)/arch/mips/include/asm/mach-jz4740 | |
3 | ||
1 | 4 | platform-$(CONFIG_MACH_JZ47XX) += jz47xx/ |
2 | cflags-$(CONFIG_MACH_JZ47XX) += -I$(srctree)/arch/mips/include/asm/mach-jz4740 | |
3 | 5 | load-$(CONFIG_MACH_JZ47XX) += 0xffffffff80010000 |
arch/mips/jz47xx/jz4740/board-id800wt.c | ||
---|---|---|
16 | 16 | #include <linux/power_supply.h> |
17 | 17 | #include <linux/pwm_backlight.h> |
18 | 18 | |
19 | #include "clock.h" | |
19 | #include "../clock.h" | |
20 | 20 | |
21 | 21 | #include <asm/mach-jz4740/jz4740_fb.h> |
22 | 22 | #include <asm/mach-jz4740/jz4740_nand.h> |
arch/mips/jz47xx/jz4740/board-n516.c | ||
---|---|---|
33 | 33 | #include <asm/mach-jz4740/board-n516.h> |
34 | 34 | #include <asm/mach-jz4740/platform.h> |
35 | 35 | |
36 | #include "clock.h" | |
36 | #include "../clock.h" | |
37 | 37 | |
38 | 38 | static long n516_panic_blink(int state) |
39 | 39 | { |
arch/mips/jz47xx/jz4740/board-n526.c | ||
---|---|---|
28 | 28 | |
29 | 29 | #include <linux/i2c.h> |
30 | 30 | |
31 | #include "clock.h" | |
31 | #include "../clock.h" | |
32 | 32 | |
33 | 33 | #include <asm/mach-jz4740/jz4740_mmc.h> |
34 | 34 | #include <asm/mach-jz4740/jz4740_nand.h> |
arch/mips/jz47xx/jz4740/board-qi_lb60.c | ||
---|---|---|
36 | 36 | |
37 | 37 | #include <asm/mach-jz4740/platform.h> |
38 | 38 | |
39 | #include "clock.h" | |
39 | #include "../clock.h" | |
40 | 40 | |
41 | 41 | static bool is_avt2; |
42 | 42 |
arch/mips/jz47xx/jz4740/clock.c | ||
---|---|---|
25 | 25 | #include <asm/mach-jz4740/clock.h> |
26 | 26 | #include <asm/mach-jz4740/base.h> |
27 | 27 | |
28 | #include "clock.h" | |
28 | #include "../clock.h" | |
29 | 29 | |
30 | 30 | #define JZ_REG_CLOCK_CTRL 0x00 |
31 | 31 | #define JZ_REG_CLOCK_LOW_POWER 0x04 |
arch/mips/jz47xx/jz4740/platform.c | ||
---|---|---|
28 | 28 | #include <linux/serial_core.h> |
29 | 29 | #include <linux/serial_8250.h> |
30 | 30 | |
31 | #include "serial.h" | |
32 | #include "clock.h" | |
31 | #include "../serial.h" | |
32 | #include "../clock.h" | |
33 | 33 | |
34 | 34 | /* OHCI controller */ |
35 | 35 | static struct resource jz4740_usb_ohci_resources[] = { |
arch/mips/jz47xx/setup.c | ||
---|---|---|
25 | 25 | |
26 | 26 | const char *get_system_type(void) |
27 | 27 | { |
28 | #ifdef CONFIG_MACH_JZ4740 | |
28 | 29 | return "JZ4740"; |
30 | #endif | |
29 | 31 | } |
Branches:
ben-wpan
ben-wpan-stefan
5396a9238205f20f811ea57898980d3ca82df0b6
jz-2.6.34
jz-2.6.34-rc5
jz-2.6.34-rc6
jz-2.6.34-rc7
jz-2.6.35
jz-2.6.36
jz-2.6.37
jz-2.6.38
jz-2.6.39
jz-3.0
jz-3.1
jz-3.11
jz-3.12
jz-3.13
jz-3.15
jz-3.16
jz-3.18-dt
jz-3.2
jz-3.3
jz-3.4
jz-3.5
jz-3.6
jz-3.6-rc2-pwm
jz-3.9
jz-3.9-clk
jz-3.9-rc8
jz47xx
jz47xx-2.6.38
master
Tags:
od-2011-09-04
od-2011-09-18
v2.6.34-rc5
v2.6.34-rc6
v2.6.34-rc7
v3.9