Add bus clocks for hub_timer, sdio, bsc, uart and usb_otg_ahb to the
allowed clock output names for BCM21664 CCUs and add the relevant
clock IDs to the clock/bcm21664.h dt-bindings header.
Signed-off-by: Artur Weber <aweber.kernel@xxxxxxxxx>
---
Changes in v3:
- Fix UARTBx_APB clocks being out of order in DT binding header
- Drop CLOCK_COUNT defines from DT binding header
Changes in v2:
- Move clock ID dt-bindings header changes into this commit
---
.../devicetree/bindings/clock/brcm,kona-ccu.yaml | 18 ++++++++++++++++--
include/dt-bindings/clock/bcm21664.h | 13 +++++++++++++
2 files changed, 29 insertions(+), 2 deletions(-)
diff --git a/Documentation/devicetree/bindings/clock/brcm,kona-ccu.yaml b/Documentation/devicetree/bindings/clock/brcm,kona-ccu.yaml
index e5656950b3bd0ad44ba47f0ada84b558e71df590..dff04e24e92829b890bf7cd336f0e083bdb30fa6 100644
--- a/Documentation/devicetree/bindings/clock/brcm,kona-ccu.yaml
+++ b/Documentation/devicetree/bindings/clock/brcm,kona-ccu.yaml
@@ -40,7 +40,7 @@ properties:
clock-output-names:
minItems: 1
- maxItems: 10
+ maxItems: 14
required:
- compatible
@@ -124,7 +124,9 @@ allOf:
then:
properties:
clock-output-names:
- const: hub_timer
+ items:
+ - const: hub_timer
+ - const: hub_timer_apb
- if:
properties:
compatible:
@@ -142,6 +144,11 @@ allOf:
- const: sdio2_sleep
- const: sdio3_sleep
- const: sdio4_sleep
+ - const: sdio1_ahb
+ - const: sdio2_ahb
+ - const: sdio3_ahb
+ - const: sdio4_ahb
+ - const: usb_otg_ahb
- if:
properties:
compatible:
@@ -158,6 +165,13 @@ allOf:
- const: bsc2
- const: bsc3
- const: bsc4
+ - const: uartb_apb
+ - const: uartb2_apb
+ - const: uartb3_apb
+ - const: bsc1_apb
+ - const: bsc2_apb
+ - const: bsc3_apb
+ - const: bsc4_apb
additionalProperties: false
diff --git a/include/dt-bindings/clock/bcm21664.h b/include/dt-bindings/clock/bcm21664.h
index 7a380a51848ce100cbf94f9da2b997dbe3a65230..9f3614eb9036b5ce36b610fd7437338655a9cf97 100644
--- a/include/dt-bindings/clock/bcm21664.h
+++ b/include/dt-bindings/clock/bcm21664.h
@@ -25,6 +25,7 @@
/* aon CCU clock ids */
#define BCM21664_AON_CCU_HUB_TIMER 0
+#define BCM21664_AON_CCU_HUB_TIMER_APB 1
/* master CCU clock ids */
@@ -36,6 +37,11 @@
#define BCM21664_MASTER_CCU_SDIO2_SLEEP 5
#define BCM21664_MASTER_CCU_SDIO3_SLEEP 6
#define BCM21664_MASTER_CCU_SDIO4_SLEEP 7
+#define BCM21664_MASTER_CCU_SDIO1_AHB 8
+#define BCM21664_MASTER_CCU_SDIO2_AHB 9
+#define BCM21664_MASTER_CCU_SDIO3_AHB 10
+#define BCM21664_MASTER_CCU_SDIO4_AHB 11
+#define BCM21664_MASTER_CCU_USB_OTG_AHB 12
/* slave CCU clock ids */
@@ -46,5 +52,12 @@
#define BCM21664_SLAVE_CCU_BSC2 4
#define BCM21664_SLAVE_CCU_BSC3 5
#define BCM21664_SLAVE_CCU_BSC4 6
+#define BCM21664_SLAVE_CCU_UARTB_APB 7
+#define BCM21664_SLAVE_CCU_UARTB2_APB 8
+#define BCM21664_SLAVE_CCU_UARTB3_APB 9
+#define BCM21664_SLAVE_CCU_BSC1_APB 10
+#define BCM21664_SLAVE_CCU_BSC2_APB 11
+#define BCM21664_SLAVE_CCU_BSC3_APB 12
+#define BCM21664_SLAVE_CCU_BSC4_APB 13
#endif /* _CLOCK_BCM21664_H */
--
2.48.1
