GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-03-29 18:41:30 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

sun6i: dram: Do not try to initialize a second dram chan on A31s

Browse source 
The A31s only has one dram channel, so do not bother with trying to initialize
a second channel.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Acked-by: Ian Campbell <ijc@hellion.org.uk>
This commit is contained in:
Hans de Goede 2014-11-15 23:18:18 +01:00
parent 10191ed098
commit 7582e39eb0
2 changed files with 15 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
arch/arm/cpu/armv7/sunxi/Makefile
View file

@ -10,6 +10,7 @@
obj-y += timer.o obj-y += timer.o
obj-y += board.o obj-y += board.o
obj-y += clock.o obj-y += clock.o
obj-y += cpu_info.o
obj-y += pinmux.o obj-y += pinmux.o
obj-$(CONFIG_MACH_SUN6I) += prcm.o obj-$(CONFIG_MACH_SUN6I) += prcm.o
obj-$(CONFIG_MACH_SUN8I) += prcm.o obj-$(CONFIG_MACH_SUN8I) += prcm.o
@ -21,7 +22,6 @@ obj-$(CONFIG_MACH_SUN7I) += clock_sun4i.o
obj-$(CONFIG_MACH_SUN8I) += clock_sun6i.o obj-$(CONFIG_MACH_SUN8I) += clock_sun6i.o
ifndef CONFIG_SPL_BUILD ifndef CONFIG_SPL_BUILD
obj-y += cpu_info.o
ifdef CONFIG_ARMV7_PSCI ifdef CONFIG_ARMV7_PSCI
obj-y += psci.o obj-y += psci.o
endif endif

18
arch/arm/cpu/armv7/sunxi/dram_sun6i.c
View file

@ -369,18 +369,26 @@ unsigned long sunxi_dram_init(void)
.rows = 16, .rows = 16,
}; };
/* A31s only has one channel */
if (sunxi_get_ss_bonding_id() == SUNXI_SS_BOND_ID_A31S)
para.chan = 1;
mctl_sys_init(); mctl_sys_init();
mctl_dll_init(0, &para); mctl_dll_init(0, &para);
mctl_dll_init(1, &para); setbits_le32(&mctl_com->ccr, MCTL_CCR_CH0_CLK_EN);
setbits_le32(&mctl_com->ccr, if (para.chan == 2) {
MCTL_CCR_MASTER_CLK_EN | mctl_dll_init(1, &para);
MCTL_CCR_CH0_CLK_EN | setbits_le32(&mctl_com->ccr, MCTL_CCR_CH1_CLK_EN);
MCTL_CCR_CH1_CLK_EN); }
setbits_le32(&mctl_com->ccr, MCTL_CCR_MASTER_CLK_EN);
mctl_channel_init(0, &para); mctl_channel_init(0, &para);
if (para.chan == 2)
mctl_channel_init(1, &para); mctl_channel_init(1, &para);
mctl_com_init(&para); mctl_com_init(&para);
mctl_port_cfg(); mctl_port_cfg();