Re: [PATCH V2] AT91: dt: at91sam9g45 family and board device treefiles

From: Nicolas Ferre
Date: Fri Oct 07 2011 - 08:56:49 EST

Next message: Axel Lin: "Re: [PATCH 01/11 RESEND] ASoC: wm8510: Convert to snd_soc_write"
Previous message: Felipe Balbi: "Re: [PATCH] usb: add new usb gadget for ACM and mass storage"
In reply to: Rob Herring: "Re: [PATCH V2] AT91: dt: at91sam9g45 family and board device treefiles"
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

On 10/05/2011 03:00 PM, Rob Herring :
> Nicolas,
>
> On 10/03/2011 05:00 AM, Nicolas Ferre wrote:
>> Create a new device tree source file for Atmel at91sam9g45 SoC family.
>> The Evaluation Kit at91sam9m10g45ek includes it.
>> This first basic support will be populated as drivers and boards will be
>> converted to device tree.
>> Contains serial, dma and interrupt controllers.
>>
>> The generic board file still takes advantage of platform data for early serial
>> init. As we need a storage media and the NAND flash driver is not converted to
>> DT yet, we keep old initialization for it.
>>
>> Signed-off-by: Nicolas Ferre <nicolas.ferre@xxxxxxxxx>
>> ---
>> V2: foundation for AT91SAM generic support
>> - device tree focused board file
>> - inclusion of USART DT support
>> - early USART and NAND still using platform data
>>
>> arch/arm/boot/dts/at91sam9g45.dtsi | 103 +++++++++++++++++++++++++
>> arch/arm/boot/dts/at91sam9m10g45ek.dts | 37 +++++++++
>> arch/arm/mach-at91/Kconfig | 11 +++
>> arch/arm/mach-at91/Makefile | 3 +
>> arch/arm/mach-at91/Makefile.boot | 2 +
>> arch/arm/mach-at91/at91sam9g45_devices.c | 24 +++++--
>> arch/arm/mach-at91/board-dt.c | 122 ++++++++++++++++++++++++++++++
>> 7 files changed, 296 insertions(+), 6 deletions(-)
>> create mode 100644 arch/arm/boot/dts/at91sam9g45.dtsi
>> create mode 100644 arch/arm/boot/dts/at91sam9m10g45ek.dts
>> create mode 100644 arch/arm/mach-at91/board-dt.c
>>
>> diff --git a/arch/arm/boot/dts/at91sam9g45.dtsi b/arch/arm/boot/dts/at91sam9g45.dtsi
>> new file mode 100644
>> index 0000000..7d3341f
>> --- /dev/null
>> +++ b/arch/arm/boot/dts/at91sam9g45.dtsi
>> @@ -0,0 +1,103 @@
>> +/*
>> + * at91sam9g45.dtsi - Device Tree Include file for AT91SAM9G45 family SoC
>> + * applies to AT91SAM9G45, AT91SAM9M10,
>> + * AT91SAM9G46, AT91SAM9M11 SoC
>> + *
>> + * Copyright (C) 2011 Atmel,
>> + * 2011 Nicolas Ferre <nicolas.ferre@xxxxxxxxx>
>> + *
>> + * Licensed under GPLv2 or later.
>> + */
>> +
>> +/include/ "skeleton.dtsi"
>> +
>> +/ {
>> + model = "Atmel AT91SAM9G45 family SoC";
>> + compatible = "atmel,at91sam9g45";
>> + interrupt-parent = <&aic>;
>> +
>> + aliases {
>> + serial0 = &dbgu;
>> + serial1 = &usart0;
>> + serial2 = &usart1;
>> + serial3 = &usart2;
>> + serial4 = &usart3;
>> + };
>> + cpus {
>> + cpu@0 {
>> + compatible = "arm,arm926ejs";
>> + };
>> + };
>> +
>> + memory {
>
> Should be memory@0x70000000
>
>> + reg = <0x70000000 0x10000000>;
>> + };
>> +
>> + 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 = <1>;
>> + compatible = "atmel,at91rm9200-aic";
>> + interrupt-controller;
>
> Add "interrupt-parent;" so that the aic is not the parent of itself.
>
>> + reg = <0xfffff000 0x200>;
>> + };
>> +
>> + dma: dma-controller@ffffec00 {
>> + compatible = "atmel,at91sam9g45-hdmac";
>> + reg = <0xffffec00 0x200>;
>> + interrupts = <21>;
>> + atmel,hdmac-nr-channels = <8>;
>> + atmel,hdmac-cap-memcpy;
>> + atmel,hdmac-cap-slave;
>> + };
>> +
>> + dbgu: serial@ffffee00 {
>> + compatible = "atmel,at91sam9260-usart";
>> + reg = <0xffffee00 0x200>;
>> + interrupts = <1>;
>> + };
>> +
>> + usart0: serial@fff8c000 {
>> + compatible = "atmel,at91sam9260-usart";
>> + reg = <0xfff8c000 0x4000>;
>
> Is 16K really used? I would set to 4K so your not wasting virtual space
> (probably not an issue yet on Atmel parts).

Yes, I can adapt this value to the real size of register bank. The
memory map on the datasheet is not precise about this and I have to
refer to the IP documentation itself. But anyway, if it has an interest,
I can adapt this to real values.

>> + interrupts = <7>;
>> + atmel,use-dma-rx;
>> + atmel,use-dma-tx;
>> + };
>> +
>> + usart1: serial@fff90000 {
>> + compatible = "atmel,at91sam9260-usart";
>> + reg = <0xfff90000 0x4000>;
>> + interrupts = <8>;
>> + atmel,use-dma-rx;
>> + atmel,use-dma-tx;
>> + };
>> +
>> + usart2: serial@fff94000 {
>> + compatible = "atmel,at91sam9260-usart";
>> + reg = <0xfff94000 0x4000>;
>> + interrupts = <9>;
>> + atmel,use-dma-rx;
>> + atmel,use-dma-tx;
>> + };
>> +
>> + usart3: serial@fff98000 {
>> + compatible = "atmel,at91sam9260-usart";
>> + reg = <0xfff98000 0x4000>;
>> + interrupts = <10>;
>> + atmel,use-dma-rx;
>> + atmel,use-dma-tx;
>> + };
>> + };
>> + };
>> +};
>> diff --git a/arch/arm/boot/dts/at91sam9m10g45ek.dts b/arch/arm/boot/dts/at91sam9m10g45ek.dts
>> new file mode 100644
>> index 0000000..cf743de
>> --- /dev/null
>> +++ b/arch/arm/boot/dts/at91sam9m10g45ek.dts
>> @@ -0,0 +1,37 @@
>> +/*
>> + * at91sam9m10g45ek.dts - Device Tree file for AT91SAM9M10G45-EK board
>> + *
>> + * Copyright (C) 2011 Atmel,
>> + * 2011 Nicolas Ferre <nicolas.ferre@xxxxxxxxx>
>> + *
>> + * Licensed under GPLv2 or later.
>> + */
>> +/dts-v1/;
>> +/include/ "at91sam9g45.dtsi"
>> +
>> +/ {
>> + model = "Atmel AT91SAM9M10G45-EK";
>> + compatible = "atmel,at91sam9m10g45ek", "atmel,at91sam9g45", "atmel,at91sam9";
>> +
>> + chosen {
>> + bootargs = "mem=64M console=ttyS0,115200 mtdparts=atmel_nand:4M(bootstrap/uboot/kernel)ro,60M(rootfs),-(data) root=/dev/mtdblock1 rw rootfstype=jffs2";
>> + };
>> +
>> + memory {
>> + reg = <0x70000000 0x4000000>;
>> + };
>> +
>> + ahb {
>> + apb {
>> + usart0: serial@fff8c000 {
>> + status = "disabled";
>> + };
>> + usart2: serial@fff94000 {
>> + status = "disabled";
>> + };
>> + usart3: serial@fff98000 {
>> + status = "disabled";
>> + };
>> + };
>> + };
>> +};
>> diff --git a/arch/arm/mach-at91/Kconfig b/arch/arm/mach-at91/Kconfig
>> index 2248467..4b59d96 100644
>> --- a/arch/arm/mach-at91/Kconfig
>> +++ b/arch/arm/mach-at91/Kconfig
>> @@ -442,6 +442,17 @@ endif
>>
>> # ----------------------------------------------------------
>>
>> +comment "Generic Board Type"
>> +
>> +config MACH_AT91SAM_DT
>> + bool "Atmel AT91SAM Evaluation Kits with device-tree support"
>> + select USE_OF
>> + help
>> + Select this if you want to experiment device-tree with
>> + an Atmel Evaluation Kit.
>> +
>> +# ----------------------------------------------------------
>> +
>> comment "AT91 Board Options"
>>
>> config MTD_AT91_DATAFLASH_CARD
>> diff --git a/arch/arm/mach-at91/Makefile b/arch/arm/mach-at91/Makefile
>> index bf57e8b..3ff245e 100644
>> --- a/arch/arm/mach-at91/Makefile
>> +++ b/arch/arm/mach-at91/Makefile
>> @@ -74,6 +74,9 @@ obj-$(CONFIG_MACH_SNAPPER_9260) += board-snapper9260.o
>> # AT91SAM9G45 board-specific support
>> obj-$(CONFIG_MACH_AT91SAM9M10G45EK) += board-sam9m10g45ek.o
>>
>> +# AT91SAM board with device-tree
>> +obj-$(CONFIG_MACH_AT91SAM_DT) += board-dt.o
>> +
>> # AT91CAP9 board-specific support
>> obj-$(CONFIG_MACH_AT91CAP9ADK) += board-cap9adk.o
>>
>> diff --git a/arch/arm/mach-at91/Makefile.boot b/arch/arm/mach-at91/Makefile.boot
>> index 3462b81..d278863 100644
>> --- a/arch/arm/mach-at91/Makefile.boot
>> +++ b/arch/arm/mach-at91/Makefile.boot
>> @@ -16,3 +16,5 @@ else
>> params_phys-y := 0x20000100
>> initrd_phys-y := 0x20410000
>> endif
>> +
>> +dtb-$(CONFIG_MACH_AT91SAM_DT) += at91sam9m10g45ek.dtb
>> diff --git a/arch/arm/mach-at91/at91sam9g45_devices.c b/arch/arm/mach-at91/at91sam9g45_devices.c
>> index bb84040..27276b8 100644
>> --- a/arch/arm/mach-at91/at91sam9g45_devices.c
>> +++ b/arch/arm/mach-at91/at91sam9g45_devices.c
>> @@ -69,9 +69,16 @@ static struct platform_device at_hdmac_device = {
>>
>> void __init at91_add_device_hdmac(void)
>> {
>> - dma_cap_set(DMA_MEMCPY, atdma_pdata.cap_mask);
>> - dma_cap_set(DMA_SLAVE, atdma_pdata.cap_mask);
>> - platform_device_register(&at_hdmac_device);
>> + struct device_node *of_node =
>> + of_find_node_by_name(NULL, "dma-controller");
>
> You should really search by the compatible string.
>
>> +
>> + if (of_node) {
>> + of_node_put(of_node);
>> + } else {
>> + dma_cap_set(DMA_MEMCPY, atdma_pdata.cap_mask);
>> + dma_cap_set(DMA_SLAVE, atdma_pdata.cap_mask);
>
> This really should be in the driver.

Yes, I will try to find a way to get rid of those platform data.

>> + platform_device_register(&at_hdmac_device);
>> + }
>> }
>> #else
>> void __init at91_add_device_hdmac(void) {}
>> @@ -1556,10 +1563,15 @@ void __init at91_set_serial_console(unsigned portnr)
>> void __init at91_add_device_serial(void)
>> {
>> int i;
>> + struct device_node *of_node = of_find_node_by_name(NULL, "serial");
>>
>> - for (i = 0; i < ATMEL_MAX_UART; i++) {
>> - if (at91_uarts[i])
>> - platform_device_register(at91_uarts[i]);
>> + if (of_node) {
>> + of_node_put(of_node);
>> + } else {
>> + for (i = 0; i < ATMEL_MAX_UART; i++) {
>> + if (at91_uarts[i])
>> + platform_device_register(at91_uarts[i]);
>> + }
>
> Why can't you only call these init functions when booting non-DT?

For the dma driver function: this init function is called as an
arch_initcall().
But for the 91_add_device_serial() function, I can simply avoid calling
it, like you suggest.

>> }
>>
>> if (!atmel_default_console_device)
>> diff --git a/arch/arm/mach-at91/board-dt.c b/arch/arm/mach-at91/board-dt.c
>> new file mode 100644
>> index 0000000..7bcb9a9
>> --- /dev/null
>> +++ b/arch/arm/mach-at91/board-dt.c
>> @@ -0,0 +1,122 @@
>> +/*
>> + * Setup code for AT91SAM Evaluation Kits with Device Tree support
>> + *
>> + * Covers: * AT91SAM9G45-EKES board
>> + * * AT91SAM9M10-EKES board
>> + * * AT91SAM9M10G45-EK board
>> + *
>> + * Copyright (C) 2011 Atmel,
>> + * 2011 Nicolas Ferre <nicolas.ferre@xxxxxxxxx>
>> + *
>> + * Licensed under GPLv2 or later.
>> + */
>> +
>> +#include <linux/types.h>
>> +#include <linux/init.h>
>> +#include <linux/module.h>
>> +#include <linux/irqdomain.h>
>> +#include <linux/of_irq.h>
>> +#include <linux/of_platform.h>
>> +
>> +#include <mach/hardware.h>
>> +#include <mach/board.h>
>> +#include <mach/gpio.h>
>> +#include <mach/system_rev.h>
>> +#include <mach/at91sam9_smc.h>
>> +
>> +#include <asm/setup.h>
>> +#include <asm/irq.h>
>> +#include <asm/mach/arch.h>
>> +#include <asm/mach/map.h>
>> +#include <asm/mach/irq.h>
>> +
>> +#include "sam9_smc.h"
>> +#include "generic.h"
>> +
>> +
>> +static void __init ek_init_early(void)
>> +{
>> + /* Initialize processor: 12.000 MHz crystal */
>> + at91_initialize(12000000);
>> +
>> + /* DGBU on ttyS0. (Rx & Tx only) */
>> + at91_register_uart(0, 0, 0);
>> +
>> + /* USART0 not connected on the -EK board */
>> + /* USART1 on ttyS2. (Rx, Tx, RTS, CTS) */
>> + at91_register_uart(AT91SAM9G45_ID_US1, 2, ATMEL_UART_CTS | ATMEL_UART_RTS);
>> +
>> + /* set serial console to ttyS0 (ie, DBGU) */
>> + at91_set_serial_console(0);
>> +}
>> +
>> +/* det_pin is not connected */
>> +static struct atmel_nand_data __initdata ek_nand_data = {
>> + .ale = 21,
>> + .cle = 22,
>> + .rdy_pin = AT91_PIN_PC8,
>> + .enable_pin = AT91_PIN_PC14,
>> +};
>> +
>> +static struct sam9_smc_config __initdata ek_nand_smc_config = {
>> + .ncs_read_setup = 0,
>> + .nrd_setup = 2,
>> + .ncs_write_setup = 0,
>> + .nwe_setup = 2,
>> +
>> + .ncs_read_pulse = 4,
>> + .nrd_pulse = 4,
>> + .ncs_write_pulse = 4,
>> + .nwe_pulse = 4,
>> +
>> + .read_cycle = 7,
>> + .write_cycle = 7,
>> +
>> + .mode = AT91_SMC_READMODE | AT91_SMC_WRITEMODE | AT91_SMC_EXNWMODE_DISABLE,
>> + .tdf_cycles = 3,
>> +};
>> +
>> +static void __init ek_add_device_nand(void)
>> +{
>> + ek_nand_data.bus_width_16 = board_have_nand_16bit();
>> + /* setup bus-width (8 or 16) */
>> + if (ek_nand_data.bus_width_16)
>> + ek_nand_smc_config.mode |= AT91_SMC_DBW_16;
>> + else
>> + ek_nand_smc_config.mode |= AT91_SMC_DBW_8;
>> +
>> + /* configure chip-select 3 (NAND) */
>> + sam9_smc_configure(3, &ek_nand_smc_config);
>> +
>> + at91_add_device_nand(&ek_nand_data);
>> +}
>> +
>> +static const struct of_device_id aic_of_match[] __initconst = {
>> + { .compatible = "atmel,at91rm9200-aic", },
>> + {},
>> +};
>> +
>> +static void __init at91_dt_device_init(void)
>> +{
>> + irq_domain_generate_simple(aic_of_match, 0xfffff000, 0);
>
> Why is this not in the .init_irq function? I'm surprised your timer
> interrupt even works.

Ok, I will add an .init_irq function in my v3 patch.

BTW, as I am a little bit confused about the "early" serial
initialization, what is the proper way to address this?
So, can you tell me or give me a pointer to an update on this topic: I
know that it is moving a lot those days...

Thanks a lot for your review.
Best regards,
--
Nicolas Ferre
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

Next message: Axel Lin: "Re: [PATCH 01/11 RESEND] ASoC: wm8510: Convert to snd_soc_write"
Previous message: Felipe Balbi: "Re: [PATCH] usb: add new usb gadget for ACM and mass storage"
In reply to: Rob Herring: "Re: [PATCH V2] AT91: dt: at91sam9g45 family and board device treefiles"
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]