Introduce Nuvoton ma35d1 SoC
Subsystems (7)
v13 cover Introduce Nuvoton ma35d1 SoC
From: Jacky Huang <[email protected]>
This patchset adds initial support for the Nuvoton ma35d1 SoC, including initial device tree, clock driver, reset driver, and serial driver.
This patchset cover letter is based from the initial support for Nuvoton ma35d1 to keep tracking the version history.
This patchset had been applied to Linux kernel 6.4.0-rc5 and tested on the Nuvoton ma35d1 SOM evaluation board.
(ma35d1 information: https://www.nuvoton.com/products/microprocessors/arm-cortex-a35-mpus/)
MA35D1 porting on linux-5.10.y can be found at: https://github.com/OpenNuvoton/MPU-Family
v13:
- Modify serial driver
- Added a check for oops_in_progress in ma35d1serial_console_write to determine whether to perform the spin_lock.
- Rebased drivers/tty/serial/Kconfig and recreate the patch
- Rebased MAINTAINERS and recreate the patch
v12:
- Modify serial driver
- Added PORT_MA35 to include/uapi/linux/serial_core.h, and apply to the port->type of ma35d1 serial driver
- Added check for the return value of ioremap()
- Fixed several coding issues
- Rebase MAINTAINERS and recreate the patch
v11:
- Rebase on top of 2023.05.24
- Modify serial driver
- Fixed several coding style issues
- Fixed ma35d1serial_set_mctrl()
- Added the 'MA35_' prefix to all register and bit field definitions.
- Used 'ttyNVT' instead of 'ttyS'
- Modify clock driver
- Added 'source nuvoton/Kconfig' to drivers/clk/Kconfig
- Fixed several coding issues
- Removed unnecessary inline specifier
- Modify reset driver
- Fixed typo and added comments
- Modify ma35d1.dtsi l2-cache node
- Added cache-unified and cache-size properties
v10:
- Change from using ARCH_NUVOTON to using ARCH_MA35. The following patch files have been modified:
- patch 1 arch/arm64/Kconfig.platforms
- patch 2 arch/arm64/configs/defconfig
- patch 7 arch/arm64/boot/dts/nuvoton/Makefile
- patch 8 drivers/clk/Makefile
drivers/clk/nuvoton/Kconfig drivers/clk/nuvoton/Makefile
- patch 9 drivers/reset/Kconfig
- patch 10 drivers/tty/serial/Kconfig
v9:
- Combine MAINTAINERS patch into patch 5 'dt-bindings: arm: Add initial bindings for Nuvoton platform'
- Modify clock driver
- Use the helper function for 64-bit division
- Fixed minor issues
- Modify reset driver
- Refine coding style and add required header files
- Add spin_lock protection
- Add error return handling to the serial driver probe function
v8:
- Remove '0005-dt-bindings-mfd-syscon-Add-nuvoton-ma35d1-sys-compat.patch' as it was applied.
- Modify MAINTAINERS NUVOTON MA35 and NPCM path settings
- Remove 'syscon' from dtsi 'sys' node and modify the corresponding yaml
- Modify clock driver
- Remove the header file and move definitions into .c files.
- Use parent_data instead of parent name.
- Modify serial driver
- Modify reset driver
- Modify reset register/offset lookup table to be indexed by reset id
- Combined reset and reboot structure
v7:
- Fixed dts system-management node and compatible driver
- move 'nuvoton,npcm-gcr.yaml' from 'binding/arm/nuvoton' to 'binding/soc/nuvoton'
- In ma35d1.dtsi, create the soc node for ma35d1 SoC
- Modify the issues found in serial driver
- Modify the issues found in clock driver
- Modify the IDs of reset driver to be contiguous numbers and use lookup table to find register offset and bit position.
- Modify MAINTAINERS NUVOTON NPCM path as npcm directory name to nuvoton
v6:
- Combine nuvoton,ma35d1-clk.yaml and nuvoton,ma35d1-clk.h into one patch
- Combine nuvoton,ma35d1-reset.yaml and nuvoton,ma35d1-reset.h into one patch
- rename Documentation/devicetree/bindings/arm/npcm directory as nuvoton
- Remove patch for adding include/linux/mfd/ma35d1-sys.h as it's not required
- Update dtsi & dts files and move board-specific nodes to dts
- Modify reset driver
- Modify serial driver, fix coding style issues
- Modify clock driver, rewrite the PLL calculation functions
v5:
- Add ARCH_NUVOTON to arm64 Kconfig
- Add ARCH_NUVOTON to defconfig
- Add the clock driver
- Add the reset driver
- Add the serial driver
- Add us to the maintainer
v4:
- patch 4/5 is a resend
- Fixed dt_binding_check errors of nuvoton,ma35d1-clk.yaml
- Modify ma35d1.dtsi
1. Add a node hxt_24m
2. Fixed the base address of gic node
3. Add clocks and clock-names to clock node
- Fixed borad binding mistakes of nuvoton.yaml
v3:
- added patch 4/5 and 5/5
- introduce CONFIG_ARCH_NUVOTON option
- add initial bindings for Nuvoton Platform boards
- fixed coding style problem of nuvoton,ma35d1-clk.h
- added CAPLL to clock-controller node
- modify the chosen node of ma35d1-evb.dts
- modify clock yaml "clk-pll-mode" to "nuvoton,clk-pll-mode"
v2:
- fixed dt_binding_check failed of nuvoton,ma35d1-clk.yaml
Jacky Huang (10):
arm64: Kconfig.platforms: Add config for Nuvoton MA35 platform
arm64: defconfig: Add support for Nuvoton MA35 family SoCs
dt-bindings: clock: nuvoton: add binding for ma35d1 clock controller
dt-bindings: reset: nuvoton: Document ma35d1 reset control
dt-bindings: arm: Add initial bindings for Nuvoton platform
dt-bindings: serial: Document ma35d1 uart controller
arm64: dts: nuvoton: Add initial ma35d1 device tree
clk: nuvoton: Add clock driver for ma35d1 clock controller
reset: Add Nuvoton ma35d1 reset driver support
tty: serial: Add Nuvoton ma35d1 serial driver support
.../bindings/arm/nuvoton/nuvoton,ma35d1.yaml | 30 +
.../npcm.yaml => nuvoton/nuvoton,npcm.yaml} | 2 +-
.../bindings/clock/nuvoton,ma35d1-clk.yaml | 63 ++
.../bindings/reset/nuvoton,ma35d1-reset.yaml | 45 +
.../serial/nuvoton,ma35d1-serial.yaml | 48 +
.../nuvoton/nuvoton,npcm-gcr.yaml} | 2 +-
MAINTAINERS | 13 +-
arch/arm64/Kconfig.platforms | 8 +
arch/arm64/boot/dts/nuvoton/Makefile | 2 +
.../boot/dts/nuvoton/ma35d1-iot-512m.dts | 56 ++
.../boot/dts/nuvoton/ma35d1-som-256m.dts | 56 ++
arch/arm64/boot/dts/nuvoton/ma35d1.dtsi | 234 +++++
arch/arm64/configs/defconfig | 1 +
drivers/clk/Kconfig | 1 +
drivers/clk/Makefile | 1 +
drivers/clk/nuvoton/Kconfig | 19 +
drivers/clk/nuvoton/Makefile | 4 +
drivers/clk/nuvoton/clk-ma35d1-divider.c | 135 +++
drivers/clk/nuvoton/clk-ma35d1-pll.c | 361 +++++++
drivers/clk/nuvoton/clk-ma35d1.c | 933 ++++++++++++++++++
drivers/reset/Kconfig | 6 +
drivers/reset/Makefile | 1 +
drivers/reset/reset-ma35d1.c | 235 +++++
drivers/tty/serial/Kconfig | 18 +
drivers/tty/serial/Makefile | 1 +
drivers/tty/serial/ma35d1_serial.c | 808 +++++++++++++++
.../dt-bindings/clock/nuvoton,ma35d1-clk.h | 253 +++++
.../dt-bindings/reset/nuvoton,ma35d1-reset.h | 108 ++
include/uapi/linux/serial_core.h | 3 +
29 files changed, 3444 insertions(+), 3 deletions(-)
create mode 100644 Documentation/devicetree/bindings/arm/nuvoton/nuvoton,ma35d1.yaml
rename Documentation/devicetree/bindings/arm/{npcm/npcm.yaml => nuvoton/nuvoton,npcm.yaml} (93%)
create mode 100644 Documentation/devicetree/bindings/clock/nuvoton,ma35d1-clk.yaml
create mode 100644 Documentation/devicetree/bindings/reset/nuvoton,ma35d1-reset.yaml
create mode 100644 Documentation/devicetree/bindings/serial/nuvoton,ma35d1-serial.yaml
rename Documentation/devicetree/bindings/{arm/npcm/nuvoton,gcr.yaml => soc/nuvoton/nuvoton,npcm-gcr.yaml} (93%)
create mode 100644 arch/arm64/boot/dts/nuvoton/ma35d1-iot-512m.dts
create mode 100644 arch/arm64/boot/dts/nuvoton/ma35d1-som-256m.dts
create mode 100644 arch/arm64/boot/dts/nuvoton/ma35d1.dtsi
create mode 100644 drivers/clk/nuvoton/Kconfig
create mode 100644 drivers/clk/nuvoton/Makefile
create mode 100644 drivers/clk/nuvoton/clk-ma35d1-divider.c
create mode 100644 drivers/clk/nuvoton/clk-ma35d1-pll.c
create mode 100644 drivers/clk/nuvoton/clk-ma35d1.c
create mode 100644 drivers/reset/reset-ma35d1.c
create mode 100644 drivers/tty/serial/ma35d1_serial.c
create mode 100644 include/dt-bindings/clock/nuvoton,ma35d1-clk.h
create mode 100644 include/dt-bindings/reset/nuvoton,ma35d1-reset.hSignature · 1 line
2.34.1
PATCH v13 1/10 arm64: Kconfig.platforms: Add config for Nuvoton MA35 platform
From: Jacky Huang <[email protected]>
Add ARCH_NUVOTON configuration option for Nuvoton MA35 family SoCs.
--- arch/arm64/Kconfig.platforms | 8 ++++++++ 1 file changed, 8 insertions(+)
arch/arm64/Kconfig.platforms +8 -0
@@ -225,6 +225,14 @@ config ARCH_S32 endif +config ARCH_MA35 + bool "Nuvoton MA35 Architecture" + select GPIOLIB + select PINCTRL + select RESET_CONTROLLER + help + This enables support for the ARMv8 based Nuvoton MA35 series SoCs. + config ARCH_NPCM bool "Nuvoton NPCM Architecture" select PINCTRL
Signature · 1 line
2.34.1
PATCH v13 2/10 arm64: defconfig: Add support for Nuvoton MA35 family SoCs
In reply to Jacky HuangFrom: Jacky Huang <[email protected]>
This adds support for the Nuvoton MA35 family SoCs which are based on the Cortex-A35 Armv8-A 64-bit architecture.
--- arch/arm64/configs/defconfig | 1 + 1 file changed, 1 insertion(+)
arch/arm64/configs/defconfig +1 -0
@@ -52,6 +52,7 @@ CONFIG_ARCH_NXP=y CONFIG_ARCH_LAYERSCAPE=y CONFIG_ARCH_MXC=y CONFIG_ARCH_S32=y +CONFIG_ARCH_MA35=y CONFIG_ARCH_NPCM=y CONFIG_ARCH_QCOM=y CONFIG_ARCH_RENESAS=y
Signature · 1 line
2.34.1
PATCH v13 3/10 dt-bindings: clock: nuvoton: add binding for ma35d1 clock controller
In reply to Jacky HuangFrom: Jacky Huang <[email protected]>
Add the dt-bindings header for Nuvoton ma35d1, that gets shared between the clock controller and clock references in the dts. Add documentation to describe nuvoton ma35d1 clock driver.
--- .../bindings/clock/nuvoton,ma35d1-clk.yaml | 63 +++++ .../dt-bindings/clock/nuvoton,ma35d1-clk.h | 253 ++++++++++++++++++ 2 files changed, 316 insertions(+) create mode 100644 Documentation/devicetree/bindings/clock/nuvoton,ma35d1-clk.yaml create mode 100644 include/dt-bindings/clock/nuvoton,ma35d1-clk.h
Documentation/devicetree/bindings/clock/nuvoton,ma35d1-clk.yaml new file +63 -0
@@ -0,0 +1,63 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/clock/nuvoton,ma35d1-clk.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Nuvoton MA35D1 Clock Controller Module + +maintainers: + - Chi-Fang Li <[email protected]> + - Jacky Huang <[email protected]> + +description: | + The MA35D1 clock controller generates clocks for the whole chip, + including system clocks and all peripheral clocks. + + See also: + include/dt-bindings/clock/ma35d1-clk.h + +properties: + compatible: + items: + - const: nuvoton,ma35d1-clk + + reg: + maxItems: 1 + + "#clock-cells": + const: 1 + + clocks: + maxItems: 1 + + nuvoton,pll-mode: + description: + A list of PLL operation mode corresponding to CAPLL, DDRPLL, APLL, + EPLL, and VPLL in sequential. + maxItems: 5 + items: + enum: + - integer + - fractional + - spread-spectrum + $ref: /schemas/types.yaml#/definitions/non-unique-string-array + +required: + - compatible + - reg + - "#clock-cells" + - clocks + +additionalProperties: false + +examples: + - | + + clock-controller@40460200 { + compatible = "nuvoton,ma35d1-clk"; + reg = <0x40460200 0x100>; + #clock-cells = <1>; + clocks = <&clk_hxt>; + }; +...
include/dt-bindings/clock/nuvoton,ma35d1-clk.h new file +253 -0
253 lines not on this page · raw message
Signature · 1 line
2.34.1
PATCH v13 4/10 dt-bindings: reset: nuvoton: Document ma35d1 reset control
In reply to Jacky HuangFrom: Jacky Huang <[email protected]>
Add the dt-bindings header for Nuvoton ma35d1, that gets shared between the reset controller and reset references in the dts. Add documentation to describe nuvoton ma35d1 reset driver.
--- .../bindings/reset/nuvoton,ma35d1-reset.yaml | 45 ++++++++ .../dt-bindings/reset/nuvoton,ma35d1-reset.h | 108 ++++++++++++++++++ 2 files changed, 153 insertions(+) create mode 100644 Documentation/devicetree/bindings/reset/nuvoton,ma35d1-reset.yaml create mode 100644 include/dt-bindings/reset/nuvoton,ma35d1-reset.h
Documentation/devicetree/bindings/reset/nuvoton,ma35d1-reset.yaml new file +45 -0
@@ -0,0 +1,45 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/reset/nuvoton,ma35d1-reset.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Nuvoton MA35D1 Reset Controller + +maintainers: + - Chi-Fang Li <[email protected]> + - Jacky Huang <[email protected]> + +description: + The system reset controller can be used to reset various peripheral + controllers in MA35D1 SoC. + +properties: + compatible: + items: + - const: nuvoton,ma35d1-reset + + reg: + maxItems: 1 + + '#reset-cells': + const: 1 + +required: + - compatible + - reg + - '#reset-cells' + +additionalProperties: false + +examples: + # system reset controller node: + - | + + system-management@40460000 { + compatible = "nuvoton,ma35d1-reset"; + reg = <0x40460000 0x200>; + #reset-cells = <1>; + }; +... +
include/dt-bindings/reset/nuvoton,ma35d1-reset.h new file +108 -0
108 lines not on this page · raw message
Signature · 1 line
2.34.1
PATCH v13 5/10 dt-bindings: arm: Add initial bindings for Nuvoton platform
In reply to Jacky HuangFrom: Jacky Huang <[email protected]>
Modify Nuvoton NPCM and MA35 platform board bindings
- Move 'nuvoton,npcm-gcr.yaml' from 'bindings/arm/npcm' to 'bindings/soc/nuvoton'.
- Rename the 'bindings/arm/npcm' directory to 'bindings/arm/nuvoton'.
- Add bindings for ARMv8-based Nuvoton SoCs and platform boards, and include the initial bindings for ma35d1 series development boards.
Modify MAINTAINERS
- Remove the line for 'bindings/arm/npcm/' under ARM/NUVOTON NPCM, as it has been renamed.
- Add ARM/NUVOTON MA35 for Nuvoton MA35 series SoCs maintainer and files.
---
.../bindings/arm/nuvoton/nuvoton,ma35d1.yaml | 30 +++++++++++++++++++
.../npcm.yaml => nuvoton/nuvoton,npcm.yaml} | 2 +-
.../nuvoton/nuvoton,npcm-gcr.yaml} | 2 +-
MAINTAINERS | 13 +++++++-
4 files changed, 44 insertions(+), 3 deletions(-)
create mode 100644 Documentation/devicetree/bindings/arm/nuvoton/nuvoton,ma35d1.yaml
rename Documentation/devicetree/bindings/arm/{npcm/npcm.yaml => nuvoton/nuvoton,npcm.yaml} (93%)
rename Documentation/devicetree/bindings/{arm/npcm/nuvoton,gcr.yaml => soc/nuvoton/nuvoton,npcm-gcr.yaml} (93%)Documentation/devicetree/bindings/arm/nuvoton/nuvoton,ma35d1.yaml new file +30 -0
@@ -0,0 +1,30 @@ +# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/arm/nuvoton/nuvoton,ma35d1.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Nuvoton MA35 series SoC based platforms + +maintainers: + - Jacky Huang <[email protected]> + +description: | + Boards with an ARMv8 based Nuvoton MA35 series SoC shall have + the following properties. + +properties: + $nodename: + const: '/' + compatible: + oneOf: + + - description: MA35D1 based boards + items: + - enum: + - nuvoton,ma35d1-iot + - nuvoton,ma35d1-som + - const: nuvoton,ma35d1 + +additionalProperties: true +...
Documentation/devicetree/bindings/arm/nuvoton/nuvoton,npcm.yaml renamed from Documentation/devicetree/bindings/arm/npcm/npcm.yaml +1 -1
@@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause %YAML 1.2 --- -$id: http://devicetree.org/schemas/arm/npcm/npcm.yaml# +$id: http://devicetree.org/schemas/arm/nuvoton/nuvoton,npcm.yaml# $schema: http://devicetree.org/meta-schemas/core.yaml# title: NPCM Platforms
Documentation/devicetree/bindings/soc/nuvoton/nuvoton,npcm-gcr.yaml renamed from Documentation/devicetree/bindings/arm/npcm/nuvoton,gcr.yaml +1 -1
@@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause %YAML 1.2 --- -$id: http://devicetree.org/schemas/arm/npcm/nuvoton,gcr.yaml# +$id: http://devicetree.org/schemas/soc/nuvoton/nuvoton,npcm-gcr.yaml# $schema: http://devicetree.org/meta-schemas/core.yaml# title: Global Control Registers block in Nuvoton SoCs
MAINTAINERS +12 -1
@@ -2506,6 +2506,18 @@ F: drivers/rtc/rtc-ab8500.c F: drivers/rtc/rtc-pl031.c F: drivers/soc/ux500/ +ARM/NUVOTON MA35 ARCHITECTURE +M: Jacky Huang <[email protected]> +M: Shan-Chun Hung <[email protected]> +L: [email protected] (moderated for non-subscribers) +S: Supported +F: Documentation/devicetree/bindings/*/*/*ma35* +F: Documentation/devicetree/bindings/*/*ma35* +F: arch/arm64/boot/dts/nuvoton/*ma35* +F: drivers/*/*/*ma35* +F: drivers/*/*ma35* +K: ma35d1 + ARM/NUVOTON NPCM ARCHITECTURE M: Avi Fishman <[email protected]> M: Tomer Maimon <[email protected]>
@@ -2517,7 +2529,6 @@ L: [email protected] (moderated for non-subscribers) S: Supported F: Documentation/devicetree/bindings/*/*/*npcm* F: Documentation/devicetree/bindings/*/*npcm* -F: Documentation/devicetree/bindings/arm/npcm/* F: Documentation/devicetree/bindings/rtc/nuvoton,nct3018y.yaml F: arch/arm/boot/dts/nuvoton-npcm* F: arch/arm/mach-npcm/
Signature · 1 line
2.34.1
PATCH v13 6/10 dt-bindings: serial: Document ma35d1 uart controller
In reply to Jacky HuangFrom: Jacky Huang <[email protected]>
Add documentation that describes the nuvoton ma35d1 UART driver bindings.
--- .../serial/nuvoton,ma35d1-serial.yaml | 48 +++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100644 Documentation/devicetree/bindings/serial/nuvoton,ma35d1-serial.yaml
Documentation/devicetree/bindings/serial/nuvoton,ma35d1-serial.yaml new file +48 -0
@@ -0,0 +1,48 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/serial/nuvoton,ma35d1-serial.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Nuvoton MA35D1 Universal Asynchronous Receiver/Transmitter (UART) + +maintainers: + - Min-Jen Chen <[email protected]> + - Jacky Huang <[email protected]> + +allOf: + - $ref: serial.yaml + +properties: + compatible: + const: nuvoton,ma35d1-uart + + reg: + maxItems: 1 + + interrupts: + maxItems: 1 + + clocks: + maxItems: 1 + +required: + - compatible + - reg + - interrupts + - clocks + +unevaluatedProperties: false + +examples: + - | + #include <dt-bindings/interrupt-controller/arm-gic.h> + #include <dt-bindings/clock/nuvoton,ma35d1-clk.h> + + serial@40700000 { + compatible = "nuvoton,ma35d1-uart"; + reg = <0x40700000 0x100>; + interrupts = <GIC_SPI 59 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&clk UART0_GATE>; + }; +...
Signature · 1 line
2.34.1
PATCH v13 7/10 arm64: dts: nuvoton: Add initial ma35d1 device tree
In reply to Jacky HuangFrom: Jacky Huang <[email protected]>
Add initial device tree support for Nuvoton ma35d1 SoC, including cpu, clock, reset, and serial controllers.
Add reference boards som-256m and iot-512m.
--- arch/arm64/boot/dts/nuvoton/Makefile | 2 + .../boot/dts/nuvoton/ma35d1-iot-512m.dts | 56 +++++ .../boot/dts/nuvoton/ma35d1-som-256m.dts | 56 +++++ arch/arm64/boot/dts/nuvoton/ma35d1.dtsi | 234 ++++++++++++++++++ 4 files changed, 348 insertions(+) create mode 100644 arch/arm64/boot/dts/nuvoton/ma35d1-iot-512m.dts create mode 100644 arch/arm64/boot/dts/nuvoton/ma35d1-som-256m.dts create mode 100644 arch/arm64/boot/dts/nuvoton/ma35d1.dtsi
arch/arm64/boot/dts/nuvoton/Makefile +2 -0
@@ -1,2 +1,4 @@ # SPDX-License-Identifier: GPL-2.0 +dtb-$(CONFIG_ARCH_MA35) += ma35d1-iot-512m.dtb +dtb-$(CONFIG_ARCH_MA35) += ma35d1-som-256m.dtb dtb-$(CONFIG_ARCH_NPCM) += nuvoton-npcm845-evb.dtb
arch/arm64/boot/dts/nuvoton/ma35d1-iot-512m.dts new file +56 -0
56 lines not on this page · raw message
arch/arm64/boot/dts/nuvoton/ma35d1-som-256m.dts new file +56 -0
56 lines not on this page · raw message
arch/arm64/boot/dts/nuvoton/ma35d1.dtsi new file +234 -0
234 lines not on this page · raw message
Signature · 1 line
2.34.1
PATCH v13 8/10 clk: nuvoton: Add clock driver for ma35d1 clock controller
In reply to Jacky HuangFrom: Jacky Huang <[email protected]>
The clock controller generates clocks for the whole chip, including system clocks and all peripheral clocks. This driver support ma35d1 clock gating, divider, and individual PLL configuration.
There are 6 PLLs in ma35d1 SoC:
- CA-PLL for the two Cortex-A35 CPU clock
- SYS-PLL for system bus, which comes from the companion MCU and cannot be programmed by clock controller.
- DDR-PLL for DDR
- EPLL for GMAC and GFX, Display, and VDEC IPs.
- VPLL for video output pixel clock
- APLL for SDHC, I2S audio, and other IPs.
CA-PLL has only one operation mode.
DDR-PLL, EPLL, VPLL, and APLL are advanced PLLs which have 3 operation modes: integer mode, fraction mode, and spread specturm mode.
--- drivers/clk/Kconfig | 1 + drivers/clk/Makefile | 1 + drivers/clk/nuvoton/Kconfig | 19 + drivers/clk/nuvoton/Makefile | 4 + drivers/clk/nuvoton/clk-ma35d1-divider.c | 135 ++++ drivers/clk/nuvoton/clk-ma35d1-pll.c | 361 +++++++++ drivers/clk/nuvoton/clk-ma35d1.c | 933 +++++++++++++++++++++++ 7 files changed, 1454 insertions(+) create mode 100644 drivers/clk/nuvoton/Kconfig create mode 100644 drivers/clk/nuvoton/Makefile create mode 100644 drivers/clk/nuvoton/clk-ma35d1-divider.c create mode 100644 drivers/clk/nuvoton/clk-ma35d1-pll.c create mode 100644 drivers/clk/nuvoton/clk-ma35d1.c
drivers/clk/Kconfig +1 -0
@@ -478,6 +478,7 @@ source "drivers/clk/meson/Kconfig" source "drivers/clk/mstar/Kconfig" source "drivers/clk/microchip/Kconfig" source "drivers/clk/mvebu/Kconfig" +source "drivers/clk/nuvoton/Kconfig" source "drivers/clk/pistachio/Kconfig" source "drivers/clk/qcom/Kconfig" source "drivers/clk/ralink/Kconfig"
drivers/clk/Makefile +1 -0
@@ -106,6 +106,7 @@ endif obj-y += mstar/ obj-y += mvebu/ obj-$(CONFIG_ARCH_MXS) += mxs/ +obj-$(CONFIG_ARCH_MA35) += nuvoton/ obj-$(CONFIG_COMMON_CLK_NXP) += nxp/ obj-$(CONFIG_COMMON_CLK_PISTACHIO) += pistachio/ obj-$(CONFIG_COMMON_CLK_PXA) += pxa/
drivers/clk/nuvoton/Kconfig new file +19 -0
@@ -0,0 +1,19 @@ +# SPDX-License-Identifier: GPL-2.0 +# common clock support for Nuvoton SoC family. + +config COMMON_CLK_NUVOTON + bool "Nuvoton clock controller common support" + depends on ARCH_MA35 || COMPILE_TEST + default y + help + Say y here to enable common clock controller for Nuvoton platforms. + +if COMMON_CLK_NUVOTON + +config CLK_MA35D1 + bool "Nuvoton MA35D1 clock controller support" + default y + help + Build the clock controller driver for MA35D1 SoC. + +endif
drivers/clk/nuvoton/Makefile new file +4 -0
@@ -0,0 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0-only +obj-$(CONFIG_CLK_MA35D1) += clk-ma35d1.o +obj-$(CONFIG_CLK_MA35D1) += clk-ma35d1-divider.o +obj-$(CONFIG_CLK_MA35D1) += clk-ma35d1-pll.o
drivers/clk/nuvoton/clk-ma35d1-divider.c new file +135 -0
135 lines not on this page · raw message
drivers/clk/nuvoton/clk-ma35d1-pll.c new file +361 -0
361 lines not on this page · raw message
drivers/clk/nuvoton/clk-ma35d1.c new file +933 -0
933 lines not on this page · raw message
Signature · 1 line
2.34.1
Stephen Boyd
maintainerRe: [PATCH v13 08/10] clk: nuvoton: Add clock driver for ma35d1 clock controller
Quoting Jacky Huang (2023-06-04 21:07:47)
Quoted 22 lines
drivers/clk/nuvoton/clk-ma35d1-divider.c new file +16
-0@@ -0,0 +1,135 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* +* Copyright (C) 2023 Nuvoton Technology Corp. +* Author: Chi-Fang Li <[email protected]> +*/ + +#include <linux/clk-provider.h> +#include <linux/device.h> +#include <linux/regmap.h> +#include <linux/spinlock.h> + +struct ma35d1_adc_clk_div { +struct clk_hw hw; +void __iomem *reg; +u8 shift; +u8 width;
drivers/clk/nuvoton/clk-ma35d1-divider.c line 26
Quoted 10 lines
drivers/clk/nuvoton/clk-ma35d1-divider.c new file +10
-0+u32 mask; +const struct clk_div_table *table; +/* protects concurrent access to clock divider registers */ +spinlock_t *lock; +}; + +struct clk_hw *ma35d1_reg_adc_clkdiv (struct device *dev,const char *name, +struct clk_hw *parent_hw,spinlock_t *lock, +unsigned long flags,void __iomem *reg, +u8 shift,u8 width,u32 mask_bit);
Why is this forward declared?
Quoted 180 lines
drivers/clk/nuvoton/clk-ma35d1-divider.c new file +109
-0+ +static inline struct ma35d1_adc_clk_div *to_ma35d1_adc_clk_div (struct clk_hw *_hw) +{ + return container_of(_hw, struct ma35d1_adc_clk_div, hw); +} + +static unsigned long ma35d1_clkdiv_recalc_rate (struct clk_hw *hw,unsigned long parent_rate) +{ +unsigned int val; +struct ma35d1_adc_clk_div *dclk =to_ma35d1_adc_clk_div (hw); + + val =readl_relaxed (dclk->reg) >> dclk->shift; + val &=clk_div_mask (dclk->width); + val +=1 ; +return divider_recalc_rate (hw, parent_rate, val, dclk->table, +CLK_DIVIDER_ROUND_CLOSEST , dclk->width); +} + +static long ma35d1_clkdiv_round_rate (struct clk_hw *hw,unsigned long rate,unsigned long *prate) +{ +struct ma35d1_adc_clk_div *dclk =to_ma35d1_adc_clk_div (hw); + +return divider_round_rate (hw, rate, prate, dclk->table, + dclk->width,CLK_DIVIDER_ROUND_CLOSEST ); +} + +static int ma35d1_clkdiv_set_rate (struct clk_hw *hw,unsigned long rate,unsigned long parent_rate) +{ +int value; +unsigned long flags =0 ; +u32 data; +struct ma35d1_adc_clk_div *dclk =to_ma35d1_adc_clk_div (hw); + + value =divider_get_val (rate, parent_rate, dclk->table, + dclk->width,CLK_DIVIDER_ROUND_CLOSEST ); + +spin_lock_irqsave (dclk->lock, flags); + + data =readl_relaxed (dclk->reg); + data &= ~(clk_div_mask (dclk->width) << dclk->shift); + data |= (value -1 ) << dclk->shift; + data |= dclk->mask; +writel_relaxed (data, dclk->reg); + +spin_unlock_irqrestore (dclk->lock, flags); +return 0 ; +} + +static const struct clk_ops ma35d1_adc_clkdiv_ops = { + .recalc_rate = ma35d1_clkdiv_recalc_rate, + .round_rate = ma35d1_clkdiv_round_rate, + .set_rate = ma35d1_clkdiv_set_rate, +}; + +struct clk_hw *ma35d1_reg_adc_clkdiv (struct device *dev,const char *name, +struct clk_hw *parent_hw,spinlock_t *lock, +unsigned long flags,void __iomem *reg, +u8 shift,u8 width,u32 mask_bit) +{ +struct ma35d1_adc_clk_div *div; +struct clk_init_data init; +struct clk_div_table *table; +struct clk_parent_data pdata = { .index =0 }; +u32 max_div, min_div; +struct clk_hw *hw; +int ret; +int i; + + div =devm_kzalloc (dev,sizeof (*div),GFP_KERNEL ); +if (!div) +return ERR_PTR (-ENOMEM ); + + max_div =clk_div_mask (width) +1 ; + min_div =1 ; + + table =devm_kcalloc (dev, max_div +1 ,sizeof (*table),GFP_KERNEL ); +if (!table) +return ERR_PTR (-ENOMEM ); + +for (i =0 ; i < max_div; i++) { + table[i].val = min_div + i; + table[i].div =2 * table[i].val; + } + table[max_div].val =0 ; + table[max_div].div =0 ; + +memset (&init,0 ,sizeof (init)); + init.name = name; + init.ops = &ma35d1_adc_clkdiv_ops; + init.flags |= flags; + pdata.hw = parent_hw; + init.parent_data = &pdata; + init.num_parents =1 ; + + div->reg = reg; + div->shift = shift; + div->width = width; + div->mask = mask_bit ?BIT (mask_bit) :0 ; + div->lock = lock; + div->hw.init = &init; + div->table = table; + + hw = &div->hw; + ret =devm_clk_hw_register (dev, hw); +if (ret) +return ERR_PTR (ret); +return hw; +} +EXPORT_SYMBOL_GPL (ma35d1_reg_adc_clkdiv);drivers/clk/nuvoton/clk-ma35d1-pll.c new file +65
-0@@ -0,0 +1,361 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* +* Copyright (C) 2023 Nuvoton Technology Corp. +* Author: Chi-Fang Li <[email protected]> +*/ + +#include <linux/bitfield.h> +#include <linux/clk-provider.h> +#include <linux/container_of.h> +#include <linux/device.h> +#include <linux/io.h> +#include <linux/kernel.h> +#include <linux/math64.h> +#include <linux/slab.h> +#include <linux/units.h> +#include <dt-bindings/clock/nuvoton,ma35d1-clk.h> + +/* PLL frequency limits */ +#define PLL_FREF_MAX_FREQ (200 * HZ_PER_MHZ) +#define PLL_FREF_MIN_FREQ (1 * HZ_PER_MHZ) +#define PLL_FREF_M_MAX_FREQ (40 * HZ_PER_MHZ) +#define PLL_FREF_M_MIN_FREQ (10 * HZ_PER_MHZ) +#define PLL_FCLK_MAX_FREQ (2400 * HZ_PER_MHZ) +#define PLL_FCLK_MIN_FREQ (600 * HZ_PER_MHZ) +#define PLL_FCLKO_MAX_FREQ (2400 * HZ_PER_MHZ) +#define PLL_FCLKO_MIN_FREQ (85700 * HZ_PER_KHZ) +#define PLL_SS_RATE 0x77 +#define PLL_SLOPE 0x58CFA + +#define REG_PLL_CTL0_OFFSET 0x0 +#define REG_PLL_CTL1_OFFSET 0x4 +#define REG_PLL_CTL2_OFFSET 0x8 + +/* bit fields for REG_CLK_PLL0CTL0, which is SMIC PLL design */ +#define SPLL0_CTL0_FBDIV GENMASK(7, 0) +#define SPLL0_CTL0_INDIV GENMASK(11, 8) +#define SPLL0_CTL0_OUTDIV GENMASK(13, 12) +#define SPLL0_CTL0_PD BIT(16) +#define SPLL0_CTL0_BP BIT(17) + +/* bit fields for REG_CLK_PLLxCTL0 ~ REG_CLK_PLLxCTL2, where x = 2 ~ 5 */ +#define PLL_CTL0_FBDIV GENMASK(10, 0) +#define PLL_CTL0_INDIV GENMASK(17, 12) +#define PLL_CTL0_MODE GENMASK(19, 18) +#define PLL_CTL0_SSRATE GENMASK(30, 20) +#define PLL_CTL1_PD BIT(0) +#define PLL_CTL1_BP BIT(1) +#define PLL_CTL1_OUTDIV GENMASK(6, 4) +#define PLL_CTL1_FRAC GENMASK(31, 24) +#define PLL_CTL2_SLOPE GENMASK(23, 0) + +#define INDIV_MIN 1 +#define INDIV_MAX 63 +#define FBDIV_MIN 16 +#define FBDIV_MAX 2047 +#define FBDIV_FRAC_MIN 1600 +#define FBDIV_FRAC_MAX 204700 +#define OUTDIV_MIN 1 +#define OUTDIV_MAX 7 + +#define PLL_MODE_INT 0 +#define PLL_MODE_FRAC 1 +#define PLL_MODE_SS 2 + +struct ma35d1_clk_pll {
drivers/clk/nuvoton/clk-ma35d1-pll.c line 75
Quoted 10 lines
drivers/clk/nuvoton/clk-ma35d1-pll.c new file +10
-0+struct clk_hw hw; +u32 id; +u8 mode; +void __iomem *ctl0_base; +void __iomem *ctl1_base; +void __iomem *ctl2_base; +}; + +struct clk_hw *ma35d1_reg_clk_pll (struct device *dev,u32 id,u8 u8mode,const char *name, +struct clk_hw *parent_hw,void __iomem *base);
Why is this forward declared?
Quoted 339 lines
drivers/clk/nuvoton/clk-ma35d1-pll.c new file +286
-0+ +static inline struct ma35d1_clk_pll *to_ma35d1_clk_pll (struct clk_hw *_hw) +{ + return container_of(_hw, struct ma35d1_clk_pll, hw); +} + +static unsigned long ma35d1_calc_smic_pll_freq (u32 pll0_ctl0, +unsigned long parent_rate) +{ +u32 m, n, p, outdiv; +u64 pll_freq; + +if (pll0_ctl0 &SPLL0_CTL0_BP ) +return parent_rate; + + n =FIELD_GET (SPLL0_CTL0_FBDIV , pll0_ctl0); + m =FIELD_GET (SPLL0_CTL0_INDIV , pll0_ctl0); + p =FIELD_GET (SPLL0_CTL0_OUTDIV , pll0_ctl0); + outdiv =1 << p; + pll_freq = (u64 )parent_rate * n; +div_u64 (pll_freq, m * outdiv); +return pll_freq; +} + +static unsigned long ma35d1_calc_pll_freq (u8 mode,u32 *reg_ctl,unsigned long parent_rate) +{ +unsigned long pll_freq, x; +u32 m, n, p; + +if (reg_ctl[1 ] &PLL_CTL1_BP ) +return parent_rate; + + n =FIELD_GET (PLL_CTL0_FBDIV , reg_ctl[0 ]); + m =FIELD_GET (PLL_CTL0_INDIV , reg_ctl[0 ]); + p =FIELD_GET (PLL_CTL1_OUTDIV , reg_ctl[1 ]); + +if (mode ==PLL_MODE_INT ) { + pll_freq = (u64 )parent_rate * n; +div_u64 (pll_freq, m * p); + }else { + x =FIELD_GET (PLL_CTL1_FRAC , reg_ctl[1 ]); +/* 2 decimal places floating to integer (ex. 1.23 to 123) */ + n = n *100 + ((x *100 ) /FIELD_MAX (PLL_CTL1_FRAC )); + pll_freq =div_u64 (parent_rate * n,100 * m * p); + } +return pll_freq; +} + +static int ma35d1_pll_find_closest (struct ma35d1_clk_pll *pll,unsigned long rate, +unsigned long parent_rate,u32 *reg_ctl, +unsigned long *freq) +{ +unsigned long min_diff =ULONG_MAX ; +int fbdiv_min, fbdiv_max; +int p, m, n; + + *freq =0 ; +if (rate <PLL_FCLKO_MIN_FREQ || rate >PLL_FCLKO_MAX_FREQ ) +return -EINVAL ; + +if (pll->mode ==PLL_MODE_INT ) { + fbdiv_min =FBDIV_MIN ; + fbdiv_max =FBDIV_MAX ; + }else { + fbdiv_min =FBDIV_FRAC_MIN ; + fbdiv_max =FBDIV_FRAC_MAX ; + } + +for (m =INDIV_MIN ; m <=INDIV_MAX ; m++) { +for (n = fbdiv_min; n <= fbdiv_max; n++) { +for (p =OUTDIV_MIN ; p <=OUTDIV_MAX ; p++) { +unsigned long tmp, fout, fclk, diff; + + tmp =div_u64 (parent_rate, m); +if (tmp <PLL_FREF_M_MIN_FREQ || + tmp >PLL_FREF_M_MAX_FREQ ) +continue ;/* constrain */ + + fclk =div_u64 (parent_rate * n, m); +/* for 2 decimal places */ +if (pll->mode !=PLL_MODE_INT ) + fclk =div_u64 (fclk,100 ); + +if (fclk <PLL_FCLK_MIN_FREQ || + fclk >PLL_FCLK_MAX_FREQ ) +continue ;/* constrain */ + + fout =div_u64 (fclk, p); +if (fout <PLL_FCLKO_MIN_FREQ || + fout >PLL_FCLKO_MAX_FREQ ) +continue ;/* constrain */ + + diff =abs (rate - fout); +if (diff < min_diff) { + reg_ctl[0 ] =FIELD_PREP (PLL_CTL0_INDIV , m) | +FIELD_PREP (PLL_CTL0_FBDIV , n); + reg_ctl[1 ] =FIELD_PREP (PLL_CTL1_OUTDIV , p); + *freq = fout; + min_diff = diff; +if (min_diff ==0 ) +break ; + } + } + } + } +if (*freq ==0 ) +return -EINVAL ;/* cannot find even one valid setting */ +return 0 ; +} + +static int ma35d1_clk_pll_set_rate (struct clk_hw *hw,unsigned long rate, +unsigned long parent_rate) +{ +struct ma35d1_clk_pll *pll =to_ma35d1_clk_pll (hw); +u32 reg_ctl[3 ] = {0 }; +unsigned long pll_freq; +int ret; + +if (parent_rate <PLL_FREF_MIN_FREQ || parent_rate >PLL_FREF_MAX_FREQ ) +return -EINVAL ; + + ret =ma35d1_pll_find_closest (pll, rate, parent_rate, reg_ctl, &pll_freq); +if (ret !=0 ) +return ret; + +switch (pll->mode) { +case PLL_MODE_INT : + reg_ctl[0 ] |=FIELD_PREP (PLL_CTL0_MODE ,PLL_MODE_INT ); +break ; +case PLL_MODE_FRAC : + reg_ctl[0 ] |=FIELD_PREP (PLL_CTL0_MODE ,PLL_MODE_FRAC ); +break ; +case PLL_MODE_SS : + reg_ctl[0 ] |=FIELD_PREP (PLL_CTL0_MODE ,PLL_MODE_SS ) | +FIELD_PREP (PLL_CTL0_SSRATE ,PLL_SS_RATE ); + reg_ctl[2 ] =FIELD_PREP (PLL_CTL2_SLOPE ,PLL_SLOPE ); +break ; + } + reg_ctl[1 ] |=PLL_CTL1_PD ; + +writel_relaxed (reg_ctl[0 ], pll->ctl0_base); +writel_relaxed (reg_ctl[1 ], pll->ctl1_base); +writel_relaxed (reg_ctl[2 ], pll->ctl2_base); +return 0 ; +} + +static unsigned long ma35d1_clk_pll_recalc_rate (struct clk_hw *hw,unsigned long parent_rate) +{ +struct ma35d1_clk_pll *pll =to_ma35d1_clk_pll (hw); +u32 reg_ctl[3 ]; +unsigned long pll_freq; + +if (parent_rate <PLL_FREF_MIN_FREQ || parent_rate >PLL_FREF_MAX_FREQ ) +return 0 ; + +switch (pll->id) { +case CAPLL : + reg_ctl[0 ] =readl_relaxed (pll->ctl0_base); + pll_freq =ma35d1_calc_smic_pll_freq (reg_ctl[0 ], parent_rate); +return pll_freq; +case DDRPLL : +case APLL : +case EPLL : +case VPLL : + reg_ctl[0 ] =readl_relaxed (pll->ctl0_base); + reg_ctl[1 ] =readl_relaxed (pll->ctl1_base); + pll_freq =ma35d1_calc_pll_freq (pll->mode, reg_ctl, parent_rate); +return pll_freq; + } +return 0 ; +} + +static long ma35d1_clk_pll_round_rate (struct clk_hw *hw,unsigned long rate, +unsigned long *parent_rate) +{ +struct ma35d1_clk_pll *pll =to_ma35d1_clk_pll (hw); +u32 reg_ctl[3 ] = {0 }; +unsigned long pll_freq; +long ret; + +if (*parent_rate <PLL_FREF_MIN_FREQ || *parent_rate >PLL_FREF_MAX_FREQ ) +return -EINVAL ; + + ret =ma35d1_pll_find_closest (pll, rate, *parent_rate, reg_ctl, &pll_freq); +if (ret <0 ) +return ret; + +switch (pll->id) { +case CAPLL : + reg_ctl[0 ] =readl_relaxed (pll->ctl0_base); + pll_freq =ma35d1_calc_smic_pll_freq (reg_ctl[0 ], *parent_rate); +return pll_freq; +case DDRPLL : +case APLL : +case EPLL : +case VPLL : + reg_ctl[0 ] =readl_relaxed (pll->ctl0_base); + reg_ctl[1 ] =readl_relaxed (pll->ctl1_base); + pll_freq =ma35d1_calc_pll_freq (pll->mode, reg_ctl, *parent_rate); +return pll_freq; + } +return 0 ; +} + +static int ma35d1_clk_pll_is_prepared (struct clk_hw *hw) +{ +struct ma35d1_clk_pll *pll =to_ma35d1_clk_pll (hw); +u32 val =readl_relaxed (pll->ctl1_base); + +return !(val &PLL_CTL1_PD ); +} + +static int ma35d1_clk_pll_prepare (struct clk_hw *hw) +{ +struct ma35d1_clk_pll *pll =to_ma35d1_clk_pll (hw); +u32 val; + + val =readl_relaxed (pll->ctl1_base); + val &= ~PLL_CTL1_PD ; +writel_relaxed (val, pll->ctl1_base); +return 0 ; +} + +static void ma35d1_clk_pll_unprepare (struct clk_hw *hw) +{ +struct ma35d1_clk_pll *pll =to_ma35d1_clk_pll (hw); +u32 val; + + val =readl_relaxed (pll->ctl1_base); + val |=PLL_CTL1_PD ; +writel_relaxed (val, pll->ctl1_base); +} + +static const struct clk_ops ma35d1_clk_pll_ops = { + .is_prepared = ma35d1_clk_pll_is_prepared, + .prepare = ma35d1_clk_pll_prepare, + .unprepare = ma35d1_clk_pll_unprepare, + .set_rate = ma35d1_clk_pll_set_rate, + .recalc_rate = ma35d1_clk_pll_recalc_rate, + .round_rate = ma35d1_clk_pll_round_rate, +}; + +static const struct clk_ops ma35d1_clk_fixed_pll_ops = { + .recalc_rate = ma35d1_clk_pll_recalc_rate, + .round_rate = ma35d1_clk_pll_round_rate, +}; + +struct clk_hw *ma35d1_reg_clk_pll (struct device *dev,u32 id,u8 u8mode,const char *name, +struct clk_hw *parent_hw,void __iomem *base) +{ +struct clk_parent_data pdata = { .index =0 }; +struct clk_init_data init = {}; +struct ma35d1_clk_pll *pll; +struct clk_hw *hw; +int ret; + + pll =devm_kzalloc (dev,sizeof (*pll),GFP_KERNEL ); +if (!pll) +return ERR_PTR (-ENOMEM ); + + pll->id = id; + pll->mode = u8mode; + pll->ctl0_base = base +REG_PLL_CTL0_OFFSET ; + pll->ctl1_base = base +REG_PLL_CTL1_OFFSET ; + pll->ctl2_base = base +REG_PLL_CTL2_OFFSET ; + + init.name = name; + init.flags =0 ; + pdata.hw = parent_hw; + init.parent_data = &pdata; + init.num_parents =1 ; + +if (id ==CAPLL || id ==DDRPLL ) + init.ops = &ma35d1_clk_fixed_pll_ops; +else + init.ops = &ma35d1_clk_pll_ops; + + pll->hw.init = &init; + hw = &pll->hw; + + ret =devm_clk_hw_register (dev, hw); +if (ret) +return ERR_PTR (ret); +return hw; +} +EXPORT_SYMBOL_GPL (ma35d1_reg_clk_pll);drivers/clk/nuvoton/clk-ma35d1.c new file +47
-0@@ -0,0 +1,933 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* +* Copyright (C) 2023 Nuvoton Technology Corp. +* Author: Chi-Fang Li <[email protected]> +*/ + +#include <linux/clk-provider.h> +#include <linux/mfd/syscon.h> +#include <linux/module.h> +#include <linux/of.h> +#include <linux/platform_device.h> +#include <linux/spinlock.h> +#include <dt-bindings/clock/nuvoton,ma35d1-clk.h> + +static DEFINE_SPINLOCK (ma35d1_lock); + +#define PLL_MAX_NUM 5 + +/* Clock Control Registers Offset */ +#define REG_CLK_PWRCTL 0x00 +#define REG_CLK_SYSCLK0 0x04 +#define REG_CLK_SYSCLK1 0x08 +#define REG_CLK_APBCLK0 0x0C +#define REG_CLK_APBCLK1 0x10 +#define REG_CLK_APBCLK2 0x14 +#define REG_CLK_CLKSEL0 0x18 +#define REG_CLK_CLKSEL1 0x1C +#define REG_CLK_CLKSEL2 0x20 +#define REG_CLK_CLKSEL3 0x24 +#define REG_CLK_CLKSEL4 0x28 +#define REG_CLK_CLKDIV0 0x2C +#define REG_CLK_CLKDIV1 0x30 +#define REG_CLK_CLKDIV2 0x34 +#define REG_CLK_CLKDIV3 0x38 +#define REG_CLK_CLKDIV4 0x3C +#define REG_CLK_CLKOCTL 0x40 +#define REG_CLK_STATUS 0x50 +#define REG_CLK_PLL0CTL0 0x60 +#define REG_CLK_PLL2CTL0 0x80 +#define REG_CLK_PLL2CTL1 0x84 +#define REG_CLK_PLL2CTL2 0x88 +#define REG_CLK_PLL3CTL0 0x90 +#define REG_CLK_PLL3CTL1 0x94 +#define REG_CLK_PLL3CTL2 0x98 +#define REG_CLK_PLL4CTL0 0xA0 +#define REG_CLK_PLL4CTL1 0xA4 +#define REG_CLK_PLL4CTL2 0xA8
drivers/clk/nuvoton/clk-ma35d1.c line 57
Quoted 10 lines
drivers/clk/nuvoton/clk-ma35d1.c new file +10
-0+#define REG_CLK_PLL5CTL0 0xB0 +#define REG_CLK_PLL5CTL1 0xB4 +#define REG_CLK_PLL5CTL2 0xB8 +#define REG_CLK_CLKDCTL 0xC0 +#define REG_CLK_CLKDSTS 0xC4 +#define REG_CLK_CDUPB 0xC8 +#define REG_CLK_CDLOWB 0xCC +#define REG_CLK_CKFLTRCTL 0xD0 +#define REG_CLK_TESTCLK 0xF0 +#define REG_CLK_PLLCTL 0x40
Please use lowercase hex.
drivers/clk/nuvoton/clk-ma35d1.c line 69
Quoted 12 lines
drivers/clk/nuvoton/clk-ma35d1.c new file +12
-0+ +#define PLL_MODE_INT 0 +#define PLL_MODE_FRAC 1 +#define PLL_MODE_SS 2 + +struct clk_hw *ma35d1_reg_clk_pll (struct device *dev,u32 id,u8 u8mode, +const char *name,struct clk_hw *parent_hw, +void __iomem *base); +struct clk_hw *ma35d1_reg_adc_clkdiv (struct device *dev,const char *name, +struct clk_hw *hw,spinlock_t *lock, +unsigned long flags,void __iomem *reg, +u8 shift,u8 width,u32 mask_bit);
These function prototypes should be in a header and included in any C files that use them.
Quoted 13 lines
drivers/clk/nuvoton/clk-ma35d1.c new file +13
-0+ +static const struct clk_parent_data ca35clk_sel_clks[] = { + { .index =0 },/* HXT */ + { .index =1 },/* CAPLL */ + { .index =2 }/* DDRPLL */ +}; + +static const char *const sysclk0_sel_clks[] = { +"epll_div2" ,"syspll" +}; + +static const char *const sysclk1_sel_clks[] = { +"hxt" ,"syspll"
[...]
Quoted 9 lines
drivers/clk/nuvoton/clk-ma35d1.c new file +9
-0+"pclk0" ,"apll" ,"dummy" ,"dummy" +}; + +static const char *const i2s0_sel_clks[] = { +"apll" ,"sysclk1_div2" ,"dummy" ,"dummy" +}; + +static const char *const i2s1_sel_clks[] = { + "apll", "sysclk1_div2", "dummy", "dummy"
drivers/clk/nuvoton/clk-ma35d1.c line 224
Quoted 10 lines
drivers/clk/nuvoton/clk-ma35d1.c new file +10
-0+}; + +static const char *const can_sel_clks[] = { +"apll" ,"vpll" +}; + +static const char *const cko_sel_clks[] = { +"hxt" ,"lxt" ,"hirc" ,"lirc" ,"capll_div4" ,"syspll" , +"ddrpll" ,"epll_div2" ,"apll" ,"vpll" ,"dummy" ,"dummy" , +"dummy" ,"dummy" ,"dummy" ,"dummy"
I suspect "dummy" is something that we don't want to tell Linux about? If possible, we should simply omit it entirely from the parent_data arrays.
Quoted 30 lines
drivers/clk/nuvoton/clk-ma35d1.c new file +30
-0+}; + +static const char *const smc_sel_clks[] = { +"hxt" ,"pclk4" +}; + +static const char *const kpi_sel_clks[] = { +"hxt" ,"lxt" +}; + +static const struct clk_div_table ip_div_table[] = { + {0 ,2 }, {1 ,4 }, {2 ,6 }, {3 ,8 }, {4 ,10 }, + {5 ,12 }, {6 ,14 }, {7 ,16 }, {0 ,0 }, +}; + +static const struct clk_div_table eadc_div_table[] = { + {0 ,2 }, {1 ,4 }, {2 ,6 }, {3 ,8 }, {4 ,10 }, + {5 ,12 }, {6 ,14 }, {7 ,16 }, {8 ,18 }, + {9 ,20 }, {10 ,22 }, {11 ,24 }, {12 ,26 }, + {13 ,28 }, {14 ,30 }, {15 ,32 }, {0 ,0 }, +}; + +static struct clk_hw *ma35d1_clk_fixed (const char *name,int rate) +{ +return clk_hw_register_fixed_rate (NULL , name,NULL ,0 , rate); +} + +static struct clk_hw *ma35d1_clk_mux_parent(struct device *dev, const char *name, + void __iomem *reg, u8 shift, u8 width, + const struct clk_parent_data *pdata,
drivers/clk/nuvoton/clk-ma35d1.c line 264
Quoted 10 lines
drivers/clk/nuvoton/clk-ma35d1.c new file +10
-0+ int num_pdata) +{ +return clk_hw_register_mux_parent_data (dev, name, pdata, num_pdata, +CLK_SET_RATE_NO_REPARENT , reg, shift, + width,0 , &ma35d1_lock); +} + +static struct clk_hw *ma35d1_clk_mux (struct device *dev,const char *name, +void __iomem *reg,u8 shift,u8 width, +const char *const *parents,int num_parents)
Please don't use string arrays for parent descriptions. Everything should use clk_parent_data or direct clk_hw pointers.
Re: [PATCH v13 08/10] clk: nuvoton: Add clock driver for ma35d1 clock controller
Dear Stephen,
Quoted 26 lines · Stephen Boyd
Quoting Jacky Huang (2023-06-04 21:07:47)
Quoted 25 lines
drivers/clk/nuvoton/clk-ma35d1-divider.c new file +19
-0@@ -0,0 +1,135 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* +* Copyright (C) 2023 Nuvoton Technology Corp. +* Author: Chi-Fang Li <[email protected]> +*/ + +#include <linux/clk-provider.h> +#include <linux/device.h> +#include <linux/regmap.h> +#include <linux/spinlock.h> + +struct ma35d1_adc_clk_div { +struct clk_hw hw; +void __iomem *reg; +u8 shift; +u8 width; +u32 mask; +const struct clk_div_table *table; +/* protects concurrent access to clock divider registers */
Quoted 8 lines
drivers/clk/nuvoton/clk-ma35d1-divider.c line 26
Quoted 7 lines
drivers/clk/nuvoton/clk-ma35d1-divider.c new file +7
-0+spinlock_t *lock; +}; + +struct clk_hw *ma35d1_reg_adc_clkdiv (struct device *dev,const char *name, +struct clk_hw *parent_hw,spinlock_t *lock, +unsigned long flags,void __iomem *reg, +u8 shift,u8 width,u32 mask_bit);Why is this forward declared?
Yes, it's unused. I will remove this declaration.
Quoted 184 lines
Quoted 184 lines
drivers/clk/nuvoton/clk-ma35d1-divider.c new file +109
-0+ +static inline struct ma35d1_adc_clk_div *to_ma35d1_adc_clk_div (struct clk_hw *_hw) +{ + return container_of(_hw, struct ma35d1_adc_clk_div, hw); +} + +static unsigned long ma35d1_clkdiv_recalc_rate (struct clk_hw *hw,unsigned long parent_rate) +{ +unsigned int val; +struct ma35d1_adc_clk_div *dclk =to_ma35d1_adc_clk_div (hw); + + val =readl_relaxed (dclk->reg) >> dclk->shift; + val &=clk_div_mask (dclk->width); + val +=1 ; +return divider_recalc_rate (hw, parent_rate, val, dclk->table, +CLK_DIVIDER_ROUND_CLOSEST , dclk->width); +} + +static long ma35d1_clkdiv_round_rate (struct clk_hw *hw,unsigned long rate,unsigned long *prate) +{ +struct ma35d1_adc_clk_div *dclk =to_ma35d1_adc_clk_div (hw); + +return divider_round_rate (hw, rate, prate, dclk->table, + dclk->width,CLK_DIVIDER_ROUND_CLOSEST ); +} + +static int ma35d1_clkdiv_set_rate (struct clk_hw *hw,unsigned long rate,unsigned long parent_rate) +{ +int value; +unsigned long flags =0 ; +u32 data; +struct ma35d1_adc_clk_div *dclk =to_ma35d1_adc_clk_div (hw); + + value =divider_get_val (rate, parent_rate, dclk->table, + dclk->width,CLK_DIVIDER_ROUND_CLOSEST ); + +spin_lock_irqsave (dclk->lock, flags); + + data =readl_relaxed (dclk->reg); + data &= ~(clk_div_mask (dclk->width) << dclk->shift); + data |= (value -1 ) << dclk->shift; + data |= dclk->mask; +writel_relaxed (data, dclk->reg); + +spin_unlock_irqrestore (dclk->lock, flags); +return 0 ; +} + +static const struct clk_ops ma35d1_adc_clkdiv_ops = { + .recalc_rate = ma35d1_clkdiv_recalc_rate, + .round_rate = ma35d1_clkdiv_round_rate, + .set_rate = ma35d1_clkdiv_set_rate, +}; + +struct clk_hw *ma35d1_reg_adc_clkdiv (struct device *dev,const char *name, +struct clk_hw *parent_hw,spinlock_t *lock, +unsigned long flags,void __iomem *reg, +u8 shift,u8 width,u32 mask_bit) +{ +struct ma35d1_adc_clk_div *div; +struct clk_init_data init; +struct clk_div_table *table; +struct clk_parent_data pdata = { .index =0 }; +u32 max_div, min_div; +struct clk_hw *hw; +int ret; +int i; + + div =devm_kzalloc (dev,sizeof (*div),GFP_KERNEL ); +if (!div) +return ERR_PTR (-ENOMEM ); + + max_div =clk_div_mask (width) +1 ; + min_div =1 ; + + table =devm_kcalloc (dev, max_div +1 ,sizeof (*table),GFP_KERNEL ); +if (!table) +return ERR_PTR (-ENOMEM ); + +for (i =0 ; i < max_div; i++) { + table[i].val = min_div + i; + table[i].div =2 * table[i].val; + } + table[max_div].val =0 ; + table[max_div].div =0 ; + +memset (&init,0 ,sizeof (init)); + init.name = name; + init.ops = &ma35d1_adc_clkdiv_ops; + init.flags |= flags; + pdata.hw = parent_hw; + init.parent_data = &pdata; + init.num_parents =1 ; + + div->reg = reg; + div->shift = shift; + div->width = width; + div->mask = mask_bit ?BIT (mask_bit) :0 ; + div->lock = lock; + div->hw.init = &init; + div->table = table; + + hw = &div->hw; + ret =devm_clk_hw_register (dev, hw); +if (ret) +return ERR_PTR (ret); +return hw; +} +EXPORT_SYMBOL_GPL (ma35d1_reg_adc_clkdiv);drivers/clk/nuvoton/clk-ma35d1-pll.c new file +68
-0@@ -0,0 +1,361 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* +* Copyright (C) 2023 Nuvoton Technology Corp. +* Author: Chi-Fang Li <[email protected]> +*/ + +#include <linux/bitfield.h> +#include <linux/clk-provider.h> +#include <linux/container_of.h> +#include <linux/device.h> +#include <linux/io.h> +#include <linux/kernel.h> +#include <linux/math64.h> +#include <linux/slab.h> +#include <linux/units.h> +#include <dt-bindings/clock/nuvoton,ma35d1-clk.h> + +/* PLL frequency limits */ +#define PLL_FREF_MAX_FREQ (200 * HZ_PER_MHZ) +#define PLL_FREF_MIN_FREQ (1 * HZ_PER_MHZ) +#define PLL_FREF_M_MAX_FREQ (40 * HZ_PER_MHZ) +#define PLL_FREF_M_MIN_FREQ (10 * HZ_PER_MHZ) +#define PLL_FCLK_MAX_FREQ (2400 * HZ_PER_MHZ) +#define PLL_FCLK_MIN_FREQ (600 * HZ_PER_MHZ) +#define PLL_FCLKO_MAX_FREQ (2400 * HZ_PER_MHZ) +#define PLL_FCLKO_MIN_FREQ (85700 * HZ_PER_KHZ) +#define PLL_SS_RATE 0x77 +#define PLL_SLOPE 0x58CFA + +#define REG_PLL_CTL0_OFFSET 0x0 +#define REG_PLL_CTL1_OFFSET 0x4 +#define REG_PLL_CTL2_OFFSET 0x8 + +/* bit fields for REG_CLK_PLL0CTL0, which is SMIC PLL design */ +#define SPLL0_CTL0_FBDIV GENMASK(7, 0) +#define SPLL0_CTL0_INDIV GENMASK(11, 8) +#define SPLL0_CTL0_OUTDIV GENMASK(13, 12) +#define SPLL0_CTL0_PD BIT(16) +#define SPLL0_CTL0_BP BIT(17) + +/* bit fields for REG_CLK_PLLxCTL0 ~ REG_CLK_PLLxCTL2, where x = 2 ~ 5 */ +#define PLL_CTL0_FBDIV GENMASK(10, 0) +#define PLL_CTL0_INDIV GENMASK(17, 12) +#define PLL_CTL0_MODE GENMASK(19, 18) +#define PLL_CTL0_SSRATE GENMASK(30, 20) +#define PLL_CTL1_PD BIT(0) +#define PLL_CTL1_BP BIT(1) +#define PLL_CTL1_OUTDIV GENMASK(6, 4) +#define PLL_CTL1_FRAC GENMASK(31, 24) +#define PLL_CTL2_SLOPE GENMASK(23, 0) + +#define INDIV_MIN 1 +#define INDIV_MAX 63 +#define FBDIV_MIN 16 +#define FBDIV_MAX 2047 +#define FBDIV_FRAC_MIN 1600 +#define FBDIV_FRAC_MAX 204700 +#define OUTDIV_MIN 1 +#define OUTDIV_MAX 7 + +#define PLL_MODE_INT 0 +#define PLL_MODE_FRAC 1 +#define PLL_MODE_SS 2 + +struct ma35d1_clk_pll { +struct clk_hw hw; +u32 id; +u8 mode;
Quoted 8 lines
drivers/clk/nuvoton/clk-ma35d1-pll.c line 75
Quoted 7 lines
drivers/clk/nuvoton/clk-ma35d1-pll.c new file +7
-0+void __iomem *ctl0_base; +void __iomem *ctl1_base; +void __iomem *ctl2_base; +}; + +struct clk_hw *ma35d1_reg_clk_pll (struct device *dev,u32 id,u8 u8mode,const char *name, +struct clk_hw *parent_hw,void __iomem *base);Why is this forward declared?
I will remove it.
Quoted 343 lines
Quoted 343 lines
drivers/clk/nuvoton/clk-ma35d1-pll.c new file +286
-0+ +static inline struct ma35d1_clk_pll *to_ma35d1_clk_pll (struct clk_hw *_hw) +{ + return container_of(_hw, struct ma35d1_clk_pll, hw); +} + +static unsigned long ma35d1_calc_smic_pll_freq (u32 pll0_ctl0, +unsigned long parent_rate) +{ +u32 m, n, p, outdiv; +u64 pll_freq; + +if (pll0_ctl0 &SPLL0_CTL0_BP ) +return parent_rate; + + n =FIELD_GET (SPLL0_CTL0_FBDIV , pll0_ctl0); + m =FIELD_GET (SPLL0_CTL0_INDIV , pll0_ctl0); + p =FIELD_GET (SPLL0_CTL0_OUTDIV , pll0_ctl0); + outdiv =1 << p; + pll_freq = (u64 )parent_rate * n; +div_u64 (pll_freq, m * outdiv); +return pll_freq; +} + +static unsigned long ma35d1_calc_pll_freq (u8 mode,u32 *reg_ctl,unsigned long parent_rate) +{ +unsigned long pll_freq, x; +u32 m, n, p; + +if (reg_ctl[1 ] &PLL_CTL1_BP ) +return parent_rate; + + n =FIELD_GET (PLL_CTL0_FBDIV , reg_ctl[0 ]); + m =FIELD_GET (PLL_CTL0_INDIV , reg_ctl[0 ]); + p =FIELD_GET (PLL_CTL1_OUTDIV , reg_ctl[1 ]); + +if (mode ==PLL_MODE_INT ) { + pll_freq = (u64 )parent_rate * n; +div_u64 (pll_freq, m * p); + }else { + x =FIELD_GET (PLL_CTL1_FRAC , reg_ctl[1 ]); +/* 2 decimal places floating to integer (ex. 1.23 to 123) */ + n = n *100 + ((x *100 ) /FIELD_MAX (PLL_CTL1_FRAC )); + pll_freq =div_u64 (parent_rate * n,100 * m * p); + } +return pll_freq; +} + +static int ma35d1_pll_find_closest (struct ma35d1_clk_pll *pll,unsigned long rate, +unsigned long parent_rate,u32 *reg_ctl, +unsigned long *freq) +{ +unsigned long min_diff =ULONG_MAX ; +int fbdiv_min, fbdiv_max; +int p, m, n; + + *freq =0 ; +if (rate <PLL_FCLKO_MIN_FREQ || rate >PLL_FCLKO_MAX_FREQ ) +return -EINVAL ; + +if (pll->mode ==PLL_MODE_INT ) { + fbdiv_min =FBDIV_MIN ; + fbdiv_max =FBDIV_MAX ; + }else { + fbdiv_min =FBDIV_FRAC_MIN ; + fbdiv_max =FBDIV_FRAC_MAX ; + } + +for (m =INDIV_MIN ; m <=INDIV_MAX ; m++) { +for (n = fbdiv_min; n <= fbdiv_max; n++) { +for (p =OUTDIV_MIN ; p <=OUTDIV_MAX ; p++) { +unsigned long tmp, fout, fclk, diff; + + tmp =div_u64 (parent_rate, m); +if (tmp <PLL_FREF_M_MIN_FREQ || + tmp >PLL_FREF_M_MAX_FREQ ) +continue ;/* constrain */ + + fclk =div_u64 (parent_rate * n, m); +/* for 2 decimal places */ +if (pll->mode !=PLL_MODE_INT ) + fclk =div_u64 (fclk,100 ); + +if (fclk <PLL_FCLK_MIN_FREQ || + fclk >PLL_FCLK_MAX_FREQ ) +continue ;/* constrain */ + + fout =div_u64 (fclk, p); +if (fout <PLL_FCLKO_MIN_FREQ || + fout >PLL_FCLKO_MAX_FREQ ) +continue ;/* constrain */ + + diff =abs (rate - fout); +if (diff < min_diff) { + reg_ctl[0 ] =FIELD_PREP (PLL_CTL0_INDIV , m) | +FIELD_PREP (PLL_CTL0_FBDIV , n); + reg_ctl[1 ] =FIELD_PREP (PLL_CTL1_OUTDIV , p); + *freq = fout; + min_diff = diff; +if (min_diff ==0 ) +break ; + } + } + } + } +if (*freq ==0 ) +return -EINVAL ;/* cannot find even one valid setting */ +return 0 ; +} + +static int ma35d1_clk_pll_set_rate (struct clk_hw *hw,unsigned long rate, +unsigned long parent_rate) +{ +struct ma35d1_clk_pll *pll =to_ma35d1_clk_pll (hw); +u32 reg_ctl[3 ] = {0 }; +unsigned long pll_freq; +int ret; + +if (parent_rate <PLL_FREF_MIN_FREQ || parent_rate >PLL_FREF_MAX_FREQ ) +return -EINVAL ; + + ret =ma35d1_pll_find_closest (pll, rate, parent_rate, reg_ctl, &pll_freq); +if (ret !=0 ) +return ret; + +switch (pll->mode) { +case PLL_MODE_INT : + reg_ctl[0 ] |=FIELD_PREP (PLL_CTL0_MODE ,PLL_MODE_INT ); +break ; +case PLL_MODE_FRAC : + reg_ctl[0 ] |=FIELD_PREP (PLL_CTL0_MODE ,PLL_MODE_FRAC ); +break ; +case PLL_MODE_SS : + reg_ctl[0 ] |=FIELD_PREP (PLL_CTL0_MODE ,PLL_MODE_SS ) | +FIELD_PREP (PLL_CTL0_SSRATE ,PLL_SS_RATE ); + reg_ctl[2 ] =FIELD_PREP (PLL_CTL2_SLOPE ,PLL_SLOPE ); +break ; + } + reg_ctl[1 ] |=PLL_CTL1_PD ; + +writel_relaxed (reg_ctl[0 ], pll->ctl0_base); +writel_relaxed (reg_ctl[1 ], pll->ctl1_base); +writel_relaxed (reg_ctl[2 ], pll->ctl2_base); +return 0 ; +} + +static unsigned long ma35d1_clk_pll_recalc_rate (struct clk_hw *hw,unsigned long parent_rate) +{ +struct ma35d1_clk_pll *pll =to_ma35d1_clk_pll (hw); +u32 reg_ctl[3 ]; +unsigned long pll_freq; + +if (parent_rate <PLL_FREF_MIN_FREQ || parent_rate >PLL_FREF_MAX_FREQ ) +return 0 ; + +switch (pll->id) { +case CAPLL : + reg_ctl[0 ] =readl_relaxed (pll->ctl0_base); + pll_freq =ma35d1_calc_smic_pll_freq (reg_ctl[0 ], parent_rate); +return pll_freq; +case DDRPLL : +case APLL : +case EPLL : +case VPLL : + reg_ctl[0 ] =readl_relaxed (pll->ctl0_base); + reg_ctl[1 ] =readl_relaxed (pll->ctl1_base); + pll_freq =ma35d1_calc_pll_freq (pll->mode, reg_ctl, parent_rate); +return pll_freq; + } +return 0 ; +} + +static long ma35d1_clk_pll_round_rate (struct clk_hw *hw,unsigned long rate, +unsigned long *parent_rate) +{ +struct ma35d1_clk_pll *pll =to_ma35d1_clk_pll (hw); +u32 reg_ctl[3 ] = {0 }; +unsigned long pll_freq; +long ret; + +if (*parent_rate <PLL_FREF_MIN_FREQ || *parent_rate >PLL_FREF_MAX_FREQ ) +return -EINVAL ; + + ret =ma35d1_pll_find_closest (pll, rate, *parent_rate, reg_ctl, &pll_freq); +if (ret <0 ) +return ret; + +switch (pll->id) { +case CAPLL : + reg_ctl[0 ] =readl_relaxed (pll->ctl0_base); + pll_freq =ma35d1_calc_smic_pll_freq (reg_ctl[0 ], *parent_rate); +return pll_freq; +case DDRPLL : +case APLL : +case EPLL : +case VPLL : + reg_ctl[0 ] =readl_relaxed (pll->ctl0_base); + reg_ctl[1 ] =readl_relaxed (pll->ctl1_base); + pll_freq =ma35d1_calc_pll_freq (pll->mode, reg_ctl, *parent_rate); +return pll_freq; + } +return 0 ; +} + +static int ma35d1_clk_pll_is_prepared (struct clk_hw *hw) +{ +struct ma35d1_clk_pll *pll =to_ma35d1_clk_pll (hw); +u32 val =readl_relaxed (pll->ctl1_base); + +return !(val &PLL_CTL1_PD ); +} + +static int ma35d1_clk_pll_prepare (struct clk_hw *hw) +{ +struct ma35d1_clk_pll *pll =to_ma35d1_clk_pll (hw); +u32 val; + + val =readl_relaxed (pll->ctl1_base); + val &= ~PLL_CTL1_PD ; +writel_relaxed (val, pll->ctl1_base); +return 0 ; +} + +static void ma35d1_clk_pll_unprepare (struct clk_hw *hw) +{ +struct ma35d1_clk_pll *pll =to_ma35d1_clk_pll (hw); +u32 val; + + val =readl_relaxed (pll->ctl1_base); + val |=PLL_CTL1_PD ; +writel_relaxed (val, pll->ctl1_base); +} + +static const struct clk_ops ma35d1_clk_pll_ops = { + .is_prepared = ma35d1_clk_pll_is_prepared, + .prepare = ma35d1_clk_pll_prepare, + .unprepare = ma35d1_clk_pll_unprepare, + .set_rate = ma35d1_clk_pll_set_rate, + .recalc_rate = ma35d1_clk_pll_recalc_rate, + .round_rate = ma35d1_clk_pll_round_rate, +}; + +static const struct clk_ops ma35d1_clk_fixed_pll_ops = { + .recalc_rate = ma35d1_clk_pll_recalc_rate, + .round_rate = ma35d1_clk_pll_round_rate, +}; + +struct clk_hw *ma35d1_reg_clk_pll (struct device *dev,u32 id,u8 u8mode,const char *name, +struct clk_hw *parent_hw,void __iomem *base) +{ +struct clk_parent_data pdata = { .index =0 }; +struct clk_init_data init = {}; +struct ma35d1_clk_pll *pll; +struct clk_hw *hw; +int ret; + + pll =devm_kzalloc (dev,sizeof (*pll),GFP_KERNEL ); +if (!pll) +return ERR_PTR (-ENOMEM ); + + pll->id = id; + pll->mode = u8mode; + pll->ctl0_base = base +REG_PLL_CTL0_OFFSET ; + pll->ctl1_base = base +REG_PLL_CTL1_OFFSET ; + pll->ctl2_base = base +REG_PLL_CTL2_OFFSET ; + + init.name = name; + init.flags =0 ; + pdata.hw = parent_hw; + init.parent_data = &pdata; + init.num_parents =1 ; + +if (id ==CAPLL || id ==DDRPLL ) + init.ops = &ma35d1_clk_fixed_pll_ops; +else + init.ops = &ma35d1_clk_pll_ops; + + pll->hw.init = &init; + hw = &pll->hw; + + ret =devm_clk_hw_register (dev, hw); +if (ret) +return ERR_PTR (ret); +return hw; +} +EXPORT_SYMBOL_GPL (ma35d1_reg_clk_pll);drivers/clk/nuvoton/clk-ma35d1.c new file +50
-0@@ -0,0 +1,933 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* +* Copyright (C) 2023 Nuvoton Technology Corp. +* Author: Chi-Fang Li <[email protected]> +*/ + +#include <linux/clk-provider.h> +#include <linux/mfd/syscon.h> +#include <linux/module.h> +#include <linux/of.h> +#include <linux/platform_device.h> +#include <linux/spinlock.h> +#include <dt-bindings/clock/nuvoton,ma35d1-clk.h> + +static DEFINE_SPINLOCK (ma35d1_lock); + +#define PLL_MAX_NUM 5 + +/* Clock Control Registers Offset */ +#define REG_CLK_PWRCTL 0x00 +#define REG_CLK_SYSCLK0 0x04 +#define REG_CLK_SYSCLK1 0x08 +#define REG_CLK_APBCLK0 0x0C +#define REG_CLK_APBCLK1 0x10 +#define REG_CLK_APBCLK2 0x14 +#define REG_CLK_CLKSEL0 0x18 +#define REG_CLK_CLKSEL1 0x1C +#define REG_CLK_CLKSEL2 0x20 +#define REG_CLK_CLKSEL3 0x24 +#define REG_CLK_CLKSEL4 0x28 +#define REG_CLK_CLKDIV0 0x2C +#define REG_CLK_CLKDIV1 0x30 +#define REG_CLK_CLKDIV2 0x34 +#define REG_CLK_CLKDIV3 0x38 +#define REG_CLK_CLKDIV4 0x3C +#define REG_CLK_CLKOCTL 0x40 +#define REG_CLK_STATUS 0x50 +#define REG_CLK_PLL0CTL0 0x60 +#define REG_CLK_PLL2CTL0 0x80 +#define REG_CLK_PLL2CTL1 0x84 +#define REG_CLK_PLL2CTL2 0x88 +#define REG_CLK_PLL3CTL0 0x90 +#define REG_CLK_PLL3CTL1 0x94 +#define REG_CLK_PLL3CTL2 0x98 +#define REG_CLK_PLL4CTL0 0xA0 +#define REG_CLK_PLL4CTL1 0xA4 +#define REG_CLK_PLL4CTL2 0xA8 +#define REG_CLK_PLL5CTL0 0xB0 +#define REG_CLK_PLL5CTL1 0xB4 +#define REG_CLK_PLL5CTL2 0xB8
Quoted 8 lines
drivers/clk/nuvoton/clk-ma35d1.c line 57
Quoted 7 lines
drivers/clk/nuvoton/clk-ma35d1.c new file +7
-0+#define REG_CLK_CLKDCTL 0xC0 +#define REG_CLK_CLKDSTS 0xC4 +#define REG_CLK_CDUPB 0xC8 +#define REG_CLK_CDLOWB 0xCC +#define REG_CLK_CKFLTRCTL 0xD0 +#define REG_CLK_TESTCLK 0xF0 +#define REG_CLK_PLLCTL 0x40Please use lowercase hex.
I will fix them.
Quoted 6 lines
Quoted 6 lines
drivers/clk/nuvoton/clk-ma35d1.c new file +6
-0+ +#define PLL_MODE_INT 0 +#define PLL_MODE_FRAC 1 +#define PLL_MODE_SS 2 + +struct clk_hw *ma35d1_reg_clk_pll(struct device *dev, u32 id, u8 u8mode,
Quoted 8 lines
drivers/clk/nuvoton/clk-ma35d1.c line 69
Quoted 6 lines
drivers/clk/nuvoton/clk-ma35d1.c new file +6
-0+ const char *name, struct clk_hw *parent_hw, + void __iomem *base); +struct clk_hw *ma35d1_reg_adc_clkdiv (struct device *dev,const char *name, +struct clk_hw *hw,spinlock_t *lock, +unsigned long flags,void __iomem *reg, +u8 shift,u8 width,u32 mask_bit);These function prototypes should be in a header and included in any C files that use them.
I will re-create clk-ma35d1.h in the same directory, and move these function prototypes to the header file.
Quoted 28 lines
Quoted 13 lines
drivers/clk/nuvoton/clk-ma35d1.c new file +13
-0+ +static const struct clk_parent_data ca35clk_sel_clks[] = { + { .index =0 },/* HXT */ + { .index =1 },/* CAPLL */ + { .index =2 }/* DDRPLL */ +}; + +static const char *const sysclk0_sel_clks[] = { +"epll_div2" ,"syspll" +}; + +static const char *const sysclk1_sel_clks[] = { +"hxt" ,"syspll" [...]
Quoted 14 lines
drivers/clk/nuvoton/clk-ma35d1.c new file +14
-0+ "pclk0", "apll", "dummy", "dummy" +}; + +static const char *const i2s0_sel_clks[] = { +"apll" ,"sysclk1_div2" ,"dummy" ,"dummy" +}; + +static const char *const i2s1_sel_clks[] = { +"apll" ,"sysclk1_div2" ,"dummy" ,"dummy" +}; + +static const char *const can_sel_clks[] = { +"apll" ,"vpll" +};
Quoted 8 lines
drivers/clk/nuvoton/clk-ma35d1.c line 224
Quoted 5 lines
drivers/clk/nuvoton/clk-ma35d1.c new file +5
-0+ +static const char *const cko_sel_clks[] = { +"hxt" ,"lxt" ,"hirc" ,"lirc" ,"capll_div4" ,"syspll" , +"ddrpll" ,"epll_div2" ,"apll" ,"vpll" ,"dummy" ,"dummy" , +"dummy" ,"dummy" ,"dummy" ,"dummy" I suspect "dummy" is something that we don't want to tell Linux about? If possible, we should simply omit it entirely from the
parent_dataarrays.
The array is a mapping to bit field of clock selection registers, and "dummy" means reserved.
I will remove the trailing "dummy", but would like to preserve the middle "dummy" as the followings.
static const char *const timer0_sel_clks[] = {
"hxt", "lxt", "pclk0", "dummy", "dummy", "lirc", "dummy", "hirc" };
Quoted 34 lines
Quoted 34 lines
drivers/clk/nuvoton/clk-ma35d1.c new file +34
-0+}; + +static const char *const smc_sel_clks[] = { +"hxt" ,"pclk4" +}; + +static const char *const kpi_sel_clks[] = { +"hxt" ,"lxt" +}; + +static const struct clk_div_table ip_div_table[] = { + {0 ,2 }, {1 ,4 }, {2 ,6 }, {3 ,8 }, {4 ,10 }, + {5 ,12 }, {6 ,14 }, {7 ,16 }, {0 ,0 }, +}; + +static const struct clk_div_table eadc_div_table[] = { + {0 ,2 }, {1 ,4 }, {2 ,6 }, {3 ,8 }, {4 ,10 }, + {5 ,12 }, {6 ,14 }, {7 ,16 }, {8 ,18 }, + {9 ,20 }, {10 ,22 }, {11 ,24 }, {12 ,26 }, + {13 ,28 }, {14 ,30 }, {15 ,32 }, {0 ,0 }, +}; + +static struct clk_hw *ma35d1_clk_fixed (const char *name,int rate) +{ +return clk_hw_register_fixed_rate (NULL , name,NULL ,0 , rate); +} + +static struct clk_hw *ma35d1_clk_mux_parent (struct device *dev,const char *name, +void __iomem *reg,u8 shift,u8 width, +const struct clk_parent_data *pdata, +int num_pdata) +{ + return clk_hw_register_mux_parent_data(dev, name, pdata, num_pdata, + CLK_SET_RATE_NO_REPARENT, reg, shift,
Quoted 8 lines
drivers/clk/nuvoton/clk-ma35d1.c line 264
Quoted 6 lines
drivers/clk/nuvoton/clk-ma35d1.c new file +6
-0+ width, 0, &ma35d1_lock); +} + +static struct clk_hw *ma35d1_clk_mux (struct device *dev,const char *name, +void __iomem *reg,u8 shift,u8 width, +const char *const *parents,int num_parents)Please don't use string arrays for parent descriptions. Everything should use
clk_parent_dataor directclk_hwpointers.
I will use clk_parent_data instead of strings.
Best Regards,
Jacky Huang
Stephen Boyd
maintainerRe: [PATCH v13 08/10] clk: nuvoton: Add clock driver for ma35d1 clock controller
Quoting Jacky Huang (2023-06-12 18:37:31)
Quoted 16 lines · Stephen Boyd
Quoted 14 lines
Quoting Jacky Huang (2023-06-04 21:07:47)
drivers/clk/nuvoton/clk-ma35d1-divider.c
Quoted 11 lines
drivers/clk/nuvoton/clk-ma35d1-divider.c +10
-0+ int num_pdata) +{ +return clk_hw_register_mux_parent_data (dev, name, pdata, num_pdata, +CLK_SET_RATE_NO_REPARENT , reg, shift, + width,0 , &ma35d1_lock); +} + +static struct clk_hw *ma35d1_clk_mux (struct device *dev,const char *name, +void __iomem *reg,u8 shift,u8 width, +const char *const *parents,int num_parents)Please don't use string arrays for parent descriptions. Everything should use
clk_parent_dataor directclk_hwpointers.
Quoted 2 lines
I will use
clk_parent_datainstead of strings.
When you use clk_parent_data, just don't set anything for the "dummy" clks besides a -1 .index to indicate there isn't a parent for that entry.
Re: [PATCH v13 08/10] clk: nuvoton: Add clock driver for ma35d1 clock controller
Quoted 16 lines · Stephen Boyd
Quoting Jacky Huang (2023-06-12 18:37:31)
Quoted 15 lines · Stephen Boyd
Quoted 14 lines
Quoting Jacky Huang (2023-06-04 21:07:47)
drivers/clk/nuvoton/clk-ma35d1-divider.c
Quoted 11 lines
drivers/clk/nuvoton/clk-ma35d1-divider.c +10
-0+ int num_pdata) +{ +return clk_hw_register_mux_parent_data (dev, name, pdata, num_pdata, +CLK_SET_RATE_NO_REPARENT , reg, shift, + width,0 , &ma35d1_lock); +} + +static struct clk_hw *ma35d1_clk_mux (struct device *dev,const char *name, +void __iomem *reg,u8 shift,u8 width, +const char *const *parents,int num_parents)Please don't use string arrays for parent descriptions. Everything should use
clk_parent_dataor directclk_hwpointers.
Quoted 5 lines
Quoted 2 lines
I will use
clk_parent_datainstead of strings.When you use
clk_parent_data, just don't set anything for the "dummy" clks besides a -1 .index to indicate there isn't a parent for that entry.
Okay, thank you for the reminder.
Best Regards,
Jacky Huang
PATCH v13 9/10 reset: Add Nuvoton ma35d1 reset driver support
In reply to Jacky HuangFrom: Jacky Huang <[email protected]>
This driver supports individual IP reset for the MA35D1. The reset control registers are a subset of the system control registers.
--- drivers/reset/Kconfig | 6 + drivers/reset/Makefile | 1 + drivers/reset/reset-ma35d1.c | 235 +++++++++++++++++++++++++++++++++++ 3 files changed, 242 insertions(+) create mode 100644 drivers/reset/reset-ma35d1.c
drivers/reset/Kconfig +6 -0
@@ -143,6 +143,12 @@ config RESET_NPCM This enables the reset controller driver for Nuvoton NPCM BMC SoCs. +config RESET_NUVOTON_MA35D1 + bool "Nuvton MA35D1 Reset Driver" + default ARCH_MA35 || COMPILE_TEST + help + This enables the reset controller driver for Nuvoton MA35D1 SoC. + config RESET_OXNAS bool
drivers/reset/Makefile +1 -0
@@ -21,6 +21,7 @@ obj-$(CONFIG_RESET_MCHP_SPARX5) += reset-microchip-sparx5.o obj-$(CONFIG_RESET_MESON) += reset-meson.o obj-$(CONFIG_RESET_MESON_AUDIO_ARB) += reset-meson-audio-arb.o obj-$(CONFIG_RESET_NPCM) += reset-npcm.o +obj-$(CONFIG_RESET_NUVOTON_MA35D1) += reset-ma35d1.o obj-$(CONFIG_RESET_OXNAS) += reset-oxnas.o obj-$(CONFIG_RESET_PISTACHIO) += reset-pistachio.o obj-$(CONFIG_RESET_POLARFIRE_SOC) += reset-mpfs.o
drivers/reset/reset-ma35d1.c new file +235 -0
235 lines not on this page · raw message
Signature · 1 line
2.34.1
PATCH v13 10/10 tty: serial: Add Nuvoton ma35d1 serial driver support
In reply to Jacky HuangFrom: Jacky Huang <[email protected]>
This adds UART and console driver for Nuvoton ma35d1 Soc. It supports full-duplex communication, FIFO control, and hardware flow control.
--- drivers/tty/serial/Kconfig | 18 + drivers/tty/serial/Makefile | 1 + drivers/tty/serial/ma35d1_serial.c | 808 +++++++++++++++++++++++++++++ include/uapi/linux/serial_core.h | 3 + 4 files changed, 830 insertions(+) create mode 100644 drivers/tty/serial/ma35d1_serial.c
drivers/tty/serial/Kconfig +18 -0
@@ -1555,6 +1555,24 @@ config SERIAL_SUNPLUS_CONSOLE you can alter that using a kernel command line option such as "console=ttySUPx". +config SERIAL_NUVOTON_MA35D1 + tristate "Nuvoton MA35D1 family UART support" + depends on ARCH_MA35 || COMPILE_TEST + select SERIAL_CORE + help + This driver supports Nuvoton MA35D1 family UART ports. If you would + like to use them, you must answer Y or M to this option. Note that + for use as console, it must be included in kernel and not as a + module + +config SERIAL_NUVOTON_MA35D1_CONSOLE + bool "Console on a Nuvotn MA35D1 family UART port" + depends on SERIAL_NUVOTON_MA35D1=y + select SERIAL_CORE_CONSOLE + help + Select this options if you'd like to use the UART port0 of the + Nuvoton MA35D1 family as a console. + endmenu config SERIAL_MCTRL_GPIO
drivers/tty/serial/Makefile +1 -0
@@ -93,3 +93,4 @@ obj-$(CONFIG_SERIAL_MCTRL_GPIO) += serial_mctrl_gpio.o obj-$(CONFIG_SERIAL_KGDB_NMI) += kgdb_nmi.o obj-$(CONFIG_KGDB_SERIAL_CONSOLE) += kgdboc.o +obj-$(CONFIG_SERIAL_NUVOTON_MA35D1) += ma35d1_serial.o
drivers/tty/serial/ma35d1_serial.c new file +808 -0
808 lines not on this page · raw message
include/uapi/linux/serial_core.h +3 -0
@@ -279,4 +279,7 @@/* Sunplus UART */ #define PORT_SUNPLUS 123 +/* Nuvoton MA35 SoC */ +#define PORT_MA35 124 +#endif /* _UAPILINUX_SERIAL_CORE_H */
Signature · 1 line
2.34.1
Re: [PATCH v13 10/10] tty: serial: Add Nuvoton ma35d1 serial driver support
Quoted 7 lines · Jacky Huang
From: Jacky Huang <[email protected]>
This adds UART and console driver for Nuvoton ma35d1 Soc. It supports full-duplex communication, FIFO control, and hardware flow control.
Signed-off-by Jacky Huang <[email protected]>
A few stylistic things below, should be easy to address them I think. In general, this is in quite good shape already.
Quoted 262 lines
--- drivers/tty/serial/Kconfig | 18 + drivers/tty/serial/Makefile | 1 + drivers/tty/serial/ma35d1_serial.c | 808 +++++++++++++++++++++++++++++ include/uapi/linux/serial_core.h | 3 + 4 files changed, 830 insertions(+) create mode 100644 drivers/tty/serial/ma35d1_serial.cdrivers/tty/serial/Kconfig +18
-0@@ -1555,6 +1555,24 @@ config SERIAL_SUNPLUS_CONSOLE you can alter that using a kernel command line option such as "console=ttySUPx". +config SERIAL_NUVOTON_MA35D1 + tristate "Nuvoton MA35D1 family UART support" + depends on ARCH_MA35 || COMPILE_TEST + select SERIAL_CORE + help + This driver supports Nuvoton MA35D1 family UART ports. If you would + like to use them, you must answer Y or M to this option. Note that + for use as console, it must be included in kernel and not as a + module + +config SERIAL_NUVOTON_MA35D1_CONSOLE + bool "Console on a Nuvotn MA35D1 family UART port" + depends on SERIAL_NUVOTON_MA35D1=y + select SERIAL_CORE_CONSOLE + help + Select this options if you'd like to use the UART port0 of the + Nuvoton MA35D1 family as a console. + endmenu config SERIAL_MCTRL_GPIOdrivers/tty/serial/Makefile +1
-0@@ -93,3 +93,4 @@ obj-$(CONFIG_SERIAL_MCTRL_GPIO) += serial_mctrl_gpio.o obj-$(CONFIG_SERIAL_KGDB_NMI) += kgdb_nmi.o obj-$(CONFIG_KGDB_SERIAL_CONSOLE) += kgdboc.o +obj-$(CONFIG_SERIAL_NUVOTON_MA35D1) += ma35d1_serial.odrivers/tty/serial/ma35d1_serial.c new file +210
-0@@ -0,0 +1,808 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* +* MA35D1 serial driver +* Copyright (C) 2023 Nuvoton Technology Corp. +*/ + +#include <linux/bitfield.h> +#include <linux/clk.h> +#include <linux/delay.h> +#include <linux/of.h> +#include <linux/of_platform.h> +#include <linux/serial_core.h> +#include <linux/slab.h> +#include <linux/tty_flip.h> +#include <linux/units.h> + +#define MA35_UART_NR 17 + +#define MA35_RBR_REG 0x00 +#define MA35_THR_REG 0x00 +#define MA35_IER_REG 0x04 +#define MA35_FCR_REG 0x08 +#define MA35_LCR_REG 0x0C +#define MA35_MCR_REG 0x10 +#define MA35_MSR_REG 0x14 +#define MA35_FSR_REG 0x18 +#define MA35_ISR_REG 0x1C +#define MA35_TOR_REG 0x20 +#define MA35_BAUD_REG 0x24 +#define MA35_ALTCTL_REG 0x2C +#define MA35_FUN_SEL_REG 0x30 +#define MA35_WKCTL_REG 0x40 +#define MA35_WKSTS_REG 0x44 + +/* MA35_IER_REG - Interrupt Enable Register */ +#define MA35_IER_RDA_IEN BIT(0)/* RBR Available Interrupt Enable */ +#define MA35_IER_THRE_IEN BIT(1)/* THR Empty Interrupt Enable */ +#define MA35_IER_RLS_IEN BIT(2)/* RX Line Status Interrupt Enable */ +#define MA35_IER_RTO_IEN BIT(4)/* RX Time-out Interrupt Enable */ +#define MA35_IER_BUFERR_IEN BIT(5)/* Buffer Error Interrupt Enable */ +#define MA35_IER_TIME_OUT_EN BIT(11)/* RX Buffer Time-out Counter Enable */ +#define MA35_IER_AUTO_RTS BIT(12)/* nRTS Auto-flow Control Enable */ +#define MA35_IER_AUTO_CTS BIT(13)/* nCTS Auto-flow Control Enable */ + +/* MA35_FCR_REG - FIFO Control Register */ +#define MA35_FCR_RFR BIT(1)/* RX Field Software Reset */ +#define MA35_FCR_TFR BIT(2)/* TX Field Software Reset */ +#define MA35_FCR_RFITL_MASK GENMASK(7, 4)/* RX FIFO Interrupt Trigger Level */ +#define MA35_FCR_RFITL_1BYTE FIELD_PREP(MA35_FCR_RFITL_MASK, 0) +#define MA35_FCR_RFITL_4BYTES FIELD_PREP(MA35_FCR_RFITL_MASK, 1) +#define MA35_FCR_RFITL_8BYTES FIELD_PREP(MA35_FCR_RFITL_MASK, 2) +#define MA35_FCR_RFITL_14BYTES FIELD_PREP(MA35_FCR_RFITL_MASK, 3) +#define MA35_FCR_RFITL_30BYTES FIELD_PREP(MA35_FCR_RFITL_MASK, 4) +#define MA35_FCR_RTSTL_MASK GENMASK(19, 16)/* nRTS Trigger Level */ +#define MA35_FCR_RTSTL_1BYTE FIELD_PREP(MA35_FCR_RTSTL_MASK, 0) +#define MA35_FCR_RTSTL_4BYTES FIELD_PREP(MA35_FCR_RTSTL_MASK, 1) +#define MA35_FCR_RTSTL_8BYTES FIELD_PREP(MA35_FCR_RTSTL_MASK, 2) +#define MA35_FCR_RTSTL_14BYTES FIELD_PREP(MA35_FCR_RTSTL_MASK, 3) +#define MA35_FCR_RTSTLL_30BYTES FIELD_PREP(MA35_FCR_RTSTL_MASK, 4) + +/* MA35_LCR_REG - Line Control Register */ +#define MA35_LCR_NSB BIT(2)/* Number of “STOP Bit” */ +#define MA35_LCR_PBE BIT(3)/* Parity Bit Enable */ +#define MA35_LCR_EPE BIT(4)/* Even Parity Enable */ +#define MA35_LCR_SPE BIT(5)/* Stick Parity Enable */ +#define MA35_LCR_BREAK BIT(6)/* Break Control */ +#define MA35_LCR_WLS_MASK GENMASK(1, 0)/* Word Length Selection */ +#define MA35_LCR_WLS_5BITS FIELD_PREP(MA35_LCR_WLS_MASK, 0) +#define MA35_LCR_WLS_6BITS FIELD_PREP(MA35_LCR_WLS_MASK, 1) +#define MA35_LCR_WLS_7BITS FIELD_PREP(MA35_LCR_WLS_MASK, 2) +#define MA35_LCR_WLS_8BITS FIELD_PREP(MA35_LCR_WLS_MASK, 3) + +/* MA35_MCR_REG - Modem Control Register */ +#define MA35_MCR_RTS_CTRL BIT(1)/* nRTS Signal Control */ +#define MA35_MCR_RTSACTLV BIT(9)/* nRTS Pin Active Level */ +#define MA35_MCR_RTSSTS BIT(13)/* nRTS Pin Status (Read Only) */ + +/* MA35_MSR_REG - Modem Status Register */ +#define MA35_MSR_CTSDETF BIT(0)/* Detect nCTS State Change Flag */ +#define MA35_MSR_CTSSTS BIT(4)/* nCTS Pin Status (Read Only) */ +#define MA35_MSR_CTSACTLV BIT(8)/* nCTS Pin Active Level */ + +/* MA35_FSR_REG - FIFO Status Register */ +#define MA35_FSR_RX_OVER_IF BIT(0)/* RX Overflow Error Interrupt Flag */ +#define MA35_FSR_PEF BIT(4)/* Parity Error Flag*/ +#define MA35_FSR_FEF BIT(5)/* Framing Error Flag */ +#define MA35_FSR_BIF BIT(6)/* Break Interrupt Flag */ +#define MA35_FSR_RX_EMPTY BIT(14)/* Receiver FIFO Empty (Read Only) */ +#define MA35_FSR_RX_FULL BIT(15)/* Receiver FIFO Full (Read Only) */ +#define MA35_FSR_TX_EMPTY BIT(22)/* Transmitter FIFO Empty (Read Only) */ +#define MA35_FSR_TX_FULL BIT(23)/* Transmitter FIFO Full (Read Only) */ +#define MA35_FSR_TX_OVER_IF BIT(24)/* TX Overflow Error Interrupt Flag */ +#define MA35_FSR_TE_FLAG BIT(28)/* Transmitter Empty Flag (Read Only) */ +#define MA35_FSR_RXPTR_MSK GENMASK(13, 8)/* TX FIFO Pointer mask */ +#define MA35_FSR_TXPTR_MSK GENMASK(21, 16)/* RX FIFO Pointer mask */ + +/* MA35_ISR_REG - Interrupt Status Register */ +#define MA35_ISR_RDA_IF BIT(0)/* RBR Available Interrupt Flag */ +#define MA35_ISR_THRE_IF BIT(1)/* THR Empty Interrupt Flag */ +#define MA35_ISR_RLSIF BIT(2)/* Receive Line Interrupt Flag */ +#define MA35_ISR_MODEMIF BIT(3)/* MODEM Interrupt Flag */ +#define MA35_ISR_RXTO_IF BIT(4)/* RX Time-out Interrupt Flag */ +#define MA35_ISR_BUFEIF BIT(5)/* Buffer Error Interrupt Flag */ +#define MA35_ISR_WK_IF BIT(6)/* UART Wake-up Interrupt Flag */ +#define MA35_ISR_RDAINT BIT(8)/* RBR Available Interrupt Indicator */ +#define MA35_ISR_THRE_INT BIT(9)/* THR Empty Interrupt Indicator */ +#define MA35_ISR_ALL 0xFFFFFFFF + +/* MA35_BAUD_REG - Baud Rate Divider Register */ +#define MA35_BAUD_MODE_MASK GENMASK(29, 28) +#define MA35_BAUD_MODE0 FIELD_PREP(MA35_BAUD_MODE_MASK, 0) +#define MA35_BAUD_MODE1 FIELD_PREP(MA35_BAUD_MODE_MASK, 2) +#define MA35_BAUD_MODE2 FIELD_PREP(MA35_BAUD_MODE_MASK, 3) +#define MA35_BAUD_MASK GENMASK(15, 0) + +/* MA35_ALTCTL_REG - Alternate Control/Status Register */ +#define MA35_ALTCTL_RS485AUD BIT(10)/* RS-485 Auto Direction Function */ + +/* MA35_FUN_SEL_REG - Function Select Register */ +#define MA35_FUN_SEL_MASK GENMASK(2, 0) +#define MA35_FUN_SEL_UART FIELD_PREP(MA35_FUN_SEL_MASK, 0) +#define MA35_FUN_SEL_RS485 FIELD_PREP(MA35_FUN_SEL_MASK, 3) + +/* The constrain for MA35D1 UART baud rate divider */ +#define MA35_BAUD_DIV_MAX 0xFFFF +#define MA35_BAUD_DIV_MIN 11 + +/* UART FIFO depth */ +#define MA35_UART_FIFO_DEPTH 32 +/* UART console clock */ +#define MA35_UART_CONSOLE_CLK (24 * HZ_PER_MHZ) +/* UART register ioremap size */ +#define MA35_UART_REG_SIZE 0x100 +/* Rx Timeout */ +#define MA35_UART_RX_TOUT 0x40 + +#define MA35_ISR_IF_CHECK (MA35_ISR_RDA_IF | MA35_ISR_RXTO_IF | \ + MA35_ISR_THRE_INT | MA35_ISR_BUFEIF) + +static struct uart_driver ma35d1serial_reg; + +struct uart_ma35d1_port { +struct uart_port port; +struct clk *clk; +u16 capabilities;/* port capabilities */ +u8 ier; +u8 lcr; +u8 mcr; +u32 baud_rate; +u32 console_baud_rate; +u32 console_line; +u32 console_int; +}; + +static struct uart_ma35d1_port ma35d1serial_ports[MA35_UART_NR ]; + +static struct uart_ma35d1_port *to_ma35d1_uart_port (struct uart_port *uart) +{ + return container_of(uart, struct uart_ma35d1_port, port); +} + +static u32 serial_in (struct uart_ma35d1_port *p,u32 offset) +{ +return readl_relaxed (p->port.membase + offset); +} + +static void serial_out (struct uart_ma35d1_port *p,u32 offset,u32 value) +{ +writel_relaxed (value, p->port.membase + offset); +} + +static void __stop_tx (struct uart_ma35d1_port *p) +{ +u32 ier; + + ier =serial_in (p,MA35_IER_REG ); +if (ier &MA35_IER_THRE_IEN ) +serial_out (p,MA35_IER_REG , ier & ~MA35_IER_THRE_IEN ); +} + +static void ma35d1serial_stop_tx (struct uart_port *port) +{ +struct uart_ma35d1_port *up =to_ma35d1_uart_port (port); + +__stop_tx (up); +} + +static void transmit_chars (struct uart_ma35d1_port *up) +{ +u32 count; +u8 ch; + +if (uart_tx_stopped (&up->port)) { +ma35d1serial_stop_tx (&up->port); +return ; + } + count =MA35_UART_FIFO_DEPTH -FIELD_GET (MA35_FSR_TXPTR_MSK , +serial_in (up,MA35_FSR_REG )); +uart_port_tx_limited (&up->port, ch, count, + !(serial_in (up,MA35_FSR_REG ) &MA35_FSR_TX_FULL ), +serial_out (up,MA35_THR_REG , ch), + ({})); +} + +static void ma35d1serial_start_tx (struct uart_port *port) +{ +struct uart_ma35d1_port *up =to_ma35d1_uart_port (port); +u32 ier; + + ier =serial_in (up,MA35_IER_REG );
drivers/tty/serial/ma35d1_serial.c line 220
Quoted 10 lines
drivers/tty/serial/ma35d1_serial.c new file +10
-0+serial_out (up,MA35_IER_REG , ier & ~MA35_IER_THRE_IEN ); +transmit_chars (up); +serial_out (up,MA35_IER_REG , ier |MA35_IER_THRE_IEN ); +} + +static void ma35d1serial_stop_rx (struct uart_port *port) +{ +struct uart_ma35d1_port *up =to_ma35d1_uart_port (port); + +serial_out (up,MA35_IER_REG ,serial_in (up,MA35_IER_REG ) & ~MA35_IER_RDA_IEN );
These should be split up to:
reg = serial_in(...) reg &= ~MA35_IER_RDA_IEN; serial_out(...)
There are other cases too besides this one, convert them all. It will help with some line splitting challenges too you seem to have below.
Quoted 74 lines
drivers/tty/serial/ma35d1_serial.c new file +74
-0+} + +static void receive_chars (struct uart_ma35d1_port *up) +{ +u8 ch, flag; +u32 fsr; +int max_count =256 ; + + fsr =serial_in (up,MA35_FSR_REG ); +do { + flag =TTY_NORMAL ; + up->port.icount.rx++; + +if (unlikely (fsr & (MA35_FSR_BIF |MA35_FSR_FEF | +MA35_FSR_PEF |MA35_FSR_RX_OVER_IF ))) { +if (fsr &MA35_FSR_BIF ) { + up->port.icount.brk++; +if (uart_handle_break (&up->port)) +continue ; + } +if (fsr &MA35_FSR_FEF ) + up->port.icount.frame++; +if (fsr &MA35_FSR_PEF ) + up->port.icount.parity++; +if (fsr &MA35_FSR_RX_OVER_IF ) + up->port.icount.overrun++; + +serial_out (up,MA35_FSR_REG , + fsr & (MA35_FSR_BIF |MA35_FSR_FEF | +MA35_FSR_PEF |MA35_FSR_RX_OVER_IF )); +if (fsr &MA35_FSR_BIF ) + flag =TTY_BREAK ; +else if (fsr &MA35_FSR_PEF ) + flag =TTY_PARITY ; +else if (fsr &MA35_FSR_FEF ) + flag =TTY_FRAME ; + } + + ch =serial_in (up,MA35_RBR_REG ); +if (uart_handle_sysrq_char (&up->port, ch)) +continue ; + +spin_lock (&up->port.lock); +uart_insert_char (&up->port, fsr,MA35_FSR_RX_OVER_IF , ch, flag); +spin_unlock (&up->port.lock); + + fsr =serial_in (up,MA35_FSR_REG ); + }while (!(fsr &MA35_FSR_RX_EMPTY ) && (max_count-- >0 )); + +spin_lock (&up->port.lock); +tty_flip_buffer_push (&up->port.state->port); +spin_unlock (&up->port.lock); +} + +static irqreturn_t ma35d1serial_interrupt (int irq,void *dev_id) +{ +struct uart_port *port = dev_id; +struct uart_ma35d1_port *up =to_ma35d1_uart_port (port); +u32 isr, fsr; + + isr =serial_in (up,MA35_ISR_REG ); + fsr =serial_in (up,MA35_FSR_REG ); + +if (!(isr &MA35_ISR_IF_CHECK )) +return IRQ_NONE ; + +if (isr & (MA35_ISR_RDA_IF |MA35_ISR_RXTO_IF )) +receive_chars (up); +if (isr &MA35_ISR_THRE_INT ) +transmit_chars (up); +if (fsr &MA35_FSR_TX_OVER_IF ) +serial_out (up,MA35_FSR_REG ,MA35_FSR_TX_OVER_IF ); + +return IRQ_HANDLED ;
drivers/tty/serial/ma35d1_serial.c line 304
Quoted 10 lines
drivers/tty/serial/ma35d1_serial.c new file +10
-0+} + +static u32 ma35d1serial_tx_empty (struct uart_port *port) +{ +struct uart_ma35d1_port *up =to_ma35d1_uart_port (port); +u32 fsr; + + fsr =serial_in (up,MA35_FSR_REG ); +return (fsr & (MA35_FSR_TE_FLAG |MA35_FSR_TX_EMPTY )) == + (MA35_FSR_TE_FLAG |MA35_FSR_TX_EMPTY ) ?TIOCSER_TEMT :0 ;
To make this check cleaner, add this and use it here:
#define MA35_FSR_TX_BOTH_EMPTY (MA35_FSR_TE_FLAG | MA35_FSR_TX_EMPTY)
Quoted 74 lines
drivers/tty/serial/ma35d1_serial.c new file +74
-0+} + +static u32 ma35d1serial_get_mctrl (struct uart_port *port) +{ +struct uart_ma35d1_port *up =to_ma35d1_uart_port (port); +u32 status; +u32 ret =0 ; + + status =serial_in (up,MA35_MSR_REG ); +if (!(status &MA35_MSR_CTSSTS )) + ret |=TIOCM_CTS ; +return ret; +} + +static void ma35d1serial_set_mctrl (struct uart_port *port,u32 mctrl) +{ +struct uart_ma35d1_port *up =to_ma35d1_uart_port (port); +u32 mcr; +u32 ier; + + mcr =serial_in (up,MA35_MCR_REG ); + mcr &= ~MA35_MCR_RTS_CTRL ; + +if (mctrl &TIOCM_RTS ) + mcr |=MA35_MCR_RTSACTLV ; +else + mcr &= ~MA35_MCR_RTSACTLV ; + +if (up->mcr &UART_MCR_AFE ) { +serial_out (up,MA35_IER_REG , (serial_in (up,MA35_IER_REG ) | +MA35_IER_AUTO_RTS | +MA35_IER_AUTO_CTS )); + up->port.flags |=UPF_HARD_FLOW ; + }else { + ier =serial_in (up,MA35_IER_REG ); + ier &= ~(MA35_IER_AUTO_RTS |MA35_IER_AUTO_CTS ); +serial_out (up,MA35_IER_REG , ier); + up->port.flags &= ~UPF_HARD_FLOW ; + } +serial_out (up,MA35_MSR_REG , (serial_in (up,MA35_MSR_REG ) | +MA35_MSR_CTSACTLV )); +serial_out (up,MA35_MCR_REG , mcr); +} + +static void ma35d1serial_break_ctl (struct uart_port *port,int break_state) +{ +struct uart_ma35d1_port *up =to_ma35d1_uart_port (port); +unsigned long flags; +u32 lcr; + +spin_lock_irqsave (&up->port.lock, flags); + lcr =serial_in (up,MA35_LCR_REG ); +if (break_state !=0 ) + lcr |=MA35_LCR_BREAK ; +else + lcr &= ~MA35_LCR_BREAK ; +serial_out (up,MA35_LCR_REG , lcr); +spin_unlock_irqrestore (&up->port.lock, flags); +} + +static int ma35d1serial_startup (struct uart_port *port) +{ +struct uart_ma35d1_port *up =to_ma35d1_uart_port (port); +int retval; + +/* Reset FIFO */ +serial_out (up,MA35_FCR_REG ,MA35_FCR_TFR |MA35_FCR_RFR ); + +/* Clear pending interrupts */ +serial_out (up,MA35_ISR_REG ,MA35_ISR_ALL ); + + retval =request_irq (port->irq, ma35d1serial_interrupt,0 , +dev_name (port->dev), port); +if (retval) {
drivers/tty/serial/ma35d1_serial.c line 388
Quoted 10 lines
drivers/tty/serial/ma35d1_serial.c new file +10
-0+dev_err (up->port.dev,"request irq failed.\n" ); +return retval; + } + +serial_out (up,MA35_FCR_REG ,serial_in (up,MA35_FCR_REG ) | +MA35_FCR_RFITL_4BYTES |MA35_FCR_RTSTL_8BYTES ); +serial_out (up,MA35_LCR_REG ,MA35_LCR_WLS_8BITS ); +serial_out (up,MA35_TOR_REG ,MA35_UART_RX_TOUT ); +serial_out (up,MA35_IER_REG ,MA35_IER_RTO_IEN |MA35_IER_RDA_IEN | +MA35_IER_TIME_OUT_EN |MA35_IER_BUFERR_IEN );
Align to the parameter like this:
serial_out(up, MA35_IER_REG, MA35_IER_RTO_IEN | MA35_IER_RDA_IEN | MA35_IER_TIME_OUT_EN | MA35_IER_BUFERR_IEN);
Quoted 125 lines
drivers/tty/serial/ma35d1_serial.c new file +125
-0+return 0 ; +} + +static void ma35d1serial_shutdown (struct uart_port *port) +{ +struct uart_ma35d1_port *up =to_ma35d1_uart_port (port); + +serial_out (up,MA35_IER_REG ,0 ); +free_irq (port->irq, port); +} + +static void ma35d1serial_set_termios (struct uart_port *port, +struct ktermios *termios, +const struct ktermios *old) +{ +struct uart_ma35d1_port *up =to_ma35d1_uart_port (port); +u32 lcr =0 ; +unsigned long flags; +u32 baud, quot; + + lcr =UART_LCR_WLEN (tty_get_char_size (termios->c_cflag)); + +if (termios->c_cflag &CSTOPB ) + lcr |=MA35_LCR_NSB ; +if (termios->c_cflag &PARENB ) + lcr |=MA35_LCR_PBE ; +if (!(termios->c_cflag &PARODD )) + lcr |=MA35_LCR_EPE ; +if (termios->c_cflag &CMSPAR ) + lcr |=MA35_LCR_SPE ; + + baud =uart_get_baud_rate (port, termios, old, + port->uartclk /MA35_BAUD_DIV_MAX , + port->uartclk /MA35_BAUD_DIV_MIN ); + +/* MA35D1 UART baud rate equation: baudrate = UART_CLK / (quot + 2) */ + quot = (port->uartclk / baud) -2 ; + +/* +* Ok, we're now changing the port state. Do it with +* interrupts disabled. +*/ +spin_lock_irqsave (&up->port.lock, flags); + + up->port.read_status_mask =MA35_FSR_RX_OVER_IF ; +if (termios->c_iflag &INPCK ) + up->port.read_status_mask |=MA35_FSR_FEF |MA35_FSR_PEF ; +if (termios->c_iflag & (BRKINT |PARMRK )) + up->port.read_status_mask |=MA35_FSR_BIF ; + +/* Characteres to ignore */ + up->port.ignore_status_mask =0 ; +if (termios->c_iflag &IGNPAR ) + up->port.ignore_status_mask |=MA35_FSR_FEF |MA35_FSR_PEF ; +if (termios->c_iflag &IGNBRK ) { + up->port.ignore_status_mask |=MA35_FSR_BIF ; +/* +* If we're ignoring parity and break indicators, +* ignore overruns too (for real raw support). +*/ +if (termios->c_iflag &IGNPAR ) + up->port.ignore_status_mask |=MA35_FSR_RX_OVER_IF ; + } +if (termios->c_cflag &CRTSCTS ) + up->mcr |=UART_MCR_AFE ; +else + up->mcr &= ~UART_MCR_AFE ; + +uart_update_timeout (port, termios->c_cflag, baud); + +ma35d1serial_set_mctrl (&up->port, up->port.mctrl); + +serial_out (up,MA35_BAUD_REG ,MA35_BAUD_MODE2 |FIELD_PREP (MA35_BAUD_MASK , quot)); + +serial_out (up,MA35_LCR_REG , lcr); + +spin_unlock_irqrestore (&up->port.lock, flags); +} + +static const char *ma35d1serial_type (struct uart_port *port) +{ +return port->type ==PORT_MA35 ?"ma35d1-uart" :NULL ; +} + +static void ma35d1serial_config_port (struct uart_port *port,int flags) +{ +if (flags &UART_CONFIG_TYPE ) + port->type =PORT_MA35 ; +} + +static int ma35d1serial_verify_port (struct uart_port *port,struct serial_struct *ser) +{ +if (port->type !=PORT_UNKNOWN && ser->type !=PORT_MA35 ) +return -EINVAL ; + +return 0 ; +} + +static const struct uart_ops ma35d1serial_ops = { + .tx_empty = ma35d1serial_tx_empty, + .set_mctrl = ma35d1serial_set_mctrl, + .get_mctrl = ma35d1serial_get_mctrl, + .stop_tx = ma35d1serial_stop_tx, + .start_tx = ma35d1serial_start_tx, + .stop_rx = ma35d1serial_stop_rx, + .break_ctl = ma35d1serial_break_ctl, + .startup = ma35d1serial_startup, + .shutdown = ma35d1serial_shutdown, + .set_termios = ma35d1serial_set_termios, + .type = ma35d1serial_type, + .config_port = ma35d1serial_config_port, + .verify_port = ma35d1serial_verify_port, +}; + +static const struct of_device_id ma35d1_serial_of_match[] = { + { .compatible ="nuvoton,ma35d1-uart" }, + {}, +}; +MODULE_DEVICE_TABLE (of, ma35d1_serial_of_match); + +#ifdef CONFIG_SERIAL_NUVOTON_MA35D1_CONSOLE + +static struct device_node *ma35d1serial_uart_nodes[MA35_UART_NR ]; + +static void wait_for_xmitr (struct uart_ma35d1_port *up)
drivers/tty/serial/ma35d1_serial.c line 523
Quoted 10 lines
drivers/tty/serial/ma35d1_serial.c new file +10
-0+{ +unsigned int tmout; + +/* Wait up to 10ms for the character(s) to be sent. */ + tmout =10000 ; +while (--tmout) { +if (serial_in (up,MA35_FSR_REG ) &MA35_FSR_TX_EMPTY ) +break ; +udelay (1 ); + }
This can be written as:
unsigned int reg; read_poll_timeout_atomic(serial_in, reg, reg & MA35_FSR_TX_EMPTY, 1, 10000, false, up, MA35_FSR_REG);
Signature · 1 line
i.
Quoted 298 lines
drivers/tty/serial/ma35d1_serial.c new file +285
-0+} + +static void ma35d1serial_console_putchar (struct uart_port *port,unsigned char ch) +{ +struct uart_ma35d1_port *up =to_ma35d1_uart_port (port); + +wait_for_xmitr (up); +serial_out (up,MA35_THR_REG , ch); +} + +/* +* Print a string to the serial port trying not to disturb +* any possible real use of the port... +* +* The console_lock must be held when we get here. +*/ +static void ma35d1serial_console_write (struct console *co,const char *s,u32 count) +{ +struct uart_ma35d1_port *up = &ma35d1serial_ports[co->index]; +unsigned long flags; +int locked =1 ; +u32 ier; + +if (up->port.sysrq) + locked =0 ; +else if (oops_in_progress) + locked =spin_trylock_irqsave (&up->port.lock, flags); +else +spin_lock_irqsave (&up->port.lock, flags); + +/* +* First save the IER then disable the interrupts +*/ + ier =serial_in (up,MA35_IER_REG ); +serial_out (up,MA35_IER_REG ,0 ); + +uart_console_write (&up->port, s, count, ma35d1serial_console_putchar); + +wait_for_xmitr (up); +serial_out (up,MA35_IER_REG , ier); + +if (locked) +spin_unlock_irqrestore (&up->port.lock, flags); +} + +static int __init ma35d1serial_console_setup (struct console *co,char *options) +{ +struct device_node *np; +struct uart_ma35d1_port *p; +u32 val32[4 ]; +struct uart_port *port; +int baud =115200 ; +int bits =8 ; +int parity ='n' ; +int flow ='n' ; + +if ((co->index <0 ) || (co->index >=MA35_UART_NR )) { +pr_debug ("Console Port%x out of range\n" , co->index); +return -EINVAL ; + } + + np = ma35d1serial_uart_nodes[co->index]; + p = &ma35d1serial_ports[co->index]; +if (!np || !p) +return -ENODEV ; + +if (of_property_read_u32_array (np,"reg" , val32,ARRAY_SIZE (val32)) !=0 ) +return -EINVAL ; + + p->port.iobase = val32[1 ]; + p->port.membase =ioremap (p->port.iobase,MA35_UART_REG_SIZE ); +if (!p->port.membase) +return -ENOMEM ; + + p->port.ops = &ma35d1serial_ops; + p->port.line =0 ; + p->port.uartclk =MA35_UART_CONSOLE_CLK ; + + port = &ma35d1serial_ports[co->index].port; + +if (options) +uart_parse_options (options, &baud, &parity, &bits, &flow); + +return uart_set_options (port, co, baud, parity, bits, flow); +} + +static struct console ma35d1serial_console = { + .name ="ttyNVT" , + .write = ma35d1serial_console_write, + .device = uart_console_device, + .setup = ma35d1serial_console_setup, + .flags =CON_PRINTBUFFER |CON_ENABLED , + .index =-1 , + .data = &ma35d1serial_reg, +}; + +static void ma35d1serial_console_init_port (void ) +{ +u32 i =0 ; +struct device_node *np; + +for_each_matching_node (np, ma35d1_serial_of_match) { +if (ma35d1serial_uart_nodes[i] ==NULL ) { +of_node_get (np); + ma35d1serial_uart_nodes[i] = np; + i++; +if (i ==MA35_UART_NR ) +break ; + } + } +} + +static int __init ma35d1serial_console_init (void ) +{ +ma35d1serial_console_init_port (); +register_console (&ma35d1serial_console); +return 0 ; +} +console_initcall (ma35d1serial_console_init); + +#define MA35D1SERIAL_CONSOLE (&ma35d1serial_console) +#else +#define MA35D1SERIAL_CONSOLE NULL +#endif + +static struct uart_driver ma35d1serial_reg = { + .owner =THIS_MODULE , + .driver_name ="serial" , + .dev_name ="ttyNVT" , + .major =TTY_MAJOR , + .minor =64 , + .cons =MA35D1SERIAL_CONSOLE , + .nr =MA35_UART_NR , +}; + +/* +* Register a set of serial devices attached to a platform device. +* The list is terminated with a zero flags entry, which means we expect +* all entries to have at least UPF_BOOT_AUTOCONF set. +*/ +static int ma35d1serial_probe (struct platform_device *pdev) +{ +struct resource *res_mem; +struct uart_ma35d1_port *up; +int ret =0 ; + +if (pdev->dev.of_node) { + ret =of_alias_get_id (pdev->dev.of_node,"serial" ); +if (ret <0 ) { +dev_err (&pdev->dev,"failed to get alias/pdev id, errno %d\n" , ret); +return ret; + } + } + up = &ma35d1serial_ports[ret]; + up->port.line = ret; + res_mem =platform_get_resource (pdev,IORESOURCE_MEM ,0 ); +if (!res_mem) +return -ENODEV ; + + up->port.iobase = res_mem->start; + up->port.membase =ioremap (up->port.iobase,MA35_UART_REG_SIZE ); + up->port.ops = &ma35d1serial_ops; + +spin_lock_init (&up->port.lock); + + up->clk =of_clk_get (pdev->dev.of_node,0 ); +if (IS_ERR (up->clk)) { + ret =PTR_ERR (up->clk); +dev_err (&pdev->dev,"failed to get core clk: %d\n" , ret); + goto err_iounmap; + } + + ret =clk_prepare_enable (up->clk); +if (ret) + goto err_iounmap; + +if (up->port.line !=0 ) + up->port.uartclk =clk_get_rate (up->clk); + + ret =platform_get_irq (pdev,0 ); +if (ret <0 ) + goto err_clk_disable; + + up->port.irq = ret; + up->port.dev = &pdev->dev; + up->port.flags =UPF_BOOT_AUTOCONF ; + +platform_set_drvdata (pdev, up); + + ret =uart_add_one_port (&ma35d1serial_reg, &up->port); +if (ret <0 ) + goto err_free_irq; + +return 0 ; + +err_free_irq: +free_irq (up->port.irq, &up->port); + +err_clk_disable: +clk_disable_unprepare (up->clk); + +err_iounmap: +iounmap (up->port.membase); +return ret; +} + +/* +* Remove serial ports registered against a platform device. +*/ +static int ma35d1serial_remove (struct platform_device *dev) +{ +struct uart_port *port =platform_get_drvdata (dev); +struct uart_ma35d1_port *up =to_ma35d1_uart_port (port); + +uart_remove_one_port (&ma35d1serial_reg, port); +clk_disable_unprepare (up->clk); +return 0 ; +} + +static int ma35d1serial_suspend (struct platform_device *dev,pm_message_t state) +{ +struct uart_port *port =platform_get_drvdata (dev); +struct uart_ma35d1_port *up =to_ma35d1_uart_port (port); + +uart_suspend_port (&ma35d1serial_reg, &up->port); +if (up->port.line ==0 ) { + up->console_baud_rate =serial_in (up,MA35_BAUD_REG ); + up->console_line =serial_in (up,MA35_LCR_REG ); + up->console_int =serial_in (up,MA35_IER_REG ); + } +return 0 ; +} + +static int ma35d1serial_resume (struct platform_device *dev) +{ +struct uart_port *port =platform_get_drvdata (dev); +struct uart_ma35d1_port *up =to_ma35d1_uart_port (port); + +if (up->port.line ==0 ) { +serial_out (up,MA35_BAUD_REG , up->console_baud_rate); +serial_out (up,MA35_LCR_REG , up->console_line); +serial_out (up,MA35_IER_REG , up->console_int); + } +uart_resume_port (&ma35d1serial_reg, &up->port); +return 0 ; +} + +static struct platform_driver ma35d1serial_driver = { + .probe = ma35d1serial_probe, + .remove = ma35d1serial_remove, + .suspend = ma35d1serial_suspend, + .resume = ma35d1serial_resume, + .driver = { + .name ="ma35d1-uart" , + .owner =THIS_MODULE , + .of_match_table =of_match_ptr (ma35d1_serial_of_match), + }, +}; + +static int __init ma35d1serial_init (void ) +{ +int ret; + + ret =uart_register_driver (&ma35d1serial_reg); +if (ret) +return ret; + + ret =platform_driver_register (&ma35d1serial_driver); +if (ret) +uart_unregister_driver (&ma35d1serial_reg); + +return ret; +} + +static void __exit ma35d1serial_exit(void) +{ +platform_driver_unregister (&ma35d1serial_driver); +uart_unregister_driver (&ma35d1serial_reg); +} + +module_init (ma35d1serial_init); +module_exit (ma35d1serial_exit); + +MODULE_LICENSE ("GPL" ); +MODULE_DESCRIPTION ("MA35D1 serial driver" );include/uapi/linux/serial_core.h +3
-0@@ -279,4 +279,7 @@/* Sunplus UART */ #define PORT_SUNPLUS 123 +/* Nuvoton MA35 SoC */ +#define PORT_MA35 124 +#endif /* _UAPILINUX_SERIAL_CORE_H */
Re: [PATCH v13 10/10] tty: serial: Add Nuvoton ma35d1 serial driver support
Quoted 606 lines · Ilpo Järvinen
Quoted 7 lines · Jacky Huang
From: Jacky Huang <[email protected]>
This adds UART and console driver for Nuvoton ma35d1 Soc. It supports full-duplex communication, FIFO control, and hardware flow control.
Signed-off-by Jacky Huang <[email protected]>A few stylistic things below, should be easy to address them I think. In general, this is in quite good shape already.
Quoted 262 lines
--- drivers/tty/serial/Kconfig | 18 + drivers/tty/serial/Makefile | 1 + drivers/tty/serial/ma35d1_serial.c | 808 +++++++++++++++++++++++++++++ include/uapi/linux/serial_core.h | 3 + 4 files changed, 830 insertions(+)create mode 100644
drivers/tty/serial/ma35d1_serial.cdrivers/tty/serial/Kconfig +18
-0@@ -1555,6 +1555,24 @@ config SERIAL_SUNPLUS_CONSOLE you can alter that using a kernel command line option such as "console=ttySUPx". +config SERIAL_NUVOTON_MA35D1 + tristate "Nuvoton MA35D1 family UART support" + depends on ARCH_MA35 || COMPILE_TEST + select SERIAL_CORE + help + This driver supports Nuvoton MA35D1 family UART ports. If you would + like to use them, you must answer Y or M to this option. Note that + for use as console, it must be included in kernel and not as a + module + +config SERIAL_NUVOTON_MA35D1_CONSOLE + bool "Console on a Nuvotn MA35D1 family UART port" + depends on SERIAL_NUVOTON_MA35D1=y + select SERIAL_CORE_CONSOLE + help + Select this options if you'd like to use the UART port0 of the + Nuvoton MA35D1 family as a console. + endmenu config SERIAL_MCTRL_GPIOdrivers/tty/serial/Makefile +1
-0@@ -93,3 +93,4 @@ obj-$(CONFIG_SERIAL_MCTRL_GPIO) += serial_mctrl_gpio.o obj-$(CONFIG_SERIAL_KGDB_NMI) += kgdb_nmi.o obj-$(CONFIG_KGDB_SERIAL_CONSOLE) += kgdboc.o +obj-$(CONFIG_SERIAL_NUVOTON_MA35D1) += ma35d1_serial.odrivers/tty/serial/ma35d1_serial.c new file +210
-0@@ -0,0 +1,808 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* +* MA35D1 serial driver +* Copyright (C) 2023 Nuvoton Technology Corp. +*/ + +#include <linux/bitfield.h> +#include <linux/clk.h> +#include <linux/delay.h> +#include <linux/of.h> +#include <linux/of_platform.h> +#include <linux/serial_core.h> +#include <linux/slab.h> +#include <linux/tty_flip.h> +#include <linux/units.h> + +#define MA35_UART_NR 17 + +#define MA35_RBR_REG 0x00 +#define MA35_THR_REG 0x00 +#define MA35_IER_REG 0x04 +#define MA35_FCR_REG 0x08 +#define MA35_LCR_REG 0x0C +#define MA35_MCR_REG 0x10 +#define MA35_MSR_REG 0x14 +#define MA35_FSR_REG 0x18 +#define MA35_ISR_REG 0x1C +#define MA35_TOR_REG 0x20 +#define MA35_BAUD_REG 0x24 +#define MA35_ALTCTL_REG 0x2C +#define MA35_FUN_SEL_REG 0x30 +#define MA35_WKCTL_REG 0x40 +#define MA35_WKSTS_REG 0x44 + +/* MA35_IER_REG - Interrupt Enable Register */ +#define MA35_IER_RDA_IEN BIT(0)/* RBR Available Interrupt Enable */ +#define MA35_IER_THRE_IEN BIT(1)/* THR Empty Interrupt Enable */ +#define MA35_IER_RLS_IEN BIT(2)/* RX Line Status Interrupt Enable */ +#define MA35_IER_RTO_IEN BIT(4)/* RX Time-out Interrupt Enable */ +#define MA35_IER_BUFERR_IEN BIT(5)/* Buffer Error Interrupt Enable */ +#define MA35_IER_TIME_OUT_EN BIT(11)/* RX Buffer Time-out Counter Enable */ +#define MA35_IER_AUTO_RTS BIT(12)/* nRTS Auto-flow Control Enable */ +#define MA35_IER_AUTO_CTS BIT(13)/* nCTS Auto-flow Control Enable */ + +/* MA35_FCR_REG - FIFO Control Register */ +#define MA35_FCR_RFR BIT(1)/* RX Field Software Reset */ +#define MA35_FCR_TFR BIT(2)/* TX Field Software Reset */ +#define MA35_FCR_RFITL_MASK GENMASK(7, 4)/* RX FIFO Interrupt Trigger Level */ +#define MA35_FCR_RFITL_1BYTE FIELD_PREP(MA35_FCR_RFITL_MASK, 0) +#define MA35_FCR_RFITL_4BYTES FIELD_PREP(MA35_FCR_RFITL_MASK, 1) +#define MA35_FCR_RFITL_8BYTES FIELD_PREP(MA35_FCR_RFITL_MASK, 2) +#define MA35_FCR_RFITL_14BYTES FIELD_PREP(MA35_FCR_RFITL_MASK, 3) +#define MA35_FCR_RFITL_30BYTES FIELD_PREP(MA35_FCR_RFITL_MASK, 4) +#define MA35_FCR_RTSTL_MASK GENMASK(19, 16)/* nRTS Trigger Level */ +#define MA35_FCR_RTSTL_1BYTE FIELD_PREP(MA35_FCR_RTSTL_MASK, 0) +#define MA35_FCR_RTSTL_4BYTES FIELD_PREP(MA35_FCR_RTSTL_MASK, 1) +#define MA35_FCR_RTSTL_8BYTES FIELD_PREP(MA35_FCR_RTSTL_MASK, 2) +#define MA35_FCR_RTSTL_14BYTES FIELD_PREP(MA35_FCR_RTSTL_MASK, 3) +#define MA35_FCR_RTSTLL_30BYTES FIELD_PREP(MA35_FCR_RTSTL_MASK, 4) + +/* MA35_LCR_REG - Line Control Register */ +#define MA35_LCR_NSB BIT(2)/* Number of “STOP Bit” */ +#define MA35_LCR_PBE BIT(3)/* Parity Bit Enable */ +#define MA35_LCR_EPE BIT(4)/* Even Parity Enable */ +#define MA35_LCR_SPE BIT(5)/* Stick Parity Enable */ +#define MA35_LCR_BREAK BIT(6)/* Break Control */ +#define MA35_LCR_WLS_MASK GENMASK(1, 0)/* Word Length Selection */ +#define MA35_LCR_WLS_5BITS FIELD_PREP(MA35_LCR_WLS_MASK, 0) +#define MA35_LCR_WLS_6BITS FIELD_PREP(MA35_LCR_WLS_MASK, 1) +#define MA35_LCR_WLS_7BITS FIELD_PREP(MA35_LCR_WLS_MASK, 2) +#define MA35_LCR_WLS_8BITS FIELD_PREP(MA35_LCR_WLS_MASK, 3) + +/* MA35_MCR_REG - Modem Control Register */ +#define MA35_MCR_RTS_CTRL BIT(1)/* nRTS Signal Control */ +#define MA35_MCR_RTSACTLV BIT(9)/* nRTS Pin Active Level */ +#define MA35_MCR_RTSSTS BIT(13)/* nRTS Pin Status (Read Only) */ + +/* MA35_MSR_REG - Modem Status Register */ +#define MA35_MSR_CTSDETF BIT(0)/* Detect nCTS State Change Flag */ +#define MA35_MSR_CTSSTS BIT(4)/* nCTS Pin Status (Read Only) */ +#define MA35_MSR_CTSACTLV BIT(8)/* nCTS Pin Active Level */ + +/* MA35_FSR_REG - FIFO Status Register */ +#define MA35_FSR_RX_OVER_IF BIT(0)/* RX Overflow Error Interrupt Flag */ +#define MA35_FSR_PEF BIT(4)/* Parity Error Flag*/ +#define MA35_FSR_FEF BIT(5)/* Framing Error Flag */ +#define MA35_FSR_BIF BIT(6)/* Break Interrupt Flag */ +#define MA35_FSR_RX_EMPTY BIT(14)/* Receiver FIFO Empty (Read Only) */ +#define MA35_FSR_RX_FULL BIT(15)/* Receiver FIFO Full (Read Only) */ +#define MA35_FSR_TX_EMPTY BIT(22)/* Transmitter FIFO Empty (Read Only) */ +#define MA35_FSR_TX_FULL BIT(23)/* Transmitter FIFO Full (Read Only) */ +#define MA35_FSR_TX_OVER_IF BIT(24)/* TX Overflow Error Interrupt Flag */ +#define MA35_FSR_TE_FLAG BIT(28)/* Transmitter Empty Flag (Read Only) */ +#define MA35_FSR_RXPTR_MSK GENMASK(13, 8)/* TX FIFO Pointer mask */ +#define MA35_FSR_TXPTR_MSK GENMASK(21, 16)/* RX FIFO Pointer mask */ + +/* MA35_ISR_REG - Interrupt Status Register */ +#define MA35_ISR_RDA_IF BIT(0)/* RBR Available Interrupt Flag */ +#define MA35_ISR_THRE_IF BIT(1)/* THR Empty Interrupt Flag */ +#define MA35_ISR_RLSIF BIT(2)/* Receive Line Interrupt Flag */ +#define MA35_ISR_MODEMIF BIT(3)/* MODEM Interrupt Flag */ +#define MA35_ISR_RXTO_IF BIT(4)/* RX Time-out Interrupt Flag */ +#define MA35_ISR_BUFEIF BIT(5)/* Buffer Error Interrupt Flag */ +#define MA35_ISR_WK_IF BIT(6)/* UART Wake-up Interrupt Flag */ +#define MA35_ISR_RDAINT BIT(8)/* RBR Available Interrupt Indicator */ +#define MA35_ISR_THRE_INT BIT(9)/* THR Empty Interrupt Indicator */ +#define MA35_ISR_ALL 0xFFFFFFFF + +/* MA35_BAUD_REG - Baud Rate Divider Register */ +#define MA35_BAUD_MODE_MASK GENMASK(29, 28) +#define MA35_BAUD_MODE0 FIELD_PREP(MA35_BAUD_MODE_MASK, 0) +#define MA35_BAUD_MODE1 FIELD_PREP(MA35_BAUD_MODE_MASK, 2) +#define MA35_BAUD_MODE2 FIELD_PREP(MA35_BAUD_MODE_MASK, 3) +#define MA35_BAUD_MASK GENMASK(15, 0) + +/* MA35_ALTCTL_REG - Alternate Control/Status Register */ +#define MA35_ALTCTL_RS485AUD BIT(10)/* RS-485 Auto Direction Function */ + +/* MA35_FUN_SEL_REG - Function Select Register */ +#define MA35_FUN_SEL_MASK GENMASK(2, 0) +#define MA35_FUN_SEL_UART FIELD_PREP(MA35_FUN_SEL_MASK, 0) +#define MA35_FUN_SEL_RS485 FIELD_PREP(MA35_FUN_SEL_MASK, 3) + +/* The constrain for MA35D1 UART baud rate divider */ +#define MA35_BAUD_DIV_MAX 0xFFFF +#define MA35_BAUD_DIV_MIN 11 + +/* UART FIFO depth */ +#define MA35_UART_FIFO_DEPTH 32 +/* UART console clock */ +#define MA35_UART_CONSOLE_CLK (24 * HZ_PER_MHZ) +/* UART register ioremap size */ +#define MA35_UART_REG_SIZE 0x100 +/* Rx Timeout */ +#define MA35_UART_RX_TOUT 0x40 + +#define MA35_ISR_IF_CHECK (MA35_ISR_RDA_IF | MA35_ISR_RXTO_IF | \ + MA35_ISR_THRE_INT | MA35_ISR_BUFEIF) + +static struct uart_driver ma35d1serial_reg; + +struct uart_ma35d1_port { +struct uart_port port; +struct clk *clk; +u16 capabilities;/* port capabilities */ +u8 ier; +u8 lcr; +u8 mcr; +u32 baud_rate; +u32 console_baud_rate; +u32 console_line; +u32 console_int; +}; + +static struct uart_ma35d1_port ma35d1serial_ports[MA35_UART_NR ]; + +static struct uart_ma35d1_port *to_ma35d1_uart_port (struct uart_port *uart) +{ + return container_of(uart, struct uart_ma35d1_port, port); +} + +static u32 serial_in (struct uart_ma35d1_port *p,u32 offset) +{ +return readl_relaxed (p->port.membase + offset); +} + +static void serial_out (struct uart_ma35d1_port *p,u32 offset,u32 value) +{ +writel_relaxed (value, p->port.membase + offset); +} + +static void __stop_tx (struct uart_ma35d1_port *p) +{ +u32 ier; + + ier =serial_in (p,MA35_IER_REG ); +if (ier &MA35_IER_THRE_IEN ) +serial_out (p,MA35_IER_REG , ier & ~MA35_IER_THRE_IEN ); +} + +static void ma35d1serial_stop_tx (struct uart_port *port) +{ +struct uart_ma35d1_port *up =to_ma35d1_uart_port (port); + +__stop_tx (up); +} + +static void transmit_chars (struct uart_ma35d1_port *up) +{ +u32 count; +u8 ch; + +if (uart_tx_stopped (&up->port)) { +ma35d1serial_stop_tx (&up->port); +return ; + } + count =MA35_UART_FIFO_DEPTH -FIELD_GET (MA35_FSR_TXPTR_MSK , +serial_in (up,MA35_FSR_REG )); +uart_port_tx_limited (&up->port, ch, count, + !(serial_in (up,MA35_FSR_REG ) &MA35_FSR_TX_FULL ), +serial_out (up,MA35_THR_REG , ch), + ({})); +} + +static void ma35d1serial_start_tx (struct uart_port *port) +{ +struct uart_ma35d1_port *up =to_ma35d1_uart_port (port); +u32 ier; + + ier =serial_in (up,MA35_IER_REG );drivers/tty/serial/ma35d1_serial.c line 220
Quoted 10 lines
drivers/tty/serial/ma35d1_serial.c new file +10
-0+serial_out (up,MA35_IER_REG , ier & ~MA35_IER_THRE_IEN ); +transmit_chars (up); +serial_out (up,MA35_IER_REG , ier |MA35_IER_THRE_IEN ); +} + +static void ma35d1serial_stop_rx (struct uart_port *port) +{ +struct uart_ma35d1_port *up =to_ma35d1_uart_port (port); + +serial_out (up,MA35_IER_REG ,serial_in (up,MA35_IER_REG ) & ~MA35_IER_RDA_IEN );These should be split up to:
reg = serial_in(...) reg &= ~MA35_IER_RDA_IEN; serial_out(...)There are other cases too besides this one, convert them all. It will help with some line splitting challenges too you seem to have below.
Quoted 74 lines
drivers/tty/serial/ma35d1_serial.c new file +74
-0+} + +static void receive_chars (struct uart_ma35d1_port *up) +{ +u8 ch, flag; +u32 fsr; +int max_count =256 ; + + fsr =serial_in (up,MA35_FSR_REG ); +do { + flag =TTY_NORMAL ; + up->port.icount.rx++; + +if (unlikely (fsr & (MA35_FSR_BIF |MA35_FSR_FEF | +MA35_FSR_PEF |MA35_FSR_RX_OVER_IF ))) { +if (fsr &MA35_FSR_BIF ) { + up->port.icount.brk++; +if (uart_handle_break (&up->port)) +continue ; + } +if (fsr &MA35_FSR_FEF ) + up->port.icount.frame++; +if (fsr &MA35_FSR_PEF ) + up->port.icount.parity++; +if (fsr &MA35_FSR_RX_OVER_IF ) + up->port.icount.overrun++; + +serial_out (up,MA35_FSR_REG , + fsr & (MA35_FSR_BIF |MA35_FSR_FEF | +MA35_FSR_PEF |MA35_FSR_RX_OVER_IF )); +if (fsr &MA35_FSR_BIF ) + flag =TTY_BREAK ; +else if (fsr &MA35_FSR_PEF ) + flag =TTY_PARITY ; +else if (fsr &MA35_FSR_FEF ) + flag =TTY_FRAME ; + } + + ch =serial_in (up,MA35_RBR_REG ); +if (uart_handle_sysrq_char (&up->port, ch)) +continue ; + +spin_lock (&up->port.lock); +uart_insert_char (&up->port, fsr,MA35_FSR_RX_OVER_IF , ch, flag); +spin_unlock (&up->port.lock); + + fsr =serial_in (up,MA35_FSR_REG ); + }while (!(fsr &MA35_FSR_RX_EMPTY ) && (max_count-- >0 )); + +spin_lock (&up->port.lock); +tty_flip_buffer_push (&up->port.state->port); +spin_unlock (&up->port.lock); +} + +static irqreturn_t ma35d1serial_interrupt (int irq,void *dev_id) +{ +struct uart_port *port = dev_id; +struct uart_ma35d1_port *up =to_ma35d1_uart_port (port); +u32 isr, fsr; + + isr =serial_in (up,MA35_ISR_REG ); + fsr =serial_in (up,MA35_FSR_REG ); + +if (!(isr &MA35_ISR_IF_CHECK )) +return IRQ_NONE ; + +if (isr & (MA35_ISR_RDA_IF |MA35_ISR_RXTO_IF )) +receive_chars (up); +if (isr &MA35_ISR_THRE_INT ) +transmit_chars (up); +if (fsr &MA35_FSR_TX_OVER_IF ) +serial_out (up,MA35_FSR_REG ,MA35_FSR_TX_OVER_IF ); + +return IRQ_HANDLED ;drivers/tty/serial/ma35d1_serial.c line 304
Quoted 10 lines
drivers/tty/serial/ma35d1_serial.c new file +10
-0+} + +static u32 ma35d1serial_tx_empty (struct uart_port *port) +{ +struct uart_ma35d1_port *up =to_ma35d1_uart_port (port); +u32 fsr; + + fsr =serial_in (up,MA35_FSR_REG ); +return (fsr & (MA35_FSR_TE_FLAG |MA35_FSR_TX_EMPTY )) == + (MA35_FSR_TE_FLAG |MA35_FSR_TX_EMPTY ) ?TIOCSER_TEMT :0 ;To make this check cleaner, add this and use it here:
#define
MA35_FSR_TX_BOTH_EMPTY(MA35_FSR_TE_FLAG|MA35_FSR_TX_EMPTY)Quoted 74 lines
drivers/tty/serial/ma35d1_serial.c new file +74
-0+} + +static u32 ma35d1serial_get_mctrl (struct uart_port *port) +{ +struct uart_ma35d1_port *up =to_ma35d1_uart_port (port); +u32 status; +u32 ret =0 ; + + status =serial_in (up,MA35_MSR_REG ); +if (!(status &MA35_MSR_CTSSTS )) + ret |=TIOCM_CTS ; +return ret; +} + +static void ma35d1serial_set_mctrl (struct uart_port *port,u32 mctrl) +{ +struct uart_ma35d1_port *up =to_ma35d1_uart_port (port); +u32 mcr; +u32 ier; + + mcr =serial_in (up,MA35_MCR_REG ); + mcr &= ~MA35_MCR_RTS_CTRL ; + +if (mctrl &TIOCM_RTS ) + mcr |=MA35_MCR_RTSACTLV ; +else + mcr &= ~MA35_MCR_RTSACTLV ; + +if (up->mcr &UART_MCR_AFE ) { +serial_out (up,MA35_IER_REG , (serial_in (up,MA35_IER_REG ) | +MA35_IER_AUTO_RTS | +MA35_IER_AUTO_CTS )); + up->port.flags |=UPF_HARD_FLOW ; + }else { + ier =serial_in (up,MA35_IER_REG ); + ier &= ~(MA35_IER_AUTO_RTS |MA35_IER_AUTO_CTS ); +serial_out (up,MA35_IER_REG , ier); + up->port.flags &= ~UPF_HARD_FLOW ; + } +serial_out (up,MA35_MSR_REG , (serial_in (up,MA35_MSR_REG ) | +MA35_MSR_CTSACTLV )); +serial_out (up,MA35_MCR_REG , mcr); +} + +static void ma35d1serial_break_ctl (struct uart_port *port,int break_state) +{ +struct uart_ma35d1_port *up =to_ma35d1_uart_port (port); +unsigned long flags; +u32 lcr; + +spin_lock_irqsave (&up->port.lock, flags); + lcr =serial_in (up,MA35_LCR_REG ); +if (break_state !=0 ) + lcr |=MA35_LCR_BREAK ; +else + lcr &= ~MA35_LCR_BREAK ; +serial_out (up,MA35_LCR_REG , lcr); +spin_unlock_irqrestore (&up->port.lock, flags); +} + +static int ma35d1serial_startup (struct uart_port *port) +{ +struct uart_ma35d1_port *up =to_ma35d1_uart_port (port); +int retval; + +/* Reset FIFO */ +serial_out (up,MA35_FCR_REG ,MA35_FCR_TFR |MA35_FCR_RFR ); + +/* Clear pending interrupts */ +serial_out (up,MA35_ISR_REG ,MA35_ISR_ALL ); + + retval =request_irq (port->irq, ma35d1serial_interrupt,0 , +dev_name (port->dev), port); +if (retval) {drivers/tty/serial/ma35d1_serial.c line 388
Quoted 10 lines
drivers/tty/serial/ma35d1_serial.c new file +10
-0+dev_err (up->port.dev,"request irq failed.\n" ); +return retval; + } + +serial_out (up,MA35_FCR_REG ,serial_in (up,MA35_FCR_REG ) | +MA35_FCR_RFITL_4BYTES |MA35_FCR_RTSTL_8BYTES ); +serial_out (up,MA35_LCR_REG ,MA35_LCR_WLS_8BITS ); +serial_out (up,MA35_TOR_REG ,MA35_UART_RX_TOUT ); +serial_out (up,MA35_IER_REG ,MA35_IER_RTO_IEN |MA35_IER_RDA_IEN | +MA35_IER_TIME_OUT_EN |MA35_IER_BUFERR_IEN );Align to the parameter like this:
serial_out(up, MA35_IER_REG, MA35_IER_RTO_IEN | MA35_IER_RDA_IEN | MA35_IER_TIME_OUT_EN | MA35_IER_BUFERR_IEN);Quoted 125 lines
drivers/tty/serial/ma35d1_serial.c new file +125
-0+return 0 ; +} + +static void ma35d1serial_shutdown (struct uart_port *port) +{ +struct uart_ma35d1_port *up =to_ma35d1_uart_port (port); + +serial_out (up,MA35_IER_REG ,0 ); +free_irq (port->irq, port); +} + +static void ma35d1serial_set_termios (struct uart_port *port, +struct ktermios *termios, +const struct ktermios *old) +{ +struct uart_ma35d1_port *up =to_ma35d1_uart_port (port); +u32 lcr =0 ; +unsigned long flags; +u32 baud, quot; + + lcr =UART_LCR_WLEN (tty_get_char_size (termios->c_cflag)); + +if (termios->c_cflag &CSTOPB ) + lcr |=MA35_LCR_NSB ; +if (termios->c_cflag &PARENB ) + lcr |=MA35_LCR_PBE ; +if (!(termios->c_cflag &PARODD )) + lcr |=MA35_LCR_EPE ; +if (termios->c_cflag &CMSPAR ) + lcr |=MA35_LCR_SPE ; + + baud =uart_get_baud_rate (port, termios, old, + port->uartclk /MA35_BAUD_DIV_MAX , + port->uartclk /MA35_BAUD_DIV_MIN ); + +/* MA35D1 UART baud rate equation: baudrate = UART_CLK / (quot + 2) */ + quot = (port->uartclk / baud) -2 ; + +/* +* Ok, we're now changing the port state. Do it with +* interrupts disabled. +*/ +spin_lock_irqsave (&up->port.lock, flags); + + up->port.read_status_mask =MA35_FSR_RX_OVER_IF ; +if (termios->c_iflag &INPCK ) + up->port.read_status_mask |=MA35_FSR_FEF |MA35_FSR_PEF ; +if (termios->c_iflag & (BRKINT |PARMRK )) + up->port.read_status_mask |=MA35_FSR_BIF ; + +/* Characteres to ignore */ + up->port.ignore_status_mask =0 ; +if (termios->c_iflag &IGNPAR ) + up->port.ignore_status_mask |=MA35_FSR_FEF |MA35_FSR_PEF ; +if (termios->c_iflag &IGNBRK ) { + up->port.ignore_status_mask |=MA35_FSR_BIF ; +/* +* If we're ignoring parity and break indicators, +* ignore overruns too (for real raw support). +*/ +if (termios->c_iflag &IGNPAR ) + up->port.ignore_status_mask |=MA35_FSR_RX_OVER_IF ; + } +if (termios->c_cflag &CRTSCTS ) + up->mcr |=UART_MCR_AFE ; +else + up->mcr &= ~UART_MCR_AFE ; + +uart_update_timeout (port, termios->c_cflag, baud); + +ma35d1serial_set_mctrl (&up->port, up->port.mctrl); + +serial_out (up,MA35_BAUD_REG ,MA35_BAUD_MODE2 |FIELD_PREP (MA35_BAUD_MASK , quot)); + +serial_out (up,MA35_LCR_REG , lcr); + +spin_unlock_irqrestore (&up->port.lock, flags); +} + +static const char *ma35d1serial_type (struct uart_port *port) +{ +return port->type ==PORT_MA35 ?"ma35d1-uart" :NULL ; +} + +static void ma35d1serial_config_port (struct uart_port *port,int flags) +{ +if (flags &UART_CONFIG_TYPE ) + port->type =PORT_MA35 ; +} + +static int ma35d1serial_verify_port (struct uart_port *port,struct serial_struct *ser) +{ +if (port->type !=PORT_UNKNOWN && ser->type !=PORT_MA35 ) +return -EINVAL ; + +return 0 ; +} + +static const struct uart_ops ma35d1serial_ops = { + .tx_empty = ma35d1serial_tx_empty, + .set_mctrl = ma35d1serial_set_mctrl, + .get_mctrl = ma35d1serial_get_mctrl, + .stop_tx = ma35d1serial_stop_tx, + .start_tx = ma35d1serial_start_tx, + .stop_rx = ma35d1serial_stop_rx, + .break_ctl = ma35d1serial_break_ctl, + .startup = ma35d1serial_startup, + .shutdown = ma35d1serial_shutdown, + .set_termios = ma35d1serial_set_termios, + .type = ma35d1serial_type, + .config_port = ma35d1serial_config_port, + .verify_port = ma35d1serial_verify_port, +}; + +static const struct of_device_id ma35d1_serial_of_match[] = { + { .compatible ="nuvoton,ma35d1-uart" }, + {}, +}; +MODULE_DEVICE_TABLE (of, ma35d1_serial_of_match); + +#ifdef CONFIG_SERIAL_NUVOTON_MA35D1_CONSOLE + +static struct device_node *ma35d1serial_uart_nodes[MA35_UART_NR ]; + +static void wait_for_xmitr (struct uart_ma35d1_port *up)drivers/tty/serial/ma35d1_serial.c line 523
Quoted 10 lines
drivers/tty/serial/ma35d1_serial.c new file +10
-0+{ +unsigned int tmout; + +/* Wait up to 10ms for the character(s) to be sent. */ + tmout =10000 ; +while (--tmout) { +if (serial_in (up,MA35_FSR_REG ) &MA35_FSR_TX_EMPTY ) +break ; +udelay (1 ); + }This can be written as:
Quoted 7 lines
unsigned int reg; read_poll_timeout_atomic(serial_in, reg, reg & MA35_FSR_TX_EMPTY, 1, 10000, false, up, MA35_FSR_REG);
Dear Ilpo,
Thank you for your suggestions and the provided examples for modifications. I will modify the driver based on your suggestions. After a few days, if no further comments are received, I will submit the next version of this one patch.
Best Regards.
Jacky Huang
Quoted 16 lines · Jacky Huang
From: Jacky Huang <[email protected]>
This patchset adds initial support for the Nuvoton ma35d1 SoC, including initial device tree, clock driver, reset driver, and serial driver.
This patchset cover letter is based from the initial support for Nuvoton ma35d1 to keep tracking the version history.
This patchset had been applied to Linux kernel 6.4.0-rc5 and tested on the Nuvoton ma35d1 SOM evaluation board.
(ma35d1 information:
https://www.nuvoton.com/products/microprocessors/arm-cortex-a35-mpus/)
MA35D1 porting on linux-5.10.y can be found at:
https://github.com/OpenNuvoton/MPU-Family
Quoted 6 lines
v13:
- Modify serial driver
- Added a check foroops_in_progressinma35d1serial_console_writeto determine whether to perform thespin_lock.
- Rebaseddrivers/tty/serial/Kconfigand recreate the patch
- RebasedMAINTAINERSand recreate the patch
Hi Jacky,
This is looking good to me, thanks for getting it this far. I see all patches aside from the last one have been reviewed by at least one person. The clock driver is still missing an Ack from the clk maintainers, but I see that you have addressed Stephen's concerns from an earlier review round, so I expect this to be fine.
Stephen, let me know if you have any final concerns about this driver.
The serial port driver was still getting some last changes, so I only picked up the binding but not the driver here. If Greg and Jiri are happy with this version, I'd prefer to just add this with their Ack as well, otherwise please send only that patch for any follow-up revisions. If you can finish this before the linux-6.5 merge window, I'd add it on top of the other patches, otherwise it should just go through Greg's tree.
If anything else should come up, let's handle this as patches on top of the branch I have now pushed in [1], no need to resend these.
Arnd
[1] https://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git/log/?h=nuvoton/ma35d1
Quoted 42 lines · Arnd Bergmann
Quoted 16 lines · Jacky Huang
From: Jacky Huang <[email protected]>
This patchset adds initial support for the Nuvoton ma35d1 SoC, including initial device tree, clock driver, reset driver, and serial driver.
This patchset cover letter is based from the initial support for Nuvoton ma35d1 to keep tracking the version history.
This patchset had been applied to Linux kernel 6.4.0-rc5 and tested on the Nuvoton ma35d1 SOM evaluation board.
(ma35d1 information:
https://www.nuvoton.com/products/microprocessors/arm-cortex-a35-mpus/)
MA35D1 porting on linux-5.10.y can be found at:
https://github.com/OpenNuvoton/MPU-FamilyQuoted 6 lines
v13:
- Modify serial driver
- Added a check foroops_in_progressinma35d1serial_console_writeto determine whether to perform thespin_lock.
- Rebaseddrivers/tty/serial/Kconfigand recreate the patch
- RebasedMAINTAINERSand recreate the patchHi Jacky,
This is looking good to me, thanks for getting it this far. I see all patches aside from the last one have been reviewed by at least one person. The clock driver is still missing an Ack from the clk maintainers, but I see that you have addressed Stephen's concerns from an earlier review round, so I expect this to be fine.
Stephen, let me know if you have any final concerns about this driver.The serial port driver was still getting some last changes, so I only picked up the binding but not the driver here. If Greg and Jiri are happy with this version, I'd prefer to just add this with their Ack as well, otherwise please send only that patch for any follow-up revisions. If you can finish this before the linux-6.5 merge window, I'd add it on top of the other patches, otherwise it should just go through Greg's tree.
Quoted 7 lines
If anything else should come up, let's handle this as patches on top of the branch I have now pushed in [1], no need to resend these.
Arnd
[1] https://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git/log/?h=nuvoton/ma35d1
Dear Arnd,
I'm glad to see that these patches have finally been accepted. Thank you very much for all the assistance you have provided. Once the device tree is merged, we will start submitting drivers such as pinctrl, gpio, rtc, and so on.
Best Regards,
Jacky Huang
Quoted 7 lines · Jacky Huang
Quoted 1 line · Arnd Bergmann
On Mon, Jun 5, 2023, at 06:07, Jacky Huang wrote:
I'm glad to see that these patches have finally been accepted. Thank you very much for all the assistance you have provided. Once the device tree is merged, we will start submitting drivers such as pinctrl, gpio, rtc, and so on.
I think you can start submitting all the drivers to their respective maintainers now, just mention that the SoC support is currently in linux-next in case they get confused about the dependencies.
Arnd
This series was applied to soc/soc.git (for-next) by Arnd Bergmann <[email protected]>:
Hello:
This series was applied to soc/soc.git (for-next)
by Arnd Bergmann <[email protected]>:
Quoted 9 lines · On Mon, 5 Jun 2023 04:07:39 +0000 you wrote:
From: Jacky Huang <[email protected]>
This patchset adds initial support for the Nuvoton ma35d1 SoC, including initial device tree, clock driver, reset driver, and serial driver.
This patchset cover letter is based from the initial support for Nuvoton ma35d1 to keep tracking the version history.
[...]
Here is the summary with links:
- [v13,01/10] arm64: Kconfig.platforms: Add config for Nuvoton MA35 platform
https://git.kernel.org/soc/soc/c/64b88e9ff6c5 - [v13,02/10] arm64: defconfig: Add support for Nuvoton MA35 family SoCs https://git.kernel.org/soc/soc/c/4cc2272447b8 - [v13,03/10] dt-bindings: clock: nuvoton: add binding for ma35d1 clock controller https://git.kernel.org/soc/soc/c/2f8b5eb589cb - [v13,04/10] dt-bindings: reset: nuvoton: Document ma35d1 reset control https://git.kernel.org/soc/soc/c/476650a64b6b - [v13,05/10] dt-bindings: arm: Add initial bindings for Nuvoton platform https://git.kernel.org/soc/soc/c/0545810f7eda - [v13,06/10] dt-bindings: serial: Document ma35d1 uart controller https://git.kernel.org/soc/soc/c/15b53677e786 - [v13,07/10] arm64: dts: nuvoton: Add initial ma35d1 device tree https://git.kernel.org/soc/soc/c/b69af0984732 - [v13,08/10] clk: nuvoton: Add clock driver for ma35d1 clock controller https://git.kernel.org/soc/soc/c/691521a367cf - [v13,09/10] reset: Add Nuvoton ma35d1 reset driver support https://git.kernel.org/soc/soc/c/e4bb55d6ccf0
- [v13,10/10] tty: serial: Add Nuvoton ma35d1 serial driver support (no matching commit)
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html