1. 12 12月, 2013 4 次提交
  2. 05 12月, 2013 2 次提交
    • O
      Merge tag 'at91-cleanup' of git://github.com/at91linux/linux-at91 into next/cleanup · 94c5216e
      Olof Johansson 提交于
      From Nicolas Ferre:
      AT91: Move to Common Clock Framework and sama5d3 implementation
      This is the first step to move AT91 to the CCF.
      - core CCF and drivers for most of the clocks
      - use of CCF for sama5d3 (100% DT-based)
      
      * tag 'at91-cleanup' of git://github.com/at91linux/linux-at91: (22 commits)
        ARM: at91/dt: remove old clk material
        ARM: at91: move sama5d3 SoC to common clk
        ARM: at91/dt: define sama5d3xek's main clk frequency
        ARM: at91/dt: define sama5d3 clocks
        ARM: at91: prepare common clk transition for sama5d3 SoC
        ARM: at91: prepare sama5 dt boards transition to common clk
        ARM: at91: add new compatible strings for pmc driver
        ARM: at91: move pit timer to common clk framework
        dt: binding: add at91 clks dt bindings documentation
        clk: at91: add PMC smd clock
        clk: at91: add PMC usb clock
        clk: at91: add PMC utmi clock
        clk: at91: add PMC programmable clocks
        clk: at91: add PMC peripheral clocks
        clk: at91: add PMC system clocks
        clk: at91: add PMC master clock
        clk: at91: add PMC pll clocks
        clk: at91: add PMC main clock
        clk: at91: add PMC macro file for dt definitions
        clk: at91: add PMC base support
        ...
      Signed-off-by: NOlof Johansson <olof@lixom.net>
      94c5216e
    • O
      Merge commit 'fixes' into next/cleanup · 330641ce
      Olof Johansson 提交于
      Merging in post-rc1 fixes that have gone into rc2/3 to avoid later conflicts.
      
      * commit 'fixes': (39 commits)
        arm: dts: socfpga: Change some clocks of gate-clk type to perip-clk
        arm: socfpga: Enable ARM_TWD for socfpga
        ARM: multi_v7_defconfig: enable SDHCI_BCM_KONA and MMC_BLOCK_MINORS=16
        ARM: sunxi_defconfig: enable NFS, TMPFS, PRINTK_TIME and nfsroot support
        ARM: multi_v7_defconfig: enable network for BeagleBone Black
        ARM: dts: Fix the name of supplies for smsc911x shared by OMAP
        ARM: OMAP2+: Powerdomain: Fix unchecked dereference of arch_pwrdm
        ARM: dts: omap3-beagle: Add omap-twl4030 audio support
        ARM: dts: omap4-sdp: Fix pin muxing for wl12xx
        ARM: dts: omap4-panda-common: Fix pin muxing for wl12xx
        ARM: at91: fixed unresolved symbol "at91_pm_set_standby" when built without CONFIG_PM
        ARM: at91: add usart3 alias to dtsi
        ARM: at91: sama5d3: reduce TWI internal clock frequency
        mmc: omap: Fix I2C dependency and make driver usable with device tree
        mmc: omap: Fix DMA configuration to not rely on device id
        ARM: dts: omap3-beagle: Fix USB host on beagle boards (for 3.13)
        ARM: dts: omap3-igep0020: name twl4030 VPLL2 regulator as vdds_dsi
        ARM: dts: AM33XX IGEP0033: add USB support
        ARM: dts: AM33XX BASE0033: add 32KBit EEPROM support
        ARM: dts: AM33XX BASE0033: add pinmux and user led support
        ...
      Signed-off-by: NOlof Johansson <olof@lixom.net>
      330641ce
  3. 04 12月, 2013 11 次提交
    • O
      Merge tag 'mvebu-soc-3.14' of git://git.infradead.org/linux-mvebu into next/cleanup · 63167569
      Olof Johansson 提交于
      From Jason Cooper:
      mvebu soc changes for v3.14
      
       - orion:
          - remove IRQF_DISABLED
          - directly include some .h files
      
       - mvebu:
          - remove some sparse warnings
      
       - orion5x:
          - include cleanup
          - warning removal for C=1
      
       - kirkwood:
          - remove legacy clock workarounds
          - stop rpinting a TCLK value of 0 for DT boards
      
       - dove:
          - warning removal for C=1
      
      * tag 'mvebu-soc-3.14' of git://git.infradead.org/linux-mvebu:
        ARM: mvebu: fix some sparse warnings
        ARM: kirkwood: stop printk TCLK value at boot for DT boards
        ARM: orion5x: drop unused include from common.c
        ARM: Dove: Fix compiler warnings with C=1 builds
        ARM: Orion5x: Fix warnings when using C=1.
        ARM: Orion: Add missing includes
        ARM: kirkwood: remove lagacy clk workarounds
        arm: plat-orion: remove deprecated IRQF_DISABLED
      Signed-off-by: NOlof Johansson <olof@lixom.net>
      63167569
    • O
      Merge tag 'renesas-cleanup-for-v3.14' of... · 6ecf49bc
      Olof Johansson 提交于
      Merge tag 'renesas-cleanup-for-v3.14' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/cleanup
      
      From Simon Horman:
      
      Renesas ARM based SoC cleanups for v3.14
      
      * Tidy up clock table order for r7s72100, r8a7779, r8a7779, r8a7790,
        sh7372 and sh73a0 SoCs.
      * Tidy up camera-rcar header for r8a7779 SoC
      * Tidy up registration of VIN on r8a7779 SoC
      * Tidy up PFC registration on r8a7790 SoC
      * Correct typo in clocks for r8a7790 SoC
      * Don't use named resources for IPMMU, I2C and TMU on sh73a0 SoC
      * Don't use named resources for MMCIF and SDHI on ape6evm board
      * Don't use named resources for MMCIF on lager board
      * Tidy up device registration on lager board
      * Tidy up headers for bockw board
      
      * tag 'renesas-cleanup-for-v3.14' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
        ARM: shmobile: sh7372: tidyup clock table order
        ARM: shmobile: r7s72100: tidyup clock table order
        ARM: shmobile: sh73a0: tidyup clock table order
        ARM: shmobile: r8a7779: cleanup registration of sh_eth
        ARM: shmobile: r8a7790: Correct typo in clocks
        ARM: shmobile: r8a7779: camera-rcar header cleanup
        ARM: shmobile: Add r8a7790_register_pfc() function
        ARM: shmobile: Cosmetic update of Lager DT Reference
        ARM: shmobile: r8a7779: cleanup registration of VIN
        ARM: shmobile: bockw: header cleanup
        ARM: shmobile: sh73a0: don't use named resource for IPMMU
        ARM: shmobile: sh73a0: don't use named resource for I2C
        ARM: shmobile: sh73a0: don't use named resource for TMU
        ARM: shmobile: lager: don't use named resource for MMCIF
        ARM: shmobile: ape6evm: don't use named resource for SDHI
        ARM: shmobile: ape6evm: don't use named resource for MMCIF
      Signed-off-by: NOlof Johansson <olof@lixom.net>
      6ecf49bc
    • D
      arm: dts: socfpga: Change some clocks of gate-clk type to perip-clk · a5c6e87a
      Dinh Nguyen 提交于
      Some of the clocks that were designated gate-clk do not have a gate, so
      change those clocks to be of periph-clk type.
      Signed-off-by: NDinh Nguyen <dinguyen@altera.com>
      Signed-off-by: NOlof Johansson <olof@lixom.net>
      a5c6e87a
    • D
      arm: socfpga: Enable ARM_TWD for socfpga · 725dd7eb
      Dinh Nguyen 提交于
      Update Kconfig to enable TWD.
      Signed-off-by: NDinh Nguyen <dinguyen@altera.com>
      Reviewed-by: NPavel Machek <pavel@denx.de>
      Signed-off-by: NOlof Johansson <olof@lixom.net>
      725dd7eb
    • O
      ARM: multi_v7_defconfig: enable SDHCI_BCM_KONA and MMC_BLOCK_MINORS=16 · f39918ee
      Olof Johansson 提交于
      Enable MMC/SD on the Broadcom mobile platforms, and increase the block
      minors from the default 8 to 16 (since the Broadcom board by default
      has root on the 8th partition).
      Signed-off-by: NOlof Johansson <olof@lixom.net>
      Cc: stable@vger.kernel.org # v3.12
      f39918ee
    • O
      ARM: sunxi_defconfig: enable NFS, TMPFS, PRINTK_TIME and nfsroot support · 610ffd58
      Olof Johansson 提交于
      This enables a few more options on the sunxi defconfigs such that I can
      use nfsroot to boot them (there is no local storage support yet). It
      also enables PRINTK_TIME and tmpfs since it's a common distro requirement.
      Signed-off-by: NOlof Johansson <olof@lixom.net>
      610ffd58
    • O
      Merge tag 'omap-for-v3.13/more-dt-regressions' of... · 82cca5da
      Olof Johansson 提交于
      Merge tag 'omap-for-v3.13/more-dt-regressions' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes
      
      From Tony Lindgren:
      
      Few more legacy booting vs device tree booting fixes that people
      have noticed while booting things with device tree for things like
      omap4 WLAN, smsc911x, and beagle audio. Hopefully this will be it
      for the legacy booting vs device tree fixes for this -rc cycle.
      
      * tag 'omap-for-v3.13/more-dt-regressions' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
        ARM: dts: Fix the name of supplies for smsc911x shared by OMAP
        ARM: OMAP2+: Powerdomain: Fix unchecked dereference of arch_pwrdm
        ARM: dts: omap3-beagle: Add omap-twl4030 audio support
        ARM: dts: omap4-sdp: Fix pin muxing for wl12xx
        ARM: dts: omap4-panda-common: Fix pin muxing for wl12xx
      82cca5da
    • O
      ARM: multi_v7_defconfig: enable network for BeagleBone Black · 0dfee674
      Olof Johansson 提交于
      BeagleBone Black uses the TI CPSW ethernet controller, enable it in the
      multi_v7_defconfig for testing coverage purposes.
      Signed-off-by: NOlof Johansson <olof@lixom.net>
      Acked-by: NTony Lindgren <tony@atomide.com>
      Cc: stable@vger.kernel.org # v3.12
      0dfee674
    • O
      Merge tag 'at91-fixes' of git://github.com/at91linux/linux-at91 into fixes · 3060817f
      Olof Johansson 提交于
      From Nicolas Ferre:
      AT91: second round of fixes for 3.13
      - reduce IP frequency for I2C on sama5d3
      - missing aliases directive for USART3 on 9x5 family
      - a PM symbol is missing if !CONFIG_PM
      
      * tag 'at91-fixes' of git://github.com/at91linux/linux-at91:
        ARM: at91: fixed unresolved symbol "at91_pm_set_standby" when built without CONFIG_PM
        ARM: at91: add usart3 alias to dtsi
        ARM: at91: sama5d3: reduce TWI internal clock frequency
      3060817f
    • O
      Merge tag 'mvebu-dt-fixes-3.13' of git://git.infradead.org/linux-mvebu into fixes · c0c3350c
      Olof Johansson 提交于
      From Jason Cooper, mvebu DT fixes for v3.13:
       - mvebu
          - PCIe fixes now that we have test devices with more ports.
          - fix access to coherency registers
      
      * tag 'mvebu-dt-fixes-3.13' of git://git.infradead.org/linux-mvebu:
        ARM: mvebu: re-enable PCIe on Armada 370 DB
        ARM: mvebu: use the virtual CPU registers to access coherency registers
        ARM: mvebu: fix second and third PCIe unit of Armada XP mv78260
        ARM: mvebu: second PCIe unit of Armada XP mv78230 is only x1 capable
      c0c3350c
    • O
      Merge tag 'omap-for-v3.13/fixes-against-rc1-take2' of... · b8be3a22
      Olof Johansson 提交于
      Merge tag 'omap-for-v3.13/fixes-against-rc1-take2' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes
      
      From Tony Lindgren:
      
      Some omap related fixes that have come up with people moving to device
      tree only based booting for omap2+.
      
      The series contains a handful of fixes for the igep boards as they were
      one of the first omap3 boards to jump over completely to device tree
      based booting. So these can be considered regressions compared to
      booting igep in legacy mode with board files in v3.12.
      
      Also included are few other device tree vs legacy booting regressions:
      
      - yet more missing omap3 .dtsi entries that have showed up booting
        various boards with device tree only
      
      - n900 eMMC device tree fix
      
      - fixes for beagle USB EHCI
      
      - two fixes to make omap2420 MMC work
      
      As we're moving omap2+ to be device tree only for v3.14, I'd like to
      have v3.13 work equally well for legacy based booting and device tree
      based booting. So there will be likely few more device tree related
      booting patches trickling in.
      
      This series also includes a regression fix for the omap timer posted
      mode that may wrongly stay on from the bootloader for some SoCs.
      
      * tag 'omap-for-v3.13/fixes-against-rc1-take2' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
        mmc: omap: Fix I2C dependency and make driver usable with device tree
        mmc: omap: Fix DMA configuration to not rely on device id
        ARM: dts: omap3-beagle: Fix USB host on beagle boards (for 3.13)
        ARM: dts: omap3-igep0020: name twl4030 VPLL2 regulator as vdds_dsi
        ARM: dts: AM33XX IGEP0033: add USB support
        ARM: dts: AM33XX BASE0033: add 32KBit EEPROM support
        ARM: dts: AM33XX BASE0033: add pinmux and user led support
        ARM: dts: AM33XX BASE0033: add pinmux and hdmi node to enable display
        ARM: dts: omap3-igep0020: Add pinmuxing for DVI output
        ARM: dts: omap3-igep0020: Add pinmux setup for i2c devices
        ARM: dts: omap3-igep: Update to use the TI AM/DM37x processor
        ARM: dts: omap3-igep: Add support for LBEE1USJYC WiFi connected to SDIO
        ARM: dts: omap3-igep: Fix bus-width for mmc1
        ARM: OMAP2+: dss-common: change IGEP's DVI DDC i2c bus
        ARM: OMAP2+: Disable POSTED mode for errata i103 and i767
        ARM: OMAP2+: Fix eMMC on n900 with device tree
        ARM: OMAP2+: Add fixed regulator to omap2plus_defconfig
        ARM: OMAP2+: Fix more missing data for omap3.dtsi file
      Signed-off-by: NOlof Johansson <olof@lixom.net>
      b8be3a22
  4. 03 12月, 2013 5 次提交
  5. 02 12月, 2013 18 次提交