mbox

[0/5] ARM: at91: rm9200 dt updates

Message ID 20130617123645.GA21034@game.jcrosoft.org
State New
Headers show

Pull-request

git://github.com/at91linux/linux-at91.git j/for-3.11-rm9200

Message

Jean-Christophe PLAGNIOL-VILLARD June 17, 2013, 12:36 p.m. UTC 
Hi,

	The following patch series enable rm9200 in the dt defconfig and add
	- spi
	- pqfp package version

The following changes since commit 24ce10e142e7b063c4ae4437dd3b290fbfafe052:

  ARM: at91: sam9m10g45ek add udc DT support (2013-06-15 00:15:22 +0200)

are available in the git repository at:

  git://github.com/at91linux/linux-at91.git j/for-3.11-rm9200

for you to fetch changes up to 0dab9f12eab58fdf876be8bb39432f7426615230:

  ARM: at91: at91rm9200: set default mmc0 pinctrl-names (2013-06-17 20:37:26 +0800)

----------------------------------------------------------------
Jean-Christophe PLAGNIOL-VILLARD (5):
      ARM: at91: at91_dt_defconfig: enable rm9200 support
      ARM: at91: dt: rm9200: add spi support
      ARM: at91: dt: rm9200ek: add spi support
      ARM: AT91: dt: add at91rm9200 PQFP package version
      ARM: at91: at91rm9200: set default mmc0 pinctrl-names

 arch/arm/boot/dts/at91rm9200.dtsi      |   21 +++++++++++++++++++++
 arch/arm/boot/dts/at91rm9200_pqfp.dtsi |   17 +++++++++++++++++
 arch/arm/boot/dts/at91rm9200ek.dts     |   10 ++++++++++
 arch/arm/configs/at91_dt_defconfig     |    4 +++-
 4 files changed, 51 insertions(+), 1 deletion(-)
 create mode 100644 arch/arm/boot/dts/at91rm9200_pqfp.dtsi

Best Regards,
J.

Comments

Nicolas Ferre June 25, 2013, 10:35 a.m. UTC | #1 
On 17/06/2013 14:38, Jean-Christophe PLAGNIOL-VILLARD :
> Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
> Cc: Nicolas Ferre <nicolas.ferre@atmel.com>
> ---
>   arch/arm/boot/dts/at91rm9200.dtsi |    1 +
>   1 file changed, 1 insertion(+)
>
> diff --git a/arch/arm/boot/dts/at91rm9200.dtsi b/arch/arm/boot/dts/at91rm9200.dtsi
> index 1fc645e..8bc87e5 100644
> --- a/arch/arm/boot/dts/at91rm9200.dtsi
> +++ b/arch/arm/boot/dts/at91rm9200.dtsi
> @@ -116,6 +116,7 @@
>   				interrupts = <10 IRQ_TYPE_LEVEL_HIGH 0>;
>   				#address-cells = <1>;
>   				#size-cells = <0>;
> +				pinctrl-names = "default";

You do not add a pinctrl cell: is it normal? Which pinctrl definition 
does it take then?

