ddr: altera: Move struct sdram_prot_rule prototype

Move the structure prototype from sdram.h header file into sdram.c
source file, since it is used only there and for local purpose only.
There is no point in having it global.

While at this move, fix the data types in the structure from uintNN_t
to uNN and fix the coding style a bit.

Signed-off-by: Marek Vasut <marex@denx.de>

diff --git a/arch/arm/mach-socfpga/include/mach/sdram.h b/arch/arm/mach-socfpga/include/mach/sdram.h
index b4c1a2ff69944f0cb2b8651a83290d7f2822ad66..873ea25e16ab9f160dfe1bfe6e7fffcf0b8ae134 100644 (file)
--- a/arch/arm/mach-socfpga/include/mach/sdram.h
+++ b/arch/arm/mach-socfpga/include/mach/sdram.h
@@ -73,19 +73,6 @@ struct socfpga_sdr_ctrl {
        u32     phy_ctrl2;
 };
 
-struct sdram_prot_rule {
-       uint64_t        sdram_start; /* SDRAM start address */
-       uint64_t        sdram_end; /* SDRAM end address */
-       uint32_t        rule; /* SDRAM protection rule number: 0-19 */
-       int             valid; /* Rule valid or not? 1 - valid, 0 not*/
-
-       uint32_t        security;
-       uint32_t        portmask;
-       uint32_t        result;
-       uint32_t        lo_prot_id;
-       uint32_t        hi_prot_id;
-};
-
 #define SDR_CTRLGRP_CTRLCFG_NODMPINS_LSB 23
 #define SDR_CTRLGRP_CTRLCFG_NODMPINS_MASK 0x00800000
 #define SDR_CTRLGRP_CTRLCFG_DQSTRKEN_LSB 22

diff --git a/drivers/ddr/altera/sdram.c b/drivers/ddr/altera/sdram.c
index 2822d1d59e454fc8095eff5c35c3c09ae3593d80..45846debdfea3b4406671ad01f6d14ff4aa7cf62 100644 (file)
--- a/drivers/ddr/altera/sdram.c
+++ b/drivers/ddr/altera/sdram.c
@@ -22,6 +22,19 @@
 
 DECLARE_GLOBAL_DATA_PTR;
 
+struct sdram_prot_rule {
+       u64     sdram_start;    /* SDRAM start address */
+       u64     sdram_end;      /* SDRAM end address */
+       u32     rule;           /* SDRAM protection rule number: 0-19 */
+       int     valid;          /* Rule valid or not? 1 - valid, 0 not*/
+
+       u32     security;
+       u32     portmask;
+       u32     result;
+       u32     lo_prot_id;
+       u32     hi_prot_id;
+};
+
 static struct socfpga_system_manager *sysmgr_regs =
        (struct socfpga_system_manager *)SOCFPGA_SYSMGR_ADDRESS;
 static struct socfpga_sdr_ctrl *sdr_ctrl =