Doug / smarc-fsl-linux-kernel

30 Aug, 2013

4 commits

  • f97c43bbd   tegra-cpuidle: provide stub when !CONFIG_CPU_IDLE ... Browse Code »

    While poking at something using the for-3.12/* trees, I hit the
    following compile error:
    drivers/built-in.o: In function `tegra_pcie_map_irq':
    /builddir/build/BUILD/kernel-3.10.fc20/linux-3.11.0-0.rc6.git4.1.fc20.armv7hl/drivers/pci/host/pci-tegra.c:640:
    undefined reference to `tegra_cpuidle_pcie_irqs_in_use'
    drivers/built-in.o: In function `tegra_msi_map':
    /builddir/build/BUILD/kernel-3.10.fc20/linux-3.11.0-0.rc6.git4.1.fc20.armv7hl/drivers/pci/host/pci-tegra.c:1227:
    undefined reference to `tegra_cpuidle_pcie_irqs_in_use'
    make: *** [vmlinux] Error 1

    Since our .config had CONFIG_CPU_IDLE off. We should probably provide
    an empty function to handle this to avoid cluttering up pci-tegra.c
    with conditionals.

    Signed-off-by: Kyle McMartin
    Reviewed-by: Thierry Reding
    [swarren, removed unnecessary return statement]
    Signed-off-by: Stephen Warren
    Signed-off-by: Olof Johansson

    Kyle McMartin
     
  • dc05ee329   PCI: tegra: replace devm_request_and_ioremap by devm_ioremap_resource ... Browse Code »

    Use devm_ioremap_resource instead of devm_request_and_ioremap.

    This was done using the semantic patch
    scripts/coccinelle/api/devm_ioremap_resource.cocci

    Error-handling code was manually removed from the associated calls to
    platform_get_resource.

    Adjust the comment at the third platform_get_resource_byname to make clear
    why ioremap is not done at this point.

    Signed-off-by: Julia Lawall
    Acked-by: Thierry Reding
    Tested-by: Thierry Reding
    Acked-by: Bjorn Helgaas
    Acked-by: Stephen Warren
    Signed-off-by: Thierry Reding
    Signed-off-by: Olof Johansson

    Julia Lawall
     
  • e8a72e2a5   ARM: tegra: Drop ARCH_SUPPORTS_MSI and sort list ... Browse Code »

    The ARCH_SUPPORTS_MSI symbol was removed during the recent patches that
    introduce the MSI chip infrastructure. Drop it from the list of selected
    symbols. While at it, move the MIGHT_HAVE_PCI symbol so the list stays
    sorted alphabetically.

    Acked-by: Stephen Warren
    Signed-off-by: Thierry Reding
    Signed-off-by: Olof Johansson

    Thierry Reding
     
  • 6cbe0e1fe   Merge tag 'dt-3.12' of git://git.infradead.org/linux-mvebu into next/soc ... Browse Code »

    From Jason Cooper:
    mvebu dt changes for v3.12
    - kirkwood
    - add ZyXEL NSA310 board, fan for ReadyNAS Duo v2
    - mvebu
    - add ReadyNAS 102 board
    - misc dts updates and changes.

    v2:
    - dropped mv64xxx-i2c change

    * tag 'dt-3.12' of git://git.infradead.org/linux-mvebu:
    ARM: mvebu: Fix the Armada 370/XP timer compatible strings
    ARM: mvebu: use dts pre-processor for readynas 102
    ARM: kirkwood: use dts pre-processor for nsa310 boards
    ARM: mvebu: use correct #interrupt-cells instead of #interrupts-cells
    ARM: Kirkwood: Add support for another ZyXEL NSA310 variant
    ARM: mvebu: Add Netgear ReadyNAS 102 board
    arm: kirkwood: readynas duo v2: Add GMT G762 Fan Controller

    Signed-off-by: Olof Johansson

    Conflicts:
    arch/arm/boot/dts/kirkwood-nsa310.dts

    Olof Johansson
     

24 Aug, 2013

4 commits

  • d519049cb   Merge tag 'mxs-soc-3.12' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/soc ... Browse Code »

    From Shawn Guo:

    It contains mxs soc changes for 3.12.

    - Run savedefconfig on mxs_defconfig to clean it up
    - Fix on mxs_restart() routine for interrupt context calling
    - A few other random updates and cleanups

    * tag 'mxs-soc-3.12' of git://git.linaro.org/people/shawnguo/linux-2.6:
    ARM: mxs: pm: Include "pm.h"
    ARM: mxs: Simplify detection of CrystalFontz boards
    ARM: mach-mxs: Remove "TO" string from revision field
    ARM: mxs: Fix BUG() when invoking mxs_restart() from interrupt context
    ARM: mxs: Allow DT clock providers
    ARM: mxs_defconfig: Cleanup mxs_defconfig

    Kevin Hilman
     
  • 334b0f091   Merge tag 'imx-dt-3.12' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/soc ... Browse Code »

    From Shawn Guo:

    It contains the imx device tree updates for 3.12.

    - New pinctrl entry additions for various peripherals
    - Devices enabling for imx6, imx5 and imx27 boards
    - Add missing device nodes like iim, owire, audmux and sram, etc.
    - Various updates on boards like phytec, wandboard and sabresd
    - Consolidate pad macros between imx6q and imx6dl

    * tag 'imx-dt-3.12' of git://git.linaro.org/people/shawnguo/linux-2.6: (92 commits)
    ARM: dts: vf610-twr: enable i2c0 device
    ARM: dts: i.MX51: Add one more I2C2 pinmux entry
    ARM: dts: i.MX51: Move pins configuration under "iomuxc" label
    ARM: dtsi: imx6qdl-sabresd: Add USB OTG vbus pin to pinctrl_hog
    ARM: dtsi: imx6qdl-sabresd: Add USB host 1 VBUS regulator
    ARM: dts: imx27-phytec-phycore-som: Enable AUDMUX
    ARM: dts: i.MX27: Disable AUDMUX in the template
    ARM: dts: wandboard: Add support for SDIO bcm4329
    ARM: i.MX5 clocks: Remove optional clock setup (CKIH1) from i.MX51 template
    ARM: dts: imx53-qsb: Make USBH1 functional
    ARM i.MX6Q: dts: Enable I2C1 with EEPROM and PMIC on Phytec phyFLEX-i.MX6 Ouad module
    ARM i.MX6Q: dts: Enable SPI NOR flash on Phytec phyFLEX-i.MX6 Ouad module
    ARM: dts: imx6qdl-sabresd: Add touchscreen support
    ARM: imx: add ocram clock for imx53
    ARM: dts: imx: ocram size is different between imx6q and imx6dl
    ARM: dts: imx27-phytec-phycore-som: Fix regulator settings
    ARM: dts: i.MX27: Remove clock name from CPU node
    ARM: dts: i.MX27: Increase "clock-latency" value
    ARM: dts: i.MX27: Add label to CPU node
    ARM: dts: i.MX27: Remove optional "ptp" clock source for FEC
    ...

    Signed-off-by: Kevin Hilman

    Kevin Hilman
     
  • 579673ee1   Merge tag 'imx-soc-3.12' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/soc ... Browse Code »

    From Shawn Guo:

    It contains a bunch of imx soc updates for 3.12.

    - Add more ethernet phy fixups for imx6 boards
    - Add some missing imx6q clocks into clock driver
    - Add new clock types fixup mux and div to work around some ugly
    hardware defect
    - Consolidate L2 cache initialization function, so that it can be used
    on more i.MX SoCs
    - Replace magic numbers in mach-imx6q.c with well defined macros
    - Small fixes for imx6q and pllv3 clock drivers
    - Some random updates on imx defconfig files

    * tag 'imx-soc-3.12' of git://git.linaro.org/people/shawnguo/linux-2.6: (33 commits)
    phy: micrel: Add definitions for common Micrel PHY registers
    ARM: imx: Re-select CONFIG_SND_SOC_IMX_MC13783 option
    ARM: imx: Move anatop related from board file to anatop driver
    ARM: imx_v6_v7_defconfig: Enable wireless support
    ARM: imx_v4_v5_defconfig: Cleanup imx_v4_v5_defconfig
    ARM: imx_v6_v7_defconfig: Add SATA support
    ARM: imx_v6_v7_defconfig: Cleanup imx_v6_v7_defconfig
    ARM: mx53: Allow suspend/resume
    ARM: mach-imx: Select ARM_CPU_SUSPEND at ARCH_MXC level
    ARM: imx_v6_v7_defconfig: Select CONFIG_TOUCHSCREEN_EGALAX
    ARM: imx6q: add vdoa gate clock
    ARM: imx6q: add the missing cko output selection
    ARM: imx6q: add cko2 clocks
    ARM: imx6q: add spdif gate clock
    ARM: imx: clk-pllv3: improve the timeout waiting method
    ARM: imx6: change some clocks to fixup clocks
    ARM: imx: add common clock support for fixup mux
    ARM: imx: add common clock support for fixup div
    ARM: imx: Select MIGHT_HAVE_CACHE_L2X0
    ARM: imx: fix imx_init_l2cache storage class
    ...

    Kevin Hilman
     
  • 8bd6f53af   Merge tag 'imx-weim-3.12' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/soc ... Browse Code »

    From Shawn Guo:
    This is a patch series that updates imx-weim bus driver to have it
    support more i.MX SoCs. Because there is no maintainer for
    drivers/bus so far, I'm forwarding it through IMX tree for 3.12 merge
    window.

    * tag 'imx-weim-3.12' of git://git.linaro.org/people/shawnguo/linux-2.6:
    drivers: bus: imx-weim: Add support for i.MX1/21/25/27/31/35/50/51/53
    drivers: bus: imx-weim: Add missing platform_driver.owner field
    drivers: bus: imx-weim: use module_platform_driver_probe()
    drivers: bus: imx-weim: Simplify error path
    drivers: bus: imx-weim: Remove private driver data

    Kevin Hilman
     

23 Aug, 2013

3 commits

  • 070315022   Merge tag 'davinci-for-v3.12/dt' of git://git.kernel.org/pub/scm/linux/kernel/gi… ... Browse Code »

    …t/nsekhar/linux-davinci into next/soc

    From Sekhar Nori:

    DaVinci DT updates for v3.12
    ----------------------------

    This set of patches add ethernet DT nodes
    for DA850 and also remove now unneeded
    specification of UART clock frequency so
    kernel can now boot irrespective of what
    the bootloader setting of UART frequency is.

    * tag 'davinci-for-v3.12/dt' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci:
    ARM: davinci: da850: do not specify clock_frequency for UART DT node
    ARM: davinci: da850: add DT node for ethernet
    ARM: davinci: da850: add OF_DEV_AUXDATA entry for davinci_emac
    ARM: davinci: da850: add OF_DEV_AUXDATA entry for mdio.
    ARM: davinci: da850: add DT node for mdio device

    Signed-off-by: Kevin Hilman <khilman@linaro.org>

    Kevin Hilman
     
  • cee7e8bbd   Merge tag 'davinci-for-v3.12/soc' of git://git.kernel.org/pub/scm/linux/kernel/g… ... Browse Code »

    …it/nsekhar/linux-davinci into next/soc

    From Sekhar Nori:

    DaVinci SoC updates for v3.12
    -----------------------------

    This set of SoC updates contains changes to the
    way UART clock is handled to enabled DT-boot to
    obtain UART clock frequency instead of relying
    on DT-binding being supplied. Similarly handling
    of MDIO clock is fixed to make it easier to support
    MDIO in DT-boot. Finally there is patch to remove
    now unnecessary setting of wake-up capable flag for
    RTC.

    * tag 'davinci-for-v3.12/soc' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci:
    ARM: davinci: fix clock lookup for mdio device
    ARM: davinci: da8xx: remove hard coding of rtc device wakeup
    ARM: davinci: serial: remove davinci_serial_setup_clk()
    ARM: davinci: serial: get rid of davinci_uart_config
    ARM: davinci: da8xx: remove da8xx_uart_clk_enable
    ARM: davinci: uart: move to devid based clk_get

    Signed-off-by: Kevin Hilman <khilman@linaro.org>

    Kevin Hilman
     
  • 1ee64e48f   Merge tag 'ux500-core-for-arm-soc' of git://git.kernel.org/pub/scm/linux/kernel/… ... Browse Code »

    …git/linusw/linux-stericsson into next/soc

    From Linus Walleij:
    Core ux500 changes for v3.12:
    - Add support for restart using the PRCMU
    - Move secondary startup out of INIT section
    - set coherent_dma_mask for DMA40

    * tag 'ux500-core-for-arm-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson:
    ARM: ux500: set coherent_dma_mask for dma40
    ARM: ux500: remove u8500_secondary_startup from INIT section.
    ARM: ux500: add restart support via prcmu

    Kevin Hilman
     

22 Aug, 2013

29 commits