arm64: sunxi: Initial Allwinner H616 SoC support
Subsystems (20)
v2 cover arm64: sunxi: Initial Allwinner H616 SoC support
Hi,
this is the quite expanded second version of the support series for the Allwinner H616 SoC.
Besides many fixes for the bugs discovered by the diligent reviewers (many thanks for that!) this version adds some patches to support some slightly changed devices, like the second EMAC and the AXP not having an interrupt.
Also I added quite some DT binding doc patches.
USB still does not work, but I include the patches anyway, hoping that someone can help spotting the issue.
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 1/21 is the usual drive-by fix, discovered while staring at the H6 clock code.
Patch 3 and 4 add pinctrl support, with the "-R" controller now being crippled down to two I2C pins only. If we grow tired of repeating this exercise for every new SoC variant, I am happy to revive my more versatile sunxi pinctrl driver effort from a few years back [1]. Patch 6 and 7 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.
Patch 08/21 is pulling a patch from Yangtao's A100 series, since we need the same fix for MMC support. This will probably be merged separately, I just include this here to provide a bootable solution.
Patch 10 teaches the AXP MFD driver to get along without having an interrupt, as the H616 apparently does not have an NMI controller anymore. Patch 12 and 13 add some tweaks to the syscon and EMAC driver, to deal with the second EMAC clock used for the second Ethernet controller. Patches 14 and 15 *try* to add USB support. The same approach works with the very similar U-Boot PHY driver, but for some reason still fail in Linux. Maybe someone spots the issue and can help fixing it?
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[2] in the last patch.
We have U-Boot and Trusted-Firmware support in a working state, booting via FEL and even TFTPing kernels work already [3][4].
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 can also be found here:
https://github.com/apritzel/linux/commits/h616-v2
Happy reviewing!
Cheers,
Andre
[1] https://patchwork.ozlabs.org/project/linux-gpio/cover/[email protected]/
[2] https://linux-sunxi.org/Xunlong_Orange_Pi_Zero2
[3] https://github.com/jernejsk/u-boot/commits/h616-v1
[4] https://github.com/apritzel/arm-trusted-firmware/commits/h616-WIP
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 (18):
clk: sunxi-ng: h6: Fix clock divider range on some clocks
dt-bindings: pinctrl: Add Allwinner H616 compatible strings
pinctrl: sunxi: Add support for the Allwinner H616 pin controller
pinctrl: sunxi: Add support for the Allwinner H616-R pin controller
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
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
net: stmmac: dwmac-sun8i: Prepare for second EMAC clock register
phy: sun4i-usb: Rework "pmu_unk1" handling
phy: sun4i-usb: Add support for the H616 USB PHY
dt-bindings: watchdog: sun4i: Add H616 compatible string
dt-bindings: allwinner: Add H616 compatible strings
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
Yangtao Li (3):
dt-bindings: mmc: sunxi: Add Allwinner A100 and H616 compatibles
mmc: sunxi: add support for A100 mmc controller
dt-bindings: watchdog: sun4i: Add A100 compatible
.../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 +- .../bindings/mmc/allwinner,sun4i-a10-mmc.yaml | 8 + .../pinctrl/allwinner,sun4i-a10-pinctrl.yaml | 2 + .../bindings/rtc/allwinner,sun6i-a31-rtc.yaml | 3 + .../bindings/spi/allwinner,sun6i-a31-spi.yaml | 1 + .../allwinner,sun4i-a10-system-control.yaml | 1 + .../watchdog/allwinner,sun4i-a10-wdt.yaml | 9 +- arch/arm64/boot/dts/allwinner/Makefile | 1 + .../allwinner/sun50i-h616-orangepi-zero2.dts | 240 ++++ .../arm64/boot/dts/allwinner/sun50i-h616.dtsi | 715 ++++++++++ drivers/clk/sunxi-ng/Kconfig | 7 +- drivers/clk/sunxi-ng/Makefile | 1 + drivers/clk/sunxi-ng/ccu-sun50i-h6-r.c | 47 +- drivers/clk/sunxi-ng/ccu-sun50i-h6-r.h | 3 +- drivers/clk/sunxi-ng/ccu-sun50i-h6.c | 8 +- drivers/clk/sunxi-ng/ccu-sun50i-h616.c | 1150 +++++++++++++++++ drivers/clk/sunxi-ng/ccu-sun50i-h616.h | 56 + drivers/mfd/axp20x.c | 17 +- drivers/mmc/host/sunxi-mmc.c | 28 +- .../net/ethernet/stmicro/stmmac/dwmac-sun8i.c | 12 +- drivers/phy/allwinner/phy-sun4i-usb.c | 39 +- drivers/pinctrl/sunxi/Kconfig | 10 + drivers/pinctrl/sunxi/Makefile | 2 + drivers/pinctrl/sunxi/pinctrl-sun50i-h616-r.c | 54 + drivers/pinctrl/sunxi/pinctrl-sun50i-h616.c | 548 ++++++++ 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 + 31 files changed, 3151 insertions(+), 71 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 drivers/pinctrl/sunxi/pinctrl-sun50i-h616-r.c create mode 100644 drivers/pinctrl/sunxi/pinctrl-sun50i-h616.c create mode 100644 include/dt-bindings/clock/sun50i-h616-ccu.h create mode 100644 include/dt-bindings/reset/sun50i-h616-ccu.h
Signature · 7 lines
2.17.5 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
PATCH v2 1/21 clk: sunxi-ng: h6: Fix clock divider range on some clocks
While comparing clocks between the H6 and H616, some of the M factor ranges were found to be wrong: the manual says they are only covering two bits [1:0], but our code had "5" in the number-of-bits field.
By writing 0xff into that register in U-Boot and via FEL, it could be confirmed that bits [4:2] are indeed masked off, so the manual is right.
Change to number of bits in the affected clock's description.
--- drivers/clk/sunxi-ng/ccu-sun50i-h6.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/clk/sunxi-ng/ccu-sun50i-h6.c +4 -4
@@ -237,7 +237,7 @@ static const char * const psi_ahb1_ahb2_parents[] = { "osc24M", "osc32k", static SUNXI_CCU_MP_WITH_MUX(psi_ahb1_ahb2_clk, "psi-ahb1-ahb2", psi_ahb1_ahb2_parents,0x510 , -0 ,5 ,/* M */ +0 ,2 ,/* M */ 8 ,2 ,/* P */ 24 ,2 ,/* mux */ 0);
@@ -246,19 +246,19 @@ static const char * const ahb3_apb1_apb2_parents[] = { "osc24M", "osc32k","psi-ahb1-ahb2" , "pll-periph0" }; static SUNXI_CCU_MP_WITH_MUX(ahb3_clk, "ahb3", ahb3_apb1_apb2_parents, 0x51c, -0 ,5 ,/* M */ +0 ,2 ,/* M */ 8 ,2 ,/* P */ 24 ,2 ,/* mux */ 0); static SUNXI_CCU_MP_WITH_MUX(apb1_clk, "apb1", ahb3_apb1_apb2_parents, 0x520, -0 ,5 ,/* M */ +0 ,2 ,/* M */ 8 ,2 ,/* P */ 24 ,2 ,/* mux */ 0); static SUNXI_CCU_MP_WITH_MUX(apb2_clk, "apb2", ahb3_apb1_apb2_parents, 0x524, -0 ,5 ,/* M */ +0 ,2 ,/* M */ 8 ,2 ,/* P */ 24 ,2 ,/* mux */ 0);
Signature · 1 line
2.17.5
PATCH v2 2/21 dt-bindings: pinctrl: Add Allwinner H616 compatible strings
In reply to Andre PrzywaraA new SoC, a new compatible string.
Also we were too miserly with just allowing seven interrupt banks.
--- .../pinctrl/allwinner,sun4i-a10-pinctrl.yaml | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-)
Documentation/devicetree/bindings/pinctrl/allwinner,sun4i-a10-pinctrl.yaml +16 -2
@@ -53,6 +53,8 @@ properties: - allwinner,sun50i-h5-pinctrl - allwinner,sun50i-h6-pinctrl - allwinner,sun50i-h6-r-pinctrl + - allwinner,sun50i-h616-pinctrl + - allwinner,sun50i-h616-r-pinctrl - allwinner,suniv-f1c100s-pinctrl - nextthing,gr8-pinctrl
@@ -61,7 +63,7 @@ properties: interrupts: minItems: 1 - maxItems: 7 + maxItems: 8 description: One interrupt per external interrupt bank supported on the controller, sorted by bank number ascending order.
@@ -91,7 +93,7 @@ properties: bank found in the controller $ref: /schemas/types.yaml#/definitions/uint32-array minItems: 1 - maxItems: 5 + maxItems: 8 patternProperties: # It's pretty scary, but the basic idea is that:
@@ -145,6 +147,18 @@ allOf: # boards are defining it at the moment so it would generate a lot of # warnings. + - if: + properties: + compatible: + enum: + - allwinner,sun50i-h616-pinctrl + + then: + properties: + interrupts: + minItems: 8 + maxItems: 8 + - if: properties: compatible:
Signature · 1 line
2.17.5
Re: [PATCH v2 02/21] dt-bindings: pinctrl: Add Allwinner H616 compatible strings
Quoted 45 lines · Andre Przywara
A new SoC, a new compatible string.
Also we were too miserly with just allowing seven interrupt banks.Signed-off-by Andre Przywara <[email protected]>--- .../pinctrl/allwinner,sun4i-a10-pinctrl.yaml | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-)Documentation/devicetree/bindings/pinctrl/allwinner,sun4i-a10-pinctrl.yaml +6
-2@@ -53,6 +53,8 @@ properties: - allwinner,sun50i-h5-pinctrl - allwinner,sun50i-h6-pinctrl - allwinner,sun50i-h6-r-pinctrl + - allwinner,sun50i-h616-pinctrl + - allwinner,sun50i-h616-r-pinctrl - allwinner,suniv-f1c100s-pinctrl - nextthing,gr8-pinctrl@@ -61,7 +63,7 @@ properties: interrupts: minItems: 1 - maxItems: 7 + maxItems: 8 description: One interrupt per external interrupt bank supported on the controller, sorted by bank number ascending order.@@ -91,7 +93,7 @@ properties: bank found in the controller $ref: /schemas/types.yaml#/definitions/uint32-array minItems: 1 - maxItems: 5 + maxItems: 8 patternProperties: # It's pretty scary, but the basic idea is that:@@ -145,6 +147,18 @@ allOf: # boards are defining it at the moment so it would generate a lot of # warnings. + - if: + properties:
Documentation/devicetree/bindings/pinctrl/allwinner,sun4i-a10-pinctrl.yaml allOf: · line 161
Quoted 10 lines
Documentation/devicetree/bindings/pinctrl/allwinner,sun4i-a10-pinctrl.yaml +10
-0+ compatible: + enum: + - allwinner,sun50i-h616-pinctrl + + then: + properties: + interrupts: + minItems: 8 + maxItems: 8 +
You don't need to have both if they are equals, and in this particular case we already check that the maximum is 8 so there's no need to repeat that check here.
Maxime
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Re: [PATCH v2 02/21] dt-bindings: pinctrl: Add Allwinner H616 compatible strings
Quoted 47 lines · On Mon, 14 Dec 2020 10:37:28 +0100 Maxime Ripard <[email protected]> wrote:
Quoted 46 lines · Andre Przywara
A new SoC, a new compatible string.
Also we were too miserly with just allowing seven interrupt banks.Signed-off-by Andre Przywara <[email protected]>--- .../pinctrl/allwinner,sun4i-a10-pinctrl.yaml | 18++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-)
diff --git
a/Documentation/devicetree/bindings/pinctrl/allwinner,sun4i-a10-pinctrl.yamlb/Documentation/devicetree/bindings/pinctrl/allwinner,sun4i-a10-pinctrl.yamlindex5240487dfe50..292b05d9ed08100644 ---a/Documentation/devicetree/bindings/pinctrl/allwinner,sun4i-a10-pinctrl.yaml
+++b/Documentation/devicetree/bindings/pinctrl/allwinner,sun4i-a10-pinctrl.yamlDocumentation/devicetree/bindings/pinctrl/allwinner,sun4i-a10-pinctrl.yaml +4
-2@@ -53,6 +53,8 @@ properties: - allwinner,sun50i-h5-pinctrl - allwinner,sun50i-h6-pinctrl - allwinner,sun50i-h6-r-pinctrl + - allwinner,sun50i-h616-pinctrl + - allwinner,sun50i-h616-r-pinctrl - allwinner,suniv-f1c100s-pinctrl - nextthing,gr8-pinctrl@@ -61,7 +63,7 @@ properties: interrupts: minItems: 1 - maxItems: 7 + maxItems: 8 description: One interrupt per external interrupt bank supported on the controller, sorted by bank number ascending order.@@ -91,7 +93,7 @@ properties: bank found in the controller $ref: /schemas/types.yaml#/definitions/uint32-array minItems: 1 - maxItems: 5 + maxItems: 8 patternProperties: # It's pretty scary, but the basic idea is that:@@ -145,6 +147,18 @@ allOf: # boards are defining it at the moment so it would generate alot of # warnings.
Quoted 14 lines
Documentation/devicetree/bindings/pinctrl/allwinner,sun4i-a10-pinctrl.yaml allOf: · line 161
Quoted 12 lines
Documentation/devicetree/bindings/pinctrl/allwinner,sun4i-a10-pinctrl.yaml +12
-0+ - if: + properties: + compatible: + enum: + - allwinner,sun50i-h616-pinctrl + + then: + properties: + interrupts: + minItems: 8 + maxItems: 8 +You don't need to have both if they are equals, and in this particular
Mmh, but all the other compatibles have both equal, so what would be the recommended way to describe this? Just minItems? I don't find a good explanation at the moment how to handle an explicit number, other than by enumerating the items explicitly.
Quoted 2 lines
case we already check that the maximum is 8 so there's no need to repeat that check here.
Are you referring to the overall "maxItems: 8" above, in the 2nd hunk? While this will become redundant, this is apparently prone to changes (as only "7" would be redundant at the moment), so I would rather not rely on a global limit.
Cheers,
Andre.
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Re: [PATCH v2 02/21] dt-bindings: pinctrl: Add Allwinner H616 compatible strings
Quoted 65 lines · Andre Przywara
Quoted 47 lines · On Mon, 14 Dec 2020 10:37:28 +0100 Maxime Ripard <[email protected]> wrote:
Quoted 46 lines · Andre Przywara
A new SoC, a new compatible string.
Also we were too miserly with just allowing seven interrupt banks.Signed-off-by Andre Przywara <[email protected]>--- .../pinctrl/allwinner,sun4i-a10-pinctrl.yaml | 18++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-)
diff --git
a/Documentation/devicetree/bindings/pinctrl/allwinner,sun4i-a10-pinctrl.yamlb/Documentation/devicetree/bindings/pinctrl/allwinner,sun4i-a10-pinctrl.yamlindex5240487dfe50..292b05d9ed08100644 ---a/Documentation/devicetree/bindings/pinctrl/allwinner,sun4i-a10-pinctrl.yaml
+++b/Documentation/devicetree/bindings/pinctrl/allwinner,sun4i-a10-pinctrl.yamlDocumentation/devicetree/bindings/pinctrl/allwinner,sun4i-a10-pinctrl.yaml +4
-2@@ -53,6 +53,8 @@ properties: - allwinner,sun50i-h5-pinctrl - allwinner,sun50i-h6-pinctrl - allwinner,sun50i-h6-r-pinctrl + - allwinner,sun50i-h616-pinctrl + - allwinner,sun50i-h616-r-pinctrl - allwinner,suniv-f1c100s-pinctrl - nextthing,gr8-pinctrl@@ -61,7 +63,7 @@ properties: interrupts: minItems: 1 - maxItems: 7 + maxItems: 8 description: One interrupt per external interrupt bank supported on the controller, sorted by bank number ascending order.@@ -91,7 +93,7 @@ properties: bank found in the controller $ref: /schemas/types.yaml#/definitions/uint32-array minItems: 1 - maxItems: 5 + maxItems: 8 patternProperties: # It's pretty scary, but the basic idea is that:@@ -145,6 +147,18 @@ allOf: # boards are defining it at the moment so it would generate alot of # warnings.
Quoted 14 lines
Documentation/devicetree/bindings/pinctrl/allwinner,sun4i-a10-pinctrl.yaml allOf: · line 161
Quoted 12 lines
Documentation/devicetree/bindings/pinctrl/allwinner,sun4i-a10-pinctrl.yaml +12
-0+ - if: + properties: + compatible: + enum: + - allwinner,sun50i-h616-pinctrl + + then: + properties: + interrupts: + minItems: 8 + maxItems: 8 +You don't need to have both if they are equals, and in this particular
Quoted 4 lines
Mmh, but all the other compatibles have both equal, so what would be the recommended way to describe this? Just minItems? I don't find a good explanation at the moment how to handle an explicit number, other than by enumerating the items explicitly.
This is where the magic happens:
https://github.com/devicetree-org/dt-schema/blob/master/dtschema/lib.py#L258
So, if there's an items property, it will expand minItems and maxItems according to the length of the list. Else, it will see if there's either minItems and maxItems and set the other one if it's missing.
In this case, minItems and maxItems are equals, so you could just fill one of them
Quoted 7 lines
Quoted 2 lines
case we already check that the maximum is 8 so there's no need to repeat that check here.
Are you referring to the overall "maxItems: 8" above, in the 2nd hunk? While this will become redundant, this is apparently prone to changes (as only "7" would be redundant at the moment), so I would rather not rely on a global limit.
Yeah, my point was that since the upper schema checks for the interrupts array length to be between 1 and 8, there's no need to specify a max of 8, the upper schema has it covered.
You're right that the max is increased regularly, however we can still rely on the above logic to fill maxItems to 8 anyway
Maxime
PATCH v2 3/21 pinctrl: sunxi: Add support for the Allwinner H616 pin controller
In reply to Andre PrzywaraPort A is used for an internal connection to some analogue circuitry which looks like an AC200 IP (as in the H6), though this is not mentioned in the manual.
--- drivers/pinctrl/sunxi/Kconfig | 5 + drivers/pinctrl/sunxi/Makefile | 1 + drivers/pinctrl/sunxi/pinctrl-sun50i-h616.c | 548 ++++++++++++++++++++ 3 files changed, 554 insertions(+) create mode 100644 drivers/pinctrl/sunxi/pinctrl-sun50i-h616.c
drivers/pinctrl/sunxi/Kconfig +5 -0
@@ -119,4 +119,9 @@ config PINCTRL_SUN50I_H6_R default ARM64 && ARCH_SUNXI select PINCTRL_SUNXI +config PINCTRL_SUN50I_H616 + bool "Support for the Allwinner H616 PIO" + default ARM64 && ARCH_SUNXI + select PINCTRL_SUNXI + endif
drivers/pinctrl/sunxi/Makefile +1 -0
@@ -23,5 +23,6 @@ obj-$(CONFIG_PINCTRL_SUN8I_V3S) += pinctrl-sun8i-v3s.o obj-$(CONFIG_PINCTRL_SUN50I_H5) += pinctrl-sun50i-h5.o obj-$(CONFIG_PINCTRL_SUN50I_H6) += pinctrl-sun50i-h6.o obj-$(CONFIG_PINCTRL_SUN50I_H6_R) += pinctrl-sun50i-h6-r.o +obj-$(CONFIG_PINCTRL_SUN50I_H616) += pinctrl-sun50i-h616.o obj-$(CONFIG_PINCTRL_SUN9I_A80) += pinctrl-sun9i-a80.o obj-$(CONFIG_PINCTRL_SUN9I_A80_R) += pinctrl-sun9i-a80-r.o
drivers/pinctrl/sunxi/pinctrl-sun50i-h616.c new file +548 -0
548 lines not on this page · raw message
Signature · 1 line
2.17.5
Re: [PATCH v2 03/21] pinctrl: sunxi: Add support for the Allwinner H616 pin controller
drivers/pinctrl/sunxi/pinctrl-sun50i-h616.c line 252
Quoted 6 lines · Andre Przywara
drivers/pinctrl/sunxi/pinctrl-sun50i-h616.c new file +6
-0+SUNXI_PIN (SUNXI_PINCTRL_PIN (G ,10 ), +SUNXI_FUNCTION (0x0 ,"gpio_in" ), +SUNXI_FUNCTION (0x1 ,"gpio_out" ), +SUNXI_FUNCTION (0x2 ,"h_i2s2" ),/* MCLK */ +SUNXI_FUNCTION (0x3 ,"clock" ),/* X32KFOUT */ + SUNXI_FUNCTION_IRQ_BANK(0x6, 5, 10)), /* PG_EINT10 */
It looks like there's no i2s vs h_i2s issue anymore? Maybe we can just do s/h_i2s/i2s
drivers/pinctrl/sunxi/pinctrl-sun50i-h616.c line 414
Quoted 8 lines
drivers/pinctrl/sunxi/pinctrl-sun50i-h616.c new file +8
-0+SUNXI_PIN (SUNXI_PINCTRL_PIN (I ,3 ), +SUNXI_FUNCTION (0x0 ,"gpio_in" ), +SUNXI_FUNCTION (0x1 ,"gpio_out" ), +SUNXI_FUNCTION (0x2 ,"emac0" ),/* ERXD0 */ +SUNXI_FUNCTION (0x3 ,"dmic" ),/* DATA2 */ +SUNXI_FUNCTION (0x4 ,"h_i2s0" ),/* DO0 */ +SUNXI_FUNCTION (0x5 ,"h_i2s0_a" ),/* DI1 */ + SUNXI_FUNCTION_IRQ_BANK(0x6, 7, 3)), /* PI_EINT3 */
The way we dealt with this for the A100 is that we put the function as a suffix which is more natural, so h_i2s0_dout0 and h_i2s0_din1
Maxime
PATCH v2 4/21 pinctrl: sunxi: Add support for the Allwinner H616-R pin controller
In reply to Andre PrzywaraThere are only two pins left now, used to connect to the PMIC via I2C.
--- drivers/pinctrl/sunxi/Kconfig | 5 ++ drivers/pinctrl/sunxi/Makefile | 1 + drivers/pinctrl/sunxi/pinctrl-sun50i-h616-r.c | 54 +++++++++++++++++++ 3 files changed, 60 insertions(+) create mode 100644 drivers/pinctrl/sunxi/pinctrl-sun50i-h616-r.c
drivers/pinctrl/sunxi/Kconfig +5 -0
@@ -124,4 +124,9 @@ config PINCTRL_SUN50I_H616 default ARM64 && ARCH_SUNXI select PINCTRL_SUNXI +config PINCTRL_SUN50I_H616_R + bool "Support for the Allwinner H616 R-PIO" + default ARM64 && ARCH_SUNXI + select PINCTRL_SUNXI + endif
drivers/pinctrl/sunxi/Makefile +1 -0
@@ -24,5 +24,6 @@ obj-$(CONFIG_PINCTRL_SUN50I_H5) += pinctrl-sun50i-h5.o obj-$(CONFIG_PINCTRL_SUN50I_H6) += pinctrl-sun50i-h6.o obj-$(CONFIG_PINCTRL_SUN50I_H6_R) += pinctrl-sun50i-h6-r.o obj-$(CONFIG_PINCTRL_SUN50I_H616) += pinctrl-sun50i-h616.o +obj-$(CONFIG_PINCTRL_SUN50I_H616_R) += pinctrl-sun50i-h616-r.o obj-$(CONFIG_PINCTRL_SUN9I_A80) += pinctrl-sun9i-a80.o obj-$(CONFIG_PINCTRL_SUN9I_A80_R) += pinctrl-sun9i-a80-r.o
drivers/pinctrl/sunxi/pinctrl-sun50i-h616-r.c new file +54 -0
54 lines not on this page · raw message
Signature · 1 line
2.17.5
PATCH v2 5/21 dt-bindings: clk: sunxi-ccu: Add compatible string for Allwinner H616
In reply to Andre Przywara--- .../devicetree/bindings/clock/allwinner,sun4i-a10-ccu.yaml | 2 ++ 1 file changed, 2 insertions(+)
Documentation/devicetree/bindings/clock/allwinner,sun4i-a10-ccu.yaml +2 -0
@@ -41,6 +41,8 @@ properties: - allwinner,sun50i-h5-ccu - allwinner,sun50i-h6-ccu - allwinner,sun50i-h6-r-ccu + - allwinner,sun50i-h616-ccu + - allwinner,sun50i-h616-r-ccu - allwinner,suniv-f1c100s-ccu - nextthing,gr8-ccu
Signature · 7 lines
2.17.5 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Re: [PATCH v2 05/21] dt-bindings: clk: sunxi-ccu: Add compatible string for Allwinner H616
Quoted 5 lines · Andre Przywara
Signed-off-by Andre Przywara <[email protected]>--- .../devicetree/bindings/clock/allwinner,sun4i-a10-ccu.yaml | 2 ++ 1 file changed, 2 insertions(+)
PATCH v2 6/21 clk: sunxi-ng: Add support for the Allwinner H616 R-CCU
In reply to Andre PrzywaraThe clocks itself are identical to the H6 R-CCU, it's just that the H616 has not all of them implemented (or connected).
--- drivers/clk/sunxi-ng/Kconfig | 2 +- drivers/clk/sunxi-ng/ccu-sun50i-h6-r.c | 47 +++++++++++++++++++++++++- drivers/clk/sunxi-ng/ccu-sun50i-h6-r.h | 3 +- 3 files changed, 49 insertions(+), 3 deletions(-)
drivers/clk/sunxi-ng/Kconfig +1 -1
@@ -33,7 +33,7 @@ config SUN50I_H6_CCU depends on (ARM64 && ARCH_SUNXI) || COMPILE_TEST config SUN50I_H6_R_CCU - bool "Support for the Allwinner H6 PRCM CCU" + bool "Support for the Allwinner H6 and H616 PRCM CCU" default ARM64 && ARCH_SUNXI depends on (ARM64 && ARCH_SUNXI) || COMPILE_TEST
drivers/clk/sunxi-ng/ccu-sun50i-h6-r.c +46 -1
74 lines not on this page · raw message
drivers/clk/sunxi-ng/ccu-sun50i-h6-r.h +2 -1
@@ -14,6 +14,7 @@#define CLK_R_APB2 3 -#define CLK_NUMBER (CLK_W1 + 1) +#define CLK_NUMBER_H6 (CLK_W1 + 1) +#define CLK_NUMBER_H616 (CLK_IR + 1)#endif /* _CCU_SUN50I_H6_R_H */
Signature · 7 lines
2.17.5 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
PATCH v2 7/21 clk: sunxi-ng: Add support for the Allwinner H616 CCU
In reply to Andre PrzywaraWhile the clocks are fairly similar to the H6, many differ in tiny details, so a separate clock driver seems indicated.
Derived from the H6 clock driver, and adjusted according to the manual.
--- drivers/clk/sunxi-ng/Kconfig | 5 + drivers/clk/sunxi-ng/Makefile | 1 + drivers/clk/sunxi-ng/ccu-sun50i-h616.c | 1150 +++++++++++++++++++ drivers/clk/sunxi-ng/ccu-sun50i-h616.h | 56 + include/dt-bindings/clock/sun50i-h616-ccu.h | 115 ++ include/dt-bindings/reset/sun50i-h616-ccu.h | 70 ++ 6 files changed, 1397 insertions(+) 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
drivers/clk/sunxi-ng/Kconfig +5 -0
@@ -32,6 +32,11 @@ config SUN50I_H6_CCU default ARM64 && ARCH_SUNXI depends on (ARM64 && ARCH_SUNXI) || COMPILE_TEST +config SUN50I_H616_CCU + bool "Support for the Allwinner H616 CCU" + default ARM64 && ARCH_SUNXI + depends on (ARM64 && ARCH_SUNXI) || COMPILE_TEST + config SUN50I_H6_R_CCU bool "Support for the Allwinner H6 and H616 PRCM CCU" default ARM64 && ARCH_SUNXI
drivers/clk/sunxi-ng/Makefile +1 -0
@@ -26,6 +26,7 @@ obj-$(CONFIG_SUN50I_A64_CCU) += ccu-sun50i-a64.o obj-$(CONFIG_SUN50I_A100_CCU) += ccu-sun50i-a100.o obj-$(CONFIG_SUN50I_A100_R_CCU) += ccu-sun50i-a100-r.o obj-$(CONFIG_SUN50I_H6_CCU) += ccu-sun50i-h6.o +obj-$(CONFIG_SUN50I_H616_CCU) += ccu-sun50i-h616.o obj-$(CONFIG_SUN50I_H6_R_CCU) += ccu-sun50i-h6-r.o obj-$(CONFIG_SUN4I_A10_CCU) += ccu-sun4i-a10.o obj-$(CONFIG_SUN5I_CCU) += ccu-sun5i.o
drivers/clk/sunxi-ng/ccu-sun50i-h616.c new file +1150 -0
1,150 lines not on this page · raw message
drivers/clk/sunxi-ng/ccu-sun50i-h616.h new file +56 -0
56 lines not on this page · raw message
include/dt-bindings/clock/sun50i-h616-ccu.h new file +115 -0
115 lines not on this page · raw message
include/dt-bindings/reset/sun50i-h616-ccu.h new file +70 -0
70 lines not on this page · raw message
Signature · 1 line
2.17.5
PATCH v2 8/21 dt-bindings: mmc: sunxi: Add Allwinner A100 and H616 compatibles
In reply to Andre PrzywaraFrom: Yangtao Li <[email protected]>
Add binding for A100's and H616's mmc and emmc controller.
--- .../devicetree/bindings/mmc/allwinner,sun4i-a10-mmc.yaml | 8 ++++++++ 1 file changed, 8 insertions(+)
Documentation/devicetree/bindings/mmc/allwinner,sun4i-a10-mmc.yaml +8 -0
@@ -26,6 +26,8 @@ properties: - const: allwinner,sun9i-a80-mmc - const: allwinner,sun50i-a64-emmc - const: allwinner,sun50i-a64-mmc + - const: allwinner,sun50i-a100-emmc + - const: allwinner,sun50i-a100-mmc - items: - const: allwinner,sun8i-a83t-mmc - const: allwinner,sun7i-a20-mmc
@@ -47,6 +49,12 @@ properties: - items: - const: allwinner,sun50i-h6-mmc - const: allwinner,sun50i-a64-mmc + - items: + - const: allwinner,sun50i-h616-emmc + - const: allwinner,sun50i-a100-emmc + - items: + - const: allwinner,sun50i-h616-mmc + - const: allwinner,sun50i-a100-mmc reg: maxItems: 1
Signature · 1 line
2.17.5
Re: [PATCH v2 08/21] dt-bindings: mmc: sunxi: Add Allwinner A100 and H616 compatibles
Quoted 10 lines · Andre Przywara
From: Yangtao Li <[email protected]>
Add binding for A100's and H616's mmc and emmc controller.
Signed-off-by Yangtao Li <[email protected]>Signed-off-by Andre Przywara <[email protected]>--- .../devicetree/bindings/mmc/allwinner,sun4i-a10-mmc.yaml | 8 ++++++++ 1 file changed, 8 insertions(+)
Re: [PATCH v2 08/21] dt-bindings: mmc: sunxi: Add Allwinner A100 and H616 compatibles
In reply to Andre PrzywaraQuoted 7 lines · Andre Przywara
From: Yangtao Li <[email protected]>
Add binding for A100's and H616's mmc and emmc controller.
Signed-off-by Yangtao Li <[email protected]>Signed-off-by Andre Przywara <[email protected]>
Applied for next to my mmc tree, thanks!
Kind regards
Uffe
Quoted 33 lines
--- .../devicetree/bindings/mmc/allwinner,sun4i-a10-mmc.yaml | 8 ++++++++ 1 file changed, 8 insertions(+)Documentation/devicetree/bindings/mmc/allwinner,sun4i-a10-mmc.yaml +8
-1@@ -26,6 +26,8 @@ properties: - const: allwinner,sun9i-a80-mmc - const: allwinner,sun50i-a64-emmc - const: allwinner,sun50i-a64-mmc + - const: allwinner,sun50i-a100-emmc + - const: allwinner,sun50i-a100-mmc - items: - const: allwinner,sun8i-a83t-mmc - const: allwinner,sun7i-a20-mmc@@ -47,6 +49,12 @@ properties: - items: - const: allwinner,sun50i-h6-mmc - const: allwinner,sun50i-a64-mmc + - items: + - const: allwinner,sun50i-h616-emmc + - const: allwinner,sun50i-a100-emmc + - items: + - const: allwinner,sun50i-h616-mmc + - const: allwinner,sun50i-a100-mmc reg: maxItems: 1 --2.17.5
PATCH v2 9/21 mmc: sunxi: add support for A100 mmc controller
In reply to Andre PrzywaraFrom: Yangtao Li <[email protected]>
This patch adds support for A100 MMC controller, which use word address for internal dma.
--- drivers/mmc/host/sunxi-mmc.c | 28 +++++++++++++++++++++++++--- 1 file changed, 25 insertions(+), 3 deletions(-)
drivers/mmc/host/sunxi-mmc.c +25 -3
@@ -244,6 +244,7 @@ struct sunxi_idma_des {struct sunxi_mmc_cfg {u32 idma_des_size_bits; +u32 idma_des_shift;const struct sunxi_mmc_clk_delay *clk_delays;/* does the IP block support autocalibration? */
@@ -343,7 +344,7 @@ static int sunxi_mmc_init_host(struct sunxi_mmc_host *host)/* Enable CEATA support */ mmc_writel (host,REG_FUNS ,SDXC_CEATA_ON );/* Set DMA descriptor list base address */ -mmc_writel (host,REG_DLBA , host->sg_dma); +mmc_writel (host,REG_DLBA , host->sg_dma >> host->cfg->idma_des_shift); rval =mmc_readl (host,REG_GCTRL ); rval |=SDXC_INTERRUPT_ENABLE_BIT ;
@@ -373,8 +374,10 @@ static void sunxi_mmc_init_idma_des(struct sunxi_mmc_host *host, next_desc +=sizeof (struct sunxi_idma_des ); pdes[i].buf_addr_ptr1 = -cpu_to_le32 (sg_dma_address (&data->sg[i])); - pdes[i].buf_addr_ptr2 =cpu_to_le32 ((u32 )next_desc); +cpu_to_le32 (sg_dma_address (&data->sg[i]) >> + host->cfg->idma_des_shift); + pdes[i].buf_addr_ptr2 =cpu_to_le32 ((u32 )next_desc >> + host->cfg->idma_des_shift); } pdes[0 ].config |=cpu_to_le32 (SDXC_IDMAC_DES0_FD );
@@ -1178,6 +1181,23 @@ static const struct sunxi_mmc_cfg sun50i_a64_emmc_cfg = { .needs_new_timings = true, }; +static const struct sunxi_mmc_cfg sun50i_a100_cfg = { + .idma_des_size_bits =16 , + .idma_des_shift =2 , + .clk_delays =NULL , + .can_calibrate = true, + .mask_data0 = true, + .needs_new_timings = true, +}; + +static const struct sunxi_mmc_cfg sun50i_a100_emmc_cfg = { + .idma_des_size_bits =13 , + .idma_des_shift =2 , + .clk_delays =NULL , + .can_calibrate = true, + .needs_new_timings = true, +}; +static const struct of_device_id sunxi_mmc_of_match[] = { { .compatible ="allwinner,sun4i-a10-mmc" , .data = &sun4i_a10_cfg }, { .compatible ="allwinner,sun5i-a13-mmc" , .data = &sun5i_a13_cfg },
@@ -1186,6 +1206,8 @@ static const struct of_device_id sunxi_mmc_of_match[] = { { .compatible = "allwinner,sun9i-a80-mmc", .data = &sun9i_a80_cfg }, { .compatible = "allwinner,sun50i-a64-mmc", .data = &sun50i_a64_cfg }, { .compatible = "allwinner,sun50i-a64-emmc", .data = &sun50i_a64_emmc_cfg }, + { .compatible = "allwinner,sun50i-a100-mmc", .data = &sun50i_a100_cfg }, + { .compatible = "allwinner,sun50i-a100-emmc", .data = &sun50i_a100_emmc_cfg }, {/* sentinel */ } };MODULE_DEVICE_TABLE (of, sunxi_mmc_of_match);
Signature · 7 lines
2.17.5 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Re: [PATCH v2 09/21] mmc: sunxi: add support for A100 mmc controller
Quoted 8 lines · Andre Przywara
From: Yangtao Li <[email protected]>
This patch adds support for A100 MMC controller, which use word address for internal dma.
Signed-off-by Yangtao Li <[email protected]>Signed-off-by Andre Przywara <[email protected]>
Applied for next to my mmc tree, thanks!
Kind regards
Uffe
Quoted 74 lines
--- drivers/mmc/host/sunxi-mmc.c | 28 +++++++++++++++++++++++++--- 1 file changed, 25 insertions(+), 3 deletions(-)drivers/mmc/host/sunxi-mmc.c +25
-4@@ -244,6 +244,7 @@ struct sunxi_idma_des {struct sunxi_mmc_cfg {u32 idma_des_size_bits; +u32 idma_des_shift;const struct sunxi_mmc_clk_delay *clk_delays;/* does the IP block support autocalibration? */ @@ -343,7 +344,7 @@ static int sunxi_mmc_init_host(struct sunxi_mmc_host *host)/* Enable CEATA support */ mmc_writel (host,REG_FUNS ,SDXC_CEATA_ON );/* Set DMA descriptor list base address */ -mmc_writel (host,REG_DLBA , host->sg_dma); +mmc_writel (host,REG_DLBA , host->sg_dma >> host->cfg->idma_des_shift); rval =mmc_readl (host,REG_GCTRL ); rval |=SDXC_INTERRUPT_ENABLE_BIT ;@@ -373,8 +374,10 @@ static void sunxi_mmc_init_idma_des(struct sunxi_mmc_host *host, next_desc +=sizeof (struct sunxi_idma_des ); pdes[i].buf_addr_ptr1 = -cpu_to_le32 (sg_dma_address (&data->sg[i])); - pdes[i].buf_addr_ptr2 =cpu_to_le32 ((u32 )next_desc); +cpu_to_le32 (sg_dma_address (&data->sg[i]) >> + host->cfg->idma_des_shift); + pdes[i].buf_addr_ptr2 =cpu_to_le32 ((u32 )next_desc >> + host->cfg->idma_des_shift); } pdes[0 ].config |=cpu_to_le32 (SDXC_IDMAC_DES0_FD );@@ -1178,6 +1181,23 @@ static const struct sunxi_mmc_cfg sun50i_a64_emmc_cfg = { .needs_new_timings = true, }; +static const struct sunxi_mmc_cfg sun50i_a100_cfg = { + .idma_des_size_bits =16 , + .idma_des_shift =2 , + .clk_delays =NULL , + .can_calibrate = true, + .mask_data0 = true, + .needs_new_timings = true, +}; + +static const struct sunxi_mmc_cfg sun50i_a100_emmc_cfg = { + .idma_des_size_bits =13 , + .idma_des_shift =2 , + .clk_delays =NULL , + .can_calibrate = true, + .needs_new_timings = true, +}; +static const struct of_device_id sunxi_mmc_of_match[] = { { .compatible ="allwinner,sun4i-a10-mmc" , .data = &sun4i_a10_cfg }, { .compatible ="allwinner,sun5i-a13-mmc" , .data = &sun5i_a13_cfg },@@ -1186,6 +1206,8 @@ static const struct of_device_id sunxi_mmc_of_match[] = { { .compatible = "allwinner,sun9i-a80-mmc", .data = &sun9i_a80_cfg }, { .compatible = "allwinner,sun50i-a64-mmc", .data = &sun50i_a64_cfg }, { .compatible = "allwinner,sun50i-a64-emmc", .data = &sun50i_a64_emmc_cfg }, + { .compatible = "allwinner,sun50i-a100-mmc", .data = &sun50i_a100_cfg }, + { .compatible = "allwinner,sun50i-a100-emmc", .data = &sun50i_a100_emmc_cfg }, {/* sentinel */ } };MODULE_DEVICE_TABLE (of, sunxi_mmc_of_match); --2.17.5
PATCH v2 10/21 mfd: axp20x: Allow AXP chips without interrupt lines
In reply to Andre PrzywaraCurrently the AXP chip requires to have its IRQ line connected to some interrupt controller, and will fail probing when this is not the case.
On a new Allwinner SoC (H616) there is no NMI pin anymore, so the interrupt functionality of the AXP chip is simply not available.
Check whether the DT describes the AXP chip as an interrupt controller before trying to register the irqchip, to avoid probe failures on setups without an interrupt.
--- drivers/mfd/axp20x.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-)
drivers/mfd/axp20x.c +11 -6
@@ -959,12 +959,17 @@ int axp20x_device_probe(struct axp20x_dev *axp20x) AXP806_REG_ADDR_EXT_ADDR_SLAVE_MODE); } - ret =regmap_add_irq_chip (axp20x->regmap, axp20x->irq, -IRQF_ONESHOT |IRQF_SHARED | axp20x->irq_flags, --1 , axp20x->regmap_irq_chip, &axp20x->regmap_irqc); -if (ret) { -dev_err (axp20x->dev,"failed to add irq chip: %d\n" , ret); -return ret; +if (!axp20x->dev->of_node || +of_property_read_bool (axp20x->dev->of_node,"interrupt-controller" )) { + ret =regmap_add_irq_chip (axp20x->regmap, axp20x->irq, +IRQF_ONESHOT |IRQF_SHARED | axp20x->irq_flags, +-1 , axp20x->regmap_irq_chip, + &axp20x->regmap_irqc); +if (ret) { +dev_err (axp20x->dev,"failed to add irq chip: %d\n" , + ret); +return ret; + } } ret = mfd_add_devices(axp20x->dev, -1, axp20x->cells,
Signature · 7 lines
2.17.5 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
PATCH v2 11/21 dt-bindings: sram: sunxi-sram: Add H616 compatible string
In reply to Andre PrzywaraThe H616 adds a second EMAC clock register. We don't know about the exact SRAM properties yet, so this gets omitted for now.
--- .../bindings/sram/allwinner,sun4i-a10-system-control.yaml | 1 + 1 file changed, 1 insertion(+)
Documentation/devicetree/bindings/sram/allwinner,sun4i-a10-system-control.yaml +1 -0
@@ -49,6 +49,7 @@ properties: - items: - const: allwinner,suniv-f1c100s-system-control - const: allwinner,sun4i-a10-system-control + - const: allwinner,sun50i-h616-system-control reg: maxItems: 1
Signature · 1 line
2.17.5
Re: [PATCH v2 11/21] dt-bindings: sram: sunxi-sram: Add H616 compatible string
Quoted 8 lines · Andre Przywara
The H616 adds a second EMAC clock register. We don't know about the exact SRAM properties yet, so this gets omitted for now.
Signed-off-by Andre Przywara <[email protected]>--- .../bindings/sram/allwinner,sun4i-a10-system-control.yaml | 1 + 1 file changed, 1 insertion(+)
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
PATCH v2 12/21 soc: sunxi: sram: Add support for more than one EMAC clock
In reply to Andre PrzywaraThe Allwinner H616 adds a second EMAC clock register at offset 0x34, for controlling the second EMAC in this chip.
Allow to extend the regmap in this case, to cover more than the current 4 bytes exported.
--- drivers/soc/sunxi/sunxi_sram.c | 31 +++++++++++++++++++++++-------- 1 file changed, 23 insertions(+), 8 deletions(-)
drivers/soc/sunxi/sunxi_sram.c +23 -8
@@ -283,7 +283,7 @@ int sunxi_sram_release(struct device *dev)EXPORT_SYMBOL (sunxi_sram_release);struct sunxi_sramc_variant { -bool has_emac_clock; +int num_emac_clocks; };static const struct sunxi_sramc_variant sun4i_a10_sramc_variant = {
@@ -291,20 +291,31 @@ static const struct sunxi_sramc_variant sun4i_a10_sramc_variant = { };static const struct sunxi_sramc_variant sun8i_h3_sramc_variant = { - .has_emac_clock = true, + .num_emac_clocks =1 , };static const struct sunxi_sramc_variant sun50i_a64_sramc_variant = { - .has_emac_clock = true, + .num_emac_clocks =1 , +}; + +static const struct sunxi_sramc_variant sun50i_h616_sramc_variant = { + .num_emac_clocks =2 , };#define SUNXI_SRAM_EMAC_CLOCK_REG 0x30static bool sunxi_sram_regmap_accessible_reg (struct device *dev,unsigned int reg) { -if (reg ==SUNXI_SRAM_EMAC_CLOCK_REG ) -return true; -return false; +const struct sunxi_sramc_variant *variant; + + variant =of_device_get_match_data (dev); + +if (reg <SUNXI_SRAM_EMAC_CLOCK_REG ) +return false; +if (reg >SUNXI_SRAM_EMAC_CLOCK_REG + variant->num_emac_clocks *4 ) +return false; + +return true; }static struct regmap_config sunxi_sram_emac_clock_regmap = {
@@ -312,7 +323,7 @@ static struct regmap_config sunxi_sram_emac_clock_regmap = { .val_bits = 32, .reg_stride = 4,/* last defined register */ - .max_register = SUNXI_SRAM_EMAC_CLOCK_REG, + .max_register = SUNXI_SRAM_EMAC_CLOCK_REG + 4,/* other devices have no business accessing other registers */ .readable_reg = sunxi_sram_regmap_accessible_reg, .writeable_reg = sunxi_sram_regmap_accessible_reg,
@@ -343,7 +354,7 @@ static int sunxi_sram_probe(struct platform_device *pdev)if (!d)return -ENOMEM ; -if (variant->has_emac_clock) { +if (variant->num_emac_clocks >0 ) { emac_clock =devm_regmap_init_mmio (&pdev->dev, base, &sunxi_sram_emac_clock_regmap);
@@ -387,6 +398,10 @@ static const struct of_device_id sunxi_sram_dt_match[] = { .compatible = "allwinner,sun50i-h5-system-control", .data = &sun50i_a64_sramc_variant, }, + { + .compatible = "allwinner,sun50i-h616-system-control", + .data = &sun50i_h616_sramc_variant, + }, { }, };MODULE_DEVICE_TABLE (of, sunxi_sram_dt_match);
Signature · 7 lines
2.17.5 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
PATCH v2 13/21 net: stmmac: dwmac-sun8i: Prepare for second EMAC clock register
In reply to Andre PrzywaraThe Allwinner H616 SoC has two EMAC controllers, with the second one being tied to the internal PHY, but also using a separate EMAC clock register.
To tell the driver about which clock register to use, we add a parameter to our syscon phandle. The driver will use this value as an index into the regmap, so that we can address more than the first register, if needed.
--- drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-)
drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c +10 -2
@@ -1129,6 +1129,8 @@ static int sun8i_dwmac_probe(struct platform_device *pdev)struct stmmac_priv *priv;struct net_device *ndev;struct regmap *regmap; +struct reg_field syscon_field; +u32 syscon_idx =0 ; ret =stmmac_get_platform_resources (pdev, &stmmac_res);if (ret)
@@ -1190,8 +1192,12 @@ static int sun8i_dwmac_probe(struct platform_device *pdev)return ret; } - gmac->regmap_field =devm_regmap_field_alloc (dev, regmap, - *gmac->variant->syscon_field); + syscon_field = *gmac->variant->syscon_field; + ret =of_property_read_u32_index (pdev->dev.of_node,"syscon" ,1 , + &syscon_idx); +if (!ret) + syscon_field.reg += syscon_idx *sizeof (u32); + gmac->regmap_field =devm_regmap_field_alloc (dev, regmap, syscon_field);if (IS_ERR (gmac->regmap_field)) { ret =PTR_ERR (gmac->regmap_field);dev_err (dev,"Unable to map syscon register: %d\n" , ret);
@@ -1263,6 +1269,8 @@ static const struct of_device_id sun8i_dwmac_match[] = { .data = &emac_variant_a64 }, { .compatible = "allwinner,sun50i-h6-emac", .data = &emac_variant_h6 }, + { .compatible = "allwinner,sun50i-h616-emac", + .data = &emac_variant_h6 }, { } };MODULE_DEVICE_TABLE (of, sun8i_dwmac_match);
Signature · 7 lines
2.17.5 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
PATCH v2 14/21 phy: sun4i-usb: Rework "pmu_unk1" handling
In reply to Andre PrzywaraNewer SoCs (A100, H616) need to clear a different bit in our "unknown" PMU PHY register.
Generalise the existing code by allowing configs to specify a bitmask of bits to clear.
--- drivers/phy/allwinner/phy-sun4i-usb.c | 28 +++++++++++---------------- 1 file changed, 11 insertions(+), 17 deletions(-)
drivers/phy/allwinner/phy-sun4i-usb.c +11 -17
@@ -115,9 +115,9 @@ struct sun4i_usb_phy_cfg {int hsic_index;enum sun4i_usb_phy_type type;u32 disc_thresh; +u32 pmu_unk1_clrbits;u8 phyctl_offset;bool dedicated_clocks; -bool enable_pmu_unk1;bool phy0_dual_route;int missing_phys; };
@@ -288,6 +288,12 @@ static int sun4i_usb_phy_init(struct phy *_phy)return ret; } +if (phy->pmu && data->cfg->pmu_unk1_clrbits) { + val =readl (phy->pmu +REG_PMU_UNK1 ); + val &= ~data->cfg->pmu_unk1_clrbits; +writel (val, phy->pmu +REG_PMU_UNK1 ); + } +if (data->cfg->type == sun8i_a83t_phy || data->cfg->type == sun50i_h6_phy) {if (phy->index ==0 ) {
@@ -297,11 +303,6 @@ static int sun4i_usb_phy_init(struct phy *_phy)writel (val, data->base + data->cfg->phyctl_offset); } }else { -if (phy->pmu && data->cfg->enable_pmu_unk1) { - val =readl (phy->pmu +REG_PMU_UNK1 ); -writel (val & ~2 , phy->pmu +REG_PMU_UNK1 ); - } -/* Enable USB 45 Ohm resistor calibration */ if (phy->index ==0 )sun4i_usb_phy_write (phy,PHY_RES45_CAL_EN ,0x01 ,1 );
@@ -867,7 +868,6 @@ static const struct sun4i_usb_phy_cfg sun4i_a10_cfg = { .disc_thresh = 3, .phyctl_offset = REG_PHYCTL_A10, .dedicated_clocks = false, - .enable_pmu_unk1 = false, };static const struct sun4i_usb_phy_cfg sun5i_a13_cfg = {
@@ -876,7 +876,6 @@ static const struct sun4i_usb_phy_cfg sun5i_a13_cfg = { .disc_thresh = 2, .phyctl_offset = REG_PHYCTL_A10, .dedicated_clocks = false, - .enable_pmu_unk1 = false, };static const struct sun4i_usb_phy_cfg sun6i_a31_cfg = {
@@ -885,7 +884,6 @@ static const struct sun4i_usb_phy_cfg sun6i_a31_cfg = { .disc_thresh = 3, .phyctl_offset = REG_PHYCTL_A10, .dedicated_clocks = true, - .enable_pmu_unk1 = false, };static const struct sun4i_usb_phy_cfg sun7i_a20_cfg = {
@@ -894,7 +892,6 @@ static const struct sun4i_usb_phy_cfg sun7i_a20_cfg = { .disc_thresh = 2, .phyctl_offset = REG_PHYCTL_A10, .dedicated_clocks = false, - .enable_pmu_unk1 = false, };static const struct sun4i_usb_phy_cfg sun8i_a23_cfg = {
@@ -903,7 +900,6 @@ static const struct sun4i_usb_phy_cfg sun8i_a23_cfg = { .disc_thresh = 3, .phyctl_offset = REG_PHYCTL_A10, .dedicated_clocks = true, - .enable_pmu_unk1 = false, };static const struct sun4i_usb_phy_cfg sun8i_a33_cfg = {
@@ -912,7 +908,6 @@ static const struct sun4i_usb_phy_cfg sun8i_a33_cfg = { .disc_thresh = 3, .phyctl_offset = REG_PHYCTL_A33, .dedicated_clocks = true, - .enable_pmu_unk1 = false, };static const struct sun4i_usb_phy_cfg sun8i_a83t_cfg = {
@@ -929,7 +924,7 @@ static const struct sun4i_usb_phy_cfg sun8i_h3_cfg = { .disc_thresh = 3, .phyctl_offset = REG_PHYCTL_A33, .dedicated_clocks = true, - .enable_pmu_unk1 = true, + .pmu_unk1_clrbits = BIT(1), .phy0_dual_route = true, };
@@ -939,7 +934,7 @@ static const struct sun4i_usb_phy_cfg sun8i_r40_cfg = { .disc_thresh = 3, .phyctl_offset = REG_PHYCTL_A33, .dedicated_clocks = true, - .enable_pmu_unk1 = true, + .pmu_unk1_clrbits = BIT(1), .phy0_dual_route = true, };
@@ -949,7 +944,7 @@ static const struct sun4i_usb_phy_cfg sun8i_v3s_cfg = { .disc_thresh = 3, .phyctl_offset = REG_PHYCTL_A33, .dedicated_clocks = true, - .enable_pmu_unk1 = true, + .pmu_unk1_clrbits = BIT(1), .phy0_dual_route = true, };
@@ -959,7 +954,7 @@ static const struct sun4i_usb_phy_cfg sun50i_a64_cfg = { .disc_thresh = 3, .phyctl_offset = REG_PHYCTL_A33, .dedicated_clocks = true, - .enable_pmu_unk1 = true, + .pmu_unk1_clrbits = BIT(1), .phy0_dual_route = true, };
@@ -969,7 +964,6 @@ static const struct sun4i_usb_phy_cfg sun50i_h6_cfg = { .disc_thresh = 3, .phyctl_offset = REG_PHYCTL_A33, .dedicated_clocks = true, - .enable_pmu_unk1 = true, .phy0_dual_route = true, .missing_phys = BIT(1) | BIT(2), };
Signature · 7 lines
2.17.5 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Re: [PATCH v2 14/21] phy: sun4i-usb: Rework "pmu_unk1" handling
Quoted 3 lines · 在 2020-12-11星期五的 01:19 +0000,Andre Przywara写道:
Newer SoCs (A100, H616) need to clear a different bit in our "unknown"
PMU PHY register.
It looks like that the unknown PHY register is PHYCTL register for each individual PHY, and the bit that is cleared is
called SUNXI_HCI_PHY_CTRL_SIDDQ in the BSP (similar to
the USBC_PHY_CTL_SIDDQ we cleared for main PHYCTL).
Quoted 155 lines
Generalise the existing code by allowing configs to specify a bitmask of bits to clear.
Signed-off-by Andre Przywara <[email protected]>--- drivers/phy/allwinner/phy-sun4i-usb.c | 28 +++++++++++------------ ---- 1 file changed, 11 insertions(+), 17 deletions(-)drivers/phy/allwinner/phy-sun4i-usb.c +7
-6@@ -115,9 +115,9 @@ struct sun4i_usb_phy_cfg {int hsic_index;enum sun4i_usb_phy_type type;u32 disc_thresh; +u32 pmu_unk1_clrbits;u8 phyctl_offset;bool dedicated_clocks; -bool enable_pmu_unk1;bool phy0_dual_route;int missing_phys; };@@ -288,6 +288,12 @@ static int sun4i_usb_phy_init(struct phy *_phy)return ret; } +if (phy->pmu && data->cfg->pmu_unk1_clrbits) { + val =readl (phy->pmu +REG_PMU_UNK1 ); + val &= ~data->cfg->pmu_unk1_clrbits; +writel (val, phy->pmu +REG_PMU_UNK1 ); + } +if (data->cfg->type == sun8i_a83t_phy || data->cfg->type == sun50i_h6_phy) {if (phy->index ==0 ) {@@ -297,11 +303,6 @@ static int sun4i_usb_phy_init(struct phy *_phy)writel (val, data->base + data->cfg- >phyctl_offset); } }else { -if (phy->pmu && data->cfg->enable_pmu_unk1) { - val =readl (phy->pmu +REG_PMU_UNK1 ); -writel (val & ~2 , phy->pmu +REG_PMU_UNK1 ); - } -/* Enable USB 45 Ohm resistor calibration */ if (phy->index ==0 )sun4i_usb_phy_write(phy,
PHY_RES45_CAL_EN,0x01, 1);drivers/phy/allwinner/phy-sun4i-usb.c +0
-1@@ -867,7 +868,6 @@ static const struct sun4i_usb_phy_cfg sun4i_a10_cfg = { .disc_thresh = 3, .phyctl_offset = REG_PHYCTL_A10, .dedicated_clocks = false, - .enable_pmu_unk1 = false, };static const struct
sun4i_usb_phy_cfgsun5i_a13_cfg= {drivers/phy/allwinner/phy-sun4i-usb.c +0
-1@@ -876,7 +876,6 @@ static const struct sun4i_usb_phy_cfg sun5i_a13_cfg = { .disc_thresh = 2, .phyctl_offset = REG_PHYCTL_A10, .dedicated_clocks = false, - .enable_pmu_unk1 = false, };static const struct
sun4i_usb_phy_cfgsun6i_a31_cfg= {drivers/phy/allwinner/phy-sun4i-usb.c +0
-1@@ -885,7 +884,6 @@ static const struct sun4i_usb_phy_cfg sun6i_a31_cfg = { .disc_thresh = 3, .phyctl_offset = REG_PHYCTL_A10, .dedicated_clocks = true, - .enable_pmu_unk1 = false, };static const struct
sun4i_usb_phy_cfgsun7i_a20_cfg= {drivers/phy/allwinner/phy-sun4i-usb.c +0
-1@@ -894,7 +892,6 @@ static const struct sun4i_usb_phy_cfg sun7i_a20_cfg = { .disc_thresh = 2, .phyctl_offset = REG_PHYCTL_A10, .dedicated_clocks = false, - .enable_pmu_unk1 = false, };static const struct
sun4i_usb_phy_cfgsun8i_a23_cfg= {drivers/phy/allwinner/phy-sun4i-usb.c +0
-1@@ -903,7 +900,6 @@ static const struct sun4i_usb_phy_cfg sun8i_a23_cfg = { .disc_thresh = 3, .phyctl_offset = REG_PHYCTL_A10, .dedicated_clocks = true, - .enable_pmu_unk1 = false, };static const struct
sun4i_usb_phy_cfgsun8i_a33_cfg= {drivers/phy/allwinner/phy-sun4i-usb.c +0
-1@@ -912,7 +908,6 @@ static const struct sun4i_usb_phy_cfg sun8i_a33_cfg = { .disc_thresh = 3, .phyctl_offset = REG_PHYCTL_A33, .dedicated_clocks = true, - .enable_pmu_unk1 = false, };static const struct
sun4i_usb_phy_cfgsun8i_a83t_cfg= {drivers/phy/allwinner/phy-sun4i-usb.c +4
-5@@ -929,7 +924,7 @@ static const struct sun4i_usb_phy_cfg sun8i_h3_cfg = { .disc_thresh = 3, .phyctl_offset = REG_PHYCTL_A33, .dedicated_clocks = true, - .enable_pmu_unk1 = true, + .pmu_unk1_clrbits = BIT(1), .phy0_dual_route = true, };@@ -939,7 +934,7 @@ static const struct sun4i_usb_phy_cfg sun8i_r40_cfg = { .disc_thresh = 3, .phyctl_offset = REG_PHYCTL_A33, .dedicated_clocks = true, - .enable_pmu_unk1 = true, + .pmu_unk1_clrbits = BIT(1), .phy0_dual_route = true, };@@ -949,7 +944,7 @@ static const struct sun4i_usb_phy_cfg sun8i_v3s_cfg = { .disc_thresh = 3, .phyctl_offset = REG_PHYCTL_A33, .dedicated_clocks = true, - .enable_pmu_unk1 = true, + .pmu_unk1_clrbits = BIT(1), .phy0_dual_route = true, };@@ -959,7 +954,7 @@ static const struct sun4i_usb_phy_cfg sun50i_a64_cfg = { .disc_thresh = 3, .phyctl_offset = REG_PHYCTL_A33, .dedicated_clocks = true, - .enable_pmu_unk1 = true, + .pmu_unk1_clrbits = BIT(1), .phy0_dual_route = true, };@@ -969,7 +964,6 @@ static const struct sun4i_usb_phy_cfg sun50i_h6_cfg = { .disc_thresh = 3, .phyctl_offset = REG_PHYCTL_A33, .dedicated_clocks = true, - .enable_pmu_unk1 = true, .phy0_dual_route = true, .missing_phys = BIT(1) | BIT(2),
Quoted 1 line
};
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Re: [PATCH v2 14/21] phy: sun4i-usb: Rework "pmu_unk1" handling
Quoted 9 lines · Icenowy Zheng
Quoted 3 lines · 在 2020-12-11星期五的 01:19 +0000,Andre Przywara写道:
Newer SoCs (A100, H616) need to clear a different bit in our "unknown"
PMU PHY register.It looks like that the unknown PHY register is PHYCTL register for each individual PHY, and the bit that is cleared is
calledSUNXI_HCI_PHY_CTRL_SIDDQin the BSP (similar to
theUSBC_PHY_CTL_SIDDQwe cleared for main PHYCTL).
Oh, right, somehow I failed to find this in the BSP, I guess I got confused over that similar symbol. I will put proper names to it.
Thanks!
Andre
Quoted 156 lines
Quoted 156 lines
Generalise the existing code by allowing configs to specify a bitmask of bits to clear.
Signed-off-by Andre Przywara <[email protected]>--- drivers/phy/allwinner/phy-sun4i-usb.c | 28 +++++++++++------------ ---- 1 file changed, 11 insertions(+), 17 deletions(-)drivers/phy/allwinner/phy-sun4i-usb.c +7
-6@@ -115,9 +115,9 @@ struct sun4i_usb_phy_cfg {int hsic_index;enum sun4i_usb_phy_type type;u32 disc_thresh; +u32 pmu_unk1_clrbits;u8 phyctl_offset;bool dedicated_clocks; -bool enable_pmu_unk1;bool phy0_dual_route;int missing_phys; };@@ -288,6 +288,12 @@ static int sun4i_usb_phy_init(struct phy *_phy)return ret; } +if (phy->pmu && data->cfg->pmu_unk1_clrbits) { + val =readl (phy->pmu +REG_PMU_UNK1 ); + val &= ~data->cfg->pmu_unk1_clrbits; +writel (val, phy->pmu +REG_PMU_UNK1 ); + } +if (data->cfg->type == sun8i_a83t_phy || data->cfg->type == sun50i_h6_phy) {if (phy->index ==0 ) {@@ -297,11 +303,6 @@ static int sun4i_usb_phy_init(struct phy *_phy)writel (val, data->base + data->cfg- > phyctl_offset); } }else { -if (phy->pmu && data->cfg->enable_pmu_unk1) { - val =readl (phy->pmu +REG_PMU_UNK1 ); -writel (val & ~2 , phy->pmu +REG_PMU_UNK1 ); - } -/* Enable USB 45 Ohm resistor calibration */ if (phy->index ==0 )sun4i_usb_phy_write(phy,
PHY_RES45_CAL_EN,0x01, 1);drivers/phy/allwinner/phy-sun4i-usb.c +0
-1@@ -867,7 +868,6 @@ static const struct sun4i_usb_phy_cfg sun4i_a10_cfg = { .disc_thresh = 3, .phyctl_offset = REG_PHYCTL_A10, .dedicated_clocks = false, - .enable_pmu_unk1 = false, };static const struct
sun4i_usb_phy_cfgsun5i_a13_cfg= {drivers/phy/allwinner/phy-sun4i-usb.c +0
-1@@ -876,7 +876,6 @@ static const struct sun4i_usb_phy_cfg sun5i_a13_cfg = { .disc_thresh = 2, .phyctl_offset = REG_PHYCTL_A10, .dedicated_clocks = false, - .enable_pmu_unk1 = false, };static const struct
sun4i_usb_phy_cfgsun6i_a31_cfg= {drivers/phy/allwinner/phy-sun4i-usb.c +0
-1@@ -885,7 +884,6 @@ static const struct sun4i_usb_phy_cfg sun6i_a31_cfg = { .disc_thresh = 3, .phyctl_offset = REG_PHYCTL_A10, .dedicated_clocks = true, - .enable_pmu_unk1 = false, };static const struct
sun4i_usb_phy_cfgsun7i_a20_cfg= {drivers/phy/allwinner/phy-sun4i-usb.c +0
-1@@ -894,7 +892,6 @@ static const struct sun4i_usb_phy_cfg sun7i_a20_cfg = { .disc_thresh = 2, .phyctl_offset = REG_PHYCTL_A10, .dedicated_clocks = false, - .enable_pmu_unk1 = false, };static const struct
sun4i_usb_phy_cfgsun8i_a23_cfg= {drivers/phy/allwinner/phy-sun4i-usb.c +0
-1@@ -903,7 +900,6 @@ static const struct sun4i_usb_phy_cfg sun8i_a23_cfg = { .disc_thresh = 3, .phyctl_offset = REG_PHYCTL_A10, .dedicated_clocks = true, - .enable_pmu_unk1 = false, };static const struct
sun4i_usb_phy_cfgsun8i_a33_cfg= {drivers/phy/allwinner/phy-sun4i-usb.c +0
-1@@ -912,7 +908,6 @@ static const struct sun4i_usb_phy_cfg sun8i_a33_cfg = { .disc_thresh = 3, .phyctl_offset = REG_PHYCTL_A33, .dedicated_clocks = true, - .enable_pmu_unk1 = false, };static const struct
sun4i_usb_phy_cfgsun8i_a83t_cfg= {drivers/phy/allwinner/phy-sun4i-usb.c +4
-5@@ -929,7 +924,7 @@ static const struct sun4i_usb_phy_cfg sun8i_h3_cfg = { .disc_thresh = 3, .phyctl_offset = REG_PHYCTL_A33, .dedicated_clocks = true, - .enable_pmu_unk1 = true, + .pmu_unk1_clrbits = BIT(1), .phy0_dual_route = true, };@@ -939,7 +934,7 @@ static const struct sun4i_usb_phy_cfg sun8i_r40_cfg = { .disc_thresh = 3, .phyctl_offset = REG_PHYCTL_A33, .dedicated_clocks = true, - .enable_pmu_unk1 = true, + .pmu_unk1_clrbits = BIT(1), .phy0_dual_route = true, };@@ -949,7 +944,7 @@ static const struct sun4i_usb_phy_cfg sun8i_v3s_cfg = { .disc_thresh = 3, .phyctl_offset = REG_PHYCTL_A33, .dedicated_clocks = true, - .enable_pmu_unk1 = true, + .pmu_unk1_clrbits = BIT(1), .phy0_dual_route = true, };@@ -959,7 +954,7 @@ static const struct sun4i_usb_phy_cfg sun50i_a64_cfg = { .disc_thresh = 3, .phyctl_offset = REG_PHYCTL_A33, .dedicated_clocks = true, - .enable_pmu_unk1 = true, + .pmu_unk1_clrbits = BIT(1), .phy0_dual_route = true, };@@ -969,7 +964,6 @@ static const struct sun4i_usb_phy_cfg sun50i_h6_cfg = { .disc_thresh = 3, .phyctl_offset = REG_PHYCTL_A33, .dedicated_clocks = true, - .enable_pmu_unk1 = true, .phy0_dual_route = true, .missing_phys = BIT(1) | BIT(2),};
Re: [PATCH v2 14/21] phy: sun4i-usb: Rework "pmu_unk1" handling
Quoted 11 lines · 在 2020-12-14星期一的 01:35 +0000,André Przywara写道:
Quoted 10 lines · Icenowy Zheng
Quoted 3 lines · 在 2020-12-11星期五的 01:19 +0000,Andre Przywara写道:
Newer SoCs (A100, H616) need to clear a different bit in our "unknown"
PMU PHY register.It looks like that the unknown PHY register is PHYCTL register for each
individual PHY, and the bit that is cleared is
calledSUNXI_HCI_PHY_CTRL_SIDDQin the BSP (similar to theUSBC_PHY_CTL_SIDDQwe cleared for main PHYCTL).
In addition, both the BIT(1) in old PHYs and the BIT(3) in new PHYs are SIDDQ. (In BSP it's a #define inside #if)
Should we add some flag for 28nm PHY?
Quoted 3 lines
Oh, right, somehow I failed to find this in the BSP, I guess I got confused over that similar symbol. I will put proper names to it.
In addition, the region at 0x800 is not PMU at all, but some [OE]HCI- related control registers. The name "PMU" can only cover the first register here.
We may need to address this.
Quoted 154 lines
Thanks!
AndreQuoted 150 lines
Quoted 150 lines
Generalise the existing code by allowing configs to specify a bitmask
of bits to clear.Signed-off-by Andre Przywara <[email protected]>--- drivers/phy/allwinner/phy-sun4i-usb.c | 28 +++++++++++-------- ---- ---- 1 file changed, 11 insertions(+), 17 deletions(-)drivers/phy/allwinner/phy-sun4i-usb.c +7
-1@@ -115,9 +115,9 @@ struct sun4i_usb_phy_cfg {int hsic_index;enum sun4i_usb_phy_type type;u32 disc_thresh; +u32 pmu_unk1_clrbits;u8 phyctl_offset;bool dedicated_clocks; -bool enable_pmu_unk1;bool phy0_dual_route;int missing_phys; };@@ -288,6 +288,12 @@ static int sun4i_usb_phy_init(struct phy *_phy)return ret; } +if (phy->pmu && data->cfg->pmu_unk1_clrbits) { + val =readl (phy->pmu +REG_PMU_UNK1 ); + val &= ~data->cfg->pmu_unk1_clrbits; +writel (val, phy->pmu +REG_PMU_UNK1 ); + } +if (data->cfg->type == sun8i_a83t_phy || data->cfg->type == sun50i_h6_phy) {drivers/phy/allwinner/phy-sun4i-usb.c +0
-5if (phy->index ==0 ) {@@ -297,11 +303,6 @@ static int sun4i_usb_phy_init(struct phy *_phy)writel (val, data->base + data->cfg- > phyctl_offset); } }else { -if (phy->pmu && data->cfg->enable_pmu_unk1) { - val =readl (phy->pmu +REG_PMU_UNK1 ); -writel (val & ~2 , phy->pmu +REG_PMU_UNK1 ); - } -/* Enable USB 45 Ohm resistor calibration */ drivers/phy/allwinner/phy-sun4i-usb.c +0
-0if (phy->index ==0 ) sun4i_usb_phy_write(phy, PHY_RES45_CAL_EN,
0x01, 1);drivers/phy/allwinner/phy-sun4i-usb.c +0
-1@@ -867,7 +868,6 @@ static const struct sun4i_usb_phy_cfg sun4i_a10_cfg = { .disc_thresh = 3, .phyctl_offset = REG_PHYCTL_A10, .dedicated_clocks = false, - .enable_pmu_unk1 = false, };static const struct
sun4i_usb_phy_cfgsun5i_a13_cfg= {drivers/phy/allwinner/phy-sun4i-usb.c +0
-1@@ -876,7 +876,6 @@ static const struct sun4i_usb_phy_cfg sun5i_a13_cfg = { .disc_thresh = 2, .phyctl_offset = REG_PHYCTL_A10, .dedicated_clocks = false, - .enable_pmu_unk1 = false, };static const struct
sun4i_usb_phy_cfgsun6i_a31_cfg= {drivers/phy/allwinner/phy-sun4i-usb.c +0
-1@@ -885,7 +884,6 @@ static const struct sun4i_usb_phy_cfg sun6i_a31_cfg = { .disc_thresh = 3, .phyctl_offset = REG_PHYCTL_A10, .dedicated_clocks = true, - .enable_pmu_unk1 = false, };static const struct
sun4i_usb_phy_cfgsun7i_a20_cfg= {drivers/phy/allwinner/phy-sun4i-usb.c +0
-1@@ -894,7 +892,6 @@ static const struct sun4i_usb_phy_cfg sun7i_a20_cfg = { .disc_thresh = 2, .phyctl_offset = REG_PHYCTL_A10, .dedicated_clocks = false, - .enable_pmu_unk1 = false, };static const struct
sun4i_usb_phy_cfgsun8i_a23_cfg= {drivers/phy/allwinner/phy-sun4i-usb.c +0
-1@@ -903,7 +900,6 @@ static const struct sun4i_usb_phy_cfg sun8i_a23_cfg = { .disc_thresh = 3, .phyctl_offset = REG_PHYCTL_A10, .dedicated_clocks = true, - .enable_pmu_unk1 = false, };static const struct
sun4i_usb_phy_cfgsun8i_a33_cfg= {drivers/phy/allwinner/phy-sun4i-usb.c +0
-1@@ -912,7 +908,6 @@ static const struct sun4i_usb_phy_cfg sun8i_a33_cfg = { .disc_thresh = 3, .phyctl_offset = REG_PHYCTL_A33, .dedicated_clocks = true, - .enable_pmu_unk1 = false, };static const struct
sun4i_usb_phy_cfgsun8i_a83t_cfg= {drivers/phy/allwinner/phy-sun4i-usb.c +4
-4@@ -929,7 +924,7 @@ static const struct sun4i_usb_phy_cfg sun8i_h3_cfg = { .disc_thresh = 3, .phyctl_offset = REG_PHYCTL_A33, .dedicated_clocks = true, - .enable_pmu_unk1 = true, + .pmu_unk1_clrbits = BIT(1), .phy0_dual_route = true, };@@ -939,7 +934,7 @@ static const struct sun4i_usb_phy_cfg sun8i_r40_cfg = { .disc_thresh = 3, .phyctl_offset = REG_PHYCTL_A33, .dedicated_clocks = true, - .enable_pmu_unk1 = true, + .pmu_unk1_clrbits = BIT(1), .phy0_dual_route = true, };@@ -949,7 +944,7 @@ static const struct sun4i_usb_phy_cfg sun8i_v3s_cfg = { .disc_thresh = 3, .phyctl_offset = REG_PHYCTL_A33, .dedicated_clocks = true, - .enable_pmu_unk1 = true, + .pmu_unk1_clrbits = BIT(1), .phy0_dual_route = true, };@@ -959,7 +954,7 @@ static const struct sun4i_usb_phy_cfg sun50i_a64_cfg = { .disc_thresh = 3, .phyctl_offset = REG_PHYCTL_A33, .dedicated_clocks = true, - .enable_pmu_unk1 = true, + .pmu_unk1_clrbits = BIT(1), .phy0_dual_route = true, };
Quoted 9 lines
Quoted 9 lines
Quoted 9 lines
drivers/phy/allwinner/phy-sun4i-usb.c +0
-1@@ -969,7 +964,6 @@ static const struct sun4i_usb_phy_cfg sun50i_h6_cfg = { .disc_thresh = 3, .phyctl_offset = REG_PHYCTL_A33, .dedicated_clocks = true, - .enable_pmu_unk1 = true, .phy0_dual_route = true, .missing_phys = BIT(1) | BIT(2),};
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
PATCH v2 15/21 phy: sun4i-usb: Add support for the H616 USB PHY
In reply to Andre PrzywaraThe USB PHY used in the Allwinner H616 SoC inherits some traits from its various predecessors: it has four full PHYs like the H3, needs some extra bits to be set like the H6, and clears a different bit in the PMU_UNK1 register like the A100.
Name all those properties in a new config struct and assign a new compatible name to it.
--- drivers/phy/allwinner/phy-sun4i-usb.c | 11 +++++++++++ 1 file changed, 11 insertions(+)
drivers/phy/allwinner/phy-sun4i-usb.c +11 -0
@@ -968,6 +968,16 @@ static const struct sun4i_usb_phy_cfg sun50i_h6_cfg = { .missing_phys = BIT(1) | BIT(2), }; +static const struct sun4i_usb_phy_cfg sun50i_h616_cfg = { + .num_phys =4 , + .type = sun50i_h6_phy, + .disc_thresh =3 , + .phyctl_offset =REG_PHYCTL_A33 , + .dedicated_clocks = true, + .phy0_dual_route = true, + .pmu_unk1_clrbits =BIT (3 ), +}; +static const struct of_device_id sun4i_usb_phy_of_match[] = { { .compatible ="allwinner,sun4i-a10-usb-phy" , .data = &sun4i_a10_cfg }, { .compatible ="allwinner,sun5i-a13-usb-phy" , .data = &sun5i_a13_cfg },
@@ -982,6 +992,7 @@ static const struct of_device_id sun4i_usb_phy_of_match[] = { { .compatible = "allwinner,sun50i-a64-usb-phy", .data = &sun50i_a64_cfg}, { .compatible = "allwinner,sun50i-h6-usb-phy", .data = &sun50i_h6_cfg }, + { .compatible = "allwinner,sun50i-h616-usb-phy", .data = &sun50i_h616_cfg }, { }, };MODULE_DEVICE_TABLE (of, sun4i_usb_phy_of_match);
Signature · 7 lines
2.17.5 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Re: [PATCH v2 15/21] phy: sun4i-usb: Add support for the H616 USB PHY
Quoted 9 lines · Andre Przywara
The USB PHY used in the Allwinner H616 SoC inherits some traits from its various predecessors: it has four full PHYs like the H3, needs some extra bits to be set like the H6, and clears a different bit in the
PMU_UNK1register like the A100.Name all those properties in a new config struct and assign a new compatible name to it.
Signed-off-by Andre Przywara <[email protected]>
It looks like you forgot the binding for that one?
Maxime
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
PATCH v2 16/21 dt-bindings: watchdog: sun4i: Add A100 compatible
In reply to Andre PrzywaraFrom: Yangtao Li <[email protected]>
Add a binding for A100's watchdog controller.
--- .../devicetree/bindings/watchdog/allwinner,sun4i-a10-wdt.yaml | 3 +++ 1 file changed, 3 insertions(+)
Documentation/devicetree/bindings/watchdog/allwinner,sun4i-a10-wdt.yaml +3 -0
@@ -21,6 +21,9 @@ properties: - items: - const: allwinner,sun50i-a64-wdt - const: allwinner,sun6i-a31-wdt + - items: + - const: allwinner,sun50i-a100-wdt + - const: allwinner,sun6i-a31-wdt - items: - const: allwinner,sun50i-h6-wdt - const: allwinner,sun6i-a31-wdt
Signature · 1 line
2.17.5
Re: [PATCH v2 16/21] dt-bindings: watchdog: sun4i: Add A100 compatible
Quoted 7 lines · Andre Przywara
From: Yangtao Li <[email protected]>
Add a binding for A100's watchdog controller.
Signed-off-by Yangtao Li <[email protected]>Acked-by Rob Herring <[email protected]>Signed-off-by Andre Przywara <[email protected]>
Quoted 18 lines
--- .../devicetree/bindings/watchdog/allwinner,sun4i-a10-wdt.yaml | 3 +++ 1 file changed, 3 insertions(+)Documentation/devicetree/bindings/watchdog/allwinner,sun4i-a10-wdt.yaml +3
-0@@ -21,6 +21,9 @@ properties: - items: - const: allwinner,sun50i-a64-wdt - const: allwinner,sun6i-a31-wdt + - items: + - const: allwinner,sun50i-a100-wdt + - const: allwinner,sun6i-a31-wdt - items: - const: allwinner,sun50i-h6-wdt - const: allwinner,sun6i-a31-wdt
PATCH v2 17/21 dt-bindings: watchdog: sun4i: Add H616 compatible string
In reply to Andre PrzywaraUse enums to group all compatible devices together on the way.
--- .../bindings/watchdog/allwinner,sun4i-a10-wdt.yaml | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-)
Documentation/devicetree/bindings/watchdog/allwinner,sun4i-a10-wdt.yaml +5 -7
@@ -19,13 +19,11 @@ properties: - const: allwinner,sun4i-a10-wdt - const: allwinner,sun6i-a31-wdt - items: - - const: allwinner,sun50i-a64-wdt - - const: allwinner,sun6i-a31-wdt - - items: - - const: allwinner,sun50i-a100-wdt - - const: allwinner,sun6i-a31-wdt - - items: - - const: allwinner,sun50i-h6-wdt + - enum: + - allwinner,sun50i-a64-wdt + - allwinner,sun50i-a100-wdt + - allwinner,sun50i-h6-wdt + - allwinner,sun50i-h616-wdt - const: allwinner,sun6i-a31-wdt - items: - const: allwinner,suniv-f1c100s-wdt
Signature · 1 line
2.17.5
Re: [PATCH v2 17/21] dt-bindings: watchdog: sun4i: Add H616 compatible string
Quoted 7 lines · Andre Przywara
Use enums to group all compatible devices together on the way.
Signed-off-by Andre Przywara <[email protected]>--- .../bindings/watchdog/allwinner,sun4i-a10-wdt.yaml | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-)
Re: [PATCH v2 17/21] dt-bindings: watchdog: sun4i: Add H616 compatible string
In reply to Andre PrzywaraQuoted 4 lines · Andre Przywara
Use enums to group all compatible devices together on the way.
Signed-off-by Andre Przywara <[email protected]>Acked-by Rob Herring <[email protected]>
Quoted 27 lines
--- .../bindings/watchdog/allwinner,sun4i-a10-wdt.yaml | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-)Documentation/devicetree/bindings/watchdog/allwinner,sun4i-a10-wdt.yaml +5
-7@@ -19,13 +19,11 @@ properties: - const: allwinner,sun4i-a10-wdt - const: allwinner,sun6i-a31-wdt - items: - - const: allwinner,sun50i-a64-wdt - - const: allwinner,sun6i-a31-wdt - - items: - - const: allwinner,sun50i-a100-wdt - - const: allwinner,sun6i-a31-wdt - - items: - - const: allwinner,sun50i-h6-wdt + - enum: + - allwinner,sun50i-a64-wdt + - allwinner,sun50i-a100-wdt + - allwinner,sun50i-h6-wdt + - allwinner,sun50i-h616-wdt - const: allwinner,sun6i-a31-wdt - items: - const: allwinner,suniv-f1c100s-wdt
PATCH v2 18/21 dt-bindings: allwinner: Add H616 compatible strings
In reply to Andre PrzywaraAdd simple "allwinner,sun50i-h616-xxx" compatible names to existing bindings, and pair them with an existing fallback compatible string, as the devices are compatible.
This covers I2C, infrared, RTC and SPI.
Use enums to group all compatible devices together.
--- .../bindings/i2c/marvell,mv64xxx-i2c.yaml | 21 +++++++------------ .../media/allwinner,sun4i-a10-ir.yaml | 16 ++++++-------- .../bindings/rtc/allwinner,sun6i-a31-rtc.yaml | 3 +++ .../bindings/spi/allwinner,sun6i-a31-spi.yaml | 1 + 4 files changed, 17 insertions(+), 24 deletions(-)
Documentation/devicetree/bindings/i2c/marvell,mv64xxx-i2c.yaml +7 -14
@@ -18,21 +18,14 @@ properties: - const: allwinner,sun4i-a10-i2c - const: allwinner,sun6i-a31-i2c - items: - - const: allwinner,sun8i-a23-i2c + - enum: + - allwinner,sun8i-a23-i2c + - allwinner,sun8i-a83t-i2c + - allwinner,sun50i-a64-i2c + - allwinner,sun50i-a100-i2c + - allwinner,sun50i-h6-i2c + - allwinner,sun50i-h616-i2c - const: allwinner,sun6i-a31-i2c - - items: - - const: allwinner,sun8i-a83t-i2c - - const: allwinner,sun6i-a31-i2c - - items: - - const: allwinner,sun50i-a64-i2c - - const: allwinner,sun6i-a31-i2c - - items: - - const: allwinner,sun50i-a100-i2c - - const: allwinner,sun6i-a31-i2c - - items: - - const: allwinner,sun50i-h6-i2c - - const: allwinner,sun6i-a31-i2c - - const: marvell,mv64xxx-i2c - const: marvell,mv78230-i2c - const: marvell,mv78230-a0-i2c
Documentation/devicetree/bindings/media/allwinner,sun4i-a10-ir.yaml +6 -10
@@ -20,16 +20,12 @@ properties: - const: allwinner,sun5i-a13-ir - const: allwinner,sun6i-a31-ir - items: - - const: allwinner,sun8i-a83t-ir - - const: allwinner,sun6i-a31-ir - - items: - - const: allwinner,sun8i-r40-ir - - const: allwinner,sun6i-a31-ir - - items: - - const: allwinner,sun50i-a64-ir - - const: allwinner,sun6i-a31-ir - - items: - - const: allwinner,sun50i-h6-ir + - enum: + - allwinner,sun8i-a83t-ir + - allwinner,sun8i-r40-ir + - allwinner,sun50i-a64-ir + - allwinner,sun50i-h6-ir + - allwinner,sun50i-h616-ir - const: allwinner,sun6i-a31-ir reg:
Documentation/devicetree/bindings/rtc/allwinner,sun6i-a31-rtc.yaml +3 -0
@@ -26,6 +26,9 @@ properties: - const: allwinner,sun50i-a64-rtc - const: allwinner,sun8i-h3-rtc - const: allwinner,sun50i-h6-rtc + - items: + - const: allwinner,sun50i-h616-rtc + - const: allwinner,sun50i-h6-rtc reg: maxItems: 1
Documentation/devicetree/bindings/spi/allwinner,sun6i-a31-spi.yaml +1 -0
@@ -25,6 +25,7 @@ properties: - enum: - allwinner,sun8i-r40-spi - allwinner,sun50i-h6-spi + - allwinner,sun50i-h616-spi - const: allwinner,sun8i-h3-spi reg:
Signature · 1 line
2.17.5
Re: [PATCH v2 18/21] dt-bindings: allwinner: Add H616 compatible strings
Quoted 7 lines · Andre Przywara
Add simple "allwinner,sun50i-h616-xxx" compatible names to existing bindings, and pair them with an existing fallback compatible string, as the devices are compatible.
This covers I2C, infrared, RTC and SPI.Use enums to group all compatible devices together.
Quoted 8 lines
Signed-off-by Andre Przywara <[email protected]>--- .../bindings/i2c/marvell,mv64xxx-i2c.yaml | 21 +++++++------------ .../media/allwinner,sun4i-a10-ir.yaml | 16 ++++++-------- .../bindings/rtc/allwinner,sun6i-a31-rtc.yaml | 3 +++ .../bindings/spi/allwinner,sun6i-a31-spi.yaml | 1 + 4 files changed, 17 insertions(+), 24 deletions(-)
Re: [PATCH v2 18/21] dt-bindings: allwinner: Add H616 compatible strings
In reply to Andre PrzywaraQuoted 8 lines · Andre Przywara
Add simple "allwinner,sun50i-h616-xxx" compatible names to existing bindings, and pair them with an existing fallback compatible string, as the devices are compatible.
This covers I2C, infrared, RTC and SPI.Use enums to group all compatible devices together.
Signed-off-by Andre Przywara <[email protected]>
PATCH v2 19/21 arm64: dts: allwinner: Add Allwinner H616 .dtsi file
In reply to Andre PrzywaraThis (relatively) new SoC is similar to the H6, but drops the (broken) PCIe support and the USB 3.0 controller. It also gets the management controller removed, which in turn removes *some*, but not all of the devices formerly dedicated to the ARISC (CPUS).
There does not seem to be an extra interrupt controller anymore, also it lacks the corresponding NMI pin, so no interrupts for the PMIC.
--- .../arm64/boot/dts/allwinner/sun50i-h616.dtsi | 715 ++++++++++++++++++ 1 file changed, 715 insertions(+) create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi
arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi new file +715 -0
@@ -0,0 +1,715 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// Copyright (C) 2020 Arm Ltd. +// based on the H6 dtsi, which is: +// Copyright (C) 2017 Icenowy Zheng <[email protected]> + +#include <dt-bindings/interrupt-controller/arm-gic.h> +#include <dt-bindings/clock/sun50i-h616-ccu.h> +#include <dt-bindings/clock/sun50i-h6-r-ccu.h> +#include <dt-bindings/reset/sun50i-h616-ccu.h> +#include <dt-bindings/reset/sun50i-h6-r-ccu.h> + +/ { + interrupt-parent = <&gic>; + #address-cells = <2>; + #size-cells = <2>; + + cpus { + #address-cells = <1>; + #size-cells = <0>; + + cpu0: cpu@0 { + compatible = "arm,cortex-a53"; + device_type = "cpu"; + reg = <0>; + enable-method = "psci"; + clocks = <&ccu CLK_CPUX>; + }; + + cpu1: cpu@1 { + compatible = "arm,cortex-a53"; + device_type = "cpu"; + reg = <1>; + enable-method = "psci"; + clocks = <&ccu CLK_CPUX>; + }; + + cpu2: cpu@2 { + compatible = "arm,cortex-a53"; + device_type = "cpu"; + reg = <2>; + enable-method = "psci"; + clocks = <&ccu CLK_CPUX>; + }; + + cpu3: cpu@3 { + compatible = "arm,cortex-a53"; + device_type = "cpu"; + reg = <3>; + enable-method = "psci"; + clocks = <&ccu CLK_CPUX>; + }; + }; + + reserved-memory { + #address-cells = <2>; + #size-cells = <2>; + ranges; + + /* 512KiB reserved for ARM Trusted Firmware (BL31) */ + secmon_reserved: secmon@40000000 { + reg = <0x0 0x40000000 0x0 0x80000>; + no-map; + }; + }; + + osc24M: osc24M_clk { + #clock-cells = <0>; + compatible = "fixed-clock"; + clock-frequency = <24000000>; + clock-output-names = "osc24M"; + }; + + pmu { + compatible = "arm,cortex-a53-pmu"; + interrupts = <GIC_SPI 140 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 141 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 142 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 143 IRQ_TYPE_LEVEL_HIGH>; + interrupt-affinity = <&cpu0>, <&cpu1>, <&cpu2>, <&cpu3>; + }; + + psci { + compatible = "arm,psci-0.2"; + method = "smc"; + }; + + timer { + compatible = "arm,armv8-timer"; + arm,no-tick-in-suspend; + interrupts = <GIC_PPI 13 + (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)>, + <GIC_PPI 14 + (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)>, + <GIC_PPI 11 + (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)>, + <GIC_PPI 10 + (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)>; + }; + + soc { + compatible = "simple-bus"; + #address-cells = <1>; + #size-cells = <1>; + ranges = <0x0 0x0 0x0 0x40000000>; + + syscon: syscon@3000000 { + compatible = "allwinner,sun50i-h616-system-control"; + reg = <0x03000000 0x1000>; + #address-cells = <1>; + #size-cells = <1>; + ranges; + + sram_c: sram@28000 { + compatible = "mmio-sram"; + reg = <0x00028000 0x30000>; + #address-cells = <1>; + #size-cells = <1>; + ranges = <0 0x00028000 0x30000>; + }; + }; + + ccu: clock@3001000 { + compatible = "allwinner,sun50i-h616-ccu"; + reg = <0x03001000 0x1000>; + clocks = <&osc24M>, <&rtc 0>, <&rtc 2>; + clock-names = "hosc", "losc", "iosc"; + #clock-cells = <1>; + #reset-cells = <1>; + }; + + watchdog: watchdog@30090a0 { + compatible = "allwinner,sun50i-h616-wdt", + "allwinner,sun6i-a31-wdt"; + reg = <0x030090a0 0x20>; + interrupts = <GIC_SPI 50 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&osc24M>; + status = "disabled"; + }; + + pio: pinctrl@300b000 { + compatible = "allwinner,sun50i-h616-pinctrl"; + reg = <0x0300b000 0x400>; + interrupts = <GIC_SPI 51 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 52 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 53 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 43 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 54 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 55 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 56 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 57 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&ccu CLK_APB1>, <&osc24M>, <&rtc 0>; + clock-names = "apb", "hosc", "losc"; + gpio-controller; + #gpio-cells = <3>; + interrupt-controller; + #interrupt-cells = <3>; + + ext_rgmii_pins: rgmii-pins { + pins = "PI0", "PI1", "PI2", "PI3", "PI4", + "PI5", "PI7", "PI8", "PI9", "PI10", + "PI11", "PI12", "PI13", "PI14", "PI15", + "PI16"; + function = "emac0"; + drive-strength = <40>; + }; + + i2c0_pins: i2c0-pins { + pins = "PI6", "PI7"; + function = "i2c0"; + }; + + i2c3_ph_pins: i2c3-ph-pins { + pins = "PH4", "PH5"; + function = "i2c3"; + }; + + ir_rx_pin: ir_rx_pin { + pins = "PH10"; + function = "ir_rx"; + }; + + mmc0_pins: mmc0-pins { + pins = "PF0", "PF1", "PF2", "PF3", + "PF4", "PF5"; + function = "mmc0"; + drive-strength = <30>; + bias-pull-up; + }; + + mmc1_pins: mmc1-pins { + pins = "PG0", "PG1", "PG2", "PG3", + "PG4", "PG5"; + function = "mmc1"; + drive-strength = <30>; + bias-pull-up; + }; + + mmc2_pins: mmc2-pins { + pins = "PC0", "PC1", "PC5", "PC6", + "PC8", "PC9", "PC10", "PC11", + "PC13", "PC14", "PC15", "PC16"; + function = "mmc2"; + drive-strength = <30>; + bias-pull-up; + }; + + spi0_pins: spi0-pins { + pins = "PC0", "PC2", "PC3", "PC4"; + function = "spi0"; + }; + + spi1_pins: spi1-pins { + pins = "PH6", "PH7", "PH8"; + function = "spi1"; + }; + + spi1_cs_pin: spi1-cs-pin { + pins = "PH5"; + function = "spi1"; + }; + + uart0_ph_pins: uart0-ph-pins { + pins = "PH0", "PH1"; + function = "uart0"; + }; + + uart1_pins: uart1-pins { + pins = "PG6", "PG7"; + function = "uart1"; + }; + + uart1_rts_cts_pins: uart1-rts-cts-pins { + pins = "PG8", "PG9"; + function = "uart1"; + }; + }; + + gic: interrupt-controller@3021000 { + compatible = "arm,gic-400"; + reg = <0x03021000 0x1000>, + <0x03022000 0x2000>, + <0x03024000 0x2000>, + <0x03026000 0x2000>; + interrupts = <GIC_PPI 9 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)>; + interrupt-controller; + #interrupt-cells = <3>; + }; + + mmc0: mmc@4020000 { + compatible = "allwinner,sun50i-h616-mmc", + "allwinner,sun50i-a100-mmc"; + reg = <0x04020000 0x1000>; + clocks = <&ccu CLK_BUS_MMC0>, <&ccu CLK_MMC0>; + clock-names = "ahb", "mmc"; + resets = <&ccu RST_BUS_MMC0>; + reset-names = "ahb"; + interrupts = <GIC_SPI 35 IRQ_TYPE_LEVEL_HIGH>; + pinctrl-names = "default"; + pinctrl-0 = <&mmc0_pins>; + status = "disabled"; + #address-cells = <1>; + #size-cells = <0>; + }; + + mmc1: mmc@4021000 { + compatible = "allwinner,sun50i-h616-mmc", + "allwinner,sun50i-a100-mmc"; + reg = <0x04021000 0x1000>; + clocks = <&ccu CLK_BUS_MMC1>, <&ccu CLK_MMC1>; + clock-names = "ahb", "mmc"; + resets = <&ccu RST_BUS_MMC1>; + reset-names = "ahb"; + interrupts = <GIC_SPI 36 IRQ_TYPE_LEVEL_HIGH>; + pinctrl-names = "default"; + pinctrl-0 = <&mmc1_pins>; + status = "disabled"; + #address-cells = <1>; + #size-cells = <0>; + }; + + mmc2: mmc@4022000 { + compatible = "allwinner,sun50i-h616-emmc", + "allwinner,sun50i-a100-emmc"; + reg = <0x04022000 0x1000>; + clocks = <&ccu CLK_BUS_MMC2>, <&ccu CLK_MMC2>; + clock-names = "ahb", "mmc"; + resets = <&ccu RST_BUS_MMC2>; + reset-names = "ahb"; + interrupts = <GIC_SPI 37 IRQ_TYPE_LEVEL_HIGH>; + pinctrl-names = "default"; + pinctrl-0 = <&mmc2_pins>; + status = "disabled"; + #address-cells = <1>; + #size-cells = <0>; + }; + + uart0: serial@5000000 { + compatible = "snps,dw-apb-uart"; + reg = <0x05000000 0x400>; + interrupts = <GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH>; + reg-shift = <2>; + reg-io-width = <4>; + clocks = <&ccu CLK_BUS_UART0>; + resets = <&ccu RST_BUS_UART0>; + status = "disabled"; + }; + + uart1: serial@5000400 { + compatible = "snps,dw-apb-uart"; + reg = <0x05000400 0x400>; + interrupts = <GIC_SPI 1 IRQ_TYPE_LEVEL_HIGH>; + reg-shift = <2>; + reg-io-width = <4>; + clocks = <&ccu CLK_BUS_UART1>; + resets = <&ccu RST_BUS_UART1>; + status = "disabled"; + }; + + uart2: serial@5000800 { + compatible = "snps,dw-apb-uart"; + reg = <0x05000800 0x400>; + interrupts = <GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH>; + reg-shift = <2>; + reg-io-width = <4>; + clocks = <&ccu CLK_BUS_UART2>; + resets = <&ccu RST_BUS_UART2>; + status = "disabled"; + }; + + uart3: serial@5000c00 { + compatible = "snps,dw-apb-uart"; + reg = <0x05000c00 0x400>; + interrupts = <GIC_SPI 3 IRQ_TYPE_LEVEL_HIGH>; + reg-shift = <2>; + reg-io-width = <4>; + clocks = <&ccu CLK_BUS_UART3>; + resets = <&ccu RST_BUS_UART3>; + status = "disabled"; + }; + + uart4: serial@5001000 { + compatible = "snps,dw-apb-uart"; + reg = <0x05001000 0x400>; + interrupts = <GIC_SPI 4 IRQ_TYPE_LEVEL_HIGH>; + reg-shift = <2>; + reg-io-width = <4>; + clocks = <&ccu CLK_BUS_UART4>; + resets = <&ccu RST_BUS_UART4>; + status = "disabled"; + }; + + uart5: serial@5001400 { + compatible = "snps,dw-apb-uart"; + reg = <0x05001400 0x400>; + interrupts = <GIC_SPI 5 IRQ_TYPE_LEVEL_HIGH>; + reg-shift = <2>; + reg-io-width = <4>; + clocks = <&ccu CLK_BUS_UART5>; + resets = <&ccu RST_BUS_UART5>; + status = "disabled"; + }; + + i2c0: i2c@5002000 { + compatible = "allwinner,sun50i-h616-i2c", + "allwinner,sun6i-a31-i2c"; + reg = <0x05002000 0x400>; + interrupts = <GIC_SPI 6 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&ccu CLK_BUS_I2C0>; + resets = <&ccu RST_BUS_I2C0>; + pinctrl-names = "default"; + pinctrl-0 = <&i2c0_pins>; + status = "disabled"; + #address-cells = <1>; + #size-cells = <0>; + }; + + i2c1: i2c@5002400 { + compatible = "allwinner,sun50i-h616-i2c", + "allwinner,sun6i-a31-i2c"; + reg = <0x05002400 0x400>; + interrupts = <GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&ccu CLK_BUS_I2C1>; + resets = <&ccu RST_BUS_I2C1>; + status = "disabled"; + #address-cells = <1>; + #size-cells = <0>; + }; + + i2c2: i2c@5002800 { + compatible = "allwinner,sun50i-h616-i2c", + "allwinner,sun6i-a31-i2c"; + reg = <0x05002800 0x400>; + interrupts = <GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&ccu CLK_BUS_I2C2>; + resets = <&ccu RST_BUS_I2C2>; + status = "disabled"; + #address-cells = <1>; + #size-cells = <0>; + }; + + i2c3: i2c@5002c00 { + compatible = "allwinner,sun50i-h616-i2c", + "allwinner,sun6i-a31-i2c"; + reg = <0x05002c00 0x400>; + interrupts = <GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&ccu CLK_BUS_I2C3>; + resets = <&ccu RST_BUS_I2C3>; + status = "disabled"; + #address-cells = <1>; + #size-cells = <0>; + }; + + i2c4: i2c@5003000 { + compatible = "allwinner,sun50i-h616-i2c", + "allwinner,sun6i-a31-i2c"; + reg = <0x05003000 0x400>; + interrupts = <GIC_SPI 10 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&ccu CLK_BUS_I2C4>; + resets = <&ccu RST_BUS_I2C4>; + status = "disabled"; + #address-cells = <1>; + #size-cells = <0>; + }; + + spi0: spi@5010000 { + compatible = "allwinner,sun50i-h616-spi", + "allwinner,sun8i-h3-spi"; + reg = <0x05010000 0x1000>; + interrupts = <GIC_SPI 12 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&ccu CLK_BUS_SPI0>, <&ccu CLK_SPI0>; + clock-names = "ahb", "mod"; + resets = <&ccu RST_BUS_SPI0>; + pinctrl-names = "default"; + pinctrl-0 = <&spi0_pins>; + status = "disabled"; + #address-cells = <1>; + #size-cells = <0>; + }; + + spi1: spi@5011000 { + compatible = "allwinner,sun50i-h616-spi", + "allwinner,sun8i-h3-spi"; + reg = <0x05011000 0x1000>; + interrupts = <GIC_SPI 13 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&ccu CLK_BUS_SPI1>, <&ccu CLK_SPI1>; + clock-names = "ahb", "mod"; + resets = <&ccu RST_BUS_SPI1>; + pinctrl-names = "default"; + pinctrl-0 = <&spi1_pins>; + status = "disabled"; + #address-cells = <1>; + #size-cells = <0>; + }; + + emac0: ethernet@5020000 { + compatible = "allwinner,sun50i-h616-emac", + "allwinner,sun50i-a64-emac"; + syscon = <&syscon>; + reg = <0x05020000 0x10000>; + interrupts = <GIC_SPI 14 IRQ_TYPE_LEVEL_HIGH>; + interrupt-names = "macirq"; + resets = <&ccu RST_BUS_EMAC0>; + reset-names = "stmmaceth"; + clocks = <&ccu CLK_BUS_EMAC0>; + clock-names = "stmmaceth"; + status = "disabled"; + + mdio0: mdio { + compatible = "snps,dwmac-mdio"; + #address-cells = <1>; + #size-cells = <0>; + }; + }; + + emac1: ethernet@5030000 { + compatible = "allwinner,sun50i-h616-emac"; + syscon = <&syscon 1>; + reg = <0x05030000 0x10000>; + interrupts = <GIC_SPI 15 IRQ_TYPE_LEVEL_HIGH>; + interrupt-names = "macirq"; + resets = <&ccu RST_BUS_EMAC1>; + reset-names = "stmmaceth"; + clocks = <&ccu CLK_BUS_EMAC1>; + clock-names = "stmmaceth"; + status = "disabled"; + + mdio1: mdio { + compatible = "snps,dwmac-mdio"; + #address-cells = <1>; + #size-cells = <0>; + }; + }; + + usbotg: usb@5100000 { + compatible = "allwinner,sun50i-h616-musb", + "allwinner,sun8i-h3-musb"; + reg = <0x05100000 0x0400>; + clocks = <&ccu CLK_BUS_OTG>; + resets = <&ccu RST_BUS_OTG>; + interrupts = <GIC_SPI 25 IRQ_TYPE_LEVEL_HIGH>; + interrupt-names = "mc"; + phys = <&usbphy 0>; + phy-names = "usb"; + extcon = <&usbphy 0>; + status = "disabled"; + }; + + usbphy: phy@5100400 { + compatible = "allwinner,sun50i-h616-usb-phy"; + reg = <0x05100400 0x24>, + <0x05101800 0x14>, + <0x05200800 0x14>, + <0x05310800 0x14>, + <0x05311800 0x14>; + reg-names = "phy_ctrl", + "pmu0", + "pmu1", + "pmu2", + "pmu3"; + clocks = <&ccu CLK_USB_PHY0>, + <&ccu CLK_USB_PHY1>, + <&ccu CLK_USB_PHY2>, + <&ccu CLK_USB_PHY3>; + clock-names = "usb0_phy", + "usb1_phy", + "usb2_phy", + "usb3_phy"; + resets = <&ccu RST_USB_PHY0>, + <&ccu RST_USB_PHY1>, + <&ccu RST_USB_PHY2>, + <&ccu RST_USB_PHY3>; + reset-names = "usb0_reset", + "usb1_reset", + "usb2_reset", + "usb3_reset"; + status = "disabled"; + #phy-cells = <1>; + }; + + ehci0: usb@5101000 { + compatible = "allwinner,sun50i-h616-ehci", + "generic-ehci"; + reg = <0x05101000 0x100>; + interrupts = <GIC_SPI 26 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&ccu CLK_BUS_OHCI0>, + <&ccu CLK_BUS_EHCI0>, + <&ccu CLK_USB_OHCI0>; + resets = <&ccu RST_BUS_OHCI0>, + <&ccu RST_BUS_EHCI0>; + phys = <&usbphy 0>; + phy-names = "usb"; + status = "disabled"; + }; + + ohci0: usb@5101400 { + compatible = "allwinner,sun50i-h616-ohci", + "generic-ohci"; + reg = <0x05101400 0x100>; + interrupts = <GIC_SPI 27 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&ccu CLK_BUS_OHCI0>, + <&ccu CLK_USB_OHCI0>; + resets = <&ccu RST_BUS_OHCI0>; + phys = <&usbphy 0>; + phy-names = "usb"; + status = "disabled"; + }; + + ehci1: usb@5200000 { + compatible = "allwinner,sun50i-h616-ehci", + "generic-ehci"; + reg = <0x05200000 0x100>; + interrupts = <GIC_SPI 28 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&ccu CLK_BUS_OHCI1>, + <&ccu CLK_BUS_EHCI1>, + <&ccu CLK_USB_OHCI1>; + resets = <&ccu RST_BUS_OHCI1>, + <&ccu RST_BUS_EHCI1>; + phys = <&usbphy 1>; + phy-names = "usb"; + status = "disabled"; + }; + + ohci1: usb@5200400 { + compatible = "allwinner,sun50i-h616-ohci", + "generic-ohci"; + reg = <0x05200400 0x100>; + interrupts = <GIC_SPI 29 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&ccu CLK_BUS_OHCI1>, + <&ccu CLK_USB_OHCI1>; + resets = <&ccu RST_BUS_OHCI1>; + phys = <&usbphy 1>; + phy-names = "usb"; + status = "disabled"; + }; + + ehci2: usb@5310000 { + compatible = "allwinner,sun50i-h616-ehci", + "generic-ehci"; + reg = <0x05310000 0x100>; + interrupts = <GIC_SPI 30 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&ccu CLK_BUS_OHCI2>, + <&ccu CLK_BUS_EHCI2>, + <&ccu CLK_USB_OHCI2>; + resets = <&ccu RST_BUS_OHCI2>, + <&ccu RST_BUS_EHCI2>; + phys = <&usbphy 2>; + phy-names = "usb"; + status = "disabled"; + }; + + ohci2: usb@5310400 { + compatible = "allwinner,sun50i-h616-ohci", + "generic-ohci"; + reg = <0x05310400 0x100>; + interrupts = <GIC_SPI 31 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&ccu CLK_BUS_OHCI2>, + <&ccu CLK_USB_OHCI2>; + resets = <&ccu RST_BUS_OHCI2>; + phys = <&usbphy 2>; + phy-names = "usb"; + status = "disabled"; + }; + + ehci3: usb@5311000 { + compatible = "allwinner,sun50i-h616-ehci", + "generic-ehci"; + reg = <0x05311000 0x100>; + interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&ccu CLK_BUS_OHCI3>, + <&ccu CLK_BUS_EHCI3>, + <&ccu CLK_USB_OHCI3>; + resets = <&ccu RST_BUS_OHCI3>, + <&ccu RST_BUS_EHCI3>; + phys = <&usbphy 3>; + phy-names = "usb"; + status = "disabled"; + }; + + ohci3: usb@5311400 { + compatible = "allwinner,sun50i-h616-ohci", + "generic-ohci"; + reg = <0x05311400 0x100>; + interrupts = <GIC_SPI 33 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&ccu CLK_BUS_OHCI3>, + <&ccu CLK_USB_OHCI3>; + resets = <&ccu RST_BUS_OHCI3>; + phys = <&usbphy 3>; + phy-names = "usb"; + status = "disabled"; + }; + + rtc: rtc@7000000 { + compatible = "allwinner,sun50i-h616-rtc", + "allwinner,sun50i-h6-rtc"; + reg = <0x07000000 0x400>; + interrupts = <GIC_SPI 101 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 102 IRQ_TYPE_LEVEL_HIGH>; + clock-output-names = "osc32k", "osc32k-out", "iosc"; + #clock-cells = <1>; + }; + + r_ccu: clock@7010000 { + compatible = "allwinner,sun50i-h616-r-ccu"; + reg = <0x07010000 0x400>; + clocks = <&osc24M>, <&rtc 0>, <&rtc 2>, + <&ccu CLK_PLL_PERIPH0>; + clock-names = "hosc", "losc", "iosc", "pll-periph"; + #clock-cells = <1>; + #reset-cells = <1>; + }; + + r_pio: pinctrl@7022000 { + compatible = "allwinner,sun50i-h616-r-pinctrl"; + reg = <0x07022000 0x400>; + interrupts = <GIC_SPI 43 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&r_ccu CLK_R_APB1>, <&osc24M>, <&rtc 0>; + clock-names = "apb", "hosc", "losc"; + gpio-controller; + #gpio-cells = <3>; + interrupt-controller; + #interrupt-cells = <3>; + + r_i2c_pins: r-i2c-pins { + pins = "PL0", "PL1"; + function = "s_i2c"; + }; + }; + + ir: ir@7040000 { + compatible = "allwinner,sun50i-h616-ir", + "allwinner,sun6i-a31-ir"; + reg = <0x07040000 0x400>; + interrupts = <GIC_SPI 106 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&r_ccu CLK_R_APB1_IR>, + <&r_ccu CLK_IR>; + clock-names = "apb", "ir"; + resets = <&r_ccu RST_R_APB1_IR>; + pinctrl-names = "default"; + pinctrl-0 = <&ir_rx_pin>; + status = "disabled"; + }; + + r_i2c: i2c@7081400 { + compatible = "allwinner,sun50i-h616-i2c", + "allwinner,sun6i-a31-i2c"; + reg = <0x07081400 0x400>; + interrupts = <GIC_SPI 105 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&r_ccu CLK_R_APB2_I2C>; + resets = <&r_ccu RST_R_APB2_I2C>; + status = "disabled"; + #address-cells = <1>; + #size-cells = <0>; + }; + }; +};
Signature · 1 line
2.17.5
Re: [PATCH v2 19/21] arm64: dts: allwinner: Add Allwinner H616 .dtsi file
arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi line 64
Quoted 11 lines · Andre Przywara
arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi new file +11
-0+ reserved-memory { + #address-cells = <2>; + #size-cells = <2>; + ranges; + + /* 512KiB reserved for ARM Trusted Firmware (BL31) */ + secmon_reserved: secmon@40000000 { + reg = <0x0 0x40000000 0x0 0x80000>; + no-map; + }; + };
This should still be set by the firmware
Quoted 5 lines
arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi new file +5
-0+ mmc0: mmc@4020000 { + compatible = "allwinner,sun50i-h616-mmc", + "allwinner,sun50i-a100-mmc"; + reg = <0x04020000 0x1000>; + clocks = <&ccu CLK_BUS_MMC0>, <&ccu CLK_MMC0>;
arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi line 263
Quoted 10 lines
arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi new file +10
-0+ clock-names = "ahb", "mmc"; + resets = <&ccu RST_BUS_MMC0>; + reset-names = "ahb"; + interrupts = <GIC_SPI 35 IRQ_TYPE_LEVEL_HIGH>; + pinctrl-names = "default"; + pinctrl-0 = <&mmc0_pins>; + status = "disabled"; + #address-cells = <1>; + #size-cells = <0>; + };
Somewhat related: we shouldn't set the MMC speed flags in the drivers. This is biting us on the already supported SoCs, so it would be great to not repeat the same mistake with the new ones
Maxime
Re: [PATCH v2 19/21] arm64: dts: allwinner: Add Allwinner H616 .dtsi file
On Mon, 14 Dec 2020 10:58:31 +0100
Maxime Ripard <[email protected]> wrote:
Hi,
Quoted 29 lines · Andre Przywara
arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi line 64
Quoted 12 lines
arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi new file +6
-0+ reserved-memory { + #address-cells = <2>; + #size-cells = <2>; + ranges; + + /* 512KiB reserved for ARM Trusted Firmware (BL31)*/
arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi new file +5
-0+ secmon_reserved: secmon@40000000 { + reg = <0x0 0x40000000 0x0 0x80000>; + no-map; + }; + };This should still be set by the firmware
Quoted 13 lines
arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi new file +5
-0+ mmc0: mmc@4020000 { + compatible = "allwinner,sun50i-h616-mmc", + "allwinner,sun50i-a100-mmc"; + reg = <0x04020000 0x1000>; + clocks = <&ccu CLK_BUS_MMC0>, <&ccu
CLK_MMC0>;arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi new file +4
-0+ clock-names = "ahb", "mmc"; + resets = <&ccu RST_BUS_MMC0>; + reset-names = "ahb"; + interrupts = <GIC_SPI 35
IRQ_TYPE_LEVEL_HIGH>;arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi new file +2
-0+ pinctrl-names = "default"; + pinctrl-0 = <&mmc0_pins>;
Quoted 8 lines
arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi line 263
Quoted 4 lines
arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi new file +4
-0+ status = "disabled"; + #address-cells = <1>; + #size-cells = <0>; + };Somewhat related: we shouldn't set the MMC speed flags in the drivers. This is biting us on the already supported SoCs, so it would be great to not repeat the same mistake with the new ones
Do you mean to list the "sd-uhs-sdr50" and friends properties here in the DT?
What is the best practice here in terms putting them in the .dts vs. the .dtsi? Surely the controller has limits, but bad traces on a board could impose further restrictions, right?
Though that's probably rare, so it sounds like a lot of churn to list them in every board DT. So can we list everything in here (.dtsi), then delete in those affected boards only?
Cheers,
Andre
Re: [linux-sunxi] Re: [PATCH v2 19/21] arm64: dts: allwinner: Add Allwinner H616 .dtsi file
Quoted 44 lines · Andre Przywara
On Mon, 14 Dec 2020 10:58:31 +0100
Maxime Ripard <[email protected]> wrote:Hi,
Quoted 34 lines · Andre Przywara
arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi line 64
Quoted 12 lines
arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi new file +6
-0+ reserved-memory { + #address-cells = <2>; + #size-cells = <2>; + ranges; + + /* 512KiB reserved for ARM Trusted Firmware (BL31)*/
arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi new file +5
-0+ secmon_reserved: secmon@40000000 { + reg = <0x0 0x40000000 0x0 0x80000>; + no-map; + }; + };This should still be set by the firmware
Quoted 11 lines
arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi new file +5
-0+ mmc0: mmc@4020000 { + compatible = "allwinner,sun50i-h616-mmc", + "allwinner,sun50i-a100-mmc"; + reg = <0x04020000 0x1000>; + clocks = <&ccu CLK_BUS_MMC0>, <&ccu
CLK_MMC0>;arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi new file +4
-0+ clock-names = "ahb", "mmc"; + resets = <&ccu RST_BUS_MMC0>; + reset-names = "ahb"; + interrupts = <GIC_SPI 35
IRQ_TYPE_LEVEL_HIGH>;arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi line 263
Quoted 6 lines
arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi new file +6
-0+ pinctrl-names = "default"; + pinctrl-0 = <&mmc0_pins>; + status = "disabled"; + #address-cells = <1>; + #size-cells = <0>; + };Quoted 3 lines
Somewhat related: we shouldn't set the MMC speed flags in the drivers. This is biting us on the already supported SoCs, so it would be great to not repeat the same mistake with the new ones
Quoted 8 lines
Do you mean to list the "sd-uhs-sdr50" and friends properties here in the DT?
What is the best practice here in terms putting them in the .dts vs. the .dtsi? Surely the controller has limits, but bad traces on a board could impose further restrictions, right?
Though that's probably rare, so it sounds like a lot of churn to list them in every board DT. So can we list everything in here (.dtsi), then delete in those affected boards only?
The driver will most certainly already have the basic high speed modes enabled. Or we can list them in the .dtsi file.
For HS-DDR mode, we probably want to list that in the .dtsi file as well, as that seems to be the one that is failing most of the time.
All the UHS-1 modes would be listed by board, since it requires a way to cut power to the card and the ability to change I/O voltage levels.
I wonder if Allwinner still keeps the timing information in the driver, or have they moved that to their vendor device tree files. We might want to consider moving it as well.
ChenYu
Re: [linux-sunxi] Re: [PATCH v2 19/21] arm64: dts: allwinner: Add Allwinner H616 .dtsi file
Quoted 54 lines · Chen-Yu Tsai
Quoted 44 lines · Andre Przywara
On Mon, 14 Dec 2020 10:58:31 +0100
Maxime Ripard <[email protected]> wrote:Hi,
Quoted 34 lines · Andre Przywara
arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi line 64
Quoted 12 lines
arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi new file +6
-0+ reserved-memory { + #address-cells = <2>; + #size-cells = <2>; + ranges; + + /* 512KiB reserved for ARM Trusted Firmware (BL31)*/
arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi new file +5
-0+ secmon_reserved: secmon@40000000 { + reg = <0x0 0x40000000 0x0 0x80000>; + no-map; + }; + };This should still be set by the firmware
Quoted 11 lines
arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi new file +5
-0+ mmc0: mmc@4020000 { + compatible = "allwinner,sun50i-h616-mmc", + "allwinner,sun50i-a100-mmc"; + reg = <0x04020000 0x1000>; + clocks = <&ccu CLK_BUS_MMC0>, <&ccu
CLK_MMC0>;arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi new file +4
-0+ clock-names = "ahb", "mmc"; + resets = <&ccu RST_BUS_MMC0>; + reset-names = "ahb"; + interrupts = <GIC_SPI 35
IRQ_TYPE_LEVEL_HIGH>;arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi line 263
Quoted 6 lines
arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi new file +6
-0+ pinctrl-names = "default"; + pinctrl-0 = <&mmc0_pins>; + status = "disabled"; + #address-cells = <1>; + #size-cells = <0>; + };Quoted 3 lines
Somewhat related: we shouldn't set the MMC speed flags in the drivers. This is biting us on the already supported SoCs, so it would be great to not repeat the same mistake with the new ones
Quoted 8 lines
Do you mean to list the "sd-uhs-sdr50" and friends properties here in the DT?
What is the best practice here in terms putting them in the .dts vs. the .dtsi? Surely the controller has limits, but bad traces on a board could impose further restrictions, right?
Though that's probably rare, so it sounds like a lot of churn to list them in every board DT. So can we list everything in here (.dtsi), then delete in those affected boards only?
Quoted 2 lines
The driver will most certainly already have the basic high speed modes enabled. Or we can list them in the .dtsi file.
I'd list them all in the DTSI, trying to be smart has bitten us already so I'd like to avoid it as much as possible.
And if we find a better way, we can set it in the driver if it's in the DTSI already. doing the opposite would be harder
Maxime
Re: [PATCH v2 19/21] arm64: dts: allwinner: Add Allwinner H616 .dtsi file
In reply to Andre PrzywaraQuoted 46 lines · Andre Przywara
Quoted 29 lines · On Mon, 14 Dec 2020 10:58:31 +0100 Maxime Ripard <[email protected]> wrote:
arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi line 64
Quoted 12 lines · Andre Przywara
arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi new file +6
-0+ reserved-memory { + #address-cells = <2>; + #size-cells = <2>; + ranges; + + /* 512KiB reserved for ARM Trusted Firmware (BL31)*/
arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi new file +5
-0+ secmon_reserved: secmon@40000000 { + reg = <0x0 0x40000000 0x0 0x80000>; + no-map; + }; + };This should still be set by the firmware
Quoted 13 lines
arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi new file +5
-0+ mmc0: mmc@4020000 { + compatible = "allwinner,sun50i-h616-mmc", + "allwinner,sun50i-a100-mmc"; + reg = <0x04020000 0x1000>; + clocks = <&ccu CLK_BUS_MMC0>, <&ccu
CLK_MMC0>;arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi new file +4
-0+ clock-names = "ahb", "mmc"; + resets = <&ccu RST_BUS_MMC0>; + reset-names = "ahb"; + interrupts = <GIC_SPI 35
IRQ_TYPE_LEVEL_HIGH>;arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi new file +2
-0+ pinctrl-names = "default"; + pinctrl-0 = <&mmc0_pins>;Quoted 8 lines
arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi line 263
Quoted 4 lines
arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi new file +4
-0+ status = "disabled"; + #address-cells = <1>; + #size-cells = <0>; + };Somewhat related: we shouldn't set the MMC speed flags in the drivers. This is biting us on the already supported SoCs, so it would be great to not repeat the same mistake with the new ones
Do you mean to list the "sd-uhs-sdr50" and friends properties here in the DT?
What is the best practice here in terms putting them in the .dts vs. the .dtsi? Surely the controller has limits, but bad traces on a board could impose further restrictions, right?
Quoted 3 lines
Though that's probably rare, so it sounds like a lot of churn to list them in every board DT. So can we list everything in here (.dtsi), then delete in those affected boards only?
Yeah, I completely agree :)
Maxime
PATCH v2 20/21 dt-bindings: arm: sunxi: Add OrangePi Zero 2 binding
In reply to Andre Przywara--- Documentation/devicetree/bindings/arm/sunxi.yaml | 5 +++++ 1 file changed, 5 insertions(+)
Documentation/devicetree/bindings/arm/sunxi.yaml +5 -0
@@ -894,4 +894,9 @@ properties: - const: xunlong,orangepi-zero-plus2-h3 - const: allwinner,sun8i-h3 + - description: Xunlong OrangePi Zero 2 + items: + - const: xunlong,orangepi-zero2 + - const: allwinner,sun50i-h616 + additionalProperties: true
Signature · 1 line
2.17.5
Re: [PATCH v2 20/21] dt-bindings: arm: sunxi: Add OrangePi Zero 2 binding
Quoted 5 lines · Andre Przywara
Signed-off-by Andre Przywara <[email protected]>--- Documentation/devicetree/bindings/arm/sunxi.yaml | 5 +++++ 1 file changed, 5 insertions(+)
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
PATCH v2 21/21 arm64: dts: allwinner: Add OrangePi Zero 2 .dts
In reply to Andre PrzywaraThe OrangePi Zero 2 is a development board with the new H616 SoC.
It features the usual connectors used on those small boards, and comes with the AXP305, which seems to be compatible with the AXP805.
For more details see: http://linux-sunxi.org/Xunlong_Orange_Pi_Zero2
--- arch/arm64/boot/dts/allwinner/Makefile | 1 + .../allwinner/sun50i-h616-orangepi-zero2.dts | 240 ++++++++++++++++++ 2 files changed, 241 insertions(+) create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-h616-orangepi-zero2.dts
arch/arm64/boot/dts/allwinner/Makefile +1 -0
@@ -35,3 +35,4 @@ dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h6-orangepi-one-plus.dtb dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h6-pine-h64.dtb dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h6-pine-h64-model-b.dtb dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h6-tanix-tx6.dtb +dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h616-orangepi-zero2.dtb
arch/arm64/boot/dts/allwinner/sun50i-h616-orangepi-zero2.dts new file +240 -0
240 lines not on this page · raw message
Signature · 1 line
2.17.5
Re: [PATCH v2 21/21] arm64: dts: allwinner: Add OrangePi Zero 2 .dts
Quoted 49 lines · Andre Przywara
The OrangePi Zero 2 is a development board with the new H616 SoC.
It features the usual connectors used on those small boards, and comes with the AXP305, which seems to be compatible with the AXP805.
For more details see: http://linux-sunxi.org/Xunlong_Orange_Pi_Zero2
Signed-off-by Andre Przywara <[email protected]>--- arch/arm64/boot/dts/allwinner/Makefile | 1 + .../allwinner/sun50i-h616-orangepi-zero2.dts | 240 ++++++++++++++++++ 2 files changed, 241 insertions(+) create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-h616-orangepi-zero2.dtsarch/arm64/boot/dts/allwinner/Makefile +1
-0@@ -35,3 +35,4 @@ dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h6-orangepi-one-plus.dtb dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h6-pine-h64.dtb dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h6-pine-h64-model-b.dtb dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h6-tanix-tx6.dtb +dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h616-orangepi-zero2.dtbarch/arm64/boot/dts/allwinner/sun50i-h616-orangepi-zero2.dts new file +20
-0@@ -0,0 +1,240 @@ +// SPDX-License-Identifier: (GPL-2.0+ or MIT) +/* + * Copyright (C) 2020 Arm Ltd. + */ + +/dts-v1/; + +#include "sun50i-h616.dtsi" + +#include <dt-bindings/gpio/gpio.h> +#include <dt-bindings/interrupt-controller/arm-gic.h> +#include <dt-bindings/leds/common.h> + +/ { + model = "OrangePi Zero2"; + compatible = "xunlong,orangepi-zero2", "allwinner,sun50i-h616"; + + aliases { + ethernet0 = &emac0; + serial0 = &uart0;
arch/arm64/boot/dts/allwinner/sun50i-h616-orangepi-zero2.dts line 30
Quoted 10 lines
arch/arm64/boot/dts/allwinner/sun50i-h616-orangepi-zero2.dts new file +10
-0+ }; + + chosen { + stdout-path = "serial0:115200n8"; + }; + + leds { + compatible = "gpio-leds"; + + power {
This isn't a valid node name
Maxime
Quoted 48 lines · 在 2020-12-11星期五的 01:19 +0000,Andre Przywara写道:
Hi,
this is the quite expanded second version of the support series for the
Allwinner H616 SoC.
Besides many fixes for the bugs discovered by the diligent reviewers (many thanks for that!) this version adds some patches to support some
slightly changed devices, like the second EMAC and the AXP not having an interrupt.
Also I added quite some DT binding doc patches.
USB still does not work, but I include the patches anyway, hoping that
someone can help spotting the issue.
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 1/21 is the usual drive-by fix, discovered while staring at the H6 clock code.
Patch 3 and 4 add pinctrl support, with the "-R" controller now being crippled down to two I2C pins only. If we grow tired of repeating this
exercise for every new SoC variant, I am happy to revive my more versatile sunxi pinctrl driver effort from a few years back [1]. Patch 6 and 7 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.
Patch 08/21 is pulling a patch from Yangtao's A100 series, since we need
the same fix for MMC support. This will probably be merged separately,
I just include this here to provide a bootable solution. Patch 10 teaches the AXP MFD driver to get along without having an interrupt, as the H616 apparently does not have an NMI controller
Quoted 8 lines
anymore.
Patch 12 and 13 add some tweaks to the syscon and EMAC driver, to deal
with the second EMAC clock used for the second Ethernet controller. Patches 14 and 15 *try* to add USB support. The same approach works with
the very similar U-Boot PHY driver, but for some reason still fail in Linux. Maybe someone spots the issue and can help fixing it?
There's a judge currently checks for phy type A83T/H6. You may need to add H616 there.
Or should we have a bool in the data struct to mark it? I think all chips that need that is 28nm.
Quoted 129 lines
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[2] in the last patch.We have U-Boot and Trusted-Firmware support in a working state, booting
via FEL and even TFTPing kernels work already [3][4].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 can also be found here:
https://github.com/apritzel/linux/commits/h616-v2Happy reviewing!
Cheers,
Andre[1]
https://patchwork.ozlabs.org/project/linux-gpio/cover/[email protected]/
[2] https://linux-sunxi.org/Xunlong_Orange_Pi_Zero2
[3] https://github.com/jernejsk/u-boot/commits/h616-v1
[4] https://github.com/apritzel/arm-trusted-firmware/commits/h616-WIPChangelog v1 .. v2:
- pinctrl: adjust irq bank map to cover undocumented GPIO bank IRQs
- use differingh_i2s0pin 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 toCLK_OF_DECLAREstyle
- 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 patchesAndre Przywara (18):
clk: sunxi-ng: h6: Fix clock divider range on some clocks
dt-bindings: pinctrl: Add Allwinner H616 compatible strings
pinctrl: sunxi: Add support for the Allwinner H616 pin controller
pinctrl: sunxi: Add support for the Allwinner H616-R pin controller
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
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
net: stmmac: dwmac-sun8i: Prepare for second EMAC clock register
phy: sun4i-usb: Rework "pmu_unk1" handling
phy: sun4i-usb: Add support for the H616 USB PHY
dt-bindings: watchdog: sun4i: Add H616 compatible string
dt-bindings: allwinner: Add H616 compatible strings
arm64: dts: allwinner: Add Allwinner H616 .dtsi file
dt-bindings: arm: sunxi: Add OrangePi Zero 2 binding
arm64: dts: allwinner: Add OrangePi Zero 2 .dtsYangtao Li (3):
dt-bindings: mmc: sunxi: Add Allwinner A100 and H616 compatibles
mmc: sunxi: add support for A100 mmc controller
dt-bindings: watchdog: sun4i: Add A100 compatible.../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 +- .../bindings/mmc/allwinner,sun4i-a10-mmc.yaml | 8 + .../pinctrl/allwinner,sun4i-a10-pinctrl.yaml | 2 + .../bindings/rtc/allwinner,sun6i-a31-rtc.yaml | 3 + .../bindings/spi/allwinner,sun6i-a31-spi.yaml | 1 + .../allwinner,sun4i-a10-system-control.yaml | 1 + .../watchdog/allwinner,sun4i-a10-wdt.yaml | 9 +- arch/arm64/boot/dts/allwinner/Makefile | 1 + .../allwinner/sun50i-h616-orangepi-zero2.dts | 240 ++++ .../arm64/boot/dts/allwinner/sun50i-h616.dtsi | 715 ++++++++++ drivers/clk/sunxi-ng/Kconfig | 7 +- drivers/clk/sunxi-ng/Makefile | 1 + drivers/clk/sunxi-ng/ccu-sun50i-h6-r.c | 47 +- drivers/clk/sunxi-ng/ccu-sun50i-h6-r.h | 3 +- drivers/clk/sunxi-ng/ccu-sun50i-h6.c | 8 +- drivers/clk/sunxi-ng/ccu-sun50i-h616.c | 1150 +++++++++++++++++ drivers/clk/sunxi-ng/ccu-sun50i-h616.h | 56 + drivers/mfd/axp20x.c | 17 +- drivers/mmc/host/sunxi-mmc.c | 28 +- .../net/ethernet/stmicro/stmmac/dwmac-sun8i.c | 12 +- drivers/phy/allwinner/phy-sun4i-usb.c | 39 +- drivers/pinctrl/sunxi/Kconfig | 10 + drivers/pinctrl/sunxi/Makefile | 2 + drivers/pinctrl/sunxi/pinctrl-sun50i-h616-r.c | 54 + drivers/pinctrl/sunxi/pinctrl-sun50i-h616.c | 548 ++++++++ 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 + 31 files changed, 3151 insertions(+), 71 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 drivers/pinctrl/sunxi/pinctrl-sun50i-h616-r.c create mode 100644 drivers/pinctrl/sunxi/pinctrl-sun50i-h616.c create mode 100644 include/dt-bindings/clock/sun50i-h616-ccu.h create mode 100644 include/dt-bindings/reset/sun50i-h616-ccu.h
On 13/12/2020 17:47, Icenowy Zheng wrote:
Hi Icenowy,
Quoted 58 lines · 在 2020-12-11星期五的 01:19 +0000,Andre Przywara写道:
Quoted 48 lines
Hi,
this is the quite expanded second version of the support series for the
Allwinner H616 SoC.
Besides many fixes for the bugs discovered by the diligent reviewers (many thanks for that!) this version adds some patches to support some
slightly changed devices, like the second EMAC and the AXP not having an interrupt.
Also I added quite some DT binding doc patches.
USB still does not work, but I include the patches anyway, hoping that
someone can help spotting the issue.
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 1/21 is the usual drive-by fix, discovered while staring at the H6 clock code.
Patch 3 and 4 add pinctrl support, with the "-R" controller now being crippled down to two I2C pins only. If we grow tired of repeating this
exercise for every new SoC variant, I am happy to revive my more versatile sunxi pinctrl driver effort from a few years back [1]. Patch 6 and 7 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.
Patch 08/21 is pulling a patch from Yangtao's A100 series, since we need
the same fix for MMC support. This will probably be merged separately,
I just include this here to provide a bootable solution. Patch 10 teaches the AXP MFD driver to get along without having an interrupt, as the H616 apparently does not have an NMI controllerQuoted 8 lines
anymore.
Patch 12 and 13 add some tweaks to the syscon and EMAC driver, to deal
with the second EMAC clock used for the second Ethernet controller. Patches 14 and 15 *try* to add USB support. The same approach works with
the very similar U-Boot PHY driver, but for some reason still fail in Linux. Maybe someone spots the issue and can help fixing it?
Quoted 2 lines
There's a judge currently checks for phy type A83T/H6. You may need to add H616 there.
You mean for setting PHY_CTL_VBUSVLDEXT and clearing PHY_CTL_SIDDQ? This is guarded by .type == sun50i_h6_phy, which I also use for the H616. So this should be covered.
Quoted 2 lines
Or should we have a bool in the data struct to mark it? I think all chips that need that is 28nm.
Yeah, the usage of .type seems somewhat arbitrary, at the end of the day it's just another quirk for a group of SoCs.
Thanks!
Andre
Quoted 130 lines
Quoted 130 lines
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[2] in the last patch.We have U-Boot and Trusted-Firmware support in a working state, booting
via FEL and even TFTPing kernels work already [3][4].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 can also be found here:
https://github.com/apritzel/linux/commits/h616-v2Happy reviewing!
Cheers,
Andre[1]
https://patchwork.ozlabs.org/project/linux-gpio/cover/[email protected]/
[2] https://linux-sunxi.org/Xunlong_Orange_Pi_Zero2
[3] https://github.com/jernejsk/u-boot/commits/h616-v1
[4] https://github.com/apritzel/arm-trusted-firmware/commits/h616-WIPChangelog v1 .. v2:
- pinctrl: adjust irq bank map to cover undocumented GPIO bank IRQs
- use differingh_i2s0pin 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 toCLK_OF_DECLAREstyle
- 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 patchesAndre Przywara (18):
clk: sunxi-ng: h6: Fix clock divider range on some clocks
dt-bindings: pinctrl: Add Allwinner H616 compatible strings
pinctrl: sunxi: Add support for the Allwinner H616 pin controller
pinctrl: sunxi: Add support for the Allwinner H616-R pin controller
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
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
net: stmmac: dwmac-sun8i: Prepare for second EMAC clock register
phy: sun4i-usb: Rework "pmu_unk1" handling
phy: sun4i-usb: Add support for the H616 USB PHY
dt-bindings: watchdog: sun4i: Add H616 compatible string
dt-bindings: allwinner: Add H616 compatible strings
arm64: dts: allwinner: Add Allwinner H616 .dtsi file
dt-bindings: arm: sunxi: Add OrangePi Zero 2 binding
arm64: dts: allwinner: Add OrangePi Zero 2 .dtsYangtao Li (3):
dt-bindings: mmc: sunxi: Add Allwinner A100 and H616 compatibles
mmc: sunxi: add support for A100 mmc controller
dt-bindings: watchdog: sun4i: Add A100 compatible.../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 +- .../bindings/mmc/allwinner,sun4i-a10-mmc.yaml | 8 + .../pinctrl/allwinner,sun4i-a10-pinctrl.yaml | 2 + .../bindings/rtc/allwinner,sun6i-a31-rtc.yaml | 3 + .../bindings/spi/allwinner,sun6i-a31-spi.yaml | 1 + .../allwinner,sun4i-a10-system-control.yaml | 1 + .../watchdog/allwinner,sun4i-a10-wdt.yaml | 9 +- arch/arm64/boot/dts/allwinner/Makefile | 1 + .../allwinner/sun50i-h616-orangepi-zero2.dts | 240 ++++ .../arm64/boot/dts/allwinner/sun50i-h616.dtsi | 715 ++++++++++ drivers/clk/sunxi-ng/Kconfig | 7 +- drivers/clk/sunxi-ng/Makefile | 1 + drivers/clk/sunxi-ng/ccu-sun50i-h6-r.c | 47 +- drivers/clk/sunxi-ng/ccu-sun50i-h6-r.h | 3 +- drivers/clk/sunxi-ng/ccu-sun50i-h6.c | 8 +- drivers/clk/sunxi-ng/ccu-sun50i-h616.c | 1150 +++++++++++++++++ drivers/clk/sunxi-ng/ccu-sun50i-h616.h | 56 + drivers/mfd/axp20x.c | 17 +- drivers/mmc/host/sunxi-mmc.c | 28 +- .../net/ethernet/stmicro/stmmac/dwmac-sun8i.c | 12 +- drivers/phy/allwinner/phy-sun4i-usb.c | 39 +- drivers/pinctrl/sunxi/Kconfig | 10 + drivers/pinctrl/sunxi/Makefile | 2 + drivers/pinctrl/sunxi/pinctrl-sun50i-h616-r.c | 54 + drivers/pinctrl/sunxi/pinctrl-sun50i-h616.c | 548 ++++++++ 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 + 31 files changed, 3151 insertions(+), 71 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 drivers/pinctrl/sunxi/pinctrl-sun50i-h616-r.c create mode 100644 drivers/pinctrl/sunxi/pinctrl-sun50i-h616.c create mode 100644 include/dt-bindings/clock/sun50i-h616-ccu.h create mode 100644 include/dt-bindings/reset/sun50i-h616-ccu.h