diff for duplicates of <53466C07.4080409@ti.com> diff --git a/a/1.txt b/N1/1.txt index 346a310..972ef0a 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -32,7 +32,8 @@ controller and the PHY is given in dt data. > 4 files changed, 330 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 @@ -71,7 +72,8 @@ controller and the PHY is given in dt data. > + 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 @@ -90,7 +92,8 @@ depends on CONFIG_OF? > 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 > @@ -9,6 +9,7 @@ obj-$(CONFIG_PHY_EXYNOS_MIPI_VIDEO) += p > obj-$(CONFIG_PHY_MVEBU_SATA) += phy-mvebu-sata.o @@ -101,7 +104,8 @@ depends on CONFIG_OF? > obj-$(CONFIG_TWL4030_USB) += phy-twl4030-usb.o > obj-$(CONFIG_PHY_EXYNOS5250_SATA) += phy-exynos5250-sata.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,287 @@ > +/* @@ -224,7 +228,7 @@ why ioreadl here? > + > + 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 d5fe517..09472a5 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\0201404090144.26769.sergei.shtylyov@cogentembedded.com\0" "From\0Kishon Vijay Abraham I <kishon@ti.com>\0" "Subject\0Re: [PATCH v2] phy: Renesas R-Car Gen2 PHY driver\0" - "Date\0Thu, 10 Apr 2014 10:13:43 +0000\0" + "Date\0Thu, 10 Apr 2014 15:31:43 +0530\0" "To\0Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>" devicetree@vger.kernel.org robh+dt@kernel.org @@ -50,7 +50,8 @@ "> 4 files changed, 330 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" @@ -89,7 +90,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" @@ -108,7 +110,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" "> @@ -9,6 +9,7 @@ obj-$(CONFIG_PHY_EXYNOS_MIPI_VIDEO)\t+= p\n" "> obj-$(CONFIG_PHY_MVEBU_SATA)\t\t+= phy-mvebu-sata.o\n" @@ -119,7 +122,8 @@ "> obj-$(CONFIG_TWL4030_USB)\t\t+= phy-twl4030-usb.o\n" "> obj-$(CONFIG_PHY_EXYNOS5250_SATA)\t+= phy-exynos5250-sata.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,287 @@\n" "> +/*\n" @@ -242,7 +246,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" @@ -373,4 +377,4 @@ "Thanks\n" Kishon -fe68bf04dec5d2dd0330d4a97cf1ed3b90d7b57e4d16af2162d0b9dc1b58e1af +d465eb9742f580ea0729d5ef68bb60de325df4d0add8326eb116b98d93199a85
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.