Skip to content

Commit 47b7755

Browse files
ryan-wannerclaudiubeznea
authored andcommitted
ARM: dts: microchip: sama7g5: Adjust clock xtal phandle
Adjust clock xtal phandles to match the new xtal phandle formatting. Signed-off-by: Ryan Wanner <Ryan.Wanner@microchip.com> Link: https://lore.kernel.org/r/8a9ece664958d07b1be73b4b6676a2a2ee397a94.1750175453.git.Ryan.Wanner@microchip.com Signed-off-by: Claudiu Beznea <claudiu.beznea@tuxon.dev>
1 parent 11b83df commit 47b7755

2 files changed

Lines changed: 14 additions & 13 deletions

File tree

arch/arm/boot/dts/microchip/at91-sama7g5ek.dts

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -35,16 +35,6 @@
3535
i2c2 = &i2c9;
3636
};
3737

38-
clocks {
39-
slow_xtal {
40-
clock-frequency = <32768>;
41-
};
42-
43-
main_xtal {
44-
clock-frequency = <24000000>;
45-
};
46-
};
47-
4838
gpio-keys {
4939
compatible = "gpio-keys";
5040

@@ -556,6 +546,10 @@
556546
pinctrl-0 = <&pinctrl_i2s0_default>;
557547
};
558548

549+
&main_xtal {
550+
clock-frequency = <24000000>;
551+
};
552+
559553
&pdmc0 {
560554
#sound-dai-cells = <0>;
561555
microchip,mic-pos = <MCHP_PDMC_DS0 MCHP_PDMC_CLK_NEGATIVE>, /* MIC 1 */
@@ -885,6 +879,10 @@
885879
};
886880
};
887881

882+
&slow_xtal {
883+
clock-frequency = <32768>;
884+
};
885+
888886
&spdifrx {
889887
pinctrl-names = "default";
890888
pinctrl-0 = <&pinctrl_spdifrx_default>;

arch/arm/boot/dts/microchip/sama7g5.dtsi

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -117,19 +117,22 @@
117117
};
118118

119119
clocks {
120-
slow_xtal: slow_xtal {
120+
slow_xtal: clock-slowxtal {
121121
compatible = "fixed-clock";
122+
clock-output-names = "slow_xtal";
122123
#clock-cells = <0>;
123124
};
124125

125-
main_xtal: main_xtal {
126+
main_xtal: clock-mainxtal {
126127
compatible = "fixed-clock";
128+
clock-output-names = "main_xtal";
127129
#clock-cells = <0>;
128130
};
129131

130-
usb_clk: usb_clk {
132+
usb_clk: clock-usbclk {
131133
compatible = "fixed-clock";
132134
#clock-cells = <0>;
135+
clock-output-names = "usb_clk";
133136
clock-frequency = <48000000>;
134137
};
135138
};

0 commit comments

Comments
 (0)