summaryrefslogtreecommitdiffstats
path: root/arch
AgeCommit message (Collapse)Author
2012-05-15Merge branch 'drivers/mmc' into next/dt2Arnd Bergmann
Changes in the dt2 branch move stuff around that gets changed in the drivers/mmc branch. I chose a non-obvious resolution by adding the new bus-width property into all the tegra sdhci device nodes. Conflicts: arch/arm/boot/dts/tegra-cardhu.dts arch/arm/boot/dts/tegra-harmony.dts arch/arm/boot/dts/tegra-ventana.dts Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2012-05-15mmc: dt: Consolidate DT bindingsArnd Bergmann
This patch unifies the current DT MMC bindings documentation and code, adds generic MMC DT bindings documentation, and updates .dts files for consistency. [cjb: typo fixes, addition of max-frequency property] Signed-off-by: Chris Ball <cjb@laptop.org> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2012-05-14Merge branch 'for-3.5/dt2' of ↵Arnd Bergmann
git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra into for-next Stephen Warren <swarren@wwwdotorg.org> writes: This branch is based on the merge of the following branches from the Tegra repo, which are all already pulled into arm-soc: for-3.5/tegra30-audio for-3.5/usb-ulpi for-3.5/dt ... which are all based on for-3.5/gpio-pinmux * 'for-3.5/dt2' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra: ARM: dt: tegra: invert status=disable vs status=okay ARM: dt: tegra: consistent basic property ordering ARM: dt: tegra: sort nodes based on bus order ARM: dt: tegra: remove duplicate device_type property ARM: dt: tegra: consistenly use lower-case for hex constants ARM: dt: tegra: format regs properties consistently ARM: dt: tegra: gpio comment cleanup ARM: dt: tegra: remove unnecessary unit addresses ARM: dt: tegra: whitespace cleanup ARM: dt: tegra cardhu: fix typo in SDHCI node name ARM: dt: tegra: cardhu: register core regulator tps62361 ARM: dt: tegra30.dtsi: Add SMMU node ARM: dt: tegra20.dtsi: Add GART node ARM: dt: tegra30.dtsi: Add Memory Controller(MC) nodes ARM: dt: tegra20.dtsi: Add Memory Controller(MC) nodes ARM: dt: tegra: Add device tree support for AHB Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2012-05-14Merge branch 'omap/dt-missed-3.4' into drivers/mmcArnd Bergmann
The omap/dt branch adds a few instances of mmc device nodes that need to get changed to use the common bindings. Pull that into a new branch so we can apply the patch in a single run. Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2012-05-14ARM: dt: tegra: invert status=disable vs status=okayStephen Warren
In tegra*.dtsi, set status="disable" for all HW modules that the board design may choose not to use. Update all boards to specifically enable any of those modules that are useful by setting status="okay". This makes board files say which features they do use, rather than which they don't, which feels more logical. It also makes the .dts files slightly smaller, at least for existing content. Signed-off-by: Stephen Warren <swarren@nvidia.com> Acked-by: Olof Johansson <olof@lixom.net>
2012-05-14ARM: dt: tegra: consistent basic property orderingStephen Warren
Put properties in order compatible, reg, interrupts, then anything else the node has. Signed-off-by: Stephen Warren <swarren@nvidia.com> Acked-by: Olof Johansson <olof@lixom.net>
2012-05-14ARM: dt: tegra: sort nodes based on bus orderStephen Warren
Sort the nodes according to the following rules: * First, any overrides for properties or nodes created by included files, in the order they appeared in the include file. * Second, any nodes with a reg property, in numerical order. * Third, any nodes without a reg property, in alphabetical order of node name. The second sorting rule at least will probably help if/when we need to explicitly insert nodes for the various busses in Tegra; that will just be an indentation change rather than also a node re-ordering. Signed-off-by: Stephen Warren <swarren@nvidia.com> Acked-by: Olof Johansson <olof@lixom.net>
2012-05-14ARM: dt: tegra: remove duplicate device_type propertyStephen Warren
It's already specified in skeleton.dtsi, included via tegra20.dtsi. Signed-off-by: Stephen Warren <swarren@nvidia.com> Acked-by: Olof Johansson <olof@lixom.net>
2012-05-14ARM: dt: tegra: consistenly use lower-case for hex constantsStephen Warren
Signed-off-by: Stephen Warren <swarren@nvidia.com> Acked-by: Olof Johansson <olof@lixom.net>
2012-05-14ARM: dt: tegra: format regs properties consistentlyStephen Warren
Place each reg "entry" on its own line, and wrap the whole list in <> rather than each individual entry. The convention chosen here is slightly arbitrary, but is not consistent throughout all Tegra files. Signed-off-by: Stephen Warren <swarren@nvidia.com> Acked-by: Olof Johansson <olof@lixom.net>
2012-05-14ARM: dt: tegra: gpio comment cleanupStephen Warren
Ensure that all Tegraa GPIO specifiers contain a comment indicating which GPIO name the number refers to. Signed-off-by: Stephen Warren <swarren@nvidia.com> Acked-by: Olof Johansson <olof@lixom.net>
2012-05-14ARM: dt: tegra: remove unnecessary unit addressesStephen Warren
DT node names only need to include the unit address if it's required to make the node name unique. Remove the unnecessary unit addresses. Signed-off-by: Stephen Warren <swarren@nvidia.com> Acked-by: Olof Johansson <olof@lixom.net>
2012-05-14ARM: dt: tegra: whitespace cleanupStephen Warren
Consistently don't place a space after < or before >. Signed-off-by: Stephen Warren <swarren@nvidia.com> Acked-by: Olof Johansson <olof@lixom.net>
2012-05-14ARM: dt: tegra cardhu: fix typo in SDHCI node nameStephen Warren
Cardhu's eMMC controller is on sdhci@78000600, not sdhci@78000400. Fix the typo. This roughly doubles the IO performance, since the support-8bit property actually takes effect. Signed-off-by: Stephen Warren <swarren@nvidia.com> Cc: stable@kernel.org # v3.4
2012-05-14ARM: dt: tegra: cardhu: register core regulator tps62361Laxman Dewangan
Add device info for the core regulator tps62360 in tegra-cardhu dts file. Signed-off-by: Laxman Dewangan <ldewangan@nvidia.com> [swarren: fixed node name to reflect actual device type] Signed-off-by: Stephen Warren <swarren@nvidia.com>
2012-05-14ARM: dt: tegra30.dtsi: Add SMMU nodehdoyu@nvidia.com
Add a node for the Tegra30 SMMU Signed-off-by: Hiroshi DOYU <hdoyu@nvidia.com> Signed-off-by: Stephen Warren <swarren@nvidia.com>
2012-05-14ARM: dt: tegra20.dtsi: Add GART nodehdoyu@nvidia.com
Add a node for the Tegra20 GART Signed-off-by: Hiroshi DOYU <hdoyu@nvidia.com> Signed-off-by: Stephen Warren <swarren@nvidia.com>
2012-05-14ARM: dt: tegra30.dtsi: Add Memory Controller(MC) nodeshdoyu@nvidia.com
Add Tegra MC(Memory Controller) nodes for tegra30.dtsi. Signed-off-by: Hiroshi DOYU <hdoyu@nvidia.com> Signed-off-by: Stephen Warren <swarren@nvidia.com>
2012-05-14ARM: dt: tegra20.dtsi: Add Memory Controller(MC) nodeshdoyu@nvidia.com
Add Tegra MC(Memory Controller) nodes for tegra20.dtsi. Signed-off-by: Hiroshi DOYU <hdoyu@nvidia.com> Signed-off-by: Stephen Warren <swarren@nvidia.com>
2012-05-14ARM: dt: tegra: Add device tree support for AHBHiroshi DOYU
Add AHB entry for tegra20/30. Signed-off-by: Hiroshi DOYU <hdoyu@nvidia.com> Signed-off-by: Stephen Warren <swarren@nvidia.com>
2012-05-14Merge branch 'for-3.5/dt' into for-3.5/dt2-newStephen Warren
2012-05-14Merge branch 'for-3.5/usb-ulpi' into for-3.5/dt2-newStephen Warren
2012-05-14Merge branch 'imx/dt/for-3.5' of ↵Arnd Bergmann
git://git.linaro.org/people/shawnguo/linux-2.6.git into next/dt2 Shawn Guo <shawn.guo@linaro.org> writes: I chose to base it on Sascha's imx-common-clk series than -rc, because otherwise it will keep patching clock file that has been removed by imx-common-clk series. It also depends on imx-pinctrl pull-request I just sent to be functional. Note: when imx-common-clk and imx-pinctrl get merged together, the following files will have conflicts. But the conflicts should not be so hard to resolve. [arnd: resolved those merge conflicts by pulling pinctrl branch] * imx/dt: (24 commits) ARM: dts: imx53-qsb: enable audio support ARM: dts: imx51-babbage: enable audio support ARM: imx: add audio codec clk lookup for imx53-qsb ARM: imx: add audmux pad setting for imx51-babbage ARM: imx: add more imx5 ssi clocks ARM: dts: imx53-qsb: Add Dialog DA9053 PMIC support ARM: dts: imx6q-sabrelite: add serial2 pinctrl support ARM: dts: imx6q-sabrelite: add sound device imx6q-sabrelite-sgtl5000 ARM: imx6q_sabrelite: clk_register_clkdev cko1 for sgtl5000 ARM: imx6q: add ssi1_ipg clk_lookup ARM: dts: imx6q-sabrelite: add audmux pinctrl support ARM: dts: imx6q-sabrelite: add i2c1 pinctrl support ARM: dts: imx6q-sabrelite: add audmux device ARM: dts: imx6q-sabrelite: add ssi device ARM: dts: imx6q-arm2: add pinctrl state for usdhc ARM: imx6: Add UART2 for low-level debug ARM: imx6q: register phy fixup only when CONFIG_PHYLIB is enabled ARM: imx6q: move imx6q_sabrelite specific code to a dedicated function ARM: dts: imx6q-sabrelite: Add SPI NOR support ARM: dts: Add basic support for imx6q-sabresd ... Pulls in imx/pinctrl and imx/clock as dependencies. Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2012-05-14Merge branch 'imx/pinctrl' into imx/dtArnd Bergmann
Conflicts: drivers/mmc/host/sdhci-esdhc-imx.c drivers/net/ethernet/freescale/fec.c drivers/spi/spi-imx.c drivers/tty/serial/imx.c This resolves some simply but annoying conflicts. Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2012-05-12Merge branch 'mxs/dt/for-3.5' of ↵Olof Johansson
git://git.linaro.org/people/shawnguo/linux-2.6 into next/dt2 * 'mxs/dt/for-3.5' of git://git.linaro.org/people/shawnguo/linux-2.6: (51 commits) ARM: dts: enable audio support for imx28-evk ARM: dts: enable i2c device for imx28-evk i2c: mxs: add device tree probe support ARM: dts: enable mmc for imx28-evk ARM: dts: enable mmc for imx23-evk mmc: mxs-mmc: add device tree support mmc: mxs-mmc: copy wp_gpio in struct mxs_mmc_host mmc: mxs-mmc: have dma_channel than dma_res in mxs_mmc_host mmc: mxs-mmc: use devm_* helper to make cleanup simpler mmc: mxs-mmc: move header from mach into linux folder mmc: mxs-mmc: get rid of the use of cpu_is_xxx mmc: mxs-mmc: let ssp_is_old take host as parameter mmc: mxs-mmc: use global stmp_device functionality ARM: mxs: add gpio support for device tree boot gpio/mxs: add device tree probe gpio/mxs: get rid of the use of cpu_is_xxx gpio/mxs: use devm_* helpers to make error handling simple ARM: mxs: add mxs-dma dt support ARM: mxs: do not add dma device by default dma: mxs-dma: add device tree probe support ...
2012-05-13ARM: dts: enable audio support for imx28-evkShawn Guo
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
2012-05-13ARM: dts: enable i2c device for imx28-evkShawn Guo
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
2012-05-13ARM: dts: enable mmc for imx28-evkShawn Guo
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
2012-05-13ARM: dts: enable mmc for imx23-evkShawn Guo
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
2012-05-13mmc: mxs-mmc: move header from mach into linux folderShawn Guo
Rename arch/arm/mach-mxs/include/mach/mmc.h to include/linux/mmc/mxs-mmc.h, so that mxs-mmc driver becomes <mach/*> inclusion free. Signed-off-by: Shawn Guo <shawn.guo@linaro.org> Acked-by: Marek Vasut <marex@denx.de> Acked-by: Chris Ball <cjb@laptop.org>
2012-05-13mmc: mxs-mmc: get rid of the use of cpu_is_xxxShawn Guo
The register HW_SSP_VERSION is broken for ssp version detection, as the address of the register is different between imx23 and imx28. Let's use platform_device_id to detect the device, so that the use of cpu_is_xxx can be removed. Signed-off-by: Shawn Guo <shawn.guo@linaro.org> Acked-by: Chris Ball <cjb@laptop.org>
2012-05-12ARM: mxs: add gpio support for device tree bootShawn Guo
It adds gpio support for device tree boot. Signed-off-by: Shawn Guo <shawn.guo@linaro.org> Acked-by: Linus Walleij <linus.walleij@linaro.org>
2012-05-12gpio/mxs: get rid of the use of cpu_is_xxxShawn Guo
It removes the use of cpu_is_xxx from gpio-mxs driver and instead use platform_device_id to identify the device. Accordingly, mxs platform code is changed to register gpio device with different names, and the registeration are done in soc specific initialization functions now, so postcore_initcall(mxs_add_mxs_gpio) gets removed. Signed-off-by: Shawn Guo <shawn.guo@linaro.org> Acked-by: Linus Walleij <linus.walleij@linaro.org>
2012-05-12ARM: mxs: add mxs-dma dt supportDong Aisheng
Cc: Grant Likely <grant.likely@secretlab.ca> Cc: Rob Herring <rob.herring@calxeda.com> Cc: Sascha Hauer <s.hauer@pengutronix.de> Cc: Huang Shijie <b32955@freescale.com> Signed-off-by: Dong Aisheng <dong.aisheng@linaro.org> Signed-off-by: Shawn Guo <shawn.guo@linaro.org> Acked-by: Marek Vasut <marex@denx.de> Acked-by: Vinod Koul <vinod.koul@intel.com>
2012-05-12ARM: mxs: do not add dma device by defaultDong Aisheng
This will cause conflict when dt is enabled. So let each platform add dma devices respectively. Cc: Sascha Hauer <s.hauer@pengutronix.de> Cc: Huang Shijie <b32955@freescale.com> Signed-off-by: Dong Aisheng <dong.aisheng@linaro.org> Signed-off-by: Shawn Guo <shawn.guo@linaro.org> Acked-by: Marek Vasut <marex@denx.de> Acked-by: Vinod Koul <vinod.koul@intel.com>
2012-05-12dma: mxs-dma: make platform_device_id more genericShawn Guo
Rewrite mxs_dma_is_apbh and mxs_dma_is_apbx in order to support other SoCs like imx6q and reform the platform_device_id for the better further dt support. Cc: Dan Williams <dan.j.williams@intel.com> Cc: Sascha Hauer <s.hauer@pengutronix.de> Cc: Huang Shijie <b32955@freescale.com> Signed-off-by: Dong Aisheng <dong.aisheng@linaro.org> Signed-off-by: Shawn Guo <shawn.guo@linaro.org> Acked-by: Marek Vasut <marex@denx.de> Acked-by: Vinod Koul <vinod.koul@intel.com>
2012-05-12ARM: mxs: always build in device tree supportShawn Guo
As the ultimate for mxs platform is to convert over to device tree, let's start always building in device tree support for the platform. Signed-off-by: Shawn Guo <shawn.guo@linaro.org> Acked-by: Marek Vasut <marex@denx.de>
2012-05-12ARM: mxs: add initial device tree support for imx23-evk boardShawn Guo
It adds initial device tree support for imx23-evk board, and only serial console is enabled. Signed-off-by: Shawn Guo <shawn.guo@linaro.org> Acked-by: Marek Vasut <marex@denx.de>
2012-05-12ARM: mxs: add initial device tree support for imx28-evk boardDong Aisheng
This patch includes basic dt support which can boot via nfs rootfs. Signed-off-by: Dong Aisheng <dong.aisheng@linaro.org> Signed-off-by: Shawn Guo <shawn.guo@linaro.org> Acked-by: Marek Vasut <marex@denx.de>
2012-05-12Merge branches 'clk/mxs' and 'imx/pinctrl/for-3.5' into mxs/dt/for-3.5Shawn Guo
2012-05-12ARM: mxs: enable pinctrl supportShawn Guo
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
2012-05-11ARM: dts: imx53-qsb: enable audio supportShawn Guo
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
2012-05-11ARM: dts: imx51-babbage: enable audio supportShawn Guo
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
2012-05-11ARM: imx: add audio codec clk lookup for imx53-qsbShawn Guo
On imx53-qsb board, the clk ssi_ext.0 is used as the clock input to audio codec sgtl5000. Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
2012-05-11ARM: imx: add audmux pad setting for imx51-babbageShawn Guo
Before i.MX51 Pinctrl support is available, we have to reply on the iomux initialization in non-DT board file to set iomux up for DT boot. Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
2012-05-11ARM: imx: add more imx5 ssi clocksShawn Guo
Add more imx5 ssi clocks and lookup for device tree probe. Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
2012-05-11ARM: dts: imx53-qsb: Add Dialog DA9053 PMIC supportYing-Chun Liu (PaulLiu)
Add Dialog DA9053 regulators support for imx53-qsb (Loco board) Cc: Sascha Hauer <kernel@pengutronix.de> Cc: Mark Brown <broonie@opensource.wolfsonmicro.com> Cc: Amit Kucheria <amit.kucheria@canonical.com> Cc: Arnaud Patard (Rtp) <arnaud.patard@rtp-net.org> Cc: Russell King - ARM Linux <linux@arm.linux.org.uk> Signed-off-by: Ying-Chun Liu (PaulLiu) <paulliu@debian.org> Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
2012-05-11ARM: dts: imx6q-sabrelite: add serial2 pinctrl supportRichard Zhao
Signed-off-by: Richard Zhao <richard.zhao@freescale.com> Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
2012-05-11ARM: dts: imx6q-sabrelite: add sound device imx6q-sabrelite-sgtl5000Richard Zhao
Signed-off-by: Richard Zhao <richard.zhao@freescale.com> Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
2012-05-11ARM: imx6q_sabrelite: clk_register_clkdev cko1 for sgtl5000Richard Zhao
Signed-off-by: Richard Zhao <richard.zhao@freescale.com> Signed-off-by: Shawn Guo <shawn.guo@linaro.org>