| Message ID | 20250308-kona-bus-clock-v3-4-d6fb5bfc3b67@gmail.com (mailing list archive) |
|---|---|
| State | Changes Requested, archived |
| Headers | show |
| Series | clk: bcm: kona: Add bus clock support, bus clocks for BCM21664/BCM281xx | expand |
On Sat, Mar 08, 2025 at 08:50:42AM +0100, Artur Weber wrote: > Add bus clocks corresponding to peripheral clocks currently supported > by the BCM281xx clock driver and add the relevant clock IDs to the > clock/bcm281xx.h dt-bindings header. Please squash the patch so we see complete change. > > Signed-off-by: Artur Weber <aweber.kernel@gmail.com> > --- > Changes in v3: > - Add more clock output names to example > - Drop CLOCK_COUNT defines from the DT binding header > > Changes in v2: > - Add this commit (BCM281xx bus clocks) > --- > .../devicetree/bindings/clock/brcm,kona-ccu.yaml | 33 ++++++++++++++++++++-- > include/dt-bindings/clock/bcm281xx.h | 19 +++++++++++++ > 2 files changed, 50 insertions(+), 2 deletions(-) > > diff --git a/Documentation/devicetree/bindings/clock/brcm,kona-ccu.yaml b/Documentation/devicetree/bindings/clock/brcm,kona-ccu.yaml > index dff04e24e92829b890bf7cd336f0e083bdb30fa6..d00dcf916b45904177614c6f19a5df02abdf42f7 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: 14 > + maxItems: 20 > > required: > - compatible > @@ -61,6 +61,8 @@ allOf: > - const: hub_timer > - const: pmu_bsc > - const: pmu_bsc_var > + - const: hub_timer_apb > + - const: pmu_bsc_apb > - if: > properties: > compatible: > @@ -86,6 +88,13 @@ allOf: > - const: usb_ic > - const: hsic2_48m > - const: hsic2_12m > + - const: sdio1_ahb > + - const: sdio2_ahb > + - const: sdio3_ahb > + - const: sdio4_ahb > + - const: usb_ic_ahb > + - const: hsic2_ahb > + - const: usb_otg_ahb > - if: > properties: > compatible: > @@ -116,6 +125,16 @@ allOf: > - const: bsc2 > - const: bsc3 > - const: pwm > + - const: uartb_apb > + - const: uartb2_apb > + - const: uartb3_apb > + - const: uartb4_apb > + - const: ssp0_apb > + - const: ssp2_apb > + - const: bsc1_apb > + - const: bsc2_apb > + - const: bsc3_apb > + - const: pwm_apb Why pwm_apb cannot be after pwm? Any idea for sorting here? Best regards, Krzysztof
On 10.03.2025 10:43, Krzysztof Kozlowski wrote: > On Sat, Mar 08, 2025 at 08:50:42AM +0100, Artur Weber wrote: >> Add bus clocks corresponding to peripheral clocks currently supported >> by the BCM281xx clock driver and add the relevant clock IDs to the >> clock/bcm281xx.h dt-bindings header. > > Please squash the patch so we see complete change. > >> >> Signed-off-by: Artur Weber <aweber.kernel@gmail.com> >> --- >> Changes in v3: >> - Add more clock output names to example >> - Drop CLOCK_COUNT defines from the DT binding header >> >> Changes in v2: >> - Add this commit (BCM281xx bus clocks) >> --- >> .../devicetree/bindings/clock/brcm,kona-ccu.yaml | 33 ++++++++++++++++++++-- >> include/dt-bindings/clock/bcm281xx.h | 19 +++++++++++++ >> 2 files changed, 50 insertions(+), 2 deletions(-) >> >> diff --git a/Documentation/devicetree/bindings/clock/brcm,kona-ccu.yaml b/Documentation/devicetree/bindings/clock/brcm,kona-ccu.yaml >> index dff04e24e92829b890bf7cd336f0e083bdb30fa6..d00dcf916b45904177614c6f19a5df02abdf42f7 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: 14 >> + maxItems: 20 >> >> required: >> - compatible >> @@ -61,6 +61,8 @@ allOf: >> - const: hub_timer >> - const: pmu_bsc >> - const: pmu_bsc_var >> + - const: hub_timer_apb >> + - const: pmu_bsc_apb >> - if: >> properties: >> compatible: >> @@ -86,6 +88,13 @@ allOf: >> - const: usb_ic >> - const: hsic2_48m >> - const: hsic2_12m >> + - const: sdio1_ahb >> + - const: sdio2_ahb >> + - const: sdio3_ahb >> + - const: sdio4_ahb >> + - const: usb_ic_ahb >> + - const: hsic2_ahb >> + - const: usb_otg_ahb >> - if: >> properties: >> compatible: >> @@ -116,6 +125,16 @@ allOf: >> - const: bsc2 >> - const: bsc3 >> - const: pwm >> + - const: uartb_apb >> + - const: uartb2_apb >> + - const: uartb3_apb >> + - const: uartb4_apb >> + - const: ssp0_apb >> + - const: ssp2_apb >> + - const: bsc1_apb >> + - const: bsc2_apb >> + - const: bsc3_apb >> + - const: pwm_apb > > Why pwm_apb cannot be after pwm? Any idea for sorting here? I placed all bus clocks corresponding to peripheral clocks at the end of the clock list (so as to not modify the IDs of previous clocks), in the same order as their corresponding peripheral clocks. This applies both to the dt-bindings/clock/bcm281xx.h header and to the clock binding here (I kept the same order of clock names here as clock IDs in the header). The same reasoning applies to the BCM21664 bus clocks patch. Best regards Artur
On 10.03.2025 10:43, Krzysztof Kozlowski wrote: > On Sat, Mar 08, 2025 at 08:50:42AM +0100, Artur Weber wrote: >> Add bus clocks corresponding to peripheral clocks currently supported >> by the BCM281xx clock driver and add the relevant clock IDs to the >> clock/bcm281xx.h dt-bindings header. > > Please squash the patch so we see complete change. Squash which patch(-es)? Both CCU bindings and the dt-bindings header are modified in this patch, as outlined in the commit message (though now that I look at it, I could reword the first sentence to specifically imply "add bus clocks *to the binding*"...). What is missing? (Sorry for the separate reply, I meant to reply to this in the previous message but accidentally removed my reply.) Best regards Artur
On 10/03/2025 21:20, Artur Weber wrote: > On 10.03.2025 10:43, Krzysztof Kozlowski wrote: >> On Sat, Mar 08, 2025 at 08:50:42AM +0100, Artur Weber wrote: >>> Add bus clocks corresponding to peripheral clocks currently supported >>> by the BCM281xx clock driver and add the relevant clock IDs to the >>> clock/bcm281xx.h dt-bindings header. >> >> Please squash the patch so we see complete change. > > Squash which patch(-es)? Both CCU bindings and the dt-bindings header > are modified in this patch, as outlined in the commit message (though > now that I look at it, I could reword the first sentence to specifically > imply "add bus clocks *to the binding*"...). What is missing? If I got it correctly, you are changing the same lines in bindings in two patches, so squash these two patches. Best regards, Krzysztof
diff --git a/Documentation/devicetree/bindings/clock/brcm,kona-ccu.yaml b/Documentation/devicetree/bindings/clock/brcm,kona-ccu.yaml index dff04e24e92829b890bf7cd336f0e083bdb30fa6..d00dcf916b45904177614c6f19a5df02abdf42f7 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: 14 + maxItems: 20 required: - compatible @@ -61,6 +61,8 @@ allOf: - const: hub_timer - const: pmu_bsc - const: pmu_bsc_var + - const: hub_timer_apb + - const: pmu_bsc_apb - if: properties: compatible: @@ -86,6 +88,13 @@ allOf: - const: usb_ic - const: hsic2_48m - const: hsic2_12m + - const: sdio1_ahb + - const: sdio2_ahb + - const: sdio3_ahb + - const: sdio4_ahb + - const: usb_ic_ahb + - const: hsic2_ahb + - const: usb_otg_ahb - if: properties: compatible: @@ -116,6 +125,16 @@ allOf: - const: bsc2 - const: bsc3 - const: pwm + - const: uartb_apb + - const: uartb2_apb + - const: uartb3_apb + - const: uartb4_apb + - const: ssp0_apb + - const: ssp2_apb + - const: bsc1_apb + - const: bsc2_apb + - const: bsc3_apb + - const: pwm_apb - if: properties: compatible: @@ -190,6 +209,16 @@ examples: "bsc1", "bsc2", "bsc3", - "pwm"; + "pwm", + "uartb_apb", + "uartb2_apb", + "uartb3_apb", + "uartb4_apb", + "ssp0_apb", + "ssp2_apb", + "bsc1_apb", + "bsc2_apb", + "bsc3_apb", + "pwm_apb"; }; ... diff --git a/include/dt-bindings/clock/bcm281xx.h b/include/dt-bindings/clock/bcm281xx.h index 0c7a7e10cb425ddb597392939cb218545a48bf22..8e3ac4ab3e16fb33a82259ccb82287fdfbb749bc 100644 --- a/include/dt-bindings/clock/bcm281xx.h +++ b/include/dt-bindings/clock/bcm281xx.h @@ -33,6 +33,8 @@ #define BCM281XX_AON_CCU_HUB_TIMER 0 #define BCM281XX_AON_CCU_PMU_BSC 1 #define BCM281XX_AON_CCU_PMU_BSC_VAR 2 +#define BCM281XX_AON_CCU_HUB_TIMER_APB 3 +#define BCM281XX_AON_CCU_PMU_BSC_APB 4 /* hub CCU clock ids */ @@ -47,6 +49,13 @@ #define BCM281XX_MASTER_CCU_USB_IC 4 #define BCM281XX_MASTER_CCU_HSIC2_48M 5 #define BCM281XX_MASTER_CCU_HSIC2_12M 6 +#define BCM281XX_MASTER_CCU_SDIO1_AHB 7 +#define BCM281XX_MASTER_CCU_SDIO2_AHB 8 +#define BCM281XX_MASTER_CCU_SDIO3_AHB 9 +#define BCM281XX_MASTER_CCU_SDIO4_AHB 10 +#define BCM281XX_MASTER_CCU_USB_IC_AHB 11 +#define BCM281XX_MASTER_CCU_HSIC2_AHB 12 +#define BCM281XX_MASTER_CCU_USB_OTG_AHB 13 /* slave CCU clock ids */ @@ -60,5 +69,15 @@ #define BCM281XX_SLAVE_CCU_BSC2 7 #define BCM281XX_SLAVE_CCU_BSC3 8 #define BCM281XX_SLAVE_CCU_PWM 9 +#define BCM281XX_SLAVE_CCU_UARTB_APB 10 +#define BCM281XX_SLAVE_CCU_UARTB2_APB 11 +#define BCM281XX_SLAVE_CCU_UARTB3_APB 12 +#define BCM281XX_SLAVE_CCU_UARTB4_APB 13 +#define BCM281XX_SLAVE_CCU_SSP0_APB 14 +#define BCM281XX_SLAVE_CCU_SSP2_APB 15 +#define BCM281XX_SLAVE_CCU_BSC1_APB 16 +#define BCM281XX_SLAVE_CCU_BSC2_APB 17 +#define BCM281XX_SLAVE_CCU_BSC3_APB 18 +#define BCM281XX_SLAVE_CCU_PWM_APB 19 #endif /* _CLOCK_BCM281XX_H */
Add bus clocks corresponding to peripheral clocks currently supported by the BCM281xx clock driver and add the relevant clock IDs to the clock/bcm281xx.h dt-bindings header. Signed-off-by: Artur Weber <aweber.kernel@gmail.com> --- Changes in v3: - Add more clock output names to example - Drop CLOCK_COUNT defines from the DT binding header Changes in v2: - Add this commit (BCM281xx bus clocks) --- .../devicetree/bindings/clock/brcm,kona-ccu.yaml | 33 ++++++++++++++++++++-- include/dt-bindings/clock/bcm281xx.h | 19 +++++++++++++ 2 files changed, 50 insertions(+), 2 deletions(-)