Commit Graph

13 Commits

Author SHA1 Message Date
Richard Zhu
1dc8f0e201 ENGR00124736 Remerge the minor modifications to mainline
1 correct the pata platform device resource check codes
2 Change the end statment of the sdhc1 det pin
iomux definition on mx51 board from ',' to ';'.
3 sdhc driver max blk count on MX31, sinc
customer report that the emmc would be failed when
the blk count is more than 32.

Signed-off-by: Richard Zhu <r65037@freescale.com>
2010-08-10 11:51:21 -05:00
Jason Chen
cedf277fe5 ENGR00122780 ipufb: rework display device setting method
Rework the display command line options to not require new option for
every new display. Add mxcdi0fb/mxcdi1fb option <fmt> and to tell system
what kind of display device is going to use.

Use "di1_primary" to make DI1 the primary display (i.e. fb0).

The display selection is done using video= parameter.

        For example on imx51:

                  di             di_fmt      video_mode
        DVI:      0              RGB24      mxcdi0fb:800x600M-16@60 etc
        DVI-HDMI: 0              RGB24      mxcdi0fb:720P60
        LVDS:     0              LVDS666    mxcdi0fb:XGA
        WVGA lcd: 1              RGB565     mxcdi1fb:800x480M-16@55
        TVE:      1              YUV444     mxcdi1fb:TV-NTSC
                                            mxcdi1fb:TV-PAL
                                            mxcdi1fb:720P60
        For example on imx53:

                  di             di_fmt      video_mode
        DVI:      0              RGB24      mxcdi0fb:800x600M-16@60 etc
        DVI-HDMI: 0              RGB24      mxcdi0fb:720P60
        WVGA lcd: 0              RGB565     mxcdi0fb:800x480M-16@55
        TVE:      1              YUV444     mxcdi1fb:TV-NTSC
                                            mxcdi1fb:TV-PAL
                                            mxcdi1fb:720P60

If you want to set NTSC tv as primary display, and make second display
DI0 as DVI 1024x768 resolution, just add

"di1_primary video=mxcdi0fb:RGB24,1024x768M-16@60 video=mxcdi1fb:YUV444,TV-NTSC"

to cmdline.

Signed-off-by: Rob Herring <r.herring@freescale.com>
Signed-off-by: Jason Chen <b02280@freescale.com>
2010-08-10 11:50:15 -05:00
Jason Liu
a6a9ff450b ENGR00123131 NAND:Get resources from platform data
Get resources from platform data

Signed-off-by:Jason Liu <r64343@freescale.com>
2010-08-10 11:50:01 -05:00
Jason Chen
99db3066ed ENGR00121100 tve: fix issue of make tve as primary display
This patch make tve primary display work for both imx51_bbg and imx37_3stack.
For imx51_bbg, add "hdtv=2" to cmdline, for imx37_3stack, add "tv" to
cmdline.

Signed-off-by: Jason Chen <b02280@freescale.com>
2010-08-10 11:47:21 -05:00
Rob Herring
376ee81cfc ENGR00121365 mxcuart: rework early uart console
Rework early uart to pass in uart base and clock ptr from board.
Now early console for ttymxc is always enabled and mxcuart console
is not needed.

Add fix work-around u-boot illegal uart setup. uboot sets fifo
trigger levels to reserved values which breaks early uart console.
Use TXFE instead of TRDY.

Signed-off-by: Rob Herring <r.herring@freescale.com>
2010-08-10 11:47:15 -05:00
Rob Herring
1ab4fba6b4 ENGR00120394-2 imx: make tzic use dynamic base address
Different chips have TZIC interrupt controller at different addresses,
so make the mapping dynamic.

Signed-off-by: Rob Herring <r.herring@freescale.com>
2010-08-10 11:46:55 -05:00
Rob Herring
a45319ebdb ENGR00120394-1 imx: remove unneeded spba related code
The spba defaults to all masters enabled and this is fine as
all chips only have ARM and SDMA as masters.

Signed-off-by: Rob Herring <r.herring@freescale.com>
2010-08-10 11:46:54 -05:00
Jason Chen
d2d97286cb ENGR00119274 TVE: HDTV can not work
1.arrange display port according to choice of different display device
2.for ipu_disp.c: not round pixel clock to even for tvout.
3.cmdline "hdtv" enable 720P, "hdtv=2" enable 720P as primary.

Signed-off-by: Jason Chen <b02280@freescale.com>
2010-08-10 11:46:19 -05:00
Ranjani Vaidyanathan-RA5478
28af5a66c6 ENGR00088305: Add DVFS-PER support
Added support for DVFS-PER for both MX37 and MX51.

Signed-off-by: Ranjani Vaidyanathan-RA5478 <Ranjani.Vaidyanathan@freescale.com>
2010-08-10 11:45:57 -05:00
Alan Tull
52bf586bac ENGR00118016-1 ASoC : upgrade audio support to 2.6.31
Move regulator control into codec drivers.
Move codec platform data to machine layer.
Remove unused fields from mxc_audio_platform_data.
soc multiple audio cards support:
  dai_list is a list for all registered codec/cpu dais.
  One codec/cpu dais can't be registered twice, so move the
  cpu dai registering into imx-ssi.c/imx-esai.c
Fix ak4647_read_reg error.
Put ssi/esai mode in the cpu_dai private_data.
sgtl5000: Fix the power for MX35
  1. MX35 vddio and vddd are directly connected to
  external 3V3. It has no regulator control.
  2. sgtl5000 needs some time to be ready after vdda
  is switched on so msleep(1) is added before regiter
  read/write.
  3. On MX35 platform, vdda is from VCAM.

Signed-off-by: Alan Tull <r80115@freescale.com>
Signed-off-by: Wallace Wang <r59996@freescale.com>
2010-08-10 11:45:24 -05:00
Ranjani Vaidyanathan-RA5478
e717ff90e8 ENGR00117111: Added EMPGC0 fixes for MX37.
Set ALP bits to 0.
Set the SRPG powerup and powerdown values.
Set the WM8350 to be in normal mode (PWM) rather in Pulse Skipping mode.

Signed-off-by: Ranjani Vaidyanathan-RA5478 <Ranjani.Vaidyanathan@freescale.com>
2010-08-10 11:44:54 -05:00
Ranjani Vaidyanathan-RA5478
55a8300bb3 ENGR00116479: Ported DVFS-CORE and audio pop issue from Apollo project.
Fix the audio pop issue that is caused whenever the system enters and
exits LP-APM mode.
Added some more working points for DVFS-CORE.

Signed-off-by: Ranjani Vaidyanathan-RA5478 <Ranjani.Vaidyanathan@freescale.com>
2010-08-10 11:44:42 -05:00
Rob Herring
be0524d38f ENGR00117389 Port 5.0.0 release to 2.6.31
This is i.MX BSP 5.0.0 release ported to 2.6.31

Signed-off-by: Rob Herring <r.herring@freescale.com>
Signed-off-by: Alan Tull <r80115@freescale.com>
Signed-off-by: Xinyu Chen <xinyu.chen@freescale.com>
2010-08-10 11:44:41 -05:00