From: Abel Vesa <abel.vesa@nxp.com>
To: Shawn Guo <shawnguo@kernel.org>, Stephen Boyd <sboyd@kernel.org>,
Aisheng Dong <aisheng.dong@nxp.com>
Cc: "linux-clk@vger.kernel.org" <linux-clk@vger.kernel.org>,
Pengutronix Kernel Team <kernel@pengutronix.de>,
Olof Johansson <olof@lixom.net>,
"linux-arm-kernel@lists.infradead.org"
<linux-arm-kernel@lists.infradead.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
dl-linux-imx <linux-imx@nxp.com>, Rob Herring <robh@kernel.org>,
Will Deacon <will.deacon@arm.com>,
Lucas Stach <l.stach@pengutronix.de>,
Fabio Estevam <fabio.estevam@nxp.com>,
Abel Vesa <abel.vesa@nxp.com>
Subject: [PATCH 1/3] arm64: Remove CONFIG_SOC_IMX8MQ and use ARCH_MXC instead
Date: Thu, 13 Dec 2018 13:17:42 +0000 [thread overview]
Message-ID: <1544707047-4417-2-git-send-email-abel.vesa@nxp.com> (raw)
In-Reply-To: <1544707047-4417-1-git-send-email-abel.vesa@nxp.com>
To keep aligned with arm64, remove the unnecessary SOC_IMX8MQ and use
ARCH_MXC instead.
Signed-off-by: Abel Vesa <abel.vesa@nxp.com>
---
arch/arm64/Kconfig.platforms | 8 --------
arch/arm64/boot/dts/freescale/Makefile | 2 +-
drivers/clk/imx/Makefile | 3 ++-
drivers/phy/freescale/Kconfig | 2 +-
drivers/pinctrl/freescale/Kconfig | 2 +-
drivers/soc/imx/Kconfig | 2 +-
6 files changed, 6 insertions(+), 13 deletions(-)
diff --git a/arch/arm64/Kconfig.platforms b/arch/arm64/Kconfig.platforms
index 7e1545a..318dbb9 100644
--- a/arch/arm64/Kconfig.platforms
+++ b/arch/arm64/Kconfig.platforms
@@ -148,14 +148,6 @@ config ARCH_MXC
This enables support for the ARMv8 based SoCs in the
NXP i.MX family.
-config SOC_IMX8MQ
- bool "i.MX8MQ support"
- depends on ARCH_MXC
- select ARM64_ERRATUM_843419
- select ARM64_ERRATUM_845719
- help
- This enables support for the i.MX8MQ SoC.
-
config ARCH_QCOM
bool "Qualcomm Platforms"
select GPIOLIB
diff --git a/arch/arm64/boot/dts/freescale/Makefile b/arch/arm64/boot/dts/freescale/Makefile
index 0001361..f9be242 100644
--- a/arch/arm64/boot/dts/freescale/Makefile
+++ b/arch/arm64/boot/dts/freescale/Makefile
@@ -19,4 +19,4 @@ dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls2088a-rdb.dtb
dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-lx2160a-qds.dtb
dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-lx2160a-rdb.dtb
-dtb-$(CONFIG_SOC_IMX8MQ) += imx8mq-evk.dtb
+dtb-$(CONFIG_ARCH_MXC) += imx8mq-evk.dtb
diff --git a/drivers/clk/imx/Makefile b/drivers/clk/imx/Makefile
index 5c0b11e..62a1882 100644
--- a/drivers/clk/imx/Makefile
+++ b/drivers/clk/imx/Makefile
@@ -34,5 +34,6 @@ obj-$(CONFIG_SOC_IMX6SX) += clk-imx6sx.o
obj-$(CONFIG_SOC_IMX6UL) += clk-imx6ul.o
obj-$(CONFIG_SOC_IMX7D) += clk-imx7d.o
obj-$(CONFIG_SOC_IMX7ULP) += clk-imx7ulp.o
-obj-$(CONFIG_SOC_IMX8MQ) += clk-imx8mq.o
obj-$(CONFIG_SOC_VF610) += clk-vf610.o
+
+obj-$(CONFIG_ARCH_MXC) += clk-imx8mq.o
diff --git a/drivers/phy/freescale/Kconfig b/drivers/phy/freescale/Kconfig
index f050bd4..923c0ef 100644
--- a/drivers/phy/freescale/Kconfig
+++ b/drivers/phy/freescale/Kconfig
@@ -2,4 +2,4 @@ config PHY_FSL_IMX8MQ_USB
tristate "Freescale i.MX8M USB3 PHY"
depends on OF && HAS_IOMEM
select GENERIC_PHY
- default SOC_IMX8MQ
+ default ARCH_MXC
diff --git a/drivers/pinctrl/freescale/Kconfig b/drivers/pinctrl/freescale/Kconfig
index 2d6db43..9874a16 100644
--- a/drivers/pinctrl/freescale/Kconfig
+++ b/drivers/pinctrl/freescale/Kconfig
@@ -123,7 +123,7 @@ config PINCTRL_IMX7ULP
config PINCTRL_IMX8MQ
bool "IMX8MQ pinctrl driver"
- depends on SOC_IMX8MQ
+ depends on ARCH_MXC
select PINCTRL_IMX
help
Say Y here to enable the imx8mq pinctrl driver
diff --git a/drivers/soc/imx/Kconfig b/drivers/soc/imx/Kconfig
index 2112d18..7ffbb6b 100644
--- a/drivers/soc/imx/Kconfig
+++ b/drivers/soc/imx/Kconfig
@@ -2,7 +2,7 @@ menu "i.MX SoC drivers"
config IMX_GPCV2_PM_DOMAINS
bool "i.MX GPCv2 PM domains"
- depends on SOC_IMX7D || SOC_IMX8MQ || (COMPILE_TEST && OF)
+ depends on SOC_IMX7D || ARCH_MXC || (COMPILE_TEST && OF)
depends on PM
select PM_GENERIC_DOMAINS
default y if SOC_IMX7D
--
2.7.4
next prev parent reply other threads:[~2018-12-13 13:18 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-12-13 13:17 [PATCH 0/3] i.MX8MQ build dependency fixes Abel Vesa
2018-12-13 13:17 ` Abel Vesa [this message]
2018-12-13 14:35 ` [PATCH 1/3] arm64: Remove CONFIG_SOC_IMX8MQ and use ARCH_MXC instead Lucas Stach
2018-12-13 14:51 ` Abel Vesa
2018-12-14 1:12 ` Shawn Guo
2018-12-14 9:22 ` Lucas Stach
2018-12-14 12:41 ` Abel Vesa
2018-12-14 17:16 ` Stephen Boyd
2018-12-13 13:17 ` [PATCH 2/3] clk: imx: Build imx8mq clocks on arm64 only Abel Vesa
2018-12-13 13:24 ` Aisheng Dong
2018-12-13 13:17 ` [PATCH 3/3] arm64: Add i.MX8 boot necesarry configs to defconfig Abel Vesa
2018-12-13 13:22 ` [PATCH 0/3] i.MX8MQ build dependency fixes Abel Vesa
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1544707047-4417-2-git-send-email-abel.vesa@nxp.com \
--to=abel.vesa@nxp.com \
--cc=aisheng.dong@nxp.com \
--cc=fabio.estevam@nxp.com \
--cc=kernel@pengutronix.de \
--cc=l.stach@pengutronix.de \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-clk@vger.kernel.org \
--cc=linux-imx@nxp.com \
--cc=linux-kernel@vger.kernel.org \
--cc=olof@lixom.net \
--cc=robh@kernel.org \
--cc=sboyd@kernel.org \
--cc=shawnguo@kernel.org \
--cc=will.deacon@arm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).