1
0
Fork 0
Commit Graph

266 Commits (539b322758deb7910771a2adb64a9be4ca5490c8)

Author SHA1 Message Date
Alistair Francis 539b322758 ARM: imx_v6_v7_defconfig: Update to work for rM2
Signed-off-by: Alistair Francis <alistair@alistair23.me>
2021-02-11 17:44:38 -08:00
Jason Liu 335d2828a9 This is the 5.4.24 stable release
-----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEEZH8oZUiU471FcZm+ONu9yGCSaT4FAl5hHjgACgkQONu9yGCS
 aT6CSBAA0c16mnDb59jgmW/sBj/p/MrlD/WJzLriqiKN5BUsPt9++I5mNj8mG+d2
 Glm4086e8L826zv8oKiZm23xk93on+78ExhVFVZvZNaEUpiRNYCGSuDq2NrHW0z+
 kpagkAFLfCUZFoKtmWo+bpl0YtF4dd/fg7+EjyL6qT1DBs8NVMwZx7i/v0xXv7Wc
 0vsGCLYoBLzcW1FB2d9cfAUPCBuGEzL/7TdifNOXRgI9owGsZndFJgXgIzoBUt/P
 tqB8RLjIupCiMEPtsEAZ/rgEQLPFkb3yrBvgjd1wDI8bHUIQU0clqThKVNvmNSmv
 UTBSNgPAhkP8nZG7X9xCkyfEsUefejBJy66da9n4XTGGrXf9ga0BL0nNrOGwOesr
 m+tNnBSFsbFCMqFopQnt4zZSnaf67AOk2mzxbEu4E+sStyW943aDO9MoRRFgaYGH
 pfie3qOKtKta2MuNTJA+q6F0W9H+V5MtMpwbyuy1/dp2eVln2wewBBMvXYdL1YOy
 E/Z87nsQgalsDynz9m/niv32J4JAxHptyOyROkktDLBSzL5RawNn+Op8X5EtmZOe
 sPkiYicqp9CLmMj13qWXJhtuyNdD4wk6FyyAy6cX9mF44+EZGOBkyNP+n8g789Kn
 sqFJ7sfTfOnwLBFciMA5PaMTGNWROyWXNkvvUzO+9t0CyFAnT2U=
 =abGA
 -----END PGP SIGNATURE-----

Merge tag 'v5.4.24' into imx_5.4.y

Merge Linux stable release v5.4.24 into imx_5.4.y

* tag 'v5.4.24': (3306 commits)
  Linux 5.4.24
  blktrace: Protect q->blk_trace with RCU
  kvm: nVMX: VMWRITE checks unsupported field before read-only field
  ...

Signed-off-by: Jason Liu <jason.hui.liu@nxp.com>

 Conflicts:
	arch/arm/boot/dts/imx6sll-evk.dts
	arch/arm/boot/dts/imx7ulp.dtsi
	arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi
	drivers/clk/imx/clk-composite-8m.c
	drivers/gpio/gpio-mxc.c
	drivers/irqchip/Kconfig
	drivers/mmc/host/sdhci-of-esdhc.c
	drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c
	drivers/net/can/flexcan.c
	drivers/net/ethernet/freescale/dpaa/dpaa_eth.c
	drivers/net/ethernet/mscc/ocelot.c
	drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
	drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
	drivers/net/phy/realtek.c
	drivers/pci/controller/mobiveil/pcie-mobiveil-host.c
	drivers/perf/fsl_imx8_ddr_perf.c
	drivers/tee/optee/shm_pool.c
	drivers/usb/cdns3/gadget.c
	kernel/sched/cpufreq.c
	net/core/xdp.c
	sound/soc/fsl/fsl_esai.c
	sound/soc/fsl/fsl_sai.c
	sound/soc/sof/core.c
	sound/soc/sof/imx/Kconfig
	sound/soc/sof/loader.c
2020-03-08 18:57:18 +08:00
Leonard Crestez 12f1c5fa3e ARM: imx_v6_v7_defconfig: Explicitly restore CONFIG_DEBUG_FS
[ Upstream commit 46db63abb7 ]

This is currently off and that's not desirable: default imx config is
meant to be generally useful for development and debugging.

Running git bisect between v5.4 and v5.5-rc1 finds this started from
commit 0e4a459f56 ("tracing: Remove unnecessary DEBUG_FS dependency")

