Skip to contentSkip to conversation

memory: jz4780-nemc: Do not build by default

PATCH Applied Krzysztof Kozlowski 3 participants 11 messages Jul 28, 2020

Subsystems (2)
MIPS Memory controller drivers
lore
Share & tools
lore

Krzysztof Kozlowski

author maintainer
#0 lore raw

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

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 <[email protected]>

---

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(-)
drivers/memory/Kconfig +0 -1
index f64106fa63b7..8072204bc21a 100644
@@ -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
Signature · 1 line
2.17.1
author maintainer
#1 lore raw

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

The CONFIG_JZ4780_NEMC was previously a default on MIPS but now it has to be enabled manually.

Signed-off-by Krzysztof Kozlowski <[email protected]>

---

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(+)
arch/mips/configs/ci20_defconfig +1 -0
index e511fe0243a5..0a46199fdc3f 100644
@@ -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
arch/mips/configs/qi_lb60_defconfig +1 -0
index 97c9a69d1528..81bfbee72b0c 100644
@@ -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
arch/mips/configs/rs90_defconfig +1 -0
index 433ac5c0266a..de6752051ecc 100644
@@ -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
Signature · 1 line
2.17.1
Reviewed-by on v4 2/2
#2 lore raw

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

Hi Krzysztof,

Quoted 4 lines · 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 <[email protected]>

I think you should swap the two so that there are no problems when bisecting.

With that:

Reviewed-by Paul Cercueil <[email protected]>

Cheers,
-Paul

Quoted 50 lines

---

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(+)
arch/mips/configs/ci20_defconfig +1 -0
index e511fe0243a5..0a46199fdc3f 100644
@@ -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
arch/mips/configs/qi_lb60_defconfig +1 -0
index 97c9a69d1528..81bfbee72b0c 100644
@@ -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
arch/mips/configs/rs90_defconfig +1 -1
index 433ac5c0266a..de6752051ecc 100644
@@ -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

author maintainer
#3 lore raw

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

Quoted 11 lines · Paul Cercueil

Hi Krzysztof,

Le mar. 28 juil. 2020 à 12:45, Krzysztof Kozlowski <[email protected]> a écrit :

Quoted 4 lines

The CONFIG_JZ4780_NEMC was previously a default on MIPS but now it has to be enabled manually.

Signed-off-by Krzysztof Kozlowski <[email protected]>

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.

Quoted 3 lines

With that:

Reviewed-by Paul Cercueil <[email protected]>

Thanks,

Best regards,
Krzysztof

maintainer
#4 lore raw

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

Quoted 8 lines · Krzysztof Kozlowski
Quoted 7 lines · Paul Cercueil

Hi Krzysztof,

Le mar. 28 juil. 2020 à 12:45, Krzysztof Kozlowski <[email protected]> a écrit :

Quoted 3 lines

The CONFIG_JZ4780_NEMC was previously a default on MIPS but now it has to be enabled manually.

Quoted 8 lines
Quoted 4 lines
Quoted 1 line
Signed-off-by Krzysztof Kozlowski <[email protected]>

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.

Signature · 2 lines
Crap can work. Given enough thrust pigs will fly, but it's not necessarily a
good idea.                                                [ RFC1925, 2.3 ]
author maintainer
#5 lore raw

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

Quoted 14 lines · Thomas Bogendoerfer
Quoted 13 lines · Krzysztof Kozlowski
Quoted 11 lines · Paul Cercueil

Hi Krzysztof,

Le mar. 28 juil. 2020 à 12:45, Krzysztof Kozlowski <[email protected]> a écrit :

Quoted 4 lines

The CONFIG_JZ4780_NEMC was previously a default on MIPS but now it has to be enabled manually.

Signed-off-by Krzysztof Kozlowski <[email protected]>

I think you should swap the two so that there are no problems when bisecting.

Quoted 7 lines
Quoted 3 lines

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

#6 lore raw

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

Quoted 26 lines · Krzysztof Kozlowski
Quoted 25 lines · Thomas Bogendoerfer
Quoted 4 lines · Krzysztof Kozlowski
Quoted 3 lines · Paul Cercueil

Hi Krzysztof,

Le mar. 28 juil. 2020 à 12:45, Krzysztof Kozlowski

<[email protected]> a écrit

Quoted 2 lines
Quoted 2 lines

:

Quoted 1 line

The CONFIG_JZ4780_NEMC was previously a default on MIPS but

now it has

Quoted 5 lines
Quoted 5 lines
Quoted 3 lines

to be enabled manually.

Signed-off-by Krzysztof Kozlowski <[email protected]>

I think you should swap the two so that there are no problems

when

Quoted 3 lines
Quoted 1 line

bisecting.

Good point. I was thinking that it will go via some of MIPS trees

and

Quoted 1 line

the patch #1 will just wait a cycle. However with acks, I can

take it

Quoted 1 line

through drivers/memory tree.

I've acked the patch.

Quoted 8 lines
Quoted 1 line

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

author maintainer
#7 lore raw

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

Quoted 35 lines · Paul Cercueil

Le mar. 28 juil. 2020 à 14:00, Krzysztof Kozlowski <[email protected]> a écrit :

Quoted 31 lines · Thomas Bogendoerfer
Quoted 18 lines · Krzysztof Kozlowski
Quoted 4 lines · Paul Cercueil
Quoted 3 lines

Hi Krzysztof,

Le mar. 28 juil. 2020 à 12:45, Krzysztof Kozlowski

<[email protected]> a écrit

Quoted 2 lines
Quoted 2 lines

:

Quoted 1 line

The CONFIG_JZ4780_NEMC was previously a default on MIPS but

now it has

Quoted 5 lines
Quoted 5 lines
Quoted 3 lines

to be enabled manually.

Signed-off-by Krzysztof Kozlowski <[email protected]>

I think you should swap the two so that there are no problems

when

Quoted 3 lines
Quoted 1 line

bisecting.

Good point. I was thinking that it will go via some of MIPS trees

Quoted 8 lines

and

Quoted 1 line

the patch #1 will just wait a cycle. However with acks, I can

take it

Quoted 1 line

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.

Quoted 6 lines
Quoted 3 lines

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

maintainer Applied
#8 lore raw

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

Quoted 36 lines · Krzysztof Kozlowski
Quoted 35 lines · Paul Cercueil

Le mar. 28 juil. 2020 à 14:00, Krzysztof Kozlowski <[email protected]> a écrit :

Quoted 31 lines · Thomas Bogendoerfer
Quoted 18 lines · Krzysztof Kozlowski
Quoted 4 lines · Paul Cercueil
Quoted 3 lines

Hi Krzysztof,

Le mar. 28 juil. 2020 à 12:45, Krzysztof Kozlowski

<[email protected]> a écrit

Quoted 2 lines
Quoted 2 lines

:

Quoted 1 line

The CONFIG_JZ4780_NEMC was previously a default on MIPS but

now it has

Quoted 5 lines
Quoted 5 lines
Quoted 3 lines

to be enabled manually.

Signed-off-by Krzysztof Kozlowski <[email protected]>

I think you should swap the two so that there are no problems

when

Quoted 3 lines
Quoted 1 line

bisecting.

Good point. I was thinking that it will go via some of MIPS trees

Quoted 8 lines

and

Quoted 1 line

the patch #1 will just wait a cycle. However with acks, I can

take it

Quoted 1 line

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.

Quoted 8 lines
Quoted 6 lines
Quoted 3 lines

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.

Signature · 2 lines
Crap can work. Given enough thrust pigs will fly, but it's not necessarily a
good idea.                                                [ RFC1925, 2.3 ]
maintainer
#9 lore raw

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

In reply to Krzysztof Kozlowski
Quoted 21 lines · Krzysztof Kozlowski
Quoted 20 lines · Thomas Bogendoerfer
Quoted 8 lines · Krzysztof Kozlowski
Quoted 7 lines · Paul Cercueil

Hi Krzysztof,

Le mar. 28 juil. 2020 à 12:45, Krzysztof Kozlowski <[email protected]> a écrit :

Quoted 3 lines

The CONFIG_JZ4780_NEMC was previously a default on MIPS but now it has to be enabled manually.

Quoted 8 lines
Quoted 4 lines
Quoted 1 line
Signed-off-by Krzysztof Kozlowski <[email protected]>

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.

Quoted 8 lines
Quoted 1 line

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.

Signature · 2 lines
Crap can work. Given enough thrust pigs will fly, but it's not necessarily a
good idea.                                                [ RFC1925, 2.3 ]
maintainer Acked-by on v4 2/2
#10 lore raw

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

In reply to Krzysztof Kozlowski
Quoted 4 lines · 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 <[email protected]>
Acked-by Thomas Bogendoerfer <[email protected]>

Thomas.

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