Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 4ec1b54c4d082d4bad19b55ca709da7e7138d542

Authored by Andres Salomon
Committed by Samuel Ortiz
1 parent 8615e4cba1
Exists in master and in 39 other branches 8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y, smarc_imx_lf-5.15.y

mfd: mfd_cell is now implicitly available to mc13xxx drivers 

The cell's platform_data is now accessed with a helper function;
change clients to use that, and remove the now-unused data_size.

Note that mfd-core no longer makes a copy of platform_data, but the
mc13xxx-core driver creates the pdata structures on the stack.  In
order to get around that, the various ARM mach types that set the
pdata have been changed to hold the variable in static (global) memory.
Also note that __initdata references in aforementioned pdata structs
have been dropped.

Signed-off-by: Andres Salomon <dilinger@queued.net>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>

Showing 9 changed files with 39 additions and 40 deletions Side-by-side Diff

arch/arm/mach-imx/mach-mx27_3ds.c
Diff comments   View file @ 4ec1b54
... ... @@ -232,10 +232,13 @@
232 232 };
233 233  
234 234 /* MC13783 */
235   -static struct mc13xxx_platform_data mc13783_pdata __initdata = {
236   - .regulators = mx27_3ds_regulators,
237   - .num_regulators = ARRAY_SIZE(mx27_3ds_regulators),
238   - .flags = MC13XXX_USE_REGULATOR,
  235 +static struct mc13xxx_platform_data mc13783_pdata = {
  236 + .regulators = {
  237 + .regulators = mx27_3ds_regulators,
  238 + .num_regulators = ARRAY_SIZE(mx27_3ds_regulators),
  239 +
  240 + },
  241 + .flags = MC13783_USE_REGULATOR,
239 242 };
240 243  
241 244 /* SPI */
arch/arm/mach-imx/mach-pcm038.c
Diff comments   View file @ 4ec1b54
... ... @@ -263,10 +263,12 @@
263 263 };
264 264  
265 265 static struct mc13xxx_platform_data pcm038_pmic = {
266   - .regulators = pcm038_regulators,
267   - .num_regulators = ARRAY_SIZE(pcm038_regulators),
268   - .flags = MC13XXX_USE_ADC | MC13XXX_USE_REGULATOR |
269   - MC13XXX_USE_TOUCHSCREEN,
  266 + .regulators = {
  267 + .regulators = pcm038_regulators,
  268 + .num_regulators = ARRAY_SIZE(pcm038_regulators),
  269 + },
  270 + .flags = MC13783_USE_ADC | MC13783_USE_REGULATOR |
  271 + MC13783_USE_TOUCHSCREEN,
270 272 };
271 273  
272 274 static struct spi_board_info pcm038_spi_board_info[] __initdata = {
arch/arm/mach-mx3/mach-mx31_3ds.c
Diff comments   View file @ 4ec1b54
... ... @@ -488,10 +488,12 @@
488 488 };
489 489  
490 490 /* MC13783 */
491   -static struct mc13xxx_platform_data mc13783_pdata __initdata = {
492   - .regulators = mx31_3ds_regulators,
493   - .num_regulators = ARRAY_SIZE(mx31_3ds_regulators),
494   - .flags = MC13XXX_USE_REGULATOR | MC13XXX_USE_TOUCHSCREEN
  491 +static struct mc13xxx_platform_data mc13783_pdata = {
  492 + .regulators = {
  493 + .regulators = mx31_3ds_regulators,
  494 + .num_regulators = ARRAY_SIZE(mx31_3ds_regulators),
  495 + },
  496 + .flags = MC13783_USE_REGULATOR | MC13783_USE_TOUCHSCREEN,
495 497 };
496 498  
497 499 /* SPI */
arch/arm/mach-mx3/mach-mx31moboard.c
Diff comments   View file @ 4ec1b54
... ... @@ -268,8 +268,10 @@
268 268 };
269 269  
270 270 static struct mc13xxx_platform_data moboard_pmic = {
271   - .regulators = moboard_regulators,
272   - .num_regulators = ARRAY_SIZE(moboard_regulators),
  271 + .regulators = {
  272 + .regulators = moboard_regulators,
  273 + .num_regulators = ARRAY_SIZE(moboard_regulators),
  274 + },
273 275 .leds = &moboard_leds,
274 276 .flags = MC13XXX_USE_REGULATOR | MC13XXX_USE_RTC |
275 277 MC13XXX_USE_ADC | MC13XXX_USE_LED,
drivers/leds/leds-mc13783.c
Diff comments   View file @ 4ec1b54
... ... @@ -22,6 +22,7 @@
22 22 #include <linux/leds.h>
23 23 #include <linux/workqueue.h>
24 24 #include <linux/mfd/mc13783.h>
  25 +#include <linux/mfd/core.h>
25 26 #include <linux/slab.h>
26 27  
27 28 struct mc13783_led {
... ... @@ -183,7 +184,7 @@
183 184  
184 185 static int __devinit mc13783_leds_prepare(struct platform_device *pdev)
185 186 {
186   - struct mc13783_leds_platform_data *pdata = dev_get_platdata(&pdev->dev);
  187 + struct mc13783_leds_platform_data *pdata = mfd_get_data(pdev);
187 188 struct mc13783 *dev = dev_get_drvdata(pdev->dev.parent);
188 189 int ret = 0;
189 190 int reg = 0;
... ... @@ -264,7 +265,7 @@
264 265  
265 266 static int __devinit mc13783_led_probe(struct platform_device *pdev)
266 267 {
267   - struct mc13783_leds_platform_data *pdata = dev_get_platdata(&pdev->dev);
  268 + struct mc13783_leds_platform_data *pdata = mfd_get_data(pdev);
268 269 struct mc13783_led_platform_data *led_cur;
269 270 struct mc13783_led *led, *led_dat;
270 271 int ret, i;
... ... @@ -351,7 +352,7 @@
351 352  
352 353 static int __devexit mc13783_led_remove(struct platform_device *pdev)
353 354 {
354   - struct mc13783_leds_platform_data *pdata = dev_get_platdata(&pdev->dev);
  355 + struct mc13783_leds_platform_data *pdata = mfd_get_data(pdev);
355 356 struct mc13783_led *led = platform_get_drvdata(pdev);
356 357 struct mc13783 *dev = dev_get_drvdata(pdev->dev.parent);
357 358 int i;
drivers/mfd/mc13xxx-core.c
Diff comments   View file @ 4ec1b54
... ... @@ -683,14 +683,13 @@
683 683 EXPORT_SYMBOL_GPL(mc13783_adc_do_conversion);
684 684  
685 685 static int mc13xxx_add_subdevice_pdata(struct mc13xxx *mc13xxx,
686   - const char *format, void *pdata, size_t pdata_size)
  686 + const char *format, void *pdata)
687 687 {
688 688 char buf[30];
689 689 const char *name = mc13xxx_get_chipname(mc13xxx);
690 690  
691 691 struct mfd_cell cell = {
692 692 .platform_data = pdata,
693   - .data_size = pdata_size,
694 693 };
695 694  
696 695 /* there is no asnprintf in the kernel :-( */
... ... @@ -706,7 +705,7 @@
706 705  
707 706 static int mc13xxx_add_subdevice(struct mc13xxx *mc13xxx, const char *format)
708 707 {
709   - return mc13xxx_add_subdevice_pdata(mc13xxx, format, NULL, 0);
  708 + return mc13xxx_add_subdevice_pdata(mc13xxx, format, NULL);
710 709 }
711 710  
712 711 static int mc13xxx_probe(struct spi_device *spi)
713 712  
... ... @@ -764,13 +763,8 @@
764 763 mc13xxx_add_subdevice(mc13xxx, "%s-codec");
765 764  
766 765 if (pdata->flags & MC13XXX_USE_REGULATOR) {
767   - struct mc13xxx_regulator_platform_data regulator_pdata = {
768   - .num_regulators = pdata->num_regulators,
769   - .regulators = pdata->regulators,
770   - };
771   -
772 766 mc13xxx_add_subdevice_pdata(mc13xxx, "%s-regulator",
773   - &regulator_pdata, sizeof(regulator_pdata));
  767 + &pdata->regulators);
774 768 }
775 769  
776 770 if (pdata->flags & MC13XXX_USE_RTC)
... ... @@ -779,10 +773,8 @@
779 773 if (pdata->flags & MC13XXX_USE_TOUCHSCREEN)
780 774 mc13xxx_add_subdevice(mc13xxx, "%s-ts");
781 775  
782   - if (pdata->flags & MC13XXX_USE_LED) {
783   - mc13xxx_add_subdevice_pdata(mc13xxx, "%s-led",
784   - pdata->leds, sizeof(*pdata->leds));
785   - }
  776 + if (pdata->flags & MC13XXX_USE_LED)
  777 + mc13xxx_add_subdevice_pdata(mc13xxx, "%s-led", pdata->leds);
786 778  
787 779 return 0;
788 780 }
drivers/regulator/mc13783-regulator.c
Diff comments   View file @ 4ec1b54
... ... @@ -15,6 +15,7 @@
15 15 #include <linux/regulator/driver.h>
16 16 #include <linux/platform_device.h>
17 17 #include <linux/kernel.h>
  18 +#include <linux/mfd/core.h>
18 19 #include <linux/slab.h>
19 20 #include <linux/init.h>
20 21 #include <linux/err.h>
... ... @@ -336,8 +337,7 @@
336 337 {
337 338 struct mc13xxx_regulator_priv *priv;
338 339 struct mc13xxx *mc13783 = dev_get_drvdata(pdev->dev.parent);
339   - struct mc13783_regulator_platform_data *pdata =
340   - dev_get_platdata(&pdev->dev);
  340 + struct mc13783_regulator_platform_data *pdata = mfd_get_data(pdev);
341 341 struct mc13783_regulator_init_data *init_data;
342 342 int i, ret;
343 343  
... ... @@ -381,8 +381,7 @@
381 381 static int __devexit mc13783_regulator_remove(struct platform_device *pdev)
382 382 {
383 383 struct mc13xxx_regulator_priv *priv = platform_get_drvdata(pdev);
384   - struct mc13783_regulator_platform_data *pdata =
385   - dev_get_platdata(&pdev->dev);
  384 + struct mc13783_regulator_platform_data *pdata = mfd_get_data(pdev);
386 385 int i;
387 386  
388 387 platform_set_drvdata(pdev, NULL);
drivers/regulator/mc13892-regulator.c
Diff comments   View file @ 4ec1b54
... ... @@ -15,6 +15,7 @@
15 15 #include <linux/regulator/driver.h>
16 16 #include <linux/platform_device.h>
17 17 #include <linux/kernel.h>
  18 +#include <linux/mfd/core.h>
18 19 #include <linux/slab.h>
19 20 #include <linux/init.h>
20 21 #include <linux/err.h>
... ... @@ -520,8 +521,7 @@
520 521 {
521 522 struct mc13xxx_regulator_priv *priv;
522 523 struct mc13xxx *mc13892 = dev_get_drvdata(pdev->dev.parent);
523   - struct mc13xxx_regulator_platform_data *pdata =
524   - dev_get_platdata(&pdev->dev);
  524 + struct mc13xxx_regulator_platform_data *pdata = mfd_get_data(pdev);
525 525 struct mc13xxx_regulator_init_data *init_data;
526 526 int i, ret;
527 527 u32 val;
... ... @@ -595,8 +595,7 @@
595 595 static int __devexit mc13892_regulator_remove(struct platform_device *pdev)
596 596 {
597 597 struct mc13xxx_regulator_priv *priv = platform_get_drvdata(pdev);
598   - struct mc13xxx_regulator_platform_data *pdata =
599   - dev_get_platdata(&pdev->dev);
  598 + struct mc13xxx_regulator_platform_data *pdata = mfd_get_data(pdev);
600 599 int i;
601 600  
602 601 platform_set_drvdata(pdev, NULL);
include/linux/mfd/mc13xxx.h
Diff comments   View file @ 4ec1b54
... ... @@ -146,8 +146,7 @@
146 146 #define MC13XXX_USE_LED (1 << 5)
147 147 unsigned int flags;
148 148  
149   - int num_regulators;
150   - struct mc13xxx_regulator_init_data *regulators;
  149 + struct mc13xxx_regulator_platform_data regulators;
151 150 struct mc13xxx_leds_platform_data *leds;
152 151 };
153 152