Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ff968f5a authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "usb: dwc3: Fix probe deferral issue"

parents e1d7d8cb 5203ee82

arch/arm/Kconfig

+20 −0
Original line number Diff line number Diff line
@@ -1902,6 +1902,26 @@ config BUILD_ARM_APPENDED_DTB_IMAGE 
	  Enabling this option will cause a concatenated zImage and list of

	  DTBs to be built by default (instead of a standalone zImage.)

	  The image will built in arch/arm/boot/zImage-dtb

choice

	prompt "Appended DTB Kernel Image name"

	depends on BUILD_ARM_APPENDED_DTB_IMAGE

	default ZIMG_DTB

	help

	  Enabling this option will cause a specific kernel image Image or

	  Image.gz to be used for final image creation.

	  The image will built in arch/arm/boot/IMAGE-NAME-dtb



	config ZIMG_DTB

		bool "zImage-dtb"

	config IMG_DTB

		bool "Image-dtb"

endchoice



config BUILD_ARM_APPENDED_KERNEL_IMAGE_NAME

	string

	depends on BUILD_ARM_APPENDED_DTB_IMAGE

	default "zImage-dtb" if ZIMG_DTB

	default "Image-dtb" if IMG_DTB



config BUILD_ARM_APPENDED_DTB_IMAGE_NAMES

	string "Default dtb names"

arch/arm/Makefile

+5 −1
Original line number Diff line number Diff line
@@ -307,7 +307,7 @@ boot := arch/arm/boot 
ifeq ($(CONFIG_XIP_KERNEL),y)

KBUILD_IMAGE := $(boot)/xipImage

else ifeq ($(CONFIG_BUILD_ARM_APPENDED_DTB_IMAGE),y)

KBUILD_IMAGE := $(boot)/zImage-dtb

KBUILD_IMAGE := $(boot)/$(subst $\",,$(CONFIG_BUILD_ARM_APPENDED_KERNEL_IMAGE_NAME))

else

KBUILD_IMAGE := $(boot)/zImage

endif
@@ -361,6 +361,10 @@ endif 
zImage-dtb: vmlinux scripts dtbs

	$(Q)$(MAKE) $(build)=$(boot) MACHINE=$(MACHINE) DTSSUBDIR=$(DTSSUBDIR) $(boot)/$@



Image-dtb: vmlinux scripts dtbs

	$(Q)$(MAKE) $(build)=$(boot) MACHINE=$(MACHINE) DTSSUBDIR=$(DTSSUBDIR) $(boot)/$@





# We use MRPROPER_FILES and CLEAN_FILES now

archclean:

	$(Q)$(MAKE) $(clean)=$(boot)

arch/arm/boot/.gitignore

+2 −0
Original line number Diff line number Diff line
@@ -3,3 +3,5 @@ zImage 
xipImage

bootpImage

uImage

Image-dtb-hdr

Image-dtb

arch/arm/boot/Makefile

+8 −0
Original line number Diff line number Diff line
@@ -59,6 +59,14 @@ $(obj)/xipImage: FORCE 
$(obj)/Image: vmlinux FORCE

	$(call if_changed,objcopy)



$(obj)/Image-dtb-hdr: $(obj)/Image FORCE

	echo -n 'UNCOMPRESSED_IMG' > $@ && \

	$(call size_append, $(filter-out FORCE,$^)) >> $@



$(obj)/Image-dtb: $(obj)/Image-dtb-hdr $(obj)/Image $(DTB_OBJS) FORCE

	$(call if_changed,cat)

	@echo '  Kernel: $@ is ready'



$(obj)/compressed/vmlinux: $(obj)/Image FORCE

	$(Q)$(MAKE) $(build)=$(obj)/compressed $@

drivers/usb/dwc3/dwc3-msm.c

+4 −1
Original line number Diff line number Diff line
@@ -2712,8 +2712,11 @@ static int dwc3_msm_get_clk_gdsc(struct dwc3_msm *mdwc) 
	int ret;



	mdwc->dwc3_gdsc = devm_regulator_get(mdwc->dev, "USB3_GDSC");

	if (IS_ERR(mdwc->dwc3_gdsc))

	if (IS_ERR(mdwc->dwc3_gdsc)) {

		if (PTR_ERR(mdwc->dwc3_gdsc) == -EPROBE_DEFER)

			return PTR_ERR(mdwc->dwc3_gdsc);

		mdwc->dwc3_gdsc = NULL;

	}



	mdwc->xo_clk = devm_clk_get(mdwc->dev, "xo");

	if (IS_ERR(mdwc->xo_clk)) {