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

Commit a02b2fb4 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "usb: ci13xxx_msm_hsic: Add devicetree support for hsic device"

parents c9a83614 e8648f2a

Documentation/devicetree/bindings/usb/msm-hsic-peripheral.txt

0 → 100644
+22 −0
Original line number Diff line number Diff line 
USB HSIC Peripheral:



This describes device tree node for the USB HSIC Peripheral. This works with

usage of USB Device controller to enable USB HSIC Device mode functionality.



Required properties:

- compatible: should be "qcom,hsic-peripheral"

- regs : offset and length of the register set in the memory map

- interrupts: IRQ lines used by this controller

- <supply-name>-supply: handle to the regulator device tree node

  Required "supply-name" is either "hsic_vdd_dig" or "HSIC_VDDCX"



Optional properties :

- qcom,usb-id-core: USB Core Index to be used to bind with gadget driver.

Example USB HSIC device node :

	hsic: hsic@f9a15000 {

		compatible = "qcom,hsic-peripheral";

		reg = <0xf9a15000 0x352>;

		interrupts = <0 136 0>;

		qcom,usb-id-core = <1>;

		HSIC_VDDCX-supply = <&pmd9635_l2>;

	};

drivers/usb/gadget/ci13xxx_msm_hsic.c

+43 −2
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ 
#define HSIC_DBG1_REG					0x38



struct msm_hsic_per *the_mhsic;

static u64 msm_hsic_peripheral_dma_mask = DMA_BIT_MASK(32);



struct msm_hsic_per {

	struct device		*dev;
@@ -637,6 +638,29 @@ static struct ci13xxx_udc_driver ci13xxx_msm_udc_hsic_driver = { 
	.notify_event		= ci13xxx_msm_hsic_notify_event,

};



struct ci13xxx_platform_data *msm_hsic_peripheral_dt_to_pdata(

					struct platform_device *pdev)

{

	struct device_node *node = pdev->dev.of_node;

	struct ci13xxx_platform_data *pdata;

	u32 core_id;

	int ret;



	pdata = devm_kzalloc(&pdev->dev, sizeof(*pdata), GFP_KERNEL);

	if (!pdata) {

		dev_err(&pdev->dev, "unable to allocate platform data\n");

		return NULL;

	}



	ret = of_property_read_u32(node, "qcom,hsic-usb-core-id", &core_id);

	if (ret)

		dev_err(&pdev->dev, "hsic usb core id is not provided.\n");

	else

		pdata->usb_core_id = (u8)core_id;



	return pdata;

}



static int msm_hsic_probe(struct platform_device *pdev)

{

	struct resource *res;
@@ -646,13 +670,23 @@ static int msm_hsic_probe(struct platform_device *pdev) 


	dev_dbg(&pdev->dev, "msm-hsic probe\n");



	if (pdev->dev.of_node) {

		dev_dbg(&pdev->dev, "device tree enabled\n");

		pdev->dev.platform_data = msm_hsic_peripheral_dt_to_pdata(pdev);

	}



	if (!pdev->dev.platform_data) {

		dev_err(&pdev->dev, "No platform data given. Bailing out\n");

		return -ENODEV;

	} else {

		pdata = pdev->dev.platform_data;

	}



	if (!pdev->dev.dma_mask)

		pdev->dev.dma_mask = &msm_hsic_peripheral_dma_mask;

	if (!pdev->dev.coherent_dma_mask)

		pdev->dev.coherent_dma_mask = DMA_BIT_MASK(32);



	pdata = pdev->dev.platform_data;



	mhsic = kzalloc(sizeof(struct msm_hsic_per), GFP_KERNEL);

	if (!mhsic) {

		dev_err(&pdev->dev, "unable to allocate msm_hsic\n");
@@ -774,6 +808,12 @@ static int hsic_msm_remove(struct platform_device *pdev) 
	return 0;

}



static const struct of_device_id hsic_peripheral_dt_match[] = {

	{ .compatible = "qcom,hsic-peripheral",

	},

	{}

};



static struct platform_driver msm_hsic_peripheral_driver = {

	.probe	= msm_hsic_probe,

	.remove	= hsic_msm_remove,
@@ -782,6 +822,7 @@ static struct platform_driver msm_hsic_peripheral_driver = { 
#ifdef CONFIG_PM

		.pm = &msm_hsic_dev_pm_ops,

#endif

		.of_match_table = hsic_peripheral_dt_match,

	},

};