Enable on-chip OTP NVMEM support for NXP i.MX and VF610 SoCs.
Since OTP values might be required by drivers required during
boot, make sure the driver is built-in (e.g. i.MX thermal
driver).
Signed-off-by: Stefan Agner <[email protected]>
---
arch/arm/configs/multi_v7_defconfig | 2 ++
1 file changed, 2 insertions(+)
diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig
index da7387689b88..6395425854cc 100644
--- a/arch/arm/configs/multi_v7_defconfig
+++ b/arch/arm/configs/multi_v7_defconfig
@@ -917,7 +917,9 @@ CONFIG_PHY_SAMSUNG_USB2=m
CONFIG_PHY_TEGRA_XUSB=y
CONFIG_PHY_BRCM_SATA=y
CONFIG_NVMEM=y
+CONFIG_NVMEM_IMX_OCOTP=y
CONFIG_NVMEM_SUNXI_SID=y
+CONFIG_NVMEM_VF610_OCOTP=y
CONFIG_BCM2835_MBOX=y
CONFIG_RASPBERRYPI_FIRMWARE=y
CONFIG_EFI_VARS=m
--
2.16.2
Enable drivers to support NXP graphics IPs such as:
- Etnaviv (e.g. i.MX6)
- DCU (e.g. Vybrid LS1021A)
- mxsfb (e.g. i.MX6UL/ULL/7)
Signed-off-by: Stefan Agner <[email protected]>
---
arch/arm/configs/multi_v7_defconfig | 3 +++
1 file changed, 3 insertions(+)
diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig
index 61968bd6cccc..403d0e7156aa 100644
--- a/arch/arm/configs/multi_v7_defconfig
+++ b/arch/arm/configs/multi_v7_defconfig
@@ -623,6 +623,7 @@ CONFIG_DRM_ATMEL_HLCDC=m
CONFIG_DRM_RCAR_DU=m
CONFIG_DRM_RCAR_LVDS=y
CONFIG_DRM_SUN4I=m
+CONFIG_DRM_FSL_DCU=m
CONFIG_DRM_TEGRA=y
CONFIG_DRM_PANEL_SAMSUNG_LD9040=m
CONFIG_DRM_PANEL_SAMSUNG_S6E8AA0=m
@@ -630,6 +631,8 @@ CONFIG_DRM_PANEL_SIMPLE=y
CONFIG_DRM_SII9234=m
CONFIG_DRM_STI=m
CONFIG_DRM_VC4=y
+CONFIG_DRM_ETNAVIV=m
+CONFIG_DRM_MXSFB=m
CONFIG_FB_ARMCLCD=y
CONFIG_FB_EFI=y
CONFIG_FB_WM8505=y
--
2.16.2
Enable FlexCAN support as module by default. FlexCAN can be found
on various NXP designs such as the i.MX and Vybrid SoC family.
Signed-off-by: Stefan Agner <[email protected]>
---
arch/arm/configs/multi_v7_defconfig | 1 +
1 file changed, 1 insertion(+)
diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig
index 984e509d41bf..61968bd6cccc 100644
--- a/arch/arm/configs/multi_v7_defconfig
+++ b/arch/arm/configs/multi_v7_defconfig
@@ -174,6 +174,7 @@ CONFIG_CAN_RAW=y
CONFIG_CAN_BCM=y
CONFIG_CAN_DEV=y
CONFIG_CAN_AT91=m
+CONFIG_CAN_FLEXCAN=m
CONFIG_CAN_RCAR=m
CONFIG_CAN_XILINXCAN=y
CONFIG_CAN_MCP251X=y
--
2.16.2
Add GPMI NAND controller support as required by some NXP i.MX6/7
based boards.
Signed-off-by: Stefan Agner <[email protected]>
---
arch/arm/configs/multi_v7_defconfig | 1 +
1 file changed, 1 insertion(+)
diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig
index 66c32741a130..984e509d41bf 100644
--- a/arch/arm/configs/multi_v7_defconfig
+++ b/arch/arm/configs/multi_v7_defconfig
@@ -208,6 +208,7 @@ CONFIG_MTD_NAND_DENALI_DT=y
CONFIG_MTD_NAND_OMAP2=y
CONFIG_MTD_NAND_OMAP_BCH=y
CONFIG_MTD_NAND_ATMEL=y
+CONFIG_MTD_NAND_GPMI_NAND=y
CONFIG_MTD_NAND_BRCMNAND=y
CONFIG_MTD_NAND_VF610_NFC=y
CONFIG_MTD_NAND_DAVINCI=y
--
2.16.2
PMIC often require the I2C bus, and the PMIC regulators might be
necessary to power on eMMC/SD-card or other supplies required
for successful boot. Make sure I2C driver for i.MX devices is
built-in.
Signed-off-by: Stefan Agner <[email protected]>
---
arch/arm/configs/multi_v7_defconfig | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig
index 608bc85856a1..fc142dc75092 100644
--- a/arch/arm/configs/multi_v7_defconfig
+++ b/arch/arm/configs/multi_v7_defconfig
@@ -368,7 +368,7 @@ CONFIG_I2C_DIGICOLOR=m
CONFIG_I2C_EMEV2=m
CONFIG_I2C_GPIO=m
CONFIG_I2C_EXYNOS5=y
-CONFIG_I2C_IMX=m
+CONFIG_I2C_IMX=y
CONFIG_I2C_MV64XXX=y
CONFIG_I2C_RIIC=y
CONFIG_I2C_RK3X=y
--
2.16.2
This allows to successfully boot Colibri iMX7 which is using
the Ricoh RN5T567 PMIC.
Signed-off-by: Stefan Agner <[email protected]>
---
arch/arm/configs/multi_v7_defconfig | 3 +++
1 file changed, 3 insertions(+)
diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig
index fc142dc75092..66c32741a130 100644
--- a/arch/arm/configs/multi_v7_defconfig
+++ b/arch/arm/configs/multi_v7_defconfig
@@ -477,6 +477,7 @@ CONFIG_ARM_SP805_WATCHDOG=y
CONFIG_AT91SAM9X_WATCHDOG=y
CONFIG_SAMA5D4_WATCHDOG=y
CONFIG_ORION_WATCHDOG=y
+CONFIG_RN5T618_WATCHDOG=y
CONFIG_ST_LPC_WATCHDOG=y
CONFIG_SUNXI_WATCHDOG=y
CONFIG_IMX2_WDT=y
@@ -512,6 +513,7 @@ CONFIG_MFD_RK808=y
CONFIG_MFD_PM8XXX=y
CONFIG_MFD_QCOM_RPM=y
CONFIG_MFD_SPMI_PMIC=y
+CONFIG_MFD_RN5T618=y
CONFIG_MFD_SEC_CORE=y
CONFIG_MFD_STMPE=y
CONFIG_MFD_PALMAS=y
@@ -548,6 +550,7 @@ CONFIG_REGULATOR_PBIAS=y
CONFIG_REGULATOR_PWM=y
CONFIG_REGULATOR_QCOM_RPM=y
CONFIG_REGULATOR_QCOM_SMD_RPM=y
+CONFIG_REGULATOR_RN5T618=y
CONFIG_REGULATOR_S2MPS11=y
CONFIG_REGULATOR_S5M8767=y
CONFIG_REGULATOR_TI_ABB=y
--
2.16.2
Enable the i.MX thermal driver required for i.MX SoC family.
Signed-off-by: Stefan Agner <[email protected]>
---
arch/arm/configs/multi_v7_defconfig | 1 +
1 file changed, 1 insertion(+)
diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig
index 6395425854cc..608bc85856a1 100644
--- a/arch/arm/configs/multi_v7_defconfig
+++ b/arch/arm/configs/multi_v7_defconfig
@@ -463,6 +463,7 @@ CONFIG_SENSORS_PWM_FAN=m
CONFIG_SENSORS_INA2XX=m
CONFIG_CPU_THERMAL=y
CONFIG_BRCMSTB_THERMAL=m
+CONFIG_IMX_THERMAL=y
CONFIG_ROCKCHIP_THERMAL=y
CONFIG_RCAR_THERMAL=y
CONFIG_ARMADA_THERMAL=y
--
2.16.2
On Sun, Mar 18, 2018 at 09:34:36PM +0100, Stefan Agner wrote:
> Enable on-chip OTP NVMEM support for NXP i.MX and VF610 SoCs.
> Since OTP values might be required by drivers required during
> boot, make sure the driver is built-in (e.g. i.MX thermal
> driver).
>
> Signed-off-by: Stefan Agner <[email protected]>
Arnd,
The series looks good to me. In general, I keep myself away from
multi_v7_defconfig changes, but if you expect a pull-request from me, I
can do that. Let me know how you want to apply the patches.
Shawn
On Mon, Mar 26, 2018 at 9:32 AM, Shawn Guo <[email protected]> wrote:
> On Sun, Mar 18, 2018 at 09:34:36PM +0100, Stefan Agner wrote:
>> Enable on-chip OTP NVMEM support for NXP i.MX and VF610 SoCs.
>> Since OTP values might be required by drivers required during
>> boot, make sure the driver is built-in (e.g. i.MX thermal
>> driver).
>>
>> Signed-off-by: Stefan Agner <[email protected]>
>
> Arnd,
>
> The series looks good to me. In general, I keep myself away from
> multi_v7_defconfig changes, but if you expect a pull-request from me, I
> can do that. Let me know how you want to apply the patches.
I would generally prefer that your defconfig pull requests contain changes
to both the imx specific and the generic defconfig files. It's much easier
for me to handle any conflicts when they arise during a merge than
to pick up the individual patches.
I applied all seven this time, to make sure we get them into linux-next
for more testing.
Arnd
On Tue, Mar 27, 2018 at 03:40:33PM +0200, Arnd Bergmann wrote:
> On Mon, Mar 26, 2018 at 9:32 AM, Shawn Guo <[email protected]> wrote:
> > On Sun, Mar 18, 2018 at 09:34:36PM +0100, Stefan Agner wrote:
> >> Enable on-chip OTP NVMEM support for NXP i.MX and VF610 SoCs.
> >> Since OTP values might be required by drivers required during
> >> boot, make sure the driver is built-in (e.g. i.MX thermal
> >> driver).
> >>
> >> Signed-off-by: Stefan Agner <[email protected]>
> >
> > Arnd,
> >
> > The series looks good to me. In general, I keep myself away from
> > multi_v7_defconfig changes, but if you expect a pull-request from me, I
> > can do that. Let me know how you want to apply the patches.
>
> I would generally prefer that your defconfig pull requests contain changes
> to both the imx specific and the generic defconfig files. It's much easier
> for me to handle any conflicts when they arise during a merge than
> to pick up the individual patches.
Noted, thanks for the comments, Arnd.
Shawn