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

Commit 2809e80b authored by Guan Xuetao's avatar Guan Xuetao
Browse files

unicore32: move rtc-puv3.c to drivers/rtc directory



The patch moves rtc driver for PKUnity-v3 SoC from arch/unicore32/kernel/
to drivers/rtc/, with renaming it to rtc-puv3.c.
Also, Kconfig, Makefile, and MAINTAINERS are modified correspondingly.

Signed-off-by: default avatarGuan Xuetao <gxt@mprc.pku.edu.cn>
Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
parent 06e86849
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -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/i2c/busses/i2c-puv3.c
F:	drivers/video/fb-puv3.c
F:	drivers/rtc/rtc-puv3.c

PMC SIERRA MaxRAID DRIVER
M:	Anil Ravindranath <anil_ravindranath@pmc-sierra.com>
+0 −4
Original line number Diff line number Diff line
@@ -231,10 +231,6 @@ config PUV3_PWM
	help
	  Enable support for NB0916 PWM controllers

config PUV3_RTC
	tristate "PKUnity v3 RTC Support"
	depends on !ARCH_FPGA

if PUV3_NB0916

menu "PKUnity NetBook-0916 Features"
+3 −3
Original line number Diff line number Diff line
@@ -64,7 +64,6 @@ CONFIG_I2C_BATTERY_BQ27200=n
CONFIG_I2C_EEPROM_AT24=n
CONFIG_LCD_BACKLIGHT=n

CONFIG_PUV3_RTC=y
CONFIG_PUV3_UMAL=y
CONFIG_PUV3_MUSB=n
CONFIG_PUV3_AC97=n
@@ -167,8 +166,9 @@ CONFIG_LEDS_TRIGGER_IDE_DISK=y
CONFIG_LEDS_TRIGGER_HEARTBEAT=y

#	Real Time Clock
CONFIG_RTC_LIB=m
CONFIG_RTC_CLASS=m
CONFIG_RTC_LIB=y
CONFIG_RTC_CLASS=y
CONFIG_RTC_DRV_PUV3=y

### File systems
CONFIG_EXT2_FS=m
+0 −1
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ obj-$(CONFIG_UNICORE_FPU_F64) += fpu-ucf64.o
obj-$(CONFIG_ARCH_PUV3)		+= clock.o irq.o time.o

obj-$(CONFIG_PUV3_GPIO)		+= gpio.o
obj-$(CONFIG_PUV3_RTC)		+= rtc.o
obj-$(CONFIG_PUV3_PWM)		+= pwm.o
obj-$(CONFIG_PUV3_PM)		+= pm.o sleep.o
obj-$(CONFIG_HIBERNATION)	+= hibernate.o hibernate_asm.o
+9 −0
Original line number Diff line number Diff line
@@ -1051,4 +1051,13 @@ config RTC_DRV_TILE
	  Enable support for the Linux driver side of the Tilera
	  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
Loading