* [PATCH 00/10] pinctrl: mvebu: remove hard-coded addresses from Dove pinctrl @ 2014-02-24 8:42 Sebastian Hesselbarth 2014-02-24 8:42 ` [PATCH 01/10] devicetree: bindings: add missing Marvell Dove SoC documentation Sebastian Hesselbarth ` (5 more replies) 0 siblings, 6 replies; 23+ messages in thread From: Sebastian Hesselbarth @ 2014-02-24 8:42 UTC (permalink / raw) To: Sebastian Hesselbarth Cc: Mark Rutland, Andrew Lunn, Russell King, Jason Cooper, Pawel Moll, Ian Campbell, Linus Walleij, linux-doc, linux-kernel, devicetree, Rob Herring, Rob Landley, Kumar Gala, Gregory Clement, linux-arm-kernel This is a patches separated from one sent earlier [1] with just the removal of any hard-coded reg addresses from Dove pinctrl stub. This is a required step for Dove to leave mach-dove, hop into mach-mvebu, and become part of multi_v7. In the meantime, support for new Armada 375/38x was added that also contain patches for pinctrl [2]. The cleanup patches [3] split off from the original patch set take care of pinctrl-related changes for Armada 375/38x. Since this patch set now already depends on Armada 375/38x pinctrl through those cleanup patches, we take care of Armada 375/38x binding updates here, too. For Dove, this patch set removes all hardcoded addresses from pinctrl-dove by either requesting additional resources or a syscon provided regmap for global config registers. As this changes existing driver to DT binding relationship, all additional resources are probed in a backward compatible way. If the corresponding resource cannot be found, we derive it from the existing pinctrl resource and warn about the old DTB firmware. Patches 1-2 add or update binding documentation for dove, global config syscon, and pinctrl-dove. Patch 2 also documents missing reg property requirement for other mvebu pinctrl nodes, including new Armada 375/38x. Patch 3 and 4 add the new pinctrl reg property values and global config register syscon to exisiting dove.dtsi. Patches 5-6 request either additional reg ranges or the syscon regmap in a DT-backward compatible way. If any resource cannot be derived from DT node, we warn about an old DTB firmware. Patches 7-10 finally remove any hardcoded addresses from Dove SoC pinctrl driver and use the iomap/regmap resources instead. DT and binding related patches have also been sent to DT maintainers and corresponding lists, additional pinctrl related patches have been sent to pinctrl/mvebu maintainers and LAKML only. This patch set is based on v3.14-rc1 and depends on some cleanup patches that will go into v3.15. We have a lot of stuff for v3.15 already in mvebu, so I am okay with postponing this and/or the following dove-to- mvebu patches for v3.16. As Jason prepares mvebu pinctrl PRs for LinusW, it is up to him when to take it with LinusW's Acked-by. Nevertheless, there is an *unstable* branch based on v3.14-rc1, with mvebu/pinctrl-3xx and mvebu/pinctrl merged in at (still named -for-3.15) https://github.com/shesselba/linux-dove.git unstable/dove-pinctrl-for-3.15_v1 [1] http://www.spinics.net/lists/arm-kernel/msg303496.html [2] http://www.spinics.net/lists/arm-kernel/msg306409.html [3] http://lkml.org/lkml/2014/2/23/43 Sebastian Hesselbarth (10): devicetree: bindings: add missing Marvell Dove SoC documentation devicetree: bindings: update MVEBU pinctrl binding documentation ARM: dove: add additional pinctrl registers ARM: dove: add global-config register node pinctrl: mvebu: dove: request additional resources pinctrl: mvebu: dove: request syscon regmap for global registers pinctrl: mvebu: dove: use remapped mpp base registers pinctrl: mvebu: dove: use remapped mpp4 register pinctrl: mvebu: dove: use remapped pmu_mpp registers pinctrl: mvebu: dove: use global register regmap .../devicetree/bindings/arm/marvell,dove.txt | 22 ++ .../pinctrl/marvell,armada-370-pinctrl.txt | 1 + .../pinctrl/marvell,armada-375-pinctrl.txt | 1 + .../pinctrl/marvell,armada-38x-pinctrl.txt | 1 + .../bindings/pinctrl/marvell,armada-xp-pinctrl.txt | 1 + .../bindings/pinctrl/marvell,dove-pinctrl.txt | 1 + .../bindings/pinctrl/marvell,kirkwood-pinctrl.txt | 1 + .../bindings/pinctrl/marvell,mvebu-pinctrl.txt | 2 +- arch/arm/boot/dts/dove.dtsi | 10 +- drivers/pinctrl/mvebu/Kconfig | 1 + drivers/pinctrl/mvebu/pinctrl-dove.c | 286 +++++++++++++-------- 11 files changed, 213 insertions(+), 114 deletions(-) create mode 100644 Documentation/devicetree/bindings/arm/marvell,dove.txt --- Cc: Rob Herring <robh+dt@kernel.org> Cc: Pawel Moll <pawel.moll@arm.com> Cc: Mark Rutland <mark.rutland@arm.com> Cc: Ian Campbell <ijc+devicetree@hellion.org.uk> Cc: Kumar Gala <galak@codeaurora.org> Cc: Rob Landley <rob@landley.net> Cc: Linus Walleij <linus.walleij@linaro.org> Cc: Russell King <linux@arm.linux.org.uk> Cc: Jason Cooper <jason@lakedaemon.net> Cc: Andrew Lunn <andrew@lunn.ch> Cc: Gregory Clement <gregory.clement@free-electrons.com> Cc: devicetree@vger.kernel.org Cc: linux-doc@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org Cc: linux-kernel@vger.kernel.org -- 1.8.5.3 ^ permalink raw reply [flat|nested] 23+ messages in thread
* [PATCH 01/10] devicetree: bindings: add missing Marvell Dove SoC documentation 2014-02-24 8:42 [PATCH 00/10] pinctrl: mvebu: remove hard-coded addresses from Dove pinctrl Sebastian Hesselbarth @ 2014-02-24 8:42 ` Sebastian Hesselbarth 2014-02-24 8:42 ` [PATCH 02/10] devicetree: bindings: update MVEBU pinctrl binding documentation Sebastian Hesselbarth ` (4 subsequent siblings) 5 siblings, 0 replies; 23+ messages in thread From: Sebastian Hesselbarth @ 2014-02-24 8:42 UTC (permalink / raw) To: Sebastian Hesselbarth Cc: Mark Rutland, Andrew Lunn, Jason Cooper, Pawel Moll, Ian Campbell, Linus Walleij, linux-doc, linux-kernel, devicetree, Rob Herring, Rob Landley, Kumar Gala, Gregory Clement, linux-arm-kernel Marvell Dove SoC binding was not documented, yet. Add the documentation and also describe Global Configuration register node in it. Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> --- Cc: Rob Herring <robh+dt@kernel.org> Cc: Pawel Moll <pawel.moll@arm.com> Cc: Mark Rutland <mark.rutland@arm.com> Cc: Ian Campbell <ijc+devicetree@hellion.org.uk> Cc: Kumar Gala <galak@codeaurora.org> Cc: Rob Landley <rob@landley.net> Cc: Linus Walleij <linus.walleij@linaro.org> Cc: Jason Cooper <jason@lakedaemon.net> Cc: Andrew Lunn <andrew@lunn.ch> Cc: Gregory Clement <gregory.clement@free-electrons.com> Cc: devicetree@vger.kernel.org Cc: linux-doc@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org Cc: linux-kernel@vger.kernel.org --- .../devicetree/bindings/arm/marvell,dove.txt | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 Documentation/devicetree/bindings/arm/marvell,dove.txt diff --git a/Documentation/devicetree/bindings/arm/marvell,dove.txt b/Documentation/devicetree/bindings/arm/marvell,dove.txt new file mode 100644 index 000000000000..aaaf64c56e44 --- /dev/null +++ b/Documentation/devicetree/bindings/arm/marvell,dove.txt @@ -0,0 +1,22 @@ +Marvell Dove Platforms Device Tree Bindings +----------------------------------------------- + +Boards with a Marvell Dove SoC shall have the following properties: + +Required root node property: +- compatible: must contain "marvell,dove"; + +* Global Configuration registers + +Global Configuration registers of Dove SoC are shared by a syscon node. + +Required properties: +- compatible: must contain "marvell,dove-global-config" and "syscon". +- reg: base address and size of the Global Configuration registers. + +Example: + +gconf: global-config@e802c { + compatible = "marvell,dove-global-config", "syscon"; + reg = <0xe802c 0x14>; +}; -- 1.8.5.3 ^ permalink raw reply related [flat|nested] 23+ messages in thread
* [PATCH 02/10] devicetree: bindings: update MVEBU pinctrl binding documentation 2014-02-24 8:42 [PATCH 00/10] pinctrl: mvebu: remove hard-coded addresses from Dove pinctrl Sebastian Hesselbarth 2014-02-24 8:42 ` [PATCH 01/10] devicetree: bindings: add missing Marvell Dove SoC documentation Sebastian Hesselbarth @ 2014-02-24 8:42 ` Sebastian Hesselbarth 2014-02-24 8:42 ` [PATCH 03/10] ARM: dove: add additional pinctrl registers Sebastian Hesselbarth ` (3 subsequent siblings) 5 siblings, 0 replies; 23+ messages in thread From: Sebastian Hesselbarth @ 2014-02-24 8:42 UTC (permalink / raw) To: Sebastian Hesselbarth Cc: Rob Herring, Pawel Moll, Mark Rutland, Ian Campbell, Kumar Gala, Rob Landley, Linus Walleij, Jason Cooper, Andrew Lunn, Gregory Clement, devicetree, linux-doc, linux-arm-kernel, linux-kernel Dove pinctrl binding now requires three different reg properties. This updates corresponding binding and example accordingly. While at it, also document reg property as required for the other MVEBU SoC pinctrl nodes. Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> --- Cc: Rob Herring <robh+dt@kernel.org> Cc: Pawel Moll <pawel.moll@arm.com> Cc: Mark Rutland <mark.rutland@arm.com> Cc: Ian Campbell <ijc+devicetree@hellion.org.uk> Cc: Kumar Gala <galak@codeaurora.org> Cc: Rob Landley <rob@landley.net> Cc: Linus Walleij <linus.walleij@linaro.org> Cc: Jason Cooper <jason@lakedaemon.net> Cc: Andrew Lunn <andrew@lunn.ch> Cc: Gregory Clement <gregory.clement@free-electrons.com> Cc: devicetree@vger.kernel.org Cc: linux-doc@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org Cc: linux-kernel@vger.kernel.org --- .../devicetree/bindings/pinctrl/marvell,armada-370-pinctrl.txt | 1 + .../devicetree/bindings/pinctrl/marvell,armada-375-pinctrl.txt | 1 + .../devicetree/bindings/pinctrl/marvell,armada-38x-pinctrl.txt | 1 + Documentation/devicetree/bindings/pinctrl/marvell,armada-xp-pinctrl.txt | 1 + Documentation/devicetree/bindings/pinctrl/marvell,dove-pinctrl.txt | 1 + Documentation/devicetree/bindings/pinctrl/marvell,kirkwood-pinctrl.txt | 1 + Documentation/devicetree/bindings/pinctrl/marvell,mvebu-pinctrl.txt | 2 +- 7 files changed, 7 insertions(+), 1 deletion(-) diff --git a/Documentation/devicetree/bindings/pinctrl/marvell,armada-370-pinctrl.txt b/Documentation/devicetree/bindings/pinctrl/marvell,armada-370-pinctrl.txt index 01ef408e205f..adda2a8d1d52 100644 --- a/Documentation/devicetree/bindings/pinctrl/marvell,armada-370-pinctrl.txt +++ b/Documentation/devicetree/bindings/pinctrl/marvell,armada-370-pinctrl.txt @@ -5,6 +5,7 @@ part and usage. Required properties: - compatible: "marvell,88f6710-pinctrl" +- reg: register specifier of MPP registers Available mpp pins/groups and functions: Note: brackets (x) are not part of the mpp name for marvell,function and given diff --git a/Documentation/devicetree/bindings/pinctrl/marvell,armada-375-pinctrl.txt b/Documentation/devicetree/bindings/pinctrl/marvell,armada-375-pinctrl.txt index 2ede59dffe1b..7de0cda4a379 100644 --- a/Documentation/devicetree/bindings/pinctrl/marvell,armada-375-pinctrl.txt +++ b/Documentation/devicetree/bindings/pinctrl/marvell,armada-375-pinctrl.txt @@ -5,6 +5,7 @@ part and usage. Required properties: - compatible: "marvell,88f6720-pinctrl" +- reg: register specifier of MPP registers Available mpp pins/groups and functions: Note: brackets (x) are not part of the mpp name for marvell,function and given diff --git a/Documentation/devicetree/bindings/pinctrl/marvell,armada-38x-pinctrl.txt b/Documentation/devicetree/bindings/pinctrl/marvell,armada-38x-pinctrl.txt index 1d45f9d62346..b17c96849fc9 100644 --- a/Documentation/devicetree/bindings/pinctrl/marvell,armada-38x-pinctrl.txt +++ b/Documentation/devicetree/bindings/pinctrl/marvell,armada-38x-pinctrl.txt @@ -7,6 +7,7 @@ Required properties: - compatible: "marvell,88f6810-pinctrl", "marvell,88f6820-pinctrl" or "marvell,88f6828-pinctrl" depending on the specific variant of the SoC being used. +- reg: register specifier of MPP registers Available mpp pins/groups and functions: Note: brackets (x) are not part of the mpp name for marvell,function and given diff --git a/Documentation/devicetree/bindings/pinctrl/marvell,armada-xp-pinctrl.txt b/Documentation/devicetree/bindings/pinctrl/marvell,armada-xp-pinctrl.txt index bfa0a2e5e0cb..373dbccd7ab0 100644 --- a/Documentation/devicetree/bindings/pinctrl/marvell,armada-xp-pinctrl.txt +++ b/Documentation/devicetree/bindings/pinctrl/marvell,armada-xp-pinctrl.txt @@ -6,6 +6,7 @@ part and usage. Required properties: - compatible: "marvell,mv78230-pinctrl", "marvell,mv78260-pinctrl", "marvell,mv78460-pinctrl" +- reg: register specifier of MPP registers This driver supports all Armada XP variants, i.e. mv78230, mv78260, and mv78460. diff --git a/Documentation/devicetree/bindings/pinctrl/marvell,dove-pinctrl.txt b/Documentation/devicetree/bindings/pinctrl/marvell,dove-pinctrl.txt index 50ec3512a292..cf52477cc7ee 100644 --- a/Documentation/devicetree/bindings/pinctrl/marvell,dove-pinctrl.txt +++ b/Documentation/devicetree/bindings/pinctrl/marvell,dove-pinctrl.txt @@ -6,6 +6,7 @@ part and usage. Required properties: - compatible: "marvell,dove-pinctrl" - clocks: (optional) phandle of pdma clock +- reg: register specifiers of MPP, MPP4, and PMU MPP registers Available mpp pins/groups and functions: Note: brackets (x) are not part of the mpp name for marvell,function and given diff --git a/Documentation/devicetree/bindings/pinctrl/marvell,kirkwood-pinctrl.txt b/Documentation/devicetree/bindings/pinctrl/marvell,kirkwood-pinctrl.txt index 95daf6335c37..730444a9a4de 100644 --- a/Documentation/devicetree/bindings/pinctrl/marvell,kirkwood-pinctrl.txt +++ b/Documentation/devicetree/bindings/pinctrl/marvell,kirkwood-pinctrl.txt @@ -8,6 +8,7 @@ Required properties: "marvell,88f6190-pinctrl", "marvell,88f6192-pinctrl", "marvell,88f6281-pinctrl", "marvell,88f6282-pinctrl" "marvell,98dx4122-pinctrl" +- reg: register specifier of MPP registers This driver supports all kirkwood variants, i.e. 88f6180, 88f619x, and 88f628x. It also support the 88f6281-based variant in the 98dx412x Bobcat SoCs. diff --git a/Documentation/devicetree/bindings/pinctrl/marvell,mvebu-pinctrl.txt b/Documentation/devicetree/bindings/pinctrl/marvell,mvebu-pinctrl.txt index 0a26c3aa4e6d..0c09f4eb2af0 100644 --- a/Documentation/devicetree/bindings/pinctrl/marvell,mvebu-pinctrl.txt +++ b/Documentation/devicetree/bindings/pinctrl/marvell,mvebu-pinctrl.txt @@ -37,7 +37,7 @@ uart1: serial@12100 { pinctrl: pinctrl@d0200 { compatible = "marvell,dove-pinctrl"; - reg = <0xd0200 0x20>; + reg = <0xd0200 0x14>, <0xd0440 0x04>, <0xd802c 0x08>; pmx_uart1_sw: pmx-uart1-sw { marvell,pins = "mpp_uart1"; -- 1.8.5.3 ^ permalink raw reply related [flat|nested] 23+ messages in thread
* [PATCH 03/10] ARM: dove: add additional pinctrl registers 2014-02-24 8:42 [PATCH 00/10] pinctrl: mvebu: remove hard-coded addresses from Dove pinctrl Sebastian Hesselbarth 2014-02-24 8:42 ` [PATCH 01/10] devicetree: bindings: add missing Marvell Dove SoC documentation Sebastian Hesselbarth 2014-02-24 8:42 ` [PATCH 02/10] devicetree: bindings: update MVEBU pinctrl binding documentation Sebastian Hesselbarth @ 2014-02-24 8:42 ` Sebastian Hesselbarth 2014-02-24 8:42 ` [PATCH 04/10] ARM: dove: add global-config register node Sebastian Hesselbarth ` (2 subsequent siblings) 5 siblings, 0 replies; 23+ messages in thread From: Sebastian Hesselbarth @ 2014-02-24 8:42 UTC (permalink / raw) To: Sebastian Hesselbarth Cc: Mark Rutland, Andrew Lunn, Russell King, Jason Cooper, Pawel Moll, Ian Campbell, Linus Walleij, linux-doc, linux-kernel, devicetree, Rob Herring, Rob Landley, Kumar Gala, Gregory Clement, linux-arm-kernel Dove pinctrl uses additional registers to control MPPs. This patch first increases existing pinctrl reg property by one register, and then adds two new ranges for MPP4 and PMU MPP registers. Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> --- Cc: Rob Herring <robh+dt@kernel.org> Cc: Pawel Moll <pawel.moll@arm.com> Cc: Mark Rutland <mark.rutland@arm.com> Cc: Ian Campbell <ijc+devicetree@hellion.org.uk> Cc: Kumar Gala <galak@codeaurora.org> Cc: Rob Landley <rob@landley.net> Cc: Linus Walleij <linus.walleij@linaro.org> Cc: Russell King <linux@arm.linux.org.uk> Cc: Jason Cooper <jason@lakedaemon.net> Cc: Andrew Lunn <andrew@lunn.ch> Cc: Gregory Clement <gregory.clement@free-electrons.com> Cc: devicetree@vger.kernel.org Cc: linux-doc@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org Cc: linux-kernel@vger.kernel.org --- arch/arm/boot/dts/dove.dtsi | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/dove.dtsi b/arch/arm/boot/dts/dove.dtsi index 2b76524f4aa7..c5e90f0287b9 100644 --- a/arch/arm/boot/dts/dove.dtsi +++ b/arch/arm/boot/dts/dove.dtsi @@ -390,7 +390,9 @@ pinctrl: pin-ctrl@d0200 { compatible = "marvell,dove-pinctrl"; - reg = <0xd0200 0x10>; + reg = <0xd0200 0x14>, + <0xd0440 0x04>, + <0xd802c 0x08>; clocks = <&gate_clk 22>; pmx_gpio_0: pmx-gpio-0 { -- 1.8.5.3 ^ permalink raw reply related [flat|nested] 23+ messages in thread
* [PATCH 04/10] ARM: dove: add global-config register node 2014-02-24 8:42 [PATCH 00/10] pinctrl: mvebu: remove hard-coded addresses from Dove pinctrl Sebastian Hesselbarth ` (2 preceding siblings ...) 2014-02-24 8:42 ` [PATCH 03/10] ARM: dove: add additional pinctrl registers Sebastian Hesselbarth @ 2014-02-24 8:42 ` Sebastian Hesselbarth 2014-02-24 10:17 ` [PATCH 00/10] pinctrl: mvebu: remove hard-coded addresses from Dove pinctrl Linus Walleij [not found] ` <1393231382-11078-1-git-send-email-sebastian.hesselbarth-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> 5 siblings, 0 replies; 23+ messages in thread From: Sebastian Hesselbarth @ 2014-02-24 8:42 UTC (permalink / raw) To: Sebastian Hesselbarth Cc: Rob Herring, Pawel Moll, Mark Rutland, Ian Campbell, Kumar Gala, Rob Landley, Linus Walleij, Russell King, Jason Cooper, Andrew Lunn, Gregory Clement, devicetree, linux-doc, linux-arm-kernel, linux-kernel We share global config registers by syscon node, add it to dove.dtsi. Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> --- Cc: Rob Herring <robh+dt@kernel.org> Cc: Pawel Moll <pawel.moll@arm.com> Cc: Mark Rutland <mark.rutland@arm.com> Cc: Ian Campbell <ijc+devicetree@hellion.org.uk> Cc: Kumar Gala <galak@codeaurora.org> Cc: Rob Landley <rob@landley.net> Cc: Linus Walleij <linus.walleij@linaro.org> Cc: Russell King <linux@arm.linux.org.uk> Cc: Jason Cooper <jason@lakedaemon.net> Cc: Andrew Lunn <andrew@lunn.ch> Cc: Gregory Clement <gregory.clement@free-electrons.com> Cc: devicetree@vger.kernel.org Cc: linux-doc@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org Cc: linux-kernel@vger.kernel.org --- arch/arm/boot/dts/dove.dtsi | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/arch/arm/boot/dts/dove.dtsi b/arch/arm/boot/dts/dove.dtsi index c5e90f0287b9..eeb08edb67ac 100644 --- a/arch/arm/boot/dts/dove.dtsi +++ b/arch/arm/boot/dts/dove.dtsi @@ -616,6 +616,12 @@ interrupts = <5>; }; + gconf: global-config@e802c { + compatible = "marvell,dove-global-config", + "syscon"; + reg = <0xe802c 0x14>; + }; + gpio2: gpio-ctrl@e8400 { compatible = "marvell,orion-gpio"; #gpio-cells = <2>; -- 1.8.5.3 ^ permalink raw reply related [flat|nested] 23+ messages in thread
* Re: [PATCH 00/10] pinctrl: mvebu: remove hard-coded addresses from Dove pinctrl 2014-02-24 8:42 [PATCH 00/10] pinctrl: mvebu: remove hard-coded addresses from Dove pinctrl Sebastian Hesselbarth ` (3 preceding siblings ...) 2014-02-24 8:42 ` [PATCH 04/10] ARM: dove: add global-config register node Sebastian Hesselbarth @ 2014-02-24 10:17 ` Linus Walleij 2014-02-24 10:20 ` Sebastian Hesselbarth [not found] ` <1393231382-11078-1-git-send-email-sebastian.hesselbarth-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> 5 siblings, 1 reply; 23+ messages in thread From: Linus Walleij @ 2014-02-24 10:17 UTC (permalink / raw) To: Sebastian Hesselbarth Cc: Rob Herring, Pawel Moll, Mark Rutland, Ian Campbell, Kumar Gala, Rob Landley, Russell King, Jason Cooper, Andrew Lunn, Gregory Clement, devicetree@vger.kernel.org, linux-doc@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org On Mon, Feb 24, 2014 at 9:42 AM, Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> wrote: > This is a patches separated from one sent earlier [1] with just the > removal of any hard-coded reg addresses from Dove pinctrl stub. OK let's queue this a while later on top of the other stuff (that I'm working on applying right now). > In the meantime, support for new Armada 375/38x was added that also > contain patches for pinctrl [2]. I applied these first. Please look at the result once I push out the pinctrl tree with the 375/38x + your v4 series in combination (let's see how big mess it will be...) I'm sorry for not applying the nice patches earlier, forcing you to work on many parallel series like this, hopefully I'll be able to attend to them this week. Yours, Linus Walleij ^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PATCH 00/10] pinctrl: mvebu: remove hard-coded addresses from Dove pinctrl 2014-02-24 10:17 ` [PATCH 00/10] pinctrl: mvebu: remove hard-coded addresses from Dove pinctrl Linus Walleij @ 2014-02-24 10:20 ` Sebastian Hesselbarth [not found] ` <530B1CF4.2060208-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> 0 siblings, 1 reply; 23+ messages in thread From: Sebastian Hesselbarth @ 2014-02-24 10:20 UTC (permalink / raw) To: Linus Walleij Cc: Rob Herring, Pawel Moll, Mark Rutland, Ian Campbell, Kumar Gala, Rob Landley, Russell King, Jason Cooper, Andrew Lunn, Gregory Clement, devicetree@vger.kernel.org, linux-doc@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org On 02/24/14 11:17, Linus Walleij wrote: > On Mon, Feb 24, 2014 at 9:42 AM, Sebastian Hesselbarth > <sebastian.hesselbarth@gmail.com> wrote: > >> This is a patches separated from one sent earlier [1] with just the >> removal of any hard-coded reg addresses from Dove pinctrl stub. > > OK let's queue this a while later on top of the other stuff (that I'm working > on applying right now). Ok. >> In the meantime, support for new Armada 375/38x was added that also >> contain patches for pinctrl [2]. > > I applied these first. Please look at the result once I push out the > pinctrl tree with the 375/38x + your v4 series in combination > (let's see how big mess it will be...) > > I'm sorry for not applying the nice patches earlier, forcing you to work > on many parallel series like this, hopefully I'll be able to attend to > them this week. It's okay, I don't expect you to jump on every patch set we sent immediately. Although, I guess instead of applying them separately, it would have been better to pull them from Jason's stable topic branch. But that is also up to you and Jason may give valuable hints on how to proceed in the future. Thanks anyway! Sebastian ^ permalink raw reply [flat|nested] 23+ messages in thread
[parent not found: <530B1CF4.2060208-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>]
* Re: [PATCH 00/10] pinctrl: mvebu: remove hard-coded addresses from Dove pinctrl [not found] ` <530B1CF4.2060208-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> @ 2014-02-24 11:50 ` Linus Walleij 0 siblings, 0 replies; 23+ messages in thread From: Linus Walleij @ 2014-02-24 11:50 UTC (permalink / raw) To: Sebastian Hesselbarth Cc: Rob Herring, Pawel Moll, Mark Rutland, Ian Campbell, Kumar Gala, Rob Landley, Russell King, Jason Cooper, Andrew Lunn, Gregory Clement, devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-doc-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org, linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org On Mon, Feb 24, 2014 at 11:20 AM, Sebastian Hesselbarth <sebastian.hesselbarth-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> wrote: > Although, I guess instead of applying them separately, it would have > been better to pull them from Jason's stable topic branch. But that is > also up to you and Jason may give valuable hints on how to proceed in > the future. Yeah I concluded that I should take a branch pull instead, so I'm just waiting for an indication of which branch to pull in. Yours, Linus Walleij -- 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 ^ permalink raw reply [flat|nested] 23+ messages in thread
[parent not found: <1393231382-11078-1-git-send-email-sebastian.hesselbarth-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>]
* Re: [PATCH 00/10] pinctrl: mvebu: remove hard-coded addresses from Dove pinctrl [not found] ` <1393231382-11078-1-git-send-email-sebastian.hesselbarth-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> @ 2014-02-24 18:10 ` Jason Cooper [not found] ` <20140224181023.GA1010-u4khhh1J0LxI1Ri9qeTfzeTW4wlIGRCZ@public.gmane.org> 0 siblings, 1 reply; 23+ messages in thread From: Jason Cooper @ 2014-02-24 18:10 UTC (permalink / raw) To: Sebastian Hesselbarth, Linus Walleij Cc: Mark Rutland, Andrew Lunn, Russell King, Pawel Moll, Ian Campbell, linux-doc-u79uwXL29TY76Z2rM5mHXA, linux-kernel-u79uwXL29TY76Z2rM5mHXA, devicetree-u79uwXL29TY76Z2rM5mHXA, Rob Herring, Rob Landley, Kumar Gala, Gregory Clement, linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r Sebastian, Linus, I've now created mvebu/pinctrl-dove for this series. It's based on v3.14-rc1, and depends on mvebu/pinctrl (which depends on mvebu/pinctrl-3xx). I've kept this series in a separate branch in case we encounter an unforeseen problem with something in here. Then this branch can be dropped, and /pinctrl-3xx and /pinctrl will still make it in. So, all patches except 3 and 4 are in mvebu/pinctrl-dove. 3 and 4 are in mvebu/dt. thx, Jason. On Mon, Feb 24, 2014 at 09:42:52AM +0100, Sebastian Hesselbarth wrote: > This is a patches separated from one sent earlier [1] with just the > removal of any hard-coded reg addresses from Dove pinctrl stub. This > is a required step for Dove to leave mach-dove, hop into mach-mvebu, > and become part of multi_v7. > > In the meantime, support for new Armada 375/38x was added that also > contain patches for pinctrl [2]. The cleanup patches [3] split off from > the original patch set take care of pinctrl-related changes for Armada > 375/38x. Since this patch set now already depends on Armada 375/38x > pinctrl through those cleanup patches, we take care of Armada 375/38x > binding updates here, too. > > For Dove, this patch set removes all hardcoded addresses from > pinctrl-dove by either requesting additional resources or a syscon > provided regmap for global config registers. As this changes existing > driver to DT binding relationship, all additional resources are probed > in a backward compatible way. If the corresponding resource cannot be > found, we derive it from the existing pinctrl resource and warn about > the old DTB firmware. > > Patches 1-2 add or update binding documentation for dove, global config > syscon, and pinctrl-dove. Patch 2 also documents missing reg property > requirement for other mvebu pinctrl nodes, including new Armada 375/38x. > > Patch 3 and 4 add the new pinctrl reg property values and global config > register syscon to exisiting dove.dtsi. > > Patches 5-6 request either additional reg ranges or the syscon regmap > in a DT-backward compatible way. If any resource cannot be derived from > DT node, we warn about an old DTB firmware. > > Patches 7-10 finally remove any hardcoded addresses from Dove SoC > pinctrl driver and use the iomap/regmap resources instead. > > DT and binding related patches have also been sent to DT maintainers > and corresponding lists, additional pinctrl related patches have been > sent to pinctrl/mvebu maintainers and LAKML only. > > This patch set is based on v3.14-rc1 and depends on some cleanup patches > that will go into v3.15. We have a lot of stuff for v3.15 already in > mvebu, so I am okay with postponing this and/or the following dove-to- > mvebu patches for v3.16. As Jason prepares mvebu pinctrl PRs for LinusW, > it is up to him when to take it with LinusW's Acked-by. > > Nevertheless, there is an *unstable* branch based on v3.14-rc1, with > mvebu/pinctrl-3xx and mvebu/pinctrl merged in at (still named -for-3.15) > > https://github.com/shesselba/linux-dove.git unstable/dove-pinctrl-for-3.15_v1 > > [1] http://www.spinics.net/lists/arm-kernel/msg303496.html > [2] http://www.spinics.net/lists/arm-kernel/msg306409.html > [3] http://lkml.org/lkml/2014/2/23/43 > > Sebastian Hesselbarth (10): > devicetree: bindings: add missing Marvell Dove SoC documentation > devicetree: bindings: update MVEBU pinctrl binding documentation > ARM: dove: add additional pinctrl registers > ARM: dove: add global-config register node > pinctrl: mvebu: dove: request additional resources > pinctrl: mvebu: dove: request syscon regmap for global registers > pinctrl: mvebu: dove: use remapped mpp base registers > pinctrl: mvebu: dove: use remapped mpp4 register > pinctrl: mvebu: dove: use remapped pmu_mpp registers > pinctrl: mvebu: dove: use global register regmap > > .../devicetree/bindings/arm/marvell,dove.txt | 22 ++ > .../pinctrl/marvell,armada-370-pinctrl.txt | 1 + > .../pinctrl/marvell,armada-375-pinctrl.txt | 1 + > .../pinctrl/marvell,armada-38x-pinctrl.txt | 1 + > .../bindings/pinctrl/marvell,armada-xp-pinctrl.txt | 1 + > .../bindings/pinctrl/marvell,dove-pinctrl.txt | 1 + > .../bindings/pinctrl/marvell,kirkwood-pinctrl.txt | 1 + > .../bindings/pinctrl/marvell,mvebu-pinctrl.txt | 2 +- > arch/arm/boot/dts/dove.dtsi | 10 +- > drivers/pinctrl/mvebu/Kconfig | 1 + > drivers/pinctrl/mvebu/pinctrl-dove.c | 286 +++++++++++++-------- > 11 files changed, 213 insertions(+), 114 deletions(-) > create mode 100644 Documentation/devicetree/bindings/arm/marvell,dove.txt > > --- > Cc: Rob Herring <robh+dt-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org> > Cc: Pawel Moll <pawel.moll-5wv7dgnIgG8@public.gmane.org> > Cc: Mark Rutland <mark.rutland-5wv7dgnIgG8@public.gmane.org> > Cc: Ian Campbell <ijc+devicetree-KcIKpvwj1kUDXYZnReoRVg@public.gmane.org> > Cc: Kumar Gala <galak-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org> > Cc: Rob Landley <rob-VoJi6FS/r0vR7s880joybQ@public.gmane.org> > Cc: Linus Walleij <linus.walleij-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org> > Cc: Russell King <linux-lFZ/pmaqli7XmaaqVzeoHQ@public.gmane.org> > Cc: Jason Cooper <jason-NLaQJdtUoK4Be96aLqz0jA@public.gmane.org> > Cc: Andrew Lunn <andrew-g2DYL2Zd6BY@public.gmane.org> > Cc: Gregory Clement <gregory.clement-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org> > Cc: devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org > Cc: linux-doc-u79uwXL29TY76Z2rM5mHXA@public.gmane.org > Cc: linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org > Cc: linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org > -- > 1.8.5.3 > > > _______________________________________________ > linux-arm-kernel mailing list > linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel -- 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 ^ permalink raw reply [flat|nested] 23+ messages in thread
[parent not found: <20140224181023.GA1010-u4khhh1J0LxI1Ri9qeTfzeTW4wlIGRCZ@public.gmane.org>]
* Re: [PATCH 00/10] pinctrl: mvebu: remove hard-coded addresses from Dove pinctrl [not found] ` <20140224181023.GA1010-u4khhh1J0LxI1Ri9qeTfzeTW4wlIGRCZ@public.gmane.org> @ 2014-02-25 9:36 ` Linus Walleij 2014-02-25 15:16 ` Jason Cooper [not found] ` <CACRpkdZ+YGTyDj6i8c198MdRtz3GY-YBmVO9LysPCcmT4EC0cg-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org> 0 siblings, 2 replies; 23+ messages in thread From: Linus Walleij @ 2014-02-25 9:36 UTC (permalink / raw) To: Jason Cooper Cc: Sebastian Hesselbarth, Mark Rutland, Andrew Lunn, Russell King, Pawel Moll, Ian Campbell, linux-doc-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, Rob Herring, Rob Landley, Kumar Gala, Gregory Clement, linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org On Mon, Feb 24, 2014 at 7:10 PM, Jason Cooper <jason-NLaQJdtUoK4Be96aLqz0jA@public.gmane.org> wrote: > Sebastian, Linus, > > I've now created mvebu/pinctrl-dove for this series. It's based on > v3.14-rc1, and depends on mvebu/pinctrl (which depends on > mvebu/pinctrl-3xx). > > I've kept this series in a separate branch in case we encounter an > unforeseen problem with something in here. Then this branch can be > dropped, and /pinctrl-3xx and /pinctrl will still make it in. > > So, all patches except 3 and 4 are in mvebu/pinctrl-dove. 3 and 4 are > in mvebu/dt. OK so what should I be pulling in first now? Yours, Linus Walleij -- 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 ^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PATCH 00/10] pinctrl: mvebu: remove hard-coded addresses from Dove pinctrl 2014-02-25 9:36 ` Linus Walleij @ 2014-02-25 15:16 ` Jason Cooper 2014-02-25 15:30 ` Sebastian Hesselbarth [not found] ` <CACRpkdZ+YGTyDj6i8c198MdRtz3GY-YBmVO9LysPCcmT4EC0cg-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org> 1 sibling, 1 reply; 23+ messages in thread From: Jason Cooper @ 2014-02-25 15:16 UTC (permalink / raw) To: Linus Walleij, Sebastian Hesselbarth Cc: Mark Rutland, Andrew Lunn, Russell King, Pawel Moll, linux-doc@vger.kernel.org, Ian Campbell, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, Rob Herring, Rob Landley, Kumar Gala, Gregory Clement, linux-arm-kernel@lists.infradead.org On Tue, Feb 25, 2014 at 10:36:54AM +0100, Linus Walleij wrote: > On Mon, Feb 24, 2014 at 7:10 PM, Jason Cooper <jason@lakedaemon.net> wrote: > > > Sebastian, Linus, > > > > I've now created mvebu/pinctrl-dove for this series. It's based on > > v3.14-rc1, and depends on mvebu/pinctrl (which depends on > > mvebu/pinctrl-3xx). > > > > I've kept this series in a separate branch in case we encounter an > > unforeseen problem with something in here. Then this branch can be > > dropped, and /pinctrl-3xx and /pinctrl will still make it in. > > > > So, all patches except 3 and 4 are in mvebu/pinctrl-dove. 3 and 4 are > > in mvebu/dt. > > OK so what should I be pulling in first now? Of course I woke up this morning not happy with this :-/ Here's what it looks like currently: /v3.14-rc1 | --+---+---+---+---+ mvebu/pinctrl-3xx | \ |---+---+---+---+---+---+---+ mvebu/pinctrl \ \ \---------------------------+---+---+---+ mvebu/pinctrl-dove Not to scale. I would prefer to do: /v3.14-rc1 | --+---+---+---+---+ mvebu/pinctrl-cleanup | \ |----------------+--+---+---+ mvebu/pinctrl-3xx \ \ \----------------+---+---+--+---+---+---+ mvebu/pinctrl-dove But this would mean moving some patches to branches other than what they were sent with. The advantage is that /pinctrl-3xx and /pinctrl-dove don't depend on each other, and only depend on -cleanup. Which is great if there is something wrong in either branch. Sebastian, I can cherry-pick the patches around, but you know the code better than any of us, do you foresee any problems with this scenario? thx, Jason. ^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PATCH 00/10] pinctrl: mvebu: remove hard-coded addresses from Dove pinctrl 2014-02-25 15:16 ` Jason Cooper @ 2014-02-25 15:30 ` Sebastian Hesselbarth 2014-02-25 15:43 ` Jason Cooper 0 siblings, 1 reply; 23+ messages in thread From: Sebastian Hesselbarth @ 2014-02-25 15:30 UTC (permalink / raw) To: Jason Cooper, Linus Walleij, Sebastian Hesselbarth Cc: Mark Rutland, Andrew Lunn, Russell King, Pawel Moll, Ian Campbell, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, Rob Herring, Rob Landley, Kumar Gala, Gregory Clement, linux-arm-kernel@lists.infradead.org, Thomas Petazzoni On 02/25/14 16:16, Jason Cooper wrote: > On Tue, Feb 25, 2014 at 10:36:54AM +0100, Linus Walleij wrote: >> On Mon, Feb 24, 2014 at 7:10 PM, Jason Cooper <jason@lakedaemon.net> wrote: >>> I've now created mvebu/pinctrl-dove for this series. It's based on >>> v3.14-rc1, and depends on mvebu/pinctrl (which depends on >>> mvebu/pinctrl-3xx). >>> >>> I've kept this series in a separate branch in case we encounter an >>> unforeseen problem with something in here. Then this branch can be >>> dropped, and /pinctrl-3xx and /pinctrl will still make it in. >>> >>> So, all patches except 3 and 4 are in mvebu/pinctrl-dove. 3 and 4 are >>> in mvebu/dt. >> >> OK so what should I be pulling in first now? > > Of course I woke up this morning not happy with this :-/ Here's what it > looks like currently: > > /v3.14-rc1 > | > --+---+---+---+---+ mvebu/pinctrl-3xx > | \ > |---+---+---+---+---+---+---+ mvebu/pinctrl > \ \ > \---------------------------+---+---+---+ mvebu/pinctrl-dove > > Not to scale. > > > I would prefer to do: > > /v3.14-rc1 > | > --+---+---+---+---+ mvebu/pinctrl-cleanup > | \ > |----------------+--+---+---+ mvebu/pinctrl-3xx > \ \ > \----------------+---+---+--+---+---+---+ mvebu/pinctrl-dove > > But this would mean moving some patches to branches other than what they > were sent with. The advantage is that /pinctrl-3xx and /pinctrl-dove > don't depend on each other, and only depend on -cleanup. Which is great > if there is something wrong in either branch. > > Sebastian, I can cherry-pick the patches around, but you know the code > better than any of us, do you foresee any problems with this scenario? If Thomas agrees, I can rework Armada 375/38x pinctrl stubs to fit on mvebu/pinctrl. That should allow you to have mvebu/pinctrl-dove independent of mvebu/pinctrl-3xx. Not a big deal, I'd just pick 375/38x patches from mvebu/pinctrl and squash them into mvebu/pinctrl-3xx. The only "issue" is that DT documentation update patches from mvebu/pinctrl-dove have to be split too. I'll prepare the three new branches for you and Thomas to look at today. Sebastian ^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PATCH 00/10] pinctrl: mvebu: remove hard-coded addresses from Dove pinctrl 2014-02-25 15:30 ` Sebastian Hesselbarth @ 2014-02-25 15:43 ` Jason Cooper 0 siblings, 0 replies; 23+ messages in thread From: Jason Cooper @ 2014-02-25 15:43 UTC (permalink / raw) To: Sebastian Hesselbarth Cc: Linus Walleij, Sebastian Hesselbarth, Mark Rutland, Andrew Lunn, Russell King, Pawel Moll, Ian Campbell, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, Rob Herring, Rob Landley, Kumar Gala, Gregory Clement, linux-arm-kernel@lists.infradead.org, Thomas Petazzoni On Tue, Feb 25, 2014 at 04:30:45PM +0100, Sebastian Hesselbarth wrote: > On 02/25/14 16:16, Jason Cooper wrote: > >On Tue, Feb 25, 2014 at 10:36:54AM +0100, Linus Walleij wrote: > >>On Mon, Feb 24, 2014 at 7:10 PM, Jason Cooper <jason@lakedaemon.net> wrote: > >>>I've now created mvebu/pinctrl-dove for this series. It's based on > >>>v3.14-rc1, and depends on mvebu/pinctrl (which depends on > >>>mvebu/pinctrl-3xx). > >>> > >>>I've kept this series in a separate branch in case we encounter an > >>>unforeseen problem with something in here. Then this branch can be > >>>dropped, and /pinctrl-3xx and /pinctrl will still make it in. > >>> > >>>So, all patches except 3 and 4 are in mvebu/pinctrl-dove. 3 and 4 are > >>>in mvebu/dt. > >> > >>OK so what should I be pulling in first now? > > > >Of course I woke up this morning not happy with this :-/ Here's what it > >looks like currently: > > > > /v3.14-rc1 > > | > >--+---+---+---+---+ mvebu/pinctrl-3xx > > | \ > > |---+---+---+---+---+---+---+ mvebu/pinctrl > > \ \ > > \---------------------------+---+---+---+ mvebu/pinctrl-dove > > > >Not to scale. > > > > > >I would prefer to do: > > > > /v3.14-rc1 > > | > >--+---+---+---+---+ mvebu/pinctrl-cleanup > > | \ > > |----------------+--+---+---+ mvebu/pinctrl-3xx > > \ \ > > \----------------+---+---+--+---+---+---+ mvebu/pinctrl-dove > > > >But this would mean moving some patches to branches other than what they > >were sent with. The advantage is that /pinctrl-3xx and /pinctrl-dove > >don't depend on each other, and only depend on -cleanup. Which is great > >if there is something wrong in either branch. > > > >Sebastian, I can cherry-pick the patches around, but you know the code > >better than any of us, do you foresee any problems with this scenario? > > If Thomas agrees, I can rework Armada 375/38x pinctrl stubs to fit on > mvebu/pinctrl. That should allow you to have mvebu/pinctrl-dove > independent of mvebu/pinctrl-3xx. > > Not a big deal, I'd just pick 375/38x patches from mvebu/pinctrl and > squash them into mvebu/pinctrl-3xx. The only "issue" is that DT > documentation update patches from mvebu/pinctrl-dove have to be split > too. > > I'll prepare the three new branches for you and Thomas to look at > today. Ok, great. Thanks Sebastian! thx, Jason. ^ permalink raw reply [flat|nested] 23+ messages in thread
[parent not found: <CACRpkdZ+YGTyDj6i8c198MdRtz3GY-YBmVO9LysPCcmT4EC0cg-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>]
* Re: [PATCH 00/10] pinctrl: mvebu: remove hard-coded addresses from Dove pinctrl [not found] ` <CACRpkdZ+YGTyDj6i8c198MdRtz3GY-YBmVO9LysPCcmT4EC0cg-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org> @ 2014-02-26 0:09 ` Jason Cooper 2014-02-26 9:43 ` Linus Walleij 0 siblings, 1 reply; 23+ messages in thread From: Jason Cooper @ 2014-02-26 0:09 UTC (permalink / raw) To: Linus Walleij Cc: Mark Rutland, Andrew Lunn, Russell King, Pawel Moll, Ian Campbell, linux-doc-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, Rob Herring, Rob Landley, Kumar Gala, Gregory Clement, linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org, Sebastian Hesselbarth Linus, On Tue, Feb 25, 2014 at 10:36:54AM +0100, Linus Walleij wrote: > On Mon, Feb 24, 2014 at 7:10 PM, Jason Cooper <jason-NLaQJdtUoK4Be96aLqz0jA@public.gmane.org> wrote: > > > Sebastian, Linus, > > > > I've now created mvebu/pinctrl-dove for this series. It's based on > > v3.14-rc1, and depends on mvebu/pinctrl (which depends on > > mvebu/pinctrl-3xx). > > > > I've kept this series in a separate branch in case we encounter an > > unforeseen problem with something in here. Then this branch can be > > dropped, and /pinctrl-3xx and /pinctrl will still make it in. > > > > So, all patches except 3 and 4 are in mvebu/pinctrl-dove. 3 and 4 are > > in mvebu/dt. > > OK so what should I be pulling in first now? Sebastian has now re-organized the branches as I asked, and I confirmed that the final result is the exact same as mine (diff is null). Usually when I submit pull requests to arm-soc, they like to see the branches. That way if there is an error in one of them, they just drop the one branch and the others remain. Would you like them the same way? If so, I'll send the pulls to you tomorrow. Otherwise, I'll wait a few more days to let things shake out and then send you one request with the branches merged. thx, Jason. -- 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 ^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PATCH 00/10] pinctrl: mvebu: remove hard-coded addresses from Dove pinctrl 2014-02-26 0:09 ` Jason Cooper @ 2014-02-26 9:43 ` Linus Walleij [not found] ` <CACRpkdYQa2BG_qxf5zY=7rks6O31ZF-BX0af3_u1MOgwfwxFSQ-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org> 0 siblings, 1 reply; 23+ messages in thread From: Linus Walleij @ 2014-02-26 9:43 UTC (permalink / raw) To: Jason Cooper Cc: Mark Rutland, Andrew Lunn, Russell King, Pawel Moll, Ian Campbell, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, Rob Herring, Rob Landley, Kumar Gala, Gregory Clement, linux-arm-kernel@lists.infradead.org, Sebastian Hesselbarth On Wed, Feb 26, 2014 at 1:09 AM, Jason Cooper <jason@lakedaemon.net> wrote: > Sebastian has now re-organized the branches as I asked, and I confirmed > that the final result is the exact same as mine (diff is null). Okay! > Usually when I submit pull requests to arm-soc, they like to see the > branches. That way if there is an error in one of them, they just drop > the one branch and the others remain. > > Would you like them the same way? If so, I'll send the pulls to you > tomorrow. Send me one big branch with everything on it. Actually, I'd prefer to pull it in, rebase and sign off each patch individually in my tree if that is not causing you problems. That way it is visible that the patches were funneled through pin control. Yours, Linus Walleij ^ permalink raw reply [flat|nested] 23+ messages in thread
[parent not found: <CACRpkdYQa2BG_qxf5zY=7rks6O31ZF-BX0af3_u1MOgwfwxFSQ-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>]
* Re: [PATCH 00/10] pinctrl: mvebu: remove hard-coded addresses from Dove pinctrl [not found] ` <CACRpkdYQa2BG_qxf5zY=7rks6O31ZF-BX0af3_u1MOgwfwxFSQ-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org> @ 2014-02-26 14:53 ` Jason Cooper 2014-03-07 1:26 ` Linus Walleij 0 siblings, 1 reply; 23+ messages in thread From: Jason Cooper @ 2014-02-26 14:53 UTC (permalink / raw) To: Linus Walleij Cc: Mark Rutland, Andrew Lunn, Russell King, Pawel Moll, Ian Campbell, linux-doc-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, Rob Herring, Rob Landley, Kumar Gala, Gregory Clement, linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org, Sebastian Hesselbarth On Wed, Feb 26, 2014 at 10:43:45AM +0100, Linus Walleij wrote: > On Wed, Feb 26, 2014 at 1:09 AM, Jason Cooper <jason-NLaQJdtUoK4Be96aLqz0jA@public.gmane.org> wrote: > > > Sebastian has now re-organized the branches as I asked, and I confirmed > > that the final result is the exact same as mine (diff is null). > > Okay! > > > Usually when I submit pull requests to arm-soc, they like to see the > > branches. That way if there is an error in one of them, they just drop > > the one branch and the others remain. > > > > Would you like them the same way? If so, I'll send the pulls to you > > tomorrow. > > Send me one big branch with everything on it. Sure. > Actually, I'd prefer to pull it in, rebase and sign off each patch > individually in my tree if that is not causing you problems. Actually, that would mess us up pretty badly. :( One of the reasons we take the effort to base off of -rc1 and create stable topic branches is so that the commit IDs don't change. This way, all the patches needed to boot the new mvebu SoCs (code intended for v3.15) can be boot tested from the mvebu/for-next branch, which is merge-tested and randconfig tested in linux-next. This all happens _before_ the merge window for v3.15. There have been huge benefits since we started doing this. In fact, just yesterday I committed three patches to fix issues discovered as a result of this process: edd9d3cffc90 watchdog: orion_wdt: Use %pa to print 'phys_addr_t' 1b82af4f1749 ARM: kirkwood: select dtbs based on SoC a02dd0271d01 ARM: mvebu: select dtbs from MACH_ARMADA_* The first was discovered by Olof's autobuilder, and the last two were discovered by Kevin's boot farm. If you rebase the branch, I'll have to drop it from our for-next tree to prevent conflicts in linux-next with your -next branch. Which means no one will be able to boot test the new SoCs without going through a lot of hunting to re-collect all the branches. The advantage of having mvebu/for-next in addition to linux-next is that should there be a boot failure, we can quickly determine whether it is a result of the mvebu code (mvebu/for-next fails) or something outside of mvebu (only linux-next fails). By keeping the commit IDs the same, the same branch can be in multiple trees all getting merged into linux-next. Currently, mvebu does this with arm-soc, clk, and irqchip. In those cases, those maintainers are the ones who send the pull requests to Linus, not us. > That way it is visible that the patches were funneled through pin > control. I'm a little confused by this. Once you merge the branch into one of yours, that merge commit is a part of the history. In fact, the branch is still intact for eternity. So by merging the branch, adding other patches, and signing the tip of the result, it should be clear it came through pinctrl, no? thx, Jason. -- 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 ^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PATCH 00/10] pinctrl: mvebu: remove hard-coded addresses from Dove pinctrl 2014-02-26 14:53 ` Jason Cooper @ 2014-03-07 1:26 ` Linus Walleij 2014-03-07 2:16 ` Jason Cooper 0 siblings, 1 reply; 23+ messages in thread From: Linus Walleij @ 2014-03-07 1:26 UTC (permalink / raw) To: Jason Cooper Cc: Mark Rutland, Andrew Lunn, Russell King, Pawel Moll, Ian Campbell, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, Rob Herring, Rob Landley, Kumar Gala, Gregory Clement, linux-arm-kernel@lists.infradead.org, Sebastian Hesselbarth On Wed, Feb 26, 2014 at 10:53 PM, Jason Cooper <jason@lakedaemon.net> wrote: > On Wed, Feb 26, 2014 at 10:43:45AM +0100, Linus Walleij wrote: >> Actually, I'd prefer to pull it in, rebase and sign off each patch >> individually in my tree if that is not causing you problems. > > Actually, that would mess us up pretty badly. :( OK so I didn't do this, I just pulled it in :-) >> That way it is visible that the patches were funneled through pin >> control. > > I'm a little confused by this. Once you merge the branch into one of > yours, that merge commit is a part of the history. Yes this has been discussed in the past. But when a developer bisects down to a certain commit and just looks at it with git log there is no telling which subsystem this thing came from and who actually funnelled it to Torvalds. I do know you *can* find that out with some git magic, the problem is that it is so magic that most developers don't know it and just look at the signoffs. But it's not like I care super-much. Yours, Linus Walleij ^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PATCH 00/10] pinctrl: mvebu: remove hard-coded addresses from Dove pinctrl 2014-03-07 1:26 ` Linus Walleij @ 2014-03-07 2:16 ` Jason Cooper 2014-03-07 2:57 ` Yoshiyuki Ito 2014-03-07 3:47 ` Jason Cooper 0 siblings, 2 replies; 23+ messages in thread From: Jason Cooper @ 2014-03-07 2:16 UTC (permalink / raw) To: Linus Walleij Cc: Mark Rutland, Andrew Lunn, Russell King, Pawel Moll, Ian Campbell, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, Rob Herring, Rob Landley, Kumar Gala, Gregory Clement, linux-arm-kernel@lists.infradead.org, Sebastian Hesselbarth On Fri, Mar 07, 2014 at 09:26:48AM +0800, Linus Walleij wrote: > On Wed, Feb 26, 2014 at 10:53 PM, Jason Cooper <jason@lakedaemon.net> wrote: > > On Wed, Feb 26, 2014 at 10:43:45AM +0100, Linus Walleij wrote: > > >> Actually, I'd prefer to pull it in, rebase and sign off each patch > >> individually in my tree if that is not causing you problems. > > > > Actually, that would mess us up pretty badly. :( > > OK so I didn't do this, I just pulled it in :-) I could tell, Stephen would have had a heart attack :) > >> That way it is visible that the patches were funneled through pin > >> control. > > > > I'm a little confused by this. Once you merge the branch into one of > > yours, that merge commit is a part of the history. > > Yes this has been discussed in the past. Would you have a link handy? My first thought was to create a tag, eg "Sent-through: subsystem <maintainer@example.com>" that I would add to patches as I pull them in. After all, I know where I'm sending them. Or should at any rate. > But when a developer bisects down to a certain commit and just looks > at it with git log there is no telling which subsystem this thing came > from and who actually funnelled it to Torvalds. True. > I do know you *can* find that out with some git magic, the problem > is that it is so magic that most developers don't know it and just > look at the signoffs. It would be helpful if there were a complement to 'git merge-base', say 'git merge-tip' to point to the merge commit that joined the branch containing commit X. Run in succession, it would yield committers me (I merged pinctrl-dove into pinctrl), you, Torvalds. > But it's not like I care super-much. Well, if the code is perfect, we don't have to worry about a lazy developer bisecting down to one of our commits. ;-) btw - I have one last pull request I'll be sending tomorrow that's a couple of commits on top of what you currently have. It's very small, but we're avoiding locking ourselves into supporting a bad DT ABI. The real code change just downgrades a WARN(). The rest is correcting the binding doc. thx, Jason. ^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PATCH 00/10] pinctrl: mvebu: remove hard-coded addresses from Dove pinctrl 2014-03-07 2:16 ` Jason Cooper @ 2014-03-07 2:57 ` Yoshiyuki Ito 2014-03-07 3:03 ` Jason Cooper 2014-03-07 3:47 ` Jason Cooper 1 sibling, 1 reply; 23+ messages in thread From: Yoshiyuki Ito @ 2014-03-07 2:57 UTC (permalink / raw) To: jason Cc: linus.walleij, mark.rutland, andrew, linux, pawel.moll, linux-doc, ijc+devicetree, linux-kernel, devicetree, robh+dt, rob, galak, gregory.clement, linux-arm-kernel, sebastian.hesselbarth To: 渡辺さん、宗像さん 伊藤(義)です。 AGL、現状で公開されているもの、これから調べます。 L.F.のボードメンバーは、web上、以下のように掲載されていました。 Larry Augustin -- Individual Member Representative James Bottomley, Technical Advisory Board Member Mark Charlebois, Qualcomm Innovation Center, Inc. (QuIC) Alan Clark, SUSE Wim Coekaerts, Oracle Yoshiya Eto, Fujitsu Eileen Evans, Hewlett-Packard Frank Fanzilli Doug Fisher, Intel Dan Frye, IBM Bdale Garbee, Individual Member Representative Hisashi Hashimoto, Hitachi KIM Myung-Joon, ETRI Young Yoon Kim, Samsung Electronics Mark Lee, Splashtop Tsugikazu Shibata, NEC LFのメンバ企業ですが、メンバーリストを公開しているページは、 logoが並んでいるだけなので、各社のURLを抜き出しました(アル ファベット順です)。 プラチナが、富士通、HP、IBM、INTEL、NEC、オラクル、Qualcomm、 サムスン ゴールドが、チャイナモバイル、CISCO、Citrix、ETRL、Google、 日立、Huawei、Netapp、NYSEテクノロジーズ、パナソニック、 SuSE、トヨタ Platinum Members www.fujitsu.com www.hp.com www.ibm.com www.intel.com www.nec.com www.oracle.com www.quicinc.com www.samsung.com Gold Members www.chinamobileltd.com www.cisco.com www.citrix.com www.etri.re.kr www.google.com www.hitachi.com www.huawei.com www.netapp.com nysetechnologies.nyx.com www.panasonic.com www.suse.com www.toyota.com Silver Members www.4linux.com.br www.6wind.com www.aavamobile.com www.aboveit.nl www.adeneo-embedded.com www.adobe.com www.advancedtelematic.com www.aisin-aw.co.jp www.allgosystems.com www.amarulasolutions.com aws.amazon.com www.amd.com www.antelink.com www.arm.com www.ashisuto.co.jp www.autonomicresources.com www.axis.com www.bn.com www.basyskom.com www.blackducksoftware.com www.bloombase.com www.bluecatnetworks.com www.borqs.com www.brightone.de www.broadcom.com www.bromium.com www.bt.com www.bull.com www.ca.com www.calix.com www.calxeda.com www.canonical.com www.caviumnetworks.com www.cdac.in www.chelsio.com www.cinemo.com www.cloudius-systems.com www.cloudscaling.com www.cloudsigma.com www.cloudsoftcorp.com www.cme.com www.codero.com www.codethink.co.uk www.collabora.co.uk www.comarch.com www.componentality.com www.credativ.com www.csr.com www.cybercom.com www.cypress.com www.dlink.com www.dotrtt.com www.dell.com www.globaldenso.com www.denx.de www.dfs-ais.de www.docker.io www.dreamhost.com www.dreamworks.com www.emc.com www.enea.com www.epson.com www.erlang-solutions.com www.eucalyptus.com exegy.com feuerlabs.com www.fixnetix.com www.fluendo.com www.freescale.com www.fusionio.com www.gazzang.com www.genymobile.com gsmart.gigabytecm.com www.goahead.com www.harman.com www.hgst.com www.hisense.com www.hostconcepts.com hsafoundation.com www.hyundai.com www.ics.com www.igalia.com www.inktank.com www.innominds.com www.interactivedata.com www.intrinsyc.com www.ixonos.com www.jaguarlandrover.com www.jpmorgan.com www.jvckenwood.com adaptxt.com www.lanedo.com www.lexisnexis.ca www.lexmark.com www.lg.com www.lineo.co.jp www.linpus.com www.lpi.org www.lsi.com www.mandriva.com www.marvell.com www.meinbergglobal.com www.mellanox.com www.mentor.com www.meyersound.com www.micware.co.jp www.mindspeed.com www.mips.com www.mocana.com www.nebula.com www.nexb.com www.nicira.com www.nipa.kr www.nissan-global.com www.nixu.com www.nokia.com www.ntt.co.jp nttd-mse.com nvidia.com www.osssystems.com www.omnibond.com www.op5.com www.openlogic.com www.osadl.org owncloud.org www.palamida.com www.parallels.com www.pelagicore.com www.perforce.com www.pingwinsoft.ru pioneer.jp www.produban.com www.profusion.mobi www.protecode.com www.proxmox.com www.pt.com www.puzzle.ch www.atheros.com reaktor.fi www.redhat.com www.renesas.com www.ricoh.com rusbitech.ru www.savoirfairelinux.com www.scalecomputing.com www.servergy.com www.siemens.com www.sim.com www.softlayer.com www.solarflare.com www.sonatype.com www.sony.com www.spectracoretech.com www.splashtop.com www.stericsson.com www.stec-inc.com www.suntec.net www.superb.net www.symbio.com www.symphonyteleca.com www.synopsys.com www.systena.co.jp www.ti.com www.ramsan.com www.thomas-krenn.com www.thundersoft.com www.tieto.com www.timesys.com www.toshiba.com www.toyotsu-electronics.co.jp www.travelping.com www.ts-a.com www.turbosystems.co.jp www.tuxera.com twitter.com www.valvesoftware.com www.via.com www.vbridges.com www.vmware.com www.wargaming.net www.windriver.com www.yahoo.com www.zenoss.com wwwen.zte.com.cn Affiliates www.cicc.or.jp www.konkuk.ac.kr www.oamk.fi www.senecac.on.ca www.soongsil.ac.kr trace.wisc.edu ^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PATCH 00/10] pinctrl: mvebu: remove hard-coded addresses from Dove pinctrl 2014-03-07 2:57 ` Yoshiyuki Ito @ 2014-03-07 3:03 ` Jason Cooper 2014-03-07 3:08 ` YOSHIYUKI ITO 0 siblings, 1 reply; 23+ messages in thread From: Jason Cooper @ 2014-03-07 3:03 UTC (permalink / raw) To: Yoshiyuki Ito Cc: linus.walleij, mark.rutland, andrew, linux, pawel.moll, linux-doc, ijc+devicetree, linux-kernel, devicetree, robh+dt, rob, galak, gregory.clement, linux-arm-kernel, sebastian.hesselbarth Yoshiyuki, Umm, I'm pretty sure you didn't send this to who you thought you did. :) thx, Jason. On Fri, Mar 07, 2014 at 11:57:09AM +0900, Yoshiyuki Ito wrote: > > ... something which might have been private but I don't speak Japanese > (?) ... ^ permalink raw reply [flat|nested] 23+ messages in thread
* RE: [PATCH 00/10] pinctrl: mvebu: remove hard-coded addresses from Dove pinctrl 2014-03-07 3:03 ` Jason Cooper @ 2014-03-07 3:08 ` YOSHIYUKI ITO 0 siblings, 0 replies; 23+ messages in thread From: YOSHIYUKI ITO @ 2014-03-07 3:08 UTC (permalink / raw) To: Jason Cooper Cc: linus.walleij@linaro.org, mark.rutland@arm.com, andrew@lunn.ch, linux@arm.linux.org.uk, pawel.moll@arm.com, linux-doc@vger.kernel.org, ijc+devicetree@hellion.org.uk, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, robh+dt@kernel.org, rob@landley.net, galak@codeaurora.org, gregory.clement@free-electrons.com, linux-arm-kernel@lists.infradead.org, sebastian.hesselbarth@gmail.com Hi Jason and all other recipients, I'm sorry to my mis operation.. Please ignore my odd mail last I sent. I have to check my mailer. Regards, Yoshiyuki Ito. -----Original Message----- From: Jason Cooper [mailto:jason@lakedaemon.net] Sent: Friday, March 07, 2014 12:04 PM To: YOSHIYUKI ITO Cc: linus.walleij@linaro.org; mark.rutland@arm.com; andrew@lunn.ch; linux@arm.linux.org.uk; pawel.moll@arm.com; linux-doc@vger.kernel.org; ijc+devicetree@hellion.org.uk; linux-kernel@vger.kernel.org; devicetree@vger.kernel.org; robh+dt@kernel.org; rob@landley.net; galak@codeaurora.org; gregory.clement@free-electrons.com; linux-arm-kernel@lists.infradead.org; sebastian.hesselbarth@gmail.com Subject: Re: [PATCH 00/10] pinctrl: mvebu: remove hard-coded addresses from Dove pinctrl Yoshiyuki, Umm, I'm pretty sure you didn't send this to who you thought you did. :) thx, Jason. On Fri, Mar 07, 2014 at 11:57:09AM +0900, Yoshiyuki Ito wrote: > > ... something which might have been private but I don't speak Japanese > (?) ... ^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PATCH 00/10] pinctrl: mvebu: remove hard-coded addresses from Dove pinctrl 2014-03-07 2:16 ` Jason Cooper 2014-03-07 2:57 ` Yoshiyuki Ito @ 2014-03-07 3:47 ` Jason Cooper 2014-03-07 3:54 ` Linus Walleij 1 sibling, 1 reply; 23+ messages in thread From: Jason Cooper @ 2014-03-07 3:47 UTC (permalink / raw) To: Linus Walleij Cc: Mark Rutland, Andrew Lunn, Russell King, Pawel Moll, Ian Campbell, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, Rob Herring, Rob Landley, Kumar Gala, Gregory Clement, linux-arm-kernel@lists.infradead.org, Sebastian Hesselbarth On Thu, Mar 06, 2014 at 09:16:33PM -0500, Jason Cooper wrote: > On Fri, Mar 07, 2014 at 09:26:48AM +0800, Linus Walleij wrote: > > On Wed, Feb 26, 2014 at 10:53 PM, Jason Cooper <jason@lakedaemon.net> wrote: ... > > > I'm a little confused by this. Once you merge the branch into one of > > > yours, that merge commit is a part of the history. > > > > Yes this has been discussed in the past. > > Would you have a link handy? My first thought was to create a tag, eg > "Sent-through: subsystem <maintainer@example.com>" that I would add to > patches as I pull them in. After all, I know where I'm sending them. > Or should at any rate. > > > But when a developer bisects down to a certain commit and just looks > > at it with git log there is no telling which subsystem this thing came > > from and who actually funnelled it to Torvalds. > > True. > > > I do know you *can* find that out with some git magic, the problem > > is that it is so magic that most developers don't know it and just > > look at the signoffs. > > It would be helpful if there were a complement to 'git merge-base', say > 'git merge-tip' to point to the merge commit that joined the branch > containing commit X. > > Run in succession, it would yield committers me (I merged pinctrl-dove > into pinctrl), you, Torvalds. grrr. Couldn't let it go. If you add this alias: merged-by-who = log --ancestry-path --reverse --merges --format=\"%h %cD \\\"%cN <%cE>\\\"\" to you ~/.gitconfig, then $ git merged-by-who 2c4b229bafcf..pinctrl/for-next 08d4f0c8b131 Sat, 1 Mar 2014 07:03:36 +0000 "Jason Cooper <jason@lakedaemon.net>" 7cab36e5eee9 Sat, 1 Mar 2014 07:03:52 +0000 "Jason Cooper <jason@lakedaemon.net>" cdfe3175eb90 Mon, 3 Mar 2014 13:39:20 +0800 "Linus Walleij <linus.walleij@linaro.org>" a9ea2ed45a22 Mon, 3 Mar 2014 13:40:22 +0800 "Linus Walleij <linus.walleij@linaro.org>" 7bd0df13646d Wed, 5 Mar 2014 17:12:17 +0800 "Linus Walleij <linus.walleij@linaro.org>" Once it makes it to mainline, one could use origin/master for the bottom commit. thx, Jason. ^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PATCH 00/10] pinctrl: mvebu: remove hard-coded addresses from Dove pinctrl 2014-03-07 3:47 ` Jason Cooper @ 2014-03-07 3:54 ` Linus Walleij 0 siblings, 0 replies; 23+ messages in thread From: Linus Walleij @ 2014-03-07 3:54 UTC (permalink / raw) To: Jason Cooper Cc: Mark Rutland, Andrew Lunn, Russell King, Pawel Moll, linux-doc@vger.kernel.org, Ian Campbell, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, Rob Herring, Rob Landley, Kumar Gala, Gregory Clement, linux-arm-kernel@lists.infradead.org, Sebastian Hesselbarth On Fri, Mar 7, 2014 at 11:47 AM, Jason Cooper <jason@lakedaemon.net> wrote: > On Thu, Mar 06, 2014 at 09:16:33PM -0500, Jason Cooper wrote: >> On Fri, Mar 07, 2014 at 09:26:48AM +0800, Linus Walleij wrote: >> > On Wed, Feb 26, 2014 at 10:53 PM, Jason Cooper <jason@lakedaemon.net> wrote: > ... >> > > I'm a little confused by this. Once you merge the branch into one of >> > > yours, that merge commit is a part of the history. >> > >> > Yes this has been discussed in the past. >> >> Would you have a link handy? My first thought was to create a tag, eg >> "Sent-through: subsystem <maintainer@example.com>" that I would add to >> patches as I pull them in. After all, I know where I'm sending them. >> Or should at any rate. >> >> > But when a developer bisects down to a certain commit and just looks >> > at it with git log there is no telling which subsystem this thing came >> > from and who actually funnelled it to Torvalds. >> >> True. >> >> > I do know you *can* find that out with some git magic, the problem >> > is that it is so magic that most developers don't know it and just >> > look at the signoffs. >> >> It would be helpful if there were a complement to 'git merge-base', say >> 'git merge-tip' to point to the merge commit that joined the branch >> containing commit X. >> >> Run in succession, it would yield committers me (I merged pinctrl-dove >> into pinctrl), you, Torvalds. > > grrr. Couldn't let it go. If you add this alias: > > merged-by-who = log --ancestry-path --reverse --merges --format=\"%h %cD \\\"%cN <%cE>\\\"\" > > to you ~/.gitconfig, then > > $ git merged-by-who 2c4b229bafcf..pinctrl/for-next > 08d4f0c8b131 Sat, 1 Mar 2014 07:03:36 +0000 "Jason Cooper <jason@lakedaemon.net>" > 7cab36e5eee9 Sat, 1 Mar 2014 07:03:52 +0000 "Jason Cooper <jason@lakedaemon.net>" > cdfe3175eb90 Mon, 3 Mar 2014 13:39:20 +0800 "Linus Walleij <linus.walleij@linaro.org>" > a9ea2ed45a22 Mon, 3 Mar 2014 13:40:22 +0800 "Linus Walleij <linus.walleij@linaro.org>" > 7bd0df13646d Wed, 5 Mar 2014 17:12:17 +0800 "Linus Walleij <linus.walleij@linaro.org>" nifty alias, I added it to my .gitconfig. Yours, Linus Walleij ^ permalink raw reply [flat|nested] 23+ messages in thread
end of thread, other threads:[~2014-03-07 3:54 UTC | newest] Thread overview: 23+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2014-02-24 8:42 [PATCH 00/10] pinctrl: mvebu: remove hard-coded addresses from Dove pinctrl Sebastian Hesselbarth 2014-02-24 8:42 ` [PATCH 01/10] devicetree: bindings: add missing Marvell Dove SoC documentation Sebastian Hesselbarth 2014-02-24 8:42 ` [PATCH 02/10] devicetree: bindings: update MVEBU pinctrl binding documentation Sebastian Hesselbarth 2014-02-24 8:42 ` [PATCH 03/10] ARM: dove: add additional pinctrl registers Sebastian Hesselbarth 2014-02-24 8:42 ` [PATCH 04/10] ARM: dove: add global-config register node Sebastian Hesselbarth 2014-02-24 10:17 ` [PATCH 00/10] pinctrl: mvebu: remove hard-coded addresses from Dove pinctrl Linus Walleij 2014-02-24 10:20 ` Sebastian Hesselbarth [not found] ` <530B1CF4.2060208-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> 2014-02-24 11:50 ` Linus Walleij [not found] ` <1393231382-11078-1-git-send-email-sebastian.hesselbarth-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> 2014-02-24 18:10 ` Jason Cooper [not found] ` <20140224181023.GA1010-u4khhh1J0LxI1Ri9qeTfzeTW4wlIGRCZ@public.gmane.org> 2014-02-25 9:36 ` Linus Walleij 2014-02-25 15:16 ` Jason Cooper 2014-02-25 15:30 ` Sebastian Hesselbarth 2014-02-25 15:43 ` Jason Cooper [not found] ` <CACRpkdZ+YGTyDj6i8c198MdRtz3GY-YBmVO9LysPCcmT4EC0cg-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org> 2014-02-26 0:09 ` Jason Cooper 2014-02-26 9:43 ` Linus Walleij [not found] ` <CACRpkdYQa2BG_qxf5zY=7rks6O31ZF-BX0af3_u1MOgwfwxFSQ-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org> 2014-02-26 14:53 ` Jason Cooper 2014-03-07 1:26 ` Linus Walleij 2014-03-07 2:16 ` Jason Cooper 2014-03-07 2:57 ` Yoshiyuki Ito 2014-03-07 3:03 ` Jason Cooper 2014-03-07 3:08 ` YOSHIYUKI ITO 2014-03-07 3:47 ` Jason Cooper 2014-03-07 3:54 ` Linus Walleij
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).