| Message ID | 1368624323-24311-6-git-send-email-thomas.petazzoni@free-electrons.com (mailing list archive) |
|---|---|
| State | New, archived |
| Delegated to: | Bjorn Helgaas |
| Headers | show |
Quoting Thomas Petazzoni (2013-05-15 06:25:19) > The Armada 370 has two gatable clocks for each PCIe interface, and we > want both of them to be enabled. We therefore make one of the two > clocks a child of the other, as we did for the sataX and sataXlnk > clocks on Armada XP. > Ack for patches #5 and #6. Do you want me to take them? Regards, Mike > Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> > Cc: Mike Turquette <mturquette@linaro.org> > --- > drivers/clk/mvebu/clk-gating-ctrl.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/clk/mvebu/clk-gating-ctrl.c b/drivers/clk/mvebu/clk-gating-ctrl.c > index ebf141d..b35785a 100644 > --- a/drivers/clk/mvebu/clk-gating-ctrl.c > +++ b/drivers/clk/mvebu/clk-gating-ctrl.c > @@ -119,8 +119,8 @@ static const struct mvebu_soc_descr __initconst armada_370_gating_descr[] = { > { "pex1_en", NULL, 2 }, > { "ge1", NULL, 3 }, > { "ge0", NULL, 4 }, > - { "pex0", NULL, 5 }, > - { "pex1", NULL, 9 }, > + { "pex0", "pex0_en", 5 }, > + { "pex1", "pex1_en", 9 }, > { "sata0", NULL, 15 }, > { "sdio", NULL, 17 }, > { "tdm", NULL, 25 }, > -- > 1.7.9.5 -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Dear Mike Turquette, On Wed, 15 May 2013 14:41:54 -0700, Mike Turquette wrote: > Quoting Thomas Petazzoni (2013-05-15 06:25:19) > > The Armada 370 has two gatable clocks for each PCIe interface, and we > > want both of them to be enabled. We therefore make one of the two > > clocks a child of the other, as we did for the sataX and sataXlnk > > clocks on Armada XP. > > Ack for patches #5 and #6. Do you want me to take them? I don't know, I guess with your Ack, it would be easier to carry them through the Marvell maintainers and then the arm-soc tree, so that we can test arm-soc and have all the pieces needed in here. That said, Sebastian Hesselbarth has submitted a big rework of the mvebu clock drivers, which would conflict with this patch, and Sebastian's rework would most likely go through your tree. If that's the case, I guess it would be better to let you take #5 and #6 in this patch series. That's something to be discussed with the Marvell maintainers (Jason Cooper, Andrew Lunn, Gregory Clement). Thanks! Thomas
On 05/16/2013 09:44 AM, Thomas Petazzoni wrote: > Dear Mike Turquette, > > On Wed, 15 May 2013 14:41:54 -0700, Mike Turquette wrote: >> Quoting Thomas Petazzoni (2013-05-15 06:25:19) >>> The Armada 370 has two gatable clocks for each PCIe interface, and we >>> want both of them to be enabled. We therefore make one of the two >>> clocks a child of the other, as we did for the sataX and sataXlnk >>> clocks on Armada XP. >> >> Ack for patches #5 and #6. Do you want me to take them? > > I don't know, I guess with your Ack, it would be easier to carry them > through the Marvell maintainers and then the arm-soc tree, so that we > can test arm-soc and have all the pieces needed in here. > > That said, Sebastian Hesselbarth has submitted a big rework of the > mvebu clock drivers, which would conflict with this patch, and > Sebastian's rework would most likely go through your tree. If that's > the case, I guess it would be better to let you take #5 and #6 in this > patch series. I also requested to take the restructure patches through ARM tree. They are only touching files in drivers/clk/mvebu and by taking them through ARM, we can update PCIe clock patches easily. The dependency between Thomas' and my patches basically is that I renamed files that Thomas now commits to. (I switched clk/mvebu from per-function files to per-soc files). > That's something to be discussed with the Marvell maintainers (Jason > Cooper, Andrew Lunn, Gregory Clement). Sebastian -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Mike, Sebastian, On Thu, May 16, 2013 at 10:26:24AM +0200, Sebastian Hesselbarth wrote: > On 05/16/2013 09:44 AM, Thomas Petazzoni wrote: > >Dear Mike Turquette, > > > >On Wed, 15 May 2013 14:41:54 -0700, Mike Turquette wrote: > >>Quoting Thomas Petazzoni (2013-05-15 06:25:19) > >>>The Armada 370 has two gatable clocks for each PCIe interface, and we > >>>want both of them to be enabled. We therefore make one of the two > >>>clocks a child of the other, as we did for the sataX and sataXlnk > >>>clocks on Armada XP. > >> > >>Ack for patches #5 and #6. Do you want me to take them? Thanks for the Ack! > >I don't know, I guess with your Ack, it would be easier to carry them > >through the Marvell maintainers and then the arm-soc tree, so that we > >can test arm-soc and have all the pieces needed in here. > > > >That said, Sebastian Hesselbarth has submitted a big rework of the > >mvebu clock drivers, which would conflict with this patch, and > >Sebastian's rework would most likely go through your tree. If that's > >the case, I guess it would be better to let you take #5 and #6 in this > >patch series. > > I also requested to take the restructure patches through ARM tree. They > are only touching files in drivers/clk/mvebu and by taking them through > ARM, we can update PCIe clock patches easily. The dependency between > Thomas' and my patches basically is that I renamed files that Thomas > now commits to. (I switched clk/mvebu from per-function files to per-soc > files). I agree. My heart jumped into my throat a little there :) Mike, if it's ok with you, I'd prefer to take these through arm-soc. Any merge conflicts should be minimal. And at any rate, resolving the conflicts are *much* easier to handle than having arm-soc depend on an outside tree (then Linus has to take care in the order he merges them, no rebasing for clk tree, dogs and cats living together, etc ;-) ) thx, Jason. -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Quoting Jason Cooper (2013-05-16 08:06:16) > Mike, Sebastian, > > On Thu, May 16, 2013 at 10:26:24AM +0200, Sebastian Hesselbarth wrote: > > On 05/16/2013 09:44 AM, Thomas Petazzoni wrote: > > >Dear Mike Turquette, > > > > > >On Wed, 15 May 2013 14:41:54 -0700, Mike Turquette wrote: > > >>Quoting Thomas Petazzoni (2013-05-15 06:25:19) > > >>>The Armada 370 has two gatable clocks for each PCIe interface, and we > > >>>want both of them to be enabled. We therefore make one of the two > > >>>clocks a child of the other, as we did for the sataX and sataXlnk > > >>>clocks on Armada XP. > > >> > > >>Ack for patches #5 and #6. Do you want me to take them? > > Thanks for the Ack! > > > >I don't know, I guess with your Ack, it would be easier to carry them > > >through the Marvell maintainers and then the arm-soc tree, so that we > > >can test arm-soc and have all the pieces needed in here. > > > > > >That said, Sebastian Hesselbarth has submitted a big rework of the > > >mvebu clock drivers, which would conflict with this patch, and > > >Sebastian's rework would most likely go through your tree. If that's > > >the case, I guess it would be better to let you take #5 and #6 in this > > >patch series. > > > > I also requested to take the restructure patches through ARM tree. They > > are only touching files in drivers/clk/mvebu and by taking them through > > ARM, we can update PCIe clock patches easily. The dependency between > > Thomas' and my patches basically is that I renamed files that Thomas > > now commits to. (I switched clk/mvebu from per-function files to per-soc > > files). > > I agree. My heart jumped into my throat a little there :) Mike, if > it's ok with you, I'd prefer to take these through arm-soc. Any merge > conflicts should be minimal. And at any rate, resolving the conflicts > are *much* easier to handle than having arm-soc depend on an outside > tree (then Linus has to take care in the order he merges them, no > rebasing for clk tree, dogs and cats living together, etc ;-) ) > Yeah that all sounds good to me. I'll review the restructure patches shortly. Regards, Mike > thx, > > Jason. -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Fri, May 17, 2013 at 12:08:26AM -0700, Mike Turquette wrote: > Quoting Jason Cooper (2013-05-16 08:06:16) > > Mike, Sebastian, > > > > On Thu, May 16, 2013 at 10:26:24AM +0200, Sebastian Hesselbarth wrote: > > > On 05/16/2013 09:44 AM, Thomas Petazzoni wrote: > > > >Dear Mike Turquette, > > > > > > > >On Wed, 15 May 2013 14:41:54 -0700, Mike Turquette wrote: > > > >>Quoting Thomas Petazzoni (2013-05-15 06:25:19) > > > >>>The Armada 370 has two gatable clocks for each PCIe interface, and we > > > >>>want both of them to be enabled. We therefore make one of the two > > > >>>clocks a child of the other, as we did for the sataX and sataXlnk > > > >>>clocks on Armada XP. > > > >> > > > >>Ack for patches #5 and #6. Do you want me to take them? > > > > Thanks for the Ack! > > > > > >I don't know, I guess with your Ack, it would be easier to carry them > > > >through the Marvell maintainers and then the arm-soc tree, so that we > > > >can test arm-soc and have all the pieces needed in here. > > > > > > > >That said, Sebastian Hesselbarth has submitted a big rework of the > > > >mvebu clock drivers, which would conflict with this patch, and > > > >Sebastian's rework would most likely go through your tree. If that's > > > >the case, I guess it would be better to let you take #5 and #6 in this > > > >patch series. > > > > > > I also requested to take the restructure patches through ARM tree. They > > > are only touching files in drivers/clk/mvebu and by taking them through > > > ARM, we can update PCIe clock patches easily. The dependency between > > > Thomas' and my patches basically is that I renamed files that Thomas > > > now commits to. (I switched clk/mvebu from per-function files to per-soc > > > files). > > > > I agree. My heart jumped into my throat a little there :) Mike, if > > it's ok with you, I'd prefer to take these through arm-soc. Any merge > > conflicts should be minimal. And at any rate, resolving the conflicts > > are *much* easier to handle than having arm-soc depend on an outside > > tree (then Linus has to take care in the order he merges them, no > > rebasing for clk tree, dogs and cats living together, etc ;-) ) > > > > Yeah that all sounds good to me. I'll review the restructure patches > shortly. Awesome, thanks. Jason. -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/clk/mvebu/clk-gating-ctrl.c b/drivers/clk/mvebu/clk-gating-ctrl.c index ebf141d..b35785a 100644 --- a/drivers/clk/mvebu/clk-gating-ctrl.c +++ b/drivers/clk/mvebu/clk-gating-ctrl.c @@ -119,8 +119,8 @@ static const struct mvebu_soc_descr __initconst armada_370_gating_descr[] = { { "pex1_en", NULL, 2 }, { "ge1", NULL, 3 }, { "ge0", NULL, 4 }, - { "pex0", NULL, 5 }, - { "pex1", NULL, 9 }, + { "pex0", "pex0_en", 5 }, + { "pex1", "pex1_en", 9 }, { "sata0", NULL, 15 }, { "sdio", NULL, 17 }, { "tdm", NULL, 25 },
The Armada 370 has two gatable clocks for each PCIe interface, and we want both of them to be enabled. We therefore make one of the two clocks a child of the other, as we did for the sataX and sataXlnk clocks on Armada XP. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Cc: Mike Turquette <mturquette@linaro.org> --- drivers/clk/mvebu/clk-gating-ctrl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)