Merge tag 'v4.4' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux...

Linux 4.4

Conflicts:
	arch/arm/boot/dts/Makefile
	arch/arm/boot/dts/am33xx.dtsi
	arch/arm/boot/dts/imx28-tx28.dts
	drivers/gpio/gpio-pca953x.c
	drivers/gpu/drm/imx/imx-drm-core.c
	drivers/gpu/drm/tilcdc/tilcdc_panel.c
	drivers/pwm/pwm-imx.c
	drivers/usb/musb/Kconfig
	drivers/usb/musb/musb_core.c
	drivers/video/backlight/pwm_bl.c
	include/linux/pwm.h
	sound/soc/codecs/sgtl5000.c

diff --cc arch/arm/boot/dts/Makefile
index 0a7ea52c932d2101a69a1698696d0b9a99c6a5f4,30bbc3746130a56e54fa665a763894fe4ec02e6a..b14e4d3e86e6530e7e7e01da7f008d63f4bd4a4d
--- 1/arch/arm/boot/dts/Makefile
--- 2/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@@ -285,15 -447,28 +447,29 @@@ dtb-$(CONFIG_ARCH_OMAP3) += 
        omap3-sbc-t3517.dtb \
        omap3-sbc-t3530.dtb \
        omap3-sbc-t3730.dtb \
+       omap3-thunder.dtb \
        omap3-zoom3.dtb
- dtb-$(CONFIG_SOC_AM33XX) += am335x-base0033.dtb \
+ dtb-$(CONFIG_SOC_TI81XX) += \
+       dm8148-evm.dtb \
+       dm8148-t410.dtb \
+       dm8168-evm.dtb
+ dtb-$(CONFIG_SOC_AM33XX) += \
+       am335x-baltos-ir5221.dtb \
+       am335x-base0033.dtb \
        am335x-bone.dtb \
        am335x-boneblack.dtb \
 -      am335x-sl50.dtb \
+       am335x-bonegreen.dtb \
++      am335x-chiliboard.dtb \
        am335x-evm.dtb \
        am335x-evmsk.dtb \
++      am335x-lxm.dtb \
        am335x-nano.dtb \
-       am335x-tx48.dtb
- dtb-$(CONFIG_ARCH_OMAP4) += omap4-duovero-parlor.dtb \
+       am335x-pepper.dtb \
 -      am335x-lxm.dtb \
 -      am335x-chiliboard.dtb \
++      am335x-sl50.dtb \
++      am335x-tx48.dtb \
+       am335x-wega-rdk.dtb
+ dtb-$(CONFIG_ARCH_OMAP4) += \
+       omap4-duovero-parlor.dtb \
        omap4-panda.dtb \
        omap4-panda-a4.dtb \
        omap4-panda-es.dtb \

diff --cc arch/arm/boot/dts/am335x-boneblack.dts
Simple merge

diff --cc arch/arm/boot/dts/am335x-evm.dts
Simple merge

diff --cc arch/arm/boot/dts/am335x-evmsk.dts
Simple merge

diff --cc arch/arm/boot/dts/am335x-igep0033.dtsi
Simple merge

diff --cc arch/arm/boot/dts/am335x-nano.dts
Simple merge

diff --cc arch/arm/boot/dts/am33xx.dtsi
Simple merge

diff --cc arch/arm/boot/dts/imx53-tx53-x03x.dts
Simple merge

diff --cc arch/arm/boot/dts/imx53-tx53.dtsi
Simple merge

diff --cc drivers/clk/ti/clk.c
Simple merge

diff --cc drivers/leds/trigger/ledtrig-gpio.c
Simple merge

diff --cc drivers/mfd/ti_am335x_tscadc.c
Simple merge

diff --cc drivers/pwm/core.c
Simple merge

diff --cc drivers/pwm/pwm-atmel-tcb.c
Simple merge

diff --cc drivers/pwm/pwm-atmel.c
Simple merge

diff --cc drivers/pwm/pwm-imx.c
index 7357bbb8acc9ef630ccb29d2f9fa39da102a0060,d600fd5cd4bac9a434a20798328d513d89b5452f..176e917a4cb824f52428c4841b681f9220ffdf02
--- 1/drivers/pwm/pwm-imx.c
--- 2/drivers/pwm/pwm-imx.c
+++ b/drivers/pwm/pwm-imx.c
@@@ -36,10 -38,14 +38,15 @@@
  #define MX3_PWMCR_DOZEEN              (1 << 24)
  #define MX3_PWMCR_WAITEN              (1 << 23)
  #define MX3_PWMCR_DBGEN                       (1 << 22)
 +#define MX3_PWMCR_POUTC                       (1 << 18)
  #define MX3_PWMCR_CLKSRC_IPG_HIGH     (2 << 16)
  #define MX3_PWMCR_CLKSRC_IPG          (1 << 16)
+ #define MX3_PWMCR_SWR                 (1 << 3)
  #define MX3_PWMCR_EN                  (1 << 0)
