[PATCH v4 1/2] memory: jz4780-nemc: Do not build by default

[PATCH v4 1/2] memory: jz4780-nemc: Do not build by default

[Krzysztof Kozlowski]

Enabling the JZ4780_NEMC driver makes sense only for specific hardware -
the Ingenic SoC architecture.  It is not an essential driver for the SoC
support so do not enable it by default.

Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>

---

Changes since v3:
1. Just drop the default, don't touch depends
2. Drop second patch for MTD_NAND_JZ4780

Changes since v2:
1. MIPS -> MACH_INGENIC, as suggested by Arnd
---
 drivers/memory/Kconfig | 1 -
 1 file changed, 1 deletion(-)

diff --git a/drivers/memory/Kconfig b/drivers/memory/Kconfig
index f64106fa63b7..8072204bc21a 100644
--- a/drivers/memory/Kconfig
+++ b/drivers/memory/Kconfig
@@ -164,7 +164,6 @@ config FSL_IFC
 
 config JZ4780_NEMC
 	bool "Ingenic JZ4780 SoC NEMC driver"
-	default y
 	depends on MIPS || COMPILE_TEST
 	depends on HAS_IOMEM && OF
 	help
-- 
2.17.1

[PATCH v4 2/2] MIPS: ingenic: Enable JZ4780_NEMC manually

[Krzysztof Kozlowski]

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(+)

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

Re: [PATCH v4 2/2] MIPS: ingenic: Enable JZ4780_NEMC manually

[Paul Cercueil]

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
> 

Re: [PATCH v4 2/2] MIPS: ingenic: Enable JZ4780_NEMC manually

[Krzysztof Kozlowski]

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

Re: [PATCH v4 2/2] MIPS: ingenic: Enable JZ4780_NEMC manually

[Thomas Bogendoerfer]

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.

-- 
Crap can work. Given enough thrust pigs will fly, but it's not necessarily a
good idea.                                                [ RFC1925, 2.3 ]

Re: [PATCH v4 2/2] MIPS: ingenic: Enable JZ4780_NEMC manually

[Thomas Bogendoerfer]

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.

-- 
Crap can work. Given enough thrust pigs will fly, but it's not necessarily a
good idea.                                                [ RFC1925, 2.3 ]

Re: [PATCH v4 2/2] MIPS: ingenic: Enable JZ4780_NEMC manually

[Krzysztof Kozlowski]

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

Re: [PATCH v4 2/2] MIPS: ingenic: Enable JZ4780_NEMC manually

[Thomas Bogendoerfer]

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.

-- 
Crap can work. Given enough thrust pigs will fly, but it's not necessarily a
good idea.                                                [ RFC1925, 2.3 ]

Re: [PATCH v4 2/2] MIPS: ingenic: Enable JZ4780_NEMC manually

[Paul Cercueil]

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

Re: [PATCH v4 2/2] MIPS: ingenic: Enable JZ4780_NEMC manually

[Krzysztof Kozlowski]

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

Re: [PATCH v4 2/2] MIPS: ingenic: Enable JZ4780_NEMC manually

[Thomas Bogendoerfer]

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.

-- 
Crap can work. Given enough thrust pigs will fly, but it's not necessarily a
good idea.                                                [ RFC1925, 2.3 ]