From 5315f11b23ec41324752b61289d846ed1da90c83 Mon Sep 17 00:00:00 2001 From: "bichao.zheng" Date: Sat, 23 Jun 2018 16:41:49 +0800 Subject: [PATCH] pwm: meson: add support for txl MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit PD#168480: pwm: meson: add support for txl 1、 add support for txl 2、 fix txl、txlx clock mux selection error issue Change-Id: Iff7eeb16086604030414d4e350fd533a3d2328b1 Signed-off-by: bichao.zheng Signed-off-by: Bo Yang --- drivers/amlogic/pwm/pwm_meson.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/amlogic/pwm/pwm_meson.c b/drivers/amlogic/pwm/pwm_meson.c index b2a51ffd35e4..8edca59cfa0a 100644 --- a/drivers/amlogic/pwm/pwm_meson.c +++ b/drivers/amlogic/pwm/pwm_meson.c @@ -444,7 +444,7 @@ static const char * const pwm_txlx_ee_parent_names[] = { }; static const char * const pwm_txlx_ao_parent_names[] = { - "clk81", "xtal", "null", "null" + "xtal", "clk81", "null", "null" }; static const char * const pwm_axg_ee_parent_names[] = { @@ -528,6 +528,8 @@ static const struct of_device_id meson_pwm_matches[] = { { .compatible = "amlogic,g12b-ao-pwm", .data = &pwm_g12a_ao_data }, { .compatible = "amlogic,txlx-ee-pwm", .data = &pwm_txlx_ee_data }, { .compatible = "amlogic,txlx-ao-pwm", .data = &pwm_txlx_ao_data }, + { .compatible = "amlogic,txl-ee-pwm", .data = &pwm_txlx_ee_data }, + { .compatible = "amlogic,txl-ao-pwm", .data = &pwm_txlx_ao_data }, { .compatible = "amlogic,axg-ee-pwm", .data = &pwm_axg_ee_data }, { .compatible = "amlogic,axg-ao-pwm", .data = &pwm_axg_ao_data }, /*for gxl gxtvbb gxm*/