| Message ID | 20220727082204.3677784-2-sumit.garg@linaro.org |
|---|---|
| State | New |
| Headers | show |
| Series | Initial step for Linux DT sync on Qcom SoCs | expand |
On Wed, Jul 27, 2022 at 11:22 AM Sumit Garg <sumit.garg@linaro.org> wrote: > > DT compatible is sufficient to make platform specific differentiation, > so remove redundant CONFIG_SDM845 check. > > Signed-off-by: Sumit Garg <sumit.garg@linaro.org> > --- > arch/arm/mach-snapdragon/Makefile | 2 +- > arch/arm/mach-snapdragon/pinctrl-snapdragon.c | 2 -- > 2 files changed, 1 insertion(+), 3 deletions(-) > > diff --git a/arch/arm/mach-snapdragon/Makefile b/arch/arm/mach-snapdragon/Makefile > index 0d31f10f68..cbaaf23f6b 100644 > --- a/arch/arm/mach-snapdragon/Makefile > +++ b/arch/arm/mach-snapdragon/Makefile > @@ -16,6 +16,6 @@ obj-y += pinctrl-snapdragon.o > obj-y += pinctrl-apq8016.o > obj-y += pinctrl-apq8096.o > obj-y += pinctrl-qcs404.o > -obj-$(CONFIG_SDM845) += pinctrl-sdm845.o > +obj-y += pinctrl-sdm845.o > obj-$(CONFIG_TARGET_QCS404EVB) += clock-qcs404.o > obj-$(CONFIG_TARGET_QCS404EVB) += sysmap-qcs404.o > diff --git a/arch/arm/mach-snapdragon/pinctrl-snapdragon.c b/arch/arm/mach-snapdragon/pinctrl-snapdragon.c > index c2148a5d0a..842e2da0c5 100644 > --- a/arch/arm/mach-snapdragon/pinctrl-snapdragon.c > +++ b/arch/arm/mach-snapdragon/pinctrl-snapdragon.c > @@ -116,9 +116,7 @@ static struct pinctrl_ops msm_pinctrl_ops = { > static const struct udevice_id msm_pinctrl_ids[] = { > { .compatible = "qcom,tlmm-apq8016", .data = (ulong)&apq8016_data }, > { .compatible = "qcom,tlmm-apq8096", .data = (ulong)&apq8096_data }, > -#ifdef CONFIG_SDM845 > { .compatible = "qcom,tlmm-sdm845", .data = (ulong)&sdm845_data }, > -#endif > { .compatible = "qcom,tlmm-qcs404", .data = (ulong)&qcs404_data }, > { } > }; > -- > 2.25.1 > Reviewed-by: Ramon Fried <rfried.dev@gmail.com>
On Wed, Jul 27, 2022 at 01:52:03PM +0530, Sumit Garg wrote: > DT compatible is sufficient to make platform specific differentiation, > so remove redundant CONFIG_SDM845 check. > > Signed-off-by: Sumit Garg <sumit.garg@linaro.org> > Reviewed-by: Ramon Fried <rfried.dev@gmail.com> Applied to u-boot/next, thanks!
diff --git a/arch/arm/mach-snapdragon/Makefile b/arch/arm/mach-snapdragon/Makefile index 0d31f10f68..cbaaf23f6b 100644 --- a/arch/arm/mach-snapdragon/Makefile +++ b/arch/arm/mach-snapdragon/Makefile @@ -16,6 +16,6 @@ obj-y += pinctrl-snapdragon.o obj-y += pinctrl-apq8016.o obj-y += pinctrl-apq8096.o obj-y += pinctrl-qcs404.o -obj-$(CONFIG_SDM845) += pinctrl-sdm845.o +obj-y += pinctrl-sdm845.o obj-$(CONFIG_TARGET_QCS404EVB) += clock-qcs404.o obj-$(CONFIG_TARGET_QCS404EVB) += sysmap-qcs404.o diff --git a/arch/arm/mach-snapdragon/pinctrl-snapdragon.c b/arch/arm/mach-snapdragon/pinctrl-snapdragon.c index c2148a5d0a..842e2da0c5 100644 --- a/arch/arm/mach-snapdragon/pinctrl-snapdragon.c +++ b/arch/arm/mach-snapdragon/pinctrl-snapdragon.c @@ -116,9 +116,7 @@ static struct pinctrl_ops msm_pinctrl_ops = { static const struct udevice_id msm_pinctrl_ids[] = { { .compatible = "qcom,tlmm-apq8016", .data = (ulong)&apq8016_data }, { .compatible = "qcom,tlmm-apq8096", .data = (ulong)&apq8096_data }, -#ifdef CONFIG_SDM845 { .compatible = "qcom,tlmm-sdm845", .data = (ulong)&sdm845_data }, -#endif { .compatible = "qcom,tlmm-qcs404", .data = (ulong)&qcs404_data }, { } };
DT compatible is sufficient to make platform specific differentiation, so remove redundant CONFIG_SDM845 check. Signed-off-by: Sumit Garg <sumit.garg@linaro.org> --- arch/arm/mach-snapdragon/Makefile | 2 +- arch/arm/mach-snapdragon/pinctrl-snapdragon.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-)