1. 18 2月, 2015 5 次提交
    • L
      Merge tag 'dt-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · a233bb74
      Linus Torvalds 提交于
      Pull ARM SoC DT updates from Olof Johansson:
       "DT changes continue to be the bulk of our merge window contents.
      
        We continue to have a large set of changes across the board as new
        platforms and drivers are added.
      
        Some of the new platforms are:
         - Alphascale ASM9260
         - Marvell Armada 388
         - CSR Atlas7
         - TI Davinci DM816x
         - Hisilicon HiP01
         - ST STiH418
      
        There have also been some sweeping changes, including relicensing of
        DTS contents from GPL to GPLv2+/X11 so that the same files can be
        reused in other non-GPL projects more easily.  There's also been
        changes to the DT Makefile to make it a little less conflict-ridden
        and churny down the road"
      
      * tag 'dt-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (330 commits)
        ARM: dts: Add PPMU node for exynos4412-trats2
        ARM: dts: Add PPMU node for exynos3250-monk and exynos3250-rinato
        ARM: dts: Add PPMU dt node for exynos4 and exynos4210
        ARM: dts: Add PPMU dt node for exynos3250
        ARM: dts: add mipi dsi device node for exynos4415
        ARM: dts: add fimd device node for exynos4415
        ARM: dts: Add syscon phandle to the video-phy node for Exynos4
        ARM: dts: Add sound nodes for exynos4412-trats2
        ARM: dts: Fix CLK_MOUT_CAMn parent clocks assignment for exynos4412-trats2
        ARM: dts: Fix CLK_UART_ISP_SCLK clock assignment in exynos4x12.dtsi
        ARM: dts: Add max77693 charger node for exynos4412-trats2
        ARM: dts: Switch max77686 regulators to GPIO control for exynos4412-trats2
        ARM: dts: Add suspend configuration for max77686 regulators for exynos4412-trats2
        ARM: dts: Add Maxim 77693 fuel gauge node for exynos4412-trats2
        ARM: dts: am57xx-beagle-x15: Fix USB2 mode
        ARM: dts: am57xx-beagle-x15: Add extcon nodes for USB
        ARM: dts: dra72-evm: Add extcon nodes for USB
        ARM: dts: dra7-evm: Add extcon nodes for USB
        ARM: dts: rockchip: move the hdmi ddc-i2c-bus property to the actual boards
        ARM: dts: rockchip: enable vops and hdmi output on rk3288-firefly and -evb
        ...
      a233bb74
    • L
      Merge tag 'soc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · 878ba61a
      Linus Torvalds 提交于
      Pull ARM SoC platform changes from Olof Johansson:
       "New and updated SoC support.  Also included are some cleanups where
        the platform maintainers hadn't separated cleanups from new developent
        in separate branches.
      
        Some of the larger things worth pointing out:
      
         - A large set of changes from Alexandre Belloni and Nicolas Ferre
           preparing at91 platforms for multiplatform and cleaning up quite a
           bit in the process.
      
         - Removal of CSR's "Marco" SoC platform that never made it out to the
           market.  We love seeing these since it means the vendor published
           support before product was out, which is exactly what we want!
      
        New platforms this release are:
      
         - Conexant Digicolor (CX92755 SoC)
         - Hisilicon HiP01 SoC
         - CSR/sirf Atlas7 SoC
         - ST STiH418 SoC
         - Common code changes for Nvidia Tegra132 (64-bit SoC)
      
        We're seeing more and more platforms having a harder time labelling
        changes as cleanups vs new development -- which is a good sign that
        we've come quite far on the cleanup effort.  So over time we might
        start combining the cleanup and new-development branches more"
      
      * tag 'soc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (124 commits)
        ARM: at91/trivial: unify functions and machine names
        ARM: at91: remove at91_dt_initialize and machine init_early()
        ARM: at91: change board files into SoC files
        ARM: at91: remove at91_boot_soc
        ARM: at91: move alternative initial mapping to board-dt-sama5.c
        ARM: at91: merge all SOC_AT91SAM9xxx
        ARM: at91: at91rm9200: set idle and restart from rm9200_dt_device_init()
        ARM: digicolor: select syscon and timer
        ARM: zynq: Simplify SLCR initialization
        ARM: zynq: PM: Fixed simple typo.
        ARM: zynq: Setup default gpio number for Xilinx Zynq
        ARM: digicolor: add low level debug support
        ARM: initial support for Conexant Digicolor CX92755 SoC
        ARM: OMAP2+: Add dm816x hwmod support
        ARM: OMAP2+: Add clock domain support for dm816x
        ARM: OMAP2+: Add board-generic.c entry for ti81xx
        ARM: at91: pm: remove warning to remove SOC_AT91SAM9263 usage
        ARM: at91: remove unused mach/system_rev.h
        ARM: at91: stop using HAVE_AT91_DBGUx
        ARM: at91: fix ordering of SRAM and PM initialization
        ...
      878ba61a
    • L
      Merge tag 'cleanup-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · ea7531ac
      Linus Torvalds 提交于
      Pull ARM SoC cleanups from Olof Johansson:
       "This is a good healthy set of various code removals.  Total net delta
        is 8100 lines removed.
      
        Among the larger cleanups are:
      
         - Removal of old Samsung S3C DMA infrastructure by Arnd
         - Removal of the non-DT version of the 'lager' board by Magnus Damm
         - General stale code removal on OMAP and Davinci by Rickard Strandqvist
         - Removal of non-DT support on am3517 platforms by Tony Lindgren
      
        ... plus several other cleanups of various platforms across the board"
      
      * tag 'cleanup-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (47 commits)
        ARM: sirf: drop redundant function and marco declaration
        arm: omap: specify PMUs are for ARMv7 CPUs
        arm: shmobile: specify PMUs are for ARMv7 CPUs
        arm: iop: specify PMUs are for XScale CPUs
        arm: pxa: specify PMUs are for XScale CPUs
        arm: realview: specify PMU types
        ARM: SAMSUNG: remove unused DMA infrastructure
        ARM: OMAP3: Add back Kconfig option MACH_OMAP3517EVM for ASoC
        ARM: davinci: Remove CDCE949 driver
        ARM: at91: remove useless at91rm9200_set_type()
        ARM: at91: remove useless at91rm9200_dt_initialize()
        ARM: at91: move debug-macro.S into the common space
        ARM: at91: remove useless at91_sysirq_mask_rtx
        ARM: at91: remove useless config MACH_AT91SAM9_DT
        ARM: at91: remove useless config MACH_AT91RM9200_DT
        ARM: at91: remove unused mach/memory.h
        ARM: at91: remove useless header file includes
        ARM: at91: remove unneeded header file
        rtc: at91/Kconfig: remove useless options
        ARM: at91/Documentation: add a README for Atmel SoCs
        ...
      ea7531ac
    • L
      Merge tag 'fixes-non-critical-for-linus' of... · 4025fa97
      Linus Torvalds 提交于
      Merge tag 'fixes-non-critical-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
      
      Pull ARM SoC non-critical fixes from Olof Johansson:
       "Here's a small collection of fixes accrued during the last release
        that weren't considered severe enough to merge during the -rc series.
      
        A few of these are around resurrecting TI81xx support that's been
        broken for quite a while, the rest are smaller fixes -- most for PXA
        but a few across the board.
      
        There are also some updates to MAINTAINERS here, in particular for
        Broadcom platforms"
      
      * tag 'fixes-non-critical-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (23 commits)
        MAINTAINERS: fix git repositories for Broadcom SoCs
        ARM: pxa: fix broken isa interrupts for zeus and viper
        ARM: DRA7: hwmod: Fix boot crash with DEBUG_LL enabled on UART3
        ARM: OMAP: DRA7: hwmod: Make gpmc software supervised as the smart idle is broken
        ARM: AM43xx: hwmod: set DSS submodule parent hwmods
        ARM: OMAP2+: hwmod: print error if wait_target_ready() failed
        MAINTAINERS: add maintainer for OMAP hwmod data
        ARM: OMAP2+: Disable omap3 PM init for ti81xx
        ARM: OMAP2+: Fix reboot for 81xx
        ARM: OMAP2+: Fix dm814 and dm816 for clocks and timer init
        ARM: OMAP2+: Fix ti81xx class type
        ARM: OMAP2+: Fix ti81xx devtype
        ARM: OMAP2+: Fix error handling for omap2_clk_enable_init_clocks
        MAINTAINERS: add a git entry for BMIPS-based BCM7xxx SoCs
        MAINTAINERS: add a git entry for BCM7xxx ARM-based SoCs
        MAINTAINERS: update Broadcom Cygnus SoC git tree
        MAINTAINERS: move BCM63xx ARM-based SoCs git tree
        hx4700: regulator: declare full constraints
        ARM: pxa: add regulator_has_full_constraints to spitz board file
        ARM: pxa: add regulator_has_full_constraints to poodle board file
        ...
      4025fa97
    • L
      Merge branch 'akpm' (patches from Andrew) · c397f8fa
      Linus Torvalds 提交于
      Merge fifth set of updates from Andrew Morton:
      
       - A few things which were awaiting merges from linux-next:
           - rtc
           - ocfs2
           - misc others
      
       - Willy's "dax" feature: direct fs access to memory (mainly NV-DIMMs)
         which isn't backed by pageframes.
      
      * emailed patches from Andrew Morton <akpm@linux-foundation.org>: (37 commits)
        rtc: add driver for DS1685 family of real time clocks
        MAINTAINERS: add entry for Maxim PMICs on Samsung boards
        lib/Kconfig: use bool instead of boolean
        powerpc: drop _PAGE_FILE and pte_file()-related helpers
        ocfs2: set append dio as a ro compat feature
        ocfs2: wait for orphan recovery first once append O_DIRECT write crash
        ocfs2: complete the rest request through buffer io
        ocfs2: do not fallback to buffer I/O write if appending
        ocfs2: allocate blocks in ocfs2_direct_IO_get_blocks
        ocfs2: implement ocfs2_direct_IO_write
        ocfs2: add orphan recovery types in ocfs2_recover_orphans
        ocfs2: add functions to add and remove inode in orphan dir
        ocfs2: prepare some interfaces used in append direct io
        MAINTAINERS: fix spelling mistake & remove trailing WS
        dax: does not work correctly with virtual aliasing caches
        brd: rename XIP to DAX
        ext4: add DAX functionality
        dax: add dax_zero_page_range
        ext2: get rid of most mentions of XIP in ext2
        ext2: remove ext2_aops_xip
        ...
      c397f8fa
  2. 17 2月, 2015 35 次提交