- 03 Apr, 2015 2 commits
-
-
git://github.com/rogerq/linuxOlof Johansson authored
Merge "OMAP-GPMC driver fixes for v4.1" from Roger Quandros: * Fixed WAITMONITORINGTIME programming to be based on GPMC_CLK instead of GPMC_FCLK. The GPMC clock divider programming is fixed for both synchronous and asynchronous modes. * Allow GPMC's children of default bus type to be populated in the device tree. * Improved DEBUG output data and format. * Prevent writing 1 into reserved bits of GPMC_CONFIG7. * tag 'gpmc-omap-for-v4.1' of git://github.com/rogerq/linux: ARM OMAP2+ GPMC: fix programming/showing reserved timing parameters ARM OMAP2+ GPMC: fix WAITMONITORINGTIME divider bug ARM OMAP2+ GPMC: calculate GPMCFCLKDIVIDER based on WAITMONITORINGTIME ARM OMAP2+ GPMC: always program GPMCFCLKDIVIDER ARM OMAP2+ GPMC: change get_gpmc_timing_reg output for DTS ARM OMAP2+ GPMC: fix debug output alignment ARM OMAP2+ GPMC: add bus children ARM OMAP2+ GPMC: don't undef DEBUG ARM: OMAP2+: gpmc: make gpmc_cs_get_name() static ARM: OMAP2+: gpmc: Fix writing in gpmc_cs_set_memconf Signed-off-by:
Olof Johansson <olof@lixom.net>
-
Olof Johansson authored
Merge tag 'at91-cleanup3' of git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91 into next/drivers Merge "at91: cleanup for 4.1 #3" from Nicolas Ferre: Third batch of cleanup for 4.1: - System Timer (ST) for at91rm9200 re-work (syscon/regmap): - watchdog - restart handler - timer as a proper clocksource => remove mach dependency + cleanup * tag 'at91-cleanup3' of git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91: (54 commits) ARM: at91: remove useless include clocksource: atmel-st: remove mach/hardware dependency clocksource: atmel-st: use syscon/regmap ARM: at91: time: move the system timer driver to drivers/clocksource ARM: at91: properly initialize timer ARM: at91: at91rm9200: remove deprecated arm_pm_restart watchdog: at91rm9200: implement restart handler watchdog: at91rm9200: use the system timer syscon mfd: syscon: Add atmel system timer registers definition ARM: at91/dt: declare atmel,at91rm9200-st as a syscon ARM: at91: remove old setup ARM: at91: sama5d4: remove useless map_io ARM: at91: sama5 use SoC detection infrastructure ARM: at91: at91sam9: use SoC detection infrastructure ARM: at91: at91rm9200 use SoC detection infrastructure ARM: at91: add soc detection infrastructure ARM: at91/dt: introduce atmel,<chip>-dbgu ARM: at91: remove unused _matrix.h headers ARM: at91: remove unused at91_ioremap_matrix and header ARM: at91: remove NEED_MACH_IO_H ... Signed-off-by:
-
- 02 Apr, 2015 1 commit
-
-
Olof Johansson authored
Merge tag 'qcom-soc-for-4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/galak/linux-qcom into next/drivers Merge "qcom SoC changes for v4.1" from Kumar Gala: Qualcomm ARM Based SoC Updates for v4.1 * Merged the based Qualcomm SCM and SCM boot support * Cleaned up SCM interface to only expose functional SCM APIs * Moved Qualcomm SCM code into drivers/firmware * Updated the SCM APIs for setting cpu cold and warm boot addresses * Added support for ADM CRCI muxing * tag 'qcom-soc-for-4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/galak/linux-qcom: soc: qcom: gsbi: Add support for ADM CRCI muxing firmware: qcom: scm: Support cpu power down through SCM firmware: qcom: scm: Add qcom_scm_set_warm_boot_addr function firmware: qcom: scm: Clean cold boot entry to export only the API firmware: qcom: scm: Move the scm driver to drivers/firmware ARM: qcom: Prep scm code for move to drivers/firmware ARM: qcom: Cleanup scm interface to only export what is needed ARM: qcom: Merge scm and scm boot code together Signed-off-by:
-
- 16 Mar, 2015 10 commits
-
-
Alexandre Belloni authored
Both drivers using the system timer are now converted to an MFD. mach/at91_st.h is now useless. Signed-off-by:
Alexandre Belloni <alexandre.belloni@free-electrons.com> Acked-by:
Boris Brezillon <boris.brezillon@free-electrons.com> Acked-by:
Daniel Lezcano <daniel.lezcano@linaro.org> Signed-off-by:
Nicolas Ferre <nicolas.ferre@atmel.com>
-
Alexandre Belloni authored
Remove the mach/hardware dependency to prepare the driver for multiplatform support. Also switch from setup_irq() to request_irq() Signed-off-by:
-
Alexandre Belloni authored
The register range from the system timer is also used by the watchdog driver. Use a regmap to handle concurrent accesses. Signed-off-by:
-
Alexandre Belloni authored
Import at91rm9200_time.c from mach-at91 as timer-atmel-st.c. Further cleanup is required to get rid of the mach-at91 headers. Signed-off-by:
-
Alexandre Belloni authored
Use clocksource_of_init to initialize the system timer instead of relying on a custom function. Signed-off-by:
-
Alexandre Belloni authored
Now that a proper driver is available, remove at91rm9200_restart. Signed-off-by:
-
Alexandre Belloni authored
Restarting the at91rm9200 is done through programming the watchdog and waiting for it to reset. Signed-off-by:
Guenter Roeck <linux@roeck-us.net> Signed-off-by:
-
Alexandre Belloni authored
Use a syscon regmap to access the system timer registers. Also, rename the driver atmel_st_watchdog to stop conflicting with at91sam9_wdt.c Signed-off-by:
-
Alexandre Belloni authored
AT91RM920 has a memory range reserved for timer and watchdog configuration. Expose those registers so that drivers can make use of the system timer syscon declared in at91 DTs. Signed-off-by:
Lee Jones <lee.jones@linaro.org> Signed-off-by:
-
Alexandre Belloni authored
The system timer register range is used to handle three different functionalities: Periodic Interval Timer, Real Time Timer and watchdog. Declare it as a syscon to be able to get a regmap. Also declare it as a simple-mfd and its watchdog subnode. Finally, document the watchdog compatible string. Signed-off-by:
-
- 13 Mar, 2015 22 commits
-
-
Alexandre Belloni authored
The old setup is not used anymore, remove it Signed-off-by:
-
Alexandre Belloni authored
All the peripheral remapped at io_map are taken care of by their respective drivers. Signed-off-by:
-
Alexandre Belloni authored
Use the soc detection infrastructure for sama5 initialization. Signed-off-by:
-
Alexandre Belloni authored
Use the soc detection infrastructure for at91sam9 initialization. Signed-off-by:
-
Alexandre Belloni authored
Use the soc detection infrastructure for at91rm9200 initialization. Signed-off-by:
-
Boris BREZILLON authored
Add new structures and functions to handle AT91 SoC detection. [alexandre.belloni@free-electrons.com: reworked DBGU detection] Signed-off-by:
-
Alexandre Belloni authored
The DBGU is not a simple UART and we need to be able to distinguish it from the other UARTs, in particular to get its address and check the chip id. Signed-off-by:
-
Alexandre Belloni authored
The matrix headers are not used anymore, remove them. Signed-off-by:
-
Alexandre Belloni authored
at91_ioremap_matrix and the at91_matrix.h header are not used anymore, remove them. Signed-off-by:
-
Arnd Bergmann authored
The mach/io.h header on at91 is used to support a nonstandard I/O space window for the cf card driver. This changes the driver to use pci_ioremap_io in order to have the standard location, and then removes the custom mach/io.h. [alexandre.belloni@free-electrons.com: Added PCI dependency] Signed-off-by:
Arnd Bergmann <arnd@arndb.de> Signed-off-by:
-
Wenyou Yang authored
Flush data cache, and clean, invalidate and disable the L2 cache before going to suspend. Restore the L2 cache configuration and re-enable the L2 cache after waking up. Signed-off-by:
Wenyou Yang <wenyou.yang@atmel.com> Acked-by:
Sylvain Rochet <sylvain.rochet@finsecur.com> Signed-off-by:
-
Wenyou Yang authored
Add the WFI instruction to make the cpu to the idle state. In the meanwhile, disable the processor's clock. Signed-off-by:
-
Wenyou Yang authored
Because the standby mode use the same sram function as the suspend to memory mode, void (*at91_pm_standby)(void) doesn't need, remove it. Signed-off-by:
-
Wenyou Yang authored
As the file name is renamed, rename the function name at91_slow_clock() --> at91_pm_suspend_sram_fn(), rename the function handler's name at the same time. Signed-off-by:
-
Wenyou Yang authored
Because the sram function is used for both suspend to memory and the suspend to standby mode, renaming is more elegant. Signed-off-by:
-
Wenyou Yang authored
To simply the PM code, the suspend to standby mode uses same sram function as the suspend to memory mode, running in the internal SRAM, instead of the respective code for each mode. For the suspend to standby mode, the master clock doesn't switch to the slow clock, and PLLA and the main oscillator doesn't turn off as well. Signed-off-by:
-
Wenyou Yang authored
To decrease the suspend time, move copying the sram function to the sram initialization phase, instead of every time go to suspend. In the meanwhile, substitute fncpy() for memcpy(). If there is no sram allocated for PM, the PM is not supported. Signed-off-by:
-
Wenyou Yang authored
To decrease the duplicated code, create the procedure to contain both activing and exiting the sdram self-refresh mode. Signed-off-by:
-
Sylvain Rochet authored
Assume USB PLL and PLL B are already stopped before entering sleep mode. Removed PLL B from slow clock code, all drivers are supposed to properly unprepare clocks. Signed-off-by:
-
Wenyou Yang authored
The slow clock always exists, selecting CONFIG_AT91_SLOW_CLOCK config is unnecessary for the suspend to memory mode. For this mode the master clock should always switch to the slow clock. Signed-off-by:
-
Wenyou Yang authored
To simply the PM config the CONFIG_AT91_SLOW_CLOCK option will be removed, so move "select SRAM" from under AT91_SLOW_CLOCK, add "select SRAM if PM" under SOC_AT91SAM9 and SOC_SAMA5 Signed-off-by:
-
Wenyou Yang authored
The SLOWDOWN_MASTER_CLOCK definition is not used, remove the redundant code. Signed-off-by:
-
- 12 Mar, 2015 5 commits
-
-
Wenyou Yang authored
Since at91_pm_set_standby() will not be used out of the pm.c file, change its attribute from extern to static, remove its declaration as well. Signed-off-by:
-
Boris Brezillon authored
Commit 2b0ba96c ("net: phy: micrel: disable NAND-tree for KSZ8021, KSZ8031, KSZ8051, KSZ8081") automated the NAND-tree mode deactivation process, thus making this phy fixup useless. Remove it along with the associated headers inclusion. Signed-off-by:
-
Nicolas Ferre authored
Third fixes batch for AT91 on 4.0: - clock fixes for USB - compatible string changes for handling USB IP differences (+ needed AHB matrix syscon) - fix of a compilation error in PM code
-
Nicolas Ferre authored
Second fixes batch for AT91 on 4.0: - little fix for !MMU debug: may also help for randconfig - fix of 2 errors in LCD clock definitions - in PM code, not writing the key leads to not execute the action
-
Nicolas Ferre authored
First fixes batch for AT91 on 4.0: - PM slowclock fixes for DDR and timeouts - fix some DT entries - little defconfig updates - the removal of a harmful watchdog option + its detailed documentation
-
