initial support for "suniv" Allwinner new ARM9 SoC
Subsystems (12)
v3 cover initial support for "suniv" Allwinner new ARM9 SoC
This is the third version of RFC patchset for Allwinner ARMv5 F1C100s SoC. Addressed comment from Maxime Ripard and fixed device tree bindings to not include patterns. Also sram and watchdog compatibles added for F1C100s.
irqchip code reworked to include a struct to differentiate chips.
Thanks!
Original cover later:
This is the RFC initial patchset for the "new" Allwinner SUNIV ARM9 SoC.
The same die is packaged differently, come with different co-packaged DRAM or shipped with different SDK; and then made many model names: F23, F25, F1C100A, F1C100S, F1C200S, F1C500, F1C600, R6, etc. These SoCs all share a common feature set and are packaged similarly (eLQFP128 for SoCs without co-packaged DRAM, QFN88 for with DRAM). As their's no functionality hidden on the QFN88 models (except DRAM interface not exported), it's not clever to differentiate them. So I will use suniv as common name of all these SoCs.
As it's the first not ARMv7+ Allwinner SoC to get supported, this patchset firstly made CONFIG_ARCH_SUNXI a common config item, and let selectable CONFIG_ARCH_SUNXI_V{5,7} to internally select it. This makes reusing most work possible. This is PATCH 1~2.
The ARM9 has neither GIC nor arch_timer, like the sun4i/5i Cortex-A8 SoCs. So adapt the IRQ and timer driver used by sun4i/5i to support suniv. This is PATCH 3~5.
Then it's the common way to support a new SoC -- pinctrl, CCU and initial DT.
Changes since v2:
- Patch "ARM: sunxi: add Allwinner ARMv5 SoCs"
- Move SUN4I_TIMER option to ARCH_SUNXI
- Added help text for MACH_SUNIV
- Patch "irqchip/sun4i: add support for suniv interrupt controller"
- Defined sunxi_irq_chip_data struct and used it to differentiate registers between different chips.
- Patch " ARM: dts: suniv: add initial DTSI file for F1C100s"
- Removed unnecessary fake clock.
- Fixed compatible strings.
Changes since v1:
- Patch "ARM: add CONFIG_ARCH_SUNXI_V7 for differentiate ARMv5/v7 Allwinner SoCs"
- Instead of using a common bool config use a common menuconfig.
- Use ARCH_MULTI_V7 to differentiate V7 SoCs.
- Addressed comment from Julian Calaby
- Patch "ARM: sunxi: add Allwinner ARMv5 SoCs"
- Use ARCH_MULTI_V5 to differentiate V5 SoCs.
- removed "allwinner,suniv" board compatible string
- Added dt-bindings
- Patch "irqchip/sun4i: add support for suniv interrupt controller"
- Added dt-bindings
- Changed "allwinner,suniv-ic" to "allwinner,suniv-f1c100s-ic"
- Patch "clocksource: sun4i: add a compatible for suniv"
- Added dt-bindings
- Changed "allwinner,suniv-timer" to "allwinner,suniv-f1c100s-timer"
- Patch "pinctrl: sunxi: add support for suniv F1C100s (newer F-series SoCs)"
- Added dt-bindings
- Renamed suniv-pinctrl to suniv-f1c100s-pinctrl
- Patch "clk: sunxi-ng: add support for suniv F1C100s SoC"
- Added dt-bindings
- Renamed suniv-ccu to suniv-f1c100s-ccu
- Patch "ARM: suniv: f1c100s: add device tree for Lichee Pi Nano"
- Addressed comment from Rask Ingemann Lambertsen
Mesih Kilinc (17):
ARM: add CONFIG_ARCH_SUNXI_V7 for differentiate ARMv5/v7 Allwinner
SoCs
dt-bindings: arm: Add new Allwinner ARMv5 F1C100s SoC
ARM: sunxi: add Allwinner ARMv5 SoCs
dt-bindings: interrupt-controller: Add suniv interrupt-controller irqchip/sun4i: add support for suniv interrupt controller
dt-bindings: timer: Add Allwinner suniv timer
clocksource: sun4i: add a compatible for suniv
dt-bindings: pinctrl: Add Allwinner suniv F1C100s pinctrl
pinctrl: sunxi: add support for suniv F1C100s (newer F-series SoCs)
dt-bindings: clock: Add Allwinner suniv F1C100s CCU
clk: sunxi-ng: add support for suniv F1C100s SoC
dt-bindings: sram: Add Allwinner suniv F1C100s
SoC: sunxi: Add support for Allwinner ARMv5 F1C100s sram
dt-bindings: watchdog: Add Allwinner ARMv5 F1C100s wdt
watchdog: Add support for Allwinner ARMv5 F1C100s wdt
ARM: dts: suniv: add initial DTSI file for F1C100s
ARM: suniv: f1c100s: add device tree for Lichee Pi Nano
Documentation/devicetree/bindings/arm/sunxi.txt | 1 + .../devicetree/bindings/clock/sunxi-ccu.txt | 1 + .../interrupt-controller/allwinner,sun4i-ic.txt | 4 +- .../bindings/pinctrl/allwinner,sunxi-pinctrl.txt | 1 + .../devicetree/bindings/sram/sunxi-sram.txt | 4 + .../bindings/timer/allwinner,sun4i-timer.txt | 4 +- .../devicetree/bindings/watchdog/sunxi-wdt.txt | 1 + arch/arm/boot/dts/Makefile | 2 + arch/arm/boot/dts/suniv-f1c100s-licheepi-nano.dts | 26 + arch/arm/boot/dts/suniv-f1c100s.dtsi | 151 ++++++ arch/arm/mach-sunxi/Kconfig | 39 +- arch/arm/mach-sunxi/sunxi.c | 10 + drivers/clk/sunxi-ng/Kconfig | 5 + drivers/clk/sunxi-ng/Makefile | 1 + drivers/clk/sunxi-ng/ccu-suniv-f1c100s.c | 536 +++++++++++++++++++++ drivers/clk/sunxi-ng/ccu-suniv-f1c100s.h | 34 ++ drivers/clocksource/sun4i_timer.c | 5 +- drivers/irqchip/irq-sun4i.c | 104 ++-- drivers/pinctrl/sunxi/Kconfig | 4 + drivers/pinctrl/sunxi/Makefile | 1 + drivers/pinctrl/sunxi/pinctrl-suniv-f1c100s.c | 417 ++++++++++++++++ drivers/soc/sunxi/sunxi_sram.c | 8 + drivers/watchdog/sunxi_wdt.c | 1 + include/dt-bindings/clock/suniv-ccu-f1c100s.h | 69 +++ include/dt-bindings/reset/suniv-ccu-f1c100s.h | 37 ++ 25 files changed, 1425 insertions(+), 41 deletions(-) create mode 100644 arch/arm/boot/dts/suniv-f1c100s-licheepi-nano.dts create mode 100644 arch/arm/boot/dts/suniv-f1c100s.dtsi create mode 100644 drivers/clk/sunxi-ng/ccu-suniv-f1c100s.c create mode 100644 drivers/clk/sunxi-ng/ccu-suniv-f1c100s.h create mode 100644 drivers/pinctrl/sunxi/pinctrl-suniv-f1c100s.c create mode 100644 include/dt-bindings/clock/suniv-ccu-f1c100s.h create mode 100644 include/dt-bindings/reset/suniv-ccu-f1c100s.h
Signature · 1 line
2.7.4
RFC PATCH v3 1/17 ARM: add CONFIG_ARCH_SUNXI_V7 for differentiate ARMv5/v7 Allwinner SoCs
Allwinner also has some ARMv5 SoCs.
In order to add support for them, add a CONFIG_ARCH_SUNXI_V7 bool config which is selected when a ARMv7 soc is selected, and make CONFIG_ARCH_SUNXI a common option which is selected by both V7 and V5 sunxi option.
--- arch/arm/mach-sunxi/Kconfig | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-)
arch/arm/mach-sunxi/Kconfig +16 -7
@@ -6,31 +6,38 @@ menuconfig ARCH_SUNXI select GENERIC_IRQ_CHIP select GPIOLIB select PINCTRL - select PM_OPP select SUN4I_TIMER select RESET_CONTROLLER + help + Support for Allwinner ARM-based family of processors if ARCH_SUNXI +if ARCH_MULTI_V7 + +config ARCH_SUNXI_V7 + bool + select PM_OPP + config MACH_SUN4I bool "Allwinner A10 (sun4i) SoCs support" - default ARCH_SUNXI + select ARCH_SUNXI_V7 config MACH_SUN5I bool "Allwinner A10s / A13 (sun5i) SoCs support" - default ARCH_SUNXI + select ARCH_SUNXI_V7 select SUN5I_HSTIMER config MACH_SUN6I bool "Allwinner A31 (sun6i) SoCs support" - default ARCH_SUNXI + select ARCH_SUNXI_V7 select ARM_GIC select MFD_SUN6I_PRCM select SUN5I_HSTIMER config MACH_SUN7I bool "Allwinner A20 (sun7i) SoCs support" - default ARCH_SUNXI + select ARCH_SUNXI_V7 select ARM_GIC select ARM_PSCI select ARCH_SUPPORTS_BIG_ENDIAN
@@ -39,13 +46,13 @@ config MACH_SUN7I config MACH_SUN8I bool "Allwinner sun8i Family SoCs support" - default ARCH_SUNXI + select ARCH_SUNXI_V7 select ARM_GIC select MFD_SUN6I_PRCM config MACH_SUN9I bool "Allwinner (sun9i) SoCs support" - default ARCH_SUNXI + select ARCH_SUNXI_V7 select ARM_GIC config ARCH_SUNXI_MC_SMP
@@ -56,3 +63,5 @@ config ARCH_SUNXI_MC_SMP select ARM_CPU_SUSPEND endif + +endif
Signature · 1 line
2.7.4
Re: [RFC PATCH v3 01/17] ARM: add CONFIG_ARCH_SUNXI_V7 for differentiate ARMv5/v7 Allwinner SoCs
Quoted 23 lines · Mesih Kilinc
Allwinner also has some ARMv5 SoCs.
In order to add support for them, add a
CONFIG_ARCH_SUNXI_V7bool config which is selected when a ARMv7 soc is selected, and makeCONFIG_ARCH_SUNXIa common option which is selected by both V7 and V5 sunxi option.Signed-off-by Mesih Kilinc <[email protected]>--- arch/arm/mach-sunxi/Kconfig | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-)arch/arm/mach-sunxi/Kconfig +1
-1@@ -6,31 +6,38 @@ menuconfig ARCH_SUNXI select GENERIC_IRQ_CHIP select GPIOLIB select PINCTRL - select PM_OPP select SUN4I_TIMER select RESET_CONTROLLER + help
arch/arm/mach-sunxi/Kconfig menuconfig ARCH_SUNXI · line 21
Quoted 10 lines
arch/arm/mach-sunxi/Kconfig +7
-0+ Support for Allwinner ARM-based family of processors if ARCH_SUNXI +if ARCH_MULTI_V7 + +config ARCH_SUNXI_V7 + bool + select PM_OPP +
Actually, thinking more about this, I don't see why the PM_OPP config option should be made specific to the ARMv7 sunxi SoCs, you will have things cpufreq enabled at some point as well on the armv5 support.
arch/arm/mach-sunxi/Kconfig menuconfig ARCH_SUNXI · line 24
Quoted 4 lines
arch/arm/mach-sunxi/Kconfig +1
-1config MACH_SUN4I bool "Allwinner A10 (sun4i) SoCs support" - default ARCH_SUNXI + select ARCH_SUNXI_V7
The option is still changed from being on by default to being off by default. This breaks all the defconfig, and we really shouldn't change that.
Maxime
Signature · 10 lines
Maxime Ripard, Bootlin Embedded Linux and Kernel engineering https://bootlin.com -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 228 bytes Desc: not available URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20181122/0390c8e4/attachment.sig>
Re: [RFC PATCH v3 01/17] ARM: add CONFIG_ARCH_SUNXI_V7 for differentiate ARMv5/v7 Allwinner SoCs
Quoted 28 lines · Maxime Ripard
Quoted 27 lines · Mesih Kilinc
Allwinner also has some ARMv5 SoCs.
In order to add support for them, add a
CONFIG_ARCH_SUNXI_V7bool config which is selected when a ARMv7 soc is selected, and makeCONFIG_ARCH_SUNXIa common option which is selected by both V7 and V5 sunxi option.Signed-off-by Mesih Kilinc <[email protected]>--- arch/arm/mach-sunxi/Kconfig | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-)arch/arm/mach-sunxi/Kconfig +2
-1@@ -6,31 +6,38 @@ menuconfig ARCH_SUNXI select GENERIC_IRQ_CHIP select GPIOLIB select PINCTRL - select PM_OPP select SUN4I_TIMER select RESET_CONTROLLER + help + Support for Allwinner ARM-based family of processors if ARCH_SUNXI
Quoted 11 lines
arch/arm/mach-sunxi/Kconfig menuconfig ARCH_SUNXI · line 21
Quoted 6 lines
arch/arm/mach-sunxi/Kconfig +6
-0+if ARCH_MULTI_V7 + +config ARCH_SUNXI_V7 + bool + select PM_OPP +Actually, thinking more about this, I don't see why the
PM_OPPconfig option should be made specific to the ARMv7 sunxi SoCs, you will have things cpufreq enabled at some point as well on the armv5 support.
OK. I was basing this code to the first patch series.
So there will be no need for ARCH_SUNXI_VX configs. Should I drop them and differantiate IC's by only ARCH_MULTI_VX?
Quoted 8 lines
arch/arm/mach-sunxi/Kconfig menuconfig ARCH_SUNXI · line 24
Quoted 4 lines
arch/arm/mach-sunxi/Kconfig +1
-1config MACH_SUN4I bool "Allwinner A10 (sun4i) SoCs support" - default ARCH_SUNXI + select ARCH_SUNXI_V7The option is still changed from being on by default to being off by default. This breaks all the defconfig, and we really shouldn't change that.
OK. I will fix it.
Mesih Veysi K?l?n?
Re: [RFC PATCH v3 01/17] ARM: add CONFIG_ARCH_SUNXI_V7 for differentiate ARMv5/v7 Allwinner SoCs
Quoted 40 lines · Mesih Kilinc
Quoted 28 lines · Maxime Ripard
Quoted 27 lines · Mesih Kilinc
Allwinner also has some ARMv5 SoCs.
In order to add support for them, add a
CONFIG_ARCH_SUNXI_V7bool config which is selected when a ARMv7 soc is selected, and makeCONFIG_ARCH_SUNXIa common option which is selected by both V7 and V5 sunxi option.Signed-off-by Mesih Kilinc <[email protected]>--- arch/arm/mach-sunxi/Kconfig | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-)arch/arm/mach-sunxi/Kconfig +2
-1@@ -6,31 +6,38 @@ menuconfig ARCH_SUNXI select GENERIC_IRQ_CHIP select GPIOLIB select PINCTRL - select PM_OPP select SUN4I_TIMER select RESET_CONTROLLER + help + Support for Allwinner ARM-based family of processors if ARCH_SUNXIQuoted 11 lines
arch/arm/mach-sunxi/Kconfig menuconfig ARCH_SUNXI · line 21
Quoted 6 lines
arch/arm/mach-sunxi/Kconfig +6
-0+if ARCH_MULTI_V7 + +config ARCH_SUNXI_V7 + bool + select PM_OPP +Actually, thinking more about this, I don't see why the
PM_OPPconfig option should be made specific to the ARMv7 sunxi SoCs, you will have things cpufreq enabled at some point as well on the armv5 support.
Quoted 3 lines
OK. I was basing this code to the first patch series.
So there will be no need forARCH_SUNXI_VXconfigs. Should I drop them and differantiate IC's by onlyARCH_MULTI_VX?
Yeah, that's probably enough for now, and we can always merge some patch along those lines if we ever need it later.
Thanks!
Maxime
Signature · 10 lines
Maxime Ripard, Bootlin Embedded Linux and Kernel engineering https://bootlin.com -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 228 bytes Desc: not available URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20181122/7d617ef3/attachment-0001.sig>
RFC PATCH v3 2/17 dt-bindings: arm: Add new Allwinner ARMv5 F1C100s SoC
In reply to Mesih KilincAdd new Allwinner ARMv5 F1C100s SoC's compatible string
--- Documentation/devicetree/bindings/arm/sunxi.txt | 1 + 1 file changed, 1 insertion(+)
Documentation/devicetree/bindings/arm/sunxi.txt +1 -0
@@ -18,4 +18,5 @@ using one of the following compatible strings: allwinner,sun8i-v3s allwinner,sun9i-a80 allwinner,sun50i-a64 + allwinner,suniv-f1c100s nextthing,gr8
Signature · 1 line
2.7.4
Re: [RFC PATCH v3 02/17] dt-bindings: arm: Add new Allwinner ARMv5 F1C100s SoC
Quoted 3 lines · Mesih Kilinc
Add new Allwinner ARMv5 F1C100s SoC's compatible string
Signed-off-by Mesih Kilinc <[email protected]>
Maxime
Signature · 10 lines
Maxime Ripard, Bootlin Embedded Linux and Kernel engineering https://bootlin.com -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 228 bytes Desc: not available URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20181122/ced98911/attachment.sig>
RFC PATCH v3 3/17 ARM: sunxi: add Allwinner ARMv5 SoCs
In reply to Mesih KilincAdd option for Allwinner ARMv5 SoCs and SoC F1C100s (which has a die used for many new F-series products, including F1C100A, F1C100s, F1C200s, F1C500, F1C600).
--- arch/arm/mach-sunxi/Kconfig | 16 +++++++++++++++- arch/arm/mach-sunxi/sunxi.c | 10 ++++++++++ 2 files changed, 25 insertions(+), 1 deletion(-)
arch/arm/mach-sunxi/Kconfig +15 -1
@@ -1,6 +1,6 @@ menuconfig ARCH_SUNXI bool "Allwinner SoCs" - depends on ARCH_MULTI_V7 + depends on ARCH_MULTI_V5 || ARCH_MULTI_V7 select ARCH_HAS_RESET_CONTROLLER select CLKSRC_MMIO select GENERIC_IRQ_CHIP
@@ -64,4 +64,18 @@ config ARCH_SUNXI_MC_SMP endif +if ARCH_MULTI_V5 + +config ARCH_SUNXI_V5 + bool + +config MACH_SUNIV + bool "Allwinner ARMv5 F-series (suniv) SoCs support" + select ARCH_SUNXI_V5 + help + Support for Allwinner suniv ARMv5 SoCs. + (F1C100A, F1C100s, F1C200s, F1C500, F1C600) + +endif + endif
arch/arm/mach-sunxi/sunxi.c +10 -0
@@ -101,3 +101,13 @@ static const char * const sun9i_board_dt_compat[] = {DT_MACHINE_START (SUN9I_DT ,"Allwinner sun9i Family" ) .dt_compat = sun9i_board_dt_compat, MACHINE_END + +static const char *const suniv_board_dt_compat[] = { +"allwinner,suniv-f1c100s" , +NULL , +}; + +DT_MACHINE_START (SUNIV_DT ,"Allwinner suniv Family" ) + .dt_compat = suniv_board_dt_compat, +MACHINE_END +
Signature · 1 line
2.7.4
Re: [RFC PATCH v3 03/17] ARM: sunxi: add Allwinner ARMv5 SoCs
Quoted 5 lines · Mesih Kilinc
Add option for Allwinner ARMv5 SoCs and SoC F1C100s (which has a die used for many new F-series products, including F1C100A, F1C100s, F1C200s, F1C500, F1C600).
Signed-off-by Mesih Kilinc <[email protected]>
maxime
Signature · 10 lines
Maxime Ripard, Bootlin Embedded Linux and Kernel engineering https://bootlin.com -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 228 bytes Desc: not available URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20181122/6c95dd11/attachment.sig>
RFC PATCH v3 4/17 dt-bindings: interrupt-controller: Add suniv interrupt-controller
In reply to Mesih KilincAdd compatible string for Alwinner suniv F1C100s SoC interrupt controller which is stripped version of sun4i
--- .../devicetree/bindings/interrupt-controller/allwinner,sun4i-ic.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
Documentation/devicetree/bindings/interrupt-controller/allwinner,sun4i-ic.txt +3 -1
@@ -2,7 +2,9 @@ Allwinner Sunxi Interrupt Controller Required properties: -- compatible : should be "allwinner,sun4i-a10-ic" +- compatible : should be one of the following: + "allwinner,sun4i-a10-ic" + "allwinner,suniv-f1c100s-ic" - reg : Specifies base physical address and size of the registers. - interrupt-controller : Identifies the node as an interrupt controller - #interrupt-cells : Specifies the number of cells needed to encode an
Signature · 1 line
2.7.4
Re: [RFC PATCH v3 04/17] dt-bindings: interrupt-controller: Add suniv interrupt-controller
Quoted 4 lines · Mesih Kilinc
Add compatible string for Alwinner suniv F1C100s SoC interrupt controller which is stripped version of sun4i
Signed-off-by Mesih Kilinc <[email protected]>
Maxime
Signature · 10 lines
Maxime Ripard, Bootlin Embedded Linux and Kernel engineering https://bootlin.com -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 228 bytes Desc: not available URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20181122/9fb2a098/attachment.sig>
RFC PATCH v3 5/17 irqchip/sun4i: add support for suniv interrupt controller
In reply to Mesih KilincThe new F-series SoCs (suniv) from Allwinner use an stripped version of the interrupt controller in A10/A13
Add support for it in irq-sun4i driver.
--- drivers/irqchip/irq-sun4i.c | 104 +++++++++++++++++++++++++++++++------------- 1 file changed, 74 insertions(+), 30 deletions(-)
drivers/irqchip/irq-sun4i.c +74 -30
@@ -28,11 +28,21 @@#define SUN4I_IRQ_NMI_CTRL_REG 0x0c#define SUN4I_IRQ_PENDING_REG (x) (0x10 + 0x4 * x)#define SUN4I_IRQ_FIQ_PENDING_REG (x) (0x20 + 0x4 * x) -#define SUN4I_IRQ_ENABLE_REG (x) (0x40 + 0x4 * x) -#define SUN4I_IRQ_MASK_REG (x) (0x50 + 0x4 * x) +#define SUN4I_IRQ_ENABLE_REG (x) (irq_ic_data->enable_req_offset + 0x4 * x) +#define SUN4I_IRQ_MASK_REG (x) (irq_ic_data->mask_req_offset + 0x4 * x) +#define SUN4I_IRQ_ENABLE_REG_OFFSET 0x40 +#define SUN4I_IRQ_MASK_REG_OFFSET 0x50 +#define SUNIV_IRQ_ENABLE_REG_OFFSET 0x20 +#define SUNIV_IRQ_MASK_REG_OFFSET 0x30 + +struct sunxi_irq_chip_data { +void __iomem *irq_base; +struct irq_domain *irq_domain; +u32 enable_req_offset; +u32 mask_req_offset; +}; -static void __iomem *sun4i_irq_base; -static struct irq_domain *sun4i_irq_domain; +static struct sunxi_irq_chip_data *irq_ic_data; static void __exception_irq_entry sun4i_handle_irq(struct pt_regs *regs);
@@ -43,7 +53,7 @@ static void sun4i_irq_ack(struct irq_data *irqd)if (irq !=0 )return ;/* Only IRQ 0 / the ENMI needs to be acked */ -writel (BIT (0 ), sun4i_irq_base +SUN4I_IRQ_PENDING_REG (0 )); +writel (BIT (0 ), irq_ic_data->irq_base +SUN4I_IRQ_PENDING_REG (0 )); }static void sun4i_irq_mask (struct irq_data *irqd)
@@ -53,9 +63,9 @@ static void sun4i_irq_mask(struct irq_data *irqd)int reg = irq /32 ;u32 val; - val =readl (sun4i_irq_base +SUN4I_IRQ_ENABLE_REG (reg)); + val =readl (irq_ic_data->irq_base +SUN4I_IRQ_ENABLE_REG (reg));writel (val & ~(1 << irq_off), - sun4i_irq_base +SUN4I_IRQ_ENABLE_REG (reg)); + irq_ic_data->irq_base +SUN4I_IRQ_ENABLE_REG (reg)); }static void sun4i_irq_unmask (struct irq_data *irqd)
@@ -65,9 +75,9 @@ static void sun4i_irq_unmask(struct irq_data *irqd)int reg = irq /32 ;u32 val; - val =readl (sun4i_irq_base +SUN4I_IRQ_ENABLE_REG (reg)); + val =readl (irq_ic_data->irq_base +SUN4I_IRQ_ENABLE_REG (reg));writel (val | (1 << irq_off), - sun4i_irq_base +SUN4I_IRQ_ENABLE_REG (reg)); + irq_ic_data->irq_base +SUN4I_IRQ_ENABLE_REG (reg)); }static struct irq_chip sun4i_irq_chip = {
@@ -95,42 +105,76 @@ static const struct irq_domain_ops sun4i_irq_ops = {static int __init sun4i_of_init (struct device_node *node,struct device_node *parent) { - sun4i_irq_base =of_iomap (node,0 ); -if (!sun4i_irq_base) + irq_ic_data->irq_base =of_iomap (node,0 ); +if (!irq_ic_data->irq_base)panic ("%pOF: unable to map IC registers\n" , node);/* Disable all interrupts */ -writel (0 , sun4i_irq_base +SUN4I_IRQ_ENABLE_REG (0 )); -writel (0 , sun4i_irq_base +SUN4I_IRQ_ENABLE_REG (1 )); -writel (0 , sun4i_irq_base +SUN4I_IRQ_ENABLE_REG (2 )); +writel (0 , irq_ic_data->irq_base +SUN4I_IRQ_ENABLE_REG (0 )); +writel (0 , irq_ic_data->irq_base +SUN4I_IRQ_ENABLE_REG (1 )); +writel (0 , irq_ic_data->irq_base +SUN4I_IRQ_ENABLE_REG (2 ));/* Unmask all the interrupts, ENABLE_REG(x) is used for masking */ -writel (0 , sun4i_irq_base +SUN4I_IRQ_MASK_REG (0 )); -writel (0 , sun4i_irq_base +SUN4I_IRQ_MASK_REG (1 )); -writel (0 , sun4i_irq_base +SUN4I_IRQ_MASK_REG (2 )); +writel (0 , irq_ic_data->irq_base +SUN4I_IRQ_MASK_REG (0 )); +writel (0 , irq_ic_data->irq_base +SUN4I_IRQ_MASK_REG (1 )); +writel (0 , irq_ic_data->irq_base +SUN4I_IRQ_MASK_REG (2 ));/* Clear all the pending interrupts */ -writel (0xffffffff , sun4i_irq_base +SUN4I_IRQ_PENDING_REG (0 )); -writel (0xffffffff , sun4i_irq_base +SUN4I_IRQ_PENDING_REG (1 )); -writel (0xffffffff , sun4i_irq_base +SUN4I_IRQ_PENDING_REG (2 )); +writel (0xffffffff , irq_ic_data->irq_base +SUN4I_IRQ_PENDING_REG (0 )); +writel (0xffffffff , irq_ic_data->irq_base +SUN4I_IRQ_PENDING_REG (1 )); +writel (0xffffffff , irq_ic_data->irq_base +SUN4I_IRQ_PENDING_REG (2 )); -/* Enable protection mode */ -writel (0x01 , sun4i_irq_base +SUN4I_IRQ_PROTECTION_REG ); +/* Enable protection mode (not available in suniv) */ +if (of_device_is_compatible (node,"allwinner,sun4i-a10-ic" )) +writel (0x01 , irq_ic_data->irq_base +SUN4I_IRQ_PROTECTION_REG );/* Configure the external interrupt source type */ -writel (0x00 , sun4i_irq_base +SUN4I_IRQ_NMI_CTRL_REG ); +writel (0x00 , irq_ic_data->irq_base +SUN4I_IRQ_NMI_CTRL_REG ); - sun4i_irq_domain =irq_domain_add_linear (node,3 *32 , + irq_ic_data->irq_domain =irq_domain_add_linear (node,3 *32 , &sun4i_irq_ops,NULL ); -if (!sun4i_irq_domain) +if (!irq_ic_data->irq_domain)panic ("%pOF: unable to create IRQ domain\n" , node);set_handle_irq (sun4i_handle_irq);return 0 ; } -IRQCHIP_DECLARE (allwinner_sun4i_ic,"allwinner,sun4i-a10-ic" , sun4i_of_init); + +static int __init sun4i_ic_of_init (struct device_node *node, +struct device_node *parent) +{ + irq_ic_data =kzalloc (sizeof (struct sunxi_irq_chip_data ),GFP_KERNEL ); +if (!irq_ic_data) { +pr_err ("kzalloc failed!\n" ); +return -ENOMEM ; + } + + irq_ic_data->enable_req_offset =SUN4I_IRQ_ENABLE_REG_OFFSET ; + irq_ic_data->mask_req_offset =SUN4I_IRQ_MASK_REG_OFFSET ; + +return sun4i_of_init (node, parent); +} + +IRQCHIP_DECLARE (allwinner_sun4i_ic,"allwinner,sun4i-a10-ic" , sun4i_ic_of_init); + +static int __init suniv_ic_of_init (struct device_node *node, +struct device_node *parent) +{ + irq_ic_data =kzalloc (sizeof (struct sunxi_irq_chip_data ),GFP_KERNEL ); +if (!irq_ic_data) { +pr_err ("kzalloc failed!\n" ); +return -ENOMEM ; + } + + irq_ic_data->enable_req_offset =SUNIV_IRQ_ENABLE_REG_OFFSET ; + irq_ic_data->mask_req_offset =SUNIV_IRQ_MASK_REG_OFFSET ; + +return sun4i_of_init (node, parent); +} + +IRQCHIP_DECLARE (allwinner_sunvi_ic,"allwinner,suniv-f1c100s-ic" , suniv_ic_of_init); static void __exception_irq_entry sun4i_handle_irq(struct pt_regs *regs) {
@@ -146,13 +190,13 @@ static void __exception_irq_entry sun4i_handle_irq(struct pt_regs *regs)* the extra check in the common case of 1 hapening after having * read the vector-reg once. */ - hwirq =readl (sun4i_irq_base +SUN4I_IRQ_VECTOR_REG ) >>2 ; + hwirq =readl (irq_ic_data->irq_base +SUN4I_IRQ_VECTOR_REG ) >>2 ;if (hwirq ==0 && - !(readl (sun4i_irq_base +SUN4I_IRQ_PENDING_REG (0 )) &BIT (0 ))) + !(readl (irq_ic_data->irq_base +SUN4I_IRQ_PENDING_REG (0 )) &BIT (0 )))return ;do { -handle_domain_irq (sun4i_irq_domain, hwirq, regs); - hwirq =readl (sun4i_irq_base +SUN4I_IRQ_VECTOR_REG ) >>2 ; +handle_domain_irq (irq_ic_data->irq_domain, hwirq, regs); + hwirq =readl (irq_ic_data->irq_base +SUN4I_IRQ_VECTOR_REG ) >>2 ; }while (hwirq !=0 ); }
Signature · 1 line
2.7.4
Re: [RFC PATCH v3 05/17] irqchip/sun4i: add support for suniv interrupt controller
Hi Mesih,
Quoted 15 lines · Mesih Kilinc
The new F-series SoCs (suniv) from Allwinner use an stripped version of the interrupt controller in A10/A13
Add support for it in irq-sun4i driver.
Signed-off-by Mesih Kilinc <[email protected]>--- drivers/irqchip/irq-sun4i.c | 104 +++++++++++++++++++++++++++++++------------- 1 file changed, 74 insertions(+), 30 deletions(-)drivers/irqchip/irq-sun4i.c +0
-0
drivers/irqchip/irq-sun4i.c line 32
Quoted 7 lines
drivers/irqchip/irq-sun4i.c +2
-2@@ -28,11 +28,21 @@#define SUN4I_IRQ_NMI_CTRL_REG 0x0c#define SUN4I_IRQ_PENDING_REG (x) (0x10 + 0x4 * x)#define SUN4I_IRQ_FIQ_PENDING_REG (x) (0x20 + 0x4 * x) -#define SUN4I_IRQ_ENABLE_REG (x) (0x40 + 0x4 * x) -#define SUN4I_IRQ_MASK_REG (x) (0x50 + 0x4 * x) +#define SUN4I_IRQ_ENABLE_REG (x) (irq_ic_data->enable_req_offset + 0x4 * x) +#define SUN4I_IRQ_MASK_REG (x) (irq_ic_data->mask_req_offset + 0x4 * x)
You shouldn't have all the values you use passed as argument, so irq_ic_data should be one of them here.
drivers/irqchip/irq-sun4i.c line 38
Quoted 6 lines
drivers/irqchip/irq-sun4i.c +6
-0+#define SUN4I_IRQ_ENABLE_REG_OFFSET 0x40 +#define SUN4I_IRQ_MASK_REG_OFFSET 0x50 +#define SUNIV_IRQ_ENABLE_REG_OFFSET 0x20 +#define SUNIV_IRQ_MASK_REG_OFFSET 0x30 + +struct sunxi_irq_chip_data {
^ a space here
drivers/irqchip/irq-sun4i.c line 42
Quoted 4 lines
drivers/irqchip/irq-sun4i.c +4
-0+void __iomem *irq_base; +struct irq_domain *irq_domain; +u32 enable_req_offset; +u32 mask_req_offset;
s/req/reg/ ?
drivers/irqchip/irq-sun4i.c line 45
Quoted 5 lines
drivers/irqchip/irq-sun4i.c +2
-2+}; -static void __iomem *sun4i_irq_base; -static struct irq_domain *sun4i_irq_domain; +static struct sunxi_irq_chip_data *irq_ic_data;
This is a very welcome change, but you should do it in two patches:
one to convert the existing code to that structure (with only the domain and base), and then a second patch to add the register offsets.
(also the structure should be prefixed with sun4i, for consistency with the rest of the driver).
Quoted 117 lines
drivers/irqchip/irq-sun4i.c +46
-22static void __exception_irq_entry sun4i_handle_irq(struct pt_regs *regs);@@ -43,7 +53,7 @@ static void sun4i_irq_ack(struct irq_data *irqd)if (irq !=0 )return ;/* Only IRQ 0 / the ENMI needs to be acked */ -writel (BIT (0 ), sun4i_irq_base +SUN4I_IRQ_PENDING_REG (0 )); +writel (BIT (0 ), irq_ic_data->irq_base +SUN4I_IRQ_PENDING_REG (0 )); }static void sun4i_irq_mask (struct irq_data *irqd)@@ -53,9 +63,9 @@ static void sun4i_irq_mask(struct irq_data *irqd)int reg = irq /32 ;u32 val; - val =readl (sun4i_irq_base +SUN4I_IRQ_ENABLE_REG (reg)); + val =readl (irq_ic_data->irq_base +SUN4I_IRQ_ENABLE_REG (reg));writel (val & ~(1 << irq_off), - sun4i_irq_base +SUN4I_IRQ_ENABLE_REG (reg)); + irq_ic_data->irq_base +SUN4I_IRQ_ENABLE_REG (reg)); }static void sun4i_irq_unmask (struct irq_data *irqd)@@ -65,9 +75,9 @@ static void sun4i_irq_unmask(struct irq_data *irqd)int reg = irq /32 ;u32 val; - val =readl (sun4i_irq_base +SUN4I_IRQ_ENABLE_REG (reg)); + val =readl (irq_ic_data->irq_base +SUN4I_IRQ_ENABLE_REG (reg));writel (val | (1 << irq_off), - sun4i_irq_base +SUN4I_IRQ_ENABLE_REG (reg)); + irq_ic_data->irq_base +SUN4I_IRQ_ENABLE_REG (reg)); }static struct irq_chip sun4i_irq_chip = {@@ -95,42 +105,76 @@ static const struct irq_domain_ops sun4i_irq_ops = {static int __init sun4i_of_init (struct device_node *node,struct device_node *parent) { - sun4i_irq_base =of_iomap (node,0 ); -if (!sun4i_irq_base) + irq_ic_data->irq_base =of_iomap (node,0 ); +if (!irq_ic_data->irq_base)panic ("%pOF: unable to map IC registers\n" , node);/* Disable all interrupts */ -writel (0 , sun4i_irq_base +SUN4I_IRQ_ENABLE_REG (0 )); -writel (0 , sun4i_irq_base +SUN4I_IRQ_ENABLE_REG (1 )); -writel (0 , sun4i_irq_base +SUN4I_IRQ_ENABLE_REG (2 )); +writel (0 , irq_ic_data->irq_base +SUN4I_IRQ_ENABLE_REG (0 )); +writel (0 , irq_ic_data->irq_base +SUN4I_IRQ_ENABLE_REG (1 )); +writel (0 , irq_ic_data->irq_base +SUN4I_IRQ_ENABLE_REG (2 ));/* Unmask all the interrupts, ENABLE_REG(x) is used for masking */ -writel (0 , sun4i_irq_base +SUN4I_IRQ_MASK_REG (0 )); -writel (0 , sun4i_irq_base +SUN4I_IRQ_MASK_REG (1 )); -writel (0 , sun4i_irq_base +SUN4I_IRQ_MASK_REG (2 )); +writel (0 , irq_ic_data->irq_base +SUN4I_IRQ_MASK_REG (0 )); +writel (0 , irq_ic_data->irq_base +SUN4I_IRQ_MASK_REG (1 )); +writel (0 , irq_ic_data->irq_base +SUN4I_IRQ_MASK_REG (2 ));/* Clear all the pending interrupts */ -writel (0xffffffff , sun4i_irq_base +SUN4I_IRQ_PENDING_REG (0 )); -writel (0xffffffff , sun4i_irq_base +SUN4I_IRQ_PENDING_REG (1 )); -writel (0xffffffff , sun4i_irq_base +SUN4I_IRQ_PENDING_REG (2 )); +writel (0xffffffff , irq_ic_data->irq_base +SUN4I_IRQ_PENDING_REG (0 )); +writel (0xffffffff , irq_ic_data->irq_base +SUN4I_IRQ_PENDING_REG (1 )); +writel (0xffffffff , irq_ic_data->irq_base +SUN4I_IRQ_PENDING_REG (2 )); -/* Enable protection mode */ -writel (0x01 , sun4i_irq_base +SUN4I_IRQ_PROTECTION_REG ); +/* Enable protection mode (not available in suniv) */ +if (of_device_is_compatible (node,"allwinner,sun4i-a10-ic" )) +writel (0x01 , irq_ic_data->irq_base +SUN4I_IRQ_PROTECTION_REG );/* Configure the external interrupt source type */ -writel (0x00 , sun4i_irq_base +SUN4I_IRQ_NMI_CTRL_REG ); +writel (0x00 , irq_ic_data->irq_base +SUN4I_IRQ_NMI_CTRL_REG ); - sun4i_irq_domain =irq_domain_add_linear (node,3 *32 , + irq_ic_data->irq_domain =irq_domain_add_linear (node,3 *32 , &sun4i_irq_ops,NULL ); -if (!sun4i_irq_domain) +if (!irq_ic_data->irq_domain)panic ("%pOF: unable to create IRQ domain\n" , node);set_handle_irq (sun4i_handle_irq);return 0 ; } -IRQCHIP_DECLARE (allwinner_sun4i_ic,"allwinner,sun4i-a10-ic" , sun4i_of_init); + +static int __init sun4i_ic_of_init (struct device_node *node, +struct device_node *parent) +{ + irq_ic_data =kzalloc (sizeof (struct sunxi_irq_chip_data ),GFP_KERNEL ); +if (!irq_ic_data) { +pr_err ("kzalloc failed!\n" ); +return -ENOMEM ; + } + + irq_ic_data->enable_req_offset =SUN4I_IRQ_ENABLE_REG_OFFSET ; + irq_ic_data->mask_req_offset =SUN4I_IRQ_MASK_REG_OFFSET ; + +return sun4i_of_init (node, parent); +} + +IRQCHIP_DECLARE (allwinner_sun4i_ic,"allwinner,sun4i-a10-ic" , sun4i_ic_of_init); + +static int __init suniv_ic_of_init (struct device_node *node, +struct device_node *parent) +{ + irq_ic_data =kzalloc (sizeof (struct sunxi_irq_chip_data ),GFP_KERNEL ); +if (!irq_ic_data) { +pr_err ("kzalloc failed!\n" );
drivers/irqchip/irq-sun4i.c static const struct irq_domain_ops sun4i_irq_ops = { · line 177
Quoted 10 lines
drivers/irqchip/irq-sun4i.c +10
-0+return -ENOMEM ; + } + + irq_ic_data->enable_req_offset =SUNIV_IRQ_ENABLE_REG_OFFSET ; + irq_ic_data->mask_req_offset =SUNIV_IRQ_MASK_REG_OFFSET ; + +return sun4i_of_init (node, parent); +} + +IRQCHIP_DECLARE (allwinner_sunvi_ic,"allwinner,suniv-f1c100s-ic" , suniv_ic_of_init);
You can even split that addition to a new patch as well.
Maxime
Signature · 10 lines
Maxime Ripard, Bootlin Embedded Linux and Kernel engineering https://bootlin.com -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 228 bytes Desc: not available URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20181122/4d3da495/attachment.sig>
Re: [RFC PATCH v3 05/17] irqchip/sun4i: add support for suniv interrupt controller
Quoted 2 lines · Maxime Ripard
Hi Mesih,
Hi!
Quoted 11 lines · Mesih Kilinc
Quoted 10 lines
The new F-series SoCs (suniv) from Allwinner use an stripped version of the interrupt controller in A10/A13
Add support for it in irq-sun4i driver.
Signed-off-by Mesih Kilinc <[email protected]>--- drivers/irqchip/irq-sun4i.c | 104 +++++++++++++++++++++++++++++++------------- 1 file changed, 74 insertions(+), 30 deletions(-)
Quoted 16 lines
drivers/irqchip/irq-sun4i.c line 32
Quoted 12 lines
drivers/irqchip/irq-sun4i.c +2
-2@@ -28,11 +28,21 @@#define SUN4I_IRQ_NMI_CTRL_REG 0x0c#define SUN4I_IRQ_PENDING_REG (x) (0x10 + 0x4 * x)#define SUN4I_IRQ_FIQ_PENDING_REG (x) (0x20 + 0x4 * x) -#define SUN4I_IRQ_ENABLE_REG (x) (0x40 + 0x4 * x) -#define SUN4I_IRQ_MASK_REG (x) (0x50 + 0x4 * x) +#define SUN4I_IRQ_ENABLE_REG (x) (irq_ic_data->enable_req_offset + 0x4 * x) +#define SUN4I_IRQ_MASK_REG (x) (irq_ic_data->mask_req_offset + 0x4 * x)You shouldn't have all the values you use passed as argument, so
irq_ic_datashould be one of them here.
Could you elaborate it a little bit?
Quoted 8 lines
drivers/irqchip/irq-sun4i.c line 38
Quoted 6 lines
drivers/irqchip/irq-sun4i.c +6
-0+#define SUN4I_IRQ_ENABLE_REG_OFFSET 0x40 +#define SUN4I_IRQ_MASK_REG_OFFSET 0x50 +#define SUNIV_IRQ_ENABLE_REG_OFFSET 0x20 +#define SUNIV_IRQ_MASK_REG_OFFSET 0x30 + +struct sunxi_irq_chip_data {^ a space here
Quoted 7 lines
drivers/irqchip/irq-sun4i.c line 42
Quoted 4 lines
drivers/irqchip/irq-sun4i.c +4
-0+void __iomem *irq_base; +struct irq_domain *irq_domain; +u32 enable_req_offset; +u32 mask_req_offset;s/req/reg/ ?
Oops sorry
...
Quoted 11 lines
Quoted 11 lines
drivers/irqchip/irq-sun4i.c +11
-0+ +static int __init suniv_ic_of_init (struct device_node *node, +struct device_node *parent) +{ + irq_ic_data =kzalloc (sizeof (struct sunxi_irq_chip_data ),GFP_KERNEL ); +if (!irq_ic_data) { +pr_err ("kzalloc failed!\n" ); +return -ENOMEM ; + } + + irq_ic_data->enable_req_offset =SUNIV_IRQ_ENABLE_REG_OFFSET ;
Quoted 8 lines
drivers/irqchip/irq-sun4i.c static const struct irq_domain_ops sun4i_irq_ops = { · line 177
Quoted 6 lines
drivers/irqchip/irq-sun4i.c +6
-0+ irq_ic_data->mask_req_offset =SUNIV_IRQ_MASK_REG_OFFSET ; + +return sun4i_of_init (node, parent); +} + +IRQCHIP_DECLARE (allwinner_sunvi_ic,"allwinner,suniv-f1c100s-ic" , suniv_ic_of_init);You can even split that addition to a new patch as well.
OK. I will do 3 patches. First one will add a struct that holds only base and domain. Second one will add register offsets to that struct. Third one will add f1c100s support. Is that ok?
Mesih
Re: [RFC PATCH v3 05/17] irqchip/sun4i: add support for suniv interrupt controller
Quoted 17 lines · Mesih Kilinc
Quoted 7 lines
Quoted 7 lines
drivers/irqchip/irq-sun4i.c +0
-0@@ -28,11 +28,21 @@#define SUN4I_IRQ_NMI_CTRL_REG 0x0c#define SUN4I_IRQ_PENDING_REG (x) (0x10 + 0x4 * x)Quoted 9 lines
drivers/irqchip/irq-sun4i.c line 32
Quoted 5 lines
drivers/irqchip/irq-sun4i.c +2
-2#define SUN4I_IRQ_FIQ_PENDING_REG (x) (0x20 + 0x4 * x) -#define SUN4I_IRQ_ENABLE_REG (x) (0x40 + 0x4 * x) -#define SUN4I_IRQ_MASK_REG (x) (0x50 + 0x4 * x) +#define SUN4I_IRQ_ENABLE_REG (x) (irq_ic_data->enable_req_offset + 0x4 * x) +#define SUN4I_IRQ_MASK_REG (x) (irq_ic_data->mask_req_offset + 0x4 * x)You shouldn't have all the values you use passed as argument, so
irq_ic_datashould be one of them here.
Quoted 1 line
Could you elaborate it a little bit?
You should change your macro to something like:
SUN4I_IRQ_ENABLE_REG(data, x) ((data)->enable_req_offset + 0x4 * x)
That way, you are transparent about the parameters that the macro expects, and don't rely on some unwritten rule about the variable name.
Quoted 20 lines
Quoted 11 lines
Quoted 11 lines
drivers/irqchip/irq-sun4i.c +11
-0+ +static int __init suniv_ic_of_init (struct device_node *node, +struct device_node *parent) +{ + irq_ic_data =kzalloc (sizeof (struct sunxi_irq_chip_data ),GFP_KERNEL ); +if (!irq_ic_data) { +pr_err ("kzalloc failed!\n" ); +return -ENOMEM ; + } + + irq_ic_data->enable_req_offset =SUNIV_IRQ_ENABLE_REG_OFFSET ;Quoted 8 lines
drivers/irqchip/irq-sun4i.c static const struct irq_domain_ops sun4i_irq_ops = { · line 177
Quoted 6 lines
drivers/irqchip/irq-sun4i.c +6
-0+ irq_ic_data->mask_req_offset =SUNIV_IRQ_MASK_REG_OFFSET ; + +return sun4i_of_init (node, parent); +} + +IRQCHIP_DECLARE (allwinner_sunvi_ic,"allwinner,suniv-f1c100s-ic" , suniv_ic_of_init);You can even split that addition to a new patch as well.
Quoted 3 lines
OK. I will do 3 patches. First one will add a struct that holds only base and domain. Second one will add register offsets to that struct. Third one will add f1c100s support. Is that ok?
Sounds perfect :)
Thanks!
Maxime
Signature · 10 lines
Maxime Ripard, Bootlin Embedded Linux and Kernel engineering https://bootlin.com -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 228 bytes Desc: not available URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20181122/6f17eed2/attachment.sig>
RFC PATCH v3 6/17 dt-bindings: timer: Add Allwinner suniv timer
In reply to Mesih KilincAdd compatible string for Allwinner suniv timer which is similar to sun4i timer.
--- Documentation/devicetree/bindings/timer/allwinner,sun4i-timer.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
Documentation/devicetree/bindings/timer/allwinner,sun4i-timer.txt +3 -1
@@ -2,7 +2,9 @@ Allwinner A1X SoCs Timer Controller Required properties: -- compatible : should be "allwinner,sun4i-a10-timer" +- compatible : should be one of the following: + "allwinner,sun4i-a10-timer" + "allwinner,suniv-f1c100s-timer" - reg : Specifies base physical address and size of the registers. - interrupts : The interrupt of the first timer - clocks: phandle to the source clock (usually a 24 MHz fixed clock)
Signature · 1 line
2.7.4
Re: [RFC PATCH v3 06/17] dt-bindings: timer: Add Allwinner suniv timer
Quoted 4 lines · Mesih Kilinc
Add compatible string for Allwinner suniv timer which is similar to sun4i timer.
Signed-off-by Mesih Kilinc <[email protected]>
Maxime
Signature · 10 lines
Maxime Ripard, Bootlin Embedded Linux and Kernel engineering https://bootlin.com -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 228 bytes Desc: not available URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20181122/72c5fce3/attachment-0001.sig>
RFC PATCH v3 7/17 clocksource: sun4i: add a compatible for suniv
In reply to Mesih KilincThe suniv (new F-series) chip has a timer with less functionality than the A10 timer, e.g. it has only 3 channels.
Add a new compatible for it. As we didn't use the extra channels on A10 either now, the code needn't to be changed.
The suniv chip is based on ARM926EJ-S CPU, thus it has no architecture timer.
Register sun4i_timer as sched_clock on it.
--- drivers/clocksource/sun4i_timer.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/clocksource/sun4i_timer.c +4 -1
@@ -186,7 +186,8 @@ static int __init sun4i_timer_init(struct device_node *node)*/ if (of_machine_is_compatible ("allwinner,sun4i-a10" ) ||of_machine_is_compatible ("allwinner,sun5i-a13" ) || -of_machine_is_compatible ("allwinner,sun5i-a10s" )) +of_machine_is_compatible ("allwinner,sun5i-a10s" ) || +of_machine_is_compatible ("allwinner,suniv-f1c100s" ))sched_clock_register (sun4i_timer_sched_read,32 ,timer_of_rate (&to));
@@ -218,3 +219,5 @@ static int __init sun4i_timer_init(struct device_node *node) }TIMER_OF_DECLARE (sun4i,"allwinner,sun4i-a10-timer" , sun4i_timer_init); +TIMER_OF_DECLARE (suniv,"allwinner,suniv-f1c100s-timer" , + sun4i_timer_init);
Signature · 1 line
2.7.4
Re: [RFC PATCH v3 07/17] clocksource: sun4i: add a compatible for suniv
Quoted 11 lines · Mesih Kilinc
The suniv (new F-series) chip has a timer with less functionality than the A10 timer, e.g. it has only 3 channels.
Add a new compatible for it. As we didn't use the extra channels on A10 either now, the code needn't to be changed.
The suniv chip is based on ARM926EJ-S CPU, thus it has no architecture timer.
Register
sun4i_timerassched_clockon it.Signed-off-by Mesih Kilinc <[email protected]>
Maxime
Signature · 10 lines
Maxime Ripard, Bootlin Embedded Linux and Kernel engineering https://bootlin.com -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 228 bytes Desc: not available URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20181122/5f757349/attachment.sig>
Re: [RFC PATCH v3 07/17] clocksource: sun4i: add a compatible for suniv
In reply to Mesih KilincQuoted 11 lines · Mesih Kilinc
The suniv (new F-series) chip has a timer with less functionality than the A10 timer, e.g. it has only 3 channels.
Add a new compatible for it. As we didn't use the extra channels on A10 either now, the code needn't to be changed.
The suniv chip is based on ARM926EJ-S CPU, thus it has no architecture timer.
Register
sun4i_timerassched_clockon it.Signed-off-by Mesih Kilinc <[email protected]>
Quoted 25 lines
--- drivers/clocksource/sun4i_timer.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)drivers/clocksource/sun4i_timer.c +4
-1@@ -186,7 +186,8 @@ static int __init sun4i_timer_init(struct device_node *node)*/ if (of_machine_is_compatible ("allwinner,sun4i-a10" ) ||of_machine_is_compatible ("allwinner,sun5i-a13" ) || -of_machine_is_compatible ("allwinner,sun5i-a10s" )) +of_machine_is_compatible ("allwinner,sun5i-a10s" ) || +of_machine_is_compatible ("allwinner,suniv-f1c100s" ))sched_clock_register (sun4i_timer_sched_read,32 ,timer_of_rate (&to));@@ -218,3 +219,5 @@ static int __init sun4i_timer_init(struct device_node *node) }TIMER_OF_DECLARE (sun4i,"allwinner,sun4i-a10-timer" , sun4i_timer_init); +TIMER_OF_DECLARE (suniv,"allwinner,suniv-f1c100s-timer" , + sun4i_timer_init);
Signature · 5 lines
<http://www.linaro.org/> Linaro.org ? Open source software for ARM SoCs Follow Linaro: <http://www.facebook.com/pages/Linaro> Facebook | <http://twitter.com/#!/linaroorg> Twitter | <http://www.linaro.org/linaro-blog/> Blog
RFC PATCH v3 8/17 dt-bindings: pinctrl: Add Allwinner suniv F1C100s pinctrl
In reply to Mesih KilincAdd compatible string for Allwinner suniv F1C100s SoC's pinctrl.
--- Documentation/devicetree/bindings/pinctrl/allwinner,sunxi-pinctrl.txt | 1 + 1 file changed, 1 insertion(+)
Documentation/devicetree/bindings/pinctrl/allwinner,sunxi-pinctrl.txt +1 -0
@@ -29,6 +29,7 @@ Required properties: "allwinner,sun50i-h5-pinctrl" "allwinner,sun50i-h6-pinctrl" "allwinner,sun50i-h6-r-pinctrl" + "allwinner,suniv-f1c100s-pinctrl" "nextthing,gr8-pinctrl" - reg: Should contain the register physical address and length for the
Signature · 1 line
2.7.4
Re: [RFC PATCH v3 08/17] dt-bindings: pinctrl: Add Allwinner suniv F1C100s pinctrl
Quoted 3 lines · Mesih Kilinc
Add compatible string for Allwinner suniv F1C100s SoC's pinctrl.
Signed-off-by Mesih Kilinc <[email protected]>
Maxime
Signature · 10 lines
Maxime Ripard, Bootlin Embedded Linux and Kernel engineering https://bootlin.com -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 228 bytes Desc: not available URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20181122/14daae74/attachment.sig>
RFC PATCH v3 9/17 pinctrl: sunxi: add support for suniv F1C100s (newer F-series SoCs)
In reply to Mesih KilincThe suniv F1C100s chip (several new F-series SoCs) of Allwinner has a pin
controller like other SoCs from Allwinner.
Add support for it.
--- drivers/pinctrl/sunxi/Kconfig | 4 + drivers/pinctrl/sunxi/Makefile | 1 + drivers/pinctrl/sunxi/pinctrl-suniv-f1c100s.c | 417 ++++++++++++++++++++++++++ 3 files changed, 422 insertions(+) create mode 100644 drivers/pinctrl/sunxi/pinctrl-suniv-f1c100s.c
drivers/pinctrl/sunxi/Kconfig +4 -0
@@ -6,6 +6,10 @@ config PINCTRL_SUNXI select GENERIC_PINCONF select GPIOLIB +config PINCTRL_SUNIV_F1C100S + def_bool MACH_SUNIV + select PINCTRL_SUNXI + config PINCTRL_SUN4I_A10 def_bool MACH_SUN4I || MACH_SUN7I || MACH_SUN8I select PINCTRL_SUNXI
drivers/pinctrl/sunxi/Makefile +1 -0
@@ -3,6 +3,7 @@ obj-y += pinctrl-sunxi.o # SoC Drivers +obj-$(CONFIG_PINCTRL_SUNIV_F1C100S) += pinctrl-suniv-f1c100s.o obj-$(CONFIG_PINCTRL_SUN4I_A10) += pinctrl-sun4i-a10.o obj-$(CONFIG_PINCTRL_SUN5I) += pinctrl-sun5i.o obj-$(CONFIG_PINCTRL_SUN6I_A31) += pinctrl-sun6i-a31.o
drivers/pinctrl/sunxi/pinctrl-suniv-f1c100s.c new file +417 -0
417 lines not on this page · raw message
Signature · 1 line
2.7.4
Re: [RFC PATCH v3 09/17] pinctrl: sunxi: add support for suniv F1C100s (newer F-series SoCs)
Quoted 7 lines · Mesih Kilinc
The suniv F1C100s chip (several new F-series SoCs) of Allwinner has a pin
controller like other SoCs from Allwinner.Add support for it.
Signed-off-by Mesih Kilinc <[email protected]>
Maxime
Signature · 10 lines
Maxime Ripard, Bootlin Embedded Linux and Kernel engineering https://bootlin.com -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 228 bytes Desc: not available URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20181122/9f892c7e/attachment.sig>
Re: [RFC PATCH v3 09/17] pinctrl: sunxi: add support for suniv F1C100s (newer F-series SoCs)
In reply to Mesih KilincHi,
drivers/pinctrl/sunxi/pinctrl-suniv-f1c100s.c line 397
Quoted 6 lines · Mesih Kilinc
drivers/pinctrl/sunxi/pinctrl-suniv-f1c100s.c new file +6
-0+static const struct sunxi_pinctrl_desc suniv_f1c100s_pinctrl_data = { + .pins = suniv_f1c100s_pins, + .npins =ARRAY_SIZE (suniv_f1c100s_pins), + .irq_banks =3 , + .disable_strict_mode = true, +};
One thing I forgot to check before giving my Acked-by, you shouldn't disable the strict mode here, this is only meant as a legacy option, new drivers need to enforce it.
Maxime
Signature · 10 lines
Maxime Ripard, Bootlin Embedded Linux and Kernel engineering https://bootlin.com -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 228 bytes Desc: not available URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20181122/478fd4e9/attachment.sig>
RFC PATCH v3 10/17 dt-bindings: clock: Add Allwinner suniv F1C100s CCU
In reply to Mesih KilincAdd compatiple string for Allwinner suniv F1C100s CCU. Add clock and reset definitions.
--- .../devicetree/bindings/clock/sunxi-ccu.txt | 1 + include/dt-bindings/clock/suniv-ccu-f1c100s.h | 69 ++++++++++++++++++++++ include/dt-bindings/reset/suniv-ccu-f1c100s.h | 37 ++++++++++++ 3 files changed, 107 insertions(+) create mode 100644 include/dt-bindings/clock/suniv-ccu-f1c100s.h create mode 100644 include/dt-bindings/reset/suniv-ccu-f1c100s.h
Documentation/devicetree/bindings/clock/sunxi-ccu.txt +1 -0
@@ -22,6 +22,7 @@ Required properties : - "allwinner,sun50i-h5-ccu" - "allwinner,sun50i-h6-ccu" - "allwinner,sun50i-h6-r-ccu" + - "allwinner,suniv-f1c100s-ccu" - "nextthing,gr8-ccu" - reg: Must contain the registers base address and length
include/dt-bindings/clock/suniv-ccu-f1c100s.h new file +69 -0
69 lines not on this page · raw message
include/dt-bindings/reset/suniv-ccu-f1c100s.h new file +37 -0
@@ -0,0 +1,37 @@ +/* +* Copyright (C) 2018 Icenowy Zheng <[email protected]> +* +* SPDX-License-Identifier: (GPL-2.0+ OR MIT) +*/ + +#ifndef _DT_BINDINGS_RST_SUNIV_F1C100S_H_ +#define _DT_BINDINGS_RST_SUNIV_F1C100S_H_ + +#define RST_USB_PHY0 0 +#define RST_BUS_MMC0 1 +#define RST_BUS_MMC1 2 +#define RST_BUS_DRAM 3 +#define RST_BUS_SPI0 4 +#define RST_BUS_SPI1 5 +#define RST_BUS_OTG 6 +#define RST_BUS_VE 7 +#define RST_BUS_LCD 8 +#define RST_BUS_DEINTERLACE 9 +#define RST_BUS_CSI 10 +#define RST_BUS_TVD 11 +#define RST_BUS_TVE 12 +#define RST_BUS_DE_BE 13 +#define RST_BUS_DE_FE 14 +#define RST_BUS_CODEC 15 +#define RST_BUS_SPDIF 16 +#define RST_BUS_IR 17 +#define RST_BUS_RSB 18 +#define RST_BUS_I2S0 19 +#define RST_BUS_I2C0 20 +#define RST_BUS_I2C1 21 +#define RST_BUS_I2C2 22 +#define RST_BUS_UART0 23 +#define RST_BUS_UART1 24 +#define RST_BUS_UART2 25 + +#endif /* _DT_BINDINGS_RST_SUNIV_F1C100S_H_ */
Signature · 1 line
2.7.4
Re: [RFC PATCH v3 10/17] dt-bindings: clock: Add Allwinner suniv F1C100s CCU
Quoted 4 lines · Mesih Kilinc
Add compatiple string for Allwinner suniv F1C100s CCU. Add clock and reset definitions.
Signed-off-by Mesih Kilinc <[email protected]>
Maxime
Signature · 10 lines
Maxime Ripard, Bootlin Embedded Linux and Kernel engineering https://bootlin.com -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 228 bytes Desc: not available URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20181122/31ab0d82/attachment.sig>
RFC PATCH v3 11/17 clk: sunxi-ng: add support for suniv F1C100s SoC
In reply to Mesih KilincThe suniv F1C100s SoC (the chip in some new F-series products of Allwinner)
has a CCU which seems to be a stripped version of the CCU in SoCs after sun6i.
Add support for the CCU.
--- drivers/clk/sunxi-ng/Kconfig | 5 + drivers/clk/sunxi-ng/Makefile | 1 + drivers/clk/sunxi-ng/ccu-suniv-f1c100s.c | 536 +++++++++++++++++++++++++++++++ drivers/clk/sunxi-ng/ccu-suniv-f1c100s.h | 34 ++ 4 files changed, 576 insertions(+) create mode 100644 drivers/clk/sunxi-ng/ccu-suniv-f1c100s.c create mode 100644 drivers/clk/sunxi-ng/ccu-suniv-f1c100s.h
drivers/clk/sunxi-ng/Kconfig +5 -0
@@ -6,6 +6,11 @@ config SUNXI_CCU if SUNXI_CCU +config SUNIV_F1C100S_CCU + bool "Support for the Allwinner newer F1C100s CCU" + default MACH_SUNIV + depends on MACH_SUNIV || COMPILE_TEST + config SUN50I_A64_CCU bool "Support for the Allwinner A64 CCU" default ARM64 && ARCH_SUNXI
drivers/clk/sunxi-ng/Makefile +1 -0
@@ -21,6 +21,7 @@ obj-y += ccu_nm.o obj-y += ccu_mp.o # SoC support +obj-$(CONFIG_SUNIV_F1C100S_CCU) += ccu-suniv-f1c100s.o obj-$(CONFIG_SUN50I_A64_CCU) += ccu-sun50i-a64.o obj-$(CONFIG_SUN50I_H6_CCU) += ccu-sun50i-h6.o obj-$(CONFIG_SUN50I_H6_R_CCU) += ccu-sun50i-h6-r.o
drivers/clk/sunxi-ng/ccu-suniv-f1c100s.c new file +536 -0
536 lines not on this page · raw message
drivers/clk/sunxi-ng/ccu-suniv-f1c100s.h new file +34 -0
@@ -0,0 +1,34 @@ +/* +* Copyright 2017 Icenowy Zheng <[email protected]> +* +* SPDX-License-Identifier: GPL-2.0+ +*/ + +#ifndef _CCU_SUNIV_F1C100S_H_ +#define _CCU_SUNIV_F1C100S_H_ + +#include <dt-bindings/clock/suniv-ccu-f1c100s.h> +#include <dt-bindings/reset/suniv-ccu-f1c100s.h> + +#define CLK_PLL_CPU 0 +#define CLK_PLL_AUDIO_BASE 1 +#define CLK_PLL_AUDIO 2 +#define CLK_PLL_AUDIO_2X 3 +#define CLK_PLL_AUDIO_4X 4 +#define CLK_PLL_AUDIO_8X 5 +#define CLK_PLL_VIDEO 6 +#define CLK_PLL_VIDEO_2X 7 +#define CLK_PLL_VE 8 +#define CLK_PLL_DDR0 9 +#define CLK_PLL_PERIPH 10 + +/* CPU clock is exported */ + +#define CLK_AHB 12 +#define CLK_APB 13 + +/* All bus gates, DRAM gates and mod clocks are exported */ + +#define CLK_NUMBER (CLK_AVS + 1) + +#endif /* _CCU_SUNIV_F1C100S_H_ */
Signature · 1 line
2.7.4
Re: [RFC PATCH v3 11/17] clk: sunxi-ng: add support for suniv F1C100s SoC
Quoted 8 lines · Mesih Kilinc
The suniv F1C100s SoC (the chip in some new F-series products of Allwinner)
has a CCU which seems to be a stripped version of the CCU in SoCs after sun6i.Add support for the CCU.
Signed-off-by Mesih Kilinc <[email protected]>
Maxime
Signature · 10 lines
Maxime Ripard, Bootlin Embedded Linux and Kernel engineering https://bootlin.com -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 228 bytes Desc: not available URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20181122/3b93826b/attachment.sig>
RFC PATCH v3 12/17 dt-bindings: sram: Add Allwinner suniv F1C100s
In reply to Mesih KilincThe suniv ARMv5 F1C100s chip has similar sram controller to sun4i A10. Add compatible string for it.
--- Documentation/devicetree/bindings/sram/sunxi-sram.txt | 4 ++++ 1 file changed, 4 insertions(+)
Documentation/devicetree/bindings/sram/sunxi-sram.txt +4 -0
@@ -19,6 +19,7 @@ Required properties: - "allwinner,sun50i-a64-sram-controller" (deprecated) - "allwinner,sun50i-a64-system-control" - "allwinner,sun50i-h6-system-control", "allwinner,sun50i-a64-system-control" + - "allwinner,suniv-f1c100s-system-control" - reg : sram controller register offset + length SRAM nodes
@@ -58,6 +59,9 @@ The valid sections compatible for A64 are: The valid sections compatible for H6 are: - allwinner,sun50i-h6-sram-c, allwinner,sun50i-a64-sram-c +The valid sections compatible for F1C100s are: + - allwinner,suniv-f1c100s-sram-d + Devices using SRAM sections ---------------------------
Signature · 1 line
2.7.4
Re: [RFC PATCH v3 12/17] dt-bindings: sram: Add Allwinner suniv F1C100s
Quoted 4 lines · Mesih Kilinc
The suniv ARMv5 F1C100s chip has similar sram controller to sun4i A10. Add compatible string for it.
Signed-off-by Mesih Kilinc <[email protected]>
Maxime
Signature · 10 lines
Maxime Ripard, Bootlin Embedded Linux and Kernel engineering https://bootlin.com -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 228 bytes Desc: not available URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20181122/939dea31/attachment.sig>
RFC PATCH v3 13/17 SoC: sunxi: Add support for Allwinner ARMv5 F1C100s sram
In reply to Mesih KilincAllwinner ARMv5 F1C100s has similar sram controller to sun4i A10 Add compatible strings for it.
--- drivers/soc/sunxi/sunxi_sram.c | 8 ++++++++ 1 file changed, 8 insertions(+)
drivers/soc/sunxi/sunxi_sram.c +8 -0
@@ -99,6 +99,10 @@ static const struct of_device_id sunxi_sram_dt_ids[] = { .compatible = "allwinner,sun50i-a64-sram-c", .data = &sun50i_a64_sram_c.data, }, + { + .compatible = "allwinner,suniv-f1c100s-sram-d", + .data = &sun4i_a10_sram_d.data, + }, {} };
@@ -389,6 +393,10 @@ static const struct of_device_id sunxi_sram_dt_match[] = { .compatible = "allwinner,sun50i-a64-system-control", .data = &sun50i_a64_sramc_variant, }, + { + .compatible = "allwinner,suniv-f1c100s-system-control", + .data = &sun4i_a10_sramc_variant, + }, { }, };MODULE_DEVICE_TABLE (of, sunxi_sram_dt_match);
Signature · 1 line
2.7.4
Re: [RFC PATCH v3 13/17] SoC: sunxi: Add support for Allwinner ARMv5 F1C100s sram
Quoted 4 lines · Mesih Kilinc
Allwinner ARMv5 F1C100s has similar sram controller to sun4i A10 Add compatible strings for it.
Signed-off-by Mesih Kilinc <[email protected]>
Maxime
Signature · 10 lines
Maxime Ripard, Bootlin Embedded Linux and Kernel engineering https://bootlin.com -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 228 bytes Desc: not available URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20181122/9dbcfd8f/attachment-0001.sig>
RFC PATCH v3 14/17 dt-bindings: watchdog: Add Allwinner ARMv5 F1C100s wdt
In reply to Mesih KilincAllwinner ARMv5 F1C100s has similar watchdog timer to sun6i A31. Add definition for it.
--- Documentation/devicetree/bindings/watchdog/sunxi-wdt.txt | 1 + 1 file changed, 1 insertion(+)
Documentation/devicetree/bindings/watchdog/sunxi-wdt.txt +1 -0
@@ -6,6 +6,7 @@ Required properties: "allwinner,sun4i-a10-wdt" "allwinner,sun6i-a31-wdt" "allwinner,sun50i-a64-wdt","allwinner,sun6i-a31-wdt" + "allwinner,suniv-f1c100s-wdt" - reg : Specifies base physical address and size of the registers. Optional properties:
Signature · 1 line
2.7.4
Re: [RFC PATCH v3 14/17] dt-bindings: watchdog: Add Allwinner ARMv5 F1C100s wdt
Quoted 4 lines · Mesih Kilinc
Allwinner ARMv5 F1C100s has similar watchdog timer to sun6i A31. Add definition for it.
Signed-off-by Mesih Kilinc <[email protected]>
Maxime
Signature · 10 lines
Maxime Ripard, Bootlin Embedded Linux and Kernel engineering https://bootlin.com -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 228 bytes Desc: not available URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20181122/f90cc857/attachment.sig>
RFC PATCH v3 15/17 watchdog: Add support for Allwinner ARMv5 F1C100s wdt
In reply to Mesih KilincAllwinner ARMv5 F1C100s has similar watchdog timer to sun6i A31. Add compatible string for it.
--- drivers/watchdog/sunxi_wdt.c | 1 + 1 file changed, 1 insertion(+)
drivers/watchdog/sunxi_wdt.c +1 -0
@@ -227,6 +227,7 @@ static const struct sunxi_wdt_reg sun6i_wdt_reg = {static const struct of_device_id sunxi_wdt_dt_ids[] = { { .compatible ="allwinner,sun4i-a10-wdt" , .data = &sun4i_wdt_reg }, { .compatible ="allwinner,sun6i-a31-wdt" , .data = &sun6i_wdt_reg }, + { .compatible ="allwinner,suniv-f1c100s-wdt" , .data = &sun6i_wdt_reg }, {/* sentinel */ } };MODULE_DEVICE_TABLE (of, sunxi_wdt_dt_ids);
Signature · 1 line
2.7.4
RFC PATCH v3 16/17 ARM: dts: suniv: add initial DTSI file for F1C100s
In reply to Mesih KilincF1C100s is one product with the suniv die, which has a 32MiB co-packaged DDR1 DRAM chip. As we have the support for suniv pin controller and CCU now, add a initial DTSI for it.
--- arch/arm/boot/dts/suniv-f1c100s.dtsi | 151 +++++++++++++++++++++++++++++++++++ 1 file changed, 151 insertions(+) create mode 100644 arch/arm/boot/dts/suniv-f1c100s.dtsi
arch/arm/boot/dts/suniv-f1c100s.dtsi new file +151 -0
@@ -0,0 +1,151 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR X11) +/* + * Copyright 2018 Icenowy Zheng <[email protected]> + * Copyright 2018 Mesih Kilinc <[email protected]> + */ + +#include <dt-bindings/clock/suniv-ccu-f1c100s.h> +#include <dt-bindings/reset/suniv-ccu-f1c100s.h> + +/ { + #address-cells = <1>; + #size-cells = <1>; + interrupt-parent = <&intc>; + + clocks { + #address-cells = <1>; + #size-cells = <1>; + ranges; + + osc24M: clk-24M { + #clock-cells = <0>; + compatible = "fixed-clock"; + clock-frequency = <24000000>; + clock-output-names = "osc24M"; + }; + + osc32k: clk-32k { + #clock-cells = <0>; + compatible = "fixed-clock"; + clock-frequency = <32768>; + clock-output-names = "osc32k"; + }; + }; + + cpus { + #address-cells = <0>; + #size-cells = <0>; + + cpu { + compatible = "arm,arm926ej-s"; + device_type = "cpu"; + }; + }; + + soc { + compatible = "simple-bus"; + #address-cells = <1>; + #size-cells = <1>; + ranges; + + sram-controller at 1c00000 { + compatible = "allwinner,suniv-f1c100s-system-control"; + reg = <0x01c00000 0x30>; + #address-cells = <1>; + #size-cells = <1>; + ranges; + + sram_d: sram at 10000 { + compatible = "mmio-sram"; + reg = <0x00010000 0x1000>; + #address-cells = <1>; + #size-cells = <1>; + ranges = <0 0x00010000 0x1000>; + + otg_sram: sram-section at 0 { + compatible = "allwinner,suniv-f1c100s-sram-d"; + reg = <0x0000 0x1000>; + status = "disabled"; + }; + }; + }; + + ccu: clock at 1c20000 { + compatible = "allwinner,suniv-f1c100s-ccu"; + reg = <0x01c20000 0x400>; + clocks = <&osc24M>, <&osc32k>; + clock-names = "hosc", "losc"; + #clock-cells = <1>; + #reset-cells = <1>; + }; + + intc: interrupt-controller at 1c20400 { + compatible = "allwinner,suniv-f1c100s-ic"; + reg = <0x01c20400 0x400>; + interrupt-controller; + #interrupt-cells = <1>; + }; + + pio: pinctrl at 1c20800 { + compatible = "allwinner,suniv-f1c100s-pinctrl"; + reg = <0x01c20800 0x400>; + interrupts = <38>, <39>, <40>; + clocks = <&ccu CLK_BUS_PIO>, <&osc24M>, <&osc32k>; + clock-names = "apb", "hosc", "losc"; + gpio-controller; + interrupt-controller; + #interrupt-cells = <3>; + #gpio-cells = <3>; + + uart0_pins_a: uart-pins-pe { + pins = "PE0", "PE1"; + function = "uart0"; + }; + }; + + timer at 1c20c00 { + compatible = "allwinner,suniv-f1c100s-timer"; + reg = <0x01c20c00 0x90>; + interrupts = <13>; + clocks = <&osc24M>; + }; + + wdt: watchdog at 1c20ca0 { + compatible = "allwinner,suniv-f1c100s-wdt"; + reg = <0x01c20ca0 0x20>; + }; + + uart0: serial at 1c25000 { + compatible = "snps,dw-apb-uart"; + reg = <0x01c25000 0x400>; + interrupts = <1>; + reg-shift = <2>; + reg-io-width = <4>; + clocks = <&ccu CLK_BUS_UART0>; + resets = <&ccu RST_BUS_UART0>; + status = "disabled"; + }; + + uart1: serial at 1c25400 { + compatible = "snps,dw-apb-uart"; + reg = <0x01c25400 0x400>; + interrupts = <2>; + reg-shift = <2>; + reg-io-width = <4>; + clocks = <&ccu CLK_BUS_UART1>; + resets = <&ccu RST_BUS_UART1>; + status = "disabled"; + }; + + uart2: serial at 1c25800 { + compatible = "snps,dw-apb-uart"; + reg = <0x01c25800 0x400>; + interrupts = <3>; + reg-shift = <2>; + reg-io-width = <4>; + clocks = <&ccu CLK_BUS_UART2>; + resets = <&ccu RST_BUS_UART2>; + status = "disabled"; + }; + }; +};
Signature · 1 line
2.7.4
Re: [RFC PATCH v3 16/17] ARM: dts: suniv: add initial DTSI file for F1C100s
Quoted 43 lines · Mesih Kilinc
F1C100s is one product with the suniv die, which has a 32MiB co-packaged DDR1 DRAM chip. As we have the support for suniv pin controller and CCU now, add a initial DTSI for it.
Signed-off-by Mesih Kilinc <[email protected]>--- arch/arm/boot/dts/suniv-f1c100s.dtsi | 151 +++++++++++++++++++++++++++++++++++ 1 file changed, 151 insertions(+) create mode 100644 arch/arm/boot/dts/suniv-f1c100s.dtsiarch/arm/boot/dts/suniv-f1c100s.dtsi new file +27
-0@@ -0,0 +1,151 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR X11) +/* + * Copyright 2018 Icenowy Zheng <[email protected]> + * Copyright 2018 Mesih Kilinc <[email protected]> + */ + +#include <dt-bindings/clock/suniv-ccu-f1c100s.h> +#include <dt-bindings/reset/suniv-ccu-f1c100s.h> + +/ { + #address-cells = <1>; + #size-cells = <1>; + interrupt-parent = <&intc>; + + clocks { + #address-cells = <1>; + #size-cells = <1>; + ranges; + + osc24M: clk-24M { + #clock-cells = <0>; + compatible = "fixed-clock"; + clock-frequency = <24000000>; + clock-output-names = "osc24M"; + }; + + osc32k: clk-32k {
arch/arm/boot/dts/suniv-f1c100s.dtsi line 37
Quoted 10 lines
arch/arm/boot/dts/suniv-f1c100s.dtsi new file +10
-0+ #clock-cells = <0>; + compatible = "fixed-clock"; + clock-frequency = <32768>; + clock-output-names = "osc32k"; + }; + }; + + cpus { + #address-cells = <0>; + #size-cells = <0>;
I don't think you need those two properties (and the for the clocks as well). Ideally, if you could compile the dtbs with W=1, and fix any warning, that would be awesome. We're trying to get rid of them, so let's not add some new ones.
Quoted 66 lines
arch/arm/boot/dts/suniv-f1c100s.dtsi new file +66
-0+ cpu { + compatible = "arm,arm926ej-s"; + device_type = "cpu"; + }; + }; + + soc { + compatible = "simple-bus"; + #address-cells = <1>; + #size-cells = <1>; + ranges; + + sram-controller at 1c00000 { + compatible = "allwinner,suniv-f1c100s-system-control"; + reg = <0x01c00000 0x30>; + #address-cells = <1>; + #size-cells = <1>; + ranges; + + sram_d: sram at 10000 { + compatible = "mmio-sram"; + reg = <0x00010000 0x1000>; + #address-cells = <1>; + #size-cells = <1>; + ranges = <0 0x00010000 0x1000>; + + otg_sram: sram-section at 0 { + compatible = "allwinner,suniv-f1c100s-sram-d"; + reg = <0x0000 0x1000>; + status = "disabled"; + }; + }; + }; + + ccu: clock at 1c20000 { + compatible = "allwinner,suniv-f1c100s-ccu"; + reg = <0x01c20000 0x400>; + clocks = <&osc24M>, <&osc32k>; + clock-names = "hosc", "losc"; + #clock-cells = <1>; + #reset-cells = <1>; + }; + + intc: interrupt-controller at 1c20400 { + compatible = "allwinner,suniv-f1c100s-ic"; + reg = <0x01c20400 0x400>; + interrupt-controller; + #interrupt-cells = <1>; + }; + + pio: pinctrl at 1c20800 { + compatible = "allwinner,suniv-f1c100s-pinctrl"; + reg = <0x01c20800 0x400>; + interrupts = <38>, <39>, <40>; + clocks = <&ccu CLK_BUS_PIO>, <&osc24M>, <&osc32k>; + clock-names = "apb", "hosc", "losc"; + gpio-controller; + interrupt-controller; + #interrupt-cells = <3>; + #gpio-cells = <3>; + + uart0_pins_a: uart-pins-pe { + pins = "PE0", "PE1"; + function = "uart0"; + }; + };
arch/arm/boot/dts/suniv-f1c100s.dtsi line 114
Quoted 10 lines
arch/arm/boot/dts/suniv-f1c100s.dtsi new file +10
-0+ + timer at 1c20c00 { + compatible = "allwinner,suniv-f1c100s-timer"; + reg = <0x01c20c00 0x90>; + interrupts = <13>; + clocks = <&osc24M>; + }; + + wdt: watchdog at 1c20ca0 { + compatible = "allwinner,suniv-f1c100s-wdt";
If you don't have any difference with the A31 watchdog (and this is the same case for the A10 system controller and SRAM's), you can just have
compatible = "allwinner,suniv-f1c100s-wdt", "allwinner,sun6i-a31-wdt";
This way, you don't have to patch the driver to add the compatible, it will fall back to the A31 one (just make sure to document this properly in the binding doc, you can follow the A64 example).
Thanks!
Maxime
Signature · 10 lines
Maxime Ripard, Bootlin Embedded Linux and Kernel engineering https://bootlin.com -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 228 bytes Desc: not available URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20181122/8356a335/attachment.sig>
RFC PATCH v3 17/17 ARM: suniv: f1c100s: add device tree for Lichee Pi Nano
In reply to Mesih KilincLichee Pi Nano is a F1C100s board by Lichee Pi.
Add initial device tree for it.
--- arch/arm/boot/dts/Makefile | 2 ++ arch/arm/boot/dts/suniv-f1c100s-licheepi-nano.dts | 26 +++++++++++++++++++++++ 2 files changed, 28 insertions(+) create mode 100644 arch/arm/boot/dts/suniv-f1c100s-licheepi-nano.dts
arch/arm/boot/dts/Makefile +2 -0
@@ -1066,6 +1066,8 @@ dtb-$(CONFIG_MACH_SUN8I) += \ dtb-$(CONFIG_MACH_SUN9I) += \ sun9i-a80-optimus.dtb \ sun9i-a80-cubieboard4.dtb +dtb-$(CONFIG_MACH_SUNIV) += \ + suniv-f1c100s-licheepi-nano.dtb dtb-$(CONFIG_ARCH_TANGO) += \ tango4-vantage-1172.dtb dtb-$(CONFIG_ARCH_TEGRA_2x_SOC) += \
arch/arm/boot/dts/suniv-f1c100s-licheepi-nano.dts new file +26 -0
@@ -0,0 +1,26 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR X11) +/* + * Copyright 2018 Icenowy Zheng <[email protected]> + */ + +/dts-v1/; +#include "suniv-f1c100s.dtsi" + +/ { + model = "Lichee Pi Nano"; + compatible = "licheepi,licheepi-nano", "allwinner,suniv-f1c100s"; + + aliases { + serial0 = &uart0; + }; + + chosen { + stdout-path = "serial0:115200n8"; + }; +}; + +&uart0 { + pinctrl-names = "default"; + pinctrl-0 = <&uart0_pins_a>; + status = "okay"; +};
Signature · 1 line
2.7.4