summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2015-01-15ENGR00276567-6 mfd: si476x: Use default configuration when no platform dataNicolin Chen
This would allow the driver to work normally without specific platform data, when using devicetree for example. Signed-off-by: Nicolin Chen <b42378@freescale.com> (cherry picked from commit 23e369b88b546d7b699ca9ec46e195a05c61b717)
2015-01-15ENGR00276567-4 mfd: si476x: Fix power up failureNicolin Chen
This's some logical error in power-up code, thus fix it. Signed-off-by: Nicolin Chen <b42378@freescale.com> (cherry picked from commit 77d97ad1bb77c0e3c60b9781a06b61d4b4667de1)
2015-01-15ENGR00330403-4: ASoC: fsl_asrc: Add Memory to Memory supportShengjiu Wang
ASRC M2M function is not able to put upstream due to its self-designed ioctl protocol. So I just make a single patch for it and make it merge into P2P driver as simply as possible. The patch can only be maintained internally unless some one designs a new protocol or implement the originally protocol by using some common approach provided by Linux Kernel. Signed-off-by: Shengjiu Wang <shengjiu.wang@freescale.com>
2015-01-15ENGR00330403-3: ASoC: fsl: port si476x machine driver from imx_3.10.yShengjiu Wang
Port si476x machine dirver for i.MX series SoC and binding doc from imx_3.10.y Signed-off-by: Shengjiu Wang <shengjiu.wang@freescale.com>
2015-01-15ENGR00330403-2: ASoC: fsl_hdmi: port hdmi audio driver from imx_3.10.yShengjiu Wang
Port HDMI audio driver (CPU driver, machine driver, platform driver) from imx_3.10.y. Signed-off-by: Shengjiu Wang <shengjiu.wang@freescale.com>
2015-01-15ENGR00330403-1: ASoC: imx-cs42888: port cs42888 machine driver from imx_3.10.yShengjiu Wang
Port the cs42888 machine driver from imx_3.10.y and do update according to new esai driver and asrc driver. Signed-off-by: Shengjiu Wang <shengjiu.wang@freescale.com>
2015-01-15ENGR00303629-1: ARM: dts: imx6sx-sdb: support NOR Flash SF25FL128SAllen Xu
add Spansion SF25FL128S in sdb dts file. Signed-off-by: Allen Xu <b45815@freescale.com> (cherry picked from commit b7efdb815a9cfb63b39823226316806aced21b33)
2015-01-15ENGR00323263 support accessing two QSPI chips simultaneouslyAllen Xu
Add mutex on QSPI controller layer to support accessing two QSPI chips simultaneously. removed the conflict ddr_io_mode, it's already obsoleted in community code. Signed-off-by: Allen Xu <b45815@freescale.com>
2015-01-15ENGR00319582 iMX6SX: qspi code change to support DSMAllen Xu
add suspend/resume functions and reset qspi controller when resume. Signed-off-by: Allen Xu <b45815@freescale.com> (cherry picked from commit cdea16036e968fe2f1011339dfef476e347fb725)
2015-01-15ENGR00330776 ARM: dts: imx6sl: add dtb support for I2C in branch 3.14.yHaibo Chen
Add I2C1, I2C2, I2C3 bus support for i.MX6sl-evk board in the new branch 3.14.y. Signed-off-by: Haibo Chen <haibo.chen@freescale.com>
2015-01-15ARM: dts: imx6sx: fix the pad setting for uart CTS_BFugang Duan
The current pinfunc define all uart CTS_B IO port for DCE uart 'CTS_B' IP port. Since uart IP port 'CTS_B' is output, and it don't need to set 'SELECT_INPUT' bit. Signed-off-by: Fugang Duan <B38611@freescale.com> Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
2015-01-15ENGR00288351 sabresd_battery: fix usb charger detect when resume back on mx6slRobin Gong
Fix below redundant log after first resume back on mx6slevk: max8903-charger max8903.12: USB Charger Connected It's caused by not add enough prepare for uok&dok which are connected, such as i.MX6SL-EVK. In this case the board only support DC charger detect, so we didn't need judge the uok pin for USB charger detect, although uok share with dok pin. Signed-off-by: Robin Gong <b38343@freescale.com> (cherry picked from commit c5ba4940a72e8124db7ef91a67b337df4e45e3b0)
2015-01-15ENGR00277663-3 power: sabresd_battery: remove check charger offset on mx6slevkRobin Gong
No need check the charger offset on mx6slevk, since there is no adc converter Signed-off-by: Robin Gong <b38343@freescale.com> (cherry picked from commit 7683c62cf2290629f09983744d5a3987a4d64669)
2015-01-15ENGR00275004-4: power: sabresd_battery: add sabresd_battery driverRobin Gong
Add sabresd battery driver which based on Max8903 charger IC. Signed-off-by: Robin Gong <b38343@freescale.com> (cherry picked from commit 19ac2dfcd1e0ea3f1ae231cfc230315eaa9a41be)
2015-01-15ENGR00275004-2 ARM: dts: imx6qdl-sabresd: add max11801_ts deviceRobin Gong
Add max11801_ts device node Signed-off-by: Robin Gong <b38343@freescale.com> (cherry picked from commit 4cd339fc0ddf1d09a819238907e42081de65f353)
2015-01-15ENGR00275004-1 input: touchscreen: max11801_ts: Add DCM mode for max11801 ADCRobin Gong
We need add DCM mode/AUX mode for ADC converter function of max11801, so that it can be used to read voltage of battery. Meanwhile, let the driver based on device tree. The patchset is based on below patch (V3.5.7): commit 4001774cf51f0140ae7e4e8e0ec1d86475790682 Author: Rong Dian <b38775@freescale.com> Date: Fri Jan 18 14:24:28 2013 +0800 Engr00240284-1 MAX11801: Add DCM aux adc sample function 1.Add direct conversion mode operations 2.Add aux adc sample function Signed-off-by: Robin Gong <b38343@freescale.com> (cherry picked from commit 57b11d40431336c28f15a8a67af41907948c42b6)
2015-01-15ENGR00329844-04 ARM: dts: imx6qdl: add uart3 pad set for sabreauto boardFugang Duan
Add imx6qdl-sabreauto board uart3 DTE pad set. To avoid a flood of dts files, there comment out DTE pinctrl set. If user want to test DTE mode, it needs to rebuild the DTB file. (cherry picked from commit dc6028b08c6bd718d57866a1714f3977ba7820d3) Signed-off-by: Fugang Duan <B38611@freescale.com>
2015-01-15ENGR00329844-03 ARM: dts: imx6sl-evk: add uart4 supportFugang Duan
Add uart4 DCE and DTE pinctrl set. Since there have pin confliction, so add new dts file. To avoid a flood of dts files, there comment out DTE pinctrl set. If user want to test DTE mode, it needs to rebuild the DTB file. (cherry picked from commit a3602fa5796bb86ba432474220389ec712bde92a) Signed-off-by: Fugang Duan <B38611@freescale.com>
2015-01-15ENGR00329844-02 ARM: dts: imx6q: add uart5 dte set for sabresd boardFugang Duan
Add uart5 DTE mode pinctrl set for imx6q-sabresd board. Since there have pin confliction, so add new dts file. (cherry picked from commit d63b40d5b1b05992d2328ef0bdc80ec5d96f2dce) Signed-off-by: Fugang Duan <B38611@freescale.com>
2015-01-15ENGR00329844-01 ARM: dts: imx6sx: add uart5 dte pad set for imx6sx-sdb boardFugang Duan
Add imx6sx-sdb baord uart5 DTE pad set. To avoid a flood of dts files, there only comment out DTE pinctrl set. If user want to test DTE mode, it needs to rebuild the DTB file. (cherry picked from commit 4bd6e1654495e190e61a70c9b2c44fda931e2727) Signed-off-by: Fugang Duan <B38611@freescale.com>
2015-01-15ENGR00329865 tty: serial: support IR wake up sourceFugang Duan
Add IR wake up source support. (cherry picked from commit 1076fddcbd025c9685aa3b51f3d9a298a47aa73e) Signed-off-by: Fugang Duan <B38611@freescale.com>
2015-01-15ENGR00322581-04 serial: imx: fix the software flow controlHuang Shijie
Controls the CTS pin when the CTSC bit is negated. CTS has no function when CTSC is asserted. After The CTS pin is low, it needs to enable CTSC. The patch just fix the issue. (cherry picked from commit c6808adc3ccdfa2f3452978b998467d6a21e5b9f) Signed-off-by: Fugang Duan <B38611@freescale.com>
2015-01-15ENGR00322581-03 tty: serial: imx: start rx_dma once RXFIFO is not emptyRobin Gong
Start rx_dma once RXFIFO is not empty that can avoid dma request lost and causes data delay issue. (cherry picked from commit 9271c626e207f9a4578b4696e520253a3bd0ad32) Signed-off-by: Robin Gong <b38343@freescale.com> Signed-off-by: Fugang Duan <B38611@freescale.com>
2015-01-15ENGR00322581-02 tty: serial: imx: add dma sync for dma tx pathFugang Duan
For DMA tx path, there have no sync between prepare the tx BD and dma callback which can ensure tx_wor submit next dma request after the last finished. (cherry picked from commit 945d45c39f2afd98fd82464fee005d1e66807367) Signed-off-by: Fugang Duan <B38611@freescale.com> Signed-off-by: Robin Gong <b38343@freescale.com>
2015-01-15ENGR00322581-01 tty: serial: imx: use workque to increase tx performanceRobin Gong
Use workque to submit tx dma request to increase tx performance. (cherry picked from commit 17c20d9d290deb0dd24caed5c074125b0895bad5) Signed-off-by: Robin Gong <b38343@freescale.com> Signed-off-by: Fugang Duan <B38611@freescale.com>
2015-01-15ENGR00321246 tty: serial: imx: fix wakeup fail after suspend for more than 30sFugang Duan
Before DMA finish, we have to disable flow control, otherwise there have one corner issue like: Flow control enable, RTS always is high while there have no uart terminal connect to imx uart, and then user transmit data by the uart, after some time, TX FIFO is _FULL_, SDMA still don't complete the current transcation, so hold on. There no SDMA interrupt generate, the "dma_wait" event cannot be waked up. (cherry picked from commit a614a7d01705e1db69956913c810b62bc7f0c83e) Signed-off-by: Fugang Duan <B38611@freescale.com>
2015-01-15ENGR00330746 serial: imx: change the wait even to interruptiableHuang Shijie
The wait_event() makes the application hang for ever in the following case: [1] the hardware flow control is enabled. [2] the other end (or the remote end) is terminated, and the TX is still waiting for the hardware flow control signal to become asserted. This patch fixes it by changing the wait_event to wait_event_interruptible. (cherry picked from commit 20300f6396635224959453809b49f84f24c73094) Signed-off-by: Huang Shijie <b32955@freescale.com>
2015-01-15ENGR00318938-2 serial: imx: terminate the RX DMA when the UART is suspendingHuang Shijie
When the uart port is suspending, the RX data is useless. So in this case, we can terminate the RX DMA right now. (cherry picked from commit 49b44d48c6887df2e85ae73481689c5cb0b3a048) Signed-off-by: Huang Shijie <b32955@freescale.com>
2015-01-15ENGR00318938-1 serial: imx: add UART save/restore during DSM enter/exitAnson Huang
When Mega/Fast mix is off, UART controller will lost power, so need to add save/restore to make it work after resume. (cherry picked from commit 1303148939b5c7e746490b65c855b3cc6e770d56) Signed-off-by: Anson Huang <b20788@freescale.com> Signed-off-by: Huang Shijie <b32955@freescale.com>
2015-01-15ENGR00329948-3: dma: imx-sdma: Add hdmi audio support in sdmaShengjiu Wang
There's a missing script for hdmi audio support in current sdma driver, thus add it. This HDMI script doesn't use bd to copy memory like a normal one does but only to update the memory address for HDMI internal AHB DMA and then trigger its procedure automatically. Signed-off-by: Shengjiu Wang <shengjiu.wang@freescale.com>
2015-01-15ENGR00329948-2: dma: imx-sdma: Add device to device supportShengjiu Wang
This patch adds DEV_TO_DEV support for i.MX SDMA driver to support data tranfer between two peripheral FIFOs. The per_2_per script requires two peripheral addresses and two DMA requests, a bit different from the other scripts. Signed-off-by: Shengjiu Wang <shengjiu.wang@freescale.com>
2015-01-15ENGR00329948-1: firmware: imx: add latest sdma scriptShengjiu Wang
This is V3 version sdma firmware, which add support for qspi and canfd. Another update sdma driver for this new script. Signed-off-by: Shengjiu Wang <shengjiu.wang@freescale.com>
2015-01-15ENGR00330358 ARM: IMX6SL-EVK: PXP-V4L2: add pxp v4l2 support to 3.14 branchFancy Fang
1. Add the 'pxp_v4l2_out' entry to imx6sl-evk.dtb to enable the pxp v4l2 output driver. 2. Correct the backlight device node position in imx6sl-evk.dtb. Signed-off-by: Fancy Fang <chen.fang@freescale.com>
2015-01-15ENGR00330128 ARM: IMX6SL: PXP: add pxp support to 3.14 branchFancy Fang
1. Add pxp related properties to the imx6sl dts to enable this module. 2. Configure the PXP related clocks properly. Signed-off-by: Fancy Fang <chen.fang@freescale.com>
2015-01-15ENGR00330163 ARM: clk-imx6sl: correct the pxp and epdc axi clock selectionsFancy Fang
The parent clocks of IMX6SL_CLK_PXP_AXI_SEL and IMX6SL_CLK_EPDC_AXI_SEL clocks are not the same. So split the epdc_pxp_sels into two different clock selections 'pxp_axi_sels' and 'epdc_axi_sels'. Signed-off-by: Fancy Fang <chen.fang@freescale.com> Signed-off-by: Robby Cai <R63905@freescale.com> Acked-by: Shawn Guo <shawn.guo@freescale.com>
2015-01-15ENGR00329491 ARM: IMX6SX: PXP-V4L2: add pxp v4l2 support to 3.14 branchFancy Fang
1. Add pxp-v4l2 dts support for imx6sx platform. 2. Add v4l2_device to the pxp-v4l2 driver to pass the WARN_ON() check new added in 3.14 kernel. Signed-off-by: Fancy Fang <chen.fang@freescale.com>
2015-01-15ENGR00329352-3 dts: imx6: ocotp register access needs clockDong Aisheng
Without clock, accessing ocotp register will cause system hang. So define the clock here in device tree for driver to use. Signed-off-by: Dong Aisheng <b29396@freescale.com> (cherry picked from commit fa8e45c7c9865d78480043db87eba55a301edd8f)
2015-01-15ENGR00329352-2 doc: syscon: add clocks as optional propertyDong Aisheng
User can specify clocks in devicetree which is used for accessing the registers in this regmap. Signed-off-by: Dong Aisheng <b29396@freescale.com> (cherry picked from commit da7e2a7123dfab6e7ad23e4db072ef4611a2b6cd)
2015-01-15ENGR00329352-1 regmap: regmap-mmio: make clk_id optionally when getting clockDong Aisheng
According to clock framework, the clk_id could be NULL when getting clock. But current code relies on a non null clk_id to get clock. Changing the code to allow a null clk_id to get clock to make it more reasonable to use. And the regmap_mmio_gen_context will try to get clock by default but ignore error if not finding the clock in case some regmap access not reply on a specific clock. Signed-off-by: Dong Aisheng <b29396@freescale.com> (cherry picked from commit e94692d02c66c87c246af3b7c311d02a2d04c739)
2015-01-15ENGR00320355 dts: imx6: mmc index fixed by controller orderDong Aisheng
Make the linux mmc index to be fixed according to controller order. This can make user easily to identify which mmcX corresponding to which controller and kernel be able find the rootfs in a card plugged in a specific slot persistently. This is a eventually solution for finding mmc block devices correctly for different cards on multi slots. Signed-off-by: Dong Aisheng <b29396@freescale.com> (cherry picked from commit f53ed08c6af46fc46a244cf3f5f0b639cd41bd16)
2015-01-15mmc: Allow setting slot index via devicetree aliasSascha Hauer
As with gpio, uart and others, allow specifying the name_idx via the aliases-node in the devicetree. On embedded devices, there is often a combination of removable (e.g. SD card) and non-removable mmc devices (e.g. eMMC). Therefore the name_idx might change depending on - host of removable device - removable card present or not This makes it difficult to hard code the root device, if it is on the non-removable device. E.g. if SD card is present eMMC will be mmcblk1, if SD card is not present at boot, eMMC will be mmcblk0. If the aliases-node is not found, the driver will act as before. The original patch is from here: https://www.mail-archive.com/linux-mmc@vger.kernel.org/msg26472.html The patch requires additional alias_id fix or it won't work. Because according to function definition the max_idx parameter of idx_alloc is exclusive, so need add 1 or it will be unable to find the proper idx within an invalid range. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> Signed-off-by: Dong Aisheng <b29396@freescale.com> (cherry picked from commit 35928d6c6a76a24a16edfa636f4c08293614a1e0)
2015-01-15of: Add helper for getting the maximum alias index for a stemSascha Hauer
of_alias_max_index will return the maximum number for which an alias of a given stem exists. This is useful for frameworks whishing to reserve a number of device slots from dynamic allocation. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> (cherry picked from commit 5ce2ad39b36fd48b9f77249198655da7cbcc7ee5)
2015-01-15ENGR00323682 MMC: Fixed boot_config overwritten by switch partitionYe.Li
In MMC driver, two variables: boot_config and part_config are used to keep eCSD(179) PARTITION_CONFIG. The part_config is not updated when set new boot_config, which causes the eCSD(179) is overwritten by any following partition switching, so the new boot_config is lost. Signed-off-by: Ye.Li <B37916@freescale.com> (cherry picked from commit e66d21ade29855299ce048c97830a4bb79373761)
2015-01-15ENGR00329475-5 ARM: imx: make sure OCOTP clk is enabled in MSLAnson Huang
As some modules need to access ocotp in MSL, so we need to make sure it is enabled during MSL, after kernel boot up, clk dirver will disable it in late init. Signed-off-by: Anson Huang <b20788@freescale.com>
2015-01-15ENGR00329475-4 ARM: imx: support perclk and uart clk parent to OSC on i.mx6sxAnson Huang
change perclk parent to OSC instead of IPG, as IPG clock may be changed by busfreq. when kernel command line has "uart_from_osc" defined, uart clk will select OSC as its parent, this is to make PLL3 be able to be off for low power purpose, as we need all PLLs off in low power idle mode. Signed-off-by: Anson Huang <b20788@freescale.com>
2015-01-15ENGR00329475-3 ARM: imx: enable CONFIG_DEBUG_FS by defaultAnson Huang
enable CONFIG_DEBUG_FS by default for kernel debugging. Signed-off-by: Anson Huang <b20788@freescale.com>
2015-01-15ENGR00329475-2 ARM: imx: correct gpu2d_axi and gpu3d_axi clock settingAnson Huang
On i.MX6Q, gpu2d_axi and gpu3d_axi are either from AXI or AHB clock, but on i.MX6DL, gpu2d_axi and gpu3d_axi are from mmdc_ch0_axi_podf, and they can NOT be gated by mmdc_ch0_axi 's clock gate, the mux option register field(CCM_CBCMR) is marked as "Reserved" now on i.MX6DL RM, so correct these two clks setting. Signed-off-by: Anson Huang <b20788@freescale.com>
2015-01-15ENGR00329475-1 ARM: dts: imx6sx-sdb: add gpio key supportAnson Huang
This patch adds support for imx6sx-sdb board's gpio keys: SW4(FUNC1): KEY_VOLUMEUP SW5(FUNC2): KEY_VOLUMEDOWN Signed-off-by: Anson Huang <b20788@freescale.com>
2015-01-15clk: Support for clock parents and rates assigned from device treeSylwester Nawrocki
This patch adds helper functions to configure clock parents and rates as specified through 'assigned-clock-parents', 'assigned-clock-rates' DT properties for a clock provider or clock consumer device. The helpers are now being called by the bus code for the platform, I2C and SPI busses, before the driver probing and also in the clock core after registration of a clock provider. Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com> Acked-by: Kyungmin Park <kyungmin.park@samsung.com> Signed-off-by: Mike Turquette <mturquette@linaro.org> [shawn.guo: cherry-pick commit 86be408bfbd8 from upstream] Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
2015-01-15clk: Add of_clk_get_by_clkspec() helperSylwester Nawrocki
This patch adds of_clk_get_by_clkspec() helper function, which does only a struct clk lookup from the clock providers. It is used in the subsequent patch where parsing of a clock from device tree and the lookup from providers needed to be split. Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com> Signed-off-by: Mike Turquette <mturquette@linaro.org> [shawn.guo: cherry-pick commit 7f05e28f9dd3 from upstream] Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
generated by cgit v1.2.3 (git 2.0.4) at 2025-01-21 14:05:21 +0000