+ #define MX3_PWMSR_FIFOAV_4WORDS               0x4
+ #define MX3_PWMSR_FIFOAV_MASK         0x7
+ 
+ #define MX3_PWM_SWR_LOOP              5
  
  struct imx_chip {
        struct clk      *clk_per;
@@@ -136,10 -177,8 +178,10 @@@ static int imx_pwm_config_v2(struct pwm
                MX3_PWMCR_DOZEEN | MX3_PWMCR_WAITEN |
                MX3_PWMCR_DBGEN | MX3_PWMCR_CLKSRC_IPG_HIGH;
  
-       if (test_bit(PWMF_ENABLED, &pwm->flags))
+       if (enable)
                cr |= MX3_PWMCR_EN;
 +      if (pwm->polarity == PWM_POLARITY_INVERSED)
 +              cr |= MX3_PWMCR_POUTC;
  
        writel(cr, imx->mmio_base + MX3_PWMCR);
  

diff --cc drivers/pwm/pwm-pxa.c
Simple merge

diff --cc drivers/pwm/pwm-renesas-tpu.c
Simple merge

diff --cc drivers/pwm/pwm-samsung.c
Simple merge

diff --cc drivers/pwm/pwm-tiecap.c
Simple merge

diff --cc drivers/pwm/pwm-tiehrpwm.c
Simple merge

diff --cc drivers/pwm/pwm-vt8500.c
Simple merge

diff --cc drivers/regulator/ltc3589.c
index 7a7ade5b64071a23c999c4bbc6e99e47f86c08e4,972c386b269024180e512cab2c65da0e069817c6..fff90cd36c73c969c1f437862add4e926324a2a1
--- 1/drivers/regulator/ltc3589.c
--- 2/drivers/regulator/ltc3589.c
+++ b/drivers/regulator/ltc3589.c
@@@ -581,10 -542,8 +582,9 @@@ MODULE_DEVICE_TABLE(i2c, ltc3589_i2c_id
  static struct i2c_driver ltc3589_driver = {
        .driver = {
                .name = DRIVER_NAME,
-               .owner = THIS_MODULE,
        },
        .probe = ltc3589_probe,
 +      .remove = ltc3589_remove,
        .id_table = ltc3589_i2c_id,
  };
  module_i2c_driver(ltc3589_driver);

diff --cc drivers/spi/spi-omap2-mcspi.c
Simple merge

diff --cc drivers/usb/musb/musb_core.c
index 41034b431989cafd77231f5946dfd9a026c5c6a6,ee9ff7028b926b1a7303afb261c3b261f91c9da4..81ff12dd66152626d0b13c9806917db26ef00a1c
--- 1/drivers/usb/musb/musb_core.c
--- 2/drivers/usb/musb/musb_core.c
+++ b/drivers/usb/musb/musb_core.c
@@@ -784,7 -867,8 +865,7 @@@ b_host
                        break;
                default:
                        WARNING("unhandled DISCONNECT transition (%s)\n",
-                               usb_otg_state_string(musb->xceiv->state));
+                               usb_otg_state_string(musb->xceiv->otg->state));
 -                      break;
                }
        }
  

diff --cc drivers/usb/phy/phy-am335x-control.c
index df3e1ba5013cdd9cffdc20e8a1b0b4366faac0d4,7b3035ff94347a519a9d54f27c45108aaaca0e9f..3bff7a8b6a816e22e55a43af9f2d1d97d2eee99b
--- 1/drivers/usb/phy/phy-am335x-control.c
--- 2/drivers/usb/phy/phy-am335x-control.c
+++ b/drivers/usb/phy/phy-am335x-control.c
@@@ -174,18 -172,10 +175,17 @@@ static int am335x_control_usb_probe(str
        return 0;
  }
  
 +static int am335x_control_usb_remove(struct platform_device *pdev)
 +{
 +      module_put(pdev->dev.parent->driver->owner);
 +      return 0;
 +}
 +
  static struct platform_driver am335x_control_driver = {
        .probe          = am335x_control_usb_probe,
 +      .remove         = am335x_control_usb_remove,
        .driver         = {
                .name   = "am335x-control-usb",
-               .owner  = THIS_MODULE,
                .of_match_table = omap_control_usb_id_table,
        },
  };

diff --cc drivers/usb/phy/phy-am335x.c
Simple merge

diff --cc include/linux/pwm.h
Simple merge

diff --cc sound/soc/codecs/sgtl5000.c
Simple merge

diff --cc sound/soc/davinci/Kconfig
index ac3eaefa610c5cef4c1d61d42c5f1983913fded9,3736d9aabc563c9b006c9c00a6abea196e3e5daf..6460cf3ee40996514b370060369942fec1d3f78c
--- 1/sound/soc/davinci/Kconfig
--- 2/sound/soc/davinci/Kconfig
+++ b/sound/soc/davinci/Kconfig
@@@ -26,18 -45,9 +45,18 @@@ config SND_AM33XX_SOC_EV
          AM335X-EVMSK, and BeagelBone with AudioCape boards have this
          setup.
  
 +config  SND_AM335X_SOC_TX48
 +      tristate "SoC Audio support for Ka-Ro TX48"
 +      depends on OF && SND_DAVINCI_SOC && SOC_AM33XX
 +      select SND_SOC_SGTL5000
 +      select SND_DAVINCI_SOC_MCASP
 +      help
 +        Say Y if you want to add support for SoC audio on
 +        Ka-Ro electronics TX48
 +
  config SND_DAVINCI_SOC_EVM
        tristate "SoC Audio support for DaVinci DM6446, DM355 or DM365 EVM"
-       depends on SND_DAVINCI_SOC && I2C
+       depends on SND_EDMA_SOC && I2C
        depends on MACH_DAVINCI_EVM || MACH_DAVINCI_DM355_EVM || MACH_DAVINCI_DM365_EVM
        select SND_DAVINCI_SOC_GENERIC_EVM
        help

diff --cc sound/soc/davinci/Makefile
Simple merge