[U-Boot] [PATCH v11 2/6] arm: socfpga: Restructure FPGA driver in the preparation to support A10

Marek Vasut
2017-07-12T10:55:41Z

On 07/03/2017 11:07 AM, tien.fong.chee at intel.com wrote:
> From: Tien Fong Chee <tien.fong.chee@intel.com>
>
> Move FPGA driver which is Gen5 specific code into Gen5 driver file
> and keeping common FPGA driver intact. All the changes are still keeping
> in driver/fpga/ and no functional change. Subsequent patch would move
> FPGA manager driver from arch/arm into driver/fpga/.
>
> Signed-off-by: Tien Fong Chee <tien.fong.chee@intel.com>
> Reviewed-by: Ley Foon Tan <ley.foon.tan@intel.com>
> Reviewed-by: Dinh Nguyen <dinguyen@kernel.org>
> ---
> arch/arm/mach-socfpga/Makefile | 2 +-
> arch/arm/mach-socfpga/include/mach/fpga_manager.h | 68 +-----
> .../mach/{fpga_manager.h => fpga_manager_gen5.h} | 69 +++---
> drivers/fpga/Makefile | 1 +
> drivers/fpga/socfpga.c | 241 +--------------------
> drivers/fpga/{socfpga.c => socfpga_gen5.c} | 54 +----
> 6 files changed, 49 insertions(+), 386 deletions(-)
> copy arch/arm/mach-socfpga/include/mach/{fpga_manager.h => fpga_manager_gen5.h} (57%)
> copy drivers/fpga/{socfpga.c => socfpga_gen5.c} (83%)
[...]

> index f1b2f2c..5200de7 100644
> --- a/drivers/fpga/socfpga.c
> +++ b/drivers/fpga/socfpga.c
> @@ -14,23 +14,12 @@
>
> DECLARE_GLOBAL_DATA_PTR;
>
> -/* Timeout count */
> -#define FPGA_TIMEOUT_CNT 0x1000000
> +#define FPGA_TIMEOUT_CNT 0x1000000

Drop this hunk.

> static struct socfpga_fpga_manager *fpgamgr_regs =
> (struct socfpga_fpga_manager *)SOCFPGA_FPGAMGRREGS_ADDRESS;
> -static struct socfpga_system_manager *sysmgr_regs =
> - (struct socfpga_system_manager *)SOCFPGA_SYSMGR_ADDRESS;
>
> -/* Set CD ratio */
> -static void fpgamgr_set_cd_ratio(unsigned long ratio)
> -{
> - clrsetbits_le32(&fpgamgr_regs->ctrl,
> - 0x3 << FPGAMGRREGS_CTRL_CDRATIO_LSB,
> - (ratio & 0x3) << FPGAMGRREGS_CTRL_CDRATIO_LSB);
> -}
[...]
--
Best regards,
Marek Vasut