Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx

[platform/kernel/u-boot.git] / board / imx31_phycore / imx31_phycore.c

diff --git a/board/imx31_phycore/imx31_phycore.c b/board/imx31_phycore/imx31_phycore.c
index ae93444..3d7b7f7 100644 (file)
--- a/board/imx31_phycore/imx31_phycore.c
+++ b/board/imx31_phycore/imx31_phycore.c
@@ -23,6 +23,8 @@
 
 
 #include <common.h>
+#include <s6e63d6.h>
+#include <netdev.h>
 #include <asm/arch/mx31.h>
 #include <asm/arch/mx31-regs.h>
 
@@ -60,14 +62,79 @@ int board_init (void)
        mx31_gpio_mux(MUX_CSPI2_MOSI__I2C2_SCL);
        mx31_gpio_mux(MUX_CSPI2_MISO__I2C2_SDA);
 
-       gd->bd->bi_arch_number = 447;           /* board id for linux */
-       gd->bd->bi_boot_params = (0x80000100);  /* adress of boot parameters */
+       gd->bd->bi_arch_number = MACH_TYPE_PCM037;      /* board id for linux */
+       gd->bd->bi_boot_params = (0x80000100);          /* adress of boot parameters */
 
        return 0;
 }
 
+#ifdef BOARD_LATE_INIT
+int board_late_init(void)
+{
+#ifdef CONFIG_S6E63D6
+       struct s6e63d6 data = {
+               /*
+                * See comment in mxc_spi.c::decode_cs() for .cs field format.
+                * We use GPIO 57 as a chipselect for the S6E63D6 and chipselect
+                * 2 of the SPI controller #1, since it is unused.
+                */
+               .cs = 2 | (57 << 8),
+               .bus = 0,
+               .id = 0,
+       };
+       int ret;
+
+       /* SPI1 */
+       mx31_gpio_mux(MUX_CSPI1_SCLK__CSPI1_CLK);
+       mx31_gpio_mux(MUX_CSPI1_SPI_RDY__CSPI1_DATAREADY_B);
+       mx31_gpio_mux(MUX_CSPI1_MOSI__CSPI1_MOSI);
+       mx31_gpio_mux(MUX_CSPI1_MISO__CSPI1_MISO);
+       mx31_gpio_mux(MUX_CSPI1_SS0__CSPI1_SS0_B);
+       mx31_gpio_mux(MUX_CSPI1_SS1__CSPI1_SS1_B);
+       mx31_gpio_mux(MUX_CSPI1_SS2__CSPI1_SS2_B);
+
+       /* start SPI1 clock */
+       __REG(CCM_CGR2) = __REG(CCM_CGR2) | (3 << 2);
+
+       /* GPIO 57 */
+       /* sw_mux_ctl_key_col4_key_col5_key_col6_key_col7 */
+       mx31_gpio_mux(IOMUX_MODE(0x63, MUX_CTL_GPIO));
+
+       /* SPI1 CS2 is free */
+       ret = s6e63d6_init(&data);
+       if (ret)
+               return ret;
+
+       /*
+        * This is a "magic" sequence to initialise a C0240QGLA / C0283QGLC
+        * OLED display connected to a S6E63D6 SPI display controller in the
+        * 18 bit RGB mode
+        */
+       s6e63d6_index(&data, 2);
+       s6e63d6_param(&data, 0x0182);
+       s6e63d6_index(&data, 3);
+       s6e63d6_param(&data, 0x8130);
+       s6e63d6_index(&data, 0x10);
+       s6e63d6_param(&data, 0x0000);
+       s6e63d6_index(&data, 5);
+       s6e63d6_param(&data, 0x0001);
+       s6e63d6_index(&data, 0x22);
+#endif
+       return 0;
+}
+#endif
+
 int checkboard (void)
 {
        printf("Board: Phytec phyCore i.MX31\n");
        return 0;
 }
+
+int board_eth_init(bd_t *bis)
+{
+       int rc = 0;
+#ifdef CONFIG_SMC911X
+       rc = smc911x_initialize(0, CONFIG_SMC911X_BASE);
+#endif
+       return rc;
+}