| Message ID | 20210125151811.11871-1-andre.przywara@arm.com (mailing list archive) |
|---|---|
| Headers | show |
| Series | arm64: sunxi: Initial Allwinner H616 SoC support | expand |
Hi, On Mon, Jan 25, 2021 at 03:17:50PM +0000, Andre Przywara wrote: > Hi, > > an update from the v3 last week, to add support for the Allwinner H616 > SoC. Still based on the (updated) sunxi/for-next branch. > I am omitting the MMC and pinctrl patches now, as they have been taken > by Ulf and LinusW already into their trees. > > I addressed the comments from the list, though not sure if the HOSC clock > coming from the RTC is really a good idea (didn't change it). > > I was hoping that at least the clock and AXP patches (01/21-06/21) could > make it into 5.12 still? That would allow booting boards from SD card. > I am happy to strip the .dtsi and .dts patch to only contain the devices > that we actually support then, if needed. > > For the changes: I split the joint DT bindings patch into subsystem > specific ones, hopefully this simplifies merging. There is a new fix > for the axp20x-pek driver, and the AXP IRQ fix has been amended as well > (according to Samuel's comments). > > I eventually got USB to work, by requiring PHY 2 for [EO]HCI 1 & 3 as well. > Not sure this is the right fix, it might be just one clock or reset > line from that PHY that is needed for the others as well. Will do further > experiments. > > For a more detailed changelog, see below. With your series applied: ARCH=arm64 make -j18 dtbs_check arch/arm64/Makefile:25: ld does not support --fix-cortex-a53-843419; kernel may be susceptible to erratum arch/arm64/Makefile:33: LSE atomics not supported by binutils arch/arm64/Makefile:44: Detected assembler with broken .inst; disassembly will be unreliable DTC arch/arm64/boot/dts/allwinner/sun50i-h616-orangepi-zero2.dtb DTC arch/arm64/boot/dts/allwinner/sun50i-h616-orangepi-zero2.dt.yaml CHECK arch/arm64/boot/dts/allwinner/sun50i-h616-orangepi-zero2.dt.yaml /home/max/Work/allwinner/build/arm64/arch/arm64/boot/dts/allwinner/sun50i-h616-orangepi-zero2.dt.yaml: clock@3001000: clocks: [[7], [8, 0], [8, 2]] is too long From schema: /home/max/Work/repos/linux/Documentation/devicetree/bindings/clock/allwinner,sun4i-a10-ccu.yaml /home/max/Work/allwinner/build/arm64/arch/arm64/boot/dts/allwinner/sun50i-h616-orangepi-zero2.dt.yaml: clock@3001000: clock-names: ['hosc', 'losc', 'iosc'] is too long From schema: /home/max/Work/repos/linux/Documentation/devicetree/bindings/clock/allwinner,sun4i-a10-ccu.yaml /home/max/Work/allwinner/build/arm64/arch/arm64/boot/dts/allwinner/sun50i-h616-orangepi-zero2.dt.yaml: ethernet@5020000: compatible: 'oneOf' conditional failed, one must be fixed: ['allwinner,sun50i-h616-emac', 'allwinner,sun50i-a64-emac'] is too long Additional items are not allowed ('allwinner,sun50i-a64-emac' was unexpected) 'allwinner,sun8i-a83t-emac' was expected 'allwinner,sun8i-h3-emac' was expected 'allwinner,sun8i-r40-emac' was expected 'allwinner,sun8i-v3s-emac' was expected 'allwinner,sun50i-a64-emac' was expected 'allwinner,sun50i-h6-emac' was expected From schema: /home/max/Work/repos/linux/Documentation/devicetree/bindings/net/allwinner,sun8i-a83t-emac.yaml /home/max/Work/allwinner/build/arm64/arch/arm64/boot/dts/allwinner/sun50i-h616-orangepi-zero2.dt.yaml: clock@7010000: clocks: [[7], [8, 0], [8, 2], [2, 4]] is too long From schema: /home/max/Work/repos/linux/Documentation/devicetree/bindings/clock/allwinner,sun4i-a10-ccu.yaml /home/max/Work/allwinner/build/arm64/arch/arm64/boot/dts/allwinner/sun50i-h616-orangepi-zero2.dt.yaml: clock@7010000: clock-names: ['hosc', 'losc', 'iosc', 'pll-periph'] is too long From schema: /home/max/Work/repos/linux/Documentation/devicetree/bindings/clock/allwinner,sun4i-a10-ccu.yaml /home/max/Work/allwinner/build/arm64/arch/arm64/boot/dts/allwinner/sun50i-h616-orangepi-zero2.dt.yaml: rsb@7083000: compatible: 'oneOf' conditional failed, one must be fixed: ['allwinner,sun50i-h616-rsb', 'allwinner,sun8i-a23-rsb'] is too long Additional items are not allowed ('allwinner,sun8i-a23-rsb' was unexpected) 'allwinner,sun8i-a23-rsb' was expected 'allwinner,sun8i-a83t-rsb' was expected From schema: /home/max/Work/repos/linux/Documentation/devicetree/bindings/bus/allwinner,sun8i-a23-rsb.yaml /home/max/Work/allwinner/build/arm64/arch/arm64/boot/dts/allwinner/sun50i-h616-orangepi-zero2.dt.yaml: leds: led-0:default-state:0: 'on' is not of type 'array' From schema: /home/max/Work/repos/linux/Documentation/devicetree/bindings/leds/leds-gpio.yaml The last one is not related to your changes, but the rest must be fixed Maxime
On Mon, 25 Jan 2021 15:17:50 +0000, Andre Przywara wrote: > an update from the v3 last week, to add support for the Allwinner H616 > SoC. Still based on the (updated) sunxi/for-next branch. > I am omitting the MMC and pinctrl patches now, as they have been taken > by Ulf and LinusW already into their trees. > > I addressed the comments from the list, though not sure if the HOSC clock > coming from the RTC is really a good idea (didn't change it). > > [...] Applied to https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git for-next Thanks! [13/21] dt-bindings: spi: sunxi: Add H616 compatible string commit: 6589daf8bb98c75ad1065edad87c099ffb9f5d87 All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark
On Wed, 27 Jan 2021 17:15:30 +0000 Mark Brown <broonie@kernel.org> wrote: > On Mon, 25 Jan 2021 15:17:50 +0000, Andre Przywara wrote: > > an update from the v3 last week, to add support for the Allwinner H616 > > SoC. Still based on the (updated) sunxi/for-next branch. > > I am omitting the MMC and pinctrl patches now, as they have been taken > > by Ulf and LinusW already into their trees. > > > > I addressed the comments from the list, though not sure if the HOSC clock > > coming from the RTC is really a good idea (didn't change it). > > > > [...] > > Applied to > > https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git for-next > > Thanks! > > [13/21] dt-bindings: spi: sunxi: Add H616 compatible string > commit: 6589daf8bb98c75ad1065edad87c099ffb9f5d87 Thanks for that. I just sent a v5, just before seeing your email, so this one still has this patch, but without any changes. So please ignore [PATCH v5 13/21]. Cheers, Andre > All being well this means that it will be integrated into the linux-next > tree (usually sometime in the next 24 hours) and sent to Linus during > the next merge window (or sooner if it is a bug fix), however if > problems are discovered then the patch may be dropped or reverted. > > You may get further e-mails resulting from automated or manual testing > and review of the tree, please engage with people reporting problems and > send followup patches addressing any issues that are reported if needed. > > If any updates are required or you are submitting further changes they > should be sent as incremental updates against current git, existing > patches will not be replaced. > > Please add any relevant lists and maintainers to the CCs when replying > to this mail. > > Thanks, > Mark
Hi, an update from the v3 last week, to add support for the Allwinner H616 SoC. Still based on the (updated) sunxi/for-next branch. I am omitting the MMC and pinctrl patches now, as they have been taken by Ulf and LinusW already into their trees. I addressed the comments from the list, though not sure if the HOSC clock coming from the RTC is really a good idea (didn't change it). I was hoping that at least the clock and AXP patches (01/21-06/21) could make it into 5.12 still? That would allow booting boards from SD card. I am happy to strip the .dtsi and .dts patch to only contain the devices that we actually support then, if needed. For the changes: I split the joint DT bindings patch into subsystem specific ones, hopefully this simplifies merging. There is a new fix for the axp20x-pek driver, and the AXP IRQ fix has been amended as well (according to Samuel's comments). I eventually got USB to work, by requiring PHY 2 for [EO]HCI 1 & 3 as well. Not sure this is the right fix, it might be just one clock or reset line from that PHY that is needed for the others as well. Will do further experiments. For a more detailed changelog, see below. Thanks! Andre ================== This series gathers patches to support the Allwinner H616 SoC. This is a rather uninspired SoC (Quad-A53 with the usual peripherals), but allows for some cheap development boards and TV boxes, and supports up to 4GB of DRAM. Various DT binding patches are sprinkled throughout the series, to add the new compatible names right before they are used. Patch 2 and 3 add clock support. For the -R clock this is shared with the H6 code, as the clocks are identical, with the H616 just having fewer of them. The main clocks are different enough to warrant a separate file. Patches 5 and 6 teach the AXP MFD driver to get along without having an interrupt, as the missing NMI pin on the H616 leads to some boards not having the AXP IRQ line connected. Patch 8 and 14 add some tweaks to the syscon and EMAC driver, to deal with the second EMAC clock used for the second Ethernet controller. Patches 15 and 18 add USB support. The remaining patches add DT bindings, which just add the new compatible string along with an existing name as a fallback string. Eventually we get the .dtsi for the SoC in patch 19, and the .dts for the OrangePi Zero2 board[1] in the last patch. We have U-Boot and Trusted-Firmware support in a working state, booting via FEL or SD card and even TFTPing kernels work already [2][3]. The U-Boot patches are going to be merged this week. Many thanks to Jernej for his tremendous help on this, also for the awesome input and help from the #linux-sunxi Freenode channel. The whole series (including the other patches) can also be found here: https://github.com/apritzel/linux/commits/h616-v4 Happy reviewing! Cheers, Andre [1] https://linux-sunxi.org/Xunlong_Orange_Pi_Zero2 [2] https://github.com/jernejsk/u-boot/commits/h616-v2 [3] https://github.com/apritzel/arm-trusted-firmware/commits/h616-v1 Changelog v3 .. v4: - Drop MMC and pinctrl matches (already in some -next trees) - Add Maxime's Acks - Add patch to update the AXP MFD DT bindings - Add new patch (05/21) to fix axp20x-pek driver - Change AXP IRQ fix to check for invalid IRQ line number - Split joint DT bindings patch (v3 18/21) into subsystems - move dwmac variable to keep christmas tree - Use enums for USB PHY compatible strings in DT binding - Enable watchdog (briefly verified to work) - Add PHY2 to HCI1&3, this fixes USB - limit r-ccu register frame length to not collide with NMI controller - add interrupt-controller property to AXP DT node Changelog v2 .. v3: - Add Rob's Acks - Drop redundant maxItems from pinctrl DT binding - Rename h_i2s* to just i2s* in pinctrl names - Use more declarative i2s0_d{in,out}{0,1} names - Add RSB pins to pinctrl - Include RSB clocks (sharing with newly added H6 versions) - Fix CEC clock (add 2nd enable bit, also fix predivider flag) - Rename PMU_UNK1 register in USB PHY - Add USB and MUSB DT binding patches - Add MMC/SD speed modes to .dtsi Changelog v1 .. v2: - pinctrl: adjust irq bank map to cover undocumented GPIO bank IRQs - use differing h_i2s0 pin output names - r-ccu: fix number of used clocks - ccu: remove PLL-PERIPHy(4X) - ccu: fix gpu1 divider range - ccu: fix usb-phy3 parent - ccu: add missing TV clocks - ccu: rework to CLK_OF_DECLARE style - ccu: enable output bit for PLL clocks - ccu: renumber clocks - .dtsi: drop sun50i-a64-system-control fallback - .dtsi: drop unknown SRAM regions - .dtsi: add more (undocumented) GPIO interrupts - .dtsi: fix I2C3 pin names - .dtsi: use a100-emmc fallback for MMC2 - .dtsi: add second EMAC controller - .dtsi: use H3 MUSB controller fallback - .dtsi: fix frame size for USB PHY PMU registers - .dtsi: add USB0 PHY references - .dtsi: fix IR controller clock source - .dts: fix LED naming and swap pins - .dts: use 5V supply parent for USB supply - .dts: drop dummy IRQ for AXP - .dts: enable 3V3 header pin power rail - .dts: add SPI flash node - .dts: make USB-C port peripheral only - add IRQ-less AXP support - add two patches to support more than one EMAC clock - add patch to rework and extend USB PHY support - add DT binding documentation patches Andre Przywara (21): dt-bindings: clk: sunxi-ccu: Add compatible string for Allwinner H616 clk: sunxi-ng: Add support for the Allwinner H616 R-CCU clk: sunxi-ng: Add support for the Allwinner H616 CCU dt-bindings: mfd: axp20x: Add AXP305 compatible (plus optional IRQ) Input: axp20x-pek: Bail out if AXP has no interrupt line connected mfd: axp20x: Allow AXP chips without interrupt lines dt-bindings: sram: sunxi-sram: Add H616 compatible string soc: sunxi: sram: Add support for more than one EMAC clock dt-bindings: watchdog: sun4i: Add H616 compatible string dt-bindings: i2c: mv64xxx: Add H616 compatible string dt-bindings: media: IR: Add H616 IR compatible string dt-bindings: rtc: sun6i: Add H616 compatible string dt-bindings: spi: sunxi: Add H616 compatible string net: stmmac: dwmac-sun8i: Prepare for second EMAC clock register phy: sun4i-usb: Rework HCI PHY (aka. "pmu_unk1") handling dt-bindings: usb: Add H616 compatible string dt-bindings: usb: sunxi-musb: Add H616 compatible string phy: sun4i-usb: Add support for the H616 USB PHY arm64: dts: allwinner: Add Allwinner H616 .dtsi file dt-bindings: arm: sunxi: Add OrangePi Zero 2 binding arm64: dts: allwinner: Add OrangePi Zero 2 .dts .../devicetree/bindings/arm/sunxi.yaml | 5 + .../clock/allwinner,sun4i-a10-ccu.yaml | 2 + .../bindings/i2c/marvell,mv64xxx-i2c.yaml | 21 +- .../media/allwinner,sun4i-a10-ir.yaml | 16 +- .../devicetree/bindings/mfd/axp20x.txt | 3 +- .../phy/allwinner,sun8i-h3-usb-phy.yaml | 4 +- .../bindings/rtc/allwinner,sun6i-a31-rtc.yaml | 3 + .../bindings/spi/allwinner,sun6i-a31-spi.yaml | 1 + .../allwinner,sun4i-a10-system-control.yaml | 1 + .../usb/allwinner,sun4i-a10-musb.yaml | 3 + .../watchdog/allwinner,sun4i-a10-wdt.yaml | 12 +- arch/arm64/boot/dts/allwinner/Makefile | 1 + .../allwinner/sun50i-h616-orangepi-zero2.dts | 242 ++++ .../arm64/boot/dts/allwinner/sun50i-h616.dtsi | 750 +++++++++++ drivers/clk/sunxi-ng/Kconfig | 7 +- drivers/clk/sunxi-ng/Makefile | 1 + drivers/clk/sunxi-ng/ccu-sun50i-h6-r.c | 48 + drivers/clk/sunxi-ng/ccu-sun50i-h616.c | 1150 +++++++++++++++++ drivers/clk/sunxi-ng/ccu-sun50i-h616.h | 56 + drivers/input/misc/axp20x-pek.c | 4 + drivers/mfd/axp20x.c | 17 +- .../net/ethernet/stmicro/stmmac/dwmac-sun8i.c | 12 +- drivers/phy/allwinner/phy-sun4i-usb.c | 40 +- drivers/soc/sunxi/sunxi_sram.c | 31 +- include/dt-bindings/clock/sun50i-h616-ccu.h | 115 ++ include/dt-bindings/reset/sun50i-h616-ccu.h | 70 + 26 files changed, 2548 insertions(+), 67 deletions(-) create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-h616-orangepi-zero2.dts create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi create mode 100644 drivers/clk/sunxi-ng/ccu-sun50i-h616.c create mode 100644 drivers/clk/sunxi-ng/ccu-sun50i-h616.h create mode 100644 include/dt-bindings/clock/sun50i-h616-ccu.h create mode 100644 include/dt-bindings/reset/sun50i-h616-ccu.h