Eric Lee / smarc-fsl-linux-kernel

02 Dec, 2011

4 commits

24 Nov, 2011

1 commit

  • c2735391f   arm: mx28: fix bit operation in clock setting ... Browse Code »
    1

    reg | (1 << clk->enable_shift) always evaluates to true. Switch it
    to & which makes much more sense. Same fix as 13be9f00 (ARM i.MX28: fix
    bit operation) at a different location.

    Signed-off-by: Wolfram Sang
    Cc: Sascha Hauer
    Cc: Shawn Guo
    Signed-off-by: Shawn Guo
    Cc: stable@kernel.org
    Signed-off-by: Arnd Bergmann

    Wolfram Sang
     

08 Nov, 2011

1 commit

  • e94e05eae   arm/mxs: fix mmc device adding for mach-mx28evk ... Browse Code »

    The merge commit "526b264 Merge branch 'imx/cleanup' into imx/devel"
    left a duplicated mx28_add_mxs_mmc() call, which causes the problem
    below during boot.

    kobject_add_internal failed for mxs-mmc.1 with -EEXIST, don't try
    to register things with the same name in the same directory.

    The patch removes this leftover and also change mmc0 adding to align
    with mmc1.

    Signed-off-by: Shawn Guo

    Shawn Guo
     

02 Nov, 2011

