AT91: PMC definitions are plaform-depenent
Subsystems (4)
For supporting multiple AT91 processors in a single kernel image, the base address of the PMC controller cannot be calculated at compile-time. Changes required:
* calculate PMC base address in processor-dependent code and pass it through to the clocks driver at initialization time.
* arch_idle() need to call into processor-dependent code to put the CPU to sleep. Added an 'at91_arch_idle' callback.
* Move at91_pm_verify_clocks() from pm.c to clocks.c
* Rename definitions of AT91_PMC to AT91xxx_PMC.
arch/arm/mach-at91/at572d940hf.c +17 -1
@@ -24,6 +24,7 @@#include <linux/module.h> +#include <asm/proc-fns.h> #include <asm/mach/irq.h> #include <asm/mach/arch.h> #include <asm/mach/map.h>
@@ -292,6 +293,18 @@ static struct at91_gpio_bank at572d940hf_gpio[] = { } }; +static void at572d940hf_idle (void ) +{ +void __iomem * pmc = (void __iomem *)AT91_VA_BASE_SYS +AT572D940HF_PMC ; + +/* +* Disable the processor clock, and set the processor (CP15) +* into 'Wait for Interrupt' mode. +*/ +__raw_writel (AT91_PMC_PCK , pmc +AT91_PMC_SCDR ); +cpu_do_idle (); +} +static void at572d940hf_reset (void ) {at91_sys_write (AT91_RSTC_CR ,AT91_RSTC_KEY |AT91_RSTC_PROCRST |AT91_RSTC_PERRST );
@@ -304,15 +317,18 @@ static void at572d940hf_reset(void)void __init at572d940hf_initialize (unsigned long main_clock) { +void __iomem * pmc = (void __iomem *)AT91_VA_BASE_SYS +AT572D940HF_PMC ; +/* Map peripherals */ iotable_init (at572d940hf_io_desc,ARRAY_SIZE (at572d940hf_io_desc)); + at91_arch_idle = at572d940hf_idle; at91_arch_reset = at572d940hf_reset; at91_extern_irq = (1 <<AT572D940HF_ID_IRQ0 ) | (1 <<AT572D940HF_ID_IRQ1 ) | (1 <<AT572D940HF_ID_IRQ2 );/* Init clock subsystem */ -at91_clock_init (main_clock); +at91_clock_init (pmc, main_clock);/* Register the processor-specific clocks */ at572d940hf_register_clocks ();
arch/arm/mach-at91/at91cap9.c +17 -1
@@ -15,6 +15,7 @@#include <linux/module.h> #include <linux/pm.h> +#include <asm/proc-fns.h> #include <asm/irq.h> #include <asm/mach/arch.h> #include <asm/mach/map.h>
@@ -288,6 +289,18 @@ static struct at91_gpio_bank at91cap9_gpio[] = { } }; +static void at91cap9_idle (void ) +{ +void __iomem * pmc = (void __iomem *)AT91_VA_BASE_SYS +AT91CAP9_PMC ; + +/* +* Disable the processor clock, and set the processor (CP15) +* into 'Wait for Interrupt' mode. +*/ +__raw_writel (AT91_PMC_PCK , pmc +AT91_PMC_SCDR ); +cpu_do_idle (); +} +static void at91cap9_reset (void ) {at91_sys_write (AT91_RSTC_CR ,AT91_RSTC_KEY |AT91_RSTC_PROCRST |AT91_RSTC_PERRST );
@@ -305,15 +318,18 @@ static void at91cap9_poweroff(void)void __init at91cap9_initialize (unsigned long main_clock) { +void __iomem * pmc = (void __iomem *)AT91_VA_BASE_SYS +AT91CAP9_PMC ; +/* Map peripherals */ iotable_init (at91cap9_io_desc,ARRAY_SIZE (at91cap9_io_desc)); + at91_arch_idle = at91cap9_idle; at91_arch_reset = at91cap9_reset; pm_power_off = at91cap9_poweroff; at91_extern_irq = (1 <<AT91CAP9_ID_IRQ0 ) | (1 <<AT91CAP9_ID_IRQ1 );/* Init clock subsystem */ -at91_clock_init (main_clock); +at91_clock_init (pmc, main_clock);/* Register the processor-specific clocks */ at91cap9_register_clocks ();
arch/arm/mach-at91/at91rm9200.c +15 -1
@@ -257,6 +257,17 @@ static struct at91_gpio_bank at91rm9200_gpio[] = { } }; +static void at91rm9200_idle (void ) +{ +void __iomem *pmc = (void __iomem *)AT91_VA_BASE_SYS +AT91RM9200_PMC ; + +/* +* Disable the processor clock. The processor will be automatically +* re-enabled by an interrupt or by a reset. +*/ +__raw_writel (AT91_PMC_PCK , pmc +AT91_PMC_SCDR ); +} +static void at91rm9200_reset (void ) {/*
@@ -272,9 +283,12 @@ static void at91rm9200_reset(void)* -------------------------------------------------------------------- */ void __init at91rm9200_initialize (unsigned long main_clock,unsigned short banks) { +void __iomem *pmc = (void __iomem *)AT91_VA_BASE_SYS +AT91RM9200_PMC ; +/* Map peripherals */ iotable_init (at91rm9200_io_desc,ARRAY_SIZE (at91rm9200_io_desc)); + at91_arch_idle = at91rm9200_idle; at91_arch_reset = at91rm9200_reset; at91_extern_irq = (1 <<AT91RM9200_ID_IRQ0 ) | (1 <<AT91RM9200_ID_IRQ1 ) | (1 <<AT91RM9200_ID_IRQ2 ) | (1 <<AT91RM9200_ID_IRQ3 )
@@ -282,7 +296,7 @@ void __init at91rm9200_initialize(unsigned long main_clock, unsigned short banks | (1 << AT91RM9200_ID_IRQ6);/* Init clock subsystem */ -at91_clock_init (main_clock); +at91_clock_init (pmc, main_clock);/* Register the processor-specific clocks */ at91rm9200_register_clocks ();
arch/arm/mach-at91/at91sam9260.c +17 -1
@@ -13,6 +13,7 @@#include <linux/module.h> #include <linux/pm.h> +#include <asm/proc-fns.h> #include <asm/irq.h> #include <asm/mach/arch.h> #include <asm/mach/map.h>
@@ -279,6 +280,18 @@ static struct at91_gpio_bank at91sam9260_gpio[] = { } }; +static void at91sam9260_idle (void ) +{ +void __iomem * pmc = (void __iomem *)AT91_VA_BASE_SYS +AT91SAM9260_PMC ; + +/* +* Disable the processor clock, and set the processor (CP15) +* into 'Wait for Interrupt' mode. +*/ +__raw_writel (AT91_PMC_PCK , pmc +AT91_PMC_SCDR ); +cpu_do_idle (); +} +static void at91sam9260_poweroff (void ) {at91_sys_write (AT91_SHDW_CR ,AT91_SHDW_KEY |AT91_SHDW_SHDW );
@@ -310,6 +323,8 @@ static void __init at91sam9xe_initialize(void)void __init at91sam9260_initialize (unsigned long main_clock) { +void __iomem * pmc = (void __iomem *)AT91_VA_BASE_SYS +AT91SAM9260_PMC ; +/* Map peripherals */ iotable_init (at91sam9260_io_desc,ARRAY_SIZE (at91sam9260_io_desc));
@@ -320,13 +335,14 @@ void __init at91sam9260_initialize(unsigned long main_clock)else iotable_init (at91sam9260_sram_desc,ARRAY_SIZE (at91sam9260_sram_desc)); + at91_arch_idle = at91sam9260_idle; at91_arch_reset = at91sam9_alt_reset; pm_power_off = at91sam9260_poweroff; at91_extern_irq = (1 <<AT91SAM9260_ID_IRQ0 ) | (1 <<AT91SAM9260_ID_IRQ1 ) | (1 <<AT91SAM9260_ID_IRQ2 );/* Init clock subsystem */ -at91_clock_init (main_clock); +at91_clock_init (pmc, main_clock);/* Register the processor-specific clocks */ at91sam9260_register_clocks ();
arch/arm/mach-at91/at91sam9261.c +17 -2
@@ -13,6 +13,7 @@#include <linux/module.h> #include <linux/pm.h> +#include <asm/proc-fns.h> #include <asm/irq.h> #include <asm/mach/arch.h> #include <asm/mach/map.h>
@@ -257,6 +258,18 @@ static struct at91_gpio_bank at91sam9261_gpio[] = { } }; +static void at91sam9261_idle (void ) +{ +void __iomem * pmc = (void __iomem *)AT91_VA_BASE_SYS +AT91SAM9261_PMC ; + +/* +* Disable the processor clock, and set the processor (CP15) +* into 'Wait for Interrupt' mode. +*/ +__raw_writel (AT91_PMC_PCK , pmc +AT91_PMC_SCDR ); +cpu_do_idle (); +} +static void at91sam9261_poweroff (void ) {at91_sys_write (AT91_SHDW_CR ,AT91_SHDW_KEY |AT91_SHDW_SHDW );
@@ -269,6 +282,8 @@ static void at91sam9261_poweroff(void)void __init at91sam9261_initialize (unsigned long main_clock) { +void __iomem * pmc = (void __iomem *)AT91_VA_BASE_SYS +AT91SAM9261_PMC ; +/* Map peripherals */ iotable_init (at91sam9261_io_desc,ARRAY_SIZE (at91sam9261_io_desc));
@@ -277,14 +292,14 @@ void __init at91sam9261_initialize(unsigned long main_clock)else iotable_init (at91sam9261_sram_desc,ARRAY_SIZE (at91sam9261_sram_desc)); - + at91_arch_idle = at91sam9261_idle; at91_arch_reset = at91sam9_alt_reset; pm_power_off = at91sam9261_poweroff; at91_extern_irq = (1 <<AT91SAM9261_ID_IRQ0 ) | (1 <<AT91SAM9261_ID_IRQ1 ) | (1 <<AT91SAM9261_ID_IRQ2 );/* Init clock subsystem */ -at91_clock_init (main_clock); +at91_clock_init (pmc, main_clock);/* Register the processor-specific clocks */ at91sam9261_register_clocks ();
arch/arm/mach-at91/at91sam9263.c +17 -1
@@ -13,6 +13,7 @@#include <linux/module.h> #include <linux/pm.h> +#include <asm/proc-fns.h> #include <asm/irq.h> #include <asm/mach/arch.h> #include <asm/mach/map.h>
@@ -269,6 +270,18 @@ static struct at91_gpio_bank at91sam9263_gpio[] = { } }; +static void at91sam9263_idle (void ) +{ +void __iomem * pmc = (void __iomem *)AT91_VA_BASE_SYS +AT91SAM9263_PMC ; + +/* +* Disable the processor clock, and set the processor (CP15) +* into 'Wait for Interrupt' mode. +*/ +__raw_writel (AT91_PMC_PCK , pmc +AT91_PMC_SCDR ); +cpu_do_idle (); +} +static void at91sam9263_poweroff (void ) {at91_sys_write (AT91_SHDW_CR ,AT91_SHDW_KEY |AT91_SHDW_SHDW );
@@ -281,15 +294,18 @@ static void at91sam9263_poweroff(void)void __init at91sam9263_initialize (unsigned long main_clock) { +void __iomem * pmc = (void __iomem *)AT91_VA_BASE_SYS +AT91SAM9263_PMC ; +/* Map peripherals */ iotable_init (at91sam9263_io_desc,ARRAY_SIZE (at91sam9263_io_desc)); + at91_arch_idle = at91sam9263_idle; at91_arch_reset = at91sam9_alt_reset; pm_power_off = at91sam9263_poweroff; at91_extern_irq = (1 <<AT91SAM9263_ID_IRQ0 ) | (1 <<AT91SAM9263_ID_IRQ1 );/* Init clock subsystem */ -at91_clock_init (main_clock); +at91_clock_init (pmc, main_clock);/* Register the processor-specific clocks */ at91sam9263_register_clocks ();
arch/arm/mach-at91/at91sam9g45.c +17 -1
@@ -13,6 +13,7 @@#include <linux/module.h> #include <linux/pm.h> +#include <asm/proc-fns.h> #include <asm/irq.h> #include <asm/mach/arch.h> #include <asm/mach/map.h>
@@ -291,6 +292,18 @@ static struct at91_gpio_bank at91sam9g45_gpio[] = { } }; +static void at91sam9g45_idle (void ) +{ +void __iomem * pmc = (void __iomem *)AT91_VA_BASE_SYS +AT91SAM9G45_PMC ; + +/* +* Disable the processor clock, and set the processor (CP15) +* into 'Wait for Interrupt' mode. +*/ +__raw_writel (AT91_PMC_PCK , pmc +AT91_PMC_SCDR ); +cpu_do_idle (); +} +static void at91sam9g45_reset (void ) {at91_sys_write (AT91_RSTC_CR ,AT91_RSTC_KEY |AT91_RSTC_PROCRST |AT91_RSTC_PERRST );
@@ -308,15 +321,18 @@ static void at91sam9g45_poweroff(void)void __init at91sam9g45_initialize (unsigned long main_clock) { +void __iomem * pmc = (void __iomem *)AT91_VA_BASE_SYS +AT91SAM9G45_PMC ; +/* Map peripherals */ iotable_init (at91sam9g45_io_desc,ARRAY_SIZE (at91sam9g45_io_desc)); + at91_arch_idle = at91sam9g45_idle; at91_arch_reset = at91sam9g45_reset; pm_power_off = at91sam9g45_poweroff; at91_extern_irq = (1 <<AT91SAM9G45_ID_IRQ0 );/* Init clock subsystem */ -at91_clock_init (main_clock); +at91_clock_init (pmc, main_clock);/* Register the processor-specific clocks */ at91sam9g45_register_clocks ();
arch/arm/mach-at91/at91sam9rl.c +16 -1
@@ -12,6 +12,7 @@#include <linux/module.h> #include <linux/pm.h> +#include <asm/proc-fns.h> #include <asm/irq.h> #include <asm/mach/arch.h> #include <asm/mach/map.h>
@@ -242,6 +243,18 @@ static struct at91_gpio_bank at91sam9rl_gpio[] = { } }; +static void at91sam9rl_idle (void ) +{ +void __iomem * pmc = (void __iomem *)AT91_VA_BASE_SYS +AT91SAM9RL_PMC ; + +/* +* Disable the processor clock, and set the processor (CP15) +* into 'Wait for Interrupt' mode. +*/ +__raw_writel (AT91_PMC_PCK , pmc +AT91_PMC_SCDR ); +cpu_do_idle (); +} +static void at91sam9rl_poweroff (void ) {at91_sys_write (AT91_SHDW_CR ,AT91_SHDW_KEY |AT91_SHDW_SHDW );
@@ -254,6 +267,7 @@ static void at91sam9rl_poweroff(void)void __init at91sam9rl_initialize (unsigned long main_clock) { +void __iomem * pmc = (void __iomem *)AT91_VA_BASE_SYS +AT91SAM9RL_PMC ;unsigned long sram_size;/* Map peripherals */
@@ -274,12 +288,13 @@ void __init at91sam9rl_initialize(unsigned long main_clock)/* Map SRAM */ iotable_init (at91sam9rl_sram_desc,ARRAY_SIZE (at91sam9rl_sram_desc)); + at91_arch_idle = at91sam9rl_idle; at91_arch_reset = at91sam9_alt_reset; pm_power_off = at91sam9rl_poweroff; at91_extern_irq = (1 <<AT91SAM9RL_ID_IRQ0 );/* Init clock subsystem */ -at91_clock_init (main_clock); +at91_clock_init (pmc, main_clock);/* Register the processor-specific clocks */ at91sam9rl_register_clocks ();
arch/arm/mach-at91/at91x40.c +12 -0
@@ -42,8 +42,20 @@ struct clk *clk_get(struct device *dev, const char *id)return NULL ; } +static void at91x40_idle (void ) +{ +void __iomem *ps = (void __iomem *)AT91_VA_BASE_SYS +AT91X40_PS ; + +/* +* Disable the processor clock. The processor will be automatically +* re-enabled by an interrupt or by a reset. +*/ +__raw_writel (AT91_PS_CR_CPU , ps +AT91_PS_CR ); +} +void __init at91x40_initialize (unsigned long main_clock) { + at91_arch_idle = at91x40_idle; at91_extern_irq = (1 <<AT91X40_ID_IRQ0 ) | (1 <<AT91X40_ID_IRQ1 ) | (1 <<AT91X40_ID_IRQ2 ); }
arch/arm/mach-at91/clock.c +97 -36
277 lines not on this page · raw message
arch/arm/mach-at91/clock.h +1 -0
@@ -29,3 +29,4 @@ struct clk {extern int __init clk_register (struct clk *clk); +extern int at91_clocks_valid_for_suspend (void );
arch/arm/mach-at91/generic.h +2 -1
@@ -38,7 +38,7 @@ extern struct sys_timer at91sam926x_timer;extern struct sys_timer at91x40_timer;/* Clocks */ -extern int __init at91_clock_init (unsigned long main_clock); +extern int __init at91_clock_init (void __iomem * regbase,unsigned long main_clock);struct device ;extern void __init at91_clock_associate (const char *id,struct device *dev,const char *func);
@@ -61,5 +61,6 @@ struct at91_gpio_bank {extern void __init at91_gpio_init (struct at91_gpio_bank *,int nr_banks);extern void __init at91_gpio_irq_setup (void ); +extern void (*at91_arch_idle)(void );extern void (*at91_arch_reset)(void );extern int at91_extern_irq;
arch/arm/mach-at91/include/mach/at572d940hf.h +1 -1
@@ -97,7 +97,7 @@#define AT572D940HF_PIOA (0xfffff400 - AT91_BASE_SYS)#define AT572D940HF_PIOB (0xfffff600 - AT91_BASE_SYS)#define AT572D940HF_PIOC (0xfffff800 - AT91_BASE_SYS) -#define AT91_PMC (0xfffffc00 - AT91_BASE_SYS) +#define AT572D940HF_PMC (0xfffffc00 - AT91_BASE_SYS)#define AT91_RSTC (0xfffffd00 - AT91_BASE_SYS)#define AT572D940HF_RTT (0xfffffd20 - AT91_BASE_SYS)#define AT91_PIT (0xfffffd30 - AT91_BASE_SYS)
arch/arm/mach-at91/include/mach/at91_pmc.h +20 -20
@@ -16,10 +16,10 @@#ifndef AT91_PMC_H #define AT91_PMC_H -#define AT91_PMC_SCER (AT91_PMC + 0x00)/* System Clock Enable Register */ -#define AT91_PMC_SCDR (AT91_PMC + 0x04)/* System Clock Disable Register */ +#define AT91_PMC_SCER 0x00/* System Clock Enable Register */ +#define AT91_PMC_SCDR 0x04/* System Clock Disable Register */ -#define AT91_PMC_SCSR (AT91_PMC + 0x08)/* System Clock Status Register */ +#define AT91_PMC_SCSR 0x08/* System Clock Status Register */ #define AT91_PMC_PCK (1 << 0)/* Processor Clock */ #define AT91RM9200_PMC_UDP (1 << 1)/* USB Devcice Port Clock [AT91RM9200 only] */ #define AT91RM9200_PMC_MCKUDP (1 << 2)/* USB Device Port Master Clock Automatic Disable on Suspend [AT91RM9200 only] */
@@ -36,27 +36,27 @@#define AT91_PMC_HCK0 (1 << 16)/* AHB Clock (USB host) [AT91SAM9261 only] */ #define AT91_PMC_HCK1 (1 << 17)/* AHB Clock (LCD) [AT91SAM9261 only] */ -#define AT91_PMC_PCER (AT91_PMC + 0x10)/* Peripheral Clock Enable Register */ -#define AT91_PMC_PCDR (AT91_PMC + 0x14)/* Peripheral Clock Disable Register */ -#define AT91_PMC_PCSR (AT91_PMC + 0x18)/* Peripheral Clock Status Register */ +#define AT91_PMC_PCER 0x10/* Peripheral Clock Enable Register */ +#define AT91_PMC_PCDR 0x14/* Peripheral Clock Disable Register */ +#define AT91_PMC_PCSR 0x18/* Peripheral Clock Status Register */ -#define AT91_CKGR_UCKR (AT91_PMC + 0x1C)/* UTMI Clock Register [some SAM9, CAP9] */ +#define AT91_CKGR_UCKR 0x1C/* UTMI Clock Register [some SAM9, CAP9] */ #define AT91_PMC_UPLLEN (1 << 16)/* UTMI PLL Enable */ #define AT91_PMC_UPLLCOUNT (0xf << 20)/* UTMI PLL Start-up Time */ #define AT91_PMC_BIASEN (1 << 24)/* UTMI BIAS Enable */ #define AT91_PMC_BIASCOUNT (0xf << 28)/* UTMI BIAS Start-up Time */ -#define AT91_CKGR_MOR (AT91_PMC + 0x20)/* Main Oscillator Register [not on SAM9RL] */ +#define AT91_CKGR_MOR 0x20/* Main Oscillator Register [not on SAM9RL] */ #define AT91_PMC_MOSCEN (1 << 0)/* Main Oscillator Enable */ #define AT91_PMC_OSCBYPASS (1 << 1)/* Oscillator Bypass [SAM9x, CAP9] */ #define AT91_PMC_OSCOUNT (0xff << 8)/* Main Oscillator Start-up Time */ -#define AT91_CKGR_MCFR (AT91_PMC + 0x24)/* Main Clock Frequency Register */ +#define AT91_CKGR_MCFR 0x24/* Main Clock Frequency Register */ #define AT91_PMC_MAINF (0xffff << 0)/* Main Clock Frequency */ #define AT91_PMC_MAINRDY (1 << 16)/* Main Clock Ready */ -#define AT91_CKGR_PLLAR (AT91_PMC + 0x28)/* PLL A Register */ -#define AT91_CKGR_PLLBR (AT91_PMC + 0x2c)/* PLL B Register */ +#define AT91_CKGR_PLLAR 0x28/* PLL A Register */ +#define AT91_CKGR_PLLBR 0x2c/* PLL B Register */ #define AT91_PMC_DIV (0xff << 0)/* Divider */ #define AT91_PMC_PLLCOUNT (0x3f << 8)/* PLL Counter */ #define AT91_PMC_OUT (3 << 14)/* PLL Clock Frequency Range */
@@ -67,7 +67,7 @@#define AT91_PMC_USBDIV_4 (2 << 28)#define AT91_PMC_USB96M (1 << 28)/* Divider by 2 Enable (PLLB only) */ -#define AT91_PMC_MCKR (AT91_PMC + 0x30)/* Master Clock Register */ +#define AT91_PMC_MCKR 0x30/* Master Clock Register */ #define AT91_PMC_CSS (3 << 0)/* Master Clock Selection */ #define AT91_PMC_CSS_SLOW (0 << 0)#define AT91_PMC_CSS_MAIN (1 << 0)
@@ -99,20 +99,20 @@#define AT91_PMC_PLLADIV2_OFF (0 << 12)#define AT91_PMC_PLLADIV2_ON (1 << 12) -#define AT91_PMC_USB (AT91_PMC + 0x38)/* USB Clock Register [some SAM9 only] */ +#define AT91_PMC_USB 0x38/* USB Clock Register [some SAM9 only] */ #define AT91_PMC_USBS (0x1 << 0)/* USB OHCI Input clock selection */ #define AT91_PMC_USBS_PLLA (0 << 0)#define AT91_PMC_USBS_UPLL (1 << 0)#define AT91_PMC_OHCIUSBDIV (0xF << 8)/* Divider for USB OHCI Clock */ -#define AT91_PMC_PCKR (n) (AT91_PMC + 0x40 + ((n) * 4))/* Programmable Clock 0-N Registers */ +#define AT91_PMC_PCKR (n) (0x40 + ((n) * 4))/* Programmable Clock 0-N Registers */ #define AT91_PMC_CSSMCK (0x1 << 8)/* CSS or Master Clock Selection */ #define AT91_PMC_CSSMCK_CSS (0 << 8)#define AT91_PMC_CSSMCK_MCK (1 << 8) -#define AT91_PMC_IER (AT91_PMC + 0x60)/* Interrupt Enable Register */ -#define AT91_PMC_IDR (AT91_PMC + 0x64)/* Interrupt Disable Register */ -#define AT91_PMC_SR (AT91_PMC + 0x68)/* Status Register */ +#define AT91_PMC_IER 0x60/* Interrupt Enable Register */ +#define AT91_PMC_IDR 0x64/* Interrupt Disable Register */ +#define AT91_PMC_SR 0x68/* Status Register */ #define AT91_PMC_MOSCS (1 << 0)/* MOSCS Flag */ #define AT91_PMC_LOCKA (1 << 1)/* PLLA Lock */ #define AT91_PMC_LOCKB (1 << 2)/* PLLB Lock */
@@ -123,11 +123,11 @@#define AT91_PMC_PCK1RDY (1 << 9)/* Programmable Clock 1 */ #define AT91_PMC_PCK2RDY (1 << 10)/* Programmable Clock 2 */ #define AT91_PMC_PCK3RDY (1 << 11)/* Programmable Clock 3 */ -#define AT91_PMC_IMR (AT91_PMC + 0x6c)/* Interrupt Mask Register */ +#define AT91_PMC_IMR 0x6c/* Interrupt Mask Register */ -#define AT91_PMC_PROT (AT91_PMC + 0xe4)/* Protect Register [AT91CAP9 revC only] */ +#define AT91_PMC_PROT 0xe4/* Protect Register [AT91CAP9 revC only] */ #define AT91_PMC_PROTKEY 0x504d4301/* Activation Code */ -#define AT91_PMC_VER (AT91_PMC + 0xfc)/* PMC Module Version [AT91CAP9 only] */ +#define AT91_PMC_VER 0xfc/* PMC Module Version [AT91CAP9 only] */ #endif
arch/arm/mach-at91/include/mach/at91cap9.h +1 -1
@@ -95,7 +95,7 @@#define AT91CAP9_PIOB (0xfffff400 - AT91_BASE_SYS)#define AT91CAP9_PIOC (0xfffff600 - AT91_BASE_SYS)#define AT91CAP9_PIOD (0xfffff800 - AT91_BASE_SYS) -#define AT91_PMC (0xfffffc00 - AT91_BASE_SYS) +#define AT91CAP9_PMC (0xfffffc00 - AT91_BASE_SYS)#define AT91_RSTC (0xfffffd00 - AT91_BASE_SYS)#define AT91_SHDWC (0xfffffd10 - AT91_BASE_SYS)#define AT91CAP9_RTT (0xfffffd20 - AT91_BASE_SYS)
arch/arm/mach-at91/include/mach/at91rm9200.h +1 -1
@@ -88,7 +88,7 @@#define AT91RM9200_PIOB (0xfffff600 - AT91_BASE_SYS)/* PIO Controller B */ #define AT91RM9200_PIOC (0xfffff800 - AT91_BASE_SYS)/* PIO Controller C */ #define AT91RM9200_PIOD (0xfffffa00 - AT91_BASE_SYS)/* PIO Controller D */ -#define AT91_PMC (0xfffffc00 - AT91_BASE_SYS)/* Power Management Controller */ +#define AT91RM9200_PMC (0xfffffc00 - AT91_BASE_SYS)/* Power Management Controller */ #define AT91_ST (0xfffffd00 - AT91_BASE_SYS)/* System Timer */ #define AT91RM9200_RTC (0xfffffe00 - AT91_BASE_SYS)/* Real-Time Clock */ #define AT91_MC (0xffffff00 - AT91_BASE_SYS)/* Memory Controllers */
arch/arm/mach-at91/include/mach/at91sam9260.h +1 -1
@@ -93,7 +93,7 @@#define AT91SAM9260_PIOA (0xfffff400 - AT91_BASE_SYS)#define AT91SAM9260_PIOB (0xfffff600 - AT91_BASE_SYS)#define AT91SAM9260_PIOC (0xfffff800 - AT91_BASE_SYS) -#define AT91_PMC (0xfffffc00 - AT91_BASE_SYS) +#define AT91SAM9260_PMC (0xfffffc00 - AT91_BASE_SYS)#define AT91_RSTC (0xfffffd00 - AT91_BASE_SYS)#define AT91_SHDWC (0xfffffd10 - AT91_BASE_SYS)#define AT91SAM9260_RTT (0xfffffd20 - AT91_BASE_SYS)
arch/arm/mach-at91/include/mach/at91sam9261.h +1 -1
@@ -76,7 +76,7 @@#define AT91SAM9261_PIOA (0xfffff400 - AT91_BASE_SYS)#define AT91SAM9261_PIOB (0xfffff600 - AT91_BASE_SYS)#define AT91SAM9261_PIOC (0xfffff800 - AT91_BASE_SYS) -#define AT91_PMC (0xfffffc00 - AT91_BASE_SYS) +#define AT91SAM9261_PMC (0xfffffc00 - AT91_BASE_SYS)#define AT91_RSTC (0xfffffd00 - AT91_BASE_SYS)#define AT91_SHDWC (0xfffffd10 - AT91_BASE_SYS)#define AT91SAM9261_RTT (0xfffffd20 - AT91_BASE_SYS)
arch/arm/mach-at91/include/mach/at91sam9263.h +1 -1
@@ -92,7 +92,7 @@#define AT91SAM9263_PIOC (0xfffff600 - AT91_BASE_SYS)#define AT91SAM9263_PIOD (0xfffff800 - AT91_BASE_SYS)#define AT91SAM9263_PIOE (0xfffffa00 - AT91_BASE_SYS) -#define AT91_PMC (0xfffffc00 - AT91_BASE_SYS) +#define AT91SAM9263_PMC (0xfffffc00 - AT91_BASE_SYS)#define AT91_RSTC (0xfffffd00 - AT91_BASE_SYS)#define AT91_SHDWC (0xfffffd10 - AT91_BASE_SYS)#define AT91SAM9263_RTT0 (0xfffffd20 - AT91_BASE_SYS)
arch/arm/mach-at91/include/mach/at91sam9g45.h +1 -1
@@ -102,7 +102,7 @@#define AT91SAM9G45_PIOC (0xfffff600 - AT91_BASE_SYS)#define AT91SAM9G45_PIOD (0xfffff800 - AT91_BASE_SYS)#define AT91SAM9G45_PIOE (0xfffffa00 - AT91_BASE_SYS) -#define AT91_PMC (0xfffffc00 - AT91_BASE_SYS) +#define AT91SAM9G45_PMC (0xfffffc00 - AT91_BASE_SYS)#define AT91_RSTC (0xfffffd00 - AT91_BASE_SYS)#define AT91_SHDWC (0xfffffd10 - AT91_BASE_SYS)#define AT91SAM9G45_RTT (0xfffffd20 - AT91_BASE_SYS)
arch/arm/mach-at91/include/mach/at91sam9rl.h +1 -1
@@ -84,7 +84,7 @@#define AT91SAM9RL_PIOB (0xfffff600 - AT91_BASE_SYS)#define AT91SAM9RL_PIOC (0xfffff800 - AT91_BASE_SYS)#define AT91SAM9RL_PIOD (0xfffffa00 - AT91_BASE_SYS) -#define AT91_PMC (0xfffffc00 - AT91_BASE_SYS) +#define AT91SAM9RL_PMC (0xfffffc00 - AT91_BASE_SYS)#define AT91_RSTC (0xfffffd00 - AT91_BASE_SYS)#define AT91_SHDWC (0xfffffd10 - AT91_BASE_SYS)#define AT91SAM9RL_RTT (0xfffffd20 - AT91_BASE_SYS)
arch/arm/mach-at91/include/mach/at91x40.h +6 -3
@@ -36,14 +36,17 @@#define AT91_EBI (0xffe00000 - AT91_BASE_SYS)/* External Bus Interface */ #define AT91X40_SF (0xfff00000 - AT91_BASE_SYS)/* Special Function */ -#define AT91_USART1 (0xfffcc000 - AT91_BASE_SYS)/* USART 1 */ -#define AT91_USART0 (0xfffd0000 - AT91_BASE_SYS)/* USART 0 */ +#define AT91X40_USART1 (0xfffcc000 - AT91_BASE_SYS)/* USART 1 */ +#define AT91X40_USART0 (0xfffd0000 - AT91_BASE_SYS)/* USART 0 */ #define AT91_TC (0xfffe0000 - AT91_BASE_SYS)/* Timer Counter */ #define AT91X40_PIOA (0xffff0000 - AT91_BASE_SYS)/* PIO Controller A */ #define AT91X40_PS (0xffff4000 - AT91_BASE_SYS)/* Power Save */ #define AT91X40_WD (0xffff8000 - AT91_BASE_SYS)/* Watchdog Timer */ #define AT91X40_AIC (0xfffff000 - AT91_BASE_SYS)/* Advanced Interrupt Controller */ +#define AT91_USART0 AT91X40_USART0 +#define AT91_USART1 AT91X40_USART1 +/* * The AT91x40 series doesn't have a debug unit like the other AT91 parts. * But it does have a chip identify register and extension ID, so define at
@@ -56,7 +59,7 @@/* * Support defines for the simple Power Controller module. */ -#define AT91_PS_CR (AT91X40_PS + 0)/* PS Control register */ +#define AT91_PS_CR (0x00)/* PS Control register */ #define AT91_PS_CR_CPU (1 << 0)/* CPU clock disable bit */ #endif /* AT91X40_H */
arch/arm/mach-at91/include/mach/cpu.h +1 -1
@@ -83,7 +83,7 @@ static inline unsigned long at91_sram_size(void)static inline unsigned long at91cap9_rev_identify (void ) { -return (at91_sys_read (AT91_PMC_VER )); +return (at91_sys_read (AT91CAP9_PMC +AT91_PMC_VER )); }#endif
arch/arm/mach-at91/include/mach/system.h +5 -20
@@ -22,29 +22,14 @@#define __ASM_ARCH_SYSTEM_H#include <mach/hardware.h> -#include <mach/at91_st.h> -#include <mach/at91_dbgu.h> -#include <mach/at91_pmc.h> + +void (*at91_arch_idle)(void );static inline void arch_idle (void ) { -/* -* Disable the processor clock. The processor will be automatically -* re-enabled by an interrupt or by a reset. -*/ -#ifdef AT91X40_PS -at91_sys_write (AT91X40_PS_CR ,AT91_PS_CR_CPU ); -#else -at91_sys_write (AT91_PMC_SCDR ,AT91_PMC_PCK ); -#endif -#ifndef CONFIG_CPU_ARM920T -/* -* Set the processor (CP15) into 'Wait for Interrupt' mode. -* Post-RM9200 processors need this in conjunction with the above -* to save power when idle. -*/ -cpu_do_idle (); -#endif +/* call the CPU-specific idle function */ +if (at91_arch_idle) + (at91_arch_idle)(); }void (*at91_arch_reset)(void );
arch/arm/mach-at91/pm.c +2 -50
70 lines not on this page · raw message
arch/arm/mach-at91/pm_slowclock.S +21 -23
144 lines not on this page · raw message
drivers/usb/gadget/atmel_usba_udc.c +3 -3
@@ -332,12 +332,12 @@ static int vbus_is_present(struct usba_udc *udc)static void toggle_bias (int is_on) { -unsigned int uckr =at91_sys_read (AT91_CKGR_UCKR ); +unsigned int uckr =at91_sys_read (AT91SAM9RL_PMC +AT91_CKGR_UCKR );if (is_on) -at91_sys_write (AT91_CKGR_UCKR , uckr |AT91_PMC_BIASEN ); +at91_sys_write (AT91SAM9RL_PMC +AT91_CKGR_UCKR , uckr |AT91_PMC_BIASEN );else -at91_sys_write (AT91_CKGR_UCKR , uckr & ~(AT91_PMC_BIASEN )); +at91_sys_write (AT91SAM9RL_PMC +AT91_CKGR_UCKR , uckr & ~(AT91_PMC_BIASEN )); }#else
Hello,
it's just the subject that catched my attention:
$SUBJECT ~= s/depenent/dependent/
Best regards
Uwe
Signature · 2 lines
Pengutronix e.K. | Uwe Kleine-K?nig | Industrial Linux Solutions | http://www.pengutronix.de/ |
Quoted 9 lines · Andrew Victor
For supporting multiple AT91 processors in a single kernel image, the base address of the PMC controller cannot be calculated at compile-time. Changes required:
* calculate PMC base address in processor-dependent code and pass it through to the clocks driver at initialization time.
*arch_idle()need to call into processor-dependent code to put the CPU to sleep. Added an 'at91_arch_idle' callback.
* Moveat91_pm_verify_clocks()frompm.ctoclocks.c
* Rename definitions ofAT91_PMCtoAT91xxx_PMC.
no need the PMC is at the same address on all soc
with my patch that update the AT91_BASE_SYS to allow the same map io all at91 we do not need have a specific PMC base address
Best Regards,
J.
hi Jean-Christophe,
Quoted 1 line
no need the PMC is at the same address on all soc
That just happens to be the case with the currently-released ARM9-based AT91's. You just need to look at the base-addresses of the other system-peripherals to see there is not much consistency.
So I don't want to design a system that will break (or that we have to hack around) if/when Atmel releases a new processor where the PMC is at a different address.
Regards,
Andrew Victor
Quoted 11 lines · Andrew Victor
hi Jean-Christophe,
Quoted 1 line
no need the PMC is at the same address on all soc
That just happens to be the case with the currently-released ARM9-based AT91's. You just need to look at the base-addresses of the other system-peripherals to see there is not much consistency.
So I don't want to design a system that will break (or that we have to hack around) if/when Atmel releases a new processor where the PMC is at a different address.
even the new 5Series have the same PMC
Best Regards,
J.