From d2167685692779055c883aa50103f1bfafafdf06 Mon Sep 17 00:00:00 2001 From: Mukund Madhusudan Atre Date: Mon, 27 Jan 2020 11:11:48 -0800 Subject: [PATCH] ARM: dts: msm: Add simple-bus compat string in camera for all archs For kernel init to recognize child nodes of camera smmu and cci nodes as platform devices, the parent needs to have "simple-bus" compatibility string. Add required string so that component master framework is able to match device with driver for Kona, Lahaina, Lito and Bengal. CRs-Fixed: 2584631 Change-Id: Ia968a6617f9bb3bdb05fd999a7f87d4eaf580734 --- bengal-camera.dtsi | 4 ++-- kona-camera.dtsi | 6 +++--- lahaina-camera.dtsi | 6 +++--- lito-camera.dtsi | 6 +++--- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/bengal-camera.dtsi b/bengal-camera.dtsi index 23c6041547f9..7b2a6d944a47 100644 --- a/bengal-camera.dtsi +++ b/bengal-camera.dtsi @@ -98,7 +98,7 @@ cam_cci0: qcom,cci0 { cell-index = <0>; - compatible = "qcom,cci"; + compatible = "qcom,cci", "simple-bus"; #address-cells = <1>; #size-cells = <0>; reg = <0x05C1B000 0x1000>; @@ -192,7 +192,7 @@ }; qcom,cam_smmu { - compatible = "qcom,msm-cam-smmu"; + compatible = "qcom,msm-cam-smmu", "simple-bus"; status = "ok"; msm_cam_smmu_tfe { diff --git a/kona-camera.dtsi b/kona-camera.dtsi index f34d650b8073..497f08055be0 100644 --- a/kona-camera.dtsi +++ b/kona-camera.dtsi @@ -182,7 +182,7 @@ cam_cci0: qcom,cci@ac4f000 { cell-index = <0>; - compatible = "qcom,cci"; + compatible = "qcom,cci", "simple-bus"; reg = <0xac4f000 0x1000>; reg-names = "cci"; reg-cam-base = <0x4f000>; @@ -275,7 +275,7 @@ cam_cci1: qcom,cci@ac50000 { cell-index = <1>; - compatible = "qcom,cci"; + compatible = "qcom,cci", "simple-bus"; reg = <0xac50000 0x1000>; reg-names = "cci"; reg-cam-base = <0x50000>; @@ -367,7 +367,7 @@ }; qcom,cam_smmu { - compatible = "qcom,msm-cam-smmu"; + compatible = "qcom,msm-cam-smmu", "simple-bus"; status = "ok"; msm_cam_smmu_ife { diff --git a/lahaina-camera.dtsi b/lahaina-camera.dtsi index e3406da7924d..189a16d8bad5 100644 --- a/lahaina-camera.dtsi +++ b/lahaina-camera.dtsi @@ -182,7 +182,7 @@ cam_cci0: qcom,cci0 { cell-index = <0>; - compatible = "qcom,cci"; + compatible = "qcom,cci", "simple-bus"; reg = <0xac4f000 0x1000>; reg-names = "cci"; reg-cam-base = <0x4f000>; @@ -275,7 +275,7 @@ cam_cci1: qcom,cci1 { cell-index = <1>; - compatible = "qcom,cci"; + compatible = "qcom,cci", "simple-bus"; reg = <0xac50000 0x1000>; reg-names = "cci"; reg-cam-base = <0x50000>; @@ -367,7 +367,7 @@ }; qcom,cam_smmu { - compatible = "qcom,msm-cam-smmu"; + compatible = "qcom,msm-cam-smmu", "simple-bus"; status = "ok"; msm_cam_smmu_ife { diff --git a/lito-camera.dtsi b/lito-camera.dtsi index 90c3e37427b0..9cf6320be3d1 100644 --- a/lito-camera.dtsi +++ b/lito-camera.dtsi @@ -129,7 +129,7 @@ cam_cci0: qcom,cci0 { cell-index = <0>; - compatible = "qcom,cci"; + compatible = "qcom,cci", "simple-bus"; #address-cells = <1>; #size-cells = <0>; reg = <0xac4a000 0x1000>; @@ -224,7 +224,7 @@ cam_cci1: qcom,cci1 { cell-index = <1>; - compatible = "qcom,cci"; + compatible = "qcom,cci", "simple-bus"; #address-cells = <1>; #size-cells = <0>; reg = <0xac4b000 0x1000>; @@ -314,7 +314,7 @@ }; qcom,cam_smmu { - compatible = "qcom,msm-cam-smmu"; + compatible = "qcom,msm-cam-smmu", "simple-bus"; status = "ok"; msm_cam_smmu_ife {