1. 13 Apr, 2013 1 commit
    • Olof Johansson's avatar
      Merge tag 'dt-exynos-for-v3.10' of... · bf049ded
      Olof Johansson authored
      Merge tag 'dt-exynos-for-v3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/dt2
      
      update device tree for exynos4 and exynos5
      
      * tag 'dt-exynos-for-v3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung: (125 commits)
        ARM: dts: add PDMA0 changes for exynos5440
        ARM: dts: Add cpufreq controller node for Exynos5440 SoC
        ARM: dts: Fix gmac clock ids due to changes in Exynos5440
        ARM: dts: add device tree file for SD5v1 board
        ARM: dts: update bootargs to boot from sda2 for exynos5440-ssdk5440
        ARM: dts: add PMU support in exynos5440
        ARM: dts: Add node for GMAC for exynos5440
        ARM: dts: list the interrupts generated by pin-controller on Exynos5440
        ARM: dts: Add FIMD DT binding Documentation
        ARM: dts: Add FIMD node and display timing node to exynos4412-origen.dts
        ARM: dts: Add FIMD node to exynos4
        ARM: dts: Add SYSREG block node for S5P/Exynos4 SoC series
        ARM: dts: Add display timing node to exynos5250-smdk5250.dts
        ARM: dts: Add FIMD node to exynos5
        ARM: dts: Add virtual GIC DT bindings for exynos5440
        ARM: dts: Document usb clocks in samsung,exynos4210-ehci/ohci bindings
        ARM: dts: add usb 2.0 clock references to exynos5250 device tree
        ARM: dts: Add architected timer nodes for exynos5250
        ARM: dts: Declare the gic as a15 compatible for exynos5250
        ARM: dts: Add HDMI HPD and regulator node for Arndale board
        ...
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      bf049ded
  2. 11 Apr, 2013 3 commits
    • Olof Johansson's avatar
      Merge tag 'omap-for-v3.10/dt-signed-v2' of... · 4f779ad9
      Olof Johansson authored
      Merge tag 'omap-for-v3.10/dt-signed-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/dt2
      
      From Tony Lindgren:
      Device tree updates for omaps via Benoit Cousson <b-cousson@ti.com>.
      
      Note that the branch has dependencies to two other branches:
      
      - omap-devel-b-for-3.10 from Paul to get the AM33xx missing
        hwmod and thus avoid a regression with Santosh's hwmod
        cleanup including in this DT series [1]. It avoids breaking
        bisect if this series is merged before Paul's fixes.
      
      - omap-for-v3.10/usb branch to avoid nasty merge conflict in
        omap3.dtsi and omap4.dtsi due to the DTS patches contained
        in the USB branch because of a screw up by the unnamed person
        typing this signed tag based on Benoit's comments.
      
      [1] https://patchwork.kernel.org/patch/2366291/
      
      * tag 'omap-for-v3.10/dt-signed-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: (69 commits)
        ARM/dts: OMAP3: fix pinctrl-single configuration
        ARM: dts: Add OMAP3430 SDP NOR flash memory binding
        ARM: dts: Add NOR flash bindings for OMAP2420 H4
        ARM: dts: Update OMAP3430 SDP NAND and ONENAND properties
        ARM: dts: OMAP2+: Identify GPIO banks that are always powered
        ARM: OMAP2+: Populate DMTIMER errata when using device-tree
        ARM: dts: OMAP2+: Update DMTIMER compatibility property
        ARM: OMAP: Add function to request timer by node
        ARM: OMAP: Force dmtimer restore if context loss is not detectable
        ARM: OMAP: Simplify dmtimer context-loss handling
        ARM: dts: AM33XX: Corrects typo in interrupt field in SPI node
        ARM: dts: OMAP4460: Add CPU OPP table
        ARM: dts: omap4-panda: move generic sections to panda-common
        ARM: dts: OMAP443x: Add CPU OPP table
        ARM: dts: OMAP3: use twl4030 vdd1 regulator for CPU
        ARM: dts: OMAP36xx: Add CPU OPP table
        ARM: dts: OMAP34xx/35xx: Add CPU OPP table
        Documentation: dt: gpio-omap: Move interrupt-controller from #interrupt-cells description
        ARM: OMAP2+: hwmod: Don't call _init_mpu_rt_base if no sysc
        ARM: OMAP2+: hwmod: extract module address space from DT blob
        ...
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      4f779ad9
    • Olof Johansson's avatar
      Merge branch 'omap/usb' into next/dt2 · 35db05bb
      Olof Johansson authored
      Merging in dependencies for the omap/dt branch.
      
      * omap/usb: (21 commits)
        ARM: dts: omap3-beagle: Add USB Host support
        ARM: dts: OMAP3: Add HS USB Host IP nodes
        ARM: dts: OMAP4: Add HS USB Host IP nodes
        ARM: OMAP: zoom: Adapt to ehci-omap changes
        ARM: OMAP3: overo: Adapt to ehci-omap changes
        ARM: OMAP3: omap3touchbook: Adapt to ehci-omap changes
        ARM: OMAP3: omap3stalker: Adapt to ehci-omap changes
        ARM: OMAP3: omap3pandora: Adapt to ehci-omap changes
        ARM: OMAP3: omap3evm: Adapt to ehci-omap changes
        ARM: OMAP3: igep0020: Adapt to ehci-omap changes
        ARM: OMAP: devkit8000: Adapt to ehci-omap changes
        ARM: OMAP3: cm-t3517: Adapt to ehci-omap changes
        ARM: OMAP3: cm-t35: Adapt to ehci-omap changes
        ARM: OMAP: AM3517evm: Adapt to ehci-omap changes
        ARM: OMAP: AM3517crane: Adapt to ehci-omap changes
        ARM: OMAP3: 3630SDP: Adapt to ehci-omap changes
        ARM: OMAP3: 3430SDP: Adapt to ehci-omap changes
        ARM: OMAP3: Beagle: Adapt to ehci-omap changes
        ARM: OMAP2+: omap4panda: Adapt to ehci-omap changes
        ARM: OMAP2+: omap-usb-host: Add usbhs_init_phys()
        ...
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      35db05bb
    • Olof Johansson's avatar
      Merge branch 'omap/fixes-non-critical' into next/dt2 · 56fecc7d
      Olof Johansson authored
      Merging in dependencies for the omap/dt branch.
      
      * omap/fixes-non-critical:
        ARM: OMAP2+: fix typo "CONFIG_BRIDGE_DVFS"
        ARM: OMAP1: remove "config MACH_OMAP_HTCWIZARD"
        ARM: OMAP: dpll: enable bypass clock only when attempting dpll bypass
        ARM: OMAP2+: powerdomain: avoid testing whether an unsigned char is less than 0
        ARM: OMAP2+: hwmod: Remove unused _HWMOD_WAKEUP_ENABLED flag
        ARM: OMAP2+: am335x: Change the wdt1 func clk src to per_32k clk
        ARM: OMAP2+: AM33xx: hwmod: Add missing sysc definition to wdt1 entry
        ARM: OMAP: fix typo "CONFIG_SMC91x_MODULE"
        ARM: OMAP5: clock: No Freqsel on OMAP5 devices too
        ARM: OMAP5: Make errata i688 workaround available
        ARM: OMAP5: Update SAR memory layout for WakeupGen
        ARM: OMAP5: Update SAR RAM base address
        ARM: OMAP5: Reuse prm read_inst/write_inst
        ARM: OMAP5: prm: Allow prm init to succeed
        ARM: OMAP5: timer: Update the clocksource name as per clock data
        ARM: OMAP5: Update SOC id detection code for ES2
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      56fecc7d
  3. 09 Apr, 2013 5 commits
    • Arnd Bergmann's avatar
      Merge tag 'tegra-for-3.10-dt' of... · 535409d9
      Arnd Bergmann authored
      Merge tag 'tegra-for-3.10-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra into next/dt2
      
      From Stephen Warren <swarren@wwwdotorg.org>:
      
      ARM: tegra: device tree changes
      
      This branch contains the majority of the device tree changes for Tegra.
      Highlights include:
      
      * Many changes for Tegra114, and the Dalmore board, to enable pinctrl,
        SDHCI/MMC, PWM, DMA, I2C, KBC, SPI, battery, regulators.
      * Adding or enabling suspend wakeup sources on many boards, and adding
        suspend timing parameters, to support the system suspend patches.
      * Adding clocks to the audio-related nodes, so that in 3.11, the audio
        driver can pull these clocks from device tree rather than hard-coding
        clock names.
      * Some small DT fixes/cleanup.
      
      This branch is based on the previous clk pull request.
      
      * tag 'tegra-for-3.10-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra: (25 commits)
        clk: tegra: Fix cdev1 and cdev2 IDs
        ARM: dts: tegra: add the PM configurations of PMC
        ARM: tegra: add non-removable and keep-power-in-suspend property for MMC
        ARM: tegra: whistler: add wakeup source for KBC
        ARM: tegra: add power gpio keys to DT
        ARM: tegra: keep power on to SD slot on Dalmore
        ARM: tegra: add clocks property to AC'97 sound nodes
        ARM: tegra: add clocks property to sound nodes
        ARM: tegra: dalmore: add fixed regulator node
        ARM: tegra: dalmore: add TPS65090 node
        ARM: tegra: dalmore: add cpu regulator node
        ARM: tegra: Add sbs-battery node to Dalmore
        ARM: tegra: add DT binding for i2c-tegra
        ARM: tegra: add SPI nodes to Tegra114 DT
        ARM: tegra: add KBC nodes to Tegra114 DT
        ARM: tegra: add aliases and DMA requestor for serial nodes of Tegra114
        ARM: tegra: add I2C nodes to Tegra114 DT
        ARM: tegra: add APB DMA nodes to Tegra114 DT
        ARM: tegra: add PWM nodes to Tegra114 DT
        ARM: tegra: fix the status of PWM DT nodes
        ...
      Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      535409d9
    • Arnd Bergmann's avatar
      Merge branch 'tegra/clk' into next/dt2 · f8da810c
      Arnd Bergmann authored
      This is a dependency for the tegra/dt branch.
      
      Conflicts:
      	drivers/clocksource/tegra20_timer.c
      Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      f8da810c
    • Arnd Bergmann's avatar
      Merge tag 'mxs-dt-3.10' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/dt2 · 03e86b3a
      Arnd Bergmann authored
      From Shawn Guo <shawn.guo@linaro.org>:
      
      The mxs device tree changes for 3.10:
      
      * Move enet_out clk into device tree and have fec driver handle it.
      * Convert mxsfb driver to generic display timings bindings, and remove
        the mxsfb auxdata from platform code.
      * Add generic DMA device tree binding for mxs-dma, and convert the most
        of client device drivers to it.
      * Change mxsfb driver to use regulator for controlling power of panel.
      * A few device tree source updates
      
      * tag 'mxs-dt-3.10' of git://git.linaro.org/people/shawnguo/linux-2.6: (23 commits)
        video: mxsfb: Introduce regulator support
        ARM: dts: cfa10036: Add touchscreen support to the CFA-10049
        ARM: dts: imx23-olinuxino: mark sdcard cd as broken
        serial: mxs-auart: move to use generic DMA helper
        mtd: gpmi: move to use generic DMA helper
        i2c: i2c-mxs: move to use generic DMA helper
        spi: mxs-spi: move to use generic DMA helper
        mmc: mxs-mmc: move to use generic DMA helper
        dma: mxs-dma: move to generic device tree binding
        dma: mxs-dma: use devm_* managed functions
        ARM: dts: add generic DMA device tree binding for mxs-dma
        pinctrl: pinctrl-mxs: document the missing pull-ups
        ARM: cfa10036: add one wire bitbanging to the cfa10049
        video: mxsfb: remove mxsfb_platform_data
        ARM: mxs: move display timing configurations into device tree
        video: mxsfb: get display timings from device tree
        video: mxsfb: remove dotclk_delay from platform_data
        video: mxsfb: remove fb_phys/fb_size from platform_data
        video: mxsfb: use devm_* managed functions
        ARM: mxs: remove unneeded enet_out clk initialization
        ...
      Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      03e86b3a
    • Arnd Bergmann's avatar
      Merge branch 'mxs/cleanup' into next/dt2 · 42d96abb
      Arnd Bergmann authored
      This is a dependency for mxs/dt
      Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      42d96abb
    • Christoph Fritz's avatar
      ARM/dts: OMAP3: fix pinctrl-single configuration · 161e89a6
      Christoph Fritz authored
       - Fix 'function-mask' referring to TRM (Omap 36xx) Section 13.4.4:
         "Pad Functional Multiplexing and Configuration".
       - Fix 'omap3_pmx_wkup' referring to TRM Table 13-6:
         "Wkup Control Module Pad Configuration Register Fields".
      
      Note that these fixes are not critical currently as we
      are not yet using the missing range of pinmux registers
      at this point.
      Signed-off-by: default avatarChristoph Fritz <chf.fritz@googlemail.com>
      [tony@atomide.com: updated comments]
      Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
      161e89a6
  4. 08 Apr, 2013 31 commits