| Message ID | 20220804142721.536556-5-sumit.garg@linaro.org |
|---|---|
| State | Accepted |
| Commit | 9b6f90ca9251e9a2c366fb676b7f49f42287b8c7 |
| Delegated to: | Tom Rini |
| Headers | show |
| Series | USB support for QCS404 SoC | expand |
On Thu, Aug 4, 2022 at 4:28 PM Sumit Garg <sumit.garg@linaro.org> wrote: > > Signed-off-by: Sumit Garg <sumit.garg@linaro.org> > --- > drivers/reset/reset-qcom.c | 30 ++++++++++++++++++++++++++++++ > 1 file changed, 30 insertions(+) > > diff --git a/drivers/reset/reset-qcom.c b/drivers/reset/reset-qcom.c > index 40f436ede4..94315e76d5 100644 > --- a/drivers/reset/reset-qcom.c > +++ b/drivers/reset/reset-qcom.c > @@ -102,6 +102,35 @@ static const struct qcom_reset_map gcc_qcom_resets[] = { > }; > #endif > > +#ifdef CONFIG_TARGET_QCS404EVB Hi, Why not pass the reset maps via match data per compatible? Regards, Robert > +#include <dt-bindings/clock/qcom,gcc-qcs404.h> > +static const struct qcom_reset_map gcc_qcom_resets[] = { > + [GCC_GENI_IR_BCR] = { 0x0F000 }, > + [GCC_CDSP_RESTART] = { 0x18000 }, > + [GCC_USB_HS_BCR] = { 0x41000 }, > + [GCC_USB2_HS_PHY_ONLY_BCR] = { 0x41034 }, > + [GCC_QUSB2_PHY_BCR] = { 0x4103c }, > + [GCC_USB_HS_PHY_CFG_AHB_BCR] = { 0x0000c, 1 }, > + [GCC_USB2A_PHY_BCR] = { 0x0000c, 0 }, > + [GCC_USB3_PHY_BCR] = { 0x39004 }, > + [GCC_USB_30_BCR] = { 0x39000 }, > + [GCC_USB3PHY_PHY_BCR] = { 0x39008 }, > + [GCC_PCIE_0_BCR] = { 0x3e000 }, > + [GCC_PCIE_0_PHY_BCR] = { 0x3e004 }, > + [GCC_PCIE_0_LINK_DOWN_BCR] = { 0x3e038 }, > + [GCC_PCIEPHY_0_PHY_BCR] = { 0x3e03c }, > + [GCC_PCIE_0_AXI_MASTER_STICKY_ARES] = { 0x3e040, 6}, > + [GCC_PCIE_0_AHB_ARES] = { 0x3e040, 5 }, > + [GCC_PCIE_0_AXI_SLAVE_ARES] = { 0x3e040, 4 }, > + [GCC_PCIE_0_AXI_MASTER_ARES] = { 0x3e040, 3 }, > + [GCC_PCIE_0_CORE_STICKY_ARES] = { 0x3e040, 2 }, > + [GCC_PCIE_0_SLEEP_ARES] = { 0x3e040, 1 }, > + [GCC_PCIE_0_PIPE_ARES] = { 0x3e040, 0 }, > + [GCC_EMAC_BCR] = { 0x4e000 }, > + [GCC_WDSP_RESTART] = {0x19000}, > +}; > +#endif > + > static int qcom_reset_assert(struct reset_ctl *rst) > { > struct qcom_reset_priv *priv = dev_get_priv(rst->dev); > @@ -141,6 +170,7 @@ static const struct reset_ops qcom_reset_ops = { > > static const struct udevice_id qcom_reset_ids[] = { > { .compatible = "qcom,gcc-reset-ipq4019" }, > + { .compatible = "qcom,gcc-reset-qcs404" }, > { } > }; > > -- > 2.25.1 >
Hi Robert, Thanks for your review. On Sat, 6 Aug 2022 at 13:11, Robert Marko <robert.marko@sartura.hr> wrote: > > On Thu, Aug 4, 2022 at 4:28 PM Sumit Garg <sumit.garg@linaro.org> wrote: > > > > Signed-off-by: Sumit Garg <sumit.garg@linaro.org> > > --- > > drivers/reset/reset-qcom.c | 30 ++++++++++++++++++++++++++++++ > > 1 file changed, 30 insertions(+) > > > > diff --git a/drivers/reset/reset-qcom.c b/drivers/reset/reset-qcom.c > > index 40f436ede4..94315e76d5 100644 > > --- a/drivers/reset/reset-qcom.c > > +++ b/drivers/reset/reset-qcom.c > > @@ -102,6 +102,35 @@ static const struct qcom_reset_map gcc_qcom_resets[] = { > > }; > > #endif > > > > +#ifdef CONFIG_TARGET_QCS404EVB > > Hi, > Why not pass the reset maps via match data per compatible? > Yeah but that won't allow me to get rid of this "#ifdef" since bindings header (qcom,gcc-qcs404.h) and corresponding reset table needs to be included under it due to overlapping reset IDs. So it won't add any value. -Sumit > Regards, > Robert > > > +#include <dt-bindings/clock/qcom,gcc-qcs404.h> > > +static const struct qcom_reset_map gcc_qcom_resets[] = { > > + [GCC_GENI_IR_BCR] = { 0x0F000 }, > > + [GCC_CDSP_RESTART] = { 0x18000 }, > > + [GCC_USB_HS_BCR] = { 0x41000 }, > > + [GCC_USB2_HS_PHY_ONLY_BCR] = { 0x41034 }, > > + [GCC_QUSB2_PHY_BCR] = { 0x4103c }, > > + [GCC_USB_HS_PHY_CFG_AHB_BCR] = { 0x0000c, 1 }, > > + [GCC_USB2A_PHY_BCR] = { 0x0000c, 0 }, > > + [GCC_USB3_PHY_BCR] = { 0x39004 }, > > + [GCC_USB_30_BCR] = { 0x39000 }, > > + [GCC_USB3PHY_PHY_BCR] = { 0x39008 }, > > + [GCC_PCIE_0_BCR] = { 0x3e000 }, > > + [GCC_PCIE_0_PHY_BCR] = { 0x3e004 }, > > + [GCC_PCIE_0_LINK_DOWN_BCR] = { 0x3e038 }, > > + [GCC_PCIEPHY_0_PHY_BCR] = { 0x3e03c }, > > + [GCC_PCIE_0_AXI_MASTER_STICKY_ARES] = { 0x3e040, 6}, > > + [GCC_PCIE_0_AHB_ARES] = { 0x3e040, 5 }, > > + [GCC_PCIE_0_AXI_SLAVE_ARES] = { 0x3e040, 4 }, > > + [GCC_PCIE_0_AXI_MASTER_ARES] = { 0x3e040, 3 }, > > + [GCC_PCIE_0_CORE_STICKY_ARES] = { 0x3e040, 2 }, > > + [GCC_PCIE_0_SLEEP_ARES] = { 0x3e040, 1 }, > > + [GCC_PCIE_0_PIPE_ARES] = { 0x3e040, 0 }, > > + [GCC_EMAC_BCR] = { 0x4e000 }, > > + [GCC_WDSP_RESTART] = {0x19000}, > > +}; > > +#endif > > + > > static int qcom_reset_assert(struct reset_ctl *rst) > > { > > struct qcom_reset_priv *priv = dev_get_priv(rst->dev); > > @@ -141,6 +170,7 @@ static const struct reset_ops qcom_reset_ops = { > > > > static const struct udevice_id qcom_reset_ids[] = { > > { .compatible = "qcom,gcc-reset-ipq4019" }, > > + { .compatible = "qcom,gcc-reset-qcs404" }, > > { } > > }; > > > > -- > > 2.25.1 > > > > > -- > Robert Marko > Staff Embedded Linux Engineer > Sartura Ltd. > Lendavska ulica 16a > 10000 Zagreb, Croatia > Email: robert.marko@sartura.hr > Web: www.sartura.hr
On Tue, Aug 9, 2022 at 3:25 PM Sumit Garg <sumit.garg@linaro.org> wrote: > > Hi Robert, > > Thanks for your review. > > On Sat, 6 Aug 2022 at 13:11, Robert Marko <robert.marko@sartura.hr> wrote: > > > > On Thu, Aug 4, 2022 at 4:28 PM Sumit Garg <sumit.garg@linaro.org> wrote: > > > > > > Signed-off-by: Sumit Garg <sumit.garg@linaro.org> > > > --- > > > drivers/reset/reset-qcom.c | 30 ++++++++++++++++++++++++++++++ > > > 1 file changed, 30 insertions(+) > > > > > > diff --git a/drivers/reset/reset-qcom.c b/drivers/reset/reset-qcom.c > > > index 40f436ede4..94315e76d5 100644 > > > --- a/drivers/reset/reset-qcom.c > > > +++ b/drivers/reset/reset-qcom.c > > > @@ -102,6 +102,35 @@ static const struct qcom_reset_map gcc_qcom_resets[] = { > > > }; > > > #endif > > > > > > +#ifdef CONFIG_TARGET_QCS404EVB > > > > Hi, > > Why not pass the reset maps via match data per compatible? > > > > Yeah but that won't allow me to get rid of this "#ifdef" since > bindings header (qcom,gcc-qcs404.h) and corresponding reset table > needs to be included under it due to overlapping reset IDs. So it > won't add any value. Hi, I see it now. Regards, Robert > > -Sumit > > > Regards, > > Robert > > > > > +#include <dt-bindings/clock/qcom,gcc-qcs404.h> > > > +static const struct qcom_reset_map gcc_qcom_resets[] = { > > > + [GCC_GENI_IR_BCR] = { 0x0F000 }, > > > + [GCC_CDSP_RESTART] = { 0x18000 }, > > > + [GCC_USB_HS_BCR] = { 0x41000 }, > > > + [GCC_USB2_HS_PHY_ONLY_BCR] = { 0x41034 }, > > > + [GCC_QUSB2_PHY_BCR] = { 0x4103c }, > > > + [GCC_USB_HS_PHY_CFG_AHB_BCR] = { 0x0000c, 1 }, > > > + [GCC_USB2A_PHY_BCR] = { 0x0000c, 0 }, > > > + [GCC_USB3_PHY_BCR] = { 0x39004 }, > > > + [GCC_USB_30_BCR] = { 0x39000 }, > > > + [GCC_USB3PHY_PHY_BCR] = { 0x39008 }, > > > + [GCC_PCIE_0_BCR] = { 0x3e000 }, > > > + [GCC_PCIE_0_PHY_BCR] = { 0x3e004 }, > > > + [GCC_PCIE_0_LINK_DOWN_BCR] = { 0x3e038 }, > > > + [GCC_PCIEPHY_0_PHY_BCR] = { 0x3e03c }, > > > + [GCC_PCIE_0_AXI_MASTER_STICKY_ARES] = { 0x3e040, 6}, > > > + [GCC_PCIE_0_AHB_ARES] = { 0x3e040, 5 }, > > > + [GCC_PCIE_0_AXI_SLAVE_ARES] = { 0x3e040, 4 }, > > > + [GCC_PCIE_0_AXI_MASTER_ARES] = { 0x3e040, 3 }, > > > + [GCC_PCIE_0_CORE_STICKY_ARES] = { 0x3e040, 2 }, > > > + [GCC_PCIE_0_SLEEP_ARES] = { 0x3e040, 1 }, > > > + [GCC_PCIE_0_PIPE_ARES] = { 0x3e040, 0 }, > > > + [GCC_EMAC_BCR] = { 0x4e000 }, > > > + [GCC_WDSP_RESTART] = {0x19000}, > > > +}; > > > +#endif > > > + > > > static int qcom_reset_assert(struct reset_ctl *rst) > > > { > > > struct qcom_reset_priv *priv = dev_get_priv(rst->dev); > > > @@ -141,6 +170,7 @@ static const struct reset_ops qcom_reset_ops = { > > > > > > static const struct udevice_id qcom_reset_ids[] = { > > > { .compatible = "qcom,gcc-reset-ipq4019" }, > > > + { .compatible = "qcom,gcc-reset-qcs404" }, > > > { } > > > }; > > > > > > -- > > > 2.25.1 > > > > > > > > > -- > > Robert Marko > > Staff Embedded Linux Engineer > > Sartura Ltd. > > Lendavska ulica 16a > > 10000 Zagreb, Croatia > > Email: robert.marko@sartura.hr > > Web: www.sartura.hr
On Thu, Aug 04, 2022 at 07:57:12PM +0530, Sumit Garg wrote:
> Signed-off-by: Sumit Garg <sumit.garg@linaro.org>
Applied to u-boot/next, thanks!
diff --git a/drivers/reset/reset-qcom.c b/drivers/reset/reset-qcom.c index 40f436ede4..94315e76d5 100644 --- a/drivers/reset/reset-qcom.c +++ b/drivers/reset/reset-qcom.c @@ -102,6 +102,35 @@ static const struct qcom_reset_map gcc_qcom_resets[] = { }; #endif +#ifdef CONFIG_TARGET_QCS404EVB +#include <dt-bindings/clock/qcom,gcc-qcs404.h> +static const struct qcom_reset_map gcc_qcom_resets[] = { + [GCC_GENI_IR_BCR] = { 0x0F000 }, + [GCC_CDSP_RESTART] = { 0x18000 }, + [GCC_USB_HS_BCR] = { 0x41000 }, + [GCC_USB2_HS_PHY_ONLY_BCR] = { 0x41034 }, + [GCC_QUSB2_PHY_BCR] = { 0x4103c }, + [GCC_USB_HS_PHY_CFG_AHB_BCR] = { 0x0000c, 1 }, + [GCC_USB2A_PHY_BCR] = { 0x0000c, 0 }, + [GCC_USB3_PHY_BCR] = { 0x39004 }, + [GCC_USB_30_BCR] = { 0x39000 }, + [GCC_USB3PHY_PHY_BCR] = { 0x39008 }, + [GCC_PCIE_0_BCR] = { 0x3e000 }, + [GCC_PCIE_0_PHY_BCR] = { 0x3e004 }, + [GCC_PCIE_0_LINK_DOWN_BCR] = { 0x3e038 }, + [GCC_PCIEPHY_0_PHY_BCR] = { 0x3e03c }, + [GCC_PCIE_0_AXI_MASTER_STICKY_ARES] = { 0x3e040, 6}, + [GCC_PCIE_0_AHB_ARES] = { 0x3e040, 5 }, + [GCC_PCIE_0_AXI_SLAVE_ARES] = { 0x3e040, 4 }, + [GCC_PCIE_0_AXI_MASTER_ARES] = { 0x3e040, 3 }, + [GCC_PCIE_0_CORE_STICKY_ARES] = { 0x3e040, 2 }, + [GCC_PCIE_0_SLEEP_ARES] = { 0x3e040, 1 }, + [GCC_PCIE_0_PIPE_ARES] = { 0x3e040, 0 }, + [GCC_EMAC_BCR] = { 0x4e000 }, + [GCC_WDSP_RESTART] = {0x19000}, +}; +#endif + static int qcom_reset_assert(struct reset_ctl *rst) { struct qcom_reset_priv *priv = dev_get_priv(rst->dev); @@ -141,6 +170,7 @@ static const struct reset_ops qcom_reset_ops = { static const struct udevice_id qcom_reset_ids[] = { { .compatible = "qcom,gcc-reset-ipq4019" }, + { .compatible = "qcom,gcc-reset-qcs404" }, { } };
Signed-off-by: Sumit Garg <sumit.garg@linaro.org> --- drivers/reset/reset-qcom.c | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+)