Re: [PATCH 4/7] ARM: at91: dts: sama5d3: move the isi mck pin to mb

2014-12-19 Thread Alexandre Belloni
On 18/12/2014 at 16:51:04 +0800, Josh Wu wrote :
 From: Bo Shen voice.s...@atmel.com
 
 The mck is decided by the board design, move it to mb related
 dtsi file.
 
 Signed-off-by: Bo Shen voice.s...@atmel.com
 Acked-by: Nicolas Ferre nicolas.fe...@atmel.com
Acked-by: Alexandre Belloni alexandre.bell...@free-electrons.com

 Signed-off-by: Josh Wu josh...@atmel.com
 ---
  arch/arm/boot/dts/sama5d3.dtsi| 5 -
  arch/arm/boot/dts/sama5d3xmb.dtsi | 5 +
  2 files changed, 5 insertions(+), 5 deletions(-)
 
 diff --git a/arch/arm/boot/dts/sama5d3.dtsi b/arch/arm/boot/dts/sama5d3.dtsi
 index b3ac156..ed734e9 100644
 --- a/arch/arm/boot/dts/sama5d3.dtsi
 +++ b/arch/arm/boot/dts/sama5d3.dtsi
 @@ -573,11 +573,6 @@
   AT91_PIOC 27 
 AT91_PERIPH_C AT91_PINCTRL_NONE   /* PC27 periph C ISI_PD10, conflicts with 
 SPI1_NPCS2, TWCK1 */
AT91_PIOC 26 
 AT91_PERIPH_C AT91_PINCTRL_NONE; /* PC26 periph C ISI_PD11, conflicts with 
 SPI1_NPCS1, TWD1 */
   };
 -
 - pinctrl_isi_pck_as_mck: 
 isi_pck_as_mck-0 {
 - atmel,pins =
 - AT91_PIOD 31 
 AT91_PERIPH_B AT91_PINCTRL_NONE; /* PD31 periph B ISI_MCK */
 - };
   };
  
   mmc0 {
 diff --git a/arch/arm/boot/dts/sama5d3xmb.dtsi 
 b/arch/arm/boot/dts/sama5d3xmb.dtsi
 index 2530541..6af1cba 100644
 --- a/arch/arm/boot/dts/sama5d3xmb.dtsi
 +++ b/arch/arm/boot/dts/sama5d3xmb.dtsi
 @@ -117,6 +117,11 @@
   AT91_PIOD 30 
 AT91_PERIPH_B AT91_PINCTRL_NONE; /* PD30 periph B */
   };
  
 + pinctrl_isi_pck_as_mck: 
 isi_pck_as_mck-0 {
 + atmel,pins =
 + AT91_PIOD 31 
 AT91_PERIPH_B AT91_PINCTRL_NONE; /* PD31 periph B ISI_MCK */
 + };
 +
   pinctrl_isi_reset: isi_reset-0 {
   atmel,pins =
   AT91_PIOE 24 
 AT91_PERIPH_GPIO AT91_PINCTRL_NONE;   /* PE24 gpio */
 -- 
 1.9.1
 

-- 
Alexandre Belloni, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
--
To unsubscribe from this list: send the line unsubscribe linux-media in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[PATCH 4/7] ARM: at91: dts: sama5d3: move the isi mck pin to mb

2014-12-18 Thread Josh Wu
From: Bo Shen voice.s...@atmel.com

The mck is decided by the board design, move it to mb related
dtsi file.

Signed-off-by: Bo Shen voice.s...@atmel.com
Acked-by: Nicolas Ferre nicolas.fe...@atmel.com
Signed-off-by: Josh Wu josh...@atmel.com
---
 arch/arm/boot/dts/sama5d3.dtsi| 5 -
 arch/arm/boot/dts/sama5d3xmb.dtsi | 5 +
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/arch/arm/boot/dts/sama5d3.dtsi b/arch/arm/boot/dts/sama5d3.dtsi
index b3ac156..ed734e9 100644
--- a/arch/arm/boot/dts/sama5d3.dtsi
+++ b/arch/arm/boot/dts/sama5d3.dtsi
@@ -573,11 +573,6 @@
AT91_PIOC 27 
AT91_PERIPH_C AT91_PINCTRL_NONE   /* PC27 periph C ISI_PD10, conflicts with 
SPI1_NPCS2, TWCK1 */
 AT91_PIOC 26 
AT91_PERIPH_C AT91_PINCTRL_NONE; /* PC26 periph C ISI_PD11, conflicts with 
SPI1_NPCS1, TWD1 */
};
-
-   pinctrl_isi_pck_as_mck: 
isi_pck_as_mck-0 {
-   atmel,pins =
-   AT91_PIOD 31 
AT91_PERIPH_B AT91_PINCTRL_NONE; /* PD31 periph B ISI_MCK */
-   };
};
 
mmc0 {
diff --git a/arch/arm/boot/dts/sama5d3xmb.dtsi 
b/arch/arm/boot/dts/sama5d3xmb.dtsi
index 2530541..6af1cba 100644
--- a/arch/arm/boot/dts/sama5d3xmb.dtsi
+++ b/arch/arm/boot/dts/sama5d3xmb.dtsi
@@ -117,6 +117,11 @@
AT91_PIOD 30 
AT91_PERIPH_B AT91_PINCTRL_NONE; /* PD30 periph B */
};
 
+   pinctrl_isi_pck_as_mck: 
isi_pck_as_mck-0 {
+   atmel,pins =
+   AT91_PIOD 31 
AT91_PERIPH_B AT91_PINCTRL_NONE; /* PD31 periph B ISI_MCK */
+   };
+
pinctrl_isi_reset: isi_reset-0 {
atmel,pins =
AT91_PIOE 24 
AT91_PERIPH_GPIO AT91_PINCTRL_NONE;   /* PE24 gpio */
-- 
1.9.1

--
To unsubscribe from this list: send the line unsubscribe linux-media in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html