Skip to content

L
linux
Switch branch/tag
  1. 30 Apr, 2013 1 commit
    • Mark Brown's avatar
      mmc: sdhci-s3c: Fix operation on non-single image Samsung platforms · 2fdfe1c2
      Mark Brown authored 
      Commit cc014f3e (mmc: sdhci-s3c: remove platform dependencies) changed
the platform dependency in Kconfig to depend on SAMSUNG_SINGLE, meaning
the driver was available only on single zImage Samsung platforms.  This
breaks platforms that haven't been converted such as S3C64xx.  Revert
that part of the change to fix.

[arnd: CONFIG_SAMSUNG_SINGLE was actually introduced only for
non-multiplatform configurations, but was subsequently removed,
which means the driver was now broken both for single- and multi-
platform. The dependency was there by accident anyway, so reverting
this is still the correct solution]
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      2fdfe1c2
  3. 28 Apr, 2013 1 commit
    • Olof Johansson's avatar
      Merge branch 'clksrc/cleanup' into next/multiplatform · 6604269d
      Olof Johansson authored 
      Merge in the clksrc/cleanup branch to avoid a silly merge conflict. For
some reason two versions of the same patch were merged in two
branches. Resolve this here to avoid merge conflicts down the road,
since it can be confusing to tell which version is the one to keep.

* clksrc/cleanup:
  clocksource: make CLOCKSOURCE_OF_DECLARE type safe
Signed-off-by: default avatarOlof Johansson <olof@lixom.net>

Conflicts:
	include/linux/clocksource.h
      6604269d
  5. 27 Apr, 2013 1 commit
  7. 26 Apr, 2013 2 commits
  9. 19 Apr, 2013 11 commits
    • Paul Bolle's avatar
      ARM: SPEAr13xx: Fix typo "ARCH_HAVE_CPUFREQ" · f1981472
      Paul Bolle authored 
      Do what commit f12a500e
("ARM: SPEAr13xx: Enable CONFIG_ARCH_HAS_CPUFREQ") wanted to do.

[arnd: fix botched merge from changing the Kconfig file]
Signed-off-by: default avatarPaul Bolle <pebolle@tiscali.nl>
Acked-by: default avatarViresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      f1981472
    • Arnd Bergmann's avatar
      Merge branch 'samsung/exynos-multiplatform' into next/multiplatform · 56b69048
      Arnd Bergmann authored 
      These patches get us closer to adding multiplatform support on
the Exynos platform, they are part of a longer series of
patches.  This would get all the simple stuff out of the
way, and I don't think there is a big risk of introducing
regressions with these.

A lot of the other patches have already been merged into
subsystem trees. After this series in in arm-soc, what is
left comes down to

* The ASoC conversion to dmaengine won't make it unless someone
  who knows that code better steps up to do it right away. This
  means that we won't have audio in a 3.10 multiplatform kernel
  on Exynos, but it will still work for users that don't enable
  multiplatform.

* The irqchip (combiner), clk and clksource patches are all based
  on top   of other changesets we pulled in from your trees, so I
  would not make them part of the next/multiplatform branch. We can
  apply them on top of the next/drivers branch once they are
  tested successfully.

* A trivial patch is needed in the end to actually make
  CONFIG_ARCH_EXYNOS visible in multiplatform configurations.
  We will do that as a separate patch once everything else is
  there.
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      56b69048
    • Arnd Bergmann's avatar
      ARM: exynos: enable multiplatform support · bd51de53
      Arnd Bergmann authored 
      This makes it possible to enable the exynos platform as part of a
multiplatform kernel, in addition to keeping the single-platform
exynos support.

The multiplatform variant has a number of limitations at the moment:

* It only supports DT-enabled machines. This is not a problem in
  the long run, as non-DT machines for exynos are going away.
  The main problem here is that the gpio code and the exynos_eint
  irqchip are not multiplatform capable but still required for
  ATAGS based boot.
* The watchdog driver is still missing a conversion.
* sparsemem and memory_holes are currently not supported in
  multiplatform.

