Lothar Waßmann [Sat, 18 Jan 2014 08:18:38 +0000 (16:18 +0800)]
ARM: dts: imx53: add support for Ka-Ro TX53 modules
This patch adds support for the Ka-Ro electronics GmbH TX53 modules.
There are two distinct module types. One with an LVDS display
interface and SATA support, the other with a parallel LCD
interface and no SATA interface.
Signed-off-by: Lothar Waßmann <LW@KARO-electronics.de>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Denis Carikli [Wed, 15 Jan 2014 16:32:12 +0000 (17:32 +0100)]
ARM: dts: Add support for the cpuimx35 board from Eukrea and its baseboard.
The following devices/functionalities were added:
* Main and secondary UARTs.
* i2c and the pcf8563 device.
* Ethernet.
* NAND.
* The BP1 button.
* The LED.
* Watchdog
* SD.
Cc: Eric Bénard <eric@eukrea.com>
Cc: Grant Likely <grant.likely@linaro.org>
Cc: Rob Herring <robh+dt@kernel.org>
Cc: devicetree@vger.kernel.org
Cc: linux-arm-kernel@lists.infradead.org
Signed-off-by: Denis Carikli <denis@eukrea.com>
Acked-by: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Sébastien Szymanski [Tue, 14 Jan 2014 14:21:27 +0000 (15:21 +0100)]
ARM: dts: imx28-apf28dev: add user button
Signed-off-by: Sébastien Szymanski <sebastien.szymanski@armadeus.com>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Alexander Shiyan [Sat, 11 Jan 2014 06:54:19 +0000 (10:54 +0400)]
ARM: dts: i.MX51: Switch to use standard definitions for input subsystem
Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Steffen Trumtrar [Fri, 10 Jan 2014 12:52:59 +0000 (13:52 +0100)]
ARM: dts: i.MX53: add support for MCIMX53-START-R
The "Start-R QSB" has a different PMIC than the older "Start QSB".
Add a new devicetree for the Start-R.
They both could use the same DT, as both PMICs (the dialog and the mc34708)
have different i2c addresses and could coexist in the same DT without any
errors. But once phandles are used, this will get messy.
The pmic nodes are based on an earlier patch
[PATCH] arm: imx53-qsb: Add Ripley driver DT nodes
from
Ying-Chun Liu (PaulLiu) <paul.liu@linaro.org>
which apparently got lost/abandoned.
I added phandles/newlines and changed the node name from ripley to mc34708.
Signed-off-by: Steffen Trumtrar <s.trumtrar@pengutronix.de>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Steffen Trumtrar [Fri, 10 Jan 2014 12:52:58 +0000 (13:52 +0100)]
ARM: dts: i.MX53: move common QSB nodes to new file
There are (atleast) two versions of the i.MX53 LOCO:
- the MCIMX53-START board
- the MCIMX53-START-R board
The MCIMX53-START-R has a mc34708 pmic and is otherwise the similar to the
MCIMX53-START. To prepare for the START-R, move all common nodes to a new
imx53-qsb-common.dtsi and remove everything but the board name and pmic from
the imx53-qsb.dts.
Signed-off-by: Steffen Trumtrar <s.trumtrar@pengutronix.de>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Alexander Shiyan [Wed, 8 Jan 2014 15:31:54 +0000 (19:31 +0400)]
ARM: dts: imx53-evk: Remove board support
imx53-evk board is discontinued by Freescale. The replacement is
imx53-qsb. Additionally this board is not supported by anyone and
in their current state is non-functional, for example PMIC not have
an IRQ line defined, so it is not works. This patch removes this DTS.
Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Huang Shijie [Wed, 25 Dec 2013 06:19:27 +0000 (14:19 +0800)]
ARM: dts: vf610: use the interrupt macros
This patch uses the IRQ_TYPE_LEVEL_HIGH/IRQ_TYPE_NONE to replace
the hardcode.
[shawn.guo: While at it, we also fix the typo in uart0 interrupts
property, where the 0x00 should 0x04. Hense, it should also be
IRQ_TYPE_LEVEL_HIGH just like other UART instances.]
Signed-off-by: Huang Shijie <b32955@freescale.com>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Denis Carikli [Mon, 6 Jan 2014 16:16:07 +0000 (17:16 +0100)]
ARM: dts: imx53: Add gpio and input dt includes.
This is to permit to use of the includes in the boards dts.
Cc: Rob Herring <rob.herring@calxeda.com>
Cc: Pawel Moll <pawel.moll@arm.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Stephen Warren <swarren@wwwdotorg.org>
Cc: Ian Campbell <ijc+devicetree@hellion.org.uk>
Cc: Grant Likely <grant.likely@linaro.org>
Cc: devicetree@vger.kernel.org
Cc: Sascha Hauer <kernel@pengutronix.de>
Cc: linux-arm-kernel@lists.infradead.org
Cc: Eric Bénard <eric@eukrea.com>
Signed-off-by: Denis Carikli <denis@eukrea.com>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Alexander Shiyan [Sat, 4 Jan 2014 18:28:35 +0000 (22:28 +0400)]
ARM: dts: i.MX27: Add SSI nodes
This patch adds the missing (Synchronous Serial Interface) SSI1 & SSI2
devicetree nodes for i.MX27 CPUs.
Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Peter Chen [Fri, 20 Dec 2013 07:52:05 +0000 (15:52 +0800)]
ARM: dts: mxs: add mxs phy controller id
We need to use controller id to access different register regions
for mxs phy.
Signed-off-by: Peter Chen <peter.chen@freescale.com>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Alexander Shiyan [Sat, 21 Dec 2013 07:11:42 +0000 (11:11 +0400)]
ARM: dts: imx27-phytec-phycore-rdk: Add pinctrl definitions for WEIM
This patch adds pinctrl definitions for WEIM CS4 and GPIO used as
CAN IRQ line.
Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Alexander Shiyan [Sat, 21 Dec 2013 07:11:41 +0000 (11:11 +0400)]
ARM: dts: imx27-phytec-phycore-rdk: Add pingrp for SDHC
Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Alexander Shiyan [Sat, 21 Dec 2013 07:11:39 +0000 (11:11 +0400)]
ARM: dts: imx27-phytec-phycore-som: Add spi-cs-high property to PMIC
Since SPI core does not use GPIO bindings for CS GPIOs,
we should add an active high level declaration.
Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Alexander Shiyan [Sat, 21 Dec 2013 07:11:38 +0000 (11:11 +0400)]
ARM: dts: imx27-phytec-phycore-rdk: Enable 1-Wire module
This patch enables 1-Wire module for Phytec PCM-970 RDK.
Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Alexander Shiyan [Sat, 21 Dec 2013 07:11:37 +0000 (11:11 +0400)]
ARM: dts: imx27-phytec-phycore-som: Add NFC pin group
This patch adds pin group for NAND Flash Controller.
Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Steffen Trumtrar [Wed, 18 Dec 2013 14:10:26 +0000 (15:10 +0100)]
ARM: dts: Add support for the i.MX35.
Cc: linux-arm-kernel@lists.infradead.org
Cc: Eric Bénard <eric@eukrea.com>
Signed-off-by: Steffen Trumtrar <s.trumtrar@pengutronix.de>
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Denis Carikli <denis@eukrea.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Alexandre Belloni [Wed, 18 Dec 2013 18:50:56 +0000 (19:50 +0100)]
ARM: dts: mxs: Add iio-hwmon to mx23 soc
This allows to read the SoC on-die temperature sensor available on the LRADC by
using:
cat /sys/class/hwmon/hwmon0/device/temp1_input
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Alexandre Belloni [Wed, 18 Dec 2013 18:50:55 +0000 (19:50 +0100)]
ARM: dts: mxs: Add iio-hwmon to mx28 soc
This allows to read the SoC on-die temperature sensor available on the LRADC by
using:
cat /sys/class/hwmon/hwmon0/device/temp1_input
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Alexander Shiyan [Sat, 7 Dec 2013 08:26:36 +0000 (12:26 +0400)]
ARM: dts: imx27-phytec-phycore-som: Rename file to .dtsi
PCM-038 module cannot be used standalone. This patch renames
module file to .dtsi and excludes it from compilation.
Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Alexander Shiyan [Sat, 7 Dec 2013 08:26:35 +0000 (12:26 +0400)]
ARM: dts: imx27-phytec-phycore-som: Add pinctrl for CSPI1 and GPIOs used on module
Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Alexandre Belloni [Fri, 6 Dec 2013 20:20:31 +0000 (21:20 +0100)]
ARM: dts: mxs: add #io-channel-cells to mx28 lradc
Adding #io-channel-cells property to lradc allows us to use the lradc as
an iio provider.
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Michael Grzeschik [Fri, 6 Dec 2013 14:56:40 +0000 (15:56 +0100)]
ARM: i.MX28: dts: rename usbphy pin names
The pins have nothing todo with the phy layer. We better rename them, so
it gets clear they are routed to the ehci core not to any phy.
Signed-off-by: Michael Grzeschik <m.grzeschik@pengutronix.de>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Denis Carikli [Thu, 5 Dec 2013 14:56:56 +0000 (15:56 +0100)]
ARM: dts: Add support for the cpuimx25 board from Eukrea and its baseboard.
The following devices/functionalities were added:
* Main and secondary UARTs.
* i2c and the pcf8563 device.
* Ethernet.
* NAND.
* The BP1 button.
* The LED.
* Watchdog
* SD.
Cc: Rob Herring <rob.herring@calxeda.com>
Cc: Pawel Moll <pawel.moll@arm.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Stephen Warren <swarren@wwwdotorg.org>
Cc: Ian Campbell <ijc+devicetree@hellion.org.uk>
Cc: devicetree@vger.kernel.org
Cc: Sascha Hauer <kernel@pengutronix.de>
Cc: linux-arm-kernel@lists.infradead.org
Cc: Eric Bénard <eric@eukrea.com>
Signed-off-by: Denis Carikli <denis@eukrea.com>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Eric Bénard [Thu, 5 Dec 2013 13:28:06 +0000 (14:28 +0100)]
ARM: mxs: Add support for the eukrea-cpuimx28.
The following devices/functionalities were tested:
* Main UART.
* Ethernet0.
* Ethernet1.
* SD.
* USB host.
* USB otg.
* Display(and its backlight).
* Touchscreen.
* Audio.
* nand.
* i2c and the pcf8563 device.
* The gpio buttons.
* The gpio leds.
* Watchdog
Cc: Rob Herring <rob.herring@calxeda.com>
Cc: Pawel Moll <pawel.moll@arm.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Stephen Warren <swarren@wwwdotorg.org>
Cc: Ian Campbell <ijc+devicetree@hellion.org.uk>
Cc: devicetree@vger.kernel.org
Cc: linux-arm-kernel@lists.infradead.org
Signed-off-by: Eric Bénard <eric@eukrea.com>
Signed-off-by: Denis Carikli <denis@eukrea.com>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Denis Carikli [Thu, 5 Dec 2013 13:28:05 +0000 (14:28 +0100)]
ARM: dts: mxs: Add a new pin config for the usb0 ID.
Cc: Rob Herring <rob.herring@calxeda.com>
Cc: Pawel Moll <pawel.moll@arm.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Stephen Warren <swarren@wwwdotorg.org>
Cc: Ian Campbell <ijc+devicetree@hellion.org.uk>
Cc: devicetree@vger.kernel.org
Cc: linux-arm-kernel@lists.infradead.org
Cc: Eric Bénard <eric@eukrea.com>
Signed-off-by: Denis Carikli <denis@eukrea.com>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Denis Carikli [Thu, 5 Dec 2013 13:28:04 +0000 (14:28 +0100)]
ARM: dts: mxs: Add 18bit pin config for lcdif.
Cc: Rob Herring <rob.herring@calxeda.com>
Cc: Pawel Moll <pawel.moll@arm.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Stephen Warren <swarren@wwwdotorg.org>
Cc: Ian Campbell <ijc+devicetree@hellion.org.uk>
Cc: devicetree@vger.kernel.org
Cc: linux-arm-kernel@lists.infradead.org
Cc: Eric Bénard <eric@eukrea.com>
Signed-off-by: Denis Carikli <denis@eukrea.com>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Robert Nelson [Tue, 3 Dec 2013 14:39:38 +0000 (08:39 -0600)]
ARM: dts: imx53: Enable AHCI SATA for imx53-qsb
Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
Cc: Richard Zhu <r65037@freescale.com>
Cc: Tejun Heo <tj@kernel.org>
Cc: Linux-IDE <linux-ide@vger.kernel.org>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Alexander Shiyan [Sat, 30 Nov 2013 07:03:20 +0000 (11:03 +0400)]
ARM: dts: i.MX27: Configure GPIOs as "input" by default
This patch changes the default direction for pins used
as GPIO to "input". This prevents a short circuit on the
configuration stage when GPIO-pin is connected to the
other output pin.
Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Gwenhael Goavec-Merou [Tue, 3 Dec 2013 11:10:15 +0000 (12:10 +0100)]
ARM: dts: imx27-apf27dev: Add pinctrl for cspi, sdhci, leds and keys
- add chip-select pinctrl for cspi
- add card-detect for sdhci2
- add pinctrl for gpio-leds and gpio-keys
Signed-off-by: Gwenhael Goavec-Merou <gwenhael.goavec-merou@armadeus.com>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Gwenhael Goavec-Merou [Tue, 3 Dec 2013 11:10:14 +0000 (12:10 +0100)]
ARM: dts: apf27dev: Add pwm support
Signed-off-by: Gwenhael Goavec-Merou <gwenhael.goavec-merou@trabucayre.com>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Gwenhael Goavec-Merou [Sat, 30 Nov 2013 08:51:12 +0000 (09:51 +0100)]
ARM: imx28: add apf28 specific initialization (macaddr)
Signed-off-by: Gwenhael Goavec-Merou <gwenhael.goavec-merou@armadeus.com>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Gwenhael Goavec-Merou [Sat, 30 Nov 2013 08:51:13 +0000 (09:51 +0100)]
ARM: dts: apf28dev: set gpio polarity for usb regulator and pinctrl for regulator gpio
Signed-off-by: Gwenhael Goavec-Merou <gwenhael.goavec-merou@armadeus.com>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Alexander Shiyan [Sat, 30 Nov 2013 06:18:04 +0000 (10:18 +0400)]
ARM: dts: i.MX27 boards: Switch to use standard GPIO and IRQ flags definitions
Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Alexander Shiyan [Sat, 30 Nov 2013 06:18:03 +0000 (10:18 +0400)]
ARM: dts: imx27-phytec-phycore-som: Update FEC node
This patch updates FEC devicetree node of Phytec PCM038 module:
- Adding missing phy_mode properties.
- Adding fixed regulator to provide functionality without
dummy-regulator in the kernel.
Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Alexander Shiyan [Sat, 30 Nov 2013 06:18:02 +0000 (10:18 +0400)]
ARM: dts: imx27-phytec-phycore-rdk: Add DT node for camera module
This patch adds first I2C bus and PCA9536 device.
This device is used on Phytec PCM-970 RDK camera addon module.
Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Alexander Shiyan [Sat, 30 Nov 2013 06:18:01 +0000 (10:18 +0400)]
ARM: dts: imx27-phytec-phycore-som: Add on-flash BBT support
This patch adds support for On Flash Bad Block Table for PCM-038
onboard NAND.
Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Gwenhael Goavec-Merou [Thu, 28 Nov 2013 07:19:32 +0000 (08:19 +0100)]
ARM: dts: imx27: imx27-apf27dev: add pinctrl for cspi, i2c, sdhc and framebuffer
Signed-off-by: Gwenhael Goavec-Merou <gwenhael.goavec-merou@armadeus.com>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Gwenhael Goavec-Merou [Thu, 28 Nov 2013 07:19:31 +0000 (08:19 +0100)]
ARM: dts: imx27: imx27-apf27: add pinctrl for fec and uart1
Signed-off-by: Gwenhael Goavec-Merou <gwenhael.goavec-merou@armadeus.com>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Alexander Shiyan [Wed, 27 Nov 2013 11:55:46 +0000 (15:55 +0400)]
ARM: dts: imx51-babbage: Define FEC reset pin
Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Alexander Shiyan [Wed, 27 Nov 2013 11:55:45 +0000 (15:55 +0400)]
ARM: dts: imx51-babbage: Fix chipselect level for dataflash on spi0.1
Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Fabio Estevam [Mon, 25 Nov 2013 17:47:39 +0000 (15:47 -0200)]
ARM: dts: imx28-evk: Run I2C0 at 400kHz
It is safe to operate I2C0 at 400kHz as SGTL5000 supports this frequency.
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Gwenhael Goavec-Merou [Mon, 25 Nov 2013 07:45:44 +0000 (08:45 +0100)]
ARM: dts: imx27-apf27dev: fix display size
Signed-off-by: Gwenhael Goavec-Merou <gwenhael.goavec-merou@armadeus.com>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Markus Pargmann [Sat, 8 Feb 2014 06:15:37 +0000 (14:15 +0800)]
ARM: dts: imx27 phycore pinctrl
Add pinctrl nodes and properties for phycore device nodes.
Signed-off-by: Markus Pargmann <mpa@pengutronix.de>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Markus Pargmann [Wed, 20 Nov 2013 08:45:50 +0000 (09:45 +0100)]
ARM: dts: imx27 phycore move uart1 to rdk
uart1 is not used on SOM. It is passed directly to the rdk board.
Signed-off-by: Markus Pargmann <mpa@pengutronix.de>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Markus Pargmann [Sat, 8 Feb 2014 05:54:43 +0000 (13:54 +0800)]
ARM: dts: imx27 phyCARD-S pinctrl
Add pinctrl nodes and properties for phyCARD-S device nodes.
Signed-off-by: Markus Pargmann <mpa@pengutronix.de>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Markus Pargmann [Wed, 20 Nov 2013 08:45:48 +0000 (09:45 +0100)]
ARM: dts: imx27 iomux device node
This patch adds a iomux node for imx27 pinctrl driver. The gpio
registers are embedded in the iomux memory area. So this patch moves
them into the iomux node for a better hardware description.
Signed-off-by: Markus Pargmann <mpa@pengutronix.de>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Marek Vasut [Fri, 22 Nov 2013 11:05:04 +0000 (12:05 +0100)]
ARM: dts: imx53: Enable AHCI SATA for M53EVK
Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Richard Zhu <r65037@freescale.com>
Cc: Tejun Heo <tj@kernel.org>
Cc: Linux-IDE <linux-ide@vger.kernel.org>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Marek Vasut [Fri, 22 Nov 2013 11:05:03 +0000 (12:05 +0100)]
ARM: dts: imx53: Add AHCI SATA DT node
The AHCI-IMX driver now supports i.MX53 as well. Add DT node.
Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Richard Zhu <r65037@freescale.com>
Cc: Tejun Heo <tj@kernel.org>
Cc: Linux-IDE <linux-ide@vger.kernel.org>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Alexander Shiyan [Tue, 19 Nov 2013 11:47:27 +0000 (15:47 +0400)]
ARM: dts: i.MX51 boards: Switch to use standard GPIO flags definitions
Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Alexander Shiyan [Tue, 19 Nov 2013 11:47:26 +0000 (15:47 +0400)]
ARM: dts: i.MX51: Move usbphy0 node from AIPS1
usbphy0 is not a part of AIPS1, so move this node under root.
Additionally this patch removes useless "status" property.
Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Maxime Ripard [Mon, 18 Nov 2013 14:52:02 +0000 (15:52 +0100)]
ARM: dts:
cfa10036: Add dr_mode and phy_type properties to the DT
This USB port is only used as peripheral. Set it accordingly in its DT
node.
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Maxime Ripard [Mon, 18 Nov 2013 14:37:52 +0000 (15:37 +0100)]
ARM: mxs:
cfa10049: Add NAU7802 ADCs to the device tree
The Crystalfontz CFA-10049 has 3 Nuvoton NAU7802 ADCs, plugged behing a
GPIO-controlled I2C muxer because these ADCs don't have a configurable
address.
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Marek Vasut [Sun, 17 Nov 2013 03:04:50 +0000 (04:04 +0100)]
ARM: dts: imx53: Add USB support for M53EVK
Add USB support for M53EVK. The configuration is such that USB Host1
port is used as Host and the USB OTG port is used as Peripheral thus
far. Once OTG is properly fixed, the OTG will be further adjusted.
Signed-off-by: Marek Vasut <marex@denx.de>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Marek Vasut [Sun, 17 Nov 2013 01:19:40 +0000 (02:19 +0100)]
ARM: dts: imx53: Fix backlight for M53EVK
Remove the PWM backlight pin from the hog pins list, so it doesn't
collide with the PWM pin group. Moreover, add dummy regulator for
the backlight so that the backlight driver probes correctly.
Signed-off-by: Marek Vasut <marex@denx.de>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Marek Vasut [Sun, 17 Nov 2013 01:19:39 +0000 (02:19 +0100)]
ARM: dts: imx53: Fix display pinmux for M53EVK
Use the DISP1 pinmux on M53EVK for the LCD, not the LVDS.
Signed-off-by: Marek Vasut <marex@denx.de>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Lucas Stach [Thu, 14 Nov 2013 10:19:00 +0000 (11:19 +0100)]
ARM: imx50: use clock defines in DTS files
For better readability and no need to look up numbers
in the documentation anymore.
Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Lucas Stach [Thu, 14 Nov 2013 10:18:59 +0000 (11:18 +0100)]
ARM: imx51: use clock defines in DTS files
For better readability and no need to look up numbers
in the documentation anymore.
Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Lucas Stach [Thu, 14 Nov 2013 10:18:58 +0000 (11:18 +0100)]
ARM: imx53: use clock defines in DTS files
For better readability and no need to look up numbers
in the documentation anymore.
Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Markus Pargmann [Tue, 12 Nov 2013 08:50:04 +0000 (09:50 +0100)]
ARM: dts: imx27 pin functions
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>
Gwenhael Goavec-Merou [Mon, 11 Nov 2013 17:56:49 +0000 (18:56 +0100)]
ARM: imx27-apf27dev: Add sdhci support
Signed-off-by: Gwenhael Goavec-Merou <gwenhael.goavec-merou@armadeus.com>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Alexander Shiyan [Thu, 7 Nov 2013 08:45:08 +0000 (12:45 +0400)]
ARM: dts: i.MX51: Switch to use standard IRQ flags definitions
Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Alexander Shiyan [Thu, 7 Nov 2013 08:45:06 +0000 (12:45 +0400)]
ARM: dts: i.MX51: Add dummy clock to AUDMUX
This patch adds dummy clock for AUDMUX. This change avoids useless
debug message "cannot get clock" during driver initialization.
Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Alexander Shiyan [Thu, 7 Nov 2013 08:45:05 +0000 (12:45 +0400)]
ARM: dts: i.MX51: Update CPU node
This patch updates i.MX51 CPU node:
- Alias for CPU is added to allow using this node in the parent DTS files.
- Removed useless "clock_names" property.
- "clock-latency" value increased to safe using with 32 kHz OSC.
- Defined operating points voltages and "voltage tolerance" properties.
Values are safe for both commercial and industrial CPU variants.
Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Michael Heimpold [Sat, 9 Nov 2013 11:14:16 +0000 (12:14 +0100)]
ARM: mxs: add support for I2SE's duckbill series
Signed-off-by: Michael Heimpold <mhei@heimpold.de>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Denis Carikli [Wed, 6 Nov 2013 08:52:17 +0000 (09:52 +0100)]
ARM: dts: imx25.dtsi: label the iomuxc.
Cc: Rob Herring <rob.herring@calxeda.com>
Cc: Pawel Moll <pawel.moll@arm.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Stephen Warren <swarren@wwwdotorg.org>
Cc: Ian Campbell <ijc+devicetree@hellion.org.uk>
Cc: devicetree@vger.kernel.org
Cc: Sascha Hauer <kernel@pengutronix.de>
Cc: linux-arm-kernel@lists.infradead.org
Cc: Eric Bénard <eric@eukrea.com>
Signed-off-by: Denis Carikli <denis@eukrea.com>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Denis Carikli [Wed, 6 Nov 2013 08:52:16 +0000 (09:52 +0100)]
ARM: dts: imx25: Add pinctrl functions.
Cc: Pawel Moll <pawel.moll@arm.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Stephen Warren <swarren@wwwdotorg.org>
Cc: Ian Campbell <ijc+devicetree@hellion.org.uk>
Cc: Grant Likely <grant.likely@linaro.org>
Cc: Rob Herring <rob.herring@calxeda.com>
Cc: devicetree@vger.kernel.org
Cc: Sascha Hauer <kernel@pengutronix.de>
Cc: linux-arm-kernel@lists.infradead.org
Cc: Linus Walleij <linus.walleij@linaro.org>
Cc: Eric Bénard <eric@eukrea.com>
Signed-off-by: Denis Carikli <denis@eukrea.com>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Shawn Guo [Fri, 7 Feb 2014 15:18:30 +0000 (23:18 +0800)]
ARM: dts: imx: use generic node name for fixed regulator
The device tree specification recommends that generic name should be
used for nodes. So instead of naming those fixed regulator nodes
arbitrarily, let's use the generic name 'regulator@num' for those nodes.
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Shawn Guo [Wed, 6 Nov 2013 07:43:36 +0000 (15:43 +0800)]
ARM: dts: imx53-mba53: create a container for fixed regulators
To align with others on fixed regulators bindings, it adds node
'regulators' as the container and move all regulator-fixed nodes into
there.
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Shawn Guo [Mon, 9 Dec 2013 06:42:54 +0000 (14:42 +0800)]
ARM: dts: vf610: make pinctrl nodes board specific
Currently, all pinctrl setting nodes are defined in <soc>.dtsi, so that
boards that share the same pinctrl setting do not have to define it time
and time again in <board>.dts. However, along with the devices and use
cases being added continuously, the pinctrl setting nodes under iomuxc
becomes more than expected. This bloats device tree blob for particular
board unnecessarily since only a small subset of those pinctrl setting
nodes will be used by the board. It impacts not only the DTB file size
but also the run-time device tree lookup efficiency.
The patch moves all the pinctrl data into individual boards as needed.
With the changes, the pinctrl setting nodes becomes local to particular
board, and it makes no sense to continue numbering the setting for
given peripheral. Thus, all the pinctrl phandler name gets updated to
have only peripheral name in there.
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Acked-by: Fugang Duan <B38611@freescale.com>
Shawn Guo [Mon, 4 Nov 2013 08:05:37 +0000 (16:05 +0800)]
ARM: dts: imx51: make pinctrl nodes board specific
Currently, all pinctrl setting nodes are defined in <soc>.dtsi, so that
boards that share the same pinctrl setting do not have to define it time
and time again in <board>.dts. However, along with the devices and use
cases being added continuously, the pinctrl setting nodes under iomuxc
becomes more than expected. This bloats device tree blob for particular
board unnecessarily since only a small subset of those pinctrl setting
nodes will be used by the board. It impacts not only the DTB file size
but also the run-time device tree lookup efficiency.
The patch moves all the pinctrl data into individual boards as needed.
With the changes, the pinctrl setting nodes becomes local to particular
board, and it makes no sense to continue numbering the setting for
given peripheral. Thus, all the pinctrl phandler name gets updated to
have only peripheral name in there.
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Shawn Guo [Mon, 4 Nov 2013 06:45:46 +0000 (14:45 +0800)]
ARM: dts: imx53: make pinctrl nodes board specific
Currently, all pinctrl setting nodes are defined in <soc>.dtsi, so that
boards that share the same pinctrl setting do not have to define it time
and time again in <board>.dts. However, along with the devices and use
cases being added continuously, the pinctrl setting nodes under iomuxc
becomes more than expected. This bloats device tree blob for particular
board unnecessarily since only a small subset of those pinctrl setting
nodes will be used by the board. It impacts not only the DTB file size
but also the run-time device tree lookup efficiency.
The patch moves all the pinctrl data into individual boards as needed.
With the changes, the pinctrl setting nodes becomes local to particular
board, and it makes no sense to continue numbering the setting for
given peripheral. Thus, all the pinctrl phandler name gets updated to
have only peripheral name in there.
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Rostislav Lisovy [Thu, 24 Oct 2013 21:56:09 +0000 (23:56 +0200)]
ARM: dts: i.MX53: Devicetree for Voipac Baseboard using x53-dmm-668 module
Supported peripherals: Audio -- headphone output, LEDs, Buttons
(using keyboard controller), SD-card.
Signed-off-by: Rostislav Lisovy <lisovy@gmail.com>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Rostislav Lisovy [Thu, 24 Oct 2013 21:56:08 +0000 (23:56 +0200)]
ARM: dts: i.MX53: dts for Voipac x53-dmm-668 module
Enable uart1, ecspi1, i2c1, FEC and PMIC
Signed-off-by: Rostislav Lisovy <lisovy@gmail.com>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Rostislav Lisovy [Thu, 24 Oct 2013 21:56:07 +0000 (23:56 +0200)]
ARM: dts: Add vendor prefix for Voipac Technologies s.r.o.
Signed-off-by: Rostislav Lisovy <lisovy@gmail.com>
Acked-by: Kumar Gala <galak@codeaurora.org>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Greg Ungerer [Tue, 29 Oct 2013 05:15:57 +0000 (15:15 +1000)]
ARM: dts: imx: add device tree support for Freescale imx50evk board
Add device tree support for the Freescale IMX50EVk board based around the
IMX50 SoC. Supports UART, SPI flash, FEC ethernet and USB on this board.
Signed-off-by: Greg Ungerer <gerg@uclinux.org>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Greg Ungerer [Tue, 29 Oct 2013 05:15:56 +0000 (15:15 +1000)]
ARM: dts: imx: add IMX50 SoC device tree
Create device tree source for the Freescale IMX50 SoC. This was based on
the IMX53 source with changes made as necessary.
Signed-off-by: Greg Ungerer <gerg@uclinux.org>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Greg Ungerer [Tue, 29 Oct 2013 05:15:55 +0000 (15:15 +1000)]
ARM: dts: imx: add device tree pin definitions for the IMX50
Add device tree pin function definitions for the Freescale IMX50 SoC.
Signed-off-by: Greg Ungerer <gerg@uclinux.org>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Denis Carikli [Fri, 7 Feb 2014 07:50:23 +0000 (15:50 +0800)]
ARM: dts: Add support for the cpuimx51 board from Eukrea and its baseboard.
The following devices/functionalities were added:
* Main and secondary UARTs.
* i2c and the pcf8563 device.
* Ethernet.
* NAND.
* The BP1 button.
* The LED.
* Watchdog
* SD.
Cc: Rob Herring <rob.herring@calxeda.com>
Cc: Pawel Moll <pawel.moll@arm.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Stephen Warren <swarren@wwwdotorg.org>
Cc: Ian Campbell <ijc+devicetree@hellion.org.uk>
Cc: devicetree@vger.kernel.org
Cc: Sascha Hauer <kernel@pengutronix.de>
Cc: linux-arm-kernel@lists.infradead.org
Cc: Eric Bénard <eric@eukrea.com>
Signed-off-by: Denis Carikli <denis@eukrea.com>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Denis Carikli [Wed, 23 Oct 2013 08:29:34 +0000 (10:29 +0200)]
ARM: dts: imx25.dtsi: Add a label for the Audio Multiplexer.
Cc: Rob Herring <rob.herring@calxeda.com>
Cc: Pawel Moll <pawel.moll@arm.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Stephen Warren <swarren@wwwdotorg.org>
Cc: Ian Campbell <ijc+devicetree@hellion.org.uk>
Cc: devicetree@vger.kernel.org
Cc: Sascha Hauer <kernel@pengutronix.de>
Cc: linux-arm-kernel@lists.infradead.org
Cc: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Cc: Eric Bénard <eric@eukrea.com>
Signed-off-by: Denis Carikli <denis@eukrea.com>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Denis Carikli [Wed, 23 Oct 2013 08:29:33 +0000 (10:29 +0200)]
ARM: dts: i.MX25: Add sdma script path.
Cc: Rob Herring <rob.herring@calxeda.com>
Cc: Pawel Moll <pawel.moll@arm.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Stephen Warren <swarren@wwwdotorg.org>
Cc: Ian Campbell <ijc+devicetree@hellion.org.uk>
Cc: devicetree@vger.kernel.org
Cc: Sascha Hauer <kernel@pengutronix.de>
Cc: linux-arm-kernel@lists.infradead.org
Cc: Eric Bénard <eric@eukrea.com>
Signed-off-by: Denis Carikli <denis@eukrea.com>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Denis Carikli [Wed, 23 Oct 2013 08:29:32 +0000 (10:29 +0200)]
ARM: dts: i.MX25: Add ssi clocks and DMA events.
Cc: Rob Herring <rob.herring@calxeda.com>
Cc: Pawel Moll <pawel.moll@arm.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Stephen Warren <swarren@wwwdotorg.org>
Cc: Ian Campbell <ijc+devicetree@hellion.org.uk>
Cc: devicetree@vger.kernel.org
Cc: Sascha Hauer <kernel@pengutronix.de>
Cc: linux-arm-kernel@lists.infradead.org
Cc: Eric Bénard <eric@eukrea.com>
Signed-off-by: Denis Carikli <denis@eukrea.com>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Denis Carikli [Wed, 23 Oct 2013 08:29:26 +0000 (10:29 +0200)]
of: add vendor prefix for Eukrea Electromatique.
Trivial patch to add Eukréa Electromatique to the list
of devicetree vendor prefixes.
Cc: Pawel Moll <pawel.moll@arm.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Stephen Warren <swarren@wwwdotorg.org>
Cc: Ian Campbell <ijc+devicetree@hellion.org.uk>
Cc: devicetree@vger.kernel.org
Cc: Sascha Hauer <kernel@pengutronix.de>
Cc: linux-arm-kernel@lists.infradead.org
Cc: Eric Bénard <eric@eukrea.com>
Signed-off-by: Denis Carikli <denis@eukrea.com>
Acked-by: Rob Herring <rob.herring@calxeda.com>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Aida Mynzhasova [Wed, 23 Oct 2013 06:58:57 +0000 (10:58 +0400)]
ARM: dts: mxs: add auart2 pinmux to imx28.dtsi
Add auart2 pins configuration on its main pads
Signed-off-by: Aida Mynzhasova <aida.mynzhasova@skitlab.ru>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Rostislav Lisovy [Tue, 22 Oct 2013 17:07:21 +0000 (19:07 +0200)]
ARM: dts: i.MX53: Internal keyboard controller
Signed-off-by: Rostislav Lisovy <lisovy@gmail.com>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Linus Torvalds [Mon, 3 Feb 2014 00:42:13 +0000 (16:42 -0800)]
Linus 3.14-rc1
Linus Torvalds [Mon, 3 Feb 2014 00:32:53 +0000 (16:32 -0800)]
Merge branch 'parisc-3.14' of git://git./linux/kernel/git/deller/parisc-linux
Pull parisc updates from Helge Deller:
"The three major changes in this patchset is a implementation for
flexible userspace memory maps, cache-flushing fixes (again), and a
long-discussed ABI change to make EWOULDBLOCK the same value as
EAGAIN.
parisc has been the only platform where we had EWOULDBLOCK != EAGAIN
to keep HP-UX compatibility. Since we will probably never implement
full HP-UX support, we prefer to drop this compatibility to make it
easier for us with Linux userspace programs which mostly never checked
for both values. We don't expect major fall-outs because of this
change, and if we face some, we will simply rebuild the necessary
applications in the debian archives"
* 'parisc-3.14' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
parisc: add flexible mmap memory layout support
parisc: Make EWOULDBLOCK be equal to EAGAIN on parisc
parisc: convert uapi/asm/stat.h to use native types only
parisc: wire up sched_setattr and sched_getattr
parisc: fix cache-flushing
parisc/sti_console: prefer Linux fonts over built-in ROM fonts
Mikulas Patocka [Tue, 28 Jan 2014 23:11:33 +0000 (00:11 +0100)]
hpfs: optimize quad buffer loading
HPFS needs to load 4 consecutive 512-byte sectors when accessing the
directory nodes or bitmaps. We can't switch to 2048-byte block size
because files are allocated in the units of 512-byte sectors.
Previously, the driver would allocate a 2048-byte area using kmalloc,
copy the data from four buffers to this area and eventually copy them
back if they were modified.
In the current implementation of the buffer cache, buffers are allocated
in the pagecache. That means that 4 consecutive 512-byte buffers are
stored in consecutive areas in the kernel address space. So, we don't
need to allocate extra memory and copy the content of the buffers there.
This patch optimizes the code to avoid copying the buffers. It checks
if the four buffers are stored in contiguous memory - if they are not,
it falls back to allocating a 2048-byte area and copying data there.
Signed-off-by: Mikulas Patocka <mikulas@artax.karlin.mff.cuni.cz>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Mikulas Patocka [Tue, 28 Jan 2014 23:10:44 +0000 (00:10 +0100)]
hpfs: remember free space
Previously, hpfs scanned all bitmaps each time the user asked for free
space using statfs. This patch changes it so that hpfs scans the
bitmaps only once, remembes the free space and on next invocation of
statfs it returns the value instantly.
New versions of wine are hammering on the statfs syscall very heavily,
making some games unplayable when they're stored on hpfs, with load
times in minutes.
This should be backported to the stable kernels because it fixes
user-visible problem (excessive level load times in wine).
Signed-off-by: Mikulas Patocka <mikulas@artax.karlin.mff.cuni.cz>
Cc: stable@vger.kernel.org
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Helge Deller [Fri, 31 Jan 2014 21:19:52 +0000 (22:19 +0100)]
parisc: add flexible mmap memory layout support
Add support for the flexible mmap memory layout (as described in
http://lwn.net/Articles/91829). This is especially very interesting on
parisc since we currently only support 32bit userspace (even with a
64bit Linux kernel).
Signed-off-by: Helge Deller <deller@gmx.de>
Guy Martin [Thu, 16 Jan 2014 16:17:53 +0000 (17:17 +0100)]
parisc: Make EWOULDBLOCK be equal to EAGAIN on parisc
On Linux, only parisc uses a different value for EWOULDBLOCK which
causes a lot of troubles for applications not checking for both values.
Since the hpux compat is long dead, make EWOULDBLOCK behave the same as
all other architectures.
Signed-off-by: Guy Martin <gmsoft@tuxicoman.be>
Signed-off-by: Helge Deller <deller@gmx.de>
Helge Deller [Fri, 31 Jan 2014 22:00:38 +0000 (23:00 +0100)]
parisc: convert uapi/asm/stat.h to use native types only
The stat.h header file is exported to userspace. Some userspace
applications failed to compile due to missing/unknown types, so we
better convert it to use native types only (like it's done on other
architectures too).
Signed-off-by: Helge Deller <deller@gmx.de>
Helge Deller [Fri, 31 Jan 2014 21:29:17 +0000 (22:29 +0100)]
parisc: wire up sched_setattr and sched_getattr
Signed-off-by: Helge Deller <deller@gmx.de>
Helge Deller [Fri, 31 Jan 2014 20:33:17 +0000 (21:33 +0100)]
parisc: fix cache-flushing
This commit:
f8dae00684d678afa13041ef170cecfd1297ed40: parisc: Ensure full cache coherency for kmap/kunmap
caused negative caching side-effects, e.g. hanging processes with expect and
too many inequivalent alias messages from flush_dcache_page() on Debian 5 systems.
This patch now partly reverts it and has been in production use on our debian buildd
makeservers since a week without any major problems.
Signed-off-by: Helge Deller <deller@gmx.de>
Signed-off-by: John David Anglin <dave.anglin@bell.net>
Cc: stable@vger.kernel.org # v3.9+
Signed-off-by: Helge Deller <deller@gmx.de>
Helge Deller [Fri, 31 Jan 2014 14:39:40 +0000 (15:39 +0100)]
parisc/sti_console: prefer Linux fonts over built-in ROM fonts
The built-in ROM fonts lack many necessary ASCII characters, which is
why it makes sens to prefer the Linux fonts instead if they are
available. This makes consoles on STI graphics cards which are not
supported by the stifb driver (e.g. Visualize FXe) looks much nicer.
Signed-off-by: Helge Deller <deller@gmx.de>
Cc: stable@vger.kernel.org # v3.13
Linus Torvalds [Sun, 2 Feb 2014 19:30:57 +0000 (11:30 -0800)]
Merge branch 'hwmon-for-linus' of git://git./linux/kernel/git/jdelvare/staging
Pull hwmon kconfig fixes from Jean Delvare.
* 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
hwmon: Fix SENSORS_TMP102 dependencies to eliminate build errors
hwmon: Fix SENSORS_LM75 dependencies to eliminate build errors
Linus Torvalds [Sun, 2 Feb 2014 19:30:08 +0000 (11:30 -0800)]
Merge branch 'slab/next' of git://git./linux/kernel/git/penberg/linux
Pull SLAB changes from Pekka Enberg:
"Random bug fixes that have accumulated in my inbox over the past few
months"
* 'slab/next' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/linux:
mm: Fix warning on make htmldocs caused by slab.c
mm: slub: work around unneeded lockdep warning
mm: sl[uo]b: fix misleading comments
slub: Fix possible format string bug.
slub: use lockdep_assert_held
slub: Fix calculation of cpu slabs
slab.h: remove duplicate kmalloc declaration and fix kernel-doc warnings
Linus Torvalds [Sun, 2 Feb 2014 19:28:48 +0000 (11:28 -0800)]
Merge branch 'release' of git://git./linux/kernel/git/lenb/linux
Pull turbostat updates from Len Brown.
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux:
tools/power turbostat: introduce -s to dump counters
tools/power turbostat: remove unused command line option
turbostat: Add option to report joules consumed per sample
turbostat: run on HSX
turbostat: Add a .gitignore to ignore the compiled turbostat binary
turbostat: Clean up error handling; disambiguate error messages; use err and errx
turbostat: Factor out common function to open file and exit on failure
turbostat: Add a helper to parse a single int out of a file
turbostat: Check return value of fscanf
turbostat: Use GCC's CPUID functions to support PIC
turbostat: Don't attempt to printf an off_t with %zx
turbostat: Don't put unprocessed uapi headers in the include path
Linus Torvalds [Sun, 2 Feb 2014 19:11:06 +0000 (11:11 -0800)]
Merge tag 'fixes-for-linus' of git://git./linux/kernel/git/arm/arm-soc
Pull ARM SoC fixes from Olof Johansson:
"Here's a set of patches for (hopefully) -rc1. Some of them are fixes,
but a good number of them also do things such as enable new drivers in
the defconfigs for platforms that have such devices, increases
coverage of the multiplatform defconfig and some DTS changes that
plumbs up some of the devices that now have bindings and driver
support.
The commit dates are recent; we've mostly collected these fixes in the
last few days but I also had to rebuild the branch yesterday to sort
out some internal conflicts which reset the timestamps. The changes
should have been tested by each platform maintainer already (and few
of them have cross-platform impact) so I'm personally not too
concerned by it at this time"
* tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (23 commits)
ARM: multi_v7_defconfig: remove redundant entries and re-enable TI_EDMA
ARM: multi_v7_defconfig: add mvebu drivers
clocksource: kona: Add basic use of external clock
drivers: bus: fix CCI driver kcalloc call parameters swap
ARM: dts: bcm28155-ap: Fix Card Detection GPIO
ARM: multi_v7_defconfig: Select CONFIG_AT803X_PHY
ARM: keystone: config: fix build warning when CONFIG_DMADEVICES is not set
MAINTAINERS: ARM: SiRF: use regex patterns to involve all SiRF drivers
ARM: dts: zynq: Add SDHCI nodes
ARM: hisi: don't select SMP
ARM: tegra: rebuild tegra_defconfig to add DEBUG_FS
ARM: multi_v7: copy most options from tegra_defconfig
ARM: iop32x: fix power off handling for the EM7210 board
ARM: integrator: restore static map on the CP
ARM: msm_defconfig: Enable MSM clock drivers
ARM: dts: msm: Add clock controller nodes and hook into uart
ARM: OMAP4+: move errata initialization to omap4_pm_init_early
ARM: OMAP4460: cpuidle: Extend PM_OMAP4_ROM_SMP_BOOT_ERRATUM_GICD on cpuidle
ARM: mvebu: fix compilation warning on Armada 370 (i.e. non-SMP)
ARM: shmobile: r8a7790.dtsi: ficx i2c[0-3] clock reference
...
Jean Delvare [Sun, 2 Feb 2014 16:59:07 +0000 (17:59 +0100)]
hwmon: Fix SENSORS_TMP102 dependencies to eliminate build errors
Similar to what was done for the lm75 driver.
Add depends on THERMAL since that is what provides the
register/unregister functions above, but only if THERMAL_OF was
selected as this is an optional feature of the driver.
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Cc: Randy Dunlap <rdunlap@infradead.org>
Acked-by: Eduardo Valentin <eduardo.valentin@ti.com>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
This page took 0.044536 seconds and 5 git commands to generate.