summaryrefslogtreecommitdiffstats
path: root/arch/arm/boot/dts
Commit message (Collapse)AuthorAgeFilesLines
* Merge tag 'imx-dt-3.18' of ↵Olof Johansson2014-09-2451-1081/+2601
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into next/dt Merge "ARM: imx: device tree changes for 3.18" from Shawn Guo: The i.MX device tree changes for 3.18: - Device tree support for i.MX ADS and Armadeus APF9328 boards - Enable thermal sensor support for i.MX6SL - Add LCD support for i.MX6SL EVK board - Fix display duplicate name for a bunch of board dts files - Configure imx6qdl-sabresd board pins locally to remove the dependency on bootloader - A set of imx28-tx28 board dts updates from Lothar - Add pci config space as platform resource - Enable devices RTC, I2C and HDMI for nitrogen6x board - Split HummingBoard DT to support s/dl and d/q - mSATA and IR input support for HummingBoard - Add SSI baud clock for i.MX6 device trees - Add USB support for vf610-colibri and vf610-twr boards - A set of cleanup and updates on Gateworks boards * tag 'imx-dt-3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: (86 commits) ARM: dts: imx6: make gpt per clock can be from OSC ARM: dts: imx: ventana: add canbus support for GW52xx ARM: dts: imx: ventana: cleanup pinctrl groups ARM: dts: imx: ventana: configure padconf for all pins ARM: dts: imx: ventana: use gpio constants ARM: dts: imx: ventana: remove unused aliases ARM: dts: imx: ventana: remove unsupported dt nodes ARM: dts: imx28-tx28: add alias for CAN XCVR regulator ARM: dts: imx28-tx28: add spi-gpio as alternative for spi-mxs ARM: dts: imx28-tx28: use GPIO flags ARM: dts: imx28-tx28: remove spidev labels and add third instance of spidev ARM: dts: imx6sl: add baud clock and clock-names for ssi ARM: dts: imx6qdl: add baud clock and clock-names for ssi ARM: dts: imx6qdl-sabresd: Configure the pins locally ARM: dts: imx28-m28evk: Fix display duplicate name warning ARM: dts: imx28-tx28: Fix display duplicate name warning ARM: dts: imx28-m28cu: Fix display duplicate name warning ARM: dts: imx28-cfa100: Fix display duplicate name warning ARM: dts: imx28-apf28dev: Fix display duplicate name warning ARM: dts: imx28-apx4devkit: Fix display duplicate name warning ... Signed-off-by: Olof Johansson <olof@lixom.net>
| * ARM: dts: imx6: make gpt per clock can be from OSCAnson Huang2014-09-162-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original gpt per clk parent is from ipg_per clk which may be scaled when system enter low bus mode, as ipg clk will be lower in low bus mode, to keep system clk NOT drift, select gpt per clk parent from OSC which is at fixed freq always. On i.mx6qdl, add a osc_per clk source for i.mx6q TO > 1.0 and all i.MX6dl SoC. On i.mx6sx, just make gpt per clk from OSC. Signed-off-by: Anson Huang <b20788@freescale.com> Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
| * ARM: dts: imx: ventana: add canbus support for GW52xxTim Harvey2014-09-161-0/+14
| | | | | | | | | | | | | | | | The GW52xx baseboard supports CANbus so we enable it, configure its pinmux and CAN_STBY gpio. Signed-off-by: Tim Harvey <tharvey@gateworks.com> Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
| * ARM: dts: imx: ventana: cleanup pinctrl groupsTim Harvey2014-09-165-448/+491
| | | | | | | | | | | | | | | | | | | | Follow the conventions for pinctrl: - grouping pinctrl in logical alphabatized groups - remove any pinctrl not being used by a driver or needed by user - move iomuxc to bottom of file for readability Signed-off-by: Tim Harvey <tharvey@gateworks.com> Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
| * ARM: dts: imx: ventana: configure padconf for all pinsTim Harvey2014-09-165-69/+69
| | | | | | | | | | | | | | | | Follow the convention of configuring padconf for all pins and not leaving any 0x80000000 to leave them un-configured. Signed-off-by: Tim Harvey <tharvey@gateworks.com> Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
| * ARM: dts: imx: ventana: use gpio constantsTim Harvey2014-09-165-47/+56
| | | | | | | | | | | | | | Use the gpio contants defined in bindings for active high/low Signed-off-by: Tim Harvey <tharvey@gateworks.com> Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
| * ARM: dts: imx: ventana: remove unused aliasesTim Harvey2014-09-165-15/+0
| | | | | | | | | | | | | | | | Remove aliases that are either not used by bootloader or are provided via included dtsi files. Signed-off-by: Tim Harvey <tharvey@gateworks.com> Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
| * ARM: dts: imx: ventana: remove unsupported dt nodesTim Harvey2014-09-165-292/+0
| | | | | | | | | | | | | | | | | | The general device-tree rule is to not include nodes that do not have a driver or bindings in a dts/dtsi. Remove the place-holder nodes from the Gateworks Ventana boards until a time that a driver with proper bindings exists. Signed-off-by: Tim Harvey <tharvey@gateworks.com> Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
| * ARM: dts: imx28-tx28: add alias for CAN XCVR regulatorLothar Waßmann2014-09-161-0/+1
| | | | | | | | | | | | | | | | This alias is used by U-Boot to enable/disable the regulator depending on baseboard type. Signed-off-by: Lothar Waßmann <LW@KARO-electronics.de> Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
| * ARM: dts: imx28-tx28: add spi-gpio as alternative for spi-mxsLothar Waßmann2014-09-161-0/+54
| | | | | | | | | | | | | | | | | | | | | | The spi-mxs driver does not allow full duplex SPI transfers. The spi-gpio driver may be used as an alternative if this is required. Make the choice between those drivers easier for the end user by providing settings for both drivers. Signed-off-by: Lothar Waßmann <LW@KARO-electronics.de> Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
| * ARM: dts: imx28-tx28: use GPIO flagsLothar Waßmann2014-09-161-18/+18
| | | | | | | | | | Signed-off-by: Lothar Waßmann <LW@KARO-electronics.de> Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
| * ARM: dts: imx28-tx28: remove spidev labels and add third instance of spidevLothar Waßmann2014-09-161-2/+8
| | | | | | | | | | | | | | | | | | The labels on the spidev nodes are not used and not required, so remove them. The TX28 supports 3 chipselects on the SPI interface. Make all those chipselects available to the user. Signed-off-by: Lothar Waßmann <LW@KARO-electronics.de> Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
| * ARM: dts: imx6sl: add baud clock and clock-names for ssiShengjiu Wang2014-09-161-3/+9
| | | | | | | | | | | | | | | | Baud clock is used for bit clock generation in master mode. Ipg clock is peripheral clock and peripheral access clock. Signed-off-by: Shengjiu Wang <shengjiu.wang@freescale.com> Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
| * ARM: dts: imx6qdl: add baud clock and clock-names for ssiShengjiu Wang2014-09-161-3/+9
| | | | | | | | | | | | | | | | Baud clock is used for bit clock generation in master mode. Ipg clock is peripheral clock and peripheral access clock. Signed-off-by: Shengjiu Wang <shengjiu.wang@freescale.com> Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
| * ARM: dts: imx6qdl-sabresd: Configure the pins locallyFabio Estevam2014-09-161-13/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Passing '0x80000000' to the pin configuration means that kernel will skip the IOMUXC_SW_PAD_CTL configuration and will use whathever values come from the bootloader. Instead of relying on the bootloader setup, let's configure it in the kernel to have predictable settings. '0x1b0b0' is the default POR value for all these pins and has also been verified that the pins are using this value by manually inspecting the IOMUXC_SW_PAD_CTL registers, so no functional change has been made. Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
| * ARM: dts: imx28-m28evk: 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-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-161-1/+3
| | | | | | | | | | | | | | | | 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>
OpenPOWER on IntegriCloud