Add 5.4 kernel and switch to using it

recipes-kernel/linux/files/wifi.cfg

@@ -0,0 +1,4 @@
+CONFIG_ATH10K=m
+CONFIG_ATH10K_PCI=y
+CONFIG_ATH_CARDS=y
+CONFIG_WLAN=y

recipes-kernel/linux/linux-coral-5.4/0001-regulator-bd718x7-Add-MODULE_ALIAS.patch

@@ -0,0 +1,29 @@
+From 754c063fa38f0d4535e8d022f895e385728ca846 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Guido=20G=C3=BCnther?= <[email protected]>
+Date: Mon, 30 Sep 2019 22:26:00 +0200
+Subject: [PATCH 01/21] regulator: bd718x7: Add MODULE_ALIAS()
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This fixes device probing when built as a module
+
+Signed-off-by: Guido Günther <[email protected]>
+Link: https://lore.kernel.org/r/46ce3400e227dd88d51486c02a6152c9ec52acbb.1569875042.git.agx@sigxcpu.org
+Signed-off-by: Mark Brown <[email protected]>
+---
+ drivers/regulator/bd718x7-regulator.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/drivers/regulator/bd718x7-regulator.c b/drivers/regulator/bd718x7-regulator.c
+index bdab46a5c461..13a43eee2e46 100644
+--- a/drivers/regulator/bd718x7-regulator.c
++++ b/drivers/regulator/bd718x7-regulator.c
+@@ -1293,3 +1293,4 @@ module_platform_driver(bd718xx_regulator);
+ MODULE_AUTHOR("Matti Vaittinen <[email protected]>");
+ MODULE_DESCRIPTION("BD71837/BD71847 voltage regulator driver");
+ MODULE_LICENSE("GPL");
++MODULE_ALIAS("platform:bd718xx-pmic");
+-- 
+2.39.2
+

recipes-kernel/linux/linux-coral-5.4/0002-regulator-bd718x7-Simplify-the-code-by-removing-stru.patch

