pwm: Add support for Amlogic Meson G12A
Subsystems (3)
v2 cover pwm: Add support for Amlogic Meson G12A
This adds support for the PWM modules on the Amlogic Meson G12A SoC family, including bindings changes and DT nodes.
Changes since v1:
- Add two different AO compatible to distinguish the different clock sources
Neil Armstrong (3):
dt-bindings: pwm: Update bindings for the Meson G12A Family
pwm: meson: Add clock source configuration for Meson G12A
arm64: dts: meson-g12a: Add PWM nodes
.../devicetree/bindings/pwm/pwm-meson.txt | 3 + arch/arm64/boot/dts/amlogic/meson-g12a.dtsi | 179 ++++++++++++++++++ drivers/pwm/pwm-meson.c | 30 +++ 3 files changed, 212 insertions(+)
Signature · 1 line
2.21.0
PATCH v2 1/3 dt-bindings: pwm: Update bindings for the Meson G12A Family
Update the doc to explicitly support Meson G12A Family.
The 2 first (A & B) AO PWM uses different clock source than the last 2 (C & D) AO PWM modules, thus we need to differentiate them.
--- Documentation/devicetree/bindings/pwm/pwm-meson.txt | 3 +++ 1 file changed, 3 insertions(+)
Documentation/devicetree/bindings/pwm/pwm-meson.txt +3 -0
@@ -7,6 +7,9 @@ Required properties: or "amlogic,meson-gxbb-ao-pwm" or "amlogic,meson-axg-ee-pwm" or "amlogic,meson-axg-ao-pwm" + or "amlogic,meson-g12a-ee-pwm" + or "amlogic,meson-g12a-ao-pwm-ab" + or "amlogic,meson-g12a-ao-pwm-cd" - #pwm-cells: Should be 3. See pwm.txt in this directory for a description of the cells format.
Signature · 1 line
2.21.0
Re: [PATCH v2 1/3] dt-bindings: pwm: Update bindings for the Meson G12A Family
Quoted 6 lines · Neil Armstrong
Update the doc to explicitly support Meson G12A Family.
The 2 first (A & B) AO PWM uses different clock source than the last 2 (C & D) AO PWM modules, thus we need to differentiate them.Signed-off-by Neil Armstrong <[email protected]>
Re: [PATCH v2 1/3] dt-bindings: pwm: Update bindings for the Meson G12A Family
In reply to Neil ArmstrongQuoted 9 lines · Neil Armstrong
Update the doc to explicitly support Meson G12A Family.
The 2 first (A & B) AO PWM uses different clock source than the last 2 (C & D) AO PWM modules, thus we need to differentiate them.Signed-off-by Neil Armstrong <[email protected]>--- Documentation/devicetree/bindings/pwm/pwm-meson.txt | 3 +++ 1 file changed, 3 insertions(+)
PATCH v2 2/3 pwm: meson: Add clock source configuration for Meson G12A
In reply to Neil ArmstrongFor the PWM controller in the Meson G12A SoC, the EE domain and AO domain have different clock sources. This patch tries to describe them in the DT compatible data. The two AO PWM controller has different clock source, but the first AO controller (A & B) can reuse the AXG parents name.
--- drivers/pwm/pwm-meson.c | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+)
drivers/pwm/pwm-meson.c +30 -0
@@ -434,6 +434,24 @@ static const struct meson_pwm_data pwm_axg_ao_data = { .num_parents = ARRAY_SIZE(pwm_axg_ao_parent_names), }; +static const char *const pwm_g12a_ao_cd_parent_names[] = { +"aoclk81" ,"xtal" , +}; + +static const struct meson_pwm_data pwm_g12a_ao_cd_data = { + .parent_names = pwm_g12a_ao_cd_parent_names, + .num_parents =ARRAY_SIZE (pwm_g12a_ao_cd_parent_names), +}; + +static const char *const pwm_g12a_ee_parent_names[] = { +"xtal" ,"hdmi_pll" ,"fclk_div4" ,"fclk_div3" +}; + +static const struct meson_pwm_data pwm_g12a_ee_data = { + .parent_names = pwm_g12a_ee_parent_names, + .num_parents =ARRAY_SIZE (pwm_g12a_ee_parent_names), +}; +static const struct of_device_id meson_pwm_matches[] = { { .compatible ="amlogic,meson8b-pwm" ,
@@ -455,6 +473,18 @@ static const struct of_device_id meson_pwm_matches[] = { .compatible = "amlogic,meson-axg-ao-pwm", .data = &pwm_axg_ao_data }, + { + .compatible = "amlogic,meson-g12a-ee-pwm", + .data = &pwm_g12a_ee_data + }, + { + .compatible = "amlogic,meson-g12a-ao-pwm-ab", + .data = &pwm_axg_ao_data + }, + { + .compatible = "amlogic,meson-g12a-ao-pwm-cd", + .data = &pwm_g12a_ao_cd_data + }, {}, };MODULE_DEVICE_TABLE (of, meson_pwm_matches);
Signature · 1 line
2.21.0
Re: [PATCH v2 2/3] pwm: meson: Add clock source configuration for Meson G12A
Quoted 7 lines · Neil Armstrong
For the PWM controller in the Meson G12A SoC, the EE domain and AO domain have different clock sources. This patch tries to describe them in the DT compatible data. The two AO PWM controller has different clock source, but the first AO controller (A & B) can reuse the AXG parents name.
Signed-off-by Neil Armstrong <[email protected]>
PATCH v2 3/3 arm64: dts: meson-g12a: Add PWM nodes
In reply to Neil ArmstrongThis adds the EE and AO PWM nodes and the possible pinctrl settings.
--- arch/arm64/boot/dts/amlogic/meson-g12a.dtsi | 179 ++++++++++++++++++++ 1 file changed, 179 insertions(+)
arch/arm64/boot/dts/amlogic/meson-g12a.dtsi +179 -0
@@ -202,6 +202,94 @@ }; }; + pwm_a_pins: pwm-a { + mux { + groups = "pwm_a"; + function = "pwm_a"; + bias-disable; + }; + }; + + pwm_b_x7_pins: pwm-b-x7 { + mux { + groups = "pwm_b_x7"; + function = "pwm_b"; + bias-disable; + }; + }; + + pwm_b_x19_pins: pwm-b-x19 { + mux { + groups = "pwm_b_x19"; + function = "pwm_b"; + bias-disable; + }; + }; + + pwm_c_c_pins: pwm-c-c { + mux { + groups = "pwm_c_c"; + function = "pwm_c"; + bias-disable; + }; + }; + + pwm_c_x5_pins: pwm-c-x5 { + mux { + groups = "pwm_c_x5"; + function = "pwm_c"; + bias-disable; + }; + }; + + pwm_c_x8_pins: pwm-c-x8 { + mux { + groups = "pwm_c_x8"; + function = "pwm_c"; + bias-disable; + }; + }; + + pwm_d_x3_pins: pwm-d-x3 { + mux { + groups = "pwm_d_x3"; + function = "pwm_d"; + bias-disable; + }; + }; + + pwm_d_x6_pins: pwm-d-x6 { + mux { + groups = "pwm_d_x6"; + function = "pwm_d"; + bias-disable; + }; + }; + + pwm_e_pins: pwm-e { + mux { + groups = "pwm_e"; + function = "pwm_e"; + bias-disable; + }; + }; + + pwm_f_x_pins: pwm-f-x { + mux { + groups = "pwm_f_x"; + function = "pwm_f"; + bias-disable; + }; + }; + + pwm_f_h_pins: pwm-f-h { + mux { + groups = "pwm_f_h"; + function = "pwm_f"; + bias-disable; + }; + }; + uart_a_pins: uart-a { mux { groups = "uart_a_tx",
@@ -418,6 +506,62 @@ bias-disable; }; }; + + pwm_ao_a_pins: pwm-ao-a { + mux { + groups = "pwm_ao_a"; + function = "pwm_ao_a"; + bias-disable; + }; + }; + + pwm_ao_b_pins: pwm-ao-b { + mux { + groups = "pwm_ao_b"; + function = "pwm_ao_b"; + bias-disable; + }; + }; + + pwm_ao_c_4_pins: pwm-ao-c-4 { + mux { + groups = "pwm_ao_c_4"; + function = "pwm_ao_c"; + bias-disable; + }; + }; + + pwm_ao_c_6_pins: pwm-ao-c-6 { + mux { + groups = "pwm_ao_c_6"; + function = "pwm_ao_c"; + bias-disable; + }; + }; + + pwm_ao_d_5_pins: pwm-ao-d-5 { + mux { + groups = "pwm_ao_d_5"; + function = "pwm_ao_d"; + bias-disable; + }; + }; + + pwm_ao_d_10_pins: pwm-ao-d-10 { + mux { + groups = "pwm_ao_d_10"; + function = "pwm_ao_d"; + bias-disable; + }; + }; + + pwm_ao_d_e_pins: pwm-ao-d-e { + mux { + groups = "pwm_ao_d_e"; + function = "pwm_ao_d"; + bias-disable; + }; + }; }; };
@@ -445,6 +589,13 @@ status = "disabled"; }; + pwm_AO_cd: pwm@2000 { + compatible = "amlogic,meson-g12a-ao-pwm-cd"; + reg = <0x0 0x2000 0x0 0x20>; + #pwm-cells = <3>; + status = "disabled"; + }; + uart_AO: serial@3000 { compatible = "amlogic,meson-gx-uart", "amlogic,meson-ao-uart";
@@ -465,6 +616,13 @@ status = "disabled"; }; + pwm_AO_ab: pwm@7000 { + compatible = "amlogic,meson-g12a-ao-pwm-ab"; + reg = <0x0 0x7000 0x0 0x20>; + #pwm-cells = <3>; + status = "disabled"; + }; + saradc: adc@9000 { compatible = "amlogic,meson-g12a-saradc", "amlogic,meson-saradc";
@@ -533,6 +691,27 @@ #reset-cells = <1>; }; + pwm_ef: pwm@19000 { + compatible = "amlogic,meson-g12a-ee-pwm"; + reg = <0x0 0x19000 0x0 0x20>; + #pwm-cells = <3>; + status = "disabled"; + }; + + pwm_cd: pwm@1a000 { + compatible = "amlogic,meson-g12a-ee-pwm"; + reg = <0x0 0x1a000 0x0 0x20>; + #pwm-cells = <3>; + status = "disabled"; + }; + + pwm_ab: pwm@1b000 { + compatible = "amlogic,meson-g12a-ee-pwm"; + reg = <0x0 0x1b000 0x0 0x20>; + #pwm-cells = <3>; + status = "disabled"; + }; + clk_msr: clock-measure@18000 { compatible = "amlogic,meson-g12a-clk-measure"; reg = <0x0 0x18000 0x0 0x10>;
Signature · 1 line
2.21.0
Kevin Hilman
maintainerRe: [PATCH v2 3/3] arm64: dts: meson-g12a: Add PWM nodes
Quoted 4 lines · Neil Armstrong
This adds the EE and AO PWM nodes and the possible pinctrl settings.
Signed-off-by Neil Armstrong <[email protected]>Reviewed-by Martin Blumenstingl<[email protected]>
Since bindings are acked, and there's no build dependency on the driver itself, queuing this for v5.3 (branch: v5.3/dt64)
Thanks,
Kevin