clk: ast2600: allow empty entries in aspeed_g6_gates
authorJeremy Kerr <jk@codeconstruct.com.au>
Thu, 2 Mar 2023 00:58:29 +0000 (08:58 +0800)
committerStephen Boyd <sboyd@kernel.org>
Mon, 6 Mar 2023 22:11:03 +0000 (14:11 -0800)
We're about to remove an entry from aspeed_g6_gates, but we won't want
to alter/reorder existing entries. Allow empty entries in this array.

Reviewed-by: Joel Stanley <joel@jms.id.au>
Signed-off-by: Jeremy Kerr <jk@codeconstruct.com.au>
Link: https://lore.kernel.org/r/20230302005834.13171-2-jk@codeconstruct.com.au
Tested-by: Joel Stanley <joel@jms.id.au>
Signed-off-by: Stephen Boyd <sboyd@kernel.org>
drivers/clk/clk-ast2600.c

index 9c3305bcb27ae0810a677ac9bb693bd04e53e6c4..1f08ff3c60faa010de597d7ad61b6166eac8f522 100644 (file)
@@ -652,6 +652,9 @@ static int aspeed_g6_clk_probe(struct platform_device *pdev)
                const struct aspeed_gate_data *gd = &aspeed_g6_gates[i];
                u32 gate_flags;
 
+               if (!gd->name)
+                       continue;
+
                /*
                 * Special case: the USB port 1 clock (bit 14) is always
                 * working the opposite way from the other ones.