19 files changed, 1183 insertions, 145 deletions

diff --git a/Documentation/devicetree/bindings/pwm/pwm-meson.txt b/Documentation/devicetree/bindings/pwm/pwm-meson.txt
new file mode 100644
index 000000000000..5376a4468cb6
--- /dev/null
+++ b/Documentation/devicetree/bindings/pwm/pwm-meson.txt
@@ -0,0 +1,23 @@
+Amlogic Meson PWM Controller
+============================
+
+Required properties:
+- compatible: Shall contain "amlogic,meson8b-pwm" or "amlogic,meson-gxbb-pwm".
+- #pwm-cells: Should be 3. See pwm.txt in this directory for a description of
+  the cells format.
+
+Optional properties:
+- clocks: Could contain one or two parents clocks phandle for each of the two
+  PWM channels.
+- clock-names: Could contain at least the "clkin0" and/or "clkin1" names.
+
+Example:
+
+        pwm_ab: pwm@8550 {
+                compatible = "amlogic,meson-gxbb-pwm";
+                reg = <0x0 0x08550 0x0 0x10>;
+                #pwm-cells = <3>;
+                status = "disabled";
+                clocks = <&xtal>, <&xtal>;
+                clock-names = "clkin0", "clkin1";
+        }
diff --git a/Documentation/devicetree/bindings/pwm/pwm-mtk-disp.txt b/Documentation/devicetree/bindings/pwm/pwm-mtk-disp.txt
index f8f59baf6b67..6f8af2bcc7b7 100644
--- a/Documentation/devicetree/bindings/pwm/pwm-mtk-disp.txt
+++ b/Documentation/devicetree/bindings/pwm/pwm-mtk-disp.txt
@@ -2,8 +2,9 @@ MediaTek display PWM controller
 
 Required properties:
  - compatible: should be "mediatek,<name>-disp-pwm":
-   - "mediatek,mt8173-disp-pwm": found on mt8173 SoC.
+   - "mediatek,mt2701-disp-pwm": found on mt2701 SoC.
    - "mediatek,mt6595-disp-pwm": found on mt6595 SoC.
+   - "mediatek,mt8173-disp-pwm": found on mt8173 SoC.
  - reg: physical base address and length of the controller's registers.
  - #pwm-cells: must be 2. See pwm.txt in this directory for a description of
    the cell format.
diff --git a/Documentation/devicetree/bindings/pwm/pwm-st.txt b/Documentation/devicetree/bindings/pwm/pwm-st.txt
index 84d2fb807d3c..19fce774cafa 100644
--- a/Documentation/devicetree/bindings/pwm/pwm-st.txt
+++ b/Documentation/devicetree/bindings/pwm/pwm-st.txt
@@ -13,13 +13,14 @@ Required parameters:
 - pinctrl-0:            List of phandles pointing to pin configuration nodes
                         for PWM module.
                         For Pinctrl properties, please refer to [1].
-- clock-names:          Set to "pwm".
+- clock-names:          Valid entries are "pwm" and/or "capture".
 - clocks:               phandle of the clock used by the PWM module.
                         For Clk properties, please refer to [2].
+- interrupts:           IRQ for the Capture device
 
 Optional properties:
-- st,pwm-num-chan:      Number of available channels. If not passed, the driver
-                        will consider single channel by default.
+- st,pwm-num-chan:      Number of available PWM channels.  Default is 0.
+- st,capture-num-chan:  Number of available Capture channels.  Default is 0.
 
 [1] Documentation/devicetree/bindings/pinctrl/pinctrl-bindings.txt
 [2] Documentation/devicetree/bindings/clock/clock-bindings.txt
@@ -38,4 +39,5 @@ pwm1: pwm@fe510000 {
         clocks = <&clk_sysin>;
         clock-names = "pwm";
         st,pwm-num-chan = <4>;
+        st,capture-num-chan = <2>;
 };
diff --git a/Documentation/devicetree/bindings/pwm/pwm-sun4i.txt b/Documentation/devicetree/bindings/pwm/pwm-sun4i.txt
index cf6068b8e974..f1cbeefb3087 100644
--- a/Documentation/devicetree/bindings/pwm/pwm-sun4i.txt
+++ b/Documentation/devicetree/bindings/pwm/pwm-sun4i.txt
@@ -6,6 +6,7 @@ Required properties:
     - "allwinner,sun5i-a10s-pwm"
     - "allwinner,sun5i-a13-pwm"
     - "allwinner,sun7i-a20-pwm"
