p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ARM: Orion5x: ts78xx: allow rtc-m48t86 to manage it's own resources 

The rtc-m48t86 driver can now handle it's own resources and do the
read/write operations internally.

Pass the necessary resources to the driver and remove the m48t86_ops
platform data.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Acked-By: Alexander Clouter <alex+kernel@digriz.org.uk>
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
This commit is contained in:
H Hartley Sweeten 2017-02-15 09:35:25 -07:00 committed by Alexandre Belloni
parent 5e8bb41c51
commit 8ccbd36006
1 changed files with 7 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
arch/arm/mach-orion5x/ts78xx-setup.c
View File

@ -16,7 +16,6 @@
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/mv643xx_eth.h> #include <linux/mv643xx_eth.h>
#include <linux/ata_platform.h> #include <linux/ata_platform.h>
#include <linux/platform_data/rtc-m48t86.h>
#include <linux/mtd/nand.h> #include <linux/mtd/nand.h>
#include <linux/mtd/partitions.h> #include <linux/mtd/partitions.h>
#include <linux/timeriomem-rng.h> #include <linux/timeriomem-rng.h>
@ -80,33 +79,19 @@ static struct mv_sata_platform_data ts78xx_sata_data = {
/***************************************************************************** /*****************************************************************************
* RTC M48T86 - nicked^Wborrowed from arch/arm/mach-ep93xx/ts72xx.c * RTC M48T86 - nicked^Wborrowed from arch/arm/mach-ep93xx/ts72xx.c
****************************************************************************/ ****************************************************************************/
#define TS_RTC_CTRL (TS78XX_FPGA_REGS_VIRT_BASE + 0x808) #define TS_RTC_CTRL (TS78XX_FPGA_REGS_PHYS_BASE + 0x808)
#define TS_RTC_DATA (TS78XX_FPGA_REGS_VIRT_BASE + 0x80c) #define TS_RTC_DATA (TS78XX_FPGA_REGS_PHYS_BASE + 0x80c)
static unsigned char ts78xx_ts_rtc_readbyte(unsigned long addr) static struct resource ts78xx_ts_rtc_resources[] = {
{ DEFINE_RES_MEM(TS_RTC_CTRL, 0x01),
writeb(addr, TS_RTC_CTRL); DEFINE_RES_MEM(TS_RTC_DATA, 0x01),
return readb(TS_RTC_DATA);
}
static void ts78xx_ts_rtc_writebyte(unsigned char value, unsigned long addr)
{
writeb(addr, TS_RTC_CTRL);
writeb(value, TS_RTC_DATA);
}
static struct m48t86_ops ts78xx_ts_rtc_ops = {
.readbyte = ts78xx_ts_rtc_readbyte,
.writebyte = ts78xx_ts_rtc_writebyte,
}; };
static struct platform_device ts78xx_ts_rtc_device = { static struct platform_device ts78xx_ts_rtc_device = {
.name = "rtc-m48t86", .name = "rtc-m48t86",
.id = -1, .id = -1,
.dev = { .resource = ts78xx_ts_rtc_resources,
.platform_data = &ts78xx_ts_rtc_ops, .num_resources = ARRAY_SIZE(ts78xx_ts_rtc_resources),
},
.num_resources = 0,
}; };
static int ts78xx_ts_rtc_load(void) static int ts78xx_ts_rtc_load(void)