Re: [PATCH v5 3/3] ARM: sunxi: Add IR controller support in DT on A20

2014-05-03 Thread Maxime Ripard
On Wed, Apr 30, 2014 at 09:16:50PM +0600, Alexander Bersenev wrote:
 This patch adds IR controller in A20 Device-Tree:
 - Two IR devices found in A20 user manual
 - Pins for two devices
 - One IR device physically found on Cubieboard 2
 - One IR device physically found on Cubietruck
 
 Signed-off-by: Alexander Bersenev b...@hackerdom.ru
 Signed-off-by: Alexsey Shestacov wingr...@linux-sunxi.org
 ---
  arch/arm/boot/dts/sun7i-a20-cubieboard2.dts |  6 ++
  arch/arm/boot/dts/sun7i-a20-cubietruck.dts  |  6 ++
  arch/arm/boot/dts/sun7i-a20.dtsi| 31 
 +
  3 files changed, 43 insertions(+)
 
 diff --git a/arch/arm/boot/dts/sun7i-a20-cubieboard2.dts 
 b/arch/arm/boot/dts/sun7i-a20-cubieboard2.dts
 index feeff64..2564e8c 100644
 --- a/arch/arm/boot/dts/sun7i-a20-cubieboard2.dts
 +++ b/arch/arm/boot/dts/sun7i-a20-cubieboard2.dts
 @@ -164,6 +164,12 @@
   reg = 1;
   };
   };
 +
 + ir0: ir@01c21800 {
 + pinctrl-names = default;
 + pinctrl-0 = ir0_pins_a;
 + status = okay;
 + };
   };
  
   leds {
 diff --git a/arch/arm/boot/dts/sun7i-a20-cubietruck.dts 
 b/arch/arm/boot/dts/sun7i-a20-cubietruck.dts
 index e288562..e375e89 100644
 --- a/arch/arm/boot/dts/sun7i-a20-cubietruck.dts
 +++ b/arch/arm/boot/dts/sun7i-a20-cubietruck.dts
 @@ -232,6 +232,12 @@
   reg = 1;
   };
   };
 +
 + ir0: ir@01c21800 {
 + pinctrl-names = default;
 + pinctrl-0 = ir0_pins_a;
 + status = okay;
 + };
   };
  
   leds {
 diff --git a/arch/arm/boot/dts/sun7i-a20.dtsi 
 b/arch/arm/boot/dts/sun7i-a20.dtsi
 index 0ae2b77..bb655a5 100644
 --- a/arch/arm/boot/dts/sun7i-a20.dtsi
 +++ b/arch/arm/boot/dts/sun7i-a20.dtsi
 @@ -724,6 +724,19 @@
   allwinner,drive = 2;
   allwinner,pull = 0;
   };
 +
 + ir0_pins_a: ir0@0 {
 + allwinner,pins = PB3,PB4;
 + allwinner,function = ir0;
 + allwinner,drive = 0;
 + allwinner,pull = 0;
 + };
 + ir1_pins_a: ir1@0 {
 + allwinner,pins = PB22,PB23;
 + allwinner,function = ir1;
 + allwinner,drive = 0;
 + allwinner,pull = 0;
 + };
   };
  
   timer@01c20c00 {
 @@ -937,5 +950,23 @@
   #interrupt-cells = 3;
   interrupts = 1 9 0xf04;
   };
 +
 + ir0: ir@01c21800 {

This line...

 + compatible = allwinner,sun7i-a20-ir;
 + clocks = apb0_gates 6, ir0_clk;
 + clock-names = apb, ir;
 + interrupts = 0 5 4;
 + reg = 0x01c21800 0x40;
 + status = disabled;
 + };
 +
 + ir1: ir@01c21c00 {

... and this one are indented a tab too far.

Maxime

-- 
Maxime Ripard, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com


signature.asc
Description: Digital signature


[PATCH v5 3/3] ARM: sunxi: Add IR controller support in DT on A20

2014-04-30 Thread Alexander Bersenev
This patch adds IR controller in A20 Device-Tree:
- Two IR devices found in A20 user manual
- Pins for two devices
- One IR device physically found on Cubieboard 2
- One IR device physically found on Cubietruck

Signed-off-by: Alexander Bersenev b...@hackerdom.ru
Signed-off-by: Alexsey Shestacov wingr...@linux-sunxi.org
---
 arch/arm/boot/dts/sun7i-a20-cubieboard2.dts |  6 ++
 arch/arm/boot/dts/sun7i-a20-cubietruck.dts  |  6 ++
 arch/arm/boot/dts/sun7i-a20.dtsi| 31 +
 3 files changed, 43 insertions(+)

diff --git a/arch/arm/boot/dts/sun7i-a20-cubieboard2.dts 
b/arch/arm/boot/dts/sun7i-a20-cubieboard2.dts
index feeff64..2564e8c 100644
--- a/arch/arm/boot/dts/sun7i-a20-cubieboard2.dts
+++ b/arch/arm/boot/dts/sun7i-a20-cubieboard2.dts
@@ -164,6 +164,12 @@
reg = 1;
};
};
+
+   ir0: ir@01c21800 {
+   pinctrl-names = default;
+   pinctrl-0 = ir0_pins_a;
+   status = okay;
+   };
};
 
leds {
diff --git a/arch/arm/boot/dts/sun7i-a20-cubietruck.dts 
b/arch/arm/boot/dts/sun7i-a20-cubietruck.dts
index e288562..e375e89 100644
--- a/arch/arm/boot/dts/sun7i-a20-cubietruck.dts
+++ b/arch/arm/boot/dts/sun7i-a20-cubietruck.dts
@@ -232,6 +232,12 @@
reg = 1;
};
};
+
+   ir0: ir@01c21800 {
+   pinctrl-names = default;
+   pinctrl-0 = ir0_pins_a;
+   status = okay;
+   };
};
 
leds {
diff --git a/arch/arm/boot/dts/sun7i-a20.dtsi b/arch/arm/boot/dts/sun7i-a20.dtsi
index 0ae2b77..bb655a5 100644
--- a/arch/arm/boot/dts/sun7i-a20.dtsi
+++ b/arch/arm/boot/dts/sun7i-a20.dtsi
@@ -724,6 +724,19 @@
allwinner,drive = 2;
allwinner,pull = 0;
};
+
+   ir0_pins_a: ir0@0 {
+   allwinner,pins = PB3,PB4;
+   allwinner,function = ir0;
+   allwinner,drive = 0;
+   allwinner,pull = 0;
+   };
+   ir1_pins_a: ir1@0 {
+   allwinner,pins = PB22,PB23;
+   allwinner,function = ir1;
+   allwinner,drive = 0;
+   allwinner,pull = 0;
+   };
};
 
timer@01c20c00 {
@@ -937,5 +950,23 @@
#interrupt-cells = 3;
interrupts = 1 9 0xf04;
};
+
+   ir0: ir@01c21800 {
+   compatible = allwinner,sun7i-a20-ir;
+   clocks = apb0_gates 6, ir0_clk;
+   clock-names = apb, ir;
+   interrupts = 0 5 4;
+   reg = 0x01c21800 0x40;
+   status = disabled;
+   };
+
+   ir1: ir@01c21c00 {
+   compatible = allwinner,sun7i-a20-ir;
+   clocks = apb0_gates 7, ir1_clk;
+   clock-names = apb, ir;
+   interrupts = 0 6 4;
+   reg = 0x01C21c00 0x40;
+   status = disabled;
+   };
};
 };
-- 
1.9.2

--
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