diff options
| author | Rafał Miłecki <zajec5@gmail.com> | 2016-02-12 04:15:44 -0500 |
|---|---|---|
| committer | Kalle Valo <kvalo@codeaurora.org> | 2016-03-07 07:41:08 -0500 |
| commit | d6a3b51ada68c2bd3e184f4729ce626a1721cf74 (patch) | |
| tree | a328a3f4e2101ba5748ce468c3a622fcd2bbc79e /include/linux/bcma | |
| parent | 2e62f9b2a41e4ade1a0bb3c1bbda4defe4c67243 (diff) | |
bcma: move parallel flash support to separated file
This follows the way of handling other flashes and cleans code a bit. As
next task we will want to move flash code to ChipCommon driver as:
1) Flash controllers are accesible using ChipCommon registers
2) This code isn't MIPS specific
This change prepares bcma for that.
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Diffstat (limited to 'include/linux/bcma')
| -rw-r--r-- | include/linux/bcma/bcma_driver_chipcommon.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/include/linux/bcma/bcma_driver_chipcommon.h b/include/linux/bcma/bcma_driver_chipcommon.h index 16eaaad9dda5..846513c73606 100644 --- a/include/linux/bcma/bcma_driver_chipcommon.h +++ b/include/linux/bcma/bcma_driver_chipcommon.h | |||
| @@ -576,10 +576,11 @@ struct bcma_chipcommon_pmu { | |||
| 576 | u32 crystalfreq; /* The active crystal frequency (in kHz) */ | 576 | u32 crystalfreq; /* The active crystal frequency (in kHz) */ |
| 577 | }; | 577 | }; |
| 578 | 578 | ||
| 579 | #ifdef CONFIG_BCMA_DRIVER_MIPS | 579 | #ifdef CONFIG_BCMA_PFLASH |
| 580 | struct bcma_pflash { | 580 | struct bcma_pflash { |
| 581 | bool present; | 581 | bool present; |
| 582 | }; | 582 | }; |
| 583 | #endif | ||
| 583 | 584 | ||
| 584 | #ifdef CONFIG_BCMA_SFLASH | 585 | #ifdef CONFIG_BCMA_SFLASH |
| 585 | struct mtd_info; | 586 | struct mtd_info; |
| @@ -603,6 +604,7 @@ struct bcma_nflash { | |||
| 603 | }; | 604 | }; |
| 604 | #endif | 605 | #endif |
| 605 | 606 | ||
| 607 | #ifdef CONFIG_BCMA_DRIVER_MIPS | ||
| 606 | struct bcma_serial_port { | 608 | struct bcma_serial_port { |
| 607 | void *regs; | 609 | void *regs; |
| 608 | unsigned long clockspeed; | 610 | unsigned long clockspeed; |
| @@ -622,8 +624,9 @@ struct bcma_drv_cc { | |||
| 622 | /* Fast Powerup Delay constant */ | 624 | /* Fast Powerup Delay constant */ |
| 623 | u16 fast_pwrup_delay; | 625 | u16 fast_pwrup_delay; |
| 624 | struct bcma_chipcommon_pmu pmu; | 626 | struct bcma_chipcommon_pmu pmu; |
| 625 | #ifdef CONFIG_BCMA_DRIVER_MIPS | 627 | #ifdef CONFIG_BCMA_PFLASH |
| 626 | struct bcma_pflash pflash; | 628 | struct bcma_pflash pflash; |
| 629 | #endif | ||
| 627 | #ifdef CONFIG_BCMA_SFLASH | 630 | #ifdef CONFIG_BCMA_SFLASH |
| 628 | struct bcma_sflash sflash; | 631 | struct bcma_sflash sflash; |
| 629 | #endif | 632 | #endif |
| @@ -631,6 +634,7 @@ struct bcma_drv_cc { | |||
| 631 | struct bcma_nflash nflash; | 634 | struct bcma_nflash nflash; |
| 632 | #endif | 635 | #endif |
| 633 | 636 | ||
| 637 | #ifdef CONFIG_BCMA_DRIVER_MIPS | ||
| 634 | int nr_serial_ports; | 638 | int nr_serial_ports; |
| 635 | struct bcma_serial_port serial_ports[4]; | 639 | struct bcma_serial_port serial_ports[4]; |
| 636 | #endif /* CONFIG_BCMA_DRIVER_MIPS */ | 640 | #endif /* CONFIG_BCMA_DRIVER_MIPS */ |
