Olof Johansson [Mon, 27 Jul 2015 12:23:46 +0000 (14:23 +0200)]
Merge tag 'sti-dt-for-v4.3-1' of https://git./linux/kernel/git/mcoquelin/sti into next/dt
STi DT update for v4.3, round 1.
Highlights:
-----------
- Add pinctrl configurations for transport stream channels
- Add cpu-release-addr properties to STiH407 and STiH418
- Add PWM regulator support so STIH407 family
- Add BDISP node to STiH407
* tag 'sti-dt-for-v4.3-1' of https://git.kernel.org/pub/scm/linux/kernel/git/mcoquelin/sti:
ARM: DT: STiH410: Add bdisp dt nodes
ARM: STi: STiH407: Add PWM Regulator node
ARM: STi: STiH407: Move PWM nodes STiH407 => STiH407-family
ARM: STi: DT: Rename st_pll3200c32_407_c0_x into st_pll3200c32_cx_x
ARM: STi: DT: STiH418: Add cpu-release-addr dt property.
ARM: STi: DT: STiH407: Add cpu-release-addr dt property.
ARM: STi: DT: Add STiH407 family mtsin0 pinctrl configuration
ARM: STi: DT: Add STiH407 family tsout1 pinctrl configuration
ARM: STi: DT: Add STiH407 family tsout0 pinctrl configuration
ARM: STi: DT: Add STiH407 family tsin5 pinctrl configuration
ARM: STi: DT: Add STiH407 family tsin4 pinctrl configuration
ARM: STi: DT: Add STiH407 family tsin3 pinctrl configuration
ARM: STi: DT: Add STiH407 family tsin2 pinctrl configuration
ARM: STi: DT: Add STiH407 family tsin1 pinctrl configuration
ARM: STi: DT: Add STiH407 family tsin0 pinctrl configuration
Signed-off-by: Olof Johansson <olof@lixom.net>
Olof Johansson [Wed, 22 Jul 2015 23:25:04 +0000 (16:25 -0700)]
Merge tag 'omap-for-v4.3/dt-pt2' of git://git./linux/kernel/git/tmlind/linux-omap into next/dt
Merge "omap dts changes for v4.3, part2" from Tony Lindgren:
More omap dts changes for v4.3 merge window:
- Add missing devices for pandora. Note that we're adding wl1251
WLAN and LCD backlight support for now using legacy pdata as that
allows us to drop the legacy board file for pandora in another
series of patches
- Enable power button support for omap5-uevm
- Add aliases for am437x UARTs
- Add support for phyCORE phyBOARD-WEGA-AM335x rdk and
phyCORE-AM335x SoM
- Use u16 values for tsc2046 on omap3-lilly
* tag 'omap-for-v4.3/dt-pt2' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
ARM: OMAP2+: omap3-pandora: add wifi support
ARM: OMAP2+: omap3-pandora: add backlight support
ARM: dts: omap3-pandora: add support for usb host and 32k buffer
ARM: dts: omap3-pandora: miscellaneous corrections
ARM: dts: omap5-uevm: Add Palmas power button support
ARM: dts: am437x: add aliases for all UART instances
ARM: dts: Add phyBOARD-WEGA-AM335x rdk
ARM: dts: Add support for phyCORE-AM335x SoM
ARM: dts: omap3: correct the format of u16 values for tsc2046 node
Signed-off-by: Olof Johansson <olof@lixom.net>
Fabien Dessenne [Tue, 16 Jun 2015 13:30:00 +0000 (15:30 +0200)]
ARM: DT: STiH410: Add bdisp dt nodes
Add the bdisp (2D blitter for STMicroelectronics SoC) dt nodes for the
first of the two bdisp devices, defining register address, interrupt and
clock.
Signed-off-by: Fabien Dessenne <fabien.dessenne@st.com>
Signed-off-by: Maxime Coquelin <maxime.coquelin@st.com>
Lee Jones [Tue, 7 Jul 2015 15:06:00 +0000 (17:06 +0200)]
ARM: STi: STiH407: Add PWM Regulator node
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Maxime Coquelin <maxime.coquelin@st.com>
Lee Jones [Tue, 7 Jul 2015 15:06:00 +0000 (17:06 +0200)]
ARM: STi: STiH407: Move PWM nodes STiH407 => STiH407-family
This also incorporates the STiH410.
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Maxime Coquelin <maxime.coquelin@st.com>
Gabriel Fernandez [Tue, 23 Jun 2015 14:09:00 +0000 (16:09 +0200)]
ARM: STi: DT: Rename st_pll3200c32_407_c0_x into st_pll3200c32_cx_x
Use a generic name for this kind of PLL
Signed-off-by: Gabriel Fernandez <gabriel.fernandez@linaro.org>
Signed-off-by: Maxime Coquelin <maxime.coquelin@st.com>
Peter Griffin [Tue, 9 Jun 2015 13:33:00 +0000 (15:33 +0200)]
ARM: STi: DT: STiH418: Add cpu-release-addr dt property.
To enable SMP when booting via u-boot we need to specify the
newly implemented cpu-release-addr DT property for cores 2 & 3.
Cores 0 & 1 are inherited from stih407-family.dtsi.
Signed-off-by: Peter Griffin <peter.griffin@linaro.org>
Signed-off-by: Maxime Coquelin <maxime.coquelin@st.com>
Peter Griffin [Tue, 9 Jun 2015 13:33:00 +0000 (15:33 +0200)]
ARM: STi: DT: STiH407: Add cpu-release-addr dt property.
To enable SMP when booting via u-boot we need to specify the
newly implemented cpu-release-addr DT property.
Signed-off-by: Peter Griffin <peter.griffin@linaro.org>
Acked-by: Maxime Coquelin <maxime.coquelin@st.com>
Signed-off-by: Maxime Coquelin <maxime.coquelin@st.com>
Peter Griffin [Wed, 10 Jun 2015 14:04:00 +0000 (16:04 +0200)]
ARM: STi: DT: Add STiH407 family mtsin0 pinctrl configuration
mtsin0 channel can only be configured for parallel data transfer.
Signed-off-by: Peter Griffin <peter.griffin@linaro.org>
Signed-off-by: Maxime Coquelin <maxime.coquelin@st.com>
Peter Griffin [Wed, 10 Jun 2015 14:04:00 +0000 (16:04 +0200)]
ARM: STi: DT: Add STiH407 family tsout1 pinctrl configuration
tsout1 channel can only be configured for serial data tranfer.
Signed-off-by: Peter Griffin <peter.griffin@linaro.org>
Signed-off-by: Maxime Coquelin <maxime.coquelin@st.com>
Peter Griffin [Wed, 10 Jun 2015 14:04:00 +0000 (16:04 +0200)]
ARM: STi: DT: Add STiH407 family tsout0 pinctrl configuration
tsout0 channel can be configured for either serial or parallel
data transfer. Both pin configurations are provided.
Signed-off-by: Peter Griffin <peter.griffin@linaro.org>
Signed-off-by: Maxime Coquelin <maxime.coquelin@st.com>
Peter Griffin [Wed, 10 Jun 2015 14:04:00 +0000 (16:04 +0200)]
ARM: STi: DT: Add STiH407 family tsin5 pinctrl configuration
tsin5 can only be configured for serial data transfer. However
depending on board design, two alternate tsin5 pin configurations
are available, both in pin-controller-front0.
pinctrl_tsin5_serial_alt1 is brought out on B2120 reference
design as TSD on NIMB slot of the B2004A daughter board.
Signed-off-by: Peter Griffin <peter.griffin@linaro.org>
Signed-off-by: Maxime Coquelin <maxime.coquelin@st.com>
Peter Griffin [Wed, 10 Jun 2015 14:04:00 +0000 (16:04 +0200)]
ARM: STi: DT: Add STiH407 family tsin4 pinctrl configuration
tsin4 can only be configured for serial data transfer. However
depending on board design, two alternate pin configurations
are available. One in pin-controller-front0 and the other in
pin-controller-front1.
pinctrl_tsin4_serial_alt3 is brought out on B2120 reference
design as TSC on NIMA slot of the B2004A daughter board.
Signed-off-by: Peter Griffin <peter.griffin@linaro.org>
Signed-off-by: Maxime Coquelin <maxime.coquelin@st.com>
Peter Griffin [Wed, 10 Jun 2015 14:04:00 +0000 (16:04 +0200)]
ARM: STi: DT: Add STiH407 family tsin3 pinctrl configuration
tsin3 channel can only be configured for serial data transfer.
On B2120 reference design tsin3 is brought out as TSB on the NIMB
slot of the B2004A daughter board.
Signed-off-by: Peter Griffin <peter.griffin@linaro.org>
Signed-off-by: Maxime Coquelin <maxime.coquelin@st.com>
Peter Griffin [Wed, 10 Jun 2015 14:04:00 +0000 (16:04 +0200)]
ARM: STi: DT: Add STiH407 family tsin2 pinctrl configuration
tsin2 channel can be configured for either serial or parallel data
transfer. This patch adds the pinctrl config for both possibilities.
Signed-off-by: Peter Griffin <peter.griffin@linaro.org>
Signed-off-by: Maxime Coquelin <maxime.coquelin@st.com>
Peter Griffin [Wed, 10 Jun 2015 14:03:00 +0000 (16:03 +0200)]
ARM: STi: DT: Add STiH407 family tsin1 pinctrl configuration
tsin1 channel can be configured for either serial or parallel data
transfer. This patch adds the pinctrl config for both possibilities.
Signed-off-by: Peter Griffin <peter.griffin@linaro.org>
Signed-off-by: Maxime Coquelin <maxime.coquelin@st.com>
Peter Griffin [Wed, 10 Jun 2015 14:03:00 +0000 (16:03 +0200)]
ARM: STi: DT: Add STiH407 family tsin0 pinctrl configuration
tsin0 and be configured as either serial or parallel. This patch
adds the pinctrl config for both possiblities. On B2120 reference
design tsin0 is brought out as TSA on the NIMA slot of the B2004A
daughter board.
Signed-off-by: Peter Griffin <peter.griffin@linaro.org>
Signed-off-by: Maxime Coquelin <maxime.coquelin@st.com>
Olof Johansson [Tue, 21 Jul 2015 21:06:46 +0000 (14:06 -0700)]
Merge tag 'tags/pxa-dt-4.3' of https://github.com/rjarzmik/linux into next/dt
Merge "pxa-dt for v4.3" from Robert Jarzmik:
This device-tree pxa update brings :
- dma nodes after dmaengine pxa_dma driver merge
- camera driver
- usb host controller
* tag 'tags/pxa-dt-4.3' of https://github.com/rjarzmik/linux:
ARM: dts: pxa: fix power i2c definition
ARM: dts: pxa: add the usb host controller
ARM: dts: pxa: add embedded pxa camera capture interface
ARM: dts: pxa: add dma pxamci nodes to pxa3xx
ARM: dts: pxa: add dma engine node to pxa3xx-nand
ARM: dts: pxa: add dma controller
Signed-off-by: Olof Johansson <olof@lixom.net>
Grazvydas Ignotas [Tue, 21 Jul 2015 01:12:01 +0000 (04:12 +0300)]
ARM: OMAP2+: omap3-pandora: add wifi support
Add wl1251 support via pdata-quirks as it's driver lacks DT
support. MMC3 is marked disabled in DT so that MMC3 instance of
hsmmc driver is probed using platform data with special card init
callback.
Signed-off-by: Grazvydas Ignotas <notasas@gmail.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Grazvydas Ignotas [Tue, 21 Jul 2015 01:12:00 +0000 (04:12 +0300)]
ARM: OMAP2+: omap3-pandora: add backlight support
Add backlight support via pdata-quirks as it's driver lacks DT support.
Signed-off-by: Grazvydas Ignotas <notasas@gmail.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Grazvydas Ignotas [Tue, 21 Jul 2015 01:11:59 +0000 (04:11 +0300)]
ARM: dts: omap3-pandora: add support for usb host and 32k buffer
This adds missing bits for EHCI HS USB host support and 32k clock
buffer control for the wg7210 bt+wifi module.
Signed-off-by: Grazvydas Ignotas <notasas@gmail.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Grazvydas Ignotas [Tue, 21 Jul 2015 01:11:58 +0000 (04:11 +0300)]
ARM: dts: omap3-pandora: miscellaneous corrections
- add pandora specific compatible name
- fix mmc2 card detect polarity
- fix mmc1 and mmc2 write protect polarity
- disable write protect pins because of production issue and add an
explanation why they are disabled
- fix NAND partition name to reflect the correct address
Signed-off-by: Grazvydas Ignotas <notasas@gmail.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Aparna Balasubramanian [Mon, 20 Jul 2015 21:07:31 +0000 (16:07 -0500)]
ARM: dts: omap5-uevm: Add Palmas power button support
Palmas on OMAP5uevm has support for power button, so enable it.
Signed-off-by: Aparna Balasubramanian <aparnab@ti.com>
Acked-by: Nishanth Menon <nm@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Sekhar Nori [Mon, 20 Jul 2015 11:12:20 +0000 (16:42 +0530)]
ARM: dts: am437x: add aliases for all UART instances
Add serialN aliases for all 6 UART instances on
the AM437x SoC so each board's .dts file does not
have to define its own aliases.
Remove the alias added for am437x-gp-evm.dts now
that we have the aliases defined in am4372.dtsi
file.
Signed-off-by: Sekhar Nori <nsekhar@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Teresa Remmet [Thu, 16 Jul 2015 08:30:49 +0000 (10:30 +0200)]
ARM: dts: Add phyBOARD-WEGA-AM335x rdk
phyBOARD-WEGA-AM335x represents a direct soldered
combination of a phyCORE-AM335x SoM and carrier board.
Different kind of SoM options can be connected to
the wega carrier board. So we created a separate
wega dtsi file. The final dts contains the actual
SoM on the carrier board.
WEGA carrier board features:
* ETH phy on carrier board: 1x MII
* 1x CAN
* 2x UART
* USB0 (device)
* USB1 (host)
* mSD slot
Signed-off-by: Teresa Remmet <t.remmet@phytec.de>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Teresa Remmet [Thu, 16 Jul 2015 08:30:48 +0000 (10:30 +0200)]
ARM: dts: Add support for phyCORE-AM335x SoM
phyCORE-AM335x is a SoM (System on Module) containing
a AM335x SOC. The module can be connected to different
carrier boards.
Some hardware parts are configurable on the phyCORE-AM335x.
So they are disabled on default in this som dtsi file.
They will be enabled in the board dts files, when populated.
* RAM up to 1GiB
* PMIC
* NAND flash up to 1GiB
* Eth PHY on SOM: 1x RMII
* SPI NOR flash 8MiB (optional)
* i2c RTC (optional)
* i2c EEPROM 4kiB (optional)
Signed-off-by: Teresa Remmet <t.remmet@phytec.de>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Fugang Duan [Thu, 16 Jul 2015 08:26:45 +0000 (16:26 +0800)]
ARM: dts: omap3: correct the format of u16 values for tsc2046 node
In tsc2046 touch driver, the values such as ti,x-min is defined as a u16
value. the driver use API of_property_read_u16() read the value. For these
u16 value, the dts entry should be like:
property = /bits/ 16 <0x5000>;
This describes the property as a u16 value.
Signed-off-by: Fugang Duan <B38611@freescale.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Olof Johansson [Fri, 17 Jul 2015 17:37:26 +0000 (10:37 -0700)]
Merge tag 'v4.3-rockchip32-dts1' of git://git./linux/kernel/git/mmind/linux-rockchip into next/dt
Merge "Rockchip dts changes for 4.3, part1" from Heiko Stuebner:
This adds the board for the Netxeon R89 used in different TV-boxes and
the initial support for two Chromebooks from the veyron family.
Additionally a non-critical fix for the watchdog irq on rk3288, addition
of the gmac reset line, a ramp delay for the cpu regulator on the firefly
board and cpu affinity for the arm-pmu spi irqs.
* tag 'v4.3-rockchip32-dts1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
ARM: dts: rockchip: add rk3288 arm-pmu irq affinity
dt-bindings: document rk3368 R88 board from Rockchip
ARM: dts: rockchip: add missing device_type = "memory" to boards
ARM: dts: rockchip: add veyron-pinky board
ARM: dts: rockchip: add veyron-jerry board
ARM: dts: rockchip: add shared rk3288-veyron files
ARM: dts: Add sbs-battery dts fragment used by chromebooks
ARM: dts: rockchip: add Netxeon R89 board
dt-bindings: add vendor prefix for Netxeon Technology
ARM: dts: rockchip: fix rk3288 watchdog irq
ARM: dts: rockchip: Add ramp delay for vdd_cpu in firefly board dts
ARM: dts: rockchip: Add STMMAC reset signal in GMAC interface for rk3288
Signed-off-by: Olof Johansson <olof@lixom.net>
Olof Johansson [Fri, 17 Jul 2015 17:16:36 +0000 (10:16 -0700)]
Merge tag 'arm-soc/for-4.3/dts' of github.com/broadcom/stblinux into next/dt
Merge "Broadcom Device Tree changes for 4.3 (part 1)" from Florian Fainelli:
This pull request contains two changes:
- Ray adds the relevant clocks device tree nodes for Cygnus SoCs
- Rafal enables UART0 on BCM5301X routers where it has been verified to work
correctly
* tag 'arm-soc/for-4.3/dts' of http://github.com/broadcom/stblinux:
ARM: BCM5301X: Enable UART0 on tested devices
ARM: dts: enable clock support for Broadcom Cygnus
Signed-off-by: Olof Johansson <olof@lixom.net>
Olof Johansson [Fri, 17 Jul 2015 17:08:17 +0000 (10:08 -0700)]
Merge tag 'mvebu-dt-4.3-1' of git://git.infradead.org/linux-mvebu into next/dt
Merge "ARM: mvebu: dt changes for v4.3" from Gregory Clement:
mvebu dt changes for v4.3 (part #1)
- Update Armada 388 GP description
- Add Buffalo Linkstation LS-WXL and LS-WSXL
- Fine-tune the L2 configuration for cortex A9 based SoC
- Update XOR definition for Armada 38x and 39x SoC
* tag 'mvebu-dt-4.3-1' of git://git.infradead.org/linux-mvebu:
ARM: mvebu: update EEPROM description of Armada 388 GP
ARM: mvebu: fix description of pwr-sata0 regulator on Armada 388 GP
ARM: dts: add buffalo linkstation ls-wvl/vl
ARM: dts: add buffalo linkstation ls-wxl/wsxl
ARM: mvebu: use DT properties to fine-tune the L2 configuration
ARM: mvebu: use armada-380-xor on Armada 38x and 39x
Signed-off-by: Olof Johansson <olof@lixom.net>
Olof Johansson [Fri, 17 Jul 2015 16:53:02 +0000 (09:53 -0700)]
Merge branch 'lpc18xx_43xx_dts_4.3' of https://github.com/manabian/linux-lpc into next/dt
Merge "LPC18xx DTS changes for 4.3" from Joachim Eastwood:
This patch set adds DT nodes for all the drivers that went upstream in
4.2 and should represent the bulk of DTS changes for 4.3. All nodes
added are documented and some of patches carries a ack from subsystem
maintainer. It also features updates to the EA4357 dev- kit and a new
board from Ezequiel Garcia.
Note that there might be one more batch of DTS changes for 4.3 if any
new drivers goes upstream and also some changes for the Hitex eval board
might come.
* 'lpc18xx_43xx_dts_4.3' of https://github.com/manabian/linux-lpc:
ARM: dts: add DT for CIAA LPC4337 industrial computer
of: add vendor prefix for CIAA project
ARM: dts: lpc4357-ea4357: add uart3
ARM: dts: lpc4357-ea4357: add ethernet
ARM: dts: lpc4357-ea4357: add gpio joystick
ARM: dts: lpc4357-ea4357: add mmcsd
ARM: dts: lpc4357-ea4357: add pinctrl and uart0 muxing
ARM: dts: lpc18xx: add usb nodes
ARM: dts: lpc18xx: add ethernet node
ARM: dts: lpc18xx: add creg (syscon) node
ARM: dts: lpc18xx: add mmcsd node
ARM: dts: lpc18xx: add can nodes
ARM: dts: lpc18xx: add ssp nodes
ARM: dts: lpc18xx: add gpio node
ARM: dts: lpc18xx: add pinctrl node
ARM: dts: lpc18xx: add uart new compat string and clk names
ARM: dts: lpc18xx: add cgu and ccu clock-controller nodes
Signed-off-by: Olof Johansson <olof@lixom.net>
Heiko Stuebner [Wed, 15 Jul 2015 21:03:09 +0000 (23:03 +0200)]
ARM: dts: rockchip: add rk3288 arm-pmu irq affinity
The rk3288 uses spi irqs for the arm-pmu on individual cpu cores, so needs
the affinity to them defined.
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
Reviewed-by: Sonny Rao <sonnyrao@chromium.org>
Heiko Stuebner [Thu, 25 Jun 2015 17:22:27 +0000 (19:22 +0200)]
dt-bindings: document rk3368 R88 board from Rockchip
The initial board containing the rk3368 ARM64 soc.
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
Heiko Stuebner [Wed, 15 Jul 2015 18:57:21 +0000 (20:57 +0200)]
ARM: dts: rockchip: add missing device_type = "memory" to boards
The memory node is supposed to contain a device_type property marking
it as memory. The currently included boards miss this property.
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
Heiko Stuebner [Tue, 7 Jul 2015 18:09:34 +0000 (20:09 +0200)]
ARM: dts: rockchip: add veyron-pinky board
While pinky was one of the earlier development models, is on the list
of endangered species today and nearly extinct, I want to keep mine
around for the foreseeable future after spending all the time making a
nice hole into the base below the dut-connector.
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
Alexandru M Stan [Tue, 7 Jul 2015 18:04:32 +0000 (20:04 +0200)]
ARM: dts: rockchip: add veyron-jerry board
The Hisense Chromebook C11, also named jerry.
Signed-off-by: Alexandru M Stan <amstan@chromium.org>
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
Reviewed-by: Doug Anderson <dianders@chromium.org>
Alexandru M Stan [Tue, 7 Jul 2015 17:42:53 +0000 (19:42 +0200)]
ARM: dts: rockchip: add shared rk3288-veyron files
This adds the shared devicetree files for the Veyron device family.
They are split, as not all veyron devices are chromebooks and
not all contain a sd-card slot.
Signed-off-by: Alexandru M Stan <amstan@chromium.org>
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
Reviewed-by: Doug Anderson <dianders@chromium.org>
Olof Johansson [Wed, 15 Jul 2015 14:17:14 +0000 (10:17 -0400)]
Merge tag 'omap-for-v4.3/dt-pt1' of git://git./linux/kernel/git/tmlind/linux-omap into next/dt
Merge "omap dts changes for v4.3, part 1" from Tony Lindgren:
Omap dts changes for v4.3 merge window. There are also related
changes for reemoteproc platform_data and audio options for
omap2plus_defconfig to keep audio working when changing boards
to use SIMPLE_CARD. The summary of changes is:
- A large set of audio related changes for SIMPLE_CARD from
Peter Ujfalusi <peter.ujfalusi@ti.com> for am335x and am437x
- Pinctrl dts defines for dra7 virtual mode to configure timings
- Change to use cpsw slave0 for dra7 Ethernet
- Remove unconfigured and wrong l3-mux entry for dm816x
- Add support for Gumstix Palo35 and TobiDuo boards, and Overo
PoP NAND and McBSP2
- Start using new HDMI binding for tilcdc
- Start using new sDMA crossbar for dra7
- Start using rproc for am335x and am437x M3 coprocessor
* tag 'omap-for-v4.3/dt-pt1' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: (32 commits)
ARM: dts: am335x-evm: Switch using simple-audio-card for audio support
ARM: dts: am335x-evm: Add sleep pin settings for mcasp1
ARM: dts: am335x-evm: Rename pinctrl section for McASP1
ARM: dts: am335x-evm: Fix mcasp1 node's indentation
ARM: dts: am335x-evmsk: Switch using simple-audio-card for audio support
ARM: dts: am335x-evmsk: Add sleep pin settings for mcasp1
ARM: dts: am335x-evmsk: Fix mcasp1 node's indentation
ARM: dts: am437x-gp-evm: Enable analog audio via simple-card
ARM: dts: am437x-gp-evm: McASP1 node for audio support
ARM: dts: am437x-gp-evm: Add node for tlv320aic3106 audio codec
ARM: dts: am437x-gp-evm: Rename fixed regulator vmmcsd_fixed to evm_v3_3d
ARM: dts: am437x-gp-evm: Add gpio-hog for configuring the display/audio mux
ARM: dts: am43xx-epos-evm: Enable analog audio via simple-card
ARM: dts: am43xx-epos-evm: Add node for tlv320aic3111 audio codec
ARM: dts: am43xx-epos-evm: McASP1 node for audio support
ARM: dts: am43xx-epos-evm: Add regulator for VBAT and DCDC4 of tps65218
ARM: dts: am43xx-epos-evm: Add gpio-hog for configuring the display/audio mux
ARM: dts: am437x-sk-evm: Switch using simple-audio-card for audio support
ARM: dts: am437x-sk-evm: Add sleep pin settings for mcasp1
ARM: omap2plus_defconfig: Enable audio related config options
...
Signed-off-by: Olof Johansson <olof@lixom.net>
Chris Zhong [Fri, 16 Jan 2015 06:58:34 +0000 (22:58 -0800)]
ARM: dts: Add sbs-battery dts fragment used by chromebooks
This patch creates a sbs-battery fragment for batteries connected
to the i2c tunnel of the cros-ec embedded controller.
Signed-off-by: Chris Zhong <zyw@rock-chips.com>
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
Acked-by: Douglas Anderson <dianders@chromium.org>
Heiko Stuebner [Tue, 26 May 2015 19:50:09 +0000 (21:50 +0200)]
ARM: dts: rockchip: add Netxeon R89 board
This board is used in some TV-boxes like for example the Beelink R89 or
Tronsmart R28.
The board itself follows the reference design for the most part. But
there are no schematics available it seems, so some things should be
taken with a grain of salt.
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
Reviewed-by: Romain Perier <romain.perier@gmail.com>
Heiko Stuebner [Tue, 26 May 2015 19:49:05 +0000 (21:49 +0200)]
dt-bindings: add vendor prefix for Netxeon Technology
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
Acked-by: Rob Herring <robh@kernel.org>
Reviewed-by: Romain Perier <romain.perier@gmail.com>
Ezequiel Garcia [Tue, 2 Jun 2015 01:57:16 +0000 (22:57 -0300)]
ARM: dts: add DT for CIAA LPC4337 industrial computer
Add basic support for CIAA (Argentine Open Industrial Computer)
LPC4337 board. This commit enables the following peripherals:
* UART
* SSP
* Ethernet
Signed-off-by: Ezequiel Garcia <ezequiel@vanguardiasur.com.ar>
Signed-off-by: Joachim Eastwood <manabian@gmail.com>
Ezequiel Garcia [Sun, 21 Jun 2015 23:23:48 +0000 (20:23 -0300)]
of: add vendor prefix for CIAA project
CIAA stands for Argentine Open Industrial Computer. The CIAA project
is an initiative sponsored by universities and private companies.
Its main goal is to promote local embedded systems development.
Among other devices, the project developed a NXP LPC4337-based
reference design.
Signed-off-by: Ezequiel Garcia <ezequiel@vanguardiasur.com.ar>
Signed-off-by: Joachim Eastwood <manabian@gmail.com>
Joachim Eastwood [Fri, 29 May 2015 21:09:52 +0000 (23:09 +0200)]
ARM: dts: lpc4357-ea4357: add uart3
Enable UART3 that is routed to the J17 DSUB9 connector on
the EA4357 devkit.
Signed-off-by: Joachim Eastwood <manabian@gmail.com>
Joachim Eastwood [Thu, 2 Apr 2015 03:56:57 +0000 (05:56 +0200)]
ARM: dts: lpc4357-ea4357: add ethernet
Enable Ethernet and add pin muxing and set the correct
frequency on the enet tx clock input.
Signed-off-by: Joachim Eastwood <manabian@gmail.com>
Joachim Eastwood [Thu, 2 Apr 2015 03:55:32 +0000 (05:55 +0200)]
ARM: dts: lpc4357-ea4357: add gpio joystick
Hook up the small joystick found on the EA4357 devkit.
Signed-off-by: Joachim Eastwood <manabian@gmail.com>
Peter Ujfalusi [Thu, 2 Jul 2015 14:06:35 +0000 (17:06 +0300)]
ARM: dts: am335x-evm: Switch using simple-audio-card for audio support
The sound support consist only Headset output on the board and can be
handled by "simple-audio-card"
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Peter Ujfalusi [Thu, 2 Jul 2015 14:06:34 +0000 (17:06 +0300)]
ARM: dts: am335x-evm: Add sleep pin settings for mcasp1
When McASP is not in use the pins can be put to sleep mode to conserve
power.
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Peter Ujfalusi [Thu, 2 Jul 2015 14:06:33 +0000 (17:06 +0300)]
ARM: dts: am335x-evm: Rename pinctrl section for McASP1
Use mcasp1_pins as name for the pinctrl section needed for McASP1 instead
of the am335x_evm_audio_pins name.
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Peter Ujfalusi [Thu, 2 Jul 2015 14:06:32 +0000 (17:06 +0300)]
ARM: dts: am335x-evm: Fix mcasp1 node's indentation
The section had two tabs instead of one.
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Peter Ujfalusi [Thu, 2 Jul 2015 14:06:31 +0000 (17:06 +0300)]
ARM: dts: am335x-evmsk: Switch using simple-audio-card for audio support
The sound support consist only Headset output on the board and can be
handled by "simple-audio-card"
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Peter Ujfalusi [Thu, 2 Jul 2015 14:06:30 +0000 (17:06 +0300)]
ARM: dts: am335x-evmsk: Add sleep pin settings for mcasp1
When McASP is not in use the pins can be put to sleep mode to conserve
power.
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Peter Ujfalusi [Thu, 2 Jul 2015 14:06:29 +0000 (17:06 +0300)]
ARM: dts: am335x-evmsk: Fix mcasp1 node's indentation
The section had two tabs instead of one.
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Peter Ujfalusi [Thu, 2 Jul 2015 14:06:28 +0000 (17:06 +0300)]
ARM: dts: am437x-gp-evm: Enable analog audio via simple-card
The board uses McASP1 <-> tlv320aic3106 for analog audio and has
Headphone out and Line in connectors.
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Peter Ujfalusi [Thu, 2 Jul 2015 14:06:27 +0000 (17:06 +0300)]
ARM: dts: am437x-gp-evm: McASP1 node for audio support
Add node for McASP1 along with the needed pinctrl entries.
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Peter Ujfalusi [Thu, 2 Jul 2015 14:06:26 +0000 (17:06 +0300)]
ARM: dts: am437x-gp-evm: Add node for tlv320aic3106 audio codec
Analog audio is using this codec on the board.
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Peter Ujfalusi [Thu, 2 Jul 2015 14:06:25 +0000 (17:06 +0300)]
ARM: dts: am437x-gp-evm: Rename fixed regulator vmmcsd_fixed to evm_v3_3d
The same regulator is used by other chips on the board. The power path is:
VBAT -> TPS63031 - Enable signal is V1_8D regulator -> V3_3D.
V3_3D is used by SD slot and tlv320aic3106 codec as well.
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Peter Ujfalusi [Thu, 2 Jul 2015 14:06:24 +0000 (17:06 +0300)]
ARM: dts: am437x-gp-evm: Add gpio-hog for configuring the display/audio mux
GPIO5_8 is used as a mux switch between LCD and HDMI displays. This mux
affects audio routing as well since in LCD mode HDMI audio is not possible
and when HDMI is selected analog audio is not working.
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Peter Ujfalusi [Thu, 2 Jul 2015 14:06:23 +0000 (17:06 +0300)]
ARM: dts: am43xx-epos-evm: Enable analog audio via simple-card
Use simple card for audio support on ePOS-EVM.
The audio on the board is: McASP1 <-> tlv320aic3111 codec.
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Peter Ujfalusi [Thu, 2 Jul 2015 14:06:22 +0000 (17:06 +0300)]
ARM: dts: am43xx-epos-evm: Add node for tlv320aic3111 audio codec
Analog audio is using this codec on the board.
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Peter Ujfalusi [Thu, 2 Jul 2015 14:06:21 +0000 (17:06 +0300)]
ARM: dts: am43xx-epos-evm: McASP1 node for audio support
Add node for McASP1 along with the needed pinctrl entries.
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Peter Ujfalusi [Thu, 2 Jul 2015 14:06:20 +0000 (17:06 +0300)]
ARM: dts: am43xx-epos-evm: Add regulator for VBAT and DCDC4 of tps65218
The VBAT and DCDC4 regulator is needed for audio support (tlv320aic3111)
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Peter Ujfalusi [Thu, 2 Jul 2015 14:06:19 +0000 (17:06 +0300)]
ARM: dts: am43xx-epos-evm: Add gpio-hog for configuring the display/audio mux
GPIO2_1 is used as a mux switch between LCD and HDMI displays. This mux
affects audio routing as well since in LCD mode HDMI audio is not possible
and when HDMI is selected analog audio is not working.
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Peter Ujfalusi [Thu, 2 Jul 2015 14:06:18 +0000 (17:06 +0300)]
ARM: dts: am437x-sk-evm: Switch using simple-audio-card for audio support
The sound support consist only Headset output on the board and can be
handled by "simple-audio-card".
Also enable the Line-In route as the board has support for it.
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Tested-by: Felipe Balbi <balbi@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Peter Ujfalusi [Thu, 2 Jul 2015 14:06:17 +0000 (17:06 +0300)]
ARM: dts: am437x-sk-evm: Add sleep pin settings for mcasp1
When McASP is not in use the pins can be put to sleep mode to conserve
power.
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Tested-by: Felipe Balbi <balbi@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Peter Ujfalusi [Thu, 2 Jul 2015 14:06:16 +0000 (17:06 +0300)]
ARM: omap2plus_defconfig: Enable audio related config options
More and more boards are moving to have audio support via simple-card.
At the same time enable options needed for most am335x and am43xx board for
audio support: McASP and TLV320AIC3X codecs.
The later two has been selected by the CONFIG_SND_AM33XX_SOC_EVM option, but
the aim is to convert all boards to use simple card.
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Acked-by: Felipe Balbi <balbi@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Nishanth Menon [Mon, 22 Jun 2015 15:22:26 +0000 (10:22 -0500)]
pinctrl: dra: dt-bindings: Add virtual mode configuration option
In addition to the regular mux configuration such as mux mode 1,
2 etc, certain pins of DRA7 require to have "virtual mode" also
programmed. This allows for predefined delay characteristics to
be used by the SoC to meet timing characterstics needed for the
interface.
Provide easy to use macro to do the same.
It is important to note that the official TI guidelines recommend
to do as minimal pin reconfiguration beyond the bootloader given
the design of the hardware involved which can result in substantial
glitches which may impair functionality of certain peripherals.
Signed-off-by: Nishanth Menon <nm@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Vignesh R [Mon, 22 Jun 2015 09:03:44 +0000 (14:33 +0530)]
ARM: dts: DRA72: switch to cpsw slave0 for ethernet
On DRA72 EVM, cpsw slave1 is muxed with VIN2A, hence switch to cpsw
slave0 for ethernet. Add gpio hog entry to pcf_gpio_21 in order to
select cpsw slave0.
Signed-off-by: Vignesh R <vigneshr@ti.com>
Signed-off-by: Mugunthan V N <mugunthanvnm@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Tony Lindgren [Fri, 29 May 2015 17:21:52 +0000 (10:21 -0700)]
ARM: dts: Remove L3 compatible value for dm816x
The interconnects on dm816x are like on omap4, so we should use
l3-noc instead of l3-smx. But as the related SoC specific
l3_target_data is still missing from omap_l3_noc let's just
remove the entry for now.
Cc: Brian Hutchinson <b.hutchman@gmail.com>
Reported-by: Matthijs van Duin <matthijsvanduin@gmail.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Adam YH Lee [Fri, 12 Jun 2015 20:37:26 +0000 (13:37 -0700)]
ARM: dts: overo: Add device tree for Palo35 board
Also, reduce the maximum SPI device speed to the max. supported by the
LCD controller used on the LGPhilips LB035Q02 panel for this board.
Signed-off-by: Ash Charles <ashcharles@gmail.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Ash Charles [Fri, 12 Jun 2015 20:37:25 +0000 (13:37 -0700)]
ARM: dts: overo: Support PoP NAND
Some Overo COM models include NAND flash in the on-board
package-on-package (PoP) chip. Add this to the base Overo devicetree.
Most commonly, this is 512MB NAND from the Micron MT29C4G96MAZ family
but, as discussed [1], several different sized are possible. To
support different sizes, the last partition should fill to the end of
the chip (i.e. MTDPART_SIZ_FULL).
With thanks to Florian Vaussard for the original patch [2] and Adam Lee for
updating it here.
[1] http://lists.infradead.org/pipermail/linux-arm-kernel/2013-June/175760.html
[2] http://lists.infradead.org/pipermail/linux-arm-kernel/2013-June/175449.html
Signed-off-by: Ash Charles <ashcharles@gmail.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Adam YH Lee [Fri, 12 Jun 2015 20:37:24 +0000 (13:37 -0700)]
ARM: dts: overo: Enable McBSP2 for all Overo COMs
Both Gumstix Overo and Overo Storm COMs use TWL4030 audio module
connected to the McBSP2. As such, enable the McBSP2 module in the
common device tree file, omap3-overo-base.dtsi, rather than in the
processor-specific device tree files, omap3-overo.dtsi and
omap3-overo-storm.dtsi. This corrects audio on the Storm COMs where
the setting was accidentally missing from the device tree.
Signed-off-by: Ash Charles <ashcharles@gmail.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Ash Charles [Fri, 12 Jun 2015 20:37:23 +0000 (13:37 -0700)]
ARM: dts: Add DTS for Gumstix TobiDuo expansion board
The Gumstix "Tobi-Duo" expansion board [1] can be used with either
OMAP3 Overo or Overo Storm COMs. It provides two NICs using LAN9221
chips.
It is necessary to duplicate the interface information for the
second SMSC9221 chip as discussed [2].
[1] https://store.gumstix.com/index.php/products/241/
[2] http://www.spinics.net/lists/linux-omap/msg115282.html
Signed-off-by: Ash Charles <ashcharles@gmail.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Jyri Sarha [Fri, 8 May 2015 11:27:19 +0000 (14:27 +0300)]
ARM: dts: am335x-boneblack: Use new binding for HDMI
Use new binding for the external tda19988 HDMI encoder.
Signed-off-by: Jyri Sarha <jsarha@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Peter Ujfalusi [Thu, 9 Apr 2015 09:35:54 +0000 (12:35 +0300)]
ARM: dts: dra7x: Integrate sDMA crossbar
The sDMA requests are routed through the DMA crossbar and without the
crossbar only peripherals using DMA request 0-127 can be used.
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Suman Anna [Mon, 13 Jul 2015 17:34:55 +0000 (12:34 -0500)]
ARM: dts: AM4372: Add the wkupm3 rproc node
Add the Wakeup M3 remote processor device node for
the AM4372 SoC. The WkupM3 remote processor is used
to implement and achieve low-power functionality on
the AM33xx & AM43xx SoCs.
This node is added as a child of the recently added
l4_wkup node to reflect its presence within the SoC.
Signed-off-by: Suman Anna <s-anna@ti.com>
Signed-off-by: Dave Gerlach <d-gerlach@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Suman Anna [Mon, 13 Jul 2015 17:34:54 +0000 (12:34 -0500)]
ARM: dts: AM33xx: Update and move wkup_m3 node to l4 node
The WakeupM3 remote processor device node has been moved to
be a child node of the newly created l4_wkup node, to reflect
its presence properly within the SoC. The node was added
previously before any driver support, it is now updated as
per the wkup_m3_rproc bindings added alongside the driver
support.
Signed-off-by: Suman Anna <s-anna@ti.com>
Signed-off-by: Dave Gerlach <d-gerlach@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Dave Gerlach [Mon, 13 Jul 2015 17:34:53 +0000 (12:34 -0500)]
ARM: OMAP2+: Use pdata-quirks for wkup_m3 reset management
Use pdata-quirks to provide platform data required for reset
management during boot and shutdown of the wkup_m3 processor
on both the AM33xx and AM43xx SoCs. The WkupM3 remote processor
is used to implement and achieve low-power functionality on
the AM33xx & AM43xx SoCs.
Signed-off-by: Suman Anna <s-anna@ti.com>
Signed-off-by: Dave Gerlach <d-gerlach@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Olof Johansson [Tue, 14 Jul 2015 09:51:16 +0000 (11:51 +0200)]
Merge tag 'renesas-dt-for-v4.3' of git://git./linux/kernel/git/horms/renesas into next/dt
Merge "Renesas ARM Based SoC DT Updates for v4.3" from Simon Horman:
* Configure IRLM mode via DT on r8a7779 SoC
* Use "arm,gic-400" for GIC on r8a777[01349] and r8a73a4 SoCs
* Add pinctrl and gpio-hog for lcdc0 to armadillo800eva board
* EtherAVB DT support for r8a7790 SoC
* Minimal device tree for r8a7793 SoC and its Gose board
* tag 'renesas-dt-for-v4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
ARM: shmobile: r8a7779: Configure IRLM mode via DT
ARM: shmobile: r8a7794 dtsi: Use "arm,gic-400" for GIC
ARM: shmobile: r8a7793 dtsi: Use "arm,gic-400" for GIC
ARM: shmobile: r8a7791 dtsi: Use "arm,gic-400" for GIC
ARM: shmobile: r8a7790 dtsi: Use "arm,gic-400" for GIC
ARM: shmobile: r8a73a4 dtsi: Use "arm,gic-400" for GIC
ARM: shmobile: armadillo800eva dts: Add pinctrl and gpio-hog for lcdc0
ARM: shmobile: r8a7790: add EtherAVB DT support
ARM: shmobile: r8a7790: add EtherAVB clocks
ARM: shmobile: r8a7793: add minimal Gose board device tree
ARM: shmobile: add r8a7793 minimal SoC device tree
Masahiro Yamada [Fri, 10 Jul 2015 04:54:00 +0000 (13:54 +0900)]
ARM: dts: UniPhier: add USB EHCI device nodes
No dedicated driver compatible with "socionext,uniphier-ehci" has
been supported in the mainline yet, so it falls into "generic-ehci"
and it works well enough with our USB 2.0 host controllers.
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Signed-off-by: Olof Johansson <olof@lixom.net>
Masahiro Yamada [Fri, 10 Jul 2015 04:53:59 +0000 (13:53 +0900)]
ARM: dts: UniPhier: add on-chip UART device nodes
The UniPhier on-chip UART driver was merged into the mainline by
commit
1a8d2903cb6a ("serial: 8250_uniphier: add UniPhier serial
driver").
Add device nodes to make it really available.
We no longer have to depend on the on-board UART device (16550A),
so let's change the chosen and aliases to point to the on-chip ones.
Also, turn on the on-board Ethernet device.
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Signed-off-by: Olof Johansson <olof@lixom.net>
Baruch Siach [Mon, 6 Jul 2015 11:41:45 +0000 (14:41 +0300)]
ARM: digicolor: dts: use stdout-path for console configuration
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: Olof Johansson <olof@lixom.net>
Baruch Siach [Mon, 6 Jul 2015 11:41:43 +0000 (14:41 +0300)]
ARM: digicolor: enable watchdog device
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: Olof Johansson <olof@lixom.net>
Linus Torvalds [Sun, 12 Jul 2015 22:10:30 +0000 (15:10 -0700)]
Linux 4.2-rc2
Linus Torvalds [Sun, 12 Jul 2015 22:00:20 +0000 (15:00 -0700)]
Revert "drm/i915: Use crtc_state->active in primary check_plane func"
This reverts commit
dec4f799d0a4c9edae20512fa60b0a36f3299ca2.
Jörg Otte reports a NULL pointder dereference due to this commit, as
'crtc_state' very much can be NULL:
crtc_state = state->base.state ?
intel_atomic_get_crtc_state(state->base.state, intel_crtc) : NULL;
So the change to test 'crtc_state->base.active' cannot possibly be
correct as-is.
There may be some other minimal fix (like just checking crtc_state for
NULL), but I'm just reverting it now for the rc2 release, and people
like Daniel Vetter who actually know this code will figure out what the
right solution is in the longer term.
Reported-and-bisected-by: Jörg Otte <jrg.otte@gmail.com>
Cc: Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com>
Cc: Jani Nikula <jani.nikula@linux.intel.com>
Cc: Daniel Vetter <daniel.vetter@intel.com>
CC: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Linus Torvalds [Sun, 12 Jul 2015 21:09:36 +0000 (14:09 -0700)]
Merge branch 'for-linus' of git://git./linux/kernel/git/viro/vfs
Pull VFS fixes from Al Viro:
"Fixes for this cycle regression in overlayfs and a couple of
long-standing (== all the way back to 2.6.12, at least) bugs"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
freeing unlinked file indefinitely delayed
fix a braino in ovl_d_select_inode()
9p: don't leave a half-initialized inode sitting around
Linus Torvalds [Sun, 12 Jul 2015 20:55:24 +0000 (13:55 -0700)]
Merge branch 'upstream' of git://git.linux-mips.org/ralf/upstream-linus
Pull MIPS fixes from Ralf Baechle:
"A fair number of 4.2 fixes also because Markos opened the flood gates.
- Patch up the math used calculate the location for the page bitmap.
- The FDC (Not what you think, FDC stands for Fast Debug Channel) IRQ
around was causing issues on non-Malta platforms, so move the code
to a Malta specific location.
- A spelling fix replicated through several files.
- Fix to the emulation of an R2 instruction for R6 cores.
- Fix the JR emulation for R6.
- Further patching of mindless 64 bit issues.
- Ensure the kernel won't crash on CPUs with L2 caches with >= 8
ways.
- Use compat_sys_getsockopt for O32 ABI on 64 bit kernels.
- Fix cache flushing for multithreaded cores.
- A build fix"
* 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus:
MIPS: O32: Use compat_sys_getsockopt.
MIPS: c-r4k: Extend way_string array
MIPS: Pistachio: Support CDMM & Fast Debug Channel
MIPS: Malta: Make GIC FDC IRQ workaround Malta specific
MIPS: c-r4k: Fix cache flushing for MT cores
Revert "MIPS: Kconfig: Disable SMP/CPS for 64-bit"
MIPS: cps-vec: Use macros for various arithmetics and memory operations
MIPS: kernel: cps-vec: Replace KSEG0 with CKSEG0
MIPS: kernel: cps-vec: Use ta0-ta3 pseudo-registers for 64-bit
MIPS: kernel: cps-vec: Replace mips32r2 ISA level with mips64r2
MIPS: kernel: cps-vec: Replace 'la' macro with PTR_LA
MIPS: kernel: smp-cps: Fix 64-bit compatibility errors due to pointer casting
MIPS: Fix erroneous JR emulation for MIPS R6
MIPS: Fix branch emulation for BLTC and BGEC instructions
MIPS: kernel: traps: Fix broken indentation
MIPS: bootmem: Don't use memory holes for page bitmap
MIPS: O32: Do not handle require 32 bytes from the stack to be readable.
MIPS, CPUFREQ: Fix spelling of Institute.
MIPS: Lemote 2F: Fix build caused by recent mass rename.
Linus Torvalds [Sun, 12 Jul 2015 17:02:38 +0000 (10:02 -0700)]
Merge branch 'x86-urgent-for-linus' of git://git./linux/kernel/git/tip/tip
Pull x86 fixes from Thomas Gleixner:
- the high latency PIT detection fix, which slipped through the cracks
for rc1
- a regression fix for the early printk mechanism
- the x86 part to plug irq/vector related hotplug races
- move the allocation of the espfix pages on cpu hotplug to non atomic
context. The current code triggers a might_sleep() warning.
- a series of KASAN fixes addressing boot crashes and usability
- a trivial typo fix for Kconfig help text
* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/kconfig: Fix typo in the CONFIG_CMDLINE_BOOL help text
x86/irq: Retrieve irq data after locking irq_desc
x86/irq: Use proper locking in check_irq_vectors_for_cpu_disable()
x86/irq: Plug irq vector hotplug race
x86/earlyprintk: Allow early_printk() to use console style parameters like '115200n8'
x86/espfix: Init espfix on the boot CPU side
x86/espfix: Add 'cpu' parameter to init_espfix_ap()
x86/kasan: Move KASAN_SHADOW_OFFSET to the arch Kconfig
x86/kasan: Add message about KASAN being initialized
x86/kasan: Fix boot crash on AMD processors
x86/kasan: Flush TLBs after switching CR3
x86/kasan: Fix KASAN shadow region page tables
x86/init: Clear 'init_level4_pgt' earlier
x86/tsc: Let high latency PIT fail fast in quick_pit_calibrate()
Linus Torvalds [Sun, 12 Jul 2015 16:36:59 +0000 (09:36 -0700)]
Merge branch 'timers-urgent-for-linus' of git://git./linux/kernel/git/tip/tip
Pull timer fixes from Thomas Gleixner:
"This update from the timer departement contains:
- A series of patches which address a shortcoming in the tick
broadcast code.
If the broadcast device is not available or an hrtimer emulated
broadcast device, some of the original assumptions lead to boot
failures. I rather plugged all of the corner cases instead of only
addressing the issue reported, so the change got a little larger.
Has been extensivly tested on x86 and arm.
- Get rid of the last holdouts using do_posix_clock_monotonic_gettime()
- A regression fix for the imx clocksource driver
- An update to the new state callbacks mechanism for clockevents.
This is required to simplify the conversion, which will take place
in 4.3"
* 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
tick/broadcast: Prevent NULL pointer dereference
time: Get rid of do_posix_clock_monotonic_gettime
cris: Replace do_posix_clock_monotonic_gettime()
tick/broadcast: Unbreak CONFIG_GENERIC_CLOCKEVENTS=n build
tick/broadcast: Handle spurious interrupts gracefully
tick/broadcast: Check for hrtimer broadcast active early
tick/broadcast: Return busy when IPI is pending
tick/broadcast: Return busy if periodic mode and hrtimer broadcast
tick/broadcast: Move the check for periodic mode inside state handling
tick/broadcast: Prevent deep idle if no broadcast device available
tick/broadcast: Make idle check independent from mode and config
tick/broadcast: Sanity check the shutdown of the local clock_event
tick/broadcast: Prevent hrtimer recursion
clockevents: Allow set-state callbacks to be optional
clocksource/imx: Define clocksource for mx27
Linus Torvalds [Sun, 12 Jul 2015 16:15:02 +0000 (09:15 -0700)]
Merge branch 'irq-urgent-for-linus' of git://git./linux/kernel/git/tip/tip
Pull irq fix from Thomas Gleixner:
"A single fix for a cpu hotplug race vs. interrupt descriptors:
Prevent irq setup/teardown across the cpu starting/dying parts of cpu
hotplug so that the starting/dying cpu has a stable view of the
descriptor space. This has been an issue for all architectures in the
cpu dying phase, where interrupts are migrated away from the dying
cpu. In the starting phase its mostly a x86 issue vs the vector space
update"
* 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
hotplug: Prevent alloc/free of irq descriptors during cpu up/down
Al Viro [Wed, 8 Jul 2015 01:42:38 +0000 (02:42 +0100)]
freeing unlinked file indefinitely delayed
Normally opening a file, unlinking it and then closing will have
the inode freed upon close() (provided that it's not otherwise busy and
has no remaining links, of course). However, there's one case where that
does *not* happen. Namely, if you open it by fhandle with cold dcache,
then unlink() and close().
In normal case you get d_delete() in unlink(2) notice that dentry
is busy and unhash it; on the final dput() it will be forcibly evicted from
dcache, triggering iput() and inode removal. In this case, though, we end
up with *two* dentries - disconnected (created by open-by-fhandle) and
regular one (used by unlink()). The latter will have its reference to inode
dropped just fine, but the former will not - it's considered hashed (it
is on the ->s_anon list), so it will stay around until the memory pressure
will finally do it in. As the result, we have the final iput() delayed
indefinitely. It's trivial to reproduce -
void flush_dcache(void)
{
system("mount -o remount,rw /");
}
static char buf[20 * 1024 * 1024];
main()
{
int fd;
union {
struct file_handle f;
char buf[MAX_HANDLE_SZ];
} x;
int m;
x.f.handle_bytes = sizeof(x);
chdir("/root");
mkdir("foo", 0700);
fd = open("foo/bar", O_CREAT | O_RDWR, 0600);
close(fd);
name_to_handle_at(AT_FDCWD, "foo/bar", &x.f, &m, 0);
flush_dcache();
fd = open_by_handle_at(AT_FDCWD, &x.f, O_RDWR);
unlink("foo/bar");
write(fd, buf, sizeof(buf));
system("df ."); /* 20Mb eaten */
close(fd);
system("df ."); /* should've freed those 20Mb */
flush_dcache();
system("df ."); /* should be the same as #2 */
}
will spit out something like
Filesystem 1K-blocks Used Available Use% Mounted on
/dev/root 322023 303843 1131 100% /
Filesystem 1K-blocks Used Available Use% Mounted on
/dev/root 322023 303843 1131 100% /
Filesystem 1K-blocks Used Available Use% Mounted on
/dev/root 322023 283282 21692 93% /
- inode gets freed only when dentry is finally evicted (here we trigger
than by remount; normally it would've happened in response to memory
pressure hell knows when).
Cc: stable@vger.kernel.org # v2.6.38+; earlier ones need s/kill_it/unhash_it/
Acked-by: J. Bruce Fields <bfields@fieldses.org>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Al Viro [Sun, 12 Jul 2015 14:39:45 +0000 (10:39 -0400)]
fix a braino in ovl_d_select_inode()
when opening a directory we want the overlayfs inode, not one from
the topmost layer.
Reported-By: Andrey Jr. Melnikov <temnota.am@gmail.com>
Tested-By: Andrey Jr. Melnikov <temnota.am@gmail.com>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Al Viro [Sun, 12 Jul 2015 14:34:29 +0000 (10:34 -0400)]
9p: don't leave a half-initialized inode sitting around
Cc: stable@vger.kernel.org # all branches
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Linus Torvalds [Sun, 12 Jul 2015 03:44:31 +0000 (20:44 -0700)]
Merge branch 'libnvdimm-fixes' of git://git./linux/kernel/git/djbw/nvdimm
Pull libnvdimm fixes from Dan Williams:
"1) Fixes for a handful of smatch reports (Thanks Dan C.!) and minor
bug fixes (patches 1-6)
2) Correctness fixes to the BLK-mode nvdimm driver (patches 7-10).
Granted these are slightly large for a -rc update. They have been
out for review in one form or another since the end of May and were
deferred from the merge window while we settled on the "PMEM API"
for the PMEM-mode nvdimm driver (ie memremap_pmem, memcpy_to_pmem,
and wmb_pmem).
Now that those apis are merged we implement them in the BLK driver
to guarantee that mmio aperture moves stay ordered with respect to
incoming read/write requests, and that writes are flushed through
those mmio-windows and platform-buffers to be persistent on media.
These pass the sub-system unit tests with the updates to
tools/testing/nvdimm, and have received a successful build-report from
the kbuild robot (468 configs).
With acks from Rafael for the touches to drivers/acpi/"
* 'libnvdimm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/nvdimm:
nfit: add support for NVDIMM "latch" flag
nfit: update block I/O path to use PMEM API
tools/testing/nvdimm: add mock acpi_nfit_flush_address entries to nfit_test
tools/testing/nvdimm: fix return code for unimplemented commands
tools/testing/nvdimm: mock ioremap_wt
pmem: add maintainer for include/linux/pmem.h
nfit: fix smatch "use after null check" report
nvdimm: Fix return value of nvdimm_bus_init() if class_create() fails
libnvdimm: smatch cleanups in __nd_ioctl
sparse: fix misplaced __pmem definition
Joachim Eastwood [Thu, 2 Apr 2015 03:54:29 +0000 (05:54 +0200)]
ARM: dts: lpc4357-ea4357: add mmcsd
Enable the MMC/SD controller on EA4357 devkit and add pin
muxing plus a regulator.
Signed-off-by: Joachim Eastwood <manabian@gmail.com>
Joachim Eastwood [Thu, 2 Apr 2015 03:51:20 +0000 (05:51 +0200)]
ARM: dts: lpc4357-ea4357: add pinctrl and uart0 muxing
Setup pin muxing and properties for the debug console on uart0.
Signed-off-by: Joachim Eastwood <manabian@gmail.com>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Joachim Eastwood [Sat, 20 Jun 2015 12:45:12 +0000 (14:45 +0200)]
ARM: dts: lpc18xx: add usb nodes
Add nodes for the two USB EHCI controllers found on lpc18xx.
Signed-off-by: Joachim Eastwood <manabian@gmail.com>
Joachim Eastwood [Thu, 2 Apr 2015 03:29:28 +0000 (05:29 +0200)]
ARM: dts: lpc18xx: add ethernet node
Signed-off-by: Joachim Eastwood <manabian@gmail.com>
Joachim Eastwood [Thu, 2 Apr 2015 03:31:49 +0000 (05:31 +0200)]
ARM: dts: lpc18xx: add creg (syscon) node
The CREG block contains a collection of miscellaneous
configuration register like Ethernet phy mode, low
power clocks and DMA multiplexer. These registers
needs to be accessed from other drivers and syscon
provides this capability.
Signed-off-by: Joachim Eastwood <manabian@gmail.com>
Joachim Eastwood [Thu, 2 Apr 2015 03:27:33 +0000 (05:27 +0200)]
ARM: dts: lpc18xx: add mmcsd node
Signed-off-by: Joachim Eastwood <manabian@gmail.com>
projects / linux-2.6-microblaze.git / log