1. 01 6月, 2013 6 次提交
    • O
      Merge tag 'at91-dt' of git://github.com/at91linux/linux-at91 into next/dt · fc20c6ff
      Olof Johansson 提交于
      From Nicolas Ferre:
      
      Big DT-centric update for AT91:
      - Calao boards update, removal of one board C file and
        associated defconfig, Kconfig Makefile lines
      - several Acme boards updates
      - addition of watchdog, uart and pinctrl descriptions for
        several products
      - modification of RTC compatible string for 9x5 family
      
      * tag 'at91-dt' of git://github.com/at91linux/linux-at91: (21 commits)
        ARM: at91/dt: add pinctrl definition for at91 tc blocks
        ARM: at91/dts: add the watchdog nodes for at91 boards
        ARM: at91/dtsi: add the watchdog nodes for at91 SoC
        ARM: at91: drop non DT: Calao USB-A96x
        ARM: at91: dt: add Calao USB-A9G20 low power version
        ARM: at91: dt: usb-a9263: add dataflash support
        ARM: at91: dt: usb-a9263: update shutdown controller
        ARM: at91: dt: usb-a9260: update shutdown controller
        ARM: at91: dt: sam9260: add i2c gpio pinctrl
        ARM: at91: switch Fox G20 board .dts to pre-processor defines
        ARM: at91: add Acme Systems Fox G20 board
        ARM: at91/at91-ariag25.dts: UART0/1 nodes are disabled
        ARM: at91/at91sam9x5.dtsi: add UART0/1 nodes
        ARM: at91/at91-ariag25.dts: add RTC node
        ARM: at91: at91sam9x5 RTC is not compatible with at91rm9200 one
        ARM: at91: udpate defconfigs
        ARM: at91: dt: switch to standard IRQ flag defines
        ARM: at91: dt: switch to pinctrl to pre-processor
        ARM: at91: dt: add pinctrl pre-processor define
        ARM: at91: dt: switch to standard GPIO flag defines.
        ...
      Signed-off-by: NOlof Johansson <olof@lixom.net>
      fc20c6ff
    • A
      ARM: nomadik: fix clocksource warning · 3c09f4da
      Arnd Bergmann 提交于
      The clocksource API has changed slightly, which causes a harmless
      warning:
      
      /git/arm-soc/drivers/clocksource/nomadik-mtu.c:259:28: warning: 'nmdk_timer_match' defined but not used [-Wunused-variable]
       static struct of_device_id nmdk_timer_match[] __initconst = {
                                  ^
      
      Fortunately, the same API change also lets us simplify the code
      while removing the warning.
      Signed-off-by: NArnd Bergmann <arnd@arndb.de>
      Signed-off-by: NOlof Johansson <olof@lixom.net>
      3c09f4da
    • O
      Merge tag 'dt-3.11-3' of git://git.infradead.org/users/jcooper/linux into next/dt · d1ba78cd
      Olof Johansson 提交于
      From jason Cooper, mvebu dt changes for v3.11.
      Signed-off-by: NOlof Johansson <olof@lixom.net>
      
      * tag 'dt-3.11-3' of git://git.infradead.org/users/jcooper/linux: (27 commits)
        arm: kirkwood: openblocks-a6: add support for Init button
        arm: kirkwood: openblocks-a6: group pinmux configurations
        arm: kirkwood: ts219: move pinmux configs to the right devices
        arm: kirkwood: topkick: move pinmux configs to the right devices
        arm: kirkwood: openblocks_a6: move pinmux configs to the right devices
        arm: kirkwood: nsa310: move pinmux configs to the right devices
        arm: kirkwood: readynas: move pinmux configs to the right devices
        arm: kirkwood: mplcec4: move pinmux configs to the right devices
        arm: kirkwood: buffalo linkstation: move pinmux configs to the right devices
        arm: kirkwood: keymile: move pinmux configs to the right devices
        arm: kirkwood: ns2: move pinmux configs to the right devices
        arm: kirkwood: iomega ix2-200: move pinmux configs to the right devices
        arm: kirkwood: iconnect: move pinmux configs to the right devices
        arm: kirkwood: iconnect: give meaningful names to pinmux configs
        arm: kirkwood: ib62x0: move pinmux configs to the right devices
        arm: kirkwood: guruplug: move pinmux configs to the right devices
        arm: kirkwood: goflexnet: move pinmux configs to the right devices
        arm: kirkwood: dreamplug: move pinmux configs to the right devices
        arm: kirkwood: dockstar: move pinmux configs to the right devices
        arm: kirkwood: dlink dns: move pinmux configs to the right devices
        ...
      d1ba78cd
    • B
      ARM: at91/dt: add pinctrl definition for at91 tc blocks · 028633c2
      Boris BREZILLON 提交于
      This patch adds pinctrl configurations for at91 Timer Counter blocks.
      These pin definitions can be referenced by "atmel,tcb-pwm" devices to
      setup pins as PWM output for instance.
      Signed-off-by: NBoris BREZILLON <b.brezillon@overkiz.com>
      [nicolas.ferre@atmel.com: switch to pinctrl pre-processor macros]
      Signed-off-by: NNicolas Ferre <nicolas.ferre@atmel.com>
      028633c2
    • W
      ARM: at91/dts: add the watchdog nodes for at91 boards · c77bcef4
      Wenyou Yang 提交于
      boards include:
      at91sam9263ek, at91sam9g20ek, at91sam9m10g45ek, at91sam9n12ek, at91sam9x5ek
      Signed-off-by: NWenyou Yang <wenyou.yang@atmel.com>
      Tested-by: NRichard Genoud <richard.genoud@gmail.com>
      Signed-off-by: NNicolas Ferre <nicolas.ferre@atmel.com>
      c77bcef4
    • W
      ARM: at91/dtsi: add the watchdog nodes for at91 SoC · 136d3556
      Wenyou Yang 提交于
      at91sam9x5, at91sam9n12
      Signed-off-by: NWenyou Yang <wenyou.yang@atmel.com>
      Tested-by: NRichard Genoud <richard.genoud@gmail.com>
      Signed-off-by: NNicolas Ferre <nicolas.ferre@atmel.com>
      136d3556
  2. 31 5月, 2013 12 次提交
  3. 28 5月, 2013 1 次提交
  4. 27 5月, 2013 21 次提交