summaryrefslogtreecommitdiffstats
path: root/arch/arm
Commit message (Collapse)AuthorAgeFilesLines
* Merge tag 'dt-for-linus' of ↵Linus Torvalds2013-05-02103-738/+9394
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc Pull ARM SoC device-tree updates from Olof Johansson: "Part 1 of device-tree updates for 3.10. The bulk of the churn in this branch is due to i.MX moving from C-defined pin control over to device tree, which is a one-time conversion that will allow greater flexibility down the road. Besides that, there's PCI-e bindings for Marvell mvebu platforms and a handful of cleanups to tegra due to the new include file functionality of the device tree compiler" * tag 'dt-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (113 commits) arm: mvebu: PCIe Device Tree informations for Armada XP GP arm: mvebu: PCIe Device Tree informations for Armada 370 DB arm: mvebu: PCIe Device Tree informations for Armada 370 Mirabox arm: mvebu: PCIe Device Tree informations for Armada XP DB arm: mvebu: PCIe Device Tree informations for OpenBlocks AX3-4 arm: mvebu: add PCIe Device Tree informations for Armada XP arm: mvebu: add PCIe Device Tree informations for Armada 370 ARM: sunxi: unify osc24M_fixed and osc24M arm: vt8500: Add SDHC support to WM8505 DT ARM: dts: Add a 64 bits version of the skeleton device tree ARM: mvebu: Add Device Bus and CFI flash memory support to defconfig ARM: mvebu: Add support for NOR flash device on Openblocks AX3 board ARM: mvebu: Add support for NOR flash device on Armada XP-GP board ARM: mvebu: Add Device Bus support for Armada 370/XP SoC ARM: dts: imx6dl-wandboard: Add USB Host support ARM: dts: imx51 cpu node ARM: dts: Add missing imx27-phytec-phycore dtb target ARM: dts: Add NFC support for i.MX27 Phytec PCM038 module ARM: i.MX51: Add PATA support ARM: dts: Add initial support for Wandboard Dual-Lite ...
| * Merge tag 'sunxi-dt-for-3.10-4' of git://github.com/mripard/linux into next/dtOlof Johansson2013-04-182-14/+2
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | From Maxime Ripard: Fourth round of dt additions for 3.10 There's only one late patch that merge together two clocks that were already defined in a previous patch. * tag 'sunxi-dt-for-3.10-4' of git://github.com/mripard/linux: ARM: sunxi: unify osc24M_fixed and osc24M Signed-off-by: Olof Johansson <olof@lixom.net>
| | * ARM: sunxi: unify osc24M_fixed and osc24MEmilio López2013-04-152-14/+2
| | | | | | | | | | | | | | | | | | | | | | | | Now that the clock driver supports the gatable oscillator as one single clock, drop osc24M_fixed and move the relevant properties to osc24M Signed-off-by: Emilio López <emilio@elopez.com.ar> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
| * | Merge tag 'imx-dt-3.10' of git://git.linaro.org/people/shawnguo/linux-2.6 ↵Olof Johansson2013-04-1886-1211/+7708
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into next/dt From Shawn Guo: The imx device tree changes for 3.10: * The huge diff stat is introduced by the pinctrl changes. With DTC macro support ready, we're moving those huge mount of data about pins out of pinctrl driver. * Device tree source updates for GPI, LDB, SRC, cpufreq-cpu0. * Initial imx6dl device tree support * Board level DTS changes for some imx27 and imx51 platforms. * tag 'imx-dt-3.10' of git://git.linaro.org/people/shawnguo/linux-2.6: (605 commits) ARM: dts: imx6dl-wandboard: Add USB Host support ARM: dts: imx51 cpu node ARM: dts: Add missing imx27-phytec-phycore dtb target ARM: dts: Add NFC support for i.MX27 Phytec PCM038 module ARM: i.MX51: Add PATA support ARM: dts: Add initial support for Wandboard Dual-Lite ARM: dts: imx: add initial imx6dl-sabreauto support ARM: dts: imx: add initial imx6dl-sabresd support ARM: dts: imx: make sabreauto and sabresd common pinctrl: add pinctrl driver for imx6sl pinctrl: add pinctrl driver for imx6dl ARM: dts: imx53: fix SD2_DATA1 pad AUDMUX_AUD4 configuration ARM: dts: MicroSys sbc6x support (i.MX6) ARM i.MX5: Add System Reset Controller (SRC) support for i.MX51 and i.MX53 ARM i.MX5: Add system reset controller (SRC) to i.MX51 and i.MX53 device tree ARM i.MX6q: Link system reset controller (SRC) to IPU in DT ARM i.MX6q: Add LDB device to device tree ARM: imx5 DT init cpufreq-cpu0 device ARM: imx27 DT init cpufreq-cpu0 device ARM i.MX53: Add LDB device to device tree ... Signed-off-by: Olof Johansson <olof@lixom.net>
| | * | ARM: dts: imx6dl-wandboard: Add USB Host supportFabio Estevam2013-04-091-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Add USB Host1 port support. Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
| | * | ARM: dts: imx51 cpu nodeMarkus Pargmann2013-04-091-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds a cpus/cpu@0 node for imx51 with default operating points for the cpufreq-cpu0 driver. There is currently no regulator support, so the voltages are 0 here. Signed-off-by: Markus Pargmann <mpa@pengutronix.de> Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
| | * | ARM: dts: Add missing imx27-phytec-phycore dtb targetAlexander Shiyan2013-04-091-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The patch adds missing imx27-phytec-phycore dtb target into Makefile. Signed-off-by: Alexander Shiyan <shc_work@mail.ru> Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
| | * | ARM: dts: Add NFC support for i.MX27 Phytec PCM038 moduleAlexander Shiyan2013-04-091-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Added NFC node to imx27-phytec-phycore DT file. Signed-off-by: Alexander Shiyan <shc_work@mail.ru> Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
| | * | ARM: i.MX51: Add PATA supportSascha Hauer2013-04-091-0/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds the PATA device and the pinctrl group for to the i.MX51 dts. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
| | * | ARM: dts: Add initial support for Wandboard Dual-LiteFabio Estevam2013-04-093-0/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Wandboard is a development board that has two variants: one version based on mx6 dual lite and another one based on mx6 solo. For more details about Wandboard, please refer to: http://www.wandboard.org/ Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
| | * | ARM: dts: imx: add initial imx6dl-sabreauto supportShawn Guo2013-04-093-0/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Add initial imx6dl-sabreauto support based on the common stuff already in imx6qdl-sabreauto.dtsi. Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
| | * | ARM: dts: imx: add initial imx6dl-sabresd supportShawn Guo2013-04-093-0/+119
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Add initial imx6dl-sabresd support based on the common stuff already in imx6qdl-sabresd.dtsi. Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
| | * | ARM: dts: imx: make sabreauto and sabresd commonShawn Guo2013-04-094-100/+130
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The sabreauto and sabresd boards are common for imx6q and imx6dl. Create imx6qdl-sabreauto.dtsi and imx6qdl-sabresd.dtsi for those common parts. Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
| | * | pinctrl: add pinctrl driver for imx6slShawn Guo2013-04-091-0/+1077
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a pinctrl driver for i.MX6 SoloLite based on pinctrl-imx core driver. Signed-off-by: Shawn Guo <shawn.guo@linaro.org> Acked-by: Linus Walleij <linus.walleij@linaro.org>
| | * | pinctrl: add pinctrl driver for imx6dlShawn Guo2013-04-091-0/+1085
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The imx6dl is a derivative of imx6q with very limited difference. These two SoCs are so compatible that they can be handled as one platform in software. That said, we will not have target SOC_IMX6DL but just reusing SOC_IMX6Q. That's why the pinctrl-imx6dl driver is added here with symbol PINCTRL_IMX6Q controlling the build of it. Signed-off-by: Shawn Guo <shawn.guo@linaro.org> Acked-by: Linus Walleij <linus.walleij@linaro.org>
| | * | ARM: dts: imx53: fix SD2_DATA1 pad AUDMUX_AUD4 configurationMarek Vasut2013-04-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The IOMUXC_AUDMUX_P4_INPUT_TXCLK_AMX_SELECT_INPUT must be configured as 1 instead of 0 to have AUD4 muxed on SD2 pins working. Signed-off-by: Marek Vasut <marex@denx.de> Cc: Fabio Estevam <fabio.estevam@freescale.com> Cc: Linus Walleij <linus.walleij@linaro.org> Cc: Philipp Zabel <p.zabel@pengutronix.de> Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
| | * | ARM: dts: MicroSys sbc6x support (i.MX6)Pavel Machek2013-04-092-1/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for MicroSys sbc6x board. Signed-off-by: Pavel Machek <pavel@denx.de> Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
| | * | ARM i.MX5: Add System Reset Controller (SRC) support for i.MX51 and i.MX53Philipp Zabel2013-04-094-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The SRC in i.MX51 and i.MX53 is similar to the one in i.MX6q minus the IPU2 reset line and multi core CPU reset/enable bits. Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de> Reviewed-by: Stephen Warren <swarren@nvidia.com> Reviewed-by: Marek Vasut <marex@denx.de> Reviewed-by: Pavel Machek <pavel@ucw.cz> Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
| | * | ARM i.MX5: Add system reset controller (SRC) to i.MX51 and i.MX53 device treePhilipp Zabel2013-04-092-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also, link SRC to IPU via phandle. Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de> Reviewed-by: Stephen Warren <swarren@nvidia.com> Reviewed-by: Marek Vasut <marex@denx.de> Reviewed-by: Pavel Machek <pavel@ucw.cz> Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
| | * | ARM i.MX6q: Link system reset controller (SRC) to IPU in DTPhilipp Zabel2013-04-092-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de> Reviewed-by: Stephen Warren <swarren@nvidia.com> Reviewed-by: Marek Vasut <marex@denx.de> Reviewed-by: Pavel Machek <pavel@ucw.cz> Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
| | * | ARM i.MX6q: Add LDB device to device treeSteffen Trumtrar2013-04-092-0/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add ldb device tree node and clock lookups. Signed-off-by: Steffen Trumtrar <s.trumtrar@pengutronix.de> Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de> Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
| | * | ARM: imx5 DT init cpufreq-cpu0 deviceMarkus Pargmann2013-04-092-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add cpufreq-cpu0 platform device for imx5 DT init and register the clock for imx5. Signed-off-by: Markus Pargmann <mpa@pengutronix.de> Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
| | * | ARM: imx27 DT init cpufreq-cpu0 deviceMarkus Pargmann2013-04-092-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds cpufreq-cpu0 platform device for imx27 DT init and adds a clock registration for cpufreq-cpu0 device. Signed-off-by: Markus Pargmann <mpa@pengutronix.de> Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
| | * | ARM i.MX53: Add LDB device to device treePhilipp Zabel2013-04-091-0/+27
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de> Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
| | * | ARM i.MX53: Add IOMUXC GPR to device treePhilipp Zabel2013-04-091-0/+5
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de> Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
| | * | ARM i.MX5: Move IPU clock lookups into device treePhilipp Zabel2013-04-093-7/+4
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de> Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
| | * | ARM: imx: Add support for the Armadeus Systems APF27Dev docking boardGwenhael Goavec-Merou2013-04-092-0/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The APF27Dev is a docking board for an APF27 SOM Signed-off-by: Gwenhael Goavec-Merou <gwenhael.goavec-merou@armadeus.com> Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
| | * | ARM: imx: apf51dev: add ecspi1, ecspi2 and i2c2 supportGwenhael Goavec-Merou2013-04-091-0/+22
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Gwenhael Goavec-Merou <gwenhael.goavec-merou@armadeus.com> Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
| | * | ARM: i.MX27: Add clocks to GPT devicetree nodesSascha Hauer2013-04-091-0/+12
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
| | * | ARM: i.MX6: Add clocks to GPT devicetree nodeSascha Hauer2013-04-091-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The i.MX6 already has a devicetree node for the GPT, but not yet has the clocks. Add them. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
| | * | ARM: i.MX53: Add GPT devicetree nodeSascha Hauer2013-04-091-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The GPT is the GPT timer found on i.MX SoCs. This patch adds the devicetree node for it. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
| | * | ARM: i.MX51: Add GPT devicetree nodeSascha Hauer2013-04-091-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The GPT is the GPT timer found on i.MX SoCs. This patch adds the devicetree node for it. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
| | * | ARM: i.MX31: Add GPT devicetree nodeSascha Hauer2013-04-091-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The GPT is the GPT timer found on i.MX SoCs. Since this is the first user of the AIPS2 this patch also adds it. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
| | * | ARM: i.MX27: Add GPT devicetree nodesSascha Hauer2013-04-091-1/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The GPT is the GPT timer found on i.MX SoCs. This adds the missing GPT devicetree nodes. Also fixup the watchdog register map size along the way. it's 0x1000, not 0x4000. This didn't hurt before as the region was not occupied by another device, but now overlaps with the GPT. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
| | * | ARM: mx27: Replace clk_register_clkdev with clock DT lookupFabio Estevam2013-04-093-17/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Similarly as it was done for mx6q, use a DT lookup in order to make maintainance task for the clock devices easier. Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Tested-by: Markus Pargmann <mpa@pengutronix.de> Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
| | * | ARM: imx51: Add a second pinctrl group for i2c2Gwenhael Goavec-Merou2013-04-091-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a second pinctrl group of pins for i2c2. Signed-off-by: Gwenhael Goavec-Merou <gwenhael.goavec-merou@armadeus.com> Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
| | * | ARM: imx51: Add pinctrl for ecspi2Gwenhael Goavec-Merou2013-04-091-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Add ecspi2 group of pins for imx51. Signed-off-by: Gwenhael Goavec-Merou <gwenhael.goavec-merou@armadeus.com> Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
| | * | ARM: imx: Add support for the Armadeus Systems APF51Dev docking boardGwenhael Goavec-Merou2013-04-092-0/+76
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The APF51Dev is a docking board for an APF51 SOM Signed-off-by: Gwenhael Goavec-Merou <gwenhael.goavec-merou@armadeus.com> Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
| | * | ARM: dts: imx6q: Add pinctrl for audmix on AUD3Sean Cross2013-04-091-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow AUD3 to be used as audio output from the audmux block. Signed-off-by: Sean Cross <xobs@kosagi.com> Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
| | * | ARM: dts: imx6q: Add pinctrl for i2c2 and i2c3Sean Cross2013-04-091-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Add groups to allow i2c2 and i2c3 to be used on imx6q. Signed-off-by: Sean Cross <xobs@kosagi.com> Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
| | * | ARM: dts: imx6q: Add pinctrl for ecspi3Sean Cross2013-04-091-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a group of pins to allow ecspi3 to be used on imx6q. Signed-off-by: Sean Cross <xobs@kosagi.com> Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
| | * | pinctrl: imx: move hard-coding data into device treeShawn Guo2013-04-0918-471/+4453
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, all imx pinctrl drivers maintain a big array of struct imx_pin_reg which hard-codes data like register offset and mux mode setting for each pin function. Every time a new imx SoC support is added, we need to add such a big mount of data. With moving to single kernel build, it's only matter of time to be blamed on memory consuming. With DTC pre-processor support in place, the patch moves all these data into device tree by redefining the PIN_FUNC_ID in imxXX-pinfunc.h and changing the PIN_FUNC_ID parsing code a little bit. The pin id gets re-numbered based on mux register offset, or config register offset if the pin has no mux register, so that kernel can identify the pin id from register offsets provided by device tree. As a bonus point of the change, those arbitrary magic numbers standing for particular PIN_FUNC_ID in device tree sources are now replaced by macros to improve the readability of dts files. Signed-off-by: Shawn Guo <shawn.guo@linaro.org> Acked-by: Dong Aisheng <dong.aisheng@linaro.org> Acked-by: Linus Walleij <linus.walleij@linaro.org>
| | * | ARM: imx: use #include for all device treesShawn Guo2013-04-0926-26/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace /include/ (dtc) with #include (C pre-processor) for all imx DT files, so that gcc -E handles the entire include tree, and hence any of those files can #include some other file e.g. for constant definitions. This allows future use of #defines and header files in order to define names for various constants, such as pinctrl settings. Use of those features will increase the readability of the device tree files. Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
| | * | ARM: dts: imx6q-sabresd: Add USB supportPeter Chen2013-04-092-0/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Add USB support for imx6q sabresd board Signed-off-by: Peter Chen <peter.chen@freescale.com> Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
| | * | ARM: dts: imx6q: add PMUDirk Behme2013-04-091-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add ARM Cortex A9 Performance Monitor Unit (PMU) support. On i.MX6 a combined interrupt on hardware line #126 is used (i.MX6 TRM: Performance Unit interrupt). For more details see Documentation/devicetree/bindings/arm/pmu.txt Signed-off-by: Dirk Behme <dirk.behme@de.bosch.com> Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
| | * | Merge remote-tracking branch 'swarren/for-3.10/dtc-cpp-chroot-std-headers' ↵Shawn Guo2013-04-091-0/+1
| | |\ \ | | | | | | | | | | | | | | | into imx/dt
| | | * | kbuild: create an "include chroot" for DT bindingsStephen Warren2013-04-051-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The recent dtc+cpp support allows header files and C pre-processor defines/macros to be used when compiling device tree files. These headers will typically define various constants that are part of the device tree bindings. The original patch which set up the dtc+cpp include path only considered using those headers from device tree files. However, most are also useful for kernel code which needs to interpret the device tree. In both the DT files and the kernel, I'd like to include the DT-related headers in the same way, for example, <dt-bindings/gpio/tegra-gpio.h>. That will simplify any text which discusses the DT header locations. Creating a <dt-bindings/> for kernel source to use is as simple as placing files into include/dt-bindings/. However, when compiling DT files, the include path should be restricted so that only the dt-bindings path is available; arbitrary kernel headers shouldn't be exposed. For this reason, create a specific include directory for use by dtc+cpp, and symlink dt-bindings from there to the actual location of include/dt-bindings/. For want of a better location, place this "include chroot" into the existing dts/ directory. arch/*/boot/dts/include/dt-bindings -> ../../../../../include/dt-bindings Some headers used by device tree files may not be useful to the kernel; they may be used simply to aid in constructing the DT file (e.g. macros to create a node), but not define any information that the kernel needs to share. These may be placed directly into arch/*/boot/dts/ along with the DT files themselves. Acked-by: Michal Marek <mmarek@suse.cz> Acked-by: Shawn Guo <shawn.guo@linaro.org> Acked-by: Rob Herring <rob.herring@calxeda.com> Signed-off-by: Stephen Warren <swarren@nvidia.com>
| * | | | Merge tag 'dt-3.10-3' of git://git.infradead.org/users/jcooper/linux into ↵Olof Johansson2013-04-1717-6/+784
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | next/dt From Jason Cooper: mvebu dt for v3.10 round 3 - mvebu PCIe DT support from round 2 (no pr was sent): - 64bit dts skeleton - mvebu devicebus additions - mvebu thermal nodes - mirabox gpio leds - orion5x xor and ehci - use mvsdio on guruplug dt * tag 'dt-3.10-3' of git://git.infradead.org/users/jcooper/linux: arm: mvebu: PCIe Device Tree informations for Armada XP GP arm: mvebu: PCIe Device Tree informations for Armada 370 DB arm: mvebu: PCIe Device Tree informations for Armada 370 Mirabox arm: mvebu: PCIe Device Tree informations for Armada XP DB arm: mvebu: PCIe Device Tree informations for OpenBlocks AX3-4 arm: mvebu: add PCIe Device Tree informations for Armada XP arm: mvebu: add PCIe Device Tree informations for Armada 370 ARM: dts: Add a 64 bits version of the skeleton device tree ARM: mvebu: Add Device Bus and CFI flash memory support to defconfig ARM: mvebu: Add support for NOR flash device on Openblocks AX3 board ARM: mvebu: Add support for NOR flash device on Armada XP-GP board ARM: mvebu: Add Device Bus support for Armada 370/XP SoC ARM: configs: Update mvebu defconfig for thermal ARM: mvebu: Add thermal support to Armada 370 device tree ARM: mvebu: Add thermal support to Armada XP device tree arm: mvebu: Add GPIO LEDs to Mirabox board arm: orion5x: enable xor for orion5x platform arm: orion5x: add ehci bindings to dtsi ARM: kirkwood: make use of DT mvsdio on guruplug board ARM: mvebu: Add button on Armada 370 Reference Design board
| | * | | | arm: mvebu: PCIe Device Tree informations for Armada XP GPThomas Petazzoni2013-04-151-0/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Marvell Armada XP GP board has 3 physical full-size PCIe slots, so we enable the corresponding PCIe interfaces in the Device Tree. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Jason Cooper <jason@lakedaemon.net>
| | * | | | arm: mvebu: PCIe Device Tree informations for Armada 370 DBThomas Petazzoni2013-04-151-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Marvell evaluation board (DB) for the Armada 370 SoC has 2 physical full-size PCIe slots, so we enable the corresponding PCIe interfaces in the Device Tree. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Jason Cooper <jason@lakedaemon.net>
OpenPOWER on IntegriCloud