Eric Lee / smarc-fsl-linux-kernel

07 Jan, 2012

1 commit

  • 40ba95fdf   Merge branch 'depends/rmk/restart' into next/cleanup ... Browse Code »

    Conflicts:
    arch/arm/mach-at91/at91cap9.c
    arch/arm/mach-at91/at91sam9260.c
    arch/arm/mach-at91/at91sam9261.c
    arch/arm/mach-at91/at91sam9263.c
    arch/arm/mach-at91/at91sam9g45.c
    arch/arm/mach-at91/at91sam9rl.c
    arch/arm/mach-exynos/cpu.c
    arch/arm/mach-shmobile/board-kota2.c

    This resolves a bunch of conflicts between the arm-soc tree
    and changes from the arm tree that have gone upstream.

    Signed-off-by: Arnd Bergmann

    Arnd Bergmann
     

05 Jan, 2012

2 commits

  • f88b8979d   ARM: restart: remove the now empty arch_reset() ... Browse Code »

    Remove the now empty arch_reset() from all the mach/system.h includes,
    and remove its callsite. Remove arm_machine_restart() as this function
    no longer does anything useful.

    For samsung platforms, remove the include of mach/system-reset.h and
    plat/system-reset.h from their respective mach/system.h headers as these
    just define their arch_reset functions. As a result, the s3c2410 and
    plat-samsung system-reset.h files are no longer referenced, so remove
    these files entirely.

    Acked-by: Nicolas Pitre
    Acked-by: H Hartley Sweeten
    Acked-by: Jamie Iles
    Acked-by: Tony Lindgren
    Acked-by: Linus Walleij
    Signed-off-by: Russell King

    Russell King
     
  • 1b2073e77   ARM: restart: at91: use new restart hook ... Browse Code »

    Rather than using a private function pointer, use the existing
    arm_pm_restart function pointer instead. We no longer need to enable
    the I-cache in at91sam9_alt_reset() as the caches will now be on when
    this function is called.

    Update the function names to use the 'restart' terminology rather than
    the 'reboot' terminology.

    Signed-off-by: Russell King

    Russell King
     

20 Dec, 2011

1 commit

16 Dec, 2011

1 commit

29 Nov, 2011

3 commits

28 Nov, 2011

14 commits

27 Nov, 2011

1 commit

22 Nov, 2011

1 commit

  • 84e0cdb0a   macb: unify at91 and avr32 platform data ... Browse Code »

    Both at91 and avr32 defines its own platform data structure for
    the macb driver and both share common structures though at91
    includes a currently unused phy_irq_pin. Create a common
    macb_platform_data for macb that both at91 and avr32 can use. In
    future we can use this to support other architectures that use the
    same IP block with the macb driver.

    v2: rename eth_platform_data to macb_platform_data and allow at91_ether
    to share the platform data with macb.

    Signed-off-by: Jamie Iles
    Acked-by: Nicolas Ferre
    Tested-by: Jean-Christophe PLAGNIOL-VILLARD

    Jamie Iles
     

16 Nov, 2011

1 commit

09 Nov, 2011

1 commit

  • 30458edf6   at91: vmalloc fix missing AT91_VIRT_BASE define ... Browse Code »

    VMALLOC_END is defined in terms of AT91_VIRT_BASE but this needs
    mach/hardware.h for it's definition.

    In file included from arch/arm/mach-at91/board-usb-a926x.c:26:0:
    include/linux/mm.h: In function 'is_vmalloc_addr':
    include/linux/mm.h:305:41: error: 'AT91_VIRT_BASE' undeclared (first use in this function)
    include/linux/mm.h:305:41: note: each undeclared identifier is reported only once for each function it appears in

    Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD
    Cc: Nicolas Ferre
    Signed-off-by: Jamie Iles

    Jean-Christophe PLAGNIOL-VILLARD
     

08 Nov, 2011

1 commit

  • e0d65113a   Merge git://git.infradead.org/mtd-2.6 ... Browse Code »

    * git://git.infradead.org/mtd-2.6: (226 commits)
    mtd: tests: annotate as DANGEROUS in Kconfig
    mtd: tests: don't use mtd0 as a default
    mtd: clean up usage of MTD_DOCPROBE_ADDRESS
    jffs2: add compr=lzo and compr=zlib options
    jffs2: implement mount option parsing and compression overriding
    mtd: nand: initialize ops.mode
    mtd: provide an alias for the redboot module name
    mtd: m25p80: don't probe device which has status of 'disabled'
    mtd: nand_h1900 never worked
    mtd: Add DiskOnChip G3 support
    mtd: m25p80: add EON flash EN25Q32B into spi flash id table
    mtd: mark block device queue as non-rotational
    mtd: r852: make r852_pm_ops static
    mtd: m25p80: add support for at25df321a spi data flash
    mtd: mxc_nand: preset_v1_v2: unlock all NAND flash blocks
    mtd: nand: switch `check_pattern()' to standard `memcmp()'
    mtd: nand: invalidate cache on unaligned reads
    mtd: nand: do not scan bad blocks with NAND_BBT_NO_OOB set
    mtd: nand: wait to set BBT version
    mtd: nand: scrub BBT on ECC errors
    ...

    Fix up trivial conflicts:
    - arch/arm/mach-at91/board-usb-a9260.c
    Merged into board-usb-a926x.c
    - drivers/mtd/maps/lantiq-flash.c
    add_mtd_partitions -> mtd_device_register vs changed to use
    mtd_device_parse_register.

    Linus Torvalds
     

