Re: [PATCH] ARM: at91/dt: split sama5d3 definition

2013-08-08 Thread Jean-Christophe PLAGNIOL-VILLARD
On 10:49 Wed 07 Aug , Boris BREZILLON wrote:
> This patch splits the sama5d3 SoCs definition:
> - a common base for all sama5d3 SoCs (sama5d3.dtsi)
> - several optional peripheral definitions which will be included by sama5d3
>   specific SoCs (sama5d3_'periph name'.dtsi)
> - sama5d3 specific SoC definitions (sama5d3x.dtsi)
> 
> This provides a better representation of the real hardware (drop unneed
> dt nodes) and avoids peripheral id conflict (which is not the case for
> current sama5d3 SoCs, but could be if other SoCs of this family are
> released).

same comment as the other patch

too much file for no real advantage so no for me

Best Regards,
J.
> 
> Signed-off-by: Boris BREZILLON 
> ---
>  arch/arm/boot/dts/sama5d3.dtsi  |  203 
> ---
>  arch/arm/boot/dts/sama5d31.dtsi |   16 +++
>  arch/arm/boot/dts/sama5d31ek.dts|3 +-
>  arch/arm/boot/dts/sama5d33.dtsi |   14 +++
>  arch/arm/boot/dts/sama5d33ek.dts|1 +
>  arch/arm/boot/dts/sama5d34.dtsi |   16 +++
>  arch/arm/boot/dts/sama5d34ek.dts|1 +
>  arch/arm/boot/dts/sama5d35.dtsi |   18 
>  arch/arm/boot/dts/sama5d35ek.dts|1 +
>  arch/arm/boot/dts/sama5d3_can.dtsi  |   54 ++
>  arch/arm/boot/dts/sama5d3_emac.dtsi |   44 
>  arch/arm/boot/dts/sama5d3_gmac.dtsi |   77 +
>  arch/arm/boot/dts/sama5d3_lcd.dtsi  |   55 ++
>  arch/arm/boot/dts/sama5d3_mci2.dtsi |   47 
>  arch/arm/boot/dts/sama5d3_tcb1.dtsi |   27 +
>  arch/arm/boot/dts/sama5d3_uart.dtsi |   53 +
>  arch/arm/boot/dts/sama5d3xcm.dtsi   |1 -
>  17 files changed, 426 insertions(+), 205 deletions(-)
>  create mode 100644 arch/arm/boot/dts/sama5d31.dtsi
>  create mode 100644 arch/arm/boot/dts/sama5d33.dtsi
>  create mode 100644 arch/arm/boot/dts/sama5d34.dtsi
>  create mode 100644 arch/arm/boot/dts/sama5d35.dtsi
>  create mode 100644 arch/arm/boot/dts/sama5d3_can.dtsi
>  create mode 100644 arch/arm/boot/dts/sama5d3_emac.dtsi
>  create mode 100644 arch/arm/boot/dts/sama5d3_gmac.dtsi
>  create mode 100644 arch/arm/boot/dts/sama5d3_lcd.dtsi
>  create mode 100644 arch/arm/boot/dts/sama5d3_mci2.dtsi
>  create mode 100644 arch/arm/boot/dts/sama5d3_tcb1.dtsi
>  create mode 100644 arch/arm/boot/dts/sama5d3_uart.dtsi
> 
> diff --git a/arch/arm/boot/dts/sama5d3.dtsi b/arch/arm/boot/dts/sama5d3.dtsi
> index a1d5e25..b72f310 100644
> --- a/arch/arm/boot/dts/sama5d3.dtsi
> +++ b/arch/arm/boot/dts/sama5d3.dtsi
> @@ -31,7 +31,6 @@
>   gpio3 = &pioD;
>   gpio4 = &pioE;
>   tcb0 = &tcb0;
> - tcb1 = &tcb1;
>   i2c0 = &i2c0;
>   i2c1 = &i2c1;
>   i2c2 = &i2c2;
> @@ -100,15 +99,6 @@
>   status = "disabled";
>   };
>  
> - can0: can@f000c000 {
> - compatible = "atmel,at91sam9x5-can";
> - reg = <0xf000c000 0x300>;
> - interrupts = <40 IRQ_TYPE_LEVEL_HIGH 3>;
> - pinctrl-names = "default";
> - pinctrl-0 = <&pinctrl_can0_rx_tx>;
> - status = "disabled";
> - };
> -
>   tcb0: timer@f001 {
>   compatible = "atmel,at91sam9x5-tcb";
>   reg = <0xf001 0x100>;
> @@ -161,15 +151,6 @@
>   status = "disabled";
>   };
>  
> - macb0: ethernet@f0028000 {
> - compatible = "cdns,pc302-gem", "cdns,gem";
> - reg = <0xf0028000 0x100>;
> - interrupts = <34 IRQ_TYPE_LEVEL_HIGH 3>;
> - pinctrl-names = "default";
> - pinctrl-0 = <&pinctrl_macb0_data_rgmii 
> &pinctrl_macb0_signal_rgmii>;
> - status = "disabled";
> - };
> -
>   isi: isi@f0034000 {
>   compatible = "atmel,at91sam9g45-isi";
>   reg = <0xf0034000 0x4000>;
> @@ -190,19 +171,6 @@
>   #size-cells = <0>;
>   };
>  
> - mmc2: mmc@f8004000 {
> - compatible = "atmel,hsmci";
> - reg = <0xf8004000 0x600>;
> - interrupts = <23 IRQ_TYPE_LEVEL_HIGH 0>;
> - dmas = <&dma1 2 AT91_DMA_CFG_PER_ID(1)>;
> - dma-names = "rxtx";
> - pinctrl-names = "default";
> - pinctrl-0 = <&pinctrl_mmc2_clk_cmd_dat0 
> &pinctrl_mmc2_dat1_3>;
> - status = "disabled";
> - #address-cells = <1>;
> -

[PATCH] ARM: at91/dt: split sama5d3 definition

2013-08-07 Thread Boris BREZILLON
This patch splits the sama5d3 SoCs definition:
- a common base for all sama5d3 SoCs (sama5d3.dtsi)
- several optional peripheral definitions which will be included by sama5d3
  specific SoCs (sama5d3_'periph name'.dtsi)
- sama5d3 specific SoC definitions (sama5d3x.dtsi)

This provides a better representation of the real hardware (drop unneed
dt nodes) and avoids peripheral id conflict (which is not the case for
current sama5d3 SoCs, but could be if other SoCs of this family are
released).

Signed-off-by: Boris BREZILLON 
---
 arch/arm/boot/dts/sama5d3.dtsi  |  203 ---
 arch/arm/boot/dts/sama5d31.dtsi |   16 +++
 arch/arm/boot/dts/sama5d31ek.dts|3 +-
 arch/arm/boot/dts/sama5d33.dtsi |   14 +++
 arch/arm/boot/dts/sama5d33ek.dts|1 +
 arch/arm/boot/dts/sama5d34.dtsi |   16 +++
 arch/arm/boot/dts/sama5d34ek.dts|1 +
 arch/arm/boot/dts/sama5d35.dtsi |   18 
 arch/arm/boot/dts/sama5d35ek.dts|1 +
 arch/arm/boot/dts/sama5d3_can.dtsi  |   54 ++
 arch/arm/boot/dts/sama5d3_emac.dtsi |   44 
 arch/arm/boot/dts/sama5d3_gmac.dtsi |   77 +
 arch/arm/boot/dts/sama5d3_lcd.dtsi  |   55 ++
 arch/arm/boot/dts/sama5d3_mci2.dtsi |   47 
 arch/arm/boot/dts/sama5d3_tcb1.dtsi |   27 +
 arch/arm/boot/dts/sama5d3_uart.dtsi |   53 +
 arch/arm/boot/dts/sama5d3xcm.dtsi   |1 -
 17 files changed, 426 insertions(+), 205 deletions(-)
 create mode 100644 arch/arm/boot/dts/sama5d31.dtsi
 create mode 100644 arch/arm/boot/dts/sama5d33.dtsi
 create mode 100644 arch/arm/boot/dts/sama5d34.dtsi
 create mode 100644 arch/arm/boot/dts/sama5d35.dtsi
 create mode 100644 arch/arm/boot/dts/sama5d3_can.dtsi
 create mode 100644 arch/arm/boot/dts/sama5d3_emac.dtsi
 create mode 100644 arch/arm/boot/dts/sama5d3_gmac.dtsi
 create mode 100644 arch/arm/boot/dts/sama5d3_lcd.dtsi
 create mode 100644 arch/arm/boot/dts/sama5d3_mci2.dtsi
 create mode 100644 arch/arm/boot/dts/sama5d3_tcb1.dtsi
 create mode 100644 arch/arm/boot/dts/sama5d3_uart.dtsi

diff --git a/arch/arm/boot/dts/sama5d3.dtsi b/arch/arm/boot/dts/sama5d3.dtsi
index a1d5e25..b72f310 100644
--- a/arch/arm/boot/dts/sama5d3.dtsi
+++ b/arch/arm/boot/dts/sama5d3.dtsi
@@ -31,7 +31,6 @@
gpio3 = &pioD;
gpio4 = &pioE;
tcb0 = &tcb0;
-   tcb1 = &tcb1;
i2c0 = &i2c0;
i2c1 = &i2c1;
i2c2 = &i2c2;
@@ -100,15 +99,6 @@
status = "disabled";
};
 
