[PATCH v8 19/26] MIPS: qi_lb60: Move PWM devices to devicetree

[Paul Cercueil]

Probe the few drivers using PWMs from devicetree, now that we have a
devicetree node for the PWM driver.

Signed-off-by: Paul Cercueil <p...@crapouillou.net>
---

Notes:
     v5: New patch
    
     v6: No change
    
     v7: No change

     v8: No change

 arch/mips/boot/dts/ingenic/qi_lb60.dts | 14 ++++++++++++++
 arch/mips/jz4740/board-qi_lb60.c       | 19 -------------------
 2 files changed, 14 insertions(+), 19 deletions(-)

diff --git a/arch/mips/boot/dts/ingenic/qi_lb60.dts 
b/arch/mips/boot/dts/ingenic/qi_lb60.dts
index 76aaf8982554..85529a142409 100644
--- a/arch/mips/boot/dts/ingenic/qi_lb60.dts
+++ b/arch/mips/boot/dts/ingenic/qi_lb60.dts
@@ -9,6 +9,14 @@
        chosen {
                stdout-path = &uart0;
        };
+
+       beeper {
+               compatible = "pwm-beeper";
+               pwms = <&pwm 4 0 0>;
+
+               pinctrl-names = "default";
+               pinctrl-0 = <&pins_pwm4>;
+       };
 };
 
 &ext {
@@ -30,4 +38,10 @@
                groups = "uart0-data";
                bias-disable;
        };
+
+       pins_pwm4: pwm4 {
+               function = "pwm4";
+               groups = "pwm4";
+               bias-disable;
+       };
 };
diff --git a/arch/mips/jz4740/board-qi_lb60.c b/arch/mips/jz4740/board-qi_lb60.c
index af0c8ace0141..cc556be656d6 100644
--- a/arch/mips/jz4740/board-qi_lb60.c
+++ b/arch/mips/jz4740/board-qi_lb60.c
@@ -27,7 +27,6 @@
 #include <linux/power_supply.h>
 #include <linux/power/jz4740-battery.h>
 #include <linux/power/gpio-charger.h>
-#include <linux/pwm.h>
 
 #include <linux/platform_data/jz4740/jz4740_nand.h>
 
@@ -392,17 +391,6 @@ static struct jz4740_mmc_platform_data qi_lb60_mmc_pdata = 
{
        .power_active_low       = 1,
 };
 
-/* beeper */
-static struct pwm_lookup qi_lb60_pwm_lookup[] = {
-       PWM_LOOKUP("jz4740-pwm", 4, "pwm-beeper", NULL, 0,
-                  PWM_POLARITY_NORMAL),
-};
-
-static struct platform_device qi_lb60_pwm_beeper = {
-       .name = "pwm-beeper",
-       .id = -1,
-};
-
 /* charger */
 static char *qi_lb60_batteries[] = {
        "battery",
@@ -451,10 +439,8 @@ static struct platform_device *jz_platform_devices[] 
__initdata = {
        &jz4740_i2s_device,
        &jz4740_codec_device,
        &jz4740_adc_device,
-       &jz4740_pwm_device,
        &jz4740_dma_device,
        &qi_lb60_gpio_keys,
-       &qi_lb60_pwm_beeper,
        &qi_lb60_charger_device,
        &qi_lb60_audio_device,
 };
@@ -483,10 +469,6 @@ static struct pinctrl_map pin_map[] __initdata = {
                        "10010000.jz4740-pinctrl", "PD0", pin_cfg_bias_disable),
        PIN_MAP_CONFIGS_PIN_DEFAULT("jz4740-mmc.0",
                        "10010000.jz4740-pinctrl", "PD2", pin_cfg_bias_disable),
-
-       /* PWM pin configuration */
-       PIN_MAP_MUX_GROUP_DEFAULT("jz4740-pwm",
-                       "10010000.jz4740-pinctrl", "pwm4", "pwm4"),
 };
 
 
@@ -504,7 +486,6 @@ static int __init qi_lb60_init_platform_devices(void)
        spi_register_board_info(qi_lb60_spi_board_info,
                                ARRAY_SIZE(qi_lb60_spi_board_info));
 
-       pwm_add_table(qi_lb60_pwm_lookup, ARRAY_SIZE(qi_lb60_pwm_lookup));
        pinctrl_register_mappings(pin_map, ARRAY_SIZE(pin_map));
 
        return platform_add_devices(jz_platform_devices,
-- 
2.11.0