diff options
author | Arnd Bergmann <arnd@arndb.de> | 2012-03-02 08:22:28 -0500 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2012-03-02 08:22:28 -0500 |
commit | 48b3b08e00012382cb52099e509b529305ae0a00 (patch) | |
tree | 0b5ff03c195707e3e545731121bc4537a3b42ac4 /include/linux | |
parent | 6e1d521b9d1201214ec4a67a7e4360232be5f963 (diff) | |
parent | f75622f4679479d352d2fa83e0d84c6c13cfcb5f (diff) |
Merge branch 'at91-3.4-cleanup2+DT' of git://github.com/at91linux/linux-at91 into next/dt
* 'at91-3.4-cleanup2+DT' of git://github.com/at91linux/linux-at91: (22 commits)
ARM: at91: at91sam9x5cm/dt: add leds support
ARM: at91: usb_a9g20/dt: add gpio-keys support
ARM: at91: at91sam9m10g45ek/dt: add gpio-keys support
ARM: at91: at91sam9m10g45ek/dt: add leds support
ARM: at91: usb_a9g20/dt: add leds support
ARM: at91/pio: add new PIO3 features
ARM: at91: add sam9_smc.o to at91sam9x5 build
ARM: at91/tc/clocksource: Add 32 bit variant to Timer Counter
ARM: at91/tc: add device tree support to atmel_tclib
ARM: at91/tclib: take iomem size from resource
ARM: at91/pit: add traces in case of error
ARM: at91: pit add DT support
ARM: at91: AIC and GPIO IRQ device tree initialization
ARM: at91/board-dt: remove AIC irq domain from board file
ARM: at91/gpio: remove the static specification of gpio_chip.base
ARM: at91/gpio: add .to_irq gpio_chip handler
ARM: at91/gpio: non-DT builds do not have gpio_chip.of_node field
ARM: at91/gpio: add irqdomain and DT support
ARM: at91/gpio: change comments and one variable name
ARM/USB: at91/ohci-at91: remove the use of irq_to_gpio
...
Diffstat (limited to 'include/linux')
-rw-r--r-- | include/linux/atmel_tc.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/include/linux/atmel_tc.h b/include/linux/atmel_tc.h index 53ba65e30caa..1d14b1dc1aee 100644 --- a/include/linux/atmel_tc.h +++ b/include/linux/atmel_tc.h | |||
@@ -34,10 +34,19 @@ | |||
34 | struct clk; | 34 | struct clk; |
35 | 35 | ||
36 | /** | 36 | /** |
37 | * struct atmel_tcb_config - SoC data for a Timer/Counter Block | ||
38 | * @counter_width: size in bits of a timer counter register | ||
39 | */ | ||
40 | struct atmel_tcb_config { | ||
41 | size_t counter_width; | ||
42 | }; | ||
43 | |||
44 | /** | ||
37 | * struct atmel_tc - information about a Timer/Counter Block | 45 | * struct atmel_tc - information about a Timer/Counter Block |
38 | * @pdev: physical device | 46 | * @pdev: physical device |
39 | * @iomem: resource associated with the I/O register | 47 | * @iomem: resource associated with the I/O register |
40 | * @regs: mapping through which the I/O registers can be accessed | 48 | * @regs: mapping through which the I/O registers can be accessed |
49 | * @tcb_config: configuration data from SoC | ||
41 | * @irq: irq for each of the three channels | 50 | * @irq: irq for each of the three channels |
42 | * @clk: internal clock source for each of the three channels | 51 | * @clk: internal clock source for each of the three channels |
43 | * @node: list node, for tclib internal use | 52 | * @node: list node, for tclib internal use |
@@ -54,6 +63,7 @@ struct atmel_tc { | |||
54 | struct platform_device *pdev; | 63 | struct platform_device *pdev; |
55 | struct resource *iomem; | 64 | struct resource *iomem; |
56 | void __iomem *regs; | 65 | void __iomem *regs; |
66 | struct atmel_tcb_config *tcb_config; | ||
57 | int irq[3]; | 67 | int irq[3]; |
58 | struct clk *clk[3]; | 68 | struct clk *clk[3]; |
59 | struct list_head node; | 69 | struct list_head node; |