ARM: omap: Unify the definition of DRAM start address
Subsystems (3)
PATCH 1/1 ARM: omap: Unify the definition of DRAM start address
Instead of using "magic" numbers, lets use a single definition for the DRAM starting address.
Signed-off-by Alexander Shiyan <[email protected]>
--- arch/arm/boards/afi-gf/lowlevel.c | 4 ++-- arch/arm/boards/beagle/lowlevel.c | 4 ++-- arch/arm/boards/beaglebone/board.c | 4 +++- arch/arm/boards/beaglebone/lowlevel.c | 4 ++-- arch/arm/boards/myirtech-x335x/lowlevel.c | 2 +- arch/arm/boards/phytec-som-am335x/lowlevel.c | 2 +- arch/arm/boards/vscom-baltos/lowlevel.c | 2 +- arch/arm/boards/wago-pfc-am35xx/board.c | 3 ++- arch/arm/boards/wago-pfc-am35xx/lowlevel.c | 4 ++-- arch/arm/mach-omap/am33xx_generic.c | 2 +- arch/arm/mach-omap/am33xx_scrm.c | 3 ++- arch/arm/mach-omap/omap3_generic.c | 2 +- arch/arm/mach-omap/omap4_generic.c | 4 ++-- arch/arm/mach-omap/omap_devices.c | 3 ++- include/mach/omap/am33xx-silicon.h | 3 --- include/mach/omap/generic.h | 2 ++ include/mach/omap/omap3-silicon.h | 3 --- include/mach/omap/omap4-silicon.h | 4 ---- 18 files changed, 26 insertions(+), 29 deletions(-)
arch/arm/boards/afi-gf/lowlevel.c +2 -2
@@ -230,7 +230,7 @@ static noinline int gf_sram_init(void)omap_debug_ll_init ();putc_ll ('>' ); -barebox_arm_entry (0x80000000 ,SZ_256M , fdt); +barebox_arm_entry (OMAP_DRAM_ADDR_SPACE_START ,SZ_256M , fdt); }ENTRY_FUNCTION (start_am33xx_afi_gf_sram, bootinfo, r1, r2)
@@ -255,5 +255,5 @@ ENTRY_FUNCTION(start_am33xx_afi_gf_sdram, r0, r1, r2)putc_ll ('>' ); -barebox_arm_entry (0x80000000 ,SZ_256M , fdt); +barebox_arm_entry (OMAP_DRAM_ADDR_SPACE_START ,SZ_256M , fdt); }
arch/arm/boards/beagle/lowlevel.c +2 -2
@@ -166,7 +166,7 @@ static noinline int beagle_board_init_sdram(void) {handoff_add_arm_machine (MACH_TYPE_OMAP3_BEAGLE ); -barebox_arm_entry (0x80000000 ,SZ_128M ,NULL ); +barebox_arm_entry (OMAP_DRAM_ADDR_SPACE_START ,SZ_128M ,NULL ); }ENTRY_FUNCTION (start_omap3_beagleboard_sdram, bootinfo, r1, r2)
@@ -205,7 +205,7 @@ static noinline int beagle_board_init(void)handoff_add_arm_machine (MACH_TYPE_OMAP3_BEAGLE ); -barebox_arm_entry (0x80000000 ,SZ_128M ,NULL ); +barebox_arm_entry (OMAP_DRAM_ADDR_SPACE_START ,SZ_128M ,NULL ); }ENTRY_FUNCTION (start_omap3_beagleboard_sram, bootinfo, r1, r2)
arch/arm/boards/beaglebone/board.c +3 -1
@@ -19,6 +19,7 @@#include <asm/armlinux.h> #include <asm/mach-types.h> #include <mach/omap/am33xx-silicon.h> +#include <mach/omap/generic.h> #include <mach/omap/sys_info.h> #include <mach/omap/syslib.h> #include <mach/omap/gpmc.h>
@@ -49,7 +50,8 @@ static int beaglebone_mem_init(void)else sdram_size =SZ_256M ; -arm_add_mem_device ("ram0" ,0x80000000 , sdram_size); +arm_add_mem_device ("ram0" ,OMAP_DRAM_ADDR_SPACE_START , sdram_size); +return 0 ; }mem_initcall (beaglebone_mem_init);
arch/arm/boards/beaglebone/lowlevel.c +2 -2
@@ -136,7 +136,7 @@ static noinline int beaglebone_sram_init(void)omap_debug_ll_init ();putc_ll ('>' ); -barebox_arm_entry (0x80000000 , sdram_size, fdt); +barebox_arm_entry (OMAP_DRAM_ADDR_SPACE_START , sdram_size, fdt); }ENTRY_FUNCTION (start_am33xx_beaglebone_sram, bootinfo, r1, r2)
@@ -168,5 +168,5 @@ ENTRY_FUNCTION(start_am33xx_beaglebone_sdram, r0, r1, r2) fdt +=get_runtime_offset (); -barebox_arm_entry (0x80000000 , sdram_size, fdt); +barebox_arm_entry (OMAP_DRAM_ADDR_SPACE_START , sdram_size, fdt); }
arch/arm/boards/myirtech-x335x/lowlevel.c +1 -1
@@ -83,7 +83,7 @@ ENTRY_FUNCTION(start_am33xx_myirtech_sram, bootinfo, r1, r2)am335x_sdram_init (0x18b , &ddr3_cmd_ctrl, &ddr3_regs, &ddr3_data); -if (get_ram_size ((void *)AM33XX_DRAM_ADDR_SPACE_START ,SZ_512M ) <SZ_512M ) { +if (get_ram_size ((void *)OMAP_DRAM_ADDR_SPACE_START ,SZ_512M ) <SZ_512M ) {/* MT41K128M8DA */ ddr3_regs.sdram_config =0x61c04ab2 ;am335x_sdram_init (0x18b , &ddr3_cmd_ctrl, &ddr3_regs, &ddr3_data);
arch/arm/boards/phytec-som-am335x/lowlevel.c +1 -1
@@ -152,7 +152,7 @@ static noinline void physom_board_init(void *fdt, int sdram, int module_family) &timing->data);/* Find the ram size and set up the correct ram timings */ - ramsize =get_ram_size ((long *)0x80000000 ,SZ_1G ); + ramsize =get_ram_size ((long *)OMAP_DRAM_ADDR_SPACE_START ,SZ_1G ); timing =get_timings_by_size (module_family, ramsize);if (!timing)hang ();
arch/arm/boards/vscom-baltos/lowlevel.c +1 -1
@@ -91,7 +91,7 @@ static noinline void baltos_sram_init(void)/* Setup the PLLs and the clocks for the peripherals */ am33xx_pll_init (MPUPLL_M_600 ,DDRPLL_M_400 );am335x_sdram_init (0x18B , &ddr3_cmd_ctrl, &ddr3_regs, &ddr3_data); - sdram_size =get_ram_size ((void *)0x80000000 , (1024 <<20 )); + sdram_size =get_ram_size ((void *)OMAP_DRAM_ADDR_SPACE_START , (1024 <<20 ));if (sdram_size ==SZ_256M )am335x_sdram_init (0x18B , &ddr3_cmd_ctrl, &ddr3_regs_256mb, &ddr3_data_256mb);
arch/arm/boards/wago-pfc-am35xx/board.c +2 -1
@@ -21,7 +21,8 @@ static int pfc200_mem_init(void)if (!of_machine_is_compatible ("ti,pfc200" ))return 0 ; -arm_add_mem_device ("ram0" ,0x80000000 ,SZ_256M ); +arm_add_mem_device ("ram0" ,OMAP_DRAM_ADDR_SPACE_START ,SZ_256M ); +return 0 ; }mem_initcall (pfc200_mem_init);
arch/arm/boards/wago-pfc-am35xx/lowlevel.c +2 -2
@@ -202,7 +202,7 @@ static noinline void pfc200_board_init(void)if (!in_sdram)am35xx_emif4_init (IOMEM (OMAP3_SDRC_BASE )); -barebox_arm_entry (0x80000000 ,SZ_256M ,NULL ); +barebox_arm_entry (OMAP_DRAM_ADDR_SPACE_START ,SZ_256M ,NULL ); }ENTRY_FUNCTION (start_am35xx_pfc_750_820x_sram, bootinfo, r1, r2)
@@ -227,5 +227,5 @@ ENTRY_FUNCTION(start_am35xx_pfc_750_820x_sdram, r0, r1, r2) fdt +=get_runtime_offset (); -barebox_arm_entry (0x80000000 ,SZ_256M , fdt); +barebox_arm_entry (OMAP_DRAM_ADDR_SPACE_START ,SZ_256M , fdt); }
arch/arm/mach-omap/am33xx_generic.c +1 -1
@@ -343,7 +343,7 @@ void am33xx_config_sdram(const struct am33xx_emif_regs *regs)void __noreturn am335x_barebox_entry (void *boarddata) { -barebox_arm_entry (0x80000000 , +barebox_arm_entry (OMAP_DRAM_ADDR_SPACE_START ,emif4_sdram_size (IOMEM (AM33XX_EMIF4_BASE )), boarddata); }
arch/arm/mach-omap/am33xx_scrm.c +2 -1
@@ -22,10 +22,11 @@#include <asm/memory.h> #include <mach/omap/am33xx-silicon.h> #include <mach/omap/emif4.h> +#include <mach/omap/generic.h> static int am33xx_scrm_probe (struct device *dev) { -return arm_add_mem_device ("ram0" ,0x80000000 , +return arm_add_mem_device ("ram0" ,OMAP_DRAM_ADDR_SPACE_START ,emif4_sdram_size (IOMEM (AM33XX_EMIF4_BASE ))); }
arch/arm/mach-omap/omap3_generic.c +1 -1
@@ -193,7 +193,7 @@ u32 get_sdr_cs1_base(void) base = (cs_cfg &0x0000000F ) <<2 ;/* get CS1STARTHIGH */ base = base | ((cs_cfg &0x00000300 ) >>8 );/* get CS1STARTLOW */ base = base <<25 ; - base +=0x80000000 ; + base +=OMAP_DRAM_ADDR_SPACE_START ;return base; }EXPORT_SYMBOL (get_sdr_cs1_base);
arch/arm/mach-omap/omap4_generic.c +2 -2
@@ -380,8 +380,8 @@ void omap4_ddr_init(const struct ddr_regs *ddr_regs,reset_phy (OMAP44XX_EMIF1_BASE );reset_phy (OMAP44XX_EMIF2_BASE ); -writel (0 ,0x80000000 ); -writel (0 ,0x80000080 ); +writel (0 ,OMAP_DRAM_ADDR_SPACE_START ); +writel (0 ,OMAP_DRAM_ADDR_SPACE_START ); }void omap4_power_i2c_send (u32 r)
arch/arm/mach-omap/omap_devices.c +2 -1
@@ -3,11 +3,12 @@#include <driver.h> #include <asm/armlinux.h> +#include <mach/omap/generic.h> #include <mach/omap/omap3-devices.h> void omap_add_ram0 (resource_size_t size) { -arm_add_mem_device ("ram0" ,0x80000000 , size); +arm_add_mem_device ("ram0" ,OMAP_DRAM_ADDR_SPACE_START , size); }void omap_add_sram0 (resource_size_t base,resource_size_t size)
include/mach/omap/am33xx-silicon.h +0 -3
@@ -37,9 +37,6 @@#define AM33XX_GPIO2_BASE (AM33XX_L4_PER_BASE + 0x1AC000 + 0x100)#define AM33XX_GPIO3_BASE (AM33XX_L4_PER_BASE + 0x1AE000 + 0x100) -#define AM33XX_DRAM_ADDR_SPACE_START 0x80000000 -#define AM33XX_DRAM_ADDR_SPACE_END 0xC0000000 -/* I2C */ #define AM33XX_I2C0_BASE (AM33XX_L4_WKUP_BASE + 0x20B000)#define AM33XX_I2C1_BASE (AM33XX_L4_PER_BASE + 0x02A000)
include/mach/omap/generic.h +2 -0
@@ -3,6 +3,8 @@#ifndef _MACH_GENERIC_H#define _MACH_GENERIC_H +#define OMAP_DRAM_ADDR_SPACE_START 0x80000000 +/* I2C controller revisions */ #define OMAP_I2C_OMAP1_REV_2 0x20
include/mach/omap/omap3-silicon.h +0 -3
@@ -125,9 +125,6 @@#define DEVICE_MASK ((0x1 << 8)|(0x1 << 9)|(0x1 << 10)) -#define OMAP_SDRC_CS0 0x80000000 -#define OMAP_SDRC_CS1 0xA0000000 -/* PRM */ #define OMAP3_PRM_RSTCTRL_RESET 0x04
include/mach/omap/omap4-silicon.h +0 -4
@@ -43,10 +43,6 @@#define OMAP44XX_EMIF1_BASE 0x4c000000#define OMAP44XX_EMIF2_BASE 0x4d000000 -#define OMAP44XX_DRAM_ADDR_SPACE_START 0x80000000 -#define OMAP44XX_DRAM_ADDR_SPACE_END 0xD0000000 - -/* CONTROL */ #define OMAP44XX_CTRL_BASE (OMAP44XX_L4_CORE_BASE + 0x2000)#define OMAP44XX_CONTROL_PADCONF_CORE (OMAP44XX_L4_CORE_BASE + 0x100000)
Signature · 1 line
2.39.1
Sascha Hauer
AppliedQuoted 4 lines · Alexander Shiyan
Instead of using "magic" numbers, lets use a single definition for the DRAM starting address.
Applied, thanks!
[1/1] ARM: omap: Unify the definition of DRAM start address
https://git.pengutronix.de/cgit/barebox/commit/?id=cbae451394a5 (link may not be stable)
Best regards,
Signature · 1 line
Sascha Hauer <[email protected]>