Commit 9645ccfa authored by Stephen Boyd's avatar Stephen Boyd
Browse files

Merge tag 'clk-microchip-6.3' of... 

Merge tag 'clk-microchip-6.3' of https://git.kernel.org/pub/scm/linux/kernel/git/at91/linux into clk-microchip

Pull Microchip clk updates from Claudiu Beznea:

Only updates for AT91 SoCs this time as follows:
 - DDR clocks were marked as critical in the proper clock driver for each
   AT91 SoC such that drivers/memory/atmel-sdramc.c to be deleted
   in the next releases as it only does clock enablement;
 - Patch to avoid compiling dt-compat.o for all AT91 SoCs as only some of
   them may use it.

* tag 'clk-microchip-6.3' of https://git.kernel.org/pub/scm/linux/kernel/git/at91/linux:
  clk: at91: do not compile dt-compat.c for sama7g5 and sam9x60
  clk: at91: mark ddr clocks as critical
parents 1b929c02 80519d8c

drivers/clk/at91/Makefile

+8 −8
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
# Makefile for at91 specific clk

#



obj-y += pmc.o sckc.o dt-compat.o

obj-y += pmc.o sckc.o

obj-y += clk-slow.o clk-main.o clk-pll.o clk-plldiv.o clk-master.o

obj-y += clk-system.o clk-peripheral.o clk-programmable.o
@@ -15,12 +15,12 @@ obj-$(CONFIG_HAVE_AT91_H32MX) += clk-h32mx.o 
obj-$(CONFIG_HAVE_AT91_GENERATED_CLK)	+= clk-generated.o

obj-$(CONFIG_HAVE_AT91_I2S_MUX_CLK)	+= clk-i2s-mux.o

obj-$(CONFIG_HAVE_AT91_SAM9X60_PLL)	+= clk-sam9x60-pll.o

obj-$(CONFIG_SOC_AT91RM9200) += at91rm9200.o

obj-$(CONFIG_SOC_AT91SAM9) += at91sam9260.o at91sam9rl.o at91sam9x5.o

obj-$(CONFIG_SOC_AT91SAM9) += at91sam9g45.o

obj-$(CONFIG_SOC_AT91SAM9) += at91sam9n12.o at91sam9x5.o

obj-$(CONFIG_SOC_AT91RM9200) += at91rm9200.o dt-compat.o

obj-$(CONFIG_SOC_AT91SAM9) += at91sam9260.o at91sam9rl.o at91sam9x5.o dt-compat.o

obj-$(CONFIG_SOC_AT91SAM9) += at91sam9g45.o dt-compat.o

obj-$(CONFIG_SOC_AT91SAM9) += at91sam9n12.o at91sam9x5.o dt-compat.o

obj-$(CONFIG_SOC_SAM9X60) += sam9x60.o

obj-$(CONFIG_SOC_SAMA5D3) += sama5d3.o

obj-$(CONFIG_SOC_SAMA5D4) += sama5d4.o

obj-$(CONFIG_SOC_SAMA5D2) += sama5d2.o

obj-$(CONFIG_SOC_SAMA5D3) += sama5d3.o dt-compat.o

obj-$(CONFIG_SOC_SAMA5D4) += sama5d4.o dt-compat.o

obj-$(CONFIG_SOC_SAMA5D2) += sama5d2.o dt-compat.o

obj-$(CONFIG_SOC_SAMA7G5) += sama7g5.o

drivers/clk/at91/at91rm9200.c

+1 −1
Original line number Diff line number Diff line
@@ -183,7 +183,7 @@ static void __init at91rm9200_pmc_setup(struct device_node *np) 
	for (i = 0; i < ARRAY_SIZE(at91rm9200_systemck); i++) {

		hw = at91_clk_register_system(regmap, at91rm9200_systemck[i].n,

					      at91rm9200_systemck[i].p,

					      at91rm9200_systemck[i].id);

					      at91rm9200_systemck[i].id, 0);

		if (IS_ERR(hw))

			goto err_free;

