Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 112355
b: refs/heads/master
c: bb1ad68
h: refs/heads/master
i:
  112353: 2b211f8
  112351: febc416
v: v3
  • Loading branch information
Andrew Victor authored and Russell King committed Sep 21, 2008
1 parent 232ef2e commit b9ebb02
Show file tree
Hide file tree
Showing 8 changed files with 180 additions and 10 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: e505240b6a6fd47b84cfeb1272ffeacd3e0874b3
refs/heads/master: bb1ad68b96a68e577a87ad62fe1aa26d052a52b5
6 changes: 3 additions & 3 deletions trunk/arch/arm/mach-at91/at91cap9.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -141,8 +141,8 @@ static struct clk tcb_clk = {
.pmc_mask = 1 << AT91CAP9_ID_TCB,
.type = CLK_TYPE_PERIPHERAL,
};
static struct clk pwmc_clk = {
.name = "pwmc_clk",
static struct clk pwm_clk = {
.name = "pwm_clk",
.pmc_mask = 1 << AT91CAP9_ID_PWMC,
.type = CLK_TYPE_PERIPHERAL,
};
Expand Down Expand Up @@ -207,7 +207,7 @@ static struct clk *periph_clocks[] __initdata = {
&ssc1_clk,
&ac97_clk,
&tcb_clk,
&pwmc_clk,
&pwm_clk,
&macb_clk,
&aestdes_clk,
&adc_clk,
Expand Down
54 changes: 54 additions & 0 deletions trunk/arch/arm/mach-at91/at91cap9_devices.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -718,6 +718,60 @@ static void __init at91_add_device_watchdog(void) {}
#endif


/* --------------------------------------------------------------------
* PWM
* --------------------------------------------------------------------*/

#if defined(CONFIG_ATMEL_PWM)
static u32 pwm_mask;

static struct resource pwm_resources[] = {
[0] = {
.start = AT91CAP9_BASE_PWMC,
.end = AT91CAP9_BASE_PWMC + SZ_16K - 1,
.flags = IORESOURCE_MEM,
},
[1] = {
.start = AT91CAP9_ID_PWMC,
.end = AT91CAP9_ID_PWMC,
.flags = IORESOURCE_IRQ,
},
};

static struct platform_device at91cap9_pwm0_device = {
.name = "atmel_pwm",
.id = -1,
.dev = {
.platform_data = &pwm_mask,
},
.resource = pwm_resources,
.num_resources = ARRAY_SIZE(pwm_resources),
};

void __init at91_add_device_pwm(u32 mask)
{
if (mask & (1 << AT91_PWM0))
at91_set_A_periph(AT91_PIN_PB19, 1); /* enable PWM0 */

if (mask & (1 << AT91_PWM1))
at91_set_B_periph(AT91_PIN_PB8, 1); /* enable PWM1 */

if (mask & (1 << AT91_PWM2))
at91_set_B_periph(AT91_PIN_PC29, 1); /* enable PWM2 */

if (mask & (1 << AT91_PWM3))
at91_set_B_periph(AT91_PIN_PA11, 1); /* enable PWM3 */

pwm_mask = mask;

platform_device_register(&at91cap9_pwm0_device);
}
#else
void __init at91_add_device_pwm(u32 mask) {}
#endif



/* --------------------------------------------------------------------
* AC97
* -------------------------------------------------------------------- */
Expand Down
6 changes: 3 additions & 3 deletions trunk/arch/arm/mach-at91/at91sam9263.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -129,8 +129,8 @@ static struct clk tcb_clk = {
.pmc_mask = 1 << AT91SAM9263_ID_TCB,
.type = CLK_TYPE_PERIPHERAL,
};
static struct clk pwmc_clk = {
.name = "pwmc_clk",
static struct clk pwm_clk = {
.name = "pwm_clk",
.pmc_mask = 1 << AT91SAM9263_ID_PWMC,
.type = CLK_TYPE_PERIPHERAL,
};
Expand Down Expand Up @@ -187,7 +187,7 @@ static struct clk *periph_clocks[] __initdata = {
&ssc1_clk,
&ac97_clk,
&tcb_clk,
&pwmc_clk,
&pwm_clk,
&macb_clk,
&twodge_clk,
&udc_clk,
Expand Down
53 changes: 53 additions & 0 deletions trunk/arch/arm/mach-at91/at91sam9263_devices.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -885,6 +885,59 @@ static void __init at91_add_device_watchdog(void) {}
#endif


/* --------------------------------------------------------------------
* PWM
* --------------------------------------------------------------------*/

#if defined(CONFIG_ATMEL_PWM)
static u32 pwm_mask;

static struct resource pwm_resources[] = {
[0] = {
.start = AT91SAM9263_BASE_PWMC,
.end = AT91SAM9263_BASE_PWMC + SZ_16K - 1,
.flags = IORESOURCE_MEM,
},
[1] = {
.start = AT91SAM9263_ID_PWMC,
.end = AT91SAM9263_ID_PWMC,
.flags = IORESOURCE_IRQ,
},
};

static struct platform_device at91sam9263_pwm0_device = {
.name = "atmel_pwm",
.id = -1,
.dev = {
.platform_data = &pwm_mask,
},
.resource = pwm_resources,
.num_resources = ARRAY_SIZE(pwm_resources),
};

void __init at91_add_device_pwm(u32 mask)
{
if (mask & (1 << AT91_PWM0))
at91_set_B_periph(AT91_PIN_PB7, 1); /* enable PWM0 */

if (mask & (1 << AT91_PWM1))
at91_set_B_periph(AT91_PIN_PB8, 1); /* enable PWM1 */

if (mask & (1 << AT91_PWM2))
at91_set_B_periph(AT91_PIN_PC29, 1); /* enable PWM2 */

if (mask & (1 << AT91_PWM3))
at91_set_B_periph(AT91_PIN_PB29, 1); /* enable PWM3 */

pwm_mask = mask;

platform_device_register(&at91sam9263_pwm0_device);
}
#else
void __init at91_add_device_pwm(u32 mask) {}
#endif


/* --------------------------------------------------------------------
* SSC -- Synchronous Serial Controller
* -------------------------------------------------------------------- */
Expand Down
6 changes: 3 additions & 3 deletions trunk/arch/arm/mach-at91/at91sam9rl.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -131,8 +131,8 @@ static struct clk tc2_clk = {
.pmc_mask = 1 << AT91SAM9RL_ID_TC2,
.type = CLK_TYPE_PERIPHERAL,
};
static struct clk pwmc_clk = {
.name = "pwmc_clk",
static struct clk pwm_clk = {
.name = "pwm_clk",
.pmc_mask = 1 << AT91SAM9RL_ID_PWMC,
.type = CLK_TYPE_PERIPHERAL,
};
Expand Down Expand Up @@ -180,7 +180,7 @@ static struct clk *periph_clocks[] __initdata = {
&tc0_clk,
&tc1_clk,
&tc2_clk,
&pwmc_clk,
&pwm_clk,
&tsc_clk,
&dma_clk,
&udphs_clk,
Expand Down
53 changes: 53 additions & 0 deletions trunk/arch/arm/mach-at91/at91sam9rl_devices.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -591,6 +591,59 @@ static void __init at91_add_device_watchdog(void) {}
#endif


/* --------------------------------------------------------------------
* PWM
* --------------------------------------------------------------------*/

#if defined(CONFIG_ATMEL_PWM)
static u32 pwm_mask;

static struct resource pwm_resources[] = {
[0] = {
.start = AT91SAM9RL_BASE_PWMC,
.end = AT91SAM9RL_BASE_PWMC + SZ_16K - 1,
.flags = IORESOURCE_MEM,
},
[1] = {
.start = AT91SAM9RL_ID_PWMC,
.end = AT91SAM9RL_ID_PWMC,
.flags = IORESOURCE_IRQ,
},
};

static struct platform_device at91sam9rl_pwm0_device = {
.name = "atmel_pwm",
.id = -1,
.dev = {
.platform_data = &pwm_mask,
},
.resource = pwm_resources,
.num_resources = ARRAY_SIZE(pwm_resources),
};

void __init at91_add_device_pwm(u32 mask)
{
if (mask & (1 << AT91_PWM0))
at91_set_B_periph(AT91_PIN_PB8, 1); /* enable PWM0 */

if (mask & (1 << AT91_PWM1))
at91_set_B_periph(AT91_PIN_PB9, 1); /* enable PWM1 */

if (mask & (1 << AT91_PWM2))
at91_set_B_periph(AT91_PIN_PD5, 1); /* enable PWM2 */

if (mask & (1 << AT91_PWM3))
at91_set_B_periph(AT91_PIN_PD8, 1); /* enable PWM3 */

pwm_mask = mask;

platform_device_register(&at91sam9rl_pwm0_device);
}
#else
void __init at91_add_device_pwm(u32 mask) {}
#endif


/* --------------------------------------------------------------------
* SSC -- Synchronous Serial Controller
* -------------------------------------------------------------------- */
Expand Down
10 changes: 10 additions & 0 deletions trunk/arch/arm/mach-at91/include/mach/board.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,16 @@ struct atmel_uart_data {
};
extern void __init at91_add_device_serial(void);

/*
* PWM
*/
#define AT91_PWM0 0
#define AT91_PWM1 1
#define AT91_PWM2 2
#define AT91_PWM3 3

extern void __init at91_add_device_pwm(u32 mask);

/*
* SSC -- accessed through ssc_request(id). Drivers don't bind to SSC
* platform devices. Their SSC ID is part of their configuration data,
Expand Down

0 comments on commit b9ebb02

Please sign in to comment.