From 1834ea351441e36ae9f579db538b6c01d763cba3 Mon Sep 17 00:00:00 2001 From: Suguru Saito Date: Sun, 26 Dec 2021 21:25:09 +0900 Subject: [PATCH 1/4] usb: chipidea: ci_hdrc_imx: add null check for usbmisc --- drivers/usb/chipidea/ci_hdrc_imx.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/drivers/usb/chipidea/ci_hdrc_imx.c b/drivers/usb/chipidea/ci_hdrc_imx.c index c1d98af3f91b..1ce8ff952a0f 100644 --- a/drivers/usb/chipidea/ci_hdrc_imx.c +++ b/drivers/usb/chipidea/ci_hdrc_imx.c @@ -470,13 +470,15 @@ static int ci_hdrc_imx_probe(struct platform_device *pdev) goto err_clk; } - if (!IS_ERR(pdata.id_extcon.edev) || - of_property_read_bool(np, "usb-role-switch")) - data->usbmisc_data->ext_id = 1; + if ((!IS_ERR(pdata.id_extcon.edev) || + of_property_read_bool(np, "usb-role-switch")) && + !IS_ERR_OR_NULL(data->usbmisc_data)) + data->usbmisc_data->ext_id = 1; - if (!IS_ERR(pdata.vbus_extcon.edev) || - of_property_read_bool(np, "usb-role-switch")) - data->usbmisc_data->ext_vbus = 1; + if ((!IS_ERR(pdata.vbus_extcon.edev) || + of_property_read_bool(np, "usb-role-switch")) && + !IS_ERR_OR_NULL(data->usbmisc_data)) + data->usbmisc_data->ext_vbus = 1; ret = imx_usbmisc_init_post(data->usbmisc_data); if (ret) { @@ -485,7 +487,8 @@ static int ci_hdrc_imx_probe(struct platform_device *pdev) } /* usbmisc needs to know dr mode to choose wakeup setting */ - data->usbmisc_data->available_role = + if (!IS_ERR_OR_NULL(data->usbmisc_data)) + data->usbmisc_data->available_role = ci_hdrc_query_available_role(data->ci_pdev); if (data->supports_runtime_pm) { From 93549e63be1ae5a695accf70ce327fe4bdfb9ad3 Mon Sep 17 00:00:00 2001 From: Suguru Saito Date: Mon, 27 Dec 2021 00:06:01 +0900 Subject: [PATCH 2/4] i2c: i2c-mxs: fix 'failed to dma_request' --- drivers/i2c/busses/i2c-mxs.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/drivers/i2c/busses/i2c-mxs.c b/drivers/i2c/busses/i2c-mxs.c index 081a1169ecea..a376d4540d23 100644 --- a/drivers/i2c/busses/i2c-mxs.c +++ b/drivers/i2c/busses/i2c-mxs.c @@ -840,9 +840,12 @@ static int mxs_i2c_probe(struct platform_device *pdev) } /* Setup the DMA */ - i2c->dmach = dma_request_slave_channel(dev, "rx-tx"); - if (!i2c->dmach) { - dev_err(dev, "Failed to request dma\n"); + i2c->dmach = dma_request_chan(dev, "rx-tx"); + if (IS_ERR(i2c->dmach)) { + if (i2c->dmach == -EPROBE_DEFER) + return -EPROBE_DEFER; + + dev_err(dev, "Failed to request dma: %d\n", i2c->dmach); return -ENODEV; } From 251279ed473f2873337d0cf007e408d4090f4913 Mon Sep 17 00:00:00 2001 From: Suguru Saito Date: Mon, 27 Dec 2021 00:11:20 +0900 Subject: [PATCH 3/4] i2c: i2c-mxs: fix compiler warnings --- drivers/i2c/busses/i2c-mxs.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/i2c/busses/i2c-mxs.c b/drivers/i2c/busses/i2c-mxs.c index a376d4540d23..56da11874125 100644 --- a/drivers/i2c/busses/i2c-mxs.c +++ b/drivers/i2c/busses/i2c-mxs.c @@ -842,10 +842,10 @@ static int mxs_i2c_probe(struct platform_device *pdev) /* Setup the DMA */ i2c->dmach = dma_request_chan(dev, "rx-tx"); if (IS_ERR(i2c->dmach)) { - if (i2c->dmach == -EPROBE_DEFER) + if (PTR_ERR(i2c->dmach) == -EPROBE_DEFER) return -EPROBE_DEFER; - dev_err(dev, "Failed to request dma: %d\n", i2c->dmach); + dev_err(dev, "Failed to request dma: %ld\n", PTR_ERR(i2c->dmach)); return -ENODEV; } From 3fa2d160a6b86c640efb66db19fb78e1a205710b Mon Sep 17 00:00:00 2001 From: Suguru Saito Date: Mon, 27 Dec 2021 00:53:39 +0900 Subject: [PATCH 4/4] sharp: add PWM_BEEPER and SubLCD to brain_2g_defconfig --- arch/arm/configs/brain_2g_defconfig | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/arm/configs/brain_2g_defconfig b/arch/arm/configs/brain_2g_defconfig index e0ea9148ae9b..3f4d95c125c9 100644 --- a/arch/arm/configs/brain_2g_defconfig +++ b/arch/arm/configs/brain_2g_defconfig @@ -206,3 +206,5 @@ CONFIG_STACKTRACE=y CONFIG_STRICT_DEVMEM=y CONFIG_DEBUG_USER=y CONFIG_TOUCHSCREEN_SX8654=y +CONFIG_INPUT_PWM_BEEPER=y +CONFIG_TINYDRM_BRAIN_ST7586=y