OSDN Git Service
Alexander Shiyan [Sat, 8 Jun 2013 14:39:38 +0000 (18:39 +0400)]
ARM: dts: imx27-phytec-phycore-rdk: Add SDHC support
This patch adds the SHDC devicetree node for PCM970 board.
Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
Acked-by: Sascha Hauer <s.hauer@pengutonix.de>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Alexander Shiyan [Sat, 8 Jun 2013 14:39:37 +0000 (18:39 +0400)]
ARM: dts: i.MX27: Add SDHC devicetree nodes
This patch adds the missing SDHC devicetree nodes for i.MX27 SoCs.
Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
Acked-by: Sascha Hauer <s.hauer@pengutonix.de>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Alexander Shiyan [Sat, 8 Jun 2013 14:39:36 +0000 (18:39 +0400)]
ARM: dts: i.MX27: Add DMA devicetree node
This patch adds the missing DMA devicetree node for i.MX27 SoCs.
Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
Acked-by: Sascha Hauer <s.hauer@pengutonix.de>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Huang Shijie [Tue, 28 May 2013 06:20:12 +0000 (14:20 +0800)]
ARM: dts: imx6qdl-sabreauto: enable the WEIM NOR
Enable the WEIM NOR for imx6q{dl}-sabreauto boards.
For the pin conflict with SPI NOR, its status is set to "disabled".
Signed-off-by: Huang Shijie <b32955@freescale.com>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Huang Shijie [Tue, 28 May 2013 06:20:11 +0000 (14:20 +0800)]
ARM: dts: imx6dl: add pinctrls for WEIM NOR
Add two pinctrls for WEIM:
one for the weim nor, another for the chipselect.
Signed-off-by: Huang Shijie <b32955@freescale.com>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Huang Shijie [Tue, 28 May 2013 06:20:10 +0000 (14:20 +0800)]
ARM: dts: imx6q: add pinctrls for WEIM NOR
Add two pinctrls for WEIM:
one for the weim nor, another for the chipselect.
Signed-off-by: Huang Shijie <b32955@freescale.com>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Huang Shijie [Tue, 28 May 2013 06:20:09 +0000 (14:20 +0800)]
ARM: dts: imx6qdl: add more information for WEIM
Add the clock and compatible information for the weim.
Also adds the weim label.
Signed-off-by: Huang Shijie <b32955@freescale.com>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Huang Shijie [Tue, 28 May 2013 06:20:08 +0000 (14:20 +0800)]
ARM: dts: imx6q{dl}: fix the pin conflict between SPI and WEIM
In the imx6q-sabreauto and imx6dl-sabreauto boards,
the pin MX6Q{DL}_PAD_EIM_D19 is used as a GPIO for SPI NOR, but
it is used as a data pin for the WEIM NOR.
In order to fix the conflict, this patch removes the pin from the hog,
and adds a new board-level pinctrl: pinctrl_ecspi1_sabreauto.
The SPI NOR selects this pinctrl_ecspi1_sabreauto when it is enabled.
Signed-off-by: Huang Shijie <b32955@freescale.com>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Huang Shijie [Tue, 28 May 2013 06:20:07 +0000 (14:20 +0800)]
drivers: bus: add a new driver for WEIM
The WEIM(Wireless External Interface Module) works like a bus.
You can attach many different devices on it, such as NOR, onenand.
In the case of i.MX6q-sabreauto, the NOR is connected to WEIM.
This patch also adds the devicetree binding document.
The driver only works when the devicetree is enabled.
Signed-off-by: Huang Shijie <b32955@freescale.com>
Acked-by: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Markus Niebel [Tue, 4 Jun 2013 11:07:15 +0000 (13:07 +0200)]
ARM i.MX53: mba53: add DI1_CLK to pinctrl for disp1
Add missing pin config
Signed-off-by: Markus Niebel <Markus.Niebel@tqs.de>
Signed-off-by: Steffen Trumtrar <s.trumtrar@pengutronix.de>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Steffen Trumtrar [Tue, 4 Jun 2013 11:07:14 +0000 (13:07 +0200)]
ARM i.MX53: mba53: fix lvds/disp pinctrl
use NO_PAD_CTL / 0x80000000 instead of 0x10000 to prevent misconfigured pads
Signed-off-by: Markus Niebel <Markus.Niebel@tqs.de>
[Steffen: split up patch into tqma53+mba53 part]
Signed-off-by: Steffen Trumtrar <s.trumtrar@pengutronix.de>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Markus Niebel [Tue, 4 Jun 2013 11:07:13 +0000 (13:07 +0200)]
ARM i.MX53: mba53: use reset gpio for FEC
Signed-off-by: Markus Niebel <Markus.Niebel@tqs.de>
Signed-off-by: Steffen Trumtrar <s.trumtrar@pengutronix.de>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Markus Niebel [Tue, 4 Jun 2013 11:07:12 +0000 (13:07 +0200)]
ARM i.MX53: mba53: add missing gpio stuff for pca9554
Add properties to make use of pca9554 gpio expander.
Signed-off-by: Markus Niebel <Markus.Niebel@tqs.de>
Signed-off-by: Steffen Trumtrar <s.trumtrar@pengutronix.de>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Markus Niebel [Tue, 4 Jun 2013 11:07:11 +0000 (13:07 +0200)]
ARM i.MX53: mba53: add sound support
Enable the sgtl5000 found on MBa53 mainboard.
Also enable audio muxer and ssi, which are needed for sound to work.
Signed-off-by: Markus Niebel <Markus.Niebel@tqs.de>
Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: Steffen Trumtrar <s.trumtrar@pengutronix.de>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Philipp Zabel [Tue, 4 Jun 2013 11:07:10 +0000 (13:07 +0200)]
ARM i.MX53: mba53: add Tevision Encoder
Enable tve on MBa53.
Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: Steffen Trumtrar <s.trumtrar@pengutronix.de>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Sascha Hauer [Tue, 4 Jun 2013 11:07:09 +0000 (13:07 +0200)]
ARM i.MX53: mba53: Add display support
As the displays are optional and we have more than one, also
set the status of the parallel display and the ldb to disabled.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: Steffen Trumtrar <s.trumtrar@pengutronix.de>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Michael Olbrich [Tue, 4 Jun 2013 11:07:08 +0000 (13:07 +0200)]
ARM i.MX53: mba53: enable usbotg & usbh1
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Signed-off-by: Markus Niebel <Markus.Niebel@tqs.de>
Signed-off-by: Steffen Trumtrar <s.trumtrar@pengutronix.de>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Steffen Trumtrar [Thu, 6 Jun 2013 09:49:36 +0000 (11:49 +0200)]
ARM i.MX53: tqma53: add WP/CD pinctrl and vmmc to esdhc2
Add WP/CD pinctrl for esdhc2.
Also, add vmmc-supply for esdhc2.
Signed-off-by: Steffen Trumtrar <s.trumtrar@pengutronix.de>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Philipp Zabel [Tue, 4 Jun 2013 10:12:22 +0000 (12:12 +0200)]
ARM i.MX53: Add TVE entry to i.MX53 dtsi
This adds the Television Encoder (TVEv2) device tree node
to the i.MX53 dtsi.
Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: Steffen Trumtrar <s.trumtrar@pengutronix.de>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Philipp Zabel [Tue, 4 Jun 2013 09:12:29 +0000 (11:12 +0200)]
ARM i.MX53: tqma53: rev 300 specific pin configuration
I2S_MCLK is moved from pad GPIO19 to GPIO0, which can be muxed to the
ssi_ext1 clock signal. #SYSTEM_DOWN is moved from pad GPIO0 to GPIO19.
Add #PHY_RESET and LCD_CONTRAST.
Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: Steffen Trumtrar <s.trumtrar@pengutronix.de>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Philipp Zabel [Tue, 4 Jun 2013 09:12:28 +0000 (11:12 +0200)]
ARM i.MX53: tqma53: fix pinctrl settings
BIT(31) is NO_PAD_CTL, not BIT(16)
Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: Steffen Trumtrar <s.trumtrar@pengutronix.de>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Sascha Hauer [Tue, 4 Jun 2013 09:12:27 +0000 (11:12 +0200)]
ARM i.MX53: tqma53: Fix interrupt polarity for the mc34708
It's active high, not active low.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Alexander Shiyan [Sat, 1 Jun 2013 05:54:13 +0000 (09:54 +0400)]
ARM: dts: imx27-phytec-phycore-som: Add initial support for PCM970 RDK
Patch adds initial dts for Phytec PCM970 Rapid development kit.
- Added definition for UART0 and UART1.
- Added additional SPI chipselect which used on RDK for ZegBee module.
Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
Acked-by: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Alexander Shiyan [Sat, 1 Jun 2013 05:54:12 +0000 (09:54 +0400)]
ARM: dts: imx27-phytec-phycore-som: Remove UART definitions
UART1 and UART2 can be unused on some designs with PCM038 module.
Remove these definitions from basic dts and lets choose user only
necessary UARTs in custom designs.
Keep UART0 for using this one as boot console, but since we have
not way to disable usage RTSCTS signals, remove this parameter for UART0.
Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
Acked-by: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Alexander Shiyan [Sat, 1 Jun 2013 05:54:11 +0000 (09:54 +0400)]
ARM: dts: imx27-phytec-phycore: Rename file to match functionality
PCM038 dts can be used as base for development kit board or any
custom PCB designs. Renames this file to match functionality.
Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
Acked-by: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Alexander Shiyan [Sat, 1 Jun 2013 05:54:10 +0000 (09:54 +0400)]
ARM: dts: imx27-phytec-phycore: Add reset GPIO for FEC
FEC (KSZ8001L) reset pin is connected to GPIOC30.
Add this definition to dts.
Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
Acked-by: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Jingchang Lu [Tue, 28 May 2013 09:12:23 +0000 (17:12 +0800)]
ARM: dts: add initial VF610 Tower board dts support
Add initial Freescale Vybrid VF610 Tower board support
with uart and fec enabled.
Signed-off-by: Jingchang Lu <b35083@freescale.com>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Jingchang Lu [Tue, 28 May 2013 09:12:22 +0000 (17:12 +0800)]
ARM: dts: add SoC level device tree source for VF610
Add SoC level device tree source for Freescale Vybrid VF610.
Signed-off-by: Jingchang Lu <b35083@freescale.com>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Jonas Andersson [Mon, 27 May 2013 08:52:54 +0000 (10:52 +0200)]
ARM: dts: imx53: add fec pinctrl
Add a group to the fec pinctrl, for use with MII interface.
Signed-off-by: Jonas Andersson <jonas@microbit.se>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Jonas Andersson [Mon, 27 May 2013 08:52:45 +0000 (10:52 +0200)]
ARM: dts: imx53: add ecspi2 pinctrl
Add ecspi2 pinctrl.
Signed-off-by: Jonas Andersson <jonas@microbit.se>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Jonas Andersson [Mon, 27 May 2013 08:52:21 +0000 (10:52 +0200)]
ARM: dts: imx53: add cspi pinctrl
Add a group to the cspi pinctrl.
Signed-off-by: Jonas Andersson <jonas@microbit.se>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Rogerio Pimentel [Fri, 24 May 2013 14:09:30 +0000 (11:09 -0300)]
ARM: dts: mx53qsb: Add support for parallel display
Add support for CLAA WVGA display for i.MX53 QSB.
Signed-off-by: Rogerio Pimentel <rogerio.pimentel@freescale.com>
Acked-by: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Gwenhael Goavec-Merou [Thu, 16 May 2013 10:25:31 +0000 (12:25 +0200)]
ARM: imx: apf51: add nfc support
Signed-off-by: Gwenhael Goavec-Merou <gwenhael.goavec-merou@armadeus.com>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Dirk Behme [Thu, 16 May 2013 06:51:34 +0000 (08:51 +0200)]
i.MX6: Documentation: update from fsl,card-wired to non-removable
With the commit
7f217794f (mmc: dt: Consolidate DT bindings),
the device tree properties used by various device drivers
for SD/MMC host controllers were standardized. One of the changes
was that the property "fsl,card-wired", previously used by the
Freescale driver, was replaced with "non-removable". Fix the example
documentation regarding this.
Signed-off-by: Dirk Behme <dirk.behme@de.bosch.com>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Shawn Guo [Sun, 28 Apr 2013 02:01:18 +0000 (10:01 +0800)]
ARM: dts: imx6qdl: remove redundant ocotp node
There is a redundant ocotp node. Remove it.
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Shawn Guo [Sun, 28 Apr 2013 01:59:54 +0000 (09:59 +0800)]
ARM: dts: imx6qdl: remove redundant usbmisc label
There is a redundant label on usbmisc node. Remove it.
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Shawn Guo [Fri, 3 May 2013 03:28:42 +0000 (11:28 +0800)]
ARM: dts: imx6sl: add initial imx6sl-evk support
Add initial imx6sl-evk board support with uart, usdhc and fec enabled.
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Shawn Guo [Fri, 3 May 2013 03:26:30 +0000 (11:26 +0800)]
ARM: dts: add device tree source for imx6sl SoC
Add SoC level device tree source for imx6sl.
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Dirk Behme [Fri, 26 Apr 2013 08:13:55 +0000 (10:13 +0200)]
ARM: dts: i.MX6: configure L2 cache data and tag latency
Configure the data and tag latency for the L2 cache. This improves the
system performance.
This configuration is taken from Freescale's kernel patch
"ENGR00153601 [MX6]Adjust L2 cache parameter" [1]
which does
writel(0x132, IO_ADDRESS(L2_BASE_ADDR + L2X0_TAG_LATENCY_CTRL));
writel(0x132, IO_ADDRESS(L2_BASE_ADDR + L2X0_DATA_LATENCY_CTRL));
In this patch we are doing the same via the device tree.
Signed-off-by: Dirk Behme <dirk.behme@de.bosch.com>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
[1] http://git.freescale.com/git/cgit.cgi/imx/linux-2.6-imx.git/commit/arch/arm/mach-mx6/mm.c?h=imx_3.0.35_12.09.01&id=
814656410b40c67a10b25300e51b0477b2bb96d1
Huang Shijie [Thu, 9 May 2013 03:29:03 +0000 (11:29 +0800)]
ARM: dts: add SPI/NOR for mx6q{dl}-sabreauto boards
Since the SPI/NOR has pin conflict with the WEIM NOR,
we disable the spi/nor by default.
Signed-off-by: Huang Shijie <b32955@freescale.com>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Huang Shijie [Thu, 9 May 2013 03:29:02 +0000 (11:29 +0800)]
ARM: dts: imx6q: add a gpio for hog
The SPI/NOR needs this gpio for CS.
So add this gpio in the hog pinctrl.
Signed-off-by: Huang Shijie <b32955@freescale.com>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Huang Shijie [Thu, 9 May 2013 03:29:01 +0000 (11:29 +0800)]
ARM: dts: imx6dl: add a gpio for hog
The SPI/NOR needs this gpio for CS.
So add this gpio in the hog pinctrl.
Signed-off-by: Huang Shijie <b32955@freescale.com>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Huang Shijie [Thu, 9 May 2013 03:29:00 +0000 (11:29 +0800)]
ARM: dts: imx6dl: add a pinctrl for eCSPI1
Signed-off-by: Huang Shijie <b32955@freescale.com>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Huang Shijie [Tue, 7 May 2013 07:39:20 +0000 (15:39 +0800)]
ARM: dts: enable the gpmi-nand for imx6q{dl}-sabreauto boards
enable the gpmi-nand for imx6q-sabreauto and imx6qdl-sabreauto boards.
Signed-off-by: Huang Shijie <b32955@freescale.com>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Huang Shijie [Tue, 7 May 2013 07:39:19 +0000 (15:39 +0800)]
ARM: dts: imx6dl: add pinctrl for gpmi-nand
add the pinctrl item for gpmi-nand.
Signed-off-by: Huang Shijie <b32955@freescale.com>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Huang Shijie [Tue, 7 May 2013 07:39:18 +0000 (15:39 +0800)]
ARM: dts: imx6q: remove the unused pins for gpmi-nand
The gpmi does not use the MX6Q_PAD_NANDF_CS2__NAND_CE2_B and
MX6Q_PAD_NANDF_CS3__NAND_CE3_B.
Just remove them.
Signed-off-by: Huang Shijie <b32955@freescale.com>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Alexander Shiyan [Fri, 3 May 2013 08:08:21 +0000 (12:08 +0400)]
ARM: dts: Add SPI support for i.MX27 Phytec PCM038 module
Added SPI node and PMIC MC13783 (spi0.0) to imx27-phytec-phycore DT file.
Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
Acked-by: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Alexander Shiyan [Wed, 1 May 2013 10:46:57 +0000 (14:46 +0400)]
ARM: dts: Add aliases for i.MX27 SPI controller
Add aliases to determine the proper SPI bus number.
Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Steffen Trumtrar [Wed, 24 Apr 2013 09:41:26 +0000 (11:41 +0200)]
ARM: dts: add Ka-Ro tx53 devicetree
This adds support for the Ka-Ro TX53 System-On-Module.
As a baseboard is needed to operate it, only a *.dtsi and no Makefile entry.
Signed-off-by: Steffen Trumtrar <s.trumtrar@pengutronix.de>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Steffen Trumtrar [Wed, 24 Apr 2013 09:41:25 +0000 (11:41 +0200)]
ARM: i.MX53: add uart2 pinctrl
Add a group to the uart2 pinctrl.
Signed-off-by: Steffen Trumtrar <s.trumtrar@pengutronix.de>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Steffen Trumtrar [Wed, 24 Apr 2013 09:41:24 +0000 (11:41 +0200)]
ARM: i.MX53: add uart1 pinctrl
Add a group to the uart1 pinctrl.
Signed-off-by: Steffen Trumtrar <s.trumtrar@pengutronix.de>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Steffen Trumtrar [Wed, 24 Apr 2013 09:41:23 +0000 (11:41 +0200)]
ARM: i.MX53: add pwm2 pinctrl
Add pinctrl for pwm2.
Signed-off-by: Steffen Trumtrar <s.trumtrar@pengutronix.de>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Steffen Trumtrar [Wed, 24 Apr 2013 09:41:22 +0000 (11:41 +0200)]
ARM: i.MX53: add ecspi pinctrl
Add a group to the ecspi pinctrl.
Signed-off-by: Steffen Trumtrar <s.trumtrar@pengutronix.de>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Steffen Trumtrar [Wed, 24 Apr 2013 09:41:21 +0000 (11:41 +0200)]
ARM: i.MX53: add csi pinctrl
Add a group to the csi pinctrl.
Signed-off-by: Steffen Trumtrar <s.trumtrar@pengutronix.de>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Steffen Trumtrar [Wed, 24 Apr 2013 09:41:20 +0000 (11:41 +0200)]
ARM: i.MX53: add audmux pinctrl
Add a group to the audmux pinctrl.
Signed-off-by: Steffen Trumtrar <s.trumtrar@pengutronix.de>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Marek Vasut [Mon, 22 Apr 2013 21:23:47 +0000 (23:23 +0200)]
ARM: mx5: Add support for DENX M53EVK
This patch adds support for the DENX M53EVK board. The board currently supports
NAND, Ethernet, UART, CAN, I2C.
Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Fabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Shawn Guo [Mon, 22 Apr 2013 04:48:42 +0000 (12:48 +0800)]
ARM: imx: move imx53-qsb audio codec clk lookup into DT
With device tree clk lookup support in place, we can move audio codec
clk lookup for ssi_ext1 into device tree now, so that imx53_qsb_init()
can be saved.
Since ssi_ext2 lookup is used nowhere, it gets removed together with
ssi_ext1 lookup from clk driver.
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Marek Vasut [Sun, 21 Apr 2013 21:30:07 +0000 (23:30 +0200)]
ARM: mx5: Add PWM1 pinctrl data
This patch adds pinctrl data for PWM1 on MX53.
Signed-off-by: Marek Vasut <marex@denx.de>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Marek Vasut [Sun, 21 Apr 2013 21:30:06 +0000 (23:30 +0200)]
ARM: mx5: Add LCD IPU pinctrl data
This patch adds pinmux for IPU LCD 1 and IPU LVDS.
Signed-off-by: Marek Vasut <marex@denx.de>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Marek Vasut [Sun, 21 Apr 2013 21:30:05 +0000 (23:30 +0200)]
ARM: mx5: Add NAND pinctrl data
This patch adds pinctrl data for NAND on MX53.
Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Fabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Marek Vasut [Sun, 21 Apr 2013 21:30:04 +0000 (23:30 +0200)]
ARM: mx5: Add I2C2 pinctrl data
This patch adds pinctrl data for different mux of I2C2 on MX53.
Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Fabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Marek Vasut [Sun, 21 Apr 2013 21:30:03 +0000 (23:30 +0200)]
ARM: mx5: Add I2C1 pinctrl data
This patch adds pinctrl data for different mux of I2C1 on MX53.
Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Fabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Marek Vasut [Sun, 21 Apr 2013 21:30:02 +0000 (23:30 +0200)]
ARM: mx5: Add CAN1 pinctrl data
This patch adds pinctrl data for different mux of CAN1 on MX53.
Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Fabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Marek Vasut [Sun, 21 Apr 2013 21:30:01 +0000 (23:30 +0200)]
ARM: mx5: Add AUDMUX4 pinctrl data
This patch adds pinctrl data for the AUDMUX4 on MX53.
Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Fabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Philipp Zabel [Tue, 9 Apr 2013 17:18:47 +0000 (19:18 +0200)]
ARM i.MX53: dts: add i2c aliases
This allows to order the i2c character devices correctly,
so that /dev/i2c-0 corresponds to i2c1, /dev/i2c-1 corresponds
to i2c2, and so on. Currently they are ordered by register
address.
Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Gwenhael Goavec-Merou [Sun, 14 Apr 2013 07:44:25 +0000 (09:44 +0200)]
ARM: imx27: Add PWM0 to device tree
Signed-off-by: Gwenhael Goavec-Merou <gwenhael.goavec-merou@armadeus.com>
Acked-by: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Michael Grzeschik [Thu, 11 Apr 2013 10:13:17 +0000 (12:13 +0200)]
ARM: dts: imx: imx53-qsb.dts: enable usbotg and usbh1
Signed-off-by: Michael Grzeschik <m.grzeschik@pengutronix.de>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Michael Grzeschik [Thu, 11 Apr 2013 10:13:16 +0000 (12:13 +0200)]
ARM: dts: imx: use usb-nop-xceiv usbphy entries for imx5x
Signed-off-by: Michael Grzeschik <m.grzeschik@pengutronix.de>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Michael Grzeschik [Thu, 11 Apr 2013 10:13:15 +0000 (12:13 +0200)]
ARM: dts: imx: add imx5x usb clock DT lookups
Signed-off-by: Michael Grzeschik <m.grzeschik@pengutronix.de>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Michael Grzeschik [Thu, 11 Apr 2013 10:13:14 +0000 (12:13 +0200)]
ARM: dts: imx: add imx5x usbmisc entries
Signed-off-by: Michael Grzeschik <m.grzeschik@pengutronix.de>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Shawn Guo [Mon, 17 Jun 2013 08:02:51 +0000 (16:02 +0800)]
Merge tag 'imx-soc-3.11' into imx/dt
imx soc changes for 3.11:
* New SoCs i.MX6 Sololite and Vybrid VF610 support
* imx5 and imx6 clock fixes and additions
* Update clock driver to use of_clk_init() function
* Refactor restart routine mxc_restart() to get it work for DT boot
as well
* Clean up mxc specific ulpi access ops
* imx defconfig updates
Fabio Estevam [Sat, 15 Jun 2013 22:14:33 +0000 (19:14 -0300)]
ARM: imx_v6_v7_defconfig: Enable Vybrid VF610
Let VF610 SoC support be built by default.
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Nicolin Chen [Thu, 13 Jun 2013 11:51:04 +0000 (19:51 +0800)]
ARM: imx_v6_v7_defconfig: Enable imx-wm8962 by default
Enable imx-wm8962 and PM_RUNTIME, essential for WM8962 CODEC driver.
Signed-off-by: Nicolin Chen <b42378@freescale.com>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Nicolin Chen [Thu, 13 Jun 2013 11:50:56 +0000 (19:50 +0800)]
ARM: clk-imx6qdl: Add clko1 configuration for imx6qdl-sabresd
WM8962 needs 24MHz clock for its MCLK, so choose PLL4 as the parent of clko1.
Signed-off-by: Nicolin Chen <b42378@freescale.com>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Fabio Estevam [Thu, 6 Jun 2013 15:56:30 +0000 (12:56 -0300)]
ARM: imx_v6_v7_defconfig: Enable PWM and backlight options
These options are useful for controlling backlight contrast via PWM.
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Markus Pargmann [Thu, 6 Jun 2013 12:41:57 +0000 (14:41 +0200)]
ARM: imx: Remove mxc specific ulpi access ops
There are ulpi access ops implemented in drivers/usb/phy/phy-ulpi.c.
mxc access ops implement the same access operations within mach-imx. This
patch removes the mxc ulpi file and uses phy-ulpi instead for
imx_otg_ulpi_create.
phy-ulpi successfully tested with i.MX27 Phytec phyCARD-S (pca100).
Signed-off-by: Markus Pargmann <mpa@pengutronix.de>
Acked-by: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Jingchang Lu [Tue, 28 May 2013 09:12:21 +0000 (17:12 +0800)]
ARM: imx: add initial support for VF610
Add initial support for Freescale Vybrid VF610 SoC.
Signed-off-by: Jingchang Lu <b35083@freescale.com>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Jingchang Lu [Tue, 28 May 2013 09:12:20 +0000 (17:12 +0800)]
ARM: imx: add VF610 clock support
Add clock support for Vybrid VF610. It uses dtc macro support to
define all clock IDs in vf610-clock.h to keep clock IDs coherence
between kernel and DT.
Signed-off-by: Jingchang Lu <b35083@freescale.com>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Rogerio Pimentel [Fri, 24 May 2013 14:09:31 +0000 (11:09 -0300)]
ARM: imx_v6_v7_defconfig: enable parallel display
Enable paralell display by default
Signed-off-by: Rogerio Pimentel <rogerio.pimentel@freescale.com>
Acked-by: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Fabio Estevam [Fri, 24 May 2013 19:55:42 +0000 (16:55 -0300)]
ARM: imx: clk: No need to initialize phandle struct
commit
84344b43c (ARM: i.MX5: Allow DT clock providers) introduce the following
sparse warning:
arch/arm/mach-imx/clk.c:12:43: warning: Using plain integer as NULL pointer
There is no need to initialize phandle, so remove it.
Cc: Martin Fuzzey <mfuzzey@parkeon.com>
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Fabio Estevam [Fri, 24 May 2013 19:55:41 +0000 (16:55 -0300)]
ARM: imx: irq-common: Include header to avoid sparse warning
Fix the following sparse warning:
arch/arm/mach-imx/irq-common.c:24:5: warning: symbol 'mxc_set_irq_fiq' was not declared. Should it be static?
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Fabio Estevam [Thu, 23 May 2013 23:41:48 +0000 (20:41 -0300)]
ARM: imx: Enable mx6 solo-lite support
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Shawn Guo [Tue, 21 May 2013 01:58:51 +0000 (09:58 +0800)]
ARM: imx6: use common of_clk_init() call to initialize clocks
Instead of explicitly calling clock initialization functions, we can
declare the functions with CLK_OF_DECLARE() and then call common
of_clk_init() to have them invoked properly.
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Shawn Guo [Mon, 20 May 2013 14:39:19 +0000 (22:39 +0800)]
ARM: imx6q: call of_clk_init() to register fixed rate clocks
As the fixed rate clocks are defined in device tree, we can just call
of_clk_init() to register them.
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Fabio Estevam [Mon, 20 May 2013 13:59:57 +0000 (10:59 -0300)]
ARM: imx: imx_v6_v7_defconfig: Select CONFIG_DRM_IMX_TVE
Let the mx53 TVE driver be built by default.
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Dirk Behme [Sat, 18 May 2013 07:25:28 +0000 (09:25 +0200)]
ARM: i.MX6: clk: add different DualLite MLB clock config
The CCM_CBCMR register (address 0x02C4018) has different meaning
between the i.MX6 Quad/Dual and the i.MX6 Solo/DualLite.
Compared to the i.MX6 Quad/Dual, the CCM_CBCMR register in the
i.MX6 Solo/DualLite reuses the gpu2d_core bits for the MLB clock
configuration.
Signed-off-by: Dirk Behme <dirk.behme@gmail.com>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Philipp Zabel [Fri, 17 May 2013 13:49:03 +0000 (15:49 +0200)]
ARM i.MX5: Add S/PDIF clocks
This patch adds the S/PDIF clocks for i.MX51 and i.MX53. Tested on i.MX53.
The i.MX51 has a second set of spdif_root clock dividers, and on i.MX53
there is an additional input to the spdif_xtal mux.
Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Sascha Hauer [Fri, 17 May 2013 13:49:02 +0000 (15:49 +0200)]
ARM i.MX53: Add SATA clock
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Huang Shijie [Fri, 17 May 2013 09:15:23 +0000 (17:15 +0800)]
ARM: imx6q: clk: add the eim_slow clock
Add the eim_slow clock, since the weim needs it.
Signed-off-by: Huang Shijie <b32955@freescale.com>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Jiada Wang [Fri, 17 May 2013 08:40:45 +0000 (17:40 +0900)]
ARM: imx: remove MLB PLL from pllv3
MLB PLL should be handled internally in MLB driver,
so remove it from pllv3.
Signed-off-by: Jiada Wang <jiada_wang@mentor.com>
CC: Dirk Behme <dirk.behme@de.bosch.com>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Jiada Wang [Fri, 17 May 2013 08:40:44 +0000 (17:40 +0900)]
ARM: imx: disable pll8_mlb in mx6q_clks
The MLB PLL clock's operation doesn't fit for clock framework and
it should be handled internally in MLB driver.
Remove initialization of pll8_mlb clock device but leave its
declaration in mx6q_clks to avoid affecting imx6q clock numbering.
Signed-off-by: Jiada Wang <jiada_wang@mentor.com>
CC: Dirk Behme <dirk.behme@de.bosch.com>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Shawn Guo [Fri, 3 May 2013 03:24:47 +0000 (11:24 +0800)]
ARM: imx: add initial support for imx6sl
Add initial support for i.MX6 SoloLite.
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Shawn Guo [Fri, 3 May 2013 03:21:03 +0000 (11:21 +0800)]
ARM: imx: enable low-level debug support for imx6sl
Enable low-level debug support for i.MX6 SoloLite by adding the debug
port definitions for the SoC.
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Shawn Guo [Fri, 3 May 2013 03:06:46 +0000 (11:06 +0800)]
ARM: imx: add clock support for imx6sl
Add clock support for i.MX6 SoloLite. It uses the dtc marco support to
define all clock IDs in imx6sl-clock.h, which will be included by both
clock driver and device tree sources, so that the data will stay sync
all the time between kernel and DT.
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Shawn Guo [Fri, 10 May 2013 02:19:01 +0000 (10:19 +0800)]
ARM: imx: create mxc_arch_reset_init_dt() for DT boot
The mxc_arch_reset_init() uses static mapping and calls clk_get_sys() to
get clock. It's suitable for non-DT boot but not for DT boot where
dynamic mapping and of_clk_get() should be used instead. Create
mxc_arch_reset_init_dt() as the DT variant of mxc_arch_reset_init(),
and change DT platforms to use it.
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Shawn Guo [Fri, 10 May 2013 01:13:44 +0000 (09:13 +0800)]
ARM: imx: move clk_prepare() out from mxc_restart()
It's inappropriate to call clk_prepare() in mxc_restart(), because the
restart routine could be called in atomic context. Move clk_get() and
clk_prepare() into mxc_arch_reset_init() and only have the atomic part
clk_enable() be called in mxc_restart().
As a result, mxc_arch_reset_init() needs to be called after clk gets
initialized.
While there, it also changes printk(KERN_ERR ...) to pr_err() and adds
__init annotation for mxc_arch_reset_init().
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Shawn Guo [Fri, 10 May 2013 01:08:07 +0000 (09:08 +0800)]
ARM: imx: include <asm/io.h> in hardware.h
As IOMEM is referenced in hardware.h, <asm/io.h> should be included
there.
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Dirk Behme [Fri, 3 May 2013 09:08:45 +0000 (11:08 +0200)]
ARM: i.MX6: clk: add i.MX6 DualLite differences
The CCM_CBCMR register (address 0x02C4018) has different meaning
between the i.MX6 Quad/Dual and the i.MX6 Solo/DualLite.
Compared to the i.MX6 Quad/Dual, the CCM_CBCMR register in the
i.MX6 Solo/DualLite doesn't have a gpu3d_shader configuration and
moves the gpu2_core configuration at that place.
Handle these i.MX6 Quad/Dual vs. i.MX6 Solo/DualLite clock differences
by using cpu_is_mx6dl().
Signed-off-by: Dirk Behme <dirk.behme@de.bosch.com>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Dirk Behme [Fri, 26 Apr 2013 08:13:56 +0000 (10:13 +0200)]
ARM: i.MX6: add i.MX6 specific L2 cache configuration
To improve the performance and power consumption add an i.MX6
specific L2 cache initialization.
This configuration is taken from Freescale's kernel patch
"ENGR00153601 [MX6]Adjust L2 cache parameter" [1]
with two additional improvements:
a) The L2X0_POWER_CTRL has only the two bits we set. So no need
to read the register before. Remove the register read done
in Freescale's patch.
b) In the L2X0_PREFETCH_CTRL register, besides the double linefill (bit[30]),
additionally enable the instruction and data prefetch (bit[29-28]).
Signed-off-by: Dirk Behme <dirk.behme@de.bosch.com>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
[1] http://git.freescale.com/git/cgit.cgi/imx/linux-2.6-imx.git/commit/arch/arm/mach-mx6/mm.c?h=imx_3.0.35_12.09.01&id=
814656410b40c67a10b25300e51b0477b2bb96d1
Martin Fuzzey [Tue, 23 Apr 2013 12:16:59 +0000 (20:16 +0800)]
ARM: i.MX5: Allow DT clock providers
Currently clock providers defined in the DT are not registered
on i.MX5 platforms since of_clk_init() is not called.
This is not a problem for the SOC's own clocks, which are registered
in code, but prevents the DT being used to define clocks for external
hardware.
Fix this by calling of_clk_init() and actually using the DT to obtain
the 4 SOC fixed clocks.
These are already defined in the DT but were previously just used to
manually obtain the rate.
Fall back to the old scheme for non DT platforms.
Since the same method may be useful for other i.MX platforms
implement the imx_obtain_fixed_clock() function in common code.
Actually changing other i.MX platforms to use this should be done
later by someone with access to the appropriate hardware.
Signed-off-by: Martin Fuzzey <mfuzzey@parkeon.com>
Tested-by: Fabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>