Commit f116b966 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'mfd-fixes-5.4' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd 

Pull MFD fix from Lee Jones:
 "Fix broken support for BananaPi-r2"

* tag 'mfd-fixes-5.4' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd:
  mfd: mt6397: Fix probe after changing mt6397-core
parents f632bfaa 603d9299

drivers/mfd/mt6397-core.c

+40 −24
Original line number Diff line number Diff line
@@ -129,11 +129,27 @@ static int mt6397_irq_resume(struct device *dev) 
static SIMPLE_DEV_PM_OPS(mt6397_pm_ops, mt6397_irq_suspend,

			mt6397_irq_resume);



struct chip_data {

	u32 cid_addr;

	u32 cid_shift;

};



static const struct chip_data mt6323_core = {

	.cid_addr = MT6323_CID,

	.cid_shift = 0,

};



static const struct chip_data mt6397_core = {

	.cid_addr = MT6397_CID,

	.cid_shift = 0,

};



static int mt6397_probe(struct platform_device *pdev)

{

	int ret;

	unsigned int id;

	struct mt6397_chip *pmic;

	const struct chip_data *pmic_core;



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

	if (!pmic)
@@ -149,28 +165,30 @@ static int mt6397_probe(struct platform_device *pdev) 
	if (!pmic->regmap)

		return -ENODEV;



	platform_set_drvdata(pdev, pmic);

	pmic_core = of_device_get_match_data(&pdev->dev);

	if (!pmic_core)

		return -ENODEV;



	ret = regmap_read(pmic->regmap, MT6397_CID, &id);

	ret = regmap_read(pmic->regmap, pmic_core->cid_addr, &id);

	if (ret) {

		dev_err(pmic->dev, "Failed to read chip id: %d\n", ret);

		dev_err(&pdev->dev, "Failed to read chip id: %d\n", ret);

		return ret;

	}



	pmic->chip_id = (id >> pmic_core->cid_shift) & 0xff;



	platform_set_drvdata(pdev, pmic);



	pmic->irq = platform_get_irq(pdev, 0);

	if (pmic->irq <= 0)

		return pmic->irq;



	switch (id & 0xff) {

	case MT6323_CHIP_ID:

		pmic->int_con[0] = MT6323_INT_CON0;

		pmic->int_con[1] = MT6323_INT_CON1;

		pmic->int_status[0] = MT6323_INT_STATUS0;

		pmic->int_status[1] = MT6323_INT_STATUS1;

	ret = mt6397_irq_init(pmic);

	if (ret)

		return ret;



	switch (pmic->chip_id) {

	case MT6323_CHIP_ID:

		ret = devm_mfd_add_devices(&pdev->dev, -1, mt6323_devs,

					   ARRAY_SIZE(mt6323_devs), NULL,

					   0, pmic->irq_domain);
@@ -178,21 +196,13 @@ static int mt6397_probe(struct platform_device *pdev) 


	case MT6391_CHIP_ID:

	case MT6397_CHIP_ID:

		pmic->int_con[0] = MT6397_INT_CON0;

		pmic->int_con[1] = MT6397_INT_CON1;

		pmic->int_status[0] = MT6397_INT_STATUS0;

		pmic->int_status[1] = MT6397_INT_STATUS1;

		ret = mt6397_irq_init(pmic);

		if (ret)

			return ret;



		ret = devm_mfd_add_devices(&pdev->dev, -1, mt6397_devs,

					   ARRAY_SIZE(mt6397_devs), NULL,

					   0, pmic->irq_domain);

		break;



	default:

		dev_err(&pdev->dev, "unsupported chip: %d\n", id);

		dev_err(&pdev->dev, "unsupported chip: %d\n", pmic->chip_id);

		return -ENODEV;

	}
@@ -205,9 +215,15 @@ static int mt6397_probe(struct platform_device *pdev) 
}



static const struct of_device_id mt6397_of_match[] = {

	{ .compatible = "mediatek,mt6397" },

	{ .compatible = "mediatek,mt6323" },

	{ }

	{

		.compatible = "mediatek,mt6323",

		.data = &mt6323_core,

	}, {

		.compatible = "mediatek,mt6397",

		.data = &mt6397_core,

	}, {

		/* sentinel */

	}

};

MODULE_DEVICE_TABLE(of, mt6397_of_match);