Some patches for MPC8569E-MDS
cover Some patches for MPC8569E-MDS
Hi Kumar,
Here are few patches for MPC8569E-MDS, on top of these:
http://lists.denx.de/pipermail/u-boot/2009-June/054011.html
("[PATCH 1/8] Add simple hwconfig infrastructure") and
http://lists.denx.de/pipermail/u-boot/2009-May/053031.html
("[PATCH 00/15] patchset for QE UEC and MPC8569MDS")
Thanks,
Signature · 3 lines
Anton Vorontsov email: cbouatmailru at gmail.com irc://irc.freenode.net/bd2
PATCH 1/5 mpc85xx: Add multi-serial support for MPC8569E-MDS boards
There are two UARTs on MPC8569E-MDS boards, but UART1 can be muxed away to SD/MMC signals, so we'll need multi-serial support to support eSDHC on these boards (we'll redirect u-boot console to the second UART in case of enabled eSDHC).
--- common/serial.c | 2 +- include/configs/MPC8569MDS.h | 1 + include/serial.h | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-)
common/serial.c +1 -1
@@ -40,7 +40,7 @@ struct serial_device *__default_serial_console (void)return &serial_scc_device;#elif defined(CONFIG_405GP ) || defined(CONFIG_405CR ) || defined(CONFIG_440 ) \ || defined(CONFIG_405EP ) || defined(CONFIG_405EZ ) || defined(CONFIG_405EX ) \ - || defined(CONFIG_MPC5xxx) + || defined(CONFIG_MPC5xxx) || defined(CONFIG_MPC85xx)#if defined(CONFIG_CONS_INDEX ) && defined(CONFIG_SYS_NS16550_SERIAL )#if (CONFIG_CONS_INDEX ==1 )return &eserial1_device;
include/configs/MPC8569MDS.h +1 -0
@@ -206,6 +206,7 @@ extern unsigned long get_clock_freq(void);/* Serial Port */ #define CONFIG_CONS_INDEX 1 +#define CONFIG_SERIAL_MULTI 1#undef CONFIG_SERIAL_SOFTWARE_FIFO#define CONFIG_SYS_NS16550 #define CONFIG_SYS_NS16550_SERIAL
include/serial.h +1 -1
@@ -24,7 +24,7 @@ extern struct serial_device * default_serial_console (void);#if defined(CONFIG_405GP ) || defined(CONFIG_405CR ) || defined(CONFIG_440 ) || \ defined(CONFIG_405EP ) || defined(CONFIG_405EZ ) || defined(CONFIG_405EX ) || \ - defined(CONFIG_MPC5xxx) + defined(CONFIG_MPC5xxx) || defined(CONFIG_MPC85xx)extern struct serial_device serial0_device;extern struct serial_device serial1_device;#if defined(CONFIG_SYS_NS16550_SERIAL )
Signature · 1 line
1.6.3.1
PATCH 2/5 fdt_support: Add multi-serial support for stdout fixup
In reply to Anton VorontsovCurrently fdt_fixup_stdout() is using hard-coded CONFIG_CONS_INDEX constant. With multi-serial support, the CONS_INDEX may no longer represent actual console, so we should try to extract port number from the current stdio device name instead of always hard-coding the constant value.
--- common/fdt_support.c | 22 +++++++++++++++++++++- 1 files changed, 21 insertions(+), 1 deletions(-)
common/fdt_support.c +21 -1
@@ -22,6 +22,7 @@*/ #include <common.h> +#include <devices.h> #include <linux/ctype.h> #include <linux/types.h> #include <asm/global_data.h>
@@ -90,6 +91,23 @@ int fdt_find_and_setprop(void *fdt, const char *node, const char *prop, }#ifdef CONFIG_OF_STDOUT_VIA_ALIAS + +#ifdef CONFIG_SERIAL_MULTI +static void fdt_fill_multisername (char *sername,size_t maxlen) +{ +const char *outname = stdio_devices[stdout]->name; + +if (strcmp (outname,"serial" ) >0 ) +strncpy (sername, outname, maxlen); + +/* eserial? */ +if (strcmp (outname +1 ,"serial" ) >0 ) +strncpy (sername, outname +1 , maxlen); +} +#else +static inline void fdt_fill_multisername (char *sername,size_t maxlen) {} +#endif /* CONFIG_SERIAL_MULTI */ +static int fdt_fixup_stdout (void *fdt,int chosenoff) {int err =0 ;
@@ -98,7 +116,9 @@ static int fdt_fixup_stdout(void *fdt, int chosenoff)char sername[9 ] = {0 };const char *path; -sprintf (sername,"serial%d" ,CONFIG_CONS_INDEX -1 ); +fdt_fill_multisername (sername,sizeof (sername) -1 ); +if (!sername[0 ]) +sprintf (sername,"serial%d" ,CONFIG_CONS_INDEX -1 ); err = node =fdt_path_offset (fdt,"/aliases" );if (node >=0 ) {
Signature · 1 line
1.6.3.1
PATCH 3/5 mpc85xx: Add eSDHC support for MPC8569E-MDS boards
In reply to Anton VorontsoveSDHC is mutually exlusive with UART1 and I2C2. When eSDHC is used, we should switch u-boot console to UART2, and make the proper device-tree fixups.
--- board/freescale/mpc8569mds/mpc8569mds.c | 85 +++++++++++++++++++++++++++++++ cpu/mpc85xx/speed.c | 2 +- include/asm-ppc/global_data.h | 3 +- include/configs/MPC8569MDS.h | 15 ++++++ 4 files changed, 103 insertions(+), 2 deletions(-)
board/freescale/mpc8569mds/mpc8569mds.c +85 -0
@@ -23,6 +23,7 @@*/ #include <common.h> +#include <hwconfig.h> #include <pci.h> #include <asm/processor.h> #include <asm/mmu.h>
@@ -35,6 +36,7 @@#include <ioports.h> #include <libfdt.h> #include <fdt_support.h> +#include <fsl_esdhc.h> #include "bcsr.h"
@@ -303,6 +305,87 @@ local_bus_init(void)out_be32 (&lbc->lcrr, (u32 )in_be32 (&lbc->lcrr)|0x00030000 ); } +#ifdef CONFIG_FSL_ESDHC +int board_mmc_init (bd_t *bd) +{ +struct ccsr_gur *gur = (struct ccsr_gur *)CONFIG_SYS_MPC85xx_GUTS_ADDR; +u8 *bcsr = (u8 *)CONFIG_SYS_BCSR_BASE ; + +if (!hwconfig ("esdhc" )) +return 0 ; + +printf ("Enabling eSDHC...\n" +" For eSDHC to function, UART1 and I2C2 should be disabled.\n" +" Redirecting stderr, stdout and stdin to UART1...\n" ); +console_assign (stderr,"eserial1" ); +console_assign (stdout,"eserial1" ); +console_assign (stdin,"eserial1" ); +printf ("Switched to UART2 (initial log has been printed to UART1).\n" ); + +/* Assign I2C2 signals to eSDHC. */ +clrsetbits_be32 (&gur->plppar1,PLPPAR1_I2C_BIT_MASK , +PLPPAR1_ESDHC_VAL ); +clrsetbits_be32 (&gur->plpdir1,PLPDIR1_I2C_BIT_MASK , +PLPDIR1_ESDHC_VAL ); + +/* Mux UART1 & I2C2 signals to eSDHC. */ +setbits_8 (&bcsr[6 ],BCSR6_SD_ENABLE ); + +return fsl_esdhc_mmc_init (bd); +} + +static void fdt_board_fixup_esdhc (void *blob,bd_t *bd) +{ +const char *status ="disabled" ; +int off; +int err; + +/* +* In case of enabled eSDHC, we should disable UART0 and I2C2 +* in the device tree, otherwise nothing to do. +*/ +if (!hwconfig ("esdhc" )) +return ; + + off =fdt_path_offset (blob,"serial0" ); +if (off <0 ) { +printf ("WARNING: could not find serial0 alias: %s.\n" , +fdt_strerror (off)); + goto disable_i2c2; + } + + err =fdt_setprop (blob, off,"status" , status,strlen (status) +1 ); +if (err) { +printf ("WARNING: could not set status for serial0: %s.\n" , +fdt_strerror (err)); +return ; + } + +disable_i2c2: + off =-1 ; +while (1 ) { +const u32 *idx; +int len; + + off =fdt_node_offset_by_compatible (blob, off,"fsl-i2c" ); +if (off <0 ) +break ; + + idx =fdt_getprop (blob, off,"cell-index" , &len); +if (!idx || len !=sizeof (*idx)) +continue ; + +if (*idx ==1 ) { +fdt_setprop (blob, off,"status" , status, +strlen (status) +1 ); +break ; + } + } +} +#else +static inline void fdt_board_fixup_esdhc (void *blob,bd_t *bd) {} +#endif +#ifdef CONFIG_PCIE1 static struct pci_controller pcie1_hose;#endif /* CONFIG_PCIE1 */
@@ -449,5 +532,7 @@ void ft_board_setup(void *blob, bd_t *bd)#ifdef CONFIG_PCIE1 ft_fsl_pci_setup (blob,"pci1" , &pcie1_hose);#endif +fdt_fixup_esdhc (blob, bd); + fdt_board_fixup_esdhc(blob, bd); }#endif
cpu/mpc85xx/speed.c +1 -1
@@ -153,7 +153,7 @@ int get_clocks (void)#endif gd->i2c2_clk = gd->i2c1_clk; -#if defined(CONFIG_MPC8536 ) +#if defined(CONFIG_MPC8536 ) || defined(CONFIG_MPC8569 ) gd->sdhc_clk = gd->bus_clk /2 ;#endif
include/asm-ppc/global_data.h +2 -1
@@ -86,7 +86,8 @@ typedef struct global_data {u32 mem_sec_clk;#endif /* CONFIG_MPC8360 */ #endif -#if defined(CONFIG_MPC837X ) || defined(CONFIG_MPC8536 ) +#if defined(CONFIG_MPC837X ) || defined(CONFIG_MPC8536 ) || \ + defined(CONFIG_MPC8569 )u32 sdhc_clk;#endif #if defined(CONFIG_MPC85xx) || defined(CONFIG_MPC86xx)
include/configs/MPC8569MDS.h +15 -0
@@ -70,6 +70,7 @@ extern unsigned long get_clock_freq(void);#define CONFIG_ENABLE_36BIT_PHYS 1#define CONFIG_BOARD_EARLY_INIT_F 1/* Call board_pre_init */ +#define CONFIG_HWCONFIG #define CONFIG_SYS_MEMTEST_START 0x00200000/* memtest works on */ #define CONFIG_SYS_MEMTEST_END 0x00400000
@@ -260,8 +261,10 @@ extern unsigned long get_clock_freq(void);#define PLPPAR1_I2C_BIT_MASK 0x0000000F#define PLPPAR1_I2C2_VAL 0x00000000 +#define PLPPAR1_ESDHC_VAL 0x0000000A#define PLPDIR1_I2C_BIT_MASK 0x0000000F#define PLPDIR1_I2C2_VAL 0x0000000F +#define PLPDIR1_ESDHC_VAL 0x00000006/* * General PCI
@@ -452,6 +455,18 @@ extern unsigned long get_clock_freq(void);#undef CONFIG_WATCHDOG/* watchdog disabled */ +#define CONFIG_MMC 1 + +#ifdef CONFIG_MMC +#define CONFIG_FSL_ESDHC +#define CONFIG_SYS_FSL_ESDHC_ADDR CONFIG_SYS_MPC85xx_ESDHC_ADDR +#define CONFIG_CMD_MMC +#define CONFIG_GENERIC_MMC +#define CONFIG_CMD_EXT2 +#define CONFIG_CMD_FAT +#define CONFIG_DOS_PARTITION +#endif +/* * Miscellaneous configurable options */
Signature · 1 line
1.6.3.1
PATCH 4/5 mpc85xx: Add eLBC NAND support for MPC8569E-MDS boards
In reply to Anton VorontsovSimply add some defines, and adjust TLBe setup to include some space for eLBC NAND.
--- board/freescale/mpc8569mds/tlb.c | 30 +++++++++++------------------- include/configs/MPC8569MDS.h | 23 +++++++++++++++++++++++ 2 files changed, 34 insertions(+), 19 deletions(-)
board/freescale/mpc8569mds/tlb.c +11 -19
@@ -46,22 +46,24 @@ struct fsl_e_tlb_entry tlb_table[] = {/* TLB 1 Initializations */ /* -* TLBe 0: 16M Non-cacheable, guarded -* 0xff000000 16M FLASH (upper half) +* TLBe 0: 64M Non-cacheable, guarded * Out of reset this entry is only 4K. +* 0xfc000000 256K NAND FLASH (CS3) +* 0xfe000000 32M NOR FLASH (CS0) */ -SET_TLB_ENTRY (1 ,CONFIG_SYS_FLASH_BASE +0x1000000 , -CONFIG_SYS_FLASH_BASE_PHYS +0x1000000 , +SET_TLB_ENTRY (1 ,CONFIG_SYS_NAND_BASE ,CONFIG_SYS_NAND_BASE ,MAS3_SX |MAS3_SW |MAS3_SR ,MAS2_I |MAS2_G , -0 ,0 ,BOOKE_PAGESZ_16M ,1 ), +0 ,0 ,BOOKE_PAGESZ_64M ,1 ),/* -* TLBe 1: 16M Non-cacheable, guarded -* 0xfe000000 16M FLASH (lower half) +* TLBe 1: 256KB Non-cacheable, guarded +* 0xf8000000 32K BCSR +* 0xf8008000 32K PIB (CS4) +* 0xf8010000 32K PIB (CS5) */ -SET_TLB_ENTRY (1 ,CONFIG_SYS_FLASH_BASE ,CONFIG_SYS_FLASH_BASE_PHYS , +SET_TLB_ENTRY (1 ,CONFIG_SYS_BCSR_BASE ,CONFIG_SYS_BCSR_BASE_PHYS ,MAS3_SX |MAS3_SW |MAS3_SR ,MAS2_I |MAS2_G , - 0, 1, BOOKE_PAGESZ_16M, 1), + 0, 1, BOOKE_PAGESZ_256K, 1),/* * TLBe 2: 256M Non-cacheable, guarded
@@ -88,16 +90,6 @@ struct fsl_e_tlb_entry tlb_table[] = {SET_TLB_ENTRY (1 ,CONFIG_SYS_CCSRBAR ,CONFIG_SYS_CCSRBAR_PHYS ,MAS3_SX |MAS3_SW |MAS3_SR ,MAS2_I |MAS2_G , 0, 4, BOOKE_PAGESZ_64M, 1), - -/* -* TLBe 5: 256K Non-cacheable, guarded -* 0xf8000000 32K BCSR -* 0xf8008000 32K PIB (CS4) -* 0xf8010000 32K PIB (CS5) -*/ -SET_TLB_ENTRY (1 ,CONFIG_SYS_BCSR_BASE ,CONFIG_SYS_BCSR_BASE_PHYS , -MAS3_SX |MAS3_SW |MAS3_SR ,MAS2_I |MAS2_G , - 0, 5, BOOKE_PAGESZ_256K, 1), };int num_tlb_entries =ARRAY_SIZE (tlb_table);
include/configs/MPC8569MDS.h +23 -0
@@ -181,6 +181,29 @@ extern unsigned long get_clock_freq(void);#define CONFIG_SYS_FLASH_CFI #define CONFIG_SYS_FLASH_EMPTY_INFO +/* Chip select 3 - NAND */ +#define CONFIG_SYS_NAND_BASE 0xFC000000 +#define CONFIG_SYS_NAND_BASE_PHYS CONFIG_SYS_NAND_BASE +#define CONFIG_SYS_NAND_BASE_LIST { CONFIG_SYS_NAND_BASE, } +#define CONFIG_SYS_MAX_NAND_DEVICE 1 +#define CONFIG_MTD_NAND_VERIFY_WRITE 1 +#define CONFIG_CMD_NAND 1 +#define CONFIG_NAND_FSL_ELBC 1 +#define CONFIG_SYS_NAND_BLOCK_SIZE (128 * 1024) +#define CONFIG_NAND_BR_PRELIM (CONFIG_SYS_NAND_BASE_PHYS \ + | (2<<BR_DECC_SHIFT) /* Use HW ECC */ \ + | BR_PS_8 /* Port Size = 8 bit */ \ + | BR_MS_FCM /* MSEL = FCM */ \ + | BR_V) /* valid */ +#define CONFIG_NAND_OR_PRELIM (0xFFFC0000 /* length 256K */ \ + | OR_FCM_CSCT \ + | OR_FCM_CST \ + | OR_FCM_CHT \ + | OR_FCM_SCY_1 \ + | OR_FCM_TRLX \ + | OR_FCM_EHTR) +#define CONFIG_SYS_BR3_PRELIM CONFIG_NAND_BR_PRELIM/* NAND Base Address */ +#define CONFIG_SYS_OR3_PRELIM CONFIG_NAND_OR_PRELIM/* NAND Options */ /* * SDRAM on the LocalBus
Signature · 1 line
1.6.3.1
PATCH 5/5 mpc85xx: Setup QE pinmux for SPI Flash on MPC8569E-MDS boards
In reply to Anton VorontsovSPI Flash (M25P40) is connected to the SPI1 bus, we need a few qe_iop entries to actually enable SPI1 on these boards.
--- board/freescale/mpc8569mds/mpc8569mds.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-)
board/freescale/mpc8569mds/mpc8569mds.c +6 -0
@@ -154,6 +154,12 @@ const qe_iop_conf_t qe_iop_conf_tab[] = { {5, 10, 2, 0, 3}, /* UART1_CTS_B */ {5, 11, 1, 0, 2}, /* UART1_RTS_B */ +/* SPI Flash, M25P40 */ + {4, 27, 3, 0, 1}, /* SPI_MOSI */ + {4, 28, 3, 0, 1}, /* SPI_MISO */ + {4, 29, 3, 0, 1}, /* SPI_CLK */ + {4, 30, 1, 0, 0}, /* SPI_SEL, GPIO */ + {0, 0, 0, 0, QE_IOP_TAB_END} /* END of table */ };
Signature · 1 line
1.6.3.1