-   can0: can@f000c000 {
-   compatible = "atmel,at91sam9x5-can";
-   reg = <0xf000c000 0x300>;
-   interrupts = <40 IRQ_TYPE_LEVEL_HIGH 3>;
-   pinctrl-names = "default";
-   pinctrl-0 = <&pinctrl_can0_rx_tx>;
-   status = "disabled";
-   };
-
tcb0: timer@f001 {
compatible = "atmel,at91sam9x5-tcb";
reg = <0xf001 0x100>;
@@ -161,15 +151,6 @@
status = "disabled";
};
 
-   macb0: ethernet@f0028000 {
-   compatible = "cdns,pc302-gem", "cdns,gem";
-   reg = <0xf0028000 0x100>;
-   interrupts = <34 IRQ_TYPE_LEVEL_HIGH 3>;
-   pinctrl-names = "default";
-   pinctrl-0 = <&pinctrl_macb0_data_rgmii 
&pinctrl_macb0_signal_rgmii>;
-   status = "disabled";
-   };
-
isi: isi@f0034000 {
compatible = "atmel,at91sam9g45-isi";
reg = <0xf0034000 0x4000>;
@@ -190,19 +171,6 @@
#size-cells = <0>;
};
 
-   mmc2: mmc@f8004000 {
-   compatible = "atmel,hsmci";
-   reg = <0xf8004000 0x600>;
-   interrupts = <23 IRQ_TYPE_LEVEL_HIGH 0>;
-   dmas = <&dma1 2 AT91_DMA_CFG_PER_ID(1)>;
-   dma-names = "rxtx";
-   pinctrl-names = "default";
-   pinctrl-0 = <&pinctrl_mmc2_clk_cmd_dat0 
&pinctrl_mmc2_dat1_3>;
-   status = "disabled";
-   #address-cells = <1>;
-   #size-cells = <0>;
-   };
-
spi1: spi@f8008000 {
#address-cells = <1>;
#size-cells = <0>;
@@ -226,20 +194,6 @@
status =