sysmo-bts
/
barebox
9
0
Fork 0
Code Releases Activity

Merge branch 'for-next/ppc'

This commit is contained in:
Sascha Hauer 2013-12-06 08:23:27 +01:00
parent ed039cd72b 249c48a075
commit 7a653248be
3 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/ppc/boards/geip-da923rc/da923rc.c
View File

@ -195,7 +195,7 @@ static int da923rc_board_init_r(void)
gpio_set_value(1, 1);
/* De-assert Board reset */
udelay(1000);
gpio_set_value(0, 0);
gpio_set_value(0, 1);
}
/* Enable PCI error reporting */
@ -209,4 +209,4 @@ static int da923rc_board_init_r(void)
return 0;
}
core_initcall(da923rc_board_init_r);
postcore_initcall(da923rc_board_init_r);

5
arch/ppc/mach-mpc85xx/fdt.c
View File

@ -132,6 +132,11 @@ static int fdt_cpu_setup(struct device_node *blob, void *unused)
node = of_find_compatible_node(node, NULL, "ns16550");
}
node = of_find_compatible_node(blob, NULL, "fsl,mpic");
if (node)
of_property_write_u32(node, "clock-frequency",
sysinfo.freqSystemBus);
fdt_stdout_setup(blob);
return 0;

3
arch/ppc/mach-mpc85xx/include/mach/immap_85xx.h
View File

@ -158,5 +158,8 @@
#define I2C1_BASE_ADDR (CFG_IMMR + 0x3000)
#define I2C2_BASE_ADDR (CFG_IMMR + 0x3100)
/* Global Timer Registers */
#define MPC8xxx_PIC_TFRR_OFFSET 0x10F0
#define PCI1_BASE_ADDR (CFG_IMMR + MPC85xx_PCI1_OFFSET)
#endif /*__IMMAP_85xx__*/