| Message ID | 1388507534-10570-2-git-send-email-jjhiblot@traphandler.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Hello JJ, On 31/12/2013 17:32, jjhiblot@traphandler.com wrote: > From: jean-jacques hiblot <jean-jacques.hiblot@jdsu.com> > > This patch implements the basics to boot a at91sam9261ek with a dt-enabled > kernel (at91_dt_defconfig). > Only dbgu, nand and watchdog are described in the DT. > > Signed-off-by: Jean-Jacques Hiblot <jjhiblot@traphandler.com> > --- > arch/arm/boot/dts/at91sam9261.dtsi | 476 +++++++++++++++++++++++++++++++ > arch/arm/boot/dts/at91sam9261ek.dts | 75 +++++ > arch/arm/mach-at91/at91sam9261.c | 15 + > arch/arm/mach-at91/at91sam9261_devices.c | 18 ++ Just a nitpick, but I guess it would be cleaner to split this patch: 1) add a91sam9261 dt SoC support 2) move at91sam9261ek board to dt > 4 files changed, 584 insertions(+) > create mode 100644 arch/arm/boot/dts/at91sam9261.dtsi > create mode 100644 arch/arm/boot/dts/at91sam9261ek.dts > > diff --git a/arch/arm/boot/dts/at91sam9261.dtsi b/arch/arm/boot/dts/at91sam9261.dtsi > new file mode 100644 > index 0000000..ce23d7d > --- /dev/null > +++ b/arch/arm/boot/dts/at91sam9261.dtsi > @@ -0,0 +1,476 @@ > +/* > + * at91sam9261.dtsi - Device Tree Include file for AT91SAM9263 family SoC > + * > + * Copyright (C) 2013 Jean-Jacques Hiblot <jjhiblot@traphandler.com> > + * > + * Licensed under GPLv2 only. > + */ > + > +#include "skeleton.dtsi" > +#include <dt-bindings/pinctrl/at91.h> > +#include <dt-bindings/interrupt-controller/irq.h> > +#include <dt-bindings/gpio/gpio.h> > + > +/ { > + model = "Atmel AT91SAM9261 family SoC"; > + compatible = "atmel,at91sam9261"; > + interrupt-parent = <&aic>; > + > + aliases { > + serial0 = &dbgu; > + serial1 = &usart0; > + serial2 = &usart1; > + serial3 = &usart2; > + gpio0 = &pioA; > + gpio1 = &pioB; > + gpio2 = &pioC; > + tcb0 = &tcb0; > + i2c0 = &i2c0; > + ssc0 = &ssc0; > + ssc1 = &ssc1; > + }; > + cpus { > + #address-cells = <0>; > + #size-cells = <0>; > + > + cpu { > + compatible = "arm,arm926ej-s"; > + device_type = "cpu"; > + }; > + }; > + > + memory { > + reg = <0x20000000 0x08000000>; > + }; > + > + ahb { > + compatible = "simple-bus"; > + #address-cells = <1>; > + #size-cells = <1>; > + ranges; > + > + apb { > + compatible = "simple-bus"; > + #address-cells = <1>; > + #size-cells = <1>; > + ranges; > + > + aic: interrupt-controller@fffff000 { > + #interrupt-cells = <3>; > + compatible = "atmel,at91rm9200-aic"; > + interrupt-controller; > + reg = <0xfffff000 0x200>; > + atmel,external-irqs = <29 30 31>; > + }; > + > + pmc: pmc@fffffc00 { > + compatible = "atmel,at91rm9200-pmc"; > + reg = <0xfffffc00 0x100>; > + }; > + > + ramc: ramc@ffffea00 { > + compatible = "atmel,at91sam9260-sdramc"; > + reg = <0xffffea00 0x200>; > + }; > + > + pit: timer@fffffd30 { > + compatible = "atmel,at91sam9260-pit"; > + reg = <0xfffffd30 0xf>; > + interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>; > + }; > + > + tcb0: timer@fffa0000 { > + compatible = "atmel,at91rm9200-tcb"; > + reg = <0xfffa0000 0x100>; > + interrupts = < 17 IRQ_TYPE_LEVEL_HIGH 0 > + 18 IRQ_TYPE_LEVEL_HIGH 0 > + 19 IRQ_TYPE_LEVEL_HIGH 0 > + >; > + status = "disabled"; > + }; > + > + rstc@fffffd00 { > + compatible = "atmel,at91sam9260-rstc"; > + reg = <0xfffffd00 0x10>; > + }; > + > + shdwc@fffffd10 { > + compatible = "atmel,at91sam9260-shdwc"; > + reg = <0xfffffd10 0x10>; > + }; > + > + pinctrl@fffff400 { > + #address-cells = <1>; > + #size-cells = <1>; > + compatible = "atmel,at91rm9200-pinctrl", "simple-bus"; > + ranges = <0xfffff400 0xfffff400 0xa00>; > + > + atmel,mux-mask = < > + /* A B */ > + 0xffffffff 0xfffffff7 /* pioA */ > + 0xffffffff 0xfffffff4 /* pioB */ > + 0xffffffff 0xffffff07 /* pioC */ > + >; > + > + /* shared pinctrl settings */ > + dbgu { > + pinctrl_dbgu: dbgu-0 { > + atmel,pins = > + <AT91_PIOA 9 AT91_PERIPH_A AT91_PINCTRL_NONE /* PA9 periph A */ > + AT91_PIOA 10 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>; /* PA10 periph A with pullup */ > + }; > + }; > + > + usart0 { > + pinctrl_usart0: usart0-0 { > + atmel,pins = > + <AT91_PIOC 8 AT91_PERIPH_A AT91_PINCTRL_PULL_UP /* PC8 periph A with pullup */ > + AT91_PIOC 9 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PC9 periph A */ > + }; > + > + pinctrl_usart0_rts: usart0_rts-0 { > + atmel,pins = > + <AT91_PIOC 10 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PC10 periph A */ > + }; > + > + pinctrl_usart0_cts: usart0_cts-0 { > + atmel,pins = > + <AT91_PIOC 11 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PC11 periph A */ > + }; > + }; > + > + usart1 { > + pinctrl_usart1: usart1-0 { > + atmel,pins = > + <AT91_PIOC 12 AT91_PERIPH_A AT91_PINCTRL_PULL_UP /* PC12 periph A with pullup */ > + AT91_PIOC 13 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PC13 periph A */ > + }; > + > + pinctrl_usart1_rts: usart1_rts-0 { > + atmel,pins = > + <AT91_PIOA 12 AT91_PERIPH_B AT91_PINCTRL_NONE>; /* PA12 periph B */ > + }; > + > + pinctrl_usart1_cts: usart1_cts-0 { > + atmel,pins = > + <AT91_PIOA 13 AT91_PERIPH_B AT91_PINCTRL_NONE>; /* PA13 periph B */ > + }; > + }; > + > + usart2 { > + pinctrl_usart2: usart2-0 { > + atmel,pins = > + <AT91_PIOC 14 AT91_PERIPH_A AT91_PINCTRL_PULL_UP /* PC14 periph A with pullup */ > + AT91_PIOC 15 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PC15 periph A */ > + }; > + > + pinctrl_usart2_rts: usart2_rts-0 { > + atmel,pins = > + <AT91_PIOA 15 AT91_PERIPH_B AT91_PINCTRL_NONE>; /* PA15 periph B */ > + }; > + > + pinctrl_usart2_cts: usart2_cts-0 { > + atmel,pins = > + <AT91_PIOA 16 AT91_PERIPH_B AT91_PINCTRL_NONE>; /* PA16 periph B */ > + }; > + }; > + > + nand { > + pinctrl_nand: nand-0 { > + atmel,pins = > + <AT91_PIOC 15 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP /* PC15 gpio RDY pin pull_up*/ > + AT91_PIOC 14 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP>; /* PC14 gpio enable pin pull_up */ > + }; > + }; > + > + mmc0 { > + pinctrl_mmc0_clk: mmc0_clk-0 { > + atmel,pins = > + <AT91_PIOA 2 AT91_PERIPH_B AT91_PINCTRL_NONE>; /* PA2 periph B */ > + }; > + > + pinctrl_mmc0_slot0_cmd_dat0: mmc0_slot0_cmd_dat0-0 { > + atmel,pins = > + <AT91_PIOA 1 AT91_PERIPH_B AT91_PINCTRL_PULL_UP /* PA1 periph B with pullup */ > + AT91_PIOA 0 AT91_PERIPH_B AT91_PINCTRL_PULL_UP>; /* PA0 periph B with pullup */ > + }; > + > + pinctrl_mmc0_slot0_dat1_3: mmc0_slot0_dat1_3-0 { > + atmel,pins = > + <AT91_PIOA 4 AT91_PERIPH_B AT91_PINCTRL_PULL_UP /* PA4 periph B with pullup */ > + AT91_PIOA 5 AT91_PERIPH_B AT91_PINCTRL_PULL_UP /* PA5 periph B with pullup */ > + AT91_PIOA 6 AT91_PERIPH_B AT91_PINCTRL_PULL_UP>; /* PA6 periph B with pullup */ > + }; > + }; > + > + ssc0 { > + pinctrl_ssc0_tx: ssc0_tx-0 { > + atmel,pins = > + <AT91_PIOB 21 AT91_PERIPH_A AT91_PINCTRL_NONE /* PB21 periph A */ > + AT91_PIOB 22 AT91_PERIPH_A AT91_PINCTRL_NONE /* PB22 periph A */ > + AT91_PIOB 23 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PB23 periph A */ > + }; > + > + pinctrl_ssc0_rx: ssc0_rx-0 { > + atmel,pins = > + <AT91_PIOB 24 AT91_PERIPH_A AT91_PINCTRL_NONE /* PB24 periph A */ > + AT91_PIOB 25 AT91_PERIPH_A AT91_PINCTRL_NONE /* PB25 periph A */ > + AT91_PIOB 26 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PB26 periph A */ > + }; > + }; > + > + ssc1 { > + pinctrl_ssc1_tx: ssc1_tx-0 { > + atmel,pins = > + <AT91_PIOA 17 AT91_PERIPH_B AT91_PINCTRL_NONE /* PA17 periph B */ > + AT91_PIOA 18 AT91_PERIPH_B AT91_PINCTRL_NONE /* PA18 periph B */ > + AT91_PIOA 19 AT91_PERIPH_B AT91_PINCTRL_NONE>; /* PA19 periph B */ > + }; > + > + pinctrl_ssc1_rx: ssc1_rx-0 { > + atmel,pins = > + <AT91_PIOA 20 AT91_PERIPH_B AT91_PINCTRL_NONE /* PA20 periph B */ > + AT91_PIOA 21 AT91_PERIPH_B AT91_PINCTRL_NONE /* PA21 periph B */ > + AT91_PIOA 22 AT91_PERIPH_B AT91_PINCTRL_NONE>; /* PA22 periph B */ > + }; > + }; > + > + spi0 { > + pinctrl_spi0: spi0-0 { > + atmel,pins = > + <AT91_PIOA 0 AT91_PERIPH_A AT91_PINCTRL_NONE /* PA0 periph A SPI0_MISO pin */ > + AT91_PIOA 1 AT91_PERIPH_A AT91_PINCTRL_NONE /* PA1 periph A SPI0_MOSI pin */ > + AT91_PIOA 2 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PA2 periph A SPI0_SPCK pin */ > + }; > + }; > + > + spi1 { > + pinctrl_spi1: spi1-0 { > + atmel,pins = > + <AT91_PIOB 30 AT91_PERIPH_A AT91_PINCTRL_NONE /* PB30 periph A SPI1_MISO pin */ > + AT91_PIOB 31 AT91_PERIPH_A AT91_PINCTRL_NONE /* PB31 periph A SPI1_MOSI pin */ > + AT91_PIOB 29 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PB29 periph A SPI1_SPCK pin */ > + }; > + }; > + > + tcb0 { > + pinctrl_tcb0_tclk0: tcb0_tclk0-0 { > + atmel,pins = <AT91_PIOC 16 AT91_PERIPH_B AT91_PINCTRL_NONE>; > + }; > + > + pinctrl_tcb0_tclk1: tcb0_tclk1-0 { > + atmel,pins = <AT91_PIOC 17 AT91_PERIPH_B AT91_PINCTRL_NONE>; > + }; > + > + pinctrl_tcb0_tclk2: tcb0_tclk2-0 { > + atmel,pins = <AT91_PIOC 18 AT91_PERIPH_B AT91_PINCTRL_NONE>; > + }; > + > + pinctrl_tcb0_tioa0: tcb0_tioa0-0 { > + atmel,pins = <AT91_PIOC 19 AT91_PERIPH_B AT91_PINCTRL_NONE>; > + }; > + > + pinctrl_tcb0_tioa1: tcb0_tioa1-0 { > + atmel,pins = <AT91_PIOC 21 AT91_PERIPH_B AT91_PINCTRL_NONE>; > + }; > + > + pinctrl_tcb0_tioa2: tcb0_tioa2-0 { > + atmel,pins = <AT91_PIOC 23 AT91_PERIPH_B AT91_PINCTRL_NONE>; > + }; > + > + pinctrl_tcb0_tiob0: tcb0_tiob0-0 { > + atmel,pins = <AT91_PIOC 20 AT91_PERIPH_B AT91_PINCTRL_NONE>; > + }; > + > + pinctrl_tcb0_tiob1: tcb0_tiob1-0 { > + atmel,pins = <AT91_PIOC 22 AT91_PERIPH_B AT91_PINCTRL_NONE>; > + }; > + > + pinctrl_tcb0_tiob2: tcb0_tiob2-0 { > + atmel,pins = <AT91_PIOC 24 AT91_PERIPH_B AT91_PINCTRL_NONE>; > + }; > + }; > + > + pioA: gpio@fffff400 { > + compatible = "atmel,at91rm9200-gpio"; > + reg = <0xfffff400 0x200>; > + interrupts = <2 IRQ_TYPE_LEVEL_HIGH 1>; > + #gpio-cells = <2>; > + gpio-controller; > + interrupt-controller; > + #interrupt-cells = <2>; > + }; > + > + pioB: gpio@fffff600 { > + compatible = "atmel,at91rm9200-gpio"; > + reg = <0xfffff600 0x200>; > + interrupts = <3 IRQ_TYPE_LEVEL_HIGH 1>; > + #gpio-cells = <2>; > + gpio-controller; > + interrupt-controller; > + #interrupt-cells = <2>; > + }; > + > + pioC: gpio@fffff800 { > + compatible = "atmel,at91rm9200-gpio"; > + reg = <0xfffff800 0x200>; > + interrupts = <4 IRQ_TYPE_LEVEL_HIGH 1>; > + #gpio-cells = <2>; > + gpio-controller; > + interrupt-controller; > + #interrupt-cells = <2>; > + }; > + }; > + > + dbgu: serial@fffff200 { > + compatible = "atmel,at91sam9260-usart"; > + reg = <0xfffff200 0x200>; > + interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>; > + pinctrl-names = "default"; > + pinctrl-0 = <&pinctrl_dbgu>; > + status = "disabled"; > + }; > + > + usart0: serial@fffb0000 { > + compatible = "atmel,at91sam9260-usart"; > + reg = <0xfffb0000 0x200>; > + interrupts = <6 IRQ_TYPE_LEVEL_HIGH 5>; > + atmel,use-dma-rx; > + atmel,use-dma-tx; > + pinctrl-names = "default"; > + pinctrl-0 = <&pinctrl_usart0>; > + status = "disabled"; > + }; > + > + usart1: serial@ffffb400 { > + compatible = "atmel,at91sam9260-usart"; > + reg = <0xfffb4000 0x200>; > + interrupts = <7 IRQ_TYPE_LEVEL_HIGH 5>; > + atmel,use-dma-rx; > + atmel,use-dma-tx; > + pinctrl-names = "default"; > + pinctrl-0 = <&pinctrl_usart1>; > + status = "disabled"; > + }; > + > + usart2: serial@fff94000 { > + compatible = "atmel,at91sam9260-usart"; > + reg = <0xfffb8000 0x200>; > + interrupts = <8 IRQ_TYPE_LEVEL_HIGH 5>; > + atmel,use-dma-rx; > + atmel,use-dma-tx; > + pinctrl-names = "default"; > + pinctrl-0 = <&pinctrl_usart2>; > + status = "disabled"; > + }; > + > + ssc0: ssc@fffbc000 { > + compatible = "atmel,at91rm9200-ssc"; > + reg = <0xfffbc000 0x4000>; > + interrupts = <14 IRQ_TYPE_LEVEL_HIGH 5>; > + pinctrl-names = "default"; > + pinctrl-0 = <&pinctrl_ssc0_tx &pinctrl_ssc0_rx>; > + status = "disabled"; > + }; > + > + ssc1: ssc@fffc0000 { > + compatible = "atmel,at91rm9200-ssc"; > + reg = <0xfffc0000 0x4000>; > + interrupts = <15 IRQ_TYPE_LEVEL_HIGH 5>; > + pinctrl-names = "default"; > + pinctrl-0 = <&pinctrl_ssc1_tx &pinctrl_ssc1_rx>; > + status = "disabled"; > + }; > + > + usb1: gadget@fffa4000 { > + compatible = "atmel,at91rm9200-udc"; > + reg = <0xfffa4000 0x4000>; > + interrupts = <10 IRQ_TYPE_LEVEL_HIGH 2>; > + status = "disabled"; > + }; > + > + i2c0: i2c@fffac000 { > + compatible = "atmel,at91sam9261-i2c"; > + reg = <0xfffac000 0x100>; > + interrupts = <11 IRQ_TYPE_LEVEL_HIGH 6>; > + #address-cells = <1>; > + #size-cells = <0>; > + status = "disabled"; > + }; > + > + mmc0: mmc@fffa8000 { > + compatible = "atmel,hsmci"; > + reg = <0xfffa8000 0x600>; > + interrupts = <9 IRQ_TYPE_LEVEL_HIGH 0>; > + #address-cells = <1>; > + #size-cells = <0>; > + status = "disabled"; > + }; > + > + watchdog@fffffd40 { > + compatible = "atmel,at91sam9260-wdt"; > + reg = <0xfffffd40 0x10>; > + status = "disabled"; > + }; > + > + spi0: spi@fffc8000 { > + #address-cells = <1>; > + #size-cells = <0>; > + compatible = "atmel,at91rm9200-spi"; > + reg = <0xfffc8000 0x200>; > + interrupts = <12 IRQ_TYPE_LEVEL_HIGH 3>; > + pinctrl-names = "default"; > + pinctrl-0 = <&pinctrl_spi0>; > + status = "disabled"; > + }; > + > + spi1: spi@fffcc000 { > + #address-cells = <1>; > + #size-cells = <0>; > + compatible = "atmel,at91rm9200-spi"; > + reg = <0xfffcc000 0x200>; > + interrupts = <13 IRQ_TYPE_LEVEL_HIGH 3>; > + pinctrl-names = "default"; > + pinctrl-0 = <&pinctrl_spi1>; > + status = "disabled"; > + }; > + }; > + > + nand0: nand@40000000 { > + compatible = "atmel,at91rm9200-nand"; > + #address-cells = <1>; > + #size-cells = <1>; > + reg = <0x40000000 0x10000000>; > + atmel,nand-addr-offset = <22>; > + atmel,nand-cmd-offset = <21>; > + pinctrl-names = "default"; > + pinctrl-0 = <&pinctrl_nand>; > + > + gpios = <&pioC 15 GPIO_ACTIVE_HIGH > + &pioC 14 GPIO_ACTIVE_HIGH > + 0 > + >; > + status = "disabled"; > + }; > + > + usb0: ohci@00500000 { > + compatible = "atmel,at91rm9200-ohci", "usb-ohci"; > + reg = <0x00500000 0x100000>; > + interrupts = <20 IRQ_TYPE_LEVEL_HIGH 2>; > + status = "disabled"; > + }; > + }; > + > + i2c@0 { > + compatible = "i2c-gpio"; > + gpios = <&pioA 7 GPIO_ACTIVE_HIGH /* sda */ > + &pioA 8 GPIO_ACTIVE_HIGH /* scl */ > + >; > + i2c-gpio,sda-open-drain; > + i2c-gpio,scl-open-drain; > + i2c-gpio,delay-us = <2>; /* ~100 kHz */ > + #address-cells = <1>; > + #size-cells = <0>; > + status = "disabled"; > + }; > +}; > diff --git a/arch/arm/boot/dts/at91sam9261ek.dts b/arch/arm/boot/dts/at91sam9261ek.dts > new file mode 100644 > index 0000000..f3d22a9 > --- /dev/null > +++ b/arch/arm/boot/dts/at91sam9261ek.dts > @@ -0,0 +1,75 @@ > +/* > + * at91sam9261ek.dts - Device Tree file for Atmel at91sam9261 reference board > + * > + * Copyright (C) 2013 Jean-Jacques Hiblot <jjhiblot@traphandler.com> > + * > + * Licensed under GPLv2 only. > + */ > +/dts-v1/; > +#include "at91sam9261.dtsi" > + > +/ { > + model = "Atmel at91sam9261ek"; > + compatible = "atmel,at91sam9261ek", "atmel,at91sam9261", "atmel,at91sam9"; > + > + chosen { > + bootargs = "mem=64M console=ttyS0,115200"; > + }; > + > + memory { > + reg = <0x20000000 0x4000000>; > + }; > + > + clocks { > + #address-cells = <1>; > + #size-cells = <1>; > + ranges; > + > + main_clock: clock@0 { > + compatible = "atmel,osc", "fixed-clock"; > + clock-frequency = <18432000>; > + }; > + }; > + > + ahb { > + apb { > + dbgu: serial@fffff200 { > + status = "okay"; > + }; > + > + watchdog@fffffd40 { > + status = "okay"; > + }; > + }; > + > + nand0: nand@40000000 { > + nand-bus-width = <8>; > + nand-ecc-mode = "soft"; > + nand-on-flash-bbt = <1>; > + status = "okay"; > + at91bootstrap@0 { > + label = "at91bootstrap"; > + reg = <0x0 0x20000>; > + }; > + }; > + }; > + > + leds { > + compatible = "gpio-leds"; > + ds8 { > + label = "ds8"; > + gpios = <&pioA 13 GPIO_ACTIVE_LOW>; > + linux,default-trigger = "none"; > + }; > + ds7 { > + label = "ds7"; > + gpios = <&pioA 14 GPIO_ACTIVE_LOW>; > + linux,default-trigger = "nand-disk"; > + }; > + ds1 { > + label = "ds1"; > + gpios = <&pioA 23 GPIO_ACTIVE_LOW>; > + linux,default-trigger = "heartbeat"; > + }; > + }; > +}; Didn't you forget the at91sam9261ek entry in arch/arm/boot/dts/Makefile ? > diff --git a/arch/arm/mach-at91/at91sam9261.c b/arch/arm/mach-at91/at91sam9261.c > index 6276b4c..200d17a 100644 > --- a/arch/arm/mach-at91/at91sam9261.c > +++ b/arch/arm/mach-at91/at91sam9261.c > @@ -189,6 +189,21 @@ static struct clk_lookup periph_clocks_lookups[] = { > CLKDEV_CON_ID("pioA", &pioA_clk), > CLKDEV_CON_ID("pioB", &pioB_clk), > CLKDEV_CON_ID("pioC", &pioC_clk), > + /* more usart lookup table for DT entries */ > + CLKDEV_CON_DEV_ID("usart", "fffff200.serial", &mck), > + CLKDEV_CON_DEV_ID("usart", "fffb0000.serial", &usart0_clk), > + CLKDEV_CON_DEV_ID("usart", "ffffb400.serial", &usart1_clk), > + CLKDEV_CON_DEV_ID("usart", "fff94000.serial", &usart2_clk), > + /* more tc lookup table for DT entries */ > + CLKDEV_CON_DEV_ID("t0_clk", "fffa0000.timer", &tc0_clk), > + CLKDEV_CON_DEV_ID("hclk", "500000.ohci", &ohci_clk), > + CLKDEV_CON_DEV_ID("spi_clk", "fffc8000.spi", &spi0_clk), > + CLKDEV_CON_DEV_ID("spi_clk", "fffcc000.spi", &spi1_clk), > + CLKDEV_CON_DEV_ID("mci_clk", "fffa8000.mmc", &mmc_clk), > + CLKDEV_CON_DEV_ID(NULL, "fffac000.i2c", &twi_clk), > + CLKDEV_CON_DEV_ID(NULL, "fffff400.gpio", &pioA_clk), > + CLKDEV_CON_DEV_ID(NULL, "fffff600.gpio", &pioB_clk), > + CLKDEV_CON_DEV_ID(NULL, "fffff800.gpio", &pioC_clk), > }; > It would be great if you could add dt clk support to at91sam9261 SoC :) (see https://github.com/at91linux/linux-at91/blob/bbr/at91-3.14-clk/arch/arm/boot/dts/at91sam9x5.dtsi#L87). But this is antoher story... ;) > static struct clk_lookup usart_clocks_lookups[] = { > diff --git a/arch/arm/mach-at91/at91sam9261_devices.c b/arch/arm/mach-at91/at91sam9261_devices.c > index b2a3474..2f926d9 100644 > --- a/arch/arm/mach-at91/at91sam9261_devices.c > +++ b/arch/arm/mach-at91/at91sam9261_devices.c > @@ -599,8 +599,23 @@ static struct platform_device at91sam9261_tcb_device = { > .num_resources = ARRAY_SIZE(tcb_resources), > }; > > +#if defined(CONFIG_OF) > +static struct of_device_id tcb_ids[] = { > + { .compatible = "atmel,at91rm9200-tcb" }, > + { /*sentinel*/ } > +}; > +#endif > static void __init at91_add_device_tc(void) > { > +#if defined(CONFIG_OF) > + struct device_node *np; > + > + np = of_find_matching_node(NULL, tcb_ids); > + if (np) { > + of_node_put(np); > + return; > + } > +#endif Why do you need this ? Isn't this already skipped by the following test (if(of_have_populated_dt())) ? > platform_device_register(&at91sam9261_tcb_device); > } > #else > @@ -1088,6 +1103,9 @@ void __init at91_add_device_serial(void) {} > */ > static int __init at91_add_standard_devices(void) > { > + if (of_have_populated_dt()) > + return 0; > + > at91_add_device_rtt(); > at91_add_device_watchdog(); > at91_add_device_tc(); > Best Regards, Boris
2014/1/3 boris brezillon <b.brezillon@overkiz.com>: > Hello JJ, > > > On 31/12/2013 17:32, jjhiblot@traphandler.com wrote: >> >> From: jean-jacques hiblot <jean-jacques.hiblot@jdsu.com> >> >> This patch implements the basics to boot a at91sam9261ek with a dt-enabled >> kernel (at91_dt_defconfig). >> Only dbgu, nand and watchdog are described in the DT. >> >> Signed-off-by: Jean-Jacques Hiblot <jjhiblot@traphandler.com> >> --- >> arch/arm/boot/dts/at91sam9261.dtsi | 476 >> +++++++++++++++++++++++++++++++ >> arch/arm/boot/dts/at91sam9261ek.dts | 75 +++++ >> arch/arm/mach-at91/at91sam9261.c | 15 + >> arch/arm/mach-at91/at91sam9261_devices.c | 18 ++ > > > Just a nitpick, but I guess it would be cleaner to split this patch: > 1) add a91sam9261 dt SoC support > 2) move at91sam9261ek board to dt I'll split this patch for the next round. > > >> 4 files changed, 584 insertions(+) >> create mode 100644 arch/arm/boot/dts/at91sam9261.dtsi >> create mode 100644 arch/arm/boot/dts/at91sam9261ek.dts >> >> diff --git a/arch/arm/boot/dts/at91sam9261.dtsi >> b/arch/arm/boot/dts/at91sam9261.dtsi >> new file mode 100644 >> index 0000000..ce23d7d >> --- /dev/null >> +++ b/arch/arm/boot/dts/at91sam9261.dtsi >> @@ -0,0 +1,476 @@ >> +/* >> + * at91sam9261.dtsi - Device Tree Include file for AT91SAM9263 family SoC >> + * >> + * Copyright (C) 2013 Jean-Jacques Hiblot <jjhiblot@traphandler.com> >> + * >> + * Licensed under GPLv2 only. >> + */ >> + >> +#include "skeleton.dtsi" >> +#include <dt-bindings/pinctrl/at91.h> >> +#include <dt-bindings/interrupt-controller/irq.h> >> +#include <dt-bindings/gpio/gpio.h> >> + >> +/ { >> + model = "Atmel AT91SAM9261 family SoC"; >> + compatible = "atmel,at91sam9261"; >> + interrupt-parent = <&aic>; >> + >> + aliases { >> + serial0 = &dbgu; >> + serial1 = &usart0; >> + serial2 = &usart1; >> + serial3 = &usart2; >> + gpio0 = &pioA; >> + gpio1 = &pioB; >> + gpio2 = &pioC; >> + tcb0 = &tcb0; >> + i2c0 = &i2c0; >> + ssc0 = &ssc0; >> + ssc1 = &ssc1; >> + }; >> + cpus { >> + #address-cells = <0>; >> + #size-cells = <0>; >> + >> + cpu { >> + compatible = "arm,arm926ej-s"; >> + device_type = "cpu"; >> + }; >> + }; >> + >> + memory { >> + reg = <0x20000000 0x08000000>; >> + }; >> + >> + ahb { >> + compatible = "simple-bus"; >> + #address-cells = <1>; >> + #size-cells = <1>; >> + ranges; >> + >> + apb { >> + compatible = "simple-bus"; >> + #address-cells = <1>; >> + #size-cells = <1>; >> + ranges; >> + >> + aic: interrupt-controller@fffff000 { >> + #interrupt-cells = <3>; >> + compatible = "atmel,at91rm9200-aic"; >> + interrupt-controller; >> + reg = <0xfffff000 0x200>; >> + atmel,external-irqs = <29 30 31>; >> + }; >> + >> + pmc: pmc@fffffc00 { >> + compatible = "atmel,at91rm9200-pmc"; >> + reg = <0xfffffc00 0x100>; >> + }; >> + >> + ramc: ramc@ffffea00 { >> + compatible = "atmel,at91sam9260-sdramc"; >> + reg = <0xffffea00 0x200>; >> + }; >> + >> + pit: timer@fffffd30 { >> + compatible = "atmel,at91sam9260-pit"; >> + reg = <0xfffffd30 0xf>; >> + interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>; >> + }; >> + >> + tcb0: timer@fffa0000 { >> + compatible = "atmel,at91rm9200-tcb"; >> + reg = <0xfffa0000 0x100>; >> + interrupts = < 17 IRQ_TYPE_LEVEL_HIGH 0 >> + 18 IRQ_TYPE_LEVEL_HIGH 0 >> + 19 IRQ_TYPE_LEVEL_HIGH 0 >> + >; >> + status = "disabled"; >> + }; >> + >> + rstc@fffffd00 { >> + compatible = "atmel,at91sam9260-rstc"; >> + reg = <0xfffffd00 0x10>; >> + }; >> + >> + shdwc@fffffd10 { >> + compatible = "atmel,at91sam9260-shdwc"; >> + reg = <0xfffffd10 0x10>; >> + }; >> + >> + pinctrl@fffff400 { >> + #address-cells = <1>; >> + #size-cells = <1>; >> + compatible = "atmel,at91rm9200-pinctrl", >> "simple-bus"; >> + ranges = <0xfffff400 0xfffff400 0xa00>; >> + >> + atmel,mux-mask = < >> + /* A B */ >> + 0xffffffff 0xfffffff7 /* pioA */ >> + 0xffffffff 0xfffffff4 /* pioB */ >> + 0xffffffff 0xffffff07 /* pioC */ >> + >; >> + >> + /* shared pinctrl settings */ >> + dbgu { >> + pinctrl_dbgu: dbgu-0 { >> + atmel,pins = >> + <AT91_PIOA 9 >> AT91_PERIPH_A AT91_PINCTRL_NONE /* PA9 periph A */ >> + AT91_PIOA 10 >> AT91_PERIPH_A AT91_PINCTRL_PULL_UP>; /* PA10 periph A with pullup */ >> + }; >> + }; >> + >> + usart0 { >> + pinctrl_usart0: usart0-0 { >> + atmel,pins = >> + <AT91_PIOC 8 >> AT91_PERIPH_A AT91_PINCTRL_PULL_UP /* PC8 periph A with pullup */ >> + AT91_PIOC 9 >> AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PC9 periph A */ >> + }; >> + >> + pinctrl_usart0_rts: usart0_rts-0 { >> + atmel,pins = >> + <AT91_PIOC 10 >> AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PC10 periph A */ >> + }; >> + >> + pinctrl_usart0_cts: usart0_cts-0 { >> + atmel,pins = >> + <AT91_PIOC 11 >> AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PC11 periph A */ >> + }; >> + }; >> + >> + usart1 { >> + pinctrl_usart1: usart1-0 { >> + atmel,pins = >> + <AT91_PIOC 12 >> AT91_PERIPH_A AT91_PINCTRL_PULL_UP /* PC12 periph A with pullup */ >> + AT91_PIOC 13 >> AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PC13 periph A */ >> + }; >> + >> + pinctrl_usart1_rts: usart1_rts-0 { >> + atmel,pins = >> + <AT91_PIOA 12 >> AT91_PERIPH_B AT91_PINCTRL_NONE>; /* PA12 periph B */ >> + }; >> + >> + pinctrl_usart1_cts: usart1_cts-0 { >> + atmel,pins = >> + <AT91_PIOA 13 >> AT91_PERIPH_B AT91_PINCTRL_NONE>; /* PA13 periph B */ >> + }; >> + }; >> + >> + usart2 { >> + pinctrl_usart2: usart2-0 { >> + atmel,pins = >> + <AT91_PIOC 14 >> AT91_PERIPH_A AT91_PINCTRL_PULL_UP /* PC14 periph A with pullup */ >> + AT91_PIOC 15 >> AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PC15 periph A */ >> + }; >> + >> + pinctrl_usart2_rts: usart2_rts-0 { >> + atmel,pins = >> + <AT91_PIOA 15 >> AT91_PERIPH_B AT91_PINCTRL_NONE>; /* PA15 periph B */ >> + }; >> + >> + pinctrl_usart2_cts: usart2_cts-0 { >> + atmel,pins = >> + <AT91_PIOA 16 >> AT91_PERIPH_B AT91_PINCTRL_NONE>; /* PA16 periph B */ >> + }; >> + }; >> + >> + nand { >> + pinctrl_nand: nand-0 { >> + atmel,pins = >> + <AT91_PIOC 15 >> AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP /* PC15 gpio RDY pin pull_up*/ >> + AT91_PIOC 14 >> AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP>; /* PC14 gpio enable pin pull_up */ >> + }; >> + }; >> + >> + mmc0 { >> + pinctrl_mmc0_clk: mmc0_clk-0 { >> + atmel,pins = >> + <AT91_PIOA 2 >> AT91_PERIPH_B AT91_PINCTRL_NONE>; /* PA2 periph B */ >> + }; >> + >> + pinctrl_mmc0_slot0_cmd_dat0: >> mmc0_slot0_cmd_dat0-0 { >> + atmel,pins = >> + <AT91_PIOA 1 >> AT91_PERIPH_B AT91_PINCTRL_PULL_UP /* PA1 periph B with pullup */ >> + AT91_PIOA 0 >> AT91_PERIPH_B AT91_PINCTRL_PULL_UP>; /* PA0 periph B with pullup */ >> + }; >> + >> + pinctrl_mmc0_slot0_dat1_3: >> mmc0_slot0_dat1_3-0 { >> + atmel,pins = >> + <AT91_PIOA 4 >> AT91_PERIPH_B AT91_PINCTRL_PULL_UP /* PA4 periph B with pullup */ >> + AT91_PIOA 5 >> AT91_PERIPH_B AT91_PINCTRL_PULL_UP /* PA5 periph B with pullup */ >> + AT91_PIOA 6 >> AT91_PERIPH_B AT91_PINCTRL_PULL_UP>; /* PA6 periph B with pullup */ >> + }; >> + }; >> + >> + ssc0 { >> + pinctrl_ssc0_tx: ssc0_tx-0 { >> + atmel,pins = >> + <AT91_PIOB 21 >> AT91_PERIPH_A AT91_PINCTRL_NONE /* PB21 periph A */ >> + AT91_PIOB 22 >> AT91_PERIPH_A AT91_PINCTRL_NONE /* PB22 periph A */ >> + AT91_PIOB 23 >> AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PB23 periph A */ >> + }; >> + >> + pinctrl_ssc0_rx: ssc0_rx-0 { >> + atmel,pins = >> + <AT91_PIOB 24 >> AT91_PERIPH_A AT91_PINCTRL_NONE /* PB24 periph A */ >> + AT91_PIOB 25 >> AT91_PERIPH_A AT91_PINCTRL_NONE /* PB25 periph A */ >> + AT91_PIOB 26 >> AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PB26 periph A */ >> + }; >> + }; >> + >> + ssc1 { >> + pinctrl_ssc1_tx: ssc1_tx-0 { >> + atmel,pins = >> + <AT91_PIOA 17 >> AT91_PERIPH_B AT91_PINCTRL_NONE /* PA17 periph B */ >> + AT91_PIOA 18 >> AT91_PERIPH_B AT91_PINCTRL_NONE /* PA18 periph B */ >> + AT91_PIOA 19 >> AT91_PERIPH_B AT91_PINCTRL_NONE>; /* PA19 periph B */ >> + }; >> + >> + pinctrl_ssc1_rx: ssc1_rx-0 { >> + atmel,pins = >> + <AT91_PIOA 20 >> AT91_PERIPH_B AT91_PINCTRL_NONE /* PA20 periph B */ >> + AT91_PIOA 21 >> AT91_PERIPH_B AT91_PINCTRL_NONE /* PA21 periph B */ >> + AT91_PIOA 22 >> AT91_PERIPH_B AT91_PINCTRL_NONE>; /* PA22 periph B */ >> + }; >> + }; >> + >> + spi0 { >> + pinctrl_spi0: spi0-0 { >> + atmel,pins = >> + <AT91_PIOA 0 >> AT91_PERIPH_A AT91_PINCTRL_NONE /* PA0 periph A SPI0_MISO pin */ >> + AT91_PIOA 1 >> AT91_PERIPH_A AT91_PINCTRL_NONE /* PA1 periph A SPI0_MOSI pin */ >> + AT91_PIOA 2 >> AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PA2 periph A SPI0_SPCK pin */ >> + }; >> + }; >> + >> + spi1 { >> + pinctrl_spi1: spi1-0 { >> + atmel,pins = >> + <AT91_PIOB 30 >> AT91_PERIPH_A AT91_PINCTRL_NONE /* PB30 periph A SPI1_MISO pin */ >> + AT91_PIOB 31 >> AT91_PERIPH_A AT91_PINCTRL_NONE /* PB31 periph A SPI1_MOSI pin */ >> + AT91_PIOB 29 >> AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PB29 periph A SPI1_SPCK pin */ >> + }; >> + }; >> + >> + tcb0 { >> + pinctrl_tcb0_tclk0: tcb0_tclk0-0 { >> + atmel,pins = <AT91_PIOC 16 >> AT91_PERIPH_B AT91_PINCTRL_NONE>; >> + }; >> + >> + pinctrl_tcb0_tclk1: tcb0_tclk1-0 { >> + atmel,pins = <AT91_PIOC 17 >> AT91_PERIPH_B AT91_PINCTRL_NONE>; >> + }; >> + >> + pinctrl_tcb0_tclk2: tcb0_tclk2-0 { >> + atmel,pins = <AT91_PIOC 18 >> AT91_PERIPH_B AT91_PINCTRL_NONE>; >> + }; >> + >> + pinctrl_tcb0_tioa0: tcb0_tioa0-0 { >> + atmel,pins = <AT91_PIOC 19 >> AT91_PERIPH_B AT91_PINCTRL_NONE>; >> + }; >> + >> + pinctrl_tcb0_tioa1: tcb0_tioa1-0 { >> + atmel,pins = <AT91_PIOC 21 >> AT91_PERIPH_B AT91_PINCTRL_NONE>; >> + }; >> + >> + pinctrl_tcb0_tioa2: tcb0_tioa2-0 { >> + atmel,pins = <AT91_PIOC 23 >> AT91_PERIPH_B AT91_PINCTRL_NONE>; >> + }; >> + >> + pinctrl_tcb0_tiob0: tcb0_tiob0-0 { >> + atmel,pins = <AT91_PIOC 20 >> AT91_PERIPH_B AT91_PINCTRL_NONE>; >> + }; >> + >> + pinctrl_tcb0_tiob1: tcb0_tiob1-0 { >> + atmel,pins = <AT91_PIOC 22 >> AT91_PERIPH_B AT91_PINCTRL_NONE>; >> + }; >> + >> + pinctrl_tcb0_tiob2: tcb0_tiob2-0 { >> + atmel,pins = <AT91_PIOC 24 >> AT91_PERIPH_B AT91_PINCTRL_NONE>; >> + }; >> + }; >> + >> + pioA: gpio@fffff400 { >> + compatible = >> "atmel,at91rm9200-gpio"; >> + reg = <0xfffff400 0x200>; >> + interrupts = <2 >> IRQ_TYPE_LEVEL_HIGH 1>; >> + #gpio-cells = <2>; >> + gpio-controller; >> + interrupt-controller; >> + #interrupt-cells = <2>; >> + }; >> + >> + pioB: gpio@fffff600 { >> + compatible = >> "atmel,at91rm9200-gpio"; >> + reg = <0xfffff600 0x200>; >> + interrupts = <3 >> IRQ_TYPE_LEVEL_HIGH 1>; >> + #gpio-cells = <2>; >> + gpio-controller; >> + interrupt-controller; >> + #interrupt-cells = <2>; >> + }; >> + >> + pioC: gpio@fffff800 { >> + compatible = >> "atmel,at91rm9200-gpio"; >> + reg = <0xfffff800 0x200>; >> + interrupts = <4 >> IRQ_TYPE_LEVEL_HIGH 1>; >> + #gpio-cells = <2>; >> + gpio-controller; >> + interrupt-controller; >> + #interrupt-cells = <2>; >> + }; >> + }; >> + >> + dbgu: serial@fffff200 { >> + compatible = "atmel,at91sam9260-usart"; >> + reg = <0xfffff200 0x200>; >> + interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>; >> + pinctrl-names = "default"; >> + pinctrl-0 = <&pinctrl_dbgu>; >> + status = "disabled"; >> + }; >> + >> + usart0: serial@fffb0000 { >> + compatible = "atmel,at91sam9260-usart"; >> + reg = <0xfffb0000 0x200>; >> + interrupts = <6 IRQ_TYPE_LEVEL_HIGH 5>; >> + atmel,use-dma-rx; >> + atmel,use-dma-tx; >> + pinctrl-names = "default"; >> + pinctrl-0 = <&pinctrl_usart0>; >> + status = "disabled"; >> + }; >> + >> + usart1: serial@ffffb400 { >> + compatible = "atmel,at91sam9260-usart"; >> + reg = <0xfffb4000 0x200>; >> + interrupts = <7 IRQ_TYPE_LEVEL_HIGH 5>; >> + atmel,use-dma-rx; >> + atmel,use-dma-tx; >> + pinctrl-names = "default"; >> + pinctrl-0 = <&pinctrl_usart1>; >> + status = "disabled"; >> + }; >> + >> + usart2: serial@fff94000 { >> + compatible = "atmel,at91sam9260-usart"; >> + reg = <0xfffb8000 0x200>; >> + interrupts = <8 IRQ_TYPE_LEVEL_HIGH 5>; >> + atmel,use-dma-rx; >> + atmel,use-dma-tx; >> + pinctrl-names = "default"; >> + pinctrl-0 = <&pinctrl_usart2>; >> + status = "disabled"; >> + }; >> + >> + ssc0: ssc@fffbc000 { >> + compatible = "atmel,at91rm9200-ssc"; >> + reg = <0xfffbc000 0x4000>; >> + interrupts = <14 IRQ_TYPE_LEVEL_HIGH 5>; >> + pinctrl-names = "default"; >> + pinctrl-0 = <&pinctrl_ssc0_tx >> &pinctrl_ssc0_rx>; >> + status = "disabled"; >> + }; >> + >> + ssc1: ssc@fffc0000 { >> + compatible = "atmel,at91rm9200-ssc"; >> + reg = <0xfffc0000 0x4000>; >> + interrupts = <15 IRQ_TYPE_LEVEL_HIGH 5>; >> + pinctrl-names = "default"; >> + pinctrl-0 = <&pinctrl_ssc1_tx >> &pinctrl_ssc1_rx>; >> + status = "disabled"; >> + }; >> + >> + usb1: gadget@fffa4000 { >> + compatible = "atmel,at91rm9200-udc"; >> + reg = <0xfffa4000 0x4000>; >> + interrupts = <10 IRQ_TYPE_LEVEL_HIGH 2>; >> + status = "disabled"; >> + }; >> + >> + i2c0: i2c@fffac000 { >> + compatible = "atmel,at91sam9261-i2c"; >> + reg = <0xfffac000 0x100>; >> + interrupts = <11 IRQ_TYPE_LEVEL_HIGH 6>; >> + #address-cells = <1>; >> + #size-cells = <0>; >> + status = "disabled"; >> + }; >> + >> + mmc0: mmc@fffa8000 { >> + compatible = "atmel,hsmci"; >> + reg = <0xfffa8000 0x600>; >> + interrupts = <9 IRQ_TYPE_LEVEL_HIGH 0>; >> + #address-cells = <1>; >> + #size-cells = <0>; >> + status = "disabled"; >> + }; >> + >> + watchdog@fffffd40 { >> + compatible = "atmel,at91sam9260-wdt"; >> + reg = <0xfffffd40 0x10>; >> + status = "disabled"; >> + }; >> + >> + spi0: spi@fffc8000 { >> + #address-cells = <1>; >> + #size-cells = <0>; >> + compatible = "atmel,at91rm9200-spi"; >> + reg = <0xfffc8000 0x200>; >> + interrupts = <12 IRQ_TYPE_LEVEL_HIGH 3>; >> + pinctrl-names = "default"; >> + pinctrl-0 = <&pinctrl_spi0>; >> + status = "disabled"; >> + }; >> + >> + spi1: spi@fffcc000 { >> + #address-cells = <1>; >> + #size-cells = <0>; >> + compatible = "atmel,at91rm9200-spi"; >> + reg = <0xfffcc000 0x200>; >> + interrupts = <13 IRQ_TYPE_LEVEL_HIGH 3>; >> + pinctrl-names = "default"; >> + pinctrl-0 = <&pinctrl_spi1>; >> + status = "disabled"; >> + }; >> + }; >> + >> + nand0: nand@40000000 { >> + compatible = "atmel,at91rm9200-nand"; >> + #address-cells = <1>; >> + #size-cells = <1>; >> + reg = <0x40000000 0x10000000>; >> + atmel,nand-addr-offset = <22>; >> + atmel,nand-cmd-offset = <21>; >> + pinctrl-names = "default"; >> + pinctrl-0 = <&pinctrl_nand>; >> + >> + gpios = <&pioC 15 GPIO_ACTIVE_HIGH >> + &pioC 14 GPIO_ACTIVE_HIGH >> + 0 >> + >; >> + status = "disabled"; >> + }; >> + >> + usb0: ohci@00500000 { >> + compatible = "atmel,at91rm9200-ohci", "usb-ohci"; >> + reg = <0x00500000 0x100000>; >> + interrupts = <20 IRQ_TYPE_LEVEL_HIGH 2>; >> + status = "disabled"; >> + }; >> + }; >> + >> + i2c@0 { >> + compatible = "i2c-gpio"; >> + gpios = <&pioA 7 GPIO_ACTIVE_HIGH /* sda */ >> + &pioA 8 GPIO_ACTIVE_HIGH /* scl */ >> + >; >> + i2c-gpio,sda-open-drain; >> + i2c-gpio,scl-open-drain; >> + i2c-gpio,delay-us = <2>; /* ~100 kHz */ >> + #address-cells = <1>; >> + #size-cells = <0>; >> + status = "disabled"; >> + }; >> +}; >> diff --git a/arch/arm/boot/dts/at91sam9261ek.dts >> b/arch/arm/boot/dts/at91sam9261ek.dts >> new file mode 100644 >> index 0000000..f3d22a9 >> --- /dev/null >> +++ b/arch/arm/boot/dts/at91sam9261ek.dts >> @@ -0,0 +1,75 @@ >> +/* >> + * at91sam9261ek.dts - Device Tree file for Atmel at91sam9261 reference >> board >> + * >> + * Copyright (C) 2013 Jean-Jacques Hiblot <jjhiblot@traphandler.com> >> + * >> + * Licensed under GPLv2 only. >> + */ >> +/dts-v1/; >> +#include "at91sam9261.dtsi" >> + >> +/ { >> + model = "Atmel at91sam9261ek"; >> + compatible = "atmel,at91sam9261ek", "atmel,at91sam9261", >> "atmel,at91sam9"; >> + >> + chosen { >> + bootargs = "mem=64M console=ttyS0,115200"; >> + }; >> + >> + memory { >> + reg = <0x20000000 0x4000000>; >> + }; >> + >> + clocks { >> + #address-cells = <1>; >> + #size-cells = <1>; >> + ranges; >> + >> + main_clock: clock@0 { >> + compatible = "atmel,osc", "fixed-clock"; >> + clock-frequency = <18432000>; >> + }; >> + }; >> + >> + ahb { >> + apb { >> + dbgu: serial@fffff200 { >> + status = "okay"; >> + }; >> + >> + watchdog@fffffd40 { >> + status = "okay"; >> + }; >> + }; >> + >> + nand0: nand@40000000 { >> + nand-bus-width = <8>; >> + nand-ecc-mode = "soft"; >> + nand-on-flash-bbt = <1>; >> + status = "okay"; >> + at91bootstrap@0 { >> + label = "at91bootstrap"; >> + reg = <0x0 0x20000>; >> + }; >> + }; >> + }; >> + >> + leds { >> + compatible = "gpio-leds"; >> + ds8 { >> + label = "ds8"; >> + gpios = <&pioA 13 GPIO_ACTIVE_LOW>; >> + linux,default-trigger = "none"; >> + }; >> + ds7 { >> + label = "ds7"; >> + gpios = <&pioA 14 GPIO_ACTIVE_LOW>; >> + linux,default-trigger = "nand-disk"; >> + }; >> + ds1 { >> + label = "ds1"; >> + gpios = <&pioA 23 GPIO_ACTIVE_LOW>; >> + linux,default-trigger = "heartbeat"; >> + }; >> + }; >> +}; > > > Didn't you forget the at91sam9261ek entry in arch/arm/boot/dts/Makefile ? Indeed I did forget > > >> diff --git a/arch/arm/mach-at91/at91sam9261.c >> b/arch/arm/mach-at91/at91sam9261.c >> index 6276b4c..200d17a 100644 >> --- a/arch/arm/mach-at91/at91sam9261.c >> +++ b/arch/arm/mach-at91/at91sam9261.c >> @@ -189,6 +189,21 @@ static struct clk_lookup periph_clocks_lookups[] = { >> CLKDEV_CON_ID("pioA", &pioA_clk), >> CLKDEV_CON_ID("pioB", &pioB_clk), >> CLKDEV_CON_ID("pioC", &pioC_clk), >> + /* more usart lookup table for DT entries */ >> + CLKDEV_CON_DEV_ID("usart", "fffff200.serial", &mck), >> + CLKDEV_CON_DEV_ID("usart", "fffb0000.serial", &usart0_clk), >> + CLKDEV_CON_DEV_ID("usart", "ffffb400.serial", &usart1_clk), >> + CLKDEV_CON_DEV_ID("usart", "fff94000.serial", &usart2_clk), >> + /* more tc lookup table for DT entries */ >> + CLKDEV_CON_DEV_ID("t0_clk", "fffa0000.timer", &tc0_clk), >> + CLKDEV_CON_DEV_ID("hclk", "500000.ohci", &ohci_clk), >> + CLKDEV_CON_DEV_ID("spi_clk", "fffc8000.spi", &spi0_clk), >> + CLKDEV_CON_DEV_ID("spi_clk", "fffcc000.spi", &spi1_clk), >> + CLKDEV_CON_DEV_ID("mci_clk", "fffa8000.mmc", &mmc_clk), >> + CLKDEV_CON_DEV_ID(NULL, "fffac000.i2c", &twi_clk), >> + CLKDEV_CON_DEV_ID(NULL, "fffff400.gpio", &pioA_clk), >> + CLKDEV_CON_DEV_ID(NULL, "fffff600.gpio", &pioB_clk), >> + CLKDEV_CON_DEV_ID(NULL, "fffff800.gpio", &pioC_clk), >> }; >> > > It would be great if you could add dt clk support to at91sam9261 SoC :) (see > https://github.com/at91linux/linux-at91/blob/bbr/at91-3.14-clk/arch/arm/boot/dts/at91sam9x5.dtsi#L87). > But this is antoher story... ;) This is just a start :o) There is a lot of room for improvement. > > >> static struct clk_lookup usart_clocks_lookups[] = { >> diff --git a/arch/arm/mach-at91/at91sam9261_devices.c >> b/arch/arm/mach-at91/at91sam9261_devices.c >> index b2a3474..2f926d9 100644 >> --- a/arch/arm/mach-at91/at91sam9261_devices.c >> +++ b/arch/arm/mach-at91/at91sam9261_devices.c >> @@ -599,8 +599,23 @@ static struct platform_device at91sam9261_tcb_device >> = { >> .num_resources = ARRAY_SIZE(tcb_resources), >> }; >> >> +#if defined(CONFIG_OF) >> +static struct of_device_id tcb_ids[] = { >> + { .compatible = "atmel,at91rm9200-tcb" }, >> + { /*sentinel*/ } >> +}; >> +#endif >> static void __init at91_add_device_tc(void) >> { >> +#if defined(CONFIG_OF) >> + struct device_node *np; >> + >> + np = of_find_matching_node(NULL, tcb_ids); >> + if (np) { >> + of_node_put(np); >> + return; >> + } >> +#endif > > > Why do you need this ? > Isn't this already skipped by the following test > (if(of_have_populated_dt())) ? > Actually I tried to match closely the 9263 and this part comes from the 9263 code. This comes from 4abb367722c2dc06972658c8fad5b4763114477c which brings dt support to the 9263. I didn't undertsand it, but include it anyway. I'll remove this. > >> platform_device_register(&at91sam9261_tcb_device); >> } >> #else >> @@ -1088,6 +1103,9 @@ void __init at91_add_device_serial(void) {} >> */ >> static int __init at91_add_standard_devices(void) >> { >> + if (of_have_populated_dt()) >> + return 0; >> + >> at91_add_device_rtt(); >> at91_add_device_watchdog(); >> at91_add_device_tc(); >> > > Best Regards, > > Boris
diff --git a/arch/arm/boot/dts/at91sam9261.dtsi b/arch/arm/boot/dts/at91sam9261.dtsi new file mode 100644 index 0000000..ce23d7d --- /dev/null +++ b/arch/arm/boot/dts/at91sam9261.dtsi @@ -0,0 +1,476 @@ +/* + * at91sam9261.dtsi - Device Tree Include file for AT91SAM9263 family SoC + * + * Copyright (C) 2013 Jean-Jacques Hiblot <jjhiblot@traphandler.com> + * + * Licensed under GPLv2 only. + */ + +#include "skeleton.dtsi" +#include <dt-bindings/pinctrl/at91.h> +#include <dt-bindings/interrupt-controller/irq.h> +#include <dt-bindings/gpio/gpio.h> + +/ { + model = "Atmel AT91SAM9261 family SoC"; + compatible = "atmel,at91sam9261"; + interrupt-parent = <&aic>; + + aliases { + serial0 = &dbgu; + serial1 = &usart0; + serial2 = &usart1; + serial3 = &usart2; + gpio0 = &pioA; + gpio1 = &pioB; + gpio2 = &pioC; + tcb0 = &tcb0; + i2c0 = &i2c0; + ssc0 = &ssc0; + ssc1 = &ssc1; + }; + cpus { + #address-cells = <0>; + #size-cells = <0>; + + cpu { + compatible = "arm,arm926ej-s"; + device_type = "cpu"; + }; + }; + + memory { + reg = <0x20000000 0x08000000>; + }; + + ahb { + compatible = "simple-bus"; + #address-cells = <1>; + #size-cells = <1>; + ranges; + + apb { + compatible = "simple-bus"; + #address-cells = <1>; + #size-cells = <1>; + ranges; + + aic: interrupt-controller@fffff000 { + #interrupt-cells = <3>; + compatible = "atmel,at91rm9200-aic"; + interrupt-controller; + reg = <0xfffff000 0x200>; + atmel,external-irqs = <29 30 31>; + }; + + pmc: pmc@fffffc00 { + compatible = "atmel,at91rm9200-pmc"; + reg = <0xfffffc00 0x100>; + }; + + ramc: ramc@ffffea00 { + compatible = "atmel,at91sam9260-sdramc"; + reg = <0xffffea00 0x200>; + }; + + pit: timer@fffffd30 { + compatible = "atmel,at91sam9260-pit"; + reg = <0xfffffd30 0xf>; + interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>; + }; + + tcb0: timer@fffa0000 { + compatible = "atmel,at91rm9200-tcb"; + reg = <0xfffa0000 0x100>; + interrupts = < 17 IRQ_TYPE_LEVEL_HIGH 0 + 18 IRQ_TYPE_LEVEL_HIGH 0 + 19 IRQ_TYPE_LEVEL_HIGH 0 + >; + status = "disabled"; + }; + + rstc@fffffd00 { + compatible = "atmel,at91sam9260-rstc"; + reg = <0xfffffd00 0x10>; + }; + + shdwc@fffffd10 { + compatible = "atmel,at91sam9260-shdwc"; + reg = <0xfffffd10 0x10>; + }; + + pinctrl@fffff400 { + #address-cells = <1>; + #size-cells = <1>; + compatible = "atmel,at91rm9200-pinctrl", "simple-bus"; + ranges = <0xfffff400 0xfffff400 0xa00>; + + atmel,mux-mask = < + /* A B */ + 0xffffffff 0xfffffff7 /* pioA */ + 0xffffffff 0xfffffff4 /* pioB */ + 0xffffffff 0xffffff07 /* pioC */ + >; + + /* shared pinctrl settings */ + dbgu { + pinctrl_dbgu: dbgu-0 { + atmel,pins = + <AT91_PIOA 9 AT91_PERIPH_A AT91_PINCTRL_NONE /* PA9 periph A */ + AT91_PIOA 10 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>; /* PA10 periph A with pullup */ + }; + }; + + usart0 { + pinctrl_usart0: usart0-0 { + atmel,pins = + <AT91_PIOC 8 AT91_PERIPH_A AT91_PINCTRL_PULL_UP /* PC8 periph A with pullup */ + AT91_PIOC 9 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PC9 periph A */ + }; + + pinctrl_usart0_rts: usart0_rts-0 { + atmel,pins = + <AT91_PIOC 10 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PC10 periph A */ + }; + + pinctrl_usart0_cts: usart0_cts-0 { + atmel,pins = + <AT91_PIOC 11 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PC11 periph A */ + }; + }; + + usart1 { + pinctrl_usart1: usart1-0 { + atmel,pins = + <AT91_PIOC 12 AT91_PERIPH_A AT91_PINCTRL_PULL_UP /* PC12 periph A with pullup */ + AT91_PIOC 13 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PC13 periph A */ + }; + + pinctrl_usart1_rts: usart1_rts-0 { + atmel,pins = + <AT91_PIOA 12 AT91_PERIPH_B AT91_PINCTRL_NONE>; /* PA12 periph B */ + }; + + pinctrl_usart1_cts: usart1_cts-0 { + atmel,pins = + <AT91_PIOA 13 AT91_PERIPH_B AT91_PINCTRL_NONE>; /* PA13 periph B */ + }; + }; + + usart2 { + pinctrl_usart2: usart2-0 { + atmel,pins = + <AT91_PIOC 14 AT91_PERIPH_A AT91_PINCTRL_PULL_UP /* PC14 periph A with pullup */ + AT91_PIOC 15 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PC15 periph A */ + }; + + pinctrl_usart2_rts: usart2_rts-0 { + atmel,pins = + <AT91_PIOA 15 AT91_PERIPH_B AT91_PINCTRL_NONE>; /* PA15 periph B */ + }; + + pinctrl_usart2_cts: usart2_cts-0 { + atmel,pins = + <AT91_PIOA 16 AT91_PERIPH_B AT91_PINCTRL_NONE>; /* PA16 periph B */ + }; + }; + + nand { + pinctrl_nand: nand-0 { + atmel,pins = + <AT91_PIOC 15 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP /* PC15 gpio RDY pin pull_up*/ + AT91_PIOC 14 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP>; /* PC14 gpio enable pin pull_up */ + }; + }; + + mmc0 { + pinctrl_mmc0_clk: mmc0_clk-0 { + atmel,pins = + <AT91_PIOA 2 AT91_PERIPH_B AT91_PINCTRL_NONE>; /* PA2 periph B */ + }; + + pinctrl_mmc0_slot0_cmd_dat0: mmc0_slot0_cmd_dat0-0 { + atmel,pins = + <AT91_PIOA 1 AT91_PERIPH_B AT91_PINCTRL_PULL_UP /* PA1 periph B with pullup */ + AT91_PIOA 0 AT91_PERIPH_B AT91_PINCTRL_PULL_UP>; /* PA0 periph B with pullup */ + }; + + pinctrl_mmc0_slot0_dat1_3: mmc0_slot0_dat1_3-0 { + atmel,pins = + <AT91_PIOA 4 AT91_PERIPH_B AT91_PINCTRL_PULL_UP /* PA4 periph B with pullup */ + AT91_PIOA 5 AT91_PERIPH_B AT91_PINCTRL_PULL_UP /* PA5 periph B with pullup */ + AT91_PIOA 6 AT91_PERIPH_B AT91_PINCTRL_PULL_UP>; /* PA6 periph B with pullup */ + }; + }; + + ssc0 { + pinctrl_ssc0_tx: ssc0_tx-0 { + atmel,pins = + <AT91_PIOB 21 AT91_PERIPH_A AT91_PINCTRL_NONE /* PB21 periph A */ + AT91_PIOB 22 AT91_PERIPH_A AT91_PINCTRL_NONE /* PB22 periph A */ + AT91_PIOB 23 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PB23 periph A */ + }; + + pinctrl_ssc0_rx: ssc0_rx-0 { + atmel,pins = + <AT91_PIOB 24 AT91_PERIPH_A AT91_PINCTRL_NONE /* PB24 periph A */ + AT91_PIOB 25 AT91_PERIPH_A AT91_PINCTRL_NONE /* PB25 periph A */ + AT91_PIOB 26 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PB26 periph A */ + }; + }; + + ssc1 { + pinctrl_ssc1_tx: ssc1_tx-0 { + atmel,pins = + <AT91_PIOA 17 AT91_PERIPH_B AT91_PINCTRL_NONE /* PA17 periph B */ + AT91_PIOA 18 AT91_PERIPH_B AT91_PINCTRL_NONE /* PA18 periph B */ + AT91_PIOA 19 AT91_PERIPH_B AT91_PINCTRL_NONE>; /* PA19 periph B */ + }; + + pinctrl_ssc1_rx: ssc1_rx-0 { + atmel,pins = + <AT91_PIOA 20 AT91_PERIPH_B AT91_PINCTRL_NONE /* PA20 periph B */ + AT91_PIOA 21 AT91_PERIPH_B AT91_PINCTRL_NONE /* PA21 periph B */ + AT91_PIOA 22 AT91_PERIPH_B AT91_PINCTRL_NONE>; /* PA22 periph B */ + }; + }; + + spi0 { + pinctrl_spi0: spi0-0 { + atmel,pins = + <AT91_PIOA 0 AT91_PERIPH_A AT91_PINCTRL_NONE /* PA0 periph A SPI0_MISO pin */ + AT91_PIOA 1 AT91_PERIPH_A AT91_PINCTRL_NONE /* PA1 periph A SPI0_MOSI pin */ + AT91_PIOA 2 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PA2 periph A SPI0_SPCK pin */ + }; + }; + + spi1 { + pinctrl_spi1: spi1-0 { + atmel,pins = + <AT91_PIOB 30 AT91_PERIPH_A AT91_PINCTRL_NONE /* PB30 periph A SPI1_MISO pin */ + AT91_PIOB 31 AT91_PERIPH_A AT91_PINCTRL_NONE /* PB31 periph A SPI1_MOSI pin */ + AT91_PIOB 29 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PB29 periph A SPI1_SPCK pin */ + }; + }; + + tcb0 { + pinctrl_tcb0_tclk0: tcb0_tclk0-0 { + atmel,pins = <AT91_PIOC 16 AT91_PERIPH_B AT91_PINCTRL_NONE>; + }; + + pinctrl_tcb0_tclk1: tcb0_tclk1-0 { + atmel,pins = <AT91_PIOC 17 AT91_PERIPH_B AT91_PINCTRL_NONE>; + }; + + pinctrl_tcb0_tclk2: tcb0_tclk2-0 { + atmel,pins = <AT91_PIOC 18 AT91_PERIPH_B AT91_PINCTRL_NONE>; + }; + + pinctrl_tcb0_tioa0: tcb0_tioa0-0 { + atmel,pins = <AT91_PIOC 19 AT91_PERIPH_B AT91_PINCTRL_NONE>; + }; + + pinctrl_tcb0_tioa1: tcb0_tioa1-0 { + atmel,pins = <AT91_PIOC 21 AT91_PERIPH_B AT91_PINCTRL_NONE>; + }; + + pinctrl_tcb0_tioa2: tcb0_tioa2-0 { + atmel,pins = <AT91_PIOC 23 AT91_PERIPH_B AT91_PINCTRL_NONE>; + }; + + pinctrl_tcb0_tiob0: tcb0_tiob0-0 { + atmel,pins = <AT91_PIOC 20 AT91_PERIPH_B AT91_PINCTRL_NONE>; + }; + + pinctrl_tcb0_tiob1: tcb0_tiob1-0 { + atmel,pins = <AT91_PIOC 22 AT91_PERIPH_B AT91_PINCTRL_NONE>; + }; + + pinctrl_tcb0_tiob2: tcb0_tiob2-0 { + atmel,pins = <AT91_PIOC 24 AT91_PERIPH_B AT91_PINCTRL_NONE>; + }; + }; + + pioA: gpio@fffff400 { + compatible = "atmel,at91rm9200-gpio"; + reg = <0xfffff400 0x200>; + interrupts = <2 IRQ_TYPE_LEVEL_HIGH 1>; + #gpio-cells = <2>; + gpio-controller; + interrupt-controller; + #interrupt-cells = <2>; + }; + + pioB: gpio@fffff600 { + compatible = "atmel,at91rm9200-gpio"; + reg = <0xfffff600 0x200>; + interrupts = <3 IRQ_TYPE_LEVEL_HIGH 1>; + #gpio-cells = <2>; + gpio-controller; + interrupt-controller; + #interrupt-cells = <2>; + }; + + pioC: gpio@fffff800 { + compatible = "atmel,at91rm9200-gpio"; + reg = <0xfffff800 0x200>; + interrupts = <4 IRQ_TYPE_LEVEL_HIGH 1>; + #gpio-cells = <2>; + gpio-controller; + interrupt-controller; + #interrupt-cells = <2>; + }; + }; + + dbgu: serial@fffff200 { + compatible = "atmel,at91sam9260-usart"; + reg = <0xfffff200 0x200>; + interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_dbgu>; + status = "disabled"; + }; + + usart0: serial@fffb0000 { + compatible = "atmel,at91sam9260-usart"; + reg = <0xfffb0000 0x200>; + interrupts = <6 IRQ_TYPE_LEVEL_HIGH 5>; + atmel,use-dma-rx; + atmel,use-dma-tx; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_usart0>; + status = "disabled"; + }; + + usart1: serial@ffffb400 { + compatible = "atmel,at91sam9260-usart"; + reg = <0xfffb4000 0x200>; + interrupts = <7 IRQ_TYPE_LEVEL_HIGH 5>; + atmel,use-dma-rx; + atmel,use-dma-tx; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_usart1>; + status = "disabled"; + }; + + usart2: serial@fff94000 { + compatible = "atmel,at91sam9260-usart"; + reg = <0xfffb8000 0x200>; + interrupts = <8 IRQ_TYPE_LEVEL_HIGH 5>; + atmel,use-dma-rx; + atmel,use-dma-tx; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_usart2>; + status = "disabled"; + }; + + ssc0: ssc@fffbc000 { + compatible = "atmel,at91rm9200-ssc"; + reg = <0xfffbc000 0x4000>; + interrupts = <14 IRQ_TYPE_LEVEL_HIGH 5>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_ssc0_tx &pinctrl_ssc0_rx>; + status = "disabled"; + }; + + ssc1: ssc@fffc0000 { + compatible = "atmel,at91rm9200-ssc"; + reg = <0xfffc0000 0x4000>; + interrupts = <15 IRQ_TYPE_LEVEL_HIGH 5>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_ssc1_tx &pinctrl_ssc1_rx>; + status = "disabled"; + }; + + usb1: gadget@fffa4000 { + compatible = "atmel,at91rm9200-udc"; + reg = <0xfffa4000 0x4000>; + interrupts = <10 IRQ_TYPE_LEVEL_HIGH 2>; + status = "disabled"; + }; + + i2c0: i2c@fffac000 { + compatible = "atmel,at91sam9261-i2c"; + reg = <0xfffac000 0x100>; + interrupts = <11 IRQ_TYPE_LEVEL_HIGH 6>; + #address-cells = <1>; + #size-cells = <0>; + status = "disabled"; + }; + + mmc0: mmc@fffa8000 { + compatible = "atmel,hsmci"; + reg = <0xfffa8000 0x600>; + interrupts = <9 IRQ_TYPE_LEVEL_HIGH 0>; + #address-cells = <1>; + #size-cells = <0>; + status = "disabled"; + }; + + watchdog@fffffd40 { + compatible = "atmel,at91sam9260-wdt"; + reg = <0xfffffd40 0x10>; + status = "disabled"; + }; + + spi0: spi@fffc8000 { + #address-cells = <1>; + #size-cells = <0>; + compatible = "atmel,at91rm9200-spi"; + reg = <0xfffc8000 0x200>; + interrupts = <12 IRQ_TYPE_LEVEL_HIGH 3>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_spi0>; + status = "disabled"; + }; + + spi1: spi@fffcc000 { + #address-cells = <1>; + #size-cells = <0>; + compatible = "atmel,at91rm9200-spi"; + reg = <0xfffcc000 0x200>; + interrupts = <13 IRQ_TYPE_LEVEL_HIGH 3>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_spi1>; + status = "disabled"; + }; + }; + + nand0: nand@40000000 { + compatible = "atmel,at91rm9200-nand"; + #address-cells = <1>; + #size-cells = <1>; + reg = <0x40000000 0x10000000>; + atmel,nand-addr-offset = <22>; + atmel,nand-cmd-offset = <21>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_nand>; + + gpios = <&pioC 15 GPIO_ACTIVE_HIGH + &pioC 14 GPIO_ACTIVE_HIGH + 0 + >; + status = "disabled"; + }; + + usb0: ohci@00500000 { + compatible = "atmel,at91rm9200-ohci", "usb-ohci"; + reg = <0x00500000 0x100000>; + interrupts = <20 IRQ_TYPE_LEVEL_HIGH 2>; + status = "disabled"; + }; + }; + + i2c@0 { + compatible = "i2c-gpio"; + gpios = <&pioA 7 GPIO_ACTIVE_HIGH /* sda */ + &pioA 8 GPIO_ACTIVE_HIGH /* scl */ + >; + i2c-gpio,sda-open-drain; + i2c-gpio,scl-open-drain; + i2c-gpio,delay-us = <2>; /* ~100 kHz */ + #address-cells = <1>; + #size-cells = <0>; + status = "disabled"; + }; +}; diff --git a/arch/arm/boot/dts/at91sam9261ek.dts b/arch/arm/boot/dts/at91sam9261ek.dts new file mode 100644 index 0000000..f3d22a9 --- /dev/null +++ b/arch/arm/boot/dts/at91sam9261ek.dts @@ -0,0 +1,75 @@ +/* + * at91sam9261ek.dts - Device Tree file for Atmel at91sam9261 reference board + * + * Copyright (C) 2013 Jean-Jacques Hiblot <jjhiblot@traphandler.com> + * + * Licensed under GPLv2 only. + */ +/dts-v1/; +#include "at91sam9261.dtsi" + +/ { + model = "Atmel at91sam9261ek"; + compatible = "atmel,at91sam9261ek", "atmel,at91sam9261", "atmel,at91sam9"; + + chosen { + bootargs = "mem=64M console=ttyS0,115200"; + }; + + memory { + reg = <0x20000000 0x4000000>; + }; + + clocks { + #address-cells = <1>; + #size-cells = <1>; + ranges; + + main_clock: clock@0 { + compatible = "atmel,osc", "fixed-clock"; + clock-frequency = <18432000>; + }; + }; + + ahb { + apb { + dbgu: serial@fffff200 { + status = "okay"; + }; + + watchdog@fffffd40 { + status = "okay"; + }; + }; + + nand0: nand@40000000 { + nand-bus-width = <8>; + nand-ecc-mode = "soft"; + nand-on-flash-bbt = <1>; + status = "okay"; + at91bootstrap@0 { + label = "at91bootstrap"; + reg = <0x0 0x20000>; + }; + }; + }; + + leds { + compatible = "gpio-leds"; + ds8 { + label = "ds8"; + gpios = <&pioA 13 GPIO_ACTIVE_LOW>; + linux,default-trigger = "none"; + }; + ds7 { + label = "ds7"; + gpios = <&pioA 14 GPIO_ACTIVE_LOW>; + linux,default-trigger = "nand-disk"; + }; + ds1 { + label = "ds1"; + gpios = <&pioA 23 GPIO_ACTIVE_LOW>; + linux,default-trigger = "heartbeat"; + }; + }; +}; diff --git a/arch/arm/mach-at91/at91sam9261.c b/arch/arm/mach-at91/at91sam9261.c index 6276b4c..200d17a 100644 --- a/arch/arm/mach-at91/at91sam9261.c +++ b/arch/arm/mach-at91/at91sam9261.c @@ -189,6 +189,21 @@ static struct clk_lookup periph_clocks_lookups[] = { CLKDEV_CON_ID("pioA", &pioA_clk), CLKDEV_CON_ID("pioB", &pioB_clk), CLKDEV_CON_ID("pioC", &pioC_clk), + /* more usart lookup table for DT entries */ + CLKDEV_CON_DEV_ID("usart", "fffff200.serial", &mck), + CLKDEV_CON_DEV_ID("usart", "fffb0000.serial", &usart0_clk), + CLKDEV_CON_DEV_ID("usart", "ffffb400.serial", &usart1_clk), + CLKDEV_CON_DEV_ID("usart", "fff94000.serial", &usart2_clk), + /* more tc lookup table for DT entries */ + CLKDEV_CON_DEV_ID("t0_clk", "fffa0000.timer", &tc0_clk), + CLKDEV_CON_DEV_ID("hclk", "500000.ohci", &ohci_clk), + CLKDEV_CON_DEV_ID("spi_clk", "fffc8000.spi", &spi0_clk), + CLKDEV_CON_DEV_ID("spi_clk", "fffcc000.spi", &spi1_clk), + CLKDEV_CON_DEV_ID("mci_clk", "fffa8000.mmc", &mmc_clk), + CLKDEV_CON_DEV_ID(NULL, "fffac000.i2c", &twi_clk), + CLKDEV_CON_DEV_ID(NULL, "fffff400.gpio", &pioA_clk), + CLKDEV_CON_DEV_ID(NULL, "fffff600.gpio", &pioB_clk), + CLKDEV_CON_DEV_ID(NULL, "fffff800.gpio", &pioC_clk), }; static struct clk_lookup usart_clocks_lookups[] = { diff --git a/arch/arm/mach-at91/at91sam9261_devices.c b/arch/arm/mach-at91/at91sam9261_devices.c index b2a3474..2f926d9 100644 --- a/arch/arm/mach-at91/at91sam9261_devices.c +++ b/arch/arm/mach-at91/at91sam9261_devices.c @@ -599,8 +599,23 @@ static struct platform_device at91sam9261_tcb_device = { .num_resources = ARRAY_SIZE(tcb_resources), }; +#if defined(CONFIG_OF) +static struct of_device_id tcb_ids[] = { + { .compatible = "atmel,at91rm9200-tcb" }, + { /*sentinel*/ } +}; +#endif static void __init at91_add_device_tc(void) { +#if defined(CONFIG_OF) + struct device_node *np; + + np = of_find_matching_node(NULL, tcb_ids); + if (np) { + of_node_put(np); + return; + } +#endif platform_device_register(&at91sam9261_tcb_device); } #else @@ -1088,6 +1103,9 @@ void __init at91_add_device_serial(void) {} */ static int __init at91_add_standard_devices(void) { + if (of_have_populated_dt()) + return 0; + at91_add_device_rtt(); at91_add_device_watchdog(); at91_add_device_tc();