Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d396b20a authored by Jerome Brunet's avatar Jerome Brunet Committed by Thierry Reding
Browse files

pwm: meson: Add compatible for the gxbb ao PWMs 



On the gxbb (and gxl) family, the PWMs of the AO domain require a
specific compatible because the possible input clocks are different
from the EE PWMs input clocks.

Since the number of possible input clocks is also different, the
'num_parents' field is added to all the Meson PWM data.

Acked-by: default avatarNeil Armstrong <narmstrong@baylibre.com>
Signed-off-by: default avatarJerome Brunet <jbrunet@baylibre.com>
Reviewed-by: default avatarKevin Hilman <khilman@baylibre.com>
Signed-off-by: default avatarThierry Reding <thierry.reding@gmail.com>
parent a054c4d6

drivers/pwm/pwm-meson.c

+29 −3
Original line number Original line Diff line number Diff line
@@ -103,6 +103,7 @@ struct meson_pwm_channel { 




struct meson_pwm_data {

struct meson_pwm_data {

	const char * const *parent_names;

	const char * const *parent_names;

	unsigned int num_parents;

};

};





struct meson_pwm {

struct meson_pwm {
@@ -381,6 +382,7 @@ static const char * const pwm_meson8b_parent_names[] = { 




static const struct meson_pwm_data pwm_meson8b_data = {

static const struct meson_pwm_data pwm_meson8b_data = {

	.parent_names = pwm_meson8b_parent_names,

	.parent_names = pwm_meson8b_parent_names,

	.num_parents = ARRAY_SIZE(pwm_meson8b_parent_names),

};

};





static const char * const pwm_gxbb_parent_names[] = {

static const char * const pwm_gxbb_parent_names[] = {
@@ -389,11 +391,35 @@ static const char * const pwm_gxbb_parent_names[] = { 




static const struct meson_pwm_data pwm_gxbb_data = {

static const struct meson_pwm_data pwm_gxbb_data = {

	.parent_names = pwm_gxbb_parent_names,

	.parent_names = pwm_gxbb_parent_names,

	.num_parents = ARRAY_SIZE(pwm_gxbb_parent_names),

};



/*

 * Only the 2 first inputs of the GXBB AO PWMs are valid

 * The last 2 are grounded

 */

static const char * const pwm_gxbb_ao_parent_names[] = {

	"xtal", "clk81"

};



static const struct meson_pwm_data pwm_gxbb_ao_data = {

	.parent_names = pwm_gxbb_ao_parent_names,

	.num_parents = ARRAY_SIZE(pwm_gxbb_ao_parent_names),

};

};





static const struct of_device_id meson_pwm_matches[] = {

static const struct of_device_id meson_pwm_matches[] = {

	{ .compatible = "amlogic,meson8b-pwm", .data = &pwm_meson8b_data },

	{

	{ .compatible = "amlogic,meson-gxbb-pwm", .data = &pwm_gxbb_data },

		.compatible = "amlogic,meson8b-pwm",

		.data = &pwm_meson8b_data

	},

	{

		.compatible = "amlogic,meson-gxbb-pwm",

		.data = &pwm_gxbb_data

	},

	{

		.compatible = "amlogic,meson-gxbb-ao-pwm",

		.data = &pwm_gxbb_ao_data

	},

	{},

	{},

};

};

MODULE_DEVICE_TABLE(of, meson_pwm_matches);

MODULE_DEVICE_TABLE(of, meson_pwm_matches);
@@ -417,7 +443,7 @@ static int meson_pwm_init_channels(struct meson_pwm *meson, 
		init.ops = &clk_mux_ops;

		init.ops = &clk_mux_ops;

		init.flags = CLK_IS_BASIC;

		init.flags = CLK_IS_BASIC;

		init.parent_names = meson->data->parent_names;

		init.parent_names = meson->data->parent_names;

		init.num_parents = 1 << MISC_CLK_SEL_WIDTH;

		init.num_parents = meson->data->num_parents;





		channel->mux.reg = meson->base + REG_MISC_AB;

		channel->mux.reg = meson->base + REG_MISC_AB;

		channel->mux.shift = mux_reg_shifts[i];

		channel->mux.shift = mux_reg_shifts[i];