summaryrefslogtreecommitdiff
path: root/arch
AgeCommit message (Collapse)AuthorFilesLines
2015-01-22Merge tag 'sti-dt-for-v3.20-1' of ↵Olof Johansson9-4/+961
git://git.stlinux.com/devel/kernel/linux-sti into next/dt Merge "STi DT updates for v3.20, round 1" from Maxime Coquelin: Highlights: ----------- - Add USB support for STiH410 & STiH407 - Add DRM DT nodes for STiH410 & STiH407 - Add STiH418 SoC support - Add DT nodes for MiPHY28lp PHY * tag 'sti-dt-for-v3.20-1' of git://git.stlinux.com/devel/kernel/linux-sti: ARM: DT: STi: STiH407: Add DT node for MiPHY28lp ARM: dts: STiH418: Add B2199 board support ARM: dts: Add STiH418 SoC support ARM: DT: STiH410: Add DRM dt nodes ARM: DT: STiH407: Add DRM dt nodes ARM: STi: DT: STiH410: Add DT nodes for the ehci and ohci usb controllers. ARM: STi: DT: STiH410: Add usb2 picophy dt nodes ARM: STi: DT: STiH407: Add usb2 picophy dt nodes Signed-off-by: Olof Johansson <olof@lixom.net>
2015-01-22ARM: dts: Add hip01-ca9x2 dts fileWang Long3-0/+163
Add dts file for Hisilicon hip01 ca9x2 board Signed-off-by: Wang Long <long.wanglong@huawei.com> Signed-off-by: Wei Xu <xuwei5@hisilicon.com> [olof: Folded in smp enable-method from a different patch] Signed-off-by: Olof Johansson <olof@lixom.net>
2015-01-20Merge tag 'renesas-dt-cleanups2-for-v3.20' of ↵Olof Johansson4-4/+16
git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/dt Merge "Second Round of Renesas ARM Based SoC DT Cleanups for v3.20" from Simon Horman: Second Round of Renesas ARM Based SoC DT Cleanups for v3.20 * Tidy up #sound-dai-cells settings * Drop "renesas,rcar_sound" compatible value * tag 'renesas-dt-cleanups2-for-v3.20' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: ARM: shmobile: r8a7791: tidyup #sound-dai-cells settings ARM: shmobile: r8a7790: tidyup #sound-dai-cells settings ARM: shmobile: r8a7791 dtsi: Drop "renesas,rcar_sound" compatible value ARM: shmobile: r8a7790 dtsi: Drop "renesas,rcar_sound" compatible value Signed-off-by: Olof Johansson <olof@lixom.net>
2015-01-20ARM: dts: move alphascale in makefileOlof Johansson1-1/+2
The file is roughly sorted alphabetically (with some exceptions where old options have been split in two), so alphascale should go at the top instead of at the bottom. Also linewrap like other entries have been lately. Signed-off-by: Olof Johansson <olof@lixom.net>
2015-01-20Merge branch 'asm/dt' into next/dtOlof Johansson3-1/+77
* asm/dt: add Alphascale to vendor-prefixes.txt ARM: add alphascale,acc.txt bindings documentation ARM: dts: add DT for Alphascale ASM9260 SoC
2015-01-20ARM: dts: add DT for Alphascale ASM9260 SoCOleksij Rempel3-1/+77
for now it is wary basic SoC description with most important IPs needed to make this device work Signed-off-by: Oleksij Rempel <linux@rempel-privat.de> Signed-off-by: Olof Johansson <olof@lixom.net>
2015-01-19Merge tag 'at91-dt' of ↵Olof Johansson16-13/+210
git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91 into next/dt Merge "at91: dt for 3.20 #1" from Nicolas Ferre: First batch of DT changes for 3.20: - little typo and a LED declared - addition of the Special Function Registers (SFR) + its binding - RTC & SRAM nodes - the at91sam9xe has its own .dtsi now. Not combined with at91sam9260 anymore - addition of the Image Sensor Interface (ISI) DT part and supported sensors * tag 'at91-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91: ARM: at91: dts: sama5d3: add ov2640 camera sensor support ARM: at91: dts: sama5d3: change name of pinctrl of ISI_MCK ARM: at91: dts: sama5d3: change name of pinctrl_isi_{power,reset} ARM: at91: dts: sama5d3: move the isi mck pin to mb ARM: at91: dts: sama5d3: add missing pins of isi ARM: at91: dts: sama5d3: split isi pinctrl ARM: at91: dts: sama5d3: add isi clock ARM: at91/dt: ethernut5: use at91sam9xe.dtsi ARM: at91/dt: Add a dtsi for at91sam9xe ARM: at91/dt: add SRAM nodes ARM: at91/dt: at91rm9200ek: enable RTC ARM: at91/dt: rm9200: add RTC node ARM: at91/dt: at91sam9n12: Add RTC node ARM: at91: sama5d4: Add SFR ARM: at91: sama5d3: Add SFR ARM: at91: Add Special Function Registers binding documentation ARM: at91/dt: sam9263: Fix typo: ac91_clk -> ac97_clk ARM: at91/dt: sama5d3: enable D2 as the heartbeat LED Signed-off-by: Olof Johansson <olof@lixom.net>
2015-01-19Merge tag 'atlas7-init-dts-for-3.20' of ↵Olof Johansson5-813/+925
git://git.kernel.org/pub/scm/linux/kernel/git/baohua/linux into next/dt Merge "CSR atlas7 init dts for 3.20" from Barry Song: Drop Marco and add init dts stuff for Atlas7 CSR Marco SoC has never shipped to customers that could be interested in mainline support. and new Atlas7 is a replacement SoC that is in development. So we drop Marco dts stuff, and add dts stuff for Atlas7. * tag 'atlas7-init-dts-for-3.20' of git://git.kernel.org/pub/scm/linux/kernel/git/baohua/linux: ARM: dts: add init dts file for CSR atlas7 SoC ARM: dts: drop MARCO platform DT stuff Signed-off-by: Olof Johansson <olof@lixom.net>
2015-01-16ARM: DT: STi: STiH407: Add DT node for MiPHY28lpGabriel FERNANDEZ2-0/+64
The MiPHY28lp is a Generic PHY which can serve various SATA, PCIe or USB3 devices. The two first ports can be use for either; both SATA, both PCIe or one of each in any configuration. The Third port is only for USB3. Signed-off-by: Gabriel Fernandez <gabriel.fernandez@linaro.org> Signed-off-by: Maxime Coquelin <maxime.coquelin@st.com>
2015-01-16ARM: dts: STiH418: Add B2199 board supportMaxime COQUELIN2-1/+80
B2199 HDK is the reference board for STiH418 SoC. It has the following characteristics: - 3GB DDR3 - 8GB eMMC / SD-Card slot - 32MB NOR Flash - 1 x Gbit Ethernet - 1 x USB3.0 port - 2 x USB2.0 ports - 1 x Sata or Mini-PCIe port - 1 x WiFi 802.11ac (Quantenna) - 1 x HDMI out - 1 x HDMI in - 1 x SPDIF Reviewed-by: Peter Griffin <peter.griffin@linaro.org> Signed-off-by: Maxime Coquelin <maxime.coquelin@st.com>
2015-01-16ARM: dts: Add STiH418 SoC supportMaxime COQUELIN2-0/+447
The STiH418 is advanced UHD 60fps AVC processor with 3D graphic acceleration and quad-core ARM Cortex A9 CPU. Reviewed-by: Peter Griffin <peter.griffin@linaro.org> Signed-off-by: Maxime Coquelin <maxime.coquelin@st.com>
2015-01-16ARM: DT: STiH410: Add DRM dt nodesGabriel FERNANDEZ1-0/+138
This patch adds the DRM/KMS dt nodes. Signed-off-by: Benjamin Gaignard <benjamin.gaignard@linaro.org> Signed-off-by: Gabriel Fernandez <gabriel.fernandez@linaro.org> Acked-by: Peter Griffin <peter.griffin@linaro.org> Signed-off-by: Maxime Coquelin <maxime.coquelin@st.com>
2015-01-16ARM: DT: STiH407: Add DRM dt nodesGabriel FERNANDEZ3-3/+153
This patch adds the DRM/KMS dt nodes. This node can't be in stih407-family.dtsi file because in the future we will integrate a new stih418-b2199 board. It's a stih407 family board with different drm/kms dt nodes. That is why i created the stih407.dtsi file. Signed-off-by: Gabriel Fernandez <gabriel.fernandez@linaro.org> Acked-by: Peter Griffin <peter.griffin@linaro.org> Signed-off-by: Maxime Coquelin <maxime.coquelin@st.com>
2015-01-15ARM: at91: dts: sama5d3: add ov2640 camera sensor supportJosh Wu2-2/+35
According to v4l2 dt document, we add: a camera host: ISI port. a i2c camera sensor: ov2640 port. to sama5d3xmb.dtsi. The ov2640 node defines the pinctrls, clocks and refer to isi port. The ISI node also has a reference to the ov2640 port. Signed-off-by: Josh Wu <josh.wu@atmel.com> Acked-by: Alexandre Belloni <alexandre.belloni@free-electrons.com> Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
2015-01-15ARM: at91: dts: sama5d3: change name of pinctrl of ISI_MCKJosh Wu1-2/+2
For sama5d3xmb board, the pins: pinctrl_isi_pck_as_mck is pck1, and used to provide MCK for camera sensor. We change its name to: pinctrl_pck1_as_isi_mck. As we want camera sensor instead of ISI to configure the pck1 (ISI_MCK) pin. So we remove this pinctrl from ISI DT node. It will be added in sensor's DT node. Signed-off-by: Josh Wu <josh.wu@atmel.com> Acked-by: Alexandre Belloni <alexandre.belloni@free-electrons.com> Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
2015-01-15ARM: at91: dts: sama5d3: change name of pinctrl_isi_{power,reset}Josh Wu1-3/+3
For sama5d3xmb board, the pins: pinctrl_isi_{power,reset} is used to power-down or reset camera sensor. So we should let camera sensor instead of ISI to configure the pins. This patch will change pinctrl name from pinctrl_isi_{power,reset} to pinctrl_sensor_{power,reset}. And remove these two pinctrl from ISI's DT node. We will add these two pinctrl to sensor's DT node. Signed-off-by: Josh Wu <josh.wu@atmel.com> Acked-by: Alexandre Belloni <alexandre.belloni@free-electrons.com> Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
2015-01-15ARM: at91: dts: sama5d3: move the isi mck pin to mbBo Shen2-5/+5
The mck is decided by the board design, move it to mb related dtsi file. Signed-off-by: Bo Shen <voice.shen@atmel.com> Acked-by: Alexandre Belloni <alexandre.belloni@free-electrons.com> Signed-off-by: Josh Wu <josh.wu@atmel.com> Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
2015-01-15ARM: at91: dts: sama5d3: add missing pins of isiBo Shen1-0/+6
The ISI has 12 data lines, add the missing two data lines. Signed-off-by: Bo Shen <voice.shen@atmel.com> Acked-by: Alexandre Belloni <alexandre.belloni@free-electrons.com> Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
2015-01-15ARM: at91: dts: sama5d3: split isi pinctrlBo Shen2-4/+9
As the ISI has 12 data lines, however we only use 8 data lines with sensor module. So, split the data line into two groups which make it can be choosed depends on the hardware design. Signed-off-by: Bo Shen <voice.shen@atmel.com> Acked-by: Alexandre Belloni <alexandre.belloni@free-electrons.com> Signed-off-by: Josh Wu <josh.wu@atmel.com> Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
2015-01-15ARM: at91: dts: sama5d3: add isi clockJosh Wu1-0/+2
Add ISI peripheral clock in sama5d3.dtsi. Signed-off-by: Josh Wu <josh.wu@atmel.com> Acked-by: Alexandre Belloni <alexandre.belloni@free-electrons.com> Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
2015-01-15ARM: at91/dt: ethernut5: use at91sam9xe.dtsiAlexandre Belloni1-1/+1
The ethernut5 is actually based on an at91sam9xe, use the correct dts include. Cc: Martin Reimann <martin.reimann@egnite.de> Cc: Tim Schendekehl <tim.schendekehl@egnite.de> Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com> Acked-by: Boris Brezillon <boris.brezillon@free-electrons.com> Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
2015-01-15ARM: at91/dt: Add a dtsi for at91sam9xeAlexandre Belloni1-0/+60
at91sam9xe is slightly different from at91sam9260, in particular it has a different SRAM size and location. Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com> Acked-by: Boris Brezillon <boris.brezillon@free-electrons.com> Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
2015-01-15ARM: at91/dt: add SRAM nodesAlexandre Belloni11-2/+64
Add nodes for the SRAM available on atmel SoCs For the at91sam9260 and the at91sam9g20, address mirroring is used to create a single contiguous SRAM range instead of declaring two separate banks. Also remove leftover TODOs in the sam9g45 file Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com> Acked-by: Boris Brezillon <boris.brezillon@free-electrons.com> [nicolas.ferre@atmel.com: correct at91sam9rl sram size => 0x10000] Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
2015-01-15ARM: at91/dt: at91rm9200ek: enable RTCAlexandre Belloni1-0/+4
Enable the RTC on the at91rm9200ek. Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com> Acked-by: Boris Brezillon <boris.brezillon@free-electrons.com> Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
2015-01-15ARM: at91/dt: rm9200: add RTC nodeAlexandre Belloni1-0/+7
Add a node for the RTC available on at91rm9200. Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com> Acked-by: Boris Brezillon <boris.brezillon@free-electrons.com> Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
2015-01-15ARM: at91/dt: at91sam9n12: Add RTC nodeAlexandre Belloni1-0/+7
Add node for the RTC available on the at91sam9n12. Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com> Acked-by: Boris Brezillon <boris.brezillon@free-electrons.com> Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
2015-01-15ARM: at91: sama5d4: Add SFRAlexandre Belloni1-0/+5
The sama4d4 has Special Function Registers that allow to manage DDR, OHCI, EBI and AIC interrupt redirection. Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com> Acked-by: Boris Brezillon <boris.brezillon@free-electrons.com> [nicolas.ferre@atmel.com: reg size: 0x60] Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
2015-01-15ARM: at91: sama5d3: Add SFRAlexandre Belloni1-0/+5
The sama5d3 has Special Function Registers that allow to manage OHCI, EBI and the UTMI clock. Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com> Acked-by: Boris Brezillon <boris.brezillon@free-electrons.com> [nicolas.ferre@atmel.com: reg size: 0x60] Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
2015-01-15ARM: at91/dt: sam9263: Fix typo: ac91_clk -> ac97_clkAlexander Stein1-1/+1
That clock should be called ac97_clk. Signed-off-by: Alexander Stein <alexanders83@web.de> Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
2015-01-15ARM: at91/dt: sama5d3: enable D2 as the heartbeat LEDJosh Wu1-0/+1
This D2 led is available for all sama5d3x-ek board. So make it a heartbeat LED. Signed-off-by: Josh Wu <josh.wu@atmel.com> Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
2015-01-15Merge tag 'mvebu-dt-3.20' of git://git.infradead.org/linux-mvebu into next/dtOlof Johansson12-20/+823
Merge "mvebu: dt for v3.20" from Andrew Lunn: mvebu dt changes for v3.20 (part #1) - Add Armada 388 General Purpose Development Board support - Add Device Tree description of the Armada 388 SoC - Document the Device Tree binding for the Armada 388 SoC - a38x: Add missing labels - a38x: Add more pinctrl functions - Add Armada 385 Access Point Development Board support - Add a number of pinctrl functions - A38x: Remove redundant pinctrl informations - a38x: Fix node names - Add support for Seagate BlackArmor NAS220 - kirkwood: enable phy driver for SATA controller on 88f6192 - gpio_poweroff support for Iomega ix2-200 - Use all remaining MTD space foor rootfs of Iomega ix2-200 * tag 'mvebu-dt-3.20' of git://git.infradead.org/linux-mvebu: ARM: mvebu: Add Armada 388 General Purpose Development Board support ARM: mvebu: Add Device Tree description of the Armada 388 SoC ARM: mvebu: Document the Device Tree binding for the Armada 388 SoC ARM: mvebu: a38x: Add missing labels ARM: mvebu: a38x: Add more pinctrl functions ARM: mvebu: Add Armada 385 Access Point Development Board support ARM: mvebu: Add a number of pinctrl functions ARM: mvebu: A38x: Remove redundant pinctrl informations ARM: mvebu: a38x: Fix node names Kirkwood: add support for Seagate BlackArmor NAS220 ARM: dts: kirkwood: enable phy driver for SATA controller on 88f6192 ARM: dts: add gpio_poweroff support for Iomega ix2-200 ARM: dts: use all remaining MTD space foor rootfs of Iomega ix2-200 Signed-off-by: Olof Johansson <olof@lixom.net> Signed-off-by: Olof Johansson <olof@lixom.net>
2015-01-14Merge tag 'v3.20-next-dts' of https://github.com/mbgg/linux-mediatek into ↵Olof Johansson7-11/+182
next/dt Merge "ARM: mediatek: DT changes for v3.20 (round 1)" from Matthias Brugger: This adds support for the mediatek sysirq and the uarts for the following SoCs: - mt8135 - mt8127 - mt6598 For mt6592 only the sysirq support was added. * tag 'v3.20-next-dts' of https://github.com/mbgg/linux-mediatek: ARM: mediatek: dts: Add uart to Aquaris5 ARM: mediatek: dts: Add uart to mt6589 dt-bindings: add mt6592 compatible string for mediatek sysirq ARM: mediatek: Add sysirq device node to mt6592 dtsi ARM: mediatek: dts: Add UART dts for MT8127 and MT8135 boards DTS: serial: Add bindings document for the Mediatek UARTs ARM: mediatek: add UART dts for mt8127 and mt8135 ARM: mediatek: Add sysirq in mt6589/mt8135/mt8127 dtsi Signed-off-by: Olof Johansson <olof@lixom.net>
2015-01-13ARM: dts: add init dts file for CSR atlas7 SoCZhiwu Song3-0/+924
CSR atlas7 uses Network on Chip(NoC) bus architecture, there are dozens of MARCOs, in each MARCO, there are dozens of hardware modules. Signed-off-by: Zhiwu Song <Zhiwu.Song@csr.com> Signed-off-by: Hao Liu <Hao.Liu@csr.com> Signed-off-by: Barry Song <Baohua.Song@csr.com> Acked-by: Arnd Bergmann <arnd@arndb.de>
2015-01-13ARM: shmobile: r8a7791: tidyup #sound-dai-cells settingsKuninori Morimoto2-1/+7
Renesas sound driver needs #sound-dai-cells settings, but, this usage is a little bit confusable. It came from ALSA SoC historical reasons. The sound DAI naming method is different between Single/Multi DAI in the ALSA framework, and it is used for sound card matching. And this #sound-dai-cells has relationship to it. Current SoC dtsi has #sound-dai-cells = <1> as default settings (= it is assuming that board/platform has multi DAI), and board/platform side needs to overwrite it if board/platform was single DAI. This style is more confusable for users. This patch removes SoC side default settings, and force to set it by board/platform side. Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2015-01-13ARM: shmobile: r8a7790: tidyup #sound-dai-cells settingsKuninori Morimoto2-1/+7
Renesas sound driver needs #sound-dai-cells settings, but, this usage is a little bit confusable. It came from ALSA SoC historical reasons. The sound DAI naming method is different between Single/Multi DAI in the ALSA framework, and it is used for sound card matching. And this #sound-dai-cells has relationship to it. Current SoC dtsi has #sound-dai-cells = <1> as default settings (= it is assuming that board/platform has multi DAI), and board/platform side needs to overwrite it if board/platform was single DAI. This style is more confusable for users. This patch removes SoC side default settings, and force to set it by board/platform side. Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2015-01-13ARM: shmobile: r8a7791 dtsi: Drop "renesas,rcar_sound" compatible valueGeert Uytterhoeven1-1/+1
The "renesas,rcar_sound" compatible property value was never processed nor documented. Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> Acked-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2015-01-13ARM: shmobile: r8a7790 dtsi: Drop "renesas,rcar_sound" compatible valueGeert Uytterhoeven1-1/+1
The "renesas,rcar_sound" compatible property value was never processed nor documented. Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> Acked-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2015-01-13Merge tag 'berlin-dt-for-3.20-1' of ↵Olof Johansson3-3/+16
git://git.infradead.org/users/hesselba/linux-berlin into next/dt Merge "ARM: berlin: DT changes for v3.20 (round 1)" from Sebastian Hesselbarth: Berlin DT changes for v3.20 (round 1) - add PMU nodes for BG2Q and BG2CD - add PPI CPU masks for TWD timer interrupts * tag 'berlin-dt-for-3.20-1' of git://git.infradead.org/users/hesselba/linux-berlin: ARM: dts: berlin: add PPI cpu mask to twd timer interrupts ARM: dts: berlin: add pmu node for BG2Q and BG2CD Signed-off-by: Olof Johansson <olof@lixom.net>
2015-01-13ARM: dts: Only build dtb if associated Arch and/or SoC is enabledPeter Robinson1-73/+142
A number of arches (EXYNOS/IMX/TEGRA) are separated out into finer grained definitions whether it be sub ARCH or SOC definitions. The device tree blobs should only be built if the specific option is enabled that supports that device or it might be that there's an expectation that the device is supported when in actual fact it's not. This ensures only the relevant bits are built. Also standardised the line break between the arch/soc definitions and the dtbs to be on separate lines for better consistency as per feedback. Signed-off-by: Peter Robinson <pbrobinson@gmail.com> Reviewed-by: Lucas Stach <l.stach@pengutronix.de> Acked-by: Thierry Reding <treding@nvidia.com> Acked-by: Stephen Warren <swarren@nvidia.com> Acked-by: Shawn Guo <shawn.guo@freescale.com> [olof: Fixed stray \ in one of the IMX rules] Signed-off-by: Olof Johansson <olof@lixom.net>
2015-01-13Merge tag 'renesas-dt-for-v3.20' of ↵Olof Johansson10-81/+313
git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/dt Merge "Renesas ARM Based SoC DT Updates for v3.20" from Simon Horman: * Use clock-indices instead of deprecated renesas,clock-indices * Prepare for r8a73a4 multiplatform support * Increase clock coverage for r8a779[014] * Correct r8a7779 clock usage * Correct LAN9220 VDDVARIO voltage on ape6evm * Correct QSPI SPI-Flash mode of lager and koelsch * Correct flash partition label and size on koelsch * Correct mask for GIC PPI interrupts on r8a779[14] * Correct BSC bus range on ape6evm-reference * tag 'renesas-dt-for-v3.20' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: (30 commits) ARM: shmobile: r8a7791: add MLB+ clock ARM: shmobile: r8a7790: add MLB+ clock ARM: shmobile: ape6evm: Fix LAN9220 VDDVARIO voltage ARM: shmobile: r8a73a4: Add r8a73a4-ape6evm.dtb to ARCH_SHMOBILE_MULTI ARM: shmobile: ape6evm: Add keypad to the device tree ARM: shmobile: ape6evm: Add LEDs to the device tree ARM: shmobile: ape6evm: synchronize dts with reference platform ARM: shmobile: ape6evm: fix compatible string for Ethernet controller ARM: shmobile: r8a7794: Add MMCIF clock to device tree ARM: shmobile: r8a7794: Add SDHI clocks to device tree ARM: shmobile: r8a7794: Add I2C clocks to device tree ARM: shmobile: r8a7779: Add TWD device to DTS ARM: shmobile: r8a7779: Use MSTP for SCIF clocks ARM: shmobile: r8a7779: Use R8A7779_CLK_P as SCIF parent clock ARM: shmobile: r8a7794: Add QSPI clock to device tree ARM: shmobile: lager: Fix QSPI mode of SPI-Flash into mode3 ARM: shmobile: r8a7794: Add SYS-DMAC clocks to device tree ARM: shmobile: r8a7791: Add IPMMU-SGX clock to device tree ARM: shmobile: koelsch: Fix QSPI mode of SPI-Flash into mode3 ARM: shmobile: r8a7794: Add USBDMAC[01] clocks to device tree ... Signed-off-by: Olof Johansson <olof@lixom.net>
2015-01-13Merge tag 'renesas-dt-cleanups-for-v3.20' of ↵Olof Johansson7-17/+17
git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/dt Merge "Renesas ARM Based SoC DT Cleanups for v3.20" from Simon Horman: * Replace status value "ok" with "okay" * tag 'renesas-dt-cleanups-for-v3.20' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: ARM: shmobile: kzm9g-reference dts: Replace status value "ok" by "okay" ARM: shmobile: alt dts: Replace status value "ok" by "okay" ARM: shmobile: koelsch dts: Replace status value "ok" by "okay" ARM: shmobile: henninger dts: Replace status value "ok" by "okay" ARM: shmobile: lager dts: Replace status value "ok" by "okay" ARM: shmobile: armadillo800eva dts: Replace status value "ok" by "okay" ARM: shmobile: genmai dts: Replace status value "ok" by "okay" Signed-off-by: Olof Johansson <olof@lixom.net>
2015-01-11Merge branch 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-armLinus Torvalds5-11/+8
Pull ARM fixes from Russell King: "Three small fixes from over the Christmas period, and wiring up the new execveat syscall for ARM" * 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm: ARM: 8275/1: mm: fix PMD_SECT_RDONLY undeclared compile error ARM: 8253/1: mm: use phys_addr_t type in map_lowmem() for kernel mem region ARM: 8249/1: mm: dump: don't skip regions ARM: wire up execveat syscall
2015-01-11ARM: mediatek: dts: Add uart to Aquaris5Matthias Brugger1-1/+11
This patch enables uart port for the Aquaris5 mobile phone. Signed-off-by: Matthias Brugger <matthias.bgg@gmail.com>
2015-01-11ARM: mediatek: dts: Add uart to mt6589Matthias Brugger1-0/+38
This patch adds the uart ports to the device tree of Mediatek mt6589 SoC. Signed-off-by: Matthias Brugger <matthias.bgg@gmail.com>
2015-01-11Merge branch 'x86-urgent-for-linus' of ↵Linus Torvalds6-39/+53
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip Pull x86 fixes from Ingo Molnar: "Misc fixes: two vdso fixes, two kbuild fixes and a boot failure fix with certain odd memory mappings" * 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: x86, vdso: Use asm volatile in __getcpu x86/build: Clean auto-generated processor feature files x86: Fix mkcapflags.sh bash-ism x86: Fix step size adjustment during initial memory mapping x86_64, vdso: Fix the vdso address randomization algorithm
2015-01-11Merge branch 'perf-urgent-for-linus' of ↵Linus Torvalds6-2/+125
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip Pull perf fixes from Ingo Molnar: "Mostly tooling fixes, but also some kernel side fixes: uncore PMU driver fix, user regs sampling fix and an instruction decoder fix that unbreaks PEBS precise sampling" * 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: perf/x86/uncore/hsw-ep: Handle systems with only two SBOXes perf/x86_64: Improve user regs sampling perf: Move task_pt_regs sampling into arch code x86: Fix off-by-one in instruction decoder perf hists browser: Fix segfault when showing callchain perf callchain: Free callchains when hist entries are deleted perf hists: Fix children sort key behavior perf diff: Fix to sort by baseline field by default perf list: Fix --raw-dump option perf probe: Fix crash in dwarf_getcfi_elf perf probe: Fix to fall back to find probe point in symbols perf callchain: Append callchains only when requested perf ui/tui: Print backtrace symbols when segfault occurs perf report: Show progress bar for output resorting
2015-01-11ARM: dts: drop MARCO platform DT stuffBarry Song3-812/+0
MARCO will not be supported any more. it has been replaced by CSR atlas7. Signed-off-by: Barry Song <Baohua.Song@csr.com> Acked-by: Arnd Bergmann <arnd@arndb.de>
2015-01-10Merge tag 'arm64-fixes' of ↵Linus Torvalds9-5/+22
git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux Pull arm64 fixes from Will Deacon: "Here is a handful of minor arm64 fixes discovered and fixed over the Christmas break. The main part is adding some missing #includes that we seem to be getting transitively but have started causing problems in -next. - Fix early mapping fixmap corruption by EFI runtime services - Fix __NR_compat_syscalls off-by-one - Add missing sanity checks for some 32-bit registers - Add some missing #includes which we get transitively - Remove unused prepare_to_copy() macro" * tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux: arm64/efi: add missing call to early_ioremap_reset() arm64: fix missing asm/io.h include in kernel/smp_spin_table.c arm64: fix missing asm/alternative.h include in kernel/module.c arm64: fix missing linux/bug.h include in asm/arch_timer.h arm64: fix missing asm/pgtable-hwdef.h include in asm/processor.h arm64: sanity checks: add missing AArch32 registers arm64: Remove unused prepare_to_copy() arm64: Correct __NR_compat_syscalls for bpf
2015-01-10Merge branch 'akpm' (patches from Andrew)Linus Torvalds1-0/+1
Merge misc fixes from Andrew Morton: "12 fixes" * emailed patches from Andrew Morton <akpm@linux-foundation.org>: mm, vmscan: prevent kswapd livelock due to pfmemalloc-throttled process being killed memcg: fix destination cgroup leak on task charges migration mm: memcontrol: switch soft limit default back to infinity mm/debug_pagealloc: remove obsolete Kconfig options vfs: renumber FMODE_NONOTIFY and add to uniqueness check arch/blackfin/mach-bf533/boards/stamp.c: add linux/delay.h ocfs2: fix the wrong directory passed to ocfs2_lookup_ino_from_name() when link file MAINTAINERS: update rydberg's addresses mm: protect set_page_dirty() from ongoing truncation mm: prevent endless growth of anon_vma hierarchy exit: fix race between wait_consider_task() and wait_task_zombie() ocfs2: remove bogus check in dlm_process_recovery_data
2015-01-09ARM: 8275/1: mm: fix PMD_SECT_RDONLY undeclared compile errorVictor Kamensky1-2/+2
In v3.19-rc3 tree when CONFIG_ARM_LPAE and CONFIG_DEBUG_RODATA are enabled image failed to compile with the following error: arch/arm/mm/init.c:661:14: error: ‘PMD_SECT_RDONLY’ undeclared here (not in a function) It seems that '80d6b0c ARM: mm: allow text and rodata sections to be read-only' and 'ded9477 ARM: 8109/1: mm: Modify pte_write and pmd_write logic for LPAE' commits crossed. 80d6b0c uses PMD_SECT_RDONLY macro but ded9477 renames it and uses software bits L_PMD_SECT_RDONLY instead. Fix is to use L_PMD_SECT_RDONLY instead PMD_SECT_RDONLY as ded9477 does in another places. Signed-off-by: Victor Kamensky <victor.kamensky@linaro.org> Acked-by: Will Deacon <will.deacon@arm.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
generated by cgit v1.2.3 (git 2.39.0) at 2024-12-24 18:29:56 +0300