drivers/clk/at91/at91sam9260.c

+1 −1
Original line number Diff line number Diff line
@@ -460,7 +460,7 @@ static void __init at91sam926x_pmc_setup(struct device_node *np, 
	for (i = 0; i < data->num_sck; i++) {

		hw = at91_clk_register_system(regmap, data->sck[i].n,

					      data->sck[i].p,

					      data->sck[i].id);

					      data->sck[i].id, 0);

		if (IS_ERR(hw))

			goto err_free;

drivers/clk/at91/at91sam9g45.c

+8 −2
Original line number Diff line number Diff line
@@ -40,9 +40,14 @@ static const struct clk_pll_characteristics plla_characteristics = { 
static const struct {

	char *n;

	char *p;

	unsigned long flags;

	u8 id;

} at91sam9g45_systemck[] = {

	{ .n = "ddrck", .p = "masterck_div", .id = 2 },

	/*

	 * ddrck feeds DDR controller and is enabled by bootloader thus we need

	 * to keep it enabled in case there is no Linux consumer for it.

	 */

	{ .n = "ddrck", .p = "masterck_div", .id = 2, .flags = CLK_IS_CRITICAL },

	{ .n = "uhpck", .p = "usbck",        .id = 6 },

	{ .n = "pck0",  .p = "prog0",        .id = 8 },

	{ .n = "pck1",  .p = "prog1",        .id = 9 },
@@ -198,7 +203,8 @@ static void __init at91sam9g45_pmc_setup(struct device_node *np) 
	for (i = 0; i < ARRAY_SIZE(at91sam9g45_systemck); i++) {

		hw = at91_clk_register_system(regmap, at91sam9g45_systemck[i].n,

					      at91sam9g45_systemck[i].p,

					      at91sam9g45_systemck[i].id);

					      at91sam9g45_systemck[i].id,

					      at91sam9g45_systemck[i].flags);

		if (IS_ERR(hw))

			goto err_free;

drivers/clk/at91/at91sam9n12.c

+9 −3
Original line number Diff line number Diff line
@@ -54,9 +54,14 @@ static const struct clk_pll_characteristics pllb_characteristics = { 
static const struct {

	char *n;

	char *p;

	unsigned long flags;

	u8 id;

} at91sam9n12_systemck[] = {

	{ .n = "ddrck", .p = "masterck_div", .id = 2 },

	/*

	 * ddrck feeds DDR controller and is enabled by bootloader thus we need

	 * to keep it enabled in case there is no Linux consumer for it.

	 */

	{ .n = "ddrck", .p = "masterck_div", .id = 2, .flags = CLK_IS_CRITICAL },

	{ .n = "lcdck", .p = "masterck_div", .id = 3 },

	{ .n = "uhpck", .p = "usbck",        .id = 6 },

	{ .n = "udpck", .p = "usbck",        .id = 7 },
@@ -223,7 +228,8 @@ static void __init at91sam9n12_pmc_setup(struct device_node *np) 
	for (i = 0; i < ARRAY_SIZE(at91sam9n12_systemck); i++) {

		hw = at91_clk_register_system(regmap, at91sam9n12_systemck[i].n,

					      at91sam9n12_systemck[i].p,

					      at91sam9n12_systemck[i].id);

					      at91sam9n12_systemck[i].id,

					      at91sam9n12_systemck[i].flags);

		if (IS_ERR(hw))

			goto err_free;
@@ -236,7 +242,7 @@ static void __init at91sam9n12_pmc_setup(struct device_node *np) 
							 at91sam9n12_periphck[i].n,

							 "masterck_div",

							 at91sam9n12_periphck[i].id,

							 &range, INT_MIN);

							 &range, INT_MIN, 0);

		if (IS_ERR(hw))

			goto err_free;