diff for duplicates of <6633845.bKvtTVmUrN@diego> diff --git a/a/1.txt b/N1/1.txt index 0a0ac73..b21f633 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,7 +1,7 @@ Introduce the grf syscon and convert the pinctrl drivers for rk3066 and rk3188 to use it, instead of mapping the grf registers themselfs. -Signed-off-by: Heiko Stuebner <heiko@sntech.de> +Signed-off-by: Heiko Stuebner <heiko-4mtYJXux2i+zQB+pC5nmwQ@public.gmane.org> --- arch/arm/boot/dts/rk3066a.dtsi | 2 +- arch/arm/boot/dts/rk3188.dtsi | 9 ++++----- @@ -14,7 +14,7 @@ index 4d4dfbb..048c5de 100644 +++ b/arch/arm/boot/dts/rk3066a.dtsi @@ -79,7 +79,7 @@ - pinctrl at 20008000 { + pinctrl@20008000 { compatible = "rockchip,rk3066a-pinctrl"; - reg = <0x20008000 0x150>; + rockchip,grf = <&grf>; @@ -27,7 +27,7 @@ index ed9a70a..a494fb0 100644 +++ b/arch/arm/boot/dts/rk3188.dtsi @@ -75,17 +75,16 @@ - pinctrl at 20008000 { + pinctrl@20008000 { compatible = "rockchip,rk3188-pinctrl"; - reg = <0x20008000 0xa0>, - <0x20008164 0x1a0>; @@ -39,7 +39,7 @@ index ed9a70a..a494fb0 100644 #size-cells = <1>; ranges; - gpio0: gpio0 at 0x2000a000 { + gpio0: gpio0@0x2000a000 { compatible = "rockchip,rk3188-gpio-bank0"; - reg = <0x2000a000 0x100>, - <0x20004064 0x8>; @@ -55,20 +55,26 @@ index 26e5a96..2adf1cc9e 100644 reg = <0x1013c000 0x100>; }; -- pmu at 20004000 { +- pmu@20004000 { - compatible = "rockchip,rk3066-pmu"; -+ pmu: pmu at 20004000 { ++ pmu: pmu@20004000 { + compatible = "rockchip,rk3066-pmu", "syscon"; reg = <0x20004000 0x100>; }; -+ grf: grf at 20008000 { ++ grf: grf@20008000 { + compatible = "syscon"; + reg = <0x20008000 0x200>; + }; + - gic: interrupt-controller at 1013d000 { + gic: interrupt-controller@1013d000 { compatible = "arm,cortex-a9-gic"; interrupt-controller; -- 1.9.0 + + +-- +To unsubscribe from this list: send the line "unsubscribe devicetree" in +the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org +More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/a/content_digest b/N1/content_digest index 1a13dd8..90a5d72 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,14 +1,22 @@ "ref\01414506.B4e2jZujVm@diego\0" - "From\0heiko@sntech.de (Heiko St\303\274bner)\0" + "From\0Heiko St\303\274bner <heiko-4mtYJXux2i+zQB+pC5nmwQ@public.gmane.org>\0" "Subject\0[PATCH 8/8] ARM: dts: rockchip: convert pinctrl nodes to new bindings\0" "Date\0Wed, 30 Apr 2014 00:10:41 +0200\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0linus.walleij-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org\0" + "Cc\0linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org" + devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org + max.schwarz-BGeptl67XyCzQB+pC5nmwQ@public.gmane.org + Rob Herring <robh+dt-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org> + Pawel Moll <pawel.moll-5wv7dgnIgG8@public.gmane.org> + Mark Rutland <mark.rutland-5wv7dgnIgG8@public.gmane.org> + Ian Campbell <ijc+devicetree-KcIKpvwj1kUDXYZnReoRVg@public.gmane.org> + " Kumar Gala <galak-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org>\0" "\00:1\0" "b\0" "Introduce the grf syscon and convert the pinctrl drivers for rk3066 and rk3188\n" "to use it, instead of mapping the grf registers themselfs.\n" "\n" - "Signed-off-by: Heiko Stuebner <heiko@sntech.de>\n" + "Signed-off-by: Heiko Stuebner <heiko-4mtYJXux2i+zQB+pC5nmwQ@public.gmane.org>\n" "---\n" " arch/arm/boot/dts/rk3066a.dtsi | 2 +-\n" " arch/arm/boot/dts/rk3188.dtsi | 9 ++++-----\n" @@ -21,7 +29,7 @@ "+++ b/arch/arm/boot/dts/rk3066a.dtsi\n" "@@ -79,7 +79,7 @@\n" " \n" - " \t\tpinctrl at 20008000 {\n" + " \t\tpinctrl@20008000 {\n" " \t\t\tcompatible = \"rockchip,rk3066a-pinctrl\";\n" "-\t\t\treg = <0x20008000 0x150>;\n" "+\t\t\trockchip,grf = <&grf>;\n" @@ -34,7 +42,7 @@ "+++ b/arch/arm/boot/dts/rk3188.dtsi\n" "@@ -75,17 +75,16 @@\n" " \n" - " \t\tpinctrl at 20008000 {\n" + " \t\tpinctrl@20008000 {\n" " \t\t\tcompatible = \"rockchip,rk3188-pinctrl\";\n" "-\t\t\treg = <0x20008000 0xa0>,\n" "-\t\t\t <0x20008164 0x1a0>;\n" @@ -46,7 +54,7 @@ " \t\t\t#size-cells = <1>;\n" " \t\t\tranges;\n" " \n" - " \t\t\tgpio0: gpio0 at 0x2000a000 {\n" + " \t\t\tgpio0: gpio0@0x2000a000 {\n" " \t\t\t\tcompatible = \"rockchip,rk3188-gpio-bank0\";\n" "-\t\t\t\treg = <0x2000a000 0x100>,\n" "-\t\t\t\t <0x20004064 0x8>;\n" @@ -62,22 +70,28 @@ " \t\t\treg = <0x1013c000 0x100>;\n" " \t\t};\n" " \n" - "-\t\tpmu at 20004000 {\n" + "-\t\tpmu@20004000 {\n" "-\t\t\tcompatible = \"rockchip,rk3066-pmu\";\n" - "+\t\tpmu: pmu at 20004000 {\n" + "+\t\tpmu: pmu@20004000 {\n" "+\t\t\tcompatible = \"rockchip,rk3066-pmu\", \"syscon\";\n" " \t\t\treg = <0x20004000 0x100>;\n" " \t\t};\n" " \n" - "+\t\tgrf: grf at 20008000 {\n" + "+\t\tgrf: grf@20008000 {\n" "+\t\t\tcompatible = \"syscon\";\n" "+\t\t\treg = <0x20008000 0x200>;\n" "+\t\t};\n" "+\n" - " \t\tgic: interrupt-controller at 1013d000 {\n" + " \t\tgic: interrupt-controller@1013d000 {\n" " \t\t\tcompatible = \"arm,cortex-a9-gic\";\n" " \t\t\tinterrupt-controller;\n" "-- \n" - 1.9.0 + "1.9.0\n" + "\n" + "\n" + "--\n" + "To unsubscribe from this list: send the line \"unsubscribe devicetree\" in\n" + "the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org\n" + More majordomo info at http://vger.kernel.org/majordomo-info.html -61ff9b9f605ae13701a8f0d2c261836321398338d10b023d18893decef824521 +757208b9f22409501f28651e3f7eed982ac0cd3224db23cbb2586ab4cd3b9e82
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.