GitLab

Signed-off-by: Michael Welling <mwelling@emacinc.com>

Conflicts:
	arch/arm/boot/dts/at91sam9g45.dtsi
	arch/arm/mach-at91/pm.c
	arch/arm/mach-at91/sysirq_mask.c
	drivers/iio/adc/at91_adc.c
	drivers/net/can/at91_can.c
	drivers/tty/serial/atmel_serial.c
	drivers/usb/host/ehci-atmel.c
	sound/soc/atmel/Makefile
	sound/soc/atmel/atmel_ssc_dai.c
Signed-off-by: Michael Welling <mwelling@emacinc.com>

Before enabling a muxing function, pin interrupt is disabled (probably
to prevent spurious interrupts). It can causes several issues mainly for
power management when switching from default to sleep state or the other
way around. So if the irq was enabled for a pin, restore it once pin has
been configured.
Signed-off-by: Ludovic Desroches <ludovic.desroches@atmel.com>

As .power() and .reset() function defined as a pair similar functions.
But the .reset() use the soc-camera device's dev as parameter.
And .power() use the i2c-client's dev.

This patch will pass the i2c-client's dev to .reset() function, same as
.power().
Signed-off-by: Josh Wu <josh.wu@atmel.com>

Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>

This patch adds listen only mode support to the at91_can driver.
Signed-off-by: Yoann DI-RUZZA <ydiruzza@gmail.com>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>

In commit:

    3078cde7

 can: at91_can: add dt support

device tree support was added to the at91_can driver. In this commit the
mapping of device to driver data was mixed up. This results in the sam9x5
parameters being used for the sam9263 and the workaround for the broken mailbox
0 on the sam9263 not being activated.

This patch fixes the broken platform_device_id table.

Cc: linux-stable <stable@vger.kernel.org>
Cc: Ludovic Desroches <ludovic.desroches@atmel.com>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>

If not enable CONFIG_AT91_SLOW_CLOCK, when compile,
it will show following warning:
--->8---
arch/arm/mach-at91/pm.c:137:12: warning: ‘at91_pm_verify_clocks’ defined but not used
---8<---
This patch will get rid of it.
Signed-off-by: Bo Shen <voice.shen@atmel.com>
Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>

Signed-off-by: Bo Shen <voice.shen@atmel.com>
Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>

The HDMI driver depends on i2c regmap to access it's registers.
And the audio base on HDMI depends on SND_SOC.
Signed-off-by: Bo Shen <voice.shen@atmel.com>

During the registeration of clocks, the CAN clock wasn't added to the
periph_clocks_lookups table. Add them now.
Signed-off-by: Yoann Di Ruzza <ydiruzza@gmail.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>

sam9x5 SoCs have the following errata:
 "RTC: Interrupt Mask Register cannot be used
  Interrupt Mask Register read always returns 0."

Hence we should not rely on what IMR claims about already masked IRQs
and just disable all IRQs.
Signed-off-by: Boris BREZILLON <boris.brezillon@free-electrons.com>
Reported-by: Bryan Evenson <bevenson@melinkcorp.com>
Reviewed-by: Johan Hovold <johan@hovold.com>
Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Cc: Bryan Evenson <bevenson@melinkcorp.com>
Cc: Andrew Victor <linux@maxim.org.za>
Cc: Jean-Christophe Plagniol-Villard <plagnioj@jcrosoft.com>
Cc: Alessandro Zummo <a.zummo@towertech.it>
Cc: Mark Roszko <mark.roszko@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

1. Add isi pin mux.
2. As the i2c has known issue for 9g45, so we use i2c-gpio instead.
   In the dts, we disable i2c0 and enable i2c-gpio.
Signed-off-by: Josh Wu <josh.wu@atmel.com>

Signed-off-by: Josh Wu <josh.wu@atmel.com>

Also add the configuration for reset & power pins.
Signed-off-by: Josh Wu <josh.wu@atmel.com>

Also disabled the spi0 as it is conflicted with ISI
Signed-off-by: Josh Wu <josh.wu@atmel.com>

Signed-off-by: Josh Wu <josh.wu@atmel.com>

