| Message ID | 1437384726-24927-1-git-send-email-josh.wu@atmel.com |
|---|---|
| State | Accepted, archived |
| Commit | 1ae25d626cfe7e11adc2c3e71d0de1f882954ef3 |
| Headers | show |
On 20/07/2015 at 17:32:05 +0800, Josh Wu wrote : > This patch introduces a new compatible string: "atmel,sama5d3-rstc" and > new reset function for sama5d3 and later chips. > > As in sama5d3 or later chips, we don't have to shutdown the DDR > controller before reset. Shutdown the DDR controller before reset is a > workaround to avoid DDR signal driving the bus, but since sama5d3 and > later chips there is no such a conflict. > > So in this patch: > 1. the sama5d3 reset function only need to write the rstc register > and return. > 2. we can remove the code related with sama5d3 DDR controller as > we don't use it at all. > > Signed-off-by: Josh Wu <josh.wu@atmel.com> > Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com> Acked-by: Alexandre Belloni <alexandre.belloni@free-electrons.com> > --- > > Changes in v2: > - aligned the function parameters to be consist with the coding style > - refined the commit log > - add binding document changes > - use of_device_is_compitable() instead > > .../devicetree/bindings/arm/atmel-at91.txt | 2 +- > drivers/power/reset/at91-reset.c | 26 ++++++++++++++++------ > 2 files changed, 20 insertions(+), 8 deletions(-) > > diff --git a/Documentation/devicetree/bindings/arm/atmel-at91.txt b/Documentation/devicetree/bindings/arm/atmel-at91.txt > index 424ac8c..dd998b9 100644 > --- a/Documentation/devicetree/bindings/arm/atmel-at91.txt > +++ b/Documentation/devicetree/bindings/arm/atmel-at91.txt > @@ -87,7 +87,7 @@ One interrupt per TC channel in a TC block: > > RSTC Reset Controller required properties: > - compatible: Should be "atmel,<chip>-rstc". > - <chip> can be "at91sam9260" or "at91sam9g45" > + <chip> can be "at91sam9260" or "at91sam9g45" or "sama5d3" > - reg: Should contain registers location and length > > Example: > diff --git a/drivers/power/reset/at91-reset.c b/drivers/power/reset/at91-reset.c > index 36dc52f..c378d4e 100644 > --- a/drivers/power/reset/at91-reset.c > +++ b/drivers/power/reset/at91-reset.c > @@ -123,6 +123,15 @@ static int at91sam9g45_restart(struct notifier_block *this, unsigned long mode, > return NOTIFY_DONE; > } > > +static int sama5d3_restart(struct notifier_block *this, unsigned long mode, > + void *cmd) > +{ > + writel(cpu_to_le32(AT91_RSTC_KEY | AT91_RSTC_PERRST | AT91_RSTC_PROCRST), > + at91_rstc_base); > + > + return NOTIFY_DONE; > +} > + > static void __init at91_reset_status(struct platform_device *pdev) > { > u32 reg = readl(at91_rstc_base + AT91_RSTC_SR); > @@ -155,13 +164,13 @@ static void __init at91_reset_status(struct platform_device *pdev) > static const struct of_device_id at91_ramc_of_match[] = { > { .compatible = "atmel,at91sam9260-sdramc", }, > { .compatible = "atmel,at91sam9g45-ddramc", }, > - { .compatible = "atmel,sama5d3-ddramc", }, > { /* sentinel */ } > }; > > static const struct of_device_id at91_reset_of_match[] = { > { .compatible = "atmel,at91sam9260-rstc", .data = at91sam9260_restart }, > { .compatible = "atmel,at91sam9g45-rstc", .data = at91sam9g45_restart }, > + { .compatible = "atmel,sama5d3-rstc", .data = sama5d3_restart }, > { /* sentinel */ } > }; > > @@ -181,13 +190,16 @@ static int at91_reset_of_probe(struct platform_device *pdev) > return -ENODEV; > } > > - for_each_matching_node(np, at91_ramc_of_match) { > - at91_ramc_base[idx] = of_iomap(np, 0); > - if (!at91_ramc_base[idx]) { > - dev_err(&pdev->dev, "Could not map ram controller address\n"); > - return -ENODEV; > + if (!of_device_is_compatible(pdev->dev.of_node, "atmel,sama5d3-rstc")) { > + /* we need to shutdown the ddr controller, so get ramc base */ > + for_each_matching_node(np, at91_ramc_of_match) { > + at91_ramc_base[idx] = of_iomap(np, 0); > + if (!at91_ramc_base[idx]) { > + dev_err(&pdev->dev, "Could not map ram controller address\n"); > + return -ENODEV; > + } > + idx++; > } > - idx++; > } > > match = of_match_node(at91_reset_of_match, pdev->dev.of_node); > -- > 1.9.1 >
On 20/07/2015 at 17:32:06 +0800, Josh Wu wrote : > They'll use "atmel,sama5d3-rstc" for reset function. > > Cc: devicetree@vger.kernel.org > Signed-off-by: Josh Wu <josh.wu@atmel.com> Acked-by: Alexandre Belloni <alexandre.belloni@free-electrons.com> > --- > > Changes in v2: None > > arch/arm/boot/dts/sama5d3.dtsi | 2 +- > arch/arm/boot/dts/sama5d4.dtsi | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/arch/arm/boot/dts/sama5d3.dtsi b/arch/arm/boot/dts/sama5d3.dtsi > index 9e2444b..280255b 100644 > --- a/arch/arm/boot/dts/sama5d3.dtsi > +++ b/arch/arm/boot/dts/sama5d3.dtsi > @@ -1259,7 +1259,7 @@ > }; > > rstc@fffffe00 { > - compatible = "atmel,at91sam9g45-rstc"; > + compatible = "atmel,sama5d3-rstc"; > reg = <0xfffffe00 0x10>; > }; > > diff --git a/arch/arm/boot/dts/sama5d4.dtsi b/arch/arm/boot/dts/sama5d4.dtsi > index 3ee22ee..481196c 100644 > --- a/arch/arm/boot/dts/sama5d4.dtsi > +++ b/arch/arm/boot/dts/sama5d4.dtsi > @@ -1277,7 +1277,7 @@ > }; > > rstc@fc068600 { > - compatible = "atmel,at91sam9g45-rstc"; > + compatible = "atmel,sama5d3-rstc"; > reg = <0xfc068600 0x10>; > }; > > -- > 1.9.1 >
Le 20/07/2015 11:32, Josh Wu a écrit : > They'll use "atmel,sama5d3-rstc" for reset function. > > Cc: devicetree@vger.kernel.org > Signed-off-by: Josh Wu <josh.wu@atmel.com> Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com> And we'll have to synchronize with the other patches. The best way to deal with that can be to take both of them with us through arm-soc. Sebastian, 1/ as you weren't in the CC list of the original patch, do you want me to re-send the whole series? 2/ can we take these driver's changes with use through the arm-soc git tree so that we can manage the synchronization better? Thanks, bye, > --- > > Changes in v2: None > > arch/arm/boot/dts/sama5d3.dtsi | 2 +- > arch/arm/boot/dts/sama5d4.dtsi | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/arch/arm/boot/dts/sama5d3.dtsi b/arch/arm/boot/dts/sama5d3.dtsi > index 9e2444b..280255b 100644 > --- a/arch/arm/boot/dts/sama5d3.dtsi > +++ b/arch/arm/boot/dts/sama5d3.dtsi > @@ -1259,7 +1259,7 @@ > }; > > rstc@fffffe00 { > - compatible = "atmel,at91sam9g45-rstc"; > + compatible = "atmel,sama5d3-rstc"; > reg = <0xfffffe00 0x10>; > }; > > diff --git a/arch/arm/boot/dts/sama5d4.dtsi b/arch/arm/boot/dts/sama5d4.dtsi > index 3ee22ee..481196c 100644 > --- a/arch/arm/boot/dts/sama5d4.dtsi > +++ b/arch/arm/boot/dts/sama5d4.dtsi > @@ -1277,7 +1277,7 @@ > }; > > rstc@fc068600 { > - compatible = "atmel,at91sam9g45-rstc"; > + compatible = "atmel,sama5d3-rstc"; > reg = <0xfc068600 0x10>; > }; > >
On 07/20/2015 02:32 AM, Josh Wu wrote: > This patch introduces a new compatible string: "atmel,sama5d3-rstc" and > new reset function for sama5d3 and later chips. > > As in sama5d3 or later chips, we don't have to shutdown the DDR > controller before reset. Shutdown the DDR controller before reset is a > workaround to avoid DDR signal driving the bus, but since sama5d3 and > later chips there is no such a conflict. > > So in this patch: > 1. the sama5d3 reset function only need to write the rstc register > and return. > 2. we can remove the code related with sama5d3 DDR controller as > we don't use it at all. > > Signed-off-by: Josh Wu <josh.wu@atmel.com> > Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com> Reviewed-by: Guenter Roeck <linux@roeck-us.net> > --- > > Changes in v2: > - aligned the function parameters to be consist with the coding style > - refined the commit log > - add binding document changes > - use of_device_is_compitable() instead > > .../devicetree/bindings/arm/atmel-at91.txt | 2 +- > drivers/power/reset/at91-reset.c | 26 ++++++++++++++++------ > 2 files changed, 20 insertions(+), 8 deletions(-) > > diff --git a/Documentation/devicetree/bindings/arm/atmel-at91.txt b/Documentation/devicetree/bindings/arm/atmel-at91.txt > index 424ac8c..dd998b9 100644 > --- a/Documentation/devicetree/bindings/arm/atmel-at91.txt > +++ b/Documentation/devicetree/bindings/arm/atmel-at91.txt > @@ -87,7 +87,7 @@ One interrupt per TC channel in a TC block: > > RSTC Reset Controller required properties: > - compatible: Should be "atmel,<chip>-rstc". > - <chip> can be "at91sam9260" or "at91sam9g45" > + <chip> can be "at91sam9260" or "at91sam9g45" or "sama5d3" > - reg: Should contain registers location and length > > Example: > diff --git a/drivers/power/reset/at91-reset.c b/drivers/power/reset/at91-reset.c > index 36dc52f..c378d4e 100644 > --- a/drivers/power/reset/at91-reset.c > +++ b/drivers/power/reset/at91-reset.c > @@ -123,6 +123,15 @@ static int at91sam9g45_restart(struct notifier_block *this, unsigned long mode, > return NOTIFY_DONE; > } > > +static int sama5d3_restart(struct notifier_block *this, unsigned long mode, > + void *cmd) > +{ > + writel(cpu_to_le32(AT91_RSTC_KEY | AT91_RSTC_PERRST | AT91_RSTC_PROCRST), > + at91_rstc_base); > + > + return NOTIFY_DONE; > +} > + > static void __init at91_reset_status(struct platform_device *pdev) > { > u32 reg = readl(at91_rstc_base + AT91_RSTC_SR); > @@ -155,13 +164,13 @@ static void __init at91_reset_status(struct platform_device *pdev) > static const struct of_device_id at91_ramc_of_match[] = { > { .compatible = "atmel,at91sam9260-sdramc", }, > { .compatible = "atmel,at91sam9g45-ddramc", }, > - { .compatible = "atmel,sama5d3-ddramc", }, > { /* sentinel */ } > }; > > static const struct of_device_id at91_reset_of_match[] = { > { .compatible = "atmel,at91sam9260-rstc", .data = at91sam9260_restart }, > { .compatible = "atmel,at91sam9g45-rstc", .data = at91sam9g45_restart }, > + { .compatible = "atmel,sama5d3-rstc", .data = sama5d3_restart }, > { /* sentinel */ } > }; > > @@ -181,13 +190,16 @@ static int at91_reset_of_probe(struct platform_device *pdev) > return -ENODEV; > } > > - for_each_matching_node(np, at91_ramc_of_match) { > - at91_ramc_base[idx] = of_iomap(np, 0); > - if (!at91_ramc_base[idx]) { > - dev_err(&pdev->dev, "Could not map ram controller address\n"); > - return -ENODEV; > + if (!of_device_is_compatible(pdev->dev.of_node, "atmel,sama5d3-rstc")) { > + /* we need to shutdown the ddr controller, so get ramc base */ > + for_each_matching_node(np, at91_ramc_of_match) { > + at91_ramc_base[idx] = of_iomap(np, 0); > + if (!at91_ramc_base[idx]) { > + dev_err(&pdev->dev, "Could not map ram controller address\n"); > + return -ENODEV; > + } > + idx++; > } > - idx++; > } > > match = of_match_node(at91_reset_of_match, pdev->dev.of_node); > -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Hi, On Mon, Jul 20, 2015 at 05:32:05PM +0800, Josh Wu wrote: > This patch introduces a new compatible string: "atmel,sama5d3-rstc" and > new reset function for sama5d3 and later chips. > > As in sama5d3 or later chips, we don't have to shutdown the DDR > controller before reset. Shutdown the DDR controller before reset is a > workaround to avoid DDR signal driving the bus, but since sama5d3 and > later chips there is no such a conflict. > > So in this patch: > 1. the sama5d3 reset function only need to write the rstc register > and return. > 2. we can remove the code related with sama5d3 DDR controller as > we don't use it at all. > > Signed-off-by: Josh Wu <josh.wu@atmel.com> > Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com> queued. -- Sebastian
Le 20/07/2015 18:42, Sebastian Reichel a écrit : > Hi, > > On Mon, Jul 20, 2015 at 05:32:05PM +0800, Josh Wu wrote: >> This patch introduces a new compatible string: "atmel,sama5d3-rstc" and >> new reset function for sama5d3 and later chips. >> >> As in sama5d3 or later chips, we don't have to shutdown the DDR >> controller before reset. Shutdown the DDR controller before reset is a >> workaround to avoid DDR signal driving the bus, but since sama5d3 and >> later chips there is no such a conflict. >> >> So in this patch: >> 1. the sama5d3 reset function only need to write the rstc register >> and return. >> 2. we can remove the code related with sama5d3 DDR controller as >> we don't use it at all. >> >> Signed-off-by: Josh Wu <josh.wu@atmel.com> >> Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com> > > queued. Sebastian, As my Device Tree changes depend on this modification, we can synchronize in tree ways: 1/ you provide me a stable branch so that I can pull it before applying my changes that can go through arm-soc. 2/ you let me take the driver's modifications with me and the two patches of the series would go through arm-soc. 3/ you take the second patch of my series with my Acked-by tag and carry both of them up to Linus' tree. Please tell me your preference. Thanks, bye,
Le 20/07/2015 14:37, Nicolas Ferre a écrit : > Le 20/07/2015 11:32, Josh Wu a écrit : >> They'll use "atmel,sama5d3-rstc" for reset function. >> >> Cc: devicetree@vger.kernel.org >> Signed-off-by: Josh Wu <josh.wu@atmel.com> > > Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com> > > And we'll have to synchronize with the other patches. The best way to > deal with that can be to take both of them with us through arm-soc. > > Sebastian, > > 1/ as you weren't in the CC list of the original patch, do you want me > to re-send the whole series? > > 2/ can we take these driver's changes with use through the arm-soc git > tree so that we can manage the synchronization better? Okay, so to ease synchronization, I take this one with me through arm-soc and add the old compatibility string as a fallback => the newer will be used when merged... Thanks, bye. > Thanks, bye, > >> --- >> >> Changes in v2: None >> >> arch/arm/boot/dts/sama5d3.dtsi | 2 +- >> arch/arm/boot/dts/sama5d4.dtsi | 2 +- >> 2 files changed, 2 insertions(+), 2 deletions(-) >> >> diff --git a/arch/arm/boot/dts/sama5d3.dtsi b/arch/arm/boot/dts/sama5d3.dtsi >> index 9e2444b..280255b 100644 >> --- a/arch/arm/boot/dts/sama5d3.dtsi >> +++ b/arch/arm/boot/dts/sama5d3.dtsi >> @@ -1259,7 +1259,7 @@ >> }; >> >> rstc@fffffe00 { >> - compatible = "atmel,at91sam9g45-rstc"; >> + compatible = "atmel,sama5d3-rstc"; >> reg = <0xfffffe00 0x10>; >> }; >> >> diff --git a/arch/arm/boot/dts/sama5d4.dtsi b/arch/arm/boot/dts/sama5d4.dtsi >> index 3ee22ee..481196c 100644 >> --- a/arch/arm/boot/dts/sama5d4.dtsi >> +++ b/arch/arm/boot/dts/sama5d4.dtsi >> @@ -1277,7 +1277,7 @@ >> }; >> >> rstc@fc068600 { >> - compatible = "atmel,at91sam9g45-rstc"; >> + compatible = "atmel,sama5d3-rstc"; >> reg = <0xfc068600 0x10>; >> }; >> >> > >
Hi Nicolas, On Tue, Jul 28, 2015 at 09:27:38AM +0200, Nicolas Ferre wrote: > >> This patch introduces a new compatible string: "atmel,sama5d3-rstc" and > >> new reset function for sama5d3 and later chips. > > > > queued. > > As my Device Tree changes depend on this modification, > we can synchronize in tree ways: Sorry for the delay. > 1/ you provide me a stable branch so that I can pull it before applying > my changes that can go through arm-soc. > > 2/ you let me take the driver's modifications with me and the two > patches of the series would go through arm-soc. > > 3/ you take the second patch of my series with my Acked-by tag and carry > both of them up to Linus' tree. I would be fine with all solutions, but 2/ would also require you handling another patch. I think your option 4/ is the best: > Okay, so to ease synchronization, I take this one with me through > arm-soc and add the old compatibility string as a fallback => the > newer will be used when merged... FWIW: Acked-By: Sebastian Reichel <sre@kernel.org> -- Sebastian
diff --git a/Documentation/devicetree/bindings/arm/atmel-at91.txt b/Documentation/devicetree/bindings/arm/atmel-at91.txt index 424ac8c..dd998b9 100644 --- a/Documentation/devicetree/bindings/arm/atmel-at91.txt +++ b/Documentation/devicetree/bindings/arm/atmel-at91.txt @@ -87,7 +87,7 @@ One interrupt per TC channel in a TC block: RSTC Reset Controller required properties: - compatible: Should be "atmel,<chip>-rstc". - <chip> can be "at91sam9260" or "at91sam9g45" + <chip> can be "at91sam9260" or "at91sam9g45" or "sama5d3" - reg: Should contain registers location and length Example: diff --git a/drivers/power/reset/at91-reset.c b/drivers/power/reset/at91-reset.c index 36dc52f..c378d4e 100644 --- a/drivers/power/reset/at91-reset.c +++ b/drivers/power/reset/at91-reset.c @@ -123,6 +123,15 @@ static int at91sam9g45_restart(struct notifier_block *this, unsigned long mode, return NOTIFY_DONE; } +static int sama5d3_restart(struct notifier_block *this, unsigned long mode, + void *cmd) +{ + writel(cpu_to_le32(AT91_RSTC_KEY | AT91_RSTC_PERRST | AT91_RSTC_PROCRST), + at91_rstc_base); + + return NOTIFY_DONE; +} + static void __init at91_reset_status(struct platform_device *pdev) { u32 reg = readl(at91_rstc_base + AT91_RSTC_SR); @@ -155,13 +164,13 @@ static void __init at91_reset_status(struct platform_device *pdev) static const struct of_device_id at91_ramc_of_match[] = { { .compatible = "atmel,at91sam9260-sdramc", }, { .compatible = "atmel,at91sam9g45-ddramc", }, - { .compatible = "atmel,sama5d3-ddramc", }, { /* sentinel */ } }; static const struct of_device_id at91_reset_of_match[] = { { .compatible = "atmel,at91sam9260-rstc", .data = at91sam9260_restart }, { .compatible = "atmel,at91sam9g45-rstc", .data = at91sam9g45_restart }, + { .compatible = "atmel,sama5d3-rstc", .data = sama5d3_restart }, { /* sentinel */ } }; @@ -181,13 +190,16 @@ static int at91_reset_of_probe(struct platform_device *pdev) return -ENODEV; } - for_each_matching_node(np, at91_ramc_of_match) { - at91_ramc_base[idx] = of_iomap(np, 0); - if (!at91_ramc_base[idx]) { - dev_err(&pdev->dev, "Could not map ram controller address\n"); - return -ENODEV; + if (!of_device_is_compatible(pdev->dev.of_node, "atmel,sama5d3-rstc")) { + /* we need to shutdown the ddr controller, so get ramc base */ + for_each_matching_node(np, at91_ramc_of_match) { + at91_ramc_base[idx] = of_iomap(np, 0); + if (!at91_ramc_base[idx]) { + dev_err(&pdev->dev, "Could not map ram controller address\n"); + return -ENODEV; + } + idx++; } - idx++; } match = of_match_node(at91_reset_of_match, pdev->dev.of_node);