Move Freescale DDR and IFC drivers to common drivers
Subsystems (4)
cover Move Freescale DDR and IFC drivers to common drivers
This patch set attempts to move Freescale DDR and IFC drivers to common drivers, to prepare sharing between powerpc-based and ARM-based SoCs.
[Patch v1 1/6] Driver/DDR: Moving Freescale DDR driver to a common [Patch v1 2/6] Driver/DDR: combine ccsr_ddr for 83xx, 85xx and 86xx [Patch v1 3/6] Driver/DDR: Add Freescale DDR driver for ARM [Patch v1 4/6] powerpc/mpc8xxx: Extend DDR registers' fields [Patch v1 5/6] Driver/DDR: Update DDR driver to allow non-zero base [Patch v1 6/6] Driver/IFC: Move Freescale IFC driver to a common
York
PATCH 1/6 Driver/DDR: Moving Freescale DDR driver to a common driver
Freescale DDR driver has been used for mpc83xx, mpc85xx, mpc86xx SoCs. The similar DDR controllers will be used for ARM-based SoCs.
---
Makefile | 4 +-
README | 39 ++++++++++++++--
arch/powerpc/cpu/mpc83xx/Makefile | 8 +---
arch/powerpc/cpu/mpc85xx/Makefile | 42 -----------------
arch/powerpc/cpu/mpc85xx/cpu.c | 16 +++----
arch/powerpc/cpu/mpc85xx/mp.c | 2 +-
arch/powerpc/cpu/mpc86xx/Makefile | 3 --
arch/powerpc/cpu/mpc8xxx/ddr/Makefile | 45 ------------------
arch/powerpc/include/asm/config.h | 6 +++
arch/powerpc/include/asm/config_mpc85xx.h | 13 ++++++
arch/powerpc/include/asm/config_mpc86xx.h | 2 +
arch/powerpc/include/asm/immap_83xx.h | 2 +-
arch/powerpc/include/asm/immap_85xx.h | 6 +--
arch/powerpc/include/asm/immap_86xx.h | 4 +-
board/exmeritus/hww1u1a/ddr.c | 4 +-
board/exmeritus/hww1u1a/hww1u1a.c | 4 +-
board/freescale/b4860qds/ddr.c | 6 +--
board/freescale/bsc9131rdb/ddr.c | 4 +-
board/freescale/bsc9131rdb/spl_minimal.c | 4 +-
board/freescale/bsc9132qds/bsc9132qds.c | 4 +-
board/freescale/bsc9132qds/ddr.c | 4 +-
board/freescale/bsc9132qds/spl_minimal.c | 4 +-
board/freescale/c29xpcie/ddr.c | 4 +-
board/freescale/corenet_ds/ddr.c | 4 +-
board/freescale/corenet_ds/eth_p4080.c | 2 +-
board/freescale/corenet_ds/p3041ds_ddr.c | 2 +-
board/freescale/corenet_ds/p4080ds_ddr.c | 2 +-
board/freescale/corenet_ds/p5020ds_ddr.c | 2 +-
board/freescale/corenet_ds/p5040ds_ddr.c | 2 +-
board/freescale/mpc8349emds/ddr.c | 4 +-
board/freescale/mpc8349emds/mpc8349emds.c | 2 +-
board/freescale/mpc8536ds/ddr.c | 4 +-
board/freescale/mpc8536ds/mpc8536ds.c | 2 +-
board/freescale/mpc8540ads/ddr.c | 4 +-
board/freescale/mpc8540ads/mpc8540ads.c | 4 +-
board/freescale/mpc8541cds/ddr.c | 4 +-
board/freescale/mpc8541cds/mpc8541cds.c | 2 +-
board/freescale/mpc8544ds/ddr.c | 4 +-
board/freescale/mpc8544ds/mpc8544ds.c | 2 +-
board/freescale/mpc8548cds/ddr.c | 4 +-
board/freescale/mpc8548cds/mpc8548cds.c | 2 +-
board/freescale/mpc8555cds/ddr.c | 4 +-
board/freescale/mpc8555cds/mpc8555cds.c | 2 +-
board/freescale/mpc8560ads/ddr.c | 4 +-
board/freescale/mpc8560ads/mpc8560ads.c | 4 +-
board/freescale/mpc8568mds/ddr.c | 4 +-
board/freescale/mpc8568mds/mpc8568mds.c | 2 +-
board/freescale/mpc8569mds/ddr.c | 4 +-
board/freescale/mpc8569mds/mpc8569mds.c | 4 +-
board/freescale/mpc8572ds/ddr.c | 4 +-
board/freescale/mpc8572ds/mpc8572ds.c | 2 +-
board/freescale/mpc8610hpcd/ddr.c | 4 +-
board/freescale/mpc8610hpcd/mpc8610hpcd.c | 2 +-
board/freescale/mpc8641hpcn/ddr.c | 4 +-
board/freescale/mpc8641hpcn/mpc8641hpcn.c | 2 +-
board/freescale/p1010rdb/ddr.c | 4 +-
board/freescale/p1010rdb/spl_minimal.c | 4 +-
board/freescale/p1022ds/ddr.c | 4 +-
board/freescale/p1022ds/p1022ds.c | 2 +-
board/freescale/p1022ds/spl_minimal.c | 2 +-
board/freescale/p1023rdb/ddr.c | 4 +-
board/freescale/p1023rdb/p1023rdb.c | 2 +-
board/freescale/p1023rds/p1023rds.c | 4 +-
board/freescale/p1_p2_rdb/ddr.c | 2 +-
board/freescale/p1_p2_rdb_pc/ddr.c | 4 +-
board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c | 2 +-
board/freescale/p1_p2_rdb_pc/spl_minimal.c | 2 +-
board/freescale/p1_twr/ddr.c | 4 +-
board/freescale/p1_twr/p1_twr.c | 2 +-
board/freescale/p2020come/ddr.c | 4 +-
board/freescale/p2020ds/ddr.c | 4 +-
board/freescale/p2020ds/p2020ds.c | 4 +-
board/freescale/p2041rdb/ddr.c | 4 +-
board/freescale/t1040qds/ddr.c | 4 +-
board/freescale/t4qds/ddr.c | 4 +-
board/freescale/t4qds/eth.c | 2 +-
board/gdsys/p1022/controlcenterd.c | 2 +-
board/gdsys/p1022/ddr.c | 4 +-
board/keymile/kmp204x/ddr.c | 4 +-
board/sbc8548/ddr.c | 6 +--
board/sbc8548/sbc8548.c | 2 +-
board/sbc8641d/ddr.c | 4 +-
board/sbc8641d/sbc8641d.c | 2 +-
board/socrates/ddr.c | 4 +-
board/socrates/sdram.c | 4 +-
board/stx/stxgp3/ddr.c | 4 +-
board/stx/stxgp3/stxgp3.c | 2 +-
board/stx/stxssa/ddr.c | 4 +-
board/stx/stxssa/stxssa.c | 2 +-
board/xes/xpedite517x/ddr.c | 4 +-
board/xes/xpedite517x/xpedite517x.c | 2 +-
board/xes/xpedite520x/ddr.c | 4 +-
board/xes/xpedite537x/ddr.c | 4 +-
board/xes/xpedite550x/ddr.c | 4 +-
drivers/ddr/fsl/Makefile | 49 ++++++++++++++++++++
.../mpc8xxx/ddr => drivers/ddr/fsl}/ctrl_regs.c | 8 ++--
.../ddr => drivers/ddr/fsl}/ddr1_dimm_params.c | 4 +-
.../ddr => drivers/ddr/fsl}/ddr2_dimm_params.c | 4 +-
.../ddr => drivers/ddr/fsl}/ddr3_dimm_params.c | 4 +-
.../mpc8xxx/ddr => drivers/ddr/fsl}/interactive.c | 5 +-
.../ddr/fsl}/lc_common_dimm_params.c | 4 +-
.../cpu/mpc8xxx/ddr => drivers/ddr/fsl}/main.c | 4 +-
.../ddr/fsl/mpc85xx_ddr_gen1.c | 6 +--
.../ddr/fsl/mpc85xx_ddr_gen2.c | 4 +-
.../ddr/fsl/mpc85xx_ddr_gen3.c | 16 +++----
.../ddr-8641.c => drivers/ddr/fsl/mpc86xx_ddr.c | 6 +--
.../cpu/mpc8xxx/ddr => drivers/ddr/fsl}/options.c | 4 +-
.../cpu/mpc8xxx/ddr => drivers/ddr/fsl}/util.c | 10 ++--
.../mpc8xxx/ddr => include}/common_timing_params.h | 0
.../cpu/mpc8xxx/ddr/ddr.h => include/fsl_ddr.h | 6 +--
.../include/asm => include}/fsl_ddr_dimm_params.h | 0
.../include/asm => include}/fsl_ddr_sdram.h | 0
nand_spl/board/freescale/mpc8569mds/nand_boot.c | 2 +-
nand_spl/board/freescale/p1023rds/nand_boot.c | 4 +-
nand_spl/board/freescale/p1_p2_rdb/nand_boot.c | 2 +-
spl/Makefile | 2 +-
116 files changed, 304 insertions(+), 298 deletions(-)
delete mode 100644 arch/powerpc/cpu/mpc8xxx/ddr/Makefile
create mode 100644 drivers/ddr/fsl/Makefile
rename {arch/powerpc/cpu/mpc8xxx/ddr => drivers/ddr/fsl}/ctrl_regs.c (99%)
rename {arch/powerpc/cpu/mpc8xxx/ddr => drivers/ddr/fsl}/ddr1_dimm_params.c (99%)
rename {arch/powerpc/cpu/mpc8xxx/ddr => drivers/ddr/fsl}/ddr2_dimm_params.c (99%)
rename {arch/powerpc/cpu/mpc8xxx/ddr => drivers/ddr/fsl}/ddr3_dimm_params.c (99%)
rename {arch/powerpc/cpu/mpc8xxx/ddr => drivers/ddr/fsl}/interactive.c (99%)
rename {arch/powerpc/cpu/mpc8xxx/ddr => drivers/ddr/fsl}/lc_common_dimm_params.c (99%)
rename {arch/powerpc/cpu/mpc8xxx/ddr => drivers/ddr/fsl}/main.c (99%)
rename arch/powerpc/cpu/mpc85xx/ddr-gen1.c => drivers/ddr/fsl/mpc85xx_ddr_gen1.c (93%)
rename arch/powerpc/cpu/mpc85xx/ddr-gen2.c => drivers/ddr/fsl/mpc85xx_ddr_gen2.c (96%)
rename arch/powerpc/cpu/mpc85xx/ddr-gen3.c => drivers/ddr/fsl/mpc85xx_ddr_gen3.c (97%)
rename arch/powerpc/cpu/mpc86xx/ddr-8641.c => drivers/ddr/fsl/mpc86xx_ddr.c (95%)
rename {arch/powerpc/cpu/mpc8xxx/ddr => drivers/ddr/fsl}/options.c (99%)
rename {arch/powerpc/cpu/mpc8xxx/ddr => drivers/ddr/fsl}/util.c (96%)
rename {arch/powerpc/cpu/mpc8xxx/ddr => include}/common_timing_params.h (100%)
rename arch/powerpc/cpu/mpc8xxx/ddr/ddr.h => include/fsl_ddr.h (97%)
rename {arch/powerpc/include/asm => include}/fsl_ddr_dimm_params.h (100%)
rename {arch/powerpc/include/asm => include}/fsl_ddr_sdram.h (100%)Makefile +1 -3
@@ -291,19 +291,17 @@ LIBS-y += drivers/spi/libspi.o LIBS-y += drivers/dfu/libdfu.o ifeq ($(CPU),mpc83xx) LIBS-y += drivers/qe/libqe.o -LIBS-y += arch/powerpc/cpu/mpc8xxx/ddr/libddr.o LIBS-y += arch/powerpc/cpu/mpc8xxx/lib8xxx.o endif ifeq ($(CPU),mpc85xx) LIBS-y += drivers/qe/libqe.o LIBS-y += drivers/net/fm/libfm.o -LIBS-y += arch/powerpc/cpu/mpc8xxx/ddr/libddr.o LIBS-y += arch/powerpc/cpu/mpc8xxx/lib8xxx.o endif ifeq ($(CPU),mpc86xx) -LIBS-y += arch/powerpc/cpu/mpc8xxx/ddr/libddr.o LIBS-y += arch/powerpc/cpu/mpc8xxx/lib8xxx.o endif +LIBS-$(CONFIG_SYS_FSL_DDR) += drivers/ddr/fsl/libddr.o LIBS-y += drivers/rtc/librtc.o LIBS-y += drivers/serial/libserial.o LIBS-y += drivers/sound/libsound.o
README +34 -5
@@ -423,16 +423,45 @@ The following options need to be configured: CONFIG_SYS_FSL_DSP_CCSRBAR_DEFAULT This value denotes start offset of DSP CCSR space. - CONFIG_SYS_FSL_DDR_EMU - Specify emulator support for DDR. Some DDR features such as - deskew training are not available. - - Generic CPU options: CONFIG_SYS_BIG_ENDIAN, CONFIG_SYS_LITTLE_ENDIAN Defines the endianess of the CPU. Implementation of those values is arch specific. + CONFIG_SYS_FSL_DDR + Freescale DDR driver in use. This type of DDR controller is + found in mpc83xx, mpc85xx, mpc86xx as well as some ARM core + SoCs. + + CONFIG_SYS_FSL_DDR_ADDR + Freescale DDR memory-mapped register base. + + CONFIG_SYS_FSL_DDR_EMU + Specify emulator support for DDR. Some DDR features such as + deskew training are not available. + + CONFIG_SYS_FSL_DDR_PPC_GEN1 + Freescale DDR1 controller. + + CONFIG_SYS_FSL_DDR_PPC_GEN2 + Freescale DDR2 controller. + + CONFIG_SYS_FSL_DDR_PPC_GEN3 + Freescale DDR3 controller. + + CONFIG_FSL_DDR1 + User config to use DDR1. It can be enabled for SoCs with + Freescale DDR1 or DDR2 controllers. + + CONFIG_FSL_DDR2 + User config to use DDR2. It can be eanbeld for SoCs with + Freescale DDR2 or DDR3 controllers. + + CONFIG_FSL_DDR3 + User config to use DDR3. It can be enabled for SoCs with + Freescale DDR3 controllers. + - Intel Monahans options: CONFIG_SYS_MONAHANS_RUN_MODE_OSC_RATIO
@@ -3139,7 +3168,7 @@ FIT uImage format: CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT Set for the SPL on PPC mpc8xxx targets, support for - arch/powerpc/cpu/mpc8xxx/ddr/libddr.o in SPL binary. + drivers/ddr/fsl/libddr.o in SPL binary. CONFIG_SPL_COMMON_INIT_DDR Set for common ddr init with serial presence detect in
arch/powerpc/cpu/mpc83xx/Makefile +1 -7
@@ -61,14 +61,8 @@ all: $(obj).depend $(START) $(LIB) $(LIB): $(OBJS) $(call cmd_link_o_target, $(OBJS)) -$(obj)ddr-gen1.c: - ln -sf $(SRCTREE)/arch/powerpc/cpu/mpc85xx/ddr-gen1.c $(obj)ddr-gen1.c - $(obj)ddr-gen2.c: - ln -sf $(SRCTREE)/arch/powerpc/cpu/mpc85xx/ddr-gen2.c $(obj)ddr-gen2.c - -$(obj)ddr-gen3.c: - ln -sf $(SRCTREE)/arch/powerpc/cpu/mpc85xx/ddr-gen3.c $(obj)ddr-gen3.c + ln -sf $(SRCTREE)/drivers/ddr/fsl/mpc85xx_ddr_gen2.c $(obj)ddr-gen2.c #########################################################################
arch/powerpc/cpu/mpc85xx/Makefile +0 -42
48 lines not on this page · raw message
arch/powerpc/cpu/mpc85xx/cpu.c +8 -8
@@ -22,7 +22,7 @@#include <asm/fsl_lbc.h> #include <post.h> #include <asm/processor.h> -#include <asm/fsl_ddr_sdram.h> +#include <fsl_ddr_sdram.h> DECLARE_GLOBAL_DATA_PTR ;
@@ -453,21 +453,21 @@ static void dump_spd_ddr_reg(void)for (i =0 ; i <CONFIG_NUM_DDR_CONTROLLERS ; i++) {switch (i) {case 0 : - ddr[i] = (void *)CONFIG_SYS_MPC8xxx_DDR_ADDR; + ddr[i] = (void *)CONFIG_SYS_FSL_DDR_ADDR ;break ; -#if defined(CONFIG_SYS_MPC8xxx_DDR2_ADDR) && (CONFIG_NUM_DDR_CONTROLLERS >1 ) +#if defined(CONFIG_SYS_FSL_DDR2_ADDR ) && (CONFIG_NUM_DDR_CONTROLLERS >1 )case 1 : - ddr[i] = (void *)CONFIG_SYS_MPC8xxx_DDR2_ADDR; + ddr[i] = (void *)CONFIG_SYS_FSL_DDR2_ADDR ;break ;#endif -#if defined(CONFIG_SYS_MPC8xxx_DDR3_ADDR) && (CONFIG_NUM_DDR_CONTROLLERS >2 ) +#if defined(CONFIG_SYS_FSL_DDR3_ADDR ) && (CONFIG_NUM_DDR_CONTROLLERS >2 )case 2 : - ddr[i] = (void *)CONFIG_SYS_MPC8xxx_DDR3_ADDR; + ddr[i] = (void *)CONFIG_SYS_FSL_DDR3_ADDR ;break ;#endif -#if defined(CONFIG_SYS_MPC8xxx_DDR4_ADDR) && (CONFIG_NUM_DDR_CONTROLLERS >3 ) +#if defined(CONFIG_SYS_FSL_DDR4_ADDR ) && (CONFIG_NUM_DDR_CONTROLLERS >3 )case 3 : - ddr[i] = (void *)CONFIG_SYS_MPC8xxx_DDR4_ADDR; + ddr[i] = (void *)CONFIG_SYS_FSL_DDR4_ADDR ;break ;#endif default :
arch/powerpc/cpu/mpc85xx/mp.c +1 -1
@@ -11,7 +11,7 @@#include <asm/io.h> #include <asm/mmu.h> #include <asm/fsl_law.h> -#include <asm/fsl_ddr_sdram.h> +#include <fsl_ddr_sdram.h> #include "mp.h" DECLARE_GLOBAL_DATA_PTR ;
arch/powerpc/cpu/mpc86xx/Makefile +0 -3
@@ -20,9 +20,6 @@ SOBJS-$(CONFIG_MP) += release.o COBJS-y += cpu.o COBJS-y += cpu_init.o -# 8610 & 8641 are identical w/regards to DDR -COBJS-$(CONFIG_MPC8610) += ddr-8641.o -COBJS-$(CONFIG_MPC8641) += ddr-8641.o COBJS-$(CONFIG_OF_LIBFDT) += fdt.o COBJS-y += interrupts.o COBJS-$(CONFIG_MP) += mp.o
arch/powerpc/cpu/mpc8xxx/ddr/Makefile deleted +0 -45
45 lines not on this page · raw message
arch/powerpc/include/asm/config.h +6 -0
@@ -9,10 +9,16 @@#ifdef CONFIG_MPC85xx#include <asm/config_mpc85xx.h> +#define CONFIG_SYS_FSL_DDR #endif #ifdef CONFIG_MPC86xx#include <asm/config_mpc86xx.h> +#define CONFIG_SYS_FSL_DDR +#endif + +#ifdef CONFIG_MPC83xx +#define CONFIG_SYS_FSL_DDR #endif #ifndef HWCONFIG_BUFFER_SIZE
arch/powerpc/include/asm/config_mpc85xx.h +13 -0
@@ -40,17 +40,20 @@#elif defined(CONFIG_MPC8540 )#define CONFIG_MAX_CPUS 1#define CONFIG_SYS_FSL_NUM_LAWS 8 +#define CONFIG_SYS_FSL_DDR_PPC_GEN1 #define CONFIG_SYS_CCSRBAR_DEFAULT 0xff700000#elif defined(CONFIG_MPC8541 )#define CONFIG_MAX_CPUS 1#define CONFIG_SYS_FSL_NUM_LAWS 8 +#define CONFIG_SYS_FSL_DDR_PPC_GEN1 #define CONFIG_SYS_FSL_SEC_COMPAT 2#define CONFIG_SYS_CCSRBAR_DEFAULT 0xff700000#elif defined(CONFIG_MPC8544 )#define CONFIG_MAX_CPUS 1#define CONFIG_SYS_FSL_NUM_LAWS 10 +#define CONFIG_SYS_FSL_DDR_PPC_GEN2 #define CONFIG_SYS_PPC_E500_DEBUG_TLB 0#define CONFIG_SYS_FSL_SEC_COMPAT 2#define CONFIG_SYS_CCSRBAR_DEFAULT 0xff700000
@@ -59,6 +62,7 @@#elif defined(CONFIG_MPC8548 )#define CONFIG_MAX_CPUS 1#define CONFIG_SYS_FSL_NUM_LAWS 10 +#define CONFIG_SYS_FSL_DDR_PPC_GEN2 #define CONFIG_SYS_PPC_E500_DEBUG_TLB 0#define CONFIG_SYS_FSL_SEC_COMPAT 2#define CONFIG_SYS_CCSRBAR_DEFAULT 0xff700000
@@ -77,17 +81,20 @@#elif defined(CONFIG_MPC8555 )#define CONFIG_MAX_CPUS 1#define CONFIG_SYS_FSL_NUM_LAWS 8 +#define CONFIG_SYS_FSL_DDR_PPC_GEN1 #define CONFIG_SYS_FSL_SEC_COMPAT 2#define CONFIG_SYS_CCSRBAR_DEFAULT 0xff700000#elif defined(CONFIG_MPC8560 )#define CONFIG_MAX_CPUS 1#define CONFIG_SYS_FSL_NUM_LAWS 8 +#define CONFIG_SYS_FSL_DDR_PPC_GEN1 #define CONFIG_SYS_CCSRBAR_DEFAULT 0xff700000#elif defined(CONFIG_MPC8568 )#define CONFIG_MAX_CPUS 1#define CONFIG_SYS_FSL_NUM_LAWS 10 +#define CONFIG_SYS_FSL_DDR_PPC_GEN2 #define CONFIG_SYS_FSL_SEC_COMPAT 2#define QE_MURAM_SIZE 0x10000UL#define MAX_QE_RISC 2
@@ -737,4 +744,10 @@#define CONFIG_SYS_FSL_THREADS_PER_CORE 1#endif +#if !defined(CONFIG_SYS_FSL_DDR_PPC_GEN1 ) && \ + !defined(CONFIG_SYS_FSL_DDR_PPC_GEN2 ) && \ + !defined(CONFIG_SYS_FSL_DDR_PPC_GEN3 ) +#define CONFIG_SYS_FSL_DDR_PPC_GEN3 +#endif +#endif /* _ASM_MPC85xx_CONFIG_H_ */
arch/powerpc/include/asm/config_mpc86xx.h +2 -0
@@ -7,6 +7,8 @@#ifndef _ASM_MPC86xx_CONFIG_H_#define _ASM_MPC86xx_CONFIG_H_ +#define CONFIG_SYS_FSL_DDR_86XX +/* SoC specific defines for Freescale MPC86xx processors */ #if defined(CONFIG_MPC8610 )
arch/powerpc/include/asm/immap_83xx.h +1 -1
@@ -1024,7 +1024,7 @@ typedef struct immap {#endif #define CONFIG_SYS_MPC8xxx_DDR_OFFSET (0x2000) -#define CONFIG_SYS_MPC8xxx_DDR_ADDR \ +#define CONFIG_SYS_FSL_DDR_ADDR \ (CONFIG_SYS_IMMR + CONFIG_SYS_MPC8xxx_DDR_OFFSET)#define CONFIG_SYS_MPC83xx_DMA_OFFSET (0x8000)#define CONFIG_SYS_MPC83xx_DMA_ADDR \
arch/powerpc/include/asm/immap_85xx.h +3 -3
@@ -3045,11 +3045,11 @@ struct ccsr_pman { (CONFIG_SYS_IMMR + CONFIG_SYS_FSL_CORENET_RCPM_OFFSET)#define CONFIG_SYS_MPC85xx_ECM_ADDR \ (CONFIG_SYS_IMMR + CONFIG_SYS_MPC85xx_ECM_OFFSET) -#define CONFIG_SYS_MPC8xxx_DDR_ADDR \ +#define CONFIG_SYS_FSL_DDR_ADDR \ (CONFIG_SYS_IMMR + CONFIG_SYS_MPC8xxx_DDR_OFFSET) -#define CONFIG_SYS_MPC8xxx_DDR2_ADDR \ +#define CONFIG_SYS_FSL_DDR2_ADDR \ (CONFIG_SYS_IMMR + CONFIG_SYS_MPC8xxx_DDR2_OFFSET) -#define CONFIG_SYS_MPC8xxx_DDR3_ADDR \ +#define CONFIG_SYS_FSL_DDR3_ADDR \ (CONFIG_SYS_IMMR + CONFIG_SYS_MPC8xxx_DDR3_OFFSET)#define CONFIG_SYS_LBC_ADDR \ (CONFIG_SYS_IMMR + CONFIG_SYS_MPC85xx_LBC_OFFSET)
arch/powerpc/include/asm/immap_86xx.h +2 -2
@@ -1253,9 +1253,9 @@ typedef struct immap {extern immap_t *immr;#define CONFIG_SYS_MPC8xxx_DDR_OFFSET 0x2000 -#define CONFIG_SYS_MPC8xxx_DDR_ADDR (CONFIG_SYS_IMMR + CONFIG_SYS_MPC8xxx_DDR_OFFSET) +#define CONFIG_SYS_FSL_DDR_ADDR (CONFIG_SYS_IMMR + CONFIG_SYS_MPC8xxx_DDR_OFFSET)#define CONFIG_SYS_MPC8xxx_DDR2_OFFSET 0x6000 -#define CONFIG_SYS_MPC8xxx_DDR2_ADDR (CONFIG_SYS_IMMR + CONFIG_SYS_MPC8xxx_DDR2_OFFSET) +#define CONFIG_SYS_FSL_DDR2_ADDR (CONFIG_SYS_IMMR + CONFIG_SYS_MPC8xxx_DDR2_OFFSET)#define CONFIG_SYS_MPC86xx_DMA_OFFSET 0x21000#define CONFIG_SYS_MPC86xx_DMA_ADDR (CONFIG_SYS_IMMR + CONFIG_SYS_MPC86xx_DMA_OFFSET)#define CONFIG_SYS_MPC86xx_PIC_OFFSET 0x40000
board/exmeritus/hww1u1a/ddr.c +2 -2
@@ -9,8 +9,8 @@#include <common.h> -#include <asm/fsl_ddr_sdram.h> -#include <asm/fsl_ddr_dimm_params.h> +#include <fsl_ddr_sdram.h> +#include <fsl_ddr_dimm_params.h> void fsl_ddr_board_options(memctl_options_t *popts, dimm_params_t *pdimm,
board/exmeritus/hww1u1a/hww1u1a.c +2 -2
@@ -13,7 +13,7 @@#include <asm/cache.h> #include <asm/immap_85xx.h> #include <asm/fsl_pci.h> -#include <asm/fsl_ddr_sdram.h> +#include <fsl_ddr_sdram.h> #include <asm/io.h> #include <miiphy.h> #include <libfdt.h>
@@ -89,7 +89,7 @@ int checkboard(void)* and delay a while before we continue. */ if (mpc85xx_gpio_get (GPIO_RESETS )) { -ccsr_ddr_t *ddr = (ccsr_ddr_t *)CONFIG_SYS_MPC8xxx_DDR_ADDR; +ccsr_ddr_t *ddr = (ccsr_ddr_t *)CONFIG_SYS_FSL_DDR_ADDR ;puts ("Debugger detected... extra device reset enabled!\n" );
board/freescale/b4860qds/ddr.c +3 -3
@@ -9,11 +9,11 @@#include <common.h> #include <i2c.h> #include <hwconfig.h> +#include <fsl_ddr.h> #include <asm/mmu.h> -#include <asm/fsl_ddr_sdram.h> -#include <asm/fsl_ddr_dimm_params.h> +#include <fsl_ddr_sdram.h> +#include <fsl_ddr_dimm_params.h> #include <asm/fsl_law.h> -#include <../arch/powerpc/cpu/mpc8xxx/ddr/ddr.h> DECLARE_GLOBAL_DATA_PTR ;
board/freescale/bsc9131rdb/ddr.c +2 -2
@@ -8,8 +8,8 @@#include <asm/mmu.h> #include <asm/immap_85xx.h> #include <asm/processor.h> -#include <asm/fsl_ddr_sdram.h> -#include <asm/fsl_ddr_dimm_params.h> +#include <fsl_ddr_sdram.h> +#include <fsl_ddr_dimm_params.h> #include <asm/io.h> #include <asm/fsl_law.h>
board/freescale/bsc9131rdb/spl_minimal.c +2 -2
@@ -10,7 +10,7 @@#include <nand.h> #include <linux/compiler.h> #include <asm/fsl_law.h> -#include <asm/fsl_ddr_sdram.h> +#include <fsl_ddr_sdram.h> #include <asm/global_data.h> DECLARE_GLOBAL_DATA_PTR ;
@@ -20,7 +20,7 @@ DECLARE_GLOBAL_DATA_PTR;*/ static void sdram_init (void ) { -ccsr_ddr_t *ddr = (ccsr_ddr_t *)CONFIG_SYS_MPC8xxx_DDR_ADDR; +ccsr_ddr_t *ddr = (ccsr_ddr_t *)CONFIG_SYS_FSL_DDR_ADDR ;__raw_writel (CONFIG_SYS_DDR_CS0_BNDS , &ddr->cs0_bnds);__raw_writel (CONFIG_SYS_DDR_CS0_CONFIG , &ddr->cs0_config);
board/freescale/bsc9132qds/bsc9132qds.c +2 -2
@@ -20,7 +20,7 @@#include <asm/fsl_ifc.h> #include <hwconfig.h> #include <i2c.h> -#include <asm/fsl_ddr_sdram.h> +#include <fsl_ddr_sdram.h> #ifdef CONFIG_PCI #include <pci.h>
@@ -134,7 +134,7 @@ void dsp_ddr_configure(void)*to the DSP DDR controller as connected DDR memories are similar. */ ccsr_ddr_t __iomem *pa_ddr = - (ccsr_ddr_t __iomem *)CONFIG_SYS_MPC8xxx_DDR_ADDR; + (ccsr_ddr_t __iomem *)CONFIG_SYS_FSL_DDR_ADDR ;ccsr_ddr_t temp_ddr;ccsr_ddr_t __iomem *dsp_ddr = (ccsr_ddr_t __iomem *)CONFIG_SYS_FSL_DSP_CCSR_DDR_ADDR ;
board/freescale/bsc9132qds/ddr.c +2 -2
@@ -8,8 +8,8 @@#include <asm/mmu.h> #include <asm/immap_85xx.h> #include <asm/processor.h> -#include <asm/fsl_ddr_sdram.h> -#include <asm/fsl_ddr_dimm_params.h> +#include <fsl_ddr_sdram.h> +#include <fsl_ddr_dimm_params.h> #include <asm/io.h> #include <asm/fsl_law.h>
board/freescale/bsc9132qds/spl_minimal.c +2 -2
@@ -10,14 +10,14 @@#include <nand.h> #include <linux/compiler.h> #include <asm/fsl_law.h> -#include <asm/fsl_ddr_sdram.h> +#include <fsl_ddr_sdram.h> #include <asm/global_data.h> DECLARE_GLOBAL_DATA_PTR ;static void sdram_init (void ) { -ccsr_ddr_t *ddr = (ccsr_ddr_t *)CONFIG_SYS_MPC8xxx_DDR_ADDR; +ccsr_ddr_t *ddr = (ccsr_ddr_t *)CONFIG_SYS_FSL_DDR_ADDR ;#if CONFIG_DDR_CLK_FREQ ==100000000 __raw_writel (CONFIG_SYS_DDR_CS0_BNDS , &ddr->cs0_bnds);__raw_writel (CONFIG_SYS_DDR_CS0_CONFIG , &ddr->cs0_config);
board/freescale/c29xpcie/ddr.c +2 -2
@@ -6,8 +6,8 @@#include <common.h> #include <asm/fsl_law.h> -#include <asm/fsl_ddr_sdram.h> -#include <asm/fsl_ddr_dimm_params.h> +#include <fsl_ddr_sdram.h> +#include <fsl_ddr_dimm_params.h> #include "cpld.h"
board/freescale/corenet_ds/ddr.c +2 -2
@@ -10,8 +10,8 @@#include <i2c.h> #include <hwconfig.h> #include <asm/mmu.h> -#include <asm/fsl_ddr_sdram.h> -#include <asm/fsl_ddr_dimm_params.h> +#include <fsl_ddr_sdram.h> +#include <fsl_ddr_dimm_params.h> #include <asm/fsl_law.h> DECLARE_GLOBAL_DATA_PTR ;
board/freescale/corenet_ds/eth_p4080.c +1 -1
@@ -12,7 +12,7 @@#include <asm/cache.h> #include <asm/immap_85xx.h> #include <asm/fsl_law.h> -#include <asm/fsl_ddr_sdram.h> +#include <fsl_ddr_sdram.h> #include <asm/fsl_serdes.h> #include <asm/fsl_portals.h> #include <asm/fsl_liodn.h>
board/freescale/corenet_ds/p3041ds_ddr.c +1 -1
@@ -7,7 +7,7 @@*/ #include <common.h> -#include <asm/fsl_ddr_sdram.h> +#include <fsl_ddr_sdram.h> fixed_ddr_parm_t fixed_ddr_parm_0[] = { {0 ,0 ,NULL }
board/freescale/corenet_ds/p4080ds_ddr.c +1 -1
@@ -7,7 +7,7 @@*/ #include <common.h> -#include <asm/fsl_ddr_sdram.h> +#include <fsl_ddr_sdram.h> #define CONFIG_SYS_DDR_TIMING_3_1200 0x01030000#define CONFIG_SYS_DDR_TIMING_0_1200 0xCC550104
board/freescale/corenet_ds/p5020ds_ddr.c +1 -1
@@ -7,7 +7,7 @@*/ #include <common.h> -#include <asm/fsl_ddr_sdram.h> +#include <fsl_ddr_sdram.h> fixed_ddr_parm_t fixed_ddr_parm_0[] = { {0 ,0 ,NULL }
board/freescale/corenet_ds/p5040ds_ddr.c +1 -1
@@ -7,7 +7,7 @@*/ #include <common.h> -#include <asm/fsl_ddr_sdram.h> +#include <fsl_ddr_sdram.h> fixed_ddr_parm_t fixed_ddr_parm_0[] = { {0 ,0 ,NULL }
board/freescale/mpc8349emds/ddr.c +2 -2
@@ -6,8 +6,8 @@#include <common.h> -#include <asm/fsl_ddr_sdram.h> -#include <asm/fsl_ddr_dimm_params.h> +#include <fsl_ddr_sdram.h> +#include <fsl_ddr_dimm_params.h> struct board_specific_parameters {u32 n_ranks;
board/freescale/mpc8349emds/mpc8349emds.c +1 -1
@@ -13,7 +13,7 @@#include <spi.h> #include <miiphy.h> #ifdef CONFIG_FSL_DDR2 -#include <asm/fsl_ddr_sdram.h> +#include <fsl_ddr_sdram.h> #else #include <spd_sdram.h> #endif
board/freescale/mpc8536ds/ddr.c +2 -2
@@ -8,8 +8,8 @@#include <common.h> -#include <asm/fsl_ddr_sdram.h> -#include <asm/fsl_ddr_dimm_params.h> +#include <fsl_ddr_sdram.h> +#include <fsl_ddr_dimm_params.h> void fsl_ddr_board_options(memctl_options_t *popts, dimm_params_t *pdimm,
board/freescale/mpc8536ds/mpc8536ds.c +1 -1
@@ -12,7 +12,7 @@#include <asm/cache.h> #include <asm/immap_85xx.h> #include <asm/fsl_pci.h> -#include <asm/fsl_ddr_sdram.h> +#include <fsl_ddr_sdram.h> #include <asm/io.h> #include <asm/fsl_serdes.h> #include <spd.h>
board/freescale/mpc8540ads/ddr.c +2 -2
@@ -8,8 +8,8 @@#include <common.h> -#include <asm/fsl_ddr_sdram.h> -#include <asm/fsl_ddr_dimm_params.h> +#include <fsl_ddr_sdram.h> +#include <fsl_ddr_dimm_params.h> void fsl_ddr_board_options(memctl_options_t *popts, dimm_params_t *pdimm,
board/freescale/mpc8540ads/mpc8540ads.c +2 -2
@@ -14,7 +14,7 @@#include <asm/processor.h> #include <asm/mmu.h> #include <asm/immap_85xx.h> -#include <asm/fsl_ddr_sdram.h> +#include <fsl_ddr_sdram.h> #include <libfdt.h> #include <fdt_support.h>
@@ -168,7 +168,7 @@ void lbc_sdram_init(void)phys_size_t fixed_sdram (void ) {#ifndef CONFIG_SYS_RAMBOOT -volatile ccsr_ddr_t *ddr= (void *)(CONFIG_SYS_MPC8xxx_DDR_ADDR); +volatile ccsr_ddr_t *ddr = (void *)(CONFIG_SYS_FSL_DDR_ADDR ); ddr->cs0_bnds =CONFIG_SYS_DDR_CS0_BNDS ; ddr->cs0_config =CONFIG_SYS_DDR_CS0_CONFIG ;
board/freescale/mpc8541cds/ddr.c +2 -2
@@ -8,8 +8,8 @@#include <common.h> -#include <asm/fsl_ddr_sdram.h> -#include <asm/fsl_ddr_dimm_params.h> +#include <fsl_ddr_sdram.h> +#include <fsl_ddr_dimm_params.h> void fsl_ddr_board_options(memctl_options_t *popts, dimm_params_t *pdimm,
board/freescale/mpc8541cds/mpc8541cds.c +1 -1
@@ -11,7 +11,7 @@#include <asm/processor.h> #include <asm/mmu.h> #include <asm/immap_85xx.h> -#include <asm/fsl_ddr_sdram.h> +#include <fsl_ddr_sdram.h> #include <ioports.h> #include <spd_sdram.h> #include <libfdt.h>
board/freescale/mpc8544ds/ddr.c +2 -2
@@ -8,8 +8,8 @@#include <common.h> -#include <asm/fsl_ddr_sdram.h> -#include <asm/fsl_ddr_dimm_params.h> +#include <fsl_ddr_sdram.h> +#include <fsl_ddr_dimm_params.h> void fsl_ddr_board_options(memctl_options_t *popts, dimm_params_t *pdimm,
board/freescale/mpc8544ds/mpc8544ds.c +1 -1
@@ -11,7 +11,7 @@#include <asm/mmu.h> #include <asm/immap_85xx.h> #include <asm/fsl_pci.h> -#include <asm/fsl_ddr_sdram.h> +#include <fsl_ddr_sdram.h> #include <asm/fsl_serdes.h> #include <asm/io.h> #include <miiphy.h>
board/freescale/mpc8548cds/ddr.c +2 -2
@@ -8,8 +8,8 @@#include <common.h> -#include <asm/fsl_ddr_sdram.h> -#include <asm/fsl_ddr_dimm_params.h> +#include <fsl_ddr_sdram.h> +#include <fsl_ddr_dimm_params.h> void fsl_ddr_board_options(memctl_options_t *popts, dimm_params_t *pdimm,
board/freescale/mpc8548cds/mpc8548cds.c +1 -1
@@ -12,7 +12,7 @@#include <asm/mmu.h> #include <asm/immap_85xx.h> #include <asm/fsl_pci.h> -#include <asm/fsl_ddr_sdram.h> +#include <fsl_ddr_sdram.h> #include <asm/fsl_serdes.h> #include <miiphy.h> #include <libfdt.h>
board/freescale/mpc8555cds/ddr.c +2 -2
@@ -8,8 +8,8 @@#include <common.h> -#include <asm/fsl_ddr_sdram.h> -#include <asm/fsl_ddr_dimm_params.h> +#include <fsl_ddr_sdram.h> +#include <fsl_ddr_dimm_params.h> void fsl_ddr_board_options(memctl_options_t *popts, dimm_params_t *pdimm,
board/freescale/mpc8555cds/mpc8555cds.c +1 -1
@@ -9,7 +9,7 @@#include <asm/processor.h> #include <asm/mmu.h> #include <asm/immap_85xx.h> -#include <asm/fsl_ddr_sdram.h> +#include <fsl_ddr_sdram.h> #include <ioports.h> #include <spd_sdram.h> #include <libfdt.h>
board/freescale/mpc8560ads/ddr.c +2 -2
@@ -8,8 +8,8 @@#include <common.h> -#include <asm/fsl_ddr_sdram.h> -#include <asm/fsl_ddr_dimm_params.h> +#include <fsl_ddr_sdram.h> +#include <fsl_ddr_dimm_params.h> void fsl_ddr_board_options(memctl_options_t *popts, dimm_params_t *pdimm,
board/freescale/mpc8560ads/mpc8560ads.c +2 -2
@@ -14,7 +14,7 @@#include <asm/processor.h> #include <asm/mmu.h> #include <asm/immap_85xx.h> -#include <asm/fsl_ddr_sdram.h> +#include <fsl_ddr_sdram.h> #include <ioports.h> #include <spd_sdram.h> #include <miiphy.h>
@@ -373,7 +373,7 @@ void lbc_sdram_init(void)phys_size_t fixed_sdram (void ) {#ifndef CONFIG_SYS_RAMBOOT -volatile ccsr_ddr_t *ddr= (void *)(CONFIG_SYS_MPC8xxx_DDR_ADDR); +volatile ccsr_ddr_t *ddr = (void *)(CONFIG_SYS_FSL_DDR_ADDR ); ddr->cs0_bnds =CONFIG_SYS_DDR_CS0_BNDS ; ddr->cs0_config =CONFIG_SYS_DDR_CS0_CONFIG ;
board/freescale/mpc8568mds/ddr.c +2 -2
@@ -8,8 +8,8 @@#include <common.h> -#include <asm/fsl_ddr_sdram.h> -#include <asm/fsl_ddr_dimm_params.h> +#include <fsl_ddr_sdram.h> +#include <fsl_ddr_dimm_params.h> void fsl_ddr_board_options(memctl_options_t *popts, dimm_params_t *pdimm,
board/freescale/mpc8568mds/mpc8568mds.c +1 -1
@@ -12,7 +12,7 @@#include <asm/mmu.h> #include <asm/immap_85xx.h> #include <asm/fsl_pci.h> -#include <asm/fsl_ddr_sdram.h> +#include <fsl_ddr_sdram.h> #include <asm/fsl_serdes.h> #include <spd_sdram.h> #include <i2c.h>
board/freescale/mpc8569mds/ddr.c +2 -2
@@ -8,8 +8,8 @@#include <common.h> -#include <asm/fsl_ddr_sdram.h> -#include <asm/fsl_ddr_dimm_params.h> +#include <fsl_ddr_sdram.h> +#include <fsl_ddr_dimm_params.h> void fsl_ddr_board_options(memctl_options_t *popts, dimm_params_t *pdimm,
board/freescale/mpc8569mds/mpc8569mds.c +2 -2
@@ -14,7 +14,7 @@#include <asm/cache.h> #include <asm/immap_85xx.h> #include <asm/fsl_pci.h> -#include <asm/fsl_ddr_sdram.h> +#include <fsl_ddr_sdram.h> #include <asm/fsl_serdes.h> #include <asm/io.h> #include <spd_sdram.h>
@@ -231,7 +231,7 @@ int checkboard (void)#if !defined(CONFIG_SPD_EEPROM )phys_size_t fixed_sdram (void ) { -volatile ccsr_ddr_t *ddr = (ccsr_ddr_t *)CONFIG_SYS_MPC8xxx_DDR_ADDR; +volatile ccsr_ddr_t *ddr = (ccsr_ddr_t *)CONFIG_SYS_FSL_DDR_ADDR ;uint d_init;out_be32 (&ddr->cs0_bnds,CONFIG_SYS_DDR_CS0_BNDS );
board/freescale/mpc8572ds/ddr.c +2 -2
@@ -8,8 +8,8 @@#include <common.h> -#include <asm/fsl_ddr_sdram.h> -#include <asm/fsl_ddr_dimm_params.h> +#include <fsl_ddr_sdram.h> +#include <fsl_ddr_dimm_params.h> struct board_specific_parameters {u32 n_ranks;
board/freescale/mpc8572ds/mpc8572ds.c +1 -1
@@ -12,7 +12,7 @@#include <asm/cache.h> #include <asm/immap_85xx.h> #include <asm/fsl_pci.h> -#include <asm/fsl_ddr_sdram.h> +#include <fsl_ddr_sdram.h> #include <asm/io.h> #include <asm/fsl_serdes.h> #include <miiphy.h>
board/freescale/mpc8610hpcd/ddr.c +2 -2
@@ -8,8 +8,8 @@#include <common.h> -#include <asm/fsl_ddr_sdram.h> -#include <asm/fsl_ddr_dimm_params.h> +#include <fsl_ddr_sdram.h> +#include <fsl_ddr_dimm_params.h> void fsl_ddr_board_options(memctl_options_t *popts, dimm_params_t *pdimm,
board/freescale/mpc8610hpcd/mpc8610hpcd.c +1 -1
@@ -10,7 +10,7 @@#include <asm/processor.h> #include <asm/immap_86xx.h> #include <asm/fsl_pci.h> -#include <asm/fsl_ddr_sdram.h> +#include <fsl_ddr_sdram.h> #include <asm/fsl_serdes.h> #include <i2c.h> #include <asm/io.h>
board/freescale/mpc8641hpcn/ddr.c +2 -2
@@ -8,8 +8,8 @@#include <common.h> -#include <asm/fsl_ddr_sdram.h> -#include <asm/fsl_ddr_dimm_params.h> +#include <fsl_ddr_sdram.h> +#include <fsl_ddr_dimm_params.h> struct board_specific_parameters {u32 n_ranks;
board/freescale/mpc8641hpcn/mpc8641hpcn.c +1 -1
@@ -9,7 +9,7 @@#include <asm/processor.h> #include <asm/immap_86xx.h> #include <asm/fsl_pci.h> -#include <asm/fsl_ddr_sdram.h> +#include <fsl_ddr_sdram.h> #include <asm/fsl_serdes.h> #include <asm/io.h> #include <libfdt.h>
board/freescale/p1010rdb/ddr.c +2 -2
@@ -8,8 +8,8 @@#include <asm/mmu.h> #include <asm/immap_85xx.h> #include <asm/processor.h> -#include <asm/fsl_ddr_sdram.h> -#include <asm/fsl_ddr_dimm_params.h> +#include <fsl_ddr_sdram.h> +#include <fsl_ddr_dimm_params.h> #include <asm/io.h> #include <asm/fsl_law.h>
board/freescale/p1010rdb/spl_minimal.c +2 -2
@@ -10,7 +10,7 @@#include <nand.h> #include <asm/mmu.h> #include <asm/immap_85xx.h> -#include <asm/fsl_ddr_sdram.h> +#include <fsl_ddr_sdram.h> #include <asm/fsl_law.h> #include <asm/global_data.h>
@@ -19,7 +19,7 @@ DECLARE_GLOBAL_DATA_PTR;void sdram_init (void ) { -ccsr_ddr_t *ddr = (ccsr_ddr_t *)CONFIG_SYS_MPC8xxx_DDR_ADDR; +ccsr_ddr_t *ddr = (ccsr_ddr_t *)CONFIG_SYS_FSL_DDR_ADDR ;ccsr_gur_t *gur = (void *)CONFIG_SYS_MPC85xx_GUTS_ADDR;u32 ddr_ratio;unsigned long ddr_freq_mhz;
board/freescale/p1022ds/ddr.c +2 -2
@@ -8,8 +8,8 @@#include <common.h> -#include <asm/fsl_ddr_sdram.h> -#include <asm/fsl_ddr_dimm_params.h> +#include <fsl_ddr_sdram.h> +#include <fsl_ddr_dimm_params.h> struct board_specific_parameters {u32 n_ranks;
board/freescale/p1022ds/p1022ds.c +1 -1
@@ -14,7 +14,7 @@#include <asm/cache.h> #include <asm/immap_85xx.h> #include <asm/fsl_pci.h> -#include <asm/fsl_ddr_sdram.h> +#include <fsl_ddr_sdram.h> #include <asm/fsl_serdes.h> #include <asm/io.h> #include <libfdt.h>
board/freescale/p1022ds/spl_minimal.c +1 -1
@@ -9,7 +9,7 @@#include <asm/io.h> #include <nand.h> #include <asm/fsl_law.h> -#include <asm/fsl_ddr_sdram.h> +#include <fsl_ddr_sdram.h> const static u32 sysclk_tbl[] = {
board/freescale/p1023rdb/ddr.c +2 -2
@@ -8,8 +8,8 @@#include <asm/mmu.h> #include <asm/immap_85xx.h> #include <asm/processor.h> -#include <asm/fsl_ddr_sdram.h> -#include <asm/fsl_ddr_dimm_params.h> +#include <fsl_ddr_sdram.h> +#include <fsl_ddr_dimm_params.h> #include <asm/io.h> #include <asm/fsl_law.h>
board/freescale/p1023rdb/p1023rdb.c +1 -1
@@ -16,7 +16,7 @@#include <asm/mmu.h> #include <asm/immap_85xx.h> #include <asm/fsl_pci.h> -#include <asm/fsl_ddr_sdram.h> +#include <fsl_ddr_sdram.h> #include <asm/fsl_portals.h> #include <libfdt.h> #include <fdt_support.h>
board/freescale/p1023rds/p1023rds.c +2 -2
@@ -16,7 +16,7 @@#include <asm/mmu.h> #include <asm/immap_85xx.h> #include <asm/fsl_pci.h> -#include <asm/fsl_ddr_sdram.h> +#include <fsl_ddr_sdram.h> #include <asm/fsl_portals.h> #include <libfdt.h> #include <fdt_support.h>
@@ -58,7 +58,7 @@ int checkboard(void)phys_size_t fixed_sdram (void ) {#ifndef CONFIG_SYS_RAMBOOT -ccsr_ddr_t *ddr = (ccsr_ddr_t *)CONFIG_SYS_MPC8xxx_DDR_ADDR; +ccsr_ddr_t *ddr = (ccsr_ddr_t *)CONFIG_SYS_FSL_DDR_ADDR ;set_next_law (0 ,LAW_SIZE_2G ,LAW_TRGT_IF_DDR_1 );
board/freescale/p1_p2_rdb/ddr.c +1 -1
@@ -8,7 +8,7 @@#include <asm/mmu.h> #include <asm/immap_85xx.h> #include <asm/processor.h> -#include <asm/fsl_ddr_sdram.h> +#include <fsl_ddr_sdram.h> #include <asm/io.h> #include <asm/fsl_law.h>
board/freescale/p1_p2_rdb_pc/ddr.c +2 -2
@@ -10,8 +10,8 @@#include <asm/mmu.h> #include <asm/immap_85xx.h> #include <asm/processor.h> -#include <asm/fsl_ddr_sdram.h> -#include <asm/fsl_ddr_dimm_params.h> +#include <fsl_ddr_sdram.h> +#include <fsl_ddr_dimm_params.h> #include <asm/io.h> #include <asm/fsl_law.h>
board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c +1 -1
@@ -14,7 +14,7 @@#include <asm/cache.h> #include <asm/immap_85xx.h> #include <asm/fsl_pci.h> -#include <asm/fsl_ddr_sdram.h> +#include <fsl_ddr_sdram.h> #include <asm/io.h> #include <asm/fsl_law.h> #include <asm/fsl_lbc.h>
board/freescale/p1_p2_rdb_pc/spl_minimal.c +1 -1
@@ -10,7 +10,7 @@#include <nand.h> #include <linux/compiler.h> #include <asm/fsl_law.h> -#include <asm/fsl_ddr_sdram.h> +#include <fsl_ddr_sdram.h> #include <asm/global_data.h> DECLARE_GLOBAL_DATA_PTR ;
board/freescale/p1_twr/ddr.c +2 -2
@@ -8,8 +8,8 @@#include <asm/mmu.h> #include <asm/immap_85xx.h> #include <asm/processor.h> -#include <asm/fsl_ddr_sdram.h> -#include <asm/fsl_ddr_dimm_params.h> +#include <fsl_ddr_sdram.h> +#include <fsl_ddr_dimm_params.h> #include <asm/io.h> #include <asm/fsl_law.h>
board/freescale/p1_twr/p1_twr.c +1 -1
@@ -14,7 +14,7 @@#include <asm/cache.h> #include <asm/immap_85xx.h> #include <asm/fsl_pci.h> -#include <asm/fsl_ddr_sdram.h> +#include <fsl_ddr_sdram.h> #include <asm/io.h> #include <asm/fsl_law.h> #include <asm/fsl_lbc.h>
board/freescale/p2020come/ddr.c +2 -2
@@ -5,8 +5,8 @@*/ #include <common.h> -#include <asm/fsl_ddr_sdram.h> -#include <asm/fsl_ddr_dimm_params.h> +#include <fsl_ddr_sdram.h> +#include <fsl_ddr_dimm_params.h> void fsl_ddr_board_options(memctl_options_t *popts, dimm_params_t *pdimm,
board/freescale/p2020ds/ddr.c +2 -2
@@ -8,8 +8,8 @@#include <common.h> -#include <asm/fsl_ddr_sdram.h> -#include <asm/fsl_ddr_dimm_params.h> +#include <fsl_ddr_sdram.h> +#include <fsl_ddr_dimm_params.h> struct board_specific_parameters {u32 n_ranks;
board/freescale/p2020ds/p2020ds.c +2 -2
@@ -12,7 +12,7 @@#include <asm/cache.h> #include <asm/immap_85xx.h> #include <asm/fsl_pci.h> -#include <asm/fsl_ddr_sdram.h> +#include <fsl_ddr_sdram.h> #include <asm/io.h> #include <asm/fsl_serdes.h> #include <miiphy.h>
@@ -68,7 +68,7 @@ int checkboard(void)phys_size_t fixed_sdram (void ) { -volatile ccsr_ddr_t *ddr = (ccsr_ddr_t *)CONFIG_SYS_MPC8xxx_DDR_ADDR; +volatile ccsr_ddr_t *ddr = (ccsr_ddr_t *)CONFIG_SYS_FSL_DDR_ADDR ;uint d_init; ddr->cs0_config =CONFIG_SYS_DDR_CS0_CONFIG ;
board/freescale/p2041rdb/ddr.c +2 -2
@@ -10,8 +10,8 @@#include <i2c.h> #include <hwconfig.h> #include <asm/mmu.h> -#include <asm/fsl_ddr_sdram.h> -#include <asm/fsl_ddr_dimm_params.h> +#include <fsl_ddr_sdram.h> +#include <fsl_ddr_dimm_params.h> #include <asm/fsl_law.h> struct board_specific_parameters {
board/freescale/t1040qds/ddr.c +2 -2
@@ -8,8 +8,8 @@#include <i2c.h> #include <hwconfig.h> #include <asm/mmu.h> -#include <asm/fsl_ddr_sdram.h> -#include <asm/fsl_ddr_dimm_params.h> +#include <fsl_ddr_sdram.h> +#include <fsl_ddr_dimm_params.h> #include <asm/fsl_law.h> #include "ddr.h"
board/freescale/t4qds/ddr.c +2 -2
@@ -10,8 +10,8 @@#include <i2c.h> #include <hwconfig.h> #include <asm/mmu.h> -#include <asm/fsl_ddr_sdram.h> -#include <asm/fsl_ddr_dimm_params.h> +#include <fsl_ddr_sdram.h> +#include <fsl_ddr_dimm_params.h> #include <asm/fsl_law.h> #include "ddr.h"
board/freescale/t4qds/eth.c +1 -1
@@ -12,7 +12,7 @@#include <asm/cache.h> #include <asm/immap_85xx.h> #include <asm/fsl_law.h> -#include <asm/fsl_ddr_sdram.h> +#include <fsl_ddr_sdram.h> #include <asm/fsl_serdes.h> #include <asm/fsl_portals.h> #include <asm/fsl_liodn.h>
board/gdsys/p1022/controlcenterd.c +1 -1
@@ -29,7 +29,7 @@#include <asm/cache.h> #include <asm/immap_85xx.h> #include <asm/fsl_pci.h> -#include <asm/fsl_ddr_sdram.h> +#include <fsl_ddr_sdram.h> #include <asm/fsl_serdes.h> #include <asm/io.h> #include <libfdt.h>
board/gdsys/p1022/ddr.c +2 -2
@@ -12,8 +12,8 @@#include <common.h> #include <i2c.h> -#include <asm/fsl_ddr_sdram.h> -#include <asm/fsl_ddr_dimm_params.h> +#include <fsl_ddr_sdram.h> +#include <fsl_ddr_dimm_params.h> void fsl_ddr_board_options (memctl_options_t *popts,dimm_params_t *pdimm,unsigned int ctrl_num)
board/keymile/kmp204x/ddr.c +2 -2
@@ -11,8 +11,8 @@#include <i2c.h> #include <hwconfig.h> #include <asm/mmu.h> -#include <asm/fsl_ddr_sdram.h> -#include <asm/fsl_ddr_dimm_params.h> +#include <fsl_ddr_sdram.h> +#include <fsl_ddr_dimm_params.h> void fsl_ddr_board_options(memctl_options_t *popts, dimm_params_t *pdimm,
board/sbc8548/ddr.c +3 -3
@@ -9,8 +9,8 @@#include <common.h> #include <i2c.h> -#include <asm/fsl_ddr_sdram.h> -#include <asm/fsl_ddr_dimm_params.h> +#include <fsl_ddr_sdram.h> +#include <fsl_ddr_dimm_params.h> void fsl_ddr_board_options(memctl_options_t *popts, dimm_params_t *pdimm,
@@ -91,7 +91,7 @@ void get_spd(generic_spd_eeprom_t *spd, u8 i2c_address)*/ phys_size_t fixed_sdram (void ) { -volatile ccsr_ddr_t *ddr = (void *)(CONFIG_SYS_MPC8xxx_DDR_ADDR); +volatile ccsr_ddr_t *ddr = (void *)(CONFIG_SYS_FSL_DDR_ADDR );out_be32 (&ddr->cs0_bnds,0x0000007f );out_be32 (&ddr->cs1_bnds,0x008000ff );
board/sbc8548/sbc8548.c +1 -1
@@ -15,7 +15,7 @@#include <asm/processor.h> #include <asm/immap_85xx.h> #include <asm/fsl_pci.h> -#include <asm/fsl_ddr_sdram.h> +#include <fsl_ddr_sdram.h> #include <asm/fsl_serdes.h> #include <spd_sdram.h> #include <netdev.h>
board/sbc8641d/ddr.c +2 -2
@@ -8,8 +8,8 @@#include <common.h> -#include <asm/fsl_ddr_sdram.h> -#include <asm/fsl_ddr_dimm_params.h> +#include <fsl_ddr_sdram.h> +#include <fsl_ddr_dimm_params.h> void fsl_ddr_board_options(memctl_options_t *popts, dimm_params_t *pdimm,
board/sbc8641d/sbc8641d.c +1 -1
@@ -18,7 +18,7 @@#include <asm/processor.h> #include <asm/immap_86xx.h> #include <asm/fsl_pci.h> -#include <asm/fsl_ddr_sdram.h> +#include <fsl_ddr_sdram.h> #include <asm/fsl_serdes.h> #include <libfdt.h> #include <fdt_support.h>
board/socrates/ddr.c +2 -2
@@ -8,8 +8,8 @@#include <common.h> -#include <asm/fsl_ddr_sdram.h> -#include <asm/fsl_ddr_dimm_params.h> +#include <fsl_ddr_sdram.h> +#include <fsl_ddr_dimm_params.h> void fsl_ddr_board_options(memctl_options_t *popts, dimm_params_t *pdimm,
board/socrates/sdram.c +2 -2
@@ -8,7 +8,7 @@#include <common.h> #include <asm/processor.h> #include <asm/immap_85xx.h> -#include <asm/fsl_ddr_sdram.h> +#include <fsl_ddr_sdram.h> #include <asm/processor.h> #include <asm/mmu.h> #include <spd_sdram.h>
@@ -24,7 +24,7 @@*/ phys_size_t fixed_sdram (void ) { -volatile ccsr_ddr_t *ddr = (void *)(CONFIG_SYS_MPC8xxx_DDR_ADDR); +volatile ccsr_ddr_t *ddr = (void *)(CONFIG_SYS_FSL_DDR_ADDR );/* * Disable memory controller.
board/stx/stxgp3/ddr.c +2 -2
@@ -8,8 +8,8 @@#include <common.h> -#include <asm/fsl_ddr_sdram.h> -#include <asm/fsl_ddr_dimm_params.h> +#include <fsl_ddr_sdram.h> +#include <fsl_ddr_dimm_params.h> void fsl_ddr_board_options(memctl_options_t *popts, dimm_params_t *pdimm,
board/stx/stxgp3/stxgp3.c +1 -1
@@ -18,7 +18,7 @@#include <asm/processor.h> #include <asm/mmu.h> #include <asm/immap_85xx.h> -#include <asm/fsl_ddr_sdram.h> +#include <fsl_ddr_sdram.h> #include <ioports.h> #include <asm/io.h> #include <spd_sdram.h>
board/stx/stxssa/ddr.c +2 -2
@@ -9,8 +9,8 @@#include <common.h> #include <i2c.h> -#include <asm/fsl_ddr_sdram.h> -#include <asm/fsl_ddr_dimm_params.h> +#include <fsl_ddr_sdram.h> +#include <fsl_ddr_dimm_params.h> void fsl_ddr_board_options(memctl_options_t *popts, dimm_params_t *pdimm,
board/stx/stxssa/stxssa.c +1 -1
@@ -19,7 +19,7 @@#include <asm/mmu.h> #include <asm/immap_85xx.h> #include <asm/fsl_pci.h> -#include <asm/fsl_ddr_sdram.h> +#include <fsl_ddr_sdram.h> #include <ioports.h> #include <asm/io.h> #include <spd_sdram.h>
board/xes/xpedite517x/ddr.c +2 -2
@@ -7,8 +7,8 @@#include <common.h> #include <i2c.h> -#include <asm/fsl_ddr_sdram.h> -#include <asm/fsl_ddr_dimm_params.h> +#include <fsl_ddr_sdram.h> +#include <fsl_ddr_dimm_params.h> void get_spd (ddr2_spd_eeprom_t *spd,u8 i2c_address) {
board/xes/xpedite517x/xpedite517x.c +1 -1
@@ -6,7 +6,7 @@#include <common.h> #include <asm/processor.h> -#include <asm/fsl_ddr_sdram.h> +#include <fsl_ddr_sdram.h> #include <asm/mmu.h> #include <asm/io.h> #include <fdt_support.h>
board/xes/xpedite520x/ddr.c +2 -2
@@ -9,8 +9,8 @@#include <common.h> #include <i2c.h> -#include <asm/fsl_ddr_sdram.h> -#include <asm/fsl_ddr_dimm_params.h> +#include <fsl_ddr_sdram.h> +#include <fsl_ddr_dimm_params.h> void get_spd (ddr2_spd_eeprom_t *spd,unsigned char i2c_address) {
board/xes/xpedite537x/ddr.c +2 -2
@@ -8,8 +8,8 @@#include <common.h> #include <i2c.h> -#include <asm/fsl_ddr_sdram.h> -#include <asm/fsl_ddr_dimm_params.h> +#include <fsl_ddr_sdram.h> +#include <fsl_ddr_dimm_params.h> void get_spd (ddr2_spd_eeprom_t *spd,u8 i2c_address) {
board/xes/xpedite550x/ddr.c +2 -2
@@ -8,8 +8,8 @@#include <common.h> #include <i2c.h> -#include <asm/fsl_ddr_sdram.h> -#include <asm/fsl_ddr_dimm_params.h> +#include <fsl_ddr_sdram.h> +#include <fsl_ddr_dimm_params.h> void get_spd (ddr3_spd_eeprom_t *spd,u8 i2c_address) {
drivers/ddr/fsl/Makefile new file +49 -0
49 lines not on this page · raw message
drivers/ddr/fsl/ctrl_regs.c renamed from arch/powerpc/cpu/mpc8xxx/ddr/ctrl_regs.c +5 -3
@@ -11,11 +11,13 @@*/ #include <common.h> -#include <asm/fsl_ddr_sdram.h> +#include <fsl_ddr_sdram.h> -#include "ddr.h" +#include <fsl_ddr.h> +#include <fsl_immap.h> +#include <asm/io.h> -#define _DDR_ADDR CONFIG_SYS_MPC8xxx_DDR_ADDR +#define _DDR_ADDR CONFIG_SYS_FSL_DDR_ADDRstatic u32 fsl_ddr_get_version (void ) {
drivers/ddr/fsl/ddr1_dimm_params.c renamed from arch/powerpc/cpu/mpc8xxx/ddr/ddr1_dimm_params.c +2 -2
@@ -7,9 +7,9 @@*/ #include <common.h> -#include <asm/fsl_ddr_sdram.h> +#include <fsl_ddr_sdram.h> -#include "ddr.h" +#include <fsl_ddr.h> /* * Calculate the Density of each Physical Rank.
drivers/ddr/fsl/ddr2_dimm_params.c renamed from arch/powerpc/cpu/mpc8xxx/ddr/ddr2_dimm_params.c +2 -2
@@ -7,9 +7,9 @@*/ #include <common.h> -#include <asm/fsl_ddr_sdram.h> +#include <fsl_ddr_sdram.h> -#include "ddr.h" +#include <fsl_ddr.h> /* * Calculate the Density of each Physical Rank. * Returned size is in bytes.
drivers/ddr/fsl/ddr3_dimm_params.c renamed from arch/powerpc/cpu/mpc8xxx/ddr/ddr3_dimm_params.c +2 -2
@@ -12,9 +12,9 @@*/ #include <common.h> -#include <asm/fsl_ddr_sdram.h> +#include <fsl_ddr_sdram.h> -#include "ddr.h" +#include <fsl_ddr.h> /* * Calculate the Density of each Physical Rank.
drivers/ddr/fsl/interactive.c renamed from arch/powerpc/cpu/mpc8xxx/ddr/interactive.c +3 -2
@@ -14,9 +14,10 @@#include <common.h> #include <linux/ctype.h> #include <asm/types.h> +#include <asm/io.h> -#include <asm/fsl_ddr_sdram.h> -#include "ddr.h" +#include <fsl_ddr_sdram.h> +#include <fsl_ddr.h> /* Option parameter Structures */ struct options_string {
drivers/ddr/fsl/lc_common_dimm_params.c renamed from arch/powerpc/cpu/mpc8xxx/ddr/lc_common_dimm_params.c +2 -2
@@ -7,9 +7,9 @@*/ #include <common.h> -#include <asm/fsl_ddr_sdram.h> +#include <fsl_ddr_sdram.h> -#include "ddr.h" +#include <fsl_ddr.h> #if defined(CONFIG_FSL_DDR3 ) static unsigned int
drivers/ddr/fsl/main.c renamed from arch/powerpc/cpu/mpc8xxx/ddr/main.c +2 -2
@@ -14,10 +14,10 @@#include <common.h> #include <i2c.h> -#include <asm/fsl_ddr_sdram.h> +#include <fsl_ddr_sdram.h> #include <asm/fsl_law.h> -#include "ddr.h" +#include <fsl_ddr.h> void fsl_ddr_set_lawbar( const common_timing_params_t *memctl_common_params,
drivers/ddr/fsl/mpc85xx_ddr_gen1.c renamed from arch/powerpc/cpu/mpc85xx/ddr-gen1.c +3 -3
@@ -8,7 +8,7 @@#include <common.h> #include <asm/io.h> -#include <asm/fsl_ddr_sdram.h> +#include <fsl_ddr_sdram.h> #if (CONFIG_CHIP_SELECTS_PER_CTRL >4 )#error Invalid setting for CONFIG_CHIP_SELECTS_PER_CTRL
@@ -18,7 +18,7 @@ void fsl_ddr_set_memctl_regs(const fsl_ddr_cfg_regs_t *regs, unsigned int ctrl_num, int step) {unsigned int i; -volatile ccsr_ddr_t *ddr = (void *)CONFIG_SYS_MPC8xxx_DDR_ADDR; +volatile ccsr_ddr_t *ddr = (void *)CONFIG_SYS_FSL_DDR_ADDR ;if (ctrl_num !=0 ) {printf ("%s unexpected ctrl_num = %u\n" , __FUNCTION__, ctrl_num);
@@ -73,7 +73,7 @@ void fsl_ddr_set_memctl_regs(const fsl_ddr_cfg_regs_t *regs,void ddr_enable_ecc (unsigned int dram_size) { -volatile ccsr_ddr_t *ddr= (void *)(CONFIG_SYS_MPC8xxx_DDR_ADDR); +volatile ccsr_ddr_t *ddr = (void *)(CONFIG_SYS_FSL_DDR_ADDR );dma_meminit (CONFIG_MEM_INIT_VALUE , dram_size);
drivers/ddr/fsl/mpc85xx_ddr_gen2.c renamed from arch/powerpc/cpu/mpc85xx/ddr-gen2.c +2 -2
@@ -9,7 +9,7 @@#include <common.h> #include <asm/io.h> #include <asm/processor.h> -#include <asm/fsl_ddr_sdram.h> +#include <fsl_ddr_sdram.h> #if (CONFIG_CHIP_SELECTS_PER_CTRL >4 )#error Invalid setting for CONFIG_CHIP_SELECTS_PER_CTRL
@@ -19,7 +19,7 @@ void fsl_ddr_set_memctl_regs(const fsl_ddr_cfg_regs_t *regs, unsigned int ctrl_num, int step) {unsigned int i; -ccsr_ddr_t *ddr = (void *)CONFIG_SYS_MPC8xxx_DDR_ADDR; +ccsr_ddr_t *ddr = (void *)CONFIG_SYS_FSL_DDR_ADDR ;#if defined(CONFIG_SYS_FSL_ERRATUM_NMG_DDR120 ) && defined(CONFIG_MPC85xx)ccsr_gur_t *gur = (void *)(CONFIG_SYS_MPC85xx_GUTS_ADDR);
drivers/ddr/fsl/mpc85xx_ddr_gen3.c renamed from arch/powerpc/cpu/mpc85xx/ddr-gen3.c +8 -8
@@ -8,7 +8,7 @@#include <common.h> #include <asm/io.h> -#include <asm/fsl_ddr_sdram.h> +#include <fsl_ddr_sdram.h> #include <asm/processor.h> #if (CONFIG_CHIP_SELECTS_PER_CTRL >4 )
@@ -42,21 +42,21 @@ void fsl_ddr_set_memctl_regs(const fsl_ddr_cfg_regs_t *regs,switch (ctrl_num) {case 0 : - ddr = (void *)CONFIG_SYS_MPC8xxx_DDR_ADDR; + ddr = (void *)CONFIG_SYS_FSL_DDR_ADDR ;break ; -#if defined(CONFIG_SYS_MPC8xxx_DDR2_ADDR) && (CONFIG_NUM_DDR_CONTROLLERS >1 ) +#if defined(CONFIG_SYS_FSL_DDR2_ADDR ) && (CONFIG_NUM_DDR_CONTROLLERS >1 )case 1 : - ddr = (void *)CONFIG_SYS_MPC8xxx_DDR2_ADDR; + ddr = (void *)CONFIG_SYS_FSL_DDR2_ADDR ;break ;#endif -#if defined(CONFIG_SYS_MPC8xxx_DDR3_ADDR) && (CONFIG_NUM_DDR_CONTROLLERS >2 ) +#if defined(CONFIG_SYS_FSL_DDR3_ADDR ) && (CONFIG_NUM_DDR_CONTROLLERS >2 )case 2 : - ddr = (void *)CONFIG_SYS_MPC8xxx_DDR3_ADDR; + ddr = (void *)CONFIG_SYS_FSL_DDR3_ADDR ;break ;#endif -#if defined(CONFIG_SYS_MPC8xxx_DDR4_ADDR) && (CONFIG_NUM_DDR_CONTROLLERS >3 ) +#if defined(CONFIG_SYS_FSL_DDR4_ADDR ) && (CONFIG_NUM_DDR_CONTROLLERS >3 )case 3 : - ddr = (void *)CONFIG_SYS_MPC8xxx_DDR4_ADDR; + ddr = (void *)CONFIG_SYS_FSL_DDR4_ADDR ;break ;#endif default :
drivers/ddr/fsl/mpc86xx_ddr.c renamed from arch/powerpc/cpu/mpc86xx/ddr-8641.c +3 -3
@@ -8,7 +8,7 @@#include <common.h> #include <asm/io.h> -#include <asm/fsl_ddr_sdram.h> +#include <fsl_ddr_sdram.h> #if (CONFIG_CHIP_SELECTS_PER_CTRL >4 )#error Invalid setting for CONFIG_CHIP_SELECTS_PER_CTRL
@@ -22,10 +22,10 @@ void fsl_ddr_set_memctl_regs(const fsl_ddr_cfg_regs_t *regs,switch (ctrl_num) {case 0 : - ddr = (void *)CONFIG_SYS_MPC8xxx_DDR_ADDR; + ddr = (void *)CONFIG_SYS_FSL_DDR_ADDR ;break ;case 1 : - ddr = (void *)CONFIG_SYS_MPC8xxx_DDR2_ADDR; + ddr = (void *)CONFIG_SYS_FSL_DDR2_ADDR ;break ;default :printf ("%s unexpected ctrl_num = %u\n" , __FUNCTION__, ctrl_num);
drivers/ddr/fsl/options.c renamed from arch/powerpc/cpu/mpc8xxx/ddr/options.c +2 -2
@@ -6,9 +6,9 @@#include <common.h> #include <hwconfig.h> -#include <asm/fsl_ddr_sdram.h> +#include <fsl_ddr_sdram.h> -#include "ddr.h" +#include <fsl_ddr.h> /* * Use our own stack based buffer before relocation to allow accessing longer
drivers/ddr/fsl/util.c renamed from arch/powerpc/cpu/mpc8xxx/ddr/util.c +6 -4
@@ -10,7 +10,9 @@#include <asm/fsl_law.h> #include <div64.h> -#include "ddr.h" +#include <fsl_ddr.h> +#include <fsl_immap.h> +#include <asm/io.h> /* To avoid 64-bit full-divides, we factor this here */ #define ULL_2E12 2000000000000ULL
@@ -133,7 +135,7 @@ u32 fsl_ddr_get_intl3r(void)void board_add_ram_info (int use_default) { -ccsr_ddr_t *ddr = (void *)(CONFIG_SYS_MPC8xxx_DDR_ADDR); +ccsr_ddr_t *ddr = (void *)(CONFIG_SYS_FSL_DDR_ADDR );#if defined(CONFIG_E6500 ) && (CONFIG_NUM_DDR_CONTROLLERS ==3 )u32 *mcintl3r = (void *) (CONFIG_SYS_IMMR +0x18004 );
@@ -146,13 +148,13 @@ void board_add_ram_info(int use_default)#if CONFIG_NUM_DDR_CONTROLLERS >=2 if (!(sdram_cfg &SDRAM_CFG_MEM_EN )) { - ddr = (void __iomem *)CONFIG_SYS_MPC8xxx_DDR2_ADDR; + ddr = (void __iomem *)CONFIG_SYS_FSL_DDR2_ADDR ; sdram_cfg =in_be32 (&ddr->sdram_cfg); }#endif #if CONFIG_NUM_DDR_CONTROLLERS >=3 if (!(sdram_cfg &SDRAM_CFG_MEM_EN )) { - ddr = (void __iomem *)CONFIG_SYS_MPC8xxx_DDR3_ADDR; + ddr = (void __iomem *)CONFIG_SYS_FSL_DDR3_ADDR ; sdram_cfg =in_be32 (&ddr->sdram_cfg); }#endif
include/common_timing_params.h renamed from arch/powerpc/cpu/mpc8xxx/ddr/common_timing_params.h +0 -0
include/fsl_ddr.h renamed from arch/powerpc/cpu/mpc8xxx/ddr/ddr.h +3 -3
@@ -9,10 +9,10 @@#ifndef FSL_DDR_MAIN_H #define FSL_DDR_MAIN_H -#include <asm/fsl_ddr_sdram.h> -#include <asm/fsl_ddr_dimm_params.h> +#include <fsl_ddr_sdram.h> +#include <fsl_ddr_dimm_params.h> -#include "common_timing_params.h" +#include <common_timing_params.h> #if defined(CONFIG_DDR_SPD ) || defined(CONFIG_SPD_EEPROM )/*
include/fsl_ddr_dimm_params.h renamed from arch/powerpc/include/asm/fsl_ddr_dimm_params.h +0 -0
include/fsl_ddr_sdram.h renamed from arch/powerpc/include/asm/fsl_ddr_sdram.h +0 -0
nand_spl/board/freescale/mpc8569mds/nand_boot.c +1 -1
@@ -10,7 +10,7 @@#include <nand.h> #include <asm/mmu.h> #include <asm/immap_85xx.h> -#include <asm/fsl_ddr_sdram.h> +#include <fsl_ddr_sdram.h> #include <asm/fsl_law.h> #define SYSCLK_66 66666666
nand_spl/board/freescale/p1023rds/nand_boot.c +2 -2
@@ -10,7 +10,7 @@#include <asm/io.h> #include <nand.h> #include <asm/fsl_law.h> -#include <asm/fsl_ddr_sdram.h> +#include <fsl_ddr_sdram.h> #include <asm/global_data.h> DECLARE_GLOBAL_DATA_PTR ;
@@ -18,7 +18,7 @@ DECLARE_GLOBAL_DATA_PTR;/* Fixed sdram init -- doesn't use serial presence detect. */ void sdram_init (void ) { -ccsr_ddr_t *ddr = (ccsr_ddr_t *)CONFIG_SYS_MPC8xxx_DDR_ADDR; +ccsr_ddr_t *ddr = (ccsr_ddr_t *)CONFIG_SYS_FSL_DDR_ADDR ;set_next_law (0 ,LAW_SIZE_2G ,LAW_TRGT_IF_DDR_1 );
nand_spl/board/freescale/p1_p2_rdb/nand_boot.c +1 -1
@@ -10,7 +10,7 @@#include <nand.h> #include <asm/mmu.h> #include <asm/immap_85xx.h> -#include <asm/fsl_ddr_sdram.h> +#include <fsl_ddr_sdram.h> #include <asm/fsl_law.h> #define SYSCLK_MASK 0x00200000
spl/Makefile +1 -1
@@ -63,7 +63,7 @@ endif ifeq ($(CPU),mpc85xx) LIBS-y += arch/powerpc/cpu/mpc8xxx/lib8xxx.o ifdef CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT -LIBS-y += arch/powerpc/cpu/mpc8xxx/ddr/libddr.o +LIBS-$(CONFIG_SYS_FSL_DDR) += drivers/ddr/fsl/libddr.o endif endif ifeq ($(CPU),mpc86xx)
Signature · 1 line
1.7.9.5
PATCH 1/6 Driver/DDR: Moving Freescale DDR driver to a common driver
Quoted 195 lines · York Sun
Freescale DDR driver has been used for mpc83xx, mpc85xx, mpc86xx SoCs. The similar DDR controllers will be used for ARM-based SoCs.
Signed-off-by York Sun <[email protected]>--- Makefile | 4 +- README | 39 ++++++++++++++-- arch/powerpc/cpu/mpc83xx/Makefile | 8 +--- arch/powerpc/cpu/mpc85xx/Makefile | 42 ----------------- arch/powerpc/cpu/mpc85xx/cpu.c | 16 +++---- arch/powerpc/cpu/mpc85xx/mp.c | 2 +- arch/powerpc/cpu/mpc86xx/Makefile | 3 -- arch/powerpc/cpu/mpc8xxx/ddr/Makefile | 45 ------------------ arch/powerpc/include/asm/config.h | 6 +++ arch/powerpc/include/asm/config_mpc85xx.h | 13 ++++++ arch/powerpc/include/asm/config_mpc86xx.h | 2 + arch/powerpc/include/asm/immap_83xx.h | 2 +- arch/powerpc/include/asm/immap_85xx.h | 6 +-- arch/powerpc/include/asm/immap_86xx.h | 4 +- board/exmeritus/hww1u1a/ddr.c | 4 +- board/exmeritus/hww1u1a/hww1u1a.c | 4 +- board/freescale/b4860qds/ddr.c | 6 +-- board/freescale/bsc9131rdb/ddr.c | 4 +- board/freescale/bsc9131rdb/spl_minimal.c | 4 +- board/freescale/bsc9132qds/bsc9132qds.c | 4 +- board/freescale/bsc9132qds/ddr.c | 4 +- board/freescale/bsc9132qds/spl_minimal.c | 4 +- board/freescale/c29xpcie/ddr.c | 4 +- board/freescale/corenet_ds/ddr.c | 4 +- board/freescale/corenet_ds/eth_p4080.c | 2 +- board/freescale/corenet_ds/p3041ds_ddr.c | 2 +- board/freescale/corenet_ds/p4080ds_ddr.c | 2 +- board/freescale/corenet_ds/p5020ds_ddr.c | 2 +- board/freescale/corenet_ds/p5040ds_ddr.c | 2 +- board/freescale/mpc8349emds/ddr.c | 4 +- board/freescale/mpc8349emds/mpc8349emds.c | 2 +- board/freescale/mpc8536ds/ddr.c | 4 +- board/freescale/mpc8536ds/mpc8536ds.c | 2 +- board/freescale/mpc8540ads/ddr.c | 4 +- board/freescale/mpc8540ads/mpc8540ads.c | 4 +- board/freescale/mpc8541cds/ddr.c | 4 +- board/freescale/mpc8541cds/mpc8541cds.c | 2 +- board/freescale/mpc8544ds/ddr.c | 4 +- board/freescale/mpc8544ds/mpc8544ds.c | 2 +- board/freescale/mpc8548cds/ddr.c | 4 +- board/freescale/mpc8548cds/mpc8548cds.c | 2 +- board/freescale/mpc8555cds/ddr.c | 4 +- board/freescale/mpc8555cds/mpc8555cds.c | 2 +- board/freescale/mpc8560ads/ddr.c | 4 +- board/freescale/mpc8560ads/mpc8560ads.c | 4 +- board/freescale/mpc8568mds/ddr.c | 4 +- board/freescale/mpc8568mds/mpc8568mds.c | 2 +- board/freescale/mpc8569mds/ddr.c | 4 +- board/freescale/mpc8569mds/mpc8569mds.c | 4 +- board/freescale/mpc8572ds/ddr.c | 4 +- board/freescale/mpc8572ds/mpc8572ds.c | 2 +- board/freescale/mpc8610hpcd/ddr.c | 4 +- board/freescale/mpc8610hpcd/mpc8610hpcd.c | 2 +- board/freescale/mpc8641hpcn/ddr.c | 4 +- board/freescale/mpc8641hpcn/mpc8641hpcn.c | 2 +- board/freescale/p1010rdb/ddr.c | 4 +- board/freescale/p1010rdb/spl_minimal.c | 4 +- board/freescale/p1022ds/ddr.c | 4 +- board/freescale/p1022ds/p1022ds.c | 2 +- board/freescale/p1022ds/spl_minimal.c | 2 +- board/freescale/p1023rdb/ddr.c | 4 +- board/freescale/p1023rdb/p1023rdb.c | 2 +- board/freescale/p1023rds/p1023rds.c | 4 +- board/freescale/p1_p2_rdb/ddr.c | 2 +- board/freescale/p1_p2_rdb_pc/ddr.c | 4 +- board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c | 2 +- board/freescale/p1_p2_rdb_pc/spl_minimal.c | 2 +- board/freescale/p1_twr/ddr.c | 4 +- board/freescale/p1_twr/p1_twr.c | 2 +- board/freescale/p2020come/ddr.c | 4 +- board/freescale/p2020ds/ddr.c | 4 +- board/freescale/p2020ds/p2020ds.c | 4 +- board/freescale/p2041rdb/ddr.c | 4 +- board/freescale/t1040qds/ddr.c | 4 +- board/freescale/t4qds/ddr.c | 4 +- board/freescale/t4qds/eth.c | 2 +- board/gdsys/p1022/controlcenterd.c | 2 +- board/gdsys/p1022/ddr.c | 4 +- board/keymile/kmp204x/ddr.c | 4 +- board/sbc8548/ddr.c | 6 +-- board/sbc8548/sbc8548.c | 2 +- board/sbc8641d/ddr.c | 4 +- board/sbc8641d/sbc8641d.c | 2 +- board/socrates/ddr.c | 4 +- board/socrates/sdram.c | 4 +- board/stx/stxgp3/ddr.c | 4 +- board/stx/stxgp3/stxgp3.c | 2 +- board/stx/stxssa/ddr.c | 4 +- board/stx/stxssa/stxssa.c | 2 +- board/xes/xpedite517x/ddr.c | 4 +- board/xes/xpedite517x/xpedite517x.c | 2 +- board/xes/xpedite520x/ddr.c | 4 +- board/xes/xpedite537x/ddr.c | 4 +- board/xes/xpedite550x/ddr.c | 4 +- drivers/ddr/fsl/Makefile | 49 ++++++++++++++++++++ .../mpc8xxx/ddr => drivers/ddr/fsl}/ctrl_regs.c | 8 ++-- .../ddr => drivers/ddr/fsl}/ddr1_dimm_params.c | 4 +- .../ddr => drivers/ddr/fsl}/ddr2_dimm_params.c | 4 +- .../ddr => drivers/ddr/fsl}/ddr3_dimm_params.c | 4 +- .../mpc8xxx/ddr => drivers/ddr/fsl}/interactive.c | 5 +- .../ddr/fsl}/lc_common_dimm_params.c | 4 +- .../cpu/mpc8xxx/ddr => drivers/ddr/fsl}/main.c | 4 +- .../ddr/fsl/mpc85xx_ddr_gen1.c | 6 +-- .../ddr/fsl/mpc85xx_ddr_gen2.c | 4 +- .../ddr/fsl/mpc85xx_ddr_gen3.c | 16 +++---- .../ddr-8641.c => drivers/ddr/fsl/mpc86xx_ddr.c | 6 +-- .../cpu/mpc8xxx/ddr => drivers/ddr/fsl}/options.c | 4 +- .../cpu/mpc8xxx/ddr => drivers/ddr/fsl}/util.c | 10 ++-- .../mpc8xxx/ddr => include}/common_timing_params.h | 0 .../cpu/mpc8xxx/ddr/ddr.h => include/fsl_ddr.h | 6 +-- .../include/asm => include}/fsl_ddr_dimm_params.h | 0 .../include/asm => include}/fsl_ddr_sdram.h | 0 nand_spl/board/freescale/mpc8569mds/nand_boot.c | 2 +- nand_spl/board/freescale/p1023rds/nand_boot.c | 4 +- nand_spl/board/freescale/p1_p2_rdb/nand_boot.c | 2 +- spl/Makefile | 2 +- 116 files changed, 304 insertions(+), 298 deletions(-) delete mode 100644 arch/powerpc/cpu/mpc8xxx/ddr/Makefile create mode 100644 drivers/ddr/fsl/Makefile rename {arch/powerpc/cpu/mpc8xxx/ddr => drivers/ddr/fsl}/ctrl_regs.c (99%) rename {arch/powerpc/cpu/mpc8xxx/ddr => drivers/ddr/fsl}/ddr1_dimm_params.c (99%) rename {arch/powerpc/cpu/mpc8xxx/ddr => drivers/ddr/fsl}/ddr2_dimm_params.c (99%) rename {arch/powerpc/cpu/mpc8xxx/ddr => drivers/ddr/fsl}/ddr3_dimm_params.c (99%) rename {arch/powerpc/cpu/mpc8xxx/ddr => drivers/ddr/fsl}/interactive.c (99%) rename {arch/powerpc/cpu/mpc8xxx/ddr => drivers/ddr/fsl}/lc_common_dimm_params.c (99%) rename {arch/powerpc/cpu/mpc8xxx/ddr => drivers/ddr/fsl}/main.c (99%) rename arch/powerpc/cpu/mpc85xx/ddr-gen1.c => drivers/ddr/fsl/mpc85xx_ddr_gen1.c (93%) rename arch/powerpc/cpu/mpc85xx/ddr-gen2.c => drivers/ddr/fsl/mpc85xx_ddr_gen2.c (96%) rename arch/powerpc/cpu/mpc85xx/ddr-gen3.c => drivers/ddr/fsl/mpc85xx_ddr_gen3.c (97%) rename arch/powerpc/cpu/mpc86xx/ddr-8641.c => drivers/ddr/fsl/mpc86xx_ddr.c (95%) rename {arch/powerpc/cpu/mpc8xxx/ddr => drivers/ddr/fsl}/options.c (99%) rename {arch/powerpc/cpu/mpc8xxx/ddr => drivers/ddr/fsl}/util.c (96%) rename {arch/powerpc/cpu/mpc8xxx/ddr => include}/common_timing_params.h (100%) rename arch/powerpc/cpu/mpc8xxx/ddr/ddr.h => include/fsl_ddr.h (97%) rename {arch/powerpc/include/asm => include}/fsl_ddr_dimm_params.h (100%) rename {arch/powerpc/include/asm => include}/fsl_ddr_sdram.h (100%)Makefile +1
-3@@ -291,19 +291,17 @@ LIBS-y += drivers/spi/libspi.o LIBS-y += drivers/dfu/libdfu.o ifeq ($(CPU),mpc83xx) LIBS-y += drivers/qe/libqe.o -LIBS-y += arch/powerpc/cpu/mpc8xxx/ddr/libddr.o LIBS-y += arch/powerpc/cpu/mpc8xxx/lib8xxx.o endif ifeq ($(CPU),mpc85xx) LIBS-y += drivers/qe/libqe.o LIBS-y += drivers/net/fm/libfm.o -LIBS-y += arch/powerpc/cpu/mpc8xxx/ddr/libddr.o LIBS-y += arch/powerpc/cpu/mpc8xxx/lib8xxx.o endif ifeq ($(CPU),mpc86xx) -LIBS-y += arch/powerpc/cpu/mpc8xxx/ddr/libddr.o LIBS-y += arch/powerpc/cpu/mpc8xxx/lib8xxx.o endif +LIBS-$(CONFIG_SYS_FSL_DDR) += drivers/ddr/fsl/libddr.o LIBS-y += drivers/rtc/librtc.o LIBS-y += drivers/serial/libserial.o LIBS-y += drivers/sound/libsound.oREADME +10
-4@@ -423,16 +423,45 @@ The following options need to be configured: CONFIG_SYS_FSL_DSP_CCSRBAR_DEFAULT This value denotes start offset of DSP CCSR space. - CONFIG_SYS_FSL_DDR_EMU - Specify emulator support for DDR. Some DDR features such as - deskew training are not available. - - Generic CPU options: CONFIG_SYS_BIG_ENDIAN, CONFIG_SYS_LITTLE_ENDIAN Defines the endianess of the CPU. Implementation of those values is arch specific. + CONFIG_SYS_FSL_DDR + Freescale DDR driver in use. This type of DDR controller is + found in mpc83xx, mpc85xx, mpc86xx as well as some ARM core + SoCs. + + CONFIG_SYS_FSL_DDR_ADDR + Freescale DDR memory-mapped register base. + + CONFIG_SYS_FSL_DDR_EMU + Specify emulator support for DDR. Some DDR features such as
README The following options need to be configured: · line 451
Quoted 10 lines
README +10
-0+ deskew training are not available. + + CONFIG_SYS_FSL_DDR_PPC_GEN1 + Freescale DDR1 controller. + + CONFIG_SYS_FSL_DDR_PPC_GEN2 + Freescale DDR2 controller. + + CONFIG_SYS_FSL_DDR_PPC_GEN3 + Freescale DDR3 controller.
Why is there "PPC" in the name if this is to be common for PPC and ARM? The description is more generic than the config symbol...
README The following options need to be configured: · line 463
Quoted 11 lines
README +11
-0+ CONFIG_FSL_DDR1 + User config to use DDR1. It can be enabled for SoCs with + Freescale DDR1 or DDR2 controllers. + + CONFIG_FSL_DDR2 + User config to use DDR2. It can be eanbeld for SoCs with + Freescale DDR2 or DDR3 controllers. + + CONFIG_FSL_DDR3 + User config to use DDR3. It can be enabled for SoCs with + Freescale DDR3 controllers.
How is this user config, rather than a description of the type of DDR that is present?
arch/powerpc/include/asm/config_mpc86xx.h line 10
Quoted 9 lines
arch/powerpc/include/asm/config_mpc86xx.h +1
-0@@ -7,6 +7,8 @@#ifndef _ASM_MPC86xx_CONFIG_H_#define _ASM_MPC86xx_CONFIG_H_ +#define CONFIG_SYS_FSL_DDR_86XX
This doesn't qualify as one of the "PPC_GEN" controllers?
-Scott
PATCH 1/6 Driver/DDR: Moving Freescale DDR driver to a common driver
Quoted 17 lines · Scott Wood
Quoted 16 lines · York Sun
README +15
-0+ CONFIG_SYS_FSL_DDR + Freescale DDR driver in use. This type of DDR controller is + found in mpc83xx, mpc85xx, mpc86xx as well as some ARM core + SoCs. + + CONFIG_SYS_FSL_DDR_ADDR + Freescale DDR memory-mapped register base. + + CONFIG_SYS_FSL_DDR_EMU + Specify emulator support for DDR. Some DDR features such as + deskew training are not available. + + CONFIG_SYS_FSL_DDR_PPC_GEN1 + Freescale DDR1 controller. +
Quoted 8 lines
README The following options need to be configured: · line 451
Quoted 5 lines
README +5
-0+ CONFIG_SYS_FSL_DDR_PPC_GEN2 + Freescale DDR2 controller. + + CONFIG_SYS_FSL_DDR_PPC_GEN3 + Freescale DDR3 controller.Why is there "PPC" in the name if this is to be common for PPC and ARM? The description is more generic than the config symbol...
This patch moves the DDR driver out of powerpc. I should deal with the common part for ARM and PPC later. Good point.
Quoted 15 lines
README The following options need to be configured: · line 463
Quoted 12 lines
README +11
-0+ CONFIG_FSL_DDR1 + User config to use DDR1. It can be enabled for SoCs with + Freescale DDR1 or DDR2 controllers. + + CONFIG_FSL_DDR2 + User config to use DDR2. It can be eanbeld for SoCs with + Freescale DDR2 or DDR3 controllers. + + CONFIG_FSL_DDR3 + User config to use DDR3. It can be enabled for SoCs with + Freescale DDR3 controllers.How is this user config, rather than a description of the type of DDR that is present?
The DDR controller may support more than one type of memory. DDR2 controllers support both DDR1 and DDR2, and some DDR3 controllers support both DDR2 and DDR3. It's user's option to choose which type of DDR devices to use. The driver needs to deal with them differently. You may argue the driver should detect them and choose the algorithm differently. But that will increase the code size considerably. It makes less sense to do so because once the board is designed, it is either this or that.
Quoted 9 lines
Quoted 9 lines
arch/powerpc/include/asm/config_mpc86xx.h +0
-0@@ -7,6 +7,8 @@#ifndef _ASM_MPC86xx_CONFIG_H_#define _ASM_MPC86xx_CONFIG_H_
Quoted 4 lines
arch/powerpc/include/asm/config_mpc86xx.h line 10
Quoted 1 line
arch/powerpc/include/asm/config_mpc86xx.h +1
-0+#define CONFIG_SYS_FSL_DDR_86XX This doesn't qualify as one of the "
PPC_GEN" controllers?
The common part is shared for all controllers. The final writing register function is different. I didn't try to merge 86xx with 85xx, because 85xx is messy, with a lot of workaround. And most importantly, 86xx driver stay with DDR2 while 85xx driver mainly supports DDR3.
York
PATCH 1/6 Driver/DDR: Moving Freescale DDR driver to a common driver
Quoted 46 lines · On Fri, 2013-11-08 at 20:25 -0600, sun york-R58495 wrote:
Quoted 17 lines · Scott Wood
Quoted 16 lines · York Sun
README +15
-0+ CONFIG_SYS_FSL_DDR + Freescale DDR driver in use. This type of DDR controller is + found in mpc83xx, mpc85xx, mpc86xx as well as some ARM core + SoCs. + + CONFIG_SYS_FSL_DDR_ADDR + Freescale DDR memory-mapped register base. + + CONFIG_SYS_FSL_DDR_EMU + Specify emulator support for DDR. Some DDR features such as + deskew training are not available. + + CONFIG_SYS_FSL_DDR_PPC_GEN1 + Freescale DDR1 controller. +Quoted 8 lines
README The following options need to be configured: · line 451
Quoted 5 lines
README +5
-0+ CONFIG_SYS_FSL_DDR_PPC_GEN2 + Freescale DDR2 controller. + + CONFIG_SYS_FSL_DDR_PPC_GEN3 + Freescale DDR3 controller.Why is there "PPC" in the name if this is to be common for PPC and ARM? The description is more generic than the config symbol...
This patch moves the DDR driver out of powerpc. I should deal with the common part for ARM and PPC later. Good point.
Quoted 15 lines
README The following options need to be configured: · line 463
Quoted 12 lines
README +11
-0+ CONFIG_FSL_DDR1 + User config to use DDR1. It can be enabled for SoCs with + Freescale DDR1 or DDR2 controllers. + + CONFIG_FSL_DDR2 + User config to use DDR2. It can be eanbeld for SoCs with + Freescale DDR2 or DDR3 controllers. + + CONFIG_FSL_DDR3 + User config to use DDR3. It can be enabled for SoCs with + Freescale DDR3 controllers.How is this user config, rather than a description of the type of DDR that is present?
Quoted 8 lines
The DDR controller may support more than one type of memory. DDR2 controllers support both DDR1 and DDR2, and some DDR3 controllers support both DDR2 and DDR3. It's user's option to choose which type of DDR devices to use. The driver needs to deal with them differently. You may argue the driver should detect them and choose the algorithm differently. But that will increase the code size considerably. It makes less sense to do so because once the board is designed, it is either this or that.
My point is that the type of DDR that is present is hardware description, just as much as the type of DDR controller. "User config" means things users can choose purely in software, without a corresponding hardware change.
-Scott
PATCH 1/6 Driver/DDR: Moving Freescale DDR driver to a common driver
Quoted 56 lines · Scott Wood
Quoted 46 lines · On Fri, 2013-11-08 at 20:25 -0600, sun york-R58495 wrote:
Quoted 17 lines · Scott Wood
Quoted 16 lines · York Sun
README +15
-0+ CONFIG_SYS_FSL_DDR + Freescale DDR driver in use. This type of DDR controller is + found in mpc83xx, mpc85xx, mpc86xx as well as some ARM core + SoCs. + + CONFIG_SYS_FSL_DDR_ADDR + Freescale DDR memory-mapped register base. + + CONFIG_SYS_FSL_DDR_EMU + Specify emulator support for DDR. Some DDR features such as + deskew training are not available. + + CONFIG_SYS_FSL_DDR_PPC_GEN1 + Freescale DDR1 controller. +Quoted 8 lines
README The following options need to be configured: · line 451
Quoted 5 lines
README +5
-0+ CONFIG_SYS_FSL_DDR_PPC_GEN2 + Freescale DDR2 controller. + + CONFIG_SYS_FSL_DDR_PPC_GEN3 + Freescale DDR3 controller.Why is there "PPC" in the name if this is to be common for PPC and ARM? The description is more generic than the config symbol...
This patch moves the DDR driver out of powerpc. I should deal with the common part for ARM and PPC later. Good point.
Quoted 15 lines
README The following options need to be configured: · line 463
Quoted 12 lines
README +11
-0+ CONFIG_FSL_DDR1 + User config to use DDR1. It can be enabled for SoCs with + Freescale DDR1 or DDR2 controllers. + + CONFIG_FSL_DDR2 + User config to use DDR2. It can be eanbeld for SoCs with + Freescale DDR2 or DDR3 controllers. + + CONFIG_FSL_DDR3 + User config to use DDR3. It can be enabled for SoCs with + Freescale DDR3 controllers.How is this user config, rather than a description of the type of DDR that is present?
Quoted 8 lines
The DDR controller may support more than one type of memory. DDR2 controllers support both DDR1 and DDR2, and some DDR3 controllers support both DDR2 and DDR3. It's user's option to choose which type of DDR devices to use. The driver needs to deal with them differently. You may argue the driver should detect them and choose the algorithm differently. But that will increase the code size considerably. It makes less sense to do so because once the board is designed, it is either this or that.
Quoted 5 lines
My point is that the type of DDR that is present is hardware description, just as much as the type of DDR controller. "User config" means things users can choose purely in software, without a corresponding hardware change.
This is a board-level configuration, not SoC level. Should we use CONFIG_SYS_ as well? If so, we need to come up with a new name, such as CONFIG_SYS_FSL_DDR_MEM_GEN3.
York
PATCH 1/6 Driver/DDR: Moving Freescale DDR driver to a common driver
Quoted 9 lines · York Sun
Quoted 5 lines · Scott Wood
My point is that the type of DDR that is present is hardware description, just as much as the type of DDR controller. "User config" means things users can choose purely in software, without a corresponding hardware change.
This is a board-level configuration, not SoC level. Should we use
CONFIG_SYS_as well?
Yes.
Quoted 1 line
If so, we need to come up with a new name, such as
CONFIG_SYS_FSL_DDR_MEM_GEN3.
How about CONFIG_SYS_FSL_DDR3 for the memory, andCONFIG_SYS_FSL_DDR_CTRL3 for the controller?
-Scott
PATCH 1/6 Driver/DDR: Moving Freescale DDR driver to a common driver
Quoted 11 lines · Scott Wood
Quoted 9 lines · York Sun
Quoted 5 lines · Scott Wood
My point is that the type of DDR that is present is hardware description, just as much as the type of DDR controller. "User config" means things users can choose purely in software, without a corresponding hardware change.
This is a board-level configuration, not SoC level. Should we use
CONFIG_SYS_as well?
Quoted 7 lines
Yes.
Quoted 1 line
If so, we need to come up with a new name, such as
CONFIG_SYS_FSL_DDR_MEM_GEN3.How about
CONFIG_SYS_FSL_DDR3for the memory, andCONFIG_SYS_FSL_DDR_CTRL3for the controller?
I am reluctant to change existing macro to different meaning. How about CONFIG_SYS_FSL_DDR3_MEM, or CONFIG_SYS_FSL_MEM_DDR3?
York
PATCH 1/6 Driver/DDR: Moving Freescale DDR driver to a common driver
Quoted 14 lines · York Sun
Quoted 13 lines · Scott Wood
Quoted 9 lines · York Sun
Quoted 5 lines · Scott Wood
My point is that the type of DDR that is present is hardware description, just as much as the type of DDR controller. "User config" means things users can choose purely in software, without a corresponding hardware change.
This is a board-level configuration, not SoC level. Should we use
CONFIG_SYS_as well?Yes.
Quoted 8 lines
Quoted 5 lines
Quoted 1 line
If so, we need to come up with a new name, such as
CONFIG_SYS_FSL_DDR_MEM_GEN3.How about
CONFIG_SYS_FSL_DDR3for the memory, andCONFIG_SYS_FSL_DDR_CTRL3for the controller?I am reluctant to change existing macro to different meaning. How about
CONFIG_SYS_FSL_DDR3_MEM, orCONFIG_SYS_FSL_MEM_DDR3?
CONFIG_SYS_FSL_DDR3 is not an existing macro.
-Scott
PATCH 1/6 Driver/DDR: Moving Freescale DDR driver to a common driver
Quoted 17 lines · Scott Wood
Quoted 16 lines · York Sun
Quoted 15 lines · Scott Wood
Quoted 9 lines · York Sun
Quoted 5 lines · Scott Wood
My point is that the type of DDR that is present is hardware description, just as much as the type of DDR controller. "User config" means things users can choose purely in software, without a corresponding hardware change.
This is a board-level configuration, not SoC level. Should we use
CONFIG_SYS_as well?Yes.
Quoted 1 line
If so, we need to come up with a new name, such as
CONFIG_SYS_FSL_DDR_MEM_GEN3.
Quoted 9 lines
Quoted 6 lines
Quoted 3 lines
How about
CONFIG_SYS_FSL_DDR3for the memory, andCONFIG_SYS_FSL_DDR_CTRL3for the controller?I am reluctant to change existing macro to different meaning. How about
CONFIG_SYS_FSL_DDR3_MEM, orCONFIG_SYS_FSL_MEM_DDR3?
CONFIG_SYS_FSL_DDR3is not an existing macro.
Oh. My mistake. We can use CONFIG_SYS_FSL_DDR3 for the memory. But I prefer to keep CONFIG_SYS_FSL_DDR_PPC_GEN3 or use CONFIG_SYS_FSL_DDRC_GEN3 if it can be merged with ARM controller. CTRL3 is misleading. It makes me thinking of controller #3.
York
PATCH 1/6 Driver/DDR: Moving Freescale DDR driver to a common driver
Quoted 25 lines · York Sun
Quoted 24 lines · Scott Wood
Quoted 22 lines · York Sun
Quoted 11 lines · Scott Wood
Quoted 9 lines · York Sun
Quoted 5 lines · Scott Wood
My point is that the type of DDR that is present is hardware description, just as much as the type of DDR controller. "User config" means things users can choose purely in software, without a corresponding hardware change.
This is a board-level configuration, not SoC level. Should we use
CONFIG_SYS_as well?Quoted 7 lines
Yes.
Quoted 1 line
If so, we need to come up with a new name, such as
CONFIG_SYS_FSL_DDR_MEM_GEN3.How about
CONFIG_SYS_FSL_DDR3for the memory, andCONFIG_SYS_FSL_DDR_CTRL3for the controller?I am reluctant to change existing macro to different meaning. How about
CONFIG_SYS_FSL_DDR3_MEM, orCONFIG_SYS_FSL_MEM_DDR3?
Quoted 7 lines
Quoted 2 lines
CONFIG_SYS_FSL_DDR3is not an existing macro.Oh. My mistake. We can use
CONFIG_SYS_FSL_DDR3for the memory. But I prefer to keepCONFIG_SYS_FSL_DDR_PPC_GEN3or useCONFIG_SYS_FSL_DDRC_GEN3if it can be merged with ARM controller. CTRL3 is misleading. It makes me thinking of controller #3.
OK.
-Scott
PATCH 2/6 Driver/DDR: combine ccsr_ddr for 83xx, 85xx and 86xx
In reply to York SunFix ccsr_ddr structure to avoid using typedef. Combine DDR2 and DDR3 structure for 83xx, 85xx and 86xx.
--- arch/powerpc/cpu/mpc83xx/ecc.c | 4 +- arch/powerpc/cpu/mpc85xx/cpu.c | 4 +- arch/powerpc/include/asm/immap_83xx.h | 106 ++--------------------- arch/powerpc/include/asm/immap_85xx.h | 100 +--------------------- arch/powerpc/include/asm/immap_86xx.h | 74 +--------------- board/exmeritus/hww1u1a/hww1u1a.c | 3 +- board/freescale/bsc9131rdb/spl_minimal.c | 3 +- board/freescale/bsc9132qds/bsc9132qds.c | 14 ++-- board/freescale/bsc9132qds/spl_minimal.c | 3 +- board/freescale/mpc8536ds/mpc8536ds.c | 2 +- board/freescale/mpc8540ads/mpc8540ads.c | 3 +- board/freescale/mpc8569mds/mpc8569mds.c | 3 +- board/freescale/mpc8572ds/mpc8572ds.c | 2 +- board/freescale/mpc8610hpcd/mpc8610hpcd.c | 2 +- board/freescale/mpc8641hpcn/mpc8641hpcn.c | 2 +- board/freescale/p1010rdb/spl_minimal.c | 3 +- board/freescale/p1023rds/p1023rds.c | 3 +- board/freescale/p2020ds/p2020ds.c | 3 +- board/sbc8548/ddr.c | 3 +- board/sbc8641d/sbc8641d.c | 6 +- board/socrates/sdram.c | 3 +- drivers/ddr/fsl/ctrl_regs.c | 2 +- drivers/ddr/fsl/mpc85xx_ddr_gen1.c | 6 +- drivers/ddr/fsl/mpc85xx_ddr_gen2.c | 3 +- drivers/ddr/fsl/mpc85xx_ddr_gen3.c | 2 +- drivers/ddr/fsl/mpc86xx_ddr.c | 4 +- drivers/ddr/fsl/util.c | 3 +- include/fsl_immap.h | 112 +++++++++++++++++++++++++ nand_spl/board/freescale/p1023rds/nand_boot.c | 3 +- 29 files changed, 173 insertions(+), 308 deletions(-) create mode 100644 include/fsl_immap.h
arch/powerpc/cpu/mpc83xx/ecc.c +2 -2
@@ -16,7 +16,7 @@ void ecc_print_status(void) {immap_t *immap = (immap_t *)CONFIG_SYS_IMMR ;#ifdef CONFIG_FSL_DDR2 -ccsr_ddr_t *ddr = &immap->ddr; +struct ccsr_ddr __iomem *ddr = &immap->ddr;#else ddr83xx_t *ddr = &immap->ddr;#endif
@@ -100,7 +100,7 @@ int do_ecc(cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[]) {immap_t *immap = (immap_t *)CONFIG_SYS_IMMR ;#ifdef CONFIG_FSL_DDR2 -ccsr_ddr_t *ddr = &immap->ddr; +struct ccsr_ddr __iomem *ddr = &immap->ddr;#else ddr83xx_t *ddr = &immap->ddr;#endif
arch/powerpc/cpu/mpc85xx/cpu.c +2 -2
@@ -416,7 +416,7 @@ static void dump_spd_ddr_reg(void)int i, j, k, m;u8 *p_8;u32 *p_32; -ccsr_ddr_t *ddr[CONFIG_NUM_DDR_CONTROLLERS ]; +struct ccsr_ddr __iomem *ddr[CONFIG_NUM_DDR_CONTROLLERS ];generic_spd_eeprom_t spd[CONFIG_NUM_DDR_CONTROLLERS ][CONFIG_DIMM_SLOTS_PER_CTLR ];
@@ -482,7 +482,7 @@ static void dump_spd_ddr_reg(void)for (i =0 ; i <CONFIG_NUM_DDR_CONTROLLERS ; i++)printf (" Base + 0x%04x" , (u32 )ddr[i] &0xFFFF );puts ("\n" ); -for (k =0 ; k <sizeof (ccsr_ddr_t)/4 ; k++) { +for (k =0 ; k <sizeof (struct ccsr_ddr )/4 ; k++) { m =0 ;printf ("%6d (0x%04x)" , k *4 , k *4 );for (i =0 ; i <CONFIG_NUM_DDR_CONTROLLERS ; i++) {
arch/powerpc/include/asm/immap_83xx.h +5 -101
125 lines not on this page · raw message
arch/powerpc/include/asm/immap_85xx.h +1 -99
112 lines not on this page · raw message
arch/powerpc/include/asm/immap_86xx.h +3 -71
95 lines not on this page · raw message
board/exmeritus/hww1u1a/hww1u1a.c +2 -1
@@ -37,6 +37,7 @@ int checkboard(void)unsigned int gpio_low =0 ;unsigned int gpio_in =0 ;unsigned int i; +struct ccsr_ddr __iomem *ddr;puts ("Board: HWW-1U-1A " );
@@ -89,7 +90,7 @@ int checkboard(void)* and delay a while before we continue. */ if (mpc85xx_gpio_get (GPIO_RESETS )) { -ccsr_ddr_t *ddr = (ccsr_ddr_t *)CONFIG_SYS_FSL_DDR_ADDR ; + ddr = (struct ccsr_ddr __iomem *)CONFIG_SYS_FSL_DDR_ADDR ;puts ("Debugger detected... extra device reset enabled!\n" );
board/freescale/bsc9131rdb/spl_minimal.c +2 -1
@@ -20,7 +20,8 @@ DECLARE_GLOBAL_DATA_PTR;*/ static void sdram_init (void ) { -ccsr_ddr_t *ddr = (ccsr_ddr_t *)CONFIG_SYS_FSL_DDR_ADDR ; +struct ccsr_ddr __iomem *ddr = + (struct ccsr_ddr __iomem *)CONFIG_SYS_FSL_DDR_ADDR ;__raw_writel (CONFIG_SYS_DDR_CS0_BNDS , &ddr->cs0_bnds);__raw_writel (CONFIG_SYS_DDR_CS0_CONFIG , &ddr->cs0_config);
board/freescale/bsc9132qds/bsc9132qds.c +7 -7
@@ -133,16 +133,16 @@ void dsp_ddr_configure(void)*copy the ddr controller settings from PowerPC side DDR controller *to the DSP DDR controller as connected DDR memories are similar. */ -ccsr_ddr_t __iomem *pa_ddr = - (ccsr_ddr_t __iomem *)CONFIG_SYS_FSL_DDR_ADDR ; -ccsr_ddr_t temp_ddr; -ccsr_ddr_t __iomem *dsp_ddr = - (ccsr_ddr_t __iomem *)CONFIG_SYS_FSL_DSP_CCSR_DDR_ADDR ; +struct ccsr_ddr __iomem *pa_ddr = + (struct ccsr_ddr __iomem *)CONFIG_SYS_FSL_DDR_ADDR ; +struct ccsr_ddr temp_ddr; +struct ccsr_ddr __iomem *dsp_ddr = + (struct ccsr_ddr __iomem *)CONFIG_SYS_FSL_DSP_CCSR_DDR_ADDR ; -memcpy (&temp_ddr, pa_ddr,sizeof (ccsr_ddr_t)); +memcpy (&temp_ddr, pa_ddr,sizeof (struct ccsr_ddr )); temp_ddr.cs0_bnds =CONFIG_SYS_DDR1_CS0_BNDS ; temp_ddr.sdram_cfg &= ~SDRAM_CFG_MEM_EN ; -memcpy (dsp_ddr, &temp_ddr,sizeof (ccsr_ddr_t)); +memcpy (dsp_ddr, &temp_ddr,sizeof (struct ccsr_ddr )); dsp_ddr->sdram_cfg |=SDRAM_CFG_MEM_EN ; }
board/freescale/bsc9132qds/spl_minimal.c +2 -1
@@ -17,7 +17,8 @@ DECLARE_GLOBAL_DATA_PTR;static void sdram_init (void ) { -ccsr_ddr_t *ddr = (ccsr_ddr_t *)CONFIG_SYS_FSL_DDR_ADDR ; +struct ccsr_ddr __iomem *ddr = + (struct ccsr_ddr __iomem *)CONFIG_SYS_FSL_DDR_ADDR ;#if CONFIG_DDR_CLK_FREQ ==100000000 __raw_writel (CONFIG_SYS_DDR_CS0_BNDS , &ddr->cs0_bnds);__raw_writel (CONFIG_SYS_DDR_CS0_CONFIG , &ddr->cs0_config);
board/freescale/mpc8536ds/mpc8536ds.c +1 -1
@@ -90,7 +90,7 @@ int checkboard (void)phys_size_t fixed_sdram (void ) {volatile immap_t *immap = (immap_t *)CONFIG_SYS_IMMR ; -volatile ccsr_ddr_t *ddr= &immap->im_ddr; +struct ccsr_ddr __iomem *ddr = &immap->im_ddr;uint d_init; ddr->cs0_bnds =CONFIG_SYS_DDR_CS0_BNDS ;
board/freescale/mpc8540ads/mpc8540ads.c +2 -1
@@ -168,7 +168,8 @@ void lbc_sdram_init(void)phys_size_t fixed_sdram (void ) {#ifndef CONFIG_SYS_RAMBOOT -volatile ccsr_ddr_t *ddr = (void *)(CONFIG_SYS_FSL_DDR_ADDR ); +struct ccsr_ddr __iomem *ddr = + (struct ccsr_ddr __iomem *)(CONFIG_SYS_FSL_DDR_ADDR ); ddr->cs0_bnds =CONFIG_SYS_DDR_CS0_BNDS ; ddr->cs0_config =CONFIG_SYS_DDR_CS0_CONFIG ;
board/freescale/mpc8569mds/mpc8569mds.c +2 -1
@@ -231,7 +231,8 @@ int checkboard (void)#if !defined(CONFIG_SPD_EEPROM )phys_size_t fixed_sdram (void ) { -volatile ccsr_ddr_t *ddr = (ccsr_ddr_t *)CONFIG_SYS_FSL_DDR_ADDR ; +struct ccsr_ddr __iomem *ddr = + (struct ccsr_ddr __iomem *)CONFIG_SYS_FSL_DDR_ADDR ;uint d_init;out_be32 (&ddr->cs0_bnds,CONFIG_SYS_DDR_CS0_BNDS );
board/freescale/mpc8572ds/mpc8572ds.c +1 -1
@@ -62,7 +62,7 @@ int checkboard (void)phys_size_t fixed_sdram (void ) {volatile immap_t *immap = (immap_t *)CONFIG_SYS_IMMR ; -volatile ccsr_ddr_t *ddr= &immap->im_ddr; +struct ccsr_ddr __iomem *ddr = &immap->im_ddr;uint d_init; ddr->cs0_bnds =CONFIG_SYS_DDR_CS0_BNDS ;
board/freescale/mpc8610hpcd/mpc8610hpcd.c +1 -1
@@ -143,7 +143,7 @@ phys_size_t fixed_sdram(void) {#if !defined(CONFIG_SYS_RAMBOOT )volatile immap_t *immap = (immap_t *)CONFIG_SYS_IMMR ; -volatile ccsr_ddr_t *ddr = &immap->im_ddr1; +struct ccsr_ddr __iomem *ddr = &immap->im_ddr1;uint d_init; ddr->cs0_bnds =0x0000001f ;
board/freescale/mpc8641hpcn/mpc8641hpcn.c +1 -1
@@ -64,7 +64,7 @@ fixed_sdram(void) {#if !defined(CONFIG_SYS_RAMBOOT )volatile immap_t *immap = (immap_t *)CONFIG_SYS_IMMR ; -volatile ccsr_ddr_t *ddr = &immap->im_ddr1; +struct ccsr_ddr __iomem *ddr = &immap->im_ddr1; ddr->cs0_bnds =CONFIG_SYS_DDR_CS0_BNDS ; ddr->cs0_config =CONFIG_SYS_DDR_CS0_CONFIG ;
board/freescale/p1010rdb/spl_minimal.c +2 -1
@@ -19,7 +19,8 @@ DECLARE_GLOBAL_DATA_PTR;void sdram_init (void ) { -ccsr_ddr_t *ddr = (ccsr_ddr_t *)CONFIG_SYS_FSL_DDR_ADDR ; +struct ccsr_ddr __iomem *ddr = + (struct ccsr_ddr __iomem *)CONFIG_SYS_FSL_DDR_ADDR ;ccsr_gur_t *gur = (void *)CONFIG_SYS_MPC85xx_GUTS_ADDR;u32 ddr_ratio;unsigned long ddr_freq_mhz;
board/freescale/p1023rds/p1023rds.c +2 -1
@@ -58,7 +58,8 @@ int checkboard(void)phys_size_t fixed_sdram (void ) {#ifndef CONFIG_SYS_RAMBOOT -ccsr_ddr_t *ddr = (ccsr_ddr_t *)CONFIG_SYS_FSL_DDR_ADDR ; +struct ccsr_ddr __iomem *ddr = + (struct ccsr_ddr __iomem *)CONFIG_SYS_FSL_DDR_ADDR ;set_next_law (0 ,LAW_SIZE_2G ,LAW_TRGT_IF_DDR_1 );
board/freescale/p2020ds/p2020ds.c +2 -1
@@ -68,7 +68,8 @@ int checkboard(void)phys_size_t fixed_sdram (void ) { -volatile ccsr_ddr_t *ddr = (ccsr_ddr_t *)CONFIG_SYS_FSL_DDR_ADDR ; +struct ccsr_ddr __iomem *ddr = + (struct ccsr_ddr __iomem *)CONFIG_SYS_FSL_DDR_ADDR ;uint d_init; ddr->cs0_config =CONFIG_SYS_DDR_CS0_CONFIG ;
board/sbc8548/ddr.c +2 -1
@@ -91,7 +91,8 @@ void get_spd(generic_spd_eeprom_t *spd, u8 i2c_address)*/ phys_size_t fixed_sdram (void ) { -volatile ccsr_ddr_t *ddr = (void *)(CONFIG_SYS_FSL_DDR_ADDR ); +struct ccsr_ddr __iomem *ddr = + (struct ccsr_ddr __iomem *)(CONFIG_SYS_FSL_DDR_ADDR );out_be32 (&ddr->cs0_bnds,0x0000007f );out_be32 (&ddr->cs1_bnds,0x008000ff );
board/sbc8641d/sbc8641d.c +3 -3
@@ -93,7 +93,7 @@ long int fixed_sdram (void) {#if !defined(CONFIG_SYS_RAMBOOT )volatile immap_t *immap = (immap_t *)CONFIG_SYS_IMMR ; -volatile ccsr_ddr_t *ddr = &immap->im_ddr1; +volatile struct ccsr_ddr *ddr = &immap->im_ddr1; ddr->cs0_bnds =CONFIG_SYS_DDR_CS0_BNDS ; ddr->cs1_bnds =CONFIG_SYS_DDR_CS1_BNDS ;
@@ -111,7 +111,7 @@ long int fixed_sdram (void) ddr->sdram_cfg_2 =CONFIG_SYS_DDR_CFG_2 ; ddr->sdram_mode =CONFIG_SYS_DDR_MODE_1 ; ddr->sdram_mode_2 =CONFIG_SYS_DDR_MODE_2 ; - ddr->sdram_mode_cntl =CONFIG_SYS_DDR_MODE_CTL ; + ddr->sdram_md_cntl =CONFIG_SYS_DDR_MODE_CTL ; ddr->sdram_interval =CONFIG_SYS_DDR_INTERVAL ; ddr->sdram_data_init =CONFIG_SYS_DDR_DATA_INIT ; ddr->sdram_clk_cntl =CONFIG_SYS_DDR_CLK_CTRL ;
@@ -142,7 +142,7 @@ long int fixed_sdram (void) ddr->sdram_cfg_2 =CONFIG_SYS_DDR2_CFG_2 ; ddr->sdram_mode =CONFIG_SYS_DDR2_MODE_1 ; ddr->sdram_mode_2 =CONFIG_SYS_DDR2_MODE_2 ; - ddr->sdram_mode_cntl =CONFIG_SYS_DDR2_MODE_CTL ; + ddr->sdram_md_cntl =CONFIG_SYS_DDR2_MODE_CTL ; ddr->sdram_interval =CONFIG_SYS_DDR2_INTERVAL ; ddr->sdram_data_init =CONFIG_SYS_DDR2_DATA_INIT ; ddr->sdram_clk_cntl =CONFIG_SYS_DDR2_CLK_CTRL ;
board/socrates/sdram.c +2 -1
@@ -24,7 +24,8 @@*/ phys_size_t fixed_sdram (void ) { -volatile ccsr_ddr_t *ddr = (void *)(CONFIG_SYS_FSL_DDR_ADDR ); +struct ccsr_ddr __iomem *ddr = + (struct ccsr_ddr __iomem *)(CONFIG_SYS_FSL_DDR_ADDR );/* * Disable memory controller.
drivers/ddr/fsl/ctrl_regs.c +1 -1
@@ -21,7 +21,7 @@static u32 fsl_ddr_get_version (void ) { -ccsr_ddr_t *ddr; +struct ccsr_ddr __iomem *ddr;u32 ver_major_minor_errata; ddr = (void *)_DDR_ADDR;
drivers/ddr/fsl/mpc85xx_ddr_gen1.c +4 -2
@@ -18,7 +18,8 @@ void fsl_ddr_set_memctl_regs(const fsl_ddr_cfg_regs_t *regs, unsigned int ctrl_num, int step) {unsigned int i; -volatile ccsr_ddr_t *ddr = (void *)CONFIG_SYS_FSL_DDR_ADDR ; +struct ccsr_ddr __iomem *ddr = + (struct ccsr_ddr __iomem *)CONFIG_SYS_FSL_DDR_ADDR ;if (ctrl_num !=0 ) {printf ("%s unexpected ctrl_num = %u\n" , __FUNCTION__, ctrl_num);
@@ -73,7 +74,8 @@ void fsl_ddr_set_memctl_regs(const fsl_ddr_cfg_regs_t *regs,void ddr_enable_ecc (unsigned int dram_size) { -volatile ccsr_ddr_t *ddr = (void *)(CONFIG_SYS_FSL_DDR_ADDR ); +struct ccsr_ddr __iomem *ddr = + (struct ccsr_ddr __iomem *)(CONFIG_SYS_FSL_DDR_ADDR );dma_meminit (CONFIG_MEM_INIT_VALUE , dram_size);
drivers/ddr/fsl/mpc85xx_ddr_gen2.c +2 -1
@@ -19,7 +19,8 @@ void fsl_ddr_set_memctl_regs(const fsl_ddr_cfg_regs_t *regs, unsigned int ctrl_num, int step) {unsigned int i; -ccsr_ddr_t *ddr = (void *)CONFIG_SYS_FSL_DDR_ADDR ; +struct ccsr_ddr __iomem *ddr = + (struct ccsr_ddr __iomem *)CONFIG_SYS_FSL_DDR_ADDR ;#if defined(CONFIG_SYS_FSL_ERRATUM_NMG_DDR120 ) && defined(CONFIG_MPC85xx)ccsr_gur_t *gur = (void *)(CONFIG_SYS_MPC85xx_GUTS_ADDR);
drivers/ddr/fsl/mpc85xx_ddr_gen3.c +1 -1
@@ -29,7 +29,7 @@ void fsl_ddr_set_memctl_regs(const fsl_ddr_cfg_regs_t *regs, unsigned int ctrl_num, int step) {unsigned int i, bus_width; -volatile ccsr_ddr_t *ddr; +struct ccsr_ddr __iomem *ddr;u32 temp_sdram_cfg;u32 total_gb_size_per_controller;int timeout;
drivers/ddr/fsl/mpc86xx_ddr.c +2 -2
@@ -18,7 +18,7 @@ void fsl_ddr_set_memctl_regs(const fsl_ddr_cfg_regs_t *regs, unsigned int ctrl_num, int step) {unsigned int i; -volatile ccsr_ddr_t *ddr; +struct ccsr_ddr __iomem *ddr;switch (ctrl_num) {case 0 :
@@ -58,7 +58,7 @@ void fsl_ddr_set_memctl_regs(const fsl_ddr_cfg_regs_t *regs,out_be32 (&ddr->sdram_cfg_2, regs->ddr_sdram_cfg_2);out_be32 (&ddr->sdram_mode, regs->ddr_sdram_mode);out_be32 (&ddr->sdram_mode_2, regs->ddr_sdram_mode_2); -out_be32 (&ddr->sdram_mode_cntl, regs->ddr_sdram_md_cntl); +out_be32 (&ddr->sdram_md_cntl, regs->ddr_sdram_md_cntl);out_be32 (&ddr->sdram_interval, regs->ddr_sdram_interval);out_be32 (&ddr->sdram_data_init, regs->ddr_data_init);out_be32 (&ddr->sdram_clk_cntl, regs->ddr_sdram_clk_cntl);
drivers/ddr/fsl/util.c +2 -1
@@ -135,7 +135,8 @@ u32 fsl_ddr_get_intl3r(void)void board_add_ram_info (int use_default) { -ccsr_ddr_t *ddr = (void *)(CONFIG_SYS_FSL_DDR_ADDR ); +struct ccsr_ddr __iomem *ddr = + (struct ccsr_ddr __iomem *)(CONFIG_SYS_FSL_DDR_ADDR );#if defined(CONFIG_E6500 ) && (CONFIG_NUM_DDR_CONTROLLERS ==3 )u32 *mcintl3r = (void *) (CONFIG_SYS_IMMR +0x18004 );
include/fsl_immap.h new file +112 -0
112 lines not on this page · raw message
nand_spl/board/freescale/p1023rds/nand_boot.c +2 -1
@@ -18,7 +18,8 @@ DECLARE_GLOBAL_DATA_PTR;/* Fixed sdram init -- doesn't use serial presence detect. */ void sdram_init (void ) { -ccsr_ddr_t *ddr = (ccsr_ddr_t *)CONFIG_SYS_FSL_DDR_ADDR ; +struct ccsr_ddr __iomem *ddr = + (struct ccsr_ddr __iomem *)CONFIG_SYS_FSL_DDR_ADDR ;set_next_law (0 ,LAW_SIZE_2G ,LAW_TRGT_IF_DDR_1 );
Signature · 1 line
1.7.9.5
PATCH 3/6 Driver/DDR: Add Freescale DDR driver for ARM
In reply to York SunMake PowerPC specific code conditional so ARM SoCs can reuse this driver. Add DDR3 driver for ARM.
--- drivers/ddr/fsl/Makefile | 1 + drivers/ddr/fsl/arm_ddr_gen3.c | 213 ++++++++++++++++++++++++++++++++++++++++ drivers/ddr/fsl/main.c | 12 ++- drivers/ddr/fsl/util.c | 4 + 4 files changed, 227 insertions(+), 3 deletions(-) create mode 100644 drivers/ddr/fsl/arm_ddr_gen3.c
drivers/ddr/fsl/Makefile +1 -0
@@ -34,6 +34,7 @@ COBJS-$(CONFIG_SYS_FSL_DDR_PPC_GEN1) += mpc85xx_ddr_gen1.o COBJS-$(CONFIG_SYS_FSL_DDR_PPC_GEN2) += mpc85xx_ddr_gen2.o COBJS-$(CONFIG_SYS_FSL_DDR_PPC_GEN3) += mpc85xx_ddr_gen3.o COBJS-$(CONFIG_SYS_FSL_DDR_86XX) += mpc86xx_ddr.o +COBJS-$(CONFIG_SYS_FSL_DDR_ARM_GEN3) += arm_ddr_gen3.o COBJS-$(CONFIG_FSL_DDR_INTERACTIVE) += interactive.o SRCS := $(START:.o=.S) $(SOBJS-y:.o=.S) $(COBJS-y:.o=.c)
drivers/ddr/fsl/arm_ddr_gen3.c new file +213 -0
213 lines not on this page · raw message
drivers/ddr/fsl/main.c +9 -3
@@ -15,16 +15,18 @@#include <common.h> #include <i2c.h> #include <fsl_ddr_sdram.h> -#include <asm/fsl_law.h> -#include <fsl_ddr.h> +#ifdef CONFIG_PPC +#include <asm/fsl_law.h> +void fsl_ddr_set_lawbar (const common_timing_params_t *memctl_common_params,unsigned int memctl_interleaved,unsigned int ctrl_num); -void fsl_ddr_set_intl3r (const unsigned int granule_size); +#endif +void fsl_ddr_set_intl3r (const unsigned int granule_size);#if defined(SPD_EEPROM_ADDRESS ) || \ defined(SPD_EEPROM_ADDRESS1 ) || defined(SPD_EEPROM_ADDRESS2 ) || \ defined(SPD_EEPROM_ADDRESS3 ) || defined(SPD_EEPROM_ADDRESS4 )
@@ -549,7 +551,9 @@ fsl_ddr_compute(fsl_ddr_info_t *pinfo, unsigned int start_step,phys_size_t fsl_ddr_sdram (void ) {unsigned int i; +#ifdef CONFIG_PPC unsigned int law_memctl =LAW_TRGT_IF_DDR_1 ; +#endif unsigned long long total_memory;fsl_ddr_info_t info;int deassert_reset;
@@ -621,6 +625,7 @@ phys_size_t fsl_ddr_sdram(void) } } +#ifdef CONFIG_PPC /* program LAWs */ for (i =0 ; i <CONFIG_NUM_DDR_CONTROLLERS ; i++) {if (info.memctl_opts[i].memctl_interleaving) {
@@ -681,6 +686,7 @@ phys_size_t fsl_ddr_sdram(void) law_memctl, i); } } +#endif debug ("total_memory by %s = %llu\n" , __func__, total_memory);
drivers/ddr/fsl/util.c +4 -0
@@ -7,7 +7,9 @@*/ #include <common.h> +#ifdef CONFIG_PPC #include <asm/fsl_law.h> +#endif #include <div64.h> #include <fsl_ddr.h>
@@ -79,6 +81,7 @@ unsigned int mclk_to_picos(unsigned int mclk)return get_memory_clk_period_ps () * mclk; } +#ifdef CONFIG_PPC void __fsl_ddr_set_lawbar(const common_timing_params_t *memctl_common_params, unsigned int law_memctl,
@@ -113,6 +116,7 @@ __attribute__((weak, alias("__fsl_ddr_set_lawbar"))) void fsl_ddr_set_lawbar(const common_timing_params_t *memctl_common_params, unsigned int memctl_interleaved, unsigned int ctrl_num); +#endif void fsl_ddr_set_intl3r (const unsigned int granule_size) {
Signature · 1 line
1.7.9.5
PATCH 3/6 Driver/DDR: Add Freescale DDR driver for ARM
Quoted 17 lines · York Sun
Make PowerPC specific code conditional so ARM SoCs can reuse this driver. Add DDR3 driver for ARM.
Signed-off-by York Sun <[email protected]>--- drivers/ddr/fsl/Makefile | 1 + drivers/ddr/fsl/arm_ddr_gen3.c | 213 ++++++++++++++++++++++++++++++++++++++++ drivers/ddr/fsl/main.c | 12 ++- drivers/ddr/fsl/util.c | 4 + 4 files changed, 227 insertions(+), 3 deletions(-) create mode 100644 drivers/ddr/fsl/arm_ddr_gen3.cdrivers/ddr/fsl/Makefile +0
-0
drivers/ddr/fsl/Makefile COBJS-$(CONFIG_SYS_FSL_DDR_PPC_GEN1) += mpc85xx_ddr_gen1.o · line 38
Quoted 5 lines
drivers/ddr/fsl/Makefile +1
-0@@ -34,6 +34,7 @@ COBJS-$(CONFIG_SYS_FSL_DDR_PPC_GEN1) += mpc85xx_ddr_gen1.o COBJS-$(CONFIG_SYS_FSL_DDR_PPC_GEN2) += mpc85xx_ddr_gen2.o COBJS-$(CONFIG_SYS_FSL_DDR_PPC_GEN3) += mpc85xx_ddr_gen3.o COBJS-$(CONFIG_SYS_FSL_DDR_86XX) += mpc86xx_ddr.o +COBJS-$(CONFIG_SYS_FSL_DDR_ARM_GEN3) += arm_ddr_gen3.o COBJS-$(CONFIG_FSL_DDR_INTERACTIVE) += interactive.o
I'm confused -- is this hardware the same across CPU families or not?
-Scott
PATCH 3/6 Driver/DDR: Add Freescale DDR driver for ARM
Quoted 13 lines · Scott Wood
Quoted 12 lines · York Sun
Make PowerPC specific code conditional so ARM SoCs can reuse this driver. Add DDR3 driver for ARM.
Signed-off-by York Sun <[email protected]>---
drivers/ddr/fsl/Makefile | 1 + drivers/ddr/fsl/arm_ddr_gen3.c | 213 ++++++++++++++++++++++++++++++++++++++++ drivers/ddr/fsl/main.c | 12 ++- drivers/ddr/fsl/util.c | 4 + 4 files changed, 227 insertions(+), 3 deletions(-)create mode 100644
drivers/ddr/fsl/arm_ddr_gen3.c
Quoted 12 lines
Quoted 10 lines
drivers/ddr/fsl/Makefile +0
-0@@ -34,6 +34,7 @@ COBJS-$(CONFIG_SYS_FSL_DDR_PPC_GEN1) += mpc85xx_ddr_gen1.oCOBJS-$(CONFIG_SYS_FSL_DDR_PPC_GEN2) += mpc85xx_ddr_gen2.o
COBJS-$(CONFIG_SYS_FSL_DDR_PPC_GEN3) += mpc85xx_ddr_gen3.o
COBJS-$(CONFIG_SYS_FSL_DDR_86XX) += mpc86xx_ddr.o
+COBJS-$(CONFIG_SYS_FSL_DDR_ARM_GEN3) += arm_ddr_gen3.o
COBJS-$(CONFIG_FSL_DDR_INTERACTIVE) += interactive.oI'm confused -- is this hardware the same across CPU families or not?
The algorithm is the same for all DDR controllers. The final part of writing to registers is slightly different. For example, 85xx SoCs have LAWs, ARM parts don't. 85xx driver needs to deal with both DDR2 and DDR3, while ARM driver doesn't. I also don't want to carry some messy workarounds from 85xx to ARM driver. It's much cleaner to keep them separated. The final part is very small in size.
York
PATCH 4/6 powerpc/mpc8xxx: Extend DDR registers' fields
In reply to York SunSome DDR registers' fields have expanded to accommodate larger values. These changes are backward compatible. Some fields are removed for newer DDR controllers. Writing to those fields are safely ignored.
TIMING_CFG_2 register is fixed. Additive latency is added to RD_TO_PRE automatically. It was a misunderstanding in commit c360ceac.
--- drivers/ddr/fsl/ctrl_regs.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-)
drivers/ddr/fsl/ctrl_regs.c +12 -8
@@ -325,10 +325,10 @@ static void set_timing_cfg_0(fsl_ddr_cfg_regs_t *ddr, | ((twrt_mclk & 0x3) << 28) /* WRT */ | ((trrt_mclk &0x3 ) <<26 )/* RRT */ | ((twwt_mclk &0x3 ) <<24 )/* WWT */ - | ((act_pd_exit_mclk &0x7 ) <<20 )/* ACT_PD_EXIT */ + | ((act_pd_exit_mclk &0xf ) <<20 )/* ACT_PD_EXIT */ | ((pre_pd_exit_mclk &0xF ) <<16 )/* PRE_PD_EXIT */ | ((taxpd_mclk &0xf ) <<8 )/* ODT_PD_EXIT */ - | ((tmrd_mclk &0xf ) <<0 )/* MRS_CYC */ + | ((tmrd_mclk &0x1f ) <<0 )/* MRS_CYC */ );debug ("FSLDDR: timing_cfg_0 = 0x%08x\n" , ddr->timing_cfg_0); }
@@ -338,7 +338,8 @@ static void set_timing_cfg_0(fsl_ddr_cfg_regs_t *ddr,static void set_timing_cfg_3 (fsl_ddr_cfg_regs_t *ddr,const memctl_options_t *popts,const common_timing_params_t *common_dimm, -unsigned int cas_latency) +unsigned int cas_latency, +unsigned int additive_latency) {/* Extended precharge to activate interval (tRP) */ unsigned int ext_pretoact =0 ;
@@ -350,6 +351,8 @@ static void set_timing_cfg_3(fsl_ddr_cfg_regs_t *ddr,unsigned int ext_refrec;/* Extended MCAS latency from READ cmd */ unsigned int ext_caslat =0 ; +/* Extended additive latency */ +unsigned int ext_add_lat =0 ;/* Extended last data to precharge interval (tWR) */ unsigned int ext_wrrec =0 ;/* Control Adjust */
@@ -359,6 +362,7 @@ static void set_timing_cfg_3(fsl_ddr_cfg_regs_t *ddr, ext_acttopre =picos_to_mclk (common_dimm->tras_ps) >>4 ; ext_acttorw =picos_to_mclk (common_dimm->trcd_ps) >>4 ; ext_caslat = (2 * cas_latency -1 ) >>4 ; + ext_add_lat = additive_latency >>4 ; ext_refrec = (picos_to_mclk (common_dimm->trfc_ps) -8 ) >>4 ;/* ext_wrrec only deals with 16 clock and above, or 14 with OTF */ ext_wrrec = (picos_to_mclk(common_dimm->twr_ps) +
@@ -370,6 +374,7 @@ static void set_timing_cfg_3(fsl_ddr_cfg_regs_t *ddr, | ((ext_acttorw & 0x1) << 22) | ((ext_refrec &0x1F ) <<16 ) | ((ext_caslat &0x3 ) <<12 ) + | ((ext_add_lat &0x1 ) <<10 ) | ((ext_wrrec &0x1 ) <<8 ) | ((cntl_adj &0x7 ) <<0 ) );
@@ -531,8 +536,6 @@ static void set_timing_cfg_2(fsl_ddr_cfg_regs_t *ddr,if (rd_to_pre <4 ) rd_to_pre =4 ;#endif -if (additive_latency) - rd_to_pre += additive_latency;if (popts->otf_burst_chop_en) rd_to_pre +=2 ;/* according to UM */
@@ -1592,8 +1595,8 @@ compute_fsl_memctl_config_regs(const memctl_options_t *popts,if (cs_en) { ddr->cs[i].bnds = (0 - | ((sa &0xFFF ) <<16 )/* starting address MSB */ - | ((ea &0xFFF ) <<0 )/* ending address MSB */ + | ((sa &0xffff ) <<16 )/* starting address */ + | ((ea &0xffff ) <<0 )/* ending address */ ); }else {/* setting bnds to 0xffffffff for inactive CS */
@@ -1618,7 +1621,8 @@ compute_fsl_memctl_config_regs(const memctl_options_t *popts,set_timing_cfg_0 (ddr, popts, dimm_params);#endif -set_timing_cfg_3 (ddr, popts, common_dimm, cas_latency); +set_timing_cfg_3 (ddr, popts, common_dimm, cas_latency, + additive_latency);set_timing_cfg_1 (ddr, popts, common_dimm, cas_latency);set_timing_cfg_2 (ddr, popts, common_dimm, cas_latency, additive_latency);
Signature · 1 line
1.7.9.5
PATCH 5/6 Driver/DDR: Update DDR driver to allow non-zero base address
In reply to York SunThe DRAM base has been zero for Power SoCs. It could be non-zero for ARM SoCs. Use a macro instead of hard-coding to zero.
--- drivers/ddr/fsl/main.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/ddr/fsl/main.c +3 -3
@@ -255,7 +255,7 @@ static unsigned long long __step_assign_addresses(fsl_ddr_info_t *pinfo,debug ("dbw_cap_adj[%d]=%d\n" , i, dbw_cap_adj[i]); } - current_mem_base =0ull ; + current_mem_base =CONFIG_SYS_DDR_SDRAM_BASE ; total_mem =0 ;if (pinfo->memctl_opts[0 ].memctl_interleaving) { rank_density = pinfo->dimm_params[0][0].rank_density >>
@@ -535,8 +535,8 @@ fsl_ddr_compute(fsl_ddr_info_t *pinfo, unsigned int start_step, } } - total_mem =1 + (((unsigned long long )max_end <<24ULL ) - |0xFFFFFFULL ); + total_mem =1 + (((unsigned long long )max_end <<24ULL ) | +0xFFFFFFULL ) -CONFIG_SYS_DDR_SDRAM_BASE ; }return total_mem;
Signature · 1 line
1.7.9.5
PATCH 6/6 Driver/IFC: Move Freescale IFC driver to a common driver
In reply to York SunFreescale IFC controller has been used for mpc8xxx. It will be used for ARM-based SoC as well. This patch moves the driver to driver/mtd and fix the header file includes.
---
arch/powerpc/cpu/mpc85xx/cpu.c | 2 +-
arch/powerpc/cpu/mpc85xx/spl_minimal.c | 2 +-
arch/powerpc/cpu/mpc8xxx/Makefile | 1 -
arch/powerpc/include/asm/immap_85xx.h | 2 +-
board/freescale/bsc9132qds/bsc9132qds.c | 2 +-
board/freescale/c29xpcie/c29xpcie.c | 2 +-
board/freescale/p1010rdb/p1010rdb.c | 2 +-
drivers/mtd/Makefile | 1 +
.../powerpc/cpu/mpc8xxx => drivers/mtd}/fsl_ifc.c | 2 +-
drivers/mtd/nand/fsl_ifc_nand.c | 2 +-
drivers/mtd/nand/fsl_ifc_spl.c | 2 +-
{arch/powerpc/include/asm => include}/fsl_ifc.h | 6 +++---
12 files changed, 13 insertions(+), 13 deletions(-)
rename {arch/powerpc/cpu/mpc8xxx => drivers/mtd}/fsl_ifc.c (99%)
rename {arch/powerpc/include/asm => include}/fsl_ifc.h (99%)arch/powerpc/cpu/mpc85xx/cpu.c +1 -1
@@ -17,7 +17,7 @@#include <asm/cache.h> #include <asm/io.h> #include <asm/mmu.h> -#include <asm/fsl_ifc.h> +#include <fsl_ifc.h> #include <asm/fsl_law.h> #include <asm/fsl_lbc.h> #include <post.h>
arch/powerpc/cpu/mpc85xx/spl_minimal.c +1 -1
@@ -7,7 +7,7 @@#include <common.h> #include <asm/processor.h> #include <asm/global_data.h> -#include <asm/fsl_ifc.h> +#include <fsl_ifc.h> #include <asm/io.h> DECLARE_GLOBAL_DATA_PTR ;
arch/powerpc/cpu/mpc8xxx/Makefile +0 -1
@@ -29,7 +29,6 @@ COBJS-y += cpu.o endif COBJS-$(CONFIG_OF_LIBFDT) += fdt.o -COBJS-$(CONFIG_FSL_IFC) += fsl_ifc.o COBJS-$(CONFIG_FSL_LBC) += fsl_lbc.o COBJS-$(CONFIG_SYS_SRIO) += srio.o COBJS-$(CONFIG_FSL_LAW) += law.o
arch/powerpc/include/asm/immap_85xx.h +1 -1
@@ -15,7 +15,7 @@#include <asm/types.h> #include <asm/fsl_dma.h> #include <asm/fsl_i2c.h> -#include <asm/fsl_ifc.h> +#include <fsl_ifc.h> #include <asm/fsl_lbc.h> #include <asm/fsl_fman.h> #include <fsl_immap.h>
board/freescale/bsc9132qds/bsc9132qds.c +1 -1
@@ -17,7 +17,7 @@#include <tsec.h> #include <mmc.h> #include <netdev.h> -#include <asm/fsl_ifc.h> +#include <fsl_ifc.h> #include <hwconfig.h> #include <i2c.h> #include <fsl_ddr_sdram.h>
board/freescale/c29xpcie/c29xpcie.c +1 -1
@@ -18,7 +18,7 @@#include <mmc.h> #include <netdev.h> #include <pci.h> -#include <asm/fsl_ifc.h> +#include <fsl_ifc.h> #include <asm/fsl_pci.h> #include "cpld.h"
board/freescale/p1010rdb/p1010rdb.c +1 -1
@@ -19,7 +19,7 @@#include <netdev.h> #include <pci.h> #include <asm/fsl_serdes.h> -#include <asm/fsl_ifc.h> +#include <fsl_ifc.h> #include <asm/fsl_pci.h> #include <hwconfig.h> #include <i2c.h>
drivers/mtd/Makefile +1 -0
@@ -22,6 +22,7 @@ COBJS-$(CONFIG_FTSMC020) += ftsmc020.o COBJS-$(CONFIG_FLASH_CFI_LEGACY) += jedec_flash.o COBJS-$(CONFIG_MW_EEPROM) += mw_eeprom.o COBJS-$(CONFIG_ST_SMI) += st_smi.o +COBJS-$(CONFIG_FSL_IFC) += fsl_ifc.o COBJS := $(COBJS-y) SRCS := $(COBJS:.o=.c)
drivers/mtd/fsl_ifc.c renamed from arch/powerpc/cpu/mpc8xxx/fsl_ifc.c +1 -1
@@ -6,7 +6,7 @@*/ #include <common.h> -#include <asm/fsl_ifc.h> +#include <fsl_ifc.h> void print_ifc_regs (void ) {
drivers/mtd/nand/fsl_ifc_nand.c +1 -1
@@ -17,7 +17,7 @@#include <asm/io.h> #include <asm/errno.h> -#include <asm/fsl_ifc.h> +#include <fsl_ifc.h> #define FSL_IFC_V1_1_0 0x01010000#define MAX_BANKS 4
drivers/mtd/nand/fsl_ifc_spl.c +1 -1
@@ -9,7 +9,7 @@#include <common.h> #include <asm/io.h> -#include <asm/fsl_ifc.h> +#include <fsl_ifc.h> #include <linux/mtd/nand.h> static inline int is_blank (uchar *addr,int page_size)
include/fsl_ifc.h renamed from arch/powerpc/include/asm/fsl_ifc.h +3 -3
@@ -5,8 +5,8 @@* SPDX-License-Identifier: GPL-2.0+ */ -#ifndef __ASM_PPC_FSL_IFC_H -#define __ASM_PPC_FSL_IFC_H +#ifndef __FSL_IFC_H +#define __FSL_IFC_H#ifdef CONFIG_FSL_IFC #include <config.h>
@@ -983,4 +983,4 @@ struct fsl_ifc {#endif /* CONFIG_FSL_IFC */ #endif /* __ASSEMBLY__ */ -#endif /* __ASM_PPC_FSL_IFC_H */ +#endif /* __FSL_IFC_H */
Signature · 1 line
1.7.9.5
PATCH 6/6 Driver/IFC: Move Freescale IFC driver to a common driver
Quoted 6 lines · York Sun
Freescale IFC controller has been used for mpc8xxx. It will be used for ARM-based SoC as well. This patch moves the driver to driver/mtd and fix the header file includes.
Signed-off-by York Sun <[email protected]>
Thanks York for this patch. This was pending from long time.
This patch moves fsl_ifc.c from powerpc to driver/mtd
I am not sure having 2 files for IFC controller in driver/mtd/ is correct. Although fsl_ifc.c is for IFC Controller(NOR, NAND machine) and fsl_ifc_nand.c is only for IFC - NAND machine.
I am asking this question as same changes will be applicable in Linux also.
Also,
We have to move changes of arch/powerpc/cpu/mpc85xx/speed.c to fsl_ifc.c . This will make a IFC driver generic.
As this patch has impact on all IFC platforms, has this been tested on few platforms?
Thanks,
Prabhakar
PATCH 6/6 Driver/IFC: Move Freescale IFC driver to a common driver
Quoted 15 lines · Prabhakar Kushwaha
Quoted 6 lines · York Sun
Freescale IFC controller has been used for mpc8xxx. It will be used for ARM-based SoC as well. This patch moves the driver to driver/mtd and fix the header file includes.
Signed-off-by York Sun <[email protected]>Thanks York for this patch. This was pending from long time.
This patch moves
fsl_ifc.cfrom powerpc to driver/mtd
I am not sure having 2 files for IFC controller in driver/mtd/ is correct. Althoughfsl_ifc.cis for IFCController(NOR, NAND machine)andfsl_ifc_nand.cis only for IFC - NAND machine.
I am asking this question as same changes will be applicable in Linux also.
Quoted 6 lines
Also,
We have to move changes ofarch/powerpc/cpu/mpc85xx/speed.ctofsl_ifc.c. This will make a IFC driver generic.As this patch has impact on all IFC platforms, has this been tested on few platforms?
I'm not sure that drivers/mtd is the right place for it as it doesn't expose an mtd interface.
-Scott
PATCH 6/6 Driver/IFC: Move Freescale IFC driver to a common driver
Quoted 16 lines · Scott Wood
Quoted 15 lines · Prabhakar Kushwaha
Quoted 6 lines · York Sun
Freescale IFC controller has been used for mpc8xxx. It will be used for ARM-based SoC as well. This patch moves the driver to driver/mtd and fix the header file includes.
Signed-off-by York Sun <[email protected]>Thanks York for this patch. This was pending from long time.
This patch moves
fsl_ifc.cfrom powerpc to driver/mtd
I am not sure having 2 files for IFC controller in driver/mtd/ is correct. Althoughfsl_ifc.cis for IFCController(NOR, NAND machine)andfsl_ifc_nand.cis only for IFC - NAND machine.
I am asking this question as same changes will be applicable in Linux also.
Quoted 10 lines
Quoted 6 lines
Also,
We have to move changes ofarch/powerpc/cpu/mpc85xx/speed.ctofsl_ifc.c. This will make a IFC driver generic.As this patch has impact on all IFC platforms, has this been tested on few platforms?
I'm not sure that
drivers/mtdis the right place for it as it doesn't expose an mtd interface.
Yes Scott, I am also agree with you. But we are not sure about the right place for it.
one suggestion, may we merge fsl_ifc in fsl_ifc_nand.c & fsl_ifc_spl.c?
Please advice
Regards,
Prabhakar
PATCH 6/6 Driver/IFC: Move Freescale IFC driver to a common driver
Quoted 23 lines · Prabhakar Kushwaha
Quoted 22 lines · Scott Wood
Quoted 21 lines · Prabhakar Kushwaha
Quoted 6 lines · York Sun
Freescale IFC controller has been used for mpc8xxx. It will be used for ARM-based SoC as well. This patch moves the driver to driver/mtd and fix the header file includes.
Signed-off-by York Sun <[email protected]>Thanks York for this patch. This was pending from long time.
This patch moves
fsl_ifc.cfrom powerpc to driver/mtd
I am not sure having 2 files for IFC controller in driver/mtd/ is correct. Althoughfsl_ifc.cis for IFCController(NOR, NAND machine)andfsl_ifc_nand.cis only for IFC - NAND machine.
I am asking this question as same changes will be applicable in Linux also.Also,
We have to move changes ofarch/powerpc/cpu/mpc85xx/speed.ctofsl_ifc.c. This will make a IFC driver generic.As this patch has impact on all IFC platforms, has this been tested on few platforms?
Quoted 7 lines
Quoted 4 lines
I'm not sure that
drivers/mtdis the right place for it as it doesn't expose an mtd interface.Yes Scott, I am also agree with you. But we are not sure about the right place for it.
This is similar to the question of where to put CPM/QE code. A place will need to be identified for glue code that doesn't fit cleanly into an existing subsystem. drivers/misc is probably the right place, though IIRC on the Linux side the drivers/misc maintainer was generally opposed to its existence and pushed back on new things being added to it.
Quoted 1 line
one suggestion, may we merge
fsl_ifcinfsl_ifc_nand.c&fsl_ifc_spl.c?
No.
-Scott
PATCH 6/6 Driver/IFC: Move Freescale IFC driver to a common driver
Quoted 28 lines · Scott Wood
Quoted 27 lines · Prabhakar Kushwaha
Quoted 26 lines · Scott Wood
Quoted 15 lines · Prabhakar Kushwaha
Quoted 6 lines · York Sun
Freescale IFC controller has been used for mpc8xxx. It will be used for ARM-based SoC as well. This patch moves the driver to driver/mtd and fix the header file includes.
Signed-off-by York Sun <[email protected]>Thanks York for this patch. This was pending from long time.
This patch moves
fsl_ifc.cfrom powerpc to driver/mtd
I am not sure having 2 files for IFC controller in driver/mtd/ is correct. Althoughfsl_ifc.cis for IFCController(NOR, NAND machine)andfsl_ifc_nand.cis only for IFC - NAND machine.
I am asking this question as same changes will be applicable in Linux also.Quoted 6 lines
Also,
We have to move changes ofarch/powerpc/cpu/mpc85xx/speed.ctofsl_ifc.c. This will make a IFC driver generic.As this patch has impact on all IFC platforms, has this been tested on few platforms?
I'm not sure that
drivers/mtdis the right place for it as it doesn't expose an mtd interface.
Quoted 7 lines
Quoted 2 lines
Yes Scott, I am also agree with you. But we are not sure about the right place for it.
This is similar to the question of where to put CPM/QE code. A place will need to be identified for glue code that doesn't fit cleanly into an existing subsystem.
drivers/miscis probably the right place, though IIRC on the Linux side thedrivers/miscmaintainer was generally opposed to its existence and pushed back on new things being added to it.
looks like putting fsl_ifc.c in driver/mtd is not good way of handle it. I should sent on RFC of putting this in driver/misc for Linux and see the response. May be I get a better solution there.
Regards,
Prabhakar