Merge branch 'master' of git://git.denx.de/u-boot-sh

diff --git a/arch/arm/dts/r8a7791-porter.dts b/arch/arm/dts/r8a7791-porter.dts
index f2d5723fbdc3cdd910b36bd241283039cab74cb0..fa9a57d77047b26d1e79a470b9b9829981ada4a2 100644 (file)
--- a/arch/arm/dts/r8a7791-porter.dts
+++ b/arch/arm/dts/r8a7791-porter.dts
@@ -372,6 +372,11 @@
        clock-frequency = <400000>;
 };
 
+&i2c6 {
+       status = "okay";
+       clock-frequency = <400000>;
+};
+
 &sata0 {
        status = "okay";
 };

diff --git a/arch/arm/mach-rmobile/Kconfig b/arch/arm/mach-rmobile/Kconfig
index fc4b3c321926d9b316f039215bbdd88ec6472be9..ac08d6eb12597b1119b2581a437ae217937fdd59 100644 (file)
--- a/arch/arm/mach-rmobile/Kconfig
+++ b/arch/arm/mach-rmobile/Kconfig
@@ -11,6 +11,7 @@ config RCAR_32
 config RCAR_GEN3
        bool "Renesas ARM SoCs R-Car Gen3 (64bit)"
        select ARM64
+       select PHY
 
 endchoice
 

diff --git a/arch/arm/mach-rmobile/memmap-gen3.c b/arch/arm/mach-rmobile/memmap-gen3.c
index 57a2f88fc43ae2a3826c9a365034c34744212f3e..92c8f2e80db762ddc78f3702b9e85badf3201f74 100644 (file)
--- a/arch/arm/mach-rmobile/memmap-gen3.c
+++ b/arch/arm/mach-rmobile/memmap-gen3.c
@@ -29,6 +29,12 @@ static struct mm_region gen3_mem_map[] = {
                .attrs = PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) |
                         PTE_BLOCK_NON_SHARE |
                         PTE_BLOCK_PXN | PTE_BLOCK_UXN