5 commits

  • 6585dea1f   Merge branch 'next/cross-platform' of git://git.linaro.org/people/arnd/arm-soc ... Browse Code »

    * 'next/cross-platform' of git://git.linaro.org/people/arnd/arm-soc:
    arm/imx: use Kconfig choice for low-level debug UART selection
    ARM: realview: use Kconfig choice for debug UART selection
    ARM: plat-samsung: use Kconfig choice for debug UART selection
    ARM: versatile: convert logical CPU numbers to physical numbers
    ARM: ux500: convert logical CPU numbers to physical numbers
    ARM: shmobile: convert logical CPU numbers to physical numbers
    ARM: msm: convert logical CPU numbers to physical numbers
    ARM: exynos4: convert logical CPU numbers to physical numbers

    Fix up trivial conflict (config DEBUG_S3C_UART move/split vs addition of
    ARM_KPROBES_TEST option) in arch/arm/Kconfig.debug

    Linus Torvalds
     
  • 16ee792e4   Merge branch 'next/devel' of git://git.linaro.org/people/arnd/arm-soc ... Browse Code »

    * 'next/devel' of git://git.linaro.org/people/arnd/arm-soc: (50 commits)
    ARM: tegra: update defconfig
    arm/tegra: Harmony: Configure PMC for low-level interrupts
    arm/tegra: device tree support for ventana board
    arm/tegra: add support for ventana pinmuxing
    arm/tegra: prepare Seaboard pinmux code for derived boards
    arm/tegra: pinmux: ioremap registers
    gpio/tegra: Convert to a platform device
    arm/tegra: Convert pinmux driver to a platform device
    arm/dt: Tegra: Add pinmux node to tegra20.dtsi
    arm/tegra: Prep boards for gpio/pinmux conversion to pdevs
    ARM: mx5: fix clock usage for suspend
    ARM i.MX entry-macro.S: remove now unused code
    ARM i.MX boards: use CONFIG_MULTI_IRQ_HANDLER
    ARM i.MX tzic: add handle_irq function
    ARM i.MX avic: add handle_irq function
    ARM: mx25: Add the missing IIM base definition
    ARM i.MX avic: convert to use generic irq chip
    mx31moboard: Add poweroff support
    ARM: mach-qong: Add watchdog support
    ARM: davinci: AM18x: Add wl1271/wlan support
    ...

    Fix up conflicts in:
    arch/arm/mach-at91/at91sam9g45.c
    arch/arm/mach-mx5/devices-imx53.h
    arch/arm/plat-mxc/include/mach/memory.h

    Linus Torvalds
     
  • f906fb1d7   Merge branch 'next/board' of git://git.linaro.org/people/arnd/arm-soc ... Browse Code »

    * 'next/board' of git://git.linaro.org/people/arnd/arm-soc: (34 commits)
    ep93xx: add support Vision EP9307 SoM
    ARM: mxs: Add initial support for DENX MX28
    ARM: EXYNOS4: Add support SMDK4412 Board
    ARM: EXYNOS4: Add MCT support for EXYNOS4412
    ARM: EXYNOS4: Add functions for gic interrupt handling
    ARM: EXYNOS4: Add support clock for EXYNOS4412
    ARM: EXYNOS4: Add support new EXYNOS4412 SoC
    ARM: EXYNOS4: Add support MCT PPI for EXYNOS4212
    ARM: EXYNOS4: Add support PPI in external GIC
    ARM: EXYNOS4: convert boot_params to atag_offset
    ixp4xx: support omicron ixp425 based boards
    ARM: EXYNOS4: Add support SMDK4212 Board
    ARM: EXYNOS4: Add support PM for EXYNOS4212
    ARM: EXYNOS4: Add support clock for EXYNOS4212
    ARM: EXYNOS4: Add support new EXYNOS4212 SoC
    at91: USB-A9G20 C01 & C11 board support
    at91: merge board USB-A9260 and USB-A9263 together
    at91: add support for RSIs EWS board
    ARM: SAMSUNG: Fix mask value for S5P64X0 CPU IDs
    ARM: SAMSUNG: Fix mask for S3C64xx CPU IDs
    ...

    Linus Torvalds
     
  • 952414505   Merge branch 'next/cleanup' of git://git.linaro.org/people/arnd/arm-soc ... Browse Code »

    * 'next/cleanup' of git://git.linaro.org/people/arnd/arm-soc: (125 commits)
    ARM: mach-mxs: fix machines' initializers order
    mmc: mxcmmc: explicitly includes mach/hardware.h
    arm/imx: explicitly includes mach/hardware.h in pm-imx27.c
    arm/imx: remove mx27_setup_weimcs() from mx27.h
    arm/imx: explicitly includes mach/hardware.h in mach-kzm_arm11_01.c
    arm/imx: remove mx31_setup_weimcs() from mx31.h
    ARM: tegra: devices.c should include devices.h
    ARM: tegra: cpu-tegra: unexport two functions
    ARM: tegra: cpu-tegra: sparse type fix
    ARM: tegra: dma: staticify some tables and functions
    ARM: tegra: tegra2_clocks: don't export some tables
    ARM: tegra: tegra_powergate_is_powered should be static
    ARM: tegra: tegra_rtc_read_ms should be static
    ARM: tegra: tegra_init_cache should be static
    ARM: tegra: pcie: 0 -> NULL changes
    ARM: tegra: pcie: include board.h
    ARM: tegra: pcie: don't cast __iomem pointers
    ARM: tegra: tegra2_clocks: 0 -> NULL changes
    ARM: tegra: tegra2_clocks: don't cast __iomem pointers
    ARM: tegra: timer: don't cast __iomem pointers
    ...

    Fix up trivial conflicts in
    arch/arm/mach-omap2/Makefile,
    arch/arm/mach-u300/{Makefile.boot,core.c}
    arch/arm/plat-{mxc,omap}/devices.c

    Linus Torvalds
     
  • 68e24ba70   Merge branch 'next/fixes' of git://git.linaro.org/people/arnd/arm-soc ... Browse Code »

    * 'next/fixes' of git://git.linaro.org/people/arnd/arm-soc: (28 commits)
    ARM: pxa/cm-x300: properly set bt_reset pin
    ARM: mmp: rename SHEEVAD to GPLUGD
    ARM: imx: Fix typo 'MACH_MX31_3DS_MXC_NAND_USE_BBT'
    ARM: i.MX28: shift frac value in _CLK_SET_RATE
    plat-mxc: iomux-v3.h: implicitly enable pull-up/down when that's desired
    ARM: mx5: fix clock usage for suspend
    ARM: pxa: use correct __iomem annotations
    ARM: pxa: sharpsl pm needs SPI
    ARM: pxa: centro and treo680 need palm27x
    ARM: pxa: make pxafb_smart_*() empty when not enabled
    ARM: pxa: select POWER_SUPPLY on raumfeld
    ARM: pxa: pxa95x is incompatible with earlier pxa
    ARM: pxa: CPU_FREQ_TABLE is needed for CPU_FREQ
    ARM: pxa: pxa95x/saarb depends on pxa3xx code
    ARM: pxa: allow selecting just one of TREO680/CENTRO
    ARM: pxa: export symbols from pxa3xx-ulpi
    ARM: pxa: make zylonite_pxa*_init declaration match code
    ARM: pxa/z2: fix building error of pxa27x_cpu_suspend() no longer available
    ARM: at91: add defconfig for at91sam9g45 family
    ARM: at91: remove dependency for Atmel PWM driver selector in Kconfig
    ...

    Linus Torvalds
     

01 Nov, 2011

6 commits

29 Oct, 2011

