Skip to content

L
linux
Commit a5368e77 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files
Options

Merge branch 'at91-fixes' of git://github.com/at91linux/linux-at91 into fixes 

* 'at91-fixes' of git://github.com/at91linux/linux-at91:
  ARM: at91: drop ide driver in favor of the pata one
  pata/at91: use newly introduced SMC accessors
  ARM: at91: add accessor to manage SMC
  ARM: at91:rtc/rtc-at91sam9: ioremap register bank
  ARM: at91: USB AT91 gadget registration for module
parents 88fa269b cf844751
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 140 additions and 437 deletions
arch/arm/mach-at91/at91rm9200_devices.c
View file @ a5368e77
...@@ -83,7 +83,7 @@ void __init at91_add_device_usbh(struct at91_usbh_data *data) {} ...@@ -83,7 +83,7 @@ void __init at91_add_device_usbh(struct at91_usbh_data *data) {}
* USB Device (Gadget) * USB Device (Gadget)
* -------------------------------------------------------------------- */ * -------------------------------------------------------------------- */
#ifdef CONFIG_USB_AT91 #if defined(CONFIG_USB_AT91) || defined(CONFIG_USB_AT91_MODULE)
static struct at91_udc_data udc_data; static struct at91_udc_data udc_data;
static struct resource udc_resources[] = { static struct resource udc_resources[] = {
......
arch/arm/mach-at91/at91sam9260_devices.c
View file @ a5368e77
...@@ -84,7 +84,7 @@ void __init at91_add_device_usbh(struct at91_usbh_data *data) {} ...@@ -84,7 +84,7 @@ void __init at91_add_device_usbh(struct at91_usbh_data *data) {}
* USB Device (Gadget) * USB Device (Gadget)
* -------------------------------------------------------------------- */ * -------------------------------------------------------------------- */
#ifdef CONFIG_USB_AT91 #if defined(CONFIG_USB_AT91) || defined(CONFIG_USB_AT91_MODULE)
static struct at91_udc_data udc_data; static struct at91_udc_data udc_data;
static struct resource udc_resources[] = { static struct resource udc_resources[] = {
...@@ -1215,8 +1215,7 @@ void __init at91_add_device_serial(void) {} ...@@ -1215,8 +1215,7 @@ void __init at91_add_device_serial(void) {}
* CF/IDE * CF/IDE
* -------------------------------------------------------------------- */ * -------------------------------------------------------------------- */
#if defined(CONFIG_BLK_DEV_IDE_AT91) || defined(CONFIG_BLK_DEV_IDE_AT91_MODULE) || \ #if defined(CONFIG_PATA_AT91) || defined(CONFIG_PATA_AT91_MODULE) || \
defined(CONFIG_PATA_AT91) || defined(CONFIG_PATA_AT91_MODULE) || \
defined(CONFIG_AT91_CF) || defined(CONFIG_AT91_CF_MODULE) defined(CONFIG_AT91_CF) || defined(CONFIG_AT91_CF_MODULE)
static struct at91_cf_data cf0_data; static struct at91_cf_data cf0_data;
...@@ -1313,10 +1312,8 @@ void __init at91_add_device_cf(struct at91_cf_data *data) ...@@ -1313,10 +1312,8 @@ void __init at91_add_device_cf(struct at91_cf_data *data)
if (data->flags & AT91_CF_TRUE_IDE) if (data->flags & AT91_CF_TRUE_IDE)
#if defined(CONFIG_PATA_AT91) || defined(CONFIG_PATA_AT91_MODULE) #if defined(CONFIG_PATA_AT91) || defined(CONFIG_PATA_AT91_MODULE)
pdev->name = "pata_at91"; pdev->name = "pata_at91";
#elif defined(CONFIG_BLK_DEV_IDE_AT91) || defined(CONFIG_BLK_DEV_IDE_AT91_MODULE)
pdev->name = "at91_ide";
#else #else
#warning "board requires AT91_CF_TRUE_IDE: enable either at91_ide or pata_at91" #warning "board requires AT91_CF_TRUE_IDE: enable pata_at91"
#endif #endif
else else
pdev->name = "at91_cf"; pdev->name = "at91_cf";
......
arch/arm/mach-at91/at91sam9261_devices.c
View file @ a5368e77
...@@ -87,7 +87,7 @@ void __init at91_add_device_usbh(struct at91_usbh_data *data) {} ...@@ -87,7 +87,7 @@ void __init at91_add_device_usbh(struct at91_usbh_data *data) {}
* USB Device (Gadget) * USB Device (Gadget)
* -------------------------------------------------------------------- */ * -------------------------------------------------------------------- */
#ifdef CONFIG_USB_AT91 #if defined(CONFIG_USB_AT91) || defined(CONFIG_USB_AT91_MODULE)
static struct at91_udc_data udc_data; static struct at91_udc_data udc_data;
static struct resource udc_resources[] = { static struct resource udc_resources[] = {
......
arch/arm/mach-at91/at91sam9263_devices.c
View file @ a5368e77
...@@ -92,7 +92,7 @@ void __init at91_add_device_usbh(struct at91_usbh_data *data) {} ...@@ -92,7 +92,7 @@ void __init at91_add_device_usbh(struct at91_usbh_data *data) {}
* USB Device (Gadget) * USB Device (Gadget)
* -------------------------------------------------------------------- */ * -------------------------------------------------------------------- */
#ifdef CONFIG_USB_AT91 #if defined(CONFIG_USB_AT91) || defined(CONFIG_USB_AT91_MODULE)
static struct at91_udc_data udc_data; static struct at91_udc_data udc_data;
static struct resource udc_resources[] = { static struct resource udc_resources[] = {
...@@ -355,8 +355,8 @@ void __init at91_add_device_mmc(short mmc_id, struct at91_mmc_data *data) {} ...@@ -355,8 +355,8 @@ void __init at91_add_device_mmc(short mmc_id, struct at91_mmc_data *data) {}
* Compact Flash (PCMCIA or IDE) * Compact Flash (PCMCIA or IDE)
* -------------------------------------------------------------------- */ * -------------------------------------------------------------------- */
#if defined(CONFIG_AT91_CF) || defined(CONFIG_AT91_CF_MODULE) || \ #if defined(CONFIG_PATA_AT91) || defined(CONFIG_PATA_AT91_MODULE) || \
defined(CONFIG_BLK_DEV_IDE_AT91) || defined(CONFIG_BLK_DEV_IDE_AT91_MODULE) defined(CONFIG_AT91_CF) || defined(CONFIG_AT91_CF_MODULE)
static struct at91_cf_data cf0_data; static struct at91_cf_data cf0_data;
...@@ -450,7 +450,7 @@ void __init at91_add_device_cf(struct at91_cf_data *data) ...@@ -450,7 +450,7 @@ void __init at91_add_device_cf(struct at91_cf_data *data)
at91_set_A_periph(AT91_PIN_PD9, 0); /* CFCE2 */ at91_set_A_periph(AT91_PIN_PD9, 0); /* CFCE2 */
at91_set_A_periph(AT91_PIN_PD14, 0); /* CFNRW */ at91_set_A_periph(AT91_PIN_PD14, 0); /* CFNRW */
pdev->name = (data->flags & AT91_CF_TRUE_IDE) ? "at91_ide" : "at91_cf"; pdev->name = (data->flags & AT91_CF_TRUE_IDE) ? "pata_at91" : "at91_cf";
platform_device_register(pdev); platform_device_register(pdev);
} }
#else #else
......
arch/arm/mach-at91/include/mach/at91sam9_smc.h
View file @ a5368e77
...@@ -18,6 +18,35 @@ ...@@ -18,6 +18,35 @@
#include <mach/cpu.h> #include <mach/cpu.h>
#ifndef __ASSEMBLY__
struct sam9_smc_config {
/* Setup register */
u8 ncs_read_setup;
u8 nrd_setup;
u8 ncs_write_setup;
u8 nwe_setup;
/* Pulse register */
u8 ncs_read_pulse;
u8 nrd_pulse;
u8 ncs_write_pulse;
u8 nwe_pulse;
/* Cycle register */
u16 read_cycle;
u16 write_cycle;
/* Mode register */
u32 mode;
u8 tdf_cycles:4;
};
extern void sam9_smc_configure(int id, int cs, struct sam9_smc_config *config);
extern void sam9_smc_read(int id, int cs, struct sam9_smc_config *config);
extern void sam9_smc_read_mode(int id, int cs, struct sam9_smc_config *config);
extern void sam9_smc_write_mode(int id, int cs, struct sam9_smc_config *config);
#endif
#define AT91_SMC_SETUP 0x00 /* Setup Register for CS n */ #define AT91_SMC_SETUP 0x00 /* Setup Register for CS n */
#define AT91_SMC_NWESETUP (0x3f << 0) /* NWE Setup Length */ #define AT91_SMC_NWESETUP (0x3f << 0) /* NWE Setup Length */
#define AT91_SMC_NWESETUP_(x) ((x) << 0) #define AT91_SMC_NWESETUP_(x) ((x) << 0)
......
arch/arm/mach-at91/sam9_smc.c
View file @ a5368e77
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
* linux/arch/arm/mach-at91/sam9_smc.c * linux/arch/arm/mach-at91/sam9_smc.c
* *
* Copyright (C) 2008 Andrew Victor * Copyright (C) 2008 Andrew Victor
* Copyright (C) 2011 Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as * it under the terms of the GNU General Public License version 2 as
...@@ -22,7 +23,22 @@ ...@@ -22,7 +23,22 @@
static void __iomem *smc_base_addr[2]; static void __iomem *smc_base_addr[2];
static void __init sam9_smc_cs_configure(void __iomem *base, struct sam9_smc_config* config) static void sam9_smc_cs_write_mode(void __iomem *base,
struct sam9_smc_config *config)
{
__raw_writel(config->mode
| AT91_SMC_TDF_(config->tdf_cycles),
base + AT91_SMC_MODE);
}
void sam9_smc_write_mode(int id, int cs,
struct sam9_smc_config *config)
{
sam9_smc_cs_write_mode(AT91_SMC_CS(id, cs), config);
}
static void sam9_smc_cs_configure(void __iomem *base,
struct sam9_smc_config *config)
{ {
/* Setup register */ /* Setup register */
...@@ -45,16 +61,66 @@ static void __init sam9_smc_cs_configure(void __iomem *base, struct sam9_smc_con ...@@ -45,16 +61,66 @@ static void __init sam9_smc_cs_configure(void __iomem *base, struct sam9_smc_con
base + AT91_SMC_CYCLE); base + AT91_SMC_CYCLE);
/* Mode register */ /* Mode register */
__raw_writel(config->mode sam9_smc_cs_write_mode(base, config);
| AT91_SMC_TDF_(config->tdf_cycles),
base + AT91_SMC_MODE);
} }
void __init sam9_smc_configure(int id, int cs, struct sam9_smc_config* config) void sam9_smc_configure(int id, int cs,
struct sam9_smc_config *config)
{ {
sam9_smc_cs_configure(AT91_SMC_CS(id, cs), config); sam9_smc_cs_configure(AT91_SMC_CS(id, cs), config);
} }
static void sam9_smc_cs_read_mode(void __iomem *base,
struct sam9_smc_config *config)
{
u32 val = __raw_readl(base + AT91_SMC_MODE);
config->mode = (val & ~AT91_SMC_NWECYCLE);
config->tdf_cycles = (val & AT91_SMC_NWECYCLE) >> 16 ;
}
void sam9_smc_read_mode(int id, int cs,
struct sam9_smc_config *config)
{
sam9_smc_cs_read_mode(AT91_SMC_CS(id, cs), config);
}
static void sam9_smc_cs_read(void __iomem *base,
struct sam9_smc_config *config)
{
u32 val;
/* Setup register */
val = __raw_readl(base + AT91_SMC_SETUP);
config->nwe_setup = val & AT91_SMC_NWESETUP;
config->ncs_write_setup = (val & AT91_SMC_NCS_WRSETUP) >> 8;
config->nrd_setup = (val & AT91_SMC_NRDSETUP) >> 16;
config->ncs_read_setup = (val & AT91_SMC_NCS_RDSETUP) >> 24;
/* Pulse register */
val = __raw_readl(base + AT91_SMC_PULSE);
config->nwe_setup = val & AT91_SMC_NWEPULSE;
config->ncs_write_pulse = (val & AT91_SMC_NCS_WRPULSE) >> 8;
config->nrd_pulse = (val & AT91_SMC_NRDPULSE) >> 16;
config->ncs_read_pulse = (val & AT91_SMC_NCS_RDPULSE) >> 24;
/* Cycle register */
val = __raw_readl(base + AT91_SMC_CYCLE);
config->write_cycle = val & AT91_SMC_NWECYCLE;
config->read_cycle = (val & AT91_SMC_NRDCYCLE) >> 16;
/* Mode register */
sam9_smc_cs_read_mode(base, config);
}
void sam9_smc_read(int id, int cs, struct sam9_smc_config *config)
{
sam9_smc_cs_read(AT91_SMC_CS(id, cs), config);
}
void __init at91sam9_ioremap_smc(int id, u32 addr) void __init at91sam9_ioremap_smc(int id, u32 addr)
{ {
if (id > 1) { if (id > 1) {
......
arch/arm/mach-at91/sam9_smc.h
View file @ a5368e77
...@@ -8,27 +8,4 @@ ...@@ -8,27 +8,4 @@
* published by the Free Software Foundation. * published by the Free Software Foundation.
*/ */
struct sam9_smc_config {
/* Setup register */
u8 ncs_read_setup;
u8 nrd_setup;
u8 ncs_write_setup;
u8 nwe_setup;
/* Pulse register */
u8 ncs_read_pulse;
u8 nrd_pulse;
u8 ncs_write_pulse;
u8 nwe_pulse;
/* Cycle register */
u16 read_cycle;
u16 write_cycle;
/* Mode register */
u32 mode;
u8 tdf_cycles:4;
};
extern void __init sam9_smc_configure(int id, int cs, struct sam9_smc_config* config);
extern void __init at91sam9_ioremap_smc(int id, u32 addr); extern void __init at91sam9_ioremap_smc(int id, u32 addr);
drivers/ata/pata_at91.c
View file @ a5368e77
...@@ -207,11 +207,11 @@ static void set_smc_timing(struct device *dev, struct ata_device *adev, ...@@ -207,11 +207,11 @@ static void set_smc_timing(struct device *dev, struct ata_device *adev,
{ {
int ret = 0; int ret = 0;
int use_iordy; int use_iordy;
struct sam9_smc_config smc;
unsigned int t6z; /* data tristate time in ns */ unsigned int t6z; /* data tristate time in ns */
unsigned int cycle; /* SMC Cycle width in MCK ticks */ unsigned int cycle; /* SMC Cycle width in MCK ticks */
unsigned int setup; /* SMC Setup width in MCK ticks */ unsigned int setup; /* SMC Setup width in MCK ticks */
unsigned int pulse; /* CFIOR and CFIOW pulse width in MCK ticks */ unsigned int pulse; /* CFIOR and CFIOW pulse width in MCK ticks */
unsigned int cs_setup = 0;/* CS4 or CS5 setup width in MCK ticks */
unsigned int cs_pulse; /* CS4 or CS5 pulse width in MCK ticks*/ unsigned int cs_pulse; /* CS4 or CS5 pulse width in MCK ticks*/
unsigned int tdf_cycles; /* SMC TDF MCK ticks */ unsigned int tdf_cycles; /* SMC TDF MCK ticks */
unsigned long mck_hz; /* MCK frequency in Hz */ unsigned long mck_hz; /* MCK frequency in Hz */
...@@ -244,26 +244,20 @@ static void set_smc_timing(struct device *dev, struct ata_device *adev, ...@@ -244,26 +244,20 @@ static void set_smc_timing(struct device *dev, struct ata_device *adev,
} }
dev_dbg(dev, "Use IORDY=%u, TDF Cycles=%u\n", use_iordy, tdf_cycles); dev_dbg(dev, "Use IORDY=%u, TDF Cycles=%u\n", use_iordy, tdf_cycles);
info->mode |= AT91_SMC_TDF_(tdf_cycles);
/* SMC Setup Register */
/* write SMC Setup Register */ smc.nwe_setup = smc.nrd_setup = setup;
at91_sys_write(AT91_SMC_SETUP(info->cs), smc.ncs_write_setup = smc.ncs_read_setup = 0;
AT91_SMC_NWESETUP_(setup) | /* SMC Pulse Register */
AT91_SMC_NRDSETUP_(setup) | smc.nwe_pulse = smc.nrd_pulse = pulse;
AT91_SMC_NCS_WRSETUP_(cs_setup) | smc.ncs_write_pulse = smc.ncs_read_pulse = cs_pulse;
AT91_SMC_NCS_RDSETUP_(cs_setup)); /* SMC Cycle Register */
/* write SMC Pulse Register */ smc.write_cycle = smc.read_cycle = cycle;
at91_sys_write(AT91_SMC_PULSE(info->cs), /* SMC Mode Register*/
AT91_SMC_NWEPULSE_(pulse) | smc.tdf_cycles = tdf_cycles;
AT91_SMC_NRDPULSE_(pulse) | smc.mode = info->mode;
AT91_SMC_NCS_WRPULSE_(cs_pulse) |
AT91_SMC_NCS_RDPULSE_(cs_pulse)); sam9_smc_configure(0, info->cs, &smc);
/* write SMC Cycle Register */
at91_sys_write(AT91_SMC_CYCLE(info->cs),
AT91_SMC_NWECYCLE_(cycle) |
AT91_SMC_NRDCYCLE_(cycle));
/* write SMC Mode Register*/
at91_sys_write(AT91_SMC_MODE(info->cs), info->mode);
} }
static void pata_at91_set_piomode(struct ata_port *ap, struct ata_device *adev) static void pata_at91_set_piomode(struct ata_port *ap, struct ata_device *adev)
...@@ -288,20 +282,20 @@ static unsigned int pata_at91_data_xfer_noirq(struct ata_device *dev, ...@@ -288,20 +282,20 @@ static unsigned int pata_at91_data_xfer_noirq(struct ata_device *dev,
struct at91_ide_info *info = dev->link->ap->host->private_data; struct at91_ide_info *info = dev->link->ap->host->private_data;
unsigned int consumed; unsigned int consumed;
unsigned long flags; unsigned long flags;
unsigned int mode; struct sam9_smc_config smc;
local_irq_save(flags); local_irq_save(flags);
mode = at91_sys_read(AT91_SMC_MODE(info->cs)); sam9_smc_read_mode(0, info->cs, &smc);
/* set 16bit mode before writing data */ /* set 16bit mode before writing data */
at91_sys_write(AT91_SMC_MODE(info->cs), smc.mode = (smc.mode & ~AT91_SMC_DBW) | AT91_SMC_DBW_16;
(mode & ~AT91_SMC_DBW) | AT91_SMC_DBW_16); sam9_smc_write_mode(0, info->cs, &smc);
consumed = ata_sff_data_xfer(dev, buf, buflen, rw); consumed = ata_sff_data_xfer(dev, buf, buflen, rw);
/* restore 8bit mode after data is written */ /* restore 8bit mode after data is written */
at91_sys_write(AT91_SMC_MODE(info->cs), smc.mode = (smc.mode & ~AT91_SMC_DBW) | AT91_SMC_DBW_8;
(mode & ~AT91_SMC_DBW) | AT91_SMC_DBW_8); sam9_smc_write_mode(0, info->cs, &smc);
local_irq_restore(flags); local_irq_restore(flags);
return consumed; return consumed;
......
drivers/ide/Makefile
View file @ a5368e77
...@@ -116,4 +116,3 @@ obj-$(CONFIG_BLK_DEV_IDE_AU1XXX) += au1xxx-ide.o ...@@ -116,4 +116,3 @@ obj-$(CONFIG_BLK_DEV_IDE_AU1XXX) += au1xxx-ide.o
obj-$(CONFIG_BLK_DEV_IDE_TX4938) += tx4938ide.o obj-$(CONFIG_BLK_DEV_IDE_TX4938) += tx4938ide.o
obj-$(CONFIG_BLK_DEV_IDE_TX4939) += tx4939ide.o obj-$(CONFIG_BLK_DEV_IDE_TX4939) += tx4939ide.o
obj-$(CONFIG_BLK_DEV_IDE_AT91) += at91_ide.o
drivers/ide/at91_ide.c deleted 100644 → 0
View file @ 88fa269b
This diff is collapsed.
drivers/rtc/rtc-at91sam9.c
View file @ a5368e77
...@@ -307,8 +307,12 @@ static int __init at91_rtc_probe(struct platform_device *pdev) ...@@ -307,8 +307,12 @@ static int __init at91_rtc_probe(struct platform_device *pdev)
device_init_wakeup(&pdev->dev, 1); device_init_wakeup(&pdev->dev, 1);
platform_set_drvdata(pdev, rtc); platform_set_drvdata(pdev, rtc);
rtc->rtt = (void __force __iomem *) (AT91_VA_BASE_SYS - AT91_BASE_SYS); rtc->rtt = ioremap(r->start, resource_size(r));
rtc->rtt += r->start; if (!rtc->rtt) {
dev_err(&pdev->dev, "failed to map registers, aborting.\n");
ret = -ENOMEM;
goto fail;
}
mr = rtt_readl(rtc, MR); mr = rtt_readl(rtc, MR);
...@@ -326,7 +330,7 @@ static int __init at91_rtc_probe(struct platform_device *pdev) ...@@ -326,7 +330,7 @@ static int __init at91_rtc_probe(struct platform_device *pdev)
&at91_rtc_ops, THIS_MODULE); &at91_rtc_ops, THIS_MODULE);
if (IS_ERR(rtc->rtcdev)) { if (IS_ERR(rtc->rtcdev)) {
ret = PTR_ERR(rtc->rtcdev); ret = PTR_ERR(rtc->rtcdev);
goto fail; goto fail_register;
} }
/* register irq handler after we know what name we'll use */ /* register irq handler after we know what name we'll use */
...@@ -351,6 +355,8 @@ static int __init at91_rtc_probe(struct platform_device *pdev) ...@@ -351,6 +355,8 @@ static int __init at91_rtc_probe(struct platform_device *pdev)
return 0; return 0;
fail_register:
iounmap(rtc->rtt);
fail: fail:
platform_set_drvdata(pdev, NULL); platform_set_drvdata(pdev, NULL);
kfree(rtc); kfree(rtc);
...@@ -371,6 +377,7 @@ static int __exit at91_rtc_remove(struct platform_device *pdev) ...@@ -371,6 +377,7 @@ static int __exit at91_rtc_remove(struct platform_device *pdev)
rtc_device_unregister(rtc->rtcdev); rtc_device_unregister(rtc->rtcdev);
iounmap(rtc->rtt);
platform_set_drvdata(pdev, NULL); platform_set_drvdata(pdev, NULL);
kfree(rtc); kfree(rtc);
return 0; return 0;
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7