• Linus Torvalds's avatar
    Merge branch 'i2c-embedded/for-next' of git://git.pengutronix.de/git/wsa/linux · ae32adc1
    Linus Torvalds authored
    Pull i2c-embedded changes from Wolfram Sang:
     "Major changes:
    
       - lots of devicetree additions for existing drivers.  I tried hard to
         make sure the bindings are proper.  In more complicated cases, I
         requested acks from people having more experience with them than
         me.  That took a bit of extra time and also some time went into
         discussions with developers about what bindings are and what not.
         I have the feeling that the workflow with bindings should be
         improved to scale better.  I will spend some more thought on
         this...
    
       - i2c-muxes are succesfully used meanwhile, so we dropped
         EXPERIMENTAL for them and renamed the drivers to a standard pattern
         to match the rest of the subsystem.  They can also be used with
         devicetree now.
    
       - ixp2000 was removed since the whole platform goes away.
    
       - cleanups (strlcpy instead of strcpy, NULL instead of 0)
    
       - The rest is typical driver fixes I assume.
    
      All patches have been in linux-next at least since v3.4-rc6."
    
    Fixed up trivial conflict in arch/arm/mach-lpc32xx/common.c due to the
    same patch already having come in through the arm/soc trees, with
    additional patches on top of it.
    
    * 'i2c-embedded/for-next' of git://git.pengutronix.de/git/wsa/linux: (35 commits)
      i2c: davinci: Free requested IRQ in remove
      i2c: ocores: register OF i2c devices
      i2c: tegra: notify transfer-complete after clearing status.
      I2C: xiic: Add OF binding support
      i2c: Rename last mux driver to standard pattern
      i2c: tegra: fix 10bit address configuration
      i2c: muxes: rename first set of drivers to a standard pattern
      of/i2c: implement of_find_i2c_adapter_by_node
      i2c: implement i2c_verify_adapter
      i2c-s3c2410: Add HDMIPHY quirk for S3C2440
      i2c-s3c2410: Rework device type handling
      i2c: muxes are not EXPERIMENTAL anymore
      i2c/of: Automatically populate i2c mux busses from device tree data.
      i2c: Add a struct device * parameter to i2c_add_mux_adapter()
      of/i2c: call i2c_verify_client from of_find_i2c_device_by_node
      i2c: designware: Add clk_{un}prepare() support
      i2c: designware: add PM support
      i2c: ixp2000: remove driver
      i2c: pnx: add device tree support
      i2c: imx: don't use strcpy but strlcpy
      ...
    ae32adc1
i2c-imx.c 17.8 KB