diff for duplicates of <534B77E2.8060901@ti.com> diff --git a/a/1.txt b/N1/1.txt index faafdf5..8ed4e87 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -39,7 +39,8 @@ On Saturday 12 April 2014 05:45 AM, Sergei Shtylyov wrote: > 4 files changed, 326 insertions(+) > > Index: linux-phy/Documentation/devicetree/bindings/phy/rcar-gen2-phy.txt -> =================================> --- /dev/null +> =================================================================== +> --- /dev/null > +++ linux-phy/Documentation/devicetree/bindings/phy/rcar-gen2-phy.txt > @@ -0,0 +1,35 @@ > +* Renesas R-Car generation 2 USB PHY @@ -78,7 +79,8 @@ On Saturday 12 April 2014 05:45 AM, Sergei Shtylyov wrote: > + clock-names = "usbhs"; > + }; > Index: linux-phy/drivers/phy/Kconfig -> =================================> --- linux-phy.orig/drivers/phy/Kconfig +> =================================================================== +> --- linux-phy.orig/drivers/phy/Kconfig > +++ linux-phy/drivers/phy/Kconfig > @@ -31,6 +31,13 @@ config PHY_MVEBU_SATA > depends on OF @@ -95,7 +97,8 @@ On Saturday 12 April 2014 05:45 AM, Sergei Shtylyov wrote: > tristate "OMAP CONTROL PHY Driver" > help > Index: linux-phy/drivers/phy/Makefile -> =================================> --- linux-phy.orig/drivers/phy/Makefile +> =================================================================== +> --- linux-phy.orig/drivers/phy/Makefile > +++ linux-phy/drivers/phy/Makefile > @@ -7,6 +7,7 @@ obj-$(CONFIG_BCM_KONA_USB2_PHY) += phy- > obj-$(CONFIG_PHY_EXYNOS_DP_VIDEO) += phy-exynos-dp-video.o @@ -106,7 +109,8 @@ On Saturday 12 April 2014 05:45 AM, Sergei Shtylyov wrote: > obj-$(CONFIG_OMAP_USB2) += phy-omap-usb2.o > obj-$(CONFIG_TI_PIPE3) += phy-ti-pipe3.o > Index: linux-phy/drivers/phy/phy-rcar-gen2.c -> =================================> --- /dev/null +> =================================================================== +> --- /dev/null > +++ linux-phy/drivers/phy/phy-rcar-gen2.c > @@ -0,0 +1,283 @@ > +/* @@ -229,7 +233,7 @@ We can just add > + > + for (i = 0; i < 20; i++) { > + value = readl(base + USBHS_UGSTS); -> + if ((value & USBHS_UGSTS_LOCK) = USBHS_UGSTS_LOCK) { +> + if ((value & USBHS_UGSTS_LOCK) == USBHS_UGSTS_LOCK) { > + value = readl(base + USBHS_UGCTRL); > + value |= USBHS_UGCTRL_CONNECT; > + writel(value, base + USBHS_UGCTRL); diff --git a/a/content_digest b/N1/content_digest index 0591143..469c220 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\0201404120415.43761.sergei.shtylyov@cogentembedded.com\0" "From\0Kishon Vijay Abraham I <kishon@ti.com>\0" "Subject\0Re: [PATCH v3] phy: Renesas R-Car Gen2 PHY driver\0" - "Date\0Mon, 14 Apr 2014 05:54:26 +0000\0" + "Date\0Mon, 14 Apr 2014 11:23:38 +0530\0" "To\0Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>" devicetree@vger.kernel.org robh+dt@kernel.org @@ -57,7 +57,8 @@ "> 4 files changed, 326 insertions(+)\n" "> \n" "> Index: linux-phy/Documentation/devicetree/bindings/phy/rcar-gen2-phy.txt\n" - "> =================================> --- /dev/null\n" + "> ===================================================================\n" + "> --- /dev/null\n" "> +++ linux-phy/Documentation/devicetree/bindings/phy/rcar-gen2-phy.txt\n" "> @@ -0,0 +1,35 @@\n" "> +* Renesas R-Car generation 2 USB PHY\n" @@ -96,7 +97,8 @@ "> +\t\tclock-names = \"usbhs\";\n" "> +\t};\n" "> Index: linux-phy/drivers/phy/Kconfig\n" - "> =================================> --- linux-phy.orig/drivers/phy/Kconfig\n" + "> ===================================================================\n" + "> --- linux-phy.orig/drivers/phy/Kconfig\n" "> +++ linux-phy/drivers/phy/Kconfig\n" "> @@ -31,6 +31,13 @@ config PHY_MVEBU_SATA\n" "> \tdepends on OF\n" @@ -113,7 +115,8 @@ "> \ttristate \"OMAP CONTROL PHY Driver\"\n" "> \thelp\n" "> Index: linux-phy/drivers/phy/Makefile\n" - "> =================================> --- linux-phy.orig/drivers/phy/Makefile\n" + "> ===================================================================\n" + "> --- linux-phy.orig/drivers/phy/Makefile\n" "> +++ linux-phy/drivers/phy/Makefile\n" "> @@ -7,6 +7,7 @@ obj-$(CONFIG_BCM_KONA_USB2_PHY)\t\t+= phy-\n" "> obj-$(CONFIG_PHY_EXYNOS_DP_VIDEO)\t+= phy-exynos-dp-video.o\n" @@ -124,7 +127,8 @@ "> obj-$(CONFIG_OMAP_USB2)\t\t\t+= phy-omap-usb2.o\n" "> obj-$(CONFIG_TI_PIPE3)\t\t\t+= phy-ti-pipe3.o\n" "> Index: linux-phy/drivers/phy/phy-rcar-gen2.c\n" - "> =================================> --- /dev/null\n" + "> ===================================================================\n" + "> --- /dev/null\n" "> +++ linux-phy/drivers/phy/phy-rcar-gen2.c\n" "> @@ -0,0 +1,283 @@\n" "> +/*\n" @@ -247,7 +251,7 @@ "> +\n" "> +\tfor (i = 0; i < 20; i++) {\n" "> +\t\tvalue = readl(base + USBHS_UGSTS);\n" - "> +\t\tif ((value & USBHS_UGSTS_LOCK) = USBHS_UGSTS_LOCK) {\n" + "> +\t\tif ((value & USBHS_UGSTS_LOCK) == USBHS_UGSTS_LOCK) {\n" "> +\t\t\tvalue = readl(base + USBHS_UGCTRL);\n" "> +\t\t\tvalue |= USBHS_UGCTRL_CONNECT;\n" "> +\t\t\twritel(value, base + USBHS_UGCTRL);\n" @@ -380,4 +384,4 @@ "Thanks\n" Kishon -7dba535cc227000ec9a4a6a9d9840ff673cdc4c14de3a27beb37034acd1b2961 +b3265bc3976711ac7ccf00aaf5383784bd01a4457ee5dcc8adf43327dd813252
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.