Commit graph

448532 commits

Author SHA1 Message Date
Matwey V. Kornilov
7751b6fb05 usb: musb: tusb6010: Use musb->tusb_revision instead of tusb_get_revision call.
The value of the revision is stored in musb->tusb_revision,
so don't re-read it every time.
Exporting tusb_get_revision is not needed anymore,
so the dependency loop between tusb6010 and tusb6010_omap is resolved.

Signed-off-by: Matwey V. Kornilov <matwey@sai.msu.ru>
Signed-off-by: Felipe Balbi <balbi@ti.com>
2014-05-16 12:16:31 -05:00
Matwey V. Kornilov
8c240dc17d usb: musb: tusb6010: Add tusb_revision to struct musb to store the revision.
Add field to store tusb6010 revision value. Read the revision at
the startup and store to the variable.

Signed-off-by: Matwey V. Kornilov <matwey@sai.msu.ru>
Signed-off-by: Felipe Balbi <balbi@ti.com>
2014-05-16 12:14:55 -05:00
Mark Salter
4797ec2dc8 arm64: fix pud_huge() for 2-level pagetables
The following happens when trying to run a kvm guest on a kernel
configured for 64k pages. This doesn't happen with 4k pages:

  BUG: failure at include/linux/mm.h:297/put_page_testzero()!
  Kernel panic - not syncing: BUG!
  CPU: 2 PID: 4228 Comm: qemu-system-aar Tainted: GF            3.13.0-0.rc7.31.sa2.k32v1.aarch64.debug #1
  Call trace:
  [<fffffe0000096034>] dump_backtrace+0x0/0x16c
  [<fffffe00000961b4>] show_stack+0x14/0x1c
  [<fffffe000066e648>] dump_stack+0x84/0xb0
  [<fffffe0000668678>] panic+0xf4/0x220
  [<fffffe000018ec78>] free_reserved_area+0x0/0x110
  [<fffffe000018edd8>] free_pages+0x50/0x88
  [<fffffe00000a759c>] kvm_free_stage2_pgd+0x30/0x40
  [<fffffe00000a5354>] kvm_arch_destroy_vm+0x18/0x44
  [<fffffe00000a1854>] kvm_put_kvm+0xf0/0x184
  [<fffffe00000a1938>] kvm_vm_release+0x10/0x1c
  [<fffffe00001edc1c>] __fput+0xb0/0x288
  [<fffffe00001ede4c>] ____fput+0xc/0x14
  [<fffffe00000d5a2c>] task_work_run+0xa8/0x11c
  [<fffffe0000095c14>] do_notify_resume+0x54/0x58

In arch/arm/kvm/mmu.c:unmap_range(), we end up doing an extra put_page()
on the stage2 pgd which leads to the BUG in put_page_testzero(). This
happens because a pud_huge() test in unmap_range() returns true when it
should always be false with 2-level pages tables used by 64k pages.
This patch removes support for huge puds if 2-level pagetables are
being used.

