Merge tag 'armsoc-late' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

Pull ARM SoC late DT updates from Arnd Bergmann:
 "These updates have been kept in a separate branch mostly because they
  rely on updates to the respective clk drivers to keep the shared
  header files in sync.

   - The Renesas r8a7796 (R-Car M3-W) platform gets added, this is an
     automotive SoC similar to the ⅹ8a7795 chip we already support, but
     the dts changes rely on a clock driver change that has been merged
     for v4.9 through the clk tree.

   - The Amlogic meson-gxbb (S905) platform gains support for a few
     drivers merged through our tree, in particular the network and usb
     driver changes are required and included here, and also the clk
     tree changes.

   - The Allwinner platforms have seen a large-scale change to their clk
     drivers and the dts file updates must come after that. This
     includes the newly added Nextthing GR8 platform, which is derived
     from sun5i/A13.

   - Some integrator (arm32) changes rely on clk driver changes.

   - A single patch for lpc32xx has no such dependency but wasn't added
     until just before the merge window"

* tag 'armsoc-late' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (99 commits)
  ARM: dts: lpc32xx: add device node for IRAM on-chip memory
  ARM: dts: sun8i: Add accelerometer to polaroid-mid2407pxe03
  ARM: dts: sun8i: enable UART1 for iNet D978 Rev2 board
  ARM: dts: sun8i: add pinmux for UART1 at PG
  dts: sun8i-h3: add I2C0-2 peripherals to H3 SOC
  dts: sun8i-h3: add pinmux definitions for I2C0-2
  dts: sun8i-h3: associate exposed UARTs on Orange Pi Boards
  dts: sun8i-h3: split off RTS/CTS for UART1 in seperate pinmux
  dts: sun8i-h3: add pinmux definitions for UART2-3
  ARM: dts: sun9i: a80-optimus: Disable EHCI1
  ARM: dts: sun9i: cubieboard4: Add AXP806 PMIC device node and regulators
  ARM: dts: sun9i: a80-optimus: Add AXP806 PMIC device node and regulators
  ARM: dts: sun9i: cubieboard4: Declare AXP809 SW regulator as unused
  ARM: dts: sun9i: a80-optimus: Declare AXP809 SW regulator as unused
  ARM: dts: sun8i: Add touchscreen node for sun8i-a33-ga10h
  ARM: dts: sun8i: Add touchscreen node for sun8i-a23-polaroid-mid2809pxe04
  ARM: dts: sun8i: Add touchscreen node for sun8i-a23-polaroid-mid2407pxe03
  ARM: dts: sun8i: Add touchscreen node for sun8i-a23-inet86dz
  ARM: dts: sun8i: Add touchscreen node for sun8i-a23-gt90h
  ARM64: dts: meson-gxbb-vega-s95: Enable USB Nodes
  ...

1 files changed, 34 insertions, 0 deletions

diff --git a/drivers/usb/dwc2/platform.c b/drivers/usb/dwc2/platform.c
index 530959a8a6d1..8e1728b39a49 100644
--- a/drivers/usb/dwc2/platform.c
+++ b/drivers/usb/dwc2/platform.c
@@ -182,6 +182,38 @@ static const struct dwc2_core_params params_ltq = {
         .hibernation                    = -1,
 };
 
+static const struct dwc2_core_params params_amlogic = {
+        .otg_cap                        = DWC2_CAP_PARAM_NO_HNP_SRP_CAPABLE,
+        .otg_ver                        = -1,
+        .dma_enable                     = 1,
+        .dma_desc_enable                = 0,
+        .dma_desc_fs_enable             = 0,
+        .speed                          = DWC2_SPEED_PARAM_HIGH,
+        .enable_dynamic_fifo            = 1,
+        .en_multiple_tx_fifo            = -1,
+        .host_rx_fifo_size              = 512,
+        .host_nperio_tx_fifo_size       = 500,
+        .host_perio_tx_fifo_size        = 500,
+        .max_transfer_size              = -1,
+        .max_packet_count               = -1,
+        .host_channels                  = 16,
+        .phy_type                       = DWC2_PHY_TYPE_PARAM_UTMI,
+        .phy_utmi_width                 = -1,
+        .phy_ulpi_ddr                   = -1,
+        .phy_ulpi_ext_vbus              = -1,
+        .i2c_enable                     = -1,
+        .ulpi_fs_ls                     = -1,
+        .host_support_fs_ls_low_power   = -1,
+        .host_ls_low_power_phy_clk      = -1,
+        .ts_dline                       = -1,
+        .reload_ctl                     = 1,
+        .ahbcfg                         = GAHBCFG_HBSTLEN_INCR8 <<
+                                          GAHBCFG_HBSTLEN_SHIFT,
+        .uframe_sched                   = 0,
+        .external_id_pin_ctl            = -1,
+        .hibernation                    = -1,
+};
+
 /*
  * Check the dr_mode against the module configuration and hardware
  * capabilities.
@@ -486,6 +518,8 @@ static const struct of_device_id dwc2_of_match_table[] = {
         { .compatible = "lantiq,xrx200-usb", .data = &params_ltq },
         { .compatible = "snps,dwc2", .data = NULL },
         { .compatible = "samsung,s3c6400-hsotg", .data = NULL},
+        { .compatible = "amlogic,meson8b-usb", .data = &params_amlogic },
+        { .compatible = "amlogic,meson-gxbb-usb", .data = &params_amlogic },
         {},
 };
 MODULE_DEVICE_TABLE(of, dwc2_of_match_table);