[PATCH 0/2] get rid of Kconfig symbol MACH_MESON8B

[PATCH 0/2] get rid of Kconfig symbol MACH_MESON8B

[Martin Blumenstingl]

as noted by Kevin [0] there are two Kconfig symbols which only differ
in their Kconfig help text and the list of .dtbs that are being built.
the goal of this small series is to get rid of the unnecessary
MACH_MESON8B Kconfig symbol by merging it into MACH_MESON8.


[0] http://lists.infradead.org/pipermail/linux-amlogic/2018-May/007342.html

Martin Blumenstingl (2):
  ARM: dts: meson: build the Meson8b .dtbs with MACH_MESON8
  ARM: meson: merge Kconfig symbol MACH_MESON8B into MACH_MESON8

 arch/arm/boot/dts/Makefile  | 5 ++---
 arch/arm/mach-meson/Kconfig | 9 +--------
 2 files changed, 3 insertions(+), 11 deletions(-)

-- 
2.17.0

[PATCH 0/2] get rid of Kconfig symbol MACH_MESON8B

[Martin Blumenstingl]

as noted by Kevin [0] there are two Kconfig symbols which only differ
in their Kconfig help text and the list of .dtbs that are being built.
the goal of this small series is to get rid of the unnecessary
MACH_MESON8B Kconfig symbol by merging it into MACH_MESON8.


[0] http://lists.infradead.org/pipermail/linux-amlogic/2018-May/007342.html

Martin Blumenstingl (2):
  ARM: dts: meson: build the Meson8b .dtbs with MACH_MESON8
  ARM: meson: merge Kconfig symbol MACH_MESON8B into MACH_MESON8

 arch/arm/boot/dts/Makefile  | 5 ++---
 arch/arm/mach-meson/Kconfig | 9 +--------
 2 files changed, 3 insertions(+), 11 deletions(-)

-- 
2.17.0

[PATCH 1/2] ARM: dts: meson: build the Meson8b .dtbs with MACH_MESON8

[Martin Blumenstingl]

Currently there are two identical Kconfig options where only differences
are the Kconfig help text and the list of .dtbs that are built:
- MACH_MESON8
- MACH_MESON8B

Build the Meson8b .dtbs when MACH_MESON8 is selected to get rid of the
latter Kconfig symbol later.

Suggested-by: Kevin Hilman <khilman@baylibre.com>
Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
---
 arch/arm/boot/dts/Makefile | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index 4300e86049ee..b7f0b55e0dc5 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -313,14 +313,13 @@ dtb-$(CONFIG_MACH_MESON6) += \
 	meson6-atv1200.dtb
 dtb-$(CONFIG_MACH_MESON8) += \
 	meson8-minix-neo-x8.dtb \
+	meson8b-mxq.dtb \
+	meson8b-odroidc1.dtb \
 	meson8m2-mxiii-plus.dtb
 dtb-$(CONFIG_ARCH_MMP) += \
 	pxa168-aspenite.dtb \
 	pxa910-dkb.dtb \
 	mmp2-brownstone.dtb
-dtb-$(CONFIG_MACH_MESON8B) += \
-	meson8b-mxq.dtb \
-	meson8b-odroidc1.dtb
 dtb-$(CONFIG_ARCH_MPS2) += \
 	mps2-an385.dtb \
 	mps2-an399.dtb
-- 
2.17.0

[PATCH 1/2] ARM: dts: meson: build the Meson8b .dtbs with MACH_MESON8

[Martin Blumenstingl]

Currently there are two identical Kconfig options where only differences
are the Kconfig help text and the list of .dtbs that are built:
- MACH_MESON8
- MACH_MESON8B

Build the Meson8b .dtbs when MACH_MESON8 is selected to get rid of the
latter Kconfig symbol later.

Suggested-by: Kevin Hilman <khilman@baylibre.com>
Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
---
 arch/arm/boot/dts/Makefile | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index 4300e86049ee..b7f0b55e0dc5 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -313,14 +313,13 @@ dtb-$(CONFIG_MACH_MESON6) += \
 	meson6-atv1200.dtb
 dtb-$(CONFIG_MACH_MESON8) += \
 	meson8-minix-neo-x8.dtb \
+	meson8b-mxq.dtb \
+	meson8b-odroidc1.dtb \
 	meson8m2-mxiii-plus.dtb
 dtb-$(CONFIG_ARCH_MMP) += \
 	pxa168-aspenite.dtb \
 	pxa910-dkb.dtb \
 	mmp2-brownstone.dtb
-dtb-$(CONFIG_MACH_MESON8B) += \
-	meson8b-mxq.dtb \
-	meson8b-odroidc1.dtb
 dtb-$(CONFIG_ARCH_MPS2) += \
 	mps2-an385.dtb \
 	mps2-an399.dtb
-- 
2.17.0

[PATCH 2/2] ARM: meson: merge Kconfig symbol MACH_MESON8B into MACH_MESON8

[Martin Blumenstingl]

Currently there are no differences between the MACH_MESON8 and
MACH_MESON8B Kconfig symbols (except the help text). Since both
platforms are very similar (Meson8b being a slightly updated,
cost-reduced version of Meson8 which even shares some peripherals with
Meson8m2) no notable differences are expected in the future either.

Suggested-by: Kevin Hilman <khilman@baylibre.com>
Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
---
 arch/arm/mach-meson/Kconfig | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/arch/arm/mach-meson/Kconfig b/arch/arm/mach-meson/Kconfig
