| Message ID | 20190411230221.31362-4-digetx@gmail.com |
|---|---|
| State | Deferred |
| Headers | show |
| Series | memory: Introduce NVIDIA Tegra30 EMC driver | expand |
On Fri, Apr 12, 2019 at 02:02:21AM +0300, Dmitry Osipenko wrote: > Add Add External Memory Controller node to the device-tree. > One 'Add' is enough I think :) Peter. > Signed-off-by: Dmitry Osipenko <digetx@gmail.com> > --- > arch/arm/boot/dts/tegra30.dtsi | 11 +++++++++++ > drivers/memory/tegra/tegra30-emc.c | 3 ++- > 2 files changed, 13 insertions(+), 1 deletion(-) > > diff --git a/arch/arm/boot/dts/tegra30.dtsi b/arch/arm/boot/dts/tegra30.dtsi > index e074258d4518..92c4aeafab29 100644 > --- a/arch/arm/boot/dts/tegra30.dtsi > +++ b/arch/arm/boot/dts/tegra30.dtsi > @@ -732,6 +732,17 @@ > #reset-cells = <1>; > }; > > + memory-controller@7000f400 { > + compatible = "nvidia,tegra30-emc"; > + reg = <0x7000f400 0x400>; > + interrupts = <GIC_SPI 78 IRQ_TYPE_LEVEL_HIGH>; > + clocks = <&tegra_car TEGRA30_CLK_EMC>; > + #address-cells = <1>; > + #size-cells = <0>; > + > + nvidia,memory-controller = <&mc>; > + }; > + > fuse@7000f800 { > compatible = "nvidia,tegra30-efuse"; > reg = <0x7000f800 0x400>; > diff --git a/drivers/memory/tegra/tegra30-emc.c b/drivers/memory/tegra/tegra30-emc.c > index 38ebdb076ccd..defdb38bde54 100644 > --- a/drivers/memory/tegra/tegra30-emc.c > +++ b/drivers/memory/tegra/tegra30-emc.c > @@ -980,7 +980,8 @@ static long emc_round_rate(unsigned long rate, > } > > if (!timing) { > - dev_err(emc->dev, "no timing for rate %lu\n", rate); > + dev_err(emc->dev, "no timing for rate %lu min %lu max %lu\n", > + rate, min_rate, max_rate); > return -EINVAL; > } > > -- > 2.21.0 >
On Fri, Apr 12, 2019 at 02:02:21AM +0300, Dmitry Osipenko wrote: > Add Add External Memory Controller node to the device-tree. > > Signed-off-by: Dmitry Osipenko <digetx@gmail.com> > --- .. > diff --git a/drivers/memory/tegra/tegra30-emc.c b/drivers/memory/tegra/tegra30-emc.c > index 38ebdb076ccd..defdb38bde54 100644 > --- a/drivers/memory/tegra/tegra30-emc.c > +++ b/drivers/memory/tegra/tegra30-emc.c > @@ -980,7 +980,8 @@ static long emc_round_rate(unsigned long rate, > } > > if (!timing) { > - dev_err(emc->dev, "no timing for rate %lu\n", rate); > + dev_err(emc->dev, "no timing for rate %lu min %lu max %lu\n", > + rate, min_rate, max_rate); > return -EINVAL; > } This doesn't seem to belong to this patch? Peter. > > -- > 2.21.0 >
12.04.2019 11:01, Peter De Schrijver пишет: > On Fri, Apr 12, 2019 at 02:02:21AM +0300, Dmitry Osipenko wrote: >> Add Add External Memory Controller node to the device-tree. >> > > One 'Add' is enough I think :) Indeed, thank you!
12.04.2019 11:06, Peter De Schrijver пишет: > On Fri, Apr 12, 2019 at 02:02:21AM +0300, Dmitry Osipenko wrote: >> Add Add External Memory Controller node to the device-tree. >> >> Signed-off-by: Dmitry Osipenko <digetx@gmail.com> >> --- > .. >> diff --git a/drivers/memory/tegra/tegra30-emc.c b/drivers/memory/tegra/tegra30-emc.c >> index 38ebdb076ccd..defdb38bde54 100644 >> --- a/drivers/memory/tegra/tegra30-emc.c >> +++ b/drivers/memory/tegra/tegra30-emc.c >> @@ -980,7 +980,8 @@ static long emc_round_rate(unsigned long rate, >> } >> >> if (!timing) { >> - dev_err(emc->dev, "no timing for rate %lu\n", rate); >> + dev_err(emc->dev, "no timing for rate %lu min %lu max %lu\n", >> + rate, min_rate, max_rate); >> return -EINVAL; >> } > > This doesn't seem to belong to this patch? Yes, I accidentally edited a wrong patch on rebase. Fixed it up for v2 already, thank you.
diff --git a/arch/arm/boot/dts/tegra30.dtsi b/arch/arm/boot/dts/tegra30.dtsi index e074258d4518..92c4aeafab29 100644 --- a/arch/arm/boot/dts/tegra30.dtsi +++ b/arch/arm/boot/dts/tegra30.dtsi @@ -732,6 +732,17 @@ #reset-cells = <1>; }; + memory-controller@7000f400 { + compatible = "nvidia,tegra30-emc"; + reg = <0x7000f400 0x400>; + interrupts = <GIC_SPI 78 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&tegra_car TEGRA30_CLK_EMC>; + #address-cells = <1>; + #size-cells = <0>; + + nvidia,memory-controller = <&mc>; + }; + fuse@7000f800 { compatible = "nvidia,tegra30-efuse"; reg = <0x7000f800 0x400>; diff --git a/drivers/memory/tegra/tegra30-emc.c b/drivers/memory/tegra/tegra30-emc.c index 38ebdb076ccd..defdb38bde54 100644 --- a/drivers/memory/tegra/tegra30-emc.c +++ b/drivers/memory/tegra/tegra30-emc.c @@ -980,7 +980,8 @@ static long emc_round_rate(unsigned long rate, } if (!timing) { - dev_err(emc->dev, "no timing for rate %lu\n", rate); + dev_err(emc->dev, "no timing for rate %lu min %lu max %lu\n", + rate, min_rate, max_rate); return -EINVAL; }
Add Add External Memory Controller node to the device-tree. Signed-off-by: Dmitry Osipenko <digetx@gmail.com> --- arch/arm/boot/dts/tegra30.dtsi | 11 +++++++++++ drivers/memory/tegra/tegra30-emc.c | 3 ++- 2 files changed, 13 insertions(+), 1 deletion(-)