| Message ID | 1533309679-20903-1-git-send-email-dinguyen@kernel.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [GIT/RFC,PULL,LTSI-4.14] SoCFPGA, NIOS2 SoCs and Drivers to v4.18 | expand |
Hi Dinh, On Fri, Aug 3, 2018 at 5:21 PM Dinh Nguyen <dinguyen@kernel.org> wrote: > In preparation for the v4.14-ltsi release, I'd like to have these backported > patches be considered for the release. Thanks for your backport! > The following changes since commit 53208e12faa5b8c6eac4eb1d23d6e3fae450fc5a: > > Linux 4.14.59 (2018-07-28 07:55:45 +0200) > > are available in the git repository at: > > git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux.git tags/socfpga_for_v4.14_ltsi > > for you to fetch changes up to b894b5008949db0457dcda436291c70d74f04512: > > reset: socfpga: build the reset-socfpga for Stratix10 SOC (2018-08-03 09:11:49 -0500) > > ---------------------------------------------------------------- > LTSI-v4.14 Preparation for SoCFPGA SoCs (v4.18) > > Base: > * v4.14.59 > > Backports of the following components to v4.18 > > * Stratix10 enablement(clock driver) > * NIOS2 updates > * FPGA manager updates All of the above looks fairly low-risk and self-contained to me. I can confirm all backported commits are present either in v4.18-rc8, or (in some form) in current linux-next. Note that when backporting, it is a good idea to record the original upstream commit ID in the patch description, either by manually adding commit <sha1> upstream like Greg does, or by letting "git cherry-pick" automatically add (cherry picked from commit <sha1>) using the "-x" option, like Simon Horman does. Doing so would have saved me some (scripted) git patch-id matching ;-) Thanks! Gr{oetje,eeting}s, Geert -- Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds
Hi Geert, On 08/08/2018 10:57 AM, Geert Uytterhoeven wrote: > Hi Dinh, > > On Fri, Aug 3, 2018 at 5:21 PM Dinh Nguyen <dinguyen@kernel.org> wrote: >> In preparation for the v4.14-ltsi release, I'd like to have these backported >> patches be considered for the release. > > Thanks for your backport! > >> The following changes since commit 53208e12faa5b8c6eac4eb1d23d6e3fae450fc5a: >> >> Linux 4.14.59 (2018-07-28 07:55:45 +0200) >> >> are available in the git repository at: >> >> git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux.git tags/socfpga_for_v4.14_ltsi >> >> for you to fetch changes up to b894b5008949db0457dcda436291c70d74f04512: >> >> reset: socfpga: build the reset-socfpga for Stratix10 SOC (2018-08-03 09:11:49 -0500) >> >> ---------------------------------------------------------------- >> LTSI-v4.14 Preparation for SoCFPGA SoCs (v4.18) >> >> Base: >> * v4.14.59 >> >> Backports of the following components to v4.18 >> >> * Stratix10 enablement(clock driver) >> * NIOS2 updates >> * FPGA manager updates > > All of the above looks fairly low-risk and self-contained to me. > > I can confirm all backported commits are present either in v4.18-rc8, or > (in some form) in current linux-next. > > Note that when backporting, it is a good idea to record the original > upstream commit ID in the patch description, either by manually adding > > commit <sha1> upstream > > like Greg does, or by letting "git cherry-pick" automatically add > > (cherry picked from commit <sha1>) > > using the "-x" option, like Simon Horman does. > Doing so would have saved me some (scripted) git patch-id matching ;-) > Thanks for the tip. Do you need me to respin another branch with this information? Thanks, Dinh
Hi Dinh, On Mon, Aug 13, 2018 at 3:36 PM Dinh Nguyen <dinguyen@kernel.org> wrote: > On 08/08/2018 10:57 AM, Geert Uytterhoeven wrote: > > On Fri, Aug 3, 2018 at 5:21 PM Dinh Nguyen <dinguyen@kernel.org> wrote: > >> In preparation for the v4.14-ltsi release, I'd like to have these backported > >> patches be considered for the release. > > > > Thanks for your backport! > > > >> The following changes since commit 53208e12faa5b8c6eac4eb1d23d6e3fae450fc5a: > >> > >> Linux 4.14.59 (2018-07-28 07:55:45 +0200) > >> > >> are available in the git repository at: > >> > >> git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux.git tags/socfpga_for_v4.14_ltsi > >> > >> for you to fetch changes up to b894b5008949db0457dcda436291c70d74f04512: > >> > >> reset: socfpga: build the reset-socfpga for Stratix10 SOC (2018-08-03 09:11:49 -0500) > >> > >> ---------------------------------------------------------------- > >> LTSI-v4.14 Preparation for SoCFPGA SoCs (v4.18) > >> > >> Base: > >> * v4.14.59 > >> > >> Backports of the following components to v4.18 > >> > >> * Stratix10 enablement(clock driver) > >> * NIOS2 updates > >> * FPGA manager updates > > > > All of the above looks fairly low-risk and self-contained to me. > > > > I can confirm all backported commits are present either in v4.18-rc8, or > > (in some form) in current linux-next. > > > > Note that when backporting, it is a good idea to record the original > > upstream commit ID in the patch description, either by manually adding > > > > commit <sha1> upstream > > > > like Greg does, or by letting "git cherry-pick" automatically add > > > > (cherry picked from commit <sha1>) > > > > using the "-x" option, like Simon Horman does. > > Doing so would have saved me some (scripted) git patch-id matching ;-) > > > > Thanks for the tip. Do you need me to respin another branch with this > information? Personally, I think more traceability never hurts, so a respin would be nice. However, I would like to defer the final decision to Greg. Gr{oetje,eeting}s, Geert
On Tue, Aug 21, 2018 at 07:51:45PM +0200, Geert Uytterhoeven wrote: > Hi Dinh, > > On Mon, Aug 13, 2018 at 3:36 PM Dinh Nguyen <dinguyen@kernel.org> wrote: > > On 08/08/2018 10:57 AM, Geert Uytterhoeven wrote: > > > On Fri, Aug 3, 2018 at 5:21 PM Dinh Nguyen <dinguyen@kernel.org> wrote: > > >> In preparation for the v4.14-ltsi release, I'd like to have these backported > > >> patches be considered for the release. > > > > > > Thanks for your backport! > > > > > >> The following changes since commit 53208e12faa5b8c6eac4eb1d23d6e3fae450fc5a: > > >> > > >> Linux 4.14.59 (2018-07-28 07:55:45 +0200) > > >> > > >> are available in the git repository at: > > >> > > >> git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux.git tags/socfpga_for_v4.14_ltsi > > >> > > >> for you to fetch changes up to b894b5008949db0457dcda436291c70d74f04512: > > >> > > >> reset: socfpga: build the reset-socfpga for Stratix10 SOC (2018-08-03 09:11:49 -0500) > > >> > > >> ---------------------------------------------------------------- > > >> LTSI-v4.14 Preparation for SoCFPGA SoCs (v4.18) > > >> > > >> Base: > > >> * v4.14.59 > > >> > > >> Backports of the following components to v4.18 > > >> > > >> * Stratix10 enablement(clock driver) > > >> * NIOS2 updates > > >> * FPGA manager updates > > > > > > All of the above looks fairly low-risk and self-contained to me. > > > > > > I can confirm all backported commits are present either in v4.18-rc8, or > > > (in some form) in current linux-next. > > > > > > Note that when backporting, it is a good idea to record the original > > > upstream commit ID in the patch description, either by manually adding > > > > > > commit <sha1> upstream > > > > > > like Greg does, or by letting "git cherry-pick" automatically add > > > > > > (cherry picked from commit <sha1>) > > > > > > using the "-x" option, like Simon Horman does. > > > Doing so would have saved me some (scripted) git patch-id matching ;-) > > > > > > > Thanks for the tip. Do you need me to respin another branch with this > > information? > > Personally, I think more traceability never hurts, so a respin would be nice. > However, I would like to defer the final decision to Greg. Yes, a respin with this required information is essential. Dinh, please do so, thanks! greg k-h
Hi, In preparation for the v4.14-ltsi release, I'd like to have these backported patches be considered for the release. Thanks, Dinh The following changes since commit 53208e12faa5b8c6eac4eb1d23d6e3fae450fc5a: Linux 4.14.59 (2018-07-28 07:55:45 +0200) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux.git tags/socfpga_for_v4.14_ltsi for you to fetch changes up to b894b5008949db0457dcda436291c70d74f04512: reset: socfpga: build the reset-socfpga for Stratix10 SOC (2018-08-03 09:11:49 -0500) ---------------------------------------------------------------- LTSI-v4.14 Preparation for SoCFPGA SoCs (v4.18) Base: * v4.14.59 Backports of the following components to v4.18 * Stratix10 enablement(clock driver) * NIOS2 updates * FPGA manager updates ---------------------------------------------------------------- Alan Tull (36): arm64: dts: stratix10: add gpio header arm64: dts: stratix10: enable gpio and leds arm64: dts: stratix10: enable i2c, add i2c periperals fpga: bridge: support getting bridge from device fpga: mgr: API change to replace fpga load functions with single function fpga: mgr: separate getting/locking FPGA manager fpga: region: use dev_err instead of pr_err fpga: region: remove unneeded of_node_get and put fpga: region: get mgr early on fpga: region: check for child regions before allocing image info fpga: region: fix slow warning with more than one overlay fpga: region: use image info as parameter for programming region fpga: region: separate out code that parses the overlay fpga: region: add fpga-region.h header fpga: region: rename some functions prior to moving fpga: region: add register/unregister functions fpga: region: add fpga_region_class_find fpga: region: move device tree support to of-fpga-region.c fpga: of-fpga-region: accept overlays that don't program FPGA fpga: clean up fpga Kconfig fpga: add attribute groups fpga: fpga-region: comment on fpga_region_program_fpga locking fpga: region: don't use drvdata in common fpga code fpga: manager: change api, don't use drvdata fpga: bridge: change api, don't use drvdata fpga: region: change api, add fpga_region_create/free fpga: use SPDX fpga: mgr: kernel-doc fixes fpga: bridge: kernel-doc fixes fpga: region: kernel-doc fixes fpga: clarify that unregister functions also free Documentation: fpga: move fpga overview to driver-api documentation: fpga: move fpga-mgr.txt to driver-api documentation: fpga: add bridge document to driver-api documentation: fpga: move fpga-region.txt to driver-api Documentation: fpga: cleanup Alexey Khoroshilov (1): fpga: socfpga-a10: disable clk on error in socfpga_a10_fpga_probe() Arnd Bergmann (1): arm64: dts: socfpga: add missing interrupt-parent Baolin Wang (1): nios2: Use read_persistent_clock64() instead of read_persistent_clock() Christophe Jaillet (1): fpga: altera-cvp: Fix an error handling path in 'altera_cvp_probe()' Dinh Nguyen (20): clk: socfpga: stratix10: add clock driver for Stratix10 platform clk: socfpga: stratix10: use platform driver APIs clk: socfpga: stratix10: suppress unbinding platform's clock driver arm64: dts: stratix10: fix up the gic register for the Stratix10 platform arm64: dts: stratix10: add ethernet/sdmmc support to the S10 devkit arm64: dts: stratix10: include the reset manager bindings arm64: dts: stratix10: add the 'altr,modrst-off' property arm64: dts: stratix10: add reset property for various peripherals arm64: dts: stratix10: fix interrupt number for gpio1 arm64: dts: stratix10: enable USB on the devkit arm64: dts: stratix10: add USB ECC reset bit arm64: dts: stratix10: enable watchdog timer on the S10 devkit arm64: dts: stratix10: disable false USB overcurrent on devkit arm64: dts: stratix10: use clock bindings for the Stratix10 platform arm64: dts: stratix10: fill in clocks field for usb and watchdog arm64: dts: stratix10: add OCP reset property for ethernet net: stmmac: socfpga: add additional ocp reset line for Stratix10 dt-bindings: documentation: add clock bindings information for Stratix10 usb: dwc2: add optional usb ecc reset bit reset: socfpga: build the reset-socfpga for Stratix10 SOC Geert Uytterhoeven (1): fpga: Remove depends on HAS_DMA in case of platform dependency Graham Moore (1): arm64: dts: stratix10: Add PL330 DMAC to Stratix10 dts Greentime Hu (1): nios2: add ioremap_nocache declaration before include asm-generic/io.h. Gustavo A. R. Silva (2): fpga: fpga-mgr: remove unnecessary code in __fpga_mgr_get fpga: fpga-bridge: remove unnecessary null check in of_fpga_bridge_get Ian Abbott (1): fpga: region: release of_parse_phandle nodes after use Jaehoon Chung (1): arm64: dts: stratix10: remove 'num-slots' property for dwmmc Johannes Thumshirn (1): PCI: Add Altera vendor ID Krzysztof Kozlowski (1): nios2: defconfig: Cleanup from old Kconfig options Mathieu Malaterre (1): nios2: dts: Remove leading 0x and 0s from bindings notation Ooi, Joyce (1): arm64: dts: stratix10: Change pad skew values for EMAC0 PHY driver Paolo Pisati (1): fpga: lattice machxo2: Add Lattice MachXO2 support Thor Thayer (5): arm64: dts: stratix10: fix SPI settings arm64: dts: stratix10: add sdram ecc arm64: dts: stratix10: Fix SPI nodes for Stratix10 arm64: dts: stratix10: Add QSPI support for Stratix10 arm64: dts: stratix10: Add SPI node clocks for Stratix10 Ulf Magnusson (1): nios2: kconfig: Remove blank help text .../devicetree/bindings/clock/intc_stratix10.txt | 20 + Documentation/driver-api/fpga/fpga-bridge.rst | 49 ++ Documentation/driver-api/fpga/fpga-mgr.rst | 220 +++++++++ Documentation/driver-api/fpga/fpga-region.rst | 102 ++++ Documentation/driver-api/fpga/index.rst | 13 + Documentation/driver-api/fpga/intro.rst | 54 +++ Documentation/driver-api/index.rst | 1 + Documentation/fpga/fpga-mgr.txt | 199 -------- arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi | 165 ++++++- .../boot/dts/altera/socfpga_stratix10_socdk.dts | 147 +++++- arch/nios2/Kconfig | 1 - arch/nios2/boot/dts/3c120_devboard.dts | 16 +- arch/nios2/configs/10m50_defconfig | 1 - arch/nios2/configs/3c120_defconfig | 1 - arch/nios2/include/asm/io.h | 1 + arch/nios2/kernel/time.c | 4 +- drivers/char/xillybus/xillybus_pcie.c | 1 - drivers/clk/Makefile | 1 + drivers/clk/socfpga/Makefile | 9 +- drivers/clk/socfpga/clk-gate-s10.c | 125 +++++ drivers/clk/socfpga/clk-periph-s10.c | 149 ++++++ drivers/clk/socfpga/clk-pll-s10.c | 146 ++++++ drivers/clk/socfpga/clk-s10.c | 341 +++++++++++++ drivers/clk/socfpga/clk.h | 4 + drivers/clk/socfpga/stratix10-clk.h | 80 ++++ drivers/fpga/Kconfig | 109 +++-- drivers/fpga/Makefile | 2 + drivers/fpga/altera-cvp.c | 23 +- drivers/fpga/altera-fpga2sdram.c | 34 +- drivers/fpga/altera-freeze-bridge.c | 35 +- drivers/fpga/altera-hps2fpga.c | 37 +- drivers/fpga/altera-pr-ip-core-plat.c | 13 +- drivers/fpga/altera-pr-ip-core.c | 31 +- drivers/fpga/altera-ps-spi.c | 20 +- drivers/fpga/fpga-bridge.c | 199 +++++--- drivers/fpga/fpga-mgr.c | 240 +++++++--- drivers/fpga/fpga-region.c | 526 ++++----------------- drivers/fpga/ice40-spi.c | 21 +- drivers/fpga/machxo2-spi.c | 415 ++++++++++++++++ drivers/fpga/of-fpga-region.c | 490 +++++++++++++++++++ drivers/fpga/socfpga-a10.c | 34 +- drivers/fpga/socfpga.c | 32 +- drivers/fpga/ts73xx-fpga.c | 20 +- drivers/fpga/xilinx-pr-decoupler.c | 22 +- drivers/fpga/xilinx-spi.c | 20 +- drivers/fpga/zynq-fpga.c | 14 +- drivers/net/ethernet/stmicro/stmmac/Kconfig | 2 +- .../net/ethernet/stmicro/stmmac/dwmac-socfpga.c | 18 +- drivers/reset/Kconfig | 2 +- drivers/usb/dwc2/core.h | 1 + drivers/usb/dwc2/platform.c | 10 + include/dt-bindings/clock/stratix10-clock.h | 84 ++++ include/linux/fpga/altera-pr-ip-core.h | 13 +- include/linux/fpga/fpga-bridge.h | 23 +- include/linux/fpga/fpga-mgr.h | 62 +-- include/linux/fpga/fpga-region.h | 45 ++ include/linux/pci_ids.h | 2 + 57 files changed, 3418 insertions(+), 1031 deletions(-) create mode 100644 Documentation/devicetree/bindings/clock/intc_stratix10.txt create mode 100644 Documentation/driver-api/fpga/fpga-bridge.rst create mode 100644 Documentation/driver-api/fpga/fpga-mgr.rst create mode 100644 Documentation/driver-api/fpga/fpga-region.rst create mode 100644 Documentation/driver-api/fpga/index.rst create mode 100644 Documentation/driver-api/fpga/intro.rst delete mode 100644 Documentation/fpga/fpga-mgr.txt create mode 100644 drivers/clk/socfpga/clk-gate-s10.c create mode 100644 drivers/clk/socfpga/clk-periph-s10.c create mode 100644 drivers/clk/socfpga/clk-pll-s10.c create mode 100644 drivers/clk/socfpga/clk-s10.c create mode 100644 drivers/clk/socfpga/stratix10-clk.h create mode 100644 drivers/fpga/machxo2-spi.c create mode 100644 drivers/fpga/of-fpga-region.c create mode 100644 include/dt-bindings/clock/stratix10-clock.h create mode 100644 include/linux/fpga/fpga-region.h