diff options
| author | Tony Lindgren <tony@atomide.com> | 2019-04-01 18:36:25 +0200 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2019-04-01 18:36:25 +0200 |
| commit | 81717283cf2c4c4d9bf8fd618cd6e5bdfe082edd (patch) | |
| tree | ce1db222e81ba2517cdd8973930c70e4148b4a8b /arch | |
| parent | ARM: dts: am335x-evmsk: Correct the regulators for the audio codec (diff) | |
| parent | ARM: dts: Fix dcan clkctrl clock for am3 (diff) | |
| download | linux-81717283cf2c4c4d9bf8fd618cd6e5bdfe082edd.tar.xz linux-81717283cf2c4c4d9bf8fd618cd6e5bdfe082edd.zip | |
Merge commit '7d56bedb2730dc2ea8abf0fd7240ee99ecfee3c9' into omap-for-v5.1/fixes
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/boot/dts/am33xx-l4.dtsi | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/am33xx-l4.dtsi b/arch/arm/boot/dts/am33xx-l4.dtsi index f459ec316a22..ca6d9f02a800 100644 --- a/arch/arm/boot/dts/am33xx-l4.dtsi +++ b/arch/arm/boot/dts/am33xx-l4.dtsi @@ -1762,7 +1762,7 @@ reg = <0xcc000 0x4>; reg-names = "rev"; /* Domains (P, C): per_pwrdm, l4ls_clkdm */ - clocks = <&l4ls_clkctrl AM3_D_CAN0_CLKCTRL 0>; + clocks = <&l4ls_clkctrl AM3_L4LS_D_CAN0_CLKCTRL 0>; clock-names = "fck"; #address-cells = <1>; #size-cells = <1>; @@ -1785,7 +1785,7 @@ reg = <0xd0000 0x4>; reg-names = "rev"; /* Domains (P, C): per_pwrdm, l4ls_clkdm */ - clocks = <&l4ls_clkctrl AM3_D_CAN1_CLKCTRL 0>; + clocks = <&l4ls_clkctrl AM3_L4LS_D_CAN1_CLKCTRL 0>; clock-names = "fck"; #address-cells = <1>; #size-cells = <1>; |