summaryrefslogtreecommitdiff
path: root/arch/arm
AgeCommit message (Collapse)Author
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 'next/board-samsung' of ↵Arnd Bergmann
git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/boards Kukjin Kim <kgene.kim@samsung.com> writes: As there were discussions, some exynos4 boards have been updated because current dt cannot support all features for current board files on exynos4. Note, this should be merged after next/devel-samsung because some platform devices are defined in that. * 'next/board-samsung' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung: ARM: EXYNOS: Add FIMC device to SMDK4X12 ARM: EXYNOS: Add MFC device to SMDK4X12 ARM: EXYNOS: Add DRM device to SMDKV310 ARM: EXYNOS: Add DRM device to Origen ARM: EXYNOS: Make BT platform data structure static in mach-origen.c file ARM: EXYNOS: Add DRM core support for NURI board ARM: EXYNOS: Add DRM core device support for Universal C210 board ARM: EXYNOS: Increase framebuffer virtual size for origen ARM: S3C64XX: Hook up new style regulator-regulator supplies on Cragganmore Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2012-05-14Merge branch 'next/cpuidle' into next/pmArnd Bergmann
No point maintaining two branches for power management 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-14Merge branch 'power' of git://github.com/hzhuang1/linux into next/pmArnd Bergmann
* 'power' of git://github.com/hzhuang1/linux: ARM: mmp: add pm support for pxa910 ARM: mmp: ttc_dkb: add PMIC support ARM: cache: tauros2: add disable and resume callback ARM: mm: proc-mohawk: add suspend resume for mohawk ARM: mmp: add PM support for mmp2 ARM: mmp: move XX_REG definition to addr-map.h Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2012-05-14Merge branch 'mmp/dt' into next/pmArnd Bergmann
The mmp power management changes are based on this branch, so pull it in as a dependency. Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2012-05-14Merge branch 'dt' of git://github.com/hzhuang1/linux into next/dtArnd Bergmann
* 'dt' of git://github.com/hzhuang1/linux: Documentation: update docs for mmp dt ARM: dts: refresh dts file for arch mmp ARM: mmp: support pxa910 with device tree ARM: mmp: support mmp2 with device tree gpio: pxa: parse gpio from DTS file ARM: mmp: support DT in timer ARM: mmp: support DT in irq ARM: mmp: append CONFIG_MACH_MMP2_DT ARM: mmp: fix build issue on mmp with device tree Includes an update to v3-4-rc5 Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2012-05-14Merge branch 'next/cleanup-plat-s3c24xx-s5p' of ↵Arnd Bergmann
git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/cleanup2 Kukjin Kim <kgene.kim@samsung.com> writes: We can remove plat-s5p directory with this series and I think, the plat-s3c24xx can be removed next time for one plat-samsung of Samsung stuff. Note, this is including cleanup-samsung-iommu which is removing s5p iommu stuff in plat-s5p. * 'next/cleanup-plat-s3c24xx-s5p' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung: ARM: SAMSUNG: merge plat-s5p into plat-samsung ARM: SAMSUNG: move options for common s5p into plat-samsung/Kconfig ARM: SAMSUNG: move setup code for s5p mfc and mipiphy into plat-samsung ARM: SAMSUNG: move platform device for s5p uart into plat-samsung ARM: SAMSUNG: move hr timer for common s5p into plat-samsung ARM: SAMSUNG: move pm part for common s5p into plat-samsung ARM: SAMSUNG: move interrupt part for common s5p into plat-samsung ARM: SAMSUNG: move clock part for common s5p into plat-samsung ARM: S3C24XX: Use common macro to define resources on dev-uart.c ARM: S3C24XX: move common clock init into common.c ARM: S3C24XX: move common power-management code to mach-s3c24xx ARM: S3C24XX: move plat-s3c24xx/dev-uart.c into common.c ARM: S3C24XX: move plat-s3c24xx/cpu.c Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2012-05-14Merge branch 'exynos/sysmmu' into next/cleanup2Arnd Bergmann
Required as a depdency for the next/cleanup-plat-s3c24xx-s5p branch Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2012-05-14Merge branch 'next/cleanup-samsung-iommu' of ↵Arnd Bergmann
git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/drivers * 'next/cleanup-samsung-iommu' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung: ARM: EXYNOS: Change System MMU platform device definitions S5P: SYSMMU: Remove System MMU device driver Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2012-05-14Merge branch 'for-3.5/defconfig2' of ↵Arnd Bergmann
git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra into next/defconfig * 'for-3.5/defconfig2' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra: ARM: tegra: update defconfig
2012-05-14ARM clps711x: Removed unused header mach/time.hAlexander Shiyan
All functions from this header already provided by common.c Signed-off-by: Alexander Shiyan <shc_work@mail.ru> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2012-05-14ARM: clps711x: Added note about support EP731x CPU to KconfigAlexander Shiyan
ep7312 has been supported for a very long time, but has never been mentioned in the Kconfig file. Signed-off-by: Alexander Shiyan <shc_work@mail.ru> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2012-05-14ARM: clps711x: Added missing register definitionsAlexander Shiyan
This allows us to keep everything in a single place. Signed-off-by: Alexander Shiyan <shc_work@mail.ru> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2012-05-14ARM: clps711x: Used own subarch directory for store header fileAlexander Shiyan
There is no reason to have the clps7111.h header in a globally visible location, so move it to a place that is only visible when building for mach-clps711x. Signed-off-by: Alexander Shiyan <shc_work@mail.ru> 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-14ARM: tegra: Fix flow controller accessesPeter De Schrijver
flowctrl_write_cpu_csr uses the cpu halt offsets and vice versa. This patch fixes this bug. Reported-by: Dan Willemsen <dwillemsen@nvidia.com> Signed-off-by: Peter De Schrijver <pdeschrijver@nvidia.com> [swarren: This problem was introduced in v3.4-rc1, in commit 26fe681 "ARM: tegra: functions to access the flowcontroller", when this file was first added] Signed-off-by: Stephen Warren <swarren@nvidia.com>
2012-05-14Dove: Fix Section mismatch warningsAndrew Lunn
Add missing __init markups to GPIO and timer functions. Signed-off-by: Andrew Lunn <andrew@lunn.ch>
2012-05-14ARM: orion5x: ts78xx debugging changesAlexander Clouter
Move to using a refined pr_fmt to avoid having to manually prefix every message line with 'ts78xx'. Changelog: v2: moved pr_fmt define ahead of includes as suggested by Hartley Sweeten to avoid use of leading undef v1: initial release Signed-off-by: Alexander Clouter <alex@digriz.org.uk> Signed-off-by: Andrew Lunn <andrew@lunn.ch>
2012-05-14ARM: orion5x: remove PM dependency from ts78xxAlexander Clouter
Move ts78xx_fpga from /sys/power to /sys/firmware so that we can remove the PM dependency. Signed-off-by: Alexander Clouter <alex@digriz.org.uk> Signed-off-by: Andrew Lunn <andrew@lunn.ch>
2012-05-14ARM: orion5x: ts78xx fix NAND resource off by oneAlexander Clouter
Changelog: v2: use DEFINE_RES_MEM as suggesed by Hartley Sweeten v1: inital release Signed-off-by: Alexander Clouter <alex@digriz.org.uk> Signed-off-by: Andrew Lunn <andrew@lunn.ch>
2012-05-14ARM: orion5x: ts78xx whitespace cleanupsAlexander Clouter
Signed-off-by: Alexander Clouter <alex@digriz.org.uk> Signed-off-by: Andrew Lunn <andrew@lunn.ch>
2012-05-14Orion5x: Fix Section mismatch warningsAndrew Lunn
Wrongly placed __initdata, and missing __init caused these warnings. Signed-off-by: Andrew Lunn <andrew@lunn.ch>
2012-05-14Orion5x: Fix warning: struct pci_dev declared inside paramter listAndrew Lunn
Orion5x board files which don't have PCI give warnings: arch/arm/mach-orion5x/common.h:54:38: warning: 'struct pci_dev' declared inside parameter list. Add a forward declaration in the header file, which is the pattern used for other PCI structures. Signed-off-by: Andrew Lunn <andrew@lunn.ch>
2012-05-14ARM: spear6xx: remove board selection optionsArnd Bergmann
There are no board specific configurations that need user intervention, so just make MACH_SPEAR600 the silent default for ARCH_SPEAR6XX to prevent users from turning it off, which would result in a build error. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Reported-by: Paul Gortmaker <paul.gortmaker@windriver.com> Acked-by: Viresh Kumar <viresh.kumar@st.com>
2012-05-14Merge branches 'spear/clock' and 'imx/clock' into next/clockArnd Bergmann
Updated to resolve dependencies. Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2012-05-14Merge branch 'spear/13xx' into next/soc2Arnd Bergmann
* spear/13xx: pinctrl: SPEAr1310: Fix pin numbers for clcd_high_res SPEAr: Update MAINTAINERS and Documentation SPEAr13xx: Add defconfig SPEAr13xx: Add compilation support SPEAr13xx: Add dts and dtsi files pinctrl: Add SPEAr13xx pinctrl drivers pinctrl: SPEAr: Create macro for declaring GPIO PINS SPEAr13xx: Add common clock framework support SPEAr13xx: Add source files SPEAr13xx: Add header files Depends on clock, pinctrl and dt branches to go first. Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2012-05-14SPEAr13xx: Add defconfigViresh Kumar
Signed-off-by: Viresh Kumar <viresh.kumar@st.com>
2012-05-14SPEAr13xx: Add compilation supportViresh Kumar
Signed-off-by: Viresh Kumar <viresh.kumar@st.com>
2012-05-14SPEAr13xx: Add dts and dtsi filesViresh Kumar
This patch adds machines/boards dts{i} files for SPEAr1310 and SPEAr1340. Both are based on ARM, Cortex A9 processor family. Signed-off-by: Viresh Kumar <viresh.kumar@st.com>
2012-05-14pinctrl: Add SPEAr13xx pinctrl driversViresh Kumar
This adds pinctrl driver for SPEAr13xx family. SPEAr13xx family supports two machines: SPEAr1310 and SPEAr1340. Signed-off-by: Viresh Kumar <viresh.kumar@st.com> Acked-by: Linus Walleij <linus.walleij@linaro.org>
2012-05-14SPEAr13xx: Add source filesViresh Kumar
This patch adds source files for SPEAr13xx Machines. Signed-off-by: Viresh Kumar <viresh.kumar@st.com> Signed-off-by: Deepak Sikri <deepak.sikri@st.com> Signed-off-by: Shiraz Hashim <shiraz.hashim@st.com>
2012-05-14SPEAr13xx: Add header filesViresh Kumar
This patch adds basic header files for SPEAr13xx Machines. Signed-off-by: Viresh Kumar <viresh.kumar@st.com>
generated by cgit (git 2.34.1) at 2025-10-01 07:55:40 +0000