subject:"\[PATCH v4 1\/2\] watchdog\:OMAP3\:Register IVA and SECURE WDT, make clks accessible"

Re: [PATCH v4 1/2] watchdog:OMAP3:Register IVA and SECURE WDT, make clks accessible

2009-06-22 Thread Kevin Hilman

Ulrik Bech Hald  writes:

> Enabling registration of IVA and SECURE WDT devices. Making
> ick and fck for IVA and SECURE WDTs accessible.
>
> Tested on Zoom1 OMAP3 platform
>
> Signed-off-by: Ulrik Bech Hald 

One more change still needed... You should start the platform_device
numbering at zero, not one.

Kevin

> ---
>  arch/arm/mach-omap1/clock.c |6 +-
>  arch/arm/mach-omap2/clock24xx.c |4 +-
>  arch/arm/mach-omap2/clock34xx.c |   12 +++---
>  arch/arm/plat-omap/devices.c|   91 
> ---
>  4 files changed, 86 insertions(+), 27 deletions(-)
>
> diff --git a/arch/arm/mach-omap1/clock.c b/arch/arm/mach-omap1/clock.c
> index 436eed2..c0b5849 100644
> --- a/arch/arm/mach-omap1/clock.c
> +++ b/arch/arm/mach-omap1/clock.c
> @@ -85,9 +85,9 @@ static struct omap_clk omap_clks[] = {
>   CLK(NULL,   "arm_gpio_ck",  &arm_gpio_ck,   CK_1510 | CK_310),
>   CLK(NULL,   "armxor_ck",&armxor_ck.clk, CK_16XX | CK_1510 | 
> CK_310),
>   CLK(NULL,   "armtim_ck",&armtim_ck.clk, CK_16XX | CK_1510 | 
> CK_310),
> - CLK("omap_wdt", "fck",  &armwdt_ck.clk, CK_16XX | CK_1510 | 
> CK_310),
> - CLK("omap_wdt", "ick",  &armper_ck.clk, CK_16XX),
> - CLK("omap_wdt", "ick",  &dummy_ck,  CK_1510 | CK_310),
> + CLK("omap_wdt.2", "fck",&armwdt_ck.clk, CK_16XX | CK_1510 | 
> CK_310),
> + CLK("omap_wdt.2", "ick",&armper_ck.clk, CK_16XX),
> + CLK("omap_wdt.2", "ick",&dummy_ck,  CK_1510 | CK_310),
>   CLK(NULL,   "arminth_ck",   &arminth_ck1510, CK_1510 | CK_310),
>   CLK(NULL,   "arminth_ck",   &arminth_ck16xx, CK_16XX),
>   /* CK_GEN2 clocks */
> diff --git a/arch/arm/mach-omap2/clock24xx.c b/arch/arm/mach-omap2/clock24xx.c
> index 44de027..4fe3def
> --- a/arch/arm/mach-omap2/clock24xx.c
> +++ b/arch/arm/mach-omap2/clock24xx.c
> @@ -165,8 +165,8 @@ static struct omap_clk omap24xx_clks[] = {
>   CLK(NULL,   "uart3_fck",&uart3_fck, CK_243X | CK_242X),
>   CLK(NULL,   "gpios_ick",&gpios_ick, CK_243X | CK_242X),
>   CLK(NULL,   "gpios_fck",&gpios_fck, CK_243X | CK_242X),
> - CLK("omap_wdt", "ick",  &mpu_wdt_ick,   CK_243X | CK_242X),
> - CLK("omap_wdt", "fck",  &mpu_wdt_fck,   CK_243X | CK_242X),
> + CLK("omap_wdt.2", "ick",&mpu_wdt_ick,   CK_243X | CK_242X),
> + CLK("omap_wdt.2", "fck",&mpu_wdt_fck,   CK_243X | CK_242X),
>   CLK(NULL,   "sync_32k_ick", &sync_32k_ick,  CK_243X | CK_242X),
>   CLK(NULL,   "wdt1_ick", &wdt1_ick,  CK_243X | CK_242X),
>   CLK(NULL,   "omapctrl_ick", &omapctrl_ick,  CK_243X | CK_242X),
> diff --git a/arch/arm/mach-omap2/clock34xx.c b/arch/arm/mach-omap2/clock34xx.c
> index 045da92..a4613e5 100644
> --- a/arch/arm/mach-omap2/clock34xx.c
> +++ b/arch/arm/mach-omap2/clock34xx.c
> @@ -215,11 +215,11 @@ static struct omap_clk omap34xx_clks[] = {
>   CLK(NULL,   "gpt1_fck", &gpt1_fck,  CK_343X),
>   CLK(NULL,   "wkup_32k_fck", &wkup_32k_fck,  CK_343X),
>   CLK(NULL,   "gpio1_dbck",   &gpio1_dbck,CK_343X),
> - CLK("omap_wdt", "fck",  &wdt2_fck,  CK_343X),
> + CLK("omap_wdt.2", "fck",&wdt2_fck,  CK_343X),
>   CLK(NULL,   "wkup_l4_ick",  &wkup_l4_ick,   CK_343X),
>   CLK(NULL,   "usim_ick", &usim_ick,  CK_3430ES2),
> - CLK("omap_wdt", "ick",  &wdt2_ick,  CK_343X),
> - CLK(NULL,   "wdt1_ick", &wdt1_ick,  CK_343X),
> + CLK("omap_wdt.2", "ick",&wdt2_ick,  CK_343X),
> + CLK("omap_wdt.1", "ick",&wdt1_ick,  CK_343X),
>   CLK(NULL,   "gpio1_ick",&gpio1_ick, CK_343X),
>   CLK(NULL,   "omap_32ksync_ick", &omap_32ksync_ick, CK_343X),
>   CLK(NULL,   "gpt12_ick",&gpt12_ick, CK_343X),
> @@ -241,14 +241,14 @@ static struct omap_clk omap34xx_clks[] = {
>   CLK(NULL,   "gpio4_dbck",   &gpio4_dbck,CK_343X),
>   CLK(NULL,   "gpio3_dbck",   &gpio3_dbck,CK_343X),
>   CLK(NULL,   "gpio2_dbck",   &gpio2_dbck,CK_343X),
> - CLK(NULL,   "wdt3_fck", &wdt3_fck,  CK_343X),
> + CLK("omap_wdt.3", "fck",&wdt3_fck,  CK_343X),
>   CLK(NULL,   "per_l4_ick",   &per_l4_ick,CK_343X),
>   CLK(NULL,   "gpio6_ick",&gpio6_ick, CK_343X),
>   CLK(NULL,   "gpio5_ick",&gpio5_ick, CK_343X),
>   CLK(NULL,   "gpio4_ick",&gpio4_ick, CK_343X),
>   CLK(NULL,   "gpio3_ick",&gpio3_ick, CK_343X),
>   CLK(NULL,   "gpio2_ick",&gpio2_ick, CK_343X),
> - CLK(NULL,   "wdt3_ick", &wdt3_ick,  CK_343X),
> + CLK("omap_wdt.3", "ick",&wdt3_ick,  CK_343X),
>   CLK(NULL,   "uart3_ick",&uart3_ick, CK_343X),
>   CLK(NULL,   "gpt9_ick", &gpt9_ick,  CK_343X),
>   CLK(NULL,

Re: [PATCH v4 1/2] watchdog:OMAP3:Register IVA and SECURE WDT, make clks accessible

2009-06-22 Thread Tony Lindgren

* Ulrik Bech Hald  [090617 22:06]:
> Enabling registration of IVA and SECURE WDT devices. Making
> ick and fck for IVA and SECURE WDTs accessible.
> 
> Tested on Zoom1 OMAP3 platform
> 
> Signed-off-by: Ulrik Bech Hald 
> ---
>  arch/arm/mach-omap1/clock.c |6 +-
>  arch/arm/mach-omap2/clock24xx.c |4 +-
>  arch/arm/mach-omap2/clock34xx.c |   12 +++---
>  arch/arm/plat-omap/devices.c|   91 
> ---
>  4 files changed, 86 insertions(+), 27 deletions(-)
> 
> diff --git a/arch/arm/mach-omap1/clock.c b/arch/arm/mach-omap1/clock.c
> index 436eed2..c0b5849 100644
> --- a/arch/arm/mach-omap1/clock.c
> +++ b/arch/arm/mach-omap1/clock.c
> @@ -85,9 +85,9 @@ static struct omap_clk omap_clks[] = {
>   CLK(NULL,   "arm_gpio_ck",  &arm_gpio_ck,   CK_1510 | CK_310),
>   CLK(NULL,   "armxor_ck",&armxor_ck.clk, CK_16XX | CK_1510 | 
> CK_310),
>   CLK(NULL,   "armtim_ck",&armtim_ck.clk, CK_16XX | CK_1510 | 
> CK_310),
> - CLK("omap_wdt", "fck",  &armwdt_ck.clk, CK_16XX | CK_1510 | 
> CK_310),
> - CLK("omap_wdt", "ick",  &armper_ck.clk, CK_16XX),
> - CLK("omap_wdt", "ick",  &dummy_ck,  CK_1510 | CK_310),
> + CLK("omap_wdt.2", "fck",&armwdt_ck.clk, CK_16XX | CK_1510 | 
> CK_310),
> + CLK("omap_wdt.2", "ick",&armper_ck.clk, CK_16XX),
> + CLK("omap_wdt.2", "ick",&dummy_ck,  CK_1510 | CK_310),
>   CLK(NULL,   "arminth_ck",   &arminth_ck1510, CK_1510 | CK_310),
>   CLK(NULL,   "arminth_ck",   &arminth_ck16xx, CK_16XX),
>   /* CK_GEN2 clocks */
> diff --git a/arch/arm/mach-omap2/clock24xx.c b/arch/arm/mach-omap2/clock24xx.c
> index 44de027..4fe3def
> --- a/arch/arm/mach-omap2/clock24xx.c
> +++ b/arch/arm/mach-omap2/clock24xx.c
> @@ -165,8 +165,8 @@ static struct omap_clk omap24xx_clks[] = {
>   CLK(NULL,   "uart3_fck",&uart3_fck, CK_243X | CK_242X),
>   CLK(NULL,   "gpios_ick",&gpios_ick, CK_243X | CK_242X),
>   CLK(NULL,   "gpios_fck",&gpios_fck, CK_243X | CK_242X),
> - CLK("omap_wdt", "ick",  &mpu_wdt_ick,   CK_243X | CK_242X),
> - CLK("omap_wdt", "fck",  &mpu_wdt_fck,   CK_243X | CK_242X),
> + CLK("omap_wdt.2", "ick",&mpu_wdt_ick,   CK_243X | CK_242X),
> + CLK("omap_wdt.2", "fck",&mpu_wdt_fck,   CK_243X | CK_242X),
>   CLK(NULL,   "sync_32k_ick", &sync_32k_ick,  CK_243X | CK_242X),
>   CLK(NULL,   "wdt1_ick", &wdt1_ick,  CK_243X | CK_242X),
>   CLK(NULL,   "omapctrl_ick", &omapctrl_ick,  CK_243X | CK_242X),
> diff --git a/arch/arm/mach-omap2/clock34xx.c b/arch/arm/mach-omap2/clock34xx.c
> index 045da92..a4613e5 100644
> --- a/arch/arm/mach-omap2/clock34xx.c
> +++ b/arch/arm/mach-omap2/clock34xx.c
> @@ -215,11 +215,11 @@ static struct omap_clk omap34xx_clks[] = {
>   CLK(NULL,   "gpt1_fck", &gpt1_fck,  CK_343X),
>   CLK(NULL,   "wkup_32k_fck", &wkup_32k_fck,  CK_343X),
>   CLK(NULL,   "gpio1_dbck",   &gpio1_dbck,CK_343X),
> - CLK("omap_wdt", "fck",  &wdt2_fck,  CK_343X),
> + CLK("omap_wdt.2", "fck",&wdt2_fck,  CK_343X),
>   CLK(NULL,   "wkup_l4_ick",  &wkup_l4_ick,   CK_343X),
>   CLK(NULL,   "usim_ick", &usim_ick,  CK_3430ES2),
> - CLK("omap_wdt", "ick",  &wdt2_ick,  CK_343X),
> - CLK(NULL,   "wdt1_ick", &wdt1_ick,  CK_343X),
> + CLK("omap_wdt.2", "ick",&wdt2_ick,  CK_343X),
> + CLK("omap_wdt.1", "ick",&wdt1_ick,  CK_343X),
>   CLK(NULL,   "gpio1_ick",&gpio1_ick, CK_343X),
>   CLK(NULL,   "omap_32ksync_ick", &omap_32ksync_ick, CK_343X),
>   CLK(NULL,   "gpt12_ick",&gpt12_ick, CK_343X),
> @@ -241,14 +241,14 @@ static struct omap_clk omap34xx_clks[] = {
>   CLK(NULL,   "gpio4_dbck",   &gpio4_dbck,CK_343X),
>   CLK(NULL,   "gpio3_dbck",   &gpio3_dbck,CK_343X),
>   CLK(NULL,   "gpio2_dbck",   &gpio2_dbck,CK_343X),
> - CLK(NULL,   "wdt3_fck", &wdt3_fck,  CK_343X),
> + CLK("omap_wdt.3", "fck",&wdt3_fck,  CK_343X),
>   CLK(NULL,   "per_l4_ick",   &per_l4_ick,CK_343X),
>   CLK(NULL,   "gpio6_ick",&gpio6_ick, CK_343X),
>   CLK(NULL,   "gpio5_ick",&gpio5_ick, CK_343X),
>   CLK(NULL,   "gpio4_ick",&gpio4_ick, CK_343X),
>   CLK(NULL,   "gpio3_ick",&gpio3_ick, CK_343X),
>   CLK(NULL,   "gpio2_ick",&gpio2_ick, CK_343X),
> - CLK(NULL,   "wdt3_ick", &wdt3_ick,  CK_343X),
> + CLK("omap_wdt.3", "ick",&wdt3_ick,  CK_343X),
>   CLK(NULL,   "uart3_ick",&uart3_ick, CK_343X),
>   CLK(NULL,   "gpt9_ick", &gpt9_ick,  CK_343X),
>   CLK(NULL,   "gpt8_ick", &gpt8_ick,  CK_343X),
> @@ -275,7 +275,7 @@ static struct omap_clk om

[PATCH v4 1/2] watchdog:OMAP3:Register IVA and SECURE WDT, make clks accessible

2009-06-17 Thread Ulrik Bech Hald

Enabling registration of IVA and SECURE WDT devices. Making
ick and fck for IVA and SECURE WDTs accessible.

Tested on Zoom1 OMAP3 platform

Signed-off-by: Ulrik Bech Hald 
---
 arch/arm/mach-omap1/clock.c |6 +-
 arch/arm/mach-omap2/clock24xx.c |4 +-
 arch/arm/mach-omap2/clock34xx.c |   12 +++---
 arch/arm/plat-omap/devices.c|   91 ---
 4 files changed, 86 insertions(+), 27 deletions(-)

diff --git a/arch/arm/mach-omap1/clock.c b/arch/arm/mach-omap1/clock.c
index 436eed2..c0b5849 100644
--- a/arch/arm/mach-omap1/clock.c
+++ b/arch/arm/mach-omap1/clock.c
@@ -85,9 +85,9 @@ static struct omap_clk omap_clks[] = {
CLK(NULL,   "arm_gpio_ck",  &arm_gpio_ck,   CK_1510 | CK_310),
CLK(NULL,   "armxor_ck",&armxor_ck.clk, CK_16XX | CK_1510 | 
CK_310),
CLK(NULL,   "armtim_ck",&armtim_ck.clk, CK_16XX | CK_1510 | 
CK_310),
-   CLK("omap_wdt", "fck",  &armwdt_ck.clk, CK_16XX | CK_1510 | 
CK_310),
-   CLK("omap_wdt", "ick",  &armper_ck.clk, CK_16XX),
-   CLK("omap_wdt", "ick",  &dummy_ck,  CK_1510 | CK_310),
+   CLK("omap_wdt.2", "fck",&armwdt_ck.clk, CK_16XX | CK_1510 | 
CK_310),
+   CLK("omap_wdt.2", "ick",&armper_ck.clk, CK_16XX),
+   CLK("omap_wdt.2", "ick",&dummy_ck,  CK_1510 | CK_310),
CLK(NULL,   "arminth_ck",   &arminth_ck1510, CK_1510 | CK_310),
CLK(NULL,   "arminth_ck",   &arminth_ck16xx, CK_16XX),
/* CK_GEN2 clocks */
diff --git a/arch/arm/mach-omap2/clock24xx.c b/arch/arm/mach-omap2/clock24xx.c
index 44de027..4fe3def
--- a/arch/arm/mach-omap2/clock24xx.c
+++ b/arch/arm/mach-omap2/clock24xx.c
@@ -165,8 +165,8 @@ static struct omap_clk omap24xx_clks[] = {
CLK(NULL,   "uart3_fck",&uart3_fck, CK_243X | CK_242X),
CLK(NULL,   "gpios_ick",&gpios_ick, CK_243X | CK_242X),
CLK(NULL,   "gpios_fck",&gpios_fck, CK_243X | CK_242X),
-   CLK("omap_wdt", "ick",  &mpu_wdt_ick,   CK_243X | CK_242X),
-   CLK("omap_wdt", "fck",  &mpu_wdt_fck,   CK_243X | CK_242X),
+   CLK("omap_wdt.2", "ick",&mpu_wdt_ick,   CK_243X | CK_242X),
+   CLK("omap_wdt.2", "fck",&mpu_wdt_fck,   CK_243X | CK_242X),
CLK(NULL,   "sync_32k_ick", &sync_32k_ick,  CK_243X | CK_242X),
CLK(NULL,   "wdt1_ick", &wdt1_ick,  CK_243X | CK_242X),
CLK(NULL,   "omapctrl_ick", &omapctrl_ick,  CK_243X | CK_242X),
diff --git a/arch/arm/mach-omap2/clock34xx.c b/arch/arm/mach-omap2/clock34xx.c
index 045da92..a4613e5 100644
--- a/arch/arm/mach-omap2/clock34xx.c
+++ b/arch/arm/mach-omap2/clock34xx.c
@@ -215,11 +215,11 @@ static struct omap_clk omap34xx_clks[] = {
CLK(NULL,   "gpt1_fck", &gpt1_fck,  CK_343X),
CLK(NULL,   "wkup_32k_fck", &wkup_32k_fck,  CK_343X),
CLK(NULL,   "gpio1_dbck",   &gpio1_dbck,CK_343X),
-   CLK("omap_wdt", "fck",  &wdt2_fck,  CK_343X),
+   CLK("omap_wdt.2", "fck",&wdt2_fck,  CK_343X),
CLK(NULL,   "wkup_l4_ick",  &wkup_l4_ick,   CK_343X),
CLK(NULL,   "usim_ick", &usim_ick,  CK_3430ES2),
-   CLK("omap_wdt", "ick",  &wdt2_ick,  CK_343X),
-   CLK(NULL,   "wdt1_ick", &wdt1_ick,  CK_343X),
+   CLK("omap_wdt.2", "ick",&wdt2_ick,  CK_343X),
+   CLK("omap_wdt.1", "ick",&wdt1_ick,  CK_343X),
CLK(NULL,   "gpio1_ick",&gpio1_ick, CK_343X),
CLK(NULL,   "omap_32ksync_ick", &omap_32ksync_ick, CK_343X),
CLK(NULL,   "gpt12_ick",&gpt12_ick, CK_343X),
@@ -241,14 +241,14 @@ static struct omap_clk omap34xx_clks[] = {
CLK(NULL,   "gpio4_dbck",   &gpio4_dbck,CK_343X),
CLK(NULL,   "gpio3_dbck",   &gpio3_dbck,CK_343X),
CLK(NULL,   "gpio2_dbck",   &gpio2_dbck,CK_343X),
-   CLK(NULL,   "wdt3_fck", &wdt3_fck,  CK_343X),
+   CLK("omap_wdt.3", "fck",&wdt3_fck,  CK_343X),
CLK(NULL,   "per_l4_ick",   &per_l4_ick,CK_343X),
CLK(NULL,   "gpio6_ick",&gpio6_ick, CK_343X),
CLK(NULL,   "gpio5_ick",&gpio5_ick, CK_343X),
CLK(NULL,   "gpio4_ick",&gpio4_ick, CK_343X),
CLK(NULL,   "gpio3_ick",&gpio3_ick, CK_343X),
CLK(NULL,   "gpio2_ick",&gpio2_ick, CK_343X),
-   CLK(NULL,   "wdt3_ick", &wdt3_ick,  CK_343X),
+   CLK("omap_wdt.3", "ick",&wdt3_ick,  CK_343X),
CLK(NULL,   "uart3_ick",&uart3_ick, CK_343X),
CLK(NULL,   "gpt9_ick", &gpt9_ick,  CK_343X),
CLK(NULL,   "gpt8_ick", &gpt8_ick,  CK_343X),
@@ -275,7 +275,7 @@ static struct omap_clk omap34xx_clks[] = {
CLK(NULL,   "sr_l4_ick",&sr_l4_ick, CK_343X),
CLK(NULL,

Re: [PATCH v4 1/2] watchdog:OMAP3:Register IVA and SECURE WDT, make clks accessible

Re: [PATCH v4 1/2] watchdog:OMAP3:Register IVA and SECURE WDT, make clks accessible

[PATCH v4 1/2] watchdog:OMAP3:Register IVA and SECURE WDT, make clks accessible

3 matches

Site Navigation

Mail list logo

Footer information