Add ISI support in board-dt-sam9.c file.
Also add the support camera sensors: ov2640, ov2643, ov5640, ov9740 and
ov7740.
Signed-off-by: Josh Wu <josh.wu@atmel.com>

ISI pins has reorganized by following groups:
  0~7 data pins, with vsync, hsync.
  8~9 data pins.
  10~11 data pins.
  reset pin.
  powerdown pin.
Signed-off-by: Josh Wu <josh.wu@atmel.com>

When a pin is configured as GPIO, print also direction (input or output).
Signed-off-by: Matthieu Crapet <mcrapet@gmail.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>

The soc camera provide two functions: .power and .reset.
Current we only use .power() function.

This patch separate power() and reset() functions.
Reported-by: Bo Shen <voice.shen@atmel.com>
Signed-off-by: Josh Wu <josh.wu@atmel.com>

This could fix the isi overflow issue
Reported-by: Bo Shen <voice.shen@atmel.com>
Signed-off-by: Josh Wu <josh.wu@atmel.com>

Signed-off-by: Josh Wu <josh.wu@atmel.com>

Signed-off-by: Michael Welling <mwelling@emacinc.com>

Allow the pin controller to handle and set the state of the pins to:
* "default" on boot, resume and before performing an transfer.
* "sleep" on suspend.

This should make it possible to optimize energy usage for the pins
both for the suspend/resume cycle.
Signed-off-by: Wenyou Yang <wenyou.yang@atmel.com>

pm: at91: pm_slowclock: move disabling the DDR clock after the code to disable the DDRC peripheral clock

It is verified on the SAMA5D4-EK that it is more reliable to disable DDR clock.
Signed-off-by: Wenyou Yang <wenyou.yang@atmel.com>

Since in SAMA5D4 chip, the PMECC can correct bit flips in erased page.
So we add a DT property to indicate this hardware charactor.

If the PMECC support correct bitflip erased page (all data are 0xff).
Then we can use the PMECC correct the page and skip the erased page
check.
Signed-off-by: Josh Wu <josh.wu@atmel.com>

Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>

Signed-off-by: Josh Wu <josh.wu@atmel.com>
Acked-by: Bo Shen <voice.shen@atmel.com>

Signed-off-by: Bo Shen <voice.shen@atmel.com>

Status returned using:
cat /sys/kernel/debug/gpio
is wrong if pin number is greater than 31.

Same fix in Mainline: 47f227163a5c77742a9840a0ac3eeb7bcc3ef413 (pinctrl/at91:
Fix mask creation in at91_gpio_dbg_show).
Signed-off-by: Matthieu Crapet <mcrapet@gmail.com>
Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>

Merge remote-tracking branch 'rfo/voice/linux-3.10-at91_hdmi_v2' into linux-3.10-at91-sama5d4_xplained
Signed-off-by: Josh Wu <josh.wu@atmel.com>

Conflicts:
	arch/arm/boot/dts/Makefile

Signed-off-by: Josh Wu <josh.wu@atmel.com>

Conflicts:
	drivers/tty/serial/atmel_serial.c

This patch swaps the use "tail" and "head" to fit the semantic of the linux
circular buffer documentation:
- head: the point at which the producer (the DMA controller) inserts items.
- tail: the point at which the consumer (the serial framework) finds the next
        item.

Besides the former code of the rx ring buffer didn't manage the case where
head < tail, which might lead to loss of data. To fix this bug the data are now
sent from the DMA buffer to the serial framework in two steps:
1 - First, we test if head < tail. If so, we copy the data from tail to the end
    of the DMA buffer then reset tail to zero.
2 - Finally, we copy data from tail to head then set tail to head.

In addition, since tty_insert_flip_string() may now be called twice,
atmel_flip_buffer_rx_dma() becomes less efficient than moving the calls
dma_sync_sg_for_cpu(), dma_sync_sg_for_device(), tty_insert_flip_string() and
tty_flip_buffer_push() directly into atmel_rx_from_dma().
Signed-off-by: Cyrille Pitchen <cyrille.pitchen@atmel.com>
Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>

Signed-off-by: Bo Shen <voice.shen@atmel.com>