Eric Lee / smarc-fsl-linux-kernel

10 Jan, 2012

2 commits

  • 6d889d03a   Merge tag 'boards' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc ... Browse Code »

    Board-level changes

    This adds and extends support for specific boards on a number of
    ARM platforms: omap, imx, samsung, tegra, ...

    * tag 'boards' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (49 commits)
    Enable 32 bit flash support for iMX21ADS board
    ARM: mx31pdk: Add MC13783 RTC support
    iomux-mx25: configuration to support CSPI3 on CSI pins
    MX1:apf9328: Add i2c support
    mioa701: add newly available DoC G3 chip
    arm/tegra: remove __initdata annotation from pinmux tables
    arm/tegra: Use bus notifiers to trigger pinmux setup
    arm/tegra: Refactor board-*-pinmux.c to share code
    arm/tegra: Fix mistake in Trimslice's pinmux
    arm/tegra: Rework Seaboard-vs-Ventana pinmux table
    arm/tegra: Remove useless entries from ventana_pinmux[]
    arm/tegra: PCIe: Remove include of mach/pinmux.h
    arm/tegra: Harmony PCIe: Don't touch pinmux
    arm/tegra: Add AUXDATA for tegra-pinmux and tegra-gpio
    arm/tegra: Split Seaboard GPIO table to allow for Ventana
    ARM: imx6q: generate imx6q dtb files
    arm/imx6q: Rename Sabreauto to Armadillo2
    arm/imx6q-sabrelite: add enet phy ksz9021rn fixup
    arm/imx6: add imx6q sabrelite board support
    dts/imx: rename uart labels to consistent with hw spec
    ...

    Linus Torvalds
     
  • 421b759b8   Merge branch 'samsung/cleanup' into next/boards ... Browse Code »

    Conflicts:
    arch/arm/mach-imx/mach-imx6q.c
    arch/arm/mach-omap2/board-ti8168evm.c
    arch/arm/mach-s3c64xx/Kconfig
    arch/arm/mach-tegra/Makefile
    arch/arm/mach-tegra/board-dt-tegra20.c
    arch/arm/mach-tegra/common.c

    Lots of relatively simple conflicts between the board
    changes and stuff from the arm tree. This pulls in
    the resolution from the samsung/cleanup tree, so we
    don't get conflicting merges.

    Signed-off-by: Arnd Bergmann

    Arnd Bergmann
     

08 Jan, 2012

1 commit

07 Jan, 2012

1 commit

28 Dec, 2011

1 commit

  • e195ffbe4   Merge branch 'tegra/soc' into next/soc ... Browse Code »

    * tegra/soc:
    arm/tegra: Compile tegra_dt_init_irq only when CONFIG_OF
    arm/tegra: Make MACH_TEGRA_DT depend on ARCH_TEGRA_2x_SOC
    arm/tegra: Delete tegra_init_clock()
    arm/tegra: Fix section mismatch errors in tegra30 pinmux
    arm/tegra: Fix section mismatch errors in tegra20 pinmux
    arm/tegra: refresh defconfig for tegra30
    arm/tegra: add support for tegra30 based board cardhu
    arm/tegra: implement support for tegra30
    arm/tegra: pinmux tables and definitions for tegra30
    arm/tegra: add new fields to struct tegra_pingroup_desc
    arm/tegra: prepare pinmux code for multiple tegra variants
    arm/tegra: rename tegra20 pinmux files
    arm/tegra: generalize L2 cache initialization
    arm/tegra: use PMC reset
    arm/tegra: rename board-dt.c to board-dt-tegra20.c
    arm/tegra: prepare early init for multiple tegra variants
    arm/tegra: don't export clk_measure_input_freq
    arm/tegra: prepare clock code for multiple tegra variants
    arm/tegra: cleanup tegra20 support
    arm/tegra: clk_get should not be fatal

    Conflicts:
    arch/arm/mach-tegra/board-dt-tegra20.c

    Arnd Bergmann
     

18 Dec, 2011

1 commit

  • a2385dc50   arm/tegra: rename board-dt.c to board-dt-tegra20.c ... Browse Code »

    Tegra20 based boards will be handled by the current board-dt.c file. Tegra30
    based boards will be handled by a new board-dt-tegra30.c file. Hence rename
    the existing board-dt.c to board-dt-tegra20.c to reflect its use.

    Signed-off-by: Peter De Schrijver
    Acked-by: Stephen Warren
    Acked-by: Colin Cross
    Signed-off-by: Olof Johansson

    Peter De Schrijver