1. 12 May, 2014 1 commit
  2. 09 May, 2014 36 commits
  3. 07 May, 2014 3 commits
    • Harish Patil's avatar
      qlcnic: Fix Kconfig dependency on HWMON · f398a771
      Harish Patil authored
      Commit 1f0f467b "qlcnic: Add hwmon interface to export board
      temperature" introduced a randconfig build error in the case
      when the hwmon framework is built as a module and the qlcnic
      driver itself is built-in:
      
      drivers/built-in.o: In function `qlcnic_register_hwmon_dev':
      drivers/net/ethernet/qlogic/qlcnic/qlcnic_sysfs.c:1301:
      undefined reference to `hwmon_device_register_with_groups'
      drivers/built-in.o: In function `qlcnic_unregister_hwmon_dev':
      drivers/net/ethernet/qlogic/qlcnic/qlcnic_sysfs.c:1309:
      undefined reference to `hwmon_device_unregister'.
      
      This changes the Kconfig logic to enforce that the qlcnic hwmon
      support can only be enabled if it is possible to successfully
      build it.
      Signed-off-by: default avatarHarish Patil <harish.patil@qlogic.com>
      Reported-by: default avatarArnd Bergmann <arnd@arndb.de>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      f398a771
    • David S. Miller's avatar
      Merge branch 'micrel_ksz9031' · c1a58d6a
      David S. Miller authored
      Hubert Chaumette says:
      
      ====================
      net/phy: micrel: Add DT configuration support and documentation for KSZ9031
      
       - Adds DT configuration support for ksz9031
       - Renames micrel-ksz9021.txt to micrel-ksz90x1.txt and adds ksz9031 binding
         documentation
      
      Changes since v3:
       - Rebased on net-next
      Changes since v2:
       - Merged together ksz9031_load_{clk,data,ctrl}_skew_values()
       - Added field length and number of fields prameter to account for registers
        specificities
       - Added binding documentation
      Changes since v1:
       - Removed ksz9021 and ksz9031 fixup deletions from arch/arm/mach-imx/mach-imx6q.c
      
      Hubert Chaumette (2):
        Update Micrel KSZ90x1 binding documentation
        ARM: i.MX6: Add OF configuration support for ksz9031
      ====================
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      c1a58d6a
    • Hubert Chaumette's avatar
      ARM: i.MX6: Add OF configuration support for ksz9031 · 6e4b8273
      Hubert Chaumette authored
      Adds support for ksz9031 PAD skew configuration over devicetree.
      Signed-off-by: default avatarHubert Chaumette <hchaumette@adeneo-embedded.com>
      Reviewed-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      6e4b8273