diff options
| author | Yangbo Lu <yangbo.lu@nxp.com> | 2020-04-10 10:47:05 +0800 |
|---|---|---|
| committer | Petr Štetiar <ynezz@true.cz> | 2020-05-07 12:53:06 +0200 |
| commit | cddd4591404fb4c53dc0b3c0b15b942cdbed4356 (patch) | |
| tree | 392c1179de46b0f804e3789edca19069b64e6b44 /target/linux/layerscape/patches-5.4/808-i2c-0009-i2c-imx-get-rid-of-CONFIG_ARCH_LAYERSCAPE.patch | |
| parent | d1d2c0b5579ea4f69a42246c9318539d61ba1999 (diff) | |
| download | upstream-cddd4591404fb4c53dc0b3c0b15b942cdbed4356.tar.gz upstream-cddd4591404fb4c53dc0b3c0b15b942cdbed4356.tar.bz2 upstream-cddd4591404fb4c53dc0b3c0b15b942cdbed4356.zip | |
layerscape: add patches-5.4
Add patches for linux-5.4. The patches are from NXP LSDK-20.04 release
which was tagged LSDK-20.04-V5.4.
https://source.codeaurora.org/external/qoriq/qoriq-components/linux/
For boards LS1021A-IOT, and Traverse-LS1043 which are not involved in
LSDK, port the dts patches from 4.14.
The patches are sorted into the following categories:
301-arch-xxxx
302-dts-xxxx
303-core-xxxx
701-net-xxxx
801-audio-xxxx
802-can-xxxx
803-clock-xxxx
804-crypto-xxxx
805-display-xxxx
806-dma-xxxx
807-gpio-xxxx
808-i2c-xxxx
809-jailhouse-xxxx
810-keys-xxxx
811-kvm-xxxx
812-pcie-xxxx
813-pm-xxxx
814-qe-xxxx
815-sata-xxxx
816-sdhc-xxxx
817-spi-xxxx
818-thermal-xxxx
819-uart-xxxx
820-usb-xxxx
821-vfio-xxxx
Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
Diffstat (limited to 'target/linux/layerscape/patches-5.4/808-i2c-0009-i2c-imx-get-rid-of-CONFIG_ARCH_LAYERSCAPE.patch')
| -rw-r--r-- | target/linux/layerscape/patches-5.4/808-i2c-0009-i2c-imx-get-rid-of-CONFIG_ARCH_LAYERSCAPE.patch | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/target/linux/layerscape/patches-5.4/808-i2c-0009-i2c-imx-get-rid-of-CONFIG_ARCH_LAYERSCAPE.patch b/target/linux/layerscape/patches-5.4/808-i2c-0009-i2c-imx-get-rid-of-CONFIG_ARCH_LAYERSCAPE.patch new file mode 100644 index 0000000000..1bcc6e0e6c --- /dev/null +++ b/target/linux/layerscape/patches-5.4/808-i2c-0009-i2c-imx-get-rid-of-CONFIG_ARCH_LAYERSCAPE.patch @@ -0,0 +1,36 @@ +From c35124bc3fc5f9f2a79815721db139e5bf186391 Mon Sep 17 00:00:00 2001 +From: Dong Aisheng <aisheng.dong@nxp.com> +Date: Thu, 26 Sep 2019 21:00:55 +0800 +Subject: [PATCH] i2c: imx: get rid of CONFIG_ARCH_LAYERSCAPE + +We can't use CONFIG_ARCH_LAYERSCAPE for one Image multiple platforms +support. + +Reviewed-by: Biwen Li <biwen.li@nxp.com> +Signed-off-by: Dong Aisheng <aisheng.dong@nxp.com> +--- + drivers/i2c/busses/i2c-imx.c | 13 ++++++------- + 1 file changed, 6 insertions(+), 7 deletions(-) + +--- a/drivers/i2c/busses/i2c-imx.c ++++ b/drivers/i2c/busses/i2c-imx.c +@@ -1398,13 +1398,12 @@ static int i2c_imx_probe(struct platform + i2c_imx, IMX_I2C_I2CR); + imx_i2c_write_reg(i2c_imx->hwdata->i2sr_clr_opcode, i2c_imx, IMX_I2C_I2SR); + +-#ifdef CONFIG_ARCH_LAYERSCAPE +- /* Init optional bus recovery for layerscape */ +- ret = i2c_imx_init_recovery_for_layerscape(i2c_imx, pdev); +-#else +- /* Init optional bus recovery function */ +- ret = i2c_imx_init_recovery_info(i2c_imx, pdev); +-#endif ++ /* Init optional bus recovery */ ++ if (of_match_node(pinmux_of_match, pdev->dev.of_node)) ++ ret = i2c_imx_init_recovery_for_layerscape(i2c_imx, pdev); ++ else ++ ret = i2c_imx_init_recovery_info(i2c_imx, pdev); ++ + /* Give it another chance if pinctrl used is not ready yet */ + if (ret == -EPROBE_DEFER) + goto clk_notifier_unregister; |