← Back to branch summary

~ubuntu-branches/ubuntu/trusty/linux-linaro-u8500/trusty

« back to all changes in this revision

Viewing changes to arch/avr32/mach-at32ap/at32ap700x.c

  • Committer: Bazaar Package Importer
  • Author(s): John Rigby, Upstream Fixes, Andy Green, John Rigby
  • Date: 2011-04-14 12:16:06 UTC
  • Revision ID: james.westby@ubuntu.com-20110414121606-b77podkyqgr2oix7
Tags: 2.6.38-1002.3
https://launchpad.net/bugs/745737
https://launchpad.net/bugs/747639
https://launchpad.net/bugs/752900
https://launchpad.net/bugs/745737
https://launchpad.net/bugs/732842
https://launchpad.net/bugs/732912
[ Upstream Fixes ]

* MUSB: shutdown: Make sure block is awake before doing shutdown
  - LP: #745737
* Fixed gpio polarity of gpio USB-phy reset.
  - LP: #747639

[ Andy Green ]

* LINARO: SAUCE: disable CONFIG_OMAP_RESET_CLOCKS
  - LP: #752900

[ John Rigby ]

* Rebase to new upstreams:
  Linux v2.6.38.1
  linaro-linux-2.6.38-upstream-29Mar2011
  Ubuntu-2.6.38-7.35
* SAUCE: OMAP4: clock: wait for module to become accessible on
  a clk enable
  - LP: #745737
* Rebase to new upstreams:
  Linux v2.6.38.2
  linaro-linux-2.6.38-upstream-5Apr2011
  Ubuntu-2.6.38-8.41
  - LP: #732842
* Update configs for device tree, dvfs and lttng
* LINARO: add building of dtb's
* LINARO: SAUCE: Disable lowest operating freqs on omap34xx
  - LP: #732912

Show diffs side-by-side

added added

removed removed

Lines of Context:
arch/avr32/mach-at32ap/at32ap700x.c
2048
2048
                rx_dws->reg_width = DW_DMA_SLAVE_WIDTH_16BIT;
2049
2049
                rx_dws->cfg_hi = DWC_CFGH_SRC_PER(3);
2050
2050
                rx_dws->cfg_lo &= ~(DWC_CFGL_HS_DST_POL | DWC_CFGL_HS_SRC_POL);
 
2051
                rx_dws->src_master = 0;
 
2052
                rx_dws->dst_master = 1;
 
2053
                rx_dws->src_msize = DW_DMA_MSIZE_1;
 
2054
                rx_dws->dst_msize = DW_DMA_MSIZE_1;
 
2055
                rx_dws->fc = DW_DMA_FC_D_P2M;
2051
2056
        }
2052
2057
 
2053
2058
        /* Check if DMA slave interface for playback should be configured. */
2056
2061
                tx_dws->reg_width = DW_DMA_SLAVE_WIDTH_16BIT;
2057
2062
                tx_dws->cfg_hi = DWC_CFGH_DST_PER(4);
2058
2063
                tx_dws->cfg_lo &= ~(DWC_CFGL_HS_DST_POL | DWC_CFGL_HS_SRC_POL);
 
2064
                tx_dws->src_master = 0;
 
2065
                tx_dws->dst_master = 1;
 
2066
                tx_dws->src_msize = DW_DMA_MSIZE_1;
 
2067
                tx_dws->dst_msize = DW_DMA_MSIZE_1;
 
2068
                tx_dws->fc = DW_DMA_FC_D_M2P;
2059
2069
        }
2060
2070
 
2061
2071
        if (platform_device_add_data(pdev, data,
2128
2138
        dws->reg_width = DW_DMA_SLAVE_WIDTH_32BIT;
2129
2139
        dws->cfg_hi = DWC_CFGH_DST_PER(2);
2130
2140
        dws->cfg_lo &= ~(DWC_CFGL_HS_DST_POL | DWC_CFGL_HS_SRC_POL);
 
2141
        dws->src_master = 0;
 
2142
        dws->dst_master = 1;
 
2143
        dws->src_msize = DW_DMA_MSIZE_1;
 
2144
        dws->dst_msize = DW_DMA_MSIZE_1;
 
2145
        dws->fc = DW_DMA_FC_D_M2P;
2131
2146
 
2132
2147
        if (platform_device_add_data(pdev, data,
2133
2148
                                sizeof(struct atmel_abdac_pdata)))