Explicit CONFIG_DEBUG_FS=y was earlier removed by
commit c29d541f59 ("ARM: imx_v6_v7_defconfig: Remove unneeded options")

A very similar fix was required before:
commit 7e9eb62688 ("ARM: imx_v6_v7_defconfig: Explicitly restore CONFIG_DEBUG_FS")

Signed-off-by: Leonard Crestez <leonard.crestez@nxp.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
2020-01-12 12:21:27 +01:00
Sandor Yu 97a6600dd0 LF-313-2: arm: imx_v6_v7_defconfig: add vadc to defconfig
add vadc to imx_v6_v7_defconfig

Signed-off-by: Sandor Yu <Sandor.yu@nxp.com>
2019-12-10 14:14:31 +08:00
Peter Chen f343c2747a
LF-238-1 ARM: configs: imx_v6_v7_defconfig: enable USB ACM
It is used for CDC ACM function.

Acked-by: Leonard Crestez <leonard.crestez@nxp.com>
Signed-off-by: Peter Chen <peter.chen@nxp.com>
2019-12-02 15:27:32 +08:00
Horia Geantă 12dfefd889 LF-63-2 ARM: imx_v6_v7_defconfig: build SM test as module
SM test driver was changed to build only as a module.
Update defconfig accordingly.

Signed-off-by: Horia Geantă <horia.geanta@nxp.com>
Acked-by: Leonard Crestez <leonard.crestez@nxp.com>
2019-11-27 18:28:47 +02:00
Robin Gong 91cbc7cc11 LF-141: ARM: imx_v6_v7_defconfig: enable CONFIG_PREEMPT
Enable CONFIG_PREEMPT instead of CONFIG_PREEMPT_VOLUNTARY, the former
is much suitable for embed system as i.mx. Besides, that aligns with
internal legacy imx_v7_defconfig.

Signed-off-by: Robin Gong <yibin.gong@nxp.com>
Reviewed-by: Anson Huang <anson.huang@nxp.com>
2019-11-27 20:00:31 +08:00
Fugang Duan 91aacb7e2b LF-40 ARM: imx_v6_v7_defconfig: remove HCI SDIO config
IMX bluetooth support interface is HCI UART. Remove HCI SDIO
interface since there have HIF conflict for cypress bluetooth.

Reviewed-by: Richard Zhu <hongxing.zhu@nxp.com>
Signed-off-by: Fugang Duan <fugang.duan@nxp.com>
2019-11-25 16:30:33 +08:00
Robby Cai 81976c5817 ARM: imx_v6_v7_defconfig: enable adv7180
enable adv7180 as module

Signed-off-by: Robby Cai <robby.cai@nxp.com>
2019-11-25 16:30:32 +08:00
Horia Geantă f5aa899d33 ARM: imx_v6_v7_defconfig: enable some CRYPTO_* symbols
Enable the following:
-CAAM SNVS and SM drivers
-generic SW crypto algorithms - needed for tcrypt speed tests
-CRYPTO_USER - needed for configuring crypto algorithms
from user space (using tools like crconf)

Signed-off-by: Horia Geantă <horia.geanta@nxp.com>
2019-11-25 16:30:32 +08:00
Clark Wang 05adaaa23b MLK-22921-1 ARM: config: add spi slave support for imx6/7
Add spi slave support for imx6/7 platforms.

Signed-off-by: Clark Wang <xiaoning.wang@nxp.com>
Reviewed-by: Dong Aisheng <aisheng.dong@nxp.com>
2019-11-25 16:30:32 +08:00
Dong Aisheng 99cac263b0 MLK-22904: ARM: imx_v6_v7_defconfig: add DMA_CMA support
This is needed for VPU/MM/GPU features.
Generated by savedefconfig.

NOTE: the exist CONFIG_CMA_SIZE_MBYTES=320 option actually did not work
before due to missing CONFIG_DMA_CMA, removed it first.

Reviewed-by: Anson Huang <Anson.Huang@nxp.com>
Signed-off-by: Dong Aisheng <aisheng.dong@nxp.com>
2019-11-25 16:30:32 +08:00
Fugang Duan f2445a5c55 ARM: imx_v6_v7_defconfig: set the configs for marvell wireless
Set the necessary configs for marvell wireless solution.

