| Message ID | 20200313091401.15888-1-narmstrong@baylibre.com (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | 5fa86f4f72e049470897fef32cc785b448fcf42b |
| Headers | show |
| Series | arm64: dts: meson-g12-common: add spicc controller nodes | expand |
Neil Armstrong <narmstrong@baylibre.com> writes: > This adds the controller and pinctrl nodes for the Amlogic G12A SPICC > controllers. > > Signed-off-by: Neil Armstrong <narmstrong@baylibre.com> > --- > Kevin, > > This depends on the CLKID_SPICC0_SCLK and CLKID_SPICC1_SCLK introduced > in https://lore.kernel.org/linux-arm-kernel/20200219084928.28707-2-narmstrong@baylibre.com/ Looks like this is merged in clk-meson. Can I get a stable tag to use in my tree please? Thanks, Kevin
Hi Kevin, On 16/03/2020 16:31, Kevin Hilman wrote: > Neil Armstrong <narmstrong@baylibre.com> writes: > >> This adds the controller and pinctrl nodes for the Amlogic G12A SPICC >> controllers. >> >> Signed-off-by: Neil Armstrong <narmstrong@baylibre.com> >> --- >> Kevin, >> >> This depends on the CLKID_SPICC0_SCLK and CLKID_SPICC1_SCLK introduced >> in https://lore.kernel.org/linux-arm-kernel/20200219084928.28707-2-narmstrong@baylibre.com/ > > Looks like this is merged in clk-meson. Can I get a stable tag to use > in my tree please? > > Thanks, > > Kevin > Here you go: The following changes since commit bb6d3fb354c5ee8d6bde2d576eb7220ea09862b9: Linux 5.6-rc1 (2020-02-09 16:08:48 -0800) are available in the Git repository at: git://github.com/BayLibre/clk-meson.git tags/clk-meson-dt-v5.7-1 for you to fetch changes up to 42be7c41a5edc990e329b991b4ad6ec172e72e18: dt-bindings: clk: g12a-clkc: add SPICC SCLK Source clock IDs (2020-02-19 18:40:00 +0100) ---------------------------------------------------------------- - Add gxl internal dac gate clock id - Add g12a SPICC SCLK Source clock IDs ---------------------------------------------------------------- Jerome Brunet (1): dt-bindings: clk: meson: add the gxl internal dac gate Neil Armstrong (1): dt-bindings: clk: g12a-clkc: add SPICC SCLK Source clock IDs include/dt-bindings/clock/g12a-clkc.h | 2 ++ include/dt-bindings/clock/gxbb-clkc.h | 1 + 2 files changed, 3 insertions(+) Neil
Hello: This patch was applied to khilman/linux-amlogic.git (refs/heads/for-next). On Fri, 13 Mar 2020 10:14:01 +0100 you wrote: > This adds the controller and pinctrl nodes for the Amlogic G12A SPICC > controllers. > > Signed-off-by: Neil Armstrong <narmstrong@baylibre.com> > --- > Kevin, > > [...] Here is a summary with links: - arm64: dts: meson-g12-common: add spicc controller nodes https://git.kernel.org/khilman/linux-amlogic/c/5fa86f4f72e049470897fef32cc785b448fcf42b You are awesome, thank you!
diff --git a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi index abe04f4ad7d8..3e1dfa80651d 100644 --- a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi @@ -957,6 +957,57 @@ }; }; + spicc0_x_pins: spicc0-x { + mux { + groups = "spi0_mosi_x", + "spi0_miso_x", + "spi0_clk_x"; + function = "spi0"; + drive-strength-microamp = <4000>; + bias-disable; + }; + }; + + spicc0_ss0_x_pins: spicc0-ss0-x { + mux { + groups = "spi0_ss0_x"; + function = "spi0"; + drive-strength-microamp = <4000>; + bias-disable; + }; + }; + + spicc0_c_pins: spicc0-c { + mux { + groups = "spi0_mosi_c", + "spi0_miso_c", + "spi0_ss0_c", + "spi0_clk_c"; + function = "spi0"; + drive-strength-microamp = <4000>; + bias-disable; + }; + }; + + spicc1_pins: spicc1 { + mux { + groups = "spi1_mosi", + "spi1_miso", + "spi1_clk"; + function = "spi1"; + drive-strength-microamp = <4000>; + }; + }; + + spicc1_ss0_pins: spicc1-ss0 { + mux { + groups = "spi1_ss0"; + function = "spi1"; + drive-strength-microamp = <4000>; + bias-disable; + }; + }; + tdm_a_din0_pins: tdm-a-din0 { mux { groups = "tdm_a_din0"; @@ -2051,6 +2102,30 @@ amlogic,channel-interrupts = <64 65 66 67 68 69 70 71>; }; + spicc0: spi@13000 { + compatible = "amlogic,meson-g12a-spicc"; + reg = <0x0 0x13000 0x0 0x44>; + interrupts = <GIC_SPI 81 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&clkc CLKID_SPICC0>, + <&clkc CLKID_SPICC0_SCLK>; + clock-names = "core", "pclk"; + #address-cells = <1>; + #size-cells = <0>; + status = "disabled"; + }; + + spicc1: spi@15000 { + compatible = "amlogic,meson-g12a-spicc"; + reg = <0x0 0x15000 0x0 0x44>; + interrupts = <GIC_SPI 90 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&clkc CLKID_SPICC1>, + <&clkc CLKID_SPICC1_SCLK>; + clock-names = "core", "pclk"; + #address-cells = <1>; + #size-cells = <0>; + status = "disabled"; + }; + pwm_ef: pwm@19000 { compatible = "amlogic,meson-g12a-ee-pwm"; reg = <0x0 0x19000 0x0 0x20>;
This adds the controller and pinctrl nodes for the Amlogic G12A SPICC controllers. Signed-off-by: Neil Armstrong <narmstrong@baylibre.com> --- Kevin, This depends on the CLKID_SPICC0_SCLK and CLKID_SPICC1_SCLK introduced in https://lore.kernel.org/linux-arm-kernel/20200219084928.28707-2-narmstrong@baylibre.com/ Neil .../boot/dts/amlogic/meson-g12-common.dtsi | 75 +++++++++++++++++++ 1 file changed, 75 insertions(+)