1. 20 Nov, 2014 9 commits
  2. 19 Nov, 2014 6 commits
    • Arnd Bergmann's avatar
      Merge tag 'mvebu-dt-3.19' of git://git.infradead.org/linux-mvebu into next/dt · 7d9e89c7
      Arnd Bergmann authored
      Pull "mvebu DT changes for v3.19" from Jason Cooper:
      
       - mvebu
          - ReadyNAS 102 leds, esata
          - ReadyNAS 2120 esata
          - Add cache-unified for Aurora L2 node
          - Add ref clk for timer and watchdog on Armada 375
          - Cleanup Armada XP pinctrl for GigE
          - Add RGMII pinctrl, i2c eeprom, and fix 74hc595 counter on Lenovo ix4-300d
      
       - kirkwood
          - Add DLink DIR665 and it's DSA configuration
      
      * tag 'mvebu-dt-3.19' of git://git.infradead.org/linux-mvebu:
        ARM: mvebu: armada-xp: Fix 74hc595 count for Lenovo ix4-300d
        ARM: mvebu: armada-xp: Add I2C eeprom on Lenovo ix4-300d
        ARM: mvebu: armada-xp: Add RGMII pinctrl to Lenovo ix4-300d
        ARM: mvebu: armada-xp: Add GE0 pinctrl settings for GMII
        ARM: mvebu: armada-xp: Move GE0/1 pinctrl settings for RGMII
        ARM: mvebu: armada-xp: Use pinctrl node alias
        ARM: mvebu: armada-xp: Add node alias to pinctrl and add base address
        ARM: mvebu: armada-xp: Consolidate pinctrl node
        ARM: Kirkwood: DIR665: Instantiate Distributed Switch Architecture
        ARM: Kirkwood: Add support for DLink DIR665
        ARM: mvebu: Enable rear eSATA ports of NETGEAR ReadyNAS 2120
        ARM: mvebu: Enable the reference clock for timer and watchdog on Armada 375 SoC
        arm: mvebu: Clarify (e)SATA ports info in NETGEAR ReadyNAS 102 .dts file
        arm: mvebu: Fix LED color in NETGEAR ReadyNAS 102 .dts file
        ARM: mvebu: Fix the Aurora L2 cache node with the required cache-unified property
      Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      7d9e89c7
    • Arnd Bergmann's avatar
      Merge tag 'hix5hd2-dt-for-3.19' of git://github.com/hisilicon/linux-hisi into next/dt · 2184d566
      Arnd Bergmann authored
      Pull "ARM: DT:  Hisilicon terminal SoC HiX5HD2 DT updates for 3.19" from Wei Xu:
      
      - Add reboot node, reusing syscon-reboot
      - Add I2C nodes Hisilicon IP
      - Add IR node based on Hisilicon IP
      - Add Watchdog node based on ARM IP
      - Add GPIO nodes based on ARM GPIO IP
      - Add SATA node based on Hisilicon IP
      - Add USB nodes
      - Add MMC nodes based on Synopsys IP
      - Add GMAC nodes based on Hisilicon IP
      
      * tag 'hix5hd2-dt-for-3.19' of git://github.com/hisilicon/linux-hisi:
        ARM: dts: hix5hd2: add reboot node
        ARM: dts: hix5hd2: add i2c node
        ARM: dts: hix5hd2: add ir node
        ARM: dts: hix5hd2: add wdg node
        ARM: dts: hix5hd2: add gpio node
        ARM: dts: hix5hd2: add sata node
        ARM: dts: hix5hd2: add usb node
        ARM: dts: hix5hd2: add mmc node
        ARM: dts: hix5hd2: add gmac node
      Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      2184d566
    • Arnd Bergmann's avatar
      Merge tag 'renesas-dt-cleanups3-for-v3.19' of... · a096c88b
      Arnd Bergmann authored
      Merge tag 'renesas-dt-cleanups3-for-v3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/dt
      
      Pull "Third Round of Renesas ARM Based SoC DT Cleanups for v3.19" from Simon Horman:
      
      * Use keyboard as gpio-keys node name
      
      * tag 'renesas-dt-cleanups3-for-v3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
        ARM: shmobile: kzm9g-reference: Use keyboard as gpio-keys node name
        ARM: shmobile: koelsch: Use keyboard as gpio-keys node name
        ARM: shmobile: lager: Use keyboard as gpio-keys node name
        ARM: shmobile: armadillo800eva: Use keyboard as gpio-keys node name
      Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      a096c88b
    • Arnd Bergmann's avatar
      Merge tag 'renesas-dt-cleanups2-for-v3.19' of... · ba84c80b
      Arnd Bergmann authored
      Merge tag 'renesas-dt-cleanups2-for-v3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/dt
      
      Pull "Second Round of Renesas ARM Based SoC DT Cleanups for v3.19" from Simon Horman:
      
      * Drop console= bootargs parameter on alt
      * Correct scifb* naming on r8a73a4
      * Drop 0x unit-address prefixes
      * Remove unnecessary MMC options
      
      * tag 'renesas-dt-cleanups2-for-v3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
        ARM: shmobile: alt dts: Drop console= bootargs parameter
        ARM: shmobile: r8a73a4: fix scifb* naming
        ARM: shmobile: kzm9g-reference dts: Drop bogus 0x unit-address prefix
        ARM: shmobile: r8a7791 dtsi: Drop bogus 0x unit-address prefix
        ARM: shmobile: r8a7790 dtsi: Drop bogus 0x unit-address prefix
        ARM: shmobile: r8a7790 dtsi: Remove unnecessary MMC options
        ARM: shmobile: r8a7779 dtsi: Remove unnecessary MMC options
        ARM: shmobile: r8a7778 dtsi: Remove unnecessary MMC options
      Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      ba84c80b
    • Arnd Bergmann's avatar
      Merge tag 'renesas-dt-for-v3.19' of... · 8ef74e5d
      Arnd Bergmann authored
      Merge tag 'renesas-dt-for-v3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/dt
      
      Pull "Renesas ARM Based SoC DT Updates for v3.19" from Simon Horman:
      
      * Add Add SoC-specific SATA compatible property to r8a7779
      * Enable DMA for MMCIF on r8a7791 and r8a7790
      * Enable USB-PHY, HS-USB and USB3.0 on r8a7791 and r8a7790
      * Enable TMU timer via DT on r8a7778
      * Enable CMT timer via DT on r8a73a4
      * Add MMP and {SR}GX clocks to  r8a7791 and r8a7790
      * Correct scifa2 clock index on r8a7740
      * Add missing INTCA for irqpin on r8a7740
      
      * tag 'renesas-dt-for-v3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: (34 commits)
        ARM: shmobile: r8a7779 dtsi: Add SoC-specific SATA compatible property
        ARM: shmobile: r8a7791: Reference DMA channels in MMCIF DT node
        ARM: shmobile: r8a7790: Reference DMA channels in MMCIF DT nodes
        ARM: shmobile: r8a7791: Add MMCIF0 DT node
        ARM: shmobile: r8a7790: Rename mmcif node to mmc
        ARM: shmobile: r8a7778: Add SoC-specific TMU compatible property
        ARM: shmobile: r8a73a4: Add SoC-specific CMT compatible property
        ARM: shmobile: henninger: enable HS-USB
        ARM: shmobile: koelsch: enable HS-USB
        ARM: shmobile: r8a7791: add HS-USB device node
        ARM: shmobile: lager: enable HS-USB
        ARM: shmobile: r8a7790: add HS-USB device node
        ARM: shmobile: r8a7791: add USB3.0 device node
        ARM: shmobile: lager: enable USB3.0
        ARM: shmobile: r8a7790: add USB3.0 device node
        ARM: shmobile: r8a7794: Add arch_timer to device tree
        ARM: shmobile: bockw-reference: Initialise TMU device using DT
        ARM: shmobile: r8a7778: Add TMU nodes
        ARM: shmobile: armadillo800eva dts: Enable TMU0
        ARM: shmobile: r8a7740 dtsi: Add TMU0 and TMU1 device nodes
        ...
      Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      8ef74e5d
    • Arnd Bergmann's avatar
      Merge branch 'renesas/dt-du' into next/dt · 67ec55bc
      Arnd Bergmann authored
      This is a base for the DT updates, merged through the arm-soc
      cleanup branch.
      Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      67ec55bc
  3. 17 Nov, 2014 11 commits
    • Ludovic Desroches's avatar
      dmaengine: at_xdmac: Add DMA_PRIVATE · fef4cbf2
      Ludovic Desroches authored
      same issue as commit 7f5ae355:
      "Without DMA_PRIVATE the driver is not able to allocate more than one channel.
      Since it uses dma_get_any_slave_channel that calls private_candidate, the
      second allocation fails at
      /* some channels are already publicly allocated */
      "
      Signed-off-by: default avatarLudovic Desroches <ludovic.desroches@atmel.com>
      Signed-off-by: default avatarVinod Koul <vinod.koul@intel.com>
      fef4cbf2
    • Ludovic Desroches's avatar
      ARM: dts: at_xdmac: fix bad value of dma-cells in documentation · 466b3cf1
      Ludovic Desroches authored
      The dma-cells value in the example was 2 instead of 1.
      Signed-off-by: default avatarLudovic Desroches <ludovic.desroches@atmel.com>
      Signed-off-by: default avatarVinod Koul <vinod.koul@intel.com>
      466b3cf1
    • Ludovic Desroches's avatar
      dmaengine: at_xdmac: fix missing spin_unlock · 87809839
      Ludovic Desroches authored
      Lock taken when entering the function but unlock missing before it
      returns.
      Signed-off-by: default avatarLudovic Desroches <ludovic.desroches@atmel.com>
      Reported-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
      Signed-off-by: default avatarVinod Koul <vinod.koul@intel.com>
      87809839
    • Cyrille Pitchen's avatar
      dmaengine: at_xdmac: fix a bug in transfer residue computation · 57819276
      Cyrille Pitchen authored
      The total size of the transfer was wrong in at_xdmac_prep_slave_sg()
      resulting in bad computation of the transfer residue by
      at_xdmac_tx_status().
      Signed-off-by: default avatarCyrille Pitchen <cyrille.pitchen@atmel.com>
      Signed-off-by: default avatarLudovic Desroches <ludovic.desroches@atmel.com>
      Signed-off-by: default avatarVinod Koul <vinod.koul@intel.com>
      57819276
    • Cyrille Pitchen's avatar
      dmaengine: at_xdmac: fix software lockup at_xdmac_tx_status() · 4e097820
      Cyrille Pitchen authored
      According to the Atmel eXtended DMA controller datasheet, requesting a
      DMA transfer flush for a channel is only revelant when this transfer is
      source peripheral synchronized.
      
      So we have to check this condition before requesting a channel flush by
      writing the channel bit into the Global channel SoftWare Flush (GSWF)
      register then waiting for flush to complete by monitoring the end of
      Flush Interrupt Status (FIS) bit in the Channel Interrupt Status (CIS)
      register.
      
      Indeed, for non source peripheral synchronized transfer, writing the
      channel bit into the GSWF register does nothing. Especially, the FIS bit
      is never set into the CIS register. The former code looped forever
      waiting for this bit to be set.
      Signed-off-by: default avatarCyrille Pitchen <cyrille.pitchen@atmel.com>
      Signed-off-by: default avatarLudovic Desroches <ludovic.desroches@atmel.com>
      Signed-off-by: default avatarVinod Koul <vinod.koul@intel.com>
      4e097820
    • Ludovic Desroches's avatar
      dmaengine: at_xdmac: remove chancnt affectation · 77e6c9bf
      Ludovic Desroches authored
      Remove chancnt affectation since it is done in dma_async_device_regiser.
      Signed-off-by: default avatarLudovic Desroches <ludovic.desroches@atmel.com>
      Signed-off-by: default avatarVinod Koul <vinod.koul@intel.com>
      77e6c9bf
    • Ludovic Desroches's avatar
      dmaengine: at_xdmac: prefer usage of readl/writel_relaxed · 6e5ae29b
      Ludovic Desroches authored
      _relaxed version of readl and writel are not implemented on all
      architecture so COMPILE_TEST has to be removed in order to not cause
      some build failures.
      Signed-off-by: default avatarLudovic Desroches <ludovic.desroches@atmel.com>
      Signed-off-by: default avatarVinod Koul <vinod.koul@intel.com>
      6e5ae29b
    • Vinod Koul's avatar
      dmaengine: xdmac: fix print warning on dma_addr_t variable · 82e24246
      Vinod Koul authored
      As documented in printk-formats.txt the dma_addr_t should be printed with
      %pad specfiers. This way it works on all archs.
      
       make.cross ARCH=s390
      
      All warnings:
      
         drivers/dma/at_xdmac.c: In function 'at_xdmac_prep_slave_sg':
      >> drivers/dma/at_xdmac.c:621:3: warning: format '%x' expects argument of type 'unsigned int', but argument 5 has type 'dma_addr_t' [-Wformat=]
            dev_dbg(chan2dev(chan),
            ^
      >> drivers/dma/at_xdmac.c:621:3: warning: format '%x' expects argument of type 'unsigned int', but argument 6 has type 'dma_addr_t' [-Wformat=]
      >> drivers/dma/at_xdmac.c:628:4: warning: format '%x' expects argument of type 'unsigned int', but argument 6 has type 'dma_addr_t' [-Wformat=]
             dev_dbg(chan2dev(chan),
             ^
         drivers/dma/at_xdmac.c: In function 'at_xdmac_prep_dma_cyclic':
      >> drivers/dma/at_xdmac.c:663:2: warning: format '%x' expects argument of type 'unsigned int', but argument 5 has type 'dma_addr_t' [-Wformat=]
           dev_dbg(chan2dev(chan), "%s: buf_addr=0x%08x, buf_len=%d, period_len=%d, dir=%s, flags=0x%lx\n",
           ^
      >> drivers/dma/at_xdmac.c:690:3: warning: format '%x' expects argument of type 'unsigned int', but argument 6 has type 'dma_addr_t' [-Wformat=]
            dev_dbg(chan2dev(chan),
            ^
      >> drivers/dma/at_xdmac.c:709:3: warning: format '%x' expects argument of type 'unsigned int', but argument 5 has type 'dma_addr_t' [-Wformat=]
            dev_dbg(chan2dev(chan),
            ^
      >> drivers/dma/at_xdmac.c:709:3: warning: format '%x' expects argument of type 'unsigned int', but argument 6 has type 'dma_addr_t' [-Wformat=]
      >> drivers/dma/at_xdmac.c:716:4: warning: format '%x' expects argument of type 'unsigned int', but argument 6 has type 'dma_addr_t' [-Wformat=]
             dev_dbg(chan2dev(chan),
      
      >> drivers/dma/at_xdmac.c:731:2: warning: format '%x' expects argument of type 'unsigned int', but argument 6 has type 'dma_addr_t' [-Wformat=]
           dev_dbg(chan2dev(chan),
           ^
         drivers/dma/at_xdmac.c: In function 'at_xdmac_prep_dma_memcpy':
      >> drivers/dma/at_xdmac.c:765:2: warning: format '%x' expects argument of type 'unsigned int', but argument 5 has type 'dma_addr_t' [-Wformat=]
           dev_dbg(chan2dev(chan), "%s: src=0x%08x, dest=0x%08x, len=%d, flags=0x%lx\n",
           ^
      >> drivers/dma/at_xdmac.c:765:2: warning: format '%x' expects argument of type 'unsigned int', but argument 6 has type 'dma_addr_t' [-Wformat=]
            dev_dbg(chan2dev(chan), "%s: remaining_size=%u\n", __func__, remaining_size);
                                    ^
      >> drivers/dma/at_xdmac.c:845:3: warning: format '%x' expects argument of type 'unsigned int', but argument 5 has type 'dma_addr_t' [-Wformat=]
            dev_dbg(chan2dev(chan),
            ^
      >> drivers/dma/at_xdmac.c:845:3: warning: format '%x' expects argument of type 'unsigned int', but argument 6 has type 'dma_addr_t' [-Wformat=]
      >> drivers/dma/at_xdmac.c:852:4: warning: format '%x' expects argument of type 'unsigned int', but argument 6 has type 'dma_addr_t' [-Wformat=]
             dev_dbg(chan2dev(chan),
             ^
         drivers/dma/at_xdmac.c: In function 'at_xdmac_tx_status':
      >> drivers/dma/at_xdmac.c:929:2: warning: format '%x' expects argument of type 'unsigned int', but argument 6 has type 'dma_addr_t' [-Wformat=]
           dev_dbg(chan2dev(chan),
      Reported-by: default avatarkbuild test robot <fengguang.wu@intel.com>
      Signed-off-by: default avatarVinod Koul <vinod.koul@intel.com>
      82e24246
    • Vinod Koul's avatar
      dmaengine: xdmac: fix print warning on size_t variable · c66ec04e
      Vinod Koul authored
      As documented in printk-formats.txt the size_t should be printed with
      %zu/%zd specfiers. This way it works on all archs.
      
      make.cross ARCH=avr32
      
      All warnings:
      
         drivers/dma/at_xdmac.c: In function 'at_xdmac_prep_dma_cyclic':
      >> drivers/dma/at_xdmac.c:663: warning: format '%d' expects type 'int', but argument 6 has type 'size_t'
      >> drivers/dma/at_xdmac.c:663: warning: format '%d' expects type 'int', but argument 7 has type 'size_t'
         drivers/dma/at_xdmac.c: In function 'at_xdmac_prep_dma_memcpy':
      >> drivers/dma/at_xdmac.c:765: warning: format '%d' expects type 'int', but argument 7 has type 'size_t'
      >> drivers/dma/at_xdmac.c:794: warning: format '%u' expects type 'unsigned int', but argument 5 has type 'size_t'
      >> drivers/dma/at_xdmac.c:815: warning: format '%u' expects type 'unsigned int', but argument 5 has type 'size_t'
      Reported-by: default avatarkbuild test robot <fengguang.wu@intel.com>
      Signed-off-by: default avatarVinod Koul <vinod.koul@intel.com>
      c66ec04e
    • Vinod Koul's avatar
      dmaengine: at_xdmac: fix usage of read, write wrappers · 2abd4198
      Vinod Koul authored
      This driver uses read_relaxed and writel_relaxed to read, write to IO
      memory. the config defines COMPILE_TEST so gets compiled on different archs.
      This causes issue as few archs like x86 etc don't define it.
      So use readl/writel which is defined in all archs
      Reported-by: default avatarkbuild test robot <fengguang.wu@intel.com>
      Signed-off-by: default avatarVinod Koul <vinod.koul@intel.com>
      2abd4198
    • kbuild test robot's avatar
      dmaengine: at_xdmac: fix semicolon.cocci warnings · 5ac7d582
      kbuild test robot authored
      drivers/dma/at_xdmac.c:702:3-4: Unneeded semicolon
      
       Removes unneeded semicolon.
      
      Generated by: scripts/coccinelle/misc/semicolon.cocci
      Signed-off-by: default avatarFengguang Wu <fengguang.wu@intel.com>
      Signed-off-by: default avatarVinod Koul <vinod.koul@intel.com>
      5ac7d582
  4. 14 Nov, 2014 4 commits
  5. 12 Nov, 2014 10 commits