Signed-off-by: Fugang Duan <fugang.duan@nxp.com>
2019-11-25 16:30:21 +08:00
Robby Cai 88ffe78616 ARM: imx_v6_v7_defconfig: disable ov5640 driver of upstreaming version
disable ov5640 driver of upstreaming version

Signed-off-by: Robby Cai <robby.cai@nxp.com>
2019-11-25 16:30:21 +08:00
Horia Geantă b6c04deb67 MLK-22625-2 ARM: imx_v6_v7_defconfig: enable tcrypt module
tcrypt module is required for testing crypto algorithms.

Note: CONFIG_CRYPTO_MANAGER_DISABLE_TESTS is let to default value ("y"),
since setting it to "n" would slow down boot, i.e. have a system-level
effect.
For tcrypt testing CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=n is needed,
which will have to be done using a separate kernel config.

Signed-off-by: Horia Geantă <horia.geanta@nxp.com>
2019-11-25 16:30:21 +08:00
Robby Cai dd223e97dd ARM: imx_v6_v7_defconfig: Enable mipi camera ov5640 of subdev version
enable mipi camera ov5640 of subdev version

Signed-off-by: Robby Cai <robby.cai@nxp.com>
2019-11-25 16:30:20 +08:00
Robby Cai 36d285cf6b ARM: imx_v6_v7_defconfig: Enable MIPI CSI driver
Enable Samsung's MIPI CSI driver

Signed-off-by: Robby Cai <robby.cai@nxp.com>
2019-11-25 16:30:19 +08:00
Robby Cai 28c6f5f3c5 ARM: imx_v6_v7_defconfig: Enable mx6s v4l2 capture driver
enable CONFIG_VIDEO_MXC_CSI_CAMERA as module

Signed-off-by: Robby Cai <robby.cai@nxp.com>
2019-11-25 16:30:19 +08:00
Robby Cai 964f2a36e9 ARM: imx_v6_v7_defconfig: Enable parallel camera ov5640 driver
enable parallel camera ov5640 driver based on subdev,
used by iMX 6UL/ULL/SX/SL/SLL

Signed-off-by: Robby Cai <robby.cai@nxp.com>
2019-11-25 16:30:18 +08:00
Liu Ying 16da39c90c ARM: imx_v6_v7_defconfig: Build in MXC IPU output driver
This patch builds in MXC IPU output driver.

Signed-off-by: Liu Ying <victor.liu@nxp.com>
2019-11-25 16:30:18 +08:00
Robby Cai c4434fab4c ARM: imx_v6_v7_defconfig: add v4l2 capture support for imx6qdl
add v4l2 capture support for imx6qdl, including IPU CSI/PrP, V4L2 capture and the
camera ov5640 (mipi and parallel) drivers.

Signed-off-by: Robby Cai <robby.cai@nxp.com>
2019-11-25 16:30:18 +08:00
Fugang Duan 633976b33d ARM: imx_v6_v7_defconfig: Fixup the typo for CONFIG_LLC2
Correct the typo for CONFIG_LLC2.

Fixes: ec4753a4c99a("MLK-22558 imx_v6_v7_defconfig: enable the necessary net configs")
Signed-off-by: Fugang Duan <fugang.duan@nxp.com>
2019-11-25 16:30:18 +08:00
Shengjiu Wang 31d4db56e7 ARM: imx_v6_v7_defconfig: built-in SND_SOC_IMX_SI476X
built-in SND_SOC_IMX_SI476X

Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com>
2019-11-25 16:30:17 +08:00
Shengjiu Wang a45d5f6ca2 ARM: imx_v6_v7_defconfig: Enable SND_SOC_IMX_SII902X and SND_SOC_IMX_HDMI
built-in SND_SOC_IMX_SII902X and SND_SOC_IMX_HDMI

Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com>
2019-11-25 16:30:17 +08:00
Sandor Yu 9fe46cac74 ARM: imx_v6_v7_defconfig: Enable dcic
CONFIG_FB_MXC_DCIC=y
support dcic.

Signed-off-by: Sandor Yu <Sandor.yu@nxp.com>
2019-11-25 16:30:16 +08:00
Sandor Yu 227c77ff12 ARM: imx_v6_v7_defconfig: Enable imx6/7 hdmi fb device driver
CONFIG_FB_MXC_HDMI=y
CONFIG_FB_MXS_SII902X=y
CONFIG_MXC_HDMI_CEC=y

Signed-off-by: Sandor Yu <Sandor.yu@nxp.com>
2019-11-25 16:30:16 +08:00
Leonard Crestez aa9c25a714 ARM: imx_v6_v7_defconfig: Enable CONFIG_USB_CONFIGFS=y
This is used for network boot with an USB ethernet gadget

Signed-off-by: Leonard Crestez <leonard.crestez@nxp.com>
2019-11-25 16:30:16 +08:00
Robby Cai fcbf87efe1 ARM: imx_v6_v7_defconfig: Enable CONFIG_VIDEO_MXC_PXP_V4L2
enable PXP V4L2 driver

Signed-off-by: Robby Cai <robby.cai@nxp.com>
2019-11-25 16:30:15 +08:00
Ella Feng 96a0a89e5b ARM: imx_v6_v7_defconfig: Enlarge CMA size to 320M
Enlarge CMA size to 320M so that GPU can reserve enough memory.

Signed-off-by: Ella Feng <ella.feng@nxp.com>
2019-11-25 16:30:14 +08:00
Ella Feng cbb3d9fc4b ARM: imx_v6_v7_defconfig: Disable etnaviv GPU driver.
Disable etnaviv driver to use Vivante private driver.

Signed-off-by: Ella Feng <ella.feng@nxp.com>
2019-11-25 16:30:14 +08:00
Fugang Duan ba9d7c1b28 MLK-22558 ARM: imx_v6_v7_defconfig: Enable necessary net configs
Enable the necessary net configs:
	CONFIG_IP_MULTICAST
	CONFIG_VLAN_8021Q
	CONFIG_LLC2

Signed-off-by: Fugang Duan <fugang.duan@nxp.com>
2019-11-25 16:30:13 +08:00
Shengjiu Wang e7e39ec15e ARM: imx_v6_v7_defconfig: Enable audio sound card
support audio sound card (wm8960/wm8958/wm8962/mqs)

Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com>
2019-11-25 16:30:13 +08:00
Clark Wang 09b2e5d560 ARM: imx_v6_v7_defconfig: Remove CONFIG_MMA8452
Remove this define, because the mma8541 use CONFIG_MXC_MMA8451.

Signed-off-by: Clark Wang <xiaoning.wang@nxp.com>
2019-11-25 16:30:13 +08:00
Haibo Chen 25b8c97a75 ARM: imx_v6_v7_defconfig: Enable focaltech touch support
Signed-off-by: Haibo Chen <haibo.chen@nxp.com>
2019-11-25 16:30:13 +08:00
Haibo Chen 876b2579bc ARM: imx_v6_v7_defconfig: Eanble elan touch screen support
Currently, we just use driver elan_ts.c, not elants_i2c.c. So this
patch change this.

Signed-off-by: Haibo Chen <haibo.chen@nxp.com>
2019-11-25 16:30:12 +08:00
Clark Wang da4dad9ed9 ARM: imx_v6_v7_defconfig: Remove CONFIG_SENSORS_ISL29018
No need for this config define, remove it.

Signed-off-by: Clark Wang <xiaoning.wang@nxp.com>
[ Aisheng : split arm64 changes ]
Signed-off-by: Dong Aisheng <aisheng.dong@nxp.com>
2019-11-25 16:30:12 +08:00
Liu Ying b7a0e0ad7b ARM: imx_v6_v7_defconfig: Enable CONFIG_FB_MXC_LDB
This patch sets CONFIG_FB_MXC_LDB to y so that we may
build in LDB driver.

Signed-off-by: Liu Ying <victor.liu@nxp.com>
2019-11-25 16:30:11 +08:00
Liu Ying ecbb5edccb ARM: imx_v6_v7_defconfig: Build in CONFIG_FB_MXC_SYNC_PANEL
This patch sets CONFIG_FB_MXC_SYNC_PANEL to y so that we
may build in IPUv3 framebuffer driver.

Signed-off-by: Liu Ying <victor.liu@nxp.com>
2019-11-25 16:30:11 +08:00
Liu Ying 9986a20864 ARM: imx_v6_v7_defconfig: Enable CONFIG_MXC_IPU and CONFIG_MXC_IPU_PRE
This patch sets CONFIG_MXC_IPU and CONFIG_MXC_IPU_PRE to y so that we
can build in IPUv3 common driver and IPUv3 prefetch drivers.

