Commit 5ebe5500 authored by Linus Torvalds's avatar Linus Torvalds

Merge branch 'unicore32' of git://git.kernel.org/pub/scm/linux/kernel/git/epip/linux-2.6-unicore32

* 'unicore32' of git://git.kernel.org/pub/scm/linux/kernel/git/epip/linux-2.6-unicore32:
  unicore32: using generic-y format for one line asm-generic files
  unicore32: change PERCPU to PERCPU_SECTION
  unicore32: add KBUILD_DEFCONFIG with unicore32_defconfig (old debug_defconfig)
  unicore32: change zImage physical address, though it's PIC codes
  unicore32: move rtc-puv3.c to drivers/rtc directory
parents 29cf519e 62b62c5c
...@@ -4945,6 +4945,7 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/epip/linux-2.6-unicore32.gi ...@@ -4945,6 +4945,7 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/epip/linux-2.6-unicore32.gi
F: drivers/input/serio/i8042-unicore32io.h F: drivers/input/serio/i8042-unicore32io.h
F: drivers/i2c/busses/i2c-puv3.c F: drivers/i2c/busses/i2c-puv3.c
F: drivers/video/fb-puv3.c F: drivers/video/fb-puv3.c
F: drivers/rtc/rtc-puv3.c
PMC SIERRA MaxRAID DRIVER PMC SIERRA MaxRAID DRIVER
M: Anil Ravindranath <anil_ravindranath@pmc-sierra.com> M: Anil Ravindranath <anil_ravindranath@pmc-sierra.com>
......
...@@ -231,10 +231,6 @@ config PUV3_PWM ...@@ -231,10 +231,6 @@ config PUV3_PWM
help help
Enable support for NB0916 PWM controllers Enable support for NB0916 PWM controllers
config PUV3_RTC
tristate "PKUnity v3 RTC Support"
depends on !ARCH_FPGA
if PUV3_NB0916 if PUV3_NB0916
menu "PKUnity NetBook-0916 Features" menu "PKUnity NetBook-0916 Features"
......
...@@ -40,42 +40,10 @@ core-y += arch/unicore32/mm/ ...@@ -40,42 +40,10 @@ core-y += arch/unicore32/mm/
libs-y += arch/unicore32/lib/ libs-y += arch/unicore32/lib/
ASM_GENERATED_DIR := $(srctree)/arch/unicore32/include/generated
LINUXINCLUDE += -I$(ASM_GENERATED_DIR)
ASM_GENERIC_HEADERS := atomic.h auxvec.h
ASM_GENERIC_HEADERS += bitsperlong.h bug.h bugs.h
ASM_GENERIC_HEADERS += cputime.h current.h
ASM_GENERIC_HEADERS += device.h div64.h
ASM_GENERIC_HEADERS += emergency-restart.h errno.h
ASM_GENERIC_HEADERS += fb.h fcntl.h ftrace.h futex.h
ASM_GENERIC_HEADERS += hardirq.h hw_irq.h
ASM_GENERIC_HEADERS += ioctl.h ioctls.h ipcbuf.h irq_regs.h
ASM_GENERIC_HEADERS += kdebug.h kmap_types.h
ASM_GENERIC_HEADERS += local.h
ASM_GENERIC_HEADERS += mman.h module.h msgbuf.h
ASM_GENERIC_HEADERS += param.h parport.h percpu.h poll.h posix_types.h
ASM_GENERIC_HEADERS += resource.h
ASM_GENERIC_HEADERS += scatterlist.h sections.h segment.h sembuf.h serial.h
ASM_GENERIC_HEADERS += setup.h shmbuf.h shmparam.h
ASM_GENERIC_HEADERS += siginfo.h signal.h sizes.h
ASM_GENERIC_HEADERS += socket.h sockios.h stat.h statfs.h swab.h syscalls.h
ASM_GENERIC_HEADERS += termbits.h termios.h topology.h types.h
ASM_GENERIC_HEADERS += ucontext.h unaligned.h user.h
ASM_GENERIC_HEADERS += vga.h
ASM_GENERIC_HEADERS += xor.h
archprepare:
ifneq ($(ASM_GENERATED_DIR), $(wildcard $(ASM_GENERATED_DIR)))
$(Q)mkdir -p $(ASM_GENERATED_DIR)/asm
$(Q)$(foreach a, $(ASM_GENERIC_HEADERS), \
echo '#include <asm-generic/$a>' \
> $(ASM_GENERATED_DIR)/asm/$a; )
endif
boot := arch/unicore32/boot boot := arch/unicore32/boot
# Default target when executing plain make # Default defconfig and target when executing plain make
KBUILD_DEFCONFIG := $(ARCH)_defconfig
KBUILD_IMAGE := zImage KBUILD_IMAGE := zImage
all: $(KBUILD_IMAGE) all: $(KBUILD_IMAGE)
...@@ -83,8 +51,6 @@ all: $(KBUILD_IMAGE) ...@@ -83,8 +51,6 @@ all: $(KBUILD_IMAGE)
zImage Image uImage: vmlinux zImage Image uImage: vmlinux
$(Q)$(MAKE) $(build)=$(boot) $(boot)/$@ $(Q)$(MAKE) $(build)=$(boot) $(boot)/$@
MRPROPER_DIRS += $(ASM_GENERATED_DIR)
archclean: archclean:
$(Q)$(MAKE) $(clean)=$(boot) $(Q)$(MAKE) $(clean)=$(boot)
......
...@@ -59,7 +59,7 @@ $(obj)/vmlinux: $(obj)/vmlinux.lds $(obj)/head.o $(obj)/piggy.o \ ...@@ -59,7 +59,7 @@ $(obj)/vmlinux: $(obj)/vmlinux.lds $(obj)/head.o $(obj)/piggy.o \
# We now have a PIC decompressor implementation. Decompressors running # We now have a PIC decompressor implementation. Decompressors running
# from RAM should not define ZTEXTADDR. Decompressors running directly # from RAM should not define ZTEXTADDR. Decompressors running directly
# from ROM or Flash must define ZTEXTADDR (preferably via the config) # from ROM or Flash must define ZTEXTADDR (preferably via the config)
ZTEXTADDR := 0 ZTEXTADDR := 0x03000000
ZBSSADDR := ALIGN(4) ZBSSADDR := ALIGN(4)
SEDFLAGS_lds = s/TEXT_START/$(ZTEXTADDR)/;s/BSS_START/$(ZBSSADDR)/ SEDFLAGS_lds = s/TEXT_START/$(ZTEXTADDR)/;s/BSS_START/$(ZBSSADDR)/
......
### General setup ### General setup
CONFIG_EXPERIMENTAL=y CONFIG_EXPERIMENTAL=y
CONFIG_LOCALVERSION="-debug" CONFIG_LOCALVERSION="-unicore32"
CONFIG_SWAP=y CONFIG_SWAP=y
CONFIG_SYSVIPC=y CONFIG_SYSVIPC=y
CONFIG_POSIX_MQUEUE=y CONFIG_POSIX_MQUEUE=y
...@@ -64,7 +64,6 @@ CONFIG_I2C_BATTERY_BQ27200=n ...@@ -64,7 +64,6 @@ CONFIG_I2C_BATTERY_BQ27200=n
CONFIG_I2C_EEPROM_AT24=n CONFIG_I2C_EEPROM_AT24=n
CONFIG_LCD_BACKLIGHT=n CONFIG_LCD_BACKLIGHT=n
CONFIG_PUV3_RTC=y
CONFIG_PUV3_UMAL=y CONFIG_PUV3_UMAL=y
CONFIG_PUV3_MUSB=n CONFIG_PUV3_MUSB=n
CONFIG_PUV3_AC97=n CONFIG_PUV3_AC97=n
...@@ -167,8 +166,9 @@ CONFIG_LEDS_TRIGGER_IDE_DISK=y ...@@ -167,8 +166,9 @@ CONFIG_LEDS_TRIGGER_IDE_DISK=y
CONFIG_LEDS_TRIGGER_HEARTBEAT=y CONFIG_LEDS_TRIGGER_HEARTBEAT=y
# Real Time Clock # Real Time Clock
CONFIG_RTC_LIB=m CONFIG_RTC_LIB=y
CONFIG_RTC_CLASS=m CONFIG_RTC_CLASS=y
CONFIG_RTC_DRV_PUV3=y
### File systems ### File systems
CONFIG_EXT2_FS=m CONFIG_EXT2_FS=m
......
include include/asm-generic/Kbuild.asm include include/asm-generic/Kbuild.asm
generic-y += atomic.h
generic-y += auxvec.h
generic-y += bitsperlong.h
generic-y += bug.h
generic-y += bugs.h
generic-y += cputime.h
generic-y += current.h
generic-y += device.h
generic-y += div64.h
generic-y += emergency-restart.h
generic-y += errno.h
generic-y += fb.h
generic-y += fcntl.h
generic-y += ftrace.h
generic-y += futex.h
generic-y += hardirq.h
generic-y += hw_irq.h
generic-y += ioctl.h
generic-y += ioctls.h
generic-y += ipcbuf.h
generic-y += irq_regs.h
generic-y += kdebug.h
generic-y += kmap_types.h
generic-y += local.h
generic-y += mman.h
generic-y += module.h
generic-y += msgbuf.h
generic-y += param.h
generic-y += parport.h
generic-y += percpu.h
generic-y += poll.h
generic-y += posix_types.h
generic-y += resource.h
generic-y += scatterlist.h
generic-y += sections.h
generic-y += segment.h
generic-y += sembuf.h
generic-y += serial.h
generic-y += setup.h
generic-y += shmbuf.h
generic-y += shmparam.h
generic-y += siginfo.h
generic-y += signal.h
generic-y += sizes.h
generic-y += socket.h
generic-y += sockios.h
generic-y += stat.h
generic-y += statfs.h
generic-y += swab.h
generic-y += syscalls.h
generic-y += termbits.h
generic-y += termios.h
generic-y += topology.h
generic-y += types.h
generic-y += ucontext.h
generic-y += unaligned.h
generic-y += user.h
generic-y += vga.h
generic-y += xor.h
...@@ -16,7 +16,6 @@ obj-$(CONFIG_UNICORE_FPU_F64) += fpu-ucf64.o ...@@ -16,7 +16,6 @@ obj-$(CONFIG_UNICORE_FPU_F64) += fpu-ucf64.o
obj-$(CONFIG_ARCH_PUV3) += clock.o irq.o time.o obj-$(CONFIG_ARCH_PUV3) += clock.o irq.o time.o
obj-$(CONFIG_PUV3_GPIO) += gpio.o obj-$(CONFIG_PUV3_GPIO) += gpio.o
obj-$(CONFIG_PUV3_RTC) += rtc.o
obj-$(CONFIG_PUV3_PWM) += pwm.o obj-$(CONFIG_PUV3_PWM) += pwm.o
obj-$(CONFIG_PUV3_PM) += pm.o sleep.o obj-$(CONFIG_PUV3_PM) += pm.o sleep.o
obj-$(CONFIG_HIBERNATION) += hibernate.o hibernate_asm.o obj-$(CONFIG_HIBERNATION) += hibernate.o hibernate_asm.o
......
...@@ -30,7 +30,7 @@ SECTIONS ...@@ -30,7 +30,7 @@ SECTIONS
HEAD_TEXT_SECTION HEAD_TEXT_SECTION
INIT_TEXT_SECTION(PAGE_SIZE) INIT_TEXT_SECTION(PAGE_SIZE)
INIT_DATA_SECTION(16) INIT_DATA_SECTION(16)
PERCPU(L1_CACHE_BYTES, PAGE_SIZE) PERCPU_SECTION(L1_CACHE_BYTES)
__init_end = .; __init_end = .;
_stext = .; _stext = .;
......
...@@ -1051,4 +1051,13 @@ config RTC_DRV_TILE ...@@ -1051,4 +1051,13 @@ config RTC_DRV_TILE
Enable support for the Linux driver side of the Tilera Enable support for the Linux driver side of the Tilera
hypervisor's real-time clock interface. hypervisor's real-time clock interface.
config RTC_DRV_PUV3
tristate "PKUnity v3 RTC support"
depends on ARCH_PUV3
help
This enables support for the RTC in the PKUnity-v3 SoCs.
This drive can also be built as a module. If so, the module
will be called rtc-puv3.
endif # RTC_CLASS endif # RTC_CLASS
...@@ -78,6 +78,7 @@ obj-$(CONFIG_RTC_DRV_PCF50633) += rtc-pcf50633.o ...@@ -78,6 +78,7 @@ obj-$(CONFIG_RTC_DRV_PCF50633) += rtc-pcf50633.o
obj-$(CONFIG_RTC_DRV_PL030) += rtc-pl030.o obj-$(CONFIG_RTC_DRV_PL030) += rtc-pl030.o
obj-$(CONFIG_RTC_DRV_PL031) += rtc-pl031.o obj-$(CONFIG_RTC_DRV_PL031) += rtc-pl031.o
obj-$(CONFIG_RTC_DRV_PS3) += rtc-ps3.o obj-$(CONFIG_RTC_DRV_PS3) += rtc-ps3.o
obj-$(CONFIG_RTC_DRV_PUV3) += rtc-puv3.o
obj-$(CONFIG_RTC_DRV_PXA) += rtc-pxa.o obj-$(CONFIG_RTC_DRV_PXA) += rtc-pxa.o
obj-$(CONFIG_RTC_DRV_R9701) += rtc-r9701.o obj-$(CONFIG_RTC_DRV_R9701) += rtc-r9701.o
obj-$(CONFIG_RTC_DRV_RP5C01) += rtc-rp5c01.o obj-$(CONFIG_RTC_DRV_RP5C01) += rtc-rp5c01.o
......
/* /*
* linux/arch/unicore32/kernel/rtc.c * RTC driver code specific to PKUnity SoC and UniCore ISA
*
* Code specific to PKUnity SoC and UniCore ISA
* *
* Maintained by GUAN Xue-tao <gxt@mprc.pku.edu.cn> * Maintained by GUAN Xue-tao <gxt@mprc.pku.edu.cn>
* Copyright (C) 2001-2010 Guan Xuetao * Copyright (C) 2001-2010 Guan Xuetao
...@@ -36,7 +34,6 @@ static int puv3_rtc_tickno = IRQ_RTC; ...@@ -36,7 +34,6 @@ static int puv3_rtc_tickno = IRQ_RTC;
static DEFINE_SPINLOCK(puv3_rtc_pie_lock); static DEFINE_SPINLOCK(puv3_rtc_pie_lock);
/* IRQ Handlers */ /* IRQ Handlers */
static irqreturn_t puv3_rtc_alarmirq(int irq, void *id) static irqreturn_t puv3_rtc_alarmirq(int irq, void *id)
{ {
struct rtc_device *rdev = id; struct rtc_device *rdev = id;
...@@ -89,7 +86,6 @@ static int puv3_rtc_setpie(struct device *dev, int enabled) ...@@ -89,7 +86,6 @@ static int puv3_rtc_setpie(struct device *dev, int enabled)
} }
/* Time read/write */ /* Time read/write */
static int puv3_rtc_gettime(struct device *dev, struct rtc_time *rtc_tm) static int puv3_rtc_gettime(struct device *dev, struct rtc_time *rtc_tm)
{ {
rtc_time_to_tm(readl(RTC_RCNR), rtc_tm); rtc_time_to_tm(readl(RTC_RCNR), rtc_tm);
...@@ -196,7 +192,6 @@ static void puv3_rtc_release(struct device *dev) ...@@ -196,7 +192,6 @@ static void puv3_rtc_release(struct device *dev)
struct rtc_device *rtc_dev = platform_get_drvdata(pdev); struct rtc_device *rtc_dev = platform_get_drvdata(pdev);
/* do not clear AIE here, it may be needed for wake */ /* do not clear AIE here, it may be needed for wake */
puv3_rtc_setpie(dev, 0); puv3_rtc_setpie(dev, 0);
free_irq(puv3_rtc_alarmno, rtc_dev); free_irq(puv3_rtc_alarmno, rtc_dev);
free_irq(puv3_rtc_tickno, rtc_dev); free_irq(puv3_rtc_tickno, rtc_dev);
...@@ -218,7 +213,6 @@ static void puv3_rtc_enable(struct platform_device *pdev, int en) ...@@ -218,7 +213,6 @@ static void puv3_rtc_enable(struct platform_device *pdev, int en)
writel(readl(RTC_RTSR) & ~RTC_RTSR_HZE, RTC_RTSR); writel(readl(RTC_RTSR) & ~RTC_RTSR_HZE, RTC_RTSR);
} else { } else {
/* re-enable the device, and check it is ok */ /* re-enable the device, and check it is ok */
if ((readl(RTC_RTSR) & RTC_RTSR_HZE) == 0) { if ((readl(RTC_RTSR) & RTC_RTSR_HZE) == 0) {
dev_info(&pdev->dev, "rtc disabled, re-enabling\n"); dev_info(&pdev->dev, "rtc disabled, re-enabling\n");
writel(readl(RTC_RTSR) | RTC_RTSR_HZE, RTC_RTSR); writel(readl(RTC_RTSR) | RTC_RTSR_HZE, RTC_RTSR);
...@@ -251,7 +245,6 @@ static int puv3_rtc_probe(struct platform_device *pdev) ...@@ -251,7 +245,6 @@ static int puv3_rtc_probe(struct platform_device *pdev)
pr_debug("%s: probe=%p\n", __func__, pdev); pr_debug("%s: probe=%p\n", __func__, pdev);
/* find the IRQs */ /* find the IRQs */
puv3_rtc_tickno = platform_get_irq(pdev, 1); puv3_rtc_tickno = platform_get_irq(pdev, 1);
if (puv3_rtc_tickno < 0) { if (puv3_rtc_tickno < 0) {
dev_err(&pdev->dev, "no irq for rtc tick\n"); dev_err(&pdev->dev, "no irq for rtc tick\n");
...@@ -268,7 +261,6 @@ static int puv3_rtc_probe(struct platform_device *pdev) ...@@ -268,7 +261,6 @@ static int puv3_rtc_probe(struct platform_device *pdev)
puv3_rtc_tickno, puv3_rtc_alarmno); puv3_rtc_tickno, puv3_rtc_alarmno);
/* get the memory region */ /* get the memory region */
res = platform_get_resource(pdev, IORESOURCE_MEM, 0); res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
if (res == NULL) { if (res == NULL) {
dev_err(&pdev->dev, "failed to get memory region resource\n"); dev_err(&pdev->dev, "failed to get memory region resource\n");
...@@ -288,7 +280,6 @@ static int puv3_rtc_probe(struct platform_device *pdev) ...@@ -288,7 +280,6 @@ static int puv3_rtc_probe(struct platform_device *pdev)
puv3_rtc_enable(pdev, 1); puv3_rtc_enable(pdev, 1);
/* register RTC and exit */ /* register RTC and exit */
rtc = rtc_device_register("pkunity", &pdev->dev, &puv3_rtcops, rtc = rtc_device_register("pkunity", &pdev->dev, &puv3_rtcops,
THIS_MODULE); THIS_MODULE);
...@@ -315,8 +306,6 @@ static int puv3_rtc_probe(struct platform_device *pdev) ...@@ -315,8 +306,6 @@ static int puv3_rtc_probe(struct platform_device *pdev)
#ifdef CONFIG_PM #ifdef CONFIG_PM
/* RTC Power management control */
static int ticnt_save; static int ticnt_save;
static int puv3_rtc_suspend(struct platform_device *pdev, pm_message_t state) static int puv3_rtc_suspend(struct platform_device *pdev, pm_message_t state)
...@@ -368,4 +357,3 @@ module_exit(puv3_rtc_exit); ...@@ -368,4 +357,3 @@ module_exit(puv3_rtc_exit);
MODULE_DESCRIPTION("RTC Driver for the PKUnity v3 chip"); MODULE_DESCRIPTION("RTC Driver for the PKUnity v3 chip");
MODULE_AUTHOR("Hu Dongliang"); MODULE_AUTHOR("Hu Dongliang");
MODULE_LICENSE("GPL v2"); MODULE_LICENSE("GPL v2");
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment