Eric Lee / smarc-fsl-linux-kernel

02 Nov, 2011

1 commit

  • 25498e5b3   Merge branch 'next/driver' of git://git.linaro.org/people/arnd/arm-soc ... Browse Code »

    * 'next/driver' of git://git.linaro.org/people/arnd/arm-soc:
    hw_random: add driver for atmel true hardware random number generator
    ARM: at91: at91sam9g45: add trng clock and platform device
    MX53 Enable the AHCI SATA on MX53 SMD board
    MX53 Enable the AHCI SATA on MX53 LOCO board
    MX53 Enable the AHCI SATA on MX53 ARD board
    AHCI Add the AHCI SATA feature on the MX53 platforms
    Fix pata imx resource
    ARM: imx: Define functions for registering PATA
    ARM: imx: Add PATA clock support
    ARM: imx: Add PATA resources for other i.MX processors
    imx: efika: Enable pata.
    imx51: add pata clock
    imx51: add pata device

    Fix up trivial conflict (new selects next to each other from separate
    branches for EFIKA_COMMON) in arch/arm/mach-mx5/Kconfig

    Linus Torvalds
     

20 Oct, 2011

1 commit

07 Oct, 2011

1 commit

28 Aug, 2011

1 commit

  • 318007e90   Fix pata imx resource ... Browse Code »

    Commit 236c4e8be436380b5354fe0d7facf94688e024ec
    "ARM: imx: Add PATA resources for other i.MX processors"
    has broken resource declaration of pata_imx device by using iobase instead of
    iosize.

    Signed-off-by: Arnaud Patard
    Signed-off-by: Sascha Hauer

    Arnaud Patard (Rtp)
     

24 Aug, 2011

1 commit

23 Aug, 2011

1 commit

03 Aug, 2011

1 commit

01 Aug, 2011

3 commits

27 Jul, 2011

6 commits

  • 62550cd7c   dmaengine: imx-sdma: use platform_device_id to identify sdma version ... Browse Code »

    It might be not good to use software defined version to identify sdma
    device type, when hardware does not define such version. Instead,
    soc name is stable enough to define the device type.

    The patch uses platform_device_id rather than version number passed
    by platform data to identify sdma device type/version.

    Signed-off-by: Shawn Guo
    Cc: Vinod Koul
    Cc: Sascha Hauer
    Acked-by: Grant Likely
    Acked-by: Vinod Koul

    Shawn Guo
     
  • 57ed3314e   mmc: sdhci-esdhc-imx: get rid of the uses of cpu_is_mx() ... Browse Code »

    The patch removes all the uses of cpu_is_mx(). Instead, it utilizes
    platform_device_id to distinguish the esdhc differences among SoCs.

    Signed-off-by: Shawn Guo
    Cc: Wolfram Sang
    Cc: Chris Ball
    Acked-by: Grant Likely
    Acked-by: Chris Ball

    Shawn Guo
     
  • 913413c30   mmc: sdhci-esdhc-imx: extend card_detect and write_protect support for mx5 ... Browse Code »

    The patch extends card_detect and write_protect support to get mx5
    family and more scenarios supported. The changes include:

    * Turn platform_data from optional to mandatory
    * Add cd_types and wp_types into platform_data to cover more use
    cases
    * Remove the use of flag ESDHC_FLAG_GPIO_FOR_CD
    * Adjust some machine codes to adopt the platform_data changes
    * Work around the issue that software reset will get card detection
    circuit stop working

    With this patch, card_detect and write_protect gets supported on
    mx5 based platforms.

    Signed-off-by: Shawn Guo
    Cc: Chris Ball
    Acked-by: Wolfram Sang
    Tested-by: Arnaud Patard
    Acked-by: Chris Ball

    Shawn Guo
     
  • 0ca1e290b   net/fec: gasket needs to be enabled for some i.mx ... Browse Code »

    On the recent i.mx (mx25/50/53), there is a gasket inside fec
    controller which needs to be enabled no matter phy works in MII
    or RMII mode.

    The current code enables the gasket only when phy interface is RMII.
    It's broken when the driver works with a MII phy. The patch uses
    platform_device_id to distinguish the SoCs that have the gasket and
    enables it on these SoCs for both MII and RMII mode.

    Signed-off-by: Shawn Guo
    Reported-by: Troy Kisky
    Cc: David S. Miller
    Cc: Sascha Hauer
    Acked-by: David S. Miller

    Shawn Guo
     
  • fe6b540ac   serial/imx: get rid of the uses of cpu_is_mx1() ... Browse Code »

    The patch removes all the uses of cpu_is_mx1(). Instead, it uses
    the .id_table of platform_driver to distinguish the uart device type,
    IMX1_UART and IMX21_UART. The IMX21_UART type runs on all i.mx
    except i.mx1.

    A couple of !cpu_is_mx1 logic gets turned into is_imx21_uart,
    as the codes wrapped there are really IMX21 type uart specific.

    It also removes macro MX1_UCR3_REF25 and MX1_UCR3_REF30 which are
    not used anywhere.

    Signed-off-by: Shawn Guo
    Cc: Sascha Hauer
    Cc: Alan Cox
    Cc: Greg Kroah-Hartman
    Acked-by: Grant Likely

    Shawn Guo
     
  • 69f1d1a6a   Merge branch 'next/devel' of ssh://master.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc ... Browse Code »

    * 'next/devel' of ssh://master.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc: (128 commits)
    ARM: S5P64X0: External Interrupt Support
    ARM: EXYNOS4: Enable MFC on Samsung NURI
    ARM: EXYNOS4: Enable MFC on universal_c210
    ARM: S5PV210: Enable MFC on Goni
    ARM: S5P: Add support for MFC device
    ARM: EXYNOS4: Add support FIMD on SMDKC210
    ARM: EXYNOS4: Add platform device and helper functions for FIMD
    ARM: EXYNOS4: Add resource definition for FIMD
    ARM: EXYNOS4: Change devname for FIMD clkdev
    ARM: SAMSUNG: Add IRQ_I2S0 definition
    ARM: SAMSUNG: Add platform device for idma
    ARM: EXYNOS4: Add more registers to be saved and restored for PM
    ARM: EXYNOS4: Add more register addresses of CMU
    ARM: EXYNOS4: Add platform device for dwmci driver
    ARM: EXYNOS4: configure rtc-s3c on NURI
    ARM: EXYNOS4: configure MAX8903 secondary charger on NURI
    ARM: EXYNOS4: configure ADC on NURI
    ARM: EXYNOS4: configure MAX17042 fuel gauge on NURI
    ARM: EXYNOS4: configure regulators and PMIC(MAX8997) on NURI
    ARM: EXYNOS4: Increase NR_IRQS for devices with more IRQs
    ...

    Fix up tons of silly conflicts:
    - arch/arm/mach-davinci/include/mach/psc.h
    - arch/arm/mach-exynos4/Kconfig
    - arch/arm/mach-exynos4/mach-smdkc210.c
    - arch/arm/mach-exynos4/pm.c
    - arch/arm/mach-imx/mm-imx1.c
    - arch/arm/mach-imx/mm-imx21.c
    - arch/arm/mach-imx/mm-imx25.c
    - arch/arm/mach-imx/mm-imx27.c
    - arch/arm/mach-imx/mm-imx31.c
    - arch/arm/mach-imx/mm-imx35.c
    - arch/arm/mach-mx5/mm.c
    - arch/arm/mach-s5pv210/mach-goni.c
    - arch/arm/mm/Kconfig

    Linus Torvalds
     

26 Jul, 2011

2 commits

  • 786c89f7a   ARM: mx50: Select IMX_HAVE_PLATFORM_FEC as done on other i.MX devices ... Browse Code »

    Currently it is only the MX50_RDP board that selects IMX_HAVE_PLATFORM_FEC in its board Kconfig.

    Do like the other i.MX processors, which select IMX_HAVE_PLATFORM_FEC based on the processor type.

    Signed-off-by: Fabio Estevam
    Signed-off-by: Sascha Hauer

    Fabio Estevam
     
  • dd58ecba4   Merge branch 'next/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc ... Browse Code »

    * 'next/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc: (35 commits)
    ARM: msm: platsmp: determine number of CPU cores at boot time
    ARM: Tegra: Seaboard: Fix I2C bus numbering for ADT7461
    ARM: Tegra: Trimslice: Tri-state DAP3 pinmux
    ARM: orion5x: fixup 5181 MPP mask check
    ARM: mxs-dma: include
    ARM: i.MX53: consistently use MX53_UART_PAD_CTRL for uart txd/rxd/rts/cts
    ARM: i.MX53: UARTn_CTS pin should not change RTS input select
    ARM: i.MX53: UARTn_TXD pin should not change RXD input select
    ARM: mx25: Fix typo on CAN1_RX pad setting
    iomux-mx53: add missing 'IOMUX_CONFIG_SION' for some I2C pad definitions
    ARM: NUC93X: add UL suffix to VMALLOC_END to ensure it is properly typed
    ARM: LPC32XXX: add UL suffix to VMALLOC_END to ensure it is properly typed
    ARM: CNS3XXX: add UL suffix to VMALLOC_END to ensure it is properly typed
    ARM: i.MX53: Fix IOMUX type o's
    ARM i.MX dma: Fix burstsize settings
    mach-mx5: fix the I2C clock parents
    ARM: mxs/tx28: according to the TX28's datasheet D4-D7 are not used for MMC0
    ARM i.MX23/28: platform-mxsfb: Add missing include of linux/dma-mapping.h
    ARM: mx53: Fix some interrupts marked as reserved.
    MXC: iomux-v3: correct NO_PAD_CTRL definition
    ...

    Fix up trivial conflict in arch/arm/mach-imx/mach-mx31_3ds.c

    Linus Torvalds
     

23 Jul, 2011

2 commits

  • 7235dd74a   Merge branch 'spi/next' of git://git.secretlab.ca/git/linux-2.6 ... Browse Code »

    * 'spi/next' of git://git.secretlab.ca/git/linux-2.6: (34 commits)
    spi/imx: add device tree probe support
    spi/imx: copy gpio number passed by platform data into driver private data
    spi/imx: use soc name in spi device type naming scheme
    spi/imx: merge type SPI_IMX_VER_0_7 into SPI_IMX_VER_0_4
    spi/imx: do not use spi_imx2_3 to name SPI_IMX_VER_2_3 function and macro
    spi/imx: use mx21 to name SPI_IMX_VER_0_0 function and macro
    spi/imx: do not make copy of spi_imx_devtype_data
    spi/dw: Add spi number into spi irq desc
    spi/tegra: Use engineering names in DT compatible property
    spi/fsl_spi: fix CPM spi driver
    mach-s3c2410: remove unused spi-gpio.h file
    spi: remove obsolete spi-s3c24xx-gpio driver
    mach-gta2: remove unused spi-gpio.h include
    mach-qt2410: convert to spi_gpio
    mach-jive: convert to spi_gpio
    spi/pxa2xx: Remove unavailable ssp_type from documentation
    spi/bfin_spi: uninline fat queue funcs
    spi/bfin_spi: constify pin array
    spi/bfin_spi: use structs for accessing hardware regs
    spi/topcliff-pch: Support new device ML7223 IOH
    ...

    Fix up trivial conflict in arch/arm/mach-ep93xx/Makefile

    Linus Torvalds
     
  • c7c851849   Merge branch 'gpio/next' of git://git.secretlab.ca/git/linux-2.6 ... Browse Code »

    * 'gpio/next' of git://git.secretlab.ca/git/linux-2.6: (61 commits)
    gpio/mxc/mxs: fix build error introduced by the irq_gc_ack() renaming
    mcp23s08: add i2c support
    mcp23s08: isolate spi specific parts
    mcp23s08: get rid of setup/teardown callbacks
    gpio/tegra: dt: add binding for gpio polarity
    mcp23s08: remove unused work queue
    gpio/da9052: remove a redundant assignment for gpio->da9052
    gpio/mxc: add device tree probe support
    ARM: mxc: use ARCH_NR_GPIOS to define gpio number
    gpio/mxc: get rid of the uses of cpu_is_mx()
    gpio/mxc: add missing initialization of basic_mmio_gpio shadow variables
    gpio: Move mpc5200 gpio driver to drivers/gpio
    GPIO: DA9052 GPIO module v3
    gpio/tegra: Use engineering names in DT compatible property
    of/gpio: Add new method for getting gpios under different property names
    gpio/dt: Refine GPIO device tree binding
    gpio/ml-ioh: fix off-by-one for displaying variable i in dev_err
    gpio/pca953x: Deprecate meaningless device-tree bindings
    gpio/pca953x: Remove dynamic platform data pointer
    gpio/pca953x: Fix IRQ support.
    ...

    Linus Torvalds
     

15 Jul, 2011

1 commit

  • 04ee58549   spi/imx: use soc name in spi device type naming scheme ... Browse Code »

    Software defined version number is not stable enough to be used
    in device type naming scheme. The patch changes it to use implicit
    soc name for spi device type definition. In this way, we can easily
    align the naming scheme with device tree binding, which comes later.

    It removes fifosize from spi_imx_data and adds devtype there, so that
    fifosize can be set in an inline function according to devtype.
    Also, cpu_is_mx can be replaced by inline functions checking devtype.

    Signed-off-by: Shawn Guo
    Cc: Uwe Kleine-König
    Cc: Sascha Hauer
    Cc: Grant Likely
    Signed-off-by: Grant Likely

    Shawn Guo
     

09 Jul, 2011

1 commit

  • e7fc6ae74   gpio/mxc: get rid of the uses of cpu_is_mx() ... Browse Code »

    The patch removes all the uses of cpu_is_mx(). Instead, it utilizes
    platform_device_id to distinguish the different gpio types, IMX1_GPIO
    on i.mx1, IMX21_GPIO on i.mx21 and i.mx27, IMX31_GPIO on all other
    i.mx SoCs.

    Signed-off-by: Shawn Guo
    Signed-off-by: Grant Likely

    Shawn Guo
     

