-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
ns9xxx: prepare for adding support for Digi ns921x processors
The hardware team changed some things that were taken as being common to all ns9xxx processors up to now. This patch addresses: - irqs: s/IRQ_/IRQ_NS9360_/ - system module registers: some registers are still general, their definition lives now in include/asm-arm/arch-ns9xxx/regs-sys-common.h. The ns9360 specific ones are in .../regs-sys-ns9360.h As a result ns9360_systemclock cannot be static inline any more as its definition needs regs-sys-ns9360.h. This becomes a real problem when adding support for ns9215 as this will need regs-sys-ns9215.h and including both files will not work. For the same reason ns9360_reset() is now non-inline and gpio functions live in their own file. - register mapping: s/ns9xxx_map_io/ns9360_map_io/ - timer registers: move time.c to time-ns9360.c; s/ns9xxx_timer/ns9360_timer/ Signed-off-by: Uwe Kleine-König <Uwe.Kleine-Koenig@digi.com>
- Loading branch information
Uwe Kleine-König
authored and
Uwe Kleine-König
committed
Mar 31, 2008
1 parent
3a58134
commit 724ce5e
Showing
19 changed files
with
407 additions
and
308 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,118 @@ | ||
| /* | ||
| * arch/arm/mach-ns9xxx/gpio-ns9360.c | ||
| * | ||
| * Copyright (C) 2006,2007 by Digi International Inc. | ||
| * All rights reserved. | ||
| * | ||
| * 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 published by | ||
| * the Free Software Foundation. | ||
| */ | ||
| #include <linux/bug.h> | ||
| #include <linux/errno.h> | ||
| #include <linux/io.h> | ||
| #include <linux/kernel.h> | ||
| #include <linux/module.h> | ||
|
|
||
| #include <asm/arch-ns9xxx/regs-bbu.h> | ||
| #include <asm/arch-ns9xxx/processor-ns9360.h> | ||
|
|
||
| #include "gpio-ns9360.h" | ||
|
|
||
| static inline int ns9360_valid_gpio(unsigned gpio) | ||
| { | ||
| return gpio <= 72; | ||
| } | ||
|
|
||
| static inline void __iomem *ns9360_gpio_get_gconfaddr(unsigned gpio) | ||
| { | ||
| if (gpio < 56) | ||
| return BBU_GCONFb1(gpio / 8); | ||
| else | ||
| /* | ||
| * this could be optimised away on | ||
| * ns9750 only builds, but it isn't ... | ||
| */ | ||
| return BBU_GCONFb2((gpio - 56) / 8); | ||
| } | ||
|
|
||
| static inline void __iomem *ns9360_gpio_get_gctrladdr(unsigned gpio) | ||
| { | ||
| if (gpio < 32) | ||
| return BBU_GCTRL1; | ||
| else if (gpio < 64) | ||
| return BBU_GCTRL2; | ||
| else | ||
| /* this could be optimised away on ns9750 only builds */ | ||
| return BBU_GCTRL3; | ||
| } | ||
|
|
||
| static inline void __iomem *ns9360_gpio_get_gstataddr(unsigned gpio) | ||
| { | ||
| if (gpio < 32) | ||
| return BBU_GSTAT1; | ||
| else if (gpio < 64) | ||
| return BBU_GSTAT2; | ||
| else | ||
| /* this could be optimised away on ns9750 only builds */ | ||
| return BBU_GSTAT3; | ||
| } | ||
|
|
||
| /* | ||
| * each gpio can serve for 4 different purposes [0..3]. These are called | ||
| * "functions" and passed in the parameter func. Functions 0-2 are always some | ||
| * special things, function 3 is GPIO. If func == 3 dir specifies input or | ||
| * output, and with inv you can enable an inverter (independent of func). | ||
| */ | ||
| int __ns9360_gpio_configure(unsigned gpio, int dir, int inv, int func) | ||
| { | ||
| void __iomem *conf = ns9360_gpio_get_gconfaddr(gpio); | ||
| u32 confval; | ||
|
|
||
| confval = __raw_readl(conf); | ||
| REGSETIM_IDX(confval, BBU_GCONFx, DIR, gpio & 7, dir); | ||
| REGSETIM_IDX(confval, BBU_GCONFx, INV, gpio & 7, inv); | ||
| REGSETIM_IDX(confval, BBU_GCONFx, FUNC, gpio & 7, func); | ||
| __raw_writel(confval, conf); | ||
|
|
||
| return 0; | ||
| } | ||
|
|
||
| int ns9360_gpio_configure(unsigned gpio, int inv, int func) | ||
| { | ||
| if (likely(ns9360_valid_gpio(gpio))) { | ||
| if (func == 3) { | ||
| printk(KERN_WARNING "use gpio_direction_input " | ||
| "or gpio_direction_output\n"); | ||
| return -EINVAL; | ||
| } else | ||
| return __ns9360_gpio_configure(gpio, 0, inv, func); | ||
| } else | ||
| return -EINVAL; | ||
| } | ||
| EXPORT_SYMBOL(ns9360_gpio_configure); | ||
|
|
||
| int ns9360_gpio_get_value(unsigned gpio) | ||
| { | ||
| void __iomem *stat = ns9360_gpio_get_gstataddr(gpio); | ||
| int ret; | ||
|
|
||
| ret = 1 & (__raw_readl(stat) >> (gpio & 31)); | ||
|
|
||
| return ret; | ||
| } | ||
|
|
||
| void ns9360_gpio_set_value(unsigned gpio, int value) | ||
| { | ||
| void __iomem *ctrl = ns9360_gpio_get_gctrladdr(gpio); | ||
| u32 ctrlval; | ||
|
|
||
| ctrlval = __raw_readl(ctrl); | ||
|
|
||
| if (value) | ||
| ctrlval |= 1 << (gpio & 31); | ||
| else | ||
| ctrlval &= ~(1 << (gpio & 31)); | ||
|
|
||
| __raw_writel(ctrlval, ctrl); | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| /* | ||
| * arch/arm/mach-ns9xxx/gpio-ns9360.h | ||
| * | ||
| * Copyright (C) 2006,2007 by Digi International Inc. | ||
| * All rights reserved. | ||
| * | ||
| * 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 published by | ||
| * the Free Software Foundation. | ||
| */ | ||
| int __ns9360_gpio_configure(unsigned gpio, int dir, int inv, int func); | ||
| int ns9360_gpio_get_value(unsigned gpio); | ||
| void ns9360_gpio_set_value(unsigned gpio, int value); |
Oops, something went wrong.