Signed-off-by: Liu Ying <victor.liu@nxp.com>
2019-11-25 16:30:11 +08:00
Leonard Crestez 90b0e42f5e ARM: imx_v6_v7_defconfig: Disable CONFIG_IMX_IPUV3_CORE
For now we'll use our internal IPUv3 common driver, so this patch
disables CONFIG_IMX_IPUV3_CORE from upstream kernel.

Signed-off-by: Liu Ying <victor.liu@nxp.com>
[Leonard: Remove unrelated changes]
Signed-off-by: Leonard Crestez <leonard.crestez@nxp.com>
2019-11-25 16:30:11 +08:00
Robby Cai a07c60b6cf ARM: imx_v6_v7_defconfig: Enable EPDC driver
enable EPDC V1 and V2 driver

Signed-off-by: Robby Cai <robby.cai@nxp.com>
2019-11-25 16:30:10 +08:00
Robby Cai 37cc85c8de ARM: imx_v6_v7_defconfig: Enable PXP v2 and v3 driver
enable PXP v2 and v3 driver

Signed-off-by: Robby Cai <robby.cai@nxp.com>
2019-11-25 16:30:10 +08:00
Robby Cai 90d1521be3 ARM: imx_v6_v7_defconfig: Enable max17135 hwmon+regulator mfd
Enable max17135 hwmon, mfd, regulator function

Signed-off-by: Robby Cai <robby.cai@nxp.com>
2019-11-25 16:30:09 +08:00
Fancy Fang 3f922d3262 ARM: imx_v6_v7_defconfig: Enable FB_MXC_TRULY_WVGA_SYNC_PANEL
Enable 'FB_MXC_TRULY_WVGA_SYNC_PANEL' config by default
for imx6 and imx7 series which support the TRULY HX8369
mipi panel.

Signed-off-by: Fancy Fang <chen.fang@nxp.com>
2019-11-25 16:30:09 +08:00
Fancy Fang 38f5b839fb ARM: imx_v6_v7_defconfig: Enable FB_MXC_MIPI_DSI
Enable 'FB_MXC_MIPI_DSI' config by default for imx6 and imx7
series which include the NXP MIPI DSI controller.

Signed-off-by: Fancy Fang <chen.fang@nxp.com>
2019-11-25 16:30:08 +08:00
Fancy Fang 7e8c78c6e7 ARM: imx_v6_v7_defconfig: Enable FB_MXC_MIPI_DSI_SAMSUNG
Enable 'FB_MXC_MIPI_DSI_SAMSUNG' config by default for
imx6 and imx7 series which include the Samsung MIPI DSI
controller.

Signed-off-by: Fancy Fang <chen.fang@nxp.com>
2019-11-25 16:30:07 +08:00
Fancy Fang f505cfe417 ARM: imx_v6_v7_defconfig: Enable FB_MXC_RK_PANEL_RK055IQH042
Enable 'FB_MXC_RK_PANEL_RK055IQH042' config by default for
imx6 and imx7 series which support the RM68191 mipi panel.

Signed-off-by: Fancy Fang <chen.fang@nxp.com>
2019-11-25 16:30:07 +08:00
Fancy Fang edc8796ea8 ARM: imx_v6_v7_defconfig: Enable FB_MXC_RK_PANEL_RK055AHD042
Enable 'FB_MXC_RK_PANEL_RK055AHD042' config by default for imx6 and imx7
series which support the RM68200 mipi panel.

Signed-off-by: Fancy Fang <chen.fang@nxp.com>
2019-11-25 16:30:07 +08:00
Fancy Fang a45efe0d9a ARM: imx_v6_v7_defconfig: Enable FB_MXC_TRULY_PANEL_TFT3P5581E
Enable 'FB_MXC_TRULY_PANEL_TFT3P5581E' config by default for imx6 and
imx7 series which support the TRULY TFT3P5581E mipi panel.

Signed-off-by: Fancy Fang <chen.fang@nxp.com>
2019-11-25 16:30:06 +08:00
Fancy Fang 2d0ac27a1b ARM: imx_v6_v7_defconfig: Enable FB_MXC_MIPI_DSI_NORTHWEST
Enable 'FB_MXC_MIPI_DSI_NORTHWEST' config by default for imx6 and imx7
series which includes the Northwest Logic MIPI DSI controller.

Signed-off-by: Fancy Fang <chen.fang@nxp.com>
2019-11-25 16:30:05 +08:00