>   				status = "disabled";
>   			};
>
>
Nicolas Ferre June 25, 2013, 10:39 a.m. UTC | #2 
On 17/06/2013 14:38, Jean-Christophe PLAGNIOL-VILLARD :
> Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
> Cc: Nicolas Ferre <nicolas.ferre@atmel.com>
> ---
>   arch/arm/configs/at91_dt_defconfig |    4 +++-
>   1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/arch/arm/configs/at91_dt_defconfig b/arch/arm/configs/at91_dt_defconfig
> index 75fd842..690e892 100644
> --- a/arch/arm/configs/at91_dt_defconfig
> +++ b/arch/arm/configs/at91_dt_defconfig
> @@ -14,11 +14,13 @@ CONFIG_MODULE_UNLOAD=y
>   # CONFIG_IOSCHED_DEADLINE is not set
>   # CONFIG_IOSCHED_CFQ is not set
>   CONFIG_ARCH_AT91=y
> +CONFIG_SOC_AT91RM9200=y
>   CONFIG_SOC_AT91SAM9260=y
>   CONFIG_SOC_AT91SAM9263=y
>   CONFIG_SOC_AT91SAM9G45=y
>   CONFIG_SOC_AT91SAM9X5=y
>   CONFIG_SOC_AT91SAM9N12=y
> +CONFIG_MACH_AT91RM9200_DT=y
>   CONFIG_MACH_AT91SAM9_DT=y
>   CONFIG_AT91_PROGRAMMABLE_CLOCKS=y
>   CONFIG_AT91_TIMER_HZ=128
> @@ -62,6 +64,7 @@ CONFIG_MTD=y
>   CONFIG_MTD_CMDLINE_PARTS=y
>   CONFIG_MTD_CHAR=y
>   CONFIG_MTD_BLOCK=y
> +CONFIG_MTD_DATAFLASH=y
>   CONFIG_MTD_NAND=y
>   CONFIG_MTD_NAND_ATMEL=y
>   CONFIG_MTD_UBI=y
> @@ -78,7 +81,6 @@ CONFIG_BLK_DEV_SD=y
>   CONFIG_SCSI_MULTI_LUN=y
>   # CONFIG_SCSI_LOWLEVEL is not set
>   CONFIG_NETDEVICES=y
> -CONFIG_MII=y

What is the reason for this change? It is really related with rm9200 DT 
suppot?

>   CONFIG_MACB=y
>   # CONFIG_NET_VENDOR_BROADCOM is not set
>   # CONFIG_NET_VENDOR_FARADAY is not set
>
Nicolas Ferre June 26, 2013, 7:55 a.m. UTC | #3 
On 17/06/2013 14:38, Jean-Christophe PLAGNIOL-VILLARD :
> the PQFP version have only 3 gpio banks (A, B & C)
>
> Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
> Cc: Nicolas Ferre <nicolas.ferre@atmel.com>

Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>

> ---
>   arch/arm/boot/dts/at91rm9200_pqfp.dtsi |   17 +++++++++++++++++
>   1 file changed, 17 insertions(+)
>   create mode 100644 arch/arm/boot/dts/at91rm9200_pqfp.dtsi
>
> diff --git a/arch/arm/boot/dts/at91rm9200_pqfp.dtsi b/arch/arm/boot/dts/at91rm9200_pqfp.dtsi
> new file mode 100644
> index 0000000..8e3d43f
> --- /dev/null
> +++ b/arch/arm/boot/dts/at91rm9200_pqfp.dtsi
> @@ -0,0 +1,17 @@
> +/*
> + * at91rm9200_pqfp.dtsi - Device Tree Include file for AT91RM9200 PQFP family SoC
> + *
> + * Copyright (C) 2013 Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
> + *
> + * Licensed under GPLv2 or later.
> + */
> +
> +#include "at91rm9200.dtsi"
> +
> +/ {
> +	compatible = "atmel,at91rm9200-pqfp", "atmel,at91rm9200";
> +};
> +
> +&pioD {
> +	status = "disable";

Typo: s/disable/disabled/

> +};
>
Nicolas Ferre June 26, 2013, 8:51 a.m. UTC | #4 
On 17/06/2013 14:38, Jean-Christophe PLAGNIOL-VILLARD :
> Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
> Cc: Nicolas Ferre <nicolas.ferre@atmel.com>

Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>

stacked on at91-3.11-dt

