summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* ARM: dts: imx28-tx28: Fix display duplicate name warningFabio Estevam2014-09-161-3/+3
| | | | | | | | | | | | | The lcdif node has a property named "display" and also a child node called "display", which causes the following warning: device-tree: Duplicate name in lcdif@80030000, renamed to "display#1" Rename the child node name in order to avoid the warning. Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Acked-by: Lothar Waßmann <LW@KARO-electronics.de> Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
* ARM: dts: imx28-m28cu: Fix display duplicate name warningFabio Estevam2014-09-161-2/+2
| | | | | | | | | | | | The lcdif node has a property named "display" and also a child node called "display", which causes the following warning: device-tree: Duplicate name in lcdif@80030000, renamed to "display#1" Rename the child node name in order to avoid the warning. Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
* ARM: dts: imx28-cfa100: Fix display duplicate name warningFabio Estevam2014-09-165-10/+10
| | | | | | | | | | | | The lcdif node has a property named "display" and also a child node called "display", which causes the following warning: device-tree: Duplicate name in lcdif@80030000, renamed to "display#1" Rename the child node name in order to avoid the warning. Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
* ARM: dts: imx28-apf28dev: Fix display duplicate name warningFabio Estevam2014-09-161-2/+2
| | | | | | | | | | | | The lcdif node has a property named "display" and also a child node called "display", which causes the following warning: device-tree: Duplicate name in lcdif@80030000, renamed to "display#1" Rename the child node name in order to avoid the wa Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
* ARM: dts: imx28-apx4devkit: Fix display duplicate name warningFabio Estevam2014-09-161-2/+2
| | | | | | | | | | | | The lcdif node has a property named "display" and also a child node called "display", which causes the following warning: device-tree: Duplicate name in lcdif@80030000, renamed to "display#1" Rename the child node name in order to avoid the warning. Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
* ARM: dts: imx6sl-evk: Fix display duplicate name warningFabio Estevam2014-09-161-2/+2
| | | | | | | | | | | | The lcdif node has a property named "display" and also a child node called "display", which causes the following warning: device-tree: Duplicate name in lcdif@02220000, renamed to "display#1" Rename the child node name in order to avoid the warning. Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
* ARM: dts: imx23-evk: Fix display duplicate name warningFabio Estevam2014-09-161-2/+2
| | | | | | | | | | | | The lcdif node has a property named "display" and also a child node called "display", which causes the following warning: device-tree: Duplicate name in lcdif@80030000, renamed to "display#1" Rename the child node name in order to avoid the warning. Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
* ARM: dts: imx28-evk: Fix display duplicate name warningFabio Estevam2014-09-161-2/+2
| | | | | | | | | | | | The lcdif node has a property named "display" and also a child node called "display", which causes the following warning: device-tree: Duplicate name in lcdif@80030000, renamed to "display#1" Rename the child node name in order to avoid the warning. Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
* ARM: dts: imx6x-sdb: Add LCD supportFabio Estevam2014-09-161-0/+93
| | | | | | | Add support for the "MX28LCD Seiko 4.3' WVGA" panel. Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
* ARM: dts: imx6sx: Add LCDIF compatible stringsFabio Estevam2014-09-161-0/+2
| | | | | | | | imx6sx has the same LCDIF controller IP as in mx28, so add the proper compatible strings. Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
* ARM: dts: apf27dev: add max1027 in the dtsPhilippe Reynes2014-09-161-0/+17
| | | | | Signed-off-by: Philippe Reynes <tremyfr@gmail.com> Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
* ARM: imx6: add pci config space as platform resourceLucas Stach2014-09-162-2/+6
| | | | | | | | Fixes "imx6q-pcie 1ffc000.pcie: missing *config* reg space" error exposed by new versions of the designware pcie driver. Signed-off-by: Lucas Stach <l.stach@pengutronix.de> Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
* ARM: dts: Add support for the i.MX1 Armadeus APF9328 boardAlexander Shiyan2014-09-162-0/+130
| | | | | | | | This patch adds support for the i.MX1 APF9328 from Armadeus. This change is intended to further remove non-DT support for this board. Signed-off-by: Alexander Shiyan <shc_work@mail.ru> Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
* ARM: dts: hummingboard: fix configuration of IR inputRussell King2014-09-161-1/+1
| | | | | | | | Add the IOMUX setting for the IR input, rather than relying on the boot loader. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
* ARM: dts: hummingboard: gpio-ir on gpio 3,5Rabeeh Khoury2014-09-161-4/+4
| | | | | | | | | | | | | HummingBoard after rev 2.0 and the production one starting rev 3.0 uses gpio 3,5 (EIM_DA5 pad) as the gpio infra red receiver input. Since the original Carrier1 board is obsolete and we are retiring it, update the DT file for this. This will mean IR reception will not work on Carrier1 with this DT file. Signed-off-by: Rabeeh Khoury <rabeeh@solid-run.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
* ARM: dts: hummingboard: add mSATA support for iMX6 quad/dual HummingBoardRabeeh Khoury2014-09-161-0/+8
| | | | | | | | Initial patch from Rabeeh, but with the electrical properties added. Signed-off-by: Rabeeh Khoury <rabeeh@solid-run.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
* ARM: dts: hummingboard: Split HummingBoard DT to support s/dl and d/qRabeeh Khoury2014-09-164-198/+219
| | | | | | Signed-off-by: Rabeeh Khoury <rabeeh@solid-run.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
* ARM: dts: i.MX53: add pmu nodeSteffen Trumtrar2014-09-161-0/+5
| | | | | | | | | The i.MX53 has a Cortex-A8 Performance Monitor Unit. Add it to the dtsi. Signed-off-by: Steffen Trumtrar <s.trumtrar@pengutronix.de> Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
* ARM: dts: nitrogen6x: Add Intersil ISL1208 RTCPhilipp Zabel2014-09-161-0/+5
| | | | | | | | This patch adds the battery backed real time clock connected to I2C1 to the device tree. Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de> Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
* ARM: dts: imx6sl-evk: Add LCD supportFabio Estevam2014-09-162-0/+98
| | | | | | | Add support for the "MX28LCD Seiko 4.3' WVGA" panel. Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
* ARM: dts: imx6sl-evk.dts: Keep pinctrl nodes sortedFabio Estevam2014-09-161-6/+6
| | | | | | | Let's keep pinctrl nodes sorted. Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
* ARM: dts: Gateworks GW5520 support (i.MX6)Tim Harvey2014-09-164-0/+313
| | | | | | | Add support for the Gateworks GW5520 board. Signed-off-by: Tim Harvey <tharvey@gateworks.com> Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
* ARM: i.MX: dts: Add simple-card supportAlexander Shiyan2014-09-168-0/+20
| | | | | | | This patch adds simple-card support to the i.MX SoCs. Signed-off-by: Alexander Shiyan <shc_work@mail.ru> Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
* ARM: i.MX: dts: Add support for the Freescale i.MX1 ADS boardAlexander Shiyan2014-09-162-0/+153
| | | | | | | | This patch adds support for the Freescale (Motorola) i.MX1 ADS board. This change is intended to further remove non-DT support for this board. Signed-off-by: Alexander Shiyan <shc_work@mail.ru> Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
* ARM: dts: vf610-twr: Add USB supportStefan Agner2014-09-161-0/+10
| | | | | | | | | Add USB support for Freescale Vybrid tower. The USB hosts over-current protection signal is not connected to the PHY's over- current protection, hence we need to disable it. Signed-off-by: Stefan Agner <stefan@agner.ch> Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
* ARM: dts: vf610-colibri: Add USB supportStefan Agner2014-09-161-0/+10
| | | | | | | | | | | | Add USB support for Colibri VF61 modules. The Colibri standard pinout defines a pin for USB over-current. However, due to lack of pinmux options, the USB hosts over-current protection signal of the Colibri standard could not be connected to the PHY's over-current protection. Hence we need to disable the over-current functionality of the USB controller. Signed-off-by: Stefan Agner <stefan@agner.ch> Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
* ARM: dts: vf610: Add usbmisc for non-core registersStefan Agner2014-09-161-1/+15
| | | | | | | | | Add device tree node for usbmisc which controls the non-core USB registers. This is required to use the property to disable the over- current detection. Signed-off-by: Stefan Agner <stefan@agner.ch> Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
* ARM: dts: vf610: Add USB PHY and controllerStefan Agner2014-09-161-3/+43
| | | | | | | | | | | | This adds USB PHY and USB controller nodes. Vybrid SoCs have two independent USB cores which each supports DR (dual role). However, real OTG is not supported since the OTG ID pin is not available. The PHYs are located within the anadig register range, hence we need to change the length of the anadig registers. Signed-off-by: Stefan Agner <stefan@agner.ch> Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
* ARM: dts: imx28: add alternative pinmuxing for i2c1Uwe Kleine-König2014-09-161-0/+11
| | | | | Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
* ARM: dts: imx28: add pinmuxing for mmc1Marc Kleine-Budde2014-09-161-0/+32
| | | | | | | Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> [ukl: rebase from ancient kernel version] Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
* ARM: dts: imx25-pinfunc: Add several pin configurationsMichael Grzeschik2014-09-161-2/+31
| | | | | | | | | | | | | | | | This patch adds pin configurations for: - csi aud6 - cspi1 uart3 - csi uart5 - cc - csi sdhc2 - csi cspi3 - sd1 cspi2 - cspi1 pwm Signed-off-by: Michael Grzeschik <m.grzeschik@pengutronix.de> Signed-off-by: Markus Pargmann <mpa@pengutronix.de> Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
* ARM: dts: imx25: remove imx35-sdma compatibleMarkus Pargmann2014-09-161-1/+1
| | | | | | | | | The preloaded script addresses on imx25 and imx35 are different, so imx25 is not compatible with imx35-sdma unless a custom firmware is loaded. Signed-off-by: Markus Pargmann <mpa@pengutronix.de> Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
* ARM: dts: vf610-twr: Add ttyLP2 device.Bill Pringlemeir2014-09-161-2/+13
| | | | | | | | | | | | | | The ttyLP1 is already the default console/serial port. The tower board will route ttyLP2 to the same connectors depending on the JP23/24 settings. See: http://lists.infradead.org/pipermail/linux-arm-kernel/2014-July/276457.html http://lists.infradead.org/pipermail/linux-arm-kernel/2014-July/275576.html Signed-off-by: Bill Pringlemeir <bpringlemeir@nbsps.com> Acked-by: Stefan Agner <stefan@agner.ch> Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
* ARM: dts: add thermal sensor support for i.mx6slAnson Huang2014-09-161-1/+9
| | | | | | | Add thermal sensor support for i.MX6SL. Signed-off-by: Anson Huang <b20788@freescale.com> Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
* ARM: dts: i.MX1: Add i.MX1 templateAlexander Shiyan2014-09-162-0/+568
| | | | | | | This patch adds basic devicetree template for i.MX1 based SoCs. Signed-off-by: Alexander Shiyan <shc_work@mail.ru> Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
* ARM: dts: nitrogen6x: add i2c3Philipp Zabel2014-09-161-0/+14
| | | | | | Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de> Signed-off-by: Lucas Stach <l.stach@pengutronix.de> Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
* ARM: dts: nitrogen6x: add hdmiMichael Olbrich2014-09-161-0/+5
| | | | | | Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> Signed-off-by: Lucas Stach <l.stach@pengutronix.de> Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
* ARM: dts: nitrogen6x: add i2c2Michael Olbrich2014-09-161-0/+14
| | | | | | Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> Signed-off-by: Lucas Stach <l.stach@pengutronix.de> Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
* ARM: dts: imx6qdl-sabresd: add always on pcie regulatorLucas Stach2014-09-161-0/+19
| | | | | | | | | | | | | | Everything in the PCI specification assumes devices to be enumerable on startup. This is only possible if they have power available. A future improvement may allow this regulator to be switched off for D3hot and D3cold power states, but there is a lot of work to do the pcie host controller side for this to work. To keep things simple always enable the regulator for now. Signed-off-by: Lucas Stach <l.stach@pengutronix.de> Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
* ARM: dts: vf610-colibri: split device tree for carrier boardsStefan Agner2014-09-163-13/+49
| | | | | | | | | | | | | | The Colibri VF61 is a module which needs a carrier board to actually run. Different carrier board have different hardware support, hence we should reflect this in the device tree files. This patch adds the Colibri Evaluation Board, which supports almost all peripherals defined in the Colibri standard. Also align the compatible naming, file splitting and file naming with the scheme which was choosen for the Tegra based modules. Signed-off-by: Stefan Agner <stefan@agner.ch> Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
* Merge branch 'imx/soc' into imx/dtShawn Guo2014-09-1639-1990/+521
|\
| * ARM: imx_v6_v7_defconfig updatesFabio Estevam2014-09-161-6/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The rtc isl1208 driver is used by mx6 nitrogen board, so let's enable it by default. The fsl sai driver is used by the vf610-twr board, so let's enable it by default. simple-audio-card driver is used by the vf610-twr board, so let's enable it by default. Generated this patch by doing: - make imx_v6_v7_defconfig - make menuconfig and manually select options - make savedefconfig - cp defconfig arch/arm/configs/imx_v6_v7_defconfig ,which results in some additional cleanups. Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
| * ARM: imx_v4_v5_defconfig: Select CONFIG_IMX_WEIMFabio Estevam2014-09-161-9/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The imx weim driver is used by some mx27/mx1 boards, so let's enable it by default. Generated this patch by doing: - make imx_v4_v5_defconfig - make menuconfig and manually select CONFIG_IMX_WEIM - make savedefconfig - cp defconfig arch/arm/configs/imx_v4_v5_defconfig ,which results in some additional cleanups. Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
| * arm: mach-imx: Convert pr_warning to pr_warnJoe Perches2014-09-164-6/+6
| | | | | | | | | | | | | | Use the more common pr_warn. Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
| * ARM: imx: source gpt per clk from OSC for system timerAnson Huang2014-09-161-5/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On i.MX6Q TO > 1.0, i.MX6DL and i.MX6SX, gpt per clock can be from OSC instead of ipg_per, as ipg_per's rate may be scaled when system enter low bus mode, to keep system timer NOT drift, better to make gpt per clock at fixed rate, here add support for gpt per clock to be from OSC which is at fixed rate always. There are some difference on this implementation of gpt per clock source, see below for details: i.MX6Q TO > 1.0: GPT_CR_CLKSRC, b'101 selects fix clock of OSC / 8 for gpt per clk; i.MX6DL and i.MX6SX: GPT_CR_CLKSRC, b'101 selects OSC for gpt per clk, and we must enable GPT_CR_24MEM to enable OSC clk source for gpt per, GPT_PR_PRESCALER24M is for pre-scaling of this OSC clk, here set it to 8 to make gpt per clk is 3MHz; i.MX6SL: ipg_per can be from OSC directly, so no need to implement this new clk source for gpt per. Signed-off-by: Anson Huang <b20788@freescale.com> Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
| * ARM: imx: add gpt_3m clk for i.mx6qdlAnson Huang2014-09-162-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | Add gpt_3m clock for i.mx6qdl, as gpt can source clock from OSC, some i.MX6 series SOCs has fixed divider of 8 for gpt clock, so here add a fix clk of gpt_3m. i.MX6Q TO1.0 has no gpt_3m option, so force it to be from ipg_per. Signed-off-by: Anson Huang <b20788@freescale.com> Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
| * ARM: imx: fix register offset of pll7_usb_host gate clockShawn Guo2014-09-163-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | There is a copy&paste error on register offset of pll7_usb_host gate clock introduced by i.MX6 PLL bypass support patches. The error breaks the ENET function, because it overwrites the pll6_enet gate bit. Correct the offset for all i.MX6 clock drivers. Thanks to Fugang Duan <B38611@freescale.com> for spotting the error. Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
| * ARM: clk-imx6sl: refine clock tree for SSIShengjiu Wang2014-09-162-4/+14
| | | | | | | | | | | | | | Each SSI has "ssi", "ssi_ipg" clocks, and they share same gate bits. Signed-off-by: Shengjiu Wang <shengjiu.wang@freescale.com> Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
| * ARM: imx: remove ENABLE and BYPASS bits from clk-pllv3 driverShawn Guo2014-09-161-37/+0
| | | | | | | | | | | | | | | | Since ENABLE and BYPASS bits of PLLs are now implemented as separate gate and mux clocks by clock drivers, the code handling these two bits can be removed from clk-pllv3 driver. Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
| * ARM: imx6sx: add BYPASS support for PLL clocksShawn Guo2014-09-162-10/+78
| | | | | | | | | | | | | | | | This is the same change for imx6sx clock driver as "ARM: imx6q: add BYPASS support for PLL clocks" for imx6q. The difference is that only anaclk1 is available on imx6sx. Signed-off-by: Shawn Guo <shawn.guo@freescale.com>