Commit 2423eeae authored by Alexandre Belloni's avatar Alexandre Belloni Committed by Stephen Boyd
Browse files

clk: at91: usb: Add sam9x60 support 



The sam9x60 USB clock supports four different parents, ensure they can be
selected.

Signed-off-by: default avatarAlexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: default avatarStephen Boyd <sboyd@kernel.org>
parent e4cfb823

drivers/clk/at91/clk-usb.c

+27 −6
Original line number Diff line number Diff line
@@ -23,9 +23,13 @@ 
#define RM9200_USB_DIV_SHIFT	28

#define RM9200_USB_DIV_TAB_SIZE	4



#define SAM9X5_USBS_MASK	GENMASK(0, 0)

#define SAM9X60_USBS_MASK	GENMASK(1, 0)



struct at91sam9x5_clk_usb {

	struct clk_hw hw;

	struct regmap *regmap;

	u32 usbs_mask;

};



#define to_at91sam9x5_clk_usb(hw) \
@@ -111,8 +115,7 @@ static int at91sam9x5_clk_usb_set_parent(struct clk_hw *hw, u8 index) 
	if (index > 1)

		return -EINVAL;



	regmap_update_bits(usb->regmap, AT91_PMC_USB, AT91_PMC_USBS,

			   index ? AT91_PMC_USBS : 0);

	regmap_update_bits(usb->regmap, AT91_PMC_USB, usb->usbs_mask, index);



	return 0;

}
@@ -124,7 +127,7 @@ static u8 at91sam9x5_clk_usb_get_parent(struct clk_hw *hw) 


	regmap_read(usb->regmap, AT91_PMC_USB, &usbr);



	return usbr & AT91_PMC_USBS;

	return usbr & usb->usbs_mask;

}



static int at91sam9x5_clk_usb_set_rate(struct clk_hw *hw, unsigned long rate,
@@ -190,9 +193,10 @@ static const struct clk_ops at91sam9n12_usb_ops = { 
	.set_rate = at91sam9x5_clk_usb_set_rate,

};



struct clk_hw * __init

at91sam9x5_clk_register_usb(struct regmap *regmap, const char *name,

			    const char **parent_names, u8 num_parents)

static struct clk_hw * __init

_at91sam9x5_clk_register_usb(struct regmap *regmap, const char *name,

			     const char **parent_names, u8 num_parents,

			     u32 usbs_mask)

{

	struct at91sam9x5_clk_usb *usb;

	struct clk_hw *hw;
@@ -212,6 +216,7 @@ at91sam9x5_clk_register_usb(struct regmap *regmap, const char *name, 


	usb->hw.init = &init;

	usb->regmap = regmap;

	usb->usbs_mask = SAM9X5_USBS_MASK;



	hw = &usb->hw;

	ret = clk_hw_register(NULL, &usb->hw);
@@ -223,6 +228,22 @@ at91sam9x5_clk_register_usb(struct regmap *regmap, const char *name, 
	return hw;

}



struct clk_hw * __init

at91sam9x5_clk_register_usb(struct regmap *regmap, const char *name,

			    const char **parent_names, u8 num_parents)

{

	return _at91sam9x5_clk_register_usb(regmap, name, parent_names,

					    num_parents, SAM9X5_USBS_MASK);

}



struct clk_hw * __init

sam9x60_clk_register_usb(struct regmap *regmap, const char *name,

			 const char **parent_names, u8 num_parents)

{

	return _at91sam9x5_clk_register_usb(regmap, name, parent_names,

					    num_parents, SAM9X60_USBS_MASK);

}



struct clk_hw * __init

at91sam9n12_clk_register_usb(struct regmap *regmap, const char *name,

			     const char *parent_name)

drivers/clk/at91/pmc.h

+3 −0
Original line number Diff line number Diff line
@@ -194,6 +194,9 @@ struct clk_hw * __init 
at91sam9n12_clk_register_usb(struct regmap *regmap, const char *name,

			     const char *parent_name);

struct clk_hw * __init

sam9x60_clk_register_usb(struct regmap *regmap, const char *name,

			 const char **parent_names, u8 num_parents);

struct clk_hw * __init

at91rm9200_clk_register_usb(struct regmap *regmap, const char *name,

			    const char *parent_name, const u32 *divisors);