+       }, {
+               .virt = 0x100000000UL,
+               .phys = 0x100000000UL,
+               .size = 0xf00000000UL,
+               .attrs = PTE_BLOCK_MEMTYPE(MT_NORMAL) |
+                        PTE_BLOCK_INNER_SHARE
        }, {
                /* List terminator */
                0,

diff --git a/drivers/phy/Kconfig b/drivers/phy/Kconfig
index bcc8e22795a9d95a99c35f4c474ed6d543ce64ed..14d82b93ed1e058b96abd76321e5f2016cff8854 100644 (file)
--- a/drivers/phy/Kconfig
+++ b/drivers/phy/Kconfig
@@ -118,6 +118,14 @@ config PHY_RCAR_GEN2
          PHY connected to USBHS module, PCI EHCI module and USB3.0 module and
          allows configuring the module multiplexing.
 
+config PHY_RCAR_GEN3
+       tristate "Renesas R-Car Gen3 USB PHY"
+       depends on PHY && RCAR_GEN3 && CLK && DM_REGULATOR
+       default y if RCAR_GEN3
+       help
+         Support for the Renesas R-Car Gen3 USB PHY. This driver operates the
+         PHY connected to EHCI USB module and controls USB OTG operation.
+
 config PHY_STM32_USBPHYC
        tristate "STMicroelectronics STM32 SoC USB HS PHY driver"
        depends on PHY && ARCH_STM32MP

diff --git a/drivers/phy/Makefile b/drivers/phy/Makefile
index 1e1e4ca11e4fd129b61b38afefd04c0bae954121..8030d599e755f615ecc26557c59f601f2aea873a 100644 (file)
--- a/drivers/phy/Makefile
+++ b/drivers/phy/Makefile
@@ -13,6 +13,7 @@ obj-$(CONFIG_PHY_SANDBOX) += sandbox-phy.o
 obj-$(CONFIG_$(SPL_)PIPE3_PHY) += ti-pipe3-phy.o
 obj-$(CONFIG_STI_USB_PHY) += sti_usb_phy.o
 obj-$(CONFIG_PHY_RCAR_GEN2) += phy-rcar-gen2.o
+obj-$(CONFIG_PHY_RCAR_GEN3) += phy-rcar-gen3.o
 obj-$(CONFIG_PHY_STM32_USBPHYC) += phy-stm32-usbphyc.o
 obj-$(CONFIG_MESON_GXL_USB_PHY) += meson-gxl-usb2.o meson-gxl-usb3.o
 obj-$(CONFIG_MSM8916_USB_PHY) += msm8916-usbh-phy.o

diff --git a/drivers/phy/phy-rcar-gen3.c b/drivers/phy/phy-rcar-gen3.c
new file mode 100644 (file)
index 0000000..b662935
--- /dev/null
+++ b/drivers/phy/phy-rcar-gen3.c
@@ -0,0 +1,161 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Renesas RCar Gen3 USB PHY driver
+ *
+ * Copyright (C) 2018 Marek Vasut <marek.vasut@gmail.com>
+ */
+
+#include <common.h>
+#include <clk.h>
+#include <div64.h>
+#include <dm.h>
+#include <fdtdec.h>
+#include <generic-phy.h>
+#include <reset.h>
+#include <syscon.h>
+#include <usb.h>
+#include <asm/io.h>
+#include <linux/bitops.h>
+#include <power/regulator.h>
+
+/* USB2.0 Host registers (original offset is +0x200) */
+#define USB2_INT_ENABLE                0x000
+#define USB2_USBCTR            0x00c
+#define USB2_SPD_RSM_TIMSET    0x10c
+#define USB2_OC_TIMSET         0x110
+#define USB2_COMMCTRL          0x600
+#define USB2_OBINTSTA          0x604
+#define USB2_OBINTEN           0x608
+#define USB2_VBCTRL            0x60c
+#define USB2_LINECTRL1         0x610
+#define USB2_ADPCTRL           0x630
+
+/* USBCTR */
+#define USB2_USBCTR_PLL_RST    BIT(1)
+
+/* SPD_RSM_TIMSET */
+#define USB2_SPD_RSM_TIMSET_INIT       0x014e029b
+
+/* OC_TIMSET */
+#define USB2_OC_TIMSET_INIT            0x000209ab
+
+/* COMMCTRL */
+#define USB2_COMMCTRL_OTG_PERI         BIT(31) /* 1 = Peripheral mode */
+
+/* LINECTRL1 */
+#define USB2_LINECTRL1_DP_RPD          BIT(18)
+#define USB2_LINECTRL1_DM_RPD          BIT(16)
+
+/* ADPCTRL */
+#define USB2_ADPCTRL_DRVVBUS           BIT(4)
+
+struct rcar_gen3_phy {
+       fdt_addr_t      regs;
+       struct clk      clk;
+       struct udevice  *vbus_supply;
+};
+
+static int rcar_gen3_phy_phy_init(struct phy *phy)
+{
+       struct rcar_gen3_phy *priv = dev_get_priv(phy->dev);
+
+       /* Initialize USB2 part */
+       writel(0, priv->regs + USB2_INT_ENABLE);
+       writel(USB2_SPD_RSM_TIMSET_INIT, priv->regs + USB2_SPD_RSM_TIMSET);
+       writel(USB2_OC_TIMSET_INIT, priv->regs + USB2_OC_TIMSET);
+
+       setbits_le32(priv->regs + USB2_LINECTRL1,
+                    USB2_LINECTRL1_DP_RPD | USB2_LINECTRL1_DM_RPD);
+
+       clrbits_le32(priv->regs + USB2_COMMCTRL, USB2_COMMCTRL_OTG_PERI);
+
+       setbits_le32(priv->regs + USB2_ADPCTRL, USB2_ADPCTRL_DRVVBUS);
+
+       return 0;
+}
+
+static int rcar_gen3_phy_phy_power_on(struct phy *phy)
+{
+       struct rcar_gen3_phy *priv = dev_get_priv(phy->dev);
+       int ret;
+
+       if (priv->vbus_supply) {
+               ret = regulator_set_enable(priv->vbus_supply, true);
+               if (ret)
+                       return ret;
+       }
+
+       setbits_le32(priv->regs + USB2_USBCTR, USB2_USBCTR_PLL_RST);
+       clrbits_le32(priv->regs + USB2_USBCTR, USB2_USBCTR_PLL_RST);
+
+       return 0;
+}
+
+static int rcar_gen3_phy_phy_power_off(struct phy *phy)
+{
+       struct rcar_gen3_phy *priv = dev_get_priv(phy->dev);
+
+       if (!priv->vbus_supply)
+               return 0;
+
+       return regulator_set_enable(priv->vbus_supply, false);
+}
+
+static const struct phy_ops rcar_gen3_phy_phy_ops = {
+       .init           = rcar_gen3_phy_phy_init,
+       .power_on       = rcar_gen3_phy_phy_power_on,
+       .power_off      = rcar_gen3_phy_phy_power_off,
+};
+
+static int rcar_gen3_phy_probe(struct udevice *dev)
+{
+       struct rcar_gen3_phy *priv = dev_get_priv(dev);
+       int ret;
+
+       priv->regs = dev_read_addr(dev);
+       if (priv->regs == FDT_ADDR_T_NONE)
+               return -EINVAL;
+
+       ret = device_get_supply_regulator(dev, "vbus-supply",
+                                         &priv->vbus_supply);
+       if (ret && ret != -ENOENT) {
+               pr_err("Failed to get PHY regulator\n");
+               return ret;
+       }
+
+       /* Enable clock */
+       ret = clk_get_by_index(dev, 0, &priv->clk);
+       if (ret)
+               return ret;
+
+       ret = clk_enable(&priv->clk);
+       if (ret)
+               return ret;
+
+       return 0;
+}
+
+static int rcar_gen3_phy_remove(struct udevice *dev)
+{
+       struct rcar_gen3_phy *priv = dev_get_priv(dev);
+
+       clk_disable(&priv->clk);
+       clk_free(&priv->clk);
+
+       return 0;
+}
+
+static const struct udevice_id rcar_gen3_phy_of_match[] = {
+       { .compatible = "renesas,rcar-gen3-usb2-phy", },
+       { },
+};
+
+U_BOOT_DRIVER(rcar_gen3_phy) = {
+       .name           = "rcar-gen3-phy",
+       .id             = UCLASS_PHY,
+       .of_match       = rcar_gen3_phy_of_match,
+       .ops            = &rcar_gen3_phy_phy_ops,
+       .probe          = rcar_gen3_phy_probe,
+       .remove         = rcar_gen3_phy_remove,
+       .priv_auto_alloc_size = sizeof(struct rcar_gen3_phy),
+};

diff --git a/include/configs/rcar-gen2-common.h b/include/configs/rcar-gen2-common.h
index 01583f8cc24cc19e14b89da177bdeb9ee9d77994..d606da8b0ec4bff262d415e0b47b5cfe16af3d3c 100644 (file)
--- a/include/configs/rcar-gen2-common.h
+++ b/include/configs/rcar-gen2-common.h
@@ -60,6 +60,6 @@
 #define CONFIG_TMU_TIMER
 #define CONFIG_SYS_TIMER_COUNTS_DOWN
 #define CONFIG_SYS_TIMER_COUNTER       (TMU_BASE + 0xc)        /* TCNT0 */
-#define CONFIG_SYS_TIMER_RATE          (32500000 / 4)          /* CP/4 */
+#define CONFIG_SYS_TIMER_RATE          (CONFIG_SYS_CLK_FREQ / 8)
 
 #endif /* __RCAR_GEN2_COMMON_H */