diff options
| author | Krzysztof Kozlowski <[email protected]> | 2022-05-09 16:47:13 +0200 |
|---|---|---|
| committer | Bjorn Andersson <[email protected]> | 2022-06-27 16:46:32 -0500 |
| commit | 7908dcc8be2db90c9d9bbcbd5fb021f935b76b26 (patch) | |
| tree | de662268ff4d81a4fd5498de2f57a9831a78e155 | |
| parent | e8881372ccc6ff5a86bddeb4ebc248ff892d2ffc (diff) | |
arm64: dts: qcom: sdm630: order regs according to bindings
The CAMSS DTSI device node, which came after the bindings were merged,
got the regs ordered differently then specified in the bindings:
sdm636-sony-xperia-ganges-mermaid.dtb: camss@ca00000: reg-names:0: 'csi_clk_mux' was expected
Reordering them to match bindings should not cause ABI issues, because
the driver relies on names, not ordering.
Signed-off-by: Krzysztof Kozlowski <[email protected]>
Signed-off-by: Bjorn Andersson <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
| -rw-r--r-- | arch/arm64/boot/dts/qcom/sdm630.dtsi | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/arch/arm64/boot/dts/qcom/sdm630.dtsi b/arch/arm64/boot/dts/qcom/sdm630.dtsi index 7afe36f55536..9d86a011fa01 100644 --- a/arch/arm64/boot/dts/qcom/sdm630.dtsi +++ b/arch/arm64/boot/dts/qcom/sdm630.dtsi @@ -1846,32 +1846,32 @@ camss: camss@ca00000 { compatible = "qcom,sdm660-camss"; - reg = <0x0c824000 0x1000>, + reg = <0x0ca00020 0x10>, + <0x0ca30000 0x100>, + <0x0ca30400 0x100>, + <0x0ca30800 0x100>, + <0x0ca30c00 0x100>, + <0x0c824000 0x1000>, <0x0ca00120 0x4>, <0x0c825000 0x1000>, <0x0ca00124 0x4>, <0x0c826000 0x1000>, <0x0ca00128 0x4>, - <0x0ca30000 0x100>, - <0x0ca30400 0x100>, - <0x0ca30800 0x100>, - <0x0ca30c00 0x100>, <0x0ca31000 0x500>, - <0x0ca00020 0x10>, <0x0ca10000 0x1000>, <0x0ca14000 0x1000>; - reg-names = "csiphy0", + reg-names = "csi_clk_mux", + "csid0", + "csid1", + "csid2", + "csid3", + "csiphy0", "csiphy0_clk_mux", "csiphy1", "csiphy1_clk_mux", "csiphy2", "csiphy2_clk_mux", - "csid0", - "csid1", - "csid2", - "csid3", "ispif", - "csi_clk_mux", "vfe0", "vfe1"; interrupts = <GIC_SPI 78 IRQ_TYPE_EDGE_RISING>, |