* [PATCH 0/6] arm64: Add support for Amlogic SM1 SoC Family
@ 2019-08-20 14:40 Neil Armstrong
2019-08-20 14:40 ` [PATCH 1/6] soc: amlogic: meson-gx-socinfo: Add SM1 and S905X3 IDs Neil Armstrong
` (6 more replies)
0 siblings, 7 replies; 13+ messages in thread
From: Neil Armstrong @ 2019-08-20 14:40 UTC (permalink / raw)
To: khilman; +Cc: Neil Armstrong, linux-amlogic, linux-arm-kernel, linux-kernel
The new Amlogic SM1 SoC Family is a derivative of the Amlogic G12A
SoC Family, with the following changes :
- Cortex-A55 cores instead of A53
- more power domains, including USB & PCIe
- a neural network co-processor (NNA)
- a CSI input and image processor
- some changes in the audio complex, thus not yet enabled
- new clocks, for NNA, CSI and a clock tree for each CPU Core
This serie does not add support for NNA, CSI, Audio, USB, Display
or DVFS, it only aligns with the current G12A Support.
With this serie, the SEI610 Board has supported :
- Default-boot CPU frequency
- Ethernet
- LEDs
- IR
- GPIO Buttons
- eMMC
- SDCard
- SDIO WiFi
- UART Bluetooth
Audio (HDMI, Embedded HP, MIcs), USB, HDMI, IR Output, & RGB Led
would be supported in following patchsets.
Dependencies:
- g12-common.dtsi from the DVFS patchset at [1]
Changes from rfc at [2]:
- Removed Power domain patches & display/USB support, will resend separately
- Removed applied AO-CEC patches
- Fixed clk-measure IDs
- Collected reviewed-by tags
[1] https://patchwork.kernel.org/cover/11025309/
[2] https://patchwork.kernel.org/cover/11025511/
Neil Armstrong (6):
soc: amlogic: meson-gx-socinfo: Add SM1 and S905X3 IDs
dt-bindings: soc: amlogic: clk-measure: Add SM1 compatible
soc: amlogic: clk-measure: Add support for SM1
dt-bindings: arm: amlogic: add SM1 bindings
dt-bindings: arm: amlogic: add SEI Robotics SEI610 bindings
arm64: dts: add support for SM1 based SEI Robotics SEI610
.../devicetree/bindings/arm/amlogic.yaml | 5 +
.../bindings/soc/amlogic/clk-measure.txt | 1 +
arch/arm64/boot/dts/amlogic/Makefile | 1 +
.../boot/dts/amlogic/meson-sm1-sei610.dts | 300 ++++++++++++++++++
arch/arm64/boot/dts/amlogic/meson-sm1.dtsi | 68 ++++
drivers/soc/amlogic/meson-clk-measure.c | 134 ++++++++
drivers/soc/amlogic/meson-gx-socinfo.c | 2 +
7 files changed, 511 insertions(+)
create mode 100644 arch/arm64/boot/dts/amlogic/meson-sm1-sei610.dts
create mode 100644 arch/arm64/boot/dts/amlogic/meson-sm1.dtsi
--
2.22.0
^ permalink raw reply [flat|nested] 13+ messages in thread* [PATCH 1/6] soc: amlogic: meson-gx-socinfo: Add SM1 and S905X3 IDs 2019-08-20 14:40 [PATCH 0/6] arm64: Add support for Amlogic SM1 SoC Family Neil Armstrong @ 2019-08-20 14:40 ` Neil Armstrong 2019-08-20 14:40 ` [PATCH 2/6] dt-bindings: soc: amlogic: clk-measure: Add SM1 compatible Neil Armstrong ` (5 subsequent siblings) 6 siblings, 0 replies; 13+ messages in thread From: Neil Armstrong @ 2019-08-20 14:40 UTC (permalink / raw) To: khilman Cc: Neil Armstrong, linux-amlogic, linux-arm-kernel, linux-kernel, Martin Blumenstingl, Jerome Brunet Add the SoC IDs for the S905X3 Amlogic SM1 SoC. Reviewed-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com> Reviewed-by: Jerome Brunet <jbrunet@baylibre.com> Signed-off-by: Neil Armstrong <narmstrong@baylibre.com> --- drivers/soc/amlogic/meson-gx-socinfo.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/soc/amlogic/meson-gx-socinfo.c b/drivers/soc/amlogic/meson-gx-socinfo.c index ff86a75939e8..b9f4c6f4fd03 100644 --- a/drivers/soc/amlogic/meson-gx-socinfo.c +++ b/drivers/soc/amlogic/meson-gx-socinfo.c @@ -39,6 +39,7 @@ static const struct meson_gx_soc_id { { "TXHD", 0x27 }, { "G12A", 0x28 }, { "G12B", 0x29 }, + { "SM1", 0x2b }, }; static const struct meson_gx_package_id { @@ -66,6 +67,7 @@ static const struct meson_gx_package_id { { "S905X2", 0x28, 0x40, 0xf0 }, { "S922X", 0x29, 0x40, 0xf0 }, { "A311D", 0x29, 0x10, 0xf0 }, + { "S905X3", 0x2b, 0x5, 0xf }, }; static inline unsigned int socinfo_to_major(u32 socinfo) -- 2.22.0 ^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH 2/6] dt-bindings: soc: amlogic: clk-measure: Add SM1 compatible 2019-08-20 14:40 [PATCH 0/6] arm64: Add support for Amlogic SM1 SoC Family Neil Armstrong 2019-08-20 14:40 ` [PATCH 1/6] soc: amlogic: meson-gx-socinfo: Add SM1 and S905X3 IDs Neil Armstrong @ 2019-08-20 14:40 ` Neil Armstrong 2019-08-20 14:40 ` [PATCH 3/6] soc: amlogic: clk-measure: Add support for SM1 Neil Armstrong ` (4 subsequent siblings) 6 siblings, 0 replies; 13+ messages in thread From: Neil Armstrong @ 2019-08-20 14:40 UTC (permalink / raw) To: khilman Cc: Neil Armstrong, linux-amlogic, linux-arm-kernel, linux-kernel, devicetree, Martin Blumenstingl, Rob Herring Add the Amlogic SM1 Compatible for the clk-measurer IP. Reviewed-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com> Reviewed-by: Rob Herring <robh@kernel.org> Signed-off-by: Neil Armstrong <narmstrong@baylibre.com> --- Documentation/devicetree/bindings/soc/amlogic/clk-measure.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/Documentation/devicetree/bindings/soc/amlogic/clk-measure.txt b/Documentation/devicetree/bindings/soc/amlogic/clk-measure.txt index 6bf6b43f8dd8..3dd563cec794 100644 --- a/Documentation/devicetree/bindings/soc/amlogic/clk-measure.txt +++ b/Documentation/devicetree/bindings/soc/amlogic/clk-measure.txt @@ -11,6 +11,7 @@ Required properties: "amlogic,meson8b-clk-measure" for Meson8b SoCs "amlogic,meson-axg-clk-measure" for AXG SoCs "amlogic,meson-g12a-clk-measure" for G12a SoCs + "amlogic,meson-sm1-clk-measure" for SM1 SoCs - reg: base address and size of the Clock Measurer register space. Example: -- 2.22.0 ^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH 3/6] soc: amlogic: clk-measure: Add support for SM1 2019-08-20 14:40 [PATCH 0/6] arm64: Add support for Amlogic SM1 SoC Family Neil Armstrong 2019-08-20 14:40 ` [PATCH 1/6] soc: amlogic: meson-gx-socinfo: Add SM1 and S905X3 IDs Neil Armstrong 2019-08-20 14:40 ` [PATCH 2/6] dt-bindings: soc: amlogic: clk-measure: Add SM1 compatible Neil Armstrong @ 2019-08-20 14:40 ` Neil Armstrong 2019-08-20 14:40 ` [PATCH 4/6] dt-bindings: arm: amlogic: add SM1 bindings Neil Armstrong ` (3 subsequent siblings) 6 siblings, 0 replies; 13+ messages in thread From: Neil Armstrong @ 2019-08-20 14:40 UTC (permalink / raw) To: khilman; +Cc: Neil Armstrong, linux-amlogic, linux-arm-kernel, linux-kernel Add the clk-measurer clocks IDs for the Amlogic SM1 SoC family. Signed-off-by: Neil Armstrong <narmstrong@baylibre.com> --- drivers/soc/amlogic/meson-clk-measure.c | 134 ++++++++++++++++++++++++ 1 file changed, 134 insertions(+) diff --git a/drivers/soc/amlogic/meson-clk-measure.c b/drivers/soc/amlogic/meson-clk-measure.c index f09b404b39d3..0fa47d77577d 100644 --- a/drivers/soc/amlogic/meson-clk-measure.c +++ b/drivers/soc/amlogic/meson-clk-measure.c @@ -357,6 +357,136 @@ static struct meson_msr_id clk_msr_g12a[CLK_MSR_MAX] = { CLK_MSR_ID(122, "audio_pdm_dclk"), }; +static struct meson_msr_id clk_msr_sm1[CLK_MSR_MAX] = { + CLK_MSR_ID(0, "ring_osc_out_ee_0"), + CLK_MSR_ID(1, "ring_osc_out_ee_1"), + CLK_MSR_ID(2, "ring_osc_out_ee_2"), + CLK_MSR_ID(3, "ring_osc_out_ee_3"), + CLK_MSR_ID(4, "gp0_pll"), + CLK_MSR_ID(5, "gp1_pll"), + CLK_MSR_ID(6, "enci"), + CLK_MSR_ID(7, "clk81"), + CLK_MSR_ID(8, "encp"), + CLK_MSR_ID(9, "encl"), + CLK_MSR_ID(10, "vdac"), + CLK_MSR_ID(11, "eth_tx"), + CLK_MSR_ID(12, "hifi_pll"), + CLK_MSR_ID(13, "mod_tcon"), + CLK_MSR_ID(14, "fec_0"), + CLK_MSR_ID(15, "fec_1"), + CLK_MSR_ID(16, "fec_2"), + CLK_MSR_ID(17, "sys_pll_div16"), + CLK_MSR_ID(18, "sys_cpu_div16"), + CLK_MSR_ID(19, "lcd_an_ph2"), + CLK_MSR_ID(20, "rtc_osc_out"), + CLK_MSR_ID(21, "lcd_an_ph3"), + CLK_MSR_ID(22, "eth_phy_ref"), + CLK_MSR_ID(23, "mpll_50m"), + CLK_MSR_ID(24, "eth_125m"), + CLK_MSR_ID(25, "eth_rmii"), + CLK_MSR_ID(26, "sc_int"), + CLK_MSR_ID(27, "in_mac"), + CLK_MSR_ID(28, "sar_adc"), + CLK_MSR_ID(29, "pcie_inp"), + CLK_MSR_ID(30, "pcie_inn"), + CLK_MSR_ID(31, "mpll_test_out"), + CLK_MSR_ID(32, "vdec"), + CLK_MSR_ID(34, "eth_mpll_50m"), + CLK_MSR_ID(35, "mali"), + CLK_MSR_ID(36, "hdmi_tx_pixel"), + CLK_MSR_ID(37, "cdac"), + CLK_MSR_ID(38, "vdin_meas"), + CLK_MSR_ID(39, "bt656"), + CLK_MSR_ID(40, "arm_ring_osc_out_4"), + CLK_MSR_ID(41, "eth_rx_or_rmii"), + CLK_MSR_ID(42, "mp0_out"), + CLK_MSR_ID(43, "fclk_div5"), + CLK_MSR_ID(44, "pwm_b"), + CLK_MSR_ID(45, "pwm_a"), + CLK_MSR_ID(46, "vpu"), + CLK_MSR_ID(47, "ddr_dpll_pt"), + CLK_MSR_ID(48, "mp1_out"), + CLK_MSR_ID(49, "mp2_out"), + CLK_MSR_ID(50, "mp3_out"), + CLK_MSR_ID(51, "sd_emmc_c"), + CLK_MSR_ID(52, "sd_emmc_b"), + CLK_MSR_ID(53, "sd_emmc_a"), + CLK_MSR_ID(54, "vpu_clkc"), + CLK_MSR_ID(55, "vid_pll_div_out"), + CLK_MSR_ID(56, "wave420l_a"), + CLK_MSR_ID(57, "wave420l_c"), + CLK_MSR_ID(58, "wave420l_b"), + CLK_MSR_ID(59, "hcodec"), + CLK_MSR_ID(60, "arm_ring_osc_out_5"), + CLK_MSR_ID(61, "gpio_msr"), + CLK_MSR_ID(62, "hevcb"), + CLK_MSR_ID(63, "dsi_meas"), + CLK_MSR_ID(64, "spicc_1"), + CLK_MSR_ID(65, "spicc_0"), + CLK_MSR_ID(66, "vid_lock"), + CLK_MSR_ID(67, "dsi_phy"), + CLK_MSR_ID(68, "hdcp22_esm"), + CLK_MSR_ID(69, "hdcp22_skp"), + CLK_MSR_ID(70, "pwm_f"), + CLK_MSR_ID(71, "pwm_e"), + CLK_MSR_ID(72, "pwm_d"), + CLK_MSR_ID(73, "pwm_c"), + CLK_MSR_ID(74, "arm_ring_osc_out_6"), + CLK_MSR_ID(75, "hevcf"), + CLK_MSR_ID(76, "arm_ring_osc_out_7"), + CLK_MSR_ID(77, "rng_ring_osc_0"), + CLK_MSR_ID(78, "rng_ring_osc_1"), + CLK_MSR_ID(79, "rng_ring_osc_2"), + CLK_MSR_ID(80, "rng_ring_osc_3"), + CLK_MSR_ID(81, "vapb"), + CLK_MSR_ID(82, "ge2d"), + CLK_MSR_ID(83, "co_rx"), + CLK_MSR_ID(84, "co_tx"), + CLK_MSR_ID(85, "arm_ring_osc_out_8"), + CLK_MSR_ID(86, "arm_ring_osc_out_9"), + CLK_MSR_ID(87, "mipi_dsi_phy"), + CLK_MSR_ID(88, "cis2_adapt"), + CLK_MSR_ID(89, "hdmi_todig"), + CLK_MSR_ID(90, "hdmitx_sys"), + CLK_MSR_ID(91, "nna_core"), + CLK_MSR_ID(92, "nna_axi"), + CLK_MSR_ID(93, "vad"), + CLK_MSR_ID(94, "eth_phy_rx"), + CLK_MSR_ID(95, "eth_phy_pll"), + CLK_MSR_ID(96, "vpu_b"), + CLK_MSR_ID(97, "cpu_b_tmp"), + CLK_MSR_ID(98, "ts"), + CLK_MSR_ID(99, "arm_ring_osc_out_10"), + CLK_MSR_ID(100, "arm_ring_osc_out_11"), + CLK_MSR_ID(101, "arm_ring_osc_out_12"), + CLK_MSR_ID(102, "arm_ring_osc_out_13"), + CLK_MSR_ID(103, "arm_ring_osc_out_14"), + CLK_MSR_ID(104, "arm_ring_osc_out_15"), + CLK_MSR_ID(105, "arm_ring_osc_out_16"), + CLK_MSR_ID(106, "ephy_test"), + CLK_MSR_ID(107, "au_dac_g128x"), + CLK_MSR_ID(108, "audio_locker_out"), + CLK_MSR_ID(109, "audio_locker_in"), + CLK_MSR_ID(110, "audio_tdmout_c_sclk"), + CLK_MSR_ID(111, "audio_tdmout_b_sclk"), + CLK_MSR_ID(112, "audio_tdmout_a_sclk"), + CLK_MSR_ID(113, "audio_tdmin_lb_sclk"), + CLK_MSR_ID(114, "audio_tdmin_c_sclk"), + CLK_MSR_ID(115, "audio_tdmin_b_sclk"), + CLK_MSR_ID(116, "audio_tdmin_a_sclk"), + CLK_MSR_ID(117, "audio_resample"), + CLK_MSR_ID(118, "audio_pdm_sys"), + CLK_MSR_ID(119, "audio_spdifout_b"), + CLK_MSR_ID(120, "audio_spdifout"), + CLK_MSR_ID(121, "audio_spdifin"), + CLK_MSR_ID(122, "audio_pdm_dclk"), + CLK_MSR_ID(123, "audio_resampled"), + CLK_MSR_ID(124, "earcrx_pll"), + CLK_MSR_ID(125, "earcrx_pll_test"), + CLK_MSR_ID(126, "csi_phy0"), + CLK_MSR_ID(127, "csi2_data"), +}; + static int meson_measure_id(struct meson_msr_id *clk_msr_id, unsigned int duration) { @@ -545,6 +675,10 @@ static const struct of_device_id meson_msr_match_table[] = { .compatible = "amlogic,meson-g12a-clk-measure", .data = (void *)clk_msr_g12a, }, + { + .compatible = "amlogic,meson-sm1-clk-measure", + .data = (void *)clk_msr_sm1, + }, { /* sentinel */ } }; -- 2.22.0 ^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH 4/6] dt-bindings: arm: amlogic: add SM1 bindings 2019-08-20 14:40 [PATCH 0/6] arm64: Add support for Amlogic SM1 SoC Family Neil Armstrong ` (2 preceding siblings ...) 2019-08-20 14:40 ` [PATCH 3/6] soc: amlogic: clk-measure: Add support for SM1 Neil Armstrong @ 2019-08-20 14:40 ` Neil Armstrong 2019-08-20 16:15 ` Rob Herring 2019-08-20 14:40 ` [PATCH 5/6] dt-bindings: arm: amlogic: add SEI Robotics SEI610 bindings Neil Armstrong ` (2 subsequent siblings) 6 siblings, 1 reply; 13+ messages in thread From: Neil Armstrong @ 2019-08-20 14:40 UTC (permalink / raw) To: khilman Cc: Neil Armstrong, linux-amlogic, linux-arm-kernel, linux-kernel, devicetree Add bindings for the new Amlogic SM1 SoC Family. It a derivative of the G12A SoC Family with : - Cortex-A55 core instead of A53 - more power domains - a neural network co-processor - a CSI input and image processor Signed-off-by: Neil Armstrong <narmstrong@baylibre.com> --- Documentation/devicetree/bindings/arm/amlogic.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Documentation/devicetree/bindings/arm/amlogic.yaml b/Documentation/devicetree/bindings/arm/amlogic.yaml index 96f66911e3c6..d701e8447363 100644 --- a/Documentation/devicetree/bindings/arm/amlogic.yaml +++ b/Documentation/devicetree/bindings/arm/amlogic.yaml @@ -150,4 +150,7 @@ properties: - const: amlogic,s922x - const: amlogic,g12b + - description: Boards with the Amlogic Meson SM1 S905X3 SoC + items: + - const: amlogic,sm1 ... -- 2.22.0 ^ permalink raw reply related [flat|nested] 13+ messages in thread
* Re: [PATCH 4/6] dt-bindings: arm: amlogic: add SM1 bindings 2019-08-20 14:40 ` [PATCH 4/6] dt-bindings: arm: amlogic: add SM1 bindings Neil Armstrong @ 2019-08-20 16:15 ` Rob Herring 0 siblings, 0 replies; 13+ messages in thread From: Rob Herring @ 2019-08-20 16:15 UTC (permalink / raw) To: Neil Armstrong Cc: Kevin Hilman, linux-amlogic, moderated list:ARM/FREESCALE IMX / MXC ARM ARCHITECTURE, linux-kernel, devicetree On Tue, Aug 20, 2019 at 9:41 AM Neil Armstrong <narmstrong@baylibre.com> wrote: > > Add bindings for the new Amlogic SM1 SoC Family. > > It a derivative of the G12A SoC Family with : > - Cortex-A55 core instead of A53 > - more power domains > - a neural network co-processor > - a CSI input and image processor > > Signed-off-by: Neil Armstrong <narmstrong@baylibre.com> > --- > Documentation/devicetree/bindings/arm/amlogic.yaml | 3 +++ > 1 file changed, 3 insertions(+) Reviewed-by: Rob Herring <robh@kernel.org> ^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH 5/6] dt-bindings: arm: amlogic: add SEI Robotics SEI610 bindings 2019-08-20 14:40 [PATCH 0/6] arm64: Add support for Amlogic SM1 SoC Family Neil Armstrong ` (3 preceding siblings ...) 2019-08-20 14:40 ` [PATCH 4/6] dt-bindings: arm: amlogic: add SM1 bindings Neil Armstrong @ 2019-08-20 14:40 ` Neil Armstrong 2019-08-20 16:16 ` Rob Herring 2019-08-20 14:40 ` [PATCH 6/6] arm64: dts: add support for SM1 based SEI Robotics SEI610 Neil Armstrong 2019-08-20 19:25 ` [PATCH 0/6] arm64: Add support for Amlogic SM1 SoC Family Kevin Hilman 6 siblings, 1 reply; 13+ messages in thread From: Neil Armstrong @ 2019-08-20 14:40 UTC (permalink / raw) To: khilman Cc: Neil Armstrong, linux-amlogic, linux-arm-kernel, linux-kernel, devicetree Add the compatible for the Amlogic SM1 Based SEI610 board. Signed-off-by: Neil Armstrong <narmstrong@baylibre.com> --- Documentation/devicetree/bindings/arm/amlogic.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Documentation/devicetree/bindings/arm/amlogic.yaml b/Documentation/devicetree/bindings/arm/amlogic.yaml index d701e8447363..b48ea1e4913a 100644 --- a/Documentation/devicetree/bindings/arm/amlogic.yaml +++ b/Documentation/devicetree/bindings/arm/amlogic.yaml @@ -152,5 +152,7 @@ properties: - description: Boards with the Amlogic Meson SM1 S905X3 SoC items: + - enum: + - seirobotics,sei610 - const: amlogic,sm1 ... -- 2.22.0 ^ permalink raw reply related [flat|nested] 13+ messages in thread
* Re: [PATCH 5/6] dt-bindings: arm: amlogic: add SEI Robotics SEI610 bindings 2019-08-20 14:40 ` [PATCH 5/6] dt-bindings: arm: amlogic: add SEI Robotics SEI610 bindings Neil Armstrong @ 2019-08-20 16:16 ` Rob Herring 0 siblings, 0 replies; 13+ messages in thread From: Rob Herring @ 2019-08-20 16:16 UTC (permalink / raw) To: Neil Armstrong Cc: Kevin Hilman, linux-amlogic, moderated list:ARM/FREESCALE IMX / MXC ARM ARCHITECTURE, linux-kernel, devicetree On Tue, Aug 20, 2019 at 9:41 AM Neil Armstrong <narmstrong@baylibre.com> wrote: > > Add the compatible for the Amlogic SM1 Based SEI610 board. > > Signed-off-by: Neil Armstrong <narmstrong@baylibre.com> > --- > Documentation/devicetree/bindings/arm/amlogic.yaml | 2 ++ > 1 file changed, 2 insertions(+) Reviewed-by: Rob Herring <robh@kernel.org> ^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH 6/6] arm64: dts: add support for SM1 based SEI Robotics SEI610 2019-08-20 14:40 [PATCH 0/6] arm64: Add support for Amlogic SM1 SoC Family Neil Armstrong ` (4 preceding siblings ...) 2019-08-20 14:40 ` [PATCH 5/6] dt-bindings: arm: amlogic: add SEI Robotics SEI610 bindings Neil Armstrong @ 2019-08-20 14:40 ` Neil Armstrong 2019-08-20 20:11 ` Martin Blumenstingl 2019-08-20 19:25 ` [PATCH 0/6] arm64: Add support for Amlogic SM1 SoC Family Kevin Hilman 6 siblings, 1 reply; 13+ messages in thread From: Neil Armstrong @ 2019-08-20 14:40 UTC (permalink / raw) To: khilman; +Cc: Neil Armstrong, linux-amlogic, linux-arm-kernel, linux-kernel Add support for the Amlogic SM1 Based SEI610 board. The SM1 SoC is a derivative of the G12A SoC Family with : - Cortex-A55 core instead of A53 - more power domains, including USB & PCIe - a neural network co-processor (NNA) - a CSI input and image processor - some changes in the audio complex, thus not yet enabled The SEI610 board is a derivative of the SEI510 board with : - removed ADC based touch button, replaced with 3x GPIO buttons - physical switch disabling on-board MICs - USB-C port for USB 2.0 OTG - On-board FTDI USB2SERIAL port for Linux console Audio, Display and USB support will be added later when support of the corresponding power domains will be added, for now they are kept disabled. Signed-off-by: Neil Armstrong <narmstrong@baylibre.com> --- arch/arm64/boot/dts/amlogic/Makefile | 1 + .../boot/dts/amlogic/meson-sm1-sei610.dts | 300 ++++++++++++++++++ arch/arm64/boot/dts/amlogic/meson-sm1.dtsi | 68 ++++ 3 files changed, 369 insertions(+) create mode 100644 arch/arm64/boot/dts/amlogic/meson-sm1-sei610.dts create mode 100644 arch/arm64/boot/dts/amlogic/meson-sm1.dtsi diff --git a/arch/arm64/boot/dts/amlogic/Makefile b/arch/arm64/boot/dts/amlogic/Makefile index ae5e8d0c08da..edbf128e7707 100644 --- a/arch/arm64/boot/dts/amlogic/Makefile +++ b/arch/arm64/boot/dts/amlogic/Makefile @@ -34,3 +34,4 @@ dtb-$(CONFIG_ARCH_MESON) += meson-gxm-q200.dtb dtb-$(CONFIG_ARCH_MESON) += meson-gxm-q201.dtb dtb-$(CONFIG_ARCH_MESON) += meson-gxm-rbox-pro.dtb dtb-$(CONFIG_ARCH_MESON) += meson-gxm-vega-s96.dtb +dtb-$(CONFIG_ARCH_MESON) += meson-sm1-sei610.dtb diff --git a/arch/arm64/boot/dts/amlogic/meson-sm1-sei610.dts b/arch/arm64/boot/dts/amlogic/meson-sm1-sei610.dts new file mode 100644 index 000000000000..12dab0ba2f26 --- /dev/null +++ b/arch/arm64/boot/dts/amlogic/meson-sm1-sei610.dts @@ -0,0 +1,300 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +/* + * Copyright (c) 2019 BayLibre SAS. All rights reserved. + */ + +/dts-v1/; + +#include "meson-sm1.dtsi" +#include <dt-bindings/gpio/gpio.h> +#include <dt-bindings/input/input.h> +#include <dt-bindings/gpio/meson-g12a-gpio.h> + +/ { + compatible = "seirobotics,sei610", "amlogic,sm1"; + model = "SEI Robotics SEI610"; + + aliases { + serial0 = &uart_AO; + ethernet0 = ðmac; + }; + + chosen { + stdout-path = "serial0:115200n8"; + }; + + emmc_pwrseq: emmc-pwrseq { + compatible = "mmc-pwrseq-emmc"; + reset-gpios = <&gpio BOOT_12 GPIO_ACTIVE_LOW>; + }; + + gpio-keys { + compatible = "gpio-keys-polled"; + poll-interval = <100>; + + key1 { + label = "A"; + linux,code = <BTN_0>; + gpios = <&gpio GPIOH_6 GPIO_ACTIVE_LOW>; + }; + + key2 { + label = "B"; + linux,code = <BTN_1>; + gpios = <&gpio GPIOH_7 GPIO_ACTIVE_LOW>; + }; + + key3 { + label = "C"; + linux,code = <BTN_2>; + gpios = <&gpio_ao GPIOAO_2 GPIO_ACTIVE_LOW>; + }; + }; + + leds { + compatible = "gpio-leds"; + + bluetooth { + label = "sei610:blue:bt"; + gpios = <&gpio GPIOC_7 (GPIO_ACTIVE_LOW | GPIO_OPEN_DRAIN)>; + default-state = "off"; + }; + }; + + pwmleds { + compatible = "pwm-leds"; + + power { + label = "sei610:red:power"; + pwms = <&pwm_AO_ab 0 30518 0>; + max-brightness = <255>; + linux,default-trigger = "default-on"; + active-low; + }; + }; + + memory@0 { + device_type = "memory"; + reg = <0x0 0x0 0x0 0x40000000>; + }; + + ao_5v: regulator-ao_5v { + compatible = "regulator-fixed"; + regulator-name = "AO_5V"; + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; + vin-supply = <&dc_in>; + regulator-always-on; + }; + + dc_in: regulator-dc_in { + compatible = "regulator-fixed"; + regulator-name = "DC_IN"; + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; + regulator-always-on; + }; + + emmc_1v8: regulator-emmc_1v8 { + compatible = "regulator-fixed"; + regulator-name = "EMMC_1V8"; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + vin-supply = <&vddao_3v3>; + regulator-always-on; + }; + + vddao_3v3: regulator-vddao_3v3 { + compatible = "regulator-fixed"; + regulator-name = "VDDAO_3V3"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + vin-supply = <&dc_in>; + regulator-always-on; + }; + + /* Used by Tuner, RGB Led & IR Emitter LED array */ + vddao_3v3_t: regultor-vddao_3v3_t { + compatible = "regulator-fixed"; + regulator-name = "VDDAO_3V3_T"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + vin-supply = <&vddao_3v3>; + gpio = <&gpio GPIOH_8 GPIO_OPEN_DRAIN>; + enable-active-low; + regulator-always-on; + }; + + vddio_ao1v8: regulator-vddio_ao1v8 { + compatible = "regulator-fixed"; + regulator-name = "VDDIO_AO1V8"; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + vin-supply = <&vddao_3v3>; + regulator-always-on; + }; + + reserved-memory { + /* TEE Reserved Memory */ + bl32_reserved: bl32@5000000 { + reg = <0x0 0x05300000 0x0 0x2000000>; + no-map; + }; + }; + + sdio_pwrseq: sdio-pwrseq { + compatible = "mmc-pwrseq-simple"; + reset-gpios = <&gpio GPIOX_6 GPIO_ACTIVE_LOW>; + clocks = <&wifi32k>; + clock-names = "ext_clock"; + }; + + wifi32k: wifi32k { + compatible = "pwm-clock"; + #clock-cells = <0>; + clock-frequency = <32768>; + pwms = <&pwm_ef 0 30518 0>; /* PWM_E at 32.768KHz */ + }; +}; + +&cec_AO { + pinctrl-0 = <&cec_ao_a_h_pins>; + pinctrl-names = "default"; + status = "disabled"; + hdmi-phandle = <&hdmi_tx>; +}; + +&cecb_AO { + pinctrl-0 = <&cec_ao_b_h_pins>; + pinctrl-names = "default"; + status = "okay"; + hdmi-phandle = <&hdmi_tx>; +}; + +ðmac { + status = "okay"; + phy-handle = <&internal_ephy>; + phy-mode = "rmii"; +}; + +&i2c3 { + status = "okay"; + pinctrl-0 = <&i2c3_sda_a_pins>, <&i2c3_sck_a_pins>; + pinctrl-names = "default"; +}; + +&ir { + status = "okay"; + pinctrl-0 = <&remote_input_ao_pins>; + pinctrl-names = "default"; +}; + +&pwm_AO_ab { + status = "okay"; + pinctrl-0 = <&pwm_ao_a_pins>; + pinctrl-names = "default"; + clocks = <&xtal>; + clock-names = "clkin0"; +}; + +&pwm_ef { + status = "okay"; + pinctrl-0 = <&pwm_e_pins>; + pinctrl-names = "default"; + clocks = <&xtal>; + clock-names = "clkin0"; +}; + +&saradc { + status = "okay"; + vref-supply = <&vddio_ao1v8>; +}; + +/* SDIO */ +&sd_emmc_a { + status = "okay"; + pinctrl-0 = <&sdio_pins>; + pinctrl-1 = <&sdio_clk_gate_pins>; + pinctrl-names = "default", "clk-gate"; + #address-cells = <1>; + #size-cells = <0>; + + bus-width = <4>; + cap-sd-highspeed; + sd-uhs-sdr50; + max-frequency = <100000000>; + + non-removable; + disable-wp; + + mmc-pwrseq = <&sdio_pwrseq>; + + vmmc-supply = <&vddao_3v3>; + vqmmc-supply = <&vddio_ao1v8>; + + brcmf: wifi@1 { + reg = <1>; + compatible = "brcm,bcm4329-fmac"; + }; +}; + +/* SD card */ +&sd_emmc_b { + status = "okay"; + pinctrl-0 = <&sdcard_c_pins>; + pinctrl-1 = <&sdcard_clk_gate_c_pins>; + pinctrl-names = "default", "clk-gate"; + + bus-width = <4>; + cap-sd-highspeed; + max-frequency = <50000000>; + disable-wp; + + cd-gpios = <&gpio GPIOC_6 GPIO_ACTIVE_LOW>; + vmmc-supply = <&vddao_3v3>; + vqmmc-supply = <&vddao_3v3>; +}; + +/* eMMC */ +&sd_emmc_c { + status = "okay"; + pinctrl-0 = <&emmc_pins>, <&emmc_ds_pins>; + pinctrl-1 = <&emmc_clk_gate_pins>; + pinctrl-names = "default", "clk-gate"; + + bus-width = <8>; + cap-mmc-highspeed; + mmc-ddr-1_8v; + mmc-hs200-1_8v; + max-frequency = <200000000>; + non-removable; + disable-wp; + + mmc-pwrseq = <&emmc_pwrseq>; + vmmc-supply = <&vddao_3v3>; + vqmmc-supply = <&emmc_1v8>; +}; + +&uart_A { + status = "okay"; + pinctrl-0 = <&uart_a_pins>, <&uart_a_cts_rts_pins>; + pinctrl-names = "default"; + uart-has-rtscts; + + bluetooth { + compatible = "brcm,bcm43438-bt"; + shutdown-gpios = <&gpio GPIOX_17 GPIO_ACTIVE_HIGH>; + max-speed = <2000000>; + clocks = <&wifi32k>; + clock-names = "lpo"; + vbat-supply = <&vddao_3v3>; + vddio-supply = <&vddio_ao1v8>; + }; +}; + +/* Exposed via the on-board USB to Serial FT232RL IC */ +&uart_AO { + status = "okay"; + pinctrl-0 = <&uart_ao_a_pins>; + pinctrl-names = "default"; +}; diff --git a/arch/arm64/boot/dts/amlogic/meson-sm1.dtsi b/arch/arm64/boot/dts/amlogic/meson-sm1.dtsi new file mode 100644 index 000000000000..e902d4f9165f --- /dev/null +++ b/arch/arm64/boot/dts/amlogic/meson-sm1.dtsi @@ -0,0 +1,68 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +/* + * Copyright (c) 2019 BayLibre, SAS + * Author: Neil Armstrong <narmstrong@baylibre.com> + */ + +#include "meson-g12-common.dtsi" + +/ { + compatible = "amlogic,sm1"; + + cpus { + #address-cells = <0x2>; + #size-cells = <0x0>; + + cpu0: cpu@0 { + device_type = "cpu"; + compatible = "arm,cortex-a55"; + reg = <0x0 0x0>; + enable-method = "psci"; + next-level-cache = <&l2>; + }; + + cpu1: cpu@1 { + device_type = "cpu"; + compatible = "arm,cortex-a55"; + reg = <0x0 0x1>; + enable-method = "psci"; + next-level-cache = <&l2>; + }; + + cpu2: cpu@2 { + device_type = "cpu"; + compatible = "arm,cortex-a55"; + reg = <0x0 0x2>; + enable-method = "psci"; + next-level-cache = <&l2>; + }; + + cpu3: cpu@3 { + device_type = "cpu"; + compatible = "arm,cortex-a55"; + reg = <0x0 0x3>; + enable-method = "psci"; + next-level-cache = <&l2>; + }; + + l2: l2-cache0 { + compatible = "cache"; + }; + }; +}; + +&cecb_AO { + compatible = "amlogic,meson-sm1-ao-cec"; +}; + +&clk_msr { + compatible = "amlogic,meson-sm1-clk-measure"; +}; + +&pwrc_vpu { + status = "disabled"; +}; + +&vpu { + status = "disabled"; +}; -- 2.22.0 ^ permalink raw reply related [flat|nested] 13+ messages in thread
* Re: [PATCH 6/6] arm64: dts: add support for SM1 based SEI Robotics SEI610 2019-08-20 14:40 ` [PATCH 6/6] arm64: dts: add support for SM1 based SEI Robotics SEI610 Neil Armstrong @ 2019-08-20 20:11 ` Martin Blumenstingl 2019-08-20 20:32 ` Kevin Hilman 0 siblings, 1 reply; 13+ messages in thread From: Martin Blumenstingl @ 2019-08-20 20:11 UTC (permalink / raw) To: Neil Armstrong; +Cc: khilman, linux-amlogic, linux-kernel, linux-arm-kernel Hi Neil, On Tue, Aug 20, 2019 at 4:43 PM Neil Armstrong <narmstrong@baylibre.com> wrote: > > Add support for the Amlogic SM1 Based SEI610 board. > > The SM1 SoC is a derivative of the G12A SoC Family with : > - Cortex-A55 core instead of A53 > - more power domains, including USB & PCIe > - a neural network co-processor (NNA) > - a CSI input and image processor > - some changes in the audio complex, thus not yet enabled > > The SEI610 board is a derivative of the SEI510 board with : > - removed ADC based touch button, replaced with 3x GPIO buttons > - physical switch disabling on-board MICs > - USB-C port for USB 2.0 OTG > - On-board FTDI USB2SERIAL port for Linux console > > Audio, Display and USB support will be added later when support of the > corresponding power domains will be added, for now they are kept disabled. > > Signed-off-by: Neil Armstrong <narmstrong@baylibre.com> I don't have any details about this board but overall this looks sane, so: Acked-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com> [...] > + /* Used by Tuner, RGB Led & IR Emitter LED array */ > + vddao_3v3_t: regultor-vddao_3v3_t { that should be regulator-vddao_3v3_t - maybe Kevin can fix this up, if not then we can still fix it with a follow-up patch Martin ^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH 6/6] arm64: dts: add support for SM1 based SEI Robotics SEI610 2019-08-20 20:11 ` Martin Blumenstingl @ 2019-08-20 20:32 ` Kevin Hilman 0 siblings, 0 replies; 13+ messages in thread From: Kevin Hilman @ 2019-08-20 20:32 UTC (permalink / raw) To: Martin Blumenstingl, Neil Armstrong Cc: linux-amlogic, linux-kernel, linux-arm-kernel Martin Blumenstingl <martin.blumenstingl@googlemail.com> writes: > Hi Neil, > > On Tue, Aug 20, 2019 at 4:43 PM Neil Armstrong <narmstrong@baylibre.com> wrote: >> >> Add support for the Amlogic SM1 Based SEI610 board. >> >> The SM1 SoC is a derivative of the G12A SoC Family with : >> - Cortex-A55 core instead of A53 >> - more power domains, including USB & PCIe >> - a neural network co-processor (NNA) >> - a CSI input and image processor >> - some changes in the audio complex, thus not yet enabled >> >> The SEI610 board is a derivative of the SEI510 board with : >> - removed ADC based touch button, replaced with 3x GPIO buttons >> - physical switch disabling on-board MICs >> - USB-C port for USB 2.0 OTG >> - On-board FTDI USB2SERIAL port for Linux console >> >> Audio, Display and USB support will be added later when support of the >> corresponding power domains will be added, for now they are kept disabled. >> >> Signed-off-by: Neil Armstrong <narmstrong@baylibre.com> > I don't have any details about this board but overall this looks sane, so: > Acked-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com> > > [...] >> + /* Used by Tuner, RGB Led & IR Emitter LED array */ >> + vddao_3v3_t: regultor-vddao_3v3_t { > that should be regulator-vddao_3v3_t - maybe Kevin can fix this up, if > not then we can still fix it with a follow-up patch I fixed it up while applying, Kevin ^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH 0/6] arm64: Add support for Amlogic SM1 SoC Family 2019-08-20 14:40 [PATCH 0/6] arm64: Add support for Amlogic SM1 SoC Family Neil Armstrong ` (5 preceding siblings ...) 2019-08-20 14:40 ` [PATCH 6/6] arm64: dts: add support for SM1 based SEI Robotics SEI610 Neil Armstrong @ 2019-08-20 19:25 ` Kevin Hilman 2019-08-20 23:06 ` Kevin Hilman 6 siblings, 1 reply; 13+ messages in thread From: Kevin Hilman @ 2019-08-20 19:25 UTC (permalink / raw) To: Neil Armstrong Cc: Neil Armstrong, linux-amlogic, linux-arm-kernel, linux-kernel Neil Armstrong <narmstrong@baylibre.com> writes: > The new Amlogic SM1 SoC Family is a derivative of the Amlogic G12A > SoC Family, with the following changes : > - Cortex-A55 cores instead of A53 > - more power domains, including USB & PCIe > - a neural network co-processor (NNA) > - a CSI input and image processor > - some changes in the audio complex, thus not yet enabled > - new clocks, for NNA, CSI and a clock tree for each CPU Core > > This serie does not add support for NNA, CSI, Audio, USB, Display > or DVFS, it only aligns with the current G12A Support. > > With this serie, the SEI610 Board has supported : > - Default-boot CPU frequency > - Ethernet > - LEDs > - IR > - GPIO Buttons > - eMMC > - SDCard > - SDIO WiFi > - UART Bluetooth > > Audio (HDMI, Embedded HP, MIcs), USB, HDMI, IR Output, & RGB Led > would be supported in following patchsets. > > Dependencies: > - g12-common.dtsi from the DVFS patchset at [1] > > Changes from rfc at [2]: > - Removed Power domain patches & display/USB support, will resend separately > - Removed applied AO-CEC patches > - Fixed clk-measure IDs > - Collected reviewed-by tags > > [1] https://patchwork.kernel.org/cover/11025309/ > [2] https://patchwork.kernel.org/cover/11025511/ Series queued for v5.4... > Neil Armstrong (6): > soc: amlogic: meson-gx-socinfo: Add SM1 and S905X3 IDs > dt-bindings: soc: amlogic: clk-measure: Add SM1 compatible > soc: amlogic: clk-measure: Add support for SM1 ... these 3 in v5.4/drivers ... > dt-bindings: arm: amlogic: add SM1 bindings > dt-bindings: arm: amlogic: add SEI Robotics SEI610 bindings > arm64: dts: add support for SM1 based SEI Robotics SEI610 ... and these 3 in v5.4/dt64 with Rob's tag. Thanks, Kevin ^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH 0/6] arm64: Add support for Amlogic SM1 SoC Family 2019-08-20 19:25 ` [PATCH 0/6] arm64: Add support for Amlogic SM1 SoC Family Kevin Hilman @ 2019-08-20 23:06 ` Kevin Hilman 0 siblings, 0 replies; 13+ messages in thread From: Kevin Hilman @ 2019-08-20 23:06 UTC (permalink / raw) To: Neil Armstrong Cc: Neil Armstrong, linux-amlogic, linux-arm-kernel, linux-kernel Kevin Hilman <khilman@baylibre.com> writes: > Neil Armstrong <narmstrong@baylibre.com> writes: > >> The new Amlogic SM1 SoC Family is a derivative of the Amlogic G12A >> SoC Family, with the following changes : >> - Cortex-A55 cores instead of A53 >> - more power domains, including USB & PCIe >> - a neural network co-processor (NNA) >> - a CSI input and image processor >> - some changes in the audio complex, thus not yet enabled >> - new clocks, for NNA, CSI and a clock tree for each CPU Core >> >> This serie does not add support for NNA, CSI, Audio, USB, Display >> or DVFS, it only aligns with the current G12A Support. >> >> With this serie, the SEI610 Board has supported : >> - Default-boot CPU frequency >> - Ethernet >> - LEDs >> - IR >> - GPIO Buttons >> - eMMC >> - SDCard >> - SDIO WiFi >> - UART Bluetooth >> >> Audio (HDMI, Embedded HP, MIcs), USB, HDMI, IR Output, & RGB Led >> would be supported in following patchsets. >> >> Dependencies: >> - g12-common.dtsi from the DVFS patchset at [1] >> >> Changes from rfc at [2]: >> - Removed Power domain patches & display/USB support, will resend separately >> - Removed applied AO-CEC patches >> - Fixed clk-measure IDs >> - Collected reviewed-by tags >> >> [1] https://patchwork.kernel.org/cover/11025309/ >> [2] https://patchwork.kernel.org/cover/11025511/ > > Series queued for v5.4... >> Neil Armstrong (6): >> soc: amlogic: meson-gx-socinfo: Add SM1 and S905X3 IDs >> dt-bindings: soc: amlogic: clk-measure: Add SM1 compatible >> soc: amlogic: clk-measure: Add support for SM1 > > ... these 3 in v5.4/drivers ... > >> dt-bindings: arm: amlogic: add SM1 bindings >> dt-bindings: arm: amlogic: add SEI Robotics SEI610 bindings >> arm64: dts: add support for SM1 based SEI Robotics SEI610 > > ... and these 3 in v5.4/dt64 with Rob's tag. And I forgot to add that I boot-tested this on an SEI610 as well. Tested-by: Kevin Hilman <khilman@baylibre.com> ^ permalink raw reply [flat|nested] 13+ messages in thread
end of thread, other threads:[~2019-08-20 23:06 UTC | newest] Thread overview: 13+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2019-08-20 14:40 [PATCH 0/6] arm64: Add support for Amlogic SM1 SoC Family Neil Armstrong 2019-08-20 14:40 ` [PATCH 1/6] soc: amlogic: meson-gx-socinfo: Add SM1 and S905X3 IDs Neil Armstrong 2019-08-20 14:40 ` [PATCH 2/6] dt-bindings: soc: amlogic: clk-measure: Add SM1 compatible Neil Armstrong 2019-08-20 14:40 ` [PATCH 3/6] soc: amlogic: clk-measure: Add support for SM1 Neil Armstrong 2019-08-20 14:40 ` [PATCH 4/6] dt-bindings: arm: amlogic: add SM1 bindings Neil Armstrong 2019-08-20 16:15 ` Rob Herring 2019-08-20 14:40 ` [PATCH 5/6] dt-bindings: arm: amlogic: add SEI Robotics SEI610 bindings Neil Armstrong 2019-08-20 16:16 ` Rob Herring 2019-08-20 14:40 ` [PATCH 6/6] arm64: dts: add support for SM1 based SEI Robotics SEI610 Neil Armstrong 2019-08-20 20:11 ` Martin Blumenstingl 2019-08-20 20:32 ` Kevin Hilman 2019-08-20 19:25 ` [PATCH 0/6] arm64: Add support for Amlogic SM1 SoC Family Kevin Hilman 2019-08-20 23:06 ` Kevin Hilman
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).