> ---
>   arch/arm/boot/dts/at91rm9200.dtsi |   20 ++++++++++++++++++++
>   1 file changed, 20 insertions(+)
>
> diff --git a/arch/arm/boot/dts/at91rm9200.dtsi b/arch/arm/boot/dts/at91rm9200.dtsi
> index b91cf78..1fc645e 100644
> --- a/arch/arm/boot/dts/at91rm9200.dtsi
> +++ b/arch/arm/boot/dts/at91rm9200.dtsi
> @@ -474,6 +474,15 @@
>   					};
>   				};
>
> +				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 */
> +					};
> +				};
> +
>   				pioA: gpio@fffff400 {
>   					compatible = "atmel,at91rm9200-gpio";
>   					reg = <0xfffff400 0x200>;
> @@ -574,6 +583,17 @@
>   				interrupts = <11 IRQ_TYPE_LEVEL_HIGH 2>;
>   				status = "disabled";
>   			};
> +
> +			spi0: spi@fffe0000 {
> +				#address-cells = <1>;
> +				#size-cells = <0>;
> +				compatible = "atmel,at91rm9200-spi";
> +				reg = <0xfffe0000 0x200>;
> +				interrupts = <13 IRQ_TYPE_LEVEL_HIGH 3>;
> +				pinctrl-names = "default";
> +				pinctrl-0 = <&pinctrl_spi0>;
> +				status = "disabled";
> +			};
>   		};
>
>   		nand0: nand@40000000 {
>
Nicolas Ferre June 26, 2013, 8:51 a.m. UTC | #5 
On 17/06/2013 14:38, Jean-Christophe PLAGNIOL-VILLARD :
> Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
> Cc: Nicolas Ferre <nicolas.ferre@atmel.com>

Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>

stacked on at91-3.11-dt

Thanks

> ---
>   arch/arm/boot/dts/at91rm9200ek.dts |   10 ++++++++++
>   1 file changed, 10 insertions(+)
>
> diff --git a/arch/arm/boot/dts/at91rm9200ek.dts b/arch/arm/boot/dts/at91rm9200ek.dts
> index 1405812..d2d72c3 100644
> --- a/arch/arm/boot/dts/at91rm9200ek.dts
> +++ b/arch/arm/boot/dts/at91rm9200ek.dts
> @@ -53,6 +53,16 @@
>   				atmel,vbus-gpio = <&pioD 4 GPIO_ACTIVE_HIGH>;
>   				status = "okay";
>   			};
> +
> +			spi0: spi@fffe0000 {
> +				status = "okay";
> +				cs-gpios = <&pioA 3 0>, <0>, <0>, <0>;
> +				mtd_dataflash@0 {
> +					compatible = "atmel,at45", "atmel,dataflash";
> +					spi-max-frequency = <15000000>;
> +					reg = <0>;
> +				};
> +			};
>   		};
>
>   		usb0: ohci@00300000 {
>
Nicolas Ferre Aug. 21, 2013, 9:40 a.m. UTC | #6 
On 25/06/2013 12:35, Nicolas Ferre :
> On 17/06/2013 14:38, Jean-Christophe PLAGNIOL-VILLARD :
>> Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
>> Cc: Nicolas Ferre <nicolas.ferre@atmel.com>
>> ---
>>    arch/arm/boot/dts/at91rm9200.dtsi |    1 +
>>    1 file changed, 1 insertion(+)
>>
>> diff --git a/arch/arm/boot/dts/at91rm9200.dtsi b/arch/arm/boot/dts/at91rm9200.dtsi
>> index 1fc645e..8bc87e5 100644
>> --- a/arch/arm/boot/dts/at91rm9200.dtsi
>> +++ b/arch/arm/boot/dts/at91rm9200.dtsi
>> @@ -116,6 +116,7 @@
>>    				interrupts = <10 IRQ_TYPE_LEVEL_HIGH 0>;
>>    				#address-cells = <1>;
>>    				#size-cells = <0>;
>> +				pinctrl-names = "default";
>
> You do not add a pinctrl cell: is it normal? Which pinctrl definition
> does it take then?

Okay, same fix that the one for 9260/9g20. So I take this one without a 
change:

Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>

>
>>    				status = "disabled";
>>    			};
>>
>>
>
>
Nicolas Ferre Aug. 21, 2013, 10:16 a.m. UTC | #7 
On 25/06/2013 12:39, Nicolas Ferre :
> On 17/06/2013 14:38, Jean-Christophe PLAGNIOL-VILLARD :
>> Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
>> Cc: Nicolas Ferre <nicolas.ferre@atmel.com>
>> ---
>>    arch/arm/configs/at91_dt_defconfig |    4 +++-
>>    1 file changed, 3 insertions(+), 1 deletion(-)
>>
>> diff --git a/arch/arm/configs/at91_dt_defconfig b/arch/arm/configs/at91_dt_defconfig
>> index 75fd842..690e892 100644
>> --- a/arch/arm/configs/at91_dt_defconfig
>> +++ b/arch/arm/configs/at91_dt_defconfig
>> @@ -14,11 +14,13 @@ CONFIG_MODULE_UNLOAD=y
>>    # CONFIG_IOSCHED_DEADLINE is not set
>>    # CONFIG_IOSCHED_CFQ is not set
>>    CONFIG_ARCH_AT91=y
>> +CONFIG_SOC_AT91RM9200=y
>>    CONFIG_SOC_AT91SAM9260=y
>>    CONFIG_SOC_AT91SAM9263=y
>>    CONFIG_SOC_AT91SAM9G45=y
>>    CONFIG_SOC_AT91SAM9X5=y
>>    CONFIG_SOC_AT91SAM9N12=y
>> +CONFIG_MACH_AT91RM9200_DT=y
>>    CONFIG_MACH_AT91SAM9_DT=y
>>    CONFIG_AT91_PROGRAMMABLE_CLOCKS=y
>>    CONFIG_AT91_TIMER_HZ=128
>> @@ -62,6 +64,7 @@ CONFIG_MTD=y
>>    CONFIG_MTD_CMDLINE_PARTS=y
>>    CONFIG_MTD_CHAR=y
>>    CONFIG_MTD_BLOCK=y
>> +CONFIG_MTD_DATAFLASH=y
>>    CONFIG_MTD_NAND=y
>>    CONFIG_MTD_NAND_ATMEL=y
>>    CONFIG_MTD_UBI=y
>> @@ -78,7 +81,6 @@ CONFIG_BLK_DEV_SD=y
>>    CONFIG_SCSI_MULTI_LUN=y
>>    # CONFIG_SCSI_LOWLEVEL is not set
>>    CONFIG_NETDEVICES=y
>> -CONFIG_MII=y
>
> What is the reason for this change? It is really related with rm9200 DT
> suppot?

