summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2015-06-04ARM: dts: add sysmmu nodes for exynos4Marek Szyprowski
This patch adds System MMU nodes that are specific to Exynos4210/4x12 series. Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com> Acked-by: Krzysztof Kozlowski <k.kozlowski@samsung.com> Signed-off-by: Kukjin Kim <kgene@kernel.org>
2015-06-03drm/amdkfd: fix topology bug with capability attr.Alexey Skidanov
This patch fixes a bug where the number of watch points was shown before it was actually calculated Signed-off-by: Alexey Skidanov <Alexey.Skidanov@amd.com> Cc: stable@vger.kernel.org Signed-off-by: Oded Gabbay <oded.gabbay@gmail.com>
2015-06-03lib: Clarify the return value of strnlen_user()Jan Kara
strnlen_user() can return a number in a range 0 to count + sizeof(unsigned long) - 1. Clarify the comment at the top of the function so that users don't think the function returns at most count+1. Signed-off-by: Jan Kara <jack@suse.cz> [ Also added commentary about preferably not using this function ] Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2015-06-03ALSA: usb-audio: fix missing input volume controls in MAYA44 USB(+)Clemens Ladisch
The driver worked around an error in the MAYA44 USB(+)'s mixer unit descriptor by aborting before parsing the missing field. However, aborting parsing too early prevented parsing of the other units connected to this unit, so the capture mixer controls would be missing. Fix this by moving the check for this descriptor error after the parsing of the unit's input pins. Reported-by: nightmixes <nightmixes@gmail.com> Tested-by: nightmixes <nightmixes@gmail.com> Signed-off-by: Clemens Ladisch <clemens@ladisch.de> Cc: <stable@vger.kernel.org> Signed-off-by: Takashi Iwai <tiwai@suse.de>
2015-06-03ALSA: usb-audio: add MAYA44 USB+ mixer control namesClemens Ladisch
Add mixer control names for the ESI Maya44 USB+ (which appears to be identical width the AudioTrak Maya44 USB). Reported-by: nightmixes <nightmixes@gmail.com> Signed-off-by: Clemens Ladisch <clemens@ladisch.de> Cc: <stable@vger.kernel.org> Signed-off-by: Takashi Iwai <tiwai@suse.de>
2015-06-03ARM: dts: imx6dl: add imx6dl gpt specific compatible stringShawn Guo
The i.MX6DL/S GPT has a different programming model from i.MX6Q one. Add the compatible string "fsl,imx6dl-gpt" for it, and leave "fsl,imx6q-gpt" there to keep the existing/old kernel happy. Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
2015-06-03MIPS: Avoid an FPE exception in FCSR mask probingMaciej W. Rozycki
Use the default FCSR value in mask probing, avoiding an FPE exception where reset has left any exception enable and their corresponding cause bits set and the register is then rewritten with these bits active. Signed-off-by: Maciej W. Rozycki <macro@linux-mips.org> Cc: Joshua Kinard <kumba@gentoo.org> Cc: linux-mips@linux-mips.org Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
2015-06-03ARM: dts: imx6: add DT for aristainetos2 boardHeiko Schocher
This patch adds support for the imx6dl based aristainetos2 board with following configuration: CPU: Freescale i.MX6DL rev1.1 at 792 MHz MReset cause: POR MBoard: aristaitenos2 DRAM: 1 GiB NAND: 1024 MiB MMC: FSL_SDHC: 0, FSL_SDHC: 1 SF: Detected N25Q128A with page size 256 Bytes, erase size 64 KiB, total 16 MiB Display: lb07wv8 (800x480) As this board can be used with 2 different display types, the differences between them are extracted into 2 DTS files, and the common settings are collected in a common file. Signed-off-by: Heiko Schocher <hs@denx.de> Reviewed-by: Philipp Zabel <p.zabel@pengutronix.de>
2015-06-03ARM: dts: cubox-i/hummingboard: Fix the license textFabio Estevam
Arrange the license text a bit to make it clear. Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Acked-by: Russell King <rmk+kernel@arm.linux.org.uk> Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
2015-06-03ARM: dts: sabrelite: use simple-panel instead of display-timings for LVDS0Eric Nelson
Also add label for backlight_lvds and connect it to the LVDS display. Signed-off-by: Eric Nelson <eric.nelson@boundarydevices.com> Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
2015-06-03ARM: dts: nitrogen6x: use simple-panel instead of display-timings for LVDS0Eric Nelson
Also add label for backlight_lvds and connect it to the display. Signed-off-by: Eric Nelson <eric.nelson@boundarydevices.com> Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
2015-06-03ARM: dts: add imx7d-sdb supportFrank Li
add imx7d sdb board support Signed-off-by: Frank Li <Frank.Li@freescale.com> Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
2015-06-03ARM: dts: add imx7d soc dtsi fileFrank Li
imx7d intergrates the unique display controller for EPD panel, pixel engines and graphics engines to make it a ideal solution for EPD based devices such as eReader, Signage, as well as any application rely on the bistable charactersic of the EPD panel. imx7d include two ARM Cortex A7 Core and one Cortex-M4 core. Included Main Peripheral - DDR3\LP-DDR2 - GPMI\BCH\APBH DMA(NAND flash support) - QSPI - WEIM Nor - LCDIF\MIPI DSI - CSI\MIPI CSI - EPDC - PCIe RC\EP - USB OTG\Host - CAN x2 - I2C x4 - SIMv2 x2 - ENET -x2 - uSDHC x3 - eCSPI x1 - PWM x4 - OCOTP (fuse) - GPT x4 - WDOG x4 - Flex Timer x2 Signed-off-by: Anson Huang <b20788@freescale.com> Signed-off-by: Frank Li <Frank.Li@freescale.com> Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
2015-06-03ARM: dts: Armadeus Systems APF6 family support (i.MX6)Sébastien Szymanski
Add support to the Armadeus Systems APF6 Solo / Dual / Quad SoM and the Armadeus Systems APF6Dev carrier board. For more details see: http://www.armadeus.com/english/products-processor_boards-apf6.html http://www.armadeus.com/english/products-development_boards-apf6_dev.html Signed-off-by: Sébastien Szymanski <sebastien.szymanski@armadeus.com> Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
2015-06-03ARM: dts: vf610: Nomenclature fixup for PTC12 pin used in RMII mode.Cory Tusar
This commit includes a minor nomenclature fixup for boards based on the Freescale VF610 SoC and which make use of the alternate "RMII1_RXD1" functionality for pin PTC12. This brings the macro name in-line with both the datasheet and other similar macros. Signed-off-by: Cory Tusar <cory.tusar@pid1solutions.com> Acked-by: Stefan Agner <stefan@agner.ch> Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
2015-06-03ARM: dts: cubox-i: add support for Broadcom Wifi/Bluetooth devicesFabio Estevam
Add DT support for the Broadcom Wifi/Bluetooth devices found on the microsom board. [Modified original Russell King's patch to use mmc-pwrseq] Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Tested-by: Jon Nettleton <jon@solid-run.com> Tested-by: Russell King <rmk+kernel@arm.linux.org.uk> Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
2015-06-03Document: dt: binding: imx: update document for imx7d supportFrank Li
This part just add necessary change to boot imx7d. Update clock, pinctrl and gpt for imx7d Signed-off-by: Frank Li <Frank.Li@freescale.com> Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
2015-06-03ARM: dts: imx6qdl: Add power-domain phandle to CODA device nodePhilipp Zabel
The CODA960 VPU is part of the PU power domain. Add power-domains phandle so it can be associated with the PU generic pm domain for power gating. Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de> Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
2015-06-03ARM: dts: Gateworks GW5510 support (i.MX6)Tim Harvey
Add support for the Gateworks GW5510 board featuring: * i.MX6 SoC * up to 512MB DDR3 * up to 2GB NAND flash * 1x miniPCIe socket (with USB) * HDMI out (micro-HDMI) * HDMI in (micro-HDMI) (currently supported by only vendor kernel) * TTL level I/O (supported by GW16111 breakout board): * I2C * 2x UART * CAN * 2x DIO (GPIO/PWM) * USB OTG For more details see: http://www.gateworks.com/product/item/ventana-gw5510-single-board-computer Signed-off-by: Tim Harvey <tharvey@gateworks.com> Reviewed-by: Fabio Estevam <fabio.estevam@freescale.com> Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
2015-06-03ARM: dts: imx6sl-warp: Fix OTG rolesFabio Estevam
USBOTG1 always work on peripheral mode and USBOTG in host mode, so fix their roles accordingly. Tested by mounting the MMC card as a storage device: modprobe g_mass_storage file=/dev/mmcblk0p2 Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Acked-by: Otavio Salvador <otavio@ossystems.com.br> Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
2015-06-03ARM: dts: imx6sl-warp: Remove USB regulatorsFabio Estevam
According to the warp schematics there are no regulators for the USB OTG ports, so let's remove them. Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Acked-by: Otavio Salvador <otavio@ossystems.com.br> Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
2015-06-03ARM: dts: imx6sl-warp: Remove unused regulatorFabio Estevam
The 'reg_1p8v' regulator is not used anywhere, so let's remove it. Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Acked-by: Otavio Salvador <otavio@ossystems.com.br> Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
2015-06-03ARM: dts: add pinfunc include file to support imx7dFrank Li
Addi i.MX7D support: pinfunc part except GPIO1 Signed-off-by: Frank Li <Frank.Li@freescale.com> Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
2015-06-03ARM: mxs: fix in tree users of ssd1306Thomas Niederprüm
This patch updates the in tree-users of the SSD1306 controller for using the newly introduced DT properties. Signed-off-by: Thomas Niederprüm <niederp@physik.uni-kl.de> Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
2015-06-03ARM: dts: imx6qdl-hummingboard: Add PCIe supportFabio Estevam
Add PCIe support. Based on a patch from Rabeeh Khoury from the solid-run tree. Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
2015-06-03ARM: dts: imx23-olinuxino: Add i2c supportHarald Geyer
The imx23-olinuxino board has an i2c interface exposed on UEXT connector. This patch enables i2c and selects the pin group used on UEXT connector. Tested with MOD-LCD1x9 from Olimex. This patch is based on work by Fadil Berisha with his permission. However all bugs are mine. Signed-off-by: Harald Geyer <harald@ccbib.org> Acked-by: Stefan Wahren <stefan.wahren@i2se.com> Acked-by: Marek Vasut <marex@denx.de> Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
2015-06-03ARM: dts: imx23: Add i2c supportHarald Geyer
The imx23-olinuxino board has an i2c interface exposed on UEXT connector. This patch provides the generic devicetree infrastructure for a follow-up patch to add support to the actual board files. Tested all three possible pin groups with MOD-LCD1x9 from Olimex. This patch is based on work by Fadil Berisha with his permission. However all bugs are mine. Signed-off-by: Harald Geyer <harald@ccbib.org> Acked-by: Stefan Wahren <stefan.wahren@i2se.com> Acked-by: Marek Vasut <marex@denx.de> Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
2015-06-03ARM: dts: hummingboard: Remove unneeded 'fsl,mode' propertyFabio Estevam
imx6qdl-hummingboard boards use sgtl5000 codec and the machine file (imx-sgtl5000) already sets SSI in slave mode and codec in master mode, so there is no need for having the 'fsl,mode' property. Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
2015-06-03ARM: dts: imx6qdl: move HDMI controller to right location in DTLucas Stach
Currently the HDMI controller is a child device of the AIPS bus in the DT which is clearly wrong. Move it to the right location. This introduces no functional change it just aligns the DT representation with reality. Signed-off-by: Lucas Stach <l.stach@pengutronix.de> Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
2015-06-03ARM: imx: imx7d requires anatopArnd Bergmann
Like i.MX6, the i.MX7 code calls into the anatop driver, which fails if that is disabled: arch/arm/mach-imx/built-in.o: In function `imx7d_init_machine': arch/arm/mach-imx/mach-imx7d.c:24: undefined reference to `imx_anatop_init' arch/arm/mach-imx/built-in.o: In function `imx7d_init_irq': arch/arm/mach-imx/mach-imx7d.c:29: undefined reference to `imx_init_revision_from_anatop' This patch ensures that for an imx7-only build, we still get anatop built-in, matching what we do for imx6. We also need to select HAVE_IMX_MMDC, as that is needed by the anatop code. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
2015-06-03clocksource: timer-imx-gpt: remove include of <asm/mach/time.h>Shawn Guo
The include of <asm/mach/time.h> is not needed at all, and causes build error in some cases. Remove it. Reported-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Shawn Guo <shawn.guo@linaro.org> Acked-by: Daniel Lezcano <daniel.lezcano@linaro.org>
2015-06-03ARM: imx: move timer driver into drivers/clocksourceShawn Guo
After the cleanup on imx timer driver, now it's ready to be moved into drivers/clocksource/. Let's do it. Signed-off-by: Shawn Guo <shawn.guo@linaro.org> Acked-by: Daniel Lezcano <daniel.lezcano@linaro.org>
2015-06-03ARM: imx: remove platform headers from timer driverShawn Guo
With the cleanup done before, the platform specific headers now can be removed. Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
2015-06-03ARM: imx: provide gpt device specific irq functionsShawn Guo
It splits irq enable/disable/acknowledge operations into device specific functions as the hooks in imx_gpt_data, so that we can save the use of timer_is_xxx() and cpu_is_xxx() checking in these irq functions. Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
2015-06-03ARM: imx: get rid of variable timer_baseShawn Guo
We now have pointer to imx_timer structure available where timer base address is needed, so we can just kill global timer_base by using imxtm->base instead. Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
2015-06-03ARM: imx: define gpt register offset per device typeShawn Guo
It defines offset of gpt registers TSTAT, TCN and TCMP per device type in imx_gpt_data, so that these registers can be accessed in an way without timer_is_v2() checking. Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
2015-06-03ARM: imx: move clock event variables into imx_timerShawn Guo
Since we now have imx_timer structure, it makes more sense to move those clock event related variables into the structure, so that we can save some global variables. Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
2015-06-03ARM: imx: set up .set_next_event hook via imx_gpt_dataShawn Guo
Set up .set_next_event hook via imx_gpt_data, so that we can save the use of timer_is_v2(). Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
2015-06-03ARM: imx: setup tctl register in device specific functionShawn Guo
It creates a gpt device speicific data structure and adds function hook gpt_setup_tctl in there to set up gpt TCTL register. Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
2015-06-03ARM: imx: initialize gpt device type for DT bootShawn Guo
Use different initialization function in CLOCKSOURCE_OF_DECLARE() to initialize gpt device type for DT boot. Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
2015-06-03ARM: imx: define an enum for gpt timer device typeShawn Guo
Define an enum for gpt timer device type in include/soc/imx/timer.h to tell the gpt block differences among SoCs. Update non-DT users (clock drivers) to pass the device type. As we now have include/soc/imx/timer.h, the declaration of mxc_timer_init() is moved into there as the best fit. Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
2015-06-03ARM: imx: move timer resources into a structureShawn Guo
Instead of passing around as individual argument, let's move timer resources like irq and clocks together with base address into a data structure, and pass pointer of the structure as argument to simplify the function call interface. Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
2015-06-03ARM: imx: use relaxed IO accessor in timer driverShawn Guo
Replace the __raw_readl/__raw_writel with readl_relaxed/writel_relaxed which is endian-safe, as a step of moving the driver code into folder drivers/clocksource. Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
2015-06-03ARM: imx: make imx51/3 suspend optionalArnd Bergmann
A recent change to the imx53 power management caused a build regression when CONFIG_SOC_IMX53 is disabled: mach-imx/built-in.o:(.init.rodata+0x60): undefined reference to `imx53_suspend' mach-imx/built-in.o:(.init.rodata+0x64): undefined reference to `imx53_suspend_sz' This avoids the problem by compiling the code in question conditionally on the presence of CONFIG_SOC_IMX53. For consistency, I'm also changing the same thing for CONFIG_SOC_IMX51. An additional benefit of this approach is reduced code size for kernels that only include support for one of the two SoCs. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Fixes: 1579c7b9fe01 ("ARM: imx53: Set DDR pins to high impedance when in suspend to RAM.") Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
2015-06-03ARM: clk-imx6q: refine sata's parentSébastien Szymanski
According to IMX6D/Q RM, table 18-3, sata clock's parent is ahb, not ipg. Signed-off-by: Sébastien Szymanski <sebastien.szymanski@armadeus.com> Reviewed-by: Fabio Estevam <fabio.estevam@freescale.com> Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
2015-06-03ARM: imx: clk-v610: Add clock for I2C2 and I2C3Mirza Krak
Add support for clock gating of I2C2 and I2C3. We use I2C2 in a (not yet mainlined) device tree. Signed-off-by: Mirza Krak <mirza.krak@hostmobility.com> Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
2015-06-03ARM: mach-imx: iomux-imx31: Use DECLARE_BITMAPJoe Perches
Use the generic mechanism to declare a bitmap instead of unsigned long. Signed-off-by: Joe Perches <joe@perches.com> Acked-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
2015-06-03ARM: imx: add imx7d clk tree supportFrank Li
Add i.MX7D clk tree support. Enable all clock to bring up imx7. Clock framework need be modified a little since imx7d change clock design. otherwise system will halt and block the other part upstream. All clock refine need wait for Dong Aisheng's patch clk: support clocks which requires parent clock on during operation Or other solution ready. Signed-off-by: Anson Huang <b20788@freescale.com> Signed-off-by: Adrian Alonso <aalonso@freescale.com> Signed-off-by: Frank Li <Frank.Li@freescale.com> Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
2015-06-03ARM: clk: imx: update pllv3 to support imx7Frank Li
Add type IMX_PLLV3_ENET_IMX7 Signed-off-by: Frank Li <Frank.Li@freescale.com> Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
2015-06-03ARM: imx: clk-vf610: enable debug access port by defaultStefan Agner
Enabled DAP (debug access port) by default. This enables the hw- breakpoint framework to make use of the breakpoints and watchpoints supported by hardware. [ 0.215805] hw-breakpoint: found 2 (+1 reserved) breakpoint and 1 watchpoint registers. [ 0.224624] hw-breakpoint: maximum watchpoint size is 4 bytes. Without this clock, the hw-breakpoint driver claims an undefined instruction during initialization: [ 0.227380] hw-breakpoint: Debug register access (0xee003e17) caused undefined instruction on CPU 0 [ 0.227519] hw-breakpoint: CPU 0 failed to disable vector catch Signed-off-by: Stefan Agner <stefan@agner.ch> Signed-off-by: Shawn Guo <shawn.guo@linaro.org>