@@ -143,7 +143,7 @@ usbotg: usb@e20000 {
compatible = "snps,dwc2";
reg = <0x00e20000 0x10000>;
interrupts = <GIC_SPI 47 IRQ_TYPE_LEVEL_HIGH>;
- clocks = <&usb_otg_ahb_clk>;
+ clocks = <&master_ccu BCM21664_MASTER_CCU_USB_OTG_AHB>;
clock-names = "otg";
phys = <&usbphy>;
phy-names = "usb2-phy";
@@ -248,12 +248,6 @@ var_52m_clk: var_52m {
clock-frequency = <52000000>;
};
- usb_otg_ahb_clk: usb_otg_ahb {
- #clock-cells = <0>;
- compatible = "fixed-clock";
- clock-frequency = <52000000>;
- };
-
ref_96m_clk: ref_96m {
#clock-cells = <0>;
compatible = "fixed-clock";
@@ -301,7 +295,8 @@ aon_ccu: aon_ccu@35002000 {
compatible = "brcm,bcm21664-aon-ccu";
reg = <0x35002000 0x0f00>;
#clock-cells = <1>;
- clock-output-names = "hub_timer";
+ clock-output-names = "hub_timer",
+ "hub_timer_apb";
};
slave_ccu: slave_ccu@3e011000 {
@@ -314,7 +309,15 @@ slave_ccu: slave_ccu@3e011000 {
"bsc1",
"bsc2",
"bsc3",
- "bsc4";
+ "bsc4",
+ "uartb_apb",
+ "uartb2_apb",
+ "uartb3_apb",
+ "bsc1_apb",
+ "bsc2_apb",
+ "bsc3_apb",
+ "bsc4_apb";
+
};
master_ccu: master_ccu@3f001000 {
@@ -328,7 +331,12 @@ master_ccu: master_ccu@3f001000 {
"sdio1_sleep",
"sdio2_sleep",
"sdio3_sleep",
- "sdio4_sleep";
+ "sdio4_sleep",
+ "sdio1_ahb",
+ "sdio2_ahb",
+ "sdio3_ahb",
+ "sdio4_ahb",
+ "usb_otg_ahb";
};
};
};
Following changes in the clock driver, add bus clocks for timer, SDIO, BSC and UART to the DTS clock output names. Replace the usb_otg_ahb fixed clock with the real bus clock. Signed-off-by: Artur Weber <aweber.kernel@gmail.com> --- Changes in v4: - Change commit summary to match equivalent BCM281xx commit --- arch/arm/boot/dts/broadcom/bcm2166x-common.dtsi | 28 ++++++++++++++++--------- 1 file changed, 18 insertions(+), 10 deletions(-)