Okay, automatic selection by MACB => we can remove it.

Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>

stacked on at91-3.12-cleanup

Thanks,

>
>>    CONFIG_MACB=y
>>    # CONFIG_NET_VENDOR_BROADCOM is not set
>>    # CONFIG_NET_VENDOR_FARADAY is not set
>>
>
>
Nicolas Ferre Aug. 21, 2013, 10:20 a.m. UTC | #8 
On 26/06/2013 09:55, Nicolas Ferre :
> On 17/06/2013 14:38, Jean-Christophe PLAGNIOL-VILLARD :
>> the PQFP version have only 3 gpio banks (A, B & C)
>>
>> Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
>> Cc: Nicolas Ferre <nicolas.ferre@atmel.com>
>
> Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
>
>> ---
>>    arch/arm/boot/dts/at91rm9200_pqfp.dtsi |   17 +++++++++++++++++
>>    1 file changed, 17 insertions(+)
>>    create mode 100644 arch/arm/boot/dts/at91rm9200_pqfp.dtsi
>>
>> diff --git a/arch/arm/boot/dts/at91rm9200_pqfp.dtsi b/arch/arm/boot/dts/at91rm9200_pqfp.dtsi
>> new file mode 100644
>> index 0000000..8e3d43f
>> --- /dev/null
>> +++ b/arch/arm/boot/dts/at91rm9200_pqfp.dtsi
>> @@ -0,0 +1,17 @@
>> +/*
>> + * at91rm9200_pqfp.dtsi - Device Tree Include file for AT91RM9200 PQFP family SoC
>> + *
>> + * Copyright (C) 2013 Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
>> + *
>> + * Licensed under GPLv2 or later.
>> + */
>> +
>> +#include "at91rm9200.dtsi"
>> +
>> +/ {
>> +	compatible = "atmel,at91rm9200-pqfp", "atmel,at91rm9200";
>> +};
>> +
>> +&pioD {
>> +	status = "disable";
>
> Typo: s/disable/disabled/

With typo corrected, stacked on at91-3.12-dt

Thanks,