From 09f3fbb011b6a8062e88f0575f3608681966cde0 Mon Sep 17 00:00:00 2001 From: Sunny Luo Date: Mon, 23 Jul 2018 16:12:22 +0800 Subject: [PATCH] dts: spicc: change txl dts to use upstream driver PD#164751: dts: spicc: change txl dts to use upstream driver Change-Id: Ibf51059122d31316bb644d6431466e36afe44cb6 Signed-off-by: Sunny Luo --- .../devicetree/bindings/spi/spi-meson.txt | 2 ++ arch/arm64/boot/dts/amlogic/mesontxl.dtsi | 25 +++++++++++++------ arch/arm64/boot/dts/amlogic/txl_t962_p321.dts | 7 ++++++ 3 files changed, 27 insertions(+), 7 deletions(-) diff --git a/Documentation/devicetree/bindings/spi/spi-meson.txt b/Documentation/devicetree/bindings/spi/spi-meson.txt index 7aeaa457ea69..dfadaf315484 100644 --- a/Documentation/devicetree/bindings/spi/spi-meson.txt +++ b/Documentation/devicetree/bindings/spi/spi-meson.txt @@ -30,6 +30,8 @@ Required properties: - compatible: should be: "amlogic,meson-gx-spicc" on Amlogic GX and compatible SoCs. "amlogic,meson-txlx-spicc" on Amlogic TXLX and compatible SoCs + "amlogic,meson-txl-spicc", "amlogic,meson-txlx-spicc" + on Amlogic TXL and compatible SoCs "amlogic,meson-axg-spicc" on Amlogic AXG and compatible SoCs "amlogic,meson-g12a-spicc" on Amlogic G12A and compatible SoCs "amlogic,meson-g12b-spicc", "amlogic,meson-g12a-spicc" diff --git a/arch/arm64/boot/dts/amlogic/mesontxl.dtsi b/arch/arm64/boot/dts/amlogic/mesontxl.dtsi index 5dfe500fef2c..df6fcb52519c 100644 --- a/arch/arm64/boot/dts/amlogic/mesontxl.dtsi +++ b/arch/arm64/boot/dts/amlogic/mesontxl.dtsi @@ -464,14 +464,16 @@ status = "disabled"; }; - spicc: spicc@8d80 { - compatible = "amlogic, spicc"; + spicc: spi@8d80 { + compatible = "amlogic,meson-txl-spicc", + "amlogic,meson-txlx-spicc"; + reg = <0x0 0x8d80 0x0 0x3c>; + interrupts = ; + clocks = <&clkc CLKID_SPICC0>; + clock-names = "core"; + #address-cells = <1>; + #size-cells = <0>; status = "disabled"; - reg = <0x0 0x8d80 0x0 0x28>; - //clocks = <&clkc CLKID_SPICC>; - clock-names = "spicc_clk"; - interrupts = <0 81 1>; - device_id = <0>; }; uart_A: serial@84c0 { @@ -1411,4 +1413,13 @@ function = "dtv"; }; }; + + spicc_pins: spicc { + mux { + groups = "spi_miso_a", + "spi_mosi_a", + "spi_clk_a"; + function = "spi_a"; + }; + }; }; diff --git a/arch/arm64/boot/dts/amlogic/txl_t962_p321.dts b/arch/arm64/boot/dts/amlogic/txl_t962_p321.dts index 743eef8d59f1..d48e90f5ec02 100644 --- a/arch/arm64/boot/dts/amlogic/txl_t962_p321.dts +++ b/arch/arm64/boot/dts/amlogic/txl_t962_p321.dts @@ -1073,3 +1073,10 @@ mem_alloc = <0>; pxp_mode = <0>; /** 0:normal mode 1:pxp mode */ }; + +&spicc { + status = "disabled"; + pinctrl-names = "default"; + pinctrl-0 = <&spicc_pins>; + cs-gpios = <&gpio GPIOZ_3 0>; +}; -- 2.20.1