07 Jul, 2011

12 commits

22 Jun, 2011

1 commit

  • b7f080cfe   net: remove mm.h inclusion from netdevice.h ... Browse Code »

    Remove linux/mm.h inclusion from netdevice.h -- it's unused (I've checked manually).

    To prevent mm.h inclusion via other channels also extract "enum dma_data_direction"
    definition into separate header. This tiny piece is what gluing netdevice.h with mm.h
    via "netdevice.h => dmaengine.h => dma-mapping.h => scatterlist.h => mm.h".
    Removal of mm.h from scatterlist.h was tried and was found not feasible
    on most archs, so the link was cutoff earlier.

    Hope people are OK with tiny include file.

    Note, that mm_types.h is still dragged in, but it is a separate story.

    Signed-off-by: Alexey Dobriyan
    Signed-off-by: David S. Miller

    Alexey Dobriyan
     

07 Jun, 2011

1 commit

  • b78d8e59a   gpio/mxc: Change gpio-mxc into an upstanding gpio driver ... Browse Code »

    The patch makes necessary changes on gpio-mxc as below to turn it
    into an upstanding gpio driver.

    * Add a list to save all mx2 ports references, so that
    mx2_gpio_irq_handler can walk through all interrupt status
    registers

    * Use readl/writel to replace mach-specific accessors
    __raw_readl/__raw_writel

    * Change mxc_gpio_init into mxc_gpio_probe function

    * Move "struct mxc_gpio_port" into gpio-mxc.c, as it needs not to
    be public at all, and also make some other cleanup on
    plat-mxc/include/mach/gpio.h at the same time

    And the patch then migrates mach-imx and mach-mx5 to the updated
    driver by adding corresponding platform devices.

    Signed-off-by: Shawn Guo
    Acked-by: Olof Johansson
    Acked-by: Sascha Hauer
    Signed-off-by: Grant Likely

    Shawn Guo
     

06 Jun, 2011

1 commit

  • 5f85e9312   ARM: mx51/sdma: Check the chip revision in run-time ... Browse Code »

    Check the MX51 chip revision in run-time so that the correct SDMA firmware can
    be loaded.

    While at it also remove the silicon revision from the sdma_script_start_addrs
    structure name for MX51. All the MX51 revisions share the same SDMA start addresses.

    Signed-off-by: Fabio Estevam
    Signed-off-by: Sascha Hauer

    Fabio Estevam
     

19 May, 2011

3 commits

  • f142b6196   video i.MX: remove mx1 compile time dependencies ... Browse Code »

    remove usage of CONFIG_ARCH_MX1. It's mostly unused anyway, replace
    it with cpu_is_mx1() where necessary. Also, depend on
    IMX_HAVE_PLATFORM_IMX_FB instead of the architectures directly.

    LAKML-Reference: 20110303141244.GQ29521@pengutronix.de
    Acked-by: Paul Mundt
    Signed-off-by: Uwe Kleine-König
    Signed-off-by: Sascha Hauer

    Sascha Hauer
     
  • 18879e13b   ARM: imx51: use platform id 2 for imx51-cspi ... Browse Code »

    The platform id is used to determine the spi bus number, so it should
    better be different to the ids used for imx51-ecspi. Otherwise it's not
    possible to use both devices "imx51-cspi.0" and "imx51-ecspi.0".

    Alternative approaches are to use dynamic bus numbering as offered by
    the spi framework or let the machine code set the bus number. The
    downside of both possibilities is that the bus number isn't fixed for
    the same busses on different machines using i.MX51.

    LAKML-Reference: 1302100716-21034-1-git-send-email-u.kleine-koenig@pengutronix.de
    Signed-off-by: Uwe Kleine-König
    Signed-off-by: Sascha Hauer

    Uwe Kleine-König
     
  • afa77ef30   ARM: mx3: dynamically allocate "ipu-core" devices ... Browse Code »

    ... together with the related devices "mx3_camera" and "mx3_sdc_fb".

    "mx3_camera" doesn't fit the scheme of the other devices that just are
    allocated and registered in a single function because it needs additional
    care to get some dmaable memory. So currently imx31_alloc_mx3_camera
    duplicates most of imx_add_platform_device_dmamask, but I'm not sure it's
    worth to split the latter to be able to reuse more code.

    This gets rid of mach-mx3/devices.[ch] and so several files need to be
    adapted not to #include devices.h anymore.

    LAKML-Reference: 1299271882-2130-5-git-send-email-u.kleine-koenig@pengutronix.de
    Signed-off-by: Uwe Kleine-König
    Signed-off-by: Sascha Hauer

    Uwe Kleine-König