1. 31 May, 2014 2 commits
    • Olof Johansson's avatar
      Merge tag 'samsung-drivers-2' of... · 45e70b7d
      Olof Johansson authored
      Merge tag 'samsung-drivers-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/drivers
      
      Merge "Samsung 2nd drivers for 3.16" from Kukjin Kim:
      
      This is including fix exynos cpufreq driver compilation with
      ARCH_MULTIPLATFORM. Even though this is a work around, this
      is required for support exynos multiplatform for a while and
      will be updated in near future.
      
      This is based on tags/samsung-exynos.
      
      * tag 'samsung-drivers-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung: (24 commits)
        cpufreq: exynos: Fix driver compilation with ARCH_MULTIPLATFORM
        ARM: EXYNOS: Enable multi-platform build support
        ARM: EXYNOS: Consolidate Kconfig entries
        ARM: EXYNOS: Add support for EXYNOS5410 SoC
        ARM: EXYNOS: Support secondary CPU boot of Exynos3250
        ARM: EXYNOS: Add Exynos3250 SoC ID
        ARM: EXYNOS: Add 5800 SoC support
        ARM: EXYNOS: initial board support for exynos5260 SoC
        clk: exynos5250: Add missing sysmmu clocks for DISP and ISP blocks
        cpufreq: exynos: Fix the compile error
        ARM: S3C24XX: move debug-macro.S into the common space
        ARM: S3C24XX: use generic DEBUG_UART_PHY/_VIRT in debug macro
        ARM: S3C24XX: trim down debug uart handling
        ARM: compressed/head.S: remove s3c24xx special case
        ARM: EXYNOS: Remove unnecessary inclusion of cpu.h
        ARM: EXYNOS: Migrate Exynos specific macros from plat to mach
        ARM: EXYNOS: Remove exynos_subsys registration
        ARM: EXYNOS: Remove duplicate lines in Makefile
        ARM: EXYNOS: use v7_exit_coherency_flush macro for cache disabling
        ARM: dts: Remove g2d_pd node for exynos5420
        ...
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      45e70b7d
    • Olof Johansson's avatar
      Merge tag 'qcom-drivers-for-3.16-2' of... · b5de1ce0
      Olof Johansson authored
      Merge tag 'qcom-drivers-for-3.16-2' of git://git.kernel.org/pub/scm/linux/kernel/git/galak/linux-qcom into next/drivers
      
      Merge "Qualcomm ARM Based driver Updates for v3.16-2" from Kumar Gala:
      
      * Updated MSM uart driver to not access GSBI control registers
      
      * tag 'qcom-drivers-for-3.16-2' of git://git.kernel.org/pub/scm/linux/kernel/git/galak/linux-qcom:
        tty: serial: msm: Remove direct access to GSBI
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      b5de1ce0
  2. 30 May, 2014 9 commits
  3. 29 May, 2014 2 commits
    • Olof Johansson's avatar
      Merge tag 'exynos-cpuidle' of... · 182434f7
      Olof Johansson authored
      Merge tag 'exynos-cpuidle' of http://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/drivers
      
      Merge "Samsung exynos-cpuidle updates for v3.16" from Kukjin Kim:
      
      - From Daniel Lezcano:
       This patchset relies on the cpm_pm notifier to initiate the
       powerdown sequence operations from pm.c instead cpuidle.c.
       Thus the cpuidle driver is no longer dependent from arch
       specific code as everything is called from the pm.c file.
      
      * tag 'exynos-cpuidle' of http://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung: (94 commits)
        ARM: EXYNOS: Fix kernel panic when unplugging CPU1 on exynos
        ARM: EXYNOS: Move the driver to drivers/cpuidle directory
        ARM: EXYNOS: Cleanup all unneeded headers from cpuidle.c
        ARM: EXYNOS: Pass the AFTR callback to the platform_data
        ARM: EXYNOS: Move S5P_CHECK_SLEEP into pm.c
        ARM: EXYNOS: Move the power sequence call in the cpu_pm notifier
        ARM: EXYNOS: Move the AFTR state function into pm.c
        ARM: EXYNOS: Encapsulate the AFTR code into a function
        ARM: EXYNOS: Disable cpuidle for exynos5440
        ARM: EXYNOS: Encapsulate boot vector code into a function for cpuidle
        ARM: EXYNOS: Pass wakeup mask parameter to function for cpuidle
        ARM: EXYNOS: Remove ifdef for scu_enable in pm
        ARM: EXYNOS: Move scu_enable in the cpu_pm notifier
        ARM: EXYNOS: Use the cpu_pm notifier for pm
        ARM: EXYNOS: Fix S5P_WAKEUP_STAT call for cpuidle
        ARM: EXYNOS: Move some code inside the idle_finisher for cpuidle
        ARM: EXYNOS: Encapsulate register access inside a function for pm
        ARM: EXYNOS: Change function name prefix for cpuidle
        ARM: EXYNOS: Use cpuidle_register
        ARM: EXYNOS: Prevent forward declaration for cpuidle
        ...
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      182434f7
    • Andy Gross's avatar
      tty: serial: msm: Remove direct access to GSBI · 31964ffe
      Andy Gross authored
      This patch removes direct access of the GSBI registers.  GSBI configuration
      should be done through the GSBI driver directly.
      Signed-off-by: default avatarAndy Gross <agross@codeaurora.org>
      Signed-off-by: default avatarKumar Gala <galak@codeaurora.org>
      31964ffe
  4. 27 May, 2014 4 commits
  5. 26 May, 2014 4 commits
    • Olof Johansson's avatar
      Merge tag 'davinci-for-v3.16/edma' of... · 3a5e23cf
      Olof Johansson authored
      Merge tag 'davinci-for-v3.16/edma' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci into next/drivers
      
      Merge "DaVinci EDMA clean-up for v3.16" from Sekhar Nori:
      
      This series makes edma use configuration information available within
      the IP instead of reading it from platform data or DT. Some other useful
      clean-ups are included too.
      
      * tag 'davinci-for-v3.16/edma' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci: (34 commits)
        ARM: edma: Remove redundant/unused parameters from edma_soc_info
        ARM: davinci: Remove redundant/unused parameters for edma
        ARM: dts: am4372: Remove obsolete properties from edma node
        ARM: dts: am33xx: Remove obsolete properties from edma node
        dt/bindings: ti,edma: Remove redundant properties from documentation
        ARM: edma: Get IP configuration from HW (number of channels, tc, etc)
        ARM: edma: Save number of regions from pdata to struct edma
        ARM: edma: Remove num_cc member from struct edma
        ARM: edma: Remove queue_tc_mapping data from edma_soc_info
        ARM: davinci: Remove eDMA3 queue_tc_mapping data from edma_soc_info
        ARM: edma: Do not change TC -> Queue mapping, leave it to default.
        ARM: edma: Take the number of tc from edma_soc_info (pdata)
        ARM: edma: No need to clean the pdata in edma_of_parse_dt()
        ARM: edma: Clean up and simplify the code around irq request
        dmaengine: edma: update DMA memcpy to use new param element
        dmaengine: edma: Document variables used for residue accounting
        dmaengine: edma: Provide granular accounting
        dmaengine: edma: Make reading the position of active channels work
        dmaengine: edma: Store transfer data in edma_desc and edma_pset
        dmaengine: edma: Create private pset struct
        ...
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      3a5e23cf
    • Olof Johansson's avatar
      Merge tag 'davinci-fixes-for-v3.15-rc4' of... · 7741fa19
      Olof Johansson authored
      Merge tag 'davinci-fixes-for-v3.15-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci into next/drivers
      
      The patch fixes EDMA crossbar mapping to actually
      make it work. The patch has been tagged for stable.
      
      * tag 'davinci-fixes-for-v3.15-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci:
        ARM: common: edma: Fix xbar mapping
      7741fa19
    • Olof Johansson's avatar
      Merge tag 'omap-for-v3.16/l3-noc-signed' of... · 75d6bc5f
      Olof Johansson authored
      Merge tag 'omap-for-v3.16/l3-noc-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/drivers
      
      Merge "ARM: omap l3-noc bus driver changes for v3.16 merge window, resend" from
      Tony Lindgren:
      
      Improvments to omap l3-noc bus driver for v3.16 merge window
      to add support for am347x and dra7.
      
      * tag 'omap-for-v3.16/l3-noc-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: (25 commits)
        bus: omap_l3_noc: Add AM4372 interconnect error data
        bus: omap_l3_noc: Add DRA7 interconnect error data
        bus: omap_l3_noc: introduce concept of submodule
        bus: omap_l3_noc: Add information about the context of operation
        bus: omap_l3_noc: add information about the type of operation
        bus: omap_l3_noc: ignore masked out unclearable targets
        bus: omap_l3_noc: improve readability by using helper for slave event parsing
        bus: omap_l3_noc: make error reporting and handling common
        bus: omap_l3_noc: fix masterid detection
        bus: omap_l3_noc: convert flagmux information into a structure
        bus: omap_l3_noc: use of_match_data to pick up SoC information
        bus: omap_l3_noc: Add support for discountinous flag mux input numbers
        bus: omap_l3_noc: convert target information into a structure
        bus: omap_l3_noc: move L3 master data structure out
        bus: omap_l3_noc: un-obfuscate l3_targ address computation
        bus: omap_l3_noc: switch over to relaxed variants of readl/writel
        bus: omap_l3_noc: populate l3->dev and use it
        bus: omap_l3_noc: remove iclk from omap_l3 struct
        bus: omap_l3_noc: rename functions and data to omap_l3
        bus: omap_l3_noc: Fix copyright information
        ...
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      75d6bc5f
    • Arnd Bergmann's avatar
      soc: qcom: fix of_device_id table · 1b7f0c7b
      Arnd Bergmann authored
      The match tables must be zero-terminated, and Kbuild now helpfully
      fails to link the kernel if that isn't the case.
      Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      1b7f0c7b
  6. 25 May, 2014 19 commits