All of lore.kernel.org
 help / color / mirror / Atom feed
diff for duplicates of <54787A8A.6040209@redhat.com>

diff --git a/a/1.txt b/N1/1.txt
index a24422a..1364239 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -9,7 +9,7 @@ On 11/27/2014 08:05 PM, Maxime Ripard wrote:
 >> On 11/27/2014 10:28 AM, Chen-Yu Tsai wrote:
 >>> Hi,
 >>>
->>> On Thu, Nov 27, 2014 at 4:41 PM, Hans de Goede <hdegoede@redhat.com> wrote:
+>>> On Thu, Nov 27, 2014 at 4:41 PM, Hans de Goede <hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> wrote:
 >>
 >> <snip>
 >>
@@ -54,17 +54,8 @@ make the same change on sun8i (I can make the change, but not test it).
 Regards,
 
 Hans
--------------- next part --------------
-A non-text attachment was scrubbed...
-Name: 0001-ARM-dts-sun6i-Change-prcm-node-into-a-simple-bus.patch
-Type: text/x-patch
-Size: 2173 bytes
-Desc: not available
-URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20141128/6d90bca5/attachment-0002.bin>
--------------- next part --------------
-A non-text attachment was scrubbed...
-Name: 0002-ARM-dts-sun6i-Add-ir_clk-node.patch
-Type: text/x-patch
-Size: 946 bytes
-Desc: not available
-URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20141128/6d90bca5/attachment-0003.bin>
+
+-- 
+You received this message because you are subscribed to the Google Groups "linux-sunxi" group.
+To unsubscribe from this group and stop receiving emails from it, send an email to linux-sunxi+unsubscribe-/JYPxA39Uh5TLH3MbocFF+G/Ez6ZCGd0@public.gmane.org
+For more options, visit https://groups.google.com/d/optout.
diff --git a/N1/2.hdr b/N1/2.hdr
new file mode 100644
index 0000000..a4c089f
--- /dev/null
+++ b/N1/2.hdr
@@ -0,0 +1,5 @@
+Content-Type: text/x-patch;
+ name="0001-ARM-dts-sun6i-Change-prcm-node-into-a-simple-bus.patch"
+Content-Transfer-Encoding: 7bit
+Content-Disposition: attachment;
+ filename*0="0001-ARM-dts-sun6i-Change-prcm-node-into-a-simple-bus.patch"
diff --git a/N1/2.txt b/N1/2.txt
new file mode 100644
index 0000000..a5686b4
--- /dev/null
+++ b/N1/2.txt
@@ -0,0 +1,68 @@
+>From 6756574293a1f291a8dcc29427b27f32f83acb2d Mon Sep 17 00:00:00 2001
+From: Hans de Goede <hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
+Date: Fri, 28 Nov 2014 13:48:58 +0100
+Subject: [PATCH v2 1/2] ARM: dts: sun6i: Change prcm node into a simple-bus
+
+The prcm node's purpose is to group the various prcm sub-devices together,
+it does not need any special handling beyond that, there is no need to
+handle shared resources like a shared (multiplexed) interrupt or a shared
+i2c bus.
+
+As such there really is no need to have a separate compatible for it, using
+simple-bus for it works fine. This also allows us to specify the register
+offsets of the various child-devices directly into the dts, rather then having
+to specify them in the OS implementation, putting the register offsets where
+the belong.
+
+Signed-off-by: Hans de Goede <hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
+---
+ arch/arm/boot/dts/sun6i-a31.dtsi | 9 ++++++++-
+ 1 file changed, 8 insertions(+), 1 deletion(-)
+
+diff --git a/arch/arm/boot/dts/sun6i-a31.dtsi b/arch/arm/boot/dts/sun6i-a31.dtsi
+index 29e6438..4b8541f 100644
+--- a/arch/arm/boot/dts/sun6i-a31.dtsi
++++ b/arch/arm/boot/dts/sun6i-a31.dtsi
+@@ -846,11 +846,15 @@
+ 		};
+ 
+ 		prcm@01f01400 {
+-			compatible = "allwinner,sun6i-a31-prcm";
++			compatible = "simple-bus";
+ 			reg = <0x01f01400 0x200>;
++			#address-cells = <1>;
++			#size-cells = <1>;
++			ranges;
+ 
+ 			ar100: ar100_clk {
+ 				compatible = "allwinner,sun6i-a31-ar100-clk";
++				reg = <0x01f01400 0x4>;
+ 				#clock-cells = <0>;
+ 				clocks = <&osc32k>, <&osc24M>, <&pll6>, <&pll6>;
+ 				clock-output-names = "ar100";
+@@ -867,6 +871,7 @@
+ 
+ 			apb0: apb0_clk {
+ 				compatible = "allwinner,sun6i-a31-apb0-clk";
++				reg = <0x01f0140c 0x4>;
+ 				#clock-cells = <0>;
+ 				clocks = <&ahb0>;
+ 				clock-output-names = "apb0";
+@@ -874,6 +879,7 @@
+ 
+ 			apb0_gates: apb0_gates_clk {
+ 				compatible = "allwinner,sun6i-a31-apb0-gates-clk";
++				reg = <0x01f01428 0x4>;
+ 				#clock-cells = <1>;
+ 				clocks = <&apb0>;
+ 				clock-output-names = "apb0_pio", "apb0_ir",
+@@ -884,6 +890,7 @@
+ 
+ 			apb0_rst: apb0_rst {
+ 				compatible = "allwinner,sun6i-a31-clock-reset";
++				reg = <0x01f014b0 0x4>;
+ 				#reset-cells = <1>;
+ 			};
+ 		};
+-- 
+2.1.0
diff --git a/N1/3.hdr b/N1/3.hdr
new file mode 100644
index 0000000..e93a0d4
--- /dev/null
+++ b/N1/3.hdr
@@ -0,0 +1,5 @@
+Content-Type: text/x-patch;
+ name="0002-ARM-dts-sun6i-Add-ir_clk-node.patch"
+Content-Transfer-Encoding: 7bit
+Content-Disposition: attachment;
+ filename="0002-ARM-dts-sun6i-Add-ir_clk-node.patch"
diff --git a/N1/3.txt b/N1/3.txt
new file mode 100644
index 0000000..ca23b5e
--- /dev/null
+++ b/N1/3.txt
@@ -0,0 +1,31 @@
+>From a152b0405d446c748fef146915736e4a8fc548b1 Mon Sep 17 00:00:00 2001
+From: Hans de Goede <hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
+Date: Fri, 28 Nov 2014 13:54:14 +0100
+Subject: [PATCH v2 2/2] ARM: dts: sun6i: Add ir_clk node
+
+Add an ir_clk sub-node to the prcm node.
+
+Signed-off-by: Hans de Goede <hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
+---
+ arch/arm/boot/dts/sun6i-a31.dtsi | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/arch/arm/boot/dts/sun6i-a31.dtsi b/arch/arm/boot/dts/sun6i-a31.dtsi
+index 4b8541f..92a1c95 100644
+--- a/arch/arm/boot/dts/sun6i-a31.dtsi
++++ b/arch/arm/boot/dts/sun6i-a31.dtsi
+@@ -888,6 +888,14 @@
+ 						"apb0_i2c";
+ 			};
+ 
++			ir_clk: ir_clk {
++				reg = <0x01f01454 0x4>;
++				#clock-cells = <0>;
++				compatible = "allwinner,sun4i-a10-mod0-clk";
++				clocks = <&osc32k>, <&osc24M>;
++				clock-output-names = "ir";
++			};
++
+ 			apb0_rst: apb0_rst {
+ 				compatible = "allwinner,sun6i-a31-clock-reset";
+ 				reg = <0x01f014b0 0x4>;
diff --git a/a/content_digest b/N1/content_digest
index 7bfcad5..805a6ae 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -3,11 +3,19 @@
  "ref\0CAGb2v652m0bCdPWFF4LWwjcrCJZvnLibFPw8xXJ3Q-Ge+_-p7g@mail.gmail.com\0"
  "ref\05476F8AB.2000601@redhat.com\0"
  "ref\020141127190509.GR25249@lukather\0"
- "From\0hdegoede@redhat.com (Hans de Goede)\0"
- "Subject\0[PATCH 3/9] clk: sunxi: Add prcm mod0 clock driver\0"
+ "From\0Hans de Goede <hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>\0"
+ "Subject\0Re: [PATCH 3/9] clk: sunxi: Add prcm mod0 clock driver\0"
  "Date\0Fri, 28 Nov 2014 14:37:14 +0100\0"
- "To\0linux-arm-kernel@lists.infradead.org\0"
- "\00:1\0"
+ "To\0Maxime Ripard <maxime.ripard-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org>\0"
+ "Cc\0Chen-Yu Tsai <wens-jdAy2FN1RRM@public.gmane.org>"
+  Boris Brezillon <boris-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org>
+  Mike Turquette <mturquette-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
+  Emilio Lopez <emilio-0Z03zUJReD5OxF6Tv1QG9Q@public.gmane.org>
+  Linux Media Mailing List <linux-media-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>
+  linux-arm-kernel <linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org>
+  devicetree <devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>
+ " linux-sunxi <linux-sunxi-/JYPxA39Uh5TLH3MbocFFw@public.gmane.org>\0"
+ "\01:1\0"
  "b\0"
  "Hi,\n"
  "\n"
@@ -20,7 +28,7 @@
  ">> On 11/27/2014 10:28 AM, Chen-Yu Tsai wrote:\n"
  ">>> Hi,\n"
  ">>>\n"
- ">>> On Thu, Nov 27, 2014 at 4:41 PM, Hans de Goede <hdegoede@redhat.com> wrote:\n"
+ ">>> On Thu, Nov 27, 2014 at 4:41 PM, Hans de Goede <hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> wrote:\n"
  ">>\n"
  ">> <snip>\n"
  ">>\n"
@@ -65,19 +73,115 @@
  "Regards,\n"
  "\n"
  "Hans\n"
- "-------------- next part --------------\n"
- "A non-text attachment was scrubbed...\n"
- "Name: 0001-ARM-dts-sun6i-Change-prcm-node-into-a-simple-bus.patch\n"
- "Type: text/x-patch\n"
- "Size: 2173 bytes\n"
- "Desc: not available\n"
- "URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20141128/6d90bca5/attachment-0002.bin>\n"
- "-------------- next part --------------\n"
- "A non-text attachment was scrubbed...\n"
- "Name: 0002-ARM-dts-sun6i-Add-ir_clk-node.patch\n"
- "Type: text/x-patch\n"
- "Size: 946 bytes\n"
- "Desc: not available\n"
- URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20141128/6d90bca5/attachment-0003.bin>
+ "\n"
+ "-- \n"
+ "You received this message because you are subscribed to the Google Groups \"linux-sunxi\" group.\n"
+ "To unsubscribe from this group and stop receiving emails from it, send an email to linux-sunxi+unsubscribe-/JYPxA39Uh5TLH3MbocFF+G/Ez6ZCGd0@public.gmane.org\n"
+ For more options, visit https://groups.google.com/d/optout.
+ "\01:2\0"
+ "fn\00001-ARM-dts-sun6i-Change-prcm-node-into-a-simple-bus.patch\0"
+ "b\0"
+ ">From 6756574293a1f291a8dcc29427b27f32f83acb2d Mon Sep 17 00:00:00 2001\n"
+ "From: Hans de Goede <hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>\n"
+ "Date: Fri, 28 Nov 2014 13:48:58 +0100\n"
+ "Subject: [PATCH v2 1/2] ARM: dts: sun6i: Change prcm node into a simple-bus\n"
+ "\n"
+ "The prcm node's purpose is to group the various prcm sub-devices together,\n"
+ "it does not need any special handling beyond that, there is no need to\n"
+ "handle shared resources like a shared (multiplexed) interrupt or a shared\n"
+ "i2c bus.\n"
+ "\n"
+ "As such there really is no need to have a separate compatible for it, using\n"
+ "simple-bus for it works fine. This also allows us to specify the register\n"
+ "offsets of the various child-devices directly into the dts, rather then having\n"
+ "to specify them in the OS implementation, putting the register offsets where\n"
+ "the belong.\n"
+ "\n"
+ "Signed-off-by: Hans de Goede <hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>\n"
+ "---\n"
+ " arch/arm/boot/dts/sun6i-a31.dtsi | 9 ++++++++-\n"
+ " 1 file changed, 8 insertions(+), 1 deletion(-)\n"
+ "\n"
+ "diff --git a/arch/arm/boot/dts/sun6i-a31.dtsi b/arch/arm/boot/dts/sun6i-a31.dtsi\n"
+ "index 29e6438..4b8541f 100644\n"
+ "--- a/arch/arm/boot/dts/sun6i-a31.dtsi\n"
+ "+++ b/arch/arm/boot/dts/sun6i-a31.dtsi\n"
+ "@@ -846,11 +846,15 @@\n"
+ " \t\t};\n"
+ " \n"
+ " \t\tprcm@01f01400 {\n"
+ "-\t\t\tcompatible = \"allwinner,sun6i-a31-prcm\";\n"
+ "+\t\t\tcompatible = \"simple-bus\";\n"
+ " \t\t\treg = <0x01f01400 0x200>;\n"
+ "+\t\t\t#address-cells = <1>;\n"
+ "+\t\t\t#size-cells = <1>;\n"
+ "+\t\t\tranges;\n"
+ " \n"
+ " \t\t\tar100: ar100_clk {\n"
+ " \t\t\t\tcompatible = \"allwinner,sun6i-a31-ar100-clk\";\n"
+ "+\t\t\t\treg = <0x01f01400 0x4>;\n"
+ " \t\t\t\t#clock-cells = <0>;\n"
+ " \t\t\t\tclocks = <&osc32k>, <&osc24M>, <&pll6>, <&pll6>;\n"
+ " \t\t\t\tclock-output-names = \"ar100\";\n"
+ "@@ -867,6 +871,7 @@\n"
+ " \n"
+ " \t\t\tapb0: apb0_clk {\n"
+ " \t\t\t\tcompatible = \"allwinner,sun6i-a31-apb0-clk\";\n"
+ "+\t\t\t\treg = <0x01f0140c 0x4>;\n"
+ " \t\t\t\t#clock-cells = <0>;\n"
+ " \t\t\t\tclocks = <&ahb0>;\n"
+ " \t\t\t\tclock-output-names = \"apb0\";\n"
+ "@@ -874,6 +879,7 @@\n"
+ " \n"
+ " \t\t\tapb0_gates: apb0_gates_clk {\n"
+ " \t\t\t\tcompatible = \"allwinner,sun6i-a31-apb0-gates-clk\";\n"
+ "+\t\t\t\treg = <0x01f01428 0x4>;\n"
+ " \t\t\t\t#clock-cells = <1>;\n"
+ " \t\t\t\tclocks = <&apb0>;\n"
+ " \t\t\t\tclock-output-names = \"apb0_pio\", \"apb0_ir\",\n"
+ "@@ -884,6 +890,7 @@\n"
+ " \n"
+ " \t\t\tapb0_rst: apb0_rst {\n"
+ " \t\t\t\tcompatible = \"allwinner,sun6i-a31-clock-reset\";\n"
+ "+\t\t\t\treg = <0x01f014b0 0x4>;\n"
+ " \t\t\t\t#reset-cells = <1>;\n"
+ " \t\t\t};\n"
+ " \t\t};\n"
+ "-- \n"
+ 2.1.0
+ "\01:3\0"
+ "fn\00002-ARM-dts-sun6i-Add-ir_clk-node.patch\0"
+ "b\0"
+ ">From a152b0405d446c748fef146915736e4a8fc548b1 Mon Sep 17 00:00:00 2001\n"
+ "From: Hans de Goede <hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>\n"
+ "Date: Fri, 28 Nov 2014 13:54:14 +0100\n"
+ "Subject: [PATCH v2 2/2] ARM: dts: sun6i: Add ir_clk node\n"
+ "\n"
+ "Add an ir_clk sub-node to the prcm node.\n"
+ "\n"
+ "Signed-off-by: Hans de Goede <hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>\n"
+ "---\n"
+ " arch/arm/boot/dts/sun6i-a31.dtsi | 8 ++++++++\n"
+ " 1 file changed, 8 insertions(+)\n"
+ "\n"
+ "diff --git a/arch/arm/boot/dts/sun6i-a31.dtsi b/arch/arm/boot/dts/sun6i-a31.dtsi\n"
+ "index 4b8541f..92a1c95 100644\n"
+ "--- a/arch/arm/boot/dts/sun6i-a31.dtsi\n"
+ "+++ b/arch/arm/boot/dts/sun6i-a31.dtsi\n"
+ "@@ -888,6 +888,14 @@\n"
+ " \t\t\t\t\t\t\"apb0_i2c\";\n"
+ " \t\t\t};\n"
+ " \n"
+ "+\t\t\tir_clk: ir_clk {\n"
+ "+\t\t\t\treg = <0x01f01454 0x4>;\n"
+ "+\t\t\t\t#clock-cells = <0>;\n"
+ "+\t\t\t\tcompatible = \"allwinner,sun4i-a10-mod0-clk\";\n"
+ "+\t\t\t\tclocks = <&osc32k>, <&osc24M>;\n"
+ "+\t\t\t\tclock-output-names = \"ir\";\n"
+ "+\t\t\t};\n"
+ "+\n"
+ " \t\t\tapb0_rst: apb0_rst {\n"
+ " \t\t\t\tcompatible = \"allwinner,sun6i-a31-clock-reset\";\n"
+ " \t\t\t\treg = <0x01f014b0 0x4>;"
 
-502bf77fe5b6db211048665d50385636e8dd58a7ab158bf47dd567a0fe3d4562
+c24ac55414b13fa99777ca4d1586d9ca8c467621602ed5fe020861fd5df1e475

diff --git a/a/1.txt b/N2/1.txt
index a24422a..9f9ead5 100644
--- a/a/1.txt
+++ b/N2/1.txt
@@ -54,17 +54,3 @@ make the same change on sun8i (I can make the change, but not test it).
 Regards,
 
 Hans
--------------- next part --------------
-A non-text attachment was scrubbed...
-Name: 0001-ARM-dts-sun6i-Change-prcm-node-into-a-simple-bus.patch
-Type: text/x-patch
-Size: 2173 bytes
-Desc: not available
-URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20141128/6d90bca5/attachment-0002.bin>
--------------- next part --------------
-A non-text attachment was scrubbed...
-Name: 0002-ARM-dts-sun6i-Add-ir_clk-node.patch
-Type: text/x-patch
-Size: 946 bytes
-Desc: not available
-URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20141128/6d90bca5/attachment-0003.bin>
diff --git a/N2/2.hdr b/N2/2.hdr
new file mode 100644
index 0000000..a4c089f
--- /dev/null
+++ b/N2/2.hdr
@@ -0,0 +1,5 @@
+Content-Type: text/x-patch;
+ name="0001-ARM-dts-sun6i-Change-prcm-node-into-a-simple-bus.patch"
+Content-Transfer-Encoding: 7bit
+Content-Disposition: attachment;
+ filename*0="0001-ARM-dts-sun6i-Change-prcm-node-into-a-simple-bus.patch"
diff --git a/N2/2.txt b/N2/2.txt
new file mode 100644
index 0000000..797a0ee
--- /dev/null
+++ b/N2/2.txt
@@ -0,0 +1,68 @@
+>From 6756574293a1f291a8dcc29427b27f32f83acb2d Mon Sep 17 00:00:00 2001
+From: Hans de Goede <hdegoede@redhat.com>
+Date: Fri, 28 Nov 2014 13:48:58 +0100
+Subject: [PATCH v2 1/2] ARM: dts: sun6i: Change prcm node into a simple-bus
+
+The prcm node's purpose is to group the various prcm sub-devices together,
+it does not need any special handling beyond that, there is no need to
+handle shared resources like a shared (multiplexed) interrupt or a shared
+i2c bus.
+
+As such there really is no need to have a separate compatible for it, using
+simple-bus for it works fine. This also allows us to specify the register
+offsets of the various child-devices directly into the dts, rather then having
+to specify them in the OS implementation, putting the register offsets where
+the belong.
+
+Signed-off-by: Hans de Goede <hdegoede@redhat.com>
+---
+ arch/arm/boot/dts/sun6i-a31.dtsi | 9 ++++++++-
+ 1 file changed, 8 insertions(+), 1 deletion(-)
+
+diff --git a/arch/arm/boot/dts/sun6i-a31.dtsi b/arch/arm/boot/dts/sun6i-a31.dtsi
+index 29e6438..4b8541f 100644
+--- a/arch/arm/boot/dts/sun6i-a31.dtsi
++++ b/arch/arm/boot/dts/sun6i-a31.dtsi
+@@ -846,11 +846,15 @@
+ 		};
+ 
+ 		prcm@01f01400 {
+-			compatible = "allwinner,sun6i-a31-prcm";
++			compatible = "simple-bus";
+ 			reg = <0x01f01400 0x200>;
++			#address-cells = <1>;
++			#size-cells = <1>;
++			ranges;
+ 
+ 			ar100: ar100_clk {
+ 				compatible = "allwinner,sun6i-a31-ar100-clk";
++				reg = <0x01f01400 0x4>;
+ 				#clock-cells = <0>;
+ 				clocks = <&osc32k>, <&osc24M>, <&pll6>, <&pll6>;
+ 				clock-output-names = "ar100";
+@@ -867,6 +871,7 @@
+ 
+ 			apb0: apb0_clk {
+ 				compatible = "allwinner,sun6i-a31-apb0-clk";
++				reg = <0x01f0140c 0x4>;
+ 				#clock-cells = <0>;
+ 				clocks = <&ahb0>;
+ 				clock-output-names = "apb0";
+@@ -874,6 +879,7 @@
+ 
+ 			apb0_gates: apb0_gates_clk {
+ 				compatible = "allwinner,sun6i-a31-apb0-gates-clk";
++				reg = <0x01f01428 0x4>;
+ 				#clock-cells = <1>;
+ 				clocks = <&apb0>;
+ 				clock-output-names = "apb0_pio", "apb0_ir",
+@@ -884,6 +890,7 @@
+ 
+ 			apb0_rst: apb0_rst {
+ 				compatible = "allwinner,sun6i-a31-clock-reset";
++				reg = <0x01f014b0 0x4>;
+ 				#reset-cells = <1>;
+ 			};
+ 		};
+-- 
+2.1.0
diff --git a/N2/3.hdr b/N2/3.hdr
new file mode 100644
index 0000000..e93a0d4
--- /dev/null
+++ b/N2/3.hdr
@@ -0,0 +1,5 @@
+Content-Type: text/x-patch;
+ name="0002-ARM-dts-sun6i-Add-ir_clk-node.patch"
+Content-Transfer-Encoding: 7bit
+Content-Disposition: attachment;
+ filename="0002-ARM-dts-sun6i-Add-ir_clk-node.patch"
diff --git a/N2/3.txt b/N2/3.txt
new file mode 100644
index 0000000..19a89d4
--- /dev/null
+++ b/N2/3.txt
@@ -0,0 +1,33 @@
+>From a152b0405d446c748fef146915736e4a8fc548b1 Mon Sep 17 00:00:00 2001
+From: Hans de Goede <hdegoede@redhat.com>
+Date: Fri, 28 Nov 2014 13:54:14 +0100
+Subject: [PATCH v2 2/2] ARM: dts: sun6i: Add ir_clk node
+
+Add an ir_clk sub-node to the prcm node.
+
+Signed-off-by: Hans de Goede <hdegoede@redhat.com>
+---
+ arch/arm/boot/dts/sun6i-a31.dtsi | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/arch/arm/boot/dts/sun6i-a31.dtsi b/arch/arm/boot/dts/sun6i-a31.dtsi
+index 4b8541f..92a1c95 100644
+--- a/arch/arm/boot/dts/sun6i-a31.dtsi
++++ b/arch/arm/boot/dts/sun6i-a31.dtsi
+@@ -888,6 +888,14 @@
+ 						"apb0_i2c";
+ 			};
+ 
++			ir_clk: ir_clk {
++				reg = <0x01f01454 0x4>;
++				#clock-cells = <0>;
++				compatible = "allwinner,sun4i-a10-mod0-clk";
++				clocks = <&osc32k>, <&osc24M>;
++				clock-output-names = "ir";
++			};
++
+ 			apb0_rst: apb0_rst {
+ 				compatible = "allwinner,sun6i-a31-clock-reset";
+ 				reg = <0x01f014b0 0x4>;
+-- 
+2.1.0
diff --git a/a/content_digest b/N2/content_digest
index 7bfcad5..84c20e8 100644
--- a/a/content_digest
+++ b/N2/content_digest
@@ -3,11 +3,19 @@
  "ref\0CAGb2v652m0bCdPWFF4LWwjcrCJZvnLibFPw8xXJ3Q-Ge+_-p7g@mail.gmail.com\0"
  "ref\05476F8AB.2000601@redhat.com\0"
  "ref\020141127190509.GR25249@lukather\0"
- "From\0hdegoede@redhat.com (Hans de Goede)\0"
- "Subject\0[PATCH 3/9] clk: sunxi: Add prcm mod0 clock driver\0"
+ "From\0Hans de Goede <hdegoede@redhat.com>\0"
+ "Subject\0Re: [PATCH 3/9] clk: sunxi: Add prcm mod0 clock driver\0"
  "Date\0Fri, 28 Nov 2014 14:37:14 +0100\0"
- "To\0linux-arm-kernel@lists.infradead.org\0"
- "\00:1\0"
+ "To\0Maxime Ripard <maxime.ripard@free-electrons.com>\0"
+ "Cc\0Chen-Yu Tsai <wens@csie.org>"
+  Boris Brezillon <boris@free-electrons.com>
+  Mike Turquette <mturquette@linaro.org>
+  Emilio Lopez <emilio@elopez.com.ar>
+  Linux Media Mailing List <linux-media@vger.kernel.org>
+  linux-arm-kernel <linux-arm-kernel@lists.infradead.org>
+  devicetree <devicetree@vger.kernel.org>
+ " linux-sunxi <linux-sunxi@googlegroups.com>\0"
+ "\01:1\0"
  "b\0"
  "Hi,\n"
  "\n"
@@ -64,20 +72,113 @@
  "\n"
  "Regards,\n"
  "\n"
- "Hans\n"
- "-------------- next part --------------\n"
- "A non-text attachment was scrubbed...\n"
- "Name: 0001-ARM-dts-sun6i-Change-prcm-node-into-a-simple-bus.patch\n"
- "Type: text/x-patch\n"
- "Size: 2173 bytes\n"
- "Desc: not available\n"
- "URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20141128/6d90bca5/attachment-0002.bin>\n"
- "-------------- next part --------------\n"
- "A non-text attachment was scrubbed...\n"
- "Name: 0002-ARM-dts-sun6i-Add-ir_clk-node.patch\n"
- "Type: text/x-patch\n"
- "Size: 946 bytes\n"
- "Desc: not available\n"
- URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20141128/6d90bca5/attachment-0003.bin>
+ Hans
+ "\01:2\0"
+ "fn\00001-ARM-dts-sun6i-Change-prcm-node-into-a-simple-bus.patch\0"
+ "b\0"
+ ">From 6756574293a1f291a8dcc29427b27f32f83acb2d Mon Sep 17 00:00:00 2001\n"
+ "From: Hans de Goede <hdegoede@redhat.com>\n"
+ "Date: Fri, 28 Nov 2014 13:48:58 +0100\n"
+ "Subject: [PATCH v2 1/2] ARM: dts: sun6i: Change prcm node into a simple-bus\n"
+ "\n"
+ "The prcm node's purpose is to group the various prcm sub-devices together,\n"
+ "it does not need any special handling beyond that, there is no need to\n"
+ "handle shared resources like a shared (multiplexed) interrupt or a shared\n"
+ "i2c bus.\n"
+ "\n"
+ "As such there really is no need to have a separate compatible for it, using\n"
+ "simple-bus for it works fine. This also allows us to specify the register\n"
+ "offsets of the various child-devices directly into the dts, rather then having\n"
+ "to specify them in the OS implementation, putting the register offsets where\n"
+ "the belong.\n"
+ "\n"
+ "Signed-off-by: Hans de Goede <hdegoede@redhat.com>\n"
+ "---\n"
+ " arch/arm/boot/dts/sun6i-a31.dtsi | 9 ++++++++-\n"
+ " 1 file changed, 8 insertions(+), 1 deletion(-)\n"
+ "\n"
+ "diff --git a/arch/arm/boot/dts/sun6i-a31.dtsi b/arch/arm/boot/dts/sun6i-a31.dtsi\n"
+ "index 29e6438..4b8541f 100644\n"
+ "--- a/arch/arm/boot/dts/sun6i-a31.dtsi\n"
+ "+++ b/arch/arm/boot/dts/sun6i-a31.dtsi\n"
+ "@@ -846,11 +846,15 @@\n"
+ " \t\t};\n"
+ " \n"
+ " \t\tprcm@01f01400 {\n"
+ "-\t\t\tcompatible = \"allwinner,sun6i-a31-prcm\";\n"
+ "+\t\t\tcompatible = \"simple-bus\";\n"
+ " \t\t\treg = <0x01f01400 0x200>;\n"
+ "+\t\t\t#address-cells = <1>;\n"
+ "+\t\t\t#size-cells = <1>;\n"
+ "+\t\t\tranges;\n"
+ " \n"
+ " \t\t\tar100: ar100_clk {\n"
+ " \t\t\t\tcompatible = \"allwinner,sun6i-a31-ar100-clk\";\n"
+ "+\t\t\t\treg = <0x01f01400 0x4>;\n"
+ " \t\t\t\t#clock-cells = <0>;\n"
+ " \t\t\t\tclocks = <&osc32k>, <&osc24M>, <&pll6>, <&pll6>;\n"
+ " \t\t\t\tclock-output-names = \"ar100\";\n"
+ "@@ -867,6 +871,7 @@\n"
+ " \n"
+ " \t\t\tapb0: apb0_clk {\n"
+ " \t\t\t\tcompatible = \"allwinner,sun6i-a31-apb0-clk\";\n"
+ "+\t\t\t\treg = <0x01f0140c 0x4>;\n"
+ " \t\t\t\t#clock-cells = <0>;\n"
+ " \t\t\t\tclocks = <&ahb0>;\n"
+ " \t\t\t\tclock-output-names = \"apb0\";\n"
+ "@@ -874,6 +879,7 @@\n"
+ " \n"
+ " \t\t\tapb0_gates: apb0_gates_clk {\n"
+ " \t\t\t\tcompatible = \"allwinner,sun6i-a31-apb0-gates-clk\";\n"
+ "+\t\t\t\treg = <0x01f01428 0x4>;\n"
+ " \t\t\t\t#clock-cells = <1>;\n"
+ " \t\t\t\tclocks = <&apb0>;\n"
+ " \t\t\t\tclock-output-names = \"apb0_pio\", \"apb0_ir\",\n"
+ "@@ -884,6 +890,7 @@\n"
+ " \n"
+ " \t\t\tapb0_rst: apb0_rst {\n"
+ " \t\t\t\tcompatible = \"allwinner,sun6i-a31-clock-reset\";\n"
+ "+\t\t\t\treg = <0x01f014b0 0x4>;\n"
+ " \t\t\t\t#reset-cells = <1>;\n"
+ " \t\t\t};\n"
+ " \t\t};\n"
+ "-- \n"
+ 2.1.0
+ "\01:3\0"
+ "fn\00002-ARM-dts-sun6i-Add-ir_clk-node.patch\0"
+ "b\0"
+ ">From a152b0405d446c748fef146915736e4a8fc548b1 Mon Sep 17 00:00:00 2001\n"
+ "From: Hans de Goede <hdegoede@redhat.com>\n"
+ "Date: Fri, 28 Nov 2014 13:54:14 +0100\n"
+ "Subject: [PATCH v2 2/2] ARM: dts: sun6i: Add ir_clk node\n"
+ "\n"
+ "Add an ir_clk sub-node to the prcm node.\n"
+ "\n"
+ "Signed-off-by: Hans de Goede <hdegoede@redhat.com>\n"
+ "---\n"
+ " arch/arm/boot/dts/sun6i-a31.dtsi | 8 ++++++++\n"
+ " 1 file changed, 8 insertions(+)\n"
+ "\n"
+ "diff --git a/arch/arm/boot/dts/sun6i-a31.dtsi b/arch/arm/boot/dts/sun6i-a31.dtsi\n"
+ "index 4b8541f..92a1c95 100644\n"
+ "--- a/arch/arm/boot/dts/sun6i-a31.dtsi\n"
+ "+++ b/arch/arm/boot/dts/sun6i-a31.dtsi\n"
+ "@@ -888,6 +888,14 @@\n"
+ " \t\t\t\t\t\t\"apb0_i2c\";\n"
+ " \t\t\t};\n"
+ " \n"
+ "+\t\t\tir_clk: ir_clk {\n"
+ "+\t\t\t\treg = <0x01f01454 0x4>;\n"
+ "+\t\t\t\t#clock-cells = <0>;\n"
+ "+\t\t\t\tcompatible = \"allwinner,sun4i-a10-mod0-clk\";\n"
+ "+\t\t\t\tclocks = <&osc32k>, <&osc24M>;\n"
+ "+\t\t\t\tclock-output-names = \"ir\";\n"
+ "+\t\t\t};\n"
+ "+\n"
+ " \t\t\tapb0_rst: apb0_rst {\n"
+ " \t\t\t\tcompatible = \"allwinner,sun6i-a31-clock-reset\";\n"
+ " \t\t\t\treg = <0x01f014b0 0x4>;\n"
+ "-- \n"
+ 2.1.0
 
-502bf77fe5b6db211048665d50385636e8dd58a7ab158bf47dd567a0fe3d4562
+fb55e44928b0e58d28b109a5521805165e2b103ee016a75c8d304cbe0110efbc

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.