Skip to content

Commit 239df14

Browse files
6by9pelwell
authored andcommitted
dtoverlays: Fix up imx500 overlays to have unique clock nodes
The overlay was creating DT nodes /clocks/clk-aicam and /clocks/clk-aicam-gated for both cam0 and cam1, which resulted in one failing. The clock infrastructure creates the clock name from the node name without any @n reg extension, so we can't just use that. The nodes therefore have to be renamed. Signed-off-by: Dave Stevenson <[email protected]>
1 parent dd3f9f7 commit 239df14

File tree

2 files changed

+12
-8
lines changed

2 files changed

+12
-8
lines changed

arch/arm/boot/dts/overlays/imx500-overlay.dts

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -72,16 +72,16 @@
7272
};
7373
};
7474

75-
clocks_frag: fragment@104 {
75+
fragment@104 {
7676
target-path = "/clocks";
7777
__overlay__ {
78-
clk_aicam: clk-aicam {
78+
clk_aicam: clk-aicam1 {
7979
compatible = "fixed-clock";
8080
#clock-cells = <0>;
8181
clock-frequency = <24000000>;
8282
};
8383

84-
clk_aicam_gated: clk-aicam-gated {
84+
clk_aicam_gated: clk-aicam-gated1 {
8585
compatible = "gpio-gate-clock";
8686
clocks = <&clk_aicam>;
8787
#clock-cells = <0>;
@@ -98,7 +98,9 @@
9898
<&csi_frag>, "target:0=",<&csi0>,
9999
<&spi_bridge>, "power-supply:0=",<&cam0_reg>,
100100
<&reg_frag>, "target:0=",<&cam0_reg>,
101-
<&cam_node>, "VANA-supply:0=",<&cam0_reg>;
101+
<&cam_node>, "VANA-supply:0=",<&cam0_reg>,
102+
<&clk_aicam>,"name=clk-aicam0",
103+
<&clk_aicam_gated>,"name=clk-aicam-gated0";
102104
bypass-cache = <&spi_bridge>,"bypass-cache?";
103105
};
104106
};

arch/arm/boot/dts/overlays/imx500-pi5-overlay.dts

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -75,16 +75,16 @@
7575
};
7676
};
7777

78-
clocks_frag: fragment@104 {
78+
fragment@104 {
7979
target-path = "/clocks";
8080
__overlay__ {
81-
clk_aicam: clk-aicam {
81+
clk_aicam: clk-aicam1 {
8282
compatible = "fixed-clock";
8383
#clock-cells = <0>;
8484
clock-frequency = <24000000>;
8585
};
8686

87-
clk_aicam_gated: clk-aicam-gated {
87+
clk_aicam_gated: clk-aicam-gated1 {
8888
compatible = "gpio-gate-clock";
8989
clocks = <&clk_aicam>;
9090
#clock-cells = <0>;
@@ -103,7 +103,9 @@
103103
<&spi_frag_overlay>, "fast_xfer-gpios:16=35", // CD0_IO1_MICDAT0 (clock)
104104
<&spi_bridge>, "power-supply:0=",<&cam0_reg>,
105105
<&reg_frag>, "target:0=",<&cam0_reg>,
106-
<&cam_node>, "VANA-supply:0=",<&cam0_reg>;
106+
<&cam_node>, "VANA-supply:0=",<&cam0_reg>,
107+
<&clk_aicam>,"name=clk-aicam0",
108+
<&clk_aicam_gated>,"name=clk-aicam-gated0";
107109
bypass-cache = <&spi_bridge>,"bypass-cache?";
108110
};
109111
};

0 commit comments

Comments
 (0)