02 Nov, 2011

1 commit

  • 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
     

01 Nov, 2011

2 commits

21 Oct, 2011

1 commit

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
     

11 Sep, 2011

3 commits

  • 1754aab9b   mtd: ATMEL, AVR32: inline nand partition table access ... Browse Code »
    43

    Currently atmel_nand driver used by AT91 and AVR32 calls a special callback
    which return nand partition table and number of partitions. However in all
    boards this callback returns just static data. So drop this callback and
    make atmel_nand use partition table provided statically via platform_data.

    Nicolas Ferre: I am in favor for a mainline inclusion through linux-mtd tree.
    Hans-Christian Egtvedt: I'm fine by sending the changes for AVR32 through linux-mtd

    Signed-off-by: Dmitry Eremin-Solenikov
    Acked-by: Hans-Christian Egtvedt
    Acked-by: Nicolas Ferre
    Acked-by: Jean-Christophe PLAGNIOL-VILLARD
    Signed-off-by: Artem Bityutskiy

    Dmitry Eremin-Solenikov
     
  • aa6e52a35   at91: at91-ohci: support overcurrent notification ... Browse Code »

    Several USB power switches (AIC1526 or MIC2026) have a digital output
    that is used to notify that an overcurrent situation is taking
    place. This digital outputs are typically connected to GPIO inputs of
    the processor and can be used to be notified of those overcurrent
    situations.

    Therefore, we add a new overcurrent_pin[] array in the at91_usbh_data
    structure so that boards can tell the AT91 OHCI driver which pins are
    used for the overcurrent notification, and an overcurrent_supported
    boolean to tell the driver whether overcurrent is supported or not.

    The code has been largely borrowed from ohci-da8xx.c and
    ohci-s3c2410.c.

    Signed-off-by: Thomas Petazzoni
    Signed-off-by: Nicolas Ferre

    Thomas Petazzoni
     
  • e7da859e4   at91: ohci-at91: add vbus_pin_inverted platform attribute ... Browse Code »

    The existing OHCI AT91 driver made the assumption that the enable
    input of the USB power switch was active low. However, some USB power
    switches such as the Micrel MIC2026-1 [1] have an active high input to
    enable the power. A new vbus_pin_inverted attribute is added to the
    at91_usbh_data structure so that board files can tell the OHCI driver
    if the vbus pin logic is active low or active high.

    [1] http://www.micrel.com/page.do?page=product-info/products/mic2026.shtml

    Signed-off-by: Thomas Petazzoni
    Signed-off-by: Nicolas Ferre

    Thomas Petazzoni
     

07 Sep, 2011

1 commit

22 Aug, 2011

1 commit

12 Aug, 2011

2 commits

  • 8f3c4537b   ARM: gpio: make trivial GPIOLIB implementation the default ... Browse Code »

    Rather than marking the mach/gpio.h header files which want to use the
    trivial GPIOLIB implementation, mark those which do not want to use it
    instead. This means that by default, you get the trivial implementation
    and only have to do something extra if you need to. This should
    encourage the use of the trivial default implementation.

    As an additional bonus, several gpio.h header files become empty.

    Acked-by: H Hartley Sweeten
    Tested-by: Jamie Iles
    Acked-by: Kukjin Kim
    Signed-off-by: Russell King

    Russell King
     
  • 22fe67837   ARM: gpio: consolidate trivial gpiolib implementations ... Browse Code »

    Consolidate 24 trivial gpiolib implementions out of mach/gpio.h
    into asm/gpio.h. This is basically the include of asm-generic/gpio.h
    and the definition of gpio_get_value, gpio_set_value, and gpio_cansleep
    as described in Documentation/gpio.txt

    Acked-by: H Hartley Sweeten
    Tested-by: David Brown
    Acked-by: David Brown
    Tested-by: Linus Walleij
    Acked-by: Kukjin Kim
    Tested-by: Shawn Guo
    Signed-off-by: Russell King

    Russell King
     

30 Jul, 2011

1 commit