summaryrefslogtreecommitdiff
path: root/arch
AgeCommit message (Collapse)Author
2015-12-26ARM: dts: imx6dl-colibri: use input dt-bindingsMarcel Ziswiler
Rather than defining our own KEY_WAKEUP include the official input dt-bindings. While at it update copyright date range as well.
2015-12-26ARM: colibri_imx6: add extcon usb gpio support in defconfigMarcel Ziswiler
Enable extcon USB GPIO support in the default kernel configuration.
2015-12-26of: Make device nodes kobjects so they show up in sysfsGrant Likely
Device tree nodes are already treated as objects, and we already want to expose them to userspace which is done using the /proc filesystem today. Right now the kernel has to do a lot of work to keep the /proc view in sync with the in-kernel representation. If device_nodes are switched to be kobjects then the device tree code can be a whole lot simpler. It also turns out that switching to using /sysfs from /proc results in smaller code and data size, and the userspace ABI won't change if /proc/device-tree symlinks to /sys/firmware/devicetree/base. v7: Add missing sysfs_bin_attr_init() v6: Add __of_add_property() early init fixes from Pantelis v5: Rename firmware/ofw to firmware/devicetree Fix updating property values in sysfs v4: Fixed build error on Powerpc Fixed handling of dynamic nodes on powerpc v3: Fixed handling of duplicate attribute and child node names v2: switch to using sysfs bin_attributes which solve the problem of reporting incorrect property size. Signed-off-by: Grant Likely <grant.likely@secretlab.ca> Tested-by: Sascha Hauer <s.hauer@pengutronix.de> Cc: Rob Herring <rob.herring@calxeda.com> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> Cc: David S. Miller <davem@davemloft.net> Cc: Nathan Fontenot <nfont@linux.vnet.ibm.com> Cc: Pantelis Antoniou <panto@antoniou-consulting.com> (cherry picked from commit 75b57ecf9d1d1e17d099ab13b8f48e6e038676be)
2015-12-26leds: leds-gpio: Convert gpio_blink_set() to use GPIO descriptorsMika Westerberg
Commit 21f2aae91e902aad ("leds: leds-gpio: Add support for GPIO descriptors") already converted most of the driver to use GPIO descriptors. What is still missing is the platform specific hook gpio_blink_set() and board files which pass legacy GPIO numbers to this driver in platform data. In this patch we handle the former and convert gpio_blink_set() to take GPIO descriptor instead. In order to do this we convert the existing four users to accept GPIO descriptor and translate it to legacy GPIO number in the platform code. This effectively "pushes" legacy GPIO number usage from the driver to platforms. Also add comment to the remaining block describing that it is legacy code path and we are getting rid of it eventually. Suggested-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com> Acked-by: Andrew Lunn <andrew@lunn.ch> Reviewed-by: Linus Walleij <linus.walleij@linaro.org> Acked-by: Alexandre Courbot <acourbot@nvidia.com> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> (cherry picked from commit c673a2b4008103525a3cf21bedf15ffac37bfef0)
2015-12-26ACPICA: Linux: Add support to exclude <asm/acenv.h> inclusion.Lv Zheng
The forthcoming patch will make <acpi/acpi.h> to be visible to all kernel source code. Thus for the architectures that do not support ACPI and haven't implemented <asm/acenv.h>, we need to make it excluded. Signed-off-by: Lv Zheng <lv.zheng@intel.com> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> (cherry picked from commit d334c823b27401721591e0f1220050a41af08165)
2015-12-26ACPICA: Linux headers: Add <asm/acenv.h> to remove mis-ordered inclusion of ↵Lv Zheng
<asm/acpi.h> There is a mis-order inclusion for <asm/acpi.h>. As we will enforce including <linux/acpi.h> for all Linux ACPI users, we can find the inclusion order is as follows: <linux/acpi.h> <acpi/acpi.h> <acpi/platform/acenv.h> (acenv.h before including aclinux.h) <acpi/platform/aclinux.h> ........................................................................... (aclinux.h before including asm/acpi.h) <asm/acpi.h> @Redundant@ (ACPICA specific stuff) ........................................................................... ........................................................................... (Linux ACPI specific stuff) ? - - - - - - - - - - - - + (aclinux.h after including asm/acpi.h) @Invisible@ | (acenv.h after including aclinux.h) @Invisible@ | other ACPICA headers @Invisible@ | ............................................................|.............. <acpi/acpi_bus.h> | <acpi/acpi_drivers.h> | <asm/acpi.h> (Excluded) | (Linux ACPI specific stuff) ! <- - - - - - - - - - - - - + NOTE that, in ACPICA, <acpi/platform/acenv.h> is more like Kconfig generated <generated/autoconf.h> for Linux, it is meant to be included before including any ACPICA code. In the above figure, there is a question mark for "Linux ACPI specific stuff" in <asm/acpi.h> which should be included after including all other ACPICA header files. Thus they really need to be moved to the position marked with exclaimation mark or the definitions in the blocks marked with "@Invisible@" will be invisible to such architecture specific "Linux ACPI specific stuff" header blocks. This leaves 2 issues: 1. All environmental definitions in these blocks should have a copy in the area marked with "@Redundant@" if they are required by the "Linux ACPI specific stuff". 2. We cannot use any ACPICA defined types in <asm/acpi.h>. This patch splits architecture specific ACPICA stuff from <asm/acpi.h> to fix this issue. Signed-off-by: Lv Zheng <lv.zheng@intel.com> Cc: Tony Luck <tony.luck@intel.com> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Ingo Molnar <mingo@redhat.com> Cc: "H. Peter Anvin" <hpa@zytor.com> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> (cherry picked from commit 07d8391433380fc72f999d99c554b1cfedea9778)
2015-12-26Apalis/Colibri dtb: cleanup module connector designatorMax Krummenacher
Use consistently MXM3<space><number> or SODIMM<space><number>
2015-12-26Apalis iMX 6: cleanup filename for V1.0 HWMax Krummenacher
rename imx6q-apalis-eval_v1_0.dtb to imx6q-apalis_v1_0-eval.dtb The v1_0 denotes the Apalis module version, not the evaluation board version.
2015-12-26arm: Export cache flush management symbols when !MULTI_CACHEPantelis Antoniou
When compiling a kernel without CONFIG_MULTI_CACHE enabled the dma access functions end up not being exported. Fix it. Signed-off-by: Pantelis Antoniou <panto@antoniou-consulting.com> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> (cherry picked from commit 22f692548037e39809c32759b5600ee066ef59e9)
2015-12-26clk-imx6q.c: set eth phy clock dependent on RMII/RGMIIMax Krummenacher
Evaluate the device tree to find out about the used phy mode rather than using a hardcoded value of 125MHz valid for RGMII only.
2015-12-26pm-imx6.c: follow function name changeMax Krummenacher
2015-12-26colibri-imx6: use stopmode for poweroffMax Krummenacher
After the system has been shutdown with PMIC_ON_REQ and VCC_BATT is supplied from a battery it will never restart either by RESET or power cycle. So use the PMIC_STBY_REQ after shutdown to switch of power rails. Conflicts: arch/arm/mach-imx/pm-imx6.c drivers/regulator/pfuze100-regulator.c
2015-12-26mach-imx6q.c: handle RESET_MOCI when PCIe is disabledMax Krummenacher
(cherry picked from commit 02110528b45ae331d89f7e7bb6a29b5494ec0be1) Conflicts: arch/arm/mach-imx/mach-imx6q.c
2015-12-26apalis imx6: remove weim driverMax Krummenacher
The WEIM signals are not accessible so remove the driver from the config and set it to disabled in the device tree. (cherry picked from commit 6c2f7b22f5aa9572d35a3ddd7d14b653cf606550) Conflicts: arch/arm/configs/apalis_imx6_defconfig
2015-12-26OmniVision ov5640 MIPI-CSI2 camera supportWojciech Bieganski
gst-inspect mfw_v4lsrc gst-launch mfw_v4lsrc capture-mode=5 device=/dev/video2 ! mfw_v4lsink
2015-12-26Apalis/Colibri iMX6: add intital devicetreeMax Krummenacher
2015-12-26Apalis/Colibri iMX6: add intital defconfigMax Krummenacher
2015-12-26mach-imx6q.c: fix typo in error msgMax Krummenacher
Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> (cherry picked from commit 943e92ef3b9822cd278eff806b001c14c7bebb83)
2015-12-26regulator: allow GPIO 0 to be used for an enable signalMax Krummenacher
GPIO number 0 *is* legal and must be accepted. Set .ena_gpio to -ENODEV on regulators having no GPIO in preparation of a code change to accept GPIO 0 in the config. (cherry picked from commit c87ddbb1325a448d56a920513206592f03bca117) Conflicts: arch/arm/mach-imx/gpc.c drivers/regulator/88pm8607.c drivers/regulator/ab8500-ext.c drivers/regulator/ab8500.c drivers/regulator/ad5398.c drivers/regulator/arizona-micsupp.c drivers/regulator/isl6271a-regulator.c drivers/regulator/lp3972.c drivers/regulator/max1586.c drivers/regulator/max8660.c drivers/regulator/max8925-regulator.c drivers/regulator/max8952.c drivers/regulator/max8998.c drivers/regulator/mc13783-regulator.c drivers/regulator/s2mps11.c drivers/regulator/tps65217-regulator.c drivers/regulator/tps6524x-regulator.c drivers/regulator/wm831x-dcdc.c drivers/regulator/wm831x-ldo.c
2015-12-26apalis_imx6_android_defconfig: add defconfig for androidDaniel Kochmanski
2015-12-26arm: imx6: fix pcie by disabling rc/ep test modeMarcel Ziswiler
Fix PCIe operation by disabling RC/EP test mode which according to the following community forum post is only used on the PCIe EP/RC validation system and otherwise prevent PCIe from working properly: https://community.freescale.com/thread/328257
2015-12-26apalis_imx6_defconfig: add CONFIG_NEW_LEDSMax Krummenacher
2015-12-26apalis_imx6_defconfig: add fusion-F0710A as a moduleMax Krummenacher
Enable the TouchRevolution Fusion 7 and 10 multi-touch controller driver to be built as a module. While at it remove NEW_LEDS which is enabled through dependencies.
2015-12-26apalis_imx6_defconfig: remove CONFIG_INPUT_EVBUGMax Krummenacher
2015-12-26apalis-imx6: add initial defconfigMax Krummenacher
2015-12-26mach-types: add the apalis-imx6 machineMax Krummenacher
2015-12-26dma-mapping: increase DEFAULT_DMA_COHERENT_POOL_SIZE ifdef CONFIG_VIDEO_TW68Troy Kisky
2015-12-26Add nitrogen6x_ub_defconfig with Ubuntu's preferred settingsEric Nelson
Signed-off-by: Eric Nelson <eric.nelson@boundarydevices.com>
2015-12-26nit6xlite_defconfig: initial additionTroy Kisky
2015-12-26add nitrogen6x_defconfigTroy Kisky
2015-12-26imx6dl-pinfunc: add MX6QDL_PAD_SD1_CLK__OSC32K_32K_OUTTroy Kisky
2015-12-26imx6q-pinfunc: add MX6QDL_PAD_SD1_CLK__OSC32K_32K_OUTTroy Kisky
2015-11-18MLK-11860 ARM: i.MX: remove annotation __init from function mmdc_ch1_handshakeJason Liu
kbuild throw out the following compile warnings: WARNING: arch/arm/mach-imx/built-in.o(.text.unlikely+0x228): Section mismatch in reference from the function init_ldb_clks() to the function .init.text:mmdc_ch1_handshake() The function init_ldb_clks() references the function __init mmdc_ch1_handshake(). This is often because init_ldb_clks lacks a __init annotation or the annotation of mmdc_ch1_handshake is wrong. This patch to fix the build warnings. Moreover,the function annotated by __init will be discarded after boot up, so, there will be an issue when the code call the function annotated with __init will be error after freeing the __init section. Signed-off-by: Jason Liu <r64343@freescale.com> (cherry picked from commit 19e49f1edacec014a4fc9117b01f6bcf3a6f7232)
2015-11-13MLK-11853 ARM: dts: imx6qp-sabreauto: remove the enet pin reconfigFugang Duan
Tuning MMDC ZQ_PU_OFFSET impact DDR IO timing like the value is greater than 0x9 causing enet lost packets due to the worse timing. Reinforce ENET DDR IO drive strength can fix the issue. Use the default pin setting can match the RGMII timing for AI board. Worse timing cause performance drop, the performance has no drop after enhancing the DDR IO pins drive strength. Pass over night test. Signed-off-by: Fugang Duan <B38611@freescale.com>
2015-11-11MLK-11836: Revert "MLK-11746: dts: Enable mipi dsi on imx7d 19x19 ddr3 arm ↵Sandor Yu
board" This reverts commit dbf58f146c3f8260f078b6e6bdfd4d11204819ef. Because mipi dsi and mipi csi share the power and reset pins on imx7d 19x19 ddr2 arm2 board, and mipi csi and dsi can not work together. Signed-off-by: Sandor Yu <R01008@freescale.com>
2015-11-10MLK-11844-2 ARM: dts: imx7d: reserve DDR space for M4 use caseAnson Huang
FreeRTOS/M4 has DDR use case, M4 can only execute on DDR space lower than 0xa0000000, Linux kernel will reserve 1M (0x9ff00000 - 0x9fffffff) for it, below are the DDR usage: 0x80000000 - 0x9fefffff: Linux kernel; 0x9ff00000 - 0x9fffffff: FreeRTOS; 0xa0000000 - 0xbfefffff: Linux kernel; 0xbff00000 - 0xbfffffff: RPMSG shared memory; 0xc0000000 - 0xffffffff: Linux kernel if boards has 2GB DDR. Also, remove 'reg' property which is unused. Signed-off-by: Anson Huang <Anson.Huang@freescale.com>
2015-11-10MLK-11844-1 ARM: dts: imx6sx: reserve DDR space for M4 use caseAnson Huang
FreeRTOS/M4 has DDR use case, M4 can only execute on DDR space lower than 0xa0000000, Linux kernel will reserve 1M (0x9ff00000 - 0x9fffffff) for it, below are the DDR usage: 0x80000000 - 0x9fefffff: Linux kernel; 0x9ff00000 - 0x9fffffff: FreeRTOS; 0xa0000000 - 0xbfefffff: Linux kernel; 0xbff00000 - 0xbfffffff: RPMSG shared memory; 0xc0000000 - 0xffffffff: Linux kernel if boards has 2GB DDR. Also, remove 'reg' property which is unused. Signed-off-by: Anson Huang <Anson.Huang@freescale.com>
2015-11-06MLK-11830 ARM: dts: add tcm address info for imx7d 12x12 lpddr3 boardAnson Huang
When M4 is enabled, Linux has to do save/restore for M4 TCM during suspend/resume, dtb should pass the TCM address for kernel, without this TCM info, kernel will boot up fail: ------------[ cut here ]------------ WARNING: CPU: 0 PID: 1 at arch/arm/mach-imx/pm-imx7.c:1030 imx7d_pm_init+0x58/0) Modules linked in: CPU: 0 PID: 1 Comm: swapper/0 Not tainted 3.14.52-02791-g1babdb1-dirty #2093 [<80014b40>] (unwind_backtrace) from [<80011798>] (show_stack+0x10/0x14) [<80011798>] (show_stack) from [<807199ec>] (dump_stack+0x7c/0xbc) [<807199ec>] (dump_stack) from [<80032d78>] (warn_slowpath_common+0x6c/0x88) [<80032d78>] (warn_slowpath_common) from [<80032e30>] (warn_slowpath_null+0x1c/) [<80032e30>] (warn_slowpath_null) from [<80a09760>] (imx7d_pm_init+0x58/0x67c) [<80a09760>] (imx7d_pm_init) from [<80a08d3c>] (imx7d_init_machine+0x3c/0xe4) [<80a08d3c>] (imx7d_init_machine) from [<809e52e4>] (customize_machine+0x20/0x4) [<809e52e4>] (customize_machine) from [<800089bc>] (do_one_initcall+0xf8/0x144) [<800089bc>] (do_one_initcall) from [<809e2c4c>] (kernel_init_freeable+0x138/0x) [<809e2c4c>] (kernel_init_freeable) from [<807159b8>] (kernel_init+0x8/0xf0) [<807159b8>] (kernel_init) from [<8000e580>] (ret_from_fork+0x14/0x34) ---[ end trace fdb0885876d7ac0b ]--- Unable to handle kernel NULL pointer dereference at virtual address 00000000 pgd = 80004000 [00000000] *pgd=00000000 Internal error: Oops: 5 [#1] PREEMPT SMP ARM Modules linked in: CPU: 0 PID: 1 Comm: swapper/0 Tainted: G W 3.14.52-02791-g1babdb1-dir3 task: a8084000 ti: a8090000 task.ti: a8090000 PC is at memcpy+0x48/0x330 LR is at imx7d_pm_init+0xd0/0x67c pc : [<8028e768>] lr : [<80a097d8>] psr: 20000013 sp : a8091e8c ip : 00000000 fp : 00000000 r10: a8090030 r9 : 0000010b r8 : 809e52c4 r7 : 80ab9380 r6 : 80ab9380 r5 : 80abb5a4 r4 : 80a411cc r3 : 00080000 r2 : 00007f80 r1 : 00000000 r0 : a8140000 Flags: nzCv IRQs on FIQs on Mode SVC_32 ISA ARM Segment kernel Control: 10c53c7d Table: 8000406a DAC: 00000015 Process swapper/0 (pid: 1, stack limit = 0xa8090238) Signed-off-by: Anson Huang <Anson.Huang@freescale.com>
2015-11-06MLK-11828-2 ARM: dts: reserve OCRAM space for M4Anson Huang
FreeRTOS has use case of running on OCRAM, reserve the bottom half of OCRAM spase(0x910000 - 0x91efff) for M4, the last 4K is for shared memory power management. Signed-off-by: Anson Huang <Anson.Huang@freescale.com>
2015-11-06MLK-11828-1 ARM: dts: reserve OCRAM space for M4Anson Huang
FreeRTOS has use case of running on OCRAM, reserve the bottom half of OCRAM spase(0x910000 - 0x91ffff) for M4. Signed-off-by: Anson Huang <Anson.Huang@freescale.com>
2015-11-06MLK-11827 arm: imx6sx: correct the wrong qspi dts configuresRichard Zhu
- previous patch makes the wrong qspi port on imx6sx sdb and sabreauto boards. - nor flash is used qspi2 on imx6sx-sdb board, and qspi1 on sabreauto board. Signed-off-by: Richard Zhu <Richard.Zhu@freescale.com> (cherry picked from commit 44869a7d1715ec022d17f793cd20a5cc7dc34ffa)
2015-11-03MLK-11262-5: ARM: imx: add M4 rekick after DSMTeo Hall
Save M4 tcm in ddr. Copy memory after exit from DSM. Also hold M4 in reset when entering DSM. Signed-off-by: Teo Hall <teo.hall@freescale.com> (cherry picked from commit 011ed0ab784eb566b68ebacea57ae3a6857b48ff)
2015-11-03MLK-11262-4: ARM: imx: add m4_bootrom and m4_tcm to dtsTeo Hall
add tcm and bootrom to device tree for m4 re-kick after DSM. Signed-off-by: Teo Hall <teo.hall@freescale.com> (cherry picked from commit 2a69a6e413c4aa5c7662f971e535d559d6013f7c)
2015-11-03MLK-11262-3: ARM: imx: Change GPC settings for Multicore LPMTeo Hall
change the slots to persistent to be congruent with M4 image. Also change so that slots do read/modify/write so that M4 settings are not overwritten. Signed-off-by: Teo Hall <teo.hall@freescale.com> (cherry picked from commit eae33480b615c1586248a761ef3c6bcd9e0c59af)
2015-11-03MLK-11262-2: ARM: imx: Add MU messages for LPM messagesTeo Hall
add LPM messages for: -M4 reporting state -M4 Request/Release High Bus Freq -A7 tell M4 it is ready Signed-off-by: Teo Hall <teo.hall@freescale.com> (cherry picked from commit 52234ae38e6e4f2b3452d807dd1c1e199be6350c)
2015-11-03MLK-11262-1: ARM: imx: add busfreq offset for M4Teo Hall
offset high_bus_count+1 when m4 is enabled Signed-off-by: Teo Hall <teo.hall@freescale.com> (cherry picked from commit 58983b6522c324affdbbeaa5b7b192a673c615a7)
2015-11-02MLK-11807 arm: imx: correct the spi nor port used by m4Richard Zhu
The spi nor port1 is used by m4 on imx6sx sabreauto board. Signed-off-by: Richard Zhu <Richard.Zhu@freescale.com> (cherry picked from commit 75eb4493d701fc068a2969b038cb0254ddc84b2c)
2015-11-01MLK-11800 dts: imx7d-sdb: correct flexcan stby gpio pinDong Aisheng
According to schematic, the pad used for CAN STBY signal should be EPDC_DATA14, not GPIO1_IO07. So correct it. And due to pin is conflict with epdc, so we also update the imx7d-sdb-epdc.dts. Reported-by: Peng Fan <Peng.Fan@freescale.com> Signed-off-by: Dong Aisheng <aisheng.dong@freescale.com>
2015-10-30MLK-11801 imx: mx7d: resolve conflicts with A7 and M4Peng Fan
M4 will use UART2, and RDC is configured that kernel can not access. If still enable it, kernel will panic. To validation board, disable gpio-keys, since m4 will use volume keys. Signed-off-by: Peng Fan <Peng.Fan@freescale.com> (cherry picked from commit ccd54fd2096b8f3443bafd0b86499e1eda027fc9)
2015-10-30MLK-11786 ARM: dts: imx6qp: correct vddcore regulator inputAnson Huang
On i.MX6QP SabreSD board, VDDCORE is from PFuze's SW2, this is different from i.MX6QDL SabreSD board, which is from SW1A/B. Signed-off-by: Anson Huang <Anson.Huang@freescale.com>