Signed-off-by: Mark Salter <msalter@redhat.com>
[catalin.marinas@arm.com: removed #ifndef around PUD_SIZE check]
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Cc: <stable@vger.kernel.org> # v3.11+
2014-05-16 17:34:40 +01:00
Stephen Boyd
2b2c934fcb ARM: config: Add qcom_defconfig
Add a defconfig for mach-qcom platforms (copied from msm_defconfig).
Although these platforms are part of the multi-platform kernel, it's
useful to have a stripped down version of the defconfig that just
selects the DT based Qualcomm platforms and drivers.

Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
Signed-off-by: Kumar Gala <galak@codeaurora.org>
2014-05-16 11:16:11 -05:00
abdoulaye berthe
1aeede0b3c gpio: gpioep93xx: use devm functions
This uses devm functions for mem allocation

Signed-off-by: abdoulaye berthe <berthe.ab@gmail.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
2014-05-16 17:52:38 +02:00
abdoulaye berthe
ae28193e01 gpio: janzttl: use devm function
This uses dem function for mem allocation

Signed-off-by: abdoulaye berthe <berthe.ab@gmail.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
2014-05-16 17:52:37 +02:00
abdoulaye berthe
0ed3398ed8 gpio: timberdale: use devm functions
This eases memory allocation and provides appropriate logging.

Signed-off-by: abdoulaye berthe <berthe.ab@gmail.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
2014-05-16 17:52:37 +02:00
abdoulaye berthe
a435e1802b gpio: bt8xx: use devm function for memory allocation
Signed-off-by: abdoulaye berthe <berthe.ab@gmail.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
2014-05-16 17:52:36 +02:00
Arnd Bergmann
cdf86cd233 gpio: include linux/bug.h in interface header
Today's linux-next kernel started showing build errors for the
use of WARN_ON in linux/gpio/consumer.h:

In file included from drivers/video/backlight/pwm_bl.c:13:0:
include/linux/gpio/consumer.h: In function 'gpiod_put':
include/linux/gpio/consumer.h:81:2: error: implicit declaration of function 'WARN_ON' [-Werror=implicit-function-declaration]

It's not clear why this never happened before, but this patch
fixes it by including the header that contains the defintion
of this macro.

Signed-off-by: Arnd Bergmann <arnd@arnd.de>
Acked-by: Alexandre Courbot <acourbot@nvidia.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
2014-05-16 17:52:36 +02:00
Rajendra Nayak
345477ffe2 gpio: omap: prepare and unprepare the debounce clock
Replace the clk_enable()s with a clk_prepare_enable() and
the clk_disables()s with a clk_disable_unprepare()

This never showed issues due to the OMAP platform code (hwmod)
leaving these clocks in clk_prepare()ed state by default.

Reported-by: Kishon Vijay Abraham I <kishon@ti.com>
Signed-off-by: Rajendra Nayak <rnayak@ti.com>
Acked-by: Javier Martinez Canillas <javier@dowhile0.org>
Acked-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
Cc: Kevin Hilman <khilman@deeprootsystems.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
2014-05-16 17:52:35 +02:00
Ming Lei
0c29e93eae virtio_blk: fix race between start and stop queue
When there isn't enough vring descriptor for adding to vq,
blk-mq will be put as stopped state until some of pending
descriptors are completed & freed.

Unfortunately, the vq's interrupt may come just before
blk-mq's BLK_MQ_S_STOPPED flag is set, so the blk-mq will
still be kept as stopped even though lots of descriptors
are completed and freed in the interrupt handler. The worst
case is that all pending descriptors are freed in the
interrupt handler, and the queue is kept as stopped forever.

This patch fixes the problem by starting/stopping blk-mq
with holding vq_lock.

Cc: Jens Axboe <axboe@kernel.dk>
Cc: Rusty Russell <rusty@rustcorp.com.au>
Signed-off-by: Ming Lei <tom.leiming@gmail.com>
Signed-off-by: Jens Axboe <axboe@fb.com>
2014-05-16 09:40:31 -06:00
Fabio Estevam
c6f0b878f9 ARM: dts: imx35-pdk: Fix memory region description
On imx35pdk there are two DRAM chip selects that are used:

CS0 at 0x80000000
CS1 at 0x90000000

Each bank is connected to 128MB of DRAM, giving a total of 256MB of system DRAM.

Fix the memory layout to describe the hardware appropriately.

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
2014-05-16 23:02:13 +08:00
Fabio Estevam
75416cfebc ARM: dts: imx51-eukrea-mbimxsd51-baseboard: Add CAN support
Add support for CAN based on a MCP2515 connected to ECSPI1.

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Reviewed-by: Eric Bénard <eric@eukrea.com>
Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
2014-05-16 23:02:12 +08:00
Iain Paton
ec55b15087 ARM: dts: imx6: add new board RIoTboard
add element14s RIoTboard http://www.riotboard.org which is an i.MX6Solo
based design targeted at makers.

Signed-off-by: Iain Paton<ipaton0@gmail.com>
Reviewed-by: Fabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
2014-05-16 23:02:12 +08:00
Iain Paton
b92d776392 ARM: dts: imx6: i2c4 cleanup
add missing i2c4 clock and correct the compatible string to match other
imx6 i2c blocks

Signed-off-by: Iain Paton<ipaton0@gmail.com>
Reviewed-by: Fabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
2014-05-16 23:02:12 +08:00
Silvio Fricke
e59d28e896 ARM: dts: imx6: edmqmx6: add vcc and vio power supplies to stmpe
Signed-off-by: Silvio Fricke <silvio.fricke@gmail.com>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
2014-05-16 23:02:11 +08:00
Sascha Hauer
1885e5de30 ARM: dts: Karo TX25: use hardware ecc
We should use hardware ecc on i.MX. While at it, add the optional
nand-bus-width property.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Acked-by: Lothar Waßmann <LW@KARO-electronics.de>
Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
2014-05-16 23:02:11 +08:00
Sascha Hauer
974e587201 ARM: dts: Karo TX25: Add phy reset gpio and supply for FEC
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Acked-by: Lothar Waßmann <LW@KARO-electronics.de>
Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
2014-05-16 23:02:11 +08:00
Sascha Hauer
8d69043d99 ARM: dts: Karo TX25: Add pinctrl nodes
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Acked-by: Lothar Waßmann <LW@KARO-electronics.de>
Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
2014-05-16 23:02:10 +08:00
Sascha Hauer
41707314e7 ARM: dts: i.MX25: Add IRAM node
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
2014-05-16 23:02:10 +08:00
Sascha Hauer
9e3a424b8a ARM: dts: i.MX25: Add mmc aliases
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
2014-05-16 23:02:10 +08:00
Sascha Hauer
c73dbd7111 ARM: dts: i.MX51 babbage: Fix FEC pad ctrl settings
The dts relied on the FEC pad ctrl settings from the bootloader by
using the NO_PAD_CTRL option. This breaks once the bootloader starts
initializing the pad ctrl settings from the same dts file. Change
to real pad ctrl settings taken from the platform based babbage
support.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
2014-05-16 23:02:09 +08:00
Fabio Estevam
e02ab39a2e ARM: dts: imx6qdl-sabresd: Add USDHC4 support
USDHC4 is connected to a DDR MMC. Add support for it.

Signed-off-by: Dong Aisheng <b29396@freescale.com>
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
2014-05-16 23:02:09 +08:00
Russell King
f34d0d5dd8 ARM: imx: add HDMI support for SolidRun HummingBoard and Cubox-i
Add the HDMI DT configuration for the SolidRun HummingBoard and Cubox-i.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
2014-05-16 23:02:08 +08:00
Lucas Stach
819826a158 ARM: dts: imx6: edmqmx6: add SPI bus and flash
Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
2014-05-16 23:02:08 +08:00
Lucas Stach
d02f74aa75 ARM: dts: imx6: edmqmx6: add pinctrl for pfuze irq gpio
Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
2014-05-16 23:02:08 +08:00
Fabio Estevam
dbfcaed6f0 ARM: dts: imx6q-udoo: Add HDMI support
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
2014-05-16 23:02:07 +08:00
Sascha Hauer
48f5196364 ARM: dts: Add stdout-path property to i.MX boards
This adds the stdout-path property to various i.MX boards. Values
of the property have been taken from barebox, so they should be
correct. Also, the older linux,stdout-path property is converted
to stdout-path.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
2014-05-16 23:02:07 +08:00
Tim Harvey
c5d2fbd0fd ARM: dts: imx: Fix LVDS mapping for Ventana GW52xx
The GW52xx supports LVDS on channel 0. Remove the obsolete crtcs node and
add display timings for the HanStar HSD100PXN1 display.

Signed-off-by: Tim Harvey <tharvey@gateworks.com>
Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
2014-05-16 23:02:07 +08:00
Tim Harvey
b3253241fd ARM: dts: imx: add LVDS backlight for Ventana
The GW54xx/GW53xx/GW52xx all support LVDS with a PWM controlled backlight.

Signed-off-by: Tim Harvey <tharvey@gateworks.com>
Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
2014-05-16 23:02:06 +08:00
Lucas Stach
13d9ab5e87 ARM: dts: imx6qdl-sabresd: remove power-on gpio from pcie
This isn't compatible with the new binding and should be
handled via a proper regulator. It shouldn't be needed as
the driver has always ignored this property.

Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
2014-05-16 23:02:06 +08:00
Lucas Stach
92a7eb7c7e ARM: dts: imx6: update pcie to bring in line with new binding
The new bindings drops one clock, renames the others and
drops the old interrupt mapping.

Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
2014-05-16 23:02:06 +08:00
Fabio Estevam
204d156a81 ARM: dts: imx53-qsb-common: Add TVE support
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
2014-05-16 23:02:05 +08:00
Alexander Shiyan
9af1187393 ARM: dts: imx27-phytec-phycore-rdk: Fix "reg" property for USBH2 PHY
Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
2014-05-16 23:02:05 +08:00
Alexander Shiyan
09e96a896e ARM: dts: imx27-phytec-phycore-rdk: Add CSI enable switch
This patch adds a GPIO fixed regulator which used on RDK to
enable CSI bus.

Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
2014-05-16 23:02:05 +08:00
Alexander Shiyan
388130b07e ARM: dts: imx: Remove excess entries for PMIC
This patch removes excess "#address-cells" and "#size-cells" entries
for PMIC, since these entries is not used.

Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
2014-05-16 23:02:04 +08:00
Alexander Shiyan
4ee927ed6b ARM: dts: imx27-phytec-phycore-som: Disable PM pins for USB OTG
USB PWR and OC pins are used as GPIOs for different purposes,
so add "disable-over-current" property for OTG node to indicate this.

Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
2014-05-16 23:02:04 +08:00
Alexander Shiyan
198e31d08b ARM: dts: imx27-phytec-phycore-som: Fix active level for FEC reset
FEC reset GPIO is active low. Fix this typo.

Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
2014-05-16 23:02:03 +08:00
Alexander Shiyan
560723a549 ARM: dts: imx27-phytec-phycore-rdk: Remove duplicate entries for USB PHY
"compatible", "#address-cells" and "#size-cells" for USB PHY are
already described in the SOM DTS. Remove these duplicate entries.

Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
2014-05-16 23:02:03 +08:00
Tim Harvey
aef15dbaf4 ARM: dts: ventana: Add HDMI support
Configure ddc and enable HDMI

Signed-off-by: Tim Harvey <tharvey@gateworks.com>
Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
2014-05-16 23:02:03 +08:00
Marek Vasut
9d4ebb36a6 ARM: dts: imx6qdl-sabresd: Add PCIe support
Add support for the PCI express bus available on MX6 SabreSDP.

Signed-off-by: Marek Vasut <marex@denx.de>
Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
2014-05-16 23:02:02 +08:00
Fabio Estevam
fed687c526 ARM: dts: imx6qdl-wandboard: Add HDMI support
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
2014-05-16 23:02:02 +08:00
Fabio Estevam
ad704567ff ARM: dts: imx6qdl-sabresd: Add HDMI support
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
2014-05-16 23:02:02 +08:00
Fabio Estevam
f6bd3f3087 ARM: dts: imx27-pdk: Add keypad support
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
2014-05-16 23:02:01 +08:00
Fabio Estevam
b41331eceb ARM: dts: imx27-pdk: Add NAND support
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
2014-05-16 23:02:01 +08:00
Philipp Zabel
126b469677 ARM: dts: imx6q-gk802: Enable HDMI
Signed-off-by: Philipp Zabel <philipp.zabel@gmail.com>
Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
2014-05-16 23:02:01 +08:00
Fabio Estevam
dd860a9a31 ARM: dts: imx27-pdk: Add USB OTG support
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
2014-05-16 23:02:00 +08:00
Fabio Estevam
af38a00378 ARM: dts: imx27: Place the usb phy nodes in the board dts files
It is not a good approach to have the USB PHY nodes inside imx27.dtsi since
the USB PHYs on mx27 are not internal to the SoC.

Place the USB PHY nodes in the board dts files instead.

Also, each board may have a different clock source for the USB PHY, so do not
hardcode it.

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
2014-05-16 23:02:00 +08:00
Fabio Estevam
b67b19447e ARM: dts: imx27: Use the correct usb clock gate
USB Host1, Host2 and OTG are gated via 'usb_ipg_gate' clock, so fix it in order
to avoid the following kernel oops:

usbcore: registered new interface driver usb-storage
10024000.usb supply vbus not found, using dummy regulator
Unhandled fault: external abort on non-linefetch (0x808) at 0xf4424184
Internal error: : 808 [#1] PREEMPT ARM
Modules linked in:
CPU: 0 PID: 1 Comm: swapper Not tainted 3.15.0-rc1-26325-g971f9fd-dirty #64
task: c7829aa0 ti: c7836000 task.ti: c7836000
PC is at ci_hdrc_probe+0x3a4/0x634
LR is at ci_hdrc_probe+0x100/0x634
pc : [<c036cc78>]    lr : [<c036c9d4>]    psr: 60000013
sp : c7837d48  ip : 00000001  fp : 00000000
r10: 00000000  r9 : 00000000  r8 : c791b6c0
r7 : c7945000  r6 : f4424000  r5 : c7945010  r4 : c794e010
r3 : f4424184  r2 : 00000000  r1 : 8c000004  r0 : 0c000004
Flags: nZCv  IRQs on  FIQs on  Mode SVC_32  ISA ARM  Segment kernel
Control: 0005317f  Table: a0004000  DAC: 00000017
Process swapper (pid: 1, stack limit = 0xc78361c0)
Stack: (0xc7837d48 to 0xc7838000)

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
2014-05-16 23:02:00 +08:00
Fabio Estevam
2286908746 ARM: dts: imx27-phytec-phycore-som: Move PMIC IRQ GPIO into a separate pin group
The hardware is better described if we place the PMIC IRQ GPIO into its own
pingroup.

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
2014-05-16 23:01:59 +08:00