The the multiplatform aware ARCH_EXYNOS Kconfig symbol is disabled
for now, as dependent patches are still pending in other
subsystem trees. We will enable it once everything comes together.
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      bd51de53
    • Arnd Bergmann's avatar
      rtc: s3c: make header file local · b9d7c5d3
      Arnd Bergmann authored 
      Nothing outside of the rtc driver includes plat/regs-rtc.h,
so we can simply move the file into the same directory,
which allows us to build the file as platform-independent
code.
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Cc: rtc-linux@googlegroups.com
Cc: Alessandro Zummo <a.zummo@towertech.it>
      b9d7c5d3
    • Arnd Bergmann's avatar
      mtd: onenand/samsung: make regs-onenand.h file local · 93115b7f
      Arnd Bergmann authored 
      Nothing uses the NAND register definitions other than the
actual driver, so we can move the header file into the
same local directory, which lets us build it in a multiplatform
configuration.
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Acked-by: default avatarKyungmin Park <kyungmin.park@samsung.com>
Cc: linux-mtd@lists.infradead.org
Cc: David Woodhouse <dwmw2@infradead.org>
      93115b7f
    • Arnd Bergmann's avatar
      thermal/exynos: remove unnecessary header inclusions · 040f30f3
      Arnd Bergmann authored 
      In multiplatform configurations, we cannot include headers
provided by only the exynos platform. Fortunately a number
of drivers that include those headers do not actually need
them, so we can just remove the inclusions.
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Acked-by: default avatarEduardo Valentin <eduardo.valentin@ti.com>
Cc: Zhang Rui <rui.zhang@intel.com>
      040f30f3
    • Arnd Bergmann's avatar
      mmc: sdhci-s3c: remove platform dependencies · cc014f3e
      Arnd Bergmann authored 
      plat/regs-sdhci.h is not used anywhere but in the sdhci-s3c
driver, so it can become a local file there and all other
inclusions removed.

plat/sdhci.h is used only to define the platform devices,
and with the exception of the platform_data structure not
needed by the driver, so we can split out the platform_data
definition instead and leave the rest to platform code.
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Acked-by: default avatarChris Ball <cjb@laptop.org>
      cc014f3e
    • Arnd Bergmann's avatar
      ARM: samsung: move mfc device definition to s5p-dev-mfc.c · f76da510
      Arnd Bergmann authored 
      For a DT-only build we don't want to compile devs.c, but we do need
the mfc device, which is also referenced by the DT based platforms,
so move it all into one place.
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      f76da510
    • Arnd Bergmann's avatar
      ARM: exynos: move debug-macro.S to include/debug/ · a2e40710
      Arnd Bergmann authored 
      The move is necessary to support early debug output on exynos
with multiplatform configurations. This implies also moving the
plat/debug-macro.S file, but we are leaving the remaining users of that
file in place, to avoid adding large numbers of extra configuration
options to Kconfig.debug
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      a2e40710
    • Arnd Bergmann's avatar
      ARM: exynos: prepare for sparse IRQ · 7ba8022f
      Arnd Bergmann authored 
      When we enable CONFIG_SPARSE_IRQ, we have to set the value of NR_IRQS in
the machine_desc for legacy IRQ domains, and any file referring to the
number of interrupts or a specific number must include the mach/irqs.h
header file explicitly.
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      7ba8022f
    • Arnd Bergmann's avatar
      ARM: exynos: introduce EXYNOS_ATAGS symbol · b4cf27f7
      Arnd Bergmann authored 
      As a preparation for multiplatform support, this introduces
a new Kconfig symbol to split the ATAGS based EXYNOS platforms
from the DT based ones. Turning off CONFIG_EXYNOS_ATAGS disables
all platforms that are not yet converted to DT, and we can
have code that relies on DT checking for this symbol being
disabled.
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      b4cf27f7
  11. 09 Apr, 2013 9 commits
  13. 08 Apr, 2013 15 commits
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7