Merge branch 'at91-5.4-trunk/tcb' into linux-5.4-at91

Signed-off-by: Nicolas Ferre <nicolas.ferre@microchip.com>

Author: noglitch

drivers/clocksource/timer-atmel-tcb.c

@@ -351,6 +351,7 @@ static const u8 atmel_tcb_divisors[5] = { 2, 8, 32, 128, 0, };
 static const struct of_device_id atmel_tcb_of_match[] = {
 	{ .compatible = "atmel,at91rm9200-tcb", .data = (void *)16, },
 	{ .compatible = "atmel,at91sam9x5-tcb", .data = (void *)32, },
+	{ .compatible = "atmel,sama5d2-tcb", .data = (void *)32, },
 	{ /* sentinel */ }
 };
 

drivers/misc/atmel_tclib.c

@@ -89,13 +89,21 @@ static struct atmel_tcb_config tcb_sam9x5_config = {
 	.counter_width = 32,
 };
 
+static struct atmel_tcb_config tcb_sama5d2_config = {
+	.counter_width = 32,
+	.has_gclk = 1,
+};
+
 static const struct of_device_id atmel_tcb_dt_ids[] = {
 	{
 		.compatible = "atmel,at91rm9200-tcb",
 		.data = &tcb_rm9200_config,
 	}, {
 		.compatible = "atmel,at91sam9x5-tcb",
 		.data = &tcb_sam9x5_config,
+	}, {
+		.compatible = "atmel,sama5d2-tcb",
+		.data = &tcb_sama5d2_config,
 	}, {
 		/* sentinel */
 	}

drivers/pwm/pwm-atmel-tcb.c

@@ -289,7 +289,7 @@ static int atmel_tcb_pwm_config(struct pwm_chip *chip, struct pwm_device *pwm,
 	unsigned index = pwm->hwpwm % 2;
 	struct atmel_tcb_pwm_device *atcbpwm = NULL;
 	struct atmel_tc *tc = tcbpwmc->tc;
-	int i;
+	int i = 0;
 	int slowclk = 0;
 	unsigned period;
 	unsigned duty;
@@ -301,7 +301,9 @@ static int atmel_tcb_pwm_config(struct pwm_chip *chip, struct pwm_device *pwm,
 	 * Find best clk divisor:
 	 * the smallest divisor which can fulfill the period_ns requirements.
 	 */
-	for (i = 0; i < 5; ++i) {
+	if (tc->tcb_config->has_gclk)
+		i = 1;
+	for ( ; i < 5; ++i) {
 		if (atmel_tc_divisors[i] == 0) {
 			slowclk = i;
 			continue;