From: David Heidelberg <[email protected]> Instead of defining own pad function for master clock, pick one offered by sdm845 device-tree include.
Reviewed-by: Vladimir Zapolskiy <[email protected]> Signed-off-by: David Heidelberg <[email protected]> --- .../dts/qcom/sdm845-db845c-navigation-mezzanine.dtso | 2 +- arch/arm64/boot/dts/qcom/sdm845-db845c.dts | 16 ---------------- 2 files changed, 1 insertion(+), 17 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/sdm845-db845c-navigation-mezzanine.dtso b/arch/arm64/boot/dts/qcom/sdm845-db845c-navigation-mezzanine.dtso index dbe1911d8e470..f6c2c98970d76 100644 --- a/arch/arm64/boot/dts/qcom/sdm845-db845c-navigation-mezzanine.dtso +++ b/arch/arm64/boot/dts/qcom/sdm845-db845c-navigation-mezzanine.dtso @@ -40,7 +40,7 @@ camera@10 { /* CAM0_RST_N */ reset-gpios = <&tlmm 9 GPIO_ACTIVE_LOW>; pinctrl-names = "default"; - pinctrl-0 = <&cam0_default>; + pinctrl-0 = <&cam0_default &cam_mclk0_default>; clocks = <&clock_camcc CAM_CC_MCLK0_CLK>; clock-names = "xvclk"; diff --git a/arch/arm64/boot/dts/qcom/sdm845-db845c.dts b/arch/arm64/boot/dts/qcom/sdm845-db845c.dts index ce23f87e0316b..518d2ec657b13 100644 --- a/arch/arm64/boot/dts/qcom/sdm845-db845c.dts +++ b/arch/arm64/boot/dts/qcom/sdm845-db845c.dts @@ -877,14 +877,6 @@ rst-pins { drive-strength = <16>; bias-disable; }; - - mclk0-pins { - pins = "gpio13"; - function = "cam_mclk"; - - drive-strength = <16>; - bias-disable; - }; }; cam3_default: cam3-default-state { @@ -895,14 +887,6 @@ rst-pins { drive-strength = <16>; bias-disable; }; - - mclk3-pins { - function = "cam_mclk"; - pins = "gpio16"; - - drive-strength = <16>; - bias-disable; - }; }; dsi_sw_sel: dsi-sw-sel-state { -- 2.51.0