+    - "allwinner,sun8i-h3-pwm"
   - reg: physical base address and length of the controller's registers
   - #pwm-cells: should be 3. See pwm.txt in this directory for a description of
     the cells format.
diff --git a/drivers/pwm/Kconfig b/drivers/pwm/Kconfig
index 80a566a00d04..bf0128899c09 100644
--- a/drivers/pwm/Kconfig
+++ b/drivers/pwm/Kconfig
@@ -262,6 +262,15 @@ config PWM_LPSS_PLATFORM
           To compile this driver as a module, choose M here: the module
           will be called pwm-lpss-platform.
 
+config PWM_MESON
+        tristate "Amlogic Meson PWM driver"
+        depends on ARCH_MESON
+        help
+          The platform driver for Amlogic Meson PWM controller.
+
+          To compile this driver as a module, choose M here: the module
+          will be called pwm-meson.
+
 config PWM_MTK_DISP
         tristate "MediaTek display PWM driver"
         depends on ARCH_MEDIATEK || COMPILE_TEST
diff --git a/drivers/pwm/Makefile b/drivers/pwm/Makefile
index feef1dd29f73..1194c54efcc2 100644
--- a/drivers/pwm/Makefile
+++ b/drivers/pwm/Makefile
@@ -24,6 +24,7 @@ obj-$(CONFIG_PWM_LPC32XX)	+= pwm-lpc32xx.o
 obj-$(CONFIG_PWM_LPSS)          += pwm-lpss.o
 obj-$(CONFIG_PWM_LPSS_PCI)      += pwm-lpss-pci.o
 obj-$(CONFIG_PWM_LPSS_PLATFORM) += pwm-lpss-platform.o
+obj-$(CONFIG_PWM_MESON)         += pwm-meson.o
 obj-$(CONFIG_PWM_MTK_DISP)      += pwm-mtk-disp.o
 obj-$(CONFIG_PWM_MXS)           += pwm-mxs.o
 obj-$(CONFIG_PWM_OMAP_DMTIMER)  += pwm-omap-dmtimer.o
diff --git a/drivers/pwm/core.c b/drivers/pwm/core.c
index 0dbd29e287db..172ef8245811 100644
--- a/drivers/pwm/core.c
+++ b/drivers/pwm/core.c
@@ -339,6 +339,8 @@ int pwmchip_remove(struct pwm_chip *chip)
         unsigned int i;
         int ret = 0;
 
+        pwmchip_sysfs_unexport_children(chip);
+
         mutex_lock(&pwm_lock);
 
         for (i = 0; i < chip->npwm; i++) {
diff --git a/drivers/pwm/pwm-berlin.c b/drivers/pwm/pwm-berlin.c
index 65108129d505..01339c152ab0 100644
--- a/drivers/pwm/pwm-berlin.c
+++ b/drivers/pwm/pwm-berlin.c
@@ -16,6 +16,7 @@
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/pwm.h>
+#include <linux/slab.h>
 
 #define BERLIN_PWM_EN                   0x0
 #define  BERLIN_PWM_ENABLE              BIT(0)
@@ -27,6 +28,13 @@
 #define BERLIN_PWM_TCNT                 0xc
 #define  BERLIN_PWM_MAX_TCNT            65535
 
+struct berlin_pwm_channel {
+        u32 enable;
+        u32 ctrl;
+        u32 duty;
+        u32 tcnt;
+};
+
 struct berlin_pwm_chip {
         struct pwm_chip chip;
         struct clk *clk;
@@ -55,6 +63,25 @@ static inline void berlin_pwm_writel(struct berlin_pwm_chip *chip,
         writel_relaxed(value, chip->base + channel * 0x10 + offset);
 }
 
+static int berlin_pwm_request(struct pwm_chip *chip, struct pwm_device *pwm)
+{
+        struct berlin_pwm_channel *channel;
+
+        channel = kzalloc(sizeof(*channel), GFP_KERNEL);
+        if (!channel)
+                return -ENOMEM;
+