Some patches for MPC8569E-MDS
cover Some patches for MPC8569E-MDS
Hello Kumar,
Just resending rebased MPC8569E-MDS patches with your comments addressed, plus there some fixes in eSDHC patch for pilot boards (BCSR registers changed).
Thanks,
Signature · 3 lines
Anton Vorontsov email: cbouatmailru at gmail.com irc://irc.freenode.net/bd2
PATCH 1/7 fdt_support: Add multi-serial support for stdout fixup
Currently 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 <stdio_dev.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.3
PATCH 1/7 fdt_support: Add multi-serial support for stdout fixup
Quoted 11 lines · Anton Vorontsov
Currently
fdt_fixup_stdout()is using hard-codedCONFIG_CONS_INDEXconstant. With multi-serial support, theCONS_INDEXmay 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.Signed-off-by Anton Vorontsov <[email protected]>Acked-by Gerald Van Baren <[email protected]>---
common/fdt_support.c| 22 +++++++++++++++++++++-1 files changed, 21 insertions(+), 1 deletions(-)
Jerry,
Can you review this & possibly ack. I can take it via the 85xx tree to keep the rest of the patches in the sequence sane.
- k
Quoted 53 lines
common/fdt_support.c +18
-0@@ -22,6 +22,7 @@*/ #include <common.h> +#include <stdio_dev.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;common/fdt_support.c +3
-1@@ -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.3
PATCH 1/7 fdt_support: Add multi-serial support for stdout fixup
Quoted 14 lines · Kumar Gala
Quoted 11 lines · Anton Vorontsov
Currently
fdt_fixup_stdout()is using hard-codedCONFIG_CONS_INDEXconstant. With multi-serial support, theCONS_INDEXmay 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.Signed-off-by Anton Vorontsov <[email protected]>Acked-by Gerald Van Baren <[email protected]>---
common/fdt_support.c| 22 +++++++++++++++++++++-1 files changed, 21 insertions(+), 1 deletions(-)
Quoted 6 lines
Jerry,
Can you review this & possibly ack. I can take it via the 85xx tree to keep the rest of the patches in the sequence sane.
- k
Yes, take it via the 85xx tree. I've already acked it:
<http://thread.gmane.org/gmane.comp.boot-loaders.u-boot/66292/focus=68146>
Thanks,
gvb
Kumar Gala
AppliedPATCH 1/7 fdt_support: Add multi-serial support for stdout fixup
In reply to Anton VorontsovQuoted 11 lines · Anton Vorontsov
Currently
fdt_fixup_stdout()is using hard-codedCONFIG_CONS_INDEXconstant. With multi-serial support, theCONS_INDEXmay 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.Signed-off-by Anton Vorontsov <[email protected]>Acked-by Gerald Van Baren <[email protected]>---
common/fdt_support.c| 22 +++++++++++++++++++++-1 files changed, 21 insertions(+), 1 deletions(-)
applied to 85xx.
- k
PATCH 2/7 mpc85xx: Add eSDHC support for MPC8569E-MDS boards
In reply to Anton VorontsoveSDHC is mutually exlusive with UART0 (in 4-bits mode) and I2C2 (in 1-bit mode). When eSDHC is used, we should switch u-boot console to UART1, and make the proper device-tree fixups.
Because of an erratum in prototype boards it is impossible to use eSDHC without disabling UART0 (which makes it quite easy to 'brick' the board by simply issung 'setenv hwconfig esdhc', and not able to interact with U-Boot anylonger).
So, but default we assume that the board is a prototype, which is a most safe assumption. There is no way to determine board revision from a register, so we use hwconfig.
--- board/freescale/mpc8569mds/bcsr.h | 3 +- board/freescale/mpc8569mds/mpc8569mds.c | 116 +++++++++++++++++++++++++++++++ cpu/mpc85xx/speed.c | 4 + include/configs/MPC8569MDS.h | 16 ++++ 4 files changed, 138 insertions(+), 1 deletions(-)
board/freescale/mpc8569mds/bcsr.h +2 -1
@@ -33,7 +33,8 @@#define BCSR6_UPC1_POS_EN 0x40#define BCSR6_UPC1_ADDR_EN 0x20#define BCSR6_UPC1_DEV2 0x10 -#define BCSR6_SD_ENABLE 0x04 +#define BCSR6_SD_CARD_1BIT 0x08 +#define BCSR6_SD_CARD_4BITS 0x04#define BCSR6_TDM2G_EN 0x02#define BCSR6_UCC7_RMII_EN 0x01
board/freescale/mpc8569mds/mpc8569mds.c +116 -0
139 lines not on this page · raw message
cpu/mpc85xx/speed.c +4 -0
@@ -240,8 +240,12 @@ int get_clocks (void) gd->i2c2_clk = gd->i2c1_clk;#if defined(CONFIG_FSL_ESDHC ) +#ifdef CONFIG_MPC8569 + gd->sdhc_clk = gd->bus_clk; +#else gd->sdhc_clk = gd->bus_clk /2 ;#endif +#endif /* defined(CONFIG_FSL_ESDHC) */ #if defined(CONFIG_CPM2 ) gd->vco_out =2 *sys_info.freqSystemBus;
include/configs/MPC8569MDS.h +16 -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
@@ -206,6 +207,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
@@ -258,8 +260,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
@@ -450,6 +454,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.3
Kumar Gala
AppliedPATCH 2/7 mpc85xx: Add eSDHC support for MPC8569E-MDS boards
Quoted 18 lines · Anton Vorontsov
eSDHC is mutually exlusive with UART0 (in 4-bits mode) and I2C2 (in 1-bit mode). When eSDHC is used, we should switch u-boot console to
UART1, and make the proper device-tree fixups.Because of an erratum in prototype boards it is impossible to use eSDHC
without disabling UART0 (which makes it quite easy to 'brick' the board
by simply issung 'setenv hwconfig esdhc', and not able to interact with
U-Boot anylonger).So, but default we assume that the board is a prototype, which is a most
safe assumption. There is no way to determine board revision from a register, so we use hwconfig.
Quoted 8 lines
Signed-off-by Anton Vorontsov <[email protected]>---
board/freescale/mpc8569mds/bcsr.h| 3 +-board/freescale/mpc8569mds/mpc8569mds.c| 116 ++++++++++++++++++++++
+++++++++cpu/mpc85xx/speed.c| 4 +include/configs/MPC8569MDS.h| 16 ++++4 files changed, 138 insertions(+), 1 deletions(-)
applied to 85xx
- k
PATCH 3/7 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.3
Kumar Gala
AppliedPATCH 3/7 mpc85xx: Add eLBC NAND support for MPC8569E-MDS boards
Quoted 8 lines · Anton Vorontsov
Simply add some defines, and adjust TLBe setup to include some space for eLBC NAND.
Signed-off-by Anton Vorontsov <[email protected]>---
board/freescale/mpc8569mds/tlb.c | 30 +++++++++++------------------- include/configs/MPC8569MDS.h | 23 +++++++++++++++++++++++ 2 files changed, 34 insertions(+), 19 deletions(-)
applied to 85xx
- k
PATCH 4/7 mpc85xx: Setup SRIO memory region LAW for MPC8569E-MDS boards
In reply to Anton VorontsovThis patch sets memory window for Serial RapidIO on MPC8569E-MDS boards.
--- board/freescale/mpc8569mds/law.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)
board/freescale/mpc8569mds/law.c +1 -0
@@ -54,6 +54,7 @@ struct law_entry law_table[] = {SET_LAW (CONFIG_SYS_PCIE1_MEM_PHYS ,LAW_SIZE_256M ,LAW_TRGT_IF_PCIE_1 ),SET_LAW (CONFIG_SYS_PCIE1_IO_PHYS ,LAW_SIZE_8M ,LAW_TRGT_IF_PCIE_1 ),SET_LAW (CONFIG_SYS_BCSR_BASE_PHYS ,LAW_SIZE_128M ,LAW_TRGT_IF_LBC ), + SET_LAW(CONFIG_SYS_SRIO_MEM_PHYS, LAW_SIZE_512M, LAW_TRGT_IF_RIO), };int num_law_entries =ARRAY_SIZE (law_table);
Signature · 1 line
1.6.3.3
Kumar Gala
AppliedPATCH 4/7 mpc85xx: Setup SRIO memory region LAW for MPC8569E-MDS boards
Quoted 7 lines · Anton Vorontsov
This patch sets memory window for Serial RapidIO on MPC8569E-MDS boards.
Signed-off-by Anton Vorontsov <[email protected]>---
board/freescale/mpc8569mds/law.c| 1 +1 files changed, 1 insertions(+), 0 deletions(-)
applied to 85xx
- k
PATCH 5/7 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.3
Kumar Gala
AppliedPATCH 5/7 mpc85xx: Setup QE pinmux for SPI Flash on MPC8569E-MDS boards
Quoted 7 lines · Anton Vorontsov
SPI Flash (M25P40) is connected to the SPI1 bus, we need a few
qe_iopentries to actually enable SPI1 on these boards.Signed-off-by Anton Vorontsov <[email protected]>---
board/freescale/mpc8569mds/mpc8569mds.c| 6 ++++++1 files changed, 6 insertions(+), 0 deletions(-)
applied to 85xx
- k
PATCH 6/7 mpc85xx: Configure QE UART for MPC8569E-MDS boards
In reply to Anton VorontsovTo make QE UART usable by Linux we should setup pin multiplexing and turn UCC2 Ethernet node into UCC2 QE UART node.
Also, QE UART is mutually exclusive with UART0, so we can't enable it if eSDHC is in 4-bits mode on pilot boards, or if it's a prototype board with eSDHC in 1- or 4-bits mode.
--- board/freescale/mpc8569mds/bcsr.h | 1 + board/freescale/mpc8569mds/mpc8569mds.c | 98 ++++++++++++++++++++++++------- 2 files changed, 78 insertions(+), 21 deletions(-)
board/freescale/mpc8569mds/bcsr.h +1 -0
@@ -68,6 +68,7 @@#define BCSR15_SMII6_DIS 0x08#define BCSR15_SMII8_DIS 0x04 +#define BCSR15_QEUART_EN 0x01#define BCSR16_UPC1_DEV2 0x02
board/freescale/mpc8569mds/mpc8569mds.c +77 -21
132 lines not on this page · raw message
Signature · 1 line
1.6.3.3
Kumar Gala
AppliedPATCH 6/7 mpc85xx: Configure QE UART for MPC8569E-MDS boards
Quoted 7 lines · Anton Vorontsov
To make QE UART usable by Linux we should setup pin multiplexing and turn UCC2 Ethernet node into UCC2 QE UART node.
Also, QE UART is mutually exclusive with UART0, so we can't enable it if eSDHC is in 4-bits mode on pilot boards, or if it's a prototype board with eSDHC in 1- or 4-bits mode.
Quoted 6 lines
Signed-off-by Anton Vorontsov <[email protected]>---
board/freescale/mpc8569mds/bcsr.h| 1 +board/freescale/mpc8569mds/mpc8569mds.c| 98 ++++++++++++++++++++++
++-------2 files changed, 78 insertions(+), 21 deletions(-)
applied to 85xx
- k
PATCH 7/7 mpc85xx: Configure QE USB for MPC8569E-MDS boards
In reply to Anton VorontsovSetup QE pin multiplexing for USB function, configure needed BCSRs and add some fdt fixups.
--- board/freescale/mpc8569mds/bcsr.h | 4 +++ board/freescale/mpc8569mds/mpc8569mds.c | 32 +++++++++++++++++++++++++++++++ drivers/qe/fdt.c | 2 + 3 files changed, 38 insertions(+), 0 deletions(-)
board/freescale/mpc8569mds/bcsr.h +4 -0
@@ -72,6 +72,10 @@#define BCSR16_UPC1_DEV2 0x02 +#define BCSR17_nUSBEN 0x80 +#define BCSR17_nUSBLOWSPD 0x40 +#define BCSR17_USBVCC 0x20 +#define BCSR17_USBMODE 0x10#define BCSR17_FLASH_nWP 0x01/*BCSR Utils functions*/
board/freescale/mpc8569mds/mpc8569mds.c +32 -0
@@ -160,6 +160,15 @@ const qe_iop_conf_t qe_iop_conf_tab[] = { {0, 25, 1, 0, 1}, /* QEUART_RTS */ {1, 23, 2, 0, 1}, /* QEUART_CTS */ +/* QE USB */ + {5, 3, 1, 0, 1}, /* USB_OE */ + {5, 4, 1, 0, 2}, /* USB_TP */ + {5, 5, 1, 0, 2}, /* USB_TN */ + {5, 6, 2, 0, 2}, /* USB_RP */ + {5, 7, 2, 0, 1}, /* USB_RX */ + {5, 8, 2, 0, 1}, /* USB_RN */ + {2, 4, 2, 0, 2}, /* CLK5 */ +/* SPI Flash, M25P40 */ {4, 27, 3, 0, 1}, /* SPI_MOSI */ {4, 28, 3, 0, 1}, /* SPI_MISO */
@@ -479,6 +488,28 @@ static void fdt_board_fixup_esdhc(void *blob, bd_t *bd)static inline void fdt_board_fixup_esdhc (void *blob,bd_t *bd) {}#endif +static void fdt_board_fixup_qe_usb (void *blob,bd_t *bd) +{ +u8 *bcsr = (u8 *)CONFIG_SYS_BCSR_BASE ; + +if (hwconfig_subarg_cmp ("qe_usb" ,"speed" ,"low" )) +clrbits_8 (&bcsr[17 ], BCSR17_nUSBLOWSPD); +else +setbits_8 (&bcsr[17 ], BCSR17_nUSBLOWSPD); + +if (hwconfig_subarg_cmp ("qe_usb" ,"mode" ,"peripheral" )) { +clrbits_8 (&bcsr[17 ],BCSR17_USBVCC ); +clrbits_8 (&bcsr[17 ],BCSR17_USBMODE ); +do_fixup_by_compat (blob,"fsl,mpc8569-qe-usb" ,"mode" , +"peripheral" ,sizeof ("peripheral" ),1 ); + }else { +setbits_8 (&bcsr[17 ],BCSR17_USBVCC ); +setbits_8 (&bcsr[17 ],BCSR17_USBMODE ); + } + +clrbits_8 (&bcsr[17 ], BCSR17_nUSBEN); +} +#ifdef CONFIG_PCIE1 static struct pci_controller pcie1_hose;#endif /* CONFIG_PCIE1 */
@@ -622,5 +653,6 @@ void ft_board_setup(void *blob, bd_t *bd)#endif fdt_board_fixup_esdhc (blob, bd);fdt_board_fixup_qe_uart (blob, bd); + fdt_board_fixup_qe_usb(blob, bd); }#endif
drivers/qe/fdt.c +2 -0
@@ -85,6 +85,8 @@ void ft_qe_setup(void *blob) "bus-frequency", gd->qe_clk, 1);do_fixup_by_compat_u32 (blob,"fsl,qe" ,"brg-frequency" , gd->brg_clk,1 ); +do_fixup_by_compat_u32 (blob,"fsl,qe-gtm" , +"clock-frequency" , gd->qe_clk /2 ,1 );fdt_fixup_qe_firmware (blob);#endif }
Signature · 1 line
1.6.3.3
Kumar Gala
AppliedPATCH 7/7 mpc85xx: Configure QE USB for MPC8569E-MDS boards
Quoted 10 lines · Anton Vorontsov
Setup QE pin multiplexing for USB function, configure needed BCSRs and add some fdt fixups.
Signed-off-by Anton Vorontsov <[email protected]>---
board/freescale/mpc8569mds/bcsr.h| 4 +++board/freescale/mpc8569mds/mpc8569mds.c| 32 ++++++++++++++++++++++
+++++++++drivers/qe/fdt.c| 2 +3 files changed, 38 insertions(+), 0 deletions(-)
applied to 85xx
- k