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

Commit 87df8ac3 authored by Robert Baldyga's avatar Robert Baldyga Committed by Greg Kroah-Hartman
Browse files

Revert "usb: dwc2: move "samsung,s3c6400-hsotg" into common platform" 



This reverts commit 8df43857.

This patch breaks building dwc2 driver in gadget mode at samsung
platforms.

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent cd686097

drivers/usb/dwc2/gadget.c

+1 −0
Original line number Diff line number Diff line
@@ -3642,6 +3642,7 @@ static int s3c_hsotg_resume(struct platform_device *pdev) 


#ifdef CONFIG_OF

static const struct of_device_id s3c_hsotg_of_ids[] = {

	{ .compatible = "samsung,s3c6400-hsotg", },

	{ .compatible = "snps,dwc2", },

	{ /* sentinel */ }

};

drivers/usb/dwc2/platform.c

+0 −1
Original line number Diff line number Diff line
@@ -129,7 +129,6 @@ static const struct of_device_id dwc2_of_match_table[] = { 
	{ .compatible = "brcm,bcm2835-usb", .data = &params_bcm2835 },

	{ .compatible = "rockchip,rk3066-usb", .data = &params_rk3066 },

	{ .compatible = "snps,dwc2", .data = NULL },

	{ .compatible = "samsung,s3c6400-hsotg", .data = NULL},

	{},

};

MODULE_DEVICE_TABLE(of, dwc2_of_match_table);