summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2012-05-16ARM: exynos: fix building with CONFIG_OF disabledArnd Bergmann
irq_of_parse_and_map does not have an empty definition for the !CONFIG_OF case, so we should not try to call it then: arch/arm/mach-exynos/common.c: In function 'combiner_init': arch/arm/mach-exynos/common.c:576:3: warning: implicit declaration of function 'irq_of_parse_and_map' Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2012-05-16Merge branch 'next/devel-exynos5250-1' of ↵Arnd Bergmann
git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/soc2 * 'next/devel-exynos5250-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung: ARM: EXYNOS: Add AUXDATA for i2c controllers ARM: dts: Update device tree source files for EXYNOS5250 ARM: EXYNOS: Add device tree support for interrupt combiner ARM: EXYNOS: Add irq_domain support for interrupt combiner ARM: EXYNOS: Remove a new bus_type instance for EXYNOS5 ARM: EXYNOS: update irqs for EXYNOS5250 SoC ARM: EXYNOS: Add pre-divider and fout mux clocks for bpll and mpll ARM: EXYNOS: add GPC4 bank instance ARM: EXYNOS: Redefine IRQ_MCT_L0,1 definition ARM: EXYNOS: Modify the GIC physical address for static io-mapping ARM: EXYNOS: Add watchdog timer clock instance Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2012-05-16Merge branch 'samsung/cleanup-plat-s5p' into next/soc2Arnd Bergmann
2012-05-16ARM: EXYNOS: Add AUXDATA for i2c controllersThomas Abraham
Use AUXDATA to set the device names for controller instances discovered from device tree. Signed-off-by: Thomas Abraham <thomas.abraham@linaro.org> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2012-05-16ARM: dts: Update device tree source files for EXYNOS5250Thomas Abraham
Update EXYNOS5 device tree source files for EXYNOS5250 SoC. This includes new additions to the EXYNOS5 dtsi and SMDK5250 dts files and few minor fixes. Signed-off-by: Thomas Abraham <thomas.abraham@linaro.org> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2012-05-16ARM: EXYNOS: Add device tree support for interrupt combinerThomas Abraham
Add device tree based instantiation of the interrupt combiner controller. Signed-off-by: Thomas Abraham <thomas.abraham@linaro.org> Acked-by: Rob Herring <rob.herring@calxeda.com> Acked-by: Grant Likely <grant.likely@secretlab.ca> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2012-05-16ARM: EXYNOS: Add irq_domain support for interrupt combinerThomas Abraham
Add irq_domain support for hardware interrupts of the interrupt combiner. The hardware interrupts of all the instances of the combiner are grouped in a single irq_domain. Cc: Grant Likely <grant.likely@secretlab.ca> Signed-off-by: Thomas Abraham <thomas.abraham@linaro.org> Acked-by: Rob Herring <rob.herring@calxeda.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2012-05-16ARM: EXYNOS: Remove a new bus_type instance for EXYNOS5Thomas Abraham
A seperate bus_type instance is not required for EXYNOS5. The existing bus_type instance used with EXYNOS4 is sufficient for both EXYNOS4 and EXYNOS5. This also solves issue of uninitialized usage of exynos4_subsys in EXYNOS4 power management code that is reused for EXYNOS5 also. In addition to that, the existing exynos4_subsys bus_type is renamed to exynos_subsys to indicate that it is reused on both EXYNOS4 and EXYNOS5 platforms. Signed-off-by: Thomas Abraham <thomas.abraham@linaro.org> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2012-05-16ARM: EXYNOS: update irqs for EXYNOS5250 SoCKukjin Kim
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2012-05-16ARM: EXYNOS: Add pre-divider and fout mux clocks for bpll and mpllKisoo Yu
The fout clock of BPLL and MPLL have a selectable source on EXYNOS5250. The clock options are a fixed divided by 2 clock and the output of the PLL itself. Add support for these new clock instances. Signed-off-by: Kisoo Yu <ksoo.yu@samsung.com> Signed-off-by: Thomas Abraham <thomas.abraham@linaro.org> [kgene.kim@samsung.com: moved common pll stuff into s5p-clock.c] Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2012-05-16ARM: EXYNOS: add GPC4 bank instanceSangsu Park
Add GPC4 bank instance which is included in rev1 of EXYNOS5. Signed-off-by: Sangsu Park <sangsu4u.park@samsung.com> Signed-off-by: Thomas Abraham <thomas.abraham@linaro.org> Acked-by: Grant Likely <grant.likely@secretlab.ca> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2012-05-15Merge branch 'next/devel-samsung' of ↵Arnd Bergmann
git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/soc2 * 'next/devel-samsung' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung: ARM: EXYNOS: Support Suspend/Resume for EXYNOS4412 ARM: EXYNOS: To use common config for EXYNOS4 and EXYNOS5 SPI ARM: EXYNOS: Support DMA for EXYNOS5250 SoC ARM: EXYNOS: Add platform resource definitions for FIMC-LITE ARM: EXYNOS: add platform device for core DRM subsystem ARM: EXYNOS: add dts files to dtbs target spi/s3c64xx: Allow usage for ARCH_S3C24XX ARM: S3C24XX: Add HSSPI setup callback for s3c64xx-spi driver ARM: S3C24XX: Add clock-lookup entries required by s3c64xx-spi ARM: S3C24XX: Add map entries needed by the s3c64xx-spi devices ARM: S3C24XX: claim spi channels for hsspi in dma-s3c2443 ARM: S3C24XX: Add forgotten clock lookup table to S3C2443 Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2012-05-15Merge branch 'exynos/iommu' into next/soc2Arnd Bergmann
This is a dependency for the following samsung changes. Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2012-05-15ARM: EXYNOS: Redefine IRQ_MCT_L0,1 definitionChanghwan Youn
Redefine IRQ_MCT_L0,1 irq definition as it is changed in rev1 of EXYNOS5. Signed-off-by: Changhwan Youn <chaos.youn@samsung.com> Signed-off-by: Thomas Abraham <thomas.abraham@linaro.org> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2012-05-15ARM: EXYNOS: Modify the GIC physical address for static io-mappingChanghwan Youn
Adapt to changes in GIC physical address in rev1 of EXYNOS5. Signed-off-by: Changhwan Youn <chaos.youn@samsung.com> Signed-off-by: Thomas Abraham <thomas.abraham@linaro.org> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2012-05-15ARM: EXYNOS: Add watchdog timer clock instanceThomas Abraham
Add watchdog timer clock instance for EXYNOS5 watchdog controller. Signed-off-by: Thomas Abraham <thomas.abraham@linaro.org> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2012-05-15Merge branch 'next/cleanup-plat-s5p' into next/devel-exynos5250-1Kukjin Kim
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-14pinctrl: SPEAr1310: Fix pin numbers for clcd_high_resViresh Kumar
Signed-off-by: Viresh Kumar <viresh.kumar@st.com> Acked-by: Linus Walleij <linus.walleij@linaro.org>
2012-05-14SPEAr: Update MAINTAINERS and DocumentationViresh Kumar
This patchset updates MAINTAINERS files, makes shiraz as second Maintainer for SPEAr SoCs. It also updates Documentation mostly for SPEAr13xx. Signed-off-by: Viresh Kumar <viresh.kumar@st.com>
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-14pinctrl: SPEAr: Create macro for declaring GPIO PINSViresh Kumar
Same GPIO pins declarations would be required for other SoCs and that will be a lot of lines of code. Its better to create common macros for it. Signed-off-by: Viresh Kumar <viresh.kumar@st.com> Acked-by: Linus Walleij <linus.walleij@linaro.org>
2012-05-14SPEAr13xx: Add common clock framework supportViresh Kumar
This patch adds SPEAr1310 and SPEAr1340's clock framework support. It is based on earlier support for SPEAr3xx family. Signed-off-by: Viresh Kumar <viresh.kumar@st.com> Reviewed-by: Mike Turquette <mturquette@ti.com>
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>
2012-05-14Merge branch 'spear/dt' into spear/clockArnd Bergmann
Conflicts: arch/arm/mach-spear3xx/clock.c arch/arm/mach-spear3xx/include/mach/generic.h arch/arm/mach-spear3xx/include/mach/misc_regs.h arch/arm/mach-spear3xx/spear320.c arch/arm/mach-spear6xx/clock.c arch/arm/mach-spear6xx/include/mach/misc_regs.h Resolve even more merge conflicts. Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2012-05-15ARM: EXYNOS: Support Suspend/Resume for EXYNOS4412Inderpal Singh
This patch provides the suspend/resume support for EXYNOS4412. Signed-off-by: Inderpal Singh <inderpal.singh@linaro.org> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2012-05-14Merge branch 'spear/pinctrl' into spear/clockArnd Bergmann
Conflicts: arch/arm/mach-spear3xx/Makefile arch/arm/mach-spear3xx/clock.c arch/arm/mach-spear3xx/include/mach/generic.h arch/arm/mach-spear6xx/clock.c arch/arm/plat-spear/Makefile drivers/pinctrl/core.c This resolves some annoying merge conflicts. Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2012-05-14Merge branch 'next/devel-s3c24xx-hsspi' into next/devel-samsungKukjin Kim
2012-05-14ARM: EXYNOS: To use common config for EXYNOS4 and EXYNOS5 SPIKyoungil Kim
The naming EXYNOS4 is changed to EXYNOS for using shared SPI config of EXYNOS4 and EXYNOS5. And S3C64XX_DEV_SPIn configs are added to MACH_SMDK5250 config to use SPI on the EYXNOS5250. Signed-off-by: Kyoungil Kim <ki0351.kim@samsung.com> [kgene.kim@samsung.com: updated because of non-existing config] Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2012-05-12Linux 3.4-rc7v3.4-rc7Linus Torvalds
.. and this should hopefully be the last -rc before final 3.4 release.
2012-05-12Merge tag 'fixes-for-linus' of ↵Linus Torvalds
git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc Pull ARM: SoC fixes from Olof Johansson: "I was hoping to be done with fixes for 3.4 but we got two branches from subarch maintainers the last couple of days. So here is one last(?) pull request for arm-soc containing 7 patches: - Five of them are for shmobile dealing with SMP setup and compile failures - The remaining two are for regressions on the Samsung platforms" * tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: ARM: EXYNOS: fix ctrlbit for exynos5_clk_pdma1 ARM: EXYNOS: use s5p-timer for UniversalC210 board ARM / mach-shmobile: Invalidate caches when booting secondary cores ARM / mach-shmobile: sh73a0 SMP TWD boot regression fix ARM / mach-shmobile: r8a7779 SMP TWD boot regression fix ARM: mach-shmobile: convert ag5evm to use the generic MMC GPIO hotplug helper ARM: mach-shmobile: convert mackerel to use the generic MMC GPIO hotplug helper
2012-05-12Merge tag 'gpio-for-linus' of git://git.secretlab.ca/git/linux-2.6Linus Torvalds
Pull a few more GPIO bug fixes from Grant Likely: "Oops, missed a couple. Here's an updated pull req for GPIO" A set of PCH bug fixes, and one patch to fix up compile warnings * tag 'gpio-for-linus' of git://git.secretlab.ca/git/linux-2.6: gpio/exynos: Fix compiler warnings when non-exynos machines are selected gpio: pch9: Use proper flow type handlers
2012-05-13ARM: EXYNOS: Support DMA for EXYNOS5250 SoCBoojin Kim
mach-exynos/dma.c is updated to support both exynos4 and exynos5. Signed-off-by: Boojin Kim <boojin.kim@samsung.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2012-05-13ARM: SAMSUNG: merge plat-s5p into plat-samsungKukjin Kim
Since just plat-samsung can support all of Samsung stuff so that there is no more need to keep the plat-s5p for S5P SoCs. Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2012-05-12Merge branch 'v3.4-samsung-fixes-5' of ↵Olof Johansson
git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into fixes * 'v3.4-samsung-fixes-5' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung: ARM: EXYNOS: fix ctrlbit for exynos5_clk_pdma1 ARM: EXYNOS: use s5p-timer for UniversalC210 board
2012-05-13ARM: EXYNOS: fix ctrlbit for exynos5_clk_pdma1Kukjin Kim
It should be (1 << 2) for ctrlbit of exynos5_clk_pdma1. Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2012-05-13ARM: EXYNOS: use s5p-timer for UniversalC210 boardMarek Szyprowski
Commit 069d4e743 ("ARM: EXYNOS4: Remove clock event timers using ARM private timers") removed support for local timers and forced to use MCT as event source. However MCT is not operating properly on early revision of EXYNOS4 SoCs. All UniversalC210 boards are based on it, so that commit broke support for it. This patch provides a workaround that enables UniversalC210 boards to boot again. s5p-timer is used as an event source, it works only for non-SMP builds. Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2012-05-12Merge branch 'fixes' of ↵Olof Johansson
git://git.kernel.org/pub/scm/linux/kernel/git/rafael/renesas into fixes By Guennadi Liakhovetski (2) and others via Rafael J. Wysocki: "[...] urgent fixes for Renesas ARM-based platforms. Four of these commits are fixes of regressions new in 3.4-rc and the last one is necessary for SMP to work on those systems in general." * 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/renesas: ARM / mach-shmobile: Invalidate caches when booting secondary cores ARM / mach-shmobile: sh73a0 SMP TWD boot regression fix ARM / mach-shmobile: r8a7779 SMP TWD boot regression fix ARM: mach-shmobile: convert ag5evm to use the generic MMC GPIO hotplug helper ARM: mach-shmobile: convert mackerel to use the generic MMC GPIO hotplug helper
2012-05-13ARM: SAMSUNG: move options for common s5p into plat-samsung/KconfigKukjin Kim
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2012-05-13ARM: SAMSUNG: move setup code for s5p mfc and mipiphy into plat-samsungKukjin Kim
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2012-05-13ARM: SAMSUNG: move platform device for s5p uart into plat-samsungKukjin Kim
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2012-05-13ARM: SAMSUNG: move hr timer for common s5p into plat-samsungKukjin Kim
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2012-05-13ARM: SAMSUNG: move pm part for common s5p into plat-samsungKukjin Kim
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2012-05-13ARM: SAMSUNG: move interrupt part for common s5p into plat-samsungKukjin Kim
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2012-05-13ARM: SAMSUNG: move clock part for common s5p into plat-samsungKukjin Kim
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2012-05-12ARM / mach-shmobile: Invalidate caches when booting secondary coresMagnus Damm
Make sure L1 caches are invalidated when booting secondary cores. Needed to boot all mach-shmobile SMP systems that are using Cortex-A9 including sh73a0, r8a7779 and EMEV2. Thanks to imx and tegra guys for actual code. Signed-off-by: Magnus Damm <damm@opensource.se> Tested-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2025-03-02 22:30:43 +0000