mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-30 06:10:56 +00:00
Code Issues Releases Wiki Activity

Amlogic 32-bit DT changes for v4.18, round 2

Browse source 
- remove MACH_MESON8B, only used for building DTs
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEEe4dGDhaSf6n1v/EMWTcYmtP7xmUFAlsFpCUACgkQWTcYmtP7
 xmUg/A//Sqw57ztxf6gIDCWV6dKdiflt6aZwxf3qlWVagS5/93zRPavfdqLEGBzv
 mPOEY98dvFd65lMW6FscogRfeml3gKnhX/4Mew9L1PsShqYhvMPMSweuI6TOJ5KP
 YlfF3lnjElXBXgWval+YDfEn33iQbaQre10iQa+qEE9XlUoSK8jkkDd6zP2t481B
 EFl9nCvRydLENwtdsO6LnxeN8svFj/WQjdeuHXrMh/YECrphCA3eQVrGZLm6UtJU
 eY499ZcdxPZW6nU5PTvC+JQ+7r4AjArmjUyWgjYdljMGtWsWB/eXLTaUkTJvyFVg
 +yX2WI+R21d/YT8iJpQhM02HNXENgtHa3PsYFteO2PRgxtuGmD5C4tpL25FT62Dj
 wVxVJrPnAadA6yZ9X1OOMIP0Qd2X0cI02iruXCld48h3koVJUFHjlxxzk3XIi2+8
 1z0wNmTJd+I5HsNxLHLILy/rYsjM533FxyQvFROWCuMz+WhwF0Ypd/WrMvv7OnPl
 p52T1/0nSi+aHLRjaHV+jbh7TO+pattYQ7vwXimNy2ZrHhH0OlS5CseC9JAkQsei
 mXUORAlFhKIJr8LOSqWA+sj0MqCGE9//mC+JJyqvqDdtbYbR6idj0wLsfsA/1nub
 m8It2huFmrrTtr7q57kAnkoEpkOmfxqDDfnBfEfANFkBYqP18bc=
 =7Isa
 -----END PGP SIGNATURE-----

Merge tag 'amlogic-dt-2' of https://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic into next/dt

Amlogic 32-bit DT changes for v4.18, round 2
- remove MACH_MESON8B, only used for building DTs

* tag 'amlogic-dt-2' of https://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic:
  ARM: meson: merge Kconfig symbol MACH_MESON8B into MACH_MESON8
  ARM: dts: meson: build the Meson8b .dtbs with MACH_MESON8

Signed-off-by: Olof Johansson <olof@lixom.net>
This commit is contained in:
Olof Johansson 2018-05-25 14:48:38 -07:00
commit a17f6a89f0
2 changed files with 3 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
arch/arm/boot/dts/Makefile
View file

@ -314,14 +314,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

9
arch/arm/mach-meson/Kconfig
View file

@ -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