| Message ID | 1496045395-5702-1-git-send-email-narmstrong@baylibre.com (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
Neil Armstrong <narmstrong@baylibre.com> writes: > Add nodes for the SPICC controller on GX common dtsi, GXBB and > GXL dtsi files. > > Signed-off-by: Neil Armstrong <narmstrong@baylibre.com> Applied to v4.13/dt64, Kevin
Kevin Hilman <khilman@baylibre.com> writes: > Neil Armstrong <narmstrong@baylibre.com> writes: > >> Add nodes for the SPICC controller on GX common dtsi, GXBB and >> GXL dtsi files. >> >> Signed-off-by: Neil Armstrong <narmstrong@baylibre.com> > > Applied to v4.13/dt64, Oops, this one will have to wait until we have an immutable branch in the clk tree. Kevin
On Tue, 2017-05-30 at 16:27 -0700, Kevin Hilman wrote: > Kevin Hilman <khilman@baylibre.com> writes: > > > Neil Armstrong <narmstrong@baylibre.com> writes: > > > > > Add nodes for the SPICC controller on GX common dtsi, GXBB and > > > GXL dtsi files. > > > > > > Signed-off-by: Neil Armstrong <narmstrong@baylibre.com> > > > > Applied to v4.13/dt64, > > Oops, this one will have to wait until we have an immutable branch in > the clk tree. Now available : meson-clk-headers-for-4.13 > > Kevin >
diff --git a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi b/arch/arm64/boot/dts/amlogic/meson-gx.dtsi index 436b875..613719d 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-gx.dtsi @@ -304,6 +304,15 @@ status = "disabled"; }; + spicc: spi@8d80 { + compatible = "amlogic,meson-gx-spicc"; + reg = <0x0 0x08d80 0x0 0x80>; + interrupts = <GIC_SPI 81 IRQ_TYPE_LEVEL_HIGH>; + #address-cells = <1>; + #size-cells = <0>; + status = "disabled"; + }; + spifc: spi@8c80 { compatible = "amlogic,meson-gx-spifc", "amlogic,meson-gxbb-spifc"; reg = <0x0 0x08c80 0x0 0x80>; diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi index 95a5d57..1734974 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi @@ -657,6 +657,13 @@ clock-names = "core", "clkin0", "clkin1"; }; +&spicc { + clocks = <&clkc CLKID_SPICC>; + clock-names = "core"; + resets = <&reset RESET_PERIPHS_SPICC>; + num-cs = <1>; +}; + &spifc { clocks = <&clkc CLKID_SPI>; }; diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi index 42d78f0..567dde4 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi @@ -584,6 +584,13 @@ clock-names = "core", "clkin0", "clkin1"; }; +&spicc { + clocks = <&clkc CLKID_SPICC>; + clock-names = "core"; + resets = <&reset RESET_PERIPHS_SPICC>; + num-cs = <1>; +}; + &spifc { clocks = <&clkc CLKID_SPI>; };
Add nodes for the SPICC controller on GX common dtsi, GXBB and GXL dtsi files. Signed-off-by: Neil Armstrong <narmstrong@baylibre.com> --- arch/arm64/boot/dts/amlogic/meson-gx.dtsi | 9 +++++++++ arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi | 7 +++++++ arch/arm64/boot/dts/amlogic/meson-gxl.dtsi | 7 +++++++ 3 files changed, 23 insertions(+)