merged! Bruce
In message: [linux-yocto][linux-yocto v5.10/standard/nxp-sdk-5.10/nxp-soc][kernel-source][PATCH 1/2] dmaengine: imx-sdma: Fix a build error: redefinition of 'sdma_set_channel_priority' on 28/09/2021 Xiaolei Wang wrote: > Delete redundant definition functions > > Signed-off-by: Xiaolei Wang <xiaolei.w...@windriver.com> > --- > drivers/dma/imx-sdma.c | 16 ---------------- > 1 file changed, 16 deletions(-) > > diff --git a/drivers/dma/imx-sdma.c b/drivers/dma/imx-sdma.c > index 7d46aa1e9d66..8c8deddd7325 100644 > --- a/drivers/dma/imx-sdma.c > +++ b/drivers/dma/imx-sdma.c > @@ -1489,22 +1489,6 @@ static int sdma_config_channel(struct dma_chan *chan) > return 0; > } > > -static int sdma_set_channel_priority(struct sdma_channel *sdmac, > - unsigned int priority) > -{ > - struct sdma_engine *sdma = sdmac->sdma; > - int channel = sdmac->channel; > - > - if (priority < MXC_SDMA_MIN_PRIORITY > - || priority > MXC_SDMA_MAX_PRIORITY) { > - return -EINVAL; > - } > - > - writel_relaxed(priority, sdma->regs + SDMA_CHNPRI_0 + 4 * channel); > - > - return 0; > -} > - > static int sdma_request_channel0(struct sdma_engine *sdma) > { > int ret = -EBUSY; > -- > 2.25.1 > In message: [linux-yocto][linux-yocto v5.10/standard/nxp-sdk-5.10/nxp-soc][kernel-source][PATCH 2/2] drm: mxsfb: Fix a build error: 'CTRL1_RECOVER_ON_UNDERFLOW' undeclared on 28/09/2021 Xiaolei Wang wrote: > Use CTRL1_RECOVERY_ON_UNDERFLOW to replace the CTRL1_RECOVER_ON_UNDERFLOW > macro definition > > Signed-off-by: Xiaolei Wang <xiaolei.w...@windriver.com> > --- > drivers/gpu/drm/mxsfb/mxsfb_kms.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/mxsfb/mxsfb_kms.c > b/drivers/gpu/drm/mxsfb/mxsfb_kms.c > index 83a1fd1c9c35..44d4d013efb1 100644 > --- a/drivers/gpu/drm/mxsfb/mxsfb_kms.c > +++ b/drivers/gpu/drm/mxsfb/mxsfb_kms.c > @@ -219,7 +219,7 @@ static void mxsfb_enable_controller(struct > mxsfb_drm_private *mxsfb) > * Enable this bit to mitigate the sporadic underflows. > */ > reg = readl(mxsfb->base + LCDC_CTRL1); > - reg |= CTRL1_RECOVER_ON_UNDERFLOW; > + reg |= CTRL1_RECOVERY_ON_UNDERFLOW; > writel(reg, mxsfb->base + LCDC_CTRL1); > > writel(CTRL_RUN, mxsfb->base + LCDC_CTRL + REG_SET); > -- > 2.25.1 >
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#10483): https://lists.yoctoproject.org/g/linux-yocto/message/10483 Mute This Topic: https://lists.yoctoproject.org/mt/85924935/21656 Group Owner: linux-yocto+ow...@lists.yoctoproject.org Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-