index 2bc630471beb..d51cfda953d4 100644
--- a/arch/arm/mach-meson/Kconfig
+++ b/arch/arm/mach-meson/Kconfig
@@ -19,14 +19,7 @@ config MACH_MESON6
 	select MESON6_TIMER
 
 config MACH_MESON8
-	bool "Amlogic Meson8 and Meson8m2 SoCs support"
-	default ARCH_MESON
-	select MESON6_TIMER
-	select COMMON_CLK_MESON8B
-	select MESON_IRQ_GPIO
-
-config MACH_MESON8B
-	bool "Amlogic Meson8b SoCs support"
+	bool "Amlogic Meson8, Meson8b and Meson8m2 SoCs support"
 	default ARCH_MESON
 	select MESON6_TIMER
 	select COMMON_CLK_MESON8B
-- 
2.17.0

[PATCH 2/2] ARM: meson: merge Kconfig symbol MACH_MESON8B into MACH_MESON8

[Martin Blumenstingl]

Currently there are no differences between the MACH_MESON8 and
MACH_MESON8B Kconfig symbols (except the help text). Since both
platforms are very similar (Meson8b being a slightly updated,
cost-reduced version of Meson8 which even shares some peripherals with
Meson8m2) no notable differences are expected in the future either.

Suggested-by: Kevin Hilman <khilman@baylibre.com>
Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
---
 arch/arm/mach-meson/Kconfig | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/arch/arm/mach-meson/Kconfig b/arch/arm/mach-meson/Kconfig
index 2bc630471beb..d51cfda953d4 100644
--- a/arch/arm/mach-meson/Kconfig
+++ b/arch/arm/mach-meson/Kconfig
@@ -19,14 +19,7 @@ config MACH_MESON6
 	select MESON6_TIMER
 
 config MACH_MESON8
-	bool "Amlogic Meson8 and Meson8m2 SoCs support"
-	default ARCH_MESON
-	select MESON6_TIMER
-	select COMMON_CLK_MESON8B
-	select MESON_IRQ_GPIO
-
-config MACH_MESON8B
-	bool "Amlogic Meson8b SoCs support"
+	bool "Amlogic Meson8, Meson8b and Meson8m2 SoCs support"
 	default ARCH_MESON
 	select MESON6_TIMER
 	select COMMON_CLK_MESON8B
-- 
2.17.0

[PATCH 0/2] get rid of Kconfig symbol MACH_MESON8B

[Jerome Brunet]

On Sun, 2018-05-20 at 19:23 +0200, Martin Blumenstingl wrote:
> as noted by Kevin [0] there are two Kconfig symbols which only differ
> in their Kconfig help text and the list of .dtbs that are being built.
> the goal of this small series is to get rid of the unnecessary
> MACH_MESON8B Kconfig symbol by merging it into MACH_MESON8.
> 
> 
> [0] http://lists.infradead.org/pipermail/linux-amlogic/2018-May/007342.html
> 
> Martin Blumenstingl (2):
>   ARM: dts: meson: build the Meson8b .dtbs with MACH_MESON8
>   ARM: meson: merge Kconfig symbol MACH_MESON8B into MACH_MESON8
> 
>  arch/arm/boot/dts/Makefile  | 5 ++---
>  arch/arm/mach-meson/Kconfig | 9 +--------
>  2 files changed, 3 insertions(+), 11 deletions(-)
> 

For the series:

Reviewed-by: Jerome Brunet <jbrunet@baylibre.com>

[PATCH 0/2] get rid of Kconfig symbol MACH_MESON8B

[Jerome Brunet]

On Sun, 2018-05-20 at 19:23 +0200, Martin Blumenstingl wrote:
> as noted by Kevin [0] there are two Kconfig symbols which only differ
> in their Kconfig help text and the list of .dtbs that are being built.
> the goal of this small series is to get rid of the unnecessary
> MACH_MESON8B Kconfig symbol by merging it into MACH_MESON8.
> 
> 
> [0] http://lists.infradead.org/pipermail/linux-amlogic/2018-May/007342.html
> 
> Martin Blumenstingl (2):
>   ARM: dts: meson: build the Meson8b .dtbs with MACH_MESON8
>   ARM: meson: merge Kconfig symbol MACH_MESON8B into MACH_MESON8
> 
>  arch/arm/boot/dts/Makefile  | 5 ++---
>  arch/arm/mach-meson/Kconfig | 9 +--------
>  2 files changed, 3 insertions(+), 11 deletions(-)
> 

For the series:

Reviewed-by: Jerome Brunet <jbrunet@baylibre.com>

[PATCH 0/2] get rid of Kconfig symbol MACH_MESON8B

[Kevin Hilman]

Martin Blumenstingl <martin.blumenstingl@googlemail.com> writes:

> as noted by Kevin [0] there are two Kconfig symbols which only differ
> in their Kconfig help text and the list of .dtbs that are being built.
> the goal of this small series is to get rid of the unnecessary
> MACH_MESON8B Kconfig symbol by merging it into MACH_MESON8.

Thanks for the cleanup.

Applied to v4.18/dt with Jerome's tag,

Kevin

[PATCH 0/2] get rid of Kconfig symbol MACH_MESON8B

[Kevin Hilman]

Martin Blumenstingl <martin.blumenstingl@googlemail.com> writes:

> as noted by Kevin [0] there are two Kconfig symbols which only differ
> in their Kconfig help text and the list of .dtbs that are being built.
> the goal of this small series is to get rid of the unnecessary
> MACH_MESON8B Kconfig symbol by merging it into MACH_MESON8.

Thanks for the cleanup.

Applied to v4.18/dt with Jerome's tag,

Kevin