[PATCH 1/2] drivers: usb: musb: Fail if the ctrl mod register is missing
From: Sjoerd Simons sjoerd.simons@collabora.co.uk
If the trcl mode register address cannot be found error out rather then trying to continue (which cannot work)
Signed-off-by: Sjoerd Simons sjoerd.simons@collabora.co.uk Signed-off-by: Arnaud Ferraris arnaud.ferraris@collabora.com ---
drivers/usb/musb-new/ti-musb.c | 5 +++++ 1 file changed, 5 insertions(+)
diff --git a/drivers/usb/musb-new/ti-musb.c b/drivers/usb/musb-new/ti-musb.c index 608facefa3..4e88652433 100644 --- a/drivers/usb/musb-new/ti-musb.c +++ b/drivers/usb/musb-new/ti-musb.c @@ -91,6 +91,11 @@ static int ti_musb_ofdata_to_platdata(struct udevice *dev) phys = fdtdec_lookup_phandle(fdt, node, "phys"); ctrl_mod = fdtdec_lookup_phandle(fdt, phys, "ti,ctrl_mod"); platdata->ctrl_mod_base = (void *)fdtdec_get_addr(fdt, ctrl_mod, "reg"); + if (platdata->ctrl_mod_base == FDT_ADDR_T_NONE) { + pr_err("MUSB ctrl mod missing\n"); + return -ENOENT; + } + usb_index = ti_musb_get_usb_index(node); switch (usb_index) { case 1:
From: Adrian Ratiu adrian.ratiu@collabora.com
drivers/usb/musb-new/ti-musb.c: In function 'ti_musb_ofdata_to_platdata': drivers/usb/musb-new/ti-musb.c:93:30: warning: comparison between pointer and integer if (platdata->ctrl_mod_base == FDT_ADDR_T_NONE) {}
Signed-off-by: Adrian Ratiu adrian.ratiu@collabora.com Signed-off-by: Arnaud Ferraris arnaud.ferraris@collabora.com ---
drivers/usb/musb-new/ti-musb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/usb/musb-new/ti-musb.c b/drivers/usb/musb-new/ti-musb.c index 4e88652433..0c124a2c5e 100644 --- a/drivers/usb/musb-new/ti-musb.c +++ b/drivers/usb/musb-new/ti-musb.c @@ -91,7 +91,7 @@ static int ti_musb_ofdata_to_platdata(struct udevice *dev) phys = fdtdec_lookup_phandle(fdt, node, "phys"); ctrl_mod = fdtdec_lookup_phandle(fdt, phys, "ti,ctrl_mod"); platdata->ctrl_mod_base = (void *)fdtdec_get_addr(fdt, ctrl_mod, "reg"); - if (platdata->ctrl_mod_base == FDT_ADDR_T_NONE) { + if (platdata->ctrl_mod_base == (void *)FDT_ADDR_T_NONE) { pr_err("MUSB ctrl mod missing\n"); return -ENOENT; }
On 4/22/20 12:50 PM, Arnaud Ferraris wrote:
From: Adrian Ratiu adrian.ratiu@collabora.com
drivers/usb/musb-new/ti-musb.c: In function 'ti_musb_ofdata_to_platdata': drivers/usb/musb-new/ti-musb.c:93:30: warning: comparison between pointer and integer if (platdata->ctrl_mod_base == FDT_ADDR_T_NONE) {}
Signed-off-by: Adrian Ratiu adrian.ratiu@collabora.com Signed-off-by: Arnaud Ferraris arnaud.ferraris@collabora.com
drivers/usb/musb-new/ti-musb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/usb/musb-new/ti-musb.c b/drivers/usb/musb-new/ti-musb.c index 4e88652433..0c124a2c5e 100644 --- a/drivers/usb/musb-new/ti-musb.c +++ b/drivers/usb/musb-new/ti-musb.c @@ -91,7 +91,7 @@ static int ti_musb_ofdata_to_platdata(struct udevice *dev) phys = fdtdec_lookup_phandle(fdt, node, "phys"); ctrl_mod = fdtdec_lookup_phandle(fdt, phys, "ti,ctrl_mod"); platdata->ctrl_mod_base = (void *)fdtdec_get_addr(fdt, ctrl_mod, "reg");
- if (platdata->ctrl_mod_base == FDT_ADDR_T_NONE) {
- if (platdata->ctrl_mod_base == (void *)FDT_ADDR_T_NONE) { pr_err("MUSB ctrl mod missing\n");
Is this patching the same code as 1/2 ?
Le 22/04/2020 à 12:53, Marek Vasut a écrit :
On 4/22/20 12:50 PM, Arnaud Ferraris wrote:
diff --git a/drivers/usb/musb-new/ti-musb.c b/drivers/usb/musb-new/ti-musb.c index 4e88652433..0c124a2c5e 100644 --- a/drivers/usb/musb-new/ti-musb.c +++ b/drivers/usb/musb-new/ti-musb.c @@ -91,7 +91,7 @@ static int ti_musb_ofdata_to_platdata(struct udevice *dev) phys = fdtdec_lookup_phandle(fdt, node, "phys"); ctrl_mod = fdtdec_lookup_phandle(fdt, phys, "ti,ctrl_mod"); platdata->ctrl_mod_base = (void *)fdtdec_get_addr(fdt, ctrl_mod, "reg");
- if (platdata->ctrl_mod_base == FDT_ADDR_T_NONE) {
- if (platdata->ctrl_mod_base == (void *)FDT_ADDR_T_NONE) { pr_err("MUSB ctrl mod missing\n");
Is this patching the same code as 1/2 ?
It is indeed. I kept it that way as the original commits were from different authors and different times, but I can squash those.
Cheers, Arnaud
On 4/22/20 12:50 PM, Arnaud Ferraris wrote:
From: Sjoerd Simons sjoerd.simons@collabora.co.uk
If the trcl mode register address cannot be found error out rather then trying to continue (which cannot work)
Signed-off-by: Sjoerd Simons sjoerd.simons@collabora.co.uk Signed-off-by: Arnaud Ferraris arnaud.ferraris@collabora.com
drivers/usb/musb-new/ti-musb.c | 5 +++++ 1 file changed, 5 insertions(+)
diff --git a/drivers/usb/musb-new/ti-musb.c b/drivers/usb/musb-new/ti-musb.c index 608facefa3..4e88652433 100644 --- a/drivers/usb/musb-new/ti-musb.c +++ b/drivers/usb/musb-new/ti-musb.c @@ -91,6 +91,11 @@ static int ti_musb_ofdata_to_platdata(struct udevice *dev) phys = fdtdec_lookup_phandle(fdt, node, "phys"); ctrl_mod = fdtdec_lookup_phandle(fdt, phys, "ti,ctrl_mod"); platdata->ctrl_mod_base = (void *)fdtdec_get_addr(fdt, ctrl_mod, "reg");
- if (platdata->ctrl_mod_base == FDT_ADDR_T_NONE) {
pr_err("MUSB ctrl mod missing\n");
dev_err()
participants (2)
-
Arnaud Ferraris -
Marek Vasut