@@ -0,0 +1,92 @@
+From 28e6442b240279af714dbfd0144b2f5e8cbc2b6a Mon Sep 17 00:00:00 2001
+From: Axel Lin <[email protected]>
+Date: Wed, 8 Jan 2020 09:42:55 +0800
+Subject: [PATCH 02/21] regulator: bd718x7: Simplify the code by removing
+ struct bd718xx_pmic_inits
+
+Nowdays ROHM_CHIP_TYPE_AMOUNT includes not only BD71837/BD71847 but also
+BD70528/BD71828 which are not supported by this driver. So it seems not
+necessay to have pmic_regulators[ROHM_CHIP_TYPE_AMOUNT] as mapping table.
+Simplify the code by removing struct bd718xx_pmic_inits and
+pmic_regulators[ROHM_CHIP_TYPE_AMOUNT].
+
+Signed-off-by: Axel Lin <[email protected]>
+Link: https://lore.kernel.org/r/[email protected]
+Signed-off-by: Mark Brown <[email protected]>
+---
+ drivers/regulator/bd718x7-regulator.c | 34 +++++++++++----------------
+ 1 file changed, 14 insertions(+), 20 deletions(-)
+
+diff --git a/drivers/regulator/bd718x7-regulator.c b/drivers/regulator/bd718x7-regulator.c
+index 13a43eee2e46..8f9b2d8eaf10 100644
+--- a/drivers/regulator/bd718x7-regulator.c
++++ b/drivers/regulator/bd718x7-regulator.c
+@@ -1142,28 +1142,14 @@ static const struct bd718xx_regulator_data bd71837_regulators[] = {
+ 	},
+ };
+
+-struct bd718xx_pmic_inits {
+-	const struct bd718xx_regulator_data *r_datas;
+-	unsigned int r_amount;
+-};
+-
+ static int bd718xx_probe(struct platform_device *pdev)
+ {
+ 	struct bd718xx *mfd;
+ 	struct regulator_config config = { 0 };
+-	struct bd718xx_pmic_inits pmic_regulators[ROHM_CHIP_TYPE_AMOUNT] = {
+-		[ROHM_CHIP_TYPE_BD71837] = {
+-			.r_datas = bd71837_regulators,
+-			.r_amount = ARRAY_SIZE(bd71837_regulators),
+-		},
+-		[ROHM_CHIP_TYPE_BD71847] = {
+-			.r_datas = bd71847_regulators,
+-			.r_amount = ARRAY_SIZE(bd71847_regulators),
+-		},
+-	};
+-
+ 	int i, j, err;
+ 	bool use_snvs;
++	const struct bd718xx_regulator_data *reg_data;
++	unsigned int num_reg_data;
+
+ 	mfd = dev_get_drvdata(pdev->dev.parent);
+ 	if (!mfd) {
+@@ -1172,8 +1158,16 @@ static int bd718xx_probe(struct platform_device *pdev)
+ 		goto err;
+ 	}
+
+-	if (mfd->chip.chip_type >= ROHM_CHIP_TYPE_AMOUNT ||
+-	    !pmic_regulators[mfd->chip.chip_type].r_datas) {
++	switch (mfd->chip.chip_type) {
++	case ROHM_CHIP_TYPE_BD71837:
++		reg_data = bd71837_regulators;
++		num_reg_data = ARRAY_SIZE(bd71837_regulators);
++		break;
++	case ROHM_CHIP_TYPE_BD71847:
++		reg_data = bd71847_regulators;
++		num_reg_data = ARRAY_SIZE(bd71847_regulators);
++		break;
++	default:
+ 		dev_err(&pdev->dev, "Unsupported chip type\n");
+ 		err = -EINVAL;
+ 		goto err;
+@@ -1215,13 +1209,13 @@ static int bd718xx_probe(struct platform_device *pdev)
+ 		}
+ 	}
+
+-	for (i = 0; i < pmic_regulators[mfd->chip.chip_type].r_amount; i++) {
++	for (i = 0; i < num_reg_data; i++) {
+
+ 		const struct regulator_desc *desc;
+ 		struct regulator_dev *rdev;
+ 		const struct bd718xx_regulator_data *r;
+
+-		r = &pmic_regulators[mfd->chip.chip_type].r_datas[i];
++		r = &reg_data[i];
+ 		desc = &r->desc;
+
+ 		config.dev = pdev->dev.parent;
+-- 
+2.39.2
+

recipes-kernel/linux/linux-coral-5.4/0003-mfd-Rohm-PMICs-Use-platform_device_id-to-match-MFD-s.patch

@@ -0,0 +1,229 @@
+From 998dc427dbb50c81f2a588667bff4a1328460c24 Mon Sep 17 00:00:00 2001
+From: Matti Vaittinen <[email protected]>
+Date: Mon, 20 Jan 2020 15:42:38 +0200
+Subject: [PATCH 03/21] mfd: Rohm PMICs: Use platform_device_id to match MFD
+ sub-devices
+
+Thanks to Stephen Boyd I today learned we can use platform_device_id
+to do device and module matching for MFD sub-devices!
+
+Do device matching using the platform_device_id instead of using
+explicit module_aliases to load modules and custom parent-data field
+to do module loading and sub-device matching.
+
+Cc: Stephen Boyd <[email protected]>
+Signed-off-by: Matti Vaittinen <[email protected]>
+Acked-by: Mark Brown <[email protected]>
+Signed-off-by: Lee Jones <[email protected]>
+---
+ drivers/clk/clk-bd718x7.c             | 12 ++++++++-
+ drivers/mfd/rohm-bd70528.c            |  3 +--
+ drivers/mfd/rohm-bd718x7.c            | 39 ++++++++++++++++++++++-----
+ drivers/regulator/bd718x7-regulator.c | 11 +++++++-
+ include/linux/mfd/rohm-generic.h      |  3 +--
+ 5 files changed, 55 insertions(+), 13 deletions(-)
+
+diff --git a/drivers/clk/clk-bd718x7.c b/drivers/clk/clk-bd718x7.c
+index ae6e5baee330..1c1764f74d0a 100644
+--- a/drivers/clk/clk-bd718x7.c
++++ b/drivers/clk/clk-bd718x7.c
+@@ -74,6 +74,7 @@ static int bd71837_clk_probe(struct platform_device *pdev)
+ 		.name = "bd718xx-32k-out",
+ 		.ops = &bd71837_clk_ops,
+ 	};
++	enum rohm_chip_type chip = platform_get_device_id(pdev)->driver_data;
+
+ 	c = devm_kzalloc(&pdev->dev, sizeof(*c), GFP_KERNEL);
+ 	if (!c)
+@@ -87,7 +88,7 @@ static int bd71837_clk_probe(struct platform_device *pdev)
+ 		dev_err(&pdev->dev, "No parent clk found\n");
+ 		return -EINVAL;
+ 	}
+-	switch (mfd->chip_type) {
++	switch (chip) {
+ 	case ROHM_CHIP_TYPE_BD71837:
+ 	case ROHM_CHIP_TYPE_BD71847:
+ 		c->reg = BD718XX_REG_OUT32K;
+@@ -121,11 +122,20 @@ static int bd71837_clk_probe(struct platform_device *pdev)
+ 	return rval;
+ }
+
++static const struct platform_device_id bd718x7_clk_id[] = {
++	{ "bd71837-clk", ROHM_CHIP_TYPE_BD71837 },
++	{ "bd71847-clk", ROHM_CHIP_TYPE_BD71847 },
++	{ "bd70528-clk", ROHM_CHIP_TYPE_BD70528 },
++	{ },
++};
++MODULE_DEVICE_TABLE(platform, bd718x7_clk_id);
++
+ static struct platform_driver bd71837_clk = {
+ 	.driver = {
+ 		.name = "bd718xx-clk",
+ 	},
+ 	.probe = bd71837_clk_probe,
++	.id_table = bd718x7_clk_id,
+ };
+
+ module_platform_driver(bd71837_clk);
+diff --git a/drivers/mfd/rohm-bd70528.c b/drivers/mfd/rohm-bd70528.c
+index 55599d5c5c86..e66a4a1c3731 100644
+--- a/drivers/mfd/rohm-bd70528.c
++++ b/drivers/mfd/rohm-bd70528.c
+@@ -48,7 +48,7 @@ static struct mfd_cell bd70528_mfd_cells[] = {
+ 	 * We use BD71837 driver to drive the clock block. Only differences to
+ 	 * BD70528 clock gate are the register address and mask.
+ 	 */
+-	{ .name = "bd718xx-clk", },
++	{ .name = "bd70528-clk", },
+ 	{ .name = "bd70528-wdt", },
+ 	{
+ 		.name = "bd70528-power",
+@@ -237,7 +237,6 @@ static int bd70528_i2c_probe(struct i2c_client *i2c,
+
+ 	dev_set_drvdata(&i2c->dev, &bd70528->chip);
+
+-	bd70528->chip.chip_type = ROHM_CHIP_TYPE_BD70528;
+ 	bd70528->chip.regmap = devm_regmap_init_i2c(i2c, &bd70528_regmap);
+ 	if (IS_ERR(bd70528->chip.regmap)) {
+ 		dev_err(&i2c->dev, "Failed to initialize Regmap\n");
+diff --git a/drivers/mfd/rohm-bd718x7.c b/drivers/mfd/rohm-bd718x7.c
+index 85e7f5133365..bb86ec829079 100644
+--- a/drivers/mfd/rohm-bd718x7.c
++++ b/drivers/mfd/rohm-bd718x7.c
+@@ -30,14 +30,24 @@ static struct gpio_keys_platform_data bd718xx_powerkey_data = {
+ 	.name = "bd718xx-pwrkey",
+ };
+
+-static struct mfd_cell bd718xx_mfd_cells[] = {
++static struct mfd_cell bd71837_mfd_cells[] = {
+ 	{
+ 		.name = "gpio-keys",
+ 		.platform_data = &bd718xx_powerkey_data,
+ 		.pdata_size = sizeof(bd718xx_powerkey_data),
+ 	},
+-	{ .name = "bd718xx-clk", },
+-	{ .name = "bd718xx-pmic", },
++	{ .name = "bd71837-clk", },
++	{ .name = "bd71837-pmic", },
++};
++
++static struct mfd_cell bd71847_mfd_cells[] = {
++	{
++		.name = "gpio-keys",
++		.platform_data = &bd718xx_powerkey_data,
++		.pdata_size = sizeof(bd718xx_powerkey_data),
++	},
++	{ .name = "bd71847-clk", },
++	{ .name = "bd71847-pmic", },
+ };
+
+ static const struct regmap_irq bd718xx_irqs[] = {
+@@ -124,6 +134,9 @@ static int bd718xx_i2c_probe(struct i2c_client *i2c,
+ {
+ 	struct bd718xx *bd718xx;
+ 	int ret;
++	unsigned int chip_type;
++	struct mfd_cell *mfd;
++	int cells;
+
+ 	if (!i2c->irq) {
+ 		dev_err(&i2c->dev, "No IRQ configured\n");
+@@ -136,8 +149,21 @@ static int bd718xx_i2c_probe(struct i2c_client *i2c,
+ 		return -ENOMEM;
+
+ 	bd718xx->chip_irq = i2c->irq;
+-	bd718xx->chip.chip_type = (unsigned int)(uintptr_t)
+-				of_device_get_match_data(&i2c->dev);
++	chip_type = (unsigned int)(uintptr_t)
++		    of_device_get_match_data(&i2c->dev);
++	switch (chip_type) {
++	case ROHM_CHIP_TYPE_BD71837:
++		mfd = bd71837_mfd_cells;
++		cells = ARRAY_SIZE(bd71837_mfd_cells);
++		break;
++	case ROHM_CHIP_TYPE_BD71847:
++		mfd = bd71847_mfd_cells;
++		cells = ARRAY_SIZE(bd71847_mfd_cells);
++		break;
++	default:
++		dev_err(&i2c->dev, "Unknown device type");
++		return -EINVAL;
++	}
+ 	bd718xx->chip.dev = &i2c->dev;
+ 	dev_set_drvdata(&i2c->dev, bd718xx);
+
+@@ -170,8 +196,7 @@ static int bd718xx_i2c_probe(struct i2c_client *i2c,
+ 	button.irq = ret;
+
+ 	ret = devm_mfd_add_devices(bd718xx->chip.dev, PLATFORM_DEVID_AUTO,
+-				   bd718xx_mfd_cells,
+-				   ARRAY_SIZE(bd718xx_mfd_cells), NULL, 0,
++				   mfd, cells, NULL, 0,
+ 				   regmap_irq_get_domain(bd718xx->irq_data));
+ 	if (ret)
+ 		dev_err(&i2c->dev, "Failed to create subdevices\n");
+diff --git a/drivers/regulator/bd718x7-regulator.c b/drivers/regulator/bd718x7-regulator.c
+index 8f9b2d8eaf10..1ad69f7b6d9f 100644
+--- a/drivers/regulator/bd718x7-regulator.c
++++ b/drivers/regulator/bd718x7-regulator.c
+@@ -1150,6 +1150,7 @@ static int bd718xx_probe(struct platform_device *pdev)
+ 	bool use_snvs;
+ 	const struct bd718xx_regulator_data *reg_data;
+ 	unsigned int num_reg_data;
++	enum rohm_chip_type chip = platform_get_device_id(pdev)->driver_data;
+
+ 	mfd = dev_get_drvdata(pdev->dev.parent);
+ 	if (!mfd) {
+@@ -1158,7 +1159,7 @@ static int bd718xx_probe(struct platform_device *pdev)
+ 		goto err;
+ 	}
+
+-	switch (mfd->chip.chip_type) {
++	switch (chip) {
+ 	case ROHM_CHIP_TYPE_BD71837:
+ 		reg_data = bd71837_regulators;
+ 		num_reg_data = ARRAY_SIZE(bd71837_regulators);
+@@ -1275,11 +1276,19 @@ static int bd718xx_probe(struct platform_device *pdev)
+ 	return err;
+ }
+
++static const struct platform_device_id bd718x7_pmic_id[] = {
++	{ "bd71837-pmic", ROHM_CHIP_TYPE_BD71837 },
++	{ "bd71847-pmic", ROHM_CHIP_TYPE_BD71847 },
++	{ },
++};
++MODULE_DEVICE_TABLE(platform, bd718x7_pmic_id);
++
+ static struct platform_driver bd718xx_regulator = {
+ 	.driver = {
+ 		.name = "bd718xx-pmic",
+ 	},
+ 	.probe = bd718xx_probe,
++	.id_table = bd718x7_pmic_id,
+ };
+
+ module_platform_driver(bd718xx_regulator);
+diff --git a/include/linux/mfd/rohm-generic.h b/include/linux/mfd/rohm-generic.h
+index bff15ac26f2c..922f88008232 100644
+--- a/include/linux/mfd/rohm-generic.h
++++ b/include/linux/mfd/rohm-generic.h
+@@ -4,7 +4,7 @@
+ #ifndef __LINUX_MFD_ROHM_H__
+ #define __LINUX_MFD_ROHM_H__
+
+-enum {
++enum rohm_chip_type {
+ 	ROHM_CHIP_TYPE_BD71837 = 0,
+ 	ROHM_CHIP_TYPE_BD71847,
+ 	ROHM_CHIP_TYPE_BD70528,
+@@ -12,7 +12,6 @@ enum {
+ };
+
+ struct rohm_regmap_dev {
+-	unsigned int chip_type;
+ 	struct device *dev;
+ 	struct regmap *regmap;
+ };
+-- 
+2.39.2
+