diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2013-12-06 08:23:27 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2013-12-06 08:23:27 +0100 |
| commit | 7a653248be55fe799b9b72db22c3c473c43180c4 (patch) | |
| tree | 8efc06ed31b465f50b635c5f152e9a5e09705a4f /arch/ppc | |
| parent | ed039cd72bfe7cf897fc195dd9cfec0bfa359222 (diff) | |
| parent | 249c48a0756fe6039cade2213c9cbcc5dd8d7585 (diff) | |
| download | barebox-7a653248be55fe799b9b72db22c3c473c43180c4.tar.gz barebox-7a653248be55fe799b9b72db22c3c473c43180c4.tar.xz | |
Merge branch 'for-next/ppc'
Diffstat (limited to 'arch/ppc')
| -rw-r--r-- | arch/ppc/boards/geip-da923rc/da923rc.c | 4 | ||||
| -rw-r--r-- | arch/ppc/mach-mpc85xx/fdt.c | 5 | ||||
| -rw-r--r-- | arch/ppc/mach-mpc85xx/include/mach/immap_85xx.h | 3 |
3 files changed, 10 insertions, 2 deletions
diff --git a/arch/ppc/boards/geip-da923rc/da923rc.c b/arch/ppc/boards/geip-da923rc/da923rc.c index 99d139354d..976aa8d54c 100644 --- a/arch/ppc/boards/geip-da923rc/da923rc.c +++ b/arch/ppc/boards/geip-da923rc/da923rc.c @@ -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); diff --git a/arch/ppc/mach-mpc85xx/fdt.c b/arch/ppc/mach-mpc85xx/fdt.c index fd919a56e7..b1da144415 100644 --- a/arch/ppc/mach-mpc85xx/fdt.c +++ b/arch/ppc/mach-mpc85xx/fdt.c @@ -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; diff --git a/arch/ppc/mach-mpc85xx/include/mach/immap_85xx.h b/arch/ppc/mach-mpc85xx/include/mach/immap_85xx.h index ff3a31291c..d5a9c9704c 100644 --- a/arch/ppc/mach-mpc85xx/include/mach/immap_85xx.h +++ b/arch/ppc/mach-mpc85xx/include/mach/immap_85xx.h @@ -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__*/ |