phy: amlogic: add MIPI DSI function to analog MIPI+PCIe PHY
v3 cover phy: amlogic: add MIPI DSI function to analog MIPI+PCIe PHY
The AXG Analog MIPI-DSI PHY also provides functions to the PCIe PHY, thus we need to have inclusive support for both interfaces at runtime.
This fixes the regmap get from parent node, removes cell param to select a mode and implement runtime configuration & power on/off for both functions since they are not exclusive.
Changes since v2 at [2]:
- Add DT review tags
- Rebase on 5.10-rc1
Changes since v1 at [1]:
- added description to binding as requested parent
- updated commit log of patch 1
- also update example of patch 1
[1] https://lkml.kernel.org/r/[email protected]
[2] https://lkml.kernel.org/r/[email protected]
Neil Armstrong (3):
dt-bindings: phy: amlogic,meson-axg-mipi-pcie-analog: remove reg
attribute
dt-bindings: phy: amlogic,meson-axg-mipi-pcie-analog: remove phy cell
parameter
phy: amlogic: phy-meson-axg-mipi-pcie-analog: add support for MIPI DSI
analog
.../amlogic,meson-axg-mipi-pcie-analog.yaml | 21 +- drivers/phy/amlogic/Kconfig | 1 + .../amlogic/phy-meson-axg-mipi-pcie-analog.c | 204 ++++++++++++------ 3 files changed, 149 insertions(+), 77 deletions(-)
Signature · 7 lines
2.25.1 _______________________________________________ linux-amlogic mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-amlogic
PATCH RESEND v3 1/3 dt-bindings: phy: amlogic,meson-axg-mipi-pcie-analog: remove reg attribute
The PHY registers happens to be at the beginning of a large zone containing interleaved system registers (mainly clocks, power management, PHY control..), found in all Amlogic SoC so far.
The goal is to model it the same way as the other "features" of this zone, like Documentation/devicetree/bindings/clock/amlogic,gxbb-clkc.txt and Documentation/devicetree/bindings/power/amlogic,meson-ee-pwrc.yaml and have a coherent bindings scheme over the Amlogic SoCs.
This update the description, removed the reg attribute then updates the example accordingly.
--- .../phy/amlogic,meson-axg-mipi-pcie-analog.yaml | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-)
Documentation/devicetree/bindings/phy/amlogic,meson-axg-mipi-pcie-analog.yaml +11 -6
@@ -9,27 +9,32 @@ title: Amlogic AXG shared MIPI/PCIE analog PHY maintainers: - Remi Pommarel <[email protected]> +description: |+ + The Everything-Else Power Domains node should be the child of a syscon + node with the required property: + + - compatible: Should be the following: + "amlogic,meson-gx-hhi-sysctrl", "simple-mfd", "syscon" + + Refer to the the bindings described in + Documentation/devicetree/bindings/mfd/syscon.yaml + properties: compatible: const: amlogic,axg-mipi-pcie-analog-phy - reg: - maxItems: 1 - "#phy-cells": const: 1 required: - compatible - - reg - "#phy-cells" additionalProperties: false examples: - | - mpphy: phy@0 { + mpphy: phy { compatible = "amlogic,axg-mipi-pcie-analog-phy"; - reg = <0x0 0xc>; #phy-cells = <1>; };
Signature · 7 lines
2.25.1 _______________________________________________ linux-amlogic mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-amlogic
PATCH RESEND v3 2/3 dt-bindings: phy: amlogic,meson-axg-mipi-pcie-analog: remove phy cell parameter
In reply to Neil ArmstrongThe Amlogic AXG MIPI + PCIe Analog PHY provides function for both PCIe and MIPI DSI at the same time, and is not exclusive.
Thus remove the invalid phy cell parameter.
--- .../bindings/phy/amlogic,meson-axg-mipi-pcie-analog.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
Documentation/devicetree/bindings/phy/amlogic,meson-axg-mipi-pcie-analog.yaml +2 -2
@@ -24,7 +24,7 @@ properties: const: amlogic,axg-mipi-pcie-analog-phy "#phy-cells": - const: 1 + const: 0 required: - compatible
@@ -36,5 +36,5 @@ examples: - | mpphy: phy { compatible = "amlogic,axg-mipi-pcie-analog-phy"; - #phy-cells = <1>; + #phy-cells = <0>; };
Signature · 7 lines
2.25.1 _______________________________________________ linux-amlogic mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-amlogic
PATCH RESEND v3 3/3 phy: amlogic: phy-meson-axg-mipi-pcie-analog: add support for MIPI DSI analog
In reply to Neil ArmstrongThe AXG Analog MIPI-DSI PHY also provides functions to the PCIe PHY, thus we need to have inclusive support for both interfaces at runtime.
This fixes the regmap get from parent node, removes cell param to select a mode and implement runtime configuration & power on/off for both functions since they are not exclusive.
--- drivers/phy/amlogic/Kconfig | 1 + .../amlogic/phy-meson-axg-mipi-pcie-analog.c | 204 ++++++++++++------ 2 files changed, 136 insertions(+), 69 deletions(-)
drivers/phy/amlogic/Kconfig +1 -0
@@ -66,6 +66,7 @@ config PHY_MESON_AXG_MIPI_PCIE_ANALOG depends on OF && (ARCH_MESON || COMPILE_TEST) select GENERIC_PHY select REGMAP_MMIO + select GENERIC_PHY_MIPI_DPHY help Enable this to support the Meson MIPI + PCIE analog PHY found in Meson AXG SoCs.
drivers/phy/amlogic/phy-meson-axg-mipi-pcie-analog.c +135 -69
289 lines not on this page · raw message
Signature · 7 lines
2.25.1 _______________________________________________ linux-amlogic mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-amlogic
Vinod Koul
maintainerRe: [RESEND PATCH v3 3/3] phy: amlogic: phy-meson-axg-mipi-pcie-analog: add support for MIPI DSI analog
Quoted 69 lines · Neil Armstrong
The AXG Analog MIPI-DSI PHY also provides functions to the PCIe PHY, thus we need to have inclusive support for both interfaces at runtime.
This fixes the regmap get from parent node, removes cell param to select a mode and implement runtime configuration & power on/off for both functions since they are not exclusive.
Signed-off-by Neil Armstrong <[email protected]>Reviewed-by Remi Pommarel <[email protected]>--- drivers/phy/amlogic/Kconfig | 1 + .../amlogic/phy-meson-axg-mipi-pcie-analog.c | 204 ++++++++++++------ 2 files changed, 136 insertions(+), 69 deletions(-)drivers/phy/amlogic/Kconfig +1
-0@@ -66,6 +66,7 @@ config PHY_MESON_AXG_MIPI_PCIE_ANALOG depends on OF && (ARCH_MESON || COMPILE_TEST) select GENERIC_PHY select REGMAP_MMIO + select GENERIC_PHY_MIPI_DPHY help Enable this to support the Meson MIPI + PCIE analog PHY found in Meson AXG SoCs.drivers/phy/amlogic/phy-meson-axg-mipi-pcie-analog.c +8
-4@@ -4,9 +4,13 @@* * Copyright (C) 2019 Remi Pommarel <[email protected]> */ +#include <linux/bitfield.h> +#include <linux/bitops.h> #include <linux/module.h> #include <linux/phy/phy.h> #include <linux/regmap.h> +#include <linux/delay.h> +#include <linux/mfd/syscon.h> #include <linux/platform_device.h> #include <dt-bindings/phy/phy.h> @@ -14,10 +18,10 @@#define HHI_MIPI_CNTL0_COMMON_BLOCK GENMASK(31, 28)#define HHI_MIPI_CNTL0_ENABLE BIT(29)#define HHI_MIPI_CNTL0_BANDGAP BIT(26) -#define HHI_MIPI_CNTL0_DECODE_TO_RTERM GENMASK(15, 12) -#define HHI_MIPI_CNTL0_OUTPUT_EN BIT(3) +#define HHI_MIPI_CNTL0_DIF_REF_CTL1 GENMASK(25, 16) +#define HHI_MIPI_CNTL0_DIF_REF_CTL0 GENMASK(15, 0) -#define HHI_MIPI_CNTL1 0x01 +#define HHI_MIPI_CNTL1 0x04#define HHI_MIPI_CNTL1_CH0_CML_PDR_EN BIT(12)#define HHI_MIPI_CNTL1_LP_ABILITY GENMASK(5, 4)#define HHI_MIPI_CNTL1_LP_RESISTER BIT(3)@@ -25,100 +29,170 @@#define HHI_MIPI_CNTL1_INPUT_SEL BIT(1)#define HHI_MIPI_CNTL1_PRBS7_EN BIT(0) -#define HHI_MIPI_CNTL2 0x02 +#define HHI_MIPI_CNTL2 0x08#define HHI_MIPI_CNTL2_CH_PU GENMASK(31, 25)#define HHI_MIPI_CNTL2_CH_CTL GENMASK(24, 19)#define HHI_MIPI_CNTL2_CH0_DIGDR_EN BIT(18)#define HHI_MIPI_CNTL2_CH_DIGDR_EN BIT(17)#define HHI_MIPI_CNTL2_LPULPS_EN BIT(16)
drivers/phy/amlogic/phy-meson-axg-mipi-pcie-analog.c line 46
Quoted 10 lines
drivers/phy/amlogic/phy-meson-axg-mipi-pcie-analog.c +7
-1-#define HHI_MIPI_CNTL2_CH_EN (n) BIT(15 - (n)) +#define HHI_MIPI_CNTL2_CH_EN GENMASK(15, 11)#define HHI_MIPI_CNTL2_CH0_LP_CTL GENMASK(10, 1) +#define DSI_LANE_0 (1 << 4) +#define DSI_LANE_1 (1 << 3) +#define DSI_LANE_CLK (1 << 2) +#define DSI_LANE_2 (1 << 1) +#define DSI_LANE_3 (1 << 0) +#define DSI_LANE_MASK (0x1F)
This should use BIT(), also there are interesting helpers in bitfield.h to help with register fields, do send follow up patches..
Signature · 1 line
~Vinod
Re: [RESEND PATCH v3 3/3] phy: amlogic: phy-meson-axg-mipi-pcie-analog: add support for MIPI DSI analog
Quoted 74 lines · Vinod Koul
Quoted 73 lines · Neil Armstrong
The AXG Analog MIPI-DSI PHY also provides functions to the PCIe PHY, thus we need to have inclusive support for both interfaces at runtime.
This fixes the regmap get from parent node, removes cell param to select a mode and implement runtime configuration & power on/off for both functions since they are not exclusive.
Signed-off-by Neil Armstrong <[email protected]>Reviewed-by Remi Pommarel <[email protected]>--- drivers/phy/amlogic/Kconfig | 1 + .../amlogic/phy-meson-axg-mipi-pcie-analog.c | 204 ++++++++++++------ 2 files changed, 136 insertions(+), 69 deletions(-)drivers/phy/amlogic/Kconfig +1
-0@@ -66,6 +66,7 @@ config PHY_MESON_AXG_MIPI_PCIE_ANALOG depends on OF && (ARCH_MESON || COMPILE_TEST) select GENERIC_PHY select REGMAP_MMIO + select GENERIC_PHY_MIPI_DPHY help Enable this to support the Meson MIPI + PCIE analog PHY found in Meson AXG SoCs.drivers/phy/amlogic/phy-meson-axg-mipi-pcie-analog.c +9
-5@@ -4,9 +4,13 @@* * Copyright (C) 2019 Remi Pommarel <[email protected]> */ +#include <linux/bitfield.h> +#include <linux/bitops.h> #include <linux/module.h> #include <linux/phy/phy.h> #include <linux/regmap.h> +#include <linux/delay.h> +#include <linux/mfd/syscon.h> #include <linux/platform_device.h> #include <dt-bindings/phy/phy.h> @@ -14,10 +18,10 @@#define HHI_MIPI_CNTL0_COMMON_BLOCK GENMASK(31, 28)#define HHI_MIPI_CNTL0_ENABLE BIT(29)#define HHI_MIPI_CNTL0_BANDGAP BIT(26) -#define HHI_MIPI_CNTL0_DECODE_TO_RTERM GENMASK(15, 12) -#define HHI_MIPI_CNTL0_OUTPUT_EN BIT(3) +#define HHI_MIPI_CNTL0_DIF_REF_CTL1 GENMASK(25, 16) +#define HHI_MIPI_CNTL0_DIF_REF_CTL0 GENMASK(15, 0) -#define HHI_MIPI_CNTL1 0x01 +#define HHI_MIPI_CNTL1 0x04#define HHI_MIPI_CNTL1_CH0_CML_PDR_EN BIT(12)#define HHI_MIPI_CNTL1_LP_ABILITY GENMASK(5, 4)#define HHI_MIPI_CNTL1_LP_RESISTER BIT(3)@@ -25,100 +29,170 @@#define HHI_MIPI_CNTL1_INPUT_SEL BIT(1)#define HHI_MIPI_CNTL1_PRBS7_EN BIT(0) -#define HHI_MIPI_CNTL2 0x02 +#define HHI_MIPI_CNTL2 0x08#define HHI_MIPI_CNTL2_CH_PU GENMASK(31, 25)#define HHI_MIPI_CNTL2_CH_CTL GENMASK(24, 19)#define HHI_MIPI_CNTL2_CH0_DIGDR_EN BIT(18)#define HHI_MIPI_CNTL2_CH_DIGDR_EN BIT(17)#define HHI_MIPI_CNTL2_LPULPS_EN BIT(16) -#define HHI_MIPI_CNTL2_CH_EN (n) BIT(15 - (n)) +#define HHI_MIPI_CNTL2_CH_EN GENMASK(15, 11)#define HHI_MIPI_CNTL2_CH0_LP_CTL GENMASK(10, 1)
Quoted 10 lines
drivers/phy/amlogic/phy-meson-axg-mipi-pcie-analog.c line 46
Quoted 6 lines
drivers/phy/amlogic/phy-meson-axg-mipi-pcie-analog.c +6
-0+#define DSI_LANE_0 (1 << 4) +#define DSI_LANE_1 (1 << 3) +#define DSI_LANE_CLK (1 << 2) +#define DSI_LANE_2 (1 << 1) +#define DSI_LANE_3 (1 << 0) +#define DSI_LANE_MASK (0x1F)This should use
BIT(), also there are interesting helpers inbitfield.hto help with register fields, do send follow up patches..
Ok, cleanup will follow
Thanks,
Neil
_______________________________________________
linux-amlogic mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-amlogic
Quoted 6 lines · Neil Armstrong
The AXG Analog MIPI-DSI PHY also provides functions to the PCIe PHY, thus we need to have inclusive support for both interfaces at runtime.
This fixes the regmap get from parent node, removes cell param to select a mode and implement runtime configuration & power on/off for both functions since they are not exclusive.
Applied, thanks
Signature · 1 line
~Vinod