1 commit

  • 1fdb24e96   Merge branch 'devel-stable' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/… ... Browse Code »

    …git-cur/linux-2.6-arm

    * 'devel-stable' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm: (178 commits)
    ARM: 7139/1: fix compilation with CONFIG_ARM_ATAG_DTB_COMPAT and large TEXT_OFFSET
    ARM: gic, local timers: use the request_percpu_irq() interface
    ARM: gic: consolidate PPI handling
    ARM: switch from NO_MACH_MEMORY_H to NEED_MACH_MEMORY_H
    ARM: mach-s5p64x0: remove mach/memory.h
    ARM: mach-s3c64xx: remove mach/memory.h
    ARM: plat-mxc: remove mach/memory.h
    ARM: mach-prima2: remove mach/memory.h
    ARM: mach-zynq: remove mach/memory.h
    ARM: mach-bcmring: remove mach/memory.h
    ARM: mach-davinci: remove mach/memory.h
    ARM: mach-pxa: remove mach/memory.h
    ARM: mach-ixp4xx: remove mach/memory.h
    ARM: mach-h720x: remove mach/memory.h
    ARM: mach-vt8500: remove mach/memory.h
    ARM: mach-s5pc100: remove mach/memory.h
    ARM: mach-tegra: remove mach/memory.h
    ARM: plat-tcc: remove mach/memory.h
    ARM: mach-mmp: remove mach/memory.h
    ARM: mach-cns3xxx: remove mach/memory.h
    ...

    Fix up mostly pretty trivial conflicts in:
    - arch/arm/Kconfig
    - arch/arm/include/asm/localtimer.h
    - arch/arm/kernel/Makefile
    - arch/arm/mach-shmobile/board-ap4evb.c
    - arch/arm/mach-u300/core.c
    - arch/arm/mm/dma-mapping.c
    - arch/arm/mm/proc-v7.S
    - arch/arm/plat-omap/Kconfig
    largely due to some CONFIG option renaming (ie CONFIG_PM_SLEEP ->
    CONFIG_ARM_CPU_SUSPEND for the arm-specific suspend code etc) and
    addition of NEED_MACH_MEMORY_H next to HAVE_IDE.

    Linus Torvalds
     

27 Oct, 2011

1 commit

  • ca9066628   Merge branch 'gpio' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm ... Browse Code »

    * 'gpio' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm: (43 commits)
    ARM: 7135/1: ep93xx: bring back missing
    ARM: 7104/1: plat-pxa: break out GPIO driver specifics
    ARM: 7103/1: plat-pxa: move PXA GPIO driver to GPIO subsystem
    ARM: 7042/3: mach-ep93xx: break out GPIO driver specifics
    ARM: 7101/1: arm/tegra: Replace with
    ARM: 7094/1: arm/tegra: Move EN_VDD_1V05_GPIO to board-harmony.h
    ARM: 7083/1: rewrite U300 GPIO to use gpiolib
    ARM: 7074/1: gpio: davinci: eliminate unused variable warnings
    ARM: 7063/1: Orion: gpio: add missing include of linux/types.h
    ARM: 7055/1: arm/tegra: mach/gpio.h: include linux/types.h to fix build
    ARM: 7054/1: arm/tegra: Delete custom gpio_to_irq, and irq_to_gpio
    ARM: 7053/1: gpio/tegra: Implement gpio_chip.to_irq
    ARM: 7052/1: gpio/tegra: Remove use of irq_to_gpio
    ARM: 7057/1: mach-pnx4008: rename GPIO header
    ARM: 7056/1: plat-nomadik: kill off
    ARM: 7050/1: mach-sa1100: delete irq_to_gpio() function
    ARM: 7049/1: mach-sa1100: move SA1100 GPIO driver to GPIO subsystem
    ARM: 7045/1: mach-lpc32xx: break out GPIO driver specifics
    ARM: 7044/1: mach-lpc32xx: move LPC32XX GPIO driver to GPIO subsystem
    ARM: 7043/1: mach-ixp2000: rename GPIO header
    ...

    Fix up trivial conflicts in arch/arm/mach-u300/Kconfig manually

    Linus Torvalds
     

25 Oct, 2011

1 commit

  • 590842f90   ARM: i.MX28: shift frac value in _CLK_SET_RATE ... Browse Code »

    Noticed when setting SSP0 in clk_set_rate, _CLK_SET_RATE attempts to
    reset the clock divider for the SSP0 parent clock, in this case
    IO0FRAC. Bits 24-29 of HW_CLKCTRL_FRAC0 are cleared correctly, but
    when the new frac value is written the value isn't shifted up to write
    the correct bit-field. This results in IO0FRAC being set to 0 and
    CPUFRAC being corrupted.

    This should occur when writing IO1FRAC, EMIFRAC in HW_CLKCTRL_FRAC0
    and GPMIFRAC, HSADCFRAC in HW_CLKCTRL_FRAC1.

    Tested on custom i.MX28 board with SSP0 SPI driver.

    Signed-off-by: Matt Burtch
    Signed-off-by: Sascha Hauer

    Matt Burtch
     

21 Oct, 2011

2 commits

20 Oct, 2011

1 commit

18 Oct, 2011

1 commit

17 Oct, 2011

2 commits

14 Oct, 2011

1 commit

13 Oct, 2011

1 commit

08 Oct, 2011

1 commit

04 Oct, 2011

2 commits

26 Sep, 2011

1 commit

  • 639da5ee3   ARM: add an extra temp register to the low level debugging addruart macro ... Browse Code »

    Some platforms (like OMAP not to name it) are doing rather complicated
    hacks just to determine the base UART address to use. Let's give their
    addruart macro some slack by providing an extra work register which will
    allow for much needed cleanups.

    This is basically a no-op as this commit is only adding the extra argument
    to the macro but no one is using it yet.

    Signed-off-by: nicolas Pitre
    Reviewed-by: Kevin Hilman

    Nicolas Pitre
     

20 Sep, 2011

2 commits

26 Aug, 2011

1 commit

23 Aug, 2011

5 commits