| Message ID | 20120810124820.GA20557@game.jcrosoft.org |
|---|---|
| State | New |
| Headers | show |
On Fri, Aug 10, 2012 at 03:02:05PM +0200, Jean-Christophe PLAGNIOL-VILLARD wrote: > Cc: Linus Walleij <linus.walleij@linaro.org> > Cc: Nicolas Ferre <nicolas.ferre@atmel.com> > Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> > Cc: linux-serial@vger.kernel.org > --- > Hi Greg, > > if you don't mind I would like to apply with the rest of the pinctrl > patch series No objection from me: Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012/8/10 Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>: > This is also include the gpio controller as the IP share both. > Each soc will have to describe the SoC limitation and pin configuration via > DT. > > This will allow to do not need to touch the C code when adding new SoC if the > IP version is supported. > > Cc: Linus Walleij <linus.walleij@linaro.org> > Cc: Nicolas Ferre <nicolas.ferre@atmel.com> > Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> > --- > .../bindings/pinctrl/atmel,at91-pinctrl.txt | 84 ++ > arch/arm/Kconfig | 1 + > arch/arm/mach-at91/board-dt.c | 2 - > arch/arm/mach-at91/gpio.c | 165 +-- > drivers/pinctrl/Kconfig | 9 + > drivers/pinctrl/Makefile | 1 + > drivers/pinctrl/pinctrl-at91.c | 1448 ++++++++++++++++++++ > 7 files changed, 1548 insertions(+), 162 deletions(-) > create mode 100644 Documentation/devicetree/bindings/pinctrl/atmel,at91-pinctrl.txt > create mode 100644 drivers/pinctrl/pinctrl-at91.c > > diff --git a/Documentation/devicetree/bindings/pinctrl/atmel,at91-pinctrl.txt b/Documentation/devicetree/bindings/pinctrl/atmel,at91-pinctrl.txt > new file mode 100644 > index 0000000..0296ef4 > --- /dev/null > +++ b/Documentation/devicetree/bindings/pinctrl/atmel,at91-pinctrl.txt > @@ -0,0 +1,84 @@ > +* Atmel AT91 Pinmux Controller > + > +The AT91 Pinmux Controler, enables the IC > +to share one PAD to several functional blocks. The sharing is done by > +multiplexing the PAD input/output signals. For each PAD there are up to > +8 muxing options (called periph modes). Since different modules require > +different PAD settings (like pull up, keeper, etc) the contoller controls > +also the PAD settings parameters. > + > +Please refer to pinctrl-bindings.txt in this directory for details of the > +common pinctrl bindings used by client devices, including the meaning of the > +phrase "pin configuration node". > + > +Atmel AT91 pin configuration node is a node of a group of pins which can be > +used for a specific device or function. This node represents both mux and config > +of the pins in that group. The 'pins' selects the function mode(also named pin > +mode) this pin can work on and the 'config' configures various pad settings > +such as pull-up, multi drive, etc. > + > +Required properties for iomux controller: > +- compatible: "atmel,at91rm9200-pinctrl" > +- atmel,mux-mask: array of mask (periph per bank) to describe if a pin can be > + configured in this periph mode. All the periph and bank need to be describe. > + > +Required properties for pin configuration node: > +- atmel,pins: 4 integers array, represents a group of pins mux and config > + setting. The format is atmel,pins = <PIN_BANK PIN_BANK_NUM PERIPH CONFIG>. > + The PERIPH 0 means gpio. > + > +Bits used for CONFIG: > +PULL_UP(1 << 0): indicate this pin need a pull up. > +MULTIDRIVE(1 << 1): indicate this pin need to be configured as multidrive. > + > +NOTE: > +Some requirements for using atmel,at91rm9200-pinctrl binding: > +1. We have pin function node defined under at91 controller node to represent > + what pinmux functions this SoC supports. > +2. The pin configuration node intends to work on a specific function should > + to be defined under that specific function node. > + The function node's name should represent well about what function > + this group of pins in this pin configuration node are working on. > +3. The driver can use the function node's name and pin configuration node's > + name describe the pin function and group hierarchy. > + For example, Linux Iat91 pinctrl driver takes the function node's name It seems to be a typo : Iat91 > + as the function name and pin configuration node's name as group name to > + create the map table. > +4. Each pin configuration node should have a phandle, devices can set pins > + configurations by referring to the phandle of that pin configuration node. > +5. The gpio controller must be describe in the pinctrl simple-bus. > + > +Examples: > + > +pinctrl@fffff400 { > + #address-cells = <1>; > + #size-cells = <1>; > + ranges; > + compatible = "atmel,at91rm9200-pinctrl", "simple-bus"; > + reg = <0xfffff400 0x600>; > + > + atmel,mux-mask = < > + /* A B */ > + 0xffffffff 0xffc00c3b /* pioA */ > + 0xffffffff 0x7fff3ccf /* pioB */ > + 0xffffffff 0x007fffff /* pioC */ > + >; > + > + /* shared pinctrl settings */ > + dbgu { > + pinctrl_dbgu: dbgu-0 { > + atmel,pins = > + <1 14 0x1 0x0 /* PB14 periph A */ > + 1 15 0x1 0x1>; /* PB15 periph with pullup */ > + }; > + }; > +}; > + > +dbgu: serial@fffff200 { > + compatible = "atmel,at91sam9260-usart"; > + reg = <0xfffff200 0x200>; > + interrupts = <1 4 7>; > + pinctrl-names = "default"; > + pinctrl-0 = <&pinctrl_dbgu>; > + status = "disabled"; > +}; > diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig > index e91c7cd..178a619 100644 > --- a/arch/arm/Kconfig > +++ b/arch/arm/Kconfig > @@ -352,6 +352,7 @@ config ARCH_AT91 > select CLKDEV_LOOKUP > select IRQ_DOMAIN > select NEED_MACH_IO_H if PCCARD > + select PINCTRL > help > This enables support for systems based on Atmel > AT91RM9200 and AT91SAM9* processors. There's a problem with this: if CONFIG_PINCRTL is forced on ARCH_AT91 and PINCTRL_AT91 is not selected, all calls to devm_pinctrl_get_select_default() will fail. => no serial, no nand etc.. IMHO, CONFIG_PINCTRL should not be forced, otherwise it will break configs that don't want pinctrl Or, if pinctrl is the new and only way, PINCTRL_AT91 should also be forced on ARCH_AT91 > diff --git a/arch/arm/mach-at91/board-dt.c b/arch/arm/mach-at91/board-dt.c > index e8f45c4..3b6a948 100644 > --- a/arch/arm/mach-at91/board-dt.c > +++ b/arch/arm/mach-at91/board-dt.c > @@ -30,8 +30,6 @@ > static const struct of_device_id irq_of_match[] __initconst = { > > { .compatible = "atmel,at91rm9200-aic", .data = at91_aic_of_init }, > - { .compatible = "atmel,at91rm9200-gpio", .data = at91_gpio_of_irq_setup }, > - { .compatible = "atmel,at91sam9x5-gpio", .data = at91_gpio_of_irq_setup }, > { /*sentinel*/ } > }; > > diff --git a/arch/arm/mach-at91/gpio.c b/arch/arm/mach-at91/gpio.c > index 8b476fd..67d7fab 100644 > --- a/arch/arm/mach-at91/gpio.c > +++ b/arch/arm/mach-at91/gpio.c > @@ -23,8 +23,6 @@ > #include <linux/io.h> > #include <linux/irqdomain.h> > #include <linux/of_address.h> > -#include <linux/of_irq.h> > -#include <linux/of_gpio.h> > > #include <asm/mach/irq.h> > > @@ -719,80 +717,6 @@ postcore_initcall(at91_gpio_debugfs_init); > */ > static struct lock_class_key gpio_lock_class; > > -#if defined(CONFIG_OF) > -static int at91_gpio_irq_map(struct irq_domain *h, unsigned int virq, > - irq_hw_number_t hw) > -{ > - struct at91_gpio_chip *at91_gpio = h->host_data; > - > - irq_set_lockdep_class(virq, &gpio_lock_class); > - > - /* > - * Can use the "simple" and not "edge" handler since it's > - * shorter, and the AIC handles interrupts sanely. > - */ > - irq_set_chip_and_handler(virq, &gpio_irqchip, > - handle_simple_irq); > - set_irq_flags(virq, IRQF_VALID); > - irq_set_chip_data(virq, at91_gpio); > - > - return 0; > -} > - > -static struct irq_domain_ops at91_gpio_ops = { > - .map = at91_gpio_irq_map, > - .xlate = irq_domain_xlate_twocell, > -}; > - > -int __init at91_gpio_of_irq_setup(struct device_node *node, > - struct device_node *parent) > -{ > - struct at91_gpio_chip *prev = NULL; > - int alias_idx = of_alias_get_id(node, "gpio"); > - struct at91_gpio_chip *at91_gpio = &gpio_chip[alias_idx]; > - > - /* Setup proper .irq_set_type function */ > - if (has_pio3()) > - gpio_irqchip.irq_set_type = alt_gpio_irq_type; > - else > - gpio_irqchip.irq_set_type = gpio_irq_type; > - > - /* Disable irqs of this PIO controller */ > - __raw_writel(~0, at91_gpio->regbase + PIO_IDR); > - > - /* Setup irq domain */ > - at91_gpio->domain = irq_domain_add_linear(node, at91_gpio->chip.ngpio, > - &at91_gpio_ops, at91_gpio); > - if (!at91_gpio->domain) > - panic("at91_gpio.%d: couldn't allocate irq domain (DT).\n", > - at91_gpio->pioc_idx); > - > - /* Setup chained handler */ > - if (at91_gpio->pioc_idx) > - prev = &gpio_chip[at91_gpio->pioc_idx - 1]; > - > - /* The toplevel handler handles one bank of GPIOs, except > - * on some SoC it can handles up to three... > - * We only set up the handler for the first of the list. > - */ > - if (prev && prev->next == at91_gpio) > - return 0; > - > - at91_gpio->pioc_virq = irq_create_mapping(irq_find_host(parent), > - at91_gpio->pioc_hwirq); > - irq_set_chip_data(at91_gpio->pioc_virq, at91_gpio); > - irq_set_chained_handler(at91_gpio->pioc_virq, gpio_irq_handler); > - > - return 0; > -} > -#else > -int __init at91_gpio_of_irq_setup(struct device_node *node, > - struct device_node *parent) > -{ > - return -EINVAL; > -} > -#endif > - > /* > * irqdomain initialization: pile up irqdomains on top of AIC range > */ > @@ -996,85 +920,6 @@ err: > return -EINVAL; > } > > -#ifdef CONFIG_OF_GPIO > -static void __init of_at91_gpio_init_one(struct device_node *np) > -{ > - int alias_idx; > - struct at91_gpio_chip *at91_gpio; > - uint32_t ngpio; > - > - if (!np) > - return; > - > - alias_idx = of_alias_get_id(np, "gpio"); > - if (alias_idx >= MAX_GPIO_BANKS) { > - pr_err("at91_gpio, failed alias idx(%d) > MAX_GPIO_BANKS(%d), ignoring.\n", > - alias_idx, MAX_GPIO_BANKS); > - return; > - } > - > - at91_gpio = &gpio_chip[alias_idx]; > - at91_gpio->chip.base = alias_idx * MAX_NB_GPIO_PER_BANK; > - > - at91_gpio->regbase = of_iomap(np, 0); > - if (!at91_gpio->regbase) { > - pr_err("at91_gpio.%d, failed to map registers, ignoring.\n", > - alias_idx); > - return; > - } > - > - /* Get the interrupts property */ > - if (of_property_read_u32(np, "interrupts", &at91_gpio->pioc_hwirq)) { > - pr_err("at91_gpio.%d, failed to get interrupts property, ignoring.\n", > - alias_idx); > - goto ioremap_err; > - } > - > - /* Get capabilities from compatibility property */ > - if (of_device_is_compatible(np, "atmel,at91sam9x5-gpio")) > - at91_gpio_caps |= AT91_GPIO_CAP_PIO3; > - > - if (!of_property_read_u32(np, "gpio-nb", &ngpio)) { > - if (ngpio >= MAX_NB_GPIO_PER_BANK) > - pr_err("at91_gpio.%d, gpio-nb >= %d failback to %d\n", > - alias_idx, MAX_NB_GPIO_PER_BANK, MAX_NB_GPIO_PER_BANK); > - else > - at91_gpio->chip.ngpio = ngpio; > - } > - > - /* Setup clock */ > - if (at91_gpio_setup_clk(alias_idx)) > - goto ioremap_err; > - > - at91_gpio->chip.of_node = np; > - gpio_banks = max(gpio_banks, alias_idx + 1); > - at91_gpio->pioc_idx = alias_idx; > - return; > - > -ioremap_err: > - iounmap(at91_gpio->regbase); > -} > - > -static int __init of_at91_gpio_init(void) > -{ > - struct device_node *np = NULL; > - > - /* > - * This isn't ideal, but it gets things hooked up until this > - * driver is converted into a platform_device > - */ > - for_each_compatible_node(np, NULL, "atmel,at91rm9200-gpio") > - of_at91_gpio_init_one(np); > - > - return gpio_banks > 0 ? 0 : -EINVAL; > -} > -#else > -static int __init of_at91_gpio_init(void) > -{ > - return -EINVAL; > -} > -#endif > - > static void __init at91_gpio_init_one(int idx, u32 regbase, int pioc_hwirq) > { > struct at91_gpio_chip *at91_gpio = &gpio_chip[idx]; > @@ -1109,11 +954,11 @@ void __init at91_gpio_init(struct at91_gpio_bank *data, int nr_banks) > > BUG_ON(nr_banks > MAX_GPIO_BANKS); > > - if (of_at91_gpio_init() < 0) { > - /* No GPIO controller found in device tree */ > - for (i = 0; i < nr_banks; i++) > - at91_gpio_init_one(i, data[i].regbase, data[i].id); > - } > + if (of_have_populated_dt()) > + return; > + > + for (i = 0; i < nr_banks; i++) > + at91_gpio_init_one(i, data[i].regbase, data[i].id); > > for (i = 0; i < gpio_banks; i++) { > at91_gpio = &gpio_chip[i]; > diff --git a/drivers/pinctrl/Kconfig b/drivers/pinctrl/Kconfig > index 54e3588..953932a 100644 > --- a/drivers/pinctrl/Kconfig > +++ b/drivers/pinctrl/Kconfig > @@ -26,6 +26,15 @@ config DEBUG_PINCTRL > help > Say Y here to add some extra checks and diagnostics to PINCTRL calls. > > +config PINCTRL_AT91 > + bool "AT91 pinctrl driver" > + depends on OF > + depends on ARCH_AT91 > + select PINMUX > + select PINCONF > + help > + Say Y here to enable the at91 pinctrl driver > + > config PINCTRL_IMX > bool > select PINMUX > diff --git a/drivers/pinctrl/Makefile b/drivers/pinctrl/Makefile > index f40b1f8..d3fda00 100644 > --- a/drivers/pinctrl/Makefile > +++ b/drivers/pinctrl/Makefile > @@ -9,6 +9,7 @@ ifeq ($(CONFIG_OF),y) > obj-$(CONFIG_PINCTRL) += devicetree.o > endif > obj-$(CONFIG_GENERIC_PINCONF) += pinconf-generic.o > +obj-$(CONFIG_PINCTRL_AT91) += pinctrl-at91.o > obj-$(CONFIG_PINCTRL_IMX) += pinctrl-imx.o > obj-$(CONFIG_PINCTRL_IMX51) += pinctrl-imx51.o > obj-$(CONFIG_PINCTRL_IMX53) += pinctrl-imx53.o > diff --git a/drivers/pinctrl/pinctrl-at91.c b/drivers/pinctrl/pinctrl-at91.c > new file mode 100644 > index 0000000..540943b > --- /dev/null > +++ b/drivers/pinctrl/pinctrl-at91.c > @@ -0,0 +1,1448 @@ > +/* > + * at91 pinctrl driver based on at91 pinmux core > + * > + * Copyright (C) 2011-2012 Jean-Christophe PLAGNIOL-VILLARD > + * <plagnioj@jcrosoft.com> > + * > + * Under GPLv2 only > + */ > + > +#define DEBUG Please remove that, it's already handled in CONFIG_DEBUG_PINCTRL option. > + > +#include <linux/clk.h> > +#include <linux/err.h> > +#include <linux/init.h> > +#include <linux/module.h> > +#include <linux/of.h> > +#include <linux/of_device.h> > +#include <linux/of_address.h> > +#include <linux/of_irq.h> > +#include <linux/slab.h> > +#include <linux/interrupt.h> > +#include <linux/irq.h> > +#include <linux/irqdomain.h> > +#include <linux/io.h> > +#include <linux/gpio.h> > +#include <linux/irqdomain.h> > +#include <linux/pinctrl/machine.h> > +#include <linux/pinctrl/pinconf.h> > +#include <linux/pinctrl/pinctrl.h> > +#include <linux/pinctrl/pinmux.h> > +/* Since we request GPIOs from ourself */ > +#include <linux/pinctrl/consumer.h> > + > +#include <asm/mach/irq.h> > + > +#include <mach/hardware.h> > +#include <mach/at91_pio.h> > + > +#include "core.h" > + > +#define MAX_NB_GPIO_PER_BANK 32 This can be factorized with the same define in arch/arm/mach-at91/gpio.c > + > +struct at91_gpio_chip { > + struct gpio_chip chip; > + struct pinctrl_gpio_range range; > + struct at91_gpio_chip *next; /* Bank sharing same clock */ > + int pioc_hwirq; /* PIO bank interrupt identifier on AIC */ > + int pioc_virq; /* PIO bank Linux virtual interrupt */ > + int pioc_idx; /* PIO bank index */ > + void __iomem *regbase; /* PIO bank virtual address */ > + struct clk *clock; /* associated clock */ > + struct irq_domain *domain; /* associated irq domain */ > +}; > + > +#define to_at91_gpio_chip(c) container_of(c, struct at91_gpio_chip, chip) > + > +static struct at91_gpio_chip *gpio_chip[MAX_GPIO_BANKS]; > + > +static int gpio_banks; > +static unsigned long at91_gpio_caps; > + > +/* All PIO controllers support PIO3 features */ > +#define AT91_GPIO_CAP_PIO3 (1 << 0) > + > +#define has_pio3() (at91_gpio_caps & AT91_GPIO_CAP_PIO3) > + > + > +#define PULL_UP (0 << 1) > +#define MULTI_DRIVE (1 << 1) > + > +/** > + * struct at91_pmx_func - describes AT91 pinmux functions > + * @name: the name of this specific function > + * @groups: corresponding pin groups > + * @ngroups: the number of groups > + */ > +struct at91_pmx_func { > + const char *name; > + const char **groups; > + unsigned ngroups; > +}; > + > +struct at91_pmx_pin { > + uint32_t bank; > + uint32_t pin; > + uint32_t mux; > + uint32_t pullup; > + unsigned long conf; > +}; > + > +/** > + * struct at91_pin_group - describes an At91 pin group > + * @name: the name of this specific pin group > + * @pins: an array of discrete physical pins used in this group, taken > + * from the driver-local pin enumeration space > + * @npins: the number of pins in this group array, i.e. the number of > + * elements in .pins so we can iterate over that array > + */ > +struct at91_pin_group { > + const char *name; > + struct at91_pmx_pin *pins_conf; > + unsigned int *pins; > + unsigned npins; > +}; > + > +struct at91_pinctrl { > + struct device *dev; > + struct pinctrl_dev *pctl; > + > + int nbanks; > + > + int nmux; > + uint32_t *mux_mask; > + > + struct at91_pmx_func *functions; > + int nfunctions; > + > + struct at91_pin_group *groups; > + int ngroups; > + > + void (*set_A_periph)(void __iomem *pio, unsigned mask); > + void (*set_B_periph)(void __iomem *pio, unsigned mask); > +}; > + > +static const inline struct at91_pin_group *at91_pinctrl_find_group_by_name( > + const struct at91_pinctrl *info, > + const char *name) > +{ > + const struct at91_pin_group *grp = NULL; > + int i; > + > + for (i = 0; i < info->ngroups; i++) { > + if (strcmp(info->groups[i].name, name)) > + continue; > + > + grp = &info->groups[i]; > + dev_dbg(info->dev, "%s: %d 0:%d\n", name, grp->npins, grp->pins[0]); > + break; > + } > + > + return grp; > +} > + > +static int at91_get_groups_count(struct pinctrl_dev *pctldev) > +{ > + struct at91_pinctrl *info = pinctrl_dev_get_drvdata(pctldev); > + > + return info->ngroups; > +} > + > +static const char *at91_get_group_name(struct pinctrl_dev *pctldev, > + unsigned selector) > +{ > + struct at91_pinctrl *info = pinctrl_dev_get_drvdata(pctldev); > + > + return info->groups[selector].name; > +} > + > +static int at91_get_group_pins(struct pinctrl_dev *pctldev, unsigned selector, > + const unsigned **pins, > + unsigned *npins) > +{ > + struct at91_pinctrl *info = pinctrl_dev_get_drvdata(pctldev); > + > + if (selector >= info->ngroups) > + return -EINVAL; > + > + *pins = info->groups[selector].pins; > + *npins = info->groups[selector].npins; > + > + return 0; > +} > + > +static void at91_pin_dbg_show(struct pinctrl_dev *pctldev, struct seq_file *s, > + unsigned offset) > +{ > + seq_printf(s, "%s", dev_name(pctldev->dev)); > +} > + > +static int at91_dt_node_to_map(struct pinctrl_dev *pctldev, > + struct device_node *np, > + struct pinctrl_map **map, unsigned *num_maps) > +{ > + struct at91_pinctrl *info = pinctrl_dev_get_drvdata(pctldev); > + const struct at91_pin_group *grp; > + struct pinctrl_map *new_map; > + struct device_node *parent; > + int map_num = 1; > + int i; > + struct at91_pmx_pin *pin; > + > + /* > + * first find the group of this node and check if we need create > + * config maps for pins > + */ > + grp = at91_pinctrl_find_group_by_name(info, np->name); > + if (!grp) { > + dev_err(info->dev, "unable to find group for node %s\n", > + np->name); > + return -EINVAL; > + } > + > + map_num += grp->npins; > + new_map = kmalloc(sizeof(*new_map) * map_num, GFP_KERNEL); > + if (!new_map) > + return -ENOMEM; > + > + *map = new_map; > + *num_maps = map_num; > + > + /* create mux map */ > + parent = of_get_parent(np); > + if (!parent) { > + kfree(new_map); > + return -EINVAL; > + } > + new_map[0].type = PIN_MAP_TYPE_MUX_GROUP; > + new_map[0].data.mux.function = parent->name; > + new_map[0].data.mux.group = np->name; > + of_node_put(parent); > + > + /* create config map */ > + new_map++; > + for (i = 0; i < grp->npins; i++) { > + pin = &grp->pins_conf[i]; > + > + new_map[i].type = PIN_MAP_TYPE_CONFIGS_PIN; > + new_map[i].data.configs.group_or_pin = > + pin_get_name(pctldev, grp->pins[i]); > + new_map[i].data.configs.configs = &grp->pins_conf[i].conf; > + new_map[i].data.configs.num_configs = 1; > + } > + > + dev_dbg(pctldev->dev, "maps: function %s group %s num %d\n", > + (*map)->data.mux.function, (*map)->data.mux.group, map_num); > + > + return 0; > +} > + > +static void at91_dt_free_map(struct pinctrl_dev *pctldev, > + struct pinctrl_map *map, unsigned num_maps) > +{ > + kfree(map); > +} > + > +static struct pinctrl_ops at91_pctrl_ops = { > + .get_groups_count = at91_get_groups_count, > + .get_group_name = at91_get_group_name, > + .get_group_pins = at91_get_group_pins, > + .pin_dbg_show = at91_pin_dbg_show, > + .dt_node_to_map = at91_dt_node_to_map, > + .dt_free_map = at91_dt_free_map, > + > +}; > + > +static void __iomem * pin_to_controller(struct at91_pinctrl *info, > + unsigned int bank) > +{ > + return gpio_chip[bank]->regbase; > +} > + > +static inline int pin_to_bank(unsigned pin) > +{ > + return pin /= MAX_NB_GPIO_PER_BANK; > +} > + > +static unsigned pin_to_mask(unsigned int pin) > +{ > + return 1 << pin; > +} > + > +static void at91_mux_disable_interrupt(void __iomem *pio, unsigned mask) > +{ > + __raw_writel(mask, pio + PIO_IDR); > +} > + > +static unsigned at91_mux_get_pullup(void __iomem *pio, unsigned pin) > +{ > + return (__raw_readl(pio + PIO_PUSR) >> pin) & 0x1; > +} > + > +static void at91_mux_set_pullup(void __iomem *pio, unsigned mask, unsigned on) > +{ > + __raw_writel(mask, pio + (on ? PIO_PUER : PIO_PUDR)); > +} > + > +static unsigned at91_mux_get_multidrive(void __iomem *pio, unsigned pin) > +{ > + return (__raw_readl(pio + PIO_MDSR) >> pin) & 0x1; > +} > + > +static void at91_mux_set_multidrive(void __iomem *pio, unsigned mask, unsigned on) > +{ > + __raw_writel(mask, pio + (on ? PIO_MDER : PIO_MDDR)); > +} > + > +static void at91_mux_pio3_set_A_periph(void __iomem *pio, unsigned mask) > +{ > + > + __raw_writel(__raw_readl(pio + PIO_ABCDSR1) & ~mask, > + pio + PIO_ABCDSR1); > + __raw_writel(__raw_readl(pio + PIO_ABCDSR2) & ~mask, > + pio + PIO_ABCDSR2); > +} > + > +static void at91_mux_pio3_set_B_periph(void __iomem *pio, unsigned mask) > +{ > + __raw_writel(__raw_readl(pio + PIO_ABCDSR1) | mask, > + pio + PIO_ABCDSR1); > + __raw_writel(__raw_readl(pio + PIO_ABCDSR2) & ~mask, > + pio + PIO_ABCDSR2); > +} > + > +static void at91_mux_set_A_periph(void __iomem *pio, unsigned mask) > +{ > + __raw_writel(mask, pio + PIO_ASR); > +} > + > +static void at91_mux_set_B_periph(void __iomem *pio, unsigned mask) > +{ > + __raw_writel(mask, pio + PIO_BSR); > +} > + > +static void at91_mux_set_C_periph(void __iomem *pio, unsigned mask) > +{ > + __raw_writel(__raw_readl(pio + PIO_ABCDSR1) & ~mask, pio + PIO_ABCDSR1); > + __raw_writel(__raw_readl(pio + PIO_ABCDSR2) | mask, pio + PIO_ABCDSR2); > +} > + > +static void at91_mux_set_D_periph(void __iomem *pio, unsigned mask) > +{ > + __raw_writel(__raw_readl(pio + PIO_ABCDSR1) | mask, pio + PIO_ABCDSR1); > + __raw_writel(__raw_readl(pio + PIO_ABCDSR2) | mask, pio + PIO_ABCDSR2); > +} > + > +static void at91_pin_dbg(const struct device *dev, const struct at91_pmx_pin *pin) > +{ > + if (pin->mux) { > + dev_dbg(dev, "pio%c%d configured as periph%c with conf = 0x%lu\n", > + pin->bank + 'A', pin->pin, pin->mux - 1 + 'A', pin->conf); > + } else { > + dev_dbg(dev, "pio%c%d configured as gpio with conf = 0x%lu\n", > + pin->bank + 'A', pin->pin, pin->conf); > + } > +} > + > +static int pin_check_config(struct at91_pinctrl *info, const char* name, > + int index, const struct at91_pmx_pin *pin) > +{ > + int mux; > + > + /* check if it's a valid config */ > + if (pin->bank >= info->nbanks) { > + dev_err(info->dev, "%s: pin conf %d bank_id %d >= nbanks %d\n", > + name, index, pin->bank, info->nbanks); > + return -EINVAL; > + } > + > + if (pin->pin >= 32) { > + dev_err(info->dev, "%s: pin conf %d pin_bank_id %d >= 32\n", > + name, index, pin->pin); > + return -EINVAL; > + } > + > + if (!pin->mux) > + return 0; > + > + mux = pin->mux - 1; > + > + if (mux >= info->nmux) { > + dev_err(info->dev, "%s: pin conf %d mux_id %d >= nmux %d\n", > + name, index, mux, info->nmux); > + return -EINVAL; > + } > + > + if (!(info->mux_mask[pin->bank * info->nmux + mux] & 1 << pin->pin)) { > + dev_err(info->dev, "%s: pin conf %d mux_id %d not supported for pio%c%d\n", > + name, index, mux, pin->bank + 'A', pin->pin); > + return -EINVAL; > + } > + > + return 0; > +} > + > +static void at91_mux_gpio_disable(void __iomem *pio, unsigned mask) > +{ > + __raw_writel(mask, pio + PIO_PDR); > +} > + > +static void at91_mux_gpio_enable(void __iomem *pio, unsigned mask, unsigned input) > +{ > + __raw_writel(mask, pio + PIO_PER); > + __raw_writel(mask, pio + (input ? PIO_ODR : PIO_OER)); > +} > + > +static int at91_pmx_enable(struct pinctrl_dev *pctldev, unsigned selector, > + unsigned group) > +{ > + struct at91_pinctrl *info = pinctrl_dev_get_drvdata(pctldev); > + const struct at91_pmx_pin *pins_conf = info->groups[group].pins_conf; > + const struct at91_pmx_pin *pin; > + uint32_t npins = info->groups[group].npins; > + int i, ret; > + unsigned mask; > + void __iomem *pio; > + > + dev_dbg(info->dev, "enable function %s group %s\n", > + info->functions[selector].name, info->groups[group].name); > + > + /* first check that all the pins of the group are valid with a valid > + * paramter */ > + for (i = 0; i < npins; i++) { > + pin = &pins_conf[i]; > + ret = pin_check_config(info, info->groups[group].name, i, pin); > + if (ret) > + return ret; > + } > + > + for (i = 0; i < npins; i++) { > + pin = &pins_conf[i]; > + at91_pin_dbg(info->dev, pin); > + pio = pin_to_controller(info, pin->bank); > + mask = pin_to_mask(pin->pin); > + at91_mux_disable_interrupt(pio, mask); > + switch(pin->mux) { > + case 0: > + at91_mux_gpio_enable(pio, mask, 1); > + break; > + case 1: > + info->set_A_periph(pio, mask); > + break; > + case 2: > + info->set_B_periph(pio, mask); > + break; > + case 3: > + at91_mux_set_C_periph(pio, mask); > + break; > + case 4: > + at91_mux_set_D_periph(pio, mask); > + break; > + } > + if (pin->mux) > + at91_mux_gpio_disable(pio, mask); > + } > + > + return 0; > +} > + > +static void at91_pmx_disable(struct pinctrl_dev *pctldev, unsigned selector, > + unsigned group) > +{ > + struct at91_pinctrl *info = pinctrl_dev_get_drvdata(pctldev); > + const struct at91_pmx_pin *pins_conf = info->groups[group].pins_conf; > + const struct at91_pmx_pin *pin; > + uint32_t npins = info->groups[group].npins; > + int i; > + unsigned mask; > + void __iomem *pio; > + > + for (i = 0; i < npins; i++) { > + pin = &pins_conf[i]; > + at91_pin_dbg(info->dev, pin); > + pio = pin_to_controller(info, pin->bank); > + mask = pin_to_mask(pin->pin); > + at91_mux_gpio_enable(pio, mask, 1); > + } > +} > + > +static int at91_pmx_get_funcs_count(struct pinctrl_dev *pctldev) > +{ > + struct at91_pinctrl *info = pinctrl_dev_get_drvdata(pctldev); > + > + return info->nfunctions; > +} > + > +static const char *at91_pmx_get_func_name(struct pinctrl_dev *pctldev, > + unsigned selector) > +{ > + struct at91_pinctrl *info = pinctrl_dev_get_drvdata(pctldev); > + > + return info->functions[selector].name; > +} > + > +static int at91_pmx_get_groups(struct pinctrl_dev *pctldev, unsigned selector, > + const char * const **groups, > + unsigned * const num_groups) > +{ > + struct at91_pinctrl *info = pinctrl_dev_get_drvdata(pctldev); > + > + *groups = info->functions[selector].groups; > + *num_groups = info->functions[selector].ngroups; > + > + return 0; > +} > + > +int at91_gpio_request_enable(struct pinctrl_dev *pctldev, > + struct pinctrl_gpio_range *range, > + unsigned offset) > +{ > + struct at91_pinctrl *npct = pinctrl_dev_get_drvdata(pctldev); > + struct at91_gpio_chip *at91_chip; > + struct gpio_chip *chip; > + unsigned mask; > + > + if (!range) { > + dev_err(npct->dev, "invalid range\n"); > + return -EINVAL; > + } > + if (!range->gc) { > + dev_err(npct->dev, "missing GPIO chip in range\n"); > + return -EINVAL; > + } > + chip = range->gc; > + at91_chip = container_of(chip, struct at91_gpio_chip, chip); > + > + dev_dbg(npct->dev, "enable pin %u as GPIO\n", offset); > + > + mask = 1 << (offset - chip->base); > + > + dev_dbg(npct->dev, "enable pin %u as PIO%c%d 0x%x\n", > + offset, 'A' + range->id, offset - chip->base, mask); > + > + __raw_writel(mask, at91_chip->regbase + PIO_PER); > + > + return 0; > +} > + > +void at91_gpio_disable_free(struct pinctrl_dev *pctldev, > + struct pinctrl_gpio_range *range, > + unsigned offset) > +{ > + struct at91_pinctrl *npct = pinctrl_dev_get_drvdata(pctldev); > + > + dev_dbg(npct->dev, "disable pin %u as GPIO\n", offset); > + /* Set the pin to some default state, GPIO is usually default */ > +} > + > +static struct pinmux_ops at91_pmx_ops = { > + .get_functions_count = at91_pmx_get_funcs_count, > + .get_function_name = at91_pmx_get_func_name, > + .get_function_groups = at91_pmx_get_groups, > + .enable = at91_pmx_enable, > + .disable = at91_pmx_disable, > + .gpio_request_enable = at91_gpio_request_enable, > + .gpio_disable_free = at91_gpio_disable_free, > +}; > + > +static int at91_pinconf_get(struct pinctrl_dev *pctldev, > + unsigned pin_id, unsigned long *config) > +{ > + struct at91_pinctrl *info = pinctrl_dev_get_drvdata(pctldev); > + void __iomem *pio; > + unsigned pin; > + > + dev_dbg(info->dev, "%s:%d, pin_id=%d, config=0x%lx", __func__, __LINE__, pin_id, *config); > + pio = pin_to_controller(info, pin_to_bank(pin_id)); > + pin = pin_id % MAX_NB_GPIO_PER_BANK; > + > + if (at91_mux_get_multidrive(pio, pin)) > + *config |= MULTI_DRIVE; > + > + if (at91_mux_get_pullup(pio, pin)) > + *config |= PULL_UP; > + > + return 0; > +} > + > +static int at91_pinconf_set(struct pinctrl_dev *pctldev, > + unsigned pin_id, unsigned long config) > +{ > + struct at91_pinctrl *info = pinctrl_dev_get_drvdata(pctldev); > + unsigned mask; > + void __iomem *pio; > + > + dev_dbg(info->dev, "%s:%d, pin_id=%d, config=0x%lx", __func__, __LINE__, pin_id, config); > + pio = pin_to_controller(info, pin_to_bank(pin_id)); > + mask = pin_to_mask(pin_id % MAX_NB_GPIO_PER_BANK); > + > + at91_mux_set_pullup(pio, mask, config & PULL_UP); > + at91_mux_set_multidrive(pio, mask, config & MULTI_DRIVE); > + return 0; > +} > + > +static void at91_pinconf_dbg_show(struct pinctrl_dev *pctldev, > + struct seq_file *s, unsigned pin_id) > +{ > + > +} > + > +static void at91_pinconf_group_dbg_show(struct pinctrl_dev *pctldev, > + struct seq_file *s, unsigned group) > +{ > +} > + > +struct pinconf_ops at91_pinconf_ops = { > + .pin_config_get = at91_pinconf_get, > + .pin_config_set = at91_pinconf_set, > + .pin_config_dbg_show = at91_pinconf_dbg_show, > + .pin_config_group_dbg_show = at91_pinconf_group_dbg_show, > +}; > + > +static struct pinctrl_desc at91_pinctrl_desc = { > + .pctlops = &at91_pctrl_ops, > + .pmxops = &at91_pmx_ops, > + .confops = &at91_pinconf_ops, > + .owner = THIS_MODULE, > +}; > + > +static const char *gpio_compat = "atmel,at91rm9200-gpio"; > + > +static void __devinit at91_pinctrl_child_count(struct at91_pinctrl *info, > + struct device_node *np) > +{ > + struct device_node *child; > + > + for_each_child_of_node(np, child) { > + if (of_device_is_compatible(child, gpio_compat)) { > + info->nbanks++; > + } else { > + info->nfunctions++; > + info->ngroups += of_get_child_count(child); > + } > + } > +} > + > +static int __devinit at91_pinctrl_mux_mask(struct at91_pinctrl *info, > + struct device_node *np) > +{ > + int ret = 0; > + int size; > + const const __be32 *list; > + > + list = of_get_property(np, "atmel,mux-mask", &size); > + if (!list) { > + dev_err(info->dev, "can not read the mux-mask of %d\n", size); > + return -EINVAL; > + } > + > + size /= sizeof(*list); > + if (!size || size % info->nbanks) { > + dev_err(info->dev, "wrong mux mask array should be by %d\n", info->nbanks); > + return -EINVAL; > + } > + info->nmux = size / info->nbanks; > + > + info->mux_mask = devm_kzalloc(info->dev, sizeof(u32) * size, GFP_KERNEL); > + if (!info->mux_mask) { > + dev_err(info->dev, "could not alloc mux_mask\n"); > + return -ENOMEM; > + } > + > + ret = of_property_read_u32_array(np, "atmel,mux-mask", > + info->mux_mask, size); > + if (ret) > + dev_err(info->dev, "can not read the mux-mask of %d\n", size); > + return ret; > +} > + > +static int __devinit at91_pinctrl_parse_groups(struct device_node *np, > + struct at91_pin_group *grp, > + struct at91_pinctrl *info, > + u32 index) > +{ > + struct at91_pmx_pin *pin; > + int size; > + const const __be32 *list; > + int i, j; > + > + dev_dbg(info->dev, "group(%d): %s\n", index, np->name); > + > + /* Initialise group */ > + grp->name = np->name; > + > + /* > + * the binding format is fsl,pins = <bank pin mux CONFIG ...>, > + * do sanity check and calculate pins number > + */ > + list = of_get_property(np, "atmel,pins", &size); > + /* we do not check return since it's safe node passed down */ > + size /= sizeof(*list); > + if (!size || size % 4) { > + dev_err(info->dev, "wrong pins number or pins and configs should be by 4\n"); > + return -EINVAL; > + } > + > + grp->npins = size / 4; > + pin = grp->pins_conf = devm_kzalloc(info->dev, grp->npins * sizeof(struct at91_pmx_pin), > + GFP_KERNEL); > + grp->pins = devm_kzalloc(info->dev, grp->npins * sizeof(unsigned int), > + GFP_KERNEL); > + if (!grp->pins_conf || !grp->pins) > + return -ENOMEM; > + > + for (i = 0, j = 0; i < size; i += 4, j++) { > + pin->bank = be32_to_cpu(*list++); > + pin->pin = be32_to_cpu(*list++); > + grp->pins[j] = pin->bank * MAX_NB_GPIO_PER_BANK + pin->pin; > + pin->mux = be32_to_cpu(*list++); > + pin->conf = be32_to_cpu(*list++); > + > + at91_pin_dbg(info->dev, pin); > + pin++; > + } > + > + return 0; > +} > + > +static int __devinit at91_pinctrl_parse_functions(struct device_node *np, > + struct at91_pinctrl *info, u32 index) > +{ > + struct device_node *child; > + struct at91_pmx_func *func; > + struct at91_pin_group *grp; > + int ret; > + static u32 grp_index; > + u32 i = 0; > + > + dev_dbg(info->dev, "parse function(%d): %s\n", index, np->name); > + > + func = &info->functions[index]; > + > + /* Initialise function */ > + func->name = np->name; > + func->ngroups = of_get_child_count(np); > + if (func->ngroups <= 0) { > + dev_err(info->dev, "no groups defined\n"); > + return -EINVAL; > + } > + func->groups = devm_kzalloc(info->dev, > + func->ngroups * sizeof(char *), GFP_KERNEL); > + if (!func->groups) > + return -ENOMEM; > + > + for_each_child_of_node(np, child) { > + func->groups[i] = child->name; > + grp = &info->groups[grp_index++]; > + ret = at91_pinctrl_parse_groups(child, grp, info, i++); > + if (ret) > + return ret; > + } > + > + return 0; > +} > + > +static int __devinit at91_pinctrl_probe_dt(struct platform_device *pdev, > + struct at91_pinctrl *info) > +{ > + int ret = 0; > + int i, j; > + uint32_t *tmp; > + struct device_node *np = pdev->dev.of_node; > + struct device_node *child; > + > + if (!np) > + return -ENODEV; > + > + info->dev = &pdev->dev; > + at91_pinctrl_child_count(info, np); > + > + if (info->nbanks < 1) { > + dev_err(&pdev->dev, "you need to specify atleast one gpio-controller\n"); > + return -EINVAL; > + } > + > + ret = at91_pinctrl_mux_mask(info, np); > + if (ret) > + return ret; > + > + dev_dbg(&pdev->dev, "nmux = %d\n", info->nmux); > + > + dev_dbg(&pdev->dev, "mux-mask\n"); > + tmp = info->mux_mask; > + for (i = 0; i < info->nbanks; i++) { > + for (j = 0; j < info->nmux; j++, tmp++) { > + dev_dbg(&pdev->dev, "%d:%d\t0x%x\n", i, j, tmp[0]); > + } > + } > + > + dev_dbg(&pdev->dev, "nfunctions = %d\n", info->nfunctions); > + dev_dbg(&pdev->dev, "ngroups = %d\n", info->ngroups); > + info->functions = devm_kzalloc(&pdev->dev, info->nfunctions * sizeof(struct at91_pmx_func), > + GFP_KERNEL); > + if (!info->functions) > + return -ENOMEM; > + > + info->groups = devm_kzalloc(&pdev->dev, info->ngroups * sizeof(struct at91_pin_group), > + GFP_KERNEL); > + if (!info->groups) > + return -ENOMEM; > + > + dev_dbg(&pdev->dev, "nbanks = %d\n", info->nbanks); > + dev_dbg(&pdev->dev, "nfunctions = %d\n", info->nfunctions); > + dev_dbg(&pdev->dev, "ngroups = %d\n", info->ngroups); > + > + i = 0; > + > + for_each_child_of_node(np, child) { > + if (of_device_is_compatible(child, gpio_compat)) > + continue; > + ret = at91_pinctrl_parse_functions(child, info, i++); > + if (ret) { > + dev_err(&pdev->dev, "failed to parse function\n"); > + return ret; > + } > + } > + > + return 0; > +} > + > +static int __devinit at91_pinctrl_probe(struct platform_device *pdev) > +{ > + struct at91_pinctrl *info; > + struct pinctrl_pin_desc *pdesc; > + int ret, i, j ,k; > + > + info = devm_kzalloc(&pdev->dev, sizeof(*info), GFP_KERNEL); > + if (!info) > + return -ENOMEM; > + > + ret = at91_pinctrl_probe_dt(pdev, info); > + if (ret) > + return ret; > + > + /* > + * We need all the GPIO drivers to probe FIRST, or we will not be able > + * to obtain references to the struct gpio_chip * for them, and we > + * need this to proceed. > + */ > + for (i = 0; i < info->nbanks; i++) { > + if (!gpio_chip[i]) { > + dev_warn(&pdev->dev, "GPIO chip %d not registered yet\n", i); > + devm_kfree(&pdev->dev, info); > + return -EPROBE_DEFER; > + } > + } > + > + at91_pinctrl_desc.name = dev_name(&pdev->dev); > + at91_pinctrl_desc.npins = info->nbanks * MAX_NB_GPIO_PER_BANK; > + at91_pinctrl_desc.pins = pdesc = > + devm_kzalloc(&pdev->dev, sizeof(*pdesc) * at91_pinctrl_desc.npins, GFP_KERNEL); > + > + if (!at91_pinctrl_desc.pins) > + return -ENOMEM; > + > + for (i = 0 , k = 0; i < info->nbanks; i++) { > + for (j = 0; j < 32; j++, k++) { > + pdesc->number = k; > + pdesc->name = kasprintf(GFP_KERNEL, "pio%c%d", i + 'A', j); > + pdesc++; > + } > + } > + > + info->set_A_periph = at91_mux_pio3_set_A_periph; > + info->set_B_periph = at91_mux_pio3_set_B_periph; > + > + if (has_pio3()) { > + info->set_A_periph = at91_mux_set_A_periph; > + info->set_B_periph = at91_mux_set_B_periph; > + } > + > + platform_set_drvdata(pdev, info); > + info->pctl = pinctrl_register(&at91_pinctrl_desc, &pdev->dev, info); > + > + if (!info->pctl) { > + dev_err(&pdev->dev, "could not register AT91 pinctrl driver\n"); > + ret = -EINVAL; > + goto err; > + } > + > + /* We will handle a range of GPIO pins */ > + for (i = 0; i < info->nbanks; i++) > + pinctrl_add_gpio_range(info->pctl, &gpio_chip[i]->range); > + > + dev_info(&pdev->dev, "initialized AT91 pinctrl driver\n"); > + > + return 0; > + > +err: > + return ret; > +} > + > +int __devexit at91_pinctrl_remove(struct platform_device *pdev) > +{ > + struct at91_pinctrl *info = platform_get_drvdata(pdev); > + > + pinctrl_unregister(info->pctl); > + > + return 0; > +} > + > +static int at91_gpio_request(struct gpio_chip *chip, unsigned offset) > +{ > + /* > + * Map back to global GPIO space and request muxing, the direction > + * parameter does not matter for this controller. > + */ > + int gpio = chip->base + offset; > + int bank = chip->base / chip->ngpio; > + > + dev_dbg(chip->dev, "%s:%d pio%c%d(%d)\n", __func__, __LINE__, > + 'A' + bank, offset, gpio); > + > + return pinctrl_request_gpio(gpio); > +} > + > +static void at91_gpio_free(struct gpio_chip *chip, unsigned offset) > +{ > + int gpio = chip->base + offset; > + > + pinctrl_free_gpio(gpio); > +} > + > +static int at91_gpio_direction_input(struct gpio_chip *chip, unsigned offset) > +{ > + struct at91_gpio_chip *at91_gpio = to_at91_gpio_chip(chip); > + void __iomem *pio = at91_gpio->regbase; > + unsigned mask = 1 << offset; > + > + __raw_writel(mask, pio + PIO_ODR); > + return 0; > +} > + > +static int at91_gpio_get(struct gpio_chip *chip, unsigned offset) > +{ > + struct at91_gpio_chip *at91_gpio = to_at91_gpio_chip(chip); > + void __iomem *pio = at91_gpio->regbase; > + unsigned mask = 1 << offset; > + u32 pdsr; > + > + pdsr = __raw_readl(pio + PIO_PDSR); > + return (pdsr & mask) != 0; > +} > + > +static void at91_gpio_set(struct gpio_chip *chip, unsigned offset, > + int val) > +{ > + struct at91_gpio_chip *at91_gpio = to_at91_gpio_chip(chip); > + void __iomem *pio = at91_gpio->regbase; > + unsigned mask = 1 << offset; > + > + __raw_writel(mask, pio + (val ? PIO_SODR : PIO_CODR)); > +} > + > +static int at91_gpio_direction_output(struct gpio_chip *chip, unsigned offset, > + int val) > +{ > + struct at91_gpio_chip *at91_gpio = to_at91_gpio_chip(chip); > + void __iomem *pio = at91_gpio->regbase; > + unsigned mask = 1 << offset; > + > + __raw_writel(mask, pio + (val ? PIO_SODR : PIO_CODR)); > + __raw_writel(mask, pio + PIO_OER); > + > + return 0; > +} > + > +static int at91_gpio_to_irq(struct gpio_chip *chip, unsigned offset) > +{ > + struct at91_gpio_chip *at91_gpio = to_at91_gpio_chip(chip); > + int virq; > + > + if (offset < chip->ngpio) > + virq = irq_create_mapping(at91_gpio->domain, offset); > + else > + virq = -ENXIO; > + > + dev_dbg(chip->dev, "%s: request IRQ for GPIO %d, return %d\n", > + chip->label, offset + chip->base, virq); > + return virq; > +} > + > +static char peripheral_function(void __iomem *pio, unsigned mask) > +{ > + char ret = 'X'; > + u8 select; > + > + if (!pio) > + return ret; > + > + if (has_pio3()) { > + select = !!(__raw_readl(pio + PIO_ABCDSR1) & mask); > + select |= (!!(__raw_readl(pio + PIO_ABCDSR2) & mask) << 1); > + ret = 'A' + select; > + } else { > + ret = __raw_readl(pio + PIO_ABSR) & mask ? > + 'B' : 'A'; > + } > + > + return ret; > +} > + > +#ifdef CONFIG_DEBUG_FS > +static void at91_gpio_dbg_show(struct seq_file *s, struct gpio_chip *chip) > +{ > + int i; > + struct at91_gpio_chip *at91_gpio = to_at91_gpio_chip(chip); > + void __iomem *pio = at91_gpio->regbase; > + > + for (i = 0; i < chip->ngpio; i++) { > + unsigned pin = chip->base + i; > + unsigned mask = pin_to_mask(pin); > + const char *gpio_label; > + u32 pdsr; > + > + gpio_label = gpiochip_is_requested(chip, i); > + if (!gpio_label) > + continue; > + > + seq_printf(s, "[%s] GPIO%s%d: ", > + gpio_label, chip->label, i); > + if (__raw_readl(pio + PIO_PSR) & mask) { > + pdsr = __raw_readl(pio + PIO_PDSR); > + > + seq_printf(s, "[gpio] %s\n", > + pdsr & mask ? > + "set" : "clear"); > + } else { > + seq_printf(s, "[periph %c]\n", > + peripheral_function(pio, mask)); > + } > + } > +} > +#else > +#define at91_gpio_dbg_show NULL > +#endif > + > +/* Several AIC controller irqs are dispatched through this GPIO handler. > + * To use any AT91_PIN_* as an externally triggered IRQ, first call > + * at91_set_gpio_input() then maybe enable its glitch filter. > + * Then just request_irq() with the pin ID; it works like any ARM IRQ > + * handler. > + * First implementation always triggers on rising and falling edges > + * whereas the newer PIO3 can be additionally configured to trigger on > + * level, edge with any polarity. > + * > + * Alternatively, certain pins may be used directly as IRQ0..IRQ6 after > + * configuring them with at91_set_a_periph() or at91_set_b_periph(). > + * IRQ0..IRQ6 should be configurable, e.g. level vs edge triggering. > + */ > + > +static void gpio_irq_mask(struct irq_data *d) > +{ > + struct at91_gpio_chip *at91_gpio = irq_data_get_irq_chip_data(d); > + void __iomem *pio = at91_gpio->regbase; > + unsigned mask = 1 << d->hwirq; > + > + if (pio) > + __raw_writel(mask, pio + PIO_IDR); > +} > + > +static void gpio_irq_unmask(struct irq_data *d) > +{ > + struct at91_gpio_chip *at91_gpio = irq_data_get_irq_chip_data(d); > + void __iomem *pio = at91_gpio->regbase; > + unsigned mask = 1 << d->hwirq; > + > + if (pio) > + __raw_writel(mask, pio + PIO_IER); > +} > + > +static int gpio_irq_type(struct irq_data *d, unsigned type) > +{ > + switch (type) { > + case IRQ_TYPE_NONE: > + case IRQ_TYPE_EDGE_BOTH: > + return 0; > + default: > + return -EINVAL; > + } > +} > + > +/* Alternate irq type for PIO3 support */ > +static int alt_gpio_irq_type(struct irq_data *d, unsigned type) > +{ > + struct at91_gpio_chip *at91_gpio = irq_data_get_irq_chip_data(d); > + void __iomem *pio = at91_gpio->regbase; > + unsigned mask = 1 << d->hwirq; > + > + switch (type) { > + case IRQ_TYPE_EDGE_RISING: > + __raw_writel(mask, pio + PIO_ESR); > + __raw_writel(mask, pio + PIO_REHLSR); > + break; > + case IRQ_TYPE_EDGE_FALLING: > + __raw_writel(mask, pio + PIO_ESR); > + __raw_writel(mask, pio + PIO_FELLSR); > + break; > + case IRQ_TYPE_LEVEL_LOW: > + __raw_writel(mask, pio + PIO_LSR); > + __raw_writel(mask, pio + PIO_FELLSR); > + break; > + case IRQ_TYPE_LEVEL_HIGH: > + __raw_writel(mask, pio + PIO_LSR); > + __raw_writel(mask, pio + PIO_REHLSR); > + break; > + case IRQ_TYPE_EDGE_BOTH: > + /* > + * disable additional interrupt modes: > + * fall back to default behavior > + */ > + __raw_writel(mask, pio + PIO_AIMDR); > + return 0; > + case IRQ_TYPE_NONE: > + default: > + pr_warn("AT91: No type for irq %d\n", gpio_to_irq(d->irq)); > + return -EINVAL; > + } > + > + /* enable additional interrupt modes */ > + __raw_writel(mask, pio + PIO_AIMER); > + > + return 0; > +} > + > +#ifdef CONFIG_PM > +static u32 wakeups[MAX_GPIO_BANKS]; > + > +static int gpio_irq_set_wake(struct irq_data *d, unsigned state) > +{ > + struct at91_gpio_chip *at91_gpio = irq_data_get_irq_chip_data(d); > + unsigned mask = 1 << d->hwirq; > + unsigned bank = at91_gpio->pioc_idx; > + > + if (unlikely(bank >= MAX_GPIO_BANKS)) > + return -EINVAL; > + > + if (state) > + wakeups[bank] |= mask; > + else > + wakeups[bank] &= ~mask; > + > + irq_set_irq_wake(at91_gpio->pioc_virq, state); > + > + return 0; > +} > +#else > +#define gpio_irq_set_wake NULL > +#endif > + > +static struct irq_chip gpio_irqchip = { > + .name = "GPIO", > + .irq_disable = gpio_irq_mask, > + .irq_mask = gpio_irq_mask, > + .irq_unmask = gpio_irq_unmask, > + /* .irq_set_type is set dynamically */ > + .irq_set_wake = gpio_irq_set_wake, > +}; > + > +static void gpio_irq_handler(unsigned irq, struct irq_desc *desc) > +{ > + struct irq_chip *chip = irq_desc_get_chip(desc); > + struct irq_data *idata = irq_desc_get_irq_data(desc); > + struct at91_gpio_chip *at91_gpio = irq_data_get_irq_chip_data(idata); > + void __iomem *pio = at91_gpio->regbase; > + unsigned long isr; > + int n; > + > + chained_irq_enter(chip, desc); > + for (;;) { > + /* Reading ISR acks pending (edge triggered) GPIO interrupts. > + * When there none are pending, we're finished unless we need > + * to process multiple banks (like ID_PIOCDE on sam9263). > + */ > + isr = __raw_readl(pio + PIO_ISR) & __raw_readl(pio + PIO_IMR); > + if (!isr) { > + if (!at91_gpio->next) > + break; > + at91_gpio = at91_gpio->next; > + pio = at91_gpio->regbase; > + continue; > + } > + > + n = find_first_bit(&isr, BITS_PER_LONG); > + while (n < BITS_PER_LONG) { > + generic_handle_irq(irq_find_mapping(at91_gpio->domain, n)); > + n = find_next_bit(&isr, BITS_PER_LONG, n + 1); > + } > + } > + chained_irq_exit(chip, desc); > + /* now it may re-trigger */ > +} > + > +/* > + * This lock class tells lockdep that GPIO irqs are in a different > + * category than their parents, so it won't report false recursion. > + */ > +static struct lock_class_key gpio_lock_class; > + > +static int at91_gpio_irq_map(struct irq_domain *h, unsigned int virq, > + irq_hw_number_t hw) > +{ > + struct at91_gpio_chip *at91_gpio = h->host_data; > + > + irq_set_lockdep_class(virq, &gpio_lock_class); > + > + /* > + * Can use the "simple" and not "edge" handler since it's > + * shorter, and the AIC handles interrupts sanely. > + */ > + irq_set_chip_and_handler(virq, &gpio_irqchip, > + handle_simple_irq); > + set_irq_flags(virq, IRQF_VALID); > + irq_set_chip_data(virq, at91_gpio); > + > + return 0; > +} > + > +static struct irq_domain_ops at91_gpio_ops = { > + .map = at91_gpio_irq_map, > + .xlate = irq_domain_xlate_twocell, > +}; > + > +static int at91_gpio_of_irq_setup(struct device_node *node, > + struct at91_gpio_chip *at91_gpio) > +{ > + struct at91_gpio_chip *prev = NULL; > + struct irq_data *d = irq_get_irq_data(at91_gpio->pioc_virq); > + > + at91_gpio->pioc_hwirq = irqd_to_hwirq(d); > + > + /* Setup proper .irq_set_type function */ > + if (has_pio3()) > + gpio_irqchip.irq_set_type = alt_gpio_irq_type; > + else > + gpio_irqchip.irq_set_type = gpio_irq_type; > + > + /* Disable irqs of this PIO controller */ > + __raw_writel(~0, at91_gpio->regbase + PIO_IDR); > + > + /* Setup irq domain */ > + at91_gpio->domain = irq_domain_add_linear(node, at91_gpio->chip.ngpio, > + &at91_gpio_ops, at91_gpio); > + if (!at91_gpio->domain) > + panic("at91_gpio.%d: couldn't allocate irq domain (DT).\n", > + at91_gpio->pioc_idx); > + > + /* Setup chained handler */ > + if (at91_gpio->pioc_idx) > + prev = gpio_chip[at91_gpio->pioc_idx - 1]; > + > + /* The toplevel handler handles one bank of GPIOs, except > + * on some SoC it can handles up to three... > + * We only set up the handler for the first of the list. > + */ > + if (prev && prev->next == at91_gpio) > + return 0; > + > + irq_set_chip_data(at91_gpio->pioc_virq, at91_gpio); > + irq_set_chained_handler(at91_gpio->pioc_virq, gpio_irq_handler); > + > + return 0; > +} > + > +/* This structure is replicated for each GPIO block allocated at probe time */ > +static struct gpio_chip at91_gpio_template = { > + .request = at91_gpio_request, > + .free = at91_gpio_free, > + .direction_input = at91_gpio_direction_input, > + .get = at91_gpio_get, > + .direction_output = at91_gpio_direction_output, > + .set = at91_gpio_set, > + .to_irq = at91_gpio_to_irq, > + .dbg_show = at91_gpio_dbg_show, > + .can_sleep = 0, > + .ngpio = 32, > +}; > + > +static void __devinit at91_gpio_probe_fixup(void) > +{ > + unsigned i; > + struct at91_gpio_chip *at91_gpio, *last = NULL; > + > + for (i = 0; i < gpio_banks; i++) { > + at91_gpio = gpio_chip[i]; > + > + /* > + * GPIO controller are grouped on some SoC: > + * PIOC, PIOD and PIOE can share the same IRQ line > + */ > + if (last && last->pioc_virq == at91_gpio->pioc_virq) > + last->next = at91_gpio; > + last = at91_gpio; > + } > +} > + > +static int __devinit at91_gpio_probe(struct platform_device *pdev) > +{ > + struct device_node *np = pdev->dev.of_node; > + struct resource *res; > + struct at91_gpio_chip *at91_chip = NULL; > + struct gpio_chip *chip; > + struct pinctrl_gpio_range *range; > + int ret = 0; > + int irq; > + int alias_idx = of_alias_get_id(np, "gpio"); > + uint32_t ngpio; > + > + BUG_ON(alias_idx >= ARRAY_SIZE(gpio_chip)); > + if (gpio_chip[alias_idx]) { > + ret = -EBUSY; > + goto err; > + } > + > + at91_gpio_caps = (unsigned long)np->data; > + > + res = platform_get_resource(pdev, IORESOURCE_MEM, 0); > + if (!res) { > + ret = -ENOENT; > + goto err; > + } > + > + irq = platform_get_irq(pdev, 0); > + if (irq < 0) { > + ret = irq; > + goto err; > + } > + > + at91_chip = devm_kzalloc(&pdev->dev, sizeof(*at91_chip), GFP_KERNEL); > + if (!at91_chip) { > + ret = -ENOMEM; > + goto err; > + } > + > + at91_chip->regbase = devm_request_and_ioremap(&pdev->dev, res); > + if (!at91_chip->regbase) { > + dev_err(&pdev->dev, "failed to map registers, ignoring.\n"); > + ret = -EBUSY; > + goto err; > + } > + > + at91_chip->pioc_virq = irq; > + at91_chip->pioc_idx = alias_idx; > + > + at91_chip->clock = clk_get(&pdev->dev, NULL); > + if (IS_ERR(at91_chip->clock)) { > + dev_err(&pdev->dev, "failed to get clock, ignoring.\n"); > + goto err; > + } > + > + if (clk_prepare(at91_chip->clock)) > + goto clk_prep_err; > + > + /* enable PIO controller's clock */ > + if (clk_enable(at91_chip->clock)) { > + dev_err(&pdev->dev, "failed to enable clock, ignoring.\n"); > + goto clk_err; > + } > + > + at91_chip->chip = at91_gpio_template; > + > + chip = &at91_chip->chip; > + chip->of_node = np; > + chip->label = dev_name(&pdev->dev); > + chip->dev = &pdev->dev; > + chip->owner = THIS_MODULE; > + chip->base = alias_idx * MAX_NB_GPIO_PER_BANK; > + > + if (!of_property_read_u32(np, "gpio-nb", &ngpio)) { > + if (ngpio >= MAX_NB_GPIO_PER_BANK) > + pr_err("at91_gpio.%d, gpio-nb >= %d failback to %d\n", > + alias_idx, MAX_NB_GPIO_PER_BANK, MAX_NB_GPIO_PER_BANK); > + else > + chip->ngpio = ngpio; > + } > + > + range = &at91_chip->range; > + range->name = chip->label; > + range->id = alias_idx; > + range->pin_base = range->base = range->id * MAX_NB_GPIO_PER_BANK; > + > + range->npins = chip->ngpio; > + range->gc = chip; > + > + ret = gpiochip_add(chip); > + if (ret) > + goto clk_err; > + > + gpio_chip[alias_idx] = at91_chip; > + gpio_banks = max(gpio_banks, alias_idx + 1); > + > + at91_gpio_probe_fixup(); > + > + at91_gpio_of_irq_setup(np, at91_chip); > + > + dev_info(&pdev->dev, "at address %p\n", at91_chip->regbase); > + > + return 0; > + > +clk_err: > + clk_unprepare(at91_chip->clock); > +clk_prep_err: > + clk_put(at91_chip->clock); > +err: > + dev_err(&pdev->dev, "Failure %i for GPIO %i\n", ret, alias_idx); > + > + return ret; > +} > + > +static struct of_device_id at91_gpio_of_match[] __devinitdata = { > + { .compatible = "atmel,at91rm9200-gpio", }, > + { .compatible = "atmel,at91sam9x5-gpio", .data = (void*)AT91_GPIO_CAP_PIO3, }, > + { /* sentinel */ } > +}; > + > +static struct platform_driver at91_gpio_driver = { > + .driver = { > + .name = "gpio-at91", > + .owner = THIS_MODULE, > + .of_match_table = of_match_ptr(at91_gpio_of_match), > + }, > + .probe = at91_gpio_probe, > +}; > + > +static struct of_device_id at91_pinctrl_of_match[] __devinitdata = { > + { .compatible = "atmel,at91rm9200-pinctrl", }, > + { /* sentinel */ } > +}; > + > +static struct platform_driver at91_pinctrl_driver = { > + .driver = { > + .name = "pinctrl-at91", > + .owner = THIS_MODULE, > + .of_match_table = of_match_ptr(at91_pinctrl_of_match), > + }, > + .probe = at91_pinctrl_probe, > + .remove = __devexit_p(at91_pinctrl_remove), > +}; > + > +static int __init at91_pinctrl_init(void) > +{ > + int ret; > + > + ret = platform_driver_register(&at91_gpio_driver); > + if (ret) > + return ret; > + return platform_driver_register(&at91_pinctrl_driver); > +} > +arch_initcall(at91_pinctrl_init); > + > +static void __exit at91_pinctrl_exit(void) > +{ > + platform_driver_unregister(&at91_pinctrl_driver); > +} > + > +module_exit(at91_pinctrl_exit); > +MODULE_AUTHOR("Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>"); > +MODULE_DESCRIPTION("Atmel AT91 pinctrl driver"); > +MODULE_LICENSE("GPL v2"); > -- > 1.7.10.4 > > > _______________________________________________ > linux-arm-kernel mailing list > linux-arm-kernel@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel I tested it with a at91sam9g35-ek board, and it hangs before the dbgu line is configured. ( with at91_dt_defconfig and at91sam9g35ek.dts )
> > + > > +dbgu: serial@fffff200 { > > + compatible = "atmel,at91sam9260-usart"; > > + reg = <0xfffff200 0x200>; > > + interrupts = <1 4 7>; > > + pinctrl-names = "default"; > > + pinctrl-0 = <&pinctrl_dbgu>; > > + status = "disabled"; > > +}; > > diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig > > index e91c7cd..178a619 100644 > > --- a/arch/arm/Kconfig > > +++ b/arch/arm/Kconfig > > @@ -352,6 +352,7 @@ config ARCH_AT91 > > select CLKDEV_LOOKUP > > select IRQ_DOMAIN > > select NEED_MACH_IO_H if PCCARD > > + select PINCTRL > > help > > This enables support for systems based on Atmel > > AT91RM9200 and AT91SAM9* processors. > There's a problem with this: if CONFIG_PINCRTL is forced on ARCH_AT91 > and PINCTRL_AT91 is not selected, > all calls to devm_pinctrl_get_select_default() will fail. => no > serial, no nand etc.. > IMHO, CONFIG_PINCTRL should not be forced, otherwise it will break > configs that don't want pinctrl > Or, if pinctrl is the new and only way, PINCTRL_AT91 should also be > forced on ARCH_AT91 no pinctrl MUST be forced as we provide pinctrl dummies which will provide dummy config so not break and if you want the gpio you need to enable the pinctrl on at91 otherwise you not have it we can force PINCRTL_AT91 on DT but now the pinctrl need to always be enabled > > -- > > 1.7.10.4 > > > > > > _______________________________________________ > > linux-arm-kernel mailing list > > linux-arm-kernel@lists.infradead.org > > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel > > > I tested it with a at91sam9g35-ek board, and it hangs before the dbgu > line is configured. > ( with at91_dt_defconfig and at91sam9g35ek.dts ) did you update you dtb before booting? Best Regards, J.
On Fri, Aug 10, 2012 at 3:01 PM, Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> wrote: > Configure a gpio as input when freeing it to reduce power consumption/ > Confire the pin as pio when requested. > > This is need by DT as we do not mux them any more. > > Cc: Linus Walleij <linus.walleij@linaro.org> > Cc: Nicolas Ferre <nicolas.ferre@atmel.com> > Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Seems straight-forward and I guess this driver will eventually be superseded by the new pinctrl driver. Acked-by: Linus Walleij <linus.walleij@linaro.org> Yours, Linus Walleij
On Fri, Aug 10, 2012 at 3:01 PM, Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> wrote: > Fix also the reg size as we have 512 bytes bank not 256 bytes per gpio/mux > controller > > Cc: Linus Walleij <linus.walleij@linaro.org> > Cc: Nicolas Ferre <nicolas.ferre@atmel.com> > Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Not that I understand device tree, so you rpobably want Nicolas to review this one rather than me, but FWIW: Acked-by: Linus Walleij <linus.walleij@linaro.org> Yours, Linus Walleij
On Fri, Aug 10, 2012 at 3:02 PM, Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> wrote: > On the serie 5 bank b and d have 19 and 22 pins only. > > Cc: Linus Walleij <linus.walleij@linaro.org> > Cc: Nicolas Ferre <nicolas.ferre@atmel.com> > Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Again Nicolas' thing but FWIW: Acked-by: Linus Walleij <linus.walleij@linaro.org> Yours, Linus Walleij
On Fri, Aug 10, 2012 at 3:02 PM, Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> wrote: > Cc: Linus Walleij <linus.walleij@linaro.org> > Cc: Nicolas Ferre <nicolas.ferre@atmel.com> > Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> This approach is becoming popular and seems to work, so Acked-by: Linus Walleij <linus.walleij@linaro.org> Yours, Linus Walleij
On Fri, Aug 10, 2012 at 3:02 PM, Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> wrote: > + atmel,mux-mask = < > + /* A B */ > + 0xffffffff 0xffc00c3b /* pioA */ > + 0xffffffff 0x7fff3ccf /* pioB */ > + 0xffffffff 0x007fffff /* pioC */ > + >; If I read a devcie tree like this it will be a bit hard to understand what is happening. But again Nicolas is maintaining the AT91 DT. Yours, Linus Walleij
On Fri, Aug 10, 2012 at 3:02 PM, Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> wrote: > Set the dbgu pinctrl config by default as we have only one possible config > For other uart set the rxd/txd by default. > > For at91sam9x5ek create soc based dts as we need to include specific soc dtsi. Some things I understand, like this: > @@ -145,6 +240,8 @@ > compatible = "atmel,at91sam9260-usart"; > reg = <0xfffff200 0x200>; > interrupts = <1 4 7>; > + pinctrl-names = "default"; > + pinctrl-0 = <&pinctrl_dbgu>; > status = "disabled"; > }; And that looks good ... But the magic hex values I have no clue about so prefer to leave this to Nicolas. Yours, Linus Walleij
On Fri, Aug 10, 2012 at 3:02 PM, Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> wrote: > Cc: Linus Walleij <linus.walleij@linaro.org> > Cc: Nicolas Ferre <nicolas.ferre@atmel.com> > Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> > Cc: linux-serial@vger.kernel.org Looking good, Acked-by: Linus Walleij <linus.walleij@linaro.org> Yours, Linus Walleij
On Fri, Aug 10, 2012 at 3:02 PM, Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> wrote: > Cc: Linus Walleij <linus.walleij@linaro.org> > Cc: Nicolas Ferre <nicolas.ferre@atmel.com> > Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Acked-by: Linus Walleij <linus.walleij@linaro.org> Yours, Linus Walleij
On Fri, Aug 10, 2012 at 3:02 PM, Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> wrote: > Cc: Linus Walleij <linus.walleij@linaro.org> > Cc: Nicolas Ferre <nicolas.ferre@atmel.com> > Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Acked-by: Linus Walleij <linus.walleij@linaro.org> Yours, Linus Walleij
On Fri, Aug 10, 2012 at 3:02 PM, Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> wrote: > Cc: Linus Walleij <linus.walleij@linaro.org> > Cc: Nicolas Ferre <nicolas.ferre@atmel.com> > Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Acked-by: Linus Walleij <linus.walleij@linaro.org> Yours, Linus Walleij
On Fri, Aug 10, 2012 at 3:02 PM, Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> wrote: > without this the gpio will not be muxed as a gpio by the current custom pinmux > or later by the pinctrl (...) > + if (gpio_is_valid(host->board.det_pin)) > + gpio_free(host->board.det_pin); > + > + if (gpio_is_valid(host->board.enable_pin)) > + gpio_free(host->board.enable_pin); > + > + if (gpio_is_valid(host->board.rdy_pin)) > + gpio_free(host->board.rdy_pin); > + If you use devm_gpio_request() you can probably get rid of this block of code, but no big deal so: Acked-by: Linus Walleij <linus.walleij@linaro.org> Yours, Linus Walleij
On Fri, Aug 10, 2012 at 3:02 PM, Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> wrote: > Cc: Linus Walleij <linus.walleij@linaro.org> > Cc: Nicolas Ferre <nicolas.ferre@atmel.com> > Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> (...) > + nand { > + pinctrl_nand: nand-0 { > + atmel,pins = > + <2 13 0x0 0x1 /* PC13 gpio RDY pin pull_up */ > + 2 14 0x0 0x1>; /* PC14 gpio enable pin pull_up */ > + }; > + }; Again magic hex I don't understand so skipping this patch -> Nicolas. Yours, Linus Walleij
On Fri, Aug 10, 2012 at 3:02 PM, Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> wrote: > Cc: Linus Walleij <linus.walleij@linaro.org> > Cc: Nicolas Ferre <nicolas.ferre@atmel.com> > Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> > Cc: linux-mtd@lists.infradead.org Acked-by: Linus Walleij <linus.walleij@linaro.org> Yours, Linus Walleij
(Hm maybe I should've read this patch first, well whatever.) On Fri, Aug 10, 2012 at 3:02 PM, Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> wrote: > This is also include the gpio controller as the IP share both. > Each soc will have to describe the SoC limitation and pin configuration via > DT. This is very good. > This will allow to do not need to touch the C code when adding new SoC if the > IP version is supported. Which is what we want -> less churn. > +++ b/Documentation/devicetree/bindings/pinctrl/atmel,at91-pinctrl.txt This needs to be CC to devicetree-discuss@lists.ozlabs.org where bindings are discussed, the people there sometimes make a good job to make sure the bindings are OS-neutral and stuff (doesn't seem like a problem in this very case, but anyway). > +Required properties for iomux controller: > +- compatible: "atmel,at91rm9200-pinctrl" > +- atmel,mux-mask: array of mask (periph per bank) to describe if a pin can be > + configured in this periph mode. All the periph and bank need to be describe. Can you please be more elaborate on this mux-mask, like what each bit means and why the bits are arranged like that and what it means on the AT91 platform.... I was first reading the .dts and was like ?woot? so I go to the bindings doc and I read this and I'm still like ?woot?.. > +Required properties for pin configuration node: > +- atmel,pins: 4 integers array, represents a group of pins mux and config This also need to be detailed so you can just read this and then look at the numbers in the device tree and, "aha I get it!". > + setting. The format is atmel,pins = <PIN_BANK PIN_BANK_NUM PERIPH CONFIG>. > + The PERIPH 0 means gpio. So please elaborate a bit on the three first members, so it's easy to read and understand the device tree. I "sort of" understand it but better be explicit. (...) > +Bits used for CONFIG: > +PULL_UP(1 << 0): indicate this pin need a pull up. > +MULTIDRIVE(1 << 1): indicate this pin need to be configured as multidrive. Hm if we just add multidrive to <linux/pinctrl/pinconf-generic.h> we could probably get this driver (and bindings) to use the generic pinconf library in drivers/pinctrl/pinonf-generic.c as the coh901 currently does. Actually multidrive makes me think that this is just shunting in several MOSFET driver stages, which we *used* to have in pinconf-generic, just by documenting that the argument passed with parameter PIN_CONFIG_DRIVE_PUSH_PULL would indicate the number of drive stages if != 0. Like this (old doc): + * @PIN_CONFIG_DRIVE_PUSH_PULL: the pin will be driven actively high and + * low, this is the most typical case and is typically achieved with two + * active transistors on the output. If the pin can support different + * drive strengths for push/pull, the strength is given in the argument + * as the number of driving stages vs nominal load impedance, so say + * quadruple driving stages (usually 8 transistors rather than two) will + * be configured with the 8 passed as argument. We're not mandate generic pin config because driver authors told me repeatedly that their chips are very special (like everyone else, hehe) but please keep it in mind as it could be hard to change this later. I'd be happy to put back this piece of doc... > +2. The pin configuration node intends to work on a specific function should > + to be defined under that specific function node. > + The function node's name should represent well about what function > + this group of pins in this pin configuration node are working on. I cannot parse this, sorry :-) could you detail... > +3. The driver can use the function node's name and pin configuration node's > + name describe the pin function and group hierarchy. > + For example, Linux Iat91 pinctrl driver takes the function node's name > + as the function name and pin configuration node's name as group name to > + create the map table. > +4. Each pin configuration node should have a phandle, devices can set pins > + configurations by referring to the phandle of that pin configuration node. > +5. The gpio controller must be describe in the pinctrl simple-bus. I think I understand this part... > +pinctrl@fffff400 { > + #address-cells = <1>; > + #size-cells = <1>; > + ranges; > + compatible = "atmel,at91rm9200-pinctrl", "simple-bus"; > + reg = <0xfffff400 0x600>; > + > + atmel,mux-mask = < > + /* A B */ > + 0xffffffff 0xffc00c3b /* pioA */ > + 0xffffffff 0x7fff3ccf /* pioB */ > + 0xffffffff 0x007fffff /* pioC */ > + >; I still have a real hard time understanding what is happening here, but maybe I'll understand as I go on reading the driver. > + /* shared pinctrl settings */ > + dbgu { > + pinctrl_dbgu: dbgu-0 { > + atmel,pins = > + <1 14 0x1 0x0 /* PB14 periph A */ > + 1 15 0x1 0x1>; /* PB15 periph with pullup */ I understand that Pin 14 and 15 in pin bank 1 is connected to some peripheral numbered 1 and pin 15 is pulled up. I guess perioheral 1 is identical to debugf uart 0 or something like that, since the node has this name? ut shouldn't this peripheral number come from the fact that it's dbgu so there is somewhere a table cross referencing ... or the device itself has some node which is separate and has some name like "pinctrl-periphid" or so? Just trying to decipher this a bit so I see if I could maintain it... Would it be possible to have the periphid as a separate node entry if it is anyway going to be the same value for all pins, or is this number also unique per bank or something like that, so debug uart would be say peripheral ID 5 on another pin bank? (In that case, keep it like this.) > +dbgu: serial@fffff200 { > + compatible = "atmel,at91sam9260-usart"; > + reg = <0xfffff200 0x200>; > + interrupts = <1 4 7>; > + pinctrl-names = "default"; > + pinctrl-0 = <&pinctrl_dbgu>; > + status = "disabled"; > +}; I really like the looks of this. (...) > diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig > index e91c7cd..178a619 100644 > --- a/arch/arm/Kconfig > +++ b/arch/arm/Kconfig > @@ -352,6 +352,7 @@ config ARCH_AT91 > select CLKDEV_LOOKUP > select IRQ_DOMAIN > select NEED_MACH_IO_H if PCCARD > + select PINCTRL Richard said something about also selectong the AT91 driver which seemed lika a good idea. (There follow some changes moving a lot of IRQ domain stuff etc from the GPIO driver which is hard to understand, but I guess you're doing the right thing.) (...) > --- /dev/null > +++ b/drivers/pinctrl/pinctrl-at91.c > @@ -0,0 +1,1448 @@ > +/* > + * at91 pinctrl driver based on at91 pinmux core > + * > + * Copyright (C) 2011-2012 Jean-Christophe PLAGNIOL-VILLARD > + * <plagnioj@jcrosoft.com> > + * > + * Under GPLv2 only > + */ > + > +#define DEBUG As noted rely on switching on DEBUG_PINCTRL where needed. It tags on -DDEBUG in the Makefile. > +#include <asm/mach/irq.h> Hm, it seems this platform is not using SPARSE_IRQ ... (...) > +static struct at91_gpio_chip *gpio_chip[MAX_GPIO_BANKS]; Nitpick should it not be named *gpio_chips[] (plural) since there are several chips in that array? > +static int gpio_banks; > +static unsigned long at91_gpio_caps; I usually protect this kind of variables with a mutex but it may be over-cautious. (...) > +#define PULL_UP (0 << 1) > +#define MULTI_DRIVE (1 << 1) So this I would have attempted to use pinconf-generic.[c|h] for and use PIN_CONFIG_BIAS_PULL_UP and PIN_CONFIG_DRIVER_PUSH_PULL with a specific argument for the multidrive. Beware that you may want to patch pinconf-generic.c to get the debugfs output you want etc. But as I said this is optional, just a good idea in general. (...) > +struct at91_pmx_pin { > + uint32_t bank; > + uint32_t pin; > + uint32_t mux; > + uint32_t pullup; > + unsigned long conf; > +}; Are they all u32 really? I understand that they are u32 in the devicetree but pullup seems like a candidate for a bool. Reading below it seems the "mux" member should be some kind of enum. Doing that an enum and documenting it seems like it would solve other readability issues. And this could actually use some kerneldoc too, if possible. > +/** > + * struct at91_pin_group - describes an At91 pin group > + * @name: the name of this specific pin group @pins_conf is not documented. > + * @pins: an array of discrete physical pins used in this group, taken > + * from the driver-local pin enumeration space > + * @npins: the number of pins in this group array, i.e. the number of > + * elements in .pins so we can iterate over that array > + */ > +struct at91_pin_group { > + const char *name; > + struct at91_pmx_pin *pins_conf; > + unsigned int *pins; > + unsigned npins; > +}; > +struct at91_pinctrl { > + struct device *dev; > + struct pinctrl_dev *pctl; > + > + int nbanks; > + > + int nmux; > + uint32_t *mux_mask; > + > + struct at91_pmx_func *functions; > + int nfunctions; > + > + struct at91_pin_group *groups; > + int ngroups; > + > + void (*set_A_periph)(void __iomem *pio, unsigned mask); > + void (*set_B_periph)(void __iomem *pio, unsigned mask); > +}; kerneldoc. Especually the two last functions are mysterious when just looking at the struct. (Then follows a block of really nice code...) (...) > +static void at91_pin_dbg_show(struct pinctrl_dev *pctldev, struct seq_file *s, > + unsigned offset) > +{ > + seq_printf(s, "%s", dev_name(pctldev->dev)); > +} This print should actually output something interesting (if it helps) maybe you could skip it? > +static int at91_dt_node_to_map(struct pinctrl_dev *pctldev, > + struct device_node *np, > + struct pinctrl_map **map, unsigned *num_maps) DT parse code, looks nice but would request Stephen to have a look at it. (...) > + new_map = kmalloc(sizeof(*new_map) * map_num, GFP_KERNEL); Maybe devm_kzalloc()? Because: (...) > + if (!parent) { > + kfree(new_map); > + return -EINVAL; You could just return here. And: (...) > +static void at91_dt_free_map(struct pinctrl_dev *pctldev, > + struct pinctrl_map *map, unsigned num_maps) > +{ > + kfree(map); > +} Then this wouldn't be needed at all. (...) > +static void at91_mux_disable_interrupt(void __iomem *pio, unsigned mask) > +{ > + __raw_writel(mask, pio + PIO_IDR); > +} I think most people use writel_relaxed() for this purpose (non-timeconsuming register write) these days. So conside replacing all __raw_* with *_relaxed(). (...) > +static void at91_mux_pio3_set_A_periph(void __iomem *pio, unsigned mask) > +{ > + > + __raw_writel(__raw_readl(pio + PIO_ABCDSR1) & ~mask, > + pio + PIO_ABCDSR1); > + __raw_writel(__raw_readl(pio + PIO_ABCDSR2) & ~mask, > + pio + PIO_ABCDSR2); > +} > + > +static void at91_mux_pio3_set_B_periph(void __iomem *pio, unsigned mask) > +{ > + __raw_writel(__raw_readl(pio + PIO_ABCDSR1) | mask, > + pio + PIO_ABCDSR1); > + __raw_writel(__raw_readl(pio + PIO_ABCDSR2) & ~mask, > + pio + PIO_ABCDSR2); > +} > + > +static void at91_mux_set_A_periph(void __iomem *pio, unsigned mask) > +{ > + __raw_writel(mask, pio + PIO_ASR); > +} > + > +static void at91_mux_set_B_periph(void __iomem *pio, unsigned mask) > +{ > + __raw_writel(mask, pio + PIO_BSR); > +} > + > +static void at91_mux_set_C_periph(void __iomem *pio, unsigned mask) > +{ > + __raw_writel(__raw_readl(pio + PIO_ABCDSR1) & ~mask, pio + PIO_ABCDSR1); > + __raw_writel(__raw_readl(pio + PIO_ABCDSR2) | mask, pio + PIO_ABCDSR2); > +} > + > +static void at91_mux_set_D_periph(void __iomem *pio, unsigned mask) > +{ > + __raw_writel(__raw_readl(pio + PIO_ABCDSR1) | mask, pio + PIO_ABCDSR1); > + __raw_writel(__raw_readl(pio + PIO_ABCDSR2) | mask, pio + PIO_ABCDSR2); > +} I have no clue whatsoever what is going on here, A? B? C? D? Some small comment or something giving a hint about this grouping system and how it works would be really nice. > +static void at91_pin_dbg(const struct device *dev, const struct at91_pmx_pin *pin) > +{ > + if (pin->mux) { > + dev_dbg(dev, "pio%c%d configured as periph%c with conf = 0x%lu\n", > + pin->bank + 'A', pin->pin, pin->mux - 1 + 'A', pin->conf); > + } else { > + dev_dbg(dev, "pio%c%d configured as gpio with conf = 0x%lu\n", > + pin->bank + 'A', pin->pin, pin->conf); > + } > +} This is nice, and one of the things we try to centralize and standardize in pinconf-generic. However as I said that would be optional. (...) > +static void at91_mux_gpio_enable(void __iomem *pio, unsigned mask, unsigned input) > +{ > + __raw_writel(mask, pio + PIO_PER); > + __raw_writel(mask, pio + (input ? PIO_ODR : PIO_OER)); > +} > + The last argument, "input" seems to be a bool. Also not that this should maybe be named at91_mux_gpio_endisable() since it is called from the disable() function below. (...) > + for (i = 0; i < npins; i++) { > + pin = &pins_conf[i]; > + at91_pin_dbg(info->dev, pin); > + pio = pin_to_controller(info, pin->bank); > + mask = pin_to_mask(pin->pin); > + at91_mux_disable_interrupt(pio, mask); > + switch(pin->mux) { > + case 0: > + at91_mux_gpio_enable(pio, mask, 1); > + break; > + case 1: > + info->set_A_periph(pio, mask); > + break; > + case 2: > + info->set_B_periph(pio, mask); > + break; > + case 3: > + at91_mux_set_C_periph(pio, mask); > + break; > + case 4: > + at91_mux_set_D_periph(pio, mask); > + break; > + } > + if (pin->mux) > + at91_mux_gpio_disable(pio, mask); Looking at this it seems that the pin->mux variable should be an enum so we get rid of these magic values 0,1,2,3,4. Documenting these enums with kerneldoc would probably solve a lot of questionmarks. (Noted in the struct review above as well.) (...) > +static void at91_pmx_disable(struct pinctrl_dev *pctldev, unsigned selector, > + unsigned group) > +{ > + struct at91_pinctrl *info = pinctrl_dev_get_drvdata(pctldev); > + const struct at91_pmx_pin *pins_conf = info->groups[group].pins_conf; > + const struct at91_pmx_pin *pin; > + uint32_t npins = info->groups[group].npins; > + int i; > + unsigned mask; > + void __iomem *pio; > + > + for (i = 0; i < npins; i++) { > + pin = &pins_conf[i]; > + at91_pin_dbg(info->dev, pin); > + pio = pin_to_controller(info, pin->bank); > + mask = pin_to_mask(pin->pin); > + at91_mux_gpio_enable(pio, mask, 1); Actually calling a function named "*enable" to disable something looks quite unintuitive. Maybe rename that function to "at91_mux_gpio_endisable()" or something? (...) > +static void at91_pinconf_dbg_show(struct pinctrl_dev *pctldev, > + struct seq_file *s, unsigned pin_id) > +{ > + > +} Don't you want some nice debug output for each pin here? Like outputting the pull/drive conf... > +static void at91_pinconf_group_dbg_show(struct pinctrl_dev *pctldev, > + struct seq_file *s, unsigned group) > +{ > +} I think this function is optional now, or it should be. So you shouldn't need to define it. (...) > + pin = grp->pins_conf = devm_kzalloc(info->dev, grp->npins * sizeof(struct at91_pmx_pin), > + GFP_KERNEL); > + grp->pins = devm_kzalloc(info->dev, grp->npins * sizeof(unsigned int), > + GFP_KERNEL); Oh managed resources here, use them everywhere. (...) > + at91_pinctrl_desc.name = dev_name(&pdev->dev); > + at91_pinctrl_desc.npins = info->nbanks * MAX_NB_GPIO_PER_BANK; > + at91_pinctrl_desc.pins = pdesc = > + devm_kzalloc(&pdev->dev, sizeof(*pdesc) * at91_pinctrl_desc.npins, GFP_KERNEL); > + > + if (!at91_pinctrl_desc.pins) > + return -ENOMEM; Nitpick: checking the local variable pdesc for NULL is shorter. (...) > +static char peripheral_function(void __iomem *pio, unsigned mask) > +{ > + char ret = 'X'; > + u8 select; This looks like a bool. > + > + if (!pio) > + return ret; > + > + if (has_pio3()) { > + select = !!(__raw_readl(pio + PIO_ABCDSR1) & mask); > + select |= (!!(__raw_readl(pio + PIO_ABCDSR2) & mask) << 1); Especially if you use it like that... (...) > +#ifdef CONFIG_PM > +static u32 wakeups[MAX_GPIO_BANKS]; > + > +static int gpio_irq_set_wake(struct irq_data *d, unsigned state) "state" looks like a bool. > +{ > + struct at91_gpio_chip *at91_gpio = irq_data_get_irq_chip_data(d); > + unsigned mask = 1 << d->hwirq; > + unsigned bank = at91_gpio->pioc_idx; > + > + if (unlikely(bank >= MAX_GPIO_BANKS)) > + return -EINVAL; > + > + if (state) > + wakeups[bank] |= mask; > + else > + wakeups[bank] &= ~mask; > + > + irq_set_irq_wake(at91_gpio->pioc_virq, state); > + > + return 0; > +} So I can see that this sets or clears bits in a 32-bit word per bank. But I don't see these words being used for anything at all? So what's the point of all this? In ux500 we have a register bit that enables wakeup on a certain pin, then it makes all kind of sense to have this, but what is this stuff, really? It seems the function can be stripped down to two lines just calling irq_set_irq_wake(). (...) > + range = &at91_chip->range; > + range->name = chip->label; > + range->id = alias_idx; > + range->pin_base = range->base = range->id * MAX_NB_GPIO_PER_BANK; > + > + range->npins = chip->ngpio; > + range->gc = chip; This way of handling ranges looks very smooth, great that this works for you! The rest looks very good. Yours, Linus Walleij
On 16:38 Wed 15 Aug , Linus Walleij wrote: > (Hm maybe I should've read this patch first, well whatever.) > > On Fri, Aug 10, 2012 at 3:02 PM, Jean-Christophe PLAGNIOL-VILLARD > <plagnioj@jcrosoft.com> wrote: > > > This is also include the gpio controller as the IP share both. > > Each soc will have to describe the SoC limitation and pin configuration via > > DT. > > This is very good. > > > This will allow to do not need to touch the C code when adding new SoC if the > > IP version is supported. > > Which is what we want -> less churn. > > > +++ b/Documentation/devicetree/bindings/pinctrl/atmel,at91-pinctrl.txt > > This needs to be CC to devicetree-discuss@lists.ozlabs.org where bindings > are discussed, the people there sometimes make a good job to make sure > the bindings are OS-neutral and stuff (doesn't seem like a problem in this > very case, but anyway). > > > +Required properties for iomux controller: > > +- compatible: "atmel,at91rm9200-pinctrl" > > +- atmel,mux-mask: array of mask (periph per bank) to describe if a pin can be > > + configured in this periph mode. All the periph and bank need to be describe. > > Can you please be more elaborate on this mux-mask, like what each bit > means and why the bits are arranged like that and what it means on the > AT91 platform.... I was first reading the .dts and was like ?woot? so > I go to the bindings doc and I read this and I'm still like ?woot?.. > > > +Required properties for pin configuration node: > > +- atmel,pins: 4 integers array, represents a group of pins mux and config > > This also need to be detailed so you can just read this and then > look at the numbers in the device tree and, "aha I get it!". > > > + setting. The format is atmel,pins = <PIN_BANK PIN_BANK_NUM PERIPH CONFIG>. > > + The PERIPH 0 means gpio. > > So please elaborate a bit on the three first members, so it's easy to read > and understand the device tree. I "sort of" understand it but better > be explicit. > > (...) > > +Bits used for CONFIG: > > +PULL_UP(1 << 0): indicate this pin need a pull up. > > +MULTIDRIVE(1 << 1): indicate this pin need to be configured as multidrive. > > Hm if we just add multidrive to <linux/pinctrl/pinconf-generic.h> we > could probably get this driver (and bindings) to use the generic > pinconf library in drivers/pinctrl/pinonf-generic.c as the coh901 > currently does. > > Actually multidrive makes me think that this is just shunting in > several MOSFET driver stages, which we *used* to have in > pinconf-generic, just by documenting that the argument passed > with parameter PIN_CONFIG_DRIVE_PUSH_PULL > would indicate the number of drive stages if != 0. > > Like this (old doc): > > + * @PIN_CONFIG_DRIVE_PUSH_PULL: the pin will be driven actively high and > + * low, this is the most typical case and is typically achieved with two > + * active transistors on the output. If the pin can support different > + * drive strengths for push/pull, the strength is given in the argument > + * as the number of driving stages vs nominal load impedance, so say > + * quadruple driving stages (usually 8 transistors rather than two) will > + * be configured with the 8 passed as argument. > > We're not mandate generic pin config because driver authors told me > repeatedly that their chips are very special (like everyone else, hehe) > but please keep it in mind as it could be hard to change this later. > I'd be happy to put back this piece of doc... > > > +2. The pin configuration node intends to work on a specific function should > > + to be defined under that specific function node. > > + The function node's name should represent well about what function > > + this group of pins in this pin configuration node are working on. > > I cannot parse this, sorry :-) could you detail... > > > +3. The driver can use the function node's name and pin configuration node's > > + name describe the pin function and group hierarchy. > > + For example, Linux Iat91 pinctrl driver takes the function node's name > > + as the function name and pin configuration node's name as group name to > > + create the map table. > > +4. Each pin configuration node should have a phandle, devices can set pins > > + configurations by referring to the phandle of that pin configuration node. > > +5. The gpio controller must be describe in the pinctrl simple-bus. > > I think I understand this part... > > > +pinctrl@fffff400 { > > + #address-cells = <1>; > > + #size-cells = <1>; > > + ranges; > > + compatible = "atmel,at91rm9200-pinctrl", "simple-bus"; > > + reg = <0xfffff400 0x600>; > > + > > + atmel,mux-mask = < > > + /* A B */ > > + 0xffffffff 0xffc00c3b /* pioA */ > > + 0xffffffff 0x7fff3ccf /* pioB */ > > + 0xffffffff 0x007fffff /* pioC */ > > + >; > > I still have a real hard time understanding what is happening here, > but maybe I'll understand as I go on reading the driver. > > > + /* shared pinctrl settings */ > > + dbgu { > > + pinctrl_dbgu: dbgu-0 { > > + atmel,pins = > > + <1 14 0x1 0x0 /* PB14 periph A */ > > + 1 15 0x1 0x1>; /* PB15 periph with pullup */ > > I understand that Pin 14 and 15 in pin bank 1 is connected to some > peripheral numbered 1 and pin 15 is pulled up. > > I guess perioheral 1 is identical to debugf uart 0 or something > like that, since the node has this name? ut shouldn't this > peripheral number come from the fact that it's dbgu so there > is somewhere a table cross referencing ... or the device itself > has some node which is separate and has some name like > "pinctrl-periphid" or so? > > Just trying to decipher this a bit so I see if I could maintain > it... > > Would it be possible to have the periphid as a separate node > entry if it is anyway going to be the same value for all > pins, or is this number also unique per bank or something > like that, so debug uart would be say peripheral ID 5 on another > pin bank? (In that case, keep it like this.) the pin can be anywhere on the different bank and configured in different mux (periph) so can not do as you suggest > > > +dbgu: serial@fffff200 { > > + compatible = "atmel,at91sam9260-usart"; > > + reg = <0xfffff200 0x200>; > > + interrupts = <1 4 7>; > > + pinctrl-names = "default"; > > + pinctrl-0 = <&pinctrl_dbgu>; > > + status = "disabled"; > > +}; > > I really like the looks of this. > > (...) > > diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig > > index e91c7cd..178a619 100644 > > --- a/arch/arm/Kconfig > > +++ b/arch/arm/Kconfig > > @@ -352,6 +352,7 @@ config ARCH_AT91 > > select CLKDEV_LOOKUP > > select IRQ_DOMAIN > > select NEED_MACH_IO_H if PCCARD > > + select PINCTRL > > Richard said something about also selectong the AT91 driver which > seemed lika a good idea. as I reply Richard we need to force the at91 driver only when DT enabled > > (There follow some changes moving a lot of IRQ domain stuff etc from > the GPIO driver which is hard to understand, but I guess you're doing > the right thing.) > > (...) > > --- /dev/null > > +++ b/drivers/pinctrl/pinctrl-at91.c > > @@ -0,0 +1,1448 @@ > > +/* > > + * at91 pinctrl driver based on at91 pinmux core > > + * > > + * Copyright (C) 2011-2012 Jean-Christophe PLAGNIOL-VILLARD > > + * <plagnioj@jcrosoft.com> > > + * > > + * Under GPLv2 only > > + */ > > + > > +#define DEBUG > > As noted rely on switching on DEBUG_PINCTRL where needed. > It tags on -DDEBUG in the Makefile. > > > +#include <asm/mach/irq.h> > > Hm, it seems this platform is not using SPARSE_IRQ ... it does see chained_irq_enter/chained_irq_exit > > (...) > > +static struct at91_gpio_chip *gpio_chip[MAX_GPIO_BANKS]; > > Nitpick should it not be named *gpio_chips[] (plural) since > there are several chips in that array? ok > > > +static int gpio_banks; > > +static unsigned long at91_gpio_caps; > > I usually protect this kind of variables with a mutex but it > may be over-cautious. > > (...) > > +#define PULL_UP (0 << 1) > > +#define MULTI_DRIVE (1 << 1) > > So this I would have attempted to use pinconf-generic.[c|h] for > and use PIN_CONFIG_BIAS_PULL_UP and > PIN_CONFIG_DRIVER_PUSH_PULL with a specific > argument for the multidrive. > > Beware that you may want to patch pinconf-generic.c > to get the debugfs output you want etc. > > But as I said this is optional, just a good idea in general. I'll take a look > > (...) > > +struct at91_pmx_pin { > > + uint32_t bank; > > + uint32_t pin; > > + uint32_t mux; > > + uint32_t pullup; > > + unsigned long conf; > > +}; > > Are they all u32 really? I understand that they are u32 in the > devicetree but pullup seems like a candidate for a bool. > > Reading below it seems the "mux" member should be some > kind of enum. Doing that an enum and documenting it seems > like it would solve other readability issues. > > And this could actually use some kerneldoc too, if possible. ok > > > +/** > > + * struct at91_pin_group - describes an At91 pin group > > + * @name: the name of this specific pin group > > @pins_conf is not documented. > > > + * @pins: an array of discrete physical pins used in this group, taken > > + * from the driver-local pin enumeration space > > + * @npins: the number of pins in this group array, i.e. the number of > > + * elements in .pins so we can iterate over that array > > + */ > > +struct at91_pin_group { > > + const char *name; > > + struct at91_pmx_pin *pins_conf; > > + unsigned int *pins; > > + unsigned npins; > > +}; > > > > +struct at91_pinctrl { > > + struct device *dev; > > + struct pinctrl_dev *pctl; > > + > > + int nbanks; > > + > > + int nmux; > > + uint32_t *mux_mask; > > + > > + struct at91_pmx_func *functions; > > + int nfunctions; > > + > > + struct at91_pin_group *groups; > > + int ngroups; > > + > > + void (*set_A_periph)(void __iomem *pio, unsigned mask); > > + void (*set_B_periph)(void __iomem *pio, unsigned mask); > > +}; > > kerneldoc. Especually the two last functions are mysterious when just > looking at the struct. > > (Then follows a block of really nice code...) > > (...) > > +static void at91_pin_dbg_show(struct pinctrl_dev *pctldev, struct seq_file *s, > > + unsigned offset) > > +{ > > + seq_printf(s, "%s", dev_name(pctldev->dev)); > > +} > > This print should actually output something interesting (if it helps) > maybe you could skip it? I've plan at a second step > > > +static int at91_dt_node_to_map(struct pinctrl_dev *pctldev, > > + struct device_node *np, > > + struct pinctrl_map **map, unsigned *num_maps) > > DT parse code, looks nice but would request Stephen to have a look > at it. > > (...) > > + new_map = kmalloc(sizeof(*new_map) * map_num, GFP_KERNEL); > > Maybe devm_kzalloc()? > > Because: > > (...) > > + if (!parent) { > > + kfree(new_map); > > + return -EINVAL; > > You could just return here. And: > > (...) > > +static void at91_dt_free_map(struct pinctrl_dev *pctldev, > > + struct pinctrl_map *map, unsigned num_maps) > > +{ > > + kfree(map); > > +} > > Then this wouldn't be needed at all. > > (...) > > +static void at91_mux_disable_interrupt(void __iomem *pio, unsigned mask) > > +{ > > + __raw_writel(mask, pio + PIO_IDR); > > +} > > I think most people use writel_relaxed() for this purpose (non-timeconsuming > register write) these days. So conside replacing all __raw_* with *_relaxed(). I known this one I've in mind to do it as second patch > > (...) > > +static void at91_mux_pio3_set_A_periph(void __iomem *pio, unsigned mask) > > +{ > > + > > + __raw_writel(__raw_readl(pio + PIO_ABCDSR1) & ~mask, > > + pio + PIO_ABCDSR1); > > + __raw_writel(__raw_readl(pio + PIO_ABCDSR2) & ~mask, > > + pio + PIO_ABCDSR2); > > +} > > + > > +static void at91_mux_pio3_set_B_periph(void __iomem *pio, unsigned mask) > > +{ > > + __raw_writel(__raw_readl(pio + PIO_ABCDSR1) | mask, > > + pio + PIO_ABCDSR1); > > + __raw_writel(__raw_readl(pio + PIO_ABCDSR2) & ~mask, > > + pio + PIO_ABCDSR2); > > +} > > + > > +static void at91_mux_set_A_periph(void __iomem *pio, unsigned mask) > > +{ > > + __raw_writel(mask, pio + PIO_ASR); > > +} > > + > > +static void at91_mux_set_B_periph(void __iomem *pio, unsigned mask) > > +{ > > + __raw_writel(mask, pio + PIO_BSR); > > +} > > + > > +static void at91_mux_set_C_periph(void __iomem *pio, unsigned mask) > > +{ > > + __raw_writel(__raw_readl(pio + PIO_ABCDSR1) & ~mask, pio + PIO_ABCDSR1); > > + __raw_writel(__raw_readl(pio + PIO_ABCDSR2) | mask, pio + PIO_ABCDSR2); > > +} > > + > > +static void at91_mux_set_D_periph(void __iomem *pio, unsigned mask) > > +{ > > + __raw_writel(__raw_readl(pio + PIO_ABCDSR1) | mask, pio + PIO_ABCDSR1); > > + __raw_writel(__raw_readl(pio + PIO_ABCDSR2) | mask, pio + PIO_ABCDSR2); > > +} > > I have no clue whatsoever what is going on here, A? B? C? D? > Some small comment or something giving a hint about this grouping > system and how it works would be really nice. periph (mux) > > > +static void at91_pin_dbg(const struct device *dev, const struct at91_pmx_pin *pin) > > +{ > > + if (pin->mux) { > > + dev_dbg(dev, "pio%c%d configured as periph%c with conf = 0x%lu\n", > > + pin->bank + 'A', pin->pin, pin->mux - 1 + 'A', pin->conf); > > + } else { > > + dev_dbg(dev, "pio%c%d configured as gpio with conf = 0x%lu\n", > > + pin->bank + 'A', pin->pin, pin->conf); > > + } > > +} > > This is nice, and one of the things we try to centralize and standardize in > pinconf-generic. However as I said that would be optional. > > (...) > > > +static void at91_mux_gpio_enable(void __iomem *pio, unsigned mask, unsigned input) > > +{ > > + __raw_writel(mask, pio + PIO_PER); > > + __raw_writel(mask, pio + (input ? PIO_ODR : PIO_OER)); > > +} > > + > > The last argument, "input" seems to be a bool. > > Also not that this should maybe be named at91_mux_gpio_endisable() > since it is called from the disable() function below. ok > > (...) > > + for (i = 0; i < npins; i++) { > > + pin = &pins_conf[i]; > > + at91_pin_dbg(info->dev, pin); > > + pio = pin_to_controller(info, pin->bank); > > + mask = pin_to_mask(pin->pin); > > + at91_mux_disable_interrupt(pio, mask); > > + switch(pin->mux) { > > + case 0: > > + at91_mux_gpio_enable(pio, mask, 1); > > + break; > > + case 1: > > + info->set_A_periph(pio, mask); > > + break; > > + case 2: > > + info->set_B_periph(pio, mask); > > + break; > > + case 3: > > + at91_mux_set_C_periph(pio, mask); > > + break; > > + case 4: > > + at91_mux_set_D_periph(pio, mask); > > + break; > > + } > > + if (pin->mux) > > + at91_mux_gpio_disable(pio, mask); > > Looking at this it seems that the pin->mux variable should be an > enum so we get rid of these magic values 0,1,2,3,4. Documenting > these enums with kerneldoc would probably solve a lot of > questionmarks. > > (Noted in the struct review above as well.) ok > > (...) > > +static void at91_pmx_disable(struct pinctrl_dev *pctldev, unsigned selector, > > + unsigned group) > > +{ > > + struct at91_pinctrl *info = pinctrl_dev_get_drvdata(pctldev); > > + const struct at91_pmx_pin *pins_conf = info->groups[group].pins_conf; > > + const struct at91_pmx_pin *pin; > > + uint32_t npins = info->groups[group].npins; > > + int i; > > + unsigned mask; > > + void __iomem *pio; > > + > > + for (i = 0; i < npins; i++) { > > + pin = &pins_conf[i]; > > + at91_pin_dbg(info->dev, pin); > > + pio = pin_to_controller(info, pin->bank); > > + mask = pin_to_mask(pin->pin); > > + at91_mux_gpio_enable(pio, mask, 1); > > Actually calling a function named "*enable" to disable something looks > quite unintuitive. Maybe rename that function to > "at91_mux_gpio_endisable()" or something? > > (...) ... > > +{ > > + struct at91_gpio_chip *at91_gpio = irq_data_get_irq_chip_data(d); > > + unsigned mask = 1 << d->hwirq; > > + unsigned bank = at91_gpio->pioc_idx; > > + > > + if (unlikely(bank >= MAX_GPIO_BANKS)) > > + return -EINVAL; > > + > > + if (state) > > + wakeups[bank] |= mask; > > + else > > + wakeups[bank] &= ~mask; > > + > > + irq_set_irq_wake(at91_gpio->pioc_virq, state); > > + > > + return 0; > > +} > > So I can see that this sets or clears bits in a 32-bit word per > bank. But I don't see these words being used for anything at all? > > So what's the point of all this? > > In ux500 we have a register bit that enables wakeup on a > certain pin, then it makes all kind of sense to have this, > but what is this stuff, really? It seems the function can be > stripped down to two lines just calling irq_set_irq_wake(). > will take a look on this > (...) > > + range = &at91_chip->range; > > + range->name = chip->label; > > + range->id = alias_idx; > > + range->pin_base = range->base = range->id * MAX_NB_GPIO_PER_BANK; > > + > > + range->npins = chip->ngpio; > > + range->gc = chip; > > This way of handling ranges looks very smooth, great that this works > for you! should work for everyone with pinctrl that combine both Best Regards, J.
On Aug 16, 2012, at 6:18 AM, Jean-Christophe PLAGNIOL-VILLARD wrote: > On 16:38 Wed 15 Aug , Linus Walleij wrote: >>> +static void at91_mux_pio3_set_A_periph(void __iomem *pio, unsigned mask) >>> +{ >>> + >>> + __raw_writel(__raw_readl(pio + PIO_ABCDSR1) & ~mask, >>> + pio + PIO_ABCDSR1); >>> + __raw_writel(__raw_readl(pio + PIO_ABCDSR2) & ~mask, >>> + pio + PIO_ABCDSR2); >>> +} >>> + >>> +static void at91_mux_pio3_set_B_periph(void __iomem *pio, unsigned mask) >>> +{ >>> + __raw_writel(__raw_readl(pio + PIO_ABCDSR1) | mask, >>> + pio + PIO_ABCDSR1); >>> + __raw_writel(__raw_readl(pio + PIO_ABCDSR2) & ~mask, >>> + pio + PIO_ABCDSR2); >>> +} >>> + >>> +static void at91_mux_set_A_periph(void __iomem *pio, unsigned mask) >>> +{ >>> + __raw_writel(mask, pio + PIO_ASR); >>> +} >>> + >>> +static void at91_mux_set_B_periph(void __iomem *pio, unsigned mask) >>> +{ >>> + __raw_writel(mask, pio + PIO_BSR); >>> +} >>> + >>> +static void at91_mux_set_C_periph(void __iomem *pio, unsigned mask) >>> +{ >>> + __raw_writel(__raw_readl(pio + PIO_ABCDSR1) & ~mask, pio + PIO_ABCDSR1); >>> + __raw_writel(__raw_readl(pio + PIO_ABCDSR2) | mask, pio + PIO_ABCDSR2); >>> +} >>> + >>> +static void at91_mux_set_D_periph(void __iomem *pio, unsigned mask) >>> +{ >>> + __raw_writel(__raw_readl(pio + PIO_ABCDSR1) | mask, pio + PIO_ABCDSR1); >>> + __raw_writel(__raw_readl(pio + PIO_ABCDSR2) | mask, pio + PIO_ABCDSR2); >>> +} >> >> I have no clue whatsoever what is going on here, A? B? C? D? >> Some small comment or something giving a hint about this grouping >> system and how it works would be really nice. > periph (mux) >> You should read it in the context that's there. 'A_periph', 'B_periph', etc. These functions select what device is connected to a given pin. These are designated A, B, C, or D in the data sheets. The overloading of PIO names with letters and Peripheral names with letters is mildly confusion in the Atmel datasheets, but is something one quickly gets used to. Adding a one line comment wouldn't hurt here. Maybe '/* Select proper peripheral for pin mux. */' No comments on the rest of the patch, since I've only seen the replies to the original and can't find it any of the archives. From what was quoted, however, this looks like a giant leap forward. DT in 3.5 looked to be very limited, and this is one of the last pieces needed to avoid any board specific files in the general case. I'm glad to see it coming along. Warner
2012/8/15 Linus Walleij <linus.walleij@linaro.org>: > On Fri, Aug 10, 2012 at 3:02 PM, Jean-Christophe PLAGNIOL-VILLARD > <plagnioj@jcrosoft.com> wrote: > >> Cc: Linus Walleij <linus.walleij@linaro.org> >> Cc: Nicolas Ferre <nicolas.ferre@atmel.com> >> Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> > (...) >> + nand { >> + pinctrl_nand: nand-0 { >> + atmel,pins = >> + <2 13 0x0 0x1 /* PC13 gpio RDY pin pull_up */ >> + 2 14 0x0 0x1>; /* PC14 gpio enable pin pull_up */ >> + }; >> + }; > > Again magic hex I don't understand so skipping this patch -> Nicolas. Maybe it will be more readable if we use something like : atmel,pull-up; atmel,multidrive; atmel,mux="GPIO" atmel,mux="A" ... just my 2 cents... Richard.
On 17:19 Thu 16 Aug , Richard Genoud wrote: > 2012/8/15 Linus Walleij <linus.walleij@linaro.org>: > > On Fri, Aug 10, 2012 at 3:02 PM, Jean-Christophe PLAGNIOL-VILLARD > > <plagnioj@jcrosoft.com> wrote: > > > >> Cc: Linus Walleij <linus.walleij@linaro.org> > >> Cc: Nicolas Ferre <nicolas.ferre@atmel.com> > >> Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> > > (...) > >> + nand { > >> + pinctrl_nand: nand-0 { > >> + atmel,pins = > >> + <2 13 0x0 0x1 /* PC13 gpio RDY pin pull_up */ > >> + 2 14 0x0 0x1>; /* PC14 gpio enable pin pull_up */ > >> + }; > >> + }; > > > > Again magic hex I don't understand so skipping this patch -> Nicolas. > > Maybe it will be more readable if we use something like : > atmel,pull-up; > atmel,multidrive; > atmel,mux="GPIO" > atmel,mux="A" > ... > just my 2 cents... no too much data and too much node as you will need a node per pin which we tyr to avoid Best Regards, J.
2012/8/16 Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>: >> Maybe it will be more readable if we use something like : >> atmel,pull-up; >> atmel,multidrive; >> atmel,mux="GPIO" >> atmel,mux="A" >> ... >> just my 2 cents... > no too much data and too much node as you will need a node per pin which we > tyr to avoid One one hand we've got a DTS quite concise but unreadable, and on the other hand, something understandable but huge. ( and it's not specific to your patch Jean-Christophe, on imx6q.dtsi, it looks worse ) I'm just trying to make sure that having a DTS like that : nand { pinctrl_nand: nand-0 { atmel,pins = <2 13 0x0 0x1 /* PC13 gpio RDY pin pull_up */ 2 14 0x0 0x1>; /* PC14 gpio enable pin pull_up */ }; }; is better than : nand { pinctrl_nand: nand-0 { nand_rdy { atmel,bank = "C"; atmel,pin = <13>; atmel,mux = "GPIO"; atmel,pull-up; }; nand_ena { atmel,bank = "C"; atmel,pin = <14>; atmel,mux = "GPIO"; atmel,pull-up; }; }; }; It's what you did in 1st place on linux-at91 git, and I kinda liked it. But yeah, it's more verbose, and some lines will go beyond 80 columns, but that's already the case. Best regards, Richard.
On Friday 10 August 2012, Jean-Christophe PLAGNIOL-VILLARD wrote: > - pioA: gpio@fffff400 { > - compatible = "atmel,at91rm9200-gpio"; > - reg = <0xfffff400 0x100>; > - interrupts = <2 4 1>; > - #gpio-cells = <2>; > - gpio-controller; > - interrupt-controller; > - }; > + pinctrl@fffff400 { > + #address-cells = <1>; > + #size-cells = <1>; > + ranges; > + compatible = "atmel,at91rm9200-pinctrl", "simple-bus"; > + reg = <0xfffff400 0x600>; > + > + pioA: gpio@fffff400 { > + compatible = "atmel,at91rm9200-gpio"; > + reg = <0xfffff400 0x200>; > + interrupts = <2 4 1>; > + #gpio-cells = <2>; > + gpio-controller; > + interrupt-controller; > + }; Hmm, If the node declares itself to be an interrupt-controller, it should normally have an #interrupt-cells property as well. Also, I think you should not list the same registers in both the parent and the children. It's probably better to remove the registers in the parent node and just refer to the children from the pinctrl driver. Since the pinctrl device is not really a bus in the sense that devices connected to it see the same address space, you could have the registers translated like ranges = <0xfffff400 0 0x600>; Arnd
On Friday 10 August 2012, Jean-Christophe PLAGNIOL-VILLARD wrote: > --- a/Documentation/devicetree/bindings/gpio/gpio_atmel.txt > +++ b/Documentation/devicetree/bindings/gpio/gpio_atmel.txt > @@ -9,6 +9,10 @@ Required properties: > unused). > - gpio-controller: Marks the device node as a GPIO controller. > > +optional properties: > +- gpio-nb: Number of gpio if absent 32. > + > + > Example: > pioA: gpio@fffff200 { > compatible = "atmel,at91rm9200-gpio"; > @@ -16,5 +20,6 @@ Example: > interrupts = <2 4>; > #gpio-cells = <2>; > gpio-controller; > + gpio-nb = <19>; What does "nb" stand for? The marvell-gpio binding uses "ngpio" for the number, so that would already be established. Otherwise, I think "#gpio-lines" would be more in line with other things we count in the bindings. Arnd
On 08:53 Fri 17 Aug , Richard Genoud wrote: > 2012/8/16 Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>: > >> Maybe it will be more readable if we use something like : > >> atmel,pull-up; > >> atmel,multidrive; > >> atmel,mux="GPIO" > >> atmel,mux="A" > >> ... > >> just my 2 cents... > > no too much data and too much node as you will need a node per pin which we > > tyr to avoid > > One one hand we've got a DTS quite concise but unreadable, and on the > other hand, something understandable but huge. > ( and it's not specific to your patch Jean-Christophe, on imx6q.dtsi, > it looks worse ) > I'm just trying to make sure that having a DTS like that : > nand { > pinctrl_nand: nand-0 { > atmel,pins = > <2 13 0x0 0x1 /* PC13 gpio RDY pin pull_up */ > 2 14 0x0 0x1>; /* PC14 gpio enable pin pull_up */ > }; > }; > is better than : > nand { > pinctrl_nand: nand-0 { > nand_rdy { atmel,bank = "C"; atmel,pin = <13>; atmel,mux = "GPIO"; > atmel,pull-up; }; > nand_ena { atmel,bank = "C"; atmel,pin = <14>; atmel,mux = "GPIO"; > atmel,pull-up; }; > }; > }; > It's what you did in 1st place on linux-at91 git, and I kinda liked it. > But yeah, it's more verbose, and some lines will go beyond 80 columns, > but that's already the case. but as I explain you the DT must not have 1000s of not which we will have if we do this. that's why I drop it and soon we will have macro in DT so this will be more readable Best Regards, J.
On 21:18 Sat 18 Aug , Arnd Bergmann wrote: > On Friday 10 August 2012, Jean-Christophe PLAGNIOL-VILLARD wrote: > > --- a/Documentation/devicetree/bindings/gpio/gpio_atmel.txt > > +++ b/Documentation/devicetree/bindings/gpio/gpio_atmel.txt > > @@ -9,6 +9,10 @@ Required properties: > > unused). > > - gpio-controller: Marks the device node as a GPIO controller. > > > > +optional properties: > > +- gpio-nb: Number of gpio if absent 32. > > + > > + > > Example: > > pioA: gpio@fffff200 { > > compatible = "atmel,at91rm9200-gpio"; > > @@ -16,5 +20,6 @@ Example: > > interrupts = <2 4>; > > #gpio-cells = <2>; > > gpio-controller; > > + gpio-nb = <19>; > > What does "nb" stand for? > > The marvell-gpio binding uses "ngpio" for the number, so that would > already be established. Otherwise, I think "#gpio-lines" would be > more in line with other things we count in the bindings. ngpio I dont like #gpio-lines ok Best Regards, J.
Hi Jean-Christophe, 2012/8/10 Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>: > diff --git a/arch/arm/mach-at91/at91sam9x5.c b/arch/arm/mach-at91/at91sam9x5.c > index 477cf9d..bbd2f8e 100644 > --- a/arch/arm/mach-at91/at91sam9x5.c > +++ b/arch/arm/mach-at91/at91sam9x5.c > @@ -310,12 +310,6 @@ static void __init at91sam9x5_map_io(void) > at91_init_sram(0, AT91SAM9X5_SRAM_BASE, AT91SAM9X5_SRAM_SIZE); > } > > -void __init at91sam9x5_initialize(void) > -{ > - /* Register GPIO subsystem (using DT) */ > - at91_gpio_init(NULL, 0); > -} > - > /* -------------------------------------------------------------------- > * Interrupt initialization > * -------------------------------------------------------------------- */ > @@ -323,5 +317,4 @@ void __init at91sam9x5_initialize(void) > struct at91_init_soc __initdata at91sam9x5_soc = { > .map_io = at91sam9x5_map_io, > .register_clocks = at91sam9x5_register_clocks, > - .init = at91sam9x5_initialize, > }; That's why my board wasn't booting anymore after your patchset. if .init is NULL, then in arch/arm/mach-at91/soc.h : static inline int at91_soc_is_enabled(void) { return at91_boot_soc.init != NULL; } is false, and in arch/arm/mach-at91/setup.c: void __init at91_map_io(void) { ... if (!at91_soc_is_enabled()) panic("AT91: Soc not enabled"); ... } Regars, Richard.
On 16:09 Mon 20 Aug , Richard Genoud wrote: > Hi Jean-Christophe, > > 2012/8/10 Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>: > > diff --git a/arch/arm/mach-at91/at91sam9x5.c b/arch/arm/mach-at91/at91sam9x5.c > > index 477cf9d..bbd2f8e 100644 > > --- a/arch/arm/mach-at91/at91sam9x5.c > > +++ b/arch/arm/mach-at91/at91sam9x5.c > > @@ -310,12 +310,6 @@ static void __init at91sam9x5_map_io(void) > > at91_init_sram(0, AT91SAM9X5_SRAM_BASE, AT91SAM9X5_SRAM_SIZE); > > } > > > > -void __init at91sam9x5_initialize(void) > > -{ > > - /* Register GPIO subsystem (using DT) */ > > - at91_gpio_init(NULL, 0); > > -} > > - > > /* -------------------------------------------------------------------- > > * Interrupt initialization > > * -------------------------------------------------------------------- */ > > @@ -323,5 +317,4 @@ void __init at91sam9x5_initialize(void) > > struct at91_init_soc __initdata at91sam9x5_soc = { > > .map_io = at91sam9x5_map_io, > > .register_clocks = at91sam9x5_register_clocks, > > - .init = at91sam9x5_initialize, > > }; > That's why my board wasn't booting anymore after your patchset. > if .init is NULL, then in arch/arm/mach-at91/soc.h : > static inline int at91_soc_is_enabled(void) the it have the patch that drop this Best Regards, J.
2012/8/20 Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>: >> if .init is NULL, then in arch/arm/mach-at91/soc.h : >> static inline int at91_soc_is_enabled(void) > the it have the patch that drop this and who/where is "it" ? Richard.
On 08/15/2012 08:38 AM, Linus Walleij wrote: > (Hm maybe I should've read this patch first, well whatever.) > > On Fri, Aug 10, 2012 at 3:02 PM, Jean-Christophe PLAGNIOL-VILLARD > <plagnioj@jcrosoft.com> wrote: > >> This is also include the gpio controller as the IP share both. >> Each soc will have to describe the SoC limitation and pin configuration via >> DT. >> +++ b/Documentation/devicetree/bindings/pinctrl/atmel,at91-pinctrl.txt >> +Required properties for iomux controller: >> +- compatible: "atmel,at91rm9200-pinctrl" >> +- atmel,mux-mask: array of mask (periph per bank) to describe if a pin can be >> + configured in this periph mode. All the periph and bank need to be describe. > > Can you please be more elaborate on this mux-mask, like what each bit > means and why the bits are arranged like that and what it means on the > AT91 platform.... I was first reading the .dts and was like ?woot? so > I go to the bindings doc and I read this and I'm still like ?woot?.. Yes, I'm a little confused what this is, and wouldn't have a clue how to fill it in. >> +static int at91_dt_node_to_map(struct pinctrl_dev *pctldev, >> + struct device_node *np, >> + struct pinctrl_map **map, unsigned *num_maps) > > DT parse code, looks nice but would request Stephen to have a look > at it. I think it looks reasonable; I don't see any obvious issues at a quick glance.
2012/8/22 Stephen Warren <swarren@wwwdotorg.org>: >>> +Required properties for iomux controller: >>> +- compatible: "atmel,at91rm9200-pinctrl" >>> +- atmel,mux-mask: array of mask (periph per bank) to describe if a pin can be >>> + configured in this periph mode. All the periph and bank need to be describe. >> >> Can you please be more elaborate on this mux-mask, like what each bit >> means and why the bits are arranged like that and what it means on the >> AT91 platform.... I was first reading the .dts and was like ?woot? so >> I go to the bindings doc and I read this and I'm still like ?woot?.. > > Yes, I'm a little confused what this is, and wouldn't have a clue how to > fill it in. With a practical example it's easier to understand. Take a SAM9X5 release manual (here is sam9g35): http://www.atmel.com/Images/doc11053.pdf page 11 (§4.3 package pinout) in the file arch/arm/boot/dts/at91sam9x5.dtsi you've got the the atmel,mux-mask like that: /* periphA periphB periphC */ 0xffffffff 0xffe0399f 0xc000001c /* pioA */ 0x0007ffff 0x8000fe3f 0x00000000 /* pioB */ 0x80000000 0x07c0ffff 0xb83fffff /* pioC */ 0x003fffff 0x003f8000 0x00000000 /* pioD */ Let's take the PioA - peripheral B: 0xffe0399f From the documentation table 4-3, we can extract the column PIO Periperal B for all signals PA0-PA31: PIO Peripheral B PA0 SPI1_NPCS1 PA1 SPI1_NPCS2 PA2 MCI1_DA1 PA3 MCI1_DA2 PA4 MCI1_DA3 PA5 -------- PA6 -------- PA7 SPI0_NPCS1 PA8 SPI1_NPCS0 PA9 -------- PA10 -------- PA11 MCI1_DA0 PA12 MCI1_CDA PA13 MCI1_CK PA14 -------- PA15 -------- etc... Each time it's possible to mux a pin to the peripheral B function (ie when there's no "-----") the corresponding bit is set: PIO Peripheral B PA0 SPI1_NPCS1 1 PA1 SPI1_NPCS2 1 PA2 MCI1_DA1 1 PA3 MCI1_DA2 1 PA4 MCI1_DA3 1 PA5 -------- 0 PA6 -------- 0 PA7 SPI0_NPCS1 1 PA8 SPI1_NPCS0 1 PA9 -------- 0 PA10 -------- 0 PA11 MCI1_DA0 1 PA12 MCI1_CDA 1 PA13 MCI1_CK 1 PA14 -------- 0 PA15 -------- 0 => this gives 0x399f Best regards, Richard
On 08/23/2012 01:06 AM, Richard Genoud wrote: > 2012/8/22 Stephen Warren <swarren@wwwdotorg.org>: >>>> +Required properties for iomux controller: >>>> +- compatible: "atmel,at91rm9200-pinctrl" >>>> +- atmel,mux-mask: array of mask (periph per bank) to describe if a pin can be >>>> + configured in this periph mode. All the periph and bank need to be describe. >>> >>> Can you please be more elaborate on this mux-mask, like what each bit >>> means and why the bits are arranged like that and what it means on the >>> AT91 platform.... I was first reading the .dts and was like ?woot? so >>> I go to the bindings doc and I read this and I'm still like ?woot?.. >> >> Yes, I'm a little confused what this is, and wouldn't have a clue how to >> fill it in. > > With a practical example it's easier to understand. > Take a SAM9X5 release manual (here is sam9g35): > http://www.atmel.com/Images/doc11053.pdf page 11 (§4.3 package pinout) > in the file arch/arm/boot/dts/at91sam9x5.dtsi you've got the the > atmel,mux-mask like that: > > /* periphA periphB periphC */ > 0xffffffff 0xffe0399f 0xc000001c /* pioA */ > 0x0007ffff 0x8000fe3f 0x00000000 /* pioB */ > 0x80000000 0x07c0ffff 0xb83fffff /* pioC */ > 0x003fffff 0x003f8000 0x00000000 /* pioD */ > > Let's take the PioA - peripheral B: 0xffe0399f > From the documentation table 4-3, we can extract the column PIO > Periperal B for all signals PA0-PA31: ... > Each time it's possible to mux a pin to the peripheral B function (ie > when there's no "-----") the corresponding bit is set: ... > => this gives 0x399f Ah OK. It would be a good idea to briefly describe this process in the binding document I think. I assume this property exists to avoid the kernel driver having to contain tables for each Atmel device; the driver is generic.
On Fri, 2012-08-10 at 15:02 +0200, Jean-Christophe PLAGNIOL-VILLARD wrote: > Cc: Linus Walleij <linus.walleij@linaro.org> > Cc: Nicolas Ferre <nicolas.ferre@atmel.com> > Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> > Cc: linux-mtd@lists.infradead.org > --- > Hi David, > > if you don't mind I would like to apply with the rest of the pinctrl > patch series Acked-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
On 11:49 Thu 23 Aug , Stephen Warren wrote: > On 08/23/2012 01:06 AM, Richard Genoud wrote: > > 2012/8/22 Stephen Warren <swarren@wwwdotorg.org>: > >>>> +Required properties for iomux controller: > >>>> +- compatible: "atmel,at91rm9200-pinctrl" > >>>> +- atmel,mux-mask: array of mask (periph per bank) to describe if a pin can be > >>>> + configured in this periph mode. All the periph and bank need to be describe. > >>> > >>> Can you please be more elaborate on this mux-mask, like what each bit > >>> means and why the bits are arranged like that and what it means on the > >>> AT91 platform.... I was first reading the .dts and was like ?woot? so > >>> I go to the bindings doc and I read this and I'm still like ?woot?.. > >> > >> Yes, I'm a little confused what this is, and wouldn't have a clue how to > >> fill it in. > > > > With a practical example it's easier to understand. > > Take a SAM9X5 release manual (here is sam9g35): > > http://www.atmel.com/Images/doc11053.pdf page 11 (§4.3 package pinout) > > in the file arch/arm/boot/dts/at91sam9x5.dtsi you've got the the > > atmel,mux-mask like that: > > > > /* periphA periphB periphC */ > > 0xffffffff 0xffe0399f 0xc000001c /* pioA */ > > 0x0007ffff 0x8000fe3f 0x00000000 /* pioB */ > > 0x80000000 0x07c0ffff 0xb83fffff /* pioC */ > > 0x003fffff 0x003f8000 0x00000000 /* pioD */ > > > > Let's take the PioA - peripheral B: 0xffe0399f > > From the documentation table 4-3, we can extract the column PIO > > Periperal B for all signals PA0-PA31: > ... > > Each time it's possible to mux a pin to the peripheral B function (ie > > when there's no "-----") the corresponding bit is set: > ... > > => this gives 0x399f > > Ah OK. It would be a good idea to briefly describe this process in the > binding document I think. I assume this property exists to avoid the > kernel driver having to contain tables for each Atmel device; the driver > is generic. Yeap I did this exactly for this I do not want to maintain such code for the whole bunch of at91 and this way I add other SoC with just via dtsi without touching c code I think other driver should do so too Best Regards, J.
On Sat, Aug 25, 2012 at 1:38 AM, Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> wrote: > On 11:49 Thu 23 Aug , Stephen Warren wrote: >> On 08/23/2012 01:06 AM, Richard Genoud wrote: >> > Let's take the PioA - peripheral B: 0xffe0399f >> > From the documentation table 4-3, we can extract the column PIO >> > Periperal B for all signals PA0-PA31: >> ... >> > Each time it's possible to mux a pin to the peripheral B function (ie >> > when there's no "-----") the corresponding bit is set: >> ... >> > => this gives 0x399f >> >> Ah OK. It would be a good idea to briefly describe this process in the >> binding document I think. I assume this property exists to avoid the >> kernel driver having to contain tables for each Atmel device; the driver >> is generic. > Yeap I did this exactly for this > > I do not want to maintain such code for the whole bunch of at91 > and this way I add other SoC with just via dtsi without touching c code > > I think other driver should do so too I'm following it now I think, after some discussion here at the kernel summit I have come to the conclusion that the real problem with readability comes from a shortcoming in the device tree compiler, that it cannot handle macros and defines (no preprocessor) so it's currently hard to make it more readable. But that's not the implementers fault so I'm OK with this looking like this for the moment. Yours, Linus Walleij
2012/8/28 Linus Walleij <linus.walleij@linaro.org>: > I'm following it now I think, after some discussion here at the kernel summit > I have come to the conclusion that the real problem with readability comes > from a shortcoming in the device tree compiler, that it cannot handle > macros and defines (no preprocessor) so it's currently hard to make > it more readable. Definitively, I've seen quite some hex (or dec) voodoo with comment next to them like that: fsl,ssi-dma-events = <25 24 23 22>; /* TX0 RX0 TX1 RX1 */ linux,code = <102>; /* KEY_HOME */ linux,code = <158>; /* KEY_BACK */ fsl,pinmux-ids = < 0x0180 /* MX28_PAD_GPMI_RDN__GPMI_RDN */ 0x0190 /* MX28_PAD_GPMI_WRN__GPMI_WRN */ 0x01c0 /* MX28_PAD_GPMI_RESETN__GPMI_RESETN */ >; Those bits of code are crying out "We want defines !" (And even bitwise OR would be usefull, instead of having to choose between hex voodoo and one bool for each bit in a register) > But that's not the implementers fault so I'm OK with this looking like > this for the moment. > > Yours, > Linus Walleij Best regards, Richard.
On 08/15/2012 10:54 AM, Linus Walleij : > On Fri, Aug 10, 2012 at 3:02 PM, Jean-Christophe PLAGNIOL-VILLARD > <plagnioj@jcrosoft.com> wrote: > >> On the serie 5 bank b and d have 19 and 22 pins only. >> >> Cc: Linus Walleij <linus.walleij@linaro.org> >> Cc: Nicolas Ferre <nicolas.ferre@atmel.com> >> Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> > > Again Nicolas' thing but FWIW: > Acked-by: Linus Walleij <linus.walleij@linaro.org> With more explanation in the commit message please, but still Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com> Bye,
On 08/15/2012 10:55 AM, Linus Walleij : > On Fri, Aug 10, 2012 at 3:02 PM, Jean-Christophe PLAGNIOL-VILLARD > <plagnioj@jcrosoft.com> wrote: > >> Cc: Linus Walleij <linus.walleij@linaro.org> >> Cc: Nicolas Ferre <nicolas.ferre@atmel.com> >> Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> > > This approach is becoming popular and seems to work, so > Acked-by: Linus Walleij <linus.walleij@linaro.org> Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com> Best regards,
On 08/10/2012 03:02 PM, Jean-Christophe PLAGNIOL-VILLARD : > This is also include the gpio controller as the IP share both. > Each soc will have to describe the SoC limitation and pin configuration via > DT. > > This will allow to do not need to touch the C code when adding new SoC if the > IP version is supported. > > Cc: Linus Walleij <linus.walleij@linaro.org> > Cc: Nicolas Ferre <nicolas.ferre@atmel.com> I know that a v2 is being cooked on your side, (with some chunks of comments from Linus, Richard and me inside) so, I wait for this new revision with delight ;-) > Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> [..] Bye,
On 08/10/2012 03:02 PM, Jean-Christophe PLAGNIOL-VILLARD : > Cc: Linus Walleij <linus.walleij@linaro.org> > Cc: Nicolas Ferre <nicolas.ferre@atmel.com> > Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> > --- > arch/arm/boot/dts/at91sam9260.dtsi | 9 +++++++++ > arch/arm/boot/dts/at91sam9263.dtsi | 12 ++++++++++++ > arch/arm/boot/dts/at91sam9g45.dtsi | 11 +++++++++++ > arch/arm/boot/dts/at91sam9n12.dtsi | 10 ++++++++++ > arch/arm/boot/dts/at91sam9x5.dtsi | 10 ++++++++++ > arch/arm/configs/at91_dt_defconfig | 1 + > arch/arm/mach-at91/at91sam9263.c | 5 +++++ > arch/arm/mach-at91/at91sam9g45.c | 6 ++++++ > arch/arm/mach-at91/at91sam9n12.c | 3 --- > arch/arm/mach-at91/at91sam9x5.c | 7 ------- > arch/arm/mach-at91/setup.c | 3 ++- > 11 files changed, 66 insertions(+), 11 deletions(-) > > diff --git a/arch/arm/boot/dts/at91sam9260.dtsi b/arch/arm/boot/dts/at91sam9260.dtsi > index 4aa155d..353eb53 100644 > --- a/arch/arm/boot/dts/at91sam9260.dtsi > +++ b/arch/arm/boot/dts/at91sam9260.dtsi > @@ -104,6 +104,15 @@ > compatible = "atmel,at91rm9200-pinctrl", "simple-bus"; > reg = <0xfffff400 0x600>; > > + atmel,mux-mask = < > + /* A B */ > + 0xffffffff 0xffc00c3b /* pioA */ > + 0xffffffff 0x7fff3ccf /* pioB */ > + 0xffffffff 0x007fffff /* pioC */ > + >; > + > + /* shared pinctrl settings */ > + > pioA: gpio@fffff400 { > compatible = "atmel,at91rm9200-gpio"; > reg = <0xfffff400 0x200>; > diff --git a/arch/arm/boot/dts/at91sam9263.dtsi b/arch/arm/boot/dts/at91sam9263.dtsi > index f1c838e..e52d5f8 100644 > --- a/arch/arm/boot/dts/at91sam9263.dtsi > +++ b/arch/arm/boot/dts/at91sam9263.dtsi > @@ -95,6 +95,17 @@ > compatible = "atmel,at91rm9200-pinctrl", "simple-bus"; > reg = <0xfffff200 0xa00>; > > + atmel,mux-mask = < > + /* A B */ > + 0xfffffffb 0xffffe07f /* pioA */ > + 0x0007ffff 0x39072fff /* pioB */ > + 0xffffffff 0x3ffffff8 /* pioC */ > + 0xfffffbff 0xffffffff /* pioD */ > + 0xffe00fff 0xfbfcff00 /* pioE */ > + >; > + > + /* shared pinctrl settings */ > + > pioA: gpio@fffff200 { > compatible = "atmel,at91rm9200-gpio"; > reg = <0xfffff200 0x200>; > @@ -138,6 +149,7 @@ > #gpio-cells = <2>; > gpio-controller; > interrupt-controller; > + }; > }; > > dbgu: serial@ffffee00 { > diff --git a/arch/arm/boot/dts/at91sam9g45.dtsi b/arch/arm/boot/dts/at91sam9g45.dtsi > index f04bc8d..0e64221 100644 > --- a/arch/arm/boot/dts/at91sam9g45.dtsi > +++ b/arch/arm/boot/dts/at91sam9g45.dtsi > @@ -114,6 +114,17 @@ > > reg = <0xfffff200 0xa00>; > > + atmel,mux-mask = < > + /* A B */ > + 0xffffffff 0xffc003ff /* pioA */ > + 0xffffffff 0x800f8f00 /* pioB */ > + 0xffffffff 0x00000e00 /* pioC */ > + 0xffffffff 0xff0c1381 /* pioD */ > + 0xffffffff 0x81ffff81 /* pioE */ > + >; > + > + /* shared pinctrl settings */ > + > pioA: gpio@fffff200 { > compatible = "atmel,at91rm9200-gpio"; > reg = <0xfffff200 0x200>; > diff --git a/arch/arm/boot/dts/at91sam9n12.dtsi b/arch/arm/boot/dts/at91sam9n12.dtsi > index 575c891..ae23a03 100644 > --- a/arch/arm/boot/dts/at91sam9n12.dtsi > +++ b/arch/arm/boot/dts/at91sam9n12.dtsi > @@ -107,6 +107,16 @@ > compatible = "atmel,at91rm9200-pinctrl", "simple-bus"; > reg = <0xfffff400 0x800>; > > + atmel,mux-mask = < > + /* A B C */ > + 0xffffffff 0xffe07983 0x00000000 /* pioA */ > + 0x00040000 0x00047e0f 0x00000000 /* pioB */ > + 0xfdffffff 0x07c00000 0xb83fffff /* pioC */ > + 0x003fffff 0x003f8000 0x00000000 /* pioD */ > + >; > + > + /* shared pinctrl settings */ > + > pioA: gpio@fffff400 { > compatible = "atmel,at91sam9x5-gpio", "atmel,at91rm9200-gpio"; > reg = <0xfffff400 0x200>; > diff --git a/arch/arm/boot/dts/at91sam9x5.dtsi b/arch/arm/boot/dts/at91sam9x5.dtsi > index 8b56730..d1df4ea 100644 > --- a/arch/arm/boot/dts/at91sam9x5.dtsi > +++ b/arch/arm/boot/dts/at91sam9x5.dtsi > @@ -115,6 +115,16 @@ > compatible = "atmel,at91rm9200-pinctrl", "simple-bus"; > reg = <0xfffff400 0x800>; > > + atmel,mux-mask = < > + /* A B C */ > + 0xffffffff 0xffe0399f 0xc000001c /* pioA */ > + 0xffffffff 0xffc003ff 0xffc003ff /* pioB */ > + 0xffffffff 0xffc003ff 0xffc003ff /* pioC */ > + 0xffffffff 0xffc003ff 0xffc003ff /* pioD */ > + >; > + > + /* shared pinctrl settings */ > + > pioA: gpio@fffff400 { > compatible = "atmel,at91sam9x5-gpio", "atmel,at91rm9200-gpio"; > reg = <0xfffff400 0x200>; > diff --git a/arch/arm/configs/at91_dt_defconfig b/arch/arm/configs/at91_dt_defconfig > index 67bc571..b175577 100644 > --- a/arch/arm/configs/at91_dt_defconfig > +++ b/arch/arm/configs/at91_dt_defconfig > @@ -111,6 +111,7 @@ CONFIG_I2C=y > CONFIG_I2C_GPIO=y > CONFIG_SPI=y > CONFIG_SPI_ATMEL=y > +CONFIG_PINCTRL_AT91=y > # CONFIG_HWMON is not set > CONFIG_WATCHDOG=y > CONFIG_AT91SAM9X_WATCHDOG=y > diff --git a/arch/arm/mach-at91/at91sam9263.c b/arch/arm/mach-at91/at91sam9263.c > index 84b3810..ceef453 100644 > --- a/arch/arm/mach-at91/at91sam9263.c > +++ b/arch/arm/mach-at91/at91sam9263.c > @@ -210,6 +210,11 @@ static struct clk_lookup periph_clocks_lookups[] = { > CLKDEV_CON_DEV_ID("hclk", "a00000.ohci", &ohci_clk), > CLKDEV_CON_DEV_ID("spi_clk", "fffa4000.spi", &spi0_clk), > CLKDEV_CON_DEV_ID("spi_clk", "fffa8000.spi", &spi1_clk), > + CLKDEV_CON_DEV_ID(NULL, "fffff200.gpio", &pioA_clk), > + CLKDEV_CON_DEV_ID(NULL, "fffff400.gpio", &pioB_clk), > + CLKDEV_CON_DEV_ID(NULL, "fffff600.gpio", &pioCDE_clk), > + CLKDEV_CON_DEV_ID(NULL, "fffff800.gpio", &pioCDE_clk), > + CLKDEV_CON_DEV_ID(NULL, "fffffa00.gpio", &pioCDE_clk), > }; > > static struct clk_lookup usart_clocks_lookups[] = { > diff --git a/arch/arm/mach-at91/at91sam9g45.c b/arch/arm/mach-at91/at91sam9g45.c > index ef6cedd..8322aa7 100644 > --- a/arch/arm/mach-at91/at91sam9g45.c > +++ b/arch/arm/mach-at91/at91sam9g45.c > @@ -256,6 +256,12 @@ static struct clk_lookup periph_clocks_lookups[] = { > CLKDEV_CON_DEV_ID("ehci_clk", "800000.ehci", &uhphs_clk), > /* fake hclk clock */ > CLKDEV_CON_DEV_ID("hclk", "at91_ohci", &uhphs_clk), > + CLKDEV_CON_DEV_ID(NULL, "fffff200.gpio", &pioA_clk), > + CLKDEV_CON_DEV_ID(NULL, "fffff400.gpio", &pioB_clk), > + CLKDEV_CON_DEV_ID(NULL, "fffff600.gpio", &pioC_clk), > + CLKDEV_CON_DEV_ID(NULL, "fffff800.gpio", &pioDE_clk), > + CLKDEV_CON_DEV_ID(NULL, "fffffa00.gpio", &pioDE_clk), > + > CLKDEV_CON_ID("pioA", &pioA_clk), > CLKDEV_CON_ID("pioB", &pioB_clk), > CLKDEV_CON_ID("pioC", &pioC_clk), > diff --git a/arch/arm/mach-at91/at91sam9n12.c b/arch/arm/mach-at91/at91sam9n12.c > index 0849466..f4e0e60 100644 > --- a/arch/arm/mach-at91/at91sam9n12.c > +++ b/arch/arm/mach-at91/at91sam9n12.c > @@ -221,9 +221,6 @@ static void __init at91sam9n12_map_io(void) > void __init at91sam9n12_initialize(void) > { > at91_extern_irq = (1 << AT91SAM9N12_ID_IRQ0); > - > - /* Register GPIO subsystem (using DT) */ > - at91_gpio_init(NULL, 0); > } > > struct at91_init_soc __initdata at91sam9n12_soc = { > diff --git a/arch/arm/mach-at91/at91sam9x5.c b/arch/arm/mach-at91/at91sam9x5.c > index 477cf9d..bbd2f8e 100644 > --- a/arch/arm/mach-at91/at91sam9x5.c > +++ b/arch/arm/mach-at91/at91sam9x5.c > @@ -310,12 +310,6 @@ static void __init at91sam9x5_map_io(void) > at91_init_sram(0, AT91SAM9X5_SRAM_BASE, AT91SAM9X5_SRAM_SIZE); > } > > -void __init at91sam9x5_initialize(void) > -{ > - /* Register GPIO subsystem (using DT) */ > - at91_gpio_init(NULL, 0); > -} > - > /* -------------------------------------------------------------------- > * Interrupt initialization > * -------------------------------------------------------------------- */ > @@ -323,5 +317,4 @@ void __init at91sam9x5_initialize(void) > struct at91_init_soc __initdata at91sam9x5_soc = { > .map_io = at91sam9x5_map_io, > .register_clocks = at91sam9x5_register_clocks, > - .init = at91sam9x5_initialize, > }; > diff --git a/arch/arm/mach-at91/setup.c b/arch/arm/mach-at91/setup.c > index 50c69b5..fcb66ea 100644 > --- a/arch/arm/mach-at91/setup.c > +++ b/arch/arm/mach-at91/setup.c > @@ -449,7 +449,8 @@ void __init at91_dt_initialize(void) > /* Register the processor-specific clocks */ > at91_boot_soc.register_clocks(); > > - at91_boot_soc.init(); > + if (at91_boot_soc.init) > + at91_boot_soc.init(); > } > #endif Ok with this, with correction by Richard, Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
On 08/10/2012 03:02 PM, Jean-Christophe PLAGNIOL-VILLARD : > Set the dbgu pinctrl config by default as we have only one possible config > For other uart set the rxd/txd by default. > > For at91sam9x5ek create soc based dts as we need to include specific soc dtsi. > > Cc: Linus Walleij <linus.walleij@linaro.org> > Cc: Nicolas Ferre <nicolas.ferre@atmel.com> I am fine with this: Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com> > Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> > --- > arch/arm/boot/dts/at91sam9260.dtsi | 109 ++++++++++++++++++++ > arch/arm/boot/dts/at91sam9263.dtsi | 57 ++++++++++ > arch/arm/boot/dts/at91sam9g15.dtsi | 28 +++++ > arch/arm/boot/dts/at91sam9g15ek.dts | 16 +++ > arch/arm/boot/dts/at91sam9g25.dtsi | 28 +++++ > arch/arm/boot/dts/at91sam9g25ek.dts | 65 +++--------- > arch/arm/boot/dts/at91sam9g35.dtsi | 28 +++++ > arch/arm/boot/dts/at91sam9g35ek.dts | 16 +++ > arch/arm/boot/dts/at91sam9g45.dtsi | 73 +++++++++++++ > arch/arm/boot/dts/at91sam9n12.dtsi | 83 +++++++++++++++ > arch/arm/boot/dts/at91sam9x25.dtsi | 28 +++++ > arch/arm/boot/dts/at91sam9x25ek.dts | 16 +++ > arch/arm/boot/dts/at91sam9x35.dtsi | 28 +++++ > arch/arm/boot/dts/at91sam9x35ek.dts | 16 +++ > arch/arm/boot/dts/at91sam9x5.dtsi | 93 ++++++++++++++++- > .../dts/{at91sam9g25ek.dts => at91sam9x5ek.dtsi} | 8 +- > arch/arm/mach-at91/Makefile.boot | 4 + > 17 files changed, 639 insertions(+), 57 deletions(-) > create mode 100644 arch/arm/boot/dts/at91sam9g15.dtsi > create mode 100644 arch/arm/boot/dts/at91sam9g15ek.dts > create mode 100644 arch/arm/boot/dts/at91sam9g25.dtsi > rewrite arch/arm/boot/dts/at91sam9g25ek.dts (62%) > create mode 100644 arch/arm/boot/dts/at91sam9g35.dtsi > create mode 100644 arch/arm/boot/dts/at91sam9g35ek.dts > create mode 100644 arch/arm/boot/dts/at91sam9x25.dtsi > create mode 100644 arch/arm/boot/dts/at91sam9x25ek.dts > create mode 100644 arch/arm/boot/dts/at91sam9x35.dtsi > create mode 100644 arch/arm/boot/dts/at91sam9x35ek.dts > rename arch/arm/boot/dts/{at91sam9g25ek.dts => at91sam9x5ek.dtsi} (75%) > > diff --git a/arch/arm/boot/dts/at91sam9260.dtsi b/arch/arm/boot/dts/at91sam9260.dtsi > index 353eb53..8ee7cd3 100644 > --- a/arch/arm/boot/dts/at91sam9260.dtsi > +++ b/arch/arm/boot/dts/at91sam9260.dtsi > @@ -112,6 +112,101 @@ > >; > > /* shared pinctrl settings */ > + dbgu { > + pinctrl_dbgu: dbgu-0 { > + atmel,pins = > + <1 14 0x1 0x0 /* PB14 periph A */ > + 1 15 0x1 0x1>; /* PB15 periph with pullup */ > + }; > + }; > + > + uart0 { > + pinctrl_uart0: uart0-0 { > + atmel,pins = > + <1 4 0x1 0x0 /* PB4 periph A */ > + 1 5 0x1 0x0>; /* PB5 periph A */ > + }; > + > + pinctrl_uart0_rts_cts: uart0_rts_cts-0 { > + atmel,pins = > + <1 26 0x1 0x0 /* PB26 periph A */ > + 1 27 0x1 0x0>; /* PB27 periph A */ > + }; > + > + pinctrl_uart0_dtr_dsr: uart0_dtr_dsr-0 { > + atmel,pins = > + <1 24 0x1 0x0 /* PB24 periph A */ > + 1 22 0x1 0x0>; /* PB22 periph A */ > + }; > + > + pinctrl_uart0_dcd: uart0_dcd-0 { > + atmel,pins = > + <1 23 0x1 0x0>; /* PB23 periph A */ > + }; > + > + pinctrl_uart0_ri: uart0_ri-0 { > + atmel,pins = > + <1 25 0x1 0x0>; /* PB25 periph A */ > + }; > + }; > + > + uart1 { > + pinctrl_uart1: uart1-0 { > + atmel,pins = > + <2 6 0x1 0x1 /* PB6 periph A with pullup */ > + 2 7 0x1 0x0>; /* PB7 periph A */ > + }; > + > + pinctrl_uart1_rts_cts: uart1_rts_cts-0 { > + atmel,pins = > + <1 28 0x1 0x0 /* PB28 periph A */ > + 1 29 0x1 0x0>; /* PB29 periph A */ > + }; > + }; > + > + uart2 { > + pinctrl_uart2: uart2-0 { > + atmel,pins = > + <1 8 0x1 0x1 /* PB8 periph A with pullup */ > + 1 9 0x1 0x0>; /* PB9 periph A */ > + }; > + > + pinctrl_uart2_rts_cts: uart2_rts_cts-0 { > + atmel,pins = > + <0 4 0x1 0x0 /* PA4 periph A */ > + 0 5 0x1 0x0>; /* PA5 periph A */ > + }; > + }; > + > + uart3 { > + pinctrl_uart3: uart3-0 { > + atmel,pins = > + <2 10 0x1 0x1 /* PB10 periph A with pullup */ > + 2 11 0x1 0x0>; /* PB11 periph A */ > + }; > + > + pinctrl_uart3_rts_cts: uart3_rts_cts-0 { > + atmel,pins = > + <3 8 0x2 0x0 /* PB8 periph B */ > + 3 10 0x2 0x0>; /* PB10 periph B */ > + }; > + }; > + > + uart4 { > + pinctrl_uart4: uart4-0 { > + atmel,pins = > + <0 31 0x2 0x1 /* PA31 periph B with pullup */ > + 0 30 0x2 0x0>; /* PA30 periph B */ > + }; > + }; > + > + uart5 { > + pinctrl_uart5: uart5-0 { > + atmel,pins = > + <2 12 0x1 0x1 /* PB12 periph A with pullup */ > + 2 13 0x1 0x0>; /* PB13 periph A */ > + }; > + }; > > pioA: gpio@fffff400 { > compatible = "atmel,at91rm9200-gpio"; > @@ -145,6 +240,8 @@ > compatible = "atmel,at91sam9260-usart"; > reg = <0xfffff200 0x200>; > interrupts = <1 4 7>; > + pinctrl-names = "default"; > + pinctrl-0 = <&pinctrl_dbgu>; > status = "disabled"; > }; > > @@ -154,6 +251,8 @@ > interrupts = <6 4 5>; > atmel,use-dma-rx; > atmel,use-dma-tx; > + pinctrl-names = "default"; > + pinctrl-0 = <&pinctrl_uart0>; > status = "disabled"; > }; > > @@ -163,6 +262,8 @@ > interrupts = <7 4 5>; > atmel,use-dma-rx; > atmel,use-dma-tx; > + pinctrl-names = "default"; > + pinctrl-0 = <&pinctrl_uart1>; > status = "disabled"; > }; > > @@ -172,6 +273,8 @@ > interrupts = <8 4 5>; > atmel,use-dma-rx; > atmel,use-dma-tx; > + pinctrl-names = "default"; > + pinctrl-0 = <&pinctrl_uart2>; > status = "disabled"; > }; > > @@ -181,6 +284,8 @@ > interrupts = <23 4 5>; > atmel,use-dma-rx; > atmel,use-dma-tx; > + pinctrl-names = "default"; > + pinctrl-0 = <&pinctrl_uart3>; > status = "disabled"; > }; > > @@ -190,6 +295,8 @@ > interrupts = <24 4 5>; > atmel,use-dma-rx; > atmel,use-dma-tx; > + pinctrl-names = "default"; > + pinctrl-0 = <&pinctrl_uart4>; > status = "disabled"; > }; > > @@ -199,6 +306,8 @@ > interrupts = <25 4 5>; > atmel,use-dma-rx; > atmel,use-dma-tx; > + pinctrl-names = "default"; > + pinctrl-0 = <&pinctrl_uart5>; > status = "disabled"; > }; > > diff --git a/arch/arm/boot/dts/at91sam9263.dtsi b/arch/arm/boot/dts/at91sam9263.dtsi > index e52d5f8..2d054c2 100644 > --- a/arch/arm/boot/dts/at91sam9263.dtsi > +++ b/arch/arm/boot/dts/at91sam9263.dtsi > @@ -105,6 +105,55 @@ > >; > > /* shared pinctrl settings */ > + dbgu { > + pinctrl_dbgu: dbgu-0 { > + atmel,pins = > + <2 30 0x1 0x0 /* PC30 periph A */ > + 2 31 0x1 0x1>; /* PC31 periph with pullup */ > + }; > + }; > + > + uart0 { > + pinctrl_uart0: uart0-0 { > + atmel,pins = > + <0 26 0x1 0x1 /* PA26 periph A with pullup */ > + 0 27 0x1 0x0>; /* PA27 periph A */ > + }; > + > + pinctrl_uart0_rts_cts: uart0_rts_cts-0 { > + atmel,pins = > + <0 28 0x1 0x0 /* PA28 periph A */ > + 0 29 0x1 0x0>; /* PA29 periph A */ > + }; > + }; > + > + uart1 { > + pinctrl_uart1: uart1-0 { > + atmel,pins = > + <3 0 0x1 0x1 /* PD0 periph A with pullup */ > + 3 1 0x1 0x0>; /* PD1 periph A */ > + }; > + > + pinctrl_uart1_rts_cts: uart1_rts_cts-0 { > + atmel,pins = > + <3 7 0x2 0x0 /* PD7 periph B */ > + 3 8 0x2 0x0>; /* PD8 periph B */ > + }; > + }; > + > + uart2 { > + pinctrl_uart2: uart2-0 { > + atmel,pins = > + <3 2 0x1 0x1 /* PD2 periph A with pullup */ > + 3 3 0x1 0x0>; /* PD3 periph A */ > + }; > + > + pinctrl_uart2_rts_cts: uart2_rts_cts-0 { > + atmel,pins = > + <3 5 0x2 0x0 /* PD5 periph B */ > + 4 6 0x2 0x0>; /* PD6 periph B */ > + }; > + }; > > pioA: gpio@fffff200 { > compatible = "atmel,at91rm9200-gpio"; > @@ -156,6 +205,8 @@ > compatible = "atmel,at91sam9260-usart"; > reg = <0xffffee00 0x200>; > interrupts = <1 4 7>; > + pinctrl-names = "default"; > + pinctrl-0 = <&pinctrl_dbgu>; > status = "disabled"; > }; > > @@ -165,6 +216,8 @@ > interrupts = <7 4 5>; > atmel,use-dma-rx; > atmel,use-dma-tx; > + pinctrl-names = "default"; > + pinctrl-0 = <&pinctrl_uart0>; > status = "disabled"; > }; > > @@ -174,6 +227,8 @@ > interrupts = <8 4 5>; > atmel,use-dma-rx; > atmel,use-dma-tx; > + pinctrl-names = "default"; > + pinctrl-0 = <&pinctrl_uart1>; > status = "disabled"; > }; > > @@ -183,6 +238,8 @@ > interrupts = <9 4 5>; > atmel,use-dma-rx; > atmel,use-dma-tx; > + pinctrl-names = "default"; > + pinctrl-0 = <&pinctrl_uart2>; > status = "disabled"; > }; > > diff --git a/arch/arm/boot/dts/at91sam9g15.dtsi b/arch/arm/boot/dts/at91sam9g15.dtsi > new file mode 100644 > index 0000000..b0a86ab > --- /dev/null > +++ b/arch/arm/boot/dts/at91sam9g15.dtsi > @@ -0,0 +1,28 @@ > +/* > + * at91sam9g15.dtsi - Device Tree Include file for AT91SAM9G15 SoC > + * > + * Copyright (C) 2012 Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> > + * > + * Licensed under GPLv2. > + */ > + > +/include/ "at91sam9x5.dtsi" > + > +/ { > + model = "Atmel AT91SAM9G15 SoC"; > + compatible = "atmel, at91sam9g15, atmel,at91sam9x5"; > + > + ahb { > + apb { > + pinctrl@fffff200 { > + atmel,mux-mask = < > + /* A B C */ > + 0xffffffff 0xffe0399f 0x00000000 /* pioA */ > + 0x00040000 0x00047e3f 0x00000000 /* pioB */ > + 0xfdffffff 0x00000000 0xb83fffff /* pioC */ > + 0x003fffff 0x003f8000 0x00000000 /* pioD */ > + >; > + }; > + }; > + }; > +}; > diff --git a/arch/arm/boot/dts/at91sam9g15ek.dts b/arch/arm/boot/dts/at91sam9g15ek.dts > new file mode 100644 > index 0000000..86dd3f6 > --- /dev/null > +++ b/arch/arm/boot/dts/at91sam9g15ek.dts > @@ -0,0 +1,16 @@ > +/* > + * at91sam9g15ek.dts - Device Tree file for AT91SAM9G15-EK board > + * > + * Copyright (C) 2012 Atmel, > + * 2012 Nicolas Ferre <nicolas.ferre@atmel.com> > + * > + * Licensed under GPLv2 or later. > + */ > +/dts-v1/; > +/include/ "at91sam9g15.dtsi" > +/include/ "at91sam9x5ek.dtsi" > + > +/ { > + model = "Atmel AT91SAM9G25-EK"; > + compatible = "atmel,at91sam9g15ek", "atmel,at91sam9x5ek", "atmel,at91sam9x5", "atmel,at91sam9"; > +}; > diff --git a/arch/arm/boot/dts/at91sam9g25.dtsi b/arch/arm/boot/dts/at91sam9g25.dtsi > new file mode 100644 > index 0000000..5886ac2 > --- /dev/null > +++ b/arch/arm/boot/dts/at91sam9g25.dtsi > @@ -0,0 +1,28 @@ > +/* > + * at91sam9g25.dtsi - Device Tree Include file for AT91SAM9G25 SoC > + * > + * Copyright (C) 2012 Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> > + * > + * Licensed under GPLv2. > + */ > + > +/include/ "at91sam9x5.dtsi" > + > +/ { > + model = "Atmel AT91SAM9G25 SoC"; > + compatible = "atmel, at91sam9g25, atmel,at91sam9x5"; > + > + ahb { > + apb { > + pinctrl@fffff200 { > + atmel,mux-mask = < > + /* A B C */ > + 0xffffffff 0xffe0399f 0xc000001c /* pioA */ > + 0x0007ffff 0x8000fe3f 0x00000000 /* pioB */ > + 0x80000000 0x07c0ffff 0xb83fffff /* pioC */ > + 0x003fffff 0x003f8000 0x00000000 /* pioD */ > + >; > + }; > + }; > + }; > +}; > diff --git a/arch/arm/boot/dts/at91sam9g25ek.dts b/arch/arm/boot/dts/at91sam9g25ek.dts > dissimilarity index 62% > index 7829a4d..c5ab16f 100644 > --- a/arch/arm/boot/dts/at91sam9g25ek.dts > +++ b/arch/arm/boot/dts/at91sam9g25ek.dts > @@ -1,49 +1,16 @@ > -/* > - * at91sam9g25ek.dts - Device Tree file for AT91SAM9G25-EK board > - * > - * Copyright (C) 2012 Atmel, > - * 2012 Nicolas Ferre <nicolas.ferre@atmel.com> > - * > - * Licensed under GPLv2 or later. > - */ > -/dts-v1/; > -/include/ "at91sam9x5.dtsi" > -/include/ "at91sam9x5cm.dtsi" > - > -/ { > - model = "Atmel AT91SAM9G25-EK"; > - compatible = "atmel,at91sam9g25ek", "atmel,at91sam9x5ek", "atmel,at91sam9x5", "atmel,at91sam9"; > - > - chosen { > - bootargs = "128M console=ttyS0,115200 root=/dev/mtdblock1 rw rootfstype=ubifs ubi.mtd=1 root=ubi0:rootfs"; > - }; > - > - ahb { > - apb { > - dbgu: serial@fffff200 { > - status = "okay"; > - }; > - > - usart0: serial@f801c000 { > - status = "okay"; > - }; > - > - macb0: ethernet@f802c000 { > - phy-mode = "rmii"; > - status = "okay"; > - }; > - }; > - > - usb0: ohci@00600000 { > - status = "okay"; > - num-ports = <2>; > - atmel,vbus-gpio = <&pioD 19 1 > - &pioD 20 1 > - >; > - }; > - > - usb1: ehci@00700000 { > - status = "okay"; > - }; > - }; > -}; > +/* > + * at91sam9g25ek.dts - Device Tree file for AT91SAM9G25-EK board > + * > + * Copyright (C) 2012 Atmel, > + * 2012 Nicolas Ferre <nicolas.ferre@atmel.com> > + * > + * Licensed under GPLv2 or later. > + */ > +/dts-v1/; > +/include/ "at91sam9g25.dtsi" > +/include/ "at91sam9x5ek.dtsi" > + > +/ { > + model = "Atmel AT91SAM9G25-EK"; > + compatible = "atmel,at91sam9g25ek", "atmel,at91sam9x5ek", "atmel,at91sam9x5", "atmel,at91sam9"; > +}; > diff --git a/arch/arm/boot/dts/at91sam9g35.dtsi b/arch/arm/boot/dts/at91sam9g35.dtsi > new file mode 100644 > index 0000000..9cc9446 > --- /dev/null > +++ b/arch/arm/boot/dts/at91sam9g35.dtsi > @@ -0,0 +1,28 @@ > +/* > + * at91sam9g35.dtsi - Device Tree Include file for AT91SAM9G35 SoC > + * > + * Copyright (C) 2012 Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> > + * > + * Licensed under GPLv2. > + */ > + > +/include/ "at91sam9x5.dtsi" > + > +/ { > + model = "Atmel AT91SAM9rG5 SoC"; > + compatible = "atmel, at91sam9g35, atmel,at91sam9x5"; > + > + ahb { > + apb { > + pinctrl@fffff200 { > + atmel,mux-mask = < > + /* A B C */ > + 0xffffffff 0xffe0399f 0xc000000c /* pioA */ > + 0x000406ff 0x00047e3f 0x00000000 /* pioB */ > + 0xfdffffff 0x00000000 0xb83fffff /* pioC */ > + 0x003fffff 0x003f8000 0x00000000 /* pioD */ > + >; > + }; > + }; > + }; > +}; > diff --git a/arch/arm/boot/dts/at91sam9g35ek.dts b/arch/arm/boot/dts/at91sam9g35ek.dts > new file mode 100644 > index 0000000..95944bd > --- /dev/null > +++ b/arch/arm/boot/dts/at91sam9g35ek.dts > @@ -0,0 +1,16 @@ > +/* > + * at91sam9g35ek.dts - Device Tree file for AT91SAM9G35-EK board > + * > + * Copyright (C) 2012 Atmel, > + * 2012 Nicolas Ferre <nicolas.ferre@atmel.com> > + * > + * Licensed under GPLv2 or later. > + */ > +/dts-v1/; > +/include/ "at91sam9g35.dtsi" > +/include/ "at91sam9x5ek.dtsi" > + > +/ { > + model = "Atmel AT91SAM9G35-EK"; > + compatible = "atmel,at91sam9g35ek", "atmel,at91sam9x5ek", "atmel,at91sam9x5", "atmel,at91sam9"; > +}; > diff --git a/arch/arm/boot/dts/at91sam9g45.dtsi b/arch/arm/boot/dts/at91sam9g45.dtsi > index 0e64221..cfe197a 100644 > --- a/arch/arm/boot/dts/at91sam9g45.dtsi > +++ b/arch/arm/boot/dts/at91sam9g45.dtsi > @@ -124,6 +124,69 @@ > >; > > /* shared pinctrl settings */ > + dbgu { > + pinctrl_dbgu: dbgu-0 { > + atmel,pins = > + <1 12 0x1 0x0 /* PB12 periph A */ > + 1 13 0x1 0x0>; /* PB13 periph A */ > + }; > + }; > + > + uart0 { > + pinctrl_uart0: uart0-0 { > + atmel,pins = > + <1 19 0x1 0x1 /* PB19 periph A with pullup */ > + 1 18 0x1 0x0>; /* PB18 periph A */ > + }; > + > + pinctrl_uart0_rts_cts: uart0_rts_cts-0 { > + atmel,pins = > + <1 17 0x2 0x0 /* PB17 periph B */ > + 1 15 0x2 0x0>; /* PB15 periph B */ > + }; > + }; > + > + uart1 { > + pinctrl_uart1: uart1-0 { > + atmel,pins = > + <1 4 0x1 0x1 /* PB4 periph A with pullup */ > + 1 5 0x1 0x0>; /* PB5 periph A */ > + }; > + > + pinctrl_uart1_rts_cts: uart1_rts_cts-0 { > + atmel,pins = > + <3 16 0x1 0x0 /* PD16 periph A */ > + 3 17 0x1 0x0>; /* PD17 periph A */ > + }; > + }; > + > + uart2 { > + pinctrl_uart2: uart2-0 { > + atmel,pins = > + <1 6 0x1 0x1 /* PB6 periph A with pullup */ > + 1 7 0x1 0x0>; /* PB7 periph A */ > + }; > + > + pinctrl_uart2_rts_cts: uart2_rts_cts-0 { > + atmel,pins = > + <2 9 0x2 0x0 /* PC9 periph B */ > + 2 11 0x2 0x0>; /* PC11 periph B */ > + }; > + }; > + > + uart3 { > + pinctrl_uart3: uart3-0 { > + atmel,pins = > + <1 8 0x1 0x1 /* PB9 periph A with pullup */ > + 1 9 0x1 0x0>; /* PB8 periph A */ > + }; > + > + pinctrl_uart3_rts_cts: uart3_rts_cts-0 { > + atmel,pins = > + <0 23 0x2 0x0 /* PA23 periph B */ > + 0 24 0x2 0x0>; /* PA24 periph B */ > + }; > + }; > > pioA: gpio@fffff200 { > compatible = "atmel,at91rm9200-gpio"; > @@ -175,6 +238,8 @@ > compatible = "atmel,at91sam9260-usart"; > reg = <0xffffee00 0x200>; > interrupts = <1 4 7>; > + pinctrl-names = "default"; > + pinctrl-0 = <&pinctrl_dbgu>; > status = "disabled"; > }; > > @@ -184,6 +249,8 @@ > interrupts = <7 4 5>; > atmel,use-dma-rx; > atmel,use-dma-tx; > + pinctrl-names = "default"; > + pinctrl-0 = <&pinctrl_uart0>; > status = "disabled"; > }; > > @@ -193,6 +260,8 @@ > interrupts = <8 4 5>; > atmel,use-dma-rx; > atmel,use-dma-tx; > + pinctrl-names = "default"; > + pinctrl-0 = <&pinctrl_uart1>; > status = "disabled"; > }; > > @@ -202,6 +271,8 @@ > interrupts = <9 4 5>; > atmel,use-dma-rx; > atmel,use-dma-tx; > + pinctrl-names = "default"; > + pinctrl-0 = <&pinctrl_uart2>; > status = "disabled"; > }; > > @@ -211,6 +282,8 @@ > interrupts = <10 4 5>; > atmel,use-dma-rx; > atmel,use-dma-tx; > + pinctrl-names = "default"; > + pinctrl-0 = <&pinctrl_uart3>; > status = "disabled"; > }; > > diff --git a/arch/arm/boot/dts/at91sam9n12.dtsi b/arch/arm/boot/dts/at91sam9n12.dtsi > index ae23a03..36a6ce0 100644 > --- a/arch/arm/boot/dts/at91sam9n12.dtsi > +++ b/arch/arm/boot/dts/at91sam9n12.dtsi > @@ -116,6 +116,79 @@ > >; > > /* shared pinctrl settings */ > + dbgu { > + pinctrl_dbgu: dbgu-0 { > + atmel,pins = > + <0 9 0x1 0x0 /* PA9 periph A */ > + 0 10 0x1 0x1>; /* PA10 periph with pullup */ > + }; > + }; > + > + uart0 { > + pinctrl_uart0: uart0-0 { > + atmel,pins = > + <0 1 0x1 0x1 /* PA1 periph A with pullup */ > + 0 0 0x1 0x0>; /* PA0 periph A */ > + }; > + > + pinctrl_uart0_rts_cts: uart0_rts_cts-0 { > + atmel,pins = > + <0 2 0x1 0x0 /* PA2 periph A */ > + 0 3 0x1 0x0>; /* PA3 periph A */ > + }; > + }; > + > + uart1 { > + pinctrl_uart1: uart1-0 { > + atmel,pins = > + <0 6 0x1 0x1 /* PA6 periph A with pullup */ > + 0 5 0x1 0x0>; /* PA5 periph A */ > + }; > + }; > + > + uart2 { > + pinctrl_uart2: uart2-0 { > + atmel,pins = > + <0 8 0x1 0x1 /* PA8 periph A with pullup */ > + 0 7 0x1 0x0>; /* PA7 periph A */ > + }; > + > + pinctrl_uart2_rts_cts: uart2_rts_cts-0 { > + atmel,pins = > + <1 0 0x2 0x0 /* PB0 periph B */ > + 1 1 0x2 0x0>; /* PB1 periph B */ > + }; > + }; > + > + uart3 { > + pinctrl_uart3: uart3-0 { > + atmel,pins = > + <2 23 0x2 0x1 /* PC23 periph B with pullup */ > + 2 22 0x2 0x0>; /* PC22 periph B */ > + }; > + > + pinctrl_uart3_rts_cts: uart3_rts_cts-0 { > + atmel,pins = > + <2 24 0x2 0x0 /* PC24 periph B */ > + 2 25 0x2 0x0>; /* PC25 periph B */ > + }; > + }; > + > + usart0 { > + pinctrl_usart0: usart0-0 { > + atmel,pins = > + <2 9 0x3 0x1 /* PC9 periph C with pullup */ > + 2 8 0x3 0x0>; /* PC8 periph C */ > + }; > + }; > + > + usart1 { > + pinctrl_usart1: usart1-0 { > + atmel,pins = > + <2 16 0x3 0x1 /* PC17 periph C with pullup */ > + 2 17 0x3 0x0>; /* PC16 periph C */ > + }; > + }; > > pioA: gpio@fffff400 { > compatible = "atmel,at91sam9x5-gpio", "atmel,at91rm9200-gpio"; > @@ -158,6 +231,8 @@ > compatible = "atmel,at91sam9260-usart"; > reg = <0xfffff200 0x200>; > interrupts = <1 4 7>; > + pinctrl-names = "default"; > + pinctrl-0 = <&pinctrl_dbgu>; > status = "disabled"; > }; > > @@ -167,6 +242,8 @@ > interrupts = <5 4 5>; > atmel,use-dma-rx; > atmel,use-dma-tx; > + pinctrl-names = "default"; > + pinctrl-0 = <&pinctrl_uart0>; > status = "disabled"; > }; > > @@ -176,6 +253,8 @@ > interrupts = <6 4 5>; > atmel,use-dma-rx; > atmel,use-dma-tx; > + pinctrl-names = "default"; > + pinctrl-0 = <&pinctrl_uart1>; > status = "disabled"; > }; > > @@ -185,6 +264,8 @@ > interrupts = <7 4 5>; > atmel,use-dma-rx; > atmel,use-dma-tx; > + pinctrl-names = "default"; > + pinctrl-0 = <&pinctrl_uart2>; > status = "disabled"; > }; > > @@ -194,6 +275,8 @@ > interrupts = <8 4 5>; > atmel,use-dma-rx; > atmel,use-dma-tx; > + pinctrl-names = "default"; > + pinctrl-0 = <&pinctrl_uart3>; > status = "disabled"; > }; > }; > diff --git a/arch/arm/boot/dts/at91sam9x25.dtsi b/arch/arm/boot/dts/at91sam9x25.dtsi > new file mode 100644 > index 0000000..d03d734 > --- /dev/null > +++ b/arch/arm/boot/dts/at91sam9x25.dtsi > @@ -0,0 +1,28 @@ > +/* > + * at91sam9x25.dtsi - Device Tree Include file for AT91SAM9X25 SoC > + * > + * Copyright (C) 2012 Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> > + * > + * Licensed under GPLv2. > + */ > + > +/include/ "at91sam9x5.dtsi" > + > +/ { > + model = "Atmel AT91SAM9X25 SoC"; > + compatible = "atmel, at91sam9x25, atmel,at91sam9x5"; > + > + ahb { > + apb { > + pinctrl@fffff200 { > + atmel,mux-mask = < > + /* A B C */ > + 0xffffffff 0xffe03fff 0xc000001c /* pioA */ > + 0x0007ffff 0x00047e3f 0x00000000 /* pioB */ > + 0x80000000 0xfffd0000 0xb83fffff /* pioC */ > + 0x003fffff 0x003f8000 0x00000000 /* pioD */ > + >; > + }; > + }; > + }; > +}; > diff --git a/arch/arm/boot/dts/at91sam9x25ek.dts b/arch/arm/boot/dts/at91sam9x25ek.dts > new file mode 100644 > index 0000000..af907ea > --- /dev/null > +++ b/arch/arm/boot/dts/at91sam9x25ek.dts > @@ -0,0 +1,16 @@ > +/* > + * at91sam9x25ek.dts - Device Tree file for AT91SAM9X25-EK board > + * > + * Copyright (C) 2012 Atmel, > + * 2012 Nicolas Ferre <nicolas.ferre@atmel.com> > + * > + * Licensed under GPLv2 or later. > + */ > +/dts-v1/; > +/include/ "at91sam9x25.dtsi" > +/include/ "at91sam9x5ek.dtsi" > + > +/ { > + model = "Atmel AT91SAM9G25-EK"; > + compatible = "atmel,at91sam9x25ek", "atmel,at91sam9x5ek", "atmel,at91sam9x5", "atmel,at91sam9"; > +}; > diff --git a/arch/arm/boot/dts/at91sam9x35.dtsi b/arch/arm/boot/dts/at91sam9x35.dtsi > new file mode 100644 > index 0000000..139e67e > --- /dev/null > +++ b/arch/arm/boot/dts/at91sam9x35.dtsi > @@ -0,0 +1,28 @@ > +/* > + * at91sam9x35.dtsi - Device Tree Include file for AT91SAM9X35 SoC > + * > + * Copyright (C) 2012 Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> > + * > + * Licensed under GPLv2. > + */ > + > +/include/ "at91sam9x5.dtsi" > + > +/ { > + model = "Atmel AT91SAM9X35 SoC"; > + compatible = "atmel, at91sam9x35, atmel,at91sam9x5"; > + > + ahb { > + apb { > + pinctrl@fffff200 { > + atmel,mux-mask = < > + /* A B C */ > + 0xffffffff 0xffe03fff 0xc000000c /* pioA */ > + 0x000406ff 0x00047e3f 0x00000000 /* pioB */ > + 0xfdffffff 0x00000000 0xb83fffff /* pioC */ > + 0x003fffff 0x003f8000 0x00000000 /* pioD */ > + >; > + }; > + }; > + }; > +}; > diff --git a/arch/arm/boot/dts/at91sam9x35ek.dts b/arch/arm/boot/dts/at91sam9x35ek.dts > new file mode 100644 > index 0000000..5ccb607 > --- /dev/null > +++ b/arch/arm/boot/dts/at91sam9x35ek.dts > @@ -0,0 +1,16 @@ > +/* > + * at91sam9x35ek.dts - Device Tree file for AT91SAM9X35-EK board > + * > + * Copyright (C) 2012 Atmel, > + * 2012 Nicolas Ferre <nicolas.ferre@atmel.com> > + * > + * Licensed under GPLv2 or later. > + */ > +/dts-v1/; > +/include/ "at91sam9x35.dtsi" > +/include/ "at91sam9x5ek.dtsi" > + > +/ { > + model = "Atmel AT91SAM9X35-EK"; > + compatible = "atmel,at91sam9x35ek", "atmel,at91sam9x5ek", "atmel,at91sam9x5", "atmel,at91sam9"; > +}; > diff --git a/arch/arm/boot/dts/at91sam9x5.dtsi b/arch/arm/boot/dts/at91sam9x5.dtsi > index d1df4ea..c585f04 100644 > --- a/arch/arm/boot/dts/at91sam9x5.dtsi > +++ b/arch/arm/boot/dts/at91sam9x5.dtsi > @@ -118,12 +118,91 @@ > atmel,mux-mask = < > /* A B C */ > 0xffffffff 0xffe0399f 0xc000001c /* pioA */ > - 0xffffffff 0xffc003ff 0xffc003ff /* pioB */ > - 0xffffffff 0xffc003ff 0xffc003ff /* pioC */ > - 0xffffffff 0xffc003ff 0xffc003ff /* pioD */ > + 0x0007ffff 0x8000fe3f 0x00000000 /* pioB */ > + 0x80000000 0x07c0ffff 0xb83fffff /* pioC */ > + 0x003fffff 0x003f8000 0x00000000 /* pioD */ > >; > > /* shared pinctrl settings */ > + dbgu { > + pinctrl_dbgu: dbgu-0 { > + atmel,pins = > + <0 9 0x1 0x0 /* PA9 periph A */ > + 0 10 0x1 0x1>; /* PA10 periph A with pullup */ > + }; > + }; > + > + uart0 { > + pinctrl_uart0: uart0-0 { > + atmel,pins = > + <0 0 0x1 0x1 /* PA0 periph A with pullup */ > + 0 1 0x1 0x0>; /* PA1 periph A */ > + }; > + > + pinctrl_uart0_rts_cts: uart0_rts_cts-0 { > + atmel,pins = > + <0 2 0x1 0x0 /* PA2 periph A */ > + 0 3 0x1 0x0>; /* PA3 periph A */ > + }; > + }; > + > + uart1 { > + pinctrl_uart1: uart1-0 { > + atmel,pins = > + <0 5 0x1 0x1 /* PA5 periph A with pullup */ > + 0 6 0x1 0x0>; /* PA6 periph A */ > + }; > + > + pinctrl_uart1_rts_cts: uart1_rts_cts-0 { > + atmel,pins = > + <3 27 0x3 0x0 /* PC27 periph C */ > + 3 28 0x3 0x0>; /* PC28 periph C */ > + }; > + }; > + > + uart2 { > + pinctrl_uart2: uart2-0 { > + atmel,pins = > + <0 7 0x1 0x1 /* PA7 periph A with pullup */ > + 0 8 0x1 0x0>; /* PA8 periph A */ > + }; > + > + pinctrl_uart2_rts_cts: uart2_rts_cts-0 { > + atmel,pins = > + <0 0 0x2 0x0 /* PB0 periph B */ > + 0 1 0x2 0x0>; /* PB1 periph B */ > + }; > + }; > + > + uart3 { > + pinctrl_uart3: uart3-0 { > + atmel,pins = > + <3 23 0x2 0x1 /* PC22 periph B with pullup */ > + 3 23 0x2 0x0>; /* PC23 periph B */ > + }; > + > + pinctrl_uart3_rts_cts: uart3_rts_cts-0 { > + atmel,pins = > + <3 24 0x2 0x0 /* PC24 periph B */ > + 3 25 0x2 0x0>; /* PC25 periph B */ > + }; > + }; > + > + usart0 { > + pinctrl_usart0: usart0-0 { > + atmel,pins = > + <3 8 0x3 0x0 /* PC8 periph C */ > + 3 9 0x3 0x1>; /* PC9 periph C with pullup */ > + }; > + }; > + > + usart1 { > + pinctrl_usart1: usart1-0 { > + atmel,pins = > + <3 16 0x3 0x0 /* PC16 periph C */ > + 3 17 0x3 0x1>; /* PC17 periph C with pullup */ > + }; > + }; > > pioA: gpio@fffff400 { > compatible = "atmel,at91sam9x5-gpio", "atmel,at91rm9200-gpio"; > @@ -168,6 +247,8 @@ > compatible = "atmel,at91sam9260-usart"; > reg = <0xfffff200 0x200>; > interrupts = <1 4 7>; > + pinctrl-names = "default"; > + pinctrl-0 = <&pinctrl_dbgu>; > status = "disabled"; > }; > > @@ -177,6 +258,8 @@ > interrupts = <5 4 5>; > atmel,use-dma-rx; > atmel,use-dma-tx; > + pinctrl-names = "default"; > + pinctrl-0 = <&pinctrl_uart0>; > status = "disabled"; > }; > > @@ -186,6 +269,8 @@ > interrupts = <6 4 5>; > atmel,use-dma-rx; > atmel,use-dma-tx; > + pinctrl-names = "default"; > + pinctrl-0 = <&pinctrl_uart1>; > status = "disabled"; > }; > > @@ -195,6 +280,8 @@ > interrupts = <7 4 5>; > atmel,use-dma-rx; > atmel,use-dma-tx; > + pinctrl-names = "default"; > + pinctrl-0 = <&pinctrl_uart2>; > status = "disabled"; > }; > > diff --git a/arch/arm/boot/dts/at91sam9g25ek.dts b/arch/arm/boot/dts/at91sam9x5ek.dtsi > similarity index 75% > rename from arch/arm/boot/dts/at91sam9g25ek.dts > rename to arch/arm/boot/dts/at91sam9x5ek.dtsi > index 7829a4d..e5000a7 100644 > --- a/arch/arm/boot/dts/at91sam9g25ek.dts > +++ b/arch/arm/boot/dts/at91sam9x5ek.dtsi > @@ -1,18 +1,16 @@ > /* > - * at91sam9g25ek.dts - Device Tree file for AT91SAM9G25-EK board > + * at91sam9x5ek.dtsi - Device Tree file for AT91SAM9x5CM Base board > * > * Copyright (C) 2012 Atmel, > * 2012 Nicolas Ferre <nicolas.ferre@atmel.com> > * > * Licensed under GPLv2 or later. > */ > -/dts-v1/; > -/include/ "at91sam9x5.dtsi" > /include/ "at91sam9x5cm.dtsi" > > / { > - model = "Atmel AT91SAM9G25-EK"; > - compatible = "atmel,at91sam9g25ek", "atmel,at91sam9x5ek", "atmel,at91sam9x5", "atmel,at91sam9"; > + model = "Atmel AT91SAM9X5-EK"; > + compatible = "atmel,at91sam9x5ek", "atmel,at91sam9x5", "atmel,at91sam9"; > > chosen { > bootargs = "128M console=ttyS0,115200 root=/dev/mtdblock1 rw rootfstype=ubifs ubi.mtd=1 root=ubi0:rootfs"; > diff --git a/arch/arm/mach-at91/Makefile.boot b/arch/arm/mach-at91/Makefile.boot > index 30bb733..0838d30 100644 > --- a/arch/arm/mach-at91/Makefile.boot > +++ b/arch/arm/mach-at91/Makefile.boot > @@ -35,4 +35,8 @@ dtb-$(CONFIG_MACH_AT91SAM_DT) += at91sam9m10g45ek.dtb > # sam9n12 > dtb-$(CONFIG_MACH_AT91SAM_DT) += at91sam9n12ek.dtb > # sam9x5 > +dtb-$(CONFIG_MACH_AT91SAM_DT) += at91sam9g15ek.dtb > dtb-$(CONFIG_MACH_AT91SAM_DT) += at91sam9g25ek.dtb > +dtb-$(CONFIG_MACH_AT91SAM_DT) += at91sam9g35ek.dtb > +dtb-$(CONFIG_MACH_AT91SAM_DT) += at91sam9x25ek.dtb > +dtb-$(CONFIG_MACH_AT91SAM_DT) += at91sam9x35ek.dtb >
On 08/10/2012 03:02 PM, Jean-Christophe PLAGNIOL-VILLARD : > Cc: Linus Walleij <linus.walleij@linaro.org> > Cc: Nicolas Ferre <nicolas.ferre@atmel.com> > Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> > Cc: linux-serial@vger.kernel.org > --- > Hi Greg, > > if you don't mind I would like to apply with the rest of the pinctrl > patch series > > Best Regards, > J. > drivers/tty/serial/atmel_serial.c | 8 ++++++++ > 1 file changed, 8 insertions(+) > > diff --git a/drivers/tty/serial/atmel_serial.c b/drivers/tty/serial/atmel_serial.c > index 3d7e1ee..65f891b 100644 > --- a/drivers/tty/serial/atmel_serial.c > +++ b/drivers/tty/serial/atmel_serial.c > @@ -39,6 +39,7 @@ > #include <linux/atmel_pdc.h> > #include <linux/atmel_serial.h> > #include <linux/uaccess.h> > +#include <linux/pinctrl/consumer.h> > > #include <asm/io.h> > #include <asm/ioctls.h> > @@ -1773,6 +1774,7 @@ static int __devinit atmel_serial_probe(struct platform_device *pdev) > struct atmel_uart_data *pdata = pdev->dev.platform_data; > void *data; > int ret = -ENODEV; > + struct pinctrl *pinctrl; > > BUILD_BUG_ON(ATMEL_SERIAL_RINGSIZE & (ATMEL_SERIAL_RINGSIZE - 1)); > > @@ -1805,6 +1807,12 @@ static int __devinit atmel_serial_probe(struct platform_device *pdev) > > atmel_init_port(port, pdev); > > + pinctrl = devm_pinctrl_get_select_default(&pdev->dev); > + if (IS_ERR(pinctrl)) { > + ret = PTR_ERR(pinctrl); > + goto err; > + } > + > if (!atmel_use_dma_rx(&port->uart)) { > ret = -ENOMEM; > data = kmalloc(sizeof(struct atmel_uart_char) No: you should branch to "err_alloc_ring:". Bye,
On 08/10/2012 03:02 PM, Jean-Christophe PLAGNIOL-VILLARD : > Cc: Linus Walleij <linus.walleij@linaro.org> > Cc: Nicolas Ferre <nicolas.ferre@atmel.com> > Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> > --- > arch/arm/boot/dts/at91sam9m10g45ek.dts | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/arch/arm/boot/dts/at91sam9m10g45ek.dts b/arch/arm/boot/dts/at91sam9m10g45ek.dts > index a3633bd..16a13cd 100644 > --- a/arch/arm/boot/dts/at91sam9m10g45ek.dts > +++ b/arch/arm/boot/dts/at91sam9m10g45ek.dts > @@ -39,6 +39,7 @@ > }; > > usart1: serial@fff90000 { > + pinctrl-0 = <&pinctrl_uart0 &pinctrl_uart1_rts_cts>; > status = "okay"; > }; Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
On 08/10/2012 03:02 PM, Jean-Christophe PLAGNIOL-VILLARD : > Cc: Linus Walleij <linus.walleij@linaro.org> > Cc: Nicolas Ferre <nicolas.ferre@atmel.com> > Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> > --- > arch/arm/boot/dts/at91sam9263ek.dts | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/arch/arm/boot/dts/at91sam9263ek.dts b/arch/arm/boot/dts/at91sam9263ek.dts > index f86ac4b..7cfe9d5 100644 > --- a/arch/arm/boot/dts/at91sam9263ek.dts > +++ b/arch/arm/boot/dts/at91sam9263ek.dts > @@ -38,6 +38,7 @@ > }; > > usart0: serial@fff8c000 { > + pinctrl-0 = <&pinctrl_uart0 &pinctrl_uart0_rts_cts>; > status = "okay"; > }; > Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
On 08/10/2012 03:02 PM, Jean-Christophe PLAGNIOL-VILLARD : > Cc: Linus Walleij <linus.walleij@linaro.org> > Cc: Nicolas Ferre <nicolas.ferre@atmel.com> > Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> > --- > arch/arm/boot/dts/at91sam9g20ek_common.dtsi | 6 ++++++ > 1 file changed, 6 insertions(+) > > diff --git a/arch/arm/boot/dts/at91sam9g20ek_common.dtsi b/arch/arm/boot/dts/at91sam9g20ek_common.dtsi > index b06c0db..e33ab0a 100644 > --- a/arch/arm/boot/dts/at91sam9g20ek_common.dtsi > +++ b/arch/arm/boot/dts/at91sam9g20ek_common.dtsi > @@ -35,6 +35,12 @@ > }; > > usart0: serial@fffb0000 { > + pinctrl-0 = > + <&pinctrl_uart0 > + &pinctrl_uart0_rts_cts > + &pinctrl_uart0_dtr_dsr > + &pinctrl_uart0_dcd > + &pinctrl_uart0_ri>; > status = "okay"; > }; > > Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Hi, This patch series introduce the pinctrl on AT91 on all the DT Soc. THe pinctrl is limited to only the DT. Old code still use the custom at91 pin mux api. The following changes since commit 0d7614f09c1ebdbaa1599a5aba7593f147bf96ee: Linux 3.6-rc1 (2012-08-02 16:38:10 -0700) are available in the git repository at: git://github.com/at91linux/linux-at91.git j/pinctrl for you to fetch changes up to 7ff6e8b37d1f334ef24b87661c40aaa548dd93f6: MTD: atmel_nand: add pinctrl consumer support (2012-08-10 20:46:24 +0800) ---------------------------------------------------------------- Jean-Christophe PLAGNIOL-VILLARD (14): ARM: at91: gpio: implement request and free at91: regroup gpio and pinctrl under a simple-bus arm: at91: at91sam9x5: fix gpio number per bank ARM: at91: add dummies pinctrl for non dt platform ARM: at91: add pinctrl support arm: at91: dt: at91sam9 add pinctrl support arm: at91: dt: at91sam9 add serial pinctrl support tty: atmel_serial: add pinctrl support arm: at91: dt: sam9m10g45ek: use rts/cts pinctrl group for uart1 arm: at91: dt: sam9263ek: use rts/cts pinctrl group for uart0 arm: at91: dt: sam9g20ek: use rts/cts/dtr/dsr/dcd/ri pinctrl group for uart0 MTD: atmel nand: fix gpio missing request arm: at91: dt: at91sam9 add nand pinctrl support MTD: atmel_nand: add pinctrl consumer support Documentation/devicetree/bindings/gpio/gpio_atmel.txt | 5 + Documentation/devicetree/bindings/pinctrl/atmel,at91-pinctrl.txt | 84 ++++++++ arch/arm/Kconfig | 1 + arch/arm/boot/dts/at91sam9260.dtsi | 182 +++++++++++++--- arch/arm/boot/dts/at91sam9263.dtsi | 164 +++++++++++---- arch/arm/boot/dts/at91sam9263ek.dts | 1 + arch/arm/boot/dts/at91sam9g15.dtsi | 28 +++ arch/arm/boot/dts/at91sam9g15ek.dts | 16 ++ arch/arm/boot/dts/at91sam9g20ek_common.dtsi | 6 + arch/arm/boot/dts/at91sam9g25.dtsi | 28 +++ arch/arm/boot/dts/at91sam9g25ek.dts | 37 +--- arch/arm/boot/dts/at91sam9g35.dtsi | 28 +++ arch/arm/boot/dts/at91sam9g35ek.dts | 16 ++ arch/arm/boot/dts/at91sam9g45.dtsi | 181 ++++++++++++---- arch/arm/boot/dts/at91sam9m10g45ek.dts | 1 + arch/arm/boot/dts/at91sam9n12.dtsi | 173 +++++++++++++--- arch/arm/boot/dts/at91sam9x25.dtsi | 28 +++ arch/arm/boot/dts/at91sam9x25ek.dts | 16 ++ arch/arm/boot/dts/at91sam9x35.dtsi | 28 +++ arch/arm/boot/dts/at91sam9x35ek.dts | 16 ++ arch/arm/boot/dts/at91sam9x5.dtsi | 179 +++++++++++++--- arch/arm/boot/dts/at91sam9x5ek.dtsi | 47 +++++ arch/arm/configs/at91_dt_defconfig | 1 + arch/arm/mach-at91/Makefile.boot | 4 + arch/arm/mach-at91/at91sam9263.c | 5 + arch/arm/mach-at91/at91sam9g45.c | 6 + arch/arm/mach-at91/at91sam9n12.c | 3 - arch/arm/mach-at91/at91sam9x5.c | 7 - arch/arm/mach-at91/board-dt.c | 2 - arch/arm/mach-at91/gpio.c | 197 ++++-------------- arch/arm/mach-at91/setup.c | 6 +- drivers/mtd/nand/atmel_nand.c | 65 +++++- drivers/pinctrl/Kconfig | 9 + drivers/pinctrl/Makefile | 1 + drivers/pinctrl/pinctrl-at91.c | 1448 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ drivers/tty/serial/atmel_serial.c | 8 + 36 files changed, 2654 insertions(+), 373 deletions(-) create mode 100644 Documentation/devicetree/bindings/pinctrl/atmel,at91-pinctrl.txt create mode 100644 arch/arm/boot/dts/at91sam9g15.dtsi create mode 100644 arch/arm/boot/dts/at91sam9g15ek.dts create mode 100644 arch/arm/boot/dts/at91sam9g25.dtsi create mode 100644 arch/arm/boot/dts/at91sam9g35.dtsi create mode 100644 arch/arm/boot/dts/at91sam9g35ek.dts create mode 100644 arch/arm/boot/dts/at91sam9x25.dtsi create mode 100644 arch/arm/boot/dts/at91sam9x25ek.dts create mode 100644 arch/arm/boot/dts/at91sam9x35.dtsi create mode 100644 arch/arm/boot/dts/at91sam9x35ek.dts create mode 100644 arch/arm/boot/dts/at91sam9x5ek.dtsi create mode 100644 drivers/pinctrl/pinctrl-at91.c Best Regards, J.