| Message ID | 20200728104503.23655-2-krzk@kernel.org (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | 6bc9c1619de3a8a03b412c925404440566568a64 |
| Headers | show |
| Series | [v4,1/2] memory: jz4780-nemc: Do not build by default | expand |
Hi Krzysztof, Le mar. 28 juil. 2020 à 12:45, Krzysztof Kozlowski <krzk@kernel.org> a écrit : > The CONFIG_JZ4780_NEMC was previously a default on MIPS but now it has > to be enabled manually. > > Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org> I think you should swap the two so that there are no problems when bisecting. With that: Reviewed-by: Paul Cercueil <paul@crapouillou.net> Cheers, -Paul > > --- > > Changes since v3: > 1. New patch > --- > arch/mips/configs/ci20_defconfig | 1 + > arch/mips/configs/qi_lb60_defconfig | 1 + > arch/mips/configs/rs90_defconfig | 1 + > 3 files changed, 3 insertions(+) > > diff --git a/arch/mips/configs/ci20_defconfig > b/arch/mips/configs/ci20_defconfig > index e511fe0243a5..0a46199fdc3f 100644 > --- a/arch/mips/configs/ci20_defconfig > +++ b/arch/mips/configs/ci20_defconfig > @@ -128,6 +128,7 @@ CONFIG_DMA_JZ4780=y > CONFIG_INGENIC_OST=y > # CONFIG_IOMMU_SUPPORT is not set > CONFIG_MEMORY=y > +CONFIG_JZ4780_NEMC=y > CONFIG_PWM=y > CONFIG_PWM_JZ4740=m > CONFIG_EXT4_FS=y > diff --git a/arch/mips/configs/qi_lb60_defconfig > b/arch/mips/configs/qi_lb60_defconfig > index 97c9a69d1528..81bfbee72b0c 100644 > --- a/arch/mips/configs/qi_lb60_defconfig > +++ b/arch/mips/configs/qi_lb60_defconfig > @@ -108,6 +108,7 @@ CONFIG_RTC_DRV_JZ4740=y > CONFIG_DMADEVICES=y > CONFIG_DMA_JZ4780=y > CONFIG_MEMORY=y > +CONFIG_JZ4780_NEMC=y > CONFIG_IIO=y > CONFIG_INGENIC_ADC=y > CONFIG_PWM=y > diff --git a/arch/mips/configs/rs90_defconfig > b/arch/mips/configs/rs90_defconfig > index 433ac5c0266a..de6752051ecc 100644 > --- a/arch/mips/configs/rs90_defconfig > +++ b/arch/mips/configs/rs90_defconfig > @@ -145,6 +145,7 @@ CONFIG_DMA_JZ4780=y > CONFIG_INGENIC_OST=y > # CONFIG_IOMMU_SUPPORT is not set > CONFIG_MEMORY=y > +CONFIG_JZ4780_NEMC=y > CONFIG_IIO=y > CONFIG_INGENIC_ADC=y > CONFIG_IIO_RESCALE=y > -- > 2.17.1 >
On Tue, Jul 28, 2020 at 01:12:11PM +0200, Paul Cercueil wrote: > Hi Krzysztof, > > Le mar. 28 juil. 2020 à 12:45, Krzysztof Kozlowski <krzk@kernel.org> a écrit > : > > The CONFIG_JZ4780_NEMC was previously a default on MIPS but now it has > > to be enabled manually. > > > > Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org> > > I think you should swap the two so that there are no problems when > bisecting. Good point. I was thinking that it will go via some of MIPS trees and the patch #1 will just wait a cycle. However with acks, I can take it through drivers/memory tree. > > With that: > Reviewed-by: Paul Cercueil <paul@crapouillou.net> Thanks, Best regards, Krzysztof
On Tue, Jul 28, 2020 at 12:45:03PM +0200, Krzysztof Kozlowski wrote: > The CONFIG_JZ4780_NEMC was previously a default on MIPS but now it has > to be enabled manually. > > Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org> Acked-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de> Thomas.
On Tue, Jul 28, 2020 at 01:19:35PM +0200, Krzysztof Kozlowski wrote: > On Tue, Jul 28, 2020 at 01:12:11PM +0200, Paul Cercueil wrote: > > Hi Krzysztof, > > > > Le mar. 28 juil. 2020 à 12:45, Krzysztof Kozlowski <krzk@kernel.org> a écrit > > : > > > The CONFIG_JZ4780_NEMC was previously a default on MIPS but now it has > > > to be enabled manually. > > > > > > Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org> > > > > I think you should swap the two so that there are no problems when > > bisecting. > > Good point. I was thinking that it will go via some of MIPS trees and > the patch #1 will just wait a cycle. However with acks, I can take it > through drivers/memory tree. I've acked the patch. Thomas.
On Tue, Jul 28, 2020 at 01:37:02PM +0200, Thomas Bogendoerfer wrote: > On Tue, Jul 28, 2020 at 01:19:35PM +0200, Krzysztof Kozlowski wrote: > > On Tue, Jul 28, 2020 at 01:12:11PM +0200, Paul Cercueil wrote: > > > Hi Krzysztof, > > > > > > Le mar. 28 juil. 2020 à 12:45, Krzysztof Kozlowski <krzk@kernel.org> a écrit > > > : > > > > The CONFIG_JZ4780_NEMC was previously a default on MIPS but now it has > > > > to be enabled manually. > > > > > > > > Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org> > > > > > > I think you should swap the two so that there are no problems when > > > bisecting. > > > > Good point. I was thinking that it will go via some of MIPS trees and > > the patch #1 will just wait a cycle. However with acks, I can take it > > through drivers/memory tree. > > I've acked the patch. > > Thomas. Thanks but now I noticed that one of changed configs (arch/mips/configs/rs90_defconfig) is only in MIPS tree. I think it is easier then to take the patch #2 (configs) via MIPS and wait with #1 for the next cycle or also take it via MIPS if it applies cleanly. Best regards, Krzysztof
On Tue, Jul 28, 2020 at 02:00:35PM +0200, Krzysztof Kozlowski wrote: > On Tue, Jul 28, 2020 at 01:37:02PM +0200, Thomas Bogendoerfer wrote: > > On Tue, Jul 28, 2020 at 01:19:35PM +0200, Krzysztof Kozlowski wrote: > > > On Tue, Jul 28, 2020 at 01:12:11PM +0200, Paul Cercueil wrote: > > > > Hi Krzysztof, > > > > > > > > Le mar. 28 juil. 2020 à 12:45, Krzysztof Kozlowski <krzk@kernel.org> a écrit > > > > : > > > > > The CONFIG_JZ4780_NEMC was previously a default on MIPS but now it has > > > > > to be enabled manually. > > > > > > > > > > Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org> > > > > > > > > I think you should swap the two so that there are no problems when > > > > bisecting. > > > > > > Good point. I was thinking that it will go via some of MIPS trees and > > > the patch #1 will just wait a cycle. However with acks, I can take it > > > through drivers/memory tree. > > > > I've acked the patch. > > > > Thomas. > > Thanks but now I noticed that one of changed configs > (arch/mips/configs/rs90_defconfig) is only in MIPS tree. > > I think it is easier then to take the patch #2 (configs) via MIPS and > wait with #1 for the next cycle or also take it via MIPS if it applies > cleanly. ok, I'll take it. Thomas.
Le mar. 28 juil. 2020 à 14:00, Krzysztof Kozlowski <krzk@kernel.org> a écrit : > On Tue, Jul 28, 2020 at 01:37:02PM +0200, Thomas Bogendoerfer wrote: >> On Tue, Jul 28, 2020 at 01:19:35PM +0200, Krzysztof Kozlowski wrote: >> > On Tue, Jul 28, 2020 at 01:12:11PM +0200, Paul Cercueil wrote: >> > > Hi Krzysztof, >> > > >> > > Le mar. 28 juil. 2020 à 12:45, Krzysztof Kozlowski >> <krzk@kernel.org> a écrit >> > > : >> > > > The CONFIG_JZ4780_NEMC was previously a default on MIPS but >> now it has >> > > > to be enabled manually. >> > > > >> > > > Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org> >> > > >> > > I think you should swap the two so that there are no problems >> when >> > > bisecting. >> > >> > Good point. I was thinking that it will go via some of MIPS trees >> and >> > the patch #1 will just wait a cycle. However with acks, I can >> take it >> > through drivers/memory tree. >> >> I've acked the patch. >> >> Thomas. > > Thanks but now I noticed that one of changed configs > (arch/mips/configs/rs90_defconfig) is only in MIPS tree. > > I think it is easier then to take the patch #2 (configs) via MIPS and > wait with #1 for the next cycle or also take it via MIPS if it applies > cleanly. Why not take them both in the MIPS tree then? Would that conflict with changes in your tree? -Paul
On Tue, Jul 28, 2020 at 02:51:23PM +0200, Paul Cercueil wrote: > > > Le mar. 28 juil. 2020 à 14:00, Krzysztof Kozlowski <krzk@kernel.org> a écrit > : > > On Tue, Jul 28, 2020 at 01:37:02PM +0200, Thomas Bogendoerfer wrote: > > > On Tue, Jul 28, 2020 at 01:19:35PM +0200, Krzysztof Kozlowski wrote: > > > > On Tue, Jul 28, 2020 at 01:12:11PM +0200, Paul Cercueil wrote: > > > > > Hi Krzysztof, > > > > > > > > > > Le mar. 28 juil. 2020 à 12:45, Krzysztof Kozlowski > > > <krzk@kernel.org> a écrit > > > > > : > > > > > > The CONFIG_JZ4780_NEMC was previously a default on MIPS but > > > now it has > > > > > > to be enabled manually. > > > > > > > > > > > > Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org> > > > > > > > > > > I think you should swap the two so that there are no problems > > > when > > > > > bisecting. > > > > > > > > Good point. I was thinking that it will go via some of MIPS trees > > > and > > > > the patch #1 will just wait a cycle. However with acks, I can > > > take it > > > > through drivers/memory tree. > > > > > > I've acked the patch. > > > > > > Thomas. > > > > Thanks but now I noticed that one of changed configs > > (arch/mips/configs/rs90_defconfig) is only in MIPS tree. > > > > I think it is easier then to take the patch #2 (configs) via MIPS and > > wait with #1 for the next cycle or also take it via MIPS if it applies > > cleanly. > > Why not take them both in the MIPS tree then? Would that conflict with > changes in your tree? Exactly (last part of my sentence). There should be no conflicts. Best regards, Krzysztof
On Tue, Jul 28, 2020 at 02:53:08PM +0200, Krzysztof Kozlowski wrote: > On Tue, Jul 28, 2020 at 02:51:23PM +0200, Paul Cercueil wrote: > > > > > > Le mar. 28 juil. 2020 à 14:00, Krzysztof Kozlowski <krzk@kernel.org> a écrit > > : > > > On Tue, Jul 28, 2020 at 01:37:02PM +0200, Thomas Bogendoerfer wrote: > > > > On Tue, Jul 28, 2020 at 01:19:35PM +0200, Krzysztof Kozlowski wrote: > > > > > On Tue, Jul 28, 2020 at 01:12:11PM +0200, Paul Cercueil wrote: > > > > > > Hi Krzysztof, > > > > > > > > > > > > Le mar. 28 juil. 2020 à 12:45, Krzysztof Kozlowski > > > > <krzk@kernel.org> a écrit > > > > > > : > > > > > > > The CONFIG_JZ4780_NEMC was previously a default on MIPS but > > > > now it has > > > > > > > to be enabled manually. > > > > > > > > > > > > > > Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org> > > > > > > > > > > > > I think you should swap the two so that there are no problems > > > > when > > > > > > bisecting. > > > > > > > > > > Good point. I was thinking that it will go via some of MIPS trees > > > > and > > > > > the patch #1 will just wait a cycle. However with acks, I can > > > > take it > > > > > through drivers/memory tree. > > > > > > > > I've acked the patch. > > > > > > > > Thomas. > > > > > > Thanks but now I noticed that one of changed configs > > > (arch/mips/configs/rs90_defconfig) is only in MIPS tree. > > > > > > I think it is easier then to take the patch #2 (configs) via MIPS and > > > wait with #1 for the next cycle or also take it via MIPS if it applies > > > cleanly. > > > > Why not take them both in the MIPS tree then? Would that conflict with > > changes in your tree? > > Exactly (last part of my sentence). There should be no conflicts. I've applied both patches to mips-next. Thomas.
diff --git a/arch/mips/configs/ci20_defconfig b/arch/mips/configs/ci20_defconfig index e511fe0243a5..0a46199fdc3f 100644 --- a/arch/mips/configs/ci20_defconfig +++ b/arch/mips/configs/ci20_defconfig @@ -128,6 +128,7 @@ CONFIG_DMA_JZ4780=y CONFIG_INGENIC_OST=y # CONFIG_IOMMU_SUPPORT is not set CONFIG_MEMORY=y +CONFIG_JZ4780_NEMC=y CONFIG_PWM=y CONFIG_PWM_JZ4740=m CONFIG_EXT4_FS=y diff --git a/arch/mips/configs/qi_lb60_defconfig b/arch/mips/configs/qi_lb60_defconfig index 97c9a69d1528..81bfbee72b0c 100644 --- a/arch/mips/configs/qi_lb60_defconfig +++ b/arch/mips/configs/qi_lb60_defconfig @@ -108,6 +108,7 @@ CONFIG_RTC_DRV_JZ4740=y CONFIG_DMADEVICES=y CONFIG_DMA_JZ4780=y CONFIG_MEMORY=y +CONFIG_JZ4780_NEMC=y CONFIG_IIO=y CONFIG_INGENIC_ADC=y CONFIG_PWM=y diff --git a/arch/mips/configs/rs90_defconfig b/arch/mips/configs/rs90_defconfig index 433ac5c0266a..de6752051ecc 100644 --- a/arch/mips/configs/rs90_defconfig +++ b/arch/mips/configs/rs90_defconfig @@ -145,6 +145,7 @@ CONFIG_DMA_JZ4780=y CONFIG_INGENIC_OST=y # CONFIG_IOMMU_SUPPORT is not set CONFIG_MEMORY=y +CONFIG_JZ4780_NEMC=y CONFIG_IIO=y CONFIG_INGENIC_ADC=y CONFIG_IIO_RESCALE=y
The CONFIG_JZ4780_NEMC was previously a default on MIPS but now it has to be enabled manually. Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org> --- Changes since v3: 1. New patch --- arch/mips/configs/ci20_defconfig | 1 + arch/mips/configs/qi_lb60_defconfig | 1 + arch/mips/configs/rs90_defconfig | 1 + 3 files changed, 3 insertions(+)