diff for duplicates of <5550BE99.40702@ti.com> diff --git a/a/1.txt b/N1/1.txt index 41bd44b..56dafdd 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -172,7 +172,7 @@ On Thursday 23 April 2015 04:44 AM, Arun Ramamurthy wrote: > + for (i = 0; i < ARRAY_SIZE(phy_driver->ports); i++) { > + struct bcm_phy_instance *p = phy_driver->ports[i]; > + -> + if (p && p->generic_phy->dev.of_node = args->np) { +> + if (p && p->generic_phy->dev.of_node == args->np) { > + port = p; > + break; > + } @@ -219,7 +219,8 @@ can be a goto here with a label in the end. > + */ > + reg_val = readl(phy_driver->usbphy_regs + > + CDRU_USB_DEV_SUSPEND_RESUME_CTRL_OFFSET); -> + reg_val |> + 1 << CDRU_USB_DEV_SUSPEND_RESUME_CTRL_DISABLE; +> + reg_val |= +> + 1 << CDRU_USB_DEV_SUSPEND_RESUME_CTRL_DISABLE; > + writel(reg_val, phy_driver->usbphy_regs + > + CDRU_USB_DEV_SUSPEND_RESUME_CTRL_OFFSET); > + } @@ -254,7 +255,7 @@ can be a goto here with a label in the end. > + * If a port is configured to device and it is being shutdown, > + * turn off the clocks to the usb device controller. > + */ -> + if (port->port_no = 2 && !port->host_mode) { +> + if (port->port_no == 2 && !port->host_mode) { > + reg_val = readl(phy_driver->usb2d_idm_regs + > + USB2_IDM_IDM_IO_CONTROL_DIRECT_OFFSET); > + reg_val &= ~(1 << USB2_IDM_IDM_IO_CONTROL_DIRECT__clk_enable); @@ -283,7 +284,7 @@ please avoid using camel case.. > + powered_on_phy = reg_val; The above statement is useless. -> + if (reg_val = port->port_no) { +> + if (reg_val == port->port_no) { > + for (i = 0; i < ARRAY_SIZE(phy_driver->ports); i++) { > + if (phy_driver->ports[i] && > + phy_driver->ports[i]->power && @@ -302,7 +303,8 @@ The above statement is useless. > + */ > + reg_val = readl(phy_driver->usb2h_idm_regs + > + USB2_IDM_IDM_IO_CONTROL_DIRECT_OFFSET); -> + reg_val &> + ~(1 << USB2_IDM_IDM_IO_CONTROL_DIRECT__clk_enable); +> + reg_val &= +> + ~(1 << USB2_IDM_IDM_IO_CONTROL_DIRECT__clk_enable); > + writel(reg_val, phy_driver->usb2h_idm_regs + > + USB2_IDM_IDM_IO_CONTROL_DIRECT_OFFSET); > + @@ -358,7 +360,7 @@ The above statement is useless. > + port->power = true; > + > + /* Check if the port 2 is configured for device */ -> + if (port->port_no = 2 && !port->host_mode) { +> + if (port->port_no == 2 && !port->host_mode) { > + /* > + * Enable clock to USB device and get the USB device > + * out of reset. diff --git a/a/content_digest b/N1/content_digest index e77b76f..fc33233 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,7 +2,7 @@ "ref\01429744479-10410-4-git-send-email-arun.ramamurthy@broadcom.com\0" "From\0Kishon Vijay Abraham I <kishon@ti.com>\0" "Subject\0Re: [PATCH v3 3/3] phy: cygnus-usbphy: Add Broadcom Cygnus USB phy driver\0" - "Date\0Mon, 11 May 2015 14:49:13 +0000\0" + "Date\0Mon, 11 May 2015 20:07:13 +0530\0" "To\0Arun Ramamurthy <arun.ramamurthy@broadcom.com>" Rob Herring <robh+dt@kernel.org> Pawel Moll <pawel.moll@arm.com> @@ -202,7 +202,7 @@ "> +\tfor (i = 0; i < ARRAY_SIZE(phy_driver->ports); i++) {\n" "> +\t\tstruct bcm_phy_instance *p = phy_driver->ports[i];\n" "> +\n" - "> +\t\tif (p && p->generic_phy->dev.of_node = args->np) {\n" + "> +\t\tif (p && p->generic_phy->dev.of_node == args->np) {\n" "> +\t\t\tport = p;\n" "> +\t\t\tbreak;\n" "> +\t\t}\n" @@ -249,7 +249,8 @@ "> +\t\t */\n" "> +\t\treg_val = readl(phy_driver->usbphy_regs +\n" "> +\t\t\t CDRU_USB_DEV_SUSPEND_RESUME_CTRL_OFFSET);\n" - "> +\t\treg_val |> +\t\t\t1 << CDRU_USB_DEV_SUSPEND_RESUME_CTRL_DISABLE;\n" + "> +\t\treg_val |=\n" + "> +\t\t\t1 << CDRU_USB_DEV_SUSPEND_RESUME_CTRL_DISABLE;\n" "> +\t\twritel(reg_val, phy_driver->usbphy_regs +\n" "> +\t\t CDRU_USB_DEV_SUSPEND_RESUME_CTRL_OFFSET);\n" "> +\t}\n" @@ -284,7 +285,7 @@ "> +\t * If a port is configured to device and it is being shutdown,\n" "> +\t * turn off the clocks to the usb device controller.\n" "> +\t */\n" - "> +\tif (port->port_no = 2 && !port->host_mode) {\n" + "> +\tif (port->port_no == 2 && !port->host_mode) {\n" "> +\t\treg_val = readl(phy_driver->usb2d_idm_regs +\n" "> +\t\t\t\tUSB2_IDM_IDM_IO_CONTROL_DIRECT_OFFSET);\n" "> +\t\treg_val &= ~(1 << USB2_IDM_IDM_IO_CONTROL_DIRECT__clk_enable);\n" @@ -313,7 +314,7 @@ "> +\tpowered_on_phy = reg_val;\n" "\n" "The above statement is useless.\n" - "> +\tif (reg_val = port->port_no) {\n" + "> +\tif (reg_val == port->port_no) {\n" "> +\t\tfor (i = 0; i < ARRAY_SIZE(phy_driver->ports); i++) {\n" "> +\t\t\tif (phy_driver->ports[i] &&\n" "> +\t\t\t phy_driver->ports[i]->power &&\n" @@ -332,7 +333,8 @@ "> +\t\t */\n" "> +\t\treg_val = readl(phy_driver->usb2h_idm_regs +\n" "> +\t\t\tUSB2_IDM_IDM_IO_CONTROL_DIRECT_OFFSET);\n" - "> +\t\treg_val &> +\t\t ~(1 << USB2_IDM_IDM_IO_CONTROL_DIRECT__clk_enable);\n" + "> +\t\treg_val &=\n" + "> +\t\t ~(1 << USB2_IDM_IDM_IO_CONTROL_DIRECT__clk_enable);\n" "> +\t\twritel(reg_val, phy_driver->usb2h_idm_regs +\n" "> +\t\t\t\tUSB2_IDM_IDM_IO_CONTROL_DIRECT_OFFSET);\n" "> +\n" @@ -388,7 +390,7 @@ "> +\tport->power = true;\n" "> +\n" "> +\t/* Check if the port 2 is configured for device */\n" - "> +\tif (port->port_no = 2 && !port->host_mode) {\n" + "> +\tif (port->port_no == 2 && !port->host_mode) {\n" "> +\t\t/*\n" "> +\t\t * Enable clock to USB device and get the USB device\n" "> +\t\t * out of reset.\n" @@ -586,4 +588,4 @@ "Thanks\n" Kishon -fdddc1d82000a37ad9dfba268fc7fb88bdbefe3b795795f74f34ec41d67e2fda +f76ffa675d0d14b8eb501d0698dff94cd9af23367dc3cd77034218504a193179
diff --git a/a/1.txt b/N2/1.txt index 41bd44b..56dafdd 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -172,7 +172,7 @@ On Thursday 23 April 2015 04:44 AM, Arun Ramamurthy wrote: > + for (i = 0; i < ARRAY_SIZE(phy_driver->ports); i++) { > + struct bcm_phy_instance *p = phy_driver->ports[i]; > + -> + if (p && p->generic_phy->dev.of_node = args->np) { +> + if (p && p->generic_phy->dev.of_node == args->np) { > + port = p; > + break; > + } @@ -219,7 +219,8 @@ can be a goto here with a label in the end. > + */ > + reg_val = readl(phy_driver->usbphy_regs + > + CDRU_USB_DEV_SUSPEND_RESUME_CTRL_OFFSET); -> + reg_val |> + 1 << CDRU_USB_DEV_SUSPEND_RESUME_CTRL_DISABLE; +> + reg_val |= +> + 1 << CDRU_USB_DEV_SUSPEND_RESUME_CTRL_DISABLE; > + writel(reg_val, phy_driver->usbphy_regs + > + CDRU_USB_DEV_SUSPEND_RESUME_CTRL_OFFSET); > + } @@ -254,7 +255,7 @@ can be a goto here with a label in the end. > + * If a port is configured to device and it is being shutdown, > + * turn off the clocks to the usb device controller. > + */ -> + if (port->port_no = 2 && !port->host_mode) { +> + if (port->port_no == 2 && !port->host_mode) { > + reg_val = readl(phy_driver->usb2d_idm_regs + > + USB2_IDM_IDM_IO_CONTROL_DIRECT_OFFSET); > + reg_val &= ~(1 << USB2_IDM_IDM_IO_CONTROL_DIRECT__clk_enable); @@ -283,7 +284,7 @@ please avoid using camel case.. > + powered_on_phy = reg_val; The above statement is useless. -> + if (reg_val = port->port_no) { +> + if (reg_val == port->port_no) { > + for (i = 0; i < ARRAY_SIZE(phy_driver->ports); i++) { > + if (phy_driver->ports[i] && > + phy_driver->ports[i]->power && @@ -302,7 +303,8 @@ The above statement is useless. > + */ > + reg_val = readl(phy_driver->usb2h_idm_regs + > + USB2_IDM_IDM_IO_CONTROL_DIRECT_OFFSET); -> + reg_val &> + ~(1 << USB2_IDM_IDM_IO_CONTROL_DIRECT__clk_enable); +> + reg_val &= +> + ~(1 << USB2_IDM_IDM_IO_CONTROL_DIRECT__clk_enable); > + writel(reg_val, phy_driver->usb2h_idm_regs + > + USB2_IDM_IDM_IO_CONTROL_DIRECT_OFFSET); > + @@ -358,7 +360,7 @@ The above statement is useless. > + port->power = true; > + > + /* Check if the port 2 is configured for device */ -> + if (port->port_no = 2 && !port->host_mode) { +> + if (port->port_no == 2 && !port->host_mode) { > + /* > + * Enable clock to USB device and get the USB device > + * out of reset. diff --git a/a/content_digest b/N2/content_digest index e77b76f..a3f9221 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -2,7 +2,7 @@ "ref\01429744479-10410-4-git-send-email-arun.ramamurthy@broadcom.com\0" "From\0Kishon Vijay Abraham I <kishon@ti.com>\0" "Subject\0Re: [PATCH v3 3/3] phy: cygnus-usbphy: Add Broadcom Cygnus USB phy driver\0" - "Date\0Mon, 11 May 2015 14:49:13 +0000\0" + "Date\0Mon, 11 May 2015 20:07:13 +0530\0" "To\0Arun Ramamurthy <arun.ramamurthy@broadcom.com>" Rob Herring <robh+dt@kernel.org> Pawel Moll <pawel.moll@arm.com> @@ -16,15 +16,15 @@ Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Greg Kroah-Hartman <gregkh@linuxfoundation.org> " Arnd Bergmann <arnd@arndb.de>\0" - "Cc\0devicetree@vger.kernel.org" - linux-kernel@vger.kernel.org - linux-fbdev@vger.kernel.org + "Cc\0<devicetree@vger.kernel.org>" + <linux-kernel@vger.kernel.org> + <linux-fbdev@vger.kernel.org> Dmitry Torokhov <dtor@google.com> Anatol Pomazau <anatol@google.com> Jonathan Richardson <jonathar@broadcom.com> Scott Branden <sbranden@broadcom.com> Ray Jui <rjui@broadcom.com> - bcm-kernel-feedback-list@broadcom.com + <bcm-kernel-feedback-list@broadcom.com> " Dmitry Torokhov <dtor@chromium.org>\0" "\00:1\0" "b\0" @@ -202,7 +202,7 @@ "> +\tfor (i = 0; i < ARRAY_SIZE(phy_driver->ports); i++) {\n" "> +\t\tstruct bcm_phy_instance *p = phy_driver->ports[i];\n" "> +\n" - "> +\t\tif (p && p->generic_phy->dev.of_node = args->np) {\n" + "> +\t\tif (p && p->generic_phy->dev.of_node == args->np) {\n" "> +\t\t\tport = p;\n" "> +\t\t\tbreak;\n" "> +\t\t}\n" @@ -249,7 +249,8 @@ "> +\t\t */\n" "> +\t\treg_val = readl(phy_driver->usbphy_regs +\n" "> +\t\t\t CDRU_USB_DEV_SUSPEND_RESUME_CTRL_OFFSET);\n" - "> +\t\treg_val |> +\t\t\t1 << CDRU_USB_DEV_SUSPEND_RESUME_CTRL_DISABLE;\n" + "> +\t\treg_val |=\n" + "> +\t\t\t1 << CDRU_USB_DEV_SUSPEND_RESUME_CTRL_DISABLE;\n" "> +\t\twritel(reg_val, phy_driver->usbphy_regs +\n" "> +\t\t CDRU_USB_DEV_SUSPEND_RESUME_CTRL_OFFSET);\n" "> +\t}\n" @@ -284,7 +285,7 @@ "> +\t * If a port is configured to device and it is being shutdown,\n" "> +\t * turn off the clocks to the usb device controller.\n" "> +\t */\n" - "> +\tif (port->port_no = 2 && !port->host_mode) {\n" + "> +\tif (port->port_no == 2 && !port->host_mode) {\n" "> +\t\treg_val = readl(phy_driver->usb2d_idm_regs +\n" "> +\t\t\t\tUSB2_IDM_IDM_IO_CONTROL_DIRECT_OFFSET);\n" "> +\t\treg_val &= ~(1 << USB2_IDM_IDM_IO_CONTROL_DIRECT__clk_enable);\n" @@ -313,7 +314,7 @@ "> +\tpowered_on_phy = reg_val;\n" "\n" "The above statement is useless.\n" - "> +\tif (reg_val = port->port_no) {\n" + "> +\tif (reg_val == port->port_no) {\n" "> +\t\tfor (i = 0; i < ARRAY_SIZE(phy_driver->ports); i++) {\n" "> +\t\t\tif (phy_driver->ports[i] &&\n" "> +\t\t\t phy_driver->ports[i]->power &&\n" @@ -332,7 +333,8 @@ "> +\t\t */\n" "> +\t\treg_val = readl(phy_driver->usb2h_idm_regs +\n" "> +\t\t\tUSB2_IDM_IDM_IO_CONTROL_DIRECT_OFFSET);\n" - "> +\t\treg_val &> +\t\t ~(1 << USB2_IDM_IDM_IO_CONTROL_DIRECT__clk_enable);\n" + "> +\t\treg_val &=\n" + "> +\t\t ~(1 << USB2_IDM_IDM_IO_CONTROL_DIRECT__clk_enable);\n" "> +\t\twritel(reg_val, phy_driver->usb2h_idm_regs +\n" "> +\t\t\t\tUSB2_IDM_IDM_IO_CONTROL_DIRECT_OFFSET);\n" "> +\n" @@ -388,7 +390,7 @@ "> +\tport->power = true;\n" "> +\n" "> +\t/* Check if the port 2 is configured for device */\n" - "> +\tif (port->port_no = 2 && !port->host_mode) {\n" + "> +\tif (port->port_no == 2 && !port->host_mode) {\n" "> +\t\t/*\n" "> +\t\t * Enable clock to USB device and get the USB device\n" "> +\t\t * out of reset.\n" @@ -586,4 +588,4 @@ "Thanks\n" Kishon -fdddc1d82000a37ad9dfba268fc7fb88bdbefe3b795795f74f34ec41d67e2fda +e9f1e46ad9761477b2b0957b58709c9d5b4c098039c